diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index bd5e582e33..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Create a report to help fix an issue.
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Platform**: *Android/iOS/Mac/Windows/Linux*
-
-**Build**: *The build number under the title in the main menu. Required. "LATEST" IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.*
-
-**Issue**: *Explain your issue in detail.*
-
-**Steps to reproduce**: *How you happened across the issue, and what exactly you did to make the bug happen.*
-
-**Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.*
-
-**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.*
-
-If you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot.
-
-**(Crash) logs**: *Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs. REQUIRED if you are reporting a crash.*
-
----
-
-*Place an X (no spaces) between the brackets to confirm that you have read the line below.*  
-- [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**
-- [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..53c3710077
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,76 @@
+name: Bug report
+description: The type of device you were playing on
+labels: ["bug"]
+
+body:
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platforms
+      description: On what platforms do you know the bug happens?
+      multiple: false
+      options:
+        - Android
+        - iOS
+        - Mac
+        - Windows
+        - Linux
+    validations:
+      required: true
+  - type: input
+    id: build
+    attributes:
+      label: Build
+      description: The build number under the title in the main menu.
+      placeholder: LATEST IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.
+    validations:
+      required: true
+  - type: textarea
+    id: issue
+    attributes:
+      label: Issue
+      description: Explain your issue in detail.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to reproduce
+      description: How you happened across the issue, and what exactly you did to make the bug happen.
+    validations:
+      required: true
+  - type: textarea
+    id: mods
+    attributes:
+      label: Mods used
+      description: The mod repositories or zip files that are related to the issue, if applicable.
+    validations:
+      required: false
+  - type: textarea
+    id: save-file
+    attributes:
+      label: Save file
+      description: The (zipped) save file you were playing on when the bug happened. If this happened in the campaign, specify the sector, and attach the file you get from Settings -> Game Data -> Export Data. For custom games, attach the .msav file exported from the save dialog, zipped.
+      placeholder: THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME. IF YOU DO NOT HAVE A SAVE, DON'T WASTE TIME OPENING THIS ISSUE.
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: (Crash) logs
+      description: Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs.
+      placeholder: REQUIRED if you are reporting a crash.
+    validations:
+      required: false
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: Submission
+      description: Check the boxes to confirm that you have read the lines below.
+      options:
+        - label: I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.
+          required: true
+        - label: I have searched the closed and open issues to make sure that this problem has not already been reported.
+          required: true
+        - label: "I am not using Foo's Client, and have made sure the bug is not caused by mods I have installed."
+          required: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..81d2a8c472
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,5 @@
+If your pull request is **not** translation or serverlist-related, read the list of requirements below and check each box:
+
+- [ ] I have read the [contribution guidelines](https://github.com/Anuken/Mindustry/blob/master/CONTRIBUTING.md).
+- [ ] I have ensured that my code compiles, if applicable.
+- [ ] I have ensured that any new features in this PR function correctly in-game, if applicable.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index e98615e268..224a753d65 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -5,48 +5,78 @@ on:
     tags:
       - 'v*'
 
+permissions: {}
 jobs:
-  buildJava14:
+  deploy:
+    permissions:
+      contents: write # for release creation (svenstaro/upload-release-action)
+
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 17
     - name: Set env
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+    - name: Add Arc release
+      run: |
+        git config --global user.email "actions@github.com"
+        git config --global user.name "Github Actions"
+        git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
+        cd ../Arc
+        git tag ${RELEASE_VERSION}
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION};
+        cd ../Mindustry
+    - name: Update JITpack repo
+      run: |
+        cd ../
+        cp -r ./Mindustry ./MindustryJitpack
+        cd MindustryJitpack
+        git config --global user.name "Github Actions"
+        git config --global user.email "actions@github.com"
+        git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git
+        rm -rf .git
+        cp -r ./MindustryJitpack/.git ./.git
+        rm -rf MindustryJitpack
+        rm -rf .github
+        rm README.md
+        git add .
+        git commit --allow-empty -m "Updating"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
+        git tag ${RELEASE_VERSION}
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
+        cd ../Mindustry
     - name: Create artifacts
       run: |
-        ./gradlew desktop:dist server:dist core:javadoc -Pbuildversion=${RELEASE_VERSION:1}
+        ./gradlew desktop:dist server:dist core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
     - name: Update docs
       run: |
         cd ../
         git config --global user.email "cli@github.com"
         git config --global user.name "Github Actions"
         git clone --depth=1 https://github.com/MindustryGame/docs.git
-        cp -a Mindustry/core/build/docs/javadoc/. docs/
+        cd docs
+        find . -maxdepth 1 ! -name ".git" ! -name . -exec rm -r {} \;
+        cd ../
+        cp -a Mindustry/core/build/javadoc/. docs/
         cd docs
         git add .
-        git commit -m "Update ${RELEASE_VERSION:1}"
+        git commit --allow-empty -m "Update ${RELEASE_VERSION:1}"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
         cd ../Mindustry
-    - name: Add Arc release
-      run: |
-        git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
-        cd ../Arc
-        git tag ${RELEASE_VERSION}
-        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION};
-        cd ../Mindustry
     - name: Update F-Droid build string
       run: |
         git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
         cd ../MindustryBuilds
         echo "Updating version to ${RELEASE_VERSION:1}"
-        echo versionName=6-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${RELEASE_VERSION:1} > version_fdroid.txt
+        BNUM=$(($GITHUB_RUN_NUMBER + 1000))
+        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
         git add .
         git commit -m "Updating to build ${RELEASE_VERSION:1}"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds
         cd ../Mindustry
     - name: Upload client artifacts
       uses: svenstaro/upload-release-action@v2
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 0000000000..95cce8bab6
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 81cf1ff4e9..71185f740f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,21 +1,28 @@
 name: Pull Request Tests
 
-on: [pull_request]
+on: [pull_request, workflow_dispatch]
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
 
 jobs:
-  buildJava14:
+  testPR:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 17
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+    - name: Run unit tests
+      run: ./gradlew tests:test --stacktrace --rerun
     - name: Run unit tests and build JAR
-      run: ./gradlew test desktop:dist
+      run: ./gradlew desktop:dist
     - name: Upload desktop JAR for testing
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Desktop JAR (zipped)
         path: desktop/build/libs/Mindustry.jar
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 07ae6b09ab..cd593a6dfd 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,18 +2,16 @@ name: Tests
 
 on: [push, workflow_dispatch]
 
+permissions: {}
 jobs:
-  buildJava14:
+  runPush:
+    permissions:
+      contents: write # for Update bundles
+
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
-      uses: actions/setup-java@v1
-      with:
-        java-version: 14
-    - name: Run unit tests
-      run: ./gradlew clean cleanTest test
     - name: Trigger BE build
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |
@@ -21,5 +19,43 @@ jobs:
         cd ../MindustryBuilds
         BNUM=$(($GITHUB_RUN_NUMBER + 20000))
         git tag ${BNUM}
-        git config --global user.name "Build Uploader"
+        git config --global user.name "Github Actions"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}
+    - name: Set up JDK 17
+      uses: actions/setup-java@v1
+      with:
+        java-version: 17
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+    - name: Update bundles
+      if: ${{ github.repository == 'Anuken/Mindustry' }}
+      run: |
+        ./gradlew updateBundles
+
+        if [ -n "$(git status --porcelain)" ]; then
+          git config --global user.name "Github Actions"
+          git config --global user.email "actions@github.com"
+          git add core/assets/bundles/*
+          git commit -m "Automatic bundle update"
+          git push
+        fi
+    - name: Update JITpack repo
+      if: ${{ github.repository == 'Anuken/Mindustry' }}
+      run: |
+        git config --global user.name "Github Actions"
+        git config --global user.email "actions@github.com"
+        cd ../
+        cp -r ./Mindustry ./MindustryJitpack
+        cd MindustryJitpack
+        git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git
+        rm -rf .git
+        cp -r ./MindustryJitpack/.git ./.git
+        rm -rf MindustryJitpack
+        rm -rf .github
+        rm README.md
+        git add .
+        git commit --allow-empty -m "Updating"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
+        cd ../Mindustry
+    - name: Run unit tests
+      run: ./gradlew tests:test --rerun --stacktrace
diff --git a/.gitignore b/.gitignore
index 471b909106..dd3f2a0f06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
 logs/
+/fastlane/metadata/android/en-US/changelogs/
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
 /core/assets/bundles/output/
 /core/assets/.gifimages/
 /deploy/
 /out/
+ios/libs/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
@@ -42,7 +44,9 @@ steam_appid.txt
 ios/robovm.properties
 packr-out/
 config/
+buildSrc/
 *.gif
+/tests/out
 
 /core/assets/basepartnames
 version.properties
@@ -101,6 +105,10 @@ com_crashlytics_export_strings.xml
 .externalToolBuilders/
 *.launch
 
+## VSCode
+
+.vscode/
+
 ## NetBeans
 
 /nbproject/private/
@@ -156,3 +164,6 @@ gradle-app.setting
 .DS_Store
 Thumbs.db
 android/libs/
+
+# ignored due to frequent branch conflicts.
+core/assets/logicids.dat
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 64bd54bd56..99086e0da2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,9 +12,11 @@ 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.
-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*).  
+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) - either via PM or by posting in the `#pulls` channel.
 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 make formatting PRs.
+Yes, there are occurrences of trailing spaces, extra newlines, empty indents, and other tiny errors. No, I don't want to merge, view, or get notified by your 1-line PR fixing it. If you're implementing a PR with modification of *actual code*, feel free to fix formatting in the general vicinity of your changes, but please don't waste everyone's time with pointless changes.
 
 ## Style Guidelines
 
@@ -26,7 +28,7 @@ This means:
 - `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
+- Prefer single-line javadoc `/** @return for example */` instead of multiline javadoc whenever possible
 - Short method/variable names (multipleLongWords should be avoided if it's possible to do 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.
 
diff --git a/LICENSE b/LICENSE
index 94a9ed024d..bc08fe2e41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index 97aece9742..30e864545c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 ![Logo](core/assets-raw/sprites/ui/logo.png)
 
-[![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) 
-[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord)](https://discord.gg/mindustry)  
+[![Build Status](https://github.com/Anuken/Mindustry/workflows/Tests/badge.svg?event=push)](https://github.com/Anuken/Mindustry/actions)
+[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord&color=17cf48)](https://discord.gg/mindustry)  
 
-A sandbox tower defense game written in Java.
+The automation tower defense RTS, written in Java.
 
 _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_  
 _[Wiki](https://mindustrygame.github.io/wiki)_  
@@ -18,7 +18,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 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:
+First, make sure you have [JDK 17](https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
 
 ### Windows
 
@@ -38,11 +38,14 @@ 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. 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`.
+1. Install the Android SDK [here.](https://developer.android.com/studio#command-tools) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
+2. In the unzipped Android SDK folder, find the cmdline-tools directory. Then create a folder inside of it called `latest` and put all of its contents into the newly created folder.
+3. In the same directory run the command `sdkmanager --licenses` (or `./sdkmanager --licenses` if on linux/mac)
+4. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
+5. Enable developer mode on your device/emulator. If you are on testing on a phone you can follow [these instructions](https://developer.android.com/studio/command-line/adb#Enabling), otherwise you need to google how to enable your emulator's developer mode specifically.
+6. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
 
-To debug the application on a connected phone, run `gradlew android:installDebug android:run`.
+To debug the application on a connected device/emulator, run `gradlew android:installDebug android:run`.
 
 ### Troubleshooting
 
@@ -50,6 +53,16 @@ To debug the application on a connected phone, run `gradlew android:installDebug
 
 If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` before running `./gradlew`. *This is a one-time procedure.*
 
+#### Where is the `mindustry.gen` package?
+
+As the name implies, `mindustry.gen` is generated *at build time* based on other code. You will not find source code for this package in the repository, and it should not be edited by hand.
+
+The following is a non-exhaustive list of the "source" of generated code in `mindustry.gen`:
+
+- `Call`, `*Packet` classes: Generated from methods marked with `@Remote`.
+- All entity classes (`Unit`, `EffectState`, `Posc`, etc): Generated from component classes in the `mindustry.entities.comp` package, and combined using definitions in `mindustry.content.UnitTypes`.
+- `Sounds`, `Musics`, `Tex`, `Icon`, etc: Generated based on files in the respective asset folders.
+
 ---
 
 Gradle may take up to several minutes to download files. Be patient. <br>
diff --git a/SERVERLIST.md b/SERVERLIST.md
index 83aa15a3d7..bdc199602b 100644
--- a/SERVERLIST.md
+++ b/SERVERLIST.md
@@ -1,26 +1,37 @@
+# Note: Server list review is currently on pause. No new servers will be merged until v8 is released!
+
+*PRs to edit addresses of existing servers will still be accepted, although very infrequently.*
+
 ### Adding a server to the list
 
 Mindustry now has a public list of servers that everyone can see and connect to. 
-This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json) in this repository.
+This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json) in this repository.
 
 You may want to add your server to this list. The steps for getting this done are as follows:
 
+0. **Take note of the fact that modded servers are not allowed on this list.** Such servers confuse users, and there's currently no easy way to fix mod incompatibilities after a failed connection.
 1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well.
-You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins. 
+You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins.
 *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.
-2. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
-  - Your name or description must reflect the type of server you're hosting. 
-  Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
-  - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
-  - Try to be professional in your text; use common sense.
-3. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
-4. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
-5. Finally, **submit a pull request** to add your server's IP to the list. 
-This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json), then add a JSON object with a single key, indicating your server address.
-For example, if your server address is `google.com`, you would add a comma after the last entry and insert:
-```json
-  {
-    "address": "google.com"
-  }
-```
-Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.
+2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["canvas", "logic-display", "large-logic-display"]`.
+3. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
+   - Your name or description must reflect the type of server you're hosting. 
+   Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
+   - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
+   - Try to be professional in your text; use common sense.
+4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
+5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
+6. Finally, **submit a pull request** to add your server's IP to the list. 
+This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json), then add a JSON object with the following format:
+    ```json
+      {
+        "name": "Your Server Group Name",
+        "address": ["your.server.address"]
+      }
+    ```
+
+    If your group has multiple servers, simply add extra addresses inside the square brackets, separated by commas. For example: `["address1", "address2"]`
+    
+    > Note that Mindustry also support SRV records. This allows you to use a subdomain for your server address instead of specifying the port. For example, if you want to use `play.example.com` instead of `example.com:6000`, in the dns settings of your domain, add an SRV record with `_mindustry` as the service, `tcp` as the protocol, `play` as the target and `6000` as the port. You can also setup fallback servers by modifying the weight or priority of the record. Although SRV records are very convenient, keep in mind they are slower than regular addresses. Avoid using them in the server list, but rather as an easy way to share your server address.
+
+    Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.
diff --git a/TRANSLATING.md b/TRANSLATING.md
index 0514018541..8e61559964 100644
--- a/TRANSLATING.md
+++ b/TRANSLATING.md
@@ -31,9 +31,11 @@ There are two ways to test the translation bundle:
 1) Assuming you have the PC version downloaded, download your bundle file, name it `bundle.properties`, then place it in the same folder as the Mindustry desktop executable and run it. *You should get a popup message in-game confirming that you have loaded an external translation.*
 2) For advanced users: simply download your fork of mindustry and compile/run the game.
 
-#### Translating for stores (Steam, Google Play)
+#### Translating for stores (Steam, ~~Google Play~~)
 
-If you would like to translate the descriptions for Google Play or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
+NOTE: The Google Play description is in the process of being re-written, please do not translate it.
+
+If you would like to translate the descriptions for ~~Google Play~~ or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
 
 **And that's it.**  
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7d4d731df1..25602c4ab4 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="io.anuke.mindustry">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
     <uses-feature android:name="android.hardware.type.pc" android:required="false" />
@@ -9,20 +8,22 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-            android:resizeableActivity="false"
+            android:resizeableActivity="true"
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:isGame="true"
+            android:theme="@style/ArcTheme"
             android:usesCleartextTraffic="true"
             android:appCategory="game"
             android:label="@string/app_name"
-            android:theme="@style/ArcTheme" android:fullBackupContent="@xml/backup_rules">
+            android:fullBackupContent="@xml/backup_rules">
         <meta-data android:name="android.max_aspect" android:value="2.1"/>
         <activity
                 android:name="mindustry.android.AndroidLauncher"
                 android:label="@string/app_name"
                 android:screenOrientation="user"
+                android:exported="true"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
 
             <intent-filter>
diff --git a/android/build.gradle b/android/build.gradle
index cf60a2f945..f1dc45aa74 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,13 +4,10 @@ buildscript{
         mavenCentral()
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
     }
 
     dependencies{
-        //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'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 
@@ -20,25 +17,9 @@ configurations{ natives }
 
 repositories{
     mavenCentral()
-    jcenter()
     maven{ url "https://maven.google.com" }
 }
 
-dependencies{
-    implementation project(":core")
-
-    implementation arcModule("backends:backend-android")
-    implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
-
-    natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
-    natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
-    natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
-
-    //android dependencies magically disappear during compilation, thanks gradle!
-    def sdkFile = new File((String)findSdkDir(), "/platforms/android-29/android.jar")
-    if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
-}
-
 task deploy(type: Copy){
     dependsOn "assembleRelease"
 
@@ -48,8 +29,9 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '29.0.3'
-    compileSdkVersion 29
+    namespace = "io.anuke.mindustry"
+    buildToolsVersion = '34.0.0'
+    compileSdk = 34
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -63,6 +45,7 @@ android{
 
         androidTest.setRoot('tests')
     }
+
     packagingOptions{
         exclude 'META-INF/robovm/ios/robovm.xml'
     }
@@ -74,15 +57,17 @@ android{
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 34
         
         versionName versionNameResult
-        versionCode = (System.getenv("TRAVIS_BUILD_ID") != null ? System.getenv("TRAVIS_BUILD_ID").toInteger() : vcode)
+        versionCode = vcode
 
         if(project.hasProperty("release")){
             props['androidBuildCode'] = (vcode + 1).toString()
         }
         props.store(file('../core/assets/version.properties').newWriter(), null)
+
+        multiDexEnabled true
     }
 
     compileOptions{
@@ -90,7 +75,7 @@ android{
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions "google"
+    flavorDimensions = ["google"]
 
     signingConfigs{
         release{
@@ -110,6 +95,18 @@ android{
         }
     }
 
+    buildTypes{
+        all{
+            //TODO without these lines (r8 enabled), Mindustry crashes with missing default interface method errors.
+            //WHY THE HELL ARE DEFAULT INTERFACES NOT BEING DESUGARED? WHY DID UPDATING AGP MAKE THIS HAPPEN?
+            //When I ENABLE shrinking, r8 goes and REMOVES ALL DEFAULT INTERFACE CLASSES, which breaks mods. Why?
+            //-keep class mindustry.** { *; } should *keep the classes* - WHY IS R8 REMOVING THEM?
+            minifyEnabled = true
+            shrinkResources = true
+            proguardFiles("proguard-rules.pro")
+        }
+    }
+
     if(project.hasProperty("RELEASE_STORE_FILE") || System.getenv("CI") == "true"){
         buildTypes{
             release{
@@ -118,9 +115,27 @@ android{
         }
     }
 }
-// called every time gradle gets executed, takes the native dependencies of
-// the natives configuration, and extracts them to the proper libs/ folders
-// so they get packed with the APK.
+
+dependencies{
+    implementation project(":core")
+
+    implementation arcModule("backends:backend-android")
+    implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
+
+    natives "com.github.Anuken.Arc:natives-android:$arcHash"
+    natives "com.github.Anuken.Arc:natives-freetype-android:$arcHash"
+
+    def version;
+    def highestVersion;
+    new File((String)findSdkDir(), "/platforms").eachFileMatch ~/android-\d+/, {
+        version = it.name.find(/\d+/).toInteger();
+        highestVersion = version > highestVersion ? version : highestVersion;
+    }
+
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-${highestVersion}/android.jar")
+    if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
+}
+
 task copyAndroidNatives(){
     configurations.natives.files.each{ jar ->
         copy{
@@ -132,29 +147,13 @@ task copyAndroidNatives(){
 }
 
 task run(type: Exec){
-    def path
-    def localProperties = project.file("../local.properties")
-    if(localProperties.exists()){
-        Properties properties = new Properties()
-        localProperties.withInputStream{ instr ->
-            properties.load(instr)
-        }
-        def sdkDir = properties.getProperty('sdk.dir')
-        if(sdkDir){
-            path = sdkDir
-        }else{
-            path = "$System.env.ANDROID_HOME"
-        }
-    }else{
-        path = "$System.env.ANDROID_HOME"
-    }
-
-    def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
+    commandLine "${findSdkDir()}/platform-tools/adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
 }
 
 if(!project.ext.hasSprites()){
-    println "Scheduling sprite pack."
-    run.dependsOn ":tools:pack"
-    deploy.dependsOn ":tools:pack"
-}
\ No newline at end of file
+    tasks.whenTaskAdded{ task ->
+        if(task.name == 'assembleDebug' || task.name == 'assembleRelease'){
+            task.dependsOn ":tools:pack"
+        }
+    }
+}
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
new file mode 100644
index 0000000000..ebda968ae6
--- /dev/null
+++ b/android/proguard-rules.pro
@@ -0,0 +1,12 @@
+-dontobfuscate
+
+-keep class mindustry.** { *; }
+-keep class arc.** { *; }
+-keep class net.jpountz.** { *; }
+-keep class rhino.** { *; }
+-keep class com.android.dex.** { *; }
+-keepattributes Signature,*Annotation*,InnerClasses,EnclosingMethod
+
+-dontwarn javax.naming.**
+
+#-printusage out.txt
\ No newline at end of file
diff --git a/android/res/values-v21/styles.xml b/android/res/values-v21/styles.xml
index 3076a158ed..9ddd5ffb6c 100644
--- a/android/res/values-v21/styles.xml
+++ b/android/res/values-v21/styles.xml
@@ -8,4 +8,4 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowFullscreen">true</item>
     </style>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index d40cf3accd..d42ffe6d4a 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="app_name">Mindustry</string>
-
 </resources>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 3fe4d7f6a8..ac57c806dd 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -1,5 +1,4 @@
 <resources>
-
     <style name="ArcTheme" parent="android:Theme">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -8,5 +7,4 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowFullscreen">true</item>
     </style>
-
-</resources>
+</resources>
\ No newline at end of file
diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
index 1c9ee8f144..548f1b6078 100644
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -38,20 +38,19 @@ public class AndroidLauncher extends AndroidApplication{
         UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
 
         Thread.setDefaultUncaughtExceptionHandler((thread, error) -> {
-            CrashSender.log(error);
+            CrashHandler.log(error);
 
             //try to forward exception to system handler
             if(handler != null){
                 handler.uncaughtException(thread, error);
             }else{
-                error.printStackTrace();
                 Log.err(error);
                 System.exit(1);
             }
         });
 
         super.onCreate(savedInstanceState);
-        if(doubleScaleTablets && isTablet(this.getContext())){
+        if(doubleScaleTablets && isTablet(this)){
             Scl.setAddition(0.5f);
         }
 
@@ -64,7 +63,7 @@ public class AndroidLauncher extends AndroidApplication{
 
             @Override
             public rhino.Context getScriptContext(){
-                return AndroidRhinoContext.enter(getContext().getCacheDir());
+                return AndroidRhinoContext.enter(getCacheDir());
             }
 
             @Override
@@ -72,9 +71,30 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @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);
+            public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
+                //Required to load jar files in Android 14: https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading
+                jar.file().setReadOnly();
+                return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
+                    @Override
+                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
+                        //check for loaded state
+                        Class<?> loadedClass = findLoadedClass(name);
+                        if(loadedClass == null){
+                            try{
+                                //try to load own class first
+                                loadedClass = findClass(name);
+                            }catch(ClassNotFoundException | NoClassDefFoundError e){
+                                //use parent if not found
+                                return parent.loadClass(name);
+                            }
+                        }
+
+                        if(resolve){
+                            resolveClass(loadedClass);
+                        }
+                        return loadedClass;
+                    }
+                };
             }
 
             @Override
@@ -83,64 +103,69 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             void showFileChooser(boolean open, String title, Cons<Fi> cons, String... extensions){
-                String extension = extensions[0];
+                try{
+                    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 && extensions.length == 1 ? "application/zip" : "*/*");
+                    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 && extensions.length == 1 ? "application/zip" : "*/*");
+                        intent.putExtra(Intent.EXTRA_TITLE, "export." + extension);
 
-                    addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
-                        if(code == Activity.RESULT_OK && in != null && in.getData() != null){
-                            Uri uri = in.getData();
+                        addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
+                            if(code == Activity.RESULT_OK && in != null && in.getData() != null){
+                                Uri uri = in.getData();
 
-                            if(uri.getPath().contains("(invalid)")) return;
+                                if(uri.getPath().contains("(invalid)")) return;
 
-                            Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
-                                @Override
-                                public InputStream read(){
-                                    try{
-                                        return getContentResolver().openInputStream(uri);
-                                    }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+                                Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
+                                    @Override
+                                    public InputStream read(){
+                                        try{
+                                            return getContentResolver().openInputStream(uri);
+                                        }catch(IOException e){
+                                            throw new ArcRuntimeException(e);
+                                        }
                                     }
-                                }
 
-                                @Override
-                                public OutputStream write(boolean append){
-                                    try{
-                                        return getContentResolver().openOutputStream(uri);
-                                    }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+                                    @Override
+                                    public OutputStream write(boolean append){
+                                        try{
+                                            return getContentResolver().openOutputStream(uri);
+                                        }catch(IOException e){
+                                            throw new ArcRuntimeException(e);
+                                        }
                                     }
-                                }
-                            })));
-                        }
-                    });
-                }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
+                                })));
+                            }
+                        });
+                    }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(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
-                        if(!open){
-                            cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
-                        }else{
-                            cons.get(file);
-                        }
-                    });
+                        chooser = new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
+                            if(!open){
+                                cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
+                            }else{
+                                cons.get(file);
+                            }
+                        });
 
-                    ArrayList<String> perms = new ArrayList<>();
-                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-                    }
-                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-                    }
-                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
-                }else{
-                    if(open){
-                        new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                        ArrayList<String> perms = new ArrayList<>();
+                        if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                            perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                        }
+                        if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                            perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+                        }
+                        requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
                     }else{
-                        super.showFileChooser(open, "@open", extension, cons);
+                        if(open){
+                            new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                        }else{
+                            super.showFileChooser(open, "@open", extension, cons);
+                        }
                     }
+                }catch(Throwable error){
+                    Core.app.post(() -> Vars.ui.showException(error));
                 }
             }
 
@@ -162,15 +187,26 @@ public class AndroidLauncher extends AndroidApplication{
         }, new AndroidApplicationConfiguration(){{
             useImmersiveMode = true;
             hideStatusBar = true;
-            stencil = 8;
+            useGL30 = true;
         }});
         checkFiles(getIntent());
 
         try{
             //new external folder
-            Fi data = Core.files.absolute(getContext().getExternalFilesDir(null).getAbsolutePath());
+            Fi data = Core.files.absolute(((Context)this).getExternalFilesDir(null).getAbsolutePath());
             Core.settings.setDataDirectory(data);
 
+            //delete unused cache folder to free up space
+            try{
+                Fi cache = Core.settings.getDataDirectory().child("cache");
+                if(cache.exists()){
+                    cache.deleteDirectory();
+                }
+            }catch(Throwable t){
+                Log.err("Failed to delete cached folder", t);
+            }
+
+
             //move to internal storage if there's no file indicating that it moved
             if(!Core.files.local("files_moved").exists()){
                 Log.info("Moving files to external storage...");
diff --git a/android/src/mindustry/android/AndroidRhinoContext.java b/android/src/mindustry/android/AndroidRhinoContext.java
index d3e80c7427..ab28532941 100644
--- a/android/src/mindustry/android/AndroidRhinoContext.java
+++ b/android/src/mindustry/android/AndroidRhinoContext.java
@@ -13,6 +13,7 @@ import com.android.dx.dex.cf.*;
 import com.android.dx.dex.file.DexFile;
 import com.android.dx.merge.*;
 import dalvik.system.*;
+import mindustry.mod.*;
 import rhino.*;
 
 import java.io.*;
@@ -30,23 +31,6 @@ public class AndroidRhinoContext{
      * @return a context prepared for android
      */
     public static Context enter(File cacheDirectory){
-        if(!SecurityController.hasGlobal())
-            SecurityController.initGlobal(new SecurityController(){
-                @Override
-                public GeneratedClassLoader createClassLoader(ClassLoader classLoader, Object o){
-                    return Context.getCurrentContext().createClassLoader(classLoader);
-                }
-
-                @Override
-                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;
         if(!ContextFactory.hasExplicitGlobal()){
@@ -175,7 +159,7 @@ public class AndroidRhinoContext{
             }catch(IOException e){
                 e.printStackTrace();
             }
-            android.content.Context context = ((AndroidApplication) Core.app).getContext();
+            android.content.Context context = (android.content.Context)((AndroidApplication)Core.app);
             return new DexClassLoader(dexFile.getPath(), VERSION.SDK_INT >= 21 ? context.getCodeCacheDir().getPath() : context.getCacheDir().getAbsolutePath(), null, getParent()).loadClass(name);
         }
 
diff --git a/annotations/src/main/java/mindustry/annotations/Annotations.java b/annotations/src/main/java/mindustry/annotations/Annotations.java
index 88bd457e05..6aa8d5b9d9 100644
--- a/annotations/src/main/java/mindustry/annotations/Annotations.java
+++ b/annotations/src/main/java/mindustry/annotations/Annotations.java
@@ -8,14 +8,12 @@ public class Annotations{
     /** Indicates that a method overrides other methods. */
     @Target({ElementType.METHOD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Replace{
-    }
+    public @interface Replace{}
 
     /** Indicates that a method should be final in all implementing classes. */
     @Target({ElementType.METHOD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Final{
-    }
+    public @interface Final{}
 
     /** Indicates that a field will be interpolated when synced. */
     @Target({ElementType.FIELD})
@@ -30,15 +28,18 @@ public class Annotations{
     /** Indicates that a field will not be read from the server when syncing the local player state. */
     @Target({ElementType.FIELD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface SyncLocal{
+    public @interface SyncLocal{}
+
+    /** Indicates that a field should not be synced to clients (but may still be non-transient) */
+    @Target({ElementType.FIELD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface NoSync{}
 
-    }
 
     /** Indicates that a component field is imported from other components. This means it doesn't actually exist. */
     @Target({ElementType.FIELD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Import{
-    }
+    public @interface Import{}
 
     /** Indicates that a component field is read-only. */
     @Target({ElementType.FIELD, ElementType.METHOD})
@@ -105,8 +106,7 @@ public class Annotations{
     /** Indicates an internal interface for entity components. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface EntityInterface{
-    }
+    public @interface EntityInterface{}
 
     //endregion
     //region misc. utility
@@ -118,7 +118,7 @@ public class Annotations{
         /**
          * The region name to load. Variables can be used:
          * "@" -> block name
-         * "$size" -> block size
+         * "@size" -> block size
          * "#" "#1" "#2" -> index number, for arrays
          * */
         String value();
@@ -145,15 +145,12 @@ public class Annotations{
     /** Indicates that a method should always call its super version. */
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface CallSuper{
-
-    }
+    public @interface CallSuper{}
 
     /** Annotation that allows overriding CallSuper annotation. To be used on method that overrides method with CallSuper annotation from parent class. */
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface OverrideCallSuper{
-    }
+    public @interface OverrideCallSuper{}
 
     //endregion
     //region struct
@@ -161,9 +158,7 @@ public class Annotations{
     /** Marks a class as a special value type struct. Class name must end in 'Struct'. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Struct{
-
-    }
+    public @interface Struct{}
 
     /** Marks a field of a struct. Optional. */
     @Target(ElementType.FIELD)
@@ -177,28 +172,26 @@ public class Annotations{
     //region remote
 
     public enum PacketPriority{
+        /** Does not get handled unless client is connected. */
+        low,
         /** Gets put in a queue and processed if not connected. */
         normal,
         /** Gets handled immediately, regardless of connection status. */
         high,
-        /** Does not get handled unless client is connected. */
-        low
     }
 
     /** A set of two booleans, one specifying server and one specifying client. */
     public enum Loc{
-        /** Method can only be invoked on the client from the server. */
+        /** Server only. */
         server(true, false),
-        /** Method can only be invoked on the server from the client. */
+        /** Client only. */
         client(false, true),
-        /** Method can be invoked from anywhere */
+        /** Both server and client. */
         both(true, true),
         /** Neither server nor client. */
         none(false, false);
 
-        /** If true, this method can be invoked ON clients FROM servers. */
         public final boolean isServer;
-        /** If true, this method can be invoked ON servers FROM clients. */
         public final boolean isClient;
 
         Loc(boolean server, boolean client){
@@ -227,16 +220,16 @@ public class Annotations{
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)
     public @interface Remote{
-        /** Specifies the locations from which this method can be invoked. */
+        /** Specifies the locations from which this method can cause remote invocations (This -> Remote) [Default: Server -> Client]. */
         Loc targets() default Loc.server;
 
-        /** Specifies which methods are generated. Only affects server-to-client methods. */
+        /** Specifies which methods are generated. Only affects server-to-client methods (Server -> Client(s)) [Default: Server -> Client & Server -> All Clients]. */
         Variant variants() default Variant.all;
 
-        /** The local locations where this method is called locally, when invoked. */
+        /** The locations where this method is called locally, when invoked locally (This -> This) [Default: No local invocations]. */
         Loc called() default Loc.none;
 
-        /** Whether to forward this packet to all other clients upon receival. Client only. */
+        /** Whether the server should forward this packet to all other clients upon receival from a client (Client -> Server -> Other Clients). [Default: Don't Forward Client Invocations] */
         boolean forward() default false;
 
         /**
@@ -251,8 +244,7 @@ public class Annotations{
 
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface TypeIOHandler{
-    }
+    public @interface TypeIOHandler{ }
 
     //endregion
 }
diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
index fd2c05dca2..d4a057b368 100644
--- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
@@ -2,15 +2,10 @@ package mindustry.annotations;
 
 import arc.files.*;
 import arc.struct.*;
-import arc.util.Log;
-import arc.util.Log.*;
 import arc.util.*;
+import arc.util.Log.*;
 import com.squareup.javapoet.*;
 import com.sun.source.util.*;
-import com.sun.tools.javac.model.*;
-import com.sun.tools.javac.processing.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.util.*;
 import mindustry.annotations.util.*;
 
 import javax.annotation.processing.*;
@@ -22,7 +17,6 @@ import javax.tools.Diagnostic.*;
 import javax.tools.*;
 import java.io.*;
 import java.lang.annotation.*;
-import java.util.List;
 import java.util.*;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
@@ -31,19 +25,16 @@ public abstract class BaseProcessor extends AbstractProcessor{
     public static final String packageName = "mindustry.gen";
 
     public static Types typeu;
-    public static JavacElements elementu;
+    public static Elements elementu;
     public static Filer filer;
     public static Messager messager;
     public static Trees trees;
-    public static TreeMaker maker;
 
     protected int round;
     protected int rounds = 1;
     protected RoundEnvironment env;
     protected Fi rootDirectory;
 
-    protected Context context;
-
     public static String getMethodName(Element element){
         return ((TypeElement)element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
     }
@@ -100,7 +91,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
     }
 
     public static TypeName tname(String pack, String simple){
-        return ClassName.get(pack, simple );
+        return ClassName.get(pack, simple);
     }
 
     public static TypeName tname(String name){
@@ -132,14 +123,21 @@ public abstract class BaseProcessor extends AbstractProcessor{
     }
 
     public static void write(TypeSpec.Builder builder, Seq<String> imports) throws Exception{
+        builder.superinterfaces.sort(Structs.comparing(t -> t.toString()));
+        builder.methodSpecs.sort(Structs.comparing(m -> m.toString()));
+        builder.fieldSpecs.sort(Structs.comparing(f -> f.name));
+
         JavaFile file = JavaFile.builder(packageName, builder.build()).skipJavaLangImports(true).build();
+        String writeString;
 
         if(imports != null){
+            imports = imports.map(m -> Seq.with(m.split("\n")).sort().toString("\n"));
+            imports.sort();
             String rawSource = file.toString();
             Seq<String> result = new Seq<>();
             for(String s : rawSource.split("\n", -1)){
                 result.add(s);
-                if (s.startsWith("package ")){
+                if(s.startsWith("package ")){
                     result.add("");
                     for (String i : imports){
                         result.add(i);
@@ -147,14 +145,15 @@ public abstract class BaseProcessor extends AbstractProcessor{
                 }
             }
 
-            String out = result.toString("\n");
-            JavaFileObject object = filer.createSourceFile(file.packageName + "." + file.typeSpec.name, file.typeSpec.originatingElements.toArray(new Element[0]));
-            OutputStream stream = object.openOutputStream();
-            stream.write(out.getBytes());
-            stream.close();
+            writeString = result.toString("\n");
         }else{
-            file.writeTo(filer);
+            writeString = file.toString();
         }
+
+        JavaFileObject object = filer.createSourceFile(file.packageName + "." + file.typeSpec.name, file.typeSpec.originatingElements.toArray(new Element[0]));
+        Writer stream = object.openWriter();
+        stream.write(writeString);
+        stream.close();
     }
 
     public Seq<Selement> elements(Class<? extends Annotation> type){
@@ -186,7 +185,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
         Log.err("[CODEGEN ERROR] " + message + ": " + elem);
     }
 
-    public void err(String message, Selement elem){
+    public static void err(String message, Selement elem){
         err(message, elem.e);
     }
 
@@ -194,15 +193,11 @@ public abstract class BaseProcessor extends AbstractProcessor{
     public synchronized void init(ProcessingEnvironment env){
         super.init(env);
 
-        JavacProcessingEnvironment javacProcessingEnv = (JavacProcessingEnvironment)env;
-
         trees = Trees.instance(env);
         typeu = env.getTypeUtils();
-        elementu = javacProcessingEnv.getElementUtils();
+        elementu = env.getElementUtils();
         filer = env.getFiler();
         messager = env.getMessager();
-        context = ((JavacProcessingEnvironment)env).getContext();
-        maker = TreeMaker.instance(javacProcessingEnv.getContext());
 
         Log.level = LogLevel.info;
 
@@ -219,7 +214,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
                 String path = Fi.get(filer.getResource(StandardLocation.CLASS_OUTPUT, "no", "no")
                 .toUri().toURL().toString().substring(OS.isWindows ? 6 : "file:".length()))
                 .parent().parent().parent().parent().parent().parent().parent().toString().replace("%20", " ");
-                rootDirectory = Fi.get(path);
+                rootDirectory = Fi.get(path).parent();
             }catch(IOException e){
                 throw new RuntimeException(e);
             }
diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
index 0bd3aa6b32..4d9ce94869 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
@@ -89,7 +89,7 @@ public class EntityIO{
             st("write.s($L)", revisions.peek().version);
             //write uses most recent revision
             for(RevisionField field : revisions.peek().fields){
-                io(field.type, "this." + field.name);
+                io(field.type, "this." + field.name, false);
             }
         }else{
             //read revision
@@ -107,7 +107,7 @@ public class EntityIO{
                 //add code for reading revision
                 for(RevisionField field : rev.fields){
                     //if the field doesn't exist, the result will be an empty string, it won't get assigned
-                    io(field.type, presentFields.contains(field.name) ? "this." + field.name + " = " : "");
+                    io(field.type, presentFields.contains(field.name) ? "this." + field.name + " = " : "", false);
                 }
             }
 
@@ -118,14 +118,17 @@ public class EntityIO{
         }
     }
 
-    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> syncFields, Seq<Svar> allFields) throws Exception{
+    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> allFields) throws Exception{
         this.method = method;
         this.write = write;
 
         if(write){
             //write uses most recent revision
             for(RevisionField field : revisions.peek().fields){
-                io(field.type, "this." + field.name);
+                Svar var = allFields.find(s -> s.name().equals(field.name));
+                if(var == null || var.has(NoSync.class)) continue;
+
+                io(field.type, "this." + field.name, true);
             }
         }else{
             Revision rev = revisions.peek();
@@ -138,20 +141,22 @@ public class EntityIO{
             //add code for reading revision
             for(RevisionField field : rev.fields){
                 Svar var = allFields.find(s -> s.name().equals(field.name));
+                if(var == null || var.has(NoSync.class)) continue;
                 boolean sf = var.has(SyncField.class), sl = var.has(SyncLocal.class);
 
                 if(sl) cont("if(!islocal)");
 
                 if(sf){
+                    //TODO adding + targetSuf to the assignment fixes units being interpolated incorrectly during physics, but makes interpolation snap instead.
                     st(field.name + lastSuf + " = this." + field.name);
                 }
 
-                io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ");
+                io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ", true);
 
                 if(sl){
                     ncont("else" );
 
-                    io(field.type, "");
+                    io(field.type, "", true);
 
                     //just assign the two values so jumping does not occur on de-possession
                     if(sf){
@@ -216,20 +221,20 @@ public class EntityIO{
         econt();
     }
 
-    private void io(String type, String field) throws Exception{
+    private void io(String type, String field, boolean network) throws Exception{
         type = type.replace("mindustry.gen.", "");
         type = replacements.get(type, type);
 
         if(BaseProcessor.isPrimitive(type)){
             s(type.equals("boolean") ? "bool" : type.charAt(0) + "", field);
-        }else if(instanceOf(type, "mindustry.ctype.Content")){
+        }else if(instanceOf(type, "mindustry.ctype.Content") && !type.equals("mindustry.ai.UnitStance") && !type.equals("mindustry.ai.UnitCommand")){
             if(write){
                 s("s", field + ".id");
             }else{
                 st(field + "mindustry.Vars.content.getByID(mindustry.ctype.ContentType.$L, read.s())", BaseProcessor.simpleName(type).toLowerCase().replace("type", ""));
             }
-        }else if(serializer.writers.containsKey(type) && write){
-            st("$L(write, $L)", serializer.writers.get(type), field);
+        }else if((serializer.writers.containsKey(type) || (network && serializer.netWriters.containsKey(type))) && write){
+            st("$L(write, $L)", network ? serializer.getNetWriter(type, null) : serializer.writers.get(type), field);
         }else if(serializer.mutatorReaders.containsKey(type) && !write && !field.replace(" = ", "").contains(" ") && !field.isEmpty()){
             st("$L$L(read, $L)", field, serializer.mutatorReaders.get(type), field.replace(" = ", ""));
         }else if(serializer.readers.containsKey(type) && !write){
@@ -240,7 +245,7 @@ public class EntityIO{
             if(write){
                 s("i", field + ".length");
                 cont("for(int INDEX = 0; INDEX < $L.length; INDEX ++)", field);
-                io(rawType, field + "[INDEX]");
+                io(rawType, field + "[INDEX]", network);
             }else{
                 String fieldName = field.replace(" = ", "").replace("this.", "");
                 String lenf = fieldName + "_LENGTH";
@@ -249,7 +254,7 @@ public class EntityIO{
                     st("$Lnew $L[$L]", field, type.replace("[]", ""), lenf);
                 }
                 cont("for(int INDEX = 0; INDEX < $L; INDEX ++)", lenf);
-                io(rawType, field.replace(" = ", "[INDEX] = "));
+                io(rawType, field.replace(" = ", "[INDEX] = "), network);
             }
 
             econt();
@@ -261,7 +266,7 @@ public class EntityIO{
                 if(write){
                     s("i", field + ".size");
                     cont("for(int INDEX = 0; INDEX < $L.size; INDEX ++)", field);
-                    io(generic, field + ".get(INDEX)");
+                    io(generic, field + ".get(INDEX)", network);
                 }else{
                     String fieldName = field.replace(" = ", "").replace("this.", "");
                     String lenf = fieldName + "_LENGTH";
@@ -270,7 +275,7 @@ public class EntityIO{
                         st("$L.clear()", field.replace(" = ", ""));
                     }
                     cont("for(int INDEX = 0; INDEX < $L; INDEX ++)", lenf);
-                    io(generic, field.replace(" = ", "_ITEM = ").replace("this.", generic + " "));
+                    io(generic, field.replace(" = ", "_ITEM = ").replace("this.", generic + " "), network);
                     if(!field.isEmpty()){
                         String temp = field.replace(" = ", "_ITEM").replace("this.", "");
                         st("if($L != null) $L.add($L)", temp, field.replace(" = ", ""), temp);
diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
index 8eba0ec683..a6b1d95d67 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
@@ -42,6 +42,7 @@ public class EntityProcess extends BaseProcessor{
     Seq<Selement> allDefs = new Seq<>();
     Seq<Stype> allInterfaces = new Seq<>();
     Seq<TypeSpec.Builder> baseClasses = new Seq<>();
+    ObjectSet<TypeSpec.Builder> baseClassIndexers = new ObjectSet<>();
     ClassSerializer serializer;
 
     {
@@ -101,6 +102,8 @@ public class EntityProcess extends BaseProcessor{
 
                 inter.addJavadoc("Interface for {@link $L}", component.fullName());
 
+                skipDeprecated(inter);
+
                 //implement extra interfaces these components may have, e.g. position
                 for(Stype extraInterface : component.interfaces().select(i -> !isCompInterface(i))){
                     //javapoet completely chokes on this if I add `addSuperInterface` or create the type name with TypeName.get
@@ -132,13 +135,14 @@ public class EntityProcess extends BaseProcessor{
                     .build())).addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT).build());
                 }
 
+                //generate interface getters and setters for all "standard" fields
                 for(Svar field : component.fields().select(e -> !e.is(Modifier.STATIC) && !e.is(Modifier.PRIVATE) && !e.has(Import.class))){
                     String cname = field.name();
 
                     //getter
                     if(!signatures.contains(cname + "()")){
                         inter.addMethod(MethodSpec.methodBuilder(cname).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC)
-                        .addAnnotations(Seq.with(field.annotations()).select(a -> a.toString().contains("Null")).map(AnnotationSpec::get))
+                        .addAnnotations(Seq.with(field.annotations()).select(a -> a.toString().contains("Null") || a.toString().contains("Deprecated")).map(AnnotationSpec::get))
                         .addJavadoc(field.doc() == null ? "" : field.doc())
                         .returns(field.tname()).build());
                     }
@@ -150,7 +154,7 @@ public class EntityProcess extends BaseProcessor{
                         .addJavadoc(field.doc() == null ? "" : field.doc())
                         .addParameter(ParameterSpec.builder(field.tname(), field.name())
                         .addAnnotations(Seq.with(field.annotations())
-                        .select(a -> a.toString().contains("Null")).map(AnnotationSpec::get)).build()).build());
+                        .select(a -> a.toString().contains("Null") || a.toString().contains("Deprecated")).map(AnnotationSpec::get)).build()).build());
                     }
                 }
 
@@ -160,7 +164,7 @@ public class EntityProcess extends BaseProcessor{
                 //SPECIAL CASE: components with EntityDefs don't get a base class! the generated class becomes the base class itself
                 if(component.annotation(Component.class).base()){
 
-                    Seq<Stype> deps = depends.copy().and(component);
+                    Seq<Stype> deps = depends.copy().add(component);
                     baseClassDeps.get(component, ObjectSet::new).addAll(deps);
 
                     //do not generate base classes when the component will generate one itself
@@ -229,9 +233,15 @@ public class EntityProcess extends BaseProcessor{
                 Stype repr = types.first();
                 String groupType = repr.annotation(Component.class).base() ? baseName(repr) : interfaceName(repr);
 
+                String name = group.name().startsWith("g") ? group.name().substring(1) : group.name();
+
                 boolean collides = an.collide();
-                groupDefs.add(new GroupDefinition(group.name().startsWith("g") ? group.name().substring(1) : group.name(),
+                groupDefs.add(new GroupDefinition(name,
                     ClassName.bestGuess(packageName + "." + groupType), types, an.spatial(), an.mapping(), collides));
+
+                TypeSpec.Builder accessor = TypeSpec.interfaceBuilder("IndexableEntity__" + name);
+                accessor.addMethod(MethodSpec.methodBuilder("setIndex__" + name).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).addParameter(int.class, "index").returns(void.class).build());
+                write(accessor);
             }
 
             ObjectMap<String, Selement> usedNames = new ObjectMap<>();
@@ -257,6 +267,8 @@ public class EntityProcess extends BaseProcessor{
                 //get base class type name for extension
                 Stype baseClassType = baseClasses.any() ? baseClasses.first() : null;
                 @Nullable TypeName baseClass = baseClasses.any() ? tname(packageName + "." + baseName(baseClassType)) : null;
+                @Nullable TypeSpec.Builder baseClassBuilder = baseClassType == null ? null : this.baseClasses.find(b -> Reflect.<String>get(b, "name").equals(baseName(baseClassType)));
+                boolean addIndexToBase = baseClassBuilder != null && baseClassIndexers.add(baseClassBuilder);
                 //whether the main class is the base itself
                 boolean typeIsBase = baseClassType != null && type.has(Component.class) && type.annotation(Component.class).base();
 
@@ -273,7 +285,10 @@ public class EntityProcess extends BaseProcessor{
                     name += "Entity";
                 }
 
-                if(ann.legacy()){
+                boolean legacy = ann.legacy();
+
+                if(legacy){
+                    baseClass = tname(packageName + "." + name);
                     name += "Legacy" + Strings.capitalize(type.name());
                 }
 
@@ -330,7 +345,7 @@ public class EntityProcess extends BaseProcessor{
                             fbuilder.initializer(varInitializers.get(f.descString()));
                         }
 
-                        fbuilder.addModifiers(f.has(ReadOnly.class) ? Modifier.PROTECTED : Modifier.PUBLIC);
+                        fbuilder.addModifiers(f.has(ReadOnly.class) || f.is(Modifier.PRIVATE) ? Modifier.PROTECTED : Modifier.PUBLIC);
                         fbuilder.addAnnotations(f.annotations().map(AnnotationSpec::get));
                         FieldSpec spec = fbuilder.build();
 
@@ -338,7 +353,8 @@ public class EntityProcess extends BaseProcessor{
                         boolean isVisible = !f.is(Modifier.STATIC) && !f.is(Modifier.PRIVATE) && !f.has(ReadOnly.class);
 
                         //add the field only if it isn't visible or it wasn't implemented by the base class
-                        if(!isShadowed || !isVisible){
+                        //legacy classes have no extra fields
+                        if((!isShadowed || !isVisible) && !legacy){
                             builder.addField(spec);
                         }
 
@@ -348,7 +364,7 @@ public class EntityProcess extends BaseProcessor{
                         allFields.add(f);
 
                         //add extra sync fields
-                        if(f.has(SyncField.class) && isSync){
+                        if(f.has(SyncField.class) && isSync && !legacy){
                             if(!f.tname().toString().equals("float")) err("All SyncFields must be of type float", f);
 
                             syncedFields.add(f);
@@ -374,17 +390,30 @@ public class EntityProcess extends BaseProcessor{
 
                 syncedFields.sortComparing(Selement::name);
 
-                //override toString method
-                builder.addMethod(MethodSpec.methodBuilder("toString")
+                if(!methods.containsKey("toString()")){
+                    //override toString method
+                    builder.addMethod(MethodSpec.methodBuilder("toString")
                     .addAnnotation(Override.class)
                     .returns(String.class)
                     .addModifiers(Modifier.PUBLIC)
                     .addStatement("return $S + $L", name + "#", "id").build());
+                }
 
                 EntityIO io = new EntityIO(type.name(), builder, allFieldSpecs, serializer, rootDirectory.child("annotations/src/main/resources/revisions").child(type.name()));
                 //entities with no sync comp and no serialization gen no code
                 boolean hasIO = ann.genio() && (components.contains(s -> s.name().contains("Sync")) || ann.serialize());
 
+                TypeSpec.Builder indexBuilder = baseClassBuilder == null ? builder : baseClassBuilder;
+
+                if(baseClassBuilder == null || addIndexToBase){
+                    //implement indexable interfaces.
+                    for(GroupDefinition def : groups){
+                        indexBuilder.addSuperinterface(tname(packageName + ".IndexableEntity__" + def.name));
+                        indexBuilder.addMethod(MethodSpec.methodBuilder("setIndex__" + def.name).addParameter(int.class, "index").addModifiers(Modifier.PUBLIC).addAnnotation(Override.class)
+                        .addCode("index__$L = index;", def.name).build());
+                    }
+                }
+
                 //add all methods from components
                 for(ObjectMap.Entry<String, Seq<Smethod>> entry : methods){
                     if(entry.value.contains(m -> m.has(Replace.class))){
@@ -402,7 +431,7 @@ public class EntityProcess extends BaseProcessor{
                         err("Type " + type + " has multiple components implementing non-void method " + entry.key + ".");
                     }
 
-                    entry.value.sort(Structs.comps(Structs.comparingFloat(m -> m.has(MethodPriority.class) ? m.annotation(MethodPriority.class).value() : 0), Structs.comparing(Selement::name)));
+                    entry.value.sort(Structs.comps(Structs.comparingFloat(m -> m.has(MethodPriority.class) ? m.annotation(MethodPriority.class).value() : 0), Structs.comparing(s -> s.up().getSimpleName().toString())));
 
                     //representative method
                     Smethod first = entry.value.first();
@@ -416,6 +445,7 @@ public class EntityProcess extends BaseProcessor{
                     MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC);
                     //if(isFinal || entry.value.contains(s -> s.has(Final.class))) mbuilder.addModifiers(Modifier.FINAL);
                     if(entry.value.contains(s -> s.has(CallSuper.class))) mbuilder.addAnnotation(CallSuper.class); //add callSuper here if necessary
+                    if(first.has(Nullable.class)) mbuilder.addAnnotation(Nullable.class);
                     if(first.is(Modifier.STATIC)) mbuilder.addModifiers(Modifier.STATIC);
                     mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get));
                     mbuilder.returns(first.retn());
@@ -437,21 +467,31 @@ public class EntityProcess extends BaseProcessor{
                         mbuilder.addStatement("if(added == $L) return", first.name().equals("add"));
 
                         for(GroupDefinition def : groups){
-                            //remove/add from each group, assume imported
-                            mbuilder.addStatement("Groups.$L.$L(this)", def.name, first.name());
+                            if(first.name().equals("add")){
+                                //remove/add from each group, assume imported
+                                mbuilder.addStatement("index__$L = Groups.$L.addIndex(this)", def.name, def.name);
+                            }else{
+                                //remove/add from each group, assume imported
+                                mbuilder.addStatement("Groups.$L.removeIndex(this, index__$L);", def.name, def.name);
+
+                                mbuilder.addStatement("index__$L = -1", def.name);
+                            }
                         }
                     }
 
+                    boolean specialIO = false;
+
                     if(hasIO){
                         //SPECIAL CASE: I/O code
                         //note that serialization is generated even for non-serializing entities for manual usage
                         if((first.name().equals("read") || first.name().equals("write"))){
                             io.write(mbuilder, first.name().equals("write"));
+                            specialIO = true;
                         }
 
                         //SPECIAL CASE: sync I/O code
                         if((first.name().equals("readSync") || first.name().equals("writeSync"))){
-                            io.writeSync(mbuilder, first.name().equals("writeSync"), syncedFields, allFields);
+                            io.writeSync(mbuilder, first.name().equals("writeSync"), allFields);
                         }
 
                         //SPECIAL CASE: sync I/O code for writing to/from a manual buffer
@@ -525,7 +565,9 @@ public class EntityProcess extends BaseProcessor{
                         mbuilder.addStatement("mindustry.gen.Groups.queueFree(($T)this)", Poolable.class);
                     }
 
-                    builder.addMethod(mbuilder.build());
+                    if(!legacy || specialIO){
+                        builder.addMethod(mbuilder.build());
+                    }
                 }
 
                 //add pool reset method and implement Poolable
@@ -533,6 +575,7 @@ public class EntityProcess extends BaseProcessor{
                     builder.addSuperinterface(Poolable.class);
                     //implement reset()
                     MethodSpec.Builder resetBuilder = MethodSpec.methodBuilder("reset").addModifiers(Modifier.PUBLIC);
+                    allFieldSpecs.sortComparing(s -> s.name);
                     for(FieldSpec spec : allFieldSpecs){
                         @Nullable Svar variable = specVariables.get(spec);
                         if(variable != null && variable.isAny(Modifier.STATIC, Modifier.FINAL)) continue;
@@ -560,7 +603,19 @@ public class EntityProcess extends BaseProcessor{
                 .returns(tname(packageName + "." + name))
                 .addStatement(ann.pooled() ? "return Pools.obtain($L.class, " +name +"::new)" : "return new $L()", name).build());
 
-                definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs));
+                skipDeprecated(builder);
+
+                if(!legacy){
+                    TypeSpec.Builder fieldBuilder = baseClassBuilder != null ? baseClassBuilder : builder;
+                    if(addIndexToBase || baseClassBuilder == null){
+                        //add group index int variables
+                        for(GroupDefinition def : groups){
+                            fieldBuilder.addField(FieldSpec.builder(int.class, "index__" + def.name, Modifier.PROTECTED, Modifier.TRANSIENT).initializer("-1").build());
+                        }
+                    }
+                }
+
+                definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy));
             }
 
             //generate groups
@@ -575,16 +630,20 @@ public class EntityProcess extends BaseProcessor{
                 groupsBuilder.addField(ParameterizedTypeName.get(
                     ClassName.bestGuess("mindustry.entities.EntityGroup"), itype), group.name, Modifier.PUBLIC, Modifier.STATIC);
 
-                groupInit.addStatement("$L = new $T<>($L.class, $L, $L)", group.name, groupc, itype, group.spatial, group.mapping);
+                groupInit.addStatement("$L = new $T<>($L.class, $L, $L, (e, pos) -> { if(e instanceof $L.IndexableEntity__$L ix) ix.setIndex__$L(pos); })", group.name, groupc, itype, group.spatial, group.mapping, packageName, group.name, group.name);
             }
 
             //write the groups
             groupsBuilder.addMethod(groupInit.build());
 
+            groupsBuilder.addField(boolean.class, "isClearing", Modifier.PUBLIC, Modifier.STATIC);
+
             MethodSpec.Builder groupClear = MethodSpec.methodBuilder("clear").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+            groupClear.addStatement("isClearing = true");
             for(GroupDefinition group : groupDefs){
                 groupClear.addStatement("$L.clear()", group.name);
             }
+            groupClear.addStatement("isClearing = false");
 
             //write clear
             groupsBuilder.addMethod(groupClear.build());
@@ -665,11 +724,28 @@ 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.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.PUBLIC, Modifier.STATIC).initializer("new ObjectMap<>()").build())
+
+            .addField(FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(IntMap.class), tname(String.class)),
+                "customIdMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new IntMap<>()").build())
+
+            .addMethod(MethodSpec.methodBuilder("register").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .returns(TypeName.get(int.class))
+                .addParameter(String.class, "name").addParameter(Prov.class, "constructor")
+                .addStatement("int next = arc.util.Structs.indexOf(idMap, v -> v == null)")
+                .addStatement("idMap[next] = constructor")
+                .addStatement("nameMap.put(name, constructor)")
+                .addStatement("customIdMap.put(next, name)")
+                .addStatement("return next")
+                .addJavadoc("Use this method for obtaining a classId for custom modded unit types. Only call this once for each type. Modded types should return this id in their overridden classId method.")
+                .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)
                 .returns(TypeName.get(Prov.class)).addParameter(String.class, "name").addStatement("return nameMap.get(name)").build());
 
@@ -698,11 +774,6 @@ public class EntityProcess extends BaseProcessor{
         }else{
             //round 3: generate actual classes and implement interfaces
 
-            //write base classes
-            for(TypeSpec.Builder b : baseClasses){
-                write(b, imports.asArray());
-            }
-
             //implement each definition
             for(EntityDefinition def : definitions){
 
@@ -725,6 +796,14 @@ public class EntityProcess extends BaseProcessor{
 
                     def.builder.addSuperinterface(inter.tname());
 
+                    if(def.legacy) continue;
+
+                    @Nullable TypeSpec.Builder superclass = null;
+
+                    if(def.extend != null){
+                        superclass = baseClasses.find(b -> (packageName + "." + Reflect.get(b, "name")).equals(def.extend.toString()));
+                    }
+
                     //generate getter/setter for each method
                     for(Smethod method : inter.methods()){
                         String var = method.name();
@@ -732,84 +811,47 @@ public class EntityProcess extends BaseProcessor{
                         //make sure it's a real variable AND that the component doesn't already implement it somewhere with custom logic
                         if(field == null || methodNames.contains(method.simpleString())) continue;
 
+                        MethodSpec result = null;
+
                         //getter
                         if(!method.isVoid()){
-                            def.builder.addMethod(MethodSpec.overriding(method.e).addStatement("return " + var).build());
+                            result = MethodSpec.overriding(method.e).addStatement("return " + var).build();
                         }
 
                         //setter
                         if(method.isVoid() && !Seq.with(field.annotations).contains(f -> f.type.toString().equals("@mindustry.annotations.Annotations.ReadOnly"))){
-                            def.builder.addMethod(MethodSpec.overriding(method.e).addStatement("this." + var + " = " + var).build());
+                            result = MethodSpec.overriding(method.e).addStatement("this." + var + " = " + var).build();
                         }
-                    }
-                }
 
-                write(def.builder, imports.asArray());
-            }
+                        //add getter/setter to parent class, if possible. when this happens, skip adding getters setters *here* because they are defined in the superclass.
+                        if(result != null && superclass != null){
+                            FieldSpec superField = Seq.with(superclass.fieldSpecs).find(f -> f.name.equals(var));
 
-            //store nulls
-            TypeSpec.Builder nullsBuilder = TypeSpec.classBuilder("Nulls").addModifiers(Modifier.PUBLIC).addModifiers(Modifier.FINAL);
-
-            //create mock types of all components
-            for(Stype interf : allInterfaces){
-                //indirect interfaces to implement methods for
-                Seq<Stype> dependencies = interf.allInterfaces().and(interf);
-                Seq<Smethod> methods = dependencies.flatMap(Stype::methods);
-                methods.sortComparing(Object::toString);
-
-                //optionally add superclass
-                Stype superclass = dependencies.map(this::interfaceToComp).find(s -> s != null && s.annotation(Component.class).base());
-                //use the base type when the interface being emulated has a base
-                TypeName type = superclass != null && interfaceToComp(interf).annotation(Component.class).base() ? tname(baseName(superclass)) : interf.tname();
-
-                //used method signatures
-                ObjectSet<String> signatures = new ObjectSet<>();
-
-                //create null builder
-                String baseName = interf.name().substring(0, interf.name().length() - 1);
-                String className = "Null" + baseName;
-                TypeSpec.Builder nullBuilder = TypeSpec.classBuilder(className)
-                .addModifiers(Modifier.FINAL);
-
-                nullBuilder.addSuperinterface(interf.tname());
-                if(superclass != null) nullBuilder.superclass(tname(baseName(superclass)));
-
-                for(Smethod method : methods){
-                    String signature = method.toString();
-                    if(signatures.contains(signature)) continue;
-
-                    Stype compType = interfaceToComp(method.type());
-                    MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
-                    builder.addAnnotation(OverrideCallSuper.class); //just in case
-
-                    if(!method.isVoid()){
-                        if(method.name().equals("isNull")){
-                            builder.addStatement("return true");
-                        }else if(method.name().equals("id")){
-                                builder.addStatement("return -1");
-                        }else{
-                            Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(method.name()));
-                            String desc = variable == null ? null : variable.descString();
-                            if(variable == null || !varInitializers.containsKey(desc)){
-                                builder.addStatement("return " + getDefault(method.ret().toString()));
-                            }else{
-                                String init = varInitializers.get(desc);
-                                builder.addStatement("return " + (init.equals("{}") ? "new " + variable.mirror().toString() : "") + init);
+                            //found the right field, try to check for the method already existing now
+                            if(superField != null){
+                                MethodSpec fr = result;
+                                MethodSpec targetMethod = Seq.with(superclass.methodSpecs).find(m -> m.name.equals(var) && m.returnType.equals(fr.returnType));
+                                //if the method isn't added yet, add it. in any case, skip.
+                                if(targetMethod == null){
+                                    superclass.addMethod(result);
+                                }
+                                continue;
                             }
                         }
+
+                        if(result != null){
+                            def.builder.addMethod(result);
+                        }
                     }
-
-                    nullBuilder.addMethod(builder.build());
-
-                    signatures.add(signature);
                 }
 
-                nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build());
-
-                write(nullBuilder);
+                write(def.builder, imports.toSeq());
             }
 
-            write(nullsBuilder);
+            //write base classes last
+            for(TypeSpec.Builder b : baseClasses){
+                write(b, imports.toSeq());
+            }
         }
     }
 
@@ -862,7 +904,7 @@ public class EntityProcess extends BaseProcessor{
                 out.addAll(getDependencies(comp));
             }
 
-            defComponents.put(type, out.asArray());
+            defComponents.put(type, out.toSeq());
         }
 
         return defComponents.get(type);
@@ -889,7 +931,7 @@ public class EntityProcess extends BaseProcessor{
 
             //remove it again just in case
             out.remove(component);
-            componentDependencies.put(component, result.asArray());
+            componentDependencies.put(component, result.toSeq());
         }
 
         return componentDependencies.get(component);
@@ -900,7 +942,7 @@ public class EntityProcess extends BaseProcessor{
     }
 
     String createName(Selement<?> elem){
-        Seq<Stype> comps = types(elem.annotation(EntityDef.class), EntityDef::value).map(this::interfaceToComp);;
+        Seq<Stype> comps = types(elem.annotation(EntityDef.class), EntityDef::value).map(this::interfaceToComp);
         comps.sortComparing(Selement::name);
         return comps.toString("", s -> s.name().replace("Comp", ""));
     }
@@ -914,6 +956,11 @@ public class EntityProcess extends BaseProcessor{
         throw new IllegalArgumentException("Missing types.");
     }
 
+    void skipDeprecated(TypeSpec.Builder builder){
+        //deprecations are irrelevant in generated code
+        builder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"deprecation\"").build());
+    }
+
     class GroupDefinition{
         final String name;
         final ClassName baseType;
@@ -944,9 +991,10 @@ public class EntityProcess extends BaseProcessor{
         final Selement naming;
         final String name;
         final @Nullable TypeName extend;
+        final boolean legacy;
         int classID;
 
-        public EntityDefinition(String name, Builder builder, Selement naming, TypeName extend, Seq<Stype> components, Seq<GroupDefinition> groups, Seq<FieldSpec> fieldSpec){
+        public EntityDefinition(String name, Builder builder, Selement naming, TypeName extend, Seq<Stype> components, Seq<GroupDefinition> groups, Seq<FieldSpec> fieldSpec, boolean legacy){
             this.builder = builder;
             this.name = name;
             this.naming = naming;
@@ -954,6 +1002,7 @@ public class EntityProcess extends BaseProcessor{
             this.components = components;
             this.extend = extend;
             this.fieldSpecs = fieldSpec;
+            this.legacy = legacy;
         }
 
         @Override
diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
index c38570a4d4..64b12ca33d 100644
--- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
@@ -1,5 +1,7 @@
 package mindustry.annotations.impl;
 
+import arc.*;
+import arc.audio.*;
 import arc.files.*;
 import arc.scene.style.*;
 import arc.struct.*;
@@ -20,8 +22,8 @@ public class AssetsProcess extends BaseProcessor{
 
     @Override
     public void process(RoundEnvironment env) throws Exception{
-        processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound");
-        processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music");
+        processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound", true);
+        processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music", false);
         processUI(env.getElementsAnnotatedWith(StyleDefaults.class));
     }
 
@@ -43,7 +45,7 @@ public class AssetsProcess extends BaseProcessor{
 
         texIcons.each((key, val) -> {
             String[] split = val.split("\\|");
-            String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "");
+            String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "").replace("Ui", "");
             if(SourceVersion.isKeyword(name) || name.equals("char")) name += "i";
 
             ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).addJavadoc(String.format("\\u%04x", Integer.parseInt(key))).initializer("'" + ((char)Integer.parseInt(key)) + "'").build());
@@ -55,6 +57,9 @@ public class AssetsProcess extends BaseProcessor{
         ichtype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectIntMap.class, String.class),
             "codes", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectIntMap<>()").build());
 
+        ichtype.addField(FieldSpec.builder(ParameterizedTypeName.get(IntMap.class, String.class),
+            "codeToName", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new IntMap<>()").build());
+
         ObjectSet<String> used = new ObjectSet<>();
 
         for(Jval val : icons.get("glyphs").asArray()){
@@ -65,7 +70,9 @@ public class AssetsProcess extends BaseProcessor{
             int code = val.getInt("code", 0);
             iconcAll.append((char)code);
             ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).addJavadoc(String.format("\\u%04x", code)).initializer("'" + ((char)code) + "'").build());
+
             ichinit.addStatement("codes.put($S, $L)", name, code);
+            ichinit.addStatement("codeToName.put($L, $S)", code, name);
 
             ictype.addField(TextureRegionDrawable.class, name + "Small", Modifier.PUBLIC, Modifier.STATIC);
             icload.addStatement(name + "Small = mindustry.ui.Fonts.getGlyph(mindustry.ui.Fonts.def, (char)" + code + ")");
@@ -87,18 +94,18 @@ public class AssetsProcess extends BaseProcessor{
             filename = filename.substring(0, filename.indexOf("."));
 
             String sfilen = filename;
-            String dtype = p.name().endsWith(".9.png") ? "arc.scene.style.NinePatchDrawable" : "arc.scene.style.TextureRegionDrawable";
+            String dtype = "arc.scene.style.Drawable";
 
             String varname = capitalize(sfilen);
 
             if(SourceVersion.isKeyword(varname)) varname += "s";
 
             type.addField(ClassName.bestGuess(dtype), varname, Modifier.STATIC, Modifier.PUBLIC);
-            load.addStatement(varname + " = (" + dtype + ")arc.Core.atlas.drawable($S)", sfilen);
+            load.addStatement(varname + " = arc.Core.atlas.drawable($S)", sfilen);
         });
 
         for(Element elem : elements){
-            Seq.with(((TypeElement)elem).getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> {
+            Seq.with(elem.getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> {
                 String fname = field.getSimpleName().toString();
                 if(fname.startsWith("default")){
                     loadStyles.addStatement("arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")");
@@ -115,17 +122,40 @@ public class AssetsProcess extends BaseProcessor{
         JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
     }
 
-    void processSounds(String classname, String path, String rtype) throws Exception{
+    void processSounds(String classname, String path, String rtype, boolean genid) throws Exception{
         TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
-        MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
         MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        CodeBlock.Builder staticb = CodeBlock.builder();
+
+        if(genid){
+            type.addField(FieldSpec.builder(IntMap.class, "idToSound", Modifier.STATIC, Modifier.PRIVATE).initializer("new IntMap()").build());
+            type.addField(FieldSpec.builder(ObjectIntMap.class, "soundToId", Modifier.STATIC, Modifier.PRIVATE).initializer("new ObjectIntMap()").build());
+
+            type.addMethod(MethodSpec.methodBuilder("getSoundId")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addParameter(Sound.class, "sound")
+            .returns(int.class)
+            .addStatement("return soundToId.get(sound, -1)").build());
+
+            type.addMethod(MethodSpec.methodBuilder("getSound")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addParameter(int.class, "id")
+            .returns(Sound.class)
+            .addStatement("return (Sound)idToSound.get(id, () -> Sounds.none)").build());
+        }
 
         HashSet<String> names = new HashSet<>();
-        Fi.get(path).walk(p -> {
+        Seq<Fi> files = new Seq<>();
+        Fi.get(path).walk(files::add);
+
+        files.sortComparing(Fi::name);
+        int id = 0;
+
+        for(Fi p : files){
             String name = p.nameWithoutExtension();
 
             if(names.contains(name)){
-                BaseProcessor.err("Duplicate file name: " + p.toString() + "!");
+                BaseProcessor.err("Duplicate file name: " + p + "!");
             }else{
                 names.add(name);
             }
@@ -134,20 +164,29 @@ public class AssetsProcess extends BaseProcessor{
 
             String filepath =  path.substring(path.lastIndexOf("/") + 1) + p.path().substring(p.path().lastIndexOf(path) + path.length());
 
-            String filename = "\"" + filepath + "\"";
-            loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));
+            if(genid){
+                staticb.addStatement("soundToId.put($L, $L)", name, id);
 
-            dispose.addStatement("arc.Core.assets.unload(" + filename + ")");
-            dispose.addStatement(name + " = null");
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
-        });
+                loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; soundToId.put(a, $L); idToSound.put($L, a); }",
+                Core.class, filepath, rtype, name, rtype, id, id);
+            }else{
+                loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; }", Core.class, filepath, rtype, name, rtype);
+            }
+
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
+
+            id ++;
+        }
+
+        if(genid){
+            type.addStaticBlock(staticb.build());
+        }
 
         if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
         }
 
         type.addMethod(loadBegin.build());
-        type.addMethod(dispose.build());
         JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
     }
 
diff --git a/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java b/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java
deleted file mode 100644
index e28ecf13a0..0000000000
--- a/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package mindustry.annotations.impl;
-
-import com.sun.source.tree.*;
-import com.sun.source.util.*;
-import com.sun.tools.javac.code.Scope;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.code.Type.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.tree.JCTree.*;
-import mindustry.annotations.Annotations.*;
-
-import javax.annotation.processing.*;
-import javax.lang.model.*;
-import javax.lang.model.element.*;
-import javax.tools.Diagnostic.*;
-import java.lang.annotation.*;
-import java.util.*;
-
-@SupportedAnnotationTypes({"java.lang.Override"})
-public class CallSuperProcess extends AbstractProcessor{
-    private Trees trees;
-
-    @Override
-    public void init(ProcessingEnvironment pe){
-        super.init(pe);
-        trees = Trees.instance(pe);
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
-        for(Element e : roundEnv.getElementsAnnotatedWith(Override.class)){
-            if(e.getAnnotation(OverrideCallSuper.class) != null) return false;
-
-            CodeAnalyzerTreeScanner codeScanner = new CodeAnalyzerTreeScanner();
-            codeScanner.methodName = e.getSimpleName().toString();
-
-            TreePath tp = trees.getPath(e.getEnclosingElement());
-            codeScanner.scan(tp, trees);
-
-            if(codeScanner.callSuperUsed){
-                List list = codeScanner.method.getBody().getStatements();
-
-                if(!doesCallSuper(list, codeScanner.methodName)){
-                    processingEnv.getMessager().printMessage(Kind.ERROR, "Overriding method '" + codeScanner.methodName + "' must explicitly call super method from its parent class.", e);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private boolean doesCallSuper(List list, String methodName){
-        for(Object object : list){
-            if(object instanceof JCTree.JCExpressionStatement){
-                JCTree.JCExpressionStatement expr = (JCExpressionStatement)object;
-                String exprString = expr.toString();
-                if(exprString.startsWith("super." + methodName) && exprString.endsWith(");")) return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public SourceVersion getSupportedSourceVersion(){
-        return SourceVersion.RELEASE_8;
-    }
-
-    static class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees>{
-        String methodName;
-        MethodTree method;
-        boolean callSuperUsed;
-
-        @Override
-        public Object visitClass(ClassTree classTree, Trees trees){
-            Tree extendTree = classTree.getExtendsClause();
-
-            if(extendTree instanceof JCTypeApply){ //generic classes case
-                JCTypeApply generic = (JCTypeApply)extendTree;
-                extendTree = generic.clazz;
-            }
-
-            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))
-                    return super.visitClass(classTree, trees);
-
-                if(checkSuperTypes((ClassType)tree.type))
-                    return super.visitClass(classTree, trees);
-
-            }
-            callSuperUsed = false;
-
-            return super.visitClass(classTree, trees);
-        }
-
-        public boolean checkSuperTypes(ClassType type){
-            if(type.supertype_field != null && type.supertype_field.tsym != null){
-                if(checkScope(type.supertype_field.tsym.members()))
-                    return true;
-                else
-                    return checkSuperTypes((ClassType)type.supertype_field);
-            }
-
-            return false;
-        }
-
-        @SuppressWarnings("unchecked")
-        public boolean checkScope(Scope members){
-            Iterable<Symbol> it;
-            try{
-                it = (Iterable<Symbol>)members.getClass().getMethod("getElements").invoke(members);
-            }catch(Throwable t){
-                try{
-                    it = (Iterable<Symbol>)members.getClass().getMethod("getSymbols").invoke(members);
-                }catch(Exception e){
-                    throw new RuntimeException(e);
-                }
-            }
-
-            for(Symbol s : it){
-
-                if(s instanceof MethodSymbol){
-                    MethodSymbol ms = (MethodSymbol)s;
-
-                    if(ms.getSimpleName().toString().equals(methodName)){
-                        Annotation annotation = ms.getAnnotation(CallSuper.class);
-                        if(annotation != null){
-                            callSuperUsed = true;
-                            return true;
-                        }
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        @Override
-        public Object visitMethod(MethodTree methodTree, Trees trees){
-            if(methodTree.getName().toString().equals(methodName))
-                method = methodTree;
-
-            return super.visitMethod(methodTree, trees);
-        }
-
-    }
-}
diff --git a/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java b/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java
index 975e1dceee..955587301d 100644
--- a/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java
@@ -1,6 +1,7 @@
 package mindustry.annotations.impl;
 
 import arc.struct.*;
+import arc.util.*;
 import com.squareup.javapoet.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
@@ -63,23 +64,28 @@ public class StructProcess extends BaseProcessor{
                     int size = varSize(var);
                     TypeName varType = var.tname();
                     String varName = var.name();
+                    boolean isBool = varType == TypeName.BOOLEAN;
 
                     //add val param to constructor
                     constructor.addParameter(varType, varName);
 
                     //[get] field(structType) : fieldType
-                    MethodSpec.Builder getter = MethodSpec.methodBuilder(var.name().toString())
+                    MethodSpec.Builder getter = MethodSpec.methodBuilder(var.name())
                     .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
                     .returns(varType)
                     .addParameter(structType, structParam);
                     //[set] field(structType, fieldType) : structType
-                    MethodSpec.Builder setter = MethodSpec.methodBuilder(var.name().toString())
+                    MethodSpec.Builder setter = MethodSpec.methodBuilder(var.name())
                     .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
                     .returns(structType)
                     .addParameter(structType, structParam).addParameter(varType, "value");
 
+                    //field for offset
+                    classBuilder.addField(FieldSpec.builder(structType, "bitMask" + Strings.capitalize(varName), Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
+                        .initializer(!isBool ? "($T)($L)" : "($T)(1L << $L)", structType, isBool ? offset : bitString(offset, size, structTotalSize)).build());
+
                     //[getter]
-                    if(varType == TypeName.BOOLEAN){
+                    if(isBool){
                         //bools: single bit, is simplified
                         getter.addStatement("return ($L & (1L << $L)) != 0", structParam, offset);
                     }else if(varType == TypeName.FLOAT){
@@ -91,25 +97,25 @@ public class StructProcess extends BaseProcessor{
                     }
 
                     //[setter] + [constructor building]
-                    if(varType == TypeName.BOOLEAN){
+                    if(isBool){
                         cons.append(" | (").append(varName).append(" ? ").append("1L << ").append(offset).append("L : 0)");
 
                         //bools: single bit, needs special case to clear things
                         setter.beginControlFlow("if(value)");
-                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
+                        setter.addStatement("return ($T)($L | (1L << $LL))", structType, structParam, offset);
                         setter.nextControlFlow("else");
-                        setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, offset);
+                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
                         setter.endControlFlow();
                     }else if(varType == TypeName.FLOAT){
                         cons.append(" | (").append("(").append(structType).append(")").append("Float.floatToIntBits(").append(varName).append(") << ").append(offset).append("L)");
 
                         //floats: need conversion
-                        setter.addStatement("return ($T)(($L & $L) | (($T)Float.floatToIntBits(value) << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
+                        setter.addStatement("return ($T)(($L & (~$L)) | (($T)Float.floatToIntBits(value) << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
                     }else{
                         cons.append(" | (((").append(structType).append(")").append(varName).append(" << ").append(offset).append("L)").append(" & ").append(bitString(offset, size, structTotalSize)).append(")");
 
                         //bytes, shorts, chars, ints
-                        setter.addStatement("return ($T)(($L & $L) | (($T)value << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
+                        setter.addStatement("return ($T)(($L & (~$L)) | (($T)value << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
                     }
 
                     doc.append("<br>  ").append(varName).append(" [").append(offset).append("..").append(size + offset).append("]\n");
@@ -124,7 +130,7 @@ public class StructProcess extends BaseProcessor{
                 classBuilder.addJavadoc(doc.toString());
 
                 //add constructor final statement + add to class and build
-                constructor.addStatement("return ($T)($L)", structType, cons.toString().substring(3));
+                constructor.addStatement("return ($T)($L)", structType, cons.substring(3));
                 classBuilder.addMethod(constructor.build());
 
                 JavaFile.builder(packageName, classBuilder.build()).build().writeTo(BaseProcessor.filer);
diff --git a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
index d2e3e99c17..b9b2bc9dad 100644
--- a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
@@ -3,7 +3,6 @@ package mindustry.annotations.misc;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.struct.*;
-import arc.struct.ObjectMap.*;
 import com.squareup.javapoet.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
@@ -18,6 +17,7 @@ public class LoadRegionProcessor extends BaseProcessor{
     @Override
     public void process(RoundEnvironment env) throws Exception{
         TypeSpec.Builder regionClass = TypeSpec.classBuilder("ContentRegions")
+            .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"deprecation\"").build())
             .addModifiers(Modifier.PUBLIC);
         MethodSpec.Builder method = MethodSpec.methodBuilder("loadRegions")
             .addParameter(tname("mindustry.ctype.MappableContent"), "content")
@@ -33,10 +33,15 @@ public class LoadRegionProcessor extends BaseProcessor{
             fieldMap.get(field.enclosingType(), Seq::new).add(field);
         }
 
-        for(Entry<Stype, Seq<Svar>> entry : fieldMap){
-            method.beginControlFlow("if(content instanceof $T)", entry.key.tname());
+        Seq<Stype> entries = Seq.with(fieldMap.keys());
+        entries.sortComparing(e -> e.name());
 
-            for(Svar field : entry.value){
+        for(Stype type : entries){
+            Seq<Svar> fields = fieldMap.get(type);
+            fields.sortComparing(s -> s.name());
+            method.beginControlFlow("if(content instanceof $L)", type.fullName());
+
+            for(Svar field : fields){
                 Load an = field.annotation(Load.class);
                 //get # of array dimensions
                 int dims = count(field.mirror().toString(), "[]");
@@ -45,7 +50,7 @@ public class LoadRegionProcessor extends BaseProcessor{
 
                 //not an array
                 if(dims == 0){
-                    method.addStatement("(($T)content).$L = $T.atlas.find($L$L)", entry.key.tname(), field.name(), Core.class, parse(an.value()), fallbackString);
+                    method.addStatement("(($L)content).$L = $T.atlas.find($L$L)", type.fullName(), field.name(), Core.class, parse(an.value()), fallbackString);
                 }else{
                     //is an array, create length string
                     int[] lengths = an.lengths();
@@ -58,7 +63,7 @@ public class LoadRegionProcessor extends BaseProcessor{
                     StringBuilder lengthString = new StringBuilder();
                     for(int value : lengths) lengthString.append("[").append(value).append("]");
 
-                    method.addStatement("(($T)content).$L = new $T$L", entry.key.tname(), field.name(), TextureRegion.class, lengthString.toString());
+                    method.addStatement("(($T)content).$L = new $T$L", type.tname(), field.name(), TextureRegion.class, lengthString.toString());
 
                     for(int i = 0; i < dims; i++){
                         method.beginControlFlow("for(int INDEX$L = 0; INDEX$L < $L; INDEX$L ++)", i, i, lengths[i], i);
@@ -69,7 +74,7 @@ public class LoadRegionProcessor extends BaseProcessor{
                         indexString.append("[INDEX").append(i).append("]");
                     }
 
-                    method.addStatement("(($T)content).$L$L = $T.atlas.find($L$L)", entry.key.tname(), field.name(), indexString.toString(), Core.class, parse(an.value()), fallbackString);
+                    method.addStatement("(($T)content).$L$L = $T.atlas.find($L$L)", type.tname(), field.name(), indexString.toString(), Core.class, parse(an.value()), fallbackString);
 
                     for(int i = 0; i < dims; i++){
                         method.endControlFlow();
diff --git a/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java
index 6e597bd002..a6b2643c61 100644
--- a/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java
@@ -26,7 +26,8 @@ public class LogicStatementProcessor extends BaseProcessor{
         MethodSpec.Builder reader = MethodSpec.methodBuilder("read")
             .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
             .returns(tname("mindustry.logic.LStatement"))
-            .addParameter(String[].class, "tokens");
+            .addParameter(String[].class, "tokens")
+            .addParameter(int.class, "length");
 
         Seq<Stype> types = types(RegisterStatement.class);
 
@@ -76,7 +77,7 @@ public class LogicStatementProcessor extends BaseProcessor{
                     "");
 
                 //reading primitives, strings and enums is supported; nothing else is
-                reader.addStatement("if(tokens.length > $L) result.$L = $L(tokens[$L])",
+                reader.addStatement("if(length > $L) result.$L = $L(tokens[$L])",
                 index + 1,
                 field.name(),
                 field.mirror().toString().equals("java.lang.String") ?
diff --git a/annotations/src/main/java/mindustry/annotations/remote/CallGenerator.java b/annotations/src/main/java/mindustry/annotations/remote/CallGenerator.java
new file mode 100644
index 0000000000..d13d4bae3c
--- /dev/null
+++ b/annotations/src/main/java/mindustry/annotations/remote/CallGenerator.java
@@ -0,0 +1,386 @@
+package mindustry.annotations.remote;
+
+import arc.struct.*;
+import arc.util.io.*;
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+import mindustry.annotations.util.*;
+import mindustry.annotations.util.TypeIOResolver.*;
+
+import javax.lang.model.element.*;
+import java.io.*;
+
+import static mindustry.annotations.BaseProcessor.*;
+
+/** Generates code for writing remote invoke packets on the client and server. */
+public class CallGenerator{
+
+    /** Generates all classes in this list. */
+    public static void generate(ClassSerializer serializer, Seq<MethodEntry> methods) throws IOException{
+        //create builder
+        TypeSpec.Builder callBuilder = TypeSpec.classBuilder(RemoteProcess.callLocation).addModifiers(Modifier.PUBLIC);
+
+        MethodSpec.Builder register = MethodSpec.methodBuilder("registerPackets")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+        //go through each method entry in this class
+        for(MethodEntry ent : methods){
+            //builder for the packet type
+            TypeSpec.Builder packet = TypeSpec.classBuilder(ent.packetClassName)
+            .addModifiers(Modifier.PUBLIC);
+
+            //temporary data to deserialize later
+            packet.addField(FieldSpec.builder(byte[].class, "DATA", Modifier.PRIVATE).initializer("NODATA").build());
+
+            packet.superclass(tname("mindustry.net.Packet"));
+
+            //return the correct priority
+            if(ent.priority != PacketPriority.normal){
+                packet.addMethod(MethodSpec.methodBuilder("getPriority")
+                    .addModifiers(Modifier.PUBLIC)
+                    .addAnnotation(Override.class).returns(int.class).addStatement("return $L", ent.priority.ordinal())
+                .build());
+            }
+
+            //implement read & write methods
+            makeWriter(packet, ent, serializer);
+            makeReader(packet, ent, serializer);
+
+            //generate handlers
+            if(ent.where.isClient){
+                packet.addMethod(writeHandleMethod(ent, false));
+            }
+
+            if(ent.where.isServer){
+                packet.addMethod(writeHandleMethod(ent, true));
+            }
+
+            //register packet
+            register.addStatement("mindustry.net.Net.registerPacket($L.$L::new)", packageName, ent.packetClassName);
+
+            //add fields to the type
+            Seq<Svar> params = ent.element.params();
+            for(int i = 0; i < params.size; i++){
+                if(!ent.where.isServer && i == 0){
+                    continue;
+                }
+
+                Svar param = params.get(i);
+                packet.addField(param.tname(), param.name(), Modifier.PUBLIC);
+            }
+
+            //write the 'send event to all players' variant: always happens for clients, but only happens if 'all' is enabled on the server method
+            if(ent.where.isClient || ent.target.isAll){
+                writeCallMethod(callBuilder, ent, true, false);
+            }
+
+            //write the 'send event to one player' variant, which is only applicable on the server
+            if(ent.where.isServer && ent.target.isOne){
+                writeCallMethod(callBuilder, ent, false, false);
+            }
+
+            //write the forwarded method version
+            if(ent.where.isServer && ent.forward){
+                writeCallMethod(callBuilder, ent, true, true);
+            }
+
+            //write the completed packet class
+            JavaFile.builder(packageName, packet.build()).build().writeTo(BaseProcessor.filer);
+        }
+
+        callBuilder.addMethod(register.build());
+
+        //build and write resulting class
+        TypeSpec spec = callBuilder.build();
+        JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
+    }
+
+    private static void makeWriter(TypeSpec.Builder typespec, MethodEntry ent, ClassSerializer serializer){
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
+            .addParameter(Writes.class, "WRITE")
+            .addModifiers(Modifier.PUBLIC).addAnnotation(Override.class);
+        Seq<Svar> params = ent.element.params();
+
+        for(int i = 0; i < params.size; i++){
+            //first argument is skipped as it is always the player caller
+            if(!ent.where.isServer && i == 0){
+                continue;
+            }
+
+            Svar var = params.get(i);
+
+            //name of parameter
+            String varName = var.name();
+            //name of parameter type
+            String typeName = var.mirror().toString();
+            //special case: method can be called from anywhere to anywhere
+            //thus, only write the player when the SERVER is writing data, since the client is the only one who reads the player anyway
+            boolean writePlayerSkipCheck = ent.where == Loc.both && i == 0;
+
+            if(writePlayerSkipCheck){ //write begin check
+                builder.beginControlFlow("if(mindustry.Vars.net.server())");
+            }
+
+            if(BaseProcessor.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
+                builder.addStatement("WRITE.$L($L)", typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "", varName);
+            }else{
+                //else, try and find a serializer
+                String ser = serializer.getNetWriter(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(ent.element.e, var.mirror(), true));
+
+                if(ser == null){ //make sure a serializer exists!
+                    BaseProcessor.err("No method to write class type: '" + typeName + "'", var);
+                }
+
+                //add statement for writing it
+                builder.addStatement(ser + "(WRITE, " + varName + ")");
+            }
+
+            if(writePlayerSkipCheck){ //write end check
+                builder.endControlFlow();
+            }
+        }
+
+        typespec.addMethod(builder.build());
+    }
+
+    private static void makeReader(TypeSpec.Builder typespec, MethodEntry ent, ClassSerializer serializer){
+        MethodSpec.Builder readbuilder = MethodSpec.methodBuilder("read")
+            .addParameter(Reads.class, "READ")
+            .addParameter(int.class, "LENGTH")
+            .addModifiers(Modifier.PUBLIC).addAnnotation(Override.class);
+
+        //read only into temporary data buffer
+        readbuilder.addStatement("DATA = READ.b(LENGTH)");
+
+        typespec.addMethod(readbuilder.build());
+
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("handled")
+            .addModifiers(Modifier.PUBLIC)
+            .addAnnotation(Override.class);
+
+        //make sure data is present, begin reading it if so
+        builder.addStatement("BAIS.setBytes(DATA)");
+
+        Seq<Svar> params = ent.element.params();
+
+        //go through each parameter
+        for(int i = 0; i < params.size; i++){
+            Svar var = params.get(i);
+
+            //first argument is skipped as it is always the player caller
+            if(!ent.where.isServer && i == 0){
+                continue;
+            }
+
+            //special case: method can be called from anywhere to anywhere
+            //thus, only read the player when the CLIENT is receiving data, since the client is the only one who cares about the player anyway
+            boolean writePlayerSkipCheck = ent.where == Loc.both && i == 0;
+
+            if(writePlayerSkipCheck){ //write begin check
+                builder.beginControlFlow("if(mindustry.Vars.net.client())");
+            }
+
+            //full type name of parameter
+            String typeName = var.mirror().toString();
+            //name of parameter
+            String varName = var.name();
+            //capitalized version of type name for reading primitives
+            String pname = typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "";
+
+            //write primitives automatically
+            if(BaseProcessor.isPrimitive(typeName)){
+                builder.addStatement("$L = READ.$L()", varName, pname);
+            }else{
+                //else, try and find a serializer
+                String ser = serializer.readers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(ent.element.e, var.mirror(), false));
+
+                if(ser == null){ //make sure a serializer exists!
+                    BaseProcessor.err("No read method to read class type '" + typeName + "' in method " + ent.targetMethod + "; " + serializer.readers, var);
+                }
+
+                //add statement for reading it
+                builder.addStatement("$L = $L(READ)", varName, ser);
+            }
+
+            if(writePlayerSkipCheck){ //write end check
+                builder.endControlFlow();
+            }
+        }
+
+        typespec.addMethod(builder.build());
+    }
+
+    /** Creates a specific variant for a method entry. */
+    private static void writeCallMethod(TypeSpec.Builder classBuilder, MethodEntry ent, boolean toAll, boolean forwarded){
+        Smethod elem = ent.element;
+        Seq<Svar> params = elem.params();
+
+        //create builder
+        MethodSpec.Builder method = MethodSpec.methodBuilder(elem.name() + (forwarded ? "__forward" : "")) //add except suffix when forwarding
+        .addModifiers(Modifier.STATIC)
+        .returns(void.class);
+
+        //forwarded methods aren't intended for use, and are not public
+        if(!forwarded){
+            method.addModifiers(Modifier.PUBLIC);
+        }
+
+        //validate client methods to make sure
+        if(ent.where.isClient){
+            if(params.isEmpty()){
+                BaseProcessor.err("Client invoke methods must have a first parameter of type Player", elem);
+                return;
+            }
+
+            if(!params.get(0).mirror().toString().contains("Player")){
+                BaseProcessor.err("Client invoke methods should have a first parameter of type Player", elem);
+                return;
+            }
+        }
+
+        //if toAll is false, it's a 'send to one player' variant, so add the player as a parameter
+        if(!toAll){
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "playerConnection");
+        }
+
+        //add sender to ignore
+        if(forwarded){
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "exceptConnection");
+        }
+
+        //call local method if applicable, shouldn't happen when forwarding method as that already happens by default
+        if(!forwarded && ent.local != Loc.none){
+            //add in local checks
+            if(ent.local != Loc.both){
+                method.beginControlFlow("if(" + getCheckString(ent.local) + " || !mindustry.Vars.net.active())");
+            }
+
+            //concatenate parameters
+            int index = 0;
+            StringBuilder results = new StringBuilder();
+            for(Svar var : params){
+                //special case: calling local-only methods uses the local player
+                if(index == 0 && ent.where == Loc.client){
+                    results.append("mindustry.Vars.player");
+                }else{
+                    results.append(var.name());
+                }
+                if(index != params.size - 1) results.append(", ");
+                index++;
+            }
+
+            //add the statement to call it
+            method.addStatement("$N." + elem.name() + "(" + results + ")",
+            ((TypeElement)elem.up()).getQualifiedName().toString());
+
+            if(ent.local != Loc.both){
+                method.endControlFlow();
+            }
+        }
+
+        //start control flow to check if it's actually client/server so no netcode is called
+        method.beginControlFlow("if(" + getCheckString(ent.where) + ")");
+
+        //add statement to create packet from pool
+        method.addStatement("$1T packet = new $1T()", tname("mindustry.gen." + ent.packetClassName));
+
+        method.addTypeVariables(Seq.with(elem.e.getTypeParameters()).map(BaseProcessor::getTVN));
+
+        for(int i = 0; i < params.size; i++){
+            //first argument is skipped as it is always the player caller
+            if((!ent.where.isServer) && i == 0){
+                continue;
+            }
+
+            Svar var = params.get(i);
+
+            method.addParameter(var.tname(), var.name());
+
+            //name of parameter
+            String varName = var.name();
+            //special case: method can be called from anywhere to anywhere
+            //thus, only write the player when the SERVER is writing data, since the client is the only one who reads it
+            boolean writePlayerSkipCheck = ent.where == Loc.both && i == 0;
+
+            if(writePlayerSkipCheck){ //write begin check
+                method.beginControlFlow("if(mindustry.Vars.net.server())");
+            }
+
+            method.addStatement("packet.$L = $L", varName, varName);
+
+            if(writePlayerSkipCheck){ //write end check
+                method.endControlFlow();
+            }
+        }
+
+        String sendString;
+
+        if(forwarded){ //forward packet
+            if(!ent.local.isClient){ //if the client doesn't get it called locally, forward it back after validation
+                sendString = "mindustry.Vars.net.send(";
+            }else{
+                sendString = "mindustry.Vars.net.sendExcept(exceptConnection, ";
+            }
+        }else if(toAll){ //send to all players / to server
+            sendString = "mindustry.Vars.net.send(";
+        }else{ //send to specific client from server
+            sendString = "playerConnection.send(";
+        }
+
+        //send the actual packet
+        method.addStatement(sendString + "packet, " + (!ent.unreliable) + ")");
+
+
+        //end check for server/client
+        method.endControlFlow();
+
+        //add method to class, finally
+        classBuilder.addMethod(method.build());
+    }
+
+    private static String getCheckString(Loc loc){
+        return
+            loc.isClient && loc.isServer ? "mindustry.Vars.net.server() || mindustry.Vars.net.client()" :
+            loc.isClient ? "mindustry.Vars.net.client()" :
+            loc.isServer ? "mindustry.Vars.net.server()" : "false";
+    }
+
+    /** Generates handleServer / handleClient methods. */
+    public static MethodSpec writeHandleMethod(MethodEntry ent, boolean isClient){
+
+        //create main method builder
+        MethodSpec.Builder builder = MethodSpec.methodBuilder(isClient ? "handleClient" : "handleServer")
+        .addModifiers(Modifier.PUBLIC)
+        .addAnnotation(Override.class)
+        .returns(void.class);
+
+        Smethod elem = ent.element;
+        Seq<Svar> params = elem.params();
+
+        if(!isClient){
+            //add player parameter
+            builder.addParameter(ClassName.get("mindustry.net", "NetConnection"), "con");
+
+            //skip if player is invalid
+            builder.beginControlFlow("if(con.player == null || con.kicked)");
+            builder.addStatement("return");
+            builder.endControlFlow();
+
+            //make sure to use the actual player who sent the packet
+            builder.addStatement("mindustry.gen.Player player = con.player");
+        }
+
+        //execute the relevant method before the forward
+        //if it throws a ValidateException, the method won't be forwarded
+        builder.addStatement("$N." + elem.name() + "(" + params.toString(", ", s -> s.name()) + ")", ((TypeElement)elem.up()).getQualifiedName().toString());
+
+        //call forwarded method, don't forward on the client reader
+        if(ent.forward && ent.where.isServer && !isClient){
+            //call forwarded method
+            builder.addStatement("$L.$L.$L__forward(con, $L)", packageName, ent.className, elem.name(), params.toString(", ", s -> s.name()));
+        }
+
+        return builder.build();
+    }
+}
diff --git a/annotations/src/main/java/mindustry/annotations/remote/ClassEntry.java b/annotations/src/main/java/mindustry/annotations/remote/ClassEntry.java
deleted file mode 100644
index 3474eff468..0000000000
--- a/annotations/src/main/java/mindustry/annotations/remote/ClassEntry.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package mindustry.annotations.remote;
-
-import java.util.ArrayList;
-
-/** Represents a class witha list method entries to include in it. */
-public class ClassEntry{
-    /** All methods in this generated class. */
-    public final ArrayList<MethodEntry> methods = new ArrayList<>();
-    /** Simple class name. */
-    public final String name;
-
-    public ClassEntry(String name){
-        this.name = name;
-    }
-}
diff --git a/annotations/src/main/java/mindustry/annotations/remote/MethodEntry.java b/annotations/src/main/java/mindustry/annotations/remote/MethodEntry.java
index 68ea81dec0..768b373387 100644
--- a/annotations/src/main/java/mindustry/annotations/remote/MethodEntry.java
+++ b/annotations/src/main/java/mindustry/annotations/remote/MethodEntry.java
@@ -1,8 +1,7 @@
 package mindustry.annotations.remote;
 
 import mindustry.annotations.Annotations.*;
-
-import javax.lang.model.element.ExecutableElement;
+import mindustry.annotations.util.*;
 
 /** Class that repesents a remote method to be constructed and put into a class. */
 public class MethodEntry{
@@ -10,6 +9,8 @@ public class MethodEntry{
     public final String className;
     /** Fully qualified target method to call. */
     public final String targetMethod;
+    /** Simple name of the generated packet class. */
+    public final String packetClassName;
     /** Whether this method can be called on a client/server. */
     public final Loc where;
     /**
@@ -26,12 +27,13 @@ public class MethodEntry{
     /** Unique method ID. */
     public final int id;
     /** The element method associated with this entry. */
-    public final ExecutableElement element;
+    public final Smethod element;
     /** The assigned packet priority. Only used in clients. */
     public final PacketPriority priority;
 
-    public MethodEntry(String className, String targetMethod, Loc where, Variant target,
-                       Loc local, boolean unreliable, boolean forward, int id, ExecutableElement element, PacketPriority priority){
+    public MethodEntry(String className, String targetMethod, String packetClassName, Loc where, Variant target,
+                       Loc local, boolean unreliable, boolean forward, int id, Smethod element, PacketPriority priority){
+        this.packetClassName = packetClassName;
         this.className = className;
         this.forward = forward;
         this.targetMethod = targetMethod;
diff --git a/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java b/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java
index b3a473795a..ceceddb8a8 100644
--- a/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java
@@ -1,7 +1,7 @@
 package mindustry.annotations.remote;
 
 import arc.struct.*;
-import com.squareup.javapoet.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
 import mindustry.annotations.util.*;
@@ -9,7 +9,6 @@ import mindustry.annotations.util.TypeIOResolver.*;
 
 import javax.annotation.processing.*;
 import javax.lang.model.element.*;
-import java.util.*;
 
 
 /** The annotation processor for generating remote method call code. */
@@ -18,106 +17,58 @@ import java.util.*;
 "mindustry.annotations.Annotations.TypeIOHandler"
 })
 public class RemoteProcess extends BaseProcessor{
-    /** Maximum size of each event packet. */
-    public static final int maxPacketSize = 8192;
-    /** Warning on top of each autogenerated file. */
-    public static final String autogenWarning = "Autogenerated file. Do not modify!\n";
-
-    /** Name of class that handles reading and invoking packets on the server. */
-    private static final String readServerName = "RemoteReadServer";
-    /** Name of class that handles reading and invoking packets on the client. */
-    private static final String readClientName = "RemoteReadClient";
     /** Simple class name of generated class name. */
-    private static final String callLocation = "Call";
-
-    //class serializers
-    private ClassSerializer serializer;
-    //all elements with the Remote annotation
-    private Seq<Smethod> elements;
-    //map of all classes to generate by name
-    private HashMap<String, ClassEntry> classMap;
-    //list of all method entries
-    private Seq<MethodEntry> methods;
-    //list of all method entries
-    private Seq<ClassEntry> classes;
-
-    {
-        rounds = 2;
-    }
+    public static final String callLocation = "Call";
 
     @Override
     public void process(RoundEnvironment roundEnv) throws Exception{
-        //round 1: find all annotations, generate *writers*
-        if(round == 1){
-            //get serializers
-            serializer = TypeIOResolver.resolve(this);
-            //last method ID used
-            int lastMethodID = 0;
-            //find all elements with the Remote annotation
-            elements = methods(Remote.class);
-            //map of all classes to generate by name
-            classMap = new HashMap<>();
-            //list of all method entries
-            methods = new Seq<>();
-            //list of all method entries
-            classes = new Seq<>();
+        //get serializers
+        //class serializers
+        ClassSerializer serializer = TypeIOResolver.resolve(this);
+        //last method ID used
+        int lastMethodID = 0;
+        //find all elements with the Remote annotation
+        //all elements with the Remote annotation
+        Seq<Smethod> elements = methods(Remote.class);
+        //list of all method entries
+        Seq<MethodEntry> methods = new Seq<>();
 
-            Seq<Smethod> orderedElements = elements.copy();
-            orderedElements.sortComparing(Object::toString);
+        Seq<Smethod> orderedElements = elements.copy();
+        orderedElements.sortComparing(Selement::toString);
 
-            //create methods
-            for(Smethod element : orderedElements){
-                Remote annotation = element.annotation(Remote.class);
+        //create methods
+        for(Smethod element : orderedElements){
+            Remote annotation = element.annotation(Remote.class);
 
-                //check for static
-                if(!element.is(Modifier.STATIC) || !element.is(Modifier.PUBLIC)){
-                    err("All @Remote methods must be public and static: ", element);
-                }
-
-                //can't generate none methods
-                if(annotation.targets() == Loc.none){
-                    err("A @Remote method's targets() cannot be equal to 'none':", element);
-                }
-
-                //get and create class entry if needed
-                if(!classMap.containsKey(callLocation)){
-                    ClassEntry clas = new ClassEntry(callLocation);
-                    classMap.put(callLocation, clas);
-                    classes.add(clas);
-                }
-
-                ClassEntry entry = classMap.get(callLocation);
-
-                //create and add entry
-                MethodEntry method = new MethodEntry(entry.name, BaseProcessor.getMethodName(element.e), annotation.targets(), annotation.variants(),
-                annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++, element.e, annotation.priority());
-
-                entry.methods.add(method);
-                methods.add(method);
+            //check for static
+            if(!element.is(Modifier.STATIC) || !element.is(Modifier.PUBLIC)){
+                err("All @Remote methods must be public and static", element);
             }
 
-            //create read/write generators
-            RemoteWriteGenerator writegen = new RemoteWriteGenerator(serializer);
+            //can't generate none methods
+            if(annotation.targets() == Loc.none){
+                err("A @Remote method's targets() cannot be equal to 'none'", element);
+            }
 
-            //generate the methods to invoke (write)
-            writegen.generateFor(classes, packageName);
-        }else if(round == 2){ //round 2: generate all *readers*
-            RemoteReadGenerator readgen = new RemoteReadGenerator(serializer);
+            String packetName = Strings.capitalize(element.name()) + "CallPacket";
+            int[] index = {1};
 
-            //generate server readers
-            readgen.generateFor(methods.select(method -> method.where.isClient), readServerName, packageName, true);
-            //generate client readers
-            readgen.generateFor(methods.select(method -> method.where.isServer), readClientName, packageName, false);
+            while(methods.contains(m -> m.packetClassName.equals(packetName + (index[0] == 1 ? "" : index[0])))){
+                index[0] ++;
+            }
 
-            //create class for storing unique method hash
-            TypeSpec.Builder hashBuilder = TypeSpec.classBuilder("MethodHash").addModifiers(Modifier.PUBLIC);
-            hashBuilder.addJavadoc(autogenWarning);
-            hashBuilder.addField(FieldSpec.builder(int.class, "HASH", Modifier.STATIC, Modifier.PUBLIC, Modifier.FINAL)
-            .initializer("$1L", Arrays.hashCode(methods.map(m -> m.element).toArray())).build());
+            //create and add entry
+            MethodEntry method = new MethodEntry(
+                callLocation, BaseProcessor.getMethodName(element.e), packetName + (index[0] == 1 ? "" : index[0]),
+                annotation.targets(), annotation.variants(),
+                annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++,
+                element, annotation.priority()
+            );
 
-            //build and write resulting hash class
-            TypeSpec spec = hashBuilder.build();
-            JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
+            methods.add(method);
         }
+
+        //generate the methods to invoke, as well as the packet classes
+        CallGenerator.generate(serializer, methods);
     }
 }
diff --git a/annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java b/annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java
deleted file mode 100644
index 3442843669..0000000000
--- a/annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package mindustry.annotations.remote;
-
-import arc.struct.*;
-import arc.util.io.*;
-import com.squareup.javapoet.*;
-import mindustry.annotations.*;
-import mindustry.annotations.util.TypeIOResolver.*;
-
-import javax.lang.model.element.*;
-
-/** Generates code for reading remote invoke packets on the client and server. */
-public class RemoteReadGenerator{
-    private final ClassSerializer serializers;
-
-    /** Creates a read generator that uses the supplied serializer setup. */
-    public RemoteReadGenerator(ClassSerializer serializers){
-        this.serializers = serializers;
-    }
-
-    /**
-     * Generates a class for reading remote invoke packets.
-     * @param entries List of methods to use.
-     * @param className Simple target class name.
-     * @param packageName Full target package name.
-     * @param needsPlayer Whether this read method requires a reference to the player sender.
-     */
-    public void generateFor(Seq<MethodEntry> entries, String className, String packageName, boolean needsPlayer) throws Exception{
-
-        TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
-        classBuilder.addJavadoc(RemoteProcess.autogenWarning);
-
-        //create main method builder
-        MethodSpec.Builder readMethod = MethodSpec.methodBuilder("readPacket")
-        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-        .addParameter(Reads.class, "read") //buffer to read form
-        .addParameter(int.class, "id") //ID of method type to read
-        .returns(void.class);
-
-        if(needsPlayer){
-            //add player parameter
-            readMethod.addParameter(ClassName.get(packageName, "Player"), "player");
-        }
-
-        CodeBlock.Builder readBlock = CodeBlock.builder(); //start building block of code inside read method
-        boolean started = false; //whether an if() statement has been written yet
-
-        for(MethodEntry entry : entries){
-            //write if check for this entry ID
-            if(!started){
-                started = true;
-                readBlock.beginControlFlow("if(id == " + entry.id + ")");
-            }else{
-                readBlock.nextControlFlow("else if(id == " + entry.id + ")");
-            }
-
-            readBlock.beginControlFlow("try");
-
-            //concatenated list of variable names for method invocation
-            StringBuilder varResult = new StringBuilder();
-
-            //go through each parameter
-            for(int i = 0; i < entry.element.getParameters().size(); i++){
-                VariableElement var = entry.element.getParameters().get(i);
-
-                if(!needsPlayer || i != 0){ //if client, skip first parameter since it's always of type player and doesn't need to be read
-                    //full type name of parameter
-                    String typeName = var.asType().toString();
-                    //name of parameter
-                    String varName = var.getSimpleName().toString();
-                    //captialized version of type name for reading primitives
-                    String pname = typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "";
-
-                    //write primitives automatically
-                    if(BaseProcessor.isPrimitive(typeName)){
-                        readBlock.addStatement("$L $L = read.$L()", typeName, varName, pname);
-                    }else{
-                        //else, try and find a serializer
-                        String ser = serializers.readers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(entry.element, var.asType(), false));
-
-                        if(ser == null){ //make sure a serializer exists!
-                            BaseProcessor.err("No read method to read class type '" + typeName + "' in method " + entry.targetMethod + "; " + serializers.readers, var);
-                            return;
-                        }
-
-                        //add statement for reading it
-                        readBlock.addStatement(typeName + " " + varName + " = " + ser + "(read)");
-                    }
-
-                    //append variable name to string builder
-                    varResult.append(var.getSimpleName());
-                    if(i != entry.element.getParameters().size() - 1) varResult.append(", ");
-                }else{
-                    varResult.append("player");
-                    if(i != entry.element.getParameters().size() - 1) varResult.append(", ");
-                }
-            }
-
-            //execute the relevant method before the forward
-            //if it throws a ValidateException, the method won't be forwarded
-            readBlock.addStatement("$N." + entry.element.getSimpleName() + "(" + varResult.toString() + ")", ((TypeElement)entry.element.getEnclosingElement()).getQualifiedName().toString());
-
-            //call forwarded method, don't forward on the client reader
-            if(entry.forward && entry.where.isServer && needsPlayer){
-                //call forwarded method
-                readBlock.addStatement(packageName + "." + entry.className + "." + entry.element.getSimpleName() +
-                "__forward(player.con" + (varResult.length() == 0 ? "" : ", ") + varResult.toString() + ")");
-            }
-
-            readBlock.nextControlFlow("catch (java.lang.Exception e)");
-            readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to read remote method '" + entry.element.getSimpleName() + "'!\", e)");
-            readBlock.endControlFlow();
-        }
-
-        //end control flow if necessary
-        if(started){
-            readBlock.nextControlFlow("else");
-            readBlock.addStatement("throw new $1N(\"Invalid read method ID: \" + id + \"\")", RuntimeException.class.getName()); //handle invalid method IDs
-            readBlock.endControlFlow();
-        }
-
-        //add block and method to class
-        readMethod.addCode(readBlock.build());
-        classBuilder.addMethod(readMethod.build());
-
-        //build and write resulting class
-        TypeSpec spec = classBuilder.build();
-        JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
-    }
-}
diff --git a/annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java b/annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java
deleted file mode 100644
index 606fe513bd..0000000000
--- a/annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package mindustry.annotations.remote;
-
-import arc.struct.*;
-import arc.util.io.*;
-import com.squareup.javapoet.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.annotations.*;
-import mindustry.annotations.util.TypeIOResolver.*;
-
-import javax.lang.model.element.*;
-import java.io.*;
-
-/** Generates code for writing remote invoke packets on the client and server. */
-public class RemoteWriteGenerator{
-    private final ClassSerializer serializers;
-
-    /** Creates a write generator that uses the supplied serializer setup. */
-    public RemoteWriteGenerator(ClassSerializer serializers){
-        this.serializers = serializers;
-    }
-
-    /** Generates all classes in this list. */
-    public void generateFor(Seq<ClassEntry> entries, String packageName) throws IOException{
-
-        for(ClassEntry entry : entries){
-            //create builder
-            TypeSpec.Builder classBuilder = TypeSpec.classBuilder(entry.name).addModifiers(Modifier.PUBLIC);
-            classBuilder.addJavadoc(RemoteProcess.autogenWarning);
-
-            //add temporary write buffer
-            classBuilder.addField(FieldSpec.builder(ReusableByteOutStream.class, "OUT", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
-            .initializer("new ReusableByteOutStream($L)", RemoteProcess.maxPacketSize).build());
-
-            //add writer for that buffer
-            classBuilder.addField(FieldSpec.builder(Writes.class, "WRITE", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
-            .initializer("new Writes(new $T(OUT))", DataOutputStream.class).build());
-
-            //go through each method entry in this class
-            for(MethodEntry methodEntry : entry.methods){
-                //write the 'send event to all players' variant: always happens for clients, but only happens if 'all' is enabled on the server method
-                if(methodEntry.where.isClient || methodEntry.target.isAll){
-                    writeMethodVariant(classBuilder, methodEntry, true, false);
-                }
-
-                //write the 'send event to one player' variant, which is only applicable on the server
-                if(methodEntry.where.isServer && methodEntry.target.isOne){
-                    writeMethodVariant(classBuilder, methodEntry, false, false);
-                }
-
-                //write the forwarded method version
-                if(methodEntry.where.isServer && methodEntry.forward){
-                    writeMethodVariant(classBuilder, methodEntry, true, true);
-                }
-            }
-
-            //build and write resulting class
-            TypeSpec spec = classBuilder.build();
-            JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
-        }
-    }
-
-    /** Creates a specific variant for a method entry. */
-    private void writeMethodVariant(TypeSpec.Builder classBuilder, MethodEntry methodEntry, boolean toAll, boolean forwarded){
-        ExecutableElement elem = methodEntry.element;
-
-        //create builder
-        MethodSpec.Builder method = MethodSpec.methodBuilder(elem.getSimpleName().toString() + (forwarded ? "__forward" : "")) //add except suffix when forwarding
-        .addModifiers(Modifier.STATIC)
-        .returns(void.class);
-
-        //forwarded methods aren't intended for use, and are not public
-        if(!forwarded){
-            method.addModifiers(Modifier.PUBLIC);
-        }
-
-        //validate client methods to make sure
-        if(methodEntry.where.isClient){
-            if(elem.getParameters().isEmpty()){
-                BaseProcessor.err("Client invoke methods must have a first parameter of type Player", elem);
-                return;
-            }
-
-            if(!elem.getParameters().get(0).asType().toString().contains("Player")){
-                BaseProcessor.err("Client invoke methods should have a first parameter of type Player", elem);
-                return;
-            }
-        }
-
-        //if toAll is false, it's a 'send to one player' variant, so add the player as a parameter
-        if(!toAll){
-            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "playerConnection");
-        }
-
-        //add sender to ignore
-        if(forwarded){
-            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "exceptConnection");
-        }
-
-        //call local method if applicable, shouldn't happen when forwarding method as that already happens by default
-        if(!forwarded && methodEntry.local != Loc.none){
-            //add in local checks
-            if(methodEntry.local != Loc.both){
-                method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !mindustry.Vars.net.active())");
-            }
-
-            //concatenate parameters
-            int index = 0;
-            StringBuilder results = new StringBuilder();
-            for(VariableElement var : elem.getParameters()){
-                //special case: calling local-only methods uses the local player
-                if(index == 0 && methodEntry.where == Loc.client){
-                    results.append("mindustry.Vars.player");
-                }else{
-                    results.append(var.getSimpleName());
-                }
-                if(index != elem.getParameters().size() - 1) results.append(", ");
-                index++;
-            }
-
-            //add the statement to call it
-            method.addStatement("$N." + elem.getSimpleName() + "(" + results.toString() + ")",
-            ((TypeElement)elem.getEnclosingElement()).getQualifiedName().toString());
-
-            if(methodEntry.local != Loc.both){
-                method.endControlFlow();
-            }
-        }
-
-        //start control flow to check if it's actually client/server so no netcode is called
-        method.beginControlFlow("if(" + getCheckString(methodEntry.where) + ")");
-
-        //add statement to create packet from pool
-        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "mindustry.net.Packets.InvokePacket", "arc.util.pooling.Pools");
-        //assign priority
-        method.addStatement("packet.priority = (byte)" + methodEntry.priority.ordinal());
-        //assign method ID
-        method.addStatement("packet.type = (byte)" + methodEntry.id);
-        //reset stream
-        method.addStatement("OUT.reset()");
-
-        method.addTypeVariables(Seq.with(elem.getTypeParameters()).map(BaseProcessor::getTVN));
-
-        for(int i = 0; i < elem.getParameters().size(); i++){
-            //first argument is skipped as it is always the player caller
-            if((!methodEntry.where.isServer/* || methodEntry.mode == Loc.both*/) && i == 0){
-                continue;
-            }
-
-            VariableElement var = elem.getParameters().get(i);
-
-            try{
-                //add parameter to method
-                method.addParameter(TypeName.get(var.asType()), var.getSimpleName().toString());
-            }catch(Throwable t){
-                throw new RuntimeException("Error parsing method " + methodEntry.targetMethod);
-            }
-
-            //name of parameter
-            String varName = var.getSimpleName().toString();
-            //name of parameter type
-            String typeName = var.asType().toString();
-            //captialized version of type name for writing primitives
-            String capName = typeName.equals("byte") ? "" : Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1);
-            //special case: method can be called from anywhere to anywhere
-            //thus, only write the player when the SERVER is writing data, since the client is the only one who reads it
-            boolean writePlayerSkipCheck = methodEntry.where == Loc.both && i == 0;
-
-            if(writePlayerSkipCheck){ //write begin check
-                method.beginControlFlow("if(mindustry.Vars.net.server())");
-            }
-
-            if(BaseProcessor.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
-                method.addStatement("WRITE.$L($L)", typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "", varName);
-            }else{
-                //else, try and find a serializer
-                String ser = serializers.writers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(elem, var.asType(), true));
-
-                if(ser == null){ //make sure a serializer exists!
-                    BaseProcessor.err("No @WriteClass method to write class type: '" + typeName + "'", var);
-                    return;
-                }
-
-                //add statement for writing it
-                method.addStatement(ser + "(WRITE, " + varName + ")");
-            }
-
-            if(writePlayerSkipCheck){ //write end check
-                method.endControlFlow();
-            }
-        }
-
-        //assign packet bytes
-        method.addStatement("packet.bytes = OUT.getBytes()");
-        //assign packet length
-        method.addStatement("packet.length = OUT.size()");
-
-        String sendString;
-
-        if(forwarded){ //forward packet
-            if(!methodEntry.local.isClient){ //if the client doesn't get it called locally, forward it back after validation
-                sendString = "mindustry.Vars.net.send(";
-            }else{
-                sendString = "mindustry.Vars.net.sendExcept(exceptConnection, ";
-            }
-        }else if(toAll){ //send to all players / to server
-            sendString = "mindustry.Vars.net.send(";
-        }else{ //send to specific client from server
-            sendString = "playerConnection.send(";
-        }
-
-        //send the actual packet
-        method.addStatement(sendString + "packet, " +
-        (methodEntry.unreliable ? "mindustry.net.Net.SendMode.udp" : "mindustry.net.Net.SendMode.tcp") + ")");
-
-
-        //end check for server/client
-        method.endControlFlow();
-
-        //add method to class, finally
-        classBuilder.addMethod(method.build());
-    }
-
-    private String getCheckString(Loc loc){
-        return loc.isClient && loc.isServer ? "mindustry.Vars.net.server() || mindustry.Vars.net.client()" :
-        loc.isClient ? "mindustry.Vars.net.client()" :
-        loc.isServer ? "mindustry.Vars.net.server()" : "false";
-    }
-}
diff --git a/annotations/src/main/java/mindustry/annotations/util/AnnotationProxyMaker.java b/annotations/src/main/java/mindustry/annotations/util/AnnotationProxyMaker.java
index c3398f3ae8..64d86a4346 100644
--- a/annotations/src/main/java/mindustry/annotations/util/AnnotationProxyMaker.java
+++ b/annotations/src/main/java/mindustry/annotations/util/AnnotationProxyMaker.java
@@ -7,6 +7,7 @@ import com.sun.tools.javac.code.Attribute.Enum;
 import com.sun.tools.javac.code.Attribute.Error;
 import com.sun.tools.javac.code.Attribute.Visitor;
 import com.sun.tools.javac.code.Attribute.*;
+import com.sun.tools.javac.code.Scope.*;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.ArrayType;
@@ -64,36 +65,13 @@ public class AnnotationProxyMaker{
         LinkedHashMap map = new LinkedHashMap();
         ClassSymbol cl = (ClassSymbol)this.anno.type.tsym;
 
-        //try to use Java 8 API for this if possible
-        try{
-            Class entryClass = Class.forName("com.sun.tools.javac.code.Scope$Entry");
-            Object members = cl.members();
-            Field field = members.getClass().getField("elems");
-            Object elems = field.get(members);
-            Field siblingField = entryClass.getField("sibling");
-            Field symField = entryClass.getField("sym");
-            for(Object currEntry = elems; currEntry != null; currEntry = siblingField.get(currEntry)){
-                handleSymbol((Symbol)symField.get(currEntry), map);
-            }
-
-        }catch(Throwable e){
-            //otherwise try other API
-
-            try{
-                Class lookupClass = Class.forName("com.sun.tools.javac.code.Scope$LookupKind");
-                Field nonRecField = lookupClass.getField("NON_RECURSIVE");
-                Object nonRec = nonRecField.get(null);
-                Scope scope = cl.members();
-                Method getSyms = scope.getClass().getMethod("getSymbols", lookupClass);
-                Iterable<Symbol> it = (Iterable<Symbol>)getSyms.invoke(scope, nonRec);
-                Iterator<Symbol> i = it.iterator();
-                while(i.hasNext()){
-                    handleSymbol(i.next(), map);
+        for(Symbol s : cl.members().getSymbols(LookupKind.NON_RECURSIVE)){
+            if(s.getKind() == ElementKind.METHOD){
+                MethodSymbol var4 = (MethodSymbol)s;
+                Attribute var5 = var4.getDefaultValue();
+                if(var5 != null){
+                    map.put(var4, var5);
                 }
-
-            }catch(Throwable death){
-                //I tried
-                throw new RuntimeException(death);
             }
         }
 
@@ -104,17 +82,6 @@ public class AnnotationProxyMaker{
         return map;
     }
 
-    private void handleSymbol(Symbol sym, LinkedHashMap map){
-
-        if(sym.getKind() == ElementKind.METHOD){
-            MethodSymbol var4 = (MethodSymbol)sym;
-            Attribute var5 = var4.getDefaultValue();
-            if(var5 != null){
-                map.put(var4, var5);
-            }
-        }
-    }
-
     private Object generateValue(MethodSymbol var1, Attribute var2){
         AnnotationProxyMaker.ValueVisitor var3 = new AnnotationProxyMaker.ValueVisitor(var1);
         return var3.getValue(var2);
diff --git a/annotations/src/main/java/mindustry/annotations/util/Selement.java b/annotations/src/main/java/mindustry/annotations/util/Selement.java
index ca7a9ce5ad..c416f83b0a 100644
--- a/annotations/src/main/java/mindustry/annotations/util/Selement.java
+++ b/annotations/src/main/java/mindustry/annotations/util/Selement.java
@@ -12,6 +12,10 @@ import java.lang.Class;
 import java.lang.annotation.*;
 import java.lang.reflect.*;
 
+/**
+ * Wrapper over Element with added utility functions.
+ * I would have preferred to use extension methods for this, but Java doesn't have any.
+ * */
 public class Selement<T extends Element>{
     public final T e;
 
diff --git a/annotations/src/main/java/mindustry/annotations/util/Stype.java b/annotations/src/main/java/mindustry/annotations/util/Stype.java
index 58d08631dd..1b53213733 100644
--- a/annotations/src/main/java/mindustry/annotations/util/Stype.java
+++ b/annotations/src/main/java/mindustry/annotations/util/Stype.java
@@ -25,7 +25,7 @@ public class Stype extends Selement<TypeElement>{
     }
 
     public Seq<Stype> allInterfaces(){
-        return interfaces().flatMap(s -> s.allInterfaces().and(s)).distinct();
+        return interfaces().flatMap(s -> s.allInterfaces().add(s)).distinct();
     }
 
     public Seq<Stype> superclasses(){
@@ -33,7 +33,7 @@ public class Stype extends Selement<TypeElement>{
     }
 
     public Seq<Stype> allSuperclasses(){
-        return superclasses().flatMap(s -> s.allSuperclasses().and(s)).distinct();
+        return superclasses().flatMap(s -> s.allSuperclasses().add(s)).distinct();
     }
 
     public Stype superclass(){
diff --git a/annotations/src/main/java/mindustry/annotations/util/Svar.java b/annotations/src/main/java/mindustry/annotations/util/Svar.java
index 2b74ced930..b160ec6ca0 100644
--- a/annotations/src/main/java/mindustry/annotations/util/Svar.java
+++ b/annotations/src/main/java/mindustry/annotations/util/Svar.java
@@ -1,7 +1,6 @@
 package mindustry.annotations.util;
 
 import com.sun.source.tree.*;
-import com.sun.tools.javac.tree.JCTree.*;
 import mindustry.annotations.*;
 
 import javax.lang.model.element.*;
@@ -16,10 +15,6 @@ public class Svar extends Selement<VariableElement>{
         return up().asType().toString() + "#" + super.toString().replace("mindustry.gen.", "");
     }
 
-    public JCVariableDecl jtree(){
-        return (JCVariableDecl)BaseProcessor.elementu.getTree(e);
-    }
-
     public Stype enclosingType(){
         return new Stype((TypeElement)up());
     }
diff --git a/annotations/src/main/java/mindustry/annotations/util/TypeIOResolver.java b/annotations/src/main/java/mindustry/annotations/util/TypeIOResolver.java
index 4f2b315bf7..2545f6f41e 100644
--- a/annotations/src/main/java/mindustry/annotations/util/TypeIOResolver.java
+++ b/annotations/src/main/java/mindustry/annotations/util/TypeIOResolver.java
@@ -16,7 +16,7 @@ public class TypeIOResolver{
      * Maps fully qualified class names to their serializers.
      */
     public static ClassSerializer resolve(BaseProcessor processor){
-        ClassSerializer out = new ClassSerializer(new ObjectMap<>(), new ObjectMap<>(), new ObjectMap<>());
+        ClassSerializer out = new ClassSerializer(new ObjectMap<>(), new ObjectMap<>(), new ObjectMap<>(), new ObjectMap<>());
         for(Stype type : processor.types(TypeIOHandler.class)){
             //look at all TypeIOHandler methods
             Seq<Smethod> methods = type.methods();
@@ -25,7 +25,10 @@ public class TypeIOResolver{
                     Seq<Svar> params = meth.params();
                     //2 params, second one is type, first is writer
                     if(params.size == 2 && params.first().tname().toString().equals("arc.util.io.Writes")){
-                        out.writers.put(fix(params.get(1).tname().toString()), type.fullName() + "." + meth.name());
+                        //Net suffix indicates that this should only be used for sync operations
+                        ObjectMap<String, String> targetMap = meth.name().endsWith("Net") ? out.netWriters : out.writers;
+
+                        targetMap.put(fix(params.get(1).tname().toString()), type.fullName() + "." + meth.name());
                     }else if(params.size == 1 && params.first().tname().toString().equals("arc.util.io.Reads") && !meth.isVoid()){
                         //1 param, one is reader, returns type
                         out.readers.put(fix(meth.retn().toString()), type.fullName() + "." + meth.name());
@@ -47,12 +50,17 @@ public class TypeIOResolver{
 
     /** Information about read/write methods for class types. */
     public static class ClassSerializer{
-        public final ObjectMap<String, String> writers, readers, mutatorReaders;
+        public final ObjectMap<String, String> writers, readers, mutatorReaders, netWriters;
 
-        public ClassSerializer(ObjectMap<String, String> writers, ObjectMap<String, String> readers, ObjectMap<String, String> mutatorReaders){
+        public ClassSerializer(ObjectMap<String, String> writers, ObjectMap<String, String> readers, ObjectMap<String, String> mutatorReaders, ObjectMap<String, String> netWriters){
             this.writers = writers;
             this.readers = readers;
             this.mutatorReaders = mutatorReaders;
+            this.netWriters = netWriters;
+        }
+
+        public String getNetWriter(String type, String fallback){
+            return netWriters.get(type, writers.get(type, fallback));
         }
     }
 }
diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties
index 293373a9df..0c04c4de0b 100644
--- a/annotations/src/main/resources/classids.properties
+++ b/annotations/src/main/resources/classids.properties
@@ -6,9 +6,12 @@ atrax=1
 beta=30
 block=2
 corvus=24
+elude=45
 flare=3
 gamma=31
+latum=46
 mace=4
+manifold=36
 mega=5
 mindustry.entities.comp.BuildingComp=6
 mindustry.entities.comp.BulletComp=7
@@ -19,18 +22,29 @@ mindustry.entities.comp.LaunchCoreComp=11
 mindustry.entities.comp.PlayerComp=12
 mindustry.entities.comp.PosTeam=27
 mindustry.entities.comp.PosTeamDef=28
+mindustry.entities.comp.PowerGraphComp=41
+mindustry.entities.comp.PowerGraphUpdaterComp=42
 mindustry.entities.comp.PuddleComp=13
+mindustry.entities.comp.WorldLabelComp=35
 mindustry.type.Weather.WeatherStateComp=14
 mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=15
+mindustry.world.blocks.campaign.PayloadLaunchPad.LargeLaunchPayloadComp=34
 mindustry.world.blocks.defense.ForceProjector.ForceDrawComp=22
+missile=39
 mono=16
 nova=17
 oct=26
+osc=44
 poly=18
 pulsar=19
 quad=23
 quasar=32
+renale=47
 risso=20
 spiroct=21
+stell=43
+timed=38
+timedDef=37
 toxopid=33
+vanquish=40
 vela=25
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuildingComp/1.json b/annotations/src/main/resources/revisions/BuildingComp/1.json
new file mode 100644
index 0000000000..2cf0bf73fc
--- /dev/null
+++ b/annotations/src/main/resources/revisions/BuildingComp/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:health,type:float},{name:items,type:mindustry.world.modules.ItemModule},{name:liquids,type:mindustry.world.modules.LiquidModule},{name:power,type:mindustry.world.modules.PowerModule},{name:team,type:mindustry.game.Team},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BulletComp/1.json b/annotations/src/main/resources/revisions/BulletComp/1.json
new file mode 100644
index 0000000000..59ace7faf8
--- /dev/null
+++ b/annotations/src/main/resources/revisions/BulletComp/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:collided,type:arc.struct.IntSeq},{name:damage,type:float},{name:data,type:java.lang.Object},{name:fdata,type:float},{name:lifetime,type:float},{name:owner,type:mindustry.gen.Entityc},{name:rotation,type:float},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:type,type:mindustry.entities.bullet.BulletType},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BulletComp/2.json b/annotations/src/main/resources/revisions/BulletComp/2.json
new file mode 100644
index 0000000000..3a075d3fbf
--- /dev/null
+++ b/annotations/src/main/resources/revisions/BulletComp/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:collided,type:arc.struct.IntSeq},{name:damage,type:float},{name:data,type:java.lang.Object},{name:fdata,type:float},{name:lifetime,type:float},{name:owner,type:mindustry.gen.Entityc},{name:rotation,type:float},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:type,type:mindustry.entities.bullet.BulletType},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/EffectStateComp/6.json b/annotations/src/main/resources/revisions/EffectStateComp/6.json
new file mode 100644
index 0000000000..fbac2089b0
--- /dev/null
+++ b/annotations/src/main/resources/revisions/EffectStateComp/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:color,type:arc.graphics.Color},{name:data,type:java.lang.Object},{name:effect,type:mindustry.entities.Effect},{name:lifetime,type:float},{name:offsetPos,type:float},{name:offsetRot,type:float},{name:offsetX,type:float},{name:offsetY,type:float},{name:parent,type:mindustry.gen.Posc},{name:rotWithParent,type:boolean},{name:rotation,type:float},{name:time,type:float},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/LargeLaunchPayloadComp/0.json b/annotations/src/main/resources/revisions/LargeLaunchPayloadComp/0.json
new file mode 100644
index 0000000000..677d3f93da
--- /dev/null
+++ b/annotations/src/main/resources/revisions/LargeLaunchPayloadComp/0.json
@@ -0,0 +1 @@
+{fields:[{name:lifetime,type:float},{name:payload,type:mindustry.world.blocks.payloads.Payload},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/PlayerComp/1.json b/annotations/src/main/resources/revisions/PlayerComp/1.json
new file mode 100644
index 0000000000..52d4a67cae
--- /dev/null
+++ b/annotations/src/main/resources/revisions/PlayerComp/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:admin,type:boolean},{name:boosting,type:boolean},{name:color,type:arc.graphics.Color},{name:lastCommand,type:mindustry.ai.UnitCommand},{name:mouseX,type:float},{name:mouseY,type:float},{name:name,type:java.lang.String},{name:shooting,type:boolean},{name:team,type:mindustry.game.Team},{name:typing,type:boolean},{name:unit,type:Unit},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/PowerGraphUpdaterComp/0.json b/annotations/src/main/resources/revisions/PowerGraphUpdaterComp/0.json
new file mode 100644
index 0000000000..eaaaeead96
--- /dev/null
+++ b/annotations/src/main/resources/revisions/PowerGraphUpdaterComp/0.json
@@ -0,0 +1 @@
+{fields:[]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/PuddleComp/1.json b/annotations/src/main/resources/revisions/PuddleComp/1.json
new file mode 100644
index 0000000000..2e4c653aed
--- /dev/null
+++ b/annotations/src/main/resources/revisions/PuddleComp/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:amount,type:float},{name:liquid,type:mindustry.type.Liquid},{name:tile,type:mindustry.world.Tile},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/WorldLabelComp/0.json b/annotations/src/main/resources/revisions/WorldLabelComp/0.json
new file mode 100644
index 0000000000..e3d056549b
--- /dev/null
+++ b/annotations/src/main/resources/revisions/WorldLabelComp/0.json
@@ -0,0 +1 @@
+{fields:[{name:flags,type:byte},{name:fontSize,type:float},{name:text,type:java.lang.String},{name:x,type:float},{name:y,type:float},{name:z,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/alpha/2.json b/annotations/src/main/resources/revisions/alpha/2.json
new file mode 100644
index 0000000000..5bf10ed861
--- /dev/null
+++ b/annotations/src/main/resources/revisions/alpha/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/alpha/3.json b/annotations/src/main/resources/revisions/alpha/3.json
new file mode 100644
index 0000000000..08d96484d6
--- /dev/null
+++ b/annotations/src/main/resources/revisions/alpha/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/arkyid/2.json b/annotations/src/main/resources/revisions/arkyid/2.json
new file mode 100644
index 0000000000..5bf10ed861
--- /dev/null
+++ b/annotations/src/main/resources/revisions/arkyid/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/arkyid/3.json b/annotations/src/main/resources/revisions/arkyid/3.json
new file mode 100644
index 0000000000..08d96484d6
--- /dev/null
+++ b/annotations/src/main/resources/revisions/arkyid/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/beta/2.json b/annotations/src/main/resources/revisions/beta/2.json
new file mode 100644
index 0000000000..5bf10ed861
--- /dev/null
+++ b/annotations/src/main/resources/revisions/beta/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/beta/3.json b/annotations/src/main/resources/revisions/beta/3.json
new file mode 100644
index 0000000000..08d96484d6
--- /dev/null
+++ b/annotations/src/main/resources/revisions/beta/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/block/6.json b/annotations/src/main/resources/revisions/block/6.json
new file mode 100644
index 0000000000..2fa2662e57
--- /dev/null
+++ b/annotations/src/main/resources/revisions/block/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/block/7.json b/annotations/src/main/resources/revisions/block/7.json
new file mode 100644
index 0000000000..b4cd846ead
--- /dev/null
+++ b/annotations/src/main/resources/revisions/block/7.json
@@ -0,0 +1 @@
+{version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/corvus/6.json b/annotations/src/main/resources/revisions/corvus/6.json
new file mode 100644
index 0000000000..2fa2662e57
--- /dev/null
+++ b/annotations/src/main/resources/revisions/corvus/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/corvus/7.json b/annotations/src/main/resources/revisions/corvus/7.json
new file mode 100644
index 0000000000..b4cd846ead
--- /dev/null
+++ b/annotations/src/main/resources/revisions/corvus/7.json
@@ -0,0 +1 @@
+{version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/elude/0.json b/annotations/src/main/resources/revisions/elude/0.json
new file mode 100644
index 0000000000..545bb6c8ae
--- /dev/null
+++ b/annotations/src/main/resources/revisions/elude/0.json
@@ -0,0 +1 @@
+{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/flare/6.json b/annotations/src/main/resources/revisions/flare/6.json
new file mode 100644
index 0000000000..2fa2662e57
--- /dev/null
+++ b/annotations/src/main/resources/revisions/flare/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/flare/7.json b/annotations/src/main/resources/revisions/flare/7.json
new file mode 100644
index 0000000000..b4cd846ead
--- /dev/null
+++ b/annotations/src/main/resources/revisions/flare/7.json
@@ -0,0 +1 @@
+{version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/gamma/2.json b/annotations/src/main/resources/revisions/gamma/2.json
new file mode 100644
index 0000000000..5bf10ed861
--- /dev/null
+++ b/annotations/src/main/resources/revisions/gamma/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/gamma/3.json b/annotations/src/main/resources/revisions/gamma/3.json
new file mode 100644
index 0000000000..08d96484d6
--- /dev/null
+++ b/annotations/src/main/resources/revisions/gamma/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/latum/0.json b/annotations/src/main/resources/revisions/latum/0.json
new file mode 100644
index 0000000000..545bb6c8ae
--- /dev/null
+++ b/annotations/src/main/resources/revisions/latum/0.json
@@ -0,0 +1 @@
+{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/mace/6.json b/annotations/src/main/resources/revisions/mace/6.json
new file mode 100644
index 0000000000..625b446d65
--- /dev/null
+++ b/annotations/src/main/resources/revisions/mace/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/mace/7.json b/annotations/src/main/resources/revisions/mace/7.json
new file mode 100644
index 0000000000..e8abc2e3be
--- /dev/null
+++ b/annotations/src/main/resources/revisions/mace/7.json
@@ -0,0 +1 @@
+{version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/manifold/0.json b/annotations/src/main/resources/revisions/manifold/0.json
new file mode 100644
index 0000000000..b478f74a95
--- /dev/null
+++ b/annotations/src/main/resources/revisions/manifold/0.json
@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:building,type:Building},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/manifold/1.json b/annotations/src/main/resources/revisions/manifold/1.json
new file mode 100644
index 0000000000..eefe4cfceb
--- /dev/null
+++ b/annotations/src/main/resources/revisions/manifold/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:building,type:Building},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/mega/4.json b/annotations/src/main/resources/revisions/mega/4.json
new file mode 100644
index 0000000000..647e3ce02a
--- /dev/null
+++ b/annotations/src/main/resources/revisions/mega/4.json
@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/mega/5.json b/annotations/src/main/resources/revisions/mega/5.json
new file mode 100644
index 0000000000..e5d22a0653
--- /dev/null
+++ b/annotations/src/main/resources/revisions/mega/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/missile/0.json b/annotations/src/main/resources/revisions/missile/0.json
new file mode 100644
index 0000000000..f73794e092
--- /dev/null
+++ b/annotations/src/main/resources/revisions/missile/0.json
@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:lifetime,type:float},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/missile/1.json b/annotations/src/main/resources/revisions/missile/1.json
new file mode 100644
index 0000000000..689e36ee9f
--- /dev/null
+++ b/annotations/src/main/resources/revisions/missile/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:lifetime,type:float},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/mono/5.json b/annotations/src/main/resources/revisions/mono/5.json
new file mode 100644
index 0000000000..a914b97628
--- /dev/null
+++ b/annotations/src/main/resources/revisions/mono/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/mono/6.json b/annotations/src/main/resources/revisions/mono/6.json
new file mode 100644
index 0000000000..5ddc80cf2d
--- /dev/null
+++ b/annotations/src/main/resources/revisions/mono/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/nova/4.json b/annotations/src/main/resources/revisions/nova/4.json
new file mode 100644
index 0000000000..2562a5f0c5
--- /dev/null
+++ b/annotations/src/main/resources/revisions/nova/4.json
@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/nova/5.json b/annotations/src/main/resources/revisions/nova/5.json
new file mode 100644
index 0000000000..63fac31e77
--- /dev/null
+++ b/annotations/src/main/resources/revisions/nova/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/oct/4.json b/annotations/src/main/resources/revisions/oct/4.json
new file mode 100644
index 0000000000..647e3ce02a
--- /dev/null
+++ b/annotations/src/main/resources/revisions/oct/4.json
@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/oct/5.json b/annotations/src/main/resources/revisions/oct/5.json
new file mode 100644
index 0000000000..e5d22a0653
--- /dev/null
+++ b/annotations/src/main/resources/revisions/oct/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/osc/0.json b/annotations/src/main/resources/revisions/osc/0.json
new file mode 100644
index 0000000000..545bb6c8ae
--- /dev/null
+++ b/annotations/src/main/resources/revisions/osc/0.json
@@ -0,0 +1 @@
+{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/poly/4.json b/annotations/src/main/resources/revisions/poly/4.json
new file mode 100644
index 0000000000..7d090769e7
--- /dev/null
+++ b/annotations/src/main/resources/revisions/poly/4.json
@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/poly/5.json b/annotations/src/main/resources/revisions/poly/5.json
new file mode 100644
index 0000000000..9a3af67f08
--- /dev/null
+++ b/annotations/src/main/resources/revisions/poly/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/pulsar/2.json b/annotations/src/main/resources/revisions/pulsar/2.json
new file mode 100644
index 0000000000..a3a3b83466
--- /dev/null
+++ b/annotations/src/main/resources/revisions/pulsar/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/pulsar/3.json b/annotations/src/main/resources/revisions/pulsar/3.json
new file mode 100644
index 0000000000..c0289fcd5b
--- /dev/null
+++ b/annotations/src/main/resources/revisions/pulsar/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/quad/5.json b/annotations/src/main/resources/revisions/quad/5.json
new file mode 100644
index 0000000000..b8e94f88a9
--- /dev/null
+++ b/annotations/src/main/resources/revisions/quad/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/quad/6.json b/annotations/src/main/resources/revisions/quad/6.json
new file mode 100644
index 0000000000..68d261dd6c
--- /dev/null
+++ b/annotations/src/main/resources/revisions/quad/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/quasar/2.json b/annotations/src/main/resources/revisions/quasar/2.json
new file mode 100644
index 0000000000..a3a3b83466
--- /dev/null
+++ b/annotations/src/main/resources/revisions/quasar/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/quasar/3.json b/annotations/src/main/resources/revisions/quasar/3.json
new file mode 100644
index 0000000000..c0289fcd5b
--- /dev/null
+++ b/annotations/src/main/resources/revisions/quasar/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/risso/6.json b/annotations/src/main/resources/revisions/risso/6.json
new file mode 100644
index 0000000000..2fa2662e57
--- /dev/null
+++ b/annotations/src/main/resources/revisions/risso/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/risso/7.json b/annotations/src/main/resources/revisions/risso/7.json
new file mode 100644
index 0000000000..b4cd846ead
--- /dev/null
+++ b/annotations/src/main/resources/revisions/risso/7.json
@@ -0,0 +1 @@
+{version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/scuttler/0.json b/annotations/src/main/resources/revisions/scuttler/0.json
new file mode 100644
index 0000000000..7f2885cdcf
--- /dev/null
+++ b/annotations/src/main/resources/revisions/scuttler/0.json
@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/scuttler/1.json b/annotations/src/main/resources/revisions/scuttler/1.json
new file mode 100644
index 0000000000..f9d944421e
--- /dev/null
+++ b/annotations/src/main/resources/revisions/scuttler/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/spiroct/5.json b/annotations/src/main/resources/revisions/spiroct/5.json
new file mode 100644
index 0000000000..a914b97628
--- /dev/null
+++ b/annotations/src/main/resources/revisions/spiroct/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/spiroct/6.json b/annotations/src/main/resources/revisions/spiroct/6.json
new file mode 100644
index 0000000000..5ddc80cf2d
--- /dev/null
+++ b/annotations/src/main/resources/revisions/spiroct/6.json
@@ -0,0 +1 @@
+{version:6,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/stell/0.json b/annotations/src/main/resources/revisions/stell/0.json
new file mode 100644
index 0000000000..545bb6c8ae
--- /dev/null
+++ b/annotations/src/main/resources/revisions/stell/0.json
@@ -0,0 +1 @@
+{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/toxopid/2.json b/annotations/src/main/resources/revisions/toxopid/2.json
new file mode 100644
index 0000000000..5bf10ed861
--- /dev/null
+++ b/annotations/src/main/resources/revisions/toxopid/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/toxopid/3.json b/annotations/src/main/resources/revisions/toxopid/3.json
new file mode 100644
index 0000000000..08d96484d6
--- /dev/null
+++ b/annotations/src/main/resources/revisions/toxopid/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/vanquish/0.json b/annotations/src/main/resources/revisions/vanquish/0.json
new file mode 100644
index 0000000000..7f2885cdcf
--- /dev/null
+++ b/annotations/src/main/resources/revisions/vanquish/0.json
@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/vanquish/1.json b/annotations/src/main/resources/revisions/vanquish/1.json
new file mode 100644
index 0000000000..f9d944421e
--- /dev/null
+++ b/annotations/src/main/resources/revisions/vanquish/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 98744b1358..90e98a89dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,42 +1,48 @@
 buildscript{
     ext{
-        getArcHash = {
-            return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"]
-        }
+        arcHash = property("archash")
 
-        arcHash = getArcHash()
+        localArc = !project.hasProperty("release") && new File(rootDir.parent, 'Arc').exists() && !project.hasProperty("noLocalArc")
+
+        arcModule = { String name ->
+            //skip to last submodule
+            name = name.substring(name.lastIndexOf(':') + 1)
+            return "com.github.Anuken${localArc ? "" : ".Arc"}:$name:$arcHash"
+        }
     }
-    
+
     repositories{
         mavenLocal()
         mavenCentral()
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
         maven{ url 'https://jitpack.io' }
     }
 
     dependencies{
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.11'
-        classpath "com.github.anuken:packr:-SNAPSHOT"
-        classpath "com.github.Anuken.Arc:packer:$arcHash"
-        classpath "com.github.Anuken.Arc:arc-core:$arcHash"
+        classpath arcModule(":extensions:packer")
+        classpath arcModule(":arc-core")
     }
 }
 
+plugins{
+    id "org.jetbrains.kotlin.jvm" version "1.6.0"
+    id "org.jetbrains.kotlin.kapt" version "1.6.0"
+}
+
 allprojects{
-    apply plugin: 'maven'
-    
-    version = 'release'
+    apply plugin: 'maven-publish'
+
+    version = project.hasProperty("packageVersion") ? project.getProperty("packageVersion") : 'release'
     group = 'com.github.Anuken'
 
     ext{
-        versionNumber = '6'
+        versionNumber = '7'
         if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
-        steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
-        rhinoVersion = '2617981f706e50b8753155d8e15e326308be3b22'
+        steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
+        rhinoVersion = '73a812444ac388ac2d94013b5cadc8f70b7ea027'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -46,20 +52,6 @@ allprojects{
             return new File(projectDir.parent, '../Mindustry-Debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
         }
 
-        localArc = {
-            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
-        }
-
-        arcModule = { String name ->
-            if(localArc()){
-                return project(":Arc:$name")
-            }else{
-                //skip to last submodule
-                if(name.contains(':')) name = name.split(':').last()
-                return "com.github.Anuken.Arc:$name:${getArcHash()}"
-            }
-        }
-
         generateDeployName = { String platform ->
             if(platform == "windows"){
                 platform += "64"
@@ -84,13 +76,11 @@ allprojects{
         }
 
         hasSprites = {
-            return new File(rootDir, "core/assets/sprites/sprites.atlas").exists()
+            return new File(rootDir, "core/assets/sprites/sprites.aatls").exists()
         }
 
         getModifierString = {
-            if(versionModifier != "release"){
-                return "[${versionModifier.toUpperCase()}]"
-            }
+            if(versionModifier != "release") return "[${versionModifier.toUpperCase()}]"
             return ""
         }
 
@@ -99,6 +89,10 @@ allprojects{
             return project.getProperties()["buildversion"]
         }
 
+        getCommitHash = {
+            return 'git rev-parse --verify --short HEAD'.execute().text.trim()
+        }
+
         getPackage = {
             return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
         }
@@ -108,8 +102,7 @@ allprojects{
             def v = System.getenv("ANDROID_HOME")
             if(v != null) return v
             //rootDir is null here, amazing. brilliant.
-            def file = new File("local.properties")
-            if(!file.exists()) file = new File("../local.properties")
+            def file = new File(rootDir, "local.properties")
             def props = new Properties().with{p -> p.load(file.newReader()); return p }
             return props.get("sdk.dir")
         }
@@ -117,12 +110,12 @@ allprojects{
         generateLocales = {
             def output = 'en\n'
             def bundles = new File(project(':core').projectDir, 'assets/bundles/')
-            bundles.listFiles().each{ other ->
-                if(other.name == "bundle.properties") return
-                output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
+            bundles.list().sort().each{ name ->
+                if(name == "bundle.properties") return
+                output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
             }
             new File(project(':core').projectDir, 'assets/locales').text = output
-            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().join("\n")
+            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().join("\n")
         }
 
         writeVersion = {
@@ -144,6 +137,10 @@ allprojects{
                 props["number"] = versionNumber
                 props["modifier"] = versionModifier
                 props["build"] = buildid
+                props["commitHash"] = "unknown"
+                if(project.hasProperty("showCommitHash")){
+                    props["commitHash"] = getCommitHash()
+                }
 
                 props.store(pfile.newWriter(), "Autogenerated file. Do not modify.")
             }
@@ -184,7 +181,6 @@ allprojects{
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
         maven{ url 'https://jitpack.io' }
-        jcenter()
     }
 
     task clearCache{
@@ -197,10 +193,21 @@ allprojects{
 
     tasks.withType(JavaCompile){
         targetCompatibility = 8
-        sourceCompatibility = 14
+        sourceCompatibility = JavaVersion.VERSION_17
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
         dependsOn clearCache
+
+        options.forkOptions.jvmArgs += [
+            '--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+            '--add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED'
+        ]
     }
 }
 
@@ -208,26 +215,21 @@ configure(project(":annotations")){
     tasks.withType(JavaCompile){
         targetCompatibility = 8
         sourceCompatibility = 8
+        options.fork = true
     }
 }
 
 //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' }
-        }
+        options.compilerArgs.addAll(['--release', '8'])
     }
 
     tasks.withType(Javadoc){
         options{
             addStringOption('Xdoclint:none', '-quiet')
-            addBooleanOption('-enable-preview', true)
-            addStringOption('-release', '14')
+            addStringOption('-release', '17')
+            encoding('UTF-8')
         }
     }
 }
@@ -239,56 +241,31 @@ project(":desktop"){
 
     dependencies{
         implementation project(":core")
+        implementation arcModule("extensions:discord")
+        implementation arcModule("natives:natives-filedialogs")
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
-        implementation 'com.github.MinnDevelopment:java-discord-rpc:v2.0.1'
 
         if(debugged()) implementation project(":debug")
 
         implementation "com.github.Anuken:steamworks4j:$steamworksVersion"
 
         implementation arcModule("backends:backend-sdl")
-    }
-}
-
-project(":ios"){
-    apply plugin: "java"
-    apply plugin: "robovm"
-
-    task incrementConfig{
-        def vfile = file('robovm.properties')
-        def bversion = getBuildVersion()
-        def props = new Properties()
-        if(vfile.exists()){
-            props.load(new FileInputStream(vfile))
-        }else{
-            props['app.id'] = 'io.anuke.mindustry'
-            props['app.version'] = '6.0'
-            props['app.mainclass'] = 'mindustry.IOSLauncher'
-            props['app.executable'] = 'IOSLauncher'
-            props['app.name'] = 'Mindustry'
-        }
-        
-        props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
-        if(bversion != "custom build"){
-            props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
-        }
-        props.store(vfile.newWriter(), null)
-    }
-
-    dependencies{
-        implementation project(":core")
-
-        implementation arcModule("natives:natives-ios")
-        implementation arcModule("natives:natives-freetype-ios")
-        implementation arcModule("backends:backend-robovm")
-
-        compileOnly project(":annotations")
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
     }
 }
 
 project(":core"){
     apply plugin: "java-library"
+    apply plugin: "kotlin"
+    apply plugin: "kotlin-kapt"
+
+    kapt{
+        javacOptions{
+            option("-source", "17")
+            option("-target", "1.8")
+        }
+    }
 
     compileJava.options.fork = true
 
@@ -316,26 +293,85 @@ project(":core"){
                 }
             }
             def changelogs = file("../fastlane/metadata/android/en-US/changelogs/")
-            new File(changelogs, androidVersion + ".txt").text = (result)
+            changelogs.mkdirs()
+            try{
+                new File(changelogs, androidVersion + ".txt").text = (result)
+            }catch(Exception ignored){
+            }
+        }
+    }
+
+    task sourcesJar(type: Jar, dependsOn: classes){
+        archiveClassifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    task assetsJar(type: Jar, dependsOn: ":tools:pack"){
+        archiveClassifier = 'assets'
+        from files("assets"){
+            exclude "config", "cache", "music", "sounds", "sprites/fallback"
+        }
+    }
+
+    task musicJar(type: Jar){
+        archiveClassifier = 'music'
+        from files("assets"){
+            include "music/*", "sounds/*"
         }
     }
 
     dependencies{
         compileJava.dependsOn(preGen)
 
-        api "org.lz4:lz4-java:1.4.1"
+        api "org.lz4:lz4-java:1.8.0"
         api arcModule("arc-core")
+        api arcModule("extensions:flabel")
         api arcModule("extensions:freetype")
         api arcModule("extensions:g3d")
         api arcModule("extensions:fx")
         api arcModule("extensions:arcnet")
+        implementation arcModule("extensions:filedialogs")
         api "com.github.Anuken:rhino:$rhinoVersion"
-        if(localArc() && debugged()) api arcModule("extensions:recorder")
+        if(localArc && debugged()) api arcModule("extensions:recorder")
+        if(localArc) api arcModule(":extensions:packer")
 
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
         compileOnly project(":annotations")
-        annotationProcessor project(":annotations")
-        annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd'
+        if(!project.hasProperty("noKapt")) kapt project(":annotations")
+    }
 
+    afterEvaluate{
+        task mergedJavadoc(type: Javadoc){
+            def blacklist = [project(":ios"), project(":desktop"), project(":server"), project(":annotations")]
+            if(findProject(":android") != null){
+                blacklist += project(":android")
+            }
+
+            source rootProject.subprojects.collect{ project ->
+                if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
+                    return project.sourceSets.main.allJava
+                }
+            }
+
+            classpath = files(rootProject.subprojects.collect { project ->
+                if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
+                    return project.sourceSets.main.compileClasspath
+                }
+            })
+            destinationDir = new File(buildDir, 'javadoc')
+        }
+    }
+
+    gradle.taskGraph.whenReady{
+        //these are completely unnecessary
+        tasks.kaptGenerateStubsKotlin.onlyIf{ false }
+        tasks.compileKotlin.onlyIf{ false }
+        tasks.inspectClassesForKotlinIC.onlyIf{ false }
+    }
+
+    //comp** classes are only used for code generation
+    jar{
+        exclude("mindustry/entities/comp/**")
     }
 }
 
@@ -345,6 +381,7 @@ project(":server"){
     dependencies{
         implementation project(":core")
         implementation arcModule("backends:backend-headless")
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
     }
 }
 
@@ -353,16 +390,19 @@ project(":tests"){
 
     dependencies{
         testImplementation project(":core")
-        testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1"
-        testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
+        testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
         testImplementation arcModule("backends:backend-headless")
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
+        testImplementation "org.json:json:20230618"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
     }
 
     test{
+        //fork every test so mods don't interact with each other
+        forkEvery = 1
         useJUnitPlatform()
         workingDir = new File("../core/assets")
-        testLogging {
+        testLogging{
             exceptionFormat = 'full'
             showStandardStreams = true
         }
@@ -378,6 +418,9 @@ project(":tools"){
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
         implementation arcModule("backends:backend-headless")
+
+        implementation("com.google.guava:guava:33.3.1-jre")
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
     }
 }
 
@@ -386,7 +429,25 @@ project(":annotations"){
 
     dependencies{
         implementation 'com.squareup:javapoet:1.12.1'
-        implementation "com.github.Anuken.Arc:arc-core:$arcHash"
+        implementation arcModule("arc-core")
+    }
+}
+
+configure([":core", ":server"].collect{project(it)}){
+    java{
+        withJavadocJar()
+        withSourcesJar()
+    }
+
+    publishing{
+        publications{
+            maven(MavenPublication){
+                from components.java
+                if(project.name == "core"){
+                    artifact(tasks.named("assetsJar"))
+                }
+            }
+        }
     }
 }
 
@@ -407,6 +468,17 @@ task deployAll{
     dependsOn "desktop:packrWindows64"
     dependsOn "desktop:packrWindows32"
     dependsOn "desktop:packrMacOS"
-    dependsOn "server:deploy"
-    dependsOn "android:deploy"
+    if(versionModifier != "steam"){
+        dependsOn "server:deploy"
+        dependsOn "android:deploy"
+    }
+}
+
+task resolveDependencies{
+    doLast{
+        rootProject.allprojects{ project ->
+            Set<Configuration> configurations = project.buildscript.configurations + project.configurations
+            configurations.findAll{c -> c.canBeResolved}.forEach{c -> c.resolve()}
+        }
+    }
 }
diff --git a/core/assets-raw/fontgen/config.json b/core/assets-raw/fontgen/config.json
index 0a31462a8d..dffb86e36f 100644
--- a/core/assets-raw/fontgen/config.json
+++ b/core/assets-raw/fontgen/config.json
@@ -1055,6 +1055,20 @@
       "search": [
         "defense"
       ]
+    },
+    {
+      "uid": "99aa5c8f6bbe4d96a3f422a60ff065a9",
+      "css": "planet",
+      "code": 59443,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M343.8 0L312.5 31.3 281.3 62.5 218.8 62.5 187.5 93.8 156.3 125 125 156.3 93.8 187.5 62.5 218.8 62.5 281.3 31.3 312.5 0 343.8 0 406.3 0 468.8 0 531.3 0 593.8 0 656.3 31.3 687.5 62.5 718.8 62.5 781.3 93.8 812.5 125 843.8 156.3 875 187.5 906.3 218.8 937.5 281.3 937.5 312.5 968.8 343.8 1000 406.3 1000 468.8 1000 531.3 1000 593.8 1000 656.3 1000 687.5 968.8 718.8 937.5 781.3 937.5 812.5 906.3 843.8 875 875 843.8 906.3 812.5 937.5 781.3 937.5 718.8 968.8 687.5 1000 656.3 1000 593.8 1000 531.3 1000 468.8 1000 406.3 1000 343.8 968.8 312.5 937.5 281.3 937.5 218.8 906.3 187.5 875 156.3 843.8 125 812.5 93.8 781.3 62.5 718.8 62.5 687.5 31.3 656.3 0 593.8 0 531.3 0 468.8 0 406.3 0 343.8 0ZM406.3 62.5L437.5 93.8 468.8 125 531.3 125 562.5 156.3 562.5 218.8 593.8 250 625 281.3 656.3 312.5 687.5 343.8 718.8 375 781.3 375 843.8 375 906.3 375 937.5 406.3 937.5 468.8 937.5 531.3 937.5 593.8 906.3 625 875 656.3 875 718.8 843.8 750 812.5 781.3 781.3 812.5 750 843.8 718.8 875 656.3 875 625 906.3 593.8 937.5 531.3 937.5 500 906.3 468.8 875 437.5 843.8 437.5 781.3 468.8 750 500 718.8 531.3 687.5 562.5 656.3 562.5 593.8 562.5 531.3 531.3 500 500 468.8 468.8 437.5 406.3 437.5 343.8 437.5 281.3 437.5 250 468.8 218.8 500 187.5 531.3 156.3 562.5 125 593.8 93.8 625 62.5 593.8 62.5 531.3 62.5 468.8 62.5 406.3 93.8 375 125 343.8 125 281.3 156.3 250 187.5 218.8 218.8 187.5 250 156.3 281.3 125 343.8 125 375 93.8 406.3 62.5ZM718.8 562.5L687.5 593.8 687.5 656.3 718.8 687.5 781.3 687.5 812.5 656.3 812.5 593.8 781.3 562.5 718.8 562.5Z",
+        "width": 1000
+      },
+      "search": [
+        "planet"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/core/assets-raw/fontgen/extra/admin.svg b/core/assets-raw/fontgen/extra/admin.svg
index 03b33386b8..998fabfb62 100644
--- a/core/assets-raw/fontgen/extra/admin.svg
+++ b/core/assets-raw/fontgen/extra/admin.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns: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"
-   width="12"
-   height="12"
-   version="1.1"
-   id="svg380"
-   sodipodi:docname="admin.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
+        height="12"
+        version="1.1"
+        id="svg380"
+        sodipodi:docname="admin.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata386">
     <rdf:RDF>
diff --git a/core/assets-raw/fontgen/extra/distribution.svg b/core/assets-raw/fontgen/extra/distribution.svg
index 63d50541d0..79610d87e9 100644
--- a/core/assets-raw/fontgen/extra/distribution.svg
+++ b/core/assets-raw/fontgen/extra/distribution.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns: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"
-   width="10"
-   height="10"
-   version="1.1"
-   id="svg192"
-   sodipodi:docname="distribution.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
+        height="10"
+        version="1.1"
+        id="svg192"
+        sodipodi:docname="distribution.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata198">
     <rdf:RDF>
diff --git a/core/assets-raw/fontgen/extra/effect.svg b/core/assets-raw/fontgen/extra/effect.svg
index 2194e8953e..1bf4efdb86 100644
--- a/core/assets-raw/fontgen/extra/effect.svg
+++ b/core/assets-raw/fontgen/extra/effect.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns: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"
-   width="10"
-   height="10"
-   version="1.1"
-   id="svg252"
-   sodipodi:docname="effect.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
+        height="10"
+        version="1.1"
+        id="svg252"
+        sodipodi:docname="effect.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata258">
     <rdf:RDF>
diff --git a/core/assets-raw/fontgen/extra/file-image.svg b/core/assets-raw/fontgen/extra/file-image.svg
index 37d149a2e4..a0f2775d19 100644
--- a/core/assets-raw/fontgen/extra/file-image.svg
+++ b/core/assets-raw/fontgen/extra/file-image.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns: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"
-   width="10"
-   height="13"
-   version="1.1"
-   id="svg310"
-   sodipodi:docname="file-image.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
+        height="13"
+        version="1.1"
+        id="svg310"
+        sodipodi:docname="file-image.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata316">
     <rdf:RDF>
diff --git a/core/assets-raw/fontgen/extra/info.svg b/core/assets-raw/fontgen/extra/info.svg
index d7ec5d243f..b4a8d54a45 100644
--- a/core/assets-raw/fontgen/extra/info.svg
+++ b/core/assets-raw/fontgen/extra/info.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns: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"
-   width="12"
-   height="12"
-   version="1.1"
-   id="svg300"
-   sodipodi:docname="info.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
+        height="12"
+        version="1.1"
+        id="svg300"
+        sodipodi:docname="info.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata306">
     <rdf:RDF>
diff --git a/core/assets-raw/fontgen/extra/logic.svg b/core/assets-raw/fontgen/extra/logic.svg
index 431ce25d42..93fc13edd0 100644
--- a/core/assets-raw/fontgen/extra/logic.svg
+++ b/core/assets-raw/fontgen/extra/logic.svg
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns: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">
+        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="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
diff --git a/core/assets-raw/fontgen/extra/planet.svg b/core/assets-raw/fontgen/extra/planet.svg
index 17cd9fc3cd..9bcbe643de 100644
--- a/core/assets-raw/fontgen/extra/planet.svg
+++ b/core/assets-raw/fontgen/extra/planet.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns: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"
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg542"
-   sodipodi:docname="planet.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16"
+        height="16"
+        version="1.1"
+        id="svg542"
+        sodipodi:docname="planet.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata548">
     <rdf:RDF>
diff --git a/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png
new file mode 100644
index 0000000000..039c97f909
Binary files /dev/null and b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png differ
diff --git a/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png
new file mode 100644
index 0000000000..93675a3d28
Binary files /dev/null and b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png differ
diff --git a/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png
new file mode 100644
index 0000000000..de14b807f8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator-team.png b/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator-team.png
deleted file mode 100644
index e141d97940..0000000000
Binary files a/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator-team.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png b/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png
index 41019a2c7d..9993af8ff7 100644
Binary files a/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png and b/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png differ
diff --git a/core/assets-raw/sprites/blocks/campaign/landing-pad.png b/core/assets-raw/sprites/blocks/campaign/landing-pad.png
new file mode 100644
index 0000000000..e4c98a3db5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/campaign/landing-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png b/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png
deleted file mode 100644
index ac77dbe43c..0000000000
Binary files a/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/defense/barrier-projector-team.png b/core/assets-raw/sprites/blocks/defense/barrier-projector-team.png
new file mode 100644
index 0000000000..4eba1ac6a8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/barrier-projector-team.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/barrier-projector.png b/core/assets-raw/sprites/blocks/defense/barrier-projector.png
new file mode 100644
index 0000000000..edac72c033
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/barrier-projector.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/build-tower-base.png b/core/assets-raw/sprites/blocks/defense/build-tower-base.png
new file mode 100644
index 0000000000..1c3bf95ff3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/build-tower-base.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/build-tower-glow.png b/core/assets-raw/sprites/blocks/defense/build-tower-glow.png
new file mode 100644
index 0000000000..757d26de8e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/build-tower-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/build-tower.png b/core/assets-raw/sprites/blocks/defense/build-tower.png
new file mode 100644
index 0000000000..b78d473bfc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/build-tower.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/force-projector-team.png b/core/assets-raw/sprites/blocks/defense/force-projector-team.png
new file mode 100644
index 0000000000..4eba1ac6a8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/force-projector-team.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/force-projector.png b/core/assets-raw/sprites/blocks/defense/force-projector.png
index c69e9869b5..e8dfb1677e 100644
Binary files a/core/assets-raw/sprites/blocks/defense/force-projector.png and b/core/assets-raw/sprites/blocks/defense/force-projector.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/large-shield-projector-team.png b/core/assets-raw/sprites/blocks/defense/large-shield-projector-team.png
new file mode 100644
index 0000000000..6cd40f07fc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/large-shield-projector-team.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/large-shield-projector.png b/core/assets-raw/sprites/blocks/defense/large-shield-projector.png
new file mode 100644
index 0000000000..8a971abc45
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/large-shield-projector.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/radar-base.png b/core/assets-raw/sprites/blocks/defense/radar-base.png
new file mode 100644
index 0000000000..e26ef488f0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/radar-base.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/radar-glow.png b/core/assets-raw/sprites/blocks/defense/radar-glow.png
new file mode 100644
index 0000000000..866ec4f44f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/radar-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/radar.png b/core/assets-raw/sprites/blocks/defense/radar.png
new file mode 100644
index 0000000000..b4880bf7b1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/radar.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/regen-projector-bottom.png b/core/assets-raw/sprites/blocks/defense/regen-projector-bottom.png
new file mode 100644
index 0000000000..71e64780bf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/regen-projector-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/regen-projector-glow.png b/core/assets-raw/sprites/blocks/defense/regen-projector-glow.png
new file mode 100644
index 0000000000..4aa39ca852
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/regen-projector-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/regen-projector-mid.png b/core/assets-raw/sprites/blocks/defense/regen-projector-mid.png
new file mode 100644
index 0000000000..d5f5c37581
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/regen-projector-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/regen-projector.png b/core/assets-raw/sprites/blocks/defense/regen-projector.png
new file mode 100644
index 0000000000..f18e5bb857
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/regen-projector.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/shield-projector-team.png b/core/assets-raw/sprites/blocks/defense/shield-projector-team.png
new file mode 100644
index 0000000000..4eba1ac6a8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/shield-projector-team.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/shield-projector.png b/core/assets-raw/sprites/blocks/defense/shield-projector.png
new file mode 100644
index 0000000000..281848306e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/shield-projector.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/shock-mine-team-top.png b/core/assets-raw/sprites/blocks/defense/shock-mine-team-top.png
new file mode 100644
index 0000000000..e215e1a1ea
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/shock-mine-team-top.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png b/core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png
new file mode 100644
index 0000000000..f949af1f2d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/shockwave-tower.png b/core/assets-raw/sprites/blocks/defense/shockwave-tower.png
new file mode 100644
index 0000000000..dff1d43118
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/shockwave-tower.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/block-loader.png b/core/assets-raw/sprites/blocks/distribution/block-loader.png
deleted file mode 100644
index 08c851a0cd..0000000000
Binary files a/core/assets-raw/sprites/blocks/distribution/block-loader.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/distribution/block-unloader.png b/core/assets-raw/sprites/blocks/distribution/block-unloader.png
deleted file mode 100644
index 2ee0b89d9b..0000000000
Binary files a/core/assets-raw/sprites/blocks/distribution/block-unloader.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/distribution/cross-full.png b/core/assets-raw/sprites/blocks/distribution/cross-full.png
new file mode 100644
index 0000000000..916e18cfd2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/cross-full.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-0.png b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-0.png
new file mode 100644
index 0000000000..2de29f2ee5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-1.png b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-1.png
new file mode 100644
index 0000000000..24700e6f14
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-2.png b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-2.png
new file mode 100644
index 0000000000..a28ab6d617
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-3.png b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-3.png
new file mode 100644
index 0000000000..52f1b8b392
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-4.png b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-4.png
new file mode 100644
index 0000000000..6d529f2a4b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/armored-duct-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/arrow-glow.png b/core/assets-raw/sprites/blocks/distribution/ducts/arrow-glow.png
new file mode 100644
index 0000000000..469de30742
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/arrow-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-0.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-0.png
new file mode 100644
index 0000000000..329fc2f756
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-1.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-1.png
new file mode 100644
index 0000000000..6e793c7cac
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-2.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-2.png
new file mode 100644
index 0000000000..a2dd7b5e0c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-3.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-3.png
new file mode 100644
index 0000000000..a2dd7b5e0c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-4.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-4.png
new file mode 100644
index 0000000000..a2dd7b5e0c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom-4.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom.png
new file mode 100644
index 0000000000..04cecf2c96
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-arrow.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-arrow.png
new file mode 100644
index 0000000000..f47060e98c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-bridge-bottom.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-bridge-bottom.png
new file mode 100644
index 0000000000..16256794a0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-bridge-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-bridge.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-bridge.png
new file mode 100644
index 0000000000..ff853cecf6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-dir.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-dir.png
new file mode 100644
index 0000000000..8349ac6837
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge-dir.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge.png
new file mode 100644
index 0000000000..428785c66c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-router-top.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-router-top.png
new file mode 100644
index 0000000000..f93d8639c9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-router-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-router.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-router.png
new file mode 100644
index 0000000000..428785c66c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-router.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-0.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-0.png
new file mode 100644
index 0000000000..eae68cbeaf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-1.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-1.png
new file mode 100644
index 0000000000..2e1b8c091e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-2.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-2.png
new file mode 100644
index 0000000000..10fde0b35b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-3.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-3.png
new file mode 100644
index 0000000000..491efae7c9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-4.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-4.png
new file mode 100644
index 0000000000..adad9a7fc6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-arrow.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-arrow.png
new file mode 100644
index 0000000000..1ece44e2f0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-center.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-center.png
new file mode 100644
index 0000000000..19def6bcc8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-center.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-top.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-top.png
new file mode 100644
index 0000000000..5f2cff7a9b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader.png b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader.png
new file mode 100644
index 0000000000..5791261174
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/duct-unloader.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/overflow-duct-top.png b/core/assets-raw/sprites/blocks/distribution/ducts/overflow-duct-top.png
new file mode 100644
index 0000000000..7a6637d7a9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/overflow-duct-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/overflow-duct.png b/core/assets-raw/sprites/blocks/distribution/ducts/overflow-duct.png
new file mode 100644
index 0000000000..0f647a8ae4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/overflow-duct.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/surge-router-top.png b/core/assets-raw/sprites/blocks/distribution/ducts/surge-router-top.png
new file mode 100644
index 0000000000..f93d8639c9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/surge-router-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/surge-router.png b/core/assets-raw/sprites/blocks/distribution/ducts/surge-router.png
new file mode 100644
index 0000000000..99a48d8c88
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/surge-router.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/underflow-duct-top.png b/core/assets-raw/sprites/blocks/distribution/ducts/underflow-duct-top.png
new file mode 100644
index 0000000000..b986bc356d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/underflow-duct-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/ducts/underflow-duct.png b/core/assets-raw/sprites/blocks/distribution/ducts/underflow-duct.png
new file mode 100644
index 0000000000..0f647a8ae4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/ducts/underflow-duct.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png b/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png
index e023e20061..47e4ed20c9 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png and b/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-conveyor-top.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor-top.png
deleted file mode 100644
index 8ecc636e9e..0000000000
Binary files a/core/assets-raw/sprites/blocks/distribution/payload-conveyor-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/distribution/sorter.png b/core/assets-raw/sprites/blocks/distribution/sorter.png
index a4c8b37e59..8bbe0fb50a 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/sorter.png and b/core/assets-raw/sprites/blocks/distribution/sorter.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-0.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-0.png
rename to core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-0.png
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-1.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-1.png
rename to core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-1.png
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-2.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-2.png
rename to core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-2.png
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-edge.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-edge.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-edge.png
rename to core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-edge.png
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-stack.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-stack.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-stack.png
rename to core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor-stack.png
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor.png
rename to core/assets-raw/sprites/blocks/distribution/stack-conveyors/plastanium-conveyor.png
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-0.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-0.png
new file mode 100644
index 0000000000..7217e22c18
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-1.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-1.png
new file mode 100644
index 0000000000..ef69e2600b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-2.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-2.png
new file mode 100644
index 0000000000..3c1afe07dc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png
new file mode 100644
index 0000000000..379eb10394
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge.png
new file mode 100644
index 0000000000..8144b95cbe
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-glow.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-glow.png
new file mode 100644
index 0000000000..469de30742
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png
new file mode 100644
index 0000000000..d953c790a4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor.png
new file mode 100644
index 0000000000..10a38a7a83
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png
index 4f17e71eee..f781765591 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/cliff-crusher-rotator-bottom.png b/core/assets-raw/sprites/blocks/drills/cliff-crusher-rotator-bottom.png
new file mode 100644
index 0000000000..6799ee0e87
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/cliff-crusher-rotator-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/cliff-crusher-rotator.png b/core/assets-raw/sprites/blocks/drills/cliff-crusher-rotator.png
new file mode 100644
index 0000000000..a63c5c351a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/cliff-crusher-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/cliff-crusher-top.png b/core/assets-raw/sprites/blocks/drills/cliff-crusher-top.png
new file mode 100644
index 0000000000..11b6823dcd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/cliff-crusher-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/cliff-crusher.png b/core/assets-raw/sprites/blocks/drills/cliff-crusher.png
new file mode 100644
index 0000000000..6429f1c9bc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/cliff-crusher.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/eruption-drill-arrow-blur.png b/core/assets-raw/sprites/blocks/drills/eruption-drill-arrow-blur.png
new file mode 100644
index 0000000000..e5c6e0e2eb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/eruption-drill-arrow-blur.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/eruption-drill-arrow.png b/core/assets-raw/sprites/blocks/drills/eruption-drill-arrow.png
new file mode 100644
index 0000000000..88b8b3e65e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/eruption-drill-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/eruption-drill-glow.png b/core/assets-raw/sprites/blocks/drills/eruption-drill-glow.png
new file mode 100644
index 0000000000..d8f35a144f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/eruption-drill-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/eruption-drill-item.png b/core/assets-raw/sprites/blocks/drills/eruption-drill-item.png
new file mode 100644
index 0000000000..73a5e7624e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/eruption-drill-item.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/eruption-drill-top.png b/core/assets-raw/sprites/blocks/drills/eruption-drill-top.png
new file mode 100644
index 0000000000..69b4faaa8e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/eruption-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/eruption-drill.png b/core/assets-raw/sprites/blocks/drills/eruption-drill.png
new file mode 100644
index 0000000000..f4b809a51e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/eruption-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/impact-drill-arrow-blur.png b/core/assets-raw/sprites/blocks/drills/impact-drill-arrow-blur.png
new file mode 100644
index 0000000000..49913d21d4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/impact-drill-arrow-blur.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/impact-drill-arrow.png b/core/assets-raw/sprites/blocks/drills/impact-drill-arrow.png
new file mode 100644
index 0000000000..9277d3930b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/impact-drill-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/impact-drill-item.png b/core/assets-raw/sprites/blocks/drills/impact-drill-item.png
new file mode 100644
index 0000000000..a9ab1b2740
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/impact-drill-item.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/impact-drill-top-invert.png b/core/assets-raw/sprites/blocks/drills/impact-drill-top-invert.png
new file mode 100644
index 0000000000..792c61fa07
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/impact-drill-top-invert.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/impact-drill-top.png b/core/assets-raw/sprites/blocks/drills/impact-drill-top.png
new file mode 100644
index 0000000000..76d645c278
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/impact-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/impact-drill.png b/core/assets-raw/sprites/blocks/drills/impact-drill.png
new file mode 100644
index 0000000000..b982da64a0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/impact-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-rotator-bottom.png b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-rotator-bottom.png
new file mode 100644
index 0000000000..6799ee0e87
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-rotator-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-rotator.png b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-rotator.png
new file mode 100644
index 0000000000..a63c5c351a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-top.png b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-top.png
new file mode 100644
index 0000000000..1a9526ac5d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/large-cliff-crusher.png b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher.png
new file mode 100644
index 0000000000..508f4e7f22
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/large-cliff-crusher.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore-glow.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore-glow.png
new file mode 100644
index 0000000000..b17b63b0e1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/large-plasma-bore-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore-top.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore-top.png
new file mode 100644
index 0000000000..787040b968
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/large-plasma-bore-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png
new file mode 100644
index 0000000000..9221578a2d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png
deleted file mode 100644
index 80a830e1c7..0000000000
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png
index a6d5ad350b..f9301d4e73 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png
index 9a058e3fc9..6639f0889b 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore-glow.png b/core/assets-raw/sprites/blocks/drills/plasma-bore-glow.png
new file mode 100644
index 0000000000..fbfe8c4a7a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/plasma-bore-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore-top.png b/core/assets-raw/sprites/blocks/drills/plasma-bore-top.png
new file mode 100644
index 0000000000..4d8673451e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/plasma-bore-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore.png b/core/assets-raw/sprites/blocks/drills/plasma-bore.png
new file mode 100644
index 0000000000..f9d5379973
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/plasma-bore.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkycite-floor.png b/core/assets-raw/sprites/blocks/environment/arkycite-floor.png
new file mode 100644
index 0000000000..fc0cbb677d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkycite-floor.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-stone1.png b/core/assets-raw/sprites/blocks/environment/arkyic-stone1.png
new file mode 100644
index 0000000000..3e8d77902d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-stone2.png b/core/assets-raw/sprites/blocks/environment/arkyic-stone2.png
new file mode 100644
index 0000000000..83afe7df88
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-stone3.png b/core/assets-raw/sprites/blocks/environment/arkyic-stone3.png
new file mode 100644
index 0000000000..f8772bcc95
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-vent1.png b/core/assets-raw/sprites/blocks/environment/arkyic-vent1.png
new file mode 100644
index 0000000000..cb2a687612
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-vent1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-vent2.png b/core/assets-raw/sprites/blocks/environment/arkyic-vent2.png
new file mode 100644
index 0000000000..7c689388ac
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-vent2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-wall-large.png b/core/assets-raw/sprites/blocks/environment/arkyic-wall-large.png
new file mode 100644
index 0000000000..a972142d22
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-wall1.png b/core/assets-raw/sprites/blocks/environment/arkyic-wall1.png
new file mode 100644
index 0000000000..0df834af2e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-wall2.png b/core/assets-raw/sprites/blocks/environment/arkyic-wall2.png
new file mode 100644
index 0000000000..45b1197fc4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-wall3.png b/core/assets-raw/sprites/blocks/environment/arkyic-wall3.png
new file mode 100644
index 0000000000..e289f569a4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-wall3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall-large.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall-large.png
new file mode 100644
index 0000000000..19be0be158
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall1.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall1.png
new file mode 100644
index 0000000000..896f35d529
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall2.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall2.png
new file mode 100644
index 0000000000..5e37ccc777
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/beryllic-stone-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone1.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone1.png
new file mode 100644
index 0000000000..1f1ca159b3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/beryllic-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone2.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone2.png
new file mode 100644
index 0000000000..a63c393730
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/beryllic-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone3.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone3.png
new file mode 100644
index 0000000000..bfcda666b0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/beryllic-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone4.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone4.png
new file mode 100644
index 0000000000..298d4b1b8a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/beryllic-stone4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/bluemat1.png b/core/assets-raw/sprites/blocks/environment/bluemat1.png
new file mode 100644
index 0000000000..958ddac3eb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/bluemat1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/bluemat2.png b/core/assets-raw/sprites/blocks/environment/bluemat2.png
new file mode 100644
index 0000000000..13d68ac5f0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/bluemat2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/bluemat3.png b/core/assets-raw/sprites/blocks/environment/bluemat3.png
new file mode 100644
index 0000000000..b10b1b18bd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/bluemat3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-stone1.png b/core/assets-raw/sprites/blocks/environment/carbon-stone1.png
new file mode 100644
index 0000000000..2f2fceed17
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-stone2.png b/core/assets-raw/sprites/blocks/environment/carbon-stone2.png
new file mode 100644
index 0000000000..6feafe5ef0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-stone3.png b/core/assets-raw/sprites/blocks/environment/carbon-stone3.png
new file mode 100644
index 0000000000..3a17479674
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-stone4.png b/core/assets-raw/sprites/blocks/environment/carbon-stone4.png
new file mode 100644
index 0000000000..fdf9a8981e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-stone4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-vent1.png b/core/assets-raw/sprites/blocks/environment/carbon-vent1.png
new file mode 100644
index 0000000000..4429e8168d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-vent1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-vent2.png b/core/assets-raw/sprites/blocks/environment/carbon-vent2.png
new file mode 100644
index 0000000000..755e7d608e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-vent2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-wall-large.png b/core/assets-raw/sprites/blocks/environment/carbon-wall-large.png
new file mode 100644
index 0000000000..68d0826a9a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-wall1.png b/core/assets-raw/sprites/blocks/environment/carbon-wall1.png
new file mode 100644
index 0000000000..d1f7818d17
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/carbon-wall2.png b/core/assets-raw/sprites/blocks/environment/carbon-wall2.png
new file mode 100644
index 0000000000..984fb02202
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/carbon-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/char1.png b/core/assets-raw/sprites/blocks/environment/char1.png
index d8a1dae14f..e7e7f42580 100644
Binary files a/core/assets-raw/sprites/blocks/environment/char1.png and b/core/assets-raw/sprites/blocks/environment/char1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/char2.png b/core/assets-raw/sprites/blocks/environment/char2.png
index c37787ba4f..c418289e48 100644
Binary files a/core/assets-raw/sprites/blocks/environment/char2.png and b/core/assets-raw/sprites/blocks/environment/char2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/char3.png b/core/assets-raw/sprites/blocks/environment/char3.png
index c45e69823a..cfb54e0ea0 100644
Binary files a/core/assets-raw/sprites/blocks/environment/char3.png and b/core/assets-raw/sprites/blocks/environment/char3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/core-zone.png b/core/assets-raw/sprites/blocks/environment/core-zone.png
new file mode 100644
index 0000000000..ba2a9d5db5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/core-zone.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/craters1.png b/core/assets-raw/sprites/blocks/environment/crater-stone1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/craters1.png
rename to core/assets-raw/sprites/blocks/environment/crater-stone1.png
diff --git a/core/assets-raw/sprites/blocks/environment/craters2.png b/core/assets-raw/sprites/blocks/environment/crater-stone2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/craters2.png
rename to core/assets-raw/sprites/blocks/environment/crater-stone2.png
diff --git a/core/assets-raw/sprites/blocks/environment/craters3.png b/core/assets-raw/sprites/blocks/environment/crater-stone3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/craters3.png
rename to core/assets-raw/sprites/blocks/environment/crater-stone3.png
diff --git a/core/assets-raw/sprites/blocks/environment/craters4.png b/core/assets-raw/sprites/blocks/environment/crater-stone4.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/craters4.png
rename to core/assets-raw/sprites/blocks/environment/crater-stone4.png
diff --git a/core/assets-raw/sprites/blocks/environment/craters5.png b/core/assets-raw/sprites/blocks/environment/crater-stone5.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/craters5.png
rename to core/assets-raw/sprites/blocks/environment/crater-stone5.png
diff --git a/core/assets-raw/sprites/blocks/environment/craters6.png b/core/assets-raw/sprites/blocks/environment/crater-stone6.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/craters6.png
rename to core/assets-raw/sprites/blocks/environment/crater-stone6.png
diff --git a/core/assets-raw/sprites/blocks/environment/crystal-floor1.png b/core/assets-raw/sprites/blocks/environment/crystal-floor1.png
new file mode 100644
index 0000000000..d2cbb258d5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystal-floor1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystal-floor2.png b/core/assets-raw/sprites/blocks/environment/crystal-floor2.png
new file mode 100644
index 0000000000..1be27393ab
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystal-floor2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystal-floor3.png b/core/assets-raw/sprites/blocks/environment/crystal-floor3.png
new file mode 100644
index 0000000000..f677063068
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystal-floor3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystal-floor4.png b/core/assets-raw/sprites/blocks/environment/crystal-floor4.png
new file mode 100644
index 0000000000..da653b15ce
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystal-floor4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall-large.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall-large.png
new file mode 100644
index 0000000000..9d2bfdbb64
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall1.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall1.png
new file mode 100644
index 0000000000..85d020c779
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall2.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall2.png
new file mode 100644
index 0000000000..6464cddee8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall3.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall3.png
new file mode 100644
index 0000000000..019e90032c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall4.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall4.png
new file mode 100644
index 0000000000..60e70ffee6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone-wall4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone1.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone1.png
new file mode 100644
index 0000000000..25549cfbaf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone2.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone2.png
new file mode 100644
index 0000000000..7855ea476b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone3.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone3.png
new file mode 100644
index 0000000000..63d6d7be2d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone4.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone4.png
new file mode 100644
index 0000000000..d9a441075f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-stone5.png b/core/assets-raw/sprites/blocks/environment/crystalline-stone5.png
new file mode 100644
index 0000000000..e040f73d67
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-stone5.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-vent1.png b/core/assets-raw/sprites/blocks/environment/crystalline-vent1.png
new file mode 100644
index 0000000000..e52120a822
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-vent1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-vent2.png b/core/assets-raw/sprites/blocks/environment/crystalline-vent2.png
new file mode 100644
index 0000000000..72ddb58237
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-vent2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png
index 42a53db08b..6152bd059b 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png and b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dark-metal2.png b/core/assets-raw/sprites/blocks/environment/dark-metal2.png
index 42f7238425..3cf75bb998 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-metal2.png and b/core/assets-raw/sprites/blocks/environment/dark-metal2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-1.png b/core/assets-raw/sprites/blocks/environment/dark-panel-1.png
index ea2d25e43f..4eebdd9f44 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-1.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-2.png b/core/assets-raw/sprites/blocks/environment/dark-panel-2.png
index 117c0fddf7..adbc44fdf5 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-2.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-4.png b/core/assets-raw/sprites/blocks/environment/dark-panel-4.png
index a69c9c2da5..9c92f09ef3 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-4.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-5.png b/core/assets-raw/sprites/blocks/environment/dark-panel-5.png
index b7d3e69c20..2e990695ed 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-5.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-5.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/deep-tainted-water.png b/core/assets-raw/sprites/blocks/environment/deep-tainted-water.png
new file mode 100644
index 0000000000..c072c0ebea
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/deep-tainted-water.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/deepwater.png b/core/assets-raw/sprites/blocks/environment/deep-water.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/deepwater.png
rename to core/assets-raw/sprites/blocks/environment/deep-water.png
diff --git a/core/assets-raw/sprites/blocks/environment/dense-red-stone1.png b/core/assets-raw/sprites/blocks/environment/dense-red-stone1.png
new file mode 100644
index 0000000000..d45750c6a4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dense-red-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dense-red-stone2.png b/core/assets-raw/sprites/blocks/environment/dense-red-stone2.png
new file mode 100644
index 0000000000..acb47bc1fc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dense-red-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dense-red-stone3.png b/core/assets-raw/sprites/blocks/environment/dense-red-stone3.png
new file mode 100644
index 0000000000..1bbaab57e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dense-red-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dense-red-stone4.png b/core/assets-raw/sprites/blocks/environment/dense-red-stone4.png
new file mode 100644
index 0000000000..4297994f0c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dense-red-stone4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dune-wall-large.png b/core/assets-raw/sprites/blocks/environment/dune-wall-large.png
index 23082592c7..9966c564e9 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dune-wall-large.png and b/core/assets-raw/sprites/blocks/environment/dune-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dune-wall1.png b/core/assets-raw/sprites/blocks/environment/dune-wall1.png
index 64d13b3f24..fbd9cb8090 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dune-wall1.png and b/core/assets-raw/sprites/blocks/environment/dune-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/edgier.png b/core/assets-raw/sprites/blocks/environment/edgier.png
deleted file mode 100644
index 0e4e66c84c..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/edgier.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/empty.png b/core/assets-raw/sprites/blocks/environment/empty.png
new file mode 100644
index 0000000000..b76b9c46a9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/empty.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/env-error.png b/core/assets-raw/sprites/blocks/environment/env-error.png
new file mode 100644
index 0000000000..b72971ab8a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/env-error.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-craters1.png b/core/assets-raw/sprites/blocks/environment/ferric-craters1.png
new file mode 100644
index 0000000000..4fdccda562
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-craters1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-craters2.png b/core/assets-raw/sprites/blocks/environment/ferric-craters2.png
new file mode 100644
index 0000000000..ad54fb651f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-craters2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-craters3.png b/core/assets-raw/sprites/blocks/environment/ferric-craters3.png
new file mode 100644
index 0000000000..b7c0ba0a49
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-craters3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone-wall-large.png b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall-large.png
new file mode 100644
index 0000000000..a1a16a11e3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone-wall1.png b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall1.png
new file mode 100644
index 0000000000..bd72860661
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone-wall2.png b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall2.png
new file mode 100644
index 0000000000..8fb0c13179
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-stone-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone1.png b/core/assets-raw/sprites/blocks/environment/ferric-stone1.png
new file mode 100644
index 0000000000..898da4de92
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone2.png b/core/assets-raw/sprites/blocks/environment/ferric-stone2.png
new file mode 100644
index 0000000000..60a5384168
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone3.png b/core/assets-raw/sprites/blocks/environment/ferric-stone3.png
new file mode 100644
index 0000000000..6622c35e38
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ferric-stone4.png b/core/assets-raw/sprites/blocks/environment/ferric-stone4.png
new file mode 100644
index 0000000000..c0b84af752
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ferric-stone4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/glowblob1.png b/core/assets-raw/sprites/blocks/environment/glowblob1.png
new file mode 100644
index 0000000000..4d72f6092e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/glowblob1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/graphitic-wall-large.png b/core/assets-raw/sprites/blocks/environment/graphitic-wall-large.png
new file mode 100644
index 0000000000..9e64bad6aa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/graphitic-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/graphitic-wall1.png b/core/assets-raw/sprites/blocks/environment/graphitic-wall1.png
new file mode 100644
index 0000000000..ddaf262296
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/graphitic-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/graphitic-wall2.png b/core/assets-raw/sprites/blocks/environment/graphitic-wall2.png
new file mode 100644
index 0000000000..8303b5dcb9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/graphitic-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/graphitic-wall3.png b/core/assets-raw/sprites/blocks/environment/graphitic-wall3.png
new file mode 100644
index 0000000000..9fa475dece
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/graphitic-wall3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow1.png b/core/assets-raw/sprites/blocks/environment/ice-snow1.png
index ee593e9f64..d2010a0106 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow1.png and b/core/assets-raw/sprites/blocks/environment/ice-snow1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow2.png b/core/assets-raw/sprites/blocks/environment/ice-snow2.png
index a9ffcf1088..5a0d5458d4 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow2.png and b/core/assets-raw/sprites/blocks/environment/ice-snow2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow3.png b/core/assets-raw/sprites/blocks/environment/ice-snow3.png
index f38d778b29..4375ee7139 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow3.png and b/core/assets-raw/sprites/blocks/environment/ice-snow3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-4.png b/core/assets-raw/sprites/blocks/environment/metal-floor-4.png
new file mode 100644
index 0000000000..da7ee79f48
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/metal-floor-4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png
index 1cfce7fe86..c7914a00c3 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png
index 078e5e7252..8333961067 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png
index fbc921711d..01b0616d3e 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor.png b/core/assets-raw/sprites/blocks/environment/metal-floor.png
index f60eff075e..a4fe16e944 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor.png and b/core/assets-raw/sprites/blocks/environment/metal-floor.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/slag.png b/core/assets-raw/sprites/blocks/environment/molten-slag.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/slag.png
rename to core/assets-raw/sprites/blocks/environment/molten-slag.png
diff --git a/core/assets-raw/sprites/blocks/environment/ore-beryllium1.png b/core/assets-raw/sprites/blocks/environment/ore-beryllium1.png
new file mode 100644
index 0000000000..2cadc169ad
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-beryllium1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-beryllium2.png b/core/assets-raw/sprites/blocks/environment/ore-beryllium2.png
new file mode 100644
index 0000000000..8f1d546d2c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-beryllium2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-beryllium3.png b/core/assets-raw/sprites/blocks/environment/ore-beryllium3.png
new file mode 100644
index 0000000000..a037c879de
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-beryllium3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/coal1.png b/core/assets-raw/sprites/blocks/environment/ore-coal1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/coal1.png
rename to core/assets-raw/sprites/blocks/environment/ore-coal1.png
diff --git a/core/assets-raw/sprites/blocks/environment/coal2.png b/core/assets-raw/sprites/blocks/environment/ore-coal2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/coal2.png
rename to core/assets-raw/sprites/blocks/environment/ore-coal2.png
diff --git a/core/assets-raw/sprites/blocks/environment/coal3.png b/core/assets-raw/sprites/blocks/environment/ore-coal3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/coal3.png
rename to core/assets-raw/sprites/blocks/environment/ore-coal3.png
diff --git a/core/assets-raw/sprites/blocks/environment/copper1.png b/core/assets-raw/sprites/blocks/environment/ore-copper1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/copper1.png
rename to core/assets-raw/sprites/blocks/environment/ore-copper1.png
diff --git a/core/assets-raw/sprites/blocks/environment/copper2.png b/core/assets-raw/sprites/blocks/environment/ore-copper2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/copper2.png
rename to core/assets-raw/sprites/blocks/environment/ore-copper2.png
diff --git a/core/assets-raw/sprites/blocks/environment/copper3.png b/core/assets-raw/sprites/blocks/environment/ore-copper3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/copper3.png
rename to core/assets-raw/sprites/blocks/environment/ore-copper3.png
diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png
new file mode 100644
index 0000000000..3f0625749b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium2.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium2.png
new file mode 100644
index 0000000000..d71ae77293
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium3.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium3.png
new file mode 100644
index 0000000000..5790f50c77
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/lead1.png b/core/assets-raw/sprites/blocks/environment/ore-lead1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/lead1.png
rename to core/assets-raw/sprites/blocks/environment/ore-lead1.png
diff --git a/core/assets-raw/sprites/blocks/environment/lead2.png b/core/assets-raw/sprites/blocks/environment/ore-lead2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/lead2.png
rename to core/assets-raw/sprites/blocks/environment/ore-lead2.png
diff --git a/core/assets-raw/sprites/blocks/environment/lead3.png b/core/assets-raw/sprites/blocks/environment/ore-lead3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/lead3.png
rename to core/assets-raw/sprites/blocks/environment/ore-lead3.png
diff --git a/core/assets-raw/sprites/blocks/environment/scrap1.png b/core/assets-raw/sprites/blocks/environment/ore-scrap1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/scrap1.png
rename to core/assets-raw/sprites/blocks/environment/ore-scrap1.png
diff --git a/core/assets-raw/sprites/blocks/environment/scrap2.png b/core/assets-raw/sprites/blocks/environment/ore-scrap2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/scrap2.png
rename to core/assets-raw/sprites/blocks/environment/ore-scrap2.png
diff --git a/core/assets-raw/sprites/blocks/environment/scrap3.png b/core/assets-raw/sprites/blocks/environment/ore-scrap3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/scrap3.png
rename to core/assets-raw/sprites/blocks/environment/ore-scrap3.png
diff --git a/core/assets-raw/sprites/blocks/environment/thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-thorium1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/thorium1.png
rename to core/assets-raw/sprites/blocks/environment/ore-thorium1.png
diff --git a/core/assets-raw/sprites/blocks/environment/thorium2.png b/core/assets-raw/sprites/blocks/environment/ore-thorium2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/thorium2.png
rename to core/assets-raw/sprites/blocks/environment/ore-thorium2.png
diff --git a/core/assets-raw/sprites/blocks/environment/thorium3.png b/core/assets-raw/sprites/blocks/environment/ore-thorium3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/thorium3.png
rename to core/assets-raw/sprites/blocks/environment/ore-thorium3.png
diff --git a/core/assets-raw/sprites/blocks/environment/titanium1.png b/core/assets-raw/sprites/blocks/environment/ore-titanium1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/titanium1.png
rename to core/assets-raw/sprites/blocks/environment/ore-titanium1.png
diff --git a/core/assets-raw/sprites/blocks/environment/titanium2.png b/core/assets-raw/sprites/blocks/environment/ore-titanium2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/titanium2.png
rename to core/assets-raw/sprites/blocks/environment/ore-titanium2.png
diff --git a/core/assets-raw/sprites/blocks/environment/titanium3.png b/core/assets-raw/sprites/blocks/environment/ore-titanium3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/titanium3.png
rename to core/assets-raw/sprites/blocks/environment/ore-titanium3.png
diff --git a/core/assets-raw/sprites/blocks/environment/ore-tungsten1.png b/core/assets-raw/sprites/blocks/environment/ore-tungsten1.png
new file mode 100644
index 0000000000..b923450eff
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-tungsten1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-tungsten2.png b/core/assets-raw/sprites/blocks/environment/ore-tungsten2.png
new file mode 100644
index 0000000000..07624893a3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-tungsten2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-tungsten3.png b/core/assets-raw/sprites/blocks/environment/ore-tungsten3.png
new file mode 100644
index 0000000000..3cfa8d1aa4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-tungsten3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium1.png
new file mode 100644
index 0000000000..a1dcfcf4e2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium2.png
new file mode 100644
index 0000000000..851a6b5b06
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium3.png
new file mode 100644
index 0000000000..b87cd5a088
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-beryllium3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png
new file mode 100644
index 0000000000..a01a034745
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png
new file mode 100644
index 0000000000..4ea1ec3065
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png
new file mode 100644
index 0000000000..266b53f814
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten1.png
new file mode 100644
index 0000000000..faa96fc02e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten2.png
new file mode 100644
index 0000000000..e8d939d7b2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten3.png
new file mode 100644
index 0000000000..da8b232117
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-tungsten3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/pack.json b/core/assets-raw/sprites/blocks/environment/pack.json
index fcd452dd9f..8a0d47c2b6 100644
--- a/core/assets-raw/sprites/blocks/environment/pack.json
+++ b/core/assets-raw/sprites/blocks/environment/pack.json
@@ -2,7 +2,8 @@
   duplicatePadding: true,
   combineSubdirectories: true,
   flattenPaths: true,
-  maxWidth: 4096,
-  maxHeight: 4096,
-  fast: true
+  maxWidth: 2048,
+  maxHeight: 2048,
+  fast: true,
+  stripWhitespaceCenter: false
 }
diff --git a/core/assets-raw/sprites/blocks/environment/pooled-cryofluid.png b/core/assets-raw/sprites/blocks/environment/pooled-cryofluid.png
new file mode 100644
index 0000000000..9d50189fd9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/pooled-cryofluid.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-diamond-wall1.png b/core/assets-raw/sprites/blocks/environment/red-diamond-wall1.png
new file mode 100644
index 0000000000..cc4225fb76
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-diamond-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-diamond-wall2.png b/core/assets-raw/sprites/blocks/environment/red-diamond-wall2.png
new file mode 100644
index 0000000000..f9020a83c5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-diamond-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-diamond-wall3.png b/core/assets-raw/sprites/blocks/environment/red-diamond-wall3.png
new file mode 100644
index 0000000000..e6f4523e0a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-diamond-wall3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-ice-wall-large.png b/core/assets-raw/sprites/blocks/environment/red-ice-wall-large.png
new file mode 100644
index 0000000000..5e246e3e1f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-ice-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-ice-wall1.png b/core/assets-raw/sprites/blocks/environment/red-ice-wall1.png
new file mode 100644
index 0000000000..5ac6959bc8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-ice-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-ice-wall2.png b/core/assets-raw/sprites/blocks/environment/red-ice-wall2.png
new file mode 100644
index 0000000000..f9b64df1d6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-ice-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-ice1.png b/core/assets-raw/sprites/blocks/environment/red-ice1.png
new file mode 100644
index 0000000000..99bf330e22
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-ice1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-ice2.png b/core/assets-raw/sprites/blocks/environment/red-ice2.png
new file mode 100644
index 0000000000..69186658ba
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-ice2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-ice3.png b/core/assets-raw/sprites/blocks/environment/red-ice3.png
new file mode 100644
index 0000000000..d751de5382
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-ice3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone-vent1.png b/core/assets-raw/sprites/blocks/environment/red-stone-vent1.png
new file mode 100644
index 0000000000..be730b3c3f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone-vent1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone-vent2.png b/core/assets-raw/sprites/blocks/environment/red-stone-vent2.png
new file mode 100644
index 0000000000..09e1ca9994
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone-vent2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone-wall-large.png b/core/assets-raw/sprites/blocks/environment/red-stone-wall-large.png
new file mode 100644
index 0000000000..9afd5b1afb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone-wall1.png b/core/assets-raw/sprites/blocks/environment/red-stone-wall1.png
new file mode 100644
index 0000000000..a64e9f29b4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone-wall2.png b/core/assets-raw/sprites/blocks/environment/red-stone-wall2.png
new file mode 100644
index 0000000000..8b1befd21e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone-wall3.png b/core/assets-raw/sprites/blocks/environment/red-stone-wall3.png
new file mode 100644
index 0000000000..b573bd36ac
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone-wall3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone1.png b/core/assets-raw/sprites/blocks/environment/red-stone1.png
new file mode 100644
index 0000000000..3af3ec80b3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone2.png b/core/assets-raw/sprites/blocks/environment/red-stone2.png
new file mode 100644
index 0000000000..25137c4a0b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone3.png b/core/assets-raw/sprites/blocks/environment/red-stone3.png
new file mode 100644
index 0000000000..0be130de13
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/red-stone4.png b/core/assets-raw/sprites/blocks/environment/red-stone4.png
new file mode 100644
index 0000000000..ed4401a87e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/red-stone4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/redmat1.png b/core/assets-raw/sprites/blocks/environment/redmat1.png
new file mode 100644
index 0000000000..dc1db300f7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/redmat1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/redmat2.png b/core/assets-raw/sprites/blocks/environment/redmat2.png
new file mode 100644
index 0000000000..e803431ea7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/redmat2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/redmat3.png b/core/assets-raw/sprites/blocks/environment/redmat3.png
new file mode 100644
index 0000000000..19670af4d3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/redmat3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/regolith-wall-large.png b/core/assets-raw/sprites/blocks/environment/regolith-wall-large.png
new file mode 100644
index 0000000000..08d0acbef8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/regolith-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/regolith-wall1.png b/core/assets-raw/sprites/blocks/environment/regolith-wall1.png
new file mode 100644
index 0000000000..97df020844
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/regolith-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/regolith-wall2.png b/core/assets-raw/sprites/blocks/environment/regolith-wall2.png
new file mode 100644
index 0000000000..55991d3c7e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/regolith-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/regolith1.png b/core/assets-raw/sprites/blocks/environment/regolith1.png
new file mode 100644
index 0000000000..fda0ac0bec
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/regolith1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/regolith2.png b/core/assets-raw/sprites/blocks/environment/regolith2.png
new file mode 100644
index 0000000000..b0ec788c70
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/regolith2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/regolith3.png b/core/assets-raw/sprites/blocks/environment/regolith3.png
new file mode 100644
index 0000000000..51ca3625be
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/regolith3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/remove-ore.png b/core/assets-raw/sprites/blocks/environment/remove-ore.png
new file mode 100644
index 0000000000..7b9a0a91bf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/remove-ore.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/remove-wall.png b/core/assets-raw/sprites/blocks/environment/remove-wall.png
new file mode 100644
index 0000000000..be52153748
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/remove-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-crater1.png b/core/assets-raw/sprites/blocks/environment/rhyolite-crater1.png
new file mode 100644
index 0000000000..74be6964eb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-crater1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-crater2.png b/core/assets-raw/sprites/blocks/environment/rhyolite-crater2.png
new file mode 100644
index 0000000000..de82ae3394
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-crater2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-crater3.png b/core/assets-raw/sprites/blocks/environment/rhyolite-crater3.png
new file mode 100644
index 0000000000..f7b2b466b7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-crater3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-vent1.png b/core/assets-raw/sprites/blocks/environment/rhyolite-vent1.png
new file mode 100644
index 0000000000..7d61092f44
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-vent1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-vent2.png b/core/assets-raw/sprites/blocks/environment/rhyolite-vent2.png
new file mode 100644
index 0000000000..de205d6443
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-vent2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-wall-large.png b/core/assets-raw/sprites/blocks/environment/rhyolite-wall-large.png
new file mode 100644
index 0000000000..fe798710d3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-wall1.png b/core/assets-raw/sprites/blocks/environment/rhyolite-wall1.png
new file mode 100644
index 0000000000..e49b98179f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite-wall2.png b/core/assets-raw/sprites/blocks/environment/rhyolite-wall2.png
new file mode 100644
index 0000000000..f0a9abf12b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite1.png b/core/assets-raw/sprites/blocks/environment/rhyolite1.png
new file mode 100644
index 0000000000..c4a96a0596
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite2.png b/core/assets-raw/sprites/blocks/environment/rhyolite2.png
new file mode 100644
index 0000000000..63bb9820f5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rhyolite3.png b/core/assets-raw/sprites/blocks/environment/rhyolite3.png
new file mode 100644
index 0000000000..d5ef114004
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rhyolite3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png
new file mode 100644
index 0000000000..3f8f555456
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png
new file mode 100644
index 0000000000..a011218c3e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png
new file mode 100644
index 0000000000..9fc10ed086
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png
new file mode 100644
index 0000000000..4a73e0ce76
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand1.png b/core/assets-raw/sprites/blocks/environment/sand-floor1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sand1.png
rename to core/assets-raw/sprites/blocks/environment/sand-floor1.png
diff --git a/core/assets-raw/sprites/blocks/environment/sand2.png b/core/assets-raw/sprites/blocks/environment/sand-floor2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sand2.png
rename to core/assets-raw/sprites/blocks/environment/sand-floor2.png
diff --git a/core/assets-raw/sprites/blocks/environment/sand3.png b/core/assets-raw/sprites/blocks/environment/sand-floor3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sand3.png
rename to core/assets-raw/sprites/blocks/environment/sand-floor3.png
diff --git a/core/assets-raw/sprites/blocks/environment/water.png b/core/assets-raw/sprites/blocks/environment/shallow-water.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/water.png
rename to core/assets-raw/sprites/blocks/environment/shallow-water.png
diff --git a/core/assets-raw/sprites/blocks/environment/spawn.png b/core/assets-raw/sprites/blocks/environment/spawn.png
index dc1a4c30a7..2267baba5e 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spawn.png and b/core/assets-raw/sprites/blocks/environment/spawn.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/tainted-water.png b/core/assets-raw/sprites/blocks/environment/tainted-water.png
index 330aca5f14..d2686d28b8 100644
Binary files a/core/assets-raw/sprites/blocks/environment/tainted-water.png and b/core/assets-raw/sprites/blocks/environment/tainted-water.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-plates1.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates1.png
new file mode 100644
index 0000000000..068eaa8e24
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-plates2.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates2.png
new file mode 100644
index 0000000000..3fce392289
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-plates3.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates3.png
new file mode 100644
index 0000000000..a058c3a8b3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-vent1.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-vent1.png
new file mode 100644
index 0000000000..dc62a2b238
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-vent1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-vent2.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-vent2.png
new file mode 100644
index 0000000000..a4821a5770
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-vent2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-wall-large.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-wall-large.png
new file mode 100644
index 0000000000..63a94043ef
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-wall1.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-wall1.png
new file mode 100644
index 0000000000..3d4582935b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-wall2.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-wall2.png
new file mode 100644
index 0000000000..9da1956f94
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone1.png b/core/assets-raw/sprites/blocks/environment/yellow-stone1.png
new file mode 100644
index 0000000000..3b32cf651a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone2.png b/core/assets-raw/sprites/blocks/environment/yellow-stone2.png
new file mode 100644
index 0000000000..6d91ac5632
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone3.png b/core/assets-raw/sprites/blocks/environment/yellow-stone3.png
new file mode 100644
index 0000000000..819599a6ce
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellow-stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellowcoral-center.png b/core/assets-raw/sprites/blocks/environment/yellowcoral-center.png
new file mode 100644
index 0000000000..7ca539b2a9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellowcoral-center.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/yellowcoral.png b/core/assets-raw/sprites/blocks/environment/yellowcoral.png
new file mode 100644
index 0000000000..2fa56e35b4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/yellowcoral.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-select.png b/core/assets-raw/sprites/blocks/extra/block-select.png
index e9d19b9e7e..62f6a9576f 100644
Binary files a/core/assets-raw/sprites/blocks/extra/block-select.png and b/core/assets-raw/sprites/blocks/extra/block-select.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/conduit-liquid.png b/core/assets-raw/sprites/blocks/extra/conduit-liquid.png
deleted file mode 100644
index 24d37b73c8..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/conduit-liquid.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire0.png b/core/assets-raw/sprites/blocks/fire/fire0.png
new file mode 100644
index 0000000000..d9e1db18e6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire0.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire1.png b/core/assets-raw/sprites/blocks/fire/fire1.png
new file mode 100644
index 0000000000..d3026cedd2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire1.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire10.png b/core/assets-raw/sprites/blocks/fire/fire10.png
new file mode 100644
index 0000000000..b55606ede5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire10.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire11.png b/core/assets-raw/sprites/blocks/fire/fire11.png
new file mode 100644
index 0000000000..4602c384ed
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire11.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire12.png b/core/assets-raw/sprites/blocks/fire/fire12.png
new file mode 100644
index 0000000000..3860c2ce1d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire12.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire13.png b/core/assets-raw/sprites/blocks/fire/fire13.png
new file mode 100644
index 0000000000..27e48033ad
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire13.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire14.png b/core/assets-raw/sprites/blocks/fire/fire14.png
new file mode 100644
index 0000000000..0cc1071961
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire14.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire15.png b/core/assets-raw/sprites/blocks/fire/fire15.png
new file mode 100644
index 0000000000..717130d434
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire15.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire16.png b/core/assets-raw/sprites/blocks/fire/fire16.png
new file mode 100644
index 0000000000..7e61b28a69
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire16.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire17.png b/core/assets-raw/sprites/blocks/fire/fire17.png
new file mode 100644
index 0000000000..5de74405a2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire17.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire18.png b/core/assets-raw/sprites/blocks/fire/fire18.png
new file mode 100644
index 0000000000..cdf83dfab6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire18.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire19.png b/core/assets-raw/sprites/blocks/fire/fire19.png
new file mode 100644
index 0000000000..e79a1538e9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire19.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire2.png b/core/assets-raw/sprites/blocks/fire/fire2.png
new file mode 100644
index 0000000000..0b6ffb4c50
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire2.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire20.png b/core/assets-raw/sprites/blocks/fire/fire20.png
new file mode 100644
index 0000000000..5d974a427b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire20.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire21.png b/core/assets-raw/sprites/blocks/fire/fire21.png
new file mode 100644
index 0000000000..409d597aa7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire21.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire22.png b/core/assets-raw/sprites/blocks/fire/fire22.png
new file mode 100644
index 0000000000..5bbd4b93d7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire22.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire23.png b/core/assets-raw/sprites/blocks/fire/fire23.png
new file mode 100644
index 0000000000..85ede17d2f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire23.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire24.png b/core/assets-raw/sprites/blocks/fire/fire24.png
new file mode 100644
index 0000000000..5544ee65e8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire24.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire25.png b/core/assets-raw/sprites/blocks/fire/fire25.png
new file mode 100644
index 0000000000..989beef8e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire25.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire26.png b/core/assets-raw/sprites/blocks/fire/fire26.png
new file mode 100644
index 0000000000..b0eb8eff34
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire26.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire27.png b/core/assets-raw/sprites/blocks/fire/fire27.png
new file mode 100644
index 0000000000..e76de8c346
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire27.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire28.png b/core/assets-raw/sprites/blocks/fire/fire28.png
new file mode 100644
index 0000000000..464e0c3797
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire28.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire29.png b/core/assets-raw/sprites/blocks/fire/fire29.png
new file mode 100644
index 0000000000..2342d9a35a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire29.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire3.png b/core/assets-raw/sprites/blocks/fire/fire3.png
new file mode 100644
index 0000000000..0d99250e41
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire3.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire30.png b/core/assets-raw/sprites/blocks/fire/fire30.png
new file mode 100644
index 0000000000..88cb4a0bc2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire30.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire31.png b/core/assets-raw/sprites/blocks/fire/fire31.png
new file mode 100644
index 0000000000..ea83d1566b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire31.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire32.png b/core/assets-raw/sprites/blocks/fire/fire32.png
new file mode 100644
index 0000000000..e69ca2dd68
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire32.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire33.png b/core/assets-raw/sprites/blocks/fire/fire33.png
new file mode 100644
index 0000000000..a76b48aed2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire33.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire34.png b/core/assets-raw/sprites/blocks/fire/fire34.png
new file mode 100644
index 0000000000..57544d4292
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire34.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire35.png b/core/assets-raw/sprites/blocks/fire/fire35.png
new file mode 100644
index 0000000000..4a9f15335d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire35.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire36.png b/core/assets-raw/sprites/blocks/fire/fire36.png
new file mode 100644
index 0000000000..bec029e19a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire36.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire37.png b/core/assets-raw/sprites/blocks/fire/fire37.png
new file mode 100644
index 0000000000..c94dd0d01e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire37.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire38.png b/core/assets-raw/sprites/blocks/fire/fire38.png
new file mode 100644
index 0000000000..c9f23580f9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire38.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire39.png b/core/assets-raw/sprites/blocks/fire/fire39.png
new file mode 100644
index 0000000000..fe133c0794
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire39.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire4.png b/core/assets-raw/sprites/blocks/fire/fire4.png
new file mode 100644
index 0000000000..f0b83d2d55
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire4.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire5.png b/core/assets-raw/sprites/blocks/fire/fire5.png
new file mode 100644
index 0000000000..fe58e31e52
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire5.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire6.png b/core/assets-raw/sprites/blocks/fire/fire6.png
new file mode 100644
index 0000000000..0e2a45ff80
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire6.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire7.png b/core/assets-raw/sprites/blocks/fire/fire7.png
new file mode 100644
index 0000000000..b74acf05a5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire7.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire8.png b/core/assets-raw/sprites/blocks/fire/fire8.png
new file mode 100644
index 0000000000..461e0cbc76
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire8.png differ
diff --git a/core/assets-raw/sprites/blocks/fire/fire9.png b/core/assets-raw/sprites/blocks/fire/fire9.png
new file mode 100644
index 0000000000..f306ed27e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/fire/fire9.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png
deleted file mode 100644
index f2f7dfdd99..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-1.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-2.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-4.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-4.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom.png
new file mode 100644
index 0000000000..04cecf2c96
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-1.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-1.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-2.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-2.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-4.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-4.png
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/conduits/phase-conduit-end.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/phase-conduit-end.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-cap.png
new file mode 100644
index 0000000000..d19202db4e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-cap.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-1.png
new file mode 100644
index 0000000000..c231c324b1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-2.png
new file mode 100644
index 0000000000..233badb748
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-4.png
new file mode 100644
index 0000000000..a131889d9f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-0.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-1.png
new file mode 100644
index 0000000000..dbbd8d9242
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-2.png
new file mode 100644
index 0000000000..9fd3100e44
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png
rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-3.png
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-4.png
new file mode 100644
index 0000000000..3cc7dbc525
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png
new file mode 100644
index 0000000000..c416e449d7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png
new file mode 100644
index 0000000000..a340e4c59a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png
new file mode 100644
index 0000000000..ebdfd62c44
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png
new file mode 100644
index 0000000000..bab3db3a41
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png
new file mode 100644
index 0000000000..539aa3f057
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png
new file mode 100644
index 0000000000..391ac88373
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/fluid.png b/core/assets-raw/sprites/blocks/liquid/fluid.png
new file mode 100644
index 0000000000..d2896d5c7b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/fluid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/thermal-pump-liquid.png b/core/assets-raw/sprites/blocks/liquid/impulse-pump-liquid.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/liquid/thermal-pump-liquid.png
rename to core/assets-raw/sprites/blocks/liquid/impulse-pump-liquid.png
diff --git a/core/assets-raw/sprites/blocks/liquid/impulse-pump.png b/core/assets-raw/sprites/blocks/liquid/impulse-pump.png
new file mode 100644
index 0000000000..b0434345bb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/impulse-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-container-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-container-bottom.png
new file mode 100644
index 0000000000..a100086fe3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/liquid-container-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-container.png b/core/assets-raw/sprites/blocks/liquid/liquid-container.png
new file mode 100644
index 0000000000..9b02d641ff
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/liquid-container.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png
index 4f33525764..d3747e323c 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png
deleted file mode 100644
index 00dfc92f87..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png
deleted file mode 100644
index 4e45a7094b..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router.png b/core/assets-raw/sprites/blocks/liquid/liquid-router.png
new file mode 100644
index 0000000000..9a357e43da
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/liquid-router.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 4e33a6bfba..7337b1d716 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
deleted file mode 100644
index 961a9f82c7..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png and /dev/null 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
deleted file mode 100644
index c1c36e33be..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank.png
new file mode 100644
index 0000000000..a5dd0d618e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/liquid-tank.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png
index ec2633c5cc..402c082bc3 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png
deleted file mode 100644
index 4d6438c432..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png
deleted file mode 100644
index 40189f33c0..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png
deleted file mode 100644
index bb72269c7c..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png and /dev/null 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
deleted file mode 100644
index be533536a7..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png
deleted file mode 100644
index 4db953390c..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png
deleted file mode 100644
index 78a57e8f64..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png and /dev/null 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
deleted file mode 100644
index f4e6379a31..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-arrow.png
new file mode 100644
index 0000000000..aeeca0acda
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bottom.png
new file mode 100644
index 0000000000..d621cd520b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bridge-liquid.png b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bridge-liquid.png
new file mode 100644
index 0000000000..afef676ff0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bridge-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bridge.png b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bridge.png
new file mode 100644
index 0000000000..b078e3e17b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-dir.png b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-dir.png
new file mode 100644
index 0000000000..153772f943
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-dir.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-liquid.png b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-liquid.png
new file mode 100644
index 0000000000..2dfd181a22
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit.png b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit.png
new file mode 100644
index 0000000000..88b34c2f6e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-bridge-conduit.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-bottom.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-bottom.png
new file mode 100644
index 0000000000..93f71bd324
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container.png
new file mode 100644
index 0000000000..8cb802bc37
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-junction.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-junction.png
new file mode 100644
index 0000000000..14e9390a78
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-junction.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-bottom.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-bottom.png
new file mode 100644
index 0000000000..b112128bfa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router.png
new file mode 100644
index 0000000000..00ed5aff84
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-bottom.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-bottom.png
new file mode 100644
index 0000000000..5fb4e36d85
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank.png
new file mode 100644
index 0000000000..69573873b7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-pump-liquid.png b/core/assets-raw/sprites/blocks/liquid/reinforced-pump-liquid.png
new file mode 100644
index 0000000000..63d230191d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-pump-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-pump.png b/core/assets-raw/sprites/blocks/liquid/reinforced-pump.png
new file mode 100644
index 0000000000..1f1884f6bb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/reinforced-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png
index 29a234b331..ad88b06753 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png and b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png
deleted file mode 100644
index 5f8f061bfc..0000000000
Binary files a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/logic/canvas-corner1.png b/core/assets-raw/sprites/blocks/logic/canvas-corner1.png
new file mode 100644
index 0000000000..8c02a574b9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/canvas-corner1.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/canvas-corner2.png b/core/assets-raw/sprites/blocks/logic/canvas-corner2.png
new file mode 100644
index 0000000000..351ae9dd57
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/canvas-corner2.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/canvas-side1.png b/core/assets-raw/sprites/blocks/logic/canvas-side1.png
new file mode 100644
index 0000000000..cb99ffcea0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/canvas-side1.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/canvas-side2.png b/core/assets-raw/sprites/blocks/logic/canvas-side2.png
new file mode 100644
index 0000000000..dff99143b8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/canvas-side2.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/canvas.png b/core/assets-raw/sprites/blocks/logic/canvas.png
new file mode 100644
index 0000000000..b6fddec703
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/canvas.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/reinforced-message.png b/core/assets-raw/sprites/blocks/logic/reinforced-message.png
new file mode 100644
index 0000000000..8721982e3a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/reinforced-message.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/world-cell.png b/core/assets-raw/sprites/blocks/logic/world-cell.png
new file mode 100644
index 0000000000..67aba657a7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/world-cell.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/world-message.png b/core/assets-raw/sprites/blocks/logic/world-message.png
new file mode 100644
index 0000000000..66e4bd3d64
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/world-message.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/world-processor.png b/core/assets-raw/sprites/blocks/logic/world-processor.png
new file mode 100644
index 0000000000..8b98451cab
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/world-processor.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/world-switch-on.png b/core/assets-raw/sprites/blocks/logic/world-switch-on.png
new file mode 100644
index 0000000000..54f03c820c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/world-switch-on.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/world-switch.png b/core/assets-raw/sprites/blocks/logic/world-switch.png
new file mode 100644
index 0000000000..b7c65601a9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/world-switch.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/constructor-top.png b/core/assets-raw/sprites/blocks/payload/constructor-top.png
new file mode 100644
index 0000000000..bf852e5635
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/constructor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/constructor.png b/core/assets-raw/sprites/blocks/payload/constructor.png
new file mode 100644
index 0000000000..3a72e1e649
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/constructor.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/deconstructor-top.png b/core/assets-raw/sprites/blocks/payload/deconstructor-top.png
new file mode 100644
index 0000000000..ced9f4de1e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/deconstructor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/deconstructor.png b/core/assets-raw/sprites/blocks/payload/deconstructor.png
new file mode 100644
index 0000000000..f0dfc652f0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/deconstructor.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/factory-in-3-dark.png b/core/assets-raw/sprites/blocks/payload/factory-in-3-dark.png
new file mode 100644
index 0000000000..d626287db6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-in-3-dark.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/factory-in-3.png b/core/assets-raw/sprites/blocks/payload/factory-in-3.png
new file mode 100644
index 0000000000..9ea0ed0f19
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-in-3.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/factory-in-5-dark.png b/core/assets-raw/sprites/blocks/payload/factory-in-5-dark.png
new file mode 100644
index 0000000000..7514a32f0f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-in-5-dark.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/factory-in-5.png b/core/assets-raw/sprites/blocks/payload/factory-in-5.png
new file mode 100644
index 0000000000..df9e5a45b3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-in-5.png differ
diff --git a/core/assets-raw/sprites/blocks/units/factory-in-7.png b/core/assets-raw/sprites/blocks/payload/factory-in-7.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/units/factory-in-7.png
rename to core/assets-raw/sprites/blocks/payload/factory-in-7.png
diff --git a/core/assets-raw/sprites/blocks/units/factory-in-9.png b/core/assets-raw/sprites/blocks/payload/factory-in-9.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/units/factory-in-9.png
rename to core/assets-raw/sprites/blocks/payload/factory-in-9.png
diff --git a/core/assets-raw/sprites/blocks/payload/factory-out-3-dark.png b/core/assets-raw/sprites/blocks/payload/factory-out-3-dark.png
new file mode 100644
index 0000000000..8291470ae0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-out-3-dark.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/factory-out-3.png b/core/assets-raw/sprites/blocks/payload/factory-out-3.png
new file mode 100644
index 0000000000..84caaa1c31
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-out-3.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/factory-out-5-dark.png b/core/assets-raw/sprites/blocks/payload/factory-out-5-dark.png
new file mode 100644
index 0000000000..8c6647da56
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-out-5-dark.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/factory-out-5.png b/core/assets-raw/sprites/blocks/payload/factory-out-5.png
new file mode 100644
index 0000000000..b82842d043
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-out-5.png differ
diff --git a/core/assets-raw/sprites/blocks/units/factory-out-7.png b/core/assets-raw/sprites/blocks/payload/factory-out-7.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/units/factory-out-7.png
rename to core/assets-raw/sprites/blocks/payload/factory-out-7.png
diff --git a/core/assets-raw/sprites/blocks/units/factory-out-9.png b/core/assets-raw/sprites/blocks/payload/factory-out-9.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/units/factory-out-9.png
rename to core/assets-raw/sprites/blocks/payload/factory-out-9.png
diff --git a/core/assets-raw/sprites/blocks/units/factory-top-3.png b/core/assets-raw/sprites/blocks/payload/factory-top-3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/units/factory-top-3.png
rename to core/assets-raw/sprites/blocks/payload/factory-top-3.png
diff --git a/core/assets-raw/sprites/blocks/payload/factory-top-5.png b/core/assets-raw/sprites/blocks/payload/factory-top-5.png
new file mode 100644
index 0000000000..d48314ce89
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/factory-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-constructor-top.png b/core/assets-raw/sprites/blocks/payload/large-constructor-top.png
new file mode 100644
index 0000000000..6f20681c20
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-constructor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-constructor.png b/core/assets-raw/sprites/blocks/payload/large-constructor.png
new file mode 100644
index 0000000000..7436b040cc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-constructor.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-base.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-base.png
new file mode 100644
index 0000000000..71926c7682
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-base.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png
new file mode 100644
index 0000000000..5b50a925a3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-left.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-left.png
new file mode 100644
index 0000000000..66f72a57d1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-left.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-right.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-right.png
new file mode 100644
index 0000000000..6169ea0ff9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-right.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-top.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-top.png
new file mode 100644
index 0000000000..651424a4b3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png
new file mode 100644
index 0000000000..61004049b7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-conveyor-edge.png b/core/assets-raw/sprites/blocks/payload/payload-conveyor-edge.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-conveyor-edge.png
rename to core/assets-raw/sprites/blocks/payload/payload-conveyor-edge.png
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-conveyor-icon.png b/core/assets-raw/sprites/blocks/payload/payload-conveyor-icon.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-conveyor-icon.png
rename to core/assets-raw/sprites/blocks/payload/payload-conveyor-icon.png
diff --git a/core/assets-raw/sprites/blocks/payload/payload-conveyor-top.png b/core/assets-raw/sprites/blocks/payload/payload-conveyor-top.png
new file mode 100644
index 0000000000..1ca1586c59
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-conveyor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-conveyor.png b/core/assets-raw/sprites/blocks/payload/payload-conveyor.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-conveyor.png
rename to core/assets-raw/sprites/blocks/payload/payload-conveyor.png
diff --git a/core/assets-raw/sprites/blocks/payload/payload-loader-top.png b/core/assets-raw/sprites/blocks/payload/payload-loader-top.png
new file mode 100644
index 0000000000..4c737ab093
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-loader-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-loader.png b/core/assets-raw/sprites/blocks/payload/payload-loader.png
new file mode 100644
index 0000000000..0262be6c74
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-loader.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png
new file mode 100644
index 0000000000..373f195e1e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-cap.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-cap.png
new file mode 100644
index 0000000000..7e23e7b922
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-cap.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-left.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-left.png
new file mode 100644
index 0000000000..e0f0b836fa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-left.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-right.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-right.png
new file mode 100644
index 0000000000..868968adef
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-right.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-top.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-top.png
new file mode 100644
index 0000000000..0707b165ad
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver.png
new file mode 100644
index 0000000000..542b543fa1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-router-icon.png b/core/assets-raw/sprites/blocks/payload/payload-router-icon.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-router-icon.png
rename to core/assets-raw/sprites/blocks/payload/payload-router-icon.png
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-router-over.png b/core/assets-raw/sprites/blocks/payload/payload-router-over.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-router-over.png
rename to core/assets-raw/sprites/blocks/payload/payload-router-over.png
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-router-top.png b/core/assets-raw/sprites/blocks/payload/payload-router-top.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-router-top.png
rename to core/assets-raw/sprites/blocks/payload/payload-router-top.png
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-router.png b/core/assets-raw/sprites/blocks/payload/payload-router.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-router.png
rename to core/assets-raw/sprites/blocks/payload/payload-router.png
diff --git a/core/assets-raw/sprites/blocks/payload/payload-source-top.png b/core/assets-raw/sprites/blocks/payload/payload-source-top.png
new file mode 100644
index 0000000000..2de4c170be
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-source-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-source.png b/core/assets-raw/sprites/blocks/payload/payload-source.png
new file mode 100644
index 0000000000..a103553b71
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-source.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-unloader-top.png b/core/assets-raw/sprites/blocks/payload/payload-unloader-top.png
new file mode 100644
index 0000000000..1590a12792
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-unloader-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-unloader.png b/core/assets-raw/sprites/blocks/payload/payload-unloader.png
new file mode 100644
index 0000000000..fb55b6eb6f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-unloader.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-void-top.png b/core/assets-raw/sprites/blocks/payload/payload-void-top.png
new file mode 100644
index 0000000000..f334d23032
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-void-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/payload-void.png b/core/assets-raw/sprites/blocks/payload/payload-void.png
new file mode 100644
index 0000000000..4c6b7b2070
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/payload-void.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-edge.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-edge.png
new file mode 100644
index 0000000000..13b2c8ee49
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-icon.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-icon.png
new file mode 100644
index 0000000000..c2ba97a8ec
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-icon.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-top.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-top.png
new file mode 100644
index 0000000000..fe7a84ecb4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor.png
new file mode 100644
index 0000000000..9bced72851
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-icon.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-icon.png
new file mode 100644
index 0000000000..f2bc5e234a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-icon.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-over.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-over.png
new file mode 100644
index 0000000000..e7b14a86bc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-over.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-top.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-top.png
new file mode 100644
index 0000000000..c4c3376f1c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/reinforced-payload-router.png b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router.png
new file mode 100644
index 0000000000..cc9cacb3f8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/reinforced-payload-router.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/small-deconstructor-top.png b/core/assets-raw/sprites/blocks/payload/small-deconstructor-top.png
new file mode 100644
index 0000000000..4e5aa251ee
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/small-deconstructor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/payload/small-deconstructor.png b/core/assets-raw/sprites/blocks/payload/small-deconstructor.png
new file mode 100644
index 0000000000..a35d68ca80
Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/small-deconstructor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/beam-link-glow.png b/core/assets-raw/sprites/blocks/power/beam-link-glow.png
new file mode 100644
index 0000000000..6777c9a222
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/beam-link-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/power/beam-link.png b/core/assets-raw/sprites/blocks/power/beam-link.png
new file mode 100644
index 0000000000..7311804768
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/beam-link.png differ
diff --git a/core/assets-raw/sprites/blocks/power/beam-node.png b/core/assets-raw/sprites/blocks/power/beam-node.png
new file mode 100644
index 0000000000..f8de5c55ed
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/beam-node.png differ
diff --git a/core/assets-raw/sprites/blocks/power/beam-tower.png b/core/assets-raw/sprites/blocks/power/beam-tower.png
new file mode 100644
index 0000000000..74ade38fcd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/beam-tower.png differ
diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-bottom.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-glow.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-glow.png
new file mode 100644
index 0000000000..dc693222b2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-mid.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-mid.png
new file mode 100644
index 0000000000..b731775514
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston-icon.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston-icon.png
new file mode 100644
index 0000000000..72343d5294
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston-icon.png differ
diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston0.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston0.png
new file mode 100644
index 0000000000..c34d9e07b7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston0.png differ
diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston1.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston1.png
new file mode 100644
index 0000000000..a1903efcdb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston1.png differ
diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber.png
new file mode 100644
index 0000000000..c3fcc8ae3a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber.png differ
diff --git a/core/assets-raw/sprites/blocks/power/flux-reactor-bottom.png b/core/assets-raw/sprites/blocks/power/flux-reactor-bottom.png
new file mode 100644
index 0000000000..45a8dc8331
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/flux-reactor-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/power/flux-reactor-heat.png b/core/assets-raw/sprites/blocks/power/flux-reactor-heat.png
new file mode 100644
index 0000000000..2f5ad4f7fa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/flux-reactor-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/power/flux-reactor-lights.png b/core/assets-raw/sprites/blocks/power/flux-reactor-lights.png
new file mode 100644
index 0000000000..871351735b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/flux-reactor-lights.png differ
diff --git a/core/assets-raw/sprites/blocks/power/flux-reactor-mid.png b/core/assets-raw/sprites/blocks/power/flux-reactor-mid.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/flux-reactor-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/power/flux-reactor-ventglow.png b/core/assets-raw/sprites/blocks/power/flux-reactor-ventglow.png
new file mode 100644
index 0000000000..491e57cb20
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/flux-reactor-ventglow.png differ
diff --git a/core/assets-raw/sprites/blocks/power/flux-reactor.png b/core/assets-raw/sprites/blocks/power/flux-reactor.png
new file mode 100644
index 0000000000..0758766a4c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/flux-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor.png b/core/assets-raw/sprites/blocks/power/impact-reactor.png
index d56bd5d6a5..7f9363494d 100644
Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor.png and b/core/assets-raw/sprites/blocks/power/impact-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor-bottom.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-bottom.png
new file mode 100644
index 0000000000..c3eeda8e4c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor-center.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-center.png
new file mode 100644
index 0000000000..e26c3c877d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-center.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor-glow.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-glow.png
new file mode 100644
index 0000000000..88336542e8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor-heat.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-heat.png
new file mode 100644
index 0000000000..a5da4dbe49
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor-middle.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-middle.png
new file mode 100644
index 0000000000..3b1e8154c6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-middle.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor-top1.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-top1.png
new file mode 100644
index 0000000000..3d713dd948
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor-top2.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-top2.png
new file mode 100644
index 0000000000..fe644e7923
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/power/neoplasia-reactor.png b/core/assets-raw/sprites/blocks/power/neoplasia-reactor.png
new file mode 100644
index 0000000000..d13908e222
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/neoplasia-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator-bottom.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator-glow.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-glow.png
new file mode 100644
index 0000000000..f49f17b58e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator-mid.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-mid.png
new file mode 100644
index 0000000000..828dec466d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-icon.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-icon.png
new file mode 100644
index 0000000000..b3ae59668c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-icon.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-t.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-t.png
new file mode 100644
index 0000000000..ec2c057559
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-t.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston.png
new file mode 100644
index 0000000000..79f0f31908
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston1.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston1.png
new file mode 100644
index 0000000000..f1b62ced4a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston1.png differ
diff --git a/core/assets-raw/sprites/blocks/power/pyrolysis-generator.png b/core/assets-raw/sprites/blocks/power/pyrolysis-generator.png
new file mode 100644
index 0000000000..356a2f0fb6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pyrolysis-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator.png b/core/assets-raw/sprites/blocks/power/rtg-generator.png
index 0a6766ab69..1dd27d69c9 100644
Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator.png and b/core/assets-raw/sprites/blocks/power/rtg-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar-panel-large.png b/core/assets-raw/sprites/blocks/power/solar-panel-large.png
index 60526693a6..9777853a2b 100644
Binary files a/core/assets-raw/sprites/blocks/power/solar-panel-large.png and b/core/assets-raw/sprites/blocks/power/solar-panel-large.png differ
diff --git a/core/assets-raw/sprites/blocks/power/steam-generator-turbine1.png b/core/assets-raw/sprites/blocks/power/steam-generator-turbine.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/power/steam-generator-turbine1.png
rename to core/assets-raw/sprites/blocks/power/steam-generator-turbine.png
diff --git a/core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png b/core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png
deleted file mode 100644
index 27d0b9354c..0000000000
Binary files a/core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png b/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png
new file mode 100644
index 0000000000..adea1029af
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator.png b/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator.png
new file mode 100644
index 0000000000..76e45e9297
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-condenser.png b/core/assets-raw/sprites/blocks/power/turbine-condenser.png
new file mode 100644
index 0000000000..7322043c40
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/turbine-condenser.png differ
diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter.png b/core/assets-raw/sprites/blocks/production/alloy-smelter.png
deleted file mode 100644
index f9a0a1fc17..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/alloy-smelter.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/atmospheric-concentrator-bottom.png b/core/assets-raw/sprites/blocks/production/atmospheric-concentrator-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/atmospheric-concentrator-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/atmospheric-concentrator-heat.png b/core/assets-raw/sprites/blocks/production/atmospheric-concentrator-heat.png
new file mode 100644
index 0000000000..aa49eeb57d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/atmospheric-concentrator-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/atmospheric-concentrator.png b/core/assets-raw/sprites/blocks/production/atmospheric-concentrator.png
new file mode 100644
index 0000000000..031e3873ed
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/atmospheric-concentrator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/block-forge.png b/core/assets-raw/sprites/blocks/production/block-forge.png
deleted file mode 100644
index 6d37c59675..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/block-forge.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/carbide-crucible-bottom.png b/core/assets-raw/sprites/blocks/production/carbide-crucible-bottom.png
new file mode 100644
index 0000000000..cc9cacb3f8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/carbide-crucible-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/carbide-crucible-heat.png b/core/assets-raw/sprites/blocks/production/carbide-crucible-heat.png
new file mode 100644
index 0000000000..59a1fd5c36
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/carbide-crucible-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/carbide-crucible.png b/core/assets-raw/sprites/blocks/production/carbide-crucible.png
new file mode 100644
index 0000000000..dc23c2a8fe
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/carbide-crucible.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png
index b9bc65af45..e05f72e92c 100644
Binary files a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png and b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-liquid.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-liquid.png
deleted file mode 100644
index 26d446e761..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-liquid.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png
deleted file mode 100644
index 3bb5abe3cb..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluid-mixer.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer.png
new file mode 100644
index 0000000000..563dd8f2fd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cryofluid-mixer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cultivator-bottom.png b/core/assets-raw/sprites/blocks/production/cultivator-bottom.png
new file mode 100644
index 0000000000..e05f72e92c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cultivator-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cultivator.png b/core/assets-raw/sprites/blocks/production/cultivator.png
index e1ff7aa692..0532d0e1db 100644
Binary files a/core/assets-raw/sprites/blocks/production/cultivator.png and b/core/assets-raw/sprites/blocks/production/cultivator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-bottom.png b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat-top.png b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat-top.png
new file mode 100644
index 0000000000..96f1322152
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat.png b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat.png
new file mode 100644
index 0000000000..38598c0d6d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer.png b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer.png
new file mode 100644
index 0000000000..52c25ba6c4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cyanogen-synthesizer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/disassembler-bottom.png b/core/assets-raw/sprites/blocks/production/disassembler-bottom.png
new file mode 100644
index 0000000000..7337b1d716
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/disassembler-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/disassembler-liquid.png b/core/assets-raw/sprites/blocks/production/disassembler-liquid.png
deleted file mode 100644
index 88006fc498..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/disassembler-liquid.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/disassembler-spinner.png b/core/assets-raw/sprites/blocks/production/disassembler-spinner.png
index 8a7c2bd606..8fe3e32526 100644
Binary files a/core/assets-raw/sprites/blocks/production/disassembler-spinner.png and b/core/assets-raw/sprites/blocks/production/disassembler-spinner.png differ
diff --git a/core/assets-raw/sprites/blocks/production/disassembler.png b/core/assets-raw/sprites/blocks/production/disassembler.png
index 7dbfcb1474..ce6ded3a03 100644
Binary files a/core/assets-raw/sprites/blocks/production/disassembler.png and b/core/assets-raw/sprites/blocks/production/disassembler.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electric-heater-heat.png b/core/assets-raw/sprites/blocks/production/electric-heater-heat.png
new file mode 100644
index 0000000000..1b293c32c8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electric-heater-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electric-heater-top1.png b/core/assets-raw/sprites/blocks/production/electric-heater-top1.png
new file mode 100644
index 0000000000..7a563faa78
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electric-heater-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electric-heater-top2.png b/core/assets-raw/sprites/blocks/production/electric-heater-top2.png
new file mode 100644
index 0000000000..6e8ffe98cd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electric-heater-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electric-heater.png b/core/assets-raw/sprites/blocks/production/electric-heater.png
new file mode 100644
index 0000000000..e90c2b62a8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electric-heater.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-bottom.png b/core/assets-raw/sprites/blocks/production/electrolyzer-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electrolyzer-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-glow.png b/core/assets-raw/sprites/blocks/production/electrolyzer-glow.png
new file mode 100644
index 0000000000..7d88560571
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electrolyzer-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output1.png b/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output1.png
new file mode 100644
index 0000000000..f5cae9dcf9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output2.png b/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output2.png
new file mode 100644
index 0000000000..0ba6370856
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output1.png b/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output1.png
new file mode 100644
index 0000000000..f81b37607e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output2.png b/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output2.png
new file mode 100644
index 0000000000..805af9c900
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer.png b/core/assets-raw/sprites/blocks/production/electrolyzer.png
new file mode 100644
index 0000000000..ee3954fb7e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/electrolyzer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-reactor-glow.png b/core/assets-raw/sprites/blocks/production/heat-reactor-glow.png
new file mode 100644
index 0000000000..236059e1c8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-reactor-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-reactor-heat.png b/core/assets-raw/sprites/blocks/production/heat-reactor-heat.png
new file mode 100644
index 0000000000..63eda92a37
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-reactor-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-reactor-top1.png b/core/assets-raw/sprites/blocks/production/heat-reactor-top1.png
new file mode 100644
index 0000000000..68454936da
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-reactor-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-reactor-top2.png b/core/assets-raw/sprites/blocks/production/heat-reactor-top2.png
new file mode 100644
index 0000000000..b5861e05da
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-reactor-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-reactor.png b/core/assets-raw/sprites/blocks/production/heat-reactor.png
new file mode 100644
index 0000000000..a23dffaddb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-redirector-glow.png b/core/assets-raw/sprites/blocks/production/heat-redirector-glow.png
new file mode 100644
index 0000000000..87109515fc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-redirector-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-redirector-heat.png b/core/assets-raw/sprites/blocks/production/heat-redirector-heat.png
new file mode 100644
index 0000000000..0115ebd9c5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-redirector-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-redirector-top1.png b/core/assets-raw/sprites/blocks/production/heat-redirector-top1.png
new file mode 100644
index 0000000000..ae2463b4b3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-redirector-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-redirector-top2.png b/core/assets-raw/sprites/blocks/production/heat-redirector-top2.png
new file mode 100644
index 0000000000..1cafe50705
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-redirector-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-redirector.png b/core/assets-raw/sprites/blocks/production/heat-redirector.png
new file mode 100644
index 0000000000..d664306eaa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-redirector.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-router-glow.png b/core/assets-raw/sprites/blocks/production/heat-router-glow.png
new file mode 100644
index 0000000000..234616dd67
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-router-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-router-heat.png b/core/assets-raw/sprites/blocks/production/heat-router-heat.png
new file mode 100644
index 0000000000..dd574df57d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-router-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-router-top1.png b/core/assets-raw/sprites/blocks/production/heat-router-top1.png
new file mode 100644
index 0000000000..b9cba509e5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-router-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-router-top2.png b/core/assets-raw/sprites/blocks/production/heat-router-top2.png
new file mode 100644
index 0000000000..0d59002b17
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-router-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/heat-router.png b/core/assets-raw/sprites/blocks/production/heat-router.png
new file mode 100644
index 0000000000..0120bf6b0b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/heat-router.png differ
diff --git a/core/assets-raw/sprites/blocks/production/item-source.png b/core/assets-raw/sprites/blocks/production/item-source.png
deleted file mode 100644
index 98dc16ac3c..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/item-source.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/liquid-source.png b/core/assets-raw/sprites/blocks/production/liquid-source.png
deleted file mode 100644
index 0ae3a70f6f..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/liquid-source.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/melter-bottom.png b/core/assets-raw/sprites/blocks/production/melter-bottom.png
new file mode 100644
index 0000000000..a2dd7b5e0c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/melter-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/melter.png b/core/assets-raw/sprites/blocks/production/melter.png
index f499dd9893..90e833e2f5 100644
Binary files a/core/assets-raw/sprites/blocks/production/melter.png and b/core/assets-raw/sprites/blocks/production/melter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oxidation-chamber-bottom.png b/core/assets-raw/sprites/blocks/production/oxidation-chamber-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oxidation-chamber-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oxidation-chamber-glow.png b/core/assets-raw/sprites/blocks/production/oxidation-chamber-glow.png
new file mode 100644
index 0000000000..f1a3713cb8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oxidation-chamber-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oxidation-chamber-heat.png b/core/assets-raw/sprites/blocks/production/oxidation-chamber-heat.png
new file mode 100644
index 0000000000..1fbb3a69f3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oxidation-chamber-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oxidation-chamber-liquid.png b/core/assets-raw/sprites/blocks/production/oxidation-chamber-liquid.png
new file mode 100644
index 0000000000..6cad59a0bd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oxidation-chamber-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oxidation-chamber-top1.png b/core/assets-raw/sprites/blocks/production/oxidation-chamber-top1.png
new file mode 100644
index 0000000000..6d4fb92302
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oxidation-chamber-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oxidation-chamber-top2.png b/core/assets-raw/sprites/blocks/production/oxidation-chamber-top2.png
new file mode 100644
index 0000000000..c946c052c8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oxidation-chamber-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oxidation-chamber.png b/core/assets-raw/sprites/blocks/production/oxidation-chamber.png
new file mode 100644
index 0000000000..ebee304b7b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/oxidation-chamber.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-heater-heat.png b/core/assets-raw/sprites/blocks/production/phase-heater-heat.png
new file mode 100644
index 0000000000..21a8096ff6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-heater-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-heater-side2.png b/core/assets-raw/sprites/blocks/production/phase-heater-side2.png
new file mode 100644
index 0000000000..e3d0222dae
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-heater-side2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-heater-top1.png b/core/assets-raw/sprites/blocks/production/phase-heater-top1.png
new file mode 100644
index 0000000000..75c0a1a1e3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-heater-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-heater-top2.png b/core/assets-raw/sprites/blocks/production/phase-heater-top2.png
new file mode 100644
index 0000000000..293114bdc7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-heater-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-heater.png b/core/assets-raw/sprites/blocks/production/phase-heater.png
new file mode 100644
index 0000000000..3563a591b4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-heater.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-synthesizer-bottom.png b/core/assets-raw/sprites/blocks/production/phase-synthesizer-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-synthesizer-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-synthesizer-heat.png b/core/assets-raw/sprites/blocks/production/phase-synthesizer-heat.png
new file mode 100644
index 0000000000..0b92689db7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-synthesizer-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-synthesizer-vents.png b/core/assets-raw/sprites/blocks/production/phase-synthesizer-vents.png
new file mode 100644
index 0000000000..fc374249d2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-synthesizer-vents.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-synthesizer-weave-glow.png b/core/assets-raw/sprites/blocks/production/phase-synthesizer-weave-glow.png
new file mode 100644
index 0000000000..6766157c72
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-synthesizer-weave-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-synthesizer-weave.png b/core/assets-raw/sprites/blocks/production/phase-synthesizer-weave.png
new file mode 100644
index 0000000000..0c82c7a802
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-synthesizer-weave.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-synthesizer.png b/core/assets-raw/sprites/blocks/production/phase-synthesizer.png
new file mode 100644
index 0000000000..04a97dad35
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-synthesizer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png b/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png
index ceb6a9b646..52892006b4 100644
Binary files a/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png and b/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png
index 72cd249d26..e89e5ed5e7 100644
Binary files a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png and b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-top.png b/core/assets-raw/sprites/blocks/production/pulverizer-top.png
new file mode 100644
index 0000000000..6c2aa6d653
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/pulverizer-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pulverizer.png b/core/assets-raw/sprites/blocks/production/pulverizer.png
index d10680f33c..bd07997cdf 100644
Binary files a/core/assets-raw/sprites/blocks/production/pulverizer.png and b/core/assets-raw/sprites/blocks/production/pulverizer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator-bottom.png b/core/assets-raw/sprites/blocks/production/separator-bottom.png
new file mode 100644
index 0000000000..a100086fe3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/separator-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator-liquid.png b/core/assets-raw/sprites/blocks/production/separator-liquid.png
deleted file mode 100644
index 0f81574062..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/separator-liquid.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/separator-spinner.png b/core/assets-raw/sprites/blocks/production/separator-spinner.png
index e09e119c3d..0ab52e41dc 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator-spinner.png and b/core/assets-raw/sprites/blocks/production/separator-spinner.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator.png b/core/assets-raw/sprites/blocks/production/separator.png
index cefbb02633..20c9e6b72f 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator.png and b/core/assets-raw/sprites/blocks/production/separator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/silicon-arc-furnace.png b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace.png
new file mode 100644
index 0000000000..0c7055569b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge-bottom.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-centrifuge-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge-glow.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge-glow.png
new file mode 100644
index 0000000000..f85f42d1a7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-centrifuge-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge-liquid.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge-liquid.png
new file mode 100644
index 0000000000..a8fb90921f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-centrifuge-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge.png
new file mode 100644
index 0000000000..087cb47e60
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-centrifuge.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png b/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png
new file mode 100644
index 0000000000..1500ec39a0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-heat.png b/core/assets-raw/sprites/blocks/production/slag-heater-heat.png
new file mode 100644
index 0000000000..e6b68412df
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top1.png b/core/assets-raw/sprites/blocks/production/slag-heater-top1.png
new file mode 100644
index 0000000000..25c3155f75
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top2.png b/core/assets-raw/sprites/blocks/production/slag-heater-top2.png
new file mode 100644
index 0000000000..a0ba5f8446
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-heater.png b/core/assets-raw/sprites/blocks/production/slag-heater.png
new file mode 100644
index 0000000000..1dbf8eb644
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-incinerator-liquid.png b/core/assets-raw/sprites/blocks/production/slag-incinerator-liquid.png
new file mode 100644
index 0000000000..4759ece2ce
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-incinerator-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-incinerator-top.png b/core/assets-raw/sprites/blocks/production/slag-incinerator-top.png
new file mode 100644
index 0000000000..5fd4aef511
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-incinerator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/slag-incinerator.png b/core/assets-raw/sprites/blocks/production/slag-incinerator.png
new file mode 100644
index 0000000000..2ad32b475b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-incinerator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/small-heat-redirector-glow.png b/core/assets-raw/sprites/blocks/production/small-heat-redirector-glow.png
new file mode 100644
index 0000000000..c2888ca8d9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/small-heat-redirector-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/small-heat-redirector-heat.png b/core/assets-raw/sprites/blocks/production/small-heat-redirector-heat.png
new file mode 100644
index 0000000000..4b75fbf11a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/small-heat-redirector-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/small-heat-redirector-top1.png b/core/assets-raw/sprites/blocks/production/small-heat-redirector-top1.png
new file mode 100644
index 0000000000..fe05c81d2b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/small-heat-redirector-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/small-heat-redirector-top2.png b/core/assets-raw/sprites/blocks/production/small-heat-redirector-top2.png
new file mode 100644
index 0000000000..4af1a77431
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/small-heat-redirector-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/small-heat-redirector.png b/core/assets-raw/sprites/blocks/production/small-heat-redirector.png
new file mode 100644
index 0000000000..3b51f89bbc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/small-heat-redirector.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-bottom.png b/core/assets-raw/sprites/blocks/production/spore-press-bottom.png
new file mode 100644
index 0000000000..a100086fe3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/spore-press-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame0.png b/core/assets-raw/sprites/blocks/production/spore-press-frame0.png
deleted file mode 100644
index a8b86d93bd..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame0.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame1.png b/core/assets-raw/sprites/blocks/production/spore-press-frame1.png
deleted file mode 100644
index 9b403cb9ce..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame2.png b/core/assets-raw/sprites/blocks/production/spore-press-frame2.png
deleted file mode 100644
index 34f8aad11b..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-piston-icon.png b/core/assets-raw/sprites/blocks/production/spore-press-piston-icon.png
new file mode 100644
index 0000000000..921a96ef36
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/spore-press-piston-icon.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-piston0.png b/core/assets-raw/sprites/blocks/production/spore-press-piston0.png
new file mode 100644
index 0000000000..80dec747a0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/spore-press-piston0.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-piston1.png b/core/assets-raw/sprites/blocks/production/spore-press-piston1.png
new file mode 100644
index 0000000000..e1b46944ab
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/spore-press-piston1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press.png b/core/assets-raw/sprites/blocks/production/spore-press.png
index ae5aee87b3..f1a2f020a8 100644
Binary files a/core/assets-raw/sprites/blocks/production/spore-press.png and b/core/assets-raw/sprites/blocks/production/spore-press.png differ
diff --git a/core/assets-raw/sprites/blocks/production/surge-crucible-bottom.png b/core/assets-raw/sprites/blocks/production/surge-crucible-bottom.png
new file mode 100644
index 0000000000..4f4b6a2b8f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/surge-crucible-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/surge-crucible-glow.png b/core/assets-raw/sprites/blocks/production/surge-crucible-glow.png
new file mode 100644
index 0000000000..9cbb441b7e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/surge-crucible-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/production/surge-crucible-heat.png b/core/assets-raw/sprites/blocks/production/surge-crucible-heat.png
new file mode 100644
index 0000000000..92151659ec
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/surge-crucible-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/production/surge-crucible-liquid.png b/core/assets-raw/sprites/blocks/production/surge-crucible-liquid.png
new file mode 100644
index 0000000000..e2e3a85b82
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/surge-crucible-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/surge-crucible-vents.png b/core/assets-raw/sprites/blocks/production/surge-crucible-vents.png
new file mode 100644
index 0000000000..0386580503
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/surge-crucible-vents.png differ
diff --git a/core/assets-raw/sprites/blocks/production/surge-crucible.png b/core/assets-raw/sprites/blocks/production/surge-crucible.png
new file mode 100644
index 0000000000..8380ad3d4b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/surge-crucible.png differ
diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png b/core/assets-raw/sprites/blocks/production/surge-smelter-top.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/production/alloy-smelter-top.png
rename to core/assets-raw/sprites/blocks/production/surge-smelter-top.png
diff --git a/core/assets-raw/sprites/blocks/production/surge-smelter.png b/core/assets-raw/sprites/blocks/production/surge-smelter.png
new file mode 100644
index 0000000000..0d8a3b5475
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/surge-smelter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png b/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png
new file mode 100644
index 0000000000..07cfe1dc61
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png b/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png
new file mode 100644
index 0000000000..b70942ba6b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-rotator-blur.png b/core/assets-raw/sprites/blocks/production/vent-condenser-rotator-blur.png
new file mode 100644
index 0000000000..c0121f90bf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/vent-condenser-rotator-blur.png differ
diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png b/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png
new file mode 100644
index 0000000000..09acceb3e5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser.png b/core/assets-raw/sprites/blocks/production/vent-condenser.png
new file mode 100644
index 0000000000..c2eb1105c9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/vent-condenser.png differ
diff --git a/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow1.png b/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow1.png
new file mode 100644
index 0000000000..48dd992631
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow2.png b/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow2.png
new file mode 100644
index 0000000000..70157136b7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow3.png b/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow3.png
new file mode 100644
index 0000000000..e509e055c2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/arkyic-boulder-shadow3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/arkyic-boulder1.png b/core/assets-raw/sprites/blocks/props/arkyic-boulder1.png
new file mode 100644
index 0000000000..bec5753b6a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/arkyic-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/arkyic-boulder2.png b/core/assets-raw/sprites/blocks/props/arkyic-boulder2.png
new file mode 100644
index 0000000000..a9ecf43cdd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/arkyic-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/arkyic-boulder3.png b/core/assets-raw/sprites/blocks/props/arkyic-boulder3.png
new file mode 100644
index 0000000000..9e9f5ccafc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/arkyic-boulder3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/beryllic-boulder1.png b/core/assets-raw/sprites/blocks/props/beryllic-boulder1.png
new file mode 100644
index 0000000000..275c90b4f6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/beryllic-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/beryllic-boulder2.png b/core/assets-raw/sprites/blocks/props/beryllic-boulder2.png
new file mode 100644
index 0000000000..f5d2444503
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/beryllic-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/carbon-boulder1.png b/core/assets-raw/sprites/blocks/props/carbon-boulder1.png
new file mode 100644
index 0000000000..6efee1fd57
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/carbon-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/carbon-boulder2.png b/core/assets-raw/sprites/blocks/props/carbon-boulder2.png
new file mode 100644
index 0000000000..f717be1958
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/carbon-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow1.png b/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow1.png
new file mode 100644
index 0000000000..0d9145b6b1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow2.png b/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow2.png
new file mode 100644
index 0000000000..4e39edb9fd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow3.png b/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow3.png
new file mode 100644
index 0000000000..75b6d51de5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-blocks-shadow3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks1.png b/core/assets-raw/sprites/blocks/props/crystal-blocks1.png
new file mode 100644
index 0000000000..f49567c892
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-blocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks2.png b/core/assets-raw/sprites/blocks/props/crystal-blocks2.png
new file mode 100644
index 0000000000..3a6dea79bd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-blocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks3.png b/core/assets-raw/sprites/blocks/props/crystal-blocks3.png
new file mode 100644
index 0000000000..95b2e66086
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-blocks3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow1.png b/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow1.png
new file mode 100644
index 0000000000..d24059e180
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow2.png b/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow2.png
new file mode 100644
index 0000000000..7c3a8a3f9b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow3.png b/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow3.png
new file mode 100644
index 0000000000..575e8c390b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-cluster-shadow3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-cluster1.png b/core/assets-raw/sprites/blocks/props/crystal-cluster1.png
new file mode 100644
index 0000000000..5adf9a96e0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-cluster1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-cluster2.png b/core/assets-raw/sprites/blocks/props/crystal-cluster2.png
new file mode 100644
index 0000000000..40a03531c3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-cluster2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-cluster3.png b/core/assets-raw/sprites/blocks/props/crystal-cluster3.png
new file mode 100644
index 0000000000..d9ba7e96e0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-cluster3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow1.png b/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow1.png
new file mode 100644
index 0000000000..dda2465db7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow2.png b/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow2.png
new file mode 100644
index 0000000000..b741caed9d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow3.png b/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow3.png
new file mode 100644
index 0000000000..e3fe7e1d8c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-orbs-shadow3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-orbs1.png b/core/assets-raw/sprites/blocks/props/crystal-orbs1.png
new file mode 100644
index 0000000000..21bd356715
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-orbs1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-orbs2.png b/core/assets-raw/sprites/blocks/props/crystal-orbs2.png
new file mode 100644
index 0000000000..04a98d7e5a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-orbs2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystal-orbs3.png b/core/assets-raw/sprites/blocks/props/crystal-orbs3.png
new file mode 100644
index 0000000000..bad75c084f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-orbs3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystalline-boulder1.png b/core/assets-raw/sprites/blocks/props/crystalline-boulder1.png
new file mode 100644
index 0000000000..95d583a192
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystalline-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/crystalline-boulder2.png b/core/assets-raw/sprites/blocks/props/crystalline-boulder2.png
new file mode 100644
index 0000000000..d94d92be6b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystalline-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/ferric-boulder1.png b/core/assets-raw/sprites/blocks/props/ferric-boulder1.png
new file mode 100644
index 0000000000..63685cbad5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/ferric-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/ferric-boulder2.png b/core/assets-raw/sprites/blocks/props/ferric-boulder2.png
new file mode 100644
index 0000000000..93e19a3a7c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/ferric-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/pur-bush-bot.png b/core/assets-raw/sprites/blocks/props/pur-bush-bot.png
new file mode 100644
index 0000000000..5704eb7e9d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/pur-bush-bot.png differ
diff --git a/core/assets-raw/sprites/blocks/props/pur-bush.png b/core/assets-raw/sprites/blocks/props/pur-bush.png
new file mode 100644
index 0000000000..98b5fafb4b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/pur-bush.png differ
diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png
new file mode 100644
index 0000000000..6a3719383e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png
new file mode 100644
index 0000000000..64913660e4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png
new file mode 100644
index 0000000000..ebb2cb653f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/red-stone-boulder1.png b/core/assets-raw/sprites/blocks/props/red-stone-boulder1.png
new file mode 100644
index 0000000000..27fdd14a35
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-stone-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/red-stone-boulder2.png b/core/assets-raw/sprites/blocks/props/red-stone-boulder2.png
new file mode 100644
index 0000000000..40d7a7be5f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-stone-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/red-stone-boulder3.png b/core/assets-raw/sprites/blocks/props/red-stone-boulder3.png
new file mode 100644
index 0000000000..e85c09ee17
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-stone-boulder3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/red-stone-boulder4.png b/core/assets-raw/sprites/blocks/props/red-stone-boulder4.png
new file mode 100644
index 0000000000..9cf450c2eb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-stone-boulder4.png differ
diff --git a/core/assets-raw/sprites/blocks/props/redweed1.png b/core/assets-raw/sprites/blocks/props/redweed1.png
new file mode 100644
index 0000000000..2953862477
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/redweed1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/redweed2.png b/core/assets-raw/sprites/blocks/props/redweed2.png
new file mode 100644
index 0000000000..30243ffacd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/redweed2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/redweed3.png b/core/assets-raw/sprites/blocks/props/redweed3.png
new file mode 100644
index 0000000000..a8bec509ee
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/redweed3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png
new file mode 100644
index 0000000000..888aeed2eb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png
new file mode 100644
index 0000000000..7b6f910a8a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png
new file mode 100644
index 0000000000..25059fd947
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow1.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow1.png
new file mode 100644
index 0000000000..5d68525e05
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow2.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow2.png
new file mode 100644
index 0000000000..5c055e1b17
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow3.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow3.png
new file mode 100644
index 0000000000..0f65c304a4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png
new file mode 100644
index 0000000000..33cad73f65
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster2.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster2.png
new file mode 100644
index 0000000000..441acd6621
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster3.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster3.png
new file mode 100644
index 0000000000..c259fa954d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster3.png differ
diff --git a/core/assets-raw/sprites/blocks/props/yellow-stone-boulder1.png b/core/assets-raw/sprites/blocks/props/yellow-stone-boulder1.png
new file mode 100644
index 0000000000..3f7bc8955e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/yellow-stone-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/yellow-stone-boulder2.png b/core/assets-raw/sprites/blocks/props/yellow-stone-boulder2.png
new file mode 100644
index 0000000000..c0758368e3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/yellow-stone-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/sandbox/heat-source-heat.png b/core/assets-raw/sprites/blocks/sandbox/heat-source-heat.png
new file mode 100644
index 0000000000..92ae12d42d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/sandbox/heat-source-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/sandbox/heat-source-top1.png b/core/assets-raw/sprites/blocks/sandbox/heat-source-top1.png
new file mode 100644
index 0000000000..c90316d1df
Binary files /dev/null and b/core/assets-raw/sprites/blocks/sandbox/heat-source-top1.png differ
diff --git a/core/assets-raw/sprites/blocks/sandbox/heat-source-top2.png b/core/assets-raw/sprites/blocks/sandbox/heat-source-top2.png
new file mode 100644
index 0000000000..a8ae03228c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/sandbox/heat-source-top2.png differ
diff --git a/core/assets-raw/sprites/blocks/sandbox/heat-source.png b/core/assets-raw/sprites/blocks/sandbox/heat-source.png
new file mode 100644
index 0000000000..e2818047b1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/sandbox/heat-source.png differ
diff --git a/core/assets-raw/sprites/blocks/sandbox/item-source.png b/core/assets-raw/sprites/blocks/sandbox/item-source.png
new file mode 100644
index 0000000000..21c254cba5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/sandbox/item-source.png differ
diff --git a/core/assets-raw/sprites/blocks/production/item-void.png b/core/assets-raw/sprites/blocks/sandbox/item-void.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/production/item-void.png
rename to core/assets-raw/sprites/blocks/sandbox/item-void.png
diff --git a/core/assets-raw/sprites/blocks/sandbox/liquid-source.png b/core/assets-raw/sprites/blocks/sandbox/liquid-source.png
new file mode 100644
index 0000000000..92693f9200
Binary files /dev/null and b/core/assets-raw/sprites/blocks/sandbox/liquid-source.png differ
diff --git a/core/assets-raw/sprites/blocks/production/liquid-void.png b/core/assets-raw/sprites/blocks/sandbox/liquid-void.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/production/liquid-void.png
rename to core/assets-raw/sprites/blocks/sandbox/liquid-void.png
diff --git a/core/assets-raw/sprites/blocks/sandbox/source-bottom.png b/core/assets-raw/sprites/blocks/sandbox/source-bottom.png
new file mode 100644
index 0000000000..a2dd7b5e0c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/sandbox/source-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/container.png b/core/assets-raw/sprites/blocks/storage/container.png
index 959e2b6edf..038adbcd82 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/core-acropolis-team.png b/core/assets-raw/sprites/blocks/storage/core-acropolis-team.png
new file mode 100644
index 0000000000..4099c3aa09
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-acropolis-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-acropolis-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-acropolis-thruster1.png
new file mode 100644
index 0000000000..0e7dad8704
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-acropolis-thruster1.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-acropolis-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-acropolis-thruster2.png
new file mode 100644
index 0000000000..b9dbaf0e3a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-acropolis-thruster2.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-acropolis.png b/core/assets-raw/sprites/blocks/storage/core-acropolis.png
new file mode 100644
index 0000000000..c325150e8c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-acropolis.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-bastion-team.png b/core/assets-raw/sprites/blocks/storage/core-bastion-team.png
new file mode 100644
index 0000000000..6a34bde394
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-bastion-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-bastion-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-bastion-thruster1.png
new file mode 100644
index 0000000000..aaf48c0a64
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-bastion-thruster1.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-bastion-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-bastion-thruster2.png
new file mode 100644
index 0000000000..23cee644e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-bastion-thruster2.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-bastion.png b/core/assets-raw/sprites/blocks/storage/core-bastion.png
new file mode 100644
index 0000000000..d1fe947bab
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-bastion.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-team.png b/core/assets-raw/sprites/blocks/storage/core-citadel-team.png
new file mode 100644
index 0000000000..c4412053d9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png
new file mode 100644
index 0000000000..a637342ac9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png
new file mode 100644
index 0000000000..e09884a489
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel.png b/core/assets-raw/sprites/blocks/storage/core-citadel.png
new file mode 100644
index 0000000000..795eb990b2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-foundation-team.png b/core/assets-raw/sprites/blocks/storage/core-foundation-team.png
index ba7a7045a8..afb444176c 100644
Binary files a/core/assets-raw/sprites/blocks/storage/core-foundation-team.png and b/core/assets-raw/sprites/blocks/storage/core-foundation-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-foundation-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-foundation-thruster1.png
new file mode 100644
index 0000000000..f40a7eb905
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-foundation-thruster1.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-foundation-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-foundation-thruster2.png
new file mode 100644
index 0000000000..21bb44abc9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-foundation-thruster2.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-nucleus-team.png b/core/assets-raw/sprites/blocks/storage/core-nucleus-team.png
index 53b494bb6a..b63e860085 100644
Binary files a/core/assets-raw/sprites/blocks/storage/core-nucleus-team.png and b/core/assets-raw/sprites/blocks/storage/core-nucleus-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-nucleus-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-nucleus-thruster1.png
new file mode 100644
index 0000000000..112429f26a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-nucleus-thruster1.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-nucleus-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-nucleus-thruster2.png
new file mode 100644
index 0000000000..83897e87d7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-nucleus-thruster2.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-shard-team.png b/core/assets-raw/sprites/blocks/storage/core-shard-team.png
index f319ebbe2c..1b0ef1a79c 100644
Binary files a/core/assets-raw/sprites/blocks/storage/core-shard-team.png and b/core/assets-raw/sprites/blocks/storage/core-shard-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-shard-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-shard-thruster1.png
new file mode 100644
index 0000000000..7d6fd61604
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-shard-thruster1.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-shard-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-shard-thruster2.png
new file mode 100644
index 0000000000..2a15417fbe
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-shard-thruster2.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png b/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png
new file mode 100644
index 0000000000..dae1a854c0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-container.png b/core/assets-raw/sprites/blocks/storage/reinforced-container.png
new file mode 100644
index 0000000000..e38892cc05
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-container.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-vault-team.png b/core/assets-raw/sprites/blocks/storage/reinforced-vault-team.png
new file mode 100644
index 0000000000..5fc137c8af
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-vault-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-vault.png b/core/assets-raw/sprites/blocks/storage/reinforced-vault.png
new file mode 100644
index 0000000000..383e61661d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-vault.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/vault.png b/core/assets-raw/sprites/blocks/storage/vault.png
index 36a4ee5ea5..150f9acf24 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/afflict/afflict-blade-glow-heat.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-glow-heat.png
new file mode 100644
index 0000000000..a29c4daf46
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-glow-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-heat.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-heat.png
new file mode 100644
index 0000000000..7e7f994e5a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-l.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-l.png
new file mode 100644
index 0000000000..bc41ab4f10
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-r.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-r.png
new file mode 100644
index 0000000000..d79cd376da
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-blade-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict-preview.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-preview.png
new file mode 100644
index 0000000000..8bb86e37f4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/afflict/afflict-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png
new file mode 100644
index 0000000000..b0abd5b710
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/arc-heat.png b/core/assets-raw/sprites/blocks/turrets/arc-heat.png
index de36f57ce4..5b981cd6bb 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/arc-heat.png and b/core/assets-raw/sprites/blocks/turrets/arc-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-2.png b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-2.png
new file mode 100644
index 0000000000..8abd51e2a1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-2.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-3.png b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-3.png
new file mode 100644
index 0000000000..29f2caeabd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-3.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-4.png b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-4.png
new file mode 100644
index 0000000000..e356019ce1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-4.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-5.png b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-5.png
new file mode 100644
index 0000000000..39103b790f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-5.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/breach-heat.png b/core/assets-raw/sprites/blocks/turrets/breach-heat.png
new file mode 100644
index 0000000000..43e9a698d8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/breach-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/breach.png b/core/assets-raw/sprites/blocks/turrets/breach.png
new file mode 100644
index 0000000000..c3d6e83a44
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/breach.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png
deleted file mode 100644
index a0e34e20e7..0000000000
Binary files a/core/assets-raw/sprites/blocks/turrets/cyclone.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-1.png b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-1.png
new file mode 100644
index 0000000000..d0a09b148d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-1.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-2.png b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-2.png
new file mode 100644
index 0000000000..df9abb659d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-2.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-3.png b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-3.png
new file mode 100644
index 0000000000..c6ed1cb0d3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-barrel-3.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-preview.png b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-preview.png
new file mode 100644
index 0000000000..7e60d91dbd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone.png
new file mode 100644
index 0000000000..ef96418107
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/cyclone/cyclone.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-heat.png b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-heat.png
new file mode 100644
index 0000000000..f975b3babf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-l.png b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-l.png
new file mode 100644
index 0000000000..ef3373a188
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-r.png b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-r.png
new file mode 100644
index 0000000000..c555d0858c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-front-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-preview.png b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-preview.png
new file mode 100644
index 0000000000..3ff2f1dfe5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse.png b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse.png
new file mode 100644
index 0000000000..8171681a58
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/diffuse/diffuse.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-heat.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-heat.png
new file mode 100644
index 0000000000..da0a55f816
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-l.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-l.png
new file mode 100644
index 0000000000..78a096b948
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-r.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-r.png
new file mode 100644
index 0000000000..0ca5e511d1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-blade-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-mid-heat.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-mid-heat.png
new file mode 100644
index 0000000000..be012916f3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-mid-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-mid.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-mid.png
new file mode 100644
index 0000000000..edfd63a69e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-preview.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-preview.png
new file mode 100644
index 0000000000..39edc8651c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-side-l.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-side-l.png
new file mode 100644
index 0000000000..c08e60f14a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-side-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse-side-r.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-side-r.png
new file mode 100644
index 0000000000..861b981046
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse-side-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-l.png b/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-l.png
new file mode 100644
index 0000000000..4e2cd467d2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-r.png b/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-r.png
new file mode 100644
index 0000000000..ca9582932c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo/duo-preview.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/turrets/duo.png
rename to core/assets-raw/sprites/blocks/turrets/duo/duo-preview.png
diff --git a/core/assets-raw/sprites/blocks/turrets/duo/duo.png b/core/assets-raw/sprites/blocks/turrets/duo/duo.png
new file mode 100644
index 0000000000..033099c10e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/duo/duo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/fuse-heat.png b/core/assets-raw/sprites/blocks/turrets/fuse-heat.png
new file mode 100644
index 0000000000..b8c070840b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/fuse-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png
index 61ff3c7b2d..8c3b6434d7 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-heat.png b/core/assets-raw/sprites/blocks/turrets/hail-heat.png
index daad1ac936..84f197b52b 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/hail-heat.png and b/core/assets-raw/sprites/blocks/turrets/hail-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png
index 10001df6ed..604fb5d5de 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-heat.png b/core/assets-raw/sprites/blocks/turrets/lancer-heat.png
index 1327410b66..1159816138 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/lancer-heat.png and b/core/assets-raw/sprites/blocks/turrets/lancer-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png
index 08f1ea9e30..5c9cf079f5 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/lustre/lustre-blade-heat.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-heat.png
new file mode 100644
index 0000000000..f37c68ff10
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-l.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-l.png
new file mode 100644
index 0000000000..216d93f107
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-r.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-r.png
new file mode 100644
index 0000000000..2714d0f4c2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-blade-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-heat.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-heat.png
new file mode 100644
index 0000000000..a11bc46adf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-l.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-l.png
new file mode 100644
index 0000000000..6054d7c393
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-r.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-r.png
new file mode 100644
index 0000000000..30d9fd1c86
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-inner-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-mid-heat.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-mid-heat.png
new file mode 100644
index 0000000000..af7a440e82
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-mid-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-mid.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-mid.png
new file mode 100644
index 0000000000..aa246f41cf
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lustre/lustre-preview.png b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-preview.png
new file mode 100644
index 0000000000..4ac64cc157
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lustre/lustre-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-back-heat.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-back-heat.png
new file mode 100644
index 0000000000..8ecca1720d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-back-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-back-l.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-back-l.png
new file mode 100644
index 0000000000..f211c20d8c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-back-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-back-r.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-back-r.png
new file mode 100644
index 0000000000..431edae31b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-back-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-end.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-end.png
new file mode 100644
index 0000000000..1424d302e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-end.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-front-heat.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-front-heat.png
new file mode 100644
index 0000000000..0edde283f4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-front-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-front-l.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-front-l.png
new file mode 100644
index 0000000000..bb11c63592
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-front-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-front-r.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-front-r.png
new file mode 100644
index 0000000000..f316b39ab5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-front-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-main.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-main.png
new file mode 100644
index 0000000000..1deb5458de
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-main.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-mid-heat.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-mid-heat.png
new file mode 100644
index 0000000000..026ec951a1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-mid-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-mid.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-mid.png
new file mode 100644
index 0000000000..95c99e66e6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-mouth-heat.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-mouth-heat.png
new file mode 100644
index 0000000000..aa7b11d00c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-mouth-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-mouth.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-mouth.png
new file mode 100644
index 0000000000..914f81d81e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-mouth.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-preview.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-preview.png
new file mode 100644
index 0000000000..865f7d8653
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-heat.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-heat.png
new file mode 100644
index 0000000000..e10bf85567
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-l.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-l.png
new file mode 100644
index 0000000000..226f75928c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-r.png b/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-r.png
new file mode 100644
index 0000000000..226f75928c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/malign/malign-spine-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/meltdown-heat.png b/core/assets-raw/sprites/blocks/turrets/meltdown-heat.png
index e9b1fc0ed3..3c58dffce0 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/meltdown-heat.png and b/core/assets-raw/sprites/blocks/turrets/meltdown-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/ripple-heat.png b/core/assets-raw/sprites/blocks/turrets/ripple-heat.png
index 6b88b97cb3..a2aa7bc521 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/ripple-heat.png and b/core/assets-raw/sprites/blocks/turrets/ripple-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/ripple.png
index 92bd3db328..4660117fd8 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/ripple.png and b/core/assets-raw/sprites/blocks/turrets/ripple.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo-heat.png b/core/assets-raw/sprites/blocks/turrets/salvo-heat.png
deleted file mode 100644
index 5022fafc1d..0000000000
Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-heat.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
deleted file mode 100644
index 4904a913a5..0000000000
Binary files a/core/assets-raw/sprites/blocks/turrets/salvo.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png
new file mode 100644
index 0000000000..274053f819
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png
new file mode 100644
index 0000000000..1ac7d8ff1f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png
new file mode 100644
index 0000000000..936f708770
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png
new file mode 100644
index 0000000000..4ef9628282
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png
new file mode 100644
index 0000000000..21cda3b07b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-heat.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-heat.png
new file mode 100644
index 0000000000..2e17525b3c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-l.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-l.png
new file mode 100644
index 0000000000..473e136ddc
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-r.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-r.png
new file mode 100644
index 0000000000..7547140cde
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-blade-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-mid-heat.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-mid-heat.png
new file mode 100644
index 0000000000..487d1d8136
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-mid-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-mid.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-mid.png
new file mode 100644
index 0000000000..c703ef84ca
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-preview.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-preview.png
new file mode 100644
index 0000000000..458cd8b143
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-heat.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-heat.png
new file mode 100644
index 0000000000..ab062426df
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-l.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-l.png
new file mode 100644
index 0000000000..134fff35e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-r.png b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-r.png
new file mode 100644
index 0000000000..37fd18e6e3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scathe/scathe-side-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter.png
deleted file mode 100644
index f4f0d73954..0000000000
Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scatter/scatter-mid.png b/core/assets-raw/sprites/blocks/turrets/scatter/scatter-mid.png
new file mode 100644
index 0000000000..1dc01391fe
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scatter/scatter-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scatter/scatter-preview.png b/core/assets-raw/sprites/blocks/turrets/scatter/scatter-preview.png
new file mode 100644
index 0000000000..14930eb725
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scatter/scatter-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scatter/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter/scatter.png
new file mode 100644
index 0000000000..83613f9364
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scatter/scatter.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scorch-heat.png b/core/assets-raw/sprites/blocks/turrets/scorch-heat.png
index 84863ae266..82ac4b138f 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/scorch-heat.png and b/core/assets-raw/sprites/blocks/turrets/scorch-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/scorch.png
index abbd3b5188..ad77c9feda 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/smite/smite-back-l.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-back-l.png
new file mode 100644
index 0000000000..6720b81b0e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-back-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-back-r.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-back-r.png
new file mode 100644
index 0000000000..a47de1ea83
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-back-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-heat.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-heat.png
new file mode 100644
index 0000000000..265087d5cb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-l.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-l.png
new file mode 100644
index 0000000000..b473cc82f9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-r.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-r.png
new file mode 100644
index 0000000000..b473cc82f9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-bar-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-heat.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-heat.png
new file mode 100644
index 0000000000..061ddf73f2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-l.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-l.png
new file mode 100644
index 0000000000..1c162cf90f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-r.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-r.png
new file mode 100644
index 0000000000..1d7d25028e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-blade-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-front-l.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-front-l.png
new file mode 100644
index 0000000000..af7ec24e79
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-front-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-front-r.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-front-r.png
new file mode 100644
index 0000000000..58db672295
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-front-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-mid-heat.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-mid-heat.png
new file mode 100644
index 0000000000..9e564bd546
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-mid-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-mid.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-mid.png
new file mode 100644
index 0000000000..bc77fb7697
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-mid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-preview.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-preview.png
new file mode 100644
index 0000000000..ff9c02f448
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-heat.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-heat.png
new file mode 100644
index 0000000000..6c9cd0ed3e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-l.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-l.png
new file mode 100644
index 0000000000..5277c648e5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-r.png b/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-r.png
new file mode 100644
index 0000000000..c9112d61d8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/smite/smite-spine-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/spectre-heat.png b/core/assets-raw/sprites/blocks/turrets/spectre-heat.png
new file mode 100644
index 0000000000..2054d87448
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/spectre-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-heat.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-heat.png
new file mode 100644
index 0000000000..b1b9981be3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-l.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-l.png
new file mode 100644
index 0000000000..6310ed5bef
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-r.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-r.png
new file mode 100644
index 0000000000..3649e6b388
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-back-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-heat.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-heat.png
new file mode 100644
index 0000000000..6bdb42bc14
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-l.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-l.png
new file mode 100644
index 0000000000..9dc19c54d0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-r.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-r.png
new file mode 100644
index 0000000000..93762fca98
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-front-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-heat.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-heat.png
new file mode 100644
index 0000000000..b6dcfe6425
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-liquid.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-liquid.png
new file mode 100644
index 0000000000..0315dae8fb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-heat.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-heat.png
new file mode 100644
index 0000000000..3d0339a8e1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-l.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-l.png
new file mode 100644
index 0000000000..ff0d1859b1
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-r.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-r.png
new file mode 100644
index 0000000000..fb3dd30a00
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-nozzle-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-preview.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-preview.png
new file mode 100644
index 0000000000..b91e9ba13b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-top.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-top.png
new file mode 100644
index 0000000000..cab9eac8a0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate.png b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate.png
new file mode 100644
index 0000000000..7ece32712c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/sublimate/sublimate.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/swarmer.png b/core/assets-raw/sprites/blocks/turrets/swarmer.png
index 6f98a1ba7a..508e74f861 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/titan/titan-barrel-heat.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat.png
new file mode 100644
index 0000000000..01e7d763e0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat_full.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat_full.png
new file mode 100644
index 0000000000..bfaf389728
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat_full.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png
new file mode 100644
index 0000000000..633870819d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-preview.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-preview.png
new file mode 100644
index 0000000000..6f02447fc8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan-preview.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-side-heat.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-heat.png
new file mode 100644
index 0000000000..d9607a2e1e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-side-l.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-l.png
new file mode 100644
index 0000000000..b76cc39f30
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-l.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-side-r.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-r.png
new file mode 100644
index 0000000000..80d2539b5d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-r.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan.png b/core/assets-raw/sprites/blocks/turrets/titan/titan.png
new file mode 100644
index 0000000000..da8aa59a6f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/titan/titan.png differ
diff --git a/core/assets-raw/sprites/blocks/units/additive-reconstructor.png b/core/assets-raw/sprites/blocks/units/additive-reconstructor.png
index 7534cc4f15..40ea654c1d 100644
Binary files a/core/assets-raw/sprites/blocks/units/additive-reconstructor.png and b/core/assets-raw/sprites/blocks/units/additive-reconstructor.png differ
diff --git a/core/assets-raw/sprites/blocks/units/basic-assembler-module-side1.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side1.png
new file mode 100644
index 0000000000..2bc2f85465
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side1.png differ
diff --git a/core/assets-raw/sprites/blocks/units/basic-assembler-module-side2.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side2.png
new file mode 100644
index 0000000000..6ac72798d9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/payload-router-edge.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module-top.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/payload-router-edge.png
rename to core/assets-raw/sprites/blocks/units/basic-assembler-module-top.png
diff --git a/core/assets-raw/sprites/blocks/units/basic-assembler-module.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module.png
new file mode 100644
index 0000000000..1518919cfb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/basic-assembler-module.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
deleted file mode 100644
index b9d27f73c9..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/command-center-team.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/command-center.png b/core/assets-raw/sprites/blocks/units/command-center.png
deleted file mode 100644
index a0de4888a9..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/command-center.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/factory-in-3.png b/core/assets-raw/sprites/blocks/units/factory-in-3.png
deleted file mode 100644
index 7944814739..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/factory-in-3.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/factory-in-5.png b/core/assets-raw/sprites/blocks/units/factory-in-5.png
deleted file mode 100644
index ccb7fbc5a3..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/factory-in-5.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/factory-out-3.png b/core/assets-raw/sprites/blocks/units/factory-out-3.png
deleted file mode 100644
index 4553a690dd..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/factory-out-3.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/factory-out-5.png b/core/assets-raw/sprites/blocks/units/factory-out-5.png
deleted file mode 100644
index 801f1ce6f9..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/factory-out-5.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler-side1.png b/core/assets-raw/sprites/blocks/units/mech-assembler-side1.png
new file mode 100644
index 0000000000..bfa591c50a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-assembler-side1.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler-side2.png b/core/assets-raw/sprites/blocks/units/mech-assembler-side2.png
new file mode 100644
index 0000000000..9cd4cdeaa0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-assembler-side2.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler-top.png b/core/assets-raw/sprites/blocks/units/mech-assembler-top.png
new file mode 100644
index 0000000000..40f43fdd24
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-assembler-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler.png b/core/assets-raw/sprites/blocks/units/mech-assembler.png
new file mode 100644
index 0000000000..bf54cf6950
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-assembler.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-fabricator-top.png b/core/assets-raw/sprites/blocks/units/mech-fabricator-top.png
new file mode 100644
index 0000000000..18525479c8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-fabricator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-fabricator.png b/core/assets-raw/sprites/blocks/units/mech-fabricator.png
new file mode 100644
index 0000000000..96592251ae
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-fabricator.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-refabricator-top.png b/core/assets-raw/sprites/blocks/units/mech-refabricator-top.png
new file mode 100644
index 0000000000..28e1927ffa
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-refabricator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-refabricator.png b/core/assets-raw/sprites/blocks/units/mech-refabricator.png
new file mode 100644
index 0000000000..63f3cb6fa9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mech-refabricator.png differ
diff --git a/core/assets-raw/sprites/blocks/units/prime-refabricator-top.png b/core/assets-raw/sprites/blocks/units/prime-refabricator-top.png
new file mode 100644
index 0000000000..24cc4cd5a5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/prime-refabricator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/prime-refabricator.png b/core/assets-raw/sprites/blocks/units/prime-refabricator.png
new file mode 100644
index 0000000000..6709222b7b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/prime-refabricator.png differ
diff --git a/core/assets-raw/sprites/blocks/units/rally-point.png b/core/assets-raw/sprites/blocks/units/rally-point.png
deleted file mode 100644
index 493d90df1d..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/rally-point.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/repair-point.png b/core/assets-raw/sprites/blocks/units/repair-point.png
index 2cadeae5cb..f3c0a07472 100644
Binary files a/core/assets-raw/sprites/blocks/units/repair-point.png and b/core/assets-raw/sprites/blocks/units/repair-point.png differ
diff --git a/core/assets-raw/sprites/blocks/units/repair-turret.png b/core/assets-raw/sprites/blocks/units/repair-turret.png
new file mode 100644
index 0000000000..4cc4ffc5bd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/repair-turret.png differ
diff --git a/core/assets-raw/sprites/blocks/units/resupply-point.png b/core/assets-raw/sprites/blocks/units/resupply-point.png
deleted file mode 100644
index d6d9d52572..0000000000
Binary files a/core/assets-raw/sprites/blocks/units/resupply-point.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-assembler-side1.png b/core/assets-raw/sprites/blocks/units/ship-assembler-side1.png
new file mode 100644
index 0000000000..ec57520298
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-assembler-side1.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-assembler-side2.png b/core/assets-raw/sprites/blocks/units/ship-assembler-side2.png
new file mode 100644
index 0000000000..5bac81cd38
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-assembler-side2.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-assembler-top.png b/core/assets-raw/sprites/blocks/units/ship-assembler-top.png
new file mode 100644
index 0000000000..a80bf2b8f7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-assembler-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-assembler.png b/core/assets-raw/sprites/blocks/units/ship-assembler.png
new file mode 100644
index 0000000000..bf54cf6950
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-assembler.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-fabricator-top.png b/core/assets-raw/sprites/blocks/units/ship-fabricator-top.png
new file mode 100644
index 0000000000..708e361314
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-fabricator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-fabricator.png b/core/assets-raw/sprites/blocks/units/ship-fabricator.png
new file mode 100644
index 0000000000..c48284e98b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-fabricator.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-refabricator-top.png b/core/assets-raw/sprites/blocks/units/ship-refabricator-top.png
new file mode 100644
index 0000000000..7c91e756cd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-refabricator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-refabricator.png b/core/assets-raw/sprites/blocks/units/ship-refabricator.png
new file mode 100644
index 0000000000..bc9ddfe97f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/ship-refabricator.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-side1.png b/core/assets-raw/sprites/blocks/units/tank-assembler-side1.png
new file mode 100644
index 0000000000..6ea08597e9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-assembler-side1.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png b/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png
new file mode 100644
index 0000000000..c549831fd5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-top.png b/core/assets-raw/sprites/blocks/units/tank-assembler-top.png
new file mode 100644
index 0000000000..006c35f38a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-assembler-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler.png b/core/assets-raw/sprites/blocks/units/tank-assembler.png
new file mode 100644
index 0000000000..bf54cf6950
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-assembler.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-fabricator-top.png b/core/assets-raw/sprites/blocks/units/tank-fabricator-top.png
new file mode 100644
index 0000000000..4e5ee09f66
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-fabricator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-fabricator.png b/core/assets-raw/sprites/blocks/units/tank-fabricator.png
new file mode 100644
index 0000000000..c056220c41
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-fabricator.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-refabricator-top.png b/core/assets-raw/sprites/blocks/units/tank-refabricator-top.png
new file mode 100644
index 0000000000..144c7ed37d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-refabricator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tank-refabricator.png b/core/assets-raw/sprites/blocks/units/tank-refabricator.png
new file mode 100644
index 0000000000..3152db780a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-refabricator.png differ
diff --git a/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png b/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png
index deba4e9988..67f7ed806b 100644
Binary files a/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png and b/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png differ
diff --git a/core/assets-raw/sprites/blocks/units/unit-cargo-loader.png b/core/assets-raw/sprites/blocks/units/unit-cargo-loader.png
new file mode 100644
index 0000000000..69024f4877
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/unit-cargo-loader.png differ
diff --git a/core/assets-raw/sprites/blocks/units/unit-cargo-unload-point-top.png b/core/assets-raw/sprites/blocks/units/unit-cargo-unload-point-top.png
new file mode 100644
index 0000000000..025178c24d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/unit-cargo-unload-point-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/unit-cargo-unload-point.png b/core/assets-raw/sprites/blocks/units/unit-cargo-unload-point.png
new file mode 100644
index 0000000000..29d5c9a883
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/unit-cargo-unload-point.png differ
diff --git a/core/assets-raw/sprites/blocks/units/unit-repair-tower-glow.png b/core/assets-raw/sprites/blocks/units/unit-repair-tower-glow.png
new file mode 100644
index 0000000000..7db58e5944
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/unit-repair-tower-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/units/unit-repair-tower.png b/core/assets-raw/sprites/blocks/units/unit-repair-tower.png
new file mode 100644
index 0000000000..fca0c991d3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/unit-repair-tower.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/beryllium-wall-large.png b/core/assets-raw/sprites/blocks/walls/beryllium-wall-large.png
new file mode 100644
index 0000000000..0278823e03
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/beryllium-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/beryllium-wall.png b/core/assets-raw/sprites/blocks/walls/beryllium-wall.png
new file mode 100644
index 0000000000..d4ffa38dda
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/beryllium-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/blast-door-open.png b/core/assets-raw/sprites/blocks/walls/blast-door-open.png
new file mode 100644
index 0000000000..afe9aa0f1f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/blast-door-open.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/blast-door.png b/core/assets-raw/sprites/blocks/walls/blast-door.png
new file mode 100644
index 0000000000..bc4710e43d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/blast-door.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png b/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png
new file mode 100644
index 0000000000..35c0d1fd41
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall.png b/core/assets-raw/sprites/blocks/walls/carbide-wall.png
new file mode 100644
index 0000000000..4e2f36b4c5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/carbide-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall-large.png b/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall-large.png
new file mode 100644
index 0000000000..9fe2c736ca
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall.png b/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall.png
new file mode 100644
index 0000000000..c10d2afdde
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/reinforced-surge-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/shielded-wall-glow.png b/core/assets-raw/sprites/blocks/walls/shielded-wall-glow.png
new file mode 100644
index 0000000000..7eac1db515
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/shielded-wall-glow.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/shielded-wall.png b/core/assets-raw/sprites/blocks/walls/shielded-wall.png
new file mode 100644
index 0000000000..293839126b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/shielded-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 ef8f313f09..20c23043ac 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/tungsten-wall-large.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png
new file mode 100644
index 0000000000..92c9c839a5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/tungsten-wall.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall.png
new file mode 100644
index 0000000000..1e57bcea46
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/tungsten-wall.png differ
diff --git a/core/assets-raw/sprites/editor/pack.json b/core/assets-raw/sprites/editor/pack.json
index fcd452dd9f..775c36ebdd 100644
--- a/core/assets-raw/sprites/editor/pack.json
+++ b/core/assets-raw/sprites/editor/pack.json
@@ -2,7 +2,8 @@
   duplicatePadding: true,
   combineSubdirectories: true,
   flattenPaths: true,
-  maxWidth: 4096,
-  maxHeight: 4096,
-  fast: true
+  maxWidth: 2048,
+  maxHeight: 2048,
+  fast: true,
+  stripWhitespaceCenter: true
 }
diff --git a/core/assets-raw/sprites/effects/circle-bullet-back.png b/core/assets-raw/sprites/effects/circle-bullet-back.png
new file mode 100644
index 0000000000..e08bfeae85
Binary files /dev/null and b/core/assets-raw/sprites/effects/circle-bullet-back.png differ
diff --git a/core/assets-raw/sprites/effects/circle-bullet.png b/core/assets-raw/sprites/effects/circle-bullet.png
new file mode 100644
index 0000000000..3039f67c85
Binary files /dev/null and b/core/assets-raw/sprites/effects/circle-bullet.png differ
diff --git a/core/assets-raw/sprites/effects/clear-effect.png b/core/assets-raw/sprites/effects/clear-effect.png
new file mode 100644
index 0000000000..92e99b0ef3
Binary files /dev/null and b/core/assets-raw/sprites/effects/clear-effect.png differ
diff --git a/core/assets-raw/sprites/effects/drill-laser-boost-center.png b/core/assets-raw/sprites/effects/drill-laser-boost-center.png
new file mode 100644
index 0000000000..e8ed8c4a68
Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser-boost-center.png differ
diff --git a/core/assets-raw/sprites/effects/drill-laser-boost-end.png b/core/assets-raw/sprites/effects/drill-laser-boost-end.png
new file mode 100644
index 0000000000..417d6eb411
Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser-boost-end.png differ
diff --git a/core/assets-raw/sprites/effects/drill-laser-boost.png b/core/assets-raw/sprites/effects/drill-laser-boost.png
new file mode 100644
index 0000000000..f2ae1a24f2
Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser-boost.png differ
diff --git a/core/assets-raw/sprites/effects/drill-laser-center.png b/core/assets-raw/sprites/effects/drill-laser-center.png
new file mode 100644
index 0000000000..381b329920
Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser-center.png differ
diff --git a/core/assets-raw/sprites/effects/drill-laser-end.png b/core/assets-raw/sprites/effects/drill-laser-end.png
new file mode 100644
index 0000000000..cb80e5478e
Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser-end.png differ
diff --git a/core/assets-raw/sprites/effects/drill-laser.png b/core/assets-raw/sprites/effects/drill-laser.png
new file mode 100644
index 0000000000..026737d529
Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser.png differ
diff --git a/core/assets-raw/sprites/effects/large-orb-back.png b/core/assets-raw/sprites/effects/large-orb-back.png
new file mode 100644
index 0000000000..261446c517
Binary files /dev/null and b/core/assets-raw/sprites/effects/large-orb-back.png differ
diff --git a/core/assets-raw/sprites/effects/large-orb.png b/core/assets-raw/sprites/effects/large-orb.png
new file mode 100644
index 0000000000..414d8d2ab4
Binary files /dev/null and b/core/assets-raw/sprites/effects/large-orb.png differ
diff --git a/core/assets-raw/sprites/effects/laser-top-end.png b/core/assets-raw/sprites/effects/laser-top-end.png
new file mode 100644
index 0000000000..5f4b05e6a9
Binary files /dev/null and b/core/assets-raw/sprites/effects/laser-top-end.png differ
diff --git a/core/assets-raw/sprites/effects/laser-top.png b/core/assets-raw/sprites/effects/laser-top.png
new file mode 100644
index 0000000000..c50f6d69a6
Binary files /dev/null and b/core/assets-raw/sprites/effects/laser-top.png differ
diff --git a/core/assets-raw/sprites/effects/laser-white-end.png b/core/assets-raw/sprites/effects/laser-white-end.png
new file mode 100644
index 0000000000..1e6aeffcc5
Binary files /dev/null and b/core/assets-raw/sprites/effects/laser-white-end.png differ
diff --git a/core/assets-raw/sprites/effects/laser-white.png b/core/assets-raw/sprites/effects/laser-white.png
new file mode 100644
index 0000000000..13ac448bbe
Binary files /dev/null and b/core/assets-raw/sprites/effects/laser-white.png differ
diff --git a/core/assets-raw/sprites/effects/mine-bullet-back.png b/core/assets-raw/sprites/effects/mine-bullet-back.png
new file mode 100644
index 0000000000..33738a0c4d
Binary files /dev/null and b/core/assets-raw/sprites/effects/mine-bullet-back.png differ
diff --git a/core/assets-raw/sprites/effects/mine-bullet.png b/core/assets-raw/sprites/effects/mine-bullet.png
new file mode 100644
index 0000000000..9525c22bfc
Binary files /dev/null and b/core/assets-raw/sprites/effects/mine-bullet.png differ
diff --git a/core/assets-raw/sprites/effects/missile-large-back.png b/core/assets-raw/sprites/effects/missile-large-back.png
new file mode 100644
index 0000000000..bc3d3c2ef4
Binary files /dev/null and b/core/assets-raw/sprites/effects/missile-large-back.png differ
diff --git a/core/assets-raw/sprites/effects/missile-large.png b/core/assets-raw/sprites/effects/missile-large.png
new file mode 100644
index 0000000000..f1353b6b2e
Binary files /dev/null and b/core/assets-raw/sprites/effects/missile-large.png differ
diff --git a/core/assets-raw/sprites/effects/point-laser-center.png b/core/assets-raw/sprites/effects/point-laser-center.png
new file mode 100644
index 0000000000..31aa55c040
Binary files /dev/null and b/core/assets-raw/sprites/effects/point-laser-center.png differ
diff --git a/core/assets-raw/sprites/effects/point-laser-end.png b/core/assets-raw/sprites/effects/point-laser-end.png
new file mode 100644
index 0000000000..2369095417
Binary files /dev/null and b/core/assets-raw/sprites/effects/point-laser-end.png differ
diff --git a/core/assets-raw/sprites/effects/point-laser.png b/core/assets-raw/sprites/effects/point-laser.png
new file mode 100644
index 0000000000..1ac2ffc640
Binary files /dev/null and b/core/assets-raw/sprites/effects/point-laser.png differ
diff --git a/core/assets-raw/sprites/effects/power-beam-end.png b/core/assets-raw/sprites/effects/power-beam-end.png
new file mode 100644
index 0000000000..c112dad634
Binary files /dev/null and b/core/assets-raw/sprites/effects/power-beam-end.png differ
diff --git a/core/assets-raw/sprites/effects/power-beam.png b/core/assets-raw/sprites/effects/power-beam.png
new file mode 100644
index 0000000000..c797f3fad6
Binary files /dev/null and b/core/assets-raw/sprites/effects/power-beam.png differ
diff --git a/core/assets-raw/sprites/effects/select-arrow-small.png b/core/assets-raw/sprites/effects/select-arrow-small.png
new file mode 100644
index 0000000000..6d021c0ddb
Binary files /dev/null and b/core/assets-raw/sprites/effects/select-arrow-small.png differ
diff --git a/core/assets-raw/sprites/effects/select-arrow.png b/core/assets-raw/sprites/effects/select-arrow.png
new file mode 100644
index 0000000000..41c2608d8b
Binary files /dev/null and b/core/assets-raw/sprites/effects/select-arrow.png differ
diff --git a/core/assets-raw/sprites/effects/square-shadow.png b/core/assets-raw/sprites/effects/square-shadow.png
new file mode 100644
index 0000000000..035ab4abae
Binary files /dev/null and b/core/assets-raw/sprites/effects/square-shadow.png differ
diff --git a/core/assets-raw/sprites/effects/white.png b/core/assets-raw/sprites/effects/white.png
index ba9bf827c1..e8b825eae0 100644
Binary files a/core/assets-raw/sprites/effects/white.png and b/core/assets-raw/sprites/effects/white.png differ
diff --git a/core/assets-raw/sprites/items/item-beryllium.png b/core/assets-raw/sprites/items/item-beryllium.png
new file mode 100644
index 0000000000..b16182be76
Binary files /dev/null and b/core/assets-raw/sprites/items/item-beryllium.png differ
diff --git a/core/assets-raw/sprites/items/item-carbide.png b/core/assets-raw/sprites/items/item-carbide.png
new file mode 100644
index 0000000000..20d65e08bd
Binary files /dev/null and b/core/assets-raw/sprites/items/item-carbide.png differ
diff --git a/core/assets-raw/sprites/items/item-dormant-cyst.png b/core/assets-raw/sprites/items/item-dormant-cyst.png
new file mode 100644
index 0000000000..263f7ea57f
Binary files /dev/null and b/core/assets-raw/sprites/items/item-dormant-cyst.png differ
diff --git a/core/assets-raw/sprites/items/item-fissile-matter.png b/core/assets-raw/sprites/items/item-fissile-matter.png
new file mode 100644
index 0000000000..119c92732d
Binary files /dev/null and b/core/assets-raw/sprites/items/item-fissile-matter.png differ
diff --git a/core/assets-raw/sprites/items/item-graphite.png b/core/assets-raw/sprites/items/item-graphite.png
index 3d802be63f..a6cbb3454a 100644
Binary files a/core/assets-raw/sprites/items/item-graphite.png and b/core/assets-raw/sprites/items/item-graphite.png differ
diff --git a/core/assets-raw/sprites/items/item-oxide.png b/core/assets-raw/sprites/items/item-oxide.png
new file mode 100644
index 0000000000..fa3dab9a96
Binary files /dev/null and b/core/assets-raw/sprites/items/item-oxide.png differ
diff --git a/core/assets-raw/sprites/items/item-plastanium.png b/core/assets-raw/sprites/items/item-plastanium.png
index f6ddf438fc..eb5b69d374 100644
Binary files a/core/assets-raw/sprites/items/item-plastanium.png and b/core/assets-raw/sprites/items/item-plastanium.png differ
diff --git a/core/assets-raw/sprites/items/item-surge-alloy.png b/core/assets-raw/sprites/items/item-surge-alloy.png
index 4cac00c5e4..07d73c762e 100644
Binary files a/core/assets-raw/sprites/items/item-surge-alloy.png and b/core/assets-raw/sprites/items/item-surge-alloy.png differ
diff --git a/core/assets-raw/sprites/items/item-titanium.png b/core/assets-raw/sprites/items/item-titanium.png
index 69368ab751..8f9214a89c 100644
Binary files a/core/assets-raw/sprites/items/item-titanium.png and b/core/assets-raw/sprites/items/item-titanium.png differ
diff --git a/core/assets-raw/sprites/items/item-tungsten.png b/core/assets-raw/sprites/items/item-tungsten.png
new file mode 100644
index 0000000000..da25267a56
Binary files /dev/null and b/core/assets-raw/sprites/items/item-tungsten.png differ
diff --git a/core/assets-raw/sprites/items/liquid-arkycite.png b/core/assets-raw/sprites/items/liquid-arkycite.png
new file mode 100644
index 0000000000..0ecdd7cc73
Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-arkycite.png differ
diff --git a/core/assets-raw/sprites/items/liquid-cryofluid.png b/core/assets-raw/sprites/items/liquid-cryofluid.png
index b438a5ed37..760127f369 100644
Binary files a/core/assets-raw/sprites/items/liquid-cryofluid.png and b/core/assets-raw/sprites/items/liquid-cryofluid.png differ
diff --git a/core/assets-raw/sprites/items/liquid-cyanogen.png b/core/assets-raw/sprites/items/liquid-cyanogen.png
new file mode 100644
index 0000000000..29c204c89d
Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-cyanogen.png differ
diff --git a/core/assets-raw/sprites/items/liquid-gallium.png b/core/assets-raw/sprites/items/liquid-gallium.png
new file mode 100644
index 0000000000..7f1d7f8a24
Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-gallium.png differ
diff --git a/core/assets-raw/sprites/items/liquid-hydrogen.png b/core/assets-raw/sprites/items/liquid-hydrogen.png
new file mode 100644
index 0000000000..cf55930c42
Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-hydrogen.png differ
diff --git a/core/assets-raw/sprites/items/liquid-neoplasm.png b/core/assets-raw/sprites/items/liquid-neoplasm.png
new file mode 100644
index 0000000000..0f5f15e267
Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-neoplasm.png differ
diff --git a/core/assets-raw/sprites/items/liquid-nitrogen.png b/core/assets-raw/sprites/items/liquid-nitrogen.png
new file mode 100644
index 0000000000..7f0d913212
Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-nitrogen.png differ
diff --git a/core/assets-raw/sprites/items/liquid-oil.png b/core/assets-raw/sprites/items/liquid-oil.png
index 51c7a8db47..5af0c2531a 100644
Binary files a/core/assets-raw/sprites/items/liquid-oil.png and b/core/assets-raw/sprites/items/liquid-oil.png differ
diff --git a/core/assets-raw/sprites/items/liquid-ozone.png b/core/assets-raw/sprites/items/liquid-ozone.png
new file mode 100644
index 0000000000..34607d5802
Binary files /dev/null and b/core/assets-raw/sprites/items/liquid-ozone.png differ
diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png
index 2d51d55a8c..1b17f29e50 100644
Binary files a/core/assets-raw/sprites/items/liquid-slag.png and b/core/assets-raw/sprites/items/liquid-slag.png differ
diff --git a/core/assets-raw/sprites/items/liquid-water.png b/core/assets-raw/sprites/items/liquid-water.png
index 602eee79a9..4fd8b92f74 100644
Binary files a/core/assets-raw/sprites/items/liquid-water.png and b/core/assets-raw/sprites/items/liquid-water.png differ
diff --git a/core/assets-raw/sprites/pack.json b/core/assets-raw/sprites/pack.json
index fcd452dd9f..1c74544445 100644
--- a/core/assets-raw/sprites/pack.json
+++ b/core/assets-raw/sprites/pack.json
@@ -4,5 +4,7 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  stripWhitespaceCenter: true,
+  ignoredWhitespaceStrings: ["effects/"]
 }
diff --git a/core/assets-raw/sprites/rubble/pack.json b/core/assets-raw/sprites/rubble/pack.json
index fcd452dd9f..252a508081 100644
--- a/core/assets-raw/sprites/rubble/pack.json
+++ b/core/assets-raw/sprites/rubble/pack.json
@@ -4,5 +4,6 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  stripWhitespaceCenter: true
 }
diff --git a/core/assets-raw/sprites/shapes/hcircle.png b/core/assets-raw/sprites/shapes/hcircle.png
new file mode 100644
index 0000000000..5eb12e968f
Binary files /dev/null and b/core/assets-raw/sprites/shapes/hcircle.png differ
diff --git a/core/assets-raw/sprites/shapes/ring-item.png b/core/assets-raw/sprites/shapes/ring-item.png
new file mode 100644
index 0000000000..e895ebef89
Binary files /dev/null and b/core/assets-raw/sprites/shapes/ring-item.png differ
diff --git a/core/assets-raw/sprites/shapes/shape-3.png b/core/assets-raw/sprites/shapes/shape-3.png
deleted file mode 100644
index d8dfb1f9cf..0000000000
Binary files a/core/assets-raw/sprites/shapes/shape-3.png and /dev/null differ
diff --git a/core/assets-raw/sprites/statuses/status-blasted.png b/core/assets-raw/sprites/statuses/status-blasted.png
new file mode 100644
index 0000000000..79f635ffb7
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-blasted.png differ
diff --git a/core/assets-raw/sprites/statuses/status-boss.png b/core/assets-raw/sprites/statuses/status-boss.png
new file mode 100644
index 0000000000..4497e73f17
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-boss.png differ
diff --git a/core/assets-raw/sprites/statuses/status-burning.png b/core/assets-raw/sprites/statuses/status-burning.png
new file mode 100644
index 0000000000..7e82dd4482
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-burning.png differ
diff --git a/core/assets-raw/sprites/statuses/status-corroded.png b/core/assets-raw/sprites/statuses/status-corroded.png
new file mode 100644
index 0000000000..908a522381
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-corroded.png differ
diff --git a/core/assets-raw/sprites/statuses/status-disarmed.png b/core/assets-raw/sprites/statuses/status-disarmed.png
new file mode 100644
index 0000000000..c1cfb764ba
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-disarmed.png differ
diff --git a/core/assets-raw/sprites/statuses/status-electrified.png b/core/assets-raw/sprites/statuses/status-electrified.png
new file mode 100644
index 0000000000..2a08b271b8
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-electrified.png differ
diff --git a/core/assets-raw/sprites/statuses/status-fast.png b/core/assets-raw/sprites/statuses/status-fast.png
new file mode 100644
index 0000000000..0de6eda95b
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-fast.png differ
diff --git a/core/assets-raw/sprites/statuses/status-freezing.png b/core/assets-raw/sprites/statuses/status-freezing.png
new file mode 100644
index 0000000000..5be529ab12
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-freezing.png differ
diff --git a/core/assets-raw/sprites/statuses/status-melting.png b/core/assets-raw/sprites/statuses/status-melting.png
new file mode 100644
index 0000000000..e3b4e54b54
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-melting.png differ
diff --git a/core/assets-raw/sprites/statuses/status-muddy.png b/core/assets-raw/sprites/statuses/status-muddy.png
new file mode 100644
index 0000000000..41946e670d
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-muddy.png differ
diff --git a/core/assets-raw/sprites/statuses/status-overclock.png b/core/assets-raw/sprites/statuses/status-overclock.png
new file mode 100644
index 0000000000..ede85bb8e9
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-overclock.png differ
diff --git a/core/assets-raw/sprites/statuses/status-overdrive.png b/core/assets-raw/sprites/statuses/status-overdrive.png
new file mode 100644
index 0000000000..79a4d561c3
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-overdrive.png differ
diff --git a/core/assets-raw/sprites/statuses/status-sapped.png b/core/assets-raw/sprites/statuses/status-sapped.png
new file mode 100644
index 0000000000..123686d595
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-sapped.png differ
diff --git a/core/assets-raw/sprites/statuses/status-shielded.png b/core/assets-raw/sprites/statuses/status-shielded.png
new file mode 100644
index 0000000000..b079c1bfef
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-shielded.png differ
diff --git a/core/assets-raw/sprites/statuses/status-shocked.png b/core/assets-raw/sprites/statuses/status-shocked.png
new file mode 100644
index 0000000000..2a08b271b8
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-shocked.png differ
diff --git a/core/assets-raw/sprites/statuses/status-slow.png b/core/assets-raw/sprites/statuses/status-slow.png
new file mode 100644
index 0000000000..123686d595
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-slow.png differ
diff --git a/core/assets-raw/sprites/statuses/status-spore-slowed.png b/core/assets-raw/sprites/statuses/status-spore-slowed.png
new file mode 100644
index 0000000000..939584437d
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-spore-slowed.png differ
diff --git a/core/assets-raw/sprites/statuses/status-tarred.png b/core/assets-raw/sprites/statuses/status-tarred.png
new file mode 100644
index 0000000000..41946e670d
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-tarred.png differ
diff --git a/core/assets-raw/sprites/statuses/status-unmoving.png b/core/assets-raw/sprites/statuses/status-unmoving.png
new file mode 100644
index 0000000000..a8c8743382
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-unmoving.png differ
diff --git a/core/assets-raw/sprites/statuses/status-wet.png b/core/assets-raw/sprites/statuses/status-wet.png
new file mode 100644
index 0000000000..3a26c4974a
Binary files /dev/null and b/core/assets-raw/sprites/statuses/status-wet.png differ
diff --git a/core/assets-raw/sprites/teams/team-crux.png b/core/assets-raw/sprites/teams/team-crux.png
new file mode 100644
index 0000000000..bd945aba7b
Binary files /dev/null and b/core/assets-raw/sprites/teams/team-crux.png differ
diff --git a/core/assets-raw/sprites/teams/team-derelict.png b/core/assets-raw/sprites/teams/team-derelict.png
new file mode 100644
index 0000000000..7123f12eae
Binary files /dev/null and b/core/assets-raw/sprites/teams/team-derelict.png differ
diff --git a/core/assets-raw/sprites/teams/team-malis.png b/core/assets-raw/sprites/teams/team-malis.png
new file mode 100644
index 0000000000..48c853183b
Binary files /dev/null and b/core/assets-raw/sprites/teams/team-malis.png differ
diff --git a/core/assets-raw/sprites/teams/team-sharded.png b/core/assets-raw/sprites/teams/team-sharded.png
new file mode 100644
index 0000000000..a3643d4bba
Binary files /dev/null and b/core/assets-raw/sprites/teams/team-sharded.png differ
diff --git a/core/assets-raw/sprites/ui/alpha-bg-line.png b/core/assets-raw/sprites/ui/alpha-bg-line.png
new file mode 100644
index 0000000000..02becdcf15
Binary files /dev/null and b/core/assets-raw/sprites/ui/alpha-bg-line.png differ
diff --git a/core/assets-raw/sprites/ui/alphaaaa.png b/core/assets-raw/sprites/ui/alphaaaa.png
new file mode 100644
index 0000000000..36c7491b11
Binary files /dev/null and b/core/assets-raw/sprites/ui/alphaaaa.png differ
diff --git a/core/assets-raw/sprites/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png
index 2e4808729f..f566ef9534 100644
Binary files a/core/assets-raw/sprites/ui/button-down.9.png and b/core/assets-raw/sprites/ui/button-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-down-1.9.png b/core/assets-raw/sprites/ui/button-edge-down-1.9.png
new file mode 100644
index 0000000000..14811612f7
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-edge-down-1.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-down-3.9.png b/core/assets-raw/sprites/ui/button-edge-down-3.9.png
new file mode 100644
index 0000000000..0bdf193a97
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-edge-down-3.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-over-1.9.png b/core/assets-raw/sprites/ui/button-edge-over-1.9.png
new file mode 100644
index 0000000000..11e9d35f69
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-edge-over-1.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-over-3.9.png b/core/assets-raw/sprites/ui/button-edge-over-3.9.png
new file mode 100644
index 0000000000..5137b12671
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-edge-over-3.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-over.9.png b/core/assets-raw/sprites/ui/button-over.9.png
index 7e2213087d..c88fe60f90 100644
Binary files a/core/assets-raw/sprites/ui/button-over.9.png and b/core/assets-raw/sprites/ui/button-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-select-trans.9.png b/core/assets-raw/sprites/ui/button-select-trans.9.png
new file mode 100644
index 0000000000..65c60f4aff
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-select-trans.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-side-left-down.9.png b/core/assets-raw/sprites/ui/button-side-left-down.9.png
new file mode 100644
index 0000000000..77135c13a7
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-side-left-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-side-left-over.9.png b/core/assets-raw/sprites/ui/button-side-left-over.9.png
new file mode 100644
index 0000000000..344289a29f
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-side-left-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-side-left.9.png b/core/assets-raw/sprites/ui/button-side-left.9.png
new file mode 100644
index 0000000000..7b59f1d3b2
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-side-left.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-side-right-down.9.png b/core/assets-raw/sprites/ui/button-side-right-down.9.png
new file mode 100644
index 0000000000..aa34b5e53f
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-side-right-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-side-right-over.9.png b/core/assets-raw/sprites/ui/button-side-right-over.9.png
new file mode 100644
index 0000000000..dad0de712e
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-side-right-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-side-right.9.png b/core/assets-raw/sprites/ui/button-side-right.9.png
new file mode 100644
index 0000000000..32123ba7d9
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-side-right.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-square-down.9.png b/core/assets-raw/sprites/ui/button-square-down.9.png
deleted file mode 100644
index 4c81be0884..0000000000
Binary files a/core/assets-raw/sprites/ui/button-square-down.9.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/button-square-over.9.png b/core/assets-raw/sprites/ui/button-square-over.9.png
deleted file mode 100644
index 9d197296b3..0000000000
Binary files a/core/assets-raw/sprites/ui/button-square-over.9.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/button-square.9.png b/core/assets-raw/sprites/ui/button-square.9.png
deleted file mode 100644
index 8c79235588..0000000000
Binary files a/core/assets-raw/sprites/ui/button-square.9.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/cat.png b/core/assets-raw/sprites/ui/cat.png
new file mode 100755
index 0000000000..cdc94db9f9
Binary files /dev/null and b/core/assets-raw/sprites/ui/cat.png differ
diff --git a/core/assets-raw/sprites/ui/discord-banner.png b/core/assets-raw/sprites/ui/discord-banner.png
index 165705e368..49efc82711 100644
Binary files a/core/assets-raw/sprites/ui/discord-banner.png and b/core/assets-raw/sprites/ui/discord-banner.png differ
diff --git a/core/assets-raw/sprites/ui/pack.json b/core/assets-raw/sprites/ui/pack.json
index fcd452dd9f..775c36ebdd 100644
--- a/core/assets-raw/sprites/ui/pack.json
+++ b/core/assets-raw/sprites/ui/pack.json
@@ -2,7 +2,8 @@
   duplicatePadding: true,
   combineSubdirectories: true,
   flattenPaths: true,
-  maxWidth: 4096,
-  maxHeight: 4096,
-  fast: true
+  maxWidth: 2048,
+  maxHeight: 2048,
+  fast: true,
+  stripWhitespaceCenter: true
 }
diff --git a/core/assets-raw/sprites/ui/pane-left.9.png b/core/assets-raw/sprites/ui/pane-left.9.png
new file mode 100644
index 0000000000..8019c41497
Binary files /dev/null and b/core/assets-raw/sprites/ui/pane-left.9.png differ
diff --git a/core/assets-raw/sprites/ui/pane-right.9.png b/core/assets-raw/sprites/ui/pane-right.9.png
new file mode 100644
index 0000000000..62f65042dd
Binary files /dev/null and b/core/assets-raw/sprites/ui/pane-right.9.png differ
diff --git a/core/assets-raw/sprites/ui/pane-solid.9.png b/core/assets-raw/sprites/ui/pane-solid.9.png
new file mode 100644
index 0000000000..f7a6a53b36
Binary files /dev/null and b/core/assets-raw/sprites/ui/pane-solid.9.png differ
diff --git a/core/assets-raw/sprites/ui/pane-top.9.png b/core/assets-raw/sprites/ui/pane-top.9.png
new file mode 100644
index 0000000000..9a8931d2e8
Binary files /dev/null and b/core/assets-raw/sprites/ui/pane-top.9.png differ
diff --git a/core/assets-raw/sprites/ui/ranai.png b/core/assets-raw/sprites/ui/ranai.png
new file mode 100644
index 0000000000..e6fc9b930c
Binary files /dev/null and b/core/assets-raw/sprites/ui/ranai.png differ
diff --git a/core/assets-raw/sprites/ui/sideline-over.9.png b/core/assets-raw/sprites/ui/sideline-over.9.png
new file mode 100644
index 0000000000..fec86b6d35
Binary files /dev/null and b/core/assets-raw/sprites/ui/sideline-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/sideline.9.png b/core/assets-raw/sprites/ui/sideline.9.png
new file mode 100644
index 0000000000..4a5413a685
Binary files /dev/null and b/core/assets-raw/sprites/ui/sideline.9.png differ
diff --git a/core/assets-raw/sprites/ui/slider-back.9.png b/core/assets-raw/sprites/ui/slider-back.9.png
new file mode 100644
index 0000000000..013c6cc7bd
Binary files /dev/null and b/core/assets-raw/sprites/ui/slider-back.9.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png
index 7eac1c0f51..72ff323d0b 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob-down.png and b/core/assets-raw/sprites/ui/slider-knob-down.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob-over.png b/core/assets-raw/sprites/ui/slider-knob-over.png
index a4bb61170b..d7ca8fb4ea 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob-over.png and b/core/assets-raw/sprites/ui/slider-knob-over.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob.png b/core/assets-raw/sprites/ui/slider-knob.png
index 6e643e0dc6..7c4e35233e 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob.png and b/core/assets-raw/sprites/ui/slider-knob.png differ
diff --git a/core/assets-raw/sprites/ui/slider-vertical.png b/core/assets-raw/sprites/ui/slider-vertical.png
deleted file mode 100644
index 91d7c16e1f..0000000000
Binary files a/core/assets-raw/sprites/ui/slider-vertical.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/underline-over.9.png b/core/assets-raw/sprites/ui/underline-over.9.png
new file mode 100644
index 0000000000..d138927c1a
Binary files /dev/null and b/core/assets-raw/sprites/ui/underline-over.9.png differ
diff --git a/core/assets-raw/sprites/units/aegires-cell.png b/core/assets-raw/sprites/units/aegires-cell.png
new file mode 100644
index 0000000000..f85cfc8e17
Binary files /dev/null and b/core/assets-raw/sprites/units/aegires-cell.png differ
diff --git a/core/assets-raw/sprites/units/aegires.png b/core/assets-raw/sprites/units/aegires.png
new file mode 100644
index 0000000000..4514fb2035
Binary files /dev/null and b/core/assets-raw/sprites/units/aegires.png differ
diff --git a/core/assets-raw/sprites/units/anthicus-blade-heat.png b/core/assets-raw/sprites/units/anthicus-blade-heat.png
new file mode 100644
index 0000000000..1587cc4658
Binary files /dev/null and b/core/assets-raw/sprites/units/anthicus-blade-heat.png differ
diff --git a/core/assets-raw/sprites/units/anthicus-blade.png b/core/assets-raw/sprites/units/anthicus-blade.png
new file mode 100644
index 0000000000..7dcd5ea482
Binary files /dev/null and b/core/assets-raw/sprites/units/anthicus-blade.png differ
diff --git a/core/assets-raw/sprites/units/anthicus-cell.png b/core/assets-raw/sprites/units/anthicus-cell.png
new file mode 100644
index 0000000000..e0d1d80716
Binary files /dev/null and b/core/assets-raw/sprites/units/anthicus-cell.png differ
diff --git a/core/assets-raw/sprites/units/anthicus-leg-base.png b/core/assets-raw/sprites/units/anthicus-leg-base.png
new file mode 100644
index 0000000000..0b92243f30
Binary files /dev/null and b/core/assets-raw/sprites/units/anthicus-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/anthicus-leg.png b/core/assets-raw/sprites/units/anthicus-leg.png
new file mode 100644
index 0000000000..229f6d6330
Binary files /dev/null and b/core/assets-raw/sprites/units/anthicus-leg.png differ
diff --git a/core/assets-raw/sprites/units/anthicus.png b/core/assets-raw/sprites/units/anthicus.png
new file mode 100644
index 0000000000..a764180aab
Binary files /dev/null and b/core/assets-raw/sprites/units/anthicus.png differ
diff --git a/core/assets-raw/sprites/units/antumbra.png b/core/assets-raw/sprites/units/antumbra.png
index 10af20cfb9..bbbcb480fe 100644
Binary files a/core/assets-raw/sprites/units/antumbra.png and b/core/assets-raw/sprites/units/antumbra.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 114665d7a1..bbc5c171d8 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/assembly-drone-cell.png b/core/assets-raw/sprites/units/assembly-drone-cell.png
new file mode 100644
index 0000000000..8312d7a6e7
Binary files /dev/null and b/core/assets-raw/sprites/units/assembly-drone-cell.png differ
diff --git a/core/assets-raw/sprites/units/assembly-drone.png b/core/assets-raw/sprites/units/assembly-drone.png
new file mode 100644
index 0000000000..fa6c784b16
Binary files /dev/null and b/core/assets-raw/sprites/units/assembly-drone.png differ
diff --git a/core/assets-raw/sprites/units/avert-cell.png b/core/assets-raw/sprites/units/avert-cell.png
new file mode 100644
index 0000000000..2eecb72f3f
Binary files /dev/null and b/core/assets-raw/sprites/units/avert-cell.png differ
diff --git a/core/assets-raw/sprites/units/avert.png b/core/assets-raw/sprites/units/avert.png
new file mode 100644
index 0000000000..ab1344a971
Binary files /dev/null and b/core/assets-raw/sprites/units/avert.png differ
diff --git a/core/assets-raw/sprites/units/bryde.png b/core/assets-raw/sprites/units/bryde.png
index 5191b39b4a..97990553b7 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/cleroi-cell.png b/core/assets-raw/sprites/units/cleroi-cell.png
new file mode 100644
index 0000000000..ab1922cf29
Binary files /dev/null and b/core/assets-raw/sprites/units/cleroi-cell.png differ
diff --git a/core/assets-raw/sprites/units/cleroi-leg-base.png b/core/assets-raw/sprites/units/cleroi-leg-base.png
new file mode 100644
index 0000000000..1ff53aaf78
Binary files /dev/null and b/core/assets-raw/sprites/units/cleroi-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/cleroi-leg.png b/core/assets-raw/sprites/units/cleroi-leg.png
new file mode 100644
index 0000000000..cab7379bd2
Binary files /dev/null and b/core/assets-raw/sprites/units/cleroi-leg.png differ
diff --git a/core/assets-raw/sprites/units/cleroi-spine.png b/core/assets-raw/sprites/units/cleroi-spine.png
new file mode 100644
index 0000000000..6a42960bf9
Binary files /dev/null and b/core/assets-raw/sprites/units/cleroi-spine.png differ
diff --git a/core/assets-raw/sprites/units/cleroi.png b/core/assets-raw/sprites/units/cleroi.png
new file mode 100644
index 0000000000..c48211473d
Binary files /dev/null and b/core/assets-raw/sprites/units/cleroi.png differ
diff --git a/core/assets-raw/sprites/units/collaris-cell.png b/core/assets-raw/sprites/units/collaris-cell.png
new file mode 100644
index 0000000000..2e87344fb5
Binary files /dev/null and b/core/assets-raw/sprites/units/collaris-cell.png differ
diff --git a/core/assets-raw/sprites/units/collaris-joint-base.png b/core/assets-raw/sprites/units/collaris-joint-base.png
new file mode 100644
index 0000000000..3e6bf26d16
Binary files /dev/null and b/core/assets-raw/sprites/units/collaris-joint-base.png differ
diff --git a/core/assets-raw/sprites/units/collaris-leg-base.png b/core/assets-raw/sprites/units/collaris-leg-base.png
new file mode 100644
index 0000000000..841e11dab3
Binary files /dev/null and b/core/assets-raw/sprites/units/collaris-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/collaris-leg.png b/core/assets-raw/sprites/units/collaris-leg.png
new file mode 100644
index 0000000000..ff3330fe9a
Binary files /dev/null and b/core/assets-raw/sprites/units/collaris-leg.png differ
diff --git a/core/assets-raw/sprites/units/collaris.png b/core/assets-raw/sprites/units/collaris.png
new file mode 100644
index 0000000000..bc741fdb39
Binary files /dev/null and b/core/assets-raw/sprites/units/collaris.png differ
diff --git a/core/assets-raw/sprites/units/conquer-cell.png b/core/assets-raw/sprites/units/conquer-cell.png
new file mode 100644
index 0000000000..07d08e545f
Binary files /dev/null and b/core/assets-raw/sprites/units/conquer-cell.png differ
diff --git a/core/assets-raw/sprites/units/conquer-glow.png b/core/assets-raw/sprites/units/conquer-glow.png
new file mode 100644
index 0000000000..b1374eb85a
Binary files /dev/null and b/core/assets-raw/sprites/units/conquer-glow.png differ
diff --git a/core/assets-raw/sprites/units/conquer-treads.png b/core/assets-raw/sprites/units/conquer-treads.png
new file mode 100644
index 0000000000..3bc6677188
Binary files /dev/null and b/core/assets-raw/sprites/units/conquer-treads.png differ
diff --git a/core/assets-raw/sprites/units/conquer.png b/core/assets-raw/sprites/units/conquer.png
new file mode 100644
index 0000000000..6d2d669ec1
Binary files /dev/null and b/core/assets-raw/sprites/units/conquer.png differ
diff --git a/core/assets-raw/sprites/units/corvus.png b/core/assets-raw/sprites/units/corvus.png
index 59c20e2566..87d309348f 100644
Binary files a/core/assets-raw/sprites/units/corvus.png and b/core/assets-raw/sprites/units/corvus.png differ
diff --git a/core/assets-raw/sprites/units/cyerce-cell.png b/core/assets-raw/sprites/units/cyerce-cell.png
new file mode 100644
index 0000000000..6dba8c9285
Binary files /dev/null and b/core/assets-raw/sprites/units/cyerce-cell.png differ
diff --git a/core/assets-raw/sprites/units/cyerce.png b/core/assets-raw/sprites/units/cyerce.png
new file mode 100644
index 0000000000..75a4908109
Binary files /dev/null and b/core/assets-raw/sprites/units/cyerce.png differ
diff --git a/core/assets-raw/sprites/units/dagger.png b/core/assets-raw/sprites/units/dagger.png
index 2fa4b1464d..784c3c49e1 100644
Binary files a/core/assets-raw/sprites/units/dagger.png and b/core/assets-raw/sprites/units/dagger.png differ
diff --git a/core/assets-raw/sprites/units/disrupt-cell.png b/core/assets-raw/sprites/units/disrupt-cell.png
new file mode 100644
index 0000000000..4c6beb6e2d
Binary files /dev/null and b/core/assets-raw/sprites/units/disrupt-cell.png differ
diff --git a/core/assets-raw/sprites/units/disrupt.png b/core/assets-raw/sprites/units/disrupt.png
new file mode 100644
index 0000000000..660ffb4767
Binary files /dev/null and b/core/assets-raw/sprites/units/disrupt.png differ
diff --git a/core/assets-raw/sprites/units/eclipse.aseprite b/core/assets-raw/sprites/units/eclipse.aseprite
deleted file mode 100644
index 51eb8f345b..0000000000
Binary files a/core/assets-raw/sprites/units/eclipse.aseprite and /dev/null differ
diff --git a/core/assets-raw/sprites/units/eclipse.png b/core/assets-raw/sprites/units/eclipse.png
index d53b0da185..5d49e2132e 100644
Binary files a/core/assets-raw/sprites/units/eclipse.png and b/core/assets-raw/sprites/units/eclipse.png differ
diff --git a/core/assets-raw/sprites/units/elude-cell.png b/core/assets-raw/sprites/units/elude-cell.png
new file mode 100644
index 0000000000..af424fb76a
Binary files /dev/null and b/core/assets-raw/sprites/units/elude-cell.png differ
diff --git a/core/assets-raw/sprites/units/elude.png b/core/assets-raw/sprites/units/elude.png
new file mode 100644
index 0000000000..173a779327
Binary files /dev/null and b/core/assets-raw/sprites/units/elude.png differ
diff --git a/core/assets-raw/sprites/units/emanate-cell.png b/core/assets-raw/sprites/units/emanate-cell.png
new file mode 100644
index 0000000000..101a01b9ec
Binary files /dev/null and b/core/assets-raw/sprites/units/emanate-cell.png differ
diff --git a/core/assets-raw/sprites/units/emanate.png b/core/assets-raw/sprites/units/emanate.png
new file mode 100644
index 0000000000..a6bfa45261
Binary files /dev/null and b/core/assets-raw/sprites/units/emanate.png differ
diff --git a/core/assets-raw/sprites/units/evoke-cell.png b/core/assets-raw/sprites/units/evoke-cell.png
new file mode 100644
index 0000000000..fd59b26b4a
Binary files /dev/null and b/core/assets-raw/sprites/units/evoke-cell.png differ
diff --git a/core/assets-raw/sprites/units/evoke.png b/core/assets-raw/sprites/units/evoke.png
new file mode 100644
index 0000000000..11e8f689fa
Binary files /dev/null and b/core/assets-raw/sprites/units/evoke.png differ
diff --git a/core/assets-raw/sprites/units/flare.png b/core/assets-raw/sprites/units/flare.png
index 435c9d24cf..fe81ef23df 100644
Binary files a/core/assets-raw/sprites/units/flare.png and b/core/assets-raw/sprites/units/flare.png differ
diff --git a/core/assets-raw/sprites/units/incite-cell.png b/core/assets-raw/sprites/units/incite-cell.png
new file mode 100644
index 0000000000..5fecb45a29
Binary files /dev/null and b/core/assets-raw/sprites/units/incite-cell.png differ
diff --git a/core/assets-raw/sprites/units/incite.png b/core/assets-raw/sprites/units/incite.png
new file mode 100644
index 0000000000..84da4c8278
Binary files /dev/null and b/core/assets-raw/sprites/units/incite.png differ
diff --git a/core/assets-raw/sprites/units/locus-cell.png b/core/assets-raw/sprites/units/locus-cell.png
new file mode 100644
index 0000000000..673f589670
Binary files /dev/null and b/core/assets-raw/sprites/units/locus-cell.png differ
diff --git a/core/assets-raw/sprites/units/locus-treads.png b/core/assets-raw/sprites/units/locus-treads.png
new file mode 100644
index 0000000000..e39c164a76
Binary files /dev/null and b/core/assets-raw/sprites/units/locus-treads.png differ
diff --git a/core/assets-raw/sprites/units/locus.png b/core/assets-raw/sprites/units/locus.png
new file mode 100644
index 0000000000..7d69b23f04
Binary files /dev/null and b/core/assets-raw/sprites/units/locus.png differ
diff --git a/core/assets-raw/sprites/units/manifold-cell.png b/core/assets-raw/sprites/units/manifold-cell.png
new file mode 100644
index 0000000000..d921e81cb1
Binary files /dev/null and b/core/assets-raw/sprites/units/manifold-cell.png differ
diff --git a/core/assets-raw/sprites/units/manifold.png b/core/assets-raw/sprites/units/manifold.png
new file mode 100644
index 0000000000..d9276a4c9f
Binary files /dev/null and b/core/assets-raw/sprites/units/manifold.png differ
diff --git a/core/assets-raw/sprites/units/mega.png b/core/assets-raw/sprites/units/mega.png
index 3cbd6cc822..0c3ff432a0 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/merui-cell.png b/core/assets-raw/sprites/units/merui-cell.png
new file mode 100644
index 0000000000..9548b30a9a
Binary files /dev/null and b/core/assets-raw/sprites/units/merui-cell.png differ
diff --git a/core/assets-raw/sprites/units/merui-leg-base.png b/core/assets-raw/sprites/units/merui-leg-base.png
new file mode 100644
index 0000000000..efcda87291
Binary files /dev/null and b/core/assets-raw/sprites/units/merui-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/merui-leg.png b/core/assets-raw/sprites/units/merui-leg.png
new file mode 100644
index 0000000000..aad88b1de6
Binary files /dev/null and b/core/assets-raw/sprites/units/merui-leg.png differ
diff --git a/core/assets-raw/sprites/units/merui.png b/core/assets-raw/sprites/units/merui.png
new file mode 100644
index 0000000000..270c8efc53
Binary files /dev/null and b/core/assets-raw/sprites/units/merui.png differ
diff --git a/core/assets-raw/sprites/units/minke.png b/core/assets-raw/sprites/units/minke.png
index 32ec1fadfe..597550df3a 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/navanax-cell.png b/core/assets-raw/sprites/units/navanax-cell.png
new file mode 100644
index 0000000000..79e2b847b7
Binary files /dev/null and b/core/assets-raw/sprites/units/navanax-cell.png differ
diff --git a/core/assets-raw/sprites/units/navanax.png b/core/assets-raw/sprites/units/navanax.png
new file mode 100644
index 0000000000..17cf6bb068
Binary files /dev/null and b/core/assets-raw/sprites/units/navanax.png differ
diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment0.png b/core/assets-raw/sprites/units/neoplasm/latum-segment0.png
new file mode 100644
index 0000000000..694b491924
Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment0.png differ
diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment1.png b/core/assets-raw/sprites/units/neoplasm/latum-segment1.png
new file mode 100644
index 0000000000..9764ace4f0
Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment1.png differ
diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment2.png b/core/assets-raw/sprites/units/neoplasm/latum-segment2.png
new file mode 100644
index 0000000000..cca25fc655
Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment2.png differ
diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment3.png b/core/assets-raw/sprites/units/neoplasm/latum-segment3.png
new file mode 100644
index 0000000000..ffad71d540
Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment3.png differ
diff --git a/core/assets-raw/sprites/units/neoplasm/renale-segment0.png b/core/assets-raw/sprites/units/neoplasm/renale-segment0.png
new file mode 100644
index 0000000000..9823064418
Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/renale-segment0.png differ
diff --git a/core/assets-raw/sprites/units/neoplasm/renale-segment1.png b/core/assets-raw/sprites/units/neoplasm/renale-segment1.png
new file mode 100644
index 0000000000..36729c3e93
Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/renale-segment1.png differ
diff --git a/core/assets-raw/sprites/units/neoplasm/renale-segment2.png b/core/assets-raw/sprites/units/neoplasm/renale-segment2.png
new file mode 100644
index 0000000000..067b851519
Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/renale-segment2.png differ
diff --git a/core/assets-raw/sprites/units/obviate-blade-heat.png b/core/assets-raw/sprites/units/obviate-blade-heat.png
new file mode 100644
index 0000000000..b6d8f68a40
Binary files /dev/null and b/core/assets-raw/sprites/units/obviate-blade-heat.png differ
diff --git a/core/assets-raw/sprites/units/obviate-blade.png b/core/assets-raw/sprites/units/obviate-blade.png
new file mode 100644
index 0000000000..e1528e1bbc
Binary files /dev/null and b/core/assets-raw/sprites/units/obviate-blade.png differ
diff --git a/core/assets-raw/sprites/units/obviate-cell.png b/core/assets-raw/sprites/units/obviate-cell.png
new file mode 100644
index 0000000000..9c807c22dc
Binary files /dev/null and b/core/assets-raw/sprites/units/obviate-cell.png differ
diff --git a/core/assets-raw/sprites/units/obviate-heat.png b/core/assets-raw/sprites/units/obviate-heat.png
new file mode 100644
index 0000000000..410a97bd0d
Binary files /dev/null and b/core/assets-raw/sprites/units/obviate-heat.png differ
diff --git a/core/assets-raw/sprites/units/obviate-preview.png b/core/assets-raw/sprites/units/obviate-preview.png
new file mode 100644
index 0000000000..4a7553fffd
Binary files /dev/null and b/core/assets-raw/sprites/units/obviate-preview.png differ
diff --git a/core/assets-raw/sprites/units/obviate-side.png b/core/assets-raw/sprites/units/obviate-side.png
new file mode 100644
index 0000000000..ebba8b2e87
Binary files /dev/null and b/core/assets-raw/sprites/units/obviate-side.png differ
diff --git a/core/assets-raw/sprites/units/obviate.png b/core/assets-raw/sprites/units/obviate.png
new file mode 100644
index 0000000000..a952fabb87
Binary files /dev/null and b/core/assets-raw/sprites/units/obviate.png differ
diff --git a/core/assets-raw/sprites/units/oct-cell.png b/core/assets-raw/sprites/units/oct-cell.png
index 436242ed95..b27f93adb4 100644
Binary files a/core/assets-raw/sprites/units/oct-cell.png 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
index 067ebb857b..d61cf5c2f5 100644
Binary files a/core/assets-raw/sprites/units/oct.png and b/core/assets-raw/sprites/units/oct.png differ
diff --git a/core/assets-raw/sprites/units/omura.png b/core/assets-raw/sprites/units/omura.png
index 02befddd78..d29aff7739 100644
Binary files a/core/assets-raw/sprites/units/omura.png and b/core/assets-raw/sprites/units/omura.png differ
diff --git a/core/assets-raw/sprites/units/oxynoe-cell.png b/core/assets-raw/sprites/units/oxynoe-cell.png
new file mode 100644
index 0000000000..92120a6bd4
Binary files /dev/null and b/core/assets-raw/sprites/units/oxynoe-cell.png differ
diff --git a/core/assets-raw/sprites/units/oxynoe.png b/core/assets-raw/sprites/units/oxynoe.png
new file mode 100644
index 0000000000..35a4d45cbc
Binary files /dev/null and b/core/assets-raw/sprites/units/oxynoe.png differ
diff --git a/core/assets-raw/sprites/units/poly.png b/core/assets-raw/sprites/units/poly.png
index b6c57ac149..dd3c76e96f 100644
Binary files a/core/assets-raw/sprites/units/poly.png and b/core/assets-raw/sprites/units/poly.png differ
diff --git a/core/assets-raw/sprites/units/precept-cell.png b/core/assets-raw/sprites/units/precept-cell.png
new file mode 100644
index 0000000000..8f4a9ecdaf
Binary files /dev/null and b/core/assets-raw/sprites/units/precept-cell.png differ
diff --git a/core/assets-raw/sprites/units/precept-treads.png b/core/assets-raw/sprites/units/precept-treads.png
new file mode 100644
index 0000000000..916cd739e5
Binary files /dev/null and b/core/assets-raw/sprites/units/precept-treads.png differ
diff --git a/core/assets-raw/sprites/units/precept.png b/core/assets-raw/sprites/units/precept.png
new file mode 100644
index 0000000000..58f5f586e7
Binary files /dev/null and b/core/assets-raw/sprites/units/precept.png differ
diff --git a/core/assets-raw/sprites/units/pulsar.png b/core/assets-raw/sprites/units/pulsar.png
index af014df891..b16864d31c 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.png b/core/assets-raw/sprites/units/quad.png
index 95435c1f38..51b20f747d 100644
Binary files a/core/assets-raw/sprites/units/quad.png and b/core/assets-raw/sprites/units/quad.png differ
diff --git a/core/assets-raw/sprites/units/quasar.png b/core/assets-raw/sprites/units/quasar.png
index d68ed772a3..dfbf982581 100644
Binary files a/core/assets-raw/sprites/units/quasar.png and b/core/assets-raw/sprites/units/quasar.png differ
diff --git a/core/assets-raw/sprites/units/quell-cell.png b/core/assets-raw/sprites/units/quell-cell.png
new file mode 100644
index 0000000000..9c381e0415
Binary files /dev/null and b/core/assets-raw/sprites/units/quell-cell.png differ
diff --git a/core/assets-raw/sprites/units/quell.png b/core/assets-raw/sprites/units/quell.png
new file mode 100644
index 0000000000..8f337b129e
Binary files /dev/null and b/core/assets-raw/sprites/units/quell.png differ
diff --git a/core/assets-raw/sprites/units/reign-cell.png b/core/assets-raw/sprites/units/reign-cell.png
index 28aea20f24..c6983917f5 100644
Binary files a/core/assets-raw/sprites/units/reign-cell.png and b/core/assets-raw/sprites/units/reign-cell.png differ
diff --git a/core/assets-raw/sprites/units/reign.png b/core/assets-raw/sprites/units/reign.png
index 6a3d838582..6e7b81c146 100644
Binary files a/core/assets-raw/sprites/units/reign.png and b/core/assets-raw/sprites/units/reign.png differ
diff --git a/core/assets-raw/sprites/units/retusa-cell.png b/core/assets-raw/sprites/units/retusa-cell.png
new file mode 100644
index 0000000000..bb044aa5a3
Binary files /dev/null and b/core/assets-raw/sprites/units/retusa-cell.png differ
diff --git a/core/assets-raw/sprites/units/retusa.png b/core/assets-raw/sprites/units/retusa.png
new file mode 100644
index 0000000000..367e0d5921
Binary files /dev/null and b/core/assets-raw/sprites/units/retusa.png differ
diff --git a/core/assets-raw/sprites/units/risso.png b/core/assets-raw/sprites/units/risso.png
index 6cee60313b..bcfa3c29ad 100644
Binary files a/core/assets-raw/sprites/units/risso.png and b/core/assets-raw/sprites/units/risso.png differ
diff --git a/core/assets-raw/sprites/units/scepter.png b/core/assets-raw/sprites/units/scepter.png
index 5d1ae6f59b..1cfaaa2a87 100644
Binary files a/core/assets-raw/sprites/units/scepter.png and b/core/assets-raw/sprites/units/scepter.png differ
diff --git a/core/assets-raw/sprites/units/sei.png b/core/assets-raw/sprites/units/sei.png
index 724fe9559b..122cd107ab 100644
Binary files a/core/assets-raw/sprites/units/sei.png and b/core/assets-raw/sprites/units/sei.png differ
diff --git a/core/assets-raw/sprites/units/spiroct.png b/core/assets-raw/sprites/units/spiroct.png
index a69a0b2657..36df70869a 100644
Binary files a/core/assets-raw/sprites/units/spiroct.png and b/core/assets-raw/sprites/units/spiroct.png differ
diff --git a/core/assets-raw/sprites/units/stell-cell.png b/core/assets-raw/sprites/units/stell-cell.png
new file mode 100644
index 0000000000..c0909f4df5
Binary files /dev/null and b/core/assets-raw/sprites/units/stell-cell.png differ
diff --git a/core/assets-raw/sprites/units/stell-treads.png b/core/assets-raw/sprites/units/stell-treads.png
new file mode 100644
index 0000000000..703ea03dd0
Binary files /dev/null and b/core/assets-raw/sprites/units/stell-treads.png differ
diff --git a/core/assets-raw/sprites/units/stell.png b/core/assets-raw/sprites/units/stell.png
new file mode 100644
index 0000000000..e2eb8ec5ac
Binary files /dev/null and b/core/assets-raw/sprites/units/stell.png differ
diff --git a/core/assets-raw/sprites/units/tecta-cell.png b/core/assets-raw/sprites/units/tecta-cell.png
new file mode 100644
index 0000000000..0fea687a7e
Binary files /dev/null and b/core/assets-raw/sprites/units/tecta-cell.png differ
diff --git a/core/assets-raw/sprites/units/tecta-foot.png b/core/assets-raw/sprites/units/tecta-foot.png
new file mode 100644
index 0000000000..f035f791d4
Binary files /dev/null and b/core/assets-raw/sprites/units/tecta-foot.png differ
diff --git a/core/assets-raw/sprites/units/tecta-leg-base.png b/core/assets-raw/sprites/units/tecta-leg-base.png
new file mode 100644
index 0000000000..6091d58469
Binary files /dev/null and b/core/assets-raw/sprites/units/tecta-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/tecta-leg.png b/core/assets-raw/sprites/units/tecta-leg.png
new file mode 100644
index 0000000000..fc8fba6a7f
Binary files /dev/null and b/core/assets-raw/sprites/units/tecta-leg.png differ
diff --git a/core/assets-raw/sprites/units/tecta-shield.png b/core/assets-raw/sprites/units/tecta-shield.png
new file mode 100644
index 0000000000..6ef60f4ac9
Binary files /dev/null and b/core/assets-raw/sprites/units/tecta-shield.png differ
diff --git a/core/assets-raw/sprites/units/tecta.png b/core/assets-raw/sprites/units/tecta.png
new file mode 100644
index 0000000000..828e169320
Binary files /dev/null and b/core/assets-raw/sprites/units/tecta.png differ
diff --git a/core/assets-raw/sprites/units/toxopid.png b/core/assets-raw/sprites/units/toxopid.png
index a84e453f40..3f4037e94b 100644
Binary files a/core/assets-raw/sprites/units/toxopid.png and b/core/assets-raw/sprites/units/toxopid.png differ
diff --git a/core/assets-raw/sprites/units/vanguard.png b/core/assets-raw/sprites/units/vanguard.png
deleted file mode 100644
index feacbacc6e..0000000000
Binary files a/core/assets-raw/sprites/units/vanguard.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/vanquish-cell.png b/core/assets-raw/sprites/units/vanquish-cell.png
new file mode 100644
index 0000000000..46c91ead15
Binary files /dev/null and b/core/assets-raw/sprites/units/vanquish-cell.png differ
diff --git a/core/assets-raw/sprites/units/vanquish-treads.png b/core/assets-raw/sprites/units/vanquish-treads.png
new file mode 100644
index 0000000000..e878c59a7d
Binary files /dev/null and b/core/assets-raw/sprites/units/vanquish-treads.png differ
diff --git a/core/assets-raw/sprites/units/vanquish.png b/core/assets-raw/sprites/units/vanquish.png
new file mode 100644
index 0000000000..c867e2f81d
Binary files /dev/null and b/core/assets-raw/sprites/units/vanquish.png differ
diff --git a/core/assets-raw/sprites/units/vela.png b/core/assets-raw/sprites/units/vela.png
index db1fdbb9c7..b1c734abd4 100644
Binary files a/core/assets-raw/sprites/units/vela.png and b/core/assets-raw/sprites/units/vela.png differ
diff --git a/core/assets-raw/sprites/units/weapons/anthicus-missile-cell.png b/core/assets-raw/sprites/units/weapons/anthicus-missile-cell.png
new file mode 100644
index 0000000000..4299db9770
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/anthicus-missile-cell.png differ
diff --git a/core/assets-raw/sprites/units/weapons/anthicus-missile.png b/core/assets-raw/sprites/units/weapons/anthicus-missile.png
new file mode 100644
index 0000000000..5bb8d3b91e
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/anthicus-missile.png differ
diff --git a/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade-heat.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade-heat.png
new file mode 100644
index 0000000000..851b98682a
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade.png
new file mode 100644
index 0000000000..047772b92a
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade.png differ
diff --git a/core/assets-raw/sprites/units/weapons/anthicus-weapon-heat.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon-heat.png
new file mode 100644
index 0000000000..8bdd66749b
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/anthicus-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/anthicus-weapon.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon.png
new file mode 100644
index 0000000000..cf327299c6
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/anthicus-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/atrax-weapon.png b/core/assets-raw/sprites/units/weapons/atrax-weapon.png
new file mode 100644
index 0000000000..e0a6b3f1ff
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/atrax-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/avert-weapon.png b/core/assets-raw/sprites/units/weapons/avert-weapon.png
new file mode 100644
index 0000000000..75d41b24ee
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/avert-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/build-weapon.png b/core/assets-raw/sprites/units/weapons/build-weapon.png
new file mode 100644
index 0000000000..30591fa51f
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/build-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/cleroi-point-defense.png b/core/assets-raw/sprites/units/weapons/cleroi-point-defense.png
new file mode 100644
index 0000000000..96a02463d4
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/cleroi-point-defense.png differ
diff --git a/core/assets-raw/sprites/units/weapons/cleroi-weapon-heat.png b/core/assets-raw/sprites/units/weapons/cleroi-weapon-heat.png
new file mode 100644
index 0000000000..b33112bbe6
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/cleroi-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/cleroi-weapon.png b/core/assets-raw/sprites/units/weapons/cleroi-weapon.png
new file mode 100644
index 0000000000..7133cb1d87
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/cleroi-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/collaris-weapon-blade-heat.png b/core/assets-raw/sprites/units/weapons/collaris-weapon-blade-heat.png
new file mode 100644
index 0000000000..6e0ef1fcb2
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/collaris-weapon-blade-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/collaris-weapon-blade.png b/core/assets-raw/sprites/units/weapons/collaris-weapon-blade.png
new file mode 100644
index 0000000000..8b7303d2a5
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/collaris-weapon-blade.png differ
diff --git a/core/assets-raw/sprites/units/weapons/collaris-weapon-heat.png b/core/assets-raw/sprites/units/weapons/collaris-weapon-heat.png
new file mode 100644
index 0000000000..20e4e5165a
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/collaris-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/collaris-weapon.png b/core/assets-raw/sprites/units/weapons/collaris-weapon.png
new file mode 100644
index 0000000000..56d66f2431
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/collaris-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon-blade-heat.png b/core/assets-raw/sprites/units/weapons/conquer-weapon-blade-heat.png
new file mode 100644
index 0000000000..d3847c82db
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon-blade-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon-blade.png b/core/assets-raw/sprites/units/weapons/conquer-weapon-blade.png
new file mode 100644
index 0000000000..4d4181e035
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon-blade.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon-glow.png b/core/assets-raw/sprites/units/weapons/conquer-weapon-glow.png
new file mode 100644
index 0000000000..0d00463db2
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon-glow.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon-heat.png b/core/assets-raw/sprites/units/weapons/conquer-weapon-heat.png
new file mode 100644
index 0000000000..ee963032bc
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon-sides.png b/core/assets-raw/sprites/units/weapons/conquer-weapon-sides.png
new file mode 100644
index 0000000000..81a6757cd9
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon-sides.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon-sinks-heat.png b/core/assets-raw/sprites/units/weapons/conquer-weapon-sinks-heat.png
new file mode 100644
index 0000000000..4eeeb3a158
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon-sinks-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon-sinks.png b/core/assets-raw/sprites/units/weapons/conquer-weapon-sinks.png
new file mode 100644
index 0000000000..a41a37c05a
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon-sinks.png differ
diff --git a/core/assets-raw/sprites/units/weapons/conquer-weapon.png b/core/assets-raw/sprites/units/weapons/conquer-weapon.png
new file mode 100644
index 0000000000..79cc1bdcec
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/conquer-weapon.png differ
diff --git a/core/assets-raw/sprites/units/corvus-weapon-heat.png b/core/assets-raw/sprites/units/weapons/corvus-weapon-heat.png
similarity index 100%
rename from core/assets-raw/sprites/units/corvus-weapon-heat.png
rename to core/assets-raw/sprites/units/weapons/corvus-weapon-heat.png
diff --git a/core/assets-raw/sprites/units/weapons/disrupt-missile-fin.png b/core/assets-raw/sprites/units/weapons/disrupt-missile-fin.png
new file mode 100644
index 0000000000..9b5173fb28
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/disrupt-missile-fin.png differ
diff --git a/core/assets-raw/sprites/units/weapons/disrupt-missile.png b/core/assets-raw/sprites/units/weapons/disrupt-missile.png
new file mode 100644
index 0000000000..d2a9ff6e3a
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/disrupt-missile.png differ
diff --git a/core/assets-raw/sprites/units/weapons/disrupt-weapon-blade.png b/core/assets-raw/sprites/units/weapons/disrupt-weapon-blade.png
new file mode 100644
index 0000000000..3cc4e4aaae
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/disrupt-weapon-blade.png differ
diff --git a/core/assets-raw/sprites/units/weapons/disrupt-weapon-preview.png b/core/assets-raw/sprites/units/weapons/disrupt-weapon-preview.png
new file mode 100644
index 0000000000..39bd8016e1
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/disrupt-weapon-preview.png differ
diff --git a/core/assets-raw/sprites/units/weapons/disrupt-weapon.png b/core/assets-raw/sprites/units/weapons/disrupt-weapon.png
new file mode 100644
index 0000000000..8dabc8df95
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/disrupt-weapon.png differ
diff --git a/core/assets-raw/sprites/units/vanguard-cell.png b/core/assets-raw/sprites/units/weapons/elude-weapon.png
similarity index 52%
rename from core/assets-raw/sprites/units/vanguard-cell.png
rename to core/assets-raw/sprites/units/weapons/elude-weapon.png
index 4366b2167b..b3c65bcfed 100644
Binary files a/core/assets-raw/sprites/units/vanguard-cell.png and b/core/assets-raw/sprites/units/weapons/elude-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/emp-cannon-mount-heat.png b/core/assets-raw/sprites/units/weapons/emp-cannon-mount-heat.png
new file mode 100644
index 0000000000..b23f9257be
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/emp-cannon-mount-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/emp-cannon-mount.png b/core/assets-raw/sprites/units/weapons/emp-cannon-mount.png
new file mode 100644
index 0000000000..1fcaf470b1
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/emp-cannon-mount.png differ
diff --git a/core/assets-raw/sprites/units/weapons/eruption.png b/core/assets-raw/sprites/units/weapons/eruption.png
deleted file mode 100644
index 172e9835e6..0000000000
Binary files a/core/assets-raw/sprites/units/weapons/eruption.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/weapons/flakgun.png b/core/assets-raw/sprites/units/weapons/flakgun.png
deleted file mode 100644
index 12ee89862f..0000000000
Binary files a/core/assets-raw/sprites/units/weapons/flakgun.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/weapons/incite-weapon.png b/core/assets-raw/sprites/units/weapons/incite-weapon.png
new file mode 100644
index 0000000000..26d09e9784
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/incite-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/locus-weapon-cell.png b/core/assets-raw/sprites/units/weapons/locus-weapon-cell.png
new file mode 100644
index 0000000000..3ba48d74e2
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/locus-weapon-cell.png differ
diff --git a/core/assets-raw/sprites/units/weapons/locus-weapon.png b/core/assets-raw/sprites/units/weapons/locus-weapon.png
new file mode 100644
index 0000000000..bb426746dd
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/locus-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/merui-weapon-heat.png b/core/assets-raw/sprites/units/weapons/merui-weapon-heat.png
new file mode 100644
index 0000000000..764158d51b
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/merui-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/merui-weapon.png b/core/assets-raw/sprites/units/weapons/merui-weapon.png
new file mode 100644
index 0000000000..84eee1be40
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/merui-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/missiles.png b/core/assets-raw/sprites/units/weapons/missiles.png
deleted file mode 100644
index 38c0548ca6..0000000000
Binary files a/core/assets-raw/sprites/units/weapons/missiles.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/weapons/plasma-laser-mount-heat.png b/core/assets-raw/sprites/units/weapons/plasma-laser-mount-heat.png
new file mode 100644
index 0000000000..63e3eafc53
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/plasma-laser-mount-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/plasma-laser-mount.png b/core/assets-raw/sprites/units/weapons/plasma-laser-mount.png
new file mode 100644
index 0000000000..8a7ac5a27b
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/plasma-laser-mount.png differ
diff --git a/core/assets-raw/sprites/units/weapons/plasma-missile-mount.png b/core/assets-raw/sprites/units/weapons/plasma-missile-mount.png
new file mode 100644
index 0000000000..f8c5476bdc
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/plasma-missile-mount.png differ
diff --git a/core/assets-raw/sprites/units/weapons/plasma-mount-weapon.png b/core/assets-raw/sprites/units/weapons/plasma-mount-weapon.png
new file mode 100644
index 0000000000..57dad881de
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/plasma-mount-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/point-defense-mount.png b/core/assets-raw/sprites/units/weapons/point-defense-mount.png
new file mode 100644
index 0000000000..b14acbc73b
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/point-defense-mount.png differ
diff --git a/core/assets-raw/sprites/units/weapons/poly-weapon.png b/core/assets-raw/sprites/units/weapons/poly-weapon.png
new file mode 100644
index 0000000000..2ff4d59c4a
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/poly-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/precept-weapon-cell.png b/core/assets-raw/sprites/units/weapons/precept-weapon-cell.png
new file mode 100644
index 0000000000..e3cad4156d
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/precept-weapon-cell.png differ
diff --git a/core/assets-raw/sprites/units/weapons/precept-weapon-heat.png b/core/assets-raw/sprites/units/weapons/precept-weapon-heat.png
new file mode 100644
index 0000000000..07c80972db
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/precept-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/precept-weapon.png b/core/assets-raw/sprites/units/weapons/precept-weapon.png
new file mode 100644
index 0000000000..a90cf9ad73
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/precept-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/quell-missile.png b/core/assets-raw/sprites/units/weapons/quell-missile.png
new file mode 100644
index 0000000000..6aadf02c8a
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/quell-missile.png differ
diff --git a/core/assets-raw/sprites/units/weapons/quell-weapon.png b/core/assets-raw/sprites/units/weapons/quell-weapon.png
new file mode 100644
index 0000000000..44f39f794f
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/quell-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/repair-beam-weapon-center-large.png b/core/assets-raw/sprites/units/weapons/repair-beam-weapon-center-large.png
new file mode 100644
index 0000000000..2053dbbe2c
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/repair-beam-weapon-center-large.png differ
diff --git a/core/assets-raw/sprites/units/weapons/repair-beam-weapon-center.png b/core/assets-raw/sprites/units/weapons/repair-beam-weapon-center.png
new file mode 100644
index 0000000000..4f38701c30
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/repair-beam-weapon-center.png differ
diff --git a/core/assets-raw/sprites/units/weapons/repair-beam-weapon.png b/core/assets-raw/sprites/units/weapons/repair-beam-weapon.png
new file mode 100644
index 0000000000..373cf433ba
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/repair-beam-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/retusa-weapon.png b/core/assets-raw/sprites/units/weapons/retusa-weapon.png
new file mode 100644
index 0000000000..183907169c
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/retusa-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-cell.png b/core/assets-raw/sprites/units/weapons/scathe-missile-cell.png
new file mode 100644
index 0000000000..7854083dfd
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile-cell.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-phase-cell.png b/core/assets-raw/sprites/units/weapons/scathe-missile-phase-cell.png
new file mode 100644
index 0000000000..7f4d7e4c93
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile-phase-cell.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-phase.png b/core/assets-raw/sprites/units/weapons/scathe-missile-phase.png
new file mode 100644
index 0000000000..0065be21ab
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile-phase.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge-cell.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-cell.png
new file mode 100644
index 0000000000..7854083dfd
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-cell.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split-cell.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split-cell.png
new file mode 100644
index 0000000000..7854083dfd
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split-cell.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split.png
new file mode 100644
index 0000000000..22d7b4a9a6
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge.png
new file mode 100644
index 0000000000..fd05b27d08
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile-surge.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile.png b/core/assets-raw/sprites/units/weapons/scathe-missile.png
new file mode 100644
index 0000000000..e2a25eaeda
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scathe-missile.png differ
diff --git a/core/assets-raw/sprites/units/weapons/stell-weapon.png b/core/assets-raw/sprites/units/weapons/stell-weapon.png
new file mode 100644
index 0000000000..6cf23e2105
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/stell-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/tecta-weapon-heat.png b/core/assets-raw/sprites/units/weapons/tecta-weapon-heat.png
new file mode 100644
index 0000000000..11826e1305
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/tecta-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/tecta-weapon.png b/core/assets-raw/sprites/units/weapons/tecta-weapon.png
new file mode 100644
index 0000000000..85ab504421
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/tecta-weapon.png differ
diff --git a/core/assets-raw/sprites/units/toxopid-cannon.png b/core/assets-raw/sprites/units/weapons/toxopid-cannon.png
similarity index 100%
rename from core/assets-raw/sprites/units/toxopid-cannon.png
rename to core/assets-raw/sprites/units/weapons/toxopid-cannon.png
diff --git a/core/assets-raw/sprites/units/weapons/vanquish-point-weapon.png b/core/assets-raw/sprites/units/weapons/vanquish-point-weapon.png
new file mode 100644
index 0000000000..f3b3434c71
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/vanquish-point-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/vanquish-weapon-heat.png b/core/assets-raw/sprites/units/weapons/vanquish-weapon-heat.png
new file mode 100644
index 0000000000..7dc109fcec
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/vanquish-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/vanquish-weapon.png b/core/assets-raw/sprites/units/weapons/vanquish-weapon.png
new file mode 100644
index 0000000000..d58bf6e54f
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/vanquish-weapon.png differ
diff --git a/core/assets-raw/sprites/units/vela-weapon-heat.png b/core/assets-raw/sprites/units/weapons/vela-weapon-heat.png
similarity index 100%
rename from core/assets-raw/sprites/units/vela-weapon-heat.png
rename to core/assets-raw/sprites/units/weapons/vela-weapon-heat.png
diff --git a/core/assets-raw/sprites/units/zenith.png b/core/assets-raw/sprites/units/zenith.png
index 469d949c41..a41ac04898 100644
Binary files a/core/assets-raw/sprites/units/zenith.png and b/core/assets-raw/sprites/units/zenith.png differ
diff --git a/core/assets/baseparts/000.msch b/core/assets/baseparts/000.msch
deleted file mode 100644
index 35d2df8e14..0000000000
Binary files a/core/assets/baseparts/000.msch and /dev/null differ
diff --git a/core/assets/baseparts/1591381320600.msch b/core/assets/baseparts/1591381320600.msch
index 9ec53eaf98..cec83fb258 100644
--- a/core/assets/baseparts/1591381320600.msch
+++ b/core/assets/baseparts/1591381320600.msch
@@ -1,2 +1,3 @@
-msch
xœE��
-ƒ0„¯¦þÀ`{Ž>T¦Aµ–*Œ½ûÀõg°@øÂå.�Æ  =o‚n)Õãv쎣	ìÅA¯lºMü,ý“ÏSâã&ÓÊÞNìÌ­s¸/‘ÃjO1!Êq`ûK¢ñû,&�[ÀÿR Œ¤(O€®»6EÖ	*?»Ê».¡šëº>hRSÉ–-êTQBTP5PýAÙù–Ø(¢
\ No newline at end of file
+msch
xœE�Á
+ƒ0DÇ$FA(úù¢Òê‹
+1Jb)ý÷R›J÷ò–™a–…B- -=žm©c n÷MX-y³‘c5Ñl¡v{Tí;ûÚ…û‰ÜÜ“5ƒŸ­Åeô´MóÎfóÚm}²7nØĺ‘ÑDs1a}øž
\ñŸ"CäMžTË$œ
Q$¡H‘”�žŽÐñ!q¼�ãøDGüÊJ䲌"ã¼!ó
™oÈ”¬"ª2µ
1‘0[
\ No newline at end of file
diff --git a/core/assets/baseparts/1591389341902.msch b/core/assets/baseparts/1591389341902.msch
deleted file mode 100644
index de7b07b8bf..0000000000
Binary files a/core/assets/baseparts/1591389341902.msch and /dev/null differ
diff --git a/core/assets/baseparts/1591389353247.msch b/core/assets/baseparts/1591389353247.msch
deleted file mode 100644
index 35d2df8e14..0000000000
Binary files a/core/assets/baseparts/1591389353247.msch and /dev/null differ
diff --git a/core/assets/baseparts/1591389457130.msch b/core/assets/baseparts/1591389457130.msch
deleted file mode 100644
index cba53a4737..0000000000
--- a/core/assets/baseparts/1591389457130.msch
+++ /dev/null
@@ -1 +0,0 @@
-msch
xœ%ŠQƒ0C]RÐÄ>v>9Ê"µˆ¶S(HÜ~)X±_dƒƒÏKŒa•YëD­Ý¹(¼¸äS®¢øü²i©‘§¯ÆmÃ;VIÓ^e
0â–s-@
ÝuV™É½�­Úƒx›z¸?Œk¤
\ No newline at end of file
diff --git a/core/assets/baseparts/1603214918168.msch b/core/assets/baseparts/1603214918168.msch
deleted file mode 100644
index 6d69a2c362..0000000000
--- a/core/assets/baseparts/1603214918168.msch
+++ /dev/null
@@ -1,2 +0,0 @@
-msch
xœ5�Ë
-!E¯Ïy-J·ý‡ù(q¤£Gú÷�„ââä&'›„Î.<Zl.Çž®Vª{lG¸|�ŸK4ÌíúÙðü{»/ùßR±ÅÒ~•^=ÝùäГkÑïG�ç	àzRPm!&ÆÌX+ ÉÓ†4©¨²¼H}E“y$9’À˜’¢XQÜÔü‰æd8ZQŠ¡†acf,Œê˜ã"
\ No newline at end of file
diff --git a/core/assets/baseparts/1603214945791.msch b/core/assets/baseparts/1603214945791.msch
deleted file mode 100644
index 1508bec770..0000000000
--- a/core/assets/baseparts/1603214945791.msch
+++ /dev/null
@@ -1,2 +0,0 @@
-msch
xœ5�A E¿JkêÊStã��˜I
-4”šx{¡ðòÿ¼
¸vÐѽpq‘�°—”Ý›^˜Ú}æ­pŠ€Æą¼§#{Âã¯Ï>Å}SÆm‹tWØÏKæuÅXGÅq¤àY¬
z\P?E½:�ÅYŽ
ªÍΤÅÔ¢h)�(¦%UDK½”½(¶.©%Ð#èV0F¨­N#Ô
\ No newline at end of file
diff --git a/core/assets/baseparts/1603219428262.msch b/core/assets/baseparts/1603219428262.msch
deleted file mode 100644
index 6d5b519036..0000000000
Binary files a/core/assets/baseparts/1603219428262.msch and /dev/null differ
diff --git a/core/assets/baseparts/752919619894902997.msch b/core/assets/baseparts/752919619894902997.msch
deleted file mode 100644
index c8c143ca23..0000000000
Binary files a/core/assets/baseparts/752919619894902997.msch and /dev/null differ
diff --git a/core/assets/baseparts/752926963076694047.msch b/core/assets/baseparts/752926963076694047.msch
deleted file mode 100644
index 6e26296729..0000000000
Binary files a/core/assets/baseparts/752926963076694047.msch and /dev/null differ
diff --git a/core/assets/baseparts/752961607314702336.msch b/core/assets/baseparts/752961607314702336.msch
deleted file mode 100644
index f7ea7664db..0000000000
Binary files a/core/assets/baseparts/752961607314702336.msch and /dev/null differ
diff --git a/core/assets/baseparts/752980871690059906.msch b/core/assets/baseparts/752980871690059906.msch
deleted file mode 100644
index 360d04733b..0000000000
Binary files a/core/assets/baseparts/752980871690059906.msch and /dev/null differ
diff --git a/core/assets/baseparts/752982341865046126.msch b/core/assets/baseparts/752982341865046126.msch
deleted file mode 100644
index 360d04733b..0000000000
Binary files a/core/assets/baseparts/752982341865046126.msch and /dev/null differ
diff --git a/core/assets/baseparts/753043453876895784.msch b/core/assets/baseparts/753043453876895784.msch
deleted file mode 100644
index 013e2b4e23..0000000000
Binary files a/core/assets/baseparts/753043453876895784.msch and /dev/null differ
diff --git a/core/assets/baseparts/772860344174772254.msch b/core/assets/baseparts/772860344174772254.msch
deleted file mode 100644
index 781cd94d46..0000000000
Binary files a/core/assets/baseparts/772860344174772254.msch and /dev/null differ
diff --git a/core/assets/baseparts/772861253630165084.msch b/core/assets/baseparts/772861253630165084.msch
deleted file mode 100644
index e73ded4e03..0000000000
--- a/core/assets/baseparts/772861253630165084.msch
+++ /dev/null
@@ -1,3 +0,0 @@
-msch
xœ%Žknà „ÇØIü¨äV9×È
ú;¢xS!a@€“úîMÝ%F¬¾Ñ>fz�Æ©™p¾~:“¯¥}ŽëõbU$%MÈÆ;à
ãCeŠ’~rT:ûˆ^/6›»*ú#y’A9²’Õ7ϧà#É)%ŒÚ++5¹Ímáꘌ5Ú;™f²ì‹18Zf•�–S4Öb0™f™ü5áô¥2w­èƒðÎO„÷ VëÕ$ÙçN+Ÿ1(åíuÞ
-àŒýU¢ü
-‡mIŠR«uâ�80ŽGF‹úÄ©2ш–U…º€›;FÝÖÛßöÜ~·'§ÇbØ3xb`´ÕË_ Ûݾ¼+Ëÿ
©•UÊ
\ No newline at end of file
diff --git a/core/assets/baseparts/a single large power node.msch b/core/assets/baseparts/a single large power node.msch
new file mode 100644
index 0000000000..aed75d366c
--- /dev/null
+++ b/core/assets/baseparts/a single large power node.msch	
@@ -0,0 +1,2 @@
+msch
xœËA
+€ Fá_‹Ú´m7ðDÑÂraRÑ ë—¾õ÷ ¡ŒÑÞŒÍR
Ñ“Øâ™rz¹PLŽ±8®W	ù	)˜Äž,z?ÖîLs¦�?PhÍÀp;
\ No newline at end of file
diff --git a/core/assets/baseparts/a single surge tower.msch b/core/assets/baseparts/a single surge tower.msch
new file mode 100644
index 0000000000..9a59795fc4
--- /dev/null
+++ b/core/assets/baseparts/a single surge tower.msch	
@@ -0,0 +1,2 @@
+msch
xœ%ÊA
+€ @Á§Em;€èDÑÂê#‚i¨Ñõ£šõ Ñ
m´‡0ZS|tAL¹²SÓ-™a—²eVŸ"лJ(èyQ_œþŠWùÖ
\ No newline at end of file
diff --git a/core/assets/baseparts/actuallyokrtg.msch b/core/assets/baseparts/actuallyokrtg.msch
new file mode 100644
index 0000000000..904f16fda5
--- /dev/null
+++ b/core/assets/baseparts/actuallyokrtg.msch
@@ -0,0 +1,4 @@
+msch
xœM�anÂ0…MK[HÚ"Ä9rŠcÚ�<Ô-4(MaÜ~ÏñŸ)RŸíú{vB':Ô´�ý�iðç¼ú^ñ'å+Ù/ç4Ýóg"jƒÿä°PõþaÉ~¿dwIStxúÌÉñoNpˆ‰ŽK>¹»Ÿ98DW&û¯DÇ<e?OëÍ�ãüà�
Ý•gN^Æu¾pú
+ñé®0§S|p´»{Šß\ÆØe…µËñɉš‡_C&;e¾¹%®éÌXú�h#gƒxKT!îˆj[ªEª!Ûˆ4*­Jé¬iG¨‡-�’�ið.�ŽÉvT‰ã@åO¥Ò	Ð
+Þâ`É
+Þ*Þ¢¥�‹Uá:á*”ÁwŠ£�jÉ€w,/ÅN‹ø+³~¯6{o”7:Þèx£ã�no”7…¯Èê-¬ÚXµéÕ¦×5zµéÕ¦×5z½Å Ü ·õ#誅”-FÅGÅG}„QñƒâÁ÷tDçF-b@tõ½ÔO¼
\ No newline at end of file
diff --git a/core/assets/baseparts/atrax-surprise.msch b/core/assets/baseparts/atrax-surprise.msch
new file mode 100644
index 0000000000..1ed3c8b1ff
Binary files /dev/null and b/core/assets/baseparts/atrax-surprise.msch differ
diff --git a/core/assets/baseparts/atraxBaseOne.msch b/core/assets/baseparts/atraxBaseOne.msch
new file mode 100644
index 0000000000..ad42927475
Binary files /dev/null and b/core/assets/baseparts/atraxBaseOne.msch differ
diff --git a/core/assets/baseparts/battery node.msch b/core/assets/baseparts/battery node.msch
new file mode 100644
index 0000000000..fde063f02a
--- /dev/null
+++ b/core/assets/baseparts/battery node.msch	
@@ -0,0 +1,4 @@
+msch
xœ-‹Ñ
+@0F�
)”GðžH.Æþ¤fÓ¬äíQúÎÕé|hMîÍ.4³IIâÝû`…ÚʹÄíH[ð@éÌ,îD�“¢ýËÁ™¸
+Ý.‰Ãwû
(ÈÞ½h²
+ígû
\ No newline at end of file
diff --git a/core/assets/baseparts/daggersBunker.msch b/core/assets/baseparts/daggersBunker.msch
new file mode 100644
index 0000000000..bdfe341eea
Binary files /dev/null and b/core/assets/baseparts/daggersBunker.msch differ
diff --git a/core/assets/baseparts/daggersBunkerFour.msch b/core/assets/baseparts/daggersBunkerFour.msch
new file mode 100644
index 0000000000..dc06504008
--- /dev/null
+++ b/core/assets/baseparts/daggersBunkerFour.msch
@@ -0,0 +1,4 @@
+msch
xœMQË’Ó0œÄ/ÙΓåqà’À7Žœ(Ž¨âHqÐÚZÇ‹"¥d;a?…oà«ø
¸pÛbM�”¥HÊê‘Ô3êž¡m"Š�<(zù^š¦3íîƒlvïdÛ*·{;š/€×T6ª¯]w:kˆ(ÕòZéž–Ÿ~}ûþê£rÇQÛÏ/(é¥>YZ{ëºñP�¥Ö´j�MSÝÈz°îŽ¶½ÕÒUGi”®µŠâÆZGëÎœ”TSõà(E"ã
+éÊÝh{®Z9(µó)b4ÚJ\R¼—�¦ô ˜Jëk×5­ªþ×g$ºJ}œ—AÅÑžq`lƒz·£©½µôòrÖ×rà`sPõ^š®–ºj\;¥}‚�†®,ãü¤ª£³·Ê—.û¦ª� ²Ô
†FW+tî
>š‘ÿE!J¤DsÂ_F–>œGWÌ™15¤‡ `Ÿ#qÎÿ*
+@LCBQH=« ®C%`N~òKœ5ÈZbò
+�‰xzÀQÂ7Óýô)ÌÙ4M›izøAkls¢
 ðOpzɶbÖ»õRé	«!ºB%áYO!x†¥DÏÙ¸oÁ‘OH9
¸Ê�(Y¶&D0!‚	ñ¿‰¶™H¦?Ð�VL÷8ÝN¿Ù…§zåÅ�ÄÅA‚ﱩܺ(ø¦æ¡©yhj~iêœ5<¬¸ŒûÁÒYà,€ŸtÆWøñaºÁuÉþÿÁâŸÂ
\ No newline at end of file
diff --git a/core/assets/baseparts/daggersBunkerThree.msch b/core/assets/baseparts/daggersBunkerThree.msch
new file mode 100644
index 0000000000..c430d2d430
Binary files /dev/null and b/core/assets/baseparts/daggersBunkerThree.msch differ
diff --git a/core/assets/baseparts/daggersBunkerTwo.msch b/core/assets/baseparts/daggersBunkerTwo.msch
new file mode 100644
index 0000000000..c377b09aa1
Binary files /dev/null and b/core/assets/baseparts/daggersBunkerTwo.msch differ
diff --git a/core/assets/baseparts/diffGen.msch b/core/assets/baseparts/diffGen.msch
new file mode 100644
index 0000000000..526ac5a8a3
Binary files /dev/null and b/core/assets/baseparts/diffGen.msch differ
diff --git a/core/assets/baseparts/flar.msch b/core/assets/baseparts/flar.msch
new file mode 100644
index 0000000000..9ff1e0057f
--- /dev/null
+++ b/core/assets/baseparts/flar.msch
@@ -0,0 +1 @@
+msch
xœMŽÍNÃ0„'‰›æ¯^�»Ÿq0‰‹,9vd»”¼{ ¬»*KÞ�ogV‹'´„S³†¸XÐO:ŽÁ,Éx ¶êCÛˆòí}@oUÔANÁX‹—d’ræ:ËÑ»/½ú€“7VêïÔ˜Hžo*‘ý
Dc
¹eœµ¥ΣWVŽÚ¥`.×O�Þ$=Ëè¯a$¡L�—{tE·ø-s~¢Aôtª\”Ótǃ�ÔÑ–çE­Ö«éÿ2à(ò+¨¯¸%¡�+úî¼B	¨†d©©o4,�Yæ<ÐdS#ößýg߀}£nCU¶ÄБ³Zúhc."«#«cV=é"Æaù–s-Ös«Žsçz†=çÎ
Î�X�²ú18[Ó
\ No newline at end of file
diff --git a/core/assets/baseparts/flareBaseOne.msch b/core/assets/baseparts/flareBaseOne.msch
new file mode 100644
index 0000000000..42d7616993
Binary files /dev/null and b/core/assets/baseparts/flareBaseOne.msch differ
diff --git a/core/assets/baseparts/fortress.msch b/core/assets/baseparts/fortress.msch
new file mode 100644
index 0000000000..59cf5648e2
Binary files /dev/null and b/core/assets/baseparts/fortress.msch differ
diff --git a/core/assets/baseparts/glassCannons.msch b/core/assets/baseparts/glassCannons.msch
new file mode 100644
index 0000000000..fb402271bc
Binary files /dev/null and b/core/assets/baseparts/glassCannons.msch differ
diff --git a/core/assets/baseparts/horizonBaseOne.msch b/core/assets/baseparts/horizonBaseOne.msch
new file mode 100644
index 0000000000..1963ba1d83
Binary files /dev/null and b/core/assets/baseparts/horizonBaseOne.msch differ
diff --git a/core/assets/baseparts/impact.msch b/core/assets/baseparts/impact.msch
new file mode 100644
index 0000000000..bb82ff444a
Binary files /dev/null and b/core/assets/baseparts/impact.msch differ
diff --git a/core/assets/baseparts/impactMultiOutput.msch b/core/assets/baseparts/impactMultiOutput.msch
new file mode 100644
index 0000000000..7081a81237
Binary files /dev/null and b/core/assets/baseparts/impactMultiOutput.msch differ
diff --git a/core/assets/baseparts/impactSmall.msch b/core/assets/baseparts/impactSmall.msch
new file mode 100644
index 0000000000..3c5581102a
Binary files /dev/null and b/core/assets/baseparts/impactSmall.msch differ
diff --git a/core/assets/baseparts/impending-doom.msch b/core/assets/baseparts/impending-doom.msch
new file mode 100644
index 0000000000..ca2462b1ae
Binary files /dev/null and b/core/assets/baseparts/impending-doom.msch differ
diff --git a/core/assets/baseparts/pyraTurretsOne.msch b/core/assets/baseparts/pyraTurretsOne.msch
new file mode 100644
index 0000000000..47f97ce687
Binary files /dev/null and b/core/assets/baseparts/pyraTurretsOne.msch differ
diff --git a/core/assets/baseparts/rtgbrick1.msch b/core/assets/baseparts/rtgbrick1.msch
new file mode 100644
index 0000000000..f894bcdd1b
--- /dev/null
+++ b/core/assets/baseparts/rtgbrick1.msch
@@ -0,0 +1,2 @@
+msch
xœŒKà CͯE=
+‹ž§Ê‚�B%
D½~ya?Ù2œ�­á <y¤�sü¾±ìÔ#çsäV
ÜJبtèÏ갔Љýι,ýâD~´±@+�ý*I“¾·‹#á%×>Q%£ñ|Ô”’lÐʈYܵ”Í4
õÀ€$˜
\ No newline at end of file
diff --git a/core/assets/baseparts/rtgbrick2.msch b/core/assets/baseparts/rtgbrick2.msch
new file mode 100644
index 0000000000..f6898651e9
--- /dev/null
+++ b/core/assets/baseparts/rtgbrick2.msch
@@ -0,0 +1,5 @@
+msch
xœ
ŒK
+Ã0CåOÒ–ÐEâM¯ºpœÁ˜Nì0vèõ;ñ$!„	³ƒ¯ñ <däMJú¾±ìÔ“”s”V
Ì7â»~&<u2U’8š`é—d
+£ýHCt„Þ.I„Wo%œ±u™°pì$a—¬¿“
+Î(üÖÂÀhy³N½ó
+óÒ&Ñ
\ No newline at end of file
diff --git a/core/assets/baseparts/rtgsalvo.msch b/core/assets/baseparts/rtgsalvo.msch
new file mode 100644
index 0000000000..db60d562fd
Binary files /dev/null and b/core/assets/baseparts/rtgsalvo.msch differ
diff --git a/core/assets/baseparts/scorch.msch b/core/assets/baseparts/scorch.msch
new file mode 100644
index 0000000000..8a30c60d21
--- /dev/null
+++ b/core/assets/baseparts/scorch.msch
@@ -0,0 +1 @@
+msch
xœ5PÑŽ„ @ôá¾Ä/ºÜƒË’,‰ŠAÝËýýµt5!C§Ó™"FŒÝ6¯	ÆÆg:bÍû™ËÀ-ó#-ô÷�Ã×¾¥k�ϧgÍËËöN¥bŒeßS�~g¢o/WËu&jæ3­ÓQ®yNt`Ð>­ `ù®™TŸªõŒT�ôº»j=Ëë>rÅw“A`€Öè%²IÏQV*Ž6ÐË€—
Ï�f¥'Æ0Ð6LZ^Âs0™3ée®™y1b$=Hz�Ø Ê ÊAž2ðo°–6´†‰ <©þ
/_&‘
\ No newline at end of file
diff --git a/core/assets/baseparts/simplemeltdown.msch b/core/assets/baseparts/simplemeltdown.msch
new file mode 100644
index 0000000000..3cb3fc34df
--- /dev/null
+++ b/core/assets/baseparts/simplemeltdown.msch
@@ -0,0 +1,2 @@
+msch
xœ=‘벓0… å(=¾à³8þà@t¢
jöôÉ�qjqmÂq(|Ù—µ’�â|˜ºQ㼘ñjõ¨­æÛ5è¥wæêÍ<
8ÙîUÛñç/5òÿ]õkç½v÷Öv²Ý¢];8c-š[ÇR«ß¼ëz?;(ãõØ.óêz�¬Ÿ§a5jY)mý|Ó/Þøn2ëزüKß©º\¥ÒNó �]šÞÝç¯v5C;š7ª”5?%¢ôš#ø¾Ný~øË‘ £ïÌÄ~à¡A!á"Ž‰üð6À_•ræ$åªF”2U#>çœyò’‹ÃIÄR. `2'ʼD´=¶çö)¿ÏíùجeÛ“ï×Åö›[¤â]Ðâ„D�#C&ÓÝ4”HJVx˜ˆÒHj²ÓŽLZr>;XUD"%(BgÁ$QJ”'™X\åÈïµZæS2ÇÎx¯ª` B“zo:M—½©
+¾Uð­p$wI%àÌ“G2ïñ¨Þ¹ A#× Èò€" PHþ
ŸLo´
\ No newline at end of file
diff --git a/core/assets/baseparts/sixDaggers.msch b/core/assets/baseparts/sixDaggers.msch
new file mode 100644
index 0000000000..0175e599cf
--- /dev/null
+++ b/core/assets/baseparts/sixDaggers.msch
@@ -0,0 +1,2 @@
+msch
xœ-PKNÃ0}ù§N¡Bp€.Xâ-'`ɉ%báÆ&
+ríÈqZzÎÀá8
*3Ie93~óÞ›™`�M†Ü©½ÁݳrºwÝöEéíãöIu�	h´Ûб÷@iÕÎØWo¿ß?¯&“õïkÔ“³^i\wÁONËÕFNØU4Aš¯fÕNEBN¸½UAÊ+)ëªÖ;=õbðGR9¯
š�Uc”:ôÖ¢±Ë”$Ó¸õ?9ÿifÿfœÈJF6@ÓG³—£ŸBkhü{ºH�„Nž\´ÕW@F¡
rª_1-E²Ð8­–4#œ8!+¦l‘!«³óÊó™ôé,¦ËÄŒ‰9ò¬èM>5…ªàž)á‚“‚É‚œDÍìŠÙԔфÊË T®/�æ%ˆQÎåe82©Ù3¥ X'.{RaÅî5ûŠe]Á«ðÎéJþ4¨gsŽ%]XA
\ No newline at end of file
diff --git a/core/assets/baseparts/sixDaggersSmall.msch b/core/assets/baseparts/sixDaggersSmall.msch
new file mode 100644
index 0000000000..b357823c3b
Binary files /dev/null and b/core/assets/baseparts/sixDaggersSmall.msch differ
diff --git a/core/assets/baseparts/sixDaggersSmallTwo.msch b/core/assets/baseparts/sixDaggersSmallTwo.msch
new file mode 100644
index 0000000000..249fdeae71
--- /dev/null
+++ b/core/assets/baseparts/sixDaggersSmallTwo.msch
@@ -0,0 +1,2 @@
+msch
xœ-P;RÃ0}þÅŽ  g\Q¡†‚@IÁ%C¡XÂcF‘<²œ�£pÇ	˜°kedkßî{ûÑbƒ‹¹•;�›giÕ`ûöEªö¡}’}¯}ûèv£ìB{�Fé©óÃg
¬ŒÜj3áâí÷ûçîUûq6î}ƒj¶ÆI¥=.{ïf«Äå;ÄÕAí…þ
+~‰ ™fßkÜ�Ôe笚‡€r+鎨G&„uJ£Ù9¡ü`'£TTÄé	ZmpíöÚ“h¯ÅèݧŽm† wbr³ï4
~K?R ¡“'g‡ÞíÈÈ4R$QÀ°Œ0'¸fmŠ(Èl89CVe§?¬N'°„3h³ /c}A†„%
ªS‘)î–’ f�3]S<g¯`/¥º·Š^¹’½„@ŽØêÜ|yÒ’Æt˜÷IÉ,W1½>?žø5ó]K—:î ^v@›ˆëixA
;Á?·1Y„
\ No newline at end of file
diff --git a/core/assets/baseparts/solarbrick1.msch b/core/assets/baseparts/solarbrick1.msch
new file mode 100644
index 0000000000..730215bf91
Binary files /dev/null and b/core/assets/baseparts/solarbrick1.msch differ
diff --git a/core/assets/baseparts/solarbrick2.msch b/core/assets/baseparts/solarbrick2.msch
new file mode 100644
index 0000000000..3909b5f00f
Binary files /dev/null and b/core/assets/baseparts/solarbrick2.msch differ
diff --git a/core/assets/baseparts/solarbrick4.msch b/core/assets/baseparts/solarbrick4.msch
new file mode 100644
index 0000000000..d740903d5e
Binary files /dev/null and b/core/assets/baseparts/solarbrick4.msch differ
diff --git a/core/assets/baseparts/steamgobrr.msch b/core/assets/baseparts/steamgobrr.msch
new file mode 100644
index 0000000000..99af5789df
--- /dev/null
+++ b/core/assets/baseparts/steamgobrr.msch
@@ -0,0 +1,2 @@
+msch
xœ%ÐÝrƒ àãJÔ˜fúÜõm:½@³uÌ d“æí»¸^øÁ¸ËYÄÊÕ.„f‹d—É! ½Ñ6†ùg¿¨œÈmÈ¿\^6R0ôƒ£çâm™è_p9N1­ìñupv‹æfçÐïë�¯ó/3ñ)¸Æ9ÚuÞ3úõIo®ÿôO
+\ý$óþNGD=ØÈ¡o\7ïl0»’3¼šíi1›ßÃH<뎧H¯\(…Fè„E†•5›s„\(…Fèîä†YÉdÈÃ
¥¥/Jh�%Ziè Óî,»:çº#VI¬’X%±JbUŠ‡BÈ®¬˜*ݨ†æi˜F¾u÷Õ8¥IJ¨„ZÐÂIh„Vè�i^óUZhQ¤ºžWÙ?â�J-
\ No newline at end of file
diff --git a/core/assets/baseparts/strong_duos.msch b/core/assets/baseparts/strong_duos.msch
new file mode 100644
index 0000000000..32027b2c7e
Binary files /dev/null and b/core/assets/baseparts/strong_duos.msch differ
diff --git a/core/assets/baseparts/surgeTurretsOne.msch b/core/assets/baseparts/surgeTurretsOne.msch
new file mode 100644
index 0000000000..563818a965
Binary files /dev/null and b/core/assets/baseparts/surgeTurretsOne.msch differ
diff --git a/core/assets/baseparts/thoriumReactorBaseOne.msch b/core/assets/baseparts/thoriumReactorBaseOne.msch
new file mode 100644
index 0000000000..12943a3996
Binary files /dev/null and b/core/assets/baseparts/thoriumReactorBaseOne.msch differ
diff --git a/core/assets/baseparts/thoriumReactorFort.msch b/core/assets/baseparts/thoriumReactorFort.msch
new file mode 100644
index 0000000000..39e115aee4
Binary files /dev/null and b/core/assets/baseparts/thoriumReactorFort.msch differ
diff --git a/core/assets/bloomshaders/alpha_bloom.frag b/core/assets/bloomshaders/alpha_bloom.frag
index b3475ff259..b027f94649 100644
--- a/core/assets/bloomshaders/alpha_bloom.frag
+++ b/core/assets/bloomshaders/alpha_bloom.frag
@@ -6,8 +6,10 @@ uniform lowp float OriginalIntensity;
 varying vec2 v_texCoords;
 
 void main(){
-	vec4 original = texture2D(u_texture0, v_texCoords) * OriginalIntensity;
-	vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity; 	
-    original = original *  (vec4(1.0) - bloom);	 	
- 	gl_FragColor =  original + bloom; 	
+    vec4 original = texture2D(u_texture0, v_texCoords) * OriginalIntensity;
+    vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity;
+    original = original *  (vec4(1.0) - bloom);
+    vec4 combined =  original + bloom;
+    float mx = min(max(combined.r, max(combined.g, combined.b)), 1.0);
+    gl_FragColor = vec4(combined.rgb / max(mx, 0.0001), mx);
 }
diff --git a/core/assets/bloomshaders/alpha_gaussian.frag b/core/assets/bloomshaders/alpha_gaussian.frag
index 4d762bd5b4..8f52c951a5 100644
--- a/core/assets/bloomshaders/alpha_gaussian.frag
+++ b/core/assets/bloomshaders/alpha_gaussian.frag
@@ -10,9 +10,9 @@ const float close = 0.3162162162;
 const float far = 0.0702702703;
 
 void main(){
-   gl_FragColor = far * texture2D(u_texture, v_texCoords0) 
+    gl_FragColor = far * texture2D(u_texture, v_texCoords0)
 				+ close * texture2D(u_texture, v_texCoords1)
-				+ center * texture2D(u_texture, v_texCoords2) 
+				+ center * texture2D(u_texture, v_texCoords2)
 				+ close * texture2D(u_texture, v_texCoords3)
-				+ far * texture2D(u_texture, v_texCoords4); 
+				+ far * texture2D(u_texture, v_texCoords4);
 }	
diff --git a/core/assets/bloomshaders/maskedtreshold.frag b/core/assets/bloomshaders/maskedtreshold.frag
deleted file mode 100644
index ec2634ef3f..0000000000
--- a/core/assets/bloomshaders/maskedtreshold.frag
+++ /dev/null
@@ -1,9 +0,0 @@
-uniform lowp sampler2D u_texture0;
-uniform lowp vec2 threshold;
-varying vec2 v_texCoords;
-
-void main(){
-	vec4 tex = texture2D(u_texture0, v_texCoords);
-	vec3 colors = (tex.rgb - threshold.r)  * threshold.g * tex.a;
- 	gl_FragColor = vec4(colors, tex.a);
-}
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 4e9923983b..21bd9a8d3a 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -14,6 +14,7 @@ link.f-droid.description = F-Droid listing
 link.wiki.description = Official Mindustry wiki
 link.suggestions.description = Suggest new features
 link.bug.description = Found one? Report it here
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 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.
@@ -24,7 +25,6 @@ gameover.waiting = [accent]Waiting for next map...
 highscore = [accent]New highscore!
 copied = Copied.
 indev.notready = This part of the game isn't ready yet
-indev.campaign = [accent]Congratulations! You've reached the end of the campaign![]\n\nThis is as far as the content goes right now. Interplanetary travel will be added in future updates.
 
 load.sound = Sounds
 load.map = Maps
@@ -41,14 +41,23 @@ be.ignore = Ignore
 be.noupdates = No updates found.
 be.check = Check for updates
 
-mod.featured.dialog.title = Mod Browser (WIP)
+mods.browser = Mod Browser
 mods.browser.selected = Selected mod
 mods.browser.add = Install
-mods.github.open = View
+mods.browser.reinstall = Reinstall
+mods.browser.view-releases = View Releases
+mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published.
+mods.browser.latest = [lightgray][Latest]
+mods.browser.releases = Releases
+mods.github.open = Repo
+mods.github.open-release = Release Page
+mods.browser.sortdate = Sort by recent
+mods.browser.sortstars = Sort by stars
 
 schematic = Schematic
 schematic.add = Save Schematic...
 schematics = Schematics
+schematic.search = Search schematics...
 schematic.replace = A schematic by that name already exists. Replace it?
 schematic.exists = A schematic by that name already exists.
 schematic.import = Import Schematic...
@@ -61,21 +70,29 @@ schematic.shareworkshop = Share on Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
 schematic.saved = Schematic saved.
 schematic.delete.confirm = This schematic will be utterly eradicated.
-schematic.rename = Rename Schematic
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blocks
 schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.tags = Tags:
+schematic.edittags = Edit Tags
+schematic.addtag = Add Tag
+schematic.texttag = Text Tag
+schematic.icontag = Icon Tag
+schematic.renametag = Rename Tag
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Delete this tag completely?
+schematic.tagexists = That tag already exists.
 
 stats = Stats
-stat.wave = Waves Defeated:[accent] {0}
-stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
-stat.built = Buildings Built:[accent] {0}
-stat.destroyed = Buildings Destroyed:[accent] {0}
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
-stat.delivered = Resources Launched:
-stat.playtime = Time Played:[accent] {0}
-stat.rank = Final Rank: [accent]{0}
+stats.wave = Waves Defeated
+stats.unitsCreated = Units Created
+stats.enemiesDestroyed = Enemies Destroyed
+stats.built = Buildings Built
+stats.destroyed = Buildings Destroyed
+stats.deconstructed = Buildings Deconstructed
+stats.playtime = Time Played
 
-globalitems = [accent]Total Items
+globalitems = [accent]Planet Items
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
 level.select = Level Select
@@ -83,6 +100,7 @@ level.mode = Gamemode:
 coreattack = < Core is under attack! >
 nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
 database = Core Database
+database.button = Database
 savegame = Save Game
 loadgame = Load Game
 joingame = Join Game
@@ -90,6 +108,7 @@ customgame = Custom Game
 newgame = New Game
 none = <none>
 none.found = [lightgray]<none found>
+none.inmap = [lightgray]<none in map>
 minimap = Minimap
 position = Position
 close = Close
@@ -110,30 +129,49 @@ committingchanges = Committing Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
 
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub.
+mods.initfailed = [red]\u26A0[] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
 mods = Mods
 mods.none = [lightgray]No mods found!
 mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Folder
+mods.viewcontent = View Content
 mods.reload = Reload
 mods.reloadexit = The game will now exit, to reload mods.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
-mod.disabled = [scarlet]Disabled
+mod.disabled = [red]Disabled
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Disable
+mod.version = Version:
 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.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
+mod.erroredcontent = [red]Content Errors
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This mod caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+
+mod.requiresversion = Requires game version: [red]{0}
+
 mod.errors = Errors have occurred loading content.
-mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
-mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
+mod.noerrorplay = [red]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
+mod.nowdisabled = [red]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
 mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
-mod.reloadrequired = [scarlet]Restart Required
+mod.reloadrequired = [red]Restart Required
 mod.import = Import Mod
 mod.import.file = Import File
 mod.import.github = Import From GitHub
@@ -149,14 +187,23 @@ 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.
+search = Search:
 planetmap = Planet Map
 launchcore = Launch Core
 filename = File Name:
 unlocked = New content unlocked!
 available = New research available!
-completed = [accent]Completed
+unlock.incampaign = < Unlock in campaign for details >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nMore difficult. Higher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended, more content.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
+completed = [accent]Researched
 techtree = Tech Tree
-research.legacy = [accent]5.0[] research data found.\nDo you want to [accent]load this data[], or [accent]discard it[] and restart research in the new campaign (recommended)?
+techtree.select = Tech Tree Selection
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Load
 research.discard = Discard
 research.list = [lightgray]Research:
@@ -200,6 +247,7 @@ hosts.none = [lightgray]No local games found!
 host.invalid = [scarlet]Can't connect to host.
 
 servers.local = Local Servers
+servers.local.steam = Open Games & Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
 
@@ -208,13 +256,26 @@ servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
 
+viewplayer = Viewing Player: [accent]{0}
 trace = Trace Player
 trace.playername = Player name: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = Unique ID: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobile Client: [accent]{0}
 trace.modclient = Custom Client: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Invalid client ID! Submit a bug report.
+
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
+
 server.bans = Bans
 server.bans.none = No banned players found!
 server.admins = Admins
@@ -228,10 +289,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Are you sure you want to ban "{0}[white]"?
 confirmkick = Are you sure you want to kick "{0}[white]"?
-confirmvotekick = Are you sure you want to vote-kick "{0}[white]"?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make "{0}[white]" an admin?
 confirmunadmin = Are you sure you want to remove admin status from "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Join Game
 joingame.ip = Address:
 disconnect = Disconnected.
@@ -239,16 +301,18 @@ disconnect.error = Connection error.
 disconnect.closed = Connection closed.
 disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connecting...
 reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Loading world data...
 server.port = Port:
-server.addressinuse = Address already in use!
 server.invalidport = Invalid port number!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [scarlet]Error hosting server.
 save.new = New Save
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Overwrite
 save.none = No saves found!
 savefail = Failed to save game!
@@ -269,6 +333,7 @@ save.corrupted = Save file corrupted or invalid!
 empty = <empty>
 on = On
 off = Off
+save.search = Search saved games...
 save.autosave = Autosave: {0}
 save.map = Map: {0}
 save.wave = Wave {0}
@@ -284,9 +349,30 @@ ok = OK
 open = Open
 customize = Customize Rules
 cancel = Cancel
+command = Command
+command.queue = Queue
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Open Link
 copylink = Copy Link
 back = Back
+max = Max
+objective = Map Objective
 crash.export = Export Crash Logs
 crash.none = No crash logs found.
 crash.exported = Crash logs exported.
@@ -297,16 +383,18 @@ 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...
+downloading = [accent]Downloading...
 saving = [accent]Saving...
-respawn = [accent][[{0}][] to respawn in core
+respawn = [accent][[{0}][] to respawn
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
 resumebuilding = [scarlet][[{0}][] to resume building
+enablebuilding = [scarlet][[{0}][] to enable building
 showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Wave {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]Wave in {0}
@@ -326,9 +414,9 @@ custom = Custom
 builtin = Built-In
 map.delete.confirm = Are you sure you want to delete this map? This action cannot be undone!
 map.random = [accent]Random Map
-map.nospawn = This map does not have any cores for the player to spawn in! Add a[accent] orange[] core to this map in the editor.
+map.nospawn = This map does not have any cores for the player to spawn in! Add a {0} core to this map in the editor.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[scarlet] non-orange[] cores to this map in the editor.
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[scarlet] red[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add {0} cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
 workshop.update = Update Item
 workshop.error = Error fetching workshop details: {0}
@@ -336,6 +424,7 @@ map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]M
 workshop.menu = Select what you would like to do with this item.
 workshop.info = Item Info
 changelog = Changelog (optional):
+updatedesc = Overwrite Title & Description
 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...
@@ -343,6 +432,10 @@ publish.confirm = Are you sure you want to publish this?\n\n[lightgray]Make sure
 publish.error = Error publishing item: {0}
 steam.error = Failed to initialize Steam services.\nError: {0}
 
+editor.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -351,57 +444,100 @@ 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.waves = Waves
+editor.rules = Rules
+editor.generation = Generation
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Edit In-Game
+editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
-waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
+waves.health = health: {0}%
 waves.perspawn = per spawn
 waves.shields = shields/wave
 waves.to = to
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
+waves.random = Random
 waves.copy = Copy to Clipboard
 waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
 #these are intentionally in lower case
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
 
+all = All
 editor.default = [lightgray]<Default>
 details = Details...
-edit = Edit...
+edit = Edit
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
+
 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.errorimage = That's an image, not a map.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Apply
 editor.generate = Generate
+editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Saved!
 editor.save.noname = Your map does not have a name! Set one in the 'map info' menu.
 editor.save.overwrite = Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
@@ -440,10 +576,16 @@ toolmode.eraseores = Erase Ores
 toolmode.eraseores.description = Erase only ores.
 toolmode.fillteams = Fill Teams
 toolmode.fillteams.description = Fill teams instead of blocks.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.
+#unused
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
+
 filter.distort = Distort
 filter.noise = Noise
 filter.enemyspawn = Enemy Spawn Select
@@ -460,6 +602,8 @@ filter.clear = Clear
 filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
+filter.logic = Logic
+
 filter.option.scale = Scale
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -468,17 +612,40 @@ filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.angle = Angle
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Floor
 filter.option.flooronto = Target Floor
 filter.option.target = Target
+filter.option.replacement = Replacement
 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
+filter.option.code = Code
+filter.option.loop = Loop
+
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Width:
 height = Height:
@@ -489,6 +656,7 @@ load = Load
 save = Save
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Restart your game for the language settings to take effect.
@@ -507,21 +675,75 @@ requirement.core = Destroy Enemy Core in {0}
 requirement.research = Research {0}
 requirement.produce = Produce {0}
 requirement.capture = Capture {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
 map.multiplayer = Only the host can view sectors.
 uncover = Uncover
 configure = Configure Loadout
 
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+
+marker.background = Background
+marker.outline = Outline
+
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]\u26A0 Missile launch detected: [lightgray]{0}
+
+announce.nuclearstrike = [red]\u26A0 MISSILE STRIKE INBOUND \u26A0\n[lightgray]construct backup cores immediately
+
 loadout = Loadout
 resources = Resources
+resources.max = Max
 bannedblocks = Banned Blocks
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Amount must be a number between 0 and {0}.
 add = Add...
-boss.health = Guardian Health
+guardian = Guardian
 
 connectfail = [scarlet]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
@@ -533,17 +755,24 @@ 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThis will not be fixed. There is no known workaround for this issue.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
 
+campaign.playtime = \uF129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
 sectors.export = Export:
+sectors.import = Import:
 sectors.time = Time:
 sectors.threat = Threat:
 sectors.wave = Wave:
@@ -551,20 +780,29 @@ sectors.stored = Stored:
 sectors.resume = Resume
 sectors.launch = Launch
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
 sectors.enemybase = [scarlet]Enemy Base
 sectors.vulnerable = [scarlet]Vulnerable
 sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
 sectors.survives = [accent]Survives {0} waves
 sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
 sector.curcapture = Sector Captured
 sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-#note: the missing space in the line below is intentional
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white] Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
 
 threat.low = Low
 threat.medium = Medium
@@ -572,9 +810,16 @@ threat.high = High
 threat.extreme = Extreme
 threat.eradication = Eradication
 
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
 planets = Planets
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sun
 
 sector.impact0078.name = Impact 0078
@@ -592,7 +837,19 @@ sector.fungalPass.name = Fungal Pass
 sector.biomassFacility.name = Biomass Synthesis Facility
 sector.windsweptIslands.name = Windswept Islands
 sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -602,7 +859,7 @@ sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this
 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 Mace units. Destroy it.
 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.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Build air and ground defenses 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.
 sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
@@ -610,6 +867,74 @@ sector.windsweptIslands.description = Further past the shoreline is this remote
 sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
 sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
 sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+
+#do not translate
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past certain enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = An important transportation route for the enemy. No cores detected in the sector, but expect a variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
 
 settings.language = Language
 settings.data = Game Data
@@ -632,6 +957,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Yes
 no = No
 info.title = Info
@@ -639,14 +965,18 @@ error.title = [scarlet]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <load map to show>
 stat.description = Purpose
 stat.input = Input
 stat.output = Output
+stat.maxefficiency = Max Efficiency
 stat.booster = Booster
 stat.tiles = Required Tiles
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Power Capacity
 stat.powershot = Power/Shot
 stat.damage = Damage
@@ -669,8 +999,11 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Base Power Generation
 stat.productiontime = Production Time
 stat.repairtime = Block Full Repair Time
+stat.repairspeed = Repair Speed
 stat.weapons = Weapons
 stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Speed Increase
 stat.range = Range
 stat.drilltier = Drillables
@@ -678,12 +1011,13 @@ stat.drillspeed = Base Drill Speed
 stat.boosteffect = Boost Effect
 stat.maxunits = Max Active Units
 stat.health = Health
+stat.armor = Armor
 stat.buildtime = Build Time
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Build Cost
 stat.inaccuracy = Inaccuracy
 stat.shots = Shots
-stat.reload = Shots/Second
+stat.reload = Firing Rate
 stat.ammo = Ammo
 stat.shieldhealth = Shield Health
 stat.cooldowntime = Cooldown Time
@@ -693,6 +1027,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = Heat Capacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -701,25 +1036,77 @@ stat.buildspeed = Build Speed
 stat.minespeed = Mine Speed
 stat.minetier = Mine Tier
 stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
 stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Repair Suppression
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Self Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
 
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] max shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 bar.drilltierreq = Better Drill Required
+bar.nobatterypower = Insufficient Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Batteries: {0}/{1}
 bar.powerbalance = Power: {0}/s
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
@@ -730,49 +1117,66 @@ bar.capacity = Capacity: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = Liquid
 bar.heat = Heat
+bar.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
 bar.power = Power
 bar.progress = Build Progress
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
 bullet.damage = [stat]{0}[lightgray] damage
-bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
+bullet.splashdamage = [stat]{0}[lightgray] area dmg ~ [stat]{1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
-bullet.sapping = [stat]sapping
 bullet.homing = [stat]homing
-bullet.shock = [stat]shock
-bullet.frag = [stat]frag
+bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0}[lightgray] seconds of repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}x[lightgray] frag bullets:
+bullet.lightning = [stat]{0}x[lightgray] lightning ~ [stat]{1}[lightgray] damage
 bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] knockback
-bullet.pierce = [stat]{0}[lightgray]x pierce
+bullet.pierce = [stat]{0}x[lightgray] pierce
 bullet.infinitepierce = [stat]pierce
-bullet.healpercent = [stat]{0}[lightgray]% healing
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
-bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.healpercent = [stat]{0}%[lightgray] repair
+bullet.healamount = [stat]{0}[lightgray] direct repair
+bullet.multiplier = [stat]{0}[lightgray] ammo/item
+bullet.reload = [stat]{0}%[lightgray] fire rate
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores missiles
+bullet.notargetsbuildings = [stat] ignores buildings
 
 unit.blocks = blocks
-unit.blockssquared = blocks²
+unit.blockssquared = blocks\u00B2
 unit.powersecond = power units/second
+unit.tilessecond = tiles/second
 unit.liquidsecond = liquid units/second
 unit.itemssecond = items/second
 unit.liquidunits = liquid units
 unit.powerunits = power units
+unit.heatunits = heat units
 unit.degrees = degrees
 unit.seconds = seconds
 unit.minutes = mins
 unit.persecond = /sec
 unit.perminute = /min
 unit.timesspeed = x speed
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = General
@@ -782,17 +1186,23 @@ category.items = Items
 category.crafting = Input/Output
 category.function = Function
 category.optional = Optional Enhancements
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 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.logichints.name = Logic Hints
 setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animated Surfaces
 setting.animatedshields.name = Animated Shields
-setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.playerindicators.name = Player Indicators
 setting.indicators.name = Enemy Indicators
 setting.autotarget.name = Auto-Target
@@ -801,15 +1211,12 @@ 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.uiscale.name = UI Scaling
+setting.uiscale.description = Restart required to apply changes.
 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.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Display Effects
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
@@ -819,31 +1226,41 @@ setting.saveinterval.name = Save Interval
 setting.seconds = {0} seconds
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullscreen
-setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required)
+setting.borderlesswindow.name = Borderless Window
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Show FPS & Ping
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate
 setting.minimap.name = Show Minimap
 setting.coreitems.name = Display Core Items
 setting.position.name = Show Player Position
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Music Volume
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display Player Bubble Chat
 setting.showweather.name = Show Weather Graphics
-public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
-public.confirm.really = If you want to play with friends, use [green]Invite Friend[] instead of a [scarlet]Public server[]!\nAre you sure you want to make your game [scarlet]public[]?
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Adapt interface to display notch
+setting.macnotch.description = Restart required to apply changes
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
 uiscale.cancel = Cancel & Exit
@@ -852,12 +1269,9 @@ keybind.title = Rebind Keys
 keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
 category.general.name = General
 category.view.name = View
+category.command.name = Unit Command
 category.multiplayer.name = Multiplayer
 category.blocks.name = Block Select
-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
@@ -872,6 +1286,30 @@ keybind.move_y.name = Move Y
 keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Queue Unit Command
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -897,10 +1335,11 @@ keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo
-keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -909,6 +1348,7 @@ keybind.pause_building.name = Pause/Resume Building
 keybind.minimap.name = Minimap
 keybind.planet_map.name = Planet Map
 keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Chat
 keybind.player_list.name = Player List
 keybind.console.name = Console
@@ -933,36 +1373,81 @@ mode.attack.name = Attack
 mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
 mode.custom = Custom Rules
 
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 rules.infiniteresources = Infinite Resources
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Waves
+rules.airUseSpawns = Air Units Use Spawn Points
 rules.attack = Attack Mode
-rules.buildai = AI Building
-rules.enemyCheat = Infinite AI (Red Team) Resources
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI [red](WIP)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
+rules.enemyCheat = Infinite Enemy Team Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
+rules.initialwavespacing = Initial 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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.unitammo = Units Require Ammo
+rules.unitammo = Units Require Ammo [red](may be removed)
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
 rules.title.waves = Waves
 rules.title.resourcesbuilding = Resources & Building
 rules.title.enemy = Enemies
 rules.title.unit = Units
 rules.title.experimental = Experimental
 rules.title.environment = Environment
+rules.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Lighting
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
@@ -970,11 +1455,19 @@ rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
 
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
+
 content.item.name = Items
-content.liquid.name = Liquids
+content.liquid.name = Fluids
 content.unit.name = Units
 content.block.name = Blocks
+content.status.name = Status Effects
 content.sector.name = Sectors
+content.team.name = Factions
+
+wallore = (Wall)
 
 item.copper.name = Copper
 item.lead.name = Lead
@@ -992,10 +1485,24 @@ item.blast-compound.name = Blast Compound
 item.pyratite.name = Pyratite
 item.metaglass.name = Metaglass
 item.scrap.name = Scrap
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
+
 liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -1023,6 +1530,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1031,13 +1543,36 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
+
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Grass
-block.slag.name = Slag
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Space
 block.salt.name = Salt
 block.salt-wall.name = Salt Wall
@@ -1065,24 +1600,28 @@ block.graphite-press.name = Graphite Press
 block.multi-press.name = Multi-Press
 block.constructing = {0} [lightgray](Constructing)
 block.spawn.name = Enemy Spawn
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 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.deep-water.name = Deep Water
+block.shallow-water.name = Water
 block.tainted-water.name = Tainted Water
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Dark Sand Tainted Water
 block.tar.name = Tar
 block.stone.name = Stone
-block.sand.name = Sand
+block.sand-floor.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.crater-stone.name = Craters
+block.sand-water.name = Sand Water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Ice Snow
@@ -1100,8 +1639,9 @@ 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.metal-floor-4.name = Metal Floor 4
+block.metal-floor-5.name = Metal Floor 5
+block.metal-floor-damaged.name = Damaged Metal Floor
 block.dark-panel-1.name = Dark Panel 1
 block.dark-panel-2.name = Dark Panel 2
 block.dark-panel-3.name = Dark Panel 3
@@ -1139,6 +1679,9 @@ block.distributor.name = Distributor
 block.sorter.name = Sorter
 block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
@@ -1190,20 +1733,22 @@ 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.repair-turret.name = Repair Turret
 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-container.name = Liquid Container
 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.impulse-pump.name = Impulse Pump
 block.thermal-generator.name = Thermal Generator
-block.alloy-smelter.name = Alloy Smelter
+block.surge-smelter.name = Surge Smelter
 block.mender.name = Mender
 block.mend-projector.name = Mend Projector
 block.surge-wall.name = Surge Wall
@@ -1219,10 +1764,11 @@ 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.launch-pad.name = Launch Pad [lightgray](Legacy)
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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
@@ -1232,14 +1778,181 @@ block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
 block.payload-conveyor.name = Payload Conveyor
 block.payload-router.name = Payload Router
+block.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
-#experimental, may be removed
-block.block-forge.name = Block Forge
-block.block-loader.name = Block Loader
-block.block-unloader.name = Block Unloader
 block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Large Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = Outputs large amounts of heat. Sandbox only.
+
+#Erekir
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Advanced Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core: Bastion
+block.core-citadel.name = Core: Citadel
+block.core-acropolis.name = Core: Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1250,64 +1963,116 @@ 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
-team.orange.name = orange
-team.derelict.name = derelict
-team.green.name = green
-team.purple.name = purple
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Sharded
+team.derelict.name = Derelict
+team.green.name = Green
+team.blue.name = Blue
 
 hint.skip = Skip
 hint.desktopMove = Use [accent][[WASD][] to move.
 hint.zoom = [accent]Scroll[] to zoom in or out.
-hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually.
 hint.desktopShoot = [accent][[Left-click][] to shoot.
 hint.depositItems = To transfer items, drag from your ship to the core.
 hint.respawn = To respawn as a ship, press [accent][[V][].
 hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
 hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
-hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it.
-hint.placeDrill.mobile = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
-hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
-hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors.
-hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them.
 hint.breaking = [accent]Right-click[] and drag to break blocks.
-hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
-hint.research = Use the \ue875 [accent]Research[] button to research new technology.
-hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
-hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
-hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
-hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
-hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.breaking.mobile = Activate the \uE817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources, or repaired.
+hint.research = Use the \uE875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \uE875 [accent]Research[] button in the \uE88C [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to manually control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to manually control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] to the next sector by opening the \uE827 [accent]Map[] in the bottom right, and panning over to the new location.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \uE827 [accent]Map[] in the \uE88C [accent]Menu[].
 hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \uE874 copy button, then tap the \uE80F rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
-hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \uE844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
 hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
-hint.command = Press [accent][[G][] to command nearby units of [accent]similar type[] into formation.\n\nTo command ground units, you must first control another ground unit.
-hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation.
 hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
 hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
 hint.payloadDrop = Press [accent]][] to drop a payload.
 hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
 hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
-hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
-hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
-hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.generator = \uF879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uF87F [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uF835 [accent]Graphite[] \uF861Duo/\uF859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uF868 [accent]Foundation[] core over the \uF869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
 hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
 hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
-hint.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+
+gz.mine = Move near the \uF8C4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uF8C4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the \ue85e menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the \ue85e menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uF837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \uE804 Move up for further objectives.
+gz.turrets = Research and place 2 \uF861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uF838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uF8AE [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uF860 [accent]Scatter[] turrets provide excellent anti-air, but require \uF837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with \uF837 [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+
+onset.mine = Click to mine \uF748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uF748 [accent]beryllium[] from walls.
+onset.research = Open the \uE875 tech tree.\nResearch, then place a \uF73E [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uF741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uF73D [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uF799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uF799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uF835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uF74D [accent]cliff crusher[] and \uF779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uF834 [accent]sand[] and \uF835 [accent]graphite[] to create \uF82F [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uF74D [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uF6A2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uF6EB [accent]Breach[] turret.\nTurrets require \uF748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium[] as ammo, using ducts.
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uF6EE [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uF725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [[ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Used in all types of construction and ammunition.
 item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Used in liquid transportation and electrical structures.
-item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms; not that there are many left here.
 item.metaglass.description = Used in liquid distribution/storage structures.
 item.graphite.description = Used in electrical components and turret ammunition.
 item.sand.description = Used for production of other refined materials.
 item.coal.description = Used for fuel and refined material production.
 item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
-item.titanium.description = Used in liquid transportation structures, drills and aircraft.
+item.titanium.description = Used in liquid transportation structures, drills and factories.
 item.thorium.description = Used in durable structures and as nuclear fuel.
 item.scrap.description = Used in Melters and Pulverizers for refining into other materials.
 item.scrap.details = Leftover remnants of old structures and units.
@@ -1320,22 +2085,39 @@ item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic
 item.blast-compound.description = Used in bombs and explosive ammunition.
 item.pyratite.description = Used in incendiary weapons and combustion-fueled generators.
 
+#Erekir
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
+
 liquid.water.description = Used for cooling machines and waste processing.
-liquid.slag.description = Refined in separators into constituent metals, or sprayed at enemies as a weapon.
+liquid.slag.description = Refined in separators into constituent metals. Consumed in liquid turrets as ammunition.
 liquid.oil.description = Used in advanced material production and as incendiary ammunition.
 liquid.cryofluid.description = Used as coolant in reactors, turrets and factories.
 
-block.resupply-point.description = Resupplies nearby units with copper ammunition. Not compatible with units that require battery power.
-block.armored-conveyor.description = Moves items forward. Does not accept inputs from the sides.
+#Erekir
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as fuel and an oxidizing agent in material production. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+
+block.derelict = \uF77E [lightgray]Derelict
+block.armored-conveyor.description = Moves items forward. Does not accept non-conveyor inputs from the sides.
 block.illuminator.description = Emits light.
 block.message.description = Stores a message for communication between allies.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Compresses coal into graphite.
 block.multi-press.description = Compresses coal into graphite. Requires water as coolant.
 block.silicon-smelter.description = Refines silicon from sand and coal.
 block.kiln.description = Smelts sand and lead into metaglass.
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Synthesizes phase fabric from thorium and sand.
-block.alloy-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy.
+block.surge-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy.
 block.cryofluid-mixer.description = Mixes water and fine titanium powder to produce cryofluid.
 block.blast-mixer.description = Produces blast compound from pyratite and spore pods.
 block.pyratite-mixer.description = Mixes coal, lead and sand into pyratite.
@@ -1348,9 +2130,11 @@ block.incinerator.description = Vaporizes any item or liquid it receives.
 block.power-void.description = Voids all power inputted. 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.item-void.description = Destroys inputted items. Sandbox only.
 block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
-block.liquid-void.description = Removes any liquids. Sandbox only.
+block.liquid-void.description = Destroys inputted liquids. Sandbox only.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
 block.copper-wall.description = Protects structures from enemy projectiles.
 block.copper-wall-large.description = Protects structures from enemy projectiles.
 block.titanium-wall.description = Protects structures from enemy projectiles.
@@ -1363,16 +2147,20 @@ block.phase-wall.description = Protects structures from enemy projectiles, refle
 block.phase-wall-large.description = Protects structures from enemy projectiles, reflecting most bullets upon impact.
 block.surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
 block.surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = A wall that can be opened and closed.
 block.door-large.description = A wall that can be opened and closed.
 block.mender.description = Periodically repairs blocks in its vicinity.\nOptionally uses silicon to boost range and efficiency.
 block.mend-projector.description = 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.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency. Does not stack.
 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 increases shield size.
 block.shock-mine.description = Releases electric arcs upon enemy unit contact.
 block.conveyor.description = Transports items forward.
 block.titanium-conveyor.description = Transports items forward. Faster than a standard conveyor.
-block.plastanium-conveyor.description =  Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput.
+block.plastanium-conveyor.description = Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput.
 block.junction.description = Acts as a bridge for two crossing conveyor belts.
 block.bridge-conveyor.description = Transports items over terrain or buildings.
 block.phase-conveyor.description = Instantly transports items over terrain or buildings. Longer range than the item bridge, but requires power.
@@ -1381,18 +2169,19 @@ block.inverted-sorter.description = Similar to a standard sorter, but outputs se
 block.router.description = Distributes input items to 3 output directions equally.
 block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = Distributes input items to 7 output directions equally.
-block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates.
-block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates.
+block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked.
+block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
 block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers.
 block.mechanical-pump.description = Pumps and outputs liquids. Does not require power.
 block.rotary-pump.description = Pumps and outputs liquids. Requires power.
-block.thermal-pump.description = Pumps and outputs liquids.
+block.impulse-pump.description = Pumps and outputs liquids.
 block.conduit.description = Moves liquids forward. Used in conjunction with pumps and other conduits.
 block.pulse-conduit.description = Moves liquids forward. Transports faster and stores more than standard conduits.
 block.plated-conduit.description = Moves liquids forward. Does not accept input from the sides. Does not leak.
 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.
+block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Stores a large amount of liquid. Outputs to all sides, similarly to a liquid router.
-block.liquid-junction.description = Acts as a bridge for two crossing conduits.
+block.liquid-junction.description = Acts as a bridge between two crossing conduits.
 block.bridge-conduit.description = Transports liquids over terrain or buildings.
 block.phase-conduit.description = Transports liquids over terrain or buildings. Longer range than the bridge conduit, but requires power.
 block.power-node.description = Transmits power to connected nodes. The node will receive power from or supply power to any adjacent blocks.
@@ -1400,7 +2189,7 @@ block.power-node-large.description = An advanced power node with greater range.
 block.surge-tower.description = A long-range power node with fewer available connections.
 block.diode.description = Moves battery power in one direction, but only if the other side has less power stored.
 block.battery.description = Stores power in times of surplus energy. Outputs power in times of deficit.
-block.battery-large.description =  Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a regular battery.
+block.battery-large.description = Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity 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 = Generates power by burning flammable materials and converting water to steam.
@@ -1424,10 +2213,13 @@ block.core-foundation.description = Core of the base. Well armored. Stores more
 block.core-foundation.details = The second iteration.
 block.core-nucleus.description = Core of the base. Extremely well armored. Stores massive amounts of resources.
 block.core-nucleus.details = The third and final iteration.
-block.vault.description = Stores a large amount of items of each type. Contents can be retrieved with an unloader.
-block.container.description = Stores a small amount of items of each type. Contents can be retrieved with an unloader.
+block.vault.description = Stores a large amount of items of each type. Expands storage when placed next to a core. Contents can be retrieved with an unloader.
+block.container.description = Stores a small amount of items of each type. Expands storage when placed next to a core. Contents can be retrieved with an unloader.
 block.unloader.description = Unloads the selected item from nearby blocks.
 block.launch-pad.description = Launches batches of items to selected sectors.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Fires alternating bullets at enemies.
 block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
@@ -1440,19 +2232,18 @@ block.salvo.description = Fires quick salvos of bullets at enemies.
 block.fuse.description = Fires three close-range piercing blasts at nearby enemies.
 block.ripple.description = Shoots clusters of shells at ground enemies over long distances.
 block.cyclone.description = Fires explosive clumps of flak at nearby enemies.
-block.spectre.description = Fires large armor-piercing bullets at air and ground targets.
+block.spectre.description = Fires large bullets at air and ground targets.
 block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.foreshadow.description = Fires a large single-target bolt over long distances.
+block.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity.
 block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
 block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
 block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
 block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
 block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
-block.overdrive-dome.description =  Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
-block.payload-conveyor.description = Moves large payloads, such as units from factories.
-block.payload-router.description = Splits input payloads into 3 output directions.
-block.command-center.description = Controls unit behavior with several different commands.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate. Does not stack.
+block.payload-conveyor.description = Moves large payloads, such as units from factories. Magnetic. Usable in zero-G environments.
+block.payload-router.description = Splits input payloads into 3 output directions. Functions as a sorter when a filter is set. Magnetic. Usable in zero-G environments.
 block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
 block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
 block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
@@ -1469,37 +2260,439 @@ block.memory-bank.description = Stores information for a logic processor. High c
 block.logic-display.description = Displays arbitrary graphics from a logic processor.
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
 
-unit.dagger.description = Fires standard bullets at all nearby enemies.
-unit.mace.description = Fires streams of flame at all nearby enemies.
-unit.fortress.description = Fires long-range artillery at ground targets.
-unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
-unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
-unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
-unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
-unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
-unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
-unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
-unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+#Erekir
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing bullets at enemy targets.
+block.diffuse.description = Fires bursts of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires massive explosive artillery shells at ground targets. Requires hydrogen.
+block.afflict.description = Fires massive charged orbs of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a continuous slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches powerful missiles at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Applies heat to structures. Requires large amounts of power.
+block.slag-heater.description = Applies heat to structures. Requires slag.
+block.phase-heater.description = Applies heat to structures. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Splits water into hydrogen and ozone gas. Outputs resulting gases in two opposite directions, marked by corresponding colors.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Creates surge alloy from silicon and metals constituent in slag. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.\nOptionally uses hydrogen to boost efficiency.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.\nOptionally uses nitrogen to boost efficiency.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
+block.shielded-wall.description = Protects structures from enemy projectiles, reflecting most bullets upon impact. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.\nOptionally uses phase fabric to boost efficiency.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+
+unit.dagger.description = Fires standard bullets at enemy targets.
+unit.mace.description = Fires streams of flame at enemy targets.
+unit.fortress.description = Fires long-range artillery at enemy ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at enemy targets.
+unit.reign.description = Fires a barrage of massive piercing bullets at enemy targets.
+unit.nova.description = Fires laser bolts that damage enemy targets and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemy targets and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemy targets and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemy targets, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemy targets and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Moves toward enemy targets and self-destructs, causing a large explosion.
 unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
-unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
-unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
-unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
-unit.flare.description = Fires standard bullets at nearby ground targets.
-unit.horizon.description = Drops clusters of bombs on ground targets.
-unit.zenith.description = Fires salvos of missiles at all nearby enemies.
-unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
-unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.spiroct.description = Fires sapping laser beams at enemy targets, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemy targets, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemy targets. Can step over most terrain.
+unit.flare.description = Fires standard bullets at enemy ground targets.
+unit.horizon.description = Drops clusters of bombs on enemy ground targets.
+unit.zenith.description = Fires salvos of missiles at enemy targets.
+unit.antumbra.description = Fires a barrage of bullets at enemy targets.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at enemy targets.
 unit.mono.description = Automatically mines copper and lead, depositing it into the core.
 unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
 unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
-unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
-unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
-unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
-unit.minke.description = Fires shells and standard bullets at nearby ground targets.
-unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
-unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
-unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.quad.description = Drops plasma bombs on ground targets, repairing allied structures and damaging enemy ground targets. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with a regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at enemy targets.
+unit.minke.description = Fires shells and standard bullets at enemy ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemy targets.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemy targets.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemy targets. Constructs flare units.
 unit.alpha.description = Defends the Shard core from enemies. Builds structures.
 unit.beta.description = Defends the Foundation core from enemies. Builds structures.
 unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at enemy targets. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at enemy targets. Targets enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemy targets. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts enemy targets with 4 autonomous laser turrets.
+
+#Erekir
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks. Only attacks ground targets.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks. Only attacks ground targets.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam. Capable of carrying 2x2 structures.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam. Capable of carrying 2x2 structures.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams. Capable of carrying 2x2 structures.
+
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nFor the inverse operation, sense [accent]@id[] of the object.
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a unit.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Spawn a wave.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nIf the success result variable is [accent]@wait[],\nwill wait until the previous message finishes.\nOtherwise, outputs whether displaying the message succeeded.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nLimited to 20 times a second per variable.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are ignored.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True if the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlCommand[] if unit controller is a player command\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nOnly ASCII characters are allowed.\nClears the print buffer.
+
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+
+#not a typo, look up 'range notation'
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+
+sensor.in = The building/unit to sense.
+
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the specified position.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed color, used for line and quad markers with index zero being the first color.
+
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
\ No newline at end of file
diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 59d125147c..19589067a6 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1,4 +1,4 @@
-credits.text = Стваральнiк [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\n��ць недапрацоўкі ў перакладзе або хочаце знай�ці �аюзнікаў дл� �уме�най гульні?\nПішыце ў аф. [accent]discord-�ервер Mindustry[] у канал [accent]#translations[].\n\nР�дактар і перакладчык на белару�кую мову:\n[cyan]K[gray]evi[cyan]TV[gray]#9923\nVit_log выправіў памылкі і дапоўніў пераклад.
+credits.text = Стваральнiк [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\n��ць недапрацоўкі ў перакладзе або хочаце знай�ці �аюзнікаў дл� �уме�най гульні?\nПішыце ў аф. [accent]discord-�ервер Mindustry[] у канал [accent]#translations[].\n\nР�дактар і перакладчык на белару�кую мову:\n[cyan]K[gray]evi[cyan]TV[gray]#9923\nVit_log выправіў памылкі і дапоўніў пераклад. \n[orange]monodx [gray]і Dima Pozniac дапрацавалі і паправілі памылкі ў перакладзе.
 credits = �ўтары
 contributors = Перакладчык
 discord = Далучайце�� да нашага Discord!
@@ -6,21 +6,24 @@ link.discord.description = �фіцыйны Discord-�ервер Mindustry
 link.reddit.description = Сабреддзіт Mindustry
 link.github.description = Зыходны код гульні
 link.changelog.description = Лі�т змен
-link.dev-builds.description = �е�табільны� разпрацоўваемые вер�іі
+link.dev-builds.description = �е�табільны� вер�іі ў ра�працоўцы
 link.trello.description = �фіцыйна� дошка Trello дл� запланаваных функцый
 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.suggestions.description = Прапанаваць новы� функцыі
+link.bug.description = Знайшлі памылку? Паведаміць пра �е тут
+linkopen = Г�ты �ервер адправіў вам �па�ылку. Ці жадаеце адкрыць �?\n\n[sky]{0}
 linkfail = �е атрымала�� адкрыць �па�ылку!\nURL-адр�� быў �капі�ваны ў буфер абмена.
 screenshot = Cкрыншот захаваны ў {0}
 screenshot.invalid = Карта занадта в�ліка�, магчыма, не хапае пам�ці дл� �крыншота.
 gameover = Гульн� �кончана
+gameover.disconnect = �дключаны
 gameover.pvp = [accent]{0}[] каманда перамагла!
+gameover.waiting = [accent]Чаканне на�тупнай карты...
 highscore = [accent]�овы р�корд!
 copied = Скапі�вана.
-indev.popup = [accent]в6[] �шч� в [accent]альфе[].\n[lightgray]Г�та значыць:[]\n[scarlet]- Кампані� не завершана[]\n- Ча�ткі гульні ад�утнічаюць\n - Больша� ча�тка [scarlet]ШІ юнітав[] можа працаваць не правільна\n- Мно�тва юнітав не дароблена\n- Ў�ё што тут ё�ць можа быць ізменена.\n\n�б багах і крашах пі�аць на [accent]Github[].
 indev.notready = Г�та ча�тка гульні �шч� не зроблена.
 
 load.sound = Звукі
@@ -37,12 +40,25 @@ be.updating = �бнаул�ецца...
 be.ignore = Ігнараваць
 be.noupdates = �бнаўленні не знойдзены.
 be.check = Праверыць абнаўленні
+mods.browser = Браўзер Мадыфікацый
+mods.browser.selected = Выбрана� Мадыфікацы
+mods.browser.add = У�тал�ваць
+mods.browser.reinstall = Перау�тал�ваць
+mods.browser.view-releases = Прагл�дзець Р�лізы
+mods.browser.noreleases = [scarlet]Р�лізы �е Знойдзены�\n[accent]�е магчыма знай�ці р�лізы дл� г�тай мадыфікацыі. Праверце ці г�та� мадыфікацы� утрымлівае апублікаваны� р�лізы.
+mods.browser.latest = <�пошні�>
+mods.browser.releases = Р�лізы
+mods.github.open = Р�пазіторый
+mods.github.open-release = Стпронка Р�лізаў
+mods.browser.sortdate = Сартаваць па н�даўн�му
+mods.browser.sortstars = Сартаваць па зоркам
 
 schematic = Схема
 schematic.add = Захаваць �хему...
 schematics = Схемы
-schematic.replace = Схема � данным імем ўжо і�нуе. Зам�ніць �е?
-schematic.exists = Схема � данным імем ўжо і�нуе.
+schematic.search = Пошук �хемы...
+schematic.replace = Схема � дадзенай назвай ужо і�нуе. Зам�ніць �е?
+schematic.exists = Схема � дадзенай назвай ужо і�нуе.
 schematic.import = Імпартаваць �хему...
 schematic.exportfile = Эк�партаваць файл
 schematic.importfile = Імпартаваць файл
@@ -53,20 +69,28 @@ schematic.shareworkshop = Падз�ліцца ў Май�т�рні
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: �длю�траваць �хему
 schematic.saved = Схема захавана.
 schematic.delete.confirm = Г�та� �хема будзе выдалена.
-schematic.rename = Перайменаваць �хему
+schematic.edit = Р�дагаваць �хему
 schematic.info = {0}x{1}, {2} блокаў
 schematic.disabled = [scarlet]Схемы забаронены[]\nВам нельга выкары�тоўваць �хемы на г�тай [accent]карце[] альбо [accent]�ерверы.
+schematic.tags = Т�гі:
+schematic.edittags = Правіць Т�г
+schematic.addtag = Дадаць Т�г
+schematic.texttag = Т�к�тавы Т�гу
+schematic.icontag = Іконкавы Т�гу
+schematic.renametag = Пераназваць Т�г
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Выдаліць г�ты т�г цалкам?
+schematic.tagexists = Такі т�г ужо ё�ць.
+stats = Вынікі
+stats.wave = Хвал�ў Пераможана
+stats.unitsCreated = �дзінкаў Створана
+stats.enemiesDestroyed = Ворагаў Знішчана
+stats.built = Пабудавана Будынкаў
+stats.destroyed = Знішчана Будынкаў
+stats.deconstructed = Д�кн�тру�вана Будынкаў
+stats.playtime = Ча� Гульні
 
-stat.wave = Хвал�ў адлю�травана:[accent] {0}
-stat.enemiesDestroyed = Ворагаў знішчана:[accent] {0}
-stat.built = Будынкаў пабудавана:[accent] {0}
-stat.destroyed = Будынкаў знішчана:[accent] {0}
-stat.deconstructed = Будынкаў д�кан�тру�вана:[accent] {0}
-stat.delivered = Р��ур�аў запушчана:
-stat.playtime = Ча� гульні:[accent] {0}
-stat.rank = Фінальны ранг: [accent]{0}
-
-globalitems = [accent]Global Items
+globalitems = [accent]У�е Прадметы
 map.delete = Вы �апраўды хочаце выдаліць карту «[accent]{0}[]»?
 level.highscore = Р�корд: [accent]{0}
 level.select = Выбар карты
@@ -74,12 +98,15 @@ level.mode = Р�жым гульні:
 coreattack = < Ядро знаходзіцца пад атакай! >
 nearpoint = [[ [scarlet]П�КІ�ЬЦЕ КРОПКУ ВЫС�ДКІ �Е�ДКЛ�Д��[] ]\nанігіл�цы� непазбежна
 database = База дадзеных �дра
-savegame = Захаваць гульню
-loadgame = Спампаваць гульню
-joingame = Сеткава� гульн�
-customgame = Кары�тацка� гульн�
-newgame = �ова� гульн�
-none = <ничога>
+database.button = База Дадзеных
+savegame = Захаваць Гульню
+loadgame = Спампаваць Гульню
+joingame = Сеткава� Гульн�
+customgame = Кары�тальніцка� Гульн�
+newgame = �ова� Гульн�
+none = <нічога>
+none.found = [lightgray]<нічога не знойдзена>
+none.inmap = [lightgray]<нічога не знойдзена на карце>
 minimap = Міні-карта
 position = Каардынаты
 close = Зачыніць
@@ -99,33 +126,47 @@ uploadingpreviewfile = Выгрузка файла прадпрагл�ду
 committingchanges = Ун��енне зм�ненн�ў
 done = Гатова
 feature.unsupported = Ваша прылада не падтрымлівае г�тую магчыма�ць.
-
-mods.alphainfo = Майце на ўвазе, што мадыфікацыі знаходз�цца ў альфа-вер�іі і [scarlet]могуць утрымліваць шмат памылак[]. Дакладвайце аб любых праблемах, �кі� Вы знойдзеце ў Mindustry Github або Discord.
+mods.initfailed = [red]⚠[] Пап�р�дні а�обнік Mindustry не атрымала�� ініцы�лізаваць. Г�та нап�ўна выклікана тым, што моды не працуюць належным чынам.\n\nКаб прадухіліць цыкл збо�ў, [red]у�е моды былі адключаны�.[]
 mods = Мадыфікацыі
 mods.none = [lightgray]Мадыфікацыі не знойдзены!
 mods.guide = Кіраўніцтва па мадам
 mods.report = Паведаміць пра памылку
 mods.openfolder = �дкрыць т�чку з мадыфікацы�мі
-mods.reload = Reload
+mods.viewcontent = Прашл�дзець Кант�нт
+mods.reload = Перазапу�к
 mods.reloadexit = Гульн� зараз закроецца, каб ў�тал�ваць мады.
+mod.installed = [[У�тал�вана]
 mod.display = [gray]Мадыфікацы�:[orange] {0}
 mod.enabled = [lightgray]Уключана
 mod.disabled = [scarlet]Выключана
+mod.multiplayer.compatible = [gray]Многакары�тальніцка-Сум�шчальна
 mod.disable = Выкл.
+mod.version = Version:
 mod.content = Зме�т:
 mod.delete.error = �емагчыма выдаліць мадыфікацыю. Магчыма, файл выкары�тоўваецца.
-mod.requiresversion = [scarlet]Мінімальна� патрабавана� вер�і� гульні: [accent]{0}
-mod.outdated = [scarlet]�е �ум�шчальна з в6 (н�ма minGameVersion: 105)
-mod.missingdependencies = [scarlet]�е знойдзены бацькоў�кі� мадыфікацыі: {0}
-mod.erroredcontent = [scarlet]Памылкі зме�ціва
+mod.incompatiblegame = [red]За�тар�ла� Вер�і� Гульні
+mod.incompatiblemod = [red]�е�ум�шчальна
+mod.blacklisted = [red]�е Падтрымліваецца
+mod.unmetdependencies = [red]Залежна�ці �е Вырашаны
+mod.erroredcontent = [scarlet]Памылкі Зме�ціва
+mod.circulardependencies = [red]Кругавы� Залежна�ці
+mod.incompletedependencies = [red]��поўны� Залежна�ці
+mod.requiresversion.details = Патрабуецца вер�і� гульні: [accent]{0}[]\nВаша гульн� за�тар�ла�. Г�ьа� мадыфікацы� патрабуе навейшую вер�ію гульні (магчыма beta/alpha р�лізы) как функцы�наваць.
+mod.outdatedv7.details = Г�та мадыфікацы� не�ум�шчальна� з г�тай вер�і�й гульні. �ўтар павінен абнавіць г�тую мадыфікацыю, і дабаўце [accent]minGameVersion: 136[] да г�іага [accent]mod.json[] файлу.
+mod.blacklisted.details = Г�та мадыфікацы� была ўручную дададзена ў чорны �пі� дл� выклікаючых другі� памылкі з г�тай вер�і�й гульні. �е выкары�тоўвайце г�та.
+mod.missingdependencies.details = Г�та мадыфікацы� мае прапушчаны� залежна�ці: {0}
+mod.erroredcontent.details = Г�та гульн� выклікала памылкі калі запу�кала��. Спытайце аўтара мадыфікацыі �к г�та папрвіць.
+mod.circulardependencies.details = Г�та� мадыфікацы� мае залежна�ці �кі� залежаць ад другіх.
+mod.incompletedependencies.details = Г�та� мадыфікацы� не можа быць загружана� з-за не�апраўдных або прапушчаных залежна�цей: {0}.
+mod.requiresversion = Патрабуецца вер�і� гульні: [red]{0}
 mod.errors = Памылкі былі выкліканы� загружаным зме�цівам.
 mod.noerrorplay = [scarlet]У Ва� ё�ць мадыфікацыі з памылкамі.[] Выключыце праблемны� мадыфікацыі або выпраўце памылкі перад гульнёй.
 mod.nowdisabled = [scarlet]Мадыфікацыі '{0}' патрабуюцца бацькоў�кі� мадыфікацыі:[accent] {1}\n[lightgray]Спачатку тр�ба загрузіць іх.\nГ�та� мадыфікацы� будзе аўтаматычна адключана�.
 mod.enable = Укл.
 mod.requiresrestart = Ц�пер гульн� зачыніцца, каб прым�ніць змены ў мадыфікацы�х.
 mod.reloadrequired = [scarlet]�еабходны перазапу�к
-mod.import = Імпартаваць мадыфікацыю
-mod.import.file = Import File
+mod.import = Імпартаваць Мадыфікацыю
+mod.import.file = Імпартаваць Файл
 mod.import.github = Імпартаваць мод з GitHub
 mod.jarwarn = [scarlet]JAR-мады не б��печны па прынцыпу.[]\nПраверце, што імпартуеце г�ты мод � надзейнай крыніцы!
 mod.item.remove = Г�ты прадмет з’�ўл�ецца ча�ткай мадыфікацыі [accent]«{0}»[]. Каб выдаліць �го, выдаліце �аму мадыфікацыю.
@@ -135,23 +176,35 @@ mod.missing = Г�та захаванне ўтрымлівае мадыфіка
 mod.preview.missing = Перад публікацы�й г�тай мадыфікацыі ў май�т�рні, вы павінны дадаць малюнак прадпрагл�ду.\nРазме�ціце малюнак з імем[accent] preview.png[] у т�чцы мадыфікацыі і па�прабуйце зноў.
 mod.folder.missing = Мадыфікацыі могуць быць апублікаваны� ў май�т�рні толькі ў выгл�дзе т�чкі.\nКаб канвертаваць любы мод у т�чку, про�та выміце �го з архіва і выдаліце �тары архіў .zip, затым перазапу�ціце гульню ці перазагрузіце мадыфікацыі.
 mod.scripts.disable = Ваша прылада не падтрымлівае мадыфікацыі з �кріптамі. Выключайце такіе мады, как гул�ць.
-
 about.button = �б гульні
 name = Ім�:
 noname = Дл� пачатку, прыдумайце[accent] �абе iм�[].
+search = Пошук:
 planetmap = Карта планеты
 launchcore = Запу�ціць �дро
 filename = Iм� файла:
 unlocked = �овы кант�нт адмыкнуты!
+available = �овае да�ледаванне адымкнута!
+unlock.incampaign = < �дымкніце ў кампаніі каб атрымаць д�талі >
+campaign.select = Выбраць Пачатковую Кампанію
+campaign.none = [lightgray]Выберыце з �кой планеты пачаць.\nГ�та можна зм�ніць ў любы ча�.
+campaign.erekir = �авей, больш уда�каналенага кант�нту. Больш лінейнае праходжанне кампаніі.\n\nБольш �ка�ны� карты і агульны вопыт.
+campaign.serpulo = Стар�йшы кант�нт; кла�ічны вопыт. Больш адкрыта�.\n\nЗу�ім не збалан�аваны� карты і механікі кампаніі. Менш уда�каналенага.
+campaign.difficulty = Difficulty
 completed = [accent]Завершаны
-techtree = Др�ва\n т�хналогій
+techtree = Др�ва\n Т�хналогій
+techtree.select = Выбар Др�ва Т�хналогій
+techtree.serpulo = Серпуло
+techtree.erekir = Эр�кір
+research.load = Загрузіць
+research.discard = �дм�ніць
 research.list = [lightgray]Да�ьледуйце:
 research = Да�ледаваць
 researched = [lightgray] {0} да�ледавана.
 research.progress = {0}% завершана
 players = Гульцоў: {0}
 players.single = {0} гулец
-players.search = search
+players.search = пошук
 players.notfound = [gray]гульцоу не знойдзена
 server.closing = [accent]Закрыццё �ервера…
 server.kicked.kick = Ва� выгналі з �ервера!
@@ -163,7 +216,7 @@ server.kicked.serverOutdated = Са�тар�лы �ервер! Папытаец
 server.kicked.banned = Вы заблакаваны� на г�тым �ерверы.
 server.kicked.typeMismatch = Г�ты �ервер не �ум�шчальны з вашым тыпам зборкі.
 server.kicked.playerLimit = Г�ты �ервер запоўнены. Дачакайце�� вольнага �лота.
-server.kicked.recentKick = Ва� н�даўна выгналі. пПодождите трохі перад на�тупным падключ�ннем.
+server.kicked.recentKick = Ва� н�даўна выгналі. пПодождте трохі перад на�тупным падключ�ннем.
 server.kicked.nameInUse = �а г�тым �ерверы ё�ць хто-то з г�тым імем.
 server.kicked.nameEmpty = �бранае Вамі ім� недапушчальна.
 server.kicked.idInUse = Вы ўжо на г�тым �ерверы! Злуч�нне з двума ўліковымі запі�амі не дазволена.
@@ -171,11 +224,11 @@ server.kicked.customClient = Г�ты �ервер не падтрымлівае
 server.kicked.gameover = Гульн� �кончана!
 server.kicked.serverRestarting = Сервер перазапу�каецца.
 server.versions = Ваша вер�і�: [accent] {0}[]пВер�i� �ервера: [accent] {1}[]
-host.info = Кнопка [accent] адкрыць �ервер[] запу�кае �ервер на порце [scarlet] 6567[].\nлюбой кары�тальнік ў той жа [lightgray] лакальнай �еткі або WiFi[] павінен убачыць ваш �ервер у �ваім �пі�е �ервераў.\n \nе�лі вы хочаце, каб людзі маглі падлучацца адкуль заўгодна па IP, то патрабуецца [accent]пераадра�ацы� (пробро�) партоў[] і на�ўна�ць [red]знешн�га[] WAN адра�ы (WAN адра� [red]не павінен[] пачынацца з [red] 10[] [lightgray].X. X. x[], [red] 100.64[] [lightgray].X. x[], [red] 172.16[] [lightgray].X. x[], [red] 192.168[] [lightgray].X. x[], [red] 127[] [lightgray].x.x.x[])! пКлиентам мабільных аператараў тр�ба ўдакладн�ць інфармацыю ў а�абі�тым кабінеце на �айце вашага аператара!\n \n [lightgray] Заўвага: калі ў каго-то ўзнікаюць праблемы з падключ�ннем да вашай гульні па лакальнай �еткі, пераканайце��, што вы дазволілі до�туп Mindustry да вашай лакальнай �еткі ў наладах брандмаў�ра. Зв�рніце ўвагу, што публічны� �еткі ча�ам не дазвал�юць вы�ўленне �ервера.
-join.info = Тут вы можаце ўве�ці [accent]IP-адра� �ервера[] дл� падлуч�нн� або адкрыць [accent]лакальную �етку[] дл� падлуч�нн� да іншых �ерверам.\nПоддерживают�� абодва шматкары�тальніцкіх р�жыму: LAN і WAN.\n \n [lightgray] Заўвага: Г�та не аўтаматычны глабальны �пі� �ервераў; калі вы хочаце падлучыцца да каго-то па IP, вам тр�ба �пытаць у ха�та �го IP-адра�.
+host.info = Кнопка [accent] адкрыць �ервер[] запу�кае �ервер на порце [scarlet] 6567[].\nлюбой кары�тальнік ў той жа [lightgray] лакальнай �еткі або WiFi[] павінен убачыць ваш �ервер у �ваім �пі�е �ервераў.\n \nе�лі вы хочаце, каб людзі маглі падлучацца адкуль заўгодна па IP, то патрабуецца [accent]пераадра�ацы� (пробро�) партоў[] і на�ўна�ць [red]знешн�га[] WAN адра�ы (WAN адра� [red]не павінен[] пачынацца з [red] 10[] [lightgray].X. X. x[], [red] 100.64[] [lightgray].X. x[], [red] 172.16[] [lightgray].X. x[], [red] 192.168[] [lightgray].X. x[], [red] 127[] [lightgray].x.x.x[])! пКлентам мабільных аператараў тр�ба ўдакладн�ць інфармацыю ў а�абі�тым кабінеце на �айце вашага аператара!\n \n [lightgray] Заўвага: калі ў каго-то ўзнікаюць праблемы з падключ�ннем да вашай гульні па лакальнай �еткі, пераканайце��, што вы дазволілі до�туп Mindustry да вашай лакальнай �еткі ў наладах брандмаў�ра. Зв�рніце ўвагу, што публічны� �еткі ча�ам не дазвал�юць вы�ўленне �ервера.
+join.info = Тут вы можаце ўве�ці [accent]IP-адра� �ервера[] дл� падлуч�нн� або адкрыць [accent]лакальную �етку[] дл� падлуч�нн� да іншых �ерверам.\nПоддержвают�� абодва шматкары�тальніцкіх р�жыму: LAN і WAN.\n \n [lightgray] Заўвага: Г�та не аўтаматычны глабальны �пі� �ервераў; калі вы хочаце падлучыцца да каго-то па IP, вам тр�ба �пытаць у ха�та �го IP-адра�.
 hostserver = Запу�ціць шматкары�тальніцкі �ервер
 invitefriends = Запра�іць ��броў
-hostserver.mobile = Запу�ціць п�ервер
+hostserver.mobile = Запу�ціць �ервер
 host = �дкрыць �ервер
 hosting = [accent] Сервер адкрываецца…
 hosts.refresh = �бнавіць
@@ -183,19 +236,35 @@ hosts.discovering = Пошук лакальных гульн�ў
 hosts.discovering.any = Пошук гульн�ў
 server.refreshing = �бнаўленне �ервера
 hosts.none = [lightgray] Лакальных гульн�ў не вы�ўлена!
-host.invalid = [scarlet]�е атрымоўваецца падлучыцца да ха�ту.
+host.invalid = [scarlet]�е атрымліваецца падлучыцца да ха�ту.
 
 servers.local = Лакальны� �ерверы
+servers.local.steam = �дкрыты� Гульні і Лакальны� Серверы
 servers.remote = Выдалены� �ерверы
 servers.global = Глабальны� �ерверы
+servers.disclaimer = Супольны� Серверы [accent]не[] зв�заны або не кантралююцца ра�працоўшчыкам.\n\nГ�ты� �ерверы могуць утрымліваць згенераваны кары�тальнікамі кант�нт �кі можа падый�ці не да у�іх узро�таў.
+servers.showhidden = Паказаць Схаваны� Серверы
+server.shown = Бачны�
+server.hidden = Схаваны�
+viewplayer = Прагл�д Гульца: [accent]{0}
 
 trace = �д�очваць гульца
 trace.playername = Iм� гульца: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Мабільны кліент: [accent]{0}
-trace.modclient = Кары�тацкі кліент: [accent]{0}
+trace.modclient = Кары�тальніцкі кліент: [accent]{0}
+trace.times.joined = Разоў Падлучана: [accent]{0}
+trace.times.kicked = Разоў Выгнана: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = �едапушчальны ID кліента! �дпраўце �праваздачу пра памылку.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Блакаваннi
 server.bans.none = Заблакаваных гульцоў н�ма!
 server.admins = �дміні�тратары
@@ -206,29 +275,33 @@ server.edit = Р�дагаваць �ервер
 server.outdated = [crimson]Са�тар�лы �ервер![]
 server.outdated.client = [crimson]Са�тар�лы кліент![]
 server.version = [gray]Вер�і�: {0} {1}
-server.custombuild = [accent]кары�тацка� зборка
+server.custombuild = [accent]кары�тальніцка� зборка
 confirmban = Вы �апраўды хочаце заблакаваць г�тага гульца?
 confirmkick = Вы �апраўды хочаце выгнаць г�тага гульца?
-confirmvotekick = Вы �апраўды хочаце гала�аваннем выгнаць г�тага гульца?
 confirmunban = Вы �апраўды хочаце разблакаваць г�тага гульца?
 confirmadmin = Вы �апраўды хочаце зрабіць г�тага гульца адміні�тратарам?
 confirmunadmin = Вы �апраўды хочаце прыбраць г�тага гульца з адміні�тратараў?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Далучыцца да гульні
 joingame.ip = �дра�:
 disconnect = �дключана.
-disconnect.error = Памылка злуч�нн�. 
+disconnect.error = Памылка злуч�нн�.
 disconnect.closed = Злуч�нне закрыта.
 disconnect.timeout = Ча� чаканн� �кончыў��.
 disconnect.data = Памылка пры загрузцы дадзеных �вету!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = �е ўдаецца далучыцца да гульні ([accent]{0}[]).
 connecting = [accent]Падключ�нне…
+reconnecting = [accent]Перападключ�нне...
 connecting.data = [accent]Загрузка дадзеных �вету…
 server.port = Порт:
-server.addressinuse = Дадзены адра� ужо выкары�тоўваецца!
 server.invalidport = ��правільны нумар порта!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [барвовы]Памылка �твар�нн� �ервера.
 save.new = �овае захаванне
 save.overwrite = Вы ўп�ўнены�, што жадаеце перазапі�аць\nг�ты �лот дл� захаванн�?
+save.nocampaign = Індывідуальны� файлы захаванн� кампаніі нельга імпартаваць.
 overwrite = Перазапі�аць
 save.none = Захаванн� не знойдзены!
 savefail = �е атрымала�� захаваць гульню!
@@ -239,7 +312,7 @@ save.import.invalid = [accent]Г�та захаванне не�апраўдна
 save.import.fail = [crimson]�емагчыма імпартаваць захаванне: [accent]{0}
 save.export.fail = [crimson]�е атрымала�� �к�партаваць захаванне: [accent]{0}
 save.import = Імпартаваць захаванне
-save.newslot = Им� �охранени�:
+save.newslot = м� �охранен�:
 save.rename = Перайменаваць
 save.rename.text = �ова� назва:
 selectslot = Выб�рыце захаванне.
@@ -249,6 +322,7 @@ save.corrupted = [accent]Захаваны файл пашкоджаны або 
 empty = <пу�та>
 on = Вкл
 off = Выкл
+save.search = Пошук захаваных гульн�ў...
 save.autosave = �ўтазахаванне: {0}
 save.map = Карта: {0}
 save.wave = Хвал� {0}
@@ -264,9 +338,33 @@ ok = ОК
 open = �дкрыць
 customize = наладзіць правілы
 cancel = адмена
+command = Камандаваць
+command.queue = [lightgray][Queuing]
+command.mine = Дабываць
+command.repair = Рамантаваць
+command.rebuild = Перабудоўваць
+command.assist = Следаваць За Гульцом
+command.move = Рухацца
+command.boost = Узл�цець
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = адкрыць �па�ылку
 copylink = �капі�ваць �па�ылку
 back = �азад
+max = Max
+objective = М�ты Мапы
+crash.export = Эк�партаваць Логі Збо�ў
+crash.none = �е найдзена логаў збо�ў.
+crash.exported = Логі збо�ў �к�партаваны�.
 data.export = Эк�партаваць дадзены�
 data.import = Імпартаваць дадзены�
 data.openfolder = �дкрыць т�чку з дадзенымі
@@ -274,23 +372,28 @@ data.exported = Дадзены� �к�партаваны�.
 data.invalid = Г�ты� гульн�вы� дадзены� з’�ўл�юцца не�апраўднымі.
 data.import.confirm = Імпарт знешніх дадзеных �атр�[scarlet] у�е[] Вашы гульн�вы� дадзены�.\n[accent]Г�та не можа быць адменена![]\n\nЯк толькі дадзены� імпартаваны�, Ваша гульн� неадкладна зачыніцца.
 quit.confirm = Вы ўп�ўнены�, што хочаце вый�ці?
-quit.confirm.tutorial = Вы ўп�ўнены�, што ведаеце, што робіце?\n�авучанне можа быць паўторна запушчана праз[accent] �аладжваньне->Гульн�->�дкрыць навучанне.[]
 loading = [accent]Загрузка…
-reloading = [accent]Перазагрузка мадыфікацый...
+downloading = [accent]У�талёука...
 saving = [accent]Захаванне…
 respawn = [accent][[{0}][] да вазрадж�нн� з �дра
 cancelbuilding = [accent][[{0}][] дл� ачы�ткі плана
 selectschematic = [accent][[{0}][] вылучыць і �капі�ваць
 pausebuilding = [accent][[{0}][] дл� прыпыненн� будаўніцтва
 resumebuilding = [scarlet][[{0}][] дл� прац�гу будаўніцтва
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = Кары�тальніцкі Інт�рфей� �хаванф.\n�аці�ніце [accent][[{0}][] каб паказаць Кары�тальніцкі Інт�рфей�.
+commandmode.name = [accent]Р�жым Загадаў
+commandmode.nounits = [н�ма адзінкаў]
 wave = [accent]Хвал� {0}
-wave.cap = [accent]Wave {0}/{1}
+wave.cap = [accent]Хавл� {0}/{1}
 wave.waiting = [lightgray]Хвал� праз {0}
 wave.waveInProgress = [lightgray]Хвал� прац�гваецца
 waiting = [lightgray]Чаканне…
 waiting.players = Чаканне гульцоў…
 wave.enemies = Ворагаў: [lightgray]{0}
-wave.enemy = За�таў�� [lightgray]{0}[] ворагаў
+wave.enemycores = [accent]{0}[lightgray] Варожых Ядзер
+wave.enemycore = [accent]{0}[lightgray] Варожае Ядро
+wave.enemy = За�таў�� [lightgray]{0}[] вораг
 wave.guardianwarn = Вартаўнік будзе па�л� [accent]{0}[] хвалей.
 wave.guardianwarn.one = Вартаўнік будзе па�л� [accent]{0}[] хвалі.
 loadimage = Загрузіць малюнак
@@ -300,9 +403,9 @@ custom = Кары�тацка�
 builtin = Убудавана�
 map.delete.confirm = Вы �апраўды жадаеце выдаліць г�тую карту? Г�та дзе�нне не можа быць адменена!
 map.random = [accent]Выпадкова� карта
-map.nospawn = Г�та� карта не мае ні аднаго �дра, у �кім гулец можа з’�віцца! Дадайце[accent] аранжавае[] �дро на г�тую карту ў р�дактары.
-map.nospawn.pvp = У г�тай карты н�ма варожых �драў, у �кіх гулец можа з’�віцца! Дадайце[scarlet] не аранжавае[] �дро на г�тую карту ў р�дактары.
-map.nospawn.attack = У г�тай карты н�ма варожых �драў дл� нападу гульцом! Дадайце[scarlet] ружовае[] �дро на г�тую карту ў р�дактары.
+map.nospawn = Г�та� карта не мае ні аднаго �дра, у �кім гулец можа з’�віцца! Дадайце {0} �дро на г�тую карту ў р�дактары.
+map.nospawn.pvp = У г�тай карты н�ма варожых �драў, у �кіх гулец можа з’�віцца! Дадайце [scarlet]не аранжавае[] �дро на г�тую карту ў р�дактары.
+map.nospawn.attack = У г�тай карты н�ма варожых �драў дл� нападу гульцом! Дадайце {0} �дро на г�тую карту ў р�дактары.
 map.invalid = Памылка загрузкі карты: пашкоджаны або недапушчальны файл карты.
 workshop.update = �бнавіць зме�ціва
 workshop.error = Памылка загрузкі інфармацыі з Май�т�рні: {0}
@@ -310,12 +413,17 @@ map.publish.confirm = Вы ўп�ўнены�, што жадаеце апубл
 workshop.menu = Выберыце, што вы хочаце зрабіць з г�тым прадметам.
 workshop.info = Інфармацы� аб прадмеце
 changelog = Спі� змен (неабав�зкова):
+updatedesc = Перазапі�аць �азву і �пі�анне
 eula = Ліц�нзійнае пагадненне Steam з канчатковым кары�тальнікам
 missing = Г�ты прадмет быў выдалены або перамешчаны.\n[lightgray]Публікацы� ў май�т�рні была аўтаматычна выдалена�.
 publishing = [accent]�дпраўка...
 publish.confirm = Вы ўп�ўнены�, што хочаце апублікаваць г�ты прадмет?\n\n[lightgray]Пераканайце��, што вы згодны� з EULA Май�т�рні, інакш вашы� прадметы не будуць адлю�троўвацца!
 publish.error = Памылка адпраўкі прадмета: {0}
 steam.error = �емагчыма ініцы�лізаваць па�лугі Steam.\nПамылка: {0}
+editor.planet = Планета:
+editor.sector = Сектар:
+editor.seed = Зерне:
+editor.cliffs = Сцены К Скалам
 
 editor.brush = П�ндаль
 editor.openin = �дкрыць у р�дактары
@@ -328,35 +436,71 @@ editor.nodescription = Каб апублікаваць карту, �на пав
 editor.waves = Хвалі:
 editor.rules = Правілы:
 editor.generation = Генерацы�:
+editor.objectives = М�ты
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Р�дагаваць ў гульні
+editor.playtest = Т��таваць
 editor.publish.workshop = �публікаваць у май�т�рні
 editor.newmap = �ова� карта
-editor.center = Center
+editor.center = Цантраваць
+editor.search = Пошук мапаў...
+editor.filters = Фільтраваць Мапы
+editor.filters.mode = Гульн�вы� Р�жымы:
+editor.filters.type = Тып Мапы:
+editor.filters.search = Шукаць У:
+editor.filters.author = �ўтар
+editor.filters.description = �пі�анне
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Май�т�рн�
 waves.title = Хвалі
 waves.remove = Выдаліць
-waves.never = <ніколі>
 waves.every = кожны
 waves.waves = хвал� (ы)
+waves.health = Здароўе: {0}%
 waves.perspawn = за з’�ўленне
 waves.shields = адзінак шчыта/хвалю
 waves.to = да
+waves.spawn = з�віла��:
+waves.spawn.all = <у�е>
+waves.spawn.select = Выбар Кропкі З�ўленн�
+waves.spawn.none = [scarlet]�паўны на карце не знойдзены
+waves.max = мак�імум адзінак
 waves.guardian = Вартаўнік
 waves.preview = Пап�р�дні прагл�д
 waves.edit = Р�дагавацью...
+waves.random = Выпадкова
 waves.copy = Капі�ваць у буфер абмену
 waves.load = Загрузіць з буфера абмену
 waves.invalid = ���лушны� хвалі ў буферы абмену.
 waves.copied = Хвалі �капі�ваны�.
 waves.none = Ворагі не былі вызначаны�. \nЗв�рнiце ўвагу, што пу�ты� хвалі будуць аўтаматычна заменены� звычайнай хвал�й.
+waves.sort = Сартаваць Па
+waves.sort.reverse = Р�вер�іўнае Сартаванне
+waves.sort.begin = Пачатак
+waves.sort.health = Здароўе
+waves.sort.type = Тып
+waves.search = Пошук хваль...
+waves.filter = Фільтраваць Юнітав
+waves.units.hide = Схаваць У�ё
+waves.units.show = Паказаць У�ё
 
 wavemode.counts = колькац�ь адзінак
 wavemode.totals = у��го здароў�
 wavemode.health = здароўе
+all = All
 
 editor.default = [lightgray]<Па змаўчанні>
 details = Падраб�зна�ці...
 edit = Р�дагаваць...
+variables = Пераменны�
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = �азва:
 editor.spawn = Стварыць ба�вую адзінку
 editor.removeunit = Выдаліць ба�вую адзінку
@@ -368,13 +512,19 @@ editor.errorlegacy = Г�та� карта занадта �тара� і вык
 editor.errornot = Г�та не файл карты.
 editor.errorheader = Г�ты файл карты н� дзейнічае або пашкоджаны.
 editor.errorname = Карта не мае ім�. Можа быць, Вы �прабуеце загрузіць захаванне?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = �бнавіць
 editor.randomize = Выпадкова
+editor.moveup = Рухацца Уверх
+editor.movedown = Рухацца Уніз
+editor.copy = Капі�ваць
 editor.apply = Ужыць
 editor.generate = Згене- \nраваць
+editor.sectorgenerate = Згенераваць Сектар
 editor.resize = Зм�ніць \nразмер
 editor.loadmap = Загрузіць \nкарту
 editor.savemap = Захаваць \nкарту
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Захавана!
 editor.save.noname = У Вашай карты н�ма ім�! �азавіце �е ў меню «Інфармацы� аб карце».
 editor.save.overwrite = Ваша карта не можа быць запі�ана па-над убудаванай карты! Калі ла�ка, ув�дзіце іншую назву ў меню «Інфармацы� аб карце»
@@ -393,7 +543,7 @@ editor.exportimage = Эк�партаваць малюнак ландшафту
 editor.exportimage.description = Эк�партаваць файл з вы�вай карты
 editor.loadimage = Імпартаваць \nмалюнак
 editor.saveimage = Эк�партаваць \nмалюнак
-editor.unsaved = [scarlet]У Ва� ё�ць не�охранённые змены![]\nВы ўп�ўнены�, што хочаце вый�ці?
+editor.unsaved = [scarlet]У Ва� ё�ць незахаваны� змены![]\nВы ўп�ўнены�, што хочаце вый�ці?
 editor.resizemap = Зм�ніць памер карты
 editor.mapname = �азва карты:
 editor.overwrite = [accent]Увага!\nГ�та перазапіша ўжо і�нуючую карту.
@@ -406,22 +556,26 @@ toolmode.replace.description = Малюе толькі \nна �уц�льных
 toolmode.replaceall = Зам�ніць у�ё
 toolmode.replaceall.description = Зам�ніць ў�е \nблокi на карце.
 toolmode.orthogonal = �ртаганальна�
-toolmode.orthogonal.description = Малюе толькі \nартоганальны� лініі.
+toolmode.orthogonal.description = Малюе толькі \nартаганальны� лініі.
 toolmode.square = Квадрат
-toolmode.square.description = Квадратна� п�ндзаль.
+toolmode.square.description = Квадратны п�ндзлік.
 toolmode.eraseores = Сцерці руды
 toolmode.eraseores.description = Сцерці толькі руды.
 toolmode.fillteams = Зм�ніць каманду блокаў
 toolmode.fillteams.description = Зм�н�е прыналежна�ць \nблокаў да каманды.
+toolmode.fillerase = Сцерці заліўку
+toolmode.fillerase.description = Сцерці ў�е блокі аднаго тыпу.
 toolmode.drawteams = Зм�ніць каманду блока
 toolmode.drawteams.description = Зм�н�е прыналежна�ць \nблокаў да каманды.
+toolmode.underliquid = Пад вадка�ц�мі
+toolmode.underliquid.description = Малюе паверхні пад вадз�ны� блокі.
 
 filters.empty = [lightgray]��ма фільтраў! Дадайце адзін пры дапамозе кнопкі ніж�й.
 filter.distort = Скаж�нне
 filter.noise = Шум
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
-filter.corespawn = Core Select
+filter.enemyspawn = Выбар Варожай Кропкі З�ўленн�
+filter.spawnpath = Шл�х Да Кропкі З�ўленн�
+filter.corespawn = Выбар Ядра
 filter.median = Меды�на
 filter.oremedian = Рудн� меды�на
 filter.blend = Змешванне
@@ -433,6 +587,7 @@ filter.clear = �чы�ціць
 filter.option.ignore = Ігнараваць
 filter.scatter = Се�цель
 filter.terrain = Ландшафт
+filter.logic = Logic
 filter.option.scale = Маштаб фільтра
 filter.option.chance = Шанец
 filter.option.mag = Сіла прым�ненн�
@@ -441,17 +596,39 @@ filter.option.circle-scale = Маштаб круга
 filter.option.octaves = Цыклічна�ць прым�ненн�
 filter.option.falloff = Спад цыклічна�ці
 filter.option.angle = Кут
-filter.option.amount = Amount
+filter.option.tilt = �ахіліць
+filter.option.rotate = Паварочваць
+filter.option.amount = Колька�ць
 filter.option.block = Блок
 filter.option.floor = Паверхн�
 filter.option.flooronto = М�тава� паверхню
-filter.option.target = Target
+filter.option.target = Ц�ль
+filter.option.replacement = Замена
 filter.option.wall = Сц�на
 filter.option.ore = Руда
 filter.option.floor2 = Друга� паверхню
 filter.option.threshold2 = Друга�ны гранічны парог
 filter.option.radius = Радыу�
-filter.option.percentile = Процентиль
+filter.option.percentile = Процентль
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Шырын�:
 height = Вышын�:
@@ -462,40 +639,88 @@ load = Загрузіць
 save = Захаваць
 fps = FPS: {0}
 ping = Пінг: {0} м�
+tps = TPS: {0}
+memory = Пам: {0}mb
+memory2 = Пам:\n {0}mb +\n {1}mb
 language.restart = Перазагрузіце гульню, каб моўны� налады ў�тупілі ў �ілу.
 settings = �алады
 tutorial = �авучанне
-tutorial.retake = Перепройти навучанне
+tutorial.retake = Перепройт навучанне
 editor = Р�дактар
 mapeditor = Р�дактар карт
 
 abandon = Пакінуць
 abandon.text = Г�та� зона і ў�е �е р��ур�ы будуць аддадзены �уперніку.
-locked = Бл�каваны
+locked = Заблкаваны
 complete = [lightgray]Выканаць:
 requirement.wave = да��гнем {0} хвалі ў зоне {1}
 requirement.core = Знішчыце варожае �дро ​​ў зоне {0}
-requirement.research = Research {0}
-requirement.capture = Capture {0}
-bestwave = [lightgray]Лепша� хвал�: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
+requirement.research = Да�ледаваць {0}
+requirement.produce = Вырабіць {0}
+requirement.capture = Захапіць {0}
+requirement.onplanet = Кантрал�ваць Сектар �а {0}
+requirement.onsector = Прыз�мліцца �а Сектар: {0}
+launch.text = Запу�к
+map.multiplayer = Толькі ха�ты могуць прагл�даць �ектары.
 uncover = Ра�крыць
 configure = Канфігурацы� выгрузкі
-loadout = Loadout
-resources = Resources 
+objective.research.name = Да�ледаваць
+objective.produce.name = �трымаць
+objective.item.name = �трымаць Прадмет
+objective.coreitem.name = Прадмет Ядра
+objective.buildcount.name = Колька�ць Будынкаў
+objective.unitcount.name = Колька�ць �дзінкаў
+objective.destroyunits.name = �дзінкаў Знішчыць
+objective.timer.name = Таймер
+objective.destroyblock.name = Знішчыць Блок
+objective.destroyblocks.name = Знішчыць Блокі
+objective.destroycore.name = Знішчыць Ядро
+objective.commandmode.name = Р�жым Загадаў
+objective.flag.name = Сц�г
+marker.shapetext.name = Форма Т�к�ту
+marker.point.name = Point
+marker.shape.name = Форма
+marker.text.name = Т�к�т
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Задні Фон
+marker.outline = Контур
+objective.research = [accent]Да�ледаваць:\n[]{0}[lightgray]{1}
+objective.produce = [accent]�трымаць:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Знішчыць:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Знішчыць: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]�трымаць: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Рухаць да Ядра:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Будаваць: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Будаваць �дзінку: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Знішчыць: [][lightgray]{0}[]x �дзінкаў
+objective.enemiesapproaching = [accent]Ворагі з�в�цца праз [lightgray]{0}[]
+objective.enemyescelating = [accent]Павыш�нне �кора�ці варожай вытворча�ці праз [lightgray]{0}[]
+objective.enemyairunits = [accent]Вытворча�ць варожых паветранных адзінкаў пачынаецца праз [lightgray]{0}[]
+objective.destroycore = [accent]Знішчыць Варожае Ядро
+objective.command = [accent]Кантрал�ваць �дзінкі
+objective.nuclearlaunch = [accent]⚠ Ядзерны запу�к вы�ўлены: [lightgray]{0}
+announce.nuclearstrike = [red]⚠ ЯДЗЕР�Ы УД�Р �ЕП�ЗБЕЖ�Ы ⚠
+loadout = Выгрузіць
+resources = Р��ур�ы
+resources.max = Мак�імум Р��ур�аў
 bannedblocks = Забаронены� блокі
+unbannedblocks = Unbanned Blocks
+objectives = М�ты
+bannedunits = Забаронены� �дзінкі
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Забаронены� �дзінкі Ў Белым Спі�е
+bannedblocks.whitelist = Забаронены� Блокі Ў Белым Спі�е
 addall = Дадаць в�ё
-launch.destination = Destination: {0}
+launch.from = Запу�к �д: [accent]{0}
+launch.capacity = �мі�та�ць Прадметаў Да Запу�ку: [accent]{0}
+launch.destination = Кропка Прызнач�нн�: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Колька�ць павінна быць лікам паміж 0 і {0}.
-zone.unlocked = Зона «[lightgray] {0}» зараз адмыкнута�.
-zone.requirement.complete = Умовы дл� зоны «{0}» выкананы: [lightgray] \n {1}
-zone.resources = [lightgray] Вы�ўлены� р��ур�ы:
-zone.objective = [lightgray] М�та: [accent] {0}
-zone.objective.survival = Выжыць
-zone.objective.attack = Знішчыць варожае �дро
 add = Дадаць...
-boss.health = Здароўе бо�а
+guardian = Вартаўнік
 
 connectfail = [crimson]Памылка падлуч�нн�: \n\n[accent] {0}
 error.unreachable = Сервер неда�тупны. \nВы ўп�ўнены�, што адра� уведзены кар�ктна?
@@ -507,87 +732,220 @@ error.mapnotfound = Файл карты не знойдзены!
 error.io = Сеткава� памылка ўводу-вы�новы.
 error.any = �ев�дома� �еткава� памылка.
 error.bloom = �е атрымала�� ініцы�лізаваць �в�ч�нне (Bloom). \nМагчыма, зараз Ваша� прылада не падтрымлівае �го.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Дождж
-weather.snow.name = Снег
-weather.sandstorm.name = П��очны� бурі
-weather.sporestorm.name = Споравы� бурі
+weather.snowing.name = Снег
+weather.sandstorm.name = П��чана� бура
+weather.sporestorm.name = Спарава� бура
 weather.fog.name = Туман
+campaign.playtime = \uf129 [lightgray]Ча� Гульні �а Сектары: {0}
+campaign.complete = [accent]Віншую.\n\nВорагі ў {0} былі пераможаны.\n[lightgray]Фінальны �ектар захоплены.
+sectorlist = Сектары
+sectorlist.attacked = {0} пад атакай
 
-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)
-sectors.rename = Rename Sector
+sectors.unexplored = [lightgray]�е Разведана
+sectors.resources = Р��ур�ы:
+sectors.production = Вытворча�ць:
+sectors.export = Эк�партавана:
+sectors.import = Імпартавана:
+sectors.time = Ча�:
+sectors.threat = Пагроза:
+sectors.wave = Хвал�:
+sectors.stored = Захавана:
+sectors.resume = Прац�гнуць
+sectors.launch = Запу�ціць
+sectors.select = Выбраць
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]нічога (sun)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Пераназваць Сектар
+sectors.enemybase = [scarlet]Варожа� База
+sectors.vulnerable = [scarlet]Уразлівы
+sectors.underattack = [scarlet]�такуецца! [accent]{0}% пашкоджанн�ў
+sectors.underattack.nodamage = [scarlet]�езахоплены
+sectors.survives = [accent]Перажыта {0} хвал�ў
+sectors.go = Зай�ці
+sector.abandon = Пакінуць Сектар
+sector.abandon.confirm = Ядро(а) будуць �амазнішчаны ў г�тым �ектары.\n,Прац�гнуць?
+sector.curcapture = Сектар Захоплены
+sector.curlost = Сектар Згублены
 sector.missingresources = [scarlet]Insufficient Core Resources
+sector.attacked = Сектар [accent]{0}[white] атакуецца!
+sector.lost = Сектар [accent]{0}[white] згублены!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Зм�ніць Іконку
+sector.noswitch.title = �емагчыма Пераключыцца на Сектар
+sector.noswitch = Вы не можаце пераключацца на �ектары калі г�ты �ектар атакуецца.\n\nСектар: [accent]{0}[] у [accent]{1}[]
+sector.view = Прагл�дзець Сектар
+threat.low = �ізка�
+threat.medium = С�р�дн��
+threat.high = Вы�ока�
+threat.extreme = Эк�трымальна�
+threat.eradication = Вынішч�нне
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Планеты
 
-planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.serpulo.name = Серпуло
+planet.erekir.name = Эр�кір
+planet.sun.name = Сонца
+sector.impact0078.name = �вары� 0078
 
-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.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.biomassFacility.name = �б'ект Сінт�зу Бі�ма�ы
+sector.windsweptIslands.name = �бветраны� ��травы
+sector.extractionOutpost.name = Здабвываючы Фарпо�т
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Планетарны Пу�кавы Т�рмінал
+sector.coastline.name = Берагава� Ліні�
+sector.navalFortress.name = Мар�ка� Кр�па�ць
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.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Вораг за�наваў тутThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = Ваколіцы зоны здабычы нафты, паміж гарамі і пу�тын�й. �дзін з некалькіх зон з прыдатнымі дл� выкары�танн� запа�амі дзёгцю.\nТак�ама закінута�, г�та� зона мае побач неб��печных ворагаў. �е варта недаац�ньваць іх.\n\n[lightgray]Знайдзіце па магчыма�ці т�хналогіі перапрацоўкі нафты.
 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = Пачатак
+sector.aegis.name = �хова
+sector.lake.name = Рака
+sector.intersect.name = Пера��ч�нне
+sector.atlas.name = �тла�
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Гарыць
+status.freezing.name = Зам�рзае
+status.wet.name = �амакае
+status.muddy.name = Забруджваецца
+status.melting.name = Плавіцца
+status.sapped.name = Сап�уецца
+status.electrified.name = �а�лектрыфікаваны
+status.spore-slowed.name = Запаволены Спорамі
+status.tarred.name = Пра�малены
+status.overdrive.name = Стомлены
+status.overclock.name = Разагнаны
+status.shocked.name = Шакаваны
+status.blasted.name = Узарваны
+status.unmoving.name = Знерухомлены
+status.boss.name = Вартаўнік
 
 settings.language = Мова
-settings.data = Гульн�вы� дадзены�
-settings.reset = Скінуць па змаўчанні
+settings.data = Гульн�вы� Дадзены�
+settings.reset = Скінуць �алады Гуку
 settings.rebind = Зм�ніць
 settings.resetKey = Скінуць
-settings.controls = Упраўленне
+settings.controls = Кіраванне
 settings.game = Гульн�
 settings.sound = Гук
 settings.graphics = Графіка
-settings.cleardata = �чы�ціць гульн�вы� дадзены�...
+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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
+settings.clearsaves.confirm = Вы �апраўды жадаеце ачы�ціць у�е вашы� захаванні?
+settings.clearsaves = �чы�ціць Захаванні
+settings.clearresearch = �чы�ціць Да�ледаванні
+settings.clearresearch.confirm = Вы �апраўды жадаеце ачы�ціць у�е вашы� да�ледаванні ў кампаніі?
+settings.clearcampaignsaves = �чы�ціць Захаванні Кампаніі
+settings.clearcampaignsaves.confirm = Вы �апраўды жадаеце ачы�ціць у�е вашы� захаванні ў кампаніі?
 paused = [accent] <Паўза>
 clear = �чы�ціць
 banned = [scarlet] Забаронена
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]�епадтрымліваемае ���родзе
 yes = Так
 no = �е
 info.title = Інфармацы�
 error.title = [crimson]�дбыла�� памылка
 error.crashtitle = �дбыла�� памылка
-unit.nobuild = [scarlet]Unit can't build
-lastaccessed = [lightgray]Last Accessed: {0}
+unit.nobuild = [scarlet]�дзінка не можа быць пабудавана�
+lastaccessed = [lightgray]�пошні До�туп: {0}
+lastcommanded = [lightgray]�рошні Загад: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <заладуйце мапу каб паказаць>
+stat.description = Прызнач�нне
 
 stat.input = Уваход
 stat.output = Выхад
+stat.maxefficiency = Мак�імальна� Эфектыўна�ць
 stat.booster = Па�каральнік
 stat.tiles = �еабходны� пліткі
 stat.affinities = Павеліч�нне �фектыўна�ці
+stat.opposites = Пашкаджае
 stat.powercapacity = Ум�шчальна�ць �нергіі
 stat.powershot = Энергі�/Вы�тр�л
 stat.damage = Страты
@@ -597,133 +955,223 @@ stat.itemsmoved = Хутка�ць перам�шч�нн�
 stat.launchtime = Інт�рвал запу�каў
 stat.shootrange = Радыу� дзе�нн�
 stat.size = Памер
-stat.displaysize = Display Size
+stat.displaysize = Памер Ды�пл��
 stat.liquidcapacity = Ум�шчальна�ць вадка�ці
 stat.powerrange = Далёка�ць перадачы �нергіі
-stat.linkrange = Link Range
-stat.instructions = Instructions
+stat.linkrange = Ды�пазон Злуч�нн�
+stat.instructions = Ін�трукцыі
 stat.powerconnections = Колька�ць злуч�нн�ў
 stat.poweruse = Спажывае �нергіі
 stat.powerdamage = Энергі�/�траты
 stat.itemcapacity = Ум�шчальна�ць прадметаў
-stat.memorycapacity = Memory Capacity
+stat.memorycapacity = �мі�та�ць Пам�ці
 stat.basepowergeneration = Базава� генерацы� �нергіі
 stat.productiontime = Ча� вытворча�ці
 stat.repairtime = Ча� поўнай р�генерацыі
+stat.repairspeed = Хутка�ць Рамонту
+stat.weapons = Збро�
+stat.bullet = Кул�
+stat.moduletier = Модульны Ўзровень
+stat.unittype = Тып �дзінкі
 stat.speedincrease = Павеліч�нне хутка�ці
 stat.range = Радыу� дзе�нн�
-stat.drilltier = Бурит
+stat.drilltier = Бурць
 stat.drillspeed = Базава� хутка�ць �відраванн�
-stat.boosteffect = па�караў�� �фект
+stat.boosteffect = Эфект па�кар�нн�
 stat.maxunits = Мак�імальна� колька�ць актыўных адзінак
 stat.health = Здароўе
+stat.armor = Бран�
 stat.buildtime = Ча� будаўніцтва
-stat.maxconsecutive = Max Consecutive
+stat.maxconsecutive = Мак�імальны Запар
 stat.buildcost = Кошт будаўніцтва
 stat.inaccuracy = Ро�кід
 stat.shots = Стр�лы
 stat.reload = Стр�лы/�екунду
 stat.ammo = Боепрыпа�ы
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.shieldhealth = Трывала�ць Шчыта
+stat.cooldowntime = Ча� Перазарадкі
+stat.explosiveness = Узрыўчата�ць
+stat.basedeflectchance = Шанец Збо� Базы
+stat.lightningchance = Шанец Маланкі
+stat.lightningdamage = Пашкоджанні Маланкі
+stat.flammability = Гаруча�ць
+stat.radioactivity = Радыеактыўна�ць
+stat.charge = Зарад
+stat.heatcapacity = �мі�та�ць Ц�пла
+stat.viscosity = Глейка�ць
+stat.temperature = Т�мпература
+stat.speed = Хутка�ць
+stat.buildspeed = Хутка�ць Будоўлі
+stat.minespeed = Хутка�ць Здабычы
+stat.minetier = Моц Здабычы
+stat.payloadcapacity = �мі�та�ць �агрузкі
+stat.abilities = Здольна�йі
+stat.canboost = Можа Узл�таць
+stat.flying = Паветраны
+stat.ammouse = Выкары�танне Боезапа�у
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Множнік Пашкоджанн�ў
+stat.healthmultiplier = Множнік Здароў�
+stat.speedmultiplier = Множнік Хутка�ці
+stat.reloadmultiplier = Множнік Перазарадкі
+stat.buildspeedmultiplier = Множнік Хутка�ці Будоўлі
+stat.reactive = Р�агуе
+stat.immunities = Імуніт�т
+stat.healing = �днаўленне
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = Сіловое Поле
+ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.repairfield = Поле Рамонту
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Поле Стату�у
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Завод
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Ва��танўл�ю�ае Поле Шчыта
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Рух Маланкі
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Шчытава� Дуга
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Эн�ргетычнае Поле
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+bar.onlycoredeposit = Да�тупны Толькі Перано� Р��ур�аў У Ядро
 
 bar.drilltierreq = Патрабуецца �відар лепей
-bar.noresources = Missing Resources
-bar.corereq = Core Base Required
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = �е Хапае Р��ур�аў
+bar.corereq = Патрабуецца ��нова Ядра
+bar.corefloor = Патрабуецца Тайлава� Зона Ядра
+bar.cargounitcap = Грузаёмі�та�ць �дзінкі Да��гнута
 bar.drillspeed = Хутка�ць бур�нн�: {0}/�
 bar.pumpspeed = Хутка�ць выкачванне: {0}/�
 bar.efficiency = Эфектыўна�ць: {0}%
+bar.boost = Моц Узлёту: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Энергі�: {0}/�
 bar.powerstored = �азапашана: {0}/{1}
 bar.poweramount = Энергі�: {0}
 bar.poweroutput = Выхад �нергіі: {0}
-bar.powerlines = Connections: {0}/{1}
+bar.powerlines = Сув�зі: {0}/{1}
 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.cooldown = Cooldown
+bar.instability = �е�табільна�ць
+bar.heatamount = �агр�ў: {0}
+bar.heatpercent = �агр�ў: {0} ({1}%)
 bar.power = Энергі�
 bar.progress = Прагр�� будаўніцтва
+bar.loadprogress = Прагр�� Заладоўкі
+bar.launchcooldown = Затрымка Запу�ку
 bar.input = Уваход
 bar.output = Выхад
+bar.strength = [stat]{0}[lightgray]x strength
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]Кантралюецца Прац���арам
 
 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.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat] {0} [lightgray]аддачы
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat] замарожваюцца
-bullet.tarred = [stat] запавольвае, гаручы
+bullet.healpercent = [stat]{0}[lightgray]% рамонт
+bullet.healamount = [stat]{0}[lightgray] напрамкавы рамонт
 bullet.multiplier = [stat]{0}[lightgray]x множнік боепрыпа�аў
 bullet.reload = [stat]{0}[lightgray]x хутка�ць �тр�льбы
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = блокі
 unit.blockssquared = blocks²
 unit.powersecond = адзінак �нергіі/�екунду
+unit.tilessecond = плітак/�екунду
 unit.liquidsecond = вадка�ных адзінак/�екунду
 unit.itemssecond = прадметаў/�екунду
 unit.liquidunits = вадка�ных адзінак
 unit.powerunits = �нерг. адзінак
+unit.heatunits = адзінкі �нергіі
 unit.degrees = град.
 unit.seconds = �ек.
-unit.minutes = mins
+unit.minutes = хв.
 unit.persecond = /�ек
-unit.perminute = /min
+unit.perminute = /хв
 unit.timesspeed = x хутка�ць
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = shield health
+unit.shieldhealth = моц шчыта
 unit.items = прадметаў
 unit.thousands = Ты�.
 unit.millions = М.
-unit.billions = b
+unit.billions = Б.
+unit.shots = shots
+unit.pershot = /�тр�л
+category.purpose = �пі�анне
 category.general = ��ноўны�
 category.power = Энергі�
 category.liquids = Вадка�ці
 category.items = Прадметы
 category.crafting = Ув�дзенне/Вы�нова
-category.function = Function
+category.function = Функцы�
 category.optional = Дадатковы� пал�пш�нн�
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Прапу�ціць Запу�к Ядра/�німацыю Вы�адкі
 setting.landscape.name = Толькі альбомны (гарызантальны) р�жым
 setting.shadows.name = Цені
 setting.blockreplace.name = �ўтаматычна� замена блокаў
 setting.linear.name = Лінейна� фільтраванне
 setting.hints.name = Падказкі
-setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
+setting.logichints.name = Лагічны� Падказкі
+setting.backgroundpause.name = Паўза Калі Ў Фоне
 setting.buildautopause.name = �ўтаматычна� прыпыненне будаўніцтва
+setting.doubletapmine.name = Двайныа� П�трычка каб дабываць
+setting.commandmodehold.name = Утрымаць Дл� Р�жыму Загадаў
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = �дключыць Мадыфікацыі Пры Памылковым Запу�ку
 setting.animatedwater.name = �німіраваны� вада
 setting.animatedshields.name = �німіраваны� шчыты
-setting.antialias.name = Згладжванне [lightgray] (патрабуе перазапу�ку)[]
-setting.playerindicators.name = Player Indicators
+setting.playerindicators.name = Індыкатары Гульцоў
 setting.indicators.name = Індыкатары разм�шч�нн� �аюзнікаў і ворагаў
 setting.autotarget.name = �втозахват м�ты
 setting.keyboard.name = Мыш + Упраўленне з клаві�туры
@@ -731,125 +1179,156 @@ setting.touchscreen.name = С�н�арнае кіраванне
 setting.fpscap.name = Мак�імальны FPS
 setting.fpscap.none = �еабмежаваны
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Маштаб кары�тацкага інт�рфей�у [lightgray] (перазапу�ьціцца)[]
+setting.uiscale.name = Маштаб кары�тальніцкага інт�рфей�у [lightgray] (перазапу�ьціцца)[]
+setting.uiscale.description = Каб змены ўжылі�� патрабуецца перазапу�к.
 setting.swapdiagonal.name = Заў�ёды ды�ганальнае разм�шч�нне
-setting.difficulty.training = �авучанне
-setting.difficulty.easy = Лёгка�
-setting.difficulty.normal = �армальны
-setting.difficulty.hard = Складана�
-setting.difficulty.insane = Вар’�цка�
-setting.difficulty.name = Складана�ць:
 setting.screenshake.name = Тра��ніна �крана
+setting.bloomintensity.name = Інт�н�іўна�ць Цвету
+setting.bloomblur.name = Размыты Цвет
 setting.effects.name = Эфекты
 setting.destroyedblocks.name = �длю�троўваць знішчаны� блокі
-setting.blockstatus.name = Display Block Status
+setting.blockstatus.name = Паказаць Стан Блокаў
 setting.conveyorpathfinding.name = Пошук шл�ху дл� ў�таноўкі канвеераў
 setting.sensitivity.name = �дчувальна�ць кантролера
 setting.saveinterval.name = Інт�рвал захаванн�
 setting.seconds = {0} �екунд
-setting.blockselecttimeout.name = Тайм-аўт выбару блока
 setting.milliseconds = {0} мілі�екунд
 setting.fullscreen.name = Поўна�кранны р�жым
-setting.borderlesswindow.name = Безрамочное акно [lightgray] (можа �патр�біцца перазапу�к)
+setting.borderlesswindow.name = Б�зрамачнае акно [lightgray] (можа �патр�біцца перазапу�к)
+setting.borderlesswindow.name.windows = Б�зрамачны Поўны Экран
+setting.borderlesswindow.description = Каб ужыць змены можа патрабавацца перазапу�к.
 setting.fps.name = Паказваць FPS і пінг
-setting.smoothcamera.name = Smooth Camera
+setting.console.name = Уключыць Т�рмінал
+setting.smoothcamera.name = Павольна� Камера
 setting.vsync.name = Вертыкальна� �інхранізацы�
 setting.pixelate.name = Пік�елізацы�
 setting.minimap.name = �длю�троўваць міні-карту
-setting.coreitems.name = Display Core Items (WIP)
+setting.coreitems.name = Паказаць Прадметы Ядра
 setting.position.name = �длю�троўваць каардынаты гульца
+setting.mouseposition.name = Паказаць Пазіцыю Мышы
 setting.musicvol.name = Гучна�ць музыкі
-setting.atmosphere.name = Show Planet Atmosphere
+setting.atmosphere.name = Паказаць �тма�феру Планеты
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Гучна�ць акруж�нн�
 setting.mutemusic.name = Заглушыць музыку
 setting.sfxvol.name = Гучна�ць �фектаў
 setting.mutesound.name = Заглушыць гук
 setting.crashreport.name = �дпраўл�ць ананімны� �праваздачы аб вылетах
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = �ўтаматычнае �твар�нне захаванн�ў
-setting.publichost.name = �гульна� да�тупна�ць гульні
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = �бмежаванне гульцоў
 setting.chatopacity.name = �епразры�та�ць чата
 setting.lasersopacity.name = �епразры�та�ць лазераў �нергазабе�п�ч�нн�
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = �епразры�та�ць ма�тоў
 setting.playerchat.name = �длю�троўваць аблокі чата над гульцамі
-public.confirm = Вы хочаце, каб Ваша гульн� �тала публічнай? \n[accent] Любы гулец зможа далучыцца да Вашым гульн�ў. \n[lightgray] Пазней, г�та можна будзе зм�ніць у �алады-> Игра-> �гульна� да�тупна�ць гульні.
+setting.showweather.name = Паказаць �німацыю �адвор'�
+setting.hidedisplays.name = Схаваць Лагічны� Ды�пл�і
+setting.macnotch.name = �даптуйце інт�рфей� дл� адлю�траванн� выемкі
+setting.macnotch.description = Каб змены ўжылі�� патрабуецца перазапу�к
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Майце на ўвазе, што б�та-вер�і� гульні не можа рабіць гульні публічнымі.
-uiscale.reset = Маштаб кары�тацкага інт�рфей�у быў зменены. \nПажмице «ОК» дл� пацв�рдж�нн� г�тага маштабу. \n[scarlet]Зварот налад і выхад праз [accent]{0}[] �екунд ...
+uiscale.reset = Маштаб кары�тацкага інт�рфей�у быў зменены. \n�аці�ніце «ОК» дл� пацв�рдж�нн� г�тага маштабу. \n[scarlet]Зварот налад і выхад праз [accent]{0}[] �екунд ...
 uiscale.cancel = �дм�ніць & Вый�ці
 setting.bloom.name = Св�ч�нне
-keybind.title = �алада кіраванн�
-keybinds.mobile = [scarlet] Больша�ць камбінацый клавіш тут не працуюць на мабільных прыладах. Падтрымліваецца толькі базавую рух.
+keybind.title = Кіраванне
+keybinds.mobile = [scarlet] Больша�ць камбінацый клавіш тут не працуюць на мабільных прыладах. Падтрымліваецца толькі базавы рух.
 category.general.name = ��ноўнае
 category.view.name = Прагл�д
+category.command.name = Unit Command
 category.multiplayer.name = Сеткава� гульн�
-category.blocks.name = Block Select
-command.attack = �такаваць
-command.rally = Кропка збору
-command.retreat = �д�тупіць
-command.idle = Idle
+category.blocks.name = Выбар Блока
 placement.blockselectkeys = \n[lightgray]Клавіша: [{0},
-keybind.respawn.name = Respawn
-keybind.control.name = Control Unit
+keybind.respawn.name = Пераз�ўленне
+keybind.control.name = Кантрал�ваць �дзінку
 keybind.clear_building.name = �чы�ціць план будаўніцтва
 keybind.press = �аці�ніце клавішу ...
 keybind.press.axis = �аці�ніце во�і або клавішу ...
 keybind.screenshot.name = Скрыншот карты
 keybind.toggle_power_lines.name = �длю�траванне лазераў �нергазабе�п�ч�нн�
-keybind.toggle_block_status.name = Toggle Block Statuses
+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 = Boost
-keybind.schematic_select.name = �браць вобла�ць
-keybind.schematic_menu.name = Меню �хем
-keybind.schematic_flip_x.name = �длю�траваць �хему па во�і X
-keybind.schematic_flip_y.name = �длю�траваць �хему па во�і Y
-keybind.category_prev.name = Пап�р�дні кат�горы�
-keybind.category_next.name = �а�тупна� кат�горы�
-keybind.block_select_left.name = Выбар левага блока
-keybind.block_select_right.name = Выбар правага блока
-keybind.block_select_up.name = Выбар верхн�га блока
-keybind.block_select_down.name = Выбар ніжн�га блока
-keybind.block_select_01.name = Кат�горы�/Выбар блока 1
-keybind.block_select_02.name = Кат�горы�/Выбар блока 2
-keybind.block_select_03.name = Кат�горы�/Выбар блока 3
-keybind.block_select_04.name = Кат�горы�/Выбар блока 4
-keybind.block_select_05.name = Кат�горы�/Выбар блока 5
-keybind.block_select_06.name = Кат�горы�/Выбар блока 6
-keybind.block_select_07.name = Кат�горы�/Выбар блока 7
-keybind.block_select_08.name = Кат�горы�/Выбар блока 8
-keybind.block_select_09.name = Кат�горы�/Выбар блока 9
-keybind.block_select_10.name = Кат�горы�/Выбар блока 10
-keybind.fullscreen.name = Пераключ�нне поўна�краннага р�жыму
+keybind.mouse_move.name = Следаваць За Еур�орам
+keybind.pan.name = Панарамны Прагл�д
+keybind.boost.name = Узл�цець
+keybind.command_mode.name = Р�жым Загадаў
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Перабудаваць Р�гіён
+keybind.schematic_select.name = �браць Вобла�ць
+keybind.schematic_menu.name = Меню Схем
+keybind.schematic_flip_x.name = �длю�траваць Схему Па Во�і X
+keybind.schematic_flip_y.name = �длю�траваць Схему Па Во�і Y
+keybind.category_prev.name = Пап�р�дн�� Кат�горы�
+keybind.category_next.name = �а�тупна� Кат�горы�
+keybind.block_select_left.name = Выбар Левага Блока
+keybind.block_select_right.name = Выбар Правага Блока
+keybind.block_select_up.name = Выбар Верхн�га Блока
+keybind.block_select_down.name = Выбар �іжн�га Блока
+keybind.block_select_01.name = Кат�горы�/Выбар Блока 1
+keybind.block_select_02.name = Кат�горы�/Выбар Блока 2
+keybind.block_select_03.name = Кат�горы�/Выбар Блока 3
+keybind.block_select_04.name = Кат�горы�/Выбар Блока 4
+keybind.block_select_05.name = Кат�горы�/Выбар Блока 5
+keybind.block_select_06.name = Кат�горы�/Выбар Блока 6
+keybind.block_select_07.name = Кат�горы�/Выбар Блока 7
+keybind.block_select_08.name = Кат�горы�/Выбар Блока 8
+keybind.block_select_09.name = Кат�горы�/Выбар Блока 9
+keybind.block_select_10.name = Кат�горы�/Выбар Блока 10
+keybind.fullscreen.name = Поуны Экран
 keybind.select.name = Выбар/Стр�л
-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.diagonal_placement.name = Ды�ганальнае Разм�шч�нне
+keybind.pick.name = �браць Блок
+keybind.break_block.name = Разбурыць Блок
+keybind.select_all_units.name = Выбраць Ў�е �дзінкі
+keybind.select_all_unit_factories.name = Выбраць У�е �дзінкавы� Заводы
+keybind.deselect.name = Зн�ць Вылуч�нне
+keybind.pickupCargo.name = Уз�ць Груз
+keybind.dropCargo.name = Бро�іць Груз
 keybind.shoot.name = Стр�л
 keybind.zoom.name = Маштабаванне
 keybind.menu.name = Меню
 keybind.pause.name = Паўза
-keybind.pause_building.name = Прыпыніць/аднавіць будаўніцтва
+keybind.pause_building.name = Прыпыніць/�днавіць Будаўніцтва
 keybind.minimap.name = Міні-карта
+keybind.planet_map.name = Карта Планеты
+keybind.research.name = Да�ледаванні
+keybind.block_info.name = Інфармацы� Пра Блок
 keybind.chat.name = Чат
 keybind.player_list.name = Спі� гульцоў
 keybind.console.name = Кан�оль
-keybind.rotate.name = Круціць
-keybind.rotateplaced.name = Пав�рнуць і�нае (заці�нуць)
-keybind.toggle_menus.name = Пераключ�нне меню
+keybind.rotate.name = Паварочваць
+keybind.rotateplaced.name = Пав�рнуць І�нае (заці�нуць)
+keybind.toggle_menus.name = Пераключ�нне Меню
 keybind.chat_history_prev.name = Пап�р�д. гі�торы� чата
 keybind.chat_history_next.name = �а�туп. гі�торы� чата
 keybind.chat_scroll.name = Прагортка чата
+keybind.chat_mode.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 = Б��концы� р��ур�ы і н�ма таймера хваль. [gray]Можна �амім выклікаць хвалю.
 mode.editor.name = Р�дактар
@@ -858,47 +1337,100 @@ mode.pvp.description = Змагайце�� �упраць іншых гульц
 mode.attack.name = �така
 mode.attack.description = Знішчыце варожую базу. \n[gray]Дл� гульні патрабуецца чырвонае �дро ​​на карце.
 mode.custom = Кары�тальніцкі� правілы
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Схаваць Забаронены� Блокі
 
 rules.infiniteresources = Б��концы� р��ур�ы (Гулец)
+rules.onlydepositcore = Дазволіць Толькі Д�плананне Ядра
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Выбухі р�актараў
-rules.schematic = Schematics Allowed
+rules.coreincinerates = Ядро Спальвае Р��ур�ы
+rules.disableworldprocessors = �дключыць Прац��ары Свету
+rules.schematic = Схемы Дазволены
 rules.wavetimer = Інт�рвал хвал�ў
+rules.wavesending = �дпраўка Хваль
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Хвалі
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Р�жым атакі
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Мінімальны Размер �траду
+rules.rtsmaxsquadsize = Мак�імальны Размер �траду
+rules.rtsminattackweight = Мінімальна� Вага �такі
+rules.cleanupdeadteams = �чы�ціць Будынкі Знішчанай Каманды (PvP)
+rules.corecapture = Захапіь Ядро Пры ЗніCapture Core On Destruction
+rules.polygoncoreprotection = Шматкутна� �барона Ядра
+rules.placerangecheck = Праверка Вобла�ці Разм�шч�нн�
 rules.enemyCheat = Б��концы� р��ур�ы ІІ (чырвона� каманда)
 rules.blockhealthmultiplier = Множнік здароў� блокаў
-rules.blockdamagemultiplier = Block Damage Multiplier
-rules.unitbuildspeedmultiplier = Множнік хутка�ці вытворча�ці баёў. адз.
-rules.unithealthmultiplier = Множнік здароў� баёў. адз.
-rules.unitdamagemultiplier = Множнік �трат баёў. адз.
+rules.blockdamagemultiplier = Множнік Пашкоджанн� Блокам
+rules.unitbuildspeedmultiplier = Множнік хутка�ці вытворча�ці ба�в. адз.
+rules.unitcostmultiplier = Множыцель Кошту �дзінак
+rules.unithealthmultiplier = Множнік здароў� ба�в. адз.
+rules.unitdamagemultiplier = Множнік �трат ба�в. адз.
+rules.unitcrashdamagemultiplier = Множнік Падрыўнога Пашкоджанн� Юніта
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Множнік Сонечнай Энергіі
+rules.unitcapvariable = Ядра Спры�юць Колька�ці Юнітаў
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = ��ноўна� Колька�ць Юнітаў
+rules.limitarea = �бмежаваць Вобла�ць Мапы
 rules.enemycorebuildradius = Радыу� абароны варожае. �драў: [lightgray] (блок.)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Інт�рвал хваль: [lightgray](�ек)
+rules.initialwavespacing = Пачатковы Інт�рвал Хваль:[lightgray] (�ек)
 rules.buildcostmultiplier = Множнік выдаткаў на будаўніцтва
 rules.buildspeedmultiplier = Множнік хутка�ці будаўніцтва
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Хвалі чакаюць ворагаў
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Радыу� зоны вы�адкі ворагаў: [lightgray] (блокаў)
-rules.unitammo = Units Require Ammo
+rules.unitammo = �дзінкі Патрабуюць Боезапа�
+rules.enemyteam = Варожа� Каманда
+rules.playerteam = Каманда Гульца
 rules.title.waves = Хвалі
 rules.title.resourcesbuilding = Р��ур�ы & будаўніцтва
 rules.title.enemy = Ворагі
-rules.title.unit = Баёў. адз.
-rules.title.experimental = �к�перыментальнай
-rules.title.environment = Environment
+rules.title.unit = Ба�в. адз.
+rules.title.experimental = Эк�перыментальны
+rules.title.environment = ���родзе
+rules.title.teams = Кманды
+rules.title.planet = Планета
 rules.lighting = ��в�тленне
-rules.enemyLights = Enemy Lights
-rules.fire = Fire
-rules.explosions = Block/Unit Explosion Damage
+rules.fog = Туман Вайны
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = �гонь
+rules.anyenv = <Любы>
+rules.explosions = Падрыўны� пашкоджанні Блока/�дзінкі
 rules.ambientlight = �авакольны �вет
 rules.weather = �адвор'е
 rules.weather.frequency = Ча�тата:
+rules.weather.always = Заў�ёды
 rules.weather.duration = Прац�гла�ць:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Р�чывы
 content.liquid.name = Вадка�ці
 content.unit.name = Ба�вы� адзінкі
 content.block.name = Блокі
+content.status.name = Эфекты Стану
+content.sector.name = Сектары
+content.team.name = Фракцыі
+wallore = (Сц�на)
 
 item.copper.name = Медзь
 item.lead.name = Свінец
@@ -916,10 +1448,23 @@ item.blast-compound.name = Выбухова� �уме�ь
 item.pyratite.name = Піратыт
 item.metaglass.name = Металшкло
 item.scrap.name = Металалом
+item.fissile-matter.name = Ра�чапл�льнае Р�чыва
+item.beryllium.name = Берылій
+item.tungsten.name = Вальфрам
+item.oxide.name = �к�ід
+item.carbide.name = Карбід
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = Вада
 liquid.slag.name = Шлак
 liquid.oil.name = �афта
 liquid.cryofluid.name = Кры�генна� вадка�ць
+liquid.neoplasm.name = �аватвор
+liquid.arkycite.name = �ркіцыт
+liquid.gallium.name = Галій
+liquid.ozone.name = �зон
+liquid.hydrogen.name = Вадарод
+liquid.nitrogen.name = �зот
+liquid.cyanogen.name = Цыан
 
 unit.dagger.name = Кінжал
 unit.mace.name = Булава
@@ -942,11 +1487,16 @@ unit.poly.name = Полі
 unit.mega.name = Мега
 unit.quad.name = Квад
 unit.oct.name = Окт
-unit.risso.name = Рі��о
+unit.risso.name = Ры�о
 unit.minke.name = Мінкі
 unit.bryde.name = Брайд
 unit.sei.name = С�й
 unit.omura.name = �мура
+unit.retusa.name = Р�туза
+unit.oxynoe.name = �к�іной
+unit.cyerce.name = Цыерц
+unit.aegires.name = Эгір
+unit.navanax.name = �аванак�
 unit.alpha.name = �льфа
 unit.beta.name = Б�та
 unit.gamma.name = Гамма
@@ -954,14 +1504,36 @@ unit.scepter.name = Скіпетр
 unit.reign.name = Улада
 unit.vela.name = Ветразь
 unit.corvus.name = Корву�
-
-block.resupply-point.name = Ц�нтр аммуніцыі
+unit.stell.name = База
+unit.locus.name = �чаг
+unit.precept.name = Прадпі�анне
+unit.vanquish.name = Пераможнік
+unit.conquer.name = Заваёўвацель
+unit.merui.name = Меруй
+unit.cleroi.name = Клерой
+unit.anthicus.name = �нціку�
+unit.tecta.name = Т�кта
+unit.collaris.name = Калары�
+unit.elude.name = Ухіленне
+unit.avert.name = Захапленне
+unit.obviate.name = За�трашванне
+unit.quell.name = Ку�лл
+unit.disrupt.name = Паруш�нне
+unit.evoke.name = Выклік
+unit.incite.name = Узбудж�нне
+unit.emanate.name = Зыход
+unit.manifold.name = Грузавы Дрон
+unit.assembly-drone.name = Зборачны Дрон
+unit.latum.name = Латум
+unit.renale.name = Р�нал
 block.parallax.name = Парралак�
 block.cliff.name = Скала
-block.sand-boulder.name = П�шчаны валун
+block.sand-boulder.name = П��чаны валун
+block.basalt-boulder.name = Базальтны Валун
 block.grass.name = Трава
-block.slag.name = Шлак
-block.space.name = Space
+block.molten-slag.name = Шлак
+block.pooled-cryofluid.name = Кры�ген
+block.space.name = Пра�тора
 block.salt.name = Соль
 block.salt-wall.name = Сал�на� �ц�на
 block.pebbles.name = Галька
@@ -969,14 +1541,14 @@ block.tendrils.name = Споравы� ву�ікі
 block.sand-wall.name = П�шчана� �ц�на
 block.spore-pine.name = Спорава хво�
 block.spore-wall.name = Спорава� �ц�на
-block.boulder.name = Boulder
+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.spore-moss.name = Споравы мох
 block.shale-wall.name = Сланцава� �ц�на
 block.scrap-wall.name = Сц�на з металалому
 block.scrap-wall-large.name = В�ліка� �ц�на з металалому
@@ -988,42 +1560,47 @@ block.graphite-press.name = Графітны пр��
 block.multi-press.name = Мульты-пр��
 block.constructing = {0} [lightgray](Будуецца)
 block.spawn.name = Кропка з’�ўленн� ворагаў
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Ядро: «��кепак»
 block.core-foundation.name = Ядро: «Штаб»
 block.core-nucleus.name = Ядро: «�там»
-block.deepwater.name = Глубокаводдзе
-block.water.name = Вада
+block.deep-water.name = Глубокаводдзе
+block.shallow-water.name = Вада
 block.tainted-water.name = Забруджанна� вада
-block.darksand-tainted-water.name = Тёмный п��ок з забруджанай вадой
+block.deep-tainted-water.name = Глыбока� забруджана� вада
+block.darksand-tainted-water.name = Цёмны п��ок з забруджанай вадой
 block.tar.name = �афта
 block.stone.name = Камень
-block.sand.name = П��ок
+block.sand-floor.name = П��ок
 block.darksand.name = Тёмны п��ок
 block.ice.name = Лёд
 block.snow.name = Снег
-block.craters.name = Крат�ры
+block.crater-stone.name = Крат�р
 block.sand-water.name = П��ок з вадой
-block.darksand-water.name = Тёмный п��ок з вадой
+block.darksand-water.name = Цёмны п��ок з вадой
 block.char.name = Выпалена� з�мл�
 block.dacite.name = Дацыт
+block.rhyolite.name = Ры�літ
 block.dacite-wall.name = Дацытава� �ц�на
 block.dacite-boulder.name = Дацытавы валун
 block.ice-snow.name = За�нежаны лёд
 block.stone-wall.name = Каменна� �ц�на
 block.ice-wall.name = Л�дова� �ц�на
 block.snow-wall.name = Снежна� �ц�на
-block.dune-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 = �авала �пр�чка
+block.spore-cluster.name = Спарава� гронка
 block.metal-floor.name = Металічна� падлога 1
 block.metal-floor-2.name = Металічна� падлога 2
 block.metal-floor-3.name = Металічна� падлога 3
-block.metal-floor-5.name = Металічна� падлога 4
+block.metal-floor-4.name = Металічна� падлога 4
+block.metal-floor-5.name = Металічна� падлога 5
 block.metal-floor-damaged.name = Пашкоджана� металічна� падлога
 block.dark-panel-1.name = Цёмна� пан�ль 1
 block.dark-panel-2.name = Цёмна� пан�ль 2
@@ -1032,7 +1609,7 @@ block.dark-panel-4.name = Цёмна� пан�ль 4
 block.dark-panel-5.name = Цёмна� пан�ль 5
 block.dark-panel-6.name = Цёмна� пан�ль 6
 block.dark-metal.name = Цёмны метал
-block.basalt.name = Basalt
+block.basalt.name = Базальт
 block.hotrock.name = Гарачы камень
 block.magmarock.name = Магмавы камень
 block.copper-wall.name = Медна� �ц�на
@@ -1049,31 +1626,32 @@ block.door.name = Дзверы
 block.door-large.name = В�лікi� дзверы
 block.duo.name = Двайна� тур�ль
 block.scorch.name = �бпальшчык
-block.scatter.name = Ра��ейвальнік
+block.scatter.name = льнік
 block.hail.name = Град
 block.lancer.name = Капейшчык
 block.conveyor.name = Канвеер
 block.titanium-conveyor.name = Тытанавы канвеер
 block.plastanium-conveyor.name = Пла�танавы канвеер
 block.armored-conveyor.name = Браніраваны канвеер
-block.armored-conveyor.description = Перам�шчае прадметы з той жа хутка�цю, што і тытанавы� канвееры, але валодае большай бранёй. �е прымае на ўваход з бакоў ні ад чаго акрам� �к ад іншых канвеераў.
 block.junction.name = Перакро�так
 block.router.name = Маршрутызатар
 block.distributor.name = Размеркавальнік
 block.sorter.name = Сартавальнік
 block.inverted-sorter.name = Інвертаваны �артавальнік
 block.message.name = Паведамленне
+block.reinforced-message.name = Узмоцненнае Паведамленне
+block.world-message.name = Паведамленне Свету
+block.world-switch.name = World Switch
 block.illuminator.name = ��в�тл�льнік
-block.illuminator.description = Маленькі, кампактны, �кі наладжвае крыніцу �в�тла. Патрабуецца �нергі� дл� працы.
 block.overflow-gate.name = Залішнi затвор
 block.underflow-gate.name = Залішнi шлюз
 block.silicon-smelter.name = Кр�мн�вы плавільны завод
 block.phase-weaver.name = Фазавы ткач
 block.pulverizer.name = Здрабн�льнік
-block.cryofluid-mixer.name = Мешалка кры�геннай вадка�ці
+block.cryofluid-mixer.name = Змешвалка кры�геннай вадка�ці
 block.melter.name = Плавільн�
-block.incinerator.name = Му�ара�жыгатель
-block.spore-press.name = Споравы пр��
+block.incinerator.name = Му�ара�пальвальік
+block.spore-press.name = Спаравы пр��
 block.separator.name = �длучнік
 block.coal-centrifuge.name = Вугальна� ц�нтрыфуга
 block.power-node.name = Сілавы вузел
@@ -1102,12 +1680,12 @@ block.power-source.name = Крыніца �нергіі
 block.unloader.name = Разгрузчык
 block.vault.name = Сховішча
 block.wave.name = Хвал�
-block.tsunami.name = Tsunami
+block.tsunami.name = Цунамі
 block.swarmer.name = Ра�вiк
 block.salvo.name = Залп
 block.ripple.name = Рабь
 block.phase-conveyor.name = Фазавы канвеер
-block.bridge-conveyor.name = Ма�тавой канвеер
+block.bridge-conveyor.name = Ма�тавы канвеер
 block.plastanium-compressor.name = Пла�танавы кампр��ар
 block.pyratite-mixer.name = М�шалка пiратыту
 block.blast-mixer.name = М�шалка выбуховай �уме�і
@@ -1115,20 +1693,22 @@ block.solar-panel.name = Сонечна� пан�ль
 block.solar-panel-large.name = В�ліка� �онечна� пан�ль
 block.oil-extractor.name = �афтава� вышка
 block.repair-point.name = Рамонтны пункт
+block.repair-turret.name = Рамонтна тур�ль
 block.pulse-conduit.name = Імпуль�ны трубаправод
 block.plated-conduit.name = Умацаваны трубаправод
 block.phase-conduit.name = Фазавы трубаправод
 block.liquid-router.name = Вадка�ны маршрутызатар
 block.liquid-tank.name = Вадка�ны бак
-block.liquid-junction.name = Вадка�ны перакрыжаванне
+block.liquid-container.name = Вадка�ны кант�йнер
+block.liquid-junction.name = Вадка�ны перакрыжавальнік
 block.bridge-conduit.name = Ма�тавы трубаправод
 block.rotary-pump.name = Ротарны на�о�
 block.thorium-reactor.name = Торы�вы р�актар
 block.mass-driver.name = Электрамагнітна� катапульта
 block.blast-drill.name = Паветрана� бурава� ў�таноўка
-block.thermal-pump.name = Т�рмальны на�о�
+block.impulse-pump.name = Т�рмальны на�о�
 block.thermal-generator.name = Т�рмальны генератар
-block.alloy-smelter.name = Плавільн� кін�тычнага �плаву
+block.surge-smelter.name = Плавільн� кін�тычнага �плаву
 block.mender.name = Р�генератар
 block.mend-projector.name = В�лiкi р�генератар
 block.surge-wall.name = Сц�на з кін�тычнага �плаву
@@ -1142,12 +1722,12 @@ block.arc.name = Дуга
 block.rtg-generator.name = Радыеізатопны т�рма�лектрычны генератар
 block.spectre.name = Спектр
 block.meltdown.name = І�пеп�ліцель
-block.foreshadow.name = Foreshadow
+block.foreshadow.name = Прадве�це
 block.container.name = Кант�йнер
 block.launch-pad.name = Пу�кава� пл�цоўка
-block.launch-pad-large.name = В�ліка� пу�кава� пл�цоўка
-block.segment.name = Segment
-block.command-center.name = Каммандны ц�нтр
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.name = Сегмент
 block.ground-factory.name = Завод наземных адзінак
 block.air-factory.name = Завод паветраных адзінак
 block.naval-factory.name = Завод мар�кіх адзінак
@@ -1155,82 +1735,339 @@ 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.payload-conveyor.name = Грузавы Канвеер
+block.payload-router.name = Грузавы Маршрутызатар
+block.duct.name = Канал
+block.duct-router.name = Канальны Маршрутызатар
+block.duct-bridge.name = Канальны Мо�т
+block.large-payload-mass-driver.name = В�лікі Грузавы Кіроўца Ма��
+block.payload-void.name = Выгрузачны Вакуум
+block.payload-source.name = Выгрузачна� Крыніца
 block.disassembler.name = Разборшчык
 block.silicon-crucible.name = Кр�мніевы тыгель
 block.overdrive-dome.name = Сверхпрывадны купал
+block.interplanetary-accelerator.name = Міжпланетны Па�каральнік
+block.constructor.name = Кан�труктар
+block.constructor.description = Стварае збудаванні да 2x2 плітак размерам.
+block.large-constructor.name = В�лікі Кан�труктар
+block.large-constructor.description = Стварае збудаванні да 4x4 плітак размерам.
+block.deconstructor.name = Д�кан�труктар
+block.deconstructor.description = Д�кан�труюе збудаванні і адзінкі. В�ртае 100% ад кошту збокрі.
+block.payload-loader.name = Загрузчык
+block.payload-loader.description = Загружае вадка�ці і прадметы ў блокі.
+block.payload-unloader.name = Выгрузчык
+block.payload-unloader.description = Выгружае вадка�ці і прадметы з блокаў.
+block.heat-source.name = Крыніца Ц�пла
+block.heat-source.description = Блок 1x1 �кі дае віртуальнае б��концае ц�пло.
+block.empty.name = Пу�ты
+block.rhyolite-crater.name = Ры�літавы Кратар
+block.rough-rhyolite.name = Грубы Ры�літ
+block.regolith.name = Р�галіт
+block.yellow-stone.name = Жоўты Камень
+block.carbon-stone.name = Вугл�родны Камень
+block.ferric-stone.name = Жалезны Камень
+block.ferric-craters.name = Жалезны� Кратары
+block.beryllic-stone.name = Берыліевы Камень
+block.crystalline-stone.name = Крыштальны Камень
+block.crystal-floor.name = Крыштальнае Пакрыццё
+block.yellow-stone-plates.name = Жоўты� Камменны� Пла�ціны
+block.red-stone.name = Чырвоны Камень
+block.dense-red-stone.name = Шчыльны Кра�ны Камень
+block.red-ice.name = Чырвоны Лёд
+block.arkycite-floor.name = �ркіцытнае Пакрыццё
+block.arkyic-stone.name = �ркіцытны Камень
+block.rhyolite-vent.name = Ры�літавы Гейзер
+block.carbon-vent.name = Вугл�родны Гейзер
+block.arkyic-vent.name = �ркіцытны Гейзер
+block.yellow-stone-vent.name = Жоутакаменны Гейзер
+block.red-stone-vent.name = Чырвонакаменны Гейзер
+block.crystalline-vent.name = Крыштальны Гейзер
+block.redmat.name = Кра�на� Глеба
+block.bluemat.name = Сін�� Глеба
+block.core-zone.name = Зона Ядра
+block.regolith-wall.name = Сц�на З Р�гі�літу
+block.yellow-stone-wall.name = Сц�на З Жоўтага Камню
+block.rhyolite-wall.name = Сц�на З Ры�літу
+block.carbon-wall.name = Сц�на З Вугл�роду
+block.ferric-stone-wall.name = Сц�на З Жалезнага Камню
+block.beryllic-stone-wall.name = Сц�на З Берыліевага Камню
+block.arkyic-wall.name = Сц�на З �ркіцыту
+block.crystalline-stone-wall.name = Сц�на З Крыштальнага Камню
+block.red-ice-wall.name = Сц�на З Чырвонага Ільду
+block.red-stone-wall.name = Сц�на З Чырвонага Камн�
+block.red-diamond-wall.name = Сц�на З Кра�нага Кры�талу
+block.redweed.name = Кра�нацвет
+block.pur-bush.name = Фі�летавы Ку�т
+block.yellowcoral.name = Жоуты Карал
+block.carbon-boulder.name = Вугл�родны Валун
+block.ferric-boulder.name = Жалезны Валун
+block.beryllic-boulder.name = Берылі�вы Валун
+block.yellow-stone-boulder.name = Валун З Жоўтага Камню
+block.arkyic-boulder.name = �ркіцытны Валун
+block.crystal-cluster.name = Кры�тальны Кла�тар
+block.vibrant-crystal-cluster.name = Яркі Кры�тальны Кла�тар
+block.crystal-blocks.name = Кры�тальны� Блокі
+block.crystal-orbs.name = Кры�тальны� Шары
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Валун З Чырвонага Ільда
+block.rhyolite-boulder.name = Ры�літны Валун
+block.red-stone-boulder.name = Валун З Чырвонага Камн�
+block.graphitic-wall.name = Графітна� Сц�на
+block.silicon-arc-furnace.name = Кр�мнева� Дугава� Печ
+block.electrolyzer.name = Электраліз�р
+block.atmospheric-concentrator.name = �тма�ферны Канц�нтратар
+block.oxidation-chamber.name = Камера �к�ідацыі
+block.electric-heater.name = Электрычны �агравацель
+block.slag-heater.name = Шлакавы �агравацель
+block.phase-heater.name = Фазавы �агравацель
+block.heat-redirector.name = Перанакіроўшчык Ц�пла
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Маршрутызатар Ц�пла
+block.slag-incinerator.name = Шлакавы Спальвальнік
+block.carbide-crucible.name = Карбідны Тыгель
+block.slag-centrifuge.name = Шлакава� Ц�нтрыфуга
+block.surge-crucible.name = Імпуль�ны Тыгель
+block.cyanogen-synthesizer.name = Cінт�затар Цыана
+block.phase-synthesizer.name = Сінт�затар Фазы
+block.heat-reactor.name = Цеплавы Р�актар
+block.beryllium-wall.name = Берыліева� Сц�на
+block.beryllium-wall-large.name = В�ліка� Берыліева� Сц�на
+block.tungsten-wall.name = Вальфрамава� Сц�на
+block.tungsten-wall-large.name = В�ліка� Вальфрамава� Сц�на
+block.blast-door.name = Імпуль�на� Дзвер
+block.carbide-wall.name = Карбідна� Сц�на
+block.carbide-wall-large.name = В�ліка� Карбідна� Сц�на
+block.reinforced-surge-wall.name = Узмоцненна� Імпуль�на� Сц�на
+block.reinforced-surge-wall-large.name = В�ліка� Узмоцненна� Імпуль�на� Сц�на
+block.shielded-wall.name = Экранавана� Сц�на
+block.radar.name = Радар
+block.build-tower.name = Будуюча� Башн�
+block.regen-projector.name = Р�генеруючы Праектар
+block.shockwave-tower.name = Ударнаваўнава� Башн�
+block.shield-projector.name = Шчытавы Праектар
+block.large-shield-projector.name = В�лікі Шчвтавы Праектар
+block.armored-duct.name = Браніраваны Канал
+block.overflow-duct.name = Злішні Канал
+block.underflow-duct.name = Злішні Шлюзавы Канал
+block.duct-unloader.name = Канальны Разгрузчык
+block.surge-conveyor.name = Імпуль�ны Канвеер
+block.surge-router.name = Імпуль�ны Маршрутызатар
+block.unit-cargo-loader.name = Загрузчык Грузавых �дзінкаў
+block.unit-cargo-unload-point.name = Пункт Разгрузчыку Грузавых �дзінкаў
+block.reinforced-pump.name = Узмоцнена� Помпа
+block.reinforced-conduit.name = Узмоцнены Трубаправод
+block.reinforced-liquid-junction.name = Узмоцненае Вадка�нае Злуч�нне
+block.reinforced-bridge-conduit.name = Узмоцнены Ма�тавы Трубаправод
+block.reinforced-liquid-router.name = Узмоцнены Вадка�ны Маршрутызатар
+block.reinforced-liquid-container.name = Узмоцнены Вадка�ны Кант�йнер
+block.reinforced-liquid-tank.name = Узмоцнены Вадка�ны Бак
+block.beam-node.name = Прам�нёвы Вузел
+block.beam-tower.name = Прам�нёва� Башн�
+block.beam-link.name = Прам�нёвае Злуч�нне
+block.turbine-condenser.name = Канд�н�атар Турбіны
+block.chemical-combustion-chamber.name = Хімічна� Камера Згаранн�
+block.pyrolysis-generator.name = Генератар Піролізу
+block.vent-condenser.name = Вентыл�цыйны Канд�н�атар
+block.cliff-crusher.name = Здрабн�льнік Скал
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Плазменны Бур
+block.large-plasma-bore.name = В�лікі Плазменны Бур
+block.impact-drill.name = Ударна� Бурава� У�талёўка
+block.eruption-drill.name = Выв�ргаюча� Бурава� У�талёўка
+block.core-bastion.name = Ядро Ба�тыён
+block.core-citadel.name = Ядро Цытад�ль
+block.core-acropolis.name = Ядро �кропаль
+block.reinforced-container.name = Узмоцнены Кант�йнер
+block.reinforced-vault.name = Узмоцнены Склеп
+block.breach.name = Паруш�нне
+block.sublimate.name = Узвыш�нне
+block.titan.name = Тытан
+block.disperse.name = Разыход
+block.afflict.name = Пакута
+block.lustre.name = Бле�к
+block.scathe.name = Параж�нне
+block.tank-refabricator.name = Р�фабрыкатар Танкаў
+block.mech-refabricator.name = Р�фабрыкатар М�хоў
+block.ship-refabricator.name = Р�фабрыкатар Суднаў
+block.tank-assembler.name = Зборшчык Танкаў
+block.ship-assembler.name = Зборшчык Суднаў
+block.mech-assembler.name = Зборшчык М�хоў
+block.reinforced-payload-conveyor.name = Узмоцнены Выгрузачны Кант�йнер
+block.reinforced-payload-router.name = Узмоцнены Выгрузачны Кант�йнер
+block.payload-mass-driver.name = Выгрузачны Кіроўца Ма��
+block.small-deconstructor.name = Маленькі Д�кан�труктар
+block.canvas.name = Палатно
+block.world-processor.name = Прац��ар Свету
+block.world-cell.name = Клетка Свету
+block.tank-fabricator.name = Фабрыкатар Танкаў
+block.mech-fabricator.name = Фабрыкатар М�хоў
+block.ship-fabricator.name = Фабрыкатар Суднаў
+block.prime-refabricator.name = Галоўны Р�фабрыкатар
+block.unit-repair-tower.name = Башн� Рамонту �дзінак
+block.diffuse.name = Дзіфуз
+block.basic-assembler-module.name = ��ноўны Сборачны Модуль
+block.smite.name = Кара
+block.malign.name = Злоба
+block.flux-reactor.name = Патокавы Р�актар
+block.neoplasia-reactor.name = �аватворны Р�актар
 
 block.switch.name = Пераключальнік
-block.micro-processor.name = Мікропрац��ар
-block.logic-processor.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 = Чырвона�
+block.large-logic-display.name = В�лікі Экран
+block.memory-cell.name = Яч�йка Пам�ці
+block.memory-bank.name = Блок Пам�ці
+team.malis.name = Малі�
+team.crux.name = Сутна�ць
 team.sharded.name = ��кепакава�
-team.orange.name = �ранжава�
-team.derelict.name = Пакінута�
-team.green.name = Зелёна�
-team.purple.name = Фі�летава�
+team.derelict.name = Пакінуты�
+team.green.name = Зелёны�
+team.blue.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} медзі
-tutorial.drill = Ручна� здабыча не з'�ўл�ецца �фектыўнай. \n[accent]Свідры[] могуць здабываць аўтаматычна. \n�ажмите на ўкладку з вы�вай �вердзела знізу �права. \nВыберите [accent] механічны �відар[]. Разме�ціце �го на меднай жыле наці�кам. \n[accent]�аці�к па правай кнопцы[] перарве будаўніцтва.
-tutorial.drill.mobile = Ручна� здабыча не з'�ўл�ецца �фектыўнай. \n [accent] Свідры[] могуць здабываць аўтаматычна. \n�ажмите на ўкладку з вы�вай �вердзела знізу �права. \nВыберите [accent] механічны �відар[]. \nРазме�тите �го на меднай жыле наці�кам, затым наці�ніце [accent] белую каўку[] ніж�й, каб пацвердзіць пабудова вылучаны. \n�ажмите [accent] кнопку X[], каб адм�ніць разм�шч�нне.
-tutorial.blockinfo = Кожны блок мае розны� характары�тыкі. Кожна� дрыль можа здабываць п�ўны� руды. \nКаб даведацца інфармацыю аб блоку і аб �го характары�тыках, [accent] наці�ніце на «?», Калі ён выбраны ў меню будаўніцтва.[] \n[accent] Зараз, даведайце�� характары�тыкі механічнага �відра.[]
-tutorial.conveyor = [accent] Канвееры[] выкары�тоўваюцца дл� тран�парціроўкі р��ур� выкары�тоў у �дро. \nСделайте лінію канвеераў ад �відра да �дра \n [accent] Ўтрымлівайце левую кнопку мышы, каб разм��ціць у лінію.[] \nУдерживайте [accent] CTRL[] пры пабудове лініі блокаў, каб зрабіць �е ды�ганальнай \n [accent] Разме�ціце 2 канвеера ў лінію і да�таўце прадметы ў �дро.
-tutorial.conveyor.mobile = [accent] Канвееры[] выкары�тоўваюцца дл� тран�парціроўкі р��ур�аў у �дро ​​\nСделайте лінію канвеераў ад �відра да �дра \n [accent] Зрабіце лінію, утрымліваючы палец некалькі �екунд у тым ме�цы, у �кім Вы хочаце пачаць лінію, [ ] і Перац�гні �го ў патр�бным кірунку. [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 [accent] �аці�ніце ПР�БЕЛ дл� прыпыненн� гульні.
-tutorial.pause.mobile = Падча� бітвы, Вы можаце [accent] прыпыніць гульню.[] \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.withdraw = У некаторых �ітуацы�х, неабходна забраць прадметы з блокаў ўручную. \nКаб зрабіць г�та, [accent] наці�ніце на блок[], у �кім знаходз�цца прадметы, затым [accent] наці�ніце на прадмет[] ў інвентары. \nМожно забраць некалькі прадметаў [accent] наці�кам з заці�кам[].\n [accent] Заб�рыце трохі медзі з �дра[]
-tutorial.deposit = Пакладзеце прадметы ў блок, перац�гнуўшы іх ад �вайго карабл� ў патр�бны блок. \n \n [accent] Перан��іце медзь назад у �дро []
-tutorial.waves = [lightgray] Праціўнікі[] набліжаюцца. \nЗащіціце �дро ​​ад двух хваль. Выкары�тоўвайце [accent] левую кнопку мышы[] дл� �тральбы. \nПо�тройте больш тур�л�ў і бураў. Добудьте больш медзі.
-tutorial.waves.mobile = [lightgray] Праціўнікі[] набліжаюцца. \n \nЗащіціце �дро ​​ад двух хваль. Ваш карабель будзе аўтаматычна атакаваць праціўніка. \nПо�тройте больш тур�л�ў і бураў. Добудьте больш медзі.
-tutorial.launch = Калі Вы да��гаеце п�ўнай хвалі, Вы можаце ажыцц�віць [accent] запу�к �дра[], пакінуўшы базу і [accent] перане�ці р��ур�ы з �дра.[] \nЭти р��ур�ы могуць быць выкары�таны дл� вывуч�нн� новых т�хналогій.\n [accent] �аці�ніце кнопку запу�ку.
+hint.skip = Прапу�ціць
+hint.desktopMove = Выкары�тоўвайце [accent][[WASD][] каб рухацца.
+hint.zoom = [accent]Пракручваць[] каб прыблізіць і аддаліць камеру.
+hint.desktopShoot = [accent][[Левы-п�трык][] каб �трал�ць.
+hint.depositItems = Каб перане�ці прадметы, перан��іце іх �а �вайго карабл� на �дро.
+hint.respawn = Каб аднавіць карабель, наці�ніце [accent][[V][].
+hint.respawn.mobile = Вы зм�нілі кантроль на адзінку/�труктуру. Каб аднавіць карабель, [accent]наці�ніце на іконку адзінкі зверху злева.[]
+hint.desktopPause = �аці�ніце [accent][[Space][] каб прыпыніць і аднавіць гульню.
+hint.breaking = [accent]Правы-п�трык[] і утрымаць как разбурыць блокі.
+hint.breaking.mobile = �ктывуйце \ue817 [accent]малаток[] унізе �права і наці�ніце, каб разабраць блок.\n\nУтрымайце палец адну �екунду і прав�дзіце как вызначыць вобла�ць �кую жадаеце разабраць.
+hint.blockInfo = Прагл�дзець інфармацыю пра блок выбіраючы �го ў [accent]меню будаўніцтва[], па�л� выберыце [accent][[?][] кнопку �права.
+hint.derelict = [accent]Пакінуты�[] �труктуры г�та разрбураны� ча�ткі �тарой базы �кі� больш не функцы�нуюць.\n\nГ�ты� �труктуры могуць быць [accent]разабраны[] на р��ур�ы.
+hint.research = Выкары�тоўвайце кнопку \ue875 [accent]Да�ледаванні[] каб да�ледаваць новую т�хналогію.
+hint.research.mobile = Выкары�тоўвайце кнопку \ue875 [accent]Да�ледаванні[] ў \ue88c [accent]Меню[] каб да�ледаваць новую т�хналогію.
+hint.unitControl = Зажміце [accent][[Левы-ctrl][] і [accent]п�трык[] каб кантрал�ваць дружалюбнай адзінкай або тур�л�й.
+hint.unitControl.mobile = [accent][[Двайны-наці�к][] каб кантрал�ваць дружалюбнай адзінкай або тур�л�й.
+hint.unitSelectControl = Каб кіраваць адінкамі, адкройце [accent]р�жым загадаў[] утрымліва� [accent]Левы-shift.[]\nУ р�жыме загадаў, наці�ніце і утрымайце каб выбраць адзінкі. [accent]Правы-п�трык[] на а'бект каб задаць м�ту або шл�х.
+hint.unitSelectControl.mobile = Каб кантрал�ваць адінкамі, адкройце [accent]р�жым загадаў[] наці�каючы кнопку [accent]загадваць[] у унізе злева.\nУ р�жыме загадаў, утрымайце і прав�дзіце каб выбраць адзінкі. �аці�ніце на а'бект каб задаць м�ту або шл�х.
+hint.launch = Калі р��ур�ы �абраны, вы можаце [accent]Запу�ціць[] выбіраючы �ектара �кі� знаходз�цца побач на \ue827 [accent]Карце[] унізе �права.
+hint.launch.mobile = Калі р��ур�ы �абраны, вы можаце [accentЗапу�ціць[] выбіраючы �ектара �кі� знаходз�цца побач на \ue827 [accent]Карце[] ў \ue88c [accent]Меню[].
+hint.schematicSelect = Утрымайце [accent][[F][] і прац�гніце каб выбраць блокі дл� капі�ванн� і ў�таўкі.\n\n[accent][[С�р�дні П�трык][] каб �капі�ваць толькі адзін тып блоку.
+hint.rebuildSelect = Утрымайце [accent][[B][] і прац�гніце каб выбраць блокі дл� разбудаванн�.\nГ�та перабудуе іх аўтаматычна.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Утрымайце [accent][[Левы Ctrl][] калі правозіце канвееры каб аутаматычна згенераваць шл�х.
+hint.conveyorPathfind.mobile = Уключыце \ue844 [accent]ды�ганальны р�жым[] і утрымлівайце і разм�шчайце канвееры па аўтаматычна згенераванаму шл�ху.
+hint.boost = Утрымайце [accent][[Левы Shift][] каб л�цець праз перашкоды з вашай выбранай адзінкай.\n\nТолькі некаторы� наземны� адзінкі могуць узл�таць.
+hint.payloadPickup = �аці�ніце каб [accent][[[] каб уз�ць малнькі� блокі або адзінкі.
+hint.payloadPickup.mobile = [accent]�аці�ніце і утрымайце[] маленькі блок або адзінку каб уз�ць г�та.
+hint.payloadDrop = �аці�ніце [accent]][] каб збро�іць груз.
+hint.payloadDrop.mobile = [accent]�аці�ніце і ўтрымайце[] пу�тое ме�ца каб збро�іць груз тут.
+hint.waveFire = Тур�лі [accent]Хвал�[] заражаны� вадой будуць тушыць полым� побач.
+hint.generator = \uf879 [accent]Генератары Згаранн�[] падпальваюць вугаль і перанакіраванне �нергію �у�еднім блокам.\n\nРадыю� перадачы �нергіі можа быць пашыраны з дапамогай \uf87f [accent]Энергетычных Вузлоў[].
+hint.guardian = �дзінкі [accent]Вартаўнік[] браніраваны�. Слабы� патроны такі� �к [accent]Медзь[] і [accent]Свінец[] [scarlet]не �фетўны�[].\n\nВыкары�тоўвайце больш моцны� тур�лі або \uf835 [accent]Графіт[] у \uf861Двайных Тур�л�х/\uf859Залпах каб знішчыць Вартаўніка.
+hint.coreUpgrade = Ядра могуць быць палепшаны [accent]разм�шч�ннем больш моцных паверх другіх[].\n\nРазм��ціце �дро \uf868 [accent]Штаб[] паверх �дра \uf869 [accent]��кепак[]. Пераканайце��, што г�та �вабодна ад кан�трукцый побач.
+hint.presetLaunch = Серы� [accent]�ектара зоны па�адкі[], такі� �к [accent]Ледз�ны Ле�[], можна запу�ціць з любога ме�ца. Яны не патрабуюць захапл�ць т�рыторыі побач.\n\n[accent]Пранумараваны� �ектары[], такі� �к г�ты, [accent]неабав�зковы�[].
+hint.presetDifficulty = �а г�тым �ектары [scarlet]в�лікі узровень впрожай пагрозы[].\nЗапу�к на такі� �ектары [accent]не р�камендуецца[] без належнай т�хналогіі і падрыхтоўкі.
+hint.coreIncinerate = Па�л� таго �к ёмі�та�ць �дра запоўніцца прадметам, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = Каб у�тал�ваць фабрыке адзінак [accent]шл�х[], наці�ніце на блок фабрыку ў р�жыме камандаванн�, па�л� нажміце на ме�ца правай кнопкай� мышкі.\nСтвораны� адзінкі будуць аўтаматычна рухацца �юды.
+hint.factoryControl.mobile = Каб у�тал�ваць фабрыке адзінак [accent]шл�х[], наці�ніце на блок фабрыку ў р�жыме камандаванн�, па�л� наці�ніце на ме�ца.\nСтвораны� адзінкі будуць аўтаматычна рухацца �юды.
+gz.mine = Рухайце�� да \uf8c4 [accent]меднай руды[] на з�млі і наці�ніце на �е каб пачаць дабываць.
+gz.mine.mobile = Рухайце�� да \uf8c4 [accent]меднай руды[] на з�млі і дакраніце�� да �е каб пачаць дабываць.
+gz.research = �дчыніце \ue875 др�ва т�хналогій.\nДа�ледуйце \uf870 [accent]Механічны Бур[], па�л� выберыце �го ў ніжнім правым меню.\n�ажміце на руду каб разм��ціць.
+gz.research.mobile = �дкройце \ue875 др�ва т�хналогій.\nДа�ледуйце \uf870 [accent]Механічны Бур[], па�л� выберыце �го ў ніжнім правым меню.\n�аці�ніце на залежы медзі каб разм��цічь бур.\n\n�аці�ніце на конпку \ue800 [accent]падцвердзіць[] у нізе �права каб падцвердзіць.
+gz.conveyors = Да�ледуйце і разма�ціце \uf896 [accent]канвееры[] каб рухаць дабыты� р��ур�ы\nад буроў да �дра.\n\n�ажміце і прав�дзіце каб разм��ціць некалькі канвеераў.\n[accent]Пракручваць[] каб паварочваць аб'ект.
+gz.conveyors.mobile = Да�ледуйце і разма�ціце \uf896 [accent]канвееры[] каб рухаць дабыты� р��ур�ы\nад буроў да �дра.\n\nУтрымайце ваш палец адну �екнду і прав�дзіце каб разм��ціць некалькі канвеераў.
+gz.drills = Пашырайце аперацыю здабычы.\nРазм��ціце больш Механічных Буроў.\nЗдабудзьце 100 медзі.
+gz.lead = \uf837 [accent]Свінец[] г�та другі звычайны ў выкары�танні р��ур�.\nПа�таўце буры каб здабываць �го.
+gz.moveup = \ue804 Перайдзіце да на�тупных м�т.
+gz.turrets = Да�ледуйце і разм��ціце 2 \uf861 [accent]Двайны� тур�лі[] каб абаран�ць �дро.\nДвайны� тур�лі патрабуюць \uf838 [accent]�нарады[] падведзены� канвеерамі.
+gz.duoammo = Зарадзіце Двайны� тур�лт [accent]меддзю[], выкары�тоўваючы канвееры.
+gz.walls = [accent]Сцены[] могуць �трымліваць ад пашкоджанн�ў другі� блокі .\nРазм��ціце \uf8ae [accent]медны� �цены[] вакол тур�лей.
+gz.defend = Ворагі на падыходзе, прыгатуйце�� да аховы.
+gz.aa = Паветранны� адзінкі не про�та знішчыць звычайнымі тур�л�мі.\n\uf860 [accent]Тур�лі льнік[] моцны� ў �упраць-паветраннай ахове, патрабуюць \uf837 [accent]�вінец[] у �ка�ці боепрыпа�аў.
+gz.scatterammo = Зараджайче тур�лі льнік [accent]�вінцом[], выкары�тоўваючы канвееры.
+gz.supplyturret = [accent]Грузава� Тур�ль
+gz.zone1 = Г�та вобла�ць з�ўленн� ворага.
+gz.zone2 = У�ё што па�троена ў г�тай вобла�цт будзе знішчана калі пачанецца хвал�.
+gz.zone3 = Хвал� амаль пачала��.\nПрыгатуйце��.
+gz.finish = Пабудуйце больш тур�л�ў, дабудзьце больш р��ур�аў,\nі вытрывайце ад у�е хвалі каб [accent]захапіць г�ты �ектар[].
+onset.mine = �ажміце каб дабываць \uf748 [accent]берылій[] �а �цен.\n\nВыкары�тоўвайце [accent][[WASD] каб рухацца.
+onset.mine.mobile = �аці�ніце каб дабываць \uf748 [accent]берылій[] �а �цен.
+onset.research = �дчыніце \ue875 др�ва т�хналогій.\nДа�ледуйце, а па�л� разм��ціце \uf870 [accent]Турбінны Канд�н�атар[], на гейзеры.\n�н будзе генераваць [accent]�нергію[].
+onset.bore = Да�ледуйце і разм��ціце \uf870 [accent]Плазменны Бур[]. \n�н будзе аўтаматычна дабываць р��ур�ы �а �цен.
+onset.power = Каб падлучыць [accent]�нергію[] да плазменнага бура, да�ледуйце і разм��ціце \uf73d [accent]�нергетычна� вузлы[].\nЗлучыце турбінны канд�н�атар з плазменным буром.
+onset.ducts = Да�ледуйце і разм��ціце \uf799 [accent]каналы[] каб перам�шчаць дабыты� р��уры ад плазменных буроў у �дро.\n�ажміце і утрымайце каб раўм��ціць больш каналаў.\n[accent]Пракручваць[] каб паварочваць.
+onset.ducts.mobile = Да�ледуйце і разм��ціце \uf799 [accent]каналы[] каб перам�шчаць дабыты� р��уры ад плазменных буроў у �дро.\n\nУтрымлівайце ваш палец адну �екнд і прав�дзіце каб разм��ціць больш каналаў.
+onset.moremine = Пашырайце дабываючую прамы�лова�ць.\nРазм��ціце больш Плазменных Буроўmore і выкары�тоўвайце прам�нёвы� вузлы і каналы каб падтрымліваць прамы�лова�ць.\nДабудзьце 200 берылі�.
+onset.graphite = Патрабуецца больш комплек�ных блокаў \uf835 [accent]графіта[].\nРазм��ціце плазменны� буры каб дабываць графіт.
+onset.research2 = Пачніце да�ледаваць [accent]фабрыкі[].\n Да�ледуйце \uf74d [accent]Здр crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Зажміце [accent]shift[] каб увай�ці ў [accent]р�жым камандаванн�[].\n[accent]Лева� Кнопка Мышкі і прац�гнуць[] каб выбраць адзінкі.\n[accent]Права� Кнопка Мышкі[] каб камандаваць выбранымі адзінкамі каб рухаць або атакаваць.
+onset.commandmode.mobile = �аці�ніце на кнопку [accent]Камандаванн�[] каб увай�ці ў [accent]р�жым камандаванн�[].\nУтрамайце палец, па�л� [accent]праве�ці[] да выбраных адзінак.\n[accent]�аці�ніце[] каб камандаваць выбранымі адзінкамі каб рухаць або атакаваць.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Самы а�ноўны будаўнічы мат�ры�л. Шырока выкары�тоўваецца ва ў�іх тыпах блокаў.
+item.copper.details = Медзь. �намальна ра�паў�юджаны метал на Серпуло. Структурна �лабы калі не ўмацаваны.
 item.lead.description = ��ноўны �тартавы мат�ры�л. Шырока выкары�тоўваецца ў �лектроніцы і блоках дл� тран�парціроўкі вадка�ц�ў.
+item.lead.details = Плотны. Ін�ртны. Шырока выкары�тоўваецца у акумул�тарахx.\nДаданне: верагодна, так�ічны дл� бі�лагічных форм жыцц�. �е так каб іх тут шмат за�тало��.
 item.metaglass.description = Звышмоцны �плаў шкла. Шырока выкары�тоўваецца дл� размеркаванн� і захоўванн� вадка�ці.
 item.graphite.description = Мінералізаваны вугл�род, �кі выкары�тоўваецца дл� боепрыпа�аў і �лектрычных кампанентаў.
 item.sand.description = Звычайны мат�ры�л, �кі шырока выкары�тоўваецца пры выплаўленні, �к пры легіраванн�, так і ў �ка�ці флю�у.
 item.coal.description = Закам�нела�цевае мінеральнае р�чыва, �кое ўтварыла�� задоўга да па�ева. Шырока выкары�тоўваецца дл� вытворча�ці паліва і р��ур�аў.
+item.coal.details = Ча�ткі вымершых ра�лін, утворана задоўга да за�наванн�.
 item.titanium.description = Р�дкі звышлёгкі метал, шырока выкары�тоўваецца дл� тран�парціроўкі вадка�ц�ў, бураў і аві�цыі.
 item.thorium.description = Шчыльны радыеактыўны метал, �кі выкары�тоўваецца ў �ка�ці �труктурнай апоры і �дзернага паліва.
 item.scrap.description = Р�шткі �тарых збудаванн�ў і ба�вых адзінак. Зм�шчае нев�лікі� колька�ці многіх розных металаў.
+item.scrap.details = Leftover remnants of old structures and units.
 item.silicon.description = �адзвычай кары�ны паўправаднік. Прым�н�ецца ў �онечных пан�л�х, �кладанай �лектроніцы і �аманаводных боепрыпа�ах.
 item.plastanium.description = Лёгкі, пла�тычны мат�ры�л, �кі выкары�тоўваецца ў пра�унутай аві�цыі і а�колачных боепрыпа�ах.
 item.phase-fabric.description = Практычна б�зважкае р�чыва, �кое выкары�тоўваецца ў перадавой �лектроніцы і т�хналогі�х �амааднаўленн�.
 item.surge-alloy.description = Суча�ны �плаў з унікальнымі �лектрычнымі ўла�ціва�ц�мі.
-item.spore-pod.description = Струк �пр�чка, �інт�заваных з атма�ферных канц�нтрацый дл� прамы�ловых м�таў. Выкары�тоўваецца дл� перапрацоўкі ў нафту, выбуховы� р�чывы або паліва.
+item.spore-pod.description = Струк �пор, �інт�заваных з атма�ферных канц�нтрацый дл� прамы�ловых м�таў. Выкары�тоўваецца дл� перапрацоўкі ў нафту, выбуховы� р�чывы або паліва.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = �е�табільнае злуч�нне, �кое выкары�тоўваецца ў бомбах і выбуховых р�чывах. Сінт�зуецца з �трукоў �пр�чку і іншых л�тучых р�чываў. Выкары�тоўваць у �ка�ці паліва не р�камендуецца.
 item.pyratite.description = �адзвычай вогненеб��печнае р�чыва, �кое выкары�тоўваецца ў запальным зброі.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 liquid.water.description = Сама� кары�на� вадка�ць. Звычайна выкары�тоўваецца дл� а�тудж�нн� машын і перапрацоўкі адходаў.
 liquid.slag.description = разна�тайны� розны� тыпы ра�плаўленага металу, змешаны� разам. Можа быць падзелены на �кладнікі �го мінералы або ра�пылён на варожых ба�вы� адзінкі ў �ка�ці зброі.
 liquid.oil.description = Вадка�ць, �ка� выкары�тоўваецца ў вытворча�ці �уча�ных мат�ры�лаў. Можа быць пераўтворана� ў вугаль дл� выкары�танн� ў �ка�ці паліва або ра�пылена� і падпалены� �к збро�.
 liquid.cryofluid.description = Ін�ртна�, неедка� вадка�ць, �творана� з вады і тытана. Валодае надзвычай вы�окай цеплаёмі�та�цю. Шырока выкары�тоўваецца ў �ка�ці а�туджальнай вадка�ці.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Перам�шчае прадметы з той жа хутка�цю, што і тытанавы� канвееры, але валодае большай бранёй. �е прымае на ўваход з бакоў ні ад чаго акрам� �к ад іншых канвеераў.
+block.illuminator.description = Маленькі, кампактны, �кі наладжвае крыніцу �в�тла. Патрабуецца �нергі� дл� працы.
 
 block.message.description = Захоўвае паведамленне. Выкары�тоўваецца дл� �ув�зі паміж �аюзьнікамі.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Сці�кае кавалкі вугалю ў чы�ты� лі�ты графіту.
 block.multi-press.description = �бноўлена� вер�і� графітавага пр��а. Выкары�тоўвае ваду і �нергію дл� хуткай і �фектыўнай апрацоўкі вугалю.
 block.silicon-smelter.description = Злучае п��ок з чы�тым вуглём. Вырабл�е кр�мній.
 block.kiln.description = выплавл�емым п��ок і �вінец ў злуч�нне, в�домае �к меташкло. Патрабуецца нев�ліка� колька�ць �нергіі дл� працы.
 block.plastanium-compressor.description = Вырабл�е пла�тан з нафты ды тытана.
-block.phase-weaver.description = Сінт�зуе фазавую тканіна з радыеактыўнага торы� і п��ку. Патрабуецца в�ліка� колька�ць �нергіі дл� працы.
-block.alloy-smelter.description = �б'�дноўвае тытан, �вінец, кр�мній і медзь дл� вытворча�ці кін�тычнага �плаву.
-block.cryofluid-mixer.description = змешваюцца ваду і дробны тытанавы парашок у криогеннную вадка�ць. �еад'емна� ча�тка пры выкары�танн� ториевого р�актара
-block.blast-mixer.description = ра�ці�каюць і змешвае навалы �пр�чка з пиротитом дл� атрыманн� выбуховага р�чыва.
+block.phase-weaver.description = Сінт�зуе фазавую тканіну з радыеактыўнага торы� і п��ку. Патрабуецца в�ліка� колька�ць �нергіі дл� працы.
+block.surge-smelter.description = �б'�дноўвае тытан, �вінец, кр�мній і медзь дл� вытворча�ці кін�тычнага �плаву.
+block.cryofluid-mixer.description = змешваюцца ваду і дробны тытанавы парашок у крогеннную вадка�ць. �еад'емна� ча�тка пры выкары�танн� торевого р�актара
+block.blast-mixer.description = ра�ці�каюць і змешвае навалы �пр�чка з проттом дл� атрыманн� выбуховага р�чыва.
 block.pyratite-mixer.description = Змешвае вугаль, �вінец і п��ок у гаручы піратыт
 block.melter.description = Плавіць металалом ў шлак дл� далейшай апрацоўкі або выкары�танн� ў тур�л�х «Хвал�».
 block.separator.description = Падз�л�е шлак на �го мінеральны� кампаненты. Выводзіць а�туджаны вынік.
@@ -1240,50 +2077,58 @@ block.coal-centrifuge.description = �тв�рдае нафту ў кавалк
 block.incinerator.description = Выпарае любы лішні прадмет або вадка�ць, �кую ён атрымлівае.
 block.power-void.description = �нул�е ў�ю �нергію, уведзеную ў �го. Толькі п��очніца.
 block.power-source.description = Б��конца выводзіць �нергію. Толькі п��очніца.
-block.item-source.description = Б��конца выводзіць �лементы. Толькі п��очніца.
+block.item-source.description = Б��конца выводзіць прадметы. Толькі п��очніца.
 block.item-void.description = Знішчае любы� прадметы. Толькі п��очніца.
 block.liquid-source.description = Б��конца выводзіць вадка�ці. Толькі п��очніца.
 block.liquid-void.description = Знішчае любы� вадка�ці. Толькі п��очніца.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
 block.copper-wall.description = Танны ахоўны блок. \nПалезны пад абарону �дра і тур�л�ў ў першы� некалькі хвал�ў.
-block.copper-wall-large.description = Танны ахоўны блок. \nПалезны дл� абароны �дра і тур�л�ў ў першы� некалькі хвал�ў. \nРазмещает�� на некалькіх плітках.
+block.copper-wall-large.description = Танны ахоўны блок. \nПалезны дл� абароны �дра і тур�л�ў ў першы� некалькі хвал�ў. \nРазм�шчаецца на некалькіх плітках.
 block.titanium-wall.description = Умерана моцны ахоўны блок. \n�ба�п�коўвае ўмеранную абарону ад ворагаў.
-block.titanium-wall-large.description = Умерана моцны ахоўны блок. \nОбе�печивает ўмераны абарону ад ворагаў. \nРазмещает�� на некалькіх плітках.
+block.titanium-wall-large.description = Умерана моцны ахоўны блок. \nОбе�печвает ўмераны абарону ад ворагаў. \nРазм�шчаецца на некалькіх плітках.
 block.plastanium-wall.description = Спецы�льны тып �цены, �кі паглынае �лектрычны� разрады і блакуе аўтаматычнае злуч�нне паміж �ілавымі вузламі.
-block.plastanium-wall-large.description = Спецы�льны тып �цены, �кі паглынае �лектрычны� разрады і блакуе аўтаматычнае злуч�нне паміж �ілавымі вузламі. \nРазмещает�� на некалькіх плітках.
+block.plastanium-wall-large.description = Спецы�льны тып �цены, �кі паглынае �лектрычны� разрады і блакуе аўтаматычнае злуч�нне паміж �ілавымі вузламі. \nРазм�шчаецца на некалькіх плітках.
 block.thorium-wall.description = Моцны ахоўны блок. \nХораша� абарона ад ворагаў.
-block.thorium-wall-large.description = Моцны ахоўны блок. \nХораша� абарона ад ворагаў. \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.phase-wall-large.description = Сц�на, пакрыта� �пецы�льным фазавым адлю�троўваюць �кладам. �длю�троўвае больша�ць куль пры ўдары. \nРазм�шчаецца на некалькіх плітках.
+block.surge-wall.description = Вельмі трывалы ахоўны блок. \n�акаплвае зарад пры кантакце з кул�й, выпу�каючы �го выпадковым чынам.
+block.surge-wall-large.description = Вельмі трывалы ахоўны блок. \n�акаплвает зарад пры кантакце з кул�й, выпу�каючы �го выпадковым чынам. \nРазм�шчаецца на некалькіх плітках.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Маленька� дзверы. Можна адкрыць або зачыніць наці�кам.
-block.door-large.description = В�ліка� дзверы. Можна адкрыць і закрыць наці�кам. \nРазмещает�� на некалькіх плітках.
-block.mender.description = Перы�дычна рамантуе блокі ў непа�р�днай блізка�ці. Захоўвае �родкі абароны ў ц�ла�на�ці паміж хвал�мі. \nОпционально выкары�тоўвае кр�мній дл� павеліч�нн� далёка�ці і �фектыўна�ці.
-block.mend-projector.description = �бноўлена� вер�і� р�генератара. Рамантуе блокі ў непа�р�днай блізка�ці. \nОпционально выкары�тоўвае фазавую тканіна дл� павеліч�нн� далёка�ці і �фектыўна�ці.
-block.overdrive-projector.description = Пав�лічвае хутка�ць бліж�йшых будынкаў. \nОпционально выкары�тоўвае фазавую тканіна дл� павеліч�нн� далёка�ці і �фектыўна�ці.
+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.shock-mine.description = �ано�іць �траты ворагам, надыходз�чым на міну. �маль н�бачна� дл� ворага.
 block.conveyor.description = Базавы тран�партны блок. Перам�шчае прадметы наперад і аўтаматычна �кладае іх у блокі. Можна пав�рнуць.
 block.titanium-conveyor.description = Палепшаны тран�партны блок. Перам�шчае прадметы хутч�й, чым �тандартны� канвееры.
-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 = Перам�шчае прадметы ў групах.\nПрынімае прадметы ззаду, і выгружае іх у трох напрамках наперад.
 block.junction.description = Дзейнічае �к мо�т дл� двух пера��кальных канвеерных �тужак. Кары�ны ў �ітуацы�х, калі два розны� канвеера перавоз�ць розны� мат�ры�лы ў розны� ме�цы.
 block.bridge-conveyor.description = Палепшаны тран�партны блок. Дазвал�е тран�партаваць прадметы над 3 пліткамі любой м��цова�ці або будынка.
 block.phase-conveyor.description = Палепшаны тран�партны блок. Выкары�тоўвае �нергію дл� т�лепартацыі прадметаў на падлучаны фазавы канвеер над некалькімі пліткамі.
 block.sorter.description = Сартуе прадметы. Калі прадмет адпав�дае выбару, ён можа прай�ці. У адваротным выпадку прадмет выводзіцца злева і �права.
 block.inverted-sorter.description = Працуе з прадметамі г�так жа, �к і �тандартны �артавальнік, але выводзіць абраны прадмет па баках, а не прама.
 block.router.description = Прымае прадмет у адным кірунку і выводзіць іх да 3 іншых напрамкаў у роўнай �тупені. Кары�ны дл� падзелу мат�ры�лаў з адной крыніцы на некалькі м�таў. \n \n [scarlet] �іколі не выкары�тоўвайце побач з заводамі і т.п., так �к маршрутызатар будзе забіты выходнымі прадметамі.[]
+block.router.details = �еабходнае зло. Выкары�танне кал� уваходу прадукцыі не р�камендуецца, бо �ны забюцца выходз�чай прадукцы�й.
 block.distributor.description = Пашыраны маршрутызатар. Падз�л�е прадметы да 7 іншых напрамкаў у роўнай �тупені.
 block.overflow-gate.description = Выводзіць прадметы налева і направа, толькі калі п�р�дні шл�х забл�каваны.
 block.underflow-gate.description = Супрацьлегла�ць залішн�га за�аўкі. Выводзіць прадметы наперад толькі ў тым выпадку, калі левы і правы шл�ху заблакаваны�.
 block.mass-driver.description = Самы пра�унуты тран�партны блок. Збірае некалькі прадметаў і затым �трал�е імі ў іншую катапульту на в�лікай адлегла�ці. Патрабуецца �нергі� дл� працы.
 block.mechanical-pump.description = Танны на�о� з нізкай прадукцыйна�цю, але без �нерга�пажыванн�.
 block.rotary-pump.description = Пра�унута� помпа. Пампуе больш вадка�ці, але патрабуе �нергію.
-block.thermal-pump.description = �айлепша� помпа.
+block.impulse-pump.description = �айлепша� помпа.
 block.conduit.description = ��ноўны блок тран�парціроўкі вадка�ці. Перам�шчае вадка�ці наперад. Выкары�тоўваецца �уме�на з помпамі і іншымі трубаправодамі.
 block.pulse-conduit.description = Палепшаны блок тран�парціроўкі вадка�ці. Тран�партуе вадка�ці хутч�й і захоўвае больш, чым �тандартны� трубаправоды.
 block.plated-conduit.description = Перам�шчае вадка�ці з той жа хутка�цю, што і імпуль�ны� трубаправоды, але валодае большай трывала�цю. �е б�р� вадка�ці �а бакоў, акрам� �к ад іншых трубаправодаў. \nПротекает менш.
 block.liquid-router.description = Прымае вадка�ці з аднаго кірунку і выводзіць іх да 3 іншых напрамкаў у роўнай �тупені. Так�ама можа захоўваць п�ўную колька�ць вадка�ці. Кары�ны дл� падзелу вадка�ц�ў з адной крыніцы на некалькі м�таў.
-block.liquid-tank.description = Захоўвае в�ліка� колька�ць вадка�ці. Выкары�тоўваецца дл� �твар�нн� буфераў у �ітуацы�х з н��талай патр�бай у мат�ры�лах або ў �ка�ці абароны дл� а�тудж�нн� жыццёва важных блокаў.
+block.liquid-container.description = Захоўвае больш адзінак вадка�ці. Выводзіць ва ў�іх напрамках, падобны да вадка�нага маршрутызатара.
+block.liquid-tank.description = Захоўвае в�лікую колька�ць вадка�ці. Выкары�тоўваецца дл� �твар�нн� буфераў у �ітуацы�х з н��талай патр�бай у мат�ры�лах або ў �ка�ці абароны дл� а�тудж�нн� жыццёва важных блокаў.
 block.liquid-junction.description = Дзейнічае �к мо�т дл� двух пера��кальных трубаправодаў. Кары�ны ў �ітуацы�х, калі два розны� трубаправода перано��ць розны� вадка�ці ў розны� ме�цы.
 block.bridge-conduit.description = Пашыраны блок тран�парціроўкі вадка�ці. Дазвал�е тран�партаваць вадка�ці над 3 пліткамі любой м��цова�ці або будынка.
 block.phase-conduit.description = Пашыраны блок тран�парціроўкі вадка�ці. Выкары�тоўвае �нергію дл� т�лепартацыі вадка�ц�ў у падлучаны фазавы трубаправод над некалькімі пліткам.
@@ -1296,27 +2141,33 @@ block.battery-large.description = Захоўвае значна больш �н
 block.combustion-generator.description = вырабленай �нергіі шл�хам �пальванн� лёгкаўзгаральных мат�ры�лаў, такіх �к вугаль.
 block.thermal-generator.description = Генеруе �нергію, калі знаходзіцца ў гарачых ме�цах.
 block.steam-generator.description = Уда�каналены генератар згаранн�. Больш �фектыўны, але дадаткова патрабуе ваду дл� выпрацоўкі пары.
-block.differential-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.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.details = Ва�таноўленна� т�хналогі�. Выкары�тоўвае каб �твараць в�лікую колька�ць бі�ма��ы з найбольшай �фектыўна�ццю. Падобны да ініцыйнага фабрыкатара �пор �кі выкары�тоўваецца на Серпуло.
 block.oil-extractor.description = Выкары�тоўвае в�ліка� колька�ць �нергіі, п��ку і вады дл� бур�нн�, здабываючы нафту.
 block.core-shard.description = Перша� іт�рацы� кап�улы �дра. Па�л� знішч�нн�, уве�ь кантакт з р�гіёнам губл�ецца. �е дазвал�йце г�таму здарыцца.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = Друга� вер�і� �дра. Лепш браніраваць. Захоўвае больш р��ур�аў.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = Тр�ц�� і апошн�� іт�рацы� кап�улы �дра. Вельмі добра Браніраваць. Захоўвае в�ліка� колька�ць р��ур�аў.
-block.vault.description = Захоўвае в�ліка� колька�ць прадметаў кожнага тыпу. Блок разгрузчика можа быць выкары�таны дл� здабыванн� прадметаў �а �ховішча.
-block.container.description = Захоўвае нев�ліка� колька�ць прадметаў кожнага тыпу. Блок разгрузчика можа быць выкары�таны дл� здабыванн� �лементаў з кант�йнера.
+block.core-nucleus.details = The third and final iteration.
+block.vault.description = Захоўвае в�ліка� колька�ць прадметаў кожнага тыпу. Блок разгрузчка можа быць выкары�таны дл� здабыванн� прадметаў �а �ховішча.
+block.container.description = Захоўвае нев�ліка� колька�ць прадметаў кожнага тыпу. Блок разгрузчка можа быць выкары�таны дл� здабыванн� прадметаў з кант�йнера.
 block.unloader.description = Выгружае прадметы з любога нетран�портного блока. Тып прадмета, �кі неабходна выгрузіць, можна зм�ніць наці�кам.
 block.launch-pad.description = Запу�кае партыі прадметаў без неабходна�ці запу�ку �дра.
-block.launch-pad-large.description = Палепшана� вер�і� �тартавай пл�цоўкі. Захоўвае больш прадметаў. Запу�каецца ча�цей.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Маленька�, танна� тур�ль. Кары�на� �упраць наземных юнітаў.
 block.scatter.description = ��ноўна� �упрацьпаветрана� тур�ль. Ра�пыл�е кавалкі �вінцу або металалому на варожы� падраздз�ленн�.
 block.scorch.description = Спальваеце любых наземных ворагаў побач з ім. Вы�ока�фектыўны на блізкай адлегла�ці.
@@ -1331,5 +2182,429 @@ block.ripple.description = Вельмі магутна� артылерый�к
 block.cyclone.description = В�ліка� тур�ль, �ка� можа ве�ці агонь па паветраных і наземных м�тах. Страл�е разрыўнымі �нарадамі па бліж�йшых ворагам.
 block.spectre.description = Ма�іўна� дву�твольное гармата. Страл�е буйнымі бран�бойнымі кул�мі па паветраных і наземных м�тах.
 block.meltdown.description = Ма�іўна� лазерна� гармата. Зараджае і �трал�е па�та�нным лазерным прам�нём ў бліж�йшых ворагаў. Патрабуецца а�туджальна� вадка�ць дл� працы.
+block.foreshadow.description = Страл�е маланкай па адной ц�лі на в�лікай адлегла�ці. �ддае пры�рыт�т ворагам з большым мак�імальным здароўем.
 block.repair-point.description = Бе�перапынна лечыць бліж�йшую пашкоджаную ба�вую адзінку або мех у �ваім радыу�е.
 block.segment.description = Пашкоджвае і знішчае �нарады. Лазерны� �нарады не шкодз�ца.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = �баран�е �дро ��кепак ад ворагаў. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Выводзіць зменную дл� выбраннага будынку.
+unitlocate.outx = Выводзіць X каардынату.
+unitlocate.outy = Выводзіць Y каардынату.
+unitlocate.group = Знаходзіць группу будынкаў.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = �е рухацца, а будаваць/дабываць.\nЗвычайны �тан.
+lenum.stop = Пера�таць рухацца/дабываць/будаваць.
+lenum.unbind = Поўна�ццю адключыць кантрал�ванне прац���арамі.\n�днавіць звычайны� паводзіны AI.
+lenum.move = Рухацца да канкр�тнай каардынаты.
+lenum.approach = Пады�ці да каардынаты з радыю�ам.
+lenum.pathfind = �айці шл�х да варожай кропкі з'�ўленн�.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = �такаваць каардынату.
+lenum.targetp = �такаваць м�ту з прадвыліч�ннем �кора�ці.
+lenum.itemdrop = �пу�ціць прадмет.
+lenum.itemtake = Уз�ць прадмет Take an item from a building.
+lenum.paydrop = �пу�ціць і�нуючы груз.
+lenum.paytake = Узыць груз у заданных каардынатах.
+lenum.payenter = Увай�ці/прыз�мліцца на блок выгрузкі калі адзінка кал�/над ім.
+lenum.flag = Лічбавы �ц�г адзінкі.
+lenum.mine = Дабываць у кардынатах.
+lenum.build = Пабудаваць �труктуру.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Прав�рае калі адзінка знаходзіцца кал� каардынат.
+lenum.boost = Пачаць/пера�таць узл�таць.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
new file mode 100644
index 0000000000..3eb3dbc43d
--- /dev/null
+++ b/core/assets/bundles/bundle_bg.properties
@@ -0,0 +1,2648 @@
+credits.text = Създадена от [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits = За�луги
+contributors = Преводачи и Сътрудници
+discord = При�ъедини �е към Mindustry ди�корд!
+link.discord.description = Официален Mindustry ди�корд �ървър
+link.reddit.description = Субредит на Mindustry
+link.github.description = Сор� код на играта
+link.changelog.description = Спи�ък � промени
+link.dev-builds.description = �е�табилни те�тови вер�ии
+link.trello.description = Официален Trello �пи�ък � пред�то�щи промени
+link.itch.io.description = itch.io �траница. Можете да �валите играта от тук.
+link.google-play.description = Свалете за Android от Google Play
+link.f-droid.description = Свалете за Android от F-Droid
+link.wiki.description = Официално Mindustry ръковод�тво
+link.suggestions.description = Предложете Вашата иде�
+link.bug.description = �америхте грешка? Съобщете тук
+linkopen = Този �ървър Ви изпрати линк. Сигурни ли �те, че и�кате да го отворите?\n\n[sky]{0}
+linkfail = �еу�пех при отвар�не на връзка!\nURL адре�ът е копиран в клипборда ви.
+screenshot = Запи�ана екранна �нимка в {0}
+screenshot.invalid = Картата е твърде гол�ма, възможно е да не до�тига памет за екранната �нимка.
+gameover = Играта �върши.
+gameover.disconnect = Прекъ�нете връзката
+gameover.pvp = [accent]{0}[] отбор �печели!
+gameover.waiting = [accent]Изчакване за �ледваща карта...
+highscore = [accent]�ов рекорд!
+copied = Копирано.
+indev.notready = Тази ча�т от играта в�е още е в разработка
+
+load.sound = Звук
+load.map = Карти
+load.image = Графики
+load.content = Съдържание
+load.system = Си�тема
+load.mod = Модификации
+load.scripts = Скриптове
+
+be.update = �алична е актуализаци�:
+be.update.confirm = Изтегл�не и ре�тарт на играта?
+be.updating = �ктуализиране...
+be.ignore = Игнорирай
+be.noupdates = ��ма намерени актуализации.
+be.check = Провери за актуализации
+
+mods.browser = Спи�ък � модове
+mods.browser.selected = Избран мод
+mods.browser.add = Ин�талирай
+mods.browser.reinstall = Преин�талирай
+mods.browser.view-releases = Вижте издани�
+mods.browser.noreleases = [scarlet]�е �а открити издани�\n[accent]�е б�ха открити издани� за тази модификаци�. Проверете дали хранилището на модификаци�та има публикувани издани�.
+mods.browser.latest = <Latest>
+mods.browser.releases = Издани�
+mods.github.open = Сайт
+mods.github.open-release = Страница на издани�та
+mods.browser.sortdate = Сортирай по дата
+mods.browser.sortstars = Сортирай по рейтинг
+
+schematic = Схема
+schematic.add = Запази Схема...
+schematics = Схеми
+schematic.search = Тър�ене из �хемите...
+schematic.replace = Вече �ъще�твува �хема � това име. Да бъде ли заме�тена?
+schematic.exists = Вече �ъще�твува �хема � това име.
+schematic.import = Вна��не на Схема...
+schematic.exportfile = Изна��не във файл
+schematic.importfile = Вна��не от файл
+schematic.browseworkshop = Работилница
+schematic.copy = Копирай в Клипборда
+schematic.copy.import = Вне�и от Клипборда
+schematic.shareworkshop = Сподели в Работилницата
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Обърни �хемата
+schematic.saved = Схемате беше запазена.
+schematic.delete.confirm = Тази �хема ще бъде напълно унищожена.
+schematic.edit = Пром�на на �хемата
+schematic.info = {0}x{1}, {2} елемента
+schematic.disabled = [scarlet]Схемите не �а до�тъпни[]\n�е Ви е позволено да използвате Схеми на тази [accent]карта[] или [accent]�ървър[].
+schematic.tags = Етикети:
+schematic.edittags = Пром�на на етикетите
+schematic.addtag = Добав�не на етикет
+schematic.texttag = Тек�т
+schematic.icontag = Икона
+schematic.renametag = Преименуване на етикет
+schematic.tagged = {0} етикирано
+schematic.tagdelconfirm = Да �е изтрие ли този етикет?
+schematic.tagexists = Този етикет вече �ъще�твува.
+
+stats = Стати�тики
+stats.wave = �адвити вълни
+stats.unitsCreated = Създадени единици
+stats.enemiesDestroyed = Унищожени врагове
+stats.built = По�троени �гради
+stats.destroyed = Унищожени �гради
+stats.deconstructed = Разглобени �гради
+stats.playtime = Време в игра
+
+globalitems = [accent]В�ички Ре�ур�и
+map.delete = Сигурни ли �те че и�кате да изтриете карта "[accent]{0}[]"?
+level.highscore = Рекорд: [accent]{0}
+level.select = Избор на ниво
+level.mode = Режим на игра:
+coreattack = < Ядрото е нападнато! >
+nearpoint = [[ [scarlet]��ПУС�ЕТЕ ОП�С��Т� ЗО�� МОМЕ�Т�Л�О[] ]\nред�тои унижощение
+database = Енциклопеди�
+database.button = База данни
+savegame = Запази Игра
+loadgame = Зареди Игра
+joingame = При�ъедини �е в Игра
+customgame = Пер�онализирана Игра
+newgame = �ова Игра
+none = <н�ма>
+none.found = [lightgray]<н�ма намерени>
+none.inmap = [lightgray]<н�ма в карти>
+minimap = Мини-карта
+position = Позици�
+close = Затвори
+website = Уеб�айт
+quit = Изход
+save.quit = Запази и Излез
+maps = Карти
+maps.browse = Спи�ък � карти
+continue = Продължи
+maps.none = [lightgray]��ма намерени карти!
+invalid = �евалидно
+pickcolor = Избери цв�т
+preparingconfig = Подготовка на �а�тройки
+preparingcontent = Подготовка на Съдържание
+uploadingcontent = Качване на Съдържание
+uploadingpreviewfile = Качване на Изображение за визуализаци�
+committingchanges = Запазване на Промени
+done = Готово
+feature.unsupported = Вашето у�трой�тво не поддържа тази функци�
+
+mods.initfailed = [red]⚠[]Mindustry претърп� �рив при по�ледното �тартиране. Това веро�тно е причинено от лошо поведение на н�кой мод.\n\nЗа да �е предотврати по�то�нно �риване при �тартиране, [red]в�ички модове б�ха забранени.[]\n\nЗа да забраните тази опци�, изключете � от [accent]�а�тройки->Игра->Забрани Модовете При Стартиране След Срив[].
+mods = Модове
+mods.none = [lightgray]��ма намерени модове!
+mods.guide = Как да �ъздам модификаци�?
+mods.report = Съобщаване за грешка
+mods.openfolder = Отвори Директори�
+mods.viewcontent = Виж Съдържание
+mods.reload = Презареди
+mods.reloadexit = Играта ще �е затвори, за да презареди модификациите.
+mod.installed = [[Ин�талиран]
+mod.display = [gray]Мод:[orange] {0}
+mod.enabled = [lightgray]�ктивиран
+mod.disabled = [scarlet]Деактивиран
+mod.multiplayer.compatible = [gray]Поддържа Мрежова Игра
+mod.disable = Деактивирай
+mod.version = Version:
+mod.content = Съдържание:
+mod.delete.error = �еу�пешно изтриване на мод. Веро�тно файловете �е използват.
+mod.incompatiblegame = [red]О�тар�ла игра
+mod.incompatiblemod = [red]�е�ъвме�тимо
+mod.blacklisted = [red]�е �е поддържа
+mod.unmetdependencies = [red]Зави�имо�тите не �а покрити
+mod.erroredcontent = [scarlet]Грешки в Съдържанието
+mod.circulardependencies = [red]Кръгобратни зави�имо�ти
+mod.incompletedependencies = [red]�езавършени зави�имо�тиIncomplete Dependencies
+mod.requiresversion.details = �еобходима е вер�и� на играта: [accent]{0}[]\nВашата игра е о�тар�ла. Тази модификаци� изи�ква по-нова вер�и� на играта (веро�тно бета/алфа издание), за да функционира.
+mod.outdatedv7.details = Тази модификаци� е не�ъвме�тима � по�ледната вер�и� на играта. �вторът тр�бва да � обнови и да добави [accent]minGameVersion: 136[] към �во�  [accent]mod.json[] файл.
+mod.blacklisted.details = Тази модификаци� е била по�тавена в черен �пи�ък, защото причин�ва �ривове и други проблеми � тази вер�и� на играта. �е � използвайте.
+mod.missingdependencies.details = Лип�ват �ледните зави�имо�ти за този мод: {0}
+mod.erroredcontent.details = Тази игра �ъздаде грешки по време на зареждане. Помолете авторът да ги оправи.
+mod.circulardependencies.details = Тази модификаци� има зави�имо�ти, които зави��т една от друга.
+mod.incompletedependencies.details = Тази модификаци� не може да зареди поради невалидни или лип�ващи зави�имо�ти: {0}.
+mod.requiresversion = �ужна е вер�и� на играта: [red]{0}
+mod.errors = Възникнаха грешки при зареждане на �ъдържанието.
+mod.noerrorplay = [scarlet]Има грешки в н�кои от модовете, които използвате.[] Тр�бва да деактивирате тези модове или да поправите грешките преди да играете.
+mod.nowdisabled = [scarlet]Лип�ват зави�имо�ти за мод '{0}':[accent] {1}\n[lightgray]Мод {0} ще бъде деактивиран докато не ги изтеглите.
+mod.enable = �ктивирай
+mod.requiresrestart = Играта ще �е затвори за да приложи промените в модовете.
+mod.reloadrequired = [scarlet]�еобходимо е ре�тартиране
+mod.import = Вмъкни мод
+mod.import.file = Вмъкни от файл
+mod.import.github = Вмъкни от GitHub
+mod.jarwarn = [scarlet]JAR модовете могат да бъдат опа�ни.[]\n Уверете �е, че този мод e от надежден източник!
+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.scripts.disable = Вашето у�трой�тво не поддържа модове �ъ� �криптове. Тр�бва да забраните тези модове за да играете.
+
+about.button = За играта
+name = Име:
+noname = Тр�бва да изберете [accent] име на играча[].
+search = Тър�ене:
+planetmap = Глобу�
+launchcore = Из�трел�й Ядрото
+filename = Име на файл:
+unlocked = Отключихте нови неща!
+available = Можете да проучите нови технологии!
+unlock.incampaign = < Отключете в кампани�та за подробно�ти >
+campaign.select = Изберете начална кампани�
+campaign.none = [lightgray]Изберете на ко� планета да започнете.\nМоже да промените решението �и по в��ко време.
+campaign.erekir = По-ново полирано �ъдържание. �апредъкът в кампани�та е линеен.\n\nКартите �а � по-ви�око каче�тво за по-добро изжив�ване.
+campaign.serpulo = По-�таро �ъдържание; кла�иче�кото прежив�ване. По-отворена игра.\n\nВъзможно е картите и механиките на кампани�та да �а небалан�ирани и � по-ни�ко каче�тво.
+campaign.difficulty = Difficulty
+
+completed = [accent]Завършено
+techtree = Технологичен план
+techtree.select = Избиране на технологичен план
+techtree.serpulo = Серпуло
+techtree.erekir = Ерекир
+research.load = Зареди
+research.discard = Захвърли
+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.whitelist = ��мате позволение да влезете в този �ървър.
+server.kicked.serverClose = Сървърът беше �пр�н.
+server.kicked.vote = Б�хте изгонени чрез гла�уване. До �коро.
+server.kicked.clientOutdated = О�тар�л клиент!\n�ктуализирайте играта �и!
+server.kicked.serverOutdated = О�тар�л �ървър!\nПои�кайте от �об�твеника да го актуализира!
+server.kicked.banned = Вие �те баннат в този �ървър.
+server.kicked.typeMismatch = Този �ървър не е �ъвме�тим � вашата компилаци�.
+server.kicked.playerLimit = Сървърът е пълен.\nИзчакайте н�кой да излезе.
+server.kicked.recentKick = Вие �те били изхвърлени на�коро.\nОпитайте отново по-къ�но.
+server.kicked.nameInUse = Вече има играч �\nтакова име в �ървъра.
+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]прена�очване на порто (port forwarding)[].\n\n[lightgray]Бележка: �ко н�кой има проблеми при �вързване към вашата локална (LAN) игра, проверете дали �те позволили до�тъп на Mindustry до локалната мрежа в на�тройките на защитната �тена (firewall). ��кои публични мрежи не позвол�ват �ървърите в т�х да бъдат автоматично открити от о�таналите играчи.
+join.info = Тук можете да въведете [accent]IP адре� на �ървър[] за да �е �вържете или да �е при�ъедините към автоматично намерен �ървър във вашата [accent]локална мрежа[] или [accent]публичен[] �ървър.\nПоддържат �е LAN и WAN мрежови игри.\n\n[lightgray]�ко и�кате да �е �вържете по IP ще тр�бва първо да пои�кате IP на �об�твеника на �ървъра, което той може да намери като напише "my ip" в Google от �во�та мрежа.
+hostserver = Стартирай Мрежова Игра
+invitefriends = Покани При�тели
+hostserver.mobile = Организиране на игра
+host = Отвори за Локалната Мрежа
+hosting = [accent]Отвар�не на �ървър...
+hosts.refresh = Обнови
+hosts.discovering = Тър�ене на LAN �ървъри
+hosts.discovering.any = Тръ�ене на �ървъри
+server.refreshing = Обнов�ване на �ървър
+hosts.none = [lightgray]��ма намерени локални �ървъри!
+host.invalid = [scarlet]�е може да �е у�танови връзка �ъ� �ървъра.
+
+servers.local = Локални Сървъри
+servers.local.steam = Отворени игри и локални �ървъри
+servers.remote = Отдалечени Сървъри
+servers.global = Публични Сървъри
+
+servers.disclaimer = Публичните �ървъри [accent]не[] �а притежавани от разработчика.\n\nТе може да имат потребител�ко �ъдържание неподход�що за в�ички възра�ти.
+servers.showhidden = Покажи Скритите Сървъри
+server.shown = Показан
+server.hidden = Скрит
+viewplayer = Гледате играч: [accent]{0}
+
+trace = Про�леди Играч
+trace.playername = Име на играча: [accent]{0}
+trace.ip = IP: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Език: [accent]{0}
+trace.mobile = Мобилен Клиент: [accent]{0}
+trace.modclient = Модифициран Клиент: [accent]{0}
+trace.times.joined = Пъти уча�твал в игра: [accent]{0}
+trace.times.kicked = Пъти изхвърлен от игра: [accent]{0}
+trace.ips = IPs:
+trace.names = Имена:
+invalidid = �евалидно ID на клиент. Съобщете за грешка.
+player.ban = Банване
+player.kick = Изгонване
+player.trace = Про�лед�ване
+player.admin = Превключване на админ
+player.team = Пром�на на отбора
+server.bans = Банове
+server.bans.none = ��ма намерени баннати играчи!
+server.admins = �дмини�тратори
+server.admins.none = ��ма намерени админи�тратори!
+server.add = Добави Сървър
+server.delete = Сигурни ли �те, че и�кате да изтриете този �ървър?
+server.edit = Редактирай Сървър
+server.outdated = [scarlet]О�тар�л Сървър![]
+server.outdated.client = [scarlet]О�тар�л Клиент![]
+server.version = [gray]в{0} {1}
+server.custombuild = [accent]Пер�онализирана компилаци�
+confirmban = Сигурни ли �те, че и�кате да баннете "{0}[white]"?
+confirmkick = Сигурни ли �те, че и�кате да изгоните "{0}[white]"?
+confirmunban = Сигурни ли �те че, и�кате да анулирате банването на този играч?
+confirmadmin = Сигурни ли �те че, и�кате да направите "{0}[white]" админи�тратор?
+confirmunadmin = Сигурни ли �те че, и�кате да премахнете админи�тратор�ките права на "{0}[white]"?
+votekick.reason = Причина за изгонване
+votekick.reason.message = Сигурни ли �те, че и�кате да гла�уване за изгонване "{0}[white]"?\n�ко отговорът е да, по�очете причината:
+joingame.title = При�ъедин�ване в игра
+joingame.ip = IP адре�:
+disconnect = Връзката беше прекъ�ната.
+disconnect.error = Проблем � връзката.
+disconnect.closed = Връзката приключи.
+disconnect.timeout = Загубена връзка.
+disconnect.data = Грешка при зареждане на информаци� за �вета!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
+cantconnect = �еу�пех при �вързване към игра ([accent]{0}[]).
+connecting = [accent]Свързване...
+reconnecting = [accent]Повторно �вързване...
+connecting.data = [accent]Зареждане на информаци� за �вета...
+server.port = Порт:
+server.invalidport = �евалиден порт!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [scarlet]Грешка при �тартиране на �ървър.
+save.new = �ов Запи�
+save.overwrite = Сигурни ли �те, че и�кате\nда презапишете тази позици� за запи�?
+save.nocampaign = �е може да импортирате индивидуални запи�и от кампани�та.
+overwrite = Презапиши
+save.none = �е �а намерени запи�и!
+savefail = Грешка при запи�ване на игра!
+save.delete.confirm = Сигурни ли �те, че и�кате да изтриете този запи�?
+save.delete = Изтрий
+save.export = Изне�и Запи�
+save.import.invalid = [accent]Този запи� е невалиден!
+save.import.fail = [scarlet]Грешка при вна��не на запи�: [accent]{0}
+save.export.fail = [scarlet]Грешка при изна��не на запи�: [accent]{0}
+save.import = Вне�и Запи�
+save.newslot = Име на запи�:
+save.rename = Преименувай
+save.rename.text = �ово име:
+selectslot = Избери запи�
+slot = [accent]Позици� {0}
+editmessage = Редактирай Съобщение
+save.corrupted = �евалиден или увреден запи�!
+empty = <празно>
+on = Включено
+off = Изключено
+save.search = Тър�ене на запи�ани игри...
+save.autosave = �втоматично запи�ване: {0}
+save.map = Карта: {0}
+save.wave = Вълна {0}
+save.mode = Решим на игра: {0}
+save.date = По�ледно Запи�ан: {0}
+save.playtime = Играно време: {0}
+warning = Тревога.
+confirm = Потвърди
+delete = Изтрий
+view.workshop = Отвори в Работилницата
+workshop.listing = Редактирай в Работилницата
+ok = OK
+open = Отвори
+customize = Пер�онализирай правилата
+cancel = Отказ
+command = Команда
+command.queue = [lightgray][Queuing]
+command.mine = Изкопаване
+command.repair = Ремонт
+command.rebuild = Въз�танов�ване
+command.assist = Помогни на играч
+command.move = Движение
+command.boost = У�кор�ване
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
+openlink = Отвори Линк
+copylink = Копирай Линк
+back = �азад
+max = Мак�имално
+objective = Цел на картата
+crash.export = Изне�и информаци� за �рив
+crash.none = ��ма намерена информаци� за �рив.
+crash.exported = Ине�ена информаци� за �рив.
+data.export = Изне�и данните на играта
+data.import = Вне�и данните на играта
+data.openfolder = Отвори директори� � данни
+data.exported = Данните на играта беше изне�ена.
+data.invalid = Това не е валиден файл � данни.
+data.import.confirm = Вна��нето на външен файл � данни ще унищожи [scarlet]в�ички[] Ваши данни.\n[accent]Това н�ма да може да �е въз�танови![]\n\nСлед като информаци�та �е вне�е, играта ще �е затвори.
+quit.confirm = Сигурни ли �те, че и�кате да излезете?
+loading = [accent]Зареждане...
+downloading = [accent]Изтегл�не...
+saving = [accent]Запи�ване...
+respawn = [accent][[{0}][] за да �е върнете при Ядрото
+cancelbuilding = [accent][[{0}][] за да изчи�тите �кицата
+selectschematic = [accent][[{0}][] за да изберете+копирате
+pausebuilding = [accent][[{0}][] за да отложите �троежа
+resumebuilding = [scarlet][[{0}][] за да продължите �троежа
+enablebuilding = [scarlet][[{0}][] за да позволите по�тро�ването
+showui = Интерфей�ът е �крит.\n�ати�нете [accent][[{0}][] за да го покажете.
+commandmode.name = [accent]Команден режим
+commandmode.nounits = [н�ма единици]
+wave = [accent]Вълна {0}
+wave.cap = [accent]Вълна {0}/{1}
+wave.waiting = [lightgray]Вълна �лед {0}
+wave.waveInProgress = [lightgray]�аближава вълна от врагове
+waiting = [lightgray]Изчакване...
+waiting.players = Изчакване на играчи...
+wave.enemies = [lightgray]{0} О�таващи врагове
+wave.enemycores = [accent]{0}[lightgray] Враже�ки Ядра
+wave.enemycore = [accent]{0}[lightgray] Враже�ко Ядро
+wave.enemy = [lightgray]{0} О�таващи врагове
+wave.guardianwarn = Пазител�т при�тига �лед [accent]{0}[] вълни.
+wave.guardianwarn.one = Пазител�т при�тига �лед [accent]{0}[] вълна.
+loadimage = Зареди Изображение
+saveimage = Запази Изображение
+unknown = �еизве�тно
+custom = Пер�онализирано
+builtin = Вградено
+map.delete.confirm = Сигурни ли �те, че и�кате да изтриете тази карта? Това дей�твие не може да бъде отменено!
+map.random = [accent]Случайна Карта
+map.nospawn = Тази карта н�ма позици� за �дро на играча! Добавете поне едно {0} �дро от редактора на карти.
+map.nospawn.pvp = Тази карта н�ма до�татъчно позиции за �дра на други играчи! Добавете поне едно [scarlet]не-оранжево[] �дро от редактора на карти.
+map.nospawn.attack = Тази карта н�ма нито едно враже�ко �дро! Добавете поне едно {0} �дро от редактора на карти.
+map.invalid = Грешка при зареждане на карта: увреден или невалиден файл.
+workshop.update = Обнов�ване на елемент
+workshop.error = Грешка при изтегл�не на данни от Работилницата: {0}
+map.publish.confirm = Сигурни ли �те, че и�кате да публикувате тази карта?\n\n[lightgray]Уверете �е че �те приели EULA (У�лови� за използване) на Работилницата, иначе Вашата карта н�ма да �е покаже там!
+workshop.menu = Изберете какво и�кате да �торите � този елемент.
+workshop.info = Информаци� за елемент
+changelog = И�тори� на промените (по избор):
+updatedesc = Презапи�ване на заглавието и опи�анието
+eula = Steam EULA (У�лови� за използване на Steam)
+missing = Този елемент е бил изтрит или преме�тен.\n[lightgray]Препратката към Работилницата беше автоматично изтрита.
+publishing = [accent]Публикуване...
+publish.confirm = Сигурни ли �те, че и�кате да публикувате това?\n\n[lightgray]Уверете �е че �те приели EULA (У�лови� за използване) на Работилницата, иначе Ваши�т елемент н�ма да �е показва там!
+publish.error = Грешка при публикуване на елемент: {0}
+steam.error = Грешка при зареждане на Steam у�луги.\nГрешка: {0}
+editor.planet = Планета:
+editor.sector = Сектор:
+editor.seed = Семе:
+editor.cliffs = Стени към �кали
+
+editor.brush = Четка
+editor.openin = Отвори в редактора
+editor.oregen = Генериране на руди
+editor.oregen.info = Генериране на руди:
+editor.mapinfo = Информаци� за картата
+editor.author = �втор:
+editor.description = Опи�ание:
+editor.nodescription = Картата тр�бва да има опи�ание от поне 4 �имвола преди да бъде публикувана.
+editor.waves = Вълни:
+editor.rules = Правила:
+editor.generation = Генериране:
+editor.objectives = Задачи
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
+
+editor.ingame = Редактирай в игра
+editor.playtest = Те�тване
+editor.publish.workshop = Публикувай в Работилницата
+editor.newmap = �ова Карта
+editor.center = Център
+editor.search = Тър�ене на карти...
+editor.filters = Фелтриране на карти
+editor.filters.mode = Режими на игра:
+editor.filters.type = Тип карта:
+editor.filters.search = Тър�ене в:
+editor.filters.author = �втор
+editor.filters.description = Опи�ание
+editor.shiftx = Shift X
+editor.shifty = Shift Y
+workshop = Работилница
+waves.title = Вълни от нападатели
+waves.remove = Премахни
+waves.every = повтар�й през
+waves.waves = вълна(и)
+waves.health = здраве: {0}%
+waves.perspawn = на вълна
+waves.shields = брон� на вълна
+waves.to = до
+waves.spawn = пу�кане:
+waves.spawn.all = <all>
+waves.spawn.select = Пу�кане на единици
+waves.spawn.none = [scarlet]н�ма открити единици на картата
+waves.max = мак�. единици
+waves.guardian = Пазител
+waves.preview = Преглед
+waves.edit = Редактирай...
+waves.random = Случаен брой
+waves.copy = Кобирай в Клипборд
+waves.load = Зареди от Клипборда
+waves.invalid = Клипборда �ъдържа невалидна информаци� за вълни.
+waves.copied = Вълните б�ха копирани.
+waves.none = ��ма дефинирани врагове.\n�ко о�тавите опи�анието на вълните празно играта ще използва �тандартни� шаблон.
+waves.sort = Сортиране чрез
+waves.sort.reverse = Обратно �ортиране
+waves.sort.begin = �ачало
+waves.sort.health = Здраве
+waves.sort.type = Вид
+waves.search = Тър�ене на вълни...
+waves.filter = Филтър за единици
+waves.units.hide = Скриване на в�ички
+waves.units.show = Показване на в�ички
+
+#these are intentionally in lower case / тези умишлено �а о�тавени без главни букви
+wavemode.counts = бройки
+wavemode.totals = общи бройки
+wavemode.health = точки живот
+all = All
+
+editor.default = [lightgray]<Стандартно>
+details = Детайли...
+edit = Редактирай...
+variables = Променливи
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
+
+editor.name = Име:
+editor.spawn = Създай единица
+editor.removeunit = Премахни единица
+editor.teams = Отбори
+editor.errorload = Грешка при зареждане на файл.
+editor.errorsave = Грешка при запи�ване на файл.
+editor.errorimage = Това е изображение, а не карта.
+editor.errorlegacy = Тази карта е твърде �тара, играта вече не поддържа този формат.
+editor.errornot = Този файл не е карта.
+editor.errorheader = Този файл � карта е повреден или невалиден.
+editor.errorname = Картата н�ма зададено име. Да не �е опитвате да заредите игра?
+editor.errorlocales = Error reading invalid locale bundles.
+editor.update = Обнови
+editor.randomize = Случайно
+editor.moveup = Придвижи нагоре
+editor.movedown = Придвижи надолу
+editor.copy = Копирай
+editor.apply = Приложи
+editor.generate = Генерирай
+editor.sectorgenerate = Генериране на �ектор
+editor.resize = Смени размера
+editor.loadmap = Зареди Карта
+editor.savemap = Запиши Карта
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
+editor.saved = Запи�ано!
+editor.save.noname = Картата н�ма име! Задайте такова в 'Информаци� за картата' от менюто.
+editor.save.overwrite = Съще�твува �тандартна карта � такова име! Изберете различно име от 'Информаци� за картата' от менюто.
+editor.import.exists = [scarlet]�еу�пешно вна��не:[] Съще�твува �и�темна карта �ъ� �ъщото име - '{0}'!
+editor.import = Вна��не...
+editor.importmap = Използване на друга карта
+editor.importmap.description = Работи върху копие на карта
+editor.importfile = Вне�и файл
+editor.importfile.description = Използвай карта от файл
+editor.importimage = Вна��не от изображение
+editor.importimage.description = Вне�и от файл � изображение на терена
+editor.export = Изне�и...
+editor.exportfile = Изне�и Файл
+editor.exportfile.description = Изне�и като файл � карта
+editor.exportimage = Изне�и Изображение
+editor.exportimage.description = Изна�� изображение, което �ъдържа �амо о�новната информаци� за терена
+editor.loadimage = Зареди Терен
+editor.saveimage = Изне�и Терен
+editor.unsaved = Сигурни ли �те, че и�кате да излезете?\n[scarlet]В�ички незапи�ани промени ще бъдат загубени.
+editor.resizemap = Преоразмери картата
+editor.mapname = Име на картата:
+editor.overwrite = [accent]В�ИМ��ИЕ!\nТази карта презапи�ва друга карта.
+editor.overwrite.confirm = [scarlet]В�ИМ��ИЕ![] Вече �ъще�твува карта � това име. �ко продължите, ще запишете тази на нейно м��то. Желаете ли да продължите?\n"[accent]{0}[]"
+editor.exists = Вече �ъще�твува карта � това име.
+editor.selectmap = Изберете карта, ко�то да заредите:
+
+toolmode.replace = Заме�тване
+toolmode.replace.description = Ри�ува �амо върху твърди блокчета.
+toolmode.replaceall = Заме�ти в�ички
+toolmode.replaceall.description = Заме�тва в�ички блокчета на картата
+toolmode.orthogonal = Ортогоналнo
+toolmode.orthogonal.description = Ри�ува �амо хоризонтални или вертикални линии.
+toolmode.square = Квадрат
+toolmode.square.description = Квадратна четка.
+toolmode.eraseores = Изтриване на руди
+toolmode.eraseores.description = Изтрива �амо руди.
+toolmode.fillteams = Запълване в отбори
+toolmode.fillteams.description = Промен� отбора, не типа на обектите, чрез запълване
+toolmode.fillerase = Изпълващо изтриване
+toolmode.fillerase.description = Изтрива блокчета от �ъщи�т вид.
+toolmode.drawteams = Ри�уване в отбори
+toolmode.drawteams.description = Промен� отбора, не типа на обектите, чрез ри�уване.
+toolmode.underliquid = Под течно�ти
+toolmode.underliquid.description = Ри�ува повърхно�ти под течни полета.
+
+filters.empty = [lightgray]��ма избран филтър! Изберете чрез бутона отдолу.
+filter.distort = Изкрив�ване
+filter.noise = Шум
+filter.enemyspawn = Избор на враже�ка начална точка
+filter.spawnpath = Път до начална точка
+filter.corespawn = Избор на �дро
+filter.median = Медиана
+filter.oremedian = Рудна медиана
+filter.blend = Сме�ване
+filter.defaultores = Стандартни руди
+filter.ore = Руда
+filter.rivernoise = Реки
+filter.mirror = Огледално
+filter.clear = Изчи�ти
+filter.option.ignore = Игнорирай
+filter.scatter = Разпръ�кване
+filter.terrain = Терен
+filter.logic = Logic
+filter.option.scale = Мащаб
+filter.option.chance = Веро�тно�т
+filter.option.mag = Магнитут
+filter.option.threshold = Праг
+filter.option.circle-scale = Кръгово мащабиране
+filter.option.octaves = Октави
+filter.option.falloff = Разпадане
+filter.option.angle = Ъгъл
+filter.option.tilt = �аклон
+filter.option.rotate = Завърти
+filter.option.amount = Количе�тво
+filter.option.block = Блок
+filter.option.floor = Под
+filter.option.flooronto = Целеви под
+filter.option.target = Цел
+filter.option.replacement = Заме�тване
+filter.option.wall = Стена
+filter.option.ore = Руда
+filter.option.floor2 = Втори под
+filter.option.threshold2 = Втори праг
+filter.option.radius = Радиу�
+filter.option.percentile = Процент
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
+
+width = Дължина:
+height = Ви�очина:
+menu = Меню
+play = Игра
+campaign = Кампани�
+load = Зареди
+save = Запиши
+fps = FPS: {0}
+ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
+language.restart = Ре�тартирайте играта, за да промените езика.
+settings = �а�тройки
+tutorial = Обучение
+tutorial.retake = Повтори обучението
+editor = Редактор
+mapeditor = Редактор на карти
+
+abandon = Изо�тав�не
+abandon.text = Тази зона и в�ичките � ре�ур�и ще бъдат о�тавени на врага.
+locked = Заключено
+complete = [lightgray]Завършено:
+requirement.wave = Стигнете вълна {0} в {1}
+requirement.core = Унищожете враже�кото �дро в {0}
+requirement.research = Проучете {0}
+requirement.produce = Произведете {0}
+requirement.capture = Превземете {0}
+requirement.onplanet = Контролирайте �ектор на {0}
+requirement.onsector = Кацнете върху �ектор: {0}
+launch.text = Из�трел�й
+map.multiplayer = Само домакинът може да преглежда �екторите.
+uncover = Разкрий
+configure = Избор на екипировка
+objective.research.name = Проучване
+objective.produce.name = Събиране
+objective.item.name = �амиране на предмет
+objective.coreitem.name = Ключов предмет
+objective.buildcount.name = Брой �троежи
+objective.unitcount.name = Брой единици
+objective.destroyunits.name = Унищожете единици
+objective.timer.name = Таймер
+objective.destroyblock.name = Унищожете блок
+objective.destroyblocks.name = Унищожете блокове
+objective.destroycore.name = Унищожете �дро
+objective.commandmode.name = Команден режим
+objective.flag.name = По�тавете флаг
+marker.shapetext.name = Оформ�не на тек�т
+marker.point.name = Point
+marker.shape.name = Форма
+marker.text.name = Тек�т
+marker.line.name = Лини�
+marker.quad.name = Квадрат
+marker.texture.name = Тек�тура
+marker.background = Фон
+marker.outline = Рамка
+objective.research = [accent]Проучете:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Добийте:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Унищожете:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Унищожете: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Придобийте: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Прене�ете в �дро:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]По�троете: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]По�тройте единица: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Унищожете: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Враговете наближават �лед [lightgray]{0}[]
+objective.enemyescelating = [accent]Враже�ката продукци� �е увеличава �лед [lightgray]{0}[]
+objective.enemyairunits = [accent]Враже�кото производ�тво на въздушни �или започва �лед [lightgray]{0}[]
+objective.destroycore = [accent]Унищожете враже�ко �дро
+objective.command = [accent]Командвайте единици
+objective.nuclearlaunch = [accent]⚠ За�ечен е �дрен из�трел: [lightgray]{0}
+announce.nuclearstrike = [red]⚠ ЯДРЕ� УД�Р ��БЛИЖ�В� ⚠
+
+loadout = Екипировка
+resources = Ре�ур�и
+resources.max = Мак�.
+bannedblocks = Забранени блокове
+unbannedblocks = Unbanned Blocks
+objectives = Задачи
+bannedunits = Забранени единици
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Забранени единици в б�л �пи�ък
+bannedblocks.whitelist = Забранени блокчета в б�л �пи�ък
+addall = Добави в�ички
+launch.from = Из�трел�й от: [accent]{0}
+launch.capacity = Капацитет на прено�ими предмети: [accent]{0}
+launch.destination = Цел: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = Количе�твото тр�бва да е между 0 и {0}.
+add = Добави...
+guardian = Пазител
+
+connectfail = [scarlet]Грешка при �вързване:\n\n[accent]{0}
+error.unreachable = Сървърът е недо�тъпен.\nТова ли е правилни�т адре�?
+error.invalidaddress = �евалиден адре�.
+error.timedout = Времето за изчакване изтече!\nУверете �е, че адре�ът е правилен и, че �об�твеникът е прена�очил правилно порта на играта!
+error.mismatch = Грешка в пакетите:\nВеро�тно е разминаване на вер�иите между клиента и �ървъра.\nУверете �е, че те използват по�ледната вер�и� на Mindustry!
+error.alreadyconnected = Вече �те �вързани.
+error.mapnotfound = �е е намерен файл � карта!
+error.io = Мрежова I/O грешка.
+error.any = �еизве�тна мрежова грешка.
+error.bloom = �еу�пешно инициализиране на Си�ни�.\nВашето у�трой�тво може да не поддържа този ефект.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
+
+weather.rain.name = Дъжд
+weather.snowing.name = Snow
+weather.sandstorm.name = П��ъчна бур�
+weather.sporestorm.name = Спорова бур�
+weather.fog.name = Мъгла
+campaign.playtime = \uf129 [lightgray]Време в този �ектор: {0}
+campaign.complete = [accent]Поздравлени�.\n\nВрагът на {0} е надвит.\n[lightgray]По�ледни�т �ектор е завлад�н.
+sectorlist = Сектори
+sectorlist.attacked = {0} е в опа�но�т
+
+sectors.unexplored = [lightgray]�еиз�ледвано
+sectors.resources = Ре�ур�и:
+sectors.production = Производ�тво:
+sectors.export = Изне�и:
+sectors.import = Вне�и:
+sectors.time = Време:
+sectors.threat = Заплаха:
+sectors.wave = Вълна:
+sectors.stored = Съхранени:
+sectors.resume = Продължи
+sectors.launch = Из�трел�й
+sectors.select = Избери
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]н�ма (Слънцето)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Преименувай Зоната
+sectors.enemybase = [scarlet]Враже�ка база
+sectors.vulnerable = [scarlet]У�звима
+sectors.underattack = [scarlet]Под атака! [accent]{0}% повредена
+sectors.underattack.nodamage = [scarlet]�езавлад�но
+sectors.survives = [accent]Оцел�ва {0} вълни
+sectors.go = По�ети
+sector.abandon = Изо�тав�не
+sector.abandon.confirm = Ядрото(-та) в този �ектор ще �е �амоунищожат.\nПродължаване?
+sector.curcapture = Зоната е превзета
+sector.curlost = Зоната е изгубена
+sector.missingresources = [scarlet]�едо�татъчно ре�ур�и в �дрото
+sector.attacked = Зона [accent]{0}[white] е под атака!
+sector.lost = Зона [accent]{0}[white] беше загубена!
+sector.capture = Sector [accent]{0}[white] Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Промени икона
+sector.noswitch.title = �евъзможно е превключването на �ектори
+sector.noswitch = �е можете да �мените �екторите, докато вече �ъще�твуващ �ектор е под нападение.\nСектор: [accent]{0}[] на [accent]{1}[]
+sector.view = Виж �ектор
+
+threat.low = �и�ка
+threat.medium = Средна
+threat.high = Ви�ока
+threat.extreme = Ек�тремна
+threat.eradication = Унищожителна
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
+planets = Планети
+
+planet.serpulo.name = Серпуло
+planet.erekir.name = Ерекир
+planet.sun.name = Слънце
+
+sector.impact0078.name = Сблъ�ък 0078
+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.biomassFacility.name = Био�интезиращо Съоръжение
+sector.windsweptIslands.name = Ветровитите о�трови
+sector.extractionOutpost.name = Добивен лагер
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Терминал за ко�миче�ки ми�ии
+sector.coastline.name = Крайбрежие
+sector.navalFortress.name = Краймор�ка крепо�т
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
+
+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 = Обладана от ви�ока ра�тително�т, тази зона �е намира изключително близо до източника на �порите. Врагът е у�тановил военен лагер тук. По�тройте единици модел 'Боздуган' и унищожете враже�ката база.
+sector.tarFields.description = Покрайнините на нефтено находище, намиращо �е между планините и пу�тин�та. Една от малкото зони � използваеми резерви на катран.\nМакар и изо�тавена, близо до тази зона има опа�ни враже�ки �или. �е ги подцен�вайте.\n\n[lightgray]Препоръчително е да проучите технологи� за обработка на нефт преди да започнете.
+
+sector.desolateRift.description = Много опа�на зона. Изобилие на ре�ур�и, но малко про�тран�тво. Ви�ок ри�к от унищожение. �апу�нете възможно най-�коро. �е �е подлъгвайте от дългите интервали между атаките.
+sector.nuclearComplex.description = Бивш комплек� за добив и обработка на торий, от който �а о�танали �амо руини.\n[lightgray]Проучете тори� и многобройните му приложени�.\n\nВраже�кото при�ъ�твие тук е многобройно и непрекъ�нато внимава за непри�тели.
+sector.fungalPass.description = Преходна зона между ви�оки планини и по-ни�ки, о�е�ни �ъ� �пори, земи. Тук врагът е разположил малка разузнавателна база.\nУнищожете �.\nИзползвайте единици модел 'Кинжал' и 'Къртица'. Унищожете двете враже�ки �дра.
+sector.biomassFacility.description = Това �ъоръжение е първоизточникът на �порите. Тук те �а били проучвани и �ъздадени за първи път.\nПроучете технологиите �крити в него. Култивирайте �пори, за да произвеждате гориво и пла�тма�а.\n\n[lightgray]След �мъртта на �ъоръжението �порите били о�вободени. �ищо в ме�тната еко�и�тема не може да �ъперничи на такъв инвазивен организъм.
+sector.windsweptIslands.description = По-нататък край бреговата лини� �е намира тази отдалечена верига от о�трови. Според н�кои запи�и, тук н�кога е имало �труктури за производ�тво на [accent]Пла�таний[].\n\nОтблъ�нете враже�ките мор�ки вой�ки. Под�игурете �во� база на тези о�трови. Проучете тези фабрики.
+sector.extractionOutpost.description = Отдалечен аванпо�т, където врагът е из�ледвал технологии за прена��не на ре�ур�и на далечни ра�то�ни�.\n\nТехнологи�та за тран�порт на материали между зоните е ключова за бъдещи дей�тви�. Унищожете враже�ката база и проучете враже�ките Из�трелващи площадки.
+sector.impact0078.description = Тук лежат о�танките от първи� навл�зал междузвезден тран�портер в тази �и�тема.\n\nСпа�ете колкото е възможно повече. Проучете в��ка непокътната технологи�.
+sector.planetaryTerminal.description = Крайна цел.\n\nТази крайбрежна база �ъдържа �труктура, �ъздадена � цел междупланетарен тран�порт на �дра, макар и �амо в рамките на локалната звездна �и�тема. Тази локаци� има изключително ви�ока защита.\n\nИзползвайте военномор�ки единици. Елиминирайте врага възможно най-бързо. Проучете из�трелващата �труктура.
+sector.coastline.description = �а това м��то �а за�ечени о�танките от технологи� за производ�твото на мор�ки единици. Отблъ�нете враже�ките атаки, завладейте този �ектор и при�воете технологи�та.
+sector.navalFortress.description = Врагът е у�тановил база на отдалечен, е�те�твено укрепен о�тров. Унищожете базите им. Придобийте напредналата им мор�ка технологи� и � проучете.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = �ачалото
+sector.aegis.name = Егида
+sector.lake.name = Езеро
+sector.intersect.name = Пре�ичане
+sector.atlas.name = �тла�
+sector.split.name = Разрив
+sector.basin.name = Ба�ейн
+sector.marsh.name = Тре�авище
+sector.peaks.name = Върхове
+sector.ravine.name = Кли�ура
+sector.caldera-erekir.name = Калдера
+sector.stronghold.name = Крепо�т
+sector.crevice.name = Процеп
+sector.siege.name = Об�ада
+sector.crossroads.name = Кръ�топът
+sector.karst.name = Кар�т
+sector.origin.name = Произход
+sector.onset.description = Започнете овлад�ването на Ерекир. Събирайте ре�ур�и, произвеждайте единици и започнете да проучвате технологии.
+
+sector.aegis.description = Този �ектор �ъдържа депозит от волфрам.\nПроучете [accent]Пробивни� �вредел[], за да изкопавате този ре�ур� и унищожете враже�ката база в района. 
+sector.lake.description = Количе�твото �лаг в този �ектор значително ограничава подход�щите единици. Един�твено летците �а възможни.\nПроучете [accent]Фабриката за кораби[] и произведете тази [accent]гъвкава[] единица ча� по-�коро.
+sector.intersect.description = Сканирането разкрива, че този �ектор ще бъде нападнат от н�колко �трани веднага щом кацнете.\nРазположете защитите �и и �е разгърнете колкото �е може по-бързо.\nЩе �а Ви нужни [accent]Механизиране[] единици за тукашни� �уров терен.
+sector.atlas.description = Този �ектор има разнообразен терен и ще �а Ви нужни различни единици, за да атакувате ефективно.\nМоже да �а Ви необходими подобрени единици, за да преодолеете н�кои от по-могъщите за�ечени бази на врага.\nПроучете [accent]Електролизатора[] и [accent]Фабриката за танкове[].
+sector.split.description = Този �ектор има минимално враже�ко при�ъ�твие и е идеален за изпробване на новата тран�портна технологи�.
+sector.basin.description = В този �ектор е за�ечено огромно враже�ко при�ъ�твие.\nБързо направете единиците �и и завладейте враже�ките �дра, за да затвърдите при�ъ�твието �и.
+sector.marsh.description = Този �ектор изобил�тва от аркицит, но н�ма много шахти.\nИзградете [accent]Камери за химиче�ко горене[], за да добивате електриче�тво.
+sector.peaks.description = Планин�ки�т терен в този �ектор прави повечето единици безполезни. Ще �а Ви нужни летци.\nВнимавайте за враже�ки противовъздушни ин�талации. Възможно е да обезоръжите н�кои от т�х, ако �е на�очите към поддържащите им �гради.
+sector.ravine.description = В този �ектор не �а за�ечени враже�ки �дра, въпреки че е важен тран�портен маршрут за т�х. Очаквайте разнообразие от враже�ки �или.\nПроизведете [accent]импул�на �плав[]. Издигнете [accent]Мъчителни[] оръди�.
+sector.caldera-erekir.description = Ре�ур�ите за�ечени в тази зона �а разпръ�нати из н�колко о�трова.\nПроучете и по�тавете дронове за тран�порт.
+sector.stronghold.description = Големи�т враже�ки лагер в тази зона предпазва значителни залежи от [accent]торий[].\nИзползвайте го, за да произведете по-ви�око ниво единици и оръди�.
+sector.crevice.description = Врагът ще изпрати �вирепи нападатели, за да унищожат базата Ви в този �ектор.\nИзключително необходимо е да проучите [accent]карбид[] и [accent]Пиролизен генератор[], за да оцелеете.
+sector.siege.description = В този �ектор има два паралелни каньона, които ще Ви тла�нат в борба на два фронта.\nПроучете [accent]цианоген[], за да получите възможно�тта да �ъздавате още по-мощни танкове.\nВнимание: за�ечени �а враже�ки далекобойни ракети. Възможно е да �валите ракетите, преди да Ви удар�т.
+sector.crossroads.description = Враже�ките бази в този �ектор �а изградени върху различни терени. Използвайте разнообразие от единици, за да �е �правите.\nО�вен това н�кои бази �е паз�т � щитове. Тр�бва да разберете откъде идва мощно�тта им.
+sector.karst.description = Този �ектор е богат на ре�ур�и, но веро�тно ще бъдете нападнат от врага веднага щом �дрото Ви кацне.\nВъзползвайте �е от ре�ур�ите и проучете [accent]фазова тъкан[].
+sector.origin.description = По�ледни�т �ектор �ъ� значително враже�ко при�ъ�твие.\n�ищо значимо не Ви о�тава за проучване - �ъ�редоточете �е върху унищожаването на враже�ките �дра.
+
+status.burning.name = Изгар�
+status.freezing.name = Замразен
+status.wet.name = Мокър
+status.muddy.name = Кален
+status.melting.name = Разтоп�ван
+status.sapped.name = Източван
+status.electrified.name = �аелектризиран
+status.spore-slowed.name = Обра�ъл в �пори (забавен)
+status.tarred.name = Обл�н в катран
+status.overdrive.name = Свръх�коро�т
+status.overclock.name = У�корен
+status.shocked.name = Зашеметен
+status.blasted.name = Взривоопа�ен
+status.unmoving.name = �еподвижен
+status.boss.name = Пазител
+
+settings.language = Език
+settings.data = Данни на играта
+settings.reset = Върни към �тандартните на�тройки
+settings.rebind = Смени
+settings.resetKey = �улирай
+settings.controls = Управление
+settings.game = Игра
+settings.sound = Звук
+settings.graphics = Графики
+settings.cleardata = Изчи�ти данните на играта...
+settings.clear.confirm = Сигурни ли �те, че и�кате да изтриете данните на играта?\nСтореното не може да бъде отменено!
+settings.clearall.confirm = [scarlet]Внимание![]\nТова ще изчи�ти в�ички данни за играта, включително запазени игри, карти, отключени елементи и на�тройки на клавишите.\n�ко нати�нете 'ок' играта ще изчи�ти в�ички данни и автоматично ще �е затвори.
+settings.clearsaves.confirm = Сигурни ли �те, че и�кате да изтриете в�ичките �и запазени игри?
+settings.clearsaves = Изчи�ти запазените игри
+settings.clearresearch = Изчи�ти проучвани�та
+settings.clearresearch.confirm = Сигурни ли �те, че и�кате да изчи�тите в�ичките �и проучвани� от кампани�та?
+settings.clearcampaignsaves = Изчи�ти запазените игри в кампани�та
+settings.clearcampaignsaves.confirm = Сигурни ли �те, че и�кате да изтриете в�ичките �и запи�и от кампани�та?
+paused = [accent]< Играта е в пауза >
+clear = Изчи�ти
+banned = [scarlet]Баннат
+unsupported.environment = [scarlet]�еподдържана �реда
+yes = Да
+no = �е
+info.title = Информаци�
+error.title = [scarlet]Възникна грешка
+error.crashtitle = Възникна грешка
+unit.nobuild = [scarlet]Единицата не може да �трои
+lastaccessed = [lightgray]По�ледно до�тъпван: {0}
+lastcommanded = [lightgray]По�ледно командван: {0}
+block.unknown = [lightgray]???
+stat.showinmap = <заредете карта, за да �е покаже>
+
+stat.description = Предназначение
+stat.input = Вход
+stat.output = Изход
+stat.maxefficiency = Мак�. ефика�но�т
+stat.booster = Двигатели
+stat.tiles = �еобходим терен
+stat.affinities = �финитети
+stat.opposites = Противоположно�ти
+stat.powercapacity = Електриче�ки капацитет
+stat.powershot = Електроенерги�/Из�трел
+stat.damage = Щети
+stat.targetsair = �апада по въздух
+stat.targetsground = �апада по зем�
+stat.itemsmoved = Скоро�т на движение
+stat.launchtime = Време между из�трелвани�та
+stat.shootrange = Обхват
+stat.size = Размер
+stat.displaysize = Размер на екрана
+stat.liquidcapacity = Капацитет на течно�ти
+stat.powerrange = Обхват на електроенерги�та
+stat.linkrange = Обхват на връзката
+stat.instructions = Ин�трукции
+stat.powerconnections = Мак�имален брой връзки
+stat.poweruse = Кон�умаци� на електроенерги�
+stat.powerdamage = Електро-енерги�/Щета
+stat.itemcapacity = Ре�ур�ен капацитет
+stat.memorycapacity = Капацитет на паметта
+stat.basepowergeneration = О�новно производ�тво на енерги�
+stat.productiontime = Време за производ�тво
+stat.repairtime = Време за пълна поправка на блок
+stat.repairspeed = Скоро�т на поправ�не
+stat.weapons = Оръжи�
+stat.bullet = Муниции
+stat.moduletier = �иво на модул
+stat.unittype = Вид единица
+stat.speedincrease = У�корение
+stat.range = Обхват
+stat.drilltier = Изкопаеми ре�ур�и
+stat.drillspeed = О�новна �коро�т на �вредлото
+stat.boosteffect = Ефект на у�илване
+stat.maxunits = Мак�имални активни единици
+stat.health = Точки живот
+stat.armor = Брон�
+stat.buildtime = Време за по�тро�ване
+stat.maxconsecutive = Мак�имално по�ледователни
+stat.buildcost = Разходи за изграждане
+stat.inaccuracy = �еточно�т
+stat.shots = Из�трели
+stat.reload = Из�трели/Секунда
+stat.ammo = Боеприпа�и
+stat.shieldhealth = Здравина на щита
+stat.cooldowntime = Време за охлаждане
+stat.explosiveness = Ек�плозивно�т
+stat.basedeflectchance = Базов шан� за отклон�ване на из�трел
+stat.lightningchance = Веро�тно�т за �веткавица
+stat.lightningdamage = Щети от �веткавица
+stat.flammability = Възпламенимо�т
+stat.radioactivity = Радиоактивно�т
+stat.charge = Зар�д
+stat.heatcapacity = Топлинен капацитет
+stat.viscosity = Ви�козитет (гъ�тота)
+stat.temperature = Температура
+stat.speed = Скоро�т
+stat.buildspeed = Скоро�т на изграждане
+stat.minespeed = Скоро�т на добив
+stat.minetier = �иво на добив
+stat.payloadcapacity = Товарен капацитет
+stat.abilities = Спо�обно�ти
+stat.canboost = Може да у�кор�ва
+stat.flying = Лет�щ
+stat.ammouse = Употреба на боеприпа�и
+stat.ammocapacity = Муниции
+stat.damagemultiplier = Множител на щети
+stat.healthmultiplier = Множител на точки живот
+stat.speedmultiplier = Множител на �коро�т
+stat.reloadmultiplier = Множител на презареждане
+stat.buildspeedmultiplier = Множител на �коро�т за изграждане
+stat.reactive = Реагира
+stat.immunities = Имунитет
+stat.healing = Лечение
+stat.efficiency = [stat]{0}% Efficiency
+
+ability.forcefield = Енергийно поле
+ability.forcefield.description = Проектира �илово поле, което поглъща куршуми
+ability.repairfield = Въз�танов�ващо поле
+ability.repairfield.description = Поправ� околните единици
+ability.statusfield = Под�илващо поле
+ability.statusfield.description = Има определен ефект върху околните единици
+ability.unitspawn = Фабрика
+ability.unitspawn.description = Произвежда единици
+ability.shieldregenfield = Щитово поле
+ability.shieldregenfield.description = Въз�танов�ва щитовете на околните единици
+ability.movelightning = Подвижна �веткавица
+ability.movelightning.description = Отприщва �веткавици, докато �е движи
+ability.armorplate = Бронирани плочи
+ability.armorplate.description = �амал�ва вредата, ко�то единицата претърп�ва, докато �трел�
+ability.shieldarc = Щит-дъга
+ability.shieldarc.description = Проектира �илово поле в дъга, ко�то поглъща куршуми
+ability.suppressionfield = Поти�кащо поле
+ability.suppressionfield.description = Спира поправката на околните �гради
+ability.energyfield = Енергийно поле
+ability.energyfield.description = Удр� � ток близките врагове
+ability.energyfield.healdescription = Удр� � ток близките врагове и лекува при�тел�ките единици
+ability.regen = Регенераци�
+ability.regen.description = Въз�танов�ва здравето �и � течение на времето
+ability.liquidregen = Попивателни �вой�тва
+ability.liquidregen.description = Поглъща течно�т, за да �е лекува
+ability.spawndeath = Малък подарък
+ability.spawndeath.description = Пу�ка единици, когато загине
+ability.liquidexplode = Разливане
+ability.liquidexplode.description = Разлива течно�тта �и, когато загине
+ability.stat.firingrate = [stat]{0}/в �ек.[lightgray] �коро�т на огън�
+ability.stat.regen = [stat]{0}[lightgray] здраве/�ек.
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] щит
+ability.stat.repairspeed = [stat]{0}/в �ек.[lightgray] �коро�т на поправка
+ability.stat.slurpheal = [stat]{0}[lightgray] здраве/количе�тво течно�т
+ability.stat.cooldown = [stat]{0} в �ек.[lightgray] презареждане
+ability.stat.maxtargets = [stat]{0}[lightgray] мак�. мишени
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] еднакво количе�тво поправка
+ability.stat.damagereduction = [stat]{0}%[lightgray] намал�ване на вредата
+ability.stat.minspeed = [stat]{0} полета/в �ек.[lightgray] мин. �коро�т
+ability.stat.duration = [stat]{0} в �ек.[lightgray] продължително�т
+ability.stat.buildtime = [stat]{0} в �ек.[lightgray] време за �троеж
+
+bar.onlycoredeposit = До�тав�нето е разрешено �амо до �дрото
+
+bar.drilltierreq = �еобходимо е по-добро �вредло
+bar.nobatterypower = Insufficient Battery Power
+bar.noresources = �едо�татъчно ре�ур�и
+bar.corereq = �еобходимо е �дро за о�нова
+bar.corefloor = �еобходимо е поле за �дрото
+bar.cargounitcap = Капацитета на прено�вачите е до�тигнат
+bar.drillspeed = Скоро�т на �вредлото: {0}/�ек
+bar.pumpspeed = Скоро�т на помпата: {0}/�ек
+bar.efficiency = Ефективно�т: {0}%
+bar.boost = У�илване: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = Електроенерги�: {0}/�ек
+bar.powerstored = Съхранена енерги�: {0}/{1}
+bar.poweramount = Електроенерги�: {0}
+bar.poweroutput = Произвеждано електриче�тво: {0}
+bar.powerlines = Връзки: {0}/{1}
+bar.items = Предмети: {0}
+bar.capacity = Капацитет: {0}
+bar.unitcap = {0} {1}/{2}
+bar.liquid = Течно�т
+bar.heat = Топлина
+bar.cooldown = Cooldown
+bar.instability = �е�табилно�т
+bar.heatamount = Горещина: {0}
+bar.heatpercent = Горещина: {0} ({1}%)
+bar.power = Електроенерги�
+bar.progress = �апредък в производ�твото
+bar.loadprogress = �апредък
+bar.launchcooldown = Презареждане на из�трела
+bar.input = Вход
+bar.output = Изход
+bar.strength = [stat]{0}[lightgray]x �ила
+
+units.processorcontrol = [lightgray]Контролиран от проце�ор
+
+bullet.damage = [stat]{0}[lightgray] щети
+bullet.splashdamage = [stat]{0}[lightgray] щети на площ ~[stat] {1}[lightgray] полета
+bullet.incendiary = [stat]Подпалване
+bullet.homing = [stat]Самона�очване
+bullet.armorpierce = [stat]Пробождане на брон�
+bullet.maxdamagefraction = [stat]{0}%[lightgray] ограничена щета
+bullet.suppression = [stat]{0} �ек[lightgray] възпиране на поправки ~ [stat]{1}[lightgray] плочки
+bullet.interval = [stat]{0}/�ек[lightgray] куршуми в интервал:
+bullet.frags = [stat]{0}[lightgray]x фрагменти:
+bullet.lightning = [stat]{0}[lightgray]x �веткавица ~ [stat]{1}[lightgray] щети
+bullet.buildingdamage = [stat]{0}%[lightgray] щети на �гради
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] отблъ�кване
+bullet.pierce = [stat]{0}[lightgray]x пробождане
+bullet.infinitepierce = [stat]пробождане
+bullet.healpercent = [stat]{0}[lightgray]% въз�танов�ване
+bullet.healamount = [stat]{0}[lightgray] директна поправка
+bullet.multiplier = [stat]{0}[lightgray]x множител на боеприпа�и
+bullet.reload = [stat]{0}[lightgray]x �коро�т на �трелба
+bullet.range = [stat]{0}[lightgray] обхват
+bullet.notargetsmissiles = [stat] ignores missiles
+bullet.notargetsbuildings = [stat] ignores buildings
+
+unit.blocks = блокове
+unit.blockssquared = блока²
+unit.powersecond = електриче�тво/�екунда
+unit.tilessecond = полета/�екунда
+unit.liquidsecond = течно�т/�екунда
+unit.itemssecond = предмети/�екунда
+unit.liquidunits = течно�т
+unit.powerunits = електриче�тво
+unit.heatunits = единици горещина
+unit.degrees = граду�и
+unit.seconds = �екунди
+unit.minutes = минути
+unit.persecond = /�ек
+unit.perminute = /мин
+unit.timesspeed = x �коро�т
+unit.multiplier = x
+unit.percent = %
+unit.shieldhealth = здравина на щита
+unit.items = предмети
+unit.thousands = хил
+unit.millions = млн
+unit.billions = млр
+unit.shots = shots
+unit.pershot = /из�трел
+category.purpose = Предназначение
+category.general = Обща информаци�
+category.power = Електриче�тво
+category.liquids = Течно�ти
+category.items = Предмети
+category.crafting = Вход/Изход
+category.function = Функционално�т
+category.optional = Допълнителни подобрени�
+setting.alwaysmusic.name = �ека има музика
+setting.alwaysmusic.description = Когато тази опци� е включена, музиката винаги ще продължава.\nИзключите ли опци�та, музиката ще �е задей�тва през неопределен интервал от време.
+setting.skipcoreanimation.name = Пропу�кане на анимаци�та на �дрото при из�трел/кацане
+setting.landscape.name = Заключване на пейзажа
+setting.shadows.name = Сенки
+setting.blockreplace.name = �втоматични предложени� за блокове
+setting.linear.name = Линейно филтриране
+setting.hints.name = Съвети
+setting.logichints.name = Логиче�ки �ъвети
+setting.backgroundpause.name = Пауза при загуба на фоку�
+setting.buildautopause.name = �втоматична пауза на изграждането
+setting.doubletapmine.name = Двоен клик за добив на ре�ур�
+setting.commandmodehold.name = Задържане за команден режим
+setting.distinctcontrolgroups.name = Ограничаване на контролните групи за една единица 
+setting.modcrashdisable.name = Забрани Модовете При Стартиране След Срив
+setting.animatedwater.name = �нимирани повърхно�ти
+setting.animatedshields.name = �нимирани щитове
+setting.playerindicators.name = Индикатори за играчите
+setting.indicators.name = Индикатори за враговете
+setting.autotarget.name = �втоматичен прицел
+setting.keyboard.name = Управление: мишка/клавиатура
+setting.touchscreen.name = Управление: тъч�крийн
+setting.fpscap.name = Мак�имални FPS
+setting.fpscap.none = ��ма
+setting.fpscap.text = {0} FPS
+setting.uiscale.name = Размер на интерфей�а[lightgray] (изи�ква ре�тарт)[]
+setting.uiscale.description = �ужен е ре�тарт, за да �е приложат промените.
+setting.swapdiagonal.name = Винаги диагонално по�тав�не
+setting.screenshake.name = Клатене на екрана
+setting.bloomintensity.name = Интензитет на �и�ни�та
+setting.bloomblur.name = Замъгл�ване на �и�ние
+setting.effects.name = Показвай ефекти
+setting.destroyedblocks.name = Показвай унищожени блокове
+setting.blockstatus.name = Показвай �тату�а на блоковете
+setting.conveyorpathfinding.name = �амиране на валидна пътека при по�тав�не на тран�портери
+setting.sensitivity.name = Чув�твително�т на контролера
+setting.saveinterval.name = Време между автоматичен запи�
+setting.seconds = {0} �екунди
+setting.milliseconds = {0} мили�екунди
+setting.fullscreen.name = Ц�л екран
+setting.borderlesswindow.name = Прозорец без рамка[lightgray] (може да изи�ква ре�тарт)
+setting.borderlesswindow.name.windows = Ц�л екран без рамка
+setting.borderlesswindow.description = Може да е нужен ре�тарт, за да �е приложат промените.
+setting.fps.name = Показвай FPS & пинг
+setting.console.name = Включване на конзолата
+setting.smoothcamera.name = Гладка камера
+setting.vsync.name = Вертикална �инхронизаци� (VSync)
+setting.pixelate.name = Пик�елизаци�
+setting.minimap.name = Показвай мини-карта
+setting.coreitems.name = Показвай ре�ур�ите в �дрото
+setting.position.name = Показвай позици�та на играча
+setting.mouseposition.name = Показвай позици�та на мишката
+setting.musicvol.name = Сила на звука
+setting.atmosphere.name = Показвай атмо�ферата на планетата
+setting.drawlight.name = �ачертаване на мрак/�ветлина
+setting.ambientvol.name = Сила на звука на околната �реда
+setting.mutemusic.name = Заглуши музиката
+setting.sfxvol.name = Сила на звуковите ефекти
+setting.mutesound.name = Заглуши звука
+setting.crashreport.name = Изпращай анонимни отчети за �ривове
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = �втоматични запи�и
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Лимит на играчи
+setting.chatopacity.name = Плътно�т на чата
+setting.lasersopacity.name = Плътно�т на енергийните лазери
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Плътно�т на мо�товете
+setting.playerchat.name = Показвай балончета за чата
+setting.showweather.name = Показвай графики за климата
+setting.hidedisplays.name = Скрий логиче�ките екрани
+setting.macnotch.name = �даптирайте интерфей�а за показване на прорез
+setting.macnotch.description = За прилагане на промените е необходимо ре�тартиране
+steam.friendsonly = Само при�тели
+steam.friendsonly.tooltip = Дали вашите при�тели от Steam ще могат да �е включат в играта ви.\nИзключването на тази опци� ще направи играта Ви публична и в�еки ще може да �е при�ъедини.
+public.beta = Имайте в предвид, че бета вер�ии на играта не могат да �тартират публични игри.
+uiscale.reset = Размерът на интерфей�а беше променен.\n�ати�нете "ОК" за да потвърдите този размер.\n[scarlet]Въз�танов�ване и ре�тартиране �лед[accent] {0}[] �екунди...
+uiscale.cancel = Отказ и изход
+setting.bloom.name = Си�ние
+keybind.title = Промени клавишите
+keybinds.mobile = [scarlet]Повечето клавиши не �а приложими при мобилната вер�и�. Поддържат �е �амо о�новните движени�.
+category.general.name = О�новни на�тройки
+category.view.name = Изглед
+category.command.name = Управление на единици
+category.multiplayer.name = Мрежова игра
+category.blocks.name = Избор на блок
+placement.blockselectkeys = \n[lightgray]Клавиш: [{0},
+keybind.respawn.name = Връщане при �дрото
+keybind.control.name = Управл�ване на единица
+keybind.clear_building.name = Изчи�тване на �троежен план
+keybind.press = �ати�нете клавиш...
+keybind.press.axis = �ати�нете о� или клавиш...
+keybind.screenshot.name = Екранна �нимка
+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.pan.name = Панорамен изглед
+keybind.boost.name = У�корение
+keybind.command_mode.name = Команден режим
+keybind.command_queue.name = По�ледователни заповеди
+keybind.create_control_group.name = Създаване на обща група
+keybind.cancel_orders.name = Отмен�не на заповедите
+keybind.unit_stance_shoot.name = Поведение: Стрелба
+keybind.unit_stance_hold_fire.name = Поведение: �е �трел�й
+keybind.unit_stance_pursue_target.name = Поведение: Пре�ледвай целта
+keybind.unit_stance_patrol.name = Поведение: Патрул
+keybind.unit_stance_ram.name = Поведение: Забий �е
+keybind.unit_command_move.name = Команда: Движение
+keybind.unit_command_repair.name = Команда: Поправка
+keybind.unit_command_rebuild.name = Команда: Ремонт
+keybind.unit_command_assist.name = Команда: Съдей�твие
+keybind.unit_command_mine.name = Команда: Копаене
+keybind.unit_command_boost.name = Команда: Под�илване
+keybind.unit_command_load_units.name = Команда: �атовари единици
+keybind.unit_command_load_blocks.name = Команда: �атовари блокове
+keybind.unit_command_unload_payload.name = Команда: Разтовари
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Въз�танов�ване на региона
+keybind.schematic_select.name = Избери регион
+keybind.schematic_menu.name = Меню �ъ� �хеми
+keybind.schematic_flip_x.name = Завърти �хема по X
+keybind.schematic_flip_y.name = Завърти �хема по Y
+keybind.category_prev.name = Предишна категори�
+keybind.category_next.name = Следваща категори�
+keybind.block_select_left.name = Избор на блок: �ал�во
+keybind.block_select_right.name = Избор на блок: �ад��но
+keybind.block_select_up.name = Избор на блок: �агоре
+keybind.block_select_down.name = Избор на блок: �адолу
+keybind.block_select_01.name = Избор на блок: Категори� 1
+keybind.block_select_02.name = Избор на блок: Категори� 2
+keybind.block_select_03.name = Избор на блок: Категори� 3
+keybind.block_select_04.name = Избор на блок: Категори� 4
+keybind.block_select_05.name = Избор на блок: Категори� 5
+keybind.block_select_06.name = Избор на блок: Категори� 6
+keybind.block_select_07.name = Избор на блок: Категори� 7
+keybind.block_select_08.name = Избор на блок: Категори� 8
+keybind.block_select_09.name = Избор на блок: Категори� 9
+keybind.block_select_10.name = Избор на блок: Категори� 10
+keybind.fullscreen.name = Превключи на ц�л екран
+keybind.select.name = Избери/Стрелба
+keybind.diagonal_placement.name = Диагонално по�тав�не
+keybind.pick.name = Вземи блок
+keybind.break_block.name = Унищожи блок
+keybind.select_all_units.name = Избери в�ички единици
+keybind.select_all_unit_factories.name = Избиране на в�ички фабрики за единици
+keybind.deselect.name = Премахни избора
+keybind.pickupCargo.name = Вземи товар
+keybind.dropCargo.name = О�тави товар
+keybind.shoot.name = Стрел�й
+keybind.zoom.name = Увеличи
+keybind.menu.name = Меню
+keybind.pause.name = Пауза
+keybind.pause_building.name = Спри/Продължи �троеж
+keybind.minimap.name = Мини-карта
+keybind.planet_map.name = Глобу�/Карта на �вета
+keybind.research.name = Проучвани�
+keybind.block_info.name = Информаци� за блок
+keybind.chat.name = Чат
+keybind.player_list.name = Спи�ък � играчи
+keybind.console.name = Конзола
+keybind.rotate.name = Завърти
+keybind.rotateplaced.name = Завърти �ъще�твуващ блок (задържане)
+keybind.toggle_menus.name = Покажи/Скрий менюта
+keybind.chat_history_prev.name = Предишно �ъобщение
+keybind.chat_history_next.name = Следващо �ъобщение
+keybind.chat_scroll.name = Превъртане на чата
+keybind.chat_mode.name = Смени режим на чат
+keybind.drop_unit.name = О�тави единица
+keybind.zoom_minimap.name = Увеличи мини-карта
+mode.help.title = Опи�ание на режими
+mode.survival.name = Survival
+
+mode.survival.description = �ормални�т режим на играта. Ограничени ре�ур�и и автоматични вълни от нападатели.\n[gray]Картата тр�бва да �ъдържа начална точка за враговете.
+mode.sandbox.name = П��ъчник
+mode.sandbox.description = Безкрайни ре�ур�и и безкрайно време между вълните от нападатели.
+mode.editor.name = Редактор
+mode.pvp.name = Играч �рещу играч
+mode.pvp.description = Играйте �рещу други играчи в локалната мрежа.\n[gray]Картата тр�бва да �ъдържа поне 2 �дра в различни цветове.
+mode.attack.name = �ападение
+mode.attack.description = Унищожете враже�ката база. \n[gray]Картата тр�бва да �ъдържа червено �дро.
+mode.custom = Пер�онализирани правила
+rules.invaliddata = �евалидни данни от клипборда.
+rules.hidebannedblocks = Скрий забранените блокове
+
+rules.infiniteresources = Безкрайни Ре�ур�и
+rules.onlydepositcore = Разрешете до�тав�не �амо в �дрото
+rules.derelictrepair = Разрешете поправ�нето на изо�тавени блокове
+rules.reactorexplosions = Ек�плозивни реактори
+rules.coreincinerates = Унищожаване на ре�ур�и при преливане
+rules.disableworldprocessors = Изключване на проце�орите за �вета
+rules.schematic = Позволена употребата на �хеми
+rules.wavetimer = Таймер за Вълни
+rules.wavesending = Изпращане на вълни
+rules.allowedit = Позволи е редактирането на правилата
+rules.allowedit.info = Когато включите тази опци�, играчът може да промен� правилата в играта чрез менюто Пауза и копчето в долни�т л�в ъгъл.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
+rules.waves = Вълни
+rules.airUseSpawns = Въздушните единици използват точки за по�ва
+rules.attack = Режим атака
+rules.buildai = ИИ на �троител�т на бази
+rules.buildaitier = Степен на ИИ �троител�
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Мин. размер на взводовете
+rules.rtsmaxsquadsize = Мак�. размер на взводовете
+rules.rtsminattackweight = Мин. атакуваща теже�т
+rules.cleanupdeadteams = Изчи�ти �градите на победени� отбор (PvP)
+rules.corecapture = Завладей �дро при унищожение
+rules.polygoncoreprotection = Полигонална защита на �дрото
+rules.placerangecheck = Проверка за обхват при по�тав�не
+rules.enemyCheat = Безкрайни ре�ур�и за компютъра (Червени�т отбор)
+rules.blockhealthmultiplier = Множител на точките живот на блокове
+rules.blockdamagemultiplier = Множител на щетите на блокове
+rules.unitbuildspeedmultiplier = Множител на �коро�тта на производ�тво на единици
+rules.unitcostmultiplier = Множител на цената за единици
+rules.unithealthmultiplier = Множител на точките живот на единици
+rules.unitdamagemultiplier = Множител на щетите на единици
+rules.unitcrashdamagemultiplier = Множител на вредата от разбиващи �е единици
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Множител на �лънчевата енерги�
+rules.unitcapvariable = Ядрата увеличават мак�имални� брой единици
+rules.unitpayloadsexplode = �о�ени�т товар ек�плодира � единицата
+rules.unitcap = Мак�имален брой единици
+rules.limitarea = Ограничаване на картата
+rules.enemycorebuildradius = Радиу� на защитена от �троене зона около �драта:[lightgray] (полета)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Време между вълните:[lightgray] (�екунди)
+rules.initialwavespacing = Първоначално разполагане на вълните:[lightgray] (sec)
+rules.buildcostmultiplier = Множител на необходимите ре�ур�и за �троеж
+rules.buildspeedmultiplier = Множител на �коро�тта на �троене
+rules.deconstructrefundmultiplier = Множител на въз�тановени ре�ур�и при декон�трукци�
+rules.waitForWaveToEnd = Вълните изчакват враговете
+rules.wavelimit = Картата приключва �лед вълна
+rules.dropzoneradius = Радиу� на начална точка на враговете:[lightgray] (полета)
+rules.unitammo = Единиците �е нужда�т от боеприпа�и
+rules.enemyteam = Враже�ки отбор
+rules.playerteam = Отбор на играча
+
+rules.title.waves = Вълни
+rules.title.resourcesbuilding = Ре�ур�и и по�тройки
+rules.title.enemy = Врагове
+rules.title.unit = Единици
+rules.title.experimental = Ек�периментално
+rules.title.environment = Околна �реда
+rules.title.teams = Отбори
+rules.title.planet = Планета
+rules.lighting = Светкавици
+rules.fog = Мъгла на войната
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = Огън
+rules.anyenv = <Any>
+rules.explosions = Блокирай/Единици вреда от ек�плози�
+rules.ambientlight = Светлина от околната �реда
+rules.weather = Климат
+rules.weather.frequency = Че�тота:
+rules.weather.always = Винаги
+rules.weather.duration = Продължително�т:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = �е позвол�ва на играчите да по�тав�т нещо в близо�т до враже�ките �гради. Когато �е опитват да по�тав�т оръдие, обхватът е увеличен, за да не може оръдието да до�тигне врага.
+rules.onlydepositcore.info = �е позвол�ва на единиците да по�тав�т предмети, в ко�то и да е �града, � изключение на �дро.
+
+
+content.item.name = Предмети
+content.liquid.name = Течно�ти
+content.unit.name = Единици
+content.block.name = Блокове
+content.status.name = Стату�-ефекти
+content.sector.name = Сектори
+content.team.name = Групировки
+wallore = (Стена)
+
+item.copper.name = Мед
+item.lead.name = Олово
+item.coal.name = Въглища
+item.graphite.name = Графит
+item.titanium.name = Титан
+item.thorium.name = Торий
+item.silicon.name = Силикон
+item.plastanium.name = Пла�таний
+item.phase-fabric.name = Фазова тъкан
+item.surge-alloy.name = Импул�на �плав
+item.spore-pod.name = Сгъ�тени �пори
+item.sand.name = П��ък
+item.blast-compound.name = Взривно �ъединение
+item.pyratite.name = Пиратит
+item.metaglass.name = Мета-�тъкло
+item.scrap.name = Скрап
+item.fissile-matter.name = Ши�тена матери�
+item.beryllium.name = Берилий
+item.tungsten.name = Волфрам
+item.oxide.name = Ок�ид
+item.carbide.name = Карбид
+item.dormant-cyst.name = Латентна ци�та
+liquid.water.name = Вода
+liquid.slag.name = Шлака
+liquid.oil.name = �ефт
+liquid.cryofluid.name = Криотечно�т
+liquid.neoplasm.name = �еоплазма
+liquid.arkycite.name = �ркицид
+liquid.gallium.name = Галий
+liquid.ozone.name = Озон
+liquid.hydrogen.name = Водород
+liquid.nitrogen.name = Въглерод
+liquid.cyanogen.name = Цианоген
+
+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.retusa.name = Ретуза
+unit.oxynoe.name = Ок�иное
+unit.cyerce.name = Цир�е
+unit.aegires.name = Ежир
+unit.navanax.name = �аванак�
+unit.alpha.name = �лфа
+unit.beta.name = Бета
+unit.gamma.name = Гама
+unit.scepter.name = Скиптър
+unit.reign.name = Вла�т
+unit.vela.name = Вела
+unit.corvus.name = Гарван
+unit.stell.name = Щел
+unit.locus.name = Ро�к
+unit.precept.name = Правило
+unit.vanquish.name = Победа
+unit.conquer.name = Завоевание
+unit.merui.name = Меруи
+unit.cleroi.name = Клерой
+unit.anthicus.name = �нтик
+unit.tecta.name = Текта
+unit.collaris.name = Колари�
+unit.elude.name = Бегач
+unit.avert.name = Отклонение
+unit.obviate.name = Заличител
+unit.quell.name = Потушение
+unit.disrupt.name = Възпиране
+unit.evoke.name = Пробуждане
+unit.incite.name = Под�трекател
+unit.emanate.name = Еманаци�
+unit.manifold.name = Разклонение
+unit.assembly-drone.name = Дрон-�троител
+unit.latum.name = Латум
+unit.renale.name = Ренал
+block.parallax.name = Паралак�
+block.cliff.name = Скала
+block.sand-boulder.name = П��ъчен камък
+block.basalt-boulder.name = Базалтов камък
+block.grass.name = Трева
+block.molten-slag.name = Шлака
+block.pooled-cryofluid.name = Криотечно�т
+block.space.name = Ко�мо�
+block.salt.name = Сол
+block.salt-wall.name = Стена от �ол
+block.pebbles.name = Камъчета
+block.tendrils.name = Пипала
+block.sand-wall.name = Стена от п��ък
+block.spore-pine.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.shale-wall.name = Стена от хра�ти
+block.scrap-wall.name = Стена от �крап
+block.scrap-wall-large.name = Гол�ма �тена от �крап
+block.scrap-wall-huge.name = Огромна �тена от �крап
+block.scrap-wall-gigantic.name = Гигант�ка �тена от �крап
+block.thruster.name = Двигател
+block.kiln.name = Пещ
+block.graphite-press.name = Графитна пре�а
+block.multi-press.name = Мулти-пре�а
+block.constructing = {0} [lightgray](изграждане)
+block.spawn.name = Враже�ка начална точка
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
+block.core-shard.name = Ядро: Ча�тица
+block.core-foundation.name = Ядро: Фондаци�
+block.core-nucleus.name = Ядро: Център
+block.deep-water.name = Дълбока вода
+block.shallow-water.name = Вода
+block.tainted-water.name = Замър�ена вода
+block.deep-tainted-water.name = Дълбоко замър�ена вода
+block.darksand-tainted-water.name = Тъмен п��ък - Замър�ена вода
+block.tar.name = Катран
+block.stone.name = Камък
+block.sand-floor.name = П��ък
+block.darksand.name = Тъмен п��ък
+block.ice.name = Лед
+block.snow.name = Сн�г
+block.crater-stone.name = Кратери
+block.sand-water.name = П��ък - Вода
+block.darksand-water.name = Тъмен П��ък - Вода
+block.char.name = Овъглен камък
+block.dacite.name = Дацит
+block.rhyolite.name = Риолит
+block.dacite-wall.name = Стена от дацит
+block.dacite-boulder.name = Скала от дацит
+block.ice-snow.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 = Купчина �пори
+block.metal-floor.name = Метален под 1
+block.metal-floor-2.name = Метален под 2
+block.metal-floor-3.name = Метален под 3
+block.metal-floor-4.name = Метален под 4
+block.metal-floor-5.name = Метален под 4
+block.metal-floor-damaged.name = Повреден метален под
+block.dark-panel-1.name = Тъмен панел 1
+block.dark-panel-2.name = Тъмен панел 2
+block.dark-panel-3.name = Тъмен панел 3
+block.dark-panel-4.name = Тъмен панел 4
+block.dark-panel-5.name = Тъмен панел 5
+block.dark-panel-6.name = Тъмен панел 6
+block.dark-metal.name = Тъмен метал
+block.basalt.name = Базалт
+block.hotrock.name = Топла �кала
+block.magmarock.name = Магмена �кала
+block.copper-wall.name = Стена от мед
+block.copper-wall-large.name = Гол�ма �тена от мед
+block.titanium-wall.name = Стена от титан
+block.titanium-wall-large.name = Гол�ма �тена от титан
+block.plastanium-wall.name = Стена от пла�таний
+block.plastanium-wall-large.name = Гол�ма �тена от пла�таний
+block.phase-wall.name = Фазова �тена
+block.phase-wall-large.name = Гол�ма фазова �тена
+block.thorium-wall.name = Стена от торий
+block.thorium-wall-large.name = Гол�ма �тена от торий
+block.door.name = Врата
+block.door-large.name = Гол�ма врата
+block.duo.name = Дуо
+block.scorch.name = Горелка
+block.scatter.name = Пръ�кач
+block.hail.name = Градушка
+block.lancer.name = Улан
+block.conveyor.name = Лента
+block.titanium-conveyor.name = Титаниева лента
+block.plastanium-conveyor.name = Пла�таниева лента
+block.armored-conveyor.name = Бронирана лента
+block.junction.name = Кръ�товище
+block.router.name = Рутер
+block.distributor.name = Разпределител
+block.sorter.name = Сортировач
+block.inverted-sorter.name = Обърнат �ортировач
+block.message.name = Съобщение
+block.reinforced-message.name = Под�илено �ъобщение
+block.world-message.name = Глобално �ъобщение
+block.world-switch.name = Глобален превключвател
+block.illuminator.name = О�ветител
+block.overflow-gate.name = Преливаща порта
+block.underflow-gate.name = Обратна преливаща порта
+block.silicon-smelter.name = Силиконова пещ
+block.phase-weaver.name = Тъкач на фазова тъкан
+block.pulverizer.name = Пулверизатор
+block.cryofluid-mixer.name = Мик�ер за криотечно�т
+block.melter.name = Разтопител
+block.incinerator.name = Крематорий
+block.spore-press.name = Пре�а за �пори
+block.separator.name = Разделител
+block.coal-centrifuge.name = Центрифуга за въглища
+block.power-node.name = Електриче�ки възел
+block.power-node-large.name = Гол�м електриче�ки възел
+block.surge-tower.name = Трафопо�т
+block.diode.name = Диод
+block.battery.name = Батери�
+block.battery-large.name = Гол�ма батери�
+block.combustion-generator.name = Горивен генератор
+block.steam-generator.name = Парен генератор
+block.differential-generator.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.conduit.name = Тръбопровод
+block.mechanical-pump.name = Механична помпа
+block.item-source.name = Материализатор на предмети
+block.item-void.name = Дематериализатор на предмети
+block.liquid-source.name = Материализатор на течно�ти
+block.liquid-void.name = Дематериализатор натТечно�ти
+block.power-void.name = Материализатор на енерги�
+block.power-source.name = Дематериализатор на енерги�
+block.unloader.name = Разтоварващо у�трой�тво
+block.vault.name = Склад
+block.wave.name = Вълна
+block.tsunami.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.solar-panel.name = Фотоволтаик
+block.solar-panel-large.name = Гол�м фотоволтаик
+block.oil-extractor.name = �ефтена �онда
+block.repair-point.name = Точка за поправка
+block.repair-turret.name = Поправ�що уръдие
+block.pulse-conduit.name = Импул�ен тръбопровод
+block.plated-conduit.name = Тръбопровод � покритие
+block.phase-conduit.name = Фазов тръбопровод
+block.liquid-router.name = Рутер за течно�ти
+block.liquid-tank.name = Резервоар за течно�ти
+block.liquid-container.name = Контейнер за течно�ти
+block.liquid-junction.name = Тръбопроводно кръ�товище
+block.bridge-conduit.name = Мо�т за течно�ти
+block.rotary-pump.name = Ротационна помпа
+block.thorium-reactor.name = Ториев реактор
+block.mass-driver.name = Ма�ов прено�ител
+block.blast-drill.name = Въздушно �вредло
+block.impulse-pump.name = Термична помпа
+block.thermal-generator.name = Термичен генератор
+block.surge-smelter.name = Претопител за импул�на �плав
+block.mender.name = Въз�тановител
+block.mend-projector.name = Въз�танов�ващ проектор
+block.surge-wall.name = Импул�на �тена
+block.surge-wall-large.name = Гол�ма импул�на �тена
+block.cyclone.name = Циклон
+block.fuse.name = Електрошок
+block.shock-mine.name = Мина
+block.overdrive-projector.name = У�кор�ващ проектор
+block.force-projector.name = Силов проектор
+block.arc.name = Волтова дъга
+block.rtg-generator.name = RTG генератор
+block.spectre.name = Спектър
+block.meltdown.name = Разтопител
+block.foreshadow.name = Предве�тител
+block.container.name = Контейнер
+block.launch-pad.name = Из�трелваща площадка
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.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.duct.name = Канал
+block.duct-router.name = Канален рутер
+block.duct-bridge.name = Канален мо�т
+block.large-payload-mass-driver.name = Ма�иран до�тавчик на едър товар
+block.payload-void.name = Товарна бездна
+block.payload-source.name = Товарен източник
+block.disassembler.name = Разглобител
+block.silicon-crucible.name = Силиконов тигел
+block.overdrive-dome.name = У�кор�ващ купол
+block.interplanetary-accelerator.name = Междупланетен у�корител
+block.constructor.name = Строител
+block.constructor.description = Изработва �гради до размер 2х2 полета.
+block.large-constructor.name = Едър �троител
+block.large-constructor.description = Изработва �гради до размер 4х4 полета.
+block.deconstructor.name = Декон�труктор
+block.deconstructor.description = Разглаб� �гради и единици. Въз�танов�ва 100% от разходите.
+block.payload-loader.name = Товарител
+block.payload-loader.description = Товари течно�ти и предмети в блокове.
+block.payload-unloader.name = Разтоварител
+block.payload-unloader.description = Разтоварва течно�ти и предмети от блокове.
+block.heat-source.name = Топлинен източник
+block.heat-source.description = Блок в размер 1х1. Отдел� почти безкрайна топлина.
+block.empty.name = Празно
+block.rhyolite-crater.name = Риолитен кратер
+block.rough-rhyolite.name = Суров риолит
+block.regolith.name = Реголит
+block.yellow-stone.name = Жълт камък
+block.carbon-stone.name = Въглероден камък
+block.ferric-stone.name = Железен камък
+block.ferric-craters.name = Железни кратери
+block.beryllic-stone.name = Камък от берил
+block.crystalline-stone.name = Кри�тален камък
+block.crystal-floor.name = Кри�тален под
+block.yellow-stone-plates.name = Жълти каменни плочи
+block.red-stone.name = Червен камък
+block.dense-red-stone.name = Гъ�т червен камък
+block.red-ice.name = Червен лед
+block.arkycite-floor.name = �ркициден под
+block.arkyic-stone.name = �ркичен камък
+block.rhyolite-vent.name = Риолитен отвор
+block.carbon-vent.name = Въглероден отвор
+block.arkyic-vent.name = �ркичен отвор
+block.yellow-stone-vent.name = Отвор за жълт камък
+block.red-stone-vent.name = Отвор за червен камък
+block.crystalline-vent.name = Кри�тален отвор
+block.redmat.name = Червен килим
+block.bluemat.name = Син килим
+block.core-zone.name = Зона за �дро
+block.regolith-wall.name = Реголитна �тена
+block.yellow-stone-wall.name = Стена от жълт камък
+block.rhyolite-wall.name = Риолитна �тена
+block.carbon-wall.name = Въглеродна �тена
+block.ferric-stone-wall.name = Железна �тена
+block.beryllic-stone-wall.name = Стена от берил
+block.arkyic-wall.name = �ркична �тена
+block.crystalline-stone-wall.name = Кри�тална �тена
+block.red-ice-wall.name = Стена от червен лед
+block.red-stone-wall.name = Стена от червен камък
+block.red-diamond-wall.name = Стена от червен диамант
+block.redweed.name = Червена тръ�тика
+block.pur-bush.name = Пур хра�т
+block.yellowcoral.name = Жълт корал
+block.carbon-boulder.name = Въглеродна �кала
+block.ferric-boulder.name = Жел�зна �кала
+block.beryllic-boulder.name = Скала от берил
+block.yellow-stone-boulder.name = Скала от жълт камък
+block.arkyic-boulder.name = �ркична �кала
+block.crystal-cluster.name = Куп кри�тали
+block.vibrant-crystal-cluster.name = Куп от �рки кри�тали
+block.crystal-blocks.name = Кри�тални блокове
+block.crystal-orbs.name = Кри�тални кълба
+block.crystalline-boulder.name = Кри�тални �кали
+block.red-ice-boulder.name = Скала от червен лед
+block.rhyolite-boulder.name = Риолитна �кала
+block.red-stone-boulder.name = Скала от червен камък
+block.graphitic-wall.name = Стена от графит
+block.silicon-arc-furnace.name = �ркова фурна за �иликон
+block.electrolyzer.name = Електролизатор
+block.atmospheric-concentrator.name = Концентратор на атмо�фера
+block.oxidation-chamber.name = Ок�идационна камера
+block.electric-heater.name = Електриче�ки нагревател
+block.slag-heater.name = �агревател за �лаг
+block.phase-heater.name = Фазов нагревател
+block.heat-redirector.name = Разпределител на топлина
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Топлинен рутер
+block.slag-incinerator.name = Фурна за �лаг
+block.carbide-crucible.name = Тигел за карбид
+block.slag-centrifuge.name = Центрифуга за �лаг
+block.surge-crucible.name = Импул�ен тигел
+block.cyanogen-synthesizer.name = Цианогенен �интезатор
+block.phase-synthesizer.name = Фазов �интезатор
+block.heat-reactor.name = Топлинен реактор
+block.beryllium-wall.name = Стена от берилий
+block.beryllium-wall-large.name = Гол�ма �тена от берилий
+block.tungsten-wall.name = Стена от волфрам
+block.tungsten-wall-large.name = Гол�ма �тена от волфрам
+block.blast-door.name = Огнеупорна врата
+block.carbide-wall.name = Стена от карбид
+block.carbide-wall-large.name = Гол�ма �тена от карбид
+block.reinforced-surge-wall.name = Под�илена импул�на �тена
+block.reinforced-surge-wall-large.name = Гол�ма под�илена импул�на �тена
+block.shielded-wall.name = Енергийна �тена
+block.radar.name = Радар
+block.build-tower.name = По�трой кула
+block.regen-projector.name = Прожектор за регенераци�
+block.shockwave-tower.name = Шокова кула
+block.shield-projector.name = Щитов прожектор
+block.large-shield-projector.name = Гол�м щитов прожектор
+block.armored-duct.name = Брониран канал
+block.overflow-duct.name = Преливащ канал
+block.underflow-duct.name = Подливащ канал
+block.duct-unloader.name = Разтоварващ канал
+block.surge-conveyor.name = Импул�на лента
+block.surge-router.name = Импул�ен рутер
+block.unit-cargo-loader.name = Товарител
+block.unit-cargo-unload-point.name = Точка за разтоварване
+block.reinforced-pump.name = Под�илена помпа
+block.reinforced-conduit.name = Под�илена тръба
+block.reinforced-liquid-junction.name = Под�илена �връзка за течно�ти
+block.reinforced-bridge-conduit.name = Под�илена мо�това тръба
+block.reinforced-liquid-router.name = Под�илен рутер за течно�ти
+block.reinforced-liquid-container.name = Под�илен контейнер за течно�ти
+block.reinforced-liquid-tank.name = Под�илен ба�ейн за течно�ти
+block.beam-node.name = Лъчева точка
+block.beam-tower.name = Лъчева кула
+block.beam-link.name = Лъчева �връзка
+block.turbine-condenser.name = Турбинен �гъ�тител
+block.chemical-combustion-chamber.name = Химиче�ка камера за горене
+block.pyrolysis-generator.name = Пиролизен генератор
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Трошачка за �кали
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Плазмен �вредел
+block.large-plasma-bore.name = Гол�м плазмен �вредел
+block.impact-drill.name = Сблъ�ъчен �вредел
+block.eruption-drill.name = Взривен �вредел
+block.core-bastion.name = Ядро Убежище
+block.core-citadel.name = Ядро Цитадела
+block.core-acropolis.name = Ядро �кропол
+block.reinforced-container.name = Под�илен контейнер
+block.reinforced-vault.name = Под�илен трезор
+block.breach.name = Пробив
+block.sublimate.name = Сублимат
+block.titan.name = Титан
+block.disperse.name = Разпръ�ък
+block.afflict.name = Мъчител
+block.lustre.name = Бл��ък
+block.scathe.name = Поражение
+block.tank-refabricator.name = Рефабрикатор за танкове
+block.mech-refabricator.name = Рефабрикатор за машини
+block.ship-refabricator.name = Рефабрикатор за кораби
+block.tank-assembler.name = Производител на танкове
+block.ship-assembler.name = Производител на кораби
+block.mech-assembler.name = Производител на кораби
+block.reinforced-payload-conveyor.name = Под�илена лента за товар
+block.reinforced-payload-router.name = Под�илен рутер за товар
+block.payload-mass-driver.name = Ма�иран двигател за товари
+block.small-deconstructor.name = Малък разглобител
+block.canvas.name = Платно
+block.world-processor.name = Световен проце�ор
+block.world-cell.name = Световна клетка
+block.tank-fabricator.name = Фабрикатор за танкове
+block.mech-fabricator.name = Фабрикатор за роботи
+block.ship-fabricator.name = Фабрикатор за кораби
+block.prime-refabricator.name = О�новен рефабрикатор
+block.unit-repair-tower.name = Поправ�ща кула за единици
+block.diffuse.name = Дифузи�
+block.basic-assembler-module.name = О�новен �глаб�щ модул
+block.smite.name = �ебе�ен бич
+block.malign.name = Зло
+block.flux-reactor.name = Флю�ов реактор
+block.neoplasia-reactor.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.malis.name = Мали�
+team.crux.name = Крук�
+team.sharded.name = Откъ�натите
+team.derelict.name = О�танки
+team.green.name = Зелен
+
+team.blue.name = Син
+
+hint.skip = Пре�кочи
+hint.desktopMove = Използвайте [accent][[WASD][], за да �е придвижвате.
+hint.zoom = [accent]Скролирайте[] за увеличаване или намал�ване на мащаба.
+hint.desktopShoot = Задръжте [accent][[Л�в клавиш][], за да �трел�те.
+hint.depositItems = За да прене�ете ре�ур�и, върнете кораба �и при �дрото.
+hint.respawn = За да �е по�вите отново като кораб, нати�нете [accent][[V][].
+hint.respawn.mobile = Вие активирахте режим на управление на единица/�труктура. За да �е върнете към Ваши� кораб, [accent]доко�нете аватара в горни� л�в ъгъл[].
+hint.desktopPause = �ати�нете [accent][[Интервал][], за да по�тавите играта на пауза или да � продължите.
+hint.breaking = �ати�нете � [accent]Де�ен клавиш[] и ме�тете мишката, за да унищожавате блокове.
+hint.breaking.mobile = �ктивирайте \ue817 [accent]чука[] от долни� де�ен ъгъл и нати�нете за да унищожите блокове.\n\nЗадръжте за �екунда и плъзнете за да унищожите в�ички блокове в избраната зона.
+hint.blockInfo = Вижте информаци� за даден блок, като го по�очите в [accent]менюто за �троител�тво[], а по�ле цъкнете върху копчето [accent][[?][] вд��но.
+hint.derelict = [accent]Изо�тавените[] �гради �а порутените о�танки на �тари бази, които вече не функционират.\n\nМожете да [accent]декон�труирате[] тези �гради за ре�ур�и.
+hint.research = Използвайте бутона \ue875 [accent]Проучване[], за да из�ледвате нови технологии.
+hint.research.mobile = Използвайте бутона \ue875 [accent]Проучване[] в \ue88c [accent]Менюто[], за да из�ледвате нови технологии.
+hint.unitControl = Задръжте [accent][[L-Ctrl][] и [accent]кликнете[], за да управл�вате Ваши единици или оръди�.
+hint.unitControl.mobile = [accent][[Доко�нете два пъти][], за да контролирате Ваша единица или оръди�.
+hint.unitSelectControl = За да управл�вате единици, влезте в [accent]командни� режим[], като задържите [accent]L-shift.[]\nДокато �те в командни� режим, цъкнете и влачете, за да избирате единици. Цъкнете � [accent]д��но копче[] върху зем�та или мишена, за да изпратите единиците �и там.
+hint.unitSelectControl.mobile = За да управл�вате единици, влезте в [accent]командни� режим[], като цъкнете копчето за [accent]команда[] долу вл�во.\nДокато �те в командни� режим, задръжте задълго, за да избирате единици, по�ле може да нати�нете върху зем�та или мишена, за да изпратите единиците �и там.
+hint.launch = След като �ъберете до�татъчно ре�ур�и, можете да [accent]Из�трел�те[] �дро като изберете близък �ектор от \ue827 [accent]Глобу�а[] в долни� де�ен ъгъл.
+hint.launch.mobile = След като �ъберете до�татъчно ре�ур�и, можете да [accent]Из�трел�те[] �дро като изберете близък �ектор от \ue827 [accent]Глобу�а[] в \ue88c [accent]Менюто[].
+hint.schematicSelect = Задръжте [accent][[F][] и плъзнете за да изберете/копирате група от блокчета.\n\n[accent][[Среден клик][], за да копирате едно блокче.
+hint.rebuildSelect = Задръжте [accent][[B][] и влачете, за да изберете унищожени блокове.\nТова ще ги за�трои наново автоматично.
+hint.rebuildSelect.mobile = Изберете копчето за \ue874 копиране, по�ле нати�нете копчето за \ue80f по�тро�ване и изтеглете, за да изберете унищожените блокове.\nТова ще ги за�трои отново автоматично.
+hint.conveyorPathfind = Задръжте [accent][[L-Ctrl][] докато по�тав�те пътека от ленти за да генерирате пътека автоматично.
+hint.conveyorPathfind.mobile = Позволете \ue844 [accent]Диагонално по�тав�не[] за автоматично намиране на пътека при по�тав�не на конвейери.
+hint.boost = Задръжте [accent][[L-Shift][], за да прелетите над преп�т�тви� � тази единица.\n\nСамо н�кои наземни единици имат двигатели за летене.
+hint.payloadPickup = �ати�нете [accent][[[], за да вдигнете малки блокчета или единици.
+hint.payloadPickup.mobile = [accent]Доко�нете и задръжте[] върху малко блокче или единица, за да го вдигнете.
+hint.payloadDrop = �ати�нете [accent]][], за да о�тавите товара �и.
+hint.payloadDrop.mobile = [accent]Доко�нете и задръжте[] върху празна позици�, за да о�тавите товара �и там.
+hint.waveFire = Оръди�та [accent]Вълна[] заредени �ъ� вода ще дей�тват и като пожарога�ители.
+hint.generator = \uf879 [accent]Горивните генератори[] гор�т въглища и зареждат � електроенерги� �ъ�едни блокове.\n\nРаз�то�нието за предаване на енерги� може да �е увеличи чрез \uf87f [accent]Електриче�ки възли[].
+hint.guardian = [accent]Пазителите[] �а единици � повече брон�. Слаби боеприпа�и като [accent]Мед[] и [accent]Олово[] �а [scarlet]неподход�щи[] �рещу т�х.\n\nИзползвайте по-мощни оръди� или заредете Вашите \uf861Дуо/\uf859Салво � \uf835 [accent]Графит[], за да ги повалите.
+hint.coreUpgrade = Ядрата могат да бъдат подобр�вани като [accent]по�тавите по-добро �дро върху т�х[].\n\nПо�тавете \uf868 [accent]Фондаци�[] върху \uf869 �дрото [accent]Ча�тица[]. Уверете �е че н�ма други преп�т�тви� там, където по�тав�те �дрото.
+hint.presetLaunch = Към �ивите [accent]�ектори за кацане[], какъвто е [accent]Замръзнала Гора[] можете да из�трел�те �дро отв��къде. �е е необходимо да превземате �ъ�една територи�.\n\n[accent]�омерираните �ектори[], като този, �а [accent]пожелателни[].
+hint.presetDifficulty = Този �ектор има [scarlet]ви�ока враже�ка заплаха[].\nИз�трелването към такива �ектори е [accent]нежелателно[] без нухната технологи� и подготовка.
+hint.coreIncinerate = След като �дрото �е препълни � конкретен тип ре�ур�, в�ички допълнителни до�тавени количе�тва в него ще бъдат [accent]унищожени[].
+hint.factoryControl = За да по�тавите [accent]изходната точка [] на н�ко� единица, изберете фабричен блок, докато �те в команден режим, по�ле цъкнете � д��но копче върху н�кое м��то.\nЕдиници, които �е произвеждат оттам ще отидат автоматично до по�оченото м��то.
+hint.factoryControl.mobile = За да по�тавите [accent]изходната точка [] на н�ко� единица, изберете фабричен блок, докато �те в команден режим, по�ле нати�нете върху н�кое м��т.\nЕдиници, които �е произвеждат оттам ще отидат автоматично до по�оченото м��то.
+gz.mine = Придвижете �е близо до \uf8c4 [accent]медната руда[] на зем�та и цъкнете, за да започнете изкопаването.
+gz.mine.mobile = Придвижете �е близо до \uf8c4 [accent]медната руда[] на зем�та и нати�нете върху зем�та, за да започнете изкопаването.
+gz.research = Отворете \ue875 технологични� план.\nПроучете \uf870 [accent]Механични� �вредел[], по�ле го изберете от менюто долу вд��но.\nЦъкнете върху поле � мед, за да го по�тавите.
+gz.research.mobile = Отворете \ue875 технологични� план.\nПроучете \uf870 [accent]Механични� �вредел[], по�ле го изберете от менюто долу вд��но.\n�ати�нете върху поле � мед, за да го по�тавите.\n\n�ати�нете върху \ue800 [accent]тикчето[] долу вд��но, за да потвърдите.
+gz.conveyors = Проучете и по�тавете \uf896 [accent]ленти[], за да придвижите изкопани ре�ур�и от \n�вредели към �дрото.\n\nЦъкнете и влачете, за да разположите множе�тво ленти.\n[accent]Скролирайте[], за да завъртите.
+gz.conveyors.mobile = Проучете и по�тавете \uf896 [accent]ленти[], за да придвижите изкопани ре�ур�и от \n�вредели към �дрото.\n\nЗадръжте пръ�та �и една �екунда, за да разположите множе�тво ленти. 
+gz.drills = Разришете изкопната дейно�т.\nПо�тавете повече механични �вредели.\nИзкопайте 100 мед.
+gz.lead = \uf837 [accent]Оловото[] е друг че�то използван ре�ур�.\nПо�тавете �вредели, за да го изкопавате.
+gz.moveup = \ue804 Придвижете �е нагоре за �ледващите �и задачи.
+gz.turrets = Проучете и по�тавете 2 оръди� \uf861 [accent]Дуо[], за да защитите �дрото.\nДуо �е нужда�т от \uf838 [accent]муниции[] чрез лентите.
+gz.duoammo = До�тавете [accent]мед[] на оръди�та, като използвате ленти.
+gz.walls = [accent]Стените[] попречват на враже�ки� огън да до�тигне до �градите Ви.\nРазположете медни \uf8ae [accent]медни �тени[] около оръди�та �и.
+gz.defend = Врагът наближава, пригответе �е за отбрана.
+gz.aa = �а обикновените оръди� им е непо�илно да �е �прав�т � лет�щи единици.\n\uf860 [accent]Пръ�качките[] предо�тав�т отлична противовъздушна �ила, но �е нужда�т от \uf837 [accent]Олово[], за да функционират.
+gz.scatterammo = Снабдете Пръ�качките � [accent]Олово[], използвайки ленти.
+gz.supplyturret = [accent]Снабдете оръдие.
+gz.zone1 = Това е враже�ката начална зона.
+gz.zone2 = В�ичко по�троено в нейни� радиу� ще бъде унищожено, когато на�тъпи новата вълна.
+gz.zone3 = Сега ще започне една такава вълна.\nПригответе �е.
+gz.finish = Издигнете още оръди�, изкопайте повече ре�ур�и\nи �е защитете от в�ички прииждащи вълни, за да [accent]завладеете този �ектор[].
+onset.mine = Цъкнете, за да копаете \uf748 [accent]берилий[] от �тените.\n\nИзползвайте [accent][[WASD], за да �е придвижвате.
+onset.mine.mobile = �ати�нете, за да копаете \uf748 [accent]берилий[] от �тените.
+onset.research = Отворете \ue875 технологични� план.\nПроучете, по�ле по�тавете \uf73e [accent]турбинен �гъ�тител[] върху отвора.\nТова ще генерира [accent]електриче�тво[].
+onset.bore = Проучете и по�тавете \uf741 [accent]плазмена бурги�[].\nТ� ще копае ре�ур�и от �тените автоматично.
+onset.power = За да [accent]задей�твате[] плазмената бурги�, проучете и по�тавете \uf73d [accent]лъчева точка[].\nСвържете турбинни� �гъ�тител към плазмената бурги�.
+onset.ducts = Проучете и по�тавете \uf799 [accent]тръби[], за да придвижване изкопаните ре�ур�и от плазмената бурги� към �дрото.\nЦъкнете и изтеглете, за да по�тавите множе�тво тръби.\n[accent]Скролирайте[], за да завъртите.
+onset.ducts.mobile = Проучете и по�тавете \uf799 [accent]тръби[], за да придвижване изкопаните ре�ур�и от плазмената бурги� към �дрото.\nЗадръжте пръ�та �и за една �екунда, за да по�тавите множе�тво тръби.
+onset.moremine = Разришете минната �и операци�.\nПо�тавете повече плазмени бургии и използвайте лъчеви точки и тръби, за да ги поддържате.\nИзкопайте 200 берилий.
+onset.graphite = По-�ложните блокове �е нужда�т от \uf835 [accent]Графит[].\nПо�тавете плазмени бургии, за да копаете графит.
+onset.research2 = Започнете проучването на [accent]фабрики[].\nПроучете \uf74d [accent]Скалотрошача[] и \uf779 [accent]�ркова фурна за �иликон[].
+onset.arcfurnace = �рковата фурна �е нуждае от \uf834 [accent]П��ък[] и \uf835 [accent]Графит[], за да произведе \uf82f [accent]Силикон[].\n[accent]Електриче�твото[] �ъщо е важно.
+onset.crusher = Използвайте \uf74d [accent]Скалотрошачите[], за да копаете п��ък.
+onset.fabricator = Използвайте [accent]единици[], за да из�ледвате картата, да пазите �гради и да атакувате врага. Проучете и по�тавете \uf6a2 [accent]Фабрика за танкове[].
+onset.makeunit = Произведете единица.\nИзползвайте копчето "?", за да видите изи�квани�та на избраната фабрика.
+onset.turrets = Единиците �а полезни, ала [accent]Оръди�та[] предо�тав�т повече защитни възможно�ти, когато �е използват правилно.\nПо�тавете \uf6eb [accent]Пробивно[] оръдие.\nОръди�та �е нужда�т от \uf748 [accent]муниции[].
+onset.turretammo = Снабдете оръдието � [accent]берилий.[]
+onset.walls = [accent]Стените[] паз�т �градите Ви от враже�ки огън.\nПо�тавете н�колко \uf6ee [accent]�тени от берилий[] около оръдието.
+onset.enemies = Врагът приближава, пригответе �е за защита.
+onset.defenses = [accent]По�тав�не на защити:[lightgray] {0}
+onset.attack = Врагът е у�звим. Отвърнете на удара.
+onset.cores = Можете да по�тавите нови �дра върху [accent]полета за �дро[].\n�овите �дра вършат работа като предни бази и �подел�т ре�ур�ен инвентар � други �дра.\nПо�тавете \uf725 �дро.
+onset.detect = Врагът ще Ви за�ече �лед 2 минути.\nРазположете защити, изкопна дейно�т и продукци�.
+onset.commandmode = Задръжте [accent]shift[], за да влезете в [accent]командни� режим[].\n[accent]Цъкнете � л�во копче и влачете[], за да избирате единици.\n[accent]Д��но копче[] дава заповеди за придвижване или атака
+onset.commandmode.mobile = �ати�нете [accent]командното копче[], за да влезете в [accent]командни� режим[].\nЗадръжте пръ�та �и, по�ле го [accent]придвижете[], за да изберете единици.\n[accent]Доко�нете[], за да дадете заповед за придвижване или атака.
+aegis.tungsten = Можете да копаете волфрам чрез [accent]�блъ�ъчен �вредел[].\nТази �града �е нуждае от [accent]вода[] и [accent]електриче�тво[].
+split.pickup = ��кои блокове могат да бъдат вдигани от кораба.\nВдигнете този [accent]контейнер[] и го по�тавете върху [accent]товарител�[].\n(О�новните копчета за вдигане и по�тав�не �а [ и ])
+split.pickup.mobile = ��кои блокове могат да бъдат вдигани от кораба.\nВдигнете този [accent]контейнер[] и го по�тавете върху [accent]товарител�[].\n(За да вдигнете или о�тавите нещо, задръжте задълго върху него.)
+split.acquire = �уждаете �е от волфрам, за да �троите единици.
+split.build = Единиците тр�бва да бъдат прена��ни до другата �трана на �тената.\nПо�тавете два [accent]Ма�ирани товарители[], върху в��ка от �траните на �тената.\nСвържете ги, като нати�нете върху едини�, по�ле върху други�.
+split.container = Подобно на контейнерите, можете да прена��те единици � [accent]ма�иран товарител[].\nПо�тавете фабрикатор за единици до ма�иран двигател, за да ги натоварите, по�ле ги пратете зад �тената, за да нападнат враже�ката база.
+
+item.copper.description = Използва �е във в��какви типове кон�трукции и боеприпа�и.
+item.copper.details = Мед. �еобичайно изобилен метал на Серпул. Структурно �лаб, о�вен ако бъде под�илен.
+item.lead.description = Използва �е за тран�порт на течно�ти и електриче�ки �труктури.
+item.lead.details = Плътен. Инертен. Широко използван при изграждане на батерии.\nБележка: Веро�тно е ток�ичен за биологичните форми на живот. �е, че има много о�танали наоколо.
+item.metaglass.description = Използва �е в �труктури за тран�порт и �ъхранение на течно�ти.
+item.graphite.description = Използва �е в електриче�ки компоненти и като боеприпа� за н�кои видове кули.
+item.sand.description = Използва �е за производ�тво на други рафинирани материали.
+item.coal.description = Използва �е като гориво и за производ�тво на рафинирани материали.
+item.coal.details = Изглежда като вкаменена ра�тителна матери�, образувана много преди разпръ�кването на �порите.
+item.titanium.description = Използва �е в тран�портни �труктури, �вредели и летателни технологии.
+item.thorium.description = Използва �е в здрави кон�трукции или като �дрено гориво.
+item.scrap.description = Използва �е в Разтопители и Пулверизатори за преработване в други материали.
+item.scrap.details = О�танки от �тари �труктури и единици.
+item.silicon.description = Използва �е във фотоволтаици, �ложни електроники и �амона�очващи �е боеприпа�и.
+item.plastanium.description = Използва �е в у�ъвършен�твани единици, като изолаци� и за фрагментационни боеприпа�и.
+item.phase-fabric.description = Използва �е в у�ъвършен�твана електроника и въз�танов�ващи �труктури.
+item.surge-alloy.description = Използва �е в у�ъвършен�твани оръжи� и импул�ни защитни �труктури.
+item.spore-pod.description = Използва �е за производ�твото на нефт, ек�плозиви и гориво.
+item.spore-pod.details = Спори. Веро�тно �интетична форма на живот. Изпу�кат газове, които �а ток�ични за биологични организми. Изключително инвазивни. Ле�но запалими при определени у�лови�.
+item.blast-compound.description = Използва �е за бомби и ек�плозивни боеприпа�и.
+item.pyratite.description = Използва �е за подпалващи оръжи� и горивни генератори.
+item.beryllium.description = Използва �е в много видове �троежи и муниции на Ерекир.
+item.tungsten.description = Използва �е от �вредели, брон� и муниции. �ужен е за �троежа на по-�ложни �труктури.
+item.oxide.description = Използва �е като топлопроводник и ин�улатор за електриче�тво.
+item.carbide.description = Използва �е в �ложни �труктури, тежки единици и муниции.
+
+liquid.water.description = Използва �е за охлаждане на машини и преработка на отпадъци.
+liquid.slag.description = Може да �е рафинира в Разделители до �ъ�тавните �и метали или да �е използване за обливане на враговете.
+liquid.oil.description = Използва �е в напредналото производ�тво на материали или като запалимо оръжие.
+liquid.cryofluid.description = Използва �е като охладител в реактори, оръди� и фабрики.
+liquid.arkycite.description = Използва �е в химиче�ките реакции за производ�тво на електриче�тво и �интез на материали.
+liquid.ozone.description = Използва �е като оки�л�ващ агент в производ�твото на материал, както и за гориво. Отно�ително ек�плозивен.
+liquid.hydrogen.description = Използва �е в извличането на ре�ур�и, производ�твото на единици и в ремонти. Запалимо веще�тво.
+liquid.cyanogen.description = Използва �е за муниции, �троеж и напреднали единици, както и при различни реакции на по-�ложните блокове. Силно запалим.
+liquid.nitrogen.description = Използва �е в извличането на ре�ур�и, �ъздаването на газ и производ�тво на единици. Инертен газ.
+liquid.neoplasm.description = Опа�ен биологичен �траничен продукт от неоплазмени� реактор. Бързо �е разпро�тира до в�еки �ъ�еден водо�ъдържащ блок и го поврежда. Леплив материал.
+liquid.neoplasm.details = �ео-плазма. �еконтрелируема ма�а от бързо дел�щи �е �интетични клетки � кон�и�тенци� подобна на тин�. У�тойчива на жега. Изключително опа�на за в��ка �града, ко�то използва вода.\n\nТвърде �ложна и не�табилна за �тандартен анализ. Потенциалните приложени� �а неизве�тни. Препоръчва �е изгар�нето в ба�ейни от �лаг.
+block.derelict = \uf77e [lightgray]О�танки
+block.armored-conveyor.description = Придвижва предмети напред. �е приема вход от �трани.
+block.illuminator.description = Излъчва �ветлина.
+block.message.description = Съхран�ва �ъобщение за комуникаци� между �ъюзници.
+block.reinforced-message.description = Съхран�ва �ъобщение за комуникаци� между �ъюзници.
+block.world-message.description = Съобщителен блок. Използван при �ъздаването на карти. �еунищожим.
+block.graphite-press.description = Компре�ира въглища до графит.
+block.multi-press.description = Компре�ира въглища до графит. Изи�ква вода като охладител.
+block.silicon-smelter.description = Рафинира �иликон от п��ък и въглища.
+block.kiln.description = Претап� п��ък и олово в мета-�тъкло.
+block.plastanium-compressor.description = Произвежда пла�таний от нефт и титан.
+block.phase-weaver.description = Синтезира фазова тъкан от торий и п��ък.
+block.surge-smelter.description = Разтоп�ва титан, олово, �илиций и мед до импул�на �плав.
+block.cryofluid-mixer.description = Сме�ва вода и фин титаниев прах за производ�тво на криотечно�т.
+block.blast-mixer.description = Произвежда взривно �ъединение от пиратит и �гъ�тени �пори.
+block.pyratite-mixer.description = Сме�ва въглища, олово и п��ък в пиратит.
+block.melter.description = Претап� �крап до шлака.
+block.separator.description = Раздроб�ва шлаката до нейните минерални компоненти.
+block.spore-press.description = Компре�ира �гъ�тени �пори на нефт.
+block.pulverizer.description = �атрошава �крап до �ъ�то�ние на фин п��ък.
+block.coal-centrifuge.description = Преобразува нефт във въглища.
+block.incinerator.description = Изпар�ва в�еки предмет или течно�т, които получава.
+block.power-void.description = �еутрализира ц�лата енерги� в мрежата. До�тъпно �амо в П��ъчника.
+block.power-source.description = Произвежда безкрайна енерги�. До�тъпно �амо в П��ъчника.
+block.item-source.description = Извежда безкрайно количе�тво предмети. До�тъпно �амо в П��ъчника.
+block.item-void.description = Унищожава в��какви предмети. До�тъпно �амо в П��ъчника.
+block.liquid-source.description = Извежда безкрайно количе�тво течно�ти. До�тъпно �амо в П��ъчника.
+block.liquid-void.description = Унищожава в��какви течно�ти. До�тъпно �амо в П��ъчника.
+block.payload-source.description = Извежда безкрайни товари. До�тъпно �амо в П��ъчника.
+block.payload-void.description = Унищожава в�еки товар. До�тъпно �амо в П��ъчника.
+block.copper-wall.description = Защитава �труктури от враже�ки огън.
+block.copper-wall-large.description = Защитава �труктури от враже�ки огън.
+block.titanium-wall.description = Защитава �труктури от враже�ки огън.
+block.titanium-wall-large.description = Защитава �труктури от враже�ки огън.
+block.plastanium-wall.description = Защитава �труктури от враже�ки огън. Поглъща лазери и волтови дъги. Блокира автоматични електриче�ки връзки.
+block.plastanium-wall-large.description = Защитава �труктури от враже�ки огън. Поглъща лазери и волтови дъги. Блокира автоматични електриче�ки връзки.
+block.thorium-wall.description = Защитава �труктури от враже�ки огън.
+block.thorium-wall-large.description = Защитава �труктури от враже�ки огън.
+block.phase-wall.description = Защитава �труктури от враже�ки огън, отраз�вайки повечето куршуми при контакт.
+block.phase-wall-large.description = Защитава �труктури от враже�ки огън, отраз�вайки повечето куршуми при контакт.
+block.surge-wall.description = Защитава �труктури от враже�ки огън, периодично о�вобождавайки волтови дъги при контакт.
+block.surge-wall-large.description = Защитава �труктури от враже�ки огън, периодично о�вобождавайки волтови дъги при контакт.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Стена, ко�то може да бъде отворена и затворена.
+block.door-large.description = Стена, ко�то може да бъде отворена и затворена.
+block.mender.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 = Прена�� предмети напред на партиди. Приема предмети �амо в началото на веригата и ги разтоварва в 3 по�оки. Изи�ква товарене и разтоварване от н�колко �трани за мак�имална ефективно�т.
+block.junction.description = Дей�тва като мо�т за две кръ�то�ани конвейерни линии.
+block.bridge-conveyor.description = Прена�� предмети над терен или по�тройки.
+block.phase-conveyor.description = Мигновенно прена�� предмети над терен или по�тройки. Има по-гол�м обхват от мо�товата лента, но �е нуждае от електроенерги�.
+block.sorter.description = �ко предметът �ъвпада на избрани� го прена�� напред, иначе го изкарва на�трани.
+block.inverted-sorter.description = Подобно на �тандартни� �ортировач, но извежда избрани�т предмет на�трани.
+block.router.description = Разпредел� вне�ените предмети на до 3 по�оки равномерно.
+block.router.details = �еобходимо зло. Употребата му като вход на фабрики не �е препоръчва, защото ще �е запуши от изходните материали.
+block.distributor.description = Разпредел� вне�ените предмети в до 7 по�оки равномерно.
+block.overflow-gate.description = �а�очва предмети на�трани �амо ако лентата отпред е препълнена или блокирана.
+block.underflow-gate.description = �а�очва предмети напред �амо ако лентите от�трани �а препълнени или блокирани.
+block.mass-driver.description = Структура за прена��не на предмети на далечни ра�то�ни�. Събира партиди от предмети и ги из�трелва до други Ма�ови прено�ители.
+block.mechanical-pump.description = Изпомпва течно�ти. �е изи�ква електриче�тво.
+block.rotary-pump.description = Изпомпва течно�ти. Изи�ква електриче�тво.
+block.impulse-pump.description = Изпомпва течно�ти.
+block.conduit.description = Прена�� течно�ти еднопо�очно. Използва �е в комбинаци� � помпи и други тръбопроводи.
+block.pulse-conduit.description = Прена�� течно�ти еднопо�очно. Прена�� по-бързо и �ъхран�ва повече от �тандартни� тръбопровод.
+block.plated-conduit.description = Прена�� течно�ти еднопо�очно. �е приема вход от �трани. �е пропу�ка течове.
+block.liquid-router.description = Разпредел� вне�ените течно�ти в до 3 по�оки равномерно. Също може да �ъхран�ва малко количе�тво течно�т.
+block.liquid-container.description = Съхран�ва значително количе�тво течно�т. Може да изкарва течно�т във в�ички по�оки, подобно на рутер за течно�ти.
+block.liquid-tank.description = Съхран�ва гол�мо количе�тво течно�т. Може да изкарва течно�т във в�ички по�оки, подобно на рутер за течно�ти.
+block.liquid-junction.description = Дей�тва като мо�т за два кръ�то�ани тръбопровода.
+block.bridge-conduit.description = Тран�портира течно�ти над терен или �гради.
+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-large.description = Съхран�ва мощно�т, когато има излишък. Извежда мощно�т по време на дефицит. Има по-гол�м капацитет от нормалната батери�.
+block.combustion-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.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.details = Въз�тановена технологи�. Използва �е, за да произвежда ма�ивно количе�тво биома�а � мак�имална ефективно�т. Веро�тно първоначални�т инкубатор на �порите, който �ега покрива Серпуло.
+block.oil-extractor.description = Използва гол�мо количе�тво електроенерги�, п��ък и вода, за да добива нефт.
+block.core-shard.description = Ядро на базата. �ко бъде унищожено, �екторът �е губи.
+block.core-shard.details = Първата итераци�. Компактна. Самовъзпроизвежда �е. Оборудвана � едноктарни �тартови двигатели. �е е предназначена за междупланетарни полети.
+block.core-foundation.description = Ядро на базата. Добре бронирано. Съдържа повече ре�ур�и от модел Ча�тица.
+block.core-foundation.details = Втората итераци�.
+block.core-nucleus.description = Ядро на базата. Изключително добре бронирано. Съхран�ва огромни количе�тва ре�ур�и.
+block.core-nucleus.details = Третата и финална итераци�.
+block.vault.description = Съхран�ва гол�мо количе�тво материали от в�еки тип. Съдържанието може да бъде до�тъпено чрез разтоварител.
+block.container.description = Съхран�ва малко количе�тво материали от в�еки тип. Съдържанието може да бъде до�тъпено чрез разтоварител.
+block.unloader.description = Разтоварва избран материал от близки блокове.
+block.launch-pad.description = Из�трелва патриди от елементи в избраните �ектори.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = Из�трелва редуващи �е куршуми по враговете.
+block.scatter.description = Из�трелва топки олово, �крап или мета�тъкло на �ъчми �рещу враже�ки въздушни единици.
+block.scorch.description = Изгар� в�ички наземни врагове в близо�т. Ви�ока ефективно�т от близко раз�то�ние.
+block.hail.description = Из�трелва малки �нар�ди по наземни врагове на големи раз�то�ни�.
+block.wave.description = Из�трелва потоци течно�т по враговете. �втоматично га�и пожари, когато �е �набд�ва � вода.
+block.lancer.description = Зарежда и из�трелва мощни лъчи енерги� по наземни цели.
+block.arc.description = Из�трелва волтови дъги по наземни цели.
+block.swarmer.description = Из�трелва ракети � автоматично на�очване.
+block.salvo.description = Из�трелва бързи залпове от куршуми.
+block.fuse.description = Из�трелва три пробиващи взрива по врагове на близко раз�то�ние.
+block.ripple.description = Из�трелва клъ�тери от �нар�ди по наземни врагове на големи раз�то�ни�.
+block.cyclone.description = Из�трелва взривоопа�ни топки от �ъчми по близки врагове.
+block.spectre.description = Из�трелва големи бронепробивни куршуми по въздушни и наземни мишени.
+block.meltdown.description = Зарежда и из�трелва продължителен лазерен лъч по близки врагове. Изи�ква охладител, за да функционира.
+block.foreshadow.description = Произвежда единични �илни из�трели на дълго ра�то�ние. Приоритизира враговете � повече точки живот.
+block.repair-point.description = �епрекъ�нато ремонтира най-близката повредена единица в обхват.
+block.segment.description = Поврежда и унищожава враже�ки �нар�ди. �е дей�тва на лазери.
+block.parallax.description = �ктивира прихващаш лъч, � който придърпва и уврежда въздушни единици.
+block.tsunami.description = Из�трелва мощни потоци течно�т по враговете. �втоматично га�и пожари, когато �е �набд�ва � вода.
+block.silicon-crucible.description = Рафинира �иликон от п��ък и въглища, използвайки пиратит като допълнителен източник на топлина. Работи по-ефективно върху топли повърхно�ти.
+block.disassembler.description = Бавно извлича редки минерални компоненти от шлака. Има шан� да извлече торий.
+block.overdrive-dome.description = Повишава �коро�тта на близки �гради. �уждае �е от фазова тъкан и �иликон, за да работи.
+block.payload-conveyor.description = Прена�� големи товари, като единици от фабрика.
+block.payload-router.description = Разпредел� натоварените единици в 3 различни по�оки.
+block.ground-factory.description = Произвежда наземни единици. Произведените единици могат да бъдат използвани директно или прене�ени във Рекон�труктори за подобрение.
+block.air-factory.description = Произвежда въздушни единици. Произведените единици могат да бъдат използвани директно или прене�ени във Рекон�труктори за подобрение.
+block.naval-factory.description = Произвежда мор�ки единици. Произведените единици могат да бъдат използвани директно или прене�ени във Рекон�труктори за подобрение.
+block.additive-reconstructor.description = Подобр�ва до�тавените единици до второ ниво.
+block.multiplicative-reconstructor.description = Подобр�ва до�тавените единици до трето ниво.
+block.exponential-reconstructor.description = Подобр�ва до�тавените единици до четвърто ниво.
+block.tetrative-reconstructor.description = Подобр�ва до�тавените единици до петото и по�ледно ниво.
+block.switch.description = Превключвател. Може да �е превключва ръчно и да �е �леди и управл�ва � проце�ор.
+block.micro-processor.description = Многократно изпълн�ва поредица от логиче�ки ин�трукции. Може да управл�ва единици и по�тройки.
+block.logic-processor.description = Многократно изпълн�ва поредица от логиче�ки ин�трукции. Може да управл�ва единици и по�тройки. По-бърз от микропроце�ор.
+block.hyper-processor.description = Многократно изпълн�ва поредица от логиче�ки ин�трукции. Може да управл�ва единици и по�тройки. По-бърз от логиче�ки проце�ор.
+block.memory-cell.description = Съхран�ва информаци�, ко�то може да �е до�тъпва или промен� от проце�ор.
+block.memory-bank.description = Съхран�ва информаци�, ко�то може да �е до�тъпва или промен� от проце�ор. Има гол�м капацитет.
+block.logic-display.description = Позвол�ва изобраз�ването на графика чрез проце�ор.
+block.large-logic-display.description = Позвол�ва изобраз�ването на графика чрез проце�ор.
+block.interplanetary-accelerator.description = Ма�ивна електромагнитна рел�ова кула. У�кор�ва �дрото до необходимата за междупланетно из�трелване �коро�т.
+block.repair-turret.description = �епрекъ�нато ремонтира най-близката повредена единица в обхват. Може да приема охладител.
+block.core-bastion.description = Ядро на базата. Добре бронирано. �ко бъде унищожено, �екторът е загубен.
+block.core-citadel.description = Ядро на базата. Много добре бронирано. Съхран�ва повече ре�ур�и от �дро Убежище.
+block.core-acropolis.description = Ядро на базата. Изключтилено бронирано. Съхран�ва повече ре�ур�и от �дро Цитадела.
+block.breach.description = Из�трелва пробождащи муниции от берилий или волфрам.
+block.diffuse.description = Из�трелва облак от куршуми в широк кону�. Изтла�ква враговете назад.
+block.sublimate.description = Изпу�ка продължителна �тру� от пламък към врага. Пробожда брони.
+block.titan.description = Из�трелва ма�ивен артилерий�ки �нар�д към наземни мишени. �уждае �е от водород.
+block.afflict.description = Из�трелва ма�ивна заредена �фера от фрагментарна противовъздушна �ила. �уждае �е от нагр�ване.
+block.disperse.description = Из�трелва противовъздушни �нар�ди към лет�щи мишени.
+block.lustre.description = Из�трелва бавноподвижен лазер към една мишена.
+block.scathe.description = Из�трелва могъща ракета към наземни мишени през огромни раз�то�ни�.
+block.smite.description = Из�трелва �ери� от пробождащи, наелектризирани куршуми.
+block.malign.description = Из�трелва порой от �амона�очващи �е лазерни зар�ди. �уждае �е от значително нагр�ване.
+block.silicon-arc-furnace.description = Рефинира �иликон от п��ък и графит.
+block.oxidation-chamber.description = Преобразува берилий и озон в ок�ид. Излъчва топлина като �траничен продукт.
+block.electric-heater.description = �агр�ва �рещуположни блокове. �уждае �е от големи количе�тва електриче�тво.
+block.slag-heater.description = �агр�ва �рещуположни блокове. �уждае �е от �лаг.
+block.phase-heater.description = �агр�ва �рещуположни блокове. �уждае �е от фазова тъкан.
+block.heat-redirector.description = Прена�очва натрупана топлина към други блокове.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Разпредел� натрупаната топлина в три изход�щи по�оки.
+block.electrolyzer.description = Превръща вода във водород и озонов газ.
+block.atmospheric-concentrator.description = Концентрира азот от атмо�ферата. �уждае �е от нагр�ване.
+block.surge-crucible.description = Образува импул�на �плав от �лаг и �иликон. �уждае �е от нагр�ване.
+block.phase-synthesizer.description = Синтезира фазова тъкан от торий, п��ък и озон. �уждае �е от нагр�ване.
+block.carbide-crucible.description = Слива графит и волфрам в карбид. �уждае �е от нагр�ване.
+block.cyanogen-synthesizer.description = Синтезира цианоген от акрицид и графит. �уждае �е от нагр�ване.
+block.slag-incinerator.description = Изгар� у�тойчиви предмети или течно�ти. �уждае �е от �лаг.
+block.vent-condenser.description = Кондензира изпу�нати газове във вода. Поглъща електриче�тво.
+block.plasma-bore.description = Когато �е по�тави �рещуположно на �тена � руда, извежда предмети безкрайно. �уждае �е от малко електриче�тво.
+block.large-plasma-bore.description = По-гол�ма плазмена бурги�. Спо�обна е да изкопава волфрам и торий. �уждае �е от водород и електриче�тво.
+block.cliff-crusher.description = �атрошава �тени, за да генерира безкрайно количе�тво п��ък. �уждае �е от ток. Ефика�но�тта варира �пр�мо вида �тена.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Когато �е по�тави върху руда, извежда предмети безкрайно на тла�ъци. �уждае �е от ток и вода.
+block.eruption-drill.description = Подобрен �блъ�ъчен �вредел. Спо�обен е да изкопава торий. �уждае �е от водород.
+block.reinforced-conduit.description = Придвижва течно�ти напред. �е приема непроводими материали от �трани.
+block.reinforced-liquid-router.description = Разпредел� течно�ти поравно на в�ички �трани.
+block.reinforced-liquid-tank.description = Съхран�ва гол�мо количе�тво течно�ти.
+block.reinforced-liquid-container.description = Съхран�ва значително количе�тво течно�ти.
+block.reinforced-bridge-conduit.description = Прена�� течно�ти над �труктури и над терен.
+block.reinforced-pump.description = Изпомпва и изна�� течно�ти. �уждае �е от водород.
+block.beryllium-wall.description = Защитава �градите от враже�ки огън.
+block.beryllium-wall-large.description = Защитава �градите от враже�ки огън.
+block.tungsten-wall.description = Защитава �градите от враже�ки огън.
+block.tungsten-wall-large.description = Защитава �градите от враже�ки огън.
+block.carbide-wall.description = Защитава �градите от враже�ки огън.
+block.carbide-wall-large.description = Защитава �градите от враже�ки огън.
+block.reinforced-surge-wall.description = Защитава �труктури от враже�ки огън, периодично о�вобождавайки електриче�ки дъги при контакт.
+block.reinforced-surge-wall-large.description = Защитава �труктури от враже�ки огън, периодично о�вобождавайки волтови дъги при контакт.
+block.shielded-wall.description = Защитава �труктури от враже�ки огън. Пу�ка щит, който поглъща повечето �нар�ди, докато има електриче�тво. �уждае �е от ток.
+block.blast-door.description = Стена, ко�то �е отвар�, когато в близо�т има при�тел�ки наземни единици. �е може да �е управл�ва ръчно.
+block.duct.description = Придвижва предмети напред. Може да �ъхран�ва �амо по един предмет.
+block.armored-duct.description = Придвижва предмети напред. �е приема чужди предмети от �трани.
+block.duct-router.description = Разпредел� предмети поравно в три по�оки. Приема предмети един�твено от задната �и �трана. Може да �е на�трои като �ортировач на предмети.
+block.overflow-duct.description = Извежда предмети към �тените един�твено, ако предни�т път е възпреп�т�тван.
+block.duct-bridge.description = Придвижва предмети над �гради и терен.
+block.duct-unloader.description = Разтоварва избрани�т предмет от блока зад него. �е може да разтоварва от �дра.
+block.underflow-duct.description = Обратното на преливащ тръбопровод. Извежда напред, когато леви�т и де�ни�т път �а блокирани.
+block.reinforced-liquid-junction.description = Дей�тва като пре�ечна точка между два пре�ичащи �е потока.
+block.surge-conveyor.description = Придвижва предмети на партити. Може да �е у�кори � електриче�тво. Електропроводим.
+block.surge-router.description = Разпредел� предмети в три по�оки поравно от импул�ни ленти. Може да �е у�кори � електриче�тво. Електропроводим.
+block.unit-cargo-loader.description = По�тро�ва товарителни дрони. Дроните автоматично разпредел�т предмети към Разтоварителни точки �ъ� �ъвпадащ филтър.
+block.unit-cargo-unload-point.description = Дей�тва като разтоварваща точка за товарителни дрони. Приема предмети, които �ъвпадат � по�очени� филтър.
+block.beam-node.description = Предава електриче�тво ортогонално към други блокове. Съхран�ва малко количе�тво ток.
+block.beam-tower.description = Предава електриче�тво ортогонално към други блокове. Съхран�ва гол�мо количе�тво ток. Ви�ок обхват.
+block.turbine-condenser.description = Създава ток, когато �е по�тави върху отвори. Произвежда малко количе�тво вода.
+block.chemical-combustion-chamber.description = Създава ток от аркицид и озон.
+block.pyrolysis-generator.description = Създава гол�мо количе�тво ток от аркицид и �лаг. Произвежда вода като �траничен продукт.
+block.flux-reactor.description = Когато �е нагрее, �ъздава големи количе�тва електриче�тво. Изи�ква цианоген, за да �е �табилизира. Изход�щи�т ток и нуждата от цианоген �а пропорционални � подадената топлина.\nЕк�плодира, ако не получи до�татъчно цианоген.
+block.neoplasia-reactor.description = Използва аркицид, вода и фазова тъкан, за да �ъздава ви�оки количе�тва електриче�тво. Произвежда топлина и опа�на нео-плазма като �транични продукти.\nЕк�лодира же�токо, когато нео-плазмата не �е извежда от реактора � тръбопроводи.
+block.build-tower.description = �втоматично въз�танов�ва �гради в обхвата �и и единици в производ�тво.
+block.regen-projector.description = Бавно поправ� при�тел�ки �гради в квадратен периметър. �уждае �е от водород.
+block.reinforced-container.description = Съхран�ва малко количе�тво предмети. Съдържанието може да бъде извеждано � разтоварители. �е увеличава размера на хранилището на �дрото.
+block.reinforced-vault.description = Съхран�ва гол�мо количе�тво предмети. Съдържанието може да бъде извеждано � разтоварители. �е увеличава размера на хранилището на �дрото.
+block.tank-fabricator.description = Произвежда единици тип "Стел". Изведените единици могат да �е управл�ват директно или да бъдат изпратени към рефабрикаторите за подобрение.
+block.ship-fabricator.description = Произвежда единици тип "Елуд". Изведените единици могат да �е управл�ват директно или да бъдат изпратени към рефабрикаторите за подобрение.
+block.mech-fabricator.description = Произвежда единици тип "Меруи". Изведените единици могат да �е управл�ват директно или да бъдат изпратени към рефабрикаторите за подобрение.
+block.tank-assembler.description = Изгражда огромни танкове от въведени блокове и единици. Изход�щиата единица може да бъде подобрен чрез модули.
+block.ship-assembler.description = Изгражда огромни кораби от въведени блокове и единици. Изход�щиата единица може да бъде подобрен чрез модули.
+block.mech-assembler.description = Изгражда огромни машини от въведени блокове и единици. Изход�щиата единица може да бъде подобрен чрез модули.
+block.tank-refabricator.description = Подобр�ва въведените танкове до второ ниво.
+block.ship-refabricator.description = Подобр�ва въведените кораби до второ ниво.
+block.mech-refabricator.description = Подобр�ва въведените машини до второ ниво.
+block.prime-refabricator.description = Подобр�ва въведените единици до трето ниво.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Декон�труира въведени �гради и единици. Възвръща 100% от разхода им за производ�тво.
+block.reinforced-payload-conveyor.description = Придвижва товарите напред.
+block.reinforced-payload-router.description = Разпредел� товари в �ъ�едни блокове. Когато има по�очен филтър, дей�тва като �ортировач.
+block.payload-mass-driver.description = Далекообхватна �града за тран�порт на товари. Из�трелва получените товари към �вързани ма�ирани двигатели.
+block.large-payload-mass-driver.description = Далекообхватна �града за тран�порт на товари. Из�трелва получените товари към �вързани ма�ирани двигатели.
+block.unit-repair-tower.description = Поправ� в�ички единици в �во� обхват. �уждае �е от озон.
+block.radar.description = По�тепенно разкрива терена и враже�ки единици в широк радиу�. �уждае �е от електриче�тво.
+block.shockwave-tower.description = Поврежда и унищожава враже�ки �нар�ди в обхвата �и. �уждае �е от цианоген.
+block.canvas.description = Показва про�то изображение � предзададена палитра. Може да �е редактира.
+
+unit.dagger.description = Из�трелва �тандартни боеприпа�и по в�ички близки врагове.
+unit.mace.description = Из�трелва поток от пламък по в�ички близки врагове.
+unit.fortress.description = Далекообхватна атака �рещу наземни единици.
+unit.scepter.description = Из�трелва залп от заредени куршуми по в�ички близки врагове.
+unit.reign.description = Из�трелва залп от ма�ивни пронизващи куршуми по в�ички близки врагове.
+unit.nova.description = Из�трелва лазерни лъчи, които повреждат врагове и поправ�т при�тел�ки �гради. Може да лети.
+unit.pulsar.description = �ктивира волтови дъги, които повреждат врагове и поправ�т при�тел�ки �гради. Може да лети.
+unit.quasar.description = Из�трелва пронизващи лазерни лъчи, които повреждат врагове и поправ�т при�тел�ки �гради. Може да лети. Има защитно поле.
+unit.vela.description = Из�трелва ма�ивен продължителен лазерен лъч, който поврежда врагове, причин�ва пожари и поправ� при�тел�ки �гради. Може да лети.
+unit.corvus.description = Из�трелва ма�ивен лазерен взрив, който поврежда врагове и поправ� при�тел�ки �гради. Може да преминава над повечето терени.
+unit.crawler.description = Б�га към врагове и �е �амоунищожава, предизвиквайки гол�ма ек�плози�.
+unit.atrax.description = Из�трелва обездвижващи кълба от шлака по наземни цели. Може да преко��ва почти в��какъв терен.
+unit.spiroct.description = Из�трелва пронизващи лазерни лъчи по враговете и �е �амовъз�танов�ва. Може да преко��ва почти в��какъв терен.
+unit.arkyid.description = �такува врагове � големи източващи лазерни лъчи и �е �амовъз�танов�ва. Може да преко��ва почти в��какъв терен.
+unit.toxopid.description = Из�трелва големи електриче�ки клъ�терни �нар�ди и пронизващи лазери по врагове. Може да преко��ва почти в��какъв терен.
+unit.flare.description = Из�трелва �тандартни �нар�ди по близки наземни врагове.
+unit.horizon.description = Пу�ка �ери� от бомби по наземни мишени.
+unit.zenith.description = Из�трелва залпове от ракети по в�ички близки врагове.
+unit.antumbra.description = Из�трелва залп от боеприпа�и по в�ички врагове в обхвата �и.
+unit.eclipse.description = Из�трелва два пробиващи лазера и залп от �ачми по близки врагове.
+unit.mono.description = �втоматично добива мед и олово, �лед което ги прена�� в �дрото.
+unit.poly.description = �втоматично поправ� или по�тро�ва увредени и унищожени �гради. Помага на други единици в �троежи.
+unit.mega.description = �втоматично поправ� повредени �гради. Може да прена�� блокове и малки наземни единици.
+unit.quad.description = Пу�ка големи бомби по наземни мишени, поправ� при�тел�ки �гради и поврежда враговете. Може да прена�� �редни по размер наземни единици.
+unit.oct.description = Защитава при�тел�ки единици чрез регенериращо защитно поле. Може да прена�� повечето наземни единици.
+unit.risso.description = Из�трелва залпове от ракети и боеприпа�и по в�ички близки врагове.
+unit.minke.description = Из�трелва �ачми и �тандартни муниции по наземни мишени.
+unit.bryde.description = Из�трелва далекообхватни боеприпа�и и ракети по врагове.
+unit.sei.description = Из�трелва поредица от ракети и бронебойни куршуми по врагове.
+unit.omura.description = Из�трелва далечни пробивни рел�ови лазери по врагове. Изгражда единици модел Факел.
+unit.alpha.description = Защитава �дро Ча�тица от врагове. Строи �гради.
+unit.beta.description = Защитава �дро Фондаци� от врагове. Строи �гради.
+unit.gamma.description = Защитава �дро Център от врагове. Строи �гради.
+unit.retusa.description = Из�трелва �амона�очващи �е торпеда към близки врагове. Поправ� при�тел�ки единици.
+unit.oxynoe.description = Из�трелва потоци от огън, които вред�т на враговете и поправ�т �гради. �а�очва �е към враже�ки �нар�ди � кула за точкова защита.
+unit.cyerce.description = Из�трелва тър�ещи клъ�терни ракети по враговете. Поправ� при�тел�ки единици.
+unit.aegires.description = Шокира в�ички враже�ки единици и �гради в енергийното �и поле. Поправ� в�ички при�тел�ки единици.
+unit.navanax.description = Из�трелва ек�плозивни ЕМП �нар�ди, които нана��т значителна вреда на враже�ките �илови мрежи и поправ� при�тел�ки �гради. Разтоп�ва близки врагове � 4 автономни лазерни оръди�.
+unit.stell.description = Стрел� �ъ� �тандартни куршуми по враже�ки цели.
+unit.locus.description = Стрел� по�ледователни куршуми по враже�ки цели.
+unit.precept.description = Стрел� � пронизващи клъ�терни куршуми по враже�ки цели.
+unit.vanquish.description = Стрел� � едри пронизващи и разцепващи �е куршуми по враже�ки цели.
+unit.conquer.description = Стрел� � едри пронизващи ка�кади от куршуми по враже�ки цели.
+unit.merui.description = Стрел� � далекообхватна артилери� по враже�ки наземни цели. Може да преко��ва почти в��какъв терен.
+unit.cleroi.description = Стрел� � двойни �нар�ди по враже�ки цели. �а�очва �е към враже�ки �нар�ди � кули � точкова защита.  Може да преко��ва почти в��какъв терен.
+unit.anthicus.description = Из�трелва далекообхватни �амона�очващи �е ракети по враже�ки цели.  Може да преко��ва почти в��какъв терен.
+unit.tecta.description = Из�трелва �амона�очващи �е плазмени ракети по враже�ки цели. Защитава �е � на�очен щит. Може да преко��ва почти в��какъв терен.
+unit.collaris.description = Из�трелва далекообхватна фрагментарна артилери� по враже�ки цели.  Може да преко��ва почти в��какъв терен.
+unit.elude.description = Из�трелва чифт �амона�очващи �е куршуми по враже�ки цели. Може да прелита над течни ба�ейни.
+unit.avert.description = Из�трелва у�укващи �е чифтове куршуми по враже�ки цели.
+unit.obviate.description = Из�трелва у�укващи �е чифтове електриче�ки �фери по враже�ки цели.
+unit.quell.description = Из�трелва далекообхватни �амона�очващи �е ракети по враже�ки цели. Възпира поправките на враже�ки блокове.
+unit.disrupt.description = Из�трелва далекообхватни �амона�очващи �е и възпиращи ракети по враже�ки цели. Възпира поправките на враже�ки блокове.
+unit.evoke.description = Строи �гради, за да защитава �дро Убежище. Поправ� �гради � лъч.
+unit.incite.description = Строи �гради, за да защитава �дро Цитадела. Поправ� �гради � лъч.
+unit.emanate.description = Строи �гради, за да защитава �дро �кропол. Поправ� �гради � лъч.
+
+lst.read = Прочети чи�ло от �вързано хранилище за памет.
+lst.write = Запиши чи�ло в �вързано хранилище за памет.
+lst.print = Добави тек�т в буфера за изпи�ване.\n�е визуализира нищо докато не използвате [accent]Print Flush[].
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Добав� операци� в буфера за изображение.\n�е показва нищо докато не използвате [accent]Draw Flush[].
+lst.drawflush = Изпълн�ва операции, пои�кани � команда [accent]Draw[] върху по�очен ди�плей.
+lst.printflush = Извежда тек�т натрупан � [accent]Print[] върху по�очен блок за �ъобщение.
+lst.getlink = Взима връзка на проце�ора по номер. Започва от 0.
+lst.control = Контролира �града.
+lst.radar = �амира единици около �града в обхват.
+lst.sensor = Взима информаци� от �града или единица.
+lst.set = Задава променлива.
+lst.operation = Изпълн�ва операци� � 1 или 2 променливи.
+lst.end = Започва �пи�ъка � ин�трукции от начало.
+lst.wait = Изчаква определен брой �екунди.
+lst.stop = Спира изпълнението на този проце�ор.
+lst.lookup = Тър�и предмет/течно�т/единица/вид блок чрез неговото ID.\nМожете да видите общи�т брой на в�еки вид чрез:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Пре�кача до друга позици� в програмата, когато дадено у�ловие бъде изпълнено.
+lst.unitbind = Поема контрол над �ледващата единица от избран тип и � запи�ва в променливата [accent]@unit[].
+lst.unitcontrol = Управл�ва контролираната в момента единица.
+lst.unitradar = За�ича единици около контролираната единица.
+lst.unitlocate = �амира конкретен тип по�тройка/позици� на картата.\n�еобходимо е да контролирате единица за да го използвате.
+lst.getblock = Получаване на данни за повърхно�т от в��ка локаци�.
+lst.setblock = Задаване на данни за повърхно�т от в��ка локаци�.
+lst.spawnunit = Създава единица върху дадена повърхно�т.
+lst.applystatus = Прилага или премахва определено �ъ�то�ние от единица.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Симулира пу�ната вълна на произволно м��то.\n��ма да увеличи бройката на вълните.
+lst.explosion = Създава ек�плози� на избрано м��то.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = По�тав�не на правило за игра.
+lst.flushmessage = Извежда �ъобщение на екрана от тек�тови� буфер.\nИзчаква до приключването на предишното �ъобщение.
+lst.cutscene = Манипулира камерата на играча.
+lst.setflag = По�тав�не на глобално знаме, което може да �е разчете от в�ички проце�ори.
+lst.getflag = Провер�ва дали е по�тавено глобално знаме.
+lst.setprop = По�тав� притежанието на единица или �града.
+lst.effect = Create a particle effect.
+lst.sync = Синхронизира променлива през мрежата.\nПредизвиква �е най-много 10 пъти в �екунда.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Дей�тви� за �троене на единици не �а позволени тук.
+
+lenum.type = Тип �града/единица\n�апример, за рутер, това ще върне [accent]@router[].\n�е е тек�т.
+lenum.shoot = Стрел� към позици�.
+lenum.shootp = Прицелва �е в единица/�града, изчи�л�вайки нейната �коро�т.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Дали блокът е активиран или забранен.
+laccess.currentammotype = Текущите муниции/течно�т на оръдието.
+
+laccess.color = Цв�т на о�ветител�.
+laccess.controller = Показва кой контролира единицата.\n�ко �е управл�ва от проце�ор, показва него.\n�ко е във формаци�, показва водача й.\nИначе ще покаже �амата единица.
+laccess.dead = Дали дадена единица/�града е била унищожена или вече е невалидна.
+laccess.controlled = Показва:\n[accent]@ctrlProcessor[] ако единицата е контролирана от проце�ор\n[accent]@ctrlPlayer[] ако единицата/�градата е контролирана от играч\n[accent]@ctrlFormation[] ако единицата уча�тва във формаци�\nИначе, връща 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = �ай-ви�ока �коро�т за единица, измерено в полета/�екунда.
+laccess.id = ID на единица/блок/предмет/течно�т.\nТази операци� е обратната на тър�енето.
+lcategory.unknown = �еизве�тно
+lcategory.unknown.description = �екатегоризирани указани�.
+lcategory.io = Вход и изход
+lcategory.io.description = Модифицира �ъдържани�та на помнещи блокове и проце�орни буфери.
+lcategory.block = Контрол на блок
+lcategory.block.description = Взаимодей�твие � блокове.
+lcategory.operation = Операции
+lcategory.operation.description = Логиче�ки операции.
+lcategory.control = Контрол на течението
+lcategory.control.description = Управление на изпълнителни� ред.
+lcategory.unit = Управление на единица
+lcategory.unit.description = Управл�ване на единици.
+lcategory.world = Св�т
+lcategory.world.description = Управл�ва поведението на �вета.
+
+graphicstype.clear = Запълва � цв�т.
+graphicstype.color = Задава цв�т за �ледващи операции.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Задава дебелина на лини�та.
+graphicstype.line = Ри�ува лини�.
+graphicstype.rect = Запълва правоъгълник.
+graphicstype.linerect = Очертава правоъгълник.
+graphicstype.poly = Запълва правилен многоъгълник.
+graphicstype.linepoly = Очертава правилен многоъгълник.
+graphicstype.triangle = Запълва триъгълник.
+graphicstype.image = Ри�ува изображение.\n�апример: [accent]@router[] или [accent]@dagger[].
+graphicstype.print = Чертае тек�т от принтерови� буфер.\nИзчи�тва буфера.
+
+lenum.always = Винаги в�рно
+lenum.idiv = Деление � цели чи�ла.
+lenum.div = Деление.\nВръща [accent]null[] при делене на 0.
+lenum.mod = Модул.
+lenum.equal = Равен�тво. Конвертира променливите в еднакъв тип.\n�е-null обекти �тават 1, null обекти �тават 0.
+lenum.notequal = �еравен�тво. Конвертира променливите в еднакъв тип.
+lenum.strictequal = Стриктно равен�тво. Отрицателно при различни типове променливи.\nМоже да �е използва за проверка на [accent]null[].
+lenum.shl = Побитово изме�тване нал�во.
+lenum.shr = Побитово изме�тване над��но.
+lenum.or = Побитово ИЛИ.
+lenum.land = Логиче�ко И.
+lenum.and = Побитово И.
+lenum.not = Побитово �Е.
+lenum.xor = Побитово ИЗКЛЮЧВ�ЩО ИЛИ.
+
+lenum.min = Минимална �тойно�т от 2 чи�ла.
+lenum.max = Мак�имална �тойно�т от 2 чи�ла.
+lenum.angle = Ъгъл на вектор в граду�и.
+lenum.anglediff = �б�олютното раз�то�ние между два ъгъла в граду�и.
+lenum.len = Дължина на вектор.
+lenum.sin = Сину�, в граду�и.
+lenum.cos = Ко�ину�, в граду�и.
+lenum.tan = Танген�, в граду�и.
+lenum.asin = Дъгов �ину�, в граду�и.
+lenum.acos = Дъгов ко�ину�, в граду�и.
+lenum.atan = Дъгов танген�, в граду�и.
+#not a typo, look up 'range notation'
+lenum.rand = Случайно чи�ло в регион [0, �тойно�т).
+lenum.log = Е�те�твен логаритъм (ln).
+lenum.log10 = Логаритъм � о�нова 10.
+lenum.noise = 2D simplex шум.
+lenum.abs = �б�олютна �тойно�т.
+lenum.sqrt = Квадратен корен.
+
+lenum.any = В��каква единица.
+lenum.ally = При�тел�ка единица.
+lenum.attacker = Въоръжена единица.
+lenum.enemy = Враже�ка единица.
+lenum.boss = Пазител.
+lenum.flying = Въздушна единица.
+lenum.ground = �аземна единица.
+lenum.player = Единица контролирана от играч.
+
+lenum.ore = Рудно находище.
+lenum.damaged = Повредена при�тел�ка �труктура.
+lenum.spawn = Враже�ка начална точка.\nМоже да е враже�ко �дро или позици�.
+lenum.building = По�тройка в определена група.
+
+lenum.core = В��какво �дро
+lenum.storage = Хранилище, например �клад.
+lenum.generator = Електрогенератор.
+lenum.factory = Сграда ко�то обработва ре�ур�и, фабрика.
+lenum.repair = Точка за ремонт.
+lenum.battery = Батери�.
+lenum.resupply = Точка за �набд�ване.\nИма �ми�ъл �амо ако [accent]"Единиците �е нужда�т от боеприпа�и"[] е активирано.
+lenum.reactor = Ударен или Ториев реактор.
+lenum.turret = В��каква кула.
+
+sensor.in = Сградата/единицата, от ко�то да вземе информаци�.
+
+radar.from = По�тройка от ко�то да вземе информаци�.\nОбхватът е ограничен от обхвата за �троене.
+radar.target = Филтър за единици, които ще за�ича.
+radar.and = Допълнителни филтри.
+radar.order = Ред на �ортиране. 0 за обръщане.
+radar.sort = Показател за �ортиране.
+radar.output = Променлива, в ко�то да изведе намерената единица.
+
+unitradar.target = Филтър за единици, които ще за�ича.
+unitradar.and = Допълнителни филтри.
+unitradar.order = Ред на �ортиране. 0 за обръщане.
+unitradar.sort = Показател за �ортиране.
+unitradar.output = Променлива в ко�то да изведе намерената единица.
+
+control.of = Сграда, ко�то да контролира.
+control.unit = Единица/Сграда, в ко�то да �е цели.
+control.shoot = Дали да �трел�.
+
+unitlocate.enemy = Дали да локализира враже�ки �гради.
+unitlocate.found = Дали обектът е намерен.
+unitlocate.building = Променлива в ко�то да запише намерената �града.
+unitlocate.outx = Резултатна X координата.
+unitlocate.outy = Резултатна Y координата.
+unitlocate.group = Група по�тройки за които да тър�и.
+playsound.limit = �ко е в�рно, предотврат�ва този звук,\nв �лучай, че вече е прозвучал в �ъщи� кадър.
+
+lenum.idle = �е �е движи, но продължи да �троиш/добиваш ре�ур�и.\nСтандартно поведение.
+lenum.stop = Спри да �е движиш/добиваш ре�ур�и/�троиш.
+lenum.unbind = �апълно изключва логиче�ки контрол.\nПродължава �тандартно поведение.
+lenum.move = Преме�ти �е на конкретна позици�.
+lenum.approach = Доближи �е до позици� на определено раз�то�ние.
+lenum.pathfind = �амери пътека до враже�ката начална точка.
+lenum.autopathfind = �втоматично намира път� до най-близкото враже�ко �дро или точка на кацане.\nТова е �ъщото като обичайното ориентиране на враже�ките вълни.
+lenum.target = Стрел�й към позици�.
+lenum.targetp = Стрел�й към цел, изчи�л�вайки нейната �коро�т.
+lenum.itemdrop = Разтовари предмет(и).
+lenum.itemtake = Вземи предмет(и) от �града.
+lenum.paydrop = Разтовари товар.
+lenum.paytake = Вземи товар от �егашната позици�.
+lenum.payenter = Влез/кацни на товарни� блок, върху който �е намира единицата.
+lenum.flag = Чи�лов флаг на единица.
+lenum.mine = Добивай ре�ур�и от позици�.
+lenum.build = По�трой �труктура.
+lenum.getblock = Провери типа на по�тройката на дадени координати.\nПозици�та тр�бва да е в обхвата на единицата.\nСолидни не-�гради ще имат типа [accent]@solid[].
+lenum.within = Проверете дали дадена позици� е в обхват на единицата.
+lenum.boost = Започни/Спри у�корението
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
new file mode 100644
index 0000000000..c293090e5c
--- /dev/null
+++ b/core/assets/bundles/bundle_ca.properties
@@ -0,0 +1,2653 @@
+credits.text = Creat per [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits = Crèdits
+contributors = Traductors i col·laboradors
+discord = Uniu-vos al Discord del Mindustry!
+link.discord.description = Canal de Discord oficial del Mindustry
+link.reddit.description = El subreddit del Mindustry
+link.github.description = Codi font del joc
+link.changelog.description = Llista d’actualitzacions
+link.dev-builds.description = Versions en desenvolupament
+link.trello.description = Tauler oficial del Trello amb canvis planificats
+link.itch.io.description = Pàgina itch.io amb descàrregues per PC
+link.google-play.description = Vés a la Google Play Store
+link.f-droid.description = Vés a l’F-Droid
+link.wiki.description = Viquipèdia oficial del Mindustry
+link.suggestions.description = Suggereix canvis
+link.bug.description = Heu trobat un error. Informeu-ne aquí!
+linkopen = Aquest servidor us ha enviat un enllaç. Esteu segur que el voleu obrir?\n\n[sky]{0}
+linkfail = No s’ha pogut obrir l’enllaç!\nLa direcció URL s’ha copiat al porta-retalls.
+screenshot = S’ha desat la captura de pantalla a {0}.
+screenshot.invalid = El mapa és massa gran. No hi ha prou memòria per a fer la captura de pantalla.
+gameover = Fi de la partida
+gameover.disconnect = Desconnecta
+gameover.pvp = Ha guanyat l’equip[accent] {0}[]!
+gameover.waiting = [accent]S’espera el proper mapa…
+highscore = [accent]Nova puntuació rècord!
+copied = S’ha copiat.
+indev.notready = Aquesta part del joc encara no està preparada.
+
+load.sound = Sons
+load.map = Mapes
+load.image = Imatges
+load.content = Contingut
+load.system = Sistema
+load.mod = Mods
+load.scripts = Scripts
+
+be.update = Hi ha una versió nova disponible.
+be.update.confirm = Voleu descarregar-la i reiniciar ara?
+be.updating = S’actualitza…
+be.ignore = Ignora
+be.noupdates = No s’han trobat actualitzacions.
+be.check = Comprova si hi ha actualitzacions
+
+mods.browser = Explorador de mods
+mods.browser.selected = Mod seleccionat
+mods.browser.add = Instal·la
+mods.browser.reinstall = Reinstal·la
+mods.browser.view-releases = Veure versions publicades
+mods.browser.noreleases = [scarlet]No s’han trobat versions publicades.\n[accent]No s’ha trobat cap versió publicada d’aquest mod. Comproveu si el dipòsit del mod n’ha publicat alguna.
+mods.browser.latest = [lightgray][La versió més recent]
+mods.browser.releases = Versions
+mods.github.open = Dipòsit de GitHub
+mods.github.open-release = Pàgina de versions publicades
+mods.browser.sortdate = Ordena per data
+mods.browser.sortstars = Ordena per valoració
+
+schematic = Esquema
+schematic.add = Desa l’esquema…
+schematics = Esquemes
+schematic.search = Cerca esquemes…
+schematic.replace = Ja hi ha un esquema amb aquest nom. Voleu reemplaçar-lo?
+schematic.exists = Ja hi ha un esquema amb aquest nom.
+schematic.import = Importa un esquema
+schematic.exportfile = Exporta un fitxer
+schematic.importfile = Importa un fitxer
+schematic.browseworkshop = Explora el Workshop de l’Steam
+schematic.copy = Copia al porta-retalls
+schematic.copy.import = Importa del porta-retalls
+schematic.shareworkshop = Comparteix al Workshop de l’Steam
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Dóna la volta a l’esquema
+schematic.saved = L’esquema s’ha desat.
+schematic.delete.confirm = Aquest esquema s’esborrarà.
+schematic.edit = Edita l’esquema
+schematic.info = {0}×{1}, {2} blocs
+schematic.disabled = [scarlet]Els esquemes s’han desactivat.[]\nNo podeu fer servir esquemes en aquest [accent]mapa[] o [accent]servidor[].
+schematic.tags = Etiquetes:
+schematic.edittags = Edita les etiquetes
+schematic.addtag = Afegeix una etiqueta
+schematic.texttag = Text de l’etiqueta
+schematic.icontag = Icona de l’etiqueta
+schematic.renametag = Canvia el nom de l’etiqueta
+schematic.tagged = {0} d’etiquetades
+schematic.tagdelconfirm = Voleu esborrar del tot aquesta etiqueta?
+schematic.tagexists = Aquesta etiqueta ja existeix.
+
+stats = Estadístiques
+stats.wave = Onades derrotades
+stats.unitsCreated = Unitats construïdes
+stats.enemiesDestroyed = Enemics destruïts
+stats.built = Edificis construïts
+stats.destroyed = Edificis destruïts
+stats.deconstructed = Edificis desmantellats
+stats.playtime = Temps jugat
+
+globalitems = [accent]Elements totals
+map.delete = Esteu segur que voleu esborrar el mapa «[accent]{0}[]»?
+level.highscore = Puntuació rècord: [accent]{0}
+level.select = Selecció de nivell
+level.mode = Mode de joc:
+coreattack = < Estan atacant el nucli! >
+nearpoint = [[ [scarlet]ABANDONEU EL PUNT D’ATERRATGE IMMEDIATAMENT[] ]\nAniquilació imminent
+database = Base de dades del nucli
+database.button = Base de dades
+savegame = Desa la partida
+loadgame = Carrega una partida
+joingame = Uneix-me a una partida
+customgame = Partida personalitzada
+newgame = Partida nova
+none = <cap>
+none.found = [lightgray]<sense coincidències>
+none.inmap = [lightgray]<cap al mapa>
+minimap = Minimapa
+position = Posició
+close = Tanca
+website = Lloc web
+quit = Surt
+save.quit = Desa i surt
+maps = Mapes
+maps.browse = Explora els mapes
+continue = Continua
+maps.none = [lightgray]No s’ha trobat cap mapa!
+invalid = No vàlid
+pickcolor = Tria un color
+preparingconfig = Es prepara la configuració…
+preparingcontent = Es prepara el contingut…
+uploadingcontent = Es puja el contingut…
+uploadingpreviewfile = Es puja el fitxer de previsualització…
+committingchanges = S’apliquen els canvis…
+done = Fet!
+feature.unsupported = El vostre dispositiu no suporta aquesta característica.
+
+mods.initfailed = [red]⚠[] L’anterior instància del Mindustry no va poder iniciar-se, probablement per l’error d’algun mod.\n\nPer evitar un bucle de fallades, [red]s’han desactivat tots els mods.[]
+mods = Mods
+mods.none = [lightgray]No s’ha trobat cap mod!
+mods.guide = Guia sobre els mods
+mods.report = Informa d’un error
+mods.openfolder = Obre la carpeta
+mods.viewcontent = Mostra el contingut
+mods.reload = Torna a carregar
+mods.reloadexit = El programa es tancarà per a carregar els mods.
+mod.installed = [[Instal·lat]
+mod.display = [gray]Mod:[orange] {0}
+mod.enabled = [lightgray]Activat
+mod.disabled = [scarlet]Desactivat
+mod.multiplayer.compatible = [gray]Compatible amb el mode multijugador
+mod.disable = Desactiva
+mod.version = Version:
+mod.content = Contingut:
+mod.delete.error = El mod no es pot esborrar. Potser el fitxer està en ús.
+mod.incompatiblegame = [red]Versió no compatible
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]No suportat
+mod.unmetdependencies = [red]Dependències sense resoldre
+mod.erroredcontent = [scarlet]Errors del contingut
+mod.circulardependencies = [red]Dependències circulars
+mod.incompletedependencies = [red]Dependències incompletes
+mod.requiresversion.details = Requereix la versió: [accent]{0}[]\nCal actualitzar la vostra versió del joc. El mod necessita una versió nova (potser una distribució alfa o beta) per a funcionar.
+mod.outdatedv7.details = Aquest mod és incompatible amb l’última versió del joc. L’autor l’ha d’actualitzar i afegir [accent]minGameVersion: 136[] al seu fitxer [accent]mod.json[].
+mod.blacklisted.details = Aquest mod s’ha afegit manualment a la llista negra perquè causa problemes amb aquesta versió del joc. No el feu servir.
+mod.missingdependencies.details = A aquest mod li falten dependències: {0}
+mod.erroredcontent.details = Aquesta partida ha causat errors mentre es carregava. Pregunteu a l’autor del mod si pot arreglar-ho.
+mod.circulardependencies.details = Aquest mod depèn d’un segon mod que, al seu torn, depèn del mod anterior. No es permeten dependències circulars.
+mod.incompletedependencies.details = Aquest mod no es pot carregar perquè té una dependència no vàlida o que no es pot trobar: {0}.
+mod.requiresversion = Cal la versió [red]{0}[] del joc.
+mod.errors = S’han produït errors quan es carregava el contingut.
+mod.noerrorplay = [scarlet]S’executen mods amb errors.[] Desactiveu els mods afectats o arregleu les errades abans de jugar.
+mod.nowdisabled = [scarlet]Falten dependències del mod «{0}»s:[accent] {1}\n[lightgray]S’han de carregar els mods que fan falta.\nAquest mod es desactivarà automàticament.
+mod.enable = Activa
+mod.requiresrestart = El programa es tancarà per a aplicar els canvis.
+mod.reloadrequired = [scarlet]Cal reiniciar
+mod.import = Importa un mod
+mod.import.file = Importa un fitxer
+mod.import.github = Importa des de GitHub
+mod.jarwarn = [scarlet]Els mods JAR no són segurs.[]\nAssegureu-vos que l’heu importat d’una font fiable.
+mod.item.remove = Aquest element és part del mod[accent] «{0}»[]. Per a treure’l, cal desinstal·lar el mod.
+mod.remove.confirm = Aquest mod s’esborrarà.
+mod.author = [lightgray]Autor:[] {0}
+mod.missing = Aquesta partida desada conté mods que heu actualitzat fa poc o que ja no teniu instal·lats. La partida desada es pot corrompre. Esteu segur que voleu carregar-la?\n[lightgray]Mods:\n{0}
+mod.preview.missing = Abans de publicar aquest mod al Workshop, heu d’afegir una imatge de previsualització.\nPoseu una imatge amb el nom [accent]«preview.png»[] dins la carpeta del mod i proveu-ho de nou.
+mod.folder.missing = Al Workshop només es poden publicar els mods organitzats degudament en una carpeta.\nPer convertir qualsevol mod en format *.zip, descomprimiu els continguts en una carpeta i esborreu el fitxer comprimit; després, reinicieu el programa o recarregueu els mods.
+mod.scripts.disable = El vostre dispositiu no admet mods amb scripts. Heu de desactivar aquests mods per a jugar.
+
+about.button = Més informació
+name = Nom:
+noname = Trieu primer un[accent] nom de jugador[].
+search = Cerca:
+planetmap = Mapa del planeta
+launchcore = Llança el nucli
+filename = Nom del fitxer:
+unlocked = S’ha desblocat contingut nou!
+available = Hi ha una recerca disponible nova!
+unlock.incampaign = < Desbloca en el mode campanya per a veure’n més detalls. >
+campaign.select = Trieu la campanya inicial
+campaign.none = [lightgray]Trieu en quin planeta voleu començar.\nEs pot canviar en qualsevol moment.
+campaign.erekir = [accent]Recomanat per a jugadors novells.[]\n\nContingut revisat nou. Una campanya de progressió més o menys lineal.\n\nMapes de qualitat més alta i experiència més satisfactòria.
+campaign.serpulo = [scarlet]No recomanat per a jugadors novells.[]\n\nContingut antic; l’experiència clàssica. Campanya més oberta.\n\nPotser els mapes i mecàniques de la campanya no estan massa equilibrats. Contingut en general menys polit que el d’Erekir.
+campaign.difficulty = Difficulty
+completed = [accent]Completat
+techtree = Arbre tecnològic
+techtree.select = Selecció de l’arbre tecnològic
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Carrega
+research.discard = Descarta
+research.list = [lightgray]Recerques:
+research = Investiga
+researched = [lightgray]{0} d’investigades.
+research.progress = {0} % completat
+players = {0} jugadors
+players.single = {0} jugador
+players.search = Cerca
+players.notfound = [gray]no s’han trobat jugadors
+server.closing = [accent]Es tanca el servidor…
+server.kicked.kick = Us han expulsat del servidor.
+server.kicked.whitelist = No esteu a la llista blanca del servidor.
+server.kicked.serverClose = El servidor està tancat.
+server.kicked.vote = Us han expulsat per votació. Adéu.
+server.kicked.clientOutdated = El client s’ha d’actualitzar.
+server.kicked.serverOutdated = El servidor s’ha d’actualitzar. Demaneu-li a l’amfitrió que l’actualitzi.
+server.kicked.banned = Se us ha bandejat d’aquest servidor.
+server.kicked.typeMismatch = El servidor no és compatible amb el tipus de compilació actual.
+server.kicked.playerLimit = El servidor està ple. Espereu que hi hagi una ranura buida.
+server.kicked.recentKick = Us han expulsat fa poc.\nEspereu abans de connectar-vos.
+server.kicked.nameInUse = Ja hi ha algú amb aquest nom\nen aquest servidor.
+server.kicked.nameEmpty = El nom triat no és vàlid.
+server.kicked.idInUse = Ja esteu en aquest servidor. No és permès connectar-se amb dos comptes.
+server.kicked.customClient = El servidor no suporta versions personalitzades. Descarregueu una versió oficial.
+server.kicked.gameover = Fi de la partida
+server.kicked.serverRestarting = El servidor es reinicia.
+server.versions = Versió local:[accent] {0}[]\nVersió del servidor:[accent] {1}[]
+host.info = El botó de l’amfitrió «[accent]Allotja[]» crea un servidor al port [scarlet]6567[]. \nQualsevol jugador en la mateixa [lightgray]xarxa local[] hauria de poder veure el servidor a la seva llista de servidors.\n\nSi voleu que es puguin connectar jugadors des de qualsevol lloc per IP, caldrà configurar l’[accent]assignació de ports[].\n\n[lightgray]Nota: Si algú té problemes per connectar-se a la partida LAN, assegureu-vos que heu donat accés al Mindustry a la xarxa local a la configuració del tallafocs. Tingueu en compte que a vegades les xarxes públiques no permeten descobrir servidors.
+join.info = Podeu escriure l’[accent]adreça IP del servidor[] al qual us voleu connectar o bé descobrir i connectar-vos a una [accent]xarxa local[] o [accent]servidors globals[].\nEs pot jugar en multijugador tant amb la LAN com amb la WAN.\n\n[lightgray]Si us voleu connectar amb algú via IP, li haureu de demanar a l’amfitrió la seva adreça.
+hostserver = Allotja una partida multijugador
+invitefriends = Invita amics
+hostserver.mobile = Allotja una partida
+host = Allotja
+hosting = [accent]S’obre el servidor…
+hosts.refresh = Actualitza
+hosts.discovering = Es busquen partides a la LAN…
+hosts.discovering.any = Es busquen partides…
+server.refreshing = S’actualitza el servidor
+hosts.none = [lightgray]No s’han trobat partides locals!
+host.invalid = [scarlet]No es pot connectar amb l’amfitrió.
+
+servers.local = Servidors locals
+servers.local.steam = Partides públiques i servidors locals
+servers.remote = Servidors remots
+servers.global = Servidors de la comunitat
+
+servers.disclaimer = Els servidors de la comunitat [accent]no[] són ni els controla el desenvolupador.\n\nEls servidors poden tenir continguts generats per usuaris que no són adequats per a totes les edats.
+servers.showhidden = Mostra els servidors ocults
+server.shown = Mostra
+server.hidden = Amaga
+viewplayer = Es mira el jugador: [accent]{0}
+
+trace = Rastreja un jugador
+trace.playername = Nom del jugador: [accent]{0}
+trace.ip = IP: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
+trace.mobile = Client de mòbil: [accent]{0}
+trace.modclient = Client personalitzat: [accent]{0}
+trace.times.joined = S’ha unit [accent]{0}[] vegades.
+trace.times.kicked = Ha estat expulsat [accent]{0}[] vegades.
+trace.ips = Direccions IP:
+trace.names = Noms:
+invalidid = ID de client no vàlid! Envieu un informe d’error.
+player.ban = Bandeja
+player.kick = Expulsa
+player.trace = Traça
+player.admin = Commuta d’admin
+player.team = Canvia l’equip
+server.bans = Bandejaments
+server.bans.none = No s’ha trobat cap jugador bandejat!
+server.admins = Administradors
+server.admins.none = No s’ha trobat cap administrador!
+server.add = Afegeix un servidor
+server.delete = Esteu segur que voleu esborrar aquest servidor?
+server.edit = Edita el servidor
+server.outdated = [scarlet]Servidor desactualitzat![]
+server.outdated.client = [scarlet]Client desactualitzat![]
+server.version = [gray]v{0} {1}
+server.custombuild = [accent]Versió personalitzada
+confirmban = Esteu segur que voleu bandejar a «{0}[white]»?
+confirmkick = Esteu segur que voleu expulsar a «{0}[white]»?
+confirmunban = Esteu segur que voleu treure el bandeig a aquest jugador?
+confirmadmin = Esteu segur que voleu fer administrador a «{0}[white]»?
+confirmunadmin = Esteu segur que voleu treure a «{0}[white]» els permisos d’administrador?
+votekick.reason = Motiu per a la votació d’expulsió
+votekick.reason.message = Esteu segur que voleu votar per a expulsar per votació a «{0}[white]»?\nSi és que sí, escriviu-ne el motiu:
+joingame.title = Uneix-me a la partida
+joingame.ip = Direcció IP:
+disconnect = Desconnectat.
+disconnect.error = Error de connexió.
+disconnect.closed = Connexió tancada.
+disconnect.timeout = S’ha esgotat el temps d’espera.
+disconnect.data = No s’han pogut carregar les dades del món!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
+cantconnect = No és possible unir-se a la partida ([accent]{0}[]).
+connecting = [accent]Es connecta…
+reconnecting = [accent]Es torna a connectar…
+connecting.data = [accent]Es carreguen les dades del món…
+server.port = Port:
+server.invalidport = El número de port no és vàlid!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [scarlet]S’ha produït un error mentre s’allotjava el servidor.
+save.new = Desa en un fitxer nou
+save.overwrite = Esteu segur que voleu sobreescriure\naquesta ranura de desades?
+save.nocampaign = Els fitxers de desades individuals de la campanya no es poden importar.
+overwrite = Sobreescriu
+save.none = No s’ha trobat cap partida desada!
+savefail = No s’ha pogut desar la partida!
+save.delete.confirm = Esteu segur que voleu esborrar aquesta desada?
+save.delete = Esborra
+save.export = Exporta la desada
+save.import.invalid = [accent]Aquesta desada no és vàlida!
+save.import.fail = [scarlet]La desada no s’ha pogut importar: [accent]{0}
+save.export.fail = [scarlet]La desada no s’ha pogut exportar: [accent]{0}
+save.import = Importa una partida desada
+save.newslot = Nom del fitxer de la desada:
+save.rename = Reanomena
+save.rename.text = Nom nou:
+selectslot = Seleccioneu una desada.
+slot = [accent]Ranura {0}
+editmessage = Edita el missatge
+save.corrupted = El fitxer de la desada està corromput o no és vàlid!
+empty = <buit>
+on = Activat
+off = Desactivat
+save.search = Cerca partides desades…
+save.autosave = Desada automàtica: {0}
+save.map = Mapa: {0}
+save.wave = Onada {0}
+save.mode = Mode de joc: {0}
+save.date = Data de l’última desada: {0}
+save.playtime = Temps de joc: {0}
+warning = Avís.
+confirm = Confirmació
+delete = Esborra
+view.workshop = Mostra-ho al Workshop
+workshop.listing = Edita el llistat del Workshop
+ok = D’acord
+open = Obre
+customize = Personalitza les regles
+cancel = Cancel·la
+command = Ordre
+command.queue = [lightgray][Queuing]
+command.mine = Extreu recursos
+command.repair = Repara
+command.rebuild = Reconstrueix
+command.assist = Assisteix al jugador
+command.move = Mou
+command.boost = Sobrevola
+command.enterPayload = Entra bloc
+command.loadUnits = Carrega unitats
+command.loadBlocks = Carrega blocs
+command.unloadPayload = Descarrega
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel·la les ordres
+stance.shoot = Comportament: Dispara
+stance.holdfire = Comportament: Mantén el foc
+stance.pursuetarget = Comportament: Persegueix l’objectiu
+stance.patrol = Comportament: Patrulla el camí
+stance.ram = Comportament: Senzill\n[lightgray]Mou-te en línia recta, sense encaminador
+openlink = Obre l’enllaç
+copylink = Copia l’enllaç
+back = Enrere
+max = Màx.
+objective = Objectiu del mapa
+crash.export = Exporta els registres d’errors
+crash.none = No s’ha trobat cap registre d’error.
+crash.exported = Els registres d’errors s’han exportat.
+data.export = Exporta les dades
+data.import = Importa les dades
+data.openfolder = Obre la carpeta de les dades
+data.exported = Les dades s’han exportat.
+data.invalid = Aquestes no són dades de partida vàlides.
+data.import.confirm = Si s’importen dades externes es sobreescriuran[scarlet] totes[] les dades de la partida actual.\n[accent]Això no es podrà desfer![]\n\nUna vegada s’hagin importat les dades, el joc es tancarà immediatament.
+quit.confirm = Esteu segur que voleu sortir?
+loading = [accent]Es carrega…
+downloading = [accent]Es descarreguen dades…
+saving = [accent]Es desa…
+respawn = [accent][[{0}][] per a tornar a aparèixer.
+cancelbuilding = [accent][[{0}][] per a esborrar el pla de construcció.
+selectschematic = [accent][[{0}][] per a seleccionar i copiar.
+pausebuilding = [accent][[{0}][] per a posar en pausa la construcció.
+resumebuilding = [scarlet][[{0}][] per a reprendre la construcció.
+enablebuilding = [scarlet][[{0}][] per a activar l’edifici.
+showui = La interfície gràfica està amagada.\nPremeu [accent][[{0}][] per a mostrar-la.
+commandmode.name = [accent]Mode d’Ordres
+commandmode.nounits = [no units]
+wave = [accent]Onada {0}
+wave.cap = [accent]Onada {0}/{1}
+wave.waiting = [lightgray]Començarà en {0}
+wave.waveInProgress = [lightgray]Onada en curs
+waiting = [lightgray]S’espera…
+waiting.players = S’espera els jugadors…
+wave.enemies = Queden [lightgray]{0} enemics.
+wave.enemycores = [accent]{0}[lightgray] nuclis enemics
+wave.enemycore = [accent]{0}[lightgray] nucli enemic
+wave.enemy = Queda [lightgray]{0} enemic.
+wave.guardianwarn = Arribarà un guardià en [accent]{0}[] ondades.
+wave.guardianwarn.one = Arribarà un guardià en [accent]{0}[] onada.
+loadimage = Carrega una imatge
+saveimage = Desa la imatge
+unknown = Desconegut
+custom = Personalitzat
+builtin = *Integrat*
+map.delete.confirm = Esteu segur que voleu esborrar aquest mapa? Aquesta acció no es pot desfer!
+map.random = [accent]Mapa aleatori
+map.nospawn = Aquest mapa no té cap nucli per tal que el jugador hi pugui aparèixer! Afegiu-hi un nucli {0} amb l’editor.
+map.nospawn.pvp = Aquest mapa no té nuclis enemics per tal que hi puguin aparèixer altres jugadors! Afegiu-hi nuclis [scarlet]d’un altre color[] amb l’editor.
+map.nospawn.attack = Aquest mapa no té cap nucli enemic que el jugador pugui atacar! Afegiu-hi nuclis {0} amb l’editor.
+map.invalid = S’ha produït un error carregant el mapa: el fitxer està corromput o bé el mapa no és vàlid.
+workshop.update = Actualitza l’element
+workshop.error = S’ha produït un error mentre s’obtenien els detalls del Workshop: {0}
+map.publish.confirm = Esteu segur que voleu publicar el mapa?\n\n[lightgray]Assegureu-vos d’acceptar primer l’acord de llicència d’usuari final (EULA) del Workshop. Si no, els vostres mapes no hi apareixeran!
+workshop.menu = Seleccioneu què voleu fer amb l’element.
+workshop.info = Informació de l’element
+changelog = Registre de canvis (opcional):
+updatedesc = Sobreescriu el títol i la descripció
+eula = EULA de l’Steam
+missing = Aquest element s’ha esborrat o s’ha mogut.\n[lightgray]El llistat del Workshop s’ha desenllaçat automàticament.
+publishing = [accent]Es publica…
+publish.confirm = Esteu segur que ho voleu publicar?\n\n[lightgray]Assegureu-vos d’acceptar primer l’acord de llicència d’usuari final (EULA) del Workshop. Si no, els vostres elements no hi apareixeran!
+publish.error = S’ha produït un error mentre es publicava l’element: {0}
+steam.error = No s’ha pogut inicialitzar els serveis de l’Steam.\nError: {0}
+
+editor.planet = Planeta:
+editor.sector = Sector:
+editor.seed = Llavor:
+editor.cliffs = Converteix els murs en espadats
+editor.brush = Pinzell
+editor.openin = Obre a l’editor
+editor.oregen = Generació de minerals
+editor.oregen.info = Generació de minerals:
+editor.mapinfo = Informació del mapa
+editor.author = Autor:
+editor.description = Descripció:
+editor.nodescription = Un mapa ha de tenir una descripció amb almenys 4 caràcters per tal que es pugui publicar.
+editor.waves = Onades
+editor.rules = Regles
+editor.generation = Generació
+editor.objectives = Objectius
+editor.locales = Paquet de traduccions
+editor.worldprocessors = Processadors integrats
+editor.worldprocessors.editname = Edita el nom
+editor.worldprocessors.none = [lightgray]No s’han trobat blocs de processadors integrats!\nAfegiu-ne un a l’editor de mapes o feu servir el botó \ue813 de sota.
+editor.worldprocessors.nospace = No hi ha espai disponible per a posar un processador integrat!\nPotser el mapa està ple d’estructures.
+editor.worldprocessors.delete.confirm = Esteu segur que voleu esborrar aquest processador integrat?\n\nSi està envoltat de murs, es reemplaçarà per un mur mediambiental.
+editor.ingame = Edita des de la partida
+editor.playtest = Prova el mapa
+editor.publish.workshop = Publica al Workshop
+editor.newmap = Mapa nou
+editor.center = Centra
+editor.search = Cerca mapes
+editor.filters = Filtra els mapes
+editor.filters.mode = Modes de partida:
+editor.filters.type = Tipus de mapa:
+editor.filters.search = Cerca a:
+editor.filters.author = Autor
+editor.filters.description = Descripció
+editor.shiftx = Desplaça en l’eix X
+editor.shifty = Desplaça en l’eix Y
+workshop = Workshop
+waves.title = Onades
+waves.remove = Treu
+waves.every = cada
+waves.waves = onada/es
+waves.health = salut: {0} %
+waves.perspawn = per aparició
+waves.shields = escuts/onada
+waves.to = fins a
+waves.spawn = aparèixer:
+waves.spawn.all = <tots>
+waves.spawn.select = Selecciona la zona d’aparició
+waves.spawn.none = [scarlet]No s’han trobat zones d’aparició al mapa.
+waves.max = nombre màxim d’unitats
+waves.guardian = Guardià
+waves.preview = Previsualització
+waves.edit = Edita
+waves.random = Random
+waves.copy = Copia al porta-retalls
+waves.load = Carrega del porta-retalls
+waves.invalid = El contingut del porta-retalls té onades que no són vàlides.
+waves.copied = S’han copiat les onades.
+waves.none = No s’han definit enemics.\nTingueu en compte que les onades buides es substituiran automàticament amb l’onada per defecte.
+waves.sort = Ordena per
+waves.sort.reverse = Ordre invers
+waves.sort.begin = Comença
+waves.sort.health = Salut
+waves.sort.type = Tipus
+waves.search = Es busquen onades…
+waves.filter = Filtre d'unitats
+waves.units.hide = Amaga-les totes
+waves.units.show = Mostra-les totes
+
+#these are intentionally in lower case
+wavemode.counts = comptades
+wavemode.totals = totals
+wavemode.health = salut
+all = All
+
+editor.default = [lightgray]<Per defecte>
+details = Detalls
+edit = Edita
+variables = Variables
+logic.clear.confirm = Esteu segur que voleu esborrar tot el codi d’aquest processador?
+logic.globals = Built-in Variables
+editor.name = Nom:
+editor.spawn = Genera una unitat
+editor.removeunit = Treu una unitat
+editor.teams = Equips
+editor.errorload = S’ha produït un error mentre es carregava el fitxer.
+editor.errorsave = S’ha produït un error mentre es desava el fitxer.
+editor.errorimage = No és un mapa, és una imatge.
+editor.errorlegacy = Aquest mapa és massa antic i fa servir un format obsolet.
+editor.errornot = No és un fitxer de mapa.
+editor.errorheader = Aquest fitxer de mapa no és vàlid o està corromput.
+editor.errorname = No s’ha definit el nom del mapa. Esteu intentant carregar una partida desada?
+editor.errorlocales = S’ha produït un error mentre es llegia un paquet de traduccions no vàlid.
+editor.update = Actualitza
+editor.randomize = Assigna a l’atzar
+editor.moveup = Mou amunt
+editor.movedown = Mou avall
+editor.copy = Copia
+editor.apply = Aplica
+editor.generate = Genera
+editor.sectorgenerate = Generació del sector
+editor.resize = Canvia la mida
+editor.loadmap = Carrega un mapa
+editor.savemap = Desa el mapa
+editor.savechanges = [scarlet]Teniu canvis sense desar!\n\n[]Voleu desar-los?
+editor.saved = S’ha desat.
+editor.save.noname = El mapa no té nom! Trieu-ne un des del menú «Informació del mapa».
+editor.save.overwrite = El vostre mapa sobreescriu un mapa incorporat al joc! Trieu un nom diferent des del menú «Informació del mapa».
+editor.import.exists = [scarlet]No s’ha pogut importar:[] ja existeix un mapa incorporat al joc amb el nom «{0}»!
+editor.import = Importa
+editor.importmap = Importa un mapa
+editor.importmap.description = Importa un mapa ja existent al joc.
+editor.importfile = Importa un fitxer
+editor.importfile.description = Importa un fitxer de mapa extern.
+editor.importimage = Importa una imatge de mapa
+editor.importimage.description = Importa un fitxer d’imatge que representa un mapa.
+editor.export = Exporta
+editor.exportfile = Exporta el mapa
+editor.exportfile.description = Exporta el mapa a un fitxer.
+editor.exportimage = Exporta la imatge del terreny
+editor.exportimage.description = Crea un fitxer que conté només el terreny bàsic.
+editor.loadimage = Importa el terreny
+editor.saveimage = Exporta el terreny
+editor.unsaved = Esteu segur que voleu sortir?\n[scarlet]Es perdran els canvis que no s’hagin desat.
+editor.resizemap = Canvia la mida del mapa
+editor.mapname = Nom del mapa:
+editor.overwrite = [accent]Avís!\nEs sobreescriurà el mapa existent.
+editor.overwrite.confirm = [scarlet]Avís![] Ja existeix un mapa aquest nom. Esteu segur que voleu sobreescriure’l?\n"[accent]{0}[]"
+editor.exists = Ja existeix un mapa amb aquest nom.
+editor.selectmap = Seleccioneu el mapa que voleu carregar:
+
+toolmode.replace = Reemplaça
+toolmode.replace.description = Dibuixa només en blocs sòlids.
+toolmode.replaceall = Reemplaça-ho tot
+toolmode.replaceall.description = Reemplaça tots els blocs del mapa.
+toolmode.orthogonal = Ortogonal
+toolmode.orthogonal.description = Dibuixa només línies ortogonals.
+toolmode.square = Quadrat
+toolmode.square.description = Es dibuixarà amb un pinzell quadrat.
+toolmode.eraseores = Esborra els minerals
+toolmode.eraseores.description = Esborra només els minerals.
+toolmode.fillteams = Omple els equips
+toolmode.fillteams.description = Omple els equips en lloc dels blocs.
+toolmode.fillerase = Esborra els del mateix tipus
+toolmode.fillerase.description = Esborra els blocs que siguin del mateix tipus.
+toolmode.drawteams = Dibuixa els equips
+toolmode.drawteams.description = Dibuixa els equips en lloc de dibuixar blocs.
+#unused
+toolmode.underliquid = Sota els líquids
+toolmode.underliquid.description = Dibuixa el terra a sota de les caselles de líquids.
+
+filters.empty = [lightgray]Sense filtres! Afegiu-ne un amb el botó de sota.
+
+filter.distort = Distorsió
+filter.noise = Soroll
+filter.enemyspawn = Punt d’aparició dels enemics
+filter.spawnpath = Camí fins el punt d’aparició
+filter.corespawn = Selecció del nucli
+filter.median = Mediana
+filter.oremedian = Mediana de minerals
+filter.blend = Barreja
+filter.defaultores = Minerals per defecte
+filter.ore = Minerals
+filter.rivernoise = Soroll dels rius
+filter.mirror = Espill
+filter.clear = Neteja
+filter.option.ignore = Ignora
+filter.scatter = Dispersió
+filter.terrain = Terreny
+filter.logic = Lògica
+
+filter.option.scale = Escala
+filter.option.chance = Probabilitat
+filter.option.mag = Magnitud
+filter.option.threshold = Llindar
+filter.option.circle-scale = Escala del cercle
+filter.option.octaves = Octaves
+filter.option.falloff = Caiguda
+filter.option.angle = Angle
+filter.option.tilt = Inclinació
+filter.option.rotate = Gira
+filter.option.amount = Quantitat
+filter.option.block = Bloc
+filter.option.floor = Terra
+filter.option.flooronto = Terra objectiu
+filter.option.target = Objectiu
+filter.option.replacement = Reemplaçament
+filter.option.wall = Mur
+filter.option.ore = Mineral
+filter.option.floor2 = Terra secundari
+filter.option.threshold2 = Llindar secundari
+filter.option.radius = Radi
+filter.option.percentile = Percentil
+filter.option.code = Codi
+filter.option.loop = Bucle
+locales.info = Aquí, podeu afegir paquets de traducció per a idiomes específics al vostre mapa. En els paquets de traducció, cada propietat té un nom i un valor. Aquestes propietats les poden fer servir els processadors integrats i els objectius, fent servir els seus noms. Suporten el format de text (reemplaçant els marcadors de posició amb els seus valors corresponents).\n\n[cyan]Exemple de propietat:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Esteu segur que voleu esborrar aquesta traducció?
+locales.applytoall = Aplica els canvis a totes les traduccions
+locales.addtoother = Afegeix a les altres traduccions
+locales.rollback = Restableix a l’última aplicada
+locales.filter = Propietat per al filtre
+locales.searchname = Cerca el nom…
+locales.searchvalue = Cerca el valor…
+locales.searchlocale = Cerca la traducció…
+locales.byname = Per nom
+locales.byvalue = Per valor
+locales.showcorrect = Mostra les propietats que estan en totes les traduccions i tenen valors únics en totes
+locales.showmissing = Mostra les propietats que fan falta en algunes traduccions
+locales.showsame = Mostra les propietats que tenen els mateixos valors en traduccions diferents
+locales.viewproperty = Mostra en totes les traduccions
+locales.viewing = Es mostra la propietat «{0}»
+locales.addicon = Afegeix una icona
+
+width = Amplada:
+height = Alçada:
+menu = Menú
+play = Juga
+campaign = Campanya
+load = Carrega
+save = Desa
+fps = FPS: {0}
+ping = Ping: {0} ms
+tps = TPS: {0}
+memory = Mem.: {0} MB
+memory2 = Mem.:\n {0} MB +\n {1} MB
+language.restart = Reinicieu el joc perquè s’apliquin els canvis d’idioma.
+settings = Configuració
+tutorial = Tutorial
+tutorial.retake = Continua el tutorial
+editor = Editor
+mapeditor = Editor de mapes
+
+abandon = Abandona
+abandon.text = Es perdrà la zona i tots els seus recursos passaran a ser de l’enemic.
+locked = Blocat
+complete = [lightgray]Requisits previs:
+requirement.wave = Arribeu a l’onada {0} de {1}.
+requirement.core = Destruïu el nucli enemic de {0}.
+requirement.research = Recerqueu {0}.
+requirement.produce = Produïu {0}.
+requirement.capture = Captureu {0}.
+requirement.onplanet = Controleu el sector {0}.
+requirement.onsector = Aterreu al sector {0}.
+launch.text = Inicia el llançament
+map.multiplayer = Només l’amfitrió pot veure els sectors.
+uncover = Descobreix
+configure = Configura la càrrega inicial
+objective.research.name = Recerca
+objective.produce.name = Obtén
+objective.item.name = Obtén un element
+objective.coreitem.name = Element del nucli
+objective.buildcount.name = Nombre de construïts
+objective.unitcount.name = Nombre d’unitats
+objective.destroyunits.name = Destrueix unitats
+objective.timer.name = Temporitzador
+objective.destroyblock.name = Destrueix un bloc
+objective.destroyblocks.name = Destrueix blocs
+objective.destroycore.name = Destrueix el nucli
+objective.commandmode.name = Mode de comandament
+objective.flag.name = Bandera
+marker.shapetext.name = Forma del text
+marker.point.name = Punt
+marker.shape.name = Forma
+marker.text.name = Text
+marker.line.name = Línia
+marker.quad.name = Rectangle
+marker.texture.name = Textura
+marker.background = Fons
+marker.outline = Contorn
+
+objective.research = [accent]Recerqueu:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obteniu:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destruïu:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destruïu: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obteniu: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Porteu al nucli:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Construïu: [][lightgray]{0}[]×\n{1}[lightgray]{2}
+objective.buildunit = [accent]Construïu unitats: [][lightgray]{0}[]×\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destruïu [][lightgray]{0}[] unitats.
+objective.enemiesapproaching = [accent]Arribaran enemics d’aquí [lightgray]{0}[].
+objective.enemyescelating = [accent]La producció enemiga augmentarà d’aquí [lightgray]{0}[]
+objective.enemyairunits = [accent]L’enemic començarà a produir unitats aèries d’aquí [lightgray]{0}[]
+objective.destroycore = [accent]Destruïu el nucli enemic.
+objective.command = [accent]Dirigiu les unitats.
+objective.nuclearlaunch = [accent]⚠ S’ha detectat un llançament nuclear: [lightgray]{0}
+announce.nuclearstrike = [red]âš  IMPACTE NUCLEAR IMMINENT âš 
+
+loadout = Càrrega inicial
+resources = Recursos
+resources.max = Màx.
+bannedblocks = Blocs no permesos
+unbannedblocks = Unbanned Blocks
+objectives = Objectius
+bannedunits = Unitats no permeses
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Unitats no permeses com a llista blanca
+bannedblocks.whitelist = Blocs no permesos com a llista blanca
+addall = Afegeix-ho tot
+launch.from = Llançant des de [accent]{0}.
+launch.capacity = Capacitat de càrrega per llançament: [accent]{0}
+launch.destination = Destinació: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = La quantitat ha de ser un nombre entre 0 i {0}.
+add = Afegeix
+guardian = Guardià
+
+connectfail = [scarlet]Error de connexió:\n\n[accent]{0}
+error.unreachable = No es pot accedir al servidor.\nL’adreça està ben escrita?
+error.invalidaddress = L’adreça no és vàlida.
+error.timedout = S’ha esgotat el temps d’espera!\nAssegureu-vos que l’amfitrió ha configurat l’assignació de ports i que l’adreça és correcta.
+error.mismatch = Error d’enviament de paquets:\nPotser no coincideixen les versions del client i del servidor.\nAssegureu-vos que client i servidor fan servir l’última versió del Mindustry!
+error.alreadyconnected = Ja esteu connectat.
+error.mapnotfound = El fitxer del mapa no s’ha trobat!
+error.io = S’ha produït un error d’entrada/sortida de la xarxa.
+error.any = S’ha produït un error de xarxa desconegut.
+error.bloom = No s’ha pogut inicialitzar l’efecte «bloom».\nPotser el dispositiu no admet aquesta funció.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
+
+weather.rain.name = Pluja
+weather.snowing.name = Neu
+weather.sandstorm.name = Tempesta de sorra
+weather.sporestorm.name = Tempesta d’espores
+weather.fog.name = Boira
+campaign.playtime = \uf129 [lightgray]Temps de joc al sector: {0}
+campaign.complete = [accent]Felicitats.\n\nS’ha derrotat l’enemic de {0}.\n[lightgray]S’ha conquerit l’últim sector.
+
+sectorlist = Sectors
+sectorlist.attacked = Ataquen {0}.
+sectors.unexplored = [lightgray]Inexplorat
+sectors.resources = Recursos:
+sectors.production = Producció:
+sectors.export = Exporta:
+sectors.import = Importa:
+sectors.time = Temps:
+sectors.threat = Amenaça:
+sectors.wave = Onada:
+sectors.stored = Emmagatzemat:
+sectors.resume = Continua
+sectors.launch = Llança
+sectors.select = Selecciona
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]cap (sol)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Reanomena el sector
+sectors.enemybase = [scarlet]Base enemiga
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Ens ataquen! [accent]{0} % danyat
+sectors.underattack.nodamage = [scarlet]Sense capturar
+sectors.survives = [accent]Aguanta {0} onades
+sectors.go = Vés-hi
+sector.abandon = Abandona
+sector.abandon.confirm = Els nuclis d’aquest sector s’autodestruiran.\nVoleu continuar?
+sector.curcapture = Sector capturat
+sector.curlost = Sector perdut
+sector.missingresources = [scarlet]Recursos insuficients al nucli
+sector.attacked = Ataquen el sector [accent]{0}[white]!
+sector.lost = Heu perdut el sector [accent]{0}[white]!
+sector.capture = S’ha capturat el sector [accent]{0}[white]!
+sector.capture.current = Sector capturat!
+sector.changeicon = Canvia la icona
+sector.noswitch.title = Els sectors no es poden canviar.
+sector.noswitch = Potser no podeu canviar de sector perquè n’ataquen un altre.\n\nSector: [accent]{0}[] de [accent]{1}[]
+sector.view = Veure el sector
+
+threat.low = Baixa
+threat.medium = Mitjana
+threat.high = Alta
+threat.extreme = Extrema
+threat.eradication = Erradicació
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
+planets = Planetes
+
+planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
+planet.sun.name = Sol
+
+sector.impact0078.name = Impacte 0078
+sector.groundZero.name = Zona zero
+sector.craters.name = Els cràters
+sector.frozenForest.name = El bosc gelat
+sector.ruinousShores.name = Costes en ruïnes
+sector.stainedMountains.name = Muntanyes tacades
+sector.desolateRift.name = L’escletxa desolada
+sector.nuclearComplex.name = Complex de producció nuclear
+sector.overgrowth.name = Creixement exuberant
+sector.tarFields.name = Els camps de quitrà
+sector.saltFlats.name = Les Salines
+sector.fungalPass.name = El port de muntanya dels fongs
+sector.biomassFacility.name = Centre de síntesi de biomassa
+sector.windsweptIslands.name = Les illes escombrades pel vent
+sector.extractionOutpost.name = Post avançat d’extracció
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Terminal de llançament interplanetari
+sector.coastline.name = Línia de costa
+sector.navalFortress.name = Fortalesa naval
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
+
+sector.groundZero.description = El lloc adequat per a començar de nou. Amenaça enemiga baixa. Pocs recursos.\nRecolliu tot el coure i plom que pugueu.\nDesprés, continueu en un altre sector.
+sector.frozenForest.description = Les espores han arribat fins aquí, prop de les muntanyes. Les temperatures baixes no les podran contenir per sempre.\n\nComenceu el camí del poder. Construïu generadors a combustió. Apreneu a fer servir els reparadors.
+sector.saltFlats.description = Als límits del desert hi ha les Salines. Aquesta regió té pocs recursos.\n\nL’enemic hi ha aixecat un complex d’emmagatzematge de recursos. Elimineu el seu nucli i no en deixeu cap rastre.
+sector.craters.description = L’aigua s’ha acumulat en aquest cràter, relíquia de les guerres passades. Reclameu l’àrea, recolliu sorra i foneu metavidre. Bombegeu aigua per a refredar les torretes i les perforadores.
+sector.ruinousShores.description = Més enllà dels erms, hi ha la costa. En el seu temps, hi havia una línia de defensa costera. No en queda molt. Només hi queden intactes les estructures de defensa més bàsiques; de la resta només en queda ferralla.\nContinueu l’expansió i redescobriu tecnologies perdudes.
+sector.stainedMountains.description = Terra endins, hi ha muntanyes que no han estat contaminades per les espores.\nExtraieu el titani que abunda a l’àrea. Apreneu a usar-lo.\n\nEn aquesta zona hi ha més presència enemiga. No els deixeu temps per a enviar-vos les unitats més fortes.
+sector.overgrowth.description = En aquesta àrea s’ha produït un creixement desmesurat i està a prop de la font de les espores.\nL’enemic hi ha establit un post avançat. Construïu unitats [accent]Maça[] i destruïu-lo.
+sector.tarFields.description = Les afores d’una zona de producció petroliera, entre les muntanyes i el desert. Una de les poques àrees amb reserves útils de quitrà.\nEncara que estan abandonades, aquesta àrea té forces enemigues perilloses a prop. No les subestimeu.\n\n[lightgray]Recerqueu la tecnologia de processament de petroli si podeu.
+sector.desolateRift.description = Una zona extremadament perillosa, que disposa de molts recursos, però que té poc espai. Té un elevat risc de destrucció. Construïu defenses aèries i terrestres tan aviat com sigui possible. No us confieu pel llarg interval de temps entre atacs enemics.
+sector.nuclearComplex.description = Un antic centre de producció i processament de tori, reduït a ruïnes.\n[lightgray]Recerqueu el tori i els seus diversos usos.\n\nL’enemic disposa d’un gran nombre d’unitats que patrullen la zona.
+sector.fungalPass.description = Una àrea de transició entre altes muntanyes i els territoris més baixos plagats per espores. Hi ha una petita base de reconeixement enemiga.\nDestruïu-la.\nUseu unitats [accent]Daga[] i [accent]Crawler[]. Elimineu els dos nuclis enemics.
+sector.biomassFacility.description = L’origen de les espores. Aquest és el centre on es van investigar i produir les espores.\nRecerqueu les tecnologies que hi pugueu trobar. Cultiveu espores per a produir combustibles i plàstics.\n\n[lightgray]Després de la caiguda d’aquest complex, les espores van ser alliberades. L’ecosistema local no va poder competir amb un organisme tan invasiu.
+sector.windsweptIslands.description = Més enllà de la costa hi ha aquesta cadena d’illes remotes. Els informes indiquen que una vegada hi hagueren estructures per a produir [accent]plastani[].\n\nDefenseu-vos de les unitats enemigues navals i establiu una base a les illes. Investigueu les fàbriques.
+sector.extractionOutpost.description = Un post avançat remot, construït per l’enemic per a enviar recursos a altres sectors.\n\nLa tecnologia de transport entre sectors és essencial per a expandir-se. Destruïu la base i investigueu les seves plataformes de llançament.
+sector.impact0078.description = Aquí hi ha les restes de la primera nau de transport interestel·lar que va arribar al sistema.\n\nRecupereu tot el que pugueu i investigueu qualsevol tecnologia que hagi quedat intacta.
+sector.planetaryTerminal.description = L’objectiu final.\n\nAquesta base costera conté una estructura capaç de llançar nuclis a altres planetes. Està molt ben vigilida.\n\nProduïu unitats navals, elimineu l’enemic tan aviat com pugueu i investigueu l’estructura de llançament.
+sector.coastline.description = S’han detectat restes de tecnologia naval a prop. Repel·liu els atacs enemics, captureu el sector i aconseguiu la tecnologia.
+sector.navalFortress.description = L’enemic ha establert una base en una illa distant amb defenses geològiques naturals. Destruïu el post avançat i aconseguiu i investigueu les seves tecnologies navals avançades.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = El principi
+sector.aegis.name = L’ègida
+sector.lake.name = El llac
+sector.intersect.name = La intersecció
+sector.atlas.name = L’Atles
+sector.split.name = La separació
+sector.basin.name = La conca
+sector.marsh.name = El pantà
+sector.peaks.name = Els cims
+sector.ravine.name = Els barrancs
+sector.caldera-erekir.name = El cràter
+sector.stronghold.name = La fortalesa
+sector.crevice.name = L’esquerda
+sector.siege.name = El setge
+sector.crossroads.name = L’encreuament
+sector.karst.name = El carst
+sector.origin.name = Origen
+sector.onset.description = El sector del tutorial. Encara no s’ha establert cap objectiu. Manteniu-vos a l’espera per a rebre més informació.
+sector.aegis.description = L’enemic està protegit per escuts. S’ha detectat un mòdul experimental antiescuts al sector.\nLocalitzeu-lo i abastiu-lo amb tungstè per a destruir la base enemiga.
+sector.lake.description = El llac de residus d’aquest sector limita el nombre d’unitats viables. Les unitats aèries són l’única via possible.\nRecerqueu la tecnologia per a construir [accent]muntadores de naus[] i produïu una unitat [accent]Elude[] tan aviat com pugueu.
+sector.intersect.description = Els escàners indiquen que el sector rebrà atacs des de múltiples posicions poc després d’aterrar-hi.\nEstabliu les defenses de pressa i expandiu-vos tant com pugueu.\nFaran falta unitats [accent]Meca[] per a fer front al terreny abrupte de l’àrea.
+sector.atlas.description = Aquest sector conté diversos tipus de terreny i necessita diferents unitats per a atacar de manera efectiva.\nPotser també caldrà disposar d’unitats millorades per a derrotar les bases enemigues més fortes detectades en aquest sector.\nRecerqueu l’[accent]electrolitzador[] i la [accent]fabricadora de tancs[].
+sector.split.description = La presència enemiga mínima al sector el fa ideal per a provar les noves tecnologies de transport.
+sector.basin.description = {Temporal}\n\nL’últim sector per ara. Considereu de moment que és un repte. S’afegiran més sectors en versions posteriors.
+sector.marsh.description = En aquest sector hi ha molta arquicita, però poques fumaroles.\nConstruïu [accent]cambres de combustió química[] per a generar energia.
+sector.peaks.description = El terreny muntanyós del sector fa que moltes unitats no siguin útils. Caldran unitats aèries.\nAneu amb compte amb les instal·lacions antiaèries enemigues. Potser a algunes se les podrà inutilitzar si es dispara a les seves estructures de suport.
+sector.ravine.description = No es detecten nuclis enemics al sector, tot i que és una ruta de transport enemiga important. Hi haurà una gran varietat de forces enemigues.\nProduïu [accent]aliatge electrificable[]. Construïu torretes [accent]Afflict[].
+sector.caldera-erekir.description = Els recursos que s’han detectat al sector estan espargits per diverses illes.\nInvestigueu i establiu una xarxa de transport que faci servir drons.
+sector.stronghold.description = El campament enemic gran d’aquest sector guarda dipòsits importants de [accent]tori[].\nFeu-lo servir per a desenvolupar unitats i torretes de nivells més alts.
+sector.crevice.description = L’enemic enviarà un atac ferotge per a eliminar la vostra base del sector.\nPer a poder sobreviure, caldrà desenvolupar [accent]carburs[] i [accent]generadors pirolítics[].
+sector.siege.description = En aquest sector hi ha dos canyons paral·lels que forçaran un atac per dues bandes.\nInvestigueu el [accent]cianogen[] per a poder crear unitats d’atac més fortes.\nAtenció: s’han detectat míssils de llarg abast. Els míssils es poden abatre abans que impactin contra el seu objectiu.
+sector.crossroads.description = Les bases enemigues del sector s’han establert en diferents tipus de terreny. Investigueu unitats diferents per a adaptar els atacs.\nA més a més, algunes bases estan protegides per escuts. Esbrineu d’on treuen l’energia.
+sector.karst.description = Aquest sector és ric en recursos, però l’enemic l’atacarà tan aviat com hi aterri un nucli.\nAprofiteu els recursos i recerqueu el [accent]teixit de fase[].
+sector.origin.description = El sector final amb una presència enemiga important.\nProbablement no queden oportunitats de recerca. Centreu-vos en destruir els nuclis enemics.
+
+status.burning.name = Cremant
+status.freezing.name = Congelat
+status.wet.name = Mullat
+status.muddy.name = Fangós
+status.melting.name = Fos
+status.sapped.name = Esgotat
+status.electrified.name = Electrificat
+status.spore-slowed.name = Alentit
+status.tarred.name = Enquitranat
+status.overdrive.name = Sobrecarregat
+status.overclock.name = Accelerat
+status.shocked.name = Commocionat
+status.blasted.name = Explosionat
+status.unmoving.name = Immòbil
+status.boss.name = Guardià
+
+settings.language = Idioma
+settings.data = Dades del joc
+settings.reset = Restableix els valors per defecte
+settings.rebind = Canvia
+settings.resetKey = Restableix
+settings.controls = Controls
+settings.game = Joc
+settings.sound = So
+settings.graphics = Gràfics
+settings.cleardata = Esborra les dades de la partida
+settings.clear.confirm = Esteu segur que voleu esborrar les dades?\nAquesta acció no es pot desfer.
+settings.clearall.confirm = [scarlet]Avís![]\nS’esborraran totes les dades, incloent desades, mapes, elements desblocats i dreceres de teclat.\nQuan premeu «D’acord», el programa esborrara les dades i es tancarà automàticament.
+settings.clearsaves.confirm = Esteu segur que voleu esborrar totes les partides desades?
+settings.clearsaves = Esborra les partides desades
+settings.clearresearch = Esborra la recerca
+settings.clearresearch.confirm = Esteu segur que voleu esborrar tota la recerca feta en el mode campanya?
+settings.clearcampaignsaves = Esborra les desades de la campanya
+settings.clearcampaignsaves.confirm = Esteu segur que voleu esborrar totes les desades de la campanya?
+paused = [accent]< En pausa >
+clear = Esborra
+banned = [scarlet]Expulsat
+unsupported.environment = [scarlet]Entorn no vàlid
+yes = Sí
+no = No
+info.title = Informació
+error.title = [scarlet]Hi ha hagut un error.
+error.crashtitle = Hi ha hagut un error.
+unit.nobuild = [scarlet]La unitat no pot construir.
+lastaccessed = [lightgray]Últim accés: {0}
+lastcommanded = [lightgray]Última ordre: {0}
+block.unknown = [lightgray]???
+
+stat.showinmap = <carrega un mapa i mostra’l>
+stat.description = Propòsit
+stat.input = Entrada
+stat.output = Sortida
+stat.maxefficiency = Eficiència màxima
+stat.booster = Potenciador
+stat.tiles = Caselles necessàries
+stat.affinities = Afinitats
+stat.opposites = Oposats
+stat.powercapacity = Capacitat energètica
+stat.powershot = Energia/Tret
+stat.damage = Dany
+stat.targetsair = Dispara objectius aeris
+stat.targetsground = Dispara objectius terrestres
+stat.itemsmoved = Velocitat de moviment
+stat.launchtime = Temps entre llançaments
+stat.shootrange = Abast
+stat.size = Mida
+stat.displaysize = Mida de la pantalla
+stat.liquidcapacity = Capacitat de líquids
+stat.powerrange = Abast de l’energia
+stat.linkrange = Abast d’enllaç
+stat.instructions = Instruccions
+stat.powerconnections = Connexions màximes
+stat.poweruse = Consum d’energia
+stat.powerdamage = Energia/Dany
+stat.itemcapacity = Capacitat d’elements
+stat.memorycapacity = Capacitat de memòria
+stat.basepowergeneration = Generació base d’energia
+stat.productiontime = Temps de producció
+stat.repairtime = Temps de reparació completa de blocs
+stat.repairspeed = Velocitat de reparació
+stat.weapons = Armes
+stat.bullet = Bala
+stat.moduletier = Nivell del mòdul
+stat.unittype = Tipus d’unitat
+stat.speedincrease = Augment de velocitat
+stat.range = Abast
+stat.drilltier = Perforables
+stat.drillspeed = Velocitat base de perforació
+stat.boosteffect = Efecte del potenciador
+stat.maxunits = Unitats actives màximes
+stat.health = Salut
+stat.armor = Armadura
+stat.buildtime = Temps de construcció
+stat.maxconsecutive = Màxim consecutiu
+stat.buildcost = Cost de construcció
+stat.inaccuracy = Imprecisió
+stat.shots = Dispars
+stat.reload = Cadència de tir
+stat.ammo = Munició
+stat.shieldhealth = Salut de l’escut
+stat.cooldowntime = Temps de refredament
+stat.explosiveness = Explosivitat
+stat.basedeflectchance = Probabilitat base d’evasió
+stat.lightningchance = Probabilitat de llampegar
+stat.lightningdamage = Dany del llampec
+stat.flammability = Inflamabilitat
+stat.radioactivity = Radioactivitat
+stat.charge = Càrrega elèctrica
+stat.heatcapacity = Resistència a la calor
+stat.viscosity = Viscositat
+stat.temperature = Temperatura
+stat.speed = Velocitat
+stat.buildspeed = Velocitat de construcció
+stat.minespeed = Velocitat d’extracció
+stat.minetier = Nivell de perforació
+stat.payloadcapacity = Capacitat de les cintes de blocs
+stat.abilities = Habilitats
+stat.canboost = Pot sobrevolar.
+stat.flying = Està volant.
+stat.ammouse = Ús de munició
+stat.ammocapacity = Capacitat de munició
+stat.damagemultiplier = Multiplicador de dany
+stat.healthmultiplier = Multiplicador de salut
+stat.speedmultiplier = Multiplicador de velocitat
+stat.reloadmultiplier = Multiplicador de recàrrega
+stat.buildspeedmultiplier = Multiplicador de velocitat de construcció
+stat.reactive = Reacciona amb
+stat.immunities = Immunitats
+stat.healing = Reparador
+stat.efficiency = [stat]{0}% Efficiency
+
+ability.forcefield = Camp de força
+ability.forcefield.description = Projecta un camp de força que absorbeix les bales.
+ability.repairfield = Repara el camp de força
+ability.repairfield.description = Repara les unitats properes.
+ability.statusfield = Estat del camp
+ability.statusfield.description = Aplica un efecte d’estat a les unitats properes.
+ability.unitspawn = Fàbrica
+ability.unitspawn.description = Construeix unitats.
+ability.shieldregenfield = Regenerador de camps de força
+ability.shieldregenfield.description = Regenera els escuts d’unitats properes.
+ability.movelightning = Moviment llampec
+ability.movelightning.description = Solta un llamp mentre es mou.
+ability.armorplate = Armadura de plaques
+ability.armorplate.description = Redueix el dany rebut mentre dispara.
+ability.shieldarc = Escut de descàrregues
+ability.shieldarc.description = Projecta un escut de força en un arc que absorbeix les bales.
+ability.suppressionfield = Regenera el camp de supressió
+ability.suppressionfield.description = Para els edificis de reparació propers.
+ability.energyfield = Camp de força
+ability.energyfield.description = Ataca els enemics propers.
+ability.energyfield.healdescription = Ataca els enemics propers i cura els aliats.
+ability.regen = Regeneració
+ability.regen.description = Regenera la seva salut amb el pas del temps.
+ability.liquidregen = Absorció de líquids
+ability.liquidregen.description = Absorbeix líquids per a curar-se.
+ability.spawndeath = Aparicions mortals
+ability.spawndeath.description = Allibera unitats quan mor.
+ability.liquidexplode = Vessament mortal
+ability.liquidexplode.description = Vessa líquid quan mor.
+ability.stat.firingrate = [stat]{0}/seg[lightgray] de cadència de tir
+ability.stat.regen = [stat]{0}[lightgray] de salut/seg
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] d’escut
+ability.stat.repairspeed = [stat]{0}/seg[lightgray] de velocitat de reparació
+ability.stat.slurpheal = [stat]{0}[lightgray] de salut/unitat de líquid
+ability.stat.cooldown = [stat]{0} seg[lightgray] de temps de refredament
+ability.stat.maxtargets = [stat]{0}[lightgray] objectius com a màxim
+ability.stat.sametypehealmultiplier = [stat]{0} %[lightgray] a la quantitat de reparació del mateix tipus
+ability.stat.damagereduction = [stat]{0} %[lightgray] de reducció del dany
+ability.stat.minspeed = [stat]{0} caselles/seg[lightgray] de velocitat mín.
+ability.stat.duration = [stat]{0} seg[lightgray] de duració
+ability.stat.buildtime = [stat]{0} seg[lightgray] de temps de construcció
+
+bar.onlycoredeposit = Només es permet depositar al nucli.
+bar.drilltierreq = Cal una perforadora millor.
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Falten recursos.
+bar.corereq = Cal un nucli base.
+bar.corefloor = Cal col·locar-ho en una zona designada per a nuclis.
+bar.cargounitcap = S’ha assolit el límit de càrrega d’unitats.
+bar.drillspeed = Velocitat de perforació: {0}/s
+bar.pumpspeed = Velocitat de bombeig: {0}/s
+bar.efficiency = Eficiència: {0} %
+bar.boost = Potenciador: +{0} %
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = Potència: {0}/s
+bar.powerstored = Emmagatzemat: {0}/{1}
+bar.poweramount = Energia: {0}
+bar.poweroutput = Potència de sortida: {0}
+bar.powerlines = Connexions: {0}/{1}
+bar.items = Elements: {0}
+bar.capacity = Capacitat: {0}
+bar.unitcap = {0} {1}/{2}
+bar.liquid = Líquid
+bar.heat = Calor
+bar.cooldown = Cooldown
+bar.instability = Inestabilitat
+bar.heatamount = Calor: {0}
+bar.heatpercent = Calor: {0} ({1} %)
+bar.power = Potència
+bar.progress = Progrés de la construcció
+bar.loadprogress = Progrés
+bar.launchcooldown = Refredament del llançament
+bar.input = Entrada
+bar.output = Sortida
+bar.strength = [stat]{0}[lightgray]× força
+
+units.processorcontrol = [lightgray]Controlat pel processador
+
+bullet.damage = [stat]{0}[lightgray] de dany
+bullet.splashdamage = [stat]{0}[lightgray] de dany a l’àrea ~[stat] {1}[lightgray] caselles
+bullet.incendiary = [stat]incendiari
+bullet.homing = [stat]munició guiada
+bullet.armorpierce = [stat]perforador d’armadures
+bullet.maxdamagefraction = [stat]{0}%[lightgray] de dany límit
+bullet.suppression = [stat]Supressió de reparacions cada {0} s[lightgray] ~ [stat]{1}[lightgray] caselles
+bullet.interval = [stat]Interval de bales de {0}/s[lightgray]:
+bullet.frags = [stat]{0}[lightgray]× de bales de fragmentació:
+bullet.lightning = [stat]{0}[lightgray]× llampec ~ [stat]{1}[lightgray] de dany
+bullet.buildingdamage = [stat]{0}%[lightgray] de dany a les estructures
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] de bloqueig
+bullet.pierce = [stat]{0}[lightgray]× de perforació
+bullet.infinitepierce = [stat]perforador
+bullet.healpercent = [stat]{0}[lightgray] % de reparació
+bullet.healamount = [stat]{0}[lightgray] de reparació directa
+bullet.multiplier = [stat]{0}[lightgray]× de multiplicador de munició
+bullet.reload = [stat]{0}[lightgray]× de cadència de tir
+bullet.range = [stat]abast de {0}[lightgray] caselles
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
+
+unit.blocks = blocs
+unit.blockssquared = blocs²
+unit.powersecond = unitats d’energia/s
+unit.tilessecond = caselles/s
+unit.liquidsecond = unitats de líquid/s
+unit.itemssecond = elements/s
+unit.liquidunits = unitats de líquid
+unit.powerunits = unitats d’energia
+unit.heatunits = unitats de calor
+unit.degrees = °
+unit.seconds = s
+unit.minutes = min
+unit.persecond = /s
+unit.perminute = /min
+unit.timesspeed = × velocitat
+unit.multiplier = x
+unit.percent = %
+unit.shieldhealth = salut d’escut
+unit.items = elements
+unit.thousands = k
+unit.millions = M
+unit.billions = kM
+unit.shots = dispars
+unit.pershot = /dispar
+category.purpose = Funció
+category.general = General
+category.power = Energia
+category.liquids = Líquids
+category.items = Elements
+category.crafting = Entrada/Sortida
+category.function = Funcionament
+category.optional = Millores opcionals
+setting.alwaysmusic.name = Reprodueix música sempre
+setting.alwaysmusic.description = Quan està activat, la música es reproduirà en bucle durant les partides.\nQuan està desactivat, només es reproduirà a intervals aleatoris.
+setting.skipcoreanimation.name = Omet l’animació del llançament i aterratge del nucli
+setting.landscape.name = Bloca el paisatge
+setting.shadows.name = Ombres
+setting.blockreplace.name = Suggeriments de bloc automàtics
+setting.linear.name = Filtrat lineal
+setting.hints.name = Consells
+setting.logichints.name = Consells de blocs lògics
+setting.backgroundpause.name = Pausa automàtica quan s’estigui en segon pla
+setting.buildautopause.name = Pausa automàtica quan es construeixi
+setting.doubletapmine.name = Dos tocs/clics per a extreure recursos
+setting.commandmodehold.name = Mantén per al mode de comandament
+setting.distinctcontrolgroups.name = Limita a un grup de control per unitat
+setting.modcrashdisable.name = Desactiva els mods quan no es pugui iniciar el joc
+setting.animatedwater.name = Animacions del terreny
+setting.animatedshields.name = Animacions dels escuts
+setting.playerindicators.name = Indicadors de jugadors
+setting.indicators.name = Indicadors d’enemics
+setting.autotarget.name = Apunta automàticament
+setting.keyboard.name = Controls amb ratolí i teclat
+setting.touchscreen.name = Controls tàctils
+setting.fpscap.name = FPS màx.
+setting.fpscap.none = Cap
+setting.fpscap.text = {0} FPS
+setting.uiscale.name = Escala de la interfície
+setting.uiscale.description = Cal reiniciar perquè s’apliquin els canvis.
+setting.swapdiagonal.name = Permet sempre construir en diagonal
+setting.screenshake.name = Sacseig de pantalla
+setting.bloomintensity.name = Intensitat de l’efecte «bloom»
+setting.bloomblur.name = Desenfocament «bloom»
+setting.effects.name = Mostra els efectes
+setting.destroyedblocks.name = Mostra els blocs destruïts
+setting.blockstatus.name = Mostra l’estat dels blocs
+setting.conveyorpathfinding.name = Construcció intel·ligent de cintes transportadores
+setting.sensitivity.name = Sensitivitat del controlador
+setting.saveinterval.name = Interval de les desades automàtiques
+setting.seconds = {0} s
+setting.milliseconds = {0} ms
+setting.fullscreen.name = Pantalla completa
+setting.borderlesswindow.name = Finestra sense vora
+setting.borderlesswindow.name.windows = Pantalla completa sense vora
+setting.borderlesswindow.description = Potser caldrà reiniciar el joc per a aplicar els canvis.
+setting.fps.name = Mostra els FPS i el ping
+setting.console.name = Activa la consola
+setting.smoothcamera.name = Moviment de càmera suau
+setting.vsync.name = Sincronització vertical (VSync)
+setting.pixelate.name = Pixela
+setting.minimap.name = Mostra el minimapa
+setting.coreitems.name = Mostra els elements del nucli
+setting.position.name = Mostra la posició del jugador
+setting.mouseposition.name = Mostra la posició del ratolí
+setting.musicvol.name = Volum de la música
+setting.atmosphere.name = Mostra l’atmosfera del planeta
+setting.drawlight.name = Dibuixa la foscor/llum
+setting.ambientvol.name = Volum del so ambiental
+setting.mutemusic.name = Silencia la música
+setting.sfxvol.name = Volums dels efectes de so
+setting.mutesound.name = Silencia el so
+setting.crashreport.name = Envia informes d’error anònims
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = Desa automàticament la partida
+setting.steampublichost.name = Visibilitat de la partida pública
+setting.playerlimit.name = Límit de jugadors
+setting.chatopacity.name = Opacitat del xat
+setting.lasersopacity.name = Opacitat dels làsers d’energia
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Opacitat de cintes i canonades subterrànies
+setting.playerchat.name = Mostra el xat bombolla de jugadors
+setting.showweather.name = Mostra l’estat meteorològic
+setting.hidedisplays.name = Amaga els monitors lògics
+setting.macnotch.name = Adapta la interfície per a mostrar el notch
+setting.macnotch.description = Cal reiniciar perquè s’apliquin els canvis
+steam.friendsonly = Només amics
+steam.friendsonly.tooltip = Indica si només els amics de Steam podran unir-se a la vostra partida.\nSi no es selecciona aquesta opció, la vostra partida serà pública i s’hi podrà unir qualsevol jugador.
+public.beta = Tingueu en compte que les versions beta no disposen de sales d’espera.
+uiscale.reset = L’escala de la interfície ha canviat.\nPremeu «D’acord» per a confirmar-ho.\n[scarlet]Es revertiran els canvis en [accent]{0}[] segons.
+uiscale.cancel = Cancel·la i surt
+setting.bloom.name = Bloom (efecte de desenfocament i il·luminació)
+keybind.title = Personalització dels controls
+keybinds.mobile = [scarlet]La majoria de dreceres no estan disponibles en les versions per a pantalles tàctils. Només està inclòs el moviment bàsic.
+category.general.name = General
+category.view.name = Control de la vista i altres
+category.command.name = Ordre d’unitat
+category.multiplayer.name = Multijugador
+category.blocks.name = Selecció d’estructures per construir
+placement.blockselectkeys = \n[lightgray]Tecles: [{0},
+keybind.respawn.name = Reapareix
+keybind.control.name = Controla una unitat
+keybind.clear_building.name = Desmunta una estructura
+keybind.press = Premeu una tecla…
+keybind.press.axis = Premeu un botó o moveu una palanca…
+keybind.screenshot.name = Pren una captura de pantalla del mapa
+keybind.toggle_power_lines.name = Mostra/Amaga els làsers d’energia
+keybind.toggle_block_status.name = Mostra/Amaga els estats dels blocs
+keybind.move_x.name = Mou en l’eix X
+keybind.move_y.name = Mou en l’eix Y
+keybind.mouse_move.name = Segueix el ratolí
+keybind.pan.name = Desplaça la vista
+keybind.boost.name = Sobrevola
+keybind.command_mode.name = Mode de comandament
+keybind.command_queue.name = Cua d’ordres d’unitat
+keybind.create_control_group.name = Crea un grup de control
+keybind.cancel_orders.name = Cancel·la les ordres
+keybind.unit_stance_shoot.name = Comportament: Dispara
+keybind.unit_stance_hold_fire.name = Comportament: Mantén el foc
+keybind.unit_stance_pursue_target.name = Comportament: Persegueix l’objectiu
+keybind.unit_stance_patrol.name = Comportament: Patrulla
+keybind.unit_stance_ram.name = Comportament: Senzill
+keybind.unit_command_move.name = Ordre d’unitat: Mou
+keybind.unit_command_repair.name = Ordre d’unitat: Repara
+keybind.unit_command_rebuild.name = Ordre d’unitat: Reconstrueix
+keybind.unit_command_assist.name = Ordre d’unitat: Assisteix
+keybind.unit_command_mine.name = Ordre d’unitat: Extrau
+keybind.unit_command_boost.name = Ordre d’unitat: Sobrevola
+keybind.unit_command_load_units.name = Ordre d’unitat: Carrega unitats
+keybind.unit_command_load_blocks.name = Ordre d’unitat: Carrega blocs
+keybind.unit_command_unload_payload.name = Ordre d’unitat: Descarrega blocs
+keybind.unit_command_enter_payload.name = Ordre d’unitat: Entra blocs
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Reconstrueix la regió
+keybind.schematic_select.name = Selecciona una regió
+keybind.schematic_menu.name = Menú de plànols
+keybind.schematic_flip_x.name = Volta el plànol horitzontalment
+keybind.schematic_flip_y.name = Volta el plànol verticalment
+keybind.category_prev.name = Categoria anterior
+keybind.category_next.name = Categoria següent
+keybind.block_select_left.name = Selecciona la de l’esquerra
+keybind.block_select_right.name = Selecciona la de la dreta
+keybind.block_select_up.name = Selecciona la de dalt
+keybind.block_select_down.name = Selecciona la de sota
+keybind.block_select_01.name = Selecciona categoria/bloc 1
+keybind.block_select_02.name = Selecciona categoria/bloc 2
+keybind.block_select_03.name = Selecciona categoria/bloc 3
+keybind.block_select_04.name = Selecciona categoria/bloc 4
+keybind.block_select_05.name = Selecciona categoria/bloc 5
+keybind.block_select_06.name = Selecciona categoria/bloc 6
+keybind.block_select_07.name = Selecciona categoria/bloc 7
+keybind.block_select_08.name = Selecciona categoria/bloc 8
+keybind.block_select_09.name = Selecciona categoria/bloc 9
+keybind.block_select_10.name = Selecciona categoria/bloc 10
+keybind.fullscreen.name = Commuta el mode de pantalla completa
+keybind.select.name = Selecciona/Dispara
+keybind.diagonal_placement.name = Construcció diagonal
+keybind.pick.name = Selecciona un tipus de bloc des del mapa
+keybind.break_block.name = Desmunta un bloc
+keybind.select_all_units.name = Selecciona totes les unitats
+keybind.select_all_unit_factories.name = Selecciona totes les unitats fabricadores
+keybind.deselect.name = Cancel·la la selecció
+keybind.pickupCargo.name = Recull càrrega
+keybind.dropCargo.name = Deixa la càrrega
+keybind.shoot.name = Dispara
+keybind.zoom.name = Zoom
+keybind.menu.name = Menú
+keybind.pause.name = Posa en pausa
+keybind.pause_building.name = Posa en pausa/Reprèn la construcció
+keybind.minimap.name = Minimapa
+keybind.planet_map.name = Mapa del planeta
+keybind.research.name = Recerca
+keybind.block_info.name = Informació del bloc
+keybind.chat.name = Xat
+keybind.player_list.name = Llista de jugadors
+keybind.console.name = Consola
+keybind.rotate.name = Gira
+keybind.rotateplaced.name = Gira els existents (mantenint-la premuda)
+keybind.toggle_menus.name = Mostra/Amaga la interfície
+keybind.chat_history_prev.name = Historial del xat: Anterior
+keybind.chat_history_next.name = Historial del xat: Següent
+keybind.chat_scroll.name = Historial del xat: Desplaça
+keybind.chat_mode.name = Canvia el mode del xat
+keybind.drop_unit.name = Deixa anar la unitat
+keybind.zoom_minimap.name = Apropa/Allunya la vista del minimapa
+mode.help.title = Descripció dels modes
+mode.survival.name = Supervivència
+mode.survival.description = El mode normal. Hi ha recursos limitats i les onades són automàtiques.\n[gray]Cal que al mapa hi hagin llocs d’aparició d’enemics.
+mode.sandbox.name = Mode lliure
+mode.sandbox.description = Recursos infinits i sense temporitzador per a les onades.
+mode.editor.name = Editor
+mode.pvp.name = Jug. vs. Jug.
+mode.pvp.description = Lluiteu contra altres jugadors localment.\n[gray]Cal que al mapa hi hagi almenys 2 nuclis de diferent color.
+mode.attack.name = Atac
+mode.attack.description = Destruïu la base enemiga. \n[gray]Cal que al mapa hi hagi un nucli vermell.
+mode.custom = Regles personalitzades
+rules.invaliddata = Dades del porta-retalls no vàlides.
+rules.hidebannedblocks = Amaga els blocs no permesos
+
+rules.infiniteresources = Recursos infinits
+rules.onlydepositcore = Al nucli només es poden dipositar recursos
+rules.derelictrepair = Permet la reparació dels blocs en ruïnes
+rules.reactorexplosions = Explosions als reactors
+rules.coreincinerates = El nucli incinera els excedents
+rules.disableworldprocessors = Desactiva els processadors integrats
+rules.schematic = Permetre l’ús d’esquemes
+rules.wavetimer = Temporitzador d’onades
+rules.wavesending = Enviament d’onades
+rules.allowedit = Permet editar les regles
+rules.allowedit.info = Quan està activat, el jugador pot editar les regles de la partida amb el botó que hi ha a la part inferior esquerra del menú de pausa.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
+rules.waves = Onades
+rules.airUseSpawns = Les unitats aèries fan servir els punts d’aparició
+rules.attack = Mode d’atac
+rules.buildai = IA constructora de bases
+rules.buildaitier = Nivell de construcció de la IA
+rules.rtsai = IA avançada (RTS AI)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Mida mínima de l’esquadró
+rules.rtsmaxsquadsize = Mida màxima de l’esquadró
+rules.rtsminattackweight = Pes d’atac mínim
+rules.cleanupdeadteams = Treu els blocs dels equips derrotats (en mode JvsJ)
+rules.corecapture = Captura el nucli en lloc de destruir-lo
+rules.polygoncoreprotection = Protecció poligonal del nucli
+rules.placerangecheck = Comprova l’abast de construcció
+rules.enemyCheat = Recursos infinits per a la IA (equip vermell)
+rules.blockhealthmultiplier = Multiplicador de la salut dels blocs
+rules.blockdamagemultiplier = Multiplicador del dany dels blocs
+rules.unitbuildspeedmultiplier = Multiplicador de la velocitat de producció d’unitats
+rules.unitcostmultiplier = Multiplicador del cost de les unitats
+rules.unithealthmultiplier = Multiplicador de la salut de les unitats
+rules.unitdamagemultiplier = Multiplicador del dany de les unitats
+rules.unitcrashdamagemultiplier = Multiplicador del dany de xoc de les unitats
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Multiplicador de l’energia solar
+rules.unitcapvariable = Els nuclis contribueixen al límit d’unitats
+rules.unitpayloadsexplode = Els blocs carregats exploten juntament amb la unitat
+rules.unitcap = Capacitat base d’unitats
+rules.limitarea = Limita l’àrea del mapa
+rules.enemycorebuildradius = Radi de no construcció del nucli enemic:[lightgray] (caselles)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Interval entre onades:[lightgray] (s)
+rules.initialwavespacing = Retard de l’onada inicial:[lightgray] (s)
+rules.buildcostmultiplier = Multiplicador del cost de construcció
+rules.buildspeedmultiplier = Multiplicador de la velocitat de construcció
+rules.deconstructrefundmultiplier = Multiplicador dels elements recuperats per desmuntatge
+rules.waitForWaveToEnd = Les onades esperen fins veure enemics
+rules.wavelimit = El mapa acaba després de l’onada
+rules.dropzoneradius = Radi de la zona d’aterratge:[lightgray] (caselles)
+rules.unitammo = Les unitats necessiten munició
+rules.enemyteam = Equip enemic
+rules.playerteam = Equip dels jugadors
+rules.title.waves = Onades
+rules.title.resourcesbuilding = Recursos i construcció
+rules.title.enemy = Enemics
+rules.title.unit = Unitats
+rules.title.experimental = Experimental
+rules.title.environment = Entorn
+rules.title.teams = Equips
+rules.title.planet = Planeta
+rules.lighting = Il·luminació
+rules.fog = Amaga el terreny inexplorat
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = Foc
+rules.anyenv = <Qualsevol>
+rules.explosions = Dany de les explosions als blocs/unitats
+rules.ambientlight = Il·luminació ambiental
+rules.weather = Estat meteorològic
+rules.weather.frequency = Freqüència:
+rules.weather.always = Sempre
+rules.weather.duration = Durada:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = No es permet que els jugadors puguin posar res a prop dels edificis enemics. Quan s’intenta posar una torreta, l’abast augmenta i la torreta no podrà arribar a l’enemic.
+rules.onlydepositcore.info = No es permet que les unitats deixin elements a dins dels edificis excepte els nuclis.
+
+content.item.name = Elements
+content.liquid.name = Fluids
+content.unit.name = Unitats
+content.block.name = Blocs
+content.status.name = Efectes d’estat
+content.sector.name = Sectors
+content.team.name = Faccions
+
+wallore = (Mur)
+
+item.copper.name = Coure
+item.lead.name = Plom
+item.coal.name = Carbó
+item.graphite.name = Grafit
+item.titanium.name = Titani
+item.thorium.name = Tori
+item.silicon.name = Silici
+item.plastanium.name = Plastani
+item.phase-fabric.name = Teixit de fase
+item.surge-alloy.name = Aliatge electrificable
+item.spore-pod.name = Beines d’espores
+item.sand.name = Sorra
+item.blast-compound.name = Compost explosiu
+item.pyratite.name = Piratita
+item.metaglass.name = Metavidre
+item.scrap.name = Ferralla
+item.fissile-matter.name = Matèria fissible
+item.beryllium.name = Beril·li
+item.tungsten.name = Tungstè
+item.oxide.name = Ã’xid
+item.carbide.name = Carbur
+item.dormant-cyst.name = Quist latent
+
+liquid.water.name = Aigua
+liquid.slag.name = Escòria
+liquid.oil.name = Petroli
+liquid.cryofluid.name = Líquid criogènic
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arquicita
+liquid.gallium.name = Gal·li
+liquid.ozone.name = Ozó
+liquid.hydrogen.name = Hidrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cianogen
+
+unit.dagger.name = Daga
+unit.mace.name = Maça
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Púlsar
+unit.quasar.name = Quàsar
+unit.crawler.name = Crawler
+unit.atrax.name = Àtrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Àrquid
+unit.toxopid.name = Toxòpid
+unit.flare.name = Flare
+unit.horizon.name = Horitzó
+unit.zenith.name = Zenit
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipsi
+unit.mono.name = Mono
+unit.poly.name = Poli
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Octo
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
+unit.alpha.name = Alfa
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Norma
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Ã’bvia
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Dron de muntatge
+unit.latum.name = Latum
+unit.renale.name = Renale
+
+block.parallax.name = Pàral·lax
+block.cliff.name = Espadat
+block.sand-boulder.name = Roca sorrenca
+block.basalt-boulder.name = Roca basàltica
+block.grass.name = Herba
+block.molten-slag.name = Escòria
+block.pooled-cryofluid.name = Líquid criogènic
+block.space.name = Espai
+block.salt.name = Sal
+block.salt-wall.name = Mur de sal
+block.pebbles.name = Còdols
+block.tendrils.name = Rínxols
+block.sand-wall.name = Mur sorrenc
+block.spore-pine.name = Pi d’espores
+block.spore-wall.name = Mur d’espores
+block.boulder.name = Roca
+block.snow-boulder.name = Roca nevada
+block.snow-pine.name = Pi congelat
+block.shale.name = Esquist
+block.shale-boulder.name = Roca esquistosa
+block.moss.name = Molsa
+block.shrubs.name = Arbustos
+block.spore-moss.name = Molsa d’espores
+block.shale-wall.name = Mur esquistós
+block.scrap-wall.name = Mur de ferralla
+block.scrap-wall-large.name = Mur de ferralla gros
+block.scrap-wall-huge.name = Mur de ferralla enorme
+block.scrap-wall-gigantic.name = Mur de ferralla gegantí
+block.thruster.name = Propulsor
+block.kiln.name = Forn de vidre
+block.graphite-press.name = Premsa de grafit
+block.multi-press.name = Premsa múltiple
+block.constructing = {0} [lightgray](Construint)
+block.spawn.name = Punt d’aparició d’enemics
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
+block.core-shard.name = Nucli: Estella
+block.core-foundation.name = Nucli: Fonament
+block.core-nucleus.name = Nucli: Punt neuràlgic
+block.deep-water.name = Aigua profunda
+block.shallow-water.name = Aigua
+block.tainted-water.name = Aigua contaminada
+block.deep-tainted-water.name = Aigua contaminada profunda
+block.darksand-tainted-water.name = Aigua contaminada amb sorra negra
+block.tar.name = Quitrà
+block.stone.name = Pedra
+block.sand-floor.name = Sorra
+block.darksand.name = Sorra negra
+block.ice.name = Gel
+block.snow.name = Neu
+block.crater-stone.name = Cràters
+block.sand-water.name = Sorra amb aigua
+block.darksand-water.name = Sorra negra amb aigua
+block.char.name = Cendra
+block.dacite.name = Dacita
+block.rhyolite.name = Riolita
+block.dacite-wall.name = Mur de dacita
+block.dacite-boulder.name = Roca de dacita
+block.ice-snow.name = Gel/Neu
+block.stone-wall.name = Mur de pedra
+block.ice-wall.name = Mur de gel
+block.snow-wall.name = Mur de neu
+block.dune-wall.name = Mur de duna
+block.pine.name = Pi
+block.dirt.name = Terra
+block.dirt-wall.name = Mur de terra
+block.mud.name = Fang
+block.white-tree-dead.name = Arbre blanc mort
+block.white-tree.name = Arbre blanc
+block.spore-cluster.name = Clúster d’espores
+block.metal-floor.name = Terra metàl·lic 1
+block.metal-floor-2.name = Terra metàl·lic 2
+block.metal-floor-3.name = Terra metàl·lic 3
+block.metal-floor-4.name = Terra metàl·lic 4
+block.metal-floor-5.name = Terra metàl·lic 5
+block.metal-floor-damaged.name = Terra metàl·lic danyat
+block.dark-panel-1.name = Panell fosc 1
+block.dark-panel-2.name = Panell fosc 2
+block.dark-panel-3.name = Panell fosc 3
+block.dark-panel-4.name = Panell fosc 4
+block.dark-panel-5.name = Panell fosc 5
+block.dark-panel-6.name = Panell fosc 6
+block.dark-metal.name = Metall fosc
+block.basalt.name = Basalt
+block.hotrock.name = Roca calenta
+block.magmarock.name = Roca magmàtica
+block.copper-wall.name = Mur de coure
+block.copper-wall-large.name = Mur de coure gros
+block.titanium-wall.name = Mur de titani
+block.titanium-wall-large.name = Mur de titani gros
+block.plastanium-wall.name = Mur de plastani
+block.plastanium-wall-large.name = Mur de plastani gros
+block.phase-wall.name = Mur de fase
+block.phase-wall-large.name = Mur de fase gros
+block.thorium-wall.name = Mur de tori
+block.thorium-wall-large.name = Mur de tori gros
+block.door.name = Porta
+block.door-large.name = Porta gran
+block.duo.name = Duo
+block.scorch.name = Scorch
+block.scatter.name = Scatter
+block.hail.name = Hail
+block.lancer.name = Lancer
+block.conveyor.name = Cinta transportadora
+block.titanium-conveyor.name = Cinta transportadora de titani
+block.plastanium-conveyor.name = Cinta transportadora de plastani
+block.armored-conveyor.name = Cinta transportadora blindada
+block.junction.name = Encreuament
+block.router.name = Encaminador
+block.distributor.name = Distrïbudor
+block.sorter.name = Classificador
+block.inverted-sorter.name = Classificador invers
+block.message.name = Missatge
+block.reinforced-message.name = Missatge destacat
+block.world-message.name = Missatge mundial
+block.world-switch.name = Interruptor mundial
+block.illuminator.name = Il·luminador
+block.overflow-gate.name = Porta de desbordament
+block.underflow-gate.name = Porta de subdesbordament
+block.silicon-smelter.name = Forn de silici
+block.phase-weaver.name = Teixidor de fase
+block.pulverizer.name = Polsinadora
+block.cryofluid-mixer.name = Barrejador de líquid criogènic
+block.melter.name = Fonedora
+block.incinerator.name = Incineradora
+block.spore-press.name = Premsa d’espores
+block.separator.name = Separadora
+block.coal-centrifuge.name = Centrífuga de carbó
+block.power-node.name = Node d’energia
+block.power-node-large.name = Node d’energia gros
+block.surge-tower.name = Torre electrificada
+block.diode.name = Díode de bateria
+block.battery.name = Bateria
+block.battery-large.name = Bateria grossa
+block.combustion-generator.name = Generador a combustió
+block.steam-generator.name = Generador a vapor
+block.differential-generator.name = Generador diferencial
+block.impact-reactor.name = Reactor d’impacte
+block.mechanical-drill.name = Perforadora mecànica
+block.pneumatic-drill.name = Perforadora pneumàtica
+block.laser-drill.name = Perforadora làser
+block.water-extractor.name = Pou de bombeig d’aigua
+block.cultivator.name = Cultivador
+block.conduit.name = Canonada
+block.mechanical-pump.name = Estació de bombeig mecànica
+block.item-source.name = Punt d’aparició d’elements
+block.item-void.name = Punt d’eliminació d’elements
+block.liquid-source.name = Punt d’aparició de líquids
+block.liquid-void.name = Eliminador de líquids
+block.power-void.name = Eliminador d’energia
+block.power-source.name = Font d’energia
+block.unloader.name = Descarregador
+block.vault.name = Contenidor gros
+block.wave.name = Wave
+block.tsunami.name = Tsunami
+block.swarmer.name = Swarmer
+block.salvo.name = Salvo
+block.ripple.name = Ripple
+block.phase-conveyor.name = Cinta transportadora de fase
+block.bridge-conveyor.name = Cinta transportadora subterrània
+block.plastanium-compressor.name = Compressor de plastani
+block.pyratite-mixer.name = Barrejador de piratita
+block.blast-mixer.name = Barrejador d’explosius
+block.solar-panel.name = Panell solar
+block.solar-panel-large.name = Panell solar gran
+block.oil-extractor.name = Extractor de petroli
+block.repair-point.name = Punt de reparació
+block.repair-turret.name = Torreta de reparacions
+block.pulse-conduit.name = Canonada d’impuls
+block.plated-conduit.name = Canonada xapada
+block.phase-conduit.name = Canonada de fase
+block.liquid-router.name = Encaminador de líquids
+block.liquid-tank.name = Tanc de líquids
+block.liquid-container.name = Contenidor de líquids
+block.liquid-junction.name = Encreuament de canonades
+block.bridge-conduit.name = Canonada subterrània
+block.rotary-pump.name = Estació de bombeig (amb bomba rotatòria)
+block.thorium-reactor.name = Reactor de tori
+block.mass-driver.name = Transportador a distància
+block.blast-drill.name = Perforadora amb aire comprimit
+block.impulse-pump.name = Estació de bombeig (per impuls)
+block.thermal-generator.name = Generador tèrmic
+block.surge-smelter.name = Forn d’aliatge electrificable
+block.mender.name = Reparadora
+block.mend-projector.name = Projector de reparacions
+block.surge-wall.name = Mur d’aliatge electrificable
+block.surge-wall-large.name = Mur d’aliatge electrificable gros
+block.cyclone.name = Cicló
+block.fuse.name = Fuse
+block.shock-mine.name = Mina de xoc
+block.overdrive-projector.name = Projector d’acceleració
+block.force-projector.name = Projector de camps de força
+block.arc.name = Arc
+block.rtg-generator.name = Generador RTG
+block.spectre.name = Spectre
+block.meltdown.name = Meltdown
+block.foreshadow.name = Foreshadow
+block.container.name = Contenidor
+block.launch-pad.name = Plataforma de llançament
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.name = Segment
+block.ground-factory.name = Fàbrica d’unitats terrestres
+block.air-factory.name = Fàbrica d’unitats aèries
+block.naval-factory.name = Fàbrica d’unitats navals
+block.additive-reconstructor.name = Reconstructor additiu
+block.multiplicative-reconstructor.name = Reconstructor multiplicatiu
+block.exponential-reconstructor.name = Reconstructor exponencial
+block.tetrative-reconstructor.name = Reconstructor tetratiu
+block.payload-conveyor.name = Cinta transportadora de blocs
+block.payload-router.name = Encaminador de blocs
+block.duct.name = Conducte
+block.duct-router.name = Encaminador de conductes
+block.duct-bridge.name = Conducte subterrani
+block.large-payload-mass-driver.name = Transportador gros de blocs a distància
+block.payload-void.name = Eliminador de blocs
+block.payload-source.name = Punt d’aparició de blocs
+block.disassembler.name = Desmuntadora
+block.silicon-crucible.name = Gresol de silici
+block.overdrive-dome.name = Cúpula d’acceleració
+block.interplanetary-accelerator.name = Accelerador interplanetari
+block.constructor.name = Constructor de blocs
+block.constructor.description = Fabrica estructures de mida fins a 2×2 caselles.
+block.large-constructor.name = Constructor de blocs grossos
+block.large-constructor.description = Fabrica estructures de mida fins a 4×4 caselles.
+block.deconstructor.name = Desconstructor de blocs
+block.deconstructor.description = Desmunta estructures i unitats. Retorna el 100 % del cost de construcció.
+block.payload-loader.name = Carregador de blocs
+block.payload-loader.description = Carrega líquids i elements als blocs.
+block.payload-unloader.name = Descarregador de blocs
+block.payload-unloader.description = Descarrega líquids i elements dels blocs.
+block.heat-source.name = Punt d’aparició de calor
+block.heat-source.description = Un bloc de mida 1×1 que dóna calor de manera constant sense consumir recursos.
+
+#TODO: temporary names!
+block.empty.name = Buit
+block.rhyolite-crater.name = Cràter de riolita
+block.rough-rhyolite.name = Riolita irregular
+block.regolith.name = Regolita
+block.yellow-stone.name = Pedra groga
+block.carbon-stone.name = Pedra carbonífera
+block.ferric-stone.name = Pedra fèrrica
+block.ferric-craters.name = Cràters fèrrics
+block.beryllic-stone.name = Pedra beril·liana
+block.crystalline-stone.name = Pedra cristal·lina
+block.crystal-floor.name = Porta de cristall
+block.yellow-stone-plates.name = Làmines de pedra groga
+block.red-stone.name = Pedra vermella
+block.dense-red-stone.name = Pedra vermella abundant
+block.red-ice.name = Gel vermell
+block.arkycite-floor.name = Terra d’arquicita
+block.arkyic-stone.name = Pedra d’arquicita
+block.rhyolite-vent.name = Fumarola de riolita
+block.carbon-vent.name = Fumarola carbonífera
+block.arkyic-vent.name = Fumarola d’arquicita
+block.yellow-stone-vent.name = Fumarola de pedra groga
+block.red-stone-vent.name = Fumarola de pedra vermella
+block.crystalline-vent.name = Fumarola cristal·lina
+block.redmat.name = Mata vermella
+block.bluemat.name = Mata blava
+block.core-zone.name = Zona del nucli
+block.regolith-wall.name = Mur de regolita
+block.yellow-stone-wall.name = Mur de pedra groga
+block.rhyolite-wall.name = Mur de riolita
+block.carbon-wall.name = Mur carbonífer
+block.ferric-stone-wall.name = Mur de pedra fèrrica
+block.beryllic-stone-wall.name = Mur de pedra beril·liana
+block.arkyic-wall.name = Mur d’arquicita
+block.crystalline-stone-wall.name = Mur de pedra cristal·lina
+block.red-ice-wall.name = Mur de gel vermell
+block.red-stone-wall.name = Mur de pedra vermella
+block.red-diamond-wall.name = Mur de diamant vermell
+block.redweed.name = Herba vermella
+block.pur-bush.name = Arbust PUR
+block.yellowcoral.name = Corall groc
+block.carbon-boulder.name = Roca carbonífera
+block.ferric-boulder.name = Roca fèrrica
+block.beryllic-boulder.name = Roca beril·liana
+block.yellow-stone-boulder.name = Roca de pedra groga
+block.arkyic-boulder.name = Roca d’arquicita
+block.crystal-cluster.name = Estructura cristal·lina
+block.vibrant-crystal-cluster.name = Estructura cristal·lina vibrant
+block.crystal-blocks.name = Blocs de cristall
+block.crystal-orbs.name = Boles de cristall
+block.crystalline-boulder.name = Roques cristal·lines
+block.red-ice-boulder.name = Roca de gel vermella
+block.rhyolite-boulder.name = Roca de riolita
+block.red-stone-boulder.name = Roca de pedra vermella
+block.graphitic-wall.name = Mur de grafit
+block.silicon-arc-furnace.name = Forn d’arc de silici
+block.electrolyzer.name = Electrolitzador
+block.atmospheric-concentrator.name = Concentrador atmosfèric
+block.oxidation-chamber.name = Cambra d’oxidació
+block.electric-heater.name = Escalfador elèctric
+block.slag-heater.name = Escalfador d’escòria
+block.phase-heater.name = Escalfador de fase
+block.heat-redirector.name = Redirector tèrmic
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Encaminador tèrmic
+block.slag-incinerator.name = Incineradora d’escòria
+block.carbide-crucible.name = Gresol de carbur
+block.slag-centrifuge.name = Centrifugadora d’escòria
+block.surge-crucible.name = Gresol d’aliatge electrificable
+block.cyanogen-synthesizer.name = Sintetitzador de cianogen
+block.phase-synthesizer.name = Sintetitzador de fase
+block.heat-reactor.name = Reactor tèrmic
+block.beryllium-wall.name = Mur de beril·li
+block.beryllium-wall-large.name = Mur de beril·li gros
+block.tungsten-wall.name = Mur de tungstè
+block.tungsten-wall-large.name = Mur de tungstè gros
+block.blast-door.name = Porta de compost explosiu
+block.carbide-wall.name = Mur de carbur
+block.carbide-wall-large.name = Mur de carbur gros
+block.reinforced-surge-wall.name = Mur d’aliatge electrificable reforçat
+block.reinforced-surge-wall-large.name = Mur d’aliatge electrificable reforçat gros
+block.shielded-wall.name = Mur blindat
+block.radar.name = Radar
+block.build-tower.name = Torre de construcció
+block.regen-projector.name = Projector de regeneració
+block.shockwave-tower.name = Torre d’ona sísmica
+block.shield-projector.name = Projector d’escuts
+block.large-shield-projector.name = Projector d’escuts gros
+block.armored-duct.name = Conducte blindat
+block.overflow-duct.name = Desbordament de conducte
+block.underflow-duct.name = Subdesbordament de conducte
+block.duct-unloader.name = Descarregador de conducte
+block.surge-conveyor.name = Cinta transportadora d’aliatge electrificable
+block.surge-router.name = Encaminador d’aliatge electrificable
+block.unit-cargo-loader.name = Carregador d’unitats
+block.unit-cargo-unload-point.name = Punt de descàrrega d’unitats
+block.reinforced-pump.name = Estació de bombeig reforçada
+block.reinforced-conduit.name = Canonada reforçada
+block.reinforced-liquid-junction.name = Encreuament de líquids reforçada
+block.reinforced-bridge-conduit.name = Canonada subterrània reforçada
+block.reinforced-liquid-router.name = Encaminador de líquids reforçat
+block.reinforced-liquid-container.name = Contenidor de líquids reforçat
+block.reinforced-liquid-tank.name = Tanc de líquids reforçat
+block.beam-node.name = Node de transmissió d’energia per raigs
+block.beam-tower.name = Torre de transmissió d’energia per raigs
+block.beam-link.name = Enllaç de transmissió d’energia per raigs
+block.turbine-condenser.name = Turbina condensadora
+block.chemical-combustion-chamber.name = Cambra de combustió química
+block.pyrolysis-generator.name = Generador pirolític
+block.vent-condenser.name = Respirador de condensació
+block.cliff-crusher.name = Picadora d’espadats
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Perforadora de plasma
+block.large-plasma-bore.name = Perforadora de plasma grossa
+block.impact-drill.name = Perforadora d’impacte
+block.eruption-drill.name = Perforadora per erupció
+block.core-bastion.name = Nucli: Bastió
+block.core-citadel.name = Nucli: Ciutadella
+block.core-acropolis.name = Nucli: Acròpolis
+block.reinforced-container.name = Contenidor reforçat
+block.reinforced-vault.name = Contenidor reforçat gros
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Milloradora de tancs
+block.mech-refabricator.name = Milloradora de meques
+block.ship-refabricator.name = Milloradora de naus
+block.tank-assembler.name = Muntadora de tancs
+block.ship-assembler.name = Muntadora de naus
+block.mech-assembler.name = Muntadora de meques
+block.reinforced-payload-conveyor.name = Cinta transportadora de blocs reforçada
+block.reinforced-payload-router.name = Encaminador de blocs reforçat
+block.payload-mass-driver.name = Transportador a distància de blocs
+block.small-deconstructor.name = Desconstructor petit
+block.canvas.name = Llenç
+block.world-processor.name = Processador integrat
+block.world-cell.name = Cel·la de memòria integrada
+block.tank-fabricator.name = Fabricadora de tancs
+block.mech-fabricator.name = Fabricadora de meques
+block.ship-fabricator.name = Fabricadora de naus
+block.prime-refabricator.name = Milloradora Prime
+block.unit-repair-tower.name = Torre de reparació d’unitats
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Mòdul de muntatge bàsic
+block.smite.name = Smite
+block.malign.name = Maligne
+block.flux-reactor.name = Reactor de flux
+block.neoplasia-reactor.name = Reactor de neoplàsia
+
+block.switch.name = Interruptor
+block.micro-processor.name = Microprocessador
+block.logic-processor.name = Processador lògic
+block.hyper-processor.name = Hiperprocessador
+block.logic-display.name = Monitor lògic
+block.large-logic-display.name = Monitor lògic gran
+block.memory-cell.name = Cel·la de memòria
+block.memory-bank.name = Banc de memòria
+
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Estellat
+team.derelict.name = En ruïnes
+team.green.name = Verd
+team.blue.name = Blau
+
+hint.skip = Salta
+hint.desktopMove = Per a moure-vos, premeu [accent][[WASD][].
+hint.zoom = [accent]Pinceu o gireu la roda del ratolí[] per a apropar o allunyar la vista.
+hint.desktopShoot = Toqueu o feu clic amb el [accent]botó esquerre[] per a disparar.
+hint.depositItems = Per a transferir elements, arrossegueu-los de la nau al nucli.
+hint.respawn = Per a reaparèixer com una nau, premeu [accent]V[].
+hint.respawn.mobile = Ara esteu controlant una unitat o estructura. Per a reaparèixer com una nau, [accent]toqueu l’avatar[] de la part superior esquerra.
+hint.desktopPause = Premeu la [accent]barra espaiadora[] per a posar en pausa i reprendre la partida.
+hint.breaking = Feu clic amb el [accent]botó dret[] i arrossegueu per a treure blocs.
+hint.breaking.mobile = Activeu el \ue817 [accent]martell[] de la part inferior dreta i toqueu els blocs que vulgueu treure.\n\nManteniu premut el dit durant un segon i arrossegueu per a seleccionar un rectangle d’on treure tots els blocs.
+hint.blockInfo = Mostra la informació d’un bloc seleccionant-lo al [accent]menú de construcció[], Llavors seleccioneu el botó [accent][[?][] de la dreta.
+hint.derelict = Les estructures [accent]en ruïnes[] són les restes de bases antigues que ja no funcionen.\n\nAquestes estructures es poden [accent]desmuntar[] per a recuperar recursos.
+hint.research = Empreu el botó de \ue875 [accent]Recerca[] per a investigar noves tecnologies.
+hint.research.mobile = Empreu el botó de \ue875 [accent]Recerca[] del \ue88c [accent]Menú[] per a investigar noves tecnologies.
+hint.unitControl = Mantingueu premuda la tecla [accent][[ControlEsquerra][] i [accent]feu clic[] per a controlar torretes i unitats amistoses.
+hint.unitControl.mobile = [accent]Toqueu dues vegades[] per a controlar torretes i unitats amistoses.
+hint.unitSelectControl = Per a controlar unitats, entreu al [accent]mode de comandament[] amb la tecla [accent]Maj. esquerra[].\nMentre esteu al mode de comandament, feu clic i arrossegueu per a seleccionar unitats. Feu [accent]clic amb el botó esquerre[] en algun lloc o objectiu per a comandar-hi les unitats.
+hint.unitSelectControl.mobile = Per a controlar unitats, entreu al [accent]mode de comandament[] amb el botó de[accent]comandament[] de la part superior esquerra.\nMentre esteu al mode de comandament, premeu uns segons i arrossegueu per a seleccionar unitats. Toqueu en algun lloc o objectiu per a comandar-hi les unitats.
+hint.launch = Un cop s’han recollit prou recursos, podeu iniciar un llançament seleccionant un sector proper del \ue827 [accent]Mapa[] de la part inferior dreta.
+hint.launch.mobile = Un cop s’han recollit prou recursos, podeu iniciar un llançament seleccionant un sector proper del \ue827 [accent]Mapa[] del \ue88c [accent]Menú[].
+hint.schematicSelect = Manteniu premuda la tecla [accent]F[] i arrossegueu per a seleccionar els blocs que vulgueu copiar i enganxar.\n\nFeu clic amb el [accent]botó del mig[] del ratolí per a copiar només un tipus de bloc.
+hint.rebuildSelect = Manteniu premuda la tecla [accent][[B][] i arrossegueu per a seleccionar els plànols dels blocs destruïts.\nAixí, es podran reconstruir automàticament.
+hint.rebuildSelect.mobile = Seleccioneu el botó de copiar \ue874. Després, toqueu el botó de reconstrucció \ue80f i arrossegueu per a triar quins blocs voleu que es reconstrueixin.\nAixò farà que es reconstrueixin de manera automàtica.
+hint.conveyorPathfind = Manteniu premuda la tecla [accent]ControlEsquerra[] i arrossegueu les cintes per a generar un camí automàticament.
+hint.conveyorPathfind.mobile = Activeu el \ue844 [accent]mode diagonal[] i arrossegueu les cintes per a generar un camí automàticament.
+hint.boost = Manteniu premuda la tecla [accent]ControlEsquerra[] per a sobrevolar els obstacles amb la unitat actual.\n\nNomés algunes unitats terrestres tenen elevadors per a poder-ho fer.
+hint.payloadPickup = Premeu [accent][[[] per a recollir blocs petits o unitats.
+hint.payloadPickup.mobile = [accent]Manteniu premut[] un bloc petit per a recollir-lo. També es pot fer amb unitats.
+hint.payloadDrop = Premeu [accent]][] per a deixar el bloc o la unitat.
+hint.payloadDrop.mobile = [accent]Manteniu premuda[] una posició buida per a deixar-hi un bloc o una unitat.
+hint.waveFire = Les torretes de tipus [accent]Wave[] que usin aigua com munició apagaran els focs propers automàticament.
+hint.generator = Els \uf879 [accent]Generadors a combustió[] cremen carbó i transmeten energia als blocs adjacents.\n\nL’abast de la transmissió d’energia es pot expandir amb \uf87f [accent]node d’energia[].
+hint.guardian = Les unitats de tipus [accent]Guardià[] són unitats blindades. La munició dèbil com ara el [accent]Coure[] i el [accent]Plom[] [scarlet]no és efectiva[].\n\nEmpreu torretes de nivell més alt o carregueu torretes \uf861Duo/\uf859Salvo amb \uf835 [accent]Grafit[] per a destruir-los.
+hint.coreUpgrade = Els nuclis es poden millorar [accent]construint-hi a sobre nuclis amb millors característiques[].\n\nSitueu un nucli de tipus [accent]Fonament[] a sobre del nucli [accent]Estella[]. Assegureu-vos que no hi hagin obstruccions properes.
+hint.presetLaunch = Als [accent]sectors amb zones d’aterratge[] de color gris, com ara [accent]El bosc gelat[], s’hi pot accedir des de qualsevol lloc. No cal capturar cap territori proper.\n\nEls [accent]sectors numerats[], com aquest, són [accent]opcionals[].
+hint.presetDifficulty = Aquest sector té un [accent]nivell d’amenaça enemiga elevat[].\n[accent]No es recomana[]  aterrar a aquests sectors sense les tecnologies i la preparació adequades.
+hint.coreIncinerate = Després que s’hagi arribat al màxim d’emmagatzematge d’un determinat tipus d’element al nucli, tots els altres elements d’aquest tipus que entrin al nucli s’[accent]incineraran[].
+hint.factoryControl = Per a establir la [accent]destinació de sortida[] de les unitats d’una fàbrica, feu clic en un bloc de fàbrica mentre esteu en mode de comandament i després feu clic amb el botó de la dreta a la posició desitjada.\nLes unitats produïdes s’hi dirigiran automàticament.
+hint.factoryControl.mobile = Per a establir la [accent]destinació de sortida[] de les unitats d’una fàbrica, toqueu un bloc de fàbrica mentre esteu en mode de comandament i després toqueu la posició desitjada.\nLes unitats produïdes s’hi dirigiran automàticament.
+gz.mine = Apropeu-vos al \uf8c4 [accent]mineral de coure[] del terra i feu-hi clic per a començar a extreure’n coure.
+gz.mine.mobile = Apropeu-vos al \uf8c4 [accent]mineral de coure[] del terra i toqueu-lo per a començar a extreure’n coure.
+gz.research = Obriu l’\ue875 arbre tecnològic.\nInvestigueu la \uf870 [accent]perforadora mecànica[] i després trieu-la des del menú de sota a la dreta.\nFeu clic en un dipòsit de coure per a construir-la.
+gz.research.mobile = Obriu l’\ue875 arbre tecnològic.\nInvestigueu la \uf870 [accent]perforadora mecànica[] i després trieu-la des del menú de sota a la dreta.\nToqueu un dipòsit de coure per a construir-la.\n\nPer a acabar, premeu la icona de \ue800 [accent]confirmació[] a sota a l’esquerra.
+gz.conveyors = Investigueu i construïu \uf896 [accent]cintes transportadores[] per a moure els recursos extrets\nde les perforadores fins al nucli.\n\nFeu clic i arrossegueu per a construir-ne més d’una més fàcilment.\n[accent]Gireu la rodeta del mig[] del ratolí per a girar la direcció de la cinta.
+gz.conveyors.mobile = Investigueu i construïu \uf896 [accent]cintes transportadores[] per a moure els recursos extrets\nde les perforadores fins al nucli.\n\nPremeu, manteniu un moment el dit durant un segon i arrossegueu per a construir-ne més d’una més fàcilment.
+gz.drills = Expandiu les operacions mineres.\nConstruïu més perforadores mecàniques.\nExtraieu 100 unitats de coure.
+gz.lead = \uf837 El [accent]plom[] és un altre recurs comú.\nSitueu perforadores al damunt de dipòsits de plom per a extreure’n.
+gz.moveup = \ue804 Moveu-mos amunt per a veure més objectius.
+gz.turrets = Investigueu i construïu 2 torretes \uf861 [accent]duo[] per a defensar el nucli.\nLes torretes duo necessiten rebre \uf838 [accent]munició[] amb cintes transportadores.
+gz.duoammo = Subministreu [accent]coure[] a les torretes duo amb cintes transportadores.
+gz.walls = Els [accent]murs[] poden evitar que el dany arribi a les estructures importants.\nConstruïu alguns \uf6ee [accent]murs de coure[] al voltant de les torretes.
+gz.defend = S’apropa l’enemic. Prepareu-vos per a defensar-vos.
+gz.aa = Les torretes estàndard no poden disparar fàcilment a les unitats aèries.\n\uf860 Les torretes [accent]scatter[] proporcionen una defensa antiaèria excel·lent, però necessiten munició de \uf837 [accent]plom[].
+gz.scatterammo = Subministreu [accent]plom[] a la torreta scatter amb cintes transportadores.
+gz.supplyturret = [accent]Subministreu munició a la torreta
+gz.zone1 = Aquesta és la zona d’aterratge enemiga.
+gz.zone2 = Tot el que es construeixi a dins es destruirà quan comenci la propera onada enemiga.
+gz.zone3 = Ara comença una onada.\nPrepareu-vos.
+gz.finish = Construïu més torretes, extraieu més recursos \ni defense-vos contra totes les onades per a [accent]capturar el sector[].
+onset.mine = Feu clic als murs per a extraure \uf748 [accent]beril·li[].\n\nFeu servir [accent][[WASD] per a moure-vos.
+onset.mine.mobile = Toqueu per a extraure \uf748 [accent]beril·li[] dels murs.
+onset.research = Obriu \ue875 l’arbre tecnològic.\nInvestigueu i després construïu una \uf73e [accent]turbina condensadora[] a la fumarola.\nAixí aconseguireu generar [accent]energia[].
+onset.bore = Investigueu i construïu una \uf741 [accent]perforadora de plasma[].\nAixí extraureu recursos automàticament dels murs.
+onset.power = Per a subministrar [accent]energia[] a la perforadora de plasma, investigueu i situeu un \uf73d [accent]node de transmissió d’energia per raigs[].\nConnecteu la turbina condensadora a la perforadora de plasma.
+onset.ducts = Investigueu i situeu \uf799 [accent]conductes[] per a moure els recursos extrets amb perforadores de plasma al nucli.\n\nFeu clic i arrossegueu per a situar més d’un conducte fàcilment.\nGireu la [accent]rodeta del ratolí[] per a canviar-ne la direcció.
+onset.ducts.mobile = Investigueu i situeu \uf799 [accent]conductes[] per a moure els recursos extrets amb perforadores de plasma al nucli.\n\nMantingueu premut el dit durant un segon i arrossegueu per a situar més d’un conducte fàcilment.
+onset.moremine = Amplieu les operacions mineres.\nSitueu més perforadores de plasma i feu servir nodes de transmissió d’energia per raigs i conductes per tal que puguin operar.\nExtraieu 200 unitats de beril·li.
+onset.graphite = Els blocs més complexos necessiten \uf835 [accent]grafit[].\nSitueu perforadores de plasma per a extraure’n.
+onset.research2 = Comenceu a investigar les [accent]fàbriques[].\nInvestigueu les \uf74d [accent]picadores d’espadats[] i \uf779 [accent]forn d’arc de silici[].
+onset.arcfurnace = El forn d’arc necessita \uf834 [accent]sorra[] i \uf835 [accent]grafit[] per a obtenir \uf82f [accent]silici[].\nTambé fa falta [accent]energia[].
+onset.crusher = Feu servir les \uf74d [accent]picadores d’espadats[] per a extraure sorra.
+onset.fabricator = Feu servir [accent]unitats[] per a explorar el mapa, defensar estructures i atacar als enemics. Investigueu i construïu una \uf6a2 [accent]fabricadora de tancs[].
+onset.makeunit = Produïu una unitat.\nFeu servir el botó «?» per a veure els requisits de la fàbrica que trieu.
+onset.turrets = Les unitats són efectives, però les [accent]torretes[] proporcionen una capacitat defensiva millor si es fan servir adequadament.\nConstruïu Place una torreta \uf6eb [accent]breach[].\nLes torretes necessiten \uf748 [accent]munició[].
+onset.turretammo = Subministreu [accent]munició de beril·li[] a la torreta.
+onset.walls = Els [accent]murs[] poden evitar que el dany arribi a les estructures importants.\nConstruïu alguns \uf6ee [accent]murs de beril·li[] al voltant de la torreta.
+onset.enemies = S’apropa un enemic. Prepareu la defensa.
+onset.defenses = [accent]Establiu defenses:[lightgray] {0}
+onset.attack = L’enemic és vulnerable. Contraataqueu.
+onset.cores = Els nuclis nous es poden construir en [accent]caselles de nucli[].\nEls nuclis nous funcionen com a bases i comparteixen un inventari de recursos amb altres nuclis.\nConstruïu un \uf725 nucli.
+onset.detect = L’enemic us detectarà d’aquí 2 minuts.\nEstabliu les defenses i les explotacions mineres i de producció.
+onset.commandmode = Mantingueu premuda [accent]Maj.[] per a entrar al [accent]mode de comandament[].\n[accent]Feu clic amb el botó esquerre i arrossegueu[] per a seleccionar unitats.\n[accent]Feu clic amb el botó dret[] per a ordenar a les unitats seleccionades que ataquin o que es moguin.
+onset.commandmode.mobile = Premeu el [accent]botó de comandament[] per a entrar al [accent]mode de comandament[].\nPremeu i [accent]arrossegueu[] per a seleccionar unitats.\n[accent]Toqueu[] per a ordenar a les unitats seleccionades que ataquin o que es moguin.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = La unitat nucli pot recollir alguns blocs.\nRecolliu aquest [accent]contenidor[] i poseu-lo al [accent]transportador de blocs a distància[].\n(Les tecles per defecte són [ i ] per a recollir i deixar).
+split.pickup.mobile = La unitat nucli pot recollir alguns blocs.\nRecolliu aquest [accent]contenidor[] i poseu-lo al [accent]transportador de blocs a distància[].\n(Per a deixar o recollir alguna cosa, premeu-la uns segons).
+split.acquire = Heu d’aconseguir una mica de tungstè per a construir unitats.
+split.build = Les unitats s’han de transportar a l’altra banda del mur.\nConstruïu dos [accent]transportadors de blocs a distància[], un a cada banda del mur.\nPer establir-hi un enllaç, seleccioneu-ne un i després seleccionant l’altre.
+split.container = Igual que els contenidors, les unitats també es poden transportar amb els [accent]transportadors de blocs a distància[].\nConstruïu una fabricadora d’unitats al costat d’un transportadors de blocs a distància per a carregar-les i enviar-les més enllà del mur per a atacar la base enemiga.
+
+item.copper.description = S’empra en molts tipus de construccions i munició.
+item.copper.details = Coure. Un metall molt abundant al planeta Serpulo. Estructuralment és dèbil si no es reforça.
+item.lead.description = S’empra per al transport de líquids i en estructures elèctriques.
+item.lead.details = Dens. Inert. S’empra de manera habitual per a fer bateries.\nNota: Probablement, és tòxic per a altres formes de vida. Tampoc és que n’hi hagin moltes per aquí per a comprovar-ho.
+item.metaglass.description = S’empra per a construir estructures de distribució i emmagatzematge de líquids.
+item.graphite.description = S’empra en components elèctrics i munició de les torretes.
+item.sand.description = S’empra per a processar altres materials.
+item.coal.description = S’empra com a combustible i per a produir materials refinats.
+item.coal.details = Sembla que sigui matèria vegetal fossilitzada, formada molt abans que passés la «Sembra».
+item.titanium.description = S’empra per a construir estructures de transports de líquids, perforadores i fàbriques.
+item.thorium.description = S’empra per a construir estructures resistents i com a combustible nuclear.
+item.scrap.description = S’empra en forns i polsinadores per a refinar-lo i obtenir-ne altres materials.
+item.scrap.details = Residus d’unitats i estructures antigues.
+item.silicon.description = S’empra en panells solars, electrònica avançada i munició guiada de les torretes.
+item.plastanium.description = S’empra per a construir unitats avançades, aïllaments i munició de fragmentació.
+item.phase-fabric.description = S’empra en electrònica avançada i estructures de reparació automàtica.
+item.surge-alloy.description = S’empra en armament avançat i estructures de defensa reactiva.
+item.spore-pod.description = Es pot convertir en petroli, explosius i combustible.
+item.spore-pod.details = Espores. Probablement, es tracta d’una forma de vida sintètica. Emet gasos tòxics per a altres formes de vida i és molt invasiva. Sota certes condicions, són molt inflamables.
+item.blast-compound.description = S’empra en bombes i munició explosiva.
+item.pyratite.description = S’empra en armes incendiàries i generadors a combustió.
+item.beryllium.description = S’empra en molts tipus de construccions i munició d’Erekir.
+item.tungsten.description = S’empra en perforadores, armadures i munició. Se’n necessita per construir estructures més avançades.
+item.oxide.description = S’empra com a conductor de l’energia tèrmica i també es fa servir com a aïllant elèctric.
+item.carbide.description = Es fa servir en estructures avançades, unitats pesants i munició.
+
+liquid.water.description = S’empra per a refredar màquines i processar residus.
+liquid.slag.description = Es refina en separadors per a obtenir-ne diferents metalls. També es fa servir com a munició líquida en torretes.
+liquid.oil.description = S’empra per a produir materials avançats i com a munició incendiària.
+liquid.cryofluid.description = S’empra com a refrigerant en reactors, torretes i fàbriques.
+liquid.arkycite.description = Es fa servir en reaccions químiques per generar electricitat i sintetitzar materials.
+liquid.ozone.description = Es fa servir com a agent oxidant en producció de materials i combustibles. Moderadament explosiu.
+liquid.hydrogen.description = Es fa servir en extracció de recursos, producció d’unitats i reparació d’estructures. Inflamable.
+liquid.cyanogen.description = Es fa servir per a munició, construcció d’unitats avançades i diverses reaccions en blocs avançats. Molt inflamable.
+liquid.nitrogen.description = Es fa servir per a extraure recursos, obtenció de gas i producció d’unitats. Inert.
+liquid.neoplasm.description = Un subproducte biològic perillós del reactor de neoplàsia. S’estén de pressa a altres blocs adjacents que continguin aigua que toca, fent-los malbé. Viscós.
+liquid.neoplasm.details = Neoplasma. Una massa incontrolable de cèl·lules sintètiques que es divideixen molt de pressa amb una consistència fangosa. Resisteix temperatures altes. Extremadament perillosa per a estructures amb aigua.\n\nMassa complexa i inestable per a fer-ne una anàlisi estàndard. Aplicacions potencials desconegudes. Es recomana incinerar-la en piscines de residus.
+
+block.derelict = \uf77e [lightgray]En ruïnes
+block.armored-conveyor.description = Mou objectes. Pels laterals només accepta entrades des d’altres cintes transportadores.
+block.illuminator.description = Emet llum.
+block.message.description = Emmagatzema un missatge. Els aliats el poden fer servir per a comunicar-se.
+block.reinforced-message.description = Emmagatzema un missatge que serveix per a què els aliats es puguin comunicar.
+block.world-message.description = Un bloc de missatge que es far servir per a fer mapes. No es pot destruir.
+block.graphite-press.description = Comprimeix carbó fins obtenir-ne grafit.
+block.multi-press.description = Comprimeix carbó fins obtenir-ne grafit. Requereix refrigeració amb aigua.
+block.silicon-smelter.description = Refina silici a partir de sorra i carbó.
+block.kiln.description = Fon sorra i plom per a fer-ne metavidre.
+block.plastanium-compressor.description = Produeix plastani a partir de petroli i titani.
+block.phase-weaver.description = Sintetitza teixit de fase a partir de tori i sorra.
+block.surge-smelter.description = Fon i barreja titani, plom, silici i coure per a obtenir-ne aliatge electrificable.
+block.cryofluid-mixer.description = Barreja aigua i pols fina de titani per a produir líquid criogènic.
+block.blast-mixer.description = Produeix compost explosiu a partir de piratita i beines d’espores.
+block.pyratite-mixer.description = Barreja carbó, plom i sorra per a obtenir piratita.
+block.melter.description = Fon ferralla i n’obté escòria.
+block.separator.description = Separa l’escòria en els seus diferents components.
+block.spore-press.description = Comprimeix les beines d’espores i n’obté petroli.
+block.pulverizer.description = Tritura ferralla i n’obté sorra fina.
+block.coal-centrifuge.description = Transforma el petroli en carbó.
+block.incinerator.description = Vaporitza qualsevol element o líquid que rep.
+block.power-void.description = Elimina tota l’energia que rebi. Només disponible en mode lliure.
+block.power-source.description = Genera energia indefinidament sense consumir recursos. Només disponible en mode lliure.
+block.item-source.description = Genera elements indefinidament sense consumir recursos. Només disponible en mode lliure.
+block.item-void.description = Elimina tots els elements que rebi. Només disponible en mode lliure.
+block.liquid-source.description = Genera líquids indefinidament sense consumir recursos. Només disponible en mode lliure.
+block.liquid-void.description = Elimina tots els líquids que rebi. Només disponible en mode lliure.
+block.payload-source.description = Genera blocs indefinidament sense consumir recursos. Només disponible en mode lliure.
+block.payload-void.description = Elimina tots els blocs que rebi. Només disponible en mode lliure.
+block.copper-wall.description = Protegeix les estructures dels projectils enemics.
+block.copper-wall-large.description = Protegeix les estructures dels projectils enemics.
+block.titanium-wall.description = Protegeix les estructures dels projectils enemics.
+block.titanium-wall-large.description = Protegeix les estructures dels projectils enemics.
+block.plastanium-wall.description = Protegeix les estructures dels projectils enemics. Absorbeix làsers i descàrregues elèctriques. Bloca les connexions d’energia automàtiques.
+block.plastanium-wall-large.description = Protegeix les estructures dels projectils enemics. Absorbeix làsers i descàrregues elèctriques. Bloca les connexions d’energia automàtiques.
+block.thorium-wall.description = Protegeix les estructures dels projectils enemics.
+block.thorium-wall-large.description = Protegeix les estructures dels projectils enemics.
+block.phase-wall.description = Protegeix les estructures dels projectils enemics, reflectint la majoria de munició que hi impacta.
+block.phase-wall-large.description = Protegeix les estructures dels projectils enemics, reflectint la majoria de munició que hi impacta.
+block.surge-wall.description = Protegeix les estructures dels projectils enemics, alliberant descàrregues elèctriques periòdicament quan algun enemic el toca.
+block.surge-wall-large.description = Protegeix les estructures dels projectils enemics, alliberant descàrregues elèctriques periòdicament quan algun enemic el toca.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Un mur que es pot obrir i tancar.
+block.door-large.description = Un mur gros que es pot obrir i tancar.
+block.mender.description = Repara blocs propers periòdicament.\nTambé pot usar silici per a potenciar el seu abast i eficiència.
+block.mend-projector.description = Repara blocs propers.\nTambé pot usar teixit de fase per a potenciar el seu abast i eficiència.
+block.overdrive-projector.description = Augmenta la velocitat de les estructures properes.\nTambé es pot usar teixit de fase per a millorar-ne l’abast i eficiència.
+block.force-projector.description = Crea un camp de força hexagonal al seu voltant, protegint estructures i unitats que hi quedin a dins.\nS’escalfa si ha d’absorbir molt dany. També s’hi pot usar refrigerant per a contrarestar el sobreescalfament. El teixit de fase augmenta la mida del camp.
+block.shock-mine.description = Solta descàrregues elèctriques quan els enemics les toquen.
+block.conveyor.description = Mou elements en la direcció de la cinta.
+block.titanium-conveyor.description = Mou elements en la direcció de la cinta. Més ràpida que una cinta normal.
+block.plastanium-conveyor.description = Transporta elements en paquets. Accepta elements per la seva part posterior i els descarrega en les altres tres direccions. Requereix diversos punts de càrrega i descàrrega per a aconseguir la màxima eficàcia.
+block.junction.description = Actua com dues cintes per separat, una en la direcció de l’eix X i l’altra amb la direcció de l’eix Y.
+block.bridge-conveyor.description = Transporta elements per sota del terra o de les estructures.
+block.phase-conveyor.description = Transporta instantàniament elements per sota del terra o de les estructures. Té un abast més gran que les cintes subterrànies, però necessita energia.
+block.sorter.description = Si un element d’entrada compleix els criteris, passa endavant. Si no, l’element surt per l’esquerra o per la dreta.
+block.inverted-sorter.description = Funciona a l’inrevés del classificador normal. Si un element d’entrada compleix els criteris, surt per un dels dos costats. Si no, l’element passa endavant.
+block.router.description = Distribueix els elements d’entrada en les tres direccions de sortida equitativament.
+block.router.details = Un mal necessari… No es recomana fer-ho servir prop de les estructures de producció, ja que en pot embussar l’entrada de recursos.
+block.distributor.description = Distribueix els elements d’entrada en les 7 caselles de sortida equitativament.
+block.overflow-gate.description = Només envia els elements d’entrada pels costats si el camí del davant està embussat.
+block.underflow-gate.description = Funciona a l’inrevés de la porta de desbordament. Els elements només surten pel davant si els camins de l’esquerra i de la dreta estan embussats.
+block.mass-driver.description = Estructura de transport d’elements de llarg abast. Recull paquets d’elements i els dispara a altres transportadors a distància.
+block.mechanical-pump.description = Bombeja i extreu líquids. No necessita energia.
+block.rotary-pump.description = Bombeja i extreu líquids. Consumeix energia.
+block.impulse-pump.description = Bombeja i extreu líquids.
+block.conduit.description = Serveix per a transportar líquids. S’utilitza amb estacions de bombeig i altres tipus de canonades.
+block.pulse-conduit.description = Serveix per a transportar líquids. Els transporta més de pressa i n’emmagatzema més que les canonades estàndard.
+block.plated-conduit.description = Serveix per a transportar líquids. No accepta entrades des dels costats. No té fugues.
+block.liquid-router.description = Accepta líquid des d’una direcció i surt repartit equitativament en les altres 3 direccions. També pot emmagatzemar una determinada quantitat de líquid.
+block.liquid-container.description = Emmagatzema una quantitat considerable de líquid. Surt per tots els cantons, com els encaminadors de líquids.
+block.liquid-tank.description = Emmagatzema una gran quantitat de líquid. Surt per tots els cantons, com els encaminadors de líquids.
+block.liquid-junction.description = Actua com dues canonades per separat, una en la direcció de l’eix X i l’altra amb la direcció de l’eix Y.
+block.bridge-conduit.description = Transporta líquids per sota del terra o de les estructures.
+block.phase-conduit.description = Transporta líquids per sota del terra o de les estructures, amb més abast que les canonades subterrànies normals, però necessita energia.
+block.power-node.description = Transmet energia entre nodes connectats. El node rebrà o subministrarà energia als blocs adjacents.
+block.power-node-large.description = Un node d’energia avançat amb un abast més gran.
+block.surge-tower.description = Un node d’energia de llarg abast però amb menys connexions disponibles.
+block.diode.description = Mou l’energia de la bateria en una direcció, però només si l’altre costat té menys energia emmagatzemada.
+block.battery.description = Emmagatzema energia quan hi ha un excés de producció. L’allibera quan hi ha dèficit de producció d’energia.
+block.battery-large.description = Emmagatzema energia quan hi ha un excés de producció. L’allibera quan hi ha dèficit de producció d’energia. Té més capacitat que una bateria normal.
+block.combustion-generator.description = Genera energia cremant materials inflamables, com ara carbó.
+block.thermal-generator.description = Genera energia quan es construeix en llocs on el terra tingui una temperatura elevada.
+block.steam-generator.description = Genera energia cremant materials inflamables i convertint l’aigua líquida en vapor.
+block.differential-generator.description = Genera grans quantitats d’energia. Utilitza la diferència de temperatura entre el líquid criogènic i la pirarita que crema.
+block.rtg-generator.description = Usa la calor dels compostos radioactius que es descomponen per a produir energia lentament.
+block.solar-panel.description = Obté una mica d’energia solar i la transforma en elèctrica.
+block.solar-panel-large.description = Obté una mica d’energia solar i la transforma en elèctrica. És més eficient que un panell solar normal.
+block.thorium-reactor.description = Genera grans quantitats d’energia emprant tori. Necessita refrigeració constant. Es produirà una explosió violenta si no se li subministra una quantitat de refrigerant suficient.
+block.impact-reactor.description = Obté quantitats grans d’energia amb un gran rendiment. Necessita una quantitat d’energia significant d’entrada per a començar el procés.
+block.mechanical-drill.description = Quan es construeix damunt un dipòsit de mineral, extrau recursos poc a poc indefinidament. Només pot extraure els recursos minerals més bàsics.
+block.pneumatic-drill.description = Una perforadora millorada que pot extraure titani. Extrau recursos més ràpid que una perforadora mecànica.
+block.laser-drill.description = Permet extraure recursos més de pressa utilitzant tecnologia làser, però necessita energia. Pot extraure tori.
+block.blast-drill.description = La millor perforadora. Necessita grans quantitats d’energia per a funcionar.
+block.water-extractor.description = Extrau aigua del terra. S’usa en llocs on no hi ha aigua a la superfície.
+block.cultivator.description = Cultiva petites concentracions d’espores atmosfèriques i obté beines d’espores.
+block.cultivator.details = S’usa per a produir grans quantitats de biomassa de la manera més eficient possible. És molt probable que sigui com la incubadora inicial de les espores que han acabat cobrint Serpulo.
+block.oil-extractor.description = Usa molta energia, sorra i aigua per a extreure petroli.
+block.core-shard.description = Nucli de la base. Un cop s’ha destruït, es perd el sector.
+block.core-shard.details = La primera iteració. Compacte. Pot autoreplicar-se. Equipat amb propulsors d’un sol ús. No s’ha dissenyat per a viatges interplanetaris.
+block.core-foundation.description = Nucli de la base. Ben blindat. Emmagatzema més recursos que el nucli «Estella».
+block.core-foundation.details = La segona iteració.
+block.core-nucleus.description = Nucli de la base. Extremadament ben blindat. Emmagatzema una quantitat enorme de recursos.
+block.core-nucleus.details = La tercera i última iteració.
+block.vault.description = Emmagatzema una quantitat gran d’elements de cada tipus. Millora la capacitat d’emmagatzemament al sector si es situa al costat d’un nucli. Es poden recuperar els continguts amb un descarregador.
+block.container.description = Emmagatzema una quantitat petita d’elements de cada tipus. Millora la capacitat d’emmagatzemament al sector si es situa al costat d’un nucli. Es poden recuperar els continguts amb un descarregador.
+block.unloader.description = Descarrega els elements seleccionats dels blocs adjacents.
+block.launch-pad.description = Llança lots d’elements al sector seleccionat.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = Dispara munició als enemics.
+block.scatter.description = Dispara projectils antiaeris de plom, ferralla o metavidre a les aeronaus enemigues.
+block.scorch.description = Crema els enemics terrestres que tingui a prop. La torreta és molt efectiva a distàncies curtes.
+block.hail.description = Dispara projectils petits als enemics terrestres a distàncies grans.
+block.wave.description = Dispara rajos de líquid als enemics. Apaga focs automàticament quan se li subministra aigua.
+block.lancer.description = Carrega i dispara rajos d’energia potents a objectius terrestres.
+block.arc.description = Solta descàrregues d’energia a objectius terrestres.
+block.swarmer.description = Dispara míssils guiats als enemics.
+block.salvo.description = Dispara salves ràpides de bales als enemics.
+block.fuse.description = Dispara tres rajos perforants de curt abast als enemics propers.
+block.ripple.description = Dispara munició de dispersió a enemics terrestres a distàncies grans.
+block.cyclone.description = Dispara material explosiu antiaeri a enemics propers.
+block.spectre.description = Dispara bales grosses a objectius terrestres i aeris.
+block.meltdown.description = Carrega i dispara un raig làser persistent a enemics propers. Requereix refrigerant per a funcionar.
+block.foreshadow.description = Dispara una sola bala grossa d’un sol objectiu. Prioritza els enemics de major salut màxima.
+block.repair-point.description = Repara contínuament la unitat danyada més propera del seu voltant.
+block.segment.description = Danya i destrueix projectils que s’apropin. No pot blocar els làsers.
+block.parallax.description = Dispara un raig tractor que estira els objectius aeris, danyant-los en el procés.
+block.tsunami.description = Dispara rajos de líquids potents als enemics. Apaga automàticament els focs si se li subministra aigua.
+block.silicon-crucible.description = Refina silici a partir de sorra i carbó, usant piratita com a font calorífica addicional. És més eficient en llocs amb el terra amb temperatures altes.
+block.disassembler.description = Aconsegueix petites quantitats de minerals rars a partir d’escòria amb una eficiència baixa. Pot obtenir tori.
+block.overdrive-dome.description = Augmenta la velocitat de funcionament d’estructures properes. Necessita teixit de fase i silici per a operar.
+block.payload-conveyor.description = Mou unitats i blocs. Magnètic. Es pot usar en entorns de gravetat zero.
+block.payload-router.description = Separa els blocs o unitats de l’entrada en tres direccions diferents. Funciona com un classificador si s’hi estableix un filtre. Magnètic. Es pot usar en entorns de gravetat zero.
+block.ground-factory.description = Produeix unitats terrestres. Les unitats produïdes es poden usar directament o es poden moure als reconstructors per a millorar-les.
+block.air-factory.description = Produeix unitats aèries. Les unitats produïdes es poden usar directament o es poden moure als reconstructors per a millorar-les.
+block.naval-factory.description = Produeix unitats navals. Les unitats creades es poden utilitzar directament o es poden moure als reconstructors per a millorar-les.
+block.additive-reconstructor.description = Millora les unitats d’entrada al segon nivell.
+block.multiplicative-reconstructor.description = Millora les unitats d’entrada al tercer nivell.
+block.exponential-reconstructor.description = Millora les unitats d’entrada al quart nivell.
+block.tetrative-reconstructor.description = Millora les unitats d’entrada fins al cinquè i últim nivell.
+block.switch.description = Un interruptor del qual se’n pot llegir l’estat i es pot controlar amb processadors lògics.
+block.micro-processor.description = Executa una seqüència d’instruccions lògiques. Es pot usar per a controlar unitats i estructures.
+block.logic-processor.description = Executa una seqüència d’instruccions lògiques. Es pot usar per a controlar unitats i estructures. Més ràpid que els microprocessadors.
+block.hyper-processor.description = Executa una seqüència d’instruccions lògiques. Es pot usar per a controlar unitats i estructures. Més ràpid que els processadors lògics.
+block.memory-cell.description = Emmagatzema informació per a un processador lògic.
+block.memory-bank.description = Emmagatzema informació per a un processador lògic. Alta capacitat.
+block.logic-display.description = Mostra un gràfic des d’un processador lògic.
+block.large-logic-display.description = Mostra un gràfic des d’un processador lògic.
+block.interplanetary-accelerator.description = Una torreta amb un canó electromagnètic enorme. Accelera els nuclis fins aconseguir la velocitat d’escapament per a fer llançaments interplanetaris.
+block.repair-turret.description = Repara contínuament la unitat danyada que tingui més a prop al seu voltant. També se li pot subministrar refrigerant perquè funcioni més ràpid.
+block.core-bastion.description = Nucli de la base. Blindat. Quan es destrueix, es perd el sector.
+block.core-citadel.description = Nucli de la base. Molt ben blindat. Emmagatzema més recursos que un nucli Bastió.
+block.core-acropolis.description = Nucli de la base. Excepcionalment ben blindat. Emmagatzema més recursos que un nucli Ciutadella.
+block.breach.description = Dispara munició perforant de beril·li o tungstè als objectius enemics.
+block.diffuse.description = Dispara una ràfega de bales en forma de con. Empeny enrere els objectius enemics.
+block.sublimate.description = Dispara una flama continua de foc als objectius enemics. Perfora els blindatges.
+block.titan.description = Dispara projectils explosius enormes als objectius terrestres. Necessita hidrogen.
+block.afflict.description = Dispara una bola enorme carregada amb artilleria antiaèria de fragmentació. Requereix escalfor.
+block.disperse.description = Dispara ràfegues d’artilleria als objectius aeris.
+block.lustre.description = Dispara un làser lent que pot apuntar un sol objectiu enemic.
+block.scathe.description = Llança un míssil als objectius terrestres a llarga distància.
+block.smite.description = Dispara ràfegues de  bales perforadors i que emeten llum.
+block.malign.description = Dispara una cortina de càrregues làser teledirigides als objectius enemics. Necessita molta escalfor.
+block.silicon-arc-furnace.description = Refina silici a partir de sorra i grafit.
+block.oxidation-chamber.description = Converteix el beril·li i l’ozó en òxid. Emet escalfor com a subproducte.
+block.electric-heater.description = Escalfa els blocs als que està orientat. Necessita grans quantitats d’energia.
+block.slag-heater.description = Escalfa els blocs als que està orientat. Requereix escòria.
+block.phase-heater.description = Escalfa els blocs als que està orientat. Requereix teixit de fase.
+block.heat-redirector.description = Redirigeix l’escalfor acumulada a altres blocs.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Distribueix l’escalfor acumulada en tres direccions de sortida.
+block.electrolyzer.description = Converteix l’aigua en hidrogen i gas ozó.
+block.atmospheric-concentrator.description = Concentra el nitrogen de l’atmosfera. Requereix escalfor.
+block.surge-crucible.description = Genera aliatge electrificable a partir d’escòria i silici. Necessita escalfor.
+block.phase-synthesizer.description = Sintetitza teixit de fase a partir de tori, sorra i ozó. Necessita escalfor.
+block.carbide-crucible.description = Combina grafit i tungstè per obtenir-ne carbur. Necessita escalfor.
+block.cyanogen-synthesizer.description = Sintetitza cianogen a partir d’arquicita i grafit. Necessita escalfor.
+block.slag-incinerator.description = Incinera elements no volàtils o líquids. Necessita escòria.
+block.vent-condenser.description = Condensa els gasos procedents de conductes de ventilació en aigua. Consumeix energia.
+block.plasma-bore.description = Quan es posa orientat a un mur de mineral, en treu recursos indefinidament. Requereix una mica d’energia per funcionar.
+block.large-plasma-bore.description = Una perforadora de plasma grossa. Pot extraure tungstè i tori. Requereix hidrogen i energia.
+block.cliff-crusher.description = Trenca murs, extraient-ne sorra indefinidament. Necessita energia. La seva eficàcia depèn del tipus de mur.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Quan es posa a sobre de minerals, n’extrau indefinidament. Necessita energia i aigua.
+block.eruption-drill.description = Una perforadora d’impacte millorada. Pot extraure tori. Necessita hidrogen.
+block.reinforced-conduit.description = Impulsa i fa circular els fluids. No accepta entrades des dels laterals si no és a través de conductes.
+block.reinforced-liquid-router.description = Distribueix fluids a tots els seus costats.
+block.reinforced-liquid-tank.description = Emmagatzema una gran quantitat de fluid.
+block.reinforced-liquid-container.description = Emmagatzema fluids.
+block.reinforced-bridge-conduit.description = Transporta fluids per sota de les estructures i del terreny.
+block.reinforced-pump.description = Bombeja i extrau líquids. Requereix hidrogen.
+block.beryllium-wall.description = Protegeix les estructures dels projectils enemics.
+block.beryllium-wall-large.description = Protegeix les estructures dels projectils enemics.
+block.tungsten-wall.description = Protegeix les estructures dels projectils enemics.
+block.tungsten-wall-large.description = Protegeix les estructures dels projectils enemics.
+block.carbide-wall.description = Protegeix les estructures dels projectils enemics.
+block.carbide-wall-large.description = Protegeix les estructures dels projectils enemics.
+block.reinforced-surge-wall.description = Protegeix les estructures dels projectils enemics, llançant descàrregues elèctriques periòdicament quan els projectils impacten.
+block.reinforced-surge-wall-large.description = Protegeix les estructures dels projectils enemics, llançant descàrregues elèctriques periòdicament quan els projectils impacten.
+block.shielded-wall.description = Protegeix les estructures dels projectils enemics. Genera un escut que absorbeix la majoria quan se li proporciona energia. Condueix l’electricitat.
+block.blast-door.description = Un mur que s’obre quan hi ha un aliat terrestre a prop. No es pot controlar manualment.
+block.duct.description = Mou els elements. Només pot emmagatzemar un sol element.
+block.armored-duct.description = Mou elements. No accepta entrades pels laterals si no és a través de conductes.
+block.duct-router.description = Distribueix els elements en tres direccions. Només accepta elements a través de la part posterior. Es pot configurar com a classificador d’elements.
+block.overflow-duct.description = Només treu elements pels costats si la sortida del davant està blocada.
+block.duct-bridge.description = Mou elements per sota de les estructures i del terreny.
+block.duct-unloader.description = Descarrega l’element seleccionat del bloc del darrera. No pot descarregar-los dels nuclis.
+block.underflow-duct.description = Actua a l’inrevés d’una porta de desbordament. Els elements surten per la part del davant si els dos laterals estan blocats.
+block.reinforced-liquid-junction.description = Actua com a dos conductes independents que es creuen.
+block.surge-conveyor.description = Mou elements en grans quantitats. Es pot accelerar amb energia. Condueix l’electricitat.
+block.surge-router.description = Distribueix els elements en tres direccions a partir de cintes electrificades. Es poden accelerar amb energia. Condueix l’electricitat.
+block.unit-cargo-loader.description = Construeix drons de càrrega. Els drons distribueixen automàticament els elements als punts de càrrega i descàrrega que coincideixin amb el filtre.
+block.unit-cargo-unload-point.description = Actua com un punt de descàrrega per als drons de càrrega. Accepta elements que coincideixin amb el filtre.
+block.beam-node.description = Transmet energia a altres blocs ortogonalment. Emmagatzema una petita quantitat d’energia.
+block.beam-tower.description = Transmet energia a altres blocs ortogonalment. Emmagatzema una gran quantitat d’energia. Té un abast gran.
+block.turbine-condenser.description = Genera energia quan es situa en conductes de ventilació. Produeix una petita quantitat d’aigua.
+block.chemical-combustion-chamber.description = Genera energia a partir d’arquicita i ozó.
+block.pyrolysis-generator.description = Genera grans quantitats d’energia a partir d’arquicita i escòria. Produeix aigua com a subproducte.
+block.flux-reactor.description = Genera grans quantitats d’energia quan se l’escalfa. Necessita cianogen com a estabilitzador. La sortida d’energia i el cianogen necessari són proporcionals a l’escalfor d’entrada.\nExplota si no té prou cianogen.
+block.neoplasia-reactor.description = Fa servir arquicita, aigua i teixit de fase per generar grans quantitats d’energia. Produeix escalfor i quantitats perilloses de neoplasma com a subproducte.\nExplota de manera violenta si el neoplasma no s’extrau del redactor amb canonades.
+block.build-tower.description = Reconstrueix automàticament les estructures que estiguin a l’abast i ajuda a construir a altres unitats.
+block.regen-projector.description = Repara a poc a poc les estructures aliades dins d’un perímetre quadrat. Necessita hidrogen.
+block.reinforced-container.description = Emmagatzema una quantitat petita d’elements. Els continguts es poden recuperar amb descarregadors. No augmenta l’emmagatzematge del nucli.
+block.reinforced-vault.description = Emmgatzema una gran quantitat d’elements. Els continguts es poden recuperar amb descarregadors. No augmenta l’emmagatzematge del nucli.
+block.tank-fabricator.description = Construeix unitats Stell. Les unitats produïdes es poden fer servir directament o bé portar-les a les refabricadores per millorar-les.
+block.ship-fabricator.description = Construeix unitats Elude. Les unitats produïdes es poden fer servir directament o bé portar-les a les refabricadores per millorar-les.
+block.mech-fabricator.description = Construeix unitats Merui. Les unitats produïdes es poden fer servir directament o bé portar-les a les refabricadores per millorar-les.
+block.tank-assembler.description = Munta tancs grossos a partir de blocs i unitats d’entrada. El nivell de sortida es pot millorar si s’hi afegeixen mòduls.
+block.ship-assembler.description = Munta naus grosses a partir de blocs i unitats d’entrada. El nivell de sortida es pot millorar si s’hi afegeixen mòduls.
+block.mech-assembler.description = Munta meques grosses a partir de blocs i unitats d’entrada. El nivell de sortida es pot millorar si s’hi afegeixen mòduls.
+block.tank-refabricator.description = Millora els tancs d’entrada al segon nivell.
+block.ship-refabricator.description = Millora les naus d’entrada al segon nivell.
+block.mech-refabricator.description = Millora les meques d’entrada al segon nivell.
+block.prime-refabricator.description = Millora les unitats d’entrada al tercer nivell.
+block.basic-assembler-module.description = Augmenta el nivell de muntatge quan es situa al costat d’una vora de construcció. Necessita energia. Es pot fer servir com a punt d’entrada per al transport de blocs.
+block.small-deconstructor.description = Desmunta les unitats i estructures d’entrada. Recupera el 100 % del cost de construcció.
+block.reinforced-payload-conveyor.description = Mou els blocs i les unitats.
+block.reinforced-payload-router.description = Distribueix els blocs als blocs adjacents. Funciona com un classificador si s’estableix un filtre.
+block.payload-mass-driver.description = Estructura de transport de blocs i unitats de llarg abast. Dispara la càrrega rebuda a altres torres de transport a distància enllaçades.
+block.large-payload-mass-driver.description = Estructura que transporta blocs i unitats a distància. Dispara els blocs als transportadors enllaçats.
+block.unit-repair-tower.description = Repara totes les unitats a prop. Necessita ozó.
+block.radar.description = Escaneja el terreny gradualment i localitza unitats enemigues a gran distància. Necessita energia.
+block.shockwave-tower.description = Danya i destrueix projectils enemics dintre del seu abast. Requereix cianogen.
+block.canvas.description = Mostra una imatge senzilla amb una paleta predefinida. Es pot editar.
+
+unit.dagger.description = Dispara munició estàndard a tots els enemics propers.
+unit.mace.description = Dispara flames a tots els enemics propers.
+unit.fortress.description = Dispara artilleria de llarg abast als objectius terrestres.
+unit.scepter.description = Dispara una pluja de munició carregada a tots els enemics propers.
+unit.reign.description = Dispara una pluja de bales perforadores a tots els enemics propers.
+unit.nova.description = Dispara raigs làser que danyen enemics i repara estructures aliades. Pot volar.
+unit.pulsar.description = Solta descàrregues elèctrics als enemics i repara estructures aliades. Pot volar.
+unit.quasar.description = Dispara raigs làser perforadors que danyen els enemics i repara estructures aliades. Pot volar i disposa d’un camp de força incorporat.
+unit.vela.description = Dispara raigs làser continus massius que danyen enemics, causa focs i repara estructures aliades. Pot volar.
+unit.corvus.description = Dispara una ràfega làser massiva que danya els enemics i repara estructures aliades. Pot circular per la majoria dels terrenys.
+unit.crawler.description = Es dirigeix de pressa cap als enemics i s’autodestrueix, causant una gran explosió.
+unit.atrax.description = Dispara boles d’escòria que debiliten als objectius terrestres. Pot circular per la majoria dels terrenys.
+unit.spiroct.description = Dispara raigs làser debilitants als enemics i es regenera durant el procés. Pot circular per la majoria dels terrenys.
+unit.arkyid.description = Dispara raigs làser debilitants molt potents als enemics i es regenera durant el procés. Pot circular per la majoria dels terrenys.
+unit.toxopid.description = Dispara grups de projectils electrificats grossos i làsers perforadors als enemics. Pot circular per la majoria dels terrenys.
+unit.flare.description = Dispara munició estàndard als objectius terrestres propers.
+unit.horizon.description = Dispara grups de bombes als objectius terrestres.
+unit.zenith.description = Dispara salves de míssils als enemics propers.
+unit.antumbra.description = Dispara una pluja de bales als enemics propers.
+unit.eclipse.description = Dispara dos làsers perforadors i una pluja de munició antiaèria a tots els enemics propers.
+unit.mono.description = Extreu automàticament coure i plom, deixant els recursos aconseguits al nucli.
+unit.poly.description = Reconstrueix automàticament les estructures destruïdes i assisteix altres unitats per a construir.
+unit.mega.description = Repara automàticament les estructures danyades. Pot transportar blocs i unitats terrestres petites.
+unit.quad.description = Deixa caure bombes grosses damunt d’objectius terrestres, danya als enemics i repara estructures aliades. Pot transportar unitats terrestres de mida mitjana.
+unit.oct.description = Protegeix els aliats propers amb el seu escut regenerable. Pot transportar la majoria d’unitats terrestres.
+unit.risso.description = Dispara una pluja de míssils i bales a tots els enemics propers.
+unit.minke.description = Dispara projectils i bales estàndard als objectius terrestres.
+unit.bryde.description = Dispara projectils d’artilleria i míssils de llarg abast als enemics.
+unit.sei.description = Dispara una pluja de míssils i bales capaces de perforar escuts als enemics.
+unit.omura.description = Dispara projectils perforadors de llarg abast amb un canó electromagnètic. Construeix unitats «Flare».
+unit.alpha.description = Defensa el nucli «Estella» dels enemics. Construeix estructures.
+unit.beta.description = Defensa el nucli «Fonament» des enemics. Construeix estructures.
+unit.gamma.description = Defensa el nucli «Punt neuràlgic» des enemics. Construeix estructures.
+unit.retusa.description = Dispara torpedes guiats als enemics propers. Repara unitats aliades.
+unit.oxynoe.description = Dispara rajos de flames als enemics propers que reparen també les estructures aliades. També apunta i destrueix projectils enemics amb una torreta de defensa.
+unit.cyerce.description = Dispara grups de míssils rastrejadors. Repara unitats aliades.
+unit.aegires.description = Electrocuta totes les unitats enemigues que entren al seu camp d’energia. Repara tots els aliats.
+unit.navanax.description = Dispara projectils explosius PEM que danyen significativament les xarxes d’energia enemigues i que reparen les estructures aliades. Fon els enemics propers amb 4 torretes làser autònomes.
+unit.stell.description = Dispara munició estàndard als objectius enemics.
+unit.locus.description = Dispara munició alternant als objectius enemics.
+unit.precept.description = Dispara una ràfega de munició perforadora als objectius enemics.
+unit.vanquish.description = Dispara munició de gran calibre perforadora i de dispersió als objectius enemics.
+unit.conquer.description = Dispara ràfegues llargues de bales als objectius enemics.
+unit.merui.description = Dispara artilleria de llarg abast als objectius enemics. Pot travessar la majoria de terrenys.
+unit.cleroi.description = Dispara parelles de projectils als objectius enemics. Busca projectils enemics amb torretes de punt de defensa. Pot travessar la majoria de terrenys.
+unit.anthicus.description = Dispara míssils dirigits de llarg abast als objectius enemics. Pot travessar la majoria de terrenys.
+unit.tecta.description = Dispara míssils de plasma dirigits als objectius enemics. Es protegeix a si mateix amb un escut direccional. Pot travessar la majoria de terrenys.
+unit.collaris.description = Dispara artilleria de fragmentació de llarg abast als objectius enemics. Pot travessar la majoria de terrenys.
+unit.elude.description = Dispara parelles de bales dirigides als objectius enemics. Pot volar sobre les masses de líquid.
+unit.avert.description = Dispara parelles de bales que torcen la trajectòria als objectius enemics.
+unit.obviate.description = Dispara parelles de boles elèctriques als objectius enemics.
+unit.quell.description = Dispara míssils de llarg abast dirigits als objectius enemics. Evita la reparació de les estructures enemigues per part dels blocs de reparació.
+unit.disrupt.description = Dispara míssils de llarg abast dirigits i supressors als objectius enemics. Evita la reparació de les estructures enemigues per part dels blocs de reparació.
+unit.evoke.description = Construeix estructures per defensar el nucli Bastió. Repara les estructures amb un raig.
+unit.incite.description = Construeix estructures per defensar el nucli Ciutadella. Repara les estructures amb un raig.
+unit.emanate.description = Construeix estructures per defensar el nucli Acròpolis. Repara les estructures amb un raig.
+
+lst.read = Llegeix un nombre des d’una cel·la de memòria connectada.
+lst.write = Escriu un nombre en una cel·la de memòria connectada.
+lst.print = Afegeix un text a la cua d’impressió.\nEl text no es mostrarà fins que s’apliqui «[accent]Print Flush[]».
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Reemplaça el següent marcador de posició a la cua d’impressió amb un valor.\nNo fa res si el patró del marcador no és vàlid.\nPatró del marcador: "{[accent]número 0-9[]}"\nExemple:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Afegeix una instrucció de dibuix a la cua corresponent.\nEl resultat no es mostrarà fins que s’apliqui «[accent]Draw Flush[]».
+lst.drawflush = Executa les operacions de la cua de dibuix al monitor lògic.
+lst.printflush = Executa les operacions de la cua d’impressió al monitor lògic.
+lst.getlink = Obtén l’enllaç a un processador mitjançant el seu índex. Es numeren començant pel 0.
+lst.control = Controla una estructura.
+lst.radar = Localitza unitats al voltant d’un bloc amb l’abast indicat.
+lst.sensor = Obtén dades d’una estructura o unitat.
+lst.set = Estableix una variable.
+lst.operation = Executa una operació amb 1 o 2 variables.
+lst.end = Salta al principi de la llista d’instruccions.
+lst.wait = Espera el nombre indicat de segons.
+lst.stop = Para l’execució d’aquest processador.
+lst.lookup = Busca un tipus d’element, líquid, unitat o bloc per ID.\nEs pot comptar la quantitat total d’elements del tipus indicat amb:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Salta a una altra instrucció si es compleixen les condicions.
+lst.unitbind = Enllaça amb la següent unitat d’un determinat tipus i la guarda en [accent]@unit[].
+lst.unitcontrol = Controla la unitat enllaçada.
+lst.unitradar = Localitza unitats al voltant de la unitat enllaçada.
+lst.unitlocate = Localitza un tipus específic de posició/estructura en qualsevol lloc del mapa.\nCal que hi hagi una unitat enllaçada.
+lst.getblock = Obtén les dades d’un bloc en qualsevol posició.
+lst.setblock = Estableix les dades d’un bloc en qualsevol posició.
+lst.spawnunit = Fes aparèixer una unitat en una posició.
+lst.applystatus = Aplica o esborra un efecte d’estat d’una unitat.
+lst.weathersense = Comprova si un tipus de temps meteorològics està actiu.
+lst.weatherset = Estableix l’estat actual per a un tipus de temps meteorològic.
+lst.spawnwave = Simula l’aparició d’una onada enemiga en una posició arbitrària.\nEl comptador d’onades no s’incrementarà.
+lst.explosion = Crea una explosió en una posició.
+lst.setrate = Estableix la velocitat d’execució del processador en instruccions/tic.
+lst.fetch = Cerca unitats, nuclis, jugadors o estructures mitjançant el seu índex.\nEls índexs van des del 0 fins al total del nombre d’elements.
+lst.packcolor = Empaqueta els components RGBA [0, 1] en un sol nombre per a dibuixar o establir regles.
+lst.setrule = Estableix una regla de la partida.
+lst.flushmessage = Mostra un missatge a la pantalla a partir dels continguts de la cua de text.\nEsperarà fins que acabi el missatge anterior.
+lst.cutscene = Manipula la càmera del jugador.
+lst.setflag = Estableix un senyal global que es podrà llegir en tots els processadors.
+lst.getflag = Obtén un senyal global.
+lst.setprop = Estableix una propietat d’una unitat o estructura.
+lst.effect = Crea un efecte de partícula.
+lst.sync = Sincronitza una variable a través de la xarxa.\nS’invoca com a molt 10 vegades per segon.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Crea una marca lògica al món.\nS’ha de donar un ID per a identificar-la.\nEs poden establir fins a 20.000 marcadors per món.
+lst.setmarker = Estableix una propietat per a la marca.\nL’ID que es faci servir ha de ser el mateix que el de la instrucció de crear la marca.
+lst.localeprint = Afegeix el valor d’una propietat de la traducció d’un mapa a la cua d’impressió.\nPer a establir paquets de traducció de mapes a l’editor de mapes, comproveu [accent]Informació del mapa > Paquets de traducció[].\nSi el client és un dispositiu mòbil, primer intenta imprimir una propietat que acabi en «.mobile».
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = La constant matemàtica pi (3.141…)
+lglobal.@e = La constant matemàtica e (2.718…)
+lglobal.@degToRad = Multiplica per aquest nombre per a convertir graus sexagesimals en radians.
+lglobal.@radToDeg = Multiplica per aquest nombre per a convertir radians en graus sexagesimals.
+lglobal.@time = Temps de joc de la partida actual, en mil·lisegons
+lglobal.@tick = Temps de joc de la partida actual, en tics (1 segon = 60 tics)
+lglobal.@second = Temps de joc de la partida actual, en segons
+lglobal.@minute = Temps de joc de la partida actual, en minuts
+lglobal.@waveNumber = Nombre de l’onada actual, si les onades estan activades
+lglobal.@waveTime = Comptador enrere de les onades, en segons
+lglobal.@mapw = Amplada del mapa en caselles
+lglobal.@maph = Alçària del mapa en caselles
+lglobal.sectionMap = Mapa
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Xarxa/Client [Només processador integrat]
+lglobal.sectionProcessor = Processador
+lglobal.sectionLookup = Lookup
+lglobal.@this = El bloc lògic que executa el codi
+lglobal.@thisx = Coordenada X del bloc que executa el codi
+lglobal.@thisy = Coordenada Y del bloc que executa el codi
+lglobal.@links = Quantitat total de blocs enllaçats amb aquest processador
+lglobal.@ipt = Velocitat d’execució del processador en instruccions per tic (60 tics = 1 segon)
+lglobal.@unitCount = Nombre total de tipus de continguts d’unitat a la partida; es fa servir amb la instrucció lookup.
+lglobal.@blockCount = Nombre total de tipus de continguts de bloc a la partida; es fa servir amb la instrucció lookup.
+lglobal.@itemCount = Nombre total de tipus de continguts d’element a la partida; es fa servir amb la instrucció lookup.
+lglobal.@liquidCount = Nombre total de tipus de continguts de líquid a la partida; es fa servir amb la instrucció lookup.
+lglobal.@server = Cert si el codi s’executa en un servidor o en mode d’un sol jugador; fals altrament.
+lglobal.@client = Cert si el codi s’executa en un client connectat a un servidor.
+lglobal.@clientLocale = Traducció del client que executa el codi. Per exemple: en_US
+lglobal.@clientUnit = Unitat del client que executa el codi
+lglobal.@clientName = Nom del jugador del client que executa el codi
+lglobal.@clientTeam = Identificador de l’equip que executa el codi
+lglobal.@clientMobile = Cert si el client que executa el codi és un dispositiu mòbil; fals altrament.
+
+logic.nounitbuild = [red]Aquí no es permet construir blocs de tipus lògic.
+
+lenum.type = Tipus del bloc/unitat.\nPer exemple, per a qualsevol encaminador, retornarà [accent]@router[].\nNo retorna una cadena de text.
+lenum.shoot = Dispara a una posició.
+lenum.shootp = Dispara a una unitat/bloc tenint en compte la seva velocitat a l’hora d’apuntar.
+lenum.config = Configuració de l’estructura, com ara el classificador.
+lenum.enabled = Retorna si el bloc està activat.
+laccess.currentammotype = Líquid o element de munició actual de la torreta.
+
+laccess.color = Color de l’il·luminador.
+laccess.controller = Controlador de la unitat. Si es controla per processador, retorna el processador.\nAltrament, retorna la mateixa unitat.
+laccess.dead = Retorna si una unitat o bloc està destruïda o si ja no és vàlida.
+laccess.controlled = Returna:\n[accent]@ctrlProcessor[] si el controlador de la unitat és un processador;\n[accent]@ctrlPlayer[] si el controlador de la unitat és un jugador;\n[accent]@ctrlCommand[] si el controlador és un comandament del jugador;\naltrament, és 0.
+laccess.progress = Progrés de l’acció, entre 0 i 1.\nRetorna la producció, la recàrrega de la torreta o el progrés de la construcció.
+laccess.speed = Velocitat màxima de la unitat, en caselles/s.
+laccess.id = Identificador d’unitat/bloc/element/líquid.\nÉs l’invers de l’operació lookup.
+lcategory.unknown = Desconegut
+lcategory.unknown.description = Instruccions sense categoria.
+lcategory.io = Entrada i sortida
+lcategory.io.description = Modifica els continguts dels blocs de memòria i de la memòria dels processadors.
+lcategory.block = Control de blocs
+lcategory.block.description = Interacciona amb els blocs.
+lcategory.operation = Operacions
+lcategory.operation.description = Operacions lògiques.
+lcategory.control = Control de flux
+lcategory.control.description = Controla l’execució d’ordres.
+lcategory.unit = Control d’unitats
+lcategory.unit.description = Dóna ordres a les unitats.
+lcategory.world = Món
+lcategory.world.description = Controla com es comporta el món.
+
+graphicstype.clear = Omple el monitor lògic amb un color.
+graphicstype.color = Estableix el color per a les properes operacions de dibuix.
+graphicstype.col = Equivalent a «color», però empaquetat en un sol valor.\nEls colors empaquetats s’escriuen amb el seu codi hexadecimal amb el prefix [accent]%[].\nExemple: [accent]%ff0000[] representa el color vermell.
+graphicstype.stroke = Estableix l’amplada de la línia.
+graphicstype.line = Dibuixa un segment.
+graphicstype.rect = Omple un rectangle.
+graphicstype.linerect = Dibuixa els costats d’un rectangle.
+graphicstype.poly = Omple un polígon regular.
+graphicstype.linepoly = Dibuixa els costats d’un polígon regular.
+graphicstype.triangle = Omple un triangle.
+graphicstype.image = Dibuixa una imatge d’algun element del joc.\nPer exemple: [accent]@router[] o [accent]@dagger[].
+graphicstype.print = Dibuixa el text de la cua d’impressió.\nEsborra la cua d’impressió.
+
+lenum.always = Sempre cert.
+lenum.idiv = Divisió entera.
+lenum.div = Divisió.\nRetorna [accent]null[] si es divideix per zero.
+lenum.mod = Mòdul (residu de la divisió entera).
+lenum.equal = Igual. Força els tipus.\nCompara objectes no nuls amb nombres. Si són iguals, retorna 1. Si no, retorna 0.
+lenum.notequal = No igual. Força els tipus.
+lenum.strictequal = Igualtat estricta sense forçar el tipus.\nEs pot fer servir amb objectes nuls.
+lenum.shl = Desplaça els bits a l’esquerra.
+lenum.shr = Desplaça els bits a la dreta.
+lenum.or = Operació lògica OR bit a bit.
+lenum.land = Operació lògica AND bit a bit.
+lenum.and = Operació lògica AND bit a bit.
+lenum.not = Operació lògica NOT bit a bit.
+lenum.xor = Operació lògica XOR bit a bit.
+
+lenum.min = Mínim de dos nombres.
+lenum.max = Màxim de dos nombres.
+lenum.angle = Angle del vector en graus.
+lenum.anglediff = Distància absoluta entre dos angles en graus.
+lenum.len = Llargada (mòdul) del vector.
+
+lenum.sin = Sinus de l’angle (en graus).
+lenum.cos = Cosinus de l’angle (en graus).
+lenum.tan = Tangent de l’angle (en graus).
+
+lenum.asin = Arcsinus, en graus.
+lenum.acos = Arccosinus, en graus.
+lenum.atan = Arctangent, en graus.
+
+#not a typo, look up 'range notation'
+lenum.rand = Nombre decimal aleatori de l’interval [0, valor).
+lenum.log = Logaritme neperià (ln).
+lenum.log10 = Logaritme en base 10.
+lenum.noise = Soroll símplex 2D.
+lenum.abs = Valor absolut.
+lenum.sqrt = Arrel quadrada.
+
+lenum.any = Qualsevol unitat.
+lenum.ally = Unitat aliada.
+lenum.attacker = Unitat amb arma.
+lenum.enemy = Unitat enemiga.
+lenum.boss = Guardià (enemic final).
+lenum.flying = Unitat aèria.
+lenum.ground = Unitat terrestre.
+lenum.player = Unitat controlada per un jugador.
+
+lenum.ore = Dipòsit de minerals.
+lenum.damaged = Bloc aliat danyat.
+lenum.spawn = Punt d’aparició d’enemics.\nPot ser un nucli o una posició.
+lenum.building = Bloc d’una categoria específica.
+
+lenum.core = Qualsevol nucli.
+lenum.storage = Edifici d’emmagatzematge, com ara el [accent]contenidor gros[].
+lenum.generator = Edificis que generin energia elèctrica.
+lenum.factory = Edificis que transformen recursos.
+lenum.repair = Punts de reparació.
+lenum.battery = Bateries.
+lenum.resupply = Punts d’abastiment.\nNomés té rellevància quan s’activa la regla [accent]«Les unitats necessiten munició»[].
+lenum.reactor = Reactors d’impacte/tori.
+lenum.turret = Torretes.
+
+sensor.in = L’edifici/unitat a detectar.
+
+radar.from = Bloc a detectar.\nL’abast del sensor està limitat per l’abast de construcció.
+radar.target = Filtre de les unitats a detectar.
+radar.and = Filtres addicionals.
+radar.order = Criteri d’ordenació. 0 per a invertir-la.
+radar.sort = Mètrica per ordenar els resultats.
+radar.output = Variable en la qual escriure la unitat de sortida.
+
+unitradar.target = Filtre de les unitats a detectar.
+unitradar.and = Filtres addicionals.
+unitradar.order = Criteri d’ordenació. 0 per a invertir-la.
+unitradar.sort = Mètrica per ordenar els resultats.
+unitradar.output = Variable en la qual escriure la unitat de sortida.
+
+control.of = Bloc a controlar.
+control.unit = Unitat o bloc al qual apuntar.
+control.shoot = Controla quan s’ha de disparar.
+
+unitlocate.enemy = Indica si s’han de localitzar blocs enemics.
+unitlocate.found = Indica si s’ha trobat un objectiu.
+unitlocate.building = Variable de sortida per al bloc localitzat.
+unitlocate.outx = Coordenada X de la sortida.
+unitlocate.outy = Coordenada Y de la sortida.
+unitlocate.group = Categoria de blocs a buscar.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = La unitat no es mourà, però continuarà construint i extraient minerals.\nÉs l’estat per defecte.
+lenum.stop = Para de moure, construir o extreure minerals.
+lenum.unbind = Desactiva del tot el control lògic.\nContinua amb la IA estàndard.
+lenum.move = Mou a una posició exacta.
+lenum.approach = Aproxima a una zona determinada amb una posició i un radi.
+lenum.pathfind = Troba un camí i segueix una ruta fins al punt d’aparició d’enemics.
+lenum.autopathfind = Busca un camí automàticament fins al nucli enemic més proper o punt d’aterratge.\nÉs el mateix que el camí d'una onada enemiga estàndard.
+lenum.target = Dispara a una posició.
+lenum.targetp = Dispara a un objectiu tenint en compte la seva velocitat a l’hora d’apuntar.
+lenum.itemdrop = Deixa un element.
+lenum.itemtake = Agafa un element d’una estructura.
+lenum.paydrop = Deixa el bloc o unitat.
+lenum.paytake = Agafa un bloc o unitat a la posició actual.
+lenum.payenter = Entra o apareix al bloc on es troba la unitat.
+lenum.flag = Identificador numèric de la unitat.
+lenum.mine = Extreu recursos en una posició.
+lenum.build = Construeix una estructura.
+lenum.getblock = Obté el bloc, el seu tipus i el terra a les coordenades indicades.\nLa posició escollida ha d’estar a l’abast de la unitat; altrament es retornarà un valor buit.
+lenum.within = Comprova si la unitat està a prop d’una posició.
+lenum.boost = Inicia/Detén el vol.
+lenum.flushtext = Passa el contingut de la cua d’impressió al marcador, si es pot.\nSi s’estableix «fetch» a vertader, s’intentarà carregar les propietats de la traducció del mapa o del joc.
+lenum.texture = Nom de la textura directa de l’atles de textures del joc (amb l’estil de noms kebab-case).\nSi «printFlush» s’estableix a vertader, consumeix el contingut de la cua d’impressió com a argument de text.
+lenum.texturesize = Mida de la textura a les caselles. Un valor de zero indica que s’ha d'escalar l’amplada del marcador a la mida original de la textura.
+lenum.autoscale = Indica si cal escalar el marcador segons el nivell de zoom del jugador.
+lenum.posi = Posició indexada que es fa servir per a marcadors de línia i de rectangles on l’índex zero és la primera posició.
+lenum.uvi = Posició de la textura que va de zero a u i que es fa servir per a marcadors de tipus rectangle.
+lenum.colori = Posició indexada que es fa servir per a marcadors de línies i rectangles on l’índex zero és el primer color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 58942b40e3..4ad2941d20 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -7,21 +7,24 @@ link.reddit.description = Mindustry na Redditu
 link.github.description = Zdrojový kód hry
 link.changelog.description = Seznam úprav
 link.dev-builds.description = Nestabilní vývojová verze hry
-link.trello.description = Oficiální Trello nástěnka s plánovanými novinkami 
+link.trello.description = Oficiální Trello nástěnka s plánovanými novinkami
 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 = F-Droid
 link.wiki.description = Oficiální Wiki Mindustry
-link.suggestions.description = Suggest new features
+link.suggestions.description = Doporu�it nové funkce
+link.bug.description = Našel jsi nějaký? Nahlaš ho zde
+linkopen = Tento server vám poslal odkaz. Jste si jist s jeho otevřením?\n\n[sky]{0}
 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.
 gameover = Konec hry
+gameover.disconnect = Odpojit
 gameover.pvp = Vyhrál tým [accent]{0}[]!
+gameover.waiting = [accent]Čekám na novou mapu...
 highscore = [accent]Nový rekord!
 copied = Zkopírováno.
 indev.notready = Tato �ást hry ještě není připravena
-indev.campaign = [accent]Blahopřejeme! Završil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích.
 
 load.sound = Zvuky
 load.map = Mapy
@@ -38,9 +41,23 @@ be.ignore = Přesko�it verzi
 be.noupdates = Aktualizace nebyla nalezena.
 be.check = Zkontrolovat aktualizace
 
+mods.browser = Prohlíže� modifikací
+mods.browser.selected = Vybraný mod
+mods.browser.add = Stáhnout
+mods.browser.reinstall = Reinstalovat
+mods.browser.view-releases = Zobrazit Vydání
+mods.browser.noreleases = [scarlet]Žádné Vydání Nenalezeny\n[accent]Nenalezene žádné vydání pro tento mod. Check if the mod's repository has any releases published. Zjistěte, jestli repozitář modu má již veřejně vydán.
+mods.browser.latest = <Poslední>
+mods.browser.releases = Vydání
+mods.github.open = Úložiště
+mods.github.open-release = Stranka Vydání
+mods.browser.sortdate = Řadit podle nedavných
+mods.browser.sortstars = Řadit podle hvězd
+
 schematic = Å ablona
 schematic.add = Uložit šablonu...
 schematics = Å ablony
+schematic.search = Vyhledat Å¡ablonu...
 schematic.replace = Šablona s tímto názvem již existuje. Chceš ji nahradit?
 schematic.exists = Šablona s tímto názvem již existuje.
 schematic.import = Importuji Å¡ablonu...
@@ -53,19 +70,27 @@ schematic.shareworkshop = Sdílet skrze Workshop na Steamu
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Převrátit šablonu
 schematic.saved = Šablona byla uložena.
 schematic.delete.confirm = Å ablona bude kompletnÄ› vyhlazena.
-schematic.rename = Přejmenovat šablonu
+schematic.edit = Změnit šablonu
 schematic.info = {0}x{1}, {2} bloků
 schematic.disabled = [scarlet]Šablony jsou zakázány[]\nNa této [accent]mapě[] nebo [accent]serveru[] nemůžeš používat šablony.
+schematic.tags = Zna�ky:
+schematic.edittags = Upravit Zna�ky
+schematic.addtag = Přidat Zna�ku
+schematic.texttag = Textová Zna�ka
+schematic.icontag = Ikonová Zna�ka
+schematic.renametag = Přejmenovat Zna�ku
+schematic.tagged = {0} ozna�ené
+schematic.tagdelconfirm = Smazat tuto zna�ku?
+schematic.tagexists = Tato zna�ka již existuje.
 
 stats = Statistiky
-stat.wave = Vln poraženo: [accent]{0}
-stat.enemiesDestroyed = Nepřátel zni�eno: [accent]{0}[]
-stat.built = Budov postaveno: [accent]{0}[]
-stat.destroyed = Budov zni�eno: [accent]{0}[]
-stat.deconstructed = Budov rozebráno: [accent]{0}[]
-stat.delivered = Materiálu vysláno:
-stat.playtime = Odehraný �as: [accent]{0}[]
-stat.rank = Celková známka: [accent]{0}[]
+stats.wave = Poraženo Vln
+stats.unitsCreated = Jednotek Vytvořeno
+stats.enemiesDestroyed = Nepřátel Zni�eno
+stats.built = Budov Postaveno
+stats.destroyed = Budov Zni�eno
+stats.deconstructed = Budov Zdekonstruovano
+stats.playtime = Doba Hraní
 
 globalitems = [accent]Celkové položky[]
 map.delete = Jsi si jistý, že chceš smazat mapu "[accent]{0}[]"?
@@ -75,12 +100,15 @@ level.mode = Herní režim:
 coreattack = < Jádro je pod útokem! >
 nearpoint = [ [scarlet]IHNED OPUSŤTE PROSTOR V�SADKU[] ]\nNebezpe�í okamžité smrti!
 database = Katalog objektů
+database.button = Databáze
 savegame = Uložit hru
 loadgame = Na�íst hru
 joingame = Připojit se ke hře
 customgame = Vlastní hra
 newgame = Nová hra
 none = <žádný>
+none.found = [lightgray]<nic nenalezeno>
+none.inmap = [lightgray]<nic v mapÄ›>
 minimap = Mapi�ka
 position = Pozice
 close = Zavřít
@@ -101,24 +129,39 @@ committingchanges = Provádím změny
 done = Hotovo
 feature.unsupported = Tvoje zařízení nepodporuje tuto vlastnost hry.
 
-mods.alphainfo = Měj na paměti, že modifikace jsou stále v alfa fázi vývoje a mohou být [scarlet]velmi chybové[].\nNahlaš, prosím, jakékoliv závady na GitHub Mindustry. Děkujeme!
+mods.initfailed = [red]⚠[] Poslední Mindustry instaci se nepodařilo inicializovat. Nejpravděpodobněji to bylo způsobeno špatnou funkcí modifikací.\n\nK předcházení nekone�ného padání hry, [red]všechny modifikace se vyply.[]
 mods = Mody
 mods.none = [lightgray]Modifikace nebyly nalezeny.[]
 mods.guide = Průvodce modifikacemi
 mods.report = Nahlásit závadu
 mods.openfolder = Otevřít složku s modifikacemi
+mods.viewcontent = Zobrazit Obsah
 mods.reload = Znovu na�íst
 mods.reloadexit = Hra bude nyní ukon�ena, aby si znovu na�etla modifikace.
+mod.installed = [[Instalováno]
 mod.display = [gray]Modifikace:[][orange] {0}[]
 mod.enabled = [lightgray]Povoleno[]
 mod.disabled = [scarlet]Zakázáno[]
+mod.multiplayer.compatible = [gray]Hra více hrá�ů komapitibilní
 mod.disable = Zakázat
+mod.version = Version:
 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.incompatiblegame = [red]Zastaralá Hra
+mod.incompatiblemod = [red]Nekompatibilní
+mod.blacklisted = [red]Nepodporováno
+mod.unmetdependencies = [red]Nesplněné Dependencies
 mod.erroredcontent = [scarlet]V obsahu jsou chyby[]
+mod.circulardependencies = [red]Kruhové závislosti
+mod.incompletedependencies = [red]Nedokon�ené závislosti
+mod.requiresversion.details = Vyžaduje verzi hry: [accent]{0}[]\nVaše hra je zastaralá. Tento mod vyžaduje novější verzi hry (možná beta/alfa verze) aby fungoval.
+mod.outdatedv7.details = Tento mod není kompatibilní s nejnovější verzí hry. Autor ho musí aktualizovat a přidat [accent]minGameVersion: 136[] ho do [accent]mod.json[] složky.
+mod.blacklisted.details = Tento mod byl ru�ně zařazen na �ernou listinu, protože způsobuje pády nebo jiné problémy s touto verzí hry. Nepoužívejte jej.
+mod.missingdependencies.details = Tomuto módu chybí závislosti: {0}
+mod.erroredcontent.details = Tato hra způsobovala chyby při na�ítání. Požádejte autora módu o jejich opravu.
+mod.circulardependencies.details = Tento mod má závislosti, které na sobě navzájem závisí.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Vyžaduje verzi hry: [red]{0}
 mod.errors = Při na�ítání obsahu hry se vyskytly problémy.
 mod.noerrorplay = [scarlet]Máš modifikace s chybami.[] Bu� zakaž dot�ené modifikace, nebo oprav chyby před tím, než za�neš hrát.
 mod.nowdisabled = [scarlet]Modifikaci '{0}' chybí tyto závislosti: [accent]{1}\n[lightgray]Tyto modifikace je třeba nejprve stáhnout.\nTato modifikace bude nyní automaticky zakázána.
@@ -140,14 +183,24 @@ 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[].
+search = Search:
 planetmap = Planetární mapa
 launchcore = Vyslat jádro
 filename = Název souboru:
 unlocked = Byl odemmknut nový blok!
 available = Je zpřístupněn nový výzkum!
+unlock.incampaign = < Odemkni v kampani pro více detailů >
+campaign.select = Vybrat Za�ínající Kampaň
+campaign.none = [lightgray]Vyberte planetu, na které chcete za�ít.\nToto lze kdykoli přepnout.
+campaign.erekir = Novější, uhlazenější obsah. Většinou lineární průběh kampaně.\n\nVyšší kvalita map a celkový zážitek.
+campaign.serpulo = Starší obsah; klasický zážitek. Více otevřených.\n\nPotenciálně nevyvážené mapy a mechanismy kampaní. Méně leštěné.
+campaign.difficulty = Difficulty
+
 completed = [accent]Dokon�eno[]
 techtree = Technologie
-research.legacy = Nalezena výzkumná data z verze [accent]5.0[].\nChceš [accent]tato data na�íst[], nebo [accent]je zahodit[] a za�ít výzkum v nové kampani (což doporu�ujeme)?
+techtree.select = Výběr Výzkumného Stromu
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Na�íst
 research.discard = Zahodit
 research.list = [lightgray]Výzkum:[]
@@ -191,20 +244,33 @@ hosts.none = [lightgray]Žádné místní hry nebyly nalezeny![]
 host.invalid = [scarlet]Nejde se připojit k hostiteli.[]
 
 servers.local = Místní servery
+servers.local.steam = Otevřít Hry a Lokální Servery
 servers.remote = Vzdálené servery
 servers.global = Komunitní servery
 
+servers.disclaimer = Komunitní servery [accent]nejsou[] vlastněny ani kontrolovány vývojářem této hry.\n\nServery mohou obsahovat obsah vytvořený uživateli, který může na některé uživatele působit nepatři�ně �i nevhodně.
 servers.showhidden = Zobraz skryté servery
 server.shown = Zobrazené
 server.hidden = Skryté
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Vystopovat hrá�e
 trace.playername = Jméno hrá�e: [accent]{0}[]
 trace.ip = Adresa IP: [accent]{0}[]
 trace.id = Unikátní ID: [accent]{0}[]
+trace.language = Jazyk: [accent]{0}
 trace.mobile = Mobilní klient hry: [accent]{0}[]
 trace.modclient = Upravený klient hry: [accent]{0}[]
+trace.times.joined = Krát Připojen: [accent]{0}
+trace.times.kicked = Krát Vyhozen: [accent]{0}
+trace.ips = IPs:
+trace.names = Jména:
 invalidid = Neplatná adresa IP klienta! Zašli prosím zprávu o chybě.
+player.ban = Ban
+player.kick = Vyhodit
+player.trace = Trace
+player.admin = Přepínání správce
+player.team = Změnit tým
 server.bans = Zákazy
 server.bans.none = Žádní hrá�i se zákazem nebyli nalezeni.
 server.admins = Správci
@@ -218,10 +284,11 @@ server.version = [gray]Verze: {0} {1}[]
 server.custombuild = [accent]Upravená verze hry[]
 confirmban = Jsi si jistý, že chceš zakázat hrá�e "{0}[white]"?[]
 confirmkick = Jsi si jistý, že chceš vykopnout hrá�e "{0}[white]"?[]
-confirmvotekick = Jsi si jistý, že chceš hlasovat pro vykopnutí hrá�e "{0}[white]"?[]
 confirmunban = Jsi si jistý, že chceš zrušit zákaz pro tohoto hrá�e?
 confirmadmin = Jsi si jistý, že chceš hrá�e "{0}[white]" povýšit na správce?[]
 confirmunadmin = Jsi si jistý, že chceš odebrat hrá�i "{0}[white]" roli správce?[]
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Jste si jisti, že chcete hlasovat? "{0}[white]"?\nPokud ano, uve�te důvod:
 joingame.title = Připojit se ke hře
 joingame.ip = Adresa IP:
 disconnect = Odpojeno.
@@ -229,16 +296,18 @@ disconnect.error = Chyba připojení.
 disconnect.closed = Připojení bylo uzavřeno.
 disconnect.timeout = Vypršel �as pro připojení.
 disconnect.data = Chyba na�tení dat ze serveru!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Není možno se připojit ke hře ([accent]{0}[]).
 connecting = [accent]Připojuji se...[]
 reconnecting = [accent]Znovu se připojuji...
 connecting.data = [accent]Na�ítám data ze serveru...[]
 server.port = Port:
-server.addressinuse = Adresu již někdo používá!
 server.invalidport = Neplatné �íslo portu!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 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?
+save.nocampaign = Jednotlivé uložené soubory z kampaně nelze importovat.
 overwrite = Přepsat
 save.none = Žádné uložené pozice nebyly nalezeny.
 savefail = Nepodařilo se uložit hru!
@@ -259,6 +328,7 @@ save.corrupted = Uložení je poškozené nebo neplatné.
 empty = <Prázný>
 on = On
 off = Off
+save.search = Hledat uložené hry...
 save.autosave = Automatické uložení: {0}
 save.map = Mapa: {0}
 save.wave = Vlna: {0}
@@ -274,9 +344,31 @@ ok = OK
 open = Otevřít
 customize = Přizpůsobit pravidla
 cancel = Zrušit
+command = Velet
+command.queue = Queue
+command.mine = Těžit
+command.repair = Opravovat
+command.rebuild = Přestavět
+command.assist = Asistovat hrá�i
+command.move = Pohyb
+command.boost = Posílení
+command.enterPayload = Zadejte blok užite�ného zatížení
+command.loadUnits = Nahrát jednotky
+command.loadBlocks = Nahrát bloky
+command.unloadPayload = Vyložit blok užite�ného zatížení
+command.loopPayload = Loop Unit Transfer
+stance.stop = Zrušit příkaz
+stance.shoot = Postoj: Střílejte
+stance.holdfire = Postoj: Přestaň střílet
+stance.pursuetarget = Postoj: Sleduj cíl
+stance.patrol = Postoj: Hlídej
+stance.ram = Postoj: Ram\n[lightgray]Přímý pohyb, žádné hledání cesty
+
 openlink = Otevřít odkaz
 copylink = Zkopírovat odkaz
 back = Zpět
+max = Max
+objective = Úkol mapy
 crash.export = Exportovat záznamy o zhroucení hry
 crash.none = Záznamy o zhroucení hry nebyly nalezeny.
 crash.exported = Záznamy o zhroucení hry byly exportovány.
@@ -287,16 +379,18 @@ data.exported = Data byla exportována.
 data.invalid = Herní data nejsou v pořádku.
 data.import.confirm = Import externích dat smaže [scarlet]všechna[] Tvá sou�asná herní data.\n[accent]Toto nelze vrátit zpět![]\n\nPo importu dat se hra bezprostředně sama ukon�í.
 quit.confirm = Jsi si jistý, že chceš ukon�it hru?
-quit.confirm.tutorial = Jsi si jistý?Výuku je možné znovu spustit v [accent]Volby->Hra->Spustit znovu výuku[].
 loading = [accent]Na�ítám...
-reloading = [accent]Na�ítám modifikace...
+downloading = [accent]Stahuju...
 saving = [accent]Ukládám...
 respawn = [accent][[{0}][] k znovuzrození v jádře
 cancelbuilding = [accent][[{0}][] vy�istí plán šablony
 selectschematic = [accent][[{0}][] provede výběr a zkopírování
 pausebuilding = [accent][[{0}][] zastaví stavění
 resumebuilding = [scarlet][[{0}][] bude pokra�ovat ve stavění
+enablebuilding = [scarlet][[{0}][] povolí stavení
 showui = UI je skryto.\nZmá�kni [accent][[{0}][] pro jeho zobrazení.
+commandmode.name = [accent]Velící zežim
+commandmode.nounits = [no units]
 wave = [accent]Vlna �íslo {0}[]
 wave.cap = [accent]Vlna {0} z {1}[]
 wave.waiting = [lightgray]Vlna za {0} vteřin[]
@@ -306,7 +400,7 @@ waiting.players = Čekání na hrá�e...
 wave.enemies = [lightgray]{0} zbývajících nepřátel
 wave.enemycores = [accent]{0}[lightgray] nepřátelská jádra
 wave.enemycore = [accent]{0}[lightgray] nepřátelské jádro
-wave.enemy = [lightgray]{0} zbývající nepřátel
+wave.enemy = [lightgray]{0} zbývající nepřítel
 wave.guardianwarn = Po�et vln do příchodu strážce: [accent]{0}[].
 wave.guardianwarn.one = [accent]Strážce přijde již příští vlnu![]
 loadimage = Nahrát obrázek
@@ -316,23 +410,28 @@ custom = Upraveno
 builtin = Vestavěno
 map.delete.confirm = Jsi si jistý, že chceš tuto mapu smazat? Tato akce je nevratná!
 map.random = [accent]Náhodná mapa[]
-map.nospawn = Na této mapě nejsou jádra, u kterých by se mohli zrodit hrá�i. Přidej v editoru do této mapy aspoň jedno [accent]oranžové[] jádro.
+map.nospawn = Na této mapě nejsou jádra, u kterých by se mohli zrodit hrá�i. Přidej v editoru do této mapy aspoň jedno {0} jádro.
 map.nospawn.pvp = Tato mapa nemá nepřátelská jádra, u kterých by se mohli zrodit hrá�i. Přidej v editoru do této mapy aspoň jedno [scarlet]neoranžové[] jádro.
-map.nospawn.attack = Tato mapa nemá nepřátelská jádra, která by mohla být zni�ena. Přidej v editoru do této mapy aspoň jedno [scarlet]�ervené[] jádro.
+map.nospawn.attack = Tato mapa nemá nepřátelská jádra, která by mohla být zni�ena. Přidej v editoru do této mapy aspoň jedno {0} jádro.
 map.invalid = Chyba v na�ítání mapy: poškozený nebo neplatný soubor mapy.
 workshop.update = Aktualizovat položku
 workshop.error = Chyba při na�ítání podrobností z Workshopu na Steamu: {0}
-map.publish.confirm = Jsi si jistý, že chceš vystavit tuto mapu?\n\n[lightgray]Ujisti se nejprve, že souhlasíš se smluvními podmínkami Workshopu na Steamu (EULA), jinak se Tvoje mapa nezobrazí.[]
+map.publish.confirm = Jsi si jistý, že chceš publikovat tuto mapu?\n\n[lightgray]Ujisti se nejprve, že souhlasíš se smluvními podmínkami Workshopu na Steamu (EULA), jinak se Tvoje mapa nezobrazí.[]
 workshop.menu = Vyber si, co bys chtěl dělat s touto položkou.
 workshop.info = Informace o položce
 changelog = Seznam změn (volitelně):
+updatedesc = Přepsat Nadpis a Popis
 eula = Smluvní podmínky platformy Steam
 missing = Tato položka byla smazána nebo přesunuta.\n[lightgray]Položka bude automaticky odebrána ze seznamu Workshopu na Steamu.
 publishing = [accent]Publikuji...
-publish.confirm = Opravdu chceš toto vystavit?\n\n[lightgray]Ujisti se nejprve, že souhlasíš se smluvními podmínkami Workshopu na Steamu (EULA), jinak se Tvoje položky nezobrazí.[]
-publish.error = Chyba při vystavování položky: {0}
-steam.error = Nepodařilo se inicializovat služby platformy Steam.Chyba: {0}
+publish.confirm = Opravdu chceš toto publikovat?\n\n[lightgray]Ujisti se nejprve, že souhlasíš se smluvními podmínkami Workshopu na Steamu (EULA), jinak se Tvoje položky nezobrazí.[]
+publish.error = Chyba při publikování položky: {0}
+steam.error = Nepodařilo se inicializovat služby platformy Steam. Chyba: {0}
+editor.planet = Planeta:
+editor.sector = Sektor:
+editor.seed = Seed:
 
+editor.cliffs = Zdi Na Útesy
 editor.brush = Štětec
 editor.openin = Otevřít v editoru
 editor.oregen = Generování rud
@@ -340,63 +439,106 @@ editor.oregen.info = Generování rud:
 editor.mapinfo = Informace o mapÄ›
 editor.author = Autor:
 editor.description = Popis:
-editor.nodescription = Než může být mapa publikována, musí mít popisek dlouhý nejméně 4 znaky.
+editor.nodescription = Než může být mapa publikována, musí mít popis dlouhý nejméně 4 znaky.
 editor.waves = Vln:
 editor.rules = Pravidla:
 editor.generation = Generace:
+editor.objectives = Úkoly:
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Upravit ve hře
-editor.publish.workshop = Vystavit ve Workshopu na Steamu
+editor.playtest = Playtest
+editor.publish.workshop = Publikovat do Workshopu na Steamu
 editor.newmap = Nová mapa
 editor.center = Vycentrovat
+editor.search = Hledat mapy...
+editor.filters = Filtrovat Mapy
+editor.filters.mode = Herní režimy:
+editor.filters.type = Typ Mapy:
+editor.filters.search = Hledat V:
+editor.filters.author = Autor
+editor.filters.description = Popis
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop na Steamu
 waves.title = Vlny
 waves.remove = Odebrat
-waves.never = <Nikdy>
 waves.every = každých
 waves.waves = vln(y)
+waves.health = životy: {0}%
 waves.perspawn = za zrození
 waves.shields = štítů/vlnu
 waves.to = do
+waves.spawn = zrození:
+waves.spawn.all = <all>
+waves.spawn.select = Výběr Zrození
+waves.spawn.none = [scarlet]žádné zrození nebyly nalezeny na mapě
+waves.max = max jednotek
 waves.guardian = Strážce
 waves.preview = Náhled
 waves.edit = Upravit....
+waves.random = Náhodně
 waves.copy = Uložit do schránky
 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í.
+waves.sort = Řadit podle
+waves.sort.reverse = Obrátit řazení
+waves.sort.begin = Za�ít
+waves.sort.health = Životy
+waves.sort.type = Typ
+waves.search = Hledat vlny...
+waves.filter = Unit Filter
+waves.units.hide = Schovat vše
+waves.units.show = Zobrazit vše
 
 #toto je záměrně malými písmeny
 wavemode.counts = po�ty
 wavemode.totals = sou�ty
 wavemode.health = zdraví
+all = All
 
 editor.default = [lightgray]<Výchozí>[]
 details = Podrobnosti...
 edit = Upravit...
+variables = Hodnoty
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Vestavěné proměnné
+
 editor.name = Jméno:
 editor.spawn = Zrodit jednotku
 editor.removeunit = Odstranit jednotku
 editor.teams = Týmy
 editor.errorload = Chyba při na�ítání souboru.
 editor.errorsave = Chyba při ukládání souboru.
-editor.errorimage = Toto je obrázek, ne mapa.\nPokud chceš importovat mapu z verze 3.5/sestavení 40, použij položku nabídky 'Importovat starou mapu'. 
+editor.errorimage = Toto je obrázek, ne mapa.\nPokud chceš importovat mapu z verze 3.5/sestavení 40, použij položku nabídky 'Importovat starou mapu'.
 editor.errorlegacy = Tato mapa je příliš stará a používá formát mapy, který už není podporován.
 editor.errornot = Toto není soubor mapy.
 editor.errorheader = Tento soubor mapy je bu� neplatný nebo poškozen.
 editor.errorname = Mapa nemá definované jméno. Nesnažíš se náhodou nahrát soubor s uložením hry?
+editor.errorlocales = Chyba při �tení neplatných balí�ků národního prostředí.
 editor.update = Aktualizovat
 editor.randomize = Náhodně vygenerovat
+editor.moveup = Pohyb Nahoru
+editor.movedown = Pohyb Dolu
+editor.copy = Kopírovat
 editor.apply = Aplikovat
 editor.generate = Generovat
+editor.sectorgenerate = Generovat Sektor
 editor.resize = Změnit velikost
 editor.loadmap = Na�íst mapu
 editor.savemap = Uložit mapu
+editor.savechanges = [scarlet]Máte neuložené změny!\n\n[]Chcete je uložit?
 editor.saved = Uloženo!
 editor.save.noname = Tvoje mapa nemá jméno! Jméno nastavíš v položce nabídky "Informace o mapě".
 editor.save.overwrite = Tvoje mapa přepisuje vestavěnou mapu! Nastav jí radši jiné jméno v položce nabídky "Informace o mapě".
 editor.import.exists = [scarlet]Není možno importovat:[] existuje vestavěná mapa se stejným jménem '{0}'!
-editor.import = Import...
+editor.import = Importovat...
 editor.importmap = Importovat mapu
 editor.importmap.description = Importovat již existující mapu
 editor.importfile = Importovat soubor
@@ -430,8 +572,12 @@ toolmode.eraseores = Mazat rudy
 toolmode.eraseores.description = Maže jen rudy.
 toolmode.fillteams = Doplnit týmy
 toolmode.fillteams.description = Doplní týmy místo bloků.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Vymažte bloky stejného typu.
 toolmode.drawteams = Kreslit týmy
 toolmode.drawteams.description = Kreslí týmy místo bloků.
+toolmode.underliquid = Pod Kapalinami
+toolmode.underliquid.description = Kreslí podlahy pod kostkama kapalin.
 
 filters.empty = [lightgray]Nejsou zadány žádné filtry, přidej filtr tla�ítkem níže.[]
 filter.distort = Zkreslení
@@ -450,6 +596,8 @@ filter.clear = Vy�istit
 filter.option.ignore = Ignorovat
 filter.scatter = Rozptýlení
 filter.terrain = Terén
+filter.logic = Logic
+
 filter.option.scale = Měřítko
 filter.option.chance = Náhoda
 filter.option.mag = Velikost
@@ -458,17 +606,39 @@ filter.option.circle-scale = Poloměr kružnice
 filter.option.octaves = Octávy
 filter.option.falloff = Pokles
 filter.option.angle = Úhel
-filter.option.amount = Amount
+filter.option.tilt = Naklonit
+filter.option.rotate = Oto�it
+filter.option.amount = Po�et
 filter.option.block = Blok
 filter.option.floor = Povrch
 filter.option.flooronto = Cílový povrch
 filter.option.target = Cíl
+filter.option.replacement = Výměna
 filter.option.wall = Stěna
 filter.option.ore = Ruda
 filter.option.floor2 = Druhotný  povrch
 filter.option.threshold2 = Druhotný práh
 filter.option.radius = Poloměr
 filter.option.percentile = Percentil
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Zde můžete do mapy přidat balí�ky národního prostředí pro konkrétní jazyky. V balí�cích národního prostředí má každá vlastnost název a hodnotu. Tyto vlastnosti mohou využívat světoví zpracovatelé a cíle pomocí svých jmen. Podporují formátování textu (nahrazení zástupných symbolů skute�nými hodnotami).\n\n[cyan]Příklad vlastnosti:\n[]název: [accent]timer[]\nvalue: [accent]Příklad �asova�e, zbývající �as: @[]\n\n[cyan]Usage:\n[]Nastavte jej jako text cíle: [accent]@timer\n\n[]Vytiskněte si to ve světovém procesoru:\n[accent]localeprint "timer"\nformat time\n[gray](kde �as je samostatně vypo�ítaná proměnná)
+locales.deletelocale = Opravdu chcete smazat tento balí�ek národního prostředí?
+locales.applytoall = Použít změny na všechna národní prostředí
+locales.addtoother = Přidat do jiných lokalit
+locales.rollback = Vrátit se k poslední aplikaci
+locales.filter = Filtr vlastností
+locales.searchname = Hledat jméno...
+locales.searchvalue = Hledat hodnotu...
+locales.searchlocale = Vyhledat národní prostředí...
+locales.byname = Podle jména
+locales.byvalue = Podle hodnoty
+locales.showcorrect = Zobrazit vlastnosti, které jsou přítomné ve všech národních prostředích a mají všude jedine�né hodnoty
+locales.showmissing = Zobrazit vlastnosti, které v některých národních prostředích chybí
+locales.showsame = Zobrazit vlastnosti, které mají stejné hodnoty v různých národních prostředích
+locales.viewproperty = Zobrazit ve všech lokalitách
+locales.viewing = Prohlížení nemovitosti "{0}"
+locales.addicon = Přidat ikonu
 
 width = Šířka:
 height = Výška:
@@ -479,6 +649,7 @@ load = Na�íst
 save = Uložit
 fps = FPS: {0}
 ping = Odezva: {0} ms
+tps = TPS: {0}
 memory = Paměť: {0} MB
 memory2 = Paměť:\n {0} MB +\n {1} MB
 language.restart = Hru je třeba restartovat, aby se provedla změna jazyka.
@@ -497,21 +668,70 @@ requirement.core = Zni� nepřátelské jádro na mapě {0}
 requirement.research = Vynalezni {0}
 requirement.produce = Vyrob {0}
 requirement.capture = Polap {0}
+requirement.onplanet = Kontrolovat Sektor na {0}
+requirement.onsector = Přistát na Sektor: {0}
 launch.text = Vyslat
-research.multiplayer = Jen hostitel hry může vynalézat nové technologie.
 map.multiplayer = Jen hostitel může prohlížet sektory.
 uncover = Odkrýt mapu
 configure = Přizpůsobit vybavení
+objective.research.name = Výzkum
+objective.produce.name = Získat
+objective.item.name = Získat Věc
+objective.coreitem.name = Jádrova Věc
+objective.buildcount.name = Po�et Budov
+objective.unitcount.name = Po�et Jednotek
+objective.destroyunits.name = Zni� Jednotky
+objective.timer.name = Časova�
+objective.destroyblock.name = Zni�it Kostku
+objective.destroyblocks.name = Zni�it Kostky
+objective.destroycore.name = Zni�it Jádro
+objective.commandmode.name = Příkazovy Režim
+objective.flag.name = Vlajka
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Tvar
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Pozadí
+marker.outline = Outline
+objective.research = [accent]Výzkum:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Zisk:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Zni�ení:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Zni�ení: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Zisk: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Obsah Jádra:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Postaveno: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Vytvořeno jednotek: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Zni�eno: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Nepřátelé se blíží [lightgray]{0}[]
+objective.enemyescelating = [accent]Produkce nepřátel eskaluje [lightgray]{0}[]
+objective.enemyairunits = [accent]Za�átek výroby nepřátelských leteckých jednotek [lightgray]{0}[]
+objective.destroycore = [accent]Zni� nepřátelské Jádro
+objective.command = [accent]Velitelské jednotky
+objective.nuclearlaunch = [accent]⚠ Zjištěna nukleární bomba: [lightgray]{0}
+announce.nuclearstrike = [red]⚠ JADERN� ÚDER ⚠
 
 loadout = Na�tení
-resources = Zdroje 
+resources = Zdroje
+resources.max = Max
 bannedblocks = Zakázané bloky
+unbannedblocks = Unbanned Blocks
+objectives = Úkoly
+bannedunits = Zakázané jednotky
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Zakázané jednotky jako Whitelist
+bannedblocks.whitelist = Zakázané bloky jako Whitelist
 addall = Přidat vše
 launch.from = Vysláno z: [accent]{0}
+launch.capacity = Odpalovací kapacita: [accent]{0}
 launch.destination = Cíl: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Hodnota musí být �íslo mezi 0 a {0}.
 add = Přidat...
-boss.health = Životy Strážce
+guardian = Strážce
 
 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)?
@@ -523,17 +743,23 @@ error.mapnotfound = Soubor s mapou nebyl nalezen!
 error.io = Vstupně/výstupní (I/O) chyba sítě.
 error.any = Neznámá chyba sítě.
 error.bloom = Chyba inicializace filtru Bloom.\nTvé zařízení ho nejspíš nepodporuje.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Déšť
-weather.snow.name = Sníh
+weather.snowing.name = Sníh
 weather.sandstorm.name = Píse�ná ouře
 weather.sporestorm.name = Spórová bouře
 weather.fog.name = Mlha
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Nastavení.\n\nNepřítel na {0} byl poražen.\n[lightgray]Poslední sektor byl dobyt.
+sectorlist = Sektory
+sectorlist.attacked = {0} pod útokem
 
 sectors.unexplored = [lightgray]Neprozkoumáno
 sectors.resources = Zdroje:
 sectors.production = Výroba:
-sectors.export = Export:
+sectors.export = Exportovat:
+sectors.import = Importovat:
 sectors.time = ÄŒas:
 sectors.threat = Ohrožení:
 sectors.wave = Vlna:
@@ -541,30 +767,45 @@ sectors.stored = Uskladněno:
 sectors.resume = Pokra�ovat
 sectors.launch = Vyslat
 sectors.select = Vybrat
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]bez (slunce)[]
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Přejmenovat sektor
 sectors.enemybase = [scarlet]Nepřátelská základna
 sectors.vulnerable = [scarlet]Zranitelný
 sectors.underattack = [scarlet]Pod palbou! [accent]{0}% poškozeno
+sectors.underattack.nodamage = [scarlet]Neobsazen
 sectors.survives = [accent]Přežívá již {0} vln
 sectors.go = Jdi
+sector.abandon = Opustit
+sector.abandon.confirm = Jádro(a) tohoto sektoru se zni�í.\nPokra�ovat?
 sector.curcapture = Sektor polapen
 sector.curlost = Sektor ztracen
 sector.missingresources = [scarlet]Nedostate�né zdroje v jádře
 sector.attacked = Sektor [accent]{0}[white] pod útokem!
 sector.lost = Sektor [accent]{0}[white] ztracen! :(
-#note: chybějící mezera v řádce níže je záměrná :)
-sector.captured = Sektor [accent]{0}[white]polapen! :)
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Změnit Ikonu
+sector.noswitch.title = Nelze Vyměnit Sektor
+sector.noswitch = Sektory nelze přepnut, pokud je stávající sektor pod útokem.\n\nSektor: [accent]{0}[] na [accent]{1}[]
+sector.view = Prohlédnout Sektor
 
 threat.low = Nízké
 threat.medium = Střední
 threat.high = Velké
 threat.extreme = Extrémní
 threat.eradication = Vyhlazující
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
-planets = Planets
+planets = Planety
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sol
 
 sector.impact0078.name = Dopad 0078
@@ -582,7 +823,19 @@ sector.fungalPass.name = Plísňový průsmyk
 sector.biomassFacility.name = Zařízení pro syntézu biomasy
 sector.windsweptIslands.name = Větrné ostrovy
 sector.extractionOutpost.name = Extrak�ní základna
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Planetární odpalovací terminál
+sector.coastline.name = Pobřežní �ára
+sector.navalFortress.name = Námořní pevnost
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -592,14 +845,79 @@ sector.ruinousShores.description = Za pustinou se nachází pobřeží. Kdysi zd
 sector.stainedMountains.description = Dále ve vnitrozemí leží hory, dosud neposkvrněny spórami.\nVytěž titan, kterým tato oblast oplývá. Nau� se jej používat.\n\nPřítomnost nepřátelských jednotek je zde větší. Radši jim nedej moc �asu na vyslání jejich nejsilnějších jednotech.
 sector.overgrowth.description = Tato přerostlá džungle se nachází blíže ke zdroji spór.\nNepřítel zde zbudoval předsunutou hlídku. Stav jednotky Palcát a zni� s jejich pomocí jádro základny.
 sector.tarFields.description = Rozhraní produk�ní naftové oblasti mezi horami a pouští. Jedna z mála oblastí, kde se stále nachází dehet.\nA�koliv je oblast opuštěná, stále se v jejím okolí nachází nebezpe�né nepřátelské síly. Není radno je podcenit.\n\n[lightgray]Vyzkoumej technologii na zpracování nafty.[]
-sector.desolateRift.description = Extrémně nebezpe�ná mapa. Na úkor prostoru se zde nachází přehršel surovin. Vysoká pravděpodobnost zni�ení. Opusť tuto oblast co nejdříve to půjde. Nenech se zmást dlouhými prodlevami mezi vlnami nepřátel.
+sector.desolateRift.description = Extrémně nebezpe�ná mapa. Na úkor prostoru se zde nachází přehršel surovin. Vysoká pravděpodobnost zni�ení. Postav vzdušnou a pozemní obranu co nejdříve to půjde. Nenech se zmást dlouhými prodlevami mezi vlnami nepřátel.
 sector.nuclearComplex.description = Bývalá továrna na zpracování thoria, dnes v troskách.\n[lightgray]Objev thorium a jeho široké využití.[]\n\nNepřátelské jednotky se zde nacházejí v hojném po�tu, a neustále prohledávají oblast.
 sector.fungalPass.description = Přechodová oblast mezi vysokými horami a spórami nasycenou zemí. Nachází se zde malá průzkumná základna Tvého nepřítele.\nZni� ji.\nPoužij mechy Dýka a Slídil. Zni� obě nepřátelské jádra.
 sector.biomassFacility.description = Prapůvod všech spór. Toto je zařízení, be kterém byly spóry vynalezeny a zpo�átku u vyráběny.\nVynalezni technologii, která se skrýbá uvnitř. Kultivuj spóry k výrobě paliva a plastů.\n\n[lightgray]Po vypnutí tohoto zařízení byly spóry vypuštěny. V okolním ekosystému však tomuto invazivnímu druhu nebylo nic schopné konkurovat.
 sector.windsweptIslands.description = Vzdálen od pevniny je tento řetízek ostrovů. Záznamy ukazují, že zde kdysi byly zařízení na výrobu [accent]Plastany[].\n\nPoraž nepřátelské námořní jednotky. Vybuduj základnu na ostrově. Vynalezni továrny.
 sector.extractionOutpost.description = Vzdálená pevnost, postavená nepřítelem za ú�elem vysílání zdrojů do okolních sektorů.\n\nDoprava položek napří� sektory je nezbytná pro lapení dalších sektorů. Zni� základnu. Vyzkoumej jejich Vysílací plošiny.
-sector.impact0078.description = Zde leží zbytky mezihvězdné lodi, která vstoupila d otohoto systému.\n\nZachraň z vraku vše, co se dá. Vyzkoumej nepoškozenou technologii.
+sector.impact0078.description = Zde leží zbytky mezihvězdné lodi, která vstoupila do tohoto systému.\n\nZachraň z vraku vše, co se dá. Vyzkoumej nepoškozenou technologii.
 sector.planetaryTerminal.description = Kone�ný cíl.\n\nTato pobřežní základna obsahuje konstrukce schopné vyslat jádra na okolní planety. Je mimořádně dobře opevněna.\n\nVyrob námořní jednotky. Odstraň nepřítele tak rychle, jak umíš. Vyzkoumej vysílací konstrukci.
+sector.coastline.description = V této lokaci byly objeveny pozůstatky techniky námořních jednotek. Odražte nepřátelské útoky, dobijte tento sektor a získejte technologii.
+sector.navalFortress.description = Nepřítel si vybudoval základnu na odlehlém, přírodou opevněném ostrově. Zni�te tuto základnu. Získejte jejich pokro�ilou technologii námořních plavidel a vyzkoumejte ji.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = Nástup
+sector.aegis.name = Aegis
+sector.lake.name = Jezero
+sector.intersect.name = Průse�ík
+sector.atlas.name = Atlas
+sector.split.name = Rozdělení
+sector.basin.name = Povodí
+sector.marsh.name = Marš
+sector.peaks.name = Vrcholy
+sector.ravine.name = Rokle
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Pevnost
+sector.crevice.name = Štěrbina
+sector.siege.name = Obléhání
+sector.crossroads.name = Křižovatka
+sector.karst.name = Kras
+sector.origin.name = Původ
+sector.onset.description = Zahajte dobývání Erekiru. Shromážděte zdroje, vyrobte jednotky a za�něte zkoumat technologie.
+
+sector.aegis.description = Tento sektor obsahuje ložiska wolframu.\nVyzkoumej [accent]Nárazový vrták[] k vytěžení této suroviny, a zni� nepřátelskou základnu.
+sector.lake.description = Struskové jezero v tomto sektoru zna�ně omezuje použitelné jednotky. Jedinou možností je vznášecí jednotka.\nVyzkoumej [accent]továrna na výrobu lodí[] a vyrob [accent]elude[] jednotku co nejdříve
+sector.intersect.description = Podle průzkumů bude tento sektor brzy po přistání napaden z více stran.\nRychle vytvořte obranu a co nejdříve expandujte.\n[accent]Mech[] jednotky budou zapotřebí pro překro�ení teréu v oblasti.
+sector.atlas.description = Tento sektor obsahuje rozmanitý terén a pro efektivní útok bude vyžadovat různé jednotky.\nPro překonání některých těžších nepřátelských základen zde mohou být nutné i vylepšené jednotky.\nVyzkoumej [accent]Electrolyzér[] a [accent]Přestavova� tanků[].
+sector.split.description = Minimální přítomnost nepřátel v tomto sektoru je ideální pro testování nových dopravních technologií.
+sector.basin.description = V tomto sektoru byla zjištěna velká přítomnost nepřátel.\nRychle postavte jednotky a získejte nepřátelská jádra, abyste se prosadili.
+sector.marsh.description = Tento sektor má hojnost arkycitu, ale má omezené průduchy.\nPostav [accent]Chemické spalovací komory[] k výrobě energie.
+sector.peaks.description = Hornatý terén v tomto sektoru �iní většinu jednotek nepoužitelnými. Bude zapotřebí létajících jednotek.\nDejte si pozor na nepřátelská protiletecká zařízení. Některá z těchto zařízení je možné vyřadit zaměřením jejich podpůrných budov.
+sector.ravine.description = V sektoru nebyla zjištěna žádná nepřátelská jádra, a�koli se jedná o důležitou dopravní trasu pro nepřítele. O�ekávejte rozmanitost nepřátelských sil.\nVyrob [accent]rázová slitina[]. Postav [accent]Aflict[] věže.
+sector.caldera-erekir.description = Zdroje zjištěné v tomto sektoru jsou rozptýleny na několika ostrovech. \nVyzkoumejte a nasa�te dopravu pomocí dronů.
+sector.stronghold.description = Rozsáhlé nepřátelské ležení v tomto sektoru střeží významná ložiska [accent]thoria[].\nPoužijte ho na vývoj jednotek a věží vyšší úrovně.
+sector.crevice.description = Nepřítel vyšle ostré úto�né síly, aby zni�ily vaši základnu v tomto sektoru.\nVývoj [accent]karbid[] a [accent]Pyrolytický generátor[] může být nezbytný pro přežití.
+sector.siege.description = V tomto sektoru se nacházejí dva paralelní kaňony, které si vynutí útok dvěma směry.\nVyzkoumej [accent]kyan[] pro získání schopnosti vytvářet ještě silnější tankové jednotky.\nPozor: byly detekovány nepřátelské rakety dlouhého doletu. Rakety mohou být sestřeleny před dopadem.
+sector.crossroads.description = Nepřátelské základny v tomto sektoru jsou rozmístěny v různém terénu. Výzkumem různých jednotek se jim přizpůsobíte.\nNěkteré základny jsou navíc chráněny štíty. Zjistěte, jak jsou napájeny.
+sector.karst.description = Tento sektor je bohatý na zdroje, ale jakmile se zde objeví nové jádro, bude napaden nepřítelem.\nVyužijte zdroje a vyzkoumej [accent]fázová tkanina[].
+sector.origin.description = Poslední sektor s výrazným výskytem nepřátel.\nŽádné pravděpodobné možnosti výzkumu nezbývají - soustře�te se výhradně na zni�ení všech nepřátelských jader.
+
+status.burning.name = Hořící
+status.freezing.name = Mrazící
+status.wet.name = Vlhký
+status.muddy.name = Zablácený
+status.melting.name = Tavící
+status.sapped.name = Vymáchaný
+status.electrified.name = Elektrizovaný
+status.spore-slowed.name = Výtrusem Zpomalený
+status.tarred.name = Dehtovaný
+status.overdrive.name = Posílený
+status.overclock.name = Přetaktovaný
+status.shocked.name = Šokovaný
+status.blasted.name = Vybouchlý
+status.unmoving.name = Nehybný
+status.boss.name = Strážce
 
 settings.language = Jazyk
 settings.data = Data hry
@@ -622,6 +940,7 @@ settings.clearcampaignsaves.confirm = Jsi si jist, že opravdu chceš vymazat v
 paused = [accent]< Pozastaveno >[]
 clear = Vy�istit
 banned = [scarlet]Zakázán[]
+unsupported.environment = [scarlet]Nepodporované Prostředí
 yes = Ano
 no = Ne
 info.title = Informace
@@ -629,14 +948,18 @@ error.title = [scarlet]Objevila se chyba[]
 error.crashtitle = Objevila se chyba
 unit.nobuild = [scarlet]Jednotka nemůže stavět
 lastaccessed = [lightgray]Naposledy použil: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???[]
 
+stat.showinmap = <na�ti mapu pro zobrazení>
 stat.description = Ú�el
 stat.input = Vstup
 stat.output = Výstup
+stat.maxefficiency = Max Efficiency
 stat.booster = Posilova�
 stat.tiles = Vyžadované dlaždice
 stat.affinities = Synergie
+stat.opposites = Protiklady
 stat.powercapacity = Kapacita energie
 stat.powershot = Energie na 1 výstřel
 stat.damage = Poškození
@@ -659,8 +982,11 @@ stat.memorycapacity = Kapacita paměti
 stat.basepowergeneration = Základní generování energie
 stat.productiontime = ÄŒas produkce
 stat.repairtime = Čas do úplné opravy
+stat.repairspeed = Rychlost Opravy
 stat.weapons = ZbranÄ›
 stat.bullet = Střela
+stat.moduletier = Úroveň Modulu
+stat.unittype = Typ Jednotky
 stat.speedincrease = Zvýšení rychlosti
 stat.range = Dosah
 stat.drilltier = Lze těžit
@@ -668,6 +994,7 @@ stat.drillspeed = Základní rychlost vrtu
 stat.boosteffect = Ú�inek posílení
 stat.maxunits = Nejvýše aktivních jednotek
 stat.health = Životy
+stat.armor = Armor
 stat.buildtime = ÄŒas konstrukce
 stat.maxconsecutive = Nejvýše po sobě
 stat.buildcost = Cena konstrukce
@@ -683,6 +1010,7 @@ stat.lightningchance = Pravděpodobnost blesku
 stat.lightningdamage = Poškození bleskem
 stat.flammability = Hořlavost
 stat.radioactivity = Radioaktivita
+stat.charge = Nabití
 stat.heatcapacity = Tepelná kapacita
 stat.viscosity = Vazkost
 stat.temperature = Teplota
@@ -691,24 +1019,78 @@ stat.buildspeed = Rychlost stavění
 stat.minespeed = Rychlost těžení
 stat.minetier = Těžící úroveň
 stat.payloadcapacity = Kapacita pro náklad
-stat.commandlimit = Limit ovládání
 stat.abilities = Schopnosti
 stat.canboost = Umí posilovat
 stat.flying = Létající
+stat.ammouse = Spotřeba Munice
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Násobi� Poškození
+stat.healthmultiplier = Násobi� Životů
+stat.speedmultiplier = Násobi� Rychlostí
+stat.reloadmultiplier = Násobi� Přebití
+stat.buildspeedmultiplier = Nasobi� Rychlostí Stavby
+stat.reactive = Reaguje
+stat.immunities = Imunity
+stat.healing = Lé�í se
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Silové pole
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Opravit pole
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Stav pole
-ability.unitspawn = {0} továrna
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = továrna
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Silově opravné pole
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Pohybující se blesk
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Štítovy Oblouk
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Pole potla�ení regenerace
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energetické pole
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Pouze Ukládání do Jádra je povoleno
 
 bar.drilltierreq = Je vyžadován lepší vrt
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Chybějí zdroje
 bar.corereq = Je vyžadováno základní jádro
+bar.corefloor = Je vyžadována pozice základní zóny
+bar.cargounitcap = Strop nákladové jednotky dosaženo
 bar.drillspeed = Rychlost vrtu: {0}/s
 bar.pumpspeed = Rychlost pumpy: {0}/s
 bar.efficiency = Ú�innost: {0}%
+bar.boost = Posílení: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Energie: {0}
 bar.powerstored = Uskladněno: {0}/{1}
 bar.poweramount = Energie celkem: {0}
@@ -717,51 +1099,69 @@ bar.powerlines = Spojení: {0}/{1}
 bar.items = Předměty: {0}
 bar.capacity = Kapacita: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet]î Š {0} / {1}[white] {2}\n[lightgray][[jednotka je vypnuta]
 bar.liquid = Chlazení
 bar.heat = Teplo
+bar.cooldown = Cooldown
+bar.instability = Nestabilita
+bar.heatamount = Teplo: {0}
+bar.heatpercent = Teplo: {0} ({1}%)
 bar.power = Energie
 bar.progress = Konstrukce v průběhu
+bar.loadprogress = Pokrok
+bar.launchcooldown = Launch Cooldown
 bar.input = Vstup
 bar.output = Výstup
+bar.strength = [stat]{0}[lightgray]x síla
 
 units.processorcontrol = [lightgray]Procesor je ovládán[]
 
 bullet.damage = [stat]{0}[lightgray] poškození[]
 bullet.splashdamage = [stat]{0}[lightgray] plošného poškození ~[stat] {1}[lightgray] dlaždic
 bullet.incendiary = [stat]zápalný
-bullet.sapping = [stat]oslabující
 bullet.homing = [stat]samonaváděcí
-bullet.shock = [stat]šokový
-bullet.frag = [stat]trhavý
+bullet.armorpierce = [stat]proražení brnění
+bullet.maxdamagefraction = [stat]{0}%[lightgray] limit poškození
+bullet.suppression = [stat]{0} sec[lightgray] potla�ení opravy ~ [stat]{1}[lightgray] kostek
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag střel:
+bullet.lightning = [stat]{0}[lightgray]x jiskření ~ [stat]{1}[lightgray] poškození
+bullet.buildingdamage = [stat]{0}%[lightgray] poškození budov
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] odhození[]
 bullet.pierce = [stat]{0}[lightgray]x průrazné[]
 bullet.infinitepierce = [stat]průrazné[]
 bullet.healpercent = [stat]{0}[lightgray]% opravující
-bullet.freezing = [stat]zmrazující[]
-bullet.tarred = [stat]dehtující[]
+bullet.healamount = [stat]{0}[lightgray] přímá oprava
 bullet.multiplier = [stat]{0}[lightgray]x více střel[]
 bullet.reload = [stat]{0}[lightgray]x rychlost střelby[]
+bullet.range = [stat]{0}[lightgray] kostek dosah
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = bloky
 unit.blockssquared = bloky²
 unit.powersecond = energie/sekunda
+unit.tilessecond = dlaždic/sekundu
 unit.liquidsecond = kapalin/sekundu
 unit.itemssecond = předmětů/sekundu
 unit.liquidunits = jednotek kapalin
 unit.powerunits = jednotek energie
+unit.heatunits = jednotek tepla
 unit.degrees = úhly
 unit.seconds = sekundy
 unit.minutes = minuty
 unit.persecond = /s
 unit.perminute = /min
 unit.timesspeed = x větší rychlost
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = zdraví štítu
 unit.items = předměty
 unit.thousands = tis
 unit.millions = mio
 unit.billions = mld
+unit.shots = shots
+unit.pershot = /střela
 category.purpose = Ú�el
 category.general = Všeobecné
 category.power = Energie
@@ -770,17 +1170,23 @@ category.items = Předměty
 category.crafting = Vstup/Výstup
 category.function = Funkce
 category.optional = Volitelné vylepšení
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Přesko�it Animaci Odpalu/Přístání Jádra
 setting.landscape.name = Uzamknout krajinu
 setting.shadows.name = Stíny
 setting.blockreplace.name = Automatický návrh bloků
 setting.linear.name = Lineární filtrování
 setting.hints.name = Rady a tipy
-setting.flow.name = Zobrazit rychlost toku zdroje [scarlet](experimentální)[]
+setting.logichints.name = Logic Nápovědy
 setting.backgroundpause.name = Pozastavit v pozadí
 setting.buildautopause.name = Automaticky pozastavit stavění
+setting.doubletapmine.name = Dvojklik pro Těžbu
+setting.commandmodehold.name = Držet pro Příkazový Režim
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Vypnout Modifikace Při Pádovém Spuštění
 setting.animatedwater.name = Animované povrchy
 setting.animatedshields.name = Animované štíty
-setting.antialias.name = Použít antialias [lightgray](vyžaduje restart)[]
 setting.playerindicators.name = Indikátor pro hrá�e
 setting.indicators.name = Indikátor pro nepřátele
 setting.autotarget.name = Automaticky zaměřovat
@@ -790,17 +1196,14 @@ setting.fpscap.name = Strop FPS (snímků/s)
 setting.fpscap.none = Žádný
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = Škálování uživatelského rozhraní[lightgray] (je vyžadován restart)[]
+setting.uiscale.description = Pro aplikování změn, je potřeba restart.
 setting.swapdiagonal.name = Vždy pokládat úhlopří�ně
-setting.difficulty.training = Zácviková
-setting.difficulty.easy = Lehká
-setting.difficulty.normal = Normální
-setting.difficulty.hard = Těžká
-setting.difficulty.insane = Šílená
-setting.difficulty.name = Obtížnost:
 setting.screenshake.name = Chvění obrazovky
+setting.bloomintensity.name = Intenzita Bloom
+setting.bloomblur.name = Rozmazání Bloom
 setting.effects.name = Zobrazit efekty
 setting.destroyedblocks.name = Zobrazit zni�ené bloky
-setting.blockstatus.name = Display Block Status
+setting.blockstatus.name = Zobrazit Stav Bloku
 setting.conveyorpathfinding.name = Hledat cestu při umisťování pásu
 setting.sensitivity.name = Citlivost ovlada�e
 setting.saveinterval.name = Interval automatického ukládání
@@ -808,28 +1211,40 @@ setting.seconds = {0} sekund
 setting.milliseconds = {0} milisekund
 setting.fullscreen.name = Celá obrazovka
 setting.borderlesswindow.name = Bezokrajové okno [lightgray](může výt vyžadován restart)
+setting.borderlesswindow.name.windows = Celá obrazovka bez okrajů
+setting.borderlesswindow.description = Pro aplikování změn, je potřeba restart.
 setting.fps.name = Ukázat FPS a ping
+setting.console.name = Povolit Konzoli
 setting.smoothcamera.name = Plynulá kamera
 setting.vsync.name = Vertikální synchronizace
 setting.pixelate.name = Rozpixlovat
 setting.minimap.name = Ukázat mapi�ku
 setting.coreitems.name = Ukázat položky jádra
 setting.position.name = Ukázat pozici hrá�e
+setting.mouseposition.name = Zobrazit Pozici Myši
 setting.musicvol.name = Hlasitost hudby
 setting.atmosphere.name = Ukázat atmosféru planety
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Hlasitost prostředí
 setting.mutemusic.name = Ztišit hudbu
 setting.sfxvol.name = Hlasitost efektů
 setting.mutesound.name = Ztišit zvuk
 setting.crashreport.name = Poslat anonymní hlášení o spadnutí Mindustry
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Automaticky ukládat hru
-setting.publichost.name = Veřejná viditelnost hry
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Nejvyšší po�et hrá�ů
 setting.chatopacity.name = Průsvitnost kanálu zpráv
-setting.lasersopacity.name = Průsvitnost energetického laseru 
+setting.lasersopacity.name = Průsvitnost energetického laseru
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Průsvitnost přemostění
 setting.playerchat.name = Zobrazit bublinu se zprávami hrá�e
-public.confirm = Chceš Tvoji hru zpřístupnit veřejnosti?\n[accent]Kdokoli se bude moci připojit ke tvé hře.[]\n[lightgray]Toto se dá později změnit v nabídce Volby->Hra->Veřejná viditelnost hry.
+setting.showweather.name = Zobrazit Grafiku Po�así
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Přizpůsobte rozhraní zobrazení zářezu
+setting.macnotch.description = Pro aplikování změn, je potřeba restart
+steam.friendsonly = Přátele Pouze
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Poznámka: nevydané verze her nemůžou být veřejné.
 uiscale.reset = Škálování uživatelskho rozhraní se změnilo.\nZmá�kni "OK", abys potvrdil toto nastavení.\n[scarlet]Návrat k původním hodnotám proběhne za [accent]{0}[] vteřin...[]
 uiscale.cancel = Ukon�it a odejít
@@ -838,12 +1253,9 @@ keybind.title = Změnit klávesy
 keybinds.mobile = [scarlet]Většina kláves nefunguje v mobilní verzi hry. Je podporován jen základní pohyb.[]
 category.general.name = Všeobecné
 category.view.name = Pohled
+category.command.name = Unit Command
 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
@@ -858,6 +1270,27 @@ keybind.move_y.name = Pohyb svisle
 keybind.mouse_move.name = Následovat myš
 keybind.pan.name = Následovat kameru
 keybind.boost.name = Posílení
+keybind.command_mode.name = Příkazový Režim
+keybind.command_queue.name = Fronta příkazů jednotky
+keybind.create_control_group.name = Vytvořit kontrolní skupinu
+keybind.cancel_orders.name = Zrušit příkaz
+keybind.unit_stance_shoot.name = Postoj jednotky: Střílejte
+keybind.unit_stance_hold_fire.name = Postoj jednotky: Zastavit palbu
+keybind.unit_stance_pursue_target.name = Postoj jednotky: Pronásleduj cíl
+keybind.unit_stance_patrol.name = Postoj jednotky: Hlídej
+keybind.unit_stance_ram.name = Postoj jednotky: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Přestavět Region
 keybind.schematic_select.name = Vybrat oblast
 keybind.schematic_menu.name = Nabídka šablon
 keybind.schematic_flip_x.name = Překlopit šablona podle svislé osy
@@ -883,10 +1316,11 @@ keybind.select.name = Vybrat/Střílet
 keybind.diagonal_placement.name = Umisťovat úhlopří�ně
 keybind.pick.name = Vybrat blok
 keybind.break_block.name = Rozbít blok
+keybind.select_all_units.name = Vybrat VÅ¡echny Jednotky
+keybind.select_all_unit_factories.name = Vybrat Všechny Továrny Jednotek
 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
@@ -895,6 +1329,7 @@ keybind.pause_building.name = Pozastavit nebo spustit stavění
 keybind.minimap.name = Mapi�ka
 keybind.planet_map.name = Planetární mapa
 keybind.research.name = Výzkum
+keybind.block_info.name = Info o Bloku
 keybind.chat.name = Kanál zpráv
 keybind.player_list.name = Seznam hrá�ů
 keybind.console.name = Terminál
@@ -904,6 +1339,7 @@ keybind.toggle_menus.name = Přepnout zobrazení nabídek
 keybind.chat_history_prev.name = Pohyb v historii zpráv zpět
 keybind.chat_history_next.name = Pohyb v historii zpráv dopředu
 keybind.chat_scroll.name = Rolování kanálu zpráv
+keybind.chat_mode.name = Změnit Chat režim
 keybind.drop_unit.name = Zahodit jednotku
 keybind.zoom_minimap.name = Přiblížit mapu
 mode.help.title = Popis režimů
@@ -917,48 +1353,100 @@ mode.pvp.description = Bojuj proti ostatním hrá�ům v lokální síti.\n[gray
 mode.attack.name = Útok
 mode.attack.description = Zni� nepřátelskou základnu.\n[gray]Vyžaduje přítomnost �erveného jádra na mapě.[]
 mode.custom = Vlastní pravidla
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Schovat Zakázané Kostky
 
 rules.infiniteresources = NeomezenÄ› surovin
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Výbuch reaktoru
+rules.coreincinerates = Jádro Spaluje Nadbyte�né Suroviny
+rules.disableworldprocessors = Zakázat Světové Procesory
 rules.schematic = Å ablony povoleny
 rules.wavetimer = Časova� vln
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Vlny
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Režim útoku
-rules.buildai = Umělá inteligence staví
+rules.buildai = Umělá AI staví
+rules.buildaitier = Úroveň AI stavitele
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min velikost skupiny
+rules.rtsmaxsquadsize = Max velikost skupiny
+rules.rtsminattackweight = Min váha útoku
+rules.cleanupdeadteams = Vy�istit Budovy Poražených Týmů (PvP)
+rules.corecapture = Dobýt Jádro Po Jeho Zni�ení
+rules.polygoncoreprotection = Polygonální Ochrana Jádra
+rules.placerangecheck = Dosah stavění
 rules.enemyCheat = Neomezeně surovin pro umělou inteligenci
 rules.blockhealthmultiplier = Násobek zdraví bloků
 rules.blockdamagemultiplier = Násobek poškození bloků
 rules.unitbuildspeedmultiplier = Násobek rychlosti výroby jednotek
+rules.unitcostmultiplier = Násobek ceny jednotek
 rules.unithealthmultiplier = Násobek zdraví jednotek
 rules.unitdamagemultiplier = Násobek poškození jednotkami
+rules.unitcrashdamagemultiplier = Násobek poškození při nárazu jednotky
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Násobek Solární Energie
+rules.unitcapvariable = Jádra Zvýšujou Maximum Po�tu Jednotek
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Základní Maximum Po�tu Jednotek
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Poloměr, ve kterém se okolo nepřátelského jádra nesmí stavět: [lightgray](dlaždic)[]
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Čas rozestupu mezi vlnami: [lightgray](vteřin)[]
+rules.initialwavespacing = Initial Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Násobek ceny stavění
 rules.buildspeedmultiplier = Násobek rychlosti stavění
 rules.deconstructrefundmultiplier = Násobek vratky při rozebrání
 rules.waitForWaveToEnd = Vlny �ekají na nepřátele
+rules.wavelimit = Mapa kon�í po vlně
 rules.dropzoneradius = Poloměr oblasti pro vylíhnutí: [lightgray](dlaždic)[]
 rules.unitammo = Jednotky vyžadují munici
+rules.enemyteam = Nepřátelský Tým
+rules.playerteam = Hrá�ský Team
 rules.title.waves = Vlny
 rules.title.resourcesbuilding = Suroviny a stavění
 rules.title.enemy = Nepřátelé
 rules.title.unit = Jednotky
 rules.title.experimental = Experimentální
 rules.title.environment = Environmentální
+rules.title.teams = Týmy
+rules.title.planet = Planeta
 rules.lighting = Osvětlení
-rules.enemyLights = Světla nepřátel
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Výstřel
+rules.anyenv = <Jakákoliv>
 rules.explosions = Výbušné poškození bloku/jednotky
 rules.ambientlight = Světlo prostředí
 rules.weather = Po�así
 rules.weather.frequency = ÄŒetnost:
+rules.weather.always = Vždy
 rules.weather.duration = Trvání:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Předměty
 content.liquid.name = Kapaliny
 content.unit.name = Jednotky
 content.block.name = Bloky
+content.status.name = Stavové Efekty
 content.sector.name = Sektory
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Mě�
 item.lead.name = Olovo
@@ -976,53 +1464,94 @@ item.blast-compound.name = Výbušnina
 item.pyratite.name = Pyratit
 item.metaglass.name = Metasklo
 item.scrap.name = Å rot
+item.fissile-matter.name = Štěpná Hmota
+item.beryllium.name = Berylium
+item.tungsten.name = Wolfram
+item.oxide.name = Oxid
+item.carbide.name = Karbid
+item.dormant-cyst.name = Dormant Cyst
+
 liquid.water.name = Voda
 liquid.slag.name = Struska
 liquid.oil.name = Nafta
 liquid.cryofluid.name = Chladící kapalina
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arkycit
+liquid.gallium.name = Gálium
+liquid.ozone.name = Ozón
+liquid.hydrogen.name = Vodík
+liquid.nitrogen.name = Dusík
+liquid.cyanogen.name = Kyanogen
 
 unit.dagger.name = Dýka
 unit.mace.name = Palcát
 unit.fortress.name = Pevnost
-unit.nova.name = Nova
+unit.nova.name = Bratr
 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.spiroct.name = Chirurg
+unit.arkyid.name = Arkyd
+unit.toxopid.name = Toxo
+unit.flare.name = Sojka
+unit.horizon.name = Drozd
+unit.zenith.name = Racek
+unit.antumbra.name = Volavka
+unit.eclipse.name = Sup
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
 unit.quad.name = Tetra
 unit.oct.name = Hexo
-unit.risso.name = Risso
-unit.minke.name = Minke
-unit.bryde.name = Bryde
-unit.sei.name = Sei
-unit.omura.name = Omura
+unit.risso.name = Vor
+unit.minke.name = Měl�ina
+unit.bryde.name = Bře�ka
+unit.sei.name = Vodník
+unit.omura.name = Křižník
+unit.retusa.name = Ryba
+unit.oxynoe.name = Okoun
+unit.cyerce.name = Candát
+unit.aegires.name = Sumec
+unit.navanax.name = Vorvaň
 unit.alpha.name = Alfa
 unit.beta.name = Beta
 unit.gamma.name = Gama
 unit.scepter.name = Žezlo
-unit.reign.name = Panovník
+unit.reign.name = Vůdce
 unit.vela.name = Vela
 unit.corvus.name = Havran
+unit.stell.name = Hřebík
+unit.locus.name = Å roub
+unit.precept.name = Kruťák
+unit.vanquish.name = Vágus
+unit.conquer.name = Dobyvatel
+unit.merui.name = Merlin
+unit.cleroi.name = Čaroděj
+unit.anthicus.name = Darmoděj
+unit.tecta.name = Tvr�ák
+unit.collaris.name = Přísňák
+unit.elude.name = Lehátko
+unit.avert.name = Fr�ák
+unit.obviate.name = Podkova
+unit.quell.name = Kněžna
+unit.disrupt.name = Zabiják
+unit.evoke.name = Evoker
+unit.incite.name = Radiátor
+unit.emanate.name = Eman
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Montážní Dron
+unit.latum.name = Latum
+unit.renale.name = Renale
 
-block.resupply-point.name = Zásobovací místo
 block.parallax.name = Paralaxa
 block.cliff.name = Útes
 block.sand-boulder.name = Pískovec
 block.basalt-boulder.name = Čedi�ový balvan
 block.grass.name = Tráva
-block.slag.name = Struska
-block.space.name = Vesmír   
+block.molten-slag.name = Struska
+block.pooled-cryofluid.name = Chladící kapalina
+block.space.name = Vesmír
 block.salt.name = Sůl
 block.salt-wall.name = Solné skály
 block.pebbles.name = Oblázky
@@ -1049,24 +1578,28 @@ block.graphite-press.name = Lis na grafit
 block.multi-press.name = Všestranný lis
 block.constructing = {0} [lightgray](ve výstavbě)[]
 block.spawn.name = Nepřátelská líheň
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Jádro: Odštěpek
 block.core-foundation.name = Jádro: Základ
 block.core-nucleus.name = Jádro: Atom
-block.deepwater.name = Hluboká voda
-block.water.name = Voda
+block.deep-water.name = Hluboká voda
+block.shallow-water.name = Voda
 block.tainted-water.name = Zamořená voda
+block.deep-tainted-water.name = Hluboká Zamořená Voda
 block.darksand-tainted-water.name = Zamořená voda s �erným pískem
 block.tar.name = Dehet
 block.stone.name = Kámen
-block.sand.name = Písek
+block.sand-floor.name = Písek
 block.darksand.name = Černý písek
 block.ice.name = Led
 block.snow.name = Sníh
-block.craters.name = Krátery
+block.crater-stone.name = Krátery
 block.sand-water.name = Voda s pískem
 block.darksand-water.name = Voda s �erným pískem
 block.char.name = Dřevěné uhlí
 block.dacite.name = Dacit
+block.rhyolite.name = Ryolit
 block.dacite-wall.name = Stěna dacitu
 block.dacite-boulder.name = Dacitový kámen
 block.ice-snow.name = Zasněžený led
@@ -1084,6 +1617,7 @@ block.spore-cluster.name = Shluk spór
 block.metal-floor.name = Kovový povrch 1
 block.metal-floor-2.name = Kovový povrch 2
 block.metal-floor-3.name = Kovový povrch 3
+block.metal-floor-4.name = Kovový povrch 4
 block.metal-floor-5.name = Kovový povrch 4
 block.metal-floor-damaged.name = Poškozený kovový povrch
 block.dark-panel-1.name = Tmavá deska 1
@@ -1123,8 +1657,10 @@ block.distributor.name = Rozdělova�
 block.sorter.name = Třídi�ka
 block.inverted-sorter.name = Obrácená třídi�ka
 block.message.name = Zpráva
+block.reinforced-message.name = Posílená Zpráva
+block.world-message.name = Světová Zpráva
+block.world-switch.name = World Switch
 block.illuminator.name = Osvětlova�
-block.illuminator.description = Malý, kompaktní, konfigurovatelný zdroj světla. Vyžaduje pro svoje fungování energii.
 block.overflow-gate.name = Brána s přepadem
 block.underflow-gate.name = Brána s podtokem
 block.silicon-smelter.name = Křemíková huť
@@ -1175,20 +1711,22 @@ block.solar-panel.name = Solární panel
 block.solar-panel-large.name = Velký solární panel
 block.oil-extractor.name = Vrt na naftu
 block.repair-point.name = Opravovací bod
+block.repair-turret.name = Opravovací věž
 block.pulse-conduit.name = Pulzní potrubí
 block.plated-conduit.name = Plátované potrubí
 block.phase-conduit.name = Fázové potrubí
 block.liquid-router.name = Směrova� kapalin
 block.liquid-tank.name = Nádrž na kapaliny
+block.liquid-container.name = Nádoba na kapaliny
 block.liquid-junction.name = Křižovatka kapalin
 block.bridge-conduit.name = Přemostění potrubí
 block.rotary-pump.name = Rota�ní �erpadlo
 block.thorium-reactor.name = Thoriový reaktor
 block.mass-driver.name = Hromadný přenaše�
 block.blast-drill.name = Tlakovzdušný vrt
-block.thermal-pump.name = Tepelné �erpadlo
+block.impulse-pump.name = Tepelné �erpadlo
 block.thermal-generator.name = Tepelný generátor
-block.alloy-smelter.name = Slitinová huť
+block.surge-smelter.name = Slitinová huť
 block.mender.name = Opravář
 block.mend-projector.name = Opravný projektor
 block.surge-wall.name = Rázová stěna
@@ -1205,9 +1743,9 @@ block.meltdown.name = Rozpéka�
 block.foreshadow.name = Znamení osudu
 block.container.name = Kontejnér
 block.launch-pad.name = Vysílací plošina
-block.launch-pad-large.name = Velká vysílací plošina
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 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
@@ -1217,14 +1755,180 @@ block.exponential-reconstructor.name = Exponenciální přestavbova�
 block.tetrative-reconstructor.name = Mocninný přestavbova�
 block.payload-conveyor.name = Dopravník nákladu
 block.payload-router.name = Směřova� nákladu
+block.duct.name = Potrubí
+block.duct-router.name = Potrubní Směrova�
+block.duct-bridge.name = Potrubní Most
+block.large-payload-mass-driver.name = Velká Nákladní Transportní Věž
+block.payload-void.name = Černá díra na náklad
+block.payload-source.name = Zdroj nákladů
 block.disassembler.name = Rozebíra�
 block.silicon-crucible.name = Tavicí tyglík pro křemík
-block.overdrive-dome.name = Velká urychlující kupole 
-#experimental, may be removed
-block.block-forge.name = Výheň bloků
-block.block-loader.name = Naklada� bloků
-block.block-unloader.name = Vyklada� bloků
+block.overdrive-dome.name = Velká urychlující kupole
 block.interplanetary-accelerator.name = Meziplanetární urychlova�
+block.constructor.name = Konstruktor
+block.constructor.description = Vyrábí konstrukce až do velikosti dlaždic 2x2.
+block.large-constructor.name = Velký Konstruktor
+block.large-constructor.description = Vyrábí konstrukce až do velikosti dlaždic 4x4.
+block.deconstructor.name = Dekonstruktor
+block.deconstructor.description = Dekonstruuje struktury a jednotky. Vrací 100% zdrojů.
+block.payload-loader.name = Nákladový Nakláda�
+block.payload-loader.description = Nakládá kapaliny a věci z bloků.
+block.payload-unloader.name = Nákladový Vykláda�
+block.payload-unloader.description = Vykládá kapaliny a věci z bloků.
+block.heat-source.name = Zdroj Tepla
+block.heat-source.description = 1x1 blok, který dává virtuálně někone�né teplo.
+block.empty.name = Prázdné
+block.rhyolite-crater.name = Ryolitní Kráter
+block.rough-rhyolite.name = Hrubý Ryolit
+block.regolith.name = Regolit
+block.yellow-stone.name = Žlutý Kámen
+block.carbon-stone.name = Krabonový Kámen
+block.ferric-stone.name = Ferric kámen
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic kámen
+block.crystalline-stone.name = Crystalline kámen
+block.crystal-floor.name = Křišťalová Zem
+block.yellow-stone-plates.name = Žluté Kamenné Pláty
+block.red-stone.name = Červený Kámen
+block.dense-red-stone.name = Hustý Červený Kámen
+block.red-ice.name = Červený Led
+block.arkycite-floor.name = Arkycite podlaha
+block.arkyic-stone.name = Arkyic kámen
+block.rhyolite-vent.name = Rhyolite díra
+block.carbon-vent.name = Carbon díra
+block.arkyic-vent.name = Arkyic díra
+block.yellow-stone-vent.name = Yellow Stone díra
+block.red-stone-vent.name = Red Stone díra
+block.crystalline-vent.name = Crystalline díra
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Jádrová Zona
+block.regolith-wall.name = Regolith ze�
+block.yellow-stone-wall.name = Yellow Stone ze�
+block.rhyolite-wall.name = Rhyolite ze�
+block.carbon-wall.name = Krabonová ze�
+block.ferric-stone-wall.name = Ferric Stone ze�
+block.beryllic-stone-wall.name = Beryllic Stone ze�
+block.arkyic-wall.name = Arkyic ze�
+block.crystalline-stone-wall.name = Crystalline Stone ze�
+block.red-ice-wall.name = Červená Ledová Ze�
+block.red-stone-wall.name = Červená Kamenná Ze�
+block.red-diamond-wall.name = Červená Diamantová Ze�
+block.redweed.name = Redweed
+block.pur-bush.name = Pur křoví
+block.yellowcoral.name = Žlutý Korál
+block.carbon-boulder.name = Carbon balvan
+block.ferric-boulder.name = Ferric balvan
+block.beryllic-boulder.name = Beryllic balvan
+block.yellow-stone-boulder.name = Yellow Stone balvan
+block.arkyic-boulder.name = Arkyic balvan
+block.crystal-cluster.name = Crystal shluk
+block.vibrant-crystal-cluster.name = Vibrant Crystal shluk
+block.crystal-blocks.name = Křišťálové Bloky
+block.crystal-orbs.name = Křišťálové Orby
+block.crystalline-boulder.name = Crystalline balvan
+block.red-ice-boulder.name = Red Ice balvan
+block.rhyolite-boulder.name = Rhyolite balvan
+block.red-stone-boulder.name = Red Stone balvan
+block.graphitic-wall.name = Graphitic ze�
+block.silicon-arc-furnace.name = Silicon Arc pec
+block.electrolyzer.name = Elektrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation komora
+block.electric-heater.name = Elektrický Ohříva�
+block.slag-heater.name = struskový ohříva�
+block.phase-heater.name = Fázový ohříva�
+block.heat-redirector.name = Tepelné rozdělova�
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Tepelný směrova�
+block.slag-incinerator.name = Strusková spalovna
+block.carbide-crucible.name = Karbidová nádoba
+block.slag-centrifuge.name = Odstředivka strusky
+block.surge-crucible.name = Přepěťová nádoba
+block.cyanogen-synthesizer.name = Syntetizátor kyanogenu
+block.phase-synthesizer.name = Syntetizátor fáze
+block.heat-reactor.name = Tepelný Reaktor
+block.beryllium-wall.name = Beryllium ze�
+block.beryllium-wall-large.name = Velká Beryllium ze�
+block.tungsten-wall.name = Wolframová Ze�
+block.tungsten-wall-large.name = Velká Tungsten ze�
+block.blast-door.name = Velké dveře
+block.carbide-wall.name = Karbidová stěna
+block.carbide-wall-large.name = Velká karbidová stěna
+block.reinforced-surge-wall.name = Vyztužená přepěťová stěna
+block.reinforced-surge-wall-large.name = Velká vyztužená přepěťová stěna
+block.shielded-wall.name = Štítová stěna
+block.radar.name = Radar
+block.build-tower.name = Postav věž
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Blesková věž
+block.shield-projector.name = Štítový Projektor
+block.large-shield-projector.name = Velká štítový Projektor
+block.armored-duct.name = Obrněný kanál
+block.overflow-duct.name = Přepadový kanál
+block.underflow-duct.name = Podtokové potrubí
+block.duct-unloader.name = Vyklada� potrubí
+block.surge-conveyor.name = Přepěťový dopravník
+block.surge-router.name = Přepěťový směrova�
+block.unit-cargo-loader.name = Naklada� jednotek
+block.unit-cargo-unload-point.name = Místo vyložení jednotek
+block.reinforced-pump.name = Zesílené �erpadlo
+block.reinforced-conduit.name = Zesílené vedení
+block.reinforced-liquid-junction.name = Zesílený spoj pro kapaliny
+block.reinforced-bridge-conduit.name = Vyztužený mostní vedení
+block.reinforced-liquid-router.name = Zesílený směrova� kapalin
+block.reinforced-liquid-container.name = Zesílená nádrž na kapaliny
+block.reinforced-liquid-tank.name = Zesílená bazén na kapaliny
+block.beam-node.name = Uzel paprsku
+block.beam-tower.name = Věž paprsku
+block.beam-link.name = Vedení paprku
+block.turbine-condenser.name = Turbínový zkapalňova�
+block.chemical-combustion-chamber.name = Chemická spalovací komora
+block.pyrolysis-generator.name = Pyrolysový generátor
+block.vent-condenser.name = Ventila�ní zkapalňova�
+block.cliff-crusher.name = Útesový drti�
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plazmový vrták
+block.large-plasma-bore.name = Velký plazmový vrták
+block.impact-drill.name = Příklepová vrták
+block.eruption-drill.name = Tavící vrták
+block.core-bastion.name = Jádro Pevnost
+block.core-citadel.name = Jádro Palác
+block.core-acropolis.name = Jádro Boží Poselství
+block.reinforced-container.name = Vyztužený kontejner
+block.reinforced-vault.name = Vyztužená klenba
+
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tanková dílna
+block.mech-refabricator.name = Robotická dílna
+block.ship-refabricator.name = Námořní dok
+block.tank-assembler.name = Tanková výzkumná stanice
+block.ship-assembler.name = Námořní výzkumná stanice
+block.mech-assembler.name = Robotická výzkumná stanice
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Vyztužený zátěžový dopravník
+block.payload-mass-driver.name = Zátěžová ústředna
+block.small-deconstructor.name = Malý ni�itel
+block.canvas.name = Plátno
+block.world-processor.name = Řídící procesor
+block.world-cell.name = Světová Buňka
+block.tank-fabricator.name = Tanková dílna
+block.mech-fabricator.name = Robotická dílna
+block.ship-fabricator.name = Námořní dok
+block.prime-refabricator.name = Prime dílna
+block.unit-repair-tower.name = Opravárenská věž
+block.diffuse.name = Rozšíření
+block.basic-assembler-module.name = Běžný Skládací Modul
+block.smite.name = Úder
+block.malign.name = Pomluva
+block.flux-reactor.name = Fluxní Reaktor
+block.neoplasia-reactor.name = Neoplasmatický Reaktor
 
 block.switch.name = Přepína�
 block.micro-processor.name = Mikroprocesor
@@ -1234,43 +1938,40 @@ block.logic-display.name = Zobrazova� logiky
 block.large-logic-display.name = Velký zobrazova� logiky
 block.memory-cell.name = Paměťová buňka
 block.memory-bank.name = Paměťová banka
-
-team.blue.name = modrý
+team.malis.name = Malis
 team.crux.name = �ervený
 team.sharded.name = oranžový
-team.orange.name = oranžový
 team.derelict.name = opuštěný
 team.green.name = zelený
-team.purple.name = fialový
+
+team.blue.name = modrý
 
 hint.skip = Přesko�it
 hint.desktopMove = Použij [accent][[WASD][] k pohybu.
 hint.zoom = [accent]Roluj[] prp přiblížení a oddalování obrazvky.
-hint.mine = Přesuň se poblíž \uf8c4 měděné rudy a [accent]ťupni[] na ni pro zahájení těžby.
 hint.desktopShoot = Klikni na [accent][[levé tla�ítko][] myši pro střelbu.
 hint.depositItems = Pro přesun položek je přetáhni ze své lodi do jádra.
 hint.respawn = Aby ses znovu přepnul na lo�, zmá�kni [accent][[V][].
 hint.respawn.mobile = Přepnul ses na ovládání jednotky nebo konstrukce. Aby ses přepnul zpět na lo�, klikni na avatara vlevo nahoře.
 hint.desktopPause = Zmá�kni [accent][[mezerník][] k pozastavení a zase spuštění hry.
-hint.placeDrill = Vyber si záložku \ue85e [accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a klikni na oblast s mědí k umístění.
-hint.placeDrill.mobile = Vyber si záložku \ue85e [accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a ťupni na oblast s mědí k umístění.\n\Ťupni na \ue800 [accent]zaškrtnutí[] vpravo dole pro potvrzení.
-hint.placeConveyor = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nKlikni a táhni pro umístění vícero dopravníků.\n[accent]Roluj[] pro oto�ení.
-hint.placeConveyor.mobile = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nPodrž chvíli prst a táhni pro umístění vícero dopravníků.
-hint.placeTurret = Umisti \uf861 [accent]Věž[], abys ubránil Tvoji základnu před nepřáteli.\n\nVěže vyžaduj munici - v tomto případě je jí \uf838mě�.\nPoužij vrty a dopravníky, abys nějakou získal.
 hint.breaking = Klikni [accent]pravým tla�ítkem[] a potáhni pro rozbití bloků.
 hint.breaking.mobile = Použij \ue817 [accent]kladivo[] v pravém spodním  rohu a pak ťupni pro rozbití bloků.\n\nPodrž chvíli prst a táhni pro rozbití bloků ve výběru.
+hint.blockInfo = Pro zobrazení informací o bloku, vyberte blok ve [accent]stavebním menu[], poté kliknutím na [accent][[?][] tla�ítka vpravo.
+hint.derelict = [accent]Opuštěné[] struktury jsou rozbíté pozůstalky starých základen, které již nefungujou.\n\nTyto struktury můžou být [accent]rozebraný[] pro získaní zdrojů.
 hint.research = Použij tla�ítko \ue875 [accent]Výzkum[] pro vyzkoumání nové technologie.
 hint.research.mobile = Použij tla�ítko \ue875 [accent]Výzkum[] v \ue88c [accent]nabídce[] pro vyzkoumání nové technologie.
 hint.unitControl = Podrž [accent][[Levý Ctrl][] a [accent]klikni[] pro ovládání spřátelených jednotek nebo věží.
 hint.unitControl.mobile = [accent][[Dvojťupni][] pro ovládání spřátelených jednotek nebo věží.
+hint.unitSelectControl = Chcete-li ovládat jednotky, zadejte [accent]příkazový režim[] přidržením [accent]L-shift.[]\nV příkazovém režimu kliknutím a tažením vyberte jednotky. [accent]Right-click[]místo nebo cíl pro velení tamních jednotek.
+hint.unitSelectControl.mobile = Chcete-li ovládat jednotky, zadejte [accent]příkazový režim[] stisknutím tla�ítka[accent]command[] tla�ítko vlevo dole.\nV příkazovém režimu vyberte jednotky dlouhým stisknutím a přetažením. Klepnutím na místo nebo cíl velíte tamním jednotkám.
 hint.launch = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v pravém dolním rohu.
 hint.launch.mobile = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v the \ue88c [accent]nabídce[].
 hint.schematicSelect = Podrž [accent][[F][] a potáhni pro výběr bloků, které chceš zkopírovat.\n\nKlikni na [accent][[prostřední tla�ítko][] myši pro zkopírování jednoho typu bloku.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Podrž [accent][[levý Ctrl][], když táhneš dopravníky, pro automatické vygenerování cesty.
 hint.conveyorPathfind.mobile = Povol \ue844 [accent]úhlopří�ný režim[] a potáhni dopravníky pro automatické generování cesty.
 hint.boost = Podrž [accent][[levý Shift][], abys přeletěl přes překážky se svou sou�asnou jednotkou.\n\nPouze některé jednotky však mají takový posilova�.
-hint.command = Zmá�kni [accent][[G][] pro vytvoření formace z blízkých jednotek [accent]podobného typu[].\n\nAbys mohl velet pozemní jednotce, musíš nejprve ovládat jinou pozemní jednotku.
-hint.command.mobile = [accent][[Dvojťupni][] na Tvoji jednotku pro vytvoření formace z blízkých jednotek.
 hint.payloadPickup = Zmá�kni [accent][[[] pro sebrání malých bloků nebo jednotek.
 hint.payloadPickup.mobile = [accent]Ťupni a podrž[] na malém bloku nebo jednotce pro sebrání.
 hint.payloadDrop = Zmá�kni [accent]][] pro položení nákladu.
@@ -1278,6 +1979,62 @@ hint.payloadDrop.mobile = [accent]Ťupni a drž[] na prázdném místě pro polo
 hint.waveFire = [accent]Naplň[] věže vodou místo munice pro automatické hašení okolních požárů.
 hint.generator = \uf879 [accent]Spalovací generátory[] pálí uhlí a přenášení energii do sousedících bloků.\n\nPřenos energie na delší vzdálenost se provádí pomocí \uf87f [accent]Energetických uzlů[].
 hint.guardian = Jednotky [accent]Strážce[] jsou obrněné. Měkká munice, jako je například [accent]mě�[] a [accent]olovo[] je [scarlet]neefektivní[].\n\nPoužij vylepšené věže nebo \uf835 [accent]grafitovou[] munici pro \uf861 Střílnu Duo/\uf859 Salvu, abys Strážce sejmul.
+hint.coreUpgrade = Jádro může být vylepšeno [accent]překrytím  jádrem vyšší úrovně[].\n\nUmísti jádro typu [accent]Základ[] přes jádro typu [accent]Odštěpek[]. Ujisti se, že v okolí nejsou žádné překážky.
+hint.presetLaunch = Na šedé [accent]sektory v přistávací zóně[], jako je například [accent]Zamrzlý les[], se lze vyslat kdykoli. Nevyžadují polapení okolního teritoria.\n\n[accent]Číslované sektory[], jako je tento, jsou [accent]volitelné[].
+hint.presetDifficulty = Tento sektor má [scarlet]vysokou úroveň nepřátelského ohrožření[].\nSpouštení do takových sektorů se [accent]nedoporu�uje[] bez náležité technologie a přípravy.
+hint.coreIncinerate = Poté, co je kapacita jádra ur�ité položky  naplněna, jakékoliv další stejné přijaté položky budou [accent]zni�eny[].
+hint.factoryControl = Chcete-li nastavit tovární nastavení jednotky[accent]výstupní cíl[], v příkazovém režimu klikněte na tovární blok a poté klikněte pravým tla�ítkem na umístění.\nJednotky, které produkuje, se tam automaticky přesunou.
+hint.factoryControl.mobile = Chcete-li nastavit tovární nastavení jednotky[accent]výstupní cíl[], v příkazovém režimu klepněte na tovární blok a poté klepněte na umístění.\nJednotky, které produkuje, se tam automaticky přesunou.
+gz.mine = Pohybujte se poblíž\uf8c4 [accent]měděnou rudu[] na zemi a kliknutím zahájíte těžbu.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Používá se ve všech typech bloků a munice.
 item.copper.details = Mě�. Nezvykle nadpo�etný kov na Serpulu. Konstruk�ně slabý, pokud není rafinovaná.
@@ -1300,23 +2057,36 @@ item.spore-pod.description = Používá se pro přeměnu na ropu, výbušniny a
 item.spore-pod.details = Spóry. Pravděpodobně syntetická forma života. Vydává plyn toxický pro jiné formy života. Extrémně invazivní. Vysoce hořlavý za ur�itých podmínek.
 item.blast-compound.description = Používá se v bombách a výbušné munici.
 item.pyratite.description = Používá se v zápalných zbraních a spalovacích generátorech.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 
 liquid.water.description = Používá se pro chladící stroje a na zpracování odpadu.
 liquid.slag.description = Používá se v oddělova�ích pro rozdělení na jednotlivé kovy, nebo je chrlena na protivníky z věží.
 liquid.oil.description = Používá se v pokro�ilé materiálové výrobě a jako zápalná munice.
 liquid.cryofluid.description = Používá se jako chladící kapalina v reaktorech, věžích a továrnách.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
 
-block.resupply-point.description = Zásobuje okolní jednotky měděnou municí. Není kompatibilní s jednotkami, které vyžadují energii z baterie.
+block.derelict = \uf77e [lightgray]Opuštěný
 block.armored-conveyor.description = Přepravuje předměty vpřed. Nepřijímá předměty ze stran.
 block.illuminator.description = Vydává světlo.
 block.message.description = Ukládá zprávu pro komunikaci mezi spojenci.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Lisuje uhlí na grafit.
 block.multi-press.description = Lisuje uhlí na grafit. Vyžaduje vodu jako chladivo.
 block.silicon-smelter.description = Rafinuje křemík z písku a uhlí.
 block.kiln.description = Taví písek a olovo na metasklo.
 block.plastanium-compressor.description = Produkuje plastan z titanu a nafty.
 block.phase-weaver.description = Syntetizuje fázovou tkaninu z thoria a písku.
-block.alloy-smelter.description = Taví titan, olovo, křemík a mě� na rázovou slitinu.
+block.surge-smelter.description = Taví titan, olovo, křemík a mě� na rázovou slitinu.
 block.cryofluid-mixer.description = Míchá vodu a jemný titanová prášek na chladící kapalinu.
 block.blast-mixer.description = Vyrábí výbušninu z pyratitu a shluků spór.
 block.pyratite-mixer.description = Míchá uhlí, olovo a písek na pyratit.
@@ -1332,6 +2102,8 @@ block.item-source.description = Nekone�ný zdroj předmětů. Jen v režimu Pí
 block.item-void.description = Zni�í jakýkoliv vstupní předmět, který bloku pošleš. Jen v režimu Pískoviště.
 block.liquid-source.description = Nekone�ný zdroj kapalin. Jen v režimu Pískoviště.
 block.liquid-void.description = Zni�í jakoukoliv kapalinu, kterou bloku pošleš. Jen v režimu Pískoviště.
+block.payload-source.description = Nekone�ný zdroj nákladu. Jen v režimu Pískoviště.
+block.payload-void.description = Zni�í jakýkoliv náklad. Jen v režimu Pískoviště.
 block.copper-wall.description = Chrání konstrukce před nepřátelskými střelami.
 block.copper-wall-large.description = Chrání konstrukce před nepřátelskými střelami.
 block.titanium-wall.description = Chrání konstrukce před nepřátelskými střelami.
@@ -1344,6 +2116,10 @@ block.phase-wall.description = Chrání konstrukce před nepřátelskými střel
 block.phase-wall-large.description = Chrání konstrukce před nepřátelskými střelami, reflecting most bullets upon impact.
 block.surge-wall.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje.
 block.surge-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Ze�, která může být otevřena a zavřena.
 block.door-large.description = Ze�, která může být otevřena a zavřena.
 block.mender.description = Opakovaně opravuje bloky ve svém dosahu.\nVolitelně umí použít křemík pro posílení dosahu a efektivity.
@@ -1353,7 +2129,7 @@ block.force-projector.description = Vytváří okolo sebe šestiúhelníkové si
 block.shock-mine.description = Vydává energetické výboje při dotyku nepřátelskou jednotkou.
 block.conveyor.description = Přepravuje předměty vpřed.
 block.titanium-conveyor.description = Přepravuje předměty vpřed. Rychlejší, než standardní dopravník.
-block.plastanium-conveyor.description =  Přepravuje předměty vpřed in batches. Přijímá předměty zezadu, a vykládá je do tří směrů vpředu. Vyžaduje více nakládacích a vykládacích bodů pro špi�kový průtok.
+block.plastanium-conveyor.description = Přepravuje předměty vpřed in batches. Přijímá předměty zezadu, a vykládá je do tří směrů vpředu. Vyžaduje více nakládacích a vykládacích bodů pro špi�kový průtok.
 block.junction.description = Funguje jako most pro dva křížící se dopravníky.
 block.bridge-conveyor.description = Přepravuje předměty přes terén nebo budovy.
 block.phase-conveyor.description = Okamžitě přepravuje předměty přes terén nebo budovy. Má delší dosah než standardní přemostění přepravníku, ale vyžaduje energii.
@@ -1364,14 +2140,15 @@ block.router.details = Nezbytné zlo. Použití hned u produk�ních vstupů se
 block.distributor.description = Rozděluje vstupní položky rovnoměrně do sedmi výstupů.
 block.overflow-gate.description = Pokud je směr vpřed ucpán, posílá vstupní položky do stran. Nelze použít vedle jiné brány.
 block.underflow-gate.description = Pokud je směr do stran ucpán, posílá vstupní položky vpřed. Nelze použít vedle jiné brány.
-block.mass-driver.description = Konstrukce pro přepravu položek na velkou vzdálenost. Sesere dávku položek a vystřelí ji k dalšímu hromadnému přenaše�i.
-block.mechanical-pump.description = Pumpuje kapalinu a předává ji dál. Nevyžaduje energii. 
-block.rotary-pump.description = Pumpuje kapalinu a předává ji dál. Vyžaduje energii. 
-block.thermal-pump.description = Pumpuje kapalinu a předává ji dál.
+block.mass-driver.description = Konstrukce pro přepravu položek na velkou vzdálenost. Shromáždí dávku položek a vystřelí ji k dalšímu hromadnému přenaše�i.
+block.mechanical-pump.description = Pumpuje kapalinu a předává ji dál. Nevyžaduje energii.
+block.rotary-pump.description = Pumpuje kapalinu a předává ji dál. Vyžaduje energii.
+block.impulse-pump.description = Pumpuje kapalinu a předává ji dál.
 block.conduit.description = Přepravuje kapaliny vpřed. Používá se spolu s pumpami a dalším potrubím.
 block.pulse-conduit.description = Přepravuje kapaliny vpřed. Přepravuje kapaliny rychleji a ukládá jich více, než standadní potrubí.
 block.plated-conduit.description = Přepravuje kapaliny vpřed. Nepřijímá kapaliny ze stran. Nemá úniky.
 block.liquid-router.description = Přijímá kapalinu z jednoho směru a vydává ji rovnomerně do tří ostatních stran. Umí též uchovat malé množství kapaliny.
+block.liquid-container.description = Ukládá zna�né množství kapaliny. Předává ji do stran, podobně jako směřova� kapalin.
 block.liquid-tank.description = Ukládá velké množství kapaliny. Předává ji do stran, podobně jako směřova� kapalin.
 block.liquid-junction.description = Funguje jako most pro dvě křížící se potrubí.
 block.bridge-conduit.description = Přepravuje kapalinu přes terén a budovy.
@@ -1389,7 +2166,7 @@ block.differential-generator.description = Generuje velké množství energie. V
 block.rtg-generator.description = Používá teplo z rozpadajících se radioaktivních materiálů k výrobě energie v malých dávkách.
 block.solar-panel.description = Vytváří malého množství energie ze Slunce.
 block.solar-panel-large.description = Vytváří malého množství energie ze Slunce. Efektivnější, než základní solárí panel.
-block.thorium-reactor.description = Generuje významné množství energie z thoria. Vyžaduje nepřetržité chlazení. Je-li chlazen nedostate�ně, způsobí zna�nou explozi. 
+block.thorium-reactor.description = Generuje významné množství energie z thoria. Vyžaduje nepřetržité chlazení. Je-li chlazen nedostate�ně, způsobí zna�nou explozi.
 block.impact-reactor.description = Vytváří při špi�kové ú�innosti velké množství energi. Vyspělý generátor, schopný vytvářet při maximálním výkonu obrovská množství energie. Vyžaduje však zna�né množství energie pro nastartování celého procesu.
 block.mechanical-drill.description = Když je umístěn na rudu, generuje donekone�na odpovídající položky, pomalou rychlostí. Použitelný jen pro těžení základních surovin.
 block.pneumatic-drill.description = Vylepšený vrt, který je schopen těžit i titan. Těží vyšší rychlostí než mechanický vrt.
@@ -1403,19 +2180,22 @@ block.core-shard.description = Jádro základny. Pokud je zni�ena, sektor je zt
 block.core-shard.details = První iterace. Kompaktní. Sebereplikující. Vybavená vysílacím pohonem na jedno použití. Není navržena pro meziplanetární cestování.
 block.core-foundation.description = Jádro základny. Dobře opevněná. Pojme více surovin, než základna Odstěpek.
 block.core-foundation.details = Druhá iterace.
-block.core-nucleus.description =  Jádro základny. Velmi dobře opevněná. Dokáže skladovat enormní množství zdrojů.
+block.core-nucleus.description = Jádro základny. Velmi dobře opevněná. Dokáže skladovat enormní množství zdrojů.
 block.core-nucleus.details = Třetí a kone�ná iterace vývoje jádra.
 block.vault.description = Ukládá velké množství předmětů od každého typu. K vyskladnění věcí z trezoru je možné použít odbavova�.
 block.container.description = Ukládá menší množství předmětů od každého typu. K vyskladnění věcí z kontejneru je možné použít odbavova�.
 block.unloader.description = Vyskladňuje vybrané položky z okolních bloků.
-block.launch-pad.description = Vysílá dávky předmětů do přilehlých sektorů. 
+block.launch-pad.description = Vysílá dávky předmětů do přilehlých sektorů.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Střílí střídavé dávky kulek na nepřátele.
 block.scatter.description = Střílí kusy olova, pláty šrotu nebo střepy metaskla na nepřátelské letectvo.
 block.scorch.description = Sežehne pozemní jednotky blízkosti. Velmi efektivní na malé vzdálenosti.
 block.hail.description = Střílí na dálku malé patrony na pozemní nepřátele.
 block.wave.description = Střílí po nepřátelích proudy kapaliny (například strusky). Umí automaticky uhasit oheň, pokud je zásobena vodou.
 block.lancer.description = Po nabití střílí mocné energetické paprsky na pozemní cíle.
-block.arc.description =  Střílí výboje po pozemních jednotkách.
+block.arc.description = Střílí výboje po pozemních jednotkách.
 block.swarmer.description = Střílí po nepřátelích samonaváděcí střely.
 block.salvo.description = Střílí na nepřátele rychlé dávky střel.
 block.fuse.description = Střílí trojici pronikavých výbuchů na blízké nepřátele.
@@ -1423,23 +2203,23 @@ block.ripple.description = Střílí na dálku shluky střel na pozemní jednotk
 block.cyclone.description = Střílí vybuchující dávky na blízké nepřátele.
 block.spectre.description = Střílí velké náboje, které pronikají brněním jak pozemních, tak vzdušných cílů.
 block.meltdown.description = Po nabití střílí nepřetržitý laserový paprsek na nepřátele v okolí. Vyžaduje ke své funkci chlazení.
+block.foreshadow.description = Střílí velké jednocílové blesky na dlouhé vzdálenosti. Upředňostuje nepřátele s větším max životy.
 block.repair-point.description = Nepřetržitě opravuje nejbližší poškozenou jednotku v poli své působnosti.
 block.segment.description = Poškozuje a ni�í příchozí střely. Laserové střely ale zacílit neumí.
 block.parallax.description = Střílí tažný paprsek, který přitahuje vzdušné cíle, a poškozuje je.
 block.tsunami.description = Střílí mocné proudy kapalin na nepřátele. Samo�inně hasí oheň, pokud je zásobován vodou.
 block.silicon-crucible.description = Rafinuje křemík z písku a uhlí za použití pyratitu jako přídavného zdroje tepla. Ú�innější na horkých místech.
 block.disassembler.description = Odděluje ze strusky stopové množství exotických minerálových sou�ástí při malé ú�innosti. Umí vyrobit thorium.
-block.overdrive-dome.description =  Zvyšuje rychlost okolních konstrukcí. Vyžaduje ke svému fungování fázovou tkaninu a křemík.
+block.overdrive-dome.description = Zvyšuje rychlost okolních konstrukcí. Vyžaduje ke svému fungování fázovou tkaninu a křemík.
 block.payload-conveyor.description = Přesouvá velké náklady, jako jednotky z továren.
 block.payload-router.description = Rozděluje vstuní náklad na 3 výstupní směry.
-block.command-center.description = Ovládá chování jednotky několika příkazy.
 block.ground-factory.description = Vyrábí pozemní jednotky. Výstupní jednotky mohou být použity přímo, nebo přesunuty do přestavova�ů na vylepšení.
 block.air-factory.description = Vyrábí letecké jednotky. Výstupní jednotky mohou být použity přímo, nebo přesunuty do přestavova�ů na vylepšení.
 block.naval-factory.description = Vyrání námořní jednotky. Výstupní jednotky mohou být použity přímo, nebo přesunuty do přestavova�ů na vylepšení.
 block.additive-reconstructor.description = Vylepšuje vstupní jednotky na druhou úroveň.
 block.multiplicative-reconstructor.description = Vylepšuje vstupní jednotky na třetí úroveň.
 block.exponential-reconstructor.description = Vylepšuje vstupní jednotky na �tvrtou úroveň.
-block.tetrative-reconstructor.description =Vylepšuje vstupní jednotky na pátou, kone�nou úroveň.
+block.tetrative-reconstructor.description = Vylepšuje vstupní jednotky na pátou, kone�nou úroveň.
 block.switch.description = Přepína�. Jeho stav je možné �íst a ovládat logickými procesory.
 block.micro-processor.description = Spouští posloupnost logických instrukcí ve smy�ce. Dá se použít k ovládání jednotek a konstrukcí.
 block.logic-processor.description = Spouští posloupnost logických instrukcí ve smy�ce. Dá se použít k ovládání jednotek a konstrukcí. Rychlejší než mikroprocesor.
@@ -1449,6 +2229,101 @@ block.memory-bank.description = Ukládá informace z logického procesoru. Vět
 block.logic-display.description = Zobrazuje libovolnou grafiku z logického procesoru.
 block.large-logic-display.description = Zobrazuje libovolnou grafiku z logického procesoru.
 block.interplanetary-accelerator.description = Masivní elektromagnetická věž. Urychlí jádro na únikovou rychlost pro meziplanetární vyslání.
+block.repair-turret.description = Nepřetržitě opravuje nejblížší poškozenou jednotku v jeho blízkosti. Lze volitelně dodávat chlazení pro jeho posílení.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
 
 unit.dagger.description = Střílí základní střely na všechny okolní nepřátele.
 unit.mace.description = Střílí proudy ohně na všechny okolní nepřátele.
@@ -1465,13 +2340,13 @@ unit.atrax.description = Střílí oslabující koule strusky na pozemní cíle.
 unit.spiroct.description = Střílí mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překro�it většinu terénu.
 unit.arkyid.description = Střílí velké mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překro�it většinu terénu.
 unit.toxopid.description = Střílí na nepřátele velké energetické kazetové střely a lasery pronikající brněním. Může překro�it většinu z terénů.
-unit.flare.description =  Střílí základní střely na okolní nepřátele.
-unit.horizon.description =  Pouští shluky bomb na pozemní cíle.
+unit.flare.description = Střílí základní střely na okolní nepřátele.
+unit.horizon.description = Pouští shluky bomb na pozemní cíle.
 unit.zenith.description = Střílí salvy raket na všechny blízké nepřátele.
 unit.antumbra.description = Střílí palbu střel na všechny blízké nepřátele.
 unit.eclipse.description = Vystřelí dva pronikavé lasery a záplavu protivzdušných střel na všechny blízké nepřátele.
 unit.mono.description = Samo�inně těží mě� a olovo a ukládá je do jádra.
-unit.poly.description = Samo�inně obnovuje poškozené konstrukce a pomáhá ostatním jednotkám při stavbě.
+unit.poly.description = Samo�inně obnovuje zni�ené konstrukce a pomáhá ostatním jednotkám při stavbě.
 unit.mega.description = Samo�inně opravuje poškozené konstrukce. Je schopný přenést bloky a malé pozemní jednotky.
 unit.quad.description = Pouští velké bomby na pozemní cíle, opravuje spojenecké konstrukce a poškozuje nepřátele. Je schopen přenést středně velké pozemní jednotky.
 unit.oct.description = Chrání blízké spojence pomocí regenera�ního štítu. Je schopen přenést většinu pozemních jednotek.
@@ -1483,3 +2358,295 @@ unit.omura.description = Střílí na nepřátele průrazné šrouby s dlouhým
 unit.alpha.description = Brání jádro Odštěpek před nepřáteli. Staví konstrukce.
 unit.beta.description = Brání jádro Základ před nepřáteli. Staví konstrukce.
 unit.gamma.description = Brání jádro Atom před nepřáteli. Staví konstrukce.
+unit.retusa.description = Střílí naváděná torpéda na blízké nepřátele. Opravuje spojenecké jednotky.
+unit.oxynoe.description = Střílí strukturo-opravující proudy ohně na blízké nepřátelé. Sestřeluje blízké nepřátelské střely pomocí bodové obranné věže.
+unit.cyerce.description = Střílí naváděcí shlukové rakety na nepřátele. Opravuje spojenecké jednotky.
+unit.aegires.description = Šokuje všechny nepřátelské jednotky a struktury, které vstoupí do je energetického pole. Opravuje spojenecké jednotky.
+unit.navanax.description = Střílí výbušné elektromagnetické impulzivní střely, způsobující solidní poškození na nepřátelskou elektrickou síť a opravuje spojenecké struktury. Taví blízké nepřátele se 4mi autonomními laserovýmí věžmi.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+
+lst.read = Pře�te �íslo z připojené paměti.
+lst.write = Zapíše �íslo do připojené paměti.
+lst.print = Přídá text do vypisovacího buferu.\nNezobrazí nic dokud [accent]Print Flush[] je použít.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Přídá operaci do vykreslovacího buferu.\nNezobrazí nic dokud [accent]Draw Flush[] je použít.
+lst.drawflush = Provede všechny [accent]Draw[] operace na zobrazova� logiky. Pak vy�istí vykreslovací bufer.
+lst.printflush = Provede všechny [accent]Print[] operace do zprávy. Pak vy�istí vypisovací bufer.
+lst.getlink = Získá procesorové propojení pomoci indexu. Za�iná na 0.
+lst.control = Ovládne budovu.
+lst.radar = Lokalizuje jednotky blízko budovy s dosahem.
+lst.sensor = Získá data z budovy nebo jednotky.
+lst.set = Nastaví hodnotu.
+lst.operation = Provede operaci na 1-2 hodnotách.
+lst.end = Sko�í na první po�áte�ní instrukci.
+lst.wait = Čeká ur�itý po�et sekund.
+lst.stop = Halt execution of this processor.
+lst.lookup = Vyhledá typ věci/kapaliny/jednotky/bloku pomocí ID.\nCelkový po�et daného typu může být získán pomocí:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Podmíněně sko�í na danou instrukci.
+lst.unitbind = Nastaví další jednotku daného typu a uloží jí do [accent]@unit[].
+lst.unitcontrol = Kontroluje nastavenou jednotku.
+lst.unitradar = Lokalizuje jednotky kolem nastavené jednotky.
+lst.unitlocate = Lokalizuje daný typ pozice/budovy kdekoliv na mapě.\nVyžaduje nastavenou jednotku.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Stavba budov pomoci jednotek kontrolované procesorem neni povolené.
+
+lenum.type = Typ budovy/jednotky.\nnapř. pro jakýkoliv směrova�, toto vrátí [accent]@router[].\nNikoliv textovou hodnotu.
+lenum.shoot = Vystřelí na ur�itou pozici.
+lenum.shootp = Vystřelí na jednotku/budovu s rychlostní předpovědí.
+lenum.config = Konfigurace budovy, např. třídící věc pro třídi�ku.
+lenum.enabled = Zda je blok povolen.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = Barva osvětlova�e.
+laccess.controller = Kontroler jednotky. Pokud procesor je kontrolován, vrátí procesor\nPokud je ve formaci, vrací vůdce.\nJinak vrací jednotku.
+laccess.dead = Zda jednotka/budova je mrtvá/zni�ená nebo již neplatná.
+laccess.controlled = Vrací:\n[accent]@ctrlProcessor[] pokud kontroler jednotky je procesor\n[accent]@ctrlPlayer[] pokud kontroloer jednotky/budovy je hrá�\n[accent]@ctrlFormation[] pokud jednotka je ve formaci\nJiank, 0.
+laccess.progress = Průběh akce, 0 do 1.\nVrací průběh výroby, přebití věže nebo stavby.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Neznámé
+lcategory.unknown.description = Nezařazené instrukce.
+lcategory.io = Vstup a Výstup
+lcategory.io.description = Upravuje obsah paměťních bloků a procesorových pamětí.
+lcategory.block = Ovládaní Bloku
+lcategory.block.description = Interaktovat s bloky.
+lcategory.operation = Operace
+lcategory.operation.description = Logické operace.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = Svět
+lcategory.world.description = Ovládá, jak se svět chová.
+
+graphicstype.clear = Vyplní zobrazova� danou barvou.
+graphicstype.color = Vybere barvu pro další vykreslovací operace.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Nastaví šířku �áry.
+graphicstype.line = Nakreslí �áru
+graphicstype.rect = Vyplní obdélník.
+graphicstype.linerect = Nakreslí obrys obdélníku.
+graphicstype.poly = Vyplní pravidelný mnohoúhelník.
+graphicstype.linepoly = Nakreslí obrys pravidelného mnohoúhelníku.
+graphicstype.triangle = Vyplní trojúhelník.
+graphicstype.image = Vykreslí obrázek nějakého obsahu.\nnapř.: [accent]@router[] nebo [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Vždy pravda.
+lenum.idiv = Číselné dělení.
+lenum.div = Dělení.\nVrací [accent]null[], pokud je děleno nulou.
+lenum.mod = Modulo (Vydělí 2 hodnoty a vrací zbytek).
+lenum.equal = Stejné. Vynucuje typy.\nNon-null objekty porovnané s �ísly se stanou 1, jinak 0.
+lenum.notequal = Není stejné. Vynucuje typy.
+lenum.strictequal = Přísná rovnost. Nevynucuje typy.\nMůže být použít, jestli je [accent]null[].
+lenum.shl = Bitový-shift vlevo.
+lenum.shr = Bitový-shift vpravo.
+lenum.or = Bitový OR.
+lenum.land = Logický AND.
+lenum.and = Bitový AND.
+lenum.not = Bitové přehození.
+lenum.xor = Bitový XOR.
+
+lenum.min = Menší �íslo ze dvou �ísel.
+lenum.max = Větší �íslo ze dvou �ísel.
+lenum.angle = Úhel vektoru ve stupních.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Délka vektoru.
+
+lenum.sin = Sinus, ve stupních.
+lenum.cos = Kosinus, ve stupních.
+lenum.tan = Tangent, ve stupních.
+
+lenum.asin = Arkus sinus, ve stupních.
+lenum.acos = Arkus kosinus, ve stupních.
+lenum.atan = Arkus tangent, ve stupních.
+
+#not a typo, look up 'range notation'
+lenum.rand = Náhodné �íslo v rozměru <0, value).
+lenum.log = Logaritmus (ln).
+lenum.log10 = Základní 10 logaritmus.
+lenum.noise = 2D simplexův noise.
+lenum.abs = Absolutní hodnota.
+lenum.sqrt = Odmocnina.
+
+lenum.any = Jakákoliv jednotka.
+lenum.ally = Spojenecká jednotka.
+lenum.attacker = Jednotka se zbraní.
+lenum.enemy = Nepřátelská jednotka.
+lenum.boss = Jednotka strážce.
+lenum.flying = Lítající jednotka.
+lenum.ground = Pozemní jednotka.
+lenum.player = Jednotka kontrolovaná hrá�em.
+
+lenum.ore = Ložisko rudy.
+lenum.damaged = Poškozená spojenecká budova.
+lenum.spawn = Nepřátelský bod zrození.\nMůže být jádro nebo pozice.
+lenum.building = Budova ve specifické skupině.
+
+lenum.core = Jakékoliv jádro.
+lenum.storage = Uskladňovací budova, např. Trezor.
+lenum.generator = Budova generující energii.
+lenum.factory = Budovy přenášející suroviny.
+lenum.repair = Opravovací body.
+lenum.battery = Jakákoliv baterka.
+lenum.resupply = Zásobovací body.\nRelevantní pouze v případě, že možnost [accent]"Jednotky vyžadují munici"[] je povolená.
+lenum.reactor = Rázový/Thoriový reaktor.
+lenum.turret = Jakákoliv věž.
+
+sensor.in = Budova/jednotka.
+
+radar.from = Budova pro snímání.\nDélka dosahu sensoru je limitovaná dosahu budovy.
+radar.target = Filtr pro snímací jednotky.
+radar.and = Přídavné filtry.
+radar.order = Řazovací pořadí. 0 = naopak.
+radar.sort = Metrika, podle které se mají výsledky seřadit.
+radar.output = Hodnota pro zápis výstupní jednotky.
+
+unitradar.target = Filtr pro snímací jednotky.
+unitradar.and = Přídavné filtry.
+unitradar.order = Řazovací pořadí. 0 = naopak.
+unitradar.sort = Metrika, podle které se mají výsledky seřadit.
+unitradar.output = Hodnota pro zápis výstupní jednotky.
+
+control.of = Budova ke kontrole.
+control.unit = Jednotka/Budova k zamíření.
+control.shoot = Zda střílet.
+
+unitlocate.enemy = Zda lokalizovat nepřátelské budovy.
+unitlocate.found = Zda objekt byl znalezen.
+unitlocate.building = Výstup hodnot pro lokalizovanou budovu.
+unitlocate.outx = Výstup X pozice.
+unitlocate.outy = Výstup Y pozice.
+unitlocate.group = Vyhledat skupinu budov.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Nehýbat se, ale pokra�ovat ve stavění/těžení.\nVýchozí stav.
+lenum.stop = Přestat pohybovat se/těžit/stavět.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Pohnout se na ur�ité místo.
+lenum.approach = Přiblížit se k ur�ité pozici s ur�itou vzdálenosti.
+lenum.pathfind = Nalézt cestu k nepřátelskému spawnu/bodu zrození
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Střelit na pozici.
+lenum.targetp = Vystřelí na jednotku/budovu s rychlostní předpovědí
+lenum.itemdrop = Zahodit věc.
+lenum.itemtake = Vzít věc z budovy.
+lenum.paydrop = Vyhodit aktuální náklad.
+lenum.paytake = Vzít náklad na ur�ité pozici.
+lenum.payenter = Vstoupit/přistat na nákladní blok, na kterém jednotka je.
+lenum.flag = Číselné ozna�ení (flag) jednotky.
+lenum.mine = Těžit na pozici.
+lenum.build = Postavit strukturu.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Zkontrolovat, jestli jednotka je blízko dané pozice.
+lenum.boost = Za�ít/Přestat posilovat.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 71609c0d2d..76c71da909 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1,27 +1,30 @@
 credits.text = Lavet af [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
 credits = Credits
-contributors = Oversættere og Bidragsyder
+contributors = Oversættere og bidragsyder
 discord = Tilmeld dig Mindustry Discord!
 link.discord.description = Det officielle Mindustry Discord chatrum
 link.reddit.description = Mindustry subreddit
-link.github.description = Spillets source code
+link.github.description = Spillets kildekode
 link.changelog.description = Liste over opdateringer
 link.dev-builds.description = Ustabile development builds
-link.trello.description = Det officielle Trello board for planlagte udvidelser
-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.trello.description = Det officielle Trello-board for planlagte udvidelser
+link.itch.io.description = Mindustry's Itch.io-side, med muligheder for download
+link.google-play.description = Google Play Store
+link.f-droid.description = F-Droid-katalog
+link.wiki.description = Det officielle Mindustry-wiki
 link.suggestions.description = Foreslå nye ændringer
+link.bug.description = Found one? Report it here
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 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.
+screenshot.invalid = Banen er for stor; der er ikke nok hukommelse til et skærmbillede.
 gameover = Game Over
+gameover.disconnect = Disconnect
 gameover.pvp = [accent] {0}[] hold har vundet!
+gameover.waiting = [accent]Waiting for next map...
 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
+copied = Kopieret.
+indev.notready = Denne del af spillet er ikke klar endnu.
 
 load.sound = Lyd
 load.map = Bane
@@ -31,21 +34,34 @@ load.system = System
 load.mod = Mods
 load.scripts = Scripts
 
-be.update = En ny Bleeding Edge version er tilgængelig:
-be.update.confirm = Download den og genstart nu?
-be.updating = Opdatere...
+be.update = En ny "bleeding edge"-version er tilgængelig:
+be.update.confirm = Vil du downloade og genstarte nu?
+be.updating = Opdaterer ...
 be.ignore = Ignorer
 be.noupdates = Ingen opdateringer fundet
 be.check = Søg efter opdateringer
+mods.browser = Mod Browser
+mods.browser.selected = Selected mod
+mods.browser.add = Install
+mods.browser.reinstall = Reinstall
+mods.browser.view-releases = View Releases
+mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published.
+mods.browser.latest = <Latest>
+mods.browser.releases = Releases
+mods.github.open = Repo
+mods.github.open-release = Release Page
+mods.browser.sortdate = Sort by recent
+mods.browser.sortstars = Sort by stars
 
 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
+schematic.search = Search schematics...
+schematic.replace = En skabelon med det navn eksisterer allerede - vil du erstatte denne?
+schematic.exists = En skabelon med det navn eksisterer allerede.
+schematic.import = Importer skabelon ...
+schematic.exportfile = Exporter fil
+schematic.importfile = Importer fil
 schematic.browseworkshop = Søg i Workshop
 schematic.copy = Kopier til udklipsholder
 schematic.copy.import = Importer fra udklipsholder
@@ -53,39 +69,50 @@ schematic.shareworkshop = Del på Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Vend skabelon
 schematic.saved = Skabelon gemt.
 schematic.delete.confirm = Denne skabelon vil være væk for altid.
-schematic.rename = Omdøb skabelon
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blokke
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Skabeloner er slået fra.[]\nDu har ikke lov til at bruge skabeloner på denne [accent]bane[] eller [accent]server.
+schematic.tags = Tags:
+schematic.edittags = Edit Tags
+schematic.addtag = Add Tag
+schematic.texttag = Text Tag
+schematic.icontag = Icon Tag
+schematic.renametag = Rename Tag
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Delete this tag completely?
+schematic.tagexists = That tag already exists.
+stats = Stats
+stats.wave = Waves Defeated
+stats.unitsCreated = Units Created
+stats.enemiesDestroyed = Enemies Destroyed
+stats.built = Buildings Built
+stats.destroyed = Buildings Destroyed
+stats.deconstructed = Buildings Deconstructed
+stats.playtime = Time Played
 
-stat.wave = Invasionsbølger nedslået:[accent] {0}
-stat.enemiesDestroyed = Fjender nedlagt:[accent] {0}
-stat.built = Bygninger opført:[accent] {0}
-stat.destroyed = Bygninger ødelagt:[accent] {0}
-stat.deconstructed = Bygninger nedrevet:[accent] {0}
-stat.delivered = Ressourcer afsendt:
-stat.playtime = Spilletid:[accent] {0}
-stat.rank = Endelig Rang: [accent]{0}
-
-globalitems = [accent]Global Items
-map.delete = Er du sikker på at du vil slette banen"[accent]{0}[]"?
-level.highscore = High Score: [accent]{0}
+globalitems = [accent]Globale Genstande
+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:
-coreattack = < Kerne er under angreb!! >
+coreattack = < Kerne er under angreb! >
 nearpoint = [[ [scarlet]FORLAD INVASIONSZONE OMGÃ…ENDE[] ]\n Fare for udslettelse
-database = Kerne database
+database = Kerne-database
+database.button = Database
 savegame = Gem spil
 loadgame = Hent spil
 joingame = Deltag i spil
-customgame = Bregerdefineret spil
+customgame = Brugerdefinerede spil
 newgame = Nyt spil
 none = <ingen>
+none.found = [lightgray]<none found>
+none.inmap = [lightgray]<none in map>
 minimap = Kort
 position = Position
 close = Luk
-website = Webside
+website = Hjemmeside
 quit = Afslut
-save.quit = Gem & afslut
+save.quit = Gem og afslut
 maps = Baner
 maps.browse = Søg i baner
 continue = Fortsæt
@@ -95,40 +122,54 @@ pickcolor = Vælg farve
 preparingconfig = Klargører konfiguration
 preparingcontent = Klargører indhold
 uploadingcontent = Uploading indhold
-uploadingpreviewfile = Uploading Forhåndsvisnings File
+uploadingpreviewfile = Uploader forhåndsvisnings-fil
 committingchanges = Sender ændringer
 done = Færdig
 feature.unsupported = Din enhed understøtter ikke denne funktion
-
-mods.alphainfo = Vær opmærksom på at mods ikke er færdigudviklet.[scarlet]De kan indeholde mange fejl[].\n Hvis du oplever fejl can du reportére dem på Mindustry GitHub eller Discord.
+mods.initfailed = [red]âš [] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
 mods = Mods
 mods.none = [LIGHT_GRAY]Ingen mods fundet!
-mods.guide = Modding guide
-mods.report = Reportér fejl
+mods.guide = Modding-guide
+mods.report = Rapportér fejl
 mods.openfolder = Ã…ben mod mappe
-mods.reload = Reload
-mods.reloadexit = The game will now exit, to reload mods.
+mods.viewcontent = View Content
+mods.reload = Genindlæs
+mods.reloadexit = Spillet vil nu genstarte, for at indlæse mods.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktiveret
 mod.disabled = [scarlet]Deaktiveret
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 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.version = Version:
+mod.content = Indhold:
+mod.delete.error = Kan ikke slette mod - tilhørende filer er muligvis i brug.
+mod.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Indholds fejl
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Fejl ved afhentning af indhold.
 mod.noerrorplay = [scarlet]Du har mods med fejl.[] Deaktiver det eller løs fejl før du starter spillet.
-mod.nowdisabled = [scarlet]Mod '{0}' mangler afhængigheder:[accent] {1}\n[lightgray]Disse mods skal hentes først.\nDette mod vil blive deaktiver automatisk.
+mod.nowdisabled = [scarlet]Mod '{0}' mangler afhængigheder:[accent] {1}\n[lightgray]Disse mods skal hentes først.\nDenne mod vil blive deaktiveret automatisk.
 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.import = Importer mod
+mod.import.file = Importer fil
+mod.import.github = Importer mod fra GitHub
+mod.jarwarn = [scarlet]JAR er ekstraordinært usikre.[]\nVær sikker på at kilden er troværdig!
+mod.item.remove = Denne genstand er tilføjet af [accent] '{0}'[]. Afinstallér denne 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}
@@ -139,398 +180,626 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Om
 name = Navn:
 noname = Vælg et[accent] spiller navn[] først.
-planetmap = Planet Map
-launchcore = Launch Core
+search = Search:
+planetmap = Planet-kort
+launchcore = Affyr kerne
 filename = Fil navn:
 unlocked = Nyt indhold tilgængeligt!
+available = New research available!
+unlock.incampaign = < Unlock in campaign for details >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Færdiggjort
 techtree = Teknologi træ
+techtree.select = Tech Tree Selection
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Load
+research.discard = Discard
 research.list = [lightgray]Forskning:
 research = Udforsk
 researched = [lightgray]{0} Udforsket.
-research.progress = {0}% complete
+research.progress = {0}% færdiggjort
 players = {0} spillere
 players.single = {0} spiller
 players.search = search
-players.notfound = [gray]no players found
+players.notfound = [gray]Ingen spillere fundet.
 server.closing = [accent]Lukker server...
-server.kicked.kick = Du er blevet kicked fra serveren!
-server.kicked.whitelist = Du er ikke whitelisted her.
+server.kicked.kick = Du er blevet sparket ud af serveren!
+server.kicked.whitelist = Du er ikke på gæstelisten her.
 server.kicked.serverClose = Server lukket.
-server.kicked.vote = Du er blevet vote-kicked. Farvel.
-server.kicked.clientOutdated = Forældet client! Opdater dit spil!
-server.kicked.serverOutdated = Forældet server! Få værten til at opdatere!
-server.kicked.banned = Du er banned på denne server.
+server.kicked.vote = Du er blevet stemt ud af serveren. Hygge-hejsa.
+server.kicked.clientOutdated = Forældet klient! Opdater dit spil!
+server.kicked.serverOutdated = Forældet server! Få værten til at opdatere serveren!
+server.kicked.banned = Du er banlyst fra denne server.
 server.kicked.typeMismatch = Denne server er ikke kompatibel med din version.
-server.kicked.playerLimit = Denne server are fuld. Vent på en ledig plads.
-server.kicked.recentKick = Du er blevet kicked for nylig.\nVent før du forsøger at forbinde igen.
+server.kicked.playerLimit = Denne server er fuld - vent på en ledig plads.
+server.kicked.recentKick = Du er blevet sparket ud for nylig.\nVent før du forsøger at forbinde igen.
 server.kicked.nameInUse = Der er allerede nogen med dette navn\npå denne server.
 server.kicked.nameEmpty = Det valgte navn er ugyldigt.
-server.kicked.idInUse = Du er allered på denne server! Det er ikke tilladt er forbinde med flere konti.
-server.kicked.customClient = Denne server understøtter ikke brugerdefineret versioner. Download en officiel version.
+server.kicked.idInUse = Du er allerede på denne server! Det er ikke tilladt er forbinde fra flere klienter.
+server.kicked.customClient = Denne server understøtter ikke brugerdefinerede versioner. Download en officiel version af spillet.
 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.
-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
+server.kicked.serverRestarting = Serveren genstarter.
+server.versions = Din version:[accent] {0}[]\nServerens version:[accent] {1}[]
+host.info = [accent]Afhold[]-knappen starter en server på port [scarlet]6567[]. Enhver på samme [lightgray]internet eller lokale 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 via IP\n\n[lightgray]Note: Hvis nogen har problemer med at forbinde til din LAN-server, så sørg for, at du 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 servere på dit [accent]lokale netværk[].\nBåde LAN- og WAN-flerspilleri understøttes.\n\n[lightgray]Note: Der er ingen automatisk, global server-liste; Hvis du ønsker at forbinde til en server via IP, skal du spørge værten om serverens IP.
+hostserver = Ã…ben multiplayer-spil
 invitefriends = Inviter venner
 hostserver.mobile = Afhold\nspil
 host = Afhold
 hosting = [accent]Starter server...
 hosts.refresh = Genindlæs
-hosts.discovering = Finder LAN spil
-hosts.discovering.any = Discovering games
+hosts.discovering = Finder LAN-spil
+hosts.discovering.any = Udforsker spil
 server.refreshing = Genindlæser server
 hosts.none = [lightgray]Ingen lokale spil fundet!
 host.invalid = [scarlet]Kan ikke forbinde til vært.
 
 servers.local = Lokale Servere
+servers.local.steam = Open Games & Local Servers
 servers.remote = Afsides Servere
 servers.global = Globale Servere
+servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
+servers.showhidden = Show Hidden Servers
+server.shown = Shown
+server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Følg spiller
-trace.playername = Spiller navn: [accent]{0}
+trace.playername = Spiller-navn: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Unik ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobil client: [accent]{0}
-trace.modclient = Brugerdefineret client: [accent]{0}
-invalidid = Ugyldig client ID! Indsend en fejlrapport.
-server.bans = Bans
+trace.modclient = Brugerdefineret klient: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
+invalidid = Ugyldig klient-ID! Indsend en fejlrapport.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
+server.bans = Banlysninger
 server.bans.none = Ingen banned Spillere fundet!
-server.admins = Admins
-server.admins.none = Ingen admins fundet!
+server.admins = Administratorer
+server.admins.none = Ingen administratorer fundet!
 server.add = Tilføj server
-server.delete = Er du sikker på at du ønsker at slette denne server?
+server.delete = Er du sikker på, at du ønsker at slette denne server?
 server.edit = Rediger server
 server.outdated = [crimson]Forældet server![]
 server.outdated.client = [crimson]Forældet client![]
 server.version = [gray]v{0} {1}
 server.custombuild = [accent]Brugerdefineret version
-confirmban = Er du sikker på at du ønsker at banne denne spiller?
-confirmkick = Er du sikker på at du ønsker at kicke denne spiller?
-confirmvotekick = Er du sikker på at du ønsker at vote-kicke denne spiller?
-confirmunban = Er du sikker på at du ønsker at unbanne denne spiller?
-confirmadmin = Er du sikker på at du ønsker at gøre denne spiller til admin?
-confirmunadmin = Er du sikker på at du ønsker at fjerne admin status fra denne spiller?
+confirmban = Er du sikker på, at du ønsker at banne denne spiller?
+confirmkick = Er du sikker på, at du ønsker at kicke denne spiller?
+confirmunban = Er du sikker på, at du ønsker at fjerne banlysning af denne spiller?
+confirmadmin = Er du sikker på, at du ønsker at gøre denne spiller til administrator?
+confirmunadmin = Er du sikker på at du ønsker at fjerne administrator-rolle fra denne spiller?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Deltag i spil
 joingame.ip = Addresse:
 disconnect = Afbryd forbindelse
-disconnect.error = Forbindelses fejl.
+disconnect.error = Forbindelsesfejl.
 disconnect.closed = Forbindelse afbrudt.
 disconnect.timeout = Maksimal ventetid overskredet.
-disconnect.data = Failed to load world data!
-cantconnect = Unable to join game ([accent]{0}[]).
-connecting = [accent]Connecting...
-connecting.data = [accent]Loading world data...
+disconnect.data = Kunne ikke indlæse bane-data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
+cantconnect = Kunne ikke deltage i spil ([accent]{0}[]).
+connecting = [accent]Forbinder...
+reconnecting = [accent]Reconnecting...
+connecting.data = [accent]Indlæser bane-data...
 server.port = Port:
-server.addressinuse = Address already in use!
-server.invalidport = Invalid port number!
-server.error = [crimson]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 = [crimson]Failed to import save: [accent]{0}
-save.export.fail = [crimson]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!
+server.invalidport = Ugyldigt port-nummer!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [crimson]Der skete en fejl.
+save.new = Nyt gem
+save.overwrite = Er du sikker på, at du vil overskrive\ndette gem?
+save.nocampaign = Individual save files from the campaign cannot be imported.
+overwrite = Overskriv
+save.none = Ingen gem fundet!
+savefail = Kunne ikke gemme spil!
+save.delete.confirm = Er du sikker på at du vil slette dette gem?
+save.delete = Slet
+save.export = Eksporter gem
+save.import.invalid = [accent]Dette gem er i stykker!
+save.import.fail = [crimson]Kunne ikke importere gem: [accent]{0}
+save.export.fail = [crimson]Kunne ikke eksportere gem: [accent]{0}
+save.import = Import Gem
+save.newslot = Gem-navn:
+save.rename = Omdøb
+save.rename.text = Nyt navn:
+selectslot = Vælg et gem.
+slot = [accent]Gem {0}
+editmessage = Ændr besked
+save.corrupted = Gem-filen er ugyldig eller i stykker!
 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
+on = Til
+off = Fra
+save.search = Search saved games...
+save.autosave = Auto-gem: {0}
+save.map = Bane: {0}
+save.wave = Bølge {0}
+save.mode = Spil-tilstand: {0}
+save.date = Sidste gem: {0}
+save.playtime = Spiltid: {0}
+warning = Advarsel.
+confirm = Bekræft
+delete = Slet
+view.workshop = Se på Workshop
+workshop.listing = Ændr Workshop-indlæg
+ok = Okay
+open = Ã…ben
 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.cap = [accent]Wave {0}/{1}
-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
+cancel = Afblæs
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
+openlink = Ã…ben Link
+copylink = Kopier Link
+back = Tilbage
+max = Max
+objective = Map Objective
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
+data.export = Eksporter data
+data.import = Importer data
+data.openfolder = Ã…ben datamappe.
+data.exported = Data eksporteret.
+data.invalid = Dette er ikke acceptabel spildata.
+data.import.confirm = Import af ekstern spildata vil slette[scarlet] alt[] dit nuværende fremskridt.\n[accent]Dette kan ikke gøres om![]\n\nSå snart din data er importeret, vil spillet lukke.
+quit.confirm = Er du sikker på at du vil afslutte?
+loading = [accent]Indlæser...
+downloading = [accent]Downloading...
+saving = [accent]Gemmer...
+respawn = [accent][[{0}][] for at genopstå ved kernen
+cancelbuilding = [accent][[{0}][] for at rydde plan
+selectschematic = [accent][[{0}][] for at etablere skabelon
+pausebuilding = [accent][[{0}][] for at pause byggeproces
+resumebuilding = [scarlet][[{0}][] for at genoptage byggeproces
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
+wave = [accent]Bølge {0}
+wave.cap = [accent]Bølge {0}/{1}
+wave.waiting = [lightgray]Bølge om {0}
+wave.waveInProgress = [lightgray]Bølge i gang
+waiting = [lightgray]Venter...
+waiting.players = Venter på spillere...
+wave.enemies = [lightgray]{0} Fjender tilbage
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
+wave.enemy = [lightgray]{0} Fjende tilbage
 wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
 wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
-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}
+loadimage = Indlæs billede
+saveimage = Gem billede
+unknown = Ukendt
+custom = Brugerdefineret
+builtin = Indbygget
+map.delete.confirm = Er du sikker på, at du vil slette dette spil? Dette kan ikke blive genskabt!
+map.random = [accent]Tilfældig bane
+map.nospawn = Denne bane har ikke nogen kerne, spillere kan opstå fra! Tilføj en {0} kerne til denne bane via bane-editoren.
+map.nospawn.pvp = Denne bane har ikke nogen kerne, modstandere kan opstå fra! Tilføj en [scarlet]ikke-orange[] kerne til banen via bane-editoren.
+map.nospawn.attack = Denne bane har ikke nogen kerne, spillerne kan angribe! Tilføj en {0} kerne til banen via bane-editoren.
+map.invalid = Kunne ikke indlæse bane: bane-filen er i stykker.
+workshop.update = Opdater genstand
+workshop.error = Der skete en fejl ved indlæsning af Workshop-detaljer: {0}
+map.publish.confirm = Er du sikker på, at du vil offentliggøre denne bane?\n\n[lightgray]Vær sikker på, at du overholder Workshop-EULA'en først, for at din bane kan blive godkendt!
+workshop.menu = Vælg hvad du vil gøre med denne genstand.
+workshop.info = Genstands-Info
+changelog = Changelog (ikke påkrævet):
+updatedesc = Overwrite Title & Description
+eula = Steam-EULA
+missing = Denne genstand er blevet slettet eller rykket.\n[lightgray]Workshop-indlægget er blevet automatisk frakoblet.
+publishing = [accent]Offentliggør...
+publish.confirm = Er du sikker på, at du vil offentliggøre dette?\n\n[lightgray]Vær sikker på, at du overholder Workshop-EULA'en først, for at dit indlæg kan blive godkendt!
+publish.error = Der skete en fejl ved offentliggørelsen: {0}
+steam.error = Kunne ikke etablere Steam-forbindelse.\nFejl: {0}
+editor.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
-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
+editor.brush = Pensel
+editor.openin = Ã…ben i editor
+editor.oregen = Malm-generering
+editor.oregen.info = Malm-generering:
+editor.mapinfo = Bane-info
+editor.author = Skaber:
+editor.description = Beskrivelse:
+editor.nodescription = En banes beskrivelse skal være længere end 4 tegn, for at kunne blive offentliggjort.
+editor.waves = Bølge:
+editor.rules = Regler:
+editor.generation = Generering:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
+editor.ingame = Ændr i spil
+editor.playtest = Playtest
+editor.publish.workshop = Publicer på Workshop
+editor.newmap = Ny bane
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 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.
+waves.title = Bølger
+waves.remove = Fjern
+waves.every = hver
+waves.waves = bølge(r)
+waves.health = health: {0}%
+waves.perspawn = per opstandelsessted
+waves.shields = skjold/bølge
+waves.to = til
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
+waves.guardian = Vogter
+waves.preview = Forhåndsvisning
+waves.edit = Rediger...
+waves.random = Random
+waves.copy = Kopier til udklipsholder
+waves.load = Indlæs fra udklipsholder
+waves.invalid = Ugyldige bølger i udklipsholder.
+waves.copied = Bølger kopieret.
+waves.none = Ingen fjender defineret.\nBemærk at bølger uden fjender automatisk erstattes af standard-layoutet.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
-wavemode.counts = counts
-wavemode.totals = totals
-wavemode.health = health
+wavemode.counts = tal
+wavemode.totals = i alt
+wavemode.health = liv
+all = All
 
-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.default = [lightgray]<standard>
+details = Detaljer...
+edit = Rediger...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
+editor.name = Navn:
+editor.spawn = PÃ¥kald enhed
+editor.removeunit = Fjern enhed
+editor.teams = Hold
+editor.errorload = Fejl ved indlæsning af fil.
+editor.errorsave = Fejl ved eksportering af fil.
+editor.errorimage = Det er et billede, ikke en bane.\n\nHvis du vil importere en bane fra 3.5/en build-40-bane, så brug knappen 'Importer eftermægle-bane' i editoren.
+editor.errorlegacy = Denne bane er forældet, og bruger et eftermægle-format, der ikke længere understøttes.
+editor.errornot = Dette er ikke en bane-fil.
+editor.errorheader = Denne bane er enten ugyldig eller i stykker.
+editor.errorname = Banen har ikke noget navn. Forsøger du at gemme filen?
+editor.errorlocales = Error reading invalid locale bundles.
+editor.update = Opdater
+editor.randomize = Tilfældiggør
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
+editor.apply = Anvend
+editor.generate = Generer
+editor.sectorgenerate = Sector Generate
+editor.resize = Omskaler
+editor.loadmap = Indlæs bane
+editor.savemap = Gem bane
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
+editor.saved = Gemt!
+editor.save.noname = Din bane har intet navn! Giv den et navn under 'bane-information'-menuen.
+editor.save.overwrite = Din bane overskriver en indbygget bane! Vælge et andet navn under 'bane-information'-menuen.
+editor.import.exists = [scarlet]Kunne ikke importere:[] en indbygget bane ved navn '{0}' eksisterer allerede!
+editor.import = Importer...
+editor.importmap = Importer bane
 editor.importmap.description = Import an already existing map
-editor.importfile = Import File
-editor.importfile.description = Import an external map file
-editor.importimage = Import Legacy Map
-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 a map image file
-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.importfile = Importer fil
+editor.importfile.description = Importer en ekstern bane-fil
+editor.importimage = Importer eftermægle-bane
+editor.importimage.description = Importer en ekstern bane-billed-fil
+editor.export = Exporter...
+editor.exportfile = Exporter fil
+editor.exportfile.description = Eksporter bane-fil
+editor.exportimage = Eksporter terræn-billede
+editor.exportimage.description = Eksporter en bane-billed-fil
+editor.loadimage = Importer terræn
+editor.saveimage = Eksporter terræn
+editor.unsaved = [scarlet]Du har ændringer, der ikke er gemt![]\nEr du sikker på, at du vil afbryde?
+editor.resizemap = Omskaler bane
 editor.mapname = Map Name:
-editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
-editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
-editor.exists = A map with this name already exists.
-editor.selectmap = Select a map to load:
+editor.overwrite = [accent]Advarsel!\nDenne fil overskrider en eksisterende bane.
+editor.overwrite.confirm = [scarlet]Advarsel![] En bane med dette navn eksisterer allerede. Er du sikker på, at du vil overskrive det?
+editor.exists = En bane med dette navn eksisterer allerede.
+editor.selectmap = Vælg en bane, du vil indlæse:
 
-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.
+toolmode.replace = Erstat
+toolmode.replace.description = Tegner udelukkende på solide blokke.
+toolmode.replaceall = Erstat alt
+toolmode.replaceall.description = Erstatter alle blokke i banen.
+toolmode.orthogonal = Retvinklet
+toolmode.orthogonal.description = Tegner kun retvinklede linjer.
+toolmode.square = Kvadrat
+toolmode.square.description = Kvadrat-pensel.
+toolmode.eraseores = Udvisk malm
+toolmode.eraseores.description = Udvisker udelukkende malm.
+toolmode.fillteams = Udfyld hold
+toolmode.fillteams.description = Udfylder hold i stedet for blokke.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
+toolmode.drawteams = Tegn hold
+toolmode.drawteams.description = Tegner hold i stedet for blokke.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
-filters.empty = [lightgray]No filters! Add one with the button below.
-filter.distort = Distort
-filter.noise = Noise
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
-filter.corespawn = Core Select
+filters.empty = [lightgray]Ingen filtre! Tilføj filter nedenfor.
+filter.distort = Forvræng
+filter.noise = Støj
+filter.enemyspawn = Fjendtligt opstandelsessted-vælger
+filter.spawnpath = Sti til opstandelse
+filter.corespawn = Kerne-valg
 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.oremedian = Malm-median
+filter.blend = Blanding
+filter.defaultores = Standard-malm
+filter.ore = Malm
+filter.rivernoise = Flod-støj
+filter.mirror = Spejl
+filter.clear = Ryd
+filter.option.ignore = Ignorer
+filter.scatter = Spreder
+filter.terrain = Terræn
+filter.logic = Logic
+filter.option.scale = Skaler
 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.target = Target
-filter.option.wall = Wall
-filter.option.ore = Ore
-filter.option.floor2 = Secondary Floor
-filter.option.threshold2 = Secondary Threshold
+filter.option.mag = Størrelse
+filter.option.threshold = Tærskel
+filter.option.circle-scale = Cirkel-skaler
+filter.option.octaves = Oktaver
+filter.option.falloff = Frafald
+filter.option.angle = Vinkel
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
+filter.option.amount = Mængde
+filter.option.block = Blok
+filter.option.floor = Gulv
+filter.option.flooronto = Udvalgt gulv
+filter.option.target = MÃ¥l
+filter.option.replacement = Replacement
+filter.option.wall = Mur
+filter.option.ore = Malm
+filter.option.floor2 = Sekundært gulv
+filter.option.threshold2 = Sekundær terskel
 filter.option.radius = Radius
-filter.option.percentile = Percentile
+filter.option.percentile = Percentil
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
-width = Width:
-height = Height:
+width = Bredde:
+height = Højde:
 menu = Menu
-play = Play
-campaign = Campaign
-load = Load
-save = Save
+play = Spil
+campaign = Kampagne
+load = Indlæs
+save = Gem
 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
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
+language.restart = Genstart spillet, så sprog-ændring kan træde i kraft.
+settings = Indstillinger
+tutorial = Kursus
+tutorial.retake = Gentag Kursus
 editor = Editor
-mapeditor = Map Editor
+mapeditor = Bane-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}
+abandon = Forlad
+abandon.text = Denne zone og alle tilhørende resurser tilfalder fjenden.
+locked = LÃ¥st
+complete = [lightgray]Færdiggjort:
+requirement.wave = Nå bølge {0} i {1}
+requirement.core = Destruer fjendens kerne i {0}
 requirement.research = Research {0}
-requirement.capture = Capture {0}
-bestwave = [lightgray]Best Wave: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
-uncover = Uncover
-configure = Configure Loadout
-loadout = Loadout
-resources = Resources 
-bannedblocks = Banned Blocks
-addall = Add All
+requirement.produce = Produce {0}
+requirement.capture = Overtag {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
+launch.text = Affyr
+map.multiplayer = Only the host can view sectors.
+uncover = Afdæk
+configure = Konfigurer udrustning
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
+loadout = Udrustning
+resources = Resurser
+resources.max = Max
+bannedblocks = Banlyste blokke
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
+addall = Tilføj alle
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{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.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
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = Mængde skal være mellem 0 og {0}.
+add = Tilføj...
+guardian = Guardian
 
-connectfail = [crimson]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.
+connectfail = [crimson]Forbindelsesfejl:\n\n[accent]{0}
+error.unreachable = Kunne ikke forbinde til serveren.\nEr adressen mon korrekt indtastet?
+error.invalidaddress = Ugyldig adresse.
+error.timedout = Tiden udløb!\nTjek om værten har port forwarded ordentligt, og hvorvidt adressen er korrekt indtastet!
+error.mismatch = Pakkefejl:\nDette kan skyldes, at klientens version ikke matcher serverens.\nDobbeltjek, at du og værten har samme Mindustry-version!
+error.alreadyconnected = Allerede forbundet.
+error.mapnotfound = Bane-filen er blevet væk!
+error.io = Network I/O-fejl.
+error.any = Ukendt netværksfejl.
+error.bloom = Kunne ikke etablere bloom-effekt.\nMåske understøtter din enhed den ikke.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
+weather.rain.name = Regn
+weather.snowing.name = Sne
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
-weather.fog.name = Fog
+weather.fog.name = TÃ¥ge
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 
 sectors.unexplored = [lightgray]Unexplored
-sectors.resources = Resources:
-sectors.production = Production:
+sectors.resources = Resurser:
+sectors.production = Produktion:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Time:
+sectors.threat = Threat:
+sectors.wave = Wave:
 sectors.stored = Stored:
-sectors.resume = Resume
-sectors.launch = Launch
-sectors.select = Select
-sectors.nonelaunch = [lightgray]none (sun)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+sectors.resume = Genoptag
+sectors.launch = Affyr
+sectors.select = Vælg
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]ingen (solen)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Omdøb sektor
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
+sector.curcapture = Sector Captured
+sector.curlost = Sector Lost
+sector.missingresources = [scarlet]Ikke nok resurser i kernen.
+sector.attacked = Sector [accent]{0}[white] under attack!
+sector.lost = Sector [accent]{0}[white] lost!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planets
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Solen
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
-sector.craters.name = The Craters
-sector.frozenForest.name = Frozen Forest
+sector.craters.name = Kraterne
+sector.frozenForest.name = Den Frosne Skov
 sector.ruinousShores.name = Ruinous Shores
 sector.stainedMountains.name = Stained Mountains
 sector.desolateRift.name = Desolate Rift
@@ -539,6 +808,22 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -551,382 +836,644 @@ 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
 
-settings.language = Language
-settings.data = Game Data
-settings.reset = Reset to Defaults
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
+
+settings.language = Sprog
+settings.data = Spildata
+settings.reset = Nulstil til standard
 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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
-paused = [accent]< Paused >
-clear = Clear
-banned = [scarlet]Banned
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
-yes = Yes
-no = No
+settings.resetKey = Nulstil
+settings.controls = Styring
+settings.game = Spil
+settings.sound = Lyd
+settings.graphics = Grafik
+settings.cleardata = Ryd spildata...
+settings.clear.confirm = Er du helt sikker på at du vil rydde alt data?\nDet, der gøres, kan ikke gøres om!
+settings.clearall.confirm = [scarlet]KÆMPE ADVARSEL![]\nDette vil rydde alt data, også gem, baner, oplåste ting og keybindings.\nSå snart du trykker 'ok', vil spillet tilintetgøre alt!
+settings.clearsaves.confirm = Er du sikker på at du vil rydde dine gem?
+settings.clearsaves = Ryd gem
+settings.clearresearch = Ryd research
+settings.clearresearch.confirm = Er du sikker på, at du vil rydde alt din research?
+settings.clearcampaignsaves = Ryd kampagne-gem
+settings.clearcampaignsaves.confirm = Er du sikker på at du vil slette alt kampagne-fremskridt?
+paused = [accent]< Pauset >
+clear = Ryd
+banned = [scarlet]Banlyst
+unsupported.environment = [scarlet]Unsupported Environment
+yes = Ja
+no = Nej
 info.title = Info
-error.title = [crimson]An error has occured
-error.crashtitle = An error has occured
-unit.nobuild = [scarlet]Unit can't build
-lastaccessed = [lightgray]Last Accessed: {0}
+error.title = [crimson]Der er opstået en fejl.
+error.crashtitle = Der er opstået en fejl.
+unit.nobuild = [scarlet]Denne enhed kan ikke bygge
+lastaccessed = [lightgray]Sidst tilgået: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Purpose
 
 stat.input = Input
 stat.output = Output
+stat.maxefficiency = Max Efficiency
 stat.booster = Booster
-stat.tiles = Required Tiles
+stat.tiles = Påkrævet felt
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Power Capacity
 stat.powershot = Power/Shot
-stat.damage = Damage
-stat.targetsair = Targets Air
-stat.targetsground = Targets Ground
-stat.itemsmoved = Move Speed
-stat.launchtime = Time Between Launches
-stat.shootrange = Range
-stat.size = Size
-stat.displaysize = Display Size
-stat.liquidcapacity = Liquid Capacity
-stat.powerrange = Power Range
-stat.linkrange = Link Range
-stat.instructions = Instructions
-stat.powerconnections = Max Connections
-stat.poweruse = Power Use
-stat.powerdamage = Power/Damage
-stat.itemcapacity = Item Capacity
-stat.memorycapacity = Memory Capacity
-stat.basepowergeneration = Base Power Generation
-stat.productiontime = Production Time
+stat.damage = Skade
+stat.targetsair = Skyder flyvere
+stat.targetsground = Skyder fodgængere
+stat.itemsmoved = Bevægelseshastighed
+stat.launchtime = Tid mellem affyringer
+stat.shootrange = Rækkevidde
+stat.size = Størrelse
+stat.displaysize = Visnings-størrelse
+stat.liquidcapacity = Væske-kapacitet
+stat.powerrange = Kraft-rækkevidde
+stat.linkrange = Forbindelsesrækkevidde
+stat.instructions = Instruktioner
+stat.powerconnections = Max forbindelser
+stat.poweruse = Strømforbrug
+stat.powerdamage = Strøm/Skade
+stat.itemcapacity = Beholdningskapacitet
+stat.memorycapacity = Hukommelseskapacitet
+stat.basepowergeneration = Grundlæggende strøm-output
+stat.productiontime = Produktionstid
 stat.repairtime = Block Full Repair Time
-stat.speedincrease = Speed Increase
-stat.range = Range
-stat.drilltier = Drillables
-stat.drillspeed = Base Drill Speed
-stat.boosteffect = Boost Effect
-stat.maxunits = Max Active Units
-stat.health = Health
-stat.buildtime = Build Time
-stat.maxconsecutive = Max Consecutive
-stat.buildcost = Build Cost
-stat.inaccuracy = Inaccuracy
-stat.shots = Shots
-stat.reload = Shots/Second
-stat.ammo = Ammo
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.repairspeed = Repair Speed
+stat.weapons = Weapons
+stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
+stat.speedincrease = Hastigheds-forøgelse
+stat.range = Rækkevidde
+stat.drilltier = Kan bores
+stat.drillspeed = Grundlæggende bore-hastighed
+stat.boosteffect = Boost-effekt
+stat.maxunits = Max aktive enheder
+stat.health = Helbred
+stat.armor = Armor
+stat.buildtime = Bygge-tid
+stat.maxconsecutive = Max fortløbende
+stat.buildcost = Bygge-pris
+stat.inaccuracy = Unøjagtighed
+stat.shots = Skud
+stat.reload = Skud pr. sekund
+stat.ammo = Ammunition
+stat.shieldhealth = Skjold-helbred
+stat.cooldowntime = Nedkølingstid
+stat.explosiveness = Eksplosivitet
+stat.basedeflectchance = Grundlæggende reflektions-chance
+stat.lightningchance = Lyn-chance
+stat.lightningdamage = Lyn-skade
+stat.flammability = Brændbarhed
+stat.radioactivity = Radioaktivitet
+stat.charge = Charge
+stat.heatcapacity = Varmekapacitet
+stat.viscosity = Viskositet
+stat.temperature = Temperatur
+stat.speed = Hastighed
+stat.buildspeed = Bygge-hastighed
+stat.minespeed = Mine-hastighed
+stat.minetier = Mine-niveau
+stat.payloadcapacity = Last-kapacitet
+stat.abilities = Evner
+stat.canboost = Can Boost
+stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = Kraftfelt
+ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.repairfield = Reparationsfelt
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Statusfelt
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fabrik
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Skjold-regenereringsfelt
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build 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.powerlines = Connections: {0}/{1}
-bar.items = Items: {0}
-bar.capacity = Capacity: {0}
+bar.onlycoredeposit = Only Core Depositing Allowed
+
+bar.drilltierreq = Kræver bedre bor
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Mangler resurser
+bar.corereq = Kerne påkrævet
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
+bar.drillspeed = Borehastighed: {0}/s
+bar.pumpspeed = Pumpehastighed: {0}/s
+bar.efficiency = Effektivitet: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = Strøm: {0}/s
+bar.powerstored = Gemt: {0}/{1}
+bar.poweramount = Strøm: {0}
+bar.poweroutput = Strøm-output: {0}
+bar.powerlines = Forbindelser: {0}/{1}
+bar.items = Genstande: {0}
+bar.capacity = Kapacitet: {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.liquid = Væske
+bar.heat = Varme
+bar.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
+bar.power = Strøm
+bar.progress = Byggeproces
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]Processor kontrolleret
 
-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.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
-bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.damage = [stat]{0}[lightgray] skade
+bullet.splashdamage = [stat]{0}[lightgray] områdeskade ~[stat] {1}[lightgray] felter
+bullet.incendiary = [stat]brændfarlig
+bullet.homing = [stat]målsøgende
+bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] tilbageslag
+bullet.pierce = [stat]{0}[lightgray]x gennemboring
+bullet.infinitepierce = [stat]gennemboring
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
+bullet.multiplier = [stat]{0}[lightgray]x ammunitionsfaktor
+bullet.reload = [stat]{0}[lightgray]x skydehastighed
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
-unit.blocks = blocks
-unit.blockssquared = 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.blocks = blokke
+unit.blockssquared = blokke²
+unit.powersecond = strømenheder/sekund
+unit.tilessecond = tiles/second
+unit.liquidsecond = væskeenheder/sekund
+unit.itemssecond = genstande/sekund
+unit.liquidunits = væskeenheder
+unit.powerunits = strømenheder
+unit.heatunits = heat units
+unit.degrees = grader
+unit.seconds = sekunder
+unit.minutes = minutter
+unit.persecond = /sek
 unit.perminute = /min
-unit.timesspeed = x speed
+unit.timesspeed = x hastighed
+unit.multiplier = x
 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
+unit.shieldhealth = skjoldhelbred
+unit.items = genstande
+unit.thousands = t
+unit.millions = mio
+unit.billions = mia
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Purpose
+category.general = Generel
+category.power = Strøm
+category.liquids = Væsker
+category.items = Genstande
 category.crafting = Input/Output
-category.function = Function
-category.optional = Optional Enhancements
-setting.landscape.name = Lock Landscape
-setting.shadows.name = Shadows
-setting.blockreplace.name = Automatic Block Suggestions
-setting.linear.name = Linear Filtering
+category.function = Funktion
+category.optional = Valgfri Opgraderinger
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
+setting.landscape.name = LÃ¥s Landskab
+setting.shadows.name = Skygger
+setting.blockreplace.name = Automatiske Blok-forslag
+setting.linear.name = Lineær Filtrering
 setting.hints.name = Hints
-setting.flow.name = Display Resource Flow Rate
-setting.buildautopause.name = Auto-Pause Building
-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
-setting.touchscreen.name = Touchscreen Controls
+setting.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
+setting.buildautopause.name = Auto-pause af bygning
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disable Mods On Startup Crash
+setting.animatedwater.name = Animeret vand
+setting.animatedshields.name = Animeret skjold
+setting.playerindicators.name = Player-indikatorer
+setting.indicators.name = Fjende-/venne-indikatorer
+setting.autotarget.name = Auto-mål
+setting.keyboard.name = Mus- og Tasatur-styring
+setting.touchscreen.name = Touchscreen-styring
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI Scaling[lightgray] (requires restart)[]
-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] (may require restart)
-setting.fps.name = Show FPS & Ping
-setting.smoothcamera.name = Smooth Camera
+setting.uiscale.name = UI-skalering[lightgray] (genstart kræves)[]
+setting.uiscale.description = Restart required to apply changes.
+setting.swapdiagonal.name = Altid diagonal placering
+setting.screenshake.name = Skærm-ryst
+setting.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
+setting.effects.name = Vis effekter
+setting.destroyedblocks.name = Vis destruerede blokke
+setting.blockstatus.name = Vis blokstatus
+setting.conveyorpathfinding.name = Transportbånd-stifinding
+setting.sensitivity.name = Styrepind-sensitivitet
+setting.saveinterval.name = Gemme-interval
+setting.seconds = {0} sekunder
+setting.milliseconds = {0} millesekunder
+setting.fullscreen.name = Fuldskærm
+setting.borderlesswindow.name = Kantløst vindue[lightgray] (kræver nok genstart)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
+setting.fps.name = Vis FPS & Ping
+setting.console.name = Enable Console
+setting.smoothcamera.name = Blødt kamera
 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.pixelate.name = Pixeler
+setting.minimap.name = Vis minikort
+setting.coreitems.name = Vis kerne-genstande
+setting.position.name = Vis spillerposition
+setting.mouseposition.name = Show Mouse Position
+setting.musicvol.name = Musik-volumen
+setting.atmosphere.name = Vis planet-atmosfære
+setting.drawlight.name = Draw Darkness/Lighting
+setting.ambientvol.name = Stemningslyde-volumen
+setting.mutemusic.name = Forstum musik
+setting.sfxvol.name = SFX-volumen
+setting.mutesound.name = Forstum lyde
+setting.crashreport.name = Send anonyme fejlrapporter
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = Gem automatisk
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Spiller-grænse
+setting.chatopacity.name = Chat-gennemsigtighed
+setting.lasersopacity.name = Strøm-laser-gennemsigtighed
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Bro-gennemsigtighed
+setting.playerchat.name = Vis spillers bobbel-chat
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Tilpas grænsefladen til at vise hak
+setting.macnotch.description = Genstart påkrævet for at anvende ændringer
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
+public.beta = Bemærk at beta-versioner af spillet ikke kan tilslutte sig offentlige spil.
+uiscale.reset = UI-størrelsen har ændret sig.\nTryk "OK" for at bekræfte størrelsen.\n[scarlet]Omgør og afslutter om[accent] {0}[] sekunder...
+uiscale.cancel = Afblæs & Afslut
 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.title = Rekonfigurer taster
+keybinds.mobile = [scarlet]De fleste taster er ikke relevante for mobil. Kun basal bevægelse er understøttet.
+category.general.name = Generel
+category.view.name = Billede
+category.command.name = Unit Command
+category.multiplayer.name = Spil med andre
+category.blocks.name = Blokvalg
+placement.blockselectkeys = \n[lightgray]Tast: [{0},
+keybind.respawn.name = Genopstå
+keybind.control.name = Kontroller enhed
+keybind.clear_building.name = Ryd bygning
+keybind.press = Tryk på en tast...
+keybind.press.axis = Tryk på en styrepind eller tast...
+keybind.screenshot.name = Bane-skærmbillede
+keybind.toggle_power_lines.name = Visning af strøm-lasere
+keybind.toggle_block_status.name = Visning af blokstatus
+keybind.move_x.name = Bevæg X
+keybind.move_y.name = Bevæg Y
+keybind.mouse_move.name = Følg musen
+keybind.pan.name = Panorer billede
+keybind.boost.name = Forstærk
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
+keybind.schematic_select.name = Vælg region
+keybind.schematic_menu.name = Skabelon-visning
+keybind.schematic_flip_x.name = Flip skabelon X
+keybind.schematic_flip_y.name = Flip skabelon Y
+keybind.category_prev.name = Sidste kategori
+keybind.category_next.name = Næste kategori
+keybind.block_select_left.name = Vælg venstre blok
+keybind.block_select_right.name = Vælg højre blok
+keybind.block_select_up.name = Vælg øvre blok
+keybind.block_select_down.name = Vælg nedre blok
+keybind.block_select_01.name = Vælg 1. kategori/blok
+keybind.block_select_02.name = Vælg 2. kategori/blok
+keybind.block_select_03.name = Vælg 3. kategori/blok
+keybind.block_select_04.name = Vælg 4. kategori/blok
+keybind.block_select_05.name = Vælg 5. kategori/blok
+keybind.block_select_06.name = Vælg 6. kategori/blok
+keybind.block_select_07.name = Vælg 7. kategori/blok
+keybind.block_select_08.name = Vælg 8. kategori/blok
+keybind.block_select_09.name = Vælg 9. kategori/blok
+keybind.block_select_10.name = Vælg 10. kategori/blok
+keybind.fullscreen.name = Fuldskærmstilstand
+keybind.select.name = Vælg/Skyd
+keybind.diagonal_placement.name = Diagonal placering
+keybind.pick.name = Tag blok
+keybind.break_block.name = Ødelæg blok
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.deselect.name = Fravælg
+keybind.pickupCargo.name = Saml last op
+keybind.dropCargo.name = Smid last
+keybind.shoot.name = Skyd
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pause
-keybind.pause_building.name = Pause/Resume Building
-keybind.minimap.name = Minimap
+keybind.pause_building.name = Pause/Genoptag bygning
+keybind.minimap.name = Minikort
+keybind.planet_map.name = Planet Map
+keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Chat
-keybind.player_list.name = Player List
-keybind.console.name = Console
-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.
+keybind.player_list.name = Spiller-liste
+keybind.console.name = Konsol
+keybind.rotate.name = Roter
+keybind.rotateplaced.name = Roter eksisterende (hold)
+keybind.toggle_menus.name = Slå menu til/fra
+keybind.chat_history_prev.name = Chat-historie Sidste
+keybind.chat_history_next.name = Chat-historie Næste
+keybind.chat_scroll.name = Chat-scroll
+keybind.chat_mode.name = Change Chat Mode
+keybind.drop_unit.name = Smid enhed
+keybind.zoom_minimap.name = Zoom Minikort
+mode.help.title = Beskrivelse af tilstande
+mode.survival.name = Overlevelse
+mode.survival.description = Den normale tilstand. Begrænsede resurser og automatisk igangsættelse af bølger.\n[gray]Kræver fjendtlig base for at spille.
+mode.sandbox.name = Sandkasse
+mode.sandbox.description = Uendelige resurser og ingen tidsbegrænsning for bølger.
 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
+mode.pvp.description = Spil mod andre spillere lokalt.\n[gray]Kræver mindst to forskelligt farvede kerner i banen.
+mode.attack.name = Angrib
+mode.attack.description = Destruer fjendens base. \n[gray]Kræver en rød kerne i banen, for at spille.
+mode.custom = Brugerdefinerede regler
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
-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
-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.enemyLights = Enemy Lights
-rules.fire = Fire
-rules.explosions = Block/Unit Explosion Damage
-rules.ambientlight = Ambient Light
-rules.weather = Weather
-rules.weather.frequency = Frequency:
-rules.weather.duration = Duration:
+rules.infiniteresources = Uendelig resurser
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
+rules.reactorexplosions = Reaktor-eksplosioner
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
+rules.schematic = Skabeloner tilladt
+rules.wavetimer = Bølge-æggeur
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
+rules.waves = Bølger
+rules.airUseSpawns = Air units use spawn points
+rules.attack = Angrebsmode
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
+rules.enemyCheat = Uendelig AI (rødt hold) resurser.
+rules.blockhealthmultiplier = Blok-helbreds-forstærker.
+rules.blockdamagemultiplier = Blok-skade-forstærker.
+rules.unitbuildspeedmultiplier = Enheds-produktionshastigheds-forstærker
+rules.unitcostmultiplier = Unit Cost Multiplier
+rules.unithealthmultiplier = Enheds-helbreds-forstærker
+rules.unitdamagemultiplier = Enheds-skade-forstærker
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
+rules.enemycorebuildradius = Radius af fjendtlig kernes ubebyggelig zone:[lightgray] (felter)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Bølge spredning:[lightgray] (sek)
+rules.initialwavespacing = Initial Wave Spacing:[lightgray] (sec)
+rules.buildcostmultiplier = Byggepris-forstærker
+rules.buildspeedmultiplier = Byggehastigheds-forstærker
+rules.deconstructrefundmultiplier = Dekonstruerings-tilbagebetalings-forstærker
+rules.waitForWaveToEnd = Bølge-ventetid for fjender
+rules.wavelimit = Map Ends After Wave
+rules.dropzoneradius = Drop-zone-radius:[lightgray] (felter)
+rules.unitammo = Enheder kræver ammunition
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
+rules.title.waves = Bølger
+rules.title.resourcesbuilding = Resurser & bygning
+rules.title.enemy = Fjender
+rules.title.unit = Enheder
+rules.title.experimental = Eksperimentel
+rules.title.environment = Miljø
+rules.title.teams = Teams
+rules.title.planet = Planet
+rules.lighting = Lys
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = Ild
+rules.anyenv = <Any>
+rules.explosions = Blok/Enheds-eksplosionsskade
+rules.ambientlight = Stemningslys
+rules.weather = Vejr
+rules.weather.frequency = Frekvens:
+rules.weather.always = Always
+rules.weather.duration = Varighed:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
-content.item.name = Items
-content.liquid.name = Liquids
-content.unit.name = Units
-content.block.name = Blocks
+content.item.name = Genstande
+content.liquid.name = Væsker
+content.unit.name = Enheder
+content.block.name = Blokke
+content.status.name = Status Effects
+content.sector.name = Sectors
+content.team.name = Factions
+wallore = (Wall)
 
-item.copper.name = Copper
-item.lead.name = Lead
-item.coal.name = Coal
-item.graphite.name = Graphite
+item.copper.name = Kobber
+item.lead.name = Bly
+item.coal.name = Kul
+item.graphite.name = Grafit
 item.titanium.name = Titanium
 item.thorium.name = Thorium
-item.silicon.name = Silicon
+item.silicon.name = Silicium
 item.plastanium.name = Plastanium
-item.phase-fabric.name = Phase Fabric
-item.surge-alloy.name = Surge Alloy
-item.spore-pod.name = Spore Pod
+item.phase-fabric.name = Fasestof
+item.surge-alloy.name = Lyn-bronze
+item.spore-pod.name = Svampespore
 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.blast-compound.name = Sprængstof
+item.pyratite.name = Pyratit
+item.metaglass.name = Blyglas
+item.scrap.name = Skrot
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
+liquid.water.name = Vand
+liquid.slag.name = Ildgrød
+liquid.oil.name = Olie
+liquid.cryofluid.name = Frysesaft
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
-unit.dagger.name = Dagger
-unit.mace.name = Mace
-unit.fortress.name = Fortress
+unit.dagger.name = Daggert
+unit.mace.name = Kølle
+unit.fortress.name = Fort
 unit.nova.name = Nova
 unit.pulsar.name = Pulsar
-unit.quasar.name = Quasar
+unit.quasar.name = Kvasar
 unit.crawler.name = Crawler
 unit.atrax.name = Atrax
 unit.spiroct.name = Spiroct
@@ -939,7 +1486,7 @@ unit.antumbra.name = Antumbra
 unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
-unit.mega.name = Mega
+unit.mega.name = Kæmpe
 unit.quad.name = Quad
 unit.oct.name = Oct
 unit.risso.name = Risso
@@ -947,389 +1494,1117 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
-unit.alpha.name = Alpha
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
+unit.alpha.name = Alfa
 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
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
-block.cliff.name = Cliff
-block.sand-boulder.name = Sand Boulder
-block.grass.name = Grass
-block.slag.name = Slag
-block.space.name = Space
+block.cliff.name = Klippe
+block.sand-boulder.name = Sandkampesten
+block.basalt-boulder.name = Basalt Boulder
+block.grass.name = Græs
+block.molten-slag.name = Ildgrød
+block.pooled-cryofluid.name = Cryofluid
+block.space.name = Rum
 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.dacite-boulder.name = Dacite Boulder
-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.salt-wall.name = Saltvæg
+block.pebbles.name = Grus
+block.tendrils.name = Rødder
+block.sand-wall.name = Sandvæg
+block.spore-pine.name = Svampespore-træ
+block.spore-wall.name = Svampesporevæg
+block.boulder.name = Kampesten
+block.snow-boulder.name = Snebold
+block.snow-pine.name = Snegran
+block.shale.name = Skifer
+block.shale-boulder.name = Skifersten
+block.moss.name = Mos
+block.shrubs.name = Buskads
+block.spore-moss.name = Svampesporemos
+block.shale-wall.name = Skifervæg
+block.scrap-wall.name = Skrotvæg
+block.scrap-wall-large.name = Stor Skrotvæg
+block.scrap-wall-huge.name = Kæmpe Skrotvæg
+block.scrap-wall-gigantic.name = Enorm Skrotvæg
+block.thruster.name = Trykmotor
+block.kiln.name = Glasdigel
+block.graphite-press.name = Grafitvalse
+block.multi-press.name = Multi-valse
+block.constructing = {0} [lightgray](Konstruerer)
+block.spawn.name = Fjendtligt Ankomstpunkt
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
+block.core-shard.name = Kerne: Skår
+block.core-foundation.name = Kerne: Fundament
+block.core-nucleus.name = Kerne: Nukleus
+block.deep-water.name = Dybt Vand
+block.shallow-water.name = Vand
+block.tainted-water.name = Moget Vand
+block.deep-tainted-water.name = Deep Tainted Water
+block.darksand-tainted-water.name = Mørkt Sand Moget Vand
+block.tar.name = Tjærre
+block.stone.name = Sten
+block.sand-floor.name = Sand
+block.darksand.name = Mørkt Sand
+block.ice.name = Is
+block.snow.name = Sne
+block.crater-stone.name = Kratere
+block.sand-water.name = Sandet Lavvande
+block.darksand-water.name = Mørkt Sandet Lavvande
+block.char.name = Trækul
+block.dacite.name = Dacit
+block.rhyolite.name = Rhyolite
+block.dacite-wall.name = Dacit-væg
+block.dacite-boulder.name = Dacit-klippe
+block.ice-snow.name = Tiliset Sne
+block.stone-wall.name = Stenvæg
+block.ice-wall.name = Isvæg
+block.snow-wall.name = Snevæg
+block.dune-wall.name = Klitvæg
+block.pine.name = Gran
+block.dirt.name = Jord
+block.dirt-wall.name = Jordvæg
+block.mud.name = Mudder
+block.white-tree-dead.name = Dødt Hvidt Træ
+block.white-tree.name = Hvidt Træ
+block.spore-cluster.name = Svampespore-klynge
+block.metal-floor.name = Metalgulv 1
+block.metal-floor-2.name = Metalgulv 2
+block.metal-floor-3.name = Metalgulv 3
+block.metal-floor-4.name = Metal Floor 4
+block.metal-floor-5.name = Metalgulv 4
+block.metal-floor-damaged.name = Metalgulv Damaged
+block.dark-panel-1.name = Mørkt Panel 1
+block.dark-panel-2.name = Mørkt Panel 2
+block.dark-panel-3.name = Mørkt Panel 3
+block.dark-panel-4.name = Mørkt Panel 4
+block.dark-panel-5.name = Mørkt Panel 5
+block.dark-panel-6.name = Mørkt Panel 6
+block.dark-metal.name = Mørkt 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.hotrock.name = Varm Sten
+block.magmarock.name = Magma-sten
+block.copper-wall.name = Kobbervæg
+block.copper-wall-large.name = Stor Kobber-væg
+block.titanium-wall.name = Titanium-væg
+block.titanium-wall-large.name = Stor Titanium-væg
+block.plastanium-wall.name = Plastanium-væg
+block.plastanium-wall-large.name = Stor Plastanium-væg
+block.phase-wall.name = Fase-væg
+block.phase-wall-large.name = Stor Fase-væg
+block.thorium-wall.name = Thorium-væg
+block.thorium-wall-large.name = Stor Thorium-væg
+block.door.name = Dør
+block.door-large.name = Stor Dør
 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.titanium-conveyor.name = Titanium-bånd
+block.plastanium-conveyor.name = Plastanium-bånd
+block.armored-conveyor.name = Pansret BÃ¥nd
+block.junction.name = Knudepunkt
+block.router.name = Fordeler
+block.distributor.name = Distributør
+block.sorter.name = Filter
+block.inverted-sorter.name = Omvendt Filter
+block.message.name = Besked
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
+block.illuminator.name = Lyskilde
+block.overflow-gate.name = Overflods-låge
+block.underflow-gate.name = Underflods-låge
+block.silicon-smelter.name = Silicium-smelter
+block.phase-weaver.name = Fase-væv
+block.pulverizer.name = Pulverkværn
+block.cryofluid-mixer.name = Frysesaft-blander
+block.melter.name = Smelter
+block.incinerator.name = Forbrændingsovn
+block.spore-press.name = Svampespore-presse
 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 Source
-block.unloader.name = Unloader
-block.vault.name = Vault
-block.wave.name = Wave
+block.coal-centrifuge.name = Kul-centrifuge
+block.power-node.name = Strøm-node
+block.power-node-large.name = Stor Strøm-node
+block.surge-tower.name = Lyntårn
+block.diode.name = Batteri-diode
+block.battery.name = Batteri
+block.battery-large.name = Stort Batteri
+block.combustion-generator.name = Forbrændings-generator
+block.steam-generator.name = Damp-generator
+block.differential-generator.name = Differential-generater
+block.impact-reactor.name = Bang-reaktor
+block.mechanical-drill.name = Mekanisk Bor
+block.pneumatic-drill.name = Pneumatisk Bor
+block.laser-drill.name = Laser-bor
+block.water-extractor.name = Grundvandsboring
+block.cultivator.name = Kultivator
+block.conduit.name = Rør
+block.mechanical-pump.name = Mekanisk Pumpe
+block.item-source.name = Genstandskilde
+block.item-void.name = Genstands-intethed
+block.liquid-source.name = Væskekilde
+block.liquid-void.name = Væske-intethed
+block.power-void.name = Strøm-intethed
+block.power-source.name = Strømkilde
+block.unloader.name = Aflæsser
+block.vault.name = Depot
+block.wave.name = Sprøjte
 block.tsunami.name = Tsunami
-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.swarmer.name = Sværmer
+block.salvo.name = Skudsalve
+block.ripple.name = Krusning
+block.phase-conveyor.name = Fase-bro
+block.bridge-conveyor.name = Transport-bro
+block.plastanium-compressor.name = Plastanium-kompressor
+block.pyratite-mixer.name = Pyratit-blander
+block.blast-mixer.name = Sprængstof-blander
+block.solar-panel.name = Solpanel
+block.solar-panel-large.name = Stort Solpanel
+block.oil-extractor.name = Olieboring
+block.repair-point.name = Reparationsplads
+block.repair-turret.name = Repair Turret
+block.pulse-conduit.name = Højhastigheds-rør
+block.plated-conduit.name = Pansret Rør
+block.phase-conduit.name = Fase-rør
+block.liquid-router.name = Væske-fordeler
+block.liquid-tank.name = Væske-silo
+block.liquid-container.name = Liquid Container
+block.liquid-junction.name = Væske-knudepunkt
+block.bridge-conduit.name = Rørbro
+block.rotary-pump.name = Drejepumpe
+block.thorium-reactor.name = Atomreaktor
+block.mass-driver.name = Kvante-katapult
+block.blast-drill.name = Trykluftbor
+block.impulse-pump.name = Termisk Pumpe
+block.thermal-generator.name = Termisk Generator
+block.surge-smelter.name = Bronze-digel
+block.mender.name = Reparatør
+block.mend-projector.name = Reparationsfelt
+block.surge-wall.name = Lyn-væg
+block.surge-wall-large.name = Stor Lyn-væg
+block.cyclone.name = Cyklon
+block.fuse.name = Lunte
+block.shock-mine.name = Chok-mine
+block.overdrive-projector.name = Overanstrengelsesfelt
+block.force-projector.name = Kraftfelt
+block.arc.name = Ark
+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.container.name = Beholder
+block.launch-pad.name = Affyringsrampe
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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.ground-factory.name = Fodgænger-fabrik
+block.air-factory.name = Flyver-fabrik
+block.naval-factory.name = Værft
+block.additive-reconstructor.name = Opgraderingsfacilitet
+block.multiplicative-reconstructor.name = Overbygningsfacilitet
+block.exponential-reconstructor.name = Maksimeringsfacilitet
+block.tetrative-reconstructor.name = Udmaksningsfacilitet
+block.payload-conveyor.name = Troppebånd
+block.payload-router.name = Troppe-fordeler
+block.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
+block.disassembler.name = Omspalter
+block.silicon-crucible.name = Siliciums-digel
+block.overdrive-dome.name = Overanstrengelskuppel
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
-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
+block.switch.name = Kontakt
+block.micro-processor.name = Datamat
+block.logic-processor.name = Topdatamat
+block.hyper-processor.name = Hyperdatamat
+block.logic-display.name = Dataskærm
+block.large-logic-display.name = Større Dataskærm
+block.memory-cell.name = Hukommelsescelle
+block.memory-bank.name = Hukommelsesbank
+team.malis.name = Malis
+team.crux.name = rød
 team.sharded.name = orange
-team.orange.name = orange
-team.derelict.name = derelict
-team.green.name = green
-team.purple.name = purple
+team.derelict.name = forladt
+team.green.name = grøn
 
-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 or scrap 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 energy turret. Fires three piercing beams 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.
+team.blue.name = blå
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
+item.copper.description = Det simpleste byggemateriale. Bruges i store mængder til næsten alle typer af blokke.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
+item.lead.description = Et grundlæggende materiale. Har bred anvendelse inden for elektronik og rørlægning.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
+item.metaglass.description = Et super-stærkt gennemsigtigt materiale. Bruges meget til transport og lagring af væsker.
+item.graphite.description = Mineraliseret kul, som bruges til elektronik og ammunition.
+item.sand.description = Et almindeligt materiale, der anvendes i enorme mængder til smelteprocesser.
+item.coal.description = Fossilt plantestof, fra arter der groede lang tid før svampesporerne opstod. Har bred anvendelse som brændstof, og til at producere avancerede materialer.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
+item.titanium.description = Et sjældent metal med meget lav vægt, som har bred anvendelse inden for væsketransport og luftfart.
+item.thorium.description = Et radioaktivt materiale med høj massefylde som bruges til hærdede bygninger og som kernebrændstof.
+item.scrap.description = Forglemte rester af gamle strukturer. Indeholder spor af mange forskellige materialer.
+item.scrap.details = Leftover remnants of old structures and units.
+item.silicon.description = Ekstremt nyttig som halvleder. Anvendelse inden for solpaneler, avanceret elektronik og målsøgende ammunition.
+item.plastanium.description = Et let, smidigt metal som anvendes til avancerede strukturer og som fragmenterende ammunition.
+item.phase-fabric.description = En næsten vægtløs substans der anvendes til avanceret elektronik og selvreparerende teknologi.
+item.surge-alloy.description = En avanceret legering med unikke elektriske egenskaber.
+item.spore-pod.description = En bælg af økologiske svampesporer, kultiveret til industribrug fra atmosfæriske partikler. Kan omdannes til olie eller sprængstoffer, og bruges til brændstof.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
+item.blast-compound.description = En ustabil kemisk forbindelse der bruges til bomber og andre eksplosiver. Dannes fra svampesporer og andre brændfarlige substanser. Bør ikke anvendes som brændstof.
+item.pyratite.description = En ekstremt brændfarlig substans der primært er til våbenbrug.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
+liquid.water.description = En meget nyttig væske. Bruges ofte til køling, og til at skylle affaldsstoffer væk.
+liquid.slag.description = Smeltede metaller af forskellig art. Stofferne det består af kan udvindes, eller det kan sprøjtes over fjenden som et våben.
+liquid.oil.description = Væsken bruges til at producere avancerede materialer. Kan også omdannes til kul, og kan desuden sprøjtes over fjenden og antendes som et våben.
+liquid.cryofluid.description = En kemisk inaktiv væske der ikke forårsager rust, som er dannet fra vand og titanium. Dens høje varmekapacitet gør den egnet som køling.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+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.illuminator.description = A small, compact, configurable light source. Requires power to function.
+block.message.description = Indeholder en note, der kan læses af dig selv og dine allierede.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
+block.graphite-press.description = Presser kulstykker sammen til ark af ren grafit.
+block.multi-press.description = En opgraderet version af kul-valsen. Bruger vand og strøm til hurtigere at prodcere en større mængde grafit per kulstykke.
+block.silicon-smelter.description = Smelter sand om til ren silicium ved brug af kul.
+block.kiln.description = Smelter sand og bly om til blyglas ved hjælp af en lille smule strøm.
+block.plastanium-compressor.description = Producerer plastanium ud fra olie og titanium.
+block.phase-weaver.description = Syntetiserer fasestof fra det radioaktive torium og store mængder af sand. Dette sker på bekostning af enorme mængder strøm.
+block.surge-smelter.description = Kombinerer titanium, bly, silicium og kobber og laver det til lyn-bronze.
+block.cryofluid-mixer.description = Blander vand med fint titanium-pulver og laver det til frysesaft. Helt essentiel for nedkøling thorium-reaktorer.
+block.blast-mixer.description = Kvaser og blader klynger af svampesporer med pyratit for at producere sprængstof.
+block.pyratite-mixer.description = Blander kul, bly og sand til sygt brændbar pyratit.
+block.melter.description = Smelter skrot til ildgrød, så det kan raffineres eller sprøjtes ud over fjenden med Sprøjter eller Tsunamier.
+block.separator.description = Separerer indholdet i ildgrød til underliggende mineraler. Udleder det kølede resultat.
+block.spore-press.description = Komprimerer svampesporer til olie under ekstremt pres.
+block.pulverizer.description = Kværner skrot til fint sand.
+block.coal-centrifuge.description = Omdanner olie til klumper af kul.
+block.incinerator.description = Tilintetgører alle genstande eller væsker, der transporteres ind i den.
+block.power-void.description = Opsluger alt strøm, der forbindes til den. Kun i sandkassen.
+block.power-source.description = Uendelige mængder af strøm. Kun i sandkassen.
+block.item-source.description = Udsteder uendelige mængder af genstande. Kun i sandkassen.
+block.item-void.description = Destruerer enhver genstand. Kun i sandkassen.
+block.liquid-source.description = Udsteder uendelige mængder af væske. Kun i sandkassen.
+block.liquid-void.description = Fjerner enhver væske. Kun i sandkassen.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
+block.copper-wall.description = En billig, defensiv blok.\nKan bruges til at beskytte kernen og våben i de første par bølger.
+block.copper-wall-large.description = En billig, defensiv blok.\nKan bruges til at beskytte kernen og våben i de første par bølger.\nFylder flere felter.
+block.titanium-wall.description = En overvejende stærk, defensiv blok.\nGiver nogenlunde beskyttelse fra fjender.
+block.titanium-wall-large.description = En overvejende stærk, defensiv blok.\nGiver nogenlunde beskyttelse fra fjender.\nFylder flere felter.
+block.plastanium-wall.description = En unik type væg, der absorberer strøm-kiler og blokerer automatiske strøm-forbindelser.
+block.plastanium-wall-large.description = En unik type væg, der absorberer strøm-kiler og blokerer automatiske strøm-forbindelser.\nFylder flere felter.
+block.thorium-wall.description = En stærk defensiv blok.\nRimelig fin beskyttelse mod fjender.
+block.thorium-wall-large.description = En stærk defensiv blok.\nRimelig fin beskyttelse mod fjender.\nFylder flere felter.
+block.phase-wall.description = En væg legeret med specielt, reflekterende fase-stof. Reflekterer de fleste slags skud.
+block.phase-wall-large.description = En væg legeret med specielt, reflekterende fase-stof. Reflekterer de fleste slags skud.\nFylder flere felter.
+block.surge-wall.description = En ekstremt hård væg.\nOpbygger en ladning ved at absorbere skud. Ladningen affyres tilfældigt
+block.surge-wall-large.description = En ekstremt hård væg.\nOpbygger en ladning ved at absorbere skud. Ladningen affyres tilfældigt.\nFylder flere felter.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = En bette dør. Kan åbnes og lukkes ved at trykke på den.
+block.door-large.description = En stor dør. Kan åbnes og lukkes ved at trykke på den.\nFylder flere felter.
+block.mender.description = Reparerer løbende blokke i nærheden. Hjælper til at holde forsvaret oppe mellem bølger.\nSilicium kan bruges til at øge rækkevidde og effektivitet.
+block.mend-projector.description = En bedre version af den normale reparatør. Reparerer alle blokke inden for dens rækkevidde.\nFase-stof kan bruges til at øge dens rækkevidde og effektivitet.
+block.overdrive-projector.description = Øger hastigheden af bygninger i nærheden.\nFase-stof kan bruges til at øge denne hastighed og rækkevidden af feltet.
+block.force-projector.description = Skaber et stort, sekskantet kraftfelt, der beskytter bygninger og tropper.\nOveropheder, hvis den tager for meget skade. Kan nedkøles med væske. Fase-stof kan bruges til at gøre feltet større.
+block.shock-mine.description = Skader fodgængere, der træder på den. Næsten usynlig for fjender.
+block.conveyor.description = Simpel genstands-transport-blok. Transporterer genstande fremad og ind i andre blokke. Kan roteres.
+block.titanium-conveyor.description = En avanceret genstands-transport-blok. Transporterer blokke hurtigere end normale transportbånd.
+block.plastanium-conveyor.description = Transporterer genstande i klynger.\nTager imod genstande i bagenden og fordeler dem i op til tre retninger i forreste ende.
+block.junction.description = Fungerer som en bro for krydsende transportbånd. Kan bruges, når to krydsende bånd med forskellige genstande ikke må blandes.
+block.bridge-conveyor.description = En avanceret genstands-transport-blok. Kan transportere over op til 3 felter, uanset om det er terræn eller blokke.
+block.phase-conveyor.description = En avanceret genstands-transport-blok. Bruger strøm til at teleportere genstande til næste fase-bånd, hen over op til flere felter.
+block.sorter.description = Sorterer genstande. Hvis en genstand matcher et valg, kan de passere. Hvis ikke, outputtes de til siderne.
+block.inverted-sorter.description = HÃ¥ndterer genstande som et normalt filter, men outputter til siderne.
+block.router.description = Tager genstande og fordeler denne ligeligt mellem op til tre andre retninger. Kan bruges til at splitte et bånd.\n\n[scarlet]Aldrig stil dem op ad fabrikker, da de ellers vil blive stoppet til.[]
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
+block.distributor.description = En avanceret omfordeler. Fordeler genstande ligeligt mellem op til 7 andre retninger.
+block.overflow-gate.description = Outputter kun til venstre og højre, hvis blokken foran er blokeret.
+block.underflow-gate.description = Det modsatte af en overflods-låge. Outputter fremad hvis venstre og højre side af lågen er blokeret.
+block.mass-driver.description = Den ultimative transport-blok. Samler en masse genstande og slynger dem hovedkulds gennem luften til den kvante-katapult.
+block.mechanical-pump.description = En hverdags-pumpe, der ikke engang kræver strøm.
+block.rotary-pump.description = En drønhurtig pumpe. Pumper mere væske, kræver mere strøm.
+block.impulse-pump.description = Den allerbedste pumpe.
+block.conduit.description = Simpel væske-transport-blok. Transporterer væske fremad. Bruges sammen med pumper, eller i forlængelse af andre rør.
+block.pulse-conduit.description = En avanceret væske-transport-blok. Transporterer væske hurtigere og opbevarer mere end normale rør.
+block.plated-conduit.description = Transporterer væske lige så hurtigt som højhastigheds-rør. Kan ikke tage væske ind fra siderne.\nLækker mindre.
+block.liquid-router.description = Tager væske fra en retning, og fordeler denne ligeligt mellem op til tre andre retninger. Brugbar, når der er behov for at splitte en rørledning op.
+block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
+block.liquid-tank.description = Opbevarer store mængder af væske. Kan bruges som sikkerhedslager i tilfælde af underskud eller til at forsyne nedkøling i nødsituationer.
+block.liquid-junction.description = Fungerer som en bro over krydsende rør. Brugbar i situationer, hvor der er tale om transport af forskellige væsker.
+block.bridge-conduit.description = Avanceret væske-transport. Kan transportere væske over 3 felter uanset om det er terræn eller bygninger.
+block.phase-conduit.description = Avanceret væske-transport. Bruger strøm til at transportere væske hen over flere blokke.
+block.power-node.description = Leder strøm til forbundne strøm-noder. Noden enten modtager eller giver strøm til sidestående blokke.
+block.power-node-large.description = En evanceret strøm-node, der har længere rækkevidde.
+block.surge-tower.description = En strømforbindelse med ekstremt lang rækkevidde. Kan kun klare få forbindelser.
+block.diode.description = Batteri-strøm kan ledes gennem denne ensrettede blok, men kun hvis den ene side har mere strøm end destinationen.
+block.battery.description = Opbevarer overskydende strøm. Giver strøm ved underskud i strømnetværket.
+block.battery-large.description = Opbevarer mere strøm end et normalt batteri.
+block.combustion-generator.description = Genererer strøm ved at brænde brændbare materialer, såsom kul.
+block.thermal-generator.description = Genererer strøm, når den placeres på naturlig varme.
+block.steam-generator.description = En avanceret forbrændingsgenerator. Mere effektiv, men kræver vand til at lave damp.
+block.differential-generator.description = Genererer store mængder strøm. Bruger temperaturforskellen mellem frysesaft og brændende pyratit til at lave strøm.
+block.rtg-generator.description = En simpel, bæredygtig generator. Bruger varmen fra radioaktivt henfald til langsomt at generere strøm.
+block.solar-panel.description = Giver en smule strøm fra solen.
+block.solar-panel-large.description = En betydeligt bedre version af de normale solpaneler.
+block.thorium-reactor.description = Genererer bemærkelsesværdige mængder strøm. Kræver konstant nedkøling. Vil eksplodere voldeligt uden den rette nedkøling. Strøm-output afhænger af hvor fuld den her.
+block.impact-reactor.description = En avanceret reaktor, der producerer rigtig meget strøm. Det kræver meget strøm at sparke processen i gang.
+block.mechanical-drill.description = Et billigt bor. Når placeret oven på resurser, udvinder det dem langsomt. Kan kun udvinde basale resurser.
+block.pneumatic-drill.description = Et bedre bor, der kan udvinde titanium. Borer hurtigere end det mekaniske bor.
+block.laser-drill.description = Kan bore meget hårdere og hurtigere, men kræver mere strøm. Kan udvide thorium.
+block.blast-drill.description = Det ybberste bor. Kræver meget strøm.
+block.water-extractor.description = Udvinder grundvand. Bruges i områder uden vand på overfladen.
+block.cultivator.description = Kultiverer små mængder af økologiske svampesporer fra atmosfæren.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
+block.oil-extractor.description = Bruger meget strøm, sand og vand for at udvinde olie.
+block.core-shard.description = Den første kerne. Hvis den bliver ødelagt, taber du regionen. Ikke lad den blive ødelagt.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
+block.core-foundation.description = Den anden overbygning til kernen. Mere pansret. Opbevarer flere ting.
+block.core-foundation.details = The second iteration.
+block.core-nucleus.description = Den tredje og største overbygning af kernen. Helt vildt pansret. Opbevarer kollosale mængder af ting.
+block.core-nucleus.details = The third and final iteration.
+block.vault.description = Opbevarer en masse genstande. En aflæsser-blok kan bruges til at hive ting ud af en container.
+block.container.description = Opbevarer en lille mængde genstande. En aflæsser-blok kan bruges til at hive ting ud af en container.
+block.unloader.description = Aflæsser genstande fra sidestående blokke. Typen af blok, der skal aflæsses kan justeres.
+block.launch-pad.description = Affyrer samlinger af genstande løbende. Kræver ikke affyring af kernen.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = En bette, billig kanon. Effektiv mod fodgængere.
+block.scatter.description = Et vigtigt luftangreb. Skyder klumper af skud mod flyvere.
+block.scorch.description = Brænder alle forbipasserende fodgængere. Meget god til hvad den gør.
+block.hail.description = En lille kanon med lang rækkevidde.
+block.wave.description = En medium-stor væskekanon. Skyder væskestråler. Kan automatisk slukke ildebrand med vand.
+block.lancer.description = En medium-stor strøm-kanon. Lader og affyrer strømstråler mod uvidende fodgængere.
+block.arc.description = En lille nær-distance strøm-kanon. Skyder lyn mod fjenden.
+block.swarmer.description = En medium-stor missil-affyrer. Angriber både flyvere og fodgængere. Affyrer efterfølgende missiler.
+block.salvo.description = En større, mere avanceret version af Duo'en. Skyder hurtige salver af skud mod fjenden.
+block.fuse.description = En stor, nær-distance energi-kanon. Affyrer tre penetrerende skud mod nærmeste fjender.
+block.ripple.description = En ekstremt kraftfuld skyder. Skyder klynger af skud mod fjender over længere distancer.
+block.cyclone.description = En stor anti-fodgænger og -flyver, der skyder eksplosive skår på nærmeste fjender.
+block.spectre.description = En massiv dobbelt-løber-kanon. Skyder store panser-penertrerende skud mod flyvere og fodgængere.
+block.meltdown.description = En massiv laser-kanon. Lader og affyrer storer laser-stråler mod svenskere. Kræver nedkøling for at virke.
+block.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
+block.repair-point.description = Helbreder konstant den nærmeste enhed.
+block.segment.description = Skader og ødelægger projektiler. Laser-projektiler gælder ikke her.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 571a1b6e53..dd573ff7ce 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1,5 +1,5 @@
 credits.text = Entwickelt von [royal]Anuken[] - [sky]anukendev@gmail.com[]\n\n[gray]
-credits = Danksagungen
+credits = Mitwirkende
 contributors = Ãœbersetzer und Mitwirkende
 discord = Tritt dem Mindustry-Discord bei!
 link.discord.description = Der offizielle Mindustry Discord-Server
@@ -7,13 +7,14 @@ link.reddit.description = Mindustry-Subreddit
 link.github.description = Quellcode des Spiels
 link.changelog.description = Liste der Änderungen
 link.dev-builds.description = Entwicklungs-Builds (instabil)
-link.trello.description = Offizielles Trello-Board für geplante Features
+link.trello.description = Offizielles Trello-Board für geplante Funktionen
 link.itch.io.description = itch.io-Seite mit Downloads und der Web-Version des Spiels
 link.google-play.description = Google Play Store-Seite
 link.f-droid.description = F-Droid-Seite
 link.wiki.description = Offizielles Mindustry-Wiki
-link.suggestions.description = Neue Ideen einbringen
-link.bug.description = Hast du einen Bug gefunden? Melde ihn hier
+link.suggestions.description = Neue Ideen vorschlagen
+link.bug.description = Hast du einen Bug gefunden? Melde ihn hier!
+linkopen = Dieser Server hat dir einen Link geschickt. Möchtest du ihn öffnen?\n\n[sky]{0}
 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.
@@ -23,8 +24,7 @@ gameover.pvp = Das[accent] {0}[] Team ist siegreich!
 gameover.waiting = [accent]Warte auf neue Karte...
 highscore = [accent]Neuer Highscore!
 copied = Kopiert.
-indev.notready = Dieser Teil vom Spiel ist noch unfertig.
-indev.campaign = [accent]Glückwunsch! Du hast das Ende der Kampagne erreicht![]\n\nMehr gibt es noch nicht. In einem zukünftigen Update wird interplanetarisches Reisen möglich werden.
+indev.notready = Dieser Teil vom Spiel ist noch nicht fertig.
 
 load.sound = Audio
 load.map = Karten
@@ -32,24 +32,33 @@ load.image = Bilder
 load.content = Inhalt
 load.system = System
 load.mod = Mods
-load.scripts = Scripts
+load.scripts = Skripte
 
-be.update = Ein neuer Bleeding Edge build ist verfügbar:
+be.update = Ein neuer Bleeding-Edge-Build ist verfügbar:
 be.update.confirm = Herunterladen und neu starten?
-be.updating = Aktualisieren...
+be.updating = Aktualisiert...
 be.ignore = Ignorieren
 be.noupdates = Keine Aktualisierungen gefunden.
 be.check = Auf Aktualisierungen prüfen
 
-mod.featured.dialog.title = Mod Browser (unfertig)
-mods.browser.selected = Ausgewählter Mod	
+mods.browser = Mod Browser
+mods.browser.selected = Ausgewählte Mod
 mods.browser.add = Installieren
-mods.github.open = Ansehen
+mods.browser.reinstall = Neu installieren
+mods.browser.view-releases = Versionen ansehen
+mods.browser.noreleases = [scarlet]Keine Versionen gefunden\n[accent]Konnte für diese Mod keine Versionen finden. Überprüfe, ob die Mod auf GitHub Releases hat.
+mods.browser.latest = [lightgray][Neueste]
+mods.browser.releases = Versionen
+mods.github.open = GitHub-Repo
+mods.github.open-release = Versionen Webseite
+mods.browser.sortdate = Nach neuesten sortieren
+mods.browser.sortstars = Nach Sternen sortieren
 
 schematic = Entwurf
 schematic.add = Entwurf speichern...
 schematics = Entwürfe
-schematic.replace = Ein anderer Entwurf hat bereits diesen Namen. Diesen ersetzen?
+schematic.search = Suche nach Entwürfen...
+schematic.replace = Es gibt bereits einen Entwurf mit diesem Namen. Diesen ersetzen?
 schematic.exists = Es gibt schon einen Entwurf mit diesem Namen.
 schematic.import = Entwurf importieren...
 schematic.exportfile = Datei exportieren
@@ -61,21 +70,29 @@ schematic.shareworkshop = Im Workshop teilen
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Entwurf umkehren
 schematic.saved = Entwurf gespeichert.
 schematic.delete.confirm = Dieser Entwurf wird vollständig vernichtet.
-schematic.rename = Entwurf umbenennen
+schematic.edit = Entwurf bearbeiten
 schematic.info = {0}x{1}, {2} Blöcke
 schematic.disabled = [scarlet]Entwürfe deaktiviert[]\nAuf dieser [accent]Karte[] oder [accent]Server[] dürfen keine Entwürfe verwendet werden.
+schematic.tags = Tags:
+schematic.edittags = Tags bearbeiten
+schematic.addtag = Tag hinzufügen
+schematic.texttag = Text-Tag
+schematic.icontag = Bild-Tag
+schematic.renametag = Tag umbenennen
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Dieses Tag wirklich löschen?
+schematic.tagexists = Dieses Tag gibt es schon.
 
 stats = Statistiken
-stat.wave = Wellen besiegt:[accent] {0}
-stat.enemiesDestroyed = Gegner zerstört:[accent] {0}
-stat.built = Gebäude gebaut:[accent] {0}
-stat.destroyed = Gebäude zerstört:[accent] {0}
-stat.deconstructed = Gebäude abgebaut:[accent] {0}
-stat.delivered = Ãœbertragene Ressourcen:
-stat.playtime = Spielzeit:[accent] {0}
-stat.rank = Finaler Rang:[accent] {0}
+stats.wave = Wellen besiegt
+stats.unitsCreated = Gebaute Einheiten
+stats.enemiesDestroyed = Getötete Gegner
+stats.built = Gebäude gebaut
+stats.destroyed = Stukturen zerstört
+stats.deconstructed = Abgebaute Gebäude
+stats.playtime = Spielzeit
 
-globalitems = [accent]Gesamtitems
+globalitems = [accent]Ressourcen auf diesem Planeten
 map.delete = Bist du sicher, dass du die Karte "[accent]{0}[]" löschen möchtest?
 level.highscore = Highscore: [accent]{0}
 level.select = Level-Auswahl
@@ -83,6 +100,7 @@ level.mode = Spielmodus:
 coreattack = < Der Kern wird angegriffen! >
 nearpoint = [[ [scarlet]SOFORT DEN SPAWNPUNKT VERLASSEN[] ]\nVernichtung droht
 database = Kern-Datenbank
+database.button = Datenbank
 savegame = Spiel speichern
 loadgame = Spiel laden
 joingame = Spiel beitreten
@@ -90,12 +108,13 @@ customgame = Benutzerdefiniertes Spiel
 newgame = Neues Spiel
 none = <nichts>
 none.found = [lightgray]<keine gefunden>
+none.inmap = [lightgray]<keine auf der Karte>
 minimap = Minimap
 position = Position
 close = Schließen
-website = Website
+website = Webseite
 quit = Verlassen
-save.quit = Speichern & Verlassen
+save.quit = Speichern & verlassen
 maps = Karten
 maps.browse = Karten durchsuchen
 continue = Weiter
@@ -110,53 +129,81 @@ committingchanges = Veränderungen werden übernommen
 done = Fertig
 feature.unsupported = Dein System unterstützt dieses Feature nicht.
 
-mods.alphainfo = Vergiss nicht, dass Mods in der Alpha sind und[scarlet] sehr fehlerhaft sein können[].\nMelde alle Probleme auf GitHub oder Discord.
+mods.initfailed = [red]⚠[] Die vorherige Mindustry-Instanz konnte nicht starten. Dies lag wahrscheinlich an fehlerhaften Mods.\n\nDamit das Spiel starten kann, [red]wurden alle Mods deaktiviert.[]\n\nWenn du nicht willst, dass das passiert, kannst du es unter [accent]Einstellungen->Spiel->Mods bei Absturz deaktivieren[] ändern.
 mods = Mods
 mods.none = [lightgray]Keine Mods gefunden!
 mods.guide = Modding-Anleitung
 mods.report = Problem melden
 mods.openfolder = Mod-Verzeichnis öffnen
+mods.viewcontent = Inhalt ansehen
 mods.reload = Neu laden
 mods.reloadexit = Das Spiel wird jetzt beendet, um die Mod-Änderungen anzuwenden.
+mod.installed = [[Installiert]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktiviert
-mod.disabled = [scarlet]Deaktiviert
+mod.disabled = [red]Deaktiviert
+mod.multiplayer.compatible = [gray]Mehrspieler-kompatibel
 mod.disable = Deaktivieren
+mod.version = Version:
 mod.content = Inhalt:
-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]Nicht mit V6 kompatibel (no minGameVersion: 105)
-mod.missingdependencies = [scarlet]Fehlende Abhängigkeiten: {0}
+mod.delete.error = Mod konnte nicht gelöscht werden. Datei könnte in Benutzung sein.
+
+mod.incompatiblegame = [red]Spiel Veraltet
+mod.incompatiblemod = [red]Inkompatibel
+mod.blacklisted = [red]Nicht unterstützt
+mod.unmetdependencies = [red]Fehlende Abhängigkeiten
 mod.erroredcontent = [scarlet]Inhalt-Fehler
+mod.circulardependencies = [red]Wechselseitige Abhängigkeiten
+mod.incompletedependencies = [red]Fehlende Abhängigkeiten
+
+mod.requiresversion.details = Benötigt Spielversion [accent]{0}[]\nDein Spiel ist veraltet. Diese Mod benötigt eine neuere (möglicherweise Alpha- oder Beta-) Spielversion.
+mod.outdatedv7.details = Diese Mod ist nicht mit der neuesten Version von Mindustry kompatibel. Der Autor muss sie aktualisieren und [accent]minGameVersion: 136[] in der [accent]mod.json[]-Datei hinzufügen.
+mod.blacklisted.details = Diese Mod wurde manuell gesperrt, weil sie diese Spielversion zum Abstürzen bringt oder andere Fehler verursacht. Benutze diese Mod nicht.
+mod.missingdependencies.details = Dieser Mod fehlen folgende Abhängigkeiten: {0}
+mod.erroredcontent.details = Diese Mod hat beim Laden Fehler verursacht. Bitte den Mod-Autor, diese zu beheben.
+mod.circulardependencies.details = Diese Mod hat Abhängigkeiten, die von einander abhängen.
+mod.incompletedependencies.details = Diese Mod kann aufgrund fehlenden oder ungültigen Abhängigkeiten nicht geladen werden: {0}.
+mod.requiresversion = Benötigt Spielversion: [red]{0}
+
 mod.errors = Beim Laden von Inhalt sind Fehler aufgetreten.
-mod.noerrorplay = [scarlet]Du hast Mods mit Fehlern.[] Deaktiviere die Mods oder behebe die Fehler, bevor du spielst.
-mod.nowdisabled = [scarlet]Mod '{0}' fehlen Abhängigkeiten:[accent] {1}\n[lightgray]Diese Mods müssen erst installiert werden.\nDieser Mod wird automatisch deaktiviert.
+mod.noerrorplay = [red]Du hast Mods mit Fehlern.[] Deaktiviere die Mods oder behebe die Fehler, bevor du spielst.
+mod.nowdisabled = [red]Mod '{0}' fehlen Abhängigkeiten:[accent] {1}\n[lightgray]Diese Mods müssen erst installiert werden.\nDieser Mod wird automatisch deaktiviert.
 mod.enable = Aktivieren
 mod.requiresrestart = Das Spiel wird jetzt beendet, um die Mod-Änderungen anzuwenden.
-mod.reloadrequired = [scarlet]Neuladen benötigt
+mod.reloadrequired = [red]Neuladen benötigt
 mod.import = Mod importieren
 mod.import.file = Datei importieren
-mod.import.github = GitHub-Mod importieren
-mod.jarwarn = [scarlet]JAR Mods sind nicht sicher.[]\nInstalliere nur Mods von vertrauenswürdigen Quellen!
-mod.item.remove = Dies ist Teil vom [accent] '{0}'[] Mod. Deaktiviere diesen Mod, um dies zu entfernen.
-mod.remove.confirm = Dieser Mod wird gelöscht.
+mod.import.github = Aus GitHub importieren
+mod.jarwarn = [scarlet]JAR-Mods sind nicht sicher.[]\nInstalliere nur Mods von vertrauenswürdigen Quellen!
+mod.item.remove = Dieses Item ist Teil von der [accent] '{0}'[] Mod. Deaktiviere diese Mod, um dies zu entfernen.
+mod.remove.confirm = Diese Mod wird gelöscht.
 mod.author = [lightgray]Autor:[] {0}
 mod.missing = Dieser Spielstand enthält Mods, welche nicht mehr vorhanden sind oder aktualisiert wurden. Spielstandfehler könnten passieren. Bist du dir sicher, dass du ihn laden möchtest?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Bevor du diesen Mod hochladen kannst, musst du eine Bildvorschau einbinden.\nLade ein Bild namens[accent] preview.png[] in den Modordner und versuche es nochmal.
-mod.folder.missing = Nur Mods in Ordnerform können in den Workshop hochgeladen werden.\nUm einen Mod in einen Ordner zu konvertieren, extrahiere das Archiv und lösche das alte Archiv danach. Starte dann das Spiel neu oder lade die Mods neu.
-mod.scripts.disable = Ihr Gerät unterstützt keine Mods mit Scripts. Du musst diese Mods deaktivieren, um spielen zu können.
+mod.preview.missing = Bevor du diese Mod hochladen kannst, musst du eine Bildvorschau einbinden.\nLade ein Bild namens [accent]preview.png[] in den Modordner und versuche es nochmal.
+mod.folder.missing = Nur Mods in Ordnerform können in den Workshop hochgeladen werden.\nUm eine Mod in einen Ordner zu konvertieren, extrahiere das Archiv und lösche das alte Archiv danach. Starte dann das Spiel neu oder lade die Mods neu.
+mod.scripts.disable = Dein Gerät unterstützt keine Mods mit Skripten. Du musst diese Mods deaktivieren, um spielen zu können.
 
 about.button = Info
 name = Name:
 noname = Wähle zunächst einen[accent] Spielernamen[].
+search = Durchsuchen:
 planetmap = Planetenkarte
 launchcore = Kern starten
 filename = Dateiname:
 unlocked = Neuer Inhalt freigeschaltet!
 available = Neue Forschung möglich
+unlock.incampaign = < Für Details in Kampagne freischalten >
+campaign.select = Startkampagne auswählen
+campaign.none = [lightgray]Wähle einen Planeten, auf dem du starten möchtest.\nDies kannst du jederzeit ändern.
+campaign.erekir = Neuerer, besserer Inhalt. Größtenteils linearer Fortschritt.\n\nSchwieriger. Höhere Karten- und Spielqualität.
+campaign.serpulo = Älterer Inhalt; das klassische Spiel. Offener, mehr Inhalt. \n\nKarten und Spielmechanismen möglicherweise qualitativ schlechter und ohne Balance.
+campaign.difficulty = Difficulty
+
 completed = [accent]Abgeschlossen
 techtree = Forschung
-research.legacy = [accent]5.0[] Forschungsdaten gefunden.\nMöchtest du [accent]diese Daten behalten[] oder [accent]sie löschen[] und neu anfangen (empfohlen)?
+techtree.select = Forschungsauswahl
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Behalten
 research.discard = Löschen
 research.list = [lightgray]Forschung:
@@ -185,7 +232,7 @@ server.kicked.customClient = Der Server akzeptiert keine Custom Builds von Mindu
 server.kicked.gameover = Game Over!
 server.kicked.serverRestarting = Der Server startet neu.
 server.versions = Deine Version:[accent] {0}[]\nServerversion:[accent] {1}[]
-host.info = Der [accent]'Server hosten'[]-Knopf startet einen Server auf den Ports [scarlet]6567[] und [scarlet]6568.[]\nJeder im gleichen [lightgray]W-Lan oder lokalen Netzwerk[] sollte deinen Server in seiner Serverliste sehen können.\n\nWenn du anderen die Verbindung über deine IP-Adresse ermöglichen willst, musst du [accent]Port-Forwarding[] durchführen.\n\n[lightgray]Hinweis: Falls es Probleme mit der Verbindung im Netzwerk gibt, stelle sicher, dass Mindustry in deinen Firewall-Einstellungen Zugriff auf das lokale Netzwerk hat.
+host.info = Der [accent]'Server hosten'[]-Knopf startet einen Server auf den Ports [scarlet]6567[] und [scarlet]6568[].\nJeder im gleichen [lightgray]W-Lan oder lokalen Netzwerk[] sollte deinen Server in seiner Serverliste sehen können.\n\nWenn du anderen die Verbindung über deine IP-Adresse ermöglichen willst, musst du [accent]Port-Forwarding[] durchführen.\n\n[lightgray]Hinweis: Falls es Probleme mit der Verbindung im Netzwerk gibt, stelle sicher, dass Mindustry in deinen Firewall-Einstellungen Zugriff auf das lokale Netzwerk hat.
 join.info = Hier kannst du eine [accent]Server-IP[] eingeben, um dich zu verbinden, oder Server im [accent]lokalen Netzwerk[] entdecken und dich mit ihnen verbinden.\nSowohl Spielen über das lokale Netzwerk als auch Spielen über das Internet werden unterstützt.\n\n[lightgray]Hinweis: Es gibt keine globale Serverliste; wenn du dich mit jemandem per IP-Adresse verbinden willst, musst du den Host nach seiner IP-Adresse fragen.
 hostserver = Mehrspieler hosten
 invitefriends = Freunde einladen
@@ -200,21 +247,33 @@ hosts.none = [lightgray]Keine LAN-Spiele gefunden!
 host.invalid = [scarlet]Kann keine Verbindung zum Host herstellen.
 
 servers.local = Lokale Server
+servers.local.steam = Offene Spiele & Lokale Server
 servers.remote = Andere Server
 servers.global = Community-Server
 
-servers.disclaimer = Community-Server werden vom Entwickler [accent]nicht[] geprüft.\n\Sie können Inhalte, die nicht für jedes Alter geeignet sind, enthalten.
+servers.disclaimer = Community-Server werden vom Entwickler [accent]nicht[] geprüft.\nSie können Inhalte, die nicht für jedes Alter geeignet sind, enthalten.
 servers.showhidden = Versteckte Server anzeigen
 server.shown = Angezeigt
 server.hidden = Versteckt
+viewplayer = Beobachteter Spieler: [accent]{0}
 
 trace = Spieler verfolgen
 trace.playername = Spielername: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = Eindeutige ID: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Sprache: [accent]{0}
 trace.mobile = Mobiler Client: [accent]{0}
 trace.modclient = Gemoddeter Client: [accent]{0}
+trace.times.joined = Beigetreten: [accent]{0}[] Mal
+trace.times.kicked = Rausgeworfen: [accent]{0}[] Mal
+trace.ips = IPs:
+trace.names = Namen:
 invalidid = Ungültige Client-ID! Berichte den Fehler.
+player.ban = Verbannen
+player.kick = Rauswerfen
+player.trace = Verfolgen
+player.admin = Admin an/aus
+player.team = Team wechseln
 server.bans = Verbannungen
 server.bans.none = Keine verbannten Spieler gefunden!
 server.admins = Administratoren
@@ -228,10 +287,11 @@ server.version = [lightgray]Version: {0}
 server.custombuild = [accent]Benutzerdefinierter Build
 confirmban = Bist du sicher, dass du diesen Spieler verbannen möchtest?
 confirmkick = Bist du sicher, dass du diesen Spieler rauswerfen willst?
-confirmvotekick = Bist du sicher, dass du darüber abstimmen willst, diesen Spieler rauszuwerfen?
 confirmunban = Bist du sicher, dass du die Verbannung des Spielers rückgängig machen willst?
 confirmadmin = Bist du sicher, dass du diesen Spieler zu einem Administrator machen möchtest?
 confirmunadmin = Bist du sicher, dass dieser Spieler kein Administrator mehr sein soll?
+votekick.reason = Vote-Kick Grund
+votekick.reason.message = Bist du sicher, dass du "{0}[white]" rauswerfen willst?\nWenn ja, gib bitte einen Grund ein:
 joingame.title = Spiel beitreten
 joingame.ip = IP:
 disconnect = Verbindung unterbrochen.
@@ -239,16 +299,18 @@ disconnect.error = Verbindungsfehler.
 disconnect.closed = Verbindung geschlossen.
 disconnect.timeout = Zeitüberschreitung.
 disconnect.data = Fehler beim Laden der Welt!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Nicht möglich beizutreten ([accent]{0}[]).
 connecting = [accent] Verbinde...
 reconnecting = [accent]Verbindung wird wiederhergestellt...
 connecting.data = [accent] Welt wird geladen...
 server.port = Port:
-server.addressinuse = Adresse bereits in Verwendung!
 server.invalidport = Falscher Port!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson] Fehler beim Hosten des Servers:[accent] {0}
 save.new = Neuer Spielstand
 save.overwrite = Möchtest du diesen Spielstand wirklich überschreiben?
+save.nocampaign = Einzelne Spielstände aus der Kampagne können nicht importiert werden.
 overwrite = Ãœberschreiben
 save.none = Keine Spielstände gefunden!
 savefail = Fehler beim Speichern des Spiels!
@@ -269,6 +331,7 @@ save.corrupted = [accent]Datei beschädigt oder ungültig!
 empty = <leer>
 on = An
 off = Aus
+save.search = Spiele durchsuchen...
 save.autosave = Automatisches Speichern: {0}
 save.map = Karte: {0}
 save.wave = Welle: {0}
@@ -284,9 +347,31 @@ ok = OK
 open = Öffnen
 customize = Anpassen
 cancel = Abbruch
+command = Befehl
+command.queue = [lightgray][Queuing]
+command.mine = Abbauen
+command.repair = Reparieren
+command.rebuild = Wiederaufbauen
+command.assist = Spieler unterstützen
+command.move = Bewegen
+command.boost = Boost
+command.enterPayload = Frachtblock betreten
+command.loadUnits = Einheiten laden
+command.loadBlocks = Blöcke laden
+command.unloadPayload = Fracht entladen
+command.loopPayload = Loop Unit Transfer
+stance.stop = Befehle abbrechen
+stance.shoot = Stellung: schießen
+stance.holdfire = Stellung: nicht schießen
+stance.pursuetarget = Stellung: Ziel verfolgen
+stance.patrol = Stellung: Pfad patroullieren
+stance.ram = Stellung: rammen[lightgray]in einer geraden Lilie bewegen, gegen Wände laufen
+
 openlink = Link öffnen
 copylink = Link kopieren
 back = Zurück
+max = Max
+objective = Kartenziel
 crash.export = Crash-Logs exportieren
 crash.none = Keine Crash-Logs gefunden.
 crash.exported = Crash-Logs wurden erfolgreich exportiert.
@@ -296,20 +381,22 @@ data.openfolder = Datenordner öffnen
 data.exported = Daten exportiert.
 data.invalid = Dies sind keine gültigen Spieldaten.
 data.import.confirm = Der Import von externen Daten wird [scarlet] alle[] deine gegenwärtigen Spieldaten löschen.\n[accent]Das kann nicht rückgängig gemacht werden![]\n\nSobald der Import abgeschlossen ist, wird dein Spiel sofort beendet.
-quit.confirm = Willst du wirklich aufhören?
-quit.confirm.tutorial = Weißt du, was du tust?\nDu kannst das Tutorial unter[accent] Einstellungen->Spiel->Tutorial wiederholen[] erneut spielen.
+quit.confirm = Willst du wirklich verlassen?
 loading = [accent]Wird geladen...
-reloading = [accent]Lade Mods neu...
+downloading = [accent]Herunterladen...
 saving = [accent]Speichere...
 respawn = [accent][[{0}][] um im Kern zu spawnen
 cancelbuilding = [accent][[{0}][] um den Plan zu leeren
 selectschematic = [accent][[{0}][] zum Auswählen+Kopieren
 pausebuilding = [accent][[{0}][] um das Bauen zu pausieren
 resumebuilding = [scarlet][[{0}][] um das Bauen fortzusetzen
+enablebuilding = [scarlet][[{0}][] um zu bauen
 showui = Bedienflächen versteckt.\nDrücke [accent][[{0}][], um sie wieder anzuzeigen.
+commandmode.name = [accent]Steuerungsmodus
+commandmode.nounits = [keine Einheiten]
 wave = [accent]Welle {0}
 wave.cap = [accent]Welle {0}/{1}
-wave.waiting = Welle in {0}
+wave.waiting = Nächste Welle in {0}
 wave.waveInProgress = [lightgray]Welle im Gange
 waiting = Warten...
 waiting.players = Warte auf Spieler...
@@ -326,9 +413,9 @@ custom = Benutzerdefiniert
 builtin = Enthalten
 map.delete.confirm = Bist du sicher, dass du diese Karte löschen willst? Dies kann nicht rückgängig gemacht werden!
 map.random = [accent]Zufällige Karte
-map.nospawn = Diese Karte hat keine Kerne, in denen die Spieler beginnen können! Füge einen [royal]orangen[] Kern zu dieser Karte im Editor hinzu.
-map.nospawn.pvp = Diese Karte hat keine Kerne für die gegnerischen Spieler! Füge über den Editor [scarlet] nicht-orange[] Kerne zu dieser Karte hinzu.
-map.nospawn.attack = Diese Karte hat keine gegnerischen Kerne, die Spieler angreifen können! Füge über den Editor [scarlet] rote[] Kerne zu dieser Karte hinzu.
+map.nospawn = Diese Karte hat keine Kerne, in denen die Spieler beginnen können! Füge einen {0} Kern zu dieser Karte im Editor hinzu.
+map.nospawn.pvp = Diese Karte hat keine Kerne für die gegnerischen Spieler! Füge über den Editor [scarlet]nicht-orange[] Kerne zu dieser Karte hinzu.
+map.nospawn.attack = Diese Karte hat keine gegnerischen Kerne, die Spieler angreifen können! Füge über den Editor a {0} Kerne zu dieser Karte hinzu.
 map.invalid = Fehler beim Laden der Karte: Beschädigte oder ungültige Kartendatei.
 workshop.update = Objekt aktualisieren
 workshop.error = Fehler beim Laden von Workshop-Details: {0}
@@ -336,13 +423,18 @@ map.publish.confirm = Willst du diese Karte wirklich veröffentlichen?\n\n[light
 workshop.menu = Wähle aus, was du mit diesem Objekt tun willst.
 workshop.info = Objekt-Info
 changelog = Änderungen (optional):
-eula = Steam EULA
+updatedesc = Titel und Beschreibung überschreiben
+eula = Steam-EULA
 missing = Dieses Objekt wurde gelöscht oder verschoben.\n[lightgray]Die Workshop-Auflistung ist nun automatisch getrennt worden.
 publishing = [accent]Veröffentlichen...
 publish.confirm = Willst du das wirklich veröffentlichen?\n\n[lightgray]Vergewissere dich, dass du der Workshop-EULA zugestimmt hast, sonst tauchen deine Objekte nicht auf!
 publish.error = Fehler beim Veröffentlichen des Objekts: {0}
 steam.error = Fehler beim Laden der Steam-Dienste.\nError: {0}
 
+editor.planet = Planet:
+editor.sector = Sektor:
+editor.seed = Seed:
+editor.cliffs = Wände zu Klippen
 editor.brush = Pinsel
 editor.openin = Öffne im Editor
 editor.oregen = Erze generieren
@@ -351,57 +443,99 @@ editor.mapinfo = Karten-Info
 editor.author = Autor:
 editor.description = Beschreibung:
 editor.nodescription = Eine Karte benötigt eine Beschreibung mit mindestens 4 Buchstaben, bevor sie veröffentlicht werden kann.
-editor.waves = Wellen:
-editor.rules = Regeln:
-editor.generation = Generator:
+editor.waves = Wellen
+editor.rules = Regeln
+editor.generation = Generator
+editor.objectives = Ziele
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Name bearbeiten
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Im Spiel bearbeiten
+editor.playtest = Playtest
 editor.publish.workshop = Im Workshop veröffentlichen
 editor.newmap = Neue Karte
 editor.center = Zur Mitte
+editor.search = Karten durchsuchen...
+editor.filters = Karten filtern
+editor.filters.mode = Spielmodi:
+editor.filters.type = Kartentyp:
+editor.filters.search = Suchen nach:
+editor.filters.author = Autor
+editor.filters.description = Beschreibung
+editor.shiftx = Verschieben X
+editor.shifty = Verschieben Y
 workshop = Workshop
 waves.title = Wellen
 waves.remove = Entfernen
-waves.never = <nie>
 waves.every = alle
 waves.waves = Welle(n)
+waves.health = Leben: {0}%
 waves.perspawn = pro Spawn
 waves.shields = Schilder pro Welle
 waves.to = bis
+waves.spawn = Startpunkte:
+waves.spawn.all = <alle>
+waves.spawn.select = Startpunktauswahl
+waves.spawn.none = [scarlet]keine Startpunkte gefunden
+waves.max = maximale Einheiten
 waves.guardian = Boss
 waves.preview = Vorschau
 waves.edit = Bearbeiten...
-waves.copy = Aus der Zwischenablage kopieren
+waves.random = Zufällig
+waves.copy = In die Zwischenablage kopieren
 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.
+waves.sort = Sortieren nach
+waves.sort.reverse = Reihenfolge umkehren
+waves.sort.begin = Anfang
+waves.sort.health = Lebenspunkte
+waves.sort.type = Sorte
+waves.search = Wellen durchsuchen...
+waves.filter = Einheiten Filter
+waves.units.hide = Alle verstecken
+waves.units.show = Alle anzeigen
 
 
 wavemode.counts = Menge
 wavemode.totals = Gesamtmenge
 wavemode.health = Lebenspunkte
+all = All
 
 editor.default = [lightgray]<Standard>
 details = Details
 edit = Bearbeiten
+variables = Variablen
+logic.clear.confirm = Willst du wirklich den gesamten code aus diesem prozessor löschen?
+logic.globals = Eingebaute Variablen
 editor.name = Name:
 editor.spawn = Spawnbereich
 editor.removeunit = Bereich entfernen
 editor.teams = Teams
 editor.errorload = Fehler beim Laden der Datei:\n[accent]{0}
 editor.errorsave = Fehler beim Speichern der Datei:\n[accent]{0}
-editor.errorimage = Das ist ein Bild, keine Karte. Wechsle nicht den Dateityp und erwarte, dass es funktioniert.\n\nWenn du eine 'v3.5/build 40'-Karte importieren möchtest, benutze den 'Importiere Terrainbild'-Knopf im Editor.
+editor.errorimage = Das ist ein Bild, keine Karte.
 editor.errorlegacy = Diese Karte ist zu alt und benutzt ein veraltetes Kartenformat, das nicht mehr unterstützt wird.
 editor.errornot = Dies ist keine Kartendatei.
 editor.errorheader = Diese Karte ist entweder nicht gültig oder beschädigt.
 editor.errorname = Karte hat keinen Namen.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aktualisieren
 editor.randomize = Zufällig anordnen
+editor.moveup = Hochschieben
+editor.movedown = Herunterschieben
+editor.copy = Kopieren
 editor.apply = Anwenden
 editor.generate = Generieren
+editor.sectorgenerate = Sektor generieren
 editor.resize = Größe\nanpassen
 editor.loadmap = Karte\nladen
 editor.savemap = Karte\nspeichern
+editor.savechanges = [scarlet]Du hast ungespeicherte Änderungen!\n\n[]Möchtest du sie speichern?
 editor.saved = Gespeichert!
 editor.save.noname = Deine Karte hat keinen Namen! Setze einen Namen im [accent]Karten-Info[]-Menü.
 editor.save.overwrite = Deine Karte überschreibt eine Standardkarte! Wähle einen anderen Karten Namen im [accent]Karten-Info[]-Menü.
@@ -440,10 +574,16 @@ toolmode.eraseores = Erze löschen
 toolmode.eraseores.description = Löscht nur Erze.
 toolmode.fillteams = Teams ausfüllen
 toolmode.fillteams.description = Füllt Teams aus statt Blöcke.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Teams zeichnen
 toolmode.drawteams.description = Zeichnet Teams statt Blöcke.
+#unused
+toolmode.underliquid = Unter Flüssigkeiten
+toolmode.underliquid.description = Malt Boden unter Flüssigkeiten.
 
 filters.empty = [lightgray]Keine Filter! Füge einen mit dem unteren Knopf hinzu.
+
 filter.distort = Verzerren
 filter.noise = Rauschen
 filter.enemyspawn = Gegnerischer Spawn Auswahl
@@ -460,6 +600,8 @@ filter.clear = Löschen
 filter.option.ignore = Ignorieren
 filter.scatter = Streuen
 filter.terrain = Landschaft
+filter.logic = Logic
+
 filter.option.scale = Skalierung
 filter.option.chance = Wahrscheinlichkeit
 filter.option.mag = Größe
@@ -468,17 +610,39 @@ filter.option.circle-scale = Kreisskalierung
 filter.option.octaves = Oktaven
 filter.option.falloff = Rückgang
 filter.option.angle = Winkel
+filter.option.tilt = Drehung
+filter.option.rotate = Drehung
 filter.option.amount = Menge
 filter.option.block = Block
 filter.option.floor = Boden
 filter.option.flooronto = Zielboden
 filter.option.target = Ziel
+filter.option.replacement = Ersatz
 filter.option.wall = Wand
 filter.option.ore = Erz
 filter.option.floor2 = Sekundärer Boden
 filter.option.threshold2 = Sekundärer Grenzwert
 filter.option.radius = Radius
 filter.option.percentile = Perzentil
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Breite:
 height = Höhe:
@@ -489,6 +653,7 @@ load = Laden
 save = Speichern
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Arbeitsspeicher: {0}mb
 memory2 = Arbeitsspeicher:\n {0}mb +\n {1}mb
 language.restart = Starte dein Spiel neu, um die Spracheinstellungen zu übernehmen.
@@ -507,21 +672,75 @@ requirement.core = Zerstöre den feindlichen Kern in {0}
 requirement.research = Erforsche {0}
 requirement.produce = Produziere {0}
 requirement.capture = Erobere {0}
+requirement.onplanet = Kontrolliere Sektor auf {0}
+requirement.onsector = Lande auf Sektor: {0}
 launch.text = Start
-research.multiplayer = Nur der Host kann forschen.
 map.multiplayer = Nur der Host kann Sektoren ansehen.
 uncover = Freischalten
 configure = Anfangsressourcen festlegen
 
+objective.research.name = Erforschen
+objective.produce.name = Herstellen
+objective.item.name = Erhalten
+objective.coreitem.name = Im Kern lagern
+objective.buildcount.name = Blöcke bauen
+objective.unitcount.name = Einheiten herstellen
+objective.destroyunits.name = Zerstöre Einheiten
+objective.timer.name = Zeit
+objective.destroyblock.name = Block zerstören
+objective.destroyblocks.name = Blöcke zerstören
+objective.destroycore.name = Kern zerstören
+objective.commandmode.name = Steuerungsmodus
+objective.flag.name = Flag
+
+marker.shapetext.name = Geformter Text
+marker.point.name = Punkt
+marker.shape.name = Form
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quadrat
+marker.texture.name = Textur
+
+marker.background = Hintergrund
+marker.outline = Umriss
+
+objective.research = [accent]Erforsche:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Erstelle:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Zerstöre:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Zerstöre: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Erhalte: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Lagere im Kern:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Baue: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Baue Einheit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Zerstöre: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Gegner in [lightgray]{0}[]
+objective.enemyescelating = [accent]Gegnerische Einheit-Produktion steigert sich in [lightgray]{0}[]
+objective.enemyairunits = [accent]Gegnerische Lufteinheit-Produktion startet in [lightgray]{0}[]
+objective.destroycore = [accent]Gegnerischen Kern zerstören
+objective.command = [accent]Einheiten Steuern
+objective.nuclearlaunch = [accent]âš  Atomraketenstart festgestellt: [lightgray]{0}
+
+announce.nuclearstrike = [red]âš  ATOMRAKETEN IM ANFLUG  âš \n[lightgray]baue sofort weitere Kerne zur Absicherung
+
 loadout = Anfangsressourcen
 resources = Ressourcen
+resources.max = Max
 bannedblocks = Gesperrte Blöcke
+unbannedblocks = Unbanned Blocks
+objectives = Ziele
+bannedunits = Gesperrte Einheiten
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Gesperrte Einheiten als Whitelist
+bannedblocks.whitelist = Gesperrte Blöcke als Whitelist
 addall = Alle hinzufügen
-launch.from = Items werden von [accent]{0} []gestartet
+launch.from = Materialen werden von [accent]{0} []gestartet
+launch.capacity = Ressourcenkapazität: [accent]{0}
 launch.destination = Ziel: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Anzahl muss eine Zahl zwischen 0 und {0} sein.
 add = Hinzufügen...
-boss.health = Boss-Lebenspunkte
+guardian = Boss
 
 connectfail = [crimson] Verbindung zum Server konnte nicht hergestellt werden: [accent]{0}
 error.unreachable = Server nicht erreichbar.
@@ -533,17 +752,24 @@ error.mapnotfound = Kartendatei nicht gefunden!
 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Regen
-weather.snow.name = Schnee
+weather.snowing.name = Schnee
 weather.sandstorm.name = Sandsturm
 weather.sporestorm.name = Sporensturm
 weather.fog.name = Nebel
 
+campaign.playtime = \uf129 [lightgray]Sektor-Spielzeit: {0}
+campaign.complete = [accent]Glückwunsch.\n\nDer Gegner auf {0} ist besiegt worden.\n[lightgray]Der letzte Sektor wurde erobert.
+
+sectorlist = Sektoren
+sectorlist.attacked = {0} wird angegriffen
 sectors.unexplored = [lightgray]Unentdeckt
 sectors.resources = Ressourcen:
 sectors.production = Produktion:
 sectors.export = Export:
+sectors.import = Import:
 sectors.time = Zeit:
 sectors.threat = Gefahr:
 sectors.wave = Welle:
@@ -551,48 +777,75 @@ sectors.stored = Gelagert:
 sectors.resume = Weiterspielen
 sectors.launch = Start
 sectors.select = Auswählen
-sectors.nonelaunch = [lightgray]none (sun)
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]keiner (Sonne)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Sektor umbenennen
 sectors.enemybase = [scarlet]Gegnerische Basis
 sectors.vulnerable = [scarlet]Angriffsgefährdet
 sectors.underattack = [scarlet]Wird angegriffen! [accent]{0}% geschädigt
+sectors.underattack.nodamage = [scarlet]Unerobert
 sectors.survives = [accent]Kann {0} Wellen überleben
 sectors.go = Hingehen
+sector.abandon = Aufgeben
+sector.abandon.confirm = Kern(e) von diesem Sektor werden sich selbst zerstören.\nWeiter?
 sector.curcapture = Sektor erfolgreich erobert
 sector.curlost = Sektor verloren
 sector.missingresources = [scarlet]Fehlende Kernressourcen
 sector.attacked = Sektor [accent]{0}[white] wird angegriffen!
 sector.lost = Sektor [accent]{0}[white] verloren!
-#note: the missing space in the line below is intentional
-sector.captured = Sektor [accent]{0}[white]erobert!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Bild ändern
+sector.noswitch.title = Kann Sektoren nicht wechseln
+sector.noswitch = Du kannst nicht zwischen Sektoren wechseln, wenn ein anderer angegriffen wird.\n\nSektor: [accent]{0}[] auf [accent]{1}[]
+sector.view = Sektor ansehen
 
 threat.low = Niedrig
 threat.medium = Mittel
 threat.high = Hoch
 threat.extreme = Extrem
 threat.eradication = Zerstörung
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = Planeten
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sonne
 
-sector.impact0078.name = Impact 0078
+sector.impact0078.name = Einschlag 0078
 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.biomassFacility.name = Biomass Synthesis Facility
-sector.windsweptIslands.name = Windswept Islands
-sector.extractionOutpost.name = Extraction Outpost
-sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.craters.name = Die Krater
+sector.frozenForest.name = Gefrorener Wald
+sector.ruinousShores.name = Trümmerstrände
+sector.stainedMountains.name = Geflecktes Gebirge
+sector.desolateRift.name = Einsame Kluft
+sector.nuclearComplex.name = Nuklear-Produktionsstätte
+sector.overgrowth.name = Ãœberwucherung
+sector.tarFields.name = Teerfelder
+sector.saltFlats.name = Salzebenen
+sector.fungalPass.name = Infizierter Gebirgspass
+sector.biomassFacility.name = Biomassensyntheselabor
+sector.windsweptIslands.name = Windgepeitschte Inseln
+sector.extractionOutpost.name = Extraktionsaußenposten
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetares Launchterminal
+sector.coastline.name = Küstenlinie
+sector.navalFortress.name = Wasserfestung
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 sector.groundZero.description = Der optimale Ort, um anzufangen. Schwache Gegner und weniger Ressourcen.\nSammele so viel Kupfer und Blei wie möglich.\nGeh weiter.
 sector.frozenForest.description = Auch hier, näher an den Bergen, sind die Sporen. Sogar die niedrigen Temperaturen können sie nicht zurückhalten.\n\nLerne, Strom zu verwenden. Baue Verbrennungsgeneratoren und Reparateure.
@@ -610,6 +863,72 @@ sector.windsweptIslands.description = Diese Inseln befinden sich in der Nähe vo
 sector.extractionOutpost.description = Ein Außenposten, der vom Gegner erstellt wurde, um Ressourcen in andere Sektoren zu transportieren.\n\nTrans-Sektorischer Transport ist nötig, um weiter voranzuschreiten. Zerstöre den Posten. Erforsche deren Launchpads.
 sector.impact0078.description = Hier liegen Reste der interplanetarischen Transporteinheit, die dieses Sonnensystem zuerst betreten hat.\n\nRette so viel wie möglich von den Ruinen. Erforsche jede intakte Technologie.
 sector.planetaryTerminal.description = Das Endziel.\n\nDiese Uferbasis besitzt ein Gerät, mit dem es möglich ist, Kerne auf andere Planeten zu schicken. Es ist [accent]sehr[] gut beschützt.\n\nStelle Wassereinheiten her. Eliminiere den Gegner so schnell wie möglich. Erforsche das Launchgerät.
+sector.coastline.description = Ãœberreste alter Schiffstechnologien wurden hier entdeckt. Wehre dich gegen die gegnischen Angriffe, erobere den Sektor und erforsche diese Technologie.
+sector.navalFortress.description = Der Gegner hat auf einer abgelegenen, von Natur aus sicheren Insel eine Basis aufgebaut. Zerstöre diesen Außenposten. Finde deren fortgeschrittene Schiffstechnologien und erforsche diese weiter.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = Der Anfang
+sector.aegis.name = Aegis
+sector.lake.name = See
+sector.intersect.name = Schnitt
+sector.atlas.name = Atlas
+sector.split.name = Teilung
+sector.basin.name = Talbecken
+sector.marsh.name = Marsch
+sector.peaks.name = Gipfel
+sector.ravine.name = Schlucht
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Hochburg
+sector.crevice.name = Spalte
+sector.siege.name = Belagerung
+sector.crossroads.name = Kreuzung
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = Der Einführungssektor. Dieser Sektor hat noch kein Ziel. Erwarte weitere Informationen.
+sector.aegis.description = In disem Sektor gibt es Wolframvorkommen.\nErforsche den [accent]Schlagbohrer[], um diese Abzubauen und den Feind zu zerstören.
+sector.lake.description = Der Schlackesee in diesem Sektor begrenzt die Menge nützlicher Einheiten. Eine Flugeinheit ist die einzige Möglichkeit.\nErforsche den [accent]Schiffhersteller[] und erstelle so schnell wie möglich einen [accent]Elud[].
+sector.intersect.description = Unsere Scanner verraten uns, dass dieser Sektor kurz nach der Landung von mehreren Seiten gleichzeitig angegeriffen werden wird.\nBaue schnell Verteidigung und expandiere so bald wie möglich.\nWir werden [accent]Mecheinheiten[] brauchen, um mit dem Gelände umzugehen.
+sector.atlas.description = Wir werden eine Vielfalt von Einheiten brauchen, um mit dem Terrain in diesem Sektor umgehen zu können.\nEs ist möglich, dass auch verbesserte Einheiten nötig sind, um die stärkeren Gegner zu besiegen.\nErforsche den [accent]Electrolyseur[] und den [accent]Panzerverbesserer[].
+sector.split.description = Die schwache Gegnerpräsens macht diesen Sektor perfekt zum Testen neuer Transportmittel.
+sector.basin.description = Viele Gegner wurden in diesem Sektor erkann.\nBaue schnell Einheiten und nehme gegnerische Kerne ein, um einen Stützpunkt aufzubauen.
+sector.marsh.description = Dieser Sektor hat viel Arkyzit, dafür aber wenig Schlote.\nBaue [accent]Chemische Verbrennungskammern[] um Strom zu erzeugen.
+sector.peaks.description = Das bergige Gelände in diesem Sektor macht die meisten Einheiten nutzlos. Du wirst fliegende Einheiten brauchen.\nAchte auf feindliche Luftabwehr. Es ist vielleicht möglich ein paar dieser Installationen auszuschalten, indem du auf ihre unterstützenden Gebäude zielst.
+sector.ravine.description = Keine gegnerischen Kerne wurde in diesem Sektor erkannt, jedoch ist er Teil von einem wichtigen Transportweg. Erwarte eine Vielfalt an Gegnern.\nStelle Spannungslegierung her[]. Baue [accent]Afflikt[]-Geschütze.
+sector.caldera-erekir.description = Die Ressourcen in diesem Sektor sind über mehrere Inseln verteilt.\nErforsche und verwende Ressourcentransport mit Drohnen.
+sector.stronghold.description = Die starke gegnerische Basis in diesem Sektor beschützt signifikante Mengen [accent]Thorium[].\nBenutze dieses, um stärkere Einheiten und Geschütze herzustellen.
+sector.crevice.description = Der Gegner wird heftige Angriffstruppen schicken, um deine Basis in diesem Sektor zu zerstören.\n[accent]Karbid[] und [accent]Pyrolysegenerator[] sind für das Überleben vielleicht notwendig.
+sector.siege.description = In diesem Sektor befinden sich zwei Schluchten, die einen Doppelangriff erzwingen.\nErforsche [accent]Cyanogen[], um noch stärkere Panzereinheiten bauen zu können.\nVorsicht: Gegnerische Langstreckengeschosse wurden erkannt. Diese kann man abschießen, bevor sie treffen.
+sector.crossroads.description = Die gegnerischen Basen in diesem Sektor befinden sich in sehr unterschiedlichen Gebieten. Erforsche neue Einhieten, um dich anzupassen.\nManche Basen sind zusätzlich mit Schilden beschützen. Finde deren Stromversorgung.
+sector.karst.description = Dieser Sektor ist sehr ressourcenreich, wird aber von den Gegnern angegriffen, wenn ein neuer Kern landet.\nBenutze die vielen Materialen und erforsche [accent]Phasengewebe[].
+sector.origin.description = Der letzte Sektor mit einer erheblichen gegnerischen Basis.\nEs gibt keine sinnvollen Forschungsmöglichkeiten mehr - konzentriere dich ausschließlich auf die gegnerischen Kerne.
+
+status.burning.name = Brennend
+status.freezing.name = Frierend
+status.wet.name = Nass
+status.muddy.name = Schlammig
+status.melting.name = Schmelzend
+status.sapped.name = Schwächend
+status.electrified.name = Elektrisch
+status.spore-slowed.name = Sporen-verlangsamt
+status.tarred.name = Teerend
+status.overdrive.name = Overdrive
+status.overclock.name = Ãœbertaktet
+status.shocked.name = Schockend
+status.blasted.name = Sprengend
+status.unmoving.name = Unbeweglich
+status.boss.name = Boss
 
 settings.language = Sprache
 settings.data = Spieldaten
@@ -632,6 +951,7 @@ settings.clearcampaignsaves.confirm = Möchtest du wirklich alle Kampagne-Speich
 paused = [accent]< Pausiert >
 clear = Leeren
 banned = [scarlet]Verbannt
+unsupported.environment = [scarlet]Umgebung nicht unterstützt
 yes = Ja
 no = Nein
 info.title = Info
@@ -639,14 +959,18 @@ error.title = [crimson]Ein Fehler ist aufgetreten
 error.crashtitle = Ein Fehler ist aufgetreten!
 unit.nobuild = [scarlet]Einheit kann nicht bauen!
 lastaccessed = [lightgray]Zuletzt konfiguriert: {0}
+lastcommanded = [lightgray]Letzter Befehl: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <öffne Spiel um zu zeigen>
 stat.description = Beschreibung
 stat.input = Eingang
 stat.output = Ausgang
+stat.maxefficiency = Max. Effizienz
 stat.booster = Verstärkung
 stat.tiles = Erforderte Untergründe
 stat.affinities = Affinitäten
+stat.opposites = Gegenteile
 stat.powercapacity = Kapazität
 stat.powershot = Stromverbrauch/Schuss
 stat.damage = Schaden
@@ -659,8 +983,6 @@ stat.size = Größe
 stat.displaysize = Bildschirmgröße
 stat.liquidcapacity = Flüssigkeitskapazität
 stat.powerrange = Stromreichweite
-stat.weapons = Waffen
-stat.bullet = Geschoss
 stat.linkrange = Verbindungsradius
 stat.instructions = Befehle
 stat.powerconnections = Maximale Stromverbindungen
@@ -671,6 +993,11 @@ stat.memorycapacity = Speicherkapazität
 stat.basepowergeneration = Basis-Stromerzeugung
 stat.productiontime = Produktionszeit
 stat.repairtime = Zeit zur vollständigen Reparatur
+stat.repairspeed = Heilungsgeschwindigkeit
+stat.weapons = Waffen
+stat.bullet = Geschoss
+stat.moduletier = Modulstufe
+stat.unittype = Einheitentyp
 stat.speedincrease = Geschwindigkeitserhöhung
 stat.range = Reichweite
 stat.drilltier = Abbaubare Erze
@@ -678,21 +1005,23 @@ stat.drillspeed = Bohrgeschwindigkeit
 stat.boosteffect = Verstärkungseffekt
 stat.maxunits = Max. aktive Einheiten
 stat.health = Lebenspunkte
+stat.armor = Rüstung
 stat.buildtime = Baudauer
 stat.maxconsecutive = Max. Konsekutive
 stat.buildcost = Baukosten
 stat.inaccuracy = Ungenauigkeit
 stat.shots = Schüsse
-stat.reload = Schüsse/Sekunde
+stat.reload = Schussrate
 stat.ammo = Munition
 stat.shieldhealth = Schildlebenspunkte
 stat.cooldowntime = Cooldown-Zeit
 stat.explosiveness = Sprengkraft
 stat.basedeflectchance = Grundreflektionschance
-stat.lightningchance = Blitzwahr­schein­lich­keit
+stat.lightningchance = Blitzwahrscheinlichkeit
 stat.lightningdamage = Blitzschaden
 stat.flammability = Brennbarkeit
 stat.radioactivity = Radioaktivität
+stat.charge = Ladung
 stat.heatcapacity = Hitzekapazität
 stat.viscosity = Viskosität
 stat.temperature = Temperatur
@@ -701,25 +1030,78 @@ stat.buildspeed = Baugeschwindigkeit
 stat.minespeed = Abbaugeschwindigkeit
 stat.minetier = Abbau-Kraft
 stat.payloadcapacity = Einheitenkapazität
-stat.commandlimit = Kommandier-Limit
 stat.abilities = Fähigkeiten
 stat.canboost = Kann boosten
 stat.flying = Flug
 stat.ammouse = Muntionsverbrauch
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Schaden-Multiplikator
+stat.healthmultiplier = Lebenspunkte-Multiplikator
+stat.speedmultiplier = Geschwindigkeit-Multiplikator
+stat.reloadmultiplier = Nachlade-Multiplikator
+stat.buildspeedmultiplier = Baugeschwindigkeit-Multiplikator
+stat.reactive = Reagiert mit
+stat.immunities = Immunitäten
+stat.healing = Heilung
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Kraftfeld
+ability.forcefield.description = Projeziert ein Kraftfeld, welches Kugeln aufhält
 ability.repairfield = Heilungsfeld
+ability.repairfield.description = repariert Einheiten in der Nähe
 ability.statusfield = Statusfeld
-ability.unitspawn = {0} Fabrik
-ability.shieldregenfield = Schild-regenerations-Feld
+ability.statusfield.description = Gibt Einheiten in der Nähe einen Statuseffekt
+ability.unitspawn = Fabrik
+ability.unitspawn.description = Baut Einheiten
+ability.shieldregenfield = Schildregenerationsfeld
+ability.shieldregenfield.description = Regeneriert Schilder von Einheiten in der Nähe
 ability.movelightning = Bewegungsblitze
+ability.movelightning.description = Entfesselt bei Bewegung Blitze
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Lichtbogenschild
+ability.shieldarc.description = Projeziert ein Kraftfeld in einem Bogen, welches Kugeln aufhält
+ability.suppressionfield = Heilungsunterdrückungsfeld
+ability.suppressionfield.description = Unterdrückt Heilungsblöcke in der Nähe
+ability.energyfield = Energiefeld
+ability.energyfield.description = Schockt Feinde in der Nähe
+ability.energyfield.healdescription = Schockt Feinde und heilt alliierte in der Nähe
+ability.regen = Regeneration
+ability.regen.description = Regeneriert eigene Lebenspunkte mit der Zeit
+ability.liquidregen = Flüssigkeitsabsorbtion
+ability.liquidregen.description = Nimmt Flüssigkeit auf, um sich selbst zu heilen
+ability.spawndeath = Fragmentierung
+ability.spawndeath.description = Entlässt beim Tod neue Einheiten
+ability.liquidexplode = Auslaufen
+ability.liquidexplode.description = Verschüttet Flüssigkeit beim Tod
+ability.stat.firingrate = [stat]{0}/sek[lightgray] Feuerrate
+ability.stat.regen = [stat]{0}[lightgray] Lebenspunkte/sek
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] Schild
+ability.stat.repairspeed = [stat]{0}/sek[lightgray] Repariergeschwindigkeit
+ability.stat.slurpheal = [stat]{0}[lightgray] Lebenspunkte/Flüssigkeitseinheit
+ability.stat.cooldown = [stat]{0} sek[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max Ziele
+
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] Schadensreduktion
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min Geschwindigkeit
+ability.stat.duration = [stat]{0} sek[lightgray] Dauer
+ability.stat.buildtime = [stat]{0} sek[lightgray] Baudauer
+
+bar.onlycoredeposit = Nur Kernablage möglich
 
 bar.drilltierreq = Besserer Bohrer benötigt
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Fehlende Ressourcen
 bar.corereq = Kern-Basis erforderlich
+bar.corefloor = Kernzone erforderlich
+bar.cargounitcap = Frachteinheiten-Limit erreicht
 bar.drillspeed = Bohrgeschwindigkeit: {0}/s
 bar.pumpspeed = Pumpengeschwindigkeit: {0}/s
 bar.efficiency = Effizienz: {0}%
+bar.boost = Beschleunigung: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Strom: {0}/s
 bar.powerstored = Gespeichert: {0}/{1}
 bar.poweramount = Strom: {0}
@@ -730,10 +1112,17 @@ bar.capacity = Kapazität: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = Flüssigkeit
 bar.heat = Hitze
+bar.cooldown = Cooldown
+bar.instability = Instabilität
+bar.heatamount = Hitze: {0}
+bar.heatpercent = Hitze: {0} ({1}%)
 bar.power = Strom
 bar.progress = Baufortschritt
+bar.loadprogress = Fortschritt
+bar.launchcooldown = Start-Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x Stärke
 
 units.processorcontrol = [lightgray]Prozessorgesteuert
 
@@ -741,38 +1130,48 @@ bullet.damage = [stat]{0}[lightgray] Schaden
 bullet.splashdamage = [stat]{0}[lightgray] Flächenschaden ~[stat] {1}[lightgray] Kacheln
 bullet.incendiary = [stat]entzündend
 bullet.homing = [stat]zielsuchend
-bullet.sapping = [stat]entzieht Lebenspunkte
-bullet.shock = [stat]schockend
-bullet.frag = [stat]explosiv
+bullet.armorpierce = [stat]panzerbrechend
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] Heilungsunterdrückung ~ [stat]{1}[lightgray] Kacheln
+bullet.interval = [stat]{0}/sec[lightgray] Intervallgeschosse:
+bullet.frags = [stat]{0}[lightgray]x Splittergeschosse:
+bullet.lightning = [stat]{0}[lightgray]x Blitz ~ [stat]{1}[lightgray] Schaden
 bullet.buildingdamage = [stat]{0}%[lightgray]Blockschaden
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] zurückstoßend
 bullet.pierce = [stat]{0}[lightgray]x Durchstechkraft
 bullet.infinitepierce = [stat]Durchstechkraft
-bullet.freezing = [stat]frierend
 bullet.healpercent = [stat]{0}[lightgray]% Heilung
-bullet.tarred = [stat]teerend
+bullet.healamount = [stat]{0}[lightgray] direkte Reperatur
 bullet.multiplier = [stat]{0}[lightgray]x Munition Multiplikator
-bullet.reload = [stat]{0}[lightgray]x Feuerrate
+bullet.reload = [stat]{0}%[lightgray] Feuerrate
+bullet.range = [stat]{0}[lightgray] Blöcke Reichweite
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = Blöcke
 unit.blockssquared = Blöcke²
 unit.powersecond = Stromeinheiten/Sekunde
+unit.tilessecond = Blöcke/Sekunde
 unit.liquidsecond = Flüssigkeitseinheiten/Sekunde
 unit.itemssecond = Materialeinheiten/Sekunde
 unit.liquidunits = Flüssigkeitseinheiten
 unit.powerunits = Stromeinheiten
+unit.heatunits = Hitzeeinheiten
 unit.degrees = Grad
 unit.seconds = Sekunden
-unit.minutes = mins
+unit.minutes = Minuten
 unit.persecond = /sek
 unit.perminute = /min
 unit.timesspeed = x Geschwindigkeit
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = Schildlebenspunkte
 unit.items = Materialeinheiten
 unit.thousands = k
 unit.millions = Mio
 unit.billions = Mrd
+unit.shots = Schuss
 unit.pershot = /Schuss
 category.purpose = Beschreibung
 category.general = Allgemeines
@@ -782,17 +1181,23 @@ category.items = Materialien
 category.crafting = Erzeugung
 category.function = Funktion
 category.optional = Optionale Zusätze
-setting.landscape.name = Landschaft sperren
+setting.alwaysmusic.name = Immer Musik spielen
+setting.alwaysmusic.description = An: Musik spielt ständig im Spiel\n Aus: Musik spielt hin und wieder in zufälligen Abständen
+setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen
+setting.landscape.name = Querformat sperren
 setting.shadows.name = Schatten
 setting.blockreplace.name = Automatische Blockvorschläge
 setting.linear.name = Lineare Filterung
 setting.hints.name = Tipps
-setting.flow.name = Ressourcen-Fluss anzeigen
+setting.logichints.name = Logiktipps
 setting.backgroundpause.name = Im Hintergrund pausieren
 setting.buildautopause.name = Bauen automatisch pausieren
-setting.animatedwater.name = Animiertes Wasser
+setting.doubletapmine.name = Doppeltippen zum Abbauen
+setting.commandmodehold.name = Halten für Steuerungsmodus
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Mods bei Absturz deaktivieren
+setting.animatedwater.name = Animierte Oberflächen
 setting.animatedshields.name = Animierte Schilde
-setting.antialias.name = Antialias[lightgray] (Neustart erforderlich)[]
 setting.playerindicators.name = Spieler-Indikatoren
 setting.indicators.name = Verbündeten-Indikatoren
 setting.autotarget.name = Auto-Zielauswahl
@@ -801,15 +1206,12 @@ setting.touchscreen.name = Touchscreen-Steuerung
 setting.fpscap.name = Max. FPS
 setting.fpscap.none = Kein(e)
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI-Skalierung[lightgray] (Neustart erforderlich)[]
+setting.uiscale.name = UI-Skalierung
+setting.uiscale.description = Neustart erforderlich.
 setting.swapdiagonal.name = Immer diagonale Platzierung
-setting.difficulty.training = Training
-setting.difficulty.easy = Leicht
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Schwer
-setting.difficulty.insane = Verrückt
-setting.difficulty.name = Schwierigkeit:
 setting.screenshake.name = Wackeleffekt
+setting.bloomintensity.name = Bloomstärke
+setting.bloomblur.name = Bloomunschärfe
 setting.effects.name = Effekte anzeigen
 setting.destroyedblocks.name = Zerstörte Blöcke anzeigen
 setting.blockstatus.name = Block-Status anzeigen
@@ -819,31 +1221,41 @@ setting.saveinterval.name = Autosave-Häufigkeit
 setting.seconds = {0} Sekunden
 setting.milliseconds = {0} Millisekunden
 setting.fullscreen.name = Vollbild
-setting.borderlesswindow.name = Randloses Fenster [lightgray](Neustart vielleicht erforderlich)
+setting.borderlesswindow.name = Randloses Fenster
+setting.borderlesswindow.name.windows = Randloses Vollbild
+setting.borderlesswindow.description = Neustart vielleicht erforderlich.
 setting.fps.name = FPS anzeigen
+setting.console.name = Konsole freigeben
 setting.smoothcamera.name = Sanfte Kamerabewegungen
 setting.vsync.name = VSync
 setting.pixelate.name = Verpixeln [lightgray](Könnte die Leistung beeinträchtigen)
 setting.minimap.name = Zeige die Minimap
-setting.coreitems.name = Kern-Items anzeigen
+setting.coreitems.name = Kern-Materialien anzeigen
 setting.position.name = Spieler-Position anzeigen
+setting.mouseposition.name = Mausposition anzeigen
 setting.musicvol.name = Musiklautstärke
 setting.atmosphere.name = Planetatmosphäre zeigen
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Ambient-Lautstärke
 setting.mutemusic.name = Musik stummschalten
 setting.sfxvol.name = Audioeffekt-Lautstärke
 setting.mutesound.name = Audioeffekte stummschalten
 setting.crashreport.name = Anonyme Absturzberichte senden
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Automatisch speichern
-setting.publichost.name = Öffentliche Sichtbarkeit des Spiels
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Spielerbegrenzung
 setting.chatopacity.name = Chat-Deckkraft
 setting.lasersopacity.name = Power-Laser-Deckkraft
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Brücken-Deckkraft
 setting.playerchat.name = Chat im Spiel anzeigen
 setting.showweather.name = Wetter anzeigen
-public.confirm = Willst du dein Spiel öffentlich zugänglich machen?\n[accent]Jeder kann deinem Spiel beitreten.\n[lightgray]Dies kann später in den Einstellungen->Spiel->Öffentliches Spiel geändert werden.
-public.confirm.really = Wenn du mit Freunden spielen willst, drücke [green]Freunde einladen[] statt einen [scarlet]öffentlichen Server[] zu erstellen!\nBist du dir sicher, dass du dein Spiel [scarlet]öffentlich[] machen möchtest?
+setting.hidedisplays.name = Logik-Bildschirme verdecken
+setting.macnotch.name = Passe die Schnittstelle an die Anzeigekerbe an
+setting.macnotch.description = Neustart erforderlich
+steam.friendsonly = Nur Freunde
+steam.friendsonly.tooltip = Ob nur Steam-Freunde deinem Spiel beitreten können.\nDiese Einstellung zu deaktivieren macht dein Spiel öffentlich - jeder kann beitreten.
 public.beta = Bemerke: Beta-Versionen des Spiels können keine öffentlichen Spiele machen.
 uiscale.reset = UI-Skalierung wurde geändert.\nDrücke "OK", um diese Skalierung zu bestätigen.\n[scarlet]Zurückkehren und Beenden in[accent] {0}[] Einstellungen...
 uiscale.cancel = Abbrechen & Beenden
@@ -852,12 +1264,9 @@ keybind.title = Tasten zuweisen
 keybinds.mobile = [scarlet]Die meisten Tastenzuweisungen hier funktionieren auf mobilen Geräten nicht. Nur grundlegende Bewegung wird unterstützt.
 category.general.name = Allgemein
 category.view.name = Ansicht
+category.command.name = Einheitenbefehle
 category.multiplayer.name = Mehrspieler
 category.blocks.name = Blockauswahl
-command.attack = Angreifen
-command.rally = Patrouillieren
-command.retreat = Rückzug
-command.idle = Stehen bleiben
 placement.blockselectkeys = \n[lightgray]Taste: [{0},
 keybind.respawn.name = Respawn
 keybind.control.name = Einheit steuern
@@ -865,13 +1274,34 @@ keybind.clear_building.name = Bauplan löschen
 keybind.press = Drücke eine Taste...
 keybind.press.axis = Drücke eine Taste oder bewege eine Achse...
 keybind.screenshot.name = Karten-Screenshot
-keybind.toggle_power_lines.name = Power Lasers umschalten
+keybind.toggle_power_lines.name = Power Laser umschalten
 keybind.toggle_block_status.name = Blockstatus umschalten
 keybind.move_x.name = X-Achse
 keybind.move_y.name = Y-Achse
 keybind.mouse_move.name = Der Maus folgen
 keybind.pan.name = Kamera alleine bewegen
 keybind.boost.name = Boost
+keybind.command_mode.name = Steuerungsmodus
+keybind.command_queue.name = Befehl-Warteschlange
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Befehle abbrechen
+keybind.unit_stance_shoot.name = Stellung: schießen
+keybind.unit_stance_hold_fire.name = Stellung: nicht schießen
+keybind.unit_stance_pursue_target.name = Stellung: Ziel verfolgen
+keybind.unit_stance_patrol.name = Stellung: patroullieren
+keybind.unit_stance_ram.name = Stellung: rammen
+keybind.unit_command_move.name = Befehl: bewegen
+keybind.unit_command_repair.name = Befehl: reparieren
+keybind.unit_command_rebuild.name = Befehl: wiederaufbauen
+keybind.unit_command_assist.name = Befehl: Spieler helfen
+keybind.unit_command_mine.name = Befehl: Ressourcen abbauen
+keybind.unit_command_boost.name = Befehl: Boost
+keybind.unit_command_load_units.name = Befehl: Einheiten aufnehmen
+keybind.unit_command_load_blocks.name = Befehl: Blöcke aufnehmen
+keybind.unit_command_unload_payload.name = Befehl: Last abladen
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Region wiederaufbauen
 keybind.schematic_select.name = Bereich auswählen
 keybind.schematic_menu.name = Entwurfsmenü
 keybind.schematic_flip_x.name = Entwurf umdrehen X
@@ -897,10 +1327,11 @@ keybind.select.name = Auswählen/Schießen
 keybind.diagonal_placement.name = Diagonal platzieren
 keybind.pick.name = Block auswählen
 keybind.break_block.name = Block zerstören
+keybind.select_all_units.name = Alle Einheiten auswählen
+keybind.select_all_unit_factories.name = Alle Einheitenfabriken auswählen
 keybind.deselect.name = Auswahl aufheben
 keybind.pickupCargo.name = Block aufheben
 keybind.dropCargo.name = Block fallen lassen
-keybind.command.name = Einheiten kommandieren
 keybind.shoot.name = Schießen
 keybind.zoom.name = Zoomen
 keybind.menu.name = Menü
@@ -909,6 +1340,7 @@ keybind.pause_building.name = Pausieren/Fortsetzen des Bauens
 keybind.minimap.name = Minimap
 keybind.planet_map.name = Planetenkarte
 keybind.research.name = Forschen
+keybind.block_info.name = Blockinformationen anzeigen
 keybind.chat.name = Chat
 keybind.player_list.name = Spielerliste
 keybind.console.name = Konsole
@@ -932,49 +1364,102 @@ mode.pvp.description = Kämpfe lokal gegen andere Spieler.\n[gray]Benötigt mind
 mode.attack.name = Angriff
 mode.attack.description = Keine Wellen, das Ziel ist es, die gegnerische Basis zu zerstören.\n[gray]Benötigt einen roten Kern auf der Karte.
 mode.custom = Angepasste Regeln
+rules.invaliddata = Ungültige Daten in der Zwischenablage
+rules.hidebannedblocks = Gesperrte Blöcke verstecken
 
 rules.infiniteresources = Unbegrenzte Ressourcen
+rules.onlydepositcore = Nur in den Kern ablegen
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reaktor-Explosionen
+rules.coreincinerates = Kern verbrennt überflüssige Materialien
+rules.disableworldprocessors = Deaktiviere Weltprozessoren
 rules.schematic = Entwürfe erlaubt
 rules.wavetimer = Wellen-Timer
+rules.wavesending = Manuelle Wellen möglich
+rules.allowedit = Regeln bearbeiten erlauben
+rules.allowedit.info = Erlaubt dem Spieler, diese Regeln im Spiel über den Button unten links im Pause-Menü zu bearbeiten.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Wellen
+rules.airUseSpawns = Lufteinheiten spawnen am Spawnpunkt
 rules.attack = Angriff-Modus
-rules.buildai = KI kann bauen
-rules.enemyCheat = Unbegrenzte Ressourcen für die KI (Rotes Team)
+rules.buildai = Bau-KI
+rules.buildaitier = Bau-KI-Tier
+rules.rtsai = RTS KI [red](unfertig)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min. Squadgröße
+rules.rtsmaxsquadsize = Max. Squadgröße
+rules.rtsminattackweight = Min. Angriffsgröße
+rules.cleanupdeadteams = Blöcke von erorberten Teams zerstören (PvP)
+rules.corecapture = Kern nach Zerstörung einnehmen
+rules.polygoncoreprotection = Polygonaler Kernschutz
+rules.placerangecheck = Platzierungsweitenkontrolle
+rules.enemyCheat = Unbegrenzte gegnerische Ressourcen
 rules.blockhealthmultiplier = Block-Lebenspunkte-Multiplikator
 rules.blockdamagemultiplier = Block-Schaden-Multiplikator
-rules.unitbuildspeedmultiplier = Baugeschwindigkeit-Einheit Multiplikator
-rules.unithealthmultiplier = Lebenspunkte-Einheit Multiplikator
-rules.unitdamagemultiplier = Schaden-Einheit Multiplikator
+rules.unitbuildspeedmultiplier = Einheiten-Baugeschwindigkeit Multiplikator
+rules.unitcostmultiplier = Einheit-Baukosten Multiplikator
+rules.unithealthmultiplier = Einheit-Lebenspunkte-Multiplikator
+rules.unitdamagemultiplier = Einheit-Schaden-Multiplikator
+rules.unitcrashdamagemultiplier = Einheiten-Absturzschaden-Multiplikator
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solarstrom-Multiplikator
+rules.unitcapvariable = Kerne zählen zum Einheiten-Limit dazu
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Einheiten-Limit
+rules.limitarea = Kartenbereich begrenzen
 rules.enemycorebuildradius = Bauverbot-Radius durch feindlichen Kern:[lightgray] (Kacheln)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wellen-Abstand:[lightgray] (Sek)
+rules.initialwavespacing = Erster Wellenabstand:[lightgray] (Sek)
 rules.buildcostmultiplier = Bau-Kosten Multiplikator
 rules.buildspeedmultiplier = Bau-Schnelligkeit Multiplikator
 rules.deconstructrefundmultiplier = Abbau Ressourcen-Rückerstattung
 rules.waitForWaveToEnd = Warten bis Welle endet
+rules.wavelimit = Letzte Welle
 rules.dropzoneradius = Drop-Zonen-Radius:[lightgray] (Kacheln)
-rules.unitammo = Einheiten benötigen Munition
+rules.unitammo = Einheiten benötigen Munition [red](wird vielleicht entfernt)
+rules.enemyteam = Gegnerteam
+rules.playerteam = Spielerteam
 rules.title.waves = Wellen
-rules.title.resourcesbuilding = Ressourcen & Gebäude
+rules.title.resourcesbuilding = Ressourcen & Blöcke
 rules.title.enemy = Gegner
 rules.title.unit = Einheiten
 rules.title.experimental = Experimentell
 rules.title.environment = Umgebung
+rules.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Blitze
-rules.enemyLights = Gegnerisches Licht
+rules.fog = Kriegsnebel
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Feuer
+rules.anyenv = <Jede>
 rules.explosions = Explosionsschaden
 rules.ambientlight = Umgebungslicht
 rules.weather = Wetter
 rules.weather.frequency = Häufigkeit:
 rules.weather.always = Immer
 rules.weather.duration = Dauer:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Hindert den Spieler daran, in der Nähe von feindlichen Blöcken zu bauen. Geschütze können nur platziert werden, wenn keine Feindlichen Blöcke in ihrer Reichweite sind.
+rules.onlydepositcore.info = Lässt Einheiten Materialen nur in den Kern ablegen. Nicht in andere Blöcke.
+
 
 content.item.name = Materialien
 content.liquid.name = Flüssigkeiten
 content.unit.name = Einheiten
 content.block.name = Blöcke
+content.status.name = Effekte
 content.sector.name = Sektoren
+content.team.name = Teams
+
+wallore = (Wand)
 
 item.copper.name = Kupfer
 item.lead.name = Blei
@@ -992,10 +1477,24 @@ item.blast-compound.name = Explosive Mischung
 item.pyratite.name = Pyratit
 item.metaglass.name = Metaglas
 item.scrap.name = Schrott
+item.fissile-matter.name = Spaltbare Masse
+item.beryllium.name = Beryllium
+item.tungsten.name = Wolfram
+item.oxide.name = Oxid
+item.carbide.name = Karbid
+item.dormant-cyst.name = Ruhende Zyste
+
 liquid.water.name = Wasser
 liquid.slag.name = Schlacke
 liquid.oil.name = Öl
 liquid.cryofluid.name = Kryoflüssigkeit
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arkyzit
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozon
+liquid.hydrogen.name = Wasserstoff
+liquid.nitrogen.name = Stickstoff
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -1010,7 +1509,7 @@ unit.arkyid.name = Arkyid
 unit.toxopid.name = Toxopid
 unit.flare.name = Flare
 unit.horizon.name = Horizont
-unit.zenith.name = Zenith
+unit.zenith.name = Zenit
 unit.antumbra.name = Antumbra
 unit.eclipse.name = Eclipse
 unit.mono.name = Mono
@@ -1023,6 +1522,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1031,13 +1535,36 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Korvus
 
-block.resupply-point.name = Nachlade-Punkt
+unit.stell.name = Stell
+unit.locus.name = Lokus
+unit.precept.name = Prekus
+unit.vanquish.name = Bezwinger
+unit.conquer.name = Erobi
+unit.merui.name = Merui
+unit.cleroi.name = Kleroi
+unit.anthicus.name = Antikus
+unit.tecta.name = Tekta
+unit.collaris.name = Kollaris
+unit.elude.name = Elud
+unit.avert.name = Avich
+unit.obviate.name = Vermeid
+unit.quell.name = Quell
+unit.disrupt.name = Störg
+unit.evoke.name = Evozi
+unit.incite.name = Inzit
+unit.emanate.name = Emanat
+unit.manifold.name = Transportdrohne
+unit.assembly-drone.name = Fabrikdrohne
+unit.latum.name = Latum
+unit.renale.name = Renale
+
 block.parallax.name = Parallax
 block.cliff.name = Klippe
 block.sand-boulder.name = Sandbrocken
 block.basalt-boulder.name = Basaltbrocken
 block.grass.name = Gras
-block.slag.name = Schlacke
+block.molten-slag.name = Schlacke
+block.pooled-cryofluid.name = Kryoflüssigkeit
 block.space.name = Weltall
 block.salt.name = Salz
 block.salt-wall.name = Salzwand
@@ -1050,7 +1577,7 @@ block.boulder.name = Felsbrocken
 block.snow-boulder.name = Schneebrocken
 block.snow-pine.name = Schnee-Kiefer
 block.shale.name = Schiefer
-block.shale-boulder.name = Schiefergeröll
+block.shale-boulder.name = Schieferbrocken
 block.moss.name = Moos
 block.shrubs.name = Gestrüpp
 block.spore-moss.name = Moossporen
@@ -1065,26 +1592,30 @@ block.graphite-press.name = Graphit-Presse
 block.multi-press.name = Multipresse
 block.constructing = {0}\n[lightgray](Baut)
 block.spawn.name = Gegnerischer Startpunkt
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Kern: Scherbe
 block.core-foundation.name = Kern: Fundament
 block.core-nucleus.name = Kern: Nukleus
-block.deepwater.name = Tiefes Wasser
-block.water.name = Wasser
+block.deep-water.name = Tiefes Wasser
+block.shallow-water.name = Wasser
 block.tainted-water.name = Dreckiges Wasser
+block.deep-tainted-water.name = Tiefes dreckiges Wasser
 block.darksand-tainted-water.name = Dreckiges Wasser (Dunkler Sand)
 block.tar.name = Teer
 block.stone.name = Stein
-block.sand.name = Sand
+block.sand-floor.name = Sand
 block.darksand.name = Dunkler Sand
 block.ice.name = Eis
 block.snow.name = Schnee
-block.craters.name = Krater
+block.crater-stone.name = Krater
 block.sand-water.name = Sandiges Wasser
 block.darksand-water.name = Dunkles sandiges Wasser
 block.char.name = Holzkohle
 block.dacite.name = Dazit
+block.rhyolite.name = Rhyolith
 block.dacite-wall.name = Dazitwand
-block.dacite-boulder.name = Dazitgeröll
+block.dacite-boulder.name = Dazitbrocken
 block.ice-snow.name = Eisschnee
 block.stone-wall.name = Steinwand
 block.ice-wall.name = Eiswand
@@ -1100,6 +1631,7 @@ block.spore-cluster.name = Sporen-Cluster
 block.metal-floor.name = Metallboden 1
 block.metal-floor-2.name = Metallboden 2
 block.metal-floor-3.name = Metallboden 3
+block.metal-floor-4.name = Metallboden 4
 block.metal-floor-5.name = Metallboden 5
 block.metal-floor-damaged.name = beschädigter Metallboden
 block.dark-panel-1.name = Dunkles Panel 1
@@ -1120,15 +1652,15 @@ block.plastanium-wall.name = Plastaniummauer
 block.plastanium-wall-large.name = Große Plastaniummauer
 block.phase-wall.name = Phasenmauer
 block.phase-wall-large.name = Große Phasenmauer
-block.thorium-wall.name = Thorium-Mauer
-block.thorium-wall-large.name = Große Thorium-Mauer
+block.thorium-wall.name = Thoriummauer
+block.thorium-wall-large.name = Große Thoriummauer
 block.door.name = Tor
 block.door-large.name = Großes Tor
 block.duo.name = Doppelgeschütz
-block.scorch.name = Scatter
+block.scorch.name = Flammenwerfer
 block.scatter.name = Luftgeschütz
-block.hail.name = Hail
-block.lancer.name = Lancer
+block.hail.name = Hagel
+block.lancer.name = Lanze
 block.conveyor.name = Förderband
 block.titanium-conveyor.name = Titan-Förderband
 block.plastanium-conveyor.name = Plastanium-Förderband
@@ -1139,6 +1671,9 @@ block.distributor.name = Großer Verteiler
 block.sorter.name = Sortierer
 block.inverted-sorter.name = Invertierter Sortierer
 block.message.name = Nachricht
+block.reinforced-message.name = Verstärkte Nachricht
+block.world-message.name = Weltnachricht
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminierer
 block.overflow-gate.name = Ãœberlauftor
 block.underflow-gate.name = Unterlauftor
@@ -1166,7 +1701,7 @@ block.pneumatic-drill.name = Pneumatischer Bohrer
 block.laser-drill.name = Laser-Bohrer
 block.water-extractor.name = Wasser-Extraktor
 block.cultivator.name = Kultivierer
-block.conduit.name = Leitungsrohr
+block.conduit.name = Kanal
 block.mechanical-pump.name = Mechanische Pumpe
 block.item-source.name = Materialquelle
 block.item-void.name = Materialschlucker
@@ -1190,20 +1725,22 @@ block.solar-panel.name = Solarpanel
 block.solar-panel-large.name = Großes Solarpanel
 block.oil-extractor.name = Öl-Extraktor
 block.repair-point.name = Reparaturpunkt
+block.repair-turret.name = Reparaturstation
 block.pulse-conduit.name = Impulskanal
 block.plated-conduit.name = Gepanzerter Kanal
 block.phase-conduit.name = Phasenkanal
 block.liquid-router.name = Flüssigkeits-Verteiler
 block.liquid-tank.name = Flüssigkeitstank
-block.liquid-junction.name = Flüssigkeits-Kreuzung
+block.liquid-container.name = Flüssigkeitsbehälter
+block.liquid-junction.name = Flüssigkeitskreuzung
 block.bridge-conduit.name = Kanalbrücke
 block.rotary-pump.name = Rotierende Pumpe
 block.thorium-reactor.name = Thorium-Reaktor
 block.mass-driver.name = Massenbeschleuniger
 block.blast-drill.name = Sprengluftbohrer
-block.thermal-pump.name = Thermische Pumpe
+block.impulse-pump.name = Impulspumpe
 block.thermal-generator.name = Thermischer Generator
-block.alloy-smelter.name = Legierungsschmelze
+block.surge-smelter.name = Legierungsschmelze
 block.mender.name = Reparateur
 block.mend-projector.name = Reparaturprojektor
 block.surge-wall.name = Spannungsmauer
@@ -1216,13 +1753,13 @@ block.force-projector.name = Kraftfeld-Projektor
 block.arc.name = Arcus
 block.rtg-generator.name = RTG-Generator
 block.spectre.name = Phantom
-block.meltdown.name = Meltdown
-block.foreshadow.name = Foreshadow
+block.meltdown.name = Kernschmelze
+block.foreshadow.name = Vorschatten
 block.container.name = Behälter
 block.launch-pad.name = Launchpad
-block.launch-pad-large.name = Großes Launchpad
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = Segment
-block.command-center.name = Kommandozentrale
 block.ground-factory.name = Bodenfabrik
 block.air-factory.name = Luftfabrik
 block.naval-factory.name = Wasserfabrik
@@ -1230,16 +1767,183 @@ block.additive-reconstructor.name = Hinzufügender Rekonstrukteur
 block.multiplicative-reconstructor.name = Multiplikativer Rekonstrukteur
 block.exponential-reconstructor.name = Exponentieller Rekonstrukteur
 block.tetrative-reconstructor.name = Tetrativer Rekonstrukteur
-block.payload-conveyor.name = Einheitenförderband
-block.payload-router.name = Einheitenverteiler
+block.payload-conveyor.name = Frachtförderband
+block.payload-router.name = Frachtverteiler
+block.duct.name = Rohrleitung
+block.duct-router.name = Rohrleitungsverteiler
+block.duct-bridge.name = Rohrleitungsbrücke
+block.large-payload-mass-driver.name = Großer Frachtmassenbeschleuniger
+block.payload-void.name = Frachtschlucker
+block.payload-source.name = Frachtquelle
 block.disassembler.name = Großer Trenner
 block.silicon-crucible.name = Silizium Schmelztiegel
 block.overdrive-dome.name = Beschleunigungs-Maschine
-#experimental, may be removed
-block.block-forge.name = Block-Fabrik
-block.block-loader.name = Block-Lader
-block.block-unloader.name = Block-Entlader
 block.interplanetary-accelerator.name = Interplanetarischer Beschleuniger
+block.constructor.name = Konstruktor
+block.constructor.description = Erstellt Blöcke, die höchstens 2x2 groß sind.
+block.large-constructor.name = Großer Konstruktor
+block.large-constructor.description = Erstellt Blöcke, die höchstens 4x4 groß sind.
+block.deconstructor.name = Großer Dekonstruktor
+block.deconstructor.description = Zerstört Einheiten und Blöcke. Gibt 100% der Baumaterialien zurück.
+block.payload-loader.name = Frachtlader
+block.payload-loader.description = Lädt Blöcke und Materialien in Blöcke.
+block.payload-unloader.name = Frachtentlader
+block.payload-unloader.description = Entlädt Blöcke und Materialien aus Blöcken.
+block.heat-source.name = Hitzequelle
+block.heat-source.description = Produziert fast unendlich Hitze.
+
+# erekir
+block.empty.name = Leer
+block.rhyolite-crater.name = Rhyolithkrater
+block.rough-rhyolite.name = Grober Rhyolith
+block.regolith.name = Regolith
+block.yellow-stone.name = Gelbstein
+block.carbon-stone.name = Kohlestein
+block.ferric-stone.name = Eisenstein
+block.ferric-craters.name = Eisenkrater
+block.beryllic-stone.name = Berylliumstein
+block.crystalline-stone.name = Kristalliner Stein
+block.crystal-floor.name = Krystallboden
+block.yellow-stone-plates.name = Gelbsteinplatten
+block.red-stone.name = Rotstein
+block.dense-red-stone.name = Dichter Rotstein
+block.red-ice.name = Roteis
+block.arkycite-floor.name = Arkyzitboden
+block.arkyic-stone.name = Arkyzitstein
+block.rhyolite-vent.name = Rhyolithschlot
+block.carbon-vent.name = Kohleschlot
+block.arkyic-vent.name = Arkyzitschlot
+block.yellow-stone-vent.name = Gelbsteinschlot
+block.red-stone-vent.name = Rotsteinschlot
+block.crystalline-vent.name = Kristalliner Schlot
+block.redmat.name = Rote Erde
+block.bluemat.name = Blaue Erde
+block.core-zone.name = Kernzone
+block.regolith-wall.name = Regolithwand
+block.yellow-stone-wall.name = Gelbstein Wand
+block.rhyolite-wall.name = Rhyolithwand
+block.carbon-wall.name = Kohlenstoffwand
+block.ferric-stone-wall.name = Berylliumwand
+block.beryllic-stone-wall.name = Berylliumsteinwand
+block.arkyic-wall.name = Arkyzitwand
+block.crystalline-stone-wall.name = Kristallsteinwand
+block.red-ice-wall.name = Roteis Wand
+block.red-stone-wall.name = Rotstein Wand
+block.red-diamond-wall.name = Rote Diamandwand
+block.redweed.name = Rotkraut
+block.pur-bush.name = Pur Busch
+block.yellowcoral.name = Gelbe Koralle
+block.carbon-boulder.name = Kohlebrocken
+block.ferric-boulder.name = Eisenbrocken
+block.beryllic-boulder.name = Berylliumbrocken
+block.yellow-stone-boulder.name = Gelbsteinbrocken
+block.arkyic-boulder.name = Arkyzitbrocken
+block.crystal-cluster.name = Krystallklumpen
+block.vibrant-crystal-cluster.name = Leuchtender Krystallklumpen
+block.crystal-blocks.name = Kristallblöcke
+block.crystal-orbs.name = Kristallkugeln
+block.crystalline-boulder.name = Krystallbrocken
+block.red-ice-boulder.name = Roteisbrocken
+block.rhyolite-boulder.name = Rhyolithbrocken
+block.red-stone-boulder.name = Rotsteinbrocken
+block.graphitic-wall.name = Graphithaltige Wand
+block.silicon-arc-furnace.name = Silizium-Lichtbogenofen
+block.electrolyzer.name = Electrolyseur
+block.atmospheric-concentrator.name = Atmosphärischer Konzentrator
+block.oxidation-chamber.name = Oxidationskammer
+block.electric-heater.name = Elektrisches Heizelement
+block.slag-heater.name = Schlacke-Erhitzer
+block.phase-heater.name = Phasenheizer
+block.heat-redirector.name = Hitzeumleiter
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Hitzeverteiler
+block.slag-incinerator.name = Schlackeverbrennungsanlage
+block.carbide-crucible.name = Karbidtiegel
+block.slag-centrifuge.name = Schlacke Zentrifuge
+block.surge-crucible.name = Spannungstiegel
+block.cyanogen-synthesizer.name = Cyanogensynthesegerät
+block.phase-synthesizer.name = Phasensynthesegerät
+block.heat-reactor.name = Hitzereaktor
+block.beryllium-wall.name = Berylliummauer
+block.beryllium-wall-large.name = Große Berylliummauer
+block.tungsten-wall.name = Wolframmauer
+block.tungsten-wall-large.name = Große Wolframmauer
+block.blast-door.name = Panzertür
+block.carbide-wall.name = Karbidmauer
+block.carbide-wall-large.name = Große Karbidmauer
+block.reinforced-surge-wall.name = Verstärkte Spannungsmauer
+block.reinforced-surge-wall-large.name = Große verstärkte Spannungsmauer
+block.shielded-wall.name = Geschirmte Mauer
+block.radar.name = Radar
+block.build-tower.name = Bauturm
+block.regen-projector.name = Regenerationsprojektor
+block.shockwave-tower.name = Schockwellenturm
+block.shield-projector.name = Schildprojektor
+block.large-shield-projector.name = Großer Schildprojektor
+block.armored-duct.name = Gepanzerte Rohrleitung
+block.overflow-duct.name = Ãœberlaufrohrleitung
+block.underflow-duct.name = Unterlaufleitung
+block.duct-unloader.name = Rohrleitungsentlader
+block.surge-conveyor.name = Spannungsförderband
+block.surge-router.name = Spannungsverteilung
+block.unit-cargo-loader.name = Einheitenlader
+block.unit-cargo-unload-point.name = Einheitentladungspunkt
+block.reinforced-pump.name = Verstärkte Pumpe
+block.reinforced-conduit.name = Verstärkter Kanal
+block.reinforced-liquid-junction.name = Verstärkte Flüssigkeitskreuzung
+block.reinforced-bridge-conduit.name = Verstärkte Kanalbrücke
+block.reinforced-liquid-router.name = Verstärkter Flüssigkeitsverteiler
+block.reinforced-liquid-container.name = Verstärkter Flüssigkeitsbehälter
+block.reinforced-liquid-tank.name = Verstärkter Flüssigkeitstank
+block.beam-node.name = Strahlknoten
+block.beam-tower.name = Strahlturm
+block.beam-link.name = Strahlanschluss
+block.turbine-condenser.name = Turbinenkondensator
+block.chemical-combustion-chamber.name = Chemische Verbrennungskammer
+block.pyrolysis-generator.name = Pyrolysegenerator
+block.vent-condenser.name = Schlotkondensator
+block.cliff-crusher.name = Klippenbohrer
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasmabohrer
+block.large-plasma-bore.name = Großer Plasmabohrer
+block.impact-drill.name = Schlagbohrer
+block.eruption-drill.name = Eruptionsbohrer
+block.core-bastion.name = Kern: Bastion
+block.core-citadel.name = Kern: Festung
+block.core-acropolis.name = Kern: Akropolis
+block.reinforced-container.name = Verstärkter Behälter
+block.reinforced-vault.name = Verstärkter Tresor
+block.breach.name = Brecher
+block.sublimate.name = Sublimator
+block.titan.name = Titan
+block.disperse.name = Streu
+block.afflict.name = Afflikt
+block.lustre.name = Lustre
+block.scathe.name = Skate
+block.tank-refabricator.name = Panzerverbesserer
+block.mech-refabricator.name = Mechverbesserer
+block.ship-refabricator.name = Schiffverbesserer
+block.tank-assembler.name = Panzerfabrik
+block.ship-assembler.name = Schifffabrik
+block.mech-assembler.name = Mechfabrik
+block.reinforced-payload-conveyor.name = Verstärktes Frachtförderband
+block.reinforced-payload-router.name = Verstärkter Frachtverteiler
+block.payload-mass-driver.name = Frachtmassenbeschleuniger
+block.small-deconstructor.name = Dekonstruktor
+block.canvas.name = Kanvas
+block.world-processor.name = Weltprozessor
+block.world-cell.name = Weltzelle
+block.tank-fabricator.name = Panzerhersteller
+block.mech-fabricator.name = Mechhersteller
+block.ship-fabricator.name = Schiffhersteller
+block.prime-refabricator.name = Verbesserer
+block.unit-repair-tower.name = Einheiten-Heilungsturm
+block.diffuse.name = Diffusor
+block.basic-assembler-module.name = Verbesserermodul
+block.smite.name = Smite
+block.malign.name = Malin
+block.flux-reactor.name = Flux-Reaktor
+block.neoplasia-reactor.name = Neoplasma-Reaktor
 
 block.switch.name = Schalter
 block.micro-processor.name = Mikroprozessor
@@ -1250,42 +1954,41 @@ block.large-logic-display.name = Großer Logik-Bildschirm
 block.memory-cell.name = Speicherzelle
 block.memory-bank.name = Große Speicherzelle
 
-team.blue.name = Blau
+team.malis.name = Malis
 team.crux.name = Rot
-team.sharded.name = Orange
-team.orange.name = Orange
+team.sharded.name = Gelb
 team.derelict.name = Derelikt
 team.green.name = Grün
-team.purple.name = Lila
+team.blue.name = Blau
 
-hint.skip = Ãœberspringen
+hint.skip = Fertig
 hint.desktopMove = Drücke [accent][[WASD][], um dich zu bewegen.
 hint.zoom = [accent]Scrolle[], um rein oder raus zu zoomen.
-hint.mine = Bewege dich zum \uf8c4 Kupfererz und [accent]tippe darauf[], um es manuell abzubauen.
 hint.desktopShoot = Benutze [accent][[Linksklick][], um zu schießen.
-hint.depositItems = Um Materialien in den Kern zu tun, ziehe sie von dir zum Kern.
+hint.depositItems = Um Materialien in den Kern zu verschieben, ziehe sie von dir zum Kern.
 hint.respawn = Um im Kern zu respawnen, drücke [accent][[V][].
-hint.respawn.mobile = Du steuerst nun eine Einheit oder einen Block. Um wieder zur normalen Einheit zu werden, [accent]drücke die Abbildung von dir oben links.[]
+hint.respawn.mobile = Du steuerst nun eine Einheit oder einen Block. Um wieder zur normalen Einheit zu werden, [accent]drücke die Abbildung von dir oben links[].
 hint.desktopPause = Benutze [accent][[Leertaste][], um das Spiel zu pausieren oder entpausieren.
-hint.placeDrill = Wähle die \ue85e [accent]Bohrer[]-Kategorie im Menü unten rechts aus, drücke dann auf den \uf870 [accent]Bohrer[] und klicke auf ein Feld mit Kupfererz, um ihn zu platzieren.
-hint.placeDrill.mobile = Wähle die \ue85e[accent]Bohrer[]-Kategorie im Menü unten rechts aus, drücke dann auf den \uf870 [accent]Bohrer[] und klicke auf ein Feld mit Kupfererz, um ihn zu platzieren.\n\nGehe zuletzt auf das \ue800 [accent]Häkchen[] unten rechts, um dies zu bestätigen.
-hint.placeConveyor = Förderbänder bewegen Materialien zwischen verschiedenen Blöcken. Wähle ein \uf896 [accent]Förderband[] aus der \ue814 [accent]Verteilung[]-Kategorie aus.\n\nKlicke und bewege deine Maus, um mehrere Förderbänder zu setzen.\n[accent]Scrolle[] um sie zu drehen.
-hint.placeConveyor.mobile = Förderbänder bewegen Materialien zwischen verschiedenen Blöcken. Wähle ein \uf896 [accent]Förderband[] aus der \ue814 [accent]Verteilung[]-Kategorie aus.\n\nHalte deinen Finger eine Sekunde auf dem Bildschirm und bewege ihn dann, um mehrere Förderbänder zu setzen.
-hint.placeTurret = Platziere \uf861 [accent]Geschütze[], um deine Basis vor Gegnern zu beschützen.\n\nGeschütze benötigen Munition - in diesem Fall \uf838Kupfer.\nBenutze Bohrer und Förderbänder, um dies zu besorgen.
+
 hint.breaking = Benutze [accent]Rechtsklick[] und bewege deine Maus, um zu zerstören.
 hint.breaking.mobile = Aktiviere den \ue817 [accent]Hammer[] unten rechts und tippe, um Blöcke zu zerstören.\n\nHalte deinen Finger auf dem Bildschirm, um eine Fläche auszuwählen.
-hint.research = Nehme den \ue875 [accent]Forschen[]-Knopf um neue Technologien zu erforschen.
-hint.research.mobile = Nehme den \ue875 [accent]Forschen[]-Knopf im \ue88c [accent]Menü[], um neue Technologien zu erforschen.
+hint.blockInfo = Genauere Blockinformationen können im [accent]Baumenü[] rechts beim [accent][[?][]-Symbol gefunden werden.
+hint.derelict = [accent]Derelikte[] Blöcke sind kaputte Teile alter Basen, die nicht mehr funktionieren.\n\nSie können für Ressourcen [accent]abgebaut[] werden.
+hint.research = Klicke auf den \ue875 [accent]Forschen[]-Knopf um neue Technologien zu erforschen.
+hint.research.mobile = Klicke auf den \ue875 [accent]Forschen[]-Knopf im \ue88c [accent]Menü[], um neue Technologien zu erforschen.
 hint.unitControl = Halte [accent][[L-STRG][] und [accent]klicke[], um alliierte Einheiten oder Geschütze zu steuern.
 hint.unitControl.mobile = [accent][[Doppelklicke][], um alliierte Einheiten oder Geschütze zu steuern.
+hint.unitSelectControl = Du kannst [accent]L-Shift[] gedrückt halten, um den Steuerungsmodus zu aktivieren.\nIm Steuerungsmodus hältst du [accent]Linksklick[] gedrückt, um Einheiten auswählen zu können. Mit [accent]Rechtsklick[] bestimmst du, wo die ausgewählten Einheiten hingehen sollen.
+hint.unitSelectControl.mobile = Um Einheiten zu steuern, kannst du den [accent]Steuerungsmodus[] mit dem Knopf unten links aktivieren.\nIm Steuerungsmodus kannst du Einheiten auswählen, indem du lang drückst und den Finger über den Bildschirm ziehst. Dann kannst du einen Ort oder ein Ziel auswählen, wo die Einheiten hingehen sollen.
 hint.launch = Sobald du genug Ressourcen gesammelt hast, kannst du [accent]Starten[], indem du andere Sektoren auf der \ue827 [accent]Karte[] unten rechts auswählst.
 hint.launch.mobile = Sobald du genug Ressourcen gesammelt hast, kannst du [accent]Starten[], indem du andere Sektoren auf der \ue827 [accent]Karte[] im \ue88c [accent]Menü[] auswählst.
 hint.schematicSelect = Halte [accent][[F][] gedrückt und bewege deine Maus, um Blöcke zu kopieren.\n\nMit [accent][[Mittelklick][] kannst du einen einzelnen Block kopieren.
+hint.rebuildSelect = Halte [accent][[B][] gedrückt und bewege deine Maus, um Überreste zerstörter Blöcke auszuwählen.\nDiese werden dann automatisch wiederaufgebaut.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+
 hint.conveyorPathfind = Halte [accent][[L-STRG][] während du Förderbänder baust, um automatisch einen Weg zu finden.
 hint.conveyorPathfind.mobile = Aktiviere den \ue844 [accent]Diagonal-Modus[] unten rechts und platziere Förderbänder, um automatisch einen Weg zu generieren.
 hint.boost = Halte [accent][[L-Shift][] gedrückt, um über Hindernisse zu boosten.\n\nNur manche Bodeneinheiten können das.
-hint.command = Drücke [accent][[G][], um [accent]ähnliche[] Einheiten in Formation zu steuern.\n\nUm Bodeneinheiten zu steuern, musst du zuerst eine Bodeneinheit werden.
-hint.command.mobile = [accent][[Doppelklicke][] deine Einheit, um [accent]ähnliche[] Einheiten in Formation zu steuern.
 hint.payloadPickup = Du kannst [accent][[[] drücken, um kleine Einheiten oder Blöcke hochzuheben.
 hint.payloadPickup.mobile = [accent]Halte deinen Finger[] auf eine kleine Einheit oder einen kleinen Block, um ihn aufzuheben.
 hint.payloadDrop = Drücke [accent]][], um etwas fallen zu lassen.
@@ -1293,49 +1996,123 @@ hint.payloadDrop.mobile = [accent]Halte deinen Finger[] auf einen freien Ort, um
 hint.waveFire = [accent]Wellen[]-Geschütze mit Wassermunition löschen automatisch Feuer.
 hint.generator = \uf879 [accent]Verbrennungsgeneratoren[] verbrennen Kohle und übertragen diesen Strom in angrenzende Blöcke.\n\nDie Reichweite der Stromübertragung kann mit \uf87f [accent]Stromknoten[] erweitert werden.
 hint.guardian = [accent]Boss[]-Einheiten sind gepanzert. Schwache Munition wie [accent]Kupfer[] und [accent]Blei[] sind [scarlet]nicht effektiv[].\n\nBenutze bessere Geschütze oder \uf835 [accent]Graphit[] als \uf861Duo-/\uf859Salvenmunition um einen Boss zu besiegen.
-hint.coreUpgrade = Kerne können aufgerüstet werden, indem man [accent]bessere Kerne über sie platziert[].\n\nPlatziere einen  [accent]Fundament[]-Kern über einen  [accent]Scherben[]-Kern. Stelle sicher, dass ausreichend Platz verfügbar ist.
+hint.coreUpgrade = Kerne können aufgerüstet werden, indem man [accent]bessere Kerne über sie platziert[].\n\nPlatziere einen \uf868 [accent]Fundament[]-Kern über einen \uf869 [accent]Scherben[]-Kern. Stelle sicher, dass ausreichend Platz verfügbar ist.
 hint.presetLaunch = Zu grauen [accent]Sektoren[] wie dem [accent]Frozen Forest[] kann man von überall aus hin starten. Es ist nicht nötig, benachbarte Sektoren zu erobern.\n\n[accent]Nummerierte Sektoren[] wie dieser hier sind [accent]optional[].
+hint.presetDifficulty = Dieser Sektor hat eine [scarlet]hohe Gefahrenstufe[].\nOhne richtige Technologie und Vorbereitung ist es [accent]nicht empfohlen[], zu diesem Sektor zu starten.
 hint.coreIncinerate = Wenn dem Kern Materialien zugeführt werden, für die er keinen Platz mehr hat, werden diese [accent]verbrannt[].
-hint.coopCampaign = Wenn du die [accent]Mehrspielerkampagne[] spielst, werden produzierte Items [accent]zu deinen lokalen Sektoren[] geschickt.\n\nNeuen Erforschungen vom Host werden auch übertragen.
+hint.factoryControl = Um den [accent]Zielort einer Fabrik[] zu bestimmen, kannst du im Steuerungsmodus die Fabrik auswählen und einen Ort mit Rechtsklick markieren.\nEinheiten, die in der Fabrik hergestellt werden, bewegen sich dann automatisch dahin.
+hint.factoryControl.mobile = Um den [accent]Zielort einer Fabrik[] zu bestimmen, kannst du im Steuerungsmodus zuerst die Fabrik und dann einen Ort auswählen.\nEinheiten, die in der Fabrik hergestellt werden, bewegen sich dann automatisch dahin.
 
-item.copper.description = Wird als Baumaterial oder Munition verwendet.
+gz.mine = Bewege dich in die Nähe von dem \uf8c4 [accent]Kupfererz[]\n und klicke drauf, um es abzubauen.
+gz.mine.mobile = Bewege dich in die Nähe von dem \uf8c4 [accent]Kupfererz[] und tippe drauf, um es abzubauen.
+gz.research = Öffne das \ue875 Forschungsmenü.\nErforsche den \uf870 [accent]Mechanischen Bohrer[]\n und wähle ihn im Menü unten rechts aus.\nKlicke auf Kupfererz, um ihn zu platzieren.
+gz.research.mobile = Öffne das \ue875 Forschungsmenü.\nErforsche den \uf870 [accent]Mechanischen Bohrer[] und wähle ihn im Menü unten rechts aus.\nTippe auf Kupfererz, um ihn zu platzieren.\n\nWähle zuletzt das Häkchen unten rechts zur Bestätigung.
+gz.conveyors = Erforsche und platziere \uf896 [accent]Förderbänder[], um abgebaute Ressourcen zum Kern zu transportieren.\n\nZiehe die Maus über den Bildschirm, um mehrere Förderbänder zu platzieren.\n[accent]Scrolle[], um die Richtung zu ändern.
+gz.conveyors.mobile = Erforsche und platziere \uf896 [accent]Förderbänder[], um abgebaute Ressourcen zum Kern zu transportieren.\n\nDrücke kurz und ziehe deinen Finger über den Bildschirm, um mehrere Förderbänder zu platzieren.
+gz.drills = Erweitere den Bergbau.\nBaue mehr mechanische Bohrer.\nBaue 100 Kupfer ab.
+gz.lead = \uf837 [accent]Blei[] ist ein anderer wichtiger Rohstoff.\nBaue Bohrer, um Blei abzubauen.
+gz.moveup = \ue804 Bewege dich weiter nach oben, um weitere Ziele zu erhalten.
+gz.turrets = Erforsche und platziere 2 \uf861 [accent]Doppelgeschütze[], um den Kern zu beschützen.\nDoppelgeschütze benötigen \uf838 [accent]Munition[] von Förderbändern.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Mauern[] können andere Blöcke vor Schaden schützen.\nBaue \uf8ae [accent]Kufpermauern[] um die Geschütze.
+gz.defend = Feinde kommen bald, bereite dich vor.
+gz.aa = Fliegende Einheiten können nicht leicht von normalen Geschützen bekämpft werden.\n\uf860 [accent]Luftgeschütze[] können dies deutlich besser, benötigen aber \uf837 [accent]Blei[] als Munition.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = Dies ist die feindliche Drop-Zone.
+gz.zone2 = Alle Blöcke in der Zone werden zerstört, wenn eine Welle kommt.
+gz.zone3 = Jetzt kommt eine Welle.\nBereite dich vor.
+gz.finish = Baue mehr Geschütze, sammele mehr Ressourcen\nund besiege alle Wellen, um den [accent]Sektor zu erobern[].
+
+onset.mine = Klicke, um \uf748 [accent]Beryllium[] aus Wänden abzubauen.\n\nBenutze [accent][WASD], um dich zu bewegen.
+onset.mine.mobile = Tippe, um \uf748 [accent]Beryllium[] aus Wänden abzubauen.
+onset.research = Öffne das \ue875 Forschungsmenü.\nErforsche und platziere einen  \uf73e [accent]Turbinenkondensator[] auf einen Schlot.\nDieser erzeugt [accent]Strom[].
+onset.bore = Erforsche und platziere einen \uf741 [accent]Plasmabohrer[].\nDieser baut Rohstoffe aus Wänden automatisch ab.
+onset.power = Um den Plasmabohrer mit [accent]Strom[] zu versorgen, kannst du \uf73d [accent]Strahlknoten[] erforschen und bauen.\nVerbinde den Turbinenkondensator mit dem Plasmabohrer.
+onset.ducts = Erforsche und platziere \uf799 [accent]Rohrleitungen[], um die abgebauten Ressourcen zum Kern zu transportieren.\nZiehe die Maus über den Bildschirm, um mehrere Rohrleitungen zu platzieren.\n[accent]Scrolle[], um die Richtung zu ändern.
+onset.ducts.mobile = Erforsche und platziere \uf799 [accent]Rohrleitungen[], um die abgebauten Ressourcen zum Kern zu transportieren.\n\nDrücke kurz und ziehe deinen Finger über den Bildschirm, um mehrere Rohrleitungen zu platzieren.
+onset.moremine = Erweitere den Bergbau.\nPlatziere mehr Plasmabohrer und verbinde sie mit Rohrleitungen und Strahlknoten.\nBaue 200 Beryllium ab.
+onset.graphite = Komplexere Blöcke benötigen \uf835 [accent]Graphit[].\nStelle Plasmabohrer auf, um Graphit abzubauen.
+onset.research2 = Fange an, [accent]Fabriken[] zu erforschen.\nEroforsche den \uf74d [accent]Klippenbohrer[] und den \uf779 [accent]Silizium-Lichtbogenofen[].
+onset.arcfurnace = Der Lichtbogenofen verschmilzt \uf834 [accent]Sand[] und \uf835 [accent]Graphit[], um \uf82f [accent]Silizium[] herzustellen.\n[accent]Strom[] wird auch benötigt.
+onset.crusher = Benutze \uf74d [accent]Klippenbohrer[], um Sand abzubauen.
+onset.fabricator = Mit [accent]Einheiten[] kannst du die Karte erkunden, Gebäude beschützen und Feinde angreifen. Erforsche und platziere einen \uf6a2 [accent]Panzerhersteller[].
+onset.makeunit = Stelle eine Einheit her.\nDrücke den "?"-Knopf, um zu sehen, was gebraucht wird.
+onset.turrets = Einheiten sind effektiv, aber [accent]Geschütze[] sind beim Verteidigen stärker, wenn sie gut eingesetzt werden.\n Baue ein [accent]Brecher[]-Geschütz.\nGeschütze benötigen \uf748 [accent]Munition[].
+onset.turretammo = Versorge das Geschütz mit [accent]Berylliummunition[].
+onset.walls = [accent]Mauern[] können andere Blöcke vor Schaden schützen.\nBaue \uf6ee [accent]Berylliummauern[] um die Geschütze.
+onset.enemies = Feinde kommen bald, bereite dich vor.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = Der Feid ist verwundbar. Greife ihn an.
+onset.cores = Neue Kerne können auf [accent]Kernzonen[] platziert werden.\nNeue Kerne funktionieren als Außenposten und haben alle Zugriff auf dasselbe Kerninventar.\nBaue einen \uf725 Kern.
+onset.detect = Der Feind wird dich in zwei Minuten entdecken.\nStelle Verteidigung, Bergbau und Produktion auf.
+
+#Don't translate these yet!
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+
+split.pickup = Manche Blöcke können von der Kerneinheit aufgehoben werden.\nHebe diesen [accent]Behälter[] hoch und trage ihn auf den [accent]Frachtlader[].\n(Default-Tasten für Aufhaben und Fallenlassen sind [ und ] )
+split.pickup.mobile = Manche Blöcke können von der Kerneinheit aufgehoben werden.\nHebe diesen [accent]Behälter[] hoch und trage ihn auf den [accent]Frachtlader[].\n(Um etwas aufzuheben oder fallenzulassen, tippe lange drauf.)
+split.acquire = Du must etwas Wolfram sammeln, um Einheiten zu bauen.
+split.build = Einheiten müssen auf die andere Mauerseite transportiert werden.\nSetze zwei [accent]Frachtmassenbeschleuniger[], einen auf jede Seite.\nVerbinde sie, indem du den einen, und dann den anderen, auswählst.
+split.container = Ähnlich wie beim Behälter, können Einheiten auch mit einem [accent]Frachtmassenbeschleuniger[] bewegt werden.\nBaue einen Einheitenhersteller neben einem Frachtmassenbeschleuniger um diesen zu laden\nund schicke die Einheiten dann über die Wand, um die gegnerische Basis anzugreifen.
+
+item.copper.description = Wird als Baumaterial und Munition verwendet.
 item.copper.details = Kupfer. Auf Serpulo reichlich vorhanden. Strukturell schwach, solange es nicht verstärkt wird.
-item.lead.description = Wird in elektrischen Blöcken oder beim Flüssigkeitstransport verwendet.
+item.lead.description = Wird in elektrischen Blöcken und beim Flüssigkeitstransport verwendet.
 item.lead.details = Dicht. Träge. Wird sehr oft in Batterien verwendet.\nInfo: Wahrscheinlich giftig für biologische Lebewesen, obwohl es sowieso nicht mehr viele von denen gibt.
 item.metaglass.description = Wird beim Flüssigkeitstransport und -lagerung verwendet.
-item.graphite.description = Wird als Munition oder elektrischer Leiter eingesetzt.
+item.graphite.description = Wird als Munition und elektrischer Leiter eingesetzt.
 item.sand.description = Nützlich für die Herstellung vieler anderer Materialien.
 item.coal.description = Kann als Brennstoff oder zur Herstellung anderer Materialien verwendet werden.
 item.coal.details = Scheint versteinerte Pflanzenmasse zu sein, die sich schon lange vor dem Seeding gebildet hat.
-item.titanium.description = Wird im Flüssigkeitsbereich, im Bohrerbereich und für Flugzeuge vielfältig eingesetzt.
+item.titanium.description = Wird für Flüssigkeiten, Bohrer und Fabriken vielfältig eingesetzt.
 item.thorium.description = Wird als festes Baumaterial oder radioaktiver Kraftstoff verwendet.
 item.scrap.description = Wird in Pulverisierer und Schmelzer zu anderen Materialien bearbeitet.
-item.scrap.details = Übriggebliebene Reste alter Gebäude oder Einheiten.
+item.scrap.details = Übriggebliebene Reste alter Blöcke und Einheiten.
 item.silicon.description = Wird in Solarzellen, komplizierter Elektronik und als zielsuchende Munition verwendet.
 item.plastanium.description = Wird für fortgeschrittene Einheiten, Isolation und Munition eingesetzt.
 item.phase-fabric.description = Kann in Elektronik und selbstreparierende Blöcke verwendet werden.
 item.surge-alloy.description = Wird in sehr fortgeschrittenen Waffen und Abwehrsystemen benutzt.
 item.spore-pod.description = Wird zur Umwandlung in Öl, Sprengstoff und Kraftstoff verwendet.
 item.spore-pod.details = Sporen. Wahrscheinlich ein künstlich erschaffenes Lebewesen. Geben giftige Gase für andere Lebewesen ab. Sehr invasiv. Unter bestimmten Bedingungen sehr brennbar.
-item.blast-compound.description = Wird in Bomben oder als explosive Munition verwendet.
+item.blast-compound.description = Wird in Bomben und als explosive Munition verwendet.
 item.pyratite.description = Kann in Verbrennungsgeneratoren oder als brennende Munition verbrannt werden.
 
+#Erekir
+item.beryllium.description = Wird für verschiedene Strukturen und Munitionstypen auf Erekir verwendet.
+item.tungsten.description = Wird für Bohrer, Panzerung und Munition benutzt. Benötigt für die Herstellung komplexer Blöcke.
+item.oxide.description = Wird als Hitzeleiter und Stromisolator verwendet.
+item.carbide.description = Benötigt für komplexe Strukturen, Einheiten und Munition.
+
 liquid.water.description = Wird üblicherweise zum Kühlen von Maschinen und zur Müllverarbeitung verwendet.
 liquid.slag.description = Kann in Trennern verfeinert oder als Waffe gegen Gegner verwendet werden.
 liquid.oil.description = Wird in fortgeschrittener Materialgewinnung und als brennende Munition verwendet.
 liquid.cryofluid.description = Wird als Kühlung in Geschützen, Fabriken oder Reaktoren verwendet.
 
-block.resupply-point.description = Füllt Einheiten in der Nähe mit Kupfermunition wieder auf. Nicht mit Einheiten kompatibel, die Strom benötigen.
+#Erekir
+liquid.arkycite.description = Wird in chemischen Reaktionen für Stromgeneration und Synthese benutzt.
+liquid.ozone.description = Wird als Oxidationsmittel in der Materialherstellung und als Brennstoff verwendet. Etwas explosiv.
+liquid.hydrogen.description = Wird in der Ressourcengewinnung, Einheitenherstellung und zur Heilung von Blöcken verwendet. Entflammbar.
+liquid.cyanogen.description = Wird in erweiterten Einheiten, in komplexeren Reaktionen und als Munition benutzt. Leicht entflammbar.
+liquid.nitrogen.description = Wird in der Ressourcengewinnung, Gas- und Einheitenherstellung benutzt. Inert.
+liquid.neoplasm.description = Ein gefährliches, biologisches Nebenprodukt des Neoplasma-Reaktors. Breitet sich schnell in alle angrenzenden wasserhaltende Blöcke aus und beschädigt diese dabei. Viskos.
+liquid.neoplasm.details = Neoplasma. Eine unkontrollierbare Masse aus synthetischen, sich schnell teilenden Zellen mit einer schlammähnlichen Konsistenz. Hitzebeständig. Äußerst gefährlich für alle Blöcke, die mit Wasser umgehen.\n\nZu komplex und instabil, um analysiert werden zu können. Mögliche Anwendungen unbekannt. Verbrennung in Schlackebecken empfohlen.
+
+block.derelict = \uf77e [lightgray]Derelikt
 block.armored-conveyor.description = Bewegt Materialien voran. Materialien können von der Seite nicht auf das Förderband.
 block.illuminator.description = Eine Lichtquelle.
-block.message.description = Speichert eine Nachricht, die genutzt wird, um mit Verbündeten zu kommunizieren.
+block.message.description = Speichert eine Nachricht, um mit Verbündeten zu kommunizieren.
+block.reinforced-message.description = Speichert eine Nachricht, um mit Verbündeten zu kommunizieren.
+block.world-message.description = Ein Nachrichtenblock für Kartenautoren. Kann nicht zerstört werden.
 block.graphite-press.description = Komprimiert Kohle zu Graphit.
 block.multi-press.description = Komprimiert Kohle zu Graphit. Braucht für die Kühlung Wasser.
 block.silicon-smelter.description = Stellt aus Sand und Kohle Silizium her.
 block.kiln.description = Schmelzt Sand und Blei zu Metaglas.
 block.plastanium-compressor.description = Produziert Plastanium aus Öl und Titan.
 block.phase-weaver.description = Produziert Phasengewebe aus Thorium und Sand.
-block.alloy-smelter.description = Verschmilzt Titan, Blei, Silizium und Kupfer zu einer Stromstoßlegierung.
+block.surge-smelter.description = Verschmilzt Titan, Blei, Silizium und Kupfer zu einer Stromstoßlegierung.
 block.cryofluid-mixer.description = Verarbeitet Wasser mit Titan zu einer Kryoflüssigkeit, die viel effizienter kühlt.
 block.blast-mixer.description = Stellt aus Sporen und Pyratit eine explosive Mischung her.
 block.pyratite-mixer.description = Vermischt Kohle, Blei und Sand zu hochentzündlichem Pyratit.
@@ -1351,6 +2128,8 @@ block.item-source.description = Produziert unendlich viele Gegenstände. Nur im
 block.item-void.description = Zerstört Materialien, die hereingegeben werden, ohne Strom zu verbrauchen. Nur im Sandkasten-Modus verfügbar.
 block.liquid-source.description = Produziert unendlich Flüssigkeiten. Nur im Sandkasten-Modus verfügbar.
 block.liquid-void.description = Entfernt jegliche Flüssigkeiten. Nur im Sandkasten-Modus verfügbar.
+block.payload-source.description = Produziert unendlich Fracht. Nur im Sandkasten-Modus verfügbar.
+block.payload-void.description = Entfernt jegliche Fracht. Nur im Sandkasten-Modus verfügbar.
 block.copper-wall.description = Beschützt Blöcke vor Gegnern.
 block.copper-wall-large.description = Beschützt Blöcke vor Gegnern.
 block.titanium-wall.description = Beschützt Blöcke vor Gegnern.
@@ -1363,8 +2142,12 @@ block.phase-wall.description = Beschützt Blöcke vor Gegnern, indem sie die mei
 block.phase-wall-large.description = Beschützt Blöcke vor Gegnern, indem sie die meisten Schüsse reflektiert.
 block.surge-wall.description = Beschützt Blöcke vor Gegnern und greift Gegner mit Lichtbögen an.
 block.surge-wall-large.description = Beschützt Blöcke vor Gegnern und greift Gegner mit Lichtbögen an.
-block.door.description = Eine Wand, die geöffnet und geschlossen werden kann.
-block.door-large.description = Eine Wand, die geöffnet und geschlossen werden kann.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Ein Tor, das geöffnet und geschlossen werden kann.
+block.door-large.description = Ein großes Tor, das geöffnet und geschlossen werden kann.
 block.mender.description = Repariert regelmäßig Blöcke in seiner Umgebung.\nVerwendet optional Silizium, um Reichweite und Effizienz zu steigern.
 block.mend-projector.description = Repariert regelmäßig Blöcke in seiner Umgebung.\nVerwendet optional Phasengewebe, um Reichweite und Effizienz zu steigern.
 block.overdrive-projector.description = Erhöht die Geschwindigkeit von nahegelegenen Blöcken. \nVerwendet optional Phasengewebe, um Reichweite und Effizienz zu steigern.
@@ -1381,16 +2164,17 @@ block.inverted-sorter.description = Wie ein normaler Sortierer, aber gibt das au
 block.router.description = Verteilt Materialien auf bis zu drei Richtungen.
 block.router.details = Ein nötiges Übel. Es ist nicht empfehlenswert, ihn neben Fabriken zu setzen, da er sich dort verstopfen kann.
 block.distributor.description = Verteilt Materialien auf bis zu sieben Richtungen.
-block.overflow-gate.description = Gibt Materialien nur zu den Seiten heraus, wenn der fordere Ausgang blockiert ist. Kann nicht neben anderen Ãœberlauf- oder Unterlauftoren verwendet werden.
-block.underflow-gate.description = Das Gegenteil eines Ãœberlauftors. Gibt Materialien nur nach vorne heraus, wenn die Seiten blockiert sind. Kann nicht neben anderen Ãœberlauf- oder Unterlauftoren verwendet werden.
+block.overflow-gate.description = Gibt Materialien nur zu den Seiten heraus, wenn der vordere Ausgang blockiert ist.
+block.underflow-gate.description = Das Gegenteil eines Ãœberlauftors. Gibt Materialien nur nach vorne heraus, wenn die Seiten blockiert sind.
 block.mass-driver.description = Ein Transportblock mit sehr hoher Reichweite. Sammelt mehrere Materialien und schießt sie zu einem verbundenen Massenbeschleuniger.
 block.mechanical-pump.description = Eine Pumpe, die keinen Strom benötigt.
 block.rotary-pump.description = Eine Pumpe, die Strom verbraucht.
-block.thermal-pump.description = Eine Pumpe.
+block.impulse-pump.description = Eine Pumpe.
 block.conduit.description = Transportiert Flüssigkeiten. Wird mit Extraktoren, Pumpen oder anderen Kanälen benutzt.
 block.pulse-conduit.description = Transportiert Flüssigkeiten. Transportiert Flüssigkeiten schneller und speichert mehr als ein Leitungsrohr.
 block.plated-conduit.description = Transportiert Flüssigkeiten. Nimmt keine Flüssigkeiten von der Seite an.\nHat keine Lecks.
-block.liquid-router.description = Verteilt Flüssigkeiten auf bis zu drei Richtungen. Speicher außerdem eine kleine Menge an Flüssigkeit.
+block.liquid-router.description = Verteilt Flüssigkeiten auf bis zu drei Richtungen. Speichert außerdem eine kleine Menge an Flüssigkeit.
+block.liquid-container.description = Speichert etwas Flüssigkeit. Hat Ausgänge an allen Seiten, ähnlich einem Flüssigkeitsverteiler.
 block.liquid-tank.description = Speichert eine große Menge an Flüssigkeiten. Ähnlich wie ein Flüssigkeitsverteiler.
 block.liquid-junction.description = Fungiert als Brücke über zwei kreuzende Kanäle.
 block.bridge-conduit.description = Transportiert Flüssigkeiten über Terrain oder über Blöcke.
@@ -1416,7 +2200,7 @@ block.laser-drill.description = Erlaubt es, durch Lasertechnologie noch schnelle
 block.blast-drill.description = Der ultimative Bohrer. Benötigt große Mengen an Strom.
 block.water-extractor.description = Extrahiert Wasser aus dem Boden. Verwende ihn, wenn es keinen See in der Nähe gibt.
 block.cultivator.description = Kultiviert winzige Mengen atmosphärischer Mikrosporen in Sporen-Pods.
-block.cultivator.details = Zurückgewonnene Technologie. Wird benutzt, um große Mengen Biomasse so effizient wie möglich herzustellen. Wahrscheinlich der ehemaliger Inkubator der Sporen, die Serpulo heute bedecken.
+block.cultivator.details = Zurückgewonnene Technologie. Wird benutzt, um große Mengen Biomasse so effizient wie möglich herzustellen. Wahrscheinlich der ehemalige Inkubator der Sporen, die Serpulo heute bedecken.
 block.oil-extractor.description = Verwendet große Mengen an Strom, Sand und Wasser, um Öl zu extrahieren.
 block.core-shard.description = Kern der Basis. Einmal zerstört, ist jeglicher Kontakt zum Sektor verloren.
 block.core-shard.details = Die erste Version. Kompakt. Selbstduplizierend. Mit Einmalraketen ausgestattet. Nicht für Interplanetarische Reisen geeignet.
@@ -1428,6 +2212,9 @@ block.vault.description = Speichert eine große Menge an Materialien pro Typ. Ei
 block.container.description = Speichert eine kleine Menge an Materialien pro Typ. Ein[lightgray] Entlader[] kann verwendet werden, um Materialien auszuladen.
 block.unloader.description = Entlädt Materialien aus einem Block.
 block.launch-pad.description = Startet Materialien in andere Sektoren.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Schießt auf Gegner.
 block.scatter.description = Ein mittelgroßer Anti-Luft-Turm. Sprüht Blei- oder Schrottklumpen auf feindliche Lufteinheiten.
 block.scorch.description = Verbrennt alle Bodenfeinde in der Nähe. Hochwirksam im Nahbereich.
@@ -1442,7 +2229,7 @@ block.ripple.description = Schießt mehrere Schüsse gleichzeitig auf weit entfe
 block.cyclone.description = Schießt explodierende Geschosse auf Gegner.
 block.spectre.description = Schießt große, panzerbrechende Kugeln auf Luft- und Bodenziele.
 block.meltdown.description = Lädt sich auf und schießt einen starken, durchgängigen Laser auf Gegner. Braucht Kühlung.
-block.foreshadow.description = Schießt einen einzigen Schuss mit einem einzigen Ziel über eine erstaunlich große Distanz.
+block.foreshadow.description = Schießt einen starken Schuss auf ein einziges Ziel über hohe Distanzen. Zielt auf Gegner mit den meisten Lebenspunkten.
 block.repair-point.description = Heilt durchgehend die nächste befreundete, beschädigte Einheit in der Umgebung.
 block.segment.description = Beschädigt und zerstört gegnerische Projektile. Laser werden nicht anvisiert.
 block.parallax.description = Benutzt einen Traktorstrahl, um Gegner heranzuziehen und sie dabei anzugreifen.
@@ -1450,9 +2237,8 @@ block.tsunami.description = Schießt mit einem kräftigen Strahl aus Flüssigkei
 block.silicon-crucible.description = Benutzt Pyratit als Hitzequelle, um aus Sand und Kohle Silizium herzustellen. Die Effizienz wird an heißen Orten erhöht.
 block.disassembler.description = Trennt Schlacke in winzige Mengen exotischer Mineralien, verliert dafür aber an Effizienz. Kann Thorium herstellen.
 block.overdrive-dome.description = Erhöht die Geschwindigkeit von nahegelegenen Blöcken. \nBenötigt Phasengewebe und Silizium.
-block.payload-conveyor.description = Bewegt größere Objekte, zum Beispiel Einheiten.
-block.payload-router.description = Verteilt Einheiten auf bis zu drei Richtungen.
-block.command-center.description = Steuert Einheiten mit verschiedenen Befehlen.
+block.payload-conveyor.description = Bewegt Frachtmassen.
+block.payload-router.description = Verteilt Fracht auf bis zu drei Richtungen.
 block.ground-factory.description = Stellt Bodeneinheiten her. Einheiten können einfach so verwendet oder in einem Rekonstrukteur verbessert werden.
 block.air-factory.description = Stellt Lufteinheiten her. Einheiten können einfach so verwendet oder in einem Rekonstrukteur verbessert werden.
 block.naval-factory.description = Stellt Wassereinheiten her. Einheiten können einfach so verwendet oder in einem Rekonstrukteur verbessert werden.
@@ -1461,7 +2247,7 @@ block.multiplicative-reconstructor.description = Verbessert Einheiten auf die dr
 block.exponential-reconstructor.description = Verbessert Einheiten auf die vierte Stufe.
 block.tetrative-reconstructor.description = Verbessert Einheiten auf die fünfte und letzte Stufe.
 block.switch.description = Ein einfacher Schalter. Sein Status kann mit einem Prozessor abgelesen und verändert werden.
-block.micro-processor.description = Führt eine Reihe von Logikbefehlen in einer Schleife aus. Kann Einheiten und Blöcke steuern. 
+block.micro-processor.description = Führt eine Reihe von Logikbefehlen in einer Schleife aus. Kann Einheiten und Blöcke steuern.
 block.logic-processor.description = Führt eine Reihe von Logikbefehlen in einer Schleife aus. Kann Einheiten und Blöcke steuern. Schneller als der Mikroprozessor.
 block.hyper-processor.description = Führt eine Reihe von Logikbefehlen in einer Schleife aus. Kann Einheiten und Blöcke steuern. Schneller als der Logikprozessor.
 block.memory-cell.description = Speichert Informationen für einen Prozessor.
@@ -1469,37 +2255,429 @@ block.memory-bank.description = Speichert Informationen für einen Prozessor. Ho
 block.logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an.
 block.large-logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an.
 block.interplanetary-accelerator.description = Ein Riesen-Railgun-Turm, der mithilfe des Elektromagnetismus Kerne auf die nötige Geschwindigkeit bringt, um interplanetarisches Reisen zu ermöglichen.
+block.repair-turret.description = Heilt durchgehend die nächste befreundete, beschädigte Einheit in der Umgebung. Verwendet optional Kühlung.
 
-unit.dagger.description = Schießt normale Kugeln auf alle Feinde in der Nähe.
-unit.mace.description = Schießt Feuer auf alle Gegner in der Nähe.
+#Erekir
+block.core-bastion.description = Kern der Basis. Gepanzert. Einmal zerstört, ist jeglicher Kontakt zum Sektor verloren.
+block.core-citadel.description = Kern der Basis. Gut gepanzert. Lagert mehr Ressourcen als ein Bastion-Kern.
+block.core-acropolis.description = Kern der Basis. Außergewöhnlich gut gepanzert. Lagert mehr Ressourcen als ein Festungs-Kern.
+block.breach.description = Schießt panzerbrechende Beryllium- oder Wolframmunition auf feindliche Ziele.
+block.diffuse.description = Schießt eine Welle von Kugeln in einer Kegelform, die Gegner zurückstoßen.
+block.sublimate.description = Schießt einen durchgängigen Strahl aus Flammen auf feindliche Ziele. Durchdringt Panzerung.
+block.titan.description = Schießt einen riesigen, explodierenden Sprengkörper auf feindliche Bodenziele. Benötigt Wasserstoff.
+block.afflict.description = Schießt eine sich teilende Kugel aus Flak. Benötigt Hitze.
+block.disperse.description = Schießt Flaksplitter auf feindliche Luftziele.
+block.lustre.description = Schießt einen langsamen Laser auf genau 1 feindliches Luftziel.
+block.scathe.description = Schießt eine explodierende Rakete über gewaltige Distanzen auf feindliche Bodenziele.
+block.smite.description = Schießt eine Welle aus blitzenden Kugeln.
+block.malign.description = Schießt ein Sperrfeuer aus zielsuchenden Lasern auf feindliche Ziele. Benötigt viel Hitze.
+block.silicon-arc-furnace.description = Verarbeitet Sand und Graphit zu Silizium.
+block.oxidation-chamber.description = Wandelt Beryllium und Ozon in Oxid um. Gibt Hitze als Nebenprodukt ab.
+block.electric-heater.description = Heizt Blöcke in einer bestimmten Richtung. Benötigt große Mengen Strom.
+block.slag-heater.description = Heizt Blöcke in einer bestimmten Richtung. Benötigt Schlacke.
+block.phase-heater.description = Heizt Blöcke in einer bestimmten Richtung. Benötigt Phasengewebe.
+block.heat-redirector.description = Lenkt angesammelte Hitze weiter.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Verteilt angesammelte Hitze auf die 3 anderen Seiten.
+block.electrolyzer.description = Spaltet Wasser in Wasserstoff und Ozon.
+block.atmospheric-concentrator.description = Sammelt Stickstoff aus der Atmosphäre. Benötigt Hitze.
+block.surge-crucible.description = Formt Spannungslegierung ais Schlacke und Silizium. Benötigt Hitze.
+block.phase-synthesizer.description = Synthetisiert Phasengewebe aus Thorium, Sand und Ozon. Benötigt Hitze.
+block.carbide-crucible.description = Verschmilzt Graphit und Wolfram zu Karbid. Benötigt Hitze.
+block.cyanogen-synthesizer.description = Synthetisiert Cyanogen aus Arkyzit und Graphit. Benötigt Hitze.
+block.slag-incinerator.description = Verbrennt nicht-volatile Materialien und Flüssigkeiten. Benötigt Schlacke.
+block.vent-condenser.description = Kondensiert Schlotgase zu Wasser. Verbraucht Strom.
+block.plasma-bore.description = Baut unbefristet Erze aus einer Erzwand ab. Erfordert kleine Mengen an Strom.\nVerwendet optional Wasserstoff, um die Effizienz zu steigern.
+block.large-plasma-bore.description = Ein größerer Plasmabohrer. Kann Wolfram und Thorium abbauen. Benötigt Wasserstoff und Strom.\nVerwendet optional Stickstoff, um die Effizienz zu steigern.
+block.cliff-crusher.description = Zertrümmert Wände, um unbefristet Sand herzustellen. Benötigt Strom. Effizienz variiert je nach Wandart.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Baut unbefristet Erze in Schüben aus dem Boden ab. Benötigt Strom und Wasser.
+block.eruption-drill.description = Ein verbesserter Schlagbohrer. Kann Thorium abbauen. Benötigt Wasserstoff.
+block.reinforced-conduit.description = Transportiert Flüssigkeiten. Nimmt von nicht-Kanälen nur von hinten an.
+block.reinforced-liquid-router.description = Verteilt Flüssigkeiten gleichmäßig auf bis zu drei Richtungen.
+block.reinforced-liquid-tank.description = Lagert eine große Menge an Flüssigkeiten.
+block.reinforced-liquid-container.description = Lagert eine beträchtliche Menge an Flüssigkeiten.
+block.reinforced-bridge-conduit.description = Transportiert Flüssigkeiten über Blöcke und Terrain.
+block.reinforced-pump.description = Pumpt Flüssigkeiten. Benötigt Wasserstoff.
+block.beryllium-wall.description = Beschützt Blöcke vor gegnerischen Projektilen.
+block.beryllium-wall-large.description = Beschützt Blöcke vor gegnerischen Projektilen.
+block.tungsten-wall.description = Beschützt Blöcke vor gegnerischen Projektilen.
+block.tungsten-wall-large.description = Beschützt Blöcke vor gegnerischen Projektilen.
+block.carbide-wall.description = Beschützt Blöcke vor gegnerischen Projektilen.
+block.carbide-wall-large.description = Beschützt Blöcke vor gegnerischen Projektilen.
+block.reinforced-surge-wall.description = Beschützt Blöcke vor gegnerischen Projektilen. Schießt gelegentlich Lichtbögen, wenn sie von einem Projektil getroffen wird.
+block.reinforced-surge-wall-large.description = Beschützt Blöcke vor gegnerischen Projektilen. Schießt gelegentlich Lichtbögen, wenn sie von einem Projektil getroffen wird.
+block.shielded-wall.description = Beschützt Blöcke vor gegnerischen Projektilen. Benutzt Strom, um ein Projektil-reflektierendes Schild zu erstellen. Leitet Strom.
+block.blast-door.description = Eine Mauer, die verbündete Bodeneinheiten durchlässt. Kann nicht manuell gesteuert werden.
+block.duct.description = Bewegt Materialien vorwärts. Kann nur ein einziges Item lagern.
+block.armored-duct.description = Bewegt Materialien vorwärts. Materialen können von der Seite nur aus Rohrleitungen herein.
+block.duct-router.description = Verteilt Materialien gleichmäßig auf bis zu drei Richtungen. Nimmt Materialien nur aus einer Richtung an. Kann als Sortierer verwendet werden.
+block.overflow-duct.description = Gibt Materialien nur zu den Seiten heraus, wenn der vordere Ausgang blockiert ist.
+block.duct-bridge.description = Transportierrt Materialen über Blöcke und Terrain.
+block.duct-unloader.description = Entlädt Materialen aus dem Block dahinter. Kann nicht aus Kernen entladen.
+block.underflow-duct.description = Das Gegenteil eines Ãœberlauftors. Gibt Materialien nur nach vorne heraus, wenn die Seiten blockiert sind.
+block.reinforced-liquid-junction.description = Funktioniert als Kreuzung für zwei sich kreuzende Kanäle.
+block.surge-conveyor.description = Bewegt Materialien in Gruppen. Kann mit Strom beschleunigt werden. Leitet Strom.
+block.surge-router.description = Verteilt Materialien gleichmäßig auf bis zu drei Spannungsförderbänder. Kann mit Strom beschleunigt werden. Leitet Strom.
+block.unit-cargo-loader.description = Baut Transportdrohnen. Drohnen verteilen Materialen automatisch zwischen Einheitentladungspunkten mit passenden Filtern.
+block.unit-cargo-unload-point.description = Funktioniert als Entladungspunkt für Transportdrohnen. Nimmt nur Materialien an, die dem Filter passen.
+block.beam-node.description = Verteilt Strom in rechten Winkeln. Speichert eine kleine Menge Strom.
+block.beam-tower.description = Verteilt Strom in rechten Winkeln. Speichert eine große Menge Strom. Höhere Reichweite.
+block.turbine-condenser.description = Generiert Strom, wenn auf einem Schlot platziert. Stellt eine kleine Menge Wasser her.
+block.chemical-combustion-chamber.description = Generiert aus Arkyzit und Ozon Strom.
+block.pyrolysis-generator.description = Erzeugt aus Arkyzit und Schlacke große Mengen Strom. Erzeugt als Nebenprodukt Wasser.
+block.flux-reactor.description = Erzeugt mit Hitze große Mengen Strom. Benötigt Cyanogen als Stabilisator. Stromherstellung und Cyanogenverbrauch sind proportional zur Hitze.\nExplodiert, wenn nicht genug Cyanogen bereitgestellt wird.
+block.neoplasia-reactor.description = Benutzt Arkyzit, Wasser und Phasengewebe, um riesige Mengen Strom herzustellen. Stellt Hitze und gefährliches Neoplasma als Nebenprodukte her.\nExplodiert gewaltsam, wenn das Neoplasma nicht mit Kanälen entfernt wird.
+block.build-tower.description = Baut zerstörte Gebäude automatisch wieder auf und hilft anderen Einheiten beim Bauen.
+block.regen-projector.description = Heilt verbündete Blöcke in einer quadratischen Fläche. Benötigt Wasserstoff.\nVerwendet optional Phasengewebe, um die Effizienz zu steigern.
+block.reinforced-container.description = Lagert eine kleine Menge an Materialien, die mit Entladern entfernt werden können. Lässt sich nicht mit dem Kern verbinden.
+block.reinforced-vault.description = Lagert eine große Menge an Materialien, die mit Entladern entfernt werden können. Lässt sich nicht mit dem Kern verbinden.
+block.tank-fabricator.description = Baut Stell-Einheiten. Hergestellt Einheiten können entweder direkt verwendet, oder in Verbessereren weiterverarbeitet werden.
+block.ship-fabricator.description = Baut Elud-Einheiten. Hergestellt Einheiten können entweder direkt verwendet, oder in Verbessereren weiterverarbeitet werden.
+block.mech-fabricator.description = Baut Merui-Einheiten. Hergestellt Einheiten können entweder direkt verwendet, oder in Verbessereren weiterverarbeitet werden.
+block.tank-assembler.description = Baut große Panzer mit hereingegebenen Blöcken und Einheiten. Die hergestellte Einheitenstufe kann mit Verbesserermodulen erhöht werden.
+block.ship-assembler.description = Baut große Schiffe mit hereingegebenen Blöcken und Einheiten. Die hergestellte Einheitenstufe kann mit Verbesserermodulen erhöht werden.
+block.mech-assembler.description = Baut große Mechs mit hereingegebenen Blöcken und Einheiten. Die hergestellte Einheitenstufe kann mit Verbesserermodulen erhöht werden.
+block.tank-refabricator.description = Befördert Panzer zur zweiten Stufe.
+block.ship-refabricator.description = Befördert Schiffe zur zweiten Stufe.
+block.mech-refabricator.description = Befördert Mechs zur zweiten Stufe.
+block.prime-refabricator.description = Befördert Einheiten zur dritten Stufe.
+block.basic-assembler-module.description = Erhöht Fabrikstufe, wenn an einer Baugrenze platziert. Benötigt Strom. Kann Fracht annehmen.
+block.small-deconstructor.description = Nimmt Blöcke und Einheiten wieder auseinander. Gibt 100% der Baukosten zurück.
+block.reinforced-payload-conveyor.description = Bewegt Fracht vorwärts.
+block.reinforced-payload-router.description = Verteilt Fracht zwischen angrenzenden Blöcken. Kann als Sortierer funktionieren.
+block.payload-mass-driver.description = Fracht-Transportmittel mit sehr hoher Reichweite. Schießt Frachtmassen zu verbundenen Frachtantriebstürmen.
+block.large-payload-mass-driver.description = Fracht-Transportmittel mit sehr hoher Reichweite. Schießt Frachtmassen zu verbundenen Frachtantriebstürmen.
+block.unit-repair-tower.description = Heilt alle Einheiten in der Nähe. Benötigt Ozon.
+block.radar.description = Entdeckt schrittweise die Umgebung und gegnerische Einheiten in einem großen Radius. Benötigt Strom.
+block.shockwave-tower.description = Beschädigt und zerstört gegnerische Projektile in der Nähe.
+block.canvas.description = Zeigt ein einfaches Bild mit einer vordefinierten Farbpalette. Bearbeitbar.
+
+unit.dagger.description = Schießt normale Kugeln auf nahe feindliche Ziele.
+unit.mace.description = Schießt Feuer auf nahe feindliche Ziele.
 unit.fortress.description = Schießt Langstreckengeschosse auf Ziele am Boden.
-unit.scepter.description = Feuert ein Sperrfeuer geladener Kugeln auf Feinde in der Nähe ab.
-unit.reign.description = Feuert ein Sperrfeuer riesiger Geschosse mit sehr hoher Durchstechkraft auf alle Feinde in der Nähe.
+unit.scepter.description = Feuert ein Sperrfeuer geladener Kugeln auf feindliche Ziele.
+unit.reign.description = Feuert ein Sperrfeuer riesiger Geschosse mit sehr hoher Durchstechkraft auf feindliche Ziele in der Nähe.
 unit.nova.description = Schießt kleine Laser, die Gegnern schaden und eigene Blöcke heilen. Kann boosten.
 unit.pulsar.description = Schießt Lichtbögen, die Gegnern schaden und eigene Blöcke heilen. Kann boosten.
 unit.quasar.description = Schießt durchdringende Laserstrahlen, die Gegnern schaden und eigene Blöcke heilen. Kann boosten. Hat ein Schutzschild.
 unit.vela.description = Schießt einen riesigen, konstanten Laserstrahl, der Gegnern schadet, Feuer verursacht und eigene Blöcke heilt. Kann boosten.
 unit.corvus.description = Schießt einen riesigen, konstanten Laserstrahl, der Gegnern schadet und eigene Blöcke heilt. Kann über Vieles drüberlaufen.
-unit.crawler.description = Rennt auf Gegner zu und zerstört sich dann selbst, um eine Explosion zu verursachen.
+unit.crawler.description = Rennt auf feindliche Ziele zu und zerstört sich dann selbst, um eine Explosion zu verursachen.
 unit.atrax.description = Schießt lähmende Schlackekugeln auf Gegner auf dem Boden. Kann über Vieles drüberlaufen.
-unit.spiroct.description = Schießt die Gegner mit Lasern ab, die dem Gegner schaden und den Spirokt heilen. Kann über Vieles drüberlaufen.
-unit.arkyid.description = Schießt die Gegner mit Lasern ab, die dem Gegner schaden und den Arkyid heilen. Kann über Vieles drüberlaufen.
-unit.toxopid.description = Schießt große energiegeladene Cluster-Geschosse und durchdringende Laser auf Feinde. Kann über Vieles drüberlaufen.
-unit.flare.description = Schießt normale Kugeln auf Ziele am Boden.
-unit.horizon.description = Wirft Bomben auf Ziele am Boden.
-unit.zenith.description = Schießt alle Gegner in der Nähe mit Salven von Raketen ab.
+unit.spiroct.description = Schießt feindliche Ziele mit Lasern ab, die diesen schaden und den Spirokt heilen. Kann über Vieles drüberlaufen.
+unit.arkyid.description = Schießt feindliche Ziele mit Lasern ab, die diesen schaden und den Arkyid heilen. Kann über Vieles drüberlaufen.
+unit.toxopid.description = Schießt große energiegeladene Cluster-Geschosse und durchdringende Laser auf feindliche Ziele. Kann über Vieles drüberlaufen.
+unit.flare.description = Schießt normale Kugeln auf feindliche Bodenziele.
+unit.horizon.description = Wirft Bomben auf feindliche Bodenziele.
+unit.zenith.description = Schießt feindliche Ziele mit Salven von Raketen ab.
 unit.antumbra.description = Schießt ein Sperrfeuer auf Gegner in der Nähe.
 unit.eclipse.description = Feuert zwei durchdringende Laser und einen Flaksperrfeuer auf alle Feinde in der Nähe.
-unit.mono.description = Baut Automatisch Blei und Kupfer ab. Dieses wird in den Kern gebracht.
+unit.mono.description = Baut automatisch Blei und Kupfer ab. Dieses wird in den Kern gebracht.
 unit.poly.description = Baut zerstörte Blöcke wieder auf und hilft anderen Einheiten beim Bauen.
 unit.mega.description = Heilt automatisch beschädigte Blöcke. Kann kleine Blöcke oder Bodeneinheiten tragen.
 unit.quad.description = Wirft große Bomben auf Bodenziele ab, welche Gegnern schaden und einige Blöcke heilen. Kann Bodeneinheiten tragen.
 unit.oct.description = Schützt mithilfe eines regenerierenden Schildes andere Einheiten. Kann die meisten Bodeneinheiten tragen.
 unit.risso.description = Schießt ein Sperrfeuer aus Raketen und Kugeln auf alle Gegner in der Nähe.
 unit.minke.description = Schießt Geschosse und Kugeln auf Feinde.
-unit.bryde.description = Schießt Artilleriegeschosse und Raketen mit großer Reichweite auf alle Gegner in der Nähe.
-unit.sei.description = Schießt ein Sperrfeuer aus Raketen und durchdringende Geschosse auf Gegner.
+unit.bryde.description = Schießt Artilleriegeschosse und Raketen mit großer Reichweite auf alle feindlichen Ziele.
+unit.sei.description = Schießt ein Sperrfeuer aus Raketen und durchdringende Geschosse auf feindliche Ziele.
 unit.omura.description = Schießt eine Railgun mit hoher Reichweite, um Gegner zu zerstören. Stellt Flare-Einheiten her.
 unit.alpha.description = Beschützt den Scherbenkern vor Feinden. Baut Blöcke.
 unit.beta.description = Beschützt den Fundamentkern vor Feinden. Baut Blöcke.
-unit.gamma.description = Beschützt den Nukleuskern vor Feinden. Baut Blöcke.
\ No newline at end of file
+unit.gamma.description = Beschützt den Nukleuskern vor Feinden. Baut Blöcke.
+unit.retusa.description = Schießt zielsuchende Torpedos auf Gegner und heilt verbündete Einheiten.
+unit.oxynoe.description = Schießt Block-heilendes Feuer auf Gegner und zerstört gegnerische Projektile.
+unit.cyerce.description = Schießt zielsuchende Cluster-Raketen auf Gegner und heilt verbündete Einheiten.
+unit.aegires.description = Schockt alle gegnerische Einheiten und Blöcke, die das Energiefeld betreten. Heilt alle verbündete.
+unit.navanax.description = Schießt explosive EMP-Projektile, die gegnerische Stromnetze zerstören und eigene Blöcke heilen. Zerschmilzt Gegner mit 4 autonomen Laserstrahlen.
+
+#Erekir
+unit.stell.description = Schießt normale Kugeln auf nahe feindliche Ziele.
+unit.locus.description = Schießt abwechselnde Kugeln auf nahe feindliche Ziele.
+unit.precept.description = Schießt panzerbrechende Cluster-Geschosse auf feindliche Ziele.
+unit.vanquish.description = Schießt große, panzerbrechende, sich teilende Geschosse auf feindliche Ziele.
+unit.conquer.description = Schießt große, panzerbrechende Kugel-Kaskaden auf feindliche Ziele.
+unit.merui.description = Schießt Langstreckengeschosse auf feindliche Bodenziele. Kann über Vieles drüberlaufen.
+unit.cleroi.description = Schießt doppelte Geschosse auf feindliche Ziele. Visiert feindliche Projektile mit einem Punktverteidigungssystem an. Kann über Vieles drüberlaufen.
+unit.anthicus.description = Schießt Langstreckengeschosse auf feindliche Ziele. Kann über Vieles drüberlaufen.
+unit.tecta.description = Schießt zielsuchende Plasmaprojektile auf feindliche Ziele. Beschützt sich selber mit einem gerichteten Schild. Kann über Vieles drüberlaufen.
+unit.collaris.description = Schießt sich teilende Artillerie über hohe Distanzen auf feindliche Ziele. Kann über Vieles drüberlaufen.
+unit.elude.description = Schießt Paare von zielsuchenden Kugeln auf feindliche Ziele. Kann über Flüssigkeiten schweben.
+unit.avert.description = Schießt drehende Paare von Kugeln auf feindliche Ziele.
+unit.obviate.description = Schießt drehende Paare von Blitzkugeln auf feindliche Ziele.
+unit.quell.description = Schießt zielsuchende Langstreckengeschosse auf feindliche Ziele. Stört feindliche Heilungsblöcke.
+unit.disrupt.description = Schießt zielsuchende, störende Langstreckengeschosse auf feindliche Ziele. Stört feindliche Heilungsblöcke.
+unit.evoke.description = Baut Blöcke, um den Bastion-Kern zu beschützen. Heilt Blöcke mit einem Strahl. Kann 2x2 Blöcke tragen.
+unit.incite.description = Baut Blöcke, um den Festung-Kern zu beschützen. Heilt Blöcke mit einem Strahl. Kann 2x2 Blöcke tragen.
+unit.emanate.description = Baut Blöcke, um den Akropolis-Kern zu beschützen. Heilt Blöcke mit Strahlen. Kann 2x2 Blöcke tragen.
+
+lst.read = Liest einen Wert aus einer verbundenen Speicherzelle.
+lst.write = Schreibt eine Zahl in einer verbundene Speicherzelle.
+lst.print = Fügt Text zum Textspeicher hinzu.\nZeigt nichts an, bis [accent]Print Flush[] verwendet wird.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Fügt eine [accent]Draw[]-Aufgabe zum Bildspeicher hinzu.\nZeigt nichts an, bis [accent]Draw Flush[] verwendet wird.
+lst.drawflush = Druckt [accent]Draw[]-Aufgaben aus dem Bildspeicher auf einen Bildschirm.
+lst.printflush = Druckt [accent]Print[]-Aufgaben aus dem Textspeicher auf einen Nachrichtenblock.
+lst.getlink = Gibt ein verbundenen Block wieder. Fängt bei 0 an.
+lst.control = Steuert einen Block.
+lst.radar = Findet Einheiten.
+lst.sensor = Gibt Daten über einen Block oder eine Einheit wieder.
+lst.set = Setzt eine Variable fest.
+lst.operation = Verändert eine Variable.
+lst.end = Springt wieder nach oben.
+lst.wait = Wartet eine bestimmte Zeit.
+lst.stop = Halte diesen Prozessor ganz an.
+lst.lookup = Sucht ein Item, eine Flüssigkeit, eine Einheit oder einen Block.\nGesamtmengen von jeder Sache können mit \n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nabgerufen werden.
+lst.jump = Falls die Bedingung erfüllt ist, wird woanders weitergemacht.
+lst.unitbind = Speichert eine Einheit einer Sorte als [accent]@unit[].
+lst.unitcontrol = Steuert [accent]@unit[].
+lst.unitradar = Findet Einheiten in der Nähe von [accent]@unit[].
+lst.unitlocate = Findet mit [accent]@unit[] bestimmte Positionen / Blöcke auf der ganzen Karte.
+lst.getblock = Lese Tile-Daten von jedem Standort.
+lst.setblock = Setze Tile-Daten an jedem Standort.
+lst.spawnunit = Einheit an einem Standort erstellen.
+lst.applystatus = Füge einer Einheit einen Effekt hinzu oder entferne ihn.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Schickt die nächste Welle.
+lst.explosion = Erstellt an einer beliebigen Stelle eine Explosion.
+lst.setrate = Setzt die Ausführungsgeschwindigkeit von Prozessoren in Anweisungen/tick.
+lst.fetch = Finde Einheiten, Kerne, Spieler oder Blöcke nach Zahl.\nZahlen fangen bei 0 an und hören bei dem jeweiligen Count auf.
+lst.packcolor = Kombiniere [0, 1] RGBA Komponenten zu einer Zahl.
+lst.setrule = Setze eine Spielregel.
+lst.flushmessage = Zeige eine Nachricht aus dem Textspeicher auf dem Bildschirm.\nWartet, bis die vorherige Nachricht wieder verschwindet.
+lst.cutscene = Verschiebe die Spielerkamera.
+lst.setflag = Setze eine Flag, die von allen Prozessoren gelesen werden kann.
+lst.getflag = Überprüfe, ob eine Flag gesetzt ist.
+lst.setprop = Setzt eine Eigenschaft einer Einheit oder eines Blockes.
+lst.effect = Erstelle einen Partikeleffekt
+lst.sync = Synchronisiert eine Variable im Netzwerk.\nWird maximal 10 Mal pro Sekunde ausgefürht.
+lst.playsound = Spielt einen Ton.\nDie Lautstärke kann ein fester Wert sein, oder anhand der Position berechnet werden. (weiter weg: leiser)
+lst.makemarker = Erstelle einen neuen Logikmarker in der Welt.\nEine ID zur Identifizierung muss angegeben werden.\nDerzeit können nur maximal 20.000 Marker pro Welt platziert werden.
+lst.setmarker = Lege eine Eigenschaft für einen Marker fest.\nDie ID muss die selbe wie bei der Erstellung des Markers sein.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = Die mathematische Konstante pi (3.141...)
+lglobal.@e = Die mathematische Konstante e (2.718...)
+lglobal.@degToRad = Multipliziere mit dieser Zahl um Grad in Radianten umzuwandeln
+lglobal.@radToDeg = Multipliziere mit dieser Zahl um Radianten in Grad umzuwandeln
+lglobal.@time = Spielzeit des aktuellen Speicherstandes in Millisekunden
+lglobal.@tick = Spielzeit des aktuellen Speicherstandes in Ticks (1 Sekunde = 60 Ticks)
+lglobal.@second = Spielzeit des aktuellen Speicherstandes in Sekunden
+lglobal.@minute = Spielzeit des aktuellen Speicherstandes in Minuten
+lglobal.@waveNumber = Nummer der aktuellen Welle, wenn Wellen aktiviert sind
+lglobal.@waveTime = Countdown zur nächsten Welle in Sekunden
+lglobal.@mapw = Breite der Karte in Kacheln
+lglobal.@maph = Höhe der Karte in Kacheln
+lglobal.sectionMap = Karte
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = Der Logikblock, der den Code ausführt
+lglobal.@thisx = X-Koordinate des Blocks, der den Code ausführt
+lglobal.@thisy = Y-Koordinate des Blocks, der den Code ausführt
+lglobal.@links = Gesamtzahl der Blöcke, die mit diesem Prozessor verbunden sind
+lglobal.@ipt = Ausführungsgeschwindigkeit in Anweisungen pro Tick (1 Sekunde = 60 Ticks)
+lglobal.@unitCount = Gesamtzahl der verschiedenen Einheiten im Spiel; mit dem Lookup-Befehl benutzt
+lglobal.@blockCount = Gesamtzahl der verschiedenen Blöcke im Spiel; mit dem Lookup-Befehl benutzt
+lglobal.@itemCount = Gesamtzahl der verschiedenen Materialien im Spiel; mit dem Lookup-Befehl benutzt
+lglobal.@liquidCount = Gesamtzahl der verschiedenen Flüssigkeiten im Spiel; mit dem Lookup-Befehl benutzt
+lglobal.@server = true, wenn der Code auf einem Server oder im Einzelspielermodus ausgeführt wird, sonst false
+lglobal.@client = true, wenn der Code auf einem Client läuft, der mit einem Server verbunden ist
+lglobal.@clientLocale = Gebiet des Clients, der den Code ausführt. Zum Beispiel: en_US
+lglobal.@clientUnit = Einheit des Clients, der den Code ausführt
+lglobal.@clientName = Spielername des Clients, der diesen Code ausführt
+lglobal.@clientTeam = Team ID des Clients, der diesen Code ausführt
+lglobal.@clientMobile = true, wenn der Client ein Mobilgerät ist, sonst false
+
+logic.nounitbuild = [red]Logik, die Blöcke baut, ist hier nicht erlaubt.
+
+lenum.type = Englischer Name eines Blocks / einer Einheit. Ein Verteiler gibt [accent]@router[] wieder.\nKein string.
+lenum.shoot = Schießt auf eine Position.
+lenum.shootp = Schießt auf eine Einheit / einen Block und sagt deren Position voraus.
+lenum.config = Blockkonfiguration, z.B. das ausgewählte Item in einem Sortierer.
+lenum.enabled = Ob der Block an oder aus ist.
+laccess.currentammotype = Aktuelle Munitionsart eines Geschützes
+
+laccess.color = Illuminiererfarbe.
+laccess.controller = Einheitensteurer. Gibt "processor" zurück, wenn die Einheit prozessorgesteuert ist,.\nGibt den Steuerer zurück, wenn die Einheit Teil einer Formation ist.\nSonst wird einfach die Einheit zurückgegeben.
+laccess.dead = Ob ein Block / eine Einheit tot oder nicht mehr gültig ist.
+laccess.controlled = Gibt zurück:\n[accent]@ctrlProcessor[] wenn die Einheit prozessorgesteuert ist\n[accent]@ctrlPlayer[] wenn die Einheit / der Block von einem Spieler gesteuert wird\n[accent]@ctrlFormation[] wenn die Einheit Teil einer Formation ist\nSonst 0.
+laccess.progress = Fortschritt, von 0 bis 1.\nGibt Produktion, Nachladestatus or Baufortschritt zurück.
+laccess.speed = Höchstgeschwindigkeit einer Einheit, gemessen in Blöcke/Sekunde.
+laccess.id = ID einer Einheit/eines Blocks/eines Materials/einer Flüssigkeit\nThis is the inverse of the lookup operation.
+
+lcategory.unknown = Unbekannt
+lcategory.unknown.description = Unbekannte Anweisungen
+lcategory.io = Ein- und Ausgabe
+lcategory.io.description = Verändert den Inhalt von Speicherzellen und Bild- und Textspeicher.
+lcategory.block = Blocksteuerung
+lcategory.block.description = Interagiert mit Blöcken.
+lcategory.operation = Operationen
+lcategory.operation.description = Logische Operationen.
+lcategory.control = Ablaufsteuerung
+lcategory.control.description = Ablaufreihenfolge bearbeiten.
+lcategory.unit = Einheitensteuerung
+lcategory.unit.description = Einheiten finden und steuern.
+lcategory.world = Welt
+lcategory.world.description = Steuert, wie die Welt sich verhält.
+
+graphicstype.clear = Füllt den Bildschirm mit einer Farbe.
+graphicstype.color = Wählt eine Farbe aus.
+graphicstype.col = Wie color, aber Farben werden mit Prozentzeichen und hex-Code angegeben. Als Beispiel wäre %FF0000 rot.
+graphicstype.stroke = Setzt die Linienbreite fest.
+graphicstype.line = Zeichnet eine Linie.
+graphicstype.rect = Zeichnet ein Rechteck.
+graphicstype.linerect = Zeichnet den Umriss eines Rechtecks.
+graphicstype.poly = Füllt ein gleichmäßiges Polygon.
+graphicstype.linepoly = Zeichnet den Umriss eines gleichmäßigen Polygons.
+graphicstype.triangle = Zeichnet ein Dreieck.
+graphicstype.image = Zeichnet ein Bild von einem englischen Namen.\nz.B. [accent]@router[] oder [accent]@dagger[].
+graphicstype.print = Zeichnet Text aus dem Textspeicher und leert diesen.
+
+lenum.always = Immer.
+lenum.idiv = Division mit ganzen Zahlen.
+lenum.div = Division.\nGibt bei Teilung durch null [accent]null[] zurück.
+lenum.mod = Modulo.
+lenum.equal = Prüft Gleichheit.\nNicht-"null" Objekte, die mit Zahlen verglichen werden, werden 1.
+lenum.notequal = Prüft Ungleichheit.
+lenum.strictequal = Prüft strenge Gleichheit.\nKann verwendet werden, um "null" zu finden.
+lenum.shl = Bit-Shift nacht links.
+lenum.shr = Bit-Shift nach rechts.
+lenum.or = Bitwise ODER.
+lenum.land = Logisches AND.
+lenum.and = Bitweises UND.
+lenum.not = Bitweises NOT.
+lenum.xor = Bitweises XOR.
+
+lenum.min = Die Größte von zwei Zahlen.
+lenum.max = Die Kleinste von zwei Zahlen.
+lenum.angle = Vektorwinkel in Grad.
+lenum.anglediff = Absolute Entfernung zwischen zwei Winkeln in Grad.
+lenum.len = Vektorlänge.
+
+lenum.sin = Sinus in Grad.
+lenum.cos = Cosinus in Grad.
+lenum.tan = Tangens in Grad.
+
+lenum.asin = Arkussinus in Grad.
+lenum.acos = Arkuskosinus in Grad.
+lenum.atan = Arkustangens in Grad.
+
+#not a typo, look up 'range notation'
+lenum.rand = Zufällige Zahl zwischen [0, <wert>).
+lenum.log = Logarithmus (ln).
+lenum.log10 = Logarithmus zur Basis 10.
+lenum.noise = 2D rauschen.
+lenum.abs = Betrag.
+lenum.sqrt = Quadratwurzel.
+
+lenum.any = Irgendeine Einheit.
+lenum.ally = Freundliche Einheit.
+lenum.attacker = Einheit mit Waffe.
+lenum.enemy = Gegnerische Einheit.
+lenum.boss = Bosseinheit.
+lenum.flying = Lufteinheit.
+lenum.ground = Bodeneinheit.
+lenum.player = Spielergesteuerte Einheit.
+
+lenum.ore = Erz.
+lenum.damaged = Beschädigter, alliierter Block.
+lenum.spawn = Gegnerischer Spawnpunkt.\nKann ein Kern oder eine Position sein.
+lenum.building = Ein Block einer bestimmten Sorte.
+
+lenum.core = Irgendein Kern.
+lenum.storage = Speicherblock, z.B. ein Tresor.
+lenum.generator = Blöcke, die Strom generieren.
+lenum.factory = Blöcke, die Ressourcen verarbeiten.
+lenum.repair = Reperaturpunkt.
+lenum.battery = Irgendeine Batterie.
+lenum.resupply = Munitionsvorrat.\nNur wichtig, wenn [accent]"Einheiten benötigen Munition"[] an ist.
+lenum.reactor = Schlag- / Thoriumreaktor.
+lenum.turret = Irgendein Geschütz.
+
+sensor.in = Der Block / die Einheit.
+
+radar.from = Block zu benutzen. [accent]Sensor[]-Reichweite hängt von der Blockreichweite ab.
+radar.target = Einheitenfilter.
+radar.and = Weitere Filter.
+radar.order = Sortierreihenfolge der Ergebnisse. 0 bedeutet rückwärts.
+radar.sort = Sortiermethode der Ergebnisse.
+radar.output = Variable für das Ergebnis.
+
+unitradar.target = Einheitenfilter.
+unitradar.and = Weitere Filter.
+unitradar.order = Sortierreihenfolge der Ergebnisse. 0 bedeutet rückwärts.
+unitradar.sort = Sortiermethode der Ergebnisse.
+unitradar.output = Variable für das Ergebnis.
+
+control.of = Block, der gesteuert werden soll.
+control.unit = Zieleinheit / Zielblock.
+control.shoot = Ob geschossen werden soll.
+
+unitlocate.enemy = Ob gegnerische Blöcke gesucht werden sollen.
+unitlocate.found = Ob der Block gefunden wurde.
+unitlocate.building = Variable für das Ergebnis.
+unitlocate.outx = Variable für die X-Koordinate.
+unitlocate.outy = Variable für die Y-Koordinate.
+unitlocate.group = Gesuchter Blocktyp.
+playsound.limit = Wenn true: verhindert, dass dieser Ton abgespielt wird,\nwenn er im gleichen Frame schon einmal gespielt wurde.
+
+lenum.idle = Bewegt sich nicht, baut aber weiter ab.\nDer normale Zustand.
+lenum.stop = Bewegung / Abbau / Bau abbrechen.
+lenum.unbind = Logiksteuerung deaktivieren.\nNormale KI übernimmt.
+lenum.move = Geht zu diese Position.
+lenum.approach = Geht auf einen Punkt mit einem bestimmten Radius zu.
+lenum.pathfind = Geht zum gegnerischen Spawnpunkt.
+lenum.autopathfind = Läuft zum nächsten feindlichen Kern oder Spawnbereich.
+lenum.target = Schießt auf eine Position.
+lenum.targetp = Schießt auf eine Einheit und sagt deren Position voraus.
+lenum.itemdrop = Materialien abwerfen.
+lenum.itemtake = Materialien aus einem Block nehmen.
+lenum.paydrop = Lässt einen Block / eine Einheit wieder fallen.
+lenum.paytake = Hebt einen Block / eine kleine Einheit auf.
+lenum.payenter = Betritt den Fracht-Block, auf dem sich die Einheit befindet.
+lenum.flag = Zahl, mit der eine Einheit identifiziert werden kann.
+lenum.mine = Erz von einer Position abbauen.
+lenum.build = Einen Block bauen.
+lenum.getblock = Gibt den Gebäude-, Boden- und Blocktyp and den gegebenen Koordinaten zurück.\nDie Position muss in Reichweite der Einheit sein, sonst wird null zurückgegeben.
+lenum.within = Prüft, ob eine Einheit in einem Radius um einen Punkt ist.
+lenum.boost = Aktiviert / deaktiviert den Boost.
+lenum.flushtext = Verschiebt den Inhalt des Print Buffers wenn möglich zu einem Marker.\nWenn fetch true ist, wird versucht, Eigenschaften vom Locale Bundle der Karte oder des Spiels zu lesen.
+lenum.texture = Name einer Textur direkt aus dem Texturatlas des Spiels (bennant mit kebab-case naming style).\nWenn printFlush true ist, wird der Inhalt des Textspeichers als Argument genommen und gelöscht.
+lenum.texturesize = Größe einer Textur in Kacheln. Zero value scales marker width to original texture's size.
+lenum.autoscale = Ob der Marker entsprechend des Zoom-Levels des Spielers skaliert werden soll.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Positionen auf der Textur von 0 bis 1, für quad marker benutzt.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 60e9538f1a..566a5f21d6 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -2,29 +2,29 @@ credits.text = Creado por [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Créditos
 contributors = Traductores y Contribuidores
 discord = ¡Únete al Discord de Mindustry!
-link.discord.description = El servidor official de Discord de Mindustry
+link.discord.description = El Discord oficial de Mindustry
 link.reddit.description = El subreddit de Mindustry
 link.github.description = Código fuente del juego
 link.changelog.description = Lista de actualizaciones
 link.dev-builds.description = Versiones en desarrollo inestables
-link.trello.description = Tablón de Trello oficial para las características planificadas
-link.itch.io.description = Página de itch.io, donde puedes descargar las versiones para PC
+link.trello.description = Tablón de Trello oficial con las características planeadas
+link.itch.io.description = Descarga las versiones para PC desde itch.io.
 link.google-play.description = Ver en Google Play Store
-link.f-droid.description = Página de F-Droid del juego
+link.f-droid.description = Ver en F-Droid
 link.wiki.description = Wiki oficial de Mindustry
-link.suggestions.description = Sugerir nuevas funciones
+link.suggestions.description = Sugerir nuevas características
 link.bug.description = ¿Encontraste un error? Puedes reportarlo aquí
-linkfail = ¡Error al abrir el enlace!\nLa URL ha sido copiada a su portapapeles.
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
+linkfail = ¡Error al abrir el enlace!\nLa URL se ha copiado al portapapeles.
 screenshot = Captura de pantalla guardada en {0}
-screenshot.invalid = Mapa demasiado grande, no hay suficiente memoria para la captura de pantalla.
-gameover = Tu núcleo ha sido destruido.
-gameover.disconnect = Desconectado
+screenshot.invalid = El mapa es demasiado grande, no hay suficiente memoria para la captura de pantalla.
+gameover = Fin de la partida
+gameover.disconnect = Desconectarse
 gameover.pvp = ¡El equipo[accent] {0}[] ha ganado!
 gameover.waiting = [accent]Esperando el próximo mapa...
-highscore = [accent]¡Nuevo récord de puntuación!
-copied = Copiado
-indev.notready = Esta parte del juego no esta lista aún.
-indev.campaign = [accent]Has llegado al final de la campaña![]\n\nEsto es todo lo lejos que puedes llegar por ahora.\nLos viajes interplanetarios se añadirán en futuras actualizaciones.
+highscore = [accent]¡Nuevo récord!
+copied = Copiado.
+indev.notready = Esta parte del juego no esta lista aún
 
 load.sound = Sonidos
 load.map = Mapas
@@ -41,578 +41,892 @@ be.ignore = Ignorar
 be.noupdates = No se encontraron actualizaciones.
 be.check = Buscar actualizaciones
 
-mod.featured.title = Explorador de mods
-mod.featured.dialog.title = Explorador de Mods
+mods.browser = Explorador de mods
 mods.browser.selected = Mod seleccionado
-mods.browser.add = Installar Mod
-mods.github.open = Abrir en Github
+mods.browser.add = Instalar
+mods.browser.reinstall = Reinstalar
+mods.browser.view-releases = Versiones
+mods.browser.noreleases = [scarlet]No disponible.\n[accent]No se encontró ninguna versión publicada para este mod. Comprueba si el repositorio del mod ha publicado alguna versión.
+mods.browser.latest = <Última>
+mods.browser.releases = Versiones
+mods.github.open = Repositorio de GitHub
+mods.github.open-release = Lista de versiones
+mods.browser.sortdate = Más recientes
+mods.browser.sortstars = Mejor valorados
 
-schematic = Plantilla
-schematic.add = Guardar plantilla...
-schematics = Plantillas
-schematic.replace = Ya existe una plantilla con ese nombre. ¿Deseas remplazarla?
-schematic.exists = Ya existe una plantilla con ese nombre.
-schematic.import = Importar plantilla...
+schematic = Esquema
+schematic.add = Guardar esquema...
+schematics = Esquemas
+schematic.search = Buscar esquemas..
+schematic.replace = Ya existe un esquema con ese nombre. ¿Quieres reemplazarlo?
+schematic.exists = Ya existe un esquema con ese nombre.
+schematic.import = Importar esquema...
 schematic.exportfile = Exportar archivo
 schematic.importfile = Importar archivo
-schematic.browseworkshop = Buscar en el Steam Workshop
-schematic.copy = Copiar al portapapeles.
-schematic.copy.import = Importar desde el portapapeles.
-schematic.shareworkshop = Compartir en el Steam Workshop
-schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Girar plantilla
-schematic.saved = Plantilla guardada.
-schematic.delete.confirm = Se borrará ésta plantilla.
-schematic.rename = Renombrar plantilla
+schematic.browseworkshop = Buscar en Steam Workshop
+schematic.copy = Copiar al portapapeles
+schematic.copy.import = Importar desde el portapapeles
+schematic.shareworkshop = Compartir en Steam Workshop
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Invertir esquema
+schematic.saved = Esquema guardado.
+schematic.delete.confirm = Este esquema será absolutamente erradicado.
+schematic.edit = Editar esquema
 schematic.info = {0}x{1}, {2} bloques
-schematic.disabled = [scarlet]Plantillas desactivadas.[]\nNo puedes usar plantillas en este [accent]mapa[] o [accent]servidor.
+schematic.disabled = [scarlet]Esquemas desactivados.[]\nNo está permitido usar esquemas en este [accent]mapa[] o [accent]servidor.
+schematic.tags = Etiquetas:
+schematic.edittags = Editar etiquetas
+schematic.addtag = Añadir etiqueta
+schematic.texttag = Texto de etiqueta
+schematic.icontag = Icono de etiqueta
+schematic.renametag = Renombrar etiqueta
+schematic.tagged = {0} etiquetado
+schematic.tagdelconfirm = ¿Eliminar completamente esta etiqueta?
+schematic.tagexists = Esa etiqueta ya existe.
 
 stats = Estadísticas
-stat.wave = Oleadas Derrotadas:[accent] {0}
-stat.enemiesDestroyed = Enemigos Destruidos:[accent] {0}
-stat.built = Estructuras Construidas:[accent] {0}
-stat.destroyed = Estructuras Destruidas:[accent] {0}
-stat.deconstructed = Estructuras Desconstruidas:[accent] {0}
-stat.delivered = Recursos Lanzados:
-stat.playtime = Tiempo jugado:[accent] {0}
-stat.rank = Rango final: [accent]{0}
+stats.wave = Oleadas derrotadas
+stats.unitsCreated = Unidades creadas
+stats.enemiesDestroyed = Enemigos destruidos
+stats.built = Estructuras construidas
+stats.destroyed = Estructuras destruidas
+stats.deconstructed = Estructuras deconstruidas
+stats.playtime = Tiempo jugado
 
-globalitems = [accent]Recursos Totales
-map.delete = ¿Estás seguro de que quieres borrar el mapa "[accent]{0}[]"?
-level.highscore = Puntuación más alta: [accent]{0}
+globalitems = [accent]Recursos totales
+map.delete = ¿Quieres borrar el mapa "[accent]{0}[]"?
+level.highscore = Récord de puntuación: [accent]{0}
 level.select = Selección de nivel
 level.mode = Modo de juego:
 coreattack = < ¡El núcleo está bajo ataque! >
-nearpoint = [[ [scarlet]ABANDONA EL PUNTO DE APARICIÓN INMEDIATAMENTE[] ]\nRiesgo de aniquilación inminente
-database = Base de datos
-savegame = Guardar Partida
-loadgame = Cargar Partida
-joingame = Unirse a Partida
-customgame = Crear Partida
-newgame = Nueva Partida
-none = <no hay>
+nearpoint = [[ [scarlet]ABANDONA EL PUNTO DE ATERRIZAJE INMEDIATAMENTE[] ]\nAniquilación inminente
+database = Base de datos del núcleo
+database.button = Base de datos
+savegame = Guardar partida
+loadgame = Cargar partida
+joingame = Unirse a partida
+customgame = Partida personalizada
+newgame = Nueva partida
+none = <nada>
+none.found = [lightgray]<no hay coincidencias>
+none.inmap = [lightgray]<no hay en este lugar>
 minimap = Minimapa
 position = Posición
 close = Cerrar
 website = Sitio web
 quit = Salir
-save.quit = Guardar y Salir
+save.quit = Guardar y salir
 maps = Mapas
-maps.browse = Navegar por los Mapas
+maps.browse = Buscar mapas
 continue = Continuar
 maps.none = [lightgray]¡No se han encontrado mapas!
 invalid = No es válido
-pickcolor = Escoge Color
-preparingconfig = Preparando Configuración
-preparingcontent = Preparando Contenido
-uploadingcontent = Subiendo Contenido
-uploadingpreviewfile = Subiendo Archivo de Vista Previa
-committingchanges = Confirmando Cambios
+pickcolor = Selección de color
+preparingconfig = Preparando configuración
+preparingcontent = Preparando contenido
+uploadingcontent = Subiendo contenido
+uploadingpreviewfile = Subiendo archivo de vista previa
+committingchanges = Sincronizando cambios
 done = Hecho
-feature.unsupported = Tu dispositivo no es compatible con esta función.
+feature.unsupported = Tu dispositivo no es compatible con esta característica.
 
-mods.alphainfo = Ten en cuenta que los mods estan en fase Alpha, y[scarlet] pueden tener varios errores[].\nReporta cualquier error que encuentres en la página de GitHub de Mindustry.
+mods.initfailed = [red]⚠[] La anterior ejecución de Mindustry no pudo inicializarse correctamente. Seguramente fue causado por algún mod erróneo.\n\nPara evitar un bucle de errores al iniciar el juego, [red]se han desactivado todos los mods.[]
 mods = Mods
-mods.none = [lightgray]¡No se encontraron Mods!
-mods.guide = Guía de Modding
-mods.report = Reportar Error
+mods.none = [lightgray]¡No se han encontrado mods!
+mods.guide = Guía sobre mods
+mods.report = Reportar error
 mods.openfolder = Abrir carpeta de mods
+mods.viewcontent = Ver contenido
 mods.reload = Recargar
-mods.reloadexit = A continuación se cerrará el juego para recargar los mods.
+mods.reloadexit = A continuación se cerrará el juego para cargar los mods.
+mod.installed = [[Instalado]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Activado
 mod.disabled = [scarlet]Desactivado
+mod.multiplayer.compatible = [gray]Compatible con multijugador
 mod.disable = Desactivar
+mod.version = Version:
 mod.content = Contenido:
-mod.delete.error = No se pudo elminar el mod. Tal vez esté en uso por el juego.
-mod.requiresversion = [scarlet]Requiere como mínimo la versión del juego: [accent]{0}
-mod.outdated = [scarlet]No es compatible con la V6 (no minGameVersion: 105)
-mod.missingdependencies = [scarlet]Dependencias faltantes: {0}
+mod.delete.error = No se pudo elminar el mod. Puede que el archivo esté en uso.
+mod.incompatiblegame = [red]Juego desactualizado
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]No soportado
+mod.unmetdependencies = [red]Dependencias no satisfechas
 mod.erroredcontent = [scarlet]Contenido erróneo
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requiere la versión del juego: [accent]{0}[]\nTu versión está desactualizada. Este mod requiere una versión más reciente del juego.
+mod.outdatedv7.details = Este mod no es compatible con la última versión del juego. Su autor debe actualizarlo, y añadir [accent]minGameVersion: 136[] al fichero [accent]mod.json[].
+mod.blacklisted.details = Este mod ha sido bloqueado manualmente por causar cierres inesperados, errores u otros problemas en esta versión del juego. Será mejor no usarlo.
+mod.missingdependencies.details = A este mod le faltan dependencias: {0}
+mod.erroredcontent.details = La partida causó errores al cargar. Puedes pedir al autor del mod que los arregle.
+mod.circulardependencies.details = Este mod tiene dependencias que dependen unas de otras.
+mod.incompletedependencies.details = Este mod no se puede cargar debido a dependencias no válidas o faltantes: {0}.
+mod.requiresversion = Requiere la versión del juego: [red]{0}
 mod.errors = Ha ocurrido un fallo al cargar el contenido.
-mod.noerrorplay = [scarlet]Se están ejecutando algunos mods con fallos.[]Deshabilítalos o arregla los errores antes de jugar.
-mod.nowdisabled = [scarlet]Al/Los Mod/s '{0}'le esta/n faltando dependencias:[accent] {1}\n[lightgray]Estos mods necesitan descargarse primero.\nEste mod será automaticamente desactivado.
+mod.noerrorplay = [scarlet]Se están ejecutando algunos mods con fallos.[]Debes deshabilitarlos o arreglar los errores antes de jugar.
+mod.nowdisabled = [scarlet]El mod '{0}' necesita ejecutarse junto a otros mods de los que depende:[accent] {1}\n[lightgray]Es necesario descargar primero estos mods.\nEste mod se desactivará automaticamente.
 mod.enable = Activar
-mod.requiresrestart = El juego se cerrará para aplicar los mods.
-mod.reloadrequired = [scarlet]Se requiere volver a cargar
+mod.requiresrestart = El juego se cerrará para aplicar los cambios del mod.
+mod.reloadrequired = [scarlet]Es necesario reiniciar
 mod.import = Importar mod
 mod.import.file = Importar archivo
-mod.import.github = Importar Mod de Github
-mod.jarwarn = [scarlet]Los mods JAR pueden no ser seguros.[]\n¡Asegúrate de haberlos descargado de una fuente en la que confíes!
-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.import.github = Importar desde Github
+mod.jarwarn = [scarlet]Los mods JAR pueden no ser seguros.[]\n¡Asegúrate de haberlos descargado de una fuente de confianza!
+mod.item.remove = Este objeto es parte del mod[accent] '{0}'[]. Para eliminarlo, desinstala ese mod.
+mod.remove.confirm = Este mod será eliminado.
 mod.author = [lightgray]Autor:[] {0}
-mod.missing = Esta partida guardada usa mods que has actualizado recientemente o que no tienes instalados. Se puede corromper la partida guardada. ¿Quieres cargarla a pesar de ello?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Antes de publicar este mod en el Steam Workshop, debe añadir una imagen de vista previa.\nAñada una imagen  con nombre[accent] preview.png[] en la carpeta del mod e intente nuevamente.
-mod.folder.missing = Solo los mods en forma de carpeta se pueden publicar en el Steam Workshop.\nPara convertir cualquier mod en una carpeta, simplemente descomprima su archivo a una carpeta y elimine el zip anterior, luego reinicie su juego o vuelva a cargar sus mods.
-mod.scripts.disable = Tu dispositivo no es compatible con mods con scripts. Debes deshabilitar esos mods para jugar.
+mod.missing = Esta partida guardada usa mods que has actualizado recientemente o que no tienes instalados. Se puede corromper la partida guardada. ¿Quieres cargarla igualmente?\n[lightgray]Mods:\n{0}
+mod.preview.missing = Antes de publicar este mod en Steam Workshop, debes añadir una imagen de vista previa.\nAñade una imagen llamada[accent] preview.png[] en la carpeta del mod e inténtalo de nuevo.
+mod.folder.missing = Sólo los mods en forma de carpeta se pueden publicar en Steam Workshop.\nPara convertir cualquier mod en una carpeta, descomprime su archivo a una carpeta y elimina el zip anterior, luego reinicia el juego o vuelve a cargar tus mods.
+mod.scripts.disable = Tu dispositivo no soporta mods con scripts. Debes desactivar esos mods para jugar.
 
-about.button = Acerca de...
+about.button = Más información
 name = Nombre:
 noname = Elige un[accent] nombre de jugador[] primero.
+search = Search:
 planetmap = Mapa del planeta
 launchcore = Lanzar núcleo
 filename = Nombre del archivo:
-unlocked = ¡Nuevo contenido en la Base de Datos!
+unlocked = ¡Nuevo contenido desbloqueado!
 available = ¡Nueva investigación disponible!
+unlock.incampaign = < Descúbrelo en el modo campaña para ver más detalles >
+campaign.select = Elegir campaña
+campaign.none = [lightgray]Elige un planeta donde empezar.\nPuedes cambiar en cualquier momento.
+campaign.erekir = [accent]Recomendado para nuevos jugadores.[]\n\nContenido más reciente y pulido. Progresión de campaña lineal.\n\nNiveles y experiencia de mayor calidad.
+campaign.serpulo = [scarlet]No recomendado para jugadores novatos.[]\n\nContenido más antiguo; La experiencia clásica. More open-ended.\n\nNiveles y mecánicas de juego potencialmente desequilibrados.
+campaign.difficulty = Difficulty
 completed = [accent]Completado
-techtree = Tecnologías
-research.legacy = Se han encontrado datos guardados de investigaciones tecnológicas realizadas en la versión [accent]5.0[].\n¿Quieres [accent]cargar estos datos[], o [accent]descartarlos[] para reiniciar los descubrimientos tecnológicos del nuevo modo Campaña? (Recomendado)
+techtree = Investigaciones tecnológicas
+techtree.select = Selección de esquemas de tecnologías
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Cargar
 research.discard = Descartar
 research.list = [lightgray]Investigaciones:
-research = Investigaciones
+research = Tecnologías
 researched = [lightgray]{0} investigado.
 research.progress = {0}% completado
 players = {0} jugadores
 players.single = {0} jugador
 players.search = Buscar
-players.notfound = [gray]No se encontraron jugadores
+players.notfound = [gray]No se han encontrado jugadores
 server.closing = [accent]Cerrando servidor...
-server.kicked.kick = ¡Te han echado del servidor!
+server.kicked.kick = ¡Has sido expulsado del servidor!
 server.kicked.whitelist = No estás en la lista blanca de este servidor.
 server.kicked.serverClose = El servidor se ha cerrado.
-server.kicked.vote = Has sido expulsado por votación. ¡Hasta luego!
+server.kicked.vote = Has sido expulsado por votación. Hasta luego.
 server.kicked.clientOutdated = ¡Cliente desactualizado! ¡Actualiza el juego!
 server.kicked.serverOutdated = ¡Servidor desactualizado! ¡Pídele al anfitrión que lo actualice!
-server.kicked.banned = Has sido baneado en este servidor.
-server.kicked.typeMismatch = Este servidor no es compatible con su tipo de compilación.
-server.kicked.playerLimit = Este servidor está lleno. Aunque siempre puedes esperar a que alguien deje un hueco...
-server.kicked.recentKick = Has sido expulsado recientemente.\nEspera para poder conectarte de nuevo.
+server.kicked.banned = Estás vetado en este servidor.
+server.kicked.typeMismatch = Este servidor no es compatible con el tipo de compilación de tu versión actual.
+server.kicked.playerLimit = Este servidor está lleno. Puedes esperar a que alguien deje un hueco.
+server.kicked.recentKick = Has sido expulsado recientemente.\nEspera antes de conectarte de nuevo.
 server.kicked.nameInUse = Ya hay alguien con ese\nnombre en el servidor.
-server.kicked.nameEmpty = Tu nombre debe contener al menos un carácter o número.
-server.kicked.idInUse = ¡Ya estás en el servidor! No está permitido conectarse con dos cuentas.
+server.kicked.nameEmpty = Ese nombre no es válido.
+server.kicked.idInUse = ¡Ya estás en este servidor! No está permitido conectarse con dos cuentas.
 server.kicked.customClient = Este servidor no soporta versiones personalizadas. Descarga una versión oficial.
 server.kicked.gameover = ¡Fin del juego!
-server.kicked.serverRestarting = Se esta reiniciando el servidor.
+server.kicked.serverRestarting = El servidor se está reiniciando.
 server.versions = Tu versión:[accent] {0}[]\nVersión del servidor:[accent] {1}[]
-host.info = El botón [accent]host[] crea un servidor en el puerto [scarlet]6567[]. \nCualquier persona en la misma [lightgray]wifi []o [lightgray]red local[] debería poder ver tu servidor en la lista de servidores.\n\nSi quieres que cualquier persona se pueda conectar de cualquier lugar mediante IP, se requiere [accent]asignación de puertos[].\n\n[lightgray]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu firewall.
-join.info = Aquí, puedes escribir la [accent]IP de un servidor[] para conectarte, o descubrir servidores en tu [accent]red local[] para conectarte.\nTambién se puede jugar multijugador en redes LAN y WAN.\n\n[lightgray]Nota: No hay una lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP.
-hostserver = Abrir Partida
-invitefriends = Invitar Amigos
-hostserver.mobile = Abrir\nPartida
-host = Servidor
+host.info = El botón [accent]Abrir partida[] abrirá la partida en el puerto [scarlet]6567[]. \nCualquiera en la misma [lightgray]red local[] debería poder ver tu partida en su lista de servidores.\n\nSi quieres que se puedan conectar desde cualquier lugar mediante IP, se requiere configurar la [accent]asignación de puertos[].\n\n[lightgray]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu cortafuegos. Ten en cuenta que las redes públicas a veces no permiten descubrir servidores en la red.
+join.info = Aquí, puedes encontrar partidas de servidores [accent]públicos[] o en tu [accent]red local[] a las que unirte, o conectarte a un servidor mediante su [accent]dirección IP[]. \nEs posible jugar Multijugador en LAN y WAN.\n\n[lightgray]Si quieres conectarte con alguien mediante su dirección IP, necesitarás preguntarle su IP pública, la cual se puede obtener buscando "mi ip" desde la red del anfitrión.
+hostserver = Abrir partida multijugador
+invitefriends = Invitar amigos
+hostserver.mobile = Abrir partida multijugador
+host = Abrir partida
 hosting = [accent]Abriendo servidor...
 hosts.refresh = Actualizar
-hosts.discovering = Buscando partidas en LAN...
+hosts.discovering = Buscando partidas en LAN
 hosts.discovering.any = Buscando partidas
-server.refreshing = Actualizando servidor...
-hosts.none = [lightgray]No se han encontrado partidas en LAN
-host.invalid = [scarlet]No se pudo conectar con el anfitrión
+server.refreshing = Actualizando servidor
+hosts.none = [lightgray]¡No se han encontrado partidas en tu red local!
+host.invalid = [scarlet]No se puede conectar al anfitrión.
 
-servers.local = Servidores Locales
-servers.remote = Servidores Remotos
-servers.global = Servidores de la Comunidad
+servers.local = Servidores locales
+servers.local.steam = Partidas públicas y servidores locales
+servers.remote = Servidores remotos
+servers.global = Servidores de la comunidad
 
 servers.disclaimer = Los servidores de la comunidad [accent]no[] son propiedad del desarrollador, ni administrados por el mismo.\n\nLos servidores podrían tener contenido generado por los usuarios no apropiado para todas las edades.
 servers.showhidden = Mostrar servidores ocultos
 server.shown = Visibles
 server.hidden = Ocultos
+viewplayer = Viendo al jugador: [accent]{0}
 
 trace = Rastrear Jugador
-trace.playername = Nombre de jugador: [accent]{0}
+trace.playername = Nombre del jugador: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = ID Única: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Cliente de móvil: [accent]{0}
-trace.modclient = Cliente Personalizado: [accent]{0}
-invalidid = ¡ID de cliente inválida! Por favor, envía un informe del error.
-server.bans = Expulsiones
-server.bans.none = No se ha baneado a ningún usuario aún
+trace.modclient = Cliente personalizado: [accent]{0}
+trace.times.joined = Se ha unido [accent]{0} []veces
+trace.times.kicked = Fue expulsado [accent]{0} []veces
+trace.ips = IPs:
+trace.names = Names:
+invalidid = ¡ID de cliente no válida! Puedes enviar un informe reportando el error.
+player.ban = Ban
+player.kick = Expulsar
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Cambiar equipo
+server.bans = Vetos
+server.bans.none = ¡No se ha vetado a ningún usuario!
 server.admins = Administradores
 server.admins.none = ¡No hay ningún administrador!
-server.add = Agregar Servidor
-server.delete = ¿Estás seguro de querer borrar este servidor?
+server.add = Agregar servidor
+server.delete = ¿Realmente quieres borrar este servidor?
 server.edit = Editar Servidor
-server.outdated = [crimson]¡Servidor desactualizado![]
-server.outdated.client = [crimson]¡Cliente desactualizado![]
-server.version = [lightgray]Versión: {0}
+server.outdated = [scarlet]¡Servidor Desactualizado![]
+server.outdated.client = [scarlet]¡Cliente Desactualizado![]
+server.version = [gray]v{0} {1}
 server.custombuild = [accent]Versión personalizada
-confirmban = ¿Quieres banear a este jugador?
-confirmkick = ¿Estás seguro de querer expulsar este jugador?
-confirmvotekick = ¿Estás de acuerdo en expulsar este jugador?
-confirmunban = ¿Quieres desbanear a este jugador?
-confirmadmin = ¿Quieres hacer administrador a este jugador?
-confirmunadmin = ¿Quieres quitar los permisos de administrador a este jugador?
-joingame.title = Unirse a Partida
-joingame.ip = IP:
+confirmban = ¿Quieres vetar a "{0}[white]"?
+confirmkick = ¿Quieres expulsar a "{0}[white]"?
+confirmunban = ¿Quieres quitar el veto a este jugador?
+confirmadmin = ¿Quieres hacer administrador a "{0}[white]"?
+confirmunadmin = ¿Quieres quitarle los permisos de administrador a "{0}[white]"?
+votekick.reason = Razón del Voto de Expulsión
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
+joingame.title = Unirse a una Partida
+joingame.ip = Dirección IP:
 disconnect = Desconectado.
-disconnect.error = Error en la conexión.
+disconnect.error = Error de conexión.
 disconnect.closed = Conexión cerrada.
 disconnect.timeout = Tiempo de espera agotado.
-disconnect.data = ¡Hubo un fallo con la carga de datos!
+disconnect.data = ¡Hubo un fallo al cargar los datos!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = No es posible unirse a la partida ([accent]{0}[]).
 connecting = [accent]Conectando...
 reconnecting = [accent]Reconectado...
 connecting.data = [accent]Cargando datos del mundo...
 server.port = Puerto:
-server.addressinuse = ¡La dirección ya está en uso!
 server.invalidport = ¡El número de puerto no es valido!
-server.error = [crimson]Error al crear el servidor: error [accent]{0}
-save.new = Nuevo Punto de Guardado
-save.overwrite = ¿Estás seguro de querer sobrescribir\neste punto de guardado?
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [scarlet]Error alojando el servidor.
+save.new = Nuevo archivo de guardado
+save.overwrite = ¿Quieres sobrescribir\neste guardado?
+save.nocampaign = Los archivos individuales guardados de la campaña no se pueden importar.
 overwrite = Sobrescribir
-save.none = ¡No se ha encontrado ningún punto de guardado!
+save.none = ¡No se ha encontrado ningún archivo de guardado!
 savefail = ¡No se ha podido guardar la partida!
-save.delete.confirm = ¿Estás seguro de querer borrar este punto de guardado?
+save.delete.confirm = ¿Quieres borrar este punto de guardado?
 save.delete = Borrar
-save.export = Exportar Punto de Guardado
-save.import.invalid = [accent]¡Este punto de guardado es inválido!
-save.import.fail = [crimson]La importación del punto de guardado ha fallado: error [accent]{0}
-save.export.fail = [crimson]La exportación del punto de guardado ha fallado: error [accent]{0}
-save.import = Importar Punto de Guardado
-save.newslot = Nombre del Punto de Guardado:
+save.export = Exportar archivo de guardado
+save.import.invalid = [accent]¡Este archivo no es válido!
+save.import.fail = [scarlet]Hubo un fallo al importar el archivo de guardado: [accent]{0}
+save.export.fail = [scarlet]Ha fallado la exportación del guardado: [accent]{0}
+save.import = Importar guardado
+save.newslot = Nombre del archivo de guardado:
 save.rename = Renombrar
 save.rename.text = Nuevo nombre:
-selectslot = Selecciona un Punto de Guardado.
+selectslot = Selecciona un archivo de guardado.
 slot = [accent]Hueco {0}
-editmessage = Editar mensaje
-save.corrupted = [accent]¡El punto de guardado está corrupto o es inválido!\nSi acabas de actualizar el juego, probablemente se deba a un cambio en el formato de guardado y[scarlet] no[] un a error.
+editmessage = Editar Mensaje
+save.corrupted = [accent]¡Archivo de guardado corrupto o inválido!
 empty = <vacío>
 on = ON
 off = OFF
+save.search = Buscar partidas guardadas...
 save.autosave = Autoguardado: {0}
 save.map = Mapa: {0}
 save.wave = Oleada {0}
-save.mode = Modo de Juego: {0}
-save.date = Última vez guardado: {0}
+save.mode = Modo de juego: {0}
+save.date = Último guardado: {0}
 save.playtime = Tiempo de juego: {0}
-warning = Aviso
+warning = Aviso.
 confirm = Confirmar
 delete = Borrar
-view.workshop = Ver en el Steam Workshop
+view.workshop = Ver en Steam Workshop
 workshop.listing = Editar el listado del Worshop
 ok = OK
 open = Abrir
-customize = Personalizar
+customize = Personalizar reglas
 cancel = Cancelar
-openlink = Abrir Enlace
-copylink = Copiar Enlace
+command = Comandar
+command.queue = [lightgray][Queuing]
+command.mine = Minar
+command.repair = Reparar
+command.rebuild = Reconstruir
+command.assist = Asistir al jugador
+command.move = Moverse
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
+openlink = Abrir enlace
+copylink = Copiar enlace
 back = Atrás
-crash.export = Exportar Registros de errores
-crash.none = No se encontraron Registros de errores.
+max = Máximo
+objective = Objetivo del mapa
+crash.export = Exportar registros de errores
+crash.none = No se encontraron registros de errores.
 crash.exported = Registros de errores exportados.
-data.export = Exportar Datos
-data.import = Importar Datos
-data.openfolder = Abrir Carpeta de Datos
+data.export = Exportar datos
+data.import = Importar datos
+data.openfolder = Abrir carpeta de datos
 data.exported = Datos exportados.
-data.invalid = Esta data del juego no es valida.
-data.import.confirm = Importando los datos externos borrará[scarlet] todo[] tu progreso.\n[accent]Esto no se puede rehacer![]\n\nUna vez que los datos hayan sido importados, el juego saldrá automaticamente.
-quit.confirm = ¿Quieres salir de la partida?
-quit.confirm.tutorial = ¿Estás seguro de que sabes qué estas haciendo?\nSe puede hacer el tutorial de nuevo en[accent] Ajustes->Juego->Volver a hacer tutorial.[]
+data.invalid = Estos no son datos de juego válidos.
+data.import.confirm = Importar datos externos sobrescribirá[scarlet] todo[] tu progreso.\n[accent]¡Esto no se puede deshacer![]\n\nUna vez se importen los datos, el juego se cerrará automáticamente.
+quit.confirm = ¿Quieres salir?
 loading = [accent]Cargando...
-reloading = [accent]Recargando mods...
+downloading = [accent]Descargando...
 saving = [accent]Guardando...
 respawn = [accent][[{0}][] para reaparecer en el núcleo
-cancelbuilding = [accent][[{0}][] para limpiar el plan
-selectschematic = [accent][[{0}][] para seleccionar+copiar
+cancelbuilding = [accent][[{0}][] para cancelar la construcción
+selectschematic = [accent][[{0}][] para seleccionar + copiar
 pausebuilding = [accent][[{0}][] para pausar la construcción
 resumebuilding = [scarlet][[{0}][] para reanudar la construcción
-showui = Interfaz oculta.\nPulsa [accent][[{0}][] para volver a mostrar la Interfaz.
+enablebuilding = [scarlet][[{0}][] para activar la construcción
+showui = Interfaz oculta.\nPulsa [accent][[{0}][] para volver a mostrarla.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Oleada {0}
 wave.cap = [accent]Oleada {0}/{1}
-wave.waiting = Oleada en {0}
+wave.waiting = [lightgray]Próxima en {0}
 wave.waveInProgress = [lightgray]Oleada en progreso
-waiting = Esperando...
+waiting = [lightgray]Esperando...
 waiting.players = Esperando jugadores...
-wave.enemies = [lightgray]{0} Enemigos Restantes
-wave.enemycores = [accent]{0}[lightgray] Núcleos enemigos
-wave.enemycore = [accent]{0}[lightgray] Núcleo enemigo
+wave.enemies = [lightgray]{0} Enemigos restantes
+wave.enemycores = [accent]{0}[lightgray] núcleos enemigos
+wave.enemycore = [accent]{0}[lightgray] núcleo enemigo
 wave.enemy = [lightgray]{0} Enemigo Restante
 wave.guardianwarn = El Guardián llegará en [accent]{0}[] oleadas.
-wave.guardianwarn.one = El Guardián se aproxima... [accent]{0}[] oleada restante.
-loadimage = Cargar Imagen
-saveimage = Guardar Imagen
+wave.guardianwarn.one = El Guardián llegará en [accent]{0}[] oleada.
+loadimage = Cargar imagen
+saveimage = Guardar imagen
 unknown = Desconocido
 custom = Personalizado
 builtin = Incorporado
-map.delete.confirm = ¿Quieres borrar este mapa? ¡Recuerda que esta acción no se puede deshacer!
-map.random = [accent]Mapa Aleatorio
-map.nospawn = ¡Este mapa no tiene ningún núcleo en que pueda aparecer el jugador! Agrega un núcleo[accent] naranja[] al mapa con el editor.
-map.nospawn.pvp = ¡Este mapa no tiene ningún núcleo enemigo para que aparezcan otros jugadores! Añade un núcleo[scarlet] "de otro color"[] a este mapa en el editor.
-map.nospawn.attack = ¡Este mapa no tiene núcleos a los que los jugadores deban atacar! Añade núcleos[scarlet] rojos[] a este mapa en el editor.
-map.invalid = Error cargando el mapa: archivo corrupto o inválido.
+map.delete.confirm = ¿Quieres borrar este mapa? ¡Esta acción no se puede deshacer!
+map.random = [accent]Mapa aleatorio
+map.nospawn = ¡Este mapa no tiene ningún núcleo para que aparezca el jugador! Agrega un núcleo {0} al mapa desde el editor.
+map.nospawn.pvp = ¡Este mapa no tiene ningún núcleo enemigo donde puedan aparecer otros jugadores! Añade un núcleo [scarlet]de otro color[] a este mapa en el editor.
+map.nospawn.attack = ¡Este mapa no tiene ningún núcleo enemigo al que los jugadores deban atacar! Añade núcleos {0} a este mapa desde el editor.
+map.invalid = Error cargando el mapa: Archivo de mapa corrupto o no válido.
 workshop.update = Actualizar artículo
 workshop.error = Error al obtener detalles del Steam Workshop: {0}
-map.publish.confirm = ¿Deseas publicar este mapa?\n\n[lightgray]¡Asegúrate de aceptar primero el EULA del Steam Workshop, o tus mapas no aparecerán!
+map.publish.confirm = ¿Deseas publicar este mapa?\n\n[lightgray]¡Asegúrate de aceptar primero el EULA de Steam Workshop, o tus mapas no aparecerán!
 workshop.menu = Selecciona lo que quieres hacer con este artículo.
 workshop.info = Información del artículo
-changelog = Lista de cambios (optional):
+changelog = Cambios de actualización (opcional):
+updatedesc = Sobrescribir título y descripción
 eula = EULA de Steam
-missing = Este artículo ha sido movido o eliminado.\n[lightgray]La lista del Workshop se ha desvinculado automáticamente.
+missing = Este artículo ha sido movido o eliminado.\n[lightgray]La lista de Workshop se ha desvinculado automáticamente.
 publishing = [accent]Publicando...
-publish.confirm = ¿Estás seguro de que quieres publicar esto?\n\n[lightgray]¡Asegúrate de aceptar primero el EULA del Steam Workshop, o tus artículos no aparecerán!
+publish.confirm = ¿Quieres publicar esto?\n\n[lightgray]¡Asegúrate de aceptar primero el EULA de Steam Workshop, o tus artículos no aparecerán!
 publish.error = Error publicando el artículo: {0}
 steam.error = Error al inicializar los servicios de Steam.\nError: {0}
 
+editor.planet = Planeta:
+editor.sector = Sector:
+editor.seed = Semilla de generación:
+editor.cliffs = Convertir paredes en colinas
 editor.brush = Pincel
-editor.openin = Abrir en el Editor
-editor.oregen = Generación de Minerales
-editor.oregen.info = Generación de Minerales:
-editor.mapinfo = Info del Mapa
+editor.openin = Abrir en el editor
+editor.oregen = Generación de minerales
+editor.oregen.info = Generación de minerales:
+editor.mapinfo = Información del mapa
 editor.author = Autor:
 editor.description = Descripción:
 editor.nodescription = Un mapa debe tener una descripción de al menos 4 caracteres antes de ser publicado.
 editor.waves = Oleadas:
 editor.rules = Normas:
 editor.generation = Generación:
-editor.ingame = Editar dentro del juego
-editor.publish.workshop = Publicar en el Steam Workshop
-editor.newmap = Nuevo Mapa
+editor.objectives = Objetivos
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
+editor.ingame = Editar desde la nave
+editor.playtest = Probar mapa
+editor.publish.workshop = Publicar en Steam Workshop
+editor.newmap = Nuevo mapa
 editor.center = Centrar
+editor.search = Buscar mapas...
+editor.filters = Filtrar mapas
+editor.filters.mode = Modos de juego:
+editor.filters.type = Tipo de mapa:
+editor.filters.search = Buscar en:
+editor.filters.author = Autor
+editor.filters.description = Descripción
+editor.shiftx = Trasladar X
+editor.shifty = Trasladar Y
 workshop = Steam Workshop
 waves.title = Oleadas
 waves.remove = Borrar
-waves.never = <nunca>
 waves.every = cada
 waves.waves = oleada(s)
-waves.perspawn = por lugar de aparición
-waves.shields = escudo/oleadas
+waves.health = vida: {0}%
+waves.perspawn = por zona de aparición
+waves.shields = escudos/oleada
 waves.to = hasta
+waves.spawn = generar:
+waves.spawn.all = <todo>
+waves.spawn.select = Seleccionar zona de aparición
+waves.spawn.none = [scarlet]No se encontraron zonas de aterrizaje en el mapa
+waves.max = máximo de unidades
 waves.guardian = Guardián
 waves.preview = Vista previa
 waves.edit = Editar...
-waves.copy = Copiar al Portapapeles
-waves.load = Cargar del Portapapeles
-waves.invalid = Oleadas inválidaas en el portapapeles.
+waves.random = Random
+waves.copy = Copiar al portapapeles
+waves.load = Cargar del portapapeles
+waves.invalid = Los ajustes de oleadas copiados en el portapapeles no son válidos.
 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.
+waves.none = No se han definido enemigos.\nLas listas de oleadas vacías se sustituirán automáticamente por el esquema por defecto.
+waves.sort = Ordenar por
+waves.sort.reverse = Invertir orden
+waves.sort.begin = Inicio
+waves.sort.health = Vida
+waves.sort.type = Tipo
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Ocultar todo
+waves.units.show = Mostrar todo
 
-#Estos están en minúscula intencionadamente.
+#estos están en minúscula intencionalmente
 wavemode.counts = limitadas
 wavemode.totals = totales
 wavemode.health = por salud
+all = All
 
 editor.default = [lightgray]<Por defecto>
 details = Detalles...
 edit = Editar...
+variables = Variables
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Nombre:
-editor.spawn = Aparecer unidad
-editor.removeunit = Borrar Unidad
+editor.spawn = Generar unidad
+editor.removeunit = Eliminar unidad
 editor.teams = Equipos
-editor.errorload = Error cargando el archivo:\n[accent]{0}
-editor.errorsave = Error guardando el archivo:\n[accent]{0}
-editor.errorimage = Eso es una imagen, no un mapa. No cambies las extensiones del archivo esperando que funcione.\nSi quieres importar un mapa viejo, usa el botón de 'import legacy map' (importar mapa heredado) en el editor.
-editor.errorlegacy = Este mapa es demasiado viejo y usa un formato de mapa que ya no esta soportado.
+editor.errorload = Error cargando el archivo.
+editor.errorsave = Error guardando el archivo.
+editor.errorimage = Eso es una imagen, no un mapa.
+editor.errorlegacy = Este mapa es demasiado antiguo y usa un formato obsoleto.
 editor.errornot = Esto no es un fichero de mapa.
-editor.errorheader = Este mapa es inválido o está corrupto.
-editor.errorname = El mapa no tiene un nombre definido.
+editor.errorheader = Este mapa no es válido o está corrupto.
+editor.errorname = El mapa no tiene un nombre definido. ¿Estás intentando cargar un fichero de guardado?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Actualizar
-editor.randomize = Aleatorio
+editor.randomize = Aleatorizar
+editor.moveup = Subir
+editor.movedown = Bajar
+editor.copy = Copiar
 editor.apply = Aplicar
-editor.generate = Generar
-editor.resize = Cambiar Tamaño
-editor.loadmap = Cargar Mapa
-editor.savemap = Guardar Mapa
+editor.generate = Generación
+editor.sectorgenerate = Generación de sector
+editor.resize = Redimensionar
+editor.loadmap = Cargar mapa
+editor.savemap = Guardar mapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = ¡Guardado!
-editor.save.noname = ¡Tu mapa no tiene un nombre! Pon uno en el menú 'Info del Mapa'.
+editor.save.noname = ¡Tu mapa no tiene un nombre! Ponle uno en el menú "Info del Mapa".
 editor.save.overwrite = ¡Tu mapa sobrescribe uno ya incorporado! Elige un nombre diferente en el menú 'Info del Mapa'.
-editor.import.exists = [scarlet]¡No se ha podido importar:[] ya existe un mapa incorporado con el nombre '{0}'!
+editor.import.exists = [scarlet]No se ha podido importar:[] ¡Ya existe un mapa por defecto con el nombre '{0}'!
 editor.import = Importar...
-editor.importmap = Importar Mapa
+editor.importmap = Importar mapa
 editor.importmap.description = Importar un mapa ya existente
-editor.importfile = Importar Archivo
-editor.importfile.description = Importar un archivo externo del mapa
-editor.importimage = Importar Imagen del Terreno
-editor.importimage.description = Importar archivo externo de imagen del mapa
+editor.importfile = Importar archivo
+editor.importfile.description = Importar un archivo de mapa externo
+editor.importimage = Importar archivo de imagen de mapa
+editor.importimage.description = Importar un archivo de imagen de mapa externo
 editor.export = Exportar...
-editor.exportfile = Exportar Archivo
-editor.exportfile.description = Exportar archivo del mapa
-editor.exportimage = Exportar Imagen del Terreno
-editor.exportimage.description = Exportar archivo de imagen del mapa
-editor.loadimage = Importar Terreno
-editor.saveimage = Exportar Terreno
-editor.unsaved = [scarlet]¡Tienes cambios sin guardar![]\n¿Estás seguro de querer salir?
-editor.resizemap = Cambiar Tamaño del Mapa
-editor.mapname = Nombre del Mapa:
+editor.exportfile = Exportar archivo
+editor.exportfile.description = Exportar archivo de mapa
+editor.exportimage = Exportar imagen del terreno
+editor.exportimage.description = Exportar un archivo de imagen del mapa que sólo contiene el terreno básico
+editor.loadimage = Importar terreno
+editor.saveimage = Exportar terreno
+editor.unsaved = ¿Quieres salir del editor?\n[scarlet]Se perderá cualquier cambio no guardado.
+editor.resizemap = Cambiar tamaño del mapa
+editor.mapname = Nombre del mapa:
 editor.overwrite = [accent]¡Advertencia!\nEsto sobrescribe un mapa ya existente.
-editor.overwrite.confirm = [scarlet]¡Advertencia![] Un mapa con ese nombre ya existe. ¿Estás seguro de querer sobrescribirlo?
-editor.exists = Un mapa con estre nombre ya existe.
+editor.overwrite.confirm = [scarlet]¡Advertencia![] Ya existe un mapa con este nombre. ¿Quieres sobrescribirlo?\n"[accent]{0}[]"
+editor.exists = Ya existe un mapa con este nombre.
 editor.selectmap = Selecciona un mapa para cargar:
 
-toolmode.replace = Sustituir
-toolmode.replace.description = Solo dibuja en bloques sólidos.
-toolmode.replaceall = Sustituir Todo
+toolmode.replace = Reemplazar
+toolmode.replace.description = Dibuja en bloques sólidos.
+toolmode.replaceall = Reemplazar todo
 toolmode.replaceall.description = Sustituye todos los bloques del mapa.
-toolmode.orthogonal = Perpendicular
-toolmode.orthogonal.description = Solo dibuja líneas ortogonales.
+toolmode.orthogonal = Ortogonal
+toolmode.orthogonal.description = Dibuja líneas ortogonales.
 toolmode.square = Cuadrado
-toolmode.square.description = Pincel cuadrado.
-toolmode.eraseores = Borrar Vetas
-toolmode.eraseores.description = Solo borra vetas.
-toolmode.fillteams = Rellenar Equipos
+toolmode.square.description = Puntero cuadrado.
+toolmode.eraseores = Borrar minerales
+toolmode.eraseores.description = Solo borra minerales.
+toolmode.fillteams = Rellenar equipos
 toolmode.fillteams.description = Rellena equipos en lugar de bloques.
-toolmode.drawteams = Dibujar Equipos
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
+toolmode.drawteams = Dibujar equipos
 toolmode.drawteams.description = Dibuja equipos en lugar de bloques.
+#no usados
+toolmode.underliquid = Bajo líquidos
+toolmode.underliquid.description = Dibuja suelos bajo bloques con líquidos.
 
 filters.empty = [lightgray]¡No hay filtros! Añade uno con el botón de abajo.
-filter.distort = Distorsionar
+
+filter.distort = Distorsión
 filter.noise = Ruido
 filter.enemyspawn = Punto de aparición enemigo
-filter.spawnpath = Ruta hasta el punto de aterrizaje
-filter.corespawn = Elegir Núcleo
-filter.median = Calcular probabilidades de generación
-filter.oremedian = Probabilidad de vetas
-filter.blend = Mezclar
-filter.defaultores = Vetas por defecto
-filter.ore = Vetas de Minerales
-filter.rivernoise = Añadir Río
+filter.spawnpath = Ruta hasta el punto de aparición
+filter.corespawn = Elegir núcleo
+filter.median = Mediana
+filter.oremedian = Mediana de minerales
+filter.blend = Combinar
+filter.defaultores = Minerales por defecto
+filter.ore = Vetas de minerales
+filter.rivernoise = Generación de ríos
 filter.mirror = Espejo
 filter.clear = Despejar
 filter.option.ignore = Ignorar
-filter.scatter = Dispersar
+filter.scatter = Dispersión
 filter.terrain = Terreno
+filter.logic = Logic
+
 filter.option.scale = Escala
 filter.option.chance = Probabilidad
 filter.option.mag = Magnitud
 filter.option.threshold = Umbral
 filter.option.circle-scale = Escala del círculo
 filter.option.octaves = Continuidad
-filter.option.falloff = Aterrizaje
+filter.option.falloff = Caída
 filter.option.angle = �ngulo
+filter.option.tilt = Inclinación
+filter.option.rotate = Rotación
 filter.option.amount = Cantidad
 filter.option.block = Bloque
 filter.option.floor = Suelo
 filter.option.flooronto = Suelo objetivo
-filter.option.target = Target
+filter.option.target = Objetivo
+filter.option.replacement = Reemplazo
 filter.option.wall = Muro
-filter.option.ore = Veta
+filter.option.ore = Mineral
 filter.option.floor2 = Terreno secundario
 filter.option.threshold2 = Umbral secundario
 filter.option.radius = Radio
-filter.option.percentile = Porcentaje
+filter.option.percentile = Percentil
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Ancho:
 height = Alto:
 menu = Menú
 play = Jugar
-campaign = Continuar Campaña
+campaign = Campaña
 load = Cargar
 save = Guardar
 fps = FPS: {0}
-ping = Ping: {0} ms
+ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
-language.restart = Reinicia el juego para que los cambios en el idioma tengan efecto.
+language.restart = Reinicia el juego para que los cambios de idioma tengan efecto.
 settings = Ajustes
 tutorial = Tutorial
 tutorial.retake = Volver a jugar el tutorial
 editor = Editor
-mapeditor = Editor de Mapas
+mapeditor = Editor de mapas
 
 abandon = Abandonar
 abandon.text = Esta zona y sus recursos se perderán ante el enemigo.
 locked = Bloqueado
-complete = [lightgray]Completado:
-requirement.wave = Alcanzar la oleada {0} en {1}
+complete = [lightgray]Requiere:
+requirement.wave = Superar la oleada {0} en {1}
 requirement.core = Destruir el núcleo enemigo en {0}
 requirement.research = Investigar {0}
+requirement.produce = Producir {0}
 requirement.capture = Capturar {0}
-bestwave = [lightgray]Récord: {0}
+requirement.onplanet = Dominar sector de {0}
+requirement.onsector = Aterrizar en el sector: {0}
 launch.text = Lanzar
-research.multiplayer = Solo el anfitrión de la partida puede \nrealizar investigaciones tecnologías.
-map.multiplayer = Solo el anfitrión de la partida puede ver los sectores del mapa.
+map.multiplayer = Solo el anfitrión de la partida puede ver los sectores del planeta.
 uncover = Descubrir
 configure = Configurar carga inicial
 
-loadout = Carga Inicial
+objective.research.name = Investigar
+objective.produce.name = Obtener
+objective.item.name = Conseguir objetos
+objective.coreitem.name = Almacenar en el núcleo
+objective.buildcount.name = Construir estructuras
+objective.unitcount.name = Unidades activas
+objective.destroyunits.name = Destruir unidades
+objective.timer.name = Tiempo límite
+objective.destroyblock.name = Destruir bloque
+objective.destroyblocks.name = Destruir bloques
+objective.destroycore.name = Destruir núcleo
+objective.commandmode.name = Modo comando
+objective.flag.name = Bandera
+
+marker.shapetext.name = Forma del texto
+marker.point.name = Point
+marker.shape.name = Forma
+marker.text.name = Texto
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+
+marker.background = Fondo
+marker.outline = Bordes
+
+objective.research = [accent]Investiga:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Consigue:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destruye:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destruye: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Recolecta: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Almacena en el núcleo:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Construye: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Ensambla unidades: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destruye: [][lightgray]{0}[]x Unidades
+objective.enemiesapproaching = [accent]Se aproximan enemigos a [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destruye el núcleo enemigo
+objective.command = [accent]Dirige unidades
+objective.nuclearlaunch = [accent]âš  Lanzamiento nuclear detectado: [lightgray]{0}
+
+announce.nuclearstrike = [red]âš  IMPACTO NUCLEAR INMINENTE âš 
+
+loadout = Carga inicial
 resources = Recursos
+resources.max = Max
 bannedblocks = Bloques prohibidos
+unbannedblocks = Unbanned Blocks
+objectives = Objetivos
+bannedunits = Unidades prohibidas
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Sólo permitir unidades seleccionadas
+bannedblocks.whitelist = Sólo permitir bloques seleccionados
 addall = Añadir todo
 launch.from = Lanzando desde: [accent]{0}
+launch.capacity = Capacidad de objetos por envío: [accent]{0}
 launch.destination = Destino: {0}
-configure.invalid = La cantidad debe estar entre 0 y {0}.
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = La cantidad debe ser un número entre 0 y {0}.
 add = Añadir...
-boss.health = Guardián
+guardian = Guardián
 
-connectfail = [crimson]Ha fallado la conexión con el servidor: [accent]{0}
-error.unreachable = Servidor inaccesible.
-error.invalidaddress = Dirección inválida.
-error.timedout = ¡Se acabó el tiempo!\n¡Asegúrate que el host ha hecho el port forwarding, y que la dirección es correcta!
-error.mismatch = Error de paquete:\nposible versión no válida del servidor/cliente.\nAsegúrate de que tú y el host tenéis la última versión de Mindustry.
+connectfail = [scarlet]Error de conexión:\n\n[accent]{0}
+error.unreachable = Servidor inaccesible.\n¿Está la dirección IP escrita correctamente?
+error.invalidaddress = Dirección no válida.
+error.timedout = ¡Tiempo de espera agotado!\n¡Asegúrate de que el host ha configurado la asignación de puertos y que la dirección es correcta!
+error.mismatch = Error de paquete:\nPosible conflicto entre las versiones servidor/cliente.\n¡Asegúrate de que el anfitrión y tú tenéis la última versión de Mindustry!
 error.alreadyconnected = Ya estás conectado.
 error.mapnotfound = ¡Archivo de mapa no encontrado!
 error.io = Error I/O de conexión.
 error.any = Error de red desconocido.
 error.bloom = Error al cargar el efecto de bloom.\nPuede que tu dispositivo no sea compatible con esta característica.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Lluvia
-weather.snow.name = Nieve
+weather.snowing.name = Nieve
 weather.sandstorm.name = Tormenta de arena
 weather.sporestorm.name = Tormenta de esporas
 weather.fog.name = Niebla
+campaign.playtime = \uf129 [lightgray]Tiempo en el sector: {0}
+campaign.complete = [accent]Enhorabuena.\n\nEl enemigo en {0} ha sido derrotado.\n[lightgray]El sector final ha sido conquistado.
 
-sectors.unexplored = [lightgray]No explorado
+sectorlist = Sectores
+sectorlist.attacked = {0} Bajo ataque
+sectors.unexplored = [lightgray]Inexplorado
 sectors.resources = Recursos:
 sectors.production = Producción:
-sectors.export = Exportado:
+sectors.export = Exportaciones:
+sectors.import = Importaciones:
 sectors.time = Tiempo:
 sectors.threat = Amenaza:
 sectors.wave = Oleada:
 sectors.stored = Almacenado:
 sectors.resume = Reanudar
 sectors.launch = Lanzar
-sectors.select = Elegir
-sectors.nonelaunch = [lightgray]Ninguno (Sol)
+sectors.select = Seleccionar
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]Ninguno (sol)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Renombrar sector
 sectors.enemybase = [scarlet]Base enemiga
 sectors.vulnerable = [scarlet]Vulnerable
 sectors.underattack = [scarlet]¡Bajo ataque! [accent]{0}% dañado
-sectors.survives = [accent]Sobrevive {0} oleadas
+sectors.underattack.nodamage = [scarlet]No capturado
+sectors.survives = [accent]Aguantará {0} oleadas más
 sectors.go = Ir
-sector.curcapture = Sector Capturado
-sector.curlost = Sector Perdido
-sector.missingresources = [scarlet]Recursos Insuficientes
-sector.attacked = Sector [accent]{0}[white] bajo ataque[]!
-sector.lost = ¡Sector [accent]{0}[white] perdido[]!
-#nota: el espacio en blanco en la línea siguiente es intencionado
-sector.captured = ¡Sector [accent]{0}[white] capturado[]!
+sector.abandon = Abandonar
+sector.abandon.confirm = Los núcleos de este sector se auto-destruirán.\n¿Continuar?
+sector.curcapture = Sector capturado
+sector.curlost = Sector perdido
+sector.missingresources = [scarlet]Recursos insuficientes en el núcleo
+sector.attacked = ¡Sector [accent]{0}[white] bajo ataque!
+sector.lost = ¡Sector [accent]{0}[white] perdido!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Cambiar icono
+sector.noswitch.title = No se pueden cambiar los sectores
+sector.noswitch = Tal vez no puedas cambiar de sector mientras se encuentre bajo ataque.\n\nSector: [accent]{0}[] en [accent]{1}[]
+sector.view = Ver sector
 
 threat.low = Baja
 threat.medium = Media
 threat.high = Alta
 threat.extreme = Extrema
-threat.eradication = Exterminio
+threat.eradication = Erradicación
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = Planetas
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sol
 
 sector.impact0078.name = Impacto 0078
-sector.groundZero.name = Zona de impacto
+sector.groundZero.name = Zona de Impacto
 sector.craters.name = Los Cráteres
 sector.frozenForest.name = Bosque Congelado
 sector.ruinousShores.name = Costas Ruinosas
-sector.stainedMountains.name = Montañas manchadas
-sector.desolateRift.name = Grieta desolada
-sector.nuclearComplex.name = Complejo de producción nuclear
-sector.overgrowth.name = Crecimiento excesivo
-sector.tarFields.name = Campos de alquitrán
-sector.saltFlats.name = Llanuras de sal
-sector.fungalPass.name = Paso de hongos
+sector.stainedMountains.name = Montañas Manchadas
+sector.desolateRift.name = Grieta Desolada
+sector.nuclearComplex.name = Complejo de Producción Nuclear
+sector.overgrowth.name = Claro Infestado
+sector.tarFields.name = Campos de Alquitrán
+sector.saltFlats.name = Salinas
+sector.fungalPass.name = Desfiladero Contaminado
 sector.biomassFacility.name = Centro de Sintetización de Biomasa
 sector.windsweptIslands.name = Islas Windswept
-sector.extractionOutpost.name = Puesto de avanzada de Extracción
+sector.extractionOutpost.name = Puesto avanzado de Extracción
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Terminal de Lanzamiento Interplanetario
+sector.coastline.name = Ruta Costera
+sector.navalFortress.name = Fortaleza Naval
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-sector.groundZero.description = La ubicación adecuada para empezar una vez más. Baja amenaza enemiga. Pocos recursos.\nReúna la mayor cantidad de plomo y cobre posible y sigue adelante.
-sector.frozenForest.description = Incluso aquí, más cerca de las montañas, las esporas se han extendido. Las gélidas temperaturas no las contendrán para siempre.\n\nAprende a usar la energía. Construye generadores de combustión. Aprende a usar reparadores.
-sector.saltFlats.description = En las afueras del desierto se encuentran las Salinas. No hay muchos recursos en esta ubicación.\n\nEl enemigo ha creado un complejo de almacenamiento de recursos aquí. Erradica su núcleo. No dejes nada en pie.
-sector.craters.description = El agua se ha acumulado en este cráter, reliquia de las viejas guerras. Recupera la zona. Recoge arena. Funde Metacristal. Bombea agua para enfriar torretas y taladros.
-sector.ruinousShores.description = Más allá de los páramos, se encuentra la costa. Una vez, esta ubicación albergó una serie de defensa costera. No queda mucho. Solo las estructuras de defensa más básicas han quedado ilesas, todo lo demás está reducido a chatarra.\nContinúa la expansión. Redescubre la tecnología.
-sector.stainedMountains.description = Más adentro se encuentran las montañas, aún intactas por las esporas.\nExtrae el abundante titanio de esta zona. Aprende a usarlo.\n\nLa presencia enemiga es mayor aquí. No les des tiempo para enviar sus unidades más fuertes.
-sector.overgrowth.description = El área está cubierta de maleza, más cerca de la fuente de las esporas.\nEl enemigo ha establecido un puesto de avanzada aquí. Construye unidades Titán. Destruyelo. Recupera lo que se perdió.
-sector.tarFields.description = Las afueras de una zona de producción de petróleo, entre la montaña y el desierto. Una de las pocas áreas con reservas de alquitrán utilizables.\nAunque está abandonada, esta zona tiene algunas fuerzas enemigas peligrosas cerca. No los subestimes.\n\n[lightgray]Investiga la tecnología de procesamiento de petróleo si es posible.
-sector.desolateRift.description = Una zona extremadamente peligrosa. Recursos abundantes, pero poco espacio. Alto riesgo de destrucción. Abandona el lugar lo antes posible. No te dejes engañar por el intervalo entre los ataques enemigos.
-sector.nuclearComplex.description = Antigua instalación de producción y procesamiento de torio, reducida a ruinas.\n[lightgray] Investiga el torio y sus múltiples usos.\n\nEl enemigo está presente aquí,superando en número a sus atacantes.
-sector.fungalPass.description = Un área de transición entre montañas y las tierras bajas, plagadas de esporas. Aquí se encuentra una pequeña base de reconocimiento enemiga.\nDestrúyela.\nUsa unidades Dagger y Crawler. Acaba con los dos núcleos.
-sector.biomassFacility.description = El origen de las esporas. Este es el centro en el que se investigaron, y donde fueron incialmente producidas.\nDescubre la tecnología restante que contiene. Cultiva esporas para producir combustible y plásticos.\n\n[lightgray]Nada en el ecosistema local pudo combatir semejante organismo tan invasivo, originado en este lugar.
-sector.windsweptIslands.description = Tras la costa, se encuentra esta remota cadena de islas. Las grabaciones muestran que aquí existieron estructuras relacionadas con la producción de [accent]Plastanio[].\n\nDefiéndete de las unidades navales enemigas. Establece una base en las islas. Investiga estas fábricas.
-sector.extractionOutpost.description = Una base remota, construida por el enemigo con el objetivo de lanzar recursos a otros sectores.\n\nLa tecnología de transporte de recursos entre sectores es esencial para conquistar a gran escala. Destruye la base. Investiga sus Plataformas de Lanzamiento.
-sector.impact0078.description = Aquí yacen las ruinas de la primera estación de transporte interestelar en estar operativa del sistema.\n\nRecupera todo lo posible de los escombros. Investiga cualquier tecnología intacta.
-sector.planetaryTerminal.description = El objetivo final.\n\nÉsta base costera alberga una estructura capaz de lanzar Núcleos a planeteas locales. Está extremadamente bien protegida.\n\nProduce unidades navales. Acaba con el enemigo lo antes posible. Analiza la estructura de lanzamiento.
+sector.groundZero.description = La ubicación adecuada para empezar una vez más. Baja amenaza enemiga. Pocos recursos.\nReúne la mayor cantidad de plomo y cobre posible y sigue adelante.
+sector.frozenForest.description = Incluso aquí, cerca de las montañas, se han extendido las esporas. Las gélidas temperaturas no las contendrán para siempre.\nDescubre la energía eléctrica. Construye generadores de combustión. Aprende a usar reparadores.
+sector.saltFlats.description = En los límites del desierto se encuentran las Salinas. No hay muchos recursos en esta ubicación.\n\nEl enemigo ha creado un complejo de almacenamiento de recursos aquí. Erradica su núcleo. No dejes nada en pie.
+sector.craters.description = El agua se ha acumulado en este cráter, reliquia de las antiguas guerras. Recupera la zona. Procesa la arena. Funde metacristal. Bombea agua para enfriar torretas y taladros.
+sector.ruinousShores.description = Más allá de los páramos, se encuentra la costa. Antaño, esta ubicación albergó todo un sistema de defensa costera. Ya no queda mucho de aquello. Solo las estructuras de defensa más básicas han quedado ilesas, todo lo demás está reducido a chatarra.\nContinúa la expansión. Redescubre la tecnología.
+sector.stainedMountains.description = Más allá se encuentran las montañas, aún intactas por las esporas.\nExtrae el titanio que abunda en esta zona. Aprende a usarlo.\n\nLa presencia enemiga es mayor aquí. No les des tiempo para enviar sus unidades más fuertes.
+sector.overgrowth.description = El área está cubierta de maleza, próxima a la fuente de las esporas.\nEl enemigo ha establecido un puesto de avanzada aquí. Construye unidades Mace. Destrúyelo.
+sector.tarFields.description = Las afueras de una zona de producción de petróleo, entre las montañas y el desierto. Una de las pocas áreas con reservas de alquitrán utilizables.\nAunque está abandonada, esta zona tiene algunos escuadrones enemigos peligrosos cerca. No los subestimes.\n\n[lightgray]Investiga la tecnología de procesamiento de petróleo si es posible.
+sector.desolateRift.description = Una zona extremadamente peligrosa. Recursos abundantes, y poco espacio. Alto riesgo de destrucción. Abandona el lugar lo antes posible. No te dejes engañar por el intervalo entre los ataques enemigos.
+sector.nuclearComplex.description = Antigua instalación de producción y procesamiento de torio, reducida a ruinas.\n[lightgray] Investiga el torio y sus múltiples usos.\n\nGrandes cantidades de unidades enemigas patrullan la zona constantemente.
+sector.fungalPass.description = Un área de transición entre las altas montañas y las tierras plagadas de esporas. Aquí se encuentra una pequeña base de reconocimiento enemiga.\nDestrúyela.\nUsa unidades Dagger y Crawler. Acaba con los dos núcleos.
+sector.biomassFacility.description = El origen de las esporas. Este es el centro en el que se investigaron, y donde fueron incialmente producidas.\nDescubre la tecnología restante que contiene. Cultiva esporas para producir combustibles y plásticos.\n\n[lightgray]Tras la caída de este complejo, las esporas fueron liberadas. Nada en este ecosistema local pudo combatir semejante organismo tan invasivo.
+sector.windsweptIslands.description = Más allá de la costa, se encuentra esta remota cadena de islas. Las grabaciones muestran que aquí existieron estructuras relacionadas con la producción de [accent]Plastanio[].\n\nDefiéndete de las unidades navales enemigas. Establece una base en las islas. Investiga estas fábricas.
+sector.extractionOutpost.description = Una base remota, construida por el enemigo con el propósito de lanzar recursos a otros sectores.\n\nLa tecnología de transporte de recursos entre sectores es esencial para la conquista a gran escala. Destruye la base. Investiga sus plataformas de lanzamiento.
+sector.impact0078.description = Aquí yacen las ruinas de la primera nave de transporte interestelar que entró en este sistema.\n\nRecupera todo lo posible entre los escombros. Investiga cualquier tecnología intacta.
+sector.planetaryTerminal.description = El objetivo final.\n\nEsta base costera alberga una estructura capaz de lanzar núcleos a planeteas locales. Está extremadamente bien protegida.\n\nProduce unidades navales. Acaba con el enemigo lo antes posible. Analiza la estructura de lanzamiento.
+sector.coastline.description = Se han detectado restos de tecnología de unidades navales en esta ubicación. Repele los ataques enemigos, captura este sector, y consigue esa tecnología.
+sector.navalFortress.description = El enemigo ha establecido una base en una remota isla naturalmente fortificada. Destruye este puesto de avanzada. Hazte con su tecnología naval avanzada, e investígala.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = El Inicio
+sector.aegis.name = Égida
+sector.lake.name = Lago
+sector.intersect.name = Intersección
+sector.atlas.name = Atlas
+sector.split.name = División
+sector.basin.name = Declive
+
+sector.marsh.name = Ciénaga
+sector.peaks.name = Cumbres
+sector.ravine.name = Precipicio
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Baluarte
+sector.crevice.name = Resquicio
+sector.siege.name = Cerco
+sector.crossroads.name = Encrucijada
+sector.karst.name = Kárstico
+sector.origin.name = Origen
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = Este sector contiene depósitos de tungsteno.\nInvestiga el [accent]taladro de impacto[] para extraer este recurso, y destruye la base enemiga de este área.
+sector.lake.description = El lago de magma de este sector limitará en gran medida la eficacia de varias unidades. Las unidades aéreas son la única opción viable.\nInvestiga el [accent]fabricador de naves[] y ensambla una unidad [accent]Elude[] tan pronto como sea posible.
+sector.intersect.description = Los escáneres indican que este sector será atacado desde múltiples direcciones poco después de aterrizar.\nPrepara defensas rápidamente y expándete lo antes posible.\nSe requiere utilizar unidades [accent]Mech[] para operar en este terreno irregular.
+sector.atlas.description = Este sector contiene terreno variado, por lo que necesitarás unidades variadas para atacar de forma efectiva.\nTambién podrías necesitar unidades mejoradas para lidiar con algunas de las bases enemigas más duras detectadas en esta zona.\nInvestiga el [accent]Electrolizador[] y el [accent]Refabricador de Tanques[].
+sector.split.description = La baja actividad enemiga de este sector lo hace ideal para experimentar con nuevas tecnologías de transporte.
+sector.basin.description = Se ha detectado una numerosa presencia enemiga en este sector. \nEnsambla unidades rápidamente y captura los núcleos enemigos para tomar terreno.
+sector.marsh.description = Este sector contiene abundantes cantidades de arquicita, pero las grietas disponibles son limitadas. \nConstruye [accent]cámaras de combustión química[] para generar energía.
+sector.peaks.description = La mayoría de unidades son inútiles ante el terreno montañoso de este sector. Se requiere el uso de unidades aéreas.\nCuidado con las instalaciones anti-aéreas enemigas. Tal vez sea posible inhabilitar algunas de estas defensas atacando a sus estructuras de apoyo.
+sector.ravine.description = No se han detectado núcleos enemigos en este sector, a pesar de ser una de sus principales ruta de transporte. Prepárate para confrontar una gran variedad de fuerzas hostiles.\nProduce [accent]aleación eléctrica[]. Construye torretas "[accent]Afflict[]".
+sector.caldera-erekir.description = Los recursos detectados en este sector están esparcidos en varias islas. \nInvestiga y despliega un sistema de drones de transporte.
+sector.stronghold.description = El extenso campamento enemigo en este sector protege grandes depósitos de [accent]torio[].\nÚsalo para desarrollar unidades y torretas de mayor categoría.
+sector.crevice.description = El enemigo enviará poderosos grupos de ataque para destruir tu base en este sector. \nDesarrollar el [accent]carburo[] y el [accent]generador pirolítico[] podría ser necesario para sobrevivir.
+sector.siege.description = Este sector tiene dos cañones paralelos que forzarán un ataque a dos vías simultáneamente. \nInvestiga el [accent]cianógeno[] para crear tanques aún más fuertes.\nCuidado: El enemigo posee misiles de largo alcance. Los misiles pueden ser interceptados antes de impactar.
+sector.crossroads.description = Las bases enemigas en este sector se han establecido en terrenos variados. Investiga diferentes unidades para adaptarte al entorno. \nAdemás, algunas bases están protegidas con escudos. Tendrás que averiguar cómo funcionan para encontrar sus puntos débiles.
+sector.karst.description = Este sector es rico en recursos, pero será atacado por el enemigo en cuanto aterrice un nuevo núcleo. \nToma ventaja de los recursos e investiga el [accent]tejido de fase[].
+sector.origin.description = El sector final, con una presencia enemiga significante.\nYa no queda nada que investigar - concéntrate únicamente en destruir todos los núcleos enemigos.
+
+status.burning.name = En llamas
+status.freezing.name = Congelado
+status.wet.name = Mojado
+status.muddy.name = Fangoso
+status.melting.name = Fundido
+status.sapped.name = Debilitado
+status.electrified.name = Aturdido
+status.spore-slowed.name = Ralentizado
+status.tarred.name = Alquitranado
+status.overdrive.name = Sobrecargado
+status.overclock.name = Acelerado
+status.shocked.name = Electrificado
+status.blasted.name = Explosión
+status.unmoving.name = Inmóvil
+status.boss.name = Guardián
 
 settings.language = Idioma
-settings.data = Datos del Juego
+settings.data = Datos del juego
 settings.reset = Reiniciar a los valores por defecto
 settings.rebind = Reasignar
 settings.resetKey = Reiniciar
@@ -620,158 +934,238 @@ settings.controls = Controles
 settings.game = Juego
 settings.sound = Sonido
 settings.graphics = Gráficos
-settings.cleardata = Eliminando Datos del Juego...
+settings.cleardata = Eliminar datos del juego...
 settings.clear.confirm = ¿Quieres eliminar estos datos?\n¡Esta acción no se puede deshacer!
-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 borrrará todos tus datos y se cerrará automáticamente.
+settings.clearall.confirm = [scarlet]¡ADVERTENCIA![]\nEsto eliminará todos tus datos, incluyendo guardados, mapas, desbloqueos y atajos de teclado.\nUna vez presiones 'ok', el juego borrrará todos tus datos y se cerrará automáticamente.
 settings.clearsaves.confirm = ¿Quieres borrar tus partidas guardadas?
-settings.clearsaves = Limpiar partidas guardadas
-settings.clearresearch = Borrar Investigaciones Tecnológicas
-settings.clearresearch.confirm = ¿Quieres eliminar todo el progreso de las Investigaciones Tecnológicas del modo Campaña?
+settings.clearsaves = Borrar partidas guardadas
+settings.clearresearch = Borrar investigaciones tecnológicas
+settings.clearresearch.confirm = ¿Quieres eliminar todo el progreso de las investigaciones tecnológicas del modo campaña?
 settings.clearcampaignsaves = Borrar datos de campaña
 settings.clearcampaignsaves.confirm = ¿Quieres borrar tus partidas guardadas en el modo campaña?
 paused = [accent] < Pausado >
-clear = Vaciar
-banned = [scarlet]Baneado
+clear = Borrar
+banned = [scarlet]Vetado
+unsupported.environment = [scarlet]Entorno no válido
 yes = Sí
 no = No
 info.title = Información
-error.title = [crimson]Ha ocurrido un error.
-error.crashtitle = Ha ocurrido un error.
+error.title = [scarlet]Ha ocurrido un error
+error.crashtitle = Ha ocurrido un error
 unit.nobuild = [scarlet]Esta unidad no puede construir
-lastaccessed = [lightgray]Último usado: {0}
+lastaccessed = [lightgray]Último uso: {0}
+lastcommanded = [lightgray]Última orden: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <cargar mapa para mostrar>
 stat.description = Objetivo
 stat.input = Entrada
 stat.output = Salida
+stat.maxefficiency = Máxima eficiencia
 stat.booster = Potenciador
 stat.tiles = Terreno requerido
 stat.affinities = Afinidades
-stat.powercapacity = Capacidad de Energía
+stat.opposites = Opuestos
+stat.powercapacity = Capacidad de energía
 stat.powershot = Energía/Disparo
 stat.damage = Daño
-stat.targetsair = Apunta al Aire
-stat.targetsground = Apunta a Tierra
+stat.targetsair = Apunta al aire
+stat.targetsground = Apunta a tierra
 stat.itemsmoved = Velocidad de movimiento
 stat.launchtime = Tiempo entre lanzamientos
 stat.shootrange = Alcance
 stat.size = Tamaño
-stat.displaysize = Tamaño de Pantalla
-stat.liquidcapacity = Capacidad de Líquidos
-stat.powerrange = Rango de Energía
+stat.displaysize = Tamaño de pantalla
+stat.liquidcapacity = Capacidad de líquidos
+stat.powerrange = Alcance de energía
 stat.linkrange = Alcance de conexión
 stat.instructions = Instrucciones
 stat.powerconnections = Conexiones máximas
-stat.poweruse = Consumo de Energía
+stat.poweruse = Consumo de energía
 stat.powerdamage = Energía/Daño
-stat.itemcapacity = Capacidad de Objetos
+stat.itemcapacity = Capacidad de objetos
 stat.memorycapacity = Capacidad de memoria
 stat.basepowergeneration = Generación de energía
 stat.productiontime = Tiempo de producción
-stat.repairtime = Tiempo para Reparar Bloque Completamente
+stat.repairtime = Tiempo de reparación completa de bloques
+stat.repairspeed = Velocidad de reparación
 stat.weapons = Armas
 stat.bullet = Proyectil
-stat.speedincrease = Aumento de Velocidad
+stat.moduletier = Categoría de módulo
+stat.unittype = Unit Type
+stat.speedincrease = Aumento de velocidad
 stat.range = Alcance
 stat.drilltier = Taladrables
-stat.drillspeed = Velocidad del Taladro
-stat.boosteffect = Efecto de Potenciador
-stat.maxunits = Máximo de Unidades Activas
+stat.drillspeed = Velocidad del taladro
+stat.boosteffect = Efecto de potenciador
+stat.maxunits = Máximo de unidades activas
 stat.health = Vida
+stat.armor = Armadura
 stat.buildtime = Tiempo de construcción
 stat.maxconsecutive = Máximo consecutivo
 stat.buildcost = Coste de construcción
 stat.inaccuracy = Imprecisión
 stat.shots = Disparos
-stat.reload = Disparos/segundo
+stat.reload = Cadencia de tiro
 stat.ammo = Munición
 stat.shieldhealth = Escudo
 stat.cooldowntime = Enfriamiento
 stat.explosiveness = Explosividad
-stat.basedeflectchance = Probabilidad de desvío
+stat.basedeflectchance = Probabilidad base de desvío
 stat.lightningchance = Probabilidad de descarga
-stat.lightningdamage = Daño por rayo
+stat.lightningdamage = Daño de descarga eléctrica
 stat.flammability = Inflamabilidad
 stat.radioactivity = Radioactividad
-stat.heatcapacity = Resistencia temperatura
+stat.charge = Carga eléctrica
+stat.heatcapacity = Resistencia térmica
 stat.viscosity = Viscosidad
 stat.temperature = Temperatura
 stat.speed = Velocidad
 stat.buildspeed = Velocidad de construcción
 stat.minespeed = Velocidad de extracción
 stat.minetier = Nivel de taladro
-stat.payloadcapacity = Capacidad de carga
-stat.commandlimit = Límite de comando
+stat.payloadcapacity = Capacidad de transporte
 stat.abilities = Habilidades
-stat.canboost = Tiene Propulsores
+stat.canboost = Puede volar
 stat.flying = Aéreo
+stat.ammouse = Uso de munición
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Multiplicador de daño
+stat.healthmultiplier = Multiplicador de vida
+stat.speedmultiplier = Multiplicador de velocidad
+stat.reloadmultiplier = Multiplicador de recarga
+stat.buildspeedmultiplier = Multiplicador de velocidad de construcción
+stat.reactive = Reacciona con
+stat.immunities = Inmune a
+stat.healing = Curación
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Zona de Escudo
-ability.repairfield = Zona de Reparación
-ability.statusfield = Zona de Estado
-ability.unitspawn = {0} Fábrica de Drones
-ability.shieldregenfield = Regeneración de Escudos
+ability.forcefield = �rea de Escudo
+ability.forcefield.description = Projecta un campo de fuerza que absorve balas
+ability.repairfield = �rea de Reparación
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = �rea de Potenciación
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fábrica
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = �rea de Regeneración de Armaduras
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movimiento Relámpago
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Sector de Escudo
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = �rea de Bloqueo de Regeneración
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Campo de Energía
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneración
+ability.regen.description = Regenera su propia salud con el tiempo
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
+bar.onlycoredeposit = Sólo se permite depositar en el núcleo
 bar.drilltierreq = Requiere un taladro mejor
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Recursos insuficientes
-bar.corereq = Necesitas un núcleo base
-bar.drillspeed = Velocidad del Taladro: {0}/s
+bar.corereq = Requiere un núcleo base
+bar.corefloor = Requiere colocarse en una zona designada para ello
+bar.cargounitcap = Se alcanzó el límite de carga de unidades
+bar.drillspeed = Velocidad del taladro: {0}/s
 bar.pumpspeed = Velocidad de bombeado: {0}/s
 bar.efficiency = Eficiencia: {0}%
-bar.powerbalance = Energía: {0}
-bar.powerstored = Almacenados: {0}/{1}
+bar.boost = Aceleración: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = Energía: {0}/s
+bar.powerstored = Almacenado: {0}/{1}
 bar.poweramount = Energía: {0}
-bar.poweroutput = Salida de Energía: {0}
+bar.poweroutput = Salida de energía: {0}
 bar.powerlines = Conexiones: {0}/{1}
 bar.items = Objetos: {0}
 bar.capacity = Capacidad: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet]î Š {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Líquido
 bar.heat = Calor
+bar.cooldown = Cooldown
+bar.instability = Inestabilidad
+bar.heatamount = Calor: {0}
+bar.heatpercent = Calor: {0} ({1}%)
 bar.power = Energía
-bar.progress = Progreso de construcción
+bar.progress = Construyendo...
+bar.loadprogress = Progreso
+bar.launchcooldown = Recarga de lanzamiento
 bar.input = Entrada
 bar.output = Salida
+bar.strength = [stat]{0}[lightgray]x potencia
 
-units.processorcontrol = [lightgray]Procesador Controlado
+units.processorcontrol = [lightgray]Controlado desde el procesador
 
-bullet.damage = [stat]{0}[lightgray] Daño
-bullet.splashdamage = [stat]{0}[lightgray] daño de área ~[stat] {1}[lightgray] casillas
-bullet.incendiary = [stat]Incendiaria
-bullet.sapping = [stat]Oxidante
-bullet.homing = [stat]Rastreadora
-bullet.shock = [stat]Electrizante
-bullet.frag = [stat]De fragmentación
-bullet.knockback = [stat]{0}[lightgray] Empuje
-bullet.pierce = [stat]{0}[lightgray]x penetración
-bullet.infinitepierce = [stat]Penetrante
+bullet.damage = [stat]{0}[lightgray] daño
+bullet.splashdamage = [stat]{0}[lightgray] daño en área ~[stat] {1}[lightgray] bloques
+bullet.incendiary = [stat]incendiaria
+bullet.homing = [stat]rastreadora
+bullet.armorpierce = [stat]perforación de armadura
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x proyectiles fragmentados:
+bullet.lightning = [stat]{0}[lightgray]x rayos ~ [stat]{1}[lightgray] daño
+bullet.buildingdamage = [stat]{0}%[lightgray] daño a estructuras
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] empuje
+bullet.pierce = [stat]{0}[lightgray]x perforación
+bullet.infinitepierce = [stat]perforante
 bullet.healpercent = [stat]{0}[lightgray]% reparación
-bullet.freezing = [stat]Congelación
-bullet.tarred = [stat]Ralentizado
+bullet.healamount = [stat]{0}[lightgray] reparación en bruto
 bullet.multiplier = [stat]{0}[lightgray]x multiplicador de munición
 bullet.reload = [stat]{0}[lightgray]x cadencia de fuego
+bullet.range = [stat]{0}[lightgray] bloques de alcance
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = bloques
 unit.blockssquared = bloques²
 unit.powersecond = unidades de energía/segundo
+unit.tilessecond = bloques/segundo
 unit.liquidsecond = unidades de líquido/segundo
 unit.itemssecond = objetos/segundo
 unit.liquidunits = unidades de líquido
 unit.powerunits = unidades de energía
+unit.heatunits = unidades de calor
 unit.degrees = grados
 unit.seconds = segundos
 unit.minutes = mins
 unit.persecond = /seg
 unit.perminute = /min
 unit.timesspeed = x velocidad
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = Escudo
 unit.items = objetos
 unit.thousands = k
 unit.millions = M
-unit.billions = b
+unit.billions = B
+unit.shots = shots
+unit.pershot = /disparo
 category.purpose = Objetivo
 category.general = General
 category.power = Energía
@@ -780,105 +1174,137 @@ category.items = Objetos
 category.crafting = Fabricación
 category.function = Función
 category.optional = Mejoras Opcionales
-setting.landscape.name = Bloquear modo horizontal
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Omitir animación de Lanzamiento/Aterrizaje del núcleo
+setting.landscape.name = Bloquear en horizontal
 setting.shadows.name = Sombras
-setting.blockreplace.name = Sugerir bloques al construir
-setting.linear.name = Filtrado Lineal
+setting.blockreplace.name = Sugerencias de bloques
+setting.linear.name = Filtrado lineal
 setting.hints.name = Consejos
-setting.flow.name = Mostrar tasa de flujo de recursos
+setting.logichints.name = Consejos sobre "Bloques Lógicos"
 setting.backgroundpause.name = Pausar en segundo plano
 setting.buildautopause.name = Auto-pausar construcción
-setting.animatedwater.name = Animaciones de Terreno
-setting.animatedshields.name = Animación de Escudos
-setting.antialias.name = Antialias[lightgray] (necesita un reinicio)[]
-setting.playerindicators.name = Indicadores de Jugadores
-setting.indicators.name = Indicadores de Enemigos
-setting.autotarget.name = Auto-Apuntado
-setting.keyboard.name = Controles de Ratón+Teclado
-setting.touchscreen.name = Controles Táctiles
-setting.fpscap.name = Máximos FPS
-setting.fpscap.none = Nada
+setting.doubletapmine.name = Doble clic para extraer minerales
+setting.commandmodehold.name = Mantener para comandar unidades
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Desactivar mods si el juego no puede iniciarse
+setting.animatedwater.name = Animaciones de terreno
+setting.animatedshields.name = Animación de escudos
+setting.playerindicators.name = Indicadores de jugadores
+setting.indicators.name = Indicadores de enemigos
+setting.autotarget.name = Auto-apuntado
+setting.keyboard.name = Controles de teclado y ratón
+setting.touchscreen.name = Controles táctiles
+setting.fpscap.name = Límite de FPS
+setting.fpscap.none = No
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Escala de Interfaz[lightgray] (necesita reiniciar)[]
-setting.swapdiagonal.name = Siempre Construir Diagonalmente
-setting.difficulty.training = Entrenamiento
-setting.difficulty.easy = Fácil
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Difícil
-setting.difficulty.insane = Demencial
-setting.difficulty.name = Dificultad:
+setting.uiscale.name = Escala de interfaz
+setting.uiscale.description = Es necesario reiniciar para aplicar los cambios.
+setting.swapdiagonal.name = Construir siempre en diagonal
 setting.screenshake.name = Vibración de pantalla
+setting.bloomintensity.name = Intensidad de desenfoque de Bloom
+setting.bloomblur.name = Difuminado de puntos de luz (Bloom)
 setting.effects.name = Mostrar efectos
 setting.destroyedblocks.name = Mostrar bloques destruidos
 setting.blockstatus.name = Mostrar estado de los bloques
-setting.conveyorpathfinding.name = Construcción de transportadores Inteligente
-setting.sensitivity.name = Sensibilidad del Mando
-setting.saveinterval.name = Intervalo del Autoguardado
+setting.conveyorpathfinding.name = Construcción inteligente de cintas transportadoras
+setting.sensitivity.name = Sensibilidad del mando
+setting.saveinterval.name = Intervalo de autoguardado
 setting.seconds = {0} segundos
 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 y Ping
+setting.fullscreen.name = Pantalla completa
+setting.borderlesswindow.name = Ventana sin bordes
+setting.borderlesswindow.name.windows = Ventana a pantalla completa
+setting.borderlesswindow.description = Aplicar los cambios podría requerir un reinicio.
+setting.fps.name = Mostrar FPS y ping
+setting.console.name = Activar consola
 setting.smoothcamera.name = Movimiento de cámara suave
-setting.vsync.name = VSync (Limita los fps a los Hz de tu pantalla)
+setting.vsync.name = Sincronización vertical
 setting.pixelate.name = Pixelar
-setting.minimap.name = Mostrar Minimapa
-setting.coreitems.name = Mostrar elementos en el nucleo (WIP)
-setting.position.name = Mostrar indicadores de posición de jugadores.
-setting.musicvol.name = Volumen de la Música
-setting.atmosphere.name = Mostrar Atmósfera del planeta
-setting.ambientvol.name = Volumen del Ambiente
-setting.mutemusic.name = Silenciar Musica
-setting.sfxvol.name = Volumen de los efectos de sonido
-setting.mutesound.name = Silenciar Sonido
-setting.crashreport.name = Enviar informes de fallos anónimos
-setting.savecreate.name = Autoguardar la Partida
-setting.publichost.name = Visibilidad de la Partida
-setting.playerlimit.name = Limite de Jugadores
-setting.chatopacity.name = Opacidad del Chat
-setting.lasersopacity.name = Opacidad del Laser de Nodos de Energía
-setting.bridgeopacity.name = Opacidad de Puentes Transportadores
-setting.playerchat.name = Mostrar el chat de burbuja
+setting.minimap.name = Mostrar minimapa
+setting.coreitems.name = Mostrar objetos en el núcleo
+setting.position.name = Mostrar posición de jugadores
+setting.mouseposition.name = Mostrar posición del cursor
+setting.musicvol.name = Volumen de la música
+setting.atmosphere.name = Mostrar atmósfera de planetas
+setting.drawlight.name = Draw Darkness/Lighting
+setting.ambientvol.name = Volumen del ambiente
+setting.mutemusic.name = Silenciar música
+setting.sfxvol.name = Volumen del sonido
+setting.mutesound.name = Silenciar sonido
+setting.crashreport.name = Enviar registros de errores anónimos
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = Guardado automático
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Limite de jugadores
+setting.chatopacity.name = Opacidad del chat
+setting.lasersopacity.name = Opacidad de láseres energía
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Opacidad de puentes
+setting.playerchat.name = Mostrar chat de burbuja de jugadores
 setting.showweather.name = Efectos visuales climáticos
-public.confirm = ¿Quieres hacer pública tu partida?\n[lightgray]Esto se puede cambiar más tarde en "Configuración->Juego->Visibilidad pública de la partida".
+setting.hidedisplays.name = Ocultar monitores lógicos
+setting.macnotch.name = Adaptar la interfaz para mostrar la muesca
+setting.macnotch.description = Es necesario reiniciar para aplicar los cambios
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Recuerda que no puedes crear partidas públicas en las versiones beta del juego.
-uiscale.reset = La escala de la interfaz ha sido modificada.\nPulsa "OK" para conservar esta escala.\n[scarlet]Se desharán los cambios automáticamente en [accent] {0}[] segundos...
-uiscale.cancel = Cancelar y Salir
+uiscale.reset = La escala de interfaz ha sido modificada.\nPulsa "OK" para conservar esta escala.\n[scarlet]Se desharán los cambios automáticamente en [accent] {0}[] segundos...
+uiscale.cancel = Cancelar y salir
 setting.bloom.name = Desenfoque de iluminación
-keybind.title = Cambiar accesos de teclado
-keybinds.mobile = [scarlet]Los accesos del teclado aquí mostrados no estan disponible en Móviles o Tablets. Solo aceptan movimiento básico.
+keybind.title = Reasignar controles
+keybinds.mobile = [scarlet]La mayoría de los controles no están disponibles en versiones móviles. Sólo es compatible con el movimiento básico.
 category.general.name = General
-category.view.name = Visión
+category.view.name = Ver
+category.command.name = Unit Command
 category.multiplayer.name = Multijugador
-category.blocks.name = Seleccionar bloques
-command.attack = Atacar
-command.rally = Patrullar
-command.retreat = Retirarse
-command.idle = Esperar
-placement.blockselectkeys = \n[lightgray]Códigos: [{0},
+category.blocks.name = Seleccionar bloque
+placement.blockselectkeys = \n[lightgray]Teclas: [{0},
 keybind.respawn.name = Reaparecer
 keybind.control.name = Controlar unidad
 keybind.clear_building.name = Eliminar construcción
 keybind.press = Pulsa una tecla...
-keybind.press.axis = Pulsa un eje o botón...
-keybind.screenshot.name = Captura de pantalla de Mapa
-keybind.toggle_power_lines.name = Ocultar Láser de Red Eléctrica
-keybind.toggle_block_status.name = Alternar estado de los bloques
-keybind.move_x.name = Mover x
-keybind.move_y.name = Mover y
-keybind.mouse_move.name = Seguir al Cursor del Ratón
+keybind.press.axis = Pulsa un botón o palanca...
+keybind.screenshot.name = Imagen de mapa
+keybind.toggle_power_lines.name = Mostrar/Ocultar láseres de red eléctrica
+keybind.toggle_block_status.name = Mostrar/Ocultar estado de bloques
+keybind.move_x.name = Mover X
+keybind.move_y.name = Mover Y
+keybind.mouse_move.name = Seguir al cursor
 keybind.pan.name = Desplazar la cámara
-keybind.boost.name = Acelerar
+keybind.boost.name = Sobrevolar
+keybind.command_mode.name = Modo Comando
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Reconstruir región
 keybind.schematic_select.name = Seleccionar región
-keybind.schematic_menu.name = Menu de Plantillas
-keybind.schematic_flip_x.name = Invertir Plantilla desde X
-keybind.schematic_flip_y.name = Invertir Plantilla desde Y
+keybind.schematic_menu.name = Menú de esquemas
+keybind.schematic_flip_x.name = Invertir esquema X
+keybind.schematic_flip_y.name = Invertir esquema Y
 keybind.category_prev.name = Categoría anterior
-keybind.category_next.name = Siguiente categoría
-keybind.block_select_left.name = Seleccionar bloque - Izquierda
-keybind.block_select_right.name = Seleccionar bloque - Derecha
-keybind.block_select_up.name = Seleccionar bloque - Arriba
-keybind.block_select_down.name = Seleccionar bloque - Abajo
+keybind.category_next.name = Categoría siguiente
+keybind.block_select_left.name = Menú de construcción - Izquierda
+keybind.block_select_right.name = Menú de construcción - Derecha
+keybind.block_select_up.name = Menú de construcción - Arriba
+keybind.block_select_down.name = Menú de construcción - Abajo
 keybind.block_select_01.name = Seleccionar Categoría/Bloque 1
 keybind.block_select_02.name = Seleccionar Categoría/Bloque 2
 keybind.block_select_03.name = Seleccionar Categoría/Bloque 3
@@ -889,88 +1315,143 @@ keybind.block_select_07.name = Seleccionar Categoría/Bloque 7
 keybind.block_select_08.name = Seleccionar Categoría/Bloque 8
 keybind.block_select_09.name = Seleccionar Categoría/Bloque 9
 keybind.block_select_10.name = Seleccionar Categoría/Bloque 10
-keybind.fullscreen.name = Cambiar a Pantalla Completa
-keybind.select.name = Seleccionar
-keybind.diagonal_placement.name = Construcción Diagonal
-keybind.pick.name = Elegir bloque
-keybind.break_block.name = Destruir Bloque
+keybind.fullscreen.name = Pantalla completa
+keybind.select.name = Seleccionar/Disparar
+keybind.diagonal_placement.name = Construcción diagonal
+keybind.pick.name = Copiar bloque
+keybind.break_block.name = Deconstruir bloque
+keybind.select_all_units.name = Seleccionar todas las unidades
+keybind.select_all_unit_factories.name = Seleccionar todas las fábricas de unidades
 keybind.deselect.name = Deseleccionar
-keybind.pickupCargo.name = Recoger carga
-keybind.dropCargo.name = Soltar carga
-keybind.command.name = Ordenar
+keybind.pickupCargo.name = Cargar bloque/unidad
+keybind.dropCargo.name = Soltar bloque/unidad
 keybind.shoot.name = Disparar
 keybind.zoom.name = Zoom
 keybind.menu.name = Menú
 keybind.pause.name = Pausa
 keybind.pause_building.name = Pausar/Reanudar construcción
 keybind.minimap.name = Minimapa
-keybind.planet_map.name = Mapa del Planeta
+keybind.planet_map.name = Mapa del planeta
 keybind.research.name = Investigaciones
+keybind.block_info.name = Información del bloque
 keybind.chat.name = Chat
 keybind.player_list.name = Lista de jugadores
 keybind.console.name = Consola
 keybind.rotate.name = Rotar
-keybind.rotateplaced.name = Rotar existente (mantener)
-keybind.toggle_menus.name = Ocultar menús
+keybind.rotateplaced.name = Rotar existente (Mantener tecla)
+keybind.toggle_menus.name = Ocultar interfaz
 keybind.chat_history_prev.name = Historial de chat - Anterior
 keybind.chat_history_next.name = Historial de chat - Siguiente
-keybind.chat_scroll.name = Desplazar el chat
+keybind.chat_scroll.name = Historial de chat - Desplazar
 keybind.chat_mode.name = Cambiar modo de chat
 keybind.drop_unit.name = Soltar unidad
 keybind.zoom_minimap.name = Zoom del minimapa
-mode.help.title = Descripción de modos
+mode.help.title = Descripción
 mode.survival.name = Supervivencia
-mode.survival.description = El modo normal. Recursos limitados y oleadas automáticas.
+mode.survival.description = El modo normal. Recursos limitados y oleadas automáticas.\n[gray]Requiere puntos de aterrizaje enemigos en el mapa.
 mode.sandbox.name = Modo libre
-mode.sandbox.description = Recursos ilimitados y sin temporizador para las oleadas.
+mode.sandbox.description = Recursos ilimitados y tiempo indefinido para las oleadas.
 mode.editor.name = Editor
 mode.pvp.name = JcJ
-mode.pvp.description = Pelea contra otros jugadores localmente.
-mode.attack.name = Batalla
-mode.attack.description = No hay oleadas, el objetivo es destruir la base enemiga.
+mode.pvp.description = Combate contra otros jugadores localmente.\n[gray]Requiere al menos 2 núcleos de distinto color en el mapa.
+mode.attack.name = Ataque
+mode.attack.description = Destruye la base enemiga. \n[gray]Requiere un núcleo rojo en el mapa.
 mode.custom = Normas personalizadas
+rules.invaliddata = Datos del portapeles invalidos.
+rules.hidebannedblocks = Ocultar bloques prohibidos
 
 rules.infiniteresources = Recursos infinitos
-rules.reactorexplosions = Los reactores pueden explotar
-rules.schematic = Permitir Plantillas
-rules.wavetimer = Temporizador de Oleadas
+rules.onlydepositcore = Sólo permitir depositar recursos en el núcleo
+rules.derelictrepair = Allow Derelict Block Repair
+rules.reactorexplosions = Explosiones de reactores
+rules.coreincinerates = Incinerar exceso de recursos en el núcleo
+rules.disableworldprocessors = Desactivar procesadores estáticos
+rules.schematic = Permitir esquemas
+rules.wavetimer = Temporizador de oleadas
+rules.wavesending = Envío de oleadas
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Oleadas
-rules.attack = Ataque
-rules.buildai = La IA enemiga puede construir
-rules.enemyCheat = La IA enemiga tiene recursos infinitos
-rules.blockhealthmultiplier = Multiplicador de salud de bloque
-rules.blockdamagemultiplier = Multiplicador de daño de bloque
-rules.unitbuildspeedmultiplier = Multiplicador de velocidad de creación de unidades
-rules.unithealthmultiplier = Multiplicador de la vida de las unidades
-rules.unitdamagemultiplier = Multiplicador del daño de unidades
-rules.enemycorebuildradius = Radio de No-Construcción del Núcleo Enemigo:[lightgray] (casillas)
-rules.wavespacing = Tiempo entre oleadas:[lightgray] (seg)
+rules.airUseSpawns = Air units use spawn points
+rules.attack = Modo de ataque
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = IA enemiga avanzada (RTS AI)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Tamaño mínimo de escuadrón
+rules.rtsmaxsquadsize = Tamaño máximo de escuadrón
+rules.rtsminattackweight = Peso mínimo de ataque
+rules.cleanupdeadteams = Eliminar estructuras de equipos derrotados (JcJ)
+rules.corecapture = Capturar núcleo al destruirlo
+rules.polygoncoreprotection = Protección de núcleo poligonal
+rules.placerangecheck = Comprobar rango de construcción
+rules.enemyCheat = La IA (Equipo Rojo) tiene recursos infinitos
+rules.blockhealthmultiplier = Multiplicador de vida de estructuras
+rules.blockdamagemultiplier = Multiplicador de daño de estructuras
+rules.unitbuildspeedmultiplier = Multiplicador de velocidad de producción de unidades
+rules.unitcostmultiplier = Unit Cost Multiplier
+rules.unithealthmultiplier = Multiplicador de vida de unidades
+rules.unitdamagemultiplier = Multiplicador de daño de unidades
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Multiplicador de energía solar
+rules.unitcapvariable = Las categorías del núcleo alteran el límite máximo de unidades
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Límite base de unidades
+rules.limitarea = Limitar área del mapa
+rules.enemycorebuildradius = Radio de zona anti-construcción del núcleo enemigo:[lightgray] (bloques)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Intervalo entre oleadas:[lightgray] (seg)
+rules.initialwavespacing = Retraso inicial de 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.wavelimit = El mapa termina despues de la oleada
+rules.dropzoneradius = Radio de zona de aterrizaje:[lightgray] (bloques)
 rules.unitammo = Las unidades necesitan munición
+rules.enemyteam = Equipo enemigo
+rules.playerteam = Equipo del jugador
 rules.title.waves = Oleadas
-rules.title.resourcesbuilding = Recursos y Construcción
+rules.title.resourcesbuilding = Recursos y construcción
 rules.title.enemy = Enemigos
 rules.title.unit = Unidades
 rules.title.experimental = Experimental
 rules.title.environment = Entorno
+rules.title.teams = Equipos
+rules.title.planet = Planeta
 rules.lighting = Iluminación
-rules.enemyLights = Luces enemigas
+rules.fog = Ocultar terreno inexplorado (Fog of War)
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fuego
-rules.explosions = Daño de explosiones de Bloques/Unidades 
+rules.anyenv = <Cualquiera>
+rules.explosions = Daño de explosiones a bloques/unidades
 rules.ambientlight = Iluminación ambiental
 rules.weather = Clima
-rules.weather.frequency = Frequencia:
+rules.weather.frequency = Frecuencia:
+rules.weather.always = Siempre
 rules.weather.duration = Duracion:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Evita que las unidades depositen materiales en calquiera estructura a excepción del nucleo.
 
 content.item.name = Objetos
 content.liquid.name = Líquidos
 content.unit.name = Unidades
 content.block.name = Bloques
+content.status.name = Alteraciones de estado
 content.sector.name = Sectores
+content.team.name = Facciones
+
+wallore = (Muro)
 
 item.copper.name = Cobre
 item.lead.name = Plomo
@@ -980,7 +1461,7 @@ item.titanium.name = Titanio
 item.thorium.name = Torio
 item.silicon.name = Silicio
 item.plastanium.name = Plastanio
-item.phase-fabric.name = Tejido de fase
+item.phase-fabric.name = Tejido de Fase
 item.surge-alloy.name = Aleación Eléctrica
 item.spore-pod.name = Vaina de Esporas
 item.sand.name = Arena
@@ -988,11 +1469,25 @@ item.blast-compound.name = Compuesto Explosivo
 item.pyratite.name = Pirotita
 item.metaglass.name = Metacristal
 item.scrap.name = Chatarra
+item.fissile-matter.name = Materia Fisible
+item.beryllium.name = Berilio
+item.tungsten.name = Tungsteno
+item.oxide.name = Óxido
+item.carbide.name = Carburo
+item.dormant-cyst.name = Quiste Latente
+
 liquid.water.name = Agua
 liquid.slag.name = Magma
 liquid.oil.name = Petróleo
 liquid.cryofluid.name = Líquido criogénico
-#Names of Units and Turrets look better untranslated, since they are propper/own names
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arquicita
+liquid.gallium.name = Galio
+liquid.ozone.name = Ozono
+liquid.hydrogen.name = Hidrógeno
+liquid.nitrogen.name = Nitrógeno
+liquid.cyanogen.name = Cianógeno
+#Names of Units and Turrets looks better untranslated, since they are names
 unit.dagger.name = Dagger
 unit.mace.name = Mace
 unit.fortress.name = Fortress
@@ -1019,6 +1514,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1027,13 +1527,36 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = Punto de reabastecimiento
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Dron ensamblador
+unit.latum.name = Latum
+unit.renale.name = Renale
+
 block.parallax.name = Parallax
 block.cliff.name = Pared
 block.sand-boulder.name = Roca de arena
 block.basalt-boulder.name = Roca de basalto
 block.grass.name = Hierba
-block.slag.name = Magma
+block.molten-slag.name = Magma
+block.pooled-cryofluid.name = Líquido criogénico
 block.space.name = Espacio
 block.salt.name = Sal
 block.salt-wall.name = Muro de sal
@@ -1045,131 +1568,139 @@ block.spore-wall.name = Muro de esporas
 block.boulder.name = Roca
 block.snow-boulder.name = Roca de nieve
 block.snow-pine.name = Pino de nieve
-block.shale.name = Pizarra
-block.shale-boulder.name = Piedra de pizarra
+block.shale.name = Esquisto
+block.shale-boulder.name = Roca de esquisto
 block.moss.name = Musgo
 block.shrubs.name = Arbustos
 block.spore-moss.name = Musgo de esporas
-block.shale-wall.name = Muro de pizarra
+block.shale-wall.name = Muro de esquisto
 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
+block.scrap-wall-huge.name = Muro de chatarra enorme
 block.scrap-wall-gigantic.name = Muro de chatarra gigante
 block.thruster.name = Propulsor
-block.kiln.name = Horno para Cristal
+block.kiln.name = Horno para cristal
 block.graphite-press.name = Prensa de grafito
 block.multi-press.name = Multi-Prensa
-block.constructing = {0}\n[lightgray](Construyendo)
-block.spawn.name = Punto de generación
+block.constructing = {0} [lightgray](Construyendo)
+block.spawn.name = Zona de aterrizaje enemiga
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Núcleo: Shard
 block.core-foundation.name = Núcleo: Foundation
 block.core-nucleus.name = Núcleo: Nucleus
-block.deepwater.name = Aguas profundas
-block.water.name = Agua
+block.deep-water.name = Agua profunda
+block.shallow-water.name = Agua
 block.tainted-water.name = Agua contaminada
-block.darksand-tainted-water.name = Agua contaminada con arena oscura
+block.deep-tainted-water.name = Agua profunda contaminada
+block.darksand-tainted-water.name = Agua contaminada - Arena oscura
 block.tar.name = Alquitrán
 block.stone.name = Piedra
-block.sand.name = Arena
+block.sand-floor.name = Arena
 block.darksand.name = Arena oscura
 block.ice.name = Hielo
 block.snow.name = Nieve
-block.craters.name = Cráter
-block.sand-water.name = Agua con arena
-block.darksand-water.name = Agua con arena oscura
-block.char.name = Cenizas
+block.crater-stone.name = Cráteres
+block.sand-water.name = Agua - Arena
+block.darksand-water.name = Agua - Arena oscura
+block.char.name = Ceniza
 block.dacite.name = Dacita
-block.dacite-wall.name = Bloque de dacita
+block.rhyolite.name = Riolita
+block.dacite-wall.name = Muro de dacita
 block.dacite-boulder.name = Roca de dacita
-block.ice-snow.name = Hielo-Nieve
-block.stone-wall.name = Bloque de piedra
-block.ice-wall.name = Bloque de hielo
-block.snow-wall.name = Bloque de nieve
-block.dune-wall.name = Bloque de arena
+block.ice-snow.name = Hielo - Nieve
+block.stone-wall.name = Muro de piedra
+block.ice-wall.name = Muro de hielo
+block.snow-wall.name = Muro de nieve
+block.dune-wall.name = Muro de duna
 block.pine.name = Pino
 block.dirt.name = Tierra
 block.dirt-wall.name = Bloque de tierra
 block.mud.name = Lodo
-block.white-tree-dead.name = �rbol Blanco Muerto
-block.white-tree.name = �rbol Blanco
-block.spore-cluster.name = Concentración de Esporas
-block.metal-floor.name = Suelo de Metal
-block.metal-floor-2.name = Suelo de Metal 2
-block.metal-floor-3.name = Suelo de Metal 3
-block.metal-floor-5.name = Suelo de Metal 5
-block.metal-floor-damaged.name = Suelo de Metal dañado
-block.dark-panel-1.name = Panel Oscuro 1
-block.dark-panel-2.name = Panel Oscuro 2
-block.dark-panel-3.name = Panel Oscuro 3
-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.white-tree-dead.name = �rbol blanco muerto
+block.white-tree.name = �rbol blanco
+block.spore-cluster.name = Esporas
+block.metal-floor.name = Suelo de metal 1
+block.metal-floor-2.name = Suelo de metal 2
+block.metal-floor-3.name = Suelo de metal 3
+block.metal-floor-4.name = Suelo de metal 4
+block.metal-floor-5.name = Suelo de metal 5
+block.metal-floor-damaged.name = Suelo de metal dañado
+block.dark-panel-1.name = Panel oscuro 1
+block.dark-panel-2.name = Panel oscuro 2
+block.dark-panel-3.name = Panel oscuro 3
+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.basalt.name = Basalto
 block.hotrock.name = Roca volcánica
-block.magmarock.name = Roca de Magma
-block.copper-wall.name = Muro de Cobre
-block.copper-wall-large.name = Muro de Cobre grande
-block.titanium-wall.name = Muro de Titanio
-block.titanium-wall-large.name = Muro de Titanio grande
-block.plastanium-wall.name = Muro de Plastanio
-block.plastanium-wall-large.name = Muro de Plastanio grande
-block.phase-wall.name = Muro de Fase grande
-block.phase-wall-large.name = Muro de Fase grande
-block.thorium-wall.name = Pared de Torio
-block.thorium-wall-large.name = Muro de Torio grande
+block.magmarock.name = Roca de magma
+block.copper-wall.name = Muro de cobre
+block.copper-wall-large.name = Muro de cobre grande
+block.titanium-wall.name = Muro de titanio
+block.titanium-wall-large.name = Muro de titanio grande
+block.plastanium-wall.name = Muro de plastanio
+block.plastanium-wall-large.name = Muro de plastanio grande
+block.phase-wall.name = Muro de fase
+block.phase-wall-large.name = Muro de fase grande
+block.thorium-wall.name = Muro de torio
+block.thorium-wall-large.name = Muro de torio grande
 block.door.name = Puerta
-block.door-large.name = Puerta Grande
+block.door-large.name = Puerta grande
 block.duo.name = Duo
 block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer
-block.conveyor.name = Cinta Transportadora
-block.titanium-conveyor.name = Cinta Transportadora de Titanio
-block.plastanium-conveyor.name = Cinta Transportadora de Plastanio
-block.armored-conveyor.name = Cinta Transportadora Acorazada
+block.conveyor.name = Cinta transportadora
+block.titanium-conveyor.name = Cinta transportadora de titanio
+block.plastanium-conveyor.name = Cinta transportadora de plastanio
+block.armored-conveyor.name = Cinta transportadora acorazada
 block.junction.name = Cruce
 block.router.name = Enrutador
 block.distributor.name = Distribuidor
 block.sorter.name = Clasificador
-block.inverted-sorter.name = Clasificador Invertido
+block.inverted-sorter.name = Clasificador invertido
 block.message.name = Mensaje
+block.reinforced-message.name = Mensaje reforzado
+block.world-message.name = Mensaje estático
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminador
-block.overflow-gate.name = Compuerta de Desborde
-block.underflow-gate.name = Compuerta de Subdesbordamiento
-block.silicon-smelter.name = Horno para Silicio
-block.phase-weaver.name = Tejedor de Fase
+block.overflow-gate.name = Compuerta de desborde
+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.cryofluid-mixer.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
+block.spore-press.name = Prensa de esporas
 block.separator.name = Separador
-block.coal-centrifuge.name = Centrifugador de Carbón
-block.power-node.name = Nodo de Energía
-block.power-node-large.name = Nodo de Energía Grande
-block.surge-tower.name = Torre de sobretensión
+block.coal-centrifuge.name = Centrifugador de carbón
+block.power-node.name = Nodo de energía
+block.power-node-large.name = Nodo de energía grande
+block.surge-tower.name = Torre de alta tensión
 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.steam-generator.name = Turbina
-block.differential-generator.name = Generador Diferencial
-block.impact-reactor.name = Reactor de Impacto
+block.battery-large.name = Batería grande
+block.combustion-generator.name = Generador de combustión
+block.steam-generator.name = Generador de vapor
+block.differential-generator.name = Generador diferencial
+block.impact-reactor.name = Reactor de impacto
 block.mechanical-drill.name = Taladro mecánico
 block.pneumatic-drill.name = Taladro neumático
-block.laser-drill.name = Taladro Láser
-block.water-extractor.name = Extractor de Agua
+block.laser-drill.name = Taladro láser
+block.water-extractor.name = Extractor de agua
 block.cultivator.name = Cultivador
-block.conduit.name = Conducto
-block.mechanical-pump.name = Bomba Mecánica
+block.conduit.name = Tubería
+block.mechanical-pump.name = Bomba mecánica
 block.item-source.name = Fuente de objetos
-block.item-void.name = Vacío de objetos 
+block.item-void.name = Vacío de objetos
 block.liquid-source.name = Fuente de líquidos
 block.liquid-void.name = Vacío de líquidos
 block.power-void.name = Vacío de energía
-block.power-source.name = Energía Infinita
+block.power-source.name = Fuente de energía
 block.unloader.name = Descargador
 block.vault.name = Almacén
 block.wave.name = Wave
@@ -1177,48 +1708,50 @@ block.tsunami.name = Tsunami
 block.swarmer.name = Swarmer
 block.salvo.name = Salvo
 block.ripple.name = Ripple
-block.phase-conveyor.name = Cinta Transportadora de Fase
-block.bridge-conveyor.name = Puente de Cinta Transportadora
-block.plastanium-compressor.name = Compresor de Plastanio
-block.pyratite-mixer.name = Mezclador de Pirotita
-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.repair-point.name = Punto de Reparación de Unidades
-block.pulse-conduit.name = Conducto de Pulso
-block.plated-conduit.name = Conducto Acorazado
-block.phase-conduit.name = Conducto de Fase
-block.liquid-router.name = Enrutador de Líquidos
-block.liquid-tank.name = Tanque de Líquidos
-block.liquid-junction.name = Cruce de Líquidos
-block.bridge-conduit.name = Conducto Puente
-block.rotary-pump.name = Bomba Rotatoria
-block.thorium-reactor.name = Reactor de Torio
-block.mass-driver.name = Teletransportador de Masa
-block.blast-drill.name = Taladro de explosión
-block.thermal-pump.name = Bomba Térmica
-block.thermal-generator.name = Generador Térmico
-block.alloy-smelter.name = Fundidor de Materia
+block.phase-conveyor.name = Cinta transportadora de fase
+block.bridge-conveyor.name = Puente de cinta transportadora
+block.plastanium-compressor.name = Compresor de plastanio
+block.pyratite-mixer.name = Mezclador de pirotita
+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.repair-point.name = Punto de reparación de unidades
+block.repair-turret.name = Torreta reparadora
+block.pulse-conduit.name = Tubería de pulso
+block.plated-conduit.name = Tubería acorazada
+block.phase-conduit.name = Tubería de fase
+block.liquid-router.name = Enrutador de líquidos
+block.liquid-tank.name = Tanque de líquidos
+block.liquid-container.name = Contenedor de líquidos
+block.liquid-junction.name = Cruce de líquidos
+block.bridge-conduit.name = Tubería puente
+block.rotary-pump.name = Bomba rotativa
+block.thorium-reactor.name = Reactor de torio
+block.mass-driver.name = Catapulta electromagnética
+block.blast-drill.name = Taladro de voladura
+block.impulse-pump.name = Bomba de impulso
+block.thermal-generator.name = Generador térmico
+block.surge-smelter.name = Fundidor de aleación
 block.mender.name = Reparador
-block.mend-projector.name = Proyector de Reparación
-block.surge-wall.name = Muro de Sobretensión
-block.surge-wall-large.name = Muro de Sobretensión grande
+block.mend-projector.name = Proyector de reparación
+block.surge-wall.name = Muro de aleación eléctrica
+block.surge-wall-large.name = Muro de aleación eléctrica grande
 block.cyclone.name = Cyclone
 block.fuse.name = Fuse
 block.shock-mine.name = Mina eléctrica
-block.overdrive-projector.name = Proyector de Aceleración
-block.force-projector.name = Proyector de Escudo
+block.overdrive-projector.name = Proyector de aceleración
+block.force-projector.name = Proyector de escudo
 block.arc.name = Arc
 block.rtg-generator.name = Generador RTG
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Contenedor
-block.launch-pad.name = Plataforma de Lanzamiento
-block.launch-pad-large.name = Plataforma de Lanzamiento Grande
+block.launch-pad.name = Plataforma de lanzamiento
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = Segment
-block.command-center.name = Centro de comando
 block.ground-factory.name = Fábrica terrestre
 block.air-factory.name = Fábrica aérea
 block.naval-factory.name = Fábrica naval
@@ -1226,232 +1759,477 @@ block.additive-reconstructor.name = Reconstructor aditivo
 block.multiplicative-reconstructor.name = Reconstructor multiplicativo
 block.exponential-reconstructor.name = Reconstructor exponencial
 block.tetrative-reconstructor.name = Reconstructor tetrativo
-block.payload-conveyor.name = Transportador de carga
+block.payload-conveyor.name = Cinta transportadora de carga
 block.payload-router.name = Enrutador de carga
+block.duct.name = Conducto
+block.duct-router.name = Conducto enrutador
+block.duct-bridge.name = Conducto puente
+block.large-payload-mass-driver.name = Catapulta electromagnética de carga grande
+block.payload-void.name = Vacío de carga
+block.payload-source.name = Fuente de carga
 block.disassembler.name = Desensamblador
 block.silicon-crucible.name = Crisol de silicio
-block.overdrive-dome.name = Campo de Aceleración
-#experimental, puede ser eliminado
-block.block-forge.name = Fundidor de Bloques
-block.block-loader.name = Cargador de Bloques
-block.block-unloader.name = Descargador de Bloques
-block.interplanetary-accelerator.name = Acelerador Interplanetario
+block.overdrive-dome.name = Cúpula de aceleración
+block.interplanetary-accelerator.name = Acelerador interplanetario
+block.constructor.name = Constructor
+block.constructor.description = Fabrica cargas de hasta 2x2 bloques de tamaño.
+block.large-constructor.name = Constructor grande
+block.large-constructor.description = Fabrica cargas de hasta 4x4 bloques de tamaño.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstruye estructuras y unidades. Devuelve el 100% de su coste de construcción.
+block.payload-loader.name = Cargador de carga
+block.payload-loader.description = Carga objetos y líquidos en bloques.
+block.payload-unloader.name = Descargador de carga
+block.payload-unloader.description = Descarga objetos y líquidos de bloques.
+block.heat-source.name = Fuente de calor
+block.heat-source.description = Un bloque pequeño que proporciona una cantidad infinita de calor.
+
+# Erekir
+block.empty.name = Vacío
+block.rhyolite-crater.name = Cráter de riolita
+block.rough-rhyolite.name = Riolita bruta
+block.regolith.name = Regolito
+block.yellow-stone.name = Piedra amarillenta
+block.carbon-stone.name = Piedra de carbón
+block.ferric-stone.name = Roca férrea
+block.ferric-craters.name = Cráteres férreos
+block.beryllic-stone.name = Piedra berílica
+block.crystalline-stone.name = Piedra cristalina
+block.crystal-floor.name = Suelo cristalino
+block.yellow-stone-plates.name = Láminas de piedra amarilla
+block.red-stone.name = Piedra rojiza
+block.dense-red-stone.name = Piedra rojiza densa
+block.red-ice.name = Hielo rojo
+block.arkycite-floor.name = Suelo de arquicita
+block.arkyic-stone.name = Piedra de arquicita
+block.rhyolite-vent.name = Grieta de riolita
+block.carbon-vent.name = Grieta de carbón
+block.arkyic-vent.name = Grieta de arquicita
+block.yellow-stone-vent.name = Grieta de piedra amarillenta
+block.red-stone-vent.name = Grieta de piedra rojiza
+block.crystalline-vent.name = Grieta cristalina
+block.redmat.name = Manto rojo
+block.bluemat.name = Manto azul
+block.core-zone.name = Zona de núcleo
+block.regolith-wall.name = Muro de regolito
+block.yellow-stone-wall.name = Muro de piedra amarillenta
+block.rhyolite-wall.name = Muro de riolita
+block.carbon-wall.name = Muro de carbón
+block.ferric-stone-wall.name = Muro de piedra férrea
+block.beryllic-stone-wall.name = Muro de piedra berílica
+block.arkyic-wall.name = Muro de arquicita
+block.crystalline-stone-wall.name = Muro de piedra cristalina
+block.red-ice-wall.name = Muro de hielo rojo
+block.red-stone-wall.name = Muro de piedra rojiza
+block.red-diamond-wall.name = Muro de diamante rojo
+block.redweed.name = Hierba roja
+block.pur-bush.name = Arbusto puro
+block.yellowcoral.name = Coral amarillo
+block.carbon-boulder.name = Roca de carbón
+block.ferric-boulder.name = Roca férrea
+block.beryllic-boulder.name = Roca berílica
+block.yellow-stone-boulder.name = Roca amarilla
+block.arkyic-boulder.name = Roca arquiica
+block.crystal-cluster.name = Fragmento de cristal
+block.vibrant-crystal-cluster.name = Fragmento de cristal vibrante
+block.crystal-blocks.name = Bloques de cristal
+block.crystal-orbs.name = Orbes de cristal
+block.crystalline-boulder.name = Roca cristalina
+block.red-ice-boulder.name = Roca de hielo rojizo
+block.rhyolite-boulder.name = Roca de riolita
+block.red-stone-boulder.name = Roca rojiza
+block.graphitic-wall.name = Muro de grafito
+block.silicon-arc-furnace.name = Horno de arco eléctrico
+block.electrolyzer.name = Electrolizador
+block.atmospheric-concentrator.name = Concentrador atmosférico
+block.oxidation-chamber.name = Cámara de oxidación
+block.electric-heater.name = Radiador eléctrico
+block.slag-heater.name = Caldera de magma
+block.phase-heater.name = Radiador de fase
+block.heat-redirector.name = Redireccionador térmico
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Enrutador térmico
+block.slag-incinerator.name = Incinerador de magma
+block.carbide-crucible.name = Crisol de carburo
+block.slag-centrifuge.name = Centrifugador de magma
+block.surge-crucible.name = Crisol de aleación eléctrica
+block.cyanogen-synthesizer.name = Sintetizador de cianógeno
+block.phase-synthesizer.name = Sintetizador de fase
+block.heat-reactor.name = Reactor térmico
+block.beryllium-wall.name = Muro de berilio
+block.beryllium-wall-large.name = Muro de berilio grande
+block.tungsten-wall.name = Muro de tungsteno
+block.tungsten-wall-large.name = Muro de tungsteno grande
+block.blast-door.name = Puerta blindada
+block.carbide-wall.name = Muro de carburo
+block.carbide-wall-large.name = Muro de carburo grande
+block.reinforced-surge-wall.name = Muro de aleación eléctrica reforzada
+block.reinforced-surge-wall-large.name = Muro de aleación eléctrica reforzada grande
+block.shielded-wall.name = Muro blindado
+block.radar.name = Radar
+block.build-tower.name = Torre de construcción
+block.regen-projector.name = Proyector de regeneración
+block.shockwave-tower.name = Torre de pulso eléctrico
+block.shield-projector.name = Proyector de escudo
+block.large-shield-projector.name = Proyector de escudo grande
+block.armored-duct.name = Conducto acorazado
+block.overflow-duct.name = Conducto de desborde
+block.underflow-duct.name = Conducto de subdesbordamiento
+block.duct-unloader.name = Conducto descargador
+block.surge-conveyor.name = Cinta transportadora eléctrica
+block.surge-router.name = Enrutador eléctrico
+block.unit-cargo-loader.name = Cargador de unidades
+block.unit-cargo-unload-point.name = Descargador de unidades
+block.reinforced-pump.name = Bomba reforzada
+block.reinforced-conduit.name = Tubería reforzada
+block.reinforced-liquid-junction.name = Tubería cruce reforzada
+block.reinforced-bridge-conduit.name = Tubería puente reforzada
+block.reinforced-liquid-router.name = Enrutador de líquidos reforzado
+block.reinforced-liquid-container.name = Contenedor de líquidos reforzado
+block.reinforced-liquid-tank.name = Tanque de líquidos reforzado
+block.beam-node.name = Nodo de energía ortogonal
+block.beam-tower.name = Torre de transmisión de energía
+block.beam-link.name = Enlace de energía
+block.turbine-condenser.name = Turbina condensadora
+block.chemical-combustion-chamber.name = Cámara de combustión química
+block.pyrolysis-generator.name = Generador pirolítico
+block.vent-condenser.name = Condensador de grietas
+block.cliff-crusher.name = Triturador de paredes
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Perforador de plasma
+block.large-plasma-bore.name = Perforador de plasma grande
+block.impact-drill.name = Taladro de impacto
+block.eruption-drill.name = Taladro de erupción
+block.core-bastion.name = Núcleo: Bastion
+block.core-citadel.name = Núcleo: Citadel
+block.core-acropolis.name = Núcleo: Acropolis
+block.reinforced-container.name = Contenedor reforzado
+block.reinforced-vault.name = Almacén reforzado
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Refabricador de tanques
+block.mech-refabricator.name = Refabricador de mechs
+block.ship-refabricator.name = Refabricador de aeronaves
+block.tank-assembler.name = Ensamblador de tanques
+block.ship-assembler.name = Ensamblador de aeronaves
+block.mech-assembler.name = Ensamblador de mechs
+block.reinforced-payload-conveyor.name = Cinta transportadora de carga reforzada
+block.reinforced-payload-router.name = Enrutador de carga reforzado
+block.payload-mass-driver.name = Catapulta electromagnética de carga
+block.small-deconstructor.name = Deconstructor pequeño
+block.canvas.name = Lienzo
+block.world-processor.name = Procesador estático
+block.world-cell.name = Unidad de memoria estática
+block.tank-fabricator.name = Fabricador de tanques
+block.mech-fabricator.name = Fabricador de mechs
+block.ship-fabricator.name = Fabricador de aeronaves
+block.prime-refabricator.name = Refabricador Prime
+block.unit-repair-tower.name = Torre de reparación de unidades
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Módulo ensamblador básico
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Reactor de flujo
+block.neoplasia-reactor.name = Reactor de neoplasia
 
 block.switch.name = Interruptor
-block.micro-processor.name = Micro Processador
+block.micro-processor.name = Microprocesador
 block.logic-processor.name = Procesador lógico
 block.hyper-processor.name = Hiperprocesador
 block.logic-display.name = Pantalla lógica
 block.large-logic-display.name = Pantalla lógica grande
 block.memory-cell.name = Unidad de memoria
 block.memory-bank.name = Servidor de memoria
-
-team.blue.name = azul
-team.crux.name = rojo
-team.sharded.name = naranja
-team.orange.name = naranja
-team.derelict.name = abandonado
-team.green.name = verde
-team.purple.name = morado
+# Name of the teams that are not colors or adjectives are intentionally untrasnlated.
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Sharded
+team.derelict.name = Abandonado
+team.green.name = Verde
+team.blue.name = Azul
 
 hint.skip = Omitir
 hint.desktopMove = Usa [accent][[WASD][] para moverte.
-hint.zoom = Puedes usar la [accent]Rueda del ratón[] para controlar el zoom.
-hint.mine = Acércate a \uf8c4 una veta de cobre [accent]tócala[]\n para extraer cobre manualmente.
-hint.desktopShoot = [accent][[Left-click][] para disparar.
+hint.zoom = Usa la [accent]Rueda del ratón[] para controlar el zoom.
+hint.desktopShoot = [accent][[Clic-izquierdo][] para disparar.
 hint.depositItems = Deposita objetos arrastrándolos desde tu nave hasta el núcleo.
-hint.respawn = Para sacar otra nave, pulsa [accent][[V][].
+hint.respawn = Para reaparecer desde el núcleo, pulsa [accent][[V][].
 hint.respawn.mobile = Has pasado a controlar una unidad/estructura. Para volver a manejar la nave, [accent]toca el icono arriba a la izquierda.[]
-hint.desktopPause = Pulsa [accent][[Space][] para pausar y reanudar la partida.
-hint.placeDrill = Selecciona la pestaña de \ue85e [accent]Taladros[] en el menú abajo a la derecha, luego escoge un \uf870 [accent]Taladro[] y haz clic sobre una veta de cobre para colocarlo.
-hint.placeDrill.mobile = Selecciona la pestaña de \ue85e [accent]Taladros[] en el menú abajo a la derecha, luego escoge un \uf870 [accent]Taladro[] y toca sobre una veta de cobre para colocarlo.\n\nPulsa el botón con la \ue800 [accent]"V"[] abajo a la derecha para confirmar.
-hint.placeConveyor = Las cintas transportadoras pueden sacar objetos de los taladros, y moverlos hasta otros bloques. Selecciona un \uf896 [accent]Transportador[] de la pestaña \ue814 [accent]Distribución[].\n\nHaz clic y arrastra para crear una cadena con múltiples transportadores.\nUsa la [accent]Rueda del ratón[] para rotarlo.
-hint.placeConveyor.mobile = Las cintas transportadoras pueden mover objetos de los taladros hasta otros bloques. Selecciona un \uf896 [accent]Transportador[] de la pestaña \ue814 [accent]Distribución[].\n\nMantén el dedo un segundo y arrastra para crear múltiples cintas transportadoras.
-hint.placeTurret = Construye \uf861 [accent]Torretas[] para defender tu base de los enemigos.\n\nLas torretas necesitan munición - en este caso, \uf838cobre.\nUsa cintas transportadoras y taladros para abastecerlas con cobre.
+hint.desktopPause = Pulsa [accent][[Barra Espaciadora][] para pausar y reanudar la partida.
 hint.breaking = Pulsa [accent]Clic-derecho[] y arrastra para destruir bloques.
-hint.breaking.mobile = Activa el botón con el \ue817 [accent]martillo[] situado abajo a la derecha y selecciona bloque para eliminarlos.\n\nMantén el dedo un segundo y arrastra para eliminar bloques directamente en esa selección.
-hint.research = Usa el botón \ue875 [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos.
-hint.research.mobile = Usa el botón \ue875 [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos.
+hint.breaking.mobile = Activa el botón con el [accent]martillo[] situado abajo a la derecha y selecciona bloques para eliminarlos.\n\nMantén el dedo un segundo y arrastra para eliminar bloques directamente en esa selección.
+hint.blockInfo = Puedes visualizar información de un bloque seleccionándolo en el [accent]menú de construcción[], mediante el botón [accent][[?][] en la derecha.
+hint.derelict = Las estructuras [accent]abandonadas[] son ruinas inservibles de antiguas bases no operativas.\n\nEstas estructuras pueden ser [accent]deconstruidas[] para obtener recursos.
+hint.research = Usa el botón [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos.
+hint.research.mobile = Usa el botón [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos.
 hint.unitControl = Mantén [accent][[L-ctrl][] y [accent]haz clic[] sobre unidades o torretas aliadas para controlarlas manualmente.
 hint.unitControl.mobile = [accent][Toca dos veces rápidamente[] una unidad o torreta aliada para controlarla manualmente.
-hint.launch = Cuando tengas sufientes recursos, puedes [accent]Lanzar el Núcleo[] escogiendo como objetivo sectores cercanos en el \ue827 [accent]Mapa[] abajo a la derecha.
-hint.launch.mobile = Cuando tengas sufientes recursos, puedes [accent]Lanzar el Núcleo[] escogiendo como objetivo sectores cercanos en el \ue827 [accent]Mapa[], disponible desde el \ue88c [accent]Menú de pausa[].
+hint.unitSelectControl = Para controlar unidades, entra al [accent]modo comando[] manteniendo [accent]L-shift.[]\nUna vez en modo comando, haz clic y arrastra para seleccionar unidades. [accent]Clic derecho[] sobre una ubicación u objetivo para desplazar las unidades ahí.
+hint.unitSelectControl.mobile = Para controlar unidades, entra al [accent]modo comando[] pulsando el [accent]botón de comando[] en la esquina inferior izquierda.\nUna vez en modo comando, mantén pulsado y arrastra para seleccionar unidades. Toca una ubicación u objetivo para desplazar las unidades ahí.
+hint.launch = Cuando tengas sufientes recursos, puedes [accent]Lanzar el núcleo[] escogiendo como objetivo sectores cercanos en el [accent]Mapa[] abajo a la derecha.
+hint.launch.mobile = Cuando tengas sufientes recursos, puedes [accent]Lanzar el núcleo[] escogiendo como objetivo sectores cercanos en el [accent]Mapa[], disponible desde el [accent]Menú de pausa[].
 hint.schematicSelect = Mantén [accent][[F][] y arrastra para crear una selección de bloques que puedes copiar y pegar.\n\nUsa [accent][[Clic central][] para seleccionar un tipo de bloque.
+hint.rebuildSelect = Mantén [accent][[B][] y arrastra para seleccionar planos de bloques destruidos.\nEsto los reconstruirá automáticamente.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Mantener [accent][[L-Ctrl][] mientras arrastras cintas transportadoras generará automáticamente una ruta.
-hint.conveyorPathfind.mobile = Activa el\ue844 [accent]modo diagonal[] y arrastra cintas transportadoras para generar una ruta inteligente.
-hint.boost = Mantén [accent][[L-Shift][] para sobrevolar obstáculos con tu unidad actual.\n\nSólo algunas unidades terrestres disponen de estos propulsores.
-hint.command = Pulsa [accent][[G][] para comandar unidades aliadas cercanas.
-hint.command.mobile = [accent][[Toca dos veces][] tu unidad para comandar unidades aliadas cercanas.
-hint.payloadPickup = Pulsa [accent][[[] para recoger bloques pequeños o unidades.
-hint.payloadPickup.mobile = [accent]Mantén[] sobre un bloque pequeño o unidad para recogerlo.
+hint.conveyorPathfind.mobile = Activa el [accent]modo diagonal[] y arrastra cintas transportadoras para generar una ruta inteligente.
+hint.boost = Mantén [accent][[L-Shift][] para sobrevolar obstáculos con tu unidad actual.\n\nSólo algunas unidades terrestres disponen de propulsores que les otorgan esta habilidad.
+hint.payloadPickup = Pulsa [accent][[[] para recoger bloques o unidades.
+hint.payloadPickup.mobile = [accent]Mantén[] sobre un bloque o unidad para recogerlo.
 hint.payloadDrop = Pulsa [accent]][] para soltar la carga.
 hint.payloadDrop.mobile = [accent]Mantén[] sobre un lugar vacío para soltar la carga.
-hint.waveFire = Cuando las torretas [accent]Wave[] usan agua como munición, apagarán fuego e incendios cercanos automáticamente.
-hint.generator = Los \uf879[accent]Generadores de combustión[] querman carbón para transmitir energía a bloques adyacentes.\n\nEl alcance de transmisión de energía se puede extender usando \uf87f[accent]Nodos de energía[].
-hint.guardian = Los [accent]Guardianes[] poseen una robusta armadura. Municiones débiles como el [accent]Cobre[] o el [accent]Plomo[] no son [scarlet]effectivas[] contra él.\n\nUsa torretas de mayor categoría o por ejemplo, munición de \uf835[accent]Grafito[] \uf861Duo/\uf859 en torretas Salvo para derribar a los Guardianes.
-hint.coreUpgrade = Los núcleos se pueden mejorar [accent]construyendo núcleos de mayor calidad encima[].\n\nColoca un  núcleo [accent]Foundation[] sobre el  núcleo [accent]Shard[]. Asegúrate de que no hay obstáculos cerca.
+hint.waveFire = Cuando las torretas [accent]Wave[] usen agua como munición, apagarán fuego e incendios cercanos automáticamente.
+hint.generator = Los [accent]Generadores de combustión[] querman carbón para transmitir energía a bloques adyacentes.\n\nEl alcance de transmisión de energía se puede extender usando [accent]Nodos de energía[].
+hint.guardian = Los [accent]Guardianes[] poseen una robusta armadura. Municiones débiles como el [accent]Cobre[] o el [accent]Plomo[] no son [scarlet]effectivas[] contra él.\n\nUsa torretas de mayor categoría o por ejemplo, munición de [accent]Grafito[] en torretas [accent]Salvo[] para derribar a los Guardianes con más facilidad.
+hint.coreUpgrade = Los núcleos se pueden mejorar [accent]construyendo núcleos de mayor calidad encima[].\n\nColoca un núcleo [accent]Foundation[] sobre el núcleo [accent]Shard[]. Asegúrate de que no hay obstáculos cerca.
 hint.presetLaunch = Las zonas de aterrizaje de los [accent]sectores grises[], como el [accent]Bosque Congelado[], son accesibles desde cualquier lugar. No requieren capturar sectores adyacentes.\n\nLos [accent]sectores numerados[], como este, son [accent]opcionales[].
+hint.presetDifficulty = Este sector tiene un [scarlet]alto nivel de amenaza enemiga[].\n[accent]No es recomendable[] viajar a sectores como estos sin las tecnologías adecuadas y preparación.
 hint.coreIncinerate = Tras completar la capacidad máxima de almacenamiento en el núcleo para un tipo de objeto, cualquier recurso adicional de ese tipo que reciba el núcleo será [accent]incinerado[].
-hint.coopCampaign = Sí estás jugando el modo [accent]campaña en multijugador[], los objetos producidos en el mapa actual también se enviarán [accent]a los sectores locales de cada jugador[].\n\nCualquier nueva investigación tecnológica realizada por el anfitrión también se desbloqueará para los demás jugadores.
+hint.factoryControl = Para establecer el [accent]destino de salida[] de una fábrica de unidades, haz clic sobre dicho bloque desde el modo comando, luego clic derecho en el destino a elegir.\nLas unidades fabricadas intentarán desplazarse allí automáticamente.
+hint.factoryControl.mobile = Para establecer el [accent]destino de salida[] de una fábrica de unidades, toca dicho bloque en modo comando, y luego toca el destino que quieras elegir.\nLas unidades fabricadas intentarán desplazarse hasta esta ubicación automáticamente.
 
-item.copper.description = Un práctico material de estructura. Usado en todo tipo de bloques.
+gz.mine = Acércate al \uf8c4 [accent]mineral de cobre[] del suelo y haz clic sobre él para empezar a minarlo.
+gz.mine.mobile = Acércate al \uf8c4 [accent]mineral de cobre[] del suelo y tócalo para empezar a minarlo.
+gz.research = Abre el menú de \ue875 investigaciones tecnológicas.\nInvestiga el \uf870 [accent]taladro mecánico[], luego selecciónalo en el menú inferior derecho.\nHaz clic sobre una veta de cobre para colocar el taladro.
+gz.research.mobile = Abre el menú de \ue875 investigaciones tecnológicas.\nInvestiga el \uf870 [accent]taladro mecánico[], luego selecciónalo en el menú inferior derecho.\nToca una veta de cobre para colocar el taladro.\n\nPulsa el \ue800 [accent]botón de confirmación[] de abajo a la derecha para confirmar.
+gz.conveyors = Investiga y construye \uf896 [accent]cintas transportadoras[] para mover los recursos minados\ndesde los taladros hasta el núcleo.\n\nArrastra para colocar múltiples bloques de cintas transportadoras.\nUsa la [accent]rueda del ratón[] para cambiar su dirección.
+gz.conveyors.mobile = Investiga y construye \uf896 [accent]cintas transportadoras[] para mover los recursos minados \ndesde los taladros hasta el núcleo.\n\nMantén pulsado un segundo y arrastra para colocar múltiples bloques de cintas transportadoras.
+gz.drills = Expande la operación minera.\nConstruye más taladros mecánicos.\nExtrae 100 de cobre.
+gz.lead = El \uf837 [accent]plomo[] es otro recurso muy usado.\nConstruye taladros para extraer plomo.
+gz.moveup = \ue804 Sigue explorando para más objetivos.
+gz.turrets = Investiga y construye 2 torretas \uf861 [accent]Duo[] para defender el núcleo.\nLas torretas Duo requieren un suministro de \uf838 [accent]munición[] mediante cintas transportadoras.
+gz.duoammo = Suministra [accent]cobre[] a las torretas Duo, usando cintas transportadoras.
+gz.walls = Los [accent]muros[] pueden evitar que las estructuras reciban daño.\nConstruye \uf8ae [accent]muros de cobre[] alrededor de las torretas.
+gz.defend = Se aproxima un enemigo, prepárate para defenderte.
+gz.aa = Las unidades aéreas no son tan fáciles de eliminar con torretas comunes.\n\uf860 Las torretas [accent]Scatter[] proporcionan una excelente defensa anti-aérea, pero utilizan \uf837 [accent]plomo[] como munición.
+gz.scatterammo = Suministra [accent]plomo[] a la torreta Scatter mediante cintas transportadoras.
+gz.supplyturret = [accent]Cargar torreta
+gz.zone1 = Esta es la zona de aterrizaje del enemigo.
+gz.zone2 = Cualquier estructura en el área será destruida al comenzar una oleada.
+gz.zone3 = Ahora comenzará una oleada.\nPrepárate.
+gz.finish = Construye más torretas, extrae más recursos,\ny defiéndete de todas las oleadas para [accent]capturar este sector[].
+onset.mine = Haz clic para minar \uf748 [accent]berilio[] de las paredes.\n\nUsa [accent][[WASD] para moverte.
+onset.mine.mobile = Toca para minar \uf748 [accent]berilio[] de las paredes.
+onset.research = Abre el \ue875 menú de investigaciones.\nInvestiga y construye una \uf73e [accent]turbina condensadora[] en la grieta.\nEsto generará [accent]energía[].
+onset.bore = Investiga y construye un \uf741 [accent]perforador de plasma[].\nEste minará recursos de las paredes automáticamente.
+onset.power = Para [accent]encender[] el perforador de plasma, investiga y coloca un \uf73d [accent]nodo de energía ortogonal[].\nConecta la turbina condensadora al perforador de plasma.
+onset.ducts = Investiga y construye \uf799 [accent]conductos[] para mover los recursos minados desde el perforador de plasma hasta el núcleo.\nArrastra para formar una cadena de transporte con múltiples bloques de conducto.\nUsa la [accent]rueda del ratón[] para cambiar la dirección.
+onset.ducts.mobile = Investiga y construye \uf799 [accent]conductos[] para mover los recursos minados desde el perforador de plasma hasta el núcleo.\n\nPresiona por un segundo y arrastra para crear múltiples bloques de conducto.
+onset.moremine = Expande la operación minera.\nConstruye más perforadores de plasma y usa nodos de energía ortogonales y conductos para complementarlos.\nExtrae 200 de berilio.
+onset.graphite = Otros bloques más complejos requieren \uf835 [accent]grafito[].\nConstruye perforadores de plasma para extraer grafito.
+onset.research2 = Empieza a investigar las [accent]fábricas[].\nDesbloquea el \uf74d [accent]triturador de paredes[] y el \uf779 [accent]horno de arco de silicio[].
+onset.arcfurnace = El horno de arco necesita \uf834 [accent]arena[] y \uf835 [accent]grafito[] para producir \uf82f [accent]silicio[].\nTambién requiere [accent]energía[] para funcionar.
+onset.crusher = Usa los \uf74d [accent]trituradores de paredes[] para conseguir arena.
+onset.fabricator = Usa [accent]unidades[] para explorar el mapa, defender tus estructuras, y atacar al enemigo. Investiga y construye un \uf6a2 [accent]fabricador de tanques[].
+onset.makeunit = Produce una unidad.\nUsa el botón "?" para ver los requisitos de la fábrica seleccionada.
+onset.turrets = Las unidades son efectivas, pero las [accent]torretas[] pueden ofrecer mejores capacidades defensivas si se usan de forma efectiva.\nConstruye una torreta \uf6eb [accent]Breach[].\nLas torretas requieren \uf748 [accent]munición[].
+onset.turretammo = Suministra [accent]munición de berilio[] a la torreta.
+onset.walls = Los [accent]muros[] pueden evitar que las estructuras reciban daño.\nColoca unos \uf6ee [accent]muros de berilio[] alrededor de la torreta.
+onset.enemies = Se aproxima un enemigo, prepárate para defenderte.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = El enemigo es ahora vulnerable. Contraataca.
+onset.cores = Se pueden colocar nuevos núcleos sobre las [accent]zonas de núcleo[].\nLos núcleos adicionales funcionan como bases avanzadas y comparten el inventario de recursos con otros núcleos.\nColoca un \uf725 núcleo.
+onset.detect = El enemigo te detectará en 2 minutos.\nEstablece sistemas de defensa, minería, y producción.
+
+#Don't translate these yet!
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Algunos bloques pueden ser recogidos por la unidad del núcleo.\nRecoge este [accent]contenedor[] y suéltalo sobre el [accent]puerto de carga[].\n(Las teclas por defecto son [ para recoger y ] para soltar la carga)
+split.pickup.mobile = Algunos bloques pueden ser recogidos por la unidad del núcleo.\nRecoge este [accent]contenedor[] y suéltalo sobre el [accent]puerto de carga[].\n(Para recoger o soltar algo, mantenlo pulsado.)
+split.acquire = Necesitas recolectar tungsteno para construir unidades.
+split.build = Debes transportar las unidades al otro lado del muro.\nConstruye dos [accent]catapultas electromagnéticas de carga[], uno a cada lado del muro.\nEnlázalos pulsando sobre uno, y luego seleccionando el otro.
+split.container = Igual que los contenedores, las unidades también se pueden transportar usando [accent]catapultas electromagnéticas de carga[].\nConstruye un fabricador de unidades adyacente a una catapulta electromagnética, así podrás enviarlas através del muro para atacar la base enemiga.
+
+item.copper.description = Usado en todo tipo de bloques y munición.
 item.copper.details = Cobre. Metal anormalmente abundante en Serpulo. Estructuralmente débil a menos que sea reforzado.
-item.lead.description = Un material básico. Usado en electrónicos y transferencia de líquidos.
-item.lead.details = Denso. Inerte. Extensamente usado en baterías.\nNota: Suele ser tóxico para la mayoría de formas de vida biológicas. Aunque ya no quedan muchas de esas por aquí.
+item.lead.description = Usado en estructuras elécticas y transferencia de líquidos.
+item.lead.details = Denso. Inerte. Usado en baterías.\nNota: Suele ser tóxico para la mayoría de formas de vida biológicas. Aunque ya no quedan muchas de esas por aquí.
 item.metaglass.description = Usado en almacenamiento y distribución de líquidos.
 item.graphite.description = Carbón mineralizado, usado como munición y en componentes eléctricos.
 item.sand.description = Es usada sobre todo para producir otros minerales refinados.
 item.coal.description = Se usa como combustible y también en la producción de materiales refinados.
-item.coal.details = Parece ser materia vegetal fosilizada, formada hace mucho tiempo.
-item.titanium.description = Usado en transporte de liquidos, taladros y aeronaves.
+item.coal.details = Parece ser materia vegetal fosilizada, formada mucho antes del evento de "Sembrado"
+item.titanium.description = Usado en transporte de liquidos, taladros y fábricas.
 item.thorium.description = Usado en estructuras robustas y como combustible nuclear.
-item.scrap.description = Usado en fundidores y pulverizadores para refinarlo en otros materiales.
+item.scrap.description = Usada en fundidores y pulverizadores para refinarlo en otros materiales.
 item.scrap.details = Restos de antiguas estructuras y unidades caídas.
-item.silicon.description = Usado en paneles solares, electrónicos complejos y munición inteligente.
+item.silicon.description = Usado en paneles solares, electrónicos complejos y munición guiada.
 item.plastanium.description = Usado en unidades avanzadas, aislamiento y munición de fragmentación.
 item.phase-fabric.description = Usado en electrónicos avanzados y estructuras autoreparadoras.
 item.surge-alloy.description = Usado en armamento avanzado y estructuras de defensa reactiva.
 item.spore-pod.description = Se puede usar como combustible, o para obtener petróleo y explosivos.
-item.spore-pod.details = Esporas. Es algo parecido a una forma de vida sintética. Emiten gases tóxicos para el resto de vida biológica. Extremadamente invasivo. Altamente inflamable bajo determinadas condiciones.
+item.spore-pod.details = Esporas. Son algo parecido a una forma de vida sintética. Emiten gases tóxicos para el resto de vida biológica. Extremadamente invasivo. Altamente inflamable bajo determinadas condiciones.
 item.blast-compound.description = Usado en bombas y munición explosiva.
-item.pyratite.description = Usado en armas incendiarias y generadores  de combustión.
+item.pyratite.description = Usado en armas incendiarias y generadores de combustión.
 
-liquid.water.description = Usada comúnmente para enfriar máquinas y para procesar residuos.
+# Erekir
+item.beryllium.description = Usado en varios tipos de estructuras y munición en Erekir.
+item.tungsten.description = Se usa en taladros, blindajes y munición. Es un componente esencial en la construcción de estructuras avanzadas.
+item.oxide.description = Se usa como conductor térmico y aislante eléctrico.
+item.carbide.description = Se usa en estructuras avanzadas, unidades pesadas, y munición.
+
+liquid.water.description = Usado para enfriar máquinas y para procesar residuos.
 liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o disparado a unidades enemigas como arma.
 liquid.oil.description = Se utiliza en producción de materiales avanzados, y en munición incendiaria.
 liquid.cryofluid.description = Usado como refrigerante para reactores, torretas, y fábricas.
 
-block.resupply-point.description = Reabastece unidades cercanas con munición de cobre. No es compatible con unidades que requieren energía.
-block.armored-conveyor.description = Mueve objetos. No acepta objetos si entran por los lados.
+# Erekir
+liquid.arkycite.description = Se usa en reacciones químicas para generar energía y sintetizar materiales.
+liquid.ozone.description = Usado como agente oxidante en la producción de materiales, y como combustible. Moderadamente explosivo.
+liquid.hydrogen.description = Se usa en la extracción de recursos, producción de unidades, y reparación de estructuras. Inflamable.
+liquid.cyanogen.description = Se usa en municiones, producción de unidades avanzadas, y reacciones en bloques avanzados. Altamente inflamable.
+liquid.nitrogen.description = Se usa en extracción de recursos, producción de gas y construcción de unidades. Inerte.
+liquid.neoplasm.description = Un peligroso derivado biológico del reactor de Neoplasia. Se propaga rápidamente a través de cualquier bloque con agua con el que entre en contacto, deteriorándolo en el proceso. Viscoso.
+liquid.neoplasm.details = Neoplasma. Una incontrolable masa fangosa de células sintéticas que expande rápidamente. Resiste el calor. Es extremadamente peligroso para cualquier estructura relacionada con agua.\n\nDemasiado complejo e inestable para analizarlo. Se desconocen sus posibles aplicaciones. Se recomienda incinerarlo en lagos de magma.
+
+block.derelict = [lightgray]Abandonado
+block.armored-conveyor.description = Mueve objetos. No los acepta si entran por los lados.
 block.illuminator.description = Emite luz.
-block.message.description = Almacena un mensaje. Puedes usarlo para comunicarte con aliados o dejar recordatorios.
+block.message.description = Almacena un mensaje para comunicarte con tus aliados o dejar recordatorios.
+block.reinforced-message.description = Almacena un mensaje para comunicarte con tus aliados.
+block.world-message.description = Un bloque de mensaje empleado en la creación de mapas. No se puede destruir.
 block.graphite-press.description = Comprime carbón en piezas de grafito puro.
-block.multi-press.description = Una versión mejorada de la prensa de grafito. Utiliza agua y energía para procesar carbón rápida y eficientemente.
-block.silicon-smelter.description = Reduce la arena con carbón puro. Produce silicio.
-block.kiln.description = Funde arena y plomo en metacristal. Requiere cantidades pequeñas de energía para funcionar.
-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.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.
-block.separator.description = Expone piedra a la presión del agua para obtener diversos minerales contenidos en la piedra.
-block.spore-press.description = Comprime esporas en petróleo.
-block.pulverizer.description = Despedaza la piedra en arena. Útil cuando no hay arena natural.
-block.coal-centrifuge.description = Solidifica petróleo en piezas de carbón.
-block.incinerator.description = Se deshace de cualquier líquido o material producido en exceso.
-block.power-void.description = Elimina toda la energía que se le da. Solo en disponible en el modo Libre.
-block.power-source.description = Da energía infinita. Solo disponible en el modo Libre.
-block.item-source.description = Hace aparecer minerales de forma infinita. Solo disponible en el modo Libre.
-block.item-void.description = Destruye cuanquier objeto que entra en él. Solo disponible en el modo Libre.
-block.liquid-source.description = Da líquido infinito. Solo disponible en el modo Libre.
-block.liquid-void.description = Elimina cualquier liquido que entra en él. Solo disponible en el modo Libre.
-block.copper-wall.description = Un bloque defensivo barato.\nÚtil para defender el núcleo y las torres en las primeras oleadas.
-block.copper-wall-large.description = Un bloque defensivo barato.\nÚtil para defender el núcleo y las torres en las primeras oleadas.\nOcupa múltiples casillas.
-block.titanium-wall.description = Un bloque defensivo moderadamente fuerte.\nProporciona protección moderada contra los enemigos.
-block.titanium-wall-large.description = Un bloque defensivo moderadamente fuerte.\nProporciona protección moderada contra los enemigos.\nOcupa múltiples casillas.
-block.plastanium-wall.description = Un tipo especial de pared que absorbe los arcos eléctricos y bloquea las conexiones automáticas de los nodos de potencia..
-block.plastanium-wall-large.description = Un tipo especial de pared que absorbe los arcos eléctricos y bloquea las conexiones automáticas de los nodos de potencia.\nOcupa múltiples casillas.
-block.thorium-wall.description = Un bloque defensivo fuerte.\nBuena protección contra enemigos.
-block.thorium-wall-large.description = Un bloque defensivo fuerte.\nBuena protección contra enemigos.\nOcupa múltiples casillas.
-block.phase-wall.description = No es tan fuerte como un muro de torio pero hace rebotar las balas del enemigo si no son demasiado fuertes.
-block.phase-wall-large.description = No es tan fuerte como un muro de torio pero rebota balas al enemigo si no son demasiado fuertes.\nOcupa múltiples casillas.
-block.surge-wall.description = El bloque defensivo más fuerte.\nTiene una pequeña probabilidad de disparar rayos al atacante.
-block.surge-wall-large.description = El bloque defensivo más fuerte.\nTiene una pequeña probabilidad de disparar rayos al atacante.\nOcupa múltiplies casillas.
-block.door.description = Una puerta pequeña que puede ser abierta y cerrada tocándola.\nSi está abirta, los enemigos pueden moverse y disparar a través de ella.
-block.door-large.description = Una puerta grande que puede ser abierta y cerrada tocándola.\nSi está abirta, los enemigos pueden moverse y disparar a través de ella.\nOcupa múltiples casillas.
-block.mender.description = Repara bloques cercanos de forma constante. Mantiene a las defensas reparadas entre oleadas. Puede usar silicio opcionalmente para mejorar el alcance y la eficiencia.
-block.mend-projector.description = Regenera edificios cercanos de forma constante. Ocupa multiples casillas.
-block.overdrive-projector.description = Aumenta la velocidad de edificios cercanos como taladros y transportadores.
-block.force-projector.description = Crea un área de fuerza hexagonal alrededor de él, protegiendo edificios y unidades dentro de él del daño de las balas hasta que se agota. \nRequiere de un suministro constante de energía para mantenerse activo.
-block.shock-mine.description = Daña enemigos que pisan a mina. Casi invisible al enemigo.
-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 objetos por lotes.\nAcepta objetos por detrás, y los descarga en tres direcciones hacia el frente, como un enrutador.
-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.
-block.sorter.description = Clasifica objetos. Si un objeto es igual al seleccionado, pasará al frente. Si no, el objeto saldrá por la izquierda y la derecha.
-block.inverted-sorter.description = Procesa elementos como un clasificador estándar, pero en su lugar pasa elementos seleccionados a los lados.
-block.router.description = Acepta objetos de una dirección luego los deja equitativamente en hasta 3 direcciones diferentes. Útil para dividir los materiales de una fuente de recursos a múltiples objetivos. \n\n[scarlet]Nunca usar como entrada de producción porque puede tapar con los objetos de salida.[]
-block.router.details = Un mal necesario... No se recomienda usarlo junto a estructuras de producción ya que puede atascar una cadena de transporte.
-block.distributor.description = Un enrutador avanzado que distribuye objetos equitativamente en hasta otras 7 direcciones.
-block.overflow-gate.description = Un enrutador que solo saca por la izquierda y la derecha si la cinta del frente está llena.
-block.underflow-gate.description = El opuesto de la compuerda de desborde. Solo dispensa hacia el frente si los lados están bloqueados.
-block.mass-driver.description = El mejor bloque de transorte. Recoge varios objetos y los dispara a otro conductor de masa en un largo rango. Requiere energía para operar.
-block.mechanical-pump.description = Una bomba de agua barata algo lenta, pero funciona sin energía.
-block.rotary-pump.description = Una bomba algo mas avanzada. Bombea más líquido, pero requiere energía.
-block.thermal-pump.description = La mejor bomba de líquidos. Utiliza energía.
-block.conduit.description = Bloque de transporte de líquidos básico. Funciona como un transportador, pero con líquidos. Usado con bombas, extractores u otros conductos.
-block.pulse-conduit.description = Bloque de transporte de líquidos avanzado. Transporta líquidos más rápidamente y almacena más que los conductos estándar.
-block.plated-conduit.description = Mueve líquidos a la misma velocidad que los conductos de pulso, pero posee más armadura. No acepta líquidos de los lados por otra cosa que no sean conductos.\nGotea menos.
-block.liquid-router.description = Acepta líquidos de una dirección y los deja en hasta 3 direcciones equitativamente. También puede almacenar cierta capacidad de líquido. Útil para dividir los líquidos de una fuente a varios objetivos.
-block.liquid-tank.description = Almacena una gran cantidad de líquidos. Úsalo para crear almacenes cuando no hay una demanda constante de materiales o para asegurarse de enfriar bloques vitales.
-block.liquid-junction.description = Actúa como un puente para dos condusctos que se cruzan. Útil en situaciones en las que hay dos conductos con líquidos diferentes a diferentes lugares.
-block.bridge-conduit.description = Bloque avanzado de transporte de líquidos. Permite transportar líquidos por encima de hasta 3 casillas de cualquier terreno o construcción.
-block.phase-conduit.description = Bloque de transporte de líquidos avanzado. Usa energía para transportar líquidos a otro conducto de fase conectado a través de varias casillas.
-block.power-node.description = Transmite energía a nodos conectados, conecta hasta diez fuentes de energía, edificios que usan energía o nodos. El nodo obtendrá o transmitirá energía de cualquier bloque adyacente.
-block.power-node-large.description = Tiene un radio más amplio que el nodo de energía y conecta hasta diez fuentes de energía, edificios que usan energía o nodos.
-block.surge-tower.description = Un nodo con un gran alcance, pero sólo dos conexiones disponibles.
-block.diode.description = La energía de la batería puede fluir a través de este bloque en una sola dirección, pero solo si el otro lado tiene menos energía almacenada.
-block.battery.description = Guarda energía cuando hay abundancia y proporciona energía cuando hay escasez de energía mientras la batería tenga energía.
-block.battery-large.description = Almacena mucha más energía que una batería normal.
-block.combustion-generator.description = Genera energía quemando materiales inflamables o petróleo.
-block.thermal-generator.description = Genera una gran cantidad de energía con la lava.
-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 pirotita.
-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.
-block.solar-panel-large.description = Genera un mayor suministro de energía que un panel solar estándar, pero también es mucho más caro de construir.
-block.thorium-reactor.description = Genera grandes cantidades de energía del torio altamente radioactivo. Necesita enfriamiento constante. Explotará violentamente si no se le aporta suficiente enfriamiento.
-block.impact-reactor.description = Un generador avanzado, capaz de crear cantidades masivas de energía a máxima eficiencia. Requiere una cantidad significante de energía para impulsar el comienzo del proceso.
-block.mechanical-drill.description = Un taladro barato. Cuando es colocado en casillas apropiadas, extrae objetos lentamente de forma indefinida. Solo es capaz de minar recursos básicos.
-block.pneumatic-drill.description = Un taladro mejorado, es capaz de minar titanio. Más rápido que un taladro mécanico.
-block.laser-drill.description = Su tecnología láser le permite obtener minerales incluso más rápido, pero requiere energía. Además, se puede obtener torio radioactivo con este taladro.
-block.blast-drill.description = El mejor taladro. Requiere grandes cantidades de energía y refrigeración.
-block.water-extractor.description = Extrae agua de la tierra. Úsalo cuando no haya lagos cercanos.
-block.cultivator.description = Cultiva concentraciones de esporas en la atmosfera a vainas.
+block.multi-press.description = Utiliza agua y energía para procesar carbón más eficientemente.
+block.silicon-smelter.description = Refina silicio procesando arena y carbón.
+block.kiln.description = Funde arena y plomo en metacristal.
+block.plastanium-compressor.description = Produce plastanio con petróleo y titanio.
+block.phase-weaver.description = Produce tejido de fase a partir del torio radioactivo y altas cantidades de arena.
+block.surge-smelter.description = Funde titanio, plomo, silicio y cobre para producir aleación eléctica.
+block.cryofluid-mixer.description = Mezcla agua y polvo de titanio refinado para obtener líquido criogénico.
+block.blast-mixer.description = Usa esporas para transformar pirotita en compuestos explosivos.
+block.pyratite-mixer.description = Produce pirotita mezclando carbón, plomo y arena.
+block.melter.description = Funde chatarra para producir magma.
+block.separator.description = Separa el magma en sus componentes minerales.
+block.spore-press.description = Comprime vainas de esporas en petróleo.
+block.pulverizer.description = Prensa chatarra hasta obtener arena.
+block.coal-centrifuge.description = Solidifica petróleo en trozos de carbón.
+block.incinerator.description = Vaporiza cualquier líquido o material que recibe.
+block.power-void.description = Elimina toda la energía que recibe. Solo disponible en el modo Libre.
+block.power-source.description = Genera energía infinita. Solo disponible en el modo Libre.
+block.item-source.description = Genera objetos de forma infinita. Solo disponible en el modo Libre.
+block.item-void.description = Destruye los objetos que entran en él. Solo disponible en el modo Libre.
+block.liquid-source.description = Genera cualquier líquido de forma infinita. Solo disponible en el modo Libre.
+block.liquid-void.description = Elimina los liquidos que entran en él. Solo disponible en el modo Libre.
+block.payload-source.description = Genera estructuras o unidades de forma infinita. Solo disponible en el modo Libre.
+block.payload-void.description = Destruye cualquier bloque o unidad. Solo disponible en el modo Libre.
+block.copper-wall.description = Protege estructuras de proyectiles enemigos.
+block.copper-wall-large.description = Protege estructuras de proyectiles enemigos.
+block.titanium-wall.description = Protege estructuras de proyectiles enemigos.
+block.titanium-wall-large.description = Protege estructuras de proyectiles enemigos.
+block.plastanium-wall.description = Protege estructuras de proyectiles enemigos. Absorbe láseres y rayos. Bloquea las conexiones automáticas de nodos de energía.
+block.plastanium-wall-large.description = Protege estructuras de proyectiles enemigos. Absorbe láseres y rayos. Bloquea las conexiones automáticas de nodos de energía.
+block.thorium-wall.description = Protege estructuras de proyectiles enemigos.
+block.thorium-wall-large.description = Protege estructuras de proyectiles enemigos.
+block.phase-wall.description = Protege estructuras de proyectiles enemigos. Puede reflejar la mayoría de proyectiles al imapctar.
+block.phase-wall-large.description = Protege estructuras de proyectiles enemigos. Puede reflejar la mayoría de proyectiles al impactar.
+block.surge-wall.description = Protege estructuras de proyectiles enemigos. Al contaco, libera arcos eléctricos periódicamente.
+block.surge-wall-large.description = Protege estructuras de proyectiles enemigos. Al contaco, libera arcos eléctricos periódicamente.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Un muro que puede estar cerrado o abierto, permitiendo el paso a través de él.
+block.door-large.description = Un muro que puede estar cerrado o abierto, permitiendo el paso a través de él.
+block.mender.description = Repara estructuras cercanas constantemente. Puede usar silicio para potenciar su alcance y eficiencia.
+block.mend-projector.description = Repara estructuras cercanas constantemente. Puede usar tejido de fase para potenciar su alcance y eficiencia.
+block.overdrive-projector.description = Incrementa la velocidad de estructuras cercanas. Puede usar tejido de fase para potenciar su alcance y eficiencia.
+block.force-projector.description = Crea un campo de fuerza hexagonal a su alrededor, protegiendo unidades y estructuras cercanas.\nSe sobrecalentará si absorbe demasiado daño, lo que se puede evitar utilizando refrigerante. Se puede usar tejido de fase para aumentar el escudo.
+block.shock-mine.description = Libera arcos eléctricos al contacto con una unidad enemiga.
+block.conveyor.description = Mueve objetos hacia adelante.
+block.titanium-conveyor.description = Mueve objetos más rápido.
+block.plastanium-conveyor.description = Mueve objetos por lotes.\nAcepta objetos por detrás, y al final divide cada lote en hasta tres direcciones válidas. Requiere múltiples puntos de entrada y salida para alcanzar su máxima eficacia.
+block.junction.description = Actúa como puente para dos transportadores que se cruzan.
+block.bridge-conveyor.description = Transporta objetos sobre cualquier terreno o estructura.
+block.phase-conveyor.description = Transporta objetos instantáneamente sobre cualquier terreno o estructura. Tiene un mayor alcance que el puente básico, pero requiere energía.
+block.sorter.description = Si el objeto entrante es igual al seleccionado, pasará al frente. Si no, los objetos saldrán por la izquierda y la derecha.
+block.inverted-sorter.description = Similar a un clasificador normal, pero devuelve el elemento seleccionado a los lados.
+block.router.description = Distribuye los objetos entrantes hasta en 3 direcciones de salida equitativamente.
+block.router.details = Un mal necesario... No se recomienda usarlo junto a estructuras de producción ya que los objetos de salida pueden atascar la entrada del mismo bloque, e incluso toda la cadena de transporte.
+block.distributor.description = Distribuye objetos equitativamente en hasta otras 7 direcciones.
+block.overflow-gate.description = Saca los objetos entrantes por los lados cuando la cinta del frente está llena.
+block.underflow-gate.description = El opuesto de la compuerta de desborde. Sólo devuelve objetos hacia el frente cuando sus lados están bloqueados.
+block.mass-driver.description = Estructura de transporte de largo alcance. Acumula varios objetos y los dispara a otro del mismo tipo.
+block.mechanical-pump.description = Extrae y bombea líquidos. Funciona sin energía.
+block.rotary-pump.description = Extrae y bombea líquidos. Requiere energía.
+block.impulse-pump.description = Extrae y bombea líquidos.
+block.conduit.description = Mueve líquidos hacia delante. Se usa junto con bombas y otras tuberías.
+block.pulse-conduit.description = Transporta líquidos rápidamente y almacena más que las tuberías estándar.
+block.plated-conduit.description = Transporta líquidos rápidamente. No acepta líquidos por los lados. No gotea.
+block.liquid-router.description = Reparte el líquido entrante en hasta 3 direcciones equitativamente. También puede almacenar una pequeña cantidad de líquido.
+block.liquid-container.description = Almacena líquidos. Lo devuelve en todas las direcciones de salida válidas, como un enrutador de líquidos.
+block.liquid-tank.description = Almacena una gran cantidad de líquidos. Lo devuelve en todas direcciones, como un enrutador de líquidos.
+block.liquid-junction.description = Actúa como un puente para dos tuberías que se cruzan.
+block.bridge-conduit.description = Permite transportar líquidos sobre cualquier terreno o estructura.
+block.phase-conduit.description = Tiene más alcance que una tubería puente normal, pero requiere energía.
+block.power-node.description = Transmite energía a nodos conectados. Además, el nodo obtendrá o transmitirá energía de cualquier bloque adyacente.
+block.power-node-large.description = Nodo de energía avanzado con un mayor alcance.
+block.surge-tower.description = Un nodo de largo alcance, con sólo un par de conexiones disponibles.
+block.diode.description = Mueve la energía entre baterías en una sola dirección, pero sólo si el otro lado tiene menos energía almacenada.
+block.battery.description = Almacena energía cuando se genera en abundancia. Proporciona energía cuando escasea.
+block.battery-large.description = Almacena energía cuando se genera en abundancia. Proporciona energía cuando escasea. Tiene más capacidad que una batería normal.
+block.combustion-generator.description = Genera energía quemando materiales inflamables, como el carbón.
+block.thermal-generator.description = Genera una gran cantidad de energía si se construye sobre zonas con altas temperaturas.
+block.steam-generator.description = Genera energía quemando materiales inflamables y convirtiendo agua en vapor.
+block.differential-generator.description = Genera grandes cantidades de energía. Utiliza la diferencia de temperatura entre el fluído criogenico y el quemado de pirotita.
+block.rtg-generator.description = Usa el calor de generado en la descomposición de elementos radioactivos para producir energía lentamente.
+block.solar-panel.description = Proporciona una pequeña cantidad de energía de los rayos solares.
+block.solar-panel-large.description = Proporciona una pequeña cantidad de energía de los rayos solares. Es más eficiente que el panel solar estándar.
+block.thorium-reactor.description = Genera grandes cantidades de energía procesando torio. Necesita enfriamiento constante. Explotará violentamente si no se refrigera constantemente.
+block.impact-reactor.description = Capaz de crear cantidades masivas de energía a máxima eficiencia. Requiere una cantidad significante de energía para impulsar la producción.
+block.mechanical-drill.description = Si se construye sobre vetas de minerales, extrae objetos lentamente de forma indefinida. Solo es capaz de minar recursos básicos.
+block.pneumatic-drill.description = Un taladro mejorado, capaz de extraer titanio. Más rápido que un taladro mécanico.
+block.laser-drill.description = Su tecnología láser le permite obtener minerales incluso más rápido, pero requiere energía. Puede extraer torio.
+block.blast-drill.description = El mejor taladro. Requiere grandes cantidades de energía.
+block.water-extractor.description = Extrae agua subterránea. Úsalo cuando no haya agua disponible en la superficie.
+block.cultivator.description = Cultiva pequeñas concentraciones de esporas en la atmosfera en vainas de esporas.
 block.cultivator.details = Tecnología recuperada. Usada para producir cantidades masivas de biomasa. Parecido al primer incubador de esporas, que ahora cubren Serpulo.
-block.oil-extractor.description = Usa grandes cantidades de energía, arena y agua para obtener petróleo. Úsalo cuando no hay fuentes directas de petróleo cerca.
-block.core-shard.description = El núcleo de la base. Compacto. Puede auto-replicarse. Equipado con propulsores de uso único. 
-block.core-shard.details = La primera iteración. Si es destruido, todo contacto con el sector está perdido. No designado para viajes interplanetarios.
+block.oil-extractor.description = Usa grandes cantidades de energía, arena y agua para obtener petróleo.
+block.core-shard.description = El núcleo de la base. Si es destruido, todo contacto con el sector está perdido.
+block.core-shard.details = La primera iteración. Compacto. Puede auto-replicarse. Equipado con propulsores de uso único. No designado para viajes interplanetarios.
 block.core-foundation.description = El núcleo de la base. Mejor blindado. Almacena más recursos que el modelo Shard.
 block.core-foundation.details = La segunda iteración.
 block.core-nucleus.description = El núcleo de la base. Extremadamente bien armado. Almacena cantidades masivas de recursos.
 block.core-nucleus.details = La tercera y última iteración.
-block.vault.description = Almacena una gran cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] descargador[] puede usarse para obtener los objetos almacenados.
-block.container.description = Almacena una pequeña cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] descargador[] puede usarse para obtener objetos del contenedor.
-block.unloader.description = Descarga objetos de un contenedor, almacén o el núcleo a un transportador o directamente a un bloque adyacente. El tipo de objeto descargado puede ser cambiado tocando el descagador.
-block.launch-pad.description = Lanza paquetes de recursos a los sectores seleccionados.
-block.duo.description = Una torre pequeña y barata. Útil contra enemigos terrestres no demasiado fuertes.
-block.scatter.description = Una torreta antiaérea de tamaño medio. Dispara proyectiles de plomo o chatarra a las unidades enemigas.
+block.vault.description = Almacena una gran cantidad de objetos de cada tipo. Su contenido se puede recuperar con un descargador.
+block.container.description = Almacena una pequeña cantidad de objetos de cada tipo. Su contenido se puede recuperar con un descargador.
+block.unloader.description = Descarga el objeto seleccionado de bloques cercanos.
+block.launch-pad.description = Lanza lotes de recursos a los sectores seleccionados.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = Dispara balas sencillas a los enemigos.
+block.scatter.description = Dispara proyectiles de plomo, chatarra o metacristal a las unidades aéreas enemigas.
 block.scorch.description = Quema a cualquier enemigo terrestre cercano a él. Altamente efectivo a corto alcance.
-block.hail.description = Una torre de artillería pequeña de largo alcance.
-block.wave.description = Una torre de tamaño mediano. Dispara chorros de líquido a enemigos. Apaga el fuego en su rango de acción si recibe agua.
-block.lancer.description = Una torre láser anti-terrestre de tamaño mediano. Dispara y carga poderosos rayos de energía.
-block.arc.description = Una pequeña torre eléctrica de rango corto. Dispara arcos de electricidad a los enemigos.
-block.swarmer.description = Una torre de tamaño mediano que dispara misiles. Ataca a aire y tierra. Dispara misiles teledirigidos.
-block.salvo.description = Una versión más grande y avanzada de la torre dúo. Dispara ráfagas a enemigos terrestres y aéreos.
-block.fuse.description = Una torre grande de energía de corto alcance. Dispara tres rayos perforantes a enemigos cercanos.
-block.ripple.description = Una torre extramadamente poderosa. Dispara conjuntos de balas a los enemigos desde grandes distancias.
-block.cyclone.description = Una torre grande anti-aérea y anti-terrestre. Dispara conjuntos fragmentados explosivos 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 continuo a enemigos cercanos. Requiere enfriamiento para operar.
-block.foreshadow.description = Dispara un rayo de un solo objetivo a grandes distancias.
+block.hail.description = Dispara proyectiles a enemigos terrestres sobre largas distancias.
+block.wave.description = Dispara chorros de líquido a enemigos. Apaga fuego automáticamente si se lo suministra con agua.
+block.lancer.description = Carga y dispara poderosos rayos de energía a objetivos terrestres.
+block.arc.description = Dispara arcos de electricidad a objetivos terrestres.
+block.swarmer.description = Dispara misiles autodirigidos a enemigos.
+block.salvo.description = Dispara ráfagas de balas a enemigos.
+block.fuse.description = Dispara tres rayos perforantes de corta distancia a enemigos cercanos.
+block.ripple.description = Dispara cúmulos de balas a los enemigos desde grandes distancias.
+block.cyclone.description = Dispara fragmentados explosivos a enemigos cercanos.
+block.spectre.description = Dispara poderosas balas perforantes a objetivos aéreos y terrestres.
+block.meltdown.description = Carga y dispara un poderoso rayo láser persistente. Necesita refrigerante para funcionar.
+block.foreshadow.description = Dispara un rayo de objetivo único a larga distancia. Prioriza enemigos con mayor salud máxima.
 block.repair-point.description = Repara constantemente la unidad dañada más cercana dentro de su área.
-block.segment.description = Daña y destruye proyectiles que se acerquen. No afecta a los láseres.
+block.segment.description = Daña y destruye proyectiles enemigos. No afecta a láseres.
 block.parallax.description = Dispara un rayo tractor que atrae enemigos aéreos, dañándolos en el proceso.
 block.tsunami.description = Dispara poderosos torrentes de líquido a los enemigos. También apaga fuegos automáticamente si se lo abastece con agua.
 block.silicon-crucible.description = Refina silicio a partir de arena y carbón, usando pirotita como una fuente de calor adicional. Es más eficiente en lugares cálidos.
-block.disassembler.description = Separa magma cantidades moderadas de componentes minerales exóticos con baja eficiencia. Puede producir Torio.
-block.overdrive-dome.description =  Incrementa la velocidad de estructuras cercanas. Requiere Tejido de Fase, y Silicio para operar.
-block.payload-conveyor.description = Mueve tanto grandes cargas, como unidades recién ensambladas de sus fábricas.
+block.disassembler.description = Separa magma en cantidades moderadas de componentes minerales exóticos con baja eficiencia. Puede producir Torio.
+block.overdrive-dome.description = Incrementa la velocidad de estructuras cercanas. Requiere tejido de fase y silicio para operar.
+block.payload-conveyor.description = Mueve grandes cargas, como estructuras o unidades recién ensambladas de sus fábricas.
 block.payload-router.description = Divide las cargas entrantes en 3 direcciones de salida.
-block.command-center.description = Controla el comportamiento de las unidades con diferentes órdenes.
-block.ground-factory.description = Produce unidades terrestres. Las unidades resultantes se pueden usar directamente, o se pueden llevar a reconstructores para mejorarlas.
-block.air-factory.description = Produce unidades aéreas. Las unidades resultantes se pueden usar directamente, o se pueden llevar a reconstructores para mejorarlas.
-block.naval-factory.description = Produce unidades navales. Las unidades resultantes se pueden usar directamente, o se pueden llevar a reconstructores para mejorarlas.
+block.ground-factory.description = Produce unidades terrestres. Las unidades resultantes se pueden usar directamente, o se pueden transportar a reconstructores para mejorarlas.
+block.air-factory.description = Produce unidades aéreas. Las unidades resultantes se pueden usar directamente, o se pueden tranportar a reconstructores para mejorarlas.
+block.naval-factory.description = Produce unidades navales. Las unidades resultantes se pueden usar directamente, o se pueden transportar a reconstructores para mejorarlas.
 block.additive-reconstructor.description = Mejora unidades a segunda categoría.
 block.multiplicative-reconstructor.description = Mejora unidades a tercera categoría.
 block.exponential-reconstructor.description = Mejora unidades a cuarta categoría.
@@ -1461,41 +2239,434 @@ block.micro-processor.description = Ejecuta una secuencia de instrucciones lógi
 block.logic-processor.description = Ejecuta una secuencia de instrucciones lógicas en bucle. Se puede usar para controlar unidades y estructuras. Es más rápido que el microprocesador.
 block.hyper-processor.description = Ejecuta una secuencia de instrucciones lógicas en bucle. Se puede usar para controlar unidades y estructuras. Es más rápido que el procesador lógico.
 block.memory-cell.description = Almacena información para los procesadores lógicos.
-block.memory-bank.description =  Almacena información para los procesadores lógicos. Alta capacidad.
-block.logic-display.description = Muestra gráficos arbitrarios desde un procesador lógico.
-block.large-logic-display.description = También muestra gráficos arbitrarios desde un procesador lógico.
+block.memory-bank.description = Almacena información para los procesadores lógicos. Alta capacidad.
+block.logic-display.description = Muestra gráficos arbitrarios dibujados desde un procesador lógico.
+block.large-logic-display.description = Muestra gráficos arbitrarios dibujados desde un procesador lógico.
 block.interplanetary-accelerator.description = Una torre de proyección electromagnética masiva. Acelera núcleos hasta la velocidad necesaria para escapar del campo gravitatorio del planeta, habilitando el despliegue interplanetario.
+block.repair-turret.description = Repara continuamente la unidad dañada más cercana dentro de su alcance. Opcionalmente acepta refrigerante.
+
+# Erekir
+block.core-bastion.description = Núcleo de la base. Blindado. Una vez destruido, se pierde toda comunicación con el sector.
+block.core-citadel.description = Núcleo de la base. Altamente reforzado. Almacena más recursos que un núcleo Bastion.
+block.core-acropolis.description = Núcleo de la base. Posee un blindaje excepcional. Puede almacenar aún más recursos que un núcleo Citadel.
+block.breach.description = Dispara munición de berilio o tungsteno a los objetivos enemigos.
+block.diffuse.description = Dispara una ráfaga de proyectiles que se dispersan en un área de cono. Empuja a los enemigos.
+block.sublimate.description = Dispara un rayo de fuego continuo que perfora la armadura de los enemigos.
+block.titan.description = Dispara un proyectil de artillería explosivo a objetivos terrestres. Requiere hidrógeno.
+block.afflict.description = Dispara un gran orbe cargado de fragmentación antiaérea. Requiere calor.
+block.disperse.description = Dispara ráfagas de proyectiles a enemigos aéreos.
+block.lustre.description = Dispara un láser lento y de objetivo único a los enemigos.
+block.scathe.description = Lanza un poderoso misil a objetivos terrestres desde grandes distancias.
+block.smite.description = Dispara ráfagas de balas eléctricas y perforantes.
+block.malign.description = Bombardea a los enemigos con cargas de láseres dirigidos. Requiere mucho calor.
+block.silicon-arc-furnace.description = Refina silicio usando arena y grafito.
+block.oxidation-chamber.description = Convierte berilio y ozono en óxido. También emite calor.
+block.electric-heater.description = Calienta los bloques a los que apunta. Requiere grandes cantidades de energía.
+block.slag-heater.description = Calienta los bloques a los que apunta. Requiere magma.
+block.phase-heater.description = Calienta los bloques a los que apunta. Requiere tejido de fase.
+block.heat-redirector.description = Redirige el calor que acumula a otros bloques.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Distribuye el calor acumulado en tres direcciones de salida.
+block.electrolyzer.description = Convierte agua en hidrógeno y gas de ozono.
+block.atmospheric-concentrator.description = Concentra el nitrógeno disperso en la atmósfera. Requiere calor.
+block.surge-crucible.description = Genera aleación eléctrica usando magma y silicio. Requiere calor.
+block.phase-synthesizer.description = Sintetiza tejido de fase usando torio, arena, y ozono. Requiere calor.
+block.carbide-crucible.description = Combina grafito y tungsteno en carburo. Requiere calor.
+block.cyanogen-synthesizer.description = Sintetiza cianógeno usando arquicita y grafito. Requiere calor.
+block.slag-incinerator.description = Incinera líquidos u objetos no volátiles. Requiere magma.
+block.vent-condenser.description = Condensa gases en agua. Consume energía.
+block.plasma-bore.description = Si se coloca mirando hacia un muro con minerales, genera objetos indefinidamente. Requiere pequeñas cantidades de energía.
+block.large-plasma-bore.description = Un láser de plasma más grande, capaz de extraer tungsteno y torio. Requiere hidrógeno y energía.
+block.cliff-crusher.description = Tritura paredes, extrayendo arena indefinidamente. Requiere energía. Su eficiencia depende del tipo de pared.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Si se coloca sobre un mineral, extraerá ráfagas de objetos indefinidamente. Requiere energía y agua.
+block.eruption-drill.description = Un taladro de impacto mejorado, capaz de extraer torio. Requiere hidrógeno.
+block.reinforced-conduit.description = Mueve fluidos en una dirección. Sus lados no se conectarán con otros tipos de bloques, salvo que también sean tuberías.
+block.reinforced-liquid-router.description = Distribuye fluidos equitativamente en todas direcciones.
+block.reinforced-liquid-tank.description = Almacena una gran cantidad de fluidos.
+block.reinforced-liquid-container.description = Almacena una cantidad considerable de fluidos.
+block.reinforced-bridge-conduit.description = Transporta fluidos sobre el terreno o estructuras.
+block.reinforced-pump.description = Bombea y extrae líquidos. Requiere hidrógeno.
+block.beryllium-wall.description = Protege estructuras de proyectiles enemigos.
+block.beryllium-wall-large.description = Protege estructuras de proyectiles enemigos.
+block.tungsten-wall.description = Protege estructuras de proyectiles enemigos.
+block.tungsten-wall-large.description = Protege estructuras de proyectiles enemigos.
+block.carbide-wall.description = Protege estructuras de proyectiles enemigos.
+block.carbide-wall-large.description = Protege estructuras de proyectiles enemigos.
+block.reinforced-surge-wall.description = Protege estructuras de proyectiles enemigos. Libera periódicamente descargas eléctricas al impactar un proyectil.
+block.reinforced-surge-wall-large.description = Protege estructuras de proyectiles enemigos. Libera periódicamente descargas eléctricas al impactar un proyectil.
+block.shielded-wall.description = Protege estructuras de proyectiles enemigos. Si se le suministra energía, despliega un escudo que absorbe la mayoría de proyectiles. Es un buen conductor eléctrico.
+block.blast-door.description = Un muro que se abre cuando se le acercan unidades aliadas terrestres. No se puede controlar manualmente.
+block.duct.description = Mueve objetos en una dirección. Sólo puede almacenar un único objeto en su interior.
+block.armored-duct.description = Mueve objetos en una dirección. Sus lados no se conectarán con bloques que no sean del mismo tipo.
+block.duct-router.description = Distribuye objetos equitativamente en tres direcciones. Sólo acepta objetos de su parte trasera. Se puede configurar como un filtro de objetos.
+block.overflow-duct.description = Sólo devuelve los objetos hacia los lados cuando su parte frontal está bloqueada.
+block.duct-bridge.description = Transporta objetos sobre estructuras y el terreno.
+block.duct-unloader.description = Descarga los objetos seleccionados del bloque tras de este. No puede descargar objetos de los núcleos.
+block.underflow-duct.description = El opuesto al conducto de desbordamiento. Devuelve objetos hacia delante cuando se bloquean sus lados derecho e izquierdo.
+block.reinforced-liquid-junction.description = Hace de cruce para dos tuberías que se cruzan.
+block.surge-conveyor.description = Mueve objetos agrupados en lotes. Se puede acelerar si se le suministra energía. También conduce la energía.
+block.surge-router.description = Extrae objetos de las cintas transportadoras eléctricas, distribuyéndolos en hasta tres direcciones. Se puede acelerar suministrándole energía. Conduce la energía.
+block.unit-cargo-loader.description = Construye drones de carga. Estos drones distribuyen los objetos automáticamente en los "puntos de descarga" con el mismo filtro.
+block.unit-cargo-unload-point.description = Puntos de descarga para los drones de carga. Aceptan objetos que coincidan con el filtro seleccionado.
+block.beam-node.description = Transmite energía a otros bloques ortogonalmente. Almacena una pequeña cantidad de energía.
+block.beam-tower.description = Transmite energía a otros bloques ortogonalmente. Almacena grandes cantidades de energía. Tiene un mayor alcance.
+block.turbine-condenser.description = Genera energía si se coloca sobre grietas de gases en el terreno. Produce pequeñas cantidades de agua.
+block.chemical-combustion-chamber.description = Genera energía mediante arquicita y ozono.
+block.pyrolysis-generator.description = Genera grandes cantidades de energía mediante arquicita y magma. También produce agua.
+block.flux-reactor.description = Genera grandes cantidades de energía mientras disponga de calor suficiente. Requiere cianógeno como estabilizante. La salida de energía y el cianógeno requeridos son proporcionales al calor suministrado.\nExplotará si no se le proporciona suficiente cianógeno.
+block.neoplasia-reactor.description = Usa arquicita, agua y tejido de fase para generar grandes cantidades de energía. También produce calor y un peligroso neoplasma como subproducto.\nProducirá una violenta explosión si no se extrae el neoplasma acumulado reactor mediante tuberías.
+block.build-tower.description = Reconstruye estructuras dentro de su área de acción y asiste a otras unidades al construir.
+block.regen-projector.description = Repara lentamente estructuras aliadas en un perímetro cuadrado. Requiere hidrógeno.
+block.reinforced-container.description = Almacena una pequeña cantidad de objetos. Se puede obtener su contenido mediante descargadores. No incrementa la capacidad de almacenamiento del núcleo.
+block.reinforced-vault.description = Almacena una gran cantidad de objetos. Se puede obtener su contenido mediante descargadores. No incrementa la capacidad de almacenamiento del núcleo.
+block.tank-fabricator.description = Construye unidades Stell. Las unidades creadas pueden ser usadas directamente, o desplazadas hacia refabricadores para mejorarlas.
+block.ship-fabricator.description = Construye unidades Elude. Las unidades creadas pueden ser usadas directamente, o desplazadas hacia refabricadores para mejorarlas.
+block.mech-fabricator.description = Construye unidades Meuri. Las unidades creadas pueden ser usadas directamente, o desplazadas hacia refabricadores para mejorarlas.
+block.tank-assembler.description = Ensambla grandes tanques desde los bloques o unidades seleccionados. Se puede incrementar el nivel de la unidad resultante añadiendo módulos.
+block.ship-assembler.description = Ensambla grandes naves desde los bloques o unidades seleccionados. Se puede incrementar el nivel de la unidad resultante añadiendo módulos.
+block.mech-assembler.description = Ensambla grandes mechs desde los bloques o unidades seleccionados. Se puede incrementar el nivel de la unidad resultante añadiendo módulos.
+block.tank-refabricator.description = Mejora al segundo nivel el tanque seleccionado.
+block.ship-refabricator.description = Mejora al segundo nivel la nave seleccionada.
+block.mech-refabricator.description = Mejora al segundo nivel el mech seleccionado.
+block.prime-refabricator.description = Mejora al tercer nivel las unidades entrantes.
+block.basic-assembler-module.description = Incrementa el nivel del ensamblador si se coloca junto a un área de construcción. Requiere energía. Se puede usar como entrada de un cargador.
+block.small-deconstructor.description = Deconstruye las estructuras y unidades entrantes. Devuelve el 100% de su coste de construcción.
+block.reinforced-payload-conveyor.description = Mueve los lotes de carga en una dirección.
+block.reinforced-payload-router.description = Distribuye las cargas a los bloques adyacentes. Funcionará como un clasificador si se le establece un filtro.
+block.payload-mass-driver.description = Estructura de transporte de carga de largo alcance. Dispara las cargas entrantes a otras catapultas enlazadas.
+block.large-payload-mass-driver.description = Estructura de transporte de carga de largo alcance. Dispara las cargas entrantes a otras catapultas enlazadas.
+block.unit-repair-tower.description = Repara todas las unidades en su área. Requiere ozono.
+block.radar.description = Descubre gradualmente el terreno y las unidades enemigas en un amplio radio. Requiere energía.
+block.shockwave-tower.description = Daña y destruye proyectiles enemigos dentro de su radio de acción. Requiere cianógeno.
+block.canvas.description = Muestra una imagen simple con una paleta predefinida. Editable.
+
 
 unit.dagger.description = Dispara proyectiles básicos a enemigos cercanos.
-unit.mace.description = Lanza torrentes de llamas a enemigos cercanos.
+unit.mace.description = Ataca con llamaradas a enemigos cercanos.
 unit.fortress.description = Utiliza artillería de largo alcance contra enemigos terrestres.
 unit.scepter.description = Bombardea enemigos cercanos con proyectiles cargados.
-unit.reign.description = Bombardea enemigos con proyectiles penetrantes.
+unit.reign.description = Bombardea enemigos con proyectiles perforantes.
 unit.nova.description = Dispara rayos láser que dañan enemigos y reparan estructuras aliadas. Puede volar.
 unit.pulsar.description = Dispara arcos eléctricos que dañan enemigos y reparan estructuras aliadas. Puede volar.
-unit.quasar.description = Dispara rayos láser perforantes que dañan enemigos, pueden provocar incendios y reparan estructuras aliadas. Puede volar. Posee escudo.
-unit.vela.description = Dispara un rayo láser continuo que daña enemigos, provoca incendios y reparan estructuras aliadas. Puede volar.
+unit.quasar.description = Dispara rayos láser perforantes que dañan enemigos y reparan estructuras aliadas. Puede volar. Posee escudo.
+unit.vela.description = Dispara un rayo láser continuo que daña enemigos, provoca incendios y repara estructuras aliadas. Puede volar.
 unit.corvus.description = Dispara poderosos láseres que dañan enemigos, y reparan estructuras aliadas. Puede pisar sobre la mayoría de terreno.
 unit.crawler.description = Corre hacia enemigos y se autodestruye, provocando una gran explosión.
 unit.atrax.description = Dispara orbes de magma debilitantes a enemigos terrestres. Puede pisar sobre la mayoría de terreno.
-unit.spiroct.description = Dispara láseres que debilitan al enemigo, reparándose en el proceso. Puede pisar sobre la mayoría de terreno.
-unit.arkyid.description = Dispara grandes rayos láser que debilitan al enemigo, repairing itself in the process. Puede pisar sobre la mayoría de terreno.
+unit.spiroct.description = Dispara láseres que debilitan al enemigo, regenerándose en el proceso. Puede pisar sobre la mayoría de terreno.
+unit.arkyid.description = Dispara grandes rayos láser que debilitan al enemigo, regenerándose en el proceso. Puede pisar sobre la mayoría de terreno.
 unit.toxopid.description = Dispara grandes fragmentos electrizados y láseres perforantes. Puede pisar sobre la mayoría de terreno.
-unit.flare.description = Dispara proyectiles básicos a enemigos cercanos.
-unit.horizon.description = Suelta fragmentos explosivos sobre objetivos terrestres.
+unit.flare.description = Dispara proyectiles básicos a enemigos terrestres cercanos.
+unit.horizon.description = Suelta bombas sobre objetivos terrestres.
 unit.zenith.description = Dispara ráfagas de misiles a enemigos cercanos.
 unit.antumbra.description = Dispara un enjambre de balas a cualquer enemigo cercano.
 unit.eclipse.description = Dispara dos láseres perforantes y un enjambre de balas de fragmentación.
-unit.mono.description = Extrae cobre y plomo, y los deposita en el núcleo.
-unit.poly.description = Recosntruye automáticamente estructuras dañadas y asiste a otras unidades en la construcción.
-unit.mega.description = Repara automáticamente estructuras dañadas. Puede llevar estructuras y unidades terrestres pequeñas.
+unit.mono.description = Extrae automáticamente cobre y plomo, y los deposita en el núcleo.
+unit.poly.description = Reconstruye automáticamente estructuras destruidas y asiste a otras unidades en la construcción.
+unit.mega.description = Repara automáticamente estructuras dañadas. Puede cargar con estructuras y unidades terrestres pequeñas.
 unit.quad.description = Suelta grandes bombas sobre objetivos terrestres, repara estructuras aliadas y daña enemigos. Puede cargar con unidades terrestres de tamaño medio.
 unit.oct.description = Protege aliados con su escudo. Puede cargar con la mayoría de unidades terrestres.
 unit.risso.description = Dispara un enjambre de misiles y proyectiles a enemigos cercanos.
-unit.minke.description = Dispara proyectiles variados a enemigos terrestres.
-unit.bryde.description = Dispara misiles de largo alcance a enemigos.
+unit.minke.description = Dispara proyectiles simples variados a enemigos terrestres.
+unit.bryde.description = Dispara misiles de artillería de largo alcance a enemigos.
 unit.sei.description = Dispara un enjambre de misiles y proyectiles perforantes a enemigos.
-unit.omura.description = Dispara rayos contínuos perforantes. Construye unidades Flare.
+unit.omura.description = Dispara un rayo perforante de largo alcance. Construye unidades Flare.
 unit.alpha.description = Defiende el núcleo Shard de los enemigos. Construye estructuras.
 unit.beta.description = Defiende el núcleo Foundation de los enemigos. Construye estructuras.
 unit.gamma.description = Defiende el núcleo Nucleus de los enemigos. Construye estructuras.
+unit.retusa.description = Dispara torpedos guiados a los enemigos cercanos. Repara unidades aliadas.
+unit.oxynoe.description = Dispara llamaradas de fuego que reparan estructuras aliadas. Su torreta de defensa destruye proyectiles enemigos automáticamente.
+unit.cyerce.description = Dispara grupos de misiles rastreadores. Repara unidades aliadas.
+unit.aegires.description = Electrifica a todas las unidades y estructuras enemigas que entran en su campo de energía. Repara todas las unidades aliadas.
+unit.navanax.description = Dispara proyectiles PEM explosivos que infligen mucho daño a las redes eléctricas enemigas y reparan las estructuras aliadas. Funde a los enemigos cercanos con 4 torretas láser autónomas.
+
+# Erekir
+unit.stell.description = Dispara proyectiles básicos a objetivos enemigos.
+unit.locus.description = Dispara alternando proyectiles a objetivos enemigos.
+unit.precept.description = Dispara grupos de proyectiles perforantes a los objetivos enemigos.
+unit.vanquish.description = Dispara grandes balas divisibles que perforan a los objetivos enemigos.
+unit.conquer.description = Dispara grandes ráfagas de proyectiles perforantes a los objetivos enemigos.
+unit.merui.description = Dispara artillería de largo alcance a objetivos enemigos. Puede pisar sobre la mayoría de terreno.
+unit.cleroi.description = Dispara proyectiles dobles de artillería a objetivos enemigos. Intercepta proyectiles enemigos con torretas defensivas. Puede pisar sobre la mayoría de terreno.
+unit.anthicus.description = Dispara misiles guiados de largo alcance a objetivos enemigos. Puede pisar sobre la mayoría de terreno.
+unit.tecta.description = Dispara misiles de plasma guiados a objetivos enemigos. Se protege con un escudo direccional. Puede pisar sobre la mayoría de terreno.
+unit.collaris.description = Dispara artillería de fragmentación de largo alcance a objetivos enemigos. Puede pisar sobre la mayoría de terreno.
+unit.elude.description = Dispara pares de balas guiadas a objetivos enemigos. Puede flotar sobre la mayoría de líquidos.
+unit.avert.description = Dispara un par de balas en espiral a objetivos enemigos.
+unit.obviate.description = Dispara un par de orbes eléctricos en espiral a objetivos enemigos.
+unit.quell.description = Dispara misiles guiados de largo alcance a objetivos enemigos. Anula los efectos de estructuras reparadoras enemigas.
+unit.disrupt.description = Dispara misiles inhibidores de largo alcance a objetivos enemigos. Anula los efectos de estructuras reparadoras enemigas.
+unit.evoke.description = Construye estructuras para defender el núcleo Bastion. Dispone de un láser que repara estructuras.
+unit.incite.description = Construye estructuras para defender el núcleo Citadel. Dispone de un láser que repara estructuras.
+unit.emanate.description = Construye estructuras para defender el núcleo Acropolis. Dispone de láseres que reparan estructuras.
+
+lst.read = Lee un número desde una unidad de memoria conectada.
+lst.write = Escribe un número en una unidad de memoria conectada.
+lst.print = Añade texto a la cola para imprimir texto.\nNo mostrará nada hasta que se use [accent]Print Flush[].
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Añade una operación a la cola para dibujar.\nNo mostrará nada hasta que se use [accent]Draw Flush[].
+lst.drawflush = Muestra los datos en cola de operaciones [accent]Draw[] en un monitor gráfico.
+lst.printflush = Muestra los datos en cola de operaciones de [accent]Print[] en un bloque de mensaje.
+lst.getlink = Obtiene el número de enlace de procesador. Inicia en 0.
+lst.control = Controla el estado de una estructura.
+lst.radar = Localiza unidades alrededor de una estructura con rango de detección.
+lst.sensor = Recopila datos de una estructura o unidad.
+lst.set = Establece una variable.
+lst.operation = Realiza una operación sobre 1-2 variables.
+lst.end = Salta al inicio de la lista de instrucciones.
+lst.wait = Espera unos segundos.
+lst.stop = Detiene la ejecución de este procesador.
+lst.lookup = Busca un objeto/líquido/unidad/tipo de bloque por ID.\nSe puede acceder al número total de cada tipo con:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Salta condicionalmente a otra instrucción.
+lst.unitbind = Se enlaza a la siguiente unidad de un tipo, y la almacena en [accent]@unit[].
+lst.unitcontrol = Controla la unidad actualmente enlazada.
+lst.unitradar = Localiza unidades alrededor de la unidad actualmente enlazada.
+lst.unitlocate = Localiza un tipo específico de posición/estructura en cualquier lugar del mapa.\nRequiere una unidad enlazada.
+lst.getblock = Obtiene los datos de un bloque en cualquier lugar.
+lst.setblock = Cambia los datos de un bloque en cualquier lugar.
+lst.spawnunit = Crea una unidad en una localización.
+lst.applystatus = Aplica o elimina un efecto de alteración de estado a una unidad.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simula la aparición de una oleada de enemigos en una localización arbitraria.\nNo incrementará el contador de oleadas.
+lst.explosion = Crea una explosión en una localización.
+lst.setrate = Establece la velocidad de ejecución de los procesadores lógicos en formato instrucción/tick.
+lst.fetch = Busca unidades, núcleos, jugadores o estructuras por índice.\nLos índices comienzan en 0 y finalizan devolviendo el total que se ha contado.
+lst.packcolor = Agrupa los componentes RGBA [0, 1] en un solo número para dibujar gráficos o establecer reglas.
+lst.setrule = Establece una regla de la partida.
+lst.flushmessage = Muestra un mensaje en pantalla desde la lista de espera de texto.\nEsperará a que finalice el mensaje anterior.
+lst.cutscene = Manipula la cámara del jugador.
+lst.setflag = Establece una etiqueta global que se puede leer desde todos los procesadores.
+lst.getflag = Comprueba si se ha establecido una etiqueta global.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]No se permite construir bloques de categoría lógica.
+
+lenum.type = El tipo de bloque/unidad\nEjemplo: para buscar cualquier enrutador, esto devolverá [accent]@router[].\nNo devuelve una cadena de texto.
+lenum.shoot = Dispara a una posición.
+lenum.shootp = Dispara a una unidad/estructura con predicción de velocidad.
+lenum.config = Configuración de estructura, por ejemplo: el objeto seleccionado en un clasificador.
+lenum.enabled = Si el bloque está activado.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = Color del iluminador.
+laccess.controller = Controlador de unidad. Si se controla mediante un procesador, devuelve dicho procesador.\nSi está en formación, devuelve su líder.\nDe otra forma, devuelve la misma unidad.
+laccess.dead = Si una unidad/bloque es destruída o inválida.
+laccess.controlled = Devuelve:\n[accent]@ctrlProcessor[] si el control de la unidad lo tiene un procesador\n[accent]@ctrlPlayer[] si el control de la unidad/bloque lo tiene un jugador\n[accent]@ctrlFormation[] si la unidad está en formación\nDe otra forma, devuelve 0.
+laccess.progress = Progreso de una acción, 0 a 1.\nDevuelve el valor de una producción, la recarga de una torreta o el progreso de una construcción.
+laccess.speed = Velocidad máxima de una unidad, en bloques/segundo.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+
+lcategory.unknown = Desconocido
+lcategory.unknown.description = Instrucciones no clasificadas.
+lcategory.io = Entrada y salida
+lcategory.io.description = Modifica el contenido de los bloques de memoria y los búferes de procesadores.
+lcategory.block = Control de bloque
+lcategory.block.description = Interactúa con bloques.
+lcategory.operation = Operaciones
+lcategory.operation.description = Operaciones lógicas.
+lcategory.control = Control de flujo
+lcategory.control.description = Gestiona el orden de ejecución.
+lcategory.unit = Control de unidad
+lcategory.unit.description = Da órdenes a las unidades.
+lcategory.world = Mundo
+lcategory.world.description = Controla cómo se comporta el mundo.
+
+graphicstype.clear = Llena todo el monitor con un color.
+graphicstype.color = Establece el color para próximas operaciones de dibujo.
+graphicstype.col = Es equivalente a "color", pero agrupado en un único valor.\nLos colores agrupados se escriben como códigos hexadecimales usando un [accent]%[] como prefijo.\nPor ejemplo: [accent]%ff0000[] es el color rojo.
+graphicstype.stroke = Establece el ancho de la línea.
+graphicstype.line = Segmento de la línea del gráfico.
+graphicstype.rect = Rellena un rectángulo.
+graphicstype.linerect = Dibuja las aristas de un rectángulo.
+graphicstype.poly = Rellena un polígono regular.
+graphicstype.linepoly = Dibuja las aristas de un polígono regular.
+graphicstype.triangle = Rellena un triángulo.
+graphicstype.image = Dibuja una imagen de algún contenido.\nEjemplo: [accent]@router[] o [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Siempre "true".
+lenum.idiv = División de un número entero.
+lenum.div = División.\nDevuelve [accent]null[] al dividir entre cero.
+lenum.mod = Modulo.
+lenum.equal = Igual. Coacciona tipos.\nObjetos no-nulos coaccionados con números pasan a 1, si no coinciden pasan a 0.
+lenum.notequal = No igual. Coacciona tipos.
+lenum.strictequal = Igualdad estricta. No coacciona tipos.\nSe puede usar para comprobar si un resultado es [accent]null[].
+lenum.shl = Cambia bits a izquierda.
+lenum.shr = Cambia bits a derecha.
+lenum.or = Comprobación bit a bit OR.
+lenum.land = Comprobación lógica AND.
+lenum.and = Comprobación bit a bit AND.
+lenum.not = Comprobación bit a bit invertida.
+lenum.xor = Comprobación bit a bit XOR.
+
+lenum.min = Mínimo de dos números.
+lenum.max = Máximo de dos números.
+lenum.angle = �ngulo del vector en grados.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Longitud del vector.
+
+lenum.sin = Seno, en grados.
+lenum.cos = Coseno, en grados.
+lenum.tan = Tangente, en grados.
+
+lenum.asin = Arco seno, en grados.
+lenum.acos = Arco coseno, en grados.
+lenum.atan = Arco tangente, en grados.
+
+#no están mal escritos, son fórmulas matemáticas
+lenum.rand = Número decimal aleatorio en un rango (0, valor).
+lenum.log = Logaritmo natural (ln).
+lenum.log10 = Logaritmo en base 10.
+lenum.noise = Ruido simplex 2D.
+lenum.abs = Valor absoluto.
+lenum.sqrt = Raíz cuadrada.
+
+lenum.any = Cualquier unidad.
+lenum.ally = Unidad aliada.
+lenum.attacker = Unidad con un arma.
+lenum.enemy = Unidad enemiga.
+lenum.boss = Unidad guardián (Jefe).
+lenum.flying = Unidad aérea.
+lenum.ground = Unidad terrestre.
+lenum.player = Unidad controlada por un jugador.
+
+lenum.ore = Depósito mineral.
+lenum.damaged = Bloque aliado dañado.
+lenum.spawn = Punto de aterrizaje enemigo.\nPuede ser un núcleo o una posición.
+lenum.building = Un bloque de una categoría específica.
+
+lenum.core = Cualquier núcleo.
+lenum.storage = Bloque de almacenamiento, ejemplo: Contenedor.
+lenum.generator = Bloques que generan energía.
+lenum.factory = Bloques que transforman recursos.
+lenum.repair = Puntos de reparación.
+lenum.battery = Cualquier batería.
+lenum.resupply = Puntos de reabastecimiento.\nSólo es relevante cuando [accent]"Unidades necesitan munición"[] está activada.
+lenum.reactor = Reactor de Impacto/Torio.
+lenum.turret = Cualquier torreta.
+
+sensor.in = El bloque/unidad a detectar.
+
+radar.from = Bloque del que detectar.\nEl rango del sensor está limitado por el rango de dicha construcción.
+radar.target = Filtro de unidades a detectar.
+radar.and = Filtros adicionales.
+radar.order = Orden para ordenar. 0 para invertir.
+radar.sort = Métrica a usar al ordenar resultados.
+radar.output = Variable en la que escribir la salida de una unidad.
+
+unitradar.target = Filtro para detectar unidades.
+unitradar.and = Filtros adicionales.
+unitradar.order = Orden para ordenar. 0 para invertir.
+unitradar.sort = Métrica a usar al ordenar resultados.
+unitradar.output = Variable en la que escribir la salida de una unidad.
+
+control.of = Bloque a controlar.
+control.unit = Unidad/bloque al que apuntar.
+control.shoot = Cuándo disparar.
+
+unitlocate.enemy = Cuándo localizar construcciones enemigas.
+unitlocate.found = Cuándo el objeto es encontrado.
+unitlocate.building = Variable de salida para contrucciones localizadas.
+unitlocate.outx = Coordenada X devuelta.
+unitlocate.outy = Coordenada Y devuelta.
+unitlocate.group = Grupo de bloque a buscar.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = No se mueve, pero seguirá construyendo/extrayendo minerales.\nEs el estado por defecto.
+lenum.stop = Deja de moverse/extraer minerales/contruir.
+lenum.unbind = Desactiva el control externo de la unidad enlazada.\nLa unidad recupera su IA estándar.
+lenum.move = Moverse a una posición exacta.
+lenum.approach = Aproximarse al radio establecido de una posición concreta.
+lenum.pathfind = Establece y sigue una ruta hasta el punto de aterrizaje enemigo.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Dispara a una posición.
+lenum.targetp = Dispara a un objetivo con predicción de velocidad.
+lenum.itemdrop = Suelta los objetos en la estructura especificacda.
+lenum.itemtake = Recoge un tipo de objeto almacenado en una estructura.
+lenum.paydrop = Suelta la carga actual.
+lenum.paytake = Recoge bloques o unidades en la posición actual.
+lenum.payenter = Entra/Aterriza en el bloque sobre el que se encuentra la unidad.
+lenum.flag = Etiqueta numérica de la unidad.
+lenum.mine = Extrae minerales de una posición.
+lenum.build = Construye una estructura.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Comprueba si una unidad se encuentra cerca de una posición.
+lenum.boost = Iniciar/Detener vuelo.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 46cf235d26..b370c83ae1 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -3,121 +3,165 @@ credits = Tegijad
 contributors = Tõlkijad ja panustajad
 discord = Liitu Mindustry Discordi serveriga!
 link.discord.description = Ametlik Discordi server
-link.reddit.description = The Mindustry subreddit
+link.reddit.description = Mindustry subreddit
 link.github.description = Mängu lähtekood
 link.changelog.description = Uuenduste nimekiri versioonide kaupa
 link.dev-builds.description = Arendusversioonide ajalugu
 link.trello.description = Plaanitud uuenduste nimekiri
 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.f-droid.description = F-Droid kataloog
 link.wiki.description = Mängu ametlik viki
-link.suggestions.description = Suggest new features
+link.suggestions.description = Anna soovitusi
+link.bug.description = Leidsid vea? Kirjuta siia
+linkopen = See server saatis sulle lingi. Oled kindel, et tahad avada?\n\n[sky]{0}
 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.
 gameover = Mäng läbi!
+gameover.disconnect = Lahku
 gameover.pvp = Võistkond[accent] {0}[] võitis!
+gameover.waiting = [accent]Ootan järgmist kaarti...
 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
+copied = Kopeeritud.
+indev.notready = See osa mängust ei ole veel valmis
 
 load.sound = Helid
 load.map = Maailmad
 load.image = Pildid
 load.content = Sisu
 load.system = Süsteem
-load.mod = Mods
-load.scripts = Scripts
+load.mod = Modid
+load.scripts = Skriptid
 
-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 = Uus arendusversioon on saadaval:
+be.update.confirm = Lae alla ja taaskäivita?
+be.updating = Värskendan...
+be.ignore = Ignoreeri
+be.noupdates = Ei leidnud värskendusi.
+be.check = Otsi värskendusi
 
-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.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.
+mods.browser = Modi Brauser
+mods.browser.selected = Valitud mod
+mods.browser.add = Paigalda
+mods.browser.reinstall = Taaspaigalda
+mods.browser.view-releases = Kuva Versioonid
+mods.browser.noreleases = [scarlet]Ei leidnud versioone\n[accent]Ei leidnud selle modi jaoks ühtegi väljaannet. Kontrollige, kas modi repositooriumis on avaldatud versioone.
+mods.browser.latest = <Uusim>
+mods.browser.releases = Versioonid
+mods.github.open = Repo
+mods.github.open-release = Väljastusleht
+mods.browser.sortdate = Sorteeri uusimad enne
+mods.browser.sortstars = Sorteeri tähtede järgi
 
-stat.wave = Lahingulaineid läbitud:[accent] {0}
-stat.enemiesDestroyed = Vaenlasi hävitatud:[accent] {0}
-stat.built = Ehitisi konstrueeritud:[accent] {0}
-stat.destroyed = Ehitisi hävinenud:[accent] {0}
-stat.deconstructed = Ehitisi dekonstrueeritud:[accent] {0}
-stat.delivered = Kaasavõetud ressursid:
-stat.playtime = Time Played:[accent] {0}
-stat.rank = Hinne:[accent] {0}
+schematic = Skeem
+schematic.add = Salvesta Skeem...
+schematics = Skeemid
+schematic.search = Otsi skeemide hulgast...
+schematic.replace = Selle nimega skeem juba eksisteerib. Asenda?
+schematic.exists = Selle nimega skeem juba eksisteerib.
+schematic.import = Impordi Skeem...
+schematic.exportfile = Ekspordi Fail
+schematic.importfile = Impordi Fail
+schematic.browseworkshop = Lehitse Workshop'i
+schematic.copy = Kopeeri Lõikelauale
+schematic.copy.import = Impordi Lõikelaualt
+schematic.shareworkshop = Jaga Workshop'is
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Peegelda Skeem
+schematic.saved = Skeem salvestatud.
+schematic.delete.confirm = See skeem hävitatakse täielikult.
+schematic.edit = Muuda Skeemi
+schematic.info = {0}x{1}, {2} plokki
+schematic.disabled = [scarlet]Skeemid välja lülitatud[]\nSa ei tohi kasutada skeeme selles [accent]maailmas[] või [accent]serveris.
+schematic.tags = Sildid:
+schematic.edittags = Muuda Silte
+schematic.addtag = Lisa Silt
+schematic.texttag = Tekstisilt
+schematic.icontag = Ikoonisilt
+schematic.renametag = Nimeta Silt Ãœmber
+schematic.tagged = {0} sildistatud
+schematic.tagdelconfirm = Kustuta see silt täielikult?
+schematic.tagexists = See silt juba eksisteerib.
 
-globalitems = [accent]Global Items
+stats = Statistika
+stats.wave = Läbitud Laineid
+stats.unitsCreated = Ãœksusi Loodud
+stats.enemiesDestroyed = Vastaseid Hävitatud
+stats.built = Ehitisi Ehitatud
+stats.destroyed = Ehitisi Hävitatud
+stats.deconstructed = Ehitisi Lammutatud
+stats.playtime = Mängitud Aeg
+
+globalitems = [accent]Globaalsed Materjalid
 map.delete = Kas oled kindel, et soovid kustutada\nmaailma "[accent]{0}[]"?
 level.highscore = Rekord: [accent]{0}
-level.select = Taseme valimine
+level.select = Taseme valik
 level.mode = Mänguviis:
-coreattack = < Tuumik on rünnaku all! >
-nearpoint = [[ [scarlet]LAHKU VAENLASTE MAANDUMISE ALALT[] ]\nVaenlaste maandumisel hävib siin kõik.
-database = Andmebaas
-savegame = Salvesta mäng
-loadgame = Lae mäng
-joingame = Liitu mänguga
-customgame = Kohandatud mäng
+coreattack = < Tuum on rünnaku all! >
+nearpoint = [[ [scarlet]LAHKU KOHESELT MAANDUMISPLATSILT[] ]\nVaenlaste maandumisel hävib siin kõik.
+database = Tuumandmebaas
+database.button = Andmebaas
+savegame = Salvesta Mäng
+loadgame = Lae Mäng
+joingame = Liitu Mänguga
+customgame = Kohandatud Mäng
 newgame = Uus mäng
 none = <puudub>
+none.found = [lightgray]<mitte ühtegi leitud>
+none.inmap = [lightgray]<mitte ühtegi maailmas>
 minimap = Kaart
-position = Position
+position = Positsioon
 close = Sulge
 website = Veebileht
 quit = Välju
-save.quit = Salvesta ja välju
+save.quit = Salvesta ja Välju
 maps = Maailmad
-maps.browse = Sirvi maailmu
+maps.browse = Sirvi Maailmu
 continue = Jätka
 maps.none = [lightgray]Ãœhtegi maailma ei leitud!
 invalid = Kehtetu
-pickcolor = Pick Color
-preparingconfig = Konfiguratsiooni ettevalmistamine
-preparingcontent = Sisu ettevalmistamine
-uploadingcontent = Sisu üleslaadimine
-uploadingpreviewfile = Eelvaate faili üleslaadimine
-committingchanges = Muudatuste teostamine
+pickcolor = Vali Värv
+preparingconfig = Konfiguratsiooni Ettevalmistamine
+preparingcontent = Sisu Ettevalmistamine
+uploadingcontent = Sisu Ãœleslaadimine
+uploadingpreviewfile = Eelvaate Faili Ãœleslaadimine
+committingchanges = Muudatuste Teostamine
 done = Valmis
-feature.unsupported = Your device does not support this feature.
+feature.unsupported = Seade ei toeta seda funktsiooni.
 
-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.initfailed = [red]âš [] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
 mods = Mods
 mods.none = [lightgray]No mods found!
 mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Mod Folder
+mods.viewcontent = View Content
 mods.reload = Reload
 mods.reloadexit = The game will now exit, to reload mods.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Disable
+mod.version = Version:
 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.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Content Errors
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Errors have occurred loading content.
 mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
 mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
@@ -139,12 +183,25 @@ 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[].
+search = Search:
 planetmap = Planet Map
 launchcore = Launch Core
 filename = Failinimi:
 unlocked = Uus sisu!
+available = New research available!
+unlock.incampaign = < Unlock in campaign for details >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Olemas
 techtree = Uurimispuu
+techtree.select = Tech Tree Selection
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Load
+research.discard = Discard
 research.list = [lightgray]Vajalikud uuringud:
 research = Uuri
 researched = [lightgray]{0} uuritud.
@@ -186,16 +243,32 @@ hosts.none = [lightgray]Kohtvõrgus mänge ei leitud.
 host.invalid = [scarlet]Serveriga ei saa ühendust.
 
 servers.local = Local Servers
+servers.local.steam = Open Games & Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
+servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
+servers.showhidden = Show Hidden Servers
+server.shown = Shown
+server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Jälita mängijat
 trace.playername = Mängija nimi: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Mängija ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobiilne versioon: [accent]{0}
 trace.modclient = Modifitseeritud versioon: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Kehtetu mängija ID! Saada veateade!
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Keelatud mängijad
 server.bans.none = Keelatud mängijaid ei leitud!
 server.admins = Administraatorid
@@ -209,10 +282,11 @@ server.version = [lightgray]v{0} {1}
 server.custombuild = [accent]Kohandatud versioon
 confirmban = Oled kindel, et soovid keelata sellel mängjal siin mängida?
 confirmkick = Oled kindel, et soovid selle mängija välja visata?
-confirmvotekick = Oled kindel, et soovid selle mängija mängust välja hääletada?
 confirmunban = Oled kindel, et soovid lubada sellel mängijal siin uuesti mängida?
 confirmadmin = Oled kindel, et soovid anda sellele mängijale adminstraatori õigused?
 confirmunadmin = Oled kindel, et soovid sellelt mängijalt adminstraatori õigused ära võtta?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Liitu mänguga
 joingame.ip = Aadress:
 disconnect = Ãœhendus katkestatud.
@@ -220,15 +294,18 @@ disconnect.error = Ãœhenduse viga.
 disconnect.closed = Ãœhendus on suletud.
 disconnect.timeout = Ãœhendus aegus.
 disconnect.data = Maailma andmete allalaadimine ebaõnnestus!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Mänguga ei saanud liituda ([accent]{0}[]).
 connecting = [accent]Ãœhendamine...
+reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Maailma andmete allalaadimine...
 server.port = Port:
-server.addressinuse = Aadress on juba kasutusel!
 server.invalidport = Ebasobiv pordi number!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Viga serveri hostimisel.
 save.new = Uus salvestis
 save.overwrite = Oled kindel, et soovid selle salvestise asendada?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Asenda
 save.none = Salvestisi ei leitud!
 savefail = Salvestamine ebaõnnestus!
@@ -249,6 +326,7 @@ save.corrupted = [accent]See salvestis on rikutud või ebasobiv!\nKui sa uuendas
 empty = <tühi>
 on = Sees
 off = Väljas
+save.search = Search saved games...
 save.autosave = Automaatsalvestus: {0}
 save.map = Maailm: {0}
 save.wave = Lahingulaine {0}
@@ -264,9 +342,33 @@ ok = OK
 open = Ava
 customize = Kohanda reegleid
 cancel = Tühista
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Ava link
 copylink = Kopeeri link
 back = Tagasi
+max = Max
+objective = Map Objective
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
 data.export = Ekspordi mänguandmed
 data.import = Impordi mänguandmed
 data.openfolder = Open Data Folder
@@ -274,15 +376,18 @@ data.exported = Mänguandmed eksporditud.
 data.invalid = Need ei ole sobivad mänguandmed.
 data.import.confirm = Mänguandmete importimine kustutab\n[scarlet] kõik[] sinu praegused mänguandmed.\n[accent]Seda ei saa tagasi võtta![]\n\nKui mänguandmed on imporditud,\nsiis mäng sulgub kohe.
 quit.confirm = Oled kindel, et soovid väljuda?
-quit.confirm.tutorial = Oled kindel, et soovid õpetuse lõpetada?\nÕpetust saab uuesti läbida:\n[accent]Mängi -> Õpetus[].
 loading = [accent]Laadimine...
-reloading = [accent]Reloading Mods...
+downloading = [accent]Downloading...
 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
 resumebuilding = [scarlet][[{0}][] to resume building
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Lahingulaine {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]Järgmine laine\nalgab: {0}
@@ -290,6 +395,8 @@ wave.waveInProgress = [lightgray]Toimub lahingulaine
 waiting = [lightgray]Ootan...
 waiting.players = Ootan mängijaid...
 wave.enemies = [lightgray]{0} vaenlast alles
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
 wave.enemy = [lightgray]{0} vaenlane alles
 wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
 wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
@@ -300,9 +407,9 @@ custom = Mängija loodud
 builtin = Sisse-ehitatud
 map.delete.confirm = Oled kindel, et soovid maailma kustutada? Seda ei saa tagasi võtta!
 map.random = [accent]Suvaline maailm
-map.nospawn = Selles maailmas ei ole mängijate tuumikuid!\nLisa redaktoris sellele maailmale[accent] oranž[] tuumik.
-map.nospawn.pvp = Selles maailmas ei ole piisavalt mängijate tuumikuid!\nLisa redaktoris sellele maailmale[scarlet] mitte-oranže[] tuumikuid.
-map.nospawn.attack = Selles maailmas ei ole mängijate poolt rünnatavaid vaenlaste tuumikuid!\nLisa redaktoris sellele maailmale[scarlet] punaseid[] tuumikuid.
+map.nospawn = Selles maailmas ei ole mängijate tuumikuid!\nLisa redaktoris sellele maailmale {0} tuumik.
+map.nospawn.pvp = Selles maailmas ei ole piisavalt mängijate tuumikuid!\nLisa redaktoris sellele maailmale [scarlet]mitte-oranže[] tuumikuid.
+map.nospawn.attack = Selles maailmas ei ole mängijate poolt rünnatavaid vaenlaste tuumikuid!\nLisa redaktoris sellele maailmale {0} tuumikuid.
 map.invalid = Viga maailma laadimisel: ebasobiv või riknenud fail.
 workshop.update = Update Item
 workshop.error = Error fetching workshop details: {0}
@@ -310,12 +417,17 @@ map.publish.confirm = Oled kindel, et soovid selle maailma üles laadida?\n\n[li
 workshop.menu = Select what you would like to do with this item.
 workshop.info = Item Info
 changelog = Changelog (optional):
+updatedesc = Overwrite Title & Description
 eula = Steam'i kasutustingimused
 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.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Pintsel
 editor.openin = Ava redaktoris
@@ -328,35 +440,71 @@ editor.nodescription = Maailmal peab enne avaldamist olema vähemalt 4 tähemär
 editor.waves = Lahingulained:
 editor.rules = Reeglid:
 editor.generation = Genereerimine:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Redigeeri mängus
+editor.playtest = Playtest
 editor.publish.workshop = Avalda Workshop'is
 editor.newmap = Uus maailm
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = Lahingulained
 waves.remove = Eemalda
-waves.never = --
 waves.every = iga
 waves.waves = laine järel
+waves.health = health: {0}%
 waves.perspawn = laine kohta
 waves.shields = shields/wave
 waves.to = kuni
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Eelvaade
 waves.edit = Muuda...
+waves.random = Random
 waves.copy = Kopeeri puhvrisse
 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.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
+all = All
 
 editor.default = [lightgray]<Vaikimisi>
 details = Ãœksikasjad...
 edit = Muuda...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Nimi:
 editor.spawn = Tekita väeüksus
 editor.removeunit = Eemalda väeüksus
@@ -368,13 +516,19 @@ editor.errorlegacy = See maailmafail on liiga vana ja kasutab iganenud formaati,
 editor.errornot = See ei ole maailmafail.
 editor.errorheader = See maailmafail on ebasobiv või riknenud.
 editor.errorname = Maailma nime pole täpsustatud.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Uuenda
 editor.randomize = Juhuslikusta
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Kinnita
 editor.generate = Genereeri
+editor.sectorgenerate = Sector Generate
 editor.resize = Suurus
 editor.loadmap = Lae maailm
 editor.savemap = Salvesta
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Salvestatud!
 editor.save.noname = Su maailmal ei ole nime! Anna maailmale nimi, vajutades menüüs nupule "Üldinfo".
 editor.save.overwrite = Sinu maailm kirjutaks üle sisse-ehitatud maailma! Anna maailmale teistsugune nimi, vajutades menüüs nupule "Üldinfo".
@@ -413,8 +567,12 @@ toolmode.eraseores = Kustuta maake
 toolmode.eraseores.description = Kustuta ainult maake.
 toolmode.fillteams = Täida võistkondi
 toolmode.fillteams.description = Täida blokkide asemel võistkondi.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Joonista võistkondi
 toolmode.drawteams.description = Joonista blokkide asemel võistkondi.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]Filtrid puuduvad! Lisa filtreid alloleva nupuga.
 filter.distort = Moonutamine
@@ -433,6 +591,7 @@ filter.clear = Kustutamine
 filter.option.ignore = Eira
 filter.scatter = Puistamine
 filter.terrain = Maastik
+filter.logic = Logic
 filter.option.scale = Ulatus
 filter.option.chance = Tõenäosus
 filter.option.mag = Suurusjärk
@@ -441,17 +600,39 @@ filter.option.circle-scale = Ringjoone ulatus
 filter.option.octaves = Oktaav
 filter.option.falloff = Filter
 filter.option.angle = Nurk
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Blokk
 filter.option.floor = Põrand
 filter.option.flooronto = Asendatav põrand
 filter.option.target = Target
+filter.option.replacement = Replacement
 filter.option.wall = Sein
 filter.option.ore = Maak
 filter.option.floor2 = Teine põrand
 filter.option.threshold2 = Teine lävi
 filter.option.radius = Raadius
 filter.option.percentile = Protsentiil
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Laius:
 height = Kõrgus:
@@ -462,6 +643,9 @@ load = Lae
 save = Salvesta
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Keelesätete muudatuste jõustumiseks [accent]taaskäivita[] mäng.
 settings = Sätted
 tutorial = Õpetus
@@ -476,26 +660,71 @@ complete = [lightgray]Eesmärgid:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
 requirement.research = Research {0}
+requirement.produce = Produce {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Parim lahingulaine: {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
+map.multiplayer = Only the host can view sectors.
 uncover = Ava
 configure = Muuda varustust
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
 loadout = Loadout
-resources = Resources 
+resources = Resources
+resources.max = Max
 bannedblocks = Banned Blocks
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = Ressursid:
-zone.objective = [lightgray]Eesmärk: [accent]{0}
-zone.objective.survival = Ellujäämine
-zone.objective.attack = Hävita vaenlaste tuumik
 add = Lisa...
-boss.health = Bossi elud
+guardian = Guardian
 
 connectfail = [crimson]Ãœhenduse viga:\n\n[accent]{0}
 error.unreachable = Server ei ole kättesaadav.\nKas serveri aadress on õigesti sisestatud?
@@ -507,26 +736,69 @@ error.mapnotfound = Maailmafaili ei leitud!
 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Time:
+sectors.threat = Threat:
+sectors.wave = Wave:
 sectors.stored = Stored:
 sectors.resume = Resume
 sectors.launch = Launch
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
+sector.curcapture = Sector Captured
+sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
+sector.attacked = Sector [accent]{0}[white] under attack!
+sector.lost = Sector [accent]{0}[white] lost!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planets
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sun
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -539,6 +811,22 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -551,6 +839,75 @@ 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
 
 settings.language = Keel
 settings.data = Mänguandmed
@@ -573,7 +930,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Paus >
 clear = Clear
 banned = [scarlet]Banned
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Jah
 no = Ei
 info.title = Info
@@ -581,13 +938,18 @@ error.title = [crimson]Viga
 error.crashtitle = Viga
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Purpose
 
 stat.input = Sisend
 stat.output = Väljund
+stat.maxefficiency = Max Efficiency
 stat.booster = Kiirendaja
 stat.tiles = Required Tiles
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Energiamahtuvus
 stat.powershot = Energia ühikut/lasu kohta
 stat.damage = Hävituspunkte
@@ -610,6 +972,11 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Energiatootlus
 stat.productiontime = Tootmisaeg
 stat.repairtime = Täieliku parandamise aeg
+stat.repairspeed = Repair Speed
+stat.weapons = Weapons
+stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Kiiruse suurenemine
 stat.range = Ulatus
 stat.drilltier = Kaevandatav
@@ -617,6 +984,7 @@ stat.drillspeed = Puurimise kiirus
 stat.boosteffect = Kiirendaja mõju
 stat.maxunits = Maks. aktiivseid väeüksuseid
 stat.health = Elud
+stat.armor = Armor
 stat.buildtime = Ehitamise aeg
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Ehitamise maksumus
@@ -632,6 +1000,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = HeatCapacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -640,21 +1009,77 @@ stat.buildspeed = Build Speed
 stat.minespeed = Mine Speed
 stat.minetier = Mine Tier
 stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
 stat.abilities = Abilities
+stat.canboost = Can Boost
+stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Nõuab paremat puuri
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Puurimise kiirus: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Kasutegur: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Bilanss: {0}/s
 bar.powerstored = Puhver: {0}/{1}
 bar.poweramount = Laeng: {0}
@@ -663,13 +1088,19 @@ bar.powerlines = Connections: {0}/{1}
 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.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
 bar.power = Energia
 bar.progress = Edenemine
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -677,35 +1108,50 @@ bullet.damage = [stat]{0}[lightgray] hävituspunkti
 bullet.splashdamage = [stat]{0}[lightgray] hävituspunkti ~[stat] {1}[lightgray] blokki
 bullet.incendiary = [stat]süttiv
 bullet.homing = [stat]isesihtiv
-bullet.shock = [stat]elektriseeriv
-bullet.frag = [stat]kildpomm
+bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray]x tagasilöögi kordaja
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]jäätav
-bullet.tarred = [stat]leekisüütav
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x laskemoona kordaja
 bullet.reload = [stat]{0}[lightgray]x tulistamise kiirus
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blokki
 unit.blockssquared = blocks²
 unit.powersecond = energiaühikut/s
+unit.tilessecond = tiles/second
 unit.liquidsecond = vedelikuühikut/s
 unit.itemssecond = ressursiühikut/s
 unit.liquidunits = vedelikuühikut
 unit.powerunits = energiaühikut
+unit.heatunits = heat units
 unit.degrees = kraadi
 unit.seconds = s
 unit.minutes = mins
 unit.persecond = /s
 unit.perminute = /min
 unit.timesspeed = x kiirus
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = ressursiühikut
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Purpose
 category.general = Ãœldinfo
 category.power = Energia
 category.liquids = Vedelikud
@@ -713,16 +1159,23 @@ category.items = Ressursid
 category.crafting = Sisend/Väljund
 category.function = Function
 category.optional = Valikulised täiustused
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 setting.landscape.name = Lukusta horisontaalpaigutus
 setting.shadows.name = Varjud
 setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Lineaarne tekstuurivastendus
 setting.hints.name = Hints
-setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
+setting.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animeeritud vesi
 setting.animatedshields.name = Animeeritud kilbid
-setting.antialias.name = Sakitõrje[lightgray] (vajab mängu taaskäivitamist)[]
 setting.playerindicators.name = Player Indicators
 setting.indicators.name = Vaenlaste/Liitlaste osutid
 setting.autotarget.name = Automaatne sihtimine
@@ -732,14 +1185,11 @@ setting.fpscap.name = Maks. arv kaadreid/s
 setting.fpscap.none = Puudub
 setting.fpscap.text = {0} kaadrit/s
 setting.uiscale.name = Kasutajaliidese suurus[lightgray] (vajab mängu taaskäivitamist)[]
+setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Paiguta alati diagonaalselt
-setting.difficulty.training = Treening
-setting.difficulty.easy = Lihtne
-setting.difficulty.normal = Keskmine
-setting.difficulty.hard = Raske
-setting.difficulty.insane = Hullumeelne
-setting.difficulty.name = Raskusaste:
 setting.screenshake.name = Ekraani värisemine
+setting.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Näita visuaalefekte
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
@@ -747,32 +1197,43 @@ setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
 setting.sensitivity.name = Kontrolleri tundlikkus
 setting.saveinterval.name = Salvestamise intervall
 setting.seconds = {0} sekundit
-setting.blockselecttimeout.name = Block Select Timeout
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Täisekraan
 setting.borderlesswindow.name = Äärteta ekraan[lightgray] (võib vajada mängu taaskäivitamist)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Näita kaadrite arvu sekundis
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 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.coreitems.name = Display Core Items
 setting.position.name = Show Player Position
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Muusika helitugevus
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Taustahelide tugevus
 setting.mutemusic.name = Vaigista muusika
 setting.sfxvol.name = Heliefektide tugevus
 setting.mutesound.name = Vaigista heli
 setting.crashreport.name = Saada automaatseid veateateid
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Loo automaatseid salvestisi
-setting.publichost.name = Avaliku mängu nähtavus
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Vestlusakna läbipaistmatus
 setting.lasersopacity.name = Power Laser Opacity
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Näita mängusisest vestlusakent
-public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Kohandage liidest sälku kuvamiseks
+setting.macnotch.description = Muudatuste rakendamiseks on vaja taaskäivitada
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.
 uiscale.reset = Kasutajaliidese suurust on muudetud.\nVajuta nupule "OK", et uus suurus kinnitada.\n[scarlet]Esialgne suurus taastatakse[accent] {0}[] sekundi pärast...
 uiscale.cancel = Tühista ja välju
@@ -781,12 +1242,9 @@ keybind.title = Muuda juhtnuppe
 keybinds.mobile = [scarlet]Enamik kuvatud juhtnuppudest ei ole kasutusel mobiilsetel seadmetel. Toetatakse vaid lihtsaid liikumisega seotud juhtnuppe.
 category.general.name = Mäng
 category.view.name = Kaamera ja kasutajaliides
+category.command.name = Unit Command
 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
@@ -801,6 +1259,27 @@ keybind.move_y.name = Liigu Y-teljel
 keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -826,16 +1305,20 @@ keybind.select.name = Vali/Tulista
 keybind.diagonal_placement.name = Diagonaalne paigutamine
 keybind.pick.name = Vali blokk
 keybind.break_block.name = Hävita blokk
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 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üü
 keybind.pause.name = Paus
 keybind.pause_building.name = Pause/Resume Building
 keybind.minimap.name = Kaart
+keybind.planet_map.name = Planet Map
+keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Vestle
 keybind.player_list.name = Mängijate nimekiri
 keybind.console.name = Konsool
@@ -845,6 +1328,7 @@ keybind.toggle_menus.name = Näita/Peida menüüd
 keybind.chat_history_prev.name = Vestlusaken: eelmine
 keybind.chat_history_next.name = Vestlusaken: järgmine
 keybind.chat_scroll.name = Vestlusaken: kerimine
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = Heida väeüksus
 keybind.zoom_minimap.name = Suumi kaarti
 mode.help.title = Mänguviiside kirjeldused
@@ -858,47 +1342,100 @@ mode.pvp.description = Võitle teiste mängijate vastu.
 mode.attack.name = Rünnak
 mode.attack.description = Hävita vaenlaste baas. Lahingulaineid ei ole.
 mode.custom = Reeglid
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Lõputult ressursse
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Kasuta taimerit
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Kasuta lahingulaineid
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Mänguviis "Rünnak"
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = [scarlet]Vaenlastel[] on lõputult ressursse
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Väeüksuste tootmiskiiruse kordaja
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Väeüksuste elude kordaja
 rules.unitdamagemultiplier = Väeüksuste hävitusvõime kordaja
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Vaenlaste tuumiku ehitistevaba ala raadius:[lightgray] (ühik)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Aeg lainete vahel:[lightgray] (sekund)
+rules.initialwavespacing = Initial Wave Spacing:[lightgray] (sec)
 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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Maandumisala raadius:[lightgray] (ühik)
 rules.unitammo = Units Require Ammo
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
 rules.title.waves = Lahingulained
 rules.title.resourcesbuilding = Ressursid ja ehitamine
 rules.title.enemy = Vaenlased
 rules.title.unit = Väeüksused
 rules.title.experimental = Experimental
 rules.title.environment = Environment
+rules.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Lighting
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Ressursid
 content.liquid.name = Vedelikud
 content.unit.name = Väeüksused
 content.block.name = Konstruktsioonid
+content.status.name = Status Effects
+content.sector.name = Sectors
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Vask
 item.lead.name = Plii
@@ -916,10 +1453,23 @@ item.blast-compound.name = Lõhkeaine
 item.pyratite.name = Püratiit
 item.metaglass.name = Metaklaas
 item.scrap.name = Vanametall
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = Vesi
 liquid.slag.name = Räbu
 liquid.oil.name = Nafta
 liquid.cryofluid.name = Krüovedelik
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Soldat
 unit.mace.name = Mace
@@ -947,6 +1497,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,13 +1509,35 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Liivakamakas
+block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Rohi
-block.slag.name = Slag
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Space
 block.salt.name = Sool
 block.salt-wall.name = Salt Wall
@@ -988,24 +1565,28 @@ block.graphite-press.name = Grafiidipress
 block.multi-press.name = Multipress
 block.constructing = {0} [lightgray](Ehitamine)
 block.spawn.name = Vaenlaste maandumisala
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Tuumik: Osake
 block.core-foundation.name = Tuumik: Arenenud
 block.core-nucleus.name = Tuumik: Täielik
-block.deepwater.name = Sügav vesi
-block.water.name = Vesi
+block.deep-water.name = Sügav vesi
+block.shallow-water.name = Vesi
 block.tainted-water.name = Riknenud vesi
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Riknenud vesi tumedal liival
 block.tar.name = Tõrv
 block.stone.name = Kivi
-block.sand.name = Liiv
+block.sand-floor.name = Liiv
 block.darksand.name = Tume liiv
 block.ice.name = Jää
 block.snow.name = Lumi
-block.craters.name = Kraatrid
+block.crater-stone.name = Kraatrid
 block.sand-water.name = Vesi liival
 block.darksand-water.name = Vesi tumedal liival
 block.char.name = Puusüsi
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Jäine lumi
@@ -1023,6 +1604,7 @@ block.spore-cluster.name = Spoorikobarad
 block.metal-floor.name = Metallpõrand 1
 block.metal-floor-2.name = Metallpõrand 2
 block.metal-floor-3.name = Metallpõrand 3
+block.metal-floor-4.name = Metal Floor 4
 block.metal-floor-5.name = Metallpõrand 4
 block.metal-floor-damaged.name = Kahjustunud metallpõrand
 block.dark-panel-1.name = Tume paneel 1
@@ -1056,15 +1638,16 @@ block.conveyor.name = Konveier
 block.titanium-conveyor.name = Titaankonveier
 block.plastanium-conveyor.name = Plastanium Conveyor
 block.armored-conveyor.name = Soomuskonveier
-block.armored-conveyor.description = Transpordib ressursse sama kiiresti kui titaankonveier, kuid on soomuskattega ja vastupidavam. Võtab külgedelt sisendina vastu ainult konveierite väljundeid.
 block.junction.name = Ristmik
 block.router.name = Jaotur
 block.distributor.name = Suur jaotur
 block.sorter.name = Sorteerija
 block.inverted-sorter.name = Inverted Sorter
 block.message.name = Sõnum
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
-block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 block.overflow-gate.name = Ülevooluvärav
 block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Ränisulatusahi
@@ -1115,20 +1698,22 @@ block.solar-panel.name = Päikesepaneel
 block.solar-panel-large.name = Suur päikesepaneel
 block.oil-extractor.name = Naftapuur
 block.repair-point.name = Parandusjaam
+block.repair-turret.name = Repair Turret
 block.pulse-conduit.name = Titaantoru
 block.plated-conduit.name = Plated Conduit
 block.phase-conduit.name = Faastoru
 block.liquid-router.name = Torujaotur
 block.liquid-tank.name = Mahuti
+block.liquid-container.name = Liquid Container
 block.liquid-junction.name = Toruristmik
 block.bridge-conduit.name = Torusild
 block.rotary-pump.name = Labapump
 block.thorium-reactor.name = Tooriumreaktor
 block.mass-driver.name = EM-katapult
 block.blast-drill.name = Plahvatuspuur
-block.thermal-pump.name = Termopump
+block.impulse-pump.name = Termopump
 block.thermal-generator.name = Termogeneraator
-block.alloy-smelter.name = Voogsulatusahi
+block.surge-smelter.name = Voogsulatusahi
 block.mender.name = Parandaja
 block.mend-projector.name = Parandusväli
 block.surge-wall.name = Voogsein
@@ -1145,9 +1730,9 @@ block.meltdown.name = Valguskiir
 block.foreshadow.name = Foreshadow
 block.container.name = Hoidla
 block.launch-pad.name = Stardiplatvorm
-block.launch-pad-large.name = Suur stardiplatvorm
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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
@@ -1157,9 +1742,179 @@ 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.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1169,66 +1924,153 @@ 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 = sinine
+team.malis.name = Malis
 team.crux.name = punane
 team.sharded.name = killustunud
-team.orange.name = oranž
 team.derelict.name = unustatud
 team.green.name = roheline
-team.purple.name = lilla
 
-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
-tutorial.drill = Käsitsi kaevandamine ei ole tõhus.\n[accent]Puurid []kaevandavad automaatselt.\nVajuta all paremas nurgas asuvale puuride nupule.\nVali[accent] harilik puur[]. Aseta üks puur vasemaagile, kasutades [accent]vasakut hiireklikki[].\n[accent]Parem hiireklikk[] peatab ehitamise. [accent]Hoia Ctrl-klahvi ja libista rullikut[], et suumida sisse ja välja.
-tutorial.drill.mobile = Käsitsi kaevandamine ei ole tõhus.\n[accent]Puurid []kaevandavad automaatselt.\nVajuta all paremas nurgas asuvale puuride nupule.\nVali[accent] harilik puur[].\nAseta üks puur vasemaagile, , vajutades sellele, ning seejärel vajuta allpool olevale[accent] linnukesele[] valiku kinnitamiseks.\nPaigutuse tühistamiseks vajuta [accent]"X"-nupule[].
-tutorial.blockinfo = Igal konstruktsioonil on erinevad omadused. Iga puuriga on võimalik kaevandada vaid kindlaid maake.\nBloki teabe ja omaduste kuvamiseks vali see menüüst ning vajuta seejärel [accent]"?"-nupule.[]\n\n[accent]Vaata hariliku puuri omadusi.[]
-tutorial.conveyor = [accent]Konveiereid[] kasutatakse ressursside vedamiseks tuumikusse.\nMoodusta konveieritest rada puurist tuumikuni.\nRaja moodustamiseks [accent]vajuta vasak hiireklikk alla ja lohista soovitud suunas.[]\nHoia all[accent] Ctrl-klahvi[], et paigutada rada diagonaalselt.\n\n[accent]Aseta paar konveierit ja transpordi ressursid tuumikusse.
-tutorial.conveyor.mobile = [accent]Konveiereid[] kasutatakse ressursside vedamiseks tuumikusse.\nMoodusta konveieritest rada puurist tuumikuni.\n[accent] Raja moodustamiseks hoia sõrme mõni sekund all[] ning lohista soovitud suunas.\n\n[accent]Aseta paar konveierit ja transpordi ressursid tuumikusse.
-tutorial.turret = Tuumikusse veetud ressursse saab kasutada ehitamiseks.\nPea meeles, et mitte kõiki ressursse ei saa kasutada ehitamiseks.\nRessursse, mida ehitamiseks kasutada ei saa, näiteks[accent] süsi[] või[accent] vanametall[], ei saa ka tuumikusse hoiule panna.\n[scarlet]Vaenlaste tõrjumiseks[] tuleb ehitada kaitsvaid konstruktsioone.\n[accent]Ehita oma baasi lähedale kaksikkahur.
-tutorial.drillturret = Kaksikkahurid vajavad tulistamiseks[accent] vasest laskemoona[].\nAseta kaksikkahuri kõrvale puur ja suuna konveierid kahurini, et varustada seda kaevandatud vasega.\n\n[accent]Laskemoona tarnitud: 0/1
-tutorial.pause = Lahingu ajal on võimalik[accent] mängu käik peatada.[]\nPausi ajal on võimalik ehitustööd ootele valmis panna. Pausilt naastes täidetakse need tööd kohe.\n\nMängu peatamiseks vajuta [accent]tühikut.
-tutorial.pause.mobile = Lahingu ajal on võimalik[accent] mängu käik peatada.[]\nPausi ajal on võimalik ehitustööd ootele valmis panna. Pausilt naastes täidetakse need tööd kohe.\n\n[accent]Mängu peatamiseks vajuta üleval vasakus nurgas olevale pausinupule.
-tutorial.unpause = Nüüd vajuta uuesti tühikut, et mängu naasta.
-tutorial.unpause.mobile = Nüüd vajuta seda nuppu uuesti, et mängu naasta.
-tutorial.breaking = Sageli on vaja blokke hävitada.\n[accent]Hoia all paremat hiireklahvi[], et hävitada kõik valitud blokid.[]\n\n[accent]Hävita kõik tuumikust vasakule jäävad vanametalli blokid, valides need korraga.
-tutorial.breaking.mobile = Sageli on vaja blokke hävitada.\n[accent]Vali alt paremast nurgast blokkide hävitamise režiim[] ning seejärel vajuta blokile, mida soovid hävitada.\nMitme bloki hävitamiseks hoia sõrme mõni sekund all ning lohista üle blokkide.\nVajuta linnukesele, et kinnitada hävitusprotsess.\n\n[accent]Hävita kõik tuumikust vasakule jäävad vanametalli blokid, valides need korraga.
-tutorial.withdraw = Mõnikord on vaja ressursse otse mehhaanile kaasa võtta.\nSelleks [accent]vajuta blokile[], milles on ressursid, ja seejärel[accent] vajuta inventaris kuvatud ressursile[].\n[accent]Vajutades ja hoides[] on võimalik ressursse kaasa võtta hulgi.\n\n[accent]Võta tuumikust kaasa vaske.[]
-tutorial.deposit = Ressursside mahalaadimiseks lohista ressursid oma mehhaanilt sihtblokini.\n\n[accent]Pane vask tagasi tuumikusse.[]
-tutorial.waves = [scarlet]Vaenlane[] läheneb.\n\nKaitse oma tuumikut kahe lahingulaine vältel.[accent] Kliki hiirega[], et oma mehhaanist tulistada.\n[accent]Kaevanda juurde vaske. Ehita uusi puure ja kahureid.
-tutorial.waves.mobile = [scarlet]Vaenlane[] läheneb.\n\nKaitse oma tuumikut kahe lahingulaine vältel. Sinu mehhaan tulistab vaenlaseid automaatselt.\n[accent]Kaevanda juurde vaske. Ehita uusi puure ja kahureid.
-tutorial.launch = Kui oled kindla arvu lahingulaineid vastu pidanud, on sul võimalik[accent] tuumikuga lendu tõusta[], jättes maha kõik muud ehitised ja[accent] võttes kaasa kõik tuumikus olevad ressursid.[]\nNeid ressursse saab kasutada uute [accent]tehnoloogiate uurimiseks[].\n\n[accent]Vajuta lendu tõusmise nuppu.
+team.blue.name = sinine
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Peamine materjal, mida kasutatakse igat tüüpi konstruktsioonide ehitamiseks.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Peamine materjal, mida kasutatakse vedelike transportimise konstruktsioonide ja elektroonikaga seotud konstruktsioonide ehitamiseks.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
 item.metaglass.description = Ülitugev klaasiühend, mida kasutatakse vedelike transportimise ja hoiustamise konstruktsioonide ehitamiseks.
 item.graphite.description = Töödeldud süsinik, mida kasutatakse laskemoona tootmisel ja elektrilise isoleerainena.
 item.sand.description = Levinud materjal, mida kasutatakse metallurgias toorainena ja sulamite koostisena.
 item.coal.description = Kivistunud taimne mass, mis tekkis ammu enne spooride levimist. Kasutatakse kütusena ja teiste materjalide tootmisel.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
 item.titanium.description = Haruldane ja imekerge metall, mida kasutatakse puuride, mehhaanide ja vedelike transportimise konstruktsioonide ehitamiseks.
 item.thorium.description = Tihke radioaktiivne metall, mida kasutatakse tuumkütusena ja tugevate konstruktsioonide ehitamisel.
 item.scrap.description = Vanaaegsete ehitiste ja mahajäetud väeüksuste jäänused, mis sisaldavad väheses koguses erinevaid metalle.
+item.scrap.details = Leftover remnants of old structures and units.
 item.silicon.description = Pooljuht, mida kasutatakse päikesepaneelides, keerukates elektroonikaseadmetes ja isejuhtivates rakketides.
 item.plastanium.description = Kerge plastiline materjal, mida kasutatakse täiustatud lendmehhaanide ja kildpommide valmistamiseks.
 item.phase-fabric.description = Peaaegu kaalutu materjal, mida kasutatakse keerukates elektroonikaseadmetes ja isetaastuvates tehnoloogiates.
 item.surge-alloy.description = Täiustatud sulam, millel on ainulaadsed elektrilised omadused.
 item.spore-pod.description = Sünteetiline spooride kogum, mis on toodetud atmosfääris leiduvatest kontsentratsioonidest tööstustlikel eesmärkidel. Kasutatakse kütusena, tehisnafta tootmiseks ja lõhkeainete koostisosana.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = Pommides kasutatav ebastabiilne komponent, mis on sünteesitud spoorikobaratest ja teistest lenduvatest ühenditest. Kütusena kasutamine pole soovitatav.
 item.pyratite.description = Süüterelvades kasutatav eriti tuleohtlik aine.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 liquid.water.description = Kõige kasulikum vedelik, mida kasutatakse masinate jahutamiseks ja tööstuslike jäätmete töötlemisel.
 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.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Transpordib ressursse sama kiiresti kui titaankonveier, kuid on soomuskattega ja vastupidavam. Võtab külgedelt sisendina vastu ainult konveierite väljundeid.
+block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 
 block.message.description = Hoiab endas liitlastele olulist sõnumit.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Surub söekamakaid õhukesteks grafiidilehtedeks.
 block.multi-press.description = Grafiidipressi täiustatud versioon, mis kasutab vett ja energiat kiiremaks ja tõhusamaks töötlemiseks.
 block.silicon-smelter.description = Toodab räni, redutseerides liiva puhta söega.
 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.surge-smelter.description = Kombineerib titaaniumi, plii, räni ja vase voogsulamiks.
 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.
@@ -1244,6 +2086,8 @@ block.item-source.description = Väljastab piiramatult ressursse. Olemas ainult
 block.item-void.description = Hävitab kõik ressursid. Olemas ainult mänguviisis "Liivakast".
 block.liquid-source.description = Väljastab piiramatult vedelikke. Olemas ainult mänguviisis "Liivakast".
 block.liquid-void.description = Removes any liquids. Sandbox only.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
 block.copper-wall.description = Odav kaitsekonstruktsioon.\nKasulik tuumiku ja kahurite kaitsmiseks esimeste lahingulainete ajal.
 block.copper-wall-large.description = Odav kaitsekonstruktsioon.\nKasulik tuumiku ja kahurite kaitsmiseks esimeste lahingulainete ajal.\nUlatub üle mitme bloki.
 block.titanium-wall.description = Mõõdukalt tugev kaitsekonstruktsioon.\nPakub keskmist kaitset vaenlaste eest.
@@ -1256,6 +2100,10 @@ block.phase-wall.description = Tugev kaitsekonstruktsioon, mis on kaetud erilise
 block.phase-wall-large.description = Tugev kaitsekonstruktsioon, mis on kaetud erilise faaskangapõhise peegeldava ühendiga. Pakub kaitset peaaegu kõiki tüüpi kuulide ja mürskude eest.\nUlatub üle mitme bloki.
 block.surge-wall.description = Äärmiselt tugev kaitsekonstruktsioon.\nKuulidega kokkupõrkel neelab energiat, vabastades seda suvalistel hetkedel.
 block.surge-wall-large.description = Äärmiselt tugev kaitsekonstruktsioon.\nKuulidega kokkupõrkel neelab energiat, vabastades seda suvalistel hetkedel.\nUlatub üle mitme bloki.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Väike uks, mida saab avada ja sulgeda sellele vajutades.
 block.door-large.description = Suur uks, mida saab avada ja sulgeda sellele vajutades.\nUlatub üle mitme bloki.
 block.mender.description = Parandab perioodiliselt enda ümber olevaid konstruktsioone, hoides neid lahingulainete järel töökorras ja tervena. Ulatuse ja efektiivsuse parendamiseks on võimalik kasutada räni.
@@ -1272,18 +2120,20 @@ block.phase-conveyor.description = Täiustatud konveier, mis kasutab energiat re
 block.sorter.description = Sorteerib ressursse. Kui sisenev ressurss vastab valitud ressursile, siis liigub see otse edasi. Vastasel juhul väljastatakse ressurss vasakule või paremale.
 block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
 block.router.description = Jaotab ressursse kuni kolmes väljuvas suunas võrdselt. Kasulik olukordades, kus ressursse on vaja korraga saata mitmesse kohta.\n\n[scarlet]Ära kasuta neid tootmismasinate sisendite kõrval, kuna väljund ummistab sisendi.[]
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = Täiustatud jaotur, mis suunab ressursse kuni seitsmes väljuvas suunas võrdselt.
 block.overflow-gate.description = Eriline jaotur, mis väljastab vasakule ja paremale ainult siis, kui selle ees olev rada on blokeeritud.
 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 = Ülim ressursside transportimise vahend. Tulistab ressursse pika vahemaa taga asuva vastuvõtva katapuldini. Vajab töötamiseks energiat.
 block.mechanical-pump.description = Odav ja aeglane pump, mis ei vaja töötamiseks energiat.
 block.rotary-pump.description = Täiustatud pump, mis pumpab paremini kui harilik pump, kuid vajab töötamiseks energiat.
-block.thermal-pump.description = Ülim pump, mis vajab töötamiseks palju energiat.
+block.impulse-pump.description = Ülim pump, mis vajab töötamiseks palju energiat.
 block.conduit.description = Vedelike transportimise vahend, mis liigutab vedelikke edasi. Kasutatakse koos pumpade ja teiste torudega.
 block.pulse-conduit.description = Täiustatud toru, mis transpordib ja hoiustab vedelikke kiiremini kui algeline toru.
 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 = Jaotab vedelikke kuni kolmes väljuvas suunas võrdselt. Selle jaoturiga on võimalik teatud koguses ka vedelikku hoiustada. Kasulik olukordades, kus vedelikke on vaja korraga saata mitmesse kohta.
-block.liquid-tank.description = Hoiustab suures koguses vedelikke. Kasuta puhvrite loomiseks juhul, kui ressursside nõudlus pole püsiv, või ettevaatusabinõuna tähtsate konstruktsioonide jahutussüsteemides. 
+block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
+block.liquid-tank.description = Hoiustab suures koguses vedelikke. Kasuta puhvrite loomiseks juhul, kui ressursside nõudlus pole püsiv, või ettevaatusabinõuna tähtsate konstruktsioonide jahutussüsteemides.
 block.liquid-junction.description = Toimib kui sild samal tasapinnal ristuvate torude vahel. Kasulik olukordades, kus kaks toru kannavad erinevaid vedelikke erinevatesse kohtadesse.
 block.bridge-conduit.description = Spetsiaalne toru, mis liigutab vedelikke üle maastiku ja ehitiste kuni 3 bloki ulatuses.
 block.phase-conduit.description = Täiustatud toru, mis kasutab energiat vedelike teleportimiseks järgmise samasuguse toruni üle mitme bloki.
@@ -1308,15 +2158,21 @@ block.laser-drill.description = Lasertehnoloogia võimaldab puurida veelgi kiire
 block.blast-drill.description = Ülim puur, mis vajab töötamiseks suurel hulgal energiat.
 block.water-extractor.description = Puurib sügavale ja pumpab põhjavett. Kasutatakse kohtades, kus pinnavett ei leidu.
 block.cultivator.description = Kultiveerib atmosfääris madalas kontsentratsioonis leiduvaid spoore tööstuses kasutatavateks spoorikobarateks.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 block.oil-extractor.description = Kasutab suures koguses energiat, liiva ja vett nafta puurimiseks.
 block.core-shard.description = Tuumiku esimene versioon. Tuumiku hävides kaob ühendus piirkonnaga.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = Tuumiku teine versioon. Tugevam. Hoiustab rohkem ressursse.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = Tuumiku kolmas ja viimane versioon. Ãœlimalt tugev. Hoiustab massiivsel hulgal ressursse.
+block.core-nucleus.details = The third and final iteration.
 block.vault.description = Hoiustab suurt hulka igat tüüpi ressursse. Hoidlast ressursside kättesaamiseks kasutatakse mahalaadijat.
 block.container.description = Hoiustab väikest hulka igat tüüpi ressursse. Hoidlast ressursside kättesaamiseks kasutatakse mahalaadijat.
 block.unloader.description = Transpordib ressursse tuumikust ja hoidlatest konveieritele või külgnevatesse ehitistesse. Mahalaetava ressursi tüüpi saab valida mahalaadijale vajutades.
 block.launch-pad.description = Saadab ressursse tagasi emalaeva, ilma et oleks vaja tuumikuga lendu tõusta.
-block.launch-pad-large.description = Täiustatud stardiplatvorm, mis hoiustab rohkem ressursse ja millelt saadetakse ressursse sagedamini emalaeva.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Väike ja odav kahur, mis on kasulik maapealsete väeüksuste tõrjumiseks.
 block.scatter.description = Õhutõrjekahur, mis tulistab pliid või vanametalli lendavate väeüksuste pihta.
 block.scorch.description = Heidab tuld maapealsetele väeüksustele. Eriti efektiivne lähedal asuvate väeüksuste tõrjumiseks.
@@ -1331,5 +2187,429 @@ 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 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.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 537d0b3133..9fcf0835f5 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -12,16 +12,19 @@ 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.suggestions.description = Suggest new features
+link.suggestions.description = Proposatu ezaugarri berriak
+link.bug.description = Akatsen bat aurkitu duzu? Eman berri hemen
+linkopen = Zerbitzari honek esteka bat bidali dizu. Ziur ireki nahi duzula?\n\n[sky]{0}
 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.
 gameover = Partida amaitu da
+gameover.disconnect = Deskonektatu
 gameover.pvp = [accent] {0}[] taldeak irabazi du!
+gameover.waiting = [accent]Hurrengo maparen zain...
 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
+indev.notready = Jolasaren atal hau ez dago prest
 
 load.sound = Soinuak
 load.map = Mapak
@@ -29,20 +32,33 @@ load.image = Irudiak
 load.content = Edukia
 load.system = Sistema
 load.mod = Mod-ak
-load.scripts = Scripts
+load.scripts = Scriptak
 
-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 = Konpilazio berri bat eskuragarri dago:
+be.update.confirm = Deskargatu eta berrabiarazi orain?
+be.updating = Eguneratzen...
+be.ignore = Ezikusi
+be.noupdates = Ez da eguneratzerik aurkitu.
+be.check = Egiaztatu eguneratzeak
+mods.browser = Mod arakatzailea
+mods.browser.selected = Hautatutako mod-a
+mods.browser.add = Instalatu
+mods.browser.reinstall = Berrinstalatu
+mods.browser.view-releases = Ikusi bertsioak
+mods.browser.noreleases = [scarlet]Ez da bertsiorik aurkitu\n[accent]Ez da mod honen bertsiorik aurkitu. Egiaztatu mod-aren biltegian bertsiorik argitaratu ote den.
+mods.browser.latest = <Azkena>
+mods.browser.releases = Bersioak
+mods.github.open = Biltegia
+mods.github.open-release = Bertsioaren orria
+mods.browser.sortdate = Ordenatu dataren arabera
+mods.browser.sortstars = Ordenatu izarren arabera
 
-schematic = Eskama
+schematic = Eskema
 schematic.add = Gorde eskema...
 schematics = Eskemak
+schematic.search = Search schematics...
 schematic.replace = Badago izen bereko eskema bat. Ordeztu nahi duzu?
-schematic.exists = A schematic by that name already exists.
+schematic.exists = Badago izen bereko eskema bat.
 schematic.import = Inportatu eskema...
 schematic.exportfile = Esportatu fitxategia
 schematic.importfile = Inportatu fitxategia
@@ -53,20 +69,28 @@ schematic.shareworkshop = Partekatu tailerrean
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: itzulbiratu eskema
 schematic.saved = Eskema gordeta.
 schematic.delete.confirm = Eskema hau behin betiko suntsituko da.
-schematic.rename = Aldatu izena eskemari
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} bloke
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Eskemak desgaituta[]\nEz duzu eskemak erabiltzeko baimenik [accent]mapa[] edo [accent]zerbitzari[] honetan.
+schematic.tags = Etiketak:
+schematic.edittags = Editatu etiketak
+schematic.addtag = Gehitu etiketa
+schematic.texttag = Etiketaren testua
+schematic.icontag = Etiketaren ikonoa
+schematic.renametag = Aldatu etiketaren izena
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Ezabatu etiketa hau erabat?
+schematic.tagexists = Etiketa badago aurretik.
+stats = Estatistikak
+stats.wave = Gainditutako boladak
+stats.unitsCreated = Sortutako unitateak
+stats.enemiesDestroyed = Suntsitutako etsaiak
+stats.built = Eraikitako eraikinak
+stats.destroyed = Suntsitutako eraikinak
+stats.deconstructed = Deseraikitako eraikinak
+stats.playtime = Jolastutako denbora
 
-stat.wave = Garaitutako boladak:[accent] {0}
-stat.enemiesDestroyed = Suntsitutako etsaiak:[accent] {0}
-stat.built = Eraikitako eraikinak:[accent] {0}
-stat.destroyed = Suntsitutako eraikinak:[accent] {0}
-stat.deconstructed = Deseraikitako eraikinak:[accent] {0}
-stat.delivered = Egotzitako baliabideak:
-stat.playtime = Time Played:[accent] {0}
-stat.rank = Azken graduazioa: [accent]{0}
-
-globalitems = [accent]Global Items
+globalitems = [accent]Elementu globalak
 map.delete = Ziur al zaude "[accent]{0}[]" mapa ezabatu nahi duzula?
 level.highscore = Marka: [accent]{0}
 level.select = Maila hautaketa
@@ -74,12 +98,15 @@ level.mode = Jolas-modua:
 coreattack = < Muina erasopean dago! >
 nearpoint = [[ [scarlet]ATERA ERRUNTZE EREMUTIK ATOAN[] ]\nDeuseztapena berehalakoa
 database = Muinaren datu-basea
+database.button = Database
 savegame = Gorde partida
 loadgame = Kargatu partida
 joingame = Batu partidara
 customgame = Partida pertsonalizatua
 newgame = Partida berria
 none = <bat ere ez>
+none.found = [lightgray]<ez da aurkitu>
+none.inmap = [lightgray]<ez da aurkitu mapan>
 minimap = Mapatxoa
 position = Posizioa
 close = Itxi
@@ -91,7 +118,7 @@ maps.browse = Arakatu mapak
 continue = Jarraitu
 maps.none = [lightgray]Ez da maparik aurkitu!
 invalid = Baliogabea
-pickcolor = Pick Color
+pickcolor = Hautatu kolorea
 preparingconfig = Konfigurazioa prestatzen
 preparingcontent = Edukia prestatzen
 uploadingcontent = Edukia igotzen
@@ -99,60 +126,89 @@ uploadingpreviewfile = Aurrebista fitxategia igotzen
 committingchanges = Aldaketak aplikatzen
 done = Egina
 feature.unsupported = Zure gailuak ez du ezaugarri hau onartzen.
-
-mods.alphainfo = Kontuan izan mod-ak alfa egoeran daudela, eta [scarlet] akats ugari izan ditzakete[].\nEman arazoen berri Mindustry-ren GitHub or Discord zerbitzuetan.
+mods.initfailed = [red]âš [] Aurreko Mindustry instantziak ezin izan du abiatu. Ziur aski mod-en erruz.\n\nEtengabeko kraskatzean ekiditeko, [red]mod guztiak desgaitu dira.[]
 mods = Mod-ak
 mods.none = [lightgray]Ez da mod-ik aurkitu!
 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.
+mods.viewcontent = Ikusi edukia
+mods.reload = Birkargatu
+mods.reloadexit = Jolsa irten egingo da, mod-ak birkargatzeko.
+mod.installed = [[Instalatuta]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Gaituta
 mod.disabled = [scarlet]Desgaituta
+mod.multiplayer.compatible = [gray]Hainbat jokalariekin bateragarria
 mod.disable = Desgaitu
-mod.content = Content:
+mod.version = Version:
+mod.content = Edukia:
 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.
-mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
+mod.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
+mod.erroredcontent = [scarlet]Edukiaren erroreak
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This mod caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
+mod.errors = Erroreak gertatu dira edukia kargatzean.
+mod.noerrorplay = [scarlet]Erroreak dituzten mod-ak dituzu.[] Desgaitu kaltetutako mod-ak edo konpondu erroreak jolastu aurretik.
 mod.nowdisabled = [scarlet]'{0}' mod-ak menpekotasunak ditu faltan:[accent] {1}\n[lightgray]Aurretik beste mod hauek deskargatu behar dira.\nMod hau automatikoki desgaituko da.
 mod.enable = Gaitu
 mod.requiresrestart = Jolasa itxi egingo da mod-aren aldaketak aplikatzeko.
 mod.reloadrequired = [scarlet]Birkargatu behar da
-mod.import = Importatu Mod-a
-mod.import.file = Import File
+mod.import = Inportatu Mod-a
+mod.import.file = Inportatu fitxategia
 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.jarwarn = [scarlet]JAR mod-ak ez-ziurrak dira berez.[]\nEgiaztatu konfidantzako itur batetik inportatzen duzula!
+mod.item.remove = Hau[accent] '{0}'[] mod-aren parte da. Kentzeko, desinstalatu mod-a.
 mod.remove.confirm = Mod hau ezabatuko da.
 mod.author = [lightgray]Egilea:[] {0}
 mod.missing = Gordetako partida honek eguneratu dituzun edo jada instalatuta ez dituzun mod-ak ditu. Gordetako partida izorratu daiteke. Ziur kargatu nahi duzula?\n[lightgray]Mod-ak:\n{0}
 mod.preview.missing = Mod hau tailerrean argitaratu aurretik, aurrebista bat gehitu behar diozu.\nKokatu[accent] preview.png[] izeneko irudi bat mod-aren karpetan eta saiatu berriro.
 mod.folder.missing = Karpeta formatuko mod-ak besterik ezin dira argitaratu tailerrean.\nEdozein mod karpetara bihurtzeko, deskopnrimitu fitxategia eta ezabatu zip zaharra, gero berrabiarazi jolasa edo birkargatu zure mod-ak.
-mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
+mod.scripts.disable = Zure gailuak ez ditu scrit-ak dituzten mod-ak onartzen. Mod hauek desgaitu behar dituzu jolasteko.
 
 about.button = Honi buruz
 name = Izena:
 noname = Hautatu[accent] jokalari-izena[] aurretik.
-planetmap = Planet Map
-launchcore = Launch Core
+search = Bilatu:
+planetmap = Planeta-mapa
+launchcore = Egotzi muina
 filename = Fitxategi-izena:
 unlocked = Eduki berria desblokeatuta!
+available = Ikerketa berria eskuragarri!
+unlock.incampaign = < Desblokeatu kanpainan xehetasunetarako >
+campaign.select = Hautatu hasierako kanpaina
+campaign.none = [lightgray]hautatu hasteko planeta.\nHau edonoiz aldatu daiteke.
+campaign.erekir = [accent]Jokalari berrientzak aholkatua.[]\n\nEduki berriagoa eta landuagoa. Kanpaina aurreratze lineala.\n\nKalitate hobeko mapak eta esperientzia orokorra.
+campaign.serpulo = [scarlet]Ez aholkatua jokalari berrientzat.[]\n\nEduki zaharra; esperientzia klasikoa. Irekiagoa.\n\nAgian desorekatuak dauden mapak eta kanpainaren mekanikak. Ez horren landua.
+campaign.difficulty = Difficulty
+
+
 completed = [accent]Ikertua
 techtree = Teknologia zuhaitza
+techtree.select = Teknologia zuhaitzeko hautaketa
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Kargatu
+research.discard = Baztertu
 research.list = [lightgray]Ikertu:
 research = Ikertu
 researched = [lightgray]{0} ikertuta.
-research.progress = {0}% complete
+research.progress = {0}% osatuta
 players = {0} jokalari konektatuta
 players.single = Jokalari {0} konektatuta
-players.search = search
-players.notfound = [gray]no players found
+players.search = bilatu
+players.notfound = [gray]ez da jokalaririk aurkitu
 server.closing = [accent]Zerbitzaria ixten...
 server.kicked.kick = Zerbitzaritik kanporatu zaituzte!
 server.kicked.whitelist = Ez zaude hemengo zerrenda zurian.
@@ -169,7 +225,7 @@ server.kicked.nameEmpty = Aukeratu duzun izena baliogabea da.
 server.kicked.idInUse = Bazaude zerbitzari honetan! Ezin zara bi kontu desberdinekin konektatu.
 server.kicked.customClient = Zerbitzari honek ez ditu konpilazio pertsonalizatuak onartzen. Deskargatu bertsio ofizial bat.
 server.kicked.gameover = Partida amaitu da!
-server.kicked.serverRestarting = The server is restarting.
+server.kicked.serverRestarting = Zerbitzaria berrabiaratzen ari da.
 server.versions = Zure bertsioa:[accent] {0}[]\nZerbitzariaren bertsioa:[accent] {1}[]
 host.info = [accent]Ostalaria[] botoiak zerbitzari bat abiatzen du [scarlet]6567[] atakan.\n[lightgray]wifi edo sare lokal[] berean dagoen edonor zure zerbitzaria ikusi ahal beharko luke.\n\nJendea edonondik IP-a erabilita konektatu ahal izatea nahi baduzu, [accent]ataka birbidaltzea[] ezinbestekoa da.\n\n[lightgray]Oharra: Inork zure sare lokalean partidara elkartzeko arazoak baditu, egiaztatu Mindustry-k baimena duela sare lokalera elkartzeko suebakiaren ezarpenetan. Kontuan izan sare publiko batzuk ez dutela zerbitzarien bilaketa baimentzen.
 join.info = Hemen, konektatzeko [accent]zerbitzari baten IP-a[] sartu dezakezu konektatzeko, edo [accent]sare lokaleko[] zerbitzariak bilatu.\nLAN zein WAN sareetan onartzen dira hainbat jokalarien partidak .\n\n[lightgray]Oharra: Ez dago zerbitzarien zerrenda global automatikorik, beste inorekin IP bidez konektatu nahi baduzu, ostalariari bere IP helbidea eskatu beharko diozu.
@@ -185,17 +241,33 @@ server.refreshing = Zerbitzaria freskatzen
 hosts.none = [lightgray]Ez da partida lokalik aurkitu!
 host.invalid = [scarlet]Ezin da ostalarira konektatu.
 
-servers.local = Local Servers
-servers.remote = Remote Servers
-servers.global = Community Servers
+servers.local = Zerbitzari lokalak
+servers.local.steam = Ireki partidak eta zerbitzari lokalak
+servers.remote = Urruneko zerbitzariak
+servers.global = Komunitatearen zerbitzariak
+servers.disclaimer = Komunitatearen zerbitzariak [accent]ez[] ditu garatzaileak kontrolatzen.\n\nZerbitzari hauek erabiltzaileek sortutako edukia izan dezakete, eta ez du zertan adin guztientzat egokia izan behar.
+servers.showhidden = Erakutsi ezkutatutako zerbitzariak
+server.shown = Erakutsita
+server.hidden = Ezkutatuta
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Trazatu jokalaria
 trace.playername = Jokalariaren izena: [accent]{0}
 trace.ip = IP-a: [accent]{0}
 trace.id = ID bakana: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Bezero mugikorra: [accent]{0}
 trace.modclient = Bezero pertsonalizatua: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Bezero ID baliogabea! Ireki arazte txosten bat.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Debekuak
 server.bans.none = Ez da debekatutako jokalaririk aurkitu!
 server.admins = Administratzaileak
@@ -209,10 +281,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Konpilazio pertsonalizatua
 confirmban = Ziur jokalari hau debekatu nahi duzula?
 confirmkick = Ziur jokalari hau kanporatu nahi duzula?
-confirmvotekick = Ziur hokalari hau botatzearen alde bozkaytu nahi duzula?
 confirmunban = Ziur jokalari hau debekatzeari utzi nahi nahi diozula?
 confirmadmin = Ziur jokalari hau admin bihurtu nahi duzula?
 confirmunadmin = Ziur jokalari honi admin eskubidea kendu nahi diozula?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Batu partidara
 joingame.ip = Helbidea:
 disconnect = Deskonektatuta.
@@ -220,15 +293,18 @@ disconnect.error = Konexio errorea.
 disconnect.closed = Konexioa itxita.
 disconnect.timeout = Denbor-muga agortuta.
 disconnect.data = Huts egin du munduaren datuak eskuratzean!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Ezin izan da partidara elkartu ([accent]{0}[]).
 connecting = [accent]Konektatzen...
+reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Munduaren datuak kargatzen...
 server.port = Ataka:
-server.addressinuse = Helbidea dagoeneko erabilita dago!
 server.invalidport = Ataka zenbaki baliogabea!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Errorea zerbitzaria ostatatzean: [accent]{0}
 save.new = Gordetako partida berria
 save.overwrite = Ziur gordetzeko tarte hau gainidatzi nahi duzula?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Gainidatzi
 save.none = Ez da gordetako partidarik aurkitu!
 savefail = Huts egin du partida gordetzean!
@@ -249,6 +325,7 @@ save.corrupted = [accent]Gordetako partidaren fitxategia hondatuta dago edo bali
 empty = <hutsik>
 on = Piztuta
 off = Itzalita
+save.search = Search saved games...
 save.autosave = Gordetze automatikoa: {0}
 save.map = Mapa: {0}
 save.wave = {0}. bolada
@@ -264,9 +341,33 @@ ok = Ados
 open = Ireki
 customize = Aldatu arauak
 cancel = Utzi
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Ireki esteka
 copylink = Kopiatu esteka
 back = Atzera
+max = Max
+objective = Map Objective
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
 data.export = Esportatu datuak
 data.import = Inportatu datuak
 data.openfolder = Open Data Folder
@@ -274,15 +375,18 @@ data.exported = Datuak esportatuta.
 data.invalid = Datu hauek baliogabeak dira.
 data.import.confirm = Kanpoko datuak inportatzeak zure oraingo jolasaren datu [scarlet]guztiak[] ezabatuko ditu.\n[accent]Hau ezin da desegin![]\n\nBehin datuak inporatuta, zure jolasa berehala irtengo da.
 quit.confirm = Ziur irten nahi duzula?
-quit.confirm.tutorial = Ziur al zaude irten nahi duzula?\nTutoriala berriro hasi dezakezu hemen: [accent] Ezarpenak->Jolasa->Berriro hasi tutoriala.[]
 loading = [accent]Kargatzen...
-reloading = [accent]Mod-ak birkargatzen...
+downloading = [accent]Downloading...
 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
 resumebuilding = [scarlet][[{0}][] eraikiketa berrekiteko
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]{0}. bolada
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]Boladarako {0}
@@ -290,6 +394,8 @@ wave.waveInProgress = [lightgray]Bolada abian
 waiting = [lightgray]Itxaroten...
 waiting.players = Jokalariei itxaroten...
 wave.enemies = [lightgray]{0} etsai daude
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
 wave.enemy = [lightgray]Etsai {0} dago
 wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
 wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
@@ -300,9 +406,9 @@ custom = Pertsonalizatua
 builtin = Jolas barnekoa
 map.delete.confirm = Ziur mapa hau ezabatu nahi duzula? Ekintza hau ezin da desegin!
 map.random = [accent]Ausazko mapa
-map.nospawn = Mapa honek ez du muinik jokalaria sortu dadin! Gehitu muin [accent] laranja[] bat mapa honi editorean.
+map.nospawn = Mapa honek ez du muinik jokalaria sortu dadin! Gehitu muin {0} bat mapa honi editorean.
 map.nospawn.pvp = Mapa honek ez du etsaien muinik jokalaria sortu dadin! Gehitu [scarlet]laranja ez den[] muinen bat edo batzuk mapa honi editorean.
-map.nospawn.attack = Mapa honek ez du etsaien muinik jokalariak eraso dezan! Gehitu muin [scarlet]gorriak[] mapa honi editorean.
+map.nospawn.attack = Mapa honek ez du etsaien muinik jokalariak eraso dezan! Gehitu muin {0} mapa honi editorean.
 map.invalid = Errorea mapa kargatzean: Mapa-fitxategi baliogabe edo hondatua.
 workshop.update = Eguneratu elementua
 workshop.error = Errorea tailerreko xehetasunak eskuratzean: {0}
@@ -310,12 +416,17 @@ map.publish.confirm = Ziur mapa hau argitaratu nahi duzula?\n\n[lightgray]Ziurta
 workshop.menu = Erabaki elementu honekin zer egin nahi duzun.
 workshop.info = Elementuaren informazioa
 changelog = Aldaketa egunkatia (aukerakoa):
+updatedesc = Overwrite Title & Description
 eula = Steam EULA
 missing = Elementu hau ezabatu edo lekuz aldatu da.\n[lightgray]Tailerreko zerrendatik kendu da automatikoki.
 publishing = [accent]Argitaratzen...
 publish.confirm = Ziur hau argitaratu nahi duzula?\n\n[lightgray]Egiaztatu tailerreko EULA lizentziarekin ados zaudela aurretik, bestela zure elementuak ez dira agertuko!
 publish.error = Errorea elementua argitaratzean: {0}
 steam.error = Huts egin du Steam zerbitzuak hasieratzean.\nErrorea: {0}
+editor.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Brotxa
 editor.openin = Ireki editorean
@@ -328,35 +439,71 @@ editor.nodescription = Mapek deskripzio bat izan behar dute argitaratu aurretik,
 editor.waves = Boladak:
 editor.rules = Arauak:
 editor.generation = Sorrarazi:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Editatu jolasean
+editor.playtest = Playtest
 editor.publish.workshop = Argitaratu lantegian
 editor.newmap = Mapa berria
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Lantegia
 waves.title = Boladak
 waves.remove = Kendu
-waves.never = <beti>
 waves.every = maiztasuna
 waves.waves = bolada
+waves.health = health: {0}%
 waves.perspawn = sorrerako
 waves.shields = shields/wave
 waves.to = -
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Aurrebista
 waves.edit = Editatu...
+waves.random = Random
 waves.copy = Kopiatu arbelera
 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.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
+all = All
 
 editor.default = [lightgray]<Lehenetsia>
 details = Xehetasunak...
 edit = Editatu...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Izena:
 editor.spawn = Sortu unitatea
 editor.removeunit = Kendu unitatea
@@ -368,13 +515,19 @@ editor.errorlegacy = Mapa hau zaharregia da, eta jada onartzen ez den formatu za
 editor.errornot = Hau ez da mapa-fitxategi bat.
 editor.errorheader = Mapa hau hondatuta dago edo baliogabea da.
 editor.errorname = Mapak ez du zehaztutako izenik. Gordetako partida bat kargatzen saiatu zara?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Eguneratu
 editor.randomize = Ausazkoa
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Aplikatu
 editor.generate = Sorrarazi
+editor.sectorgenerate = Sector Generate
 editor.resize = Aldatu neurria
 editor.loadmap = Kargatu mapa
 editor.savemap = Gorde mapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Gordeta!
 editor.save.noname = Zure mapak ez du izenik" Jarri baten bat 'Mapa info' menuan.
 editor.save.overwrite = Zure mapak jolas barneko mapa bat gainidatziko luke! Hautatu beste izen bat 'Mapa info' menuan.
@@ -413,8 +566,12 @@ toolmode.eraseores = Ezabatu meak
 toolmode.eraseores.description = Ezabatu meak soilik.
 toolmode.fillteams = Bete taldeak
 toolmode.fillteams.description = Bete taldeak blokeen ordez.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Marraztu taldeak
 toolmode.drawteams.description = Marraztu taldeak blokeen ordez.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]Iragazkirik ez! Gehitu bat beheko botoiarekin.
 filter.distort = Distortsioa
@@ -433,6 +590,7 @@ filter.clear = Garbitu
 filter.option.ignore = Ezikusi
 filter.scatter = Sakabanaketa
 filter.terrain = Lursaila
+filter.logic = Logic
 filter.option.scale = Eskala
 filter.option.chance = Zoria
 filter.option.mag = Magnitudea
@@ -441,17 +599,39 @@ filter.option.circle-scale = Eskala zirkularra
 filter.option.octaves = Oktabak
 filter.option.falloff = Bakandu
 filter.option.angle = Angelua
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Blokea
 filter.option.floor = Zorua
 filter.option.flooronto = Zoru xedea
 filter.option.target = Target
+filter.option.replacement = Replacement
 filter.option.wall = Horma
 filter.option.ore = Mea
 filter.option.floor2 = Bigarren zorua
 filter.option.threshold2 = Bigarren atalasea
 filter.option.radius = Erradioa
 filter.option.percentile = Pertzentila
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Zabalera:
 height = Altuera:
@@ -462,6 +642,9 @@ load = Kargatu
 save = Gorde
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Berrabiarazi jolasa hizkuntza-ezarpenak aplikatzeko.
 settings = Ezarpenak
 tutorial = Tutoriala
@@ -476,26 +659,71 @@ complete = [lightgray]Helmena:
 requirement.wave = Iritsi {0} boladara {1}
 requirement.core = Suntsitu etsaiaren muina {0}
 requirement.research = Research {0}
+requirement.produce = Produce {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Bolada onena: {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
+map.multiplayer = Only the host can view sectors.
 uncover = Estalgabetu
 configure = Konfiguratu zuzkidura
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
 loadout = Loadout
-resources = Resources 
+resources = Resources
+resources.max = Max
 bannedblocks = Debekatutako blokeak
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Gehitu denak
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = [lightgray]Antzemandako baliabideak:
-zone.objective = [lightgray]Helburua: [accent]{0}
-zone.objective.survival = Biziraupena
-zone.objective.attack = Suntsitu etsaiaren muina
 add = Gehitu
-boss.health = Nagusiaren osasuna
+guardian = Guardian
 
 connectfail = [crimson]Konexio errorea:\n\n[accent]{0}
 error.unreachable = Zerbitzaria eskuraezin.\nHelbidea ondo idatzita dago?
@@ -507,26 +735,69 @@ error.mapnotfound = Ez da mapa-fitxategia aurkitu!
 error.io = Sareko irteera/sarrera errorea.
 error.any = Sareko errore ezezaguna.
 error.bloom = Ezin izan da distira hasieratu.\nAgian zure gailuak ez du onartzen.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Time:
+sectors.threat = Threat:
+sectors.wave = Wave:
 sectors.stored = Stored:
 sectors.resume = Resume
 sectors.launch = Launch
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
+sector.curcapture = Sector Captured
+sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
+sector.attacked = Sector [accent]{0}[white] under attack!
+sector.lost = Sector [accent]{0}[white] lost!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planets
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sun
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -539,6 +810,22 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -551,6 +838,75 @@ 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
 
 settings.language = Hizkuntza
 settings.data = Jolasaren datuak
@@ -573,7 +929,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Pausatuta >
 clear = Garbitu
 banned = [scarlet]Debekatuta
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Bai
 no = Ez
 info.title = Informazioa
@@ -581,13 +937,18 @@ error.title = [crimson]Errore bat gertatu da
 error.crashtitle = Errore bat gertatu da
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Purpose
 
 stat.input = Sarrera
 stat.output = Irteera
+stat.maxefficiency = Max Efficiency
 stat.booster = Indargarria
 stat.tiles = Required Tiles
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Energia-edukiera
 stat.powershot = Energia/tiroko
 stat.damage = Kaltea
@@ -610,6 +971,11 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Oinarrizko energia sorrera
 stat.productiontime = Eraikitze denbora
 stat.repairtime = Blokearen konpontze denbora osoa
+stat.repairspeed = Repair Speed
+stat.weapons = Weapons
+stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Abiadura areagotzea
 stat.range = Irismena
 stat.drilltier = Ustiagarriak
@@ -617,6 +983,7 @@ stat.drillspeed = Oinarrizko ustiatze-abiadura
 stat.boosteffect = Indartze-efektua
 stat.maxunits = Gehieneko unitate aktiboak
 stat.health = Osasuna
+stat.armor = Armor
 stat.buildtime = Eraikitze-denbora
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Eraikitze-kostua
@@ -632,6 +999,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = HeatCapacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -640,21 +1008,77 @@ stat.buildspeed = Build Speed
 stat.minespeed = Mine Speed
 stat.minetier = Mine Tier
 stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
 stat.abilities = Abilities
+stat.canboost = Can Boost
+stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Zulagailu hobea behar da
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Ustiatze-abiadura: {0}/s
 bar.pumpspeed = Ponpatze abiadura: {0}/s
 bar.efficiency = Eraginkortasuna: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Energia: {0}/s
 bar.powerstored = Bilduta: {0}/{1}
 bar.poweramount = Energia: {0}
@@ -663,13 +1087,19 @@ bar.powerlines = Connections: {0}/{1}
 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.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
 bar.power = Energia
 bar.progress = Eraikitze egoera
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -677,35 +1107,50 @@ bullet.damage = [stat]{0}[lightgray] kalte
 bullet.splashdamage = [stat]{0}[lightgray] ingurune-kaltea ~[stat] {1}[lightgray] lauza
 bullet.incendiary = [stat]su-eragilea
 bullet.homing = [stat]gidatua
-bullet.shock = [stat]danbatekoa
-bullet.frag = [stat]fragmentazioa
+bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] kontusioa
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]hozkirri
-bullet.tarred = [stat]mundrunduta
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x munizio-biderkatzailea
 bullet.reload = [stat]{0}[lightgray]x tiro tasa
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = bloke
 unit.blockssquared = blocks²
 unit.powersecond = energia unitate/segundoko
+unit.tilessecond = tiles/second
 unit.liquidsecond = likido unitate/segundoko
 unit.itemssecond = elementu/segundoko
 unit.liquidunits = likido unitate
 unit.powerunits = energia unitate
+unit.heatunits = heat units
 unit.degrees = grado
 unit.seconds = segundo
 unit.minutes = mins
 unit.persecond = /seg
 unit.perminute = /min
 unit.timesspeed = x abiadura
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = elementu
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Purpose
 category.general = Orokorra
 category.power = Energia
 category.liquids = Likidoak
@@ -713,16 +1158,23 @@ category.items = Baliabideak
 category.crafting = Sarrera/Irteera
 category.function = Function
 category.optional = Aukerako hobekuntzak
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 setting.landscape.name = Blokeatu horizontalean
 setting.shadows.name = Itzalak
 setting.blockreplace.name = Bloke proposamen automatikoak
 setting.linear.name = Iragazte lineala
 setting.hints.name = Pistak
-setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
+setting.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animatutako ura
 setting.animatedshields.name = Animatutako ezkutuak
-setting.antialias.name = Antialias[lightgray] (berrabiarazi behar da)[]
 setting.playerindicators.name = Player Indicators
 setting.indicators.name = Etsai/Aliatu adierazleak
 setting.autotarget.name = Punteria automatikoa
@@ -732,14 +1184,11 @@ setting.fpscap.name = Max FPS
 setting.fpscap.none = Bat ere ez
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = Interfaze-eskala[lightgray] (berrabiarazi behar da)[]
+setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Kokatu beti diagonalean
-setting.difficulty.training = Entrenamendua
-setting.difficulty.easy = Erraza
-setting.difficulty.normal = Arrunta
-setting.difficulty.hard = Zaila
-setting.difficulty.insane = Zoramena
-setting.difficulty.name = Zailtasuna:
 setting.screenshake.name = Pantailaren astindua
+setting.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Bistaratze-efektuak
 setting.destroyedblocks.name = Erakutsi suntsitutako blokeak
 setting.blockstatus.name = Display Block Status
@@ -747,32 +1196,43 @@ setting.conveyorpathfinding.name = Garraio-zintak kokatzeko bide-bilaketa
 setting.sensitivity.name = Kontrolagailuaren sentikortasuna
 setting.saveinterval.name = Gordetzeko tartea
 setting.seconds = {0} segundo
-setting.blockselecttimeout.name = Block Select Timeout
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Pantaila osoa
 setting.borderlesswindow.name = Ertzik gabeko leihoa[lightgray] (berrabiaraztea behar lezake)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Erakutsi FPS
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 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.coreitems.name = Display Core Items
 setting.position.name = Erakutsi jokalariaren kokalekua
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Musikaren bolumena
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Giroaren bolumena
 setting.mutemusic.name = Isilarazi musika
 setting.sfxvol.name = Efektuen bolumena
 setting.mutesound.name = Isilarazi soinua
 setting.crashreport.name = Bidali kraskatze txosten automatikoak
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Gorde automatikoki
-setting.publichost.name = Partidaren ikusgaitasun publikoa
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Txataren opakotasuna
 setting.lasersopacity.name = Energia laserraren opakutasuna
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Erakutsi jolas barneko txata
-public.confirm = Zure jolasa publikoa egin nahi duzu?\n[accent]Edonor elkartu ahal izango da zure partidetara.\n[lightgray]Hau gero ere aldatu dauteke, Ezarpenak->Partida->Partida publikoaren ikusgaitasuna.
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Egokitu interfazea bistaratzeko
+setting.macnotch.description = Berrabiarazi behar da aldaketak aplikatzeko
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Kontuan izan jolasaren beta bertsioek ezin dituztela jokalarien gela publokoak sortu.
 uiscale.reset = Interfazearen eskala aldatu da.\nSakatu "Ados" eskala hau berresteko.\n[scarlet][accent] {0}[] segundo atzera egin eta irteteko...
 uiscale.cancel = Utzi eta irten
@@ -781,12 +1241,9 @@ keybind.title = Aldatu teklak
 keybinds.mobile = [scarlet]Tekla konfigurazio gehienak ez dabiltza mugikorrean. Oinarrizko mugimendua onartzen da soilik.
 category.general.name = Orokorra
 category.view.name = Bistaratzea
+category.command.name = Unit Command
 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
@@ -801,6 +1258,27 @@ keybind.move_y.name = Mugitu y
 keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Hautatu eskualdea
 keybind.schematic_menu.name = Eskema menua
 keybind.schematic_flip_x.name = Itzulbiratu X
@@ -826,16 +1304,20 @@ keybind.select.name = Hautatu/Tirokatu
 keybind.diagonal_placement.name = Kokatze diagonala
 keybind.pick.name = Jaso blokea
 keybind.break_block.name = Apurtu blokea
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 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
 keybind.pause.name = Pausatu
 keybind.pause_building.name = Pausatu/berrekin eraikiketa
 keybind.minimap.name = Mapatxoa
+keybind.planet_map.name = Planet Map
+keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Txata
 keybind.player_list.name = Jokalarien zerrenda
 keybind.console.name = Kontsola
@@ -845,6 +1327,7 @@ keybind.toggle_menus.name = Txandakatu menuak
 keybind.chat_history_prev.name = Txat historialean aurrekoa
 keybind.chat_history_next.name = Txat historialean hurrengoa
 keybind.chat_scroll.name = Korritu txata
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = Lurreratu unitatea
 keybind.zoom_minimap.name = Mapatxoaren zooma
 mode.help.title = Moduen deskripzioa
@@ -858,47 +1341,100 @@ mode.pvp.description = Borrokatu beste jokalari batzuk lokalean.\n[gray]Gutxiene
 mode.attack.name = Erasoa
 mode.attack.description = Suntsitu etsaiaren basea. Boladarik ez.\n[gray]Kono gorria behar da mapan jolasteko.
 mode.custom = Arau pertsonalizatuak
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Baliabide amaigabeak
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Boladen denboragailua
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Boladak
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Eraso modua
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = IA-k (talde gorriak) baliabide amaigabeak ditu
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unitateen sorrerarako abiadura-biderkatzailea
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unitateen osasun-biderkatzailea
 rules.unitdamagemultiplier = Unitateen kalte-biderkatzailea
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Etsaien muinaren ez-eraikitze erradioa:[lightgray] (lauzak)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Boladen tartea:[lightgray] (seg)
+rules.initialwavespacing = Initial Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Eraikitze kostu-biderkatzailea
 rules.buildspeedmultiplier = Eraikitze abiadura-biderkatzailea
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Atzeratu bolada etsairik geratzen bada
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Erruntze puntuaren erradioa:[lightgray] (lauzak)
 rules.unitammo = Units Require Ammo
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
 rules.title.waves = Boladak
 rules.title.resourcesbuilding = Baliabideak eta eraikuntza
 rules.title.enemy = Etsaiak
 rules.title.unit = Unitateak
 rules.title.experimental = Experimental
 rules.title.environment = Environment
+rules.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Lighting
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Solidoak
 content.liquid.name = Likidoak
 content.unit.name = Unitateak
 content.block.name = Blokeak
+content.status.name = Status Effects
+content.sector.name = Sectors
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Kobrea
 item.lead.name = Beruna
@@ -916,10 +1452,23 @@ item.blast-compound.name = Lehergai konposatua
 item.pyratite.name = Piratita
 item.metaglass.name = Metabeira
 item.scrap.name = Txatarra
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = Ura
 liquid.slag.name = Zepa
 liquid.oil.name = Olioa
 liquid.cryofluid.name = Krio-isurkaria
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Daga
 unit.mace.name = Mace
@@ -947,6 +1496,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,13 +1508,35 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Hondar harkaitza
+block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Belarra
-block.slag.name = Slag
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Space
 block.salt.name = Gatza
 block.salt-wall.name = Salt Wall
@@ -988,24 +1564,28 @@ block.graphite-press.name = Grafito prentsa
 block.multi-press.name = Multi-prentsa
 block.constructing = {0} [lightgray](Eraikitzen)
 block.spawn.name = Etsai-sorrera
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Muina: Maskorra
 block.core-foundation.name = Muina: Fundazioa
 block.core-nucleus.name = Muina: Nukleoa
-block.deepwater.name = Ur sakona
-block.water.name = Ura
+block.deep-water.name = Ur sakona
+block.shallow-water.name = Ura
 block.tainted-water.name = Ur kutsatua
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Hondar ilunez kutsatutako ura
 block.tar.name = Mundruna
 block.stone.name = Harria
-block.sand.name = Hondarra
+block.sand-floor.name = Hondarra
 block.darksand.name = Hondar iluna
 block.ice.name = Izotza
 block.snow.name = Elurra
-block.craters.name = Kraterrak
+block.crater-stone.name = Kraterrak
 block.sand-water.name = Hondar ura
 block.darksand-water.name = Hondar ilun ura
 block.char.name = Kokea
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Izotz elurra
@@ -1023,6 +1603,7 @@ block.spore-cluster.name = Espora mordoa
 block.metal-floor.name = Metalezko zorua 1
 block.metal-floor-2.name = Metalezko zorua 2
 block.metal-floor-3.name = Metalezko zorua 3
+block.metal-floor-4.name = Metal Floor 4
 block.metal-floor-5.name = Metalezko zorua 4
 block.metal-floor-damaged.name = Kaltetutako metalezko zorua
 block.dark-panel-1.name = Panel iluna 1
@@ -1056,15 +1637,16 @@ block.conveyor.name = Garraio-zinta
 block.titanium-conveyor.name = Titaniozko garraio-zinta
 block.plastanium-conveyor.name = Plastanium Conveyor
 block.armored-conveyor.name = Blindatutako garraio-zinta
-block.armored-conveyor.description = Titaniozko garraio-zinten abiadura berean darmatza elementuak, baina bildaje hobea du. Ez du onartzen albotik kargatzea ez bada beste garraio-zinta batetik.
 block.junction.name = Lotunea
 block.router.name = Bideratzailea
 block.distributor.name = Banatzailea
 block.sorter.name = Antolatzailea
 block.inverted-sorter.name = Alderantzizko antolatzailea
 block.message.name = Mezua
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
-block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 block.overflow-gate.name = Gainezkatze atea
 block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silizio galdategia
@@ -1115,20 +1697,22 @@ block.solar-panel.name = Panel fotovoltaikoa
 block.solar-panel-large.name = Panel fotovoltaiko handia
 block.oil-extractor.name = Olio erauzgailua
 block.repair-point.name = Konponketa puntua
+block.repair-turret.name = Repair Turret
 block.pulse-conduit.name = Pultsu hodia
 block.plated-conduit.name = Plated Conduit
 block.phase-conduit.name = Fasezko hodia
 block.liquid-router.name = Likidoen bideratzailea
 block.liquid-tank.name = Likidoentzako tankea
+block.liquid-container.name = Liquid Container
 block.liquid-junction.name = Likidoentzako lotunea
 block.bridge-conduit.name = Hodi zubia
 block.rotary-pump.name = Ponpa birakaria
 block.thorium-reactor.name = Toriozko erreaktorea
 block.mass-driver.name = Mukulu igorlea
 block.blast-drill.name = Zurrusta zulagailua
-block.thermal-pump.name = Ponpa termikoa
+block.impulse-pump.name = Ponpa termikoa
 block.thermal-generator.name = Sorgailu termikoa
-block.alloy-smelter.name = Aleazio urtzailea
+block.surge-smelter.name = Aleazio urtzailea
 block.mender.name = Bedezi
 block.mend-projector.name = Konpontze proiektorea
 block.surge-wall.name = Tirainezko horma
@@ -1145,9 +1729,9 @@ block.meltdown.name = Nukleofusio
 block.foreshadow.name = Foreshadow
 block.container.name = Edukiontzia
 block.launch-pad.name = Egozketa-plataforma
-block.launch-pad-large.name = Egozketa-plataforma handia
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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
@@ -1157,9 +1741,179 @@ 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.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1169,66 +1923,153 @@ 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 = urdina
+team.malis.name = Malis
 team.crux.name = gorria
 team.sharded.name = laranja
-team.orange.name = laranja
 team.derelict.name = abandonatua
 team.green.name = berdea
-team.purple.name = morea
 
-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
-tutorial.drill = Eskuz ustiatzea ez da eraginkorra.\n[accent]Zulagailuek []automatikoki ustiatu dezakete.\nSakatu zulagailuen fitxa, behean eskuman.\nHautatu[accent] zulagailu mekanikoa[]. Kokatu ezazu kobre zain batean klik eginez.\n[accent]Eskumako klik[] deseraikitzeko.
-tutorial.drill.mobile = Eskuz ustiatzea ez da eraginkorra.\n[accent]Zulagailuek []automatikoki ustiatu dezakete.\nSakatu zulagailuen fitxa behean eskuman.\nHautatu[accent] zulagailu mekanikoa[]. \nKokatu ezazu kobre zain batean sakatuz, gero sakatu azpiko [accent]egiaztapen-marka[] zure hautaketa berresteko.\nSakatu [accent]X botoia[] kokatzea ezeztatzeko.
-tutorial.blockinfo = Bloke bakoitzak estatistika desberdinak ditu. Eta zulagailu bakoitzak mea mota zehatz batzuk ustiatu ditzake soilik.\nBloke mota baten informazio eta estatistikak egiaztatzeko,[accent] hautatu blokea eraikiketa menuan eta sakatu "?" botoia .[]\n\n[accent]Atzitu zulagailu mekanikoaren estatistikak orain.[]
-tutorial.conveyor = Solidoak muinera garraiatzeko [accent]garraio-zintak[] erabiltzen dira.\nEgin garraio-zinten errenkada bat zulagailutik muinera.\n[accent]Mantendu sagua sakatuta garraio-zintak errenkadan kokatzeko.[]\nSakatu [accent]CTRL[] errenkada diagonalean eraikitzeko.\n\n[accent]{0}/{1} garraio-zinta kokatuta errenkadan\n[accent]0/1 baliabide entregatuta
-tutorial.conveyor.mobile = Baliabideak muinera garraiatzeko [accent]garraio-zintak[] erabiltzen dira.\nEgin garraio-zinten errenkada bat zulagailutik muinera.\n[accent]Mantendu atzamarra segundo batzuk errenkadan [] eta arrastatu norabideren batean.\n\n[accent]{0}/{1} garraiagailu kokatuta errenkadan\n[accent]0/1 baliabide entregatuta
-tutorial.turret = Behin baliabide bat zure muinean sartu dela, eraikuntzarako erabili daiteke.\nIzan kontuan ezin direla baliabide mota guztiak erabili eraikuntzarako.\nEraikuntzarako erabili ezin daitezkeen baliabideak, esaterako [accent]ikatza[] edo [accent]txatarra[], ezin dira muinean sartu.\nDefentsarako estrukturak eraiki behar dira [lightgray]etsaiari[] aurre egiteko.\nEraiki [accent]duo dorre bat[] zure basetik hurbil.
-tutorial.drillturret = Duo dorreak [accent]kobrezko munizioa[] behar dute tirokatzeko.\nKokatu zulagailu bat dorretik hurbil.\nEraman garraio-zinta bat dorrea arte kobrea hornitzeko.\n\n[accent]Entregatutako munizioa: 0/1
-tutorial.pause = Borrokan zehar, [accent]jolasa pausatu[] dezakezu.\nEraikuntzak planifikatu ditzakezu pausatuta dagoela.\n\n[accent]Sakatu zuriune-barra pausatzeko.
-tutorial.pause.mobile = Borrokan zehar, [accent]jolasa pausatu[] dezakezu.\nEraikuntzak planifikatu ditzakezu pausatuta dagoela.\n\n[accent]Sakatu goi ezkerreko botoia pausatzeko.
-tutorial.unpause = Orain sakatu berriro zuriune-barra berrekiteko.
-tutorial.unpause.mobile = Orain sakatu berriro botoia berrekiteko.
-tutorial.breaking = Maiz blokeak suntsitu beharko dituzu.\n[accent]Mantendu saguaren eskumako botoia[] hautaketa baten barruko bloke guztiak suntsitzeko.[]\n\n[accent]Suntsitu zure muinetik ezkerrera dauden txatarra bloke guztiak eremu-hautaketarekin.
-tutorial.breaking.mobile = Maiz blokeak suntsitu beharko dituzu.\n[accent]Hautatu deseraikitze modua[], gero sakatu bloke bat hau apurtzen hasteko.\nSuntsitu eremu bat atzamarra segundo batzuk mantenduz[] eta norabideren batean arrastatuz.\nSakatu egiaztatze-marka suntsitzea berresteko.\n\n[accent]Suntsitu zure muinetik ezkerrera dauden txatarra bloke guztiak eremu-hautaketarekin.
-tutorial.withdraw = Egoera batzuetan, blokeetatik zuzenean hartu behar dira baliabideak.\nHorretarako, [accent]sakatu baliabideak dituen bloke bat[], gero [accent]sakatu baliabidea[] inbentarioan.\nHainbat baliabide ateratzeko [accent]sakatu eta mantendu[].\n\n[accent]Atera kobre apur bat muinetik.[]
-tutorial.deposit = Baliabideak blokeren batean sartzeko, arrastatu zure ontzitik blokera.\n\n[accent]Sartu zure kobrea berriro muinean.[]
-tutorial.waves = [lightgray]Etsaia[] dator.\n\nBabestu muina 2 boladetan zehar. [accent]Egin klik[] tirokatzeko.\nEraiki dorre eta zulagailu gehiago. Ustiatu kobre gehiago.
-tutorial.waves.mobile = [lightgray]Etsaia[] dator.\n\nBabestu muina 2 boladatan. Zure ontziak automatikoki tirokatuko ditu etsaiak.\nEraiki dorre eta zulagailu gehiago. Ustiatu kobre gehiago.
-tutorial.launch = Bolada zehatz batera heltzean, [accent]muina egotzi[] dezakezu, zure defentsak atzean utziz [accent]eta muineko baliabide guztiak eskuratuz.[]\nBaliabide hauek teknologia berriak ikertzeko erabili daitezke.\n\n[accent]Sakatu egotzi botoia.
+team.blue.name = urdina
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Egiturazko material oinarrizkoena. Asko erabilia bloke mota guztietarako.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Hastapeneko oinarrizko materiala. Bloke elektronikoak eta likidoen garraiorako blokeetan asko erabilia.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
 item.metaglass.description = Beirazko konposatu izugarri sendoa. Asko erabilia likidoen garraio eta biltegiratzerako.
 item.graphite.description = Mineralizatutako ikatza, munizioa eta isolamendu elektrikorako erabilia.
 item.sand.description = Galdaketan asko erabiltzen den material arrunta, aleazioetan zein urgarri gisa.
 item.coal.description = Fosilizatutako gai begetala, panspermia baino askoz lehenago sortua. Asko erabilia erregai gisa eta baliabideak sortzeko.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
 item.titanium.description = Metal oso arin eta urria. Asko erabilia likidoen garraiorako, zulagailuetan, eta hegazkinetan.
 item.thorium.description = Metal trinko erradioaktiboa, euskarri estrukturalerako eta erregai nuklear gisa erabilia.
 item.scrap.description = Estruktura eta unitate zaharren hondakin. Metal desberdin askoren apurrak dauzka.
+item.scrap.details = Leftover remnants of old structures and units.
 item.silicon.description = Erdieroale izugarri erabilgarria. Panel fotovoltaikoetan, elektronika konplexuan eta dorreen gidatutako munizioan erabilia.
 item.plastanium.description = Material arin eta harikorra aireontzi aurreratuetan eta fragmentazio-munizioan erabilia.
 item.phase-fabric.description = Ia pisurik gabeko substantzia elektronika aurreratuan eta auto-konponketan erabilia.
 item.surge-alloy.description = Ezaugarri elektriko bereziak dituen aleazio aurreratua.
 item.spore-pod.description = Espora sintetikoen leka bat, erabilera industrialerako sintetizatua kontzentrazio atmosferikoetatik. Olioa, lehergailuak eta erregaia ekoizteko erabilia.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = Bonba eta lehergailuetan erabilitako konposatu ezegonkorra. Espora lekak eta beste substantzia lurrinkorrekin sintetizatua. Erregai gisa erabiltzea ez da gomendagarria.
 item.pyratite.description = Izugarri sukoia den substantzia, arma su-eragileetan erabilia.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 liquid.water.description = Likido erabilgarriena. Makinen hozgarri gisa eta hondakinen tratamenduan arrunt erabilia.
 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.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Titaniozko garraio-zinten abiadura berean darmatza elementuak, baina bildaje hobea du. Ez du onartzen albotik kargatzea ez bada beste garraio-zinta batetik.
+block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 
 block.message.description = Mezu bat gordetzen du. Aliatuen arteko komunikaziorako erabilia.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = 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.
 block.silicon-smelter.description = Hondarra eta ikatz hutsa txikitzen ditu silizioa sortzeko.
 block.kiln.description = Hondarra eta beruna galdatzen ditu metabeira izeneko konposatua sortzeko. Energia apur bat behar du jarduteko.
 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.surge-smelter.description = Titanioa, beruna, silizioa eta kobrea konbinatzen ditu tirain aleazioa ekoizteko.
 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.
@@ -1244,6 +2085,8 @@ block.item-source.description = Elementuen iturri amaigabea. Jolastokian besteri
 block.item-void.description = Elementu guztiak suntsitzen ditu. Jolastokian besterik ez.
 block.liquid-source.description = Likidoen emari amaigabea. Jolastokian besterik ez.
 block.liquid-void.description = Removes any liquids. Sandbox only.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
 block.copper-wall.description = Babeserako bloke merke bat.\nMuina eta dorreak lehen boladetan babesteko erabilgarria.
 block.copper-wall-large.description = Babeserako bloke merke bat.\nMuina eta dorreak lehen boladetan babesteko erabilgarria.\nHainbat lauza hartzen ditu.
 block.titanium-wall.description = Zertxobait gogorra den babeserako bloke bat.\nEtsaien aurreko babes ertaina eskaintzen du.
@@ -1256,6 +2099,10 @@ block.phase-wall.description = Fasez osatutako konposatu islatzaile batez estali
 block.phase-wall-large.description = Fasez osatutako konposatu islatzaile batez estalitako horma bat. Talkan jasotako bala gehienak desbideratzen ditu.\nHainbat lauza hartzen ditu.
 block.surge-wall.description = Defentsarako bloke nabarmen iraunkorra.\nKarga hartzen du balakadak jasotzean, hau edonora askatuz.
 block.surge-wall-large.description = Defentsarako bloke nabarmen iraunkorra.\nKarga hartzen du balakadak jasotzean, edonora askatuz.\nHainbat lauza hartzen ditu.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Ate txiki bat. Sakatuz ireki eta itxi daiteke.
 block.door-large.description = Ate handi bat. Sakatuz ireki eta itxi daiteke.\nHainbat lauza hartzen ditu.
 block.mender.description = Aldiro inguruko blokeak konpontzen ditu. Defentsak bere onean mantentzen ditu boladen artean.\nAukeran silizioa erabili dezake irismena eta eraginkortasuna hobetzeko.
@@ -1272,17 +2119,19 @@ block.phase-conveyor.description = Elementuen garraiorako bloke aurreratua. Ener
 block.sorter.description = Elementuak antolatzen ditu. Elementu bat hautuarekin bat badator, aurrera jarraitu dezake. Bestela, elementua ezker eta eskuinera ateratzen da.
 block.inverted-sorter.description = Antolatzaile arruntaren antzera prozesatzen ditu elementuak, baina hautatutako elementuak alboetara ateratzen ditu.
 block.router.description = Elementuak onartzen ditu, eta beste gehienez 3 norabideetara ateratzen ditu kopuru berdinetan. Jatorri batetik hainbat xedeetara materialak banatzeko egokia.\n\n[scarlet]Ez jarri ekoizpen sarreren ondoan, irteerek trabatuko baitute.[]
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = Bideratzaile aurreratu bat. Elementuak beste gehienez 7 norabideetara sakabanatzen ditu kopuru berdinetan.
 block.overflow-gate.description = Antolatzaile eta bideratzaile konbinatua. Soilik aurrealdea blokeatuta dagoenean ateratzen du ezker eta eskuinera.
 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 = Elementuen garraiorako bloke gorena. Hainbat elementu jaso eta beste mukulu-igorle bati jaurtitzen dizkio irismen handiarekin. Energia behar du jarduteko.
 block.mechanical-pump.description = Ponpa merke bat, emari motelekoa baina ez du energiarik kontsumitzen.
 block.rotary-pump.description = Ponpa aurreratu bat. Likido gehiago barreiatzen du, baina energia behar du.
-block.thermal-pump.description = Ponpa gorena.
+block.impulse-pump.description = Ponpa gorena.
 block.conduit.description = Likidoen garraiorako oinarrizko blokea. Likidoak daramatza. Ponpa eta bestelako hodiekin batera erabilia.
 block.pulse-conduit.description = Likidoen garraiorako bloke aurreratua. Hodi arruntek baino azkarrago garraiatzen ditu likidoak eta edukiera handiagoa du.
 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 = Likidoan alde batetik jaso eta gehienez beste 3 norabideetara ateratzen ditu kopuru berdinean. Likido apur bat ere biltegiratu dezake. Likidoak iturri batetik hainbat xedeetara eramateko erabilgarria.
+block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Likidoen kopuru handi bat biltegiratzen du. Erabili tarteko biltegiratzerako materialen eskaria etengabekoa ez denean, edo ezinbesteko blokeentzako hozgarriaren gordailu gisa.
 block.liquid-junction.description = Gurutzatzen diren bi hodi banatzeko zubi gisa aritzen da. Likido desberdinak daramatzaten bi hodi gurutzatzen direnean erabilgarria.
 block.bridge-conduit.description = Likidoen garraiorako bloke aurreratua. Likidoak edozelako lurzoru edo eraikinen gainetik garraiatu ditzake, gehienez 3 lauzatara.
@@ -1308,15 +2157,21 @@ block.laser-drill.description = Laser teknologiari esker azkarrago zulatu dezake
 block.blast-drill.description = Zulagailu gorena. Energia kopuru handia behar du.
 block.water-extractor.description = Lurrazpiko ura erauzten du. Azalean urik ez dagoen tokietan erabilia.
 block.cultivator.description = Atmosferako esporen kontzentrazio txikiak kultibatzen ditu industriarako erabilgarriak diren lekak sortzeko.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 block.oil-extractor.description = Energia, hondar eta ur ugari behar du olioa erauzteko.
 block.core-shard.description = Muin kapsularen lehen iterazioa. Behin suntsituta, eremuarekin kontaktua erabat galduko da, ez utzi hau gertatzen.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = Muinaren bigarren bertsioa. Hobeto blindatua. Baliabide gehiago gorde ditzake.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = Muin kapsularen hirugarren eta azken iterazioa. Bereziki ondo blindatua. Baliabide kopuru ikaragarriak biltegiratu ditzake.
+block.core-nucleus.details = The third and final iteration.
 block.vault.description = Mota bakoitzeko elementuen kopuru handiak biltegiratzen ditu. Bloke deskargagailu bat erabili daiteke elementuak kriptatik ateratzeko.
 block.container.description = Mota bakoitzeko elementuen kopuru txiki bat gordetzen du. Bloke deskargagailu bat erabili daiteke elementuak edukiontzitik ateratzeko.
 block.unloader.description = Edukiontzi, kripta edo muin batetik elementuak deskargatzen ditu garraiagailu batera edo zuzenean ondoan dagoen bloke batera. Deskargatu beharreko elementu mota sakatuz aldatu daiteke.
 block.launch-pad.description = Baliabide multzoak egotzi ditzake muina egotzi gabe.
-block.launch-pad-large.description = Egozketa plataformaren bertsio aurreratu bat. Elementu gehiago biltegiratzen ditu. Maizago egozten du.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Dorre txiki eta merke bat. Lurreko unitateen aurka erabilgarria.
 block.scatter.description = Aire defentsarako ezinbesteko dorrea. Berun edo txatarrezko koskorrekin ihinztatzen ditu unitate etsaiak.
 block.scorch.description = Inguruko lurreko etsaiak kiskaltzen ditu. Oso eraginkorra distantzia hurbilera.
@@ -1331,5 +2186,429 @@ 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 block.repair-point.description = Etengabe konpontzen du inguruko kaltetutako unitate hurbilena.
 block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 9e516c89c9..08cc625ba6 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1,26 +1,29 @@
-credits.text = Pelin tehnyt [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits.text = Pelin on luonut [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Tekijät
 contributors = Kääntäjät ja avustajat
 discord = Liity Mindustryn Discordiin!
 link.discord.description = Mindustryn virallinen Discord-keskusteluhuone
-link.reddit.description = Mindustryn alireddit
+link.reddit.description = Mindustryn Reddit-sivu
 link.github.description = Pelin lähdekoodi
 link.changelog.description = Lista päivityksien muutoksista
 link.dev-builds.description = Epävakaat kehitysversiot
 link.trello.description = Virallinen Trello-taulu suunnitelluille ominaisuuksille.
 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.f-droid.description = F-Droid katalogilistaus
 link.wiki.description = Virallinen Mindustry wiki
 link.suggestions.description = Ehdota uusia ominaisuuksia
+link.bug.description = Löysitkö bugin? Ilmoita se täällä
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 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.
+screenshot.invalid = Kartta liian laaja, levytila voi olla liian vähissä kuvankaappausta varten.
 gameover = Peli ohi
+gameover.disconnect = Katkaise yhteys
 gameover.pvp = [accent] {0}[] joukkue voittaa!
+gameover.waiting = [accent]Odotetaan seuraavaa karttaa...
 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 = Tämä osa peliä ei ole vielä valmis
 
 load.sound = Ääniä
@@ -37,49 +40,73 @@ be.updating = Päivitetään...
 be.ignore = Sivuuta
 be.noupdates = Ei päivityksiä saatavilla.
 be.check = Tarkista päivityksiä
+mods.browser = Lisäosaselain
+mods.browser.selected = Valittu lisäosa
+mods.browser.add = Asenna
+mods.browser.reinstall = Uudelleenasenna
+mods.browser.view-releases = Näytä julkaistut versiot
+mods.browser.noreleases = [scarlet]Julkaistuja versioita ei löytynyt\n[accent]Tästä lisäosasta ei löytynyt julkaistuja versioita. Tarkista, onko lisäosan repositoriossa julkaistuja versioita.
+mods.browser.latest = <Viimeisin>
+mods.browser.releases = Julkaistut versiot
+mods.github.open = Repositorio
+mods.github.open-release = Julkaisusivu
+mods.browser.sortdate = Järjestä laskevaan aikajärjestykseen
+mods.browser.sortstars = Järjestä tähtien määrän perusteella
 
 schematic = Kaavio
 schematic.add = Tallenna kaavio...
 schematics = Kaaviot
+schematic.search = Search schematics...
 schematic.replace = Kaavio tällä nimellä on jo olemassa. Haluatko korvata sen?
 schematic.exists = Kaavio tällä nimellä on jo olemassa.
 schematic.import = Tuo kaavio...
 schematic.exportfile = Vie tiedosto
 schematic.importfile = Tuo tiedosto
-schematic.browseworkshop = Selaa Workshoppia
+schematic.browseworkshop = Selaa Steam Workshoppia
 schematic.copy = Kopioi leikepöydälle
 schematic.copy.import = Tuo leikepöydältä
 schematic.shareworkshop = Jaa Workshoppiin
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Käännä Kaavio
 schematic.saved = Kaavio tallennettu.
 schematic.delete.confirm = Tämä kaavio poistetaan.
-schematic.rename = Nimeä kaavio uudelleen
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} palikkaa
 schematic.disabled = [scarlet]Kaaviot poistettu käytöstä[]\nEt pysty käyttämään kaavioita tällä [accent]kartalla[] tai [accent]palvelimella.
+schematic.tags = Tunnisteet:
+schematic.edittags = Muokkaa tunnisteita
+schematic.addtag = Lisää tunniste
+schematic.texttag = Tekstitunniste
+schematic.icontag = Kuvatunniste
+schematic.renametag = Nimeä tunniste uudelleen
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Poista tunniste pysyvästi?
+schematic.tagexists = Samanlainen tunniste on jo olemassa.
+stats = Tilastot
+stats.wave = Aaltoja voitettu
+stats.unitsCreated = Rakennetut joukot
+stats.enemiesDestroyed = Vastustajia tuhottu
+stats.built = Rakennetut rakennukset
+stats.destroyed = Tuhotut rakennukset
+stats.deconstructed = Puretut rakennukset
+stats.playtime = Pelattu aika
 
-stat.wave = Tasoja voitettu:[accent] {0}
-stat.enemiesDestroyed = Vihollisia tuhottu:[accent] {0}
-stat.built = Rakennuksia rakennettu:[accent] {0}
-stat.destroyed = Rakennuksia tuhottu:[accent] {0}
-stat.deconstructed = Rakennuksia purettu:[accent] {0}
-stat.delivered = Resursseja laukaistu:
-stat.playtime = Pelattu aika:[accent] {0}
-stat.rank = Lopullinen arvosana: [accent]{0}
-
-globalitems = [accent]Global Items
-map.delete = Oletko varma että haluat poistaa kartan "[accent]{0}[]"?
+globalitems = [accent]Yhteiset tavarat
+map.delete = Oletko varma että haluat poistaa kartan: "[accent]{0}[]"?
 level.highscore = Ennätys: [accent]{0}
 level.select = Tason valinta
 level.mode = Pelimuoto:
 coreattack = < Ytimeen hyökätään! >
-nearpoint = [[ [scarlet]POISTU PUDOTUSPISTEELTÄ VÄLITTÖMÄSTI[]\nvälitön tuhoutuminen
+nearpoint = [[ [scarlet]POISTU VIHOLLISEN PUDOTUSPISTEELTÄ VÄLITTÖMÄSTI[]\nvälitön tuhoutuminen
 database = Ytimen tietokanta
+database.button = Tietokanta
 savegame = Tallenna peli
 loadgame = Lataa peli
 joingame = Liity peliin
 customgame = Mukautettu peli
 newgame = Uusi peli
 none = <ei mitään>
+none.found = [lightgray]<ei löydetty>
+none.inmap = [lightgray]<ei kartassa>
 minimap = Pienoiskartta
 position = Sijainti
 close = Sulje
@@ -92,63 +119,90 @@ continue = Jatka
 maps.none = [lightgray]Karttoja ei löytynyt!
 invalid = Virheellinen
 pickcolor = Valitse väri
-preparingconfig = Preparing Config
-preparingcontent = Preparing Content
-uploadingcontent = Uploading Content
-uploadingpreviewfile = Uploading Preview File
-committingchanges = Comitting Changes
+preparingconfig = Valmistellaan asetuksia
+preparingcontent = Valmistellaan sisältöä
+uploadingcontent = Julkaistaan sisältöä
+uploadingpreviewfile = Julkaistaan esikatseltavaa tiedostoa
+committingchanges = Varmistetaan muutokset
 done = Valmis
 feature.unsupported = Laitteesi ei tue tätä toimintoa.
-
-mods.alphainfo = Pidä mielessä että modit ovat alpha-tilassa, ja[scarlet] ne voivat olla virheellisiä[].\nRaportoi kaikki virheet Mindustry GitHub-sivuille tai Discordiin.
+mods.initfailed = [red]⚠[] Edellisen Mindustryn instanssin initialisointi epäonnistui. Tämä aiheutui todennäköisesti virheistä lisäosissa.\n\nJatkuvien kaatumisten estämiseksi [red]kaikki lisäosat on poistettu käytöstä.[]
 mods = Modit
 mods.none = [lightgray]Modeja ei löytynyt!
 mods.guide = Modaamisopas
 mods.report = Raportoi ohjelmistovirhe
 mods.openfolder = Avaa modikansio
-mods.reload = Reload
-mods.reloadexit = The game will now exit, to reload mods.
+mods.viewcontent = Näytä sisältö
+mods.reload = Lataa uudelleen
+mods.reloadexit = Peli tulee sulkeutumaan lisäosien uudelleenlataamiseksi.
+mod.installed = [[Asennettu]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Käytössä
 mod.disabled = [scarlet]Pois käytöstä
+mod.multiplayer.compatible = [gray]Moninpelaajayhteensopiva
 mod.disable = Poista käytössä
+mod.version = Version:
 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.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Sisältövirheet
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Virheitä on tapahtunut pelin ladatessa.
 mod.noerrorplay = [scarlet]Sinulla on virheellisiä modeja.[] Joko poista ne käytöstä tai korjaa virheet.
-mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
+mod.nowdisabled = [scarlet]Lisäosa '{0}' tarvitsee muita lisäosia toimiakseen:[accent] {1}\n[lightgray]Nämä lisäosat täytyy asentaa ensin.\nTämä lisäosa poistetaan automaattisesti käytöstä.
 mod.enable = Käytä
 mod.requiresrestart = Peli suljetaan jotta muutokset voisivat toteutua.
 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.jarwarn = [scarlet]JAR-lisäosat ovat luonteeltaan turvattomia.[]\nVarmista, että olet tuomassa tätä lisäosaa luotettavasta lähteestä!
 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}
-mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Before publishing this mod in the workshop, you must add an image preview.\nPlace an image named[accent] preview.png[] into the mod's folder and try again.
-mod.folder.missing = Only mods in folder form can be published on the 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.missing = Tämä tallennus on tallennettu sellaisen lisäosan kanssa, jonka olet äskettäin päivittänyt tai jota ei enää ole asennettuna. Tallennus voi vioittua. Oletko varma, että haluat ladata sen?\n[lightgray]Lisäosat:\n{0}
+mod.preview.missing = Ennen kuin julkaiset tämän lisäosan Workshopissa, sinun täytyy lisätä kuvake.\nLisää kuva, joka on nimetty tiedostonimellä [accent] preview.png[] lisäosan kansioon ja yritä uudestaan.
+mod.folder.missing = Vain kansion muodossa olevia lisäosia voi julkaista Workshopissa.\nMuuttaaksesi pakatun lisäosan kansioksi, pura se kansioon ja poista vanha arkisto.\nKäynnistä sen jälkeen peli uudelleen tai lataa uudelleen lisäosasi.
 mod.scripts.disable = Laitteesi ei tue modeja skripteillä. Sinun on sammutettava nämä modit pelataksesi peliä.
 
 about.button = Tietoa
 name = Nimi:
 noname = Valitse ensin[accent] pelaajanimi[].
-planetmap = Planet Map
-launchcore = Launch Core
+search = Search:
+planetmap = Avaruuskartta
+launchcore = Laukaise tukikohta
 filename = Tiedostonimi:
 unlocked = Uutta sisältöä avattu!
+available = Uusia tutkimuksia saatavilla!
+unlock.incampaign = < Avaa polussa saadaksesi yksityiskohtia >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Suoritettu
-techtree = Tekniikkapuu
+techtree = Edistyspuu
+techtree.select = Edistyspuun valinta
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Lataa
+research.discard = Hylkää
 research.list = [lightgray]Tutki:
 research = Tutki
 researched = [lightgray]{0} tutkittu.
-research.progress = {0}% complete
+research.progress = {0}% valmis
 players = {0} pelaajaa paikalla
 players.single = {0} pelaaja paikalla
 players.search = etsiä
@@ -160,8 +214,8 @@ server.kicked.serverClose = Palvelin suljettu.
 server.kicked.vote = Sinut on äänestetty pois. Hyvästi.
 server.kicked.clientOutdated = Pelisi on vanhentunut! Päivitä se!
 server.kicked.serverOutdated = Vanhentunut palvelin! Pyydä isäntää päivittämään!
-server.kicked.banned = Sinulla on portikielto tälle palvelimelle.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.banned = Sinulla on porttikielto tälle palvelimelle.
+server.kicked.typeMismatch = Tämä palvelin ei ole yhteensopiva koontiversiosi kanssa.
 server.kicked.playerLimit = Tämä palvelin on täynnä. Odota vapaata tilaa.
 server.kicked.recentKick = Sinut on potkittu äskettäin.\nOdota ennen kuin yhdistät uudestaan.
 server.kicked.nameInUse = Joku tuon niminen\non jo tällä palvelimella.
@@ -171,31 +225,47 @@ server.kicked.customClient = Tämä palvelin ei tue muokattuja versioita. Lataa
 server.kicked.gameover = Peli ohi!
 server.kicked.serverRestarting = Tämä palvelin on uudelleenkäynnistymässä.
 server.versions = Versiosi:[accent] {0}[]\nPalvelimen versio:[accent] {1}[]
-host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. Note that public networks sometimes do not allow server discovery.
-join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
-hostserver = Pidä yllä monipelaaja peliä
-invitefriends = Pyydä Ystäviä
-hostserver.mobile = Isäntä\nPeli
+host.info = [accent]Isännöi[] -nappi luo palvelimen portille [scarlet]6567[]. \nKenen tahansa samassa [lightgray]wifi-yhteydessä tai paikallisessa verkossa[] pitäisi voida nähdä palvelimesi heidän palvelinlistassaan.\n\nJos haluat muiden voivan yhdistää kaikkialta IP:n perusteella, [accent]port forwardingia[] vaaditaan.\n\n[lightgray]Huomio: Jos jollakulla on ongelmia LAN-palvelimeesi yhdistämisessä, varmista palomuurisi asetuksista, että olet sallinut Mindustrylle oikeuden paikalliseen verkkoosi. Huomaa, että julkiset verkot eivät joskus salli havaita itseään.
+join.info = Tässä voit syöttää [accent]palvelimen IP-osoitteen[] johon yhdistää, tai etsiä [accent]paikallisesta verkosta[] palvelimia, joille littyä.\nSekä LAN- että WAN-moninpeluuta tuetaan.\n\n[lightgray]Huomio: Automaattista globaalia palvelinlistaa ei ole; jos haluat yhdistää jonnekin IP-osoitteella, sinun on selvitettävä palvelimen IP-osoite.
+hostserver = Isännöi moninpeli
+invitefriends = Kutsu ystäviä
+hostserver.mobile = Isännöi\npeli
 host = Isäntä
 hosting = [accent]Avataan palvelinta...
 hosts.refresh = Päivitä
-hosts.discovering = Etsitään LAN pelejä
-hosts.discovering.any = Etsitään Pelejä
+hosts.discovering = Etsitään paikallisia pelejä
+hosts.discovering.any = Etsitään pelejä
 server.refreshing = Päivitetään palvelimen tietoja
 hosts.none = [lightgray]Paikallisia pelejä ei löytynyt!
 host.invalid = [scarlet]Isäntään ei voitu yhdistää.
 
 servers.local = Paikalliset palvelimet
+servers.local.steam = Avaa pelejä ja paikallisia palvelimia
 servers.remote = Etäpalvelimet
 servers.global = Yhteisön palvelimet
+servers.disclaimer = Yhteisön palvelimet [accent]eivät ole[] kehittäjän omistuksessa tai hallinnassa.\n\nPalvelimet voivat sisältää käyttäjien luomaa sisältöä, joka ei sovellu kaikille ikäluokille.
+servers.showhidden = Näytä piilotetut palvelimet
+server.shown = Näytetty
+server.hidden = Piilotettu
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Seuraa pelaajaa
 trace.playername = Pelaajanimi: [accent]{0}
 trace.ip = IP-osoite: [accent]{0}
-trace.id = Uniikki tunniste: [accent]{0}
-trace.mobile = Mobile Client: [accent]{0}
-trace.modclient = Custom Client: [accent]{0}
-invalidid = Invalid client ID! Submit a bug report.
+trace.id = Pelaajakohtainen tunniste: [accent]{0}
+trace.language = Language: [accent]{0}
+trace.mobile = Mobiililaite: [accent]{0}
+trace.modclient = Muokattu asiakasohjelma: [accent]{0}
+trace.times.joined = Kuinka monta kertaa olet liittynyt: [accent]{0}
+trace.times.kicked = Kuinka monta kertaa sinut on potkittu ulos: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
+invalidid = Kelvoton asiakasohjelman ID! Lähetä bugiraportti.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Porttikiellot
 server.bans.none = Porttikieltoja saaneita pelaajia ei löytynyt!
 server.admins = Ylläpitäjät
@@ -206,13 +276,14 @@ server.edit = Muokkaa palvelinta
 server.outdated = [crimson]Vanhentunut palvelin![]
 server.outdated.client = [crimson]Vanhentunut asiakasohjelma![]
 server.version = [gray]v{0} {1}
-server.custombuild = [accent]Custom Build
+server.custombuild = [accent]Muokattu koontiversio
 confirmban = Oletko varma että haluat antaa porttikiellon tälle pelaajalle?
 confirmkick = Oletko varma että haluat potkia tämän pelaajan?
-confirmvotekick = Oletko varma että haluat äänestää tämän pelaajan potkituksi?
 confirmunban = Oletko varma että haluat päästää tämän pelaajan takaisin?
 confirmadmin = Oletko varma että haluat antaa pelaajalle hallinto-oikeuksia?
 confirmunadmin = Oletko varma että haluat poistaa hallinto-oikeudet pelaajalta?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Liity peliin
 joingame.ip = Osoite:
 disconnect = Yhteys katkaistu.
@@ -220,22 +291,25 @@ disconnect.error = Yhteysvirhe.
 disconnect.closed = Yhteys poistettu.
 disconnect.timeout = Yhteys aikakatkaistiin.
 disconnect.data = Maailman tietojen lataaminen epäonnistui!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Peliin ei voitu liittyä ([accent]{0}[]).
 connecting = [accent]Yhdistetään...
+reconnecting = [accent]Yhdistetään uudelleen...
 connecting.data = [accent]Ladataan maailman tietoja...
 server.port = Portti:
-server.addressinuse = Osoite on jo käytössä!
-server.invalidport = Invalid port number!
-server.error = [crimson]Error hosting server: [accent]{0}
+server.invalidport = Tällä portilla ei löytynyt peliä!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [crimson]Virhe palvelimen hostaamisessa: [accent]{0}
 save.new = Uusi tallennus
 save.overwrite = Haluatko varmasti korvata \ntämän tallennuspaikan??
-overwrite = Korvata
+save.nocampaign = Individual save files from the campaign cannot be imported.
+overwrite = Korvaa
 save.none = Tallennuksia ei löytynyt!
 savefail = Pelin tallentaminen epäonnistui!
 save.delete.confirm = Oletko varma että haluat poistaa tämän tallennuksen?
 save.delete = Poista
 save.export = Vie tallennus
-save.import.invalid = [accent]This save is invalid!
+save.import.invalid = [accent]Tämä tallennus on kelvoton!
 save.import.fail = [crimson]Tallennuksen tuominen epäonnistui: [accent]{0}
 save.export.fail = [crimson]Tallennuksen vieminen epäonnistui: [accent]{0}
 save.import = Tuo tallennus
@@ -249,6 +323,7 @@ save.corrupted = [accent]Tallennustiedosto korruptoitunut tai viallinen!\nJos ol
 empty = <tyhjä>
 on = Päällä
 off = Pois
+save.search = Etsi Tallennettuja Pelejä...
 save.autosave = Automaattitallennus: {0}
 save.map = Kartta: {0}
 save.wave = Taso {0}
@@ -258,41 +333,70 @@ save.playtime = Peliaika: {0}
 warning = Varoitus.
 confirm = Vahvista
 delete = Poista
-view.workshop = View In Workshop
-workshop.listing = Edit Workshop Listing
-ok = OK
+view.workshop = Näytä Workshopissa
+workshop.listing = Muokkaa Workshop-listausta
+ok = Ok
 open = Avaa
 customize = Muokkaa sääntöjä
 cancel = Peruuta
+command = Komento
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Avaa linkki
 copylink = Kopioi linkki
 back = Takaisin
-data.export = Vie data
-data.import = Tuo data
+max = Max
+objective = Alueen tehtävä
+crash.export = Vie kaatumislokit
+crash.none = Kaatumislokeja ei löytynyt.
+crash.exported = Kaatumislokit on viety.
+data.export = Vie dataa
+data.import = Tuo dataa
 data.openfolder = Avaa datakansio
-data.exported = Data viety.
-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.
+data.exported = Dataa on viety.
+data.invalid = Tämä ei ole kelvollista pelidataa.
+data.import.confirm = Ulkopuolisen datan tuominen ylikirjoittaa[scarlet] kaiken[] nykyisen pelidatasi.\n[accent]Tätä ei voi peruuttaa![]\n\nKun data on tuotu, peli sulkeutuu välittömästi.
 quit.confirm = Oletko varma että haluat poistua?
-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]Ladataan...
-reloading = [accent]Ladataan Modeja...
+downloading = [accent]Ladataan alas...
 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
-resumebuilding = [scarlet][[{0}][] to resume building
+respawn = [accent][[{0}][] uudelleensyntymiseen ytimessä
+cancelbuilding = [accent][[{0}][] tyhjentääksesi suunnitelman
+selectschematic = [accent][[{0}][] jotta voisit kopioida ja liittää
+pausebuilding = [accent][[{0}][] pysäyttääksesi rakentamisen
+resumebuilding = [scarlet][[{0}][] jatkaaksesi rakentamista
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI on piilotettu.\nPaina [accent][[{0}][] näyttääksesi UI:n.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Taso {0}
-wave.cap = [accent]Wave {0}/{1}
+wave.cap = [accent]Taso {0}/{1}
 wave.waiting = [lightgray]Seuraava taso {0}
-wave.waveInProgress = [lightgray]Wave in progress
+wave.waveInProgress = [lightgray]Taso käynnissä
 waiting = [lightgray]Odotetaan...
 waiting.players = Odotetaan pelaajia...
 wave.enemies = [lightgray]{0} vihollista jäljellä
+wave.enemycores = [accent]{0}[lightgray] Vihollisydintä
+wave.enemycore = [accent]{0}[lightgray] Vihollisydin
 wave.enemy = [lightgray]{0} vihollinen jäljellä
-wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
-wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
+wave.guardianwarn = Suojelija tulossa [accent]{0}[] tason päästä.
+wave.guardianwarn.one = Suojelija tulee rökittämään sinut [accent]{0}[] tasolla.
 loadimage = Lataa kuva
 saveimage = Tallenna kuva
 unknown = Tuntematon
@@ -300,22 +404,27 @@ custom = Mukautettu
 builtin = Sisäänrakennettu
 map.delete.confirm = Oletko varma että haluat poistaa tämän kartan? Poistoa ei voi peruuttaa!
 map.random = [accent]Satunnainen kartta
-map.nospawn = Tässä kartassa ei ole ytimiä joihin syntyä! Lisää[accent] oranssi[] ydin karttaan editorissa.
-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.nospawn = Tässä kartassa ei ole ytimiä joihin syntyä! Lisää {0} ydin karttaan editorissa.
+map.nospawn.pvp = Tässä kartassa ei ole vihollisytimiä, joihin pelaaja voisi syntyä! Lisää karttaan [scarlet]ei-oransseja[] ytimiä editorissa.
+map.nospawn.attack = Tässä kartassa ei ole vihollisytimiä, joihin pelaaja voisi hyökätä! Lisää karttaan {0} ytimiä editorissa.
 map.invalid = Virhe ladatessa karttaa: korruptoitunut tai väärä karttatiedosto.
-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.update = Päivitä tavara
+workshop.error = Virhe Workshopin tietoja noudettaessa: {0}
+map.publish.confirm = Oletko varma että haluat julkaista tämän kartan?\n\n[lightgray]Hyväksy Workshopin EULA ehdot, muuten karttasi ei tule näkyviin!
+workshop.menu = Mitä haluat tehdä tälle asialle?
 workshop.info = Kohteen Tiedot
-changelog = Muutosloki (valinnainen):
-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!
+changelog = Loki (valinnainen):
+updatedesc = Korvaa otsikko ja kuvaus
+eula = Steamin EULA
+missing = Tämä tavara on poistettu tai siirretty.\n[lightgray]Workshop-listauksen linkki on nyt poistettu automaattisesti.
+publishing = [accent]Julkaistaan...
+publish.confirm = Oletko varma, että haluat julkaista tämän?\n\n[lightgray]Varmista, että hyväksyt Workshopin EULAN ensin, tai tavarasi eivät mene perille!
 publish.error = Virhe julkaisussa: {0}
-steam.error = Failed to initialize Steam services.\nError: {0}
+steam.error = Steam-palveluiden initialisointi epäonnistui.\nVirhe: {0}
+editor.planet = Planeetta:
+editor.sector = Sektori:
+editor.seed = Siemen:
+editor.cliffs = Muuta seinät kallioiksi
 
 editor.brush = Sivellin
 editor.openin = Avaa editorissa
@@ -328,140 +437,212 @@ editor.nodescription = Kartan kuvaksessa täytyy olla vähintään neljä kirjai
 editor.waves = Tasot:
 editor.rules = Säännöt:
 editor.generation = Generaatio:
+editor.objectives = Tehtävät
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Muokka pelin sisällä
+editor.playtest = Testaa pelin sisällä
 editor.publish.workshop = Julkaise Workshoppiin
 editor.newmap = Uusi kartta
-editor.center = Center
+editor.center = Keskitä
+editor.search = Hae karttoja...
+editor.filters = Rajaa karttoja
+editor.filters.mode = Pelitilat:
+editor.filters.type = Kartan tyyppi:
+editor.filters.search = Search in:
+editor.filters.author = Tekijä
+editor.filters.description = Kuvaus
+editor.shiftx = Siirrä X-akselin suunnassa
+editor.shifty = Siirrä Y-akselin suunnassa
 workshop = Työpaja
 waves.title = Tasot
 waves.remove = Poista
-waves.never = <ei koskaan>
 waves.every = jokainen
 waves.waves = tasot
+waves.health = elämäpisteet: {0}%
 waves.perspawn = per syntymispiste
-waves.shields = shields/wave
+waves.shields = kilpiä/taso
 waves.to = jotta
-waves.guardian = Guardian
+waves.spawn = syntypiste:
+waves.spawn.all = <kaikki>
+waves.spawn.select = Syntypisteen valinta
+waves.spawn.none = [scarlet]kartasta ei löytynyt syntypisteitä
+waves.max = maksimijoukot
+waves.guardian = Vartija
 waves.preview = Esikatselu
 waves.edit = Muokkaa...
+waves.random = Random
 waves.copy = Kopioi leikepöydälle
 waves.load = Lataa leikepöydältä
-waves.invalid = Invalid waves in clipboard.
+waves.invalid = Kelvottomia tasoja leikepöydällä.
 waves.copied = Tasot kopioitu.
-waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.none = Ei määriteltyjä vihollisia.\nHuomaa, että tyhjät tasopohjat korvataan automaattisesti oletuspohjalla.
+waves.sort = Järjestä
+waves.sort.reverse = Järjestä käänteisesti
+waves.sort.begin = Alkutaso
+waves.sort.health = Elämäpisteet
+waves.sort.type = Tyyppi
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Piilota kaikki
+waves.units.show = Näytä kaikki
 
-wavemode.counts = counts
-wavemode.totals = totals
-wavemode.health = health
+wavemode.counts = lukumäärä
+wavemode.totals = yhteismäärä
+wavemode.health = elämäpisteet
+all = All
 
-editor.default = [lightgray]<Default>
+editor.default = [lightgray]<Oletus>
 details = Yksityiskohdat...
 edit = Muokkaa...
+variables = Muuttujat
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Nimi:
 editor.spawn = Luo yksikkö
 editor.removeunit = Poista yksikkö
 editor.teams = Joukkueet
 editor.errorload = Virhe ladattaessa tiedostoa:\n[accent]{0}
 editor.errorsave = Virhe tallennettaessa tiedostoa:\n[accent]{0}
-editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
-editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errorimage = Tuo on kuva, ei kartta. Älä yritä muuttaa tiedostopäätteitä olettaen sen toimivan.\n\nJos haluat tuoda vanhentuneen kartan, käytä  'Tuo vanhentunut kartta' -painiketta editorissa.
+editor.errorlegacy = Tämä kartta on liian vanha, ja se käyttää vanhentunutta karttaformaattia, jota ei enää tueta.
 editor.errornot = Tämä ei ole karttatiedosto.
-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.errorheader = Tämä karttatiedosto on joko kelvoton tai turmeltunut.
+editor.errorname = Kartalla ei ole määritettyä nimeä. Yritätkö ladata tallennusta?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Päivitä
 editor.randomize = Satunnaista
+editor.moveup = Liiku yläkansioon
+editor.movedown = Siirry alakansioon
+editor.copy = Kopioi
 editor.apply = Käytä
 editor.generate = Generoi
+editor.sectorgenerate = Sektorigeneraatio
 editor.resize = Säädä kokoa
 editor.loadmap = Lataa kartta
 editor.savemap = Tallenna kartta
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Tallennettu!
 editor.save.noname = Kartallasi ei ole nimeä! Aseta sellainen 'Kartan tiedot' valikossa.
-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:[] sisäänrakennettu kartta nimellä '{0}' on jo olemassa!
+editor.save.overwrite = Karttasi on ylikirjoittamassa sisäänrakennettua karttaa! Valitse toinen nimi 'Kartan tiedot' -valikossa.
+editor.import.exists = [scarlet]Tuominen epäonnistui:[] sisäänrakennettu kartta nimellä '{0}' on jo olemassa!
 editor.import = Tuo...
 editor.importmap = Tuo kartta
-editor.importmap.description = Import an already existing map
+editor.importmap.description = Tuo jo olemassa oleva kartta
 editor.importfile = Tuo tiedosto
-editor.importfile.description = Import an external map file
-editor.importimage = Import Legacy Image
-editor.importimage.description = Import an external map image file
+editor.importfile.description = Tuo ulkoinen karttatiedosto
+editor.importimage = Tuo vanhentunut kartta
+editor.importimage.description = Tuo ulkoinen kartta kuvatiedostona
 editor.export = Vie...
 editor.exportfile = Vie tiedosto
-editor.exportfile.description = Export a map file
-editor.exportimage = Export Terrain Image
-editor.exportimage.description = Export a map image file
+editor.exportfile.description = Vie karttatiedosto
+editor.exportimage = Vie maastokuva
+editor.exportimage.description = Vie kartta kuvatiedostona
 editor.loadimage = Tuoda Maasto
 editor.saveimage = Vie Maasto
 editor.unsaved = [scarlet]Sinulla on tallentamattomia muutoksia![]\nOletko varma että haluat poistua?
-editor.resizemap = Resize Map
+editor.resizemap = Säädä kartan kokoa
 editor.mapname = Kartan nimi:
-editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
-editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
+editor.overwrite = [accent]Varoitus!\nTämä korvaa olemassa olevan kartan.
+editor.overwrite.confirm = [scarlet]Varoitus![] Tämän niminen kartta on jo olemassa. Oletko varma, että haluat korvata sen?
 editor.exists = Kartta tällä nimellä on jo olemassa.
 editor.selectmap = Valitse kartta ladattavaksi:
 
 toolmode.replace = Korvaa
-toolmode.replace.description = Draws only on solid blocks.
+toolmode.replace.description = Piirtää vain kiinteille objekteille.
 toolmode.replaceall = Korvaa kaikki
-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.
+toolmode.replaceall.description = Korvaa kaikki palikat kartassa.
+toolmode.orthogonal = Ortogonaalinen tila
+toolmode.orthogonal.description = Piirtää vain koordinaattiakselien suuntaisia viivoja.
+toolmode.square = Neliö
+toolmode.square.description = Neliösivelllin.
+toolmode.eraseores = Poista malmit
+toolmode.eraseores.description = Poista vain malmit.
+toolmode.fillteams = Täytä tiimit
+toolmode.fillteams.description = Täytä joukkueita palikkojen sijaan.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
+toolmode.drawteams = Piirrä joukkueita
+toolmode.drawteams.description = Piirrä joukkueita palikkojen sijaan.
+toolmode.underliquid = Pinnanalainen tila
+toolmode.underliquid.description = Piirrä lattioita nestelaattojen alle.
 
-filters.empty = [lightgray]No filters! Add one with the button below.
+filters.empty = [lightgray]Ei filttereitä! Lisää yksi alla olevasta napista.
 filter.distort = Vääristää
 filter.noise = Melu
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
+filter.enemyspawn = Vihollissyntypisteen valinta
+filter.spawnpath = Reitti syntypisteelle
 filter.corespawn = Valitse Ydin
 filter.median = Mediaani
-filter.oremedian = Malmin mediaani
+filter.oremedian = Malmin keskiarvo
 filter.blend = Sekoitus
-filter.defaultores = Oletuksena malmit
+filter.defaultores = Oletus malmit
 filter.ore = Malmi
 filter.rivernoise = Jokien melu
 filter.mirror = Peili
 filter.clear = Selkeä
-filter.option.ignore = Ohittaa
-filter.scatter = Scatter
+filter.option.ignore = Ohitta
+filter.scatter = Hajauta
 filter.terrain = Maasto
+filter.logic = Logic
 filter.option.scale = Mittakaava
 filter.option.chance = Mahdollisuus
 filter.option.mag = Suuruus
 filter.option.threshold = Raja
-filter.option.circle-scale = Circle Scale
+filter.option.circle-scale = Ympyrän kaava
 filter.option.octaves = Oktaavi
-filter.option.falloff = Falloff
+filter.option.falloff = Karsiutuminen
 filter.option.angle = Kulma
+filter.option.tilt = Kallistus
+filter.option.rotate = Käännä
 filter.option.amount = Määrä
 filter.option.block = Estää
 filter.option.floor = Lattia
-filter.option.flooronto = Target Floor
-filter.option.target = Target
+filter.option.flooronto = Kohdelattia
+filter.option.target = Kohde
+filter.option.replacement = Korvaus
 filter.option.wall = Seinä
 filter.option.ore = Malmi
-filter.option.floor2 = Secondary Floor
-filter.option.threshold2 = Secondary Threshold
-filter.option.radius = Radius
-filter.option.percentile = Percentile
+filter.option.floor2 = Toinen lattia
+filter.option.threshold2 = Toissijainen raja-arvo
+filter.option.radius = Säde
+filter.option.percentile = Prosentti
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Leveys:
 height = Korkeus:
 menu = Valikko
 play = Pelaa
-campaign = Polku
+campaign = Kampanja
 load = Lataa
 save = Tallenna
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Muisti: {0}mb
+memory2 = Muisti:\n {0}mb +\n {1}mb
 language.restart = Käynnista peli uudelleen, jotta saat kieliasetukset toimimaan.
 settings = Asetukset
 tutorial = Perehdytys
@@ -472,85 +653,259 @@ mapeditor = Kartan Editori
 abandon = Hylkää
 abandon.text = Tämä alue ja kaikki sen resurssit menetetään viholliselle.
 locked = Lukittu
-complete = [lightgray]Reach:
+complete = [lightgray]Saavuta:
 requirement.wave = Pääse Tasolle {0} kartassa {1}
 requirement.core = Tuhoa vihollisen ydin kartassa {0}
-requirement.research = Research {0}
-requirement.capture = Capture {0}
-bestwave = [lightgray]Paras taso: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
+requirement.research = Tutki {0}
+requirement.produce = Tuota {0}
+requirement.capture = Valtaa {0}
+requirement.onplanet = Hallitse sektoria planeetalla {0}
+requirement.onsector = Laskeudu sektorille: {0}
+launch.text = Laukaise
+map.multiplayer = Vain ylläpitäjä voi katsella sektoreita.
 uncover = Paljasta
-configure = Configure Loadout
-loadout = Loadout
-resources = Resources 
+configure = Muokkaa lastia
+objective.research.name = Tutkimus
+objective.produce.name = Hanki
+objective.item.name = Hanki Esine
+objective.coreitem.name = Ydinesine
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Teksti
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Tutki:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Hanki:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Tuhoa:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Tuhoa: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Hanki: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Siirrä ytimeen:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Rakenna: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Rakenna yksikkö: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Tuhoa: [][lightgray]{0}[]x yksikköä
+objective.enemiesapproaching = [accent]Vihollinen lähestyy ajassa [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Tuhoa vihollisydin
+objective.command = [accent]Komenna yksikköjä
+objective.nuclearlaunch = [accent]âš  Ydinaseen laukaisu havaittu: [lightgray]{0}
+announce.nuclearstrike = [red]âš  YDINASEISKU TAPAHTUMASSA âš 
+loadout = Lasti
+resources = Resurssit
+resources.max = Max
 bannedblocks = Kielletyt Palikat
+unbannedblocks = Unbanned Blocks
+objectives = Tehtävät
+bannedunits = Kielletyt yksiköt
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Lisää kaikki
-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.resources = [lightgray]Resoursseja havaittu:
-zone.objective = [lightgray]Objectiivi: [accent]{0}
-zone.objective.survival = Selviydy
-zone.objective.attack = Destroy Enemy Core
+launch.from = Laukaistaan kohteesta: [accent]{0}
+launch.capacity = Tavaratila laukaistaessa: [accent]{0}
+launch.destination = Määränpää: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = Lukumäärän täytyy olla numero väliltä 0 ja {0}.
 add = Lisää...
-boss.health = Pomon elinpisteet
+guardian = Vartija
 
-connectfail = [crimson]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.
+connectfail = [crimson]Yhdistysvirhe:\n\n[accent]{0}
+error.unreachable = Palvelinta ei voida saavuttaa.\nOnko osoite kirjoitettu oikein?
+error.invalidaddress = Kelvoton osoite.
+error.timedout = Aikakatkaistu!\nVarmista, että ylläpitäjällä on port-forwarding kunnossa, ja että osoite on oikea!
+error.mismatch = Pakettivirhe:\nmahdollinen asiakasohjelman/palvelimen versioiden yhteensopimattomuus.\nVarmista, että sinulla ja ylläpitäjällä on uusin Mindustryn versio!
+error.alreadyconnected = Sinut on jo yhdistetty.
+error.mapnotfound = Karttatiedostoa ei löydy!
+error.io = Verkon I/O-virhe.
+error.any = Tuntematon verkon virhe.
+error.bloom = Bloomin initialisointi epäonnistui.\nLaitteesi ei ehkä tue sitä.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
-weather.sandstorm.name = Sandstorm
-weather.sporestorm.name = Sporestorm
-weather.fog.name = Fog
+weather.rain.name = Sade
+weather.snowing.name = Lumi
+weather.sandstorm.name = Hiekkamyrsky
+weather.sporestorm.name = Sienimyräkkä
+weather.fog.name = Sumu
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sektorit
+sectorlist.attacked = {0} on hyökkäyksen kohteena
 
-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)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+sectors.unexplored = [lightgray]Tutkimaton
+sectors.resources = Resurssit:
+sectors.production = Produktio:
+sectors.export = Vienti:
+sectors.import = Tuonti:
+sectors.time = Aika:
+sectors.threat = Uhkataso:
+sectors.wave = Taso:
+sectors.stored = Säilötty:
+sectors.resume = Jatka
+sectors.launch = Laukaise
+sectors.select = Valitse
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]ei mitään (sun)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Nimeä sektori
+sectors.enemybase = [scarlet]Vihollistukikohta
+sectors.vulnerable = [scarlet]Haavoittuvainen
+sectors.underattack = [scarlet]Hyökkäyksen kohteena! [accent]{0}% vahingoittunut
+sectors.underattack.nodamage = [scarlet]Valtaamaton
+sectors.survives = [accent]Selviytyy {0} tasoa
+sectors.go = Siirry
+sector.abandon = Hylkää
+sector.abandon.confirm = Tämän sektorin kaikki ytimet aktivoivat itsetuhon.\nJatka?
+sector.curcapture = Sektori vallattu
+sector.curlost = Sektori menetetty
+sector.missingresources = [scarlet]Sinulla ei ole tarpeeksi resursseja.
+sector.attacked = Sektori [accent]{0}[white] on hyökkäyksen kohteena!
+sector.lost = Sektori [accent]{0}[white] menetetty!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Vaihda kuvaketta
+sector.noswitch.title = Sektoria ei voida vaihtaa
+sector.noswitch = Et voi vaihtaa sektoria, kun olemassaoleva sektori on hyökkäyksen kohteena.\n\nSektori: [accent]{0}[] planeetalla [accent]{1}[]
+sector.view = Näytä sektori
+threat.low = Matala
+threat.medium = Kohtalainen
+threat.high = Korkea
+threat.extreme = Äärimmäinen
+threat.eradication = Täystuho
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planeetat
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Aurinko
+sector.impact0078.name = Törmäys 0078
 
-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.name = Tapahtumahorisontti
+sector.craters.name = Kraatterit
+sector.frozenForest.name = Jäätyneet metsät
+sector.ruinousShores.name = Taistelujen ranta
+sector.stainedMountains.name = Kalliovuoret
+sector.desolateRift.name = Musta kanjoni
+sector.nuclearComplex.name = Hylätty ydinvoimalaitos
+sector.overgrowth.name = Jättiviidakko
+sector.tarFields.name = Tervakentät
+sector.saltFlats.name = Suolatasangot
+sector.fungalPass.name = Sienirihmasto
+sector.biomassFacility.name = Biomassasynteesilaitos
+sector.windsweptIslands.name = Tuulenpieksemät saaret
+sector.extractionOutpost.name = Kaivostukikohta
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetaarinen laukaisuterminaali
+sector.coastline.name = Rantaviiva
+sector.navalFortress.name = Laivastolinnoitus
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.
+sector.groundZero.description = Optimaalinen sijainti aloittaa jälleen kerran. Matala vihollisuhka. Vähän resursseja.\nKerää niin paljon kuparia ja lyijyä, kuin mahdollista.\nJatka matkaa.
+sector.frozenForest.description = Itiöt ovat levittäytyneet jopa tänne, lähemmäs vuoria. Jäätävät lämpötilat eivät voi torjua niitä ikuisesti.\n\nAloita seikkailusi virtaan. Rakenna polttogeneraattoreita. Opi käyttämään korjaajia.
+sector.saltFlats.description = Aavikon reunamilla sijaitsevat suolatasangot. Tässä sijainnissa resurssit ovat vähäisiä.\n\nVihollinen on pystyttänyt tänne varastokompleksin. Hävitä heidän ytimensä. Älä jätä mitään jäljelle.
+sector.craters.description = Vesi on kerääntynyt tähän kraatteriin, jäännökseen vanhoista sodista. Kunnosta alue. Kerää hiekkaa. Sulata metalasia. Pumppaa vettä jäähdyttääksesi tykkitorneja ja poria.
+sector.ruinousShores.description = Autiomaiden jälkeen seuraa rantaviiva. Kerran tällä alueella oli rannikkopuolustusrivi. Vain vähän siitä on säilynyt. Vain kaikkein yksinkertaisimmat puolustusrakennukset ovat säilyneet vahingoittumattomina, ja kaikki muu on hävitetty romuksi.\nJatka laajenemista ulospäin. Tutki teknologia uudelleen.
+sector.stainedMountains.description = Kauempana sisämaassa sijaitsevat vuoret, jotka eivät vielä ole itiöiden saastuttamia.\nKaiva tällä alueella runsasta titaania. Opi, kuinka käyttää sitä.\n\nVihollisen läsnäolo on täällä suurempaa. Älä anna heille aikaa lähettää vahvimpia joukkojaan.
+sector.overgrowth.description = Tämä alue on umpeenkasvanut, ja on lähempänä itiöiden lähdettä.\nVihollinen on perustanut tänne vartioaseman. Rakenna Mace-yksikköjä. Tuho se. Ota takaisin se, mikä oli menetettyä.
+sector.tarFields.description = Öljyntuotantoalueen ulkolaitama vuorien ja aavikon välissä. Yksi harvoista alueista, joissa on käytettäviä tervavarantoja.\nVaikka se onkin hylätty, lähellä on joitakin vaarallisia vihollisjoukkoja. Älä aliarvioi niitä.\n\n[lightgray]Tutki öljynprosessointiteknologiaa, jos mahdollista.
+sector.desolateRift.description = Äärimmäisen vaarallinen alue. Sisältää runsaasti resursseja, mutta vähän tilaa. Suuri tuhoutumisen riski. Lähde niin pian, kuin mahdollista. Älä hämäänny vihollishyökkäysten pitkistä aikaväleistä.
+sector.nuclearComplex.description = Entinen laitos, jossa tuotettiin ja prosessoitiin toriumia, nyt hävitettynä raunioiksi.\n[lightgray]Tutki torium ja sen monet käyttökohteet.\n\nVihollinen on täällä läsnä suurina lukumäärinä, alati tiedustelemassa hyökkääjien varalta.
+sector.fungalPass.description = Siirtymäalue korkeiden vuorten ja matalampien, itiöiden vaivaamien alueiden välillä. Pieni vihollisen tiedustelutukikohta sijaitsee täällä.\nHävitä se.\nKäytä Tikareita ja Indeksointirobotteja. Tuhoa kaikki kaksi ydintä.
+sector.biomassFacility.description = Itiöiden alkupiste. Tämä on se laitos, jossa ne tutkittiin ja alkujaan tuotettiin.\nTutki sen säilömä teknologia. Viljele itiöitä polttoaineen ja muovien tuotantoa varten.\n\n[lightgray]Tämän laitoksen tuhoutuessa itiöt vapautuivat. Mikään paikallisessa ekosysteemissä ei kyennyt kilpailemaan niin tunkeutuvan organismin kanssa.
+sector.windsweptIslands.description = Kauempana rantaviivan takana on tämä kaukainen saaristo. Tallenteet kertovat, että siellä oli kerran [accent]plastaniumia[] tuottavia rakennuksia.\n\nTorju vihollisen laivayksiköt. Perusta saarille tukikohta. Tutki nämä tehtaat.
+sector.extractionOutpost.description = Kaukainen vartioasema, jonka vihollinen rakensi laukaistakseen resursseja muihin sektoreihin.\n\nSektorien välinen kuljetusteknologia on olennaista myöhemmälle valloitukselle. Tuhoa tämä tukikohta. Tutki heidän laukaisualustansa.
+sector.impact0078.description = Täällä lepäävät tähtienvälisen aluksen, joka ensimmäisenä kulki tähän aurinkokuntaan, jäännökset.\n\nPelasta hylystä mahdollisimman paljon. Tutki kaikki säilynyt teknologia.
+sector.planetaryTerminal.description = Viimeinen kohde.\n\nTämä rannikkotukikohta sisältää rakennuksen, joka pystyy laukaisemaan ytimiä paikallisille planeetoille. Se on vartioitu äärimmäisen hyvin.\n\nRakenna laivayksiköitä. Eliminoi vihollinen mahdollisimman pian. Tutki laukaisurakennus.
+sector.coastline.description = Tällä alueella on havaittu jälkiä meriyksikköjen teknologiasta. Torju vihollisen hyökkäykset, valtaa tämä sektori ja hanki teknologia.
+sector.navalFortress.description = Vihollinen on perustanut tukikohdan syrjäiselle, luonnostaan linnoitetulle saarelle. Tuhoa tämä etuvartioasema. Hanki heidän kehittynyt merialusteknologiansa ja tutki se.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = Alku
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = Aloita Erekirin valloitus. Kerää resursseja, tuota yksiköitä ja aloita teknologian tutkiminen.
+sector.aegis.description = Tässä sektorissa on volfram-esiintymiä.\nTutki [accent]iskupora[] louhiaksesi tätä resurssia ja tuhoa alueen vihollistukikohta.  
+sector.lake.description = Tämän sektorin kuona-järvi rajoittaa merkittävästi käyttökelpoisia yksiköitä. Ilma-alus on ainoa vaihtoehto.\nTutki [accent]Ilma-alusrakentaja[] ja valmista elude -yksikkö mahdollisimman pian.
+sector.intersect.description = Skannaukset viittaavat siihen, että tämä sektori joutuu hyökkäyksen kohteeksi useilta suunnilta pian laskeutumisen jälkeen.\nPerusta puolustukset nopeasti ja laajenna mahdollisimman pian.\n[accent]Merui[] -yksiköitä tarvitaan alueen karuun maastoon.
+sector.atlas.description = Tässä sektorissa on monimuotoinen maasto ja tehokkaaseen hyökkäyksen tarvitaan monipuolisia yksiköitä.\nPäivitetyt yksiköt voivat myös olla tarpeen, tiettyjen vihollistukikohtien läpäisemiseksi.\nTutki [accent]Elektrolysoija[] ja [accent]Tankkijälleenrakentaja[].
+sector.split.description = Vähäinen vihollisaktiivisuus tekee tästä sektorista täydellisen uusien kuljetusteknologioiden testaamiseen.
+sector.basin.description = Tässä sektorissa havaittiin suuri vihollisjoukko.\nRakenna yksiköitä nopeasti ja valtaa vihollisen ytimet saadaksesi jalansijan.
+sector.marsh.description = Tässä sektorissa on runsaasti arkysiittiä, mutta rajoitetusti purkauksia.\nRakenna [accent]kemiallisia polttokammioita[] tuottaaksesi energiaa.
+sector.peaks.description = Sektorin vuoristoinen maasto tekee suurimman osan yksiköistä hyödyttömiksi. Lentäviä ksiköitä tarvitaan.\nHuomioi vihollisen ilmatorjuntajärjestelmät. Joitain näistä järjestelmistä voi olla mahdollista lamauttaa kohdistamalla hyökkäys niiden tukirakennuksiin.  
+sector.ravine.description = Sektorissa ei ole havaittu vihollisen ytimiä, vaikka se on vihollisen tärkeä kuljetusreitti. Odota kuitenkin monenlaisia vihollisjoukkoja.\nTuota [accent]jänniteseosta[]. Rakenna [accent]Aiheuttaja[]-tykkejä.
+sector.caldera-erekir.description = Tämän sektorin resurssit ovat hajallaan useilla saarilla.\nTutki ja ota käyttöön drone-pohjainen kuljetus.
+sector.stronghold.description = Suuri vihollisleiri tässä sektorissa puolustaa merkittäviä [accent]torium[]-esiintymiä.\nKäytä sitä kehittyneempien yksiköiden ja tykkien valmistamiseen.
+sector.crevice.description = Vihollinen lähettää rajuja hyökkäysjoukkoja tuhotakseen tukikohtasi tässä sektorissa. [accent]Karbidin[] ja [accent]Pyrolyysigeneraattorin[] kehittäminen voi olla elintärkeää selviytymisen kannalta.
+sector.siege.description = Tässä sektorissa on kaksi rinnakkaista kanjonia, jotka pakottavat kaksisuuntaisen hyökkäyksen.\nTutki [accent]syanogeeni[] kehittääksesi vieläkin vahvempia tankkiyksiköitä.\nVaroitus: vihollisen pitkän kantaman ohjuksia havaittu. Ohjukset on kuitenkin mahdollista ampua alas ennen kuin ne osuvat kohteeseensa.
+sector.crossroads.description = Tämän sektorin vihollistukikohdat on perustettu vaihtelevaan maastoon. Tutki erilaisia yksiköitä mukautuaksesi.\nLisäksi joitakin tukikohtia suojaavat kilvet. Selvitä, mistä ne saavat voimansa.
+sector.karst.description = Tässä sektorissa on runsaasti resursseja, mutta vihollinen hyökkää heti, kun uusi ydin laskeutuu.\nHyödynnä resursseja ja tutki [accent]kiihtokuitu[].
+sector.origin.description = Viimeinen sektori, jossa on merkittävä määrä vihollisia.\nVarteenotettavia tutkimusmahdollisuuksia ei ole jäljellä – keskity yksinomaan kaikkien vihollisytimien tuhoamiseen.
+
+status.burning.name = Palaminen
+status.freezing.name = Jäätyminen
+status.wet.name = Märkä
+status.muddy.name = Mutainen
+status.melting.name = Sulaminen
+status.sapped.name = Heikennetty
+status.electrified.name = Sähköistetty
+status.spore-slowed.name = Itiöiden hidastama
+status.tarred.name = Tervattu
+status.overdrive.name = Yliajo
+status.overclock.name = Ylikellotus
+status.shocked.name = Shokki
+status.blasted.name = Räjähtänyt
+status.unmoving.name = Liikkumaton
+status.boss.name = Vartija
 
 settings.language = Kieli
 settings.data = Peli Data
@@ -562,32 +917,37 @@ settings.game = Peli
 settings.sound = Ääni
 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.clear.confirm = Oletko varma että haluat tyhjentää pelin datan?\nTätä 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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
+settings.clearsaves.confirm = Oletko varma, että haluat tyhjentää kaikki tallennuksesi?
+settings.clearsaves = Poista tallennukset
+settings.clearresearch = Poista tutkimukset
+settings.clearresearch.confirm = Oletko varma, että haluat tyhjentää kaikki tutkimuksesi polussa?
+settings.clearcampaignsaves = Poista kampanjatallennukset
+settings.clearcampaignsaves.confirm = Oletko varma, että haluat poistaa kaikki kampanjatallennuksesi?
 paused = [accent]< Pysäytetty >
 clear = Tyhjä
 banned = [scarlet]Kielletty
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Ympäristöä ei tueta
 yes = Kyllä
 no = Ei
 info.title = Informaatio
-error.title = [crimson]An error has occured
-error.crashtitle = An error has occured
-unit.nobuild = [scarlet]Unit can't build
-lastaccessed = [lightgray]Last Accessed: {0}
+error.title = [crimson]On tapahtunut virhe
+error.crashtitle = On tapahtunut virhe
+unit.nobuild = [scarlet]Yksikkö ei voi rakentaa
+lastaccessed = [lightgray]Viimeiseksi käytetty: {0}
+lastcommanded = [lightgray]Viimeiseksi komennettu: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <lataa näytettäv kartta>
+stat.description = Tarkoitus
 
 stat.input = Sisääntulo
 stat.output = Ulostulo
+stat.maxefficiency = Maksimitehokkuus
 stat.booster = Tehostaja
-stat.tiles = Required Tiles
-stat.affinities = Affinities
+stat.tiles = Vaaditut laatat
+stat.affinities = Voimistavat tekijät
+stat.opposites = Heikentävät tekijät
 stat.powercapacity = Energiakapasiteetti
 stat.powershot = Energiaa/Ammus
 stat.damage = Vahinko
@@ -597,19 +957,24 @@ stat.itemsmoved = Liikkumisnopeus
 stat.launchtime = Aika laukaisujen välillä
 stat.shootrange = Kantama
 stat.size = Koko
-stat.displaysize = Display Size
+stat.displaysize = Näytettävä koko
 stat.liquidcapacity = Nestekapasiteetti
 stat.powerrange = Energiakantama
-stat.linkrange = Link Range
-stat.instructions = Instructions
+stat.linkrange = Linkin kantama
+stat.instructions = Ohjeet
 stat.powerconnections = Maksimimäärä yhdistyksiä
 stat.poweruse = Energian käyttö
 stat.powerdamage = Energia/Vahinko
 stat.itemcapacity = Tavarakapasiteetti
-stat.memorycapacity = Memory Capacity
+stat.memorycapacity = Muistikapasiteetti
 stat.basepowergeneration = Perus energiantuotto
 stat.productiontime = Tuotantoaika
 stat.repairtime = Kokonaisen palikan korjausaika
+stat.repairspeed = Korjausnopeus
+stat.weapons = Aseet
+stat.bullet = Ammukset
+stat.moduletier = Moduulin taso
+stat.unittype = Unit Type
 stat.speedincrease = Nopeuden kasvu
 stat.range = Etäisyys
 stat.drilltier = Porattavat
@@ -617,95 +982,174 @@ stat.drillspeed = Kanta Poran Nopeus
 stat.boosteffect = Tehostamisem vaikutus
 stat.maxunits = Maksimimäärä yksikköjä
 stat.health = Elämäpisteet
+stat.armor = Haarniska
 stat.buildtime = Rakentamisaika
-stat.maxconsecutive = Max Consecutive
+stat.maxconsecutive = Max. peräkkäisiä
 stat.buildcost = Rakentamishinta
 stat.inaccuracy = Epätarkkuus
 stat.shots = Ammusta
 stat.reload = Ammusta/sekunnissa
 stat.ammo = Ammus
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.shieldhealth = Kilven elämäpisteet
+stat.cooldowntime = Jäähtymisaika
+stat.explosiveness = Räjähdysherkkyys
+stat.basedeflectchance = Perustorjuntatodennäköisyys
+stat.lightningchance = Salamointitodennäköisyys
+stat.lightningdamage = Salaman vahinko
+stat.flammability = Syttyvyys
+stat.radioactivity = Radioaktiivisuus
+stat.charge = Varaus
+stat.heatcapacity = Lämpökapasiteetti
+stat.viscosity = Tahmeus
+stat.temperature = Lämpötila
+stat.speed = Nopeus
+stat.buildspeed = Rakennusnopeus
+stat.minespeed = Kaivuunopeus
+stat.minetier = Kaivuutaso
+stat.payloadcapacity = Lastikapasiteetti
+stat.abilities = Erikoisvoimat
+stat.canboost = Voi tehostaa
+stat.flying = Lentävä
+stat.ammouse = Ammusten käyttö
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Vahinkokerroin
+stat.healthmultiplier = Elmäpistekerroin
+stat.speedmultiplier = Nopeuskerroin
+stat.reloadmultiplier = Uudelleenlatauskerroin
+stat.buildspeedmultiplier = Rakennusnopeuskerroin
+stat.reactive = Reagoi
+stat.immunities = Immuuni
+stat.healing = Parantuu
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = Voimakenttä
+ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.repairfield = Korjauskenttä
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Statuskenttä
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Tehdas
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Kilvenvahvistuskenttä
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Salamointi liikkuessa
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Kilpikaari
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energiakenttä
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Sijoittaminen sallittua vain ytimeen
 
 bar.drilltierreq = Parempi pora vaadittu
-bar.noresources = Missing Resources
-bar.corereq = Core Base Required
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Resursseja Puuttuu
+bar.corereq = Pohjaydin vaadittu
+bar.corefloor = 'Ydinpohja'-laatta vaadittu
+bar.cargounitcap = Kuljetusyksikköjen enimmäismäärä saavutettu
 bar.drillspeed = Poran nopeus: {0}/s
 bar.pumpspeed = Pumpun nopeus: {0}/s
 bar.efficiency = Tehokkuus: {0}%
+bar.boost = Tehostus: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Energia: {0}/s
 bar.powerstored = Säilöttynä: {0}/{1}
 bar.poweramount = Energia: {0}
 bar.poweroutput = Energiantuotto: {0}
-bar.powerlines = Connections: {0}/{1}
+bar.powerlines = Yhteyksiä: {0}/{1}
 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.cooldown = Cooldown
+bar.instability = Epävakaus
+bar.heatamount = Lämpö: {0}
+bar.heatpercent = Lämpö: {0} ({1}%)
 bar.power = Energia
 bar.progress = Rakennuksen edistys
+bar.loadprogress = Edistys
+bar.launchcooldown = Laukaisun latausaika
 bar.input = Sisääntulo
 bar.output = Ulostulo
+bar.strength = [stat]{0}[lightgray]x voimakkuus
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]Prosessorin hallitsema
 
 bullet.damage = [stat]{0}[lightgray] Vahinko
 bullet.splashdamage = [stat]{0}[lightgray] Aluevahinko ~[stat] {1}[lightgray] palikkaa
 bullet.incendiary = [stat]sytyttävä
 bullet.homing = [stat]itseohjautuva
-bullet.shock = [stat]shokki
-bullet.frag = [stat]sirpaloituva
-bullet.knockback = [stat]{0}[lightgray] knockback
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]jäädyttävä
-bullet.tarred = [stat]tervattu
-bullet.multiplier = [stat]{0}[lightgray]x ammusten kerroin
+bullet.armorpierce = [stat]haarniskan läpäisevä
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x sirpaleammuksia:
+bullet.lightning = [stat]{0}[lightgray]x salama ~ [stat]{1}[lightgray] vahinkoa
+bullet.buildingdamage = [stat]{0}%[lightgray] vahinko rakennuksiin
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] tönäisy
+bullet.pierce = [stat]{0}[lightgray]x lävistys
+bullet.infinitepierce = [stat]lävistys
+bullet.healpercent = [stat]{0}[lightgray]% paraneminen
+bullet.healamount = [stat]{0}[lightgray] suora korjaus
+bullet.multiplier = [stat]{0}[lightgray]x ammusmäärän kerroin
 bullet.reload = [stat]{0}[lightgray]x ampumisnopeus
+bullet.range = [stat]{0}[lightgray] laatan kantama
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = palikat
-unit.blockssquared = blocks²
+unit.blockssquared = palikat²
 unit.powersecond = energiayksikköä/sekunti
+unit.tilessecond = laattaa/second
 unit.liquidsecond = nesteyksikköä/sekunti
 unit.itemssecond = esinettä/sekunti
 unit.liquidunits = nesteyksikköä
 unit.powerunits = energiayksikköä
+unit.heatunits = lämpöyksikköä
 unit.degrees = astetta
 unit.seconds = sekunttia
-unit.minutes = mins
+unit.minutes = minuuttia
 unit.persecond = /s
 unit.perminute = /min
 unit.timesspeed = x nopeus
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = shield health
+unit.shieldhealth = suojan elinpisteet
 unit.items = esinettä
 unit.thousands = t
-unit.millions = mil
-unit.billions = b
+unit.millions = milj
+unit.billions = mrd
+unit.shots = shots
+unit.pershot = /laukaisu
+category.purpose = Tarkoitus
 category.general = Yleinen
 category.power = Energia
 category.liquids = Neste
@@ -713,17 +1157,24 @@ category.items = Tavarat
 category.crafting = Ulos/Sisääntulo
 category.function = Function
 category.optional = Mahdolliset parannukset
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Ohita ytimen laukaisun/laskeutumisen animaatio
 setting.landscape.name = Lukitse tasavaakaan
 setting.shadows.name = Varjot
 setting.blockreplace.name = Automaattisia Palikka Suosituksia
 setting.linear.name = Lineaarinen suodatus
 setting.hints.name = Vihjeet
-setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
+setting.logichints.name = Logiikkavihjeet
+setting.backgroundpause.name = Pysäytä taustalla
 setting.buildautopause.name = Automaattisest Pysäytä Rakentaessa
+setting.doubletapmine.name = Kaksoisklikkaa kaivaaksesi
+setting.commandmodehold.name = Pidä pohjassa komentotilaa varten
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Poista lisäosat käytöstä käynnistyskaatumisissa
 setting.animatedwater.name = Animoitu vesi
 setting.animatedshields.name = Animoidut kilvet
-setting.antialias.name = Antialiaasi[lightgray] (vaatii uudelleenkäynnistyksen)[]
-setting.playerindicators.name = Player Indicators
+setting.playerindicators.name = Pelaajaindikaattorit
 setting.indicators.name = Vihollis/Puolulais Indikaattorit
 setting.autotarget.name = Automaatinen Tähtäys
 setting.keyboard.name = Hiiri+Näppäimistö -ohjaus
@@ -732,173 +1183,257 @@ setting.fpscap.name = Maksimi FPS
 setting.fpscap.none = Ei Mitään
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI Koko[lightgray] (vaatii uudelleenkäynnistyksen)[]
+setting.uiscale.description = Muutosten toteuttaminen vaatii uudelleenkäynnistyksen
 setting.swapdiagonal.name = Aina vino korvaus
-setting.difficulty.training = Treeni
-setting.difficulty.easy = Helppo
-setting.difficulty.normal = Keskivaikea
-setting.difficulty.hard = Haastava
-setting.difficulty.insane = Järjetön
-setting.difficulty.name = Vaikeustaso:
 setting.screenshake.name = Näytön keikkuminen
+setting.bloomintensity.name = Bloom-intensiteetti
+setting.bloomblur.name = Bloom-sumennus
 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.blockstatus.name = Näytä Palikan Toimintakunto
+setting.conveyorpathfinding.name = Liukuhihnan älykäs sijoittaminen
 setting.sensitivity.name = Ohjauksen herkkyys
 setting.saveinterval.name = Tallennuksen Aikaväli
-setting.seconds = {0} Sekunttia
-setting.blockselecttimeout.name = Block Select Timeout
-setting.milliseconds = {0} millisekunttia
-setting.fullscreen.name = Fullscreen
-setting.borderlesswindow.name = Borderless Window[lightgray] (vaatii uudelleenkäynnistyksen)
+setting.seconds = {0} Sekuntia
+setting.milliseconds = {0} millisekuntia
+setting.fullscreen.name = Täysnäyttö
+setting.borderlesswindow.name = Reunaton Ikkuna[lightgray] (vaatii uudelleenkäynnistyksen)
+setting.borderlesswindow.name.windows = Reunaton koko näytön tila
+setting.borderlesswindow.description = Uudelleenkäynnistys saatetaan vaatia muutosten toteuttamiseksi.
 setting.fps.name = Näytä FPS
-setting.smoothcamera.name = Smooth Camera
+setting.console.name = Salli konsoli
+setting.smoothcamera.name = Pehmeä kamera
 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.coreitems.name = Näytä ytimen tavarat (WIP)
 setting.position.name = Näytä pelaajan sijainti
+setting.mouseposition.name = Näytä hiiren sijainti
 setting.musicvol.name = Musiikin äänenvoimakkuus
-setting.atmosphere.name = Show Planet Atmosphere
+setting.atmosphere.name = Näytä planeetan ilmakehä
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Taustaäänet
 setting.mutemusic.name = Mykistä musiikki
 setting.sfxvol.name = SFX-voimakkuus
 setting.mutesound.name = Mykistä äänet
-setting.crashreport.name = Send Anonymous Crash Reports
+setting.crashreport.name = Lähetä anonyymejä kaatumisilmoituksia
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Luo tallenuksia automaattisesti
-setting.publichost.name = Public Game Visibility
-setting.playerlimit.name = Player Limit
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Pelaajaraja
 setting.chatopacity.name = Keskustelun läpinäkymättömyys
 setting.lasersopacity.name = Energia laserin läpinäkymättömyys
-setting.bridgeopacity.name = Bridge Opacity
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Siltojen läpinäkyvyys
 setting.playerchat.name = Näytä pelinsisäinen keskustelu
-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...
+setting.showweather.name = Näytä säägrafiikat
+setting.hidedisplays.name = Piilota logiikkanäytöt
+setting.macnotch.name = Mukauta käyttöliittymä näyttämään lovi
+setting.macnotch.description = Muutosten toteuttaminen vaatii uudelleenkäynnistyksen
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
+public.beta = Huomaa, että pelin betaversiot eivät voi luoda julkisia auloja.
+uiscale.reset = UI:n skaalaa on muutettu.\nPaina "OK" hyväksyäksesi tämän skaalan.\n[scarlet]Palautetaan ja poistutaan[accent] {0}[] sekunnissa...
 uiscale.cancel = Peruuta ja poistu
-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
+setting.bloom.name = Hehkeys
+keybind.title = Kontrollit
+keybinds.mobile = [scarlet]Useimmat näppäinkontrollit eivät toimi mobiililaitteilla. Vain yksinkertaista liikettä tuetaan.
+category.general.name = Yleinen
+category.view.name = Näytä
+category.command.name = Unit Command
 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...
-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
+category.blocks.name = Palikan Valinta
+placement.blockselectkeys = \n[lightgray]Näppäin: [{0},
+keybind.respawn.name = Synny Uudelleen
+keybind.control.name = Käytä Yksikköä
+keybind.clear_building.name = Tyhjennä rakennus
+keybind.press = Paina Nappia...
+keybind.press.axis = Paina akselia tai näppäintä...
+keybind.screenshot.name = Kuvakaappaus kartasta
+keybind.toggle_power_lines.name = Vaihda virtalaserit
+keybind.toggle_block_status.name = Vaihda palikkastatukset
+keybind.move_x.name = Liiku x
+keybind.move_y.name = Liiku y
+keybind.mouse_move.name = Seuraa Hiirtä
+keybind.pan.name = Kelaa näkymää
+keybind.boost.name = Tehosta
+keybind.command_mode.name = Komentotila
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Valitse alue
 keybind.schematic_menu.name = Kaavio Valikko
-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.schematic_flip_x.name = Käännä kaavio X-akselilla
+keybind.schematic_flip_y.name = Käännä kaavio Y-akselilla
+keybind.category_prev.name = Edellinen kategoria
+keybind.category_next.name = Seuraava kategoria
+keybind.block_select_left.name = Valitse vasen palikka
+keybind.block_select_right.name = Valitse oikea palikka
+keybind.block_select_up.name = Valitse ylempi palikka
+keybind.block_select_down.name = Valitse alempi palikka
+keybind.block_select_01.name = Valitse kategoria/palikka 1
+keybind.block_select_02.name = Valitse kategoria/palikka 2
+keybind.block_select_03.name = Valitse kategoria/palikka 3
+keybind.block_select_04.name = Valitse kategoria/palikka 4
+keybind.block_select_05.name = Valitse kategoria/palikka 5
+keybind.block_select_06.name = Valitse kategoria/palikka 6
+keybind.block_select_07.name = Valitse kategoria/palikka 7
+keybind.block_select_08.name = Valitse kategoria/palikka 8
+keybind.block_select_09.name = Valitse kategoria/palikka 9
+keybind.block_select_10.name = Valitse kategoria/palikka 10
 keybind.fullscreen.name = Vaihda kokonäyttötilaan
-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.select.name = Valitse/Ammu
+keybind.diagonal_placement.name = Vino sijoitus
+keybind.pick.name = Ota palikka
+keybind.break_block.name = Riko palikka
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.deselect.name = Poista valinta
+keybind.pickupCargo.name = Nosta lastia
+keybind.dropCargo.name = Pudota lastia
+keybind.shoot.name = Ammu
+keybind.zoom.name = Zoomaa
+keybind.menu.name = Valikko
+keybind.pause.name = Pysäytä
+keybind.pause_building.name = Pysäytä/Jatka rakennusta
 keybind.minimap.name = Pienoiskartta
+keybind.planet_map.name = Planeettakartta
+keybind.research.name = Tutki
+keybind.block_info.name = Palikan tiedot
 keybind.chat.name = Keskustelu
 keybind.player_list.name = Pelaaja lista
-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
+keybind.console.name = Konsoli
+keybind.rotate.name = Kierrä
+keybind.rotateplaced.name = Kierrä olemassa olevaa (Pidä pohjassa)
+keybind.toggle_menus.name = Vaihda valikot
+keybind.chat_history_prev.name = Edellinen keskusteluhistoria
+keybind.chat_history_next.name = Seuraavakeskusteluhistoria
+keybind.chat_scroll.name = Kelaa keskustelua
+keybind.chat_mode.name = Vaihda keskustelutilaa
+keybind.drop_unit.name = Pudota yksikkö
+keybind.zoom_minimap.name = Zoomaa pienoiskarttaa
+mode.help.title = Pelitilojen kuvaus
+mode.survival.name = Selviytyminen
 mode.survival.description = Normaali tila. Rajoitettu määrä resursseja ja tasoilla on aika.\n[gray]Vaatii vihollisten syntymispisteen kartassa.
 mode.sandbox.name = Hiekkalaatikko
 mode.sandbox.description = Ikuisesti resursseja ja tasoja ei ole ajastettu.
 mode.editor.name = Editori
 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. No waves.\n[gray]Requires a red core in the map to play.
-mode.custom = Custom Rules
+mode.pvp.description = Taistele toisia pelaajia vastaan paikallisesti.\n[gray]Pelaaminen vaatii vähintään kaksi eriväristä ydintä kartassa.
+mode.attack.name = Hyökkäys
+mode.attack.description = Tuhoa vihollisen tukikohta. Ei tasoja.\n[gray]Pelaaminen vaatii punaisen ytimen kartassa.
+mode.custom = Muokkaa sääntöjä
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
-rules.infiniteresources = Ikuiset resurssit
+rules.infiniteresources = Loputtomat resurssit
+rules.onlydepositcore = Salli sijoittaminen vain ytimeen
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reaktorien räjähtäminen
-rules.schematic = Schematics Allowed
+rules.coreincinerates = Ydin höyrystää ylivuodon
+rules.disableworldprocessors = Poista maailmaprosessorit käytöstä
+rules.schematic = Salli kaaviot
 rules.wavetimer = Tasojen aikaraja
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Tasot
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Hyökkäystila
-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.enemyLights = Enemy Lights
-rules.fire = Fire
-rules.explosions = Block/Unit Explosion Damage
-rules.ambientlight = Ambient Light
-rules.weather = Weather
-rules.weather.frequency = Frequency:
-rules.weather.duration = Duration:
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min. hyökkäysjoukon koko
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min. hyökkäyksen paino
+rules.cleanupdeadteams = Siivoa voitettujen joukkueiden rakennukset (PvP)
+rules.corecapture = Valtaa ydin sen tuhoutuessa
+rules.polygoncoreprotection = Monikulmainen ytimen suoja-alue
+rules.placerangecheck = Tarkista asetuskantama
+rules.enemyCheat = Loputtomat AI:n (punaisen joukkueen) resurssit
+rules.blockhealthmultiplier = Palikkojen elämäpistekerroin
+rules.blockdamagemultiplier = Palikkojen vahinkokerroin
+rules.unitbuildspeedmultiplier = Yksikköjen tuotantonopeuskerroin
+rules.unitcostmultiplier = Unit Cost Multiplier
+rules.unithealthmultiplier = Yksikköjen elämäpistekerroin
+rules.unitdamagemultiplier = Yksikköjen vahinkokerroin
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Aurinkovoimakerroin
+rules.unitcapvariable = Ytimet vaikuttavat yksikkörajaan
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Perusyksikköraja
+rules.limitarea = Rajoita kartan aluetta
+rules.enemycorebuildradius = Vihollisytimen rakennuksenestosäde:[lightgray] (laattoina)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Tasojen väliaika:[lightgray] (sec)
+rules.initialwavespacing = Ensimmäinen tason väliaika:[lightgray] (sec)
+rules.buildcostmultiplier = Rakentamisen hintakerroin
+rules.buildspeedmultiplier = Rakentamisen nopeuskerroin
+rules.deconstructrefundmultiplier = Purkamisen palautuskerroin
+rules.waitForWaveToEnd = Tasot odottavat edellisen tason loppumista
+rules.wavelimit = Map Ends After Wave
+rules.dropzoneradius = Syntypisteen säde:[lightgray] (laattoina)
+rules.unitammo = Yksiköt tarvitsevat ammuksia
+rules.enemyteam = Vihollisjoukkue
+rules.playerteam = Pelaajan joukkue
+rules.title.waves = Tasot
+rules.title.resourcesbuilding = Resurssit ja rakentaminen
+rules.title.enemy = Viholliset
+rules.title.unit = Yksiköt
+rules.title.experimental = Kokeellinen
+rules.title.environment = Ympäristö
+rules.title.teams = Joukkueet
+rules.title.planet = Planeetta
+rules.lighting = Salamointi
+rules.fog = Sodan sumu (Fog of War)
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = Tuli
+rules.anyenv = <mikä tahansa>
+rules.explosions = Palikkojen/Yksikköjen räjähdysvahinko
+rules.ambientlight = Ympäristön valaistus
+rules.weather = Sää
+rules.weather.frequency = Tiheys:
+rules.weather.always = Aina
+rules.weather.duration = Kesto:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Tavarat
 content.liquid.name = Nesteet
 content.unit.name = Yksiköt
 content.block.name = Palikat
+content.status.name = Statusefektit
+content.sector.name = Sektorit
+content.team.name = Ryhmittymät
+wallore = (Seinä)
 
 item.copper.name = Kupari
 item.lead.name = Lyijy
@@ -907,36 +1442,49 @@ item.graphite.name = Grafiitti
 item.titanium.name = Titaani
 item.thorium.name = Torium
 item.silicon.name = Pii
-item.plastanium.name = Plastaniumi
-item.phase-fabric.name = Kiihdekuitu
-item.surge-alloy.name = Taiteseos
+item.plastanium.name = Plastiikkaseos
+item.phase-fabric.name = Kiihtokuitu
+item.surge-alloy.name = Jänniteseos
 item.spore-pod.name = Itiöpalko
 item.sand.name = Hiekka
-item.blast-compound.name = Räjähdeyhdiste
-item.pyratite.name = Pyratiitti
-item.metaglass.name = Metallilasi
+item.blast-compound.name = Erikoisruuti
+item.pyratite.name = Rikkikiisu
+item.metaglass.name = Teräslasi
 item.scrap.name = Romu
+item.fissile-matter.name = Halkeava aines
+item.beryllium.name = Beryllium
+item.tungsten.name = Volframi
+item.oxide.name = Oksidi
+item.carbide.name = Karbidi
+item.dormant-cyst.name = Uinuva lepoitiö
 liquid.water.name = Vesi
 liquid.slag.name = Kuona
 liquid.oil.name = Öljy
-liquid.cryofluid.name = Kryoneste
+liquid.cryofluid.name = Kryolitku
+liquid.neoplasm.name = Kasvain
+liquid.arkycite.name = Arkysiitti
+liquid.gallium.name = Gallium
+liquid.ozone.name = Otsoni
+liquid.hydrogen.name = Vety
+liquid.nitrogen.name = Typpi
+liquid.cyanogen.name = Syanogeeni
 
 unit.dagger.name = Tikari
-unit.mace.name = Mace
+unit.mace.name = Nuija
 unit.fortress.name = Linnoitus
 unit.nova.name = Nova
-unit.pulsar.name = Pulsar
-unit.quasar.name = Quasar
-unit.crawler.name = Indeksointirobotti
+unit.pulsar.name = Pulsari
+unit.quasar.name = Kvasaari
+unit.crawler.name = Ryömijä
 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.horizon.name = Taivaanranta
+unit.zenith.name = Zeniitti
 unit.antumbra.name = Antumbra
-unit.eclipse.name = Eclipse
+unit.eclipse.name = Pimennys
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
@@ -947,83 +1495,117 @@ 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.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
+unit.alpha.name = Alfa
+unit.beta.name = Beeta
 unit.gamma.name = Gamma
 unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Kokoajadrooni
+unit.latum.name = Latum
+unit.renale.name = Renale
+
+block.parallax.name = Parallaksi
+block.cliff.name = Kallio
 
-block.resupply-point.name = Resupply Point
-block.parallax.name = Parallax
-block.cliff.name = Vuoren
 block.sand-boulder.name = Hiekkalohkare
+block.basalt-boulder.name = Basalttilohkare
 block.grass.name = Ruoho
-block.slag.name = Kuono
-block.space.name = Space
+block.molten-slag.name = Kuona
+block.pooled-cryofluid.name = Kryolitku
+block.space.name = Avaruus
 block.salt.name = Suolapitoisuus
-block.salt-wall.name = Salt Wall
+block.salt-wall.name = Suolaseinä
 block.pebbles.name = Pikkukivi
-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 = Lumimänny
+block.tendrils.name = Kärhet
+block.sand-wall.name = Hiekkaseinä
+block.spore-pine.name = Itiömänty
+block.spore-wall.name = Itiöseinä
+block.boulder.name = Lohkare
+block.snow-boulder.name = Lumilohkare
+block.snow-pine.name = Lumimänty
 block.shale.name = Liuske
-block.shale-boulder.name = Shale Boulder
+block.shale-boulder.name = Liuskelohkare
 block.moss.name = Sammal
 block.shrubs.name = Pensaikko
 block.spore-moss.name = Itiösammal
-block.shale-wall.name = Shale Wall
+block.shale-wall.name = Liuskeseinä
 block.scrap-wall.name = Romuseinä
 block.scrap-wall-large.name = Suuri romuseinä
 block.scrap-wall-huge.name = Valtava romuseinä
 block.scrap-wall-gigantic.name = Jättiläismäinen romuseinä
-block.thruster.name = Thruster
-block.kiln.name = Kiln
+block.thruster.name = Työnnin
+block.kiln.name = Polttouuni
 block.graphite-press.name = Grafiittipuristin
 block.multi-press.name = Monipuristin
 block.constructing = {0} [lightgray](Rakentamassa)
 block.spawn.name = Vihollisten syntymispiste
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Ydin: Siru
 block.core-foundation.name = Ydin: Pohjaus
 block.core-nucleus.name = Ydin: Tuma
-block.deepwater.name = Syvä vesi
-block.water.name = Vesi
-block.tainted-water.name = Pilaantunut vesi
-block.darksand-tainted-water.name = Dark Sand Tainted Water
+block.deep-water.name = Syvää vettä
+block.shallow-water.name = Vettä
+block.tainted-water.name = Saastevettä
+block.deep-tainted-water.name = Syvää Saasteista Vettä
+block.darksand-tainted-water.name = Saastevesi tummalla hiekalla
 block.tar.name = Terva
 block.stone.name = Kivi
-block.sand.name = Hiekka
+block.sand-floor.name = Hiekka
 block.darksand.name = Tumma hiekka
 block.ice.name = Jää
 block.snow.name = Lumi
-block.craters.name = Kraatterit
-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.dacite-boulder.name = Dacite Boulder
-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.crater-stone.name = Kraatterit
+block.sand-water.name = Vesi hiekalla
+block.darksand-water.name = Vesi tummalla hiekalla
+block.char.name = Hiili
+block.dacite.name = Dasiitti
+block.rhyolite.name = Ryoliitti
+block.dacite-wall.name = Dasiittiseinä
+block.dacite-boulder.name = Dasiittilohkare
+block.ice-snow.name = Jäinen lumi
+block.stone-wall.name = Kiviseinä
+block.ice-wall.name = Jääseinä
+block.snow-wall.name = Lumiseinä
+block.dune-wall.name = Dyyniseinä
 block.pine.name = Mänty
-block.dirt.name = Dirt
-block.dirt-wall.name = Dirt Wall
-block.mud.name = Mud
+block.dirt.name = Multa
+block.dirt-wall.name = Multaseinä
+block.mud.name = Muta
 block.white-tree-dead.name = Valkoinen kuollut puu
 block.white-tree.name = Valkoinen puu
-block.spore-cluster.name = Spore Cluster
+block.spore-cluster.name = Itiöryhmä
 block.metal-floor.name = Metallilattia 1
 block.metal-floor-2.name = Metallilattia 2
 block.metal-floor-3.name = Metallilattia 3
-block.metal-floor-5.name = Metallilattia 4
+block.metal-floor-4.name = Metallilattia 4
+block.metal-floor-5.name = Metallilattia 5
 block.metal-floor-damaged.name = Vaurioitunut metallilattia
 block.dark-panel-1.name = Tumma paneeli 1
 block.dark-panel-2.name = Tumma paneeli 2
@@ -1032,304 +1614,1004 @@ 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.basalt.name = Basalt
-block.hotrock.name = Hot Rock
-block.magmarock.name = Magma Rock
+block.basalt.name = Basaltti
+block.hotrock.name = Kuumakivi
+block.magmarock.name = Magmakivi
 block.copper-wall.name = Kupariseinä
 block.copper-wall-large.name = Suuri kupariseinä
 block.titanium-wall.name = Titaaniseinä
 block.titanium-wall-large.name = Suuri titaaniseinä
 block.plastanium-wall.name = Plastaniumiseinä
 block.plastanium-wall-large.name = Suuri plastaniumiseinä
-block.phase-wall.name = Phase Wall
-block.phase-wall-large.name = Large Phase Wall
+block.phase-wall.name = Kuituseinä
+block.phase-wall-large.name = Suuri kuituseinä
 block.thorium-wall.name = Toriumiseinä
 block.thorium-wall-large.name = Suuri toriumiseinä
 block.door.name = Ovi
 block.door-large.name = Suuri ovi
 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.scorch.name = Kärvennys
+block.scatter.name = Hajonta
+block.hail.name = Rae
+block.lancer.name = Peitsi
+block.conveyor.name = Liukuhihna
+block.titanium-conveyor.name = Titaaniliukuhihna
+block.plastanium-conveyor.name = Plastaniumliukuhihna
+block.armored-conveyor.name = Panssaroitu liukuhihna
+block.junction.name = Risteys
 block.router.name = Reititin
-block.distributor.name = Distributor
+block.distributor.name = Jakaja
 block.sorter.name = Lajittelija
-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.inverted-sorter.name = Käänteinen Lajittelija
+block.message.name = Viesti
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
+block.illuminator.name = Lamppu
+block.overflow-gate.name = Ylivuotoportti
+block.underflow-gate.name = Alivuotoportti
+block.silicon-smelter.name = Piinsulatin
+block.phase-weaver.name = Kiihtokutoja
+block.pulverizer.name = Jauhaja
+block.cryofluid-mixer.name = Kryolitkusekoittaja
+block.melter.name = Sulattaja
+block.incinerator.name = Polttaja
+block.spore-press.name = Itiöpuristin
+block.separator.name = Erottelija
+block.coal-centrifuge.name = Hiilisentrifugi
+block.power-node.name = Sähkötolppa
+block.power-node-large.name = Iso sähkötolppa
+block.surge-tower.name = Korkeajännitetorni
+block.diode.name = Akkudiodi
 block.battery.name = Akku
 block.battery-large.name = Suuri akku
-block.combustion-generator.name = Combustion Generator
+block.combustion-generator.name = Aggregaatti
 block.steam-generator.name = Höyrygeneraattori
-block.differential-generator.name = Differential Generator
+block.differential-generator.name = Lämpöerogeneraattori
 block.impact-reactor.name = Törmäysreaktori
-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 Source
-block.unloader.name = Unloader
-block.vault.name = Vault
-block.wave.name = Wave
+block.mechanical-drill.name = Mekaaninen pora
+block.pneumatic-drill.name = Pneumaattinen pora
+block.laser-drill.name = Laserpora
+block.water-extractor.name = Kaivo
+block.cultivator.name = Kultivaattori
+block.conduit.name = Putki
+block.mechanical-pump.name = Mekaaninen pumppu
+block.item-source.name = Tavaralähde
+block.item-void.name = Tavaratyhjiö
+block.liquid-source.name = Nestelähde
+block.liquid-void.name = Nestetyhjiö
+block.power-void.name = Virtatyhjiö
+block.power-source.name = Virtalähde
+block.unloader.name = Purkaja
+block.vault.name = Holvi
+block.wave.name = Aalto
 block.tsunami.name = Tsunami
-block.swarmer.name = Swarmer
+block.swarmer.name = Parvi
 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.ripple.name = Aaltoilija
+block.phase-conveyor.name = Kiihtoliukuhihna
+block.bridge-conveyor.name = Siltaliukuhihna
+block.plastanium-compressor.name = Plastaniumkompressori
+block.pyratite-mixer.name = Rikkikiisusekoittaja
+block.blast-mixer.name = Räjähdesekoittaja
 block.solar-panel.name = Aurinkopaneeli
 block.solar-panel-large.name = Suuri aurinkopaneeli
-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 = Nestesäiliö
-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.oil-extractor.name = Öljykaivo
+block.repair-point.name = Korjauspiste
+block.repair-turret.name = Korjaustykki
+block.pulse-conduit.name = Pulssiputki
+block.plated-conduit.name = Päällystetty putki
+block.phase-conduit.name = Vaihdeputki
+block.liquid-router.name = Nestereititin
+block.liquid-tank.name = Nestestankki
+block.liquid-container.name = Nestesäiliö
+block.liquid-junction.name = Nesteristeys
+block.bridge-conduit.name = Siltaputki
+block.rotary-pump.name = Pyörivä pumppu
+block.thorium-reactor.name = Toriumreaktori
 block.mass-driver.name = Massalinko
-block.blast-drill.name = Airblast Drill
-block.thermal-pump.name = Thermal Pump
+block.blast-drill.name = Ilmapurkauspora
+block.impulse-pump.name = Lämpöpumppu
 block.thermal-generator.name = Lämpögeneraattori
-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.surge-smelter.name = Jännitesulatusuuni
+block.mender.name = Korjaaja
+block.mend-projector.name = Korjausprojektori
+block.surge-wall.name = Jännitemuuri
+block.surge-wall-large.name = Suuri jännitemuuri
 block.cyclone.name = Sykloni
-block.fuse.name = Fuse
-block.shock-mine.name = Shock Mine
-block.overdrive-projector.name = Overdrive Projector
-block.force-projector.name = Force Projector
+block.fuse.name = Sulake
+block.shock-mine.name = Shokkimiina
+block.overdrive-projector.name = Yliajoprojektori
+block.force-projector.name = Kilpiprojektori
 block.arc.name = Kaari
-block.rtg-generator.name = RTG Generator
+block.rtg-generator.name = RTG-generaattori
 block.spectre.name = Haamu
 block.meltdown.name = Sulamispiste
 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
-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.container.name = Säiliö
+block.launch-pad.name = Laukaisualusta
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.name = Segmentti
+block.ground-factory.name = Maatehdas
+block.air-factory.name = Ilmatehdas
 
-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
+block.naval-factory.name = Laivatehdas
+block.additive-reconstructor.name = Additiivinen jälleenrakentaja
+block.multiplicative-reconstructor.name = Multiplikatiivinen jälleenrakentaja
+block.exponential-reconstructor.name = Eksponentiaalinen jälleenrakentaja
+block.tetrative-reconstructor.name = Tetratiivinen jälleenrakentaja
+block.payload-conveyor.name = Lastiliukuhihna
+block.payload-router.name = Lastireititin
+block.duct.name = Putki
+block.duct-router.name = Putkireititin
+block.duct-bridge.name = Putkisilta
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Lastityhjiö
+block.payload-source.name = Lastilähde
+block.disassembler.name = Hajottaja
+block.silicon-crucible.name = Piinsulatusuuni
+block.overdrive-dome.name = Yliajokupoli
+block.interplanetary-accelerator.name = Interplanetaarinen kiihdyttäjä
+block.constructor.name = Rakentaja
+block.constructor.description = Rakentaa rakennuksia, joiden koko on enintään 2x2 laattaa.
+block.large-constructor.name = Suuri rakentaja
+block.large-constructor.description = Rakentaa rakennuksia, joiden koko on enintään 2x2 laattaa.
+block.deconstructor.name = Lastipurkaja
+block.deconstructor.description = Purkaa rakennuksia ja yksikköjä. Palauttaa 100% rakennushinnasta.
+block.payload-loader.name = Täyttäjä
+block.payload-loader.description = Täyttää palikkoja tavaroilla ja nesteillä.
+block.payload-unloader.name = Massapurkaja
+block.payload-unloader.description = Purkaa tavaroita ja nesteitä palikoista.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Tyhjä
+block.rhyolite-crater.name = Ryoliittikraatteri
+block.rough-rhyolite.name = Karkea ryoliitti
+block.regolith.name = Regoliitti
+block.yellow-stone.name = Keltakivi
+block.carbon-stone.name = Hiilikivi
+block.ferric-stone.name = Rautakivi
+block.ferric-craters.name = Rautakraatterit
+block.beryllic-stone.name = Beryllikivi
+block.crystalline-stone.name = Kiteinen kivi
+block.crystal-floor.name = Kidelattia
+block.yellow-stone-plates.name = Keltakivilaatat
+block.red-stone.name = Punakivi
+block.dense-red-stone.name = Tiheä punakivi
+block.red-ice.name = Punajää
+block.arkycite-floor.name = Arkysiittilattia
+block.arkyic-stone.name = Arkyinen lattia
+block.rhyolite-vent.name = Ryoliittipurkaus
+block.carbon-vent.name = Hiilipurkaus
+block.arkyic-vent.name = Arkyinen purkaus
+block.yellow-stone-vent.name = Keltakivipurkaus
+block.red-stone-vent.name = Punakivipurkaus
+block.crystalline-vent.name = Kiteinen purkaus
+block.redmat.name = Punamatto
+block.bluemat.name = Sinimatto
+block.core-zone.name = Ydinpohja
+block.regolith-wall.name = Regoliittiseinä
+block.yellow-stone-wall.name = Keltakiviseinä
+block.rhyolite-wall.name = Ryoliittiseinä
+block.carbon-wall.name = Hiiliseinä
+block.ferric-stone-wall.name = Rautakiviseinä
+block.beryllic-stone-wall.name = Beryllikiviseinä
+block.arkyic-wall.name = Arkyinen seinä
+block.crystalline-stone-wall.name = Kiteinen kiviseinä
+block.red-ice-wall.name = Punajääseinä
+block.red-stone-wall.name = Punakiviseinä
+block.red-diamond-wall.name = Punatimanttiseinä
+block.redweed.name = Punaruoho
+block.pur-bush.name = Purpensas
+block.yellowcoral.name = Keltakoralli
+block.carbon-boulder.name = Hiililohkare
+block.ferric-boulder.name = Rautalohkare
+block.beryllic-boulder.name = Beryllilohkare
+block.yellow-stone-boulder.name = Keltakivilohkare
+block.arkyic-boulder.name = Arkyinen lohkare
+block.crystal-cluster.name = Kiderykelmä
+block.vibrant-crystal-cluster.name = Energinen kiderykelmä
+block.crystal-blocks.name = Kidepalikat
+block.crystal-orbs.name = Kidepallot
+block.crystalline-boulder.name = Kiteinen lohkare
+block.red-ice-boulder.name = Punajäälohkare
+block.rhyolite-boulder.name = Ryoliittilohkare
+block.red-stone-boulder.name = Punakivilohkare
+block.graphitic-wall.name = Grafiittiseinä
+block.silicon-arc-furnace.name = Piikaariuuni
+block.electrolyzer.name = Elektrolysoija
+block.atmospheric-concentrator.name = Ilmantiivistäjä
+block.oxidation-chamber.name = Hapetuskammio
+block.electric-heater.name = Sähkölämmitin
+block.slag-heater.name = Kuonalämmitin
+block.phase-heater.name = Kiihtolämmitin
+block.heat-redirector.name = Lämmönsiirtäjä
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Kuonahöyrystäjä
+block.carbide-crucible.name = Karbidivalimo
+block.slag-centrifuge.name = Kuonasentrifugi
+block.surge-crucible.name = Jännitevalimo
+block.cyanogen-synthesizer.name = Syanogeenisyntetisoija
+block.phase-synthesizer.name = Kiihtosyntetisoija
+block.heat-reactor.name = Lämpöreaktori
+block.beryllium-wall.name = Berylliummuuri
+block.beryllium-wall-large.name = Suuri berylliummuuri
+block.tungsten-wall.name = Volframimuuri
+block.tungsten-wall-large.name = Suuri volframimuuri
+block.blast-door.name = Räjähdysovi
+block.carbide-wall.name = Karbidimuuri
+block.carbide-wall-large.name = Suuri karbidimuuri
+block.reinforced-surge-wall.name = Vahvistettu jännitemuuri
+block.reinforced-surge-wall-large.name = Suuri vahvistettu jännitemuuri
+block.shielded-wall.name = Kilpimuuri
+block.radar.name = Tutka
+block.build-tower.name = Rakennustorni
+block.regen-projector.name = Regeneraatioprojektori
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Kenttäprojektori
+block.large-shield-projector.name = Suuri kenttäprojektori
+block.armored-duct.name = Haarniskoitu putki
+block.overflow-duct.name = Ylivuotoputki
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Putkipurkaja
+block.surge-conveyor.name = Jänniteliukuhihna
+block.surge-router.name = Jännitereititin
+block.unit-cargo-loader.name = Lastauspiste
+block.unit-cargo-unload-point.name = Rahdinpurkaja
+block.reinforced-pump.name = Vahvistettu pumppu
+block.reinforced-conduit.name = Vahvistettu johdin
+block.reinforced-liquid-junction.name = Vahvistettu nesteristeys
+block.reinforced-bridge-conduit.name = Vahvistettu siltajohdin
+block.reinforced-liquid-router.name = Vahvistettu nestereititin
+block.reinforced-liquid-container.name = Vahvistettu nestesäiliö
+block.reinforced-liquid-tank.name = Vahvistettu nestetankki
+block.beam-node.name = Sädetolppa
+block.beam-tower.name = Sädetorni
+block.beam-link.name = Sädelinkki
+block.turbine-condenser.name = Turbiinitiivistäjä
+block.chemical-combustion-chamber.name = Kemiallinen polttokammio
+block.pyrolysis-generator.name = Pyrolyysigeneraattori
+block.vent-condenser.name = Purkaustiivistäjä
+block.cliff-crusher.name = Kallionmurskaaja
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasmapora
+block.large-plasma-bore.name = Suuri plasmapora
+block.impact-drill.name = Iskupora
+block.eruption-drill.name = Purkauspora
+block.core-bastion.name = Linnake-ydin
+block.core-citadel.name = Linnoitus-ydin
+block.core-acropolis.name = Akropolis-ydin
+block.reinforced-container.name = Vahvistettu säiliö
+block.reinforced-vault.name = Vahvistettu holvi
+block.breach.name = Murros
+block.sublimate.name = Härme
+block.titan.name = Titaani
+block.disperse.name = Hälvennys
+block.afflict.name = Aiheuttaja
+block.lustre.name = Kiilto
+block.scathe.name = Vahinko
+block.tank-refabricator.name = Tankkijälleenrakentaja
+block.mech-refabricator.name = Robottijälleenrakentaja
+block.ship-refabricator.name = Ilma-alusjälleenrakentaja
+block.tank-assembler.name = Tankkikokoaja
+block.ship-assembler.name = Ilma-aluskokoaja
+block.mech-assembler.name = Robottikokoaja
+block.reinforced-payload-conveyor.name = Vahvistettu lastiliukuhihna
+block.reinforced-payload-router.name = Vahvistettu lastireititin
+block.payload-mass-driver.name = Lastimassalinko
+block.small-deconstructor.name = Pieni hajottaja
+block.canvas.name = Kanvaasi
+block.world-processor.name = Maailmaprosessori
+block.world-cell.name = Maailmasolu
+block.tank-fabricator.name = Tankkirakentaja
+block.mech-fabricator.name = Robottirakentaja
+block.ship-fabricator.name = Ilma-alusrakentaja
+block.prime-refabricator.name = Ensiluokkainen jälleenrakentaja
+block.unit-repair-tower.name = Yksikönkorjaustorni
+block.diffuse.name = Diffuusi
+block.basic-assembler-module.name = Yksinkertainen kokoajamoduuli
+block.smite.name = Isku
+block.malign.name = Pahantahto
+block.flux-reactor.name = Virtausreaktori
+block.neoplasia-reactor.name = Syöpäreaktori
 
-team.blue.name = sininen
+block.switch.name = Kytkin
+block.micro-processor.name = Mikroprosessori
+block.logic-processor.name = Logiikkaprosessori
+block.hyper-processor.name = Hyperprosessori
+block.logic-display.name = Logiikkanäyttö
+block.large-logic-display.name = Iso logiikkanäyttö
+block.memory-cell.name = Muistisolu
+block.memory-bank.name = Muistipankki
+team.malis.name = Malis
 team.crux.name = punainen
 team.sharded.name = orange
-team.orange.name = oranssi
-team.derelict.name = derelict
+team.derelict.name = hylky
 team.green.name = vihreä
-team.purple.name = violetti
 
-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
-tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building.
-tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
-tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
-tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
-tutorial.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 resources can then be used to research new technology.\n\n[accent]Press the launch button.
+team.blue.name = sininen
+hint.skip = Ohita
+hint.desktopMove = Käytä [accent][[WASD][] -näppäimiä liikkuaksesi.
+hint.zoom = [accent]Scrollaa[] zoomataksesi sisään tai ulos.
+hint.desktopShoot = Paina [accent][[Hiiren vasen][] ampuaksesi.
+hint.depositItems = Siirtääksesi tavaroita, vedä aluksestasi ytimeen.
+hint.respawn = Uudelleensyntyäksesi aluksena, paina näppäintä [accent][[V][].
+hint.respawn.mobile = Olet siirtynyt hallitsemaan yksikköä/rakennusta. Uudelleensyntyäksesi aluksena, [accent]paina avataria ylhäällä vasemmalla.[]
+hint.desktopPause = Paina [accent][[Välilyöntiä][] pysäyttääksesi ja jatkaaksesi peliä.
+hint.breaking = Paina [accent]Hiiren oikea[] ja vedä rikkoaksesi palikoita.
+hint.breaking.mobile = Aktivoi \ue817 [accent]vasara[] alhaalla oikealla ja kosketa rikkoaksesi palikoita.\n\nPidä sormeasi pohjassa hetki ja vedä poistaaksesi valinnalla.
+hint.blockInfo = Näytä tietoa palikasta valitsemalla se [accent]rakennusvalikossa[], ja painamalla sitten [accent][[?][]-nappia oikella.
+hint.derelict = [accent]Hylky[]-rakennukset ovat hajonneita jäännöksiä vanhoista tukikohdista, jotka eivät enää toimi.\n\nNämä rakennukset on mahdollista [accent]purkaa[] resurssien saamiseksi.
+hint.research = Käytä \ue875 [accent]Tutki[]-nappia tutkiaksesi uutta teknologiaa.
+hint.research.mobile = Käytä \ue875 [accent]Tutki[]-nappia \ue88c[accent]Valikossa[] tutkiaksesi uutta teknologiaa.
+hint.unitControl = Pidä pohjassa [accent][[Vasen ctrl][] ja [accent]klikkaa[] hallitaksesi ystävällisiä yksikköjä tai rakennuksia.
+hint.unitControl.mobile = [accent][[Kaksoisklikkaa][] hallitaksesi ystävällisiä yksikköjä tai rakennuksia.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Kun olet kerännyt riittävästi resursseja, voit [accent]Laukaista[] valitsemalla läheisen sektorin \ue827[accent]Kartasta[] alhaalla oikealla.
+hint.launch.mobile = Kun olet kerännyt riittävästi resursseja, voit [accent]Laukaista[] valitsemalla läheisen sektorin \ue827[accent]Kartasta[], joka löytyy \ue88c[accent]Valikosta[].
+hint.schematicSelect = Pidä näppäintä [accent][[F][] pohjassa ja vedä valitaksesi palikoita kopioitavaksi ja liitettäväksi.\n\n[accent] Paina [[Hiiren keskinäppäin][] kopioidaksesi yksittäisen palikan.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Pidä näppäintä [accent][[Vasen ctrl][] pohjassa, kun vedät liukuhihnoja luodaksesi polun automaattisesti.
+hint.conveyorPathfind.mobile = Salli \ue844[accent]Viisto tila[] ja vedä liukuhihnoja luodaksesi polun automaattisesti.
+hint.boost = Pidä [accent][[Vasen shift][] pohjassa lentääksesi esteiden yli yksikölläsi.\n\nVain harvoilla maajoukoilla on tehostin.
+hint.payloadPickup = Paina näppäintä [accent][[[] lastataksesi pieniä palikoita ja joukkoja.
+hint.payloadPickup.mobile = [accent]Paina ja pidä pohjassa[] pientä palikkaa tai yksikköä lastataksesi sen.
+hint.payloadDrop = Paina [accent]][] pudottaaksesi lastin.
+hint.payloadDrop.mobile = [accent]Paina ja pidä pohjassa[] tyhjässä kohdassa pudottaaksesi lastin sinne.
+hint.waveFire = [accent]Aalto[]-tykit, jotka on ladattu vedellä, sammuttavat kantamalla olevia tulipaloja automaattisesti.
+hint.generator = \uf879 [accent]Aggregaatit[] polttavat hiiltä ja lähettävät energiaa viereisille palikoille.\n\nEnergiansiirtokantamaa voi laajentaa \uf87f[accent]Sähkötolpilla[].
+hint.guardian = [accent]Vartija[]yksiköt ovat haarniskoituja. Heikot ammukset kuten [accent]kupari[] ja [accent]lyijy[][scarlet]eivät ole tehokkaita[].\n\nKäytä korkeamman tason tykkejä tai \uf835[accent]Grafiittia[] \uf861Duon/\uf859Salvon ammuksena voittaaksesi vartijan.
+hint.coreUpgrade = Ytimen voi päivittää [accent]sijoittamalla suuremman tason ytimen niiden päälle[].\n\nSijoita \uf868[accent]Pohjaus[]-ydin \uf869[accent]Siru[]-ytimen päälle. Varmista, että tiellä ei ole esteitä.
+hint.presetLaunch = Harmaisiin [accent]laskeutumisaluesektoreihin[], kuten [accent]Jäätyneisiin metsiin[], voi laukaista kaikkialta. Ne eivät vaadi valtausta tai läheistä aluetta.\n\n[accent]Numeroidut sektorit[], kuten tämä, ovat [accent]valinnaisia[].
+hint.presetDifficulty = Tässä sektorissa on [scarlet]korkea uhkataso[].\nLaukaiseminen korkean uhkatason sektoreihin [accent]ei ole suositeltua[] ilman asianmukaista teknologiaa ja valmistautumista.
+hint.coreIncinerate = Kun ydin on täynnä tiettyä tavaraa, ylimääräinen samanlainen tavara, joa tulee ytimeen, [accent]höyrystetään[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
-item.copper.description = 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 insulation.
-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.
+item.copper.description = Yksinkertaisin rakennemateriaali. Käytetään laajalti kaikenlaisissa palikoissa.
+item.copper.details = Kupari. Epänormaalin yleinen metalli Serpulolla. Vahvistamattomana rakenteellisesti heikko.
+item.lead.description = Yksinkertainen aloitusmateriaali. Käytetään paljon elektroniikassa ja nesteensiirtopalikoissa.
+item.lead.details = Tiheä. Reagoimaton. Laajalti käytetty akuissa.\nHuomio: Todennäköisesti myrkyllistä biologisille elämänmuodoille. Ei sillä, että niitä olisi täällä paljon jäljellä.
+item.metaglass.description = Supervahva lasiyhdiste. Laajalti käytetty nesteiden siirtoon ja varastointiin.
+item.graphite.description = Mineralisoitunutta hiiltä, jota käytetään ammuksena ja sähköeristeenä.
+item.sand.description = Yleinen materiaali, jota käytetään paljon sulatuksessa, sekä seostamisessa, että juoksutteena.
+item.coal.description = Fossilisoitunutta kasviainesta, muodostunut kauan ennen kylvötapahtumaa. Käytetään runsaasti polttoaineena ja resurssien tuotannossa.
+item.coal.details = Vaikuttaa olevan fossilisoitunutta kasviainesta, muodostunut kauan ennen kylvötapahtumaa.
+item.titanium.description = Harvinainen superkevyt metalli, jota käytetään paljolti nesteensiirtoon, poriin ja ilma-aluksiin.
+item.thorium.description = Tiheä, radioaktiivinen metalli, käytetty rakenteellisena tukena ja ydinpolttoaineena.
+item.scrap.description = Jäljelle jääneitä rippeitä vanhoista rakennuksista ja yksiköistä. Sisältää pieniä määriä monia eri metalleja.
+item.scrap.details = Jäljelle jääneitä rippeitä vanhoista rakennuksista ja yksiköistä.
+item.silicon.description = Äärimmäisen hyödyllinen puolijohde. Käytetään aurinkopaneeleissa, monimutkaisessa elektroniikassa ja hakeutuvana ammuksena tykeissä.
+item.plastanium.description = Kevyt ja taipuisa materiaali, jota käytetään kehittyneissä ilma-aluksissa sirpaleammuksissa.
+item.phase-fabric.description = Lähes painoton aine, jota käytetään kehittyneessä elektroniikassa ja itsekorjautuvassa teknologiassa.
+item.surge-alloy.description = Kehittynyt seos, jolla on ainutlaatuisia sähköisiä ominaisuuksia.
+item.spore-pod.description = Synteettisistä itiöistä koostuva palko, joka on syntetisoitu ilmakehän tiivistymistä teollisuuden tarkoituksiin. Käytetään öljyn valmistamisessa, räjähteissä ja polttoaineissa.
+item.spore-pod.details = Itiöt. Todennäköisesti synteettinen elämänmuoto. Tuottavat kaasuja, jotka ovat myrkyllisiä muulle biologiselle elämälle. Extremely invasive. Highly flammable in certain conditions.
+item.blast-compound.description = Epävakaa yhdiste, jota käytetään pommeissa ja räjähteissä. Syntetisoitu itiöpaloista ja muista räjähdysherkistä aineista. Käyttöä polttoaineena ei suositella.
+item.pyratite.description = Äärimmäisen syttyvä aine, jota käytetään tulipaloja aiheuttavissa aseissa.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
+liquid.water.description = Hyödyllisin neste. Yleisesti käytetty koneiden viilentämiseen ja jätteiden prosessointiin.
+liquid.slag.description = Monia erilaisia sulia metalleja sekoitettuna yhdeksi seokseksi. Voidaan erottaa mineraaliainesosiinsa tai suihkuttaa vihollisyksiköihin aseena.
+liquid.oil.description = Kehittyneessä materiaalituotannossa käytetty neste. Voidaan muuttaa hiileksi tai ruiskuttaa ja sytyttää aseena.
+liquid.cryofluid.description = Reagoimaton, ruostuttamaton neste, jota valmistetaan vedestä ja titaanista. Omaa äärimmäisen korkean lämpökapasiteetin. Käytetään paljolti jäähdytysnesteenä.
+liquid.arkycite.description = Käytetään kemiallisissa reaktioissa sähköntuotantoa ja materiaalisynteesiä varten.
+liquid.ozone.description = Käytetään hapettamisaineena aineentuotannossa ja polttoaineena. Kohtalaisen räjähdysherkkää.
+liquid.hydrogen.description = Käytetään resurssien louhinnassa, yksikönväsäyksessä ja rakennelmien korjauksessa. Tulenarkaa.
+liquid.cyanogen.description = Käytetään ampumatarvikkeisiin, edistyneiden yksiköiden valmistamiseen ja monenlaisiin reaktioihin edistyneissä palikoissa. Hyvin tulenarkaa.
+liquid.nitrogen.description = Käytetään resurssien louhinnassa, kaasunluonnissa and yksikönväsäyksessä. Reagoimaton.
+liquid.neoplasm.description = Syöpäreaktorin vaarallinen luonnontieteellinen sivutuote. Leviää vikkelästi koskemiinsa märkiin palikoihin, vahingoittaen niitä. Tahmeaa.
+liquid.neoplasm.details = Kasvain. Hallitsematon, vinhasti jakautuvien synteettisten solujen liejumainen massa. Kestää lämpöä. Äärimmäisen vaarallinen millekään rakennukselle jossa on tippaakaan vettä.\n\nLiian monimutkainen ja epävakaa normitutkimukselle. Mahdollisia käyttötarkoituksia ei tunneta. Suositellaan polttamaan kuona-altaassa.
+block.derelict = \uf77e [lightgray]Hylky
+block.armored-conveyor.description = Siirtää tavaroita samalla nopeudella kuin titaaniliukuhihna, mutta on haarniskoidumpi. Ei hyväksy sisääntuloa sivuilta miltään muulta, kuin toisilta liukuhihnoilta.
+block.illuminator.description = Pieni, kompakti ja säädettävä valonlähde. Tarvitsee energiaa toimiakseen.
 
-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 = A combination splitter and router. 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 and more connections.
-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 a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping.
-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 or scrap 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 energy turret. Fires three piercing beams 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.
+block.message.description = Varastoi viestin. Käytetään viestintään liittolaisten välillä.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
+block.graphite-press.description = Kompressoi hiilenpaloja puhtaiksi grafiittilevyiksi.
+block.multi-press.description = Päivitetty versio grafiittipuristimesta. Hyödyntää vettä ja energiaa hiilen prosessoimiseen grafiitiksi nopeasti ja tehokkaasti.
+block.silicon-smelter.description = Pelkistää hiekkaa puhtaalla hiilellä. Tuottaa piitä.
+block.kiln.description = Sulattaa hiekkaa ja lyijyä metalasina tunnetuksi yhdisteeksi. Tarvitsee pieniä määriä energiaa toimiakseen.
+block.plastanium-compressor.description = Tuottaa plastaniumia öljystä ja titaanista.
+block.phase-weaver.description = Syntetisoi kuitua radioaktiivisesta toriumista ja hiekasta. Tarvitsee massiivisia määriä energiaa toimiakseen.
+block.surge-smelter.description = Yhdistää titaania, lyijyä, piitä ja kuparia jänniteseokseksi.
+block.cryofluid-mixer.description = Sekoittaa vettä ja hienoa titaanipulveria kryonesteeksi. Olennainen toriumreaktorin käytölle.
+block.blast-mixer.description = Murskaa ja sekoittaa itiörykelmiä pyratiitin kanssa räjähdeyhdisteeksi.
+block.pyratite-mixer.description = Sekoittaa hiiltä, lyijyä ja hiekkaa hyvin tulenaraksi pyratiitiksi.
+block.melter.description = Sulattaa romua kuonaksi jatkojalostusta varten tai käytettäväksi Aalto-tykeissä.
+block.separator.description = Jakaa kuonan mineraaliosiinsa. Tuottaa jäähtyneen tuloksen.
+block.spore-press.description = Tuottaa öljyä puristamalla itiöpalkoja äärimmäisessä paineessa.
+block.pulverizer.description = Murskaa romua hienoksi hiekaksi.
+block.coal-centrifuge.description = Kiinteyttää öljyä hiilipaloiksi.
+block.incinerator.description = Höyrystää kaiken tavaran ja nesteen, joka sinne syötetään.
+block.power-void.description = Tyhjentää kaiken energian, joka siihen syötetään. Vain hiekkalaatikko.
+block.power-source.description = Tuottaa äärettömästi energiaa. Vain hiekkalaatikko.
+block.item-source.description = Tuottaa äärettömästi tavaroita. Vain hiekkalaatikko.
+block.item-void.description = Tuhoaa kaikki syötetyt tavarat. Vain hiekkalaatikko.
+block.liquid-source.description = Tuottaa äärettömästi nesteitä. Vain hiekkalaatikko.
+block.liquid-void.description = Tuhoaa kaikki syötetyt nesteet. Vain hiekkalaatikko.
+block.payload-source.description = Tuottaa äärettömästi lastia. Vain hiekkalaatikko.
+block.payload-void.description = Tuhoaa kaiken syötetyn lastin. Vain hiekkalaatikko.
+block.copper-wall.description = Halpa puolustuspalikka.\nHyödyllinen ytimen ja tykkien puolustamiseen ensimmäisten muutaman tason aikana.
+block.copper-wall-large.description = Halpa puolustuspalikka.\nHyödyllinen ytimen ja tykkien puolustamiseen ensimmäisten muutaman tason aikana.\nKattaa useita laattoja.
+block.titanium-wall.description = Kohtalaisen vahva puolustuspalikka.\nAntaa kohtuullisen suojan vihollisilta.
+block.titanium-wall-large.description = Kohtalaisen vahva puolustuspalikka.\nAntaa kohtuullisen suojan vihollisilta.\nKattaa useita laattoja.
+block.plastanium-wall.description = Omalaatuinen muuri, joka absorboi sähköpurkauksia ja estää automaattiset sähkötolppayhdistykset.
+block.plastanium-wall-large.description = Omalaatuinen muuri, joka absorboi sähköpurkauksia ja estää automaattiset sähkötolppayhdistykset.\nKattaa useita laattoja.
+block.thorium-wall.description = Vahva puolustuspalikka.\nSuojaa vihollisilta kelvollisesti.
+block.thorium-wall-large.description = Vahva puolustuspalikka.\nSuojaa vihollisilta kelvollisesti.\nKattaa useita laattoja.
+block.phase-wall.description = Muuri, joka on päällystetty erityisellä kiihtokuitupohjaisella heijastavalla yhdisteellä. Torjuu useimmat ammukset näiden törmätessä.
+block.phase-wall-large.description = Muuri, joka on päällystetty erityisellä kiihtokuitupohjaisella heijastavalla yhdisteellä. Torjuu useimmat ammukset näiden törmätessä.\nKattaa useita laattoja.
+block.surge-wall.description = Äärimmäisen kestävä puolustava palikka.\nVaraa jännitteen ammusten iskeytyessä, vapauttaen sen satunnaisesti.
+block.surge-wall-large.description = Äärimmäisen kestävä puolustava palikka.\nVaraa jännitteen ammusten iskeytyessä, vapauttaen sen satunnaisesti.\nKattaa useita laattoja.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Pieni ovi. Voidaan avata ja sulkea painamalla.
+block.door-large.description = Suuri ovi. Voidaan avata ja sulkea painamalla.\nKattaa useita laattoja.
+block.mender.description = Korjaa läheisiä palikoita ajoittain. Pitää puolustuksia korjattuna tasojen aikana ja välillä.\nKäyttää valinnaisesti piitä tehostaakseen kantamaa ja tehoa.
+block.mend-projector.description = Päivitetty versio korjaajasta. Korjaa palikoita läheisyydessään.\nKäyttää vaihtoehtoisesti kiihtokuitua tehostaakseen kantamaa ja tehoa.
+block.overdrive-projector.description = Nostaa läheisten rakennusten toimintanopeutta.\nKäyttää vaihtoehtoisesti kiihtokuitua kantaman ja tehon nostamiseen.
+block.force-projector.description = Luo ympärilleen kuusikulmaisen voimakentän suojaten kentän sisällä olevia rakennuksia ja yksiköitä vahingolta.\nYlikuumenee, jos joutuu kestämään liian suurta vahinkoa. Käyttää valinnaisesti jäähdytysnestettä ylikuumenemisen estämiseksi. Kilven kokoa voi kasvattaa käyttämällä kiihtokuitua.
+block.shock-mine.description = Vahingoittaa päällensa astuvia vihollisia. Vihollisille lähes näkymätön.
+block.conveyor.description = Yksinkertainen tavaransiirtopalikka. Siirtää tavaroita eteenpäin ja syöttää ne automaattisesti rakennuksiin. Käännettävä.
+block.titanium-conveyor.description = Kehittynyt tavaransiirtopalikka. Siirtää tavaroita nopeammin kuin perusliukuhihna.
+block.plastanium-conveyor.description = Siirtää tavaroita kimppuina.\nOttaa tavaroita takaosasta, ja syöttää ne kolmeen suuntaan etuosasta.
+block.junction.description = Toimii kahden leikkaavan liukuhihnan välisenä siltana. Hyödyllinen tilanteissa, joissa kaksi erilaista liukuhihnaa siirtävät eri materiaaleja eri paikkoihin.
+block.bridge-conveyor.description = Kehittynyt tavaransiirtopalikka. Mahdollistaa tavaroiden siirtämisen enintäään kolmen laatan päähän minkä tahansa maaston tai rakennuksen yli.
+block.phase-conveyor.description = Kehittynyt tavaransiirtopalikka. Käyttää energiaa teleportatakseen tavaroita yhdistettyyn kiihtokuituliukuhihnaan useiden laattojen yli.
+block.sorter.description = Lajittelee tavaroita. Jos tavara vastaa valintaa, se siirtyy eteenpäin. Muussa tapauksessa tavara siirtyy vasemmalle tai oikealle.
+block.inverted-sorter.description = Käsittelee tavaroita normaalin lajittelijan tavoin, mutta syöttääkin valitut tavarat sivuille.
+block.router.description = Ottaa vastaan tavaroita ja syöttää ne tasapuolisesti enintään kolmeen eri suuntaan. Hyödyllinen materiaalien jakamiseen yhdestä lähteestä moneen kohteeseen.\n\n[scarlet]Älä koskaan käytä tehdassyötteiden vieressä, koska tehtaiden ulostulo tulee jumittamaan ne.[]
+block.router.details = Välttämätön paha. Tehdassyötteiden vieressä käyttämistä ei suositella, koska tehtaiden ulostulo jumittaa ne.
+block.distributor.description = Kehittynyt reititin. Jakaa tavarat tasaisesti enintään seitsemään eri suuntaan.
+block.overflow-gate.description = Yhdistetty puolittaja ja reititin. Syöttää sivuille vain, jos etu-ulostulo on estetty.
+block.underflow-gate.description = Ylivuotoportin vastakohta. Syöttää eteen, jos ulostulot sivuille ovat estetty.
+block.mass-driver.description = Äärimmäinen tavaransiirtopalikka. Kerää useita tavaroita ja ampuu ne sitten suuren matkan yli toiseen massalinkoon. Tarvitsee energiaa toimiakseen.
+block.mechanical-pump.description = Halpa pumppu hitaalla ulostulolla, mutta ilman energiantarvetta.
+block.rotary-pump.description = Kehittyneempi pumppu, pumppaa enemmän vettä mutta vaatii enemmän virtaa.
+block.impulse-pump.description = Ultimaattinen pumppu.
+block.conduit.description = Yksinkertainen nesteensiirtopalikka. Siirtää nesteitä eteenpäin. Käytetään pumppujen ja muiden putkien yhteydessä.
+block.pulse-conduit.description = Kehittynyt nesteensiirtopalikka. Kuljettaa nesteitä nopeammin ja varastoi enemmän, kuin normaali putki.
+block.plated-conduit.description = Siirtää nesteitä samalla nopeudella, kuin pulssiputki, mutta omaa paremman suojauksen. Ei hyväksy syötteitä sivuilta miltään paitsi toisilta putkilta.\nVuotaa vähemmän.
+block.liquid-router.description = Ottaa nesteitä vastaan yhdestä suunnasta ja syöttää ne tasaisesti enintään kolmeen toiseen suuntaan. Voi myös varastoida jonkin verran nestettä. Hyödyllinen nesteiden jakamiseen yhdestä lähteestä moneen kohteeseen.
+block.liquid-container.description = Varastoi huomattavan määrän nestettä. Syöttää nestettä kaikille sivuille, samaan tapaan, kuin nestereititin.
+block.liquid-tank.description = Varastoi suuren määrän nestettä. Käytä puskurien luomiseen tilanteissa, joissa kulutus ei ole vakio, tai varmuusvarana elintärkeiden palikkojen jäähdytyksessä.
+block.liquid-junction.description = Toimii siltana kahdelle risteävälle putkelle. Hyödyllinen tilanteissa, joissa kaksi eri putkea kuljettavat eri nesteitä eri paikkoihin.
+block.bridge-conduit.description = Kehittynyt nesteensiirtopalikka. Mahdollistaa nesteiden siirtämisen enintäään kolmen laatan päähän minkä tahansa maaston tai rakennuksen yli.
+block.phase-conduit.description = Kehittynyt nesteensiirtopalikka. Käyttää energiaa teleportatakseen nesteitä yhdistettyyn kiihtokuituliukuhihnaan useiden laattojen yli.
+block.power-node.description = Siirtää energiaa yhdistettyihin tolppiin. Tolppa vastaanottaa tai luovuttaa energiaa mihin tahansa viereiseen palikkaan.
+block.power-node-large.description = Kehittynyt sähkötolppa suuremmalla kantamalla ja suuremmalla yhdistysten enimmäismäärällä.
+block.surge-tower.description = Erittäin pitkän kantaman sähkötolppa pienemmällä yhdistysten enimmäismäärä.
+block.diode.description = Akkuenergia voi virrata tämän palikan läpi vain yhteen suuntaan, mutta vain, jos toisella puolella on vähemmän energiaa varastoituna.
+block.battery.description = Varastoi virtaa puskurina, kun energiaa on yli kulutuksen. Luovuttaa virtaa, kun energian kulutus on suurempaa, kuin tuotto.
+block.battery-large.description = Varastoi paljon enemmän energiaa, kuin tavallinen paristo.
+block.combustion-generator.description = Tuottaa energiaa polttamalla palavia materiaaleja, kuten hiiltä.
+block.thermal-generator.description = Tuottaa energiaa, kun asetetaan kuumiin paikkoihin.
+block.steam-generator.description = Kehittynyt aggregaatti. Tehokkaampi mutta vaatii lisäksi vettä höyryn tuottamiseen.
+block.differential-generator.description = Tuottaa suuria määriä energiaa. Hyödyntää lämpötilaeroa kryonesteen ja palavan rikkikiisun välillä.
+block.rtg-generator.description = Yksinkertainenja luotettava generaattori. Käyttää hajoavien radioaktiivisten yhdisteiden tuottamaa lämpöä tuottaakseen energiaa hitaalla tahdilla.
+block.solar-panel.description = Tuottaa pieniä määriä energiaa auringosta.
+block.solar-panel-large.description = Huomattavasti tehokkaampi versio tavallisesta aurinkopaneelista.
+block.thorium-reactor.description = Tuottaa merkittäviä määriä energiaa toriumista. Vaatii jatkuvaa jäähdytystä. Räjähtää voimakkaasti, jos jäähdytysnestettä ei tarjota riittävästi. Energiantuotto riippuu täysinäisyydestä perusenergiantuoton merkitessä täysinäisen reaktorin tuottoa.
+block.impact-reactor.description = Kehittynyt generaattori, joka voi tuottaa valtavia määriä energiaa huipputeholla. Tarvitsee huomattavan energiasyötön prosessin käynnistämiseksi.
+block.mechanical-drill.description = Halpa pora. Asetettuna oikeille laatoille, se tuottaa tavaroita loputtomasti hitaalla nopeudella. Pystyy kaivamaan vain perusresursseja.
+block.pneumatic-drill.description = Paranneltu pora, joka pystyy kaivamaan titaania. Kaivaa nopeammin, kuin mekaaninen pora.
+block.laser-drill.description = Mahdollistaa vieläkin nopeamman kaivamisen laserteknologian avulla, mutta tarvitsee energiaa. Kykenee kaivamaan toriumia.
+block.blast-drill.description = Ultimaattinen pora, tarvitsee paljon sähköä.
+block.water-extractor.description = Kerää pohjavettä. Käytetään tilanteissa, joissa pintavettä ei ole saatavilla.
+block.cultivator.description = Kasvattaa ilmakehän pieniä itiötiivistymiä teollisuusvalmiiksi paloiksi.
+block.cultivator.details = Pelastettua teknologiaa. Käytetään massiivisten määrien biomassaa tuottamiseen mahdollisimman tehokkaasti. Todennäköisesti nyt Serpuloa peittävien itiöiden alkuperäinen hautomo.
+block.oil-extractor.description = Käyttää suuria määriä energiaa, hiekkaa ja vettä  öljyn poraamiseen.
+block.core-shard.description = Ydinkapselin ensimmäinen iteraatio. Tuhoutuessa kaikki yhteydet alueeseen menetetään. Älä anna tämän tapahtua.
+block.core-shard.details = Ensimmäinen iteraatio. Kompakti. Itsejäljentävä. Varustettu kertakäyttöisellä laukaisumoottorilla. Ei ole suunniteltu planeettojenvälistä matkustusta varten.
+block.core-foundation.description = Ytimen toinen iteraatio. Paremmin haarniskoitu. Varastoi enemmän resursseja.
+block.core-foundation.details = Toinen iteraatio.
+block.core-nucleus.description = Ydinkapselin kolmas ja viimeinen iteraatio. Äärimmäisen hyvin panssaroitu. Varastoi massiivisia määriä resursseja.
+block.core-nucleus.details = Kolmas ja viimeinen iteraatio.
+block.vault.description = Varastoi suuren määrän jokaista tavaratyyppiä. Purkajapalikkaa voi tavaroiden palauttamiseen holvista.
+block.container.description = Varastoi pienen määrän jokaista tavaratyyppiä. Purkajapalikkaa voi tavaroiden palauttamiseen säiliöstä.
+block.unloader.description = Purkaa tavaroita säiliöstä, holvista tai ytimestä liukuhihnalle tai suoraan viereiseen palikkaan. Purettavan tavaran tyyppi voidaan vaihtaa painamalla.
+block.launch-pad.description = Laukaisee tavarajoukkoja ilman tarvetta ytimen laukaisulle.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = Pieni ja halpa tykki, hyvä maavihollisia vastaan.
+
+block.scatter.description = Olennainen tykki ilma-aluksia vastaan. Ampuu lyijy- tai romusirpalerykelmiä vihollisjoukkoihin.
+block.scorch.description = Polttaa läheisiä vihollisen maayksiköitä. Hyvin tehokas lähikantamalla.
+block.hail.description = Pieni pitkän kantaman tykistötorni.
+block.wave.description = Keskikokoinen tykki. Ampuu nestesuihkuja vihollisia kohti. Sammuttaa tulipaloja automaattisesti vedellä ladattuna.
+block.lancer.description = Keskikokoinen lasertykki maayksiköitä vastaan. Lataa ja ampuu voimakkaita energiasäteitä.
+block.arc.description = Pieni lyhyen kantaman sähkötykki. Ampuu valokaaria vihollisiin.
+block.swarmer.description = Keskikokoinen ohjustykki. Hyökkää sekä ilma- että maayksiköihin. Ampuu hakeutuvia ohjuksia.
+block.salvo.description = Suurempi ja kehittyneempi versio Duo-tykistä. Ampuu nopeita luotisarjoja vihollisiin.
+block.fuse.description = Suuri lähikantaman energiatykki. Ampuu kolme lävistävää sädettä läheisiin vihollisiin.
+block.ripple.description = Äärimmäisen voimakas tykistötorni. Ampuu kranaattirykelmiä vihollisiin pitkällä etäisyydellä.
+block.cyclone.description = Suuri tykki sekä ilma- että maajoukkoja vastaan. Ampuu räjähtäviä sirpaleammuksia läheisiin vihollisiin.
+block.spectre.description = Valtava kaksipiippuinen tykki. Ampuu suuria haarniskan läpäiseviä ammuksia ilma- ja maakohteisiin.
+block.meltdown.description = Massiivinen laserkanuuna. Lataa ja ampuu pitkäkestoisen lasersäteen lähistöllä olevia vihollisia kohti. Tarvitsee jäähdytystä toimiakseen.
+block.foreshadow.description = Ampuu pitkällä kantamalla suuren ammuksen yksittäiskohteeseen. Priorisoi vihollisia korkeimmalla elämäpisteiden enimmäismäärä.
+block.repair-point.description = Korjaa jatkuvasti lähintä vahingoittunutta yksikköä lähellään.
+block.segment.description = Vahingoittaa ja tuhoaa lähestyviä ammuksia. Ei hyökkää laserammuksiin.
+block.parallax.description = Ampuu vetosäteen, vetää ilmakohteita sisäänpäin vahingoittaen niitä samalla.
+block.tsunami.description = Ampuu voimakkaita nestesuihkuja vihollisia kohti. Sammuttaa tulipaloja automaattisesti vedellä ladattuna.
+block.silicon-crucible.description = Jalostaa piitä hiekasta ja hiilestä käyttäen rikkikiisua ylimääräisenä lämmönlähteenä. Tehokkaampi kuumissa paikoissa.
+block.disassembler.description = Erottelee kuonaa pieniksi määriksi harvinaisia mineraaliaineksia matalalla tehokkuudella. Voi tuottaa toriumia.
+block.overdrive-dome.description = Nostaa läheisten rakennusten toimintanopeutta. Tarvitsee toimiakseen kiihtokuitua ja piitä.
+block.payload-conveyor.description = Siirtää suuria lasteja, kuten joukkoja tehtaista.
+block.payload-router.description = Jakaa sisääntulolastin kolmeen ulostulosuuntaan.
+block.ground-factory.description = Tuottaa maayksiköitä. Tuotettuja yksiköitä voi käyttää suoraan tai siirtää jälleenrakentajiin paranneltavaksi.
+block.air-factory.description = Tuottaa ilmayksiköitä. Tuotettuja yksiköitä voi käyttää suoraan tai siirtää jälleenrakentajiin paranneltavaksi.
+block.naval-factory.description = Tuottaa laivayksiköitä. Tuotettuja yksiköitä voi käyttää suoraan tai siirtää jälleenrakentajiin paranneltavaksi.
+block.additive-reconstructor.description = Päivittää syötetyt joukot toiselle tasolle.
+block.multiplicative-reconstructor.description = Päivittää syötetyt joukot kolmannelle tasolle.
+block.exponential-reconstructor.description = Päivittää syötetyt joukot neljännelle tasolle.
+block.tetrative-reconstructor.description = Päivittää syötetyt joukot viidennelle ja viimeiselle tasolle.
+block.switch.description = Vaihdettava kytkin. Tilaa voi lukea ja hallita prosessoreilla.
+block.micro-processor.description = Ajaa sarjan logiikkaohjeita silmukassa. Voidaan käyttä yksiköiden ja rakennusten hallintaan.
+block.logic-processor.description = Ajaa sarjan logiikkaohjeita silmukassa. Voidaan käyttä yksiköiden ja rakennusten hallintaan. Nopeampi kuin mikroprosessori.
+block.hyper-processor.description = Ajaa sarjan logiikkaohjeita silmukassa. Voidaan käyttä yksiköiden ja rakennusten hallintaan. Nopeampi kuin logiikkaprosessori.
+block.memory-cell.description = Varastoi tietoa prosessorille.
+block.memory-bank.description = Varastoi tietoa prosessorille. Suuri kapasiteetti.
+block.logic-display.description = Näyttää mielivaltaista ggrafiikkaa prosessorista.
+block.large-logic-display.description = Näyttää mielivaltaista ggrafiikkaa prosessorista.
+block.interplanetary-accelerator.description = Massiivinen sähkömagneettinen raidetykkitorni. Kiihdyttää ytimiä pakonopeuteen interplanetaarista leviämistä varten.
+block.repair-turret.description = Korjaa jatkuvasti lähintä vahingoittunutta yksikköä lähellään. Käyttää vaihtoehtoisesti jäähdytysnestettä.
+block.core-bastion.description = Tukikohdan ydin. Panssaroitu. Mikäli tuhottu, sektori on menetetty.
+block.core-citadel.description = Tukikohdan ydin. Tosi hyvin panssaroitu. Varastoi enemmän tavaraa kuin Linnaydin.
+block.core-acropolis.description = Tukikohdan ydin. Hemmetin hyvin panssaroitu. Varastoi enemmän tavaraa kuin Sitadelliydin.
+block.breach.description = Ampuu läpäisykykyistä beryllium- tai volfhardiammusta vihollista kohti.
+block.diffuse.description = Purskaisee ammuksia leveässä kartiomuodossa. Työntää vihollisia taaksepäin.
+block.sublimate.description = Suihkuttaa liekkejä vihollista päin. Läpäisee panssarit.
+block.titan.description = Ampuu jättimäisen tykistökranaatin maavihollisia kohti. Vaatii vetyä.
+block.afflict.description = Ampuu jättimäisen, ladatun sirpalepallon. Vaatii lämmitystä.
+block.disperse.description = Pursketulittaa ilmavihollisia.
+block.lustre.description = Ampuu hidasta laseria vihollisia kohti.
+block.scathe.description = Ampuu voimakkaan ohjuksen maavihollisia kohti astetta pidempien matkojen päästä.
+block.smite.description = Pursketulittaa läpäisykykyisiä ja salamoivia luoteja.
+block.malign.description = Rumputulittaa itseohjautuvia laserpanoksia vihollista kohti. Tarvitsee laajakantoista lämmitystä.
+block.silicon-arc-furnace.description = Jalostaa piitä hiekasta ja grafiitista.
+block.oxidation-chamber.description = Vääntää berylliumista ja otsonista oksidia. Hohkaa lämpöä sivutuotteena.
+block.electric-heater.description = Lämmittää päinkohdistettuja palikoita. Vaatii hemmetisti virtaa.
+block.slag-heater.description = Lämmittää päinkohdistettuja palikoita. Vaatii kuonaa.
+block.phase-heater.description = Lämmittää päinkohdistettuja palikoita. Vaatii kiihtokuitua.
+block.heat-redirector.description = Vaihtaa kertyneen lämmön suunnan toisiin palikoihin.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Muuttaa veden vedyksi ja otsonikaasuksi.
+block.atmospheric-concentrator.description = Kerää typpeä ilmakehästä. Vaatii lämpöä.
+block.surge-crucible.description = Muodostaa ylijänniteseosta piistä ja kuonasta. Vaatii lämpöä.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Ampuu normaaleja ammuksia kaikkiin läheisiin vihollisiin.
+unit.mace.description = Ampuu liekkisuihkuja kaikkiin läheisiin vihollisiin.
+unit.fortress.description = Ampuu pitkän kantaman ammuksia maakohteisiin.
+unit.scepter.description = Ampuu ryöpyn varattuja ammuksia kaikkiin läheisiin vihollisiin.
+unit.reign.description = Ampuu ryöpyn valtavia läpäiseviä ammuksia kaikkiin läheisiin vihollisiin.
+unit.nova.description = Ampuu laservasamoita, jotka vahingoittavat vihollisia ja korjaavat liittoutuneita rakennuksia. Kykenee lentämään.
+unit.pulsar.description = Ampuu valokaaria, jotka vahingoittavat vihollisia ja korjaavat liittoutuneita rakennuksia. Kykenee lentämään.
+unit.quasar.description = Ampuu lävistäviä lasersäteitä, jotka vahingoittavat vihollisia ja korjaavat liittoutuneita rakennuksia. Kykenee lentämään. Suojattu kilvellä.
+unit.vela.description = Ampuu suuren jatkuvan lasersäteen, joka vahingoittaa vihollisia, aiheuttaa tulipaloja ja korjaa liittoutuneita rakennuksia. Kykenee lentämään.
+unit.corvus.description = Ampuu valtavan laserpurkauksen, joka vahingoittaa vihollisia ja korjaa liittoutuneita rakennuksia. Voi kulkea useimpien maastojen yli.
+unit.crawler.description = Juoksee vihollisia päin ja räjähtää aiheuttaen suuren räjähdyksen.
+unit.atrax.description = Ampuu heikentäviä kuonapalloja maakohteisiin. Voi kulkea useimpien maastojen yli.
+unit.spiroct.description = Ampuu heikentäviä lasersäteitä vihollisiin, korjaten samalla itseään. Voi kulkea useimpien maastojen yli.
+unit.arkyid.description = Ampuu suuria heikentäviä lasersäteitä vihollisiin, korjaten samalla itseään. Voi kulkea useimpien maastojen yli.
+unit.toxopid.description = Ampuu suuria sähköisiä sirpalekranaatteja ja lävistäviä lasersäteitä vihollisiin. Voi kulkea useimpien maastojen yli.
+unit.flare.description = Ampuu tavallisia ammuksia läheisiin maakohteisiin.
+unit.horizon.description = Pudottaa pommirykelmiä maakohteisiin.
+unit.zenith.description = Ampuu ohjussarjoja kaikkiin läheisiin vihollisiin.
+unit.antumbra.description = Ampuu ryöpyn ammuksia kaikkiin läheisiin vihollisiin.
+unit.eclipse.description = Ampuu kaksi lävistävää lasersädettä ja ryöpyn räjähtäviä ammuksia läheisiin vihollisiin.
+unit.mono.description = Kaivaa automaattisesti kuparia ja lyijyä, ja sijoittaa ne ytimeen.
+unit.poly.description = Jälleenrakentaa tuhottuja rakennuksia ja auttaa muita yksiköitä raketamaan automaattisesti.
+unit.mega.description = Korjaa vahingoittuneita rakennuksia automaattisesti. Pystyy kantamaan palikoita ja pieniä maayksiköitä.
+unit.quad.description = Pudottaa maakohteisiin suuria pommeja, jotka korjaavat liittoutuneita rakennuksia ja vahingoitt vihollisia. Kykenee kantamaan keskikokoisia maayksiköitä.
+unit.oct.description = Suojaa läheisiä liittolaisia regeneroituvalla kilvellään. Pystyy kantamaan useimpia maayksiköitä.
+unit.risso.description = Ampuu ryöpyn ohjuksia ja ammuksia kaikkiin läheisiin vihollisiin.
+unit.minke.description = Ampuu kranaatteja ja normaaleja ammuksia läheisiin maakohteisiin.
+unit.bryde.description = Ampuu pitkän kantaman tykistötulta ja ohjuksia vihollisiin.
+unit.sei.description = Ampuu ryöpyn ohjuksia ja haarniskan läpäiseviä ammuksia vihollisiin.
+unit.omura.description = Ampuu pitkän kantaman lävistävän raidetykin vasaman vihollisiin. Tuottaa Flare-yksiköitä.
+unit.alpha.description = Puolustaa Siru-ydintä vihollisilta. Rakentaa rakennuksia.
+unit.beta.description = Puolustaa Pohjaus-ydintä vihollisilta. Rakentaa rakennuksia.
+unit.gamma.description = Puolustaa Tuma-ydintä vihollisilta. Rakentaa rakennuksia.
+unit.retusa.description = Ampuu hakeutuvia torpedoja läheisiin vihollisiin. Korjaa liittoutuneita yksiköitä.
+unit.oxynoe.description = Ampuu rakennuksia korjaavia liekkisuihkuja läheisiin vihollisiin. Hyökkää läheisiin vihollisammuksiin paikanpuolustustykillä.
+unit.cyerce.description = Ampuu hakeutuvia ohjuskimppuja vihollisiin. Korjaa liittoutuneita yksiköitä.
+unit.aegires.description = Antaa sähköiskuja kaikille vihollisyksiköille ja -rakennuksille, jotka ovat sen energiakentän sisällä. Korjaa kaikkia liittolaisia.
+unit.navanax.description = Ampuu räjähtäviä EMP-ammuksia tehden huomattavaa vahinkoa vihollisen sähköverkoille ja korjaten liittoutuneita rakennuksia. Sulattaa läheiset viholliset neljällä itsenäisellä lasertykillä.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Lue numero yhdistetystä muistisolusta.
+lst.write = Kirjoita numero yhdistettyyn muistisoluun.
+lst.print = Lisää tekstiä tekstipuskuriin.\nEi näytä mitään, kunnes [accent]Painosyötettä[] käytetään.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Lisää operaation piirtopuskuriin.\nEi näytä mitään, kunnes [accent]Piirtosyötettä[] käytetään.
+lst.drawflush = Syöttää jonottavat [accent]Piirto[]-operaatiot näyttöön.
+lst.printflush = Syöttää jonottavat [accent]Paino[]-operaatiot viestipalikkaan.
+lst.getlink = Selvitä prosessorin linkki numerojärjestyksellä. Alkaa nollasta.
+lst.control = Hallitsee rakennusta.
+lst.radar = Paikantaa yksiköitä kantamallisen rakennuksen ympärillä.
+lst.sensor = Selvitä rakennuksen tai yksikön data.
+lst.set = Aseta muuttuja.
+lst.operation = Suorita laskutoimitus 1-2 muuttujalla.
+lst.end = Hyppää ohjepinon alkuun.
+lst.wait = Odota tietty määrä sekunteja.
+lst.stop = Halt execution of this processor.
+lst.lookup = Etsi tavaran/nesteen/yksikön/palikan tyyppiä ID:n perusteella.\nKunkin tyypin kokonaislukumäärän voi selvittää argumentilla:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Hyppää ehdollisesti toiseen lauseeseen.
+lst.unitbind = Sido tietyntyyppiseen yksikköön ja varastoi sen [accent]@unit[]-muuttujaan.
+lst.unitcontrol = Hallitse sidottua yksikköä.
+lst.unitradar = Paikanna yksikköjä sidotun yksikön ympäriltä.
+lst.unitlocate = Paikanna tietyntyyppinen arvo/rakennus missä tahansa kartalla.\nTarvitsee sidotun joukon.
+lst.getblock = Selvitä laattadata missä tahansa sijainnissa.
+lst.setblock = Aseta laattadata missä tahansa sijainnissa.
+lst.spawnunit = Luo joukko tietyssä sijainnissa.
+lst.applystatus = Lisää tai poista statusefekti yksiköltä.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simuloi tason syntymistä mielivaltaisessa sijainnissa.\nEi vaikuta tasolaskuriin.
+lst.explosion = Luo räjähdys tietyssä sijainnissa.
+lst.setrate = Aseta prosessorin suoritusnopeus ohjeessa/sekunti.
+lst.fetch = Etsi yksiköitä, ytimiä, pelaajia tai rakennuksia luettelon perusteella.\nLuettelo alkaa nollasta ja päättyy osiensa lukumäärän.
+lst.packcolor = Pakkaa [0, 1] RGBA -komponentteja yhteen numeroon piirtämistä tai sääntöjen asettamista varten.
+lst.setrule = Aseta pelisääntö.
+lst.flushmessage = Näytä näytöllä viesti tekstipuskurista.\nOdottaa, kunnes edellinen viesti loppuu.
+lst.cutscene = Hallitse pelaajan kameraa.
+lst.setflag = Aseta globaali tunniste, jonka kaikki prosessorit voivat lukea.
+lst.getflag = Tarkista, onko globaali tunniste asetettu.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Logiikan käyttö ei täällä ole sallittu yksikköjen tuottamisessa.
+lenum.type = Rakennuksen/Yksikön tyyppi.\nEsim. jokaisesta reitittimestä tämä palauttaa [accent]@router[].\nEi ole merkkijono.
+lenum.shoot = Ammu tiettyä sijaintia.
+lenum.shootp = Ammu yksikköä/rakennusta nopeudenennustus päällä.
+lenum.config = Rakennuksen säätö, esim. lajittelijan valinta.
+lenum.enabled = Selvitä, onko palikka päällä.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Lampun väri.
+laccess.controller = Yksikön hallitsija. Jos yksikköä hallitsee prosessori, palauttaa prosessorin.\nJos yksikkö on muodostelmassa, palauttaa johtajan.\nPalauttaa muulloin itse yksikön.
+laccess.dead = Selvitä, onko yksikkö/rakennus tuhoutunut tai ei enää kelvollinen.
+laccess.controlled = Palauttaa:\n[accent]@ctrlProcessor[], jos yksikön hallitsija on prosessori.\n[accent]@ctrlPlayer[], jos yksikön/rakennuksen hallitsija on pelaaja.\n[accent]@ctrlFormation[], jos yksikkö on muodostelmassa\nMuussa tapauksessa palauttaa 0.
+laccess.progress = Toiminnon edistys asteikolla nollasta yhteen.\nPalauttaa tuotannon, tykin latauksen tai rakennuksen edistymisen.
+laccess.speed = Yksikön huippunopeus laattoina/sekunti.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Tuntematon
+lcategory.unknown.description = Luokittelemattomat ohjeet.
+lcategory.io = Sisään- ja ulostulo
+lcategory.io.description = Muokkaa muistipalikan ja prosessoripuskureiden sisältöä.
+lcategory.block = Palikan hallinta
+lcategory.block.description = Vuorovaikuta palikkojen kanssa.
+lcategory.operation = Operaatiot
+lcategory.operation.description = Loogiset operaatiot.
+lcategory.control = Virtauksenhallinta
+lcategory.control.description = Hallitse suoritusjärjestystä.
+lcategory.unit = Yksikönhallinta
+lcategory.unit.description = Anna yksiköille komentoja.
+lcategory.world = Maailma
+lcategory.world.description = Hallitse maailman käyttäytymistä.
+graphicstype.clear = Täytä näyttö tietyllä värillä.
+graphicstype.color = Aseta väri seuraaville piirto-operaatioille.
+graphicstype.col = Vastaa väriä, mutta on pakattu.\nPakatut värit on kirjoitettu heksakoodina, jossa on [accent]%[]-etuliite.\nEsimerkki: [accent]%ff0000[] vastaa punaista väriä.
+graphicstype.stroke = Aseta viivan leveys.
+graphicstype.line = Piirrä viivaosio.
+graphicstype.rect = Piirrä täytetty suorakulmio.
+graphicstype.linerect = Piirrä suorakumion ääriviivat.
+graphicstype.poly = Piirrä säännöllinen monikulmio.
+graphicstype.linepoly = Piirrä säännöllisen monikulmion ääriviivat.
+graphicstype.triangle = Piirrä täytetty kolmio.
+graphicstype.image = Piirrä kuva jostain sisällöstä.\nEsim: [accent]@router[] tai [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Aina tosi.
+lenum.idiv = Kokonaislukujen osamäärä.
+lenum.div = Osamäärä.\nPalauttaa arvon [accent]null[] jaettaessa nollalla.
+lenum.mod = Lukuun ottamatta.
+lenum.equal = Yhtä suuri. Pakottaa tyypit.\nMuut kohteet kuin null palauttavat arvon 1 verrattaessa numeroihin, muussa tapauksessa palautus on 0.
+lenum.notequal = Erisuuri. Pakottaa tyypit.
+lenum.strictequal = Tarkka yhtäsuuruus. Ei pakota tyyppejä.\nVoidaan käyttää tarkistamaan arvon [accent]null[] varalta.
+lenum.shl = Siirrä bittejä vasemmalle.
+lenum.shr = Siirrä bittejä oikealle.
+lenum.or = Binäärinen OR.
+lenum.land = Looginen AND.
+lenum.and = Binäärinen AND.
+lenum.not = Binäärinen flip.
+lenum.xor = Binäärinen XOR.
+lenum.min = Vägintään kaksi numeroa.
+lenum.max = Korkeintaan kaksi numeroa.
+lenum.angle = Vektorin kulma asteina.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Vektorin pituus.
+lenum.sin = Sini asteina.
+lenum.cos = Kosini asteina.
+lenum.tan = Tangentti asteina.
+lenum.asin = Arkussini asteina.
+lenum.acos = Arkuskosini asteina.
+lenum.atan = Arkustangentti asteina.
+lenum.rand = Satunnainen desimaaliluku väliltä [0, arvo).
+lenum.log = Luonnollinen logaritmi (ln).
+lenum.log10 = Kymmenkantainen logaritmi.
+lenum.noise = Kaksiulotteinen yksisuuntainen melu.
+lenum.abs = Absoluuttinen arvo.
+lenum.sqrt = Neliöjuuri.
+lenum.any = Mikä tahansa yksikkö.
+lenum.ally = Liittolaisyksikkö.
+lenum.attacker = Aseistettu yksikkö.
+lenum.enemy = Vihollisyksikkö.
+lenum.boss = Vartijayksikkö.
+lenum.flying = Lentävä yksikkö.
+lenum.ground = Maayksikkö.
+lenum.player = Pelaajan hallitsema yksikkö.
+lenum.ore = Malmintalletuspiste.
+lenum.damaged = Vahingoittunut liittolaisrakennus.
+lenum.spawn = Vihollisen syntypiste.\nVoi olla ydin tai sijainti.
+lenum.building = Tiettyyn joukkoon kuuluva rakennus.
+lenum.core = Mikä tahansa ydin.
+lenum.storage = Varastorakennus, esim. holvi.
+lenum.generator = Energiaa tuottavat rakennukset.
+lenum.factory = Resursseja muokkaavat rakennukset.
+lenum.repair = Korjauspisteet.
+lenum.battery = Mikä tahansa akku.
+lenum.resupply = Uudelleenvarustuspisteet.\nAiheellinen vain, jos pelisääntö [accent]"Yksiköt tarvitsevat ammuksia"[] on käytöss'.
+lenum.reactor = Törmäys- tai toriumreaktori.
+lenum.turret = Mikä tahansa tykki.
+sensor.in = Rakennus/Yksikkö, jota tarkkailla.
+radar.from = Rakennukset, joista tarkkaillaan.\nSensorin kantamaa rajoittaa rakennuksen kantama.
+radar.target = Suodatin, jota yksiköt tarkkailevat.
+radar.and = Ylimääräiset suodattimet.
+radar.order = Suodatusjärjestys. Käännä arvolla 0.
+radar.sort = Mittari, jolla tulokset lajitellaan.
+radar.output = Muuttuja, johon ulostuloyksikkö tallennetaan.
+unitradar.target = Suodatin, jota yksiköt tarkkailevat.
+unitradar.and = Ylimääräiset suodattimet.
+unitradar.order = Suodatusjärjestys. Käännä arvolla 0.
+unitradar.sort = Mittari, jolla tulokset lajitellaan.
+unitradar.output = Muuttuja, johon ulostuloyksikkö tallennetaan.
+control.of = Hallittava rakennus.
+control.unit = Yksikkö/Rakennus, johon tähdätä.
+control.shoot = Hallitsee ampuuko yksikkö.
+unitlocate.enemy = Hallitse paikantaako yksikkö vihollisrakennuksia.
+unitlocate.found = Selvitä löytyikö kohde.
+unitlocate.building = Ulostulomuuttuja paikannetulle rakennukselle.
+unitlocate.outx = X-koodinaatin ulostulo.
+unitlocate.outy = Y-koodinaatin ulostulo.
+unitlocate.group = Etsittävä rakennusjoukko.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Lopeta liikkuminen, mutta jatka rakentamista/kaivamista.\nOletustila.
+lenum.stop = Lopeta liikkuminen/kaivaminen/rakentaminen.
+lenum.unbind = Poista logiikkahallinta kokonaan.\nAnna hallinta tavalliselle AI:lle.
+lenum.move = Liiku tarkkaan sijaintiin.
+lenum.approach = Lähesty sijaintia tietylle etäisyydelle.
+lenum.pathfind = Etsi reitti määritettyyn sijaintiin.
+lenum.autopathfind = Reitittää automaattisesti lähimpään vihollisen ytimeen tai pudotuspisteeseen.\nTämä vastaa tavallista aaltojen vihollisten reititystä.
+lenum.target = Ammu tiettyä sijaintia.
+lenum.targetp = Ammu kohdetta nopeudenennustuksen ollessa päällä.
+lenum.itemdrop = Pudota tavaroita.
+lenum.itemtake = Ota tavaroita rakennuksesta.
+lenum.paydrop = Pudota lasti.
+lenum.paytake = Nosta lastia nykyisestä sijainnista.
+lenum.payenter = Siirry tai laskeudu lastipalikalle, jonka päällä yksikkö on.
+lenum.flag = Numeerinen yksikkötunniste.
+lenum.mine = Kaiva tietyssä sijainnissa.
+lenum.build = Rakenna tietty rakennus.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Tarkista, onko joukko tietyn sijainnin lähellä.
+lenum.boost = Aloita tai lopeta tehostus.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index c5663baa1d..dec21c9cc9 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1,49 +1,66 @@
-credits.text = Created by [royal]Anuken[] - [sky]anukendev@gmail.com[]
-credits = Credits
-contributors = Mga Tagasalin at Contributor
-discord = Sumali sa Mindustry Discord!
+credits.text = Ginawa ni [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits = Mga Kredito
+contributors = Mga Tagasalin at Tagapagkontributo
+discord = Sumali sa Discord Server ng Mindustry!
 link.discord.description = Ang opisyal na Mindustry Discord chatroom.
 link.reddit.description = Ang Mindustry subreddit
-link.github.description = Game source code
+link.github.description = Pinagmulang kodigo ng Mindustry
 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.
+link.dev-builds.description = Builds na masirain at iginagawa.
+link.trello.description = Opisyal na Trello board para sa mga nakalatag na features
+link.itch.io.description = itch.io page na may download para sa personal na kompyuter
+link.google-play.description = Listing sa Google Play Store
+link.f-droid.description = Catalogue listing sa F-Droid
+link.wiki.description = Opsiyal na ensiklopedya ng Mindustry
+link.suggestions.description = Magmungkahi ng mga bagong feature
+
+link.bug.description = Nakahanap ng isang sira? Ipaulat dito!
+linkopen = Ang server na ito ay nagbigay ng isang link. Gusto mo ba na ibukas?\n\n[sky]{0}
+linkfail = Hindi mabuksan ang link!\nKinopya na sa iyong 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!
+gameover = Ang laro ay natapos.
+gameover.disconnect = Nawalan ka ng koneksyon.
+gameover.pvp = Ang[accent] {0}[] na grupo ay nanalo!
+gameover.waiting = [accent]Hintayin ang bagong mapa...
 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
+indev.notready = Ang bahaging ito ng laro ay hindi pa handa
 
 load.sound = Mga Tunog
 load.map = Mga Mapa
 load.image = Mga Litrato
 load.content = Nilalaman
-load.system = System
+load.system = Sistema
 load.mod = Mga Mod
 load.scripts = Mga Iskrip
 
-be.update = Mayroong baong Bleeding Edge build na makukuha:
+be.update = Mayroong bagong 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.
+mods.browser = Hanapan ng mga Mod
+mods.browser.selected = Mga selektadong mod
+mods.browser.add = I-install
+mods.browser.reinstall = I-install ulit
+mods.browser.view-releases = Tingan ang mga ipinalabas na bersyon
+mods.browser.noreleases = [scarlet]Walang ipinalabas na bersyon na nahanap.\n[accent]Hindi makahanap ng bersyon sa mod na ito. Tingan kung may ipinalabas na bersyon ang repositoryo ng mod nito.
+mods.browser.latest = <Pinaka-bago>
+mods.browser.releases = Ipinalabas na bersyon
+mods.github.open = Repositoryo
+mods.github.open-release = Pahina ng mga ipinalabas na bersyon
+mods.browser.sortdate = Uriin sa pinakabago
+mods.browser.sortstars = Uriin sa kasikatan
 
-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 = Eskematiko
+schematic.add = I-adya ang Eskematiko...
+schematics = Mga Eskematiko
+schematic.search = Search eskematiko...
+schematic.replace = Ang eskematiko na ito ay magkaparehas ang pangalan. Gusto mo bang palitan ito?
+schematic.exists = Ang eskematiko na ito ay magkaparehas ang pangalan.
+schematic.import = I-angkat ang eskematiko...
 schematic.exportfile = Mag-export ng File
 schematic.importfile = Mag-angkat ng File
 schematic.browseworkshop = Maghanap sa Workshop
@@ -53,34 +70,45 @@ 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.edit = I-edit ang Schematic
 schematic.info = {0}x{1}, {2} blocks
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Ang mga schematics ay pinagbabawalan.[]\nBawal ka gumamit gang schematics sa [accent]mapa[] or [accent]server[] na ito.
+schematic.tags = Mga Tag:
+schematic.edittags = Mag-edit ng Tag
+schematic.addtag = Mag-dagdag ng Tag
+schematic.texttag = Tag sa teksto
+schematic.icontag = Tag sa larawan
+schematic.renametag = Palitan ang pangalan ng Tag
+schematic.tagged = {0} na na-tag
+schematic.tagdelconfirm = I-delete itong tag?
+schematic.tagexists = Meron nang tag na ganito.
+stats = Mga Statistiko
+stats.wave = Mga Wave na nalagpasan
+stats.unitsCreated = Mga Unit na nagawa
+stats.enemiesDestroyed = Mga kalabang napasira
+stats.built = Mga Building na napatayo
+stats.destroyed = Mga Building na nasira
+stats.deconstructed = Mga Building na binaklas
+stats.playtime = Oras ng paglalaro
 
-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
+globalitems = [accent]Mga Pangkalahatang Gamit
 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
+nearpoint = [[ [scarlet]UMALIS KAAGAD SA DROP POINT[] ]\npagkamatay ay palapit
 database = Database ng Core
-savegame = I-adya ang Laro
-loadgame = Load Game
+database.button = Database
+savegame = I-save ang Laro
+loadgame = I-Load ang Laro
 joingame = Sumali sa Laro
-customgame = Kustom na Laro
+customgame = Hindi-karaniwan na Laro
 newgame = Bagong Laro
 none = <wala>
-minimap = Minimap
+none.found = [lightgray]<walang nahanap>
+none.inmap = [lightgray]<wala sa mapa>
+minimap = Maliit na mapa
 position = Posisyon
 close = Isara
 website = Website
@@ -98,31 +126,46 @@ 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.
+feature.unsupported = Hindi suportado ng iyong device ang feature na ito.
+mods.initfailed = [red]âš [] Nabigong masimulan ang nakaraang instance ng Mindustry. Malamang na sanhi ito ng maling pagkilos ng mga mod.\n\nPara maiwasan ang crash loop, [red]lahat ng mga mod ay pinahinto.[]
 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.viewcontent = View Content
 mods.reload = I-reload
 mods.reloadexit = Ang laro ay isasara, para mag-reload ng mga mod.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Gumagana
 mod.disabled = [scarlet]Hindi Gumagana
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = 'Wag Paganahin
+mod.version = Version:
 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.incompatiblegame = [red]Larong luma na
+mod.incompatiblemod = [red]Hindi magkatugma
+mod.blacklisted = [red]Hindi pwede
+mod.unmetdependencies = [red]Pagpapaasa ay hindi magkatulad
+mod.erroredcontent = [scarlet]Mga sira sa Nilalaman
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Pagpapaasa ay hindi kompleto
+mod.requiresversion.details = Kailangan ng bersyon: [accent]{0}[]\nAng iyong laro ay hindi bago. Ang mod na ito ay kailangan ng bagong bersyon ng larong ito (pwedeng beta o alpha na bersyon) para gumana.
+mod.outdatedv7.details = Ang mod na ito ay hindi tugma sa pinakabagong bersyon ng laro. Dapat itong i-update ng may-akda, at idagdag ang [accent]minGameVersion: 136[] sa [accent]mod.json[] file nito.
+mod.blacklisted.details = Ang mod na ito ay manu-manong na-blacklist para sa pagdudulot ng mga pag-crash o iba pang isyu sa bersyong ito ng laro. Huwag gamitin ito.
+mod.missingdependencies.details = Ang mod na ito ay walang mga dependencies: {0}
+mod.erroredcontent.details = Nagdulot ng mga error ang larong ito kapag naglo-load. Hilingin sa may-akda ng mod na ayusin ang mga ito.
+mod.circulardependencies.details = Ang mod na ito ay may mga dependency na umaasa sa isa't isa.
+mod.incompletedependencies.details = Hindi ma-load ang mod na ito dahil sa di-wasto o nawawalang mga dependency: {0}.
+mod.requiresversion = Nangangailangan ng bersyon ng laro: [red]{0}
+
 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.requiresrestart = Ang laro'y magsasara 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
@@ -134,121 +177,158 @@ 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.
+mod.scripts.disable = Ang device mo ay hindi sumusuporta ng mga mod na may iskrip. Kailangan mo itong pahintuin upang makapaglaro.
+
+about.button = Tungkol
+name = Pangalan:
+noname = Pumili ng[accent] pangalan[] muna.
+search = Maghanap:
+planetmap = Mapa ng Planeta:
+
+launchcore = I-Launch Ang Core
+filename = Pangalan ng File:
+unlocked = Bagong content na na-unlock!
+available = Bagong research na available!
+unlock.incampaign = < I-unlock sa campaign para sa detalye >
+campaign.select = Piliin ang Starting Campaign
+campaign.none = [lightgray]Pumili ng planetang sisimulan.\nMaaari itong ilipat anumang oras.
+campaign.erekir = Mas bago, mas pinakintab na content. Kadalasan ay linear na pag-unlad ng kampanya.\n\nMas mataas na kalidad at pangkalahatang karanasan.
+campaign.serpulo = Mas lumang nilalaman; ang klasikong karanasan. Mas open-ended.\n\nPotensyal na hindi balanseng mga mapa at mechanics ng campaign. Hindi gaanong pulido.
+campaign.difficulty = Difficulty
+completed = [accent]Nakumpleto
 
-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
+techtree.select = Pagpili ng Tech Tree
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Load
+research.discard = Discard
+research.list = [lightgray]Pananaliksik:
+research = Pananaliksik
+researched = [lightgray]{0} nagsaliksik.
+research.progress = {0}% kumpleto
+players = {0} manlalaro
+players.single = {0} manlalaro
+
+players.search = mag-search
+players.notfound = [gray]walang nahanap na players
+server.closing = [accent]Sinasarado ang server...
+server.kicked.kick = Sinipa ka mula sa server!
+server.kicked.whitelist = Hindi ka naka whitelist.
+server.kicked.serverClose = Ang server ay isinarado.
+server.kicked.vote = Na-vote-kick ka na. Paalam.
+server.kicked.clientOutdated = Outdated na kliyente! I-Update yung laro mo!
+server.kicked.serverOutdated = Lumang server! Hilingin sa host na mag-update!
+server.kicked.banned = Ikaw ay pinagbawalan sa server na ito.
+server.kicked.typeMismatch = Ang server na ito ay hindi tugma sa iyong uri ng build.
+server.kicked.playerLimit = Puno na ang server na ito. maghintay ng libreng slot.
+server.kicked.recentKick = na-kick ka recently.\nMaghintay bago kumonekta muli.
+server.kicked.nameInUse = May ganyang pangalan\nsa server na ito.
+server.kicked.nameEmpty = Invalid ang pangalan mo.
+server.kicked.idInUse = Nandito kana sa server, bawal mag-join gamit nang dalawan accounts.
+server.kicked.customClient = Hindi sinusuportahan ng server na ito ang mga custom na build. Mag-download ng opisyal na bersyon.
+server.kicked.gameover = Tapos na ang laro!
+server.kicked.serverRestarting = Nag rerestart ang server.
+server.versions = Iyong bersyon:[accent] {0}[]\nBersyon ng server:[accent] {1}[]
+host.info = Ang [accent]host[] button ay nagho-host ng server sa port [scarlet]6567[]. \nAng sinuman sa parehong [lightgray]wifi o lokal na network[] ay dapat na makita ang iyong server sa kanilang listahan ng server.\n\nKung gusto mong makakonekta ang mga tao mula sa kahit saan sa pamamagitan ng IP, [accent]port forwarding[] ay kinakailangan.\n\n[lightgray]Tandaan: Kung may nakakaranas ng problema sa pagkonekta sa iyong LAN game, tiyaking pinayagan mo ang Mindustry na ma-access ang iyong lokal na network sa iyong mga setting ng firewall. Tandaan na minsan ay hindi pinapayagan ng mga pampublikong network ang pagtuklas ng server.
+join.info = Dito, maaari mong ipasok ang isang [accent]server IP[] para ikonekta, o pag diskubre ng [accent]local network[] or [accent]global[] servers pwedeng konektahin.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Kung gusto mong kumonekta sa isang tao sa pamamagitan ng IP, kakailanganin mong hilingin sa host ang kanilang IP, na makikita sa pamamagitan ng pag-googling sa "aking ip" mula sa kanilang device.
+hostserver = Mag-host ng Multiplayer Game
+invitefriends = Mag-imbita ng mga kaibigan
 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.
+hosts.refresh = I-refresh
+hosts.discovering = Pagtuklas ng mga LAN games...
+hosts.discovering.any = Pagtuklas ng mga laro...
+server.refreshing = Nagre-refresh ng server
+hosts.none = [lightgray]Walang nahanap na local games!
+host.invalid = [scarlet]Hindi makakonekta sa Host.
 
 servers.local = Local Servers
+servers.local.steam = Buksan ang Mga Laro at Lokal na Server
 servers.remote = Remote Servers
 servers.global = Community Servers
+servers.disclaimer = Ang mga server ng komunidad ay [accent]hindi pagmamay-ari o kinokontrol[] ng developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
+servers.showhidden = Show Hidden Servers
+server.shown = Ipinapakita
+server.hidden = Tinatago
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Trace Player
-trace.playername = Player name: [accent]{0}
+trace.playername = Pangalan ng Player: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Unique ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobile Client: [accent]{0}
 trace.modclient = Custom Client: [accent]{0}
-invalidid = Invalid client ID! Submit a bug report.
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
+invalidid = Di-wastong client ID! Magsumite ng ulat ng bug.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Bans
-server.bans.none = No banned players found!
+server.bans.none = walang nahanap na banned players!
 server.admins = Admins
-server.admins.none = No admins found!
+server.admins.none = walang nahnap na admin!
 server.add = Add Server
-server.delete = Are you sure you want to delete this server?
+server.delete = Sigurado ka bang gusto mong tanggalin ang server na ito?
 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
+confirmban = Sigurado ka bang gusto mong i-ban si "{0}[white]"?
+confirmkick = Sigurado ka bang gusto mong i-kick si "{0}[white]"?
+confirmunban = Sigurado kabang i-unban ang player?
+confirmadmin = Sigurado ka bang gusto mong gawing admin si "{0}[white]"?
+confirmunadmin = Sigurado kabang i-remove ang admin mula kay "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
+joingame.title = Sumali sa Laro
 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}[]).
+disconnect.timeout = Na-time out.
+disconnect.data = Pumalya ang pag-load ng world data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
+cantconnect = Hindi kayant sumali sa larong ([accent]{0}[]).
 connecting = [accent]Connecting...
+reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Loading world data...
 server.port = Port:
-server.addressinuse = Address already in use!
 server.invalidport = Invalid port number!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [scarlet]Error hosting server.
-save.new = New Save
-save.overwrite = Are you sure you want to overwrite\nthis save slot?
+save.new = Bagong Save
+save.overwrite = Sigurado ka bang gusto mong i-overwrite ang save slot na ito?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 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.none = Walang nahanap na save!
+savefail = Hindi na save ang game!
+save.delete.confirm = Sigurado ka bang gusto mo i delete intong 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.invalid = [accent]Hindi valid ang intong save!
+save.import.fail = [scarlet]Pumalya ang pag-import ng save: [accent]{0}
+save.export.fail = [scarlet]Pumalya ang pag-export ng save: [accent]{0}
 save.import = Import Save
 save.newslot = Save name:
 save.rename = Rename
 save.rename.text = New name:
-selectslot = Select a save.
+selectslot = Pumili ng save.
 slot = [accent]Slot {0}
-editmessage = Edit Message
-save.corrupted = Save file corrupted or invalid!
+editmessage = I-edit Message
+save.corrupted = Sira o kurakot ang save na ito.
 empty = <empty>
 on = On
 off = Off
+save.search = I-Search ang mga saved games...
 save.autosave = Autosave: {0}
 save.map = Map: {0}
 save.wave = Wave {0}
@@ -256,167 +336,248 @@ 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
+confirm = Kumpirmahin
+delete = Tanggalin
+view.workshop = Tingnan Sa Workshop
+workshop.listing = I-edit ang Listahan sa Workshop
 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.[]
+customize = I-customize ang Mga Panuntunan
+cancel = I-kansel
+command = Command
+command.queue = [lightgray][Queuing]
+
+command.mine = Mina
+command.repair = Ipagawa
+command.rebuild = Itayo
+command.assist = Asistahan ang maglalaro
+command.move = Galaw
+command.boost = Magpabilis
+command.enterPayload = Pumasok sa payload na tipak
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Tigilan ang mga sunurin
+stance.shoot = Paninindigan: Barilan
+stance.holdfire = Paninindigan: Huwag Bumaril
+stance.pursuetarget = Paninindigan: Habulin ang Target
+stance.patrol = Paninindigan: Patrolyang Lakarin
+stance.ram = Paninindigan: Daan\n[lightgray]Tuwid na linyang paggalaw, walang paghanag ng path
+openlink = Buksan Link
+copylink = Koypa Link
+back = Balik
+max = Pinakarami
+objective = Objective sa Map
+crash.export = I-Export Crash Logs
+crash.none = Walang nahanap na crash logs.
+crash.exported = Na-export ang mga crash log.
+data.export = Export ang Data
+data.import = Import ang Data
+data.openfolder = Buksan ang Data Folder
+data.exported = Na-i-export ang data.
+data.invalid = Hindi ito wastong data.
+data.import.confirm = Ang pag-iimport ng data ay i-o-overwrite ang[scarlet] lahat[] ng iyong game data.\n[accent]Hindi ito pwedeng maibalik sa dati![]\n\nPagkatapos i-import ang data, mag e-exit kaagad ang laro.
+quit.confirm = Sigurado ka bang gusto mong mag quit?
 loading = [accent]Loading...
-reloading = [accent]Reloading Mods...
+downloading = [accent]Downloading...
 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
+respawn = [accent][[{0}][] upang mag respawn sa core
+cancelbuilding = [accent][[{0}][] para mai-kansela ang plano
+selectschematic = [accent][[{0}][] upang mag select-copy
+pausebuilding = [accent][[{0}][] upang i-pause ang pag-tatayo
+resumebuilding = [scarlet][[{0}][] upang ipagpatuloy ang pag-tatayo
+enablebuilding = [scarlet][[{0}][] upang paganahin ang pag-tatayo
+showui = Itinago ang UI.\nPindutin ang [accent][[{0}][] upang maipakita ang UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Wave {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]Wave in {0}
 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
-wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
-wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
-loadimage = Load Image
-saveimage = Save Image
+waiting = [lightgray]Naghihintay...
+waiting.players = Naghihintay ng mga manlalaro...
+wave.enemies = [lightgray]{0} Mga Natitirang Kaaway
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
+wave.enemy = [lightgray]{0} Natitirang Kaaway
+wave.guardianwarn = Ang Guardian ay papalapit na ng mga [accent]{0}[] wave.
+wave.guardianwarn.one = Ang Guardian ay papalapit na ng [accent]{0}[] wave.
+loadimage = I-Load ng Imahe
+saveimage = I-Save ng Imahe
 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.delete.confirm = Sigurado ka bang gusto mong tanggalin ang mapang ito? Ang gawaing ito ay hindi pwedeng baguhin!
 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.
+map.nospawn = Ang mapa na ito ay walang anumang mga core para sa player upang mai-spawn in! Mag-dagdag ng {0} core sa editor ng mapa!
+map.nospawn.pvp = Ang mapa na ito ay walang anumang mga core ng kaaway para sa player upang i-spawn! Add [scarlet]non-orange[] cores to this map in the editor.
+map.nospawn.attack = Ang mapa na ito ay walang anumang mga core ng kaaway para sa pag-atake ng manlalaro! Add {0} cores to this map in the editor.
+map.invalid = Error loading map: corrupted o sira na 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.error = Error sa pagkuha ng mga detalye ng workshop: {0}
+map.publish.confirm = Sigurado ka bang gusto mong i-publish ang mapang ito?\n\n[lightgray]Tiyaking sumasang-ayon ka muna sa Workshop EULA, o hindi lalabas ang iyong mga mapa!
+workshop.menu = I-select ang gusto mong gawin sa aytem na ito.
 workshop.info = Item Info
 changelog = Changelog (optional):
+updatedesc = Overwrite Title & Description
 eula = Steam EULA
-missing = This item has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked.
+missing = Na-delete or na-remove and item na to.\n[lightgray]Awtomatikong na-unlink na ang listahan sa workshop.
 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.confirm = Sigurado ka bang gusto mong i-publish ang mapang ito?\n\n[lightgray]Tiyaking sumasang-ayon ka muna sa Workshop EULA, o hindi lalabas ang iyong mga items!
 publish.error = Error publishing item: {0}
 steam.error = Failed to initialize Steam services.\nError: {0}
+editor.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Brush
-editor.openin = Open In Editor
+editor.openin = I-Open sa 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.nodescription = Dapat meron paglalarawan ng hindi bababa sa 4 na character bago i-publish.
+editor.waves = Mga Waves:
+editor.rules = Mga Rules:
 editor.generation = Generation:
+editor.objectives = Mga Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Edit In-Game
-editor.publish.workshop = Publish On Workshop
+editor.playtest = Playtest
+editor.publish.workshop = I-Publish Sa Workshop
 editor.newmap = New Map
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Deskripsyon
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
-waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
+waves.health = health: {0}%
 waves.perspawn = per spawn
 waves.shields = shields/wave
 waves.to = to
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
-waves.copy = Copy to Clipboard
-waves.load = Load from Clipboard
+waves.random = Random
+waves.copy = I-Copy to Clipboard
+waves.load = I-Load mula sa 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.
+waves.none = Walang tinukoy na mga kaaway.\nTandaan na ang mga walang laman na wave layout ay awtomatikong papalitan ng default na layout.
+waves.sort = Sort By
+waves.sort.reverse = Pabaliktad na Sort
+waves.sort.begin = Simula
+waves.sort.health = Health
+waves.sort.type = Uri
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Itago lahat
+waves.units.show = Ipakita lahat
 
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
+all = Lahat
 
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 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.errorload = Error sa paglo-load ng file.
+editor.errorsave = Error sa pag-save ng file.
+editor.errorimage = Iyon ay isang imahe, hindi isang mapa.\n\nKung gusto mong mag-import ng 3.5/build 40 na mapa, gamitin ang button na 'Import Legacy Map' sa editor.
+editor.errorlegacy = Masyadong luma ang mapang ito, at gumagamit ng legacy na format ng mapa na hindi na sinusuportahan.
+editor.errornot = Ito ay hindi isang file ng mapa.
+editor.errorheader = Ang file ng mapa na ito ay maaaring hindi wasto o sira.
+editor.errorname = Walang tinukoy na pangalan ang mapa. Sinusubukan mo bang mag-load ng save file?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Apply
 editor.generate = Generate
+editor.sectorgenerate = Sector Generate
 editor.resize = Resize
-editor.loadmap = Load Map
-editor.savemap = Save Map
+editor.loadmap = I-load ang Mapa
+editor.savemap = I-save ang Mapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Saved!
-editor.save.noname = Your map does not have a name! Set one in the 'map info' menu.
-editor.save.overwrite = Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
-editor.import.exists = [scarlet]Unable to import:[] a built-in map named '{0}' already exists!
+editor.save.noname = Walang pangalan ang iyong mapa! Itakda ang isa sa menu na 'impormasyon ng mapa'.
+editor.save.overwrite = Ino-overwrite ng iyong mapa ang isang built-in na mapa! Pumili ng ibang pangalan sa menu na 'impormasyon ng mapa'.
+editor.import.exists = [scarlet]Hindi kayang ma-import:[] mayroon nang built-in na mapa na '{0}'!
 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.importmap = Import ang Mapa
+editor.importmap.description = Mag-import ng umiiral nang mapa
+editor.importfile = Import ang File
+editor.importfile.description = Mag-import ng panlabas na file ng mapa
+editor.importimage = Mag-import ng File ng Larawan
+editor.importimage.description = Mag-import ng panlabas na file ng imahe ng mapa
 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.exportfile = I-export ang File
+editor.exportfile.description = Mag-Export nang map file
+editor.exportimage = I-export ang Terrain Image
+editor.exportimage.description = Mag-export ng image file na naglalaman lamang ng basic terrain
+editor.loadimage = Import ang Terrain
+editor.saveimage = I-export ang Terrain
+editor.unsaved = [scarlet]Mayroon kang mga hindi na-adyang mga pagbabago![]\nSigurado ka bang gusto mong mag-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:
+editor.mapname = Pangalan ng Mapa:
+editor.overwrite = [accent]Warning!\nIno-overwrite nito ang isang existing na mapa.
+editor.overwrite.confirm = [scarlet]Warning![] Umiiral na ang isang mapa na may ganitong pangalan. Sigurado ka bang gusto mong i-overwrite ito?\n"[accent]{0}[]"
+editor.exists = Umiiral na ang isang mapa na may ganitong pangalan.
+editor.selectmap = Pumili ng mapa na ilo-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.replace = Palitan
+toolmode.replace.description = Gumuhit lamang sa mga solidong blocks.
+toolmode.replaceall = Palitan Lahat
+toolmode.replaceall.description = Palitan ang lahat ng mga blocks sa mapa.
 toolmode.orthogonal = Orthogonal
-toolmode.orthogonal.description = Draws only orthogonal lines.
+toolmode.orthogonal.description = Gumuhit lamang ng mga orthogonal na linya.
 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.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
-filters.empty = [lightgray]No filters! Add one with the button below.
+filters.empty = [lightgray]Walang mga filter! Magdagdag ng isa gamit ang button sa ibaba.
 filter.distort = Distort
 filter.noise = Noise
 filter.enemyspawn = Enemy Spawn Select
@@ -433,6 +594,7 @@ filter.clear = Clear
 filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
+filter.logic = Logic
 filter.option.scale = Scale
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -441,17 +603,39 @@ filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.angle = Angle
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Floor
 filter.option.flooronto = Target Floor
 filter.option.target = Target
+filter.option.replacement = Replacement
 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
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Width:
 height = Height:
@@ -462,214 +646,465 @@ load = Load
 save = Save
 fps = FPS: {0}
 ping = Ping: {0}ms
-language.restart = Please restart your game for the language settings to take effect.
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
+language.restart = Mangyaring i-restart ang iyong laro para magkabisa ang mga setting ng wika.
 settings = Settings
 tutorial = Tutorial
-tutorial.retake = Re-Take Tutorial
+tutorial.retake = Muling Kumuha ng Tutorial
 editor = Editor
 mapeditor = Map Editor
 
 abandon = Abandon
-abandon.text = This zone and all its resources will be lost to the enemy.
+abandon.text = Ang zone na ito at ang lahat ng mga mapagkukunan nito ay mawawala sa kaaway.
 locked = Locked
 complete = [lightgray]Complete:
 requirement.wave = Reach Wave {0} in {1}
-requirement.core = Destroy Enemy Core in {0}
+requirement.core = Wasakin ang Enemy Core sa {0}
 requirement.research = Research {0}
+requirement.produce = Produce {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Best Wave: {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
+map.multiplayer = Ang host lang ang makakatingin sa mga sektor.
 uncover = Uncover
-configure = Configure Loadout
+configure = I-Configure ang Loadout
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nai-detect ang nuclear strike: [lightgray]{0}
+announce.nuclearstrike = [red]âš  PAPALAPIT NA ANG NUCLEAR STRIKE âš 
 loadout = Loadout
 resources = Resources
-bannedblocks = Banned Blocks
+resources.max = Max
+bannedblocks = Mga Pinagbabawalan na Blocks
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Mga Pinagbabawalan na Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 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
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = Ang halaga ay dapat na isang numero sa pagitan ng 0 at {0}.
+add = I-Add...
+guardian = Guardian
 
-connectfail = [scarlet]Connection error:\n\n[accent]{0}
-error.unreachable = Server unreachable.\nIs the address spelled correctly?
+connectfail = [scarlet]Error sa Koneksyon:\n\n[accent]{0}
+error.unreachable = Hindi maabot ang server.\nTama ba ang spelling ng address?
 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.timedout = Timed out!\nTiyaking may naka-set up na port forwarding ang host, at tama ang address!
+error.mismatch = Packet error:\nposibleng client/server version mismatch.\nTiyaking mayroon ka at ang host ng pinakabagong bersyon ng Mindustry!
+error.alreadyconnected = Nakakonekta na.
+error.mapnotfound = Hindi nakita ang file ng mapa!
 error.io = Network I/O error.
 error.any = Unknown network error.
-error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.bloom = Nabigong simulan ang bloom.\nMaaaring hindi ito sinusuportahan ng iyong device.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
+weather.rain.name = Ulan
+weather.snowing.name = Niyebe
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Mga Sector
+sectorlist.attacked = {0} ay inaatake
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
-sectors.production = Production:
+sectors.production = Produksyon:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Oras:
+sectors.threat = Threat:
+sectors.wave = Mga Waves:
 sectors.stored = Stored:
 sectors.resume = Resume
-sectors.launch = Launch
-sectors.select = Select
+sectors.launch = I-Launch
+sectors.select = I-Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Palitan ang pangalan ng Sector
+
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Punta
+sector.abandon = Abandonahin
+sector.abandon.confirm = Ang core (o mga core) sa sector ay mag se-self-destruct.\nSigurado ka?
+sector.curcapture = Nai-capture ang sector
+sector.curlost = Nawala ang sector
+sector.missingresources = [scarlet]Kulang ang mga Core Resources
+sector.attacked = Ang sector [accent]{0}[white] ay inaatake!
+sector.lost = Ang sector [accent]{0}[white] ay nawala!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = I-Change ang Icon
+sector.noswitch.title = Hindi ka mapalit sa ibang Sectors
+sector.noswitch = Hindi ka pwede magpalit ng sectors habang ina-atake ang isang sector mo.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = Tingnan ang Sector
+threat.low = Mababa
+threat.medium = Medium
+threat.high = Mataas
+threat.extreme = Sobra-sobra
+threat.eradication = Tiyak na talo sa hind handa
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Mga planeta
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Araw
 
+sector.impact0078.name = Impact 0078
 sector.groundZero.name = Ground Zero
-sector.craters.name = The Craters
-sector.frozenForest.name = Frozen Forest
+sector.craters.name = Mga Bunganga
+sector.frozenForest.name = Kagubatang Nagyelo
 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.nuclearComplex.name = Complex para sa Nuklear na Produksyon
+sector.overgrowth.name = Labis ng paglalaki
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Pasilidad 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Kutang Pantubig
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.
+sector.groundZero.description = Ang pinakamainam na lokasyon upang magsimulang muli. Mababang banta ng kaaway. Kaunting mapagkukunan.\nMagtipon ng mas maraming tingga at tanso hangga't maaari.\nItuloy.
+sector.frozenForest.description = Kahit dito, mas malapit sa mga bundok, ang mga spore ay kumalat. Ang napakalamig na temperatura ay hindi maaaring maglaman ng mga ito magpakailanman.\n\nSimulan ang pakikipagsapalaran sa kapangyarihan. Bumuo ng mga generator ng pagkasunog. Matutong gumamit ng mga mender.
+sector.saltFlats.description = Sa labas ng disyerto ay matatagpuan ang Salt Flats. Ilang resource ang makikita sa lokasyong ito.\n\nNagtayo ang kaaway ng resource storage complex dito. Tanggalin ang kanilang core. Walang iwanan na nakatayo.
+sector.craters.description = Ang tubig ay naipon sa bunganga na ito, relic ng mga lumang digmaan. Bawiin ang lugar. Mangolekta ng buhangin. Gumawa ng metaglass. Magbomba ng tubig upang palamig ang mga turret at drill.
+sector.ruinousShores.description = Nakalipas ang mga basura, ay ang baybayin. Minsan, ang lokasyong ito ay mayroong hanay ng pagtatanggol sa baybayin. Hindi gaanong natitira. Tanging ang pinakapangunahing mga istruktura ng depensa ang nananatiling hindi nasaktan, lahat ng iba pa ay nabawasan sa scrap.\nIpagpatuloy ang pagpapalawak. Tuklasin muli ang teknolohiya.
+sector.stainedMountains.description = Sa kabilang bahagi ng lupain ay matatagpuan ang mga bundok, ngunit hindi nababahiran ng mga spores.\nI-extract ang masaganang titanium sa lugar na ito. Alamin kung paano ito gamitin.\n\nMas malaki ang presensya ng kaaway dito. Huwag silang bigyan ng oras na ipadala ang kanilang pinakamalakas na unit.
+sector.overgrowth.description = Ang lugar na ito ay tinutubuan, mas malapit sa pinagmumulan ng mga spores.\nNagtatag ang kalaban ng isang outpost dito. Bumuo ng mga yunit ng Titan. Sirain mo. Bawiin ang nawala.
+sector.tarFields.description = Ang labas ng isang oil production zone, sa pagitan ng mga bundok at disyerto. Isa sa ilang lugar na may magagamit na reserbang tar.\nBagaman inabandona, ang lugar na ito ay may ilang mapanganib na pwersa ng kaaway sa malapit. Huwag maliitin ang mga ito.\n\n[lightgray]Magsaliksik ng teknolohiya sa pagproseso ng langis kung maaari.
+sector.desolateRift.description = Isang mapanganib na sona. Maraming mapagkukunan, ngunit maliit na espasyo. Mataas na panganib ng pagkasira. Umalis sa lalong madaling panahon. Huwag magpalinlang sa mahabang espasyo sa pagitan ng mga pag-atake ng kaaway.
+sector.nuclearComplex.description = Isang dating pasilidad para sa paggawa at pagpoproseso ng thorium, naging mga guho.\n[lightgray]Saliksikin ang thorium at ang maraming gamit nito.\n\nAng kaaway ay naroroon sa napakaraming bilang, patuloy na naghahanap ng mga umaatake.
+sector.fungalPass.description = Isang transition area sa pagitan ng matataas na bundok at mas mababang, spore-ridden na lupain. Matatagpuan dito ang isang maliit na base ng reconnaissance ng kaaway.\nSirain ito.\nGumamit ng mga unit ng Dagger at Crawler. Ilabas ang dalawang core.
+sector.biomassFacility.description = Ang pinagmulan ng mga spores. Ito ang pasilidad kung saan sila sinaliksik at unang ginawa.\nSaliksikin ang teknolohiyang nakapaloob sa loob. Linangin ang mga spores para sa paggawa ng gasolina at mga plastik.\n\n[lightgray]Sa pagkamatay ng pasilidad na ito, inilabas ang mga spores. Wala sa lokal na ecosystem ang maaaring makipagkumpitensya sa gayong invasive na organismo.
+sector.windsweptIslands.description = Sa kabila ng baybayin ay ang malayong hanay ng mga isla. Ipinapakita ng mga rekord na minsan silang nagkaroon ng [accent]Plastanium[]-producing structures.\n\nTakasan ang mga yunit ng hukbong-dagat ng kalaban. Magtatag ng isang base sa mga isla. Magsaliksik sa mga pabrika na ito.
+sector.extractionOutpost.description = Isang malayong outpost, na itinayo ng kaaway para sa layunin ng paglulunsad ng mga mapagkukunan sa iba pang mga sektor.\n\nAng cross-sector transport technology ay mahalaga para sa karagdagang pananakop. Wasakin ang base. Magsaliksik sa kanilang mga Launch Pad.
+sector.impact0078.description = Dito nakalatag ang mga labi ng interstellar transport vessel na unang pumasok sa sistemang ito.\n\nSalvage hangga't maaari mula sa pagkawasak. Magsaliksik ng anumang buo na teknolohiya.
+sector.planetaryTerminal.description = Ang huling target.\n\nAng coastal base na ito ay naglalaman ng isang istraktura na may kakayahang maglunsad ng mga Core sa mga lokal na planeta. Ito ay napakahusay na binabantayan.\n\nGumawa ng mga yunit ng hukbong-dagat. Tanggalin ang kalaban sa lalong madaling panahon. Magsaliksik sa istraktura ng paglulunsad.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lawa
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Hati
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Itaas
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Sangang Daanan
+sector.karst.name = Karst
+sector.origin.name = Pinaggalingan
+sector.onset.description = Ang tutorial sector. Ang objective ay hindi pa nagawa. Maghintay para sa kinabukasang impormasyon.
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Nasusunog
+status.freezing.name = Nayeyelo
+status.wet.name = Basa
+status.muddy.name = Naputikan
+status.melting.name = Natutunaw
+status.sapped.name = Napahina
+status.electrified.name = Napakuryente
+status.spore-slowed.name = Binagalan ng Spore
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Di-magalaw
+status.boss.name = Namumuno
 
-settings.language = Language
+settings.language = Wika
 settings.data = Game Data
-settings.reset = Reset to Defaults
-settings.rebind = Rebind
-settings.resetKey = Reset
-settings.controls = Controls
+settings.reset = I-Reset sa mga Default
+settings.rebind = I-Rebind
+settings.resetKey = I-Reset
+settings.controls = Mga 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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
+settings.cleardata = I-Clear ang Game Data...
+settings.clear.confirm = Sigurado ka bang gusto mong i-clear ang data na ito?\nHindi na mababawi ang nagawa!
+settings.clearall.confirm = [scarlet]WARNING![]\nIki-clear nito ang lahat ng data, kabilang ang mga pag-save, mapa, pag-unlock at keybinds.\nKapag pinindot mo ang 'ok', ibubura ng laro ang lahat ng data at awtomatikong lalabas.
+settings.clearsaves.confirm = Sigurado ka bang gusto mong i-clear ang lahat ng iyong saves?
+settings.clearsaves = I-Clear Saves
+settings.clearresearch = I-Clear Research
+settings.clearresearch.confirm = Sigurado ka bang gusto mong i-clear ang lahat ng iyong campaign research?
+settings.clearcampaignsaves = Tanggalin ang mga Campaign Save
+settings.clearcampaignsaves.confirm = Sigurado ka bang gusto mong i-clear ang lahat ng iyong mga campaign save?
 paused = [accent]< Paused >
 clear = Clear
-banned = [scarlet]Banned
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
-yes = Yes
-no = No
+banned = [scarlet]Pinagbabawalan!
+unsupported.environment = [scarlet]Hindi supportadong Environment
+yes = OO
+no = Hindi
 info.title = Info
 error.title = [scarlet]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Layunin
 
 stat.input = Input
 stat.output = Output
-stat.booster = Booster
-stat.tiles = Required Tiles
-stat.affinities = Affinities
-stat.powercapacity = Power Capacity
-stat.powershot = Power/Shot
-stat.damage = Damage
-stat.targetsair = Targets Air
-stat.targetsground = Targets Ground
-stat.itemsmoved = Move Speed
-stat.launchtime = Time Between Launches
-stat.shootrange = Range
-stat.size = Size
-stat.displaysize = Display Size
+stat.maxefficiency = Max ng Kahusayan
+stat.booster = Pampalakas
+stat.tiles = Kinakailangan mga Tiles
+stat.affinities = Pagkakaugnay
+stat.opposites = Kabaligtaran
+stat.powercapacity = Kapasidad ng Kuryente
+stat.powershot = Kuryente/Putok
+stat.damage = Pinsala
+stat.targetsair = Tinatarget ng mga Air
+stat.targetsground = Tinatarget ng mga Ground
+stat.itemsmoved = Bilis ng Pag-galaw
+stat.launchtime = Oras sa pagitan ng mga launches
+stat.shootrange = Saklaw
+stat.size = Laki
+stat.displaysize = Laki ng Display
 stat.liquidcapacity = Liquid Capacity
-stat.powerrange = Power Range
-stat.linkrange = Link Range
-stat.instructions = Instructions
-stat.powerconnections = Max Connections
-stat.poweruse = Power Use
-stat.powerdamage = Power/Damage
-stat.itemcapacity = Item Capacity
-stat.memorycapacity = Memory Capacity
-stat.basepowergeneration = Base Power Generation
-stat.productiontime = Production Time
+stat.powerrange = Saklaw ng Kuryente
+stat.linkrange = Saklaw ng Link
+stat.instructions = Tagubilin
+stat.powerconnections = Max na Koneksyon
+stat.poweruse = Ginagamit ng Kuryente
+stat.powerdamage = Kuryente/Pinsala
+stat.itemcapacity = Kapasidad ng mga Aytem
+stat.memorycapacity = Kapasidad ng Memorya
+stat.basepowergeneration = Pagbuo ng Kuryente
+stat.productiontime = Oras ng Produksyon
 stat.repairtime = Block Full Repair Time
-stat.speedincrease = Speed Increase
-stat.range = Range
-stat.drilltier = Drillables
-stat.drillspeed = Base Drill Speed
-stat.boosteffect = Boost Effect
+stat.repairspeed = Bilis ng pagkumpuni
+stat.weapons = Armas
+stat.bullet = Bala
+stat.moduletier = Module Tier
+stat.unittype = Uri ng mga Unit
+stat.speedincrease = Pag-taas ng bilis
+stat.range = Saklaw
+stat.drilltier = Mga Drillable
+stat.drillspeed = Base na Bilis ng Drill
+stat.boosteffect = Epekto ng Lakas
 stat.maxunits = Max Active Units
 stat.health = Health
-stat.buildtime = Build Time
+stat.armor = Baluti
+stat.buildtime = Oras ng pagbuo
 stat.maxconsecutive = Max Consecutive
-stat.buildcost = Build Cost
-stat.inaccuracy = Inaccuracy
-stat.shots = Shots
-stat.reload = Shots/Second
-stat.ammo = Ammo
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
+stat.buildcost = Gastos ng pagbuo
+stat.inaccuracy = Ang Inaccuracy
+stat.shots = Mga Putok
+stat.reload = Putok/Segundo
+stat.ammo = Mga Bala
+stat.shieldhealth = Health ng Kalasag
+stat.cooldowntime = Oras ng Cooldown
+stat.explosiveness = Pagkasabog
 stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
+stat.lightningchance = Pagkakataon ng Lightning
+stat.lightningdamage = Pinsala ng Lightning
+stat.flammability = Pagkasunog
+stat.radioactivity = Radyaktibidad
+stat.charge = Charge
+stat.heatcapacity = Kapasidad ng Init
+stat.viscosity = Lagkit
+stat.temperature = Temperatura
+stat.speed = Bilis
+stat.buildspeed = Bilis ng Pag-buo
+stat.minespeed = Bilis ng Pagmimina
 stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.payloadcapacity = Kapasidad ng Payload
+stat.abilities = Mga Abilidad
+stat.canboost = Maaaring Magpalakas
+stat.flying = Maaring Maglipad
+stat.ammouse = Paggamit ng Bala
+stat.ammocapacity = Kapasidad ng Bala
+stat.damagemultiplier = Multiplier ng Pinsala
+stat.healthmultiplier = Multiplier ng Health
+stat.speedmultiplier = Multiplier ng Bilis
+stat.reloadmultiplier = Multiplier ng BReload
+stat.buildspeedmultiplier = Multiplier ng Bilis ng Pag-buo
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max ng mga target
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] pagbabawas ng pinsala
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min ng bilis
+ability.stat.duration = [stat]{0} sec[lightgray] na tagal
+ability.stat.buildtime = [stat]{0} sec[lightgray] oras na pagbuo
 
-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.powerlines = Connections: {0}/{1}
-bar.items = Items: {0}
-bar.capacity = Capacity: {0}
+bar.onlycoredeposit = Pinapayag lang ang Cire Depositing
+
+bar.drilltierreq = Kinakailangan ang Mas mahusay na Drill
+bar.nobatterypower = Insufficient Battery Power
+bar.noresources = Walang mga Kinakailangang Resources
+bar.corereq = Kinakailangang Core Base
+bar.corefloor = Kinakailangang Tile ng Core Zone
+bar.cargounitcap = Naabot ng Limit ng Cargo Unit
+bar.drillspeed = Bilis ng Drill: {0}/s
+bar.pumpspeed = Bilis ng Pump: {0}/s
+bar.efficiency = Kahusayan: {0}%
+bar.boost = Palakas: +{0}%
+bar.powerbuffer = Batteries: {0}/{1}
+bar.powerbalance = Kuryente: {0}/s
+bar.powerstored = Nakaimbak: {0}/{1}
+bar.poweramount = Kuryente: {0}
+bar.poweroutput = Output ng Kuryente: {0}
+bar.powerlines = Mga Connection: {0}/{1}
+bar.items = Aytems: {0}
+bar.capacity = Kapasidad: {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.liquid = Likido
+bar.heat = Init
+bar.cooldown = Cooldown
+
+bar.instability = Instability
+bar.heatamount = Init: {0}
+bar.heatpercent = Init: {0} ({1}%)
+bar.power = Kuryente
+bar.progress = Progress ng Bumuo
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -677,52 +1112,74 @@ 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.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
 bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blocks
 unit.blockssquared = 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.powersecond = mga yunit ng kuryente/segundo
+unit.tilessecond = tile/segundo
+unit.liquidsecond = mga yunit ng likido/segundo
+unit.itemssecond = aytem/segundo
+unit.liquidunits = mga yunit ng likido
+unit.powerunits = mga yunit ng kuryente
+unit.heatunits = mga yunit ng init
+unit.degrees = digri
+unit.seconds = segundo
 unit.minutes = mins
-unit.persecond = /sec
+unit.persecond = /seg
 unit.perminute = /min
-unit.timesspeed = x speed
+unit.timesspeed = x bilis
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = shield health
-unit.items = items
+unit.shieldhealth = health ng kalasag
+unit.items = aytems
 unit.thousands = k
 unit.millions = mil
-unit.billions = b
-category.general = General
-category.power = Power
-category.liquids = Liquids
-category.items = Items
+unit.billions = bil
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Ang Purpose
+category.general = Pangkalahatan
+category.power = Kuryente
+category.liquids = Mga Likido
+category.items = Mga Aytem
 category.crafting = Input/Output
 category.function = Function
-category.optional = Optional Enhancements
+category.optional = Opsyonal na mga enchantment
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Laktawan ang Core Launch/Land Animation
 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.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit
+setting.modcrashdisable.name = Huwag paganahin ang Mods Sa Startup Crash
 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
@@ -732,61 +1189,66 @@ 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.uiscale.description = Kinakailangan ang pag-restart upang mailapat ang mga pagbabago.
+setting.swapdiagonal.name = Palaging Diagonal na Placement
 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.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
+setting.effects.name = I-Display Effects
+setting.destroyedblocks.name = Ipakita ang mga Nawasak na Block
+setting.blockstatus.name = I-Display Block Status
+setting.conveyorpathfinding.name = Pathfinding ng Conveyor Placement
 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.seconds = {0} segundo
+setting.milliseconds = {0} millisegundo
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Maaaring kailanganin ang pag-restart upang mailapat ang mga pagbabago.
 setting.fps.name = Show FPS & Ping
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate
 setting.minimap.name = Show Minimap
-setting.coreitems.name = Display Core Items (WIP)
+setting.coreitems.name = Display Core Items
 setting.position.name = Show Player Position
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Music Volume
-setting.atmosphere.name = Show Planet Atmosphere
+setting.atmosphere.name = Ipakita Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
-setting.crashreport.name = Send Anonymous Crash Reports
+setting.crashreport.name = Mag-send ng Anonymous Crash Reports
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
+setting.unitlaseropacity.name = Unit Mining Beam 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.playerchat.name = Ipakita Player Bubble Chat
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Iangkop ang interface upang ipakita ang bingaw
+setting.macnotch.description = Kinakailangan ang pag-restart upang mailapat ang mga pagbabago
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
+public.beta = Tandaan na ang mga beta na bersyon ng laro ay hindi maaaring gumawa ng mga pampublikong lobby.
+uiscale.reset = Nabago ang sukat ng UI.\nPindutin ang "OK" upang kumpirmahin ang sukat na ito.\n[scarlet]Binabalik at lalabas sa dating anyo ng[accent] {0}[] segundo...
+uiscale.cancel = I-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.
+keybinds.mobile = [scarlet]Karamihan sa mga keybinds dito ay hindi gumagana sa mobile. Ang pangunahing paggalaw lamang ang sinusuportahan.
 category.general.name = General
 category.view.name = View
+category.command.name = Unit Command
 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
@@ -801,6 +1263,27 @@ keybind.move_y.name = Move Y
 keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -826,18 +1309,22 @@ keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo
-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.planet_map.name = Mapa ng Planeta
+keybind.research.name = Mga Research
+keybind.block_info.name = Info ng Block
 keybind.chat.name = Chat
-keybind.player_list.name = Player List
+keybind.player_list.name = Lista ng mga Players
 keybind.console.name = Console
 keybind.rotate.name = Rotate
 keybind.rotateplaced.name = Rotate Existing (Hold)
@@ -845,81 +1332,150 @@ keybind.toggle_menus.name = Toggle Menus
 keybind.chat_history_prev.name = Chat History Prev
 keybind.chat_history_next.name = Chat History Next
 keybind.chat_scroll.name = Chat Scroll
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = Drop Unit
 keybind.zoom_minimap.name = Zoom Minimap
 mode.help.title = Description of modes
 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.survival.description = Ang normal na mode. Mga limitadong mapagkukunan at awtomatikong papasok na alon.\n[gray]Nangangailangan ng mga spawn ng kaaway sa mapa para maglaro.
 mode.sandbox.name = Sandbox
-mode.sandbox.description = Infinite resources and no timer for waves.
+mode.sandbox.description = Maraming resources at walang timer nang 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.pvp.description = Lumaban sa iba pang mga manlalaro nang lokal.\n[gray]Nangangailangan ng hindi bababa sa 2 magkakaibang kulay na mga core sa mapa upang maglaro.
 mode.attack.name = Attack
-mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
+mode.attack.description = Wasakin ang base ng kalaban. \n[gray]Nangangailangan ng pulang core sa mapa upang maglaro.
 mode.custom = Custom Rules
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Infinite Resources
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Waves
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Attack Mode
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
+rules.initialwavespacing = Initial 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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.unitammo = Units Require Ammo
+rules.unitammo = Mga yunit nangangailangan ng Munisyon
+rules.enemyteam = Pangkat ng mga Kaaway
+rules.playerteam = Pangkat ng Player
 rules.title.waves = Waves
 rules.title.resourcesbuilding = Resources & Building
-rules.title.enemy = Enemies
-rules.title.unit = Units
+rules.title.enemy = Mga Kaaway
+rules.title.unit = Mga Yunit
 rules.title.experimental = Experimental
-rules.title.environment = Environment
+rules.title.environment = Kapaligiran
+rules.title.teams = Mga Team
+rules.title.planet = Planeta
 rules.lighting = Lighting
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.weather = Weather
+rules.weather = Panahon
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
-content.item.name = Items
-content.liquid.name = Liquids
-content.unit.name = Units
-content.block.name = Blocks
+content.item.name = Aytems
+content.liquid.name = Likido
+content.unit.name = Yunits
+content.block.name = Mga Block
+content.status.name = Status ng mga Epekto
+content.sector.name = Mga Sector
+content.team.name = Mga Faction
+wallore = (Wall)
+
+item.copper.name = Tanso
+item.lead.name = Tingga
 
-item.copper.name = Copper
-item.lead.name = Lead
 item.coal.name = Coal
-item.graphite.name = Graphite
-item.titanium.name = Titanium
+item.graphite.name = Grapayt
+item.titanium.name = Titanyo
 item.thorium.name = Thorium
-item.silicon.name = Silicon
+item.silicon.name = Silikon
 item.plastanium.name = Plastanium
-item.phase-fabric.name = Phase Fabric
+item.phase-fabric.name = Phase Pabriko
 item.surge-alloy.name = Surge Alloy
 item.spore-pod.name = Spore Pod
-item.sand.name = Sand
+item.sand.name = Buhangin
 item.blast-compound.name = Blast Compound
 item.pyratite.name = Pyratite
 item.metaglass.name = Metaglass
-item.scrap.name = Scrap
-liquid.water.name = Water
+item.scrap.name = Piraso
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Berilyo
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
+liquid.water.name = Tubig
 liquid.slag.name = Slag
-liquid.oil.name = Oil
-liquid.cryofluid.name = Cryofluid
+liquid.oil.name = Langis
+liquid.cryofluid.name = Lamigtubig
+
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -947,6 +1503,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,21 +1515,43 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Drone sa Paggagawa
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
-block.sand-boulder.name = Sand Boulder
-block.grass.name = Grass
-block.slag.name = Slag
-block.space.name = Space
-block.salt.name = Salt
-block.salt-wall.name = Salt Wall
+block.sand-boulder.name = Batong Buhangin
+block.basalt-boulder.name = Batong Basalt
+block.grass.name = Damo
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
+block.space.name = Kalawakan
+block.salt.name = Asin
+block.salt-wall.name = Asin na Pader
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sand-wall.name = Sand Wall
+block.sand-wall.name = Buhangin na Pader
 block.spore-pine.name = Spore Pine
-block.spore-wall.name = Spore Wall
+block.spore-wall.name = Spore na Pader
 block.boulder.name = Boulder
 block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
@@ -978,136 +1561,143 @@ 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.scrap-wall.name = Pirasong Pader
+block.scrap-wall-large.name = Malaking Pirasong Pader
+block.scrap-wall-huge.name = Masmalaking Pirasong Pader
+block.scrap-wall-gigantic.name = Pinakamalaking Pirasong Pader
 block.thruster.name = Thruster
 block.kiln.name = Kiln
-block.graphite-press.name = Graphite Press
+block.graphite-press.name = Grapayt Press
 block.multi-press.name = Multi-Press
 block.constructing = {0} [lightgray](Constructing)
 block.spawn.name = Enemy Spawn
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 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.deep-water.name = Malalim ng Tubig
+block.shallow-water.name = Tubig
+block.tainted-water.name = Bahid ng Tubig
+block.deep-tainted-water.name = Malalim na bahid ng tubig
+block.darksand-tainted-water.name = Madilim na buhangin na may bahid ng tubig
 block.tar.name = Tar
-block.stone.name = Stone
-block.sand.name = Sand
-block.darksand.name = Dark Sand
-block.ice.name = Ice
+block.stone.name = Bato
+block.sand-floor.name = Buhangin
+block.darksand.name = Madilim na Buhangin
+
+block.ice.name = Yelo
 block.snow.name = Snow
-block.craters.name = Craters
-block.sand-water.name = Sand water
+block.crater-stone.name = Craters
+block.sand-water.name = Buhangin na Tubig
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 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.stone-wall.name = Pader na Bato
+block.ice-wall.name = Pader na Yelo
+block.snow-wall.name = Pader na Niyebe
+block.dune-wall.name = Pader ng Dune
 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.dirt.name = Dumi
+block.dirt-wall.name = Pader ng Dumi
+block.mud.name = Putik
+block.white-tree-dead.name = Namatay na Puting Puno
+block.white-tree.name = Puting Puno
+block.spore-cluster.name = Kumpol ng Spore
+block.metal-floor.name = Bakal na Sahig 1
+block.metal-floor-2.name = Bakal na Sahig 2
+block.metal-floor-3.name = Bakal na Sahig 3
+block.metal-floor-4.name = Bakal na Sahig 4
+block.metal-floor-5.name = Bakal na Sahig 4
+block.metal-floor-damaged.name = Wasak na Bakal na Sahig
+block.dark-panel-1.name = Madilim na Panel 1
+block.dark-panel-2.name = Madilim na Panel 2
+block.dark-panel-3.name = Madilim na Panel 3
+block.dark-panel-4.name = Madilim na Panel 4
+block.dark-panel-5.name = Madilim na Panel 5
+block.dark-panel-6.name = Madilim na Panel
+block.dark-metal.name = Madilim na Bakal
 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.hotrock.name = Mainit na Bato
+block.magmarock.name = Batong Magma
+block.copper-wall.name = Tanso na Pader
+block.copper-wall-large.name = Malaking Tanso na Pader
+block.titanium-wall.name = Titanyo na Pader
+block.titanium-wall-large.name = Malaking Titanyo na Pader
+block.plastanium-wall.name = Plastanium na Pader
+block.plastanium-wall-large.name = Malaking Plastanium na Pader
+block.phase-wall.name = Phase na Pader
+block.phase-wall-large.name = Malaking Phase na Pader
+block.thorium-wall.name = Thorium na Pader
+block.thorium-wall-large.name = Malaking Thorium na Pader
+block.door.name = Pinto
+block.door-large.name = Malaking Pinto
 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.titanium-conveyor.name = Titanyo na Conveyor
+block.plastanium-conveyor.name = Plastanium na Conveyor
+block.armored-conveyor.name = Nakabaluti na Conveyor
 block.junction.name = Junction
 block.router.name = Router
-block.distributor.name = Distributor
+block.distributor.name = Distribyutor
 block.sorter.name = Sorter
 block.inverted-sorter.name = Inverted Sorter
-block.message.name = Message
+block.message.name = Mensahe
+block.reinforced-message.name = Pinatibay na Mensahe
+block.world-message.name = Mensahe ng Mundo
+block.world-switch.name = World Switch
 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.silicon-smelter.name = Silikon na Smelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulverizer
 block.cryofluid-mixer.name = Cryofluid Mixer
-block.melter.name = Melter
+block.melter.name = Pangtunaw
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
-block.separator.name = Separator
+block.separator.name = Panghiwalay
 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.power-node.name = Kuryente na Node
+block.power-node-large.name = Malaking Kuryente na Node
+block.surge-tower.name = Tore na Surge
+block.diode.name = Bateryang Diode
+block.battery.name = Baterya
+block.battery-large.name = Malaking Baterya
 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.mechanical-drill.name = Mekanikal na Drill
+block.pneumatic-drill.name = Niyumatik na 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 Source
-block.unloader.name = Unloader
+block.conduit.name = Tubo
+block.mechanical-pump.name = Mekanikal na Pump
+block.item-source.name = Pinagmulan ng Aytem
+block.item-void.name = Void ng Aytem
+block.liquid-source.name = Pinagmulan ng Likido
+block.liquid-void.name = Void ng Likido
+block.power-void.name = Void ng Kuryente
+block.power-source.name = Pinagmulan ng Kuryente
+block.unloader.name = Diskargahan
 block.vault.name = Vault
 block.wave.name = Wave
 block.tsunami.name = Tsunami
 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.phase-conveyor.name = Phase na Conveyor
+block.bridge-conveyor.name = Tulay ng Conveyor
 block.plastanium-compressor.name = Plastanium Compressor
 block.pyratite-mixer.name = Pyratite Mixer
 block.blast-mixer.name = Blast Mixer
@@ -1115,28 +1705,30 @@ 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.repair-turret.name = Repair Turret
+block.pulse-conduit.name = Pulse na Conduit
+block.plated-conduit.name = Plated na Conduit
+block.phase-conduit.name = Phase na Conduit
+block.liquid-router.name = Likidong Router
+block.liquid-tank.name = Likidong Tangke
+block.liquid-container.name = Likidong Lalagyan
+block.liquid-junction.name = Likidong Junction
+block.bridge-conduit.name = Tubong Tulay
 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.impulse-pump.name = Impulse Pump
 block.thermal-generator.name = Thermal Generator
-block.alloy-smelter.name = Alloy Smelter
+block.surge-smelter.name = Surge 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.surge-wall.name = Surge na Pader
+block.surge-wall-large.name = Malaking Surge na Pader
 block.cyclone.name = Cyclone
 block.fuse.name = Fuse
-block.shock-mine.name = Shock Mine
-block.overdrive-projector.name = Overdrive Projector
+block.shock-mine.name = Mina ng Kuryente
+block.overdrive-projector.name = Projector ng Overdrive
 block.force-projector.name = Force Projector
 block.arc.name = Arc
 block.rtg-generator.name = RTG Generator
@@ -1145,178 +1737,449 @@ 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.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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.ground-factory.name = Pabrika ng Lupa
+block.air-factory.name = Pabrika ng Langit
+block.naval-factory.name = Pabrika ng Pandagat
 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.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Malaking Constructor
+block.large-constructor.description = Gumagawa ng mga istruktura hanggang sa 4x4 na tile ang laki.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Nagde-deconstruct ng mga istruktura at yunit. Ibinabalik ang 100% ng halaga ng block.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Mag-load ng mga likido at mga item sa mga blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Naglalabas ng mga likido at mga item mula sa mga blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 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.large-logic-display.name = Malaking Logic Display
 block.memory-cell.name = Memory Cell
 block.memory-bank.name = Memory Bank
-
-team.blue.name = blue
+team.malis.name = Malis
 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.
+team.blue.name = blue
+hint.skip = Skip
+hint.desktopMove = Gamitin ang [accent][[WASD][] para gumalaw.
+hint.zoom = [accent]Scroll[] para mag-zoom in o out.
+hint.desktopShoot = [accent][[Left-click][] para mag-shoot.
+hint.depositItems = Upang maglipat ng mga item, i-drag mula sa iyong ship patungo sa core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = I-activate ang \ue817 [accent]hammer[] sa kanang bahagi sa ibaba at i-tap para masira ang mga bloke.\n\nI-hold ang iyong daliri sa isang segundo at i-drag para masira ang isang seleksyon.
+hint.blockInfo = Tingnan ang impormasyon ng isang block sa pamamagitan ng pagpili nito sa [accent]build menu[], pagkatapos ay pagpili sa [accent][[?][] na button sa kanan.
+hint.derelict = Ang [accent]Derelict[] na mga istraktura ay mga sirang labi ng mga lumang base na hindi na gumagana.\n\nAng mga istrukturang ito ay maaaring [accent]deconstructed[] para sa mga mapagkukunan.
+hint.research = Gamitin ang button na \ue875 [accent]Research[] para magsaliksik ng bagong teknolohiya.
+hint.research.mobile = Gamitin ang button na \ue875 [accent]Research[] sa \ue88c [accent]Menu[] para magsaliksik ng bagong teknolohiya.
+hint.unitControl = Pindutin ang [accent][[L-ctrl][] at [accent]click[] upang kontrolin ang mga friendly na unit o turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] para kontrolin ang mga friendly na unit o turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Kapag sapat na ang mga mapagkukunan, maaari mong [accent]Ilunsad[] sa pamamagitan ng pagpili sa mga kalapit na sektor mula sa \ue827 [accent]Map[] sa kanang ibaba.
+hint.launch.mobile = Kapag sapat na ang mga mapagkukunan, maaari mong [accent]Ilunsad[] sa pamamagitan ng pagpili sa mga kalapit na sektor mula sa \ue827 [accent]Map[] sa \ue88c [accent]Menu[].
+hint.schematicSelect = Pindutin ang [accent][[F][] at i-drag upang pumili ng mga bloke na kokopyahin at ipe-paste.\n\n[accent][[Middle Click][] upang kopyahin ang isang uri ng block.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Pindutin ang [accent][[L-Ctrl][] habang dina-drag ang mga conveyor para awtomatikong bumuo ng landas.
+hint.boost = Pindutin ang [accent][[L-Shift][] para lumipad sa mga obstacle kasama ang iyong kasalukuyang unit.\n\nIlang ground unit lang ang may mga booster
+hint.payloadPickup = Pindutin ang [accent][[[] para kunin ang maliliit na block o unit.
+hint.payloadPickup.mobile = [accent]I-tap nang matagal ang[] isang maliit na block o unit para kunin ito.
+hint.payloadDrop = Pindutin ang [accent]][] para mag-drop ng payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
-item.copper.description = 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.
+item.copper.description = Ang pinaka basic na struktural materyal. Malawakang ginagamit sa lahat ng types ng blocks.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
+item.lead.description = Ang panimulang at basic na materyal. Malawakang ginagamit sa electronika at sa transportasyon ng likido gamit ng blocks.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
+item.metaglass.description = Ito ay matigas na glass compound. Malawakang ginagamit sa distribution ng likido at pag imbakan.
+item.graphite.description = Mineralized carbon, Malawakang ginagamit sa ammunisyon at sa mga bahagi ng electrisidad.
+item.sand.description = Ang karaniwang  materyal na malawakang ginagamit sa smelting, pareho sa alloying at bilang flux
+item.coal.description = Ang karaniwang  materyal na malawakang ginagamit sa smelting, pareho sa alloying at bilang flux
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
+item.titanium.description = Ang bihira hanapin at magaan na metal. Malawaking ginagamit sa transportasyon ng likido, mga drills at aircraft.
+item.thorium.description = Ito ay malagong, radioactive metal ginagamit para sa supporta sa istraktura at nuklear fuel.
+item.scrap.description = Galing sa mga matatanda at natirang struktura  at units. Naglalaman ng ibat ibang metals.
+item.scrap.details = Leftover remnants of old structures and units.
+item.silicon.description = Ang nakakatulong na semiconductor. Aplikasyon sa solar panels, Komplikadong electronika at homing turret ammunisyon.
+item.plastanium.description = Ito ay magaan, malagkit na materyal ginamit sa advanced aircraft at fragmentation ammunisyon.
+item.phase-fabric.description = Ito ay malapit na mawalan ng timbang na substansya ginamit sa advanced  na electronika at self-repairing na technolohiya.
+item.surge-alloy.description = Ang advanced na pinag halung metal na may kakaibang electrical properties.
+item.spore-pod.description = Isang pod ng mga sintetikong spore, na synthesize mula sa mga konsentrasyon sa atmospera para sa mga layuning pang-industriya. Ginagamit para sa conversion sa langis, pampasabog at gasolina.
+item.spore-pod.details = Mga spores. Malamang na isang sintetikong anyo ng buhay. Naglalabas ng mga gas na nakakalason sa ibang biyolohikal na buhay. Lubhang invasive. Lubos na nasusunog sa ilang mga kundisyon.
+item.blast-compound.description = Isang hindi matatag na compound na ginagamit sa mga bomba at pampasabog. Na-synthesize mula sa mga spore pod at iba pang pabagu-bagong substance. Gamitin bilang gasolina ay hindi pinapayuhan.
+item.pyratite.description = Isang sobrang nasusunog na substance na ginagamit sa mga armas na nagniningas.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
+liquid.water.description = Ang pinaka-kapaki-pakinabang na likido. Karaniwang ginagamit para sa mga cooling machine at pagpoproseso ng basura.
+liquid.slag.description = Iba't ibang uri ng tinunaw na metal na pinaghalo. Maaaring ihiwalay sa mga mineral na bumubuo nito, o i-spray sa mga yunit ng kaaway bilang sandata.
+liquid.oil.description = Isang likidong ginagamit sa advanced na produksyon ng materyal. Maaaring gawing karbon bilang panggatong, o i-spray at sunugin bilang sandata.
+liquid.cryofluid.description = Isang inert, non-corrosive na likido na nilikha mula sa tubig at titanium. May napakataas na kapasidad ng init. Malawakang ginagamit bilang coolant.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Gumagalaw ng mga item sa parehong bilis ng mga titanium conveyor, ngunit nagtataglay ng mas maraming sandata. Hindi tumatanggap ng mga input mula sa mga gilid mula sa anumang bagay maliban sa iba pang mga conveyor belt.
+block.illuminator.description = Isang maliit, compact, configurable light source. Nangangailangan ng kapangyarihan upang gumana.
 
-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.message.description = Nag-iimbak ng mensahe. Ginagamit para sa komunikasyon sa pagitan ng mga kaalyado.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
+block.graphite-press.description = Pinipilit ang mga tipak ng karbon sa purong mga piraso ng grapayt.
+block.multi-press.description = Isang na-upgrade na bersyon ng graphite press. Gumagamit ng tubig at kapangyarihan upang iproseso ang karbon nang mabilis at mahusay.
+block.silicon-smelter.description = Binabawasan ang buhangin na may purong karbon. Gumagawa ng silikon.
+block.kiln.description = Tinutunaw ang buhangin at humahantong sa compound na kilala bilang metaglass. Nangangailangan ng maliit na halaga ng kapangyarihan upang tumakbo.
+block.plastanium-compressor.description = Gumagawa ng plastanium mula sa langis at titanium.
+block.phase-weaver.description = Synthesizes phase fabric mula sa radioactive thorium at buhangin. Nangangailangan ng napakalaking dami ng kapangyarihan upang gumana.
+block.surge-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy.
+block.cryofluid-mixer.description = Hinahalo ang tubig at pinong titanium powder sa cryofluid. Mahalaga para sa paggamit ng thorium reactor.
+block.blast-mixer.description = Dinudurog at hinahalo ang mga kumpol ng spores na may pyratite upang makagawa ng blast compound.
+block.pyratite-mixer.description = Naghahalo ng coal, lead at sand sa sobrang nasusunog na pyratite.
+block.melter.description = Tinutunaw ang scrap sa slag para sa karagdagang pagproseso o paggamit sa mga wave turret.
+block.separator.description = Pinaghihiwalay ang slag sa mga bahagi ng mineral nito. Inilalabas ang pinalamig na resulta.
+block.spore-press.description = Kino-compress ang mga spore pod sa ilalim ng matinding pressure para mag-synthesize ng oil.
+block.pulverizer.description = Dinudurog ang scrap sa pinong sand.
+block.coal-centrifuge.description = Pinapatigas ang oil sa mga coal.
+block.incinerator.description = Pinapasingaw ang anumang labis na bagay o likidong natatanggap nito.
+block.power-void.description = Walang laman ang lahat ng kuryente ipinasok dito. Sandbox lang.
+block.power-source.description = Walang katapusang naglalabas ng kuryente. Sandbox lang.
+block.item-source.description = Walang katapusan na naglalabas ng mga item. Sandbox lang.
+block.item-void.description = Sinisira ang anumang mga item. Sandbox lang.
+block.liquid-source.description = Walang katapusan na naglalabas ng mga likido. Sandbox lang.
+block.liquid-void.description = Tinatanggal ang anumang likido. Sandbox lang.
+block.payload-source.description = Walang katapusang naglalabas ng mga payload. Sandbox lang.
+block.payload-void.description = Sinisira ang anumang mga payload. Sandbox lang.
+block.copper-wall.description = Isang murang defensive block.\nKapaki-pakinabang para sa pagprotekta sa core at mga turret sa unang ilang alon.
+block.copper-wall-large.description = Isang murang defensive block.\nKapaki-pakinabang para sa pagprotekta sa core at mga turret sa unang ilang alon.\nKumuha ng maraming tile.
+block.titanium-wall.description = Isang katamtamang malakas na defensive block.\nNagbibigay ng katamtamang proteksyon mula sa mga kaaway.
+block.titanium-wall-large.description = Isang medyo malakas na defensive block.\nNagbibigay ng katamtamang proteksyon mula sa mga kaaway.\nKumuha ng maraming tile.
+block.plastanium-wall.description = Isang espesyal na uri ng pader na sumisipsip ng mga electric arc at hinaharangan ang mga awtomatikong koneksyon ng power node.
+block.plastanium-wall-large.description = Isang espesyal na uri ng pader na sumisipsip ng mga electric arc at hinaharangan ang mga awtomatikong koneksyon ng power node.\n Gumagamit ng maraming tile.
+block.thorium-wall.description = Isang malakas na defensive block.\nDisenteng proteksyon mula sa mga kaaway.
+block.thorium-wall-large.description = Isang malakas na defensive block.\nDisenteng proteksyon mula sa mga kaaway.\nGumagamit ng maraming tile.
+block.phase-wall.description = Isang pader na pinahiran ng espesyal na phase-based na reflective compound. Pinapalihis ang karamihan sa mga bala sa pagtama.
+block.phase-wall-large.description = Isang pader na pinahiran ng espesyal na phase-based na reflective compound. Pinapalihis ang karamihan sa mga bala kapag natamaan.\nGumagamit ng maraming tile.
+block.surge-wall.description = Isang napakatibay na defensive block.\nNagpapalaki ng singil sa bullet contact, na ilalabas ito nang random.
+block.surge-wall-large.description = Isang napakatibay na defensive block.\nBumubuo ng singil sa bullet contact, ilalabas ito nang random.\nGumagamit ng maraming tile.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Isang maliit na pinto. Maaaring buksan o isara sa pamamagitan ng pag-tap.
+block.door-large.description = Isang malaking pinto. Maaaring buksan at isara sa pamamagitan ng pag-tap.\nSpans maramihang mga tile.
+block.mender.description = Pana-panahong nag-aayos ng mga blocks sa paligid nito. Pinapanatiling maayos ang mga depensa sa pagitan ng mga alon.\nOpsyonal na gumagamit ng silicon upang palakasin ang saklaw at kahusayan.
+block.mend-projector.description = Isang na-upgrade na bersyon ng Mender. Nag-aayos ng mga bloke sa paligid nito.\nOpsyonal na gumagamit ng phase fabric upang palakasin ang saklaw at kahusayan.
+block.overdrive-projector.description = Pinapataas ang bilis ng mga kalapit na buildings.\nOpsyonal na gumagamit ng phase fabric upang palakasin ang saklaw at kahusayan.
+block.force-projector.description = Gumagawa ng hexagonal force field sa paligid nito, na nagpoprotekta sa mga gusali at unit sa loob mula sa pagkasira.\nNag-o-overheat kung masyadong maraming pinsala ang natamo. Opsyonal na gumagamit ng coolant upang maiwasan ang sobrang init. Maaaring gamitin ang phase fabric upang madagdagan ang laki ng kalasag.
+block.shock-mine.description = Pinipinsala ang mga kaaway na tumuntong sa minahan. Halos hindi nakikita ng kalaban.
+block.conveyor.description = Pangunahing block ng transportasyon ng item. Inililipat ang mga item pasulong at awtomatikong idedeposito ang mga ito sa mga bloke. Naiikot.
+block.titanium-conveyor.description = Advanced na block ng transportasyon ng item. Inilipat ang mga item nang mas mabilis kaysa sa mga karaniwang conveyor.
+block.plastanium-conveyor.description = Naglilipat ng mga item sa mga batch.\nTinatanggap ang mga item sa likod, at ibinababa ang mga ito sa tatlong direksyon sa harap.
+block.junction.description = Nagsisilbing tulay para sa dalawang tumatawid na conveyor belt. Kapaki-pakinabang sa mga sitwasyon na may dalawang magkaibang conveyor na nagdadala ng magkaibang mga materyales sa magkaibang lokasyon.
+block.bridge-conveyor.description = Advanced na block ng transportasyon ng item. Nagbibigay-daan sa pagdadala ng mga item sa hanggang 3 tile ng anumang lupain o gusali.
+block.phase-conveyor.description = Advanced na block ng transportasyon ng item. Gumagamit ng kuryente para mag-teleport ng mga item sa isang konektadong phase conveyor sa ilang tile.
+block.sorter.description = Pag-uuri ng mga item. Kung ang isang item ay tumugma sa pagpili, ito ay pinapayagang makapasa. Kung hindi, ang item ay nai-output sa kaliwa at kanan.
+block.inverted-sorter.description = Pinoproseso ang mga item tulad ng isang karaniwang sorter, ngunit sa halip ay naglalabas ng mga napiling item sa mga gilid.
+block.router.description = Tumatanggap ng mga item, pagkatapos ay i-output ang mga ito sa hanggang 3 iba pang direksyon nang pantay. Kapaki-pakinabang para sa paghahati ng mga materyales mula sa isang pinagmulan patungo sa maraming target.\n\n[scarlet]Huwag gumamit sa tabi ng mga production input, dahil mababara ang mga ito ng output.[]
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
+block.distributor.description = Isang advanced na router. Hinahati ang mga item sa hanggang 7 iba pang direksyon nang pantay.
+block.overflow-gate.description = Mga output lamang sa kaliwa at kanan kung ang harap na landas ay naka-block.
+block.underflow-gate.description = Ang kabaligtaran ng isang overflow gate. Mga output sa harap kung ang kaliwa at kanang mga landas ay naharang.
+block.mass-driver.description = Ang pinakahuling block ng transportasyon ng item. Nangongolekta ng ilang mga item at pagkatapos ay kukunan ang mga ito sa isa pang mass driver sa mahabang hanay. Nangangailangan ng kuryente upang gumana.
+block.mechanical-pump.description = Isang murang bomba na may mabagal na output, ngunit walang pagkonsumo ng kuryente.
+block.rotary-pump.description = Isang advanced na bomba. Nagbomba ng mas maraming likido, ngunit nangangailangan ng kapangyarihan.
+block.impulse-pump.description = Pumps and outputs liquids.
 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-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 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.power-node.description = Nagpapadala ng kuryente sa mga konektadong node. Ang node ay makakatanggap ng kuryente mula sa o magsu-supply ng kuryente sa anumang katabing block.
+block.power-node-large.description = Isang advanced na node na may mas malawak na hanay.
+block.surge-tower.description = Isang napakahabang kuryente na node, pero mas kaunting lamang magagamit na mga koneksyon.
+block.diode.description = Ang kuryente ng baterya ay maaaring dumaloy sa block na to sa isang direksyon lamang, ngunit kung ang kabilang panig ay may mas kaunting kuryenteng nakaimbak.
+block.battery.description = Nag-iimbak ng Kuryente bilang buffer sa mga oras ng sobrang enerhiya. Nag output ng mga kuryente sa oras ng kakulangan.
+block.battery-large.description = Nag-iimbak ng mas maraming kuryente kaysa sa normal na baterya.
+block.combustion-generator.description = Bumubuo ng kuryente sa pamamagitan ng pagsunog ng mga nasusunog na materyales, tulad ng coal.
+block.thermal-generator.description = Bumubuo ng kuryente sa mga maiinit na lugar.
+block.steam-generator.description = Isang advanced combustion generator. Mas efficient pero nangangailangan ng karagdagang tubig para sa pagbuo ng singaw.
+block.differential-generator.description = Bumubuo ng malaking halaga ng enerhiya. Ginagamit ang pagkakaiba ng temperatura sa pagitan ng cryofluid at nasusunog na pyratite.
+block.rtg-generator.description = Isang simpleng at maaasahang na generator. Gumagamit ng init ng mga nabubulok na radioactive compound upang makagawa ng enerhiya sa mabagal na bilis.
+block.solar-panel.description = Nagbibigay ng kaunting kuryente mula sa araw.
+block.solar-panel-large.description = Isang makabuluhang mas efficient na bersyon ng karaniwang solar panel.
+block.thorium-reactor.description = Bumubuo ng malaking halaga ng kuryente mula sa thorium. Nangangailangan ng patuloy na lamigin gamit ang cryofluid. Marahas na sasabog kung hindi sapat ang dami ng coolant na ibinibigay. Ang output ng kuryente ay depende sa kapunuan, na may base na kuryente na nabuo sa buong kapasidad.
+block.impact-reactor.description = Isang advanced na generator, na may kakayahang lumikha ng napakalaking halaga ng kuryente sa pinakamataas na efficiency. Nangangailangan lang ng makabuluhang input ng kuryente upang masimulan ang proseso.
+block.mechanical-drill.description = Pinaka-mura na drill. Kapag inilagay sa mga appropriate tiles, naglalabas ng items na mabagal na walang katiyakan. Kaya mag drill ng basic resources.
+block.pneumatic-drill.description = Isang upgrade sa nakaraan ng drill, kaya mag drill ang titanyo. Mas mabilis kaysa sa Mekanikal na Drill.
+block.laser-drill.description = Pwede mag drill na mas mabilis lalo na sa teknolohiya ng laser, pero kailangan kuryente. Kaya mag drill ang thorium.
+block.blast-drill.description = Ang pangwakas ng drill na ito. Kailangan ng malaking input sa kuryente.
+block.water-extractor.description = Nag e-extract ng groundwater. Ginagamit sa mga sahig na walang ibabaw na tubig.
 block.cultivator.description = Cultivates tiny concentrations of spores in the atmosphere into industry-ready pods.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 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-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.core-nucleus.details = The third and final iteration.
 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.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 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.
@@ -1331,5 +2194,429 @@ 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 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.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 79de4a4865..cead22bc02 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1,29 +1,32 @@
-credits.text = Créé par [royal]Anuken[] - [sky]anukendev@gmail.com[]\n\n[gray]
+credits.text = Créé par [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Crédits
 contributors = Traducteurs et contributeurs
-discord = Rejoignez le Discord de Mindustry
-link.discord.description = Le discord officiel de Mindustry!
-link.reddit.description = Le subreddit de Mindustry
+discord = Rejoignez le Discord de Mindustry !
+link.discord.description = Discord officiel de Mindustry
+link.reddit.description = Subreddit de Mindustry
 link.github.description = Code source du jeu
 link.changelog.description = Liste des mises à jour
-link.dev-builds.description = Versions instables du jeu
-link.trello.description = Trello officiel pour les ajouts futurs
-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.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.
-gameover = Game over
-gameover.pvp = L'équipe [accent] {0}[] a gagné !
-highscore = [accent]Nouveau meilleur score!
+link.dev-builds.description = Versions expérimentales du jeu
+link.trello.description = Trello officiel pour les nouvelles fonctionnalités planifiées
+link.itch.io.description = Page itch.io avec les différentes versions du jeu.
+link.google-play.description = Page Google Play du jeu
+link.f-droid.description = Page F-Droid du jeu
+link.wiki.description = Wiki officiel de Mindustry
+link.suggestions.description = Suggérez de nouvelles fonctionnalités
+link.bug.description = Vous avez trouvé un bug ? Reportez-le ici
+linkopen = Ce serveur vous a envoyé un lien. Êtes-vous certain de vouloir l’ouvrir ?\n\n[sky]{0}
+linkfail = L'ouverture du lien a échoué ! \nL'URL a été copiée dans votre presse-papier.
+screenshot = Capture d'écran sauvegardée dans {0}
+screenshot.invalid = Carte trop grande, potentiellement pas assez de mémoire pour la capture d'écran.
+gameover = Partie terminée
+gameover.disconnect = Déconnecté
+gameover.pvp = L'équipe[accent] {0}[] a gagné !
+gameover.waiting = [accent]Attente de la nouvelle carte...
+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
+indev.notready = Cette partie du jeu n'est pas encore prête.
 
-load.sound = Sons
+load.sound = Son
 load.map = Cartes
 load.image = Images
 load.content = Contenu
@@ -31,71 +34,91 @@ load.system = Système
 load.mod = Mods
 load.scripts = Scripts
 
-be.update = Une nouvelle version en développement est disponible:
-be.update.confirm = Télécharger et Redémarrer le jeu maintenenant ?
+be.update = Une nouvelle version expérimentale est disponible:
+be.update.confirm = Télécharger et redémarrer le jeu maintenant ?
 be.updating = Mise à jour en cours...
 be.ignore = Ignorer
 be.noupdates = Aucune mise à jour trouvée.
-be.check = Vérifiez les mises à jour
+be.check = Chercher des mises à jour
 
-mod.featured.title = Explorateur de mods
-mod.featured.dialog.title = Explorateur de Mods
+mods.browser = Navigateur de Mods
 mods.browser.selected = Mod sélectionné
-mods.browser.add = Installer le mod
-mods.github.open = Ouvrir au Github
+mods.browser.add = Installer
+mods.browser.reinstall = Réinstaller
+mods.browser.view-releases = Versions
+mods.browser.noreleases = [scarlet]Aucune version trouvée.\n[accent]Vérifiez si le dépôt du mod a des versions publiées.
+mods.browser.latest = <Dernière Version>
+mods.browser.releases = Versions
+mods.github.open = Voir sur Github
+mods.github.open-release = Page Github
+mods.browser.sortdate = Classer par date
+mods.browser.sortstars = Classer par étoiles
 
 schematic = Schéma
-schematic.add = Sauvegarder le schéma...
+schematic.add = Enregistrer le Schéma
 schematics = Schémas
-schematic.replace = Un schéma avec ce nom existe déjà. Le remplacer?
+schematic.search = Chercher des 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 un schéma...
+schematic.import = Importer un schéma
 schematic.exportfile = Exporter le fichier
 schematic.importfile = Importer un fichier
 schematic.browseworkshop = Consulter le Steam Workshop
-schematic.copy = Copier au presse-papier
-schematic.copy.import = Importer du presse-papier
+schematic.copy = Copier dans le presse-papier
+schematic.copy.import = Importer depuis presse-papier
 schematic.shareworkshop = Partager sur le Steam Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Retourner le schéma
-schematic.saved = Schéma sauvegardé.
-schematic.delete.confirm = Ce schéma sera supprimé définitivement.
-schematic.rename = Renommer le schéma
+schematic.saved = Schéma enregistré.
+schematic.delete.confirm = Ce schéma sera supprimé définitivement !
+schematic.edit = Editer Schéma
 schematic.info = {0}x{1}, {2} blocs
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Schémas désactivés ![]\nVous n'êtes pas autorisé à utiliser des schémas sur cette [accent]carte[] ou dans ce [accent]serveur.
+schematic.tags = Étiquettes :
+schematic.edittags = Éditer les étiquettes
+schematic.addtag = Ajouter une étiquette
+schematic.texttag = Mot
+schematic.icontag = Icône
+schematic.renametag = Renommer l'étiquette
+schematic.tagged = {0} étiqueté(s)
+schematic.tagdelconfirm = Voulez-vous supprimer cette étiquette définitivement ?
+schematic.tagexists = Cette étiquette existe déjà.
 
-stat.wave = Vagues vaincues:[accent] {0}
-stat.enemiesDestroyed = Ennemis détruits:[accent] {0}
-stat.built = Bâtiments construits:[accent] {0}
-stat.destroyed = Bâtiments détruits:[accent] {0}
-stat.deconstructed = Bâtiments déconstruits:[accent] {0}
-stat.delivered = Ressources transférées:
-stat.playtime = Temps de jeu:[accent] {0}
-stat.rank = Rang Final: [accent]{0}
+stats = Statistiques
+stats.wave = Vagues Vaincues
+stats.unitsCreated = Unités Créées
+stats.enemiesDestroyed = Ennemis Détruits
+stats.built = Blocs Construits
+stats.destroyed = Blocs Détruits
+stats.deconstructed = Blocs Déconstruits
+stats.playtime = Temps de Jeu
 
-globalitems = [accent]Global Items
-map.delete = Êtes-vous certain(e) de vouloir supprimer la carte "[accent]{0}[]"?
-level.highscore = Meilleur score: [accent]{0}
+globalitems = [accent]Ressources globales
+map.delete = Êtes-vous sûr de vouloir supprimer cette carte ?"[accent]{0}[]" ?
+level.highscore = Meilleur score : [accent]{0}
 level.select = Sélection du niveau
-level.mode = Mode de jeu:
-coreattack = [scarlet]< Le noyau est attaquée! >
+level.mode = Mode de jeu :
+coreattack = [scarlet]< Le Noyau est attaqué ! >
 nearpoint = [[ [scarlet]QUITTEZ LE POINT D'APPARITION ENNEMI IMMÉDIATEMENT[] ]\nannihilation imminente
 database = Base de données
+database.button = Base de données
 savegame = Sauvegarder la partie
-loadgame = Charger la partie
+loadgame = Charger une partie
 joingame = Rejoindre une partie
-customgame = Partie customisée
+customgame = Partie personnalisée
 newgame = Nouvelle partie
-none = <vide>
-minimap = Minimap
+none = <Vide>
+none.found = [lightgray]<Introuvable>
+none.inmap = [lightgray]<Introuvable dans la carte>
+minimap = Mini-carte
 position = Position
 close = Fermer
 website = Site Web
 quit = Quitter
-save.quit = Sauvegarder\net Quitter
+save.quit = Sauvegarder & Quitter
 maps = Cartes
 maps.browse = Parcourir les cartes
 continue = Continuer
-maps.none = [lightgray]Aucune carte trouvée!
+maps.none = [lightgray]Aucune carte trouvée !
 invalid = Invalide
 pickcolor = Choisir la Couleur
 preparingconfig = Préparation de la configuration
@@ -103,192 +126,275 @@ preparingcontent = Préparation du contenu
 uploadingcontent = Publication du contenu
 uploadingpreviewfile = Publication du fichier d'aperçu
 committingchanges = Validation des modifications
-done = Fait
-feature.unsupported = Votre appareil ne supporte pas cette fonctionnalité.
+done = Terminé
+feature.unsupported = Votre appareil ne prend pas en charge cette fonctionnalité.
 
-mods.alphainfo = Gardez à l'esprit que les mods sont en alpha et[scarlet] peuvent être très buggés[].\nMerci de signaler les problèmes que vous rencontrez via le GitHub ou le Discord Mindustry.
+mods.initfailed = [red]⚠[] L'instance précédente de Mindustry n’a pas pu s’initialiser. Cela a probablement été causé par des mods.\n\nPour éviter une boucle de plantage, [red]tous les mods ont été désactivés.[]
 mods = Mods
-mods.none = [lightgray]Aucun mod trouvé!
+mods.none = [lightgray]Aucun Mod trouvé !
 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.
+mods.openfolder = Ouvrir le Dossier
+mods.viewcontent = Voir le Contenu
+mods.reload = Relancer
+mods.reloadexit = Le jeu va se fermer pour relancer les mods.
+mod.installed = [[Installé]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Activé
 mod.disabled = [scarlet]Désactivé
+mod.multiplayer.compatible = [gray]Compatible en Multijoueur
 mod.disable = Désactiver
-mod.content = Contenu:
+mod.version = Version:
+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.incompatiblegame = [red]Jeu pas à jour
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Non supporté
+mod.unmetdependencies = [red]Dépendances manquantes
+mod.erroredcontent = [scarlet]Erreurs dans le contenu !
+mod.circulardependencies = [red]Dépendances circulaires
+mod.incompletedependencies = [red]Dépendances incomplètes
+
+mod.requiresversion.details = Requiert la version: [accent]{0}[]\nVotre jeu n'est pas à jour. Ce mod a besoin d'une version récente du jeu (la beta ou l'alpha) pour fonctionner.
+mod.outdatedv7.details = Ce mod est incompatible avec la version la plus récente du jeu. L'auteur doit le mettre à jour et ajouter [accent]minGameVersion: 136[] dans le fichier [accent]mod.json[].
+mod.blacklisted.details = Ce mod à été mis sur liste noire, car il cause des plantages ou d'autres problèmes avec la version actuelle du jeu. Ne l'utilisez pas.
+mod.missingdependencies.details = Ce mod à des dépendances manquantes: {0}
+mod.erroredcontent.details = Ce mod cause des erreurs lors du chargement. Demandez à l'auteur de les régler.
+mod.circulardependencies.details = Ce mod à des dépendances qui dépendent les unes des autres.
+mod.incompletedependencies.details = Ce mod ne peut pas être chargé en raison de dépendances invalides ou manquantes: {0}.
+
+mod.requiresversion = Requiert la version: [red]{0}
+
 mod.errors = Des erreurs se sont produites lors du chargement du contenu.
 mod.noerrorplay = [scarlet]Vous avez des mods avec des erreurs.[] Désactivez les mods concernés ou corrigez les erreurs avant de jouer.
-mod.nowdisabled = [scarlet]Le mod '{0}' a des dépendances manquantes:[accent] {1}\n[lightgray]Ces mods doivent d'abord être téléchargés.\nCe mod sera automatiquement désactivé.
+mod.nowdisabled = [scarlet]Le mod '{0}' a des dépendances manquantes: [accent]{1}\n[lightgray]Ces mods doivent d'abord être téléchargés.\nCe mod sera automatiquement désactivé.
 mod.enable = Activer
 mod.requiresrestart = Le jeu va maintenant se fermer pour appliquer les modifications du mod.
-mod.reloadrequired = [scarlet]Rechargement requis
+mod.reloadrequired = [scarlet]Redémarrage 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.import.github = Importer un mod depuis GitHub
+mod.jarwarn = [scarlet]Les mods JAR sont par nature peu sûrs.[]\nFaites en sorte d'importer ce mod depuis une source digne de confiance.
 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}
-mod.missing = Cette sauvegarde contient des mods que vous avez récemment mis à jour ou que vous avez désinstallés. Votre sauvegarde risque d'être corrompue. Êtes-vous sûr(e) de vouloir l'importer?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Avant de publier ce mod dans le Steam Workshop, vous devez ajouter une image servant d'aperçu.\nPlacez une image nommée[accent] preview.png[] dans le dossier du mod et réessayez.
-mod.folder.missing = Seuls les mods sous forme de dossiers peuvent être publiés sur le Steam Workshop.\nPour convertir n'importe quel mod en un dossier, dézippez-le tout simplement dans un dossier et supprimez l'ancien zip, puis redémarrez votre jeu ou rechargez vos mods.
-mod.scripts.disable = Votre appareil ne supporte pas les mods avec des scripts. Vous devez désactiver ces mods pour jouer.
+mod.author = [lightgray]Auteur : [] {0}
+mod.missing = Cette sauvegarde contient des mods que vous avez récemment mis à jour ou désinstallés. Votre sauvegarde risque d'être corrompue. Êtes-vous sûr de vouloir l'importer ?\n[lightgray]Mods:\n{0}
+mod.preview.missing = Avant de publier ce mod dans le Steam Workshop, vous devez ajouter une image servant d'aperçu.\nPlacez une image nommée [accent]preview.png[] dans le dossier du mod et réessayez.
+mod.folder.missing = Seuls les mods sous forme de dossiers peuvent être publiés sur le Steam Workshop.\nPour convertir n'importe quel mod en un dossier, décompressez-le tout simplement dans un dossier et supprimez l'ancien zip, puis redémarrez votre jeu ou rechargez vos mods.
+mod.scripts.disable = Votre appareil ne prend pas en charge les mods avec des scripts. Vous devez désactiver ces mods pour pouvoir jouer.
 
 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é!
+name = Nom :
+noname = Commencez par choisir un[accent] nom[].
+search = Recherche :
+planetmap = Carte de la Planète
+launchcore = Lancer le Noyau
+filename = Nom du fichier :
+unlocked = Nouveau contenu débloqué !
+available = Nouvelle recherche disponible !
+unlock.incampaign = < Débloquer dans la campagne pour plus de détails >
+campaign.select = Sélectionnez la Campagne de Départ
+campaign.none = [lightgray]Sélectionnez votre planète de départ.\nCela peut être changé à tout moment.
+campaign.erekir = Contenu récent et mieux travaillé. Une progression dans la campagne assez linéaire.\n\nPlus difficile. Des cartes et une expérience de qualité.
+campaign.serpulo = Contenu ancien, l'expérience classique de Mindustry. Avec plus de contenu et de possibilités.\n\nCartes et mécaniques de campagnes possiblement moins équilibrées. Moins travaillé.
+campaign.difficulty = Difficulty
 completed = [accent]Complété
 techtree = Arbre technologique
-research.list = [lightgray]Recherche:
+techtree.select = Sélection de l'Arbre technologique
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Charger
+research.discard = Ignorer
+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
+researched = [lightgray]{0} recherché.
+research.progress = {0}% complété
+players = {0} joueurs
+players.single = {0} joueur
 players.search = Recherche
 players.notfound = [gray]Aucun joueur trouvé
 server.closing = [accent]Fermeture du serveur...
-server.kicked.kick = Vous avez été expulsé du serveur!
-server.kicked.whitelist = Vous n'êtes pas sur liste blanche ici.
-server.kicked.serverClose = Serveur fermé.
-server.kicked.vote = Vous avez été expulsé suite à un vote. Au revoir.
-server.kicked.clientOutdated = Client obsolète! Mettez votre jeu à jour!
-server.kicked.serverOutdated = Serveur obsolète! Demandez à l'hôte de le mettre à jour!
-server.kicked.banned = Vous avez été banni de ce serveur.
+server.kicked.kick = Vous avez été expulsé du serveur !
+server.kicked.whitelist = Vous n'êtes pas sur liste blanche de ce serveur.
+server.kicked.serverClose = Serveur fermé !
+server.kicked.vote = Vous avez été expulsé à la suite d'un vote. Au revoir !
+server.kicked.clientOutdated = Client obsolète !\nMettez votre jeu à jour !
+server.kicked.serverOutdated = Serveur obsolète !\nDemandez à l'hôte de le mettre à jour !
+server.kicked.banned = Vous avez été banni de ce serveur !
 server.kicked.typeMismatch = Ce serveur n'est pas compatible avec votre version du jeu.
-server.kicked.playerLimit = Ce serveur est plein. Veuillez attendre qu'une place se libère.
-server.kicked.recentKick = Vous avez été expulsé récemment.\nAttendez avant de vous connecter à nouveau.
+server.kicked.playerLimit = Ce serveur est complet. Attendez qu'une place se libère.
+server.kicked.recentKick = Vous avez été expulsé récemment.\nAttendez avant de vous reconnecter...
 server.kicked.nameInUse = Il y a déjà quelqu'un avec\nce nom sur ce serveur.
 server.kicked.nameEmpty = Votre nom est invalide.
-server.kicked.idInUse = Vous êtes déjà sur ce serveur! Se connecter avec deux comptes n'est pas permis.
+server.kicked.idInUse = Vous êtes déjà sur ce serveur !\nSe connecter avec deux comptes n'est pas permis !
 server.kicked.customClient = Ce serveur ne supporte pas les versions personnalisées (Custom builds). Téléchargez une version officielle.
-server.kicked.gameover = Game over!
-server.kicked.serverRestarting = Le serveur est en train de redémarrer.
+server.kicked.gameover = Partie terminée !
+server.kicked.serverRestarting = Le serveur est en train 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 le port [scarlet]6567[]. \nN'importe qui sur le même [lightgray]wifi ou réseau local []devrait voir votre serveur sur sa liste de serveurs.\n\nSi vous voulez que les gens puissent s'y connecter de partout à l'aide de votre IP, [accent]le transfert de port (port forwarding)[] est requis.\n\n[lightgray]Note: Si quelqu'un a des problèmes de connexion à votre partie LAN, vérifiez que vous avez autorisé l'accès à Mindustry sur votre réseau local dans les paramètres de votre pare-feu.
-join.info = Ici, vous pouvez entrer [accent]l'adresse IP d'un serveur []pour s'y connecter, ou découvrir un serveur en [accent]réseau local[].\nLe multijoueur en LAN ainsi qu'en WAN est supporté.\n\n[lightgray]Note: Il n'y a pas de liste de serveurs globaux automatiques; Si vous voulez vous connecter à quelqu'un par IP, il faudra d'abord demander à l'hébergeur leur IP.
-hostserver = Héberger une partie
+host.info = Le bouton [accent]héberger[] héberge un serveur sur le port [scarlet]6567[].\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]une ouverture des ports[] est requise.\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 vous y connecter, ou découvrir les serveurs sur votre [accent]réseau local[] ou les serveurs [accent]globaux[].\nLes parties multijoueurs LAN et WAN sont toutes deux supportées.\n\n[lightgray]Note: Si vous voulez vous connecter à un serveur par IP, vous devrez demander l'IP à l'hébergeur. Celle-ci peut-être trouvée en cherchant "Mon IP" sur un moteur de recherche depuis son appareil.
+hostserver = Héberger une partie multijoueur
 invitefriends = Inviter des Amis
 hostserver.mobile = Héberger\nune partie
 host = Héberger
-hosting = [accent]Préparation du serveur...
+hosting = [accent]Ouverture du serveur...
 hosts.refresh = Actualiser
 hosts.discovering = Recherche de jeux en LAN
 hosts.discovering.any = Recherche de parties
 server.refreshing = Actualisation du serveur
-hosts.none = [lightgray]Aucun jeu en LAN trouvé!
+hosts.none = [lightgray]Aucune partie en LAN trouvée !
 host.invalid = [scarlet]Impossible de se connecter à l'hôte.
 
 servers.local = Serveurs locaux
+servers.local.steam = Parties Libres & Serveurs Locaux
 servers.remote = Serveurs distants
-servers.global = Serveurs officiels
+servers.global = Serveurs communautaires
 
+servers.disclaimer = Les serveurs communautaires ne sont [accent]pas[] gérés, ni contrôlés par le développeur.\n\nCes serveurs peuvent contenir du contenu qui ne convient pas à tous les âges.
+servers.showhidden = Montrer les serveurs cachés
+server.shown = Visible
+server.hidden = Caché
+
+viewplayer = Caméra du Joueur : [accent]{0}
 trace = Suivre le joueur
 trace.playername = Nom du joueur : [accent]{0}
-trace.ip = IP: [accent]{0}
-trace.id = ID Unique : [accent]{0}
-trace.mobile = Client mobile: [accent]{0}
-trace.modclient = Client personnalisé: [accent]{0}
-invalidid = ID du client invalide! Veuillez soumettre un rapport d'erreur.
-server.bans = Joueurs Bannis
-server.bans.none = Aucun joueur banni trouvé!
-server.admins = Administrateurs
-server.admins.none = Aucun administrateur trouvé!
+trace.ip = IP : [accent]{0}
+trace.id = ID : [accent]{0}
+trace.language = Language: [accent]{0}
+trace.mobile = Client Mobile : [accent]{0}
+trace.modclient = Client personnalisé : [accent]{0}
+trace.times.joined = Nombre de connexions : [accent]{0}
+trace.times.kicked = Nombre d'expulsions : [accent]{0}
+trace.ips = IPs:
+trace.names = Noms:
+invalidid = ID du client invalide ! Veuillez soumettre un rapport d'erreur.
+
+player.ban = Bannir
+player.kick = Expulser
+player.trace = Tracer
+player.admin = Activer Admin
+player.team = Changer Équipe
+
+server.bans = Bans
+server.bans.none = Aucun joueur banni trouvé !
+server.admins = Admins
+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
-server.outdated = [crimson]Serveur obsolète![]
-server.outdated.client = [crimson]Client obsolète![]
-server.version = [lightgray]Version: {0} {1}
+server.outdated = [scarlet]Serveur obsolète ![]
+server.outdated.client = [scarlet]Client obsolète ![]
+server.version = [gray]Version : {0} {1}
 server.custombuild = [accent]Version personnalisée
-confirmban = Souhaitez-vous vraiment bannir ce joueur?
-confirmkick = Souhaitez-vous vraiment expulser ce joueur?
-confirmvotekick = Voulez-vous vraiment voter l'expulsion de ce joueur?
-confirmunban = Souhaitez-vous vraiment réintégrer ce joueur ?
-confirmadmin = Souhaitez-vous vraiment rendre ce joueur administrateur?
-confirmunadmin = Souhaitez-vous vraiment enlever le statut d'administrateur à ce joueur?
+confirmban = Êtes-vous sûr de vouloir bannir "{0}[white]" ?
+confirmkick = Êtes-vous sûr de vouloir expulser "{0}[white]" ?
+confirmunban = Êtes-vous sûr de vouloir annuler le ban de ce joueur ?
+confirmadmin = Êtes-vous sûr de vouloir faire de "{0}[white]" un administrateur ?
+confirmunadmin = Êtes-vous sûr de vouloir supprimer le statut d'administrateur de "{0}[white]" ?
+votekick.reason = Raison du vote d'expulsion
+votekick.reason.message = Êtes-vous sûr de vouloir voter l'expulsion de "{0}[white]"?\nSi oui, merci d'entrer la raison :
 joingame.title = Rejoindre une partie
-joingame.ip = IP:
+joingame.ip = Adresse IP :
 disconnect = Déconnecté.
-disconnect.error = Erreur de connexion.
+disconnect.error = Un problème est survenu lors de la connexion.
 disconnect.closed = Connexion fermée.
 disconnect.timeout = Délai de connexion expiré.
-disconnect.data = Les données du monde n'ont pas pu être chargées!
+disconnect.data = Les données du monde n'ont pas pu être chargées !
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossible de rejoindre ([accent]{0}[]).
 connecting = [accent]Connexion...
-connecting.data = [accent]Chargement de la partie...
-server.port = Port:
-server.addressinuse = Adresse déjà utilisée!
-server.invalidport = Numéro de port invalide!
-server.error = [crimson]Erreur d'hébergement: [accent]{0}
+reconnecting = [accent]Reconnexion...
+connecting.data = [accent]Chargement des données du monde...
+server.port = Port :
+server.invalidport = Numéro de port invalide !
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [scarlet]Erreur lors de l'hébergement du serveur.
 save.new = Nouvelle sauvegarde
-save.overwrite = Êtes-vous sûr de vouloir\n écraser cette sauvegarde ?
+save.overwrite = Êtes-vous sûr de vouloir\nécraser cette sauvegarde ?
+save.nocampaign = Les fichiers de sauvegarde de la campagne ne peuvent pas être importés individuellement.
 overwrite = Écraser
 save.none = Aucune sauvegarde trouvée !
-savefail = Échec de la sauvegarde!
-save.delete.confirm = Êtes-vous sûr(e) de vouloir supprimer cette sauvegarde?
+savefail = Échec de la sauvegarde !
+save.delete.confirm = Êtes-vous sûr de vouloir supprimer cette sauvegarde ?
 save.delete = Supprimer
-save.export = Exporter une\nsauvegarde
-save.import.invalid = [accent]Cette sauvegarde est invalide!
-save.import.fail = [crimson]Échec d'importation: [accent]{0}
-save.export.fail = [crimson]Échec d'exportation: [accent]{0}
+save.export = Exporter une sauvegarde
+save.import.invalid = [accent]Cette sauvegarde est invalide !
+save.import.fail = [crimson]L'importation de la sauvegarde\na échoué: [accent]{0}
+save.export.fail = [crimson]L'exportation de la sauvegarde\na échoué: [accent]{0}
 save.import = Importer une sauvegarde
-save.newslot = Nom de la sauvegarde:
+save.newslot = Nom de la sauvegarde :
 save.rename = Renommer
-save.rename.text = Nouveau nom:
-selectslot = Choisissez une sauvegarde.
+save.rename.text = Nouveau nom :
+selectslot = Sélectionnez une sauvegarde.
 slot = [accent]Emplacement {0}
-editmessage = Modifier le Message
-save.corrupted = [accent]Sauvegarde corrompue ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]pas[] à un bug.
+editmessage = Modifier le message
+save.corrupted = Fichier de sauvegarde corrompu ou invalide !
 empty = <vide>
 on = Activé
 off = Désactivé
-save.autosave = Sauvegarde automatique: {0}
-save.map = Carte: {0}
+save.search = Recherche de parties sauvegardées...
+save.autosave = Sauvegarde automatique : {0}
+save.map = Carte : {0}
 save.wave = Vague {0}
-save.mode = Mode de jeu: {0}
-save.date = Dernière sauvegarde: {0}
-save.playtime = Temps de jeu: {0}
+save.mode = Mode de jeu : {0}
+save.date = Dernière sauvegarde : {0}
+save.playtime = Temps de jeu : {0}
 warning = Avertissement.
 confirm = Confirmer
 delete = Supprimer
 view.workshop = Voir dans le Steam Workshop
-workshop.listing = Éditer le listing du Steam Workshop
+workshop.listing = Éditer la liste du Steam Workshop
 ok = OK
 open = Ouvrir
-customize = Personnaliser les règles
+customize = Personnaliser
 cancel = Annuler
+command = Commander
+command.queue = [lightgray][Queuing]
+command.mine = Miner
+command.repair = Réparer
+command.rebuild = Reconstruire
+command.assist = Assister
+command.move = Bouger
+command.boost = Booster
+command.enterPayload = Entrer dans Bloc de Transport
+command.loadUnits = Transporter Unités
+command.loadBlocks = Transporter Blocs
+command.unloadPayload = Poser Chargement
+command.loopPayload = Loop Unit Transfer
+stance.stop = Annuler les Ordres
+stance.shoot = Ordre: Tirer
+stance.holdfire = Ordre: Ne pas Tirer
+stance.pursuetarget = Ordre: Poursuivre Cible
+stance.patrol = Ordre: Chemins de Contrôle
+stance.ram = Ordre: Charger\n[lightgray]Mouvement en ligne droite, sans détection de chemins
 openlink = Ouvrir le lien
 copylink = Copier le lien
 back = Retour
+max = Max
+objective = Objectif de la Carte
+crash.export = Exporter les rapports de bugs
+crash.none = Aucun rapport de bugs trouvé.
+crash.exported = Rapports de bugs exportés.
 data.export = Exporter les données
-data.import = Importer les données
+data.import = Importer des données
 data.openfolder = Ouvrir le dossier de données
 data.exported = Données exportées.
 data.invalid = Ce ne sont pas des données de jeu valides.
-data.import.confirm = L'importation des données externes va effacer[scarlet] toutes[] vos données de jeu actuelles.\n[accent]Ceci ne pourra pas être annulé![]\n\nUne fois les données importées, le jeu se fermera immédiatement.
-quit.confirm = Êtes-vous sûr de vouloir quitter?
-quit.confirm.tutorial = Êtes-vous sur de ce que vous faites?\nLe tutoriel peut être repris dans [accent]Paramètres->Jeu->Refaire le Tutoriel.[]
+data.import.confirm = L'importation des données externes va effacer[scarlet] toutes[] vos données de jeu actuelles.\n[accent]Ceci ne pourra pas être annulé ![]\n\nUne fois les données importées, le jeu se fermera immédiatement.
+quit.confirm = Êtes-vous sûr de vouloir quitter ?
 loading = [accent]Chargement...
-reloading = [accent]Rechargement des Mods...
+downloading = [accent]Téléchargement...
 saving = [accent]Sauvegarde...
-respawn = [accent][[{0}][] pour réapparaitre dans le noyau
+respawn = [accent][[{0}][] pour réapparaître dans le Noyau
 cancelbuilding = [accent][[{0}][] pour effacer le plan
-selectschematic = [accent][[{0}][] pour sélectionner et copier
+selectschematic = [accent][[{0}][] pour sélectionner+copier
 pausebuilding = [accent][[{0}][] pour mettre la construction en pause
 resumebuilding = [scarlet][[{0}][] pour reprendre la construction
+enablebuilding = [scarlet][[{0}][] pour activer la construction
+showui = Interface cachée.\nPressez [accent][[{0}][] pour montrer l'interface.
+commandmode.name = [accent]Mode « Commande »
+commandmode.nounits = [aucune unité]
 wave = [accent]Vague {0}
 wave.cap = [accent]Vague {0}/{1}
 wave.waiting = [lightgray]Vague dans {0}
@@ -296,171 +402,251 @@ wave.waveInProgress = [lightgray]Vague en cours
 waiting = [lightgray]En attente...
 waiting.players = En attente de joueurs...
 wave.enemies = [lightgray]{0} Ennemis restants
+wave.enemycores = [accent]{0}[lightgray] Noyaux ennemis
+wave.enemycore = [accent]{0}[lightgray] Noyau ennemi
 wave.enemy = [lightgray]{0} Ennemi restant
-wave.guardianwarn = Gardien à l'approche dans [accent]{0}[] vagues.
-wave.guardianwarn.one = Gardien à l'approche dans [accent]{0}[] vague.
+wave.guardianwarn = Arrivée du Gardien dans [accent]{0}[] vagues.
+wave.guardianwarn.one = Arrivée du Gardien dans [accent]{0}[] vague.
 loadimage = Charger l'image
 saveimage = Sauvegarder l'image
 unknown = Inconnu
 custom = Personnalisé
 builtin = Intégré
-map.delete.confirm = Voulez-vous vraiment supprimer cette carte? Il n'y aura plus de retour en arrière!
+map.delete.confirm = Voulez-vous vraiment supprimer cette carte ?\nIl n'y aura pas de retour en arrière !
 map.random = [accent]Carte aléatoire
-map.nospawn = Cette carte n'a pas de base pour qu'un joueur puisse y apparaître! Ajoutez une base[accent] orange[] sur cette carte dans l'éditeur.
-map.nospawn.pvp = Cette carte n'a pas de base ennemie pour qu'un joueur ennemi puisse y apparaître! Ajoutez au moins une base [scarlet] non-orange[] dans l'éditeur.
-map.nospawn.attack = Cette carte n'a aucune base ennemie à attaquer! Veuillez ajouter une base[scarlet] rouge[] sur cette carte dans l'éditeur.
+map.nospawn = Cette carte n'a aucun noyau pour que les joueurs puissent apparaître !\nAjoutez au moins un Noyau {0} sur cette carte dans l'éditeur.
+map.nospawn.pvp = Cette carte n'a aucun noyau ennemi pour que les joueurs ennemis puissent apparaître !\nAjoutez au moins un Noyau [scarlet]non-orange[] dans l'éditeur.
+map.nospawn.attack = Cette carte n'a aucun noyau ennemi à attaquer !\nAjouter au moins un Noyau {0} sur cette carte dans l'éditeur.
 map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
 workshop.update = Mettre à jour
 workshop.error = Erreur lors de la récupération des détails du Steam Workshop: {0}
-map.publish.confirm = Êtes-vous sûr(e) de vouloir publier cette carte?\n\n[lightgray]Assurez-vous d’accepter d’abord les CGU du Steam Workshop, sinon vos cartes ne seront pas affichées!
+map.publish.confirm = Êtes-vous sûr de vouloir publier cette carte ?\n\n[lightgray]Assurez-vous d’accepter d’abord les CGU du Steam Workshop, sinon vos cartes ne seront pas affichées !
 workshop.menu = Sélectionnez ce que vous souhaitez faire avec cet élément.
 workshop.info = Infos sur l'élément
 changelog = Journal des changements (optionnel):
+updatedesc = Écraser le Titre et la Description
 eula = CGU de Steam
-missing = Cet élément a été supprimé ou déplacé.\n[lightgray]Le listing du Steam Workshop a maintenant été automatiquement dissocié.
+missing = Cet élément a été supprimé ou déplacé.\n[lightgray]Le listing du Steam Workshop a été automatiquement dissociée.
 publishing = [accent]Publication...
-publish.confirm = Êtes-vous sûr de vouloir publier ceci ?\n\n[lightgray]Assurez-vous d'être d'abord d'accord avec les CGU du workshop, sinon vos éléments n'apparaîtront pas !
-publish.error = Erreur de publication de l'élément: {0}
-steam.error = Échec d'initialisation des services Steam.\nError: {0}
+publish.confirm = Êtes-vous sûr de vouloir publier ceci ?\n\n[lightgray]Assurez-vous d'avoir accepté les CGU du workshop, sinon vos éléments n'apparaîtront pas !
+publish.error = Erreur de publication de l'élément : {0}
+steam.error = Échec d'initialisation des services Steam.\nErreur : {0}
 
+editor.planet = Planète :
+editor.sector = Secteur :
+editor.seed = Graine :
+editor.cliffs = Transformer les murs en falaises
 editor.brush = Pinceau
 editor.openin = Ouvrir dans l'éditeur
-editor.oregen = Génération de minerais
-editor.oregen.info = Génération de minerais:
-editor.mapinfo = Infos Carte
-editor.author = Auteur:
-editor.description = Description:
+editor.oregen = Génération de minerai
+editor.oregen.info = Génération de minerai :
+editor.mapinfo = Infos de la Carte
+editor.author = Auteur :
+editor.description = Description :
 editor.nodescription = Une carte doit avoir une description d'au moins 4 caractères pour pouvoir être publiée.
-editor.waves = Vagues:
-editor.rules = Règles:
-editor.generation = Génération:
+editor.waves = Vagues
+editor.rules = Règles
+editor.generation = Génération
+editor.objectives = Objectifs
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Éditer dans le jeu
+editor.playtest = Tester
 editor.publish.workshop = Publier sur le Workshop
 editor.newmap = Nouvelle carte
 editor.center = Centrer
+editor.search = Recherche de cartes...
+editor.filters = Filtrer les cartes
+editor.filters.mode = Modes de jeu :
+editor.filters.type = Type de carte :
+editor.filters.search = Rechercher dans :
+editor.filters.author = Auteur
+editor.filters.description = Description
+editor.shiftx = Décalage X
+editor.shifty = Décalage Y
 workshop = Steam Workshop
 waves.title = Vagues
 waves.remove = Supprimer
-waves.never = <jamais>
 waves.every = tous les
 waves.waves = vague(s)
+waves.health = santé: {0}%
 waves.perspawn = par apparition
-waves.shields = boucliers/vague
+waves.shields = bouclier/vague
 waves.to = à
+waves.spawn = point d'apparition:
+waves.spawn.all = <tout>
+waves.spawn.select = Sélection du Point d'Apparition
+waves.spawn.none = [scarlet]aucun point d'apparition trouvé
+waves.max = unités maximum
 waves.guardian = Gardien
 waves.preview = Prévisualiser
 waves.edit = Modifier...
+waves.random = Aléatoire
 waves.copy = Copier dans le presse-papiers
 waves.load = Coller depuis le presse-papiers
 waves.invalid = Vagues invalides dans le presse-papiers.
 waves.copied = Vagues copiées
-waves.none = Aucun ennemi défini.\nNotez que les vagues vides seront automatiquement remplacées par une vague générée par défaut.
+waves.none = Aucun ennemi défini.\nNotez que les vagues vides seront automatiquement remplacées par les vagues par défaut.
+waves.sort = Trier Par
+waves.sort.reverse = Tri inversé
+waves.sort.begin = Vague
+waves.sort.health = Santé
+waves.sort.type = Type
+waves.search = Rechercher des vagues...
+waves.filter = Filtre d'Unité
+waves.units.hide = Masquer tout
+waves.units.show = Afficher tout
 
-wavemode.counts = counts
-wavemode.totals = totals
-wavemode.health = health
+#ces traductions restent en minuscule
+wavemode.counts = compte
+wavemode.totals = totaux
+wavemode.health = santé
+all = All
 
 editor.default = [lightgray]<par défaut>
 details = Détails...
 edit = Modifier...
-editor.name = Nom:
-editor.spawn = Créer l'unité
+variables = Variables
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
+editor.name = Nom :
+editor.spawn = Ajouter une unité
 editor.removeunit = Retirer l'unité
-editor.teams = Équipe
-editor.errorload = Erreur lors du chargement du fichier:\n[accent]{0}
-editor.errorsave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
+editor.teams = Équipes
+editor.errorload = Erreur lors du chargement du fichier : \n[accent]{0}
+editor.errorsave = Erreur lors de la sauvegarde du fichier : \n[accent]{0}
 editor.errorimage = Ceci est une image, et non une carte.\n\nSi vous voulez importer une carte provenant de la version 3.5 (build 40), utilisez le bouton 'importer une carte obsolète (image)' dans l'éditeur.
-editor.errorlegacy = Cette carte est trop ancienne, et utilise un format de carte qui n'est plus supporté.
+editor.errorlegacy = Cette carte est trop ancienne et utilise un format de carte qui n'est plus pris en charge.
 editor.errornot = Ceci n'est pas un fichier de carte.
-editor.errorheader = Le fichier de carte est invalide ou corrompu.
-editor.errorname = La carte n'a pas de nom. Essayez-vous de charger une sauvegarde?
+editor.errorheader = Ce fichier de carte est invalide ou corrompu.
+editor.errorname = La carte n'a pas de nom. Essayez-vous de charger une sauvegarde ?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Mettre à jour
-editor.randomize = Rendre aléatoire
+editor.randomize = Générer
+editor.moveup = Monter
+editor.movedown = Descendre
+editor.copy = Copier
 editor.apply = Appliquer
 editor.generate = Générer
+editor.sectorgenerate = Générer un Secteur
 editor.resize = Redimensionner
 editor.loadmap = Charger la carte
 editor.savemap = Sauvegarder la carte
-editor.saved = Sauvegardé!
-editor.save.noname = Votre carte n'a pas de nom! Ajoutez un nom dans le menu 'info de la carte'.
-editor.save.overwrite = Votre carte écrase une carte du jeu de base! Choisissez un nom différent dans le menu 'info de la carte' .
-editor.import.exists = [scarlet]Importation impossible :[] '{0}' est le nom d'une carte du jeu de base!
-editor.import = Importation...
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
+editor.saved = Sauvegardé !
+editor.save.noname = Votre carte n'a pas de nom !\nAjoutez un nom dans le menu 'Infos de la Carte'.
+editor.save.overwrite = Votre carte écrase une carte de base du jeu !\nChoisissez un nom différent dans le menu 'Infos de la Carte'.
+editor.import.exists = [scarlet]Importation impossible :[] '{0}' est le nom d'une carte par défaut du jeu !
+editor.import = Importer
 editor.importmap = Importer une carte
-editor.importmap.description = Importer une carte existante
+editor.importmap.description = Importer une carte déjà existante
 editor.importfile = Importer un fichier
 editor.importfile.description = Importer une carte externe
-editor.importimage = Importer une carte obsolète
+editor.importimage = Importer une carte (image)
 editor.importimage.description = Importer une carte externe (image)
-editor.export = Exporter...
+editor.export = Exporter
 editor.exportfile = Exporter un fichier
 editor.exportfile.description = Exporter un fichier de carte
 editor.exportimage = Exporter l'image du terrain
-editor.exportimage.description = Exporter une image de la carte
-editor.loadimage = Importer le terrain
+editor.exportimage.description = Exporter une image de la carte avec du terrain seulement
+editor.loadimage = Importer un terrain
 editor.saveimage = Exporter le terrain
 editor.unsaved = [scarlet]Vous n'avez pas sauvegardé vos modifications![] Voulez-vous vraiment quitter ?
 editor.resizemap = Redimensionner\nla carte
-editor.mapname = Nom de la carte:
-editor.overwrite = [accent]Attention!\nCeci écrase une carte existante.
-editor.overwrite.confirm = [scarlet]Attention![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir l'écraser?
+editor.mapname = Nom de la carte :
+editor.overwrite = [accent]Attention !\nCeci écrase une carte existante.
+editor.overwrite.confirm = [scarlet]Attention ![]\nUne carte avec ce nom existe déjà. Êtes-vous sûr de vouloir l'écraser ?
 editor.exists = Une carte avec ce nom existe déjà.
-editor.selectmap = Sélectionnez une carte:
+editor.selectmap = Sélectionnez une carte :
 
 toolmode.replace = Remplacer
-toolmode.replace.description = Dessiner seulement sur les blocs solides.
+toolmode.replace.description = Dessine seulement\nsur les blocs solides.
 toolmode.replaceall = Tout Remplacer
-toolmode.replaceall.description = Remplace tous les blocs de la carte.
+toolmode.replaceall.description = Remplace tous les blocs\nde la carte.
 toolmode.orthogonal = Orthogonal
-toolmode.orthogonal.description = Dessine seulement des lignes orthogonales.
+toolmode.orthogonal.description = Dessine seulement\ndes lignes orthogonales.
 toolmode.square = Carré
 toolmode.square.description = Pinceau carré.
-toolmode.eraseores = Effacer les minéraux
-toolmode.eraseores.description = Efface seulement les minéraux.
+toolmode.eraseores = Effacer les minerais
+toolmode.eraseores.description = Efface seulement\nles minerais.
 toolmode.fillteams = Remplir les équipes
-toolmode.fillteams.description = Remplit les équipes au lieu des blocs.
+toolmode.fillteams.description = Remplit les équipes\nau lieu des blocs.
+toolmode.fillerase = Remplir et effacer
+toolmode.fillerase.description = Efface les blocs\ndu même type.
 toolmode.drawteams = Dessiner les équipes
-toolmode.drawteams.description = Dessine les équipes au lieu de blocs.
+toolmode.drawteams.description = Change les équipes\nau lieu de blocs.
+#inutilisé
+toolmode.underliquid = Sous les liquides
+toolmode.underliquid.description = Dessiner les sols sous les tuiles de liquides.
+
+filters.empty = [lightgray]Aucun filtre !\nAjoutez-en un avec les boutons ci-dessous.
 
-filters.empty = [lightgray]Aucun filtre! Ajoutez-en un avec les boutons ci-dessous.
 filter.distort = Déformation
 filter.noise = Bruit
-filter.enemyspawn = Zone d'apparition enemi
-filter.spawnpath = Path To Spawn
-filter.corespawn = Zone d'apparition du noyau
+filter.enemyspawn = Zone d'apparition ennemie
+filter.spawnpath = Chemin vers la zone d'apparition
+filter.corespawn = Zone d'apparition du Noyau
 filter.median = Médian
 filter.oremedian = Minerai Médian
 filter.blend = Fusion
-filter.defaultores = Minerai par défaut
+filter.defaultores = Minerais par défaut
 filter.ore = Minerai
-filter.rivernoise = Bruit des rivières
+filter.rivernoise = Bruit de rivière
 filter.mirror = Miroir
 filter.clear = Effacer
 filter.option.ignore = Ignorer
 filter.scatter = Disperser
 filter.terrain = Terrain
-filter.option.scale = Gamme
+filter.logic = Logic
+
+filter.option.scale = Échelle
 filter.option.chance = Chance
 filter.option.mag = Magnitude
 filter.option.threshold = Seuil
-filter.option.circle-scale = Gamme du cercle
+filter.option.circle-scale = Échelle circulaire
 filter.option.octaves = Octaves
-filter.option.falloff = Diminution
+filter.option.falloff = Détachement
 filter.option.angle = Angle
+filter.option.tilt = Inclinaison
+filter.option.rotate = Rotation
 filter.option.amount = Quantité
 filter.option.block = Bloc
 filter.option.floor = Sol
-filter.option.flooronto = Sol en question
+filter.option.flooronto = Sol ciblé
 filter.option.target = Cible
+filter.option.replacement = Remplacement
 filter.option.wall = Mur
 filter.option.ore = Minerai
 filter.option.floor2 = Sol secondaire
 filter.option.threshold2 = Seuil secondaire
 filter.option.radius = Rayon
-filter.option.percentile = Centile
+filter.option.percentile = Pourcentage
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
-width = Largeur:
-height = Hauteur:
+width = Largeur :
+height = Hauteur :
 menu = Menu
 play = Jouer
 campaign = Campagne
@@ -468,6 +654,9 @@ load = Charger
 save = Sauvegarder
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Veuillez redémarrer votre jeu pour que le changement de langue prenne effet.
 settings = Paramètres
 tutorial = Tutoriel
@@ -478,62 +667,159 @@ mapeditor = Éditeur de carte
 abandon = Abandonner
 abandon.text = Cette zone et toutes ses ressources vont être perdues.
 locked = Verrouillé
-complete = [lightgray]Compléter:
+complete = [lightgray]Compléter :
 requirement.wave = Vague {0} dans {1}
 requirement.core = Détruire le Noyau ennemi dans {0}
-requirement.research = Research {0}
-requirement.capture = Capture {0}
-bestwave = [lightgray]Meilleur: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
+requirement.research = Rechercher {0}
+requirement.produce = Produire {0}
+requirement.capture = Capturer {0}
+requirement.onplanet = Contrôler le Secteur sur {0}
+requirement.onsector = Atterrir sur le Secteur: {0}
+launch.text = Décoller
+map.multiplayer = Seul l'hôte peut voir les secteurs.
 uncover = Découvrir
-configure = Modifier les ressources à emporter
-loadout = Loadout
-resources = Resources 
-bannedblocks = Blocs Bannis
-addall = Ajouter TOUS
-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.resources = [lightgray]Ressources détectées:
-zone.objective = [lightgray]Objectif: [accent]{0}
-zone.objective.survival = Survivre
-zone.objective.attack = Détruire le noyau ennemi
-add = Ajouter...
-boss.health = Santé du Boss
+configure = Modifier le chargement
 
-connectfail = [crimson]Échec de la connexion au serveur :\n\n[accent]{0}
-error.unreachable = Serveur injoignable.\nL'adresse IP est-elle correcte?
+objective.research.name = Rechercher
+objective.produce.name = Obtenir
+objective.item.name = Obtenir un Objet
+objective.coreitem.name = Transférer dans le Noyau
+objective.buildcount.name = Nombre de Constructions
+objective.unitcount.name = Nombre d'Unités
+objective.destroyunits.name = Détruire les Unités
+objective.timer.name = Décompte
+objective.destroyblock.name = Détruire le Bloc
+objective.destroyblocks.name = Détruire les Blocs
+objective.destroycore.name = Détruire le Noyau
+objective.commandmode.name = Mode « Commande »
+objective.flag.name = Drapeau
+
+marker.shapetext.name = Forme de Texte
+marker.point.name = Point
+marker.shape.name = Forme
+marker.text.name = Texte
+marker.line.name = Ligne
+marker.quad.name = Quad
+marker.texture.name = Texture
+
+marker.background = Fond
+marker.outline = Contour
+
+objective.research = [accent]Recherchez:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtenez:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Détruisez:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Détruisez: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtenez: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Transférez dans le Noyau:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Construisez: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Construisez des Unités: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Détruisez: [][lightgray]{0}[]x Unités
+objective.enemiesapproaching = [accent]Arrivée des ennemis dans [lightgray]{0}[]
+objective.enemyescelating = [accent]La production ennemie augmente dans [lightgray]{0}[]
+objective.enemyairunits = [accent]La production d'unités aériennes ennemies commence dans [lightgray]{0}[]
+objective.destroycore = [accent]Détruisez le Noyau Ennemi
+objective.command = [accent]Commandez des Unités
+objective.nuclearlaunch = [accent]⚠ Lancement nucléaire détecté: [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ FRAPPE NUCLÉAIRE EN APPROCHE ⚠
+
+loadout = Chargement
+resources = Ressources
+resources.max = Max
+bannedblocks = Blocs bannis
+unbannedblocks = Unbanned Blocks
+objectives = Objectifs
+bannedunits = Unités bannies
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Unités bannies en tant que liste blanche
+bannedblocks.whitelist = Blocs bannis en tant que liste blanche
+addall = Ajouter TOUT
+launch.from = Décollage depuis : [accent]{0}
+launch.capacity = Capacité de Lancement d'Objets : [accent]{0}
+launch.destination = Destination : {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = La quantité doit être un nombre compris entre 0 et {0}.
+add = Ajouter
+guardian = Gardien
+
+connectfail = [scarlet]Échec de la connexion au serveur : \n\n[accent]{0}
+error.unreachable = Serveur inaccessible.\nEst-ce que l'adresse est écrite correctement?
 error.invalidaddress = Adresse invalide.
-error.timedout = Délai de connexion expiré!\nAssurez-vous que l'hôte a autorisé l'accès au port (port forwarding) et que l'adresse est correcte!
-error.mismatch = Erreur de paquet:\nPossible différence de version entre le client et le serveur .\nVérifiez que vous et l'hôte avez la version de Mindustry la plus récente!
-error.alreadyconnected = Déjà connecté(e).
-error.mapnotfound = Carte introuvable!
+error.timedout = Expiration du délai!\nAssurez-vous que l'ouverture des ports est configurée chez l'hôte, que le serveur est ouvert et que l'adresse est correcte!
+error.mismatch = Erreur de paquet :\nPossible incompatibilité de version client/serveur.\nAssurez-vous que l'hôte et vous, disposez de la même version de Mindustry !
+error.alreadyconnected = Déjà connecté.
+error.mapnotfound = Fichier de carte introuvable !
 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.
+error.any = Erreur de réseau inconnue.
+error.bloom = Échec de l'initialisation du flou lumineux.\nIl se peut que votre appareil ne le prenne pas en charge.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
-weather.sandstorm.name = Sandstorm
-weather.sporestorm.name = Sporestorm
-weather.fog.name = Fog
+weather.rain.name = Pluie
+weather.snowing.name = Neige
+weather.sandstorm.name = Tempête de sable
+weather.sporestorm.name = Tempête de spores
+weather.fog.name = Brouillard
 
-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)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+campaign.playtime = \uf129 [lightgray]Temps de jeu: {0}
+campaign.complete = [accent]Félicitations.\n\nL'ennemi sur {0} a été battu.\n[lightgray]Le secteur final a été conquis.
+
+sectorlist = Secteurs
+sectorlist.attacked = {0} pris d'assaut
+sectors.unexplored = [lightgray]Inexploré
+sectors.resources = Ressources :
+sectors.production = Production :
+sectors.export = Exporter :
+sectors.import = Importer :
+sectors.time = Temps de jeu :
+sectors.threat = Menace :
+sectors.wave = Vague :
+sectors.stored = Stockage :
+sectors.resume = Reprendre
+sectors.launch = Décoller
+sectors.select = Sélectionner
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]Vide (soleil)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Renommer le secteur
+sectors.enemybase = [scarlet]Base ennemie
+sectors.vulnerable = [scarlet]Vulnérable
+sectors.underattack = [scarlet]Attaque en cours! [accent]{0}% endommagé
+sectors.underattack.nodamage = [scarlet]Non capturé
+sectors.survives = [accent]Survécu à {0} vagues
+sectors.go = Aller
+sector.abandon = Abandonner
+sector.abandon.confirm = Les noyaux de ce secteur vont s'auto-détruire.\nContinuer ?
+sector.curcapture = Secteur capturé
+sector.curlost = Secteur perdu
+sector.missingresources = [scarlet]Ressources du Noyau insuffisantes !
+sector.attacked = Secteur [accent]{0}[white] attaqué !
+sector.lost = Secteur [accent]{0}[white] perdu !
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Changer l'Icône
+sector.noswitch.title = Impossible de changer de Secteur
+sector.noswitch = Vous ne pouvez pas changer de secteur pendant qu’un autre est attaqué.\n\nSecteur: [accent]{0}[] sur [accent]{1}[]
+sector.view = Voir le secteur
+
+threat.low = Faible
+threat.medium = Normale
+threat.high = Grande
+threat.extreme = Extrême
+threat.eradication = Éradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
+planets = Planètes
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Soleil
 
+sector.impact0078.name = Impact 0078
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
 sector.frozenForest.name = Frozen Forest
@@ -545,20 +831,107 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.
+sector.groundZero.description = Un endroit optimal pour commencer. Avec une menace ennemie faible et peu de ressources disponibles.\nRassemblez autant de cuivre et de plomb que possible pour continuer votre exploration.
+sector.frozenForest.description = Même ici, près des montagnes, les spores se sont propagées. Les températures glaciales ne pourront pas les contenir indéfiniment.\n\nCommencez votre production d'énergie en construisant des générateurs à combustion et apprenez à utiliser les bâtiments de soin.
+sector.saltFlats.description = À la périphérie du désert se trouvent les déserts de sel. Peu de ressources s'y trouvent.\n\nLà-bas, l'ennemi a construit un complexe de stockage de ressource. Détruisez leur Noyau et ne laissez rien debout.
+sector.craters.description = Ce cratère est une relique d'anciennes guerres. De l'eau s'est accumulée au fond. Prenez le contrôle de la zone.\nCollectez du Sable et faites fondre du Verre trempé. Pompez de l'eau pour refroidir vos tourelles et vos foreuses.
+sector.ruinousShores.description = Au-delà des déchets se trouve le littoral. Autrefois, cet endroit abritait un réseau de défense côtière, mais il n’en reste pas grand-chose. Seules quelques structures de défense basiques sont restées intactes, tout le reste a été réduit en ferraille.\nContinuez votre exploration en redécouvrant leurs technologies.
+sector.stainedMountains.description = Plus loin, à l’intérieur des terres, se trouvent des montagnes qui n'ont pas été touchées par les spores.\nExploitez le Titane présent en abondance dans cette zone et apprenez comment l'utiliser.\n\nLa présence ennemie est bien plus grande ici. Ne leur donnez pas le temps d’envoyer leurs unités les plus fortes.
+sector.overgrowth.description = Étant plus proche de la source des spores, cette zone a été complètement envahie.\nL'ennemi y a établi un avant-poste. Formez des Titans et détruisez-le.
+sector.tarFields.description = La périphérie d’une zone de production pétrolière, située entre les montagnes et le désert. L’une des rares avec des réserves de goudron utilisables.\nBien qu’abandonnée, quelques forces ennemies dangereuses se trouvent à proximité. Ne les sous-estimez pas!\n\n[lightgray]Recherchez la technologie de traitement de pétrole si possible.
+sector.desolateRift.description = Une zone extrêmement dangereuse. Des ressources abondantes, mais peu d’espace. Un risque élevé de destruction donc, partez dès que possible! Ne vous laissez surtout pas berner par le long temps d'attente entre les vagues ennemies. Vous risquez de le regretter.
+sector.nuclearComplex.description = Une ancienne installation de production et de traitement de thorium réduite en ruines.\n[lightgray]Faites des recherches sur ce minerai et ses nombreuses utilisations.\n\nL’ennemi est présent ici en grand nombre, recherchant constamment des attaquants.
+sector.fungalPass.description = Une zone de transition entre les hautes montagnes et les terres plus basses, infestées de spores. Une petite base de reconnaissance ennemie se trouve ici.\nDétruisez les 2 Noyaux ennemis en utilisant des Poignards et des Rampeurs.
+sector.biomassFacility.description = L’origine des spores. Il s’agit de l’installation dans laquelle elles ont été étudiées et initialement produites.\nRecherchez la technologie présente sur les lieux et cultivez des spores pour la production de carburant et de plastique.\n\n[lightgray]Lors de la destruction de cette installation, les spores ont été libérées. Rien dans l’écosystème local ne pouvait concurrencer un organisme aussi envahissant.
+sector.windsweptIslands.description = Au-delà du rivage se trouve cette chaîne d’îles reculées. Les registres montrent qu’il y avait autrefois des usines de [accent]Plastanium[].\n\nDéfendez-vous contre les unités navales ennemies, établissez-y une base et faites des recherches sur ces usines.
+sector.extractionOutpost.description = Un avant-poste éloigné, construit par l’ennemi dans le but de transférer des ressources vers d’autres secteurs.\n\nCette technologie de transport inter-secteur est essentielle pour de nouvelles conquêtes. Détruisez la base et recherchez leurs Rampes de lancement.
+sector.impact0078.description = Ici reposent les vestiges d'un vaisseau de transport interstellaire, premier à être entré dans ce système.\n\nRécupérez et recherchez autant de technologies que possible dans cette épave.
+sector.planetaryTerminal.description = La cible finale.\n\nCette base côtière contient une structure capable de propulser des Noyaux sur les planètes voisines. Elle est extrêmement bien gardée.\n\nProduisez des unités navales, éliminez l’ennemi le plus rapidement possible et recherchez la structure de propulsion.
+sector.coastline.description = Des restes d’unités navales ont été détectés à cet endroit. Repoussez les attaques ennemies, capturez ce secteur, et obtenez cette technologie.
+sector.navalFortress.description = L’ennemi a établi une base sur une île isolée, avec des défenses naturelles. Détruisez cet avant-poste. Acquérez leur technologie navale avancée.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
 
-settings.language = Langue
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = Le secteur de tutoriel. Cet objectif n'a pas encore été créé. Attendez pour des informations futures.
+sector.aegis.description = L'ennemi est protégé par des boucliers. Un module expérimental de briseur de bouclier a été détecté dans ce secteur.\nLocalisez cette structure, approvisionnez-la avec des munitions de tungstène et détruisez la base ennemie.
+sector.lake.description = Le lac de scories du secteur limite les unités utilisables. Les troupes volantes sont la seule option.\nRecherchez le [accent]fabricateur de vaisseaux[] et produisez un [accent]elude[] aussi tôt que possible.
+sector.intersect.description = Les scans montrent que ce secteur sera attaqué sur plusieurs côtés après l'atterrissage.\nConstruisez et développez vos défenses aussi vite que possible.\nLes [accent]Mécas[] seront requis pour le terrain accidenté de ce secteur.
+sector.atlas.description = Ce secteur contient des terrains variés et requiert des unités toutes aussi variées pour attaquer efficacement.\nDes unités améliorées peuvent également être nécessaires afin de détruire les bases ennemies les plus difficiles.\nRecherchez l'[accent]électrolyseur[] et le [accent]refabricateur de tanks[].
+sector.split.description = La présence faible de l'ennemi dans ce secteur le rend parfait pour tester de nouvelles technologies de transport.
+sector.basin.description = Présence ennemie importante détectée dans ce secteur.\nConstruisez rapidement des unités et capturez les noyaux ennemis pour y prendre pied.
+sector.marsh.description = Ce secteur est abondant en arkycite, mais a peu d'évents.\nConstruisez des [accent]Chambres de Combustion Chimique[] pour générer de l’énergie.
+sector.peaks.description = Le terrain montagneux dans ce secteur rend la plupart des unités inutiles. Des unités volantes seront nécessaires.\nFaîtes attention aux installations anti-aériennes ennemies. Il est peut-être possible de désactiver certaines d'entre elles en ciblant leurs bâtiments de soutien.
+sector.ravine.description = Aucun noyau ennemi détecté dans ce secteur, bien que ce soit une route de transport importante. Attendez-vous à une grande variété de forces ennemies.\nProduisez de [accent]l'alliage superchargé[]. Construisez des [accent]Éclateurs[].
+sector.caldera-erekir.description = Les ressources détectées dans ce secteur sont dispersées sur plusieurs îles.\nRecherchez et déployez des lignes de distribution par drones.
+sector.stronghold.description = Le grand campement ennemi dans ce secteur garde des dépôts importants de [accent]thorium[].\nUtilisez-le pour développer des unités et des tourelles de niveau supérieur.
+sector.crevice.description = L’ennemi enverra des forces d’attaques féroces pour détruire votre base dans ce secteur.\nDévelopper du [accent]carbure[] et des [accent]Générateurs à Pyrolyse[] peuvent être impératifs à votre survie.
+sector.siege.description = Ce secteur comporte deux canyons parallèles qui forceront une attaque à deux volets.\nRecherchez du [accent]cyanogène[] pour acquérir la capacité de créer de puissants tanks.\nAttention: des missiles à longue portée ennemis ont été détectés. Les missiles peuvent être abattus avant l’impact.
+sector.crossroads.description = Les bases ennemies de ce secteur ont été établies sur différents terrains. Recherchez différentes unités pour vous adapter.\nEn outre, certaines bases sont protégées par des boucliers. Découvrez comment elles sont alimentées.
+sector.karst.description = Ce secteur est riche en ressources, mais sera attaqué dès que le noyau ennemi atterrira.\nProfitez de ce temps pour exploiter les ressources et rechercher du [accent]tissu phasé[].
+sector.origin.description = Le secteur final, avec une présence ennemie importante.\nPossibilités de recherche peu probable. Concentrez-vous uniquement sur la destruction de tous les noyaux ennemis.
+
+status.burning.name = Brûlé
+status.freezing.name = Gelé
+status.wet.name = Humidifié
+status.muddy.name = Boueux
+status.melting.name = Fondant
+status.sapped.name = Sapé
+status.electrified.name = Électrifié
+status.spore-slowed.name = Ralenti (Spores)
+status.tarred.name = Goudronné
+status.overdrive.name = Surmultiplié
+status.overclock.name = Surcadençé
+status.shocked.name = Foudroyé
+status.blasted.name = Explosé
+status.unmoving.name = Immobilisé
+status.boss.name = Gardien
+
+settings.language = Langage
 settings.data = Données du Jeu
 settings.reset = Valeurs par Défaut
 settings.rebind = Réattribuer
@@ -568,34 +941,39 @@ settings.game = Jeu
 settings.sound = Son
 settings.graphics = Graphismes
 settings.cleardata = Effacer les données du jeu...
-settings.clear.confirm = Êtes-vous sûr d'effacer ces données ?\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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
+settings.clear.confirm = Êtes-vous sûr de vouloir 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 = Êtes-vous sûr de vouloir supprimer toutes vos sauvegardes ?
+settings.clearsaves = Supprimer les Sauvegardes
+settings.clearresearch = Supprimer la Recherche
+settings.clearresearch.confirm = Êtes-vous sûr de vouloir supprimer toutes les recherches de la campagne ?
+settings.clearcampaignsaves = Supprimer la Campagne
+settings.clearcampaignsaves.confirm = Êtes-vous sûr de vouloir supprimer toutes les sauvegardes de la campagne ?
 paused = [accent]< Pause >
 clear = Effacer
-banned = [scarlet]Bannis
-unplaceable.sectorcaptured = [scarlet]Nécessite la capture du secteur
+banned = [scarlet]Banni
+unsupported.environment = [scarlet]Environnement non supporté
 yes = Oui
 no = Non
 info.title = Info
-error.title = [crimson]Une erreur s'est produite
+error.title = [scarlet]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
-unit.nobuild = [scarlet]Cette unité ne peut construire
-lastaccessed = [lightgray]Last Accessed: {0}
+unit.nobuild = [scarlet]Cette unité ne peut pas construire
+lastaccessed = [lightgray]Dernier accès : {0}
+lastcommanded = [lightgray]Dernier commandement: {0}
 block.unknown = [lightgray]???
 
-stat.input = Entrée
-stat.output = Sortie
-stat.booster = Booster
-stat.tiles = Pré-requis
+stat.showinmap = <charger la carte à afficher>
+stat.description = Description
+stat.input = Ressource(s) requise(s)
+stat.output = Ressource(s) produite(s)
+stat.maxefficiency = Efficacité maximale
+stat.booster = Boosteur
+stat.tiles = Sol requis
 stat.affinities = Affinités
+stat.opposites = Opposés
 stat.powercapacity = Capacité d'énergie
-stat.powershot = Énergie/Tir
+stat.powershot = Unités d'énergie/Tir
 stat.damage = Dégâts
 stat.targetsair = Cibles Aériennes
 stat.targetsground = Cibles Terrestres
@@ -603,220 +981,338 @@ stat.itemsmoved = Vitesse de Déplacement
 stat.launchtime = Temps entre chaque lancement
 stat.shootrange = Portée de tir
 stat.size = Taille
-stat.displaysize = Display Size
+stat.displaysize = Résolution
 stat.liquidcapacity = Capacité liquide
 stat.powerrange = Portée électrique
-stat.linkrange = Link Range
+stat.linkrange = Portée des liens
 stat.instructions = Instructions
-stat.powerconnections = Nombre maximal de connections
+stat.powerconnections = Nombre maximal de connexions
 stat.poweruse = Énergie utilisée
-stat.powerdamage = Dégâts d'énergie
+stat.powerdamage = Unités d'énergie/Dégât
 stat.itemcapacity = Stockage
-stat.memorycapacity = Memory Capacity
-stat.basepowergeneration = Production d'énergie
+stat.memorycapacity = Mémoire
+stat.basepowergeneration = Production d'énergie de Base
 stat.productiontime = Durée de production
-stat.repairtime = Durée de réparation complète du Bloc
+stat.repairtime = Durée de réparation complète d'un Bloc
+stat.repairspeed = Vitesse de réparation
+stat.weapons = Armes
+stat.bullet = Balles
+stat.moduletier = Tier
+stat.unittype = Type d'Unité
 stat.speedincrease = Accélération
 stat.range = Portée
-stat.drilltier = Forable
-stat.drillspeed = Vitesse de forage de base
-stat.boosteffect = Effet du Boost
-stat.maxunits = Unités actives max
+stat.drilltier = Blocs forables
+stat.drillspeed = Vitesse de forage de Base
+stat.boosteffect = Effet(s) du Booster
+stat.maxunits = Max d'Unités Actives
 stat.health = Santé
+stat.armor = Armure
 stat.buildtime = Durée de construction
-stat.maxconsecutive = Max Consecutive
+stat.maxconsecutive = Max consécutif
 stat.buildcost = Coût de construction
 stat.inaccuracy = Imprécision
 stat.shots = Tirs
-stat.reload = Tirs/Seconde
+stat.reload = Cadence de tir
 stat.ammo = Munitions
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.shieldhealth = Santé du bouclier
+stat.cooldowntime = Temps de refroidissement
+stat.explosiveness = Explosivité
+stat.basedeflectchance = Chance de Détournement de Base
+stat.lightningchance = Chance d'Éclairs
+stat.lightningdamage = Dégâts des Éclairs
+stat.flammability = Inflammabilité
+stat.radioactivity = Radioactivité
+stat.charge = Charge
+stat.heatcapacity = Capacité Thermique
+stat.viscosity = Viscosité
+stat.temperature = Température
+stat.speed = Vitesse
+stat.buildspeed = Vitesse de construction
+stat.minespeed = Vitesse de minage
+stat.minetier = Niveau de minage
+stat.payloadcapacity = Capacité de chargement
+stat.abilities = Habilités
+stat.canboost = Boost
+stat.flying = Unité volante
+stat.ammouse = Utilisation de munitions
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Multiplicateur de dégâts
+stat.healthmultiplier = Multiplicateur de santé
+stat.speedmultiplier = Multiplicateur de vitesse
+stat.reloadmultiplier = Multiplicateur de rechargement
+stat.buildspeedmultiplier = Multiplicateur de vitesse de construction
+stat.reactive = Réactions
+stat.immunities = Immunités
+stat.healing = Guérison
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = Champ de Force
+ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.repairfield = Champ de Réparation
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Champ d'Amélioration
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Usine
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Champ de régénération de bouclier
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Déplacement éclair
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Arc de Bouclier
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Champ de Suppression de Soins
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Champ d'énergie
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Régénération
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
+bar.onlycoredeposit = Seul le dépôt de ressources dans le Noyau est autorisé
 bar.drilltierreq = Meilleure Foreuse Requise
-bar.noresources = Missing Resources
-bar.corereq = Core Base Required
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Ressources manquantes
+bar.corereq = Noyau de base requis
+bar.corefloor = Tuiles de Zone de Noyau requis
+bar.cargounitcap = Limite de Transporteurs Atteinte
 bar.drillspeed = Vitesse de Forage: {0}/s
 bar.pumpspeed = Vitesse de Pompage: {0}/s
 bar.efficiency = Efficacité: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Énergie: {0}/s
-bar.powerstored = En stock: {0}/{1}
+bar.powerstored = Réserves d'Énergie: {0}/{1}
 bar.poweramount = Énergie: {0}
 bar.poweroutput = Énergie Produite: {0}
-bar.powerlines = Connections: {0}/{1}
+bar.powerlines = Connexions: {0}/{1}
 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.liquid = Liquides
 bar.heat = Chaleur
+bar.cooldown = Cooldown
+bar.instability = Instabilité
+bar.heatamount = Chaleur: {0}
+bar.heatpercent = Chaleur: {0} ({1}%)
 bar.power = Énergie
-bar.progress = Progression de la construction
+bar.progress = Construction en cours
+bar.loadprogress = Progression
+bar.launchcooldown = Délai de Lancement
 bar.input = Entrée
 bar.output = Sortie
+bar.strength = [stat]{0}[lightgray]x puissance
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]Contrôlé par un processeur.
 
 bullet.damage = [stat]{0}[lightgray] dégâts
 bullet.splashdamage = [stat]{0}[lightgray] dégâts de zone ~[stat] {1}[lightgray] blocs
 bullet.incendiary = [stat]incendiaire
 bullet.homing = [stat]autoguidé
-bullet.shock = [stat]choc électrique
-bullet.frag = [stat]explosif
+bullet.armorpierce = [stat]perceur d'armure
+bullet.maxdamagefraction = [stat]{0}%[lightgray] limite de dégâts
+bullet.suppression = [stat]{0} sec[lightgray] suppression de soins ~ [stat]{1}[lightgray] blocs
+bullet.interval = [stat]{0}/sec[lightgray] Balle secondaire:
+bullet.frags = [stat]{0}[lightgray]x Balle à fragmentation:
+bullet.lightning = [stat]{0}[lightgray]x foudre ~ [stat]{1}[lightgray] dégâts
+bullet.buildingdamage = [stat]{0}%[lightgray] des dégâts aux bâtiments
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] recul
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]gel
-bullet.tarred = [stat]goudronné
+bullet.pierce = [stat]{0}[lightgray]x perçant
+bullet.infinitepierce = [stat]perçant
+bullet.healpercent = [stat]{0}[lightgray]% soins
+bullet.healamount = [stat]{0}[lightgray] réparation directe
 bullet.multiplier = [stat]{0}[lightgray]x multiplicateur de munitions
-bullet.reload = [stat]{0}[lightgray]x vitesse de tir
+bullet.reload = [stat]{0}[lightgray]% vitesse de tir
+bullet.range = [stat]{0}[lightgray] blocs de portée
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blocs
-unit.blockssquared = blocks²
-unit.powersecond = énergie/seconde
-unit.liquidsecond = unité de liquide/seconde
+unit.blockssquared = blocs²
+unit.powersecond = unités d'énergie/seconde
+unit.tilessecond = blocs/seconde
+unit.liquidsecond = unités de liquide/seconde
 unit.itemssecond = objets/seconde
-unit.liquidunits = unité de liquide
-unit.powerunits = unité d'énergie
+unit.liquidunits = unités de liquide
+unit.powerunits = unités d'énergie
+unit.heatunits = unités de température
 unit.degrees = degrés
-unit.seconds = secondes
-unit.minutes = mins
+unit.seconds = sec
+unit.minutes = min
 unit.persecond = /sec
 unit.perminute = /min
 unit.timesspeed = x vitesse
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = shield health
+unit.shieldhealth = santé du bouclier
 unit.items = objets
 unit.thousands = k
 unit.millions = M
-unit.billions = b
-category.general = Général
+unit.billions = Md
+unit.shots = shots
+unit.pershot = /tirs
+category.purpose = Description
+category.general = Caractéristiques
 category.power = Énergie
 category.liquids = Liquides
 category.items = Objets
 category.crafting = Fabrication
-category.function = Function
-category.optional = Améliorations optionnelles
-setting.landscape.name = Verrouiller en rotation paysage
+category.function = Fonction
+category.optional = Améliorations facultatives
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Ignorer l'animation du lancement du noyau et de l'atterrissage
+setting.landscape.name = Verrouiller la rotation en mode paysage
 setting.shadows.name = Ombres
-setting.blockreplace.name = Suggestions Automatiques de Blocs
-setting.linear.name = Filtrage Linéaire
+setting.blockreplace.name = Suggestion automatique des Blocs
+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.animatedwater.name = Eau animée
+setting.logichints.name = Astuces pour les commandes des processeurs
+setting.backgroundpause.name = Pause en Arrière-plan
+setting.buildautopause.name = Confirmation avant construction
+setting.doubletapmine.name = Double-clic pour Miner
+setting.commandmodehold.name = Retenir pour le Mode « Commande »
+setting.distinctcontrolgroups.name = Limiter un groupe de contrôle par unité
+setting.modcrashdisable.name = Désactiver les mods lors d'un crash au démarrage
+setting.animatedwater.name = Surfaces Animées
 setting.animatedshields.name = Boucliers Animés
-setting.antialias.name = Anticrénelage[lightgray] (redémarrage du jeu nécessaire)[]
-setting.playerindicators.name = Indicateurs des Joueurs
-setting.indicators.name = Indicateurs des Ennemis
+setting.playerindicators.name = Indicateurs d'alliés
+setting.indicators.name = Indicateurs d'ennemis
 setting.autotarget.name = Visée automatique
 setting.keyboard.name = Contrôles Souris+Clavier
 setting.touchscreen.name = Commandes d'écran tactile
 setting.fpscap.name = FPS Max
-setting.fpscap.none = Aucun
+setting.fpscap.none = Illimité
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Échelle de l'interface[lightgray] (redémarrage du jeu nécessaire)[]
+setting.uiscale.name = Échelle de l'interface
+setting.uiscale.description = Redémarrage du jeu nécessaire pour appliquer les changements.
 setting.swapdiagonal.name = Autoriser le placement en diagonale
-setting.difficulty.training = Entraînement
-setting.difficulty.easy = Facile
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Difficile
-setting.difficulty.insane = Extrême
-setting.difficulty.name = Difficulté:
 setting.screenshake.name = Tremblement de l'Écran
+setting.bloomintensity.name = Intensité de l'effet de Bloom
+setting.bloomblur.name = Flou de l'effet de Bloom
 setting.effects.name = Afficher les Effets
-setting.destroyedblocks.name = Afficher les Blocs Détruits
+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.conveyorpathfinding.name = Placement intelligent des Convoyeurs
 setting.sensitivity.name = Sensibilité de la manette
-setting.saveinterval.name = Intervalle des Sauvegardes Automatiques
+setting.saveinterval.name = Intervalle des Sauvegardes automatiques
 setting.seconds = {0} secondes
-setting.blockselecttimeout.name = Délai d'Attente de Sélection de Bloc
 setting.milliseconds = {0} millisecondes
 setting.fullscreen.name = Plein Écran
-setting.borderlesswindow.name = Fenêtre sans bords (Borderless)[lightgray] (peut nécessiter le redémarrage du jeu)
-setting.fps.name = Afficher FPS et Ping
+setting.borderlesswindow.name = Fenêtré sans bordures
+setting.borderlesswindow.name.windows = Plein écran sans bordure
+setting.borderlesswindow.description = Un redémarrage peut être nécessaire pour appliquer les changements.
+setting.fps.name = Afficher les FPS et le Ping
+setting.console.name = Activer la Console
 setting.smoothcamera.name = Lissage de la Caméra
-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.vsync.name = Synchronisation Verticale
+setting.pixelate.name = Pixeliser
+setting.minimap.name = Afficher la Mini-carte
+setting.coreitems.name = Afficher les objets du Noyau
 setting.position.name = Afficher la position du joueur
-setting.musicvol.name = Volume Musique
-setting.atmosphere.name = Son atmosphérique de la planète
+setting.mouseposition.name = Afficher la Position de la Souris
+setting.musicvol.name = Volume de la Musique
+setting.atmosphere.name = Montrer l'Atmosphère des planètes
+setting.drawlight.name = Dessiner les Ombres/Lumières
 setting.ambientvol.name = Volume Ambiant
 setting.mutemusic.name = Couper la Musique
-setting.sfxvol.name = Volume des Effets Spéciaux
-setting.mutesound.name = Couper le son des Effets Spéciaux
-setting.crashreport.name = Envoyer des Rapports de Crash anonymes
+setting.sfxvol.name = Volume des Sons et Effets
+setting.mutesound.name = Couper les Sons et Effets
+setting.crashreport.name = Envoyer des Rapports de crash anonymes
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Sauvegardes Automatiques
-setting.publichost.name = Visibilité de la Partie Publique
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limite de Joueurs
 setting.chatopacity.name = Opacité du Chat
-setting.lasersopacity.name = Opacité des Connections Laser
+setting.lasersopacity.name = Opacité des Connexions laser
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Opacité des ponts
 setting.playerchat.name = Montrer les bulles de discussion des joueurs
-public.confirm = Voulez-vous rendre votre partie publique?\n[accent]N'importe qui pourrait rejoindre vos parties.\n[lightgray]Ce paramètre peut être changé plus tard dans Paramètres->Jeu->Visibilité de la Partie Publique
-public.beta = Notez que les versions bêta du jeu ne peuvent pas créer des salons publics.
-uiscale.reset = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer.\n[scarlet]Rétablissement des paramètres d'avant et fermeture dans [accent] {0}[]...
+setting.showweather.name = Montrer les Effets météo
+setting.hidedisplays.name = Cacher les Écrans
+setting.macnotch.name = Adapter l'interface pour afficher l'encoche
+setting.macnotch.description = Redémarrage du jeu nécessaire pour appliquer les changements
+steam.friendsonly = Amis seulement
+steam.friendsonly.tooltip = Indique si seuls les amis Steam peuvent rejoindre votre partie.\nSi vous décochez cette case, votre partie deviendra publique et tout le monde pourra la rejoindre.
+public.beta = Notez que les versions bêta du jeu ne peuvent pas créer de salons publics.
+uiscale.reset = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer.\n[scarlet]Rétablissement des anciens paramètres et fermeture du jeu dans [accent] {0}[] secondes...
 uiscale.cancel = Annuler & Quitter
 setting.bloom.name = Flou lumineux
-keybind.title = Raccourcis Clavier
-keybinds.mobile = [scarlet]La plupart des raccourcis clavier ne sont pas fonctionnels sur mobile. Seuls les mouvements basiques sont supportés.
+keybind.title = Paramètres des Touches du Clavier
+keybinds.mobile = [scarlet]La plupart des touches de clavier ne sont pas fonctionnelles sur mobile. Seuls les mouvements basiques sont supportés.
 category.general.name = Général
-category.view.name = Voir
+category.view.name = Vue
+category.command.name = Commandes d'Unité
 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é
-keybind.clear_building.name = Effacer les constructions
-keybind.press = Appuyez sur une touche...
-keybind.press.axis = Appuyez sur un axe ou une touche...
-keybind.screenshot.name = Capture d'écran
-keybind.toggle_power_lines.name = Montrer/Cacher les Connections d'Énergie
-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
+category.blocks.name = Sélection des blocs
+placement.blockselectkeys = \n[lightgray]Raccourci : [{0},
+keybind.respawn.name = Réapparaître
+keybind.control.name = Contrôler une Unité
+keybind.clear_building.name = Réinitialiser les constructions
+keybind.press = Pressez une touche...
+keybind.press.axis = Pressez un axe ou une touche...
+keybind.screenshot.name = Capture d'écran de la carte
+keybind.toggle_power_lines.name = Montrer/Cacher les Connexions d'Énergie
+keybind.toggle_block_status.name = Montrer/Cacher le Statut des Blocs
+keybind.move_x.name = Mouvement axe X
+keybind.move_y.name = Mouvement axe Y
+keybind.mouse_move.name = Suivre la souris
+keybind.pan.name = Vue Panoramique
 keybind.boost.name = Boost
+keybind.command_mode.name = Mode « Commande »
+keybind.command_queue.name = File d'attente des Commandes d'Unités
+keybind.create_control_group.name = Créer un Groupe de Contrôle
+keybind.cancel_orders.name = Annuler les Ordres
+
+keybind.unit_stance_shoot.name = Ordre: Tirer
+keybind.unit_stance_hold_fire.name = Ordre: Ne pas tirer
+keybind.unit_stance_pursue_target.name = Ordre: Poursuivre la cible
+keybind.unit_stance_patrol.name = Ordre: Patrouille
+keybind.unit_stance_ram.name = Ordre: Charger
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+
+keybind.rebuild_select.name = Reconstruire la Zone
 keybind.schematic_select.name = Sélectionner une Région
 keybind.schematic_menu.name = Menu des schémas
 keybind.schematic_flip_x.name = Retourner le schéma sur l'axe des X
 keybind.schematic_flip_y.name = Retourner le schéma sur l'axe des Y
 keybind.category_prev.name = Catégorie Précédente
 keybind.category_next.name = Catégorie Suivante
-keybind.block_select_left.name = Sélectionner Bloc de Gauche
-keybind.block_select_right.name = Sélectionner Bloc de Droite
-keybind.block_select_up.name = Sélectionner Bloc en Haut
-keybind.block_select_down.name = Sélectionner Bloc en Bas
+keybind.block_select_left.name = Sélectionner le Bloc de Gauche
+keybind.block_select_right.name = Sélectionner le Bloc de Droite
+keybind.block_select_up.name = Sélectionner le Bloc en Haut
+keybind.block_select_down.name = Sélectionner le Bloc en Bas
 keybind.block_select_01.name = Sélectionner Catégorie/Bloc 1
 keybind.block_select_02.name = Sélectionner Catégorie/Bloc 2
 keybind.block_select_03.name = Sélectionner Catégorie/Bloc 3
@@ -832,79 +1328,138 @@ keybind.select.name = Sélectionner/Tirer
 keybind.diagonal_placement.name = Placement en diagonale
 keybind.pick.name = Choisir un bloc
 keybind.break_block.name = Supprimer un bloc
+keybind.select_all_units.name = Sélectionner toutes les Unités
+keybind.select_all_unit_factories.name = Sélectionner toutes les Usines d'Unités
 keybind.deselect.name = Désélectionner
-keybind.pickupCargo.name = Pickup Cargo
-keybind.dropCargo.name = Drop Cargo
-keybind.command.name = Command
+keybind.pickupCargo.name = Prendre un Chargement
+keybind.dropCargo.name = Lâcher un Chargement
 keybind.shoot.name = Tirer
 keybind.zoom.name = Zoomer
 keybind.menu.name = Menu
 keybind.pause.name = Pause
-keybind.pause_building.name = Pauser/Reprendre la construction
-keybind.minimap.name = Minimap
-keybind.chat.name = Chat
-keybind.player_list.name = Liste des Joueurs
+keybind.pause_building.name = Pauser/Reprendre la Construction
+keybind.minimap.name = Mini-carte
+keybind.planet_map.name = Carte de la Planète
+keybind.research.name = Recherche
+keybind.block_info.name = Information du Bloc
+keybind.chat.name = Tchat
+keybind.player_list.name = Liste des joueurs
 keybind.console.name = Console
 keybind.rotate.name = Tourner
-keybind.rotateplaced.name = Tourner un bloc existant (maintenir)
+keybind.rotateplaced.name = Tourner un Bloc existant (maintenir)
 keybind.toggle_menus.name = Cacher/Afficher les Menus
-keybind.chat_history_prev.name = Remonter l'Historique du Chat
-keybind.chat_history_next.name = Descendre l'Historique du Chat
-keybind.chat_scroll.name = Défilement du Chat
-keybind.drop_unit.name = Larguer l'unité
-keybind.zoom_minimap.name = Zoom Minimap
-mode.help.title = Description des modes de jeu
+keybind.chat_history_prev.name = Remonter l'Historique du Tchat
+keybind.chat_history_next.name = Descendre l'Historique du Tchat
+keybind.chat_scroll.name = Défilement du Tchat
+keybind.chat_mode.name = Changer le mode du Tchat
+keybind.drop_unit.name = Larguer une Unité
+keybind.zoom_minimap.name = Zoomer la Mini-carte
+mode.help.title = Description des modes de jeux
 mode.survival.name = Survie
-mode.survival.description = Le mode normal. Ressources limitées et vagues d'Ennemis automatiques.\n[gray]Nécessite un point d'apparition ennemi pour y jouer.
-mode.sandbox.name = Bac à sable
-mode.sandbox.description = Ressources infinies et pas de minuterie pour les vagues.
+mode.survival.description = Le mode normal. Ressources limitées et vagues automatiques.\n[gray]Requiert des points d'apparition ennemis pour pouvoir jouer à ce mode.
+mode.sandbox.name = Bac à Sable
+mode.sandbox.description = Ressources infinies et pas de compte à rebours pour les vagues.
 mode.editor.name = Éditeur
-mode.pvp.name = PvP
-mode.pvp.description = Battez-vous contre d'autres joueurs en local.\n[gray]Requiert aux moins 2 noyaux de couleurs différentes dans la carte pour y jouer.
+mode.pvp.name = JcJ
+mode.pvp.description = Lutter contre d'autres joueurs pour gagner !\n[gray]Requiert au moins 2 Noyaux de couleurs différentes pour pouvoir jouer à ce mode.
 mode.attack.name = Attaque
-mode.attack.description = Pas de vagues, le but étant de détruire la base ennemie.\n[gray]Requiert un noyau rouge dans la map pour y jouer.
-mode.custom = Règles personnalisées
+mode.attack.description = Pas forcément de vagues, le but étant de détruire la base ennemie.\n[gray]Requiert un Noyau rouge pour jouer à ce mode.
+mode.custom = Règles Personnalisées
 
-rules.infiniteresources = Ressources infinies
+rules.invaliddata = Données du Presse-Papier Invalides.
+rules.hidebannedblocks = Cacher les blocs bannis.
+rules.infiniteresources = Ressources Infinies
+rules.onlydepositcore = Seulement autoriser le dépôt d'Objets dans le Noyau
+rules.derelictrepair = Autoriser la réparation des structures abandonnées
 rules.reactorexplosions = Explosion des Réacteurs
-rules.schematic = Schematics Allowed
-rules.wavetimer = Minuterie pour les vagues
+rules.coreincinerates = Incinération des surplus du Noyau
+rules.disableworldprocessors = Désactiver les Processeurs Globaux
+rules.schematic = Schémas autorisés
+rules.wavetimer = Compte à rebours des vagues
+rules.wavesending = Déclenchement des Vagues
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Vagues
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Mode « Attaque »
-rules.buildai = AI Building
+rules.buildai = IA de Construction de Base
+rules.buildaitier = Niveau de l'IA de Construction de Base
+rules.rtsai = IA de RTS [red](WIP)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Taille Minimale d'une Escouade
+rules.rtsmaxsquadsize = Taille Maximale d'une Escouade
+rules.rtsminattackweight = Poids Minimum d'une Attaque
+rules.cleanupdeadteams = Détruire les structures des équipes vaincues (JcJ)
+rules.corecapture = Capture du Noyau lors de sa Destruction
+rules.polygoncoreprotection = Protection polygonale du Noyau
+rules.placerangecheck = Vérification de la Portée de Placement
 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
-rules.unitbuildspeedmultiplier = Multiplicateur de Vitesse de Construction d'Unités
+rules.unitbuildspeedmultiplier = Multiplicateur de Vitesse de Construction des Unités
+rules.unitcostmultiplier = Multiplicateur du coût de fabrication des Unités
 rules.unithealthmultiplier = Multiplicateur de Santé des Unités
 rules.unitdamagemultiplier = Multiplicateur de Dégât des Unités
-rules.enemycorebuildradius = Périmètre de non-construction autour du noyau ennemi:[lightgray] (blocs)
-rules.wavespacing = Espacement des vagues:[lightgray] (sec)
+rules.unitcrashdamagemultiplier = Multiplicateur de Dégât de chute des Unités
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Multiplicateur de l'Efficacité des Panneaux Solaires
+rules.unitcapvariable = Les Noyaux contribuent à la limite d'Unités actives
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Limite initiale d'Unités actives
+rules.limitarea = Limite de la zone de jeu de la Carte
+rules.enemycorebuildradius = Périmètre Non-Constructible autour du Noyau ennemi :[lightgray] (blocs)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Temps entre les Vagues :[lightgray] (sec)
+rules.initialwavespacing = Temps de Vague Initial :[lightgray] (sec)
 rules.buildcostmultiplier = Multiplicateur du prix de construction
 rules.buildspeedmultiplier = Multiplicateur du temps de construction
 rules.deconstructrefundmultiplier = Multiplicateur du remboursement lors de la déconstruction
-rules.waitForWaveToEnd = Les Vagues Attendent la Mort des Ennemis
-rules.dropzoneradius = Rayon d'Apparition des Ennemis:[lightgray] (tuiles)
-rules.unitammo = Les Unités Nécessitent des Munitions
+rules.waitForWaveToEnd = Les Vagues attendent la mort des ennemis
+rules.wavelimit = La Partie termine après la Vague
+rules.dropzoneradius = Rayon de la Zone d'Apparition ennemie :[lightgray] (blocs)
+rules.unitammo = Les Unités nécessitent des munitions
+rules.enemyteam = Équipe ennemie
+rules.playerteam = Équipe du joueur
 rules.title.waves = Vagues
 rules.title.resourcesbuilding = Ressources & Construction
 rules.title.enemy = Ennemis
 rules.title.unit = Unités
 rules.title.experimental = Expérimental
-rules.title.environment = Environment
+rules.title.environment = Environnement
+rules.title.teams = Équipes
+rules.title.planet = Planète
 rules.lighting = Éclairage
-rules.enemyLights = Enemy Lights
-rules.fire = Fire
-rules.explosions = Block/Unit Explosion Damage
-rules.ambientlight = Éclairage Ambiant
-rules.weather = Weather
-rules.weather.frequency = Frequency:
-rules.weather.duration = Duration:
+rules.fog = Brouillard de Guerre
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = Feu
+rules.anyenv = <Tout>
+rules.explosions = Dégâts d'explosion des Blocs/Unités
+rules.ambientlight = Éclairage\nAmbiant
+rules.weather = Météo
+rules.weather.frequency = Fréquence :
+rules.weather.always = Permanent
+rules.weather.duration = Durée :
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Objets
 content.liquid.name = Liquides
 content.unit.name = Unités
 content.block.name = Blocs
+content.status.name = Effet
+content.sector.name = Secteurs
+content.team.name = Factions
+
+wallore = (Mur)
 
 item.copper.name = Cuivre
 item.lead.name = Plomb
@@ -916,19 +1471,33 @@ item.silicon.name = Silicium
 item.plastanium.name = Plastanium
 item.phase-fabric.name = Tissu Phasé
 item.surge-alloy.name = Alliage Superchargé
-item.spore-pod.name = Glande de Spore
+item.spore-pod.name = Spore
 item.sand.name = Sable
 item.blast-compound.name = Mélange Explosif
 item.pyratite.name = Pyratite
 item.metaglass.name = Verre Trempé
 item.scrap.name = Ferraille
+item.fissile-matter.name = Matière Fissile
+item.beryllium.name = Béryllium
+item.tungsten.name = Tungstène
+item.oxide.name = Oxide
+item.carbide.name = Carbure
+item.dormant-cyst.name = Kyste dormant
+
 liquid.water.name = Eau
 liquid.slag.name = Scories
 liquid.oil.name = Pétrole
 liquid.cryofluid.name = Liquide Cryogénique
+liquid.neoplasm.name = Néoplasme
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogène
+liquid.nitrogen.name = Azote
+liquid.cyanogen.name = Cyanogène
 
 unit.dagger.name = Poignard
-unit.mace.name = Mace
+unit.mace.name = Titan
 unit.fortress.name = Forteresse
 unit.nova.name = Nova
 unit.pulsar.name = Pulsar
@@ -942,7 +1511,7 @@ unit.flare.name = Flare
 unit.horizon.name = Horizon
 unit.zenith.name = Zenith
 unit.antumbra.name = Antumbra
-unit.eclipse.name = Eclipse
+unit.eclipse.name = Éclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
@@ -953,92 +1522,126 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
-unit.scepter.name = Scepter
-unit.reign.name = Reign
+unit.scepter.name = Destructeur
+unit.reign.name = Éradicateur
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Drone d'Assemblage
+unit.latum.name = Latum
+unit.renale.name = Renale
+
 block.parallax.name = Parallax
 block.cliff.name = Falaise
-block.sand-boulder.name = Bloc de Sable
+block.sand-boulder.name = Rocher de Sable
+block.basalt-boulder.name = Rocher de Basalte
 block.grass.name = Herbe
-block.slag.name = Scories
-block.space.name = Space
+block.molten-slag.name = Scories
+block.pooled-cryofluid.name = Cryofluide
+block.space.name = Espace
 block.salt.name = Sel
-block.salt-wall.name = Salt Wall
+block.salt-wall.name = Mur de Sel
 block.pebbles.name = Cailloux
 block.tendrils.name = Vrilles
-block.sand-wall.name = Sand Wall
+block.sand-wall.name = Mur de Sable
 block.spore-pine.name = Pin Sporeux
-block.spore-wall.name = Spore Wall
-block.boulder.name = Boulder
-block.snow-boulder.name = Snow Boulder
+block.spore-wall.name = Mur de Spores
+block.boulder.name = Rocher
+block.snow-boulder.name = Rocher de Neige
 block.snow-pine.name = Pin enneigé
 block.shale.name = Schiste
-block.shale-boulder.name = Blocs de Schiste
+block.shale-boulder.name = Rocher de Schiste
 block.moss.name = Mousse
 block.shrubs.name = Arbustes
-block.spore-moss.name = Mousse Sporeuse
-block.shale-wall.name = Shale Wall
+block.spore-moss.name = Mousse Sporifère
+block.shale-wall.name = Mur de Schiste
 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
 block.scrap-wall-gigantic.name = Gigantesque Mur de Ferraille
 block.thruster.name = Propulseur
-block.kiln.name = Four
+block.kiln.name = Four à Verre
 block.graphite-press.name = Presse à Graphite
 block.multi-press.name = Multi-Presse
-block.constructing = {0}\n[lightgray](En Construction)
+block.constructing = {0} [lightgray](En Construction)
 block.spawn.name = Point d'Apparition Ennemi
-block.core-shard.name = Noyau: Tesson
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
+block.core-shard.name = Noyau: Fragment
 block.core-foundation.name = Noyau: Fondation
 block.core-nucleus.name = Noyau: Épicentre
-block.deepwater.name = Eau profonde
-block.water.name = Eau
+block.deep-water.name = Eau Profonde
+block.shallow-water.name = Eau
 block.tainted-water.name = Eau Contaminée
-block.darksand-tainted-water.name = Eau Contaminée avec fond de Sable Sombre
+block.deep-tainted-water.name = Eau Profonde Contaminée
+block.darksand-tainted-water.name = Eau Contaminée avec fond de Sable sombre
 block.tar.name = Goudron
 block.stone.name = Roche
-block.sand.name = Sable
-block.darksand.name = Sable Sombre
+block.sand-floor.name = Sable
+block.darksand.name = Sable sombre
 block.ice.name = Glace
 block.snow.name = Neige
-block.craters.name = Cratères
+block.crater-stone.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.darksand-water.name = Eau avec fond de Sable sombre
+block.char.name = Cendres
 block.dacite.name = Dacite
-block.dacite-wall.name = Dacite Wall
-block.dacite-boulder.name = Dacite Boulder
+block.rhyolite.name = Rhyolite
+block.dacite-wall.name = Mur de Dacite
+block.dacite-boulder.name = Rocher de Dacite
 block.ice-snow.name = Neige et Glace
-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.stone-wall.name = Mur de Pierre
+block.ice-wall.name = Mur de Glace
+block.snow-wall.name = Mur de Neige
+block.dune-wall.name = Mur de Sable sombre
 block.pine.name = Pin
-block.dirt.name = Dirt
-block.dirt-wall.name = Dirt Wall
-block.mud.name = Mud
+block.dirt.name = Terre
+block.dirt-wall.name = Mur de Terre
+block.mud.name = Boue
 block.white-tree-dead.name = Arbre Blanc Mort
 block.white-tree.name = Arbre Blanc
-block.spore-cluster.name = Grappe de Spores
-block.metal-floor.name = Plancher Métallique 1
-block.metal-floor-2.name = Plancher Métallique 2
-block.metal-floor-3.name = Plancher Métallique 3
-block.metal-floor-5.name = Plancher Métallique 4
-block.metal-floor-damaged.name = Plancher Métallique Endommagé
-block.dark-panel-1.name = Panneau Sombre 1
-block.dark-panel-2.name = Panneau Sombre 2
-block.dark-panel-3.name = Panneau Sombre 3
-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.basalt.name = Basalt
+block.spore-cluster.name = Grappes de Spores
+block.metal-floor.name = Sol métallique
+block.metal-floor-2.name = Sol métallique 2
+block.metal-floor-3.name = Sol métallique 3
+block.metal-floor-4.name = Sol métallique 4
+block.metal-floor-5.name = Sol métallique 5
+block.metal-floor-damaged.name = Sol métallique endommagé
+block.dark-panel-1.name = Panneau sombre 1
+block.dark-panel-2.name = Panneau sombre 2
+block.dark-panel-3.name = Panneau sombre 3
+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.basalt.name = Basalte
 block.hotrock.name = Roches Chaudes
 block.magmarock.name = Roches Magmatiques
 block.copper-wall.name = Mur de Cuivre
@@ -1062,16 +1665,17 @@ block.conveyor.name = Convoyeur
 block.titanium-conveyor.name = Convoyeur en Titane
 block.plastanium-conveyor.name = Convoyeur en Plastanium
 block.armored-conveyor.name = Convoyeur Cuirassé
-block.armored-conveyor.description = Déplace les objets à la même vitesse que les convoyeurs en titane, mais est plus résistant. Seulement d'autres convoyeurs peuvent faire entrer des ressources par ses côtés.
 block.junction.name = Jonction
 block.router.name = Routeur
 block.distributor.name = Distributeur
 block.sorter.name = Trieur
 block.inverted-sorter.name = Trieur Inversé
-block.message.name = Message
+block.message.name = Bloc de Message
+block.reinforced-message.name = Bloc de Message Renforcé
+block.world-message.name = Bloc de Message Global
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminateur
-block.illuminator.description = Une petite source lumineuse compacte et configurable. Nécessite de l'énergie pour fonctionner.
-block.overflow-gate.name = Barrière de Débordement 
+block.overflow-gate.name = Barrière de Débordement
 block.underflow-gate.name = Barrière de Refoulement
 block.silicon-smelter.name = Fonderie de Silicium
 block.phase-weaver.name = Tisseur à Phase
@@ -1079,7 +1683,7 @@ block.pulverizer.name = Pulvérisateur
 block.cryofluid-mixer.name = Refroidisseur
 block.melter.name = Four à Fusion
 block.incinerator.name = Incinérateur
-block.spore-press.name = Presse à Spore
+block.spore-press.name = Presse à Spores
 block.separator.name = Séparateur
 block.coal-centrifuge.name = Centrifugeuse à Charbon
 block.power-node.name = Transmetteur Énergétique
@@ -1093,7 +1697,7 @@ 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
-block.pneumatic-drill.name = Foreuse à Vérin
+block.pneumatic-drill.name = Foreuse Pneumatique
 block.laser-drill.name = Foreuse Laser
 block.water-extractor.name = Extracteur d'Eau
 block.cultivator.name = Cultivateur
@@ -1107,235 +1711,969 @@ block.power-void.name = Absorbeur Énergétique
 block.power-source.name = Source d'Énergie
 block.unloader.name = Déchargeur
 block.vault.name = Coffre-Fort
-block.wave.name = Onde
+block.wave.name = Vague
 block.tsunami.name = Tsunami
-block.swarmer.name = Nuée
+block.swarmer.name = Essaim
 block.salvo.name = Salve
-block.ripple.name = Percussion
+block.ripple.name = Percuteur
 block.phase-conveyor.name = Convoyeur Phasé
 block.bridge-conveyor.name = Pont
 block.plastanium-compressor.name = Compresseur de Plastanium
-block.pyratite-mixer.name = Mixeur de Pyratite
+block.pyratite-mixer.name = Mixeur à Pyratite
 block.blast-mixer.name = Mixeur à Explosion
 block.solar-panel.name = Panneau Solaire
 block.solar-panel-large.name = Grand Panneau Solaire
 block.oil-extractor.name = Extracteur de Pétrole
 block.repair-point.name = Point de Réparation
+block.repair-turret.name = Tourelle de réparation
 block.pulse-conduit.name = Conduit à Impulsion
 block.plated-conduit.name = Conduit Plaqué
 block.phase-conduit.name = Conduit Phasé
-block.liquid-router.name = Routeur de Liquide
-block.liquid-tank.name = Réservoir à Liquide
-block.liquid-junction.name = Jonction à Liquide
-block.bridge-conduit.name = Conduit Surélevé
+block.liquid-router.name = Routeur de Liquides
+block.liquid-tank.name = Réservoir de Liquides
+block.liquid-container.name = Conteneur de Liquides
+block.liquid-junction.name = Jonction de Liquides
+block.bridge-conduit.name = Pont de Liquides
 block.rotary-pump.name = Pompe Rotative
 block.thorium-reactor.name = Réacteur à Thorium
-block.mass-driver.name = Catapulte Électromagnétique
-block.blast-drill.name = Foreuse à Explosion
-block.thermal-pump.name = Pompe Thermique
-block.thermal-generator.name = Générateur Thermique
-block.alloy-smelter.name = Fonderie d'Alliage Superchargé
-block.mender.name = Réparateur
-block.mend-projector.name = Projecteur Soignant
+block.mass-driver.name = Transporteur de Masse
+block.blast-drill.name = Foreuse à explosion
+block.impulse-pump.name = Pompe thermique
+block.thermal-generator.name = Générateur thermique
+block.surge-smelter.name = Fonderie d'Alliage Superchargé
+block.mender.name = Gardien
+block.mend-projector.name = Projecteur soignant
 block.surge-wall.name = Mur Superchargé
-block.surge-wall-large.name = Grand Mur Superchargé
+block.surge-wall-large.name = Grand mur Superchargé
 block.cyclone.name = Cyclone
 block.fuse.name = Fusible
-block.shock-mine.name = Mine
-block.overdrive-projector.name = Projecteur Surmultiplicateur
-block.force-projector.name = Champ de Force
+block.shock-mine.name = Mine terrestre
+block.overdrive-projector.name = Projecteur Accélérant
+block.force-projector.name = Projecteur de Champ de force
 block.arc.name = Arc
-block.rtg-generator.name = Générateur G.T.R.
+block.rtg-generator.name = G.T.R
 block.spectre.name = Spectre
 block.meltdown.name = Fusion
-block.foreshadow.name = Foreshadow
+block.foreshadow.name = Présage
 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
+block.launch-pad.name = Rampe de lancement
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.name = Diviseur
+block.ground-factory.name = Usine d'Unités Terrestres
+block.air-factory.name = Usine d'Unités Aériennes
+block.naval-factory.name = Usine d'Unités Navales
 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.payload-conveyor.name = Convoyeur de Masse
-block.payload-router.name = Routeur de Charge Utile
-block.disassembler.name = Disassembler
-block.silicon-crucible.name = Creuset de Silicium
-block.overdrive-dome.name = Overdrive Dome
+block.payload-conveyor.name = Convoyeur de Charges Utiles
+block.payload-router.name = Routeur de Charges Utiles
+block.duct.name = Conduit
+block.duct-router.name = Routeur de Conduit
+block.duct-bridge.name = Pont en Conduit
+block.large-payload-mass-driver.name = Grand Transporteur de Charges Utiles
+block.payload-void.name = Destructeur de Charge utile
+block.payload-source.name = Source de Charge utile
+block.disassembler.name = Désassembleur
+block.silicon-crucible.name = Grande Fonderie de Silicium
+block.overdrive-dome.name = Dôme Accélérant
+block.interplanetary-accelerator.name = Accélérateur Interplanétaire
+block.constructor.name = Constructeur
+block.constructor.description = Fabrique des structures d'une taille maximale de 2x2 (blocs).
+block.large-constructor.name = Grand Constructeur
+block.large-constructor.description = Fabrique des structures d'une taille maximale de 4x4 (blocs).
+block.deconstructor.name = Déconstructeur
+block.deconstructor.description = Déconstruit les structures et les unités. Retourne 100% du coût de construction.
+block.payload-loader.name = Chargeur de charge utile
+block.payload-loader.description = Charge les liquides et les ressources dans les blocs.
+block.payload-unloader.name = Déchargeur de charge utile
+block.payload-unloader.description = Décharge les liquides et les ressources des blocs.
+block.heat-source.name = Source de Chaleur
+block.heat-source.description = Produit de grandes quantités de chaleur. Bac à sable uniquement.
 
-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
+#Erekir
+block.empty.name = Vide
+block.rhyolite-crater.name = Cratère de Rhyolite
+block.rough-rhyolite.name = Rhyolite rugueuse
+block.regolith.name = Régolithe
+block.yellow-stone.name = Pierre Jaune
+block.carbon-stone.name = Pierre de Carbone
+block.ferric-stone.name = Pierre Ferreuse
+block.ferric-craters.name = Cratères Ferreux
+block.beryllic-stone.name = Pierre Beryllieuse
+block.crystalline-stone.name = Pierre Cristalline
+block.crystal-floor.name = Sol de Cristal
+block.yellow-stone-plates.name = Plaques de Pierre Jaune
+block.red-stone.name = Pierre Rouge
+block.dense-red-stone.name = Pierre Rouge Dense
+block.red-ice.name = Glace Rouge
+block.arkycite-floor.name = Sol d'Arkycite
+block.arkyic-stone.name = Pierre d'Arkyic
+block.rhyolite-vent.name = Évent de Rhyolite
+block.carbon-vent.name = Évent de Carbone
+block.arkyic-vent.name = Évent d'Arkyic
+block.yellow-stone-vent.name = Évent de Pierre Jaune
+block.red-stone-vent.name = Évent de Pierre Rouge
+block.crystalline-vent.name = Évent Crystallin
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Zone de Noyau
+block.regolith-wall.name = Mur de Régolithe
+block.yellow-stone-wall.name = Mur de Pierre Jaune
+block.rhyolite-wall.name = Mur de Rhyolite
+block.carbon-wall.name = Mur de Carbone
+block.ferric-stone-wall.name = Mur de Pierre Ferreuse
+block.beryllic-stone-wall.name = Mur de Pierre Beryllieuse
+block.arkyic-wall.name = Mur d'Arkyic
+block.crystalline-stone-wall.name = Mur de Pierre Cristalline
+block.red-ice-wall.name = Mur de Glace Rouge
+block.red-stone-wall.name = Mur de Pierre Rouge
+block.red-diamond-wall.name = Mur de Diamant Rouge
+block.redweed.name = Herbe Rouge
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Corail Jaune
+block.carbon-boulder.name = Rocher de Carbone
+block.ferric-boulder.name = Rocher Ferreux
+block.beryllic-boulder.name = Rocher Beryllieux
+block.yellow-stone-boulder.name = Rocher de Pierre Jaune
+block.arkyic-boulder.name = Rocher d'Arkyic
+block.crystal-cluster.name = Amas de Cristaux
+block.vibrant-crystal-cluster.name = Amas de Cristaux Vibrants
+block.crystal-blocks.name = Bloc de Cristal
+block.crystal-orbs.name = Orbe de Cristal
+block.crystalline-boulder.name = Rocher Cristallin
+block.red-ice-boulder.name = Rocher de Pierre Rouge
+block.rhyolite-boulder.name = Rocher de Rhyolite
+block.red-stone-boulder.name = Rocher de Pierre Rouge
+block.graphitic-wall.name = Rocher Graphitique
+block.silicon-arc-furnace.name = Four de Silicium
+block.electrolyzer.name = Électrolyseur
+block.atmospheric-concentrator.name = Concentrateur Atmosphérique
+block.oxidation-chamber.name = Chambre d'Oxydation
+block.electric-heater.name = Chauffage Électrique
+block.slag-heater.name = Chauffage de Scories
+block.phase-heater.name = Chauffage Phasé
+block.heat-redirector.name = Redirecteur de Chaleur
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Routeur de Chaleur
+block.slag-incinerator.name = Incinérateur de Scories
+block.carbide-crucible.name = Grande fonderie de Carbure
+block.slag-centrifuge.name = Centrifugeuse de Scories
+block.surge-crucible.name = Grande Fonderie d'Alliage Superchargé
+block.cyanogen-synthesizer.name = Synthétiseur de Cyanogène
+block.phase-synthesizer.name = Synthétiseur de Tissu Phasé
+block.heat-reactor.name = Centrale Thermique
+block.beryllium-wall.name = Mur de Béryllium
+block.beryllium-wall-large.name = Grand Mur de Béryllium
+block.tungsten-wall.name = Mur de Tungstène
+block.tungsten-wall-large.name = Grand Mur de Tungstène
+block.blast-door.name = Porte Blindée
+block.carbide-wall.name = Mur de Carbure
+block.carbide-wall-large.name = Grand Mur de Carbure
+block.reinforced-surge-wall.name = Mur d'Alliage Superchargé Renforcé
+block.reinforced-surge-wall-large.name = Grand Mur d'Alliage Superchargé Renforcé
+block.shielded-wall.name = Mur à Bouclier
+block.radar.name = Radar
+block.build-tower.name = Tourelle de Construction
+block.regen-projector.name = Projecteur Régénérant
+block.shockwave-tower.name = Tour à Ondes de Choc
+block.shield-projector.name = Projecteur de Bouclier
+block.large-shield-projector.name = Grand Projecteur de Bouclier
+block.armored-duct.name = Conduit Blindé
+block.overflow-duct.name = Conduit de Débordement
+block.underflow-duct.name = Conduit de Refoulement
+block.duct-unloader.name = Déchargeur de Conduit
+block.surge-conveyor.name = Convoyeur Superchargé
+block.surge-router.name = Routeur Superchargé
+block.unit-cargo-loader.name = Chargeur de Transporteurs
+block.unit-cargo-unload-point.name = Point de Déchargment de Transporteurs
+block.reinforced-pump.name = Pompe Renforcée
+block.reinforced-conduit.name = Conduit Reforcé
+block.reinforced-liquid-junction.name = Jonction de Liquides Renforcé
+block.reinforced-bridge-conduit.name = Pont de Liquides Renforcé
+block.reinforced-liquid-router.name = Routeur de Liquides Renforcé
+block.reinforced-liquid-container.name = Conteneur de Liquides Renforcé
+block.reinforced-liquid-tank.name = Réservoir de Liquides Renforcé
+block.beam-node.name = Transmetteur à Rayons
+block.beam-tower.name = Grand Transmetteur à Rayons
+block.beam-link.name = Relieur à Rayons
+block.turbine-condenser.name = Condenseur à Turbine
+block.chemical-combustion-chamber.name = Chambre de Combustion Chimique
+block.pyrolysis-generator.name = Générateur à Pyrolyse
+block.vent-condenser.name = Condenseur à Évent
+block.cliff-crusher.name = Broyeur de Parois
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Foreuse à Plasma
+block.large-plasma-bore.name = Grande Foreuse à Plasma
+block.impact-drill.name = Foreuse à Impact
+block.eruption-drill.name = Foreuse à Erruptions
+block.core-bastion.name = Noyau: Bastion
+block.core-citadel.name = Noyau: Citadelle
+block.core-acropolis.name = Noyau: Acropole
+block.reinforced-container.name = Conteneur Renforcé
+block.reinforced-vault.name = Coffre-Fort Renforcé
+block.breach.name = Brèche
+block.sublimate.name = Sublimeur
+block.titan.name = Titan
+block.disperse.name = Propagateur
+block.afflict.name = Éclateur
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Refabricateur de Tanks
+block.mech-refabricator.name = Refabricateur de Mécas
+block.ship-refabricator.name = Refabricateur de Vaisseaux
+block.tank-assembler.name = Assembleur de Tanks
+block.ship-assembler.name = Assembleur de Vaisseaux
+block.mech-assembler.name = Assembleur de Mécas
+block.reinforced-payload-conveyor.name = Convoyeur de Charges Utiles Renforcé
+block.reinforced-payload-router.name = Routeur de Charges Utiles Renforcé
+block.payload-mass-driver.name = Transporteur de Charges Utiles
+block.small-deconstructor.name = Petit Déconstructeur
+block.canvas.name = Canevas
+block.world-processor.name = Processeur Global
+block.world-cell.name = Cellule de Mémoire Globale
+block.tank-fabricator.name = Fabricateur de Tanks
+block.mech-fabricator.name = Fabricateur de Mécas
+block.ship-fabricator.name = Fabricateur de Vaisseaux
+block.prime-refabricator.name = Refabricateur Prime
+block.unit-repair-tower.name = Tourelle de Réparation
+block.diffuse.name = Diffuseur
+block.basic-assembler-module.name = Module d'Assemblage Basique
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Réacteur à Flux
+block.neoplasia-reactor.name = Réacteur à Néoplasme
 
-team.blue.name = bleu
-team.crux.name = rouge
-team.sharded.name = jaune
-team.orange.name = orange
-team.derelict.name = abandonné
+block.switch.name = Interrupteur
+block.micro-processor.name = Micro Processeur
+block.logic-processor.name = Processeur
+block.hyper-processor.name = Hyper Processeur
+block.logic-display.name = Écran
+block.large-logic-display.name = Grand Écran
+block.memory-cell.name = Cellule de mémoire
+block.memory-bank.name = Banque de mémoire
+
+team.malis.name = malis
+team.crux.name = crux
+team.sharded.name = sharded
+team.derelict.name = vestige
 team.green.name = vert
-team.purple.name = violet
+team.blue.name = bleu
 
-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
-tutorial.drill = Miner manuellement est inefficace.\nLes [accent]foreuses []peuvent miner pour vous.\nCliquez sur l'onglet des foreuses en bas à droite.\nSélectionnez la [accent]foreuse mécanique[]. Placez-la ensuite sur des minerais de cuivre avec un clic-gauche.\nVous pouvez aussi sélectionner la foreuse en appuyant sur [accent][[2][] et [accent][[1][] rapidement, peu importe l'onglet ouvert.\n[accent]Faites un clic-droit[] pour arrêter la construction.
-tutorial.drill.mobile = Miner manuellement est inefficace.\n[accent]Les foreuses []peuvent miner pour vous.\nAppuyez sur l'onglet des foreuses en bas à droite.\nSélectionnez la [accent]foreuse mécanique[].\nPlacez-la sur des minerais de cuivre en appuyant dessus, puis en touchant la[accent] coche[] pour confirmer votre placement.\nAppuyez sur le [accent]bouton X[] pour annuler le placement.
-tutorial.blockinfo = Chaque bloc a des statistiques différentes. Chaque foreuse ne peut miner que certains minerais.\nPour vérifier les informations et les statistiques d'un bloc, appuyez sur le [accent]bouton "?" tout en le sélectionnant dans le menu de construction.[]\n\n[accent]Maintenant, essayez d'accéder aux statistiques de la foreuse mécanique.[]
-tutorial.conveyor = [accent]Les convoyeurs[] sont utilisés pour transporter des objets au noyau.\nFaites une ligne de convoyeurs de la foreuse jusqu'au noyau.\n[accent]Maintenez votre souris pour les placer en ligne.[]\nGardez la touche[accent] CTRL[] enfoncée pour pouvoir les placer en diagonale.\n\nPlacez 2 convoyeurs en ligne, puis livrez un minerai au noyau.
-tutorial.conveyor.mobile = [accent]Les convoyeurs[] sont utilisés pour transporter des objets au noyau.\nFaites une ligne de convoyeurs de la foreuse jusqu'au noyau.\n[accent] Maintenez votre doigt enfoncé[] et déplacez-le pour former une ligne.\n\nPlacez 2 convoyeurs en ligne, puis livrez un minerai au noyau.
-tutorial.turret = Une fois qu'une ressource entre dans votre noyau, elle peut être utilisée pour la construction.\nGardez à l'esprit que certaines ressources ne peuvent pas être utilisées pour la construction.\nCes ressources, telles que[accent] le charbon[],[accent] le sable[] ou[accent] la ferraille[], ne peuvent pas entrer dans votre noyau.\nDes structures défensives doivent être construites pour repousser l'[lightgray] ennemi[].\nConstruisez une [accent]tourelle Duo[] près de votre noyau.
-tutorial.drillturret = Les tourelles Duo ont besoin de[accent] munitions en cuivre []pour tirer.\nPlacez une foreuse près de la tourelle.\nÀ l'aide de convoyeurs, alimentez la tourelle en cuivre.\n\n[accent]Munitions livrées: 0/1
-tutorial.pause = Pendant les batailles, vous pouvez mettre [accent]le jeu en pause.[]\nVous pouvez planifier la construction de bâtiments tout en étant en pause.\n\n[accent]Appuyez sur la barre espace pour mettre en pause.
-tutorial.pause.mobile = Pendant les batailles, vous pouvez mettre [accent]le jeu en pause.[]\nVous pouvez planifier la construction de bâtiments tout en étant en pause.\n\n[accent]Appuyez sur ce bouton en haut à gauche pour mettre en pause.
-tutorial.unpause = Maintenant, appuyez à nouveau sur espace pour reprendre.
-tutorial.unpause.mobile = Appuyez à nouveau dessus pour reprendre.
-tutorial.breaking = Les blocs ou bâtiments doivent souvent être détruits.\n[accent]Gardez enfoncé le bouton droit de votre souris[] pour détruire tous les blocs en une sélection.[]\n\n[accent]Détruisez tous les blocs de ferraille situés à la gauche de votre noyau à l'aide de la sélection de zone.
-tutorial.breaking.mobile = Les blocs ou bâtiments doivent souvent être détruits.\n[accent]Sélectionnez le mode de déconstruction[], puis appuyez sur un bloc pour commencer à le détruire.\nDétruisez une zone en maintenant votre doigt appuyé pendant quelques secondes[] et en le déplaçant dans une direction.\nAppuyez sur le bouton coche pour confirmer.\n\n[accent]Détruisez tous les blocs de ferraille situés à la gauche de votre noyau à l'aide de la sélection de zone.
-tutorial.withdraw = Dans certaines situations, il est nécessaire de prendre des ressources directement à partir des bâtiments.\nPour faire cela, [accent]appuyez sur un bloc[] qui contient des ressources, puis [accent]appuyez sur une ressource[] dans son inventaire.\nPlusieurs objets d'une même ressource peuvent être retirées en [accent]appuyant pendant quelques secondes[].\n\n[accent]Retirez du cuivre du noyau.[]
-tutorial.deposit = Vous pouvez déposer des ressources dans des bâtiments en les faisant glisser de votre vaisseau vers le bâtiment de destination.\n\n[accent]Déposez le cuivre récupéré précédemment dans le noyau.[]
-tutorial.waves = L'[lightgray] ennemi[] approche.\n\nDéfendez le noyau pendant 2 vagues.[accent] Cliquez[] pour tirer.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
-tutorial.waves.mobile = L'[lightgray] ennemi[] approche.\n\nDéfendez le noyau pendant 2 vagues. Votre vaisseau tirera automatiquement sur les ennemis.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
-tutorial.launch = Une fois que vous aurez atteint une vague spécifique, vous aurez la possibilité de[accent] faire décoller le noyau[], abandonnant vos défenses, mais [accent]sécurisant toutes les ressources stockées dans votre noyau.[]\nCes ressources peuvent ensuite être utilisées pour rechercher de nouvelles technologies.\n\n[accent]Appuyez sur le bouton de lancement.
+hint.skip = Passer
+hint.desktopMove = Utilisez [accent][[ZQSD][] pour bouger.
+hint.zoom = [accent]Scrollez[] pour zoomer et dézoomer.
+hint.desktopShoot = [accent][[Clic-gauche][] pour tirer.
+hint.depositItems = Pour déposer des ressources dans le Noyau, déplacez-les depuis votre vaisseau, vers ce dernier.
+hint.respawn = Pour réapparaître en tant que vaisseau, pressez [accent][[V][].
+hint.respawn.mobile = Vous avez pris le contrôle d'une unité/structure. Pour réapparaître en tant qu'unité de base, [accent]touchez l'avatar en haut à gauche.[]
+hint.desktopPause = Pressez [accent][[Espace][] pour mettre en pause et reprendre le jeu.
+hint.breaking = Maintenez [accent]Clic-droit[] pour détruire des blocs.
+hint.breaking.mobile = Activez le \ue817 [accent]marteau[] en bas à droite, Touchez pour détruire des blocs.\n\nRetenez votre doigt pendant une seconde et déplacez-le pour détruire les blocs dans la zone de sélection.
+hint.blockInfo = Pour afficher les informations relatives à un bloc, il suffit de le sélectionner dans le [accent]menu de construction[], puis de cliquer sur le bouton [accent][[?][] à droite.
+hint.derelict = [accent]Les structures abandonnées[] sont des vestiges brisés d'anciennes bases qui ne fonctionnent plus. Ces structures peuvent être [accent]déconstruites pour obtenir des ressources.
+hint.research = Utilisez le bouton \ue875 [accent]Recherche[] pour rechercher de nouvelles technologies.
+hint.research.mobile = Utilisez le bouton \ue875 [accent]Recherche[] dans le \ue88c [accent]Menu[] pour rechercher de nouvelles technologies.
+hint.unitControl = Retenez [accent][[Ctrl-gauche][] et [accent]cliquez[] pour contrôler une tourelle ou une unité alliée.
+hint.unitControl.mobile = [accent][[Tapez][] 2 fois une tourelle ou une unité alliée pour la contrôler.
+hint.unitSelectControl = Pour contrôler les unités, entrez en mode [accent]« Commande »[] en pressant [accent]Maj gauche[].\nEn mode « Commande », cliquez et faites glisser la souris pour sélectionner des unités. Faites un [accent]Clic droit[] à un emplacement ou une cible pour que les unités s'y déplacent.
+hint.unitSelectControl.mobile = Pour contrôler les unités, entrez en mode [accent]« Commande »[] en pressant le bouton de [accent]commande[] en bas à gauche de l'écran.\nEn mode « Commande », pressez longuement et faites glisser pour sélectionner des unités. Tapez un emplacement ou une cible pour que les unités s'y déplacent.
+hint.launch = Une fois que vous avez collecté assez de ressources, vous pouvez [accent]Lancer[] votre Noyau en sélectionnant un secteur depuis la \ue827 [accent]Carte[] en bas à droite.
+hint.launch.mobile = Une fois que vous avez collecté assez de ressources, vous pouvez [accent]Lancer[] votre Noyau en sélectionnant un secteur depuis la \ue827 [accent]Carte[] dans le \ue88c [accent]Menu[].
+hint.schematicSelect = Retenez [accent][[F][] pour sélectionner des blocs dans une zone afin de les copier et les coller.\n\n[accent][[Clic molette][] pour copier un seul type de bloc.
+hint.rebuildSelect = Retenez [accent][[B][] et faites glissez pour selectionner les plans des blocs détruits.\nCela va automatiquement les reconstruire.
+hint.rebuildSelect.mobile = Selectionnez le \ue874 bouton de copie, ensuite tapez le \ue80f bouton de reconstruction et faites glisser pour sélectionner les plans des blocs détruits.\nCela va les reconstruire automatiquement.
+hint.conveyorPathfind = Retenez [accent][[Ctrl-gauche][] pendant que vous placez des convoyeurs, afin de générer un chemin automatiquement.
+hint.conveyorPathfind.mobile = Activez le mode \ue844 [accent]Diagonale[] et déplacez des convoyeurs, afin de générer un chemin automatiquement.
+hint.boost = Retenez [accent][[Maj-gauche][] pour voler au-dessus des obstacles avec votre unité actuelle.\n\nSeules quelques unités terrestres peuvent voler.
+hint.payloadPickup = Pressez [accent][[[] pour transporter des blocs ou des unités.
+hint.payloadPickup.mobile = [accent]Tapez et retenez[] votre doigt pour transporter des blocs ou des unités.
+hint.payloadDrop = Pressez [accent]][] pour larguer votre chargement.
+hint.payloadDrop.mobile = [accent]Tapez et retenez[] votre doigt pour larguer votre chargement.
+hint.waveFire = [accent]Les tourelles à liquides[], approvisionnées en eau en tant que munition, peuvent automatiquement éteindre les incendies proches.
+hint.generator = \uf879 Les [accent]Générateurs à combustion[] brûlent du Charbon et transmettent de l'énergie aux blocs adjacents.\n\nLa transmission d'énergie peut être étendue avec des \uf87f [accent]Transmetteurs Énergétiques[].
+hint.guardian = Les [accent]Gardiens[] sont protégés par un bouclier. Les munitions faibles telles que le [accent]Cuivre[] et le [accent]Plomb[] ne seront [scarlet]pas efficaces[].\n\nUtilisez des tourelles de plus haut niveau, ou de meilleures munitions comme le \uf835 [accent]Graphite[] avec un \uf861Duo/\uf859Salve pour pouvoir tuer le gardien.
+hint.coreUpgrade = Les Noyaux peuvent être améliorés [accent]en plaçant un Noyau de plus haut niveau sur eux[].\n\nPlacez un \uf868 Noyau [accent]Fondation[] sur le \uf869 Noyau [accent]Fragment[]. Soyez sûrs que rien n'obstrue la construction.
+hint.presetLaunch = Les [accent]secteurs[] gris, tels que [accent]Frozen Forest[], peuvent être lancés de n'importe où. Ils ne requièrent pas la capture d'un secteur adjacent.\n\n[accent]Il y a beaucoup de secteurs[] comme celui-ci, qui sont [accent]optionnels[].
+hint.presetDifficulty = Ce secteur a un niveau de menace ennemi [scarlet]élevé[].\nIl n'est [accent]pas recommandé[] de se lancer dans de tels secteurs sans la technologie et la préparation appropriées.
+hint.coreIncinerate = Lorsqu'un Noyau est rempli d'une ressource en particulier, le surplus qui y rentrera sera [accent]incinéré[].
+hint.factoryControl = Pour régler la [accent]destination[] d'une usine à unités, cliquez sur l'usine en mode « Commande », puis clic-droit sur la destination souhaitée.\nLes unités produites s'y déplaceront automatiquement.
+hint.factoryControl.mobile = Pour régler la [accent]destination[] d'une usine à unités, tapez sur l'usine en mode « Commande », puis tapez sur la destination souhaitée.\nLes unités produites s'y déplaceront automatiquement.
 
-item.copper.description = Le matériau structurel de base. Utilisation très répandue dans tous les types de blocs.
+gz.mine = Déplacez-vous près du \uf8c4 [accent]minerai de cuivre[] sur le sol et cliquez pour commencer à miner.
+gz.mine.mobile = Déplacez-vous près du \uf8c4 [accent]minerai de cuivre[] sur le sol et Tapez dessus pour commencer à miner.
+gz.research = Ouvrez \ue875 l'Arbre technologique.\nRecherchez la \uf870 [accent]Foreuse méchanique[], ensuite sélectionnez-la dans le menu en bas à droite.\nCliquez sur le filon de cuivre pour la placer.
+gz.research.mobile = Ouvrez \ue875 l'Arbre technologique.\nRecherchez la \uf870 [accent]Foreuse méchanique[], ensuite sélectionnez-la dans le menu en bas à droite.\nTapez sur le filon de cuivre pour la placer.\n\nPressez la \ue800 [accent]coche[] en bas à droite pour confirmer.
+gz.conveyors = Recherchez et placez des \uf896 [accent]convoyeurs[] pour déplacer les resources minées par vos\nforeuses vers le noyau.\n\nCliquez et retenez pour placer plusieurs convoyeurs.\n[accent]Scrollez[] pour les faire pivoter.
+gz.conveyors.mobile = Recherchez et placez des \uf896 [accent]convoyeurs[] pour déplacer les resources minées par vos\nforeuses vers le noyau.\n\nRetenez pendant une seconde et faites glisser pour placer plusieurs convoyeurs.
+gz.drills = Étendez vos exploitations minières.\nPlacez plus de Foreuses méchaniques.\nMinez 100 minerais de cuivre.
+gz.lead = \uf837 Le [accent]Plomb[] est un autre minerai assez utilisé en tant que ressource.\nConstruisez des foreuses pour miner du plomb.
+gz.moveup = \ue804 Déplacez-vous vers le haut pour la suite des objectifs.
+gz.turrets = Recherchez et placez 2 \uf861 [accent]Duos[] pour défendre votre noyau.\nLes Duos requierent du \uf838 cuivre en tant que [accent]munitions[] depuis des convoyeurs.
+gz.duoammo = Rechargez vos Duos avec du [accent]cuivre[], en utilisant les convoyeurs.
+gz.walls = Les [accent]Murs[] peuvent empêcher les attaques ennemies d'atteindre vos constructions.\nPlacez des \uf8ae [accent]murs de cuivre[] autour de vos tourelles.
+gz.defend = Ennemis en approche, préparez-vous à défendre.
+gz.aa = Les unités aériennes ne peuvent pas être facilement repoussées avec des tourelles standard.\n\uf860 Les [accent]Disperseurs[] sont d'excellentes tourelles anti-aériennes, mais requièrent du \uf837 [accent]plomb[] en tant que munition.
+gz.scatterammo = Approvisionnez le Disperseur avec du [accent]plomb[] en utilisant des convoyeurs.
+gz.supplyturret = [accent]Approvisionnez la tourelle
+gz.zone1 = Ceci est la zone d'apparition ennemie.
+gz.zone2 = Tout ce qui est construit dans le rayon est détruit lors du commencement de la vague.
+gz.zone3 = Une vague va commencer maintenant.\nPréparez-vous.
+gz.finish = Construisez plus de tourelles, minez plus de resources,\net défendez-vous contre toutes les vagues ennemies afin de [accent]capturer ce secteur[].
+
+onset.mine = Cliquez pour miner le \uf748 [accent]béryllium[] contenu dans les murs.\n\nUtilisez [accent][[ZQSD] pour bouger.
+onset.mine.mobile = Tapez pour miner le \uf748 [accent]béryllium[] contenu dans les murs.
+onset.research = Ouvrez \ue875 l'arbre technologique.\nRecherchez et placez un \uf73e [accent]condenseur à turbine[] sur l'évent.\nCela va générer de [accent]l'énergie[].
+onset.bore = Recherchez et placez une \uf741 [accent]foreuse à plasma[].\nElle va automatiquement miner les ressources contenues dans les murs.
+onset.power = Pour [accent]alimenter[] la foreuse à plasma, recherchez et placez un \uf73d [accent]transmetteur à rayons[].\nConnectez le condenseur à la foreuse.
+onset.ducts = Recherchez et placez des \uf799 [accent]conduits[] pour déplacer les ressources minées depuis la foreuse vers le noyau.\nCliquez et faites glisser pour placer plusieurs conduits.\n[accent]Scrollez[] pour les faire pivoter.
+onset.ducts.mobile = Recherchez et placez des \uf799 [accent]conduits[] pour déplacer les ressources minées depuis la foreuse vers le noyau.\n\nRetenez votre doigt pendant une seconde et déplacez-le pour placer plusieurs conduits.
+onset.moremine = Étendez vos exploitations minières.\nPlacez plus de foreuses à plasma et utilisez des transmetteurs à rayons pour les relier.\nMinez 200 minerais de béryllium.
+onset.graphite = Les blocs plus complexes requièrent du \uf835 [accent]graphite[].\nPlacez quelques foreuses à plasma pour miner du graphite.
+onset.research2 = Commencez à rechercher des [accent]usines[].\nRecherchez le \uf74d [accent]broyeur de parois[] et le \uf779 [accent]four de silicium[].
+onset.arcfurnace = Le four de silicium a besoin de \uf834 [accent]sable[] et de \uf835 [accent]graphite[] pour créer du \uf82f [accent]silicium[].\nDe [accent]l'énergie[] est aussi requise.
+onset.crusher = Utilisez des \uf74d [accent]broyeurs de parois[] pour miner du sable.
+onset.fabricator = Utilisez des [accent]Unités[] pour explorer la carte, défendre vos constructions et attaquer l'ennemi. Recherchez et placez un \uf6a2 [accent]Fabricateur de Tanks[].
+onset.makeunit = Produisez une unité.\nUtilisez le bouton "?" pour voir les ressources requises par le fabricateur.
+onset.turrets = Les unités sont efficaces, mais les [accent]tourelles[] ont de meilleures capacités défensives si elles sont bien utilisées.\nPlacez une tourelle \uf6eb [accent]brèche[].\nLes tourelles requièrent des [accent]munitions[] \uf748.
+onset.turretammo = Approvisionnez les tourelles avec du [accent]béryllium[].
+onset.walls = Les [accent]murs[] peuvent encaisser les dégâts des attaques ennemies avant qu'elles atteignent vos constructions.\nPlacez quelques \uf6ee [accent]murs de béryllium[] autour de la tourelle.
+onset.enemies = Ennemis en approche, préparez-vous à défendre.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = L'ennemi est vulnérable. Contre-attaquez !
+onset.cores = Les noyaux peuvent être placés sur des [accent]tuiles de noyau[].\nCes nouveaux noyaux servent à faire avancer votre base et partager vos ressources avec d'autres noyaux.\nPlacez un noyau \uf725.
+onset.detect = L'ennemi sera capable de vous détecter dans 2 minutes.\nAméliorez vos défenses, vos exploitations minières ainsi que votre production.
+onset.commandmode = Retenez [accent]Maj-gauche[] pour entrer en [accent]Mode « Commande »[].\n[accent]Clic-gauche tout en bougeant la souris[] pour sélectionner des unités.\n[accent]Clic-droit[] pour ordonner aux unités sélectionnées de bouger ou attaquer.
+onset.commandmode.mobile = Pressez le [accent]bouton de commande[] pour entrer en [accent]Mode « Commande »[].\nRetenez votre doigt, et [accent]bougez-le[] pour sélectionner des unités.\n[accent]Tapez[] pour ordonner aux unités sélectionnées de bouger ou attaquer.
+aegis.tungsten = Le tungstène peut être miné en utilisant une [accent]foreuse à impact[].\nCette structure requiert de [accent]l'eau[] et de [accent]l'énergie[].
+
+split.pickup = Certains blocs peuvent être transportés par des unités du noyau.\nTransportez ce [accent]conteneur[] et placez-le sur le [accent]chargeur de charges utiles[].\n(Les touches par défaut sont [[ pour ramasser et ] pour déposer)
+split.pickup.mobile = Certains blocs peuvent être transportés par des unités du noyau.\nTransportez ce [accent]conteneur[] et placez-le sur le [accent]chargeur de charges utiles[].\n(Pour ramasser ou déposer quelque chose, Pressez longuement dessus.)
+split.acquire = Vous devez acquérir du tungstène pour construire des unités.
+split.build = Ces unités doivent être transportées vers l'autre côté du mur.\nPlacez 2 [accent]transporteurs de charges utiles[], 1 de chaque côté du mur.\nEnsuite reliez-les en pressant sur l'un et ensuite en sélectionnant l'autre.
+split.container = Similaires aux conteneurs, les unités peuvent aussi être transportées en utilisant un [accent]transporteur de charges utiles[].\nPlacez un fabricateur d'unités adjacent à un transporteur, ensuite chargez-les et finalement, envoyez-les au-delà du mur pour attaquer la base ennemie.
+
+item.copper.description = Le matériau structurel de base. Utilisation très répandue dans tous les types de blocs et en tant que munition.
+item.copper.details = Le cuivre est un matériau anormalement abondant sur Serpulo. Il est structurellement faible à moins d'être renforcé.
 item.lead.description = Un matériau de départ. Utilisation très répandue en électronique et dans les blocs de transport de liquides.
+item.lead.details = Dense et inerte, il est beaucoup utilisé dans les batteries.\nNote: Probablement toxique pour les formes de vie biologiques. Mais ce n'est pas comme s’il en restait beaucoup ici.
 item.metaglass.description = Un composé de verre super-résistant. Utilisation très répandue pour le transport et le stockage de liquides.
-item.graphite.description = Du carbone minéralisé utilisé pour les munitions et l’isolation électrique.
-item.sand.description = Un matériau commun largement utilisé dans la fonte, à la fois dans l'alliage et comme un flux.
-item.coal.description = De la matière végétale fossilisée, formée bien avant l’ensemencement de ce monde. Utilisation très répandue pour la production de carburant et de ressources.
-item.titanium.description = Un métal rare et super-léger largement utilisé dans le transport de liquides, dans les foreuses de hauts niveaux et dans l'aviation.
-item.thorium.description = Un métal dense et radioactif utilisé comme support structurel et comme carburant nucléaire.
-item.scrap.description = Un mix de métaux provenant des restes de vieilles structures et d'unités. Contient des traces de nombreux métaux différents.
+item.graphite.description = Du carbone minéralisé utilisé pour les munitions et dans les composants électriques.
+item.sand.description = Un matériau commun, largement utilisé pour la fabrication de matériaux raffinés.
+item.coal.description = Un carburant commun et facile à obtenir.
+item.coal.details = De la matière végétale fossilisée, formée bien avant l’ensemencement de ce monde. Utilisation très répandue pour la production de carburant et de ressources.
+item.titanium.description = Un métal rare et super-léger, largement utilisé dans le transport de liquides, dans les foreuses de haut niveau et dans les usines.
+item.thorium.description = Un métal dense et radioactif, utilisé comme support structurel et comme carburant nucléaire.
+item.scrap.description = Il est utilisé dans les fours à fusion et les pulvériseurs, pour être raffiné en d'autres matériaux.
+item.scrap.details = Un mix de métaux provenant des restes de vieilles structures et d'unités. Il contient des traces de nombreux métaux différents.
 item.silicon.description = Un matériau semi-conducteur extrêmement pratique utilisé dans les panneaux solaires, dans les munitions autoguidées et dans beaucoup d'autres composants électroniques complexes.
-item.plastanium.description = Un matériau léger et ductile utilisé dans l'aviation avancée et dans les munitions à fragmentation.
-item.phase-fabric.description = Une substance au poids quasiment inexistant utilisée pour l'électronique avancée et la technologie auto-réparatrice.
-item.surge-alloy.description = Un alliage avancé avec des propriétés électriques uniques.
-item.spore-pod.description = Une glande de spores synthétisées à partir de concentrations atmosphériques à des fins industrielles et utilisé pour la conversion en pétrole, en explosifs et en carburant.
-item.blast-compound.description = Un composé instable synthétisé à partir de glandes de spores ou bien d'autres composés volatils et utilisé dans les bombes ainsi que dans les autres explosifs. Bien qu'il puisse être utilisé comme carburant, ce n'est pas conseillé.
-item.pyratite.description = Une substance extrêmement inflammable utilisée dans les armes incendiaires.
+item.plastanium.description = Un matériau léger et ductile, utilisé dans l'isolation, la fabrication d'unités avancées et dans les munitions à fragmentation.
+item.phase-fabric.description = Une substance au poids quasiment inexistant, utilisée pour l'électronique avancée et la technologie auto-réparatrice.
+item.surge-alloy.description = Un alliage avancé aux propriétés électriques uniques, utilisé dans l'armement avancé.
+item.spore-pod.description = Les bulbes sporifères sont utilisés pour l'obtention d'huile, d'explosifs et de carburants.
+item.spore-pod.details = Les spores sont des formes de vies synthétiques, émettant des gaz qui sont toxiques pour les autres formes de vie biologiques. Elles sont extrêmement invasives et très inflammables dans certaines conditions.
+item.blast-compound.description = Un matériau utilisé dans les bombes et les munitions explosives.
+item.pyratite.description = Une substance extrêmement inflammable utilisée dans les armes incendiaires et comme combustible pour les générateurs.
+
+#Erekir
+item.beryllium.description = Un matériau utilisé dans de nombreux types de constructions et de munition sur Erekir.
+item.tungsten.description = Un métal utilisé dans les foreuses, armures et munitions. Requis pour la construction de structures avancées.
+item.oxide.description = Un matériau utilisé comme conducteur de chaleur et isolant pour l'énergie.
+item.carbide.description = Un matériau utilisé dans les structures avancées, les unités lourdes et les munitions.
+
 liquid.water.description = Le liquide le plus utile. Couramment utilisé pour le refroidissement et le traitement des déchets.
 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.
 
-block.message.description = Enregistre un message. Utilisé pour la communication entre alliés.
-block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite pur.
-block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
-block.silicon-smelter.description = Réduit le sable avec du charbon pur. Produit du silicium.
-block.kiln.description = Fait fondre le sable et le plomb en verre trempé. Nécessite une petite quantité d'énergie.
+#Erekir
+liquid.arkycite.description = Un liquide utilisé dans les réactions chimiques pour la production d’énergie et la synthèse de matériaux.
+liquid.ozone.description = Un gaz utilisé comme agent oxydant dans la production de matériaux et comme combustible. Relativement explosif.
+liquid.hydrogen.description = Un gaz inflammable utilisé dans l’extraction des ressources, la production d'unités et la réparation de structures.
+liquid.cyanogen.description = Un gaz hautement inflammable utilisé pour les munitions, la construction d’unités avancées, et diverses réactions dans certains blocs avancés.
+liquid.nitrogen.description = Un gaz inerte utilisé dans l’extraction des ressources, la création de gaz et la production d'unités.
+liquid.neoplasm.description = Un sous-produit biologique dangereux issu du réacteur à Néoplasme. Se propage rapidement dans tous les blocs adjacents contenant de l’eau, les endommageant dans le processus. Très visqueux.
+liquid.neoplasm.details = Néoplasme, une masse incontrôlable de cellules synthétiques à division rapide, ayant une consistance semblable à la boue. Résistant à la chaleur. Extrêmement dangereux pour toute structure comportant de l’eau.\n\nTrop complexe et instable pour des analyses standard. Applications potentielles inconnues. Il est recommandé de l’incinérer dans des bassins de scories.
+
+block.derelict = \ue815 [lightgray]Vestiges
+block.armored-conveyor.description = Déplace les objets à la même vitesse que les convoyeurs en titane, mais est plus résistant. Seulement d'autres convoyeurs peuvent faire entrer des ressources par ses côtés.
+block.illuminator.description = Une petite source lumineuse compacte et configurable. Nécessite de l'énergie pour fonctionner.
+block.message.description = Enregistre un message. Utilisé pour la communication entre alliés. Le message contenu peut être modifié par un processeur logique.
+block.reinforced-message.description = Enregistre un message. Utilisé pour la communication entre alliés.
+block.world-message.description = Un bloc de message spécial utilisé pour la création de cartes. Ne peut pas être détruit.
+block.graphite-press.description = Compresse le charbon en graphite.
+block.multi-press.description = Une version améliorée de la presse à graphite, utilisant de l'eau et de l'électricité pour traiter le charbon plus rapidement et plus efficacement.
+block.silicon-smelter.description = Raffine du silicium avec du sable et du charbon.
+block.kiln.description = Fait fondre le sable et le plomb en verre trempé.
 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.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 ».
+block.phase-weaver.description = Synthétise du tissu phasé à partir de thorium et de grandes quantités de sable. Nécessite une quantité massive d'énergie pour fonctionner.
+block.surge-smelter.description = Produit un alliage superchargé à l'aide de titane, de plomb, de silicium et de cuivre.
+block.cryofluid-mixer.description = Mélange de l’eau et de la poudre fine de titane pour former du liquide cryogénique. Indispensable lors de l'utilisation de réacteurs à thorium.
+block.blast-mixer.description = Écrase et mélange des amas de spores avec de la pyratite pour produire un mélange explosif.
+block.pyratite-mixer.description = Mélange du charbon, du plomb et du sable en pyratite hautement inflammable.
+block.melter.description = Fait fondre la ferraille en scories.
 block.separator.description = Expose la scorie à de l'eau sous pression afin d'obtenir les différents minéraux qu'elle contient.
-block.spore-press.description = Compresse les glandes de spore sous une pression extrême pour synthétiser du pétrole.
+block.spore-press.description = Compresse des spores pour synthétiser du pétrole.
 block.pulverizer.description = Écrase la ferraille pour en faire du sable. Utile quand il y a un manque de sable naturel.
 block.coal-centrifuge.description = Solidifie le pétrole en blocs de charbon.
-block.incinerator.description = Permet de se débarrasser de n'importe quel objet ou liquide en excès.
+block.incinerator.description = Incinère ou vaporise n'importe quel objet ou liquide qu'il reçoit.
 block.power-void.description = Absorbe toute l'énergie qui va à l'intérieur. Bac à sable uniquement.
 block.power-source.description = Produit de l'énergie à l'infini. Bac à sable uniquement.
-block.item-source.description = Produit des objets à l'infini. Bac à sable uniquement .
-block.item-void.description = Désintègre n'importe quel objet qui va à l'intérieur. Bac à sable uniquement.
+block.item-source.description = Produit des objets à l'infini. Bac à sable uniquement.
+block.item-void.description = Détruit les objets introduits. Bac à sable uniquement.
 block.liquid-source.description = Source de liquide infinie. Bac à sable uniquement.
-block.liquid-void.description = Détruit n'importe quel liquide. Bac à sable uniquement.
+block.liquid-void.description = Détruit les liquides introduits. Bac à sable uniquement.
+block.payload-source.description = Produit des charges utiles à l'infini. Bac à sable uniquement.
+block.payload-void.description = Détruit toutes les charges utiles. Bac à sable uniquement.
 block.copper-wall.description = Un bloc défensif à faible coût.\nUtile pour protéger la base et les tourelles lors des premières vagues.
-block.copper-wall-large.description = Un bloc défensif à faible coût.\nUtile pour protéger la base et les tourelles lors des premières vagues.\n2 x 2.
-block.titanium-wall.description = Un bloc défensif standard.\nProcure une protection modérée contre les ennemis.
-block.titanium-wall-large.description = Un bloc défensif standard.\nProcure une protection modérée contre les ennemis.\n2 x 2.
-block.plastanium-wall.description = Un mur spécial qui absorbe les arcs électriques et bloque les connections automatiques des transmetteurs énergétiques.
-block.plastanium-wall-large.description = Un mur spécial qui absorbe les arcs électriques et bloque les connections automatiques des transmetteurs énergétiques.\n2 x 2.
-block.thorium-wall.description = Un bloc défensif puissant.\nProcure une très bonne protection contre les ennemis.
-block.thorium-wall-large.description = Un bloc défensif puissant.\nProcure une très bonne protection contre les ennemis.\n2 x 2.
-block.phase-wall.description = Moins puissant qu'un mur en Thorium mais dévie les balles, sauf si elles sont trop puissantes.
-block.phase-wall-large.description = Moins puissant qu'un mur en Thorium mais dévie les balles, sauf si elles sont trop puissantes.\n2 x 2.
-block.surge-wall.description = Le plus puissant bloc défensif .\nA une faible chance de créer des éclairs vers les ennemis .
-block.surge-wall-large.description = Le plus puissant bloc défensif .\nA une faible chance de créer des éclairs vers les ennemis .\n2 x 2.
-block.door.description = Une petite porte pouvant être ouverte et fermée en appuyant dessus.\nSi elle est ouverte les ennemis peuvent tirer et passer à travers.
-block.door-large.description = Une large porte pouvant être ouverte et fermée en appuyant dessus.\nSi elle est ouverte les ennemis peuvent tirer et passer à travers.\n2 x 2.
-block.mender.description = Soigne périodiquement les bâtiments autour de lui. Permet de garder les défenses en bon état entre les vagues ennemies.\nPeut utiliser du Silicium pour booster la portée et l'efficacié.
-block.mend-projector.description = Une version améliorée du Réparateur. Soigne périodiquement les bâtiments autour de lui.\nPeut utiliser du tissu phasé pour booster la portée et l'efficacié.
-block.overdrive-projector.description = Accélère le fonctionnement des bâtiments autour de lui, notamment les foreuses et les convoyeurs.\nPeut utiliser du tissu phasé pour booster la portée et l'efficacié.
-block.force-projector.description = Crée un champ de force hexagonal autour de lui qui protège des dégâts les bâtiments et les unités à l'intérieur.\nSurchauffe si trop de dégâts sont reçus. Peut utiliser du liquide cryogénique pour éviter la surchauffe. Peut utiliser du tissu phasé pour booster la taille du bouclier.
-block.shock-mine.description = Blesse les ennemis qui marchent dessus. Quasiment invisible pour l'ennemi.
+block.copper-wall-large.description = Un bloc défensif à faible coût.\nUtile pour protéger la base et les tourelles lors des premières vagues.
+block.titanium-wall.description = Un bloc défensif standard.\nProcure une protection modérée contre les attaques ennemies.
+block.titanium-wall-large.description = Un bloc défensif standard.\nProcure une protection modérée contre les attaques ennemies.
+block.plastanium-wall.description = Un mur spécial qui peut absorber les arcs électriques et bloquer les connexions automatiques des transmetteurs énergétiques.
+block.plastanium-wall-large.description = Un mur spécial qui peut absorber les arcs électriques et bloquer les connexions automatiques des transmetteurs énergétiques.
+block.thorium-wall.description = Un bloc défensif puissant.\nProcure une très bonne protection contre les attaques ennemies.
+block.thorium-wall-large.description = Un bloc défensif puissant.\nProcure une très bonne protection contre les attaques ennemies.
+block.phase-wall.description = Ce mur est moins puissant qu'un mur en thorium, mais il peut dévier les balles, sauf si elles sont trop puissantes.
+block.phase-wall-large.description = Ce mur est moins puissant qu'un mur en thorium, mais il peut dévier les balles, sauf si elles sont trop puissantes.
+block.surge-wall.description = Le plus puissant bloc défensif.\nA une faible chance d'envoyer des éclairs vers les ennemis.
+block.surge-wall-large.description = Le plus puissant bloc défensif.\nA une faible chance d'envoyer des éclairs vers les ennemis.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Une petite porte pouvant être ouverte et fermée en appuyant dessus.\nSi elle est ouverte, les ennemis peuvent passer à travers.
+block.door-large.description = Une grande porte pouvant être ouverte et fermée en appuyant dessus.\nSi elle est ouverte, les ennemis peuvent passer à travers.
+block.mender.description = Soigne périodiquement les bâtiments autour de lui, ce qui permet de remettre les défenses en bon état entre les vagues ennemies.\nPeut utiliser du silicium pour booster la portée et l'efficacité.
+block.mend-projector.description = Une version améliorée du Gardien. Soigne périodiquement les bâtiments autour de lui.\nPeut utiliser du tissu phasé pour booster la portée et l'efficacité.
+block.overdrive-projector.description = Accélère le fonctionnement des bâtiments autour de lui, notamment les foreuses et les convoyeurs.\nPeut utiliser du tissu phasé pour booster la portée et l'efficacité.
+block.force-projector.description = Crée un champ de force hexagonal autour de lui, qui protège des dégâts les bâtiments et les unités à l'intérieur.\nSurchauffe si trop de dégâts sont reçus. De l'eau ou du liquide cryogénique peuvent être utilisés pour ralentir la surchauffe et/ou accélérer le refroidissement. Peut utiliser du tissu phasé pour booster la taille du bouclier.
+block.shock-mine.description = Blesse les ennemis qui marchent dessus.
 block.conveyor.description = Convoyeur basique servant à transporter des objets. Les objets déplacés en avant sont automatiquement déposés dans les tourelles ou les bâtiments. Peut être tourné.
-block.titanium-conveyor.description = Convoyeur avancé. Déplace les objets plus rapidement que les convoyeurs standard.
-block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.
+block.titanium-conveyor.description = Convoyeur avancé. Déplace les objets plus rapidement que les convoyeurs standards.
+block.plastanium-conveyor.description = Convoyeur transportant les ressources par paquets. Accepte les ressources par derrière et les décharge par 3 directions à l'avant. Pour une efficacité maximale, utilisez plusieurs points de chargement et de déchargement pour une même ligne.
 block.junction.description = Agit comme un pont pour deux lignes de convoyeurs se croisant. Utile lorsque deux lignes de convoyeurs différentes déplacent différents matériaux à différents endroits.
-block.bridge-conveyor.description = Bloc de transport avancé permettant de traverser jusqu'à 3 blocs de n'importe quel terrain ou bâtiment.
-block.phase-conveyor.description = Convoyeur très avancé. Utilise de l'énergie pour téléporter des objets à un convoyeur phasé connecté jusqu'à une longue distance.
+block.bridge-conveyor.description = Bloc de transport avancé permettant de traverser jusqu'à 3 blocs, au-dessus de n'importe quel terrain ou bâtiment.
+block.phase-conveyor.description = Convoyeur très avancé. Utilise de l'énergie pour téléporter des objets à un autre convoyeur phasé. Possède une longue portée.
 block.sorter.description = Trie les ressources. Si une ressource correspond à la sélection, elle peut passer tout droit. Autrement, elle est distribuée vers la gauche ou la droite.
-block.inverted-sorter.description = Trie les ressources comme un trieur standard, mais ceux correspondant à la sélection sont envoyés sur les côtés. Le reste est envoyé tout droit.
-block.router.description = Accepte les objets depuis une ou plusieurs directions et les renvoie dans n'importe quelle direction. Utile pour séparer une chaîne de convoyeurs en plusieurs.
-block.distributor.description = Un routeur avancé qui répartit équitablement les objets entre au plus 7 directions différentes.\n2x2
+block.inverted-sorter.description = Trie les ressources comme un trieur standard, mais celles qui correspondent à la sélection sont envoyées sur les côtés. Le reste est envoyé tout droit.
+block.router.description = Accepte les objets depuis une ou plusieurs directions et les renvoie équitablement dans n'importe quelle direction. Utile pour séparer une chaîne de convoyeurs en plusieurs.
+block.router.details = Un mal nécessaire... Utiliser un routeur à côté d'une usine est très déconseillé, car ceux-ci peuvent être bloqués par les matériaux produits par celle-ci.
+block.distributor.description = Un routeur avancé qui répartit équitablement les objets jusqu'à 7 directions différentes.
 block.overflow-gate.description = Bloc envoyant les ressources à gauche et à droite si le chemin de devant est bloqué.
-block.underflow-gate.description = Le contraire d'une barrière de débordement.\nEnvoie les ressources vers l'avant si les chemins de gauche et de droite sont bloqués.
-block.mass-driver.description = Le moyen de transport de resources ultime. Collecte plusieurs ressources puis les envoie à une autre catapulte sur une longue distance. Nécessite de l'énergie pour fonctionner.
-block.mechanical-pump.description = Une pompe de faible prix pompant lentement, mais ne consommant pas d'énergie.
-block.rotary-pump.description = Une pompe avancée plus rapide mais utilisant de l'énergie.\n2x2
-block.thermal-pump.description = La pompe ultime.\n3x3
-block.conduit.description = Bloc de transport de liquide de base. Fait avancer les liquides. Utilisé avec des pompes et autres conduits.
+block.underflow-gate.description = Le contraire d'une barrière de débordement. Envoie les ressources vers l'avant si les chemins de gauche et de droite sont bloqués.
+block.mass-driver.description = Le moyen de transport de ressources ultime! Cette structure collecte des lots de ressources et les envoie à un autre transporteur de masse, sur une longue distance. Nécessite de l'énergie pour fonctionner.
+block.mechanical-pump.description = Une pompe basique et bon marché qui pompe lentement des liquides. Elle ne consomme pas d'énergie.
+block.rotary-pump.description = Une pompe avancée, plus rapide, mais utilisant de l'énergie.
+block.impulse-pump.description = La pompe ultime.
+block.conduit.description = Bloc de transport de liquide de base, faisant avancer les liquides. Utilisé avec des pompes et autres conduits.
 block.pulse-conduit.description = Conduit avancé permettant le transport de liquide. Transporte les liquides plus rapidement et en stocke plus que les conduits standards.
-block.plated-conduit.description = Déplace les liquides au même rythme que les conduits à impulsion, mais est renforcé. N'accepte pas de liquides provenant des côtés par autre chose que des conduits.\nFuit moins.
-block.liquid-router.description = Accepte les liquides depuis une direction et les rejette de tous les côtés équitablement. Peut aussi stocker une certaine quantité de liquide. Utile pour envoyer un liquide à plusieurs endroits.
-block.liquid-tank.description = Stocke une grande quantité de liquide. Utile pour réguler la sortie quand la demande est inconstante ou comme sécurité pour refroidir des bâtiments importants.
-block.liquid-junction.description = Agit comme une jonction pour deux conduits se croisant. Utile si deux conduits amènent différents liquides à différents endroits.
-block.bridge-conduit.description = Bloc de transport de liquide avancé. Permet le transport de liquides à travers 3 blocs de n'importe quel terrain ou bâtiment au plus.
+block.plated-conduit.description = Déplace les liquides au même rythme que les conduits à impulsion, mais est renforcé et empêche les fuites en cas de rupture. N'accepte pas les liquides provenant des côtés, seuls les autres conduits peuvent le faire.
+block.liquid-router.description = Accepte les liquides depuis une direction et les distribue jusqu'à 3 directions équitablement. Utile pour envoyer un liquide à plusieurs endroits. Peut aussi stocker une certaine quantité de liquide.
+block.liquid-container.description = Stocke une quantité considérable de liquide. Sort de tous les côtés, de la même manière qu'un routeur de liquide.
+block.liquid-tank.description = Stocke une grande quantité de liquide et peut les distribuer dans tous les côtés, un peu comme un routeur liquide.\nUtile pour réguler la demande en liquide si elle est inconstante ou comme sécurité pour refroidir des bâtiments importants.
+block.liquid-junction.description = Agit comme un pont pour deux conduits se croisant. Utile si deux conduits amènent différents liquides à différents endroits.
+block.bridge-conduit.description = Bloc de transport de liquide avancé permettant de traverser jusqu'à 3 blocs, au-dessus de n'importe quel terrain ou bâtiment.
 block.phase-conduit.description = Conduit très avancé permettant le transport de liquide. Utilise de l'énergie pour téléporter les liquides à un autre conduit phasé sur une longue distance.
-block.power-node.description = Transmet l'énergie aux transmetteurs énergétiques connectés. Le transmetteur recevra de l'énergie ou la transmettra à n'importe quel bâtiment adjacent, mais la connexion peut être activé/désactivé manuellement
-block.power-node-large.description = Possède un rayon plus grand que le transmetteur énergétique standard, connectant d'autant plus de consommateurs ou transmetteurs d'énergie.
-block.surge-tower.description = Un transmetteur énergétique de très grande portée mais avec moins de connections disponibles.
-block.diode.description = L'énergie ne peut circuler à travers ce bloc que dans un sens, et uniquement si l’autre côté présente moins d’énergie en stock.
+block.power-node.description = Transmet de l'énergie aux autres transmetteurs énergétiques connectés. Le transmetteur recevra de l'énergie ou la transmettra à n'importe quel bâtiment adjacent. La connexion peut être activée/désactivée manuellement.
+block.power-node-large.description = Ce transmetteur possède un rayon plus grand que le transmetteur énergétique standard. Il peut aussi accepter plus de connexions.
+block.surge-tower.description = Un transmetteur énergétique à très longue portée, mais avec moins de connexions disponibles.
+block.diode.description = L'énergie ne circule que dans un sens à travers ce bloc, et uniquement si l’autre côté présente moins d’énergie en stock. Idéal pour protéger les lieux de production d'énergie.
 block.battery.description = Stocke le surplus d'énergie et le redistribue en cas de besoin.
 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.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.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.
 block.solar-panel-large.description = Génère bien plus d'énergie qu'un panneau solaire standard, mais est aussi bien plus cher à construire.
 block.thorium-reactor.description = Génère énormément d'énergie à l'aide de la radioactivité du thorium. Requiert néanmoins un refroidissement constant. Explosera violemment en cas de surchauffe.
-block.impact-reactor.description = Un générateur avancé, capable de produire une quantité d'énergie gigantesque lorsqu'il atteint son efficacité maximale. Nécessite une quantité significative d'énergie pour lancer le générateur.
-block.mechanical-drill.description = Une foreuse de faible coût. Si elle est placée sur un endroit approprié, produit des matériaux lentement à l'infini.
-block.pneumatic-drill.description = Une foreuse améliorée plus rapide et capable de forer des matériaux plus durs comme le titane grâce à l'usage de vérins à air comprimé.
-block.laser-drill.description = Permet de forer bien plus vite grâce à la technologie laser, mais requiert de l'énergie . Permet de miner le Thorium, un matériau radioactif.
-block.blast-drill.description = La Foreuse ultime . Demande une grande quantité d'énergie.
-block.water-extractor.description = Extrait l'eau des nappes phréatiques. Utile quand il n'y a pas d'eau à proximité.
-block.cultivator.description = Cultive le sol avec de l'eau afin d'obtenir de la biomasse.
-block.oil-extractor.description = Utilise une grande quantité d'énergie afin d'extraire du pétrole à partir de sable. Utile quand il n'y a pas de lacs de pétrole à proximité.
-block.core-shard.description = La première version du noyau. Une fois détruite tout contact avec la région est perdu. Ne laissez pas cela se produire.
-block.core-foundation.description = La deuxième version du noyau. Meilleur blindage. Stocke plus de ressources.
-block.core-nucleus.description = La troisième et dernière version du noyau. Extrêmement bien blindée. Stocke des quantités importantes de ressources.
-block.vault.description = Stocke un grand nombre d'objets. Utile pour réguler le flux d'objets quand la demande de matériaux est inconstante. Un [lightgray] déchargeur[] peut être utilisé pour récupérer des objets depuis le coffre-fort.
-block.container.description = Stocke un petit nombre d'objets. Utile pour réguler le flux d'objets quand la demande de matériaux est inconstante. Un [lightgray] déchargeur[] peut être utilisé pour récupérer des objets depuis le conteneur.
-block.unloader.description = Décharge des objets depuis des conteneurs, coffres-forts ou d'un noyau sur un convoyeur ou directement dans un bloc adjacent. Le type d'objet peut être changé en appuyant sur le déchargeur.
-block.launch-pad.description = Permet de transférer des ressources sans attendre le lancement du noyau.
-block.launch-pad-large.description = Une version améliorée de la plateforme de lancement. Stocke plus de ressources et les envoie plus fréquemment.
+block.impact-reactor.description = Ce réacteur est capable de produire de gigantesques quantités d'énergie lorsqu'il atteint son efficacité maximale. Nécessite une quantité significative d'énergie pour pouvoir le démarrer.
+block.mechanical-drill.description = Une foreuse basique. Si elle est placée sur un endroit approprié, elle produira des matériaux lentement et indéfiniment.
+block.pneumatic-drill.description = Une foreuse améliorée, plus rapide et capable de forer des minerais plus durs comme le titane.
+block.laser-drill.description = Permet de forer bien plus vite grâce à la technologie laser, mais requiert de l'énergie pour fonctionner. Permet de miner du Thorium, un matériau radioactif.
+block.blast-drill.description = La Foreuse ultime. Demande une grande quantité d'énergie pour fonctionner.
+block.water-extractor.description = Extrait l'eau des nappes phréatiques. Utile quand il n'y a pas d'étendue d'eau à proximité.
+block.cultivator.description = Cultive une petite quantité de spores atmosphériques afin de former des bulbes sporifères.
+block.cultivator.details = Technologie de récupération. Utilisée pour produire des quantités massives de biomasse aussi efficacement que possible. Probablement l’incubateur initial des spores, qui couvrent maintenant Serpulo.
+block.oil-extractor.description = Utilise de grandes quantités d'énergie pour extraire le pétrole du sable. Utilisez-le lorsqu'il n'y a pas de source directe de pétrole à proximité.
+block.core-shard.description = Le cœur de votre base. Une fois détruit, le secteur est perdu. Ne laissez pas cela arriver.
+block.core-shard.details = La première version du Noyau. Il est compact, doté d'un module d'auto-réplication et est équipé de propulseurs de lancement à usage unique. Ceux-ci n'ont pas été conçus pour le voyage interplanétaire.
+block.core-foundation.description = Le cœur de votre base. Cette version améliorée possède un meilleur blindage et stocke plus de ressources qu'un Noyau fragment.
+block.core-foundation.details = La seconde version.
+block.core-nucleus.description = Le cœur de votre base. Ce Noyau est extrêmement bien blindé et stocke des quantités massives de ressources.
+block.core-nucleus.details = La version finale.
+block.vault.description = Stocke un grand nombre d'objets de chaque type. Utilisez un déchargeur pour les récupérer.\nUtile pour réguler le flux d'objets quand la demande de matériaux est inconstante.
+block.container.description = Stocke un petit nombre d'objets de chaque type. Utilisez un déchargeur pour les récupérer.\nUtile pour réguler le flux d'objets quand la demande de matériaux est inconstante.
+block.unloader.description = Permet de décharger l'objet choisi, depuis les blocs adjacents.
+block.launch-pad.description = Permet de transférer des ressources vers les secteurs sélectionnés.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Une petite tourelle à faible coût. Fonctionne bien contre les ennemis terrestres.
 block.scatter.description = Une tourelle anti-aérienne essentielle. Mitraille les ennemis de débris de plomb, de ferraille ou de verre trempé.
 block.scorch.description = Brûle les ennemis terrestres près de lui. Très efficace à courte portée.
-block.hail.description = Une petite tourelle d'artillerie. Efficace à longue portée.
-block.wave.description = Une tourelle de taille moyenne tirant rapidement des jets de liquide. Peut éteindre les incendies si elle est alimentée en eau.
-block.lancer.description = Une tourelle de taille moyenne chargeant et tirant de puissants lasers aux ennemis terrestres.
-block.arc.description = Une petite tourelle de petite portée tirant des arcs électriques sur les ennemis.
-block.swarmer.description = Une tourelle de taille moyenne attaquant les ennemis terrestres et aériens à l'aide de missiles autoguidés.
+block.hail.description = Une petite tourelle d'artillerie visant les ennemis terrestres. Efficace à longue portée.
+block.wave.description = Une tourelle de taille moyenne tirant un jet de liquide. Peut éteindre les incendies automatiquement si elle est alimentée en eau.
+block.lancer.description = Une tourelle de taille moyenne chargeant et tirant de puissants lasers sur les ennemis terrestres.
+block.arc.description = Une petite tourelle tirant des arcs électriques sur les ennemis.
+block.swarmer.description = Une tourelle de taille moyenne attaquant les ennemis terrestres et aériens à l'aide de missiles autoguidés. Consomme beaucoup de munitions.
 block.salvo.description = Une version plus grande et améliorée de la tourelle Duo. Tire par salves.
-block.fuse.description = Une tourelle de grande taille et de petite portée. Elle perce les lignées ennemis avec ses trois tirs de sharpnel.
-block.ripple.description = Une grande tourelle d'artillerie qui tire plusieurs salves simultanément sur de très longues distances.
-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.fuse.description = Une tourelle de grande taille à courte portée. Tire trois tirs perçants.
+block.ripple.description = Lance des amas d’obus sur les ennemis terrestres sur de très longues distances.
+block.cyclone.description = Une grande tourelle qui tire rapidement des balles explosives aux ennemis proches.
+block.spectre.description = Une tourelle massive à double canon qui tire de puissantes balles perçantes.
 block.meltdown.description = Une tourelle massive chargeant et tirant de puissants rayons lasers. Nécessite un liquide de refroidissement.
-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.
+block.foreshadow.description = Une tourelle massive tirant une puissante balle sur une cible, sur de très longues distances. Elle vise les unités ayant le plus de santé en priorité.
+block.repair-point.description = Soigne l'unité endommagée la plus proche.
+block.segment.description = Endommage et détruit les tirs ennemis. Les lasers ne peuvent pas être ciblés.
+block.parallax.description = Tire un rayon tracteur qui attire les ennemis volants, infligeant aussi des dégâts.
+block.tsunami.description = Tire un puissant jet de liquide sur les ennemis. Peut éteindre les incendies automatiquement si elle est alimentée en eau.
+block.silicon-crucible.description = Raffine du silicium avec du sable et du charbon en utilisant de la pyratite comme source de chaleur additionnelle. Cette usine est plus efficace dans les endroits chauds.
+block.disassembler.description = Cette version avancée du séparateur peut produire du thorium.
+block.overdrive-dome.description = Accélère le fonctionnement des bâtiments autour de lui. Requiert du silicium et du tissu phasé pour fonctionner.
+block.payload-conveyor.description = Ce grand convoyeur peut déplacer de gros chargements, comme des unités depuis leurs usines ou bien des conteneurs.
+block.payload-router.description = Distribue les chargements qui entrent jusqu'à 3 directions différentes.
+block.ground-factory.description = Produit des unités terrestres. Elles peuvent être soit utilisées directement, soit envoyées vers des reconstructeurs pour être améliorées.
+block.air-factory.description = Produit des unités aériennes. Elles peuvent être soit utilisées directement, soit envoyées vers des reconstructeurs pour être améliorées.
+block.naval-factory.description = Produit des unités navales. Elles peuvent être soit utilisées directement, soit envoyées vers des reconstructeurs pour être améliorées.
+block.additive-reconstructor.description = Améliore les unités entrantes au second niveau.
+block.multiplicative-reconstructor.description = Améliore les unités entrantes au troisième niveau.
+block.exponential-reconstructor.description = Améliore les unités entrantes au quatrième niveau.
+block.tetrative-reconstructor.description = Améliore les unités entrantes au cinquième niveau.
+block.switch.description = Un interrupteur pouvant être activé/désactivé. Le statut peut être lu et contrôlé avec des processeurs logiques.
+block.micro-processor.description = Exécute une séquence d'instructions en boucle. Peut être utilisé pour contrôler des unités ou des bâtiments.
+block.logic-processor.description = Exécute une séquence d'instructions en boucle. Peut être utilisé pour contrôler des unités ou des bâtiments. Plus rapide qu'un microprocesseur.
+block.hyper-processor.description = Exécute une séquence d'instructions en boucle. Peut être utilisé pour contrôler des unités ou des bâtiments. Plus rapide qu'un processeur.
+block.memory-cell.description = Stocke des informations pour un processeur logique.
+block.memory-bank.description = Stocke des informations pour un processeur logique. Possède une plus grande capacité.
+block.logic-display.description = Affiche des images à partir des instructions d'un processeur logique.
+block.large-logic-display.description = Affiche des images à partir des instructions d'un processeur logique. Possède une plus grande résolution qu'un écran.
+block.interplanetary-accelerator.description = Un énorme canon électromagnétique à rails. Accélère les Noyaux pour qu'ils échappent à la gravité de leur planète et leur permettent un déploiement interplanétaire.
+block.repair-turret.description = Répare en continu l'unité endommagée la plus proche dans son périmètre. Accepte le liquide de refroidissement en option.
+
+#Erekir
+block.core-bastion.description = Le cœur de votre base. Blindé. Une fois détruit, le secteur est perdu.
+block.core-citadel.description = Le cœur de votre base. Très bien blindé. Stocke plus de ressources qu'un noyau Bastion.
+block.core-acropolis.description = Le cœur de votre base. Exceptionnellement bien blindé. Stocke plus de ressources qu'un noyau Citadelle.
+block.breach.description = Tire des munitions perforantes de béryllium ou de tungstène sur les cibles ennemies.
+block.diffuse.description = Tire une rafale de balles dans un large cône. Peut repousser les cibles ennemies.
+block.sublimate.description = Tire un jet de flammes continu sur les cibles ennemies. Perce les armures.
+block.titan.description = Tire un obus d'artillerie massif sur les cibles au sol. Nécessite de l'hydrogène.
+block.afflict.description = Tire une orbe massive chargée de balles à fragmentation. Nécessite de la chaleur.
+block.disperse.description = Tire des rafales de balles anti-aériennes aux cibles volantes.
+block.lustre.description = Tire un laser à cible unique se déplaçant lentement sur les cibles ennemies.
+block.scathe.description = Lance un missile puissant sur les cibles au sol sur de grandes distances.
+block.smite.description = Tire une rafale de balles perçantes émetteuse de foudre.
+block.malign.description = Tire un barrage de charges lasers à tête chercheuse sur les cibles ennemies. Requiert beaucoup de chaleur.
+block.silicon-arc-furnace.description = Raffine du silicium à partir de sable et de graphite.
+block.oxidation-chamber.description = Produit de l'oxyde à partir de béryllium et d'ozone. Émet de la chaleur comme sous-produit.
+block.electric-heater.description = Applique de la chaleur aux structures. Nécessite une grande quantité d'énergie.
+block.slag-heater.description = Applique de la chaleur structures. Nécessite des scories.
+block.phase-heater.description = Applique de la chaleur aux structures. Nécessite du tissu phasé.
+block.heat-redirector.description = Redirige la chaleur accumulée aux autres blocs.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Répartit la chaleur dans trois directions de sortie.
+block.electrolyzer.description = Décompose l'eau en hydrogène et en ozone. Les sorties de chaque gaz sont situées de part et d'autres du bloc, marquées par leur couleur correspondante.
+block.atmospheric-concentrator.description = Concentre l'azote retenu dans l'atmosphère. Requiert de la chaleur.
+block.surge-crucible.description = Forme de l'alliage superchargé à partir de scories et de silicium. Requiert de la chaleur.
+block.phase-synthesizer.description = Synthétise du tissu phasé à partir de thorium, de sable, et d'ozone. Requiert de la chaleur.
+block.carbide-crucible.description = Fusionne du tungstène et du graphite en carbure. Requiert de la chaleur.
+block.cyanogen-synthesizer.description = Synthétise du cyanogène à partir d'arkycite et de graphite. Requiert de la chaleur.
+block.slag-incinerator.description = Incinère des objets ou des liquides non-volatils. Nécéssite des scories.
+block.vent-condenser.description = Condense les gaz d'évents en eau. Consomme de l'énergie.
+block.plasma-bore.description = Lorsqu'il est placé face à un mur de minerai, il produit des matériaux indéfiniment. Requiert peu d'énergie.\nPeut utiliser de l'hydrogène pour booster l'efficacité.
+block.large-plasma-bore.description = Une foreuse à plasma plus large. Capable d'extraire du tungstène et du thorium. Nécessite de l'hydrogène et de l'énergie.\nPeut utiliser de l'azote pour booster l'efficacité.
+block.cliff-crusher.description = Écrase les murs, produisant du sable indéfiniment. Nécessite de l'énergie. L'efficacité varie en fonction du type de mur.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Lorsqu'il est placé sur du minerai, il produit des matériaux en rafales indéfiniment. Nécessite de l'énergie et de l'eau.
+block.eruption-drill.description = Une foreuse à impact améliorée. Capable d'extraire du thorium. Requiert de l'hydrogène.
+block.reinforced-conduit.description = Déplace les fluides. N'accepte pas les entrées sans conduit sur les côtés.
+block.reinforced-liquid-router.description = Accepte les fluides depuis une direction et les distribue jusqu'à 3 directions équitablement.
+block.reinforced-liquid-tank.description = Stocke une grande quantité de fluides.
+block.reinforced-liquid-container.description = Stocke une quantité importante de fluides.
+block.reinforced-bridge-conduit.description = Transporte les fluides par-dessus les structures et le terrain.
+block.reinforced-pump.description = Pompe des liquides. Requiert de l'hydrogène.
+block.beryllium-wall.description = Protège les structures des projectiles ennemis.
+block.beryllium-wall-large.description = Protège les structures des projectiles ennemis.
+block.tungsten-wall.description = Protège les structures des projectiles ennemis.
+block.tungsten-wall-large.description = Protège les structures des projectiles ennemis.
+block.carbide-wall.description = Protège les structures des projectiles ennemis.
+block.carbide-wall-large.description = Protège les structures des projectiles ennemis.
+block.reinforced-surge-wall.description = Protège les structures des projectiles ennemis, dégageant périodiquement des arcs électriques au contact.
+block.reinforced-surge-wall-large.description = Protège les structures des projectiles ennemis, dégageant périodiquement des arcs électriques au contact.
+block.shielded-wall.description = Protège les structures des projectiles ennemis, reflétant la plupart des balles lors de l'impact. Déploie un bouclier qui absorbe la plupart des projectiles lorsque de l'énergie est fournie. Conduit l'énergie.
+block.blast-door.description = Un mur qui s'ouvre lorsque des unités terrestres alliées sont à portée. Ne peut pas être contrôlé manuellement.
+block.duct.description = Déplace les objets. Ne peut stocker qu'un seul objet.
+block.armored-duct.description = Déplace les objets. N'accepte pas les entrées qui ne sont pas des conduits sur les côtés.
+block.duct-router.description = Distribue les objets de manière égale dans trois directions. N'accepte que les objets à l'arrière. Peut être configuré comme un trieur d'objets.
+block.overflow-duct.description = Envoie les objets sur les côtés si le chemin avant est bloqué.
+block.duct-bridge.description = Déplace les objets par-dessus les structures et le terrain.
+block.duct-unloader.description = Décharge l'élément sélectionné du bloc derrière lui. Impossible de décharger des noyaux.
+block.underflow-duct.description = L'opposé d'un conduit de débordement. Envoie les objets vers l'avant si les chemins gauche et droit sont bloqués.
+block.reinforced-liquid-junction.description = Agit comme une jonction entre deux conduits qui se croisent.
+block.surge-conveyor.description = Déplace les éléments par lots. Peut être accéléré avec de l'énergie. Conduit l'énergie.
+block.surge-router.description = Distribue de manière égale les objets dans trois directions à partir de convoyeurs superchargés. Peut être accéléré avec de l'énergie. Conduit l'énergie.
+block.unit-cargo-loader.description = Construit des drones cargo. Ces drones distribuent automatiquement les objets aux Points de Déchargement ayant le filtre correspondant.
+block.unit-cargo-unload-point.description = Agit comme un point de déchargement pour les drones cargo. Accepte les objets qui correspondent au filtre sélectionné.
+block.beam-node.description = Transmet l'énergie à d'autres blocs orthogonalement. Stocke une petite quantité d'énergie.
+block.beam-tower.description = Transmet l'énergie à d'autres blocs orthogonalement. Stocke une grande quantité d'énergie. Longue portée.
+block.turbine-condenser.description = Génère de l'énergie lorsqu'il est placé sur des évents. Produit une petite quantité d'eau.
+block.chemical-combustion-chamber.description = Génère de l'énergie à partir d'arkycite et d'ozone.
+block.pyrolysis-generator.description = Génère de grandes quantités d'énergie à partir d'arkycite et de scories. Produit de l'eau comme sous-produit.
+block.flux-reactor.description = Génère de grandes quantités d'énergie lorsqu'il est chauffé. Requiert du cyanogène comme stabilisant. La puissance de sortie et les besoins en cyanogène sont proportionnels à l'apport de chaleur.\nExplose s'il n'y a pas assez de cyanogène.
+block.neoplasia-reactor.description = Utilise de l'arkycite, de l'eau et du tissu phasé pour générer de grandes quantités d'énergie. Produit de la chaleur et du néoplasme dangereux comme sous-produit.\nExplose violemment si le néoplasme n'est pas retiré du réacteur via des conduits.
+block.build-tower.description = Reconstruit automatiquement les structures à portée et assiste les autres unités en construction.
+block.regen-projector.description = Répare lentement les structures alliées dans un périmètre carré. Nécessite de l'hydrogène.\nPeut utiliser du tissu phasé pour augmenter l'efficacité.
+block.reinforced-container.description = Stocke une petite quantité d'objets. Le contenu peut être récupéré via des déchargeurs. N'augmente pas la capacité de stockage du noyau.
+block.reinforced-vault.description = Stocke une grande quantité d'objets. Le contenu peut être récupéré via des déchargeurs. N'augmente pas la capacité de stockage du noyau.
+block.tank-fabricator.description = Construit des unités Stell. Les unités de sortie peuvent être utilisées directement, ou transférées dans des refabricateurs pour une amélioration.
+block.ship-fabricator.description = Construit des unités Elude. Les unités de sortie peuvent être utilisées directement, ou transférées dans des refabricateurs pour une amélioration.
+block.mech-fabricator.description = Construit des unités Merui. Les unités de sortie peuvent être utilisées directement, ou transférées dans des refabricateurs pour une amélioration.
+block.tank-assembler.description = Assemble de grands tanks à partir de blocs et d'unités. Le niveau de l'unité de sortie peut être augmenté en ajoutant des modules.
+block.ship-assembler.description = Assemble de grands vaisseaux à partir de blocs et d'unités. Le niveau de l'unité de sortie peut être augmenté en ajoutant des modules.
+block.mech-assembler.description = Assemble de grands mechs à partir de blocs et d'unités. Le niveau de l'unité de sortie peut être augmenté en ajoutant des modules.
+block.tank-refabricator.description = Améliore les tanks au deuxième niveau.
+block.ship-refabricator.description = Améliore les vaisseaux au deuxième niveau.
+block.mech-refabricator.description = Améliore les mechs au deuxième niveau.
+block.prime-refabricator.description = Améliore les unités au troisième niveau.
+block.basic-assembler-module.description = Augmente le niveau d'assembleur lorsqu'il est placé à côté d'une limite de construction. Requiert de l'énergie. Peut être utilisé comme entrée de charge utile.
+block.small-deconstructor.description = Déconstruit les structures et les unités saisies. Renvoie 100% du coût de construction.
+block.reinforced-payload-conveyor.description = Déplace les charges utiles.
+block.reinforced-payload-router.description = Distribue les charges utiles aux blocs adjacents. Fonctionne comme un trieur lorsqu'un filtre est défini.
+block.payload-mass-driver.description = Structure de transport de charge utile à longue portée. Tire les charges utiles reçues vers les transporteurs de masse liés.
+block.large-payload-mass-driver.description = Structure de transport de charge utile à longue portée. Tire les charges utiles reçues vers les transporteurs de masse liés.
+block.unit-repair-tower.description = Répare toutes les unités à proximité. Requiert de l'ozone.
+block.radar.description = Découvre progressivement le terrain et les unités ennemies dans un large rayon. Nécessite de l'énergie.
+block.shockwave-tower.description = Endommage et détruit les projectiles ennemis dans un rayon. Nécessite du cyanogène.
+block.canvas.description = Affiche une image simple avec une palette prédéfinie. Modifiable.
+
+unit.dagger.description = Tire des balles normales aux ennemis proches.
+unit.mace.description = Tire des jets de flammes aux ennemis proches.
+unit.fortress.description = Tire des balles d’artillerie à longue portée sur des cibles terrestres.
+unit.scepter.description = Tire un barrage de balles super chargées aux ennemis proches.
+unit.reign.description = Tire un barrage de grosses balles perçantes aux ennemis proches.
+unit.nova.description = Tire des balles laser qui infligent des dégâts aux ennemis et réparent les structures alliées. Est capable de voler.
+unit.pulsar.description = Tire des arcs électriques qui infligent des dégâts aux ennemis et réparent les structures alliées. Est capable de voler.
+unit.quasar.description = Tire des faisceaux laser qui infligent des dégâts aux ennemis et réparent les structures alliées. Est capable de voler et est doté d'un champ de force.
+unit.vela.description = Tire un rayon laser continu qui inflige des dégâts aux ennemis, cause des incendies aux structures ennemies et répare les structures alliées. Est capable de voler.
+unit.corvus.description = Tire un rayon laser massif qui inflige des dégâts aux ennemis et répare les structures alliées. Peut marcher sur la plupart des terrains.
+unit.crawler.description = Court vers un ennemi proche pour s'auto-détruire, causant une large explosion.
+unit.atrax.description = Tire des orbes débilitants de scories sur des cibles terrestres. Peut marcher sur la plupart des terrains.
+unit.spiroct.description = Tire des faisceaux laser sapants aux ennemis proches, le réparant aussi. Peut marcher sur la plupart des terrains.
+unit.arkyid.description = Tire de larges faisceaux laser sapants aux ennemis proches, le réparant aussi. Peut marcher sur la plupart des terrains.
+unit.toxopid.description = Tire de larges obus électriques et des lasers perçants aux ennemis proches. Peut marcher sur la plupart des terrains.
+unit.flare.description = Tire des balles normales aux cibles terrestres.
+unit.horizon.description = Largue des bombes sur des cibles terrestres.
+unit.zenith.description = Tire des salves de missiles sur les ennemis proches.
+unit.antumbra.description = Tire un barrage de balles aux ennemis proches.
+unit.eclipse.description = Tire 2 lasers perçants et un barrage de balles explosives aux ennemis proches.
+unit.mono.description = Mine automatiquement du cuivre et du plomb et le dépose dans un Noyau proche.
+unit.poly.description = Reconstruit automatiquement les structures détruites (sauf les réacteurs à thorium) et assiste les autres unités lorsqu'elles construisent.
+unit.mega.description = Répare automatiquement les structures endommagées. Capable de transporter des blocs et de petites unités terrestres.
+unit.quad.description = Largue de grosses bombes sur des cibles terrestres, réparant les structures alliées et infligeant des dégâts aux ennemis. Capable de transporter des blocs et des unités terrestres de taille moyenne.
+unit.oct.description = Protège les alliés proches avec son champ de force auto-régénérant. Capable de transporter des blocs et de grosses unités terrestres.
+unit.risso.description = Tire un barrage de missiles et de balles aux ennemis proches.
+unit.minke.description = Tire des obus et des balles normales aux ennemis proches.
+unit.bryde.description = Tire des obus d'artillerie à longue portée et des missiles aux ennemis proches.
+unit.sei.description = Tire un barrage de missiles et de balles perçantes aux ennemis proches.
+unit.omura.description = Tire avec un canon à rails à longue portée, une puissante balle perçante aux ennemis proches. Possède une usine à flares.
+unit.alpha.description = Défend le Noyau fragment contre les ennemis. Peut construire des structures.
+unit.beta.description = Défend le Noyau fondation contre les ennemis. Peut construire des structures.
+unit.gamma.description = Défend le Noyau épicentre contre les ennemis. Peut construire des structures.
+unit.retusa.description = Tire des torpilles à tête chercheuse sur les ennemis proches. Répare les unités alliées.
+unit.oxynoe.description = Tire des jets de flammes qui réparent les structures et endommage les ennemis proches. Cible les projectiles ennemis proches avec une tourelle de défense ponctuelle.
+unit.cyerce.description = Tire des missiles à fragmentation sur les ennemis. Répare les unités alliées.
+unit.aegires.description = Secoue toutes les unités et structures ennemies qui entrent dans son champ d'énergie. Répare tous les alliés.
+unit.navanax.description = Tire des projectiles explosifs EMP, infligeant des dommages importants aux réseaux électriques ennemis et réparant les structures alliées. Fait fondre les ennemis proches avec 4 tourelles laser autonomes.
+
+#Erekir
+unit.stell.description = Tire des balles standard aux ennemis proches.
+unit.locus.description = Tire des balles en alternance aux ennemis proches.
+unit.precept.description = Tire des grappes de balles perçantes aux ennemis proches.
+unit.vanquish.description = Tire des larges balles perçantes qui se divisent aux ennemis proches.
+unit.conquer.description = Tire des larges cascades de balles perçantes aux ennemis proches.
+unit.merui.description = Tire des balles d’artillerie à longue portée sur des cibles terrestres. Peut marcher sur la plupart des terrains.
+unit.cleroi.description = Tire 2 obus aux ennemis proches. Cible les projectiles ennemis afin de les détruire avec des tourelles. Peut marcher sur la plupart des terrains.
+unit.anthicus.description = Tire des balles autoguidées à longue portée aux ennemis proches. Peut marcher sur la plupart des terrains.
+unit.tecta.description = Tire des missiles autoguidés de plasma aux ennemis proches. Se protège avec un bouclier directionnel. Peut marcher sur la plupart des terrains.
+unit.collaris.description = Tire des balles à fragmentation d'artillerie à longe portée aux ennemis proches. Peut marcher sur la plupart des terrains.
+unit.elude.description = Tire une paire de balles autoguidées aux ennemis proches. Peut flotter au-dessus des étendues liquides.
+unit.avert.description = Tire une paire de balles ayant une trajectoire tordue aux ennemis proches.
+unit.obviate.description = Tire une paire d'orbes d'éclairs ayant une trajectoire tordue aux ennemis proches.
+unit.quell.description = Tire des missiles autoguidés à longue portée aux ennemis proches. Désactive les structures de réparation ennemies proches.
+unit.disrupt.description = Tire des missiles de suppression autoguidés à longue portée aux ennemis proches. Désactive les structures de réparation ennemies proches.
+unit.evoke.description = Construit des structures pour défendre le Noyau bastion. Peut réparer des structures avec un rayon.
+unit.incite.description = Construit des structures pour défendre le Noyau citadelle. Peut réparer des structures avec un rayon.
+unit.emanate.description = Construit des structures pour défendre le Noyau acropole. Peut réparer des structures avec un rayon.
+
+lst.read = Lit un nombre depuis un bloc de mémoire relié au processeur.
+lst.write = Écrit un nombre dans un bloc de mémoire relié au processeur.
+lst.print = Ajoute du texte dans la mémoire tampon de l'imprimante.\nNe montrera aucun texte tant que [accent]Print Flush[] ne sera pas utilisé.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Ajoute une opération dans la mémoire tampon de dessin.\nNe montrera aucune image tant que [accent]Draw Flush[] ne sera pas utilisé.
+lst.drawflush = Affiche les opérations [accent]Draw[] en file d'attente vers un écran.
+lst.printflush = Affiche les opérations [accent]Print[] en file d'attente vers un bloc de message.
+lst.getlink = Obtient un lien de processeur par index. Commence à 0.
+lst.control = Contrôle un bâtiment.
+lst.radar = Localise des unités dans la portée d'un bâtiment.
+lst.sensor = Récupère des données depuis un bâtiment ou une unité.
+lst.set = Définit une variable.
+lst.operation = Effectue une opération sur 1 ou 2 variables.
+lst.end = Saute au sommet de la série d’instructions.
+lst.wait = Attendre un certain nombre de secondes.
+lst.stop = Stoppe l'exéction du processeur.
+lst.lookup = Recherche d'un type d'objet/liquide/unité/bloc par ID.\nLe nombre total de chaque type peut être consulté avec:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Saute conditionnellement vers une autre instruction.
+lst.unitbind = Se lie à une unité du type donné et la stocke dans [accent]@unit[].
+lst.unitcontrol = Contrôle l'unité actuellement liée.
+lst.unitradar = Localise des unités dans la portée de l'unité actuellement liée.
+lst.unitlocate = Localise une position ou un type spécifique de bâtiment, n'importe où sur la carte.\nRequiert une unité reliée.
+lst.getblock = Obtient les données d'une tuile à n'importe quel emplacement.
+lst.setblock = Définit les données d'une tuile à n'importe quel emplacement.
+lst.spawnunit = Fait apparaître une unité à un emplacement.
+lst.applystatus = Ajoute ou enlève un effet de statut d'une unité.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simule un déclenchement de vague à n'importe quel emplacement.\nCela n'incrémente pas le compteur de vaugues.
+lst.explosion = Crée une explosion à un emplacement.
+lst.setrate = Définit la vitesse d'exécution d'un processeur en instructions/tick.
+lst.fetch = Cherche les unités, noyaux, joueurs ou constructions par index. Commence à 0 et termine par le nombre retourné.
+lst.packcolor = Compresse les composants RGBA [0, 1] en un seul nombre pour les opérations de dessins ou les changements de règles.
+lst.setrule = Change une règle du jeu.
+lst.flushmessage = Affiche un message sur l'écran depuis la mémoire tampon de texte.\nAttendra la fin du message précédent avant l'affichage du nouveau.
+lst.cutscene = Manipule la caméra du joueur.
+lst.setflag = Définit une variable globale qui peut être lue par tous les processeurs.
+lst.getflag = Vérifie si une variable globale est présente.
+lst.setprop = Change une propriété d'une unité ou d'un bâtiment.
+lst.effect = Crée un effet de particules.
+lst.sync = Synchronise une variable dans le réseau.\nLimité à 20 fois par seconde et par variable.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Crée un marqueur dans le monde.\nUn ID pour identifier le marqueur doit être donné.\nLes marqueurs sont limités à 20,000 par monde.
+lst.setmarker = Change une propriété d'un marqueur.\nL'ID utilisé doit être le même que celui de l'instruction "Make Marker".
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Les unités contrôlées par des processeurs ne peuvent pas construire ici.
+
+lenum.type = Type de bâtiment/unité.\nPar exemple, pour tout routeur, cela retournera [accent]@router[].
+lenum.shoot = Tire à une position donnée.
+lenum.shootp = Tire à une unité/bâtiment avec la prédiction de mouvement.
+lenum.config = La configuration d'un bâtiment. Par exemple, l'objet sélectionné dans un trieur.
+lenum.enabled = Retourne si le bloc est activé ou pas.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = La couleur d'un illuminateur.
+laccess.controller = Le contrôleur de l'Unité.\nSi l'Unité est contrôlée par un processeur, cela retournera le processeur en question.\nSi l'Unité est en formation, cela retournera le leader de la formation.\nSinon, renvoie l’unité elle-même.
+laccess.dead = Retourne si l'Unité/Bâtiment est morte/détruit ou plus valide.
+laccess.controlled = Retourne:\n[accent]@ctrlProcessor[] si le contrôleur de l'Unité est un processeur\n[accent]@ctrlPlayer[] si l'Unité/Bâtiment est contrôlé par un joueur\n[accent]@ctrlFormation[] si l'Unité est en formation\nSinon, retourne 0.
+laccess.progress = Progression de l'action, 0 à 1.\nRenvoie la progression de la production, du rechargement de la tourelle ou de la construction.
+laccess.speed = La vitesse maximale d'une unité, en blocs/sec.
+laccess.id = L'ID d'une unité/bloc/ressource/liquide.\nCeci est l'inverse de l'instruction de recherche.
+
+lcategory.unknown = Inconnu
+lcategory.unknown.description = Instructions sans catégorie.
+lcategory.io = Entrée & Sortie
+lcategory.io.description = Modifie le contenu des blocs de mémoire et la mémoire tampon des processeurs.
+lcategory.block = Contrôle des Blocs
+lcategory.block.description = Interagit avec les blocs.
+lcategory.operation = Opérations
+lcategory.operation.description = Opérations logiques.
+lcategory.control = Contrôle des Flux
+lcategory.control.description = Manipule l'ordre d'exécution.
+lcategory.unit = Contrôle des Unités
+lcategory.unit.description = Ordonne des commandes aux unités.
+lcategory.world = Contrôle du Monde
+lcategory.world.description = Manipule le comportement du monde.
+
+graphicstype.clear = Remplit l’écran d’une couleur.
+graphicstype.color = Définit une couleur pour les prochaines opérations de dessin.
+graphicstype.col = Équivalent à l'instruction "color", mais compressée.\nLes couleurs compressées sont représentées sous forme de codes hexadécimaux avec un préfixe [accent]%[].\nExemple: [accent]%ff0000[] est rouge.
+graphicstype.stroke = Définit la largeur d'une ligne.
+graphicstype.line = Dessine un segment de droite.
+graphicstype.rect = Dessine un rectangle.
+graphicstype.linerect = Dessine le contour d'un rectangle.
+graphicstype.poly = Dessine un polygone régulier.
+graphicstype.linepoly = Dessine le contour d'un polygone régulier.
+graphicstype.triangle = Dessine un triangle.
+graphicstype.image = Dessine une image provenant du contenu du jeu.\nexemple: [accent]@router[] ou [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Toujours [accent]true[].
+lenum.idiv = Division entière.
+lenum.div = Division.\nRetourne [accent]null[] lors d'une division par zéro.
+lenum.mod = Modulo.
+lenum.equal = Égalité. Conversion des types.\nLes objets non-nuls comparés avec des nombres deviennent 1, sinon 0.
+lenum.notequal = Inégalité. Conversion des types.
+lenum.strictequal = Égalité stricte. Ne convertit pas les types.\nPeut être utilisé pour vérifier les valeurs [accent]null[].
+lenum.shl = Décalage de bits vers la gauche.
+lenum.shr = Décalage de bits vers la droite.
+lenum.or = Opération binaire OR.
+lenum.land = Opération logique AND.
+lenum.and = Opération binaire AND.
+lenum.not = Opération binaire flip.
+lenum.xor = Opération binaire XOR.
+
+lenum.min = Le minimum des 2 nombres.
+lenum.max = Le maximum des 2 nombres.
+lenum.angle = Angle d'un vecteur en degrés.
+lenum.anglediff = Distance absolue entre 2 angles en degrés.
+lenum.len = Longueur d'un vecteur.
+
+lenum.sin = Calcule le Sinus, en degrés.
+lenum.cos = Calcule le Cosinus, en degrés.
+lenum.tan = Calcule la Tangente, en degrés.
+
+lenum.asin = Arc sinus, en degrés.
+lenum.acos = Arc cosinus, en degrés.
+lenum.atan = Tangente de l'arc, en degrés.
+
+#ceci n'est pas une erreur, c'est la notation officielle des plages de valeurs
+lenum.rand = Nombre aléatoire dans la plage [0, valeur).
+lenum.log = Logarithme naturel (ln).
+lenum.log10 = Logarithme de base 10.
+lenum.noise = Bruit simplex 2D.
+lenum.abs = Valeur absolue.
+lenum.sqrt = Racine carrée.
+
+lenum.any = N'importe quelle unité.
+lenum.ally = Unité alliée.
+lenum.attacker = Unité avec des armes.
+lenum.enemy = Unité ennemie.
+lenum.boss = Gardien.
+lenum.flying = Unité volante.
+lenum.ground = Unité terrestre.
+lenum.player = Unité contrôlée par un joueur.
+
+lenum.ore = Gisement de minerai.
+lenum.damaged = Bâtiments alliés endommagés.
+lenum.spawn = Point d'apparition ennemi.\nPeut être un noyau ou une position.
+lenum.building = Bâtiment dans un groupe spécifique.
+
+lenum.core = N'importe quel noyau.
+lenum.storage = Bâtiments de stockage, un coffre-fort par exemple.
+lenum.generator = Bâtiments générant de l'énergie.
+lenum.factory = Bâtiments traitant des ressources.
+lenum.repair = Points de réparation.
+lenum.battery = N'importe quelle batterie.
+lenum.resupply = Points de rechargement.\nUtile seulement lorsque [accent]"munitions"[] sont limitées.
+lenum.reactor = Réacteur à Impact/Thorium.
+lenum.turret = N'importe quelle tourelle.
+
+sensor.in = Les bâtiments/unités à analyser.
+
+radar.from = Bâtiment de détection.\nLa portée du détecteur est limitée à la portée du bâtiment.
+radar.target = Filtre pour les unités à détecter.
+radar.and = Filtres additionnels
+radar.order = Ordre de filtrage. 0 pour inverser.
+radar.sort = Valeur par laquelle les résultats sont triés.
+radar.output = Variable dans laquelle écrire l'unité retournée.
+
+unitradar.target = Filtre pour les unités à détecter.
+unitradar.and = Filtres additionnels
+unitradar.order = Ordre de filtrage. 0 pour inverser.
+unitradar.sort = Valeur par laquelle les résultats sont triés.
+unitradar.output = Variable dans laquelle écrire l'unité retournée.
+
+control.of = Bâtiment à contrôler.
+control.unit = Unité/bâtiment à viser.
+control.shoot = S’il faut tirer ou non.
+
+unitlocate.enemy = S'il faut détecter les bâtiments ennemis au non.
+unitlocate.found = Retourne un booléen si l'objet a été trouvé ou non.
+unitlocate.building = Retourne une variable pour le bâtiment localisé.
+unitlocate.outx = Retourne la coordonnée X.
+unitlocate.outy = Retourne la coordonnée Y.
+unitlocate.group = Le groupe de bâtiments à rechercher.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = L'Unité ne bouge plus, mais elle continue de construire/miner.\nL'état par défaut.
+lenum.stop = Empêche l'unité de bouger/miner/construire.
+lenum.unbind = Désactive complètement le contrôle par processeur.\nL'unité reprend son comportement standard.
+lenum.move = Bouge vers la position exacte.
+lenum.approach = Approche une position avec un rayon.
+lenum.pathfind = Détermine un itinéraire et bouge vers le point d'apparition ennemi.
+lenum.autopathfind = Recherche automatiquement le chemin vers le noyau ennemi ou la zone d'apparition ennemie le plus proche.\nCeci est le même que la détection de chemin de la vague ennemie.
+lenum.target = Tire vers la position donnée.
+lenum.targetp = Tire sur une cible avec la prédiction de mouvement.
+lenum.itemdrop = Lâche un objet.
+lenum.itemtake = Prend un objet depuis un bâtiment.
+lenum.paydrop = Lâche le chargement actuel.
+lenum.paytake = Prend un chargement à la position actuelle.
+lenum.payenter = Entrez/atterrissez sur le bloc de charge utile sur lequel se trouve l'unité.
+lenum.flag = Drapeau numérique d'une unité.
+lenum.mine = Mine à une position donnée.
+lenum.build = Construit une structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Vérifie si l'unité est près de la position.
+lenum.boost = Active/Désactive le boost.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties
deleted file mode 100644
index 8975031cb6..0000000000
--- a/core/assets/bundles/bundle_fr_BE.properties
+++ /dev/null
@@ -1,1335 +0,0 @@
-credits.text = Créé par [royal]Anuken[] - [sky]anukendev@gmail.com[]
-credits = Crédits
-contributors = Traducteurs et contributeurs
-discord = Rejoignez le discord de Mindustry !
-link.discord.description = Le discord officiel de Mindustry
-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
-link.trello.description = Trello officiel pour les fonctionnalités planifiées.
-link.itch.io.description = Site itch.io avec les versions téléchargeables pour ordinateur.
-link.google-play.description = Page Google Play du jeu
-link.f-droid.description = F-Droid catalogue listing
-link.wiki.description = Wiki officiel de Mindustry
-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 = Copié.
-indev.popup = [accent]La v6[] est actuellement en [accent]alpha[].\n[lightgray]Cela signifie :[]\n[scarlet]- La campagne est totalement incomplète[]\n- Il manque du contenu\n - La plupart des [scarlet]IA d'unités[] ne fonctionne pas correctement\n- De nombreuses unités ne sont pas terminées\n- Tout ce que vous voyez est susceptible d'être modifié ou supprimé.\n\nMerci de rapporter les bugs/crash sur [accent]Github[].
-indev.notready = Cette partie du jeu n'est pas encore prête
-
-load.sound = Son
-load.map = Maps
-load.image = Images
-load.content = Contenu
-load.system = Système
-load.mod = Mods
-load.scripts = Scripts
-
-be.update = Une nouvelle version est disponible:
-be.update.confirm = Voulez vous la télécharger et recommencer maintenant ?
-be.updating = En train de mettre à jour...
-be.ignore = Ignorer
-be.noupdates = Aucune mise à jour n'as été trouvée.
-be.check = Chercher des mises à jour
-
-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 définitivement supprimé.
-schematic.rename = Renommer Schéma
-schematic.info = {0}x{1}, {2} blocks
-schematic.disabled = [scarlet] Schémas désactivés ![]\nVous n'êtes pas autorisés à utiliser des schémas sur cette [accent]map[] ou ce [accent]serveur.
-
-stat.wave = Vagues vaincues:[accent] {0}
-stat.enemiesDestroyed = Ennemies détruits:[accent] {0}
-stat.built = Bâtiments construits:[accent] {0}
-stat.destroyed = Bâtiments détruits:[accent] {0}
-stat.deconstructed = Bâtiments déconstruits:[accent] {0}
-stat.delivered = Ressources transférées:
-stat.playtime = Temps Joué:[accent] {0}
-stat.rank = Rang Final: [accent]{0}
-
-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 = <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
-joingame = Rejoindre la partie
-customgame = Partie personnalisée
-newgame = Nouvelle partie
-none = <Vide>
-minimap = Minimap
-position = Position
-close = Fermer
-website = Site Web
-quit = Quitter
-save.quit = Save & Quit
-maps = Cartes
-maps.browse = Feuilleter les maps
-continue = Continuer
-maps.none = [lightgray]Aucune carte trouvée!
-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 = 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 = Mods
-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]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.
-mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
-mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
-mod.enable = Enable
-mod.requiresrestart = The game will now close to apply the mod changes.
-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}
-mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Before publishing this mod in the workshop, you must add an image preview.\nPlace an image named[accent] preview.png[] into the mod's folder and try again.
-mod.folder.missing = Only mods in folder form can be published on the 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 = À 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é.
-research.progress = {0}% complete
-players = {0} joueurs
-players.single = {0} joueur
-players.search = search
-players.notfound = [gray]no players found
-server.closing = [accent]Fermeture du serveur ...
-server.kicked.kick = Vous avez été expulsé du serveur !
-server.kicked.whitelist = You are not whitelisted here.
-server.kicked.serverClose = Serveur fermé.
-server.kicked.vote = Vous avez été expulsé 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.
-server.kicked.typeMismatch = This server is not compatible with your build type.
-server.kicked.playerLimit = Ce serveur est complet. Attendez qu'une place ce libére.
-server.kicked.recentKick = Vous avez été expulsé récemment.\nAttendez avant de vous connecter à nouveau.
-server.kicked.nameInUse = Il y a déjà quelqu'un avec ce nom\nsur ce serveur.
-server.kicked.nameEmpty = Votre nom doit contenir au moins une lettre ou un chiffre.
-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 = 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 = 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 = 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 = 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 = Client Mobile: [accent]{0}
-trace.modclient = Client personnalisé: [accent]{0}
-invalidid = ID client invalide ! Soumettre un rapport de bug
-server.bans = Banni
-server.bans.none = Aucun joueur banni trouvé !
-server.admins = Administrateurs
-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
-server.outdated = [crimson]Serveur obsolète ![]
-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 = Ê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 = 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 = Impossible de rejoindre le jeu ([accent]{0}[]).
-connecting = [accent]Connexion...
-connecting.data = [accent]Chargement des données du monde...
-server.port = Port:
-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\nrecouvrir cette sauvegarde ?
-overwrite = Recouvrir
-save.none = Aucune sauvegarde trouvée !
-savefail = Échec de la sauvegarde !
-save.delete.confirm = Êtes-vous sûr de supprimer cette sauvegarde ?
-save.delete = Supprimer
-save.export = Exporter une\nSauvegarde
-save.import.invalid = [accent]Cette sauvegarde est invalide!
-save.import.fail = [crimson]L'importation de la sauvegarde\na échouée: [accent]{0}
-save.export.fail = [crimson]L'exportation de la sauvegarde\na échouée: [accent]{0}
-save.import = Importer une sauvegarde
-save.newslot = Nom de la sauvegarde:
-save.rename = Renommer
-save.rename.text = Nouveau nom:
-selectslot = Sélectionnez une sauvegarde.
-slot = [accent]Emplacement {0}
-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
-off = Éteint
-save.autosave = Sauvegarde automatique {0}
-save.map = Carte: {0}
-save.wave = Vague {0}
-save.mode = Mode de jeu {0}
-save.date = Dernière sauvegarde: {0}
-save.playtime = Temps de jeu: {0}
-warning = Avertissement.
-confirm = Confirmer
-delete = Supprimer
-view.workshop = View In Workshop
-workshop.listing = Edit Workshop Listing
-ok = OK
-open = Ouvrir
-customize = Personnaliser
-cancel = Annuler
-openlink = Ouvrir le lien
-copylink = Copier le lien
-back = Retour
-data.export = Export Data
-data.import = Import Data
-data.openfolder = Open Data Folder
-data.exported = Data exported.
-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
-resumebuilding = [scarlet][[{0}][] to resume building
-wave = [accent]Vague {0}
-wave.cap = [accent]Wave {0}/{1}
-wave.waiting = [lightgray]Prochaine vague dans {0}
-wave.waveInProgress = [lightgray]Vague en cours
-waiting = [lightgray]En attente...
-waiting.players = En attente de joueurs ...
-wave.enemies = [lightgray]{0} Ennemis restants
-wave.enemy = [lightgray]{0} Ennemi restant
-wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
-wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
-loadimage = Charger l'image
-saveimage = Sauvegarder l'image
-unknown = Inconnu
-custom = Personnalisé
-builtin = Pré-fait
-map.delete.confirm = Êtes-vous sûr de vouloir effacer cette carte ? Cette action est irréversible !
-map.random = [accent]Carte aléatoire
-map.nospawn = Cette carte ne possède pas de base pour que le joueur puisse apparaître !Ajouter un [royal]base bleue[] sur cette carte dans l'éditeur.
-map.nospawn.pvp = Cette carte ne contient aucune base ennemi dans lequel le joueur apparaît!\nAjoutez des bases [scarlet]rouge[] à cette carte dans l'éditeur.
-map.nospawn.attack = Cette carte ne contient aucune base ennemi à attaquer! Ajoutez des bases [scarlet]rouge[] à cette carte dans l'éditeur.
-map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
-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 = Pinceau
-editor.openin = Ouvrir dans l'éditeur
-editor.oregen = Génération des minerais
-editor.oregen.info = Génération de minerais:
-editor.mapinfo = Infos sur la carte
-editor.author = Auteur:
-editor.description = Description:
-editor.nodescription = A map must have a description of at least 4 characters before being published.
-editor.waves = Vagues:
-editor.rules = Règles:
-editor.generation = Generation:
-editor.ingame = Modifier en jeu
-editor.publish.workshop = Publish On Workshop
-editor.newmap = Nouvelle carte
-editor.center = Center
-workshop = Workshop
-waves.title = Vagues
-waves.remove = Retirer
-waves.never = <jamais>
-waves.every = tous les
-waves.waves = vague(s)
-waves.perspawn = par apparition
-waves.shields = shields/wave
-waves.to = à
-waves.guardian = Guardian
-waves.preview = Prévisualiser
-waves.edit = Modifier...
-waves.copy = Copier dans le Presse-papiers
-waves.load = Coller depuis le Presse-papiers
-waves.invalid = Vagues invalides dans le Presse-papiers.
-waves.copied = Vagues copiées.
-waves.none = Aucun 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...
-editor.name = Nom:
-editor.spawn = Ajouter une unité
-editor.removeunit = Retirer l'unité
-editor.teams = Équipes
-editor.errorload = Erreur lors du chargement du fichier:\n[accent]{0}
-editor.errorsave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
-editor.errorimage = C’est une image, pas une carte.\n\nSi vous souhaitez importer une carte 3.5/build 40, utilisez le bouton "Importer une carte héritée" dans l’éditeur.
-editor.errorlegacy = Cette carte est trop ancienne et utilise un format de carte qui n'est plus pris en charge.
-editor.errornot = Ce n'est pas un fichier de carte.
-editor.errorheader = Ce fichier de carte n'est pas valide ou corrompu.
-editor.errorname = La carte n'a pas de nom !
-editor.update = Mettre à jour
-editor.randomize = Randomiser
-editor.apply = Appliquer
-editor.generate = Générer
-editor.resize = Redimensionner
-editor.loadmap = Charger une carte
-editor.savemap = Sauvegarder une carte
-editor.saved = Sauvegardé !
-editor.save.noname = Votre carte ne possède pas de nom ! Ajouter en un dans le menu 'Infos sur la carte'.
-editor.save.overwrite = Une carte posséde déjà ce nom ! Choisissez un nom différent dans le menu 'Infos sur la carte'.
-editor.import.exists = [scarlet]Importation impossible :[] Une carte nommé '{0}' existe déjà!
-editor.import = Importation...
-editor.importmap = Importer une carte
-editor.importmap.description = Importer une carte déjà existante
-editor.importfile = Importer un fichier
-editor.importfile.description = Importer une carte à partir d'un fichier externe
-editor.importimage = Importer la carte existante
-editor.importimage.description = Importer une image de terrain à partir d'un fichier externe
-editor.export = Exportation en cours...
-editor.exportfile = Exporter un fichier
-editor.exportfile.description = Exporter une carte
-editor.exportimage = Exporter l'image du terrain
-editor.exportimage.description = Exporter la carte sous forme d'image
-editor.loadimage = Importer le terrain
-editor.saveimage = Exportr le terrain
-editor.unsaved = [scarlet] Vous avez des changements non sauvegardés ![] Êtes-vous sûr de vouloir quitter ?
-editor.resizemap = Redimensionner\nla carte
-editor.mapname = Nom de la carte:
-editor.overwrite = [accent]Attention!\nCela écrasera une carte existante.
-editor.overwrite.confirm = [scarlet]Attention ![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir la réécrire?
-editor.exists = A map with this name already exists.
-editor.selectmap = Sélectionnez une carte à charger:
-
-toolmode.replace = Remplacer
-toolmode.replace.description = Dessine uniquement sur des blocs pleins.
-toolmode.replaceall = Remplacer tout
-toolmode.replaceall.description = Remplacez tous les blocs de la carte.
-toolmode.orthogonal = Orthogonale
-toolmode.orthogonal.description = Dessine uniquement des lignes orthogonales.
-toolmode.square = Carré
-toolmode.square.description = Pinceau carré.
-toolmode.eraseores = Effacer les minerais
-toolmode.eraseores.description = N'effacez que les minerais.
-toolmode.fillteams = Remplir les équipes
-toolmode.fillteams.description = Remplissez les équipes au lieu de blocs.
-toolmode.drawteams = Tirage au sort des équipes
-toolmode.drawteams.description = Dessinez des équipes au lieu de blocs.
-
-filters.empty = [lightgray]Aucun filtre! Ajoutez-en un avec les boutons ci-dessous.
-filter.distort = Déformation
-filter.noise = Bruit
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
-filter.corespawn = Core Select
-filter.median = Median
-filter.oremedian = Ore Median
-filter.blend = Mélange
-filter.defaultores = Minerais par défaut
-filter.ore = Minerai
-filter.rivernoise = Bruit des rivières
-filter.mirror = Miroir
-filter.clear = Nettoyer
-filter.option.ignore = Ignorer
-filter.scatter = Dispersement
-filter.terrain = Terrain
-filter.option.scale = Échelle
-filter.option.chance = Chance
-filter.option.mag = Magnitude
-filter.option.threshold = Seuil
-filter.option.circle-scale = Échelle du cercle
-filter.option.octaves = Octaves
-filter.option.falloff = Diminution
-filter.option.angle = Angle
-filter.option.amount = Amount
-filter.option.block = Bloc
-filter.option.floor = Sol
-filter.option.flooronto = Sible au sol
-filter.option.target = Target
-filter.option.wall = Mur
-filter.option.ore = Minerai
-filter.option.floor2 = Sol secondaire
-filter.option.threshold2 = Seuil secondaire
-filter.option.radius = Rayon
-filter.option.percentile = Centile
-
-width = Largeur:
-height = Hauteur:
-menu = Menu
-play = Jouer
-campaign = Campagne
-load = Charger
-save = Sauvegarder
-fps = FPS: {0}
-ping = Ping: {0}ms
-language.restart = Veuillez redémarrez votre jeu pour le changement de langage prenne effet.
-settings = Paramètres
-tutorial = Tutoriel
-tutorial.retake = Re-Take Tutorial
-editor = Éditeur
-mapeditor = Éditeur de carte
-
-abandon = Abandonner
-abandon.text = Cette zone et toutes ses ressources seront perdues.
-locked = Verrouillé
-complete = [lightgray]Compléter:
-requirement.wave = Reach Wave {0} in {1}
-requirement.core = Destroy Enemy Core in {0}
-requirement.research = Research {0}
-requirement.capture = Capture {0}
-bestwave = [lightgray]Meilleur: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
-uncover = Découvrir
-configure = Configurer le transfert des ressources.
-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} Débloquée.
-zone.requirement.complete = Vague {0} atteinte:\n{1} Exigences de la zone complétées
-zone.resources = Ressources détectées:
-zone.objective = [lightgray]Objective: [accent]{0}
-zone.objective.survival = Survive
-zone.objective.attack = Détruire la base ennemi
-add = Ajouter...
-boss.health = Vie du BOSS
-
-connectfail = [crimson]Échec de la connexion au serveur: [accent]{0}
-error.unreachable = Serveur inaccessible.
-error.invalidaddress = Adresse invalide.
-error.timedout = Expiration du délai !\nAssurez-vous que la redirection de port est configurée sur l'hôte et que l'adresse est correcte !
-error.mismatch = Erreur de paquet:\nPossible d'incompatibilité de version client/serveur.\nAssurez-vous que l'hôte et vous disposez de la dernière version de Mindustry !
-error.alreadyconnected = Déjà connecté.
-error.mapnotfound = Fichier de carte introuvable !
-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.
-
-weather.rain.name = Pluie
-weather.snow.name = Neige
-weather.sandstorm.name = Tempête de sable
-weather.sporestorm.name = Tempête de spores
-weather.fog.name = Brouillard
-
-sectors.unexplored = [lightgray] Inexploré
-sectors.resources = Resources:
-sectors.production = Production:
-sectors.stored = Stored:
-sectors.resume = Resume
-sectors.launch = Launch
-sectors.select = Select
-sectors.nonelaunch = [lightgray]none (sun)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Ressources du noyau insuffisantes
-
-planet.serpulo.name = Serpulo
-planet.sun.name = Soleil
-
-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
-settings.reset = Valeur par défaut.
-settings.rebind = Réatttribuer
-settings.resetKey = Reset
-settings.controls = Contrôles
-settings.game = Jeu
-settings.sound = Son
-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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
-paused = En pause
-clear = Clear
-banned = [scarlet]Banned
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
-yes = Oui
-no = Non
-info.title = Info
-error.title = [crimson]Une erreur s'est produite
-error.crashtitle = Une erreur s'est produite
-unit.nobuild = [scarlet]Unit can't build
-lastaccessed = [lightgray]Last Accessed: {0}
-block.unknown = [lightgray]Inconnu
-
-stat.input = Ressource(s) requise(s)
-stat.output = Ressource(s) produite(s)
-stat.booster = Booster
-stat.tiles = Required Tiles
-stat.affinities = Affinities
-stat.powercapacity = Capacité d'énergie
-stat.powershot = Énergie/Tir
-stat.damage = Damage
-stat.targetsair = Cible les unités aériennes
-stat.targetsground = Cible les unités terrestres
-stat.itemsmoved = Vitesse de déplacement
-stat.launchtime = Temps entre chaque lancement
-stat.shootrange = Portée
-stat.size = Taille
-stat.displaysize = Display Size
-stat.liquidcapacity = Capacité en liquide
-stat.powerrange = Distance de transmission
-stat.linkrange = Link Range
-stat.instructions = Instructions
-stat.powerconnections = Max Connections
-stat.poweruse = Énergie utilisée
-stat.powerdamage = Énergie/Dégâts
-stat.itemcapacity = Stockage
-stat.memorycapacity = Memory Capacity
-stat.basepowergeneration = Production d'énergie de base
-stat.productiontime = Temps de production
-stat.repairtime = Temps pour la réparation totale du bloc
-stat.speedincrease = Augmentation de la vitesse
-stat.range = Portée
-stat.drilltier = Forable
-stat.drillspeed = Vitesse de forage de base
-stat.boosteffect = Effet boostant
-stat.maxunits = Maximum d'unitée active
-stat.health = Santé
-stat.buildtime = Temps de construction
-stat.maxconsecutive = Max Consecutive
-stat.buildcost = Coût de construction
-stat.inaccuracy = Précision
-stat.shots = Tirs
-stat.reload = Tirs/Seconde
-stat.ammo = Munition
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
-
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
-
-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}%
-bar.powerbalance = Énergie: {0}
-bar.powerstored = Stored: {0}/{1}
-bar.poweramount = Énergie: {0}
-bar.poweroutput = Énergie en sortie: {0}
-bar.powerlines = Connections: {0}/{1}
-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.input = Input
-bar.output = Output
-
-units.processorcontrol = [lightgray]Processor Controlled
-
-bullet.damage = [stat]{0}[lightgray] dégats
-bullet.splashdamage = [stat]{0}[lightgray] dgt zone ~[stat] {1}[lightgray] tuiles
-bullet.incendiary = [stat]incendiaire
-bullet.homing = [stat]autoguidage
-bullet.shock = [stat]choc
-bullet.frag = [stat]frag
-bullet.knockback = [stat]{0}[lightgray]recul
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]gel
-bullet.tarred = [stat]goudronné
-bullet.multiplier = [stat]{0}[lightgray]x multiplicateur de munitions
-bullet.reload = [stat]{0}[lightgray]x vitesse de rechargement
-
-unit.blocks = Blocs
-unit.blockssquared = blocks²
-unit.powersecond = Énergie/seconde
-unit.liquidsecond = Liquides/seconde
-unit.itemssecond = Objets/seconde
-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
-category.items = Objets
-category.crafting = Fabrication
-category.function = Function
-category.optional = Améliorations facultatives
-setting.landscape.name = Verrouiller la rotation en mode paysage
-setting.shadows.name = Ombres
-setting.blockreplace.name = Automatic Block Suggestions
-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.animatedwater.name = Eau animée
-setting.animatedshields.name = Boucliers Animés
-setting.antialias.name = Antialias[lightgray] (demande le redémarrage de l'appareil)[]
-setting.playerindicators.name = Player Indicators
-setting.indicators.name = Indicateurs d'alliés
-setting.autotarget.name = Visée automatique
-setting.keyboard.name = Contrôles Souris + Clavier
-setting.touchscreen.name = Touchscreen Controls
-setting.fpscap.name = Max FPS
-setting.fpscap.none = Vide
-setting.fpscap.text = {0} FPS
-setting.uiscale.name = Mise à l'échelle de l'interface[lightgray] (nécessite un redémarrage)[]
-setting.swapdiagonal.name = Autoriser le placement des blocs en diagonal
-setting.difficulty.training = Entraînement
-setting.difficulty.easy = Facile
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Difficile
-setting.difficulty.insane = Êxtreme
-setting.difficulty.name = Difficulté:
-setting.screenshake.name = Tremblement d'écran
-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.sensitivity.name = Contôle de la sensibilité
-setting.saveinterval.name = Intervalle des sauvegardes auto
-setting.seconds = {0} Secondes
-setting.blockselecttimeout.name = Block Select Timeout
-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.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
-setting.mutesound.name = Couper les SFX
-setting.crashreport.name = Envoyer des rapports d'incident anonymement.
-setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
-setting.playerlimit.name = Player Limit
-setting.chatopacity.name = Opacité du tchat
-setting.lasersopacity.name = Power Laser Opacity
-setting.bridgeopacity.name = Bridge Opacity
-setting.playerchat.name = Afficher le tchat en jeu
-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 = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer cette échelle.\n[scarlet]Revenir et sortir en[accent] {0}[] réglages...
-uiscale.cancel = Annuler et quitter
-setting.bloom.name = Flou lumineux
-keybind.title = Paramétrer les touches
-keybinds.mobile = [scarlet]La plupart des raccourcis clavier ne sont pas fonctionnelles sur les appareils mobiles. Seul le mouvement de base est pris en charge.
-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...
-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 = Mouvement X
-keybind.move_y.name = Mouvement 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 = Basculer en plein écran
-keybind.select.name = Sélectionner/Tirer
-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
-keybind.pause.name = Pause
-keybind.pause_building.name = Pause/Resume Building
-keybind.minimap.name = Mini-Map
-keybind.chat.name = Tchat
-keybind.player_list.name = Liste des joueurs
-keybind.console.name = Console
-keybind.rotate.name = Tourner
-keybind.rotateplaced.name = Rotate Existing (Hold)
-keybind.toggle_menus.name = Montrer/Cacher les menus
-keybind.chat_history_prev.name = Reculer dans l'historique du tchat
-keybind.chat_history_next.name = Suite de l'historique du tchat
-keybind.chat_scroll.name = Faire défiler le tchat
-keybind.drop_unit.name = Larguer une unité
-keybind.zoom_minimap.name = Zoomer la minimap
-mode.help.title = Description des modes de jeu
-mode.survival.name = Survival
-mode.survival.description = Le mode normal. Ressources limitées et vagues automatiques.
-mode.sandbox.name = Bac à sable
-mode.sandbox.description = Ressources infinies et pas de compte à rebours pour les vagues.
-mode.editor.name = Editor
-mode.pvp.name = PvP
-mode.pvp.description = Lutter contre d'autres joueurs pour gagner !
-mode.attack.name = Attaque
-mode.attack.description = Pas de vagues, le but est de détruire la base ennemie.
-mode.custom = Règles personnalisées
-
-rules.infiniteresources = Ressources infinies
-rules.reactorexplosions = Reactor Explosions
-rules.schematic = Schematics Allowed
-rules.wavetimer = Temps de vague
-rules.waves = Vague
-rules.attack = Mode attaque
-rules.buildai = AI Building
-rules.enemyCheat = Ressources infinies pour l'IA
-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.unitdamagemultiplier = Multiplicateur de dégât des unités
-rules.enemycorebuildradius = Rayon de non-construction autour de la base ennemi:[lightgray] (tuiles)
-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.unitammo = Units Require Ammo
-rules.title.waves = Vagues
-rules.title.resourcesbuilding = Ressources & Bâtiment
-rules.title.enemy = Ennemis
-rules.title.unit = Unités
-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.weather = Weather
-rules.weather.frequency = Frequency:
-rules.weather.duration = Duration:
-
-content.item.name = Objets
-content.liquid.name = Liquides
-content.unit.name = Unités
-content.block.name = Blocs
-
-item.copper.name = Cuivre
-item.lead.name = Plomb
-item.coal.name = Charbon
-item.graphite.name = Graphite
-item.titanium.name = Titane
-item.thorium.name = Thorium
-item.silicon.name = Silicium
-item.plastanium.name = Plastanium
-item.phase-fabric.name = Phase Fabric
-item.surge-alloy.name = Alliage superchargé
-item.spore-pod.name = Bulbe sporifère 
-item.sand.name = Sable
-item.blast-compound.name = Mélange explosif
-item.pyratite.name = Pyratite
-item.metaglass.name = Métaverre
-item.scrap.name = Ferraille
-liquid.water.name = Eau
-liquid.slag.name = Scorie
-liquid.oil.name = Pétrole
-liquid.cryofluid.name = Liquide Cryogénique
-
-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 = Point de rechargement
-block.parallax.name = Parallax
-block.cliff.name = Falaise
-block.sand-boulder.name = Sable rocheux
-block.grass.name = Herbe
-block.slag.name = Scories
-block.space.name = Space
-block.salt.name = Sel
-block.salt-wall.name = Mur de sel
-block.pebbles.name = Cailloux
-block.tendrils.name = Vrilles
-block.sand-wall.name = Mur de sable
-block.spore-pine.name = Pin sporifère
-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.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
-block.scrap-wall-gigantic.name = Gigantesque mur de ferraille
-block.thruster.name = Propulseur
-block.kiln.name = Four
-block.graphite-press.name = Presse à graphite
-block.multi-press.name = Multi-Presse
-block.constructing = {0}\n[lightgray](En construction)
-block.spawn.name = Générateur d'ennemis
-block.core-shard.name = Core: Shard
-block.core-foundation.name = Core: Fondation
-block.core-nucleus.name = Core: Nucleus
-block.deepwater.name = Eau profonde
-block.water.name = Eau
-block.tainted-water.name = Eau contaminée
-block.darksand-tainted-water.name = Eau contaminée par le sable noir
-block.tar.name = Pétrole
-block.stone.name = Pierre
-block.sand.name = Sable
-block.darksand.name = Sable noire
-block.ice.name = Glace
-block.snow.name = Neige
-block.craters.name = Cratères
-block.sand-water.name = Eau (sable)
-block.darksand-water.name = Eau (sable noir)
-block.char.name = Carboniser
-block.dacite.name = Dacite
-block.dacite-wall.name = Dacite Wall
-block.dacite-boulder.name = Dacite Boulder
-block.ice-snow.name = Neige glacée
-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
-block.metal-floor.name = Sol métallique
-block.metal-floor-2.name = Sol métallique 2
-block.metal-floor-3.name = Sol métallique 3
-block.metal-floor-5.name = Sol métallique 5
-block.metal-floor-damaged.name = Sol métallique endommagé
-block.dark-panel-1.name = Panneau noir 1
-block.dark-panel-2.name = Panneau noir 2
-block.dark-panel-3.name = Panneau noir 3
-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.basalt.name = Basalt
-block.hotrock.name = Roche chaude
-block.magmarock.name = Roche de magma
-block.copper-wall.name = Mur de cuivre
-block.copper-wall-large.name = Grand mur de cuivre
-block.titanium-wall.name = Mur de titane
-block.titanium-wall-large.name = Grand mur de titane
-block.plastanium-wall.name = Plastanium Wall
-block.plastanium-wall-large.name = Large Plastanium Wall
-block.phase-wall.name = Mur phasé
-block.phase-wall-large.name = Grand mur phasé
-block.thorium-wall.name = Mur en thorium
-block.thorium-wall-large.name = Grand mur en thorium
-block.door.name = Porte
-block.door-large.name = Grande porte
-block.duo.name = Duo
-block.scorch.name = Brûleur
-block.scatter.name = Disperseur
-block.hail.name = Grêle
-block.lancer.name = Lancier
-block.conveyor.name = Convoyeur
-block.titanium-conveyor.name = Convoyeur en titane
-block.plastanium-conveyor.name = Convoyeur en plastanium
-block.armored-conveyor.name = Convoyeur cuirassé
-block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
-block.junction.name = Jonction
-block.router.name = Routeur
-block.distributor.name = [accent]Distributeur[]
-block.sorter.name = Trieur
-block.inverted-sorter.name = Trieur inversé
-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 = Barrière de Débordement
-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.cryofluid-mixer.name = Refroidisseur
-block.melter.name = Four à Fusion
-block.incinerator.name = Incinérateur
-block.spore-press.name = Presse à spores
-block.separator.name = Séparateur
-block.coal-centrifuge.name = Centrifugeuse à charbon
-block.power-node.name = Transmetteur énergétique
-block.power-node-large.name = Grand transmetteur énergétique
-block.surge-tower.name = Tour de surtension
-block.diode.name = Diode de batterie
-block.battery.name = Batterie
-block.battery-large.name = Grande batterie
-block.combustion-generator.name = Générateur à combustion
-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
-block.pneumatic-drill.name = Foreuse à vérins
-block.laser-drill.name = Foreuse Laser
-block.water-extractor.name = Extracteur d'eau
-block.cultivator.name = Cultivateur
-block.conduit.name = Conduit
-block.mechanical-pump.name = Pompe Mécanique
-block.item-source.name = Source d'objets
-block.item-void.name = Destructeur d'objets
-block.liquid-source.name = Source de liquide
-block.liquid-void.name = Vaporisateur
-block.power-void.name = Absorbeur énergétique
-block.power-source.name = Puissance infinie
-block.unloader.name = Déchargeur
-block.vault.name = Coffre-Fort
-block.wave.name = Vague
-block.tsunami.name = Tsunami
-block.swarmer.name = Essaim
-block.salvo.name = Salve
-block.ripple.name = Percussion
-block.phase-conveyor.name = Convoyeur phasé
-block.bridge-conveyor.name = Pont
-block.plastanium-compressor.name = Compresseur de plastanium
-block.pyratite-mixer.name = Mixeur à pyratite
-block.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.repair-point.name = Point de Réparation
-block.pulse-conduit.name = Conduit à Impulsion
-block.plated-conduit.name = Plated Conduit
-block.phase-conduit.name = Conduit à Phase
-block.liquid-router.name = Routeur de Liquide
-block.liquid-tank.name = Réservoir de Liquide
-block.liquid-junction.name = Jonction à Liquide
-block.bridge-conduit.name = Pont à liquide
-block.rotary-pump.name = Pompe Rotative
-block.thorium-reactor.name = Réacteur à Thorium
-block.mass-driver.name = Transporteur de masse
-block.blast-drill.name = Foreuse à explosion
-block.thermal-pump.name = Pompe thermique
-block.thermal-generator.name = Générateur thermique
-block.alloy-smelter.name = Fonderie d'alliage superchargé
-block.mender.name = Gardien
-block.mend-projector.name = Projecteur soignant
-block.surge-wall.name = Mur superchargé
-block.surge-wall-large.name = Grand mur superchargé
-block.cyclone.name = Cyclone
-block.fuse.name = Fuse
-block.shock-mine.name = Mines terrestre
-block.overdrive-projector.name = Projecteur accélérant
-block.force-projector.name = Projecteur de champ de force
-block.arc.name = Arc
-block.rtg-generator.name = G.T.R.
-block.spectre.name = Spectre
-block.meltdown.name = Meltdown
-block.foreshadow.name = Foreshadow
-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
-block.memory-bank.name = Memory Bank
-
-team.blue.name = Bleu
-team.crux.name = red
-team.sharded.name = orange
-team.orange.name = Orange
-team.derelict.name = derelict
-team.green.name = Vert
-team.purple.name = Violet
-
-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
-tutorial.drill = Le minage manuel est inefficace.\n[accent]Des foreuses[]peuvent miner automatiquement.\nPlacez-en une sur un filon de cuivre.
-tutorial.drill.mobile = Le minage manuel est inefficace.\n[accent]Des foreuses[]peuvent miner automatiquement.\nAppuyez sur l'onglet de forage en bas à droite.\nSélectionnez la[accent] perceuse mécanique[].\nPlacez-la sur une veine de cuivre, puis appuyez sur la[accent] coche(V)[] ci-dessous pour confirmer votre sélection.\nAppuyez sur le [accent] bouton X[]pour annuler le placement.
-tutorial.blockinfo = Chaque bloc a des statistiques différentes. Chaque foreuse ne peut extraire que certains minerais.\nPour vérifier les informations et les statistiques d'un bloc,[accent] tapez sur le "?" tout en le sélectionnant dans le menu de compilation.[]\n\n[accent]Accédez aux statistiques de la foreuse mécanique maintenant.[]
-tutorial.conveyor = [accent]Convoyeurs[] sont utilisés pour transporter des articles à la base.\nFaire une ligne de convoyeurs de la foreuse à la base.\n[accent]Maintenez le clique droit de la souris pour placer dans une ligne.[]\nMaintenir[accent] CTRL[] en sélectionnant une ligne à placer en diagonale.\n\n[accent]Placez 2 convoyeurs avec l'outil ligne, puis livrez un article dans la base.
-tutorial.conveyor.mobile = [accent]Convoyeurs[] sont utilisés pour transporter des articles à la base.\nFaire une ligne de convoyeurs de la foreuse à la base.\n[accent] Placez dans une ligne en maintenant votre doigt appuyé pendant quelques secondes[] et en le faisant glisser dans une direction.\n\n[accent]Placez 2 convoyeurs avec l'outil ligne, puis livrez un article dans la base.
-tutorial.turret = Des constructions défensives doivent être construites pour repousser [lightgray]les ennemis[].Construisez une tourelle "duo" près de votre base.
-tutorial.drillturret = Les tourelles "Duo" ont besoin de [accent]munitions en cuivre[] pour tirer.\nPlacez une foreuse à côté de la tourelle pour l'approvisionner avec du cuivre.
-tutorial.pause = Pendant le combat, vous pouvez[accent] mettre le jeu en pause.[]\nVous pouvez construire des bâtiments pendant que le jeu est en pause.\n\n[accent]Appuyez sur espace pour mettre le jeu en pause.
-tutorial.pause.mobile = Pendant le combat, vous pouvez[accent] mettre le jeu en pause.[]\nVous pouvez construire des bâtiments pendant que le jeu est en pause.\n\n[accent]Appuyez sur le bouton en haut à gauche pour mettre le jeu en pause.
-tutorial.unpause = Appuyez de nouveau sur espace pour reprendre le cour du jeu
-tutorial.unpause.mobile = Appuyez de nouveau sur cette touche pour reprendre le cour du jeu
-tutorial.breaking = Les blocs doivent souvent être détruits.\n[accent]Maintenez le bouton droit de la souris enfoncé.[] pour détruire tous les blocs sélectionnés.[]\n\n[accent]Détruisez tous les blocs de ferraille à gauche de votre base à l'aide de la sélection de zone.
-tutorial.breaking.mobile = Les blocs doivent souvent être détruits.\n[accent]Sélectionnez le mode de déconstruction[], puis appuyez sur un bloc pour commencer à le casser.\nDétruisez une zone en maintenant votre doigt enfoncé pendant quelques secondes[] et glisser dans une direction.\nAppuyez sur la coche(V) pour confirmer.\n\n[accent]Détruisez tous les blocs de ferraille à gauche de votre base à l'aide de la sélection de zone.
-tutorial.withdraw = Dans certaines situations, il est nécessaire de prendre des articles directement des blocs..\nPour faire ça, [accent]tapez sur un bloc[] avec des articles à l'intérieur, alors [accent]appuyez sur l'élément[] dans l'inventaire.\nPlusieurs éléments peuvent être retirés en [accent]tapotant et en maintenant enfoncée la touche[].\n\n[accent]Retirez un peu de cuivre de votre base.[]
-tutorial.deposit = Déposez les éléments dans des blocs en les faisant glisser de votre vaisseau vers un module de stockage.\n\n[accent]Déposez votre cuivre dans la base.[]
-tutorial.waves = Les [lightgray]ennemies[] approchent.\n\nDéfendez votre base durant 2 vagues.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
-tutorial.waves.mobile = [lightgray]Les ennemies approchent[].\n\nDéfendez votre base durant 2 vagues. Votre vaisseau tirera automatiquement sur les ennemis.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
-tutorial.launch = Une fois que vous atteignez une vague spécifique, vous êtes en mesure de[accent] lancer votre base[], laissant vos défenses derrière vous et[accent] en obtenant toutes les ressources de votre base.[]\nCes ressources peuvent ensuite servir à la recherche de nouvelles technologies.\n\n[accent]Appuyez sur le bouton de lancement.
-
-item.copper.description = Un matériau de construction utile. Utilisé intensivement dans tout les blocs.
-item.lead.description = Un matériau de départ. Utilisé intensivement en électronique et pour le transport de blocs.
-item.metaglass.description = Un composé de verre très résistant. Utilisation intensive pour la distribution et le stockage de liquides.
-item.graphite.description = Carbone minéralisé, utilisé pour les munitions et l’isolation électrique.
-item.sand.description = Un matériau commun utilisé largement dans la fonte, à la fois dans l'alliage et comme un flux.
-item.coal.description = Un carburant commun et facile à obtenir.
-item.titanium.description = Un métal rare super-léger largement utilisé dans le transport de liquides et d'objets ainsi que dans les foreuses de haut-niveau et l'aviation
-item.thorium.description = Un métal dense, et radioactif utilisé comme support structurel et comme carburant nucléaire.
-item.scrap.description = Restes de vieilles structures et unités. Contient des traces de nombreux métaux différents.
-item.silicon.description = Un matériau semi-conducteur extrêmement utile, avec des utilisations dans les panneaux solaires et beaucoup d'autre composants électroniques complexes.
-item.plastanium.description = Un matériau léger et docile utilisé dans l'aviation avancée et dans les munitions à fragmentation.
-item.phase-fabric.description = Une substance presque en apesanteur utilisée dans l'électronique de pointe et la technologie autoréparable.
-item.surge-alloy.description = Un alliage avancé aux propriétés électriques uniques.
-item.spore-pod.description = Utilisé pour l'obtention d'huile, d'explosifs et de carburants
-item.blast-compound.description = Un composé volatile utilisé dans les bombes et les explosifs. Bien qu'il puisse être utilisé comme carburant, ce n'est pas conseillé.
-item.pyratite.description = Une substance extrêmement inflammable utilisée dans les armes incendiaires.
-liquid.water.description = Couramment utilisé pour les machines de refroidissement et le traitement des déchets.
-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.
-
-block.message.description = Stores a message. Used for communication between allies.
-block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite.
-block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
-block.silicon-smelter.description = Réduit le sable avec du coke* très pur afin de produire du silicium. (*Coke produit à partir de charbon:REF)
-block.kiln.description = Fait fondre le sable et le plomb en métaverre. Nécessite de petites quantités d'énergie.
-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.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.
-block.separator.description = Exposer la pierre à la pression de l'eau afin d'obtenir différents minéraux contenus dans la pierre.
-block.spore-press.description = Comprime les gousses de spores en huile.
-block.pulverizer.description = Brise la pierre en sable. Utile en cas de manque de sable naturel.
-block.coal-centrifuge.description = Solidifie le pétrole en morceaux de charbon.
-block.incinerator.description = Se débarrasse de tout article ou liquide en excès.
-block.power-void.description = Annule toute l'énergie qui y est introduite. Bac à sable seulement.
-block.power-source.description = Débit infini d'énergie. Bac à sable seulement.
-block.item-source.description = Sort infiniment les articles. Bac à sable seulement.
-block.item-void.description = Détruit tous les objets qui y entrent sans utiliser d'énergie. Bac à sable seulement.
-block.liquid-source.description = Débit infini de liquides. Bac à sable seulement.
-block.liquid-void.description = Removes any liquids. Sandbox only.
-block.copper-wall.description = Un bloc défensif bon marché.\nUtile pour protéger le noyau et les tourelles lors des premières vagues.
-block.copper-wall-large.description = Un bloc défensif bon marché.\nUtile pour protéger le noyau et les tourelles lors des premières vagues.\nS'étend sur plusieurs tuiles.
-block.titanium-wall.description = Un bloc défensif modérément fort.\nFournit une protection modérée contre les ennemis.
-block.titanium-wall-large.description = Un bloc défensif modérément fort.\nFournit une protection modérée contre les ennemis.\nS'étend sur plusieurs tuiles.
-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 = Un puissant bloc défensif.\nBonne protection contre les ennemis.
-block.thorium-wall-large.description = Un puissant bloc défensif.\nBonne protection contre les ennemis.\nS'étend sur plusieurs tuiles.
-block.phase-wall.description = Pas aussi fort qu'un mur de thorium, mais détournera les balles à moins qu'elles ne soient trop puissantes.
-block.phase-wall-large.description = Pas aussi fort qu'un mur de thorium, mais détournera les balles à moins qu'elles ne soient trop puissantes.\nS'étend sur plusieurs tuiles.
-block.surge-wall.description = Le bloc défensif le plus puissant.\nPeu de chances de déclencher des éclairs en direction de l'attaquant.
-block.surge-wall-large.description = Le bloc défensif le plus puissant.\nPeu de chances de déclencher des éclairs en direction de l'attaquant.\nS'étend sur plusieurs tuiles.
-block.door.description = Une petite porte qui peut être ouverte et fermée en cliquant dessus.\nSi elle est ouverte, les ennemis peuvent tirer et se déplacer.
-block.door-large.description = Une grande porte qui peut être ouverte et fermée en cliquant dessus.\nSi elle est ouverte, les ennemis peuvent tirer et se déplacer.\nS'étend sur plusieurs tuiles.
-block.mender.description = Répare périodiquement des blocs à proximité. Garder les défenses réparées entre les vagues.\nUtilise éventuellement du silicium pour augmenter la portée et l'efficacité.
-block.mend-projector.description = Guérit périodiquement les bâtiments situés à proximité.
-block.overdrive-projector.description = Augmente la vitesse des bâtiments à proximité, comme les foreuses et les convoyeurs.
-block.force-projector.description = Crée un champ de force hexagonal autour de lui-même, protégeant les bâtiments et les unités internes des dommages causés par les balles.
-block.shock-mine.description = Endommage les ennemis qui marchent sur la mine. Presque invisible à l'ennemi.
-block.conveyor.description = Bloc de transport d'articles standard.\nDéplace les objets et les déposes automatiquement dans des tourelles ou des usines. Rotatif.
-block.titanium-conveyor.description = Bloc de transport d'articles avancé.\nDéplace les articles plus rapidement que les convoyeurs standard.
-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 = Agit comme un pont pour deux bandes transporteuses qui se croisent.\nUtile dans les situations avec deux convoyeurs différents transportant des matériaux différents à des endroits différents.
-block.bridge-conveyor.description = Bloc de transport d'articles avancé. Permet de transporter des objets sur plus de 3 tuiles de n'importe quel terrain ou bâtiment.
-block.phase-conveyor.description = Bloc de transport d'articles avancé.\nUtilise le pouvoir de téléporter des articles vers un convoyeur de phase connecté sur plusieurs carreaux.
-block.sorter.description = Trie les articles. Si un article correspond à la sélection, il peut passer. Autrement, l'article est distribué vers la gauche ou la droite.
-block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
-block.router.description = Accepte les éléments d'une direction et les envoie dans 3 autres directions de manière égale. Utile pour séparer les matériaux d'une source en plusieurs cibles.
-block.distributor.description = Un routeur avancé qui divise les articles en 7 autres directions de manière égale. [scarlet]Seule et unique ![]
-block.overflow-gate.description = C'est la combinaison entre un routeur et un diviseur qui peut seulement distribuer à gauche et à droite si le chemin de devant est bloqué.
-block.underflow-gate.description = Le contraire d'une barrière de débordement.\nEnvoie les ressources vers l'avant si les chemins de gauche et de droite sont bloqués.
-block.mass-driver.description = Bloc de transport d'articles ultime.\nRecueille plusieurs objets et les envoie ensuite à un autre pilote de masse sur une longue distance.
-block.mechanical-pump.description = Une pompe bon marché avec un débit lent, mais aucune consommation d'énergie.
-block.rotary-pump.description = Une pompe avancée qui double la vitesse en utilisant l’énergie.
-block.thermal-pump.description = La pompe ultime. Trois fois plus rapide qu'une pompe mécanique et la seule pompe capable de récupérer de la lave.
-block.conduit.description = Bloc de transport liquide de base. Fonctionne comme un convoyeur, mais avec des liquides. Utilisation optimale avec des extracteurs, des pompes ou d’autres conduits.
-block.pulse-conduit.description = Bloc de transport de liquide avancé. Transporte les liquides plus rapidement et stocke plus que des conduits standard.
-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 = Accepte les liquides d'une direction et les envoie dans 3 autres directions de manière égale. Peut également stocker une certaine quantité de liquide. Utile pour séparer les liquides d'une source à plusieurs cibles.
-block.liquid-tank.description = Stocke une grande quantité de liquides. Utilisez-le pour créer des tampons en cas de demande non constante de matériaux ou comme protection pour le refroidissement des blocs vitaux.
-block.liquid-junction.description = Agit comme un pont pour deux conduits de croisement. Utile dans les situations avec deux conduits différents transportant des liquides différents à des endroits différents.
-block.bridge-conduit.description = Bloc de transport de liquide avancé. Permet de transporter des liquides jusqu'à 3 tuiles de n'importe quel terrain ou bâtiment.
-block.phase-conduit.description = Bloc de transport de liquide avancé. Utilise le pouvoir de téléporter des liquides vers un conduit de phase connecté sur plusieurs carreaux.
-block.power-node.description = Transmet la puissance à des noeuds connectés. Il est possible de connecter jusqu'à quatre sources d'alimentation, puits ou nœuds.\nLe nœud recevra de l’alimentation ou fournira l’alimentation à tous les blocs adjacents.
-block.power-node-large.description = Son rayon d'action est supérieur à celui du nœud d'alimentation et peut être connecté à six sources d'alimentation, puits ou nœuds au maximum.
-block.surge-tower.description = Un nœud d'alimentation extrêmement longue portée avec moins de connexions disponibles.
-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 = Stocke l’énergie chaque fois qu’il ya abondance et en cas de pénurie, tant qu’il reste de la capacité.
-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.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.
-block.solar-panel-large.description = Fournit une bien meilleure alimentation qu'un panneau solaire standard, mais coûte également beaucoup plus cher à construire.
-block.thorium-reactor.description = Génère d'énormes quantités d'énergie à partir de thorium hautement radioactif. Nécessite un refroidissement constant.\nExplose violemment si des quantités insuffisantes de liquide de refroidissement ne sont pas fournies.
-block.impact-reactor.description = Un groupe électrogène avancé, capable de générer d’énormes quantités d’énergie avec une efficacité maximale.\nNécessite une entrée de puissance significative pour relancer le processus.
-block.mechanical-drill.description = Un extracteur bon marché. Lorsqu'il est placé sur des carreaux appropriés, les objets sortent à un rythme lent et indéfiniment.
-block.pneumatic-drill.description = Un extracteur améliorée, plus rapide et capable de traiter des matériaux plus durs en utilisant la pression atmosphérique.
-block.laser-drill.description = Permet de forer encore plus rapidement grâce à la technologie laser, mais nécessite de l'énergie. De plus, le thorium radioactif peut être récupéré avec cet extracteur.
-block.blast-drill.description = L'extracteur ultime. Nécessite de grandes quantités d'énergie.
-block.water-extractor.description = Extrait l'eau du sol. Utilisez-le quand il n'y a pas de lac à proximité.
-block.cultivator.description = Cultiver le sol avec de l'eau afin d'obtenir du biomatter.
-block.oil-extractor.description = Utilise de grandes quantités d'énergie pour extraire le pétrole du sable. Utilisez-le lorsqu'il n'y a pas de source directe de pétrole à proximité.
-block.core-shard.description = La première version de la base centrale. Une fois détruit, tout contact avec la région est perdu. Ne laissez pas cela arriver.
-block.core-foundation.description = La deuxième version de la base centrale. Mieux blindé. Stocke plus de ressources.
-block.core-nucleus.description = La troisième et dernière version de la base centrale. Extrêmement bien blindé. Stocke des quantités massives de ressources.
-block.vault.description = Stocke une grande quantité d'objets. Utilisez-le pour créer des tampons lorsqu'il existe une demande non constante de matériaux. [lightgray]Un déchargeur[] peut être utilisé pour récupérer des éléments du coffre-fort.
-block.container.description = Stocke une petite quantité d'objets. Utilisez-le pour créer des tampons lorsqu'il existe une demande non constante de matériaux. [lightgray]Un déchargeur[] peut être utilisé pour récupérer des éléments du conteneur.
-block.unloader.description = Décharge des articles d'un conteneur, d'une chambre forte ou d'un noyau sur un convoyeur ou directement dans un bloc adjacent.\nLe type d'élément à décharger peut être modifié en tapotant sur le déchargeur.
-block.launch-pad.description = Lance des lots d'articles sans qu'il soit nécessaire de procéder à un lancement de base. Inachevé.
-block.launch-pad-large.description = Une version améliorée de la rampe de lancement. Stocke plus d'articles. Lancements plus fréquemment.
-block.duo.description = Une petite tourelle pas chère.
-block.scatter.description = Une tourelle anti-air de taille moyenne. Pulvérise des amas de plomb ou de ferraille sur les unités ennemies.
-block.scorch.description = Brûle les ennemis au sol les plus proches. Très efficace à courte portée.
-block.hail.description = Une petite tourelle d'artillerie.
-block.wave.description = Une tourelle de taille moyenne à tir rapide qui tire des bulles de liquide.
-block.lancer.description = Une tourelle de taille moyenne qui tire des faisceaux d’électricité chargés.
-block.arc.description = Une petite tourelle qui tire de l'électricité dans un arc au hasard vers l'ennemi.
-block.swarmer.description = Une tourelle de taille moyenne qui tire des missiles éclatés.
-block.salvo.description = Une tourelle de taille moyenne qui tire des coups de salves.
-block.fuse.description = Une grande tourelle qui tire de puissants faisceaux à courte portée.
-block.ripple.description = Une grande tourelle d'artillerie qui tire plusieurs coups simultanément.
-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.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 200f3e1530..76cc0bd15d 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1,1001 +1,1508 @@
-#Fordította: Vajda Simon
-credits.text = Created by [royal]Anuken[] - [sky]anukendev@gmail.com[]
-credits = Credits
-contributors = Fordítok és készítők
+credits.text = Készítette: [royal]Anuken[] – [sky]anukendev@gmail.com[]
+credits = Készítők
+contributors = Közreműködők és fordítók
 discord = Csatlakozz a Mindustry Discord szerverhez!
-link.discord.description = Az eredeti Mindustry Discord chatszoba
-link.reddit.description =  A Mindustry subreddit
+link.discord.description = Az eredeti Mindustry Discord csevegőszoba
+link.reddit.description = A Mindustry subreddit
 link.github.description = A játék forráskódja
 link.changelog.description = Frissítési változások listája
-link.dev-builds.description = Instabil fejlesztői build-ek
+link.dev-builds.description = Instabil fejlesztői összeállítások
 link.trello.description = Hivatalos Trello tábla a tervezett funkcióknak
-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.itch.io.description = itch.io oldal PC-s letöltésekkel
+link.google-play.description = Listázás a Google Play áruházban
+link.f-droid.description = Listázás az F-Droidon
 link.wiki.description = Hivatalos Mindustry wiki
 link.suggestions.description = Új funkciók ajánlása
-link.bug.description = Találtál egyett? Jelentsd itt
-linkfail = Nem sikerült megnyitni a linket!\nAz URL a vágólapra lett másolva.
+link.bug.description = Találtál egy szoftverhibát? Itt jelentheted
+linkopen = Ez a kiszolgáló egy hivatkozást küldött. Biztosan megnyitod?\nAkár kártékony is lehet!\n\n[sky]{0}
+linkfail = Nem sikerült megnyitni a hivatkozást!\nA webcím 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.
-gameover = Játék vége
-gameover.disconnect = Kapcsolat bontása
-gameover.pvp = A[accent] {0}[] csapat nyert!
-gameover.waiting = [accent]Várakozás a következő mapra...
+screenshot.invalid = A pálya túl nagy és nem áll rendelkezésre elegendő memória a képernyőkép elkészítéséhez.
+gameover = A játéknak vége
+gameover.disconnect = A kapcsolat megszakadt
+gameover.pvp = A(z)[accent] {0}[] csapat nyert!
+gameover.waiting = [accent]Várakozás a következő pályára…
 highscore = [accent]Új rekord!
 copied = Másolva.
-indev.notready = A játéknak ez a része még nincsen kész
-indev.campaign = [accent]Gratulálunk! Elérte a kampány végét! []\n\nEz a tartalom mostanáig terjedt. A bolygóközi utazás a jövőbeli frissítésekben szerepel.
+indev.notready = A játéknak ez a része még nincs kész
 
 load.sound = Hangok
-load.map = Mapok
+load.map = Pályák
 load.image = Képek
 load.content = Tartalom
 load.system = Rendszer
 load.mod = Modok
-load.scripts = Szkriptek
+load.scripts = Parancsfájlok
 
-be.update = Új Bleeding Edge épület áll rendelkezésre:
-be.update.confirm = Letölti és újra indítja?
-be.updating = Frissítés...
-be.ignore = Mellőzés
-be.noupdates = Nem találtunk frissítést.
-be.check = Frissítések keresése.
+be.update = Új Bleeding Edge verzió áll rendelkezésre:
+be.update.confirm = Letöltöd és frissíted a játékot?\n\nAmint kész a frissítés, a játék automatikusan újraindul.
+be.updating = Frissítés…
+be.ignore = Most nem
+be.noupdates = Nem található frissítés.
+be.check = Frissítések keresése
 
-mod.featured.dialog.title = Mod kereső (WIP)
+mods.browser = Modböngésző
 mods.browser.selected = Mod kiválasztása
 mods.browser.add = Letöltés
-mods.github.open = Megtekintés
+mods.browser.reinstall = Újratelepítés
+mods.browser.view-releases = Kiadások megtekintése
+mods.browser.noreleases = [scarlet]Nem találhatók a kiadások\n[accent]Nem találhatók kiadások ehhez a modhoz. Nézd meg a tárolóját, hogy vannak-e kiadásai.
+mods.browser.latest = [lightgray][Legújabb]
+mods.browser.releases = Kiadások
+mods.github.open = Tároló
+mods.github.open-release = Kiadások oldala
+mods.browser.sortdate = Rendezés dátum szerint
+mods.browser.sortstars = Rendezés értékelés szerint
 
-schematic = Schematic
-schematic.add = Schematic mentése...
-schematics = Schematicok
-schematic.replace = Már van ilyen nevű schematic. Csere?
-schematic.exists = Már van ilyen nevű schematic.
-schematic.import = Schematic importálása...
+schematic = Vázlat
+schematic.add = Vázlat mentése…
+schematics = Vázlatok
+schematic.search = Vázlat keresése…
+schematic.replace = Már van ilyen nevű vázlat. Lecseréled?
+schematic.exists = Már van ilyen nevű vázlat.
+schematic.import = Vázlat importálása…
 schematic.exportfile = Exportálás fájlba
-schematic.importfile = Importálás fájlba
-schematic.browseworkshop = Workshop megtekintése
+schematic.importfile = Importálás fájlból
+schematic.browseworkshop = Steam Műhely megtekintése
 schematic.copy = Másolás a vágólapra
 schematic.copy.import = Importálás a vágólapról
-schematic.shareworkshop = Megosztás a Workshopon
-schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Schematic tükrözése
-schematic.saved = Schematic mentve.
-schematic.delete.confirm = Ez a Schematic törölve lesz.
-schematic.rename = Schematic átnevezése
+schematic.shareworkshop = Megosztás a Steam Műhelyben
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Vázlat tükrözése
+schematic.saved = Vázlat elmentve.
+schematic.delete.confirm = Ez a vázlat törölve lesz.
+schematic.edit = Vázlat szerkesztése
 schematic.info = {0}x{1}, {2} blokk
-schematic.disabled = [scarlet]Sémák letiltva[]\nNem használhat sematikákat ezen a [accent]mapon[] vagy [accent] szerveren.
+schematic.disabled = [scarlet]Vázlatok letiltva[]\nNem használhatsz vázlatokat ezen a [accent]pályán[] vagy [accent]kiszolgálón.
+schematic.tags = Címkék:
+schematic.edittags = Címkék szerkesztése
+schematic.addtag = Címke hozzáadása
+schematic.texttag = Szövegcímke
+schematic.icontag = Ikoncímke
+schematic.renametag = Címke átnevezése
+schematic.tagged = {0} Címkézve
+schematic.tagdelconfirm = Biztosan törlöd ezt a címkét?
+schematic.tagexists = Ez a címke már létezik.
 
 stats = Statisztika
-stat.wave = Hullámok kivádve:[accent] {0}
-stat.enemiesDestroyed = Kivédett ellenség:[accent] {0}
-stat.built = Épített épületek:[accent] {0}
-stat.destroyed = Szétrombolt épületek:[accent] {0}
-stat.deconstructed = Törölt épületek:[accent] {0}
-stat.delivered = Elindított erőforrások:
-stat.playtime = Játszott idő:[accent] {0}
-stat.rank = Végső értékelés: [accent]{0}
+stats.wave = Túlélt hullámok
+stats.unitsCreated = Létrehozott egységek
+stats.enemiesDestroyed = Legyőzött egységek
+stats.built = Épített építmények
+stats.destroyed = Lerombolt építmények
+stats.deconstructed = Lebontott építmények
+stats.playtime = Játékban töltött idő
 
-globalitems = [accent]Összes item
-map.delete = Biztosan törli ezt a mapot"[accent]{0}[]"?
-level.highscore = Magas pontszám: [accent]{0}
+globalitems = [accent]A bolygó nyersanyagai
+map.delete = Biztosan törölni akarod a(z) „[accent]{0}[]� nevű pályát?
+level.highscore = Legmagasabb pontszám: [accent]{0}
 level.select = Szint kiválasztása
 level.mode = Játékmód:
-coreattack = < A mag támadás alatt! >
-nearpoint = [[ [scarlet]AZONNAL HAGYD EL A LEDOB�SI PONTOT[] ]\nveszélyes zóna
-database = Mag adatbázis
+coreattack = < A támaszpont támadás alatt áll! >
+nearpoint = [[ [scarlet]AZONNAL HAGYD EL A LEDOB�SI PONTOT![] ]\nA megsemmisülés fenyeget!
+database = Támaszpont adatbázisa
+database.button = Adatbázis
 savegame = Játék mentése
 loadgame = Játék betöltése
-joingame = Csatlakozás játékhoz
-customgame = Custom Game
+joingame = Kapcsolódás egy játékhoz
+customgame = Egyéni játék
 newgame = Új játék
 none = <semmi>
-minimap = Minimap
+none.found = [lightgray]<nincs találat>
+none.inmap = [lightgray]<nincs a pályán>
+minimap = Minitérkép
 position = Pozíció
 close = Bezárás
 website = Weboldal
 quit = Kilépés
-save.quit = Mentés & Kilépés
-maps = Mapok
-maps.browse = Mapok keresése
+save.quit = Mentés és kilépés
+maps = Pályák
+maps.browse = Pályák böngészése
 continue = Folytatás
-maps.none = [lightgray]Nem találtunk ilyen mapot!
+maps.none = [lightgray]Nem található ilyen pálya!
 invalid = Érvénytelen
-pickcolor = Válasszon színt
+pickcolor = Válassz színt
 preparingconfig = Konfiguráció előkészítése
 preparingcontent = Tartalom előkészítése
 uploadingcontent = Tartalom feltöltése
-uploadingpreviewfile = Előnézet feltöltése
-committingchanges = Változások mentése
+uploadingpreviewfile = Előnézeti fájl feltöltése
+committingchanges = Változások rögzítése
 done = Kész
-feature.unsupported = Az eszköz nem támogatja ezt a funkciót.
+feature.unsupported = Ez az eszköz nem támogatja ezt a funkciót.
 
-mods.alphainfo = Figyelem! a modok alfa állapotban vannak, és[scarlet] nagyon sok lehet benne a hiba[].\nJelentsd be az esetleges hibákat a Mindustry GitHubon.
+mods.initfailed = [red]⚠[] Az előző Mindustry példány előkészítése nem sikerült. Ezt valószínűleg egy rosszul működő mod okozta.\n\nAz ismételt összeomlások elkerülése érdekében [red]minden mod le lett tiltva.[]
 mods = Modok
-mods.none = [lightgray]Nincsen mod!
-mods.guide = Mod készítési útmutató
+mods.none = [lightgray]Nem találhatók modok!
+mods.guide = Modkészítési útmutató
 mods.report = Hiba jelentése
-mods.openfolder = Megnyitás mappából
+mods.openfolder = Mappa megnyitása
+mods.viewcontent = Tartalom megtekintése
 mods.reload = Újratöltés
-mods.reloadexit = Indítsa újra a játékot, hogy betöltődjenek a modok.
+mods.reloadexit = A játék most kilép, hogy újratöltse a modokat a következő indításkor.
+mod.installed = [[Telepítve]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktív
-mod.disabled = [scarlet]Inaktív
+mod.disabled = [red]Inaktív
+mod.multiplayer.compatible = [gray]Többjátékos kompatibilis
 mod.disable = Letiltás
+mod.version = Verzió:
 mod.content = Tartalom:
-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]Nem kompatibilis V6-al (no minGameVersion: 105)
-mod.missingdependencies = [scarlet]Hiányzó függőség: {0}
-mod.erroredcontent = [scarlet]Tartalom hiba
+mod.delete.error = Nem lehet törölni a modot. Lehet, hogy egy másik folyamat használja.
+
+mod.incompatiblegame = [red]Elavult játék
+mod.incompatiblemod = [red]Inkompatibilis
+mod.blacklisted = [red]Nem támogatott
+mod.unmetdependencies = [red]Teljesítetlen függőségek
+mod.erroredcontent = [red]Hibás tartalom
+mod.circulardependencies = [red]Körkörös függőségek
+mod.incompletedependencies = [red]Hiányos függőségek
+
+mod.requiresversion.details = Szükséges játékverzió: [accent]{0}[]\nA játék ezen verziója elavult! A mod működéséhez újabb verzió szükséges (valószínűleg egy béta vagy alfa kiadás).
+mod.outdatedv7.details = Ez a mod nem kompatibilis a játék legújabb verziójával! A mod készítőjének frissítenie kell azt és hozzá kell adnia ezt a [accent]mod.json[] fájlhoz: [accent]minGameVersion: 136[].
+mod.blacklisted.details = Ez a mod automatikusan tiltólistára került, mert a játék összeomlott tőle, vagy más problémát okozott. Ne használd!
+mod.missingdependencies.details = Ez a mod függőségeket hiányol: {0}
+mod.erroredcontent.details = Ez a mod hibákat okozott a betöltésnél. Kérd meg a mod készítőjét, hogy javítsa őket.
+mod.circulardependencies.details = Ennek a modnak egymástól függő függőségei vannak.
+mod.incompletedependencies.details = Ez a mod nem tölthető be az érvénytelen vagy hiányzó függőségek miatt: {0}.
+
+mod.requiresversion = Szükséges játékverzió: [red]{0}[]
+
 mod.errors = Hiba történt a tartalom betöltése közben.
-mod.noerrorplay = [scarlet]Vannak hibás Modok.[] Töröld le vagy javítsd ki a játék előtt.
-mod.nowdisabled = [scarlet]A '{0}' Modnak nincsen megfelelő függősége:[accent] {1}\n[lightgray]Ezeket előbb le kell tölteni.\nEz a Mod automatikusan törölve lesz.
+mod.noerrorplay = [red]Hibákkal rendelkező modjaid vannak.[] Kapcsold ki, vagy javítsd ki őket a játék elindítása előtt.
+mod.nowdisabled = [red]A(z) „{0}� modnak nincs megfelelő függősége:[accent] {1}\n[lightgray]Ezeket előbb le kell tölteni.\nEz a mod automatikusan ki lesz kapcsolva.
 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.requiresrestart = A játék most kilép, hogy a módosítások érvénybe lépjenek a következő indításkor.
+mod.reloadrequired = [red]Újraindítás szükséges
 mod.import = Mod importálása
 mod.import.file = Fájl importálása
-mod.import.github = GitHub Mod importálása
-mod.jarwarn = [scarlet]A JAR modok eredendően nem biztonságosak.[]\nGyőződjön meg arról, hogy ezt a modot megbízható forrásból importálja!
-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.disable = Az eszköz nem támogatja a szkriptekkel rendelkező modokat. \nA játékhoz le kell tiltania ezeket a modokat.
+mod.import.github = Importálás GitHubról
+mod.jarwarn = [scarlet]A JAR modok eredendően nem biztonságosak.[]\nGyőződj meg arról, hogy ezt a modot megbízható forrásból importálod!
+mod.item.remove = Ez az elem a(z)[accent] „{0}�[] mod része. A törléséhez távolítsd el a modot.
+mod.remove.confirm = Ez a mod törölve lesz.
+mod.author = [lightgray]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 közzéteszed ezt a modot a Steam Műhelyben, 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 Steam Műhelybe.\nAhhoz, hogy átalakítsd, ki kell bontanod a ZIP-fájlt egy mappába és le kell törölnöd a régit, majd indítsd újra a játékot, vagy töltsd újra a modokat.
+mod.scripts.disable = Ez az eszköz nem támogatja a parancsfájlokkal rendelkező modokat.\nA játékhoz tiltsd le ezeket a modokat.
 
-about.button = Közreműködők
+about.button = Névjegy
 name = Név:
-noname = Válassz egy[accent] nevet[] előbb.
-planetmap = Bolygó térkép
-launchcore = Mag kilövése
-filename = Fájl név:
-unlocked = Új tartalom kinyitva!
-available = Új kutatás áll rendelkezésre!
-completed = [accent]Kész
-techtree = Tech Tree
-research.legacy = [accent]5.0[] kutatási adatok találhatók.\nSzeretné [accent] betölteni ezeket az adatokat [], vagy [accent] eldobni [], és újraindítani a kutatást az új kampányban (ajánlott)?
+noname = Előbb válassz egy[accent] nevet[].
+search = Keresés:
+planetmap = Bolygótérkép
+launchcore = Támaszpont kilövése
+filename = Fájlnév:
+unlocked = Új tartalom feloldva!
+available = Új fejlesztés érhető el!
+unlock.incampaign = < Oldd fel a hadjáratban a részletekért >
+campaign.select = Válassz ki egy kezdő hadjáratot
+campaign.none = [lightgray]Válassz egy bolygót a kezdéshez.\nEzt bármikor megváltoztathatod.
+campaign.erekir = Újabb, csiszoltabb tartalom. Többnyire lineáris játékmenet.\n\nSokkal nehezebb. Magasabb minőségű pályák és élmények.
+campaign.serpulo = Régebbi tartalom. A klasszikus élmény. Nyíltabb végű, több tartalommal.\n\nPotenciálisan kiegyensúlyozatlan pályák és hadjárat. Kevésbé csiszolt.
+campaign.difficulty = Nehézségi szint
+completed = [accent]Kifejlesztve
+techtree = Technológiafa
+techtree.select = Technológiafa kiválasztása
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Betöltés
 research.discard = Eldobás
-research.list = [lightgray]Fedezd fel:
-research = Felfedezés
-researched = [lightgray]{0} felfedezve.
+research.list = [lightgray]Fejleszd ki:
+research = Fejlesztés
+researched = [lightgray]{0} kifejlesztve.
 research.progress = {0}% kész
-players = {0} játékosok
+players = {0} játékos
 players.single = {0} játékos
-players.search = keresés
-players.notfound = [gray]nincsen játékos
-server.closing = [accent]Szerver bezárása...
-server.kicked.kick = Ki lettél rúgva a szerverről!
-server.kicked.whitelist = Nem vagy a fehérlistán.
-server.kicked.serverClose = A szerver be lett zárva.
-server.kicked.vote = Le lettél szavazva. Viszlát.
-server.kicked.clientOutdated = Elavult verziót használsz! Frissítsd a játékot!
-server.kicked.serverOutdated = Elavult a szerver! Kérd meg a tulajdonost, hogy frissítse!
-server.kicked.banned = Ki vagy tiltva a szerverről.
-server.kicked.typeMismatch = Ez a szerver nem kompatibilis a jelenlegi verzióddal.
-server.kicked.playerLimit = Ez a szerver tele van. Várd ki a sorodat.
-server.kicked.recentKick = Nemrég ki lettél rúgva.\nVárj egy kicsit.
-server.kicked.nameInUse = Már van egy ilyen nevű játékos.
+players.search = Keresés
+players.notfound = [gray]Nem található játékos
+server.closing = [accent]Kiszolgáló bezárása…
+server.kicked.kick = Ki lettél rúgva a kiszolgálóról!
+server.kicked.whitelist = Nem vagy az engedélyezési listán.
+server.kicked.serverClose = A kiszolgáló be lett zárva.
+server.kicked.vote = Ki lettél szavazva. Viszlát!
+server.kicked.clientOutdated = Elavult játékverziót használsz! Frissítsd a játékot!
+server.kicked.serverOutdated = Elavult a kiszolgáló! Kérd meg a tulajdonost, hogy frissítse!
+server.kicked.banned = Ki vagy tiltva erről a kiszolgálóról.
+server.kicked.typeMismatch = Ez a kiszolgáló nem kompatibilis a jelenlegi játékverzióddal.
+server.kicked.playerLimit = Ez a kiszolgáló tele van. Várd ki a sorodat.
+server.kicked.recentKick = Nemrég lettél kirúgva.\nVárj egy kicsit az újbóli kapcsolódással.
+server.kicked.nameInUse = Már van egy ilyen nevű játékos\nezen a kiszolgálón.
 server.kicked.nameEmpty = A kiválasztott név érvénytelen.
-server.kicked.idInUse = Már csatlakozva vagy erre a szerverre! Nem lehet egyszerre két fiókot használni.
-server.kicked.customClient = Ez a szerver nem támogatja a saját készítésű buildeket. Használj egy hivatalos változatot.
+server.kicked.idInUse = Már kapcsolódva vagy ehhez a kiszolgálóhoz! Nem lehet egyszerre két fiókot használni.
+server.kicked.customClient = Ez a kiszolgáló nem támogatja a saját készítésű játék-összeállításokat. Használj egy hivatalos változatot!
 server.kicked.gameover = Vége a játéknak!
-server.kicked.serverRestarting = Ez a szerver újraindul.
-server.versions = Te verziód:[accent] {0}[]\nSzerver verzió:[accent] {1}[]
-host.info = Az [accent]host[] gomb kiszolgálót üzemeltet a [scarlet]6567[] porton.\nAzon a [lightgray] wifin vagy a helyi hálózaton [] bárki láthatja a szervert a szerverlistáján.\n\nHa azt szeretné, hogy az emberek bárhonnan IP-címmel csatlakozhassanak, [accent] port-továbbítás []\n\n[lightgray] Megjegyzés: Ha valakinek problémái vannak a LAN-játékhoz való csatlakozással, győződjön meg arról, hogy a tűzfal beállításaiban engedélyezte-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledje, hogy a nyilvános hálózatok néha nem teszik lehetővé a kiszolgálók felderítését.
-join.info = Itt megadhat egy [accent]szerver IP-t[] a csatlakozáshoz, vagy felfedezheti a [accent]helyi hálózat[] vagy [accent]globális[] szervereket, amelyekhez csatlakozni szeretne.\nMindkét LAN és WAN multiplayer támogatott.\n\n[lightgray]Ha IP-vel akarsz csatlakozni valakihez, akkor meg kell kérdezned a gazdagéptől az IP-jét, amely megtalálható a "my ip" Google kereséssel.
-hostserver = Másik játékos meghívása
+server.kicked.serverRestarting = Ez a kiszolgáló újraindul.
+server.versions = A te játékverziód:[accent] {0}[]\nA kiszolgáló verziója:[accent] {1}[]
+host.info = A [accent]kiszolgáló indítása[] gomb egy kiszolgálót indít a [scarlet]6567-es[] porton.\nEzen a [lightgray]Wi-Fi-n vagy a helyi hálózaton[] bárki láthatja a kiszolgálót a kiszolgálólistán.\n\nHa azt szeretnéd, hogy bárki, aki ismeri az IP-címedet, bárhonnan kapcsolódhasson a kiszolgálódhoz, akkor a [accent]porttovábbítás[] beállítására lesz szükséged.\n\n[lightgray]Megjegyzés: ha problémáid vannak a LAN-játékhoz való kapcsolódással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a kiszolgálók felderítését.
+join.info = Itt megadhatod egy [accent]kiszolgáló IP-címét[] a kapcsolódáshoz, vagy felfedezhetsz [accent]helyi[] vagy [accent]globális[] kiszolgálókat.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP-cím alapján szeretnél kapcsolódni, akkor meg kell tudnod az IP-címét, amelyet például a „my ip� webes kereséssel találhatsz meg.
+hostserver = Többjátékos játék
 invitefriends = Barátok meghívása
-hostserver.mobile = Játékos meghívása
-host = meghívás
-hosting = [accent]Szerver megnyitása...
+hostserver.mobile = Többjátékos játék
+host = Kiszolgáló nyitása
+hosting = [accent]Kiszolgáló megnyitása…
 hosts.refresh = Frissítés
-hosts.discovering = LAN játék keresése
-hosts.discovering.any = Játék keresése
-server.refreshing = Szerver frissítése
-hosts.none = [lightgray]Nincsen helyi játék!
-host.invalid = [scarlet]Nem sikerült csatlakozni.
+hosts.discovering = LAN játékok felderítése
+hosts.discovering.any = Játékok felderítése
+server.refreshing = Kiszolgáló frissítése
+hosts.none = [lightgray]Nem található helyi játék!
+host.invalid = [scarlet]Nem sikerült kapcsolódni a kiszolgálóhoz.
 
-servers.local = Lokális Szerverek
-servers.remote = Távoli Szerverek
-servers.global = Közösségi szerverek
+servers.local = Helyi kiszolgálók
+servers.local.steam = Nyitott játékok és helyi kiszolgálók
+servers.remote = Távoli kiszolgálók
+servers.global = Közösségi kiszolgálók
 
-servers.disclaimer = A közösségi szervereket [accent]nem[] a fejlesztő birtokolja és nem ellenőrzi.\n\nA szerverek tartalmazhatnak olyan felhasználók által létrehozott tartalmat, amely nem minden korosztály számára megfelelő.
-servers.showhidden = Rejtett szerverek megjelenítése
+servers.disclaimer = A közösségi kiszolgálókat [accent]nem[] a fejlesztő birtokolja és ellenőrzi.\n\nA kiszolgálók tartalmazhatnak olyan felhasználók által létrehozott tartalmat, amely nem minden korosztály számára megfelelő.
+servers.showhidden = Rejtett kiszolgálók megjelenítése
 server.shown = Látható
 server.hidden = Rejtett
 
+viewplayer = Játékos figyelése: [accent]{0}
 trace = Játékos követése
 trace.playername = Játékos neve: [accent]{0}
-trace.ip = IP: [accent]{0}
+trace.ip = IP-cím: [accent]{0}
 trace.id = Azonosító: [accent]{0}
+trace.language = Nyelv: [accent]{0}
 trace.mobile = Mobil kliens: [accent]{0}
-trace.modclient = Nemhivatalos kliens: [accent]{0}
-invalidid = Érvénytelen kliens ID! Submit a bug report.
-server.bans = Tiltások
+trace.modclient = Nem hivatalos kliens: [accent]{0}
+trace.times.joined = Kapcsolódások száma: [accent]{0}
+trace.times.kicked = Kirúgások száma: [accent]{0}
+trace.ips = IP-címek:
+trace.names = Nevek:
+invalidid = Érvénytelen kliensazonosító (ID)! Küldj hibajelentést.
+
+player.ban = Kitiltás
+player.kick = Kirúgás
+player.trace = Követés
+player.admin = Admin be/ki
+player.team = Csapatváltás
+
+server.bans = Tiltólista
 server.bans.none = Nincsenek tiltott játékosok!
 server.admins = Adminok
-server.admins.none = Nincsen admin!
-server.add = Szerver hozzáadása
-server.delete = Biztosan törlöd ezt a szervert?
-server.edit = Szerver szerkesztése
-server.outdated = [crimson]Elavult szerver![]
-server.outdated.client = [crimson]Elavult kliens![]
+server.admins.none = Nem található admin!
+server.add = Kiszolgáló hozzáadása
+server.delete = Biztosan törlöd ezt a kiszolgálót?
+server.edit = Kiszolgáló szerkesztése
+server.outdated = [scarlet]Elavult kiszolgáló![]
+server.outdated.client = [scarlet]Elavult kliens![]
 server.version = [gray]v{0} {1}
-server.custombuild = [accent]Saját Build
-confirmban = Biztosan tiltod ezt a játékost?
-confirmkick = Biztosan kirúgod ezt a játékost?
-confirmvotekick = Biztosan ki akarod rúgatni ezt a játékost?
+server.custombuild = [accent]Saját összeállítás
+confirmban = Biztosan kitiltod a(z) „{0}[white]� nevű játékost?
+confirmkick = Biztosan kirúgod a(z) „{0}[white]� nevű játékost?
 confirmunban = Biztosan újra engedélyezed ezt a játékost?
-confirmadmin = Biztosan hozzá akarod adni ezt a játékost az adminokhoz?
-confirmunadmin = Biztosan meg akarod szűntetni ennek a játékosnak az admin szátuszát?
-joingame.title = Csatlakozás
+confirmadmin = Biztosan előlépteted a(z) „{0}[white]� nevű játékost adminná?
+confirmunadmin = Biztosan meg akarod szüntetni a(z) „{0}[white]� nevű játékos adminisztrátori státuszát?
+votekick.reason = Kiszavazás oka
+votekick.reason.message = Valóban ki akarod szavazni a(z) „{0}[white]� nevű játékost?\nHa igen, írd be az okát:
+joingame.title = Kapcsolódás a játékhoz
 joingame.ip = Cím:
-disconnect = Leválasztva.
-disconnect.error = Csatlakozási hiba.
-disconnect.closed = Csatlakozás bezárva.
+disconnect = Kapcsolat bontva.
+disconnect.error = Kapcsolódási hiba.
+disconnect.closed = Kapcsolat lezárva.
 disconnect.timeout = Időtúllépés.
-disconnect.data = Nem sikerült betölteni az adatokat!
-cantconnect = Nem sikerült csatlakozni ehhez: ([accent]{0}[]).
-connecting = [accent]Csatlakozás...
-reconnecting = [accent]Újra csatlakozás...
-connecting.data = [accent]Betöltés...
+disconnect.data = Nem sikerült betölteni a világ adatait!
+disconnect.snapshottimeout = Időtúllépés történt az UDP-pillanatképek fogadása közben.\nEzt instabil hálózat vagy -kapcsolat okozhatja.
+cantconnect = Nem sikerült kapcsolódni a(z) ([accent]{0}[]) játékhoz.
+connecting = [accent]Kapcsolódás…
+reconnecting = [accent]Újrakapcsolódás…
+connecting.data = [accent]Világadatok betöltése…
 server.port = Port:
-server.addressinuse = Már van ilyen cím!
 server.invalidport = Érvénytelen port!
-server.error = [crimson]Nem sikerült megnyitni a szervert.
+server.error.addressinuse = [scarlet]Nem sikerült megnyitni a kiszolgálót a 6567-es porton.[]\n\nGyőződj meg arról, hogy nem fut más Mindustry-kiszolgáló az eszközön vagy a hálózaton!
+server.error = [scarlet]Kiszolgálóhiba.
 save.new = Új mentés
 save.overwrite = Biztosan felülírod\nezt a mentést?
+save.nocampaign = A hadjáratból származó egyes mentési fájlok nem importálhatók.
 overwrite = Felülírás
 save.none = Nem található mentés!
-savefail = Nem sikerült menteni!
+savefail = Nem sikerült elmenteni a játékot!
 save.delete.confirm = Biztosan törlöd ezt a mentést?
 save.delete = Törlés
-save.export = Exportálás
+save.export = Mentés exportálása
 save.import.invalid = [accent]Ez a mentés érvénytelen!
-save.import.fail = [crimson]Nem sikerült importálni a[accent]{0}[] mentést
-save.export.fail = [crimson]Nem sikerült exportálni a[accent]{0}[] mentést
-save.import = Importálás
-save.newslot = Név:
+save.import.fail = [scarlet]Nem sikerült importálni a(z) [accent]{0}[] mentést
+save.export.fail = [scarlet]Nem sikerült exportálni a(z) [accent]{0}[] mentést
+save.import = Mentés importálása
+save.newslot = Mentés neve:
 save.rename = �tnevezés
 save.rename.text = Új név:
 selectslot = Válassz ki egy mentést.
-slot = [accent]Slot {0}
+slot = [accent]{0}. hely
 editmessage = Üzenet szerkesztése
-save.corrupted = Érvénytelen fájl!
+save.corrupted = A mentési fájl sérült vagy érvénytelen!
 empty = <üres>
 on = Be
 off = Ki
+save.search = Keresés a mentett játékok között…
 save.autosave = Automatikus mentés: {0}
-save.map = Térkép: {0}
+save.map = Pálya: {0}
 save.wave = Hullám: {0}
-save.mode = Mód: {0}
-save.date = Utolsó Mentés: {0}
+save.mode = Játékmód: {0}
+save.date = Utolsó mentés: {0}
 save.playtime = Játékidő: {0}
 warning = Figyelmeztetés.
-confirm = Rendben
+confirm = Megerősítés
 delete = Törlés
-view.workshop = Megtekintés a Workshopban
-workshop.listing = Workshop Listázás szerkesztése
+view.workshop = Megtekintés a Steam Műhelyben
+workshop.listing = Steam Műhely listázásának szerkesztése
 ok = OK
 open = Megnyitás
 customize = Szabályok módosítása
 cancel = Mégse
-openlink = Link megnyitása
-copylink = Link másolása
+command = Parancs
+command.queue = Sorba állítás
+command.mine = Bányászás
+command.repair = Javítás
+command.rebuild = Újraépítés
+command.assist = Segítség a játékosnak
+command.move = Mozgás
+command.boost = Erősítés
+command.enterPayload = Berakodás a raktérbe
+command.loadUnits = Egységek felvétele
+command.loadBlocks = Blokkok felvétele
+command.unloadPayload = Kirakodás a raktérből
+command.loopPayload = Folyamatos egységelszállítás
+stance.stop = Parancsok visszavonása
+stance.shoot = Viselkedés: lövés
+stance.holdfire = Viselkedés: tüzet szüntess
+stance.pursuetarget = Viselkedés: célpont követése
+stance.patrol = Viselkedés: járőrözési útvonal
+stance.ram = Viselkedés: ütközés\n[lightgray]Egyenes vonalú mozgás, útkeresés nélkül
+openlink = Hivatkozás megnyitása
+copylink = Hivatkozás másolása
 back = Vissza
-crash.export = Összeomlási napló exportálása
-crash.none = Nem található összeomlási napló.
-crash.exported = Összeomlási napló exportálva.
-data.export = Adatok Exportálása
-data.import = Adatok Importálása
-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.
-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]Modok Újratöltése...
-saving = [accent]Mentés...
-respawn = Nyomd meg a [accent][[{0}][] gombot, hogy újra élegy a magban.
-cancelbuilding = Használd a(z) [accent][[{0}][] gombot, hogy töröld a tervrajzot.
-selectschematic = Használd a(z) [accent][[{0}][] gombot, hogy kijelölj és másolj.
-pausebuilding = Használd a(z) [accent][[{0}][] gombot, hogy megállítsd az építkezést.
-resumebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy folytasd az építkezést.
-showui = A kezelőfelület elrejtve.\nNyomja meg a(z) [accent][[{0}][] gombot a megjelenítéséhez.
-wave = [accent]Hullám {0}
-wave.cap = [accent]Hullám {0}/{1}
-wave.waiting = [lightgray]Következő hullám {0}
+max = Max
+objective = A pálya célja
+crash.export = Az összeomlási napló exportálása
+crash.none = Nem található az összeomlási napló.
+crash.exported = Az összeomlási napló exportálva.
+data.export = Adatok exportálása
+data.import = Adatok importálása
+data.openfolder = Adatok mappájának megnyitása
+data.exported = Adatok exportálva.
+data.invalid = Ezek érvénytelen játékadatok.
+data.import.confirm = A külső adatok importálása felülírja[scarlet] minden[] jelenlegi játékadatodat.\n[accent]Ezt a műveletet nem lehet visszavonni![]\n\nAmint kész az importálás, a játék automatikusan kilép.
+quit.confirm = Biztosan kilépsz?
+loading = [accent]Betöltés…
+downloading = [accent]Letöltés…
+saving = [accent]Mentés…
+respawn = [accent][[{0}][] az újraéledéshez
+cancelbuilding = [accent][[{0}][] a tervrajz törléséhez
+selectschematic = [accent][[{0}][] a kijelöléshez és másoláshoz
+pausebuilding = [accent][[{0}][] az építkezés megállításához
+resumebuilding = [scarlet][[{0}][] az építkezés folytatásához
+enablebuilding = [scarlet][[{0}][] az építkezés jóváhagyásához
+showui = A kezelőfelület elrejtve.\nNyomd meg a(z) [accent][[{0}][] gombot a kezelőfelület megjelenítéséhez.
+commandmode.name = [accent]Parancs mód
+commandmode.nounits = [nincs egység]
+wave = [accent]{0}. hullám
+wave.cap = [accent]{0}./{1} hullám
+wave.waiting = [lightgray]A következő hullám elkezdődik: {0} mp múlva
 wave.waveInProgress = [lightgray]Hullám folyamatban
-waiting = [lightgray]Várakozás...
-waiting.players = Várakozás a játékosokra...
-wave.enemies = [lightgray]Fennmaradó ellenségek: {0}
-wave.enemycores = [accent]{0}[lightgray] Ellenséges magok
-wave.enemycore = [accent]{0}[lightgray] Ellenséges mag
-wave.enemy = [lightgray]{0} Magmaradt ellenség
-wave.guardianwarn =  Az őrző [accent]{0}[] hullám múlva érkezik.
-wave.guardianwarn.one =  Az őrző [accent]{0}[] hullám múlva érkezik.
-loadimage = Fénykép betöltése
-saveimage = Fénykép mentése
+waiting = [lightgray]Várakozás…
+waiting.players = Várakozás a játékosokra…
+wave.enemies = [lightgray]{0} ellenség maradt
+wave.enemycores = [accent]{0}[lightgray] ellenséges támaszpont
+wave.enemycore = [accent]{0}[lightgray] ellenséges támaszpont
+wave.enemy = [lightgray]{0} ellenség maradt
+wave.guardianwarn = Egy �rző érkezik [accent]{0}[] hullám múlva.
+wave.guardianwarn.one = Egy �rző érkezik [accent]{0}[] hullám múlva.
+loadimage = Kép betöltése
+saveimage = Kép mentése
 unknown = Ismeretlen
-custom = Egyedi
+custom = Egyéni
 builtin = Beépített
-map.delete.confirm = Biztosan törli ezt a mapot? Ez a művelet nem visszavonható!
-map.random = [accent]Random Map
-map.nospawn = Ez a map nem rendelkezik maggal, amelybe a játékos beleszülethet! Adjon hozzá egy [accent]narancssárga[] magot ehhez a maphoz a szerkesztőben.
-map.nospawn.pvp = Ezen a térképen nincsen ellenséges mag, amiba az másik csapat éledhet! Adjon hozzá [scarlet]nem narancssárga[] magok ehhez a maphoz a szerkesztőben.
-map.nospawn.attack = Ezen a térképen nincsen ellenséges mag! Adjon hozzá [scarlet]piros[] magot ehhez a maphoz a szerkesztőben.
-map.invalid = Hiba a map betöltésekor: sérült vagy érvénytelen mapfájl.
-workshop.update = Item frisítése
-workshop.error = Hiba történt a műhely részleteinek lekérésekor: {0}
-map.publish.confirm = Biztos, hogy közzéteszi ezt a mapot?\n\n[lightgray] Győződjön meg róla, hogy először elfogadta a Workshop EULA-t, különben a mapok nem jelennek meg!
-workshop.menu = Válassza ki, mit szeretne csinálni ezzel az itemmel.
-workshop.info = Item Infó
-changelog = Changelog (opcionális):
+map.delete.confirm = Biztosan törlöd ezt a pályát? Ezt a műveletet nem lehet visszavonni!
+map.random = [accent]Véletlenszerű pálya
+map.nospawn = Ez a pálya nem rendelkezik támaszponttal, amellyel a játékos kezdhetne. Adj hozzá egy {0} támaszpontot a pályához a szerkesztőben.
+map.nospawn.pvp = Ezen a pályán nincs ellenséges támaszpont, amellyel egy játékos kezdhet. Adj hozzá egy [scarlet]nem narancssárga[] támaszpontot a pályához a szerkesztőben.
+map.nospawn.attack = Ezen a pályán nincs ellenséges támaszpont. Adj hozzá {0} támaszpontot ehhez a pályához a szerkesztőben.
+map.invalid = Hiba történt a pálya betöltésekor: sérült vagy érvénytelen fájl.
+workshop.update = Elem frissítése
+workshop.error = Hiba történt a Steam Műhely részleteinek lekérdezésekor: {0}
+map.publish.confirm = Biztosan közzéteszed ezt a pályát?\n\n[lightgray]Győződj meg arról, hogy elfogadtad a Steam Műhely EULA-t, különben a pályáid nem jelennek meg.
+workshop.menu = Válaszd ki, hogy mit szeretnél csinálni ezzel az elemmel.
+workshop.info = Eleminformációk
+changelog = Változáslista (nem kötelező):
+updatedesc = Cím és leírás felülírása
 eula = Steam EULA
-missing = Ezt az elemet törölték vagy áthelyezték.\n[lightgray] A műhely adatait automatikusan leválasztották.
-publishing = [accent]Publikálás...
-publish.confirm = Biztosan közzéteszi ezt?\n\n[lightgray] Győződjön meg róla, hogy először elfogadta a Workshop EULA-t, különben az itemei nem jelennek meg!
-publish.error = Hiba az item publikálásakor: {0}
-steam.error = Nem sikerült inicializálni a Steam szolgáltatásokat.\nHiba: {0}
+missing = Ezt az elemet törölték vagy áthelyezték.\n[lightgray]A Steam Műhely adatai automatikusan le lettek választva.
+publishing = [accent]Közzététel…
+publish.confirm = Biztosan közzéteszed ezt az elemet?\n\n[lightgray]Győződj meg arról, hogy elfogadtad a Steam Műhely EULA-t, különben az elemeid nem jelennek meg!
+publish.error = Hiba az elem közzétételekor: {0}
+steam.error = Nem sikerült előkészíteni a Steam szolgáltatásokat.\nHiba: {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
-editor.center = Center
-workshop = Workshop
-waves.title = Waves
-waves.remove = Remove
-waves.never = <never>
-waves.every = every
-waves.waves = wave(s)
-waves.perspawn = per spawn
-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.
+editor.planet = Bolygó:
+editor.sector = Szektor:
+editor.seed = Kiindulóérték:
+editor.cliffs = Falak sziklákká
+editor.brush = Méret
+editor.openin = Megnyitás a szerkesztőben
+editor.oregen = Ércelőállítás
+editor.oregen.info = Ércelőállítás:
+editor.mapinfo = Pályainformációk
+editor.author = Szerző:
+editor.description = Leírás:
+editor.nodescription = A megosztás előtt a pályának rendelkeznie kell egy legalább 4 karakteres leírással.
+editor.waves = Hullámok
+editor.rules = Szabályok
+editor.generation = Előállítás
+editor.objectives = Célok
+editor.locales = Helyi csomagok
+editor.worldprocessors = Világprocesszorok
+editor.worldprocessors.editname = Név szerkesztése
+editor.worldprocessors.none = [lightgray]Nem találhatók világprocesszor blokkok!\nAdj hozzá egyet a pályaszerkesztőben, vagy használd az alábbi \ue813 hozzáadás gombot.
+editor.worldprocessors.nospace = Nincs szabad hely egy világprocesszor elhelyezéséhez!\nKitöltötted a pályát struktúrákkal? Miért tetted ezt?
+editor.worldprocessors.delete.confirm = Biztosan törölni akarod ezt a világprocesszort?\n\nHa falakkal van körülvéve, akkor egy környezeti fal fog a helyére kerülni.
+editor.ingame = Szerkesztés a játékban
+editor.playtest = Teszt a játékban
+editor.publish.workshop = Közzététel a Steam Műhelyben
+editor.newmap = Új pálya
+editor.center = Ugrás középre
+editor.search = Pályák keresése…
+editor.filters = Pályák szűrése
+editor.filters.mode = Játékmódok:
+editor.filters.type = Pályatípus:
+editor.filters.search = Keresés ebben:
+editor.filters.author = Szerző
+editor.filters.description = Leírás
+editor.shiftx = X eltolás
+editor.shifty = Y eltolás
+workshop = Steam Műhely
+waves.title = Hullámok
+waves.remove = Eltávolítás
+waves.every = minden
+waves.waves = hullámonként
+waves.health = élet: {0}%
+waves.perspawn = kezdőpontonként
+waves.shields = erőpajzs/hullám
+waves.to = -
+waves.spawn = kezdőpont:
+waves.spawn.all = <mind>
+waves.spawn.select = Kezdőpont kiválasztása
+waves.spawn.none = [scarlet]nem találhatók kezdőpontok a pályán
+waves.max = egységkorlát
+waves.guardian = �rző
+waves.preview = Előnézet
+waves.edit = Szerkesztés…
+waves.random = Véletlenszerű
+waves.copy = Másolás a vágólapra
+waves.load = Betöltés a vágólapról
+waves.invalid = Érvénytelen hullámok a vágólapon.
+waves.copied = Hullámok másolva.
+waves.none = Nincs ellenség megadva.\nVedd figyelembe, hogy az üresen hagyott hullám-elrendezések automatikusan le lesznek cserélve az alapértelmezett elrendezésre.
+waves.sort = Rendezési szempont
+waves.sort.reverse = Rendezés visszafelé
+waves.sort.begin = Kezdés
+waves.sort.health = Élet
+waves.sort.type = Típus
+waves.search = Hullám keresése…
+waves.filter = Egységszűrő
+waves.units.hide = Összes elrejtése
+waves.units.show = Összes megjelenítése
 
-#these are intentionally in lower case
-wavemode.counts = counts
-wavemode.totals = totals
-wavemode.health = health
+#Az alábbi szövegek szándékosan vannak kisbetűvel írva
+wavemode.counts = típusokra bontva
+wavemode.totals = összesítés
+wavemode.health = életpontok
 
-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 = 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.
-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:
+all = Összes
+editor.default = [lightgray]<Alapértelmezett>
+details = Részletek…
+edit = Szerkesztés
+variables = Változók
+logic.clear.confirm = Biztosan törölni akarod az összes kódot ebből a processzorból?
+logic.globals = Beépített változók
 
-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.
+editor.name = Név:
+editor.spawn = Egység létrehozása
+editor.removeunit = Egység eltávolítása
+editor.teams = Csapatok
+editor.errorload = Hiba a fájl betöltése közben.
+editor.errorsave = Hiba a fájl mentése közben.
+editor.errorimage = Ez egy kép, nem pedig egy pálya.
+editor.errorlegacy = Ez a pálya túl régi és olyan régi pálya formátumot használ, amely már nem támogatott.
+editor.errornot = Ez nem egy pályafájl.
+editor.errorheader = Ez a pályafájl érvénytelen vagy sérült.
+editor.errorname = A pályának nincs neve. Mentést próbálsz betölteni?
+editor.errorlocales = Hiba az érvénytelen helyi csomagok beolvasásakor.
+editor.update = Frissítés
+editor.randomize = Véletlenszerű
+editor.moveup = Mozgás felfelé
+editor.movedown = Mozgás lefelé
+editor.copy = Másolás
+editor.apply = Alkalmaz
+editor.generate = Előállítás
+editor.sectorgenerate = Szektor előállítása
+editor.resize = �tméretezés
+editor.loadmap = Pálya betöltése
+editor.savemap = Pálya mentése
+editor.savechanges = [scarlet]Nem mentett módosításaid vannak!\n\n[]Szeretnéd elmenteni őket?
+editor.saved = Mentve!
+editor.save.noname = A pályádnak nincs neve! �llíts be egyet a „pályainformációk� menüben.
+editor.save.overwrite = A pályád felülír egy beépített pályát! Válassz egy másik nevet a „pályainformációk� menüben.
+editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik a(z) „{0}� nevű beépített pálya!
+editor.import = Importálás…
+editor.importmap = Pálya importálása
+editor.importmap.description = Létező pálya importálása
+editor.importfile = Fájl importálása
+editor.importfile.description = Egy külső pályafájl importálása
+editor.importimage = Képfájl importálása
+editor.importimage.description = Egy külső pályaképfájl importálása
+editor.export = Exportálás…
+editor.exportfile = Fájl exportálása
+editor.exportfile.description = Exportálás egy pályafájlba
+editor.exportimage = Domborzati kép exportálása
+editor.exportimage.description = Csak alapvető domborzatot tartalmazó képfájl exportálása
+editor.loadimage = Domborzat importálása
+editor.saveimage = Domborzat exportálása
+editor.unsaved = Biztosan ki akarsz lépni?\n[scarlet]A nem mentett módosításaid elvesznek.
+editor.resizemap = Pálya átméretezése
+editor.mapname = Pálya neve:
+editor.overwrite = [accent]Vigyázz!\nEzzel felülírsz egy már létező pályát.
+editor.overwrite.confirm = [scarlet]Vigyázz![] Ilyen nevű pálya már létezik. Biztosan felülírod?\n„[accent]{0}[]�
+editor.exists = Ilyen nevű pálya már létezik.
+editor.selectmap = Válassz ki egy pályát a betöltéshez:
 
-filters.empty = [lightgray]No filters! Add one with the button below.
-filter.distort = Distort
-filter.noise = Noise
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
-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.target = Target
-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
+toolmode.replace = Csere
+toolmode.replace.description = Csak szilárd blokkokra rajzol.
+toolmode.replaceall = Összes cseréje
+toolmode.replaceall.description = Az összes blokkot lecseréli a pályán.
+toolmode.orthogonal = Merőleges
+toolmode.orthogonal.description = Csak merőleges vonalakat rajzol.
+toolmode.square = Négyzet
+toolmode.square.description = Négyzetes ecset.
+toolmode.eraseores = Ércradír
+toolmode.eraseores.description = Csak az érceket törli.
+toolmode.fillteams = Csapatok kitöltése
+toolmode.fillteams.description = Csapatok kitöltése a blokkok helyett.
+toolmode.fillerase = Kitöltés törlése
+toolmode.fillerase.description = Az azonos típusú blokkok törlése.
+toolmode.drawteams = Csapatok rajzolása
+toolmode.drawteams.description = Csapatok rajzolása blokkok helyett.
+#Nem használt szövegek
+toolmode.underliquid = Folyadékok alá
+toolmode.underliquid.description = Padlók rajzolása a folyadékblokkok alá.
+
+filters.empty = [lightgray]Még nincs szűrő! Adj hozzá egyet a lenti gombra kattintva.
+
+filter.distort = Torzítás
+filter.noise = Zaj
+filter.enemyspawn = Ellenséges kezdőpont kiválasztása
+filter.spawnpath = Útvonal a kezdőponthoz
+filter.corespawn = Támaszpont kiválasztása
+filter.median = Medián
+filter.oremedian = Érc medián
+filter.blend = Vegyes
+filter.defaultores = Alapértelmezett ércek
+filter.ore = Érc
+filter.rivernoise = Vízfolyás zaja
+filter.mirror = Tükrözés
+filter.clear = Törlés
+filter.option.ignore = Elutasítás
+filter.scatter = Szétszórás
+filter.terrain = Domborzat
+filter.logic = Logika
+
+filter.option.scale = Méretezés
+filter.option.chance = Gyakoriság
+filter.option.mag = Magnitúdó
+filter.option.threshold = Küszöbérték
+filter.option.circle-scale = Körskála
+filter.option.octaves = Oktávok
+filter.option.falloff = Esés
+filter.option.angle = Szög
+filter.option.tilt = Döntés
+filter.option.rotate = Forgatás
+filter.option.amount = Mennyiség
+filter.option.block = Blokk
+filter.option.floor = Talaj
+filter.option.flooronto = Céltalaj
+filter.option.target = Cél
+filter.option.replacement = Csere
+filter.option.wall = Fal
+filter.option.ore = Érc
+filter.option.floor2 = Másodlagos talaj
+filter.option.threshold2 = Másodlagos küszöbérték
+filter.option.radius = Sugár
+filter.option.percentile = Százalék
+filter.option.code = Kód
+filter.option.loop = Hurok
+
+locales.info = Itt adhatsz hozzá különböző nyelvi csomagokat a pályádhoz. A nyelvi csomagokban minden tulajdonságnak van egy neve és egy értéke. Ezeket a tulajdonságokat a világprocesszorok és a pálya célkitűzései is használhatják a saját neveikkel. Támogatják a szövegformázást (a helyőrzőket a tényleges értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: {0}[]\n\n[cyan]Használat:\n[]Beállítás a pálya célkitűzésének szövegeként: [accent]@időzítő\n\n[]�rd be egy világprocesszorba:\n[accent]localeprint „időzítő�\nformat time\n[gray](ahol az idő egy külön számított változó)
+locales.deletelocale = Biztosan törölni akarod ezt a nyelvi csomagot?
+locales.applytoall = Változások alkalmazása az összes nyelvi csomagra
+locales.addtoother = Hozzáadás más nyelvi csomagokhoz
+locales.rollback = Visszaállítás az utoljára elfogadottra
+locales.filter = Tulajdonságszűrő
+locales.searchname = Név keresése…
+locales.searchvalue = Érték keresése…
+locales.searchlocale = Nyelvi csomag keresése…
+locales.byname = Név szerint
+locales.byvalue = Érték szerint
+locales.showcorrect = Azon tulajdonságok megjelenítése, amelyek mindenhol egyedi értékekkel rendelkeznek és jelen vannak minden nyelvi csomagban.
+locales.showmissing = Azon tulajdonságok megjelenítése, amelyek hiányoznak egyes nyelvi csomagokból
+locales.showsame = Azon tulajdonságok megjelenítése, amelyek azonos értékekkel rendelkeznek különböző nyelvi csomagokban
+locales.viewproperty = Megtekintés minden nyelvi csomagban
+locales.viewing = A(z) „{0}� tulajdonság megtekintése
+locales.addicon = Ikon hozzáadása
 
 width = Szélesség:
 height = Magasság:
 menu = Menü
 play = Játék
-campaign = Kampány
+campaign = Hadjárat
 load = Betöltés
 save = Mentés
 fps = FPS: {0}
-ping = Ping: {0}ms
-memory = Mem: {0}mb
-memory2 = Mem:\n {0}mb +\n {1}mb
-language.restart = Indítsa újra a játékot, hogy betöltődjenek a nyelvi beállítások.
+ping = Ping: {0} ms
+tps = TPS: {0}
+memory = Mem: {0} MB
+memory2 = Mem:\n {0} MB +\n {1} MB
+language.restart = Indítsd újra a játékot, hogy a nyelvi beállítások érvénybe lépjenek.
 settings = Beállítások
-tutorial = Tutorial
-tutorial.retake = Re-Take Tutorial
+tutorial = Oktatóanyag
+tutorial.retake = Oktatóanyag újrajátszása
 editor = Szerkesztő
-mapeditor = Map szerkesztő
+mapeditor = Pályaszerkesztő
 
-abandon = Abandon
-abandon.text = This zone and all its resources will be lost to the enemy.
+abandon = Feladás
+abandon.text = Ez a szektor és minden nyersanyaga az ellenség kezére kerül.
 locked = Lezárva
-complete = [lightgray]Complete:
-requirement.wave = Reach Wave {0} in {1}
-requirement.core = Destroy Enemy Core in {0}
-requirement.research = Research {0}
-requirement.produce = Produce {0}
-requirement.capture = Capture {0}
-launch.text = Indítás
-research.multiplayer = Only the host can research items.
-map.multiplayer = Only the host can view sectors.
-uncover = Uncover
-configure = Configure Loadout
+complete = [lightgray]Feltételek:
+requirement.wave = Juss el a(z) {0}. hullámig a(z) {1} szektorban
+requirement.core = Pusztítsd el az ellenséges támaszpontot a(z) {0} szektorban
+requirement.research = Fejleszd ki: {0}
+requirement.produce = Gyártsd le: {0}
+requirement.capture = Foglald el a(z) {0} szektort
+requirement.onplanet = Szektor elfoglalása a(z) {0} bolygón
+requirement.onsector = Landolj a(z) {0} szektorban
+launch.text = Kilövés
+map.multiplayer = Csak a kiszolgáló tekintheti meg a szektorokat.
+uncover = Felfedés
+configure = Rakomány szerkesztése
 
-loadout = Loadout
-resources = Resources
-bannedblocks = Banned Blocks
+objective.research.name = Fejlesztés
+objective.produce.name = Megszerzés
+objective.item.name = Nyersanyag megszerzése
+objective.coreitem.name = Támaszpont nyersanyaga
+objective.buildcount.name = Építésszámláló
+objective.unitcount.name = Egységszámláló
+objective.destroyunits.name = Egységek megsemmisítése
+objective.timer.name = Időzítő
+objective.destroyblock.name = Blokk megsemmisítése
+objective.destroyblocks.name = Blokkok megsemmisítése
+objective.destroycore.name = Támaszpont megsemmisítése
+objective.commandmode.name = Parancs mód
+objective.flag.name = Jelölő
+
+marker.shapetext.name = Szövegforma
+marker.point.name = Pont
+marker.shape.name = Alakzat
+marker.text.name = Szöveg
+marker.line.name = Vonal
+marker.quad.name = Négyzet
+marker.texture.name = Textúra
+
+marker.background = Háttér
+marker.outline = Körvonal
+
+objective.research = [accent]Fejleszd ki:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Termelj:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Semmisítsd meg:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Semmisítsd meg: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Termelj: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Szállítás a támaszpontba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Építs: [][lightgray]{0}[]db\n{1}[lightgray]{2}
+objective.buildunit = [accent]Gyárts egységeket: [][lightgray]{0}[]db\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Semmisíts meg: [][lightgray]{0}[]db egységet
+objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] mp múlva
+objective.enemyescelating = [accent]Az ellenséges gyártás fokozódik: [lightgray]{0}[] mp múlva
+objective.enemyairunits = [accent]Az ellenséges légi egységek gyártása elkezdődik: [lightgray]{0}[] mp múlva
+objective.destroycore = [accent]Semmisítsd meg az ellenséges támaszpontot
+objective.command = [accent]Irányítsd az egységeket
+objective.nuclearlaunch = [accent]⚠ Rakétakilövés észlelve: [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ BEÉRKEZ� RAKÉTACSAP�S ⚠\n[lightgray]Azonnal építs tartalék támaszpontokat!
+
+loadout = Rakomány
+resources = Nyersanyagok
+resources.max = Maximum
+bannedblocks = Tiltott épületek
+unbannedblocks = Újraengedélyezett épületek
+objectives = Feladatok
+bannedunits = Tiltott egységek
+unbannedunits = Újraengedélyezett egységek
+bannedunits.whitelist = Tiltott egységek engedélyezése
+bannedblocks.whitelist = Tiltott épületek engedélyezése
 addall = Összes hozzáadása
-launch.from = Launching From: [accent]{0}
-launch.destination = Destination: {0}
-configure.invalid = Amount must be a number between 0 and {0}.
-add = Add...
-boss.health = Guardian Health
+launch.from = Kilövés a(z) [accent]{0} szektorból
+launch.capacity = Nyersanyag-kapacitás a kilövéskor: [accent]{0}
+launch.destination = Úti cél: {0}
+landing.sources = Forrásszektorok: [accent]{0}[]
+landing.import = Maximális összmennyiség: {0}[accent]{1}[lightgray]/perc
+configure.invalid = A mennyiségnek 0 és {0} között kell lennie.
+add = Hozzáadás…
+guardian = �rző
 
-connectfail = [scarlet]Csatlakozási hiba:\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 = A map fájl nem található!
+connectfail = [scarlet]Kapcsolódási hiba:\n\n[accent]{0}
+error.unreachable = A kiszolgálót nem lehet elérni.\nBiztosan jól írtad be a címet?
+error.invalidaddress = Érvénytelen cím.
+error.timedout = Időtúllépés!\nGyőződj meg arról, hogy a porttovábbítás be van kapcsolva a kiszolgálógépen, és a cím helyes!
+error.mismatch = Csomaghiba:\nLehetséges kliens- vagy kiszolgálóverzió-eltérés.\nGyőződj meg arról, hogy te és a kiszolgáló is a Mindustry legfrissebb verzióját használjátok!
+error.alreadyconnected = Már kapcsolódva vagy.
+error.mapnotfound = A pályafájl nem található!
 error.io = Internet I/O hiba.
-error.any = Ismeretlen internet hiba.
-error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.any = Ismeretlen hálózati hiba.
+error.bloom = A bloom hatás előkészítése nem sikerült.\nElőfordulhat, hogy az eszköz nem támogatja.
+error.moddex = A Mindustry nem tudja betölteni ezt a modot.\nAz eszközöd blokkolja a Java modok importálását az Android legújabb változásai miatt.\nEz a hiba nem lesz javítva, mert nincs ismert megoldás erre a problémára.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
-weather.sandstorm.name = Sandstorm
-weather.sporestorm.name = Sporestorm
-weather.fog.name = Fog
+weather.rain.name = Eső
+weather.snowing.name = Hóesés
+weather.sandstorm.name = Homokvihar
+weather.sporestorm.name = Spóravihar
+weather.fog.name = Köd
 
-sectors.unexplored = [lightgray]Unexplored
-sectors.resources = Resources:
-sectors.production = Production:
+campaign.playtime = \uf129 [lightgray]Játékidő a szektorban: {0}
+campaign.complete = [accent]Gratulálunk!\n\nLegyőzted az ellenséget a(z) {0} bolygón.\n[lightgray]Meghódítottad az utolsó szektor is.
+
+sectorlist = Szektorok
+sectorlist.attacked = {0} támadás alatt
+sectors.unexplored = [lightgray]Felderítetlen
+sectors.resources = Nyersanyagok:
+sectors.production = Termelés:
 sectors.export = Export:
-sectors.time = Idő:
-sectors.threat = Threat:
-sectors.wave = Hullámok:
-sectors.stored = Stored:
+sectors.import = Import:
+sectors.time = Játékidő a szektorban:
+sectors.threat = Fenyegetés:
+sectors.wave = Hullám:
+sectors.stored = Tárolt nyersanyagok:
 sectors.resume = Folytatás
-sectors.launch = Launch
+sectors.launch = Kilövés
 sectors.select = Kiválasztás
-sectors.nonelaunch = [lightgray]none (sun)
+sectors.launchselect = Célállomás kiválasztása
+sectors.nonelaunch = [lightgray]semmi (nap)
+sectors.redirect = Kilövőállások átirányítása
 sectors.rename = Szektor átnevezése
 sectors.enemybase = [scarlet]Ellenséges bázis
-sectors.vulnerable = [scarlet]Vulnerable
-sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
-sectors.survives = [accent]Survives {0} waves
-sectors.go = Go
-sector.curcapture = Sector Captured
-sector.curlost = Elvesztett szektor
-sector.missingresources = [scarlet]Insufficient Core Resources
-sector.attacked = Sector [accent]{0}[white] under attack!
-sector.lost = Sector [accent]{0}[white] lost!
-#note: the missing space in the line below is intentional
-sector.captured = Sector [accent]{0}[white]captured!
+sectors.vulnerable = [scarlet]Sebezhető
+sectors.underattack = [scarlet]Támadás alatt! [accent]{0}%-ban sérült
+sectors.underattack.nodamage = [scarlet]Nincs meghódítva
+sectors.survives = [accent]Túlél {0} hullámot
+sectors.go = Visszatérés
+sector.abandon = Elhagyás
+sector.abandon.confirm = Ebben a szektorban minden támaszpontod megsemmisül.\nBiztosan feladod ezt a szektort?
+sector.curcapture = A szektor elfoglalva
+sector.curlost = A szektor elveszett
+sector.missingresources = [scarlet]Nincs elég nyersanyag
+sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
+sector.lost = A(z) [accent]{0}[white] szektor elveszett!
+sector.capture = A(z) [accent]{0}[white] szektor elfoglalva!
+sector.capture.current = A szektor elfoglalva!
+sector.changeicon = Ikon módosítása
+sector.noswitch.title = A szektorváltás nem lehetséges
+sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[] bolygón
+sector.view = A szektor megtekintése
 
-threat.low = Gyenge
+threat.low = Alacsony
 threat.medium = Közepes
-threat.high = Nehéz
+threat.high = Magas
 threat.extreme = Extrém
-threat.eradication = Felszámolás
+threat.eradication = Irtózatos
 
-planets = Planets
+difficulty.casual = Laza
+difficulty.easy = Könnyű
+difficulty.normal = Normál
+difficulty.hard = Nehéz
+difficulty.eradication = Irtózatos
+
+planets = Bolygók
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Nap
 
-sector.impact0078.name = Impact 0078
-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.biomassFacility.name = Biomass Synthesis Facility
-sector.windsweptIslands.name = Windswept Islands
-sector.extractionOutpost.name = Extraction Outpost
-sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.impact0078.name = 0078-as becsapódás
+sector.groundZero.name = Becsapódási pont
+sector.craters.name = A kráterek
+sector.frozenForest.name = Fagyott erdő
+sector.ruinousShores.name = Romos partok
+sector.stainedMountains.name = Foltos hegyek
+sector.desolateRift.name = Kietlen hasadék
+sector.nuclearComplex.name = Nukleáris termelési komplexum
+sector.overgrowth.name = Túlburjánzás
+sector.tarFields.name = Kátránymezők
+sector.saltFlats.name = Sós síkságok
+sector.fungalPass.name = Gombahágó
+sector.biomassFacility.name = Biomassza-szintetizáló-létesítmény
+sector.windsweptIslands.name = Szélfútta szigetek
+sector.extractionOutpost.name = Kivonási helyőrség
+sector.facility32m.name = 32M-es létesítmény
+sector.taintedWoods.name = Szennyezett fák
+sector.infestedCanyons.name = Fertőzött kanyonok
+sector.planetaryTerminal.name = Bolygó körüli kilövőállás
+sector.coastline.name = Partvonal
+sector.navalFortress.name = Haditengerészeti erőd
+sector.polarAerodrome.name = Sarkvidéki légikikötő
+sector.atolls.name = Atollok
+sector.testingGrounds.name = Gyakorlótér
+sector.seaPort.name = Tengeri kikötő
+sector.weatheredChannels.name = Viharvert csatornák
+sector.mycelialBastion.name = Micéliumbástya
+sector.frontier.name = Frontvidék
 
-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 Mace units. Destroy it.
-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.
-sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
-sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
-sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
-sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
-sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.groundZero.description = Az ideális helyszín, hogy ismét belekezdjünk. Alacsony ellenséges fenyegetés. Kevés nyersanyag.\nGyűjts annyi rezet és ólmot, amennyit csak tudsz.\nFolytasd a küldetést!
+sector.frozenForest.description = Még itt, a hegyekhez közel is elterjedtek a spórák. A fagypont alatti hőmérséklet nem tudja örökké fogva tartani őket.\n\nFedezd fel az elektromosság erejét! Építs égetőerőműveket! Tanuld meg, hogyan használd a foltozókat!
+sector.saltFlats.description = A sivatag peremén terülnek el a Sós síkságok. Kevés nyersanyag található errefelé.\n\nAz ellenség egy raktárkomplexumot létesített itt. Pusztítsd el a támaszpontjukat! Kő kövön ne maradjon!
+sector.craters.description = Víz gyűlt össze ebben a kráterben, amely régi háborúk emlékét őrzi. Szerezd vissza a területet. Gyűjts homokot! Olvassz üveget, és szivattyúzz vizet a fúróid és lövegtornyaid hűtéséhez!
+sector.ruinousShores.description = A pusztaság mögött a partvonal húzódik. Valaha ezen a helyen egy partvédelmi rendszer állt. Nem sok minden maradt belőle. Csak a legalapvetőbb védelmi szerkezetek maradtak érintetlenül, minden más csak törmelék lett.\nFolytasd a terjeszkedést! Fedezd fel újra a technológiát!
+sector.stainedMountains.description = Mélyebben a szárazföldön fekszenek a hegyek, a spóráktól még érintetlenül.\nTermeld ki a bőséges titán készleteket a körzetben. Tanuld meg felhasználni!\n\nAz ellenség itt nagyobb létszámban van jelen. Ne hagyj nekik időt, hogy a legerősebb egységeiket hadba állíthassák!
+sector.overgrowth.description = Ez a terület közelebb esik a spórák forrásához, a spórák már kinőtték.\nAz ellenség egy helyőrséget létesített itt. Építs Mace egységeket! Pusztítsd el a bázist!
+sector.tarFields.description = Egy olajtermelő övezet peremvidéke a hegyek és a sivatag határán. Egy azon kevés szektorok közül, ahol még hasznosítható kátránykészletek találhatók.\nBár a terület elhagyatott, veszélyes ellenséges erők fészkelnek a közelben. Ne becsüld alá őket!\n\n[lightgray]Fedezd fel az olajfeldolgozási lehetőségeket, ha tudod!
+sector.desolateRift.description = Ez egy rendkívül veszélyes zóna. Bár nyersanyagokban gazdag, kevés hely áll rendelkezésre. Magas a kockázat. Építs szárazföldi és légvédelmet, amint csak tudsz. Ne tévesszen meg a hosszú szünet az ellenség támadásai között.
+sector.nuclearComplex.description = Egy néhai tóriumkitermelő és feldolgozó létesítmény, romokban.\n[lightgray]Fedezd fel a tóriumot és a sokrétű felhasználását!\n\nAz ellenség nagy létszámban van jelen, és folyamatosan megfigyelés alatt tartják a környéket.
+sector.fungalPass.description = �tmeneti terület a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két támaszpontot!
+sector.biomassFacility.description = A spórák származási helye. Ebben a létesítményben fejlesztették ki őket, és eredetileg itt is gyártották őket.\nFedezd fel az itt található technológiákat. Tenyészd ki a spórákat, és használd őket üzemanyagok vagy műanyagok gyártásához.\n\n[lightgray]A létesítmény pusztulása nyomán a spórák elszabadultak és szétszóródtak a légkörben. A helyi ökoszisztémában semmi sem tudta felvenni a versenyt egy ennyire invazív életformával.
+sector.windsweptIslands.description = Távolabb, a partvonalon túl fekszik ez az elszigetelt szigetcsoport. A feljegyzések szerint egykor [accent]műanyagot[] gyártottak itt.\n\nVerd vissza az ellenség vízi egységeit! �llíts fel egy bázist a szigeteken! Fedezd fel az itt talált gyárakat!
+sector.extractionOutpost.description = Egy távoli ellenséges támaszpont, amelyet az ellenség azért épített, hogy nyersanyagokat juttasson el más szektorokba.\n\nA szektorok közötti szállítási technológia elengedhetetlen a további hódításhoz. Pusztítsd el a bázist. Fejleszd ki a kilövőállást.
+sector.impact0078.description = Itt nyugszanak az ebbe a csillagrendszerbe érkező első csillagközi űrhajó maradványai.\n\nMents ki mindent a romok alól, amit csak lehet. Fedezd fel az épségben maradt technológiákat.
+sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti bázison egy olyan építmény található, amely képes támaszpontokat kilőni a közeli bolygókra. Rendkívül jól őrzik.\n\nGyárts vízi egységeket, és semmisítsd meg az ellenséget a lehető leggyorsabban! Találd meg a kilövőszerkezetet!
+sector.coastline.description = Ezen a helyen egy haditengerészeti egység technológiájának maradványait azonosították. Verd vissza az ellenséges támadásokat, foglald el ezt a szektort, és szerezd meg a technológiát.
+sector.navalFortress.description = Az ellenség bázist létesített egy távoli, természetes erődítményes szigeten. Pusztítsd el ezt az előőrsöt. Szerezd meg a fejlett hadihajó-technológiájukat, és fejleszd ki te is.
+sector.cruxscape.name = Zord vidék
+sector.geothermalStronghold.name = Geotermikus erődítmény
+
+#A következő sorokat ne fordítsd le!
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = A kezdet
+sector.aegis.name = Égisz
+sector.lake.name = Tó
+sector.intersect.name = Metszéspont
+sector.atlas.name = Atlasz
+sector.split.name = Hasadék
+sector.basin.name = Medence
+sector.marsh.name = Mocsár
+sector.peaks.name = Csúcsok
+sector.ravine.name = Szurdok
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Erődítmény
+sector.crevice.name = Repedés
+sector.siege.name = Ostrom
+sector.crossroads.name = Keresztutak
+sector.karst.name = Karszt
+sector.origin.name = Eredet
+
+sector.onset.description = Kezdd meg az Erekir meghódítását. Gyűjts nyersanyagokat, állíts elő egységeket, és kezdd el a technológiai fejlesztéseket.
+sector.aegis.description = Ez a szektor volfrám-lelőhelyeket tartalmaz.\nFejleszd ki az [accent]ütvefúrót[], hogy ki tudd bányászni ezt a nyersanyagot, és pusztítsd el az ellenséges bázist a szektorban.
+sector.lake.description = Az ebben a szektorban lévő salakos tó nagymértékben korlátozza a használható egységeket. A lebegőegységek használata az egyetlen lehetőség.\nFejleszd ki a [accent]repülőgépgyártót[], és állíts elő egy [accent]Elude[] egységet, amilyen hamar csak lehet.
+sector.intersect.description = A letapogatások arra utalnak, hogy ezt a szektort a leszállás után hamarosan több oldalról is megtámadják.\n�llítsd fel gyorsan a védelmedet, és terjeszkedj minél gyorsabban.\n[accent]Mech[] egységekre lesz szükség a terület zord terepviszonyai miatt.
+sector.atlas.description = Ez a szektor változatos tereppel rendelkezik, ezért az ütőképes támadáshoz többféle egységre lesz szükség.\nAz itt felfedezett ellenséges bázisok némelyikén való átjutáshoz is továbbfejlesztett egységekre lehet szükség.\nFejleszd ki az [accent]elektrolizátort[] és a [accent]Tankújratervezőt[].
+sector.split.description = A minimális ellenséges jelenlét miatt ez a szektor tökéletes az új nyersanyagszállító technológiák tesztelésére.
+sector.basin.description = Jelentős ellenséges jelenlét lett érzékelve ebben a szektorban.\nÉpíts gyorsan egységeket, és foglald el az ellenséges támaszpontokat, hogy megvethesd a lábad.
+sector.marsh.description = Ebben a szektorban rengeteg arkicit található, de kevés a kürtő.\nÉpíts [accent]kémiai égetőkamrát[] az áramfejlesztéshez.
+sector.peaks.description = A hegyvidéki terep ebben a szektorban a legtöbb egységet használhatatlanná teszi. Légi egységekre lesz szükség.\nVigyázz az ellenséges légvédelmi létesítményekkel. Lehetséges, hogy az ilyen létesítményeket hatástalanítani lehet a támogató épületeik célba vételével.
+sector.ravine.description = A szektorban nem észlelhető ellenséges támaszpont, de ez egy fontos szállítási útvonal az ellenség számára, így változatos ellenséges erőkkel kell számolni.\nTermelj [accent]elektrometált[]. Építs [accent]Afflict[] lövegtornyokat.
+sector.caldera-erekir.description = Ebben a szektorban a feltárható nyersanyagok több szigeten szétszóródva találhatók.\nFejleszd ki és helyezd üzembe a drónalapú szállítmányozást.
+sector.stronghold.description = A nagy ellenséges tábor ebben a szektorban jelentős mennyiségű [accent]tóriumot[] őriz.\nHasználd magasabb szintű egységek és lövegtornyok fejlesztésére.
+sector.crevice.description = Ebben a szektorban az ellenség kegyetlen támadóerőket fog mozgósítani, hogy kiiktassa a bázisodat.\nA [accent]karbid[] és a [accent]pirolízis-erőmű[] kifejlesztése nélkülözhetetlen lehet a túléléshez.
+sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek két irányból érkező támadásokat tesznek lehetővé.\nFejleszd ki a [accent]diciánt[], hogy még erősebb tankegységeket hozhass létre.\nVigyázat: ellenséges, nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
+sector.crossroads.description = Az ellenséges támaszpontok ebben a szektorban változó terepviszonyok között alakultak ki. Ahhoz, hogy alkalmazkodni tudj, fejlessz ki különböző egységeket.\nEzenkívül egyes bázisokat erőpajzsok védenek. Találd ki, hogyan táplálják őket.
+sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új támaszpont leszáll, az ellenség megtámadja azt.\nHasználd ki a nyersanyagokat és fedezd fel a [accent]tóritkvarcot[].
+sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy maradtak további fejlesztési lehetőségek – koncentrálj az ellenséges támaszpontok elpusztítására.
+
+status.burning.name = Égő
+status.freezing.name = Fagyos
+status.wet.name = Nedves
+status.muddy.name = Sáros
+status.melting.name = Olvadó
+status.sapped.name = Kiszáradt
+status.electrified.name = Elektromos
+status.spore-slowed.name = Spórával lassított
+status.tarred.name = Kátrányozott
+status.overdrive.name = Túlhajtás
+status.overclock.name = Túlhúzás
+status.shocked.name = Sokkolt
+status.blasted.name = Felrobbant
+status.unmoving.name = Mozdulatlan
+status.boss.name = �rző
 
 settings.language = Nyelvek
-settings.data = Játék adatok
-settings.reset = Visszaállítás az alapértelmezett értékekre
-settings.rebind = Rebind
-settings.resetKey = Visszaállítás
+settings.data = Játékadatok
+settings.reset = Alapértelmezett
+settings.rebind = �tállítás
+settings.resetKey = Vissza-\nállítás
 settings.controls = Irányítás
 settings.game = Játék
 settings.sound = Hangok
 settings.graphics = Grafika
-settings.cleardata = Játék adatok törlése...
-settings.clear.confirm = Biztosan törli ezeket az adatokat?\n A végrehajtottakat nem lehet visszavonni!
-settings.clearall.confirm = [scarlet] FIGYELEM! []\n Ez törli az összes adatot, beleértve a mentéseket, a térképeket, a feloldásokat és a billentyűzárakat.\n Amint megnyomja az 'OK' gombot, a játék minden adatot töröl és automatikusan kilép.
-settings.clearsaves.confirm = Biztosan törli az összes mentést?
+settings.cleardata = Játékadatok törlése…
+settings.clear.confirm = Biztosan törlöd ezeket az adatokat?\nEzt a műveletet nem lehet visszavonni!
+settings.clearall.confirm = [scarlet]FIGYELEM![]\nEz törli az összes adatot, beleértve a mentéseket, pályákat, felfedezéseket és a billentyűbeállításokat.\nAz „OK� gomb megnyomásával a játék minden adatot töröl, és automatikusan kilép.
+settings.clearsaves.confirm = Biztosan törlöd az összes mentést?
 settings.clearsaves = Mentések törlése
-settings.clearresearch = Kutatások törlése
-settings.clearresearch.confirm = Biztosan törli az összes kutatást?
-settings.clearcampaignsaves = Kampány mentések törlése
-settings.clearcampaignsaves.confirm = Biztosan törli az összes kampány mentést?
-paused = [accent]< Megállítva >
+settings.clearresearch = Fejlesztések törlése
+settings.clearresearch.confirm = Biztosan törlöd az összes fejlesztést?
+settings.clearcampaignsaves = Hadjáratmentések törlése
+settings.clearcampaignsaves.confirm = Biztosan törlöd az összes hadjáratmentést?
+paused = [accent]< Szünet >
 clear = Törlés
 banned = [scarlet]Kitiltva
+unsupported.environment = [scarlet]Nem támogatott környezet
 yes = Igen
 no = Nem
-info.title = Infó
+info.title = Információ
 error.title = [scarlet]Hiba történt
 error.crashtitle = Hiba történt
 unit.nobuild = [scarlet]Az egység nem tud építeni
 lastaccessed = [lightgray]Utoljára megtekintve: {0}
+lastcommanded = [lightgray]Utoljára irányítva: {0}
 block.unknown = [lightgray]???
 
-stat.description = Célja
-stat.input = Input
-stat.output = Output
-stat.booster = Booster
-stat.tiles = Required Tiles
-stat.affinities = Affinities
-stat.powercapacity = Power Capacity
-stat.powershot = Power/Shot
-stat.damage = Damage
-stat.targetsair = Targets Air
-stat.targetsground = Targets Ground
-stat.itemsmoved = Move Speed
-stat.launchtime = Time Between Launches
-stat.shootrange = Range
-stat.size = Size
-stat.displaysize = Display Size
-stat.liquidcapacity = Liquid Capacity
-stat.powerrange = Power Range
-stat.linkrange = Link Range
-stat.instructions = Instructions
-stat.powerconnections = Max Connections
-stat.poweruse = Power Use
-stat.powerdamage = Power/Damage
-stat.itemcapacity = Item Capacity
-stat.memorycapacity = Memory Capacity
-stat.basepowergeneration = Base Power Generation
-stat.productiontime = Production Time
-stat.repairtime = Block Full Repair Time
-stat.weapons = Weapons
-stat.bullet = Bullet
-stat.speedincrease = Speed Increase
-stat.range = Range
-stat.drilltier = Drillables
-stat.drillspeed = Base Drill Speed
-stat.boosteffect = Boost Effect
-stat.maxunits = Max Active Units
-stat.health = Health
-stat.buildtime = Build Time
-stat.maxconsecutive = Max Consecutive
-stat.buildcost = Build Cost
-stat.inaccuracy = Inaccuracy
-stat.shots = Shots
-stat.reload = Shots/Second
-stat.ammo = Ammo
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = Heat Capacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
-stat.canboost = Can Boost
-stat.flying = Flying
-stat.ammouse = Ammo Use
+stat.showinmap = <pálya betöltése a megtekintéshez>
+stat.description = Rendeltetés
+stat.input = Bemenet
+stat.output = Kimenet
+stat.maxefficiency = Maximális hatásfok
+stat.booster = Erősítő
+stat.tiles = Szükséges talaj
+stat.affinities = Módosító körülmények
+stat.opposites = Ellentettek
+stat.powercapacity = Maximális tárolási kapacitás
+stat.powershot = �ram/lövés
+stat.damage = Sebzés
+stat.targetsair = Légi célpontok
+stat.targetsground = Földi célpontok
+stat.itemsmoved = Szállítási sebesség
+stat.launchtime = Kilövések közötti idő
+stat.shootrange = Hatótávolság
+stat.size = Méret
+stat.displaysize = Felbontás
+stat.liquidcapacity = Folyadékkapacitás
+stat.powerrange = Hatótávolság
+stat.linkrange = Kapcsolat hatótávolsága
+stat.instructions = Utasítások
+stat.powerconnections = Max. kapcsolatok
+stat.poweruse = �ramfogyasztás
+stat.powerdamage = �ram/sebzés
+stat.itemcapacity = Nyersanyag-kapacitás
+stat.memorycapacity = Memóriakapacitás
+stat.basepowergeneration = Alap áramtermelés
+stat.productiontime = Gyártási idő
+stat.repairtime = Teljes javítási idő
+stat.repairspeed = Javítási sebesség
+stat.weapons = Fegyverek
+stat.bullet = Lövedék
+stat.moduletier = Modul szintje
+stat.unittype = Egység típusa
+stat.speedincrease = Gyorsítás
+stat.range = Hatótávolság
+stat.drilltier = Kitermelhetők
+stat.drillspeed = Alap termelési sebesség
+stat.boosteffect = Erősítés hatása
+stat.maxunits = Max. aktív egységek
+stat.health = Életpontok
+stat.armor = Páncél
+stat.buildtime = Építési időtartam
+stat.maxconsecutive = Max. egymást követő
+stat.buildcost = Építési költség
+stat.inaccuracy = Pontatlanság
+stat.shots = Lövések
+stat.reload = Tüzelési sebesség
+stat.ammo = LÅ‘szer
+stat.shieldhealth = Erőpajzs életereje
+stat.cooldowntime = Újratöltés időtartama
+stat.explosiveness = Robbanékonyság
+stat.basedeflectchance = Alap hárítási esély
+stat.lightningchance = Villámlás esélye
+stat.lightningdamage = Villámlás sebzése
+stat.flammability = Éghetőség
+stat.radioactivity = Radioaktivitás
+stat.charge = Töltés
+stat.heatcapacity = Hőkapacitás
+stat.viscosity = Viszkozitás
+stat.temperature = Hőmérséklet
+stat.speed = Sebesség
+stat.buildspeed = Építési sebesség
+stat.minespeed = Termelési sebesség
+stat.minetier = Termelési szint
+stat.payloadcapacity = Raktérkapacitás
+stat.abilities = Képességek
+stat.canboost = Erősíthető
+stat.flying = Repül
+stat.ammouse = Lőszerhasználat
+stat.ammocapacity = Lőszerkapacitás
+stat.damagemultiplier = Sebzésszorzó
+stat.healthmultiplier = Életerőszorzó
+stat.speedmultiplier = Sebességszorzó
+stat.reloadmultiplier = Újratöltési szorzó
+stat.buildspeedmultiplier = Építési sebességszorzó
+stat.reactive = Reakciók
+stat.immunities = Immunitások
+stat.healing = Gyógyulás
+stat.efficiency = [stat]{0}% Hatásfok
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
-ability.movelightning = Movement Lightning
+ability.forcefield = Erőpajzs
+ability.forcefield.description = Olyan erőpajzsot vetít ki, amely elnyeli a lövedékeket
+ability.repairfield = Javító mező
+ability.repairfield.description = Megjavítja a közeli egységeket
+ability.statusfield = �llapotmező
+ability.statusfield.description = �llapothatást alkalmaz a közeli egységekre
+ability.unitspawn = Gyár
+ability.unitspawn.description = Egységeket gyárt
+ability.shieldregenfield = Erőpajzs-regeneráló mező
+ability.shieldregenfield.description = Regenerálja a közeli egységek erőpajzsát
+ability.movelightning = Villámcsapás
+ability.movelightning.description = Mozgás közben villámokat bocsát ki
+ability.armorplate = Páncéllemez
+ability.armorplate.description = Csökkenti a kapott sebzést lövés közben
+ability.shieldarc = Erőpajzs-ív
+ability.shieldarc.description = Olyan erőpajzsot vetít ki egy ívben, amely elnyeli a lövedékeket
+ability.suppressionfield = Javítás elnyomása
+ability.suppressionfield.description = Leállítja a közeli javítóépületeket
+ability.energyfield = Energiamező
+ability.energyfield.description = Megrázza a közeli ellenségeket
+ability.energyfield.healdescription = Megrázza a közeli ellenségeket, és gyógyítja a szövetségeseket
+ability.regen = Regeneráció
+ability.regen.description = Idővel regenerálja a saját életerejét
+ability.liquidregen = Folyadékelnyelés
+ability.liquidregen.description = Folyadékot nyel el, hogy gyógyítsa magát
+ability.spawndeath = Szétesés
+ability.spawndeath.description = Megsemmisülésekor egységeket bocsát ki
+ability.liquidexplode = Szétömlés
+ability.liquidexplode.description = Megsemmisülésekor folyadék ömlik ki belőle
 
-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.powerlines = Connections: {0}/{1}
-bar.items = Items: {0}
-bar.capacity = Capacity: {0}
+ability.stat.firingrate = [stat]{0}/mp[lightgray] tüzelési sebesség
+ability.stat.regen = [stat]{0}[lightgray] életerő/mp
+ability.stat.pulseregen = [stat]{0}[lightgray] életerő/impulzus
+ability.stat.shield = [stat]{0}[lightgray] maximális pajzs
+ability.stat.repairspeed = [stat]{0}/mp[lightgray] javítási sebesség
+ability.stat.slurpheal = [stat]{0}[lightgray] életerő/folyadékegység
+ability.stat.cooldown = [stat]{0} mp[lightgray] újratöltődés
+ability.stat.maxtargets = [stat]{0}[lightgray] max. célpont
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] javítási mennyiség (azonos típusnál)
+ability.stat.damagereduction = [stat]{0}%[lightgray] sebzéscsökkentés
+ability.stat.minspeed = [stat]{0} mező/mp[lightgray] min. sebesség
+ability.stat.duration = [stat]{0} mp[lightgray] időtartam
+ability.stat.buildtime = [stat]{0} mp[lightgray] építési idő
+
+bar.onlycoredeposit = Nyersanyagtárolás csak a támaszpontban.
+bar.drilltierreq = Erősebb fúró szükséges
+bar.nobatterypower = Alacsony akkumulátor-töltöttség
+bar.noresources = Hiányzó nyersanyagok
+bar.corereq = Támaszpont szükséges
+bar.corefloor = Támaszpont-zónamező szükséges
+bar.cargounitcap = Az egység raktere megtelt
+bar.drillspeed = Termelés: {0}/mp
+bar.pumpspeed = Termelés: {0}/mp
+bar.efficiency = Hatásfok: {0}%
+bar.boost = Erősítés: +{0}%
+bar.powerbuffer = Akkumulátorok: {0}/{1}
+bar.powerbalance = �ram: {0}/mp
+bar.powerstored = Eltárolva: {0}/{1}
+bar.poweramount = Kapacitás: {0}
+bar.poweroutput = �ramtermelés: {0}
+bar.powerlines = Kapcsolatok: {0}/{1}
+bar.items = Nyersanyagok: {0}
+bar.capacity = Tárhely: {0}
 bar.unitcap = {0} {1}/{2}
-bar.liquid = Liquid
-bar.heat = Heat
-bar.power = Power
-bar.progress = Build Progress
-bar.input = Input
-bar.output = Output
+bar.liquid = Folyadék
+bar.heat = HÅ‘
+bar.cooldown = Lehűlés
+bar.instability = Instabilitás
+bar.heatamount = HÅ‘: {0}
+bar.heatpercent = HÅ‘: {0} ({1}%)
+bar.power = �ram
+bar.progress = Építés állapota
+bar.loadprogress = �llapot
+bar.launchcooldown = Kilövés visszaszámlálása
+bar.input = Bemenet
+bar.output = Kimenet
+bar.strength = [stat]{0}[lightgray]x erő
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]Processzorvezérelt
 
-bullet.damage = [stat]{0}[lightgray] damage
-bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
-bullet.incendiary = [stat]incendiary
-bullet.sapping = [stat]sapping
-bullet.homing = [stat]homing
-bullet.shock = [stat]shock
-bullet.frag = [stat]frag
-bullet.buildingdamage = [stat]{0}%[lightgray] building damage
-bullet.knockback = [stat]{0}[lightgray] knockback
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.healpercent = [stat]{0}[lightgray]% healing
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
-bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.damage = [stat]{0}[lightgray] sebzés
+bullet.splashdamage = [stat]{0}[lightgray] területi sebzés ~[stat] {1}[lightgray] mező
+bullet.incendiary = [stat]gyújtó
+bullet.homing = [stat]nyomkövető
+bullet.armorpierce = [stat]páncéltörő
+bullet.maxdamagefraction = [stat]{0}%[lightgray] sebzési határérték
+bullet.suppression = [stat]{0} mp[lightgray] javításelnyomás ~[stat]{1}[lightgray] mező
+bullet.interval = [stat]{0}/mp[lightgray] gyakoriságú lövedékek:
+bullet.frags = [stat]{0}[lightgray]db repeszlövedék:
+bullet.lightning = [stat]{0}[lightgray]db villámcsapás ~[stat]{1}[lightgray] sebzés
+bullet.buildingdamage = [stat]{0}%[lightgray] épületsebzés
+bullet.shielddamage = [stat]{0}%[lightgray] pajzssebzés
+bullet.knockback = [stat]{0}[lightgray] hátralökés
+bullet.pierce = [stat]{0}[lightgray]x átütő erő
+bullet.infinitepierce = [stat]átütő erő
+bullet.healpercent = [stat]{0}%[lightgray] javítás
+bullet.healamount = [stat]{0}[lightgray] közvetlen javítás
+bullet.multiplier = [stat]{0}[lightgray] lőszer/nyersanyag
+bullet.reload = [stat]{0}%[lightgray] tüzelési sebesség
+bullet.range = [stat]{0}[lightgray] mezős hatótávolság
+bullet.notargetsmissiles = [stat] Nem veszi célba a rakétákat
+bullet.notargetsbuildings = [stat] Nem veszi célba az épületeket
 
-unit.blocks = blocks
-unit.blockssquared = 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.blocks = blokk
+unit.blockssquared = blokk²
+unit.powersecond = áramegység/mp
+unit.tilessecond = mező/mp
+unit.liquidsecond = folyadékegység/mp
+unit.itemssecond = nyersanyag/mp
+unit.liquidunits = folyadékegység
+unit.powerunits = áramegység
+unit.heatunits = hőegység
+unit.degrees = fok
+unit.seconds = másodperc
+unit.minutes = perc
+unit.persecond = /mp
+unit.perminute = /perc
+unit.timesspeed = x sebesség
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = shield health
-unit.items = items
+unit.shieldhealth = erőpajzs életereje
+unit.items = nyersanyag
 unit.thousands = k
 unit.millions = mil
-unit.billions = b
-unit.pershot = /shot
-category.purpose = Purpose
-category.general = General
-category.power = Power
-category.liquids = Liquids
-category.items = Items
-category.crafting = Input/Output
-category.function = Function
-category.optional = Optional Enhancements
-setting.landscape.name = Lock Landscape
+unit.billions = Mrd
+unit.shots = lövés
+unit.pershot = /lövés
+category.purpose = Rendeltetés
+category.general = �ltalános
+category.power = �ram
+category.liquids = Folyadékok
+category.items = Nyersanyagok
+category.crafting = Bemenet/kimenet
+category.function = Funkció
+category.optional = Lehetséges fejlesztések
+setting.alwaysmusic.name = Folyamatos zenelejátszás
+setting.alwaysmusic.description = Amikor engedélyezve van, akkor a zene folyamatosan szól a játékban.\nHa ki van kapcsolva, akkor csak véletlenszerű időközönként szólal meg.
+setting.skipcoreanimation.name = Támaszpont kilövés/leszállás animáció kihagyása
+setting.landscape.name = Fekvő mód zárolása
 setting.shadows.name = �rnyékok
-setting.blockreplace.name = Automatikus blokk javaslatok
+setting.blockreplace.name = Automatikus blokkjavaslatok
 setting.linear.name = Lineáris szűrés
-setting.hints.name = Tippek
-setting.flow.name = Az erőforrás áramlási sebességének megjelenítése
-setting.backgroundpause.name = Szünet a háttérben
+setting.hints.name = Tanácsok
+setting.logichints.name = Logikai tanácsok
+setting.backgroundpause.name = Szüneteltetés a háttérben
 setting.buildautopause.name = Automatikus szünet építéskor
-setting.animatedwater.name = Animált víz
-setting.animatedshields.name = Animált pajzsok
-setting.antialias.name = Antialias[lightgray] (újra kell indítani)[]
-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.doubletapmine.name = Bányászás dupla kattintással/koppintással
+setting.commandmodehold.name = Lenyomva tartás a parancs módhoz
+setting.distinctcontrolgroups.name = Egységenként legfeljebb egy vezérlőcsoport
+setting.modcrashdisable.name = Modok letiltása indításkori összeomláskor
+setting.animatedwater.name = Animált felületek
+setting.animatedshields.name = Animált erőpajzsok
+setting.playerindicators.name = Játékosjelzők
+setting.indicators.name = Ellenségjelzők
+setting.autotarget.name = Automatikus célzás
+setting.keyboard.name = Irányítás egérrel és billentyűzettel
+setting.touchscreen.name = Irányítás érintőképernyővel
+setting.fpscap.name = FPS-korlát
+setting.fpscap.none = Nincs
 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 = Könnyű
-setting.difficulty.normal = közepes
-setting.difficulty.hard = Nehéz
-setting.difficulty.insane = �rült
-setting.difficulty.name = Nehézség:
-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.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.uiscale.name = Felület méretezése
+setting.uiscale.description = A módosítások érvénybe lépéséhez újraindítás szükséges.
+setting.swapdiagonal.name = Mindig átlós elhelyezés
+setting.screenshake.name = Képernyő rázkódása
+setting.bloomintensity.name = Bloom intenzitása
+setting.bloomblur.name = Bloom elmosása
+setting.effects.name = Hatások megjelenítése
+setting.destroyedblocks.name = Lerombolt építmények megjelenítése
+setting.blockstatus.name = Blokkok állapotának megjelenítése
+setting.conveyorpathfinding.name = Szállítószalag útvonalkeresése építéskor
+setting.sensitivity.name = Kontroller érzékenysége
+setting.saveinterval.name = Mentési időköz
+setting.seconds = {0} másodperc
+setting.milliseconds = {0} ezredmásodperc
+setting.fullscreen.name = Teljes képernyő
+setting.borderlesswindow.name = Keret nélküli ablak
+setting.borderlesswindow.name.windows = Keret nélküli teljes képernyő
+setting.borderlesswindow.description = A változtatások érvénybe lépéséhez újraindításra lehet szükség.
+setting.fps.name = FPS, memóriahasználat és ping megjelenítése
+setting.console.name = Konzol engedélyezése
+setting.smoothcamera.name = Egyenletes kamera
 setting.vsync.name = VSync
-setting.pixelate.name = Pixelate
-setting.minimap.name = Show Minimap
-setting.coreitems.name = Display Core Items
-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
-setting.showweather.name = Show Weather Graphics
-public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
-public.confirm.really = If you want to play with friends, use [green]Invite Friend[] instead of a [scarlet]Public server[]!\nAre you sure you want to make your game [scarlet]public[]?
-public.beta = Note that beta versions of the game cannot make public lobbies.
-uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
-uiscale.cancel = Cancel & Exit
+setting.pixelate.name = Pixelesítés
+setting.minimap.name = Minitérkép megjelenítése
+setting.coreitems.name = Támaszpontban lévő nyersanyagok megjelenítése
+setting.position.name = Játékos pozíciójának megjelenítése
+setting.mouseposition.name = Egér pozíciójának megjelenítése
+setting.musicvol.name = Zene hangereje
+setting.atmosphere.name = Bolygóatmoszféra megjelenítése
+setting.drawlight.name = Sötét/világos fényhatások
+setting.ambientvol.name = Környezeti hangerő
+setting.mutemusic.name = Zene némítása
+setting.sfxvol.name = Hanghatások hangereje
+setting.mutesound.name = Hang némítása
+setting.crashreport.name = Névtelen összeomlási jelentések
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = Automatikus mentés
+setting.steampublichost.name = Nyilvános játék láthatósága
+setting.playerlimit.name = Játékoskorlát
+setting.chatopacity.name = Csevegő átlátszatlansága
+setting.lasersopacity.name = Villanyvezeték átlátszatlansága
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Híd átlátszatlansága
+setting.playerchat.name = Játékosok csevegőbuborékainak megjelenítése
+setting.showweather.name = Időjárás-grafika megjelenítése
+setting.hidedisplays.name = Logikai kijelzők elrejtése
+setting.macnotch.name = A felület igazítása a kijelző bevágásához
+setting.macnotch.description = A változtatások érvénybe lépéséhez újraindítás szükséges
+steam.friendsonly = Csak barátok
+steam.friendsonly.tooltip = Csak a Steam-barátok tudnak kapcsolódni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz – bárki kapcsolódhat hozzá.
+public.beta = Ne feledd, hogy a játék béta verziójában nem tudsz nyilvános szobát nyitni.
+uiscale.reset = A felület mérete megváltozott.\nAz „OK� gombbal megerősítheted ezt a méretet.\n[scarlet]Automatikus visszavonás és kilépés [accent] {0}[] másodperc múlva…
+uiscale.cancel = Mégse és kilépés
 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.planet_map.name = Planet Map
-keybind.research.name = Research
-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.chat_mode.name = Change Chat Mode
-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
+keybind.title = Billentyűk átállítása
+keybinds.mobile = [scarlet]A legtöbb billentyűfunkció mobilon nem működik. Csak a mozgás támogatott.
+category.general.name = �ltalános
+category.view.name = Nézet
+category.command.name = Egységparancs
+category.multiplayer.name = Többjátékos
+category.blocks.name = Blokkválasztás
+placement.blockselectkeys = \n[lightgray]Kulcs: [{0},
+keybind.respawn.name = Újraéledés
+keybind.control.name = Egység irányítása
+keybind.clear_building.name = Épület törlése
+keybind.press = Nyomj meg egy gombot…
+keybind.press.axis = Nyomj meg egy kart vagy gombot…
+keybind.screenshot.name = Pálya képernyőképe
+keybind.toggle_power_lines.name = Villanyvezetékek be/ki
+keybind.toggle_block_status.name = Blokkállapotok be/ki
+keybind.move_x.name = Mozgás vízszintesen
+keybind.move_y.name = Mozgás függőlegesen
+keybind.mouse_move.name = Egér követése
+keybind.pan.name = Felderítés
+keybind.boost.name = Erősítés
+keybind.command_mode.name = Parancs mód
+keybind.command_queue.name = Egységparancsok sorba állítása
+keybind.create_control_group.name = Vezérlőcsoport készítése
+keybind.cancel_orders.name = Parancsok visszavonása
+
+keybind.unit_stance_shoot.name = Egység viselkedése: lövés
+keybind.unit_stance_hold_fire.name = Egység viselkedése: tüzet szüntess
+keybind.unit_stance_pursue_target.name = Egység viselkedése: célpont követése
+keybind.unit_stance_patrol.name = Egység viselkedése: járőrözés
+keybind.unit_stance_ram.name = Egység viselkedése: ütközés
+
+keybind.unit_command_move.name = Egységparancs: mozgás
+keybind.unit_command_repair.name = Egységparancs: javítás
+keybind.unit_command_rebuild.name = Egységparancs: újraépítés
+keybind.unit_command_assist.name = Egységparancs: támogatás
+keybind.unit_command_mine.name = Egységparancs: bányászás
+keybind.unit_command_boost.name = Egységparancs: erősítés
+keybind.unit_command_load_units.name = Egységparancs: egységek berakodása
+keybind.unit_command_load_blocks.name = Egységparancs: blokkok berakodása
+keybind.unit_command_unload_payload.name = Egységparancs: kirakodás
+keybind.unit_command_enter_payload.name = Egységparancs: berakodás
+keybind.unit_command_loop_payload.name = Egységparancs: folyamatos egységelszállítás
+
+keybind.rebuild_select.name = Régió újraépítése
+keybind.schematic_select.name = Terület kijelölése
+keybind.schematic_menu.name = Vázlat menü
+keybind.schematic_flip_x.name = Vázlat tükrözése vízszintesen
+keybind.schematic_flip_y.name = Vázlat tükrözése függőlegesen
+keybind.category_prev.name = Előző kategória
+keybind.category_next.name = Következő kategória
+keybind.block_select_left.name = Blokk váltás balra
+keybind.block_select_right.name = Blokk váltás jobbra
+keybind.block_select_up.name = Blokk váltás fel
+keybind.block_select_down.name = Blokk váltás le
+keybind.block_select_01.name = 1. kategória/blokk választása
+keybind.block_select_02.name = 2. kategória/blokk választása
+keybind.block_select_03.name = 3. kategória/blokk választása
+keybind.block_select_04.name = 4. kategória/blokk választása
+keybind.block_select_05.name = 5. kategória/blokk választása
+keybind.block_select_06.name = 6. kategória/blokk választása
+keybind.block_select_07.name = 7. kategória/blokk választása
+keybind.block_select_08.name = 8. kategória/blokk választása
+keybind.block_select_09.name = 9. kategória/blokk választása
+keybind.block_select_10.name = 10. kategória/blokk választása
+keybind.fullscreen.name = Teljes képernyő be/ki
+keybind.select.name = Kiválasztás/lövés
+keybind.diagonal_placement.name = �tlós elhelyezés
+keybind.pick.name = Blokk kiválasztása
+keybind.break_block.name = Blokk törlése
+keybind.select_all_units.name = Összes egység kijelölése
+keybind.select_all_unit_factories.name = Összes egységgyár kijelölése
+keybind.deselect.name = Blokk-kijelölés törlése
+keybind.pickupCargo.name = Rakomány felvétele
+keybind.dropCargo.name = Rakomány lerakása
+keybind.shoot.name = Lövés
+keybind.zoom.name = Nagyítás
+keybind.menu.name = Menü
+keybind.pause.name = Szünet
+keybind.pause_building.name = Építés szüneteltetése/folytatása
+keybind.minimap.name = Minitérkép
+keybind.planet_map.name = Bolygótérkép
+keybind.research.name = Fejlesztés
+keybind.block_info.name = Blokk infó
+keybind.chat.name = Csevegés
+keybind.player_list.name = Játékosok listája
+keybind.console.name = Konzol
+keybind.rotate.name = Forgatás
+keybind.rotateplaced.name = Meglévő forgatása (nyomva tartva)
+keybind.toggle_menus.name = Menük be/ki
+keybind.chat_history_prev.name = Csevegés görgetése felfelé
+keybind.chat_history_next.name = Csevegés görgetése lefelé
+keybind.chat_scroll.name = Csevegés görgetése
+keybind.chat_mode.name = Csevegési mód megváltoztatása
+keybind.drop_unit.name = Egység eldobása
+keybind.zoom_minimap.name = Nagyítás a minitérképen
+mode.help.title = Játékmódok leírása
+mode.survival.name = Túlélés
+mode.survival.description = A normál mód. Korlátozott nyersanyagok, és automatikusan érkező hullámok.\n[gray]Ellenséges kezdőpont szükséges hozzá a pályán.
+mode.sandbox.name = Homokozó
+mode.sandbox.description = Végtelen nyersanyagforrás, nincs időzítés a hullámokhoz.
+mode.editor.name = Szerkesztő
 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
+mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Legalább két különböző színű támaszpont szükséges hozzá a pályán.
+mode.attack.name = Támadás
+mode.attack.description = Pusztítsd el az ellenség bázisát. \n[gray]Piros támaszpont szükséges hozzá a pályán.
+mode.custom = Egyéni szabályok
 
-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
-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.enemyLights = Enemy Lights
-rules.fire = Fire
-rules.explosions = Block/Unit Explosion Damage
-rules.ambientlight = Ambient Light
-rules.weather = Weather
-rules.weather.frequency = Frequency:
-rules.weather.always = Always
-rules.weather.duration = Duration:
+rules.invaliddata = Érvénytelen adatok vannak a vágólapon.
+rules.hidebannedblocks = Tiltott épületek elrejtése
+rules.infiniteresources = Végtelen nyersanyagforrás
+rules.onlydepositcore = Csak a támaszpontok elhelyezése engedélyezett
+rules.derelictrepair = Az elhagyatott épületek javításának engedélyezése
+rules.reactorexplosions = Reaktorrobbanások
+rules.coreincinerates = Többletnyersanyagok megsemmisítése a támaszpontban
+rules.disableworldprocessors = Világprocesszorok letiltása
+rules.schematic = Vázlatok engedélyezése
+rules.wavetimer = Hullámok időzítése
+rules.wavesending = Hullámok küldése
+rules.allowedit = Szabályok szerkesztésének engedélyezése
+rules.allowedit.info = Amikor engedélyezve van, akkor a játékos szerkesztheti a szabályokat a játékban a „Szünet� menü bal alsó sarkában található gomb segítségével.
+rules.alloweditworldprocessors = Világprocesszorok szerkesztésének engedélyezése
+rules.alloweditworldprocessors.info = Amikor engedélyezve van, a világlogikai blokkok a szerkesztőn kívül is elhelyezhetők és szerkeszthetők.
+rules.waves = Hullámok
+rules.airUseSpawns = A légi egységek használjanak kezdőpontokat
+rules.attack = Támadási mód
+rules.buildai = Bázisépítő MI
+rules.buildaitier = Építő MI szintje
+rules.rtsai = RTS MI [red](WIP)
+rules.rtsai.campaign = RTS Támadó MI
+rules.rtsai.campaign.info = A „támadó� pályákon (ahol az ellenség is rendelkezik támaszponttal) az MI által irányított\negységek csoportosulnak, és intelligensebb módon támadják a játékosok bázisait.
+rules.rtsminsquadsize = Minimális osztagméret
+rules.rtsmaxsquadsize = Maximális osztagméret
+rules.rtsminattackweight = Minimális támadási súly
+rules.cleanupdeadteams = Legyőzött csapatok épületeinek törlése (PvP)
+rules.corecapture = Támaszpont elfoglalása megsemmisítéskor
+rules.polygoncoreprotection = Poligonális támaszpontvédelem
+rules.placerangecheck = Elhelyezési tartomány ellenőrzése
+rules.enemyCheat = Végtelen ellenséges csapaterőforrások
+rules.blockhealthmultiplier = Épület életpontszorzója
+rules.blockdamagemultiplier = Épület sebzésszorzója
+rules.unitbuildspeedmultiplier = Egységgyártás sebességének szorzója
+rules.unitcostmultiplier = Egység költségszorzója
+rules.unithealthmultiplier = Egység életpontszorzója
+rules.unitdamagemultiplier = Egység sebzésszorzója
+rules.unitcrashdamagemultiplier = Egység ütközési sebzésszorzója
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Napenergia szorzója
+rules.unitcapvariable = A támaszpontok befolyásolják a gyártható egységek darabszámát
+rules.unitpayloadsexplode = A szállított rakományok az egységgel együtt felrobbannak
+rules.unitcap = Alap egységdarabszám
+rules.limitarea = Játékterület korlátozása
+rules.enemycorebuildradius = Ellenséges támaszpont körüli tiltott építkezési zóna sugara:[lightgray] (mező)
+rules.extracorebuildradius = Tiltott építkezési zóna sugarának további mérete:[lightgray] (mező)
+rules.wavespacing = A hullámok közötti szünetek ideje:[lightgray] (mp)
+rules.initialwavespacing = Az első hullám előtti szünet ideje:[lightgray] (mp)
+rules.buildcostmultiplier = Építési költség szorzója
+rules.buildspeedmultiplier = Építési sebesség szorzója
+rules.deconstructrefundmultiplier = Bontási visszatérítés szorzója
+rules.waitForWaveToEnd = Az ellenség kivárja a korábbi hullám végét
+rules.wavelimit = A pálya érjen véget ennyi hullám után
+rules.dropzoneradius = A ledobási zóna sugara:[lightgray] (mező)
+rules.unitammo = Az egységeknek lőszer kell [red](eltávolítható)
+rules.enemyteam = Ellenséges csapat
+rules.playerteam = Saját csapat
+rules.title.waves = Hullámok
+rules.title.resourcesbuilding = Nyersanyagforrások és épületek
+rules.title.enemy = Ellenségek
+rules.title.unit = Egységek
+rules.title.experimental = Kísérleti
+rules.title.environment = Környezet
+rules.title.teams = Csapatok
+rules.title.planet = Bolygó
+rules.lighting = Világítás
+rules.fog = A háború köde
+rules.invasions = Ellenséges szektorokból érkező inváziók
+rules.legacylaunchpads = Hagyományos kilövőállás-mechanizmus
+rules.legacylaunchpads.info = Lehetővé teszi a kilövőállások használatát landolóállások nélkül, mint a v7.0-ban.
+landingpad.legacy.disabled = [scarlet]\ue815 Letiltva[lightgray] (Hagyományos kilövőállás engedélyezve)
+rules.showspawns = Ellenséges kezdőpontok megjelenítése a minitérképen
+rules.randomwaveai = Kiszámíthatatlan ellenséges támadások (MI)
+rules.fire = Tűz
+rules.anyenv = <Bármelyik>
+rules.explosions = Épület/egység robbanási sebzése
+rules.ambientlight = Háttérvilágítás
+rules.weather = Időjárás
+rules.weather.frequency = Gyakoriság:
+rules.weather.always = Mindig
+rules.weather.duration = Időtartam:
 
-content.item.name = Items
-content.liquid.name = Liquids
-content.unit.name = Units
-content.block.name = Blocks
-content.sector.name = Sectors
+rules.randomwaveai.info = A hullámokban érkező egységek a támaszpont vagy az áramfejlesztők\nközvetlen támadása helyett véletlenszerű építményeket vesznek célba.
+rules.placerangecheck.info = Megakadályozza, hogy a játékosok lövegtornyokat helyezzenek el az ellenséges épületek közelében.\nAmikor megpróbálnak egy lövegtornyot elhelyezni, az építési távolság megnő, így a lövegtorony nem fogja elérni az ellenséget.
+rules.onlydepositcore.info = Megakadályozza, hogy az egységek nyersanyagokat helyezzenek el a támaszponton kívül más épületekbe.
 
-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
+content.item.name = Nyersanyagok
+content.liquid.name = Folyadékok
+content.unit.name = Egységek
+content.block.name = Blokkok
+content.status.name = �llapothatások
+content.sector.name = Szektorok
+content.team.name = Csapatok
+
+wallore = (Fal)
+
+item.copper.name = Réz
+item.lead.name = Ólom
+item.coal.name = Szén
+item.graphite.name = Grafit
+item.titanium.name = Titán
+item.thorium.name = Tórium
+item.silicon.name = Szilícium
+item.plastanium.name = Műanyag
+item.phase-fabric.name = Tóritkvarc
+item.surge-alloy.name = Elektrometál
+item.spore-pod.name = Spórakapszula
+item.sand.name = Homok
+item.blast-compound.name = Robbanóelegy
+item.pyratite.name = Piratit
+item.metaglass.name = Ólomüveg
+item.scrap.name = Törmelék
+item.fissile-matter.name = Hasadóanyag
+item.beryllium.name = Berillium
+item.tungsten.name = Volfrám
+item.oxide.name = Oxid
+item.carbide.name = Karbid
+item.dormant-cyst.name = Nyugvó ciszta
+
+liquid.water.name = Víz
+liquid.slag.name = Salak
+liquid.oil.name = Olaj
+liquid.cryofluid.name = Hűtőfolyadék
+liquid.neoplasm.name = Neoplazma
+liquid.arkycite.name = Arkicit
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ózon
+liquid.hydrogen.name = Hidrogén
+liquid.nitrogen.name = Nitrogén
+liquid.cyanogen.name = Dicián
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -1023,6 +1530,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1031,475 +1543,1156 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Összeszerelő drón
+unit.latum.name = Latum
+unit.renale.name = Renale
+
 block.parallax.name = Parallax
-block.cliff.name = Cliff
-block.sand-boulder.name = Sand Boulder
-block.basalt-boulder.name = Basalt Boulder
-block.grass.name = Grass
-block.slag.name = Slag
-block.space.name = Space
-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.dacite-boulder.name = Dacite Boulder
-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.cliff.name = Szirt
+block.sand-boulder.name = Homokszikla
+block.basalt-boulder.name = Bazaltszikla
+block.grass.name = Fű
+block.molten-slag.name = Salak
+block.pooled-cryofluid.name = Hűtőfolyadék
+block.space.name = Å°r
+block.salt.name = Só
+block.salt-wall.name = Sófal
+block.pebbles.name = Kavicsok
+block.tendrils.name = Indák
+block.sand-wall.name = Homokfal
+block.spore-pine.name = Spórafenyő
+block.spore-wall.name = Spórafal
+block.boulder.name = Szikla
+block.snow-boulder.name = Havas szikla
+block.snow-pine.name = Havas fenyő
+block.shale.name = Pala
+block.shale-boulder.name = Palaszikla
+block.moss.name = Moha
+block.shrubs.name = Cserjék
+block.spore-moss.name = Spóramoha
+block.shale-wall.name = Palafal
+block.scrap-wall.name = Törmelékfal
+block.scrap-wall-large.name = Nagy törmelékfal
+block.scrap-wall-huge.name = Hatalmas törmelékfal
+block.scrap-wall-gigantic.name = Gigantikus törmelékfal
+block.thruster.name = Hajtómű
+block.kiln.name = Kemence
+block.graphite-press.name = Grafitprés
+block.multi-press.name = Grafitsajtoló
+block.constructing = {0} [lightgray](építés alatt)
+block.spawn.name = Ellenséges kezdőpont
+block.remove-wall.name = Fal eltávolítása
+block.remove-ore.name = Érc eltávolítása
+block.core-shard.name = Szilánk
+block.core-foundation.name = Alapítvány
+block.core-nucleus.name = Atommag
+block.deep-water.name = Mély víz
+block.shallow-water.name = Víz
+block.tainted-water.name = Szennyezett víz
+block.deep-tainted-water.name = Mély szennyezett víz
+block.darksand-tainted-water.name = Sötét homokkal szennyezett víz
+block.tar.name = Kátrány
+block.stone.name = KÅ‘
+block.sand-floor.name = Homok
+block.darksand.name = Sötét homok
+block.ice.name = Jég
+block.snow.name = Hó
+block.crater-stone.name = Kráterek
+block.sand-water.name = Homokvíz
+block.darksand-water.name = Sötét homokvíz
+block.char.name = Faszén
+block.dacite.name = Dácit
+block.rhyolite.name = Riolit
+block.dacite-wall.name = Dácitfal
+block.dacite-boulder.name = Dácitszikla
+block.ice-snow.name = Jéghó
+block.stone-wall.name = KÅ‘fal
+block.ice-wall.name = Jégfal
+block.snow-wall.name = Hófal
+block.dune-wall.name = Dűnefal
+block.pine.name = Fenyő
+block.dirt.name = Sár
+block.dirt-wall.name = Sárfal
+block.mud.name = Iszap
+block.white-tree-dead.name = Kiszáradt fehér fa
+block.white-tree.name = Fehér fa
+block.spore-cluster.name = Spórafürt
+block.metal-floor.name = 1. fémpadló
+block.metal-floor-2.name = 2. fémpadló
+block.metal-floor-3.name = 3. fémpadló
+block.metal-floor-4.name = 4. fémpadló
+block.metal-floor-5.name = 5. fémpadló
+block.metal-floor-damaged.name = Sérült fémpadló
+block.dark-panel-1.name = 1. sötét panel
+block.dark-panel-2.name = 2. sötét panel
+block.dark-panel-3.name = 3. sötét panel
+block.dark-panel-4.name = 4. sötét panel
+block.dark-panel-5.name = 5. sötét panel
+block.dark-panel-6.name = 6. sötét panel
+block.dark-metal.name = Sötét fém
+block.basalt.name = Bazalt
+block.hotrock.name = Forró kőzet
+block.magmarock.name = Magmás kőzet
+block.copper-wall.name = Rézfal
+block.copper-wall-large.name = Nagy rézfal
+block.titanium-wall.name = Titánfal
+block.titanium-wall-large.name = Nagy titánfal
+block.plastanium-wall.name = Műanyagfal
+block.plastanium-wall-large.name = Nagy műanyagfal
+block.phase-wall.name = Tóritkvarcfal
+block.phase-wall-large.name = Nagy tóritkvarcfal
+block.thorium-wall.name = Tóriumfal
+block.thorium-wall-large.name = Nagy tóriumfal
+block.door.name = Ajtó
+block.door-large.name = Nagy ajtó
 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.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.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 Source
-block.unloader.name = Unloader
-block.vault.name = Vault
+block.conveyor.name = Szállítószalag
+block.titanium-conveyor.name = Titán szállítószalag
+block.plastanium-conveyor.name = Műanyag szállítószalag
+block.armored-conveyor.name = Páncélozott szállítószalag
+block.junction.name = �tkötés
+block.router.name = Elosztó
+block.distributor.name = Szétosztó
+block.sorter.name = Válogató
+block.inverted-sorter.name = Fordított válogató
+block.message.name = Ãœzenet
+block.reinforced-message.name = Megerősített üzenet
+block.world-message.name = Világüzenet
+block.world-switch.name = Világkapcsoló
+block.illuminator.name = Világítótest
+block.overflow-gate.name = Túlcsorduló kapu
+block.underflow-gate.name = Alulcsorduló kapu
+block.silicon-smelter.name = Szilíciumkohó
+block.phase-weaver.name = Tóritkvarcképző
+block.pulverizer.name = Törmelékdaráló
+block.cryofluid-mixer.name = Hűtőfolyadék-keverő
+block.melter.name = Olvasztó
+block.incinerator.name = Égetőkamra
+block.spore-press.name = Spóraprés
+block.separator.name = Leválasztó
+block.coal-centrifuge.name = Széncentrifuga
+block.power-node.name = Villanyoszlop
+block.power-node-large.name = Nagy villanyoszlop
+block.surge-tower.name = Villanytorony
+block.diode.name = Akkumulátordióda
+block.battery.name = Akkumulátor
+block.battery-large.name = Nagy akkumulátor
+block.combustion-generator.name = Égetőerőmű
+block.steam-generator.name = Gőzerőmű
+block.differential-generator.name = Differenciál-erőmű
+block.impact-reactor.name = Ütközéses erőmű
+block.mechanical-drill.name = Mechanikus fúró
+block.pneumatic-drill.name = Pneumatikus fúró
+block.laser-drill.name = Lézerfúró
+block.water-extractor.name = Kútfúró torony
+block.cultivator.name = Betakarító
+block.conduit.name = Csővezeték
+block.mechanical-pump.name = Mechanikus szivattyú
+block.item-source.name = Nyersanyagforrás
+block.item-void.name = Nyersanyagnyelő
+block.liquid-source.name = Folyadékforrás
+block.liquid-void.name = Folyadéknyelő
+block.power-void.name = �ramnyelő
+block.power-source.name = �ramforrás
+block.unloader.name = Kirakodó
+block.vault.name = Raktár
 block.wave.name = Wave
 block.tsunami.name = Tsunami
 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.phase-conveyor.name = Tóritkvarc szállítószalag
+block.bridge-conveyor.name = Szállítószalag-híd
+block.plastanium-compressor.name = Műanyagsűrítő
+block.pyratite-mixer.name = Piratitkeverő
+block.blast-mixer.name = Robbanóelegy-keverő
+block.solar-panel.name = Napelem
+block.solar-panel-large.name = Nagy napelem
+block.oil-extractor.name = Olajfúró torony
+block.repair-point.name = Javítási pont
+block.repair-turret.name = Javítótorony
+block.pulse-conduit.name = Impulzus-csővezeték
+block.plated-conduit.name = Lemezelt csővezeték
+block.phase-conduit.name = Tóritkvarc-csővezeték
+block.liquid-router.name = Folyadékelosztó
+block.liquid-tank.name = Folyadéktartály
+block.liquid-container.name = Folyadéktározó
+block.liquid-junction.name = Csővezeték-átkötés
+block.bridge-conduit.name = Csővezetékhíd
+block.rotary-pump.name = Fogaskerekes szivattyú
+block.thorium-reactor.name = Tóriumerőmű
+block.mass-driver.name = Tömegmozgató
+block.blast-drill.name = Légrobbanásos fúró
+block.impulse-pump.name = Impulzusszivattyú
+block.thermal-generator.name = Hőerőmű
+block.surge-smelter.name = Elektrometál-olvasztó
+block.mender.name = Foltozó
+block.mend-projector.name = Foltozó-kivetítő
+block.surge-wall.name = Elektrometálfal
+block.surge-wall-large.name = Nagy elektrometálfal
 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.shock-mine.name = Sokkoló taposóakna
+block.overdrive-projector.name = Túlhajtó kivetítő
+block.force-projector.name = Erőpajzs-kivetítő
 block.arc.name = Arc
-block.rtg-generator.name = RTG Generator
+block.rtg-generator.name = R. T. Generátor
 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.container.name = Konténer
+block.launch-pad.name = Kilövőállás [lightgray](Hagyományos)
+block.advanced-launch-pad.name = Kilövőállás
+block.landing-pad.name = Landolóállás
+
 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 = Payload Conveyor
-block.payload-router.name = Payload Router
-block.disassembler.name = Disassembler
-block.silicon-crucible.name = Silicon Crucible
-block.overdrive-dome.name = Overdrive Dome
-#experimental, may be removed
-block.block-forge.name = Block Forge
-block.block-loader.name = Block Loader
-block.block-unloader.name = Block Unloader
-block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.ground-factory.name = Földiegységgyár
+block.air-factory.name = Repülőgépgyár
+block.naval-factory.name = Hadihajógyár
+block.additive-reconstructor.name = Additív újratervező
+block.multiplicative-reconstructor.name = Multiplikatív újratervező
+block.exponential-reconstructor.name = Exponenciális újratervező
+block.tetrative-reconstructor.name = Tetratív újratervező
+block.payload-conveyor.name = Rakományszállító-szalag
+block.payload-router.name = Rakomány-elosztó
+block.duct.name = Szállítószalag
+block.duct-router.name = Szállítószalag-elosztó
+block.duct-bridge.name = Szállítószalaghíd
+block.large-payload-mass-driver.name = Nagy rakomány-tömegmozgató
+block.payload-void.name = Rakománynyelő
+block.payload-source.name = Rakományforrás
+block.disassembler.name = Szétválasztó
+block.silicon-crucible.name = Szilíciumolvasztó
+block.overdrive-dome.name = Túlhajtó búra
+block.interplanetary-accelerator.name = Bolygóközi gyorsító
+block.constructor.name = Építő
+block.constructor.description = Legfeljebb 2×2-es mezőméretű épületeket gyárt.
+block.large-constructor.name = Nagy építő
+block.large-constructor.description = Akár 4×4-es mezőméretű épületeket is gyárt.
+block.deconstructor.name = Nagy lebontó
+block.deconstructor.description = Lebontja az épületeket és az egységeket. Visszaadja az építési költség 100%-át.
+block.payload-loader.name = Rakománycsomagoló
+block.payload-loader.description = A folyadékokat és a nyersanyagokat blokkokba csomagolja.
+block.payload-unloader.name = Rakománykibontó
+block.payload-unloader.description = Kibontja a folyadékokból és nyersanyagokból álló blokkokat.
+block.heat-source.name = Hőforrás
+block.heat-source.description = Nagy hőmennyiséget bocsát ki. Csak homokozó módban.
 
-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
+#Erekir
+block.empty.name = Ãœres
+block.rhyolite-crater.name = Riolit kráter
+block.rough-rhyolite.name = Durva riolit
+block.regolith.name = Regolit
+block.yellow-stone.name = Sárga kő
+block.carbon-stone.name = Szénkő
+block.ferric-stone.name = Vasas kő
+block.ferric-craters.name = Vasas kráterek
+block.beryllic-stone.name = Berilliumos kő
+block.crystalline-stone.name = Kristályos kő
+block.crystal-floor.name = Kristálytalaj
+block.yellow-stone-plates.name = Sárga kőlemezek
+block.red-stone.name = Vörös kő
+block.dense-red-stone.name = Sűrű vörös kő
+block.red-ice.name = Vörös jég
+block.arkycite-floor.name = Arkicit
+block.arkyic-stone.name = Arkicites kő
+block.rhyolite-vent.name = Riolitkürtő
+block.carbon-vent.name = Szénkürtő
+block.arkyic-vent.name = Arkicites kürtő
+block.yellow-stone-vent.name = Sárgakő-kürtő
+block.red-stone-vent.name = Vöröskő-kürtő
+block.crystalline-vent.name = Kristályos kürtő
+block.redmat.name = Vörös padló
+block.bluemat.name = Kék padló
+block.core-zone.name = Támaszpontzóna
+block.regolith-wall.name = Regolitfal
+block.yellow-stone-wall.name = Sárgakő-fal
+block.rhyolite-wall.name = Riolitfal
+block.carbon-wall.name = Szénfal
+block.ferric-stone-wall.name = Vasaskő-fal
+block.beryllic-stone-wall.name = Berilliumoskő-fal
+block.arkyic-wall.name = Arkicites fal
+block.crystalline-stone-wall.name = Kristályos kőfal
+block.red-ice-wall.name = Vörösjég-fal
+block.red-stone-wall.name = Vöröskő-fal
+block.red-diamond-wall.name = Vörösgyémánt-fal
+block.redweed.name = Vörös fű
+block.pur-bush.name = Lila bokor
+block.yellowcoral.name = Sárga korall
+block.carbon-boulder.name = Szénszikla
+block.ferric-boulder.name = Vasas szikla
+block.beryllic-boulder.name = Berilliumos szikla
+block.yellow-stone-boulder.name = Sárgakő-szikla
+block.arkyic-boulder.name = Arkicites szikla
+block.crystal-cluster.name = Kristályfürt
+block.vibrant-crystal-cluster.name = Vibráló kristályfürt
+block.crystal-blocks.name = Kristályblokkok
+block.crystal-orbs.name = Kristálygömbök
+block.crystalline-boulder.name = Kristályos szikla
+block.red-ice-boulder.name = Vörösjég-szikla
+block.rhyolite-boulder.name = Riolitszikla
+block.red-stone-boulder.name = Vöröskő-szikla
+block.graphitic-wall.name = Grafitfal
+block.silicon-arc-furnace.name = Szilícium-ívkemence
+block.electrolyzer.name = Elektrolizátor
+block.atmospheric-concentrator.name = Atmoszferikus sűrítő
+block.oxidation-chamber.name = Oxidációs kamra
+block.electric-heater.name = Elektromos fűtőtest
+block.slag-heater.name = Salakos fűtőtest
+block.phase-heater.name = Tóritkvarcos fűtőtest
+block.heat-redirector.name = Hőelvezető
+block.small-heat-redirector.name = Kis hőelvezető
+block.heat-router.name = Hőelosztó
+block.slag-incinerator.name = Salakos égetőkamra
+block.carbide-crucible.name = Karbidolvasztó
+block.slag-centrifuge.name = Salakcentrifuga
+block.surge-crucible.name = Elektrometál-olvasztó
+block.cyanogen-synthesizer.name = Diciánszintetizáló
+block.phase-synthesizer.name = Tóritkvarc-szintetizáló
+block.heat-reactor.name = Hőerőmű
+block.beryllium-wall.name = Berilliumfal
+block.beryllium-wall-large.name = Nagy berilliumfal
+block.tungsten-wall.name = Volfrámfal
+block.tungsten-wall-large.name = Nagy volfrámfal
+block.blast-door.name = Robbanásbiztos ajtó
+block.carbide-wall.name = Karbidfal
+block.carbide-wall-large.name = Nagy karbidfal
+block.reinforced-surge-wall.name = Megerősített elektrometálfal
+block.reinforced-surge-wall-large.name = Nagy megerősített elektrometálfal
+block.shielded-wall.name = Pajzzsal védett fal
+block.radar.name = Radar
+block.build-tower.name = Építőtorony
+block.regen-projector.name = Regeneráló kivetítő
+block.shockwave-tower.name = Sokkhullámtorony
+block.shield-projector.name = Erőpajzs-kivetítő
+block.large-shield-projector.name = Nagy erőpajzs-kivetítő
+block.armored-duct.name = Páncélozott szállítószalag
+block.overflow-duct.name = Túlcsorduló kapu
+block.underflow-duct.name = Alulcsorduló kapu
+block.duct-unloader.name = Szállítószalag-kirakodó
+block.surge-conveyor.name = Elektrometál-szállítószalag
+block.surge-router.name = Elektrometál-elosztó
+block.unit-cargo-loader.name = Egységrakomány-berakodó
+block.unit-cargo-unload-point.name = Egységrakomány-kirakodó pont
+block.reinforced-pump.name = Megerősített szivattyú
+block.reinforced-conduit.name = Megerősített csővezeték
+block.reinforced-liquid-junction.name = Megerősített folyadékátkötés
+block.reinforced-bridge-conduit.name = Megerősített csővezetékhíd
+block.reinforced-liquid-router.name = Megerősített folyadékelosztó
+block.reinforced-liquid-container.name = Megerősített folyadéktározó
+block.reinforced-liquid-tank.name = Megerősített folyadéktartály
+block.beam-node.name = Sugárcsomópont
+block.beam-tower.name = Sugártorony
+block.beam-link.name = Sugárhálózat
+block.turbine-condenser.name = Kondenzációs turbina
+block.chemical-combustion-chamber.name = Kémiai égetőkamra
+block.pyrolysis-generator.name = Pirolízis-erőmű
+block.vent-condenser.name = Vízleválasztó
+block.cliff-crusher.name = Sziklazúzó
+block.large-cliff-crusher.name = Fejlett sziklazúzó
+block.plasma-bore.name = Plazmafúró
+block.large-plasma-bore.name = Fejlett plazmafúró
+block.impact-drill.name = Ütvefúró
+block.eruption-drill.name = Kitöréses fúró
+block.core-bastion.name = Bástya
+block.core-citadel.name = Citadella
+block.core-acropolis.name = Akropolisz
+block.reinforced-container.name = Megerősített konténer
+block.reinforced-vault.name = Megerősített raktár
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tankújratervező
+block.mech-refabricator.name = Mechújratervező
+block.ship-refabricator.name = Repülőgép-újratervező
+block.tank-assembler.name = Tankösszeszerelő
+block.ship-assembler.name = Repülőgép-összeszerelő
+block.mech-assembler.name = Mechösszeszerelő
+block.reinforced-payload-conveyor.name = Megerősített rakományszállító-szalag
+block.reinforced-payload-router.name = Megerősített rakományelosztó
+block.payload-mass-driver.name = Rakomány-tömegmozgató
+block.small-deconstructor.name = Lebontó
+block.canvas.name = Vászon
+block.world-processor.name = Világprocesszor
+block.world-cell.name = Világcella
+block.tank-fabricator.name = Tankgyártó
+block.mech-fabricator.name = Mechgyártó
+block.ship-fabricator.name = Repülőgépgyártó
+block.prime-refabricator.name = Elsődleges újratervező
+block.unit-repair-tower.name = Egységjavító torony
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Alapvető összeszerelő modul
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Fluxusreaktor
+block.neoplasia-reactor.name = Neopláziareaktor
 
-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
+block.switch.name = Kapcsoló
+block.micro-processor.name = Mikroprocesszor
+block.logic-processor.name = Logikai processzor
+block.hyper-processor.name = Hiperprocesszor
+block.logic-display.name = Logikai kijelző
+block.large-logic-display.name = Nagy logikai kijelző
+block.memory-cell.name = Memóriacella
+block.memory-bank.name = Memóriabank
 
-hint.skip = Skip
-hint.desktopMove = Use [accent][[WASD][] to move.
-hint.zoom = [accent]Scroll[] to zoom in or out.
-hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually.
-hint.desktopShoot = [accent][[Left-click][] to shoot.
-hint.depositItems = To transfer items, drag from your ship to the core.
-hint.respawn = To respawn as a ship, press [accent][[V][].
-hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
-hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
-hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it.
-hint.placeDrill.mobile = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
-hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
-hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors.
-hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them.
-hint.breaking = [accent]Right-click[] and drag to break blocks.
-hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
-hint.research = Use the \ue875 [accent]Research[] button to research new technology.
-hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
-hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
-hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
-hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
-hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
-hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
-hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
-hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
-hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
-hint.command = Press [accent][[G][] to command nearby units of [accent]similar type[] into formation.\n\nTo command ground units, you must first control another ground unit.
-hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation.
-hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
-hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
-hint.payloadDrop = Press [accent]][] to drop a payload.
-hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
-hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
-hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
-hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
-hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions.
-hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
-hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
-hint.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
+team.malis.name = Lila
+team.crux.name = Piros
+team.sharded.name = Narancssárga
+team.derelict.name = Szürke
+team.green.name = Zöld
+team.blue.name = Kék
 
-item.copper.description = Used in all types of construction and ammunition.
-item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
-item.lead.description = Used in liquid transportation and electrical structures.
-item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
-item.metaglass.description = Used in liquid distribution/storage structures.
-item.graphite.description = Used in electrical components and turret ammunition.
-item.sand.description = Used for production of other refined materials.
-item.coal.description = Used for fuel and refined material production.
-item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
-item.titanium.description = Used in liquid transportation structures, drills and aircraft.
-item.thorium.description = Used in durable structures and as nuclear fuel.
-item.scrap.description = Used in Melters and Pulverizers for refining into other materials.
-item.scrap.details = Leftover remnants of old structures and units.
-item.silicon.description = Used in solar panels, complex electronics and homing turret ammunition.
-item.plastanium.description = Used in advanced units, insulation and fragmentation ammunition.
-item.phase-fabric.description = Used in advanced electronics and self-repairing structures.
-item.surge-alloy.description = Used in advanced weaponry and reactive defense structures.
-item.spore-pod.description = Used for conversion into oil, explosives and fuel.
-item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
-item.blast-compound.description = Used in bombs and explosive ammunition.
-item.pyratite.description = Used in incendiary weapons and combustion-fueled generators.
+hint.skip = Kihagyás
+hint.desktopMove = Használd a [accent][[WASD][] gombokat a mozgáshoz.
+hint.zoom = [accent]Görgess[] a nagyításhoz és kicsinyítéshez.
+hint.desktopShoot = Használd a [accent]bal egérgombot[] a lövéshez.
+hint.depositItems = A nyersanyagokat húzással helyezheted át a drónból a támaszpontba.
+hint.respawn = Ahhoz, hogy drónként újraéledj, nyomd meg a [accent][[V][] gombot.
+hint.respawn.mobile = �tvetted az irányítást egy egység vagy épület felett. Ahhoz, hogy drónként újraéledj, [accent]koppints a profilképre a bal felső sarokban.[]
+hint.desktopPause = Nyomd meg a [accent][[szóközt][] a játék szüneteltetéséhez vagy folytatásához.
+hint.breaking = [accent]Jobb egérgombbal[] és húzással lebonthatod a blokkokat.
+hint.breaking.mobile = Használd a jobb alsó sarokban lévő \ue817 [accent]kalapács[] gombot a blokkok törléséhez.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
+hint.blockInfo = Egy blokk információinak megtekintéséhez válaszd ki az épületet az [accent]építési menüben[], majd válaszd a [accent][[?][] gomb jobb oldalt.
+hint.derelict = Az [accent]elhagyatott[] szerkezetek régi bázisok maradványai, amelyek már nem működnek.\n\nEzeket az épületeket le lehet [accent]bontani[] nyersanyagokért, vagy meg is lehet javítani őket.
+hint.research = Használd a \ue875 [accent]technológiafa[] gombot, hogy új technológiákat fedezz fel.
+hint.research.mobile = Használd a \ue875 [accent]technológiafa[] gombot a \ue88c [accent]menüben[], hogy új technológiákat fedezz fel.
+hint.unitControl = Nyomd le a [accent][[bal Ctrl][] gombot, és kattints [accent]jobb egérgombbal[] a baráti egység vagy lövegtorony irányításához.
+hint.unitControl.mobile = [accent][[Dupla koppintással][] a szövetséges egységek vagy lövegtornyok kézileg irányíthatók.
+hint.unitSelectControl = Az egységek irányításához lépj be [accent]parancs módba[] a [accent]bal shift[] lenyomva tartásával.\nParancs módban az egységek kijelöléséhez kattints, és húzd az egeret. A [accent]jobb egérgombbal[] küldd az egységeket a helyszínre vagy a célponthoz.
+hint.unitSelectControl.mobile = Az egységek irányításához lépj be [accent]parancs módba[] a bal alsó sarokban lévő [accent]parancs[] gombbal.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppintással küldd az egységeket a helyszínre vagy a célponthoz.
+hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] a támaszpontot a következő szektorba, úgy, hogy megnyitod a \ue827 [accent]bolygótérképet[] a jobb alsó sarokban, és átforgatod az új helyszínre.
+hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] a támaszpontot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \ue88c [accent]menüben[] a \ue827 [accent]bolygótérképről[].
+hint.schematicSelect = Tartsd nyomja az [accent][[F][] gombot több épület kijelöléséhez és másolásához.\n\n[accent][[Középső kattintással][] egy adott blokktípus másolható.
+hint.rebuildSelect = Tartsd nyomva a [accent][[B][] gombot és húzással jelöld ki a megsemmisített blokkterveket.\nEz automatikusan újraépíti őket.
+hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints az \ue80f újraépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
+hint.conveyorPathfind = Tartsd nyomva a [accent][[bal ctrl][] gombot a szállítószalagok lerakása közben, hogy a játék útvonalat állítson elő.
+hint.conveyorPathfind.mobile = Engedélyezd az \ue844 [accent]átlós módot[], és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat állítson elő.
+hint.boost = Tartsd nyomva a [accent][[bal shift][] gombot, hogy átrepülj az akadályok felett.\n\nErre csak néhány földi egység képes.
+hint.payloadPickup = Nyomd meg a [accent][[[] gombot a kis blokkok vagy egységek felemeléséhez.
+hint.payloadPickup.mobile = [accent]Koppints és tartsd lenyomva az ujjad[] egy kis blokk vagy egység felemeléséhez.
+hint.payloadDrop = Nyomd le a [accent]][] gombot a rakomány lerakásához.
+hint.payloadDrop.mobile = [accent]Koppints és tartsd lenyomva az ujjad[] egy üres területen a rakomány lerakásához.
+hint.waveFire = A vizet lőszerként használó [accent]Wave[] lövegtornyok automatikusan eloltják a közeli tüzeket.
+hint.generator = Az \uf879 [accent]égetőerőmű[] szenet éget, és áramot ad át a vele érintkező épületeknek.\n\nAz áramszállítás távolsága további \uf87f [accent]villanyoszlopokkal[] növelhető.
+hint.guardian = Az [accent]őrzők[] páncélozottak. A gyenge lövedékek, mint a [accent]réz[] vagy az [accent]ólom[] [scarlet]nem hatásosak[] az �rző páncéljával szemben.\n\nHasználj magasabb szintű lövegtornyokat, vagy juttass \uf835 [accent]grafitot[] a \uf861 Duo / \uf859 Salvo lövegtornyokba, hogy leszedd az őrzőket.
+hint.coreUpgrade = A támaszpont úgy fejleszthető, hogy [accent]magasabb szintű támaszpontot teszel rá[].\n\nHelyezz egy \uf868 [accent]alapítvány[] támaszpontot a \uf869 [accent]szilánk[] támaszpontra. Figyelj rá, hogy ne legyenek az új támaszpont területén épületek.
+hint.presetLaunch = A szürke [accent]landolási zónát tartalmazó szektorokba[], amilyen például a [accent]Fagyott erdő[], bárhonnan kilőhetsz. Nem szükséges hozzá szomszédos területet elfoglalnod.\n\nA [accent]számozott szektorokat[], mint ez is, a játékmenet szempontjából [accent]nem fontos[] elfoglalni.
+hint.presetDifficulty = Ebben a szektorban [scarlet]magas az ellenséges fenyegetettségi szint[].\nAz ilyen szektorokba való indulás [accent]nem ajánlott[] megfelelő technológia és felkészülés nélkül.
+hint.coreIncinerate = Ha a támaszpont egy nyersanyagból elérte a maximumot, a beérkező további nyersanyagok azonnal [accent]megsemmisítésre kerülnek[].
+hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához kattints parancs módban egy gyárépületre, majd kattints jobb egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
+hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához koppints parancs módban egy gyárépületre, majd koppints egy helyre.\nAz előállított egységek automatikusan odamennek.
 
-liquid.water.description = Used for cooling machines and waste processing.
-liquid.slag.description = Refined in separators into constituent metals, or sprayed at enemies as a weapon.
-liquid.oil.description = Used in advanced material production and as incendiary ammunition.
-liquid.cryofluid.description = Used as coolant in reactors, turrets and factories.
+gz.mine = Menj a földön lévő \uf8c4 [accent]rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
+gz.mine.mobile = Menj a földön lévő \uf8c4 [accent]rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
+gz.research = Nyisd meg a \ue875 Technológia fát.\nFejleszd ki a \uf870 [accent]mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő \ue85e menüből.\nKattints egy rézfoltra az elhelyezéséhez.
+gz.research.mobile = Nyisd meg a \ue875 Technológia fát.\nFejleszd ki a \uf870 [accent]mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő \ue85e menüből.\nKattints egy rézfoltra az elhelyezéséhez.\n\nA megerősítéshez nyomd meg a jobb alsó sarokban lévő \ue800 [accent]pipát[].
+gz.conveyors = Fejleszd ki, és építs \uf896 [accent]szállítsszalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nKattints és húzd az egeret, hogy több szállítószalagot helyezz el.\nHasználd a [accent]görgőt[] a forgatáshoz.
+gz.conveyors.mobile = Fejleszd ki, és építs \uf896 [accent]Szállítószalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
+gz.drills = Bővítsd a bányászati kapacitást.\nÉpíts több mechanikus fúrót.\nBányássz 100 rezet.
+gz.lead = Az \uf837 [accent]ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az ólom kitermelésére.
+gz.moveup = \ue804 Fedezd fel a szektort, hogy megtaláld a küldetés további utasításait!
+gz.turrets = Fejleszd ki, és építs két \uf861 [accent]Duo[] lövegtornyot, hogy megvédd a támaszpontot.\nA Duo lövegtornyoknak \uf838 [accent]lőszerre[] van szükségük, amelyet szállítószalaggal juttathatsz el hozzájuk.
+gz.duoammo = Szállítószalagok segítségével lásd el [accent]rézzel[] a Duo lövegtornyokat.
+gz.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf8ae [accent]Rézfalakat[] a lövegtornyok köré.
+gz.defend = Az ellenség közeledik, készülj fel a védekezésre.
+gz.aa = A légi egységeket nem lehet könnyen elintézni a hagyományos lövegtornyokkal.\nA \uf860 [accent]Scatter[] lövegtornyok kiváló légelhárítást biztosítanak, de lőszerként \uf837 [accent]ólomra[] van szükségük.
+gz.scatterammo = Szállítószalagok segítségével lásd el \uf837 [accent]ólommal[] a Scatter lövegtornyokat.
+gz.supplyturret = [accent]Lövegtorony ellátása
+gz.zone1 = Ez az ellenség leszállóhelye.
+gz.zone2 = Bármi, ami a hatósugarában épült, elpusztul, amikor egy hullám elindul.
+gz.zone3 = Egy hullám most kezdődik.\nKészülj fel!
+gz.finish = Építs több lövegtornyot, bányássz több nyersanyagot,\nés védekezz az ellenséges hullámok ellen, hogy [accent]elfoglald a szektort[].
 
-block.resupply-point.description = Resupplies nearby units with copper ammunition. Not compatible with units that require battery power.
-block.armored-conveyor.description = Moves items forward. Does not accept inputs from the sides.
-block.illuminator.description = Emits light.
-block.message.description = Stores a message for communication between allies.
-block.graphite-press.description = Compresses coal into graphite.
-block.multi-press.description = Compresses coal into graphite. Requires water as coolant.
-block.silicon-smelter.description = Refines silicon from sand and coal.
-block.kiln.description = Smelts sand and lead into metaglass.
-block.plastanium-compressor.description = Produces plastanium from oil and titanium.
-block.phase-weaver.description = Synthesizes phase fabric from thorium and sand.
-block.alloy-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy.
-block.cryofluid-mixer.description = Mixes water and fine titanium powder to produce cryofluid.
-block.blast-mixer.description = Produces blast compound from pyratite and spore pods.
-block.pyratite-mixer.description = Mixes coal, lead and sand into pyratite.
-block.melter.description = Melts down scrap into slag.
-block.separator.description = Separates slag into its mineral components.
-block.spore-press.description = Compresses spore pods into oil.
-block.pulverizer.description = Crushes scrap into fine sand.
-block.coal-centrifuge.description = Transforms oil into coal.
-block.incinerator.description = Vaporizes any item or liquid it receives.
-block.power-void.description = Voids all power inputted. 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 = Protects structures from enemy projectiles.
-block.copper-wall-large.description = Protects structures from enemy projectiles.
-block.titanium-wall.description = Protects structures from enemy projectiles.
-block.titanium-wall-large.description = Protects structures from enemy projectiles.
-block.plastanium-wall.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections.
-block.plastanium-wall-large.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections.
-block.thorium-wall.description = Protects structures from enemy projectiles.
-block.thorium-wall-large.description = Protects structures from enemy projectiles.
-block.phase-wall.description = Protects structures from enemy projectiles, reflecting most bullets upon impact.
-block.phase-wall-large.description = Protects structures from enemy projectiles, reflecting most bullets upon impact.
-block.surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
-block.surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
-block.door.description = A wall that can be opened and closed.
-block.door-large.description = A wall that can be opened and closed.
-block.mender.description = Periodically repairs blocks in its vicinity.\nOptionally uses silicon to boost range and efficiency.
-block.mend-projector.description = 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 increases shield size.
-block.shock-mine.description = Releases electric arcs upon enemy unit contact.
-block.conveyor.description = Transports items forward.
-block.titanium-conveyor.description = Transports items forward. Faster than a standard conveyor.
-block.plastanium-conveyor.description =  Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput.
-block.junction.description = Acts as a bridge for two crossing conveyor belts.
-block.bridge-conveyor.description = Transports items over terrain or buildings.
-block.phase-conveyor.description = Instantly transports items over terrain or buildings. Longer range than the item bridge, but requires power.
-block.sorter.description = If an input item matches the selection, it passes forward. Otherwise, the item is outputted to the left and right.
-block.inverted-sorter.description = Similar to a standard sorter, but outputs selected items to the sides instead.
-block.router.description = Distributes input items to 3 output directions equally.
-block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
-block.distributor.description = Distributes input items to 7 output directions equally.
-block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates.
-block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates.
-block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers.
-block.mechanical-pump.description = Pumps and outputs liquids. Does not require power.
-block.rotary-pump.description = Pumps and outputs liquids. Requires power.
-block.thermal-pump.description = Pumps and outputs liquids.
-block.conduit.description = Moves liquids forward. Used in conjunction with pumps and other conduits.
-block.pulse-conduit.description = Moves liquids forward. Transports faster and stores more than standard conduits.
-block.plated-conduit.description = Moves liquids forward. Does not accept input from the sides. Does not leak.
-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.
-block.liquid-tank.description = Stores a large amount of liquid. Outputs to all sides, similarly to a liquid router.
-block.liquid-junction.description = Acts as a bridge for two crossing conduits.
-block.bridge-conduit.description = Transports liquids over terrain or buildings.
-block.phase-conduit.description = Transports liquids over terrain or buildings. Longer range than the bridge conduit, but requires power.
-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 = A long-range power node with fewer available connections.
-block.diode.description = Moves battery power in one direction, but only if the other side has less power stored.
-block.battery.description = Stores power in times of surplus energy. Outputs power in times of deficit.
-block.battery-large.description =  Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity 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 = Generates power by burning flammable materials and converting water to steam.
-block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
-block.rtg-generator.description = 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 = Provides a small amount of power from the sun. More efficient than 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.
-block.impact-reactor.description = Creates massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
-block.mechanical-drill.description = When placed on ore, 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 atmospheric spores into spore pods.
-block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
-block.oil-extractor.description = Uses large amounts of power, sand and water to drill for oil.
-block.core-shard.description = Core of the base. Once destroyed, the sector is lost.
-block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
-block.core-foundation.description = Core of the base. Well armored. Stores more resources than a Shard.
-block.core-foundation.details = The second iteration.
-block.core-nucleus.description = Core of the base. Extremely well armored. Stores massive amounts of resources.
-block.core-nucleus.details = The third and final iteration.
-block.vault.description = Stores a large amount of items of each type. Contents can be retrieved with an unloader.
-block.container.description = Stores a small amount of items of each type. Contents can be retrieved with an unloader.
-block.unloader.description = Unloads the selected item from nearby blocks.
-block.launch-pad.description = Launches batches of items to selected sectors.
-block.duo.description = Fires alternating bullets at enemies.
-block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft.
-block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
-block.hail.description = Fires small shells at ground enemies over long distances.
-block.wave.description = Fires streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
-block.lancer.description = Charges and fires powerful beams of energy at ground targets.
-block.arc.description = Fires arcs of electricity at ground targets.
-block.swarmer.description = Fires homing missiles at enemies.
-block.salvo.description = Fires quick salvos of bullets at enemies.
-block.fuse.description = Fires three close-range piercing blasts at nearby enemies.
-block.ripple.description = Shoots clusters of shells at ground enemies over long distances.
-block.cyclone.description = Fires explosive clumps of flak at nearby enemies.
-block.spectre.description = Fires large armor-piercing bullets at air and ground targets.
-block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.foreshadow.description = Fires a large single-target bolt over long distances.
-block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity.
-block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
-block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
-block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
-block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
-block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
-block.overdrive-dome.description =  Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
-block.payload-conveyor.description = Moves large payloads, such as units from factories.
-block.payload-router.description = Splits input payloads into 3 output directions.
-block.command-center.description = Controls unit behavior with several different commands.
-block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
-block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
-block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
-block.additive-reconstructor.description = Upgrades inputted units to the second tier.
-block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
-block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
-block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
-block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
-block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
-block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
-block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
-block.memory-cell.description = Stores information for a logic processor.
-block.memory-bank.description = Stores information for a logic processor. High capacity.
-block.logic-display.description = Displays arbitrary graphics from a logic processor.
-block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
-block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+onset.mine = Kattints bal egérgombbal a \uf748 [accent]berillium[] kibányászáshoz a falakból.\n\nA mozgáshoz használd a [accent][[WASD] gombokat.
+onset.mine.mobile = Koppints a \uf748 [accent]berillium[] kibányászáshoz a falakból.
+onset.research = Nyisd meg a \ue875 Technológia fát.\nFejleszd ki, és építs egy \uf73e [accent]kondenzációs turbinát[] a kürtőn.\nEz [accent]áramot[] fog termelni.
+onset.bore = Fejleszd ki, és építs egy \uf741 [accent]plazmafúrót[].\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
+onset.power = Ahhoz, hogy [accent]árammal[] lásd el a plazmafúrót, fejleszd ki, és helyezz el egy \uf73d [accent]sugárcsomópontot[].\nSegítségükkel összekötheted a kondenzációs turbinát a plazmafúróval.
+onset.ducts = Fejleszd ki, és építs \uf799 [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\nKattints, és húzd az egeret több szállítószalag elhelyezéséhez.\nHasználd a [accent]görgőt[] a forgatáshoz.
+onset.ducts.mobile = Fejleszd ki, és építs \uf799 [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
+onset.moremine = Bővítsd a bányászati kapacitást.\nHelyezz el több plazmavágót, és a támogatásukhoz használj sugárcsomópontokat és szállítószalagokat.\nBányássz 200 berilliumot.
+onset.graphite = Az összetettebb épületekhez \uf835 [accent]grafit[] szükséges.\nÉpíts plazmavágókat a grafit kibányászásához.
+onset.research2 = Kezdd el a [accent]gyárak[] fejlesztését.\nFejleszd ki a \uf74d [accent]sziklazúzót[] és a \uf779 [accent]szilícium-ívkemencét[].
+onset.arcfurnace = A szilícium-ívkemencének \uf834 [accent]homokra[] és \uf835 [accent]grafitra[] van szüksége, hogy \uf82f [accent]szilíciumot[] gyártson.\nTovábbá [accent]áram[] is szükséges a működéséhez.
+onset.crusher = Használj \uf74d [accent]sziklazúzókat[], hogy homokot bányássz.
+onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fejleszd ki, és helyezz el egy \uf6a2 [accent]tankgyártót[].
+onset.makeunit = �llíts elő egy egységet.\nHasználd a „?� gombot, hogy megnézd a kiválasztott gyár követelményeit.
+onset.turrets = Az egységek hatékonyak, de hatásosan alkalmazva a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak.\nHelyezz el egy \uf6eb [accent]Breach[] lövegtornyot.\nA lövegtornyoknak \uf748 [accent]lőszerre[] van szüksége.
+onset.turretammo = Szállítótalagok használatával lásd el a lövegtornyokat [accent]berillium[] lőszerrel.
+onset.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf6ee [accent]berilliumfalakat[] a lövegtornyok körül.
+onset.enemies = Az ellenség közeledik, készülj fel a védekezésre.
+onset.defenses = [accent]�llíts fel védelmet:[lightgray] {0}
+onset.attack = Az ellenség most sebezhető. Indíts ellentámadást!
+onset.cores = Új támaszpont csak a [accent]támaszpontmezőre[] helyezhető.\nAz új támaszpontok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más támaszpontokkal.\nHelyezz el egy \uf725 támaszpontot.
+onset.detect = Az ellenség 2 percen belül észrevesz téged.\n�llíts fel védelmet, bányászatot és termelést.
+onset.commandmode = Tartsd nyomva a [accent]shift[] gombot, hogy [accent]parancs módba[] lépj.\n[accent]Bal egérgombbal és húzással[] lehet egységeket kijelölni.\n[accent]Jobb egérgombbal[] az egységek mozgásra vagy támadásra utasíthatók.
+onset.commandmode.mobile = Nyomd meg a [accent]parancs gombot[], hogy [accent]parancs módba[] lépj.\nTartsd nyomva az ujjad, majd [accent]húzd[] az egységek kiválasztásához.\n[accent]Koppintással[] az egységek mozgásra vagy támadásra utasíthatók.
+aegis.tungsten = Volfrámot [accent]ütvefúróval[] lehet bányászni.\nEnnek az épületnek [accent]vízre[] és [accent]áramra[] van szüksége.
 
-unit.dagger.description = Fires standard bullets at all nearby enemies.
-unit.mace.description = Fires streams of flame at all nearby enemies.
-unit.fortress.description = Fires long-range artillery at ground targets.
-unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
-unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
-unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
-unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
-unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
-unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
-unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
-unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
-unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
-unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
-unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
-unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
-unit.flare.description = Fires standard bullets at nearby ground targets.
-unit.horizon.description = Drops clusters of bombs on ground targets.
-unit.zenith.description = Fires salvos of missiles at all nearby enemies.
-unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
-unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
-unit.mono.description = Automatically mines copper and lead, depositing it into the core.
-unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
-unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
-unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
-unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
-unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
-unit.minke.description = Fires shells and standard bullets at nearby ground targets.
-unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
-unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
-unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
-unit.alpha.description = Defends the Shard core from enemies. Builds structures.
-unit.beta.description = Defends the Foundation core from enemies. Builds structures.
-unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+split.pickup = Egyes blokkok a támaszpont drónjával is felvehetők.\nVedd fel ezt a [accent]konténert[] és helyezd egy [accent]rakománycsomagolóba[].\n(A felvétel és lerakás alapértelmezett gombjai: [[ és ].)
+split.pickup.mobile = Egyes blokkok a támaszpont drónjával is felvehetők.\nVedd fel ezt a [accent]konténert[] és helyezd egy [accent]rakománycsomagolóba[].\n(A felvételhez és lerakáshoz nyomd meg hosszan.)
+split.acquire = Az egységek építéséhez volfrámot kell szerezned.
+split.build = Az egységeket a fal másik oldalára kell eljuttatni.\nÉpíts két [accent]rakomány-tömegmozgatót[], egyet-egyet a fal mindkét oldalán.\n�llítsd be a szállítási kapcsolatukat úgy, hogy kiválasztod az egyiket, majd kiválasztod a másikat.
+split.container = A konténerekhez hasonlóan, az egységek is szállíthatók a [accent]rakomány-tömegmozgatóval[].\nÉpíts egy egységgyárat egy tömegmozgató mellé, hogy feltöltsd őket, majd küldd át őket a falon, hogy megtámadják az ellenséges bázist.
+
+item.copper.description = Széleskörűen használatos építkezésnél és lőszerként.
+item.copper.details = Réz. Szokatlanul bőségesen elterjedt fém a Serpulón. Megerősítés nélkül strukturálisan gyenge.
+item.lead.description = Folyadékszállításnál és elektromos eszközökben használatos.
+item.lead.details = Sűrű. Közömbös. Széleskörűen használatos az akkumulátorokban.\nMegjegyzés: Valószínűleg mérgező a biológiai életformákra; nem mintha sok maradt volna errefelé.
+item.metaglass.description = Folyadékszállító és -tárolóépületeknél használatos.
+item.graphite.description = Elektromos alkatrészekben és lőszerként használatos.
+item.sand.description = Egyéb finomított nyersanyagok gyártása során használatos.
+item.coal.description = Tüzelőanyagként és finomított nyersanyagok gyártásához használatos.
+item.coal.details = Fosszilizálódott növényi anyagnak tűnik, jóval a „spóra incidens� előttről.
+item.titanium.description = Folyadékszállító épületekben, fúrókban és gyárakban használatos.
+item.thorium.description = Strapabíró szerkezetekben használatos nukleáris fűtőanyag.
+item.scrap.description = Olvasztókban és porítókban használatos már nyersanyagok finomításához.
+item.scrap.details = �si építmények és egységek hátrahagyott maradványai.
+item.silicon.description = Napelemekben, összetett áramkörökben és nyomkövető lőszerekben használatos.
+item.plastanium.description = Fejlett egységek alapanyagaként, hőszigetelésben és repeszlövedékekben használatos.
+item.phase-fabric.description = Fejlett elektromos eszközökben és önjavító épületekben használatos.
+item.surge-alloy.description = Fejlett fegyverzetekhez és aktív védelmi épületekhez használatos.
+item.spore-pod.description = Olajjá, robbanószerré és tüzelőanyaggá alakításhoz használatos.
+item.spore-pod.details = Spórák. Valószínűleg egy mesterséges életforma. Más életformák számára halálos gázt bocsátanak ki. Szélsőségesen invazív. Megfelelő körülmények között erősen gyúlékony.
+item.blast-compound.description = Bombákhoz és robbanólövedékekhez használatos.
+item.pyratite.description = Gyújtólövedékekben és tüzelőanyag-alapú generátorokban használatos.
+
+#Erekir
+item.beryllium.description = Sokféle épület- és lőszertípushoz használatos az Erekiren.
+item.tungsten.description = Fúrókban, páncélokban és lőszerben használatos. A fejlettebb épületek építéséhez szükséges.
+item.oxide.description = Hővezetőként és szigetelőként is használatos az áramtermelésben.
+item.carbide.description = Fejlett szerkezetekben, nehezebb egységekhez és lőszerként használatos.
+
+liquid.water.description = Gépek hűtéséhez és törmelékfeldolgozáshoz használatos.
+liquid.slag.description = Leválasztókban alkotófémekre finomítható. A folyadékot lőszerként használó tornyokban használható, például: Wave, Tsunami.
+liquid.oil.description = Fejlett nyersanyagok gyártásához és gyújtólövedékhez használatos.
+liquid.cryofluid.description = Reaktorokban, lövegtornyokban és gyárakban használatos hűtőfolyadékként.
+
+#Erekir
+liquid.arkycite.description = Kémiai reakciókban használatos energiatermelésre és anyagszintézisre.
+liquid.ozone.description = Az anyaggyártásban oxidálószerként, illetve üzemanyagként használatos. Mérsékelten robbanékony.
+liquid.hydrogen.description = A nyersanyagok kitermelésében, egységgyártásban és szerkezetjavításban használatos. Gyúlékony.
+liquid.cyanogen.description = Lőszerként, fejlett egységek építéséhez és különböző reakciókhoz használatos a fejlett blokkokban. Erősen gyúlékony.
+liquid.nitrogen.description = A nyersanyagok kitermelésénél, gáztermelésnél és egységgyártásnál is használatos. Semleges gáz.
+liquid.neoplasm.description = A neopláziareaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú blokkra, amelyhez hozzáér, és közben károsítja azokat. Sűrű folyadék.
+liquid.neoplasm.details = Neoplazma. Egy kontrollálhatatlan, gyorsan osztódó, iszap állagú, szintetikus sejtmassza. Hőálló. Rendkívül veszélyes minden vízzel kapcsolatos szerkezetre.\n\nTúl összetett és instabil a szabványos elemzésekhez. Potenciális alkalmazási területe ismeretlen. Ajánlott elégetni a salakos égetőkamrákban.
+
+block.derelict = \uf77e [lightgray]Elhagyatott
+block.armored-conveyor.description = Nyersanyagokat szállít. Nem fogad el oldalról nem szállítószalagról érkező nyersanyagot.
+block.illuminator.description = Világít.
+block.message.description = Üzenetet tárol a szövetségesek kommunikációjához.
+block.reinforced-message.description = Üzenetet tárol a szövetségesek közötti kommunikációhoz.
+block.world-message.description = A pályakészítésben használható üzenetblokk. Nem lehet megsemmisíteni.
+block.graphite-press.description = Grafittá préseli a szenet.
+block.multi-press.description = Grafittá sajtolja a szenet. Hűtéséhez víz szükséges.
+block.silicon-smelter.description = A homokot és a szenet szilíciummá finomítja.
+block.kiln.description = Ólomüveget olvaszt az ólomból és a homokból.
+block.plastanium-compressor.description = Olaj és titán felhasználásával műanyagot gyárt.
+block.phase-weaver.description = Tórium és homok keverékéből tóritkvarcot állít elő.
+block.surge-smelter.description = Titán, ólom, szilícium és réz ötvözésével elektrometált állít elő.
+block.cryofluid-mixer.description = Finom titánpor vízhez keverésével hűtőfolyadékot állít elő.
+block.blast-mixer.description = Robbanóelegyet gyárt piratitból és spórakapszulából.
+block.pyratite-mixer.description = Piratittá vegyíti a szenet, a homokot és az ólmot.
+block.melter.description = Salakká olvasztja a törmeléket.
+block.separator.description = �sványi összetevőire bontja a salakot.
+block.spore-press.description = Olajat sajtol a spórakapszulából.
+block.pulverizer.description = Finom homokká darálja a törmeléket.
+block.coal-centrifuge.description = Szénné alakítja az olajat.
+block.incinerator.description = Megsemmisít minden nyersanyagot és folyadékot.
+block.power-void.description = Elnyel minden áramot. Csak homokozó módban.
+block.power-source.description = Végtelen áramot termel. Csak homokozó módban.
+block.item-source.description = Végtelen nyersanyagot termel. Csak homokozó módban.
+block.item-void.description = Megsemmisít minden nyersanyagot. Csak homokozó módban.
+block.liquid-source.description = Végtelen folyadékot termel. Csak homokozó módban.
+block.liquid-void.description = Megsemmisít minden folyadékot. Csak homokozó módban.
+block.payload-source.description = Végtelen rakományt termel. Csak homokozó módban.
+block.payload-void.description = Megsemmisít minden rakományt. Csak homokozó módban.
+block.copper-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.copper-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.titanium-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.titanium-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.plastanium-wall.description = Megvédi az épületeket az ellenséges lövedékektől. Elnyeli a lézereket és az elektromos szikrákat. Gátolja a villanyvezetékek automatikus kapcsolódását.
+block.plastanium-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől. Elnyeli a lézereket és az elektromos szikrákat. Gátolja a villanyvezetékek automatikus kapcsolódását.
+block.thorium-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.thorium-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.phase-wall.description = Megvédi az épületeket az ellenséges lövedékektől, a legtöbb lövedék visszapattan róla.
+block.phase-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől, a legtöbb lövedék visszapattan róla.
+block.surge-wall.description = Megvédi az épületeket az ellenséges lövedékektől, periodikusan elektromos kisüléseket generál, ha hozzáérnek.
+block.surge-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől, periodikusan elektromos kisüléseket generál, ha hozzáérnek.
+block.scrap-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.scrap-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.scrap-wall-huge.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.scrap-wall-gigantic.description = Megvédi az épületeket az ellenséges lövedékektől.
+block.door.description = Nyitható és zárható fal.
+block.door-large.description = Nyitható és zárható fal.
+block.mender.description = Időnként javítja a közeli épületeket.\nSzilíciummal növelhető a hatósugara és hatásfoka.
+block.mend-projector.description = Javítja a közeli épületeket.\nTóritkvarccal növelhető a hatósugara és hatásfoka.
+block.overdrive-projector.description = Megöveli a környező épületek termelési sebességét.\nTóritkvarccal növelhető a hatósugara és hatásfoka.
+block.force-projector.description = Hatszögletű erőpajzsot hoz létre maga körül, amely megvédi a benne lévő épületeket és egységeket a sérüléstől.\nTúlmelegszik, ha túl sok sérülést szenved. Hűtőfolyadék használatával megakadályozható a túlmelegedés. A tóritkvarc megnöveli az erőpajzs méretét.
+block.shock-mine.description = Elektromos kisülést hoz létre, ha ellenséggel érintkezik.
+block.conveyor.description = Nyersanyagokat szállít.
+block.titanium-conveyor.description = Nyersanyagokat szállít. Gyorsabb a sima szállítószalagnál.
+block.plastanium-conveyor.description = Nyersanyagokat szállít tömbösítve. Hátulról fogadja a nyersanyagokat, elöl három irányba osztja szét őket. Több kezdő- és végponttal növelhető az áteresztőképessége.
+block.junction.description = Hídként működik két egymást keresztező szállítószalag között.
+block.bridge-conveyor.description = Nyersanyagokat szállít épületek és terepakadályok fölött.
+block.phase-conveyor.description = Nyersanyagokat szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima szállítószalaghíd, de áramot fogyaszt.
+block.sorter.description = Csak a kiválasztott nyersanyagot engedi tovább egyenesen, minden mást oldalra ad ki.
+block.inverted-sorter.description = Hasonló a szokásos válogatóhoz, de a kiválasztott nyersanyagot oldalra adja ki.
+block.router.description = Egyenletesen háromfelé osztja szét a beérkező nyersanyagokat.
+block.router.details = Egy szükséges rossz. Nem ajánlott termelőegységek mellett használni, mert a kimenet eltömíti.
+block.distributor.description = Egyenletesen, hétfelé osztja szét a beérkező nyersanyagokat.
+block.overflow-gate.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud.
+block.underflow-gate.description = A túlcsorduló kapu ellentettje. Csak akkor ad ki nyersanyagot előrefelé, ha oldalra már nem tud.
+block.mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokat gyűjt össze, és átlövi egy másik, hozzákapcsolt tömegmozgatónak.
+block.mechanical-pump.description = Folyadékot szivattyúz és ad ki. Nem fogyaszt áramot.
+block.rotary-pump.description = Folyadékot szivattyúz és ad ki. �ramot fogyaszt.
+block.impulse-pump.description = Folyadékot szivattyúz és ad ki.
+block.conduit.description = Folyadékot szállít. Szivattyúkkal és egyéb csővezetékekkel együtt használatos.
+block.pulse-conduit.description = Folyadékot szállít. Gyorsabban szállít, és nagyobb tárolókapacitású, mint a szokásos csővezeték.
+block.plated-conduit.description = Folyadékot szállít. Nem fogad el folyadékot oldalról. Nem szivárog, ha nincs a végén semmi.
+block.liquid-router.description = Egyenletesen háromfelé osztja szét a beérkező folyadékot. Bizonyos mennyiség tárolására is képes.
+block.liquid-container.description = Jelentős mennyiségű folyadékot tárol. Minden oldalon kiadja, hasonlóan a folyadékelosztóhoz.
+block.liquid-tank.description = Nagy mennyiségű folyadékot tárol. Minden oldalon kiadja, hasonlóan a folyadékelosztóhoz.
+block.liquid-junction.description = Hídként működik két egymást keresztező csővezeték között.
+block.bridge-conduit.description = Folyadékot szállít épületek és terepakadályok fölött.
+block.phase-conduit.description = Folyadékot szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima csővezetékhíd. �ramot fogyaszt.
+block.power-node.description = �ramot vezet az összekapcsolt csomópontokhoz. A szomszédos blokkokkal automatikusan kapcsolatba kerül megépítéskor.
+block.power-node-large.description = Nagyobb villanyoszlop, nagyobb hatótávolsággal.
+block.surge-tower.description = Hosszútávú villanyoszlop, kevesebb elérhető kapcsolattal.
+block.diode.description = Az eltárolt áramot egy irányba engedi át, de csak akkor, ha a fogadó oldalon kevesebb van tárolva.
+block.battery.description = �ramot tárol el, ha túltermelés van. Leadja az áramot, ha hiány van.
+block.battery-large.description = �ramot tárol el, ha túltermelés van. Leadja az áramot, ha hiány van. Nagyobb kapacitású a szokásos akkumulátornál.
+block.combustion-generator.description = �ramot termel éghető anyagok, például szén, elégetésével.
+block.thermal-generator.description = Forró környezetben áramot termel.
+block.steam-generator.description = Éghető anyagok elégetésével és víz gőzzé alakításával áramot termel.
+block.differential-generator.description = Nagy mennyiségű áramot termel. A hűtőfolyadék és az égő piratit hőmérséklet-különbségét használja ki.
+block.rtg-generator.description = A radioaktív bomlás energiáját hasznosítja, hogy lassan, de biztosan áramot termeljen.
+block.solar-panel.description = Napfényből állít elő kevés áramot.
+block.solar-panel-large.description = Napfényből állít elő kevés áramot. Hatékonyabb a szokásos napelemnél.
+block.thorium-reactor.description = Jelentős mennyiségű áramot termel tóriumból. �llandó hűtést igényel. Ha nincs megfelelően hűtőfolyadékkal ellátva, akkor felrobban.
+block.impact-reactor.description = Csúcsra járatva rengeteg áramot termel. A reakció beindítása jelentős áramfogyasztással jár.
+block.mechanical-drill.description = Ércre helyezve lassú tempóban termeli ki az adott nyersanyagot. Csak alapvető nyersanyagok kitermelésére képes.
+block.pneumatic-drill.description = Egy olyan, fejlettebb fúró, amely titán kitermelésére is alkalmas. Gyorsabban dolgozik a mechanikus fúrónál.
+block.laser-drill.description = Lézerek használatával még gyorsabban tud dolgozni. �ramot fogyaszt. Képes tóriumot kitermelni.
+block.blast-drill.description = A technológia csúcsa. Nagy mennyiségű áramot fogyaszt.
+block.water-extractor.description = Kiszivattyúzza a talajvizet. Olyan helyeken használatos, ahol nem érhető el felszíni vízforrás.
+block.cultivator.description = A légkörben szálló spórákat kapszulákba sűríti.
+block.cultivator.details = Visszaszerzett technológia. Hatalmas tömegű biomassza gyártására alkalmas a lehető leghatékonyabban. Valószínűleg a Serpulo felszínét ma borító spórák kezdeti inkubátora.
+block.oil-extractor.description = Nagy mennyiségű áramot fogyaszt, továbbá homokot és vizet igényel az olajfúráshoz.
+block.core-shard.description = Támaszpont. Ha elpusztul, a szektor elveszett.
+block.core-shard.details = Az első modell. Kompakt. Önsokszorosító. Egyszer használatos gyorsítórakétákkal van felszerelve, nem bolygóközi utazásra tervezték.
+block.core-foundation.description = Támaszpont. Jól páncélozott. Több nyersanyagot tárol, mint a szilánk.
+block.core-foundation.details = A második modell.
+block.core-nucleus.description = Támaszpont. Rendkívül jól páncélozott. Hatalmas mennyiségű nyersanyag tárolására képes.
+block.core-nucleus.details = A harmadik, végső modell.
+block.vault.description = Nagy mennyiséget tárol minden nyersanyagtípusból. Növeli a támaszpont tárolókapacitását, ha egy támaszpont mellé van helyezve. A tartalma kirakodó segítségével nyerhető ki.
+block.container.description = Kis mennyiséget tárol minden nyersanyagtípusból. Növeli a támaszpont tárolókapacitását, ha egy támaszpont mellé van helyezve. A tartalma kirakodó segítségével nyerhető ki.
+block.unloader.description = Kirakodja a szomszédos épületekből a kiválasztott nyersanyagot.
+block.launch-pad.description = Nyersanyagokat juttat el a kiválasztott szektorokba.
+block.advanced-launch-pad.description = Nyersanyagokat juttat el a kiválasztott szektorokba. Egyszerre csak egy nyersanyagtípust fogad el.
+block.advanced-launch-pad.details = Szuborbitális rendszer a nyersanyagok szektorok között történő szállítására.
+block.landing-pad.description = Fogadja a más szektorok kilövőállásaiból érkező nyersanyagokat. Nagy mennyiségű vízet igényel a landolások okozta hatásokkal szembeni védekezéshez.
+block.duo.description = Változatos lövedékekkel lő az ellenségre.
+block.scatter.description = Ólom-, törmelék- vagy ólomüvegdarabokat lő az ellenséges légi egységekre.
+block.scorch.description = Megégeti az ellenség közeli földi egységeit. Kis távolságra nagyon hatékony.
+block.hail.description = Kis lövedékeket lő ki nagy távolságokra lévő földi célpontokra.
+block.wave.description = Folyadékot önt az ellenségre. Eloltja a tüzeket, ha vízzel van ellátva.
+block.lancer.description = Erős energiasugarakat lő közeli földi célpontokra.
+block.arc.description = Elektromos szikrákat kelt földi célpontok között.
+block.swarmer.description = Nyomkövető rakétákat lő az ellenségre.
+block.salvo.description = Gyors sorozatokat lő az ellenségre.
+block.fuse.description = Három kis hatótávolságú, átütő erejű lövedéket lő a közeli ellenségre.
+block.ripple.description = Lövedékek csoportjával tüzel nagy távolságra lévő földi célpontokra.
+block.cyclone.description = Robbanó lövedékeket lő közeli ellenségekre.
+block.spectre.description = Nagy lövedékekkel tüzel légi és földi célpontokra.
+block.meltdown.description = Feltöltődés után folyamatos lézersugarat lő a közeli ellenségekre. A működéséhez hűtőfolyadékot igényel.
+block.foreshadow.description = Egy nagy villámot lő ki egy nagy távolságra lévő célpontra. A magasabb maximális életerővel rendelkező ellenségeket részesíti előnyben.
+block.repair-point.description = Folyamatosan javítja a hatósugarában lévő legközelebbi sérült egységet.
+block.segment.description = Megsemmisíti a beérkező lövedékeket. A lézerrel szemben hatástalan.
+block.parallax.description = Vonónyalábot bocsát ki, amivel magához vonzza, és közben sebzi a légi egységeket.
+block.tsunami.description = Erős folyadékhullámot lő az ellenségre. Eloltja a tüzeket, ha vízzel van ellátva.
+block.silicon-crucible.description = Szilíciumot finomít homokból és szénből, piratitot igényel kiegészítő hőforrásként. Forró környezetben még hatékonyabb.
+block.disassembler.description = Ritka ásványi összetevőire bontja le a salakot, alacsony hatásfokkal. Képes tóriumot kinyerni.
+block.overdrive-dome.description = Megnöveli a környező épületek termelési sebességét. A működtetése tóritkvarcot és szilíciumot igényel.
+block.payload-conveyor.description = Nagy méretű terhet mozgat, például gyárakból érkező egységeket. Mágneses. Használható súlytalanságban.
+block.payload-router.description = Háromfelé osztja szét a beérkező terhet. Rendezőként is szolgál, ha van megadva szűrő. Mágneses. Használható súlytalanságban.
+block.ground-factory.description = Földi egységeket gyárt. Az elkészült egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.air-factory.description = Légi egységeket gyárt. Az elkészült egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.naval-factory.description = Vízi egységeket gyárt. Az elkészült egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.additive-reconstructor.description = Kettes szintre fejleszti a beérkező egységeket.
+block.multiplicative-reconstructor.description = Hármas szintre fejleszti a beérkező egységeket.
+block.exponential-reconstructor.description = Négyes szintre fejleszti a beérkező egységeket.
+block.tetrative-reconstructor.description = Ötös szintre (a végsőre) fejleszti a beérkező egységeket.
+block.switch.description = Kétállású kapcsoló. Az állapota logikai processzorokkal olvasható és vezérelhető.
+block.micro-processor.description = Logikai műveletek sorozatát hajtja végre egy ciklusban. Egységek vagy épületek irányítására használható.
+block.logic-processor.description = Logikai műveletek sorozatát hajtja végre egy ciklusban. Egységek vagy épületek irányítására használható. Gyorsabb mint a mikroprocesszor.
+block.hyper-processor.description = Logikai műveletek sorozatát hajtja végre egy ciklusban. Egységek vagy épületek irányítására használható. Gyorsabb mint a logikai processzor.
+block.memory-cell.description = Információt tárol egy logikai processzor számára.
+block.memory-bank.description = Információt tárol egy logikai processzor számára. Nagy kapacitású.
+block.logic-display.description = Tetszőleges ábrákat jelenít meg egy logikai processzor alapján.
+block.large-logic-display.description = Tetszőleges ábrákat jelenít meg egy logikai processzor alapján.
+block.interplanetary-accelerator.description = Hatalmas elektromágneses sínágyútorony. Képes a támaszpontokat szökési sebességre gyorsítani a bolygóközi bevetéshez.
+block.repair-turret.description = Folyamatosan javítja a hatósugarában lévő legközelebbi sérült egységet. Opcionálisan elfogad hűtőfolyadékot.
+
+#Erekir
+block.core-bastion.description = Támaszpont. Páncélozott. Ha elpusztul, a szektor elveszett.
+block.core-citadel.description = Támaszpont. Nagyon jól páncélozott. Több nyersanyagot tárol, mint a bástya.
+block.core-acropolis.description = Támaszpont. Kivételesen jól páncélozott. Több nyersanyagot tárol, mint a citadella.
+block.breach.description = �tütő erejű berillium-, volfrám- vagy karbidlövedéket lő az ellenséges célpontokra.
+block.diffuse.description = Széles kúpban lő ki lövedékeket. Visszalöki az ellenséges célpontokat.
+block.sublimate.description = Folyamatos lángcsóvát lő az ellenséges célpontokra. �tüti a páncélt.
+block.titan.description = Hatalmas robbanóanyagú tüzérségi lövedéket lő földi célpontokra. Hidrogént igényel.
+block.afflict.description = Hatalmas töltésű repeszlövedék-gömböket lő ki. Hőt igényel.
+block.disperse.description = Égő repeszlövedékeket lő légi célpontokra.
+block.lustre.description = Lassan mozgó, egyszerre egy célpontra ható lézert lő az ellenséges célpontokra.
+block.scathe.description = Nagy erejű rakétát lő ki jelentős távolságokra lévő földi célpontok ellen.
+block.smite.description = �tütő erejű, villámló lövedékeket lő ki.
+block.malign.description = Lézertöltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Jelentős fűtést igényel.
+block.silicon-arc-furnace.description = A homokot és a grafitot szilíciummá finomítja.
+block.oxidation-chamber.description = A berilliumot és az ózont oxiddá alakítja. Melléktermékként hőt bocsát ki.
+block.electric-heater.description = Fűti a vele szemben álló épületeket. Nagy mennyiségű áramot fogyaszt.
+block.slag-heater.description = Fűti a vele szemben álló épületeket. Salakot igényel.
+block.phase-heater.description = Fűti a vele szemben álló épületeket. Tóritkvarcot igényel.
+block.heat-redirector.description = Más blokkokba irányítja át a felgyülemlett hőt.
+block.small-heat-redirector.description = Más blokkokba irányítja át a felgyülemlett hőt.
+block.heat-router.description = A felgyülemlett hőt három kimeneti irányba osztja szét.
+block.electrolyzer.description = A vizet hidrogénné és ózonná alakítja. A keletkező gázokat két ellentétes irányba adja ki, amelyek a megfelelő színnel vannak jelölve.
+block.atmospheric-concentrator.description = Koncentrálja a légkörben lévő nitrogént. Hőt igényel.
+block.surge-crucible.description = Salakból és szilíciumból elektrometált olvaszt. Hőt igényel.
+block.phase-synthesizer.description = Tóriumból, homokból és ózonból tóritkvarcot szintetizál. Hőt igényel.
+block.carbide-crucible.description = A grafitot és a volfrámot karbiddá olvasztja. Hőt igényel.
+block.cyanogen-synthesizer.description = Arkicitből és grafitból diciánt szintetizál. Hőt igényel.
+block.slag-incinerator.description = Elégeti a nem illékony nyersanyagokat vagy folyadékokat. Salakot igényel.
+block.vent-condenser.description = A kürtőkből kiáramló gázokat vízzé kondenzálja. �ramot fogyaszt.
+block.plasma-bore.description = Ércfallal szemben elhelyezve, korlátlanul termel nyersanyagokat. Kis mennyiségű áramot fogyaszt.\nHidrogén felhasználásával növelhető a hatásfoka.
+block.large-plasma-bore.description = Egy nagyobb plazmafúró. Képes a volfrám és a tórium bányászatára. Hidrogént igényel és áramot fogyaszt.\nNitrogén felhasználásával növelhető a hatásfoka.
+block.cliff-crusher.description = Felőrli a falakat, és korlátlan mennyiségű homokot termel. �ramot fogyaszt. A hatásfoka a fal típusától függően változik.
+block.large-cliff-crusher.description = Felőrli a falakat, és korlátlan mennyiségű homokot termel. �ramot fogyaszt, és ózont igényel. A hatásfoka a fal típusától függően változik, de volfrámmal növelhető.
+block.impact-drill.description = Ha ércre helyezik, korlátlan ideig, sorozatokban termeli ki a nyersanyagokat. �ramot fogyaszt és vizet igényel.
+block.eruption-drill.description = Továbbfejlesztett ütvefúró. Képes tóriumot bányászni. Hidrogént igényel.
+block.reinforced-conduit.description = Előre szállítja a folyadékokat. Nem fogad nem csővezetékes bemeneteket oldalról.
+block.reinforced-liquid-router.description = Egyenletesen osztja el a folyadékokat minden oldalra.
+block.reinforced-liquid-tank.description = Nagy mennyiségű folyadékot tárol.
+block.reinforced-liquid-container.description = Jelentős mennyiségű folyadékot tárol.
+block.reinforced-bridge-conduit.description = Folyadékot szállít épületek és terepakadályok fölött.
+block.reinforced-pump.description = Folyadékot szivattyúz és ad ki. Hidrogént igényel.
+block.beryllium-wall.description = Megvédi az építményeket az ellenséges lövedékektől.
+block.beryllium-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől.
+block.tungsten-wall.description = Megvédi az építményeket az ellenséges lövedékektől.
+block.tungsten-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől.
+block.carbide-wall.description = Megvédi az építményeket az ellenséges lövedékektől.
+block.carbide-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől.
+block.reinforced-surge-wall.description = Megvédi az építményeket az ellenséges lövedékektől, a lövedékekkel való érintkezésekor időszakosan elektromos íveket bocsát ki.
+block.reinforced-surge-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől, a lövedékekkel való érintkezésekor időszakosan elektromos íveket bocsát ki.
+block.shielded-wall.description = Megvédi az építményeket az ellenséges lövedékektől. Olyan erőpajzsot képez, amely a legtöbb lövedéket elnyeli, ha az áramellátás biztosítva van. Vezeti az áramot.
+block.blast-door.description = Egy fal, amely kinyílik, ha szövetséges földi egységek vannak a közelében. Kézzel nem irányítható.
+block.duct.description = Előre mozgatja a nyersanyagokat. Csak egyetlen nyersanyag tárolására alkalmas.
+block.armored-duct.description = Előre mozgatja a nyersanyagokat. Csak szállítószalagos bemeneteket fogad el oldalról.
+block.duct-router.description = A nyersanyagokat egyenlően osztja el három irányba. Csak hátulról fogad el nyersanyagokat. Nyersanyag-válogatóként is beállítható.
+block.overflow-duct.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud.
+block.duct-bridge.description = Nyersanyagokat szállít épületek és terepakadályok fölött.
+block.duct-unloader.description = A kiválasztott nyersanyagokat kirakodja a mögötte lévő épületekből. Támaszpontokból nem tud kirakodni.
+block.underflow-duct.description = A túlcsorduló kapu ellentettje. Csak akkor ad ki nyersanyagot előrefelé, ha oldalra már nem tud.
+block.reinforced-liquid-junction.description = Csomópontként működik két egymást keresztező csővezeték között.
+block.surge-conveyor.description = A nyersanyagokat rakományokban mozgatja. �rammal felgyorsítható. Vezeti az áramot.
+block.surge-router.description = Egyenletesen osztja el a nyersanyagokat három irányba az elektrometál-szállítószalagról. �rammal felgyorsítható. Vezeti az áramot.
+block.unit-cargo-loader.description = Teherszállító drónokat épít. A drónok automatikusan eljuttatják a nyersanyagokat a megfelelő szűrővel rendelkező kirakodási pontokra.
+block.unit-cargo-unload-point.description = A teherszállító drónok kirakodási pontjaként működik. Csak a kiválasztott szűrőnek megfelelő nyersanyagokat fogadja be.
+block.beam-node.description = Merőlegesen áramot vezet a többi blokkhoz. Kis mennyiségű áramot tárol.
+block.beam-tower.description = Merőlegesen áramot vezet a többi blokkhoz. Nagy mennyiségű áramot tárol. Nagy hatótávolságú.
+block.turbine-condenser.description = Kürtőkre helyezve áramot termel. Kis mennyiségű vizet termel.
+block.chemical-combustion-chamber.description = �ramot termel arkicitből és ózonból.
+block.pyrolysis-generator.description = Nagy mennyiségű áramot termel arkicitből és salakból. Melléktermékként vizet termel.
+block.flux-reactor.description = Fűtés hatására nagy mennyiségű áramot termel. Stabilizátorként diciánt igényel. Az áramtermelés és a diciánigény arányos a hőbevitellel.\nFelrobban, ha nem áll rendelkezésre elegendő dicián.
+block.neoplasia-reactor.description = Arkicit, víz és tóritkvarc felhasználásával nagy mennyiségű áramot termel. Melléktermékként hőt és veszélyes neoplazmát termel.\nFelrobban, ha a neoplazmát nem távolítják el a reaktorból csővezetékeken keresztül.
+block.build-tower.description = Automatikusan újjáépíti a hatósugarában lévő építményeket, és segíti a többi egységet az építkezésben.
+block.regen-projector.description = Lassan javítja a szövetséges építményeket egy négyzet alakú területen. Hidrogént igényel.\nTóritkvarccal növelhető a hatásfoka.
+block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a támaszpont tárolókapacitását.
+block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a támaszpont tárolókapacitását.
+block.tank-fabricator.description = Stell egységeket épít. Az elkészült egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.ship-fabricator.description = Elude egységeket épít. Az elkészült egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.mech-fabricator.description = Merui egységeket épít. Az elkészült egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.tank-assembler.description = Nagy méretű tankokat állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
+block.ship-assembler.description = Nagy méretű repülőgépeket állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
+block.mech-assembler.description = Nagy méretű mecheket állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
+block.tank-refabricator.description = Kettes szintre fejleszti a beérkező tank típusú egységeket.
+block.ship-refabricator.description = Kettes szintre fejleszti a beérkező repülőgép típusú egységeket.
+block.mech-refabricator.description = Kettes szintre fejleszti a beérkező mech típusú egységeket.
+block.prime-refabricator.description = Hármas szintre fejleszti a beérkező tank típusú egységeket.
+block.basic-assembler-module.description = Növeli az összeszerelő szintjét, ha annak az építési határvonala mellé helyezik. �ramot fogyaszt. Használható nyersanyagrakomány-bemenetként.
+block.small-deconstructor.description = Lebontja a beadott építményeket és egységeket. Visszaadja az építési költség 100%-át.
+block.reinforced-payload-conveyor.description = Előre mozgatja a rakományokat.
+block.reinforced-payload-router.description = A rakományokat a szomszédos blokkokba osztja szét. A megfelelő szűrő beállítása esetén rakomány-válogatóként is beállítható.
+block.payload-mass-driver.description = Nagy hatótávolságú rakományszállító eszköz. A kapott rakományokat egy másik, hozzákapcsolt rakomány-tömegmozgatónak lövi át.
+block.large-payload-mass-driver.description = Nagyobb hatótávolságú rakományszállító eszköz, mint rakomány-tömegmozgató. A kapott rakományokat egy másik, hozzákapcsolt nagy rakomány-tömegmozgatónak lövi át.
+block.unit-repair-tower.description = Javítja a közelében lévő összes egységet. Ózont igényel.
+block.radar.description = Fokozatosan feltárja a terepet és az ellenséges egységeket egy nagy sugarú körben. �ramot fogyaszt.
+block.shockwave-tower.description = Sérülést okoz és megsemmisíti az ellenséges lövedékeket egy körön belül. Diciánt igényel.
+block.canvas.description = Egy egyszerű képet jelenít meg egy előre meghatározott palettával. Szerkeszthető.
+
+unit.dagger.description = Szokásos lövedékeket lő a közeli ellenségekre.
+unit.mace.description = Lángnyelveket küld a közeli ellenségek felé.
+unit.fortress.description = Nagy hatótávolságú rakétákat lő földi célpontokra.
+unit.scepter.description = Töltött lövedékek záporát lövi közeli ellenségekre.
+unit.reign.description = Méretes átütő erejű lövedékeket zúdít minden közeli ellenségre.
+unit.nova.description = Lézerlövedékeket lő ki, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. Repülésre alkalmas.
+unit.pulsar.description = Elektromos szikrákat szór, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. Repülésre alkalmas.
+unit.quasar.description = �tütő erejű lézersugarakat lő, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. Repülésre alkalmas. Erőpajzsa van.
+unit.vela.description = Folyamatos lézernyalábot bocsát ki, amelyek sebzik az ellenséges célpontokat, tüzet okoznak, és megjavítják a szövetséges épületeket. Repülésre alkalmas.
+unit.corvus.description = Hatalmas lézersugarat lő, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. �tlépi a legtöbb terepakadályt.
+unit.crawler.description = Az ellenséghez rohan és megsemmisíti önmagát, nagy robbanást okozva.
+unit.atrax.description = Bénító salakgolyókat lő a földi célpontokra. A legtöbb terepakadályt átlépi.
+unit.spiroct.description = Lézersugarakkal elszívja az ellenséges célpontok életerejét, miközben javítja önmagát. A legtöbb terepakadályt átlépi.
+unit.arkyid.description = Nagy lézersugarakkal elszívja az ellenséges célpontok életerejét, miközben javítja önmagát. A legtöbb terepakadályt átlépi.
+unit.toxopid.description = Kazettás elektromos bombákat és átütő erejű lézert lő az ellenségre. A legtöbb terepakadályt átlépi.
+unit.flare.description = Szokásos lövedékeket lő közeli földi célpontokra.
+unit.horizon.description = Kazettás bombákat szór földi célpontokra.
+unit.zenith.description = Rakétasorozatokat lő közeli ellenségekre.
+unit.antumbra.description = Lövedékek záporát zúdítja minden közeli ellenségre.
+unit.eclipse.description = Két átütő erejű lézersugarat és rengeteg lövedéket zúdít minden közeli ellenségre.
+unit.mono.description = Automatikusan rezet és ólmot bányászik, a támaszpontba juttatva őket.
+unit.poly.description = Automatikusan újjáépíti a lerombolt épületeket és segít más egységeknek az építkezésben.
+unit.mega.description = Automatikusan javítja a sérült épületeket. Kis blokkok és földi egységek szállítására is alkalmas.
+unit.quad.description = Plazmabombákat szór földi célpontokra, amelyek sebzik az ellenséget, de javítják a szövetséges épületeket. Közepes méretű földi egységek szállítására is alkalmas.
+unit.oct.description = Megvédi a közeli szövetségeseket egy regeneráló pajzzsal. A legtöbb földi egység szállítására is alkalmas.
+unit.risso.description = Rakéták és lövedékek záporát zúdítja minden közeli ellenségre.
+unit.minke.description = Tüzérségi és szokásos lövedékeket lő közeli földi célpontokra.
+unit.bryde.description = Nagy távolságú tüzérségi lövedékeket és rakétákat lő az ellenségre.
+unit.sei.description = Rakéták és páncéltörő lövedékek záporát zúdítja az ellenségre.
+unit.omura.description = Nagy hatótávolságú átütő erejű lövedékeket lő az ellenségre. Flare egységeket gyárt.
+unit.alpha.description = Megvédi a szilánk támaszpontot az ellenségtől. Épületeket épít.
+unit.beta.description = Megvédi az alapítvány támaszpontot az ellenségtől. Épületeket épít.
+unit.gamma.description = Megvédi az atommag támaszpontot az ellenségtől. Épületeket épít.
+unit.retusa.description = Célkövető torpedókat lő ki minden közeli ellenségre. Javítja a szövetséges egységeket.
+unit.oxynoe.description = Épületjavító lángcsóvát lő az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket egy pontvédelmi toronnyal.
+unit.cyerce.description = Célkereső kazettás rakétákat lő ki az ellenségre. Javítja a szövetséges egységeket.
+unit.aegires.description = Elektromosan sokkolja az összes ellenséges egységet és építményt, amely az energiamezejébe lép. Javítja az összes szövetségest.
+unit.navanax.description = Robbanékony EMI-lövedékeket lő ki, jelentős károkat okozva az ellenséges energiahálózatokban, és megjavítva a szövetségesek építményeit. Szétolvasztja a közeli ellenséges célpontokat a 4 autonóm lézertornyával.
+
+#Erekir
+unit.stell.description = Szokásos lövedékeket lő ki az ellenséges célpontokra.
+unit.locus.description = Változatos lövedékeket lő ki az ellenséges célpontokra.
+unit.precept.description = �tütő erejű kazettás lövedékeket lő ki az ellenséges célpontokra.
+unit.vanquish.description = Nagy, átütő erejű hasítólövedékeket lő ki az ellenséges célpontokra.
+unit.conquer.description = Nagy, átütő erejű golyózáport lő ki az ellenséges célpontokra.
+unit.merui.description = Nagy hatótávolságú ágyúkkal lövi az ellenséges szárazföldi célpontokat. A legtöbb terepakadályt átlépi.
+unit.cleroi.description = Kettős lövedékeket lő ki az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket a pontvédelmi tornyokkal. A legtöbb terepakadályt átlépi.
+unit.anthicus.description = Nagy hatótávolságú célkövető rakétákat lő ki az ellenséges célpontokra. A legtöbb terepakadályt átlépi.
+unit.tecta.description = Célkövető plazmarakétákat lő ki az ellenséges célpontokra. Irányított pajzzsal védi magát. A legtöbb terepakadályt átlépi.
+unit.collaris.description = Nagy hatótávolságú repeszágyúval lövi az ellenséges célpontokat. A legtöbb terepakadályt átlépi.
+unit.elude.description = Célkövető golyópárokat lő ki az ellenséges célpontokra. Lebeg a folyadékfelületeket felett.
+unit.avert.description = Forgó lövedékpárokat lő ki az ellenséges célpontokra.
+unit.obviate.description = Forgó, páros villámgömböket lő ki az ellenséges célpontokra.
+unit.quell.description = Nagy hatótávolságú célkövető rakétát lő ki az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket. Csak földi célpontokat támad.
+unit.disrupt.description = Nagy hatótávolságú célkövető elnyomó rakétát lő ki az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket. Csak földi célpontokat támad.
+unit.evoke.description = A bástya védelmére szolgáló építményeket épít. Sugárral javítja az építményeket. 2×2-es épületek szállítására is alkalmas.
+unit.incite.description = A citadella védelmére szolgáló építményeket épít. Sugárral javítja az építményeket. 2×2-es épületek szállítására is alkalmas.
+unit.emanate.description = Az akropolisz védelmére szolgáló építményeket épít. Sugárral javítja az építményeket. 2×2-es épületek szállítására is alkalmas.
+
+lst.read = Szám kiolvasása egy összekapcsolt memóriacellából.
+lst.write = Szám beírása egy összekapcsolt memóriacellába.
+lst.print = Szöveg hozzáadása a kiírási pufferhez.\nA [accent]Print Flush[] használatáig nem jelenít meg semmit.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = A szövegpufferben lévő következő helyőrző cseréje egy értékre.\nNem csinál semmit, ha a helyőrzőminta érvénytelen.\nHelyőrzőminta: „{[accent]number 0-9[]}�\nPélda:\n[accent]print „test {0}�\nformat „example�
+lst.draw = Művelet hozzáadása a rajzpufferhez.\nA [accent]Draw Flush[] használatáig nem jelenít meg semmit.
+lst.drawflush = Sorba állított [accent]Draw[] műveletek megjelenítése a kijelzőn.
+lst.printflush = Sorba állított [accent]Print[] műveletek kiírása egy üzenetblokkba.
+lst.getlink = A processzor hivatkozásának lekérése index alapján. 0-nál kezdődik.
+lst.control = Épület irányítása.
+lst.radar = Egységek megkeresése az épület körül egy bizonyos hatótávolságban.
+lst.sensor = Adatok lekérése egy épületről vagy egységről.
+lst.set = Egy változó beállítása.
+lst.operation = Egy művelet elvégzése 1-2 változóval.
+lst.end = Ugrás az utasítási verem tetejére.
+lst.wait = Várakozás bizonyos számú másodpercig.
+lst.stop = A processzor futtatásának leállítása.
+lst.lookup = Egy nyersanyag/folyadék/egység/épület típusának keresése azonosító alapján.\nAz egyes típusok összesített száma a következőkkel érhető el:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nA fordított művelethez használd az objektum [accent]@id[] értékét.
+lst.jump = Feltételes ugrás egy másik utasításra.
+lst.unitbind = Összekapcsolás a következő egységtípussal, és tárolás a következőben: [accent]@unit[].
+lst.unitcontrol = A jelenleg összekapcsolt egység vezérlése.
+lst.unitradar = Egységek keresése a jelenleg összekapcsolt egység körül.
+lst.unitlocate = Egy adott típusú pozíció/épület keresése bárhol a pályán.\nÖsszekapcsolt egységet igényel.
+lst.getblock = Mezőadatok lekérdezése tetszőleges helyen.
+lst.setblock = Mezőadatok beállítása tetszőleges helyen.
+lst.spawnunit = Egység lerakása az adott helyen.
+lst.applystatus = �llapothatás alkalmazása vagy törlése egy egységről.
+lst.weathersense = Ellenőrzés, hogy egy bizonyos típusú időjárás aktív-e.
+lst.weatherset = Az időjárástípus jelenlegi állapotának megadása.
+lst.spawnwave = Egy hullám indítása.
+lst.explosion = Robbanás létrehozása az adott helyen.
+lst.setrate = A processzor végrehajtási sebességének beállítása utasítás/órajelciklusban.
+lst.fetch = Egységek, támaszpontok, játékosok, vagy épületek keresése index szerint.\nAz indexek 0-tól indulnak és a visszaadott számuknál végződnek.
+lst.packcolor = Egyetlen számba tömöríti a [0, 1] RGBA komponenseket a rajzoláshoz vagy szabálymeghatározáshoz.
+lst.setrule = Játékszabály beállítása.
+lst.flushmessage = Üzenet megjelenítése a képernyőn a szövegpufferből. Ha a sikeres válasz változója [accent]@wait[],\nakkor, megvárja, amíg az előző üzenet befejeződik.\nMáskülönben azt adja ki, hogy az üzenet megjelenítése sikeres volt-e.
+lst.cutscene = A játékos kamerájának mozgatása.
+lst.setflag = Egy globális jelölő beállítása, amely minden processzor által olvasható.
+lst.getflag = Ellenőrzés, hogy egy globális jelölő be van-e állítva.
+lst.setprop = Beállítja egy egység vagy épület tulajdonságát.
+lst.effect = Részecskehatás létrehozása.
+lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 20-szor hívható meg.
+lst.playsound = Egy hangot játszik le.\nA hangerő és a panoráma lehet globális érték, vagy a pozíció alapján kiszámított érték.
+lst.makemarker = Új logikai jelölő létrehozása a világban.\nMeg kell adni egy azonosítót a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
+lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Make Marker utasításban megadottal.\nA [accent]null []értékek figyelmen kívül lesznek hagyva.
+lst.localeprint = Hozzáadja a pálya nyelvi csomagjainak tulajdonságértékét a szövegpufferhez.\nA pálya nyelvi csomagjainak beállításait a térképszerkesztőben ellenőrizheted: [accent]pályainformációk > nyelvi csomagok[].\nHa a kliens egy hordozható eszköz, akkor először próbáld kiíratni a „.mobile� végződésű tulajdonságot.
+
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = A pi matematikai állandó (3.141…)
+lglobal.@e = Az e matematikai állandó (2.718…)
+lglobal.@degToRad = Ezzel a számmal szoroz a fok radiánra való átalakításához
+lglobal.@radToDeg = Ezzel a számmal szoroz a radián fokra való átalakításához
+
+lglobal.@time = A jelenlegi mentés játékideje ezredmásodpercben
+lglobal.@tick = A jelenlegi mentés játékideje, órajelciklusban (1 másodperc = 60 órajelciklus)
+lglobal.@second = A jelenlegi mentés játékideje másodpercben
+lglobal.@minute = A jelenlegi mentés játékideje percben
+lglobal.@waveNumber = A jelenlegi hullám száma, ha a hullámok engedélyezve vannak
+lglobal.@waveTime = Visszaszámláló a hullámokhoz, másodpercben
+lglobal.@mapw = A pálya szélessége mezőben
+lglobal.@maph = A pálya magassága mezőben
+
+lglobal.sectionMap = Pálya
+lglobal.sectionGeneral = �ltalános
+lglobal.sectionNetwork = Hálózati/kliensoldali [Csak világprocesszor]
+lglobal.sectionProcessor = Processzor
+lglobal.sectionLookup = Keresés
+
+lglobal.@this = A kódot végrehajtó logikai blokk
+lglobal.@thisx = A kódot végrehajtó blokk X koordinátája
+lglobal.@thisy = A kódot végrehajtó blokk Y koordinátája
+lglobal.@links = Az ehhez a processzorhoz kapcsolt épületek száma összesen
+lglobal.@ipt = A processzor végrehajtási sebessége órajelciklusban (60 órajelciklus = 1 másodperc)
+
+lglobal.@unitCount = A játékban található egységtípusok száma összesen; a keresés utasítással együtt használatos
+lglobal.@blockCount = A játékban található blokktípusok száma összesen; a keresés utasítással együtt használatos
+lglobal.@itemCount = A játékban található nyersanyagtípusok száma összesen; a keres utasítással együtt használatos
+lglobal.@liquidCount = A játékban található folyadéktípusok száma összesen; a keresés utasítással együtt használatos
+
+lglobal.@server = Igaz, ha a kód egy kiszolgálón, vagy egyjátékos módban fut, egyébként hamis
+lglobal.@client = Igaz, ha a kód egy kiszolgálóhoz kapcsolódott kliensen fut
+
+lglobal.@clientLocale = A kódot futtató kliens területi beállítása. Például: hu_HU
+lglobal.@clientUnit = A kódot futtató kliens egysége
+lglobal.@clientName = A kódot futtató kliens játékosneve
+lglobal.@clientTeam = A kódot futtató kliens csapatazonosítója
+lglobal.@clientMobile = Igaz, ha a kódot futtató kliens egy hordozható eszköz, egyébként hamis
+
+logic.nounitbuild = [red]Az egységépítési logika itt nem megengedett.
+
+lenum.type = Az épület/egység típusa.\nPéldául bármilyen elosztó esetén a [accent]@router[] értéket adja vissza.\nNem karakterlánc.
+lenum.shoot = Lövés egy adott pontra.
+lenum.shootp = Lövés egy egységre/épületre sebesség-előrejelzéssel.
+lenum.config = Épületkonfiguráció, például nyersanyag-válogató.
+lenum.enabled = Engedélyezve van-e a blokk.
+laccess.currentammotype = Egy lövegtorony jelenlegi lőszer nyersanyaga/folyadéka.
+
+laccess.color = Megvilágítás színe.
+laccess.controller = Egységvezérlő. Ha processzor vezérli, akkor a processzort adja vissza.\nKülönben magát az egységet adja vissza.
+laccess.dead = Egy épület/egység megsemmisült-e, vagy érvénytelen-e.
+laccess.controlled = Ezt adja vissza:\n[accent]@ctrlProcessor[], ha az egységvezérlő egy processzor\n[accent]@ctrlPlayer[], ha az egység/épület vezérlője a játékos\n[accent]@ctrlFormation[], ha az egység formációban van\nKülönben 0.
+laccess.progress = Művelet előrehaladása, 0 és 1 között.\nA termelés, a lövegtorony-újratöltés vagy az építés előrehaladását adja vissza.
+laccess.speed = Az egység legnagyobb sebessége, mező/mp-ben.
+laccess.id = Egy egység/blokk/nyersanyag/folyadék azonosítója.\nEz a keresési művelet fordítottja.
+
+lcategory.unknown = Ismeretlen
+lcategory.unknown.description = Nem kategorizált utasítások.
+lcategory.io = Bemenet és kimenet
+lcategory.io.description = A memóriablokkok és processzorpufferek tartalmának módosítása.
+lcategory.block = Blokkvezérlés
+lcategory.block.description = Interakció a blokkokkal.
+lcategory.operation = Műveletek
+lcategory.operation.description = Logikai műveletek.
+lcategory.control = Folyamatvezérlés
+lcategory.control.description = A végrehajtási sorrend kezelése.
+lcategory.unit = Egységvezérlés
+lcategory.unit.description = Parancsok adása az egységeknek.
+lcategory.world = Világ
+lcategory.world.description = A világ viselkedésének szabályozása.
+
+graphicstype.clear = A kijelző kitöltése egy színnel.
+graphicstype.color = Szín kiválasztása a következő rajzolási műveletekhez.
+graphicstype.col = A színnel egyenértékű, de csomagolva van.\nA csomagolt színeket hexa kódként írja ki egy [accent]%[] előtaggal.\nPéldául: a [accent]%ff0000[] piros lenne.
+graphicstype.stroke = Vonalvastagság beállítása.
+graphicstype.line = Vonalszakasz rajzolása.
+graphicstype.rect = Téglalap kitöltése.
+graphicstype.linerect = Téglalap körvonalának rajzolása.
+graphicstype.poly = Egy szabályos sokszög kitöltése.
+graphicstype.linepoly = Szabályos sokszög körvonalának rajzolása.
+graphicstype.triangle = Egy háromszög kitöltése.
+graphicstype.image = Kép rajzolása valamilyen tartalomról.\nPéldául: [accent]@router[] vagy [accent]@dagger[].
+graphicstype.print = Szöveget rajzol a kiírási pufferből.\nCsak ASCII karakterek használhatók.\nTörli a kiírás puffert.
+
+lenum.always = Mindig igaz.
+lenum.idiv = Egész osztás.
+lenum.div = Osztás.\nNullával való osztáskor a visszatérési érték [accent]null[].
+lenum.mod = Modulo.
+lenum.equal = Egyenlő. Kényszeríti a típusokat.\nA nem null értékű objektumok értéke 1 lesz, egyébként 0.
+lenum.notequal = Nem egyenlő. Kényszeríti a típusokat.
+lenum.strictequal = Szigorúan egyenlőség. Nem kényszeríti a típusokat.\nA [accent]null[] ellenőrzésére is használható.
+lenum.shl = Biteltolás balra.
+lenum.shr = Biteltolás jobbra.
+lenum.or = Bitenkénti VAGY.
+lenum.land = Logikai ÉS.
+lenum.and = Bitenkénti ÉS.
+lenum.not = Bitenkénti átfordítás.
+lenum.xor = Bitenkénti KIZ�RÓ VAGY.
+
+lenum.min = Két szám minimuma.
+lenum.max = Két szám maximuma.
+lenum.angle = A vektor szöge fokban.
+lenum.anglediff = Két szög abszolút távolsága fokban.
+lenum.len = A vektor hossza.
+
+lenum.sin = Szinusz, fokban.
+lenum.cos = Koszinusz, fokban.
+lenum.tan = Tangens, fokban.
+
+lenum.asin = Arkusz szinusz, fokban.
+lenum.acos = Arkusz koszinusz, fokban.
+lenum.atan = Arkusz tangens, fokban.
+
+#Az alábbi zárójel nem elírás, nézz utána a „nyitott/zárt intervallum/tartomány jelöléseknek�
+lenum.rand = Véletlenszerű decimális szám a [0, érték) tartományban.
+lenum.log = Természetes logaritmus (ln).
+lenum.log10 = 10-es alapú logaritmus.
+lenum.noise = 2D-s szimplex zaj.
+lenum.abs = Abszolút érték.
+lenum.sqrt = Négyzetgyök.
+
+lenum.any = Bármelyik egység.
+lenum.ally = Szövetséges egység.
+lenum.attacker = Fegyveres egység.
+lenum.enemy = Ellenséges egység.
+lenum.boss = �rző egység.
+lenum.flying = Légi egység.
+lenum.ground = Földi egység.
+lenum.player = Egy játékos által irányított egység.
+
+lenum.ore = Érclelőhely.
+lenum.damaged = Sérült szövetséges épület.
+lenum.spawn = Ellenséges kezdőpont.\nLehet támaszpont vagy pozíció.
+lenum.building = Épület egy adott csoportban.
+
+lenum.core = Bármilyen támaszpont.
+lenum.storage = Raktárépület, például raktár.
+lenum.generator = Energiát termelő épületek.
+lenum.factory = Nyersanyagokat feldolgozó épületek.
+lenum.repair = Javítási pontok.
+lenum.battery = Bármilyen akkumulátor.
+lenum.resupply = Utánpótlási pontok.\nCsak akkor van jelentősége, amikor az [accent]„egység lőszere�[] engedélyezve van.
+lenum.reactor = Ütközéses- vagy tóriumerőmű.
+lenum.turret = Bármilyen lövegtorony.
+
+sensor.in = Az érzékelendő épület/egység.
+
+radar.from = Az épület, ahonnan érzékelni kell.\nAz érzékelő hatótávolságát az épület hatótávolsága korlátozza.
+radar.target = Szűrő az érzékelendő egységekhez.
+radar.and = További szűrők.
+radar.order = Rendezési sorrend. 0-tól visszafelé.
+radar.sort = Az eredmények rendezésének metrikája.
+radar.output = Változó, amelybe a kimeneti egységet írja.
+
+unitradar.target = Érzékelendő egységek szűrése.
+unitradar.and = További szűrők.
+unitradar.order = Rendezési sorrend. 0-tól visszafelé.
+unitradar.sort = Az eredmények rendezésének metrikája.
+unitradar.output = Változó, amelybe a kimeneti egységet írja.
+
+control.of = Irányítandó épület.
+control.unit = Megcélozandó egység/épület.
+control.shoot = Lőjön-e.
+
+unitlocate.enemy = Felderítse-e az ellenséges épületeket.
+unitlocate.found = Megtalálta-e az objektumot.
+unitlocate.building = Kimeneti változó a megtalált épülethez.
+unitlocate.outx = Kimenet X koordinátája.
+unitlocate.outy = Kimenet Y koordinátája.
+unitlocate.group = Keresendő épületcsoport.
+
+playsound.limit = Ha igaz, megakadályozza a hang lejátszását,\nha már lejátszották ugyanabban a keretben.
+
+lenum.idle = Ne mozdulj, de folytasd az építkezést/bányászatot.\nAz alapértelmezett állapot.
+lenum.stop = Mozgás/bányászás/építés leállítása.
+lenum.unbind = A logikai vezérlés teljes kikapcsolása.\nA szokásos mesterséges intelligencia használatának folytatása.
+lenum.move = Mozgás a pontos pozícióba.
+lenum.approach = Egy pozíció megközelítése egy sugárral.
+lenum.pathfind = Útkeresés a megadott pozícióhoz.
+lenum.autopathfind = Automatikus útkeresés a legközelebbi ellenséges támaszponthoz vagy ledobási ponthoz.\nEz ugyanaz, mint a normál hullámos ellenséges útkeresés.
+lenum.target = Lövés egy pozícióra.
+lenum.targetp = Lövés egy célpontra sebesség-előrejelzéssel.
+lenum.itemdrop = Egy nyersanyag ledobása.
+lenum.itemtake = Egy nyersanyag felvétele egy épületből.
+lenum.paydrop = A jelenlegi rakomány ledobása.
+lenum.paytake = Rakomány felvétele a jelenlegi helyen.
+lenum.payenter = Belépés/leszállás a rakományblokkra, amelyen az egység van.
+lenum.flag = Számjegyes egységjelölő.
+lenum.mine = Bányászat egy helyen.
+lenum.build = Egy épület építése.
+lenum.getblock = Az épület-, talaj- és blokktípus lekérdezése a koordinátákon.\nAz egységnek a pozíciótartományon belül kell lennie, különben null értékkel tér vissza.
+lenum.within = Ellenőrzés, hogy az egység egy pozíció közelében van-e.
+lenum.boost = Erősítés indítása/leállítása.
+
+lenum.flushtext = Az írási puffer tartalmának ürítése a jelölőre, ha alkalmazható.\nHa a „fetch� igaz, akkor megpróbálja lekérni a tulajdonságokat a pálya nyelvi csomagjából vagy a játék csomagjából.
+lenum.texture = A textúra neve közvetlenül a játék textúraatlaszából (ún. kebab-case elnevezési stílus használatával).\nHa a „printFlush� igaz, akkor a szöveges puffer tartalmát használja szöveges argumentumként.
+lenum.texturesize = A textúra mérete mezőben. A nulla érték a jelölő szélességét az eredeti textúra méretére skálázza.
+lenum.autoscale = Skálázva legyen-e a jelölő a játékos nagyítási szintjének megfelelően.
+lenum.posi = Indexelt pozíció, vonal- és négyszögjelzőkhöz használatos, ahol a nulla az első pozíció.
+lenum.uvi = A textúra pozíciója nullától egyig, négyzetjelölőkhöz használatos.
+lenum.colori = Indexelt szín, vonal- és négyzetjelölőkhöz használatos, ahol a nulla az első szín.
+
+lenum.wavetimer = Független attól, hogy a hullámok automatikusan indulnak-e az időzítésre. Ha nem, akkor a hullámok a lejátszásgomb megnyomásakor indulnak.
+lenum.wave = Jelenlegi hullámszám. Bármi lehet a nem-hullámalapú játékmódokban.
+lenum.currentwavetime = Hullám-visszaszámlálás tickben.
+lenum.waves = Független attól, hogy a hullámok egyáltalán elindíthatók-e.
+lenum.wavesending = Független attól, hogy a hullámok kézzel elindíthatók-e a lejátszásgombbal.
+lenum.attackmode = Meghatározza, hogy a játékmód támadó módban van-e.
+lenum.wavespacing = A hullámok közötti idő tickben.
+lenum.enemycorebuildradius = Építési tilalmi zóna az ellenséges támaszpont körül.
+lenum.dropzoneradius = Az ellenséges hullámok ledobási zónájának sugara.
+lenum.unitcap = Alap egységdarabszám. Épületekkel tovább növelhető.
+lenum.lighting = Független attól, hogy a háttérfény engedélyezve van-e.
+lenum.buildspeed = Az építési sebesség szorzója.
+lenum.unithealth = Mennyi életponttal indulnak az egységek.
+lenum.unitbuildspeed = Milyen gyorsan gyártanak egységeket az egységgyárak.
+lenum.unitcost = Az egységek építéséhez szükséges erőforrások szorzója.
+lenum.unitdamage = Mennyi sebzést okoznak az egységek.
+lenum.blockhealth = Mennyi életponttal indulnak az épületek.
+lenum.blockdamage = Mennyi sebzést okoznak az épületek (lövegtornyok).
+lenum.rtsminweight = Minimális „támadási súly� szükséges ahhoz, hogy egy osztag támadjon. Minél magasabb az érték, annál megfontoltabbak az egységek.
+lenum.rtsminsquad = A támadó osztagok minimális mérete.
+lenum.maparea = A játszható területe a pályának. Minden, ami a területen kívülre esik, nem lesz elérhető.
+lenum.ambientlight = Háttérfény színe. Akkor használható, amikor a világítás engedélyezve van.
+lenum.solarmultiplier = Megsokszorozza a napelemek teljesítményét.
+lenum.dragmultiplier = Környezet-húzási szorzó.
+lenum.ban = Épületek vagy egységek, amelyek nem építhetők meg vagy helyezhetők el a pályán.
+lenum.unban = Egy egység vagy épület újraengedélyezése.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
new file mode 100644
index 0000000000..0b5eb9fa57
--- /dev/null
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -0,0 +1,2697 @@
+credits.text = Diciptakan oleh [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits = Kredit
+contributors = Penerjemah dan Kontributor
+discord = Bergabung di Discord Mindustry!
+link.discord.description = Discord Mindustry resmi
+link.reddit.description = Subreddit Mindustry
+link.github.description = Sumber kode permainan
+link.changelog.description = Daftar rekam pembaruan
+link.dev-builds.description = Bentuk pengembangan kurang stabil
+link.trello.description = Papan Trello resmi untuk fitur terencana
+link.itch.io.description = Halaman itch.io dengan unduhan PC
+link.google-play.description = Google Play Store
+link.f-droid.description = F-Droid
+link.wiki.description = Wiki Mindustry resmi
+link.suggestions.description = Saran fitur baru
+link.bug.description = Menemukan bug? Laporkan di sini
+linkopen = Server ini mengirimkan Anda sebuah tautan. Apakah Anda yakin ingin membukanya?\n\n[sky]{0}
+linkfail = Gagal membuka tautan!\nURL disalin ke papan klip.
+screenshot = Tangkapan layar tersimpan di {0}
+screenshot.invalid = Peta terlalu besar, tidak cukup memori untuk menangkap layar.
+gameover = Permainan Selesai
+gameover.disconnect = Jaringan Terputus
+gameover.pvp = Tim[accent] {0}[] menang!
+gameover.waiting = [accent]Menunggu peta selanjutnya...
+highscore = [accent]Rekor baru!
+copied = Tersalin.
+indev.notready = Bagian permainan saat ini belum siap
+
+load.sound = Suara
+load.map = Peta
+load.image = Gambar
+load.content = Konten
+load.system = Sistem
+load.mod = Mod
+load.scripts = Skrip
+
+be.update = Versi Bleeding Edge terbaru tersedia:
+be.update.confirm = Unduh dan mulai ulang sekarang?
+be.updating = Memperbarui...
+be.ignore = Abaikan
+be.noupdates = Tidak ada pembaruan yang ditemukan.
+be.check = Periksa pembaruan
+
+mods.browser = Browser Mod
+mods.browser.selected = Mod yang Dipilih
+mods.browser.add = Pasang mod
+mods.browser.reinstall = Pasang kembali
+mods.browser.view-releases = Lihat Rilis
+mods.browser.noreleases = [scarlet]Tidak Ada Rilis Ditemukan\n[accent]Tidak dapat menemukan rilis untuk mod ini. Periksa apakah repositori mod memiliki rilis publik.
+mods.browser.latest = [lightgray][Terbaru]
+mods.browser.releases = Rilis
+mods.github.open = Repo
+mods.github.open-release = Laman Rilis
+mods.browser.sortdate = Urut berdasarkan waktu
+mods.browser.sortstars = Urut berdasarkan bintang
+
+schematic = Skema
+schematic.add = Menyimpan skema...
+schematics = Kumpulan skema
+schematic.search = Cari skema...
+schematic.replace = Skema dengan nama tersebut sudah ada. Ganti dengan yang baru?
+schematic.exists = Skema dengan nama tersebut sudah ada.
+schematic.import = Mengimpor skema...
+schematic.exportfile = Ekspor Berkas
+schematic.importfile = Impor Berkas
+schematic.browseworkshop = Cari di Workshop
+schematic.copy = Salin ke papan klip
+schematic.copy.import = Impor dari papan klip
+schematic.shareworkshop = Bagikan di Workshop
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Balik Skema
+schematic.saved = Skema telah disimpan.
+schematic.delete.confirm = Skema ini akan benar-benar dihapus.
+schematic.edit = Sunting Skema
+schematic.info = {0}x{1}, {2} blok
+schematic.disabled = [scarlet]Skema dimatikan[]\nPenggunaan skema tidak diperbolehkan di [accent]peta[] atau [accent]server[] ini.
+schematic.tags = Tanda:
+schematic.edittags = Ubah Tanda
+schematic.addtag = Tambah Tanda
+schematic.texttag = Tanda Teks
+schematic.icontag = Tanda Ikon
+schematic.renametag = Ubah Nama Tanda
+schematic.tagged = {0} ditandai
+schematic.tagdelconfirm = Ingin menghapus tanda ini?
+schematic.tagexists = Tanda tersebut sudah ada.
+
+stats = Statistik
+stats.wave = Gelombang Terkalahkan
+stats.unitsCreated = Unit Terbentuk
+stats.enemiesDestroyed = Musuh yang Dihancurkan
+stats.built = Jumlah Blok yang Dibangun
+stats.destroyed = Jumlah Blok Dihancurkan Musuh
+stats.deconstructed = Jumlah Blok yang Dihancurkan Pemain
+stats.playtime = Waktu Bermain
+
+globalitems = [accent]Bahan Keseluruhan
+map.delete = Apakah Anda yakin ingin menghapus peta "[accent]{0}[]"?
+level.highscore = Nilai Tertinggi: [accent]{0}
+level.select = Pilih Level
+level.mode = Mode Permainan:
+coreattack = < Inti sedang diserang! >
+nearpoint = [[ [scarlet]TINGGALKAN ZONA PENDARATAN SEGERA[] ]\npenghancuran akan terjadi
+database = Basis Data Inti
+database.button = Basis Data
+savegame = Simpan Permainan
+loadgame = Muat Permainan
+joingame = Gabung Permainan
+customgame = Permainan Kustom
+newgame = Permainan Baru
+none = <kosong>
+none.found = [lightgray]<tidak ditemukan>
+none.inmap = [lightgray]<tidak ada di peta>
+minimap = Peta Kecil
+position = Posisi
+close = Tutup
+website = Situs Web
+quit = Keluar
+save.quit = Simpan & Keluar
+maps = Peta
+maps.browse = Cari Peta
+continue = Lanjutkan
+maps.none = [lightgray]Peta tidak ditemukan!
+invalid = Tidak Valid
+pickcolor = Pilih Warna
+preparingconfig = Menyiapkan Konfigurasi
+preparingcontent = Menyiapkan Konten
+uploadingcontent = Mengunggah Konten
+uploadingpreviewfile = Mengunggah File Tinjauan
+committingchanges = Membuat Perubahan
+done = Selesai
+feature.unsupported = Perangkat Anda tidak mendukung fitur ini.
+
+mods.initfailed = [red]âš [] Proses Memuat Mindustry sebelumnya gagal untuk dimulai. Kemungkinan besar disebabkan oleh mod yang bermasalah.\n\nUntuk menghindari kesalahan berulang, [red]semua mod telah dinonaktifkan.[]
+mods = Mod
+mods.none = [lightgray]Tidak ada mod yang ditemukan!
+mods.guide = Panduan Modifikasi
+mods.report = Laporkan Bug
+mods.openfolder = Buka Folder Mod
+mods.viewcontent = Buka Konten
+mods.reload = Muat Ulang
+mods.reloadexit = Game akan ditutup, untuk memuat ulang mod.
+mod.installed = [[Terpasang]
+mod.display = [gray]Mod:[orange] {0}
+mod.enabled = [lightgray]Aktif
+mod.disabled = [red]Nonaktif
+mod.multiplayer.compatible = [gray]Kompatibel dalam Multipemain
+mod.disable = Nonaktifkan
+mod.version = Versi:
+mod.content = Konten:
+mod.delete.error = Tidak dapat menghapus mod. File mungkin sedang digunakan.
+
+mod.incompatiblegame = [red]Game telah Kedaluwarsa
+mod.incompatiblemod = [red]Tidak Kompatibel
+mod.blacklisted = [red]Tidak Didukung
+mod.unmetdependencies = [red]Dependensi Tidak Terpenuhi
+mod.erroredcontent = [scarlet]Konten Mengalami Kesalahan
+mod.circulardependencies = [red]Dependensi Sirkular
+mod.incompletedependencies = [red]Dependensi Tidak Lengkap
+
+mod.requiresversion.details = Membutuhkan versi game: [accent]{0}[]\nGame Anda telah kadaluarsa. Mod ini membutuhkan versi game yang lebih baru (kemungkinan versi beta/alpha) untuk berfungsi.
+mod.outdatedv7.details = Mod ini tidak kompatibel dengan versi game ini. Pencipta harus memperbaruinya, and add [accent]minGameVersion: 136[] ke dalam file [accent]mod.json[].
+mod.blacklisted.details = Mod ini terdapat di dalam blacklist karena menyebabkan crash atau masalah lain dengan versi game saat ini. Mohon jangan dipakai.
+mod.missingdependencies.details = Mod ini kekurangan dependensi: {0}
+mod.erroredcontent.details = Mod ini menimbulkan masalah pada saat proses memuat. Tanyakan pembuat mod untuk memperbaikinya.
+mod.circulardependencies.details = Mod ini memiliki dependensi yang membutuhkan satu sama lain.
+mod.incompletedependencies.details = Mod ini gagal memuat karena kekurangan dependensi atau tidak valid: {0}.
+
+mod.requiresversion = Membutuhkan versi game: [red]{0}
+
+mod.errors = Terjadi kesalahan saat memuat konten.
+mod.noerrorplay = [scarlet]Anda memiliki mod dengan suatu kesalahan.[] Nonaktifkan mod yang bersangkutan atau perbaiki kesalahan tersebut sebelum bermain.
+mod.nowdisabled = [scarlet]Mod '{0}' tidak memiliki dependensi:[accent] {1}\n[lightgray]Mod ini harus diunduh terlebih dahulu.\nMod ini akan dinonaktifkan secara otomatis.
+mod.enable = Aktifkan
+mod.requiresrestart = Game akan ditutup untuk mengaktifkan perubahan mod.
+mod.reloadrequired = [scarlet]Mulai Ulang Dibutuhkan
+mod.import = Impor Mod
+mod.import.file = Impor File
+mod.import.github = Impor dari GitHub
+mod.jarwarn = [scarlet]Mod dari JAR sebenarnya tidak aman.[]\nPastikan Anda mengimpor mod dari sumber terpercaya!
+mod.item.remove = Konten ini merupakan bagian dari mod[accent] '{0}'[]. Untuk menghilangkannya, hapus mod yang tersebut.
+mod.remove.confirm = Mod ini akan dihapus.
+mod.author = [lightgray]Pencipta:[] {0}
+mod.missing = Simpanan ini berisikan mod yang telah diperbarui atau sudah lama tidak dipasang. Kerusakan simpanan dapat terjadi. Apakah Anda yakin ingin memuatnya?\n[lightgray]Mod:\n{0}
+mod.preview.missing = Sebelum mengunggah mod ini ke workshop, Anda harus memberi gambar pratinjau.\nBeri sebuah gambar bernama[accent] preview.png[] ke dalam folder mod dan coba lagi.
+mod.folder.missing = Hanya mod dengan format folder yang dapat diunggah ke workshop.\nUntuk mengubah mod menjadi folder, ekstrak mod dalam folder dan hapus arsip zip, kemudian mulai ulang game atau mod Anda.
+mod.scripts.disable = Perangkat Anda tidak mendukung mod dengan skrip/JS. Anda harus menonaktifkan mod tersebut untuk dapat bermain.
+
+about.button = Tentang
+name = Nama:
+noname = Masukkan[accent] nama pemain[] dahulu.
+search = Cari:
+planetmap = Peta Planet
+launchcore = Luncurkan Inti
+filename = Nama File:
+unlocked = Konten baru terbuka!
+available = Penelitian baru tersedia!
+unlock.incampaign = < Buka dalam kampanye untuk detail lebih lanjut >
+campaign.select = Pilih untuk Memulai Kampanye
+campaign.none = [lightgray]Pilih planet untuk memulai.\nPilihan ini dapat diubah setiap saat.
+campaign.erekir = Konten baru yang disempurnakan. Kemajuan kampanye lebih linier.\n\nKualitas peta yang tinggi dan pengalaman lebih mantap.
+campaign.serpulo = Konten lawas; pengalaman klasik. Lebih terbuka dan banyak konten.\n\nPeta dan mekanisme kampanye yang berpotensi tidak seimbang. Kurang halus
+campaign.difficulty = Kesulitan
+completed = [accent]Terselesaikan
+techtree = Pohon Teknologi
+techtree.select = Pemilihan Pohon Teknologi
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Muat
+research.discard = Buang
+research.list = [lightgray]Penelitian:
+research = Penelitian
+researched = [lightgray]{0} telah diteliti.
+research.progress = {0}% diteliti
+players = {0} pemain aktif
+players.single = {0} pemain aktif
+players.search = cari
+players.notfound = [gray]tidak ada pemain ditemukan
+server.closing = [accent]Menutup server...
+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 = Klien kedaluwarsa! Perbarui game Anda!
+server.kicked.serverOutdated = Server kedaluwarsa! Tanyakan host 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 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! Menghubungkan dengan dua akun tidak diizinkan.
+server.kicked.customClient = Server ini tidak mendukung build kostum. Unduh versi resmi.
+server.kicked.gameover = Permainan telah berakhir!
+server.kicked.serverRestarting = Server sedang dimulai ulang.
+server.versions = Versi Anda:[accent] {0}[]\nVersi server:[accent] {1}[]
+host.info = Tombol [accent]host[] akan membuat server sementara di port [scarlet]6567[]. \nSemua orang di dalam [lightgray]Wi-Fi atau jaringan lokal[] yang sama dapat melihat server Anda di daftar server mereka.\n\nJika Anda ingin pemain dari mana saja memasuki server Anda dengan IP, [accent]port forwarding[] sangat dibutuhkan.\n\n[lightgray]Catatan: Jika seseorang mengalami masalah memasuki permainan lokal Anda, pastikan Mindustry memiliki akses ke jaringan lokal di pengaturan firewall Anda. Perlu diingat jaringan publik terkadang tidak mengizinkan pencarian server.
+join.info = Di sini, Anda bisa memasukkan [accent]IP server[] untuk dihubungkan, serta mencari [accent]jaringan lokal[] atau server [accent]global[] untuk dihubungkan.\nLAN dan WAN mendukung multipemain.\n\n[lightgray]Jika Anda ingin bergabung dengan seseorang melalui IP, Anda perlu menanyakan host tentang IP mereka, yang dapat dicari dengan meng-google "my ip" melalui perangkat mereka.
+hostserver = Host Permainan Multi Pemain
+invitefriends = Undang Teman
+hostserver.mobile = Host\nPermainan
+host = Host
+hosting = [accent]Membuka server...
+hosts.refresh = Segarkan
+hosts.discovering = Mencari permainan lokal
+hosts.discovering.any = Mencari permainan
+server.refreshing = Memuat ulang server
+hosts.none = [lightgray]Permainan lokal tidak ditemukan!
+host.invalid = [scarlet]Tidak dapat menyambung ke host.
+
+servers.local = Server Lokal
+servers.local.steam = Permainan Publik & Server Lokal
+servers.remote = Server Jarak Jauh
+servers.global = Server Komunitas
+
+servers.disclaimer = Server komunitas [accent]tidak[] dimiliki atau diatur oleh pengembang.\n\nServer dapat berisi konten buatan pemain lain yang mungkin tidak sesuai untuk semua umur.
+servers.showhidden = Tampilkan Server Tersembunyi
+server.shown = Ditampilkan
+server.hidden = Disembunyikan
+
+viewplayer = Melihat Pemain: [accent]{0}
+trace = Lacak Pemain
+trace.playername = Nama pemain: [accent]{0}
+trace.ip = IP: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Bahasa: [accent]{0}
+trace.mobile = Klien Mobile: [accent]{0}
+trace.modclient = Klien Modifikasi: [accent]{0}
+trace.times.joined = Total Bergabung: [accent]{0}
+trace.times.kicked = Total Dikeluarkan: [accent]{0}
+trace.ips = IP:
+trace.names = Nama:
+invalidid = ID klien tidak valid! Kirimkan laporan bug.
+
+player.ban = Ban
+player.kick = Keluarkan
+player.trace = lacak
+player.admin = Beri/Lepas Admin
+player.team = Ganti Tim
+
+server.bans = Pemain Dilarang Masuk
+server.bans.none = Tidak ada pemain yang tidak diizinkan masuk!
+server.admins = Admin
+server.admins.none = Tidak ada admin ditemukan!
+server.add = Tambah Server
+server.delete = Anda yakin ingin menghapus server ini?
+server.edit = Sunting Server
+server.outdated = [scarlet]Server Kedaluwarsa![]
+server.outdated.client = [scarlet]Klien Kedaluwarsa![]
+server.version = [gray]v{0} {1}
+server.custombuild = [accent]Bentuk Modifikasi
+confirmban = Anda yakin ingin melarang pemain ini untuk masuk lagi?
+confirmkick = Anda yakin ingin mengeluarkan pemain ini?
+confirmunban = Anda yakin ingin mengizinkan pemain ini untuk masuk lagi?
+confirmadmin = Anda yakin ingin membuat pemain ini sebagai admin?
+confirmunadmin = Anda yakin ingin menghapus status admin dari pemain ini?
+votekick.reason = Pilih-Alasan dikeluarkan
+votekick.reason.message = Anda yakin ingin memulai pemungutan suara untuk mengeluarkan "{0}[white]"?\nJika ya, masukkan alasan:
+joingame.title = Gabung Permainan
+joingame.ip = Alamat:
+disconnect = Terputus.
+disconnect.error = Sambungan bermasalah.
+disconnect.closed = Sambungan ditutup.
+disconnect.timeout = Waktu koneksi telah habis.
+disconnect.data = Gagal memuat data dunia!
+disconnect.snapshottimeout = Waktu koneksi habis selama menerima snapshot UDP.\nIni mungkin disebabkan oleh jaringan atau koneksi yang tidak stabil.
+cantconnect = Gagal tersambung ke permainan ([accent]{0}[]).
+connecting = [accent]Menghubungkan...
+reconnecting = [accent]Menghubungkan kembali...
+connecting.data = [accent]Memuat data dunia...
+server.port = Port:
+server.invalidport = Nomor port tidak valid!
+server.error.addressinuse = [scarlet]Gagal membuka server di port 6567.[]\n\nPastikan tidak ada server Mindustry lain yang berjalan di perangkat atau jaringan Anda!
+server.error = [scarlet]Terjadi kesalahan saat menghosting server: [accent]{0}
+save.new = Simpanan Baru
+save.overwrite = Anda yakin ingin menimpa \nsimpanan ini?
+save.nocampaign = File simpanan individual dari kampanye tidak dapat diimpor.
+overwrite = Timpa
+save.none = Tidak ada simpanan!
+savefail = Gagal menyimpan permainan!
+save.delete.confirm = Anda yakin ingin menghapus simpanan ini?
+save.delete = Hapus
+save.export = Ekspor Simpanan
+save.import.invalid = [accent]Simpanan ini tidak valid!
+save.import.fail = [crimson]Gagal mengimpor simpanan: [accent]{0}
+save.export.fail = [crimson]Gagal mengekspor simpanan: [accent]{0}
+save.import = Impor Simpanan
+save.newslot = Simpan nama:
+save.rename = Ganti nama
+save.rename.text = Nama baru:
+selectslot = Pilih simpanan.
+slot = [accent]Tempat {0}
+editmessage = Atur Pesan
+save.corrupted = File simpanan rusak atau tidak valid!
+empty = <kosong>
+on = Aktif
+off = Nonaktif
+save.search = Cari permainan tersimpan...
+save.autosave = Simpan otomatis: {0}
+save.map = Peta: {0}
+save.wave = Gelombang {0}
+save.mode = Mode Permainan: {0}
+save.date = Simpanan Terakhir: {0}
+save.playtime = Waktu Bermain: {0}
+warning = Peringatan.
+confirm = Konfirmasi
+delete = Hapus
+view.workshop = Lihat di Workshop
+workshop.listing = Sunting Daftar Workshop
+ok = OK
+open = Buka
+customize = Sunting Peraturan
+cancel = Batal
+command = Perintah
+command.queue = Antrian
+command.mine = Tambang
+command.repair = Perbaiki
+command.rebuild = Bangun Kembali
+command.assist = Bantu Pemain
+command.move = Maju
+command.boost = Pendorongan
+command.enterPayload = Masukkan Muatan Blok
+command.loadUnits = Muat Unit
+command.loadBlocks = Muat Blok
+command.unloadPayload = Turunkan Muatan
+command.loopPayload = Perulangan Transfer Unit
+stance.stop = Batalkan Perintah
+stance.shoot = Posisi Unit: Menembak
+stance.holdfire = Posisi Unit: Gencatan Senjata
+stance.pursuetarget = Posisi Unit: Kejar Target
+stance.patrol = Posisi Unit: Patroli Jalur
+stance.ram = Posisi Unit: Seruduk\n[lightgray]Pergerakan lurus, tanpa pathfinding
+openlink = Buka Tautan
+copylink = Salin Tautan
+back = Kembali
+max = Batas Maximum
+objective = Peta Tujuan
+crash.export = Ekspor Laporan Error
+crash.none = Tidak ada Laporan Error ditemukan.
+crash.exported = Laporan Error diekspor.
+data.export = Ekspor Data
+data.import = Impor Data
+data.openfolder = Buka Folder Data
+data.exported = Data telah diekspor.
+data.invalid = Data permainan ini tidak valid.
+data.import.confirm = Mengimpor data eksternal akan menghapus [scarlet] semua[] data yang tersimpan.\n[accent]Ini tidak dapat dibatalkan![]\n\nSetelah data diimpor, game akan segera keluar.
+quit.confirm = Apakah Anda yakin ingin keluar?
+loading = [accent]Memuat...
+downloading = [accent]Mengunduh...
+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 jeda membangun
+resumebuilding = [scarlet][[{0}][] untuk lanjut membangun
+enablebuilding = [scarlet][[{0}][] untuk mulai membangun
+showui = UI disembunyikan.\nTekan [accent][[{0}][] untuk menampilkan UI.
+commandmode.name = [accent]Mode Perintah
+commandmode.nounits = [unit kosong]
+wave = [accent]Gelombang {0}
+wave.cap = [accent]Gelombang {0}/{1}
+wave.waiting = [lightgray]Gelombang di {0}
+wave.waveInProgress = [lightgray]Gelombang sedang berlangsung
+waiting = [lightgray]Menunggu...
+waiting.players = Menunggu pemain lainnya...
+wave.enemies = [lightgray]{0} Musuh Tersisa
+wave.enemycores = [accent]{0}[lightgray] Inti Musuh
+wave.enemycore = [accent]{0}[lightgray] Inti Musuh
+wave.enemy = [lightgray]{0} Musuh Tersisa
+wave.guardianwarn = Penjaga akan tiba dalam [accent]{0}[] gelombang.
+wave.guardianwarn.one = Penjaga akan tiba dalam [accent]{0}[] gelombang.
+loadimage = Memuat Gambar
+saveimage = Simpan Gambar
+unknown = Tidak diketahui
+custom = Modifikasi
+builtin = Bawaan
+map.delete.confirm = Anda yakin ingin menghapus peta ini? Tindakan ini tidak bisa diubah!
+map.random = [accent]Peta Acak
+map.nospawn = Peta ini tidak memiliki inti agar pemain bisa muncul! Tambahkan inti [#{0}]{1}[] ke dalam peta di penyunting.
+map.nospawn.pvp = Peta ini tidak memiliki inti agar pemain lawan bisa muncul! Tambahkan inti[scarlet] selain jingga[] ke dalam peta di penyunting.
+map.nospawn.attack = Peta ini tidak memiliki inti musuh agar pemain bisa menyerang! Tambahkan inti [#{0}]{1}[] ke dalam peta di penyunting.
+map.invalid = Terjadi kesalahan saat memuat peta: rusak atau file peta tidak valid.
+workshop.update = Perbarui Konten
+workshop.error = Terjadi kesalahan saat mengambil detail workshop: {0}
+map.publish.confirm = Apakah Anda yakin untuk menerbitkan peta ini?\n\n[lightgray]Pastikan Anda setuju dengan Workshop EULA terlebih dahulu, atau peta Anda tidak akan muncul!
+workshop.menu = Pilih apa yang Anda ingin lakukan dengan konten ini.
+workshop.info = Informasi Konten
+changelog = Catatan Pembaruan (opsional):
+updatedesc = Timpa Judul & Deskripsi
+eula = EULA Steam
+missing = Konten ini telah dihapus atau dipindah.\n[lightgray]Daftar Workshop sekarang telah tidak terhubung secara otomatis.
+publishing = [accent]Menerbitkan...
+publish.confirm = Apakah Anda yakin untuk menerbitkan ini?\n\n[lightgray]Pastikan Anda setuju dengan EULA Workshop terlebih dahulu, atau konten Anda tidak akan muncul!
+publish.error = Terjadi kesalahan saat menerbitkan konten: {0}
+steam.error = Gagal untuk menjalankan layanan Steam.\nKesalahan: {0}
+
+editor.planet = Planet:
+editor.sector = Sektor:
+editor.seed = Benih:
+editor.cliffs = Dinding Ke Tebing
+editor.brush = Kuas
+editor.openin = Buka di Penyuntingan
+editor.oregen = Generasi Sumber Daya
+editor.oregen.info = Generasi Sumber Daya:
+editor.mapinfo = Info Peta
+editor.author = Pencipta:
+editor.description = Deskripsi:
+editor.nodescription = Setiap peta harus memiliki deskripsi setidaknya 4 huruf sebelum diunggah.
+editor.waves = Gelombang:
+editor.rules = Peraturan:
+editor.generation = Generasi:
+editor.objectives = Tujuan
+editor.locales = Paket Lokal
+editor.worldprocessors = Prosesor Dunia
+editor.worldprocessors.editname = Sunting Nama
+editor.worldprocessors.none = [lightgray]Tidak ada blok prosesor dunia yang ditemukan!\nTambahkan satu di penyunting peta, atau gunakan \ue813 tombol Tambah di bawah.
+editor.worldprocessors.nospace = Tidak ada ruang kosong untuk menempatkan prosesor dunia!\nApakah Anda mengisi peta dengan bangunan? Mengapa Anda melakukan ini?
+editor.worldprocessors.delete.confirm = Apakah Anda yakin ingin menghapus prosesor dunia ini?\n\nJika dikelilingi tembok maka akan diganti dengan tembok lingkungan.
+editor.ingame = Sunting dalam Permainan
+editor.playtest = Tes Bermain
+editor.publish.workshop = Unggah ke Workshop
+editor.newmap = Peta Baru
+editor.center = Pusat
+editor.search = Cari peta...
+editor.filters = Filter Peta
+editor.filters.mode = Mode Permainan:
+editor.filters.type = Tipe Peta:
+editor.filters.search = Cari Dalam:
+editor.filters.author = Pencipta
+editor.filters.description = Deskripsi
+editor.shiftx = Shift X
+editor.shifty = Shift Y
+workshop = Workshop
+waves.title = Gelombang
+waves.remove = Hapus
+waves.every = setiap
+waves.waves = gelombang
+waves.health = darah: {0}%
+waves.perspawn = per muncul
+waves.shields = perisai/gelombang
+waves.to = sampai
+waves.spawn = Titik Pendaratan:
+waves.spawn.all = <semua>
+waves.spawn.select = Pilih Tempat Pendaratan Musuh
+waves.spawn.none = [scarlet]tidak ada tempat pendaratan musuh di peta
+waves.max = unit maks
+waves.guardian = Penjaga
+waves.preview = Pratinjau
+waves.edit = Sunting...
+waves.random = Acak
+waves.copy = Salin ke Papan Klip
+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.
+waves.sort = Urut Berdasarkan
+waves.sort.reverse = Urut Balik
+waves.sort.begin = Mulai
+waves.sort.health = Darah
+waves.sort.type = Tipe
+waves.search = Cari gelombang...
+waves.filter = Filter Unit
+waves.units.hide = Sembunyikan Semua
+waves.units.show = Perlihatkan Semua
+
+#these are intentionally in lower case
+wavemode.counts = jumlah
+wavemode.totals = total
+wavemode.health = darah
+
+all = Semua
+editor.default = [lightgray]<Standar>
+details = Detail...
+edit = Sunting
+variables = Variabel
+logic.clear.confirm = Apakah Anda yakin ingin menghapus semua kode dari prosesor ini?
+logic.globals = Variabel Bawaan
+
+editor.name = Nama:
+editor.spawn = Munculkan Unit
+editor.removeunit = Hapus Unit
+editor.teams = Tim
+editor.errorload = Terjadi kesalahan saat memuat file.
+editor.errorsave = Terjadi kesalahan saat menyimpan file.
+editor.errorimage = Itu gambar, bukan peta.
+editor.errorlegacy = Peta ini terlalu tua, dan memakai format peta "legacy" yang tidak didukung lagi.
+editor.errornot = Ini bukan file peta.
+editor.errorheader = File peta ini Kemungkinan tidak valid atau rusak.
+editor.errorname = Peta tidak ada nama. Apakah Anda mencoba untuk memuat file simpanan?
+editor.errorlocales = Terjadi kesalahan saat membaca paket lokal yang tidak valid.
+editor.update = Perbarui
+editor.randomize = Acak
+editor.moveup = Pindah Ke Atas
+editor.movedown = Pindah Ke Bawah
+editor.copy = Salin
+editor.apply = Terapkan
+editor.generate = Generasi
+editor.sectorgenerate = Generasi Sektor
+editor.resize = Ubah Ukuran
+editor.loadmap = Memuat Peta
+editor.savemap = Simpan Peta
+editor.savechanges = [scarlet]Anda memiliki perubahan yang belum disimpan!\n\n[]Apakah Anda ingin menyimpannya?
+editor.saved = Tersimpan!
+editor.save.noname = Peta Anda tidak ada nama! Tambahkan di menu 'info peta'.
+editor.save.overwrite = Peta ini menimpa peta bawaan! Pilih nama yang berbeda di menu 'info peta'.
+editor.import.exists = [scarlet]Tidak bisa mengimpor:[] peta bawaan bernama '{0}' sudah ada!
+editor.import = Mengimpor...
+editor.importmap = Impor Peta
+editor.importmap.description = Mengimpor peta yang telah ada
+editor.importfile = Impor File
+editor.importfile.description = Mengimpor file peta eksternal
+editor.importimage = Impor File Gambar
+editor.importimage.description = Mengimpor file peta eksternal berbentuk gambar
+editor.export = Ekspor...
+editor.exportfile = Ekspor File
+editor.exportfile.description = Mengekspor sebuah file peta
+editor.exportimage = Ekspor Gambar Medan
+editor.exportimage.description = Ekspor sebuah file gambar peta
+editor.loadimage = Impor Medan
+editor.saveimage = Ekspor Medan
+editor.unsaved = Yakin ingin keluar?\n[scarlet]Perubahan yang belum disimpan akan hilang.
+editor.resizemap = Ubah Ukuran Peta
+editor.mapname = Nama Peta:
+editor.overwrite = [accent]Peringatan!\nIni akan menimpa peta yang telah ada.
+editor.overwrite.confirm = [scarlet]Peringatan![] Peta dengan nama ini sudah ada. Yakin ingin menimpanya?\n"[accent]{0}[]"
+editor.exists = Sebuah peta dengan nama ini sudah ada.
+editor.selectmap = Pilih peta untuk dimuat:
+
+toolmode.replace = Ganti
+toolmode.replace.description = Menggambar pada blok padat.
+toolmode.replaceall = Ganti Semua
+toolmode.replaceall.description = Ganti semua blok di peta.
+toolmode.orthogonal = Ortogonal
+toolmode.orthogonal.description = Menggambar dalam garis ortogonal.
+toolmode.square = Persegi
+toolmode.square.description = Bangun persegi.
+toolmode.eraseores = Hapus Bijih
+toolmode.eraseores.description = Menghapus bijih.
+toolmode.fillteams = Isi Tim
+toolmode.fillteams.description = Mengisi tim bukannya blok.
+toolmode.fillerase = Hapus
+toolmode.fillerase.description = Hapus blok dengan tipe yang sama.
+toolmode.drawteams = Gambar Tim
+toolmode.drawteams.description = Menggambar tim bukannya blok.
+#unused
+toolmode.underliquid = Di Bawah Cairan
+toolmode.underliquid.description = Gambarlah lantai di bawah ubin cair.
+
+filters.empty = [lightgray]Tidak ada penyaring! Tambahkan dengan tombol di bawah.
+
+filter.distort = Kerusakkan
+filter.noise = Kebisingan
+filter.enemyspawn = Pilih Titik Pendaratan Musuh
+filter.spawnpath = Jalur ke Titik Pendaratan Musuh
+filter.corespawn = Pilih Inti
+filter.median = Median
+filter.oremedian = Median Bijih
+filter.blend = Campur
+filter.defaultores = Sumber Daya Bawaan
+filter.ore = Sumber Daya
+filter.rivernoise = Kebisingan Sungai
+filter.mirror = Cermin
+filter.clear = Bersih
+filter.option.ignore = Biarkan
+filter.scatter = Penebaran
+filter.terrain = Lahan
+filter.logic = Logika
+
+filter.option.scale = Ukuran
+filter.option.chance = Kemungkinan
+filter.option.mag = Tingkat
+filter.option.threshold = Ambang
+filter.option.circle-scale = Ukuran Lingkaran
+filter.option.octaves = Oktaf
+filter.option.falloff = Kemerosotan
+filter.option.angle = Sudut
+filter.option.tilt = Miring
+filter.option.rotate = Putar
+filter.option.amount = Jumlah
+filter.option.block = Blok
+filter.option.floor = Lantai
+filter.option.flooronto = Target Lantai
+filter.option.target = Target
+filter.option.replacement = Pengganti
+filter.option.wall = Dinding
+filter.option.ore = Sumber Daya
+filter.option.floor2 = Lantai Sekunder
+filter.option.threshold2 = Ambang Sekunder
+filter.option.radius = Radius
+filter.option.percentile = Perseratus
+filter.option.code = Kode
+filter.option.loop = Perulangan
+
+locales.info = Di sini, Anda dapat menambahkan paket lokal untuk bahasa tertentu ke peta Anda. Dalam paket lokal, setiap properti memiliki nama dan nilai. Properti ini dapat digunakan prosesor dunia dan tujuan dengan menggunakan namanya. Mereka mendukung pemformatan teks (mengganti placeholder dengan nilai sebenarnya).\n\n[cyan]Contoh properti:\n[]nama: [accent]waktu[]\nnilai: [accent]Contoh pengatur waktu, waktu tersisa: {0}[]\n\n[cyan]Penggunaan:\n[]Tetapkan sebagai teks tujuan: [accent]@timer\n\n[]Cetak dalam prosesor dunia:\n[accent]cetak lokal "timer"\nformat time\n[gray](di mana waktu adalah variabel yang dihitung secara terpisah)
+locales.deletelocale = Apakah Anda yakin ingin menghapus paket lokal ini?
+locales.applytoall = Terapkan Perubahan Ke Semua Paket Lokal
+locales.addtoother = Tambahkan Ke Paket Lokal Lain
+locales.rollback = Kembalikan ke yang terakhir diterapkan
+locales.filter = Filter properti
+locales.searchname = Cari nama...
+locales.searchvalue = Cari nilai...
+locales.searchlocale = Cari lokal...
+locales.byname = Dengan nama
+locales.byvalue = Dengan nilai
+locales.showcorrect = Tampilkan properti yang ada di semua paket lokal dan memiliki nilai unik di mana pun
+locales.showmissing = Tampilkan properti yang tidak ada di beberapa paket lokal
+locales.showsame = Tampilkan properti yang memiliki nilai yang sama di lokasi berbeda
+locales.viewproperty = Lihat di semua paket lokal
+locales.viewing = Melihat properti "{0}"
+locales.addicon = Tambahkan Ikon
+
+width = Lebar:
+height = Tinggi:
+menu = Menu
+play = Bermain
+campaign = Kampanye
+load = Memuat
+save = Simpan
+fps = FPS: {0}
+ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
+language.restart = Silahkan memulai ulang game agar pengaturan bahasa diterapkan
+settings = Pengaturan
+tutorial = Tutorial
+tutorial.retake = Ulangi Tutorial
+editor = Penyunting
+mapeditor = Penyunting Peta
+
+abandon = Tinggalkan
+abandon.text = Zona ini dan semua sumber daya di dalamnya akan berada di tangan musuh.
+locked = Terkunci
+complete = [lightgray]Selesaikan:
+requirement.wave = Raih gelombang {0} dalam {1}
+requirement.core = Hancurkan inti musuh dalam {0}
+requirement.research = Riset {0}
+requirement.produce = Produksi {0}
+requirement.capture = Kuasai {0}
+requirement.onplanet = Kendalikan Sektor Di {0}
+requirement.onsector = Mendarat Di Sektor: {0}
+launch.text = Luncurkan
+map.multiplayer = Hanya host yang dapat melihat sektor.
+uncover = Buka
+configure = Konfigurasi Muatan
+
+objective.research.name = Riset
+objective.produce.name = Peroleh
+objective.item.name = Peroleh Suatu Bahan
+objective.coreitem.name = Bahan Inti
+objective.buildcount.name = Jumlah Bangunan
+objective.unitcount.name = Jumlah Unit
+objective.destroyunits.name = Hancurkan Unit
+objective.timer.name = Waktu
+objective.destroyblock.name = Hancurkan Blok
+objective.destroyblocks.name = Hancurkan Blok
+objective.destroycore.name = Hancurkan Inti
+objective.commandmode.name = Mode Perintah
+objective.flag.name = Bendera
+
+marker.shapetext.name = Teks Berbentuk
+marker.point.name = Titik
+marker.shape.name = Bentuk
+marker.text.name = Teks
+marker.line.name = Garis
+marker.quad.name = Segi empat
+marker.texture.name = Tekstur
+
+marker.background = Latar Belakang
+marker.outline = Garis Luar
+
+objective.research = [accent]Riset:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Peroleh:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Hancurkan:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Hancurkan: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Peroleh: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Pindahkan ke Inti:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Bangun: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Buat Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Hancurkan: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Musuh akan datang dalam [lightgray]{0}[]
+objective.enemyescelating = [accent]Produksi musuh meningkat dalam  [lightgray]{0}[]
+objective.enemyairunits = [accent]Produksi pasukan udara musuh dimulai dalam [lightgray]{0}[]
+objective.destroycore = [accent]Hancurkan Inti Musuh
+objective.command = [accent]Perintahkan Unit
+objective.nuclearlaunch = [accent]âš  Terdeteksi peluncuran nuklir: [lightgray]{0}
+
+announce.nuclearstrike = [red]âš  SERANGAN NUKLIR âš \n[lightgray]bangun inti cadangan sesegera mungkin
+
+loadout = Muatan
+resources = Sumber Daya
+resources.max = Maks
+bannedblocks = Blok yang Dilarang
+unbannedblocks = Unbanned Blocks
+objectives = Tujuan
+bannedunits = Unit yang Dilarang
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Unit yang Dilarang Sebagai Whitelist
+bannedblocks.whitelist = Blok yang Dilarang Sebagai Whitelist
+addall = Tambah Semua
+launch.from = Meluncurkan Dari: [accent]{0}
+launch.capacity = Kapasitas Barang yang Diluncurkan: [accent]{0}
+launch.destination = Destinasi: {0}
+landing.sources = Sumber Sektor: [accent]{0}[]
+landing.import = Total Impor Maksimum: {0}[accent]{1}[lightgray]/mnt
+configure.invalid = Jumlah harus berupa angka di antara 0 dan {0}.
+add = Tambahkan...
+guardian = Penjaga
+
+connectfail = [scarlet]Gagal menyambung ke server:\n\n[accent]{0}
+error.unreachable = Server tidak dapat dihubungi.\nApakah alamatnya benar?
+error.invalidaddress = Alamat tidak valid.
+error.timedout = Kehabisan waktu!\nPastikan pemilik mempunyai port penerusan, dan alamatnya benar!
+error.mismatch = Paket bermasalah:\nkemungkinan versi client/server berbeda.\nPastikan Anda dan host mempunyai versi terbaru Mindustry!
+error.alreadyconnected = Sudah tersambung.
+error.mapnotfound = File peta tidak ditemaukan!
+error.io = Terjadi kesalahan jaringan I/O.
+error.any = Terjadi kesalahan Jaringan tidak diketahui.
+error.bloom = Gagal untuk menjalankan efek bloom.\nPerangkat Anda mungkin tidak mendukung fitur ini.
+error.moddex = Mindustry tidak dapat memuat mod ini.\nPerangkat Anda memblokir impor mod Java karena perubahan terbaru dari Android akhir akhir ini.\nIni tidak akan diperbaiki. Tidak ada solusi yang diketahui untuk masalah ini.
+
+weather.rain.name = Hujan
+weather.snowing.name = Salju
+weather.sandstorm.name = Badai Pasir
+weather.sporestorm.name = Badai Spora
+weather.fog.name = Kabut
+
+campaign.playtime = \uf129 [lightgray]Waktu bermain di sektor: {0}
+campaign.complete = [accent]Selamat.\n\nMusuh di {0} telah dikalahkan.\n[lightgray]Sektor terakhir telah dikuasai.
+
+sectorlist = Sektor
+sectorlist.attacked = {0} sedang diserang
+sectors.unexplored = [lightgray]Belum Ditelusuri
+sectors.resources = Sumber Daya:
+sectors.production = Produksi:
+sectors.export = Ekspor:
+sectors.import = Impor:
+sectors.time = Waktu:
+sectors.threat = Tingkat:
+sectors.wave = Gelombang:
+sectors.stored = Terisi:
+sectors.resume = Lanjutkan
+sectors.launch = Luncurkan
+sectors.select = Pilih
+sectors.launchselect = Pilih Destinasi Peluncuran
+sectors.nonelaunch = [lightgray]tidak ada (matahari)
+sectors.redirect = Arahkan Ulang Alas Peluncur
+sectors.rename = Ganti Nama Sektor
+sectors.enemybase = [scarlet]Markas Musuh
+sectors.vulnerable = [scarlet]Rawan diserang
+sectors.underattack = [scarlet]Dalam Serangan! [accent]Kerusakan sebesar {0}%
+sectors.underattack.nodamage = [scarlet]Belum Dikuasai
+sectors.survives = [accent]Bertahan sebanyak {0} gelombang
+sectors.go = Mulai
+sector.abandon = Tinggalkan
+sector.abandon.confirm = Inti di sektor ini akan meledak secara sendirinya.\nLanjutkan?
+sector.curcapture = Sektor Dikuasai
+sector.curlost = Sektor Gagal Bertahan
+sector.missingresources = [scarlet]Sumber Daya Inti Tidak Cukup
+sector.attacked = Sektor [accent]{0}[white] sedang diserang!
+sector.lost = Sektor [accent]{0}[white] telah dihancurkan!
+sector.capture = Sector [accent]{0}[white]Dikuasai!
+sector.capture.current = Sektor Dikuasai!
+sector.changeicon = Ubah Ikon
+sector.noswitch.title = Tidak Dapat berpindah Sektor
+sector.noswitch = Anda tidak boleh berpindah sektor jika salah satu sektor sedang di serang.\nSektor: [accent]{0}[] di [accent]{1}[]
+sector.view = Lihat Sektor
+
+threat.low = Rendah
+threat.medium = Sedang
+threat.high = Tinggi
+threat.extreme = Berbahaya
+threat.eradication = Pemusnahan
+
+difficulty.casual = Kasual
+difficulty.easy = Mudah
+difficulty.normal = Normal
+difficulty.hard = Susah
+difficulty.eradication = Pemusnahan
+
+planets = Planet
+
+planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
+planet.sun.name = Matahari
+
+sector.impact0078.name = Benturan 0078
+sector.groundZero.name = Titik Awal
+sector.craters.name = Kawah
+sector.frozenForest.name = Hutan Beku
+sector.ruinousShores.name = Pantai Yang Hancur
+sector.stainedMountains.name = Gunung Bernoda
+sector.desolateRift.name = Retakan Terpencil
+sector.nuclearComplex.name = Kompleks Produksi Nuklir
+sector.overgrowth.name = Pertumbuhan
+sector.tarFields.name = Lahan Perminyakan Mentah
+sector.saltFlats.name = Dataran Garam
+sector.fungalPass.name = Lintasan Spora
+sector.biomassFacility.name = Pabrik Sintesis Biomassa
+sector.windsweptIslands.name = Pulau Bersemilir
+sector.extractionOutpost.name = Pos Ekstraksi
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Pusat Peluncuran Planet
+sector.coastline.name = Tepi Pantai
+sector.navalFortress.name = Benteng Laut
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
+
+sector.groundZero.description = Lokasi yang optimal untuk bermain satu kali lagi. Sangat sedikit musuh. Sedikit sumber daya.\nKumpulkan timah dan tembaga sebanyak yang Anda bisa.\nMulai dari sini.
+sector.frozenForest.description = Di sini, dekat dengan gunung, spora sudah menyebar. Suhu dingin tidak dapat menahannya.\n\nMulailah hasilkan listrik. Bangun generator pembakar. Pelajari cara menggunakan mender.
+sector.saltFlats.description = Di pinggiran padang pasir terdapat Daratan Garam. Beberapa sumber daya dapat ditemukan di sini.\n\nMusuh telah mendirikan penyimpanan sumber daya kompleks di sini. Hancurkan inti mereka. Jangan biarkan satupun tersisa.
+sector.craters.description = Air banyak terkumpul di kawah ini, sebuah peninggalan dari perang masa lalu. Klaim area ini lagi. Kumpulkan pasir. Lebur metaglass. Pompa air untuk mendinginkan turret dan bor.
+sector.ruinousShores.description = Keluar dari lembah gunung, terdapat garis pantai. Sebelumnya, area ini adalah garis pertahanan pantai. Sekarang tidak banyak yang tersisa. Hanya pertahanan dasar yang tersisa, yang lain telah hancur berkeping keping.\nBangun kembali pertahanan di sini. Pelajari lebih banyak teknologi.
+sector.stainedMountains.description = Area ini terletak di dekat pegunungan, namun belum tersentuh oleh spora.\nTambang titanium yang ada di area ini. Pelajari fungsinya.\n\nMusuh jauh lebih kuat di sini. Jangan biarkan mereka meluncurkan unit yang lebih kuat.
+sector.overgrowth.description = Area ini banyak ditumbuhi spora, karena dekat dengan sumber spora.\nMusuh telah membangun pangkalan di sini. Buat unit Mace. Hancurkan mereka. Klaim apapun yang tersisa.
+sector.tarFields.description = Terletak di pinggiran zona produksi minyak, di antara gunung dan padang pasir. Salah satu dari beberapa area yang memiliki cadangan minyak yang dapat digunakan.\nMeskipun ditinggalkan, area ini terdapat pasukan musuh yang berbahaya di sekitarnya. Jangan meremehkan mereka.\n\n[lightgray]Pelajari proses penyulingan minyak bila memungkinkan.
+sector.desolateRift.description = Zona yang sangat berbahaya. Banyak sumber daya, tetapi terdapat sedikit ruang. Sangat resiko kehancuran sangat tinggi. Buatlah pertahanan udara dan darat secepat yang Anda bisa. Jangan terlena dengan waktu antar gelombang yang lama.
+sector.nuclearComplex.description = Sebuah fasilitas untuk memproduksi dan memproses torium, yang telah hancur.\n[lightgray]Pelajari torium dan cara penggunaanya.\n\nMusuh yang hadir di sini menyerang dalam jumlah besar, tak henti mengintai penyerang.
+sector.fungalPass.description = Area ini terdapat di antara pegunungan yang lebih tinggi dengan yang lebih rendah, juga daerah yang dipenuhi spora. Musuh membangun markas pengintaian kecil di sini.\nHancurkan itu.\nGunakan unit Dagger dan Crawler. Hancurkan dua inti mereka.
+sector.biomassFacility.description = Asal dari semua spora di planet ini. Tempat ini adalah fasilitas dimana spora dipelajari dan diproduksi.\nPelajari teknologi yang terkait dengannya. Budi dayakan spora untuk memproduksi bahan bakar dan plastik.\n\n[lightgray]Setelah fasilitas ini hancur, spora menyebar. Tidak ada di ekosistem lokal yang dapat bersaing dengan organisme invasif seperti itu.
+sector.windsweptIslands.description = Jauh dari pantai terdapat sekumpulan pulau. Catatan yang ada mengatakan bahwa mereka memiliki struktur untuk memproduksi [accent]Plastanium[].\n\nKalahkan unit laut musuh. Bangun markas di kepulauan ini. Pelajari pabriknya.
+sector.extractionOutpost.description = Sebuah pos jarak jauh, dibangun musuh untuk meluncurkan sumber daya ke sektor yang lain.\n\nTeknologi transportasi antar sektor dapat memudahkan untuk menaklukan lebih banyak sektor. Hancurkan markasnya. Pelajari Alas Peluncur mereka.
+sector.impact0078.description = Di sini terletak sisa-sisa pesawat antarbintang yang pertama kali memasuki sistem ini.\n\nSelamatkan apapun yang ada dari sisa-sisa pesawat. Pelajari teknologi apa pun yang utuh.
+sector.planetaryTerminal.description = Target terakhir.\n\nMarkas pesisir pantai ini memiliki struktur yang dapat meluncurkan inti ke planet di sekitarnya. Memiliki pertahanan yang sangat bagus.\n\nProduksi unit laut. Hancurkan musuh secepat mungkin. Pelajari struktur peluncuran mereka.
+sector.coastline.description = Sisa-sisa teknologi Unit Laut telah terdeteksi di lokasi ini. Tolak serangan musuh, rebut sektor ini, dan dapatkan teknologinya.
+sector.navalFortress.description = Musuh telah mendirikan markas di sebuah pulau terpencil, dibentengi secara alami. Hancurkan pangkalan ini. Dapatkan teknologi Unit Laut mereka yang canggih, dan telitilah
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+
+#do not translate
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = Serangan Awal
+sector.aegis.name = Aegis
+sector.lake.name = Danau
+sector.intersect.name = Perempatan
+sector.atlas.name = Atlas
+sector.split.name = Pisahan
+sector.basin.name = Cekungan
+sector.marsh.name = Rawa
+sector.peaks.name = Puncak
+sector.ravine.name = Jurang
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Benteng
+sector.crevice.name = Retakan
+sector.siege.name = Pengepungan
+sector.crossroads.name = Simpangan
+sector.karst.name = Kars
+sector.origin.name = Origin
+
+sector.onset.description = Permulaan Penaklukan Erekir. Kumpulkan sumber daya, produksi unit, dan mulailah meneliti teknologi.
+sector.aegis.description = Sektor ini mengandung deposit tungsten.\nRiset [accent]Bor Tumbukan[] untuk menambang sumber daya ini, dan hancurkan markas musuh di area tersebut.
+sector.lake.description = Danau lava di sektor ini sangat membatasi pilihan unit yang kita gunakan. Unit Kapal adalah satu-satunya pilihan.\nRiset [accent]pabrikator kapal[] dan produksi unit [accent]elude[] secepat mungkin.
+sector.intersect.description = Pemindai menunjukkan bahwa sektor ini akan diserang dari berbagai arah setelah kita mendarat.\nSegera siapkan pertahanan dan perluas wilayah secepat mungkin.\nUnit [accent]Mech[] akan dibutuhkan untuk dataran yang sulit dilalui.
+sector.atlas.description = Sektor ini memiliki dataran yang unik dan akan membutuhkan beraneka ragam unit untuk menyerang secara efektif.\nUnit yang ditingkatkan mungkin dibutuhkan untuk melewati beberapa markas musuh yang kuat di sekitar sini.\nRiset [accent]Elektroliser[] dan [accent]Pabrikator Ulang Tank[].
+sector.split.description = Keberadaan musuh yang minim di sektor ini sangat bagus untuk menguji coba teknologi transportasi baru.
+sector.basin.description = Kehadiran musuh dalam jumlah besar terdeteksi di sektor ini.\nBangun unit dengan cepat dan kuasai inti musuh untuk mendapatkan pijakan
+sector.marsh.description = Sektor ini memiliki kelimpahan arkisit, namun memiliki ventilasi yang terbatas.\nBangun [accent]Ruang Pembakaran Kimia[] untuk menghasilkan tenaga.
+sector.peaks.description = Medan pegunungan di sektor ini membuat sebagian besar unit tidak berguna. Unit terbang akan dibutuhkan.\nWaspadai instalasi anti-udara yang dimiliki musuh. Beberapa instalasi ini mungkin dapat dinonaktifkan dengan menargetkan bangunan pendukungnya.
+sector.ravine.description = Jalur transportasi penting bagi musuh. Tidak ada inti musuh yang ditemukan di sini, namun hati-hati terhadap berbagai jenis musuh.\nProduksi [accent]paduan logam[]. Bangun menara [accent]Afflict[].
+sector.caldera-erekir.description = Sumber daya yang terdeteksi di sektor ini tersebar di beberapa pulau.\nRiset dan sebarkan transportasi berbasis drone.
+sector.stronghold.description = Markas musuh yang besar di sektor ini menjaga simpanan [accent]torium[] dalam jumlah besar .\nGunakan itu untuk mengembangkan unit dan menara ke tingkat yang lebih tinggi.
+sector.crevice.description = Musuh akan mengirimkan pasukan serangan yang hebat untuk menghancurkan markasmu di sektor ini.\nKembangkan [accent]karbit[] dan [accent]Generator Pirolisis[] mungkin imperatif untuk bertahan hidup.
+sector.siege.description = Sektor ini memiliki dua ngarai paralel yang akan memaksa serangan dari dua arah.\nRiset [accent]sianogen[] untuk mendapatkan kemampuan untuk membuat unit tank yang lebih kuat.\nPeringatan: Rudal jarak jauh milik musuh telah terdeteksi. Rudal tersebut mungkin ditembak jatuh sebelum terjadi benturan.
+sector.crossroads.description = Pangkalan musuh di sektor ini telah didirikan di berbagai medan. Riset unit yang berbeda untuk beradaptasi.\nSelain itu, beberapa markas telah dilindungi oleh perisai. Cari tahu bagaimana mereka diberi daya.
+sector.karst.description = Sektor ini kaya akan sumber daya, namun akan diserang oleh musuh begitu inti baru mendarat.\nManfaatkan sumber daya dan riset [accent]phase fabric[].
+sector.origin.description = Sektor terakhir dengan kehadiran musuh yang signifikan.\nTidak ada peluang penelitian yang tersisa - fokuslah pada menghancurkan semua inti musuh.
+
+status.burning.name = Terbakar
+status.freezing.name = Membeku
+status.wet.name = Basah
+status.muddy.name = Berlumpur
+status.melting.name = Meleleh
+status.sapped.name = Melemah
+status.electrified.name = Terkena Listrik
+status.spore-slowed.name = Spora Melambat
+status.tarred.name = Berminyak
+status.overdrive.name = Dipercepat
+status.overclock.name = Melebihi Batas
+status.shocked.name = Tersengat
+status.blasted.name = Meledak
+status.unmoving.name = Terdiam
+status.boss.name = Penjaga
+
+settings.language = Bahasa
+settings.data = Data Game
+settings.reset = Atur Ulang ke Bawaan
+settings.rebind = Ganti tombol
+settings.resetKey = Atur ulang
+settings.controls = Kontrol
+settings.game = Permainan
+settings.sound = Suara
+settings.graphics = Grafik
+settings.cleardata = Menghapus Data Permainan...
+settings.clear.confirm = Anda yakin ingin menghapus data ini?\nApa yang sudah dilakukan tidak dapat dibatalkan!
+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 = Anda yakin ingin menghapus semua simpanan?
+settings.clearsaves = Bersihkan Simpanan
+settings.clearresearch = Bersihkan Penelitian
+settings.clearresearch.confirm = Apakah Anda yakin ingin membersihkan semua penelitian kampanye?
+settings.clearcampaignsaves = Bersihkan Simpanan Kampanye
+settings.clearcampaignsaves.confirm = Apakah Anda yakin ingin membersihkan semua simpanan kampanye?
+paused = [accent]< Jeda >
+clear = Bersih
+banned = [scarlet]Dilarang
+unsupported.environment = [scarlet]Ruang Lingkup Tidak Cocok
+yes = Ya
+no = Tidak
+info.title = Info
+error.title = [scarlet]Sebuah kesalahan telah terjadi
+error.crashtitle = Sebuah kesalahan telah terjadi
+unit.nobuild = [scarlet]Unit tidak dapat membangun
+lastaccessed = [lightgray]Terakhir Diakses: {0}
+lastcommanded = [lightgray]Terakhir Diperintah: {0}
+block.unknown = [lightgray]???
+
+stat.showinmap = <muat peta untuk melihat>
+stat.description = Kegunaan
+stat.input = Pemasukan
+stat.output = Pengeluaran
+stat.maxefficiency = Batas Efisiensi
+stat.booster = Pendorong
+stat.tiles = Ubin yang Diperlukan
+stat.affinities = Kecocokan
+stat.opposites = Bertentangan
+stat.powercapacity = Kapasitas Tenaga
+stat.powershot = Tenaga/Tembakan
+stat.damage = Damage
+stat.targetsair = Target Udara
+stat.targetsground = Target Darat
+stat.itemsmoved = Kecepatan Barang
+stat.launchtime = Waktu Antara Peluncuran
+stat.shootrange = Jarak
+stat.size = Ukuran
+stat.displaysize = Ukuran Tampilan
+stat.liquidcapacity = Kapasitas Zat Cair
+stat.powerrange = Jarak Tenaga
+stat.linkrange = Jarak Tautan
+stat.instructions = Instruksi
+stat.powerconnections = Batas Sambungan
+stat.poweruse = Penggunaan Tenaga
+stat.powerdamage = Tenaga/Tembakan
+stat.itemcapacity = Kapasitas Item
+stat.memorycapacity = Kapasitas Memori
+stat.basepowergeneration = Dasar Generasi Tenaga
+stat.productiontime = Waktu Produksi
+stat.repairtime = Waktu Perbaikan Blok Penuh
+stat.repairspeed = Kecepatan Perbaikan
+stat.weapons = Senjata
+stat.bullet = Peluru
+stat.moduletier = Tingkatan Modul
+stat.unittype = Jenis Unit
+stat.speedincrease = Peningkatan Kecepatan
+stat.range = Jarak
+stat.drilltier = Sumber Daya yang Ditambang
+stat.drillspeed = Kecepatan Bor Dasar
+stat.boosteffect = Efek Pendorong
+stat.maxunits = Batas Unit Aktif
+stat.health = Darah
+stat.armor = Pelindung
+stat.buildtime = Waktu Pembuatan
+stat.maxconsecutive = Batas Konsekutif
+stat.buildcost = Biaya Bangunan
+stat.inaccuracy = Melenceng
+stat.shots = Tembakan
+stat.reload = Kecepatan Penembakan
+stat.ammo = Amunisi
+stat.shieldhealth = Darah Perisai
+stat.cooldowntime = Waktu Pendinginan
+stat.explosiveness = Daya Ledak
+stat.basedeflectchance = Peluang Defleksi Dasar
+stat.lightningchance = Peluang Menghasilkan Petir
+stat.lightningdamage = Damage Petir
+stat.flammability = Daya Bakar
+stat.radioactivity = Daya Radioaktif
+stat.charge = Setruman
+stat.heatcapacity = Kapasitas Panas
+stat.viscosity = Kelekatan
+stat.temperature = Suhu
+stat.speed = Kecepatan
+stat.buildspeed = Kecepatan Membangun
+stat.minespeed = Kecepatan Menambang
+stat.minetier = Tingkat Tambang
+stat.payloadcapacity = Kapasitas Muatan
+stat.abilities = Kemampuan
+stat.canboost = Memiliki Pendorong
+stat.flying = Terbang
+stat.ammouse = Penggunaan Amunisi
+stat.ammocapacity = Kapasitas Amunisi
+stat.damagemultiplier = Penggandaan Kekuatan (dmg)
+stat.healthmultiplier = Penggandaan Darah
+stat.speedmultiplier = Penggandaan Kecepatan
+stat.reloadmultiplier = Penggandaan Isi Ulang
+stat.buildspeedmultiplier = Penggandaan Kecepatan Membangun
+stat.reactive = Reaksi
+stat.immunities = Kekebalan
+stat.healing = Menyembuhkan
+stat.efficiency = [stat]{0}% Efficiency
+
+ability.forcefield = Bidang Kekuatan
+ability.forcefield.description = Memproyeksikan perisai kekuatan yang menyerap peluru
+ability.repairfield = Bidang Perbaikan
+ability.repairfield.description = Memperbaiki unit terdekat
+ability.statusfield = Bidang Status
+ability.statusfield.description = Menerapkan efek status ke unit terdekat
+ability.unitspawn = Pabrik
+ability.unitspawn.description = Membangun unit
+ability.shieldregenfield = Bidang Regenerasi Perisai
+ability.shieldregenfield.description = Meregenerasi perisai unit di sekitar
+ability.movelightning = Pergerakan Petir
+ability.movelightning.description = Melepaskan petir sambil bergerak
+ability.armorplate = Pelindung Baja
+ability.armorplate.description = Mengurangi kerusakan yang diterima saat menembak
+ability.shieldarc = Perisai Busur
+ability.shieldarc.description = Memproyeksikan perisai kekuatan dalam busur yang menyerap peluru
+ability.suppressionfield = Bidang Penahan Regen
+ability.suppressionfield.description = Menghentikan bangunan perbaikan di dekatnya
+ability.energyfield = Bidang Energi
+ability.energyfield.description = Menyengat musuh di sekitar
+ability.energyfield.healdescription = Menyengat musuh di sekitar dan menyembuhkan sekutu
+ability.regen = Regenerasi Diri Sendiri
+ability.regen.description = Meregenerasi darah sendiri secara terus menerus
+ability.liquidregen = Penyerapan Cairan
+ability.liquidregen.description = Menyerap cairan untuk menyembuhkan dirinya sendiri
+ability.spawndeath = Kematian-Munculkan
+ability.spawndeath.description = Melepaskan unit saat mati
+ability.liquidexplode = Kematian-Tumpahkan
+ability.liquidexplode.description = Menumpahkan cairan saat mati
+
+ability.stat.firingrate = [stat]{0}/sec[lightgray] laju penembakan
+ability.stat.regen = [stat]{0}[lightgray] darah/detik
+ability.stat.pulseregen = [stat]{0}[lightgray] darah/denyut
+ability.stat.shield = [stat]{0}[lightgray] perisai
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] kecepatan perbaikan
+ability.stat.slurpheal = [stat]{0}[lightgray] darah/unit cair
+ability.stat.cooldown = [stat]{0} sec[lightgray] waktu jeda
+ability.stat.maxtargets = [stat]{0}[lightgray] target maksimal
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] jumlah jenis perbaikan yang sama
+ability.stat.damagereduction = [stat]{0}%[lightgray] pengurangan kerusakan
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] kecepatan minimal
+ability.stat.duration = [stat]{0} sec[lightgray] durasi
+ability.stat.buildtime = [stat]{0} sec[lightgray] waktu membangun
+
+bar.onlycoredeposit = Hanya Penyetoran Inti yang Diizinkan
+bar.drilltierreq = Membutuhkan Bor yang Lebih Baik
+bar.nobatterypower = Daya Baterai Tidak Mencukupi
+bar.noresources = Sumber Daya Tidak Cukup
+bar.corereq = Membutuhkan Inti Markas
+bar.corefloor = Ubin Zona Inti Dibutuhkan
+bar.cargounitcap = Kapasitas Unit Kargo Telah Mencapai Batas
+bar.drillspeed = Kecepatan Bor: {0}/s
+bar.pumpspeed = Kecepatan Pompa: {0}/s
+bar.efficiency = Efisiensi: {0}%
+bar.boost = Pendorongan: +{0}%
+bar.powerbuffer = Tenaga Baterai: {0}/{1}
+bar.powerbalance = Tenaga: {0}/s
+bar.powerstored = Disimpan: {0}/{1}
+bar.poweramount = Tenaga: {0}
+bar.poweroutput = Pengeluaran Tenaga: {0}
+bar.powerlines = Sambungan: {0}/{1}
+bar.items = Item: {0}
+bar.capacity = Kapasitas: {0}
+bar.unitcap = {0} {1}/{2}
+bar.liquid = Zat Cair
+bar.heat = Panas
+bar.cooldown = Pendinginan
+bar.instability = Instabilitas
+bar.heatamount = Panas: {0}
+bar.heatpercent = Panas: {0} ({1}%)
+bar.power = Tenaga
+bar.progress = Proses Pembangunan
+bar.loadprogress = Proses Muatan
+bar.launchcooldown = Jeda Peluncuran
+bar.input = Masukan
+bar.output = Keluaran
+bar.strength = [stat]{0}[lightgray]x penguatan
+
+units.processorcontrol = [lightgray]Dikendalikan Prosesor
+
+bullet.damage = [stat]{0}[lightgray] kekuatan (dmg)
+bullet.splashdamage = [stat]{0}[lightgray] kekuatan percikan~[stat] {1}[lightgray] kotak
+bullet.incendiary = [stat]membakar
+bullet.homing = [stat]mengejar
+bullet.armorpierce = [stat]menembus pelindung
+bullet.maxdamagefraction = [stat]{0}%[lightgray] batas kerusakan
+bullet.suppression = [stat]{0}[lightgray] detik penahanan perbaikan ~ [stat]{1}[lightgray] ubin
+bullet.interval = [stat]{0}/detik[lightgray] jarak antar peluru:
+bullet.frags = [stat]{0}[lightgray]x pecahan:
+bullet.lightning = [stat]{0}[lightgray]x petir ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] damage bangunan
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] terdorong
+bullet.pierce = [stat]{0}[lightgray]x tembus
+bullet.infinitepierce = [stat]tembus
+bullet.healpercent = [stat]{0}[lightgray]% menyembuhkan
+bullet.healamount = [stat]{0}[lightgray] perbaikan langsung
+bullet.multiplier = [stat]{0}[lightgray]x penggandaan amunisi
+bullet.reload = [stat]{0}[lightgray]x laju tembakan
+bullet.range = [stat]{0}[lightgray] jarak ubin
+bullet.notargetsmissiles = [stat] mengabaikan misil
+bullet.notargetsbuildings = [stat] mengabaikan bangunan
+
+unit.blocks = blok
+unit.blockssquared = blok²
+unit.powersecond = unit tenaga/detik
+unit.tilessecond = ubin/detik
+unit.liquidsecond = unit zat cair/detik
+unit.itemssecond = item/detik
+unit.liquidunits = unit zat cair
+unit.powerunits = unit tenaga
+unit.heatunits = unit panas
+unit.degrees = derajat
+unit.seconds = detik
+unit.minutes = menit
+unit.persecond = /dtk
+unit.perminute = /mnt
+unit.timesspeed = x kecepatan
+unit.multiplier = x
+unit.percent = %
+unit.shieldhealth = darah perisai
+unit.items = item
+unit.thousands = rb
+unit.millions = jt
+unit.billions = m
+unit.shots = tembakan
+unit.pershot = /tembakan
+category.purpose = Kegunaan
+category.general = Umum
+category.power = Tenaga
+category.liquids = Zat Cair
+category.items = Barang
+category.crafting = Pemasukan/Pengeluaran
+category.function = Fungsi
+category.optional = Pilihan Peningkatan
+setting.alwaysmusic.name = Selalu Putar Musik
+setting.alwaysmusic.description = Saat diaktifkan, musik akan selalu diputar berulang-ulang di dalam game. Saat dinonaktifkan, musik hanya diputar secara acak.
+setting.skipcoreanimation.name = Lewati Animasi Peluncuran atau Pendaratan Inti
+setting.landscape.name = Kunci Pemandangan
+setting.shadows.name = Bayangan
+setting.blockreplace.name = Saran Blok Otomatis
+setting.linear.name = Filter Linear
+setting.hints.name = Petunjuk
+setting.logichints.name = Petunjuk Logika
+setting.backgroundpause.name = Jeda di Latar
+setting.buildautopause.name = Jeda Otomatis ketika Membangun
+setting.doubletapmine.name = Ketuk Dua Kali untuk Menambang
+setting.commandmodehold.name = Tahan Untuk Mode Perintah
+setting.distinctcontrolgroups.name = Batasi Satu Grup Kontrol Per Unit
+setting.modcrashdisable.name = Matikan Mod Ketika Ada Masalah Saat Memulai Game
+setting.animatedwater.name = Animasi Perairan
+setting.animatedshields.name = Animasi Perisai
+setting.playerindicators.name = Indikasi Pemain
+setting.indicators.name = Indikasi Musuh
+setting.autotarget.name = Bidik Musuh Secara Otomatis
+setting.keyboard.name = Kontrol Tetikus+Papan Ketik
+setting.touchscreen.name = Kontrol Layar Sentuh
+setting.fpscap.name = Batas FPS
+setting.fpscap.none = Tidak Ada
+setting.fpscap.text = {0} FPS
+setting.uiscale.name = Skala UI
+setting.uiscale.description = Mulai ulang diperlukan untuk menerapkan perubahan.
+setting.swapdiagonal.name = Penaruhan Selalu Diagonal
+setting.screenshake.name = Layar Getar
+setting.bloomintensity.name = Intensitas Bloom
+setting.bloomblur.name = Blur Bloom
+setting.effects.name = Munculkan Efek
+setting.destroyedblocks.name = Tunjukkan Blok yang Telah Hancur
+setting.blockstatus.name = Tunjukan Status Blok
+setting.conveyorpathfinding.name = Navigasi Konveyor/Pipa Otomatis
+setting.sensitivity.name = Sensitivitas Kontroler
+setting.saveinterval.name = Jarak Menyimpan
+setting.seconds = {0} detik
+setting.milliseconds = {0} milidetik
+setting.fullscreen.name = Layar Penuh
+setting.borderlesswindow.name = Jendela tak Berbatas
+setting.borderlesswindow.name.windows = Layar Penuh tak Berbatas
+setting.borderlesswindow.description = Mulai ulang mungkin diperlukan untuk menerapkan perubahan.
+setting.fps.name = Tunjukkan FPS & Ping
+setting.console.name = Hidupkan Konsol
+setting.smoothcamera.name = Kamera Halus
+setting.vsync.name = VSync
+setting.pixelate.name = Mode Pixel
+setting.minimap.name = Tunjukkan Peta Kecil
+setting.coreitems.name = Tunjukkan Bahan Inti
+setting.position.name = Tunjukkan Posisi Pemain
+setting.mouseposition.name = Tunjukkan Posisi Tetikus
+setting.musicvol.name = Volume Musik
+setting.atmosphere.name = Tunjukkan Atmosfer Planet
+setting.drawlight.name = Gambar Kegelapan atau Pencahayaan
+setting.ambientvol.name = Volume Sekeliling
+setting.mutemusic.name = Bisukan Musik
+setting.sfxvol.name = Volume Suara Efek
+setting.mutesound.name = Bisukan Suara
+setting.crashreport.name = Laporkan Masalah Secara Anonim
+setting.communityservers.name = Ambil Daftar Server Komunitas
+setting.savecreate.name = Otomatis Menyimpan
+setting.steampublichost.name = Visibilitas Game Publik
+setting.playerlimit.name = Batas pemain
+setting.chatopacity.name = Jelas-Beningnya Pesan
+setting.lasersopacity.name = Jelas-Beningnya Laser Tenaga
+setting.unitlaseropacity.name = Jelas-Beningnya Laser Unit Menambang
+setting.bridgeopacity.name = Jelas-Beningnya Jembatan
+setting.playerchat.name = Tunjukkan Pesan Pemain
+setting.showweather.name = Perlihatkan Cuaca
+setting.hidedisplays.name = Sembunyikan Tampilan Logika
+setting.macnotch.name = Sesuaikan tampilan dengan batas layar	
+setting.macnotch.description = Mulai ulang diperlukan untuk menerapkan perubahan
+steam.friendsonly = Hanya Teman
+steam.friendsonly.tooltip = Mengatur bisa atau tidaknya teman Steam bergabung ke permainanmu.\nMenghapus centang pada kotak ini akan membuat permainan Anda menjadi publik - siapa saja dapat bergabung.
+public.beta = Ingat bahwa game dalam versi beta tidak dapat membuat lobi publik.
+uiscale.reset = Skala UI telah diubah.\nTekan "OK" untuk mengonfirmasi.\n[scarlet]Kembali dan keluar di[accent] {0}[] pengaturan...
+uiscale.cancel = Batal & Keluar
+setting.bloom.name = Bloom
+keybind.title = Ganti Tombol
+keybinds.mobile = [scarlet]Mayoritas tombol tidak didukung oleh perangkat ponsel. Hanya gerakan dasar yang didukung.
+category.general.name = Umum
+category.view.name = Melihat
+category.command.name = Perintah Unit
+category.multiplayer.name = Bermain Bersama
+category.blocks.name = Pilih Blok
+placement.blockselectkeys = \n[lightgray]Tombol: [{0},
+keybind.respawn.name = Muncul Kembali
+keybind.control.name = Kendalikan Unit
+keybind.clear_building.name = Hapus Bangunan
+keybind.press = Tekan tombol...
+keybind.press.axis = Tekan sumbu atau tombol...
+keybind.screenshot.name = Tangkapan Layar Peta
+keybind.toggle_power_lines.name = Aktifkan Laser Tenaga
+keybind.toggle_block_status.name = Status Blok
+keybind.move_x.name = Pindah X
+keybind.move_y.name = Pindah Y
+keybind.mouse_move.name = Ikuti Tetikus
+keybind.pan.name = Tampilan Geser
+keybind.boost.name = Dorongan
+keybind.command_mode.name = Mode Perintah
+keybind.command_queue.name = Antrian Perintah Unit
+keybind.create_control_group.name = Buat Grup Kendali
+keybind.cancel_orders.name = Batalkan Perintah
+
+keybind.unit_stance_shoot.name = Posisi	 Unit: Tembak
+keybind.unit_stance_hold_fire.name = Posisi Unit: Tahan Tembakan
+keybind.unit_stance_pursue_target.name = Posisi Unit: Mengejar Target
+keybind.unit_stance_patrol.name = Posisi Unit: Patroli
+keybind.unit_stance_ram.name = Posisi Unit: Tabrak
+
+keybind.unit_command_move.name = Perintah Unit: Bergerak
+keybind.unit_command_repair.name = Perintah Unit: Perbaiki
+keybind.unit_command_rebuild.name = Perintah Unit: Bangun kembali
+keybind.unit_command_assist.name = Perintah Unit: Ikuti Player
+keybind.unit_command_mine.name = Perintah Unit: Menambang
+keybind.unit_command_boost.name = Perintah Unit: Mendorong
+keybind.unit_command_load_units.name = Perintah Unit: Muat Unit
+keybind.unit_command_load_blocks.name = Perintah Unit: Muat Blok
+keybind.unit_command_unload_payload.name = Perintah Unit: Bongkar Muatan
+keybind.unit_command_enter_payload.name = Perintah Unit: Masuk ke Muatan
+keybind.unit_command_loop_payload.name = Perintah Unit: Perulangan Transfer Unit
+
+keybind.rebuild_select.name = Membangun Wilayah Kembali
+keybind.schematic_select.name = Pilih Daerah
+keybind.schematic_menu.name = Menu Skema
+keybind.schematic_flip_x.name = Balik Skematik Horizontal
+keybind.schematic_flip_y.name = Balik Skematik Vertikal
+keybind.category_prev.name = Kategori Sebelumnya
+keybind.category_next.name = Kategori Selanjutnya
+keybind.block_select_left.name = Pilih Blok Kiri
+keybind.block_select_right.name = Pilih Blok Kanan
+keybind.block_select_up.name = Pilih Blok Atas
+keybind.block_select_down.name = Pilih Blok Bawah
+keybind.block_select_01.name = Kategori/Pilih Blok 1
+keybind.block_select_02.name = Kategori/Pilih Blok 2
+keybind.block_select_03.name = Kategori/Pilih Blok 3
+keybind.block_select_04.name = Kategori/Pilih Blok 4
+keybind.block_select_05.name = Kategori/Pilih Blok 5
+keybind.block_select_06.name = Kategori/Pilih Blok 6
+keybind.block_select_07.name = Kategori/Pilih Blok 7
+keybind.block_select_08.name = Kategori/Pilih Blok 8
+keybind.block_select_09.name = Kategori/Pilih Blok 9
+keybind.block_select_10.name = Kategori/Pilih Blok 10
+keybind.fullscreen.name = Aktifkan Layar Penuh
+keybind.select.name = Pilih/Tembak
+keybind.diagonal_placement.name = Penaruhan Diagonal
+keybind.pick.name = Memilih Blok
+keybind.break_block.name = Menghancurkan Blok
+keybind.select_all_units.name = Pilih Semua Unit
+keybind.select_all_unit_factories.name = Pilih Semua Pabrik Unit
+keybind.deselect.name = Batal Memilih
+keybind.pickupCargo.name = Angkat Muatan
+keybind.dropCargo.name = Turunkan Muatan
+keybind.shoot.name = Menembak
+keybind.zoom.name = Perbesar
+keybind.menu.name = Menu
+keybind.pause.name = Jeda
+keybind.pause_building.name = Jeda/Lanjut Membangun
+keybind.minimap.name = Peta Kecil
+keybind.planet_map.name = Peta Planet
+keybind.research.name = Penelitian
+keybind.block_info.name = Info Blok
+keybind.chat.name = Pesan
+keybind.player_list.name = Daftar Pemain
+keybind.console.name = Papan Konsol
+keybind.rotate.name = Putar
+keybind.rotateplaced.name = Putar yang telah Dibangun (Tekan dan Tahan)
+keybind.toggle_menus.name = Aktifkan Menu
+keybind.chat_history_prev.name = Sejarah Pesan Sebelumnya
+keybind.chat_history_next.name = Sejarah Pesan Setelahnya
+keybind.chat_scroll.name = Gulir Pesan
+keybind.chat_mode.name = Ubah Mode Pesan
+keybind.drop_unit.name = Turunkan Unit
+keybind.zoom_minimap.name = Perbesar Peta Kecil
+mode.help.title = Deskripsi mode permainan
+mode.survival.name = Bertahan Hidup
+mode.survival.description = Mode normal. Sumber daya terbatas dan gelombang otomatis.\n[gray]Membutuhkan zona pendaratan musuh di dalam peta untuk bermain.
+mode.sandbox.name = Sandbox/Bebas
+mode.sandbox.description = Sumber daya tak terbatas dan tidak ada gelombang otomatis.
+mode.editor.name = Penyunting
+mode.pvp.name = PvP
+mode.pvp.description = Lawan pemain lain dalam permainan lokal.\n[gray]Membutuhkan setidaknya 2 inti dengan warna berbeda di dalam peta untuk bermain.
+mode.attack.name = Penyerangan
+mode.attack.description = Hancurkan markas musuh. Membutuhkan inti merah di dalam peta untuk main.
+mode.custom = Pengaturan Modifikasi
+
+rules.invaliddata = Data papan klip tidak valid.
+rules.hidebannedblocks = Sembunyikan Blok Terlarang
+rules.infiniteresources = Sumber Daya Tak Terbatas
+rules.onlydepositcore = Hanya Izinkan Penyetoran Inti
+rules.derelictrepair = Izinkan Perbaikan Blok 
+rules.reactorexplosions = Ledakan Reaktor
+rules.coreincinerates = Penghangusan Luapan Inti
+rules.disableworldprocessors = Nonaktifkan Prosesor Dunia
+rules.schematic = Skema Diperbolehkan
+rules.wavetimer = Pengaturan Waktu Gelombang
+rules.wavesending = Pengiriman Gelombang
+rules.allowedit = Izinkan Aturan Pengeditan
+rules.allowedit.info = Ketika diaktifkan, pemain dapat mengedit aturan dalam game melalui tombol di sudut kiri bawah pada menu Jeda.
+rules.alloweditworldprocessors = Izinkan Pengeditan Prosesor Dunia
+rules.alloweditworldprocessors.info = Ketika diaktifkan, blok logika dunia dapat ditempatkan dan diedit bahkan di luar penyunting.
+rules.waves = Gelombang
+rules.airUseSpawns = Unit udara menggunakan titik pendaratan
+rules.attack = Mode Penyerangan
+rules.buildai = A.I. Pembangun Markas
+rules.buildaitier = Tingkat A.I. Pembangun
+rules.rtsai = A.I. RTS [red](WIP)
+rules.rtsai.campaign = A.I. Serangan RTS
+rules.rtsai.campaign.info = Dalam peta serangan, membuat unit berkelompok dan menyerang markas pemain dengan cara yang lebih cerdas.
+rules.rtsminsquadsize = Ukuran Regu Minimum
+rules.rtsmaxsquadsize = Ukuran Regu Maksimum
+rules.rtsminattackweight = Berat Serangan Minimum
+rules.cleanupdeadteams = Bersihkan Bangunan Tim yang Kalah (PvP)
+rules.corecapture = Kuasai Inti Saat Penghancuran
+rules.polygoncoreprotection = Poligon Pelindung Inti
+rules.placerangecheck = Pemeriksaan Jarak Penempatan
+rules.enemyCheat = Sumber Daya Musuh Tak Terbatas
+rules.blockhealthmultiplier = Penggandaan Darah Blok
+rules.blockdamagemultiplier = Penggandaan Kekuatan Blok
+rules.unitbuildspeedmultiplier = Penggandaan Kecepatan Pembuatan Unit
+rules.unitcostmultiplier = Penggandaan Bahan Pembuatan Unit
+rules.unithealthmultiplier = Penggandaan Darah Unit
+rules.unitdamagemultiplier = Penggandaan Kekuatan Unit
+rules.unitcrashdamagemultiplier = Penggandaan Kerusakan Jatuhnya Unit
+rules.unitminespeedmultiplier = Penggandaan Kecepatan Unit Menambang
+rules.solarmultiplier = Penggandaan Tenaga Surya
+rules.unitcapvariable = Inti Memengaruhi Batas Unit
+rules.unitpayloadsexplode = Muatan yang Dibawa Meledak Bersama Unit
+rules.unitcap = Batas Unit Dasar
+rules.limitarea = Batas Area Peta
+rules.enemycorebuildradius = Dilarang Membangun di Radius Inti Musuh :[lightgray] (ubin)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Jarak Gelombang:[lightgray] (detik)
+rules.initialwavespacing = Jarak Gelombang Awal:[lightgray] (detik)
+rules.buildcostmultiplier = Penggandaan Harga Bangunan
+rules.buildspeedmultiplier = Penggandaan Waktu Pembangunan
+rules.deconstructrefundmultiplier = Penggandaan Kembalinya Bahan Bangunan yang Dihancurkan
+rules.waitForWaveToEnd = Gelombang Menunggu Musuh
+rules.wavelimit = Peta Berakhir Setelah Gelombang
+rules.dropzoneradius = Radius Zona Pendaratan :[lightgray] (ubin)
+rules.unitammo = Unit Membutuhkan Amunisi [red](mungkin dihapus)
+rules.enemyteam = Tim Musuh
+rules.playerteam = Tim Pemain
+rules.title.waves = Gelombang
+rules.title.resourcesbuilding = Sumber Daya & Bangunan
+rules.title.enemy = Musuh
+rules.title.unit = Unit
+rules.title.experimental = Eksperimental
+rules.title.environment = Lingkungan
+rules.title.teams = Tim
+rules.title.planet = Planet
+rules.lighting = Penerangan
+rules.fog = Kabut Perang
+rules.invasions = Invasi Sektor Musuh
+rules.legacylaunchpads = Mekanisme Alas Peluncur Warisan
+rules.legacylaunchpads.info = Mengizinkan penggunaan alas peluncur tanpa alas pendaratan, seperti pada versi 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Nonaktifkan[lightgray] (Alas Peluncur Warisan diaktifkan)
+rules.showspawns = Tampilkan Titik Pendaratan Musuh
+rules.randomwaveai = Gelombang AI yang Tak Terduga
+rules.fire = Api
+rules.anyenv = <Apapun>
+rules.explosions = Kekuatan Ledakan Blok/Unit
+rules.ambientlight = Cahaya Di Sekeliling
+rules.weather = Cuaca
+rules.weather.frequency = Frekuensi:
+rules.weather.always = Selalu
+rules.weather.duration = Durasi:
+
+rules.randomwaveai.info = Membuat unit yang muncul dalam gelombang menargetkan struktur bangunan secara acak alih-alih menyerang inti atau generator pembangkit listrik secara langsung.
+rules.placerangecheck.info = Mencegah pemain menempatkan apa pun di dekat bangunan musuh. Ketika mencoba memasang menara, jangkauannya akan ditingkatkan sehingga menara tidak akan bisa menjangkau musuh.
+rules.onlydepositcore.info = Mencegah unit menyimpan bahan ke dalam bangunan apa pun kecuali inti.
+
+content.item.name = Bahan
+content.liquid.name = Zat Cair
+content.unit.name = Unit
+content.block.name = Blok
+content.status.name = Status Efek
+content.sector.name = Sektor
+content.team.name = Fraksi
+
+wallore = (Dinding)
+
+item.copper.name = Tembaga
+item.lead.name = Timah
+item.coal.name = Batu Bara
+item.graphite.name = Grafit
+item.titanium.name = Titanium
+item.thorium.name = Torium
+item.silicon.name = Silikon
+item.plastanium.name = Plastanium
+item.phase-fabric.name = Phase Fabric
+item.surge-alloy.name = Paduan Logam
+item.spore-pod.name = Polong Spora
+item.sand.name = Pasir
+item.blast-compound.name = Senyawa Peledak
+item.pyratite.name = Pyratit
+item.metaglass.name = Metaglass
+item.scrap.name = Rongsokan
+item.fissile-matter.name = Bahan Fisil
+item.beryllium.name = Berilium
+item.tungsten.name = Tungsten
+item.oxide.name = Oksida
+item.carbide.name = Karbit
+item.dormant-cyst.name = Kista Nonaktif
+
+liquid.water.name = Air
+liquid.slag.name = Lava
+liquid.oil.name = Minyak
+liquid.cryofluid.name = Kriogenik
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arkisit
+liquid.gallium.name = Galium
+liquid.ozone.name = Ozon
+liquid.hydrogen.name = Hidrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Sianogen
+
+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.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
+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
+
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Drone Perakit
+unit.latum.name = Latum
+unit.renale.name = Renale
+
+block.parallax.name = Paralaks
+block.cliff.name = Bukit
+block.sand-boulder.name = Batu Pasir Besar
+block.basalt-boulder.name = Batu Basal Besar
+block.grass.name = Rumput
+block.molten-slag.name = Lava
+block.pooled-cryofluid.name = Kriogenik
+block.space.name = Luar Angkasa
+block.salt.name = Garam
+block.salt-wall.name = Bukit Garam
+block.pebbles.name = Kerikil
+block.tendrils.name = Sulur
+block.sand-wall.name = Bukit Pasir
+block.spore-pine.name = Cemara Spora
+block.spore-wall.name = Bukit Spora
+block.boulder.name = Batu Besar
+block.snow-boulder.name = Batu Salju Besar
+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.shale-wall.name = Bukit Serpih
+block.scrap-wall.name = Dinding Rongsokan
+block.scrap-wall-large.name = Dinding Rongsokan Besar
+block.scrap-wall-huge.name = Dinding Rongsokan Sangat Besar
+block.scrap-wall-gigantic.name = Dinding Rongsokan Raksasa
+block.thruster.name = Pendorong
+block.kiln.name = Pembakar
+block.graphite-press.name = Pencetak Grafit
+block.multi-press.name = Multi-Cetak
+block.constructing = {0} [lightgray](Membangun)
+block.spawn.name = Titik Pendaratan Musuh
+block.remove-wall.name = Hapus Dinding
+block.remove-ore.name = Hapus Bijih
+block.core-shard.name = Inti: Shard
+block.core-foundation.name = Inti: Foundation
+block.core-nucleus.name = Inti: Nucleus
+block.deep-water.name = Air yang Dalam
+block.shallow-water.name = Air
+block.tainted-water.name = Air Tercemar
+block.deep-tainted-water.name = Air Tercemar yang Dalam
+block.darksand-tainted-water.name = Air Tercemar pada Pasir Hitam
+block.tar.name = Minyak Mentah
+block.stone.name = Batu
+block.sand-floor.name = Pasir
+block.darksand.name = Pasir Hitam
+block.ice.name = Es
+block.snow.name = Salju
+block.crater-stone.name = Kawah
+block.sand-water.name = Air pada Pasir
+block.darksand-water.name = Air pada Pasir Hitam
+block.char.name = Bara
+block.dacite.name = Dasit
+block.rhyolite.name = Riolit
+block.dacite-wall.name = Dinding Dasit
+block.dacite-boulder.name = Batu Besar Dasit
+block.ice-snow.name = Salju Es
+block.stone-wall.name = Dinding Batu
+block.ice-wall.name = Dinding Es
+block.snow-wall.name = Dinding Salju
+block.dune-wall.name = Dinding Pasir
+block.pine.name = Cemara
+block.dirt.name = Tanah
+block.dirt-wall.name = Dinding Tanah
+block.mud.name = Lumpur
+block.white-tree-dead.name = Pohon Putih Mati
+block.white-tree.name = Pohon Putih
+block.spore-cluster.name = Kumpulan Spora
+block.metal-floor.name = Lantai Besi 1
+block.metal-floor-2.name = Lantai Besi 2
+block.metal-floor-3.name = Lantai Besi 3
+block.metal-floor-4.name = Lantai Besi 4
+block.metal-floor-5.name = Lantai Besi 5
+block.metal-floor-damaged.name = Lantai Besi Rusak
+block.dark-panel-1.name = Panel Gelap 1
+block.dark-panel-2.name = Panel Gelap 2
+block.dark-panel-3.name = Panel Gelap 3
+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.basalt.name = Basal
+block.hotrock.name = Batu Panas
+block.magmarock.name = Batu Magma
+block.copper-wall.name = Dinding Tembaga
+block.copper-wall-large.name = Dinding Tembaga Besar
+block.titanium-wall.name = Dinding Titanium
+block.titanium-wall-large.name = Dinding Titanium Besar
+block.plastanium-wall.name = Dinding Plastanium
+block.plastanium-wall-large.name = Dinding Plastanium Besar
+block.phase-wall.name = Dinding Phase
+block.phase-wall-large.name = Dinding Phase Besar
+block.thorium-wall.name = Dinding Torium
+block.thorium-wall-large.name = Dinding Torium Besar
+block.door.name = Pintu
+block.door-large.name = Pintu Besar
+block.duo.name = Duo
+block.scorch.name = Scorch
+block.scatter.name = Scatter
+block.hail.name = Hail
+block.lancer.name = Lancer
+block.conveyor.name = Konveyor
+block.titanium-conveyor.name = Konveyor Berbahan Titanium
+block.plastanium-conveyor.name = Konveyor Berbahan Plastanium
+block.armored-conveyor.name = Konveyor Berlapis Baja
+block.junction.name = Simpangan
+block.router.name = Pengarah
+block.distributor.name = Distributor
+block.sorter.name = Penyortir
+block.inverted-sorter.name = Penyortir Terbalik
+block.message.name = Pesan
+block.reinforced-message.name = Pesan yang Diperkuat
+block.world-message.name = Pesan Dunia
+block.world-switch.name = Saklar Dunia
+block.illuminator.name = Lampu
+block.overflow-gate.name = Gerbang Luapan
+block.underflow-gate.name = Gerbang Luapan Terbalik
+block.silicon-smelter.name = Pelebur Silikon
+block.phase-weaver.name = Pengerajut Phase
+block.pulverizer.name = Penghancur
+block.cryofluid-mixer.name = Pencampur Kriogenik
+block.melter.name = Pencair
+block.incinerator.name = Insinerator
+block.spore-press.name = Penekan Spora
+block.separator.name = Pemisah Rongsokan
+block.coal-centrifuge.name = Sentrifugal Batu Bara
+block.power-node.name = Simpul Tenaga
+block.power-node-large.name = Simpul Tenaga Besar
+block.surge-tower.name = Tiang Listrik
+block.diode.name = Dioda Baterai
+block.battery.name = Baterai
+block.battery-large.name = Baterai Besar
+block.combustion-generator.name = Generator Pembakar
+block.steam-generator.name = Generator Uap
+block.differential-generator.name = Generator Diferensial
+block.impact-reactor.name = Reaktor Tumbukan
+block.mechanical-drill.name = Bor Mekanis
+block.pneumatic-drill.name = Bor Pneumatik
+block.laser-drill.name = Bor Laser
+block.water-extractor.name = Pengekstrak Air
+block.cultivator.name = Pembudidaya
+block.conduit.name = Saluran
+block.mechanical-pump.name = Pompa Mekanis
+block.item-source.name = Sumber Bahan
+block.item-void.name = Penghilang Bahan
+block.liquid-source.name = Sumber Zat Cair
+block.liquid-void.name = Penghilang Zat Zair
+block.power-void.name = Penghilang Tenaga
+block.power-source.name = Sumber Tenaga
+block.unloader.name = Pembongkar
+block.vault.name = Gudang
+block.wave.name = Wave
+block.tsunami.name = Tsunami
+block.swarmer.name = Swarmer
+block.salvo.name = Salvo
+block.ripple.name = Ripple
+block.phase-conveyor.name = Konveyor Berbahan Phase
+block.bridge-conveyor.name = Jembatan Konvenyor
+block.plastanium-compressor.name = Kompresor Plastanium
+block.pyratite-mixer.name = Pencampur Pyratit
+block.blast-mixer.name = Pencampur Bahan Peledak
+block.solar-panel.name = Panel Surya
+block.solar-panel-large.name = Panel Surya Besar
+block.oil-extractor.name = Pengekstrak Minyak
+block.repair-point.name = Titik Perbaikan
+block.repair-turret.name = Menara Perbaikan
+block.pulse-conduit.name = Saluran Denyut
+block.plated-conduit.name = Saluran Terlapis
+block.phase-conduit.name = Saluran Phase
+block.liquid-router.name = Pengarah Cairan
+block.liquid-tank.name = Tangki Cairan
+block.liquid-container.name = Kontainer Cairan
+block.liquid-junction.name = Simpangan Cairan
+block.bridge-conduit.name = Jembatan Saluran
+block.rotary-pump.name = Pompa Putaran
+block.thorium-reactor.name = Reaktor Torium
+block.mass-driver.name = Penembak Massal
+block.blast-drill.name = Bor Ledakan Udara
+block.impulse-pump.name = Pompa Suhu Panas
+block.thermal-generator.name = Generator Panas
+block.surge-smelter.name = Pelebur Paduan Logam
+block.mender.name = Mender
+block.mend-projector.name = Proyektor Mender
+block.surge-wall.name = Dinding Logam
+block.surge-wall-large.name = Dinding Logam Besar
+block.cyclone.name = Cyclone
+block.fuse.name = Fuse
+block.shock-mine.name = Ranjau Kejut
+block.overdrive-projector.name = Proyektor Pemercepat
+block.force-projector.name = Proyektor Pelindung
+block.arc.name = Arc
+block.rtg-generator.name = Generator Radiasi
+block.spectre.name = Spectre
+block.meltdown.name = Meltdown
+block.foreshadow.name = Foreshadow
+block.container.name = Kontainer
+block.launch-pad.name = Alas Peluncur (Warisan)
+block.advanced-launch-pad.name = Alas Peluncur
+block.landing-pad.name = Alas Pendaratan
+
+block.segment.name = Segment
+block.ground-factory.name = Pabrik Unit Darat
+block.air-factory.name = Pabrik Unit Udara
+block.naval-factory.name = Pabrik Unit Laut
+block.additive-reconstructor.name = Rekonstruktor Aditif
+block.multiplicative-reconstructor.name = Rekonstruktor Multiplikatif
+block.exponential-reconstructor.name = Rekonstruktor Eksponensial
+block.tetrative-reconstructor.name = Rekonstruktor Tetratif
+block.payload-conveyor.name = Konveyor Muatan
+block.payload-router.name = Pengarah Muatan
+block.duct.name = Pipa
+block.duct-router.name = Pengarah Pipa
+block.duct-bridge.name = Jembatan Pipa
+block.large-payload-mass-driver.name = Penembak Muatan Massal Besar
+block.payload-void.name = Penghilang Muatan
+block.payload-source.name = Sumber Muatan
+block.disassembler.name = Pembongkar Rongsokan
+block.silicon-crucible.name = Tungku Peleburan Silikon 
+block.overdrive-dome.name = Kubah Proyektor Pemercepat
+block.interplanetary-accelerator.name = Akselerator Antarplanet
+block.constructor.name = Konstruktor
+block.constructor.description = Membuat bangunan hingga ubin berukuran 2x2.
+block.large-constructor.name = Konstruktor Besar
+block.large-constructor.description = Membuat bangunan hingga ubin berukuran 4x4.
+block.deconstructor.name = Dekonstruktor Besar
+block.deconstructor.description = Mendekonstruksi bangunan dan unit. Mengembalikan 100% dari biaya pembuatan.
+block.payload-loader.name = Pemuat Muatan
+block.payload-loader.description = Memuat cairan dan item ke dalam blok.
+block.payload-unloader.name = Pembongkar Muatan
+block.payload-unloader.description = Membongkar muatan cairan dan item dari blok.
+block.heat-source.name = Sumber Panas
+block.heat-source.description = Blok ukuran 1x1 yang memberikan panas tak terhingga.
+
+#Erekir
+block.empty.name = Kosong
+block.rhyolite-crater.name = Kawah Riolit
+block.rough-rhyolite.name = Riolit Kasar
+block.regolith.name = Regolit
+block.yellow-stone.name = Batu Kuning
+block.carbon-stone.name = Batu Karbon
+block.ferric-stone.name = Batu Besi
+block.ferric-craters.name = Kawah Besi
+block.beryllic-stone.name = Batu Berilik
+block.crystalline-stone.name = Batu Kristal
+block.crystal-floor.name = Lantai Kristal
+block.yellow-stone-plates.name = Plat Batu Kuning
+block.red-stone.name = Batu Merah
+block.dense-red-stone.name = Batu Merah Padat
+block.red-ice.name = Es Merah
+block.arkycite-floor.name = Lantai Arkisit
+block.arkyic-stone.name = Batu Arkisit
+block.rhyolite-vent.name = Ventilasi Riolit
+block.carbon-vent.name = Ventilasi Karbon
+block.arkyic-vent.name = Ventilasi Arkisit
+block.yellow-stone-vent.name = Ventilasi Batu Kuning
+block.red-stone-vent.name = Ventilasi Batu Merah
+block.crystalline-vent.name = Ventilasi Kristal
+block.redmat.name = Matras Merah
+block.bluemat.name = Matras Biru
+block.core-zone.name = Zona Inti
+block.regolith-wall.name = Dinding Regolit
+block.yellow-stone-wall.name = Dinding Batu Kuning
+block.rhyolite-wall.name = Dinding Riolit
+block.carbon-wall.name = Dinding Karbon
+block.ferric-stone-wall.name = Dinding Batu Besi
+block.beryllic-stone-wall.name = Dinding Batu Berilik
+block.arkyic-wall.name = Dinding Arkisit
+block.crystalline-stone-wall.name = Dinding Batu Kristal
+block.red-ice-wall.name = Dinding Es Merah
+block.red-stone-wall.name = Dinding Batu Merah
+block.red-diamond-wall.name = Dinding Berlian Merah
+block.redweed.name = Rumput Merah
+block.pur-bush.name = Semak Pur
+block.yellowcoral.name = Terumbu Kuning
+block.carbon-boulder.name = Batu Besar Karbon
+block.ferric-boulder.name = Batu Besar Besi
+block.beryllic-boulder.name = Batu Besar Berilik
+block.yellow-stone-boulder.name = Batu Besar Kuning
+block.arkyic-boulder.name = Batu Besar Arkisit
+block.crystal-cluster.name = Bongkahan Kristal
+block.vibrant-crystal-cluster.name = Bongkahan Kristal yang Bersinar
+block.crystal-blocks.name = Blok Kristal
+block.crystal-orbs.name = Bola Kristal
+block.crystalline-boulder.name = Batu Besar Kristal
+block.red-ice-boulder.name = Batu Besar Es Merah
+block.rhyolite-boulder.name = Batu Besar Riolit
+block.red-stone-boulder.name = Batu Besar Merah
+block.graphitic-wall.name = Dinding Grafit
+block.silicon-arc-furnace.name = Tungku Listrik Silikon
+block.electrolyzer.name = Elektroliser
+block.atmospheric-concentrator.name = Konsentrator Atmosfer
+block.oxidation-chamber.name = Ruangan Oksidasi
+block.electric-heater.name = Pemanas Listrik
+block.slag-heater.name = Pemanas Lava
+block.phase-heater.name = Pemanas Phase
+block.heat-redirector.name = Pengalih Panas
+block.small-heat-redirector.name = Pengalih Panas Kecil
+block.heat-router.name = Pengarah Panas
+block.slag-incinerator.name = Insinerator Lava
+block.carbide-crucible.name = Tungku Peleburan Karbit
+block.slag-centrifuge.name = Sentrifugal Lava
+block.surge-crucible.name = Tungku Peleburan Logam
+block.cyanogen-synthesizer.name = Penyintesis Sianogen
+block.phase-synthesizer.name = Penyintesis Phase
+block.heat-reactor.name = Reaktor Panas
+block.beryllium-wall.name = Dinding Berilium
+block.beryllium-wall-large.name = Dinding Berilium Besar
+block.tungsten-wall.name = Dinding Tungsten
+block.tungsten-wall-large.name = Dinding Tungsten Besar
+block.blast-door.name = Pintu Blast
+block.carbide-wall.name = Dinding Karbit
+block.carbide-wall-large.name = Dinding Karbit Besar
+block.reinforced-surge-wall.name = Dinding Logam yang Diperkuat
+block.reinforced-surge-wall-large.name = Dinding Logam Besar yang Diperkuat
+block.shielded-wall.name = Dinding Berperisai
+block.radar.name = Radar
+block.build-tower.name = Menara Pembangun
+block.regen-projector.name = Proyektor Penyembuhan
+block.shockwave-tower.name = Menara Gelombang Kejut
+block.shield-projector.name = Proyektor Perisai
+block.large-shield-projector.name = Proyektor Perisai Besar
+block.armored-duct.name = Pipa Lapis Baja
+block.overflow-duct.name = Pipa Luapan
+block.underflow-duct.name = Pipa Luapan Terbalik
+block.duct-unloader.name = Pipa Pembongkar Muatan
+block.surge-conveyor.name = Konveyor Berbahan Logam
+block.surge-router.name = Pengarah Berbahan Logam
+block.unit-cargo-loader.name = Pemuat Unit Kargo
+block.unit-cargo-unload-point.name = Titik Bongkar Muatan Unit Kargo
+block.reinforced-pump.name = Pompa yang Diperkuat
+block.reinforced-conduit.name = Saluran yang Diperkuat
+block.reinforced-liquid-junction.name = Persimpangan Cairan yang Diperkuat
+block.reinforced-bridge-conduit.name = Jembatan Saluran yang Diperkuat
+block.reinforced-liquid-router.name = Pengarah Cairan yang Diperkuat
+block.reinforced-liquid-container.name = Kontainer Cairan yang Diperkuatkan
+block.reinforced-liquid-tank.name = Tangki Cairan yang Diperkuatkan
+block.beam-node.name = Simpul Sinar
+block.beam-tower.name = Menara Sinar
+block.beam-link.name = Tautan Sinar
+block.turbine-condenser.name = Kondensor Turbin
+block.chemical-combustion-chamber.name = Ruang Pembakaran Kimia
+block.pyrolysis-generator.name = Generator Pirolisis
+block.vent-condenser.name = Kondensor Ventilasi
+block.cliff-crusher.name = Penghancur Tebing
+block.large-cliff-crusher.name = Penghancur Tebing Canggih
+block.plasma-bore.name = Bor Plasma
+block.large-plasma-bore.name = Bor Plasma Canggih
+block.impact-drill.name = Bor Tumbukan
+block.eruption-drill.name = Bor Erupsi
+block.core-bastion.name = Inti: Bastion
+block.core-citadel.name = Inti: Citadel
+block.core-acropolis.name = Inti: Acropolis
+block.reinforced-container.name = Kontainer yang Diperkuat
+block.reinforced-vault.name = Gudang yang Diperkuat
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Pabrikator Ulang Tank
+block.mech-refabricator.name = Pabrikator Ulang Mech
+block.ship-refabricator.name = Pabrikator Ulang Kapal
+block.tank-assembler.name = Perakitan Tank
+block.ship-assembler.name = Perakitan Kapal
+block.mech-assembler.name = Perakitan Mech
+block.reinforced-payload-conveyor.name = Konveyor Muatan yang Diperkuat
+block.reinforced-payload-router.name = Pengarah Muatan yang Diperkuat
+block.payload-mass-driver.name = Penembak Muatan Massal
+block.small-deconstructor.name = Dekonstruktor
+block.canvas.name = Kanvas
+block.world-processor.name = Prosessor Dunia
+block.world-cell.name = Sel Dunia
+block.tank-fabricator.name = Pabrikator Tank
+block.mech-fabricator.name = Pabrikator Mech
+block.ship-fabricator.name = Pabrikator Kapal
+block.prime-refabricator.name = Pabrikator Ulang Perdana
+block.unit-repair-tower.name = Menara Perbaikan Unit
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Modul Perakitan Dasar
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Reaktor Flux
+block.neoplasia-reactor.name = Reaktor Neoplasia
+
+block.switch.name = Saklar
+block.micro-processor.name = Prosesor Mikro
+block.logic-processor.name = Prosesor Logika
+block.hyper-processor.name = Prosesor Raksasa
+block.logic-display.name = Tampilan Logika
+block.large-logic-display.name = Tampilan Logika Besar
+block.memory-cell.name = Sel Memori
+block.memory-bank.name = Bank Memori
+
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Sharded
+team.derelict.name = Derelik
+team.green.name = Hijau
+team.blue.name = Biru
+
+hint.skip = Lewati
+hint.desktopMove = Gunakan [accent][[WASD][] untuk bergerak.
+hint.zoom = [accent]Gulir[] untuk membesarkan atau mengecilkan layar.
+hint.desktopShoot = [accent][[Klik Kanan][] untuk menembak.
+hint.depositItems = Untuk memindahkan bahan, seret dari pesawatmu ke inti.
+hint.respawn = Untuk muncul kembali seperti awal, tekan [accent][[V][].
+hint.respawn.mobile = Anda telah mengambil alih kendali dari sebuah unit atau bangunan. Untuk muncul kembali sebagai pesawat, [accent]ketuk avatar di kiri atas.[]
+hint.desktopPause = Tekan [accent][[Spasi][] untuk menjeda dan menghentikan jeda permainan.
+hint.breaking = [accent]Klik kanan[] dan tarik untuk menghancurkan blok.
+hint.breaking.mobile = Aktifkan \ue817 [accent]palu[] di kanan bawah dan ketuk untuk menghancurkan blok.\n\nTahan jari Anda untuk beberapa saat lalu seret pada bagian yang dipilih untuk menghancurkannya.
+hint.blockInfo = Lihat informasi dari sebuah blok dengan memilihnya di [accent]menu bangunan[], lalu pilih tombol [accent][[?][] di sebelah kanan.
+hint.derelict = Bangunan berwarna [accent]abu-abu[] adalah sisa-sisa dari markas lama yang hancur dan tidak dapat berfungsi kembali.\n\nBangunan tersebut dapat [accent]didekonstruksi[] menjadi sumber daya.
+hint.research = Gunakan tombol \ue875 [accent]Penelitian[] untuk mempelajari teknologi baru.
+hint.research.mobile = Gunakan tombol \ue875 [accent]Penelitian[] di \ue88c [accent]Menu[] untuk mempelajari teknologi baru.
+hint.unitControl = Tekan dan Tahan [accent][[L-ctrl][] dan [accent]klik[] untuk mengendalikan unit atau turret sekutu.
+hint.unitControl.mobile = [accent][Ketuk dua kali[] untuk mengendalikan unit atau turret sekutu.
+hint.unitSelectControl = Untuk mengendalikan unit, masuki [accent]mode perintah[] dengan menahan tombol [accent]L-shift.[]\nDalam mode perintah, klik dan seret untuk memilih unit. [accent]Klik Kanan[] pada suatu lokasi atau target untuk memerintahkan unit.
+hint.unitSelectControl.mobile = Untuk mengendalikan unit, masuki [accent]mode perintah[] dengan menekan tombol [accent]perintah[] di pojok kanan bawah.\nDalam mode perintah, tekan layar untuk beberapa saat dan seret untuk memilih unit. ketuk pada suatu lokasi atau target untuk memerintahkan unit.
+hint.launch = Ketika sumber daya sudah mencukupi, Anda dapat [accent]Meluncurkan Inti[] dengan memilih sektor terdekat dari \ue827 [accent]Peta[] di kanan bawah.
+hint.launch.mobile = Ketika sumber daya sudah mencukupi, Anda bisa [accent]Meluncurkan Inti[] dengan memilih sektor terdekat dari \ue827 [accent]Peta[] dibagian \ue88c [accent]Menu[].
+hint.schematicSelect = Tahan tombol [accent][[F][] dan seret ke bangunan untuk menyalin bangunan.\n\n[accent][[Klik tengah][] untuk menyalin satu jenis blok.
+hint.rebuildSelect = Tahan tombol [accent][[B][] dan seret untuk memilih bagian blok yang hancur.\nIni akan membangunnya kembali secara otomatis.
+hint.rebuildSelect.mobile = Pilih Tombol \ue874 salin, lalu ketuk tombol \ue80f bangun kembali dan seret untuk memilih blok yang hancur.\nIni akan membangun ulang secara otomatis.
+hint.conveyorPathfind = Tahan [accent][[L-Ctrl][] ketika menarik konveyor untuk membuat jalur secara otomatis.
+hint.conveyorPathfind.mobile = Ketuk \ue844 [accent]mode diagonal[] dan tarik konveyor untuk membuat jalur secara otomatis.
+hint.boost = Tahan [accent][[L-Shift][] untuk terbang dengan unit.\n\nHanya beberapa unit darat yang memiliki pendorong.
+hint.payloadPickup = Tekan [accent][[[] untuk mengambil blok kecil atau unit.
+hint.payloadPickup.mobile = [accent]Ketuk dan tahan[] untuk mengambil blok kecil atau unit.
+hint.payloadDrop = Tekan [accent]][] untuk menurunkan muatan.
+hint.payloadDrop.mobile = [accent]Tekan dan tahan[] di lokasi yang kosong untuk menurunkan muatan.
+hint.waveFire = [accent]Wave[] yang terisi dengan air akan memadamkan air dalam jangkauannya.
+hint.generator = \uf879 [accent]Generator Pembakar[] membakar batu bara dan menghasilkan energi ke blok yang berdekatan.\n\nTransmisi energi dapat diperluas dengan \uf87f [accent]Simpul Daya[].
+hint.guardian = Unit [accent]Penjaga[] adalah unit yang diperkuat. Amunisi lemah seperti [accent]Tembaga[] dan [accent]Timah[] [scarlet]tidak efektif[].\n\nGunakan menara yang lebih bagus atau amunisi yang lebih kuat seperti \uf835 [accent]Grafit[] \uf861Duo/\uf859Salvo untuk menghancurkan Penjaga.
+hint.coreUpgrade = Inti dapat ditingkatkan dengan cara [accent]meletakkan Inti yang lebih besar di atasnya[].\n\nLetakan sebuah inti \uf868 [accent]Foundation[] diatas inti \uf869 [accent]Shard[]. Pastikan terdapat ruang kosong dari bangunan yang lain.
+hint.presetLaunch = [accent]Zona pendaratan[] yang berwarna abu-abu, seperti [accent]Hutan Beku[], dapat diluncurkan dari mana saja. Sektor seperti ini tidak perlu diluncurkan dari sektor terdekat milik Anda.\n\n[accent]Sektor yang bernomor[], seperti yang ini, bersifat [accent]opsional[].
+hint.presetDifficulty = Sektor ini memiliki [scarlet]tingkat ancaman musuh yang tinggi[].\nMeluncurkan ke sektor tersebut [accent]tidak disarankan[] tanpa teknologi yang sesuai dan persiapan yang matang.
+hint.coreIncinerate = Setelah inti penuh dengan suatu barang, barang yang sejenis akan [accent]dihanguskan[].
+hint.factoryControl = Untuk menentukan [accent]tempat keluar[] unit pabrik, klik blok pabrik ketika dalam mode perintah, lalu klik kanan lokasi yang diinginkan.\nUnit yang diproduksi akan langsung bergerak ke tempat yang ditentukan.
+hint.factoryControl.mobile = Untuk menentukan [accent]tempat keluar[] unit pabrik, ketuk blok pabrik ketika dalam mode perintah, lalu ketuk lokasi yang diinginkan.\nUnit yang diproduksi akan langsung bergerak ke tempat yang ditentukan.
+
+gz.mine = Bergerak di dekat \uf8c4 [accent]bijih tembaga[] di tanah dan klik untuk mulai menambang.
+gz.mine.mobile = Bergerak di dekat \uf8c4 [accent]bijih tembaga[] di tanah dan ketuk untuk mulai menambang.
+gz.research = Buka \ue875 pohon teknologi.\nRiset \uf870 [accent]Bor Mekanis[], lalu pilih dari menu di kanan bawah.\nKlik pada tambalan tembaga untuk menempatkannya.
+gz.research.mobile = Buka \ue875 pohon teknologi.\nRiset \uf870 [accent]Bor Mekanis[], lalu pilih dari menu di kanan bawah.\nKetuk pada tambalan tembaga untuk menempatkannya.\n\nKetuk \ue800 [accent]tanda centang[] di kanan bawah untuk mengonfirmasi.
+gz.conveyors = Riset dan tempatkan \uf896 [accent]konveyor[] untuk memindahkan sumber daya yang ditambang\ndari bor ke inti.\n\nKlik dan seret untuk menempatkan beberapa konveyor.\n[accent]Gulir[] untuk memutar arah konveyor
+gz.conveyors.mobile = Riset dan tempatkan \uf896 [accent]konveyor[] untuk memindahkan sumber daya yang ditambang\ndari bor ke inti.\n\nTahan jari Anda sebentar dan seret untuk menempatkan beberapa konveyor.
+gz.drills = Perluas operasi penambangan.\ntempatkan lebih banyak Bor Mekanis.\nTambang 100 tembaga.
+gz.lead = \uf837 [accent]Timah[] adalah sumber daya lain yang umum digunakan.\nSiapkan bor untuk menambang timah.
+gz.moveup = \ue804 Bergerak ke atas untuk objektif lebih lanjut.
+gz.turrets = Riset dan tempatkan 2 menara \uf861 [accent]Duo[] untuk mempertahankan inti.\nMenara Duo membutuhkan amunisi \uf838 [accent]tembaga[] dari konveyor.
+gz.duoammo = Suplai menara Duo dengan [accent]tembaga[], menggunakan konveyor.
+gz.walls = [accent]Dinding[] dapat menahan kerusakan yang mencapai bangunan.\nTempatkan \uf8ae [accent]dinding tembaga[] di sekitar menara.
+gz.defend = Musuh datang, bersiaplah untuk bertahan.
+gz.aa = Unit terbang tidak dapat dengan mudah dibunuh dengan menara standar.\nMenara \uf860 [accent]Scatter[] memberikan anti-udara yang sangat baik, tetapi membutuhkan \uf837 [accent]timah[] sebagai amunisi.
+gz.scatterammo = Suplai Menara Scatter dengan [accent]timah[], menggunakan konveyor.
+gz.supplyturret = [accent]Suplai Menara
+gz.zone1 = Ini adalah zona pendaratan musuh.
+gz.zone2 = Apa pun yang dibangun dalam radius tersebut \nakan hancur ketika gelombang mulai.
+gz.zone3 = Gelombang akan dimulai sekarang. Bersiap.
+gz.finish = Bangun lebih banyak menara, tambang lebih banyak sumber daya,\ndan bertahanlah terhadap semua gelombang untuk [accent]menaklukkan sektor[].
+
+onset.mine = Klik untuk menambang \uf748 [accent]berilium[] dari dinding.\n\nGunakan tombol [accent][[WASD] untuk bergerak.
+onset.mine.mobile = Ketuk untuk menambang \uf748 [accent]berilium[] dari dinding.
+onset.research = Buka \ue875 pohon teknologi.\nRiset, dan tempatkan \uf73e [accent]kondensor turbin[] di ventilasi.\nIni akan menghasilkan [accent]tenaga[].
+onset.bore = Riset dan tempatkan \uf741 [accent]bor plasma[].\nIni secara otomatis mengekstraksi sumber daya dari dinding.
+onset.power = Untuk [accent]menyalakan[] bor plasma, riset dan tempatkan \uf73d [accent]simpul sinar[].\nHubungkan kondensor turbin ke bor plasma.
+onset.ducts = Riset dan tempatkan \uf799 [accent]pipa[] untuk memindahkan sumber daya yang ditambang dari bor plasma ke inti.\nklik dan seret untuk menempatkan beberapa saluran.\n[accent]Gulir[] untuk memutar.
+onset.ducts.mobile = Riset dan tempatkan \uf799 [accent]saluran[] untuk memindahkan sumber daya yang ditambang dari bor plasma ke inti.\n\nTahan jari Anda sebentar dan seret untuk menempatkan beberapa saluran.
+onset.moremine = Perluas operasi penambangan.\nTempatkan lebih banyak Bor Plasma dan gunakan simpul sinar dan pipa untuk menambangnya.\nTambang 200 berillium.
+onset.graphite = Blok yang lebih kompleks membutuhkan \uf835 [accent]grafit[].\nSiapkan bor plasma untuk menambang grafit.
+onset.research2 = Mulailah meneliti [accent]bangunan pabrik[].\nRiset \uf74d [accent]penghancur tebing[] dan \uf779 [accent]tungku listrik silikon[].
+onset.arcfurnace = Tungku Listrik Silikon membutuhkan \uf834 [accent]pasir[] dan \uf835 [accent]grafit[] untuk membuat \uf82f [accent]silikon[].\n[accent]Tenaga[] juga dibutuhkan.
+onset.crusher = Gunakan \uf74d [accent]penghancur tebing[] untuk menambang pasir.
+onset.fabricator = Gunakan [accent]unit[] untuk menjelajah peta, mempertahakan bangunan, dan menyerang musuh. Riset dan tempatkan \uf6a2 [accent]pabricator tank[].
+onset.makeunit = Produksi sebuah unit.\nGunakan tombol "?" untuk melihat persyaratan pabrik yang dipilih.
+onset.turrets = Unit sangatlah efektif, namun [accent]menara[] memberikan kemampuan pertahanan yang lebih baik jika digunakan secara efektif.\nTempatkan menara \uf6eb [accent]Breach[].\nMenara membutuhkan amunisi \uf748 [accent]berilium[].
+onset.turretammo = Suplai menara dengan [accent]amunisi berillium.[]
+onset.walls = [accent]Dinding[] dapat mencegah kerusakan yang datang pada bangunan.\nTempatkan beberapa \uf6ee [accent]dinding berillium[] di sekitar menara.
+onset.enemies = Musuh datang, bersiaplah untuk bertahan.
+onset.defenses = [accent]Siapkan pertahanan:[lightgray] {0}
+onset.attack = Musuh dalam keadaan rentan diserang. Luncurkan Serangan balik.
+onset.cores = Inti baru dapat ditempatkan di [accent]ubin inti[].\nInti baru berfungsi sebagai pangkalan depan dan berbagi sumber daya dengan inti lainnya.\nTempatkan inti\uf725.
+onset.detect = Musuh akan dapat mendeteksi Anda dalam 2 menit.\nSiapkan pertahanan, penambangan, dan produksi.
+onset.commandmode = Tahan [accent]shift[] untuk masuk ke[accent]mode perintah[].\n[accent]Klik kiri dan seret[] untuk memilih unit.\n[accent]Klik kanan[] untuk memerintahkan unit yang dipilih untuk bergerak atau menyerang.
+onset.commandmode.mobile = Tekan [accent]tombol perintah[] untuk masuk ke [accent]mode perintah[].\nTekan dan tahan jari Anda, lalu [accent]seret[] untuk memilih unit.\n[accent]Ketuk[] untuk memerintahkan unit yang dipilih untuk bergerak atau menyerang.
+aegis.tungsten = Tungsten dapat ditambang menggunakan [accent]bor tumbukan[].\nBangunan ini membutuhkan [accent]air[] dan [accent]tenaga[].
+
+split.pickup = Beberapa blok dapat diambil oleh unit inti.\nAmbil [accent]kontainer ini[] dan letakan di [accent]pembongkar muatan[].\n(Tombol bawaan nya ialah [ dan ] untuk mengambil dan menurun kan)
+split.pickup.mobile = Beberapa blok dapat diambil oleh unit inti.\nAmbil [accent]kontainer ini[] dan letakan di [accent]pembongkar muatan[].\n(Untuk mengambil atau menurunkan sesuatu, tekan lama blok tersebut)
+split.acquire = Anda harus memperoleh beberapa tungsten untuk membangun unit.
+split.build = Unit harus diangkut ke sisi lain tembok.\nTempatkan dua [accent]Penembak Muatan Massal[], satu di setiap sisi dinding.\nHubungkan Penembak dengan menekan salah satunya, lalu pilih penembak yang lain.
+split.container = Mirip dengan kontainer, unit juga dapat diangkut menggunakan [accent]Penembak Muatan Massal[].\nTempatkan unit fabrikator berdekatan dengan penggerak massal untuk memuatnya, lalu kirim mereka melintasi dinding untuk menyerang markas musuh.
+
+item.copper.description = Digunakan pada semua tipe konstruksi dan amunisi.
+item.copper.details = Tembaga. Logam yang sangat melimpah di Serpulo. Lemah secara struktural kecuali jika diperkuat.
+item.lead.description = Digunakan pada transportasi cairan dan bangunan listrik.
+item.lead.details = Padat. Lembam. Biasanya digunakan untuk baterai.\nCatatan: Kemungkinan beracun untuk kehidupan biologis. Bukan berarti tidak banyak di sini.
+item.metaglass.description = Digunakan pada bangunan distribusi cairan atau penyimpanan.
+item.graphite.description = Digunakan pada komponen listrik dan amunisi menara.
+item.sand.description = Digunakan sebagai bahan produksi untuk material yang akan dimurnikan.
+item.coal.description = Digunakan sebagai bahan bakar dan memurnikan material.
+item.coal.details = Merupakan hasil dari tumbuhan yang menjadi fosil, sudah terjadi sangat lama sebelum spora menyebar.
+item.titanium.description = Digunakan pada bangunan transportasi cairan, bor dan pesawat terbang.
+item.thorium.description = Digunakan pada bangunan yang kuat dan sebagai bahan bakar nuklir.
+item.scrap.description = Digunakan pada Pelebur dan Penghancur untuk dimurnikan menjadi material lain.
+item.scrap.details = Sisa-sisa dari unit dan bangunan tua.
+item.silicon.description = Digunakan pada panel surya, bahan elektronik yang kompleks dan amunisi yang bisa mengejar.
+item.plastanium.description = Digunakan dalam unit canggih, isolasi dan amunisi fragmentasi.
+item.phase-fabric.description = Digunakan di elektronik canggih dan teknologi perbaikan diri sendiri.
+item.surge-alloy.description = Digunakan di pertahanan yang lebih canggih dan struktur pertahanan reaktif.
+item.spore-pod.description = Digunakan untuk produksi minyak, bahan peledak dan bahan bakar.
+item.spore-pod.details = Spora. Sepertinya bentuk kehidupan sintetis. Menghasilkan gas beracun yang meracuni kehidupan biologis lainnya. Sangat mudah menyebar. Sangat mudah terbakar dalam kondisi tertentu.
+item.blast-compound.description = Digunakan sebagai bom dan amunisi peledak.
+item.pyratite.description = Digunakan di senjata pembakar dan generator yang membutuhkan bahan mudah terbakar.
+
+#Erekir
+item.beryllium.description = Digunakan pada banyak jenis konstruksi dan amunisi di Erekir.
+item.tungsten.description = Digunakan dalam bor, pelindung dan amunisi. Dibutuhkan dalam pembangunan struktur yang lebih canggih
+item.oxide.description = Digunakan sebagai konduktor panas dan isolator tenaga.
+item.carbide.description = Digunakan dalam bangunan canggih, unit yang lebih berat, dan amunisi.
+
+liquid.water.description = Umumnya digunakan untuk mendinginkan mesin dan pengolahan limbah.
+liquid.slag.description = Dapat dipadatkan menjadi logam tertentu, atau disemprotkan ke musuh sebagai senjata.
+liquid.oil.description = Digunakan pada produksi material canggih dan sebagai amunisi yang mudah terbakar.
+liquid.cryofluid.description = Digunakan sebagai pendingin di reaktor, menara, dan pabrik.
+
+#Erekir
+liquid.arkycite.description = Digunakan dalam reaksi kimia untuk pembangkit listrik dan material sintesis.
+liquid.ozone.description = Digunakan sebagai zat pengoksidasi dalam memproduki material, dan sebagai bahan bakar. Cukup eksplosif.
+liquid.hydrogen.description = Digunakan dalam ekstraksi sumber daya, produksi unit, dan perbaikan bangunan. Mudah terbakar.
+liquid.cyanogen.description = Digunakan untuk amunisi, pembangunan unit canggih, dan berbagai reaksi pada blok canggih. Sangat mudah terbakar.
+liquid.nitrogen.description = Digunakan dalam ekstraksi sumber daya, pembuatan gas, dan produksi unit. Lembam.
+liquid.neoplasm.description = Produk sampingan biologis yang berbahaya dari reaktor Neoplasia. Sangat cepat menyebar ketika menyentuh blok yang mengandung air yang ada di dekatnya, dan merusak blok tersebut secara perlahan. Kental.
+liquid.neoplasm.details = Neoplasma. Sel sintetik Massa yang membelah dengan cepat dan tak terkendali dengan konsistensi seperti lumpur. Tahan panas. Sangat berbahaya bagi bangunan apa pun yang melibatkan air.\n\nTerlalu rumit dan tidak stabil untuk analisis standar. Potensi penerapan tidak diketahui. Dianjurkan untuk dibakar pada kolam lava.
+
+block.derelict = \uf77e [lightgray]Derelik
+block.armored-conveyor.description = Memindahkan barang ke depan. Tidak dapat menerima masukan dari samping.
+block.illuminator.description = Memancarkan cahaya.
+block.message.description = Menyimpan pesan untuk komunikasi antar sekutu.
+block.reinforced-message.description = Menyimpan pesan untuk komunikasi antar sekutu.
+block.world-message.description = Blok pesan untuk digunakan dalam pembuatan peta. Tidak dapat dihancurkan.
+block.graphite-press.description = Memadatkan bongkahan batu bara menjadi lempengan grafit.
+block.multi-press.description = Memadatkan bongkahan batu bara menjadi lempengan grafit. Membutuhkan air sebagai pendingin.
+block.silicon-smelter.description = Memproduksi silikon dari pasir dan batu bara.
+block.kiln.description = Membakar pasir dan timah menjadi metaglass.
+block.plastanium-compressor.description = Memproduksi plastanium dari minyak dan titanium.
+block.phase-weaver.description = Memproduksi phase fabric dari torium dan pasir.
+block.surge-smelter.description = Memproduksi campuran logam dari titanium, timah, silikon dan tembaga.
+block.cryofluid-mixer.description = Mencampur air dan titanium untuk memproduksi cairan dingin.
+block.blast-mixer.description = Memproduksi senyawa peledak dari pyratit dan polong spora.
+block.pyratite-mixer.description = Mencampur batu bara, timah dan pasir menjadi pyratit.
+block.melter.description = Melelehkan rongsokan menjadi lava.
+block.separator.description = Memisahkan komponen mineral dari lava.
+block.spore-press.description = Menekan polong spora menjadi minyak.
+block.pulverizer.description = Menghancurkan kepingan menjadi pasir.
+block.coal-centrifuge.description = Memadatkan minyak menjadi bongkahan batu bara.
+block.incinerator.description = Menghancurkan item atau zat cair yang masuk.
+block.power-void.description = Menghilangkan semua tenaga yang masuk ke dalamnya. Khusus mode sandbox.
+block.power-source.description = Menghasilkan tenaga tak terhingga. Khusus mode sandbox.
+block.item-source.description = Mengeluarkan bahan tak terhingga. Khusus mode sandbox.
+block.item-void.description = Menghancurkan bahan yang masuk. Khusus mode sandbox.
+block.liquid-source.description = Mengeluarkan zat cair tak terhingga. Khusus mode sandbox.
+block.liquid-void.description = Menghancurkan zat cair yang masuk. Khusus mode sandbox.
+block.payload-source.description = Mengeluarkan muatan tak terhingga. Khusus mode sandbox.
+block.payload-void.description = Menghancurkan muatan apapun. Khusus mode sandbox.
+block.copper-wall.description = Melindungi bangunan dari tembakan musuh.
+block.copper-wall-large.description = Melindungi bangunan dari tembakan musuh.
+block.titanium-wall.description = Melindungi bangunan dari tembakan musuh.
+block.titanium-wall-large.description = Melindungi bangunan dari tembakan musuh.
+block.plastanium-wall.description = Melindungi bangunan dari tembakan musuh. Mampu menyerap laser dan listrik. Memblokir koneksi simpul tenaga secara otomatis.
+block.plastanium-wall-large.description = Melindungi bangunan dari tembakan musuh. Mampu menyerap laser dan listrik. Memblokir koneksi simpul tenaga secara otomatis.
+block.thorium-wall.description = Melindungi bangunan dari tembakan musuh.
+block.thorium-wall-large.description = Melindungi bangunan dari tembakan musuh.
+block.phase-wall.description = Melindungi bangunan dari tembakan musuh, dan dapat memantulkan beberapa jenis peluru senjata.
+block.phase-wall-large.description = Melindungi bangunan dari tembakan musuh, dan dapat memantulkan beberapa jenis peluru senjata.
+block.surge-wall.description = Melindungi bangunan dari tembakan musuh, dan dapat mengeluarkan setruman listrik.
+block.surge-wall-large.description = Melindungi bangunan dari tembakan musuh, dan dapat mengeluarkan setruman listrik.
+block.scrap-wall.description = Melindungi bangunan dari tembakan musuh.
+block.scrap-wall-large.description = Melindungi bangunan dari tembakan musuh.
+block.scrap-wall-huge.description = Melindungi bangunan dari tembakan musuh.
+block.scrap-wall-gigantic.description = Melindungi bangunan dari tembakan musuh.
+block.door.description = Dinding yang bisa dibuka dan ditutup.
+block.door-large.description = Dinding yang bisa dibuka dan ditutup.
+block.mender.description = Menyembuhkan blok di sekelilingnya secara berkala.\nGunakan silikon untuk meningkatkan jangkauan dan efisiensi (Opsional).
+block.mend-projector.description = Menyembuhkan blok di sekelilingnya secara berkala.\nGunakan phase fabric untuk meningkatkan jangkauan dan efisiensi (Opsional).
+block.overdrive-projector.description = Menambah kecepatan bangunan sekitar.\nGunakan phase fabric untuk meningkatkan jangkauan dan efisiensi (Opsional). Efek Pemercepat tidak dapat ditumpuk.
+block.force-projector.description = Menciptakan medan gaya heksagonal di sekelilingnya, melindungi bangunan dan unit di dalamnya dari kerusakan. Terlalu panas jika menerima banyak kerusakan. Gunakan cairan pendingin untuk mencegah panas berlebih (Opsional). Phase fabric meningkatkan ukuran perisai.
+block.shock-mine.description = Mengeluarkan setruman listrik setelah diinjak musuh.
+block.conveyor.description = Memindahkan barang ke depan.
+block.titanium-conveyor.description = Memindahkan barang ke depan. Lebih cepat daripada konveyor biasa.
+block.plastanium-conveyor.description = Memindahkan barang secara bertumpuk. Menerima barang dari belakang, dan membaginya ke tiga arah di depan. Membutuhkan beberapa titik pemuat dan pembongkar untuk hasil yang maksimal.
+block.junction.description = Bertindak sebagai jembatan untuk dua konveyor yang bersimpangan.
+block.bridge-conveyor.description = Memindahkan barang melewati tanah atau bangunan.
+block.phase-conveyor.description = Memindahkan barang secara instan melewati tanah atau bangunan. Memiliki jarak yang lebih jauh daripada jembatan, namun membutuhkan tenaga.
+block.sorter.description = Jika barang yang masuk cocok dengan seleksi, barang akan diperbolehkan lewat ke depan. Jika tidak, barang akan dikeluarkan ke kiri dan kanan.
+block.inverted-sorter.description = Sama seperti penyortir, namun mengeluarkan barang terpilih ke samping.
+block.router.description = Mendistribusikan barang ke 3 arah secara merata.
+block.router.details = Bisa sangat menggangu. Jangan meletakannya disamping bangunan pabrik, karena laju pengeluaran barang dapat tersumbat.
+block.distributor.description = Mendistribusikan barang ke 7 arah secara merata.
+block.overflow-gate.description = Hanya mengeluarkan barang ke kiri dan ke kanan jika bagian depan tertutup.
+block.underflow-gate.description = Kebalikan dari gerbang luapan. Mengeluarkan barang ke depan jika bagian kiri dan kanan tertutup.
+block.mass-driver.description = Blok transportasi barang jarak jauh. Mengumpulkan sejumlah barang dan menembakkannya ke penembak massal lainnya.
+block.mechanical-pump.description = Memompa dan mengeluarkan cairan. Tidak membutuhkan tenaga.
+block.rotary-pump.description = Memompa dan mengeluarkan cairan. Membutuhkan tenaga.
+block.impulse-pump.description = Memompa dan mengeluarkan cairan.
+block.conduit.description = Memindahkan cairan ke depan. Digunakan dengan pompa dan saluran lainnya.
+block.pulse-conduit.description = Memindahkan cairan ke depan. Mengantarkan lebih cepat dan banyak daripada saluran biasa.
+block.plated-conduit.description = Memindahkan cairan ke depan. Tidak menerima cairan dari samping. Tidak bocor.
+block.liquid-router.description = Menerima cairan dari satu arah dan mengeluarkannya ke 3 arah secara rata. Dapat digunakan untuk menyimpan sejumlah cairan.
+block.liquid-container.description = Menyimpan jumlah cairan yang banyak. Mengeluarkan cairan ke segala arah, sama seperti pengarah cairan.
+block.liquid-tank.description = Menyimpan jumlah cairan yang sangat banyak. Mengeluarkan cairan ke segala arah, sama seperti pengarah cairan.
+block.liquid-junction.description = Bertindak sebagai jembatan untuk dua saluran yang bersimpangan.
+block.bridge-conduit.description = Memindahkan cairan melewati tanah atau bangunan.
+block.phase-conduit.description = Memindahkan cairan melewati tanah atau bangunan. Memiliki jarak yang lebih jauh daripada jembatan cairan, namun membutuhkan tenaga.
+block.power-node.description = Mentransmisikan tenaga ke simpul tersambung. Simpul akan menerima atau memberi tenaga ke atau dari blok yang disambung.
+block.power-node-large.description = Mempunyai radius yang lebih besar dari simpul listrik biasa. Dapat tersambung ke 15 simpul lainnya.
+block.surge-tower.description = Sebuah menara listrik dengan jangkauan sangat jauh dengan sambungan yang sedikit.
+block.diode.description = Tenaga baterai dapat mengalir hanya dari satu arah, tetapi hanya jika tenaga di sebelah lebih sedikit.
+block.battery.description = Menyimpan tenaga pada saat tenaga berlebih. Memberikan tenaga pada saat tenaga berkurang.
+block.battery-large.description = Menyimpan tenaga pada saat tenaga berlebih. Memberikan tenaga pada saat tenaga berkurang. Memiliki kapasitas yang besar daripada baterai biasa.
+block.combustion-generator.description = Menghasilkan tenaga dengan membakar material yang mudah terbakar, seperti batu bara.
+block.thermal-generator.description = Menghasilkan tenaga saat ditempatkan di lokasi yang panas.
+block.steam-generator.description = Menghasilkan tenaga dengan membakar material yang mudah terbakar dan mengubah air menjadi uap.
+block.differential-generator.description = Menghasilkan tenaga dalam jumlah banyak. Memanfaatkan perbedaan suhu cairan pendingin dan pyratit yang terbakar.
+block.rtg-generator.description = Menggunakan panas dari senyawa radioaktif untuk memproduksi tenaga secara perlahan.
+block.solar-panel.description = Menghasilkan sedikit tenaga dari sinar matahari.
+block.solar-panel-large.description = Menghasilkan sedikit tenaga dari sinar matahari. Lebih efisien daripada panel surya biasa.
+block.thorium-reactor.description = Menghasilkan tenaga yang besar dari konsumsi torium. Membutuhkan pendinginan konstan. Akan meledak jika jumlah cairan pendingin yang disediakan tidak mencukupi
+block.impact-reactor.description = Menghasilkan tenaga dengan jumlah yang sangat banyak secara efisien. Membutuhkan banyak tenaga agar dapat menyalakan reaktor.
+block.mechanical-drill.description = Ketika ditempatkan pada bijih, mengeluarkan bahan dengan kecepatan lambat tanpa batas. Hanya mampu menambang sumber daya dasar.
+block.pneumatic-drill.description = Bor yang ditingkatkan, mampu menambang titanium. Menambang dengan kecepatan lebih cepat daripada bor mekanis.
+block.laser-drill.description = Mengebor lebih cepat lewat teknologi laser, tapi membutuhkan tenaga. Dapat menambang torium.
+block.blast-drill.description = Bor tercanggih. Membutuhkan banyak tenaga.
+block.water-extractor.description = Memompa air dari tanah. Gunakan jika tidak ada sumber air di sekitar.
+block.cultivator.description = Menumbuhkan konsentrasi spora yang kecil di atmosfer menjadi polong spora.
+block.cultivator.details = Teknologi yang dipulihkan. Digunakan untuk memproduksi biomassa dalam jumlah besar secara efisien. Kemungkinan merupakan inkubator awal dari spora yang sekarang menutupi Serpulo.
+block.oil-extractor.description = Menggunakan jumlah tenaga, pasir dan air yang banyak untuk diolah menjadi minyak.
+block.core-shard.description = Inti markas. Jika hancur, sektormu akan hilang.
+block.core-shard.details = Iterasi pertama. Padat. Bisa menggandakan dirinya (untuk menguasai sektor di sekitarnya). Dilengkapi dengan pendorong sekali pakai. Tidak didesain untuk perjalanan antar planet.
+block.core-foundation.description = Inti markas. Lebih kuat. Menyimpan banyak sumber daya.
+block.core-foundation.details = Iterasi kedua.
+block.core-nucleus.description = Inti markas. Sangat kuat. Menyimpan sangat banyak sumber daya.
+block.core-nucleus.details = Iterasi ketiga dan yang terakhir.
+block.vault.description = Menyimpan semua tipe bahan dalam jumlah besar. Bahan dapat dikeluarkan dengan pembongkar muatan.
+block.container.description = Menyimpan semua tipe bahan dalam jumlah kecil. Bahan dapat dikeluarkan dengan pembongkar muatan.
+block.unloader.description = Mengeluarkan bahan yang ditentukan dari bangunan.
+block.launch-pad.description = Meluncurkan muatan bahan ke sektor yang dipilih.
+block.advanced-launch-pad.description = Meluncurkan muatan bahan ke sektor yang dipilih. Hanya menerima satu jenis item dalam satu waktu.
+block.advanced-launch-pad.details = Sistem sub-orbital untuk transportasi sumber daya point-to-point.
+block.landing-pad.description = Menerima muatan bahan dari alas peluncur di sektor lain. Membutuhkan air dalam jumlah besar untuk melindungi alas dari dampak pendaratan.
+block.duo.description = Menembakkan peluru bergantian ke musuh.
+block.scatter.description = Menembakkan gumpalan timah, rongsokan atau metaglass ke target udara.
+block.scorch.description = Membakar musuh darat yang dekat dengannya. Sangat efektif dalam jarak dekat.
+block.hail.description = Menembakkan peluru kecil ke musuh darat dari jarak jauh.
+block.wave.description = Menembakkan aliran cairan ke musuh. Secara otomatis memadamkan api bila disuplai dengan air.
+block.lancer.description = Memuat dan menembakkan sinar energi yang kuat ke target darat.
+block.arc.description = Menembakkan busur listrik ke target darat
+block.swarmer.description = Menembakkan misil yang mengejar ke arah musuh.
+block.salvo.description = Menembakkan peluru cepat ke arah musuh.
+block.fuse.description = Menembakkan tiga penusuk tajam jarak dekat ke musuh terdekat.
+block.ripple.description = Menembakkan gugusan peluru ke musuh darat dari jarak jauh.
+block.cyclone.description = Menembakkan gumpalan peledak ke musuh terdekat.
+block.spectre.description = Menembakkan peluru besar yang menembus pelindung ke target udara dan darat.
+block.meltdown.description = Mengisi dan menembakkan sinar laser secara terus-menerus ke musuh di sekitar. Membutuhkan pendingin untuk beroperasi.
+block.foreshadow.description = Menembakkan baut besar jarak jauh yang hanya menembak satu target. Mengutamakan musuh dengan batas darah tertinggi.
+block.repair-point.description = Memulihkan unit yang terluka di sekitar secara terus-menerus.
+block.segment.description = Merusakkan dan menghancurkan proyektil yang datang. Proyektil laser tidak akan ditargetkan.
+block.parallax.description = Menembakkan laser yang menarik target udara, juga merusaknya selama dalam proses.
+block.tsunami.description = Menembakkan cairan dalam jumlah dan tekanan besar ke arah musuh. Dapat memadamkan api secara otomatis jika diisi dengan air.
+block.silicon-crucible.description = Memurnikan silikon dari pasir dan batu bara, menggunakan pyratit sebagai sumber panas tambahan. Lebih efesien jika diletakkan di area yang panas.
+block.disassembler.description = Memisahkan lava menjadi mineral langka dalam efesiensi rendah. Bisa memproduksi torium.
+block.overdrive-dome.description = Menambahkan kecepatan pada bangunan di sekitarnya. Membutuhkan phase fabric dan silikon untuk bekerja. Efek Pemercepat tidak dapat ditumpuk.
+block.payload-conveyor.description = Memindahkan muatan yang besar, seperti unit dari pabrik.
+block.payload-router.description = Membagi muatan masukan menjadi 3 arah keluaran.
+block.ground-factory.description = Memproduksi unit darat. Hasil unit dapat digunakan secara langsung, atau dipindahkan ke rekonstruktor untuk ditingkatkan.
+block.air-factory.description = Memproduksi unit udara. Hasil unit dapat digunakan secara langsung, atau dipindahkan ke rekonstruktor untuk ditingkatkan.
+block.naval-factory.description = Memproduksi unit laut. Hasil unit dapat digunakan secara langsung, atau dipindahkan ke rekonstruktor untuk ditingkatkan.
+block.additive-reconstructor.description = Meningkatkan unit di dalamnya menjadi tingkat dua.
+block.multiplicative-reconstructor.description = Meningkatkan unit di dalamnya menjadi tingkat tiga.
+block.exponential-reconstructor.description = Meningkatkan unit di dalamnya menjadi tingkat empat.
+block.tetrative-reconstructor.description = Meningkatkan unit di dalamnya menjadi tingkat lima dan terakhir.
+block.switch.description = Sakelar yang dapat dialihkan. Status dapat dibaca dan dikendalikan dengan prosesor logika.
+block.micro-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan.
+block.logic-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. Lebih cepat dibandingkan prosesor mikro.
+block.hyper-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. Lebih cepat dibandingkan prosesor logika.
+block.memory-cell.description = Menyimpan informasi untuk prosesor.
+block.memory-bank.description = Menyimpan informasi untuk prosesor. Berkapasitas besar.
+block.logic-display.description = Menampilkan grafik sembarang dari prosesor.
+block.large-logic-display.description = Menampilkan grafik sembarang dari prosesor. Lebih besar.
+block.interplanetary-accelerator.description = Sebuah menara railgun elektromagnetik raksasa. Meluncurkan Inti dengan kecepatan tinggi untuk peluncuran antarplanet.
+block.repair-turret.description = Memulihkan unit terdekat yang sekarat dalam jangkauan secara terus-menerus. Dapat menerima pendingin (Opsional).
+
+#Erekir
+block.core-bastion.description = Inti markas. Terlindungi. Jika hancur, sektor jatuh ke tangan musuh.
+block.core-citadel.description = Inti markas. Sangat terlindungi. Menyimpan lebih banyak sumber daya dari pada Inti Bastion.
+block.core-acropolis.description = Inti markas. Sangat amat terlindungi. Menyimpan lebih banyak sumber daya dari pada Inti Citadel.
+block.breach.description = Menembakkan amunisi yang menusuk ke arah musuh.
+block.diffuse.description = Menembakkan semburan peluru dalam kerucut yang lebar. Mendorong musuh kebelakang.
+block.sublimate.description = Menembakkan pancaran api terus menerus ke arah musuh. Menembus pelindung.
+block.titan.description = Menembakkan peluru artileri eksplosif besar ke target darat. Membutuhkan hidrogen.
+block.afflict.description = Menembakkan bola anti-peluru fragmentaris bermuatan besar. Membutuhkan pemanasan.
+block.disperse.description = Menembakkan semburan anti-peluru ke target udara.
+block.lustre.description = Menembakkan laser target tunggal yang bergerak lambat ke arahmusuh.
+block.scathe.description = Meluncurkan rudal yang kuat ke target darat dalam jarak yang sangat jauh.
+block.smite.description = Menembakan semburan peluru yang menusuk dan menyambar.
+block.malign.description = Menembakkan rentetan muatan laser pelacak ke target musuh. Membutuhkan pemanasan ekstensif.
+block.silicon-arc-furnace.description = Memurnikan silikon dari pasir dan grafit.
+block.oxidation-chamber.description = Mengubah berilium dan ozon menjadi oksida. Memancarkan panas sebagai produk sampingan.
+block.electric-heater.description = Pemanas yang menghadap ke arah blok. Membutuhkan daya yang besar.
+block.slag-heater.description = Pemanas yang menghadap ke arah blok. Membutuhkan lava.
+block.phase-heater.description = Pemanas yang menghadap ke arah blok. Membutuhkan phase fabric.
+block.heat-redirector.description = Mengalihkan akumulasi panas ke blok lain.
+block.small-heat-redirector.description = Mengalihkan akumulasi panas ke blok lain.
+block.heat-router.description = Menyebarkan akumulasi panas ke tiga arah.
+block.electrolyzer.description = Mengubah air menjadi gas hidrogen dan ozon.
+block.atmospheric-concentrator.description = Mengkonsentrasikan nitrogen dari atmosfer. Membutuhkan panas.
+block.surge-crucible.description = Membentuk Paduan Logam dari lava dan silikon. Membutuhkan panas.
+block.phase-synthesizer.description = Mensintesis phase fabric dari torium, pasir, dan ozon. Membutuhkan panas.
+block.carbide-crucible.description = Memadukan grafit dan tungsten menjadi karbida. Membutuhkan panas.
+block.cyanogen-synthesizer.description = Mensintesis sianogen dari arkisit dan grafit. Membutuhkan panas.
+block.slag-incinerator.description = Membakar benda atau cairan yang tidak mudah menguap. Membutuhkan lava.
+block.vent-condenser.description = Mengondensasi gas ventilasi ke dalam air. Membutuhkan tenaga.
+block.plasma-bore.description = Saat ditempatkan menghadap dinding bijih, mengeluarkan bahan tanpa batas. Membutuhkan daya dalam jumlah kecil.
+block.large-plasma-bore.description = Bor plasma yang lebih besar. Mampu menambang tungsten dan torium. Membutuhkan hidrogen dan tenaga.
+block.cliff-crusher.description = Menghancurkan dinding, mengeluarkan pasir tanpa batas. Membutuhkan tenaga. Efisiensi bervariasi berdasarkan jenis dinding.
+block.large-cliff-crusher.description = Menghancurkan dinding, mengeluarkan pasir tanpa batas. Membutuhkan tenaga dan ozon. Efisiensi bervariasi berdasarkan jenis dinding. Gunakan Tungsten untuk meningkatkan efisiensi (Opsional).
+block.impact-drill.description = Saat ditempatkan pada bijih, mengeluarkan bahan dalam ledakan tanpa batas. Membutuhkan listrik dan air.
+block.eruption-drill.description = Bor tumbukan yang ditingkatkan. Mampu menambang torium. Membutuhkan hidrogen.
+block.reinforced-conduit.description = Memindahkan cairan ke depan. Tidak menerima masukkan ke samping.
+block.reinforced-liquid-router.description = Mendistribusikan cairan secara merata ke semua sisi.
+block.reinforced-liquid-tank.description = Menyimpan sejumlah besar cairan.
+block.reinforced-liquid-container.description = Menyimpan jumlah cairan yang cukup besar.
+block.reinforced-bridge-conduit.description = Memindahkan cairan melintasi medan dan bangunan
+block.reinforced-pump.description = Memompa dan mengeluarkan cairan. Membutuhkan hidrogen.
+block.beryllium-wall.description = Melindungi bangunan dari proyektil musuh.
+block.beryllium-wall-large.description = Melindungi bangunan dari proyektil musuh.
+block.tungsten-wall.description = Melindungi bangunan dari proyektil musuh.
+block.tungsten-wall-large.description = Melindungi bangunan dari proyektil musuh.
+block.carbide-wall.description = Melindungi bangunan dari proyektil musuh.
+block.carbide-wall-large.description = Melindungi bangunan dari proyektil musuh.
+block.reinforced-surge-wall.description = Melindungi bangunan dari proyektil musuh, melepaskan listrik secara berkala saat proyektil mengenai dinding.
+block.reinforced-surge-wall-large.description = Melindungi bangunan dari proyektil musuh, melepaskan listrik secara berkala saat proyektil mengenai dinding.
+block.shielded-wall.description = Melindungi bangunan dari proyektil musuh. Menyebarkan perisai yang menyerap sebagian besar proyektil saat daya tersedia. Menghantarkan tenaga.
+block.blast-door.description = Dinding yang terbuka ketika unit darat sekutu berada dalam jangkauan. Tidak dapat dikontrol secara manual.
+block.duct.description = Memindahkan barang ke depan. Hanya mampu menyimpan satu barang.
+block.armored-duct.description = Memindahkan barang ke depan. Tidak menerima masukan dari samping.
+block.duct-router.description = Mendistribusikan barang secara merata ke tiga arah. Hanya menerima barang dari sisi belakang. Dapat dikonfigurasi sebagai penyortir barang.
+block.overflow-duct.description = Hanya mengeluarkan barang ke samping jika jalur depan diblokir.
+block.duct-bridge.description = Memindahkan barang di atas medan dan bangunan
+block.duct-unloader.description = Membongkarkan barang yang dipilih dari blok di belakangnya. Tidak dapat membongkar dari inti.
+block.underflow-duct.description = Kebalikan dari pipa luapan. Mengeluarkan barang ke depan jika jalur kiri dan kanan terblokir.
+block.reinforced-liquid-junction.description = Bertindak sebagai persimpangan antara dua saluran penyeberangan.
+block.surge-conveyor.description = Memindahkan barang secara berkelompok. Dapat dipercepat dengan tenaga. Menghantarkan tenaga.
+block.surge-router.description = Mendistribusikan barang secara merata ke tiga arah dari konveyor lonjakan. Dapat dipercepat dengan tenaga. Menghantarkan tenaga.
+block.unit-cargo-loader.description = Membuat unit kargo. Unit kargo secara otomatis mendistribusikan barang ke titik bongkar muatan unit kargo dengan filter yang cocok.
+block.unit-cargo-unload-point.description = Bertindak sebagai titik bongkar muatan unit kargo. Menerima barang yang cocok dengan filter yang dipilih.
+block.beam-node.description = Mentransmisikan daya ke blok lain secara ortogonal. Menyimpan sejumlah kecil daya.
+block.beam-tower.description = Mentransmisikan daya ke blok lain secara ortogonal. Menyimpan sejumlah besar daya. Jarak jauh.
+block.turbine-condenser.description = Menghasilkan tenaga ketika ditempatkan pada ventilasi. Menghasilkan sedikit air.
+block.chemical-combustion-chamber.description = Menghasilkan tenaga dari arkisit dan ozon.
+block.pyrolysis-generator.description = Menghasilkan tenaga dalam jumlah besar dari arkisit dan lava. Menghasilkan air sebagai produk sampingan.
+block.flux-reactor.description = Menghasilkan daya dalam jumlah besar ketika dipanaskan. Membutuhkan sianogen sebagai penstabil. Daya yang dihasilkan dan kebutuhan sianogen sebanding dengan panas yang masuk.\nMeledak jika sianogen yang disediakan tidak mencukupi.
+block.neoplasia-reactor.description = Menggunakan arkisit, air, dan phase fabric untuk menghasilkan daya dalam jumlah besar. Menghasilkan panas dan neoplasma yang berbahaya sebagai produk sampingan.\nMeledak hebat jika neoplasma tidak dikeluarkan dari reaktor melalui saluran.
+block.build-tower.description = Secara otomatis membangun kembali bangunan dalam jangkauan dan membantu unit lain dalam konstruksi.
+block.regen-projector.description = Perlahan memperbaiki bangunan sekutu di perimeter persegi. Membutuhkan hidrogen. Gunakan phase fabric untuk meningkatkan efisiensi (Opsional).
+block.reinforced-container.description = Menyimpan sejumlah kecil barang. Isi kontainer dapat diambil melalui pembongkaran. Tidak dapat meningkatkan kapasitas penyimpanan inti.
+block.reinforced-vault.description = Menyimpan sejumlah besar barang. Isi gudang dapat diambil melalui pembongkaran. Tidak dapat meningkatkan kapasitas penyimpanan inti.
+block.tank-fabricator.description = Membangun unit Stell. Unit dapat digunakan secara langsung, atau dipindahkan ke pabrikator ulang untuk ditingkatkan.
+block.ship-fabricator.description = Membangun unit Elude. Unit dapat digunakan secara langsung, atau dipindahkan ke pabrikator ulang untuk ditingkatkan.
+block.mech-fabricator.description = Membangun unit Merui. Unit dapat digunakan secara langsung, atau dipindahkan ke pabrikator ulang untuk ditingkatkan.
+block.tank-assembler.description = Merakit Unit Tank besar dari blok dan unit yang dimasukkan. Tingkat keluaran dapat ditingkatkan dengan menambahkan modul.
+block.ship-assembler.description = Merakit Unit Kapal besar dari blok dan unit yang dimasukkan. Tingkat keluaran dapat ditingkatkan dengan menambahkan modul.
+block.mech-assembler.description = Merakit Unit Mech besar dari blok dan unit yang dimasukkan. Tingkat keluaran dapat ditingkatkan dengan menambahkan modul.
+block.tank-refabricator.description = Meningkatkan unit tank yang dimasukkan ke tingkat kedua.
+block.ship-refabricator.description = Meningkatkan unit kapal yang dimasukkan ke tingkat kedua.
+block.mech-refabricator.description = Meningkatkan unit mech yang dimasukkan ke tingkat kedua.
+block.prime-refabricator.description = Meningkatkan unit yang dimasukkan ke tingkat ketiga.
+block.basic-assembler-module.description = Meningkatkan tingkat perakit ketika ditempatkan di sebelah batas konstruksi. Membutuhkan tenaga. Dapat digunakan sebagai penerima muatan.
+block.small-deconstructor.description = Mendekonstruksi bangunan dan unit yang dimasukkan. Mengembalikan 100% biaya pembangunan.
+block.reinforced-payload-conveyor.description = Memindahkan muatan ke depan.
+block.reinforced-payload-router.description = Mendistribusikan muatan ke blok yang berdekatan. Berfungsi sebagai penyortir ketika filter disetel.
+block.payload-mass-driver.description = Struktur transportasi muatan jarak jauh. Menembak muatan ke penembak muatan massal yang terhubung.
+block.large-payload-mass-driver.description = Struktur transportasi muatan jarak jauh. Menembak muatan ke penembak muatan massal yang terhubung.
+block.unit-repair-tower.description = Memulihkan semua unit di sekitarnya. Membutuhkan ozon.
+block.radar.description = Secara bertahap mengungkap medan dan unit musuh dalam radius besar. Membutuhkan tenaga.
+block.shockwave-tower.description = Merusak dan menghancurkan proyektil musuh dalam radius. Membutuhkan sianogen.
+block.canvas.description = Menampilkan gambar sederhana dengan palet yang telah ditentukan sebelumnya. Dapat diedit.
+
+unit.dagger.description = Menembak musuh terdekat dengan amunisi standar.
+unit.mace.description = Menyerang musuh terdekat dengan cara membakarnya.
+unit.fortress.description = Menembak musuh darat dengan artileri jarak jauh.
+unit.scepter.description = Menembak semua musuh terdekat dengan rentetan peluru bermuatan listrik.
+unit.reign.description = Menembak semua musuh terdekat dengan rentetan peluru tajam dalam jumlah banyak.
+unit.nova.description = Menembak baut laser yang dapat merusak musuh dan memperbaiki bangunan sekutu. Dapat terbang.
+unit.pulsar.description = Menembak petir yang dapat merusak musuh dan memperbaiki bangunan sekutu. Dapat terbang.
+unit.quasar.description = Menembak sinar laser yang dapat menembus bangunan yang dapat merusak musuh dan memperbaiki bangunan sekutu. Dapat terbang. Memiliki perisai.
+unit.vela.description = Menembak sinar laser besar secara terus menerus yang dapat merusak musuh, membakarnya dan memperbaiki bangunan sekutu. Dapat terbang.
+unit.corvus.description = Menembak sinar laser besar yang dapat merusak musuh dan memperbaiki bangunan sekutu. Dapat berjalan diatas hampir semua medan.
+unit.crawler.description = Berlari menuju musuh dan menghancurkan dirinya, yang dapat menghasilkan ledakan besar.
+unit.atrax.description = Menembak musuh dengan cairan lava kepada target darat. Dapat berjalan diatas hampir semua medan.
+unit.spiroct.description = Menembak laser pelemah kepada musuh, dapat memperbaiki dirinya dalam proses. Dapat berjalan diatas hampir semua medan.
+unit.arkyid.description = Menembak laser pelemah besar kepada musuh, dapat memperbaiki dirinya dalam proses. Dapat berjalan diatas hampir semua medan.
+unit.toxopid.description = Menembak gugusan peluru listrik besar dan laser penusuk kepada musuh. Dapat berjalan diatas hampir semua medan.
+unit.flare.description = Menembak musuh darat terdekat dengan amunisi standar.
+unit.horizon.description = Menjatuhkan gugusan bom kepada musuh darat.
+unit.zenith.description = Menembak misil kepada musuh terdekat.
+unit.antumbra.description = Menembak rentetan peluru kepada musuh terdekat.
+unit.eclipse.description = Menembak dua sinar laser dan rentetan peluru kepada musuh terdekat.
+unit.mono.description = Menambang tembaga dan timah secara otomatis, menyimpannya ke dalam inti.
+unit.poly.description = Membangun kembali bangunan yang hancur secara otomatis dan membantu unit lain dalam pembangunan.
+unit.mega.description = Memperbaiki bangunan secara otomatis. Dapat membawa bangunan dan unit darat kecil.
+unit.quad.description = Menjatuhkan bom besar kepada target darat, yang bisa memberbaiki bangunan sekutu dan merusak musuh. Dapat membawa unit darat berukuran sedang.
+unit.oct.description = Melindungi sekutu di sekitarnya dengan perisai yang dapat beregenerasi. Dapat membawa hampir semua unit darat.
+unit.risso.description = Menembak rentetan misil dan peluru kepada semua musuh terdekat.
+unit.minke.description = Menembak cangkang pembakar dan peluru standar kepada musuh darat terdekat.
+unit.bryde.description = Menembak artileri jarak jauh dan misil kepada musuh.
+unit.sei.description = Menembak rentetan misil dan peluru yang dapat menembus pelindung kepada musuh.
+unit.omura.description = Menembak senapan rel jarak jauh penembus kepada musuh. Dapat memproduksi unit Flare.
+unit.alpha.description = Melindungi Inti Shard dari musuh. Dapat membangun struktur.
+unit.beta.description = Melindungi Inti Foundation dari musuh. Dapat membangun struktur.
+unit.gamma.description = Melindungi Inti Nucleus dari musuh. Dapat membangun struktur.
+unit.retusa.description = Menembak torpedo pelacak. Memperbaiki unit sekutu.
+unit.oxynoe.description = Menembak aliran api pada musuh terdekat. Menargetkan proyektil musuh terdekat dengan titik menara pertahanan.
+unit.cyerce.description = Menembak misil yang membidik otomatis secara beruntun pada musuh. Memperbaiki unit sekutu.
+unit.aegires.description = Mengkejutkan semua bangunan dan unit musuh yang ada di dalam medan energi. Memperbaiki seluruh unit sekutu.
+unit.navanax.description = Menembak proyektil elektromagnetik yang meledak, memberikan kerusakan yang signifikan pada jaringan tenaga musuh dan memperbaiki bangunan sekutu. Melelehkan musuh terdekat dengan 4 menara laser secara otomatis.
+
+#Erekir
+unit.stell.description = Menembak peluru standar pada musuh.
+unit.locus.description = Menembak peluru bergantian pada musuh.
+unit.precept.description = Menembak gugusan peluru penusuk pada musuh.
+unit.vanquish.description = Menembak peluru penusuk pemisahan besar pada musuh.
+unit.conquer.description = Menembak peluru penusuk besar yang berpancar pada musuh.
+unit.merui.description = Menembak artileri jarak jauh pada musuh di darat. Dapat melewati berbagai dataran.
+unit.cleroi.description = Menembak peluru ganda pada musuh. Menargetkan proyektil musuh terdekat dengan titik menara pertahanan. Dapat melewati berbagai dataran.
+unit.anthicus.description = Menembak misil pelacak jarak jauh pada musuh. Dapat melewati berbagai dataran.
+unit.tecta.description = Menembak misil plasma pelacak pada musuh. Melindungi diri sendiri dengan perisai searah. Dapat melewati berbagai dataran.
+unit.collaris.description = Menembak pecahan artileri jarak jauh pada musuh. Dapat melewati berbagai dataran.
+unit.elude.description = Menembak sepasang peluru pelacak pada musuh. Dapat melayang diatas permukaan cairan.
+unit.avert.description = Menembak sepasang peluru yang memutar pada musuh.
+unit.obviate.description = Menembak sepasang bola listrik yang memutar pada musuh.
+unit.quell.description = Menembak misil pelacak jarak jauh pada musuh. Menahan bangunan perbaikan musuh.
+unit.disrupt.description = Menembak misil pelacak penekanan jarak jauh pada musuh. Menahan bangunan perbaikan musuh.
+unit.evoke.description = Membangun struktur untuk melindungi Inti Bastion. Memperbaiki bangunan dengan sebuah sinar. Dapat membawa bangunan hingga ukuran 2x2.
+unit.incite.description = Membangun struktur untuk melindungi Inti Citadel. Memperbaiki bangunan dengan sebuah sinar. Dapat membawa bangunan hingga ukuran 2x2.
+unit.emanate.description = Membangun struktur untuk melindungi Inti Acropolis. Memperbaiki bangunan dengan sebuah sinar. Dapat membawa bangunan hingga ukuran 2x2
+
+lst.read = Membaca angka dari memori sel yang dihubungkan.
+lst.write = Menulis angka ke memori sel yang dihubungkan.
+lst.print = Menambahkan teks ke daftar cetak.\nTidak dapat menampilkan apapun sampai [accent]Print Flush[] dipakai.
+lst.printchar = Tambahkan karakter UTF-16 atau ikon konten ke buffer cetak.\nTidak menampilkan apa pun sampai [accent]Print Flush[] digunakan.
+lst.format = Ganti placeholder berikutnya di buffer teks dengan sebuah nilai.\nTidak melakukan apa pun jika pola placeholder tidak valid.\nPola placeholder: "{[accent]nomor 0-9[]}"\nContoh:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Menambahkan perintah ke daftar gambar.\nTidak dapat menampilkan apapun sampai [accent]Draw Flush[] dipakai.
+lst.drawflush = Mengeluarkan perintah [accent]Draw[] dari daftar antrean untuk ditampilkan.
+lst.printflush = Mengeluarkan perintah [accent]Print[] dari daftar antrean untuk blok pesan.
+lst.getlink = Dapatkan tautan prosesor dengan indeks. Dimulai dari 0.
+lst.control = Mengendalikan bangunan.
+lst.radar = Mendeteksi unit di sekitar bangunan dalam jarak.
+lst.sensor = Mengambil data dari bangunan atau unit.
+lst.set = Menentukan sebuah variabel.
+lst.operation = Melakukan operasi pada 1-2 variabel.
+lst.end = Loncati ke awal dari tumpukan perintah.
+lst.wait = Memberi jeda dalam detik yang ditentukan.
+lst.stop = Menghentikan eksekusi dari prosesor ini.
+lst.lookup = Mencari tipe barang/cairan/unit/blok dengan ID.\nJumlah hitungan dari setiap tipe dapat dilihat dengan:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Loncati secara bersyarat ke pernyataan berikutnya.
+lst.unitbind = Menautkan ke unit jenis berikutnya, dan menyimpannya di [accent]@unit[].
+lst.unitcontrol = Mengendalikan unit yang saat ini dihubungkan.
+lst.unitradar = Mendeteksi unit lain di sekitar unit yang saat ini dihubungkan.
+lst.unitlocate = Mendeteksi sebuah tipe tertentu dari posisi/bangunan di mana saja di peta.\nMembutuhkan unit yang dihubungkan.
+lst.getblock = Mendapatkan data ubin di lokasi manapun.
+lst.setblock = Menentukan data ubin di lokasi manapun.
+lst.spawnunit = Munculkan unit pada tempat yang ditentukan.
+lst.applystatus = Menerapkan atau menghapus status efek dari sebuah unit.
+lst.weathersense = Periksa apakah jenis cuaca aktif.
+lst.weatherset = Tetapkan suatu keadaan pada jenis cuaca saat ini.
+lst.spawnwave = Simulasikan adanya gelombang pada lokasi acak.\nTidak akan ditambahkan pada jumlah gelombang keseluruhan.
+lst.explosion = Membuat sebuah ledakan pada lokasi yang ditentukan.
+lst.setrate = Menentukan kecepatan eksekusi prosesor dalam instruksi per tick.
+lst.fetch = Mencari unit, inti, pemain atau bangunan dari indeks.\nIndeks dimulai dari 0 dan berakhir pada jumlah yang dikembalikan.
+lst.packcolor = Memadatkan [0, 1] komponen RGBA menjadi satu angka untuk menggambar atau rule-setting.
+lst.setrule = Menentukan suatu peraturan permainan.
+lst.flushmessage = Tampilkan sebuah pesan di layar dari antrian teks.\nAkan menunggu hingga pesan sebelumnya selesai.
+lst.cutscene = Mengendalikan kamera pemain.
+lst.setflag = Menentukan global flag yang dapat dibaca oleh semua prosesor.
+lst.getflag = Periksa apakah ada global flag yang ditentukan.
+lst.setprop = Menetapkan properti unit atau bangunan.
+lst.effect = Buat efek partikel.
+lst.sync = Sinkronkan variabel di seluruh jaringan.\nHanya dipanggil paling banyak 10 kali per detik.
+lst.playsound = Memutar suara. \nVolume dan kontrol suara dapat berupa nilai global, atau dihitung berdasarkan posisi.
+lst.makemarker = Buat penanda logika baru di dunia.\nSebuah ID untuk mengidentifikasi penanda ini harus disediakan.\nPenanda saat ini dibatasi hingga 20.000 per dunia.
+lst.setmarker = Tetapkan properti untuk penanda.\nID yang digunakan harus sama dengan instruksi Membuat Marker.
+lst.localeprint = Tambahkan nilai properti peta lokal ke buffer teks.\nUntuk menyetel paket peta lokal di penyunting peta, cek [accent]Info Peta > Paket Lokal[].\nJika klien adalah perangkat seluler, coba cetak properti yang diakhiri dengan ".mobile" terlebih dahulu.
+
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = Konstan matematikal pi (3.141...)
+lglobal.@e = Konstan matematikal e (2.718...)
+lglobal.@degToRad = Mengalikan dengan angka ini untuk mengubah derajat ke radian
+lglobal.@radToDeg = Mengalikan dengan angka ini untuk mengubah radian ke derajat
+
+lglobal.@time = Waktu main dari simpanan saat ini, dalam milidetik
+lglobal.@tick = Waktu main dari simpanan saat ini, dalam tick (1 detik = 60 tick)
+lglobal.@second = Waktu main dari simpanan saat ini, dalam detik
+lglobal.@minute = Waktu main dari simpanan saat ini, dalam menit
+lglobal.@waveNumber = Angka gelombang saat ini, jika gelombang diaktifkan
+lglobal.@waveTime = Pewaktu hitung mundur untuk gelombang, dalam detik
+lglobal.@mapw = Lebar peta, dalam ubin.
+lglobal.@maph = Tinggi peta, dalam ubin.
+
+lglobal.sectionMap = Peta
+lglobal.sectionGeneral = Umum
+lglobal.sectionNetwork = Jaringan/Sisi-klien [Hanya Prosesor Dunia]
+lglobal.sectionProcessor = Prosesor
+lglobal.sectionLookup = Pencarian
+
+lglobal.@this = Blok logika yang mengeksekusi suatu kode
+lglobal.@thisx = Koordinat X dari blok yang mengeksekusi suatu kode
+lglobal.@thisy = Koordinat Y dari blok yang mengeksekusi suatu kode
+lglobal.@links = Jumlah total blok yang ditautkan ke prosesor ini
+lglobal.@ipt = Kecepatan eksekusi dari prosesor dalam intruksi per tick (60 tick = 1 detik)
+
+lglobal.@unitCount = Jumlah total dari tipe pada konten unit di dalam game; digunakan dengan intruksi pencarian
+lglobal.@blockCount = Jumlah total dari tipe pada konten blok di dalam game; digunakan dengan intruksi pencarian
+lglobal.@itemCount = Jumlah total dari tipe pada konten item di dalam game; digunakan dengan intruksi pencarian
+lglobal.@liquidCount = Jumlah total dari tipe pada konten cairan di dalam game; digunakan dengan intruksi pencarian
+
+lglobal.@server = True jika kode dijalankan di server atau di singleplayer, false sebaliknya
+lglobal.@client = True jika kode dijalankan dalam sebuah klien disambungkan ke sebuah server
+
+lglobal.@clientLocale = Lokalisasi pada klien yang menjalankan suatu kode. Untuk contoh: en_US
+lglobal.@clientUnit = Unit pada klien yang menjalankan suatu kode
+lglobal.@clientName = Nama player pada klien yang menjalankan suatu kode
+lglobal.@clientTeam = ID Tim pada klien yang menjalankan suatu kode
+lglobal.@clientMobile = True jika kode dijalankan di server atau di singleplayer, false sebaliknya
+
+logic.nounitbuild = [red]Logika unit membangun tidak diizinkan.
+
+lenum.type = Bentuk dari bangunan/unit.\nMisalnya, untuk blok pengarah masa, akan tampil sebagai [accent]@router[].\nBukan string.
+lenum.shoot = Menembak pada suatu posisi yang ditentukan.
+lenum.shootp = Menembak pada unit/bangunan dengan prediksi kecepatan.
+lenum.config = Pengaturan bangunan, misalnya menyortir barang.
+lenum.enabled = Menentukan aktif tidaknya suatu blok.
+
+laccess.currentammotype = Bahan amunisi/cairan menara saat ini.
+laccess.color = Warna lampu.
+laccess.controller = Pengendali unit. Jika dikendalikan prosesor, mengembalikan prosesor.\nJika unit dalam barisan, mengembalikan leader.\nSebaliknya, mengembalikan unit itu sendiri.
+laccess.dead = Menentukan apakah unit/bangunan itu hancur atau tidak ada lagi.
+laccess.controlled = Mengembalikan:\n[accent]@ctrlProcessor[] bila pengendali unit adalah prosesor\n[accent]@ctrlPlayer[] bila pengendali unit/bangunan adalah pemain\n[accent]@ctrlFormation[] bila unit dalam formasi\nSebaliknya, 0.
+laccess.progress = Memeriksa hasil kemajuan, 0 sampai 1.\nMengembalikan hasil laju produksi, pengisian ulang menara atau pembangunan.
+laccess.speed = Kecepatan tertinggi dari suatu unit, dalam ubin/detik.
+laccess.id = ID suatu unit/blok/bahan/cairan.\nIni adalah kebalikan dari operasi pencarian.
+
+lcategory.unknown = Tak Diketahui
+lcategory.unknown.description = Instruksi tanpa kategori.
+lcategory.io = Input & Output
+lcategory.io.description = Ubah isi dari blok memori dan buffer prosesor.
+lcategory.block = Kontrol Blok
+lcategory.block.description = Interaksi dengan blok.
+lcategory.operation = Operasi
+lcategory.operation.description = Operasi logikal.
+lcategory.control = Kontrol Aliran
+lcategory.control.description = Mengatur eksekusi perintah.
+lcategory.unit = Kontrol Unit
+lcategory.unit.description = Memberikan perintah kepada unit.
+lcategory.world = Dunia
+lcategory.world.description = Kendalikan bagaimana dunia berjalan.
+
+graphicstype.clear = Mengisi tampilan dangan warna.
+graphicstype.color = Menentukan warna untuk operasi mengambar selanjutnya.
+graphicstype.col = Setara dengan color, namun dikemas.\nWarna yang dikemas ditulis dalam kode hex dengan awalan [accent]%[].\nContoh: [accent]%ff0000[] akan menjadi warna merah.
+graphicstype.stroke = Menentukan lebar garis.
+graphicstype.line = Menggambar segmen garis.
+graphicstype.rect = Mengisi sebuah persegi panjang.
+graphicstype.linerect = Menggambar sebuah garis persegi panjang.
+graphicstype.poly = Mengisi sebuah poligon beraturan.
+graphicstype.linepoly = Menggambar sebuah garis poligon beraturan.
+graphicstype.triangle = Mengisi sebuah segitiga.
+graphicstype.image = Membentuk sebuah gambar dari suatu konten.\nMisal: [accent]@router[] atau [accent]@dagger[].
+graphicstype.print = Mengambar teks dari buffer cetak.\nHanya karakter ASCII yang diperbolehkan.\nMenghapus buffer cetak.
+
+lenum.always = Selalu benar.
+lenum.idiv = Pembagian integer.
+lenum.div = Pembagian.\nMengembalikan [accent]null[] pada pembagian dengan nol.
+lenum.mod = Modulus.
+lenum.equal = Kesetaraan. Mengonversikan tipe.\nObjek bukan nol dibandingkan dengan angka menjadi 1, jika tidak 0.
+lenum.notequal = Kesetaraan tanpa jenis pemaksaan. Mengonversikan tipe.
+lenum.strictequal = Kesetaraan dengan jenis pemaksaan. Tidak mengonversikan tipe.\nDapat digunakan untuk memeriksa [accent]null[].
+lenum.shl = Bit-shift kiri.
+lenum.shr = Bit-shift kanan.
+lenum.or = Bitwise OR.
+lenum.land = Logika AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+
+lenum.min = Minimum dari dua angka.
+lenum.max = Maksimum dari dua angka.
+lenum.angle = Sudut vektor dalam derajat.
+lenum.anglediff = Jarak mutlak antara dua sudut dalam derajat.
+lenum.len = Panjang vektor.
+
+lenum.sin = Sinus, dalam derajat.
+lenum.cos = Kosinus, dalam derajat.
+lenum.tan = Tangen, dalam derajat.
+
+lenum.asin = Arc sinus, dalam derajat.
+lenum.acos = Arc kosinus, dalam derajat.
+lenum.atan = Arc tangen, dalam derajat.
+
+#bukan typo, lihat 'daerah hasil fungsi'
+lenum.rand = Angka acak dalam jarak [0, value).
+lenum.log = Logaritma natural (ln).
+lenum.log10 = Logaritma basis 10.
+lenum.noise = Kebisingan simpleks 2D.
+lenum.abs = Nilai absolut.
+lenum.sqrt = Akar kuadrat.
+
+lenum.any = Unit apapun.
+lenum.ally = Unit sekutu.
+lenum.attacker = Unit dengan senjata.
+lenum.enemy = Unit musuh.
+lenum.boss = Unit penjaga.
+lenum.flying = Unit terbang.
+lenum.ground = Unit darat.
+lenum.player = Unit yang dikendalikan oleh pemain.
+
+lenum.ore = Bahan tambang.
+lenum.damaged = Bangunan sekutu yang rusak.
+lenum.spawn = Titik mendaratnya musuh.\nDapat berupa inti atau suatu posisi.
+lenum.building = Bangunan dalam suatu kumpulan.
+
+lenum.core = Inti apapun.
+lenum.storage = Bangunan penyimpanan, misalnya gudang.
+lenum.generator = Bangunan yang menghasilkan tenaga.
+lenum.factory = Bangunan yang mengubah sumber daya.
+lenum.repair = Tempat perbaikan.
+lenum.battery = Baterai apapun.
+lenum.resupply = Titik pemasok ulang.\nHanya berguna ketika [accent]"Amunisi Unit"[] dihidupkan.
+lenum.reactor = Reaktor Benturan/Torium.
+lenum.turret = Menara apapun.
+
+sensor.in = Bangunan/unit yang akan dilacak.
+
+radar.from = Bangunan yang akan dilacak.\nJarak pelacakan dibatasi oleh jarak bangunan.
+radar.target = Saringan untuk unit yang akan dilacak.
+radar.and = Penyaring tambahan.
+radar.order = Menyortir perintah. 0 untuk memutar balik.
+radar.sort = Metrik untuk mengurutkan hasil.
+radar.output = Variabel untuk menuliskan perintah unit.
+
+unitradar.target = Saringan untuk unit yang akan dilacak.
+unitradar.and = Penyaring tambahan.
+unitradar.order = Menyortir perintah. 0 untuk memutar balik.
+unitradar.sort = Metrik untuk mengurutkan hasil.
+unitradar.output = Variabel untuk menuliskan perintah unit.
+
+control.of = Bangunan yang akan dikendalikan.
+control.unit = Unit/bangunan yang akan ditargetkan.
+control.shoot = Menentukan apakah akan menembak.
+
+unitlocate.enemy = Menentukan apakah akan menemukan bangunan musuh.
+unitlocate.found = Menentukan ditemukannya objek tersebut.
+unitlocate.building = Mengeluarkan variabel untuk bangunan yang terlihat.
+unitlocate.outx = Mengeluarkan koordinat X.
+unitlocate.outy = Mengeluarkan koordinat Y.
+unitlocate.group = Kumpulan bangunan yang akan dicari.
+
+playsound.limit = Jika benar, cegah suara ini diputar \njika sudah diputar pada frame yang sama.
+
+lenum.idle = Tidak bergerak, namun tetap membangun/menambang.\nSifat awalan.
+lenum.stop = Berhenti bergerak/menambang/membangun.
+lenum.unbind = Mematikan kendali logika.\nLanjutkan A.I. standar.
+lenum.move = Bergerak ke posisi yang ditentukan.
+lenum.approach = Mendekati posisi dalam radius.
+lenum.pathfind = Mencari arah ke tempat pendaratan musuh.
+lenum.autopathfind = Secara otomatis menemukan jalur ke inti atau zona pendaratan musuh terdekat.\nIni sama dengan pathfinding musuh pada gelombang standar.
+lenum.target = Menembak pada posisi.
+lenum.targetp = Menembak target dengan perkiraan kecepatan.
+lenum.itemdrop = Menjatuhkan bahan.
+lenum.itemtake = Mengambil bahan dari suatu bangunan.
+lenum.paydrop = Menurunkan muatan yang ada.
+lenum.paytake = Membawa muatan pada lokasi ini.
+lenum.payenter = Masuk/mendarat pada blok muatan yang saat ini unit sedang berdiri.
+lenum.flag = Tanda numerik unit.
+lenum.mine = Menambang pada sebuah posisi.
+lenum.build = Membangun sebuah struktur.
+lenum.getblock = Ambil tipe bangunan, lantai dan blok pada koordinat.\nUnit harus berada dalam jangkauan posisinya, jika tidak maka null akan dikembalikan.
+lenum.within = Memeriksa apakah unit di dekat suatu posisi.
+lenum.boost = Mulai/berhenti pendorong.
+
+lenum.flushtext = Flush cetak konten buffer ke penanda, jika ada.\nJika pengambilan disetel ke true, coba ambil properti dari paket peta lokal atau paket game.
+lenum.texture = Nama tekstur langsung dari atlas tekstur game (menggunakan gaya penamaan kebab-case).\nJika printFlush disetel ke true, gunakan konten buffer teks sebagai argumen teks.
+lenum.texturesize = Ukuran tekstur pada ubin. Nilai nol mengskalakan lebar penanda ke ukuran tekstur asli.
+lenum.autoscale = Apakah akan menskalakan penanda sesuai dengan tingkat zoom pemain.
+lenum.posi = Posisi terindeks, digunakan untuk penanda garis dan segi empat dengan indeks nol sebagai posisi pertama.
+lenum.uvi = Posisi tekstur mulai dari nol hingga satu, digunakan untuk penanda segi empat.
+lenum.colori = Warna terindeks, digunakan untuk penanda garis dan segi empat dengan indeks nol sebagai warna pertama.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties
deleted file mode 100644
index 7c82ca930e..0000000000
--- a/core/assets/bundles/bundle_in_ID.properties
+++ /dev/null
@@ -1,1503 +0,0 @@
-credits.text = Diciptakan oleh [royal]Anuken[] - [sky]anukendev@gmail.com[]
-credits = Kredit
-contributors = Penerjemah dan Kontributor
-discord = Bergabung di Discord Mindustry!
-link.discord.description = Discord Mindustry Resmi 
-link.reddit.description = Subreddit Mindustry
-link.github.description = Sumber Kode Permainan
-link.changelog.description = Daftar Rekam Pembaruan
-link.dev-builds.description = Bentuk pengembangan (kurang stabil)
-link.trello.description = Papan Trello resmi untuk fitur terencana
-link.itch.io.description = Halaman itch.io dengan unduhan PC dan versi situs jaringan 
-link.google-play.description = Google Play Store
-link.f-droid.description = Daftar katalog F-Droid
-link.wiki.description = Wiki Mindustry resmi 
-link.suggestions.description = Saran fitur baru
-link.bug.description = Menemukan bug? Laporkan di sini
-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.
-gameover = Permainan Habis
-gameover.disconnect = Terputus
-gameover.pvp = Tim[accent] {0}[] menang!
-gameover.waiting = [accent]Menunggu peta selanjutnya...
-highscore = [accent]Rekor Baru!
-copied = Tersalin.
-indev.notready = Bagian tersebut saat ini belum siap
-indev.campaign = [accent]Selamat! Kamu telah mencapai batas dari kampanye![]\n\nHanya sejauh ini yang kamu bisa. Perjalanan antarplanet akan ditambahkan di masa mendatang.
-
-load.sound = Suara
-load.map = Peta
-load.image = Gambar
-load.content = Konten
-load.system = Sistem
-load.mod = Mod
-load.scripts = Skrip
-
-be.update = Versi Bleeding Edge terbaru tersedia:
-be.update.confirm = Unduh dan ulang kembali sekarang?
-be.updating = Memperbarui...
-be.ignore = Abaikan
-be.noupdates = Tidak ada pembaruan yang ditemukan.
-be.check = Cek versi baru
-
-mod.featured.title = Browser mod
-mod.featured.dialog.title = Browser Mod
-mods.browser.selected = Mod yang Dipilih
-mods.browser.add = Unduh Mod
-mods.github.open = Buka di GitHub
-
-schematic = Skema
-schematic.add = Menyimpan skema...
-schematics = Kumpulan skema
-schematic.replace = Skema dengan nama tersebut sudah ada. Ganti dengan yang baru?
-schematic.exists = Sebuah skema dengan nama tersebut sudah ada.
-schematic.import = Mengimpor skema...
-schematic.exportfile = Ekspor File
-schematic.importfile = Impor File
-schematic.browseworkshop = Cari di Workshop
-schematic.copy = Salin ke papan klip
-schematic.copy.import = Impor dari papan klip
-schematic.shareworkshop = Bagikan di Workshop
-schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Balik Skema
-schematic.saved = Skema telah disimpan.
-schematic.delete.confirm = Skema ini akan benar-benar dihapus.
-schematic.rename = Ganti nama Skema
-schematic.info = {0}x{1}, {2} blok
-schematic.disabled = [scarlet]Skema dilarang[]\nAnda tidak diperbolehkan untuk menggunakan skema di [accent]peta[] atau [accent]server ini.
-
-stats = Statistik
-stat.wave = Gelombang Terkalahkan:[accent] {0}
-stat.enemiesDestroyed = Musuh Terhancurkan:[accent] {0}
-stat.built = Jumlah Blok yang Dibangun:[accent] {0}
-stat.destroyed = Jumlah Blok Dihancurkan Musuh:[accent] {0}
-stat.deconstructed = Jumlah Blok Dihancurkan Pemain:[accent] {0}
-stat.delivered = Sumber Daya yang Diluncurkan:
-stat.playtime = Waktu Bermain:[accent] {0}
-stat.rank = Nilai Akhir: [accent]{0}
-
-globalitems = [accent]Item Global
-map.delete = Apakah Anda yakin ingin menghapus peta "[accent]{0}[]"?
-level.highscore = Nilai Tertinggi: [accent]{0}
-level.select = Pilih Level
-level.mode = Mode Permainan:
-coreattack = < Inti sedang diserang! >
-nearpoint = [[ [scarlet]TINGGALKAN TITIK JATUH SEGERA[] ]\npenghancuran akan terjadi
-database = Basis Data Inti
-savegame = Simpan Permainan
-loadgame = Muat Permainan
-joingame = Bermain Bersama
-customgame = Permainan Modifikasi
-newgame = Permainan Baru
-none = <kosong>
-minimap = Peta Kecil
-position = Posisi
-close = Tutup
-website = Situs Jaringan
-quit = Keluar
-save.quit = Simpan & Keluar
-maps = Peta
-maps.browse = Cari Peta
-continue = Lanjutkan
-maps.none = [lightgray]Peta tidak ditemukan!
-invalid = Tidak valid
-pickcolor = Pilih warna
-preparingconfig = Menyiapkan Konfigurasi
-preparingcontent = Menyiapkan Konten
-uploadingcontent = Mengunggah Konten
-uploadingpreviewfile = Mengunggah File Tinjauan
-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 mengakibatkan kerusakan[].\nLapor isu atau masalah di Github atau Discord Mindustry.
-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 = Muat Ulang
-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 = 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]Tidak cocok dengan V6 (minGameVersion: 105)
-mod.missingdependencies = [scarlet]Ketergantungan hilang: {0}
-mod.erroredcontent = [scarlet]Konten Mengalami Kesalahan
-mod.errors = Kesalahan terjadi disaat memuat konten.
-mod.noerrorplay = [scarlet]Anda memiliki mod dengan suatu kesalahan.[] Antara nonaktifkan modnya atau perbaiki kesalahan tersebut sebelum bermain.
-mod.nowdisabled = [scarlet]Mod '{0}' tidak memiliki ketergantungan:[accent] {1}\n[lightgray]Mod ini butuh untuk diunduh terlebih dahulu.\nMod ini akan dinonaktifkan secara otomatis.
-mod.enable = Aktif
-mod.requiresrestart = Game akan keluar untuk mengaktifkan mod.
-mod.reloadrequired = [scarlet]Dibutuhkan untuk memuat ulang
-mod.import = Impor Mod
-mod.import.file = Impor 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 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 = Peta Planet
-launchcore = Luncurkan Inti
-filename = Nama File:
-unlocked = Konten baru terbuka!
-available = Penelitian baru tersedia!
-completed = [accent]Terselesaikan
-techtree = Cabang Teknologi
-research.legacy = Data penelitian [accent]5.0[] ditemukan.\nApakah kamu ingin [accent]memuat data ini[], atau [accent]mengabaikannya[] dan memulai ulang penelitian di kampanye terbaru (disarankan)?
-research.load = Muat
-research.discard = Abaikan
-research.list = [lightgray]Penelitian:
-research = Penelitian
-researched = [lightgray]{0} telah diteliti.
-research.progress = {0}% diteliti
-players = {0} pemain aktif
-players.single = {0} pemain aktif
-players.search = Cari
-players.notfound = [gray]Tidak ada pemain ditemukan
-server.closing = [accent]Menutup server...
-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 game 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 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.
-server.kicked.gameover = Permainan telah berakhir!
-server.kicked.serverRestarting = Server sedang mengulang kembali.
-server.versions = Versi Anda:[accent] {0}[]\nVersi server:[accent] {1}[]
-host.info = Tombol [accent]host[] akan membuat server sementara di port [scarlet]6567[]. \nSemua orang yang memiliki [lightgray]Wi-Fi atau jaringan lokal[] akan bisa melihat server anda di daftar server mereka.\n\nJika Anda ingin pemain dari mana saja memasuki servermu dengan IP, dibutuhkan untuk melakukan [accent]port forwarding[].\n\n[lightgray]Diingat: Jika seseorang mengalami masalah memasuki permainan LAN-mu, pastikan Anda telah mengizinkan Mindustry akses ke jaringan lokalmu di pengaturan firewall.
-join.info = Disini, Anda bisa memasuki [accent]server IP[], atau menemukan [accent]server lokal[] untuk bermain bersama.\nLAN dan WAN mendukung permainan bersama.\n\n[lightgray]Ingat: Tidak ada daftar server global; jika anda ingin bergabung dengan seseorang memakai IP, Anda perlu menanyakan host tentang IP mereka.
-hostserver = Host Permainan
-invitefriends = Undang Teman
-hostserver.mobile = Host\nPermainan
-host = Host
-hosting = [accent]Membuka server...
-hosts.refresh = Muat Ulang
-hosts.discovering = Mencari permainan LAN 
-hosts.discovering.any = Mencari permainan
-server.refreshing = Memuat ulang server
-hosts.none = [lightgray]Tidak ditemukan game lokal!
-host.invalid = [scarlet]Tidak bisa menyambung dengan pemilik.
-
-servers.local = Server Lokal
-servers.remote = Server Jarak Jauh (Simpanan)
-servers.global = Server Komunitas
-
-servers.disclaimer = Server komunitas [accent]tidak[] dimiliki atau diatur oleh pengembang.\n\nServer dapat berisi konten buatan pemain lain yang mungkin tidak sesuai untuk semua umur.
-servers.showhidden = Tampilkan Server Tersembunyi
-server.shown = Ditampilkan
-server.hidden = Disembunyikan
-
-trace = Melacak Pemain
-trace.playername = Nama pemain: [accent]{0}
-trace.ip = IP: [accent]{0}
-trace.id = ID Unik: [accent]{0}
-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 tidak diberi izin masuk!
-server.admins = Admin
-server.admins.none = Tidak ada admin!
-server.add = Tambahkan Server
-server.delete = Anda yakin ingin menghapus server ini?
-server.edit = Sunting Server
-server.outdated = [crimson]Server Kadaluarsa![]
-server.outdated.client = [crimson]Client Kadaluarsa![]
-server.version = [lightgray]Versi: {0} {1}
-server.custombuild = [accent]Bentuk Modifikasi
-confirmban = Anda yakin ingin melarang pemain ini untuk masuk lagi?
-confirmkick = Anda yakin ingin mengeluarkan pemain ini?
-confirmvotekick = Anda yakin ingin memulai pemungutan suara untuk mengeluarkan pemain ini?
-confirmunban = Anda yakin ingin mengizinkan pemain ini untuk masuk lagi?
-confirmadmin = Anda yakin ingin membuat pemain ini sebagai admin?
-confirmunadmin = Anda yakin ingin menghapus status admin dari pemain ini?
-joingame.title = Bermain Bersama
-joingame.ip = Alamat:
-disconnect = Terputus.
-disconnect.error = Koneksi bermasalah.
-disconnect.closed = Koneksi ditutup.
-disconnect.timeout = Waktu habis.
-disconnect.data = Gagal memuat data server!
-cantconnect = Gagal menyambung! ([accent]{0}[]).
-connecting = [accent]Menghubungkan...
-reconnecting = [accent]Menghubungkan kembali...
-connecting.data = [accent]Memuat data server...
-server.port = Port:
-server.addressinuse = Alamat sudah ada!
-server.invalidport = Nomor port tidak sah!
-server.error = [crimson]Terjadi kesalahan saat menghosting server: [accent]{0}
-save.new = Simpanan Baru
-save.overwrite = Anda yakin ingin menindih \ntempat simpanan ini?
-overwrite = Tindih
-save.none = Tidak ada simpanan!
-savefail = Gagal menyimpan permainan!
-save.delete.confirm = Anda yakin ingin menghapus simpanan ini?
-save.delete = Hapus
-save.export = Ekspor Simpanan
-save.import.invalid = [accent]Simpanan ini tidak valid!
-save.import.fail = [crimson]Gagal mengimpor simpanan: [accent]{0}
-save.export.fail = [crimson]Gagal mengekspor simpanan: [accent]{0}
-save.import = Impor Simpanan
-save.newslot = Simpan nama:
-save.rename = Ganti nama
-save.rename.text = Nama baru:
-selectslot = Pilih simpanan.
-slot = [accent]Tempat {0}
-editmessage = Atur Pesan
-save.corrupted = [accent]File simpanan rusak atau tidak sah!\nJika Anda baru saja memperbarui permainannya, ini karena perubahan di format penyimpanan dan [scarlet]bukan[] sebuah isu.
-empty = <kosong>
-on = Aktif
-off = Nonaktif
-save.autosave = Simpan otomatis: {0}
-save.map = Peta: {0}
-save.wave = Gelombang {0}
-save.mode = Mode Permainan: {0}
-save.date = Simpanan Terakhir: {0}
-save.playtime = Waktu Bermain: {0}
-warning = Peringatan.
-confirm = Konfirmasi
-delete = Hapus
-view.workshop = Lihat di Workshop
-workshop.listing = Sunting Daftar Workshop
-ok = OK
-open = Buka
-customize = Sunting Peraturan
-cancel = Batal
-openlink = Buka Tautan
-copylink = Salin Tautan
-back = Kembali
-crash.export = Export Crash Logs
-crash.none = No crash logs found.
-crash.exported = Crash logs exported.
-data.export = Ekspor Data
-data.import = Impor Data
-data.openfolder = Buka Folder Data
-data.exported = Data telah di ekspor.
-data.invalid = Data permainan ini tidak sah.
-data.import.confirm = Mengimpor data eksternal akan menghapus [scarlet] semua[] data yang tersimpan.\n[accent]Tidak dapat diundur lagi![]\n\nSetelah data diimpor, game akan segera ditutup.
-quit.confirm = Apakah Anda yakin ingin keluar?
-quit.confirm.tutorial = Apakah Anda tahu apa yang dilakukan?\nTutorial dapat diulang di[accent] Pengaturan->Permainan->Ulang Tutorial.[]
-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
-resumebuilding = [scarlet][[{0}][] untuk lanjut membangun
-showui = UI disembunyikan.\nTekan [accent][[{0}][] untuk menampilkan UI.
-wave = [accent]Gelombang {0}
-wave.cap = [accent]Gelombang {0}/{1}
-wave.waiting = [lightgray]Gelombang di {0}
-wave.waveInProgress = [lightgray]Gelombang sedang berlangsung
-waiting = [lightgray]Menunggu...
-waiting.players = Menunggu pemain lainnya...
-wave.enemies = [lightgray]{0} Musuh Tersisa
-wave.enemycores = [accent]{0}[lightgray] Inti Musuh
-wave.enemycore = [accent]{0}[lightgray] Inti Musuh
-wave.enemy = [lightgray]{0} Musuh Tersisa
-wave.guardianwarn = Penjaga akan tiba dalam [accent]{0}[] gelombang.
-wave.guardianwarn.one = Penjaga akan tiba dalam [accent]{0}[] gelombang.
-loadimage = Memuat Gambar
-saveimage = Simpan Gambar
-unknown = Tak diketahui
-custom = Modifikasi
-builtin = Terpasang
-map.delete.confirm = Anda yakin ingin menghapus peta ini? Aksi ini tidak bisa diubah!
-map.random = [accent]Peta Acak
-map.nospawn = Peta ini tidak memiliki inti agar pemain bisa muncul! Tambahkan inti [royal] biru[] kedalam peta di penyunting.
-map.nospawn.pvp = Peta ini tidak memiliki inti agar pemain lawan bisa muncul! Tambahkan inti[scarlet] selain biru[] kedalam peta di penyunting.
-map.nospawn.attack = Peta ini tidak memiliki inti musuh agar pemain bisa menyerang! Tambahkan inti[scarlet] merah[] kedalam peta di penyunting.
-map.invalid = Terjadi kesalahan saat memuat peta: rusak atau file peta tidak valid.
-workshop.update = Perbarui Item
-workshop.error = Terjadi kesalahan saat mengambil detail workshop: {0}
-map.publish.confirm = Apakah Anda yakin untuk menerbitkan peta ini?\n\n[lightgray]Pastikan Anda setuju dengan Workshop EULA terlebih dahulu, atau peta anda tidak akan muncul!
-workshop.menu = Pilih apa yang Anda ingin lakukan dengan item ini.
-workshop.info = Informasi item
-changelog = Catatan Pembaruan (opsional):
-eula = Steam EULA
-missing = Item ini telah dihapus atau dipindah.\n[lightgray]Daftar Workshop sekarang telah tidak terhubung secara otomatis.
-publishing = [accent]Menerbitkan...
-publish.confirm = Apakah Anda yakin untuk menerbitkan item ini?\n\n[lightgray]Pastikan Anda setuju dengan Workshop EULA terlebih dahulu, atau item Anda tidak akan muncul!
-publish.error = Terjadi kesalahan saat menerbitkan item: {0}
-steam.error = Gagal untuk menginisialisasi layanan Steam.\nError: {0}
-
-editor.brush = Kuas
-editor.openin = Buka di Penyunting
-editor.oregen = Generasi Sumber Daya
-editor.oregen.info = Generasi Sumber Daya:
-editor.mapinfo = Info Peta
-editor.author = Pencipta:
-editor.description = Deskripsi:
-editor.nodescription = Sebuah peta harus memiliki sebuah deskripsi atau 4 karakter sebelum diterbitkan.
-editor.waves = Gelombang:
-editor.rules = Peraturan:
-editor.generation = Generasi:
-editor.ingame = Sunting dalam Permainan
-editor.publish.workshop = Terbitkan di Workshop
-editor.newmap = Peta Baru
-editor.center = Pusat
-workshop = Workshop
-waves.title = Gelombang
-waves.remove = Hapus
-waves.never = <tidak pernah>
-waves.every = setiap
-waves.waves = gelombang
-waves.perspawn = per muncul
-waves.shields = perisai/gelombang
-waves.to = sampai
-waves.guardian = Penjaga
-waves.preview = Pratinjau
-waves.edit = Sunting...
-waves.copy = Salin ke Papan klip
-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.
-
-#memang sengaja diberi huruf kecil
-wavemode.counts = jumlah
-wavemode.totals = total
-wavemode.health = darah
-
-editor.default = [lightgray]<Standar>
-details = Detail...
-edit = Sunting...
-editor.name = Nama:
-editor.spawn = Munculkan Unit
-editor.removeunit = Hapus Unit
-editor.teams = Tim
-editor.errorload = Terjadi kesalahan saat memuat file.
-editor.errorsave = Terjadi kesalahan saat menyimpan file.
-editor.errorimage = Itu gambar biasa, bukan peta. Jangan merubah ekstensi dan megharapkan akan berhasil.\n\nJika anda ingin mengimpor peta "Legacy", gunakan tombol 'Impor Peta Legacy ' di penyunting.
-editor.errorlegacy = Peta ini terlalu tua, dan memakai format peta "legacy" yang tidak didukung lagi.
-editor.errornot = Ini bukan merupakan file peta.
-editor.errorheader = File peta ini bisa jadi tidak sah atau rusak.
-editor.errorname = Peta tidak ada nama.
-editor.update = Perbaruan 
-editor.randomize = Acak
-editor.apply = Terapkan
-editor.generate = Generasi
-editor.resize = Ubah Ukuran
-editor.loadmap = Memuat Peta
-editor.savemap = Simpan Peta
-editor.saved = Tersimpan!
-editor.save.noname = Peta Anda tidak ada nama! Tambahkan di menu 'info peta'.
-editor.save.overwrite = Peta ini menindih peta built-in! Pilih nama yang berbeda di menu 'info peta'.
-editor.import.exists = [scarlet]Tidak bisa mengimpor:[] peta built-in bernama '{0}' sudah ada!
-editor.import = Mengimpor...
-editor.importmap = Impor Peta
-editor.importmap.description = Mengimpor peta yang telah ada
-editor.importfile = Impor File
-editor.importfile.description = Mengimpor file peta dari luar
-editor.importimage = Impor Peta "Legacy"
-editor.importimage.description = Mengimpor peta legacy dari luar
-editor.export = Ekspor...
-editor.exportfile = Ekspor File
-editor.exportfile.description = Mengekspor sebuah file peta
-editor.exportimage = Expor Gambar Dunia
-editor.exportimage.description = Ekspor sebuah file gambar peta
-editor.loadimage = Impor Dunia
-editor.saveimage = Ekspor Dunia
-editor.unsaved = [scarlet]Anda memiliki perubahan belum disimpan![]\nYakin ingin keluar?
-editor.resizemap = Ubah Ukuran Peta
-editor.mapname = Nama Peta:
-editor.overwrite = [accent]Peringatan!\nIni menindih peta yang telah ada.
-editor.overwrite.confirm = [scarlet]Peringatan![] Peta dengan nama ini sudah ada. Yakin ingin menindihnya?
-editor.exists = Sebuah peta dengan nama ini sudah ada.
-editor.selectmap = Pilih peta untuk dimuat:
-
-toolmode.replace = Ganti
-toolmode.replace.description = Hanya dapat digambar pada balok padat.
-toolmode.replaceall = Ganti Semua
-toolmode.replaceall.description = Ganti semua balok di peta.
-toolmode.orthogonal = Ortogonal
-toolmode.orthogonal.description = Hanya menggambar garis ortogonal.
-toolmode.square = Persegi
-toolmode.square.description = Sikat bangun persegi.
-toolmode.eraseores = Hapus Bijih
-toolmode.eraseores.description = Hanya menghapus bijih.
-toolmode.fillteams = Isi Tim
-toolmode.fillteams.description = Mengisi tim bukannya blok.
-toolmode.drawteams = Gambar Tim
-toolmode.drawteams.description = Menggambar tim bukannya blok.
-
-filters.empty = [lightgray]Tidak ada filter! Tambahkan dengan tombol dibawah.
-filter.distort = Kerusakkan
-filter.noise = Kebisingan
-filter.enemyspawn = Pilih Munculnya Musuh
-filter.spawnpath = Path To Spawn
-filter.corespawn = Pilih Inti
-filter.median = Median
-filter.oremedian = Median Bijih
-filter.blend = Campur
-filter.defaultores = Bijih Standar
-filter.ore = Sumber Daya
-filter.rivernoise = Kebisingan Sungai
-filter.mirror = Cermin
-filter.clear = Bersih
-filter.option.ignore = Biarkan
-filter.scatter = Penebaran
-filter.terrain = Lahan
-filter.option.scale = Ukuran
-filter.option.chance = Kemungkinan
-filter.option.mag = Tingkat
-filter.option.threshold = Ambang
-filter.option.circle-scale = Ukuran Lingkaran
-filter.option.octaves = Oktaf
-filter.option.falloff = Kemerosotan
-filter.option.angle = Sudut
-filter.option.amount = Jumlah
-filter.option.block = Blok
-filter.option.floor = Lantai
-filter.option.flooronto = Target Lantai
-filter.option.target = Target
-filter.option.wall = Dinding
-filter.option.ore = Sumber Daya
-filter.option.floor2 = Lantai Sekunder
-filter.option.threshold2 = Ambang Sekunder
-filter.option.radius = Radius
-filter.option.percentile = Perseratus
-
-width = Lebar:
-height = Tinggi:
-menu = Menu
-play = Bermain
-campaign = Kampanye
-load = Memuat
-save = Simpan
-fps = FPS: {0}
-ping = Ping: {0}ms
-memory = Mem: {0}mb
-memory2 = Mem:\n {0}mb +\n {1}mb
-language.restart = Silahkan mengulang kembali permainan agar pengaturan bahasa berpengaruh.
-settings = Pengaturan
-tutorial = Tutorial
-tutorial.retake = Ulang Tutorial
-editor = Penyunting
-mapeditor = Penyunting Peta
-
-abandon = Tinggalkan
-abandon.text = Zona ini dan semua sumber daya didalamnya akan berada di tangan musuh.
-locked = Terkunci
-complete = [lightgray]Mencapai:
-requirement.wave = Capai gelombang {0} dalam {1}
-requirement.core = Hancurkan inti musuh dalam {0}
-requirement.research = Kembangkan {0}
-requirement.produce = Produksi {0}
-requirement.capture = Kuasai {0}
-launch.text = Luncurkan
-research.multiplayer = Hanya host yang dapat meneliti item.
-map.multiplayer = Hanya host yang dapat melihat sektor.
-uncover = Buka
-configure = Konfigurasi Muatan
-
-loadout = Muatan
-resources = Sumber Daya
-bannedblocks = Balok yang dilarang
-addall = Tambah Semua
-launch.from = Meluncurkan Dari: [accent]{0}
-launch.destination = Destinasi: {0}
-configure.invalid = Jumlah harus berupa angka diantara 0 dan {0}.
-add = Menambahkan...
-boss.health = Darah Penjaga
-
-connectfail = [scarlet]Gagal menyambung ke server:\n\n[accent]{0}
-error.unreachable = Server tak terjangkau.\nApakah alamatnya benar?
-error.invalidaddress = Alamat tidak valid.
-error.timedout = Kehabisan waktu!\nPastikan pemilik mempunyai port forwarding, dan alamatnya benar!
-error.mismatch = Paket terjadi kekeliruan:\nbisa terjadi apabila versi client/server berbeda.\nPastikan Anda dan host mempunyai versi terbaru Mindustry!
-error.alreadyconnected = Sudah tersambung.
-error.mapnotfound = File peta tidak ditemaukan!
-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.
-
-weather.rain.name = Hujan
-weather.snow.name = Salju
-weather.sandstorm.name = Badai Pasir
-weather.sporestorm.name = Badai Spora
-weather.fog.name = Kabut
-
-sectors.unexplored = [lightgray]Belum Ditelusuri
-sectors.resources = Sumber Daya:
-sectors.production = Produksi:
-sectors.export = Ekspor:
-sectors.time = Waktu:
-sectors.threat = Tingkat:
-sectors.wave = Gelombang:
-sectors.stored = Terisi:
-sectors.resume = Lanjutkan
-sectors.launch = Luncurkan
-sectors.select = Pilih
-sectors.nonelaunch = [lightgray]tidak ada (matahari)
-sectors.rename = Ganti Nama Sektor
-sectors.enemybase = [scarlet]Markas Musuh
-sectors.vulnerable = [scarlet]Rawan diserang
-sectors.underattack = [scarlet]Dalam Serangan! [accent]kerusakan sebesar {0}%
-sectors.survives = [accent]Bertahan sebanyak {0} gelombang
-sectors.go = Mulai
-sector.curcapture = Sektor Dikuasai
-sector.curlost = Sektor Gagal Bertahan
-sector.missingresources = [scarlet]Sumber Daya Inti Tidak Cukup
-sector.attacked = Sektor [accent]{0}[white] sedang diserang!
-sector.lost = Sektor [accent]{0}[white] telah dihancurkan!
-#note: the missing space in the line below is intentional
-sector.captured = Sektor [accent]{0}[white]ditaklukkan!
-
-threat.low = Rendah
-threat.medium = Sedang
-threat.high = Tinggi
-threat.extreme = Ekstrem
-threat.eradication = Pemusnahan
-
-planets = Planet
-
-planet.serpulo.name = Serpulo
-planet.sun.name = Matahari
-
-sector.impact0078.name = Impact 0078
-sector.groundZero.name = Titik Nol
-sector.craters.name = Kawah
-sector.frozenForest.name = Hutan Yang Beku
-sector.ruinousShores.name = Pantai Yang Hancur
-sector.stainedMountains.name = Gunung Bernoda
-sector.desolateRift.name = Retakan Terpencil
-sector.nuclearComplex.name = Kompleks Produksi Nuklir
-sector.overgrowth.name = Pertumbuhan
-sector.tarFields.name = Lahan Tar
-sector.saltFlats.name = Dataran Garam
-sector.fungalPass.name = Lintasan Spora
-sector.biomassFacility.name = Pabrik Sintesis Biomassa
-sector.windsweptIslands.name = Pulau Bersemilir
-sector.extractionOutpost.name = Pos Ekstraksi
-sector.planetaryTerminal.name = Pusat Peluncuran Planet
-
-sector.groundZero.description = Lokasi yang optimal untuk bermain satu kali lagi. Sangat sedikit musuh. Beberapa sumber daya dapat dikumpulkan.\nKumpulkan timah dan tembaga sebanyak yang kamu bisa.\nMulai dari sini.
-sector.frozenForest.description = Disini, dekat dengan gunung, spora sudah menyebar. Suhu dingin tidak dapat menahannya.\n\nHasilkan listrik. Bangun generator pembakar. Pelajari cara menggunakan mender.
-sector.saltFlats.description = Di pinggiran padang pasir terdapat Daratan Garam. Beberapa sumber daya dapat ditemukan disini.\n\nMusuh telah membangun gudang disini. Hancurkan inti mereka. Jangan biarkan satupun tersisa.
-sector.craters.description = Air banyak terkumpul di kawah ini, sebuah peninggalan dari perang masa lalu. Klaim area ini lagi. Kumpulkan pasir. Lebur metaglass. Pompa air untuk mendinginkan turret dan bor.
-sector.ruinousShores.description = Keluar dari lembah gunung, terdapat garis pantai. Sebelumnya, area ini adalah garis pertahanan pantai. Sekarang tidak banyak yang tersisa. Hanya pertahanan dasar yang tersisa, yang lain hancur berkeping keping.\nBangun kembali pertahanan di sini. Pelajari lebih banyak teknologi.
-sector.stainedMountains.description = Area ini terletak di dekat pegunungan, namun belum tersentuh oleh spora.\nTambang titanium yang ada di area ini. Pelajari fungsinya.\n\nMusuh jauh lebih kuat disini. Jangan biarkan mereka meluncurkan unit yang lebih kuat.
-sector.overgrowth.description = Area ini banyak ditumbuhi spora, karena dekat dengan sumber spora.\nMusuh telah membangun basis disini. Bangun unit Mace. Hancurkan mereka. Klaim apapun yang tersisa.
-sector.tarFields.description = Terletak di pinggiran zona produksi minyak, diantara gunung dan padang pasir. Salah satu dari beberapa area yang memiliki cadangan minyak yang dapat digunakan.\nMeskipun ditinggalkan, area ini terdapat pertahanan musuh yang sangat kuat disekitarnya. Jangan meremehkan mereka.\n\n[lightgray]Pelajari proses penyulingan minyak jika bisa.
-sector.desolateRift.description = Zona yang sangat berbahaya. Banyak sumber daya, tetapi terdapat sedikit ruang. Sangat beresiko tinggi untuk dihancurkan. Keluar secepat yang kamu bisa. Jangan terlena karena waktu antara gelombang yang lama.
-sector.nuclearComplex.description = Sebuah fasilitas untuk memproduksi dan memproses thorium, telah hancur.\n[lightgray]Pelajari thorium dan cara penggunaanya.\n\nMusuh disini menyerang dalam jumlah besar, yang siap untuk menghadapi siapapun.
-sector.fungalPass.description = Area ini terdapat diantara pegunungan yang lebih tinggi dengan yang lebih rendah, juga daerah yang dipenuhi spora. Musuh membangun basis kecil disini.\nHancurkan itu.\nGunakan unit Dagger dan Crawler. Hancurkan dua inti mereka.
-sector.biomassFacility.description = Asal dari semua spora di planet ini. Tempat ini adalah fasilitas dimana spora dipelajari dan diproduksi.\nPelajari teknologi yang terkait dengannya. Budi dayakan spora untuk memproduksi bahan bakar dan plastik.\n\n[lightgray]Setelah fasilitas ini hancur, spora menyebar. Tidak ada di ekosistem lokal yang dapat bersaing dengan organisme invasif seperti itu.
-sector.windsweptIslands.description = Jauh dari pantai terdapat sekumpulan pulau. Catatan yang ada mengatakan bahwa mereka memiliki struktur untuk memproduksi [accent]Plastanium[].\n\nKalahkan unit laut musuh. Bangun basis di kepulauan ini. Pelajari pabriknya.
-sector.extractionOutpost.description = Sebuah pos jarak jauh, dibangun musuh untuk meluncurkan sumber daya ke sektor yang lain.\n\nTeknologi tarnsportasi antar sektor dapat memudahkan untuk menaklukan lebih banyak sektor. Hancurkan basis itu. Pelajari Alas Peluncur mereka.
-sector.impact0078.description = Di sini terletak sisa-sisa pesawat antarbintang yang pertama kali memasuki sistem ini.\n\nSelamatkan apapun yang ada dari sisa-sisa pesawat. Pelajari teknologi apa pun yang utuh.
-sector.planetaryTerminal.description = Target terakhir.\n\nBasis pantai ini memiliki struktur yang dapat meluncurkan inti ke planet disekitarnya. Memiliki pertahanan yang sangat bagus.\n\nProduksi unit laut. Hancurkan musuh secepat mungkin. Pelajari struktur peluncuran mereka.
-
-settings.language = Bahasa
-settings.data = Data Game
-settings.reset = Atur ulang ke Default (standar)
-settings.rebind = Ganti tombol
-settings.resetKey = Atur ulang
-settings.controls = Kontrol
-settings.game = Permainan
-settings.sound = Suara
-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 = Anda yakin ingin menghapus semua simpanan?
-settings.clearsaves = Bersihkan Simpanan
-settings.clearresearch = Bersihkan Penelitian
-settings.clearresearch.confirm = Apakah Anda yakin ingin membersihkan semua penelitian kampanye?
-settings.clearcampaignsaves = Bersihkan Simpanan Kampanye
-settings.clearcampaignsaves.confirm = Apakah Anda yakin ingin membersihkan semua simpanan kampanye?
-paused = [accent]< Jeda >
-clear = Bersih
-banned = [scarlet]Dilarang
-yes = Ya
-no = Tidak
-info.title = Info
-error.title = [crimson]Sebuah kesalahan telah terjadi
-error.crashtitle = Sebuah kesalahan telah terjadi
-unit.nobuild = [scarlet]Unit tidak dapat membangun
-lastaccessed = [lightgray]Terakhir Diakses: {0}
-block.unknown = [lightgray]???
-
-stat.description = Kegunaan
-stat.input = Masukan
-stat.output = Pengeluaran
-stat.booster = Pendorong
-stat.tiles = Kotak yang dibutuhkan
-stat.affinities = Afinitas
-stat.powercapacity = Kapasitas Tenaga
-stat.powershot = Tenaga/Tembakan
-stat.damage = Kerusakan
-stat.targetsair = Menargetkan Udara
-stat.targetsground = Menargetkan Darat
-stat.itemsmoved = Kecepatan Gerak
-stat.launchtime = Waktu Diantara Peluncuran
-stat.shootrange = Jarak
-stat.size = Ukuran
-stat.displaysize = Ukuran Tampilan
-stat.liquidcapacity = Kapasitas Zat Cair
-stat.powerrange = Jarak Tenaga
-stat.linkrange = Jarak Tautan
-stat.instructions = Instruksi
-stat.powerconnections = Koneksi Maksimal
-stat.poweruse = Penggunaan Tenaga
-stat.powerdamage = Tenaga/Pukulan
-stat.itemcapacity = Kapasitas Item
-stat.memorycapacity = Kapasitas Memori
-stat.basepowergeneration = Basis Generasi Tenaga
-stat.productiontime = Waktu Produksi
-stat.repairtime = Waktu Memperbaiki Blok Penuh
-stat.weapons = Senjata
-stat.bullet = Peluru
-stat.speedincrease = Tambahan Kecepatan
-stat.range = Jarak
-stat.drilltier = Sumber Daya yang Bisa di Bor
-stat.drillspeed = Basis Kecepatan Bor
-stat.boosteffect = Efek Pendorong
-stat.maxunits = Maks Unit Aktif
-stat.health = Darah
-stat.buildtime = Waktu Pembuatan
-stat.maxconsecutive = Maks Konsekutif
-stat.buildcost = Biaya Bangunan
-stat.inaccuracy = Jarak Melenceng
-stat.shots = Tembakan
-stat.reload = Tembakan/Detik
-stat.ammo = Amunisi
-stat.shieldhealth = Darah Perisai
-stat.cooldowntime = Waktu Pendinginan
-stat.explosiveness = Ledakan
-stat.basedeflectchance = Peluang Defleksi Dasar
-stat.lightningchance = Peluang Menghasilkan Petir
-stat.lightningdamage = Kerusakan Petir
-stat.flammability = Pembakar
-stat.radioactivity = Radiasi
-stat.heatcapacity = Kapasitas Panas
-stat.viscosity = Kelekatan
-stat.temperature = Temperatur
-stat.speed = Kecepatan
-stat.buildspeed = Kecepatan Membangun
-stat.minespeed = Kecepatan Menambang
-stat.minetier = Tingkat Menambang
-stat.payloadcapacity = Kapasitas Muatan
-stat.commandlimit = Batas Perintah
-stat.abilities = Kemampuan
-stat.canboost = Dapat dipercepat
-stat.flying = Terbang
-stat.ammouse = Penggunaan Amunisi
-
-ability.forcefield = Bidang Kekuatan
-ability.repairfield = Bidang Perbaikan
-ability.statusfield = Bidang Status
-ability.unitspawn = {0} Pabrik
-ability.shieldregenfield = Bidang Regenerasi Perisai
-ability.movelightning = Pergerakan Petir
-
-bar.drilltierreq = Membutuhkan Bor yang Lebih Baik
-bar.noresources = Sumber Daya Tidak Ditemukan
-bar.corereq = Memerlukan Inti Dasar
-bar.drillspeed = Kecepatan Bor: {0}/s
-bar.pumpspeed = Kecepatan Pompa: {0}/s
-bar.efficiency = Daya Guna: {0}%
-bar.powerbalance = Tenaga: {0}/s
-bar.powerstored = Disimpan: {0}/{1}
-bar.poweramount = Tenaga: {0}
-bar.poweroutput = Pengeluaran Tenaga: {0}
-bar.powerlines = Sambungan: {0}/{1}
-bar.items = Item: {0}
-bar.capacity = Kapasitas: {0}
-bar.unitcap = {0} {1}/{2}
-bar.liquid = Zat Cair
-bar.heat = Panas
-bar.power = Tenaga
-bar.progress = Perkembangan Pembangunan
-bar.input = Masukan
-bar.output = Keluaran
-
-units.processorcontrol = [lightgray]Dikendalikan Prosesor
-
-bullet.damage = [stat]{0}[lightgray] kekuatan (dmg)
-bullet.splashdamage = [stat]{0}[lightgray] kekuatan percikan~[stat] {1}[lightgray] kotak
-bullet.incendiary = [stat]membakar
-bullet.sapping = [stat]sapping
-bullet.homing = [stat]mengejar
-bullet.shock = [stat]mengkejut
-bullet.frag = [stat]menyebar
-bullet.buildingdamage = [stat]{0}%[lightgray] kerusakan bangunan
-bullet.knockback = [stat]{0}[lightgray] pantulan kembali
-bullet.pierce = [stat]{0}[lightgray]x tembus
-bullet.infinitepierce = [stat]menembus
-bullet.healpercent = [stat]{0}[lightgray]% menyembuhkan
-bullet.freezing = [stat]membeku
-bullet.tarred = [stat]tar
-bullet.multiplier = [stat]{0}[lightgray]x multiplikasi amunisi
-bullet.reload = [stat]{0}[lightgray]x rasio menembak
-
-unit.blocks = blok
-unit.blockssquared = blok²
-unit.powersecond = unit tenaga/detik
-unit.liquidsecond = unit zat cair/detik
-unit.itemssecond = item/detik
-unit.liquidunits = unit zat cair
-unit.powerunits = unit tenaga
-unit.degrees = derajat
-unit.seconds = detik
-unit.minutes = menit
-unit.persecond = /detik
-unit.perminute = /menit
-unit.timesspeed = x kecepatan
-unit.percent = %
-unit.shieldhealth = darah perisai
-unit.items = item
-unit.thousands = rb
-unit.millions = jt
-unit.billions = m
-unit.pershot = /tembakan
-category.purpose = Kegunaan
-category.general = Umum
-category.power = Tenaga
-category.liquids = Zat Cair
-category.items = Item
-category.crafting = Pemasukan/Pengeluaran
-category.function = Fungsi
-category.optional = Peningkatan Opsional
-setting.landscape.name = Kunci Pemandangan
-setting.shadows.name = Bayangan
-setting.blockreplace.name = Usulan Blok Otomatis
-setting.linear.name = Filter Bergaris
-setting.hints.name = Petunjuk
-setting.flow.name = Tampilan Laju Aliran Sumber Daya
-setting.backgroundpause.name = Jeda di Latar
-setting.buildautopause.name = Jeda Otomatis saat Membangun
-setting.animatedwater.name = Animasi Perairan
-setting.animatedshields.name = Animasi Perisai
-setting.antialias.name = Antialiasi[lightgray] (membutuhkan restart)[]
-setting.playerindicators.name = Indikasi Pemain
-setting.indicators.name = Indikasi Musuh/Teman Lain
-setting.autotarget.name = Target Secara Otomatis
-setting.keyboard.name = Kontrol Mouse+Papan Ketik
-setting.touchscreen.name = Kontrol Layar Sentuh
-setting.fpscap.name = Maksimal FPS
-setting.fpscap.none = Tidak Ada
-setting.fpscap.text = {0} FPS
-setting.uiscale.name = Skala UI[lightgray] (butuh untuk mengulang game)[]
-setting.swapdiagonal.name = Selalu Penaruhan Diagonal
-setting.difficulty.training = Latihan
-setting.difficulty.easy = Mudah
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Susah
-setting.difficulty.insane = Sangat sulit!
-setting.difficulty.name = Tingkat Kesulitan:
-setting.screenshake.name = Layar Getar
-setting.effects.name = Munculkan Efek
-setting.destroyedblocks.name = Tunjukkan Blok yang Telah Hancur
-setting.blockstatus.name = Tunjukan Status Blok
-setting.conveyorpathfinding.name = Navigasi Pengantar Otomatis
-setting.sensitivity.name = Sensitivitas Kontroler
-setting.saveinterval.name = Jarak Menyimpan
-setting.seconds = {0} detik
-setting.milliseconds = {0} milidetik
-setting.fullscreen.name = Layar Penuh
-setting.borderlesswindow.name = Jendela tak Berbatas[lightgray] (mungkin memerlukan mengulang kembali)
-setting.fps.name = Tunjukkan FPS
-setting.smoothcamera.name = Kamera Halus
-setting.vsync.name = VSync
-setting.pixelate.name = Mode Pixel[lightgray] (menonaktifkan animasi)
-setting.minimap.name = Tunjukkan Peta Kecil
-setting.coreitems.name = Tunjukkan Item Inti (WIP)
-setting.position.name = Tunjukkan Posisi Pemain
-setting.musicvol.name = Volume Musik
-setting.atmosphere.name = Tunjukkan Atmosfer Planet
-setting.ambientvol.name = Volume Sekeliling
-setting.mutemusic.name = Diamkan Musik
-setting.sfxvol.name = Volume Efek Suara
-setting.mutesound.name = Diamkan Suara
-setting.crashreport.name = Laporkan Masalah
-setting.savecreate.name = Otomatis Menyimpan
-setting.publichost.name = Visibilitas Game Publik
-setting.playerlimit.name = Batas pemain
-setting.chatopacity.name = Jelas-Beningnya Pesan
-setting.lasersopacity.name = Jelas-Beningnya Tenaga Laser
-setting.bridgeopacity.name = Jelas-Beningnya Jembatan
-setting.playerchat.name = Tunjukkan Pesan dalam Permainan
-setting.showweather.name = Perlihatkan Cuaca
-public.confirm = Apakah kamu ingin mempublikasi permainanmu?\n[accent]Siapa saja bisa masuk ke permainanmu.\n[lightgray]Ini bisa diganti di Peraturan->Permainan->Visibilitas Game Publik.
-public.confirm.really = Jika kamu ingin bermain dengan temanmu, gunakan [green]Undang Teman[] daripada [scarlet]server publik[]!\nApakah kamu yakin ingin membuat permainanmu [scarlet]publik[]?
-public.beta = Ingat bahwa game versi beta tidak dapat membuat lobi publik.
-uiscale.reset = Skala UI telah diubah.\nTekan "OK" untuk mengonfirmasi.\n[scarlet]Kembali dan keluar di[accent] {0}[] pengaturan...
-uiscale.cancel = Batal & Keluar
-setting.bloom.name = Bloom
-keybind.title = Ganti Tombol
-keybinds.mobile = [scarlet]Mayoritas tombol tidak didukung oleh perangkat ponsel Hanya gerakan dasar yang didukung.
-category.general.name = Umum
-category.view.name = Melihat
-category.multiplayer.name = Bermain Bersama
-category.blocks.name = Pilih Blok
-command.attack = Serang
-command.rally = Kumpul/Patroli
-command.retreat = Mundur
-command.idle = Diam di Tempat
-placement.blockselectkeys = \n[lightgray]Tombol: [{0},
-keybind.respawn.name = Muncul Kembali
-keybind.control.name = Kontrol Unit
-keybind.clear_building.name = Hapus Bangunan
-keybind.press = Tekan tombol...
-keybind.press.axis = Tekan sumbu atau tombol...
-keybind.screenshot.name = Tangkapan Layar Peta
-keybind.toggle_power_lines.name = Aktifkan Tenaga Laser
-keybind.toggle_block_status.name = Status Blok
-keybind.move_x.name = Pindah X
-keybind.move_y.name = Pindah Y
-keybind.mouse_move.name = Ikuti Mouse
-keybind.pan.name = Tampilan Geser
-keybind.boost.name = Dorongan
-keybind.schematic_select.name = Pilih Daerah
-keybind.schematic_menu.name = Menu Skema
-keybind.schematic_flip_x.name = Balik Skema X
-keybind.schematic_flip_y.name = Balik Skema Y
-keybind.category_prev.name = Kategori Sebelumnya
-keybind.category_next.name = Kategori Selanjutnya
-keybind.block_select_left.name = Pilih Blok Kiri
-keybind.block_select_right.name = Pilih Blok Kanan
-keybind.block_select_up.name = Pilih Blok Atas
-keybind.block_select_down.name = Pilih Blok Bawah
-keybind.block_select_01.name = Kategori/Pilih Blok 1
-keybind.block_select_02.name = Kategori/Pilih Blok 2
-keybind.block_select_03.name = Kategori/Pilih Blok 3
-keybind.block_select_04.name = Kategori/Pilih Blok 4
-keybind.block_select_05.name = Kategori/Pilih Blok 5
-keybind.block_select_06.name = Kategori/Pilih Blok 6
-keybind.block_select_07.name = Kategori/Pilih Blok 7
-keybind.block_select_08.name = Kategori/Pilih Blok 8
-keybind.block_select_09.name = Kategori/Pilih Blok 9
-keybind.block_select_10.name = Kategori/Pilih Blok 10
-keybind.fullscreen.name = Aktifkan Layar Penuh
-keybind.select.name = Pilih/Tembak
-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 = Muat Kargo
-keybind.dropCargo.name = Turunkan Kargo
-keybind.command.name = Perintah
-keybind.shoot.name = Menembak
-keybind.zoom.name = Perbesar
-keybind.menu.name = Menu
-keybind.pause.name = Jeda
-keybind.pause_building.name = Jeda/Lanjut Membangun
-keybind.minimap.name = Peta Kecil
-keybind.planet_map.name = Peta Planet
-keybind.research.name = Penelitian
-keybind.chat.name = Pesan
-keybind.player_list.name = Daftar pemain
-keybind.console.name = Papan Konsol
-keybind.rotate.name = Putar
-keybind.rotateplaced.name = Putar yang ada (Tekan dan Tahan)
-keybind.toggle_menus.name = Muncul Tidaknya Menu
-keybind.chat_history_prev.name = Sejarah Pesan Sebelumnya
-keybind.chat_history_next.name = Sejarah Pesan Setelahnya
-keybind.chat_scroll.name = Scroll Pesan
-keybind.drop_unit.name = Jatuhkan Unit
-keybind.zoom_minimap.name = Perbesar Peta Kecil
-mode.help.title = Deskripsi mode
-mode.survival.name = Bertahan Hidup
-mode.survival.description = Mode normal. Sumber daya terbatas dan gelombang otomatis.
-mode.sandbox.name = Mode Sandbox/Bebas
-mode.sandbox.description = Sumber daya tak terbatas dan tidak ada gelombang otomatis.
-mode.editor.name = Sunting
-mode.pvp.name = PvP
-mode.pvp.description = Melawan pemain lain. Membutuhkan setidaknya 2 inti berbeda warna didalam peta untuk main.
-mode.attack.name = Penyerangan
-mode.attack.description = Hancurkan markas musuh. Membutuhkan inti merah di dalam peta untuk main.
-mode.custom = Pengaturan Modifikasi
-
-rules.infiniteresources = Sumber Daya Tak Terbatas
-rules.reactorexplosions = Ledakan Reaktor
-rules.schematic = Skema Diperbolehkan
-rules.wavetimer = Pengaturan Waktu Gelombang 
-rules.waves = Gelombang
-rules.attack = Mode Penyerangan
-rules.buildai = Bangunan A.I.
-rules.enemyCheat = Sumber Daya A.I Musuh (Tim Merah) Tak Terbatas
-rules.blockhealthmultiplier = Multiplikasi Darah Blok
-rules.blockdamagemultiplier = Multiplikasi Kekuatan Blok
-rules.unitbuildspeedmultiplier = Multiplikasi Kecepatan Munculnya Unit
-rules.unithealthmultiplier = Multiplikasi Darah Unit
-rules.unitdamagemultiplier = Multiplikasi Kekuatan Unit
-rules.enemycorebuildradius = Dilarang Membangun Radius Inti Musuh :[lightgray] (blok)
-rules.wavespacing = Jarak Gelombang:[lightgray] (detik)
-rules.buildcostmultiplier = Multiplikasi Harga Bangunan
-rules.buildspeedmultiplier = Multiplikasi Waktu Pembuatan Bangunan
-rules.deconstructrefundmultiplier = Penggembalian Bahan Mendekonstruksi Blok
-rules.waitForWaveToEnd = Gelombang menunggu musuh
-rules.dropzoneradius = Radius Titik Muncul:[lightgray] (Blok)
-rules.unitammo = Unit Membutuhkan Amunisi
-rules.title.waves = Gelombang
-rules.title.resourcesbuilding = Sumber Daya & Bangunan
-rules.title.enemy = Musuh
-rules.title.unit = Unit
-rules.title.experimental = Eksperimental
-rules.title.environment = Lingkungan
-rules.lighting = Penerangan
-rules.enemyLights = Sinar dari Musuh
-rules.fire = Api
-rules.explosions = Kekuatan Ledakan Blok/Unit
-rules.ambientlight = Sinar Disekeliling
-rules.weather = Cuaca
-rules.weather.frequency = Frekuensi:
-rules.weather.always = Selalu
-rules.weather.duration = Durasi:
-
-content.item.name = Item
-content.liquid.name = Zat Cair
-content.unit.name = Unit
-content.block.name = Blok
-content.sector.name = Sektor
-
-item.copper.name = Tembaga
-item.lead.name = Timah
-item.coal.name = Batu Bara
-item.graphite.name = Grafit
-item.titanium.name = Titanium
-item.thorium.name = Thorium
-item.silicon.name = Silikon
-item.plastanium.name = Plastanium
-item.phase-fabric.name = Kain Phase
-item.surge-alloy.name = Campuran Logam
-item.spore-pod.name = Polong Spora
-item.sand.name = Pasir
-item.blast-compound.name = Senyawa Peledak
-item.pyratite.name = Pyratit
-item.metaglass.name = Metaglass
-item.scrap.name = Rongsokan
-liquid.water.name = Air
-liquid.slag.name = Lava
-liquid.oil.name = Minyak
-liquid.cryofluid.name = Cairan Pendingin
-
-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 = Titik Pemasok Ulang
-block.parallax.name = Parallax
-block.cliff.name = Cliff
-block.sand-boulder.name = Batu Pasir Besar
-block.basalt-boulder.name = Batu Basal Besar
-block.grass.name = Rumput
-block.slag.name = Lahar
-block.space.name = Luar Angkasa
-block.salt.name = Garam
-block.salt-wall.name = Bukit Garam
-block.pebbles.name = Kerikil
-block.tendrils.name = Sulur
-block.sand-wall.name = Bukit Pasir
-block.spore-pine.name = Cemara Spora
-block.spore-wall.name = Bukit Spora
-block.boulder.name = Batu Besar
-block.snow-boulder.name = Batu Salju Besar
-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.shale-wall.name = Bukit Serpih
-block.scrap-wall.name = Dinding Rongsokan
-block.scrap-wall-large.name = Dinding Rongsokan Besar
-block.scrap-wall-huge.name = Dinding Rongsokan Sangat Besar
-block.scrap-wall-gigantic.name = Dinding Rongsokan Raksasa
-block.thruster.name = Pendorong
-block.kiln.name = Pengeringan
-block.graphite-press.name = Pencetak Grafit
-block.multi-press.name = Multi-Cetak
-block.constructing = {0} [lightgray](Konstruksi)
-block.spawn.name = Muncul Musuh
-block.core-shard.name = Inti: Bagian
-block.core-foundation.name = Inti: Pondasi
-block.core-nucleus.name = Inti: Nukleus
-block.deepwater.name = Air Dalam
-block.water.name = Air
-block.tainted-water.name = Air Ternoda
-block.darksand-tainted-water.name = Air Ternodai Pasir Hitam
-block.tar.name = Tar
-block.stone.name = Batu
-block.sand.name = Pasir
-block.darksand.name = Pasir Hitam
-block.ice.name = Es
-block.snow.name = Salju
-block.craters.name = Kawah
-block.sand-water.name = Air Pasir
-block.darksand-water.name = Air Pasir Hitam
-block.char.name = Bara
-block.dacite.name = Dasit
-block.dacite-wall.name = Dinding Dasit
-block.dacite-boulder.name = Batu Besar Dasit
-block.ice-snow.name = Salju Es
-block.stone-wall.name = Dinding Batu
-block.ice-wall.name = Dinding Es
-block.snow-wall.name = Dinding Salju
-block.dune-wall.name = Dinding Pasir
-block.pine.name = Cemara
-block.dirt.name = Tanah
-block.dirt-wall.name = Dinding Tanah
-block.mud.name = Lumpur
-block.white-tree-dead.name = Pohon Putih Mati
-block.white-tree.name = Pohon Putih
-block.spore-cluster.name = Kumpulan Spora
-block.metal-floor.name = Lantai Besi 1
-block.metal-floor-2.name = Lantai Besi 2
-block.metal-floor-3.name = Lantai Besi 3
-block.metal-floor-5.name = Lantai Besi 4
-block.metal-floor-damaged.name = Lantai Besi Rusak
-block.dark-panel-1.name = Panel Gelap 1
-block.dark-panel-2.name = Panel Gelap 2
-block.dark-panel-3.name = Panel Gelap 3
-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.basalt.name = Basal
-block.hotrock.name = Batu Panas
-block.magmarock.name = Batu Lahar
-block.copper-wall.name = Dinding Tembaga
-block.copper-wall-large.name = Dinding Tembaga Besar
-block.titanium-wall.name = Dinding Titanium
-block.titanium-wall-large.name = Dinding Titanium Besar
-block.plastanium-wall.name = Dinding Plastanium
-block.plastanium-wall-large.name = Dinding Plastanium Besar
-block.phase-wall.name = Dinding Phase
-block.phase-wall-large.name = Dinding Phase Besar
-block.thorium-wall.name = Dinding Thorium
-block.thorium-wall-large.name = Dinding Thorium Besar
-block.door.name = Pintu
-block.door-large.name = Pintu Besar
-block.duo.name = Duo
-block.scorch.name = Penyembur Api
-block.scatter.name = Scatter
-block.hail.name = Meriam
-block.lancer.name = Lancer
-block.conveyor.name = Pengantar
-block.titanium-conveyor.name = Pengantar Berbahan Titanium
-block.plastanium-conveyor.name = Pengantar Berbahan Plastanium
-block.armored-conveyor.name = Pengantar Berlapis Pelindung
-block.junction.name = Simpangan
-block.router.name = Pengarah
-block.distributor.name = Distributor
-block.sorter.name = Penyortir
-block.inverted-sorter.name = Penyortir Terbalik
-block.message.name = Pesan
-block.illuminator.name = Lampu
-block.overflow-gate.name = Gerbang Luap
-block.underflow-gate.name = Gerbang Luap Terbalik
-block.silicon-smelter.name = Pelebur Silikon
-block.phase-weaver.name = Pengrajut Phase 
-block.pulverizer.name = Penghancur
-block.cryofluidmixer.name = Penyampur Cairan Dingin
-block.melter.name = Pencair
-block.incinerator.name = Penghangus
-block.spore-press.name = Penekan Spora
-block.separator.name = Pemisah
-block.coal-centrifuge.name = Sentrifugal Batu Bara
-block.power-node.name = Simpul Tenaga
-block.power-node-large.name = Tiang Listrik Besar
-block.surge-tower.name = Tiang Listrik
-block.diode.name = Dioda Baterai
-block.battery.name = Baterai
-block.battery-large.name = Baterai Besar
-block.combustion-generator.name = Generator Pembakar
-block.steam-generator.name = Generator Turbin
-block.differential-generator.name = Generator Majemuk
-block.impact-reactor.name = Reaktor Tumbukan
-block.mechanical-drill.name = Bor Mekanik
-block.pneumatic-drill.name = Bor Pneumatik
-block.laser-drill.name = Bor Laser 
-block.water-extractor.name = Pengekstrak Air
-block.cultivator.name = Pembudidaya
-block.conduit.name = Pipa
-block.mechanical-pump.name = Pompa Mekanik
-block.item-source.name = Sumber Item
-block.item-void.name = Penghilang Item 
-block.liquid-source.name = Sumber Zat Cair
-block.liquid-void.name = Penghilang Zat Zair
-block.power-void.name = Penghilang Tenaga
-block.power-source.name = Sumber Tenaga
-block.unloader.name = Pembongkar Muatan
-block.vault.name = Gudang
-block.wave.name = Penyemprot
-block.tsunami.name = Tsunami
-block.swarmer.name = Peluncur Misil
-block.salvo.name = Salvo
-block.ripple.name = Mortir
-block.phase-conveyor.name = Pengantar Berbahan Phase
-block.bridge-conveyor.name = Jembatan Pengantar
-block.plastanium-compressor.name = Kompresor Plastanium 
-block.pyratite-mixer.name = Penyampur Pyratit
-block.blast-mixer.name = Penyampur Bahan Peledak
-block.solar-panel.name = Panel Surya
-block.solar-panel-large.name = Panel Surya Besar
-block.oil-extractor.name = Pengekstrak Minyak
-block.repair-point.name = Tempat Perbaikan
-block.pulse-conduit.name = Selang Denyut
-block.plated-conduit.name = Pipa Terlapis
-block.phase-conduit.name = Selang Phase
-block.liquid-router.name = Pembagi Zat Cair
-block.liquid-tank.name = Tank Zat Cair
-block.liquid-junction.name = Simpangan Zat Cair
-block.bridge-conduit.name = Jembatan Saluran
-block.rotary-pump.name = Pompa Putaran
-block.thorium-reactor.name = Reaktor Thorium 
-block.mass-driver.name = Penggerak Massal
-block.blast-drill.name = Bor Ledakan Udara
-block.thermal-pump.name = Pompa Suhu Panas
-block.thermal-generator.name = Generator Panas
-block.alloy-smelter.name = Pelebur Paduan Logam
-block.mender.name = Mender
-block.mend-projector.name = Mender Projektor
-block.surge-wall.name = Dinding Listrik
-block.surge-wall-large.name = Dinding Listrik Besar
-block.cyclone.name = Cyclone
-block.fuse.name = Fuse
-block.shock-mine.name = Ranjau Listrik
-block.overdrive-projector.name = Projektor Pemercepat
-block.force-projector.name = Projektor Pelindung
-block.arc.name = Busur Petir
-block.rtg-generator.name = Generator Radiasi
-block.spectre.name = Meriam Raksasa
-block.meltdown.name = Meltdown
-block.foreshadow.name = Foreshadow
-block.container.name = Kontainer
-block.launch-pad.name = Alas Peluncur
-block.segment.name = Segment
-block.command-center.name = Pusat Perintah
-block.ground-factory.name = Pabrik Unit Darat
-block.air-factory.name = Pabrik Unit Udara
-block.naval-factory.name = Pabrik Unit Laut
-block.additive-reconstructor.name = Rekonstruktor Aditif
-block.multiplicative-reconstructor.name = Rekonstruktor Multiplikatif
-block.exponential-reconstructor.name = Rekonstruktor Eksponensial
-block.tetrative-reconstructor.name = Rekonstruktor Tetratif
-block.payload-conveyor.name = Pengantar Massa
-block.payload-router.name = Pengarah Massa
-block.disassembler.name = Pembongkar
-block.silicon-crucible.name = Pelebur Raksasa
-block.overdrive-dome.name = Kubah Projektor Pemercepat
-#experimental, may be removed
-block.block-forge.name = Pemadu Blok
-block.block-loader.name = Pemuat Blok
-block.block-unloader.name = Pembongkar Blok
-block.interplanetary-accelerator.name = Akselerator Antarplanet
-
-block.switch.name = Saklar
-block.micro-processor.name = Prosesor Mikro
-block.logic-processor.name = Prosesor Logika
-block.hyper-processor.name = Prosesor Raksasa
-block.logic-display.name = Tampilan Logika
-block.large-logic-display.name = Tampilan Logika Besar
-block.memory-cell.name = Sel Memori
-block.memory-bank.name = Bank Memori
-
-team.blue.name = biru
-team.crux.name = merah
-team.sharded.name = kuning
-team.orange.name = jingga
-team.derelict.name = abu-abu
-team.green.name = hijau
-team.purple.name = ungu
-
-hint.skip = Lewati
-hint.desktopMove = Tekan [accent][[WASD][] untuk bergerak.
-hint.zoom = [accent]Skrol[] untuk membesarkan atau mengecilkan layar.
-hint.mine = Dekati \uf8c4 bijih tembaga dan [accent]tekan[] untuk menambangnya secara manual.
-hint.desktopShoot = [accent][[Klik][] untuk menembak.
-hint.depositItems = Untuk mentransfer item, tarik item dari pesawatmu ke inti.
-hint.respawn = Untuk muncul kembali seperti awal, tekan [accent][[V][].
-hint.respawn.mobile = Kamu telah mengambil alih kontrol dari sebuah unit/struktur. Untuk muncul kembali, [accent]tekan avatar di kiri atas.[]
-hint.desktopPause = Tekan [accent][[Spasi][] untuk menjeda dan menghentikan jeda permainan.
-hint.placeDrill = Pilih \ue85e [accent]Bor[] menu di kanan bawah, lalu pilih \uf870 [accent]Bor[] dan klik diatas bijih tembaga untuk menaruhnya.
-hint.placeDrill.mobile = Pilih \ue85e[accent]Bor[] tab di menu di kanan bawah, lalu pilih \uf870 [accent]Bor[] dan klik diatas bijih tembaga untuk menaruhnya.\n\nTekan \ue800 [accent]checkmark[] di bawah kanan untuk menkonfirmasi pembangunan.
-hint.placeConveyor = Pengantar dapat memindahkan item dari bor ke blok yang lain. Pilih \uf896 [accent]Pengantar[] dari menu \ue814 [accent]Distribusi[].\n\nKlik dan tarik untuk menaruh beberapa pengantar.\n[accent]Skrol[] untuk memutarnya.
-hint.placeConveyor.mobile = Pengantar dapat memindahkan item dari bor ke blok yang lain. Pilih \uf896 [accent]Pengantar[] dari menu \ue814 [accent]Distribusi[].\n\nTahan jari kamu sebentar dan seret untuk menaruh beberapa pengantar.
-hint.placeTurret = Taruh \uf861 [accent]Turret[] untuk mempertahankan basismu daru musuh.\n\nTurret membutuhkan amunisi - yang satu ini, \uf838copper.\nGunakan pengantar dan bor untuk mengisinya.
-hint.breaking = [accent]Klik kanan[] dan tarik untuk menghancurkan blok.
-hint.breaking.mobile = Aktifkan \ue817 [accent]palu[] di kanan bawah dan tekan untuk menghancurkan blok.\n\nTahan jari kamu sebentar dan seret untuk menghancurkannya.
-hint.research = Gunakan tombol \ue875 [accent]Riset[] untuk mempelajari teknologi baru.
-hint.research.mobile = Gunakan tombol \ue875 [accent]Riset[] di \ue88c [accent]Menu[] untuk mempelajari teknologi baru.
-hint.unitControl = Tahan [accent][[L-ctrl][] dan [accent]klik[] untuk mengendalikan unit atau turret teman.
-hint.unitControl.mobile = [accent][Klik dua kali[] untuk mengendalikan unit atau turret teman.
-hint.launch = Ketika sumber daya sudah mencukupi, kamu bisa [accent]Meluncurkan[] dengan memilih sektor terdekat dari \ue827 [accent]Map[] di kanan bawah.
-hint.launch.mobile = Ketika sumber daya sudah mencukupi, kamu bisa [accent]Meluncurkan[] dengan memilih sektor terdekat dari \ue827 [accent]Map[] di \ue88c [accent]Menu[].
-hint.schematicSelect = Tahan [accent][[F][] dan tarik ke bangunan untuk menyalin bangunan.\n\n[accent][[Klik tengah][] untuk menyalin blok setipe.
-hint.conveyorPathfind = Tahan [accent][[L-Ctrl][] ketika menarik pengantar untuk membuat jalur secara otomatis.
-hint.conveyorPathfind.mobile = Aktifkan \ue844 [accent]diagonal mode[] dan tarik pengantar untuk membuat jalur secara otomatis.
-hint.boost = Tahan [accent][[L-Shift][] untuk terbang dengan unit sekarang.\n\nHanya beberapa unit darat yang memiliki pendorong.
-hint.command = Tekan [accent][[G][] untuk memperintah unit sekitarmu kedalam formasi.
-hint.command.mobile = [accent][[Klik dua kali][] unitmu untuk memperintah unit sekitarmu kedalam formasi.
-hint.payloadPickup = Tekan [accent][[[] untuk membawa blok kecil atau unit.
-hint.payloadPickup.mobile = [accent]Tekan dan tahan[] untuk membawa blok kecil atau unit.
-hint.payloadDrop = Tekan [accent]][] untuk menurunkan muatan.
-hint.payloadDrop.mobile = [accent]Tekan dan tahan[] di lokasi yang kosong untuk menurunkan muatan.
-hint.waveFire = [accent]Wave[] yang terisi dengan air akan memadamkan air dalam jangkauannya.
-hint.generator = \uf879 [accent]Generator Pembakar[] membakar batu bara dan menghasilkan energik ke blok yang berdekatan.\n\nTransmisi energi dapat diperluas menggunakan \uf87f [accent]Tiang Listrik[].
-hint.guardian = Unit [accent]Penjaga[] adalah unit yang diperkuat. Amunisi lemah seperti [accent]Tembaga[] dan [accent]Timah[] [scarlet]tidak berefek pada mereka[].\n\nGunakan turret yang lebih bagus atau gunakan amunisi yang lebih kuat seperti \uf835 [accent]Grafit[] \uf861Duo/\uf859Salvo untuk menghancurkan Penjaga.
-hint.coreUpgrade = Inti dapat ditingkatkan dengan cara [accent]meletakkan yang lebih besar diatasnya[].\n\nLetakan sebuah inti  [accent]Fondasi[] diatas inti  [accent]Shard[]. Pastikan terdapat ruang kosong dari bangunan yang lain.
-hint.presetLaunch = [accent]Zona pendaratan[]yang berwarna abu-abu, seperti [accent]Hutan yang Beku[], dapat diluncurkan dari mana saja. Sektor seperti ini tidak perlu diluncurkan dari sektor terdekat milik kamu.\n\n[accent]Sektor yang bernomor[], seperti yang ini, bisa [accent]dikuasai atau diabaikan[].
-hint.coreIncinerate = Setelah inti penuh dengan suatu barang, barang yang setipe akan [accent]dihancurkan[].
-hint.coopCampaign = Ketika bermain [accent]kampanye multiplayer[], barang yang diproduksi di map ini akan diberikan ke [accent]sektor kamu juga[].\n\nSetiap penelitian baru yang dilakukan oleh host juga akan diberikan kepadamu.
-
-item.copper.description = Bahan struktur yang berguna. Digunakan di semua tipe blok.
-item.copper.details = Tembaga. Logam yang sangat melimpah di Serpulo. Lemah secara struktural kecuali jika diperkuat.
-item.lead.description = Bahan dasar di awal permainan. Digunakan di elektronik dan blok transportasi zat cair.
-item.lead.details = Padat. Lembam. Biasanya digunakan dalam baterai.\nCatatan : Kemungkinan beracun untuk kehidupan biologis. Bukan berarti tidak banyak disini.
-item.metaglass.description = Kaca yang super-kuat. Digunakan untuk distribusi zar cair dan penyimpanan.
-item.graphite.description = Karbon termineralisasi, dipakai untuk amunisi dan penyekatan listrik.
-item.sand.description = Digunakan sebagai produksi untuk material yang akan dimurnikan. 
-item.coal.description = Digunakan sebagai bahan bakar dan memurnikan material.
-item.coal.details = Hasil dari tumbuhan yang menjadi fosil, sudah terjadi sangat lama sebelum spora-spora menyebar.
-item.titanium.description = Digunakan di transportasi zat cair, bor dan pesawat terbang.
-item.thorium.description = Digunakan dalam struktur tahan lama dan sebagai bahan bakar nuklir.
-item.scrap.description = Dilebur dan dimurnikan menjadi material lain.
-item.scrap.details = Sisa sisa bangunan dan unit tua.
-item.silicon.description = Digunakan di panel surya, bahan elektronik yang kompleks, dan amunisi yang bisa mengejar.
-item.plastanium.description = Digunakan dalam unit canggih, isolasi dan amunisi fragmentasi .
-item.phase-fabric.description = Digunakan di elektronik canggih dan teknologi perbaikan diri sendiri.
-item.surge-alloy.description = Digunakan di pertahanan yang lebih canggih dan struktur pertahanan reaktif.
-item.spore-pod.description = Digunakan untuk produksi minyak, bahan peledak dan bahan bakar.
-item.spore-pod.details = Spora. Sepertinya bentuk kehidupan sintetis. Menghasilkan gas beracun yang meracuni kehidupan biologis lainnya. Sangat mudah menyebar. Sangat mudah terbakar dalam kondisi tertentu.
-item.blast-compound.description = Senyawa yang digunakan sebagai bom dan amunisi peledak.
-item.pyratite.description = Digunakan di senjata pembakar dan generator yang membutuhkan bahan mudah terbakar.
-
-liquid.water.description = Umumnya digunakan untuk mendinginkan bor dan turret.
-liquid.slag.description = Berbagai campuran tipe logam yang meleleh. Dapat dipisahkan menjadi mineral masing-masing, atau disemprotkan ke musuh sebagai senjata.
-liquid.oil.description = Digunakan di produksi material lanjutan dan sebagai amunisi yang mudah terbakar.
-liquid.cryofluid.description = Digunakan sebagai pendingin di reaktor, turret, dan pabrik.
-
-block.resupply-point.description = Mengisi ulang amunisi unit terdekat dengan tembaga. Jika tidak bisa berarti unit tersebut membutuhkan baterai.
-block.armored-conveyor.description = Memindahkan barang sama cepatnya dengan pengantar titanium, namun memiliki lebih banyak armor. Tidak dapat menerima masukan dari samping dari apapun kecuali dari pengantar.
-block.illuminator.description = Sebuah lampu kecil untuk menerangi daerah sekitar. Perlu listrik untuk bekerja.
-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 sebagai pendingin.
-block.silicon-smelter.description = Melebur pasir dengan batu bara untuk memproduksi silikon.
-block.kiln.description = Membakar pasir dan timah menjadi kaca meta. Membutuhkan tenaga.
-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.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 rongsokan menjadi lava.
-block.separator.description = Mengekstrak komponen mineral dari lava.
-block.spore-press.description = Menekan polong spora menjadi minyak.
-block.pulverizer.description = Menghancurkan kepingan menjadi pasir. Berguna jika tidak ada pasir disekitar.
-block.coal-centrifuge.description = Memadatkan minyak menjadi bongkahan batu bara.
-block.incinerator.description = Menghancurkan mineral atau zat cair sisa.
-block.power-void.description = Menghilangkan semua tenaga yang masuk kedalamnya. Sandbox eksklusif.
-block.power-source.description = Menghasilkan tenaga tak terbatas. Sandbox eksklusif.
-block.item-source.description = Mengeluarkan item tak terhingga. Sandbox eksklusif.
-block.item-void.description = Menghancurkan item apa saja tanpa penggunaan tenaga. Sandbox eksklusif.
-block.liquid-source.description = Mengeluarkan zat cair tak terhingga. Sandbox eksklusif.
-block.liquid-void.description = Menghancurkan zat cair apa saja tanpa penggunaan tenaga. Sandbox eksklusif.
-block.copper-wall.description = Blok pelindung murah.\nBerguna untuk melindungi inti dan menara di beberapa gelombang awal.
-block.copper-wall-large.description = Blok pelindung murah.\nBerguna untuk melindungi inti dan menara di beberapa gelombang awal.\nSebesar 4 kotak.
-block.titanium-wall.description = Blok pelindung kekuatan yang sedang.\nMemberi perlindungan yang sedang dari musuh.
-block.titanium-wall-large.description = Blok pelindumg dengan kekuatan yang sedang.\nMemberi perlindungan yang sedang dari musuh.\nSebesar 4 kotak.
-block.plastanium-wall.description = Dinding spesial yang menyerap listrik arca dan memblokir koneksi simpul tenaga otomatis.
-block.plastanium-wall-large.description = Dinding spesial yang menyerap listrik arca dan memblokir koneksi simpul tenaga otomatis.\nSebesar 4 kotak.
-block.thorium-wall.description = Blok pelindung yang kuat.\nPelindung bagus dari musuh.
-block.thorium-wall-large.description = Blok pelindung yang kuat.\nPelindung bagus dari musuh.\nSebesar 4 blok.
-block.phase-wall.description = Tidak sekuat dinding thorium tetapi akan memantulkan peluru senjata jika tidak terlalu kuat.
-block.phase-wall-large.description = Tidak sekuat dinding thorium tetapi akan memantulkan peluru senjata jika tidak terlalu kuat. \nSebesar 4 blok.
-block.surge-wall.description = Blok pelindung terkuat.\nMempunyai kemungkinan untuk menyetrum penyerang.
-block.surge-wall-large.description = Blok pelindung terkuat.\nMempunyai kemungkinan untuk menyetrum penyerang. \nSebesar 4 blok.
-block.door.description = Pintu kecil yang bisa dibuka-tutup dengan menekannya.\nJika dibuka, musuh bisa masuk dan menembak.
-block.door-large.description = Pintu kecil yang bisa dibuka-tutup dengan menekannya.\nJika dibuka, musuh bisa masuk dan menembak.\nSebesar 4 blok.
-block.mender.description = Menyembuhkan blok di sekelilingnya secara berkala. Menjaga keutuhan pertahanan di sela-sela gelombang.\nDapat menggunakan silikon untuk meningkatkan jangkauan dan efisiensi.
-block.mend-projector.description = Versi mender yang lebih besar. Menyembuhkan blok di sekelilingnya secara berkala.\nDapat menggunakan phase untuk meningkatkan jangkauan dan efisiensi.
-block.overdrive-projector.description = Menambah kecepatan bangunan sekitar, seperti bor dan pengantar.
-block.force-projector.description = Membentuk medan gaya berbentuk heksagon disekitar, melindungi bangunan dan unit didalamnya dari tembakan. Dapat mengalami kelebihan panas jika membendung terlalu banyak kerusakan. Bisa menggunakan cairan untuk mendinginkan. Gunakan fabrik phase untuk memperbesar jangkauan.
-block.shock-mine.description = Mencedera musuh yang menginjak ranjau. Hampir tak kasat mata kepada musuh.
-block.conveyor.description = Blok transportasi dasar. Memindahkan item ke kubah ataupun pabrik. Bisa diputar.
-block.titanium-conveyor.description = Blok transportasi canggih. Memindahkan item lebih cepat daripada pengantar biasa.
-block.plastanium-conveyor.description = Memindahkan barang secara bertumpuk.\nMenerima barang dari belakang, dan membaginya ke tiga arah di depan.\nMembutuhkan beberapa titik pemuat dan pembongkar untuk hasil yang maksimal.
-block.junction.description = Berguna seperti jembatan untuk dua pengantar yang bersimpangan. Berguna di situasi dimana dua pengantar berbeda membawa bahan berbeda ke lokasi yang berbeda.
-block.bridge-conveyor.description = Blok transportasi item canggih. bisa memindahkan item hingga 3 blok panjang melewati apapun lapangan atau bangunan.
-block.phase-conveyor.description = Blok transportasi canggih. Menggunakan tenaga untuk teleportasi item ke sambungan pengantar phase melewati beberapa blok.
-block.sorter.description = Memilah Item. Jika item cocok dengan seleksi, itemnya diperbolehkan lewat. Jika tidak, item akan dikeluarkan dari kiri dan/atau kanan.
-block.inverted-sorter.description = Sama seperti penyortir, melainkan mengeluarkan item terpilih ke samping.
-block.router.description = Menerima bahan dari satu arah dan mengeluarkannya ke 3 arah yang sama. Bisa juga menyimpan sejumlah bahan. Berguna untuk memisahkan bahan dari satu sumber ke target yang banyak.
-block.router.details = Bisa sangat menggangu. Jangan meletakannya disamping input produksi, karena bisa tersumbat oleh output.
-block.distributor.description = Pemisah canggih yang memisah item ke 7 arah berbeda bersamaan.
-block.overflow-gate.description = Kombinasi antara pemisah dan penyortir yang hanya mengeluarkan item ke kiri dan/atau ke kanan jika bagian depan tertutup.
-block.underflow-gate.description = Kebalikan dari gerbang luap. Mengeluarkan ke depan jika kanan dan kiri tertutup.
-block.mass-driver.description = Blok item transportasi tercanggih. Membawa beberapa item dan menembaknya ke penggerak massal lainnya dari arah yang jauh.
-block.mechanical-pump.description = Pompa murah dengan pengeluaran yang pelan, tetapi tidak mengkonsumsi tenaga.
-block.rotary-pump.description = Pompa canggih yang kecepatannya dua kali lipat jika menggunakan tenaga.
-block.thermal-pump.description = Pompa Tercanggih.
-block.conduit.description = Blok transportasi zat cair umum. Bekerja seperti pengantar, tetapi untuk zat cair.
-block.pulse-conduit.description = Blok transportasi zat cair canggih. Memindahkan dan  menyimpan zat cair lebih cepat dan banyak daripada saluran biasa.
-block.plated-conduit.description = Sama seperti pengantar berlapis baja, tetapi menuju ke zat cair. Lebih sedikit bocor.
-block.liquid-router.description = Menerima zat cair dari satu arah dan mengeluarkannya ke 3 arah yang sama. Bisa juga menyimpan sejumlah zat cair. Berguna untuk memisahkan zat cair dari satu sumber ke target yang banyak.
-block.liquid-tank.description = Menyimpan jumlah zat cair yang banyak. Gunakan sebagai penyangga ketika kebutuhan zat cair tidak konstan atau sebagai penjaga untuk mendinginkan blok yang vital.
-block.liquid-junction.description = Berguna seperti jembatan untuk dua saluran yang bersimpangan. Berguna di situasi dimana dua saluran berbeda membawa zat cair berbeda ke lokasi yang berbeda.
-block.bridge-conduit.description = Blok transportasi zat cair canggih. bisa memindahkan zat cair hingga 3 blok panjang melewati apapun lapangan atau bangunan.
-block.phase-conduit.description = Blok transportasi zat cair canggih. Menggunakan listrik untuk teleportasi zat zair ke saluran phase yang terhubung dari jarak jauh.
-block.power-node.description = Membawa tenaga ke tiang tersambung. hingga empat sumber listrik, sambungan atau tiang lainnya yang bisa disambung. Tiang akan mendapatkan atau memberi tenaga ke/dari blok yang disambung.
-block.power-node-large.description = Mempunyai radius lebih besar dari tiang listrik biasa dan bisa menyambung hingga enam sumber listrik, sambungan atau tiang lainnya.
-block.surge-tower.description = Sebuah menara listrik dengan jangkauan sangat jauh tetapi sambungan yang sedikit.
-block.diode.description = Tenaga baterai dapat mengalir hanya dari satu arah, tetapi hanya jika tenaga di sebelah lebih sedikit.
-block.battery.description = Menyimpan tenaga jika ada kelimpahan dan memberikan tenaga jika ada kekurangan, asalkan ada kapasitas tersisa.
-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.steam-generator.description = Lebih efisien daripada generator pembakar, tetapi membutuhkan tambahan air.
-block.differential-generator.description = Menghasilkan tenaga dalam jumlah banyak. 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 tenaga dalam jumlah kecil dari sinar matahari.
-block.solar-panel-large.description = Menghasilkan lebih banyak tenaga dari panel surya biasa, tapi lebih mahal untuk dibangun.
-block.thorium-reactor.description = Menghasilkan tenaga yang besar dari konsumsi thorium. Membutuhkan pendinginan konstan. Akan meledak jika tidak cukup pendingin . Pengeluaran tenaga tergantung kepenuhan.
-block.impact-reactor.description = Sebuah generator yang lebih maju, dapat menghasilkan tenaga dengan jumlah yang sangat banyak. Memerlukan tenaga untuk menyalakan reaktor terlebih dahulu.
-block.mechanical-drill.description = Bor murah. Saat ditaruh ditempat yang sesuai, mengeluarkan item dengan pelan tanpa batas.
-block.pneumatic-drill.description = Bor lebih cepat dari bor mekanik dan bisa memproses bahan lebih keras dengan menggunakan tekanan udara.
-block.laser-drill.description = Mengebor lebih cepat lewat teknologi laser, tapi membutuhkan tenaga. Bisa menambang thorium dengan bor ini.
-block.blast-drill.description = Bor tercanggih. Membutuhkan banyak tenaga.
-block.water-extractor.description = Mengekstrak air dari tanah. Gunakan jika tidak ada sumber air disekitar.
-block.cultivator.description = Menumbuhkan konsentrasi spora yang kecil di atmosfer menjadi polong spora.
-block.cultivator.details = Teknologi yang dipulihkan. Digunakan untuk memproduksi biomassa secara efesien. Kemungkinan merupakan inkubator awal dari spora yang sekarang menutupi Serpulo.
-block.oil-extractor.description = Menggunakan tenaga cukup besar untuk mengekstrak minyak dari pasir. Gunakan jika tidak ada sumber minyak disekitar.
-block.core-shard.description = Versi pertama dari pengulangan kapsul inti. Jika hancur, Semua kontak dengan daerah akan hilang. Jangan biarkan ini terjadi.
-block.core-shard.details = Iterasi pertama. Padat. Bisa menggandakan dirinya (untuk menguasai sektor disekitarnya). Dilengkapi dengan pendorong yang sekali pakai. Tidak didesain untuk perjalanan antar planet.
-block.core-foundation.description = Versi kedua dari inti. Lebih kuat. Menyimpan banyak sumber daya.
-block.core-foundation.details = Iterasi kedua.
-block.core-nucleus.description = Versi ketiga dan pengulangan terakhir dari kapsul inti. Sangat kuat. Menyimpan sangat banyak sumber daya.
-block.core-nucleus.details = Iterasi ketiga dan yang terakhir.
-block.vault.description = Menyimpan semua tipe item berkuantitas besar. [lightgray] pembongkar muatan[] bisa digunakan untuk mengeluarkan item dari gudang.
-block.container.description = Menyimpan semua tipe item. [lightgray] pembongkar muatan[] bisa digunakan untuk mengeluarkan item dari kontainer.
-block.unloader.description = Mengeluarkan item dari kontainer, gudang atau inti kedalam pengantar atau langsung ke blok yang dituju. Tipe item yang dimuat bisa diganti dengan mengetuk pembongkar muatan.
-block.launch-pad.description = Meluncurkan beberapa item tanpa meninggalkan tempat.
-block.duo.description = Menembakkan peluru bergantian ke musuh.
-block.scatter.description = Menembakkan gumpalan timah, rongsokan atau metaglass ke musuh udara.
-block.scorch.description = Membakar musuh darat yang dekat dengannya. Sangat efektif dalam jarak dekat.
-block.hail.description = Menembakkan peluru kecil ke musuh darat dari jarak jauh.
-block.wave.description = Menembakkan aliran cairan ke musuh. Secara otomatis memadamkan api saat disuplai dengan air.
-block.lancer.description = Memuat dan menembakkan sinar energi yang kuat ke target darat.
-block.arc.description = Menembak petir ke musuh darat.
-block.swarmer.description = Menembakkan misil yang mengejar ke arah musuh.
-block.salvo.description = Menembakkan peluru cepat ke arah musuh.
-block.fuse.description = Menembakkan tiga penusuk tajam jarak dekat ke musuh terdekat.
-block.ripple.description = Menembak cangkang berkelompok ke musuh darat dari jarak jauh.
-block.cyclone.description = Menembakkan gumpalan peledak ke musuh terdekat.
-block.spectre.description = Menembakkan peluru besar yang menembus lapis baja ke target udara dan darat.
-block.meltdown.description = Mengisi dan menembakkan sinar laser yang terus-menerus ke musuh di sekitar. Membutuhkan pendingin untuk beroperasi.
-block.foreshadow.description = Menembak baut besar jarak jauh yang hanya menembak satu target.
-block.repair-point.description = Terus menerus memulihkan unit terluka disekitar.
-block.segment.description = Merusakkan dan menghancurkan proyektil yang datang. Proyektil laser tidak akan ditargetkan.
-block.parallax.description = Menembak laser yang menarik target udara, juga merusaknya selama dalam proses.
-block.tsunami.description = Menembak cairan dalam jumlah dan tekanan besar ke arah musuh. Akan memadamkan api secara otomatis jika diisi dengan air.
-block.silicon-crucible.description = Memurnikan silikon dari pasir dan batubara, menggunakan pyratit sebagai sumber panas tambahan. Lebih efesien jika diletakkan di area yang panas.
-block.disassembler.description = Memisahkan lava menjadi mineral langka dalam efesiensi rendah. Bisa memproduksi thorium.
-block.overdrive-dome.description =  Menambah kecepatan kepada bangunan disekitarnya. Membutuhkan phase dan silikon untuk bekerja.
-block.payload-conveyor.description = Memindahkan muatan yang besar, seperti unit dari pabrik.
-block.payload-router.description = Membagi muatan masukan menjadi 3 arah keluaran.
-block.command-center.description = Mengontrol perilaku unit dengan beberapa perintah berbeda.
-block.ground-factory.description = Memproduksi unit darat. Hasil unit dapat digunakan secara langsung, atau dipindah ke rekonstruktor untuk ditingkatkan.
-block.air-factory.description = Memproduksi unit udara. Hasil unit dapat digunakan secara langsung, atau dipindah ke rekonstruktor untuk ditingkatkan.
-block.naval-factory.description = Memproduksi unit laut. Hasil unit dapat digunakan secara langsung, atau dipindah ke rekonstruktor untuk ditingkatkan.
-block.additive-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat dua
-block.multiplicative-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat tiga.
-block.exponential-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat empat.
-block.tetrative-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat lima dan terakhir.
-block.switch.description = Sakelar yang dapat dialihkan. Status dapat dibaca dan dikontrol dengan prosesor logika.
-block.micro-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan.
-block.logic-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. Lebih cepat dibandingkan prosesor mikro.
-block.hyper-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. Lebih cepat dibandingkan prosesor logika.
-block.memory-cell.description = Menyimpan informasi untuk prosesor.
-block.memory-bank.description = Menyimpan informasi untuk prosesor. Berkapasitas besar.
-block.logic-display.description = Menampilkan grafik sembarang dari prosesor.
-block.large-logic-display.description = Menampilkan grafik sembarang dari prosesor. Lebih besar.
-block.interplanetary-accelerator.description = Sebuah menara railgun elektromagnetik raksasa. Meluncurkan Inti dengan kecepatan tinggi untuk peluncuran antarplanet.
-
-unit.dagger.description = Menembak musuh terdekat dengan amunisi standar.
-unit.mace.description = Menyerang musuh terdekat dengan cara membakarnya.
-unit.fortress.description = Menembak musuh darat dengan altileri jarak jauh.
-unit.scepter.description = Menembak semua musuh terdekat dengan rentetan peluru bermuatan listrik.
-unit.reign.description = Menembak semua musuh terdekat dengan gugusan peluru tajam dalam jumlah banyak.
-unit.nova.description = Menembak baut laser yang dapat merusak musuh dan memperbaiki bangunan teman. Dapat terbang.
-unit.pulsar.description = Menembak petir yang dapat merusak musuh dan memperbaiki bangunan teman. Dapat terbang.
-unit.quasar.description = Menembak sinar laser yang dapat menembus bangunan yang dapat merusak musuh dan memperbaiki bangunan teman. Dapat terbang. Memiliki perisai.
-unit.vela.description = Menembak sinar laser besar dan kontinu yang dapat merusak musuh, membakarnya dan memperbaiki bangunan musuh. Dapat terbang.
-unit.corvus.description = Menembak sinar laser besar yang dapat merusak musuh dan memperbaiki bangunan teman. Dapat berjalan diatas hampir semua medan.
-unit.crawler.description = Berlari menuju musuh dan menghancurkan dirinya, yang dapat menghasilkan ledakan besar.
-unit.atrax.description = Menembak musuh dengan cairan lava kepada target darat. Dapat berjalan diatas hampir semua medan.
-unit.spiroct.description = Menembak laser pelemah kepada musuh, dapat memperbaiki dirinya dalam proses. Dapat berjalan diatas hampir semua medan.
-unit.arkyid.description = Menembak laser pelemah besar kepada musuh, dapat memperbaiki dirinya dalam proses. Dapat berjalan diatas hampir semua medan.
-unit.toxopid.description = Menembak gugusan cangkang energi besar dan laser penusuk kepada musuh. Dapat berjalan diatas hampir semua medan.
-unit.flare.description = Menembak musuh darat terdekat dengan amunisi standar.
-unit.horizon.description = Menjatuhkan gugusan bom kepada musuh darat.
-unit.zenith.description = Menembak misil kepada musuh terdekat.
-unit.antumbra.description = Menembak rentetan peluru kepada musuh terdekat.
-unit.eclipse.description = Menembak dua sinar laser dan rentetan peluru kepada musuh terdekat.
-unit.mono.description = Menambang tembaga dan timah secara otomatis, membawanya menuju inti.
-unit.poly.description = Membangun kembali bangunan yang hancur secara otomatis dan membantu unit lain dalam pembangunan.
-unit.mega.description = Memperbaiki bangunan secara otomatis. Dapat membawa bangunan dan unit darat kecil. 
-unit.quad.description = Menjatuhkan bom besar kepada target darat, yang bisa memberbaiki struktur teman dan merusak musuh. Dapat membawa unit darat berukuran sedang.
-unit.oct.description = Melindungi teman disekitarnya dengan perisai yang dapat beregenerasi. Dapat membawa hampir semua unit darat.
-unit.risso.description = Menembak misil dan peluru kepada semua musuh terdekat.
-unit.minke.description = Menembak cangkang pembakar dan peluru standar kepada musuh darat terdekat.
-unit.bryde.description = Menembak altileri jarak jauh dan misil kepada musuh.
-unit.sei.description = Menembak rentetan misil dan peluru yang dapat menembus baju besi kepada musuh.
-unit.omura.description = Menembak railgun jarak jauh kepada musuh. Dapat memproduksi unit flare.
-unit.alpha.description = Melindungi Inti Bagian dari musuh. Dapat membangun.
-unit.beta.description = Melindungi Inti Fondasi dari musuh. Dapat membangun.
-unit.gamma.description = Melindungi Inti Nukleus dari musuh. Dapat membangun.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index dd1d40f0f7..408ed5bb19 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -2,17 +2,19 @@ credits.text = Creato da [royal]Anuken[] - [sky]anukendev@gmail.com[]\n\nVersion
 credits = Crediti
 contributors = Traduttori e Contributori
 discord = Entra nel server Discord di Mindustry!
-link.discord.description = La chatroom ufficiale del server Discord di Mindustry
+link.discord.description = Il server Discord ufficiale di Mindustry
 link.reddit.description = Il subreddit di Mindustry!
 link.github.description = Codice sorgente del gioco
 link.changelog.description = Elenco delle modifiche del gioco
-link.dev-builds.description = Build di sviluppo versioni instabili
+link.dev-builds.description = Build in sviluppo versioni instabili
 link.trello.description = Sezione ufficiale Trello per funzionalità pianificate
 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.suggestions.description = Suggerisci nuove funzionalità
+link.bug.description = Trovato uno? Segnalalo qui
+linkopen = Questo server ti ha inviato un link, sicuro di volerlo aprire?\n\n[sky]{0}
 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.
@@ -23,7 +25,6 @@ gameover.waiting = [accent]In attesa della prossima mappa...
 highscore = [accent]Nuovo record!
 copied = Copiato.
 indev.notready = Questa parte del gioco non è ancora pronta
-indev.campaign = [accent]Congratulazioni! Hai raggiunto la fine della modalità campagna![]\n\nI contenuti per ora si fermano qui. In qualche aggiornamento futuro scoprirai i viaggi interplanetari.
 
 load.sound = Suoni
 load.map = Mappe
@@ -39,10 +40,23 @@ be.updating = Aggiornamento in corso...
 be.ignore = Ignora
 be.noupdates = Nessun aggiornamento disponibile.
 be.check = Verifica aggiornamenti
+mods.browser = Mod Browser
+mods.browser.selected = Mod selezionata
+mods.browser.add = Installa mod
+mods.browser.reinstall = Reinstalla mod
+mods.browser.view-releases = Vedi versioni
+mods.browser.noreleases = [scarlet]Nessuna versione trovata\n[accent]Cerca se la mod ha delle versioni 
+mods.browser.latest = <Ultima versione>
+mods.browser.releases = Versioni
+mods.github.open = Repo
+mods.github.open-release = Pagina delle versioni di Mindustry
+mods.browser.sortdate = Ordinato per data
+mods.browser.sortstars = Ordinato per stelle
 
 schematic = Schematica
 schematic.add = Salva Schematica...
 schematics = Schematiche
+schematic.search = Search schematics...
 schematic.replace = Esiste già una schematica con questo nome. Sostituirla?
 schematic.exists = Esiste già una schematica con questo nome.
 schematic.import = Importa schematica
@@ -55,19 +69,27 @@ schematic.shareworkshop = Condividi nel Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Ruota Schematica
 schematic.saved = Schematica salvata.
 schematic.delete.confirm = Questa schematica sarà cancellata definitivamente.
-schematic.rename = Rinomina Schematica
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blocchi
 schematic.disabled = [scarlet]Schematiche disabilitate[]\nNon hai il permesso di usare schematiche in questa [accent]mappa[] o [accent]server.
+schematic.tags = Tags:
+schematic.edittags = Modifiga Tag
+schematic.addtag = Aggiungi Tag
+schematic.texttag = Tag di testo
+schematic.icontag = Tag immagine
+schematic.renametag = Rinomina Tag
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Eliminare il tag definitivamente?
+schematic.tagexists = Tag già esistente.
 
 stats = Statistiche
-stat.wave = Ondate Sconfitte:[accent] {0}
-stat.enemiesDestroyed = Nemici Distrutti:[accent] {0}
-stat.built = Costruzioni Erette:[accent] {0}
-stat.destroyed = Costruzioni Distrutte:[accent] {0}
-stat.deconstructed = Costruzioni Smantellate:[accent] {0}
-stat.delivered = Risorse Lanciate:
-stat.playtime = Tempo Di Gioco:[accent] {0}
-stat.rank = Livello Finale: [accent]{0}
+stats.wave = Ondate sconfitte
+stats.unitsCreated = Unità create
+stats.enemiesDestroyed = Nemici distrutti
+stats.built = Edifici costruiti
+stats.destroyed = Edifici distrutti
+stats.deconstructed = Edifici smantellati
+stats.playtime = Tempo giocato
 
 globalitems = [accent]Oggetti Globali
 map.delete = Sei sicuro di voler eliminare la mappa '[accent]{0}[]'?
@@ -77,12 +99,15 @@ level.mode = Modalità di Gioco:
 coreattack = < Il Nucleo è sotto attacco! >
 nearpoint = [[ [scarlet]LASCIA LA ZONA NEMICA IMMEDIATAMENTE[] ]\nautodistruzione imminente
 database = Database Nucleo
+database.button = Database
 savegame = Salva
 loadgame = Carica
 joingame = Unisciti al Gioco
 customgame = Gioco Personalizzato
 newgame = Nuova partita
 none = <niente>
+none.found = [lightgray]<non trovato>
+none.inmap = [lightgray]<ninte nella mappa>
 minimap = Minimappa
 position = Posizione
 close = Chiudi
@@ -102,25 +127,39 @@ uploadingpreviewfile = Carico File di Anteprima
 committingchanges = Applicando le Modifiche
 done = Fatto
 feature.unsupported = Il tuo dispositivo non supporta questa funzione.
-
-mods.alphainfo = Tieni a mente che queste mod sono in alpha e[scarlet] possono contenere molti bug[]. Segnala eventuali problemi che trovi sulla pagina GitHub o sul server Discord di Mindustry.
+mods.initfailed = [red]⚠[] L'ultimo avvio di Mindustry non è riuscito. Questo potrebbe essere a causa delle mod.\n\nè consigliato disabilitare tutte le mod.[]
 mods = Mod
 mods.none = [lightgray]Nessuna mod trovata!
 mods.guide = Guida per il modding
 mods.report = Segnala un Bug
 mods.openfolder = Apri Cartella
+mods.viewcontent = Vedi contenuto
 mods.reload = Ricarica
 mods.reloadexit = Il gioco si chiuderà per ricaricare le mod.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Abilitato
 mod.disabled = [scarlet]Disabilitato
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Disabilita
+mod.version = Version:
 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]Non compatibile con V6 (Versione minima: 105)
-mod.missingdependencies = [scarlet]Dipendenze mancanti: {0}
+mod.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Errori di Contenuto
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Richiede la versione del gioco: [accent]{0}[]\nIl tuo gioco è obsoleto. Questa mod richiede una versione più recente del gioco (possibilmente una versione beta/alpha) per funzionare.
+mod.outdatedv7.details = Questa mod è incompatibile con l'ultima versione del gioco. L'autore deve aggiornarla e aggiungere [accent]minGameVersion: 136[] al suo file [accent]mod.json[].
+mod.blacklisted.details = Questa mod è stata messa manualmente nella blacklist perchè provoca crash o altri problemi in questa versione del gioco. Non usarla.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Si sono verificati degli errori durante il caricamento del contenuto.
 mod.noerrorplay = [scarlet]Sono presenti delle mod con errori.[] Puoi disabilitare le mod affette oppure sistemarle prima di giocare.
 mod.nowdisabled = [scarlet]Alla mod '{0}' mancano delle dipendenze:[accent] {1}\n[lightgray]Queste mod devono essere scaricate prima.\nQuesta mod verrà disabilitata automaticamente.
@@ -130,7 +169,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]Le mod JAR mod sono intrinsecamente pericolose.[]\nAssicuratevi di star importando questa mod da una fonte affidabile!!
+mod.jarwarn = [scarlet]Le mod JAR mod sono intrinsecamente [orange]pericolose[].[red]\nAssicuratevi di star importando questa mod da una fonte affidabile!!
 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}
@@ -142,14 +181,23 @@ 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.
+search = Cerca:
 planetmap = Mappa Pianeta
 launchcore = Lancia Nucleo
 filename = Nome File:
 unlocked = Nuovo contenuto sbloccato!
 available = Nuova scoperta disponibile!
+unlock.incampaign = < Scopri in campagnia per ulteriori informazioni >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Completato
 techtree = Albero Scoperte
-research.legacy = Sono stati trovati dati dell'albero delle scoperte della [accent]v5.0[]\nVuoi [accent]caricare questi dati[], o [accent]scartarli[] e ricominciare le scoperte nella nuova campagna (consigliato)?
+techtree.select = Seleziona albero delle scoperte
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Carica
 research.discard = Scarta
 research.list = [lightgray]Ricerca:
@@ -157,7 +205,7 @@ research = Albero Scoperte
 researched = [lightgray]{0} cercati.
 research.progress = {0}% completato
 players = {0} giocatori online
-players.single = {0} giocatore online
+players.single = {0} giocatori online
 players.search = Cerca
 players.notfound = [gray]Nessun giocatore trovato
 server.closing = [accent]Chiusura server...
@@ -193,6 +241,7 @@ hosts.none = [lightgray]Nessuna partita locale trovata!
 host.invalid = [scarlet]Impossibile connettersi all'host.
 
 servers.local = Server Locali
+servers.local.steam = Open Games & Local Servers
 servers.remote = Server Remoti
 servers.global = Server Community
 
@@ -200,14 +249,25 @@ servers.disclaimer = I server della Community [accent]non[] appartengono o sono
 servers.showhidden = Mostra Server Nascosti
 server.shown = Visibile
 server.hidden = Nascosto
+viewplayer = Spettatore di: [accent]{0}
 
 trace = Traccia Giocatore
 trace.playername = Nome del Giocatore: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID univoco: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Client Mobile: [accent]{0}
 trace.modclient = Client Personalizzato: [accent]{0}
+trace.times.joined = Accessi: [accent]{0}
+trace.times.kicked = Espulsioni: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = ID client non valido! Segnala un bug.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Lista Bans
 server.bans.none = Nessun giocatore bandito trovato!
 server.admins = Amministratori
@@ -221,10 +281,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Build Personalizzata
 confirmban = Sei sicuro di voler bandire "{0}[white]"?
 confirmkick = Sei sicuro di voler espellere "{0}[white]"?
-confirmvotekick = Sei sicuro di voler votare per l'espulsione di "{0}[white]"?
 confirmunban = Sei sicuro di voler riammettere questo giocatore?
 confirmadmin = Sei sicuro di voler rendere "{0}[white]" un amministratore?
 confirmunadmin = Sei sicuro di voler rimuovere lo stato di amministratore da "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Unisciti alla Partita
 joingame.ip = Indirizzo:
 disconnect = Disconnesso.
@@ -232,16 +293,18 @@ disconnect.error = Errore di connessione.
 disconnect.closed = Connessione chiusa.
 disconnect.timeout = Connessione scaduta.
 disconnect.data = Errore durante il caricamento del mondo!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossibile unirsi alla partita ([accent]{0}[]).
 connecting = [accent]Connessione in corso...
 reconnecting = [accent]Riconnessione in corso...
 connecting.data = [accent]Caricamento del mondo...
 server.port = Porta:
-server.addressinuse = Indirizzo già in uso!
 server.invalidport = Numero porta non valido!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [scarlet]Errore nell'hosting del server.
 save.new = Nuovo Salvataggio
 save.overwrite = Sei sicuro di voler sovrascrivere questo salvataggio?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Sovrascrivi
 save.none = Nessun salvataggio trovato!
 savefail = Salvataggio del gioco non riuscito!
@@ -262,6 +325,7 @@ save.corrupted = Salvataggio corrotto o non valido!
 empty = <vuoto>
 on = On
 off = Off
+save.search = Ricerca giochi salvati...
 save.autosave = Salvataggio Automatico: {0}
 save.map = Mappa: {0}
 save.wave = Ondata: {0}
@@ -277,9 +341,30 @@ ok = OK
 open = Apri
 customize = Personalizza
 cancel = Annulla
+command = Comando
+command.queue = [lightgray][Queuing]
+command.mine = Mina
+command.repair = Ripara
+command.rebuild = Ricostruisci
+command.assist = Aiuta giocatore
+command.move = Muovi
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Apri Link
 copylink = Copia link
 back = Indietro
+max = Max
+objective = Map Objective
 crash.export = Esporta Logs del Crash
 crash.none = Nessun Log trovato.
 crash.exported = Crash logs esportati.
@@ -290,16 +375,18 @@ data.exported = Dati esportati.
 data.invalid = Questi non sono dati di gioco validi.
 data.import.confirm = Importare dati di gioco esterni sovrascriverà[scarlet] tutti[] i tuoi progressi attuali.\n[accent]L'operazione è irreversibile![]\n\nUna volta importati i dati, il gioco si chiuderà immediatamente.
 quit.confirm = Sei sicuro di voler uscire?
-quit.confirm.tutorial = Sei sicuro di sapere cosa stai facendo? Il tutorial può essere ripetuto in[accent]\nImpostazioni -> Gioco -> Ripeti il Tutorial.[]
 loading = [accent]Caricamento in Corso...
-reloading = [accent]Ricaricamento delle mod...
+downloading = [accent]Downloading...
 saving = [accent]Salvataggio in corso...
 respawn = [accent][[{0}][] per rinascere nel nucleo
 cancelbuilding = [accent][[{0}][] per pulire la selezione
 selectschematic = [accent][[{0}][] per selezionare+copiare
 pausebuilding = [accent][[{0}][] per smettere di costruire
 resumebuilding = [scarlet][[{0}][] per riprendere a costruire
+enablebuilding = [scarlet][[{0}][] per abilitare la costruzione
 showui = Interfaccia utente nascosta.\nPremere [accent][[{0}][] per mostrarla nuovamente.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Ondata {0}
 wave.cap = [accent]Ondata {0}/{1}
 wave.waiting = [lightgray]Ondata tra {0}
@@ -329,12 +416,17 @@ map.publish.confirm = Vuoi pubblicare questa mappa?\n\n[lightgray]Assicurati di
 workshop.menu = Seleziona cosa vorresti fare con questo elemento.
 workshop.info = Info Elemento
 changelog = Changelog (opzionale):
+updatedesc = Sovrascrivere titolo e descrizione
 eula = Steam EULA
 missing = Questo prodotto è stato eliminato o spostato.\n[lightgray]L'elemento è stato scollegato automaticamente dal Workshop.
 publishing = [accent]Pubblicazione...
 publish.confirm = Sei sicuro di volerlo pubblicare?\n\n[lightgray]Assicurati di accettare il contratto EULA del Workshop o i tuoi prodotti non verranno mostrati!
 publish.error = Errore nella pubblicazione del prodotto: {0}
 steam.error = Impossibile inizializzare i servizi di Steam.\nErrore: {0}
+editor.planet = Pianeta:
+editor.sector = Settore:
+editor.seed = Seme:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Dimensioni Pennello
 editor.openin = Apri nell'Editor
@@ -347,36 +439,72 @@ editor.nodescription = Una mappa deve avere una descrizione di almeno 4 caratter
 editor.waves = Ondate:
 editor.rules = Regole:
 editor.generation = Generazione:
+editor.objectives = Obbiettivi
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Modifica in Gioco
+editor.playtest = Playtest
 editor.publish.workshop = Pubblica nel Workshop
 editor.newmap = Nuova Mappa
 editor.center = Centro
+editor.search = Ricerca mappe...
+editor.filters = Filtri mappe
+editor.filters.mode = Modalità di gioco:
+editor.filters.type = Tipo mappa:
+editor.filters.search = Cerca in:
+editor.filters.author = Autore
+editor.filters.description = Descrizione
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = Ondate
 waves.remove = Rimuovi
-waves.never = <mai>
 waves.every = sempre
 waves.waves = ondata/e
+waves.health = salute: {0}%
 waves.perspawn = per generazione
 waves.shields = scudi/ondata
 waves.to = a
+waves.spawn = spawn:
+waves.spawn.all = <tutto>
+waves.spawn.select = Seleziona spawn
+waves.spawn.none = [scarlet]nessuno spawn trovato nella mappa
+waves.max = numero massimo unità
 waves.guardian = Guardiano
 waves.preview = Anteprima
 waves.edit = Modifica...
+waves.random = Random
 waves.copy = Copia negli Appunti
 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.
+waves.sort = Ordina per
+waves.sort.reverse = Inverti ordine
+waves.sort.begin = Inizia
+waves.sort.health = Salute
+waves.sort.type = Tipo
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Nascondi tutto
+waves.units.show = Mostra tutto
 
 #Questi sono intenzionalmente in minuscolo
 wavemode.counts = conteggi
 wavemode.totals = totali
 wavemode.health = salute
+all = All
 
 editor.default = [lightgray]<Predefinito>
 details = Dettagli...
 edit = Modifica...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Nome:
 editor.spawn = Piazza un'Unità
 editor.removeunit = Rimuovi un'Unità
@@ -388,13 +516,19 @@ editor.errorlegacy = La mappa è troppo vecchia ed usa un formato che non è pi
 editor.errornot = Questo non è un file mappa.
 editor.errorheader = Il file di questa mappa non è valido o è corrotto.
 editor.errorname = Questa mappa è senza nome. Stai cercando di caricare un salvataggio?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aggiorna
 editor.randomize = Casualizza
+editor.moveup = Muovi in alto
+editor.movedown = Muovi in basso
+editor.copy = Copia
 editor.apply = Applica
 editor.generate = Genera
+editor.sectorgenerate = Genera settore
 editor.resize = Ridimensiona
 editor.loadmap = Carica Mappa
 editor.savemap = Salva Mappa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Salvato!
 editor.save.noname = La tua mappa non ha un nome! Impostane uno nel menu 'Info Mappa'.
 editor.save.overwrite = La tua mappa sovrascrive quelle incluse! Imposta un nome diverso nel menu 'Info Mappa'.
@@ -433,8 +567,12 @@ toolmode.eraseores = Rimuovi Minerali
 toolmode.eraseores.description = Rimuove solo minerali.
 toolmode.fillteams = Riempi Squadre
 toolmode.fillteams.description = Riempe squadre al posto di blocchi.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Disegna Squadre
 toolmode.drawteams.description = Disegna squadre al posto di blocchi.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]Nessun filtro! Aggiungine uno cliccando il tasto sotto.
 filter.distort = Modifica
@@ -453,6 +591,7 @@ filter.clear = Resetta Filtro
 filter.option.ignore = Ignora
 filter.scatter = Dispersione
 filter.terrain = Terreno
+filter.logic = Logic
 filter.option.scale = Scala
 filter.option.chance = Probabilità
 filter.option.mag = Magnitudine
@@ -461,17 +600,39 @@ filter.option.circle-scale = Modifica Diametro Cerchio
 filter.option.octaves = Ottavi
 filter.option.falloff = Cadere
 filter.option.angle = Angolo
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Quantità
 filter.option.block = Blocco
 filter.option.floor = Terreno
 filter.option.flooronto = Terreno Mirato
 filter.option.target = Obiettivo
+filter.option.replacement = Sostituisci
 filter.option.wall = Muro
 filter.option.ore = Minerale
 filter.option.floor2 = Terreno Secondario
 filter.option.threshold2 = Soglia Secondaria
 filter.option.radius = Raggio
 filter.option.percentile = Percentuale
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Larghezza:
 height = Altezza:
@@ -482,6 +643,7 @@ load = Carica
 save = Salva
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Memoria: {0}MB
 memory2 = Memoria:\n {0}MB +\n {1}MB
 language.restart = Riavvia il gioco affinché le impostazioni della lingua abbiano effetto.
@@ -500,43 +662,98 @@ requirement.core = Distruggi il Nucleo Nemico in {0}
 requirement.research = Scopri {0}
 requirement.produce = Produci {0}
 requirement.capture = Cattura {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Lancia
-research.multiplayer = Solo l'host può scoprire gli oggetti.
 map.multiplayer = Solo l'host può vedere i settori.
 uncover = Scopri
 configure = Configura Equipaggiamento
+objective.research.name = Ricerca
+objective.produce.name = Ottieni
+objective.item.name = Ottieni oggetto
+objective.coreitem.name = Core Item
+objective.buildcount.name = Numero di costruzioni
+objective.unitcount.name = Numero di unità
+objective.destroyunits.name = Distruggi unità
+objective.timer.name = Timer
+objective.destroyblock.name = Distruggi blocco
+objective.destroyblocks.name = Distruggi blocchi
+objective.destroycore.name = Distruggi nuclei
+objective.commandmode.name = Modalità comando
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Forma
+marker.text.name = Testo
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Sfondo
+marker.outline = Outline
+objective.research = [accent]Ricerca:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Ottieni:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Distruggi:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Distruggi: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Ottieni: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Muovi nel nucleo:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Costruisci: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Costruisci unità: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Distruggi: [][lightgray]{0}[]x unità
+objective.enemiesapproaching = [accent]Nemici in arrivo tra [lightgray]{0}[]
+objective.enemyescelating = [accent]Produzione nemica in aumento tra [lightgray]{0}[]
+objective.enemyairunits = [accent]La produzione aerea nemica comincia tra [lightgray]{0}[]
+objective.destroycore = [accent]Distruggi il nucleo nemico
+objective.command = [accent]Comanda Unità
+objective.nuclearlaunch = [accent]âš  Lancio nucleare rilevato: [lightgray]{0}
+announce.nuclearstrike = [red]âš  COLPO NUCLEARE IN ARRIVO âš 
 
 loadout = Equipaggiamento
-resources = Risorse 
+resources = Risorse
+resources.max = Max
 bannedblocks = Blocchi Banditi
+unbannedblocks = Unbanned Blocks
+objectives = Obbiettivi
+bannedunits = Unità bandite
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Aggiungi Tutti
 launch.from = Partenza da: [accent]{0}
+launch.capacity = Capacità di lancio oggetti: [accent]{0}
 launch.destination = Destinazione: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Il valore deve essere un numero compresto tra 0 e {0}.
 add = Aggiungi...
-boss.health = Vita del Guardiano
+guardian = Guardiano
 
 connectfail = [scarlet]Impossibile connettersi al server:\n\n[accent] {0}
 error.unreachable = Server irraggiungibile. L'indirizzo è scritto correttamente?
 error.invalidaddress = Indirizzo non valido.
 error.timedout = Tempo scaduto!\nAssicurati che l'host abbia il port forwarding impostato e che l'indirizzo sia corretto!
-error.mismatch = Errore dei pacchetti:\nPossibile discordanza della versione client/server.\nAssicurati che tu e l'host possiediate l'ultima versione di Mindustry!
+error.mismatch = Errore dei pacchetti:\nPossibile discordanza della versione client/server.\nAssicurati che tu e l'host possediate l'ultima versione di Mindustry!
 error.alreadyconnected = Già connesso.
 error.mapnotfound = Mappa non trovata!
 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Pioggia
-weather.snow.name = Neve
+weather.snowing.name = Neve
 weather.sandstorm.name = Tempesta di Sabbia
 weather.sporestorm.name = Tempesta di Spore
 weather.fog.name = Nebbia
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Settore
+sectorlist.attacked = {0} sotto attacco
 
 sectors.unexplored = [lightgray]Inesplorato
 sectors.resources = Risorse:
 sectors.production = Produzione:
 sectors.export = Merce:
+sectors.import = Importa:
 sectors.time = Tempo:
 sectors.threat = Minaccia:
 sectors.wave = Ondata:
@@ -544,30 +761,45 @@ sectors.stored = Immagazzinato:
 sectors.resume = Riprendi
 sectors.launch = Lancia
 sectors.select = Seleziona
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]nessuno (sole)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rinomina Settore
 sectors.enemybase = [scarlet]Base Nemica
 sectors.vulnerable = [scarlet]Vulnerabile
 sectors.underattack = [scarlet]Sotto attacco! [accent]{0}% danneggiato
+sectors.underattack.nodamage = [scarlet]Non catturato
 sectors.survives = [accent]Sopravvissuto a {0} ondate
 sectors.go = Lancia
+sector.abandon = Abbandona
+sector.abandon.confirm = Il nucleo/i di questo settore si auto-distruggeranno.\nContinuare?
 sector.curcapture = Settore Catturato
 sector.curlost = Settore Perso
 sector.missingresources = [scarlet]Risorse del Nucleo Insufficienti
 sector.attacked = Settore [accent]{0}[white] sotto attacco!
 sector.lost = Settore [accent]{0}[white] perso!
-#nota: lo spazio mancante nella linea sotto è intenzionale
-sector.captured = Settore [accent]{0}[white]catturato!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Cambia icona
+sector.noswitch.title = Impossibile cambiare settore
+sector.noswitch = Non puoi cambiare settore mentre sei sotto attacco.\n\nSectore: [accent]{0}[] on [accent]{1}[]
+sector.view = Vedi settore
 
 threat.low = Bassa
 threat.medium = Media
 threat.high = Alta
 threat.extreme = Estrema
-threat.eradication = Eradicazione
+threat.eradication = Catastrofe
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = Pianeti
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sole
 
 sector.impact0078.name = Impatto 0078
@@ -585,7 +817,19 @@ sector.fungalPass.name = Passo Fungino
 sector.biomassFacility.name = Struttura di Sintesi di Biomassa
 sector.windsweptIslands.name = Isole Ventose
 sector.extractionOutpost.name = Avamposto di Estrazione Mineraria
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Terminale di Lancio Planetario
+sector.coastline.name = Coastline
+sector.navalFortress.name = Fortezza navale
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 sector.groundZero.description = La posizione ottimale per ricominciare. Bassa minaccia nemica. Poche risorse.\nRaccogli quanto più piombo e rame possibile.\nParti.
 sector.frozenForest.description = Anche qui, più vicino alle montagne, le spore si sono diffuse. Le temperature gelide non possono contenerle per sempre.\n\nInizia l'avventura nell'energia. Costruisci generatori a combustione. Impara a usare i riparatori.
@@ -603,6 +847,69 @@ sector.windsweptIslands.description = Oltre la fascia costiera si trova questo r
 sector.extractionOutpost.description = Un avamposto remoto, costruito dai nemici con l'obiettivo di lanciare risorse in altri settori.\n\nLa tecnologia di trasposto a settori-incrociati è essenziale per un ulteriore conquista. Distruggi la base. scopri la loro Rampa di Lancio.
 sector.impact0078.description = Qui giaciono i resti della nave da trasporto interstellare che fu la prima ad entrare in questo sistema.\n\nRecupera per quanto possibile dal relitto. Scopri qualsiasi tecnologia intatta.
 sector.planetaryTerminal.description = Il bersaglio finale.\n\nQuesta base costiera contiene una struttura capace di lanciare Nuclei ai pianeti locali. È estremamente protetto.\n\nProduci unità navali. Elimina il nemico il più rapidamente possibile. Scopri la struttura di lancio.
+sector.coastline.description = In questo settore sono stati rilevati resti di tecnologia di unità navali. Respingi gli attacchi nemici, cattura il settore e acquisisci la tecnologia.
+sector.navalFortress.description = Il nemico ha stabilito una base su un'isola remota e fortificata naturalmente. Distruggi questo avamposto. Acquisisci la loro tecnologia navale avanzata e fate ricerche.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Nome
+sector.intersect.name = Intersezioni
+sector.atlas.name = Atlas
+sector.split.name = Dividi
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Settore di prova. Questo obbiettivo non è ancora stato creato. Aspetta ulteriori informazioni.
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Bruciatura
+status.freezing.name = Congelamento
+status.wet.name = Bagnato
+status.muddy.name = Fangoso
+status.melting.name = Fusione
+status.sapped.name = Sfinimento
+status.electrified.name = Elettrificato
+status.spore-slowed.name = Rallentamento da spore
+status.tarred.name = Tarred
+status.overdrive.name = Potenziato
+status.overclock.name = Overclock
+status.shocked.name = Stordito
+status.blasted.name = Blasted
+status.unmoving.name = Immobile
+status.boss.name = Guardiano
 
 settings.language = Lingua
 settings.data = Dati di Gioco
@@ -625,21 +932,26 @@ settings.clearcampaignsaves.confirm = Sei sicuro di voler eliminare tutti i salv
 paused = [accent]< In Pausa >
 clear = Pulisci
 banned = [scarlet]Bandito
-yes = Si
+unsupported.environment = [scarlet]Ambiente non supportato
+yes = Sì
 no = No
 info.title = Info
 error.title = [scarlet]Si è verificato un errore
 error.crashtitle = Si è verificato un errore
 unit.nobuild = [scarlet]L'unità non può costruire
 lastaccessed = [lightgray]Ultimo Accesso: {0}
+lastcommanded = [lightgray]Ultimo comandato: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <carica mappa da vedere>
 
 stat.description = Obiettivo
 stat.input = Ingresso
 stat.output = Uscita
+stat.maxefficiency = Efficienza massima
 stat.booster = Potenziamenti
 stat.tiles = Blocchi Richiesti
 stat.affinities = Affinità
+stat.opposites = Opposti
 stat.powercapacity = Capacità Energetica
 stat.powershot = Energia/Colpo
 stat.damage = Danno
@@ -659,11 +971,14 @@ stat.poweruse = Consumo Energetico
 stat.powerdamage = Energia/Danno
 stat.itemcapacity = Capacità Oggetti
 stat.memorycapacity = Capacità di Memoria
-stat.basepowergeneration = Generazione Minina di Energia
+stat.basepowergeneration = Generazione Minima di Energia
 stat.productiontime = Tempo di Produzione
 stat.repairtime = Tempo di Riparazione Completa
+stat.repairspeed = Velocità di riparazione
 stat.weapons = Armi
 stat.bullet = Proiettile
+stat.moduletier = Grado del modulo
+stat.unittype = Unit Type
 stat.speedincrease = Potenziamento Velocità
 stat.range = Raggio
 stat.drilltier = Scavabili
@@ -671,8 +986,9 @@ stat.drillspeed = Velocità di Scavo
 stat.boosteffect = Effetto Boost
 stat.maxunits = Unità Attive Massime
 stat.health = Salute
+stat.armor = Armatura
 stat.buildtime = Tempo di Costruzione
-stat.maxconsecutive = Limite Consecutive
+stat.maxconsecutive = Limite Consecutivi
 stat.buildcost = Costo di Costruzione
 stat.inaccuracy = Inaccuratezza
 stat.shots = Colpi
@@ -686,6 +1002,7 @@ stat.lightningchance = Probabilità di Fulmine
 stat.lightningdamage = Danno Fulmine
 stat.flammability = Infiammabilità
 stat.radioactivity = Radioattività
+stat.charge = Carica elettrica
 stat.heatcapacity = Capacità Termica
 stat.viscosity = Viscosità
 stat.temperature = Temperatura
@@ -694,24 +1011,77 @@ stat.buildspeed = Velocità Costruzione
 stat.minespeed = Velocità Estrazione
 stat.minetier = Livello Estrazione
 stat.payloadcapacity = Capacità di Carico
-stat.commandlimit = Limite di Comando
 stat.abilities = Abilità
 stat.canboost = Capace di Potenziamento
 stat.flying = Volo
+stat.ammouse = Consumo di munizioni
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Moltiplicatore danni
+stat.healthmultiplier = Moltiplicatore salute
+stat.speedmultiplier = Moltiplicatore velocità
+stat.reloadmultiplier = Moltiplicatore ricarica
+stat.buildspeedmultiplier = Moltiplicatore velocità di costruzione
+stat.reactive = Reacts
+stat.immunities = Immunità
+stat.healing = Rigenerazione
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Campo di Forza
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Campo Riparativo
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Campo di Stato
-ability.unitspawn = {0} Fabbrica
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fabbrica
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Campo di Rigenerazione Scudo
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movimento Fulminante
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Campo energetico
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Concesso solo il deposito al nucleo
 
 bar.drilltierreq = Miglior Trivella Richiesta
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Risorse Mancanti
 bar.corereq = Nucleo Richiesto
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Limite massimo di unità raggiunto
 bar.drillspeed = Velocità Scavo: {0}/s
 bar.pumpspeed = Velocità di Pompaggio: {0}/s
 bar.efficiency = Efficienza: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Energia: {0}/s
 bar.powerstored = Immagazzinata: {0}/{1}
 bar.poweramount = Energia: {0}
@@ -720,51 +1090,69 @@ bar.powerlines = Connessioni: {0}/{1}
 bar.items = Oggetti: {0}
 bar.capacity = Capacità: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unità disabilitata]
 bar.liquid = Liquido
 bar.heat = Calore
+bar.cooldown = Cooldown
+bar.instability = Instabilità
+bar.heatamount = Calore: {0}
+bar.heatpercent = Calore: {0} ({1}%)
 bar.power = Energia
 bar.progress = Progresso Costruzione
+bar.loadprogress = Progresso
+bar.launchcooldown = Tempo rimanente al lancio
 bar.input = Entrata
 bar.output = Uscita
+bar.strength = [stat]{0}[lightgray]x forza
 
 units.processorcontrol = [lightgray]Controllato dal Processore
 
 bullet.damage = [stat]{0}[lightgray] danno
 bullet.splashdamage = [stat]{0}[lightgray] danno ad area ~[stat] {1}[lightgray] blocchi
 bullet.incendiary = [stat]incendiario
-bullet.sapping = [stat]debilitante
 bullet.homing = [stat]autoguidato
-bullet.shock = [stat]stordente
-bullet.frag = [stat]a frammentazione
+bullet.armorpierce = [stat]perforazione alle armature
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frammentazione:
+bullet.lightning = [stat]{0}[lightgray]x fulmine ~ [stat]{1}[lightgray] danno
+bullet.buildingdamage = [stat]{0}%[lightgray] danno alle costruzioni
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] contraccolpo
 bullet.pierce = [stat]{0}[lightgray]x perforazione
 bullet.infinitepierce = [stat]perforazione
 bullet.healpercent = [stat]{0}[lightgray]% guarigione
-bullet.freezing = [stat]congelante
-bullet.tarred = [stat]viscoso
+bullet.healamount = [stat]{0}[lightgray] quantità di cura
 bullet.multiplier = [stat]{0}[lightgray]x moltiplicatore munizioni
-bullet.reload = [stat]{0}[lightgray]x ricarica
+bullet.reload = [stat]{0}%[lightgray] ricarica
+bullet.range = [stat]{0}[lightgray] raggio in blocchi
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blocchi
 unit.blockssquared = blocchi²
 unit.powersecond = unità energetica/s
+unit.tilessecond = blocchi/s
 unit.liquidsecond = unità liquide/s
 unit.itemssecond = oggetti/s
 unit.liquidunits = unità liquidi
 unit.powerunits = unità energetica
+unit.heatunits = unità termica
 unit.degrees = gradi
 unit.seconds = secondi
 unit.minutes = minuti
 unit.persecond = /s
 unit.perminute = /min
 unit.timesspeed = x velocità
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = salute scudo
 unit.items = oggetti
 unit.thousands = k
 unit.millions = mln
 unit.billions = mld
+unit.shots = shots
+unit.pershot = /colpo
 category.purpose = Scopo
 category.general = Generali
 category.power = Energia
@@ -773,17 +1161,23 @@ category.items = Oggetti
 category.crafting = Produzione
 category.function = Funzione
 category.optional = Miglioramenti Opzionali
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Salta il lancio del nucleo/Animazione
 setting.landscape.name = Visuale Orizontale
 setting.shadows.name = Ombre
 setting.blockreplace.name = Suggerimento Blocchi Automatico
 setting.linear.name = Filtro Lineare
 setting.hints.name = Suggerimenti
-setting.flow.name = Visualizza Portata Nastri/Condotti
+setting.logichints.name = Suggerimenti sulla logica
 setting.backgroundpause.name = Metti in pausa quando in background
 setting.buildautopause.name = Pausa Automatica nella Costruzione
+setting.doubletapmine.name = Doppio click per minare
+setting.commandmodehold.name = Tieni premuto per comandare
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disabilita le mod dopo un arresto anomalo
 setting.animatedwater.name = Fluidi Animati
 setting.animatedshields.name = Scudi Animati
-setting.antialias.name = Antialias[lightgray] (richiede riavvio)[]
 setting.playerindicators.name = Indicatori Giocatori
 setting.indicators.name = Indicatori Nemici
 setting.autotarget.name = Mira Automatica
@@ -793,14 +1187,11 @@ setting.fpscap.name = Limite FPS
 setting.fpscap.none = Niente
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = Ridimensionamento Interfaccia[lightgray] (richiede il riavvio)[]
+setting.uiscale.description = Riavvio necessario per applicare le modifiche.
 setting.swapdiagonal.name = Posizionamento Sempre Diagonale
-setting.difficulty.training = Allenamento
-setting.difficulty.easy = Facile
-setting.difficulty.normal = Normale
-setting.difficulty.hard = Difficile
-setting.difficulty.insane = Impossibile
-setting.difficulty.name = Difficoltà:
 setting.screenshake.name = Movimento dello Schermo
+setting.bloomintensity.name = Intensità d'illuminazione (Bloom Intensity)
+setting.bloomblur.name = Illuminazione sfocata (Bloom Blur)
 setting.effects.name = Visualizza Effetti
 setting.destroyedblocks.name = Visualizza Blocchi Distrutti
 setting.blockstatus.name = Visualizza Stato Blocchi
@@ -811,28 +1202,40 @@ setting.seconds = {0} secondi
 setting.milliseconds = {0} millisecondi
 setting.fullscreen.name = Schermo Intero
 setting.borderlesswindow.name = Finestra Senza Bordi[lightgray] (potrebbe richiedere il riavvio)
+setting.borderlesswindow.name.windows = Schermo intero senza bordi
+setting.borderlesswindow.description = Potrebbe essere necessario il riavvio.
 setting.fps.name = Mostra FPS e Ping
+setting.console.name = Attiva Console
 setting.smoothcamera.name = Visuale fluida
 setting.vsync.name = VSync
 setting.pixelate.name = Pixellato
 setting.minimap.name = Mostra Minimappa
-setting.coreitems.name = Mostra Oggetti Nucleo (WIP)
+setting.coreitems.name = Mostra Oggetti Nucleo
 setting.position.name = Mostra Posizione Giocatori
+setting.mouseposition.name = Mostra mouse
 setting.musicvol.name = Volume Musica
 setting.atmosphere.name = Mostra Atmosfera Pianeta
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Volume Ambiente
 setting.mutemusic.name = Silenzia Musica
 setting.sfxvol.name = Volume Effetti
 setting.mutesound.name = Silenzia Suoni
 setting.crashreport.name = Invia rapporti anonimi sugli arresti anomali
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Salvataggi Automatici
-setting.publichost.name = Gioco Visibile Pubblicamente
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limite Giocatori
 setting.chatopacity.name = Opacità Chat
 setting.lasersopacity.name = Opacità Raggi Energetici
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Opacità Nastri e Condotti Sopraelevati
 setting.playerchat.name = Mostra Chat
-public.confirm = Vuoi rendere la tua partita pubblica?\n[accent]Chiunque sarà in grado di accedere alle tue partite.\n[lightgray]Questo può essere modificato più tardi in Impostazioni->Gioco->Partite Pubbliche.
+setting.showweather.name = Mostra grafica del meteo
+setting.hidedisplays.name = Nascondi display logici
+setting.macnotch.name = Adatta l'interfaccia per visualizzare la tacca
+setting.macnotch.description = Riavvio necessario per applicare le modifiche
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Nota che le versioni beta del gioco non possono creare lobby pubbliche.
 uiscale.reset = La scala dell'interfaccia utente è stata modificata.\nPremere 'OK' per confermare questa scala.\n[scarlet]Ripristina ed esci in [accent] {0}[] secondi...
 uiscale.cancel = Annulla ed Esci
@@ -841,12 +1244,9 @@ keybind.title = Configurazione Tasti
 keybinds.mobile = [scarlet]La maggior parte dei controlli qui non sono funzionano sui dispositivi mobili. È supportato solo il movimento di base.
 category.general.name = Generale
 category.view.name = Visualizzazione
+category.command.name = Unit Command
 category.multiplayer.name = Multigiocatore
 category.blocks.name = Seleziona Blocco
-command.attack = Attacca
-command.rally = Guardia
-command.retreat = Ritirata
-command.idle = Inattivo
 placement.blockselectkeys = \n[lightgray]Tasto: [{0},
 keybind.respawn.name = Rinasci
 keybind.control.name = Controlla Unità
@@ -861,6 +1261,27 @@ keybind.move_y.name = Muovi Verticalmente
 keybind.mouse_move.name = Segui il Mouse
 keybind.pan.name = Vista Panoramica
 keybind.boost.name = Scatto
+keybind.command_mode.name = Modalità di comando
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Seleziona Regione
 keybind.schematic_menu.name = Menu Schematica
 keybind.schematic_flip_x.name = Ruota Schematica Orizzontalmente
@@ -886,10 +1307,11 @@ keybind.select.name = Seleziona/Spara
 keybind.diagonal_placement.name = Posiziona Diagonalmente
 keybind.pick.name = Scegli Blocco
 keybind.break_block.name = Rompi Blocco
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Deseleziona
 keybind.pickupCargo.name = Raccogli Carico
 keybind.dropCargo.name = Rilascia Carico
-keybind.command.name = Comanda
 keybind.shoot.name = Spara
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -898,15 +1320,17 @@ keybind.pause_building.name = Interrompi/Riprendi Costruzione
 keybind.minimap.name = Minimappa
 keybind.planet_map.name = Mappa Pianeta
 keybind.research.name = Albero Scoperte
+keybind.block_info.name = Block Info
 keybind.chat.name = Chat
 keybind.player_list.name = Lista dei Giocatori
 keybind.console.name = Console
 keybind.rotate.name = Ruota
-keybind.rotateplaced.name = Ruota Blocco Esistente (premuto)
+keybind.rotateplaced.name = Ruota Blocco Esistente (mantenere premuto)
 keybind.toggle_menus.name = Mostra/Nascondi Menu
-keybind.chat_history_prev.name = Scorri Chat vero l'alto 
+keybind.chat_history_prev.name = Scorri Chat verso l'alto
 keybind.chat_history_next.name = Scorri Chat verso il basso
 keybind.chat_scroll.name = Scorri Chat
+keybind.chat_mode.name = Cambia modalità chat
 keybind.drop_unit.name = Lascia Materiali
 keybind.zoom_minimap.name = Esegui Zoom Minimappa
 mode.help.title = Descrizione delle Modalità
@@ -920,48 +1344,100 @@ mode.pvp.description = Combatti contro altri giocatori in locale.\n[gray]Per gio
 mode.attack.name = Schermaglia
 mode.attack.description = Distruggi la base nemica. \n[gray]Richiede un nucleo rosso nella mappa per essere giocata.
 mode.custom = Regole Personalizzate
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Risorse Infinite
+rules.onlydepositcore = Deposito consentito solo al nucleo
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Esplosioni Reattore
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disabilita processori
 rules.schematic = Schematiche Consentite
 rules.wavetimer = Timer Ondate
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Ondate
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Modalità Attacco
-rules.buildai = Costruzioni dell'AI
-rules.enemyCheat = Risorse AI (Team Rosso) Infinite
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Dimensione minima squadra
+rules.rtsmaxsquadsize = Dimensione massima squadra
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Cancella costruzioni delle squadre sconfitte (PvP)
+rules.corecapture = Cattura nucleo alla distruzione
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Protezione del nucleo dalle costruzioni nemiche
+rules.enemyCheat = Risorse AI (squadra Rossa) Infinite
 rules.blockhealthmultiplier = Moltiplicatore Salute Blocco
 rules.blockdamagemultiplier = Moltiplicatore Danno Blocco
 rules.unitbuildspeedmultiplier = Moltiplicatore Velocità Costruzione Unità
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Moltiplicatore Vita Unità
 rules.unitdamagemultiplier = Moltiplicatore Danno Unità
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Moltiplicatore energia solare
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limite dimensioni mappa
 rules.enemycorebuildradius = Raggio di protezione del Nucleo Nemico dalle costruzioni:[lightgray] (blocchi)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Tempo fra Ondate:[lightgray] (secondi)
+rules.initialwavespacing = Tempo per la prima ondata:[lightgray] (sec)
 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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Raggio di Generazione:[lightgray] (blocchi)
 rules.unitammo = Unità Richiedono Munizioni
+rules.enemyteam = Squadra avversaria
+rules.playerteam = Squadra giocatore
 rules.title.waves = Ondate
 rules.title.resourcesbuilding = Risorse e Costruzioni
 rules.title.enemy = Nemici
 rules.title.unit = Unità
 rules.title.experimental = Sperimentale
 rules.title.environment = Ambiente
+rules.title.teams = squadre
+rules.title.planet = pianeta
 rules.lighting = Illuminazione
-rules.enemyLights = Illuminazione Nemica
+rules.fog = Nebbia di guerra
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fuoco
+rules.anyenv = <qualunque>
 rules.explosions = Danno da Esplosione Blocchi/Unità
 rules.ambientlight = Illuminazione\nAmbientale
 rules.weather = Meteo
 rules.weather.frequency = Frequenza:
+rules.weather.always = sempre
 rules.weather.duration = Durata:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Oggetti
 content.liquid.name = Liquidi
 content.unit.name = Unità
 content.block.name = Blocchi
+content.status.name = Effetti
 content.sector.name = Settori
+content.team.name = Fazioni
+wallore = (Mura)
 
 item.copper.name = Rame
 item.lead.name = Piombo
@@ -972,18 +1448,34 @@ item.thorium.name = Torio
 item.silicon.name = Silicio
 item.plastanium.name = Plastanio
 item.phase-fabric.name = Tessuto di Fase
-item.surge-alloy.name = Lega di Sovratensione
+item.surge-alloy.name = Lega superconduttrice
 item.spore-pod.name = Baccello di Spore
 item.sand.name = Sabbia
 item.blast-compound.name = Composto Esplosivo
 item.pyratite.name = Pirite
 item.metaglass.name = Vetro Metallico
 item.scrap.name = Rottame
+
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Berillio
+item.tungsten.name = Tungsteno
+item.oxide.name = Ossido
+item.carbide.name = Carburo
+item.dormant-cyst.name = Dormant Cyst
+
 liquid.water.name = Acqua
 liquid.slag.name = Scoria
 liquid.oil.name = Petrolio
 liquid.cryofluid.name = Criofluido
 
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallio
+liquid.ozone.name = Ozono
+liquid.hydrogen.name = Idrogeno
+liquid.nitrogen.name = Azoto
+liquid.cyanogen.name = Cianogeno
+
 unit.dagger.name = Pugnalatore
 unit.mace.name = Randellatore
 unit.fortress.name = Fortezza
@@ -1010,6 +1502,12 @@ unit.minke.name = Cacciatorpediniere
 unit.bryde.name = Incrociatore
 unit.sei.name = Nave da Guerra
 unit.omura.name = Portaerei
+
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1017,14 +1515,36 @@ unit.scepter.name = Infiltratore
 unit.reign.name = Conquistatore
 unit.vela.name = Radiante
 unit.corvus.name = Disgregatore
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 
-block.resupply-point.name = Punto di Rifornimento
 block.parallax.name = Parallasse
 block.cliff.name = Scogliera
 block.sand-boulder.name = Masso di Sabbia
 block.basalt-boulder.name = Masso di Basalto
 block.grass.name = Erba
-block.slag.name = Scoria
+block.molten-slag.name = Scoria
+block.pooled-cryofluid.name = Criofluido
 block.space.name = Spazio
 block.salt.name = Sale
 block.salt-wall.name = Muro di Sale
@@ -1052,24 +1572,28 @@ block.graphite-press.name = Pressa per Grafite
 block.multi-press.name = Multi Pressa
 block.constructing = {0}\n[lightgray](In Costruzione)
 block.spawn.name = Punto di Generazione Nemico
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Nucleo: Frammento
 block.core-foundation.name = Nucleo: Fondamento
-block.core-nucleus.name = Nucleo: Kernel
-block.deepwater.name = Acqua Profonda
-block.water.name = Acqua
+block.core-nucleus.name = Nucleo: Centrale
+block.deep-water.name = Acqua Profonda
+block.shallow-water.name = Acqua
 block.tainted-water.name = Acqua Contaminata
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Acqua Contaminata Scura
 block.tar.name = Catrame
 block.stone.name = Pietra
-block.sand.name = Sabbia
+block.sand-floor.name = Sabbia
 block.darksand.name = Sabbia Scura
 block.ice.name = Ghiaccio
 block.snow.name = Neve
-block.craters.name = Crateri
+block.crater-stone.name = Crateri
 block.sand-water.name = Acqua Sabbiosa
 block.darksand-water.name = Acqua Sabbiosa Scura
 block.char.name = Carbone
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Muro di Dacite
 block.dacite-boulder.name = Masso di Dacite
 block.ice-snow.name = Neve Ghiacciata
@@ -1082,11 +1606,12 @@ block.dirt.name = Terra
 block.dirt-wall.name = Muro di Terra
 block.mud.name = Fango
 block.white-tree-dead.name = Albero Bianco Morto
-block.white-tree.name = Albero Morto
+block.white-tree.name = Albero Bianco
 block.spore-cluster.name = Agglomerato di Spore
 block.metal-floor.name = Pavimento Metallico 1
 block.metal-floor-2.name = Pavimento Metallico 2
 block.metal-floor-3.name = Pavimento Metallico 3
+block.metal-floor-4.name = Metal Floor 4
 block.metal-floor-5.name = Pavimento Metallico 4
 block.metal-floor-damaged.name = Pavimento Metallico Danneggiato
 block.dark-panel-1.name = Pannello Scuro 1
@@ -1100,7 +1625,7 @@ block.basalt.name = Basalto
 block.hotrock.name = Roccia Bollente
 block.magmarock.name = Roccia Magmatica
 block.copper-wall.name = Muro di Rame
-block.copper-wall-large.name = Muro di Rame Grande 
+block.copper-wall-large.name = Muro di Rame Grande
 block.titanium-wall.name = Muro di Titanio
 block.titanium-wall-large.name = Muro di Titanio Grande
 block.plastanium-wall.name = Muro di Plastanio
@@ -1126,6 +1651,9 @@ block.distributor.name = Distributore Grande
 block.sorter.name = Filtro
 block.inverted-sorter.name = Filtro Inverso
 block.message.name = Messaggio
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lanterna
 block.overflow-gate.name = Separatore per Eccesso
 block.underflow-gate.name = Separatore per Eccesso Inverso
@@ -1174,23 +1702,25 @@ block.plastanium-compressor.name = Compressore al Plastanio
 block.pyratite-mixer.name = Miscelatore di Pirite
 block.blast-mixer.name = Miscelatore d'Esplosivi
 block.solar-panel.name = Pannello Solare
-block.solar-panel-large.name = Pannello Solare Grande 
+block.solar-panel-large.name = Pannello Solare Grande
 block.oil-extractor.name = Estrattore di Petrolio
 block.repair-point.name = Punto di Riparazione
+block.repair-turret.name = Repair Turret
 block.pulse-conduit.name = Condotto a Impulsi
 block.plated-conduit.name = Condotto Placcato
 block.phase-conduit.name = Condotto di Fase
 block.liquid-router.name = Distributore di Liquidi
 block.liquid-tank.name = Serbatoio
+block.liquid-container.name = Liquid Container
 block.liquid-junction.name = Giunzione Liquida
 block.bridge-conduit.name = Condotto Sopraelevato
 block.rotary-pump.name = Pompa a Turbina
 block.thorium-reactor.name = Reattore al Torio
 block.mass-driver.name = Lancia Materiali
 block.blast-drill.name = Trivella ad Impulsi
-block.thermal-pump.name = Pompa Termica
+block.impulse-pump.name = Pompa Termica
 block.thermal-generator.name = Generatore Termico
-block.alloy-smelter.name = Altoforno
+block.surge-smelter.name = Altoforno
 block.mender.name = Riparatore
 block.mend-projector.name = Riparatore Grande
 block.surge-wall.name = Muro di Sovratensione
@@ -1207,26 +1737,191 @@ block.meltdown.name = Fusione
 block.foreshadow.name = Tenebra
 block.container.name = Contenitore
 block.launch-pad.name = Ascensore Spaziale
-block.launch-pad-large.name = Ascensore Spaziale Avanzato
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = Segmentatore
-block.command-center.name = Centro di Controllo
 block.ground-factory.name = Fabbrica Terrestre
 block.air-factory.name = Fabbrica Aerea
 block.naval-factory.name = Fabbrica Navale
-block.additive-reconstructor.name = Ricostruttore Adattivo
+block.additive-reconstructor.name = Ricostruttore Additivo
 block.multiplicative-reconstructor.name = Ricostruttore Moltiplicativo
 block.exponential-reconstructor.name = Ricostruttore Esponenziale
 block.tetrative-reconstructor.name = Ricostruttore Tetrattivo
 block.payload-conveyor.name = Trasportatore di Massa
 block.payload-router.name = Distributore di Carico
+block.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassemblatore
 block.silicon-crucible.name = Crogiolo per Silicio
 block.overdrive-dome.name = Cupola di Overdrive
-#sperimentale, potrebbero esseri rimossi
-block.block-forge.name = Forgia per Blocco
-block.block-loader.name = Caricatore Blocchi
-block.block-unloader.name = Scaricatore Blocchi
 block.interplanetary-accelerator.name = Acceleratore Interplanetario
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Interruttore
 block.micro-processor.name = Micro Processore
@@ -1236,43 +1931,40 @@ block.logic-display.name = Display Logico
 block.large-logic-display.name = Grande Display Logico
 block.memory-cell.name = Cella di Memoria
 block.memory-bank.name = Banca di Memoria
-
-team.blue.name = blu
+team.malis.name = Malis
 team.crux.name = rosso
 team.sharded.name = arancione
-team.orange.name = arancione
 team.derelict.name = abbandonato
 team.green.name = verde
-team.purple.name = viola
+
+team.blue.name = blu
 
 hint.skip = Salta
 hint.desktopMove = Usa [accent][[WASD][] per muoverti.
 hint.zoom = [accent]Scorri[] per aumentare o ridurre la visuale.
-hint.mine = Muoviti vicino il \uf8c4 minerale di rame e[accent]toccalo[] per minare manualmente.
 hint.desktopShoot = [accent][[Click-sinistro][] per sparare.
-hint.depositItems = Per trasferire oggetti, trascinadalla tua nave al nucleo.
+hint.depositItems = Per trasferire oggetti, trascina dalla tua nave al nucleo.
 hint.respawn = Per rinascere come nave, premi [accent][[V][].
 hint.respawn.mobile = Hai cambiato il controllo a unità/strutture. Per rinascere come nave, [accent]tocca the l'avatar in alto a sinistra.[]
 hint.desktopPause = Premi[accent][[Space][] per mettere in pausa o riprendere il gioco.
-hint.placeDrill = Seleziona la sezione delle \ue85e [accent]Trivelle[] nel menu in fondo a destra, dopo seleziona una \uf870 [accent]Trivella[] e cliccala su una risorsa di rame per piazzarla.
-hint.placeDrill.mobile = Seleziona la sezione \ue85e [accent]Trivelle[] nel menu in fondo a destra, dopo seleziona una \uf870 [accent]Drill[] e cliccalo su una risorsa di rame per piazzarlo.\n\nPremi il \ue800 [accent]checkmark[] in fonod a destra per confermare.
-hint.placeConveyor = I nastri trasportatori muovono oggetti dalle trivelle in altri blocchi. Seleziona un \uf896 [accent]Nastro[] dalla sezione \ue814 [accent]Distribuzione[].\n\nClicca e trascina per piazziare più nastri.\n[accent]Scorri[] per ruotare.
-hint.placeConveyor.mobile = I nastri trasportatori muovono gli oggetti dalle trivelle ad altri blocchi. Seleziona un \uf896 [accent]Nastro Trasportatore[] dal menu \ue814 [accent]Distribuzione[].\n\nTieni premuto il dito per un secondo e trascinalo per disporre più nastri contemporaneamente.
-hint.placeTurret = Posiziona \uf861 [accent]Torrette[] per difendere la tua base dai nemici.\n\n Le torrette richiedono munizioni- in questo caso, \uf838rame.\nUsa nastri e trivelle per rifornirli.
 hint.breaking = [accent]Click-destro[] e trascina per distruggere blocchi.
-hint.breaking.mobile = Attivita il \ue817 [accent]martello[] in fondo a destra e tocca per distruggere blocchi.\n\nTieni premuto il tuo dito per un secondo e trascina per distruggere blocchi in una selezione.
+hint.breaking.mobile = Attiva il \ue817 [accent]martello[] in fondo a destra e tocca per distruggere blocchi.\n\nTieni premuto il tuo dito per un secondo e trascina per distruggere blocchi in una selezione.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
 hint.research = Usa il pulsante \ue875 [accent]Scopri[] per scoprire nuova tecnologia.
 hint.research.mobile = Usa il pulsante \ue875 [accent]Research[] nel \ue88c [accent]menu[] per scoprire  una nuova tecnologia.
 hint.unitControl = Tieni premuto [accent][[L-ctrl][] e [accent]clic[] per controllare unità o torrette amichevoli.
 hint.unitControl.mobile = [accent][[Doppio-tocco][] per controllare unità o torrette amichevoli.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
 hint.launch = Una volta che sono state raccolte abbastanza risorse, puoi[accent]Lanciare[] selezionando settori vicini dalla \ue827 [accent]Mappa[] in fondo a destra.
 hint.launch.mobile = Una volta che sono state raccolte abbastanza risorse, puoi[accent]Lanciare[] selezionando settori vicini dalla \ue827 [accent]Mappa[] nel \ue88c [accent]menu[].
 hint.schematicSelect = Tieni premuto [accent][[F][] e trascina per selezionare blocchi da copiare ed incollare.\n\n[accent][[Middle Click][] per copiare un singolo tipo di blocco.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Tieni premuto [accent][[L-Ctrl][] mentre trascini nastri per generare automaticamente un percorso.
 hint.conveyorPathfind.mobile = Attiva la \ue844 [accent]modalità diagonale[] e trascina nastri per generare automaticamente un percorso.
 hint.boost = Tieni premuto [accent][[L-Shift][] per volare sopra gli ostacoli con la tua unità attuale.\n\nSolo poche unità terrestri possono farlo.
-hint.command = Premi [accent][[G][] per comandare le unità vicine di [accent]simile tipologia[] in formazione.\n\nPer comandare unità terrestri, devi prima controllare un'altra unità terrestre.
-hint.command.mobile = [accent][[Double-tap][] per comandare le unità vicine in formazione.
 hint.payloadPickup = Premi [accent][[[] per raccogliere piccoli blocchi o unità.
 hint.payloadPickup.mobile = [accent]Clicca e trattieni[] piccoli blocchi o unità per raccglierla.
 hint.payloadDrop = Premi [accent]][] per rilasciare un carico.
@@ -1280,8 +1972,62 @@ hint.payloadDrop.mobile = [accent]Clicca e trattieni[] una posizione vuota per r
 hint.waveFire = [accent]Idrogetto[] torrette con acqua per munizioni spegneranno automaticamente incendi.
 hint.generator = \uf879 [accent]Generatori a Combustibile[] bruciano carbone e trasferiscono energia ai blocchi adiacenti.\n\nIl raggio di trasmissione dell'enrgia può essere esteso con \uf87f [accent]Nodo Energetico[].
 hint.guardian = Unità [accent]Guardiano[] sono corazzate. Munizioni deboli come [accent]Rame[] e [accent]Piombo[] sono [scarlet]inefficaci[].\n\nUsa torrette di grado superiore o \uf835 [accent]Grafite[] \uf861Duo/\uf859Cannone Leggero per buttare giù il boss.
-hint.coreUpgrade =  I nuclei possono essere aggiornati [accent]piazzando nuclei di un livello superiore sopra di loro[].\n\nPiazzia un nucleo  [accent]Fondazione[] sopra il nucleo  [accent]Frammento[]. Assicurati che sia libero da ostacoli.
+hint.coreUpgrade = I nuclei possono essere aggiornati [accent]piazzando nuclei di un livello superiore sopra di loro[].\n\nPiazzia un nucleo \uf868 [accent]Fondazione[] sopra il nucleo \uf869 [accent]Frammento[]. Assicurati che sia libero da ostacoli.
 hint.presetLaunch = [accent]Settori grigi d'atterraggio[], come [accent]Foresta Ghiacciata[], possono essere lanciati da ovunque. Non richiedono la cattura nei terrotori circostanti.\n\n[accent]Settori numerati[], come questo qui, sono [accent]opzionali[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Usato in molti tipi di costruzioni e munizioni.
 item.copper.details = Rame. Metallo anormalmente abbondante su Serpulo. Strutturalmente debole se non rinforzato.
@@ -1304,23 +2050,35 @@ item.spore-pod.description = Utilizzato per la conversione in petrolio, esplosiv
 item.spore-pod.details = Spore. Probabilmente una forma di vita sintetica. Emettono gas tossici alle vita biologica. Estremamente invasive. Altamente infiammabili in certe condizioni.
 item.blast-compound.description = Un composto altamente volatile, utilizzato nella produzione di bombe ed esplosivi. Può essere utilizzato come combustibile anche se non è consigliabile.
 item.pyratite.description = Una sostanza molto infiammabile che viene utilizzata nelle armi da fuoco.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 
 liquid.water.description = Usato per il raffreddamento di macchinari ed il trattamento dei rifiuti.
 liquid.slag.description = Raffinata nei separatori in diversi metalli o spruzzata sui nemici come munizione.
 liquid.oil.description = Usato nella produzione di materiali avanzati e come munizione incendiaria.
 liquid.cryofluid.description = Usato come refrigerante in reattori, torrette e macchinari.
-
-block.resupply-point.description = Rifornisce untià vicine con munizioni in rame. Incompatibile con unità che richiedono energia.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
 block.armored-conveyor.description = Trasporta gli oggetti. Non accetta oggetti dai lati.
 block.illuminator.description = Emette luce.
 block.message.description = Memorizza un messaggio per le comunicazioni tra alleati.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Comprime il carbone in grafite.
 block.multi-press.description = Comprime il carbone in grafite. Necessite di acqua come refrigerante.
 block.silicon-smelter.description = Raffina il silicio da sabbia e carbone.
 block.kiln.description = Fonde sabbia e piombo in vetro metallico.
 block.plastanium-compressor.description = Produce plastanio da petrolio e titanio.
 block.phase-weaver.description = Sintetizza il tessuto di fase da torio e sabbia.
-block.alloy-smelter.description = Fonde titanio, piombo, silicio e rame nella lega di sovratensione.
+block.surge-smelter.description = Fonde titanio, piombo, silicio e rame nella lega di sovratensione.
 block.cryofluid-mixer.description = Miscela acqua e polvere di titanio per produrre il criofluido.
 block.blast-mixer.description = Produce composto esplosivo dalla pirite e dal baccello di spore.
 block.pyratite-mixer.description = Miscela carbone, piombo e sabbia in pirite.
@@ -1336,6 +2094,8 @@ block.item-source.description = Genera oggetti infiniti. Disponibile solo nella
 block.item-void.description = Distrugge tutti gli oggetti che riceve. Disponibile solo nella modalità creativa.
 block.liquid-source.description = Genera liquidi infiniti. Disponibile solo nella modalità creativa.
 block.liquid-void.description = Distrugge qualsiasi liquido che riceve. Disponibile solo nella modalità creativa.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
 block.copper-wall.description = Protegge le strutture dai proiettili nemici.
 block.copper-wall-large.description = Protegge le strutture dai proiettili nemici.
 block.titanium-wall.description = Protegge le strutture dai proiettili nemici.
@@ -1348,6 +2108,10 @@ block.phase-wall.description = Protegge le strutture dai proiettili nemici rifle
 block.phase-wall-large.description = Protegge le strutture dai proiettili nemici riflettendone la maggior parte all'impatto.
 block.surge-wall.description = Protegge le strutture dai proiettili nemici rilasciando periodicamente archi elettrici al contatto.
 block.surge-wall-large.description = Protegge le strutture dai proiettili nemici rilasciando periodicamente archi elettrici al contatto.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Un muro che può essere aperto o chiuso.
 block.door-large.description = Un muro che può essere aperto o chiuso.
 block.mender.description = Ripara periodicamente i blocchi nelle sue vicinanze.\nAccetta silicio per aumentare la portata e l'efficienza.
@@ -1357,7 +2121,7 @@ block.force-projector.description = Crea un campo di forza esagonale attorno a s
 block.shock-mine.description = Rilascia archi elettrici al contatto con un nemico.
 block.conveyor.description = Trasporta gli oggetti.
 block.titanium-conveyor.description = Trasporta gli oggetti. È più veloce di un nastro trasportatore standard.
-block.plastanium-conveyor.description =  Trasporta gli oggetti in lotti. Accetta gli oggetti dal retro e li scarica in tre direzioni. Necessita di molteplici punti di carico e scarico per aumentare la portata.
+block.plastanium-conveyor.description = Trasporta gli oggetti in lotti. Accetta gli oggetti dal retro e li scarica in tre direzioni. Necessita di molteplici punti di carico e scarico per aumentare la portata.
 block.junction.description = Funge da ponte tra due nastri trasportatori che si incrociano.
 block.bridge-conveyor.description = Trasporta gli oggetti sopra blocchi e strutture.
 block.phase-conveyor.description = Trasporta gli oggetti sopra blocchi e strutture istantaneamente. Ha un raggio più ampio rispetto al nastro trasportatore sopraelevato, ma ha bisogno di energia per funzionare.
@@ -1371,11 +2135,12 @@ block.underflow-gate.description = L'esatto opposto del separatore per eccesso.
 block.mass-driver.description = Struttura per il trasporto di oggetti a lungo raggio. Immagazzina lotti di oggetti e li spara ad un altro trasportatore di massa.
 block.mechanical-pump.description = Pompa liquidi. Non richiede energia.
 block.rotary-pump.description = Pompa liquidi. Richiede energia.
-block.thermal-pump.description = Pompa liquidi.
+block.impulse-pump.description = Pompa liquidi.
 block.conduit.description = Trasporta i liquidi. Spesso usato insieme a pompe e altri condotti.
 block.pulse-conduit.description = Trasporta i liquidi più velocemente. Ha una capacità maggiore rispetto ai condotti tradizionali.
 block.plated-conduit.description = Trasporta i liquidi. Non accetta liquidi dai lati. Non spande.
 block.liquid-router.description = Accetta liquidi da un lato e li divide equamente nelle 3 uscite. Può anche immagazzinare una piccola quantità di liquido.
+block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Immagazzina una grande quantità di liquido. Emette il liquido che contiene da tutti i lati, simile ad un distributore di liquidi.
 block.liquid-junction.description = Funge da ponte tra due condotti che si incrociano.
 block.bridge-conduit.description = Trasporta i liquidi sopra blocchi e strutture.
@@ -1413,6 +2178,9 @@ block.vault.description = Immagazzina grandi quantità di oggetti di ogni tipo.
 block.container.description = Imagazzina piccole quantità di oggetti di ogni tipo. Può essere svuotato con uno scaricatore.
 block.unloader.description = Scarica l'oggetto selezionato dai blocchi adiacenti.
 block.launch-pad.description = Lancia lotti di oggetti ai settori selezionati.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Spara proiettili ai nemici.
 block.scatter.description = Spara agglomerati di piombo, rottami o vetro metallico ai nemici aerei.
 block.scorch.description = Incenerisce qualsiasi unità terrena nelle vicinanze. Altamente efficace a distanza ravvicinata.
@@ -1434,10 +2202,9 @@ block.parallax.description = Spara un raggio traente che avvicina i bersagli aer
 block.tsunami.description = Spara potenti getti di liquidi ai nemici. Quando alimentato ad acqua, estingue automaticamente gli incendi.
 block.silicon-crucible.description = Produce il silicio da sabbia e carbone usando la pirite come fonte di calore aggiuntiva. Aumenta la sua efficienza su terreni caldi.
 block.disassembler.description = Separa le scorie in diversi minerali, tra cui il torio.
-block.overdrive-dome.description =  Aumenta la velocità delle strutture vicine. Richiede tessuto di fase e silicio per funzionare.
+block.overdrive-dome.description = Aumenta la velocità delle strutture vicine. Richiede tessuto di fase e silicio per funzionare.
 block.payload-conveyor.description = Trasporta carichi pesanti come le unità prodotte nelle fabbriche.
 block.payload-router.description = Divide equamente il carico dei trasportatori di massa in 3 direzioni.
-block.command-center.description = Permette di controllare il comportamento delle unità con diversi comandi.
 block.ground-factory.description = Produce le unità terrene. Le unità prodotte possono essere utilizzate direttamente o trasferite nei ricostruttori per essere potenziate.
 block.air-factory.description = Produce le unità aeree. Le unità prodotte possono essere utilizzate direttamente o trasferite nei ricostruttori per essere potenziate.
 block.naval-factory.description = Produce le unità navali. Le unità prodotte possono essere utilizzate direttamente o trasferite nei ricostruttori per essere potenziate.
@@ -1454,6 +2221,101 @@ block.memory-bank.description = Imagazzina le informazioni elaborate dai process
 block.logic-display.description = Visualizza la grafica arbitraria  elaborata dal processore.
 block.large-logic-display.description = Visualizza la grafica arbitraria elaborata dal processore.
 block.interplanetary-accelerator.description = Una massiccia torre che utilizza potenti campi elettromagnetici. Accelera nuclei fino alla velocità di fuga per un impiego interplanetario.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
 
 unit.dagger.description = Spara proiettili standard ai nemici vicini.
 unit.mace.description = Spara raffiche infuocate ai nemici vicini.
@@ -1482,9 +2344,281 @@ unit.quad.description = Rilascia grandi bombe alle unità terrene, riparando le
 unit.oct.description = Protegge gli alleati nelle vicinanze con lo scudo rigenerante integrato. È in grado di trasportare la maggior parte delle unità terrene.
 unit.risso.description = Spara una raffica di missili e proiettili ai nemici nelle vicinanze.
 unit.minke.description = Spara proiettili incendiari e standard alle unità terrene.
-unit.bryde.description = Spara proiettili e missili a lungo raggio ai nemici. 
+unit.bryde.description = Spara proiettili e missili a lungo raggio ai nemici.
 unit.sei.description = Spara raffiche di missili e proiettili corazzati e perforanti ai nemici.
 unit.omura.description = Utilizza un bullone sparatato grazie a due binari a scorrimento accelerati da un campo elettromagnetico. Lunga gittata e perforazione estrema. Costruisce unità flare.
 unit.alpha.description = Difende il nucleo Frammento dai nemici. Costruisce strutture.
 unit.beta.description = Difende il nucleo Fondamento dai nemici. Costruisce strutture.
 unit.gamma.description = Difende il nucleo Kernel dai nemici. Costruisce strutture.
+unit.retusa.description = Lancia siluri di puntamento contro i nemici vicini. Ripara le unità alleate.
+unit.oxynoe.description = Spara flussi di fiamme che riparano le strutture ai nemici vicini. Bersaglia i proiettili nemici nelle vicinanze con una torretta di difesa.
+unit.cyerce.description = Spara missili a grappolo contro i nemici. Ripara le unità alleate.
+unit.aegires.description = Scuote tutte le unità e le strutture nemiche che entrano nel suo campo energetico. Ripara tutti gli alleati.
+unit.navanax.description = Spara proiettili EMP esplosivi, infliggendo danni significativi alle reti elettriche nemiche e riparando le strutture alleate. Scioglie i nemici vicini con 4 torrette laser autonome.
+unit.stell.description = Spara proiettili standard contro i bersagli nemici.
+unit.locus.description = Spara proiettili alternati contro i bersagli nemici.
+unit.precept.description = Spara proiettili a grappolo perforanti contro i bersagli nemici.
+unit.vanquish.description = Spara grandi proiettili perforanti contro i bersagli nemici.
+unit.conquer.description = Spara grandi cascate di proiettili perforanti contro i bersagli nemici.
+unit.merui.description = Spara con l'artiglieria a lungo raggio contro bersagli terrestri nemici. Può superare la maggior parte dei terreni.
+unit.cleroi.description = Spara proiettili doppi contro i bersagli nemici. Bersaglia i proiettili nemici con le torrette di difesa. Può superare la maggior parte dei terreni.
+unit.anthicus.description = Spara missili a lunga gittata contro i bersagli nemici. Può superare la maggior parte dei terreni.
+unit.tecta.description = Spara missili al plasma a puntamento interno contro i bersagli nemici. Si protegge con uno scudo direzionale. Può superare la maggior parte dei terreni.
+unit.collaris.description = Spara con l'artiglieria a frammentazione a lungo raggio contro gli obiettivi nemici. Può superare la maggior parte dei terreni.
+unit.elude.description = Spara coppie di proiettili di puntamento contro i bersagli nemici. Può galleggiare su corpi liquidi.
+unit.avert.description = Spara coppie di proiettili a spirale contro i bersagli nemici.
+unit.obviate.description = Spara coppie di fulmini a spirale contro i bersagli nemici.
+unit.quell.description = Spara missili di puntamento a lungo raggio contro gli obiettivi nemici. Sopprime i blocchi di riparazione delle strutture nemiche.
+unit.disrupt.description = Spara missili di soppressione a lungo raggio contro gli obiettivi nemici. Sopprime i blocchi di riparazione delle strutture nemiche.
+unit.evoke.description = Costruisce strutture per difendere il nucleo del Bastione. Ripara le strutture con un raggio.
+unit.incite.description = Costruisce strutture per difendere il nucleo della Cittadella. Ripara le strutture con un raggio.
+unit.emanate.description = Costruisce strutture per difendere il nucleo dell'Acropoli. Ripara le strutture con le travi.
+lst.read = Leggi un numero da una cella di memoria collegata.
+lst.write = Scrivi un numero in una cella di memoria collegata.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 7b43e80516..e7f7f5f09c 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1,6 +1,6 @@
 credits.text = 制作者 [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = クレジット
-contributors = 翻訳や開発��力�������方々
+contributors = 翻訳や開発��力�������皆様
 discord = Mindustry�Discord��加!
 link.discord.description = Mindustry�公�Discordグループ
 link.reddit.description = Mindustry�subreddit
@@ -13,7 +13,8 @@ link.google-play.description = Google Play ストアを開�
 link.f-droid.description = F-Droid を開�
 link.wiki.description = 公� Mindustry Wiki
 link.suggestions.description = 新機能を�案�る
-link.bug.description = Found one? Report it here
+link.bug.description = �グを見������？�����ら報告��下��。
+linkopen = ��サー�ー�らリンク��信�れ���。開����？\n\n[sky]{0}
 linkfail = リンクを開���ん���!\nURLをクリップボード�コピー����。
 screenshot = スクリーンショットを {0} ��存����。
 screenshot.invalid = マップ�広����。スクリーンショット�必��メモリ�足り���能性��り��。
@@ -23,8 +24,7 @@ gameover.pvp = [accent] {0}[] �ーム��利!
 gameover.waiting = [accent]次�マップを待�����...
 highscore = [accent]�イスコアを更新!
 copied = コピー����。
-indev.notready = This part of the game isn't ready yet
-indev.campaign = [accent]Congratulations! You've reached the end of the campaign![]\n\nThis is as far as the content goes right now. Interplanetary travel will be added in future updates.
+indev.notready = ゲーム����素���準備中��
 
 load.sound = サウンド
 load.map = マップ
@@ -32,7 +32,7 @@ load.image = 画�
 load.content = コンテンツ
 load.system = システム
 load.mod = MOD
-load.scripts = Scripts
+load.scripts = スクリプト
 
 be.update = 新��Bleeding Edgeビルド��り��:
 be.update.confirm = ダウンロード���起動����？
@@ -41,14 +41,23 @@ be.ignore = 無視�る
 be.noupdates = 更新�見��り��ん。
 be.check = 更新を確����。
 
-mod.featured.dialog.title = Mod ブラウザー (作業中)
-mods.browser.selected = �択�れ�mod
+mods.browser = Modブラウザ
+mods.browser.selected = �択�れ�Mod
 mods.browser.add = インストール
+mods.browser.reinstall = �インストール
+mods.browser.view-releases = リリースを表示
+mods.browser.noreleases = [scarlet]リリース�見��り��ん\n[accent]��mod�リリース�見��り��ん���。mod�リ�ジトリ�リリース�公開�れ��る����を確�������。
+mods.browser.latest = <最新>
+mods.browser.releases = リリース
 mods.github.open = 見る
+mods.github.open-release = リリースページ
+mods.browser.sortdate = 新��も��ら並�る
+mods.browser.sortstars = �気�入り数�並�る
 
 schematic = 設計図
 schematic.add = 設計図を�存
 schematics = 設計図一覧
+schematic.search = Search schematics...
 schematic.replace = �����設計図�既�存在�����。上書�����？
 schematic.exists = �����設計図�既�存在�����。
 schematic.import = 設計図をイン�ート
@@ -61,28 +70,37 @@ schematic.shareworkshop = ワークショップ�共有�る
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: �転
 schematic.saved = 設計図を�存����。
 schematic.delete.confirm = ��設計図�完全�削除�れ��。よ������
-schematic.rename = 設計図���を変更�る。
+schematic.edit = Edit Schematic
 schematic.info = {1}x{0}, {2} ブロック
 schematic.disabled = [scarlet]設計図使用��[]\n��[accent]マップ[]�[accent]サー�ー[]��設計図�使用�許��れ����ん。
+schematic.tags = ã‚¿ã‚°:
+schematic.edittags = タグ編集
+schematic.addtag = タグを追加
+schematic.texttag = テキストタグ
+schematic.icontag = アイコンタグ
+schematic.renametag = タグ���変更
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = ��タグを���削除����？
+schematic.tagexists = ��タグ����存在���。
 
-stats = Stats
-stat.wave = 防衛��ウェーブ:[accent] {0}
-stat.enemiesDestroyed = 敵�破壊�れ�数:[accent] {0}
-stat.built = 建設��建造物数:[accent] {0}
-stat.destroyed = 破壊��建造物数:[accent] {0}
-stat.deconstructed = 解体��建造物数:[accent] {0}
-stat.delivered = �得��資�:
-stat.playtime = プレイ時間:[accent] {0}
-stat.rank = 最終ランク: [accent]{0}
+stats = 戦績
+stats.wave = 防衛��ウェーブ
+stats.unitsCreated = 製造��ユニット
+stats.enemiesDestroyed = 破壊��敵
+stats.built = 建造��建物
+stats.destroyed = 破壊�れ�建物
+stats.deconstructed = 解体��建物
+stats.playtime = プレイ時間
 
-globalitems = [accent]グロー�ルアイテム
+globalitems = [accent]トータルアイテム
 map.delete = マップ "[accent]{0}[]" を削除��もよ������?
 level.highscore = �イスコア: [accent]{0}
 level.select = レベル�択
 level.mode = ゲームモード:
 coreattack = < コア�攻撃を������! >
 nearpoint = [[ [scarlet]直��出��イントより離脱�よ[] ]\n殲滅�れ��
-database = コアデーターベース
+database = コアデータベース
+database.button = データベース
 savegame = �存
 loadgame = 読�込む
 joingame = マル�プレイ
@@ -90,6 +108,7 @@ customgame = カスタムプレイ
 newgame = 新��始�る
 none = <��>
 none.found = [lightgray]<見��り��ん>
+none.inmap = [lightgray]<マップ内��り��ん>
 minimap = ミニマップ
 position = �置
 close = 閉�る
@@ -110,24 +129,39 @@ committingchanges = 変更を�応中
 done = 完了
 feature.unsupported = ����デ�イス���機能をサ�ート�����ん。
 
-mods.alphainfo = Mod機能�実験的�も���。[scarlet] エラー���れ��る�能性��り��[]。\n �題を発見��場�� Mindustry GitHub�報告������。
+mods.initfailed = [red]⚠[] 以��Mindustry��期化�失敗����。\n��ら�Mod�誤作動�原因��。\n\nクラッシュループを防�����[red]全��Mod�無効�������。[]
 mods = Mods
 mods.none = [lightgray]Mod�見��り��ん���!
 mods.guide = Mod作�ガイド
 mods.report = �グを報告�る
-mods.openfolder = MOD�フォルダを開�
+mods.openfolder = Modフォルダを開�
+mods.viewcontent = コンテンツを見る
 mods.reload = �読�込�
 mods.reloadexit = Modを読�込む為�ゲームを�起動���。
+mod.installed = [[インストール済�]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]有効
 mod.disabled = [scarlet]無効
+mod.multiplayer.compatible = [gray]マル�プレイ�対応
 mod.disable = 無効化
+mod.version = Version:
 mod.content = コンテンツ:
-mod.delete.error = MODを削除�る�������ん���。
-mod.requiresversion = [scarlet]Mod��求�る最低�ージョン: [accent]{0}
-mod.outdated = [scarlet]V6 ��互�性��り��ん (minGameVersion � 105 未満)
-mod.missingdependencies = [scarlet]�存関係��り��ん。: {0}
+mod.delete.error = Modを削除�る�������ん���。
+mod.incompatiblegame = [red]旧�ージョン用
+mod.incompatiblemod = [red]�対応
+mod.blacklisted = [red]未対応
+mod.unmetdependencies = [red]�存関係エラー
 mod.erroredcontent = [scarlet]コンテンツエラー
+mod.circulardependencies = [red]循環�存
+mod.incompletedependencies = [red]�完全��存関係
+mod.requiresversion.details = ゲーム��ージョン�必���: [accent]{0}[]\n����ゲーム���������。��mod�機能�る���ゲーム�新���ージョン (��ら�ベータ/アルファリリース) �必���。
+mod.outdatedv7.details = ��mod�ゲーム�最新�ージョン�互�性��り��ん。 mod製作者�v7�対応�����[accent]minGameVersion: 136[] を [accent]mod.json[] ファイル�追加�る必���り��。
+mod.blacklisted.details = ��mod�����ージョン�ゲーム�クラッシュや��他��題を引�起�����手動�ブラックリスト�登録�れ����。 使用��������。
+mod.missingdependencies.details = �� mod �次� mod を必�������: {0}
+mod.erroredcontent.details = ��ゲーム��読�込�中�エラー�発生����。mod�作�者�修正を�頼������。
+mod.circulardependencies.details = �� mod ���相互��存�る�存関係��り��。
+mod.incompletedependencies.details = �存関係�無効���欠����る����� mod をロード����ん: {0}。
+mod.requiresversion = ゲーム��ージョン�必���: [red]{0}
 mod.errors = コンテンツ�読�込�中�エラー�発生����。
 mod.noerrorplay = [scarlet]以下�Mod�エラー��り��。[] Modを無効化�る��エラーを修正������。
 mod.nowdisabled = [scarlet]{0} �存関係��り��ん。:[accent] {1}\n[lightgray]�れら�Modをダウンロード�有効化�る必���り��。\n�����Mod�自動的�無効化�れ��。
@@ -149,14 +183,23 @@ mod.scripts.disable = �使��デ�イス�Scriptを使用��Modをサ
 about.button = 情報
 name = ��:
 noname = [accent]プレイヤー�[]を入力������。
+search = 検索:
 planetmap = 惑星地図
 launchcore = コアを打�上�る
 filename = ファイル�:
 unlocked = 新���素をアンロック!
 available = 新��研究�利用�能��!
+unlock.incampaign = < 詳細�キャンペーン�アンロック������ >
+campaign.select = 開始�るキャンペーンを�択
+campaign.none = [lightgray]キャンペーンを始�る惑星を�ん�����。\n惑星����も変更�能��。
+campaign.erekir = より新���より洗練�れ�コンテンツ。 ��一貫��進行�るキャンペーン。\n\n高�質�マップ���的�体験。
+campaign.serpulo = 昔�コンテンツ。クラシック�体験。より自由�発想。\n\nマップやキャンペーン�仕組��アン�ランス��る�能性��り���り洗練�れ���。
+campaign.difficulty = Difficulty
 completed = [accent]完了
 techtree = テックツリー
-research.legacy = [accent]5.0[] �研究データ�見��り���。\n[accent]��データを読�込����?[] �れ�も�[accent]破棄��新��キャンペーン�研究をやり直����?[](推奨)
+techtree.select = テックツリー��択
+techtree.serpulo = セルプロ
+techtree.erekir = エレキル
 research.load = ロード
 research.discard = 破棄
 research.list = [lightgray]研究:
@@ -168,7 +211,7 @@ 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.vote = ����プレイヤー�投票�よりサー�ー�らキック�れ���。
@@ -200,6 +243,7 @@ hosts.none = [lightgray]ローカル上�サー�ー�見��り��ん
 host.invalid = [scarlet]ホスト�接続����ん。
 
 servers.local = ローカルサー�ー
+servers.local.steam = オープンゲーム & ローカルサー�ー
 servers.remote = リモートサー�ー
 servers.global = コミュニティサー�ー
 
@@ -207,14 +251,25 @@ servers.disclaimer = コミュニティサー�ー��[accent]開発者�所
 servers.showhidden = �表示�サー�ーを表示�る
 server.shown = 表示
 server.hidden = �表示
+viewplayer = プレーヤーを表示: [accent]{0}
 
 trace = プレイヤー�記録
 trace.playername = プレイヤー�: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = ユニークID: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = モ�イルクライアント: [accent]{0}
 trace.modclient = カスタムクライアント: [accent]{0}
+trace.times.joined = �加回数: [accent]{0}
+trace.times.kicked = キック�れ�回数: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = 無効�クライアントID��! �グ報告������。
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Ban
 server.bans.none = Ban�れ�プレイヤー�見��り��ん���!
 server.admins = 管�者
@@ -228,10 +283,11 @@ server.version = [lightgray]�ージョン: {0} {1}
 server.custombuild = [accent]カスタムビルド
 confirmban = {0} をBan��もよ������?
 confirmkick = {0} をキック��もよ������?
-confirmvotekick = {0} を投票キック��もよ������?
 confirmunban = ��プレイヤー�Banを解除��もよ������?
 confirmadmin = {0} を管�者���もよ������?
 confirmunadmin = {0} を管�者�ら削除��もよ������?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = サー�ー��加
 joingame.ip = アドレス:
 disconnect = 接続�切断�れ���。
@@ -239,16 +295,18 @@ disconnect.error = 接続�エラー�発生����。
 disconnect.closed = 接続�切断�れ���。
 disconnect.timeout = タイムアウト����。
 disconnect.data = ワールドデータ�読�込��失敗����!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = ゲーム��加����ん���。 ([accent]{0}[])
 connecting = [accent]接続中...
 reconnecting = [accent]�接続中...
 connecting.data = [accent]ワールドデータを読�込�中...
 server.port = �ート:
-server.addressinuse = アドレス����使用�れ����!
 server.invalidport = 無効��ート番���!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]サー�ー�ホストエラー: [accent]{0}
 save.new = 新��存
 save.overwrite = ��スロット�上書���もよ������?
+save.nocampaign = キャンペーン�個別�セーブファイルをイン�ート�る�������ん。
 overwrite = 上書�
 save.none = セーブデータ�見��り��ん���!
 savefail = ゲーム��存�失敗����!
@@ -269,6 +327,7 @@ save.corrupted = [accent]セーブファイル�無効����破���
 empty = <空>
 on = オン
 off = オフ
+save.search = セーブデータを検索...
 save.autosave = 自動�存: {0}
 save.map = マップ: {0}
 save.wave = ウェーブ {0}
@@ -284,9 +343,30 @@ ok = OK
 open = 開�
 customize = カスタマイズ
 cancel = キャンセル
+command = コマンド
+command.queue = [lightgray][Queuing]
+command.mine = 採掘
+command.repair = 修復
+command.rebuild = �建築
+command.assist = プレイヤーをアシスト
+command.move = 移動
+command.boost = ブースト
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = リンクを開�
 copylink = リンクをコピー
 back = 戻る
+max = 最大
+objective = 地図上�目的地
 crash.export = クラッシュログを出力
 crash.none = クラッシュログ�見��り��ん。
 crash.exported = クラッシュログを出力����。
@@ -297,25 +377,27 @@ data.exported = ゲームデータをエクス�ート����。
 data.invalid = �れ�有効�ゲームデータ���り��ん。
 data.import.confirm = ゲームデータをイン�ート�る���在�����データ�削除�れ��。\n[accent]�れ�元�戻���ん![]\n\nイン�ート�完了�る��ゲーム�終了���。
 quit.confirm = 終了��もよ������?
-quit.confirm.tutorial = �ュートリアルを終了����?\n�ュートリアル� [accent]設定->ゲーム->�ュートリアル[] �ら�度��る�������。
 loading = [accent]読�込�中...
-reloading = [accent]�読�込�中...
+downloading = [accent]ダウンロード中...
 saving = [accent]�存中...
-respawn = [accent][[{0}][] to respawn in core
+respawn = [accent][[{0}][] コア�らリス�ーン�る
 cancelbuilding = [accent][[{0}][] �択を解除�る
 selectschematic = [accent][[{0}][] �択��コピー�る
 pausebuilding = [accent][[{0}][] 建築を一時的�中断�る
 resumebuilding = [scarlet][[{0}][] 建築を�開�る
-showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+enablebuilding = [scarlet][[{0}][] 建築を�能��る
+showui = UI �表示.\nUIを表示�る��[accent][[{0}][] を押下
+commandmode.name = [accent]コマンドモード
+commandmode.nounits = [no units]
 wave = [accent]ウェーブ {0}
-wave.cap = [accent]Wave {0}/{1}
+wave.cap = [accent]ウェーブ {0}/{1}
 wave.waiting = [lightgray]次�ウェーブ�� {0} 秒
 wave.waveInProgress = [lightgray]ウェーブ進行中
 waiting = [lightgray]待機中...
 waiting.players = プレイヤーを待�����...
 wave.enemies = [lightgray]敵�残り {0} 体
-wave.enemycores = [accent]{0}[lightgray] Enemy Cores
-wave.enemycore = [accent]{0}[lightgray] Enemy Core
+wave.enemycores = [accent]{0}[lightgray] 敵性コア
+wave.enemycore = [accent]{0}[lightgray] 敵性コア
 wave.enemy = [lightgray]敵�残り {0} 体
 wave.guardianwarn = [red][[警告][]ガーディアン��� [accent]{0}[] ウェーブ����。
 wave.guardianwarn.one = [red][[警告][]ガーディアン��� [accent]{0}[] ウェーブ����。
@@ -326,9 +408,9 @@ custom = カスタム
 builtin = 組�込�
 map.delete.confirm = マップを削除��もよ������? �れ�元�戻��������ん!
 map.random = [accent]ランダムマップ
-map.nospawn = ��マップ��プレイヤー�出��る���コア��り��ん! エディター�[accent]オレンジ色[]�コアをマップ�追加������。
+map.nospawn = ��マップ��プレイヤー�出��る���コア��り��ん! エディター�{0}�コアをマップ�追加������。
 map.nospawn.pvp = ��マップ��敵�プレイヤー�出��る���コア��り��ん! エディター�[scarlet]オレンジ色����[]コアをマップ�追加������。
-map.nospawn.attack = ��マップ��攻撃�る���敵�コア��り��ん! エディター�[scarlet]赤色[]�コアをマップ�追加������。
+map.nospawn.attack = ��マップ��攻撃�る���敵�コア��り��ん! エディター�{0}�コアをマップ�追加������。
 map.invalid = マップ�読�込�エラー: ファイル�無効����破������。
 workshop.update = æ›´æ–°
 workshop.error = ワークショップ�詳細を�得中�エラー�発生����: {0}
@@ -336,13 +418,18 @@ map.publish.confirm = 本当���マップを公開����?\n\n[lightgr
 workshop.menu = ��アイテム�対��行��作を�択������。
 workshop.info = アイテム�詳細
 changelog = 更新履歴 （オプション）:
+updatedesc = Overwrite Title & Description
 eula = Steam�使用許諾契約
 missing = ��アイテム�削除���移動�れ����。\n[lightgray]ワークショップ�リスト�自動的�リンク解除�れ���。
 publishing = [accent]公開中...
 publish.confirm = 公開��もよ������？\n\n[lightgray]最���ワークショップ�使用許諾契約����る�確�������。
 publish.error = 公開中�エラー: {0}
 steam.error = Steam サービス��期化�失敗����。\nエラー: {0}
+editor.planet = 惑星:
+editor.sector = セクター:
+editor.seed = シード値:
 
+editor.cliffs = �を崖��る
 editor.brush = ブラシ
 editor.openin = エディター�開�
 editor.oregen = 鉱石�生�
@@ -354,36 +441,72 @@ editor.nodescription = マップを公開�る���少���も4文字
 editor.waves = ウェーブ:
 editor.rules = ルール:
 editor.generation = 生�:
+editor.objectives = オブジェクティブ
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = ゲーム内�編集�る
+editor.playtest = Playtest
 editor.publish.workshop = ワークショップ�公開
 editor.newmap = 新��マップ
-editor.center = Center
+editor.center = 中心
+editor.search = マップを検索...
+editor.filters = マップをフィルター�る
+editor.filters.mode = ゲームモード:
+editor.filters.type = マップタイプ:
+editor.filters.search = 検索:
+editor.filters.author = 作者
+editor.filters.description = 説明
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = ワークショップ
 waves.title = ウェーブ
 waves.remove = 削除
-waves.never = <永久>
 waves.every = ウェーブ
 waves.waves = ���出�
+waves.health = health: {0}%
 waves.perspawn = 体出�
 waves.shields = シールド/ウェーブ
 waves.to = �ら
+waves.spawn = ス�ーン:
+waves.spawn.all = <all>
+waves.spawn.select = ス�ーン�択
+waves.spawn.none = [scarlet] マップ�ス�ーン地点�見��り��ん
+waves.max = 最大ユニット数
 waves.guardian = ガーディアン
 waves.preview = プレビュー
 waves.edit = 編集...
+waves.random = ランダム
 waves.copy = クリップボード�コピー
 waves.load = クリップボード�ら読�込む
 waves.invalid = クリップボード�ウェーブ�無効�ウェーブ��。
 waves.copied = ウェーブをコピー����。
 waves.none = 敵�定義�れ����ん。\n空�ウェーブレイアウト�デフォルト�レイアウト�自動的�置���られ��。
+waves.sort = 昇順
+waves.sort.reverse = �順
+waves.sort.begin = 開始
+waves.sort.health = 体力
+waves.sort.type = タイプ
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = ����表示
+waves.units.show = ���表示
 
-#these are intentionally in lower case
+#these are intentionally in lower case = #these are intentionally in lower case
 wavemode.counts = æ•°
 wavemode.totals = �数
 wavemode.health = �体力
+all = All
 
 editor.default = [lightgray]<デフォルト>
 details = 詳細...
 edit = 編集...
+variables = 変数
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = ��:
 editor.spawn = ユニットを出�
 editor.removeunit = ユニットを消�
@@ -395,13 +518,19 @@ editor.errorlegacy = ��マップ�����。今後���マップ
 editor.errornot = �れ�マップファイル���り��ん。
 editor.errorheader = ��マップファイル�無効���破������。
 editor.errorname = マップ����設定�れ����ん。
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = æ›´æ–°
 editor.randomize = ランダム
+editor.moveup = 上�移動
+editor.movedown = 下�移動
+editor.copy = コピー
 editor.apply = �用
 editor.generate = 生�
+editor.sectorgenerate = セクターを生�
 editor.resize = リサイズ
 editor.loadmap = マップを読�込む
 editor.savemap = マップを�存
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = �存����!
 editor.save.noname = マップ����設定�れ����ん! メニュー� 'マップ情報' �ら設定������。
 editor.save.overwrite = 組�込�マップを上書��よ�������! メニュー� 'マップ情報' �ら異�る���設定������。
@@ -420,7 +549,7 @@ editor.exportimage = 地形画�をエクス�ート
 editor.exportimage.description = 地形���マップ画�をエクス�ート�る
 editor.loadimage = 地形をイン�ート
 editor.saveimage = 地形をエクス�ート
-editor.unsaved = [scarlet]�存�れ����変更��り��![]\n終了��もよ������?
+editor.unsaved = [scarlet]�存�れ����変更�失�れ��![]\n終了��もよ������?
 editor.resizemap = マップをリサイズ
 editor.mapname = マップ�:
 editor.overwrite = [accent]警告!\n���存在�るマップを上書����。
@@ -429,56 +558,85 @@ editor.exists = ��������マップ�存在���。
 editor.selectmap = 読�込むマップを�択:
 
 toolmode.replace = 置�
-toolmode.replace.description = 固体ブロック�������。
+toolmode.replace.description = �系統�ブロック��を置��る。
 toolmode.replaceall = 全�置�
-toolmode.replaceall.description = ��マップ��る����ブロックを置�����。
-toolmode.orthogonal = 直角
-toolmode.orthogonal.description = 直角�線を����。
+toolmode.replaceall.description = マップ内��ブロックを���置��る。
+toolmode.orthogonal = 水平垂直
+toolmode.orthogonal.description = 水平も���垂直�線を����。
 toolmode.square = 四角形
 toolmode.square.description = 四角形�ブラシ��。
 toolmode.eraseores = 鉱石消�ゴム
-toolmode.eraseores.description = 鉱石��を消���。
-toolmode.fillteams = �ーム�埋�る
-toolmode.fillteams.description = ブロック�代�り��ーム�埋���。
-toolmode.drawteams = �ームを��
-toolmode.drawteams.description = ブロック�代�り��ームを����。
+toolmode.eraseores.description = 鉱石��を消���。(敵�出�場所�む)
+toolmode.fillteams = �ームを変更
+toolmode.fillteams.description = ブロック�所属�ームを上書����。
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
+toolmode.drawteams = �ームを変更
+toolmode.drawteams.description = ブロック�所属�ームを上書����。
+toolmode.underliquid = 液体タイル
+toolmode.underliquid.description = 液体タイル��を置����。
 
 filters.empty = [lightgray]フィルター�設定�れ����ん! 下�ボタン�らフィルターを追加������。
+
 filter.distort = ゆ��
 filter.noise = ノイズ
 filter.enemyspawn = 敵ス�ーンセレクト
-filter.spawnpath = Path To Spawn
+filter.spawnpath = ス�ーン����
 filter.corespawn = コアセレクト
-filter.median = メディアン
-filter.oremedian = メディアン (鉱石)
+filter.median = 中央値
+filter.oremedian = 中央値 (鉱石)
 filter.blend = ブレンド
 filter.defaultores = デフォルト�鉱石
 filter.ore = 鉱石
-filter.rivernoise = リ�ーノイズ
+filter.rivernoise = ��生�
 filter.mirror = �転
-filter.clear = クリアー
+filter.clear = クリア
 filter.option.ignore = 無視
 filter.scatter = 分散
 filter.terrain = 地形
+filter.logic = Logic
+
 filter.option.scale = スケール
 filter.option.chance = 確率
 filter.option.mag = マグニ�ュード
-filter.option.threshold = スレッシュホールド
+filter.option.threshold = 閾値
 filter.option.circle-scale = サークルスケール
 filter.option.octaves = オクターブ
-filter.option.falloff = フォールオフ
+filter.option.falloff = 減衰
 filter.option.angle = 角度
+filter.option.tilt = 傾�
+filter.option.rotate = 回転
 filter.option.amount = �
 filter.option.block = ブロック
 filter.option.floor = 地�
 filter.option.flooronto = 対象�地�
 filter.option.target = ターゲット
+filter.option.replacement = 置�
 filter.option.wall = �
 filter.option.ore = 鉱石
 filter.option.floor2 = 2番目�地�
-filter.option.threshold2 = 2番目�スレッシュホールド
+filter.option.threshold2 = 2番目�閾値
 filter.option.radius = �径
 filter.option.percentile = パーセンタイル
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = å¹…:
 height = 高�:
@@ -489,9 +647,10 @@ load = 読�込む
 save = �存
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
-language.restart = ゲームを�起動後�言語設定�有効��り��。
+language.restart = ゲームを�起動�る��言語設定�有効��り��。
 settings = 設定
 tutorial = �ュートリアル
 tutorial.retake = �ュートリアル
@@ -504,112 +663,259 @@ locked = ロック
 complete = [lightgray]��済�:
 requirement.wave = {1} �ウェーブ {0} �到�
 requirement.core = {0} �敵�コアを破壊
-requirement.research = 研究 {0}
-requirement.produce = �得 {0}
-requirement.capture = 制圧 {0}
+requirement.research = 研究: {0}
+requirement.produce = �得: {0}
+requirement.capture = 制圧: {0}
+requirement.onplanet = {0} �制御セクター
+requirement.onsector = セクター��陸: {0}
 launch.text = 発射
-research.multiplayer = 研究��る��ホスト����。
 map.multiplayer = ホスト���セクターを表示����。
 uncover = 開放
 configure = ����設定
+objective.research.name = 研究
+objective.produce.name = 入手
+objective.item.name = アイテム入手
+objective.coreitem.name = コアアイテム
+objective.buildcount.name = ビルド数
+objective.unitcount.name = ユニット数
+objective.destroyunits.name = ユニットを破壊�る
+objective.timer.name = タイマー
+objective.destroyblock.name = ブロックを破壊�る
+objective.destroyblocks.name = ブロックを破壊�る
+objective.destroycore.name = コアを破壊�る
+objective.commandmode.name = コマンドモード
+objective.flag.name = フラグ
+marker.shapetext.name = テキスト�形
+marker.point.name = Point
+marker.shape.name = 図形
+marker.text.name = 文章
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = 背景
+marker.outline = 輪郭
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]入手:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]破壊:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]破壊: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]入手: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]コア��る:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]建設: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]ユニット建造: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]破壊: [][lightgray]{0}[]x ユニット
+objective.enemiesapproaching = [accent]敵� [lightgray]{0}[] �接近中
+objective.enemyescelating = [accent][lightgray]{0} �敵�生産�早��る。[]
+objective.enemyairunits = [accent][lightgray]{0} �敵�航空部隊�生産�始�る。[]
+objective.destroycore = [accent]敵�コアを破壊�る
+objective.command = [accent]ユニット�制御
+objective.nuclearlaunch = [accent]⚠ 核�発射�検出�れ���: [lightgray]{0}
+announce.nuclearstrike = [red]⚠ 核�攻撃を������⚠
 
 loadout = ロードアウト
 resources = 資�
+resources.max = Max
 bannedblocks = �止ブロック
+unbannedblocks = Unbanned Blocks
+objectives = オブジェクティブ
+bannedunits = �止ユニット
+unbannedunits = Unbanned Units
+bannedunits.whitelist = 「�止ユニット�以外を�止�る（ホワイトリスト）
+bannedblocks.whitelist = 「�止ブロック�以外を�止�る（ホワイトリスト）
 addall = ���追加
 launch.from = [accent]{0}[] �ら�発射
-launch.destination = Destination: {0}
+launch.capacity = 発射アイテム容�: [accent]{0}
+launch.destination = 目的地: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = 値� 0 �ら {0} �間���れ��り��ん。
 add = 追加...
-boss.health = ボス�HP
+guardian = ガーディアン
 
 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 = マップファイル�見��り��ん!
-error.io = �ットワークエラー��。
+error.io = I/O �ットワークエラー��。
 error.any = �明��ットワークエラー��。
 error.bloom = ブルーム��期化�失敗����。\n�ら�����デ�イス��ブルーム�サ�ート�れ����ん。
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = 雨
-weather.snow.name = 雪
+weather.snowing.name = 雪
 weather.sandstorm.name = 砂�
 weather.sporestorm.name = 胞��
 weather.fog.name = 霧
+campaign.playtime = \uf129 [lightgray]セクタープレイ時間: {0}
+campaign.complete = [accent]����������。\n\n{0} �敵を倒����。\n[lightgray]最終セクターを制圧����。
 
+sectorlist = セクター
+sectorlist.attacked = {0}�攻撃を������
 sectors.unexplored = [lightgray]未�査
 sectors.resources = 資�:
 sectors.production = 生産:
 sectors.export = �出:
+sectors.import = �入:
 sectors.time = 時間:
 sectors.threat = 脅�:
 sectors.wave = ウェーブ:
-sectors.stored = �存済�:
+sectors.stored = コア�資�:
 sectors.resume = �開
 sectors.launch = 打�上�
 sectors.select = �択
-sectors.nonelaunch = [lightgray]none (sun)
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]無� (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = セクター�を変更
 sectors.enemybase = [scarlet]敵基地
-sectors.vulnerable = [scarlet]Vulnerable
-sectors.underattack = [scarlet]攻撃を����! [accent]{0}% 破�
+sectors.vulnerable = [scarlet]脆弱
+sectors.underattack = [scarlet]攻撃を������! [accent]{0}% 破�
+sectors.underattack.nodamage = [scarlet]未制圧
 sectors.survives = [accent]{0} ウェーブ生存
 sectors.go = Go
+sector.abandon = 廃棄
+sector.abandon.confirm = ��セクター�コア�自爆���。\n続行����?
 sector.curcapture = 制圧��セクター
 sector.curlost = 失�れ�セクター
 sector.missingresources = [scarlet]資��足り��ん
 sector.attacked = セクター [accent]{0}[white] �攻撃を������!
 sector.lost = セクター [accent]{0}[white] 喪失!
-#note: the missing space in the line below is intentional
-sector.captured = セクター [accent]{0}[white]制圧!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = アイコンを変更
+sector.noswitch.title = セクターを切り替�る�������ん
+sector.noswitch = 既存�セクター�攻撃を����る間��セクターを切り替�る�������ん。\n\nセクター: [accent]{0}[] on [accent]{1}[]
+sector.view = セクターを表示
 
 threat.low = 低
 threat.medium = 中
 threat.high = 高
-threat.extreme = �激
-threat.eradication = 根絶
+threat.extreme = �酷
+threat.eradication = ç ´æ»…çš„
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = 惑星
 
 planet.serpulo.name = セルプロ
+planet.erekir.name = エレキル
 planet.sun.name = 太陽
 
-sector.impact0078.name = インパクト 0078
-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.biomassFacility.name = Biomass Synthesis Facility
-sector.windsweptIslands.name = Windswept Islands
-sector.extractionOutpost.name = Extraction Outpost
-sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.impact0078.name = 墜�地点 0078
+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.biomassFacility.name = �イオマス研究施設
+sector.windsweptIslands.name = ���ら��列島
+sector.extractionOutpost.name = 資��出�哨基地
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = 惑星間発射ターミナル
+sector.coastline.name = 海岸線
+sector.navalFortress.name = 海��塞
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.
-sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
-sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
-sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
-sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
-sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.groundZero.description = 奪回を始�る��最��場所��。敵�脅���������資�������。\n��る��多��銅�鉛を集���ょ�。\n始���ょ�。
+sector.frozenForest.description = ������山�近����胞��広������。\n極寒�気候も���胞�を永����込�る�������ん���。\n\n電気�挑���ょ�。\n�力発電機を建設��修復機�使�方を学���ょ�。
+sector.saltFlats.description = 砂漠���れ��る平野��。\n����資����ん��り��ん。\n\n敵����資�貯蔵施設を建設����。\n彼ら�コアを破壊��掃滅������。
+sector.craters.description = �去�戦争��残��るクレーター�水�溜������。\nエリアを�り戻��砂を集��メタガラスを精錬���ょ�。\nタレット�ドリルを冷��る����水を�ンプ��る必���り��。
+sector.ruinousShores.description = �れ地を��る�海岸線��。\n�������沿岸防衛隊��備�れ���������残存�����ん。\n最も基本的�防衛施設���無傷���残���り��れ以外�全�破壊�れ����。\n外部拡張を続��研究を�発見������ょ�。
+sector.stainedMountains.description = 更�内陸���胞��汚染�れ����山��り��。\n��地域���タン�豊富��り��。抽出��使�方を学���ょ�。\n\n����より多��敵�襲����。強力�ユニットを�る時間を与��������。
+sector.overgrowth.description = ��エリア��胞��発生��近�生�茂�����。\n敵�����哨基地を�備����。ユニット�"メイス"を生産��破壊������。\n失��も�を�り戻����。
+sector.tarFields.description = 山�砂漠�挟�れ��石油産出地帯���れ��。\n利用�能�石油�埋蔵�る数少��エリア�1���。\n放棄�れ�エリア����近��脅���る敵����。\n\n[lightgray]�能��れ�石油�関連�る施設を研究���ょ�。
+sector.desolateRift.description = �常��険�地帯��。資��豊富����領域��分��り��ん。破壊�れるリスク�高����一刻も早�立�去り��ょ�。\n敵�攻撃間隔�長�����気を抜��������。
+sector.nuclearComplex.description = 崩壊��トリウム製造・加工施設��。\n[lightgray]トリウム���多��用途を研究������。\n\n多��敵����存在��常�攻撃を�察�����。
+sector.fungalPass.description = 高山��胞��多�低地��間��移地域��。\n����敵�����察基地��り��。\n破壊������。\nダガー�クローラーユニットを使��2��敵コア�排除���ょ��
+sector.biomassFacility.description = 胞��発生���。\n�れら�胞��研究�����最��建設�れ�施設��。\n内部�残�れ�技術を研究���ょ�。燃料�プラスタニウム�生産����胞�を培養���。\n\n[lightgray]��施設�活動�止������胞��放出�れ���。地域�生態系�����よ��侵略的生物�競��るも���り��ん。
+sector.windsweptIslands.description = 海岸を�ら�進む��辺鄙�列島��り��。記録�よれ���������[accent]プラスタニウム[]�生産施設��り���。\n\n敵�海�ユニットを撃沈������。島々�基地を建造���れら�工場を調査���ょ�。
+sector.extractionOutpost.description = 他�セクター�資�を輸��る���建設�れ�敵��隔地��哨基地��。\n\n�ら�る��������セクター間を通�る輸�技術���欠��。基地を破壊������。彼ら�発射�を研究���ょ�。
+sector.impact0078.description = �����最����星系�入��星間輸�船�残骸��り��。\n\n残骸を�能��り回���解��能�技術を研究���ょ�。
+sector.planetaryTerminal.description = 最終目標��。\n\n��沿岸基地���コアを他�惑星�打�上�る���出�る建造物��り��。����極��堅固�守られ����。\n\n海�ユニットを生産����的速や��敵を排除������。\n����発射場を研究���ょ�。
+sector.coastline.description = ����海��技術�残骸�発見�れ���。\n敵�攻撃を退���領����技術を�得���ょ�。
+sector.navalFortress.description = 敵��自然�塞化��離島�基地を設�����。���哨基地を破壊���ょ�。\n彼ら�高度�艦艇技術を入手��研究���ょ�。
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = オンセット
+sector.aegis.name = イージス
+sector.lake.name = レイク
+sector.intersect.name = インターセクト
+sector.atlas.name = アトラス
+sector.split.name = スプリット
+sector.basin.name = ベイシン
+sector.marsh.name = マーシュ
+sector.peaks.name = ピークス
+sector.ravine.name = ラヴィーン
+sector.caldera-erekir.name = カルデラ
+sector.stronghold.name = ストロングホールド
+sector.crevice.name = クレ�ス
+sector.siege.name = シージ
+sector.crossroads.name = クロスロード
+sector.karst.name = カルスト
+sector.origin.name = オリジン
+sector.onset.description = エレキル�制圧を開始���。資�を集��ユニットを生産��技術�研究を始���ょ�。
+
+sector.aegis.description = ��セクター���タングステン�鉱床��り��。\n��資�を採掘�る���[accent]インパクトドリル[]を研究����地域�敵基地を破壊���ょ�。
+sector.lake.description = ��セクター��溶岩湖��り�使用�能�ユニット��られ����。\n[accent]戦艦工場[]を研究��一刻も早�[accent]エリュード[]を生産���ょ�。
+sector.intersect.description = セクター�陸後����多方��ら敵�押�寄���。\n速や��防御を固��基地を展開������ょ�。\n�れ�地形����[accent]メカ[]�必���。
+sector.atlas.description = ��セクター������地形��り����攻略��多��種類�ユニット�必���。\n������攻略��強化��ユニット�必���り��。\n[accent]電解装置[]�[accent]戦車�加工工場[]を研究���ょ�。
+sector.split.description = 敵�少��場所��。���新��輸�技術を学���ょ�。
+sector.basin.description = ��セクター��大��敵�確��れ����。\n素早�ユニットを生産��敵�コアを破壊���ょ�。
+sector.marsh.description = ��セクター��豊富�アーキサイト��り����ジェットホール��られ����。\n[accent]化学燃焼�ャン�ー[]を構築��電力を生�������。
+sector.peaks.description = ��セクター�山岳地帯������ん��ユニット�役�立���ん。飛行ユニット�必���り��。\n敵�対空施設�注�������。�れら�施設����周辺�建物を破壊�る����無効化��る場���り��。
+sector.ravine.description = 敵�������輸�路��る�も���ら����セクター��敵�コア�検出�れ����ん。�����敵勢力�存在�る���予想�れ��。\n[accent]サージ�金[] を生産�� [accent]アフリクト[] を建設���ょ�。
+sector.caldera-erekir.description = ��セクター�検出�れ�リソース�������島々�散ら������。\nドローンベース�輸�手段を研究���備������。
+sector.stronghold.description = ��セクター��敵�大�模�野営地��り� [accent]トリウム[] ����鉱脈を守�����。\n�れを利用���より高度�ユニットやタレットを研究������。
+sector.crevice.description = 敵���セクター�基地を破壊�る����激��攻撃部隊を�り込ん����。\n[accent]炭化物[] � [accent]パイロリシス発電機[] �開発��生�残る����必���欠�も�れ��ん。
+sector.siege.description = ��セクター���二��平行��峡谷��り�二方��ら攻撃�れ������。\n[accent]シアン[] を研究����ら�強力�戦車ユニットを作��る能力を�得������。\n注�: 敵�長�離ミサイル�検出�れ���。 ミサイル��弾��撃墜�れる�能性��り��。
+sector.crossroads.description = ��セクター�敵�拠点�������地形�設置�れ����。多種類�ユニットを研究��対応���ょ�。\n���シールド�守られ��る拠点も�り��。シールド�動力�を探���ょ�。
+sector.karst.description = ��セクター�資��豊富����新��コア�上陸�る�敵�攻撃を��る����り��。\n資�を活用�� [accent]フェーズファイ�ー[] を研究������。
+sector.origin.description = 敵�多�存在�る最後�セクター��。\n研究�����も��も�残�����ん。敵コア�破壊�専念���ょ�。
+
+status.burning.name = 燃焼
+status.freezing.name = ��
+status.wet.name = 水濡れ
+status.muddy.name = 泥�ら�
+status.melting.name = 溶解
+status.sapped.name = ��
+status.electrified.name = 帯電
+status.spore-slowed.name = �化胞�
+status.tarred.name = 石油塗れ
+status.overdrive.name = オー�ードライブ
+status.overclock.name = オー�ークロック
+status.shocked.name = 電撃
+status.blasted.name = 爆破
+status.unmoving.name = 移動�止
+status.boss.name = ガーディアン
 
 settings.language = 言語
 settings.data = ゲームデータ
@@ -632,6 +938,7 @@ settings.clearcampaignsaves.confirm = キャンペーン�セーブデータを
 paused = [accent]< �ーズ >
 clear = 消去
 banned = [scarlet]使用�止
+unsupported.environment = [scarlet]サ�ート�れ����環境
 yes = ��
 no = ���
 info.title = 情報
@@ -639,14 +946,18 @@ error.title = [crimson]エラー�発生����
 error.crashtitle = エラー�発生����
 unit.nobuild = [scarlet]構築��
 lastaccessed = [lightgray]最終アクセス {0}
+lastcommanded = [lightgray]最後�コマンド: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <表示�マップを読�込む>
 stat.description = 説明
 stat.input = �入
 stat.output = �出
+stat.maxefficiency = 最大効率
 stat.booster = ブースト
 stat.tiles = 必��タイル
 stat.affinities = 親和性
+stat.opposites = 排他性
 stat.powercapacity = 電力容�
 stat.powershot = 電力/ショット
 stat.damage = ダメージ
@@ -669,8 +980,11 @@ stat.memorycapacity = メモリー容�
 stat.basepowergeneration = 基本発電�
 stat.productiontime = 製造速度
 stat.repairtime = ブロック�完全修復速度
+stat.repairspeed = 修復速度
 stat.weapons = 武器
 stat.bullet = 弾丸
+stat.moduletier = モジュールレベル
+stat.unittype = Unit Type
 stat.speedincrease = 速度�上
 stat.range = 範囲
 stat.drilltier = ドリル
@@ -678,8 +992,9 @@ stat.drillspeed = 基本採掘速度
 stat.boosteffect = ブースト効果
 stat.maxunits = 最大ユニット数
 stat.health = �久値
+stat.armor = アーマー
 stat.buildtime = 建設時間
-stat.maxconsecutive = Max Consecutive
+stat.maxconsecutive = 最大連鎖
 stat.buildcost = 建設費用
 stat.inaccuracy = 誤差
 stat.shots = ショット
@@ -693,6 +1008,7 @@ stat.lightningchance = 電撃確率
 stat.lightningdamage = 電撃ダメージ
 stat.flammability = �燃性
 stat.radioactivity = 放射能
+stat.charge = 帯電性
 stat.heatcapacity = 熱容�
 stat.viscosity = 粘度
 stat.temperature = 温度
@@ -701,25 +1017,77 @@ stat.buildspeed = 建築速度
 stat.minespeed = 採掘速度
 stat.minetier = 採掘
 stat.payloadcapacity = �載容�
-stat.commandlimit = 指�上�
 stat.abilities = 能力
 stat.canboost = ブースト�能
 stat.flying = 飛行
 stat.ammouse = 使用弾薬
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = ダメージ�率
+stat.healthmultiplier = 体力�率
+stat.speedmultiplier = スピード�率
+stat.reloadmultiplier = リロード�率
+stat.buildspeedmultiplier = 建築速度�率
+stat.reactive = �応
+stat.immunities = �性
+stat.healing = 治癒
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = フォースフィールド
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = リペアフィールド
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = ステータスフィールド
-ability.unitspawn = {0} 生産
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = 生産
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = シールドリペアフィールド
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = ムーブメントライトニング
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = シールドアーク
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = リジェ�抑制フィールド
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = エ�ルギー範囲
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = コア����入����。
 
 bar.drilltierreq = より高性能�ドリルを使用������
-bar.noresources = Missing Resources
-bar.corereq = Core Base Required
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = �足���る資�
+bar.corereq = コアベース�必�
+bar.corefloor = コアゾーンタイル�必�
+bar.cargounitcap = 貨物ユニット�容��上�������
 bar.drillspeed = 採掘速度: {0}/秒
 bar.pumpspeed = �ンプ�速度: {0}/s
 bar.efficiency = 効率: {0}%
+bar.boost = ブースト: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = 電力�衡: {0}/秒
 bar.powerstored = �蓄電�: {0}/{1}
 bar.poweramount = 蓄電�: {0}
@@ -730,49 +1098,66 @@ bar.capacity = 容�: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = 液体
 bar.heat = 熱
+bar.cooldown = Cooldown
+bar.instability = �安定度
+bar.heatamount = 熱: {0}
+bar.heatpercent = 熱: {0} ({1}%)
 bar.power = 電力
 bar.progress = 建設状�
+bar.loadprogress = 進�状�
+bar.launchcooldown = 打�上�後�クールダウン
 bar.input = 入力
 bar.output = 出力
+bar.strength = [stat]{0}[lightgray]x 強化
 
 units.processorcontrol = [lightgray]プロセッサー�制御下
 
 bullet.damage = [stat]{0}[lightgray] ダメージ
 bullet.splashdamage = [stat]{0}[lightgray] 範囲ダメージ 約[stat] {1}[lightgray] タイル
 bullet.incendiary = [stat]焼夷弾
-bullet.sapping = [stat]sapping
 bullet.homing = [stat]追尾弾
-bullet.shock = [stat]電撃
-bullet.frag = [stat]爆発弾
+bullet.armorpierce = [stat]アーマー貫通
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x ライトニング ~ [stat]{1}[lightgray] ダメージ
 bullet.buildingdamage = [stat]{0}%[lightgray] 対物ダメージ
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] ノック�ック
 bullet.pierce = [stat]{0}[lightgray]x レーザー弾
 bullet.infinitepierce = [stat]レーザー弾
 bullet.healpercent = [stat]{0}[lightgray]% 回復
-bullet.freezing = [stat]��
-bullet.tarred = [stat]タール弾
+bullet.healamount = [stat]{0}[lightgray] 直接修�
 bullet.multiplier = [stat]弾薬 {0}[lightgray]�
-bullet.reload = [stat]リロード速度 {0}[lightgray]�
+bullet.reload = [stat]リロード速度 {0}[lightgray]%
+bullet.range = [stat]{0}[lightgray] タイル範囲
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = ブロック
 unit.blockssquared = ブロック²
 unit.powersecond = 電力/秒
+unit.tilessecond = タイル/秒
 unit.liquidsecond = 液体/秒
 unit.itemssecond = アイテム/秒
 unit.liquidunits = 液体
 unit.powerunits = 電力
+unit.heatunits = 熱�装置
 unit.degrees = 度
 unit.seconds = 秒
 unit.minutes = 分
 unit.persecond = /秒
 unit.perminute = /分
 unit.timesspeed = ��速度
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = シールド
 unit.items = アイテム
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /発
 category.purpose = 説明
 category.general = 一般
@@ -782,17 +1167,23 @@ category.items = アイテム
 category.crafting = �入/�出
 category.function = 役割
 category.optional = 強化オプション
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = コア�打�上�/�陸アニメーションをスキップ
 setting.landscape.name = 横画��固定
 setting.shadows.name = å½±
 setting.blockreplace.name = 自動ブロック�案
 setting.linear.name = リニアフィルター
 setting.hints.name = ヒント
-setting.flow.name = 資��通��表示
-setting.backgroundpause.name = �ックグラウンド�一時�止中
-setting.buildautopause.name = オート�ーズビルディング
+setting.logichints.name = ロジック�ヒント
+setting.backgroundpause.name = �ックグラウンド中�一時�止�る
+setting.buildautopause.name = 常�建築一時中断状態��る
+setting.doubletapmine.name = ダブルタップ�採掘�る
+setting.commandmodehold.name = コマンドモード�長押�
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = 起動時�クラッシュ��場��Modを無効��る
 setting.animatedwater.name = �体�アニメーション
 setting.animatedshields.name = シールド�アニメーション
-setting.antialias.name = アン�エイリアス[lightgray] (�起動�必�)[]
 setting.playerindicators.name = プレイヤー�方角表示
 setting.indicators.name = 敵�方角表示
 setting.autotarget.name = オートターゲット
@@ -801,15 +1192,12 @@ setting.touchscreen.name = タッ�スクリーン�作
 setting.fpscap.name = 最大FPS
 setting.fpscap.none = ��
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UIサイズ[lightgray] (�起動�必�)[]
+setting.uiscale.name = UIサイズ
+setting.uiscale.description = �起動�必���。
 setting.swapdiagonal.name = 常�斜�設置
-setting.difficulty.training = トレーニング
-setting.difficulty.easy = イージー
-setting.difficulty.normal = ノーマル
-setting.difficulty.hard = �ード
-setting.difficulty.insane = クレイジー
-setting.difficulty.name = 難易度:
 setting.screenshake.name = 画���れ
+setting.bloomintensity.name = �ら���強�
+setting.bloomblur.name = 光��や�
 setting.effects.name = 画�効果
 setting.destroyedblocks.name = 破壊�れ�ブロックを表示
 setting.blockstatus.name = ブロック�状態を表示
@@ -817,33 +1205,43 @@ setting.conveyorpathfinding.name = コンベアー�置経路探索
 setting.sensitivity.name = �作感度
 setting.saveinterval.name = 自動�存間隔
 setting.seconds = {0} 秒
-setting.milliseconds = {0} milliseconds
+setting.milliseconds = {0} ミリ秒
 setting.fullscreen.name = フルスクリーン
-setting.borderlesswindow.name = 境界�無�ウィンドウ[lightgray] (�起動�必���る場���り��)
+setting.borderlesswindow.name = ボーダーレスウィンドウ
+setting.borderlesswindow.name.windows = ボーダーレスフルスクリーン
+setting.borderlesswindow.description = �起動�必���る場���り��。
 setting.fps.name = FPSを表示
+setting.console.name = コンソールを有効��る
 setting.smoothcamera.name = スムーズ�カメラ
 setting.vsync.name = 垂直�期
 setting.pixelate.name = ピクセル化[lightgray] (アニメーション�無効化�れ��)
 setting.minimap.name = ミニマップを表示
-setting.coreitems.name = コア�資�を表示 (WIP)
+setting.coreitems.name = コア�資�を表示
 setting.position.name = プレイヤー��置表示
+setting.mouseposition.name = マウス��置を表示
 setting.musicvol.name = 音楽 音�
 setting.atmosphere.name = 惑星�大気を表示
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = 環境音 音�
 setting.mutemusic.name = 音楽をミュート
 setting.sfxvol.name = 効果音 音�
 setting.mutesound.name = 効果音をミュート
 setting.crashreport.name = 匿��クラッシュレ�ートを�信�る
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = 自動�存
-setting.publichost.name = 誰�もゲーム��加��るよ���る
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = プレイヤー数制�
 setting.chatopacity.name = �ャット��明度
-setting.lasersopacity.name = レーザー��明度
+setting.lasersopacity.name = 電線��明度
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = ブリッジ��明度
 setting.playerchat.name = ゲーム内��ャットを表示
 setting.showweather.name = 天気�グラフィックを表示
-public.confirm = ゲームを公開����？\n[accent]誰�もゲーム��加��るよ���り��。\n[lightgray]���ら設定�変更����。
-public.confirm.really = If you want to play with friends, use [green]Invite Friend[] instead of a [scarlet]Public server[]!\nAre you sure you want to make your game [scarlet]public[]?
+setting.hidedisplays.name = �画�れ��るロジックディスプレイを�表示
+setting.macnotch.name = インターフェイスをノッ�表示��応��る
+setting.macnotch.description = �起動�必���。
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = ベータ版��使用����ん。
 uiscale.reset = UIサイズ�変更�れ���。\n�����よ�れ�「OK�を押������。\n[scarlet][accent]{0}[] 秒�元�設定�戻り��...
 uiscale.cancel = キャンセル & 終了
@@ -852,12 +1250,9 @@ keybind.title = キー�インドを�設定
 keybinds.mobile = [scarlet]モ�イル��多��キー�インド�機能���ん。基本的�動����サ�ート�れ����。
 category.general.name = 一般
 category.view.name = 表示
+category.command.name = Unit Command
 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 = ユニットをコントロール
@@ -865,14 +1260,35 @@ keybind.clear_building.name = 建築��り消�
 keybind.press = キーを押������...
 keybind.press.axis = 軸���キーを押������...
 keybind.screenshot.name = スクリーンショット
-keybind.toggle_power_lines.name = パワーレーザー�切り替�
+keybind.toggle_power_lines.name = 電線�表示�切り替�
 keybind.toggle_block_status.name = ブロック�状態表示�切り替�
 keybind.move_x.name = 左�移動
 keybind.move_y.name = 上下移動
 keybind.mouse_move.name = マウスを追�
-keybind.pan.name = パン
+keybind.pan.name = 視点移動
 keybind.boost.name = ブースト
-keybind.schematic_select.name = 地域��択
+keybind.command_mode.name = コマンドモード
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = リージョン��構築
+keybind.schematic_select.name = 範囲�択
 keybind.schematic_menu.name = 設計図メニュー
 keybind.schematic_flip_x.name = 設計図をX座標��転
 keybind.schematic_flip_y.name = 設計図をY座標��転
@@ -897,18 +1313,20 @@ keybind.select.name = �択/ショット
 keybind.diagonal_placement.name = 斜�設置
 keybind.pick.name = ブロック��択
 keybind.break_block.name = ブロック�破壊
+keybind.select_all_units.name = ����ユニットを�択
+keybind.select_all_unit_factories.name = ����ユニット工場を�択
 keybind.deselect.name = �択解除
 keybind.pickupCargo.name = 貨物を拾�
 keybind.dropCargo.name = 貨物を���
-keybind.command.name = 指�
 keybind.shoot.name = ショット
 keybind.zoom.name = ズーム
 keybind.menu.name = メニュー
 keybind.pause.name = �ーズ
-keybind.pause_building.name = 建築��ーズ/レジューム
+keybind.pause_building.name = 建築�一時中断/�開
 keybind.minimap.name = ミニマップ
 keybind.planet_map.name = 惑星地図
 keybind.research.name = 研究
+keybind.block_info.name = ブロック情報
 keybind.chat.name = �ャット
 keybind.player_list.name = プレイヤーリスト
 keybind.console.name = コンソール
@@ -918,63 +1336,114 @@ keybind.toggle_menus.name = メニュー切り替�
 keybind.chat_history_prev.name = ���ャット履歴
 keybind.chat_history_next.name = 次��ャット履歴
 keybind.chat_scroll.name = �ャットスクロール
-keybind.chat_mode.name = Change Chat Mode
+keybind.chat_mode.name = �ャットモード�変更
 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 = Editor
+mode.editor.name = エディター
 mode.pvp.name = PvP
-mode.pvp.description = エリア内�他�プレイヤー�戦���。\n[gray]プレイ�る���マップ�少���も二��異�る色�コア�必���。
+mode.pvp.description = エリア内�他�プレイヤー�戦���。\n[gray]マップ�少���も異�る2色�コア�必���。
 mode.attack.name = アタック
-mode.attack.description = ウェーブ����敵�基地を破壊�る��を目指���。\n[gray]プレイ�る���マップ�赤色�コア�必���。
+mode.attack.description = ウェーブ����敵�基地を破壊�る��を目指���。\n[gray]マップ�赤色�コア�必���。
 mode.custom = カスタムルール
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = �止ブロックを�表示
 
 rules.infiniteresources = 資��無�化
+rules.onlydepositcore = コア���入��を許�
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = リアクター�爆発
+rules.coreincinerates = 余剰アイテム�焼�
+rules.disableworldprocessors = ワールドプロセッサーを無効��る
 rules.schematic = 設計図を許�
 rules.wavetimer = ウェーブ�自動進行
+rules.wavesending = ウェーブスキップ
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = ウェーブ
+rules.airUseSpawns = Air units use spawn points
 rules.attack = アタックモード
-rules.buildai = AI 建築
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = �ーム�最少人数
+rules.rtsmaxsquadsize = �ーム�最大人数
+rules.rtsminattackweight = 最�攻撃力
+rules.cleanupdeadteams = 敗北���ーム�建設物を片付�る (PvP)
+rules.corecapture = 破壊時�コアを奪�
+rules.polygoncoreprotection = 多角形�建設�止区域�設定
+rules.placerangecheck = �置範囲�確�
 rules.enemyCheat = 敵(赤�ーム)�資��無�化
 rules.blockhealthmultiplier = ブロック�体力�率
 rules.blockdamagemultiplier = ブロック�ダメージ�率
 rules.unitbuildspeedmultiplier = ユニット�製造速度�率
+rules.unitcostmultiplier = ユニット�製造コスト�率
 rules.unithealthmultiplier = ユニット�体力�率
 rules.unitdamagemultiplier = ユニット�ダメージ�率
+rules.unitcrashdamagemultiplier = ユニット���ダメージ�率
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = 太陽光��率
+rules.unitcapvariable = コア数�よ��ユニット上�を変動
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = 基礎ユニット上�数
+rules.limitarea = マップエリアを制�
 rules.enemycorebuildradius = 敵コア周辺�建設�止区域��径:[lightgray] (タイル)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = ウェーブ間�待機時間:[lightgray] (秒)
+rules.initialwavespacing = 第1ウェーブ�待機時間 [lightgray] (秒)
 rules.buildcostmultiplier = 建設コスト��率
 rules.buildspeedmultiplier = 建設速度��率
 rules.deconstructrefundmultiplier = ブロック破壊時�還元�率
 rules.waitForWaveToEnd = 敵�倒�れる��ウェーブ�進行を中断
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = 出�範囲��径:[lightgray] (タイル)
 rules.unitammo = ユニット�弾丸�必�
+rules.enemyteam = 敵�ーム
+rules.playerteam = プレイヤー�ーム
 rules.title.waves = ウェーブ
 rules.title.resourcesbuilding = 資� & 建設
 rules.title.enemy = 敵
 rules.title.unit = ユニット
 rules.title.experimental = 実験的�ゲームプレイ
 rules.title.environment = 環境
+rules.title.teams = �ーム
+rules.title.planet = 惑星
 rules.lighting = 霧
-rules.enemyLights = Enemy Lights
-rules.fire = Fire
+rules.fog = 戦場�霧
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = ��
+rules.anyenv = <Any>
 rules.explosions = 爆発ダメージ
 rules.ambientlight = 霧�色
 rules.weather = 気象
 rules.weather.frequency = 頻度:
-rules.weather.always = Always
+rules.weather.always = 常時
 rules.weather.duration = 継続時間:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = アイテム
 content.liquid.name = 液体
 content.unit.name = ユニット
 content.block.name = ブロック
+content.status.name = ステータス効果
 content.sector.name = セクター
+content.team.name = 派閥
+wallore = (�)
 
 item.copper.name = 銅
 item.lead.name = 鉛
@@ -992,10 +1461,24 @@ item.blast-compound.name = 爆発性化�物
 item.pyratite.name = ピラタイト
 item.metaglass.name = メタガラス
 item.scrap.name = スクラップ
+item.fissile-matter.name = 核分裂性物質
+item.beryllium.name = ベリリウム
+item.tungsten.name = タングステン
+item.oxide.name = 酸化物
+item.carbide.name = 炭化物
+item.dormant-cyst.name = �活性�嚢胞
+
 liquid.water.name = æ°´
 liquid.slag.name = スラグ
 liquid.oil.name = 石油
 liquid.cryofluid.name = 冷�水
+liquid.neoplasm.name = �オプラズム
+liquid.arkycite.name = アーキサイト
+liquid.gallium.name = ガリウム
+liquid.ozone.name = オゾン
+liquid.hydrogen.name = æ°´ç´ 
+liquid.nitrogen.name = 窒素
+liquid.cyanogen.name = シアン
 
 unit.dagger.name = ダガー
 unit.mace.name = メイス
@@ -1023,6 +1506,11 @@ unit.minke.name = ミンク
 unit.bryde.name = ブライド
 unit.sei.name = セイ
 unit.omura.name = オムラ
+unit.retusa.name = レトゥーザ
+unit.oxynoe.name = オキシノ
+unit.cyerce.name = サイラス
+unit.aegires.name = エイガース
+unit.navanax.name = ナ�ナックス
 unit.alpha.name = アルファ
 unit.beta.name = ベータ
 unit.gamma.name = ガンマ
@@ -1030,14 +1518,36 @@ unit.scepter.name = セプター
 unit.reign.name = レイン
 unit.vela.name = ヴェラ
 unit.corvus.name = コー�ス
+unit.stell.name = ステル
+unit.locus.name = ローカス
+unit.precept.name = プリセプト
+unit.vanquish.name = ヴァンキッシュ
+unit.conquer.name = コンカ―
+unit.merui.name = メルイ
+unit.cleroi.name = クレロイ
+unit.anthicus.name = アンティカス
+unit.tecta.name = テクタ
+unit.collaris.name = コラリス
+unit.elude.name = アルード
+unit.avert.name = アヴァート
+unit.obviate.name = オヴィエート
+unit.quell.name = クヱル
+unit.disrupt.name = ディスラプト
+unit.evoke.name = エヴォーク
+unit.incite.name = インサイト
+unit.emanate.name = エマ�ート
+unit.manifold.name = マニホールド
+unit.assembly-drone.name = 組立ドローン
+unit.latum.name = ラトゥム
+unit.renale.name = レナール
 
-block.resupply-point.name = 補給�イント
 block.parallax.name = パララックス
 block.cliff.name = å´–
 block.sand-boulder.name = 巨大�礫
 block.basalt-boulder.name = 玄武岩�礫
 block.grass.name = �
-block.slag.name = スラグ
+block.molten-slag.name = スラグ
+block.pooled-cryofluid.name = 冷�水
 block.space.name = Space
 block.salt.name = 岩塩氷河
 block.salt-wall.name = 塩��
@@ -1065,24 +1575,28 @@ block.graphite-press.name = 黒鉛圧縮機
 block.multi-press.name = マル�圧縮機
 block.constructing = {0}\n[lightgray](建設中)
 block.spawn.name = 敵�出�場所
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = コア: シャード
 block.core-foundation.name = コア: ファンデーション
 block.core-nucleus.name = コア: ニュークリアス
-block.deepwater.name = 深層水
-block.water.name = æ°´
-block.tainted-water.name = 汚れ�水
+block.deep-water.name = 深層水
+block.shallow-water.name = æ°´
+block.tainted-water.name = 汚水
+block.deep-tainted-water.name = 深層汚水
 block.darksand-tainted-water.name = 黒�砂�汚れ�水
 block.tar.name = タール
 block.stone.name = 石
-block.sand.name = ç ‚
+block.sand-floor.name = ç ‚
 block.darksand.name = 黒�砂
 block.ice.name = æ°·
 block.snow.name = 雪
-block.craters.name = クレーター
+block.crater-stone.name = クレーター
 block.sand-water.name = ���水
 block.darksand-water.name = 黒�砂����水
 block.char.name = 焦�跡
 block.dacite.name = デイサイト
+block.rhyolite.name = �紋岩
 block.dacite-wall.name = デイサイト��
 block.dacite-boulder.name = デイサイト�礫
 block.ice-snow.name = 雪氷
@@ -1094,12 +1608,13 @@ block.pine.name = ��木
 block.dirt.name = æ³¥
 block.dirt-wall.name = 泥��
 block.mud.name = 汚泥
-block.white-tree-dead.name = 白�枯れ�樹木
+block.white-tree-dead.name = 枯れ�白�樹木
 block.white-tree.name = 白�樹木
 block.spore-cluster.name = 胞��房
 block.metal-floor.name = 金属製�地� 1
 block.metal-floor-2.name = 金属製�地� 2
 block.metal-floor-3.name = 金属製�地� 3
+block.metal-floor-4.name = 金属製�地� 4
 block.metal-floor-5.name = 金属製�地� 5
 block.metal-floor-damaged.name = 破壊�れ�金属製�地�
 block.dark-panel-1.name = ダークパ�ル 1
@@ -1139,6 +1654,9 @@ block.distributor.name = ディストリビューター
 block.sorter.name = ソーター
 block.inverted-sorter.name = �転ソーター
 block.message.name = メッセージブロック
+block.reinforced-message.name = 強化�れ�メッセージブロック
+block.world-message.name = ワールドメッセージブロック
+block.world-switch.name = World Switch
 block.illuminator.name = イルミ�ーター
 block.overflow-gate.name = オー�ーフローゲート
 block.underflow-gate.name = アンダーフローゲート
@@ -1190,20 +1708,22 @@ block.solar-panel.name = ソーラーパ�ル
 block.solar-panel-large.name = 大型ソーラーパ�ル
 block.oil-extractor.name = 石油抽出機
 block.repair-point.name = 修復�イント
+block.repair-turret.name = 修復タレット
 block.pulse-conduit.name = パルスパイプ
 block.plated-conduit.name = メッキパイプ
 block.phase-conduit.name = フェーズパイプ
 block.liquid-router.name = 液体ルーター
 block.liquid-tank.name = 液体タンク
+block.liquid-container.name = 液体コンテナ
 block.liquid-junction.name = 液体ジャンクション
 block.bridge-conduit.name = ブリッジパイプ
 block.rotary-pump.name = ロータリー�ンプ
 block.thorium-reactor.name = トリウムリアクター
 block.mass-driver.name = マスドライ�ー
 block.blast-drill.name = エアブラストドリル
-block.thermal-pump.name = サーマル�ンプ
+block.impulse-pump.name = サーマル�ンプ
 block.thermal-generator.name = サーマル発電機
-block.alloy-smelter.name = �金溶鉱炉
+block.surge-smelter.name = �金溶鉱炉
 block.mender.name = 修復機
 block.mend-projector.name = 修復プロジェクター
 block.surge-wall.name = サージ�金��
@@ -1220,26 +1740,191 @@ block.meltdown.name = メルトダウン
 block.foreshadow.name = フォーシャドウ
 block.container.name = コンテナー
 block.launch-pad.name = 発射�
-block.launch-pad-large.name = 大型発射�
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = セグメント
-block.command-center.name = �令塔
 block.ground-factory.name = 陸�工場
 block.air-factory.name = 空�工場
 block.naval-factory.name = 海�工場
-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 = マスコンベアー
+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.duct.name = ダクト
+block.duct-router.name = ダクトルーター
+block.duct-bridge.name = ダクトブリッジ
+block.large-payload-mass-driver.name = 大型ペイロードマスドライ�ー
+block.payload-void.name = ペイロードボイド
+block.payload-source.name = ペイロードソース
 block.disassembler.name = ディスアセンブラー
 block.silicon-crucible.name = シリコンクルーシブル
 block.overdrive-dome.name = 加速ドーム
-#experimental, may be removed
-block.block-forge.name = ブロックフォージ
-block.block-loader.name = ブロック�載機
-block.block-unloader.name = ブロック�出機
 block.interplanetary-accelerator.name = 惑星間加速器
+block.constructor.name = コンストラクター
+block.constructor.description = 最大�2x2�大���構造物を建造���。
+block.large-constructor.name = 大型コンストラクター
+block.large-constructor.description = 最大�4x4�大���構造物を建造���。
+block.deconstructor.name = デコンストラクター
+block.deconstructor.description = 構造物やユニットを解体���。建造費�100％�戻�����。
+block.payload-loader.name = ペイロード�入機
+block.payload-loader.description = 液体や資�をブロック��入���。
+block.payload-unloader.name = ペイロード�出機
+block.payload-unloader.description = ブロック�ら液体や資�を�出���。
+block.heat-source.name = 熱�
+block.heat-source.description = 1x1�熱���。
+block.empty.name = 空白
+block.rhyolite-crater.name = ライオライトクレーター
+block.rough-rhyolite.name = 粗�ライオライト
+block.regolith.name = レゴリス
+block.yellow-stone.name = 黄色�石
+block.carbon-stone.name = 炭素質�石
+block.ferric-stone.name = 鉄分質�石
+block.ferric-craters.name = 鉄分質�クレーター
+block.beryllic-stone.name = ベリリウム質�石
+block.crystalline-stone.name = 水晶質�石
+block.crystal-floor.name = 水晶�床
+block.yellow-stone-plates.name = 黄色�石��
+block.red-stone.name = 赤�石
+block.dense-red-stone.name = 高密度�赤�石
+block.red-ice.name = 赤�氷
+block.arkycite-floor.name = アーキサイト�床
+block.arkyic-stone.name = アーキサイト質�石
+block.rhyolite-vent.name = ライオライトジェット
+block.carbon-vent.name = カーボンジェット
+block.arkyic-vent.name = アーキサイトジェット
+block.yellow-stone-vent.name = イエローストーンジェット
+block.red-stone-vent.name = レッドストーンジェット
+block.crystalline-vent.name = クリスタルジェット
+block.redmat.name = レッドマット
+block.bluemat.name = ブルーマット
+block.core-zone.name = コアゾーン
+block.regolith-wall.name = レゴリス��
+block.yellow-stone-wall.name = 黄色�石��
+block.rhyolite-wall.name = ライオライト��
+block.carbon-wall.name = 炭素��
+block.ferric-stone-wall.name = 鉄分質�石��
+block.beryllic-stone-wall.name = ベリリウム質�石��
+block.arkyic-wall.name = アーキサイト��
+block.crystalline-stone-wall.name = 水晶質�石��
+block.red-ice-wall.name = 赤�氷��
+block.red-stone-wall.name = 赤�石��
+block.red-diamond-wall.name = 赤�ダイヤモンド��
+block.redweed.name = レッドウィード
+block.pur-bush.name = プルブッシュ
+block.yellowcoral.name = イエローコーラル
+block.carbon-boulder.name = 炭素質�丸石
+block.ferric-boulder.name = 鉄分質�丸石
+block.beryllic-boulder.name = ベリリウム質�丸石
+block.yellow-stone-boulder.name = 黄色�丸石
+block.arkyic-boulder.name = アーキサイト質�丸石
+block.crystal-cluster.name = 水晶�塊
+block.vibrant-crystal-cluster.name = ��水晶�塊
+block.crystal-blocks.name = 水晶ブロック
+block.crystal-orbs.name = 水晶玉
+block.crystalline-boulder.name = 水晶質�丸石
+block.red-ice-boulder.name = 赤�氷�丸石
+block.rhyolite-boulder.name = ライオライト�丸石
+block.red-stone-boulder.name = 赤�丸石
+block.graphitic-wall.name = 黒鉛��
+block.silicon-arc-furnace.name = シリコン放電炉
+block.electrolyzer.name = 電解装置
+block.atmospheric-concentrator.name = 窒素濃縮機
+block.oxidation-chamber.name = 酸化�ャン�ー
+block.electric-heater.name = 電気ヒーター
+block.slag-heater.name = スラグヒーター
+block.phase-heater.name = フェーズヒーター
+block.heat-redirector.name = ヒートリダイレクター
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = ヒートルーター
+block.slag-incinerator.name = スラグ焼�炉
+block.carbide-crucible.name = 炭化物クルーシブル
+block.slag-centrifuge.name = スラグ�心分離機
+block.surge-crucible.name = サージクルーシブル
+block.cyanogen-synthesizer.name = シアンシンセサイザー
+block.phase-synthesizer.name = フェーズシンセサイザー
+block.heat-reactor.name = ヒートリアクター
+block.beryllium-wall.name = ベリリウム��
+block.beryllium-wall-large.name = 大��ベリリウム��
+block.tungsten-wall.name = タングステン��
+block.tungsten-wall-large.name = 大��タングステン��
+block.blast-door.name = ブラストドア
+block.carbide-wall.name = 炭化物��
+block.carbide-wall-large.name = 大��炭化物��
+block.reinforced-surge-wall.name = 強化サージ�金��
+block.reinforced-surge-wall-large.name = 大��強化サージ�金��
+block.shielded-wall.name = シールド�
+block.radar.name = レーダー
+block.build-tower.name = ビルドタワー
+block.regen-projector.name = 復元プロジェクター
+block.shockwave-tower.name = ショックウェーブタワー
+block.shield-projector.name = シールドプロジェクター
+block.large-shield-projector.name = 大型シールドプロジェクター
+block.armored-duct.name = 装甲ダクト
+block.overflow-duct.name = オー�ーフローダクト
+block.underflow-duct.name = アンダーフローダクト
+block.duct-unloader.name = ダクト�出機
+block.surge-conveyor.name = サージコンベアー
+block.surge-router.name = サージルーター
+block.unit-cargo-loader.name = ��ユニット�入機
+block.unit-cargo-unload-point.name = ��ユニット�出機
+block.reinforced-pump.name = 強化�ンプ
+block.reinforced-conduit.name = 強化パイプ
+block.reinforced-liquid-junction.name = 強化液体ジャンクション
+block.reinforced-bridge-conduit.name = 強化液体ブリッジ
+block.reinforced-liquid-router.name = 強化液体ルーター
+block.reinforced-liquid-container.name = 強化液体コンテナー
+block.reinforced-liquid-tank.name = 強化液体タンク
+block.beam-node.name = ビームノード
+block.beam-tower.name = ビームタワー
+block.beam-link.name = ビームリンク
+block.turbine-condenser.name = タービンコンデンサー
+block.chemical-combustion-chamber.name = 化学燃焼室
+block.pyrolysis-generator.name = パイロリシス発電機
+block.vent-condenser.name = ジェットコンデンサー
+block.cliff-crusher.name = クリフ掘削機
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = プラズマ掘り
+block.large-plasma-bore.name = 大��プラズマ掘り
+block.impact-drill.name = インパクトドリル
+block.eruption-drill.name = イラプションドリル
+block.core-bastion.name = コア:�スティオン
+block.core-citadel.name = コア:シタデル
+block.core-acropolis.name = コア:アクロ�リス
+block.reinforced-container.name = 強化コンテナ
+block.reinforced-vault.name = 強化ボールト
+block.breach.name = ブリー�
+block.sublimate.name = サブリメート
+block.titan.name = タイタン
+block.disperse.name = ディスパーズ
+block.afflict.name = アフリクト
+block.lustre.name = ラストル
+block.scathe.name = スケース
+block.tank-refabricator.name = 戦車�加工工場
+block.mech-refabricator.name = メカ�加工工場
+block.ship-refabricator.name = 戦艦�加工工場
+block.tank-assembler.name = 戦車組立工場
+block.ship-assembler.name = 戦艦組立工場
+block.mech-assembler.name = メカ組立工場
+block.reinforced-payload-conveyor.name = 強化ペイロードコンベアー
+block.reinforced-payload-router.name = 強化ペイロードルーター
+block.payload-mass-driver.name = ペイロードマスドライ�ー
+block.small-deconstructor.name = ���デコンストラクター
+block.canvas.name = キャン�ス
+block.world-processor.name = ワールドプロセッサー
+block.world-cell.name = ワールドセル
+block.tank-fabricator.name = 戦車工場
+block.mech-fabricator.name = メカ工場
+block.ship-fabricator.name = 戦艦工場
+block.prime-refabricator.name = 上級�加工工場
+block.unit-repair-tower.name = ユニット修�タワー
+block.diffuse.name = ディフューズ
+block.basic-assembler-module.name = 基本組立モジュール
+block.smite.name = スマイト
+block.malign.name = マライン
+block.flux-reactor.name = フラックスリアクター
+block.neoplasia-reactor.name = �オプラジアリアクター
 
 block.switch.name = スイッ�
 block.micro-processor.name = マイクロプロセッサー
@@ -1249,98 +1934,160 @@ block.logic-display.name = ロジックディスプレイ
 block.large-logic-display.name = 大型ロジックディスプレイ
 block.memory-cell.name = メモリーセル
 block.memory-bank.name = メモリー�ンク
-
-team.blue.name = ブルー
+team.malis.name = マリス
 team.crux.name = レッド
 team.sharded.name = オレンジ
-team.orange.name = オレンジ
 team.derelict.name = 廃墟
 team.green.name = グリーン
-team.purple.name = パープル
+
+team.blue.name = ブルー
 
 hint.skip = スキップ
-hint.desktopMove = Use [accent][[WASD][] to move.
-hint.zoom = [accent]Scroll[] to zoom in or out.
-hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually.
-hint.desktopShoot = [accent][[Left-click][] to shoot.
-hint.depositItems = To transfer items, drag from your ship to the core.
-hint.respawn = To respawn as a ship, press [accent][[V][].
-hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
-hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
-hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it.
-hint.placeDrill.mobile = Select the \ue85e[accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
-hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
-hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors.
-hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them.
-hint.breaking = [accent]Right-click[] and drag to break blocks.
-hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
-hint.research = Use the \ue875 [accent]Research[] button to research new technology.
-hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
-hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
-hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets.
-hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
-hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
-hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
-hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
-hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
-hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
-hint.command = Press [accent][[G][] to command nearby units of [accent]similar type[] into formation.\n\nTo command ground units, you must first control another ground unit.
-hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation.
-hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
-hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
-hint.payloadDrop = Press [accent]][] to drop a payload.
-hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
-hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
-hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
-hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
-hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions.
-hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
-hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
-hint.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
+hint.desktopMove = [accent][[WASD][]を使�移動���。
+hint.zoom = [accent]マウスホイール[]�ズームイン�ズームアウトを���。
+hint.desktopShoot = [accent][[左クリック][]�射撃���。
+hint.depositItems = アイテムを移����シップ�らコア�ドラッグ���。
+hint.respawn = シップ���リス�ーン�る���[accent][[V][]を押���。
+hint.respawn.mobile = ユニット/建造物�コントロールを得���。シップ���リス�ーン�る���[accent]左上�アイコンをタップ���。[]
+hint.desktopPause = [accent][[スペース][]を押���ゲームを一時�止�一時�止�解除�����。
+hint.breaking = [accent]�クリック[]��クリックドラッグ�よりブロックを壊���。
+hint.breaking.mobile = �下��る\ue817 [accent]�ンマー[]をアクティブ����タップ��ブロックを壊���。\n\n指を１秒間押����ドラッグ�る��範囲�択�出���。
+hint.blockInfo = [accent]建築メニュー[]�ブロックを�択�����[accent][[?][]ボタンを押���ブロック�情報�表示�れ��。
+hint.derelict = [accent]放棄[]�れ����機能を失����基地建造物�残骸��。\n\n�れら�[accent]解体[]�る���より�資���り��。
+hint.research = \ue875 [accent]研究[]ボタンを押���新��テクノロジーを研究���。
+hint.research.mobile = \ue88c [accent]メニュー[]�\ue875 [accent]研究[]ボタンを押���新��テクノロジーを研究���。
+hint.unitControl = [accent][[左ctrl][]を押���ら[accent]クリック[]�る�タレットや味方ユニットを�作����。
+hint.unitControl.mobile = [accent][ダブルタップ[]�る�味方ユニットやタレットを�作����。
+hint.unitSelectControl = ユニットを�作�る��� [accent][[左Shift][] を押�� [accent]コマンドモード[] �入り��。\nコマンドモード���クリック＆ドラッグ�ユニットを�択�る�������。 [accent]�クリック[] �場所や目標物を指定������るユニットを指�����。
+hint.unitSelectControl.mobile = ユニットを�作�る��� [accent]command[] ボタンを押�� [accent]コマンドモード[] ����。\nコマンドモード���長押�&ドラッグ�ユニットを�択����。場所や目標をタップ�る������るユニット�命令を出��������。
+hint.launch = �分�資�を確����ら��下�\ue827 [accent]マップ[]�ら�近��セクターを�択��[accent]発射[]����。
+hint.launch.mobile = �分�資�を確����ら�\ue88c [accent]メニュー[]�\ue827 [accent]マップ[]�ら�近��セクターを�択��[accent]発射[]����。
+hint.schematicSelect = [accent][[F][]を押���らドラッグ���コピー&ペースト�るブロックを�択���。\n\n[accent][[ミドルクリック][]�より�１��ブロックタイプをコピー���。
+hint.rebuildSelect = [accent][[B][] を押����ドラッグ���破壊�れ�ブロック計画を�択���。\n�れ�より��れら�自動的��建築�れ��。
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = [accent][[左-Ctrl][]を押���らコンベアーをドラッグ�る��経路�自動生��れ��。
+hint.conveyorPathfind.mobile = \ue844 [accent]対角線モード[]を有効���コンベアーをドラッグ�る�経路�自動生����。
+hint.boost = [accent][[左シフト][]を押������る���作中�ユニット�障害物を飛�越���。\n\n少数�地上ユニット�����ブースターを�載�����。
+hint.payloadPickup = [accent][[[]を押������ブロック���ユニットを格����。
+hint.payloadPickup.mobile = [accent]タップ&ホールド[]�より����ブロック���ユニットを格����。
+hint.payloadDrop = [accent]][]を押����載物を�����。
+hint.payloadDrop.mobile = 空���る場所を[accent]タップ&ホールド[]����載物を�����。
+hint.waveFire = [accent]ウェーブ[]タレット�水を�入�る��近���を自動的�消����。
+hint.generator = \uf879 [accent]�力発電機[]石炭を燃や��隣接�るブロック�電力を供給���。\n\n電力供給範囲�\uf87f [accent]電�ノード[]�拡張����。
+hint.guardian = [accent]ガーディアン[]ユニット�装甲を�載�����。[accent]銅[]や[accent]鉛[]���弱�弾薬�[scarlet]効果��り��ん[]。\n\n強力�ターレット����\uf861デュオ/\uf859サルボー�弾薬�\uf835 [accent]黒鉛[]を使用��ガーディアンを撃破������。
+hint.coreUpgrade = コア� [accent]上��コアを�置�る���アップグレード����[]。\n\n \uf869 [accent]シャード[]コア�上�� \uf868 [accent]ファンデーション[]コアを置���。近��障害物�����を確�������。
+hint.presetLaunch = [accent]フローズン · フォレスト[]����色�[accent]�陸ゾーンセクター[]������ら�も発射��る��近��領土を確��る必���り��ん。\n\n������よ��[accent]数字�セクター[]��[accent]���り���り��ん[]。
+hint.presetDifficulty = ��セクター�[scarlet]敵�脅�レベル�高���[]。\n��よ��セクター��出撃���切�技術�準備����[accent]�勧�����ん[]。
+hint.coreIncinerate = コア�アイテム��数�上�����アイテム��入�れ�[accent]破棄[]�れ��。
+hint.factoryControl = ユニット工場� [accent]出力先[] を設定�る���コマンドモード�工場ブロックをクリック����場所を�クリック���。\n��工場�生産�れ�ユニット��自動的����移動���。
+hint.factoryControl.mobile = ユニット工場� [accent]出力先[] を設定�る���コマンドモード�工場ブロックをタップ��場所をタップ������。\n��工場�生産�れ�ユニット�自動的����移動���。
+gz.mine = 地�� \uf8c4 [accent]銅鉱石[]�近��移動��クリック��採掘を開始���。
+gz.mine.mobile = 地�� \uf8c4 [accent]銅鉱石[]�近��移動��タップ��採掘を開始���。
+gz.research = \ue875 技術ツリーを開���。\n\uf870 [accent]機械ドリル[] を探����下�メニュー�ら�択���。\n銅をクリック���置���。
+gz.research.mobile = \ue875 技術ツリーを開���。\n\uf870 [accent]機械ドリル[] を探����下�メニュー�ら�択���。\n銅をタップ���置���。\n\n\ue800 [accent]�下��ェックマーク[]�確定���。
+gz.conveyors = \uf896 [accent]コンベア[] を研究���置��\n採掘��素�をドリル�らコア�移���ょ�。\n\nドラッグ��複数�コンベアを�置���。\n[accent]マウスホイールをスクロール[] ����を変更���。
+gz.conveyors.mobile = \uf896 [accent]コンベア[] を研究���置��\n採掘��素�をドリル�らコア�移���ょ�。\n\n長押�&ドラッグ���複数�コンベアを�置���。
+gz.drills = 採掘場所を拡大���ょ�。\n機械ドリルを�ら��置���。\n銅を 100個 採掘���ょ�。
+gz.lead = \uf837 [accent]鉛[] も一般的�使用�れる素���。\nドリルを�置��鉛を採掘���ょ�。
+gz.moveup = \ue804 �ら�る目的����上�移動���ょ�。
+gz.turrets = \uf861 [accent]デュオ[] を研究��二��置��コアを守り��。\nデュオ���コンベア�ら� \uf838 [accent]弾丸[] �必���。
+gz.duoammo = コンベアを使��デュオ�[accent]銅[]を供給������。
+gz.walls = [accent]�[]�建物�対�るダメージを防��������。\nタレット�周り�\uf8ae [accent]銅��[]を�置���ょ�。
+gz.defend = 敵�迫�������防御�る準備を������。
+gz.aa = 飛行ユニット��標準�タレット��簡���倒���ん。\n\uf860 [accent]スキャッター[] �優れ�対空防衛を実�������弾丸��� \uf837 [accent]鉛[] �必���。
+gz.scatterammo = コンベアを使���[accent]鉛[]をスキャッター�供給������。
+gz.supplyturret = [accent]タレット��供給
+gz.zone1 = ���敵�出��イント。
+gz.zone2 = ウェーブ�始�る��円�中�構築�れ�も�����破壊�れ��。
+gz.zone3 = も���ウェーブ�始�り��。\n準備を������。
+gz.finish = より多��タレットを建設��より多��資�を採掘��\n����ウェーブ�ら防御��[accent]セクターを�領[]������。
+onset.mine = クリック�� \uf748 [accent]ベリリウム[] を��ら採掘���ょ�。\n\n移動�る�� [accent][[WASD] を使用������。
+onset.mine.mobile = ��ら\uf748 [accent]ベリリウム[]を採掘�る��タップ������。
+onset.research = \ue875 技術ツリーを開���。\n \uf73e [accent]タービンコンデンサー[] を研究��ジェットホール��置���ょ�。\n�れ�より [accent]電力[] �生��れ��。
+onset.bore = \uf741 [accent]プラズマ掘り[]を研究���置���ょ�。\n�れ�より���ら素��自動的�採掘�れ��。
+onset.power = プラズマ掘り�[accent]給電[]�る���\uf73d [accent]ビームノード[]を研究���置���。\nタービンコンデンサーをプラズマ掘り�接続���。
+onset.ducts = \uf799 [accent]ダクト[]を研究���置��採掘��資�をプラズマ掘り�らコア�移���ょ�。\nドラッグ��複数�ダクトを�置���。\n[accent]マウスホイールをスクロール[]����を変更���。
+onset.ducts.mobile = \uf799 [accent]ダクト[] を研究���置��採掘��資�をプラズマ掘り�らコア�移���ょ�。\n\n長押�&ドラッグ���複数�ダクトを�置���。
+onset.moremine = 採掘場所を拡大���ょ�。\n�ら�プラズマ掘りを�置��ビームノード�ダクトを使用��採掘���。\n200個�ベリリウムを採掘���ょ�。
+onset.graphite = より高度�ブロック�� \uf835 [accent]黒鉛[] �必���。\n黒鉛を採掘�る���プラズマ掘りを�置���。
+onset.research2 = [accent]工場[]�研究を始���ょ�。\n\uf74d [accent]クリフ掘削機[]�\uf779 [accent]シリコン放電炉[]を研究������。
+onset.arcfurnace = シリコン放電炉� \uf82f [accent]シリコン[] を作��る���\uf834 [accent]砂[] � \uf835 [accent]黒鉛[] �必���。\n[accent]電力[] も必���。
+onset.crusher = \uf74d [accent]クリフ掘削機[]を使��砂を採掘���ょ�。
+onset.fabricator = [accent]ユニット[]を使��マップを探索��建物を守り�敵を攻撃������。 \uf6a2 [accent]戦車工場[]を研究���置���。
+onset.makeunit = ユニットを生産���。\n[[?]を使用���。ボタンをクリック����択��工場�概�を確����。
+onset.turrets = ユニット�効果的����[accent]タレット[] �効果的�使用�れ�より優れ�防御能力を�供���。\n\uf6eb [accent]ブリー�[] を�置���。\nタレット�� \uf748 [accent]弾丸[] �必���。
+onset.turretammo = タレット�[accent]ベリリウム弾[]を供給������。
+onset.walls = [accent]�[]�建物�対�るダメージを防��������。\n砲��周囲� \uf6ee [accent]ベリリウム��[] を�����置���ょ�。
+onset.enemies = 敵�迫�������防御�る準備を������。
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = 敵�脆弱��。�撃���ょ��
+onset.cores = 新��コア� [accent]コアタイル[] ��置����。\n新��コア��線基地���機能��リソースインベントリを他�コア�共有���。\n\uf725 コアを�置���ょ�。
+onset.detect = 敵� 2 分以内����を見����。\n防御�採掘�生産を用����ょ�。
+onset.commandmode = [accent]shift[] を押���ら [accent]コマンドモード[] �移行���。\n[accent]左クリック&ドラッグ[] �ユニットを�択���。\n[accent]�クリック[] を�る���択��ユニット�移動や攻撃���命令を���。
+onset.commandmode.mobile = [accent]コマンドボタン[] を押�� [accent]コマンドモード[] ����。\n長押����ら [accent]ドラッグ[] �ユニットを�択���。\n[accent]タップ[] ��択��ユニット�移動や攻撃���命令を���。
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = 一部�ブロック�コアユニット�拾��������。\n�� [accent]コンテナ[] を拾��[accent]ペイロード�入機[] ��置���。\n(デフォルト�キー� [ and ] ��拾��り置��り����。)
+split.pickup.mobile = 一部�ブロック�コアユニット�拾��������。\n��[accent]コンテナ[]を拾��[accent]ペイロード�入機[]��置���。\n(何�を拾��り置��り�る���長押����。)
+split.acquire = ユニットを構築�る���タングステンを入手�る必���り��。
+split.build = ユニット����対��輸��る必���り��。\n��両�� 1 ����2 �� [accent]ペイロードマスドライ�ー[] を�置���。\n����� 1 �を�択��リンクを設定��次�も� 1 �を�択���。
+split.container = コンテナ��様��[accent]ペイロードマスドライ�ー[]を使用��ユニットを輸��る��も����。\nユニット工場をマスドライ�ー�隣��置����込���を越��敵�基地を攻撃���。
 
-item.copper.description = 便利�鉱石��。様々�ブロック��料���幅広�使�れ����。
-item.copper.details = セルプロ�豊富�金属。補強����り構造的�弱�。
-item.lead.description = 一般的�手軽�鉱石��。機械や液体輸�ブロック���使�れ��。
-item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
-item.metaglass.description = ��も頑丈�強化ガラス��。液体�輸�やタンク���幅広�使�れ����。
+item.copper.description = 便利�鉱石��。\n多様�ブロック��料���幅広�使�れ����。
+item.copper.details = セルプロ�豊富�金属��。\n補強����り構造的�弱���。
+item.lead.description = 一般的�手軽�鉱石��。\n機械や液体輸�ブロック���使�れ��。
+item.lead.details = 高密度��活性��。�ッテリー�よ�利用�れ��。\nノート: 生物学的�有毒��る�能性��り��。����り��生命���り見られ��ん。
+item.metaglass.description = ��も頑丈�強化ガラス��。\n液体�輸�やタンク�工場���幅広�使�れ����。
 item.graphite.description = 弾薬や絶�体���利用�れ����。
 item.sand.description = �金や�剤��広�使用�れ��る一般的��料��。
 item.coal.description = 一般的�有用�燃料��。
-item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
-item.titanium.description = 希少��常�軽��金属��。液体輸�やドリル�航空機���使�れ��。
-item.thorium.description = 放射性を��高密度�金属��。建造物�支�や核燃料���使�れ��。
-item.scrap.description = 昔�建造物やユニット�残骸��。様々�種類�金属�微����れ����。
-item.scrap.details = Leftover remnants of old structures and units.
+item.coal.details = 化石化���物�よ��\n利用方法�確立�れる�る���形��れ���。
+item.titanium.description = 希少��常�軽��金属��。\n液体輸�やドリル�航空機���使�れ��。
+item.thorium.description = 放射性を��高密度�金属��。\n建造物�支�や核燃料���使�れ��。
+item.scrap.description = 昔�建造物やユニット�残骸��。\n多種多様�金属�微����れ����。
+item.scrap.details = ��建造物やユニット�残骸��。
 item.silicon.description = �常�有用��導体�ソーラーパ�ルや多��複雑�機械�応用����。
-item.plastanium.description = 軽��伸縮性��る�料��。高度�航空機や分散型�弾薬���使用�れ��。
-item.phase-fabric.description = 極��軽��素���。高度�機械や自己修復技術�使用�れ��。
+item.plastanium.description = 軽��伸縮性��る�料��。\n高度�航空機や分散型�弾薬���使用�れ��。
+item.phase-fabric.description = 極��軽��素���。\n高度�機械や自己修復技術�使用�れ��。
 item.surge-alloy.description = 電気的特性を���高度��金��。
 item.spore-pod.description = 石油や爆薬�燃料��転����使用�れ��。
-item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
-item.blast-compound.description = 爆弾や爆発物�使�れる�安定�化�物��。胞���発性物質�ら���れ��。燃料���燃や���も�������勧����ん。
+item.spore-pod.details = 人工生命体���れる胞���。\n他�生物�有毒�ガスを放出���常�侵略的��。特定��件下��常�高��燃性を����。
+item.blast-compound.description = 爆弾や爆発物�使�れる�安定�化�物��。\n胞���発性物質�ら���れ��。燃料���燃や���も�������勧����ん。
 item.pyratite.description = 焼夷兵器���使�れる�常�燃�や��物質��。
+item.beryllium.description = エレキル�多��種類�弾薬や建造物�使用�れ����。
+item.tungsten.description = ドリルや装甲�弾薬�使用�れ��。高度�建造物�建造�も必���。
+item.oxide.description = 熱を通�や��性質を������。絶�体�も使用�れ��。
+item.carbide.description = 高度�建造物やユニット�弾薬�使用�れ��。
 
 liquid.water.description = 機械�冷�や廃棄物�処���幅広�使�れ��る液体��。
-liquid.slag.description = 様々�種類�鉱石�混�り������。�れ�れ�鉱石�分類�る��噴射�る武器���使用�れ��。
+liquid.slag.description = 多種多様�鉱石�混�り������。�れ�れ�鉱石�分類�る��噴射�る武器���使用�れ��。
 liquid.oil.description = 高度��料生産�使用�れる液体��。 燃料���石炭�変���り�武器���噴霧��発���る�������。
 liquid.cryofluid.description = 水��タニウム�ら作られる�活性���食性�液体��。 �常�高�熱容�を����る���冷��使用�れ��。
+liquid.arkycite.description = 発電や�料�����化学�応�利用�れ��。
+liquid.ozone.description = 原料�製造時�酸化剤や燃料���使用�れ��。 中程度�爆発性��り��。
+liquid.hydrogen.description = 資��抽出�ユニット�生産�建造物�修復�使用�れ��。 �燃性を����。
+liquid.cyanogen.description = 弾薬�高度�ユニット�構築��よ�高度�ブロック��������応�使用�れ��。�燃性��常�高���。
+liquid.nitrogen.description = 資�抽出�ガス生��ユニット生産�使用�れ��。 化学的�安定�����。
+liquid.neoplasm.description = 新形�リアクター��険�生物学的副産物。 隣接�る水を�むブロック�素早�広�り����程�ダメージを与���。 �ん�����������。
+liquid.neoplasm.details = Neoplasm（�オプラズム）。急速�分裂�る��細胞�制御�能�塊��ドロドロ���粘性を��。熱�強� 水を�む構造物��極���険。\n\n複雑��安定����標準的�分������。用途��明。スラグ��焼�を推奨�る。
 
-block.resupply-point.description = 近��ユニット�銅�弾薬を補給���。エ�ルギーを必���るユニット��互�性��り��ん。
+block.derelict = \ue815 [lightgray]放棄
 block.armored-conveyor.description = �タンコンベアー���速度�アイテムを輸��る�������久性�優れ����。\n���コンベアー以外�よる����入力を��入れ��ん。
 block.illuminator.description = 電力�必��光���。
 block.message.description = メッセージを�存��仲間間�通信�使用���。
+block.reinforced-message.description = メッセージを�存��仲間間�通信�使用���。
+block.world-message.description = マップ作�時�使用�るメッセージブロック��。破壊�る�������ん。
 block.graphite-press.description = 石炭を圧縮��黒鉛を生����。
 block.multi-press.description = 黒鉛圧縮機�アップグレード版��。水�電力を使用���より効率的�石炭を圧縮���。
 block.silicon-smelter.description = 石炭�砂�らシリコンを製造���。
 block.kiln.description = 砂�鉛を溶���メタガラスを生����。少��電力�必���。
 block.plastanium-compressor.description = オイル��タン�らプラスタニウムを製造���。
 block.phase-weaver.description = 放射性トリウム�多��砂�らフェーズファイ�ーを製造���。
-block.alloy-smelter.description = �タンや鉛�シリコン�銅�らサージ�金を製造���。
+block.surge-smelter.description = �タンや鉛�シリコン�銅�らサージ�金を製造���。
 block.cryofluid-mixer.description = 水��タン�ら冷��効率的�冷�水を製造���。
 block.blast-mixer.description = �燃性�ピラタイトを石油を使用���ら�爆発性化�物����。
 block.pyratite-mixer.description = 石炭�鉛�砂�ら燃�や��ピラタイトを製造���。
-block.melter.description = 石を熱�溶���溶岩を生����。
-block.separator.description = 石を水圧�砕��石���れる様々�鉱石を回����。
+block.melter.description = 石を熱�溶���スラグを生����。
+block.separator.description = スラグを分離���多様�鉱石を回����。
 block.spore-press.description = 胞��ッドを石油�圧縮���。
 block.pulverizer.description = 石を砕��砂����。自然�砂���場��有用��。
 block.coal-centrifuge.description = 石油を石炭�加工���。
@@ -1351,46 +2098,53 @@ block.item-source.description = アイテムを無���出���。サン
 block.item-void.description = 電力を必�����アイテムを廃棄���。サンドボックスモード��使用����。
 block.liquid-source.description = 液体を無���出���。サンドボックスモード��使用����。
 block.liquid-void.description = 液体を破棄����。サンドボックスモード��使用����。
-block.copper-wall.description = 安価�防�ブロック��。\n最��ウェーブ�コアやターレットを�護�る��有用��。
-block.copper-wall-large.description = 安価�大型防�ブロック��。\n最��ウェーブ�コアやターレットを�護�る��有用��。
+block.payload-source.description = ペイロードを無���出���。サンドボックスモード��使用����。
+block.payload-void.description = ペイロードを破棄����。サンドボックスモード��使用����。
+block.copper-wall.description = 安価�防�ブロック��。\n最��ウェーブ�コアやタレットを�護�る��有用��。
+block.copper-wall-large.description = 安価�大型防�ブロック��。\n最��ウェーブ�コアやタレットを�護�る��有用��。
 block.titanium-wall.description = �度�強力�防�ブロック��。\n中程度�攻撃�ら�護���。
 block.titanium-wall-large.description = �度�強力�大型防�ブロック��。\n中程度�攻撃�ら�護���。
-block.plastanium-wall.description = 電気アークを����電�ノード�自動接続をブロック�る特別����。
-block.plastanium-wall-large.description = 電気アークを����電�ノード�自動接続をブロック�る特別�大型����。
-block.thorium-wall.description = 強化�れ�防�ブロック��。\n敵�ら��護�より強固��。
-block.thorium-wall-large.description = 強化�れ�大型防�ブロック��。\n敵�ら��護�より強固��。
+block.plastanium-wall.description = レーザー弾や放電を����電�ノード�自動接続をブロック�る特別����。
+block.plastanium-wall-large.description = レーザー弾や放電を����電�ノード�自動接続をブロック�る特別�大型����。
+block.thorium-wall.description = より強固�強化�れ�防�ブロック��。
+block.thorium-wall-large.description = より強固�強化�れ�大型防�ブロック��。
 block.phase-wall.description = トリウム����強固������強力�弾���れ�弾�返��������。
 block.phase-wall-large.description = トリウム����強固������強力�弾���れ�弾�返��������。
-block.surge-wall.description = 最も硬�防�ブロック��。\n���攻撃�れる�敵�電撃を与���。
-block.surge-wall-large.description = 最も硬�大型防�ブロック��。\n���攻撃�れる�敵�電撃を与���。
+block.surge-wall.description = 最も硬�防�ブロック��。\n攻撃�れる����放電��敵を攻撃���。
+block.surge-wall-large.description = 最も硬�大型防�ブロック��。\n攻撃�れる����放電��敵を攻撃���。
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = ���ドアブロック��。タップ�る���開閉�る�������。\n����ドア�開���る場��弾や敵も通�����。
 block.door-large.description = 大型�ドアブロック��。タップ�る���開閉�る�������。\n����ドア�開���る場��弾や敵も通�����。
 block.mender.description = 定期的�周囲�ブロックを修復���。ウェーブ�間も修復�続���。\nオプション�シリコンを利用����ら�効率的�修復�出���。
 block.mend-projector.description = 修復機�アップグレード版��。定期的�周辺�ブロックを修復���。\nオプション�フェーズファイ�ーを利用����ら�効率的�修復�出���。
 block.overdrive-projector.description = ドリルやコンベアー���近��施設�効率を�上����。
 block.force-projector.description = 周囲�六角形�力場を作り出��内部�建造物やユニット��を守り��。
-block.shock-mine.description = �ん�敵�ダメージを与���。敵�見�る����り��ん。
-block.conveyor.description = 一般的�アイテム輸�ブロック��。アイテムを�方�移動��自動的�ターレットや機械����入���。回転��る�������。
+block.shock-mine.description = 敵��ん�時�放電���ん�敵�ダメージを与���。敵�見�る����り��ん。
+block.conveyor.description = 一般的�アイテム輸�ブロック��。アイテムを�方�移動��自動的�タレットや機械����入���。回転��る�������。
 block.titanium-conveyor.description = 改良�れ�アイテム輸�ブロック��。通常�コンベアーよりも速�アイテムを輸����。
 block.plastanium-conveyor.description = アイテムを����輸��るブロック��。\n末端�らアイテムを�入��先端3方��アイテムを�出���。
 block.junction.description = �字�交差��コンベアーを�れ�れ�方��出���。コンベアー�複雑�構造を組�立�る���便利��。
 block.bridge-conveyor.description = 高度�輸�ブロック��。地形や建物を超���3ブロック離れ�場所�アイテムを輸��る�������。
 block.phase-conveyor.description = 改良�れ�アイテム転�ブロック��。電力を使用���離れ�場所��るフェーズコンベアー�アイテムを転��る�������。
-block.sorter.description = アイテムを分別���出���。設定��アイテム�通�����。他�アイテム��入�れる����アイテムを�出���。
-block.inverted-sorter.description = アイテムを分別���出���。設定��アイテム�����出�れ��。他�アイテム��入�れる�アイテムを通�����。通常�ルーター��対�動作を���。
-block.router.description = �入��アイテムを���3方���等��出���。一��資��ら複数�分�る際���使�れ��。
-block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
-block.distributor.description = 高度�ルーター��。�入��アイテムを���7方���等�分���出���。
-block.overflow-gate.description = �出先�アイテムを�入�る空����場��左��アイテムを�出���。
+block.sorter.description = アイテムを分別���出���。設定��アイテム�����出���。他�アイテム��入�れる�����出���。
+block.inverted-sorter.description = アイテムを分別���出���。設定��アイテム�����出���。他�アイテム��入�れる�����出���。
+block.router.description = �入��アイテムを���3方���等��出���。一��資��ら複数�分�る際���使�れ��。
+block.router.details = 最悪�設置���入����生産施設�隣接��る����。�出アイテム�より詰�る�能性��る����������ん。
+block.distributor.description = 高度�ルーター��。�入��アイテムを���7方���等�分���出���。
+block.overflow-gate.description = �出先�アイテムを�入�る空����場��左��アイテムを�出���。
 block.underflow-gate.description = オー�ーフローゲート��対�機能を����。 左��出力����場�����出力���。
 block.mass-driver.description = 長�離�輸���能�上�アイテム輸�ブロック��。離れ�別�マスドライ�ー�アイテムを発射���。
 block.mechanical-pump.description = 安価��ンプ��。�出速度�������電力を使��使用����。
-block.rotary-pump.description = 高度��ンプ��。電力を使用��2�速��出�る�������。
-block.thermal-pump.description = 最高性能��ンプ��。
+block.rotary-pump.description = 高度��ンプ��。電力�必�����より多��出�る�������。
+block.impulse-pump.description = 最高性能��ンプ��。
 block.conduit.description = 一般的�液体輸�ブロック��。液体版�コンベアー��。�ンプや他�パイプ�使��������。
 block.pulse-conduit.description = 高度�液体輸�ブロック��。通常�パイプより速����ん�液体を輸��る�������。
 block.plated-conduit.description = パルスパイプ���速度�液体を輸��る�������久性�優れ����。\n���パイプ以外�よる����入力を��入れ��ん。
-block.liquid-router.description = �入��アイテムを���3方���等��出���。液体��れを防��������。一��資��ら複数�分�る際���使�れ��。
+block.liquid-router.description = �入��アイテムを���3方���等��出���。液体��れを防��������。一��資��ら複数�分�る際���使�れ��。
+block.liquid-container.description = 中��液体を�管�����������。液体ルーター��様�四方��出����。
 block.liquid-tank.description = 大��液体を�管�����������。需���安定�製造設備や���施設�冷�水�予備�����使用�れ��。
 block.liquid-junction.description = パイプを他�パイプ�交差��るよ�����。�れ�れ�入��液体を�方��出���。パイプ�複雑�構造を組�立�る�����使�れ��。
 block.bridge-conduit.description = 高度�液体輸�ブロック��。地形や建物を超���3ブロック離れ�場所�液体を輸��る�������。
@@ -1416,33 +2170,36 @@ block.laser-drill.description = 電力を使用��レーザー技術�より
 block.blast-drill.description = 上��ドリル��。大��電力�必���り��。
 block.water-extractor.description = 地��ら水を汲�上���。近��湖���場��有用��。
 block.cultivator.description = 胞�����集�りを工業用�ッド�培養���。
-block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
+block.cultivator.details = �り戻�れ�テクノロジー。大���イオマスを�能��り効率的�生産���。��ら�最��培養機�より�今セルプロ�胞��覆�れ�����
 block.oil-extractor.description = 大��電力を使用���砂�ら石油を回����。近��油田���場��有用��。
 block.core-shard.description = 基本的�コア��。一度破壊�れる����地域��接続�途絶���。破壊�れ��よ�����ょ�。
-block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
+block.core-shard.details = 最���ージョン��。コンパクト�自己複製�能�使����発射スラスターを装備�����。惑星間旅行用��設計�れ����ん。
 block.core-foundation.description = �ージョンアップ��コア��。より堅��より多��資�を格�����。
-block.core-foundation.details = The second iteration.
+block.core-foundation.details = 2番目��ージョン��。
 block.core-nucleus.description = �ら��ージョンアップ��コア��。優れ��久性�大��資�を格�����。
-block.core-nucleus.details = The third and final iteration.
+block.core-nucleus.details = 3番目�最終�ージョン��。
 block.vault.description = �種類�アイテムを大���管���。隣接�るコンテナーやボール��コア�一��ストレージユニット���扱�れ��。[lightgray]�出機[]を使���ボールト�らアイテムを�出����。
 block.container.description = �種類�アイテムを少����管���。隣接�るコンテナーやボール��コア�一��ストレージユニット���扱�れ��。 [lightgray]�出機[]を使���コンテナー�らアイテムを�出����。
 block.unloader.description = コンテナやボールト�コア�らアイテムをコンベアー�隣接�るブロック��出���。�出機をタップ���出�るアイテムを変更�る�������。
 block.launch-pad.description = 離脱�る�����アイテムを回��る�������。
-block.duo.description = ���安価�ターレット��。
-block.scatter.description = 中�模�対空型ターレット��。敵�鉛やスクラップ�塊�メタガラスを分散�るよ��発射���。。
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = ���安価�タレット��。
+block.scatter.description = 中�模�対空型タレット��。敵�鉛やスクラップ�塊�メタガラスを分散�るよ��発射���。
 block.scorch.description = 近��地上�敵を燃や���。近�離���常�効果的��。
-block.hail.description = �型�砲撃型ターレット��。
-block.wave.description = �ブル�連射攻撃を�る中型�ターレット��。
-block.lancer.description = �ャージビームを放�中型�ターレット��。
-block.arc.description = �型�電撃型ターレット��。敵�����ランダム��円状�電撃を放���。
-block.swarmer.description = �ーストミサイル�攻撃�る中型ターレット��。
-block.salvo.description = 一斉�攻撃を行�中型�ターレット��。
-block.fuse.description = 短�離攻撃�得��大型�ターレット��。
-block.ripple.description = �時�複数ショットを発射�る大型ターレット��。
-block.cyclone.description = 大型�連射型ターレット��。
-block.spectre.description = 一度�2発�強力�弾を放�大型�ターレット��。
-block.meltdown.description = 強力�長�離攻撃��能�大型�ターレット��。
-block.foreshadow.description = 一��ターゲットを狙�高�力�長射程�タレット��。
+block.hail.description = �型�砲撃型タレット��。
+block.wave.description = �ブル�連射攻撃を�る中型�タレット��。
+block.lancer.description = �ャージビームを放�中型�タレット��。
+block.arc.description = �型�電撃型タレット��。敵�����ランダム��円状�電撃を放���。
+block.swarmer.description = �ーストミサイル�攻撃�る中型タレット��。
+block.salvo.description = 一斉�攻撃を行�中型�タレット��。
+block.fuse.description = 短�離攻撃�得��大型�タレット��。
+block.ripple.description = �時�複数ショットを発射�る大型タレット��。
+block.cyclone.description = 大型�連射型タレット��。
+block.spectre.description = 一度�2発�強力�弾を放�大型�タレット��。
+block.meltdown.description = 強力�長�離攻撃��能�大型�タレット��。
+block.foreshadow.description = 一��ターゲットを狙�高�力�長射程�タレット��。最大体力�高�敵を優先���。
 block.repair-point.description = 近��負傷��ユニットを修復���。
 block.segment.description = 射程内�入����弾丸を破壊���。レーザー弾�破壊����ん。
 block.parallax.description = 航空ユニットを引�込むビームを発射�����程�ターゲット�ダメージを与���。
@@ -1452,7 +2209,6 @@ block.disassembler.description = スラグを低効率�貴��鉱物�分
 block.overdrive-dome.description = 近��建造物�速度を上���。電気�他��フェーズファイ�ー�シリコン�必���。
 block.payload-conveyor.description = 工場�生産�れ�ユニット���大��物を輸����。
 block.payload-router.description = �入��物を3方���等��出���。
-block.command-center.description = �����コマンド�ユニット�動作を制御���。
 block.ground-factory.description = 陸�ユニットを生産���。生産�れ�ユニット�直接使用�る������アップグレード����移動��る��も����。
 block.air-factory.description = 空�ユニットを生産���。生産�れ�ユニット�直接使用�る������アップグレード����移動��る��も����。
 block.naval-factory.description = 海�ユニットを生産���。生産�れ�ユニット�直接使用�る������アップグレード����移動��る��も����。
@@ -1469,37 +2225,404 @@ block.memory-bank.description = より多��情報を格����。
 block.logic-display.description = プロセッサ�ら�任��グラフィックを表示���。
 block.large-logic-display.description = プロセッサ�ら�任��グラフィックを表示���。
 block.interplanetary-accelerator.description = 巨大�電�レールガンタワー��。別惑星��展開����コアを�力�脱出�能速度��加速���。
+block.repair-turret.description = 範囲内��傷��ブロックを近�順�継続的�修復���。オプション�冷�液を活用����。
+block.core-bastion.description = 基本的�堅�コア��。一度破壊�れる��セクターを失���。破壊�れ��よ�����ょ�。
+block.core-citadel.description = �ージョンアップ��コア��。 より優れ��久を������。 �スティオンコアよりも多��資�を格����。
+block.core-acropolis.description = �ら��ージョンアップ��コア��。 �常�優れ��久を������。 シタデルコアよりも多��資�を格����。
+block.breach.description = ベリリウムやタングステン�貫通弾を発射�るタレット��。
+block.diffuse.description = 広�扇形�弾丸を発射���。 敵�ノック�ックを与���。
+block.sublimate.description = 敵�炎を噴射���。アーマーを貫通���。
+block.titan.description = 水素を消費��地上目標����広範囲�爆発性�砲弾を発射���。
+block.afflict.description = 熱を消費�大��帯電��オーブを発射��四方八方�分裂���。
+block.disperse.description = 空中�目標�対空砲�を発射���。
+block.lustre.description = �一ターゲット�����低速�レーザーを照射���。
+block.scathe.description = ��離れ�地上目標�����強力�ミサイルを発射���。
+block.smite.description = 閃光を放�貫通弾を発射���。
+block.malign.description = 大��熱を使���敵�追尾型�レーザーを発射���。
+block.silicon-arc-furnace.description = 砂�黒鉛�らシリコンを製造���。
+block.oxidation-chamber.description = ベリリウム�オゾン�ら酸化物�副産物���熱を製造���。
+block.electric-heater.description = 大��電力を消費���������ブロックを加熱���。
+block.slag-heater.description = スラグを用���������ブロックを加熱���。
+block.phase-heater.description = フェーズファイ�ーを用���������ブロックを加熱���。
+block.heat-redirector.description = 蓄��れ�熱を他�ブロック�����。
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = 蓄��れ�熱を3��出力方��分散����。
+block.electrolyzer.description = 水を電気分解���水素�オゾン�変����。
+block.atmospheric-concentrator.description = 熱を利用���大気中�窒素を濃縮���。
+block.surge-crucible.description = 熱を利用���スラグ�シリコン�らサージ�金を製造���。
+block.phase-synthesizer.description = 熱を利用��トリウム�砂�オゾン�らフェイズファイ�ーを製造���。
+block.carbide-crucible.description = 熱を利用���黒鉛�タングステンを�����炭化物を製造���。
+block.cyanogen-synthesizer.description = 熱を利用���アーキサイト�黒鉛�らシアンを製造���。
+block.slag-incinerator.description = スラグを用���ガス以外�アイテムや液体を焼����。
+block.vent-condenser.description = 電力を消費���ジェットホール�ガスを水��縮���。
+block.plasma-bore.description = 鉱石�������置��鉱石を掘り���。少��電力�必���。
+block.large-plasma-bore.description = 大��プラズマ掘り。 タングステン�トリウム�採掘��能。 水素�電力�必���
+block.cliff-crusher.description = 電力を消費����を粉砕��砂を採掘���。 効率���種類�よ��異�り��。
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = 鉱石�上�置���一定�間隔�アイテムを採掘���。 電力�水�必���。
+block.eruption-drill.description = 改良�れ�インパクトドリル��。 トリウム�採掘��能。 電力�水素�必���。
+block.reinforced-conduit.description = 液体���気体を輸����。 ���ら��入を��入れ��ん。
+block.reinforced-liquid-router.description = 液体を��������等�分����。
+block.reinforced-liquid-tank.description = 大��液体を蓄�る�������。
+block.reinforced-liquid-container.description = 中��液体を蓄�る�������。
+block.reinforced-bridge-conduit.description = 構造物や地形�上�液体を輸���る�������。
+block.reinforced-pump.description = 水素を消費��液体を汲�上��排出���。
+block.beryllium-wall.description = ベリリウム�������。\n敵�攻撃�ら構造物を�護���。
+block.beryllium-wall-large.description = ベリリウム����大�����。\n敵�攻撃�ら構造物を�護���。
+block.tungsten-wall.description = タングステン�������。\n敵�攻撃�ら構造物を�護���。
+block.tungsten-wall-large.description = タングステン����大�����。\n敵�攻撃�ら構造物を�護���。
+block.carbide-wall.description = 炭化物�������。\n敵�攻撃�ら構造物を�護���。
+block.carbide-wall-large.description = 炭化物����大�����。\n敵�攻撃�ら構造物を�護���。
+block.reinforced-surge-wall.description = サージ�金�タングステン�������。\n敵�攻撃�ら構造物を�護��攻撃�れる�����電撃を発生����。
+block.reinforced-surge-wall-large.description = サージ�金�タングステン����大�����。\n敵�攻撃�ら構造物を�護��攻撃�れる����電撃を発生����。
+block.shielded-wall.description = 敵�攻撃�ら構造物を�護���。電力を供給�る����ん��弾丸を���るシールドを展開���。��中�電力を�導���。
+block.blast-door.description = 味方�地上ユニット�射程内�入る�開����。 手動�開閉����ん。
+block.duct.description = アイテムを�方�輸����。 �一�アイテム��を格�����。
+block.armored-duct.description = アイテムを�方�移動���。���ら�ダクト以外�入力���付���ん。
+block.duct-router.description = アイテムを 3 方���等�分����。 ���ら�アイテム����付���。ソーター����機能を兼�備�����。
+block.overflow-duct.description = �方��出����場�������アイテムを出力���。
+block.duct-bridge.description = 高度�輸�ブロック��。地形や建物を超���3ブロック離れ�場所�アイテムを輸��る�������。
+block.duct-unloader.description = コンテナやボールト�らアイテムをコンベアー�隣接�るブロック��出���。�出機をタップ���出�るアイテムを変更�る�������。コア�ら��出�����ん。
+block.underflow-duct.description = オー�ーフローゲート��対�機能を����。 左��出力����場�����出力���。
+block.reinforced-liquid-junction.description = 交差�る 2 ��パイプ間�ジャンクション���機能���。
+block.surge-conveyor.description = アイテムを����移動���。 電力を使用�る�加速����。 電力を����。
+block.surge-router.description = サージコンベアー�ら3方���等�物を振り分���。 �電�使��電力を使用�る�加速����。
+block.unit-cargo-loader.description = 輸�ドローンを作����入�イント��入��アイテムを�択���出�イント���輸�ドローン�アイテムを自動的�輸����。
+block.unit-cargo-unload-point.description = 輸�ドローン��出�イント���機能���。 �択��アイテムを��入れ��。
+block.beam-node.description = 他�ブロック�直交�るよ��電力を�����。少��電力を蓄���。
+block.beam-tower.description = 他�ブロック�直交�るよ��電力を�����。大��電力を蓄��長�離�����能��。
+block.turbine-condenser.description = ジェットホール�置��発電���。少��水を生����。
+block.chemical-combustion-chamber.description = アーキサイト�オゾン�発電���。
+block.pyrolysis-generator.description = アーキサイト�スラグ�ら大��電力を生����。 副産物���水を生����。
+block.flux-reactor.description = 加熱�る�大��電力を生����。安定剤�シアン�必���発電��シアン�消費��入力�れる熱��比例���。\nシアン�供給��足�る�爆発���。
+block.neoplasia-reactor.description = アーキサイト�水�フェーズファイ�ー�大��電力を生����。副産物���熱��オプラズムを生����。\n�オプラズムをパイプ�リアクター�ら�り除�����爆発四散���。
+block.build-tower.description = 範囲内�破壊�れ�構造物を自動的��建築��建設中�他�ユニットを支����。
+block.regen-projector.description = 周囲�四角�範囲内�建造物をゆ��り�修復���。水素を必�����。
+block.reinforced-container.description = 少��アイテムを�管���。 ダクト�出機�中身を�り出��������。コア�容��増加���ん。
+block.reinforced-vault.description = 大��アイテムを�管���。 ダクト�出機�中身を�り出��������。コア�容��増加���ん。
+block.tank-fabricator.description = ステルを製作���。出力�れ�ユニット�����使用�る��も�������加工工場�移動��アップグレード�る��も����。
+block.ship-fabricator.description = アルードを製作���。出力�れ�ユニット�����使用�る��も�������加工工場�移動��アップグレード�る��も����。
+block.mech-fabricator.description = メルイを製作���。出力�れ�ユニット�����使用�る��も�������加工工場�移動��アップグレード�る��も����。
+block.tank-assembler.description = �入��ブロックやユニット�ら大型戦車を組�立���。 基本組立モジュールを追加�る����出力レベルを上�る�������。
+block.ship-assembler.description = �入�れ�ブロック�ユニット�ら大型戦艦を組�立���。 モジュールを追加�る����出力レベルを上�る�������。
+block.mech-assembler.description = �入�れ�ブロック�ユニット�ら大型メカを組�立���。 モジュールを追加�る����出力レベルを上�る�������。
+block.tank-refabricator.description = �入��戦車ユニットを第2レベル�アップグレード���。
+block.ship-refabricator.description = �入�れ�艦船ユニットを第2レベル�アップグレード���。
+block.mech-refabricator.description = �入��メカユニットを第2レベル�アップグレード���。
+block.prime-refabricator.description = �入��ユニットを第3レベル�アップグレード���。
+block.basic-assembler-module.description = 組立工場�建設スペース�隣接��れ��ユニットレベル�上�り��。電力�必���。 ペイロード入力���使用����。
+block.small-deconstructor.description = 入力�れ�建造物やユニットを分解���。建造費用�100%�返��れ��。
+block.reinforced-payload-conveyor.description = 工場�生産�れ�ユニット���大��物を輸����。
+block.reinforced-payload-router.description = �入��物を3方���等��出���。フィルタ�設定�れ��る場��ソータ���機能���。
+block.payload-mass-driver.description = ペイロード版マスドライ�ー。入力�れ�物を�連動�るペイロードマスドライ�ー�射出���。
+block.large-payload-mass-driver.description = ペイロード版マスドライ�ー。入力�れ�物を�連動�る大型ペイロードマスドライ�ー�射出���。
+block.unit-repair-tower.description = 周辺�����ユニットを修����。 オゾン�必���。
+block.radar.description = 大���径�地形�敵ユニットを�々�発見���。 電��必���。
+block.shockwave-tower.description = �径内�敵�発射体�ダメージを与��破壊���。 シアン�必���。
+block.canvas.description = 定義済��パレットを使用���純�画�を表示���。 編集�能。
 
-unit.dagger.description = Fires standard bullets at all nearby enemies.
-unit.mace.description = Fires streams of flame at all nearby enemies.
-unit.fortress.description = Fires long-range artillery at ground targets.
-unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
-unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
-unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
-unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
-unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
-unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
-unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
-unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
-unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
-unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
-unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
-unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
-unit.flare.description = Fires standard bullets at nearby ground targets.
-unit.horizon.description = Drops clusters of bombs on ground targets.
-unit.zenith.description = Fires salvos of missiles at all nearby enemies.
-unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
-unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
-unit.mono.description = Automatically mines copper and lead, depositing it into the core.
-unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
-unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
-unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
-unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
-unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
-unit.minke.description = Fires shells and standard bullets at nearby ground targets.
-unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
-unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
-unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
-unit.alpha.description = Defends the Shard core from enemies. Builds structures.
-unit.beta.description = Defends the Foundation core from enemies. Builds structures.
-unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.dagger.description = 近��敵�標準的�弾丸を発射���。
+unit.mace.description = 近��敵��炎放射を発射���。
+unit.fortress.description = 地上目標�長�離砲を発射���。
+unit.scepter.description = 近��敵��ャージ弾を発射���。
+unit.reign.description = 近��敵�大�径�貫通弾を発射���。
+unit.nova.description = 敵�ダメージを与��味方�建造物を修復�る光線を発射���。\n飛行�能。
+unit.pulsar.description = 敵�ダメージを与��味方�建造物を修復�る電撃攻撃を行���。\n飛行�能。
+unit.quasar.description = 敵�ダメージを与��味方�建造物を修復�るレーザー弾を発射���。\n飛行�能。シールド形�。
+unit.vela.description = 敵�ダメージを与����を引�起���味方�建造物を修復�るレーザー焼夷弾を発射���。\n飛行�能。
+unit.corvus.description = 敵�ダメージを与��味方�建造物を修復�る大�力�レーザー弾を発射���。\n��ん��地形を無視����。
+unit.crawler.description = 敵�����走り自爆��大爆発を起��。
+unit.atrax.description = 地上目標を消耗��るスラグ弾を発射���。\n��ん��地形を無視����。
+unit.spiroct.description = 敵���レーザービームを発射��与��ダメージを自ら�体力��������。\n��ん��地形を無視����。
+unit.arkyid.description = 敵�大�径���レーザービームを発射��与��ダメージを自ら�体力��������。\n��ん��地形を無視����。
+unit.toxopid.description = 敵�大�径�電撃クラスターシェル�貫通レーザーを発射���。\n��ん��地形を無視����。
+unit.flare.description = 近��地上目標�標準的�弾丸を発射���。
+unit.horizon.description = 地上目標�クラスター爆弾を投下���。
+unit.zenith.description = 近��敵�ミサイルを一斉発射���。
+unit.antumbra.description = 近��敵�弾幕�よ��弾丸を連射���。
+unit.eclipse.description = 近��敵�2門�貫通レーザー�高射砲�弾幕を発射���。
+unit.mono.description = 銅�鉛を自動的�採掘��コア�移����。
+unit.poly.description = 破壊�れ�建造物を自動的��構築���ら�建設�支�を行���。
+unit.mega.description = �傷��建造物を自動的�修復���。\n�型�ブロック�地上ユニットを������。
+unit.quad.description = 地上目標�大型爆弾を投下��味方�建造物�修復��敵��ダメージを与���。\n中型�地上ユニットを������。
+unit.oct.description = シールド形��修復を行��付近�味方を守り��。\n��ん��地上ユニットを������。
+unit.risso.description = 近��敵�ミサイル�弾丸�弾幕を発射���。
+unit.minke.description = 近��地上目標�砲弾�標準的�弾丸を発射���。
+unit.bryde.description = 敵�長�離砲弾�ミサイルを発射���。
+unit.sei.description = 敵�ミサイル�徹甲弾�弾幕を発射���。
+unit.omura.description = 敵�長�離��貫通性能を��レールガンボルトを発射���。\nフレアユニットを生産���。
+unit.alpha.description = シャードコアを敵�ら守り��。\n建造物を建築���。
+unit.beta.description = ファンデーションコアを敵�ら守り��。\n建造物を建築���。
+unit.gamma.description = ニュークリアスコアを敵�ら守り��。\n建造物を建築���。
+unit.retusa.description = 近��敵�追尾魚雷を発射���。\n味方ユニットを修復���。
+unit.oxynoe.description = 建造物修復�炎放射を発射���。敵��ダメージを与���。\n地点防空タレット�よ��敵�弾丸を撃������。
+unit.cyerce.description = 敵�追尾クラスターミサイルを発射���。\n味方ユニットを修復���。
+unit.aegires.description = エ�ルギーフィールド内�全��敵ユニット�建造物��電撃を放��全��味方ユニット��修復効果を与���。
+unit.navanax.description = 爆発性�EMP弾を発射��敵�電力系統���大��傷を与��味方�建造物�修復���。\n4門�自律型レーザータレット�近��敵を溶����。
+unit.stell.description = 敵�ターゲット�標準�弾丸を発射���。
+unit.locus.description = 敵�ターゲット�弾丸を交互�発射���。
+unit.precept.description = 敵�ターゲット����貫通�るクラスター弾を発射���。
+unit.vanquish.description = 敵�ターゲット�大��分裂�る貫通弾を発射���。
+unit.conquer.description = 敵�ターゲット�����貫通�る大��波状�弾丸を発射���。
+unit.merui.description = 敵�地上目標�長�離砲を発射���。\n��ん��地形を無視����。
+unit.cleroi.description = 敵�ターゲット�二��砲弾を発射���。防衛タレット�敵�弾丸を狙���。\n��ん��地形を無視����。
+unit.anthicus.description = 長�離追尾ミサイルを敵�発射���。\n��ん��地形を無視����。
+unit.tecta.description = 敵�追尾型電撃ミサイルを発射���。シールド�身を守り��。\n��ん��地形を無視����。
+unit.collaris.description = 敵����長�離�破片砲を発射���。\n��ん��地形を無視����。
+unit.elude.description = 敵�一対�追尾弾を発射���。\n水�浮��������。
+unit.avert.description = 敵�ターゲット����れ�一対�弾丸を発射���。
+unit.obviate.description = 敵�ターゲット����れ�一対�帯電オーブを発射���。
+unit.quell.description = 長�離追尾ミサイルを敵�発射���。敵�修復ブロックを抑制���。
+unit.disrupt.description = 敵�ターゲット�長�離ホーミング抑制ミサイルを発射���。 敵�構造修復ブロックを抑制���。
+unit.evoke.description = �スティオンコアを敵�ら守り��。\nビーム�建造物を修復���。
+unit.incite.description = シタデルコアを敵�ら守り��。\nビーム�建造物を修復���。
+unit.emanate.description = アクロ�リスコアを敵�ら守り��。\nビーム�建造物を修復���。
+lst.read = リンク�れ�メモリセル�ら数値を読��り��。
+lst.write = リンク�れ�メモリセル�数値を書�込���。
+lst.print = メッセージブロック�テキストを追加���。[accent]Print Flush[] を使用�る��何も表示���ん。
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = ロジックディスプレイ��作を追加���。[accent]Draw Flush[] を使用�る��何も表示���ん。
+lst.drawflush = キュー�入れられ� [accent]Draw[] �作をディスプレイ�フラッシュ���。
+lst.printflush = キュー�入れられ� [accent]Print[] �作をメッセージ ブロック�フラッシュ���。
+lst.getlink = プロセッサー�リンクを番���得���。番��0�ら始�り��。
+lst.control = 建物を制御���。
+lst.radar = 射程内�ユニットを探���。
+lst.sensor = 建物やユニット�データを�得���。
+lst.set = 変数を定義��数値を代入���。
+lst.operation = 一��ら二��変数を使��演算を���。
+lst.end = 命令スタック�先頭�ジャンプ���。
+lst.wait = 一定�秒数待���。
+lst.stop = ��プロセッサ�実行を�止���。
+lst.lookup = アイテム/液体/ユニット/ブロック �タイプをID�検索����。\n�タイプ��カウント数��以下�方法�アクセス�能��。\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = �件付��別�文�ジャンプ���。
+lst.unitbind = 指定��型�次�ユニットを確��� [accent]@unit[] �格����。
+lst.unitcontrol = �在確��れ��るユニットを制御���。
+lst.unitradar = �在確����るユニット�周囲�ユニットを�置���。
+lst.unitlocate = マップ上�任��座標��る�特定�タイプ�場所や建物を探���。\nユニットを確��る必���り��。
+lst.getblock = 任��座標�タイル�情報を�得���。
+lst.setblock = 任��座標�タイル�情報を変更���。
+lst.spawnunit = 任��座標�ユニットをス�ーン����。
+lst.applystatus = ユニット�らステータス効果を�用���削除�る。
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = 任��座標�発生�るウェーブをシミュレーション���。\nウェーブを進���ん。
+lst.explosion = �る場所�爆発を起����。
+lst.setrate = プロセッサー�実行速度を1命令/tick�設定���。
+lst.fetch = ユニット�コア�プレイヤー�建物を番��検索���。\n番��0�ら始�り�返�れ�回数�終�り��。
+lst.packcolor = [0, 1] RGBA �分を1��数値�������画やルール設定�利用���。
+lst.setrule = ゲームルールを設定���。
+lst.flushmessage = テキスト�ッファ�ら画��メッセージを表示���。\n��メッセージ�終了�る��待���。
+lst.cutscene = プレイヤー�カメラを�作���。
+lst.setflag = 全プロセッサー�ら読��れるグロー�ルフラグを設定���。
+lst.getflag = グロー�ルフラグ�設定�れ��る����を確����。
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]����ユニット構築ロジック�使用����ん。
+lenum.type = ユニットや建物�種類を�得���。\n例：任��ルーター�対��� [accent]@router[] を返���。\n文字列���り��ん。
+lenum.shoot = 指定��座標�����撃���。
+lenum.shootp = 任��ユニットや建物を撃���。
+lenum.config = 建物�設定を�得���。\n例:ソーター�設定�れ��るアイテム��
+lenum.enabled = ブロック�有効����を�得���。
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = イルミ�ーター�色を�得���。
+laccess.controller = ユニットを制御���るも�を�得���。\nプロセッサ制御�場��制御���るプロセッサを返���。\n���ユニット�制御�れ��る場��制御���るユニットを返���。\n�れ以外�場���ユニット自身を返���。
+laccess.dead = ユニットや建物�機能���る��������も�有効�������。
+laccess.controlled = ユニットや建物���よ��制御�れ��る��を�得���。\nプロセッサ制御�場�� [accent]@ctrlProcessor[] を返���。\nプレイヤー制御�場�� [accent]@ctrlPlayer[] を返���。\n隊列を組ん��る場�� [accent]@ctrlFormation[] を返���。\n�れ以外� 0 を返���。
+laccess.progress = アクション�進行状�を0〜1��得���。\n生産�リロード����建設�進�状�を返���。
+laccess.speed = ユニット�最高速度を返���。（��：タイル/秒）
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = �明
+lcategory.unknown.description = 未分類�指示��。
+lcategory.io = 入出力
+lcategory.io.description = メモリブロックやプロセッサ�隠�変数�内容を変更���。
+lcategory.block = ブロック制御
+lcategory.block.description = ブロック�連動���。
+lcategory.operation = 演算
+lcategory.operation.description = 論�演算を���。
+lcategory.control = �れ制御
+lcategory.control.description = 実行順�を管����。
+lcategory.unit = ユニット制御
+lcategory.unit.description = ユニット�命令を与���。
+lcategory.world = 世界
+lcategory.world.description = 世界�振る舞�をコントロール���。
+graphicstype.clear = ディスプレイを色�塗り�����。
+graphicstype.color = 次��画�る色を設定���。
+graphicstype.col = coolor�������色����られ����。\n���られ�色� [accent]%[] �接頭辞を��16進コード�記述�れ��。\n例: 赤� [accent]%ff0000[] �表�れ��。
+graphicstype.stroke = 線幅を設定���。
+graphicstype.line = 線を����。
+graphicstype.rect = 塗り���れ�矩形を����。
+graphicstype.linerect = 輪郭���矩形を����。
+graphicstype.poly = 塗り���れ�多角形を����。
+graphicstype.linepoly = 輪郭���多角形を����。
+graphicstype.triangle = 塗り���れ�三角形を����。
+graphicstype.image = 何ら��コンテンツ�イメージを�画���。\n例: [accent]@router[] や [accent]@dagger[]��。
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = 常�trueを返���。
+lenum.idiv = 整数�割り算を���。
+lenum.div = 割り算を���。\nゼロ除算� [accent]null[] を返���。
+lenum.mod = 割����りを返���。
+lenum.equal = 等������を比較���。型を強制���。\n数値�比較�れる�NULLオブジェクト�1��り������場��0��る。
+lenum.notequal = 等��������を比較���。型を強制���。
+lenum.strictequal = より厳密�比較を���。型�強制����ん。\n [accent]null[] ��ェック�使用�る�������。
+lenum.shl = ビットを左�シフト���。
+lenum.shr = ビットを��シフト���。
+lenum.or = ビット����OR演算を���。
+lenum.land = 論�的�AND演算を���。
+lenum.and = ビット����AND演算を���。
+lenum.not = ビット����転を���。
+lenum.xor = ビット����XOR演算を���。
+lenum.min = 二��値を比較�������を返���。
+lenum.max = 二��値を比較��大����を返���。
+lenum.angle = ベクトル�角度を度�計算���。
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = ベクトル�長�を計算���。
+lenum.sin = sinを度�計算���。
+lenum.cos = cosを度�計算���。
+lenum.tan = tanを度�計算���。
+lenum.asin = asinを度�計算���。
+lenum.acos = acosを度�計算���。
+lenum.atan = atanを度�計算���。
+lenum.rand = 0�ら任��値���ランダム�値を返���。
+lenum.log = 自然対数 (ln)を計算���。
+lenum.log10 = 10 を底���対数を計算���。
+lenum.noise = 2次元シンプレックスノイズを計算���。
+lenum.abs = 絶対値を計算���。
+lenum.sqrt = 平方根を計算���。
+lenum.any = 任��ユニット
+lenum.ally = 味方�ユニット
+lenum.attacker = 武器を���ユニット
+lenum.enemy = 敵�ユニット
+lenum.boss = ガーディアンユニット
+lenum.flying = 飛行ユニット
+lenum.ground = 地上ユニット
+lenum.player = プレイヤー��作�るユニット
+lenum.ore = 鉱脈
+lenum.damaged = �傷��建物
+lenum.spawn = 敵�ス�ーン地点\nコア�も場所�も����。
+lenum.building = 特定�グループ�建物
+lenum.core = 任��コア
+lenum.storage = ストレージ\n例: ボールト
+lenum.generator = 発電所
+lenum.factory = 加工施設
+lenum.repair = 修復�イント
+lenum.battery = 任���ッテリー
+lenum.resupply = 補給�イント\n[accent]ユニット弾薬[] �有効�場���。
+lenum.reactor = インパクトリアクター�トリウムリアクター
+lenum.turret = 任��タレット
+sensor.in = 感知�る建物やユニット
+radar.from = 検知�るも�\nセンサー�範囲��建物�範囲�よ��制��れ��。
+radar.target = ユニットを感知�る���フィルター
+radar.and = 追加�フィルター
+radar.order = ソート順。 0 �ら逆順。
+radar.sort = �果を並�替�る���指標
+radar.output = 検知��ユニットを出力�る変数
+unitradar.target = ユニットを感知�る���フィルター
+unitradar.and = 追加�フィルター
+unitradar.order = ソート順。 0 �ら逆順。
+unitradar.sort = �果を並�替�る���指標
+unitradar.output = 検知��ユニットを出力�る変数
+control.of = 制御�る建物
+control.unit = 標的��るユニットや建物
+control.shoot = 撃�����
+unitlocate.enemy = 敵�建物��置を特定�る����
+unitlocate.found = 対象物を見�������
+unitlocate.building = 見���建物を出力�る変数
+unitlocate.outx = X座標を出力�る変数
+unitlocate.outy = Y座標を出力�る変数
+unitlocate.group = 探�建物�グループ
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = 移動����ん��建築・採掘�続���。
+lenum.stop = 移動・採掘・建造を中止���。
+lenum.unbind = ロジック制御を完全�無効����。\n標準的�AI制御�移行���。
+lenum.move = 正確��る座標�移動���。
+lenum.approach = �る座標�近����。
+lenum.pathfind = 敵�ス�ーン����を探���。
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = 指定��座標�����撃���。
+lenum.targetp = 任��ユニットや建物を撃���。
+lenum.itemdrop = アイテムをドロップ���。
+lenum.itemtake = 建物�らアイテムを�得���。
+lenum.paydrop = �在�ペイロードをドロップ���。
+lenum.paytake = �在地�ペイロードを�得���。
+lenum.payenter = ユニット�乗���るペイロードブロック�進入��地���。
+lenum.flag = ユニット�フラグ��。
+lenum.mine = 任���置を採掘���。
+lenum.build = 建築を���。
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = ユニット�座標�近���る����を確����。
+lenum.boost = ブースト�開始��止を���。
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 6bba05f072..f0238a9414 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -4,27 +4,27 @@ contributors = 번역가와 기여�
 discord = Mindustry Discord 서버� 가입하세요!
 link.discord.description = Mindustry Discord 공� 대화방
 link.reddit.description = Mindustry 서브레딧
-link.github.description = Mindustry 개발 홈페�지
+link.github.description = Mindustry 소스코드
 link.changelog.description = 업��트 내용 목�
 link.dev-builds.description = 불안정한 개발 버전
-link.trello.description = 출시 예정� 기능� 한다고 게시한 공� Trello 보드
+link.trello.description = 출시 예정 기능 계�� 게시한 공� Trello 보드
 link.itch.io.description = PC 다운로드가 있는 itch.io 페�지
 link.google-play.description = Google Play 스토어 목�
 link.f-droid.description = F-Droid 카탈로그 목�
 link.wiki.description = 공� Mindustry 위키
 link.suggestions.description = 새 기능 제안하기
 link.bug.description = 버그 제보하기
+linkopen = � 서버�서 당신�게 ��를 보냈습니다. 정�로 열어보시겠습니까?\n\n[sky]{0}
 linkfail = ��를 열지 못했습니다!\nURL� �립보드� 복사�었습니다.
-screenshot = 스�린 캡처가 {0} � 저장�었습니다.
-screenshot.invalid = 맵� 너무 커서 스�린 캡처� 사용� 메모리가 부족합니다.
+screenshot = 스�린샷� {0} � 저장�었습니다.
+screenshot.invalid = 맵� 너무 커서 스�린샷� 사용� 메모리가 부족합니다.
 gameover = 게임 오버
 gameover.disconnect = 연결 �기
 gameover.pvp = [accent]{0}[] 팀� 승리했습니다!
 gameover.waiting = [accent]다� 맵 기다리는 중...
 highscore = [accent]새로운 최고 �수!
-copied = 복사 
+copied = 복사�
 indev.notready = � 부분� 아� 준비�지 않았습니다.
-indev.campaign = [accent]당신� 캠페�� �� �달했습니다![]\n\n�것으로 캠페�� 있는 대부분� 콘�츠는 �났으며, 행성 간 여행� 향후 업��트� 추가� 예정입니다.
 
 load.sound = 소리
 load.map = 맵
@@ -36,44 +36,61 @@ load.scripts = 스�립트
 
 be.update = 새로운 Bleeding Edge 버전 사용 가능:
 be.update.confirm = 지금 내려받고 다시 시작하시겠습니까?
-be.updating = 업��트 중….
-be.ignore = 무시
+be.updating = 업��트 중…
+be.ignore = 무시하기
 be.noupdates = 업��트가 없습니다.
-be.check = 업��트 확�
+be.check = 업��트 확�하기
 
-mod.featured.dialog.title = 모드 �색 (WIP)
+mods.browser = 모드 �색기
 mods.browser.selected = 선�� 모드
-mods.browser.add = 모드 설치
-mods.github.open = 깃허브 사�트 열기
+mods.browser.add = 설치
+mods.browser.reinstall = 재설치
+mods.browser.view-releases = 릴리즈 보기
+mods.browser.noreleases = [scarlet]�색� 릴리즈 없�\n[accent]� 모드� 어떠한 릴리즈� 찾지 못했습니다. � 모드� 저장소�서 공개� 릴리즈가 있는지 확�하세요.
+mods.browser.latest = <최신>
+mods.browser.releases = 릴리즈
+mods.github.open = 저장소 보기
+mods.github.open-release = 릴리즈 페�지
+mods.browser.sortdate = 최근 업��트
+mods.browser.sortstars = 추천(스타) 수
 
 schematic = 설계�
 schematic.add = 설계� 저장하기
-schematics = 설계�들
+schematics = 설계�
+schematic.search = 설계� 검색하기
 schematic.replace = 해당 �름� 설계�가 �미 존재합니다. �체하시겠습니까?
 schematic.exists = 해당 �름� 설계�가 �미 존재합니다.
 schematic.import = 설계� 가져오기
 schematic.exportfile = 파� 내보내기
 schematic.importfile = 파� 가져오기
-schematic.browseworkshop = 창작마당 검색
+schematic.browseworkshop = 창작마당� 검색
 schematic.copy = �립 보드� 복사
 schematic.copy.import = �립 보드�서 가져오기
 schematic.shareworkshop = 창작마당� 공유
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: 설계� 뒤집기
-schematic.saved = 설계� 저장�.
+schematic.saved = 설계� 저장�
 schematic.delete.confirm = � 설계�는 완전히 삭제� 것입니다.
-schematic.rename = 설계� �름 바꾸기
+schematic.edit = 설계� 수정
 schematic.info = {0}x{1}, {2} 블�
 schematic.disabled = [scarlet]설계� 비활성화�[]\n� [accent]맵[] �는 [accent]서버[] �서는 설계�를 사용할 수 없습니다.
+schematic.tags = 태그:
+schematic.edittags = 태그 수정하기
+schematic.addtag = 태그 추가하기
+schematic.texttag = �스트 태그
+schematic.icontag = 아�콘 태그
+schematic.renametag = 태그 �름바꾸기
+schematic.tagged = {0} 태그�
+schematic.tagdelconfirm = � 태그를 완전히 삭제하시겠습니까?
+schematic.tagexists = � 태그는 �미 존재합니다.
 
-stats = 전투 결과
-stat.wave = 패배한 단계:[accent] {0}
-stat.enemiesDestroyed = 파괴� �:[accent] {0}
-stat.built = 지어진 건물: [accent]{0}
-stat.destroyed = 파괴� 건물: [accent]{0}
-stat.deconstructed = 해체� 건물: [accent]{0}
-stat.delivered = 얻� ��:
-stat.playtime = 플레� 시간: [accent] {0}
-stat.rank = 최종 순위: [accent]{0}
+stats = 기�
+stats.wave = 진행 단계
+stats.unitsCreated = �성한 유닛
+stats.enemiesDestroyed = 파괴한 �
+stats.built = 건설한 건물
+stats.destroyed = 파괴한 건물
+stats.deconstructed = 철거한 건물
+stats.playtime = 진행 시간
 
 globalitems = [accent]전체 ��
 map.delete = 정�로 "[accent]{0}[]" 맵� 삭제하시겠습니까?
@@ -81,15 +98,17 @@ level.highscore = 최고 �수: [accent]{0}
 level.select = 맵 선�
 level.mode = 게임 모드:
 coreattack = < 코어가 공격� 받고 있습니다! >
-nearpoint = [[ [scarlet]즉시 � 소환구역�서 떠나십시오[] ]\n단계가 시작하는 순간 �근 건물들과 유닛들� 전멸�니다!
+nearpoint = [[ [scarlet]즉시 � 소환구역�서 떠나세요[] ]\n단계가 시작하는 순간 구역 내� 모든 건물과 유닛� 파괴�니다!
 database = 코어 ��터베�스
+database.button = ��터베�스
 savegame = 게임 저장
 loadgame = 게임 불러오기
-joingame = 게임 참여
+joingame = 서버 참여
 customgame = 사용� 지정 게임
 newgame = 새 게임
 none = < 없� >
 none.found = [lightgray]< 찾� 수 없� >
+none.inmap = [lightgray]< 맵� 없� >
 minimap = 미니맵
 position = 위치
 close = 닫기
@@ -110,25 +129,44 @@ committingchanges = 바� � �용
 done = 완료
 feature.unsupported = 기기가 � 기능� 지�하지 않습니다.
 
-mods.alphainfo = 현재 모드는 정� 출시 버전� 아니며, [scarlet]오류가 많� 수 있습니다[].\n발견한 문제는 Mindustry Github �는 Discord� 보고하세요.
+mods.initfailed = [red]⚠[]�전 민�스트리 실행과정�서 모드를 초기화하지 못했습니다. 잘못� 모드로 �해 발�한 것� 수 있습니다.\n\n 게임 충� 무한반복� 막기 위해, [red]모든 모드가 비활성화�었습니다.[]\n\n� 시스템� 비활성화하려면, [accent]설정->게임->로딩 중 충� 시 모드 비활성화[]설정� �세요.
 mods = 모드
 mods.none = [lightgray]모드를 찾� 수 없습니다!
 mods.guide = 모드 제작 가�드
 mods.report = 버그 제보하기
 mods.openfolder = �� 열기
+mods.viewcontent = 콘�츠 보기
 mods.reload = 새로 고침
 mods.reloadexit = 게임� 종료� 후 모드를 불러올 것입니다.
+mod.installed = [설치�]
 mod.display = [gray]모드:[orange] {0}
 mod.enabled = [lightgray]활성화�
 mod.disabled = [scarlet]비활성화�
+mod.multiplayer.compatible = [gray]멀티플레�어 호환 가능
 mod.disable = 비활성화
+mod.version = Version:
 mod.content = 콘�츠:
 mod.delete.error = 모드를 삭제할 수 없습니다. 파�� 사용 중� 수 있습니다.
-mod.requiresversion = [scarlet]필요한 최소 게임 버전: [accent]{0}
-mod.outdated = [scarlet]V6 버전과 호환�지 않� (minGameVersion� 105 �하� 모드는 사용할 수 없습니다.)
-mod.missingdependencies = [scarlet]누�� 요구 모드: {0}
+
+mod.incompatiblegame = [red]구버전 게임
+mod.incompatiblemod = [red]호환�지 않�
+mod.blacklisted = [red]지�하지 않�
+mod.unmetdependencies = [red]충촉�지 않� 종�성
 mod.erroredcontent = [scarlet]콘�츠 오류
-mod.errors = 콘�츠를 불러오는 중� 오류가 발�함.
+mod.circulardependencies = [red]순환 �존성
+mod.incompletedependencies = [red]불완전한 �존성
+
+mod.requiresversion.details = 게임 버전 요구: [accent]{0}[]\n당신� 게임� 구버전입니다. � 모드가 작�하려면 최신 버전� 게임� 필요합니다. (베타/알파 릴리즈� 가능성� 있�).
+mod.outdatedv7.details = � 모드는 최신 버전� 게임과 호환�지 않습니다. 반드시 작성�가 업��트해야 하고, [accent]mod.json[] 파�� [accent]최소게임버전: 136[]� 추가해야 합니다.
+mod.blacklisted.details = � 모드는 � 버전� 게임�서 충� �는 기타 문제를 �으키는 것으로 �해 수�으로 블랙리스트� 올�와 있습니다. 사용하지 마세요.
+mod.missingdependencies.details = � 모드�는 종�성� 없�: {0}
+mod.erroredcontent.details = � 게임� 로딩하는 �안 오류가 발�했습니다. 모드 작성��게 수정하�� 요청하세요.
+mod.circulardependencies.details = � 모드는 서로 �존하는 �존성� 지니고 있습니다.
+mod.incompletedependencies.details = 잘못�었거나 누�한 종�성으로 �해 � 모드를 불러올 수 없습니다: {0}.
+
+mod.requiresversion = 필요한 게임 버전: [red]{0}
+
+mod.errors = 콘�츠를 불러오는 중� 오류가 발�함
 mod.noerrorplay = [scarlet]오류가 있는 모드가 있습니다.[] �향� 받는 모드를 비활성화하거나 플레�하기 전� 오류를 수정하세요.
 mod.nowdisabled = [scarlet]모드 '{0}'� 필요한 종�성� 없습니다:[accent] {1}\n[lightgray]� 모드를 먼저 내려받아야 합니다.\n� 모드는 ��으로 비활성화�니다.
 mod.enable = 활성화
@@ -137,31 +175,40 @@ mod.reloadrequired = [scarlet]재시작 필요
 mod.import = 모드 가져오기
 mod.import.file = 파� 가져오기
 mod.import.github = Github �서 모드 가져오기
-mod.jarwarn = [scarlet]JAR 모드는 안전하지 않습니다.[]\n신뢰할 수 있는 소스�서 얻� 모드만� 사용해야 합니다!
-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[lighthray]모드들:\n{0}
+mod.missing = � 저장 파��는 최근� 업��트�었거나 현재 기기� 설치�지 않� 모드가 �함�어 있습니다. 저장 파�� ��� 수 있습니다. 정�로 불러오시겠습니까?\n[lightgray]모드들:\n{0}
 mod.preview.missing = 창작마당� 모드를 올리기 전� 미리 보기 �미지를 추가해야 합니다.\n[accent]preview.png[] �는 �름� 미리 보기 �미지를 모드 ��� 넣고 다시 시�하세요.
-mod.folder.missing = 창작마당�는 �� 형태� 모드만 게시할 수 있습니다.\n모드를 �� 형태로 바꾸려면 모드 파�� 모드 ��� 압축� 풀고 �전 모드 파�� 삭제 후, 게임� 재시작하거나 모드를 다시 불러오십시오.
+mod.folder.missing = 창작마당�는 �� 형태� 모드만 게시할 수 있습니다.\n모드를 �� 형태로 바꾸려면 모드 파�� 모드 ��� 압축� 풀고 �전 모드 파�� 삭제 후, 게임� 재시작하거나 모드를 다시 불러오세요.
 mod.scripts.disable = � 기기는 스�립트가 있는 모드를 지�하지 않습니다. 게임� 플레�하려면 � 모드를 비활성화해야 합니다.
 
 about.button = ì •ë³´
-name = 닉네임 : 
-noname = 먼저 [accent]닉네임[]� 설정하세요.
+name = �름 :
+noname = 먼저 [accent]플레�어 �름[]� 설정하세요.
+search = 검색:
 planetmap = 행성 지�
 launchcore = 코어 출격
-filename = 파� �름 : 
+filename = 파� �름:
 unlocked = 새로운 콘�츠가 해금�었습니다!
 available = 새로운 콘�츠 해금� 가능합니다!
+unlock.incampaign = < 해금 후 �세정보 열람� 가능합니다 >
+campaign.select = 캠페� 시작지� 선�하기
+campaign.none = [lightgray]시작할 행성� 선�하십시오.\n언제든지 전환할 수 있습니다.
+campaign.erekir = [scarlet]신규 플레�어�게 권장�지 않습니다.[]\n\n보다 새롭고 세련� 컨�츠. 대부분 순차�으로 캠페�� 진행�.\n\n� 어렵고, � 높� 완성�� 맵과 다채로운 경험.
+campaign.serpulo = [accent]신규 플레�어�게 추천합니다.[]\n\n오래� 콘�츠, 고전�� 경험. � 개방��고, � 많� 콘�츠.\n\n잠재�으로 불균형한 맵과 캠페� 메커니즘. � 세련�.
+campaign.difficulty = 난��
 completed = [accent]완료�
 techtree = 연구 기�
-research.legacy = [accent]5.0[] 연구 ��터를 찾았습니다.\n[accent]� ��터를 불러오시겠습니까?[], 아니면 � ��터를 무시하고 캠페�� 새로 시작하시겠습니까? [accent]무시한 ��터는 삭제�니다.[] (권장�)
+techtree.select = 연구 기� 선�
+techtree.serpulo = 세르플로
+techtree.erekir = �르키아
 research.load = 불러오기
 research.discard = 무시하기
 research.list = [lightgray]연구:
 research = 연구
-researched = [lightgray]{0} 연구 완료.
+researched = [lightgray]{0} 연구 완료
 research.progress = {0}% 완료�
 players = {0} 플레�어
 players.single = {0} 플레�어
@@ -170,18 +217,18 @@ players.notfound = [gray]플레�어를 찾� 수 없습니다.
 server.closing = [accent]서버를 닫는 중...
 server.kicked.kick = 서버�서 추방�었습니다!
 server.kicked.whitelist = 당신� � 서버� 화�트리스트� 등��어 있지 않습니다.
-server.kicked.serverClose = 서버 닫힘.
-server.kicked.vote = 당신� 투표로 추방�었습니다. 안녕히 가세요!
+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.nameEmpty = 설정� 닉네임� 없습니다.
-server.kicked.idInUse = 당신� �미 � 서버� 있습니다! � 개� 계정으로 연결하는건 허용�지 않습니다.
-server.kicked.customClient = � 서버는 사용� 정� 빌드를 지�하지 않습니다. 공� 버전� 다운로드 하세요.
+server.kicked.idInUse = 당신� �미 � 서버� 있습니다! � 개� 계정으로 연결하는 건 허용�지 않습니다.
+server.kicked.customClient = � 서버는 사용� 정� 빌드를 지�하지 않습니다. 공� 버전� 내려받으세요.
 server.kicked.gameover = 게임 오버!
 server.kicked.serverRestarting = 서버가 다시 시작�고 있습니다.
 server.versions = 당신� 버전 : [accent] {0}[]\n서버 버전 : [accent] {1}[]
@@ -200,24 +247,38 @@ hosts.none = [lightgray]LAN 게임� 찾� 수 없습니다!
 host.invalid = [scarlet]서버� 연결할 수 없습니다!
 
 servers.local = 로컬 서버
+servers.local.steam = 공개 서버 & 로컬 서버
 servers.remote = �격 서버
 servers.global = 커뮤니티 서버
 
-servers.disclaimer = 커뮤니티 서버는 개발�가 소유하거나 제어하지 [accent]않습니다[].\n\n서버들� 전연령대� �합하지 않� 사용� 지정 콘�츠를 보유할 수� 있습니다.
-servers.showhidden = 서버 숨기기 / 보�기
+servers.disclaimer = 커뮤니티 서버는 개발�가 소유하거나 제어하지 [accent]않습니다[].\n\n�부 서버는 전연령대� �합하지 않� 사용� 지정 콘�츠를 보유할 수� 있습니다.
+servers.showhidden = 숨겨진 서버 보�기/숨기기
 server.shown = 서버 숨기기
 server.hidden = 서버 보�기
 
+viewplayer = 플레�어 보기: [accent]{0}
 trace = 플레�어 정보 보기
 trace.playername = 플레�어 �름: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = UUID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = 모바� ���언트: [accent]{0}
 trace.modclient = 사용� 지정 ���언트: [accent]{0}
+trace.times.joined = 입장 횟수: [accent]{0}
+trace.times.kicked = 추방 횟수: [accent]{0}
+trace.ips = IP:
+trace.names = �름:
 invalidid = 잘못� ���언트 ID입니다! 버그 보고서를 보내주세요.
+
+player.ban = 플레�어 차단
+player.kick = 플레�어 강퇴
+player.trace = 플레�어 찾기
+player.admin = 관리� 권한 부여
+player.team = 팀 변경하기
+
 server.bans = 차단 목�
 server.bans.none = 차단� 플레�어를 찾� 수 없습니다!
-server.admins = 관리�들
+server.admins = 관리�
 server.admins.none = 관리�를 찾� 수 없습니다!
 server.add = 서버 추가
 server.delete = 정�로 � 서버를 삭제하시겠습니까?
@@ -228,27 +289,30 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]사용� 정� 서버
 confirmban = 정�로 "{0}[white]" �(를) 차단하시겠습니까?
 confirmkick = 정�로 "{0}[white]" �(를) 추방하시겠습니까?
-confirmvotekick = 정�로 "{0}[white]" �(를) 투표로 추방하시겠습니까?
 confirmunban = 정�로 � 플레�어를 차단 해제하시겠습니까?
-confirmadmin = 정�로 "{0}[white]" �(를) 관리�로 임명하겠습니까?
+confirmadmin = 정�로 "{0}[white]" �(를) 관리�로 임명하시겠습니까?
 confirmunadmin = 정�로 "{0}[white]"� 관리�를 박탈하시겠습니까?
+votekick.reason = 강퇴 사유
+votekick.reason.message = "{0}[white]" �(를) 투표 추방하시려면 해당 사유를 �어주세요:
 joingame.title = 게임 참가
 joingame.ip = 주소:
 disconnect = 연결� �어졌습니다.
-disconnect.error = 연결 오류.
+disconnect.error = 연결 오류
 disconnect.closed = 연결� 종료�었습니다.
-disconnect.timeout = 시간 초과.
+disconnect.timeout = 시간 초과
 disconnect.data = 맵 ��터를 로드하지 못했습니다!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = [accent]{0}[] 게임� 참여할 수 없습니다.
 connecting = [accent] 연결중...
 reconnecting = [accent]재접�중...
 connecting.data = [accent]맵 ��터 불러오는중...
 server.port = �트:
-server.addressinuse = �미 사용 중� 주소입니다!
 server.invalidport = 잘못� �트 번호입니다!
-server.error = [scarlet]서버 호스팅 오류.
+server.error.addressinuse = [scarlet]�트 6567�서 서버를 열지 못했습니다.[]\n\n다른 Mindustry 서버가 귀하� 장치나 네트워��서 실행�고 있지 않�지 확�하세요!
+server.error = [scarlet]서버 호스팅 오류
 save.new = 새로 저장
 save.overwrite = 저장� 슬롯� �어쓰시겠습니까?
+save.nocampaign = 캠페�� 개별 저장 파�� 가져올 수 없습니다.
 overwrite = �어쓰기
 save.none = 저장� 파�� 찾� 수 없습니다!
 savefail = 게임� 저장하지 못했습니다!
@@ -262,13 +326,14 @@ save.import = 저장 가져오기
 save.newslot = 저장 �름:
 save.rename = �름 변경
 save.rename.text = 새 �름:
-selectslot = 저장슬롯� 선�하십시오.
+selectslot = 저장 슬롯� 선�하세요.
 slot = [accent] 슬롯 {0}
 editmessage = 메시지 편집
 save.corrupted = [accent]���었거나 잘못� 저장 파�입니다!
 empty = <비어있�>
 on = 활성화
 off = 비활성화
+save.search = 세�브 파� 검색
 save.autosave = ��저장: {0}
 save.map = 맵: {0}
 save.wave = {0} 단계
@@ -284,9 +349,30 @@ ok = 확�
 open = 열기
 customize = 사용� 정� 규칙
 cancel = 취소
+command = 명령
+command.queue = 대기
+command.mine = 채굴
+command.repair = 수리
+command.rebuild = 재건
+command.assist = 플레�어 지�
+command.move = ��
+command.boost = 비행
+command.enterPayload = 화물 블�� 들어가기
+command.loadUnits = 유닛 �재
+command.loadBlocks = 블� �재
+command.unloadPayload = 화물 내려놓기
+command.loopPayload = 유닛 반복 운반
+stance.stop = 명령 취소하기
+stance.shoot = 명령: 사격
+stance.holdfire = 명령: 사격 중지
+stance.pursuetarget = 명령: 타겟 추격
+stance.patrol = 명령: 정찰
+stance.ram = 명령 : �격\n[lightgray] 유닛� 장애물 여부를 확�하지 않고 ��선으로 ��합니다.
 openlink = �� 열기
 copylink = �� 복사
 back = 뒤로가기
+max = 최대
+objective = 맵 목표
 crash.export = 오류 로그 내보내기
 crash.none = 오류 로그가 발견�지 않았습니다.
 crash.exported = 오류 로그가 추출�었습니다.
@@ -297,52 +383,59 @@ data.exported = ��터를 내보냈습니다.
 data.invalid = 유효한 게임 ��터가 아닙니다.
 data.import.confirm = 외부 ��터를 가져오면 현재 게임 ��터를 [scarlet]모�[] �어쓰게 �니다.\n[accent]� 작업� 취소할 수 없습니다![]\n\n��터를 가져오면 게임� 즉시 종료�니다.
 quit.confirm = 정�로 종료하시겠습니까?
-quit.confirm.tutorial = 튜토리얼� 종료하시겠습니까?\n튜토리얼�[accent]설정->게임->튜토리얼[]�서 다시 하실 수 있습니다.
 loading = [accent]불러오는중...
-reloading = [accent]모드 새로고침하는중...
+downloading = [accent]내려받는중...
 saving = [accent]저장중...
 respawn = [accent][[{0}][] 키를 눌러 코어�서 부활
-cancelbuilding = [accent][[{0}][] 를 눌러 건설 계�� 초기화
-selectschematic = [accent][[{0}][] 를 눌러 선�+복사
-pausebuilding = [accent][[{0}][] 를 눌러 건설� �시중지
-resumebuilding = [scarlet][[{0}][] 를 눌러 건설� 재개
-showui = [accent][[{0}][] 키를 눌러 UI를 활성화
-wave = [accent]{0} 단계
+cancelbuilding = [accent][[{0}][] 키를 눌러 건설 계�� 초기화
+selectschematic = [accent][[{0}][] 키를 눌러 선�+복사
+pausebuilding = [accent][[{0}][] 키를 눌러 건설� �시중지
+resumebuilding = [scarlet][[{0}][] 키를 눌러 건설� 재개
+enablebuilding = [scarlet][[{0}][] 키를 눌러 건설� 활성
+showui = UI가 숨겨졌습니다. [accent][[{0}][] 키를 눌러 UI를 활성화하세요.
+commandmode.name = [accent]명령 모드
+commandmode.nounits = [유닛 없�]
+wave = [accent]{0}단계
 wave.cap = [accent]단계 {0}/{1}
 wave.waiting = 다� 단계까지[lightgray] {0}초
-wave.waveInProgress = [lightgray]단계 진행중
+wave.waveInProgress = [lightgray]단계 진행 중
 waiting = [lightgray]대기중...
 waiting.players = �대 플레�어를 기다리는 중...
-wave.enemies = [lightgray]� 유닛 {0}명 남�
+wave.enemies = [lightgray]� 유닛 {0}기 남�
 wave.enemycores = [accent]{0}[lightgray] � 코어들
 wave.enemycore = [accent]{0}[lightgray] � 코어
-wave.enemy = [lightgray]{0}명 남�
+wave.enemy = [lightgray]{0}기 남�
 wave.guardianwarn = [accent]{0}[] 단계 후� 수호�가 접근합니다.
 wave.guardianwarn.one = [accent]{0}[] 단계 후� 수호�가 접근합니다.
 loadimage = 사진 불러오기
-saveimage = 사진 저장
+saveimage = 사진 저장하기
 unknown = 알 수 없�
 custom = 사용� 정�
 builtin = 내장
 map.delete.confirm = 정�로 � 맵� 삭제하시겠습니까? � 명령� 취소할 수 없습니다!
 map.random = [accent]무작위 맵
-map.nospawn = � 맵� 플레�어가 �성� 코어가 없습니다! 편집기�서 [accent]orange[] 코어를 맵� 추가하세요.
-map.nospawn.pvp = � 맵�는 � 플레�어가 �성� 코어가 없습니다! 편집기�서 [royal]orange 팀� 아닌[] 코어를 추가하세요.
-map.nospawn.attack = � 맵�는 플레�어가 공격할 수 있는 �� 코어가 없습니다! �디터�서 [royal]빨간색[] 코어들� 맵� 추가하세요.
+map.nospawn = � 맵� 플레�어가 �성� 코어가 없습니다! 편집기�서 {0} 코어를 맵� 추가하세요.
+map.nospawn.pvp = � 맵�는 � 플레�어가 �성� 코어가 없습니다! 편집기�서 [scarlet]주황색 팀� 아닌[] 코어를 추가하세요.
+map.nospawn.attack = � 맵�는 플레�어가 공격할 수 있는 � 코어가 없습니다! 편집기�서 {0} 코어를 맵� 추가하세요.
 map.invalid = 맵 로드 오류: 맵 파�� ���었거나 잘못� 파�입니다.
 workshop.update = 아�템 업��트
 workshop.error = 창작마당 세부 사항� 가져오는 중 오류가 발�했습니다: {0}
 map.publish.confirm = � 맵� 게시하시겠습니까?\n\n[lightgray]창작마당 EULA� 먼저 ��해야 하며, 그렇지 않으면 맵� 표시�지 않습니다!
-workshop.menu = � 아�템으로 수행 할 작업� 선�하십시오.
+workshop.menu = � 아�템으로 수행 할 작업� 선�하세요.
 workshop.info = 아�템 정보
-changelog = 변경 � (선� 사항) :
+changelog = 변경� (선� 사항):
+updatedesc = 제목&설명 �어쓰기
 eula = 스팀 EULA
 missing = � 아�템� 삭제�거나 ���었습니다.\n[lightgray]창작마당 목�� ��으로 연결 해제�었습니다.
-publishing = [accent]업로드 중...
+publishing = [accent]게시 중...
 publish.confirm = �것� 게시하시겠습니까?[lightgray]창작마당 EULA� ��해야 합니다. 그렇지 않으면 아�템� 표시�지 않습니다!
 publish.error = 아�템 게시 오류: {0}
 steam.error = 스팀 서비스를 초기화하지 못했습니다.\n오류: {0}
 
+editor.planet = 행성:
+editor.sector = 구역:
+editor.seed = 시드:
+editor.cliffs = 언� 전환
 editor.brush = 브러쉬
 editor.openin = 편집기 열기
 editor.oregen = 광물 무작위 �성
@@ -350,58 +443,101 @@ editor.oregen.info = 광물 무작위 �성:
 editor.mapinfo = 맵 정보
 editor.author = 제작�:
 editor.description = 설명:
-editor.nodescription = 맵� 업로드하려면 최소 4� ��� 설명� 있어야 합니다.
-editor.waves = 단계:
-editor.rules = 규칙:
-editor.generation = 지형 �성:
-editor.ingame = � 게임 편집
+editor.nodescription = 맵� 공유하려면 최소 4� ��� 설명� 있어야 합니다.
+editor.waves = 단계
+editor.rules = 규칙
+editor.generation = 지형 �성
+editor.objectives = 목표
+editor.locales = 번역 팩
+editor.worldprocessors = 월드 프로세서
+editor.worldprocessors.editname = �름 수정
+editor.worldprocessors.none = [lightgray]월드 프로세서 블�� 찾� 수 없습니다!\n맵 편집기�서 추가하거나 아래� \ue813 추가 버튼� 사용하세요.
+editor.worldprocessors.nospace = 월드 프로세서를 배치할 여유 공간� 없습니다!\n맵� 전부 구조물로 채웠나요? 왜 �렇게 했나요?
+editor.worldprocessors.delete.confirm = � 월드 프로세서를 삭제하시겠습니까?\n\n주변� 벽으로 둘러싸여 있다면 지형 벽으로 대체� 것입니다.
+editor.ingame = �게임 편집
+editor.playtest = 맵 테스트
 editor.publish.workshop = 창작마당 게시
-editor.newmap = 신규 맵
+editor.newmap = 맵 만들기
 editor.center = 중앙
+editor.search = 맵 검색
+editor.filters = 맵 필터�
+editor.filters.mode = 게임 모드:
+editor.filters.type = 맵 유형:
+editor.filters.search = 검색:
+editor.filters.author = 제작�
+editor.filters.description = 설명
+editor.shiftx = X축 밀기
+editor.shifty = Y축 밀기
 workshop = 창작마당
 waves.title = 단계
 waves.remove = 삭제
-waves.never = 여기까지 유닛 �성
 waves.every = 매
 waves.waves = 단계마다
-waves.perspawn = 마리씩 �성�
-waves.shields = 방어막 hp/단계
+waves.health = ì²´ë ¥: {0}%
+waves.perspawn = 기씩
+waves.shields = 방어막만� 소환
 waves.to = 부터
+waves.spawn = 소환:
+waves.spawn.all = <ì „ì²´>
+waves.spawn.select = � 소환지� 선�
+waves.spawn.none = [scarlet] � 소환지�� 찾� 수 없습니다
+waves.max = 기까지
 waves.guardian = 수호�
 waves.preview = 미리보기
 waves.edit = 편집
-waves.copy = �립보드로 복사
+waves.random = 무작위
+waves.copy = �립보드로 복사하기
 waves.load = �립보드�서 불러오기
 waves.invalid = �립보드� 잘못� 단계 ��터가 있습니다.
 waves.copied = 단계 복사�
 waves.none = � 단계가 설정�지 않았습니다.\n비어있� 시 ��으로 기본 � 단계 ��터로 설정�니다.
+waves.sort = 정렬 기준
+waves.sort.reverse = 정렬 뒤집기
+waves.sort.begin = 시작 단계
+waves.sort.health = ì²´ë ¥
+waves.sort.type = 유닛 유형
+waves.search = 단계 검색...
+waves.filter = 유닛 필터
+waves.units.hide = 모� 숨기기
+waves.units.show = 모� 보�기
 
 #these are intentionally in lower case
-wavemode.counts = 마리
+wavemode.counts = 기
 wavemode.totals = ì´�
 wavemode.health = ì²´ë ¥
 
+all = 모�
 editor.default = [lightgray]<기본값>
-details = 설명
-edit = 편집
+details = 설명...
+edit = 편집...
+variables = 변수
+logic.clear.confirm = � 프로세서� 모든 코드를 삭제하시겠습니까?
+logic.globals = 내장 변수
+
 editor.name = �름:
 editor.spawn = 유닛 �성
 editor.removeunit = 유닛 삭제
 editor.teams = 팀
 editor.errorload = 파�� 불러오지 못했습니다.
 editor.errorsave = 파�� 저장하지 못했습니다.
-editor.errorimage = �것� 맵� 아니� 사진입니다.\n\n3.5/build 40 맵� 가져올려면 편집기�서 '예전 맵 가져오기' 버튼� 사용하세요.
-editor.errorlegacy = � 맵� 너무 오래�어 � �� 지��지 않는 구형 맵 형�� 사용합니다.
+editor.errorimage = �것� 맵� 아니� 사진입니다.
+editor.errorlegacy = � 맵� 너무 오래�고, � �� 지�하지 않는 구형 맵 형�� 사용합니다.
 editor.errornot = 맵 파�� 아닙니다.
 editor.errorheader = � 맵 파�� 유효하지 않거나 ���었습니다.
 editor.errorname = 맵� �름� 지정�어 있지 않습니다. 저장 파�� 불러오려고 시�하는 건가요?
+editor.errorlocales = 잘못� 언어 팩� �는 �안 오류가 발�했습니다.
 editor.update = 업��트
 editor.randomize = 무작위
+editor.moveup = 위로 ��
+editor.movedown = 아래로 ��
+editor.copy = 복사
 editor.apply = �용
 editor.generate = �성
+editor.sectorgenerate = 구역 형성
 editor.resize = 맵 �기조정
 editor.loadmap = 맵 불러오기
 editor.savemap = 맵 저장
+editor.savechanges = [scarlet]저장하지 않� 변경 사항� 있습니다!\n\n[]저장하시겠습니까?
 editor.saved = 저장�!
 editor.save.noname = 맵� �름� 없습니다! '맵 정보' 메뉴�서 설정하세요.
 editor.save.overwrite = � 맵� 내장� 맵� �어�니다! '맵 정보' �서 다른 �름� 선�하세요.
@@ -413,7 +549,7 @@ editor.importfile = 파� 가져오기
 editor.importfile.description = 외부 맵 파� 가져오기
 editor.importimage = 사진 파� 가져오기
 editor.importimage.description = 외부 맵 사진 파� 가져오기
-editor.export = 내보내기
+editor.export = 내보내기...
 editor.exportfile = 파� 내보내기
 editor.exportfile.description = 맵 파� 내보내기
 editor.exportimage = 지형 �미지 내보내기
@@ -423,162 +559,271 @@ editor.saveimage = 지형 내보내기
 editor.unsaved = [scarlet]변경사항� 저장하지 않았습니다![]\n정�로 나가시겠습니까?
 editor.resizemap = 맵 �기 조정
 editor.mapname = 맵 �름:
-editor.overwrite = [accept]경고!\n�것� 기존 맵� �어 �니다.
+editor.overwrite = [accept]경고!\n� 맵� 기존 맵� �어 �니다.
 editor.overwrite.confirm = [scarlet]경고![] � �름� 가진 맵� �미 있습니다. �어 쓰시겠습니까?
 editor.exists = � �름� 맵� �미 존재합니다.
 editor.selectmap = 불러올 맵� 선�하세요:
 
 toolmode.replace = 재배치
-toolmode.replace.description = 단단한 블��만 그립니다.
+toolmode.replace.description = 지형 블��만 그립니다.
 toolmode.replaceall = 모� 재배치
 toolmode.replaceall.description = 맵� 있는 모든 블�� 재배치합니다.
 toolmode.orthogonal = ��
-toolmode.orthogonal.description = ��으로 블�� 배치합니다.
+toolmode.orthogonal.description = ��으로만 블�� 배치합니다.
 toolmode.square = 정사�형
 toolmode.square.description = 정사�형 형태� 브러시로 �체합니다.
 toolmode.eraseores = �� 초기화
 toolmode.eraseores.description = ��만 초기화합니다.
 toolmode.fillteams = 팀 채우기
-toolmode.fillteams.description = 블� 대신 선�한 팀으로 블� 팀� 채�니다. 
+toolmode.fillteams.description = 블�� 팀� 선�한 팀으로 채�니다.
+toolmode.fillerase = 유형별 지우기
+toolmode.fillerase.description = 같� 유형� 블�� 지�니다.
 toolmode.drawteams = 팀 그리기
-toolmode.drawteams.description = 블� 대신 선�한 팀으로 블� 팀� 그립니다.
+toolmode.drawteams.description = 블�� 팀� 선�한 팀으로 그립니다.
+#unused
+toolmode.underliquid = 액체 아래로 그리기
+toolmode.underliquid.description = 액체 타� 아래� 바닥� 그립니다.
 
 filters.empty = [lightgray]필터가 없습니다! 아래 버튼� 눌러 하나를 추가하세요.
+
 filter.distort = 왜곡
 filter.noise = 노�즈
-filter.enemyspawn = � 소환지� 제한
+filter.enemyspawn = � 소환지� 선�
 filter.spawnpath = ���성� � ��경로 �
-filter.corespawn = 코어 1개 제한
+filter.corespawn = 코어 선�
 filter.median = 중앙값
-filter.oremedian = �� 중앙값
-filter.blend = 블렌드
-filter.defaultores = 기본 ��
-filter.ore = ��
-filter.rivernoise = 협곡 노�즈
+filter.oremedian = 광물 중앙값
+filter.blend = 가장�리
+filter.defaultores = 기본 광물
+filter.ore = 광물
+filter.rivernoise = 강 노�즈
 filter.mirror = 거울
 filter.clear = 초기화
 filter.option.ignore = 무시
 filter.scatter = �뿌리기
 filter.terrain = 지형
+filter.logic = 로�
+
 filter.option.scale = �기
 filter.option.chance = 배치 빈�
 filter.option.mag = �기
-filter.option.threshold = 경계선
+filter.option.threshold = 한계�
 filter.option.circle-scale = � �기
 filter.option.octaves = 옥타브
 filter.option.falloff = 경사
 filter.option.angle = ��
+filter.option.tilt = 기울기
+filter.option.rotate = ë°©í–¥
 filter.option.amount = 개수
 filter.option.block = 블�
-filter.option.floor = 배치할 타�
+filter.option.floor = 타�
 filter.option.flooronto = 대� 타�
-filter.option.target = 대� 타�
+filter.option.target = 대�
+filter.option.replacement = 바꿔넣� 타�
 filter.option.wall = ë²½
-filter.option.ore = ��
-filter.option.floor2 = 2층 바닥
+filter.option.ore = 광물
+filter.option.floor2 = 2번째 타�
 filter.option.threshold2 = 2번째 경계선
 filter.option.radius = 반경
 filter.option.percentile = 백분율
+filter.option.code = 코드
+filter.option.loop = 루프
 
-width = 넓�:
+locales.info = 여기�서 특정 언어� 대한 언어 팩� 맵� 추가할 수 있습니다. 언어 팩�서 � �성�는 �름과 값� 있습니다. �러한 �성� �름� 사용하여 월드 프로세서와 목표�서 사용할 수 있습니다. �스트 서� 지정(플레�스홀�를 실제 값으로 대체)� 지�합니다.\n\n[cyan]예시 �성:\n[]�름: [accent]timer[]\n값: [accent]예시 타�머, 남� 시간: {0}[]\n\n[cyan]사용법:\n[]목표� �스트로 설정: [accent]@timer\n\n[]월드 프로세서�서 Print:\n[accent]localeprint "timer"\nformat time\n[gray](여기서 시간� 별�로 계산� 변수)
+locales.deletelocale = � 언어 팩� 삭제하시겠습니까?
+locales.applytoall = 모든 언어 팩� 변경 사항 �용
+locales.addtoother = 다른 언어 팩� 추가
+locales.rollback = 마지막으로 �용� �태로 롤백
+locales.filter = �성 필터
+locales.searchname = �름 검색...
+locales.searchvalue = 값 검색...
+locales.searchlocale = 언어 팩 검색...
+locales.byname = �름으로
+locales.byvalue = 값으로
+locales.showcorrect = 모든 언어 팩� 존재하고 모든 곳�서 고유한 값� 갖는 �성� 표시
+locales.showmissing = �부 언어 팩�서 누�� �성 표시
+locales.showsame = 다른 언어 팩�서 ��한 값� 갖는 �성 표시
+locales.viewproperty = 모든 언어 팩�서 보기
+locales.viewing = �성 보기 "{0}"
+locales.addicon = 아�콘 추가
+
+width = 너비:
 height = 높�:
 menu = 메뉴
 play = 플레�
 campaign = 캠페�
 load = 불러오기
-save = 저장
+save = 저장하기
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = 언어 설정� �용하려면 게임� 다시 시작하세요.
 settings = 설정
 tutorial = 튜토리얼
-tutorial.retake = 튜토리얼� 다시 시작하기
+tutorial.retake = 튜토리얼 재시작하기
 editor = 편집기
 mapeditor = 맵 편집기
 
 abandon = �기하기
 abandon.text = � 지역과 모든 ��� ��게 넘어갑니다.
 locked = ìž ê¹€
-complete = [lightgray]해금 조건 :
+complete = [lightgray]해금 조건:
 requirement.wave = {1} 지역�서 {0}단계 달성
 requirement.core = {0} 지역�서 � 코어를 파괴
 requirement.research = {0} 연구
+requirement.produce = {0} �산
 requirement.capture = {0} �령
-bestwave = [lightgray]최고 단계: {0}
+requirement.onplanet = {0} 구역� 제어
+requirement.onsector = {0} 구역� 착륙
 launch.text = 출격
-research.multiplayer = 캠페� 멀티 플레� 시�는 해당 캠페� 서버� 호스트만 연구할 수 있습니다.
-map.multiplayer = 캠페� 멀티 플레� 시�는 해당 캠페� 서버� 호스트만 다른 섹터들� 보고, ��� 가능합니다.
+map.multiplayer = 캠페� 멀티 플레� 시�는 해당 캠페� 서버� 호스트만 다른 구역� 보고, ��� 가능합니다.
 uncover = 지역 개방
 configure = 초기�� 설정
 
+objective.research.name = 연구
+objective.produce.name = ��
+objective.item.name = ��한 ��
+objective.coreitem.name = 코어 ��
+objective.buildcount.name = 건설 횟수
+objective.unitcount.name = 유닛 횟수
+objective.destroyunits.name = 유닛 처치
+objective.timer.name = 타�머
+objective.destroyblock.name = 단� 블� 파괴
+objective.destroyblocks.name = 다수 블� 파괴
+objective.destroycore.name = 코어 파괴
+objective.commandmode.name = 명령 모드
+objective.flag.name = 플래그
+
+marker.shapetext.name = �형과 문�
+marker.point.name = ��트
+marker.shape.name = �형
+marker.text.name = 문�
+marker.line.name = ��
+marker.quad.name = 쿼드
+marker.texture.name = �스처
+
+marker.background = ë°°ê²½
+marker.outline = 외곽선
+
+objective.research = [accent]연구:\n[]{0}[lightgray]{1}
+objective.produce = [accent]��:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]파괴:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]파괴: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]��: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]코어로 운반:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]건설: [][lightgray]{0}[]개\n{1}[lightgray]{2}
+objective.buildunit = [accent]유닛 �산: [][lightgray]{0}[]기\n{1}[lightgray]{2}
+objective.destroyunits = [accent]처치: [][lightgray]{0}[]기� 유닛
+objective.enemiesapproaching = [accent]�� [lightgray]{0}[]초 후� �착합니다
+objective.enemyescelating = [accent]�� �산량� �가하고 있습니다[lightgray]{0}[]
+objective.enemyairunits = [accent]�� 공중 유닛� �산�고 있습니다[lightgray]{0}[]
+objective.destroycore = [accent]�� 코어를 파괴하세요
+objective.command = [accent]유닛 조종
+objective.nuclearlaunch = [accent]⚠ 핵공격� �지�었습니다: [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ 핵 공습 �지 ⚠
+
 loadout = 출격
 resources = ��
-bannedblocks = 금지� 블�들
+resources.max = 최대
+bannedblocks = 금지� 블�
+unbannedblocks = Unbanned Blocks
+objectives = 목표
+bannedunits = 금지� 기체
+unbannedunits = Unbanned Units
+bannedunits.whitelist = 금지� 기체만 활성화
+bannedblocks.whitelist = 금지� 블�만 활성화
 addall = 모� 추가
-launch.from = �령 코어 송신 지역 : [accent]{0}
+launch.from = 출격 출발지: [accent]{0}[]
+launch.capacity = 출격 �� 용량: [accent]{0}
 launch.destination = 목�지: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = 해당 값� 0�서 {0} 사�� 숫�여야 합니다.
 add = 추가...
-boss.health = 수호� 체력
+guardian = 수호�
 
-connectfail = [scarlet]연결 오류:\n\n[accent]{0}
+connectfail = [scarlet]연결 오류:[]\n\n[][accent]{0}[]
 error.unreachable = 서버� 연결하지 못했습니다.\n서버 주소가 정확히 입력�었나요?
 error.invalidaddress = 잘못� 주소입니다.
 error.timedout = 시간 초과!\n서버� �트 �워딩� 설정�어 있고 주소가 올바른지 확�하세요.
-error.mismatch = 패킷 오류\n���언트/서버 버전� �치하지 않습니다.\n접�하려는 서버가 최신 버전�지 확�하세요!
+error.mismatch = 패킷 오류\n���언트와 서버 버전� �치하지 않습니다.\n접�하려는 서버가 최신 버전�지 확�하세요!
 error.alreadyconnected = �미 접� 중입니다.
 error.mapnotfound = 맵 파�� 찾� 수 없습니다!
-error.io = 네트워� I/O 오류.
-error.any = 알 수 없는 네트워� 오류.
-error.bloom = 블룸 그래픽 효과를 �용하지 못했습니다.\n당신� 기기가 � 기능� 지�하지 않는 것� 수� 있습니다.
+error.io = 네트워� I/O 오류
+error.any = 알 수 없는 네트워� 오류
+error.bloom = 블룸 그래픽 효과를 �용하지 못했습니다.\n기기가 � 기능� 지�하지 않는 것� 수� 있습니다.
+error.moddex = Mindustry가 해당 모드를 로드할 수 없습니다.\n최근 Android� 변경으로 �해 기기�서 Java 모드 가져오기가 차단�었습니다.\n 아� � 문제� 대한 알려진 해결 방법� 없습니다.
 
 weather.rain.name = 비
-weather.snow.name = 눈
+weather.snowing.name = 눈
 weather.sandstorm.name = 모래 ��
 weather.sporestorm.name = �� ��
 weather.fog.name = 안개
 
-sectors.unexplored = [lightgray]미개척지
+campaign.playtime = \uf129 [lightgray]지역 플레�타임: {0}
+campaign.complete = [accent]축하드립니다.\n\n {0} 지역� �� 패배하였습니다\n[lightgray] 마지막 지역� �령하였습니다.
+
+sectorlist = 지역 목�
+sectorlist.attacked = {0} 공격받는 중
+sectors.unexplored = [lightgray]미개척지[]
 sectors.resources = ��:
-sectors.production = 분당 �� �산량:
-sectors.export = 분당 �� 수출량:
-sectors.time = 지역 진행 시간:
-sectors.threat = 지역 위험�:
-sectors.wave = 진행 중 단계:
-sectors.stored = 저장� �� 목�:
+sectors.production = �산량:
+sectors.export = 수출량:
+sectors.import = 수입량:
+sectors.time = 진행 시간:
+sectors.threat = 위험�:
+sectors.wave = 단계:
+sectors.stored = 저장량:
 sectors.resume = 재개
 sectors.launch = 출격
 sectors.select = 선�
-sectors.nonelaunch = [lightgray]없� (sun)
-sectors.rename = 구역 �름 변경
-sectors.enemybase = [scarlet]� 기지
-sectors.vulnerable = [scarlet]취약
-sectors.underattack = [scarlet]공격받고 있습니다! [accent]{0}% ���.
-sectors.survives = [accent]{0} 단계 �� 버티세요.
-sectors.go = 지역 진입
-sector.curcapture = �령지
-sector.curlost = 잃� 지역
-sector.missingresources = [scarlet]�� 부족
-sector.attacked = [accent]{0}[white] 지역� 공격받고 있습니다!
-sector.lost = [accent]{0}[white] 지역� 잃었습니다...
-#note: the missing space in the line below is intentional
-sector.captured = [accent]{0}[white] 지역� �령했습니다!
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]없� (태양)[]
+sectors.redirect = Redirect Launch Pads
+sectors.rename = 지역 �름 변경하기
+sectors.enemybase = [scarlet]� 기지[]
+sectors.vulnerable = [scarlet]취약함[]
+sectors.underattack = [scarlet]공격받고 있습니다! [accent]{0}% ���[]
+sectors.underattack.nodamage = [scarlet]�령�지 않�
+sectors.survives = [accent]{0} 단계 버팀[]
+sectors.go = 진입
+sector.abandon = �기
+sector.abandon.confirm = � 지역� 코어가 ��합니다.\n계�하시겠습니까?
+sector.curcapture = 지역 �령�
+sector.curlost = 지역 잃�
+sector.missingresources = [scarlet]코어 �� 부족[]
+sector.attacked = [accent]{0}[white] 지역� 공격받고 있습니다![]
+sector.lost = [accent]{0}[white] 지역� 잃었습니다![]
+sector.capture = [accent]{0}[white] 지역� �령하였습니다!
+sector.capture.current = 지역 �령!
+sector.changeicon = 아�콘 바꾸기
+sector.noswitch.title = 지역 전환 불가능
+sector.noswitch = 기존 지역� 공격받는 �안� 지역� 전환할 수 없습니다.\n\n지역: [accent]{0}[] 중 [accent]{1}[]
+sector.view = 지역 보기
 
 threat.low = 낮�
-threat.medium = 높지 않지만 낮지� 않�
+threat.medium = 보통
 threat.high = 높�
 threat.extreme = 매우 높�
 threat.eradication = 극한
 
+difficulty.casual = �주얼
+difficulty.easy = 쉬움
+difficulty.normal = 보통
+difficulty.hard = 어려움
+difficulty.eradication = 극한
+
 planets = 태양계
 
 planet.serpulo.name = 세르플로
+planet.erekir.name = �르키아
 planet.sun.name = 태양
 
 sector.impact0078.name = �허 : Impact 0078
-sector.groundZero.name = Zero 전초기지
+sector.groundZero.name = 전초기지
 sector.craters.name = �레�터
 sector.frozenForest.name = 얼어붙� 숲
 sector.ruinousShores.name = 파괴� 해안가
@@ -592,134 +837,275 @@ sector.fungalPass.name = �� 지대
 sector.biomassFacility.name = 유기물 합성 시설
 sector.windsweptIslands.name = ��� 격전지
 sector.extractionOutpost.name = �� 추출기지
+sector.facility32m.name = 32 M 시설
+sector.taintedWoods.name = 오염� 산림
+sector.infestedCanyons.name = �염� 깊� 협곡
 sector.planetaryTerminal.name = 대행성 출격단지
+sector.coastline.name = 해안선
+sector.navalFortress.name = 해군 요새
+sector.polarAerodrome.name = 극지 비행장
+sector.atolls.name = 환초
+sector.testingGrounds.name = 시험장
+sector.seaPort.name = 바다 항구
+sector.weatheredChannels.name = �화� 수로
+sector.mycelialBastion.name = 균사 요새
+sector.frontier.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대거와 �롤러 유닛� 사용하여 �개� 코어를 파괴하세요.
-sector.biomassFacility.description = ��� 시작� �는 지역입니다. � 시설� ��를 연구하고 그것들� 가장 처� �산했습니다.\n� 시설� 기�� 기술� 배우고, 연료와 플�스터늄� �산하기 위해 ��를 배양하세요. \n\n[lightgray]� 시설� 붕괴� 후�, 시설 내� 배양�� ��들� 외부로 방출�었습니다. �로 �해 �태계 �란종� ��가 지역 �태계�서 번�하게 �었고, 그 무엇� � 무�비하고 작� 침략��게 대항할 수 없었습니다.
-sector.windsweptIslands.description = 육지�서 멀리 떨어진 �곳�는 작� 군�가 있습니다. � 지역� 조사해보면 한 때 [accent]플�스터늄[]� �산한 ��� 남아있습니다.\n\n몰려오는 � 해군� 막으며, 섬� 기지를 건설하고, 공장들� 연구하십시오.
-sector.extractionOutpost.description = �� 다른 지역� ��� 보내기 위한 용�로 건설한 보급기지입니다.\n\n강력한 �들� 지키고 있거나, 침공해올 예정� 지역� 효과�으로 침공/수호하기 위해서는 우리� � 수송 기술� 필요합니다. �� 기지를 파괴하고, 그들� 수송 기술� 약탈하십시오.
-sector.impact0078.description = �곳�는 시스템� 처� 진입한 우주 수송선� 잔해가 있습니다.\n\n우주선� 파괴� 잔해�서 최대한 많� ��� 회수하고, ���지 않� 그들� 기술� ��하세요.
-sector.planetaryTerminal.description = � 행성�서� 마지막 전투를 준비하세요.\n\n�� 필사� �오로 지키고 있는 � 해안 기지엔 우주� 코어를 발사할 수 있는 시설� 있습니다.\n\n해군� �산하여 �� 신�하게 제거하고, 그들� 코어 발사 기술� 약탈하십시오.\n\n[royal] 건투를 빕니다.[]
+sector.groundZero.description = � 장소는 다시 시작하기� 최�� 환경� 지녔습니다. �� 위협��지 않지만, ��� �부하진 않습니다.\n가능한 한 많� 양� 구리와 납� 수집하십시오.\n�제 출격할 시간입니다!
+sector.frozenForest.description = 산과 가까운 �곳��, ��가 �졌습니다. 혹한� 추위조차 ��가 �지는 것� 억누를 수 없습니다.\n화력 발전기를 건설하고, 멘�를 사용하는 방법� 배워야 합니다.
+sector.saltFlats.description = 사막� 변�리�는 소금으로 �루어진 ��� 있습니다. �곳�선 매우 �� ��만 발견�었습니다.\n\n하지만 ��� �소한 �곳�서� �들� 요새가 �착�었습니다. 그들� 사막� 모래로 만들어버리세요!
+sector.craters.description = 물� 가�한 � �레�터�는 옛 전�� 유물들� 쌓여있습니다.\n�곳� 탈환하여 강화 유리를 제련하고, �탑과 드릴� 물� 공급하여 � 강력한 방어선� 구축하여야 합니다.
+sector.ruinousShores.description = �허를 지나서 나오는 해안선. 한때, �곳�는 해안 방어기지가 있었습니다.\n많� 부분� 소실�었습니다. 기본�� 방어 시설� 제외한 모든 것� 고철 �어리가 �었습니다. \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대거와 �롤러 기체를 사용하여 � 개� 기지를 파괴하여야 합니다.
+sector.biomassFacility.description = ��가 탄�한 곳. �곳� ��를 연구하고 최초로 �산했� 시설입니다.\n� 시설� 남아있는 기술� 습�하고, 연료와 플�스터늄� �산하기 위해 ��를 배양하십시오. \n\n[lightgray]� 시설� 붕괴한 후�, 시설 내� 배양�� 대량� ��가 외부로 방출�었습니다. �로 �해 �태계 �란종� ��가 지역 �태계�서 번�하게 �었고, 그 무엇� � 무�비하고 작� 침략��게 대항할 수 없었습니다.
+sector.windsweptIslands.description = 육지�서 멀리 떨어진 �곳�는 작� 군�가 있습니다. 기�� 따르면 한 때 [accent]플�스터늄[]� �산하는 시설� 존재했습니다.\n\n몰려오는 � 해군� 막으며, 섬� 기지를 구축하고, 공장들� 연구하여야 합니다.
+sector.extractionOutpost.description = �� 다른 지역� ��� 보내기 위한 용�로 건설한 보급기지입니다.\n\n강력한 �들� 지키고 있는 지역� 공격하거나, ��게 침공당한 지역� 효과�으로 수호하기 위해서는 우리� � 수송 기술� 필요합니다. �� 기지를 파괴하고, 그들� 수송 기술� 강탈하십시오.
+sector.impact0078.description = �곳�는 태양계� 처� 진입한 우주 수송선� 잔해가 존재합니다.\n\n우주선� 파괴� 잔해�서 최대한 많� ��� 회수하고, ���지 않� 그들� 기술� ��하십시오.
+sector.planetaryTerminal.description = � 행성�서� 마지막 전투를 준비하십시오.\n\n�� 필사� �오로 지키고 있는 � 해안 기지엔 우주� 코어를 발사할 수 있는 시설� 있습니다.\n\n해군� �산하여 �� 신�하게 제거하고, 그들� 행성간 �� 기술� 강탈하십시오.\n\n[royal] 건투를 빕니다.[]
+sector.coastline.description = � 장소�서 해� 유닛 기술� 잔재가 발견�었습니다. �� 공격� 격퇴하고, � 지역� �령하고, 기술� 습�하십시오.
+sector.navalFortress.description = �� �연�으로 요새화� 외딴 섬� 기지를 세웠습니다. � 전초기지를 파괴하여 �� 발전� 함선 건조 기술� 습�하고 연구하십시오.
+sector.cruxscape.name = �럭스케�프
+sector.geothermalStronghold.name = 지열 근거지
+
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = 시작
+sector.aegis.name = 보호
+sector.lake.name = 호수
+sector.intersect.name = �차지
+sector.atlas.name = 아틀�스
+sector.split.name = 분열
+sector.basin.name = 유역
+sector.marsh.name = 습지
+sector.peaks.name = 산봉우리
+sector.ravine.name = 협곡
+sector.caldera-erekir.name = 칼��
+sector.stronghold.name = ê±°ì �
+sector.crevice.name = 틈새
+sector.siege.name = �위
+sector.crossroads.name = �차로
+sector.karst.name = 카르스트
+sector.origin.name = 근�
+
+sector.onset.description = �르키아 정복� 시작하세요. ��� 모으고, 유닛� �산하고, 기술 연구를 시작하세요.
+sector.aegis.description = � 구역�는 텅스� 매장지가 있습니다.\n[accent]충격 드릴[]� 연구해 � ��� 채굴하고 해당 지역� � 기지를 파괴하세요.
+sector.lake.description = � 지역� 광재 호수는 유닛� 활� 범위를 �게 제한시킵니다. 호버� 유닛만� 유�한 선�지입니다.\n[accent]함선 재구성기[]를 연구하고 [accent]�루드[]를 가능한 한 빨리 �산하여야 합니다.
+sector.intersect.description = 정찰 결과 � 지역� 착륙 �후 여러 방향�서 공격받� 것으로 예측�니다.\n방어선� 빠르게 구축하고 가능한 한 빠르게 확장하여야 합니다.\n� 지역� 험난한 지형� 위해서는 [accent]기계[] 유닛� 필요할 것입니다.
+sector.atlas.description = � 지역� �기 다른 지형� �함하고 있으며, 효과�으로 공격하기 위해서는 다양한 기체가 필요합니다.\n�곳�서 발견� � 강력한 �� 기지를 통과하기 위해서는 �위 등급� 유닛� 필요할 수� 있습니다.\n[accent]전해조[]와 [accent]전차 재조립기[]를 연구하세요.
+sector.split.description = � 지역� 최소한으로 존재하는 � 주둔군� 새로운 운송 기술� 시험하기� 완벽합니다.
+sector.basin.description = � 지역�는 많� 수� �� 확��었습니다. 발�� 마련하기 위해 신�히 유닛� �산하여 �� 기지를 무력화 해야 합니다.
+sector.marsh.description = � 지역� 아르키사�트가 �부하지만 분출구� 수는 한정�입니다.\n[accent]화학� 연소실[]� 건설하여 전력� �산하세요.
+sector.peaks.description = � 지역� 산악 지형� 대부분� 유닛� 무용지물로 만들었습니다. 비행 가능한 유닛� 필요합니다.\n�� 방공�� 유�하십시오. �부 시설� 지� 건물� 공격하여 무력화시킬 수 있습니다.
+sector.ravine.description = �� 중요한 �� 경로�긴 하지만, 해당 구역�선 �� 기지가 �지�지 않았습니다. 다양한 �군� 맞닥뜨릴 것으로 예��니다.\n[accent]설금[]� �산하여 �탑 [accent]어플릭트[]를 건설하세요.
+sector.caldera-erekir.description = � 지역�서 �지� ��� 여러 섬� 분산�어 있습니다 .\n드론� 기반으로 한 운송수단� 연구하고 활용하세요.
+sector.stronghold.description = � 지역� 대규모 � 야�지�는 �들� 지키고 있는 �당한 양� [accent]토륨[] 매장지가 있습니다.\n� 높� 등급� 유닛과 �탑� 연구할 때 사용합니다.
+sector.crevice.description = �들� � 지역�서 당신� 기지를 제거하기 위해 맹렬한 공격부대를 보낼 것입니다.\n[accent]탄화물[]과 [accent]열분해 발전기[]를 연구하는 것� 살아남기 위해 반드시 필요합니다.
+sector.siege.description = � 지역� � 갈래� 공격� 강요하는 � 개� �행 협곡� 특징입니다.\n� 강력한 전차 유닛� 만들기 위한 능력� 얻기 위해 [accent]시아노�[]� 연구하시오.\n주�: �� 장거리 발사체가 �지�었습니다. 미사�� 충� 전� 격추� 수 있습니다.
+sector.crossroads.description = � 지역� � 기지는 다양한 지형� 위차하고 있는 것� 확� �었으며 �로 �해 다양한 유닛� 필요합니다. \n�한, �부 기지는 보호막으로 보호�고 있습니다. 그들� 어떻게 전력� 공급받는지 알아보아야 합니다.
+sector.karst.description = � 지역� ��� �부하지만, 새로운 코어가 착륙하면 ��게 공격� 받� 것입니다.\n��� ��� 활용하고 [accent]위� 섬유[]를 연구하세요.
+sector.origin.description = �당한 �� 존재하는 마지막 지역입니다.\n 모든 연구를 마쳤으니 오� 모든 �� 코어를 파괴하는 �만 집중하세요.
+
+status.burning.name = 발화
+status.freezing.name = 빙결
+status.wet.name = 젖�
+status.muddy.name = 질척해�
+status.melting.name = 융해
+status.sapped.name = 피로
+status.electrified.name = 과전류
+status.spore-slowed.name = ����
+status.tarred.name = 침유�
+status.overdrive.name = 과부하
+status.overclock.name = 가�화
+status.shocked.name = �전
+status.blasted.name = 파�
+status.unmoving.name = 멈춤
+status.boss.name = 수호�
 
 settings.language = 언어
 settings.data = 게임 ��터
-settings.reset = 설정 초기화
-settings.rebind = 조작키 설정
-settings.resetKey = 조작키 설정 초기화
+settings.reset = 기본값으로 초기화
+settings.rebind = 설정
+settings.resetKey = 초기화
 settings.controls = ì¡°ìž‘
 settings.game = 게임
 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 = 저장 초기화
 settings.clearresearch = 연구 초기화
 settings.clearresearch.confirm = 정�로 모든 연구를 삭제하시겠습니까?
 settings.clearcampaignsaves = 캠페� 맵 초기화
 settings.clearcampaignsaves.confirm = 정�로 캠페�� 초기화하시겠습니까?
-paused = [accent]< �시정지 >
+paused = [accent]< �시정지 >[]
 clear = 초기화
-banned = [scarlet]차단�
+banned = [scarlet]금지�
+unsupported.environment = [scarlet]지��지 않는 환경[]
 yes = O
 no = X
 info.title = ì •ë³´
-error.title = [scarlet]오류가 발�했습니다.
-error.crashtitle = 오류가 발�했습니다.
-unit.nobuild = [scarlet]건설 불가
-lastaccessed = [lightgray]마지막 조작: {0}
-block.unknown = [lightgray]???
+error.title = [scarlet]오류가 발�했습니다[]
+error.crashtitle = 오류가 발�했습니다
+unit.nobuild = [scarlet]건설 불가[]
+lastaccessed = [lightgray]마지막 접근: {0}[]
+lastcommanded = [lightgray]마지막 명령어: {0}
+block.unknown = [lightgray]???[]
 
+stat.showinmap = <맵� 먼저 불러와야 합니다>
 stat.description = 특성
 stat.input = ìž…ë ¥
 stat.output = 출력
+stat.maxefficiency = 최대 효율
 stat.booster = 가�
 stat.tiles = 필요한 타�
-stat.affinities = 친화력
-stat.powercapacity = 전력량
-stat.powershot = 전력량/발
-stat.damage = 공격력
-stat.targetsair = 공중 공격
-stat.targetsground = 지� 공격
+stat.affinities = 작용 가능
+stat.opposites = �성
+stat.powercapacity = 전력 용량
+stat.powershot = 전력/발
+stat.damage = 피해량
+stat.targetsair = 공중 조준
+stat.targetsground = 지� 조준
 stat.itemsmoved = �� ��
-stat.launchtime = 발사 간격
+stat.launchtime = 출격 간격
 stat.shootrange = 사거리
 stat.size = �기
 stat.displaysize = 화면 �기
-stat.liquidcapacity = 액체 수용량
+stat.liquidcapacity = 액체 용량
 stat.powerrange = 전선 길�
-stat.linkrange = �지 길�
+stat.linkrange = 연결 길�
 stat.instructions = 연산 ��
-stat.powerconnections = 최대 연결 개수
+stat.powerconnections = 최대 연결
 stat.poweruse = 전력 요구량
-stat.powerdamage = 전력량/피해량
-stat.itemcapacity = �� 수용량
-stat.memorycapacity = 최대 변수 개수
-stat.basepowergeneration = 기본 발전량
+stat.powerdamage = 전력/피해량
+stat.itemcapacity = �� 용량
+stat.memorycapacity = 변수 용량
+stat.basepowergeneration = 기본 전력 발전량
 stat.productiontime = 소요 시간
-stat.repairtime = 건물 완전 복구 시간
+stat.repairtime = 건물 완전 수리 시간
+stat.repairspeed = 수리 ��
 stat.weapons = 무기
 stat.bullet = 탄환
+stat.moduletier = 모듈 등급
+stat.unittype = 유닛 유형
 stat.speedincrease = �� �가
 stat.range = 사거리
-stat.drilltier = 채굴 가능 ��
+stat.drilltier = 채굴 가능
 stat.drillspeed = 기본 채굴 ��
 stat.boosteffect = 버프 효과
 stat.maxunits = 최대 유닛 수
 stat.health = ì²´ë ¥
+stat.armor = ë°©ì–´ë ¥
 stat.buildtime = 건설 시간
-stat.maxconsecutive = 최대 체� 길�
+stat.maxconsecutive = 최대 체�
 stat.buildcost = 건설 비용
 stat.inaccuracy = 오차�
-stat.shots = 발사 당 탄
-stat.reload = 발/초
+stat.shots = 발사 수
+stat.reload = 발사 주기
 stat.ammo = 탄약
-stat.shieldhealth = 보호막 체력
+stat.shieldhealth = 보호막 내구�
 stat.cooldowntime = 쿨타임
 stat.explosiveness = �발성
 stat.basedeflectchance = 기본 반사 확률
-stat.lightningchance = 전격 확률
-stat.lightningdamage = 전격 공격량
-stat.flammability = 휘발성
+stat.lightningchance = 전격 �성 확률
+stat.lightningdamage = 전격 피해량
+stat.flammability = �화성
 stat.radioactivity = 방사성
-stat.heatcapacity = 열용량
+stat.charge = 과충전율
+stat.heatcapacity = 비열
 stat.viscosity = �성
 stat.temperature = 온�
 stat.speed = ��
 stat.buildspeed = 건설 ��
 stat.minespeed = 채굴 ��
-stat.minetier = 채굴 티어
-stat.payloadcapacity = 화물 수용량
-stat.commandlimit = 지휘 한계
+stat.minetier = 채굴 등급
+stat.payloadcapacity = 화물 용량
 stat.abilities = 능력
-stat.canboost = 부스터
+stat.canboost = �륙 가능
 stat.flying = 비행
 stat.ammouse = 탄약 사용
+stat.ammocapacity = 탄약 용량
+stat.damagemultiplier = 피해량 배수
+stat.healthmultiplier = 체력 배수
+stat.speedmultiplier = ���� 배수
+stat.reloadmultiplier = 재장전 배수
+stat.buildspeedmultiplier = 건설�� 배수
+stat.reactive = 작용 받�
+stat.immunities = �태�� 면역
+stat.healing = 회복량
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = 보호막 필드
+ability.forcefield.description = 탄약� �수하는 보호막� 만들어냄
 ability.repairfield = 수리 필드
+ability.repairfield.description = 근처 유닛� 수리함
 ability.statusfield = �태�� 필드
-ability.unitspawn = {0} 공장
+ability.statusfield.description = 근처 유닛� �태 효과를 제공함
+ability.unitspawn = 공장
+ability.unitspawn.description = 유닛� �산함
 ability.shieldregenfield = 방어막 복구 필드
+ability.shieldregenfield.description = 근처 유닛� 방어막� 재�성함
 ability.movelightning = 가� 전격
+ability.movelightning.description = ��하면서 번개를 방출함
+ability.armorplate = 장갑�
+ability.armorplate.description = 사격 시 받는 피해가 �소�
+ability.shieldarc = 호 보호막
+ability.shieldarc.description = 탄약� �수하는 호 형태� 보호막� 만들어냄
+ability.suppressionfield = 재�성 억제 필드
+ability.suppressionfield.description = 근처 수리 건물� 잠��안 억제함
+ability.energyfield = �너지 필드
+ability.energyfield.description = 근처 �� �전시킴
+ability.energyfield.healdescription = 근처 ��게 전기 충격� 주고 아군� 치료함
+ability.regen = 재�
+ability.regen.description = 시간� 지남� 따� 스스로 체력� 재�함
+ability.liquidregen = 액체 �수
+ability.liquidregen.description = 액체를 �수하여 스스로를 치유함
+ability.spawndeath = 스� 죽�
+ability.spawndeath.description = 사� 시 유닛� 방출함
+ability.liquidexplode = 유출 죽�
+ability.liquidexplode.description = 사� 시 액체를 ��
 
-bar.drilltierreq = � 좋� 드릴� 필요
+ability.stat.firingrate = [stat]{0}/초[lightgray] 발사 ��
+ability.stat.regen = [stat]{0}[lightgray] ì²´ë ¥/ì´ˆ
+ability.stat.pulseregen = [stat]{0}[lightgray] 체력/파�
+ability.stat.shield = [stat]{0}[lightgray] 실드
+ability.stat.repairspeed = [stat]{0}/초[lightgray] 수리 ��
+ability.stat.slurpheal = [stat]{0}[lightgray] 체력/액체 단위
+ability.stat.cooldown = [stat]{0} 초[lightgray] 쿨타임
+ability.stat.maxtargets = [stat]{0}[lightgray] 최대 목표
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] �� 유형 회복량
+ability.stat.damagereduction = [stat]{0}%[lightgray] 피해 �소
+ability.stat.minspeed = [stat]{0} tiles/초[lightgray] 최소 ��
+ability.stat.duration = [stat]{0} 초[lightgray] 지� 시간
+ability.stat.buildtime = [stat]{0} 초[lightgray] 건설 시간
+
+bar.onlycoredeposit = 코어�만 투입할 수 있습니다
+bar.drilltierreq = � 좋� 드릴 필요
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = �� 부족
-bar.corereq = 코어 필요
+bar.corereq = 기본 코어 필요
+bar.corefloor = 코어 구역 타� 필요
+bar.cargounitcap = 화물 용량 최대치 �달
 bar.drillspeed = 드릴 ��: {0}/s
 bar.pumpspeed = 펌프 ��: {0}/s
 bar.efficiency = 효율: {0}%
+bar.boost = 가�: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = ì „ë ¥: {0}/s
 bar.powerstored = 저장량: {0}/{1}
 bar.poweramount = ì „ë ¥: {0}
@@ -730,69 +1116,92 @@ bar.capacity = 용량: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = ì•¡ì²´
 bar.heat = 발열
+bar.cooldown = Cooldown
+bar.instability = 불안정
+bar.heatamount = ì—´: {0}
+bar.heatpercent = ì—´: {0} ({1}%)
 bar.power = ì „ë ¥
-bar.progress = �산 진행�
+bar.progress = 건설 진행�
+bar.loadprogress = 진행�
+bar.launchcooldown = 발사 대기시간
 bar.input = ìž…ë ¥
 bar.output = 출력
+bar.strength = [stat]{0}[lightgray]x 치료 ��[][]
 
-units.processorcontrol = [lightgray]프로세서 제어 중
+units.processorcontrol = [lightgray]프로세서 제어�[]
 
-bullet.damage = [stat]{0}[lightgray] �미지
-bullet.splashdamage = [stat]{0}[lightgray] 범위 �미지 ~ [stat] {1}[lightgray] 타�
-bullet.incendiary = [stat]ë°©í™”
-bullet.sapping = [stat]�혈
-bullet.homing = [stat]유�
-bullet.shock = [stat]전격
-bullet.frag = [stat]파편
-bullet.buildingdamage = [stat]{0}%[lightgray] 건물 피해량
-bullet.knockback = [stat]{0}[lightgray] 넉백
-bullet.pierce = [stat]{0}[lightgray]배 관통
-bullet.infinitepierce = [stat]관통
-bullet.healpercent = [stat]{0}[lightgray]% 회복
-bullet.freezing = [stat]빙결
-bullet.tarred = [stat]타르
-bullet.multiplier = [stat]{0}[lightgray]배 탄약 배수 
-bullet.reload = [stat]{0}[lightgray]배 발사 ��
+bullet.damage = [stat]{0}[lightgray] 피해량[][]
+bullet.splashdamage = [stat]{0}[lightgray] 범위 피해량 ~ [stat]{1}[lightgray] 타�[][][][]
+bullet.incendiary = [stat]ë°©í™”[]
+bullet.homing = [stat]유�[]
+bullet.armorpierce = [stat]방어 관통
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] 수리 억제 ~ [stat]{1}[lightgray] 타�
+bullet.interval = [stat]{0}/sec[lightgray] 간격 탄환:
+bullet.frags = [stat]{0}[lightgray]개 파편 탄환:[][]
+bullet.lightning = [stat]{0}[lightgray]x 전격 ~ [stat]{1}[lightgray] 피해량[][][][]
+bullet.buildingdamage = [stat]{0}%[lightgray] 건물 피해량[][]
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] 넉백[][]
+bullet.pierce = [stat]{0}[lightgray]번 관통[][]
+bullet.infinitepierce = [stat]관통[]
+bullet.healpercent = [stat]{0}%[lightgray] 회복[][]
+bullet.healamount = [stat]{0}[lightgray] �접 수리
+bullet.multiplier = [stat]{0}[lightgray]배 탄약 배수[][]
+bullet.reload = [stat]{0}%[lightgray] 발사 ��[][]
+bullet.range = [stat]{0}[lightgray]블� 추가 범위
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = 블�
 unit.blockssquared = 블�²
 unit.powersecond = ì „ë ¥/ì´ˆ
+unit.tilessecond = 타�/초
 unit.liquidsecond = ì•¡ì²´/ì´ˆ
-unit.itemssecond = 개/초
+unit.itemssecond = ��/초
 unit.liquidunits = ì•¡ì²´
 unit.powerunits = ì „ë ¥
+unit.heatunits = 열 단위
 unit.degrees = �
 unit.seconds = ì´ˆ
 unit.minutes = 분
 unit.persecond = /ì´ˆ
 unit.perminute = /분
 unit.timesspeed = x ë°°
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = 보호막 체력
 unit.items = ��
 unit.thousands = k
 unit.millions = m
 unit.billions = b
+unit.shots = shots
 unit.pershot = /발
-category.purpose = 기능 / 목�
+category.purpose = 목�
 category.general = �반
 category.power = ì „ë ¥
 category.liquids = ì•¡ì²´
 category.items = ��
 category.crafting = 입력/출력
 category.function = 기능
-category.optional = 보조 ��
+category.optional = 선�� 향�
+setting.alwaysmusic.name = 항� �악 재�
+setting.alwaysmusic.description = � 기능� 활성화하면, 게임 내�서 �악� 항� 반복 재��니다.\n비활성화하면, 무작위 간격으로만 재��니다.
+setting.skipcoreanimation.name = 코어 발사/착륙 애니메�션 건너뛰기
 setting.landscape.name = 가로화면 잠금
 setting.shadows.name = 그림�
 setting.blockreplace.name = �� 블� 제안
 setting.linear.name = 선형 필터�
-setting.hints.name = 힌트
-setting.flow.name = �� �름량 표시
+setting.hints.name = 힌트 표시
+setting.logichints.name = 로� 힌트 표시
 setting.backgroundpause.name = 백그�운드�서 �시정지
 setting.buildautopause.name = 건설 �� �시정지
+setting.doubletapmine.name = 연� 터치로 채광
+setting.commandmodehold.name = 키를 누른 �태로 명령
+setting.distinctcontrolgroups.name = 유닛당 하나� 제어 그룹으로 제한
+setting.modcrashdisable.name = 로딩 중 충� 시 모드 비활성화
 setting.animatedwater.name = 액체 애니메�션 효과
 setting.animatedshields.name = 보호막 애니메�션 효과
-setting.antialias.name = 위신호 제거 필터[lightgray] (재시작 필요)[]
 setting.playerindicators.name = 플레�어 위치 표시기
 setting.indicators.name = � 위치 표시기
 setting.autotarget.name = �� 조준
@@ -801,49 +1210,56 @@ setting.touchscreen.name = 터치스�린 조작
 setting.fpscap.name = 최대 FPS
 setting.fpscap.none = 없�
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI 스케��[lightgray] (재시작 필요)[]
+setting.uiscale.name = UI 스케��
+setting.uiscale.description = �용하려면 재시작� 필요합니다.
 setting.swapdiagonal.name = 항� 대�선 배치
-setting.difficulty.training = 훈련
-setting.difficulty.easy = 무난
-setting.difficulty.normal = 보통
-setting.difficulty.hard = 혼�
-setting.difficulty.insane = 박멸
-setting.difficulty.name = 난��:
 setting.screenshake.name = 화면 �들림
-setting.effects.name = 효과 보임
+setting.bloomintensity.name = 광� 세기
+setting.bloomblur.name = 광� 번�
+setting.effects.name = 입� 효과 표시
 setting.destroyedblocks.name = 파괴� 블� 표시
 setting.blockstatus.name = 블� �태 표시
-setting.conveyorpathfinding.name = 컨베�어를 배치할 때 ��으로 경로 찾기
+setting.conveyorpathfinding.name = 컨베�어 배치 길찾기
 setting.sensitivity.name = 컨트롤러 ��
 setting.saveinterval.name = 저장 간격
-setting.seconds = {0}ì´ˆ
-setting.milliseconds = {0}ms
+setting.seconds = {0} ì´ˆ
+setting.milliseconds = {0} 밀리초
 setting.fullscreen.name = 전체 화면
-setting.borderlesswindow.name = 테�리 없는 창 모드[lightgray] (재시작� 필요할 수 있습니다)
+setting.borderlesswindow.name = 테�리 없는 창 모드
+setting.borderlesswindow.name.windows = 테�리 없는 전체화면
+setting.borderlesswindow.description = �용하려면 재시작� 필요할 수� 있습니다.
 setting.fps.name = FPS와 핑 표시
+setting.console.name = 콘솔 활성화
 setting.smoothcamera.name = 부드러운 시�
 setting.vsync.name = 수� �기화
 setting.pixelate.name = 픽셀화
 setting.minimap.name = 미니맵 표시
 setting.coreitems.name = 코어� 있는 �� 표시
 setting.position.name = 플레�어 위치 표시
+setting.mouseposition.name = 마우스 좌표 표시
 setting.musicvol.name = �악 �기
 setting.atmosphere.name = 행성 배경화면 표시
+setting.drawlight.name = 어�움, 광� 표시
 setting.ambientvol.name = 배경� �기
 setting.mutemusic.name = �소거
 setting.sfxvol.name = 효과� �기
 setting.mutesound.name = 소리 �기
 setting.crashreport.name = �명으로 오류 보고서 �� 전송
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = �� 저장 활성화
-setting.publichost.name = 멀티플레� 공용 서버로 표시
+setting.steampublichost.name = 공개 게임 가시성
 setting.playerlimit.name = 플레�어 제한
 setting.chatopacity.name = 채팅창 투명�
 setting.lasersopacity.name = 전선 투명�
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = 터� 투명�
 setting.playerchat.name = 채팅 ��선 표시
 setting.showweather.name = 날씨 그래픽 표시
-public.confirm = 게임� 모��게 공개하시겠습니까?\n[accent]모든 플레�어가 게임� 참여할 수 있습니다.\n[lightgray]설정->게임->멀티플레� 공용 서버로 표시�서 나중� 변경할 수 있습니다.\n\n[sky]번역� 추가[]\n[accent]친구�리 하려고 � 기능� 활성화 한 뒤�, 친구 외� 다른 플레�어가 들어왔� 때\n해당 플레�어를 차단하는 행위는 비매너를 넘어서는 얌체 행위 그 �체입니다.\n정�로 [scarlet]많� 다른 플레�어들� 오길 �한다[]면 확�하세요.
-public.confirm.really = [red]친구하고 플레� 하고 싶으면 [scarlet]공용 서버[] 대신� [green]친구 초대[] 를 사용하세요. 정�로 [scarlet]공용 서버[] 를 열겠습니까?[]
+setting.hidedisplays.name = 로� 디스플레� 숨김
+setting.macnotch.name = 노치를 표시하�� �터페�스 조정
+setting.macnotch.description = �용하려면 재시작� 필요합니다.
+steam.friendsonly = 친구 전용
+steam.friendsonly.tooltip = 게임� 스팀 친구만 접�할 수 있는가� 대한 여부입니다.체�를 해제하면, 누구나 접�할 수 있습니다.
 public.beta = 베타 버전� 게임� 공개 서버를 만들 수 없습니다.
 uiscale.reset = UI 스케�� 변경�었습니다.\n"확�"버튼� 눌러 저장하세요.\n[accent] {0}[][scarlet]초 후� 예전 설정으로 ��리고 게임� 종료합니다...
 uiscale.cancel = 취소 후 나가기
@@ -852,12 +1268,9 @@ keybind.title = 조작키 설정
 keybinds.mobile = [scarlet]대부분� 조작키 설정� 모바��서 작�하지 않습니다. 기본 ��만 지��니다.
 category.general.name = �반
 category.view.name = 보기
+category.command.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 = 유닛 제어
@@ -866,18 +1279,42 @@ keybind.press = 키를 누르세요...
 keybind.press.axis = 마우스 휠 �는 키를 누르세요...
 keybind.screenshot.name = 맵 스�린 캡처
 keybind.toggle_power_lines.name = 전선 가시� 설정
-keybind.toggle_block_status.name = 블� �태 가시� 
+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.pan.name = 팬 보기
+keybind.boost.name = �륙
+keybind.command_mode.name = 명령 모드
+keybind.command_queue.name = 유닛 명령 대기
+keybind.create_control_group.name = 컨트롤 그룹 만들기
+keybind.cancel_orders.name = 명령 취소
+
+keybind.unit_stance_shoot.name = 유닛 명령: 사격
+keybind.unit_stance_hold_fire.name = 유닛 명령: 사격 중지
+keybind.unit_stance_pursue_target.name = 유닛 명령: 타겟 추격
+keybind.unit_stance_patrol.name = 유닛 명령: 정찰
+keybind.unit_stance_ram.name = 유닛 명령: �격
+
+keybind.unit_command_move.name = 유닛 제어: ��
+keybind.unit_command_repair.name = 유닛 제어: 수리
+keybind.unit_command_rebuild.name = 유닛 제어: 재건
+keybind.unit_command_assist.name = 유닛 제어: 플레�어 지�
+keybind.unit_command_mine.name = 유닛 제어: 채굴
+keybind.unit_command_boost.name = 유닛 제어: 비행
+keybind.unit_command_load_units.name = 유닛 제어: 유닛 �재
+keybind.unit_command_load_blocks.name = 유닛 제어: 블� �재
+keybind.unit_command_unload_payload.name = 유닛 제어: 화물 투하
+keybind.unit_command_enter_payload.name = 유닛 제어: 화물 건물� 착륙/진입
+keybind.unit_command_loop_payload.name = 유닛 제어: 유닛 반복 운반
+
+keybind.rebuild_select.name = 지역 재건
 keybind.schematic_select.name = �역 설정
 keybind.schematic_menu.name = 설계� 메뉴
 keybind.schematic_flip_x.name = 설계� X축 뒤집기
 keybind.schematic_flip_y.name = 설계� Y축 뒤집기
-keybind.category_prev.name = �전 목�
-keybind.category_next.name = 다� 목�
+keybind.category_prev.name = �전 카테고리
+keybind.category_next.name = 다� 카테고리
 keybind.block_select_left.name = 블� 왼쪽 선�
 keybind.block_select_right.name = 블� 오른쪽 선�
 keybind.block_select_up.name = 블� 위쪽 선�
@@ -892,23 +1329,25 @@ keybind.block_select_07.name = 카테고리/블� 선� 7
 keybind.block_select_08.name = 카테고리/블� 선� 8
 keybind.block_select_09.name = 카테고리/블� 선� 9
 keybind.block_select_10.name = 카테고리/블� 선� 10
-keybind.fullscreen.name = 전체 화면
+keybind.fullscreen.name = 전체 화면 전환
 keybind.select.name = 선�/공격
 keybind.diagonal_placement.name = 대�선 설치
 keybind.pick.name = 블� 선�
 keybind.break_block.name = 블� 파괴
+keybind.select_all_units.name = 전체 유닛 선�
+keybind.select_all_unit_factories.name = 전체 유닛 공장 선�
 keybind.deselect.name = 선�해제
 keybind.pickupCargo.name = 화물 집기
 keybind.dropCargo.name = 화물 내려놓기
-keybind.command.name = 명령
-keybind.shoot.name = 사격
-keybind.zoom.name = 확대
+keybind.shoot.name = 발사
+keybind.zoom.name = 확대/축소
 keybind.menu.name = 메뉴
 keybind.pause.name = �시중지
 keybind.pause_building.name = 건설 �시정지/재개
 keybind.minimap.name = 미니맵
 keybind.planet_map.name = 행성 지�
 keybind.research.name = 연구
+keybind.block_info.name = 블� 정보
 keybind.chat.name = 채팅
 keybind.player_list.name = 플레�어 목�
 keybind.console.name = 콘솔
@@ -918,64 +1357,117 @@ keybind.toggle_menus.name = 메뉴 보�기/숨기기
 keybind.chat_history_prev.name = �전 채팅 기�
 keybind.chat_history_next.name = 다� 채팅 기�
 keybind.chat_scroll.name = 채팅 스�롤
-keybind.chat_mode = 대화 대� 변경
-keybind.drop_unit.name = 유닛 떨구기
+keybind.chat_mode.name = 채팅 모드 변경
+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.invaliddata = 잘못� �립보드 ��터 입니다.
+rules.hidebannedblocks = 금지� 블� 숨기기
 rules.infiniteresources = 무한 ��
+rules.onlydepositcore = 오� 코어�만 투입 가능
+rules.derelictrepair = 잔해 블� 수리 허용
 rules.reactorexplosions = ��로 �발 허용
+rules.coreincinerates = 코어 방화 비허용
+rules.disableworldprocessors = 월드 프로세서 비활성화
 rules.schematic = 설계� 허용
 rules.wavetimer = 시간 제한� 있는 단계
-rules.waves = �반 단계
+rules.wavesending = 단계 넘김
+rules.allowedit = 규칙 편집 허용
+rules.allowedit.info = � 기능� 활성화하면, 플레�어는 �시 정지 메뉴� 왼쪽 하단� 있는 버튼� 통해 게임 내�서 규칙� 편집할 수 있습니다.
+rules.alloweditworldprocessors = 월드 프로세서 편집 허용
+rules.alloweditworldprocessors.info = � 기능� 활성화하면 편집기 외부�서� 월드 로� 블�� 배치하고 편집할 수 있습니다.
+rules.waves = 단계
+rules.airUseSpawns = 공중 유닛 스� 지� 사용
 rules.attack = 공격 모드
-rules.buildai = AI 건설
-rules.enemyCheat = 무한 AI (빨간팀) ��
+rules.buildai = 기지 건설 AI
+rules.buildaitier = 건설 AI 등급
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS 공격 AI
+rules.rtsai.campaign.info = 공격 맵�서는 유닛� 그룹화하여 �욱 지능�� 방�으로 플레�어 기지를 공격합니다.
+rules.rtsminsquadsize = 최소 부대 규모
+rules.rtsmaxsquadsize = 최대 부대 규모
+rules.rtsminattackweight = 최소 공격 중량
+rules.cleanupdeadteams = 패배한 팀 건물 정리하기 (PvP)
+rules.corecapture = 코어 파괴 시 �령
+rules.polygoncoreprotection = 다�형 코어 건설 금지구역
+rules.placerangecheck = 배치 거리 확�
+rules.enemyCheat = � AI 무한��
 rules.blockhealthmultiplier = 블� 체력 배수
-rules.blockdamagemultiplier = 블� 공격력 배수
-rules.unitbuildspeedmultiplier = 유닛 �산 �� 배수
+rules.blockdamagemultiplier = 블� 피해량 배수
+rules.unitbuildspeedmultiplier = 유닛 �산�� 배수
+rules.unitcostmultiplier = 유닛 비용 배수
 rules.unithealthmultiplier = 유닛 체력 배수
-rules.unitdamagemultiplier = 유닛 공격력 배수
-rules.enemycorebuildradius = � 코어 건설 금지구역 범위:[lightgray] (타�)
+rules.unitdamagemultiplier = 유닛 피해량 배수
+rules.unitcrashdamagemultiplier = 유닛 파� 피해량 배수
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = 태양광 전력 배수
+rules.unitcapvariable = 코어 유닛 수 제한 추가
+rules.unitpayloadsexplode = 들어올린 화물 유닛과 함께 �발
+rules.unitcap = 기본 유닛 제한
+rules.limitarea = 맵 �역 제한
+rules.enemycorebuildradius = � 코어 건설금지 범위:[lightgray] (타�)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = 단계 간격:[lightgray] (초)
-rules.buildcostmultiplier = 건설 ��소모 배수
+rules.initialwavespacing = 첫 단계 간격:[lightgray] (초)
+rules.buildcostmultiplier = 건설 비용 배수
 rules.buildspeedmultiplier = 건설 �� 배수
-rules.deconstructrefundmultiplier = 해체 환불 배수
+rules.deconstructrefundmultiplier = 철거 환불 배수
 rules.waitForWaveToEnd = 한 단계가 �날때까지 대기
+rules.wavelimit = 특정 단계 �후 맵 종료
 rules.dropzoneradius = 스� 구역 범위: [lightgray] (타�)
-rules.unitammo = 탄약 필요
+rules.unitammo = 유닛 탄약 필요
+rules.enemyteam = � 팀
+rules.playerteam = 플레�어 팀
 rules.title.waves = 단계
-rules.title.resourcesbuilding = �� & 건축
+rules.title.resourcesbuilding = �� & 건물
 rules.title.enemy = ì �
-rules.title.unit = 유닛
+rules.title.unit = 기체
 rules.title.experimental = 실험�� 기능
 rules.title.environment = 환경
-rules.lighting = 조명
-rules.enemyLights = �대�게 조명
-rules.fire = ë°©í™”
-rules.explosions = 블�/유닛 �발 �미지
-rules.ambientlight = �연 조명
-rules.weather = 날씨
+rules.title.teams = 팀
+rules.title.planet = 행성
+rules.lighting = 조명 표시
+rules.fog = 전장� 안개
+rules.invasions = � 지역 침공
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = � 스� 표시
+rules.randomwaveai = 무작위 단계 AI
+rules.fire = 방화 허용
+rules.anyenv = <모�>
+rules.explosions = 블�/유닛 �발 피해
+rules.ambientlight = 주변광
+rules.weather = 날씨 추가
 rules.weather.frequency = 빈�:
 rules.weather.always = 항�
 rules.weather.duration = 지� 시간:
 
+rules.randomwaveai.info = 단계� �성� 유닛� 코어 �는 전력 �산기를 공격하는 대신 무작위 구조물� 공격하게 �니다.
+rules.placerangecheck.info = 플레�어가 � 건물 근처� 건설 불가 구역� �성합니다. 만�, 플레�어가 �탑� 건설하고� 할 경우 반경� �가�어 � 건물� �탑� 사정거리� 닿지 않게 �니다.
+rules.onlydepositcore.info = 코어를 제외한 어떠한 건물�� ��� 투하할 수 없게 만듭니다. 
+
 content.item.name = ��
 content.liquid.name = ì•¡ì²´
-content.unit.name = 유닛
+content.unit.name = 기체
 content.block.name = 블�
+content.status.name = �태 ��
 content.sector.name = 지역
+content.team.name = 파벌
 
+wallore = (ë²½)
+#굳� �역� 안해� �기� 설금� 해당 명칭� 유지합니다
 item.copper.name = 구리
 item.lead.name = ë‚©
 item.coal.name = �탄
@@ -984,18 +1476,32 @@ item.titanium.name = 티타늄
 item.thorium.name = 토륨
 item.silicon.name = 실리콘
 item.plastanium.name = 플�스터늄
-item.phase-fabric.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.scrap.name = ê³ ì² 
+item.fissile-matter.name = 핵분열 물질
+item.beryllium.name = 베릴륨
+item.tungsten.name = 텅스�
+item.oxide.name = 산화물
+item.carbide.name = 탄화물
+item.dormant-cyst.name = 휴면 낭종
+
 liquid.water.name = 물
 liquid.slag.name = 광재
 liquid.oil.name = �유
 liquid.cryofluid.name = 냉�수
+liquid.neoplasm.name = 신�물
+liquid.arkycite.name = 아르키사�트
+liquid.gallium.name = 갈륨
+liquid.ozone.name = 오존
+liquid.hydrogen.name = 수소
+liquid.nitrogen.name = 질소
+liquid.cyanogen.name = 시아노�
 
 unit.dagger.name = 대거
 unit.mace.name = 메�스
@@ -1023,6 +1529,11 @@ unit.minke.name = 민케
 unit.bryde.name = 브��드
 unit.sei.name = 세�
 unit.omura.name = 오무�
+unit.retusa.name = 레투사
+unit.oxynoe.name = 옥시노
+unit.cyerce.name = 사�어스
+unit.aegires.name = �어리어스
+unit.navanax.name = 나바낙스
 unit.alpha.name = 알파
 unit.beta.name = 베타
 unit.gamma.name = �마
@@ -1031,13 +1542,36 @@ unit.reign.name = 레�
 unit.vela.name = 벨�
 unit.corvus.name = 코르버스
 
-block.resupply-point.name = 보급 지�
+unit.stell.name = 스텔
+unit.locus.name = 로커스
+unit.precept.name = 프리셉트
+unit.vanquish.name = 뱅퀴시
+unit.conquer.name = 컨커
+unit.merui.name = 메루�
+unit.cleroi.name = �레로�
+unit.anthicus.name = 안티쿠스
+unit.tecta.name = �타
+unit.collaris.name = 콜�리스
+unit.elude.name = �루드
+unit.avert.name = 어버트
+unit.obviate.name = 오비��트
+unit.quell.name = 퀠
+unit.disrupt.name = 디스럽트
+unit.evoke.name = �보�
+unit.incite.name = �사�트
+unit.emanate.name = �머네�트
+unit.manifold.name = 매니�드
+unit.assembly-drone.name = 조립 드론
+unit.latum.name = �툼
+unit.renale.name = 리네�
+
 block.parallax.name = 패럴랙스
 block.cliff.name = 언�
-block.sand-boulder.name = 사암
-block.basalt-boulder.name = 현무암
+block.sand-boulder.name = 사암 바위
+block.basalt-boulder.name = 현무암 바위
 block.grass.name = 잔디
-block.slag.name = ìš©ì•”
+block.molten-slag.name = ìš©ì•”
+block.pooled-cryofluid.name = 냉�수
 block.space.name = 우주
 block.salt.name = 소금
 block.salt-wall.name = 소금 벽
@@ -1065,24 +1599,28 @@ block.graphite-press.name = �연 압축기
 block.multi-press.name = 다중 압축기
 block.constructing = {0} [lightgray](제작중)
 block.spawn.name = � 소환지�
+block.remove-wall.name = 벽 제거
+block.remove-ore.name = 광� 제거
 block.core-shard.name = 코어: 조�
 block.core-foundation.name = 코어: 기반
 block.core-nucleus.name = 코어: 핵심
-block.deepwater.name = 깊� 물
-block.water.name = 물
+block.deep-water.name = 깊� 물
+block.shallow-water.name = 물
 block.tainted-water.name = 오염� 물
+block.deep-tainted-water.name = 오염� 깊� 물
 block.darksand-tainted-water.name = 오염� 젖� 검� 모래
 block.tar.name = 타르
 block.stone.name = 바위
-block.sand.name = 모래
+block.sand-floor.name = 모래
 block.darksand.name = 검� 모래
 block.ice.name = 얼�
 block.snow.name = 눈
-block.craters.name = 구��
+block.crater-stone.name = 구��
 block.sand-water.name = 젖� 모래
 block.darksand-water.name = 젖� 검� 모래
 block.char.name = 숯
 block.dacite.name = ��안산암
+block.rhyolite.name = 유문암
 block.dacite-wall.name = ��안산암 벽
 block.dacite-boulder.name = ��안산암
 block.ice-snow.name = 얼�눈
@@ -1100,6 +1638,7 @@ block.spore-cluster.name = ��낭
 block.metal-floor.name = 금�제 바닥
 block.metal-floor-2.name = 금� 타� 2
 block.metal-floor-3.name = 금� 타� 3
+block.metal-floor-4.name = 금� 타� 4
 block.metal-floor-5.name = 금� 타� 5
 block.metal-floor-damaged.name = ��� 금� 타�
 block.dark-panel-1.name = 검� 패� 1
@@ -1118,8 +1657,8 @@ block.titanium-wall.name = 티타늄 벽
 block.titanium-wall-large.name = 대형 티타늄 벽
 block.plastanium-wall.name = 플�스터늄 벽
 block.plastanium-wall-large.name = 대형 플�스터늄 벽
-block.phase-wall.name = 메타 벽
-block.phase-wall-large.name = 대형 메타 벽
+block.phase-wall.name = 위� 벽
+block.phase-wall-large.name = 대형 위� 벽
 block.thorium-wall.name = 토륨 벽
 block.thorium-wall-large.name = 대형 토륨 벽
 block.door.name = 문
@@ -1139,13 +1678,16 @@ block.distributor.name = 대형 분배기
 block.sorter.name = í•„í„°
 block.inverted-sorter.name = 반전 필터
 block.message.name = 메모 블�
+block.reinforced-message.name = 보강� 메모 블�
+block.world-message.name = 월드 메모 블�
+block.world-switch.name = 월드 스위치
 block.illuminator.name = 조명
 block.overflow-gate.name = �화 필터
 block.underflow-gate.name = 불�화 필터
 block.silicon-smelter.name = 실리콘 제련소
-block.phase-weaver.name = 메타 합성기
+block.phase-weaver.name = 위� 제조기
 block.pulverizer.name = 분쇄기
-block.cryofluid-mixer.name = 냉�수 제조기
+block.cryofluid-mixer.name = 냉�수 혼합기
 block.melter.name = 융해기
 block.incinerator.name = 소�로
 block.spore-press.name = �� 압축기
@@ -1154,7 +1696,7 @@ block.coal-centrifuge.name = �탄 정제기
 block.power-node.name = 전력 노드
 block.power-node-large.name = 대형 전력 노드
 block.surge-tower.name = 설금 타워
-block.diode.name = 전력 비�기
+block.diode.name = 다�오드
 block.battery.name = 배터리
 block.battery-large.name = 대형 배터리
 block.combustion-generator.name = 화력 발전기
@@ -1172,7 +1714,7 @@ block.item-source.name = �� 공급기
 block.item-void.name = �� 소멸기
 block.liquid-source.name = 액체 공급기
 block.liquid-void.name = 액체 소멸기
-block.power-void.name = 방전장치
+block.power-void.name = 전력 소멸기
 block.power-source.name = 전력 공급기
 block.unloader.name = 언로�
 block.vault.name = 창고
@@ -1181,7 +1723,7 @@ block.tsunami.name = 쓰나미
 block.swarmer.name = 스웜
 block.salvo.name = ì‚´ë³´
 block.ripple.name = 립플
-block.phase-conveyor.name = 메타 컨베�어
+block.phase-conveyor.name = 위� 컨베�어
 block.bridge-conveyor.name = 다리 컨베�어
 block.plastanium-compressor.name = 플�스터늄 압축기
 block.pyratite-mixer.name = 파��타�트 혼합기
@@ -1190,24 +1732,26 @@ block.solar-panel.name = 태양 전지�
 block.solar-panel-large.name = 대형 태양 전지�
 block.oil-extractor.name = �유 추출기
 block.repair-point.name = 수리 지�
+block.repair-turret.name = 수리 �탑
 block.pulse-conduit.name = 펄스 파�프
 block.plated-conduit.name = �금� 파�프
-block.phase-conduit.name = 메타 파�프
+block.phase-conduit.name = 위� 파�프
 block.liquid-router.name = 액체 분배기
 block.liquid-tank.name = 액체 탱�
+block.liquid-container.name = 액체 컨테�너
 block.liquid-junction.name = 액체 �차기
 block.bridge-conduit.name = 다리 파�프
 block.rotary-pump.name = �력 펌프
 block.thorium-reactor.name = 토륨 ��로
 block.mass-driver.name = 매스 드��버
 block.blast-drill.name = 압축 공기분사 드릴
-block.thermal-pump.name = 화력 펌프
+block.impulse-pump.name = 충격 펌프
 block.thermal-generator.name = 지열 발전기
-block.alloy-smelter.name = 설금 제련소
+block.surge-smelter.name = 설금 제련소
 block.mender.name = 멘�
 block.mend-projector.name = 수리 프로�터
 block.surge-wall.name = 설금 벽
-block.surge-wall-large.name = � 설금 벽
+block.surge-wall-large.name = 대형 설금 벽
 block.cyclone.name = 사��론
 block.fuse.name = 퓨즈
 block.shock-mine.name = 전격 지뢰
@@ -1220,26 +1764,193 @@ block.meltdown.name = 멜트다운
 block.foreshadow.name = �어��우
 block.container.name = 컨테�너
 block.launch-pad.name = 지역 �� 수송기
-block.launch-pad-large.name = 대형 지역 �� 수송기
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = 세그먼트
-block.command-center.name = 유닛 지휘소
 block.ground-factory.name = 지� 공장
 block.air-factory.name = 항공 공장
 block.naval-factory.name = 해양 공장
-block.additive-reconstructor.name = 재구성기 : Additive
-block.multiplicative-reconstructor.name = 재구성기 : Multiplicative
-block.exponential-reconstructor.name = 재구성기 : Exponential
-block.tetrative-reconstructor.name = 재구성기 : Tetrative
+block.additive-reconstructor.name = 재구성기: Additive
+block.multiplicative-reconstructor.name = 재구성기: Multiplicative
+block.exponential-reconstructor.name = 재구성기: Exponential
+block.tetrative-reconstructor.name = 재구성기: Tetrative
 block.payload-conveyor.name = 화물 컨베�어
 block.payload-router.name = 화물 분배기
+block.duct.name = �관
+block.duct-router.name = �관 분배기
+block.duct-bridge.name = �관 다리
+block.large-payload-mass-driver.name = 대형 화물 매스 드��버
+block.payload-void.name = 화물 소멸기
+block.payload-source.name = 화물 공급기
 block.disassembler.name = 광재 분해기
 block.silicon-crucible.name = 실리콘 �가니
 block.overdrive-dome.name = 대형 과부하 프로�터
-#experimental, may be removed / � 아래� 블�들� 테스트용 임시 블�들입니다. 
-block.block-forge.name = 블� 제작대
-block.block-loader.name = 블� 로�
-block.block-unloader.name = 블� 언로�
 block.interplanetary-accelerator.name = 성간 코어 가�기
+block.constructor.name = 블� 제작대
+block.constructor.description = 최대 2x2 �기� 블�� 제작합니다.
+block.large-constructor.name = 대형 블� 제작대
+block.large-constructor.description = 최대 4x4 �기� 블�� 제작합니다.
+block.deconstructor.name = 화물 분해기
+block.deconstructor.description = 블�과 기체를 분해합니다. 건설 비용� 100%를 반환합니다.
+block.payload-loader.name = 화물 로�
+block.payload-loader.description = 들어간 블�� 액체와 아�템� 저장합니다.
+block.payload-unloader.name = 화물 언로�
+block.payload-unloader.description = 들어간 블��서 액체와 아�템� 가져옵니다.
+block.heat-source.name = 열 공급기
+block.heat-source.description = 엄청난 양� 열� 출력합니다. 샌드박스 전용.
+
+#Erekir
+block.empty.name = 공백
+block.rhyolite-crater.name = 유문암 구��
+block.rough-rhyolite.name = 거친 유문암
+block.regolith.name = 표토
+block.yellow-stone.name = 노란 �
+block.carbon-stone.name = 탄소 �
+block.ferric-stone.name = 철강 �
+block.ferric-craters.name = 철강 구��
+block.beryllic-stone.name = 녹주 �
+block.crystalline-stone.name = 수정형 �
+block.crystal-floor.name = 수정 타�
+block.yellow-stone-plates.name = 황색 �조�
+block.red-stone.name = 붉� �
+block.dense-red-stone.name = 고밀� 붉� �
+block.red-ice.name = 붉� 얼�
+block.arkycite-floor.name = 아르키사�트 타�
+block.arkyic-stone.name = 아르키사�트 �
+block.rhyolite-vent.name = 유문암 분출구
+block.carbon-vent.name = 탄소 분출구
+block.arkyic-vent.name = 아르킥 분출구
+block.yellow-stone-vent.name = 노란 � 분출구
+block.red-stone-vent.name = 붉� � 분출구
+block.crystalline-vent.name = 수정형 분출구
+block.redmat.name = 붉� �
+block.bluemat.name = 푸른 �
+block.core-zone.name = 코어 구역
+block.regolith-wall.name = 표토 벽
+block.yellow-stone-wall.name = 노란 � 벽
+block.rhyolite-wall.name = 유문암 벽
+block.carbon-wall.name = 탄소 벽
+block.ferric-stone-wall.name = 철강 � 벽
+block.beryllic-stone-wall.name = 녹주 � 벽
+block.arkyic-wall.name = 아르킥 벽
+block.crystalline-stone-wall.name = 수정형 � 벽
+block.red-ice-wall.name = 붉� 얼� 벽
+block.red-stone-wall.name = 붉� � 벽
+block.red-diamond-wall.name = 붉� 다�아몬드 벽
+block.redweed.name = 붉� 잡초
+block.pur-bush.name = 보�빛 �불
+block.yellowcoral.name = 노란 산호
+block.carbon-boulder.name = 탄소 바위
+block.ferric-boulder.name = 철강 바위
+block.beryllic-boulder.name = 녹주 바위
+block.yellow-stone-boulder.name = 노란 �바위
+block.arkyic-boulder.name = 아르킥 바위
+block.crystal-cluster.name = 수정 �러스터
+block.vibrant-crystal-cluster.name = 선명한 수정 �러스터
+block.crystal-blocks.name = 수정 �어리
+block.crystal-orbs.name = 수정 구체
+block.crystalline-boulder.name = 수정같� 바위
+block.red-ice-boulder.name = 붉� 얼� 바위
+block.rhyolite-boulder.name = 유문암 바위
+block.red-stone-boulder.name = 붉� � 바위
+block.graphitic-wall.name = 탄소화 벽
+block.silicon-arc-furnace.name = 실리콘 아� 화로
+block.electrolyzer.name = ì „í•´ì¡°
+block.atmospheric-concentrator.name = 대기 �축기
+block.oxidation-chamber.name = 산화실
+block.electric-heater.name = 전기 가열기
+block.slag-heater.name = 광재 가열기
+block.phase-heater.name = 위� 가열기
+block.heat-redirector.name = 열 전송기
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = 열 분배기
+block.slag-incinerator.name = 광재 소�로
+block.carbide-crucible.name = 탄화물 �가니
+block.slag-centrifuge.name = 광재 �심분리기
+block.surge-crucible.name = 설금 �가니
+block.cyanogen-synthesizer.name = 시아노� 합성기
+block.phase-synthesizer.name = 위� 합성기
+block.heat-reactor.name = 열 반�로
+block.beryllium-wall.name = 베릴륨 벽
+block.beryllium-wall-large.name = 대형 베릴륨 벽
+block.tungsten-wall.name = 텅스� 벽
+block.tungsten-wall-large.name = 대형 텅스� 벽
+block.blast-door.name = 방�문
+block.carbide-wall.name = 탄화물 벽
+block.carbide-wall-large.name = 대형 탄화물 벽
+block.reinforced-surge-wall.name = 보강� 설금 벽
+block.reinforced-surge-wall-large.name = 보강� 대형 설금 벽
+block.shielded-wall.name = 보호� 벽
+block.radar.name = 레��
+block.build-tower.name = 건설 타워
+block.regen-projector.name = 재� 프로�터
+block.shockwave-tower.name = 충격파 타워
+block.shield-projector.name = 방어막 프로�터
+block.large-shield-projector.name = 대형 방어막 프로�터
+block.armored-duct.name = 장갑 �관
+block.overflow-duct.name = �화 �관
+block.underflow-duct.name = 불�화 �관
+block.duct-unloader.name = 언로� �관
+block.surge-conveyor.name = 설금 컨베�어
+block.surge-router.name = 설금 분배기
+block.unit-cargo-loader.name = 유닛 화물 �재소
+block.unit-cargo-unload-point.name = 유닛 화물 하역지�
+block.reinforced-pump.name = 보강� 펌프
+block.reinforced-conduit.name = 보강� 파�프
+block.reinforced-liquid-junction.name = 보강� 액체 �차기
+block.reinforced-bridge-conduit.name = 보강� 다리 파�프
+block.reinforced-liquid-router.name = 보강� 액체 분배기
+block.reinforced-liquid-container.name = 보강� 액체 컨테�너
+block.reinforced-liquid-tank.name = 보강� 액체 탱�
+block.beam-node.name = 빔 노드
+block.beam-tower.name = 빔 타워
+block.beam-link.name = 빔 ��
+block.turbine-condenser.name = 터빈 �결기
+block.chemical-combustion-chamber.name = 화학� 연소실
+block.pyrolysis-generator.name = 열분해 발전기
+block.vent-condenser.name = 분출구 �결기
+block.cliff-crusher.name = 벽 분쇄기
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = 플�즈마 채광기
+block.large-plasma-bore.name = 대형 플�즈마 채광기
+block.impact-drill.name = 충격 드릴
+block.eruption-drill.name = 분화 드릴
+block.core-bastion.name = 코어: 요새
+block.core-citadel.name = 코어: 성채
+block.core-acropolis.name = 코어: �심
+block.reinforced-container.name = 보강� 컨테�너
+block.reinforced-vault.name = 보강� 창고
+block.breach.name = 브리치
+block.sublimate.name = 서브리메�트
+block.titan.name = 티탄
+block.disperse.name = 디스�스
+block.afflict.name = 어플릭트
+block.lustre.name = 러스터
+block.scathe.name = 스�드
+block.tank-refabricator.name = 전차 재조립기
+block.mech-refabricator.name = 기계 재조립기
+block.ship-refabricator.name = 함선 재조립기
+block.tank-assembler.name = 전차 조립대
+block.ship-assembler.name = 함선 조립대
+block.mech-assembler.name = 기계 조립대
+block.reinforced-payload-conveyor.name = 보강� 화물 컨베�어
+block.reinforced-payload-router.name = 보강� 화물 분배기
+block.payload-mass-driver.name = 화물 매스 드��버
+block.small-deconstructor.name = 소형 화물 분해기
+block.canvas.name = �화지
+block.world-processor.name = 월드 프로세서
+block.world-cell.name = 월드 셀
+block.tank-fabricator.name = 전차 조립기
+block.mech-fabricator.name = 기계 조립기
+block.ship-fabricator.name = 함선 조립기
+block.prime-refabricator.name = �급 조립기
+block.unit-repair-tower.name = 유닛 수리 타워
+block.diffuse.name = 디퓨즈
+block.basic-assembler-module.name = 기본 조립 모듈
+block.smite.name = 스마�트
+block.malign.name = 멀��
+block.flux-reactor.name = 융제 반�로
+block.neoplasia-reactor.name = 신�물 반�로
 
 block.switch.name = 스위치
 block.micro-processor.name = 마��로 프로세서
@@ -1250,93 +1961,162 @@ block.large-logic-display.name = 대형 로� 디스플레�
 block.memory-cell.name = 메모리 셀
 block.memory-bank.name = 메모리 보관소
 
-team.blue.name = 파랑색 팀
-team.crux.name = 빨강색 팀
-team.sharded.name = 주황색 팀
-team.orange.name = 주황색 팀
-team.derelict.name = 버려진 팀
-team.green.name = 초�색 팀
-team.purple.name = 보�색 팀
+team.malis.name = �리스
+team.crux.name = �럭스
+team.sharded.name = 샤디드
+team.derelict.name = 잔해
+team.green.name = 초�팀
+team.blue.name = 파랑팀
 
-hint.skip = 힌트 넘기기
-hint.desktopMove = [accent][[WASD][] 키를 �용해 �신� 유닛� 조종하세요.
-hint.zoom = [accent]마우스 스�롤[]를 사용해 확대 �는 축소가 가능합니다.
-hint.mine =  \uf8c4 주변� 구리광�� 수�으로 채굴하려면 광�� [accent]누르십시오[]. (추가설명)마우스가 있� 경우 마우스 오른쪽 �릭� 하면 채굴 중단� 가능합니다.
-hint.desktopShoot = [accent][[마우스 왼�릭][]으로 발사할수 있습니다. 
-hint.depositItems = 아�템� 코어로 옮기려면, 당신� 기체� 아�템� 코어로 �어놓으세요.
-hint.respawn = 당신� 기체를 떠나려면 [accent][[V][]를 누르십시오.
-hint.respawn.mobile = 당신� 유닛 혹� �탑� 조종할 수 있습니다. 당신� 기체를 떠나려면 [accent]왼쪽 위� 있는 아바타를 누르십시오.[]
-hint.desktopPause = 게임� �시정지/재시작 하기 위해 [accent][[Space][]를 누르십시오.
-hint.placeDrill = 드릴� 설치하려면 오른쪽 아래� \ue85e [accent]드릴[]� 선�하고, \uf870 [accent]드릴[]� 선�해서 구리 광� 위를 누르십시오.
-hint.placeDrill.mobile = 오른쪽 아래 메뉴� \ue85e [accent]드릴[]� 선�하고, \uf870 [accent]드릴[] 를 선�해서 구리 광� 위를 누르십시오.\n\n설치를 완료하려면 오른쪽 아래� \ue800 [accent]완료 버튼[]� 누르십시오.
-hint.placeConveyor = 컨베�어는 아�템� 드릴�서 다른 블�으로 ��시켜�니다. \ue814 [accent]분배[] 카테고리�서 \uf896 [accent]컨베�어[]를 선�하십시오.\n\n�릭하거나 드래그로 다수� 컨베�어를 설치할 수 있습니다.\n�릭하고 놓지 않�채로 마우스 [accent]휠� �리면 �아갑니다.
-hint.placeConveyor.mobile = 컨베�어는 아�템� 드릴�서 다른 블�으로 ��시켜�니다. \ue814 [accent]분배[] 카테고리�서 \uf896 [accent]컨베�어[]를 선�하십시오.\n\n여러개� 컨베�어를 놓으려면 �가�으로 누른채로 �어서 설치 범위를 지정하십시오.
-hint.placeTurret = ��게서 당신� 기지를 막아내려면 \uf861 [accent]�탑[]를 설치하십시오.\n\n�탑 탄약 필요 - 지금� \uf838 구리가 필요합니다.\n컨베�어를 사용해 드릴� 구리를 공급하십시오. 
-hint.breaking = 블�� 부수려면 [accent]오른�릭[]�나 드래그를 하십시오.
-hint.breaking.mobile = 블럭� 부수려면 오른쪽 아래� \ue817 [accent]�치[]를 눌러 해체 모드를 활성화 하십시오.\n\n�가�으로 누른채로 �어서 해체 범위를 지정하십시오.
+hint.skip = 넘기기
+hint.desktopMove = [accent][[WASD][] 키를 �용해 움��십시오.
+hint.zoom = [accent]스�롤[]� 통해 화면 확대/축소가 가능합니다.
+hint.desktopShoot = [accent][[좌�릭][]으로 발사할 수 있습니다.
+hint.depositItems = ��� 코어로 옮기려면, 유닛� ��� 코어로 �어다놓으십시오.
+hint.respawn = 유닛� 떠나려면 [accent][[V][]를 누르십시오.
+hint.respawn.mobile = 유닛 혹� �탑� 조종할 수 있습니다. 유닛� 떠나려면 [accent]왼쪽 위� 아바타를 누르십시오.[]
+hint.desktopPause = 게임� �시 정지/재개하기 위해 [accent][[Space][]를 누르십시오.
+hint.breaking = 블�� 부수려면 [accent]우�릭[]한 후 드래그하십시오.
+hint.breaking.mobile = 블�� 부수려면 오른쪽 하단� \ue817 [accent]�치[]를 눌러 해체 모드를 활성화하십시오.\n\n�가�으로 누른 채로 �어서 해체 범위를 지정하십시오.
+hint.blockInfo = 블� 정보를 확�하려면, [accent]건설 목�[]�서 블�� 선�한 후 오른쪽� [accent][[?][] 버튼� 누르십시오.
+hint.derelict = [accent]버려진[] 구조물� � �� 작�하지 않는 오래� 기지� 부서진 잔해입니다.\n\n� 구조물� [accent]철거[]하여 ��� 얻� 수 있습니다.
 hint.research = 새 기술� 연구하려면 \ue875 [accent]연구[]버튼� 누르십시오.
 hint.research.mobile = 새 기술� 연구하려면 \ue88c [accent]메뉴[] 아래� \ue875 [accent]연구[]버튼� 누르십시오.
-hint.unitControl = 아군 유닛과 �탑� 조종하려면 [accent][[왼쪽 ctrl][]� 누른채로 [accent]�릭[] 하십시오.
-hint.unitControl.mobile = 아군 유닛과 �탑� 조종하려면 해당 개체를 [accent]빠르게 �번 누르십시오[].
-hint.launch = 충분한 ��� 모았으면, 오른쪽 아래� \ue827 [accent]Map[]�서 주변 지역� 선�해서 [accent]Launch[]할 수 있습니다. 
-hint.launch.mobile = 충분한 ��� 모았으면, 오른쪽 아래� \ue88c [accent]메뉴[]� 있는 \ue827 [accent]Map[]�서 주변 지역� 선�해서 [accent]Launch[]할 수 있습니다.
-hint.schematicSelect = 블�� 복사하고 붙여넣으려면 [accent][[F][]를 누른채로 �어서 구역� 지정하십시오. \n\n [accent][[마우스 휠][]� 누르면 한개� 블�만 복사할 수 있습니다.
-hint.conveyorPathfind = [accent][[왼쪽 Ctrl][]� 누른채로 컨베�어를 대�선으로 �면 길� ��으로 만들어�니다.
-hint.conveyorPathfind.mobile = \ue844 [accent]diagonal mode[]를 활성화하고 컨베�어를 대�선으로 �면 길� ��으로 찾아�니다.
-hint.boost = 당신� 유닛과 같� 장애물� 넘어가려면 [accent][[L-Shift][]� 누르고 ��하십시오. \n\n �� 수� 지� 유닛만 날 수 있습니다.
-hint.command = 주변� 아군 유닛� �리고 다니려면 비슷한 단계� 유닛 무리 주변�서 [accent][[G][]를 누르십시오. \n\n 지� 유닛� �리고 다니기 위해서는 먼저 다른 지� 유닛� 조종하고 있어야 합니다.
-hint.command.mobile = 아군 유닛� �리고 다니려면 비슷한 단계� 유닛 무리 주변�서 [accent]빠르게 �번 누르십시오[].
-hint.payloadPickup = 작� 블럭�나 유닛� 집으려면 [accent][[[]를 누르십시오.
-hint.payloadPickup.mobile = 작� 블럭�나 유닛� 집으려면 [accent]잠� 누르십시오[].
+hint.unitControl = 아군 유닛과 �탑� 조종하려면 [accent][[왼쪽 ctrl][]� 누른 채로 해당 개체를[accent]�릭[] 하십시오.
+hint.unitControl.mobile = 아군 유닛과 �탑� 조종하려면 해당 개체를 [accent]빠르게 � 번 누르십시오[].
+hint.unitSelectControl = 유닛� 조종하려면, [accent]왼쪽 shift[]를 눌러 [accent]명령 모드[]를 활성화하시오.\n명령 모드가 활성화�어 있� 때 누르거나 �어서 유닛� 선�합니다. [accent]우�릭[]으로 유닛�게 ��과 공격� 명령할 수 있습니다.
+hint.unitSelectControl.mobile = 유닛� 조종하려면, 왼쪽 아래� 있는 [accent]명령[]� 눌러 [accent]명령 모드[]를 활성화하시오.\n명령 모드가 활성화�어 있� 때 길게 누르거나 �어서 유닛� 선�합니다. 눌러서 유닛�게 ��과 공격� 명령할 수 있습니다.
+hint.launch = 충분한 ��� 모았으면, 오른쪽 아래� \ue827 [accent]지�[]�서 주변 지역� 선�해서 [accent]출격[]할 수 있습니다.
+hint.launch.mobile = 충분한 ��� 모았으면, 오른쪽 아래� \ue88c [accent]메뉴[]� 있는 \ue827 [accent]지�[]�서 주변 지역� 선�해서 [accent]출격[]할 수 있습니다.
+hint.schematicSelect = [accent][[F][]를 누른 채로 �어서 복사하고 붙여넣� 블�� 선�하십시오. \n\n [accent][[마우스 휠][]� 누르면 한 개� 블�만 복사할 수 있습니다.
+hint.rebuildSelect = [accent][[B][]를 누르고 �어서 파괴� 블� ��� 선�하세요.\n선�� 블�� ��으로 복구�니다.
+hint.rebuildSelect.mobile = 복사버튼 \ue874 � 선�하시고, 재건축 버튼 \ue80f � 탭 하신 뒤, 드래그 하여 블� ��� 선�하세요. 선�� 블�� ��으로 복구�니다.
+hint.conveyorPathfind = [accent][[왼쪽 Ctrl][]� 누른 채로 컨베�어를 대�선으로 �면 길� ��으로 만들어�니다.
+hint.conveyorPathfind.mobile = \ue844 [accent]대� 모드[]를 활성화하고 컨베�어를 대�선으로 �면 길� ��으로 찾아�니다.
+hint.boost = [accent][[왼쪽 Shift][]를 눌러 탑승한 기체로 장애물� 넘� 수 있습니다. \n\n �부 지� 유닛만 �륙할 수 있습니다.
+hint.payloadPickup = 작� 블��나 유닛� 집으려면 [accent][[[]를 누르십시오.
+hint.payloadPickup.mobile = 작� 블��나 유닛� 집으려면 [accent]잠� 누르십시오[].
 hint.payloadDrop = 다시 내려놓으려면 [accent]][]를 누르십시오.
 hint.payloadDrop.mobile = 다시 내려놓으려면 빈 공간�서 [accent]화면� 잠� 누르십시오[].
-hint.waveFire = [accent]Wave[]�탑� 탄약으로 물� 넣으면 주변� 불� ��으로 꺼�니다.
-hint.generator = \uf879 [accent]화력 발전기[]는 �탄� 태워서 주변 블�� 전력� 전달합니다.\n\n \uf87f � 넓� 범위� 블�� 전력� 전달하려면 [accent]Power Nodes[]를 사용하십시오.
-hint.guardian = [accent]수호�[] 유닛들� 방어력� 가집니다. [accent]구리[]와 [accent]납[]같� 약한 탄약으로는 [scarlet]아무런 효과� 없습니다[].\n\n그런 수호�를 없애려면 높� 단계� �탑 �는 \uf835 [accent]�연[]� 탄약으로 넣� \uf861듀오/\uf859살보를 사용하십시오.
-hint.coreUpgrade = 코어는 [accent]�위 코어를 위� 설치함[]으로� 업그레�드할 수 있습니다.\n\n [accent]기반[] 코어를  [accent]조�[] 코어 위� 설치하십시오. 주변� 장애물� 없는지� 확�하십시오.
-hint.presetLaunch = [accent]얼어붙� 숲[]과 같� 회색[accent]캠페� 지역[]� 어디�서나 출격해서 올 수 있습니다. 주변 지역� �령하지 않아� �니다.\n\n�와 같� [accent]네임드 지역[]들� [accent]선��[]입니다.	
-hint.coreIncinerate = 코어가 아�템으로 가� 찬 후� 받는 모든 아�템들� [accent]소�[]� 것입니다.
-hint.coopCampaign = [accent]협� 캠페�[]� 할 떄, 현재 맵�서 �산� 아�템들� [accent]당신� 캠페� 지역으로[]� 보내집니다.\n\n호스트가 새로 해금한 모든 것들� 가져갑니다.
+hint.waveFire = [accent]파�[] �탑� 물� 공급하면 주변� 발�한 화재를 ��으로 진압합니다.
+hint.generator = \uf879 [accent]화력 발전기[]는 �탄� 태워서 주변 블�� 전력� 전달합니다.\n\n \uf87f � 넓� 범위� 블�� 전력� 전달하려면 [accent]전력 노드[]를 활용하십시오.
+hint.guardian = [accent]수호�[] 유닛� 높� 체력과 방어력� 가졌습니다. [accent]구리[]와 [accent]납[]처럼 약한 탄약으로는 [scarlet]아무런 효과� 없습니다[].\n\n수호�를 제거하려면 높� 단계� �탑 �는 \uf835 [accent]�연[]� 탄약으로 넣� \uf861듀오/\uf859살보를 사용하십시오.
+hint.coreUpgrade = 코어는 [accent]�위 코어를 위� 설치[]하여 업그레�드할 수 있습니다.\n\n [accent]기반[] 코어를 [accent]조�[] 코어 위� 설치하십시오. 주변� 장애물� 없는지 확�하십시오.
+hint.presetLaunch = [accent]얼어붙� 숲[]과 같� 회색[accent]캠페� 지역[]� 어디�서나 출격해서 올 수 있습니다. 주변 지역� �령하지 않아� �니다.\n\n�와 같� [accent]네임드 지역[]들� [accent]선��[]입니다.
+hint.presetDifficulty = � 지역� [scarlet]위험�가 높�[] 지역입니다.\n�절한 기술과 준비 없� �런 지역들로 출격하는건 [accent]추천하지 않습니다[].
+hint.coreIncinerate = 코어가 ��으로 가� 찬 후� 받는 모든 ��들� [accent]소�[]� 것입니다.
+hint.factoryControl = 유닛 공장� [accent]출력 목�지[]를 설정하려면, 명령 모드�서 공장 블�� �릭한 다�, 마우스 오른쪽 버튼으로 위치를 지정합니다.\n�산� 유닛� ��으로 그곳으로 ��합니다.
+hint.factoryControl.mobile = 유닛 공장� [accent]출력 목�지[]를 설정하려면, 명령 모드�서 공장 블�� �릭한 다�, 눌러서 위치를 지정합니다.\n�산� 유닛� ��으로 그곳으로 ��합니다.
 
-item.copper.description = 가장 기본�� 건설 재료. 모든 유형� 블��서 광범위하게 사용�니다.
-item.copper.details = �범한 구리. 세르플로� 비정��으로 많� 분��어 있습니다. 별다른 보강재 없�는 구조� 문제 때문� 내구성� 비�� 약합니다.
-item.lead.description = 기본 초반 재료. 전� � 액체 수송 블��서 광범위하게 사용�는 ��입니다.
-item.lead.details = 밀�가 높으며 반�성� �� ��. 배터리� 주로 사용�니다. 
-item.metaglass.description = 초강력 방탄유리. 액체 분배 � 저장� 광범위하게 사용�니다.
-item.graphite.description = 탄약 � 전기 부품� 사용�는 무기질 탄소.
-item.sand.description = 제련�서 합금 �는 플럭스�서 광범위하게 사용�는 �반�� 재료.
-item.coal.description = 화�화� �물 물질. 씨앗� 나오기 훨씬 전� 형성�었습니다. 연료 � �� �산� 광범위하게 사용�니다.
-item.coal.details = 발화 작용 �전, 오래전� �성� 화�화 작용� 거친 �물체로 보입니다.
-item.titanium.description = 액체 수송, 드릴�나 항공기� 광범위하게 사용�는 �귀 초경량 금�.
-item.thorium.description = 구조� 지지 � 핵연료로 사용�는 고밀�� 방사성 금�.
-item.scrap.description = 오래� 건물과 유닛� 남� 잔해. 미량� 다양한 금�들� �함�어 있습니다.
-item.scrap.details = 오래� 구조물과 유닛� 잔해.
-item.silicon.description = 매우 유용한 반�체. 복잡한 전� 장치나 유�탄� 사용�니다.
-item.plastanium.description = 고급 기체 � 파편화 탄약� 사용�는 가�고 연성� 있는 재료입니다.
-item.phase-fabric.description = 최첨단 전� 제품과 �기수리 기술� 사용�는 거� 무중력� 가까운 물질입니다.
-item.surge-alloy.description = �특한 전기� 특성� 가진 고급 합금.
-item.spore-pod.description = 산업 목�� 위해 대기 ���서 합성� �� 버섯. �유, �발물 � 연료로 전환하는 � 사용�니다.
-item.spore-pod.details = ��. 유기�� �명체로 �단�다. 타 유기체� 치명�� �가스를 내뿜는다. 침입성� 매우 강하다. 특정 조건�서 강력한 �화성� 보입니다.
-item.blast-compound.description = �탄과 �발물� 사용�는 불안정한 화합물. �� 버섯 � 기타 휘발성 물질로 합성할 수 있습니다. 연료로 사용하지 않는 것� 좋습니다.
-item.pyratite.description = 소� 무기�서 사용�는 가연성 매우 높� 물질.
+gz.mine = 주변 땅� 있는 \uf8c4 [accent]구리 광�[]으로 ��하고, 광�� �릭해서 채굴� 시작하세요.
+gz.mine.mobile = 주변 땅� 있는 \uf8c4 [accent]구리 광�[]으로 ��하고, 광�� 눌러서 채굴� 시작하세요.
+gz.research = 오른쪽 하단� \ue875 연구 기�� �릭하거나 [J]키를 눌러 여세요.\n\uf870 [accent]기계� 드릴[]� 연구하고, 그 후 연구 기�� 닫아서 오른쪽 아래� 있는 메뉴�서 해당 드릴� 선�하세요.\n구리 광� 위� �릭해서 배치합니다.\n(만약 바로 건설�는게 불편하다면, 설정�서 건설 �� �시정지를 킬 수 있습니다.)[]
+gz.research.mobile = 왼쪽 �단� \ue875 연구 기�� 눌러 여세요.\n\uf870 [accent]기계� 드릴[]� 연구하고, 그 후 연구 메뉴를 닫아서 오른쪽 아래� 있는 블� 메뉴�서 해당 드릴� 선�하세요.\n구리 광� 위� 눌러서 배치합니다.\n\n오른쪽 아래 \ue800 [accent]체�마�[]를 눌러 확정지으세요.
+gz.conveyors = \uf896 �제 연구 기�� 다시 열어 [accent]컨베�어[]를 연구하고 배치하여 채굴� ��� 운반하세요.\n드릴�서 코어로 ��죠.\n\n컨베�어를 선�하고, �릭하고 드래그해서 컨베�어를 길게 배치하세요.\n[accent]스�롤[]로 방향� 회전할 수 있습니다.\n��� 부족하면 연구나 건설� 불가능해지니 참고해주세요.
+gz.conveyors.mobile = \uf896 �제 연구 기�� 다시 열어 [accent]컨베�어[]를 연구하고 배치하여 채굴� ��� 운반하세요.\n드릴�서 코어로 ��죠.\n\n�가�� 길게 누르고 �어서 컨베�어를 길게 배치하세요.\n��� 부족하면 연구나 건설� 불가능해지니 참고해주세요.
+gz.drills = 채굴 작업� 확장하세요.\n기계� 드릴� � 배치하세요.\n[accent]새 목표:[] 드릴로 구리를 채굴하고 컨베�어를 �용해 [accent]구리 100개[]를 코어로 운반하기.
+gz.lead = \uf837 [accent]납[]� �반�으로 사용�는 � 다른 ��입니다.\n납� 채굴하기 위한 드릴� 건설하세요.
+gz.moveup = \ue804 추가 목표를 위해 위로 ��하세요.
+gz.turrets = � 게임� 핵심� '코어'를 보호하기 위해 \uf861 [accent]듀오[] �탑� 연구하고 2개를 설치하세요.\n듀오 �탑� 컨베�어로부터 \uf838 [accent]탄약[]� 공급받아야 합니다.
+gz.duoammo = 컨베�어를 활용하여, 듀오 �탑� [accent]구리[]를 공급하세요.
+gz.walls = [accent]벽[]� 건물로 날아오는 공격� 막� 수 있습니다. \n�탑 주변� \uf8ae [accent]구리 벽[]� 배치하세요.
+gz.defend = �� 다가옵니다, 방어 태세를 갖추세요.
+gz.aa = 비행 유닛� 기본 �탑으로는 쉽게 처리할 수 없습니다.\n\uf860 [accent]스�터[] �탑� 훌륭한 대공 방어를 �랑하지만, 탄환으로 \uf837 [accent]납[]� 필요합니다.
+gz.scatterammo = 컨베�어를 활용하여, 스�터 �탑� [accent]납[]� 공급하세요.
+gz.supplyturret = [accent]보급 �탑
+gz.zone1 = �건 �� 착륙 지�입니다.
+gz.zone2 = 반경� 세워진 모든 것� 단계가 시작�면 파괴�니다.
+gz.zone3 = 단계가 지금 시작�니다.\n준비하세요.
+gz.finish = �탑� � 건설하고, ��� � 채굴하고,\n그리고 모든 단계를 막아내어 [accent]지역� �령[]하세요. �것으로 튜토리얼� 마칩니다. 행운� 빕니다.
 
-liquid.water.description = 기능성� 뛰어난 액체. 냉�기 � �기물 처리� �반�으로 사용�니다.
-liquid.slag.description = 다양한 종류� 금�들� 함께 섞여 녹아있습니다. 분리기를 �용해 다른 광물들로 분리하거나 탄약으로 사용해 � 부대를 향해 살�할 수 있습니다.
-liquid.oil.description = 고급 재료 �산� 사용�는 액체. �탄으로 전환하거나 무기로 뿌려서 불� 지를 수 있습니다. 
-liquid.cryofluid.description = 물과 티타늄으로 만든 비 부�성 액체. 열 용량� 매우 높으며 냉�수로 광범위하게 사용�니다.
+onset.mine = 벽� 붙어있는 \uf748 [accent]베릴륨[]� �릭하여 채굴하세요.\n\n[accent][WASD]로 움��세요.
+onset.mine.mobile = 벽� 붙어있는 \uf748 [accent]베릴륨[]� 눌러서 채굴하세요.
+onset.research = \ue875 연구 기�� 여세요.\n \uf73e [accent]터빈 �결기[]를 연구하고, 연구 기�� 다시 닫� 다�, 구�� 위� 배치하세요.\n[accent]전력[]� �산합니다.
+onset.bore = 다시 연구 기�� 열어 \uf741 [accent]플�즈마 채광기[]를 연구하고 배치하세요.\n벽으로부터 ��으로 ��� 채굴합니다.
+onset.power = [accent]전력[]� 플�즈마 채광기로 전달하기 위해선, \uf73d [accent]빔 노드[]를 연구하고 배치하세요.\n터빈 �결기와 플�즈마 채광기를 연결하세요.
+onset.ducts = \uf799 [accent]�관[]� 연구하고 배치하여 플�즈마 채광기�서 채굴한 ��� 코어로 운반하세요.\n�릭하고 �어서 �관� 길게 연결하세요.\n[accent]스�롤해서[]해서 방향� 회전할 수 있습니다.
+onset.ducts.mobile = \uf799 [accent]�관[]� 연구하고 배치하여 플�즈마 채광기�서 채굴한 ��� 코어로 운반하세요.\n�가�� 길게 누르고 �어서 �관� 길게 연결하세요.
+onset.moremine = 채굴 작업� 확장하세요.\n� 많� 플�즈마 채광기를 배치하고 빔 노드와 �관� 사용하여 보조하세요.\n베릴륨 200개 채굴하기.
+onset.graphite = � 복잡한 건물� \uf835 [accent]�연[]� 필요합니다.\n�연� 채굴하는 플�즈마 채광기를 배치하세요.
+onset.research2 = [accent]공장[]� 연구할 시간입니다.\n \uf74d [accent]벽 분쇄기[]와 \uf779 [accent]실리콘 아� 화로[]를 연구하세요.
+onset.arcfurnace = 아� 화로는 \uf834 [accent]모래[]와 \uf835 [accent]�연[]� 가공하여 \uf82f [accent]실리콘[]� �산합니다.\n[accent]전력[] �한 필수입니다.
+onset.crusher = \uf74d [accent]벽 분쇄기[]를 사용하여 모래를 채굴하세요.
+onset.fabricator = [accent]유닛[]� 맵� 정찰하거나, 건물� 보호하거나, �� 공격할 때 활용할 수 있습니다. \uf6a2 [accent]전차 재조립기[]를 연구하고 배치하세요.
+onset.makeunit = 유닛� �산하세요.\n"?" 버튼� 눌러 선�한 공장� 요구사항� 확�할 수 있습니다.
+onset.turrets = 유닛� 유용하지만, [accent]�탑[]� 사용하기� 따� � 나� 방어 성능� 보여�니다.\n \uf6eb [accent]브리치[] �탑� 배치하세요.\n�탑� \uf748 [accent]탄약[]� 필요합니다.
+onset.turretammo = �탑� [accent]베릴륨 탄약[]� 공급하세요.
+onset.walls = [accent]벽[]� 건물로 날아오는 공격� 막� 수 있습니다. \n�탑 주변� \uf6ee [accent]베릴륨 벽[]� 배치하세요.
+onset.enemies = �� 다가옵니다, 방어 태세를 갖추세요.
+onset.defenses = [accent]방어 태세 갖추기:[lightgray] {0}
+onset.attack = �� 취약한 �태입니다. 반격하세요.
+onset.cores = 새로운 코어는 [accent]코어 타�[]위� 배치할 수 있습니다.\n새로운 코어는 전진기지 역할� 하며 다른 코어와 저장� ��� 공유합니다.\n \uf725 코어를 배치하세요.
+onset.detect = �� 2분 �내� 당신� �지할 것입니다.\n�산, 채굴, 방어시설� 구성하세요.
+onset.commandmode = [accent]shift[]를 눌러 [accent]명령 모드[]를 활성화하세요.\n[accent]좌�릭과 드래그[]로 유닛� 선�하세요.\n[accent]우�릭[]으로 선�� 유닛들�게 �� �는 공격 명령� 내리세요.
+onset.commandmode.mobile = [accent]명령 버튼[]� 눌러 [accent]명령 모드[]를 활성화하세요.\n�가�� 꾹 누르고, [accent]드래그[]해서 유닛� 선�하세요.\n[accent]눌러서[] 선�� 유닛들�게 �� �는 공격 명령� 내리세요. �것으로 �르키아� 튜토리얼� 마칩니다. 행운� 빕니다.
+aegis.tungsten = 텅스�� 채굴하려면 [accent]충격 드릴[]� 필요합니다.\n 충격 드릴�[accent]물[]과 [accent]전력[]� 필요로 합니다.
 
-block.resupply-point.description = 주변 유닛들�게 구리 탄약� 보급합니다. 베터리 전력� 필요한 유닛들� 호환�지 않습니다.
-block.armored-conveyor.description = 앞으로 아�템들� 운반합니다. 측면�서 아�템들� 받아들�지 않습니다.
+split.pickup = �부 블�� 코어 유닛으로 집어올릴 수 있습니다.\n� [accent]컨테�너[]를 집어올리고 [accent]화물 로�[] �� 내려놓으세요.\n(화물� 집어올리거나 내리는 기본 키는 [ 그리고 ]입니다.)
+split.pickup.mobile = �부 블�� 코어 유닛으로 집어올릴 수 있습니다.\n� [accent]컨테�너[]를 집어올리고 [accent]화물 로�[] �� 내려놓으세요.\n(무언가를 집어올리거나 내려놓으려면, 길게 누르세요.)
+split.acquire = 유닛� �산하려면 텅스�� 채굴해야 합니다.
+split.build = 유닛� 벽� 반대편으로 운반해야 합니다.\n� 개� [accent]화물 매스 드��버[]를 � 벽면� 하나씩 배치하세요.\n둘 중 하나를 누른 다� 다른 하나를 선�하여 연결� 설정합니다.
+split.container = 컨테�너와 마찬가지로, 유닛� [accent]화물 매스 드��버[]를 사용하여 운송할 수 있습니다.\n유닛 조립대를 매스 드��버 근처� 배치하여 유닛� �재한 후, 벽� 가로질러 보내 � 기지를 공격하게 만듭니다.
+
+item.copper.description = 모든 종류� 구조물 � 탄약으로 사용하는 기본 ��입니다.
+item.copper.details = �범한 구리. 세르플로� 비정��으로 많� 분��어 있습니다. 기본�으로 보강하지 않는 한 구조�으로 약합니다.
+item.lead.description = 전� � 액체 수송 블��서 광범위하게 사용하는 기본 ��입니다.
+item.lead.details = 밀�가 높으며 반�성� �� ��. 배터리� 주로 사용�니다.
+item.metaglass.description = 액체 분배 � 저장� 광범위하게 사용합니다.
+item.graphite.description = 탄약 � 전기 부품� 사용�는 무기질 탄소입니다.
+item.sand.description = 다른 제련� ��� �산� 사용�니다.
+item.coal.description = 연료 � �� �산� 광범위하게 사용�니다.
+item.coal.details = 화�화� �물 물질. 씨앗� 나오기 훨씬 전� 형성�었습니다.
+item.titanium.description = 액체 수송 구조물, 드릴 � 공장�서 광범위하게 사용�는 �귀한 초경량 금�입니다.
+item.thorium.description = 튼튼한 구조물과 핵 연료로 사용�는 고밀�� 방사성 금�입니다.
+item.scrap.description = 융해기와 분쇄기를 통해 다른 물질로 정제할 수 있습니다.
+item.scrap.details = 오래� 구조물과 유닛� 잔해. 미량� 다양한 금�들� �함�어 있습니다.
+item.silicon.description = 복잡한 전� 장치나 유�탄� 사용�는 유용한 반�체입니다.
+item.plastanium.description = 고급 유닛, 절연 � 파편화 탄약� 사용�니다.
+item.phase-fabric.description = 최첨단 전� 제품과 �가 수리 기술� 사용�는 거� 무중력� 가까운 물질입니다.
+item.surge-alloy.description = 첨단 무기 � 반작용 방어 구조물� 사용�는 고급 합금입니다.
+item.spore-pod.description = �유, �발물과 연료로 전환하는 � 사용�는 합성 �� 버섯입니다.
+item.spore-pod.details = ��, 합성 �명체로 �단�니다. 타 유기체� 치명�� �가스를 내뿜으며. 매우 빠르게 �집니다. 특정한 조건�서 �화성� 매우 높습니다.
+item.blast-compound.description = �탄과 �발성 탄약� 사용�는 불안정한 화합물입니다.
+item.pyratite.description = 방화 무기와 연료를 연소하는 발전기� 사용�는 가연성� 매우 높� 물질입니다.
+
+#Erekir
+item.beryllium.description = �르키아� 여러 종류� 건축물과 탄약� 사용�니다.
+item.tungsten.description = 드릴, 장갑 � 탄약� 사용�니다. 보다 발전� 구조물� 건설하는 � 필요합니다.
+item.oxide.description = 전�� 열전�체 � 절연체로 사용�니다.
+item.carbide.description = 첨단 구조물, 강력한 기체 � 탄약� 사용�니다.
+
+liquid.water.description = 냉�기 � �기물 처리� 사용�니다.
+liquid.slag.description = 분리기를 통해 다른 ��으로 정제하거나 탄환으로 �들�게 살�할 수 있습니다.
+liquid.oil.description = 고급 재료 �산, �탄으로 전환 � �들�게 살�하여 불� 지를 수 있습니다.
+liquid.cryofluid.description = ��로, �탑 � 공장�서 냉�수로 사용�는 비부�성 액체입니다.
+
+#Erekir
+liquid.arkycite.description = 발전 � 재료 합성� 위한 화학 반�� 사용�니다.
+liquid.ozone.description = 재료 �산�서 산화제로 사용�며 연료로� 사용�니다. �당한 �발성 물질입니다.
+liquid.hydrogen.description = �� 추출, 기체 �산 � 구조물 수리� 사용�니다. 가연성 물질입니다.
+liquid.cyanogen.description = 탄약, 첨단 기체� 구축 � 첨단 블�� 다양한 반�� 사용�니다. 강한 �화성 물질입니다.
+liquid.nitrogen.description = �� 추출, 가스 �성 � 기체 �산� 사용�니다. 불활성 물질입니다.
+liquid.neoplasm.description = 신�물 반�로� 위험한 �물학� 부산물. 접촉하는 즉시 �접한 모든 수분 함유 블�으로 빠르게 확산�며, 진행�는 �안 피해를 입힙니다. �성� �는 물질입니다.
+liquid.neoplasm.details = 신�물, 진�과 비슷한 �성� 가졌으며, 통제 불능� ��로 빠르게 확산�는 합성세� �어리 입니다. 고온� 저항력� 있으며, �반�� 분�으로는 너무나 복잡하고 불안정하여 아� 정확한 행� 양��나 �태를 확�하지 못 했습니다. 열 저항. 물과 관련� 구조물�는 매우 위험합니다.\n\n 광재 웅��� 소�하는 것� 바람�합니다.
+
+block.derelict = \uf77e [lightgray]잔해
+block.armored-conveyor.description = ��� 앞으로 운반합니다. 측면�서 ��� 받아들�지 않습니다.
 block.illuminator.description = 발광합니다.
 block.message.description = 아군 간� 소통� 위한 메시지를 저장합니다.
+block.reinforced-message.description = �맹 간� 소통� 위한 메시지를 저장합니다.
+block.world-message.description = 맵 제작� 사용�는 메시지 블�. 파괴할 수 없습니다.
 block.graphite-press.description = �탄� �연으로 압축합니다.
-block.multi-press.description = �탄� �연으로 압축합니다. 냉�수로� 물� 필요합니다.
-block.silicon-smelter.description = �탄과 모래로부터 실리콘� 정제합니다.
-block.kiln.description = 모래와 납� 강화 유리로 재련합니다.
+block.multi-press.description = �탄� �연으로 압축합니다. 냉�수로 물� 필요합니다.
+block.silicon-smelter.description = �탄과 모래�서 실리콘� 정제합니다.
+block.kiln.description = 모래와 납� 강화 유리로 제련합니다.
 block.plastanium-compressor.description = �유와 티타늄으로 플�스터늄� �산합니다.
-block.phase-weaver.description = 토륨과 모래로 메타를 합성합니다.
-block.alloy-smelter.description = 티타늄, 납, 실리콘, 구리를 결합하여 설금� �산합니다.
-block.cryofluid-mixer.description = 물과 미세 티타늄 분�� 냉�수로 혼합합니다. 
+block.phase-weaver.description = 토륨과 모래를 위� 섬유로 합성합니다.
+block.surge-smelter.description = 티타늄, 납, 실리콘 � 구리를 설금으로 혼합합니다.
+block.cryofluid-mixer.description = 물과 미세 티타늄 분�� 냉�수로 혼합합니다.
 block.blast-mixer.description = 파��타�트와 ��로 �발물� �산합니다.
 block.pyratite-mixer.description = �탄, 납, 그리고 모래를 파��타�트로 혼합합니다.
 block.melter.description = 고철� 광재로 녹입니다.
@@ -1344,162 +2124,572 @@ block.separator.description = 광재를 광물들로 분리합니다.
 block.spore-press.description = ��를 �유로 압축합니다.
 block.pulverizer.description = 고철� 갈아 모래로 만듭니다.
 block.coal-centrifuge.description = �유�서 �탄� 추출합니다.
-block.incinerator.description = 넘치는 ���나 액체를 �발시킵니다.
-block.power-void.description = 입력� 모든 전력� 무효화합니다. 샌드박스 전용.
-block.power-source.description = 무한한 전력� 공급해주는 블�입니다. 샌드박스 전용.
-block.item-source.description = ��� 무한대로 출력합니다. 샌드박스 전용.
-block.item-void.description = 모든 ��� 파괴합니다. 샌드박스 전용.
+block.incinerator.description = 들어오는 모든 ��과 액체를 소�시킵니다.
+block.power-void.description = 전력� 제거합니다. 샌드박스 전용.
+block.power-source.description = 전력� 무한히 출력합니다. 샌드박스 전용.
+block.item-source.description = ��� 무한히 출력합니다. 샌드박스 전용.
+block.item-void.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.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.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.router.details = 필요악. 공장 옆� 설치하는 것� 그 공장� 출력으로 �해 막� 수 있으므로 바람�하지 못하다.
-block.distributor.description = 고급 분배기. ��� 최대 7개� 다른 방향으로 ��하게 분배합니다.
-block.overflow-gate.description = 전면 경로가 차단� 경우�만 왼쪽과 오른쪽으로 출력�니다.
-block.underflow-gate.description = 오버플로 게�트� 반대. 왼쪽 � 오른쪽 경로가 차단�면 전면으로 출력�니다.
-block.mass-driver.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.liquid-router.description = 한 방향�서 액체를 받아 최대 3개� 다른 방향으로 ��하게 출력합니다. �정량� 액체를 저장할 수� 있으며 한 소스�서 여러 대�으로 액체를 분할하는 � 유용합니다.
-block.liquid-tank.description = 대량� 액체를 저장합니다. 재료가 �정하지 않� �황�서 버�를 �성하거나 중요한 블�� 냉�하기 위한 보호 장치로 사용하세요.
-block.liquid-junction.description = � 개� �차 파�프를 위한 다리 역할� 합니다. 다른 액체를 다른 위치로 운반하는 � 개� 다른 파�프가 있는 �황�서 유용합니다.
-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.payload-source.description = 화물� 무한히 출력합니다. 샌드박스 전용.
+block.payload-void.description = 화물� 제거합니다. 샌드박스 전용.
+block.copper-wall.description = � 발사체로부터 아군 구조물� 보호합니다.
+block.copper-wall-large.description = � 발사체로부터 아군 구조물� 보호합니다.\n여러 타�� 차지합니다.
+block.titanium-wall.description = � 발사체로부터 아군 구조물� 보호합니다.
+block.titanium-wall-large.description = � 발사체로부터 아군 구조물� 보호합니다.\n여러 타�� 차지합니다.
+block.plastanium-wall.description = � 발사체로부터 아군 구조물� 보호합니다. 레�저와 전격� �수하고 노드� �� 전� 연결� 차단합니다.
+block.plastanium-wall-large.description = � 발사체로부터 아군 구조물� 보호합니다. 레�저와 전격� �수하고 노드� �� 전� 연결� 차단합니다.\n여러 타�� 차지합니다.
+block.thorium-wall.description = � 발사체로부터 아군 구조물� 보호합니다. 내구성� 강합니다.
+block.thorium-wall-large.description = � 발사체로부터 아군 구조물� 보호합니다. 내구성� 강합니다.\n여러 타�� 차지합니다.
+block.phase-wall.description = � 발사체로부터 아군 구조물� 보호합니다. 충�한 탄환 대부분� 반사합니다.
+block.phase-wall-large.description = � 발사체로부터 아군 구조물� 보호합니다. 충�한 탄환 대부분� 반사합니다. \n여러 타�� 차지합니다.
+block.surge-wall.description = � 발사체로부터 아군 구조물� 보호합니다. 접촉 시 무작위로 전격 아�를 방출합니다.
+block.surge-wall-large.description = � 발사체로부터 아군 구조물� 보호합니다. 접촉 시 무작위로 전격 아�를 방출합니다.\n여러 타�� 차지합니다.
+block.scrap-wall.description = � 발사체로부터 아군 구조물� 보호합니다.
+block.scrap-wall-large.description = � 발사체로부터 아군 구조물� 보호합니다.
+block.scrap-wall-huge.description = � 발사체로부터 아군 구조물� 보호합니다.
+block.scrap-wall-gigantic.description = � 발사체로부터 아군 구조물� 보호합니다.
+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.shock-mine.description = 접촉한 � 유닛�게 전격 아�를 방출합니다.
+block.conveyor.description = ��� 앞으로 운반합니다. 회전하여 방향� 바꿀 수 있습니다.
+block.titanium-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.router.details = 필요악. �� 입력� 위해 공장 옆� 설치하는 것� 그 공장� 출력으로 �해 막� 수 있으므로 사용하지 않는 것� 좋�.
+block.distributor.description = 입력� ��� 최대 7개� 다른 방향으로 �등하게 분배합니다.
+block.overflow-gate.description = 앞쪽 경로가 차단� 경우�만 왼쪽과 오른쪽으로 출력합니다.
+block.underflow-gate.description = �화 필터� 반대. 왼쪽 � 오른쪽 경로가 차단�면 앞쪽으로 출력합니다.
+block.mass-driver.description = 장거리 �� 운송 구조물. ��� 모아서 연결� 매스 드��버로 발사합니다. 작�하려면 전력� 필요합니다.
+block.mechanical-pump.description = 액체를 � 올립니다. 전력� 필요하지 않습니다.
+block.rotary-pump.description = 액체를 � 올립니다. 작�하려면 전력� 필요합니다.
+block.impulse-pump.description = 액체를 � 올립니다. 작�하려면 전력� 필요합니다.
+block.conduit.description = 액체를 앞으로 움�입니다. 펌프 � 다른 파�프와 함께 사용합니다.
+block.pulse-conduit.description = 액체를 앞으로 움�입니다. 파�프보다 � 빠르게 운반하고 � 많� 저장합니다.
+block.plated-conduit.description = 액체를 앞으로 움�입니다. 측면�서 액체를 받아들�지 않습니다. 액체를 누설하지 않습니다.
+block.liquid-router.description = 한 방향�서 액체를 받아 최대 3개� 다른 방향으로 �등하게 출력합니다. �정량� 액체� 저장할 수 있습니다.
+block.liquid-container.description = �당한 양� 액체를 저장합니다. 액체 분배기와 비슷하게 모든 면� 출력할 수 있습니다.
+block.liquid-tank.description = 많� 양� 액체를 저장합니다. 액체 분배기와 비슷하게 모든 면� 출력할 수 있습니다.
+block.liquid-junction.description = � 개� �차 파�프를 위한 다리 역할� 합니다.
+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-large.description = �반 배터리보다 훨씬 � 많� 전력� 저장합니다.
-block.combustion-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.thorium-reactor.description = 토륨으로부터 �당한 양� 전력� �산합니다. 지��� 냉�� 필요하며, 충분한 양� 냉�수가 공급�지 않으면 �게 �발합니다. 전력 출력� 토륨� 양� 따� 달�집니다.
-block.impact-reactor.description = 최고 효율로 대량� 전력� �산할 수 있는 고급 발전기. 프로세스를 시작하려면 �당한 전력 공급� 필요합니다.
-block.mechanical-drill.description = 가격� 싼 드릴. �절한 타�� 설치하면 ��� 천천히 �린 ��로 출력합니다. 기본 ��만 채굴할 수 있습니다.
-block.pneumatic-drill.description = 티타늄� 캘 수 있는 향�� 드릴. 기계� 드릴보다 � 빠른 ��로 채굴합니다.
-block.laser-drill.description = 레�저 기술� 통해 �욱 빠르게 채광할 수 있지만, 전력� 필요합니다. 토륨 채굴 가능.
-block.blast-drill.description = 최�위 드릴. 많� 양� 전력� 필요합니다.
+block.combustion-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.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.details = 재발견� 기술. 가장 효율�으로 대량� 유기체를 �산할 때 사용�다. 과거, 세르플로� 뒤�� ��� 최초 배양지로 �단�다.
+block.cultivator.description = 대기� �함� 미세한 ��� ��를 산업용 ��로 배양합니다.
+block.cultivator.details = 복구� 기술. 최대한 효율�으로 �물��� �산할 때 사용�. 현재 세르플로를 뒤�� ��� 최초 배양지� 가능성� 높�.
 block.oil-extractor.description = �유를 추출하기 위해 많� 양� 전력과 모래 � 물� 사용합니다.
-block.core-shard.description = 기지� 핵심입니다. 파괴�면 해당 지역과� 모든 연결� �어집니다. �런 �� �어나지 않�� 하십시오.
-block.core-shard.details = 첫 번째 버전. 휴대용. �가복제 가능. �회용 출격 추진기를 가졌으며, 행성간 ���는 부�합함.
-block.core-foundation.description = 기지� 핵심입니다. � 나� 방어력과 ��� 저장합니다.
-block.core-foundation.details =  � 번째 버전.
-block.core-nucleus.description = 기지� 핵심입니다. 방어력� 매우 높고 대량� ��� 저장할 수 있습니다.
+block.core-shard.description = 기지� 핵심입니다. 파괴�면 해당 지역� 잃습니다.
+block.core-shard.details = 첫 번째 버전. 휴대용. �가복제 가능. �회용 출격 추진기를 장착했으며, 행성간 ���는 부�합함.
+block.core-foundation.description = 기지� 핵심입니다.코어: 조�보다 튼튼하고 � 많� 양� ��� 저장합니다.
+block.core-foundation.details = � 번째 버전.
+block.core-nucleus.description = 기지� 핵심입니다. 매우 튼튼하고 엄청나게 많� 양� ��� 저장할 수 있습니다.
 block.core-nucleus.details = 세 번째, �극� 버전.
-block.vault.description = � 유형� 많� 양� ��� 저장합니다. 언로� 블�� 사용하여 창고�서 ��� 빼낼 수 있습니다.
-block.container.description = � 유형� ��� 소량 저장합니다. 언로� 블�� 사용하여 컨테�너�서 ��� 빼낼 수 있습니다.
-block.unloader.description = 근처� 비 수송 블��서 ��� 빼냅니다. 눌러서 빼낼 ��� 변경할 수 있십니다.
-block.launch-pad.description = 코어 출격 없�� ��� 묶어 출격시킬 수 있습니다.
-block.duo.description = ��게 탄환� �대하며 발사합니다.
-block.scatter.description = �군�게 납, 고철, �는 강화 유리 조� �어리를 발사합니다.
+block.vault.description = � 종류별로 많� 양� ��� 저장합니다. 코어 옆� 배치하면 저장 용량� 확장합니다. 언로�를 사용하여 내용물� 빼낼 수 있습니다.
+block.container.description = � 종류별로 �� 양� ��� 저장합니다. 코어 옆� 배치하면 저장 용량� 확장합니다. 언로�를 사용하여 내용물� 빼낼 수 있습니다.
+block.unloader.description = 선�한 ��� 근처� 블��서 빼냅니다. 수송 블� � �탑� 대�으로 작�하지 않습니다.
+block.launch-pad.description = 선�한 지역으로 ��� 출격합니다.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = �� 향해 번갈아 탄환� 발사합니다.
+block.scatter.description = 공중 목표물� 향해 납, 고철, �는 강화유리 조� �어리를 발사합니다.
 block.scorch.description = 주변� 모든 지� �� 불태�니다. 근거리�서 매우 효과�입니다.
-block.hail.description = 장거리� 걸� 지� ��게 작� �탄� 발사합니다.
-block.wave.description = ��게 액체 줄기를 발사합니다. 물� 공급�면 ��으로 화재를 진압합니다.
-block.lancer.description = 지� 목표물�게 강력한 �너지 빔� 충전하여 발사합니다.
-block.arc.description = 지� 목표물�게 전격 아�를 발사합니다.
-block.swarmer.description = ��게 유�탄� 발사합니다.
-block.salvo.description = ��게 �알� 빠르게 �제히 발사합니다.
-block.fuse.description = 주변 ��게 3개� 단거리 관통 레�저를 발사합니다.
-block.ripple.description = 장거리� 걸� 지� ��게 �탄 무리를 발사합니다.
-block.cyclone.description = 근처 ��게 �발 파편 �어리를 발사합니다.
-block.spectre.description = 공중 � 지� 목표물�게 � 관통 철갑탄� 발사합니다.
-block.meltdown.description = 주변 ��게 지��� 레�저 빔� 충전하여 발사합니다. 냉� 액체가 있어야 작�합니다.
-block.foreshadow.description = 장거리� 걸친 거대한 단� 목표 저격탄� 발사합니다.
-block.repair-point.description = �근� 가장 가까운 유닛� 지��으로 치료합니다.
-block.segment.description = 날아오는 발사체를 요격합니다. � 발사체�� 조준�지 않습니다.
-block.parallax.description = 공중 목표물� �어오는 견� 광선� 발사하며, 견� 과정�서 �미지를 �니다.
-block.tsunami.description = ��게 강력한 액체 줄기를 발사합니다. 물� 공급�면 ��으로 주변� 화재를 진압합니다.
-block.silicon-crucible.description = 추가�으로 파��타�트를 사용하여 � 높� 온��서 �탄과 모래를 제련합니다. 뜨거운 곳�서 � 효율�입니다.
-block.disassembler.description = 광재를 낮� 확률로 미량� �귀한 광물들로 분리합니다. 토륨� �산할 수 있습니다.
-block.overdrive-dome.description = �근 블�들� 과부하시킵니다. 작�하기 위해 실리콘과 메타가 필요합니다.
-block.payload-conveyor.description = 유닛�나 공장같� � 화물들� 운반합니다.
-block.payload-router.description = 3가지 방향으로 번갈아서 화물들� 운반합니다.
-block.command-center.description = 4개� 명령어들로 유닛 행�� 제어합니다.
-block.ground-factory.description = 지� 유닛들� �산합니다. �산� 유닛들� 바로 사용� 수 있고, �는 강화를 위해 재구성기� 들어가질 수 있습니다.
-block.air-factory.description = 공중 유닛들� �산합니다. �산� 유닛들� 바로 사용� 수 있고, �는 강화를 위해 재구성기� 들어가질 수 있습니다.
-block.naval-factory.description = 해� 유닛들� �산합니다. �산� 유닛들� 바로 사용� 수 있고, �는 강화를 위해 재구성기� 들어가질 수 있습니다.
-block.additive-reconstructor.description = 들어온 유닛들� � 번째 티어로 강화합니다.
-block.multiplicative-reconstructor.description = 들어온 유닛들� 세 번째 티어로 강화합니다.
-block.exponential-reconstructor.description = 들어온 유닛들� 네 번째 티어로 강화합니다.
-block.tetrative-reconstructor.description = 들어온 유닛들� 다섯 번째, �극� 티어로 강화합니다.
+block.hail.description = 장거리� 걸� 지� �� 향해 작� �탄� 발사합니다.
+block.wave.description = �� 향해 액체 줄기를 발사합니다. 물� 공급�면 ��으로 화재를 진압합니다.
+block.lancer.description = 지� 목표물� 향해 강력한 �너지 빔� 충전하여 발사합니다.
+block.arc.description = 지� 목표물� 향해 전격 아�를 발사합니다.
+block.swarmer.description = �� 향해 유� 미사�� 발사합니다.
+block.salvo.description = �� 향해 �알� 빠르게 �제히 발사합니다.
+block.fuse.description = 가까운 �� 향해 3발� 단거리 관통 레�저를 발사합니다.
+block.ripple.description = 장거리� 걸� 지� �� 향해 �탄 무리를 발사합니다.
+block.cyclone.description = 근처 �� 향해 �발 파편 �어리를 발사합니다.
+block.spectre.description = 공중 � 지� 목표물� 향해 � 관통 철갑탄� 발사합니다.
+block.meltdown.description = 주변 �� 향해 지��� 레�저 빔� 충전하여 발사합니다. 작�하려면 냉� 액체가 필요합니다.
+block.foreshadow.description = 장거리� 걸친 거대한 단� 목표 저격탄� 발사합니다. 최대 체력� 높� �� 먼저 조준합니다.
+block.repair-point.description = 피해를 입� 가장 가까운 기체를 지��으로 수리합니다.
+block.segment.description = 날아오는 발사체를 요격합니다. 전격 � 레�저 발사체는 조준하지 않습니다.
+block.parallax.description = 공중 목표물� �어오는 견� 광선� 발사하며, 견� 중� 피해를 입힙니다.
+block.tsunami.description = �� 향해 강력한 액체 줄기를 발사합니다. 물� 공급�면 ��으로 화재를 진압합니다.
+block.silicon-crucible.description = 파��타�트를 추가 열�으로 사용하여 모래와 �탄�서 실리콘� 정제합니다. 뜨거운 곳�서 � 효율�입니다.
+block.disassembler.description = 광재를 낮� 효율로 미량� �귀한 광물들로 분리합니다. 토륨� �산할 수 있습니다.
+block.overdrive-dome.description = 주변 건물� ��를 높입니다. 작�하려면 위� 섬유와 실리콘� 필요합니다.
+block.payload-conveyor.description = 공장�서 �산� 유닛 같� � 화물� 운반합니다.
+block.payload-router.description = 화물� 3가지 방향으로 번갈아 운반합니다.
+block.ground-factory.description = 지� 유닛� �산합니다. �산� 유닛� 바로 사용하거나 강화를 위해 재구성기로 ��할 수 있습니다.
+block.air-factory.description = 공중 유닛� �산합니다. �산� 유닛� 바로 사용하거나 강화를 위해 재구성기로 ��할 수 있습니다.
+block.naval-factory.description = 해� 유닛� �산합니다. �산� 유닛� 바로 사용하거나 강화를 위해 재구성기로 ��할 수 있습니다.
+block.additive-reconstructor.description = 들어온 유닛� � 번째 단계로 강화합니다.
+block.multiplicative-reconstructor.description = 들어온 유닛� 세 번째 단계로 강화합니다.
+block.exponential-reconstructor.description = 들어온 유닛� 네 번째 티어로 강화합니다.
+block.tetrative-reconstructor.description = 들어온 유닛� 다섯 번째, 최종 단계로 강화합니다.
 block.switch.description = on/off 가능한 스위치입니다. 스위치 �태는 프로세서� �해 �히거나 제어� 수 있습니다.
 block.micro-processor.description = 로� 실행문� 순서대로 무한히 실행합니다. 유닛 �는 건물� 제어하는 � 쓰� 수 있습니다.
 block.logic-processor.description = 로� 실행문� 순서대로 무한히 실행합니다. 유닛 �는 건물� 제어하는 � 쓰� 수 있습니다. 마��로 프로세서보다 실행 ��가 � 빠릅니다.
 block.hyper-processor.description = 로� 실행문� 순서대로 무한히 실행합니다. 유닛 �는 건물� 제어하는 � 쓰� 수 있습니다. 로� 프로세서보다 실행 ��가 � 빠릅니다.
 block.memory-cell.description = 프로세서를 위한 ��터를 저장합니다.
-block.memory-bank.description = 프로세서를 위한 ��터를 저장합니다. 저장 공간� 셀보다 �니다.
-block.logic-display.description = 프로세서를 �용해 그래픽� 출력할 수 있습니다.
-block.large-logic-display.description = 프로세서를 �용해 그래픽� 출력할 수 있습니다.
-block.interplanetary-accelerator.description = 거대한 전�기 레�건 타워. 코어를 행성 간 ��� 위한 탈출 ��까지 가�합니다. 
+block.memory-bank.description = 프로세서를 위한 ��터를 저장합니다. � 용량� 지니고 있습니다.
+block.logic-display.description = 프로세서를 �용해 임�로 그래픽� 출력할 수 있습니다.
+block.large-logic-display.description = 프로세서를 �용해 임�로 그래픽� 출력할 수 있습니다.
+block.interplanetary-accelerator.description = 거대한 전�기 레�건 타워. 행성 간 ��� 위한 탈출 ��까지 코어를 가�합니다.
+block.repair-turret.description = 피해를 입� 가장 가까운 유닛� 지��으로 수리합니다. 선��으로 냉�수를 넣� 수 있습니다.
 
-unit.dagger.description = 주변 모든 ��게 �반�� 탄환� 발사합니다. 
-unit.mace.description = 주변 모든 ��게 화염 줄기를 발사합니다.
-unit.fortress.description = 지� 목표물� 장거리 �탄� 발사합니다.
-unit.scepter.description = 주변 모든 ��게 장전� 탄환� �제히 발사합니다.
-unit.reign.description = 주변 모든 ��게 거대한 관통 탄환� �제히 발사합니다.
-unit.nova.description = ��게 피해를 주고, 아군 구조물� 수리하는 레�저 볼트를 발사합니다. 비행할 수 있습니다.
-unit.pulsar.description = ��게 피해를 주고, 아군 구조물� 수리하는 전격� 발사합니다. 비행할 수 있습니다.
-unit.quasar.description = ��게 피해를 주고, 아군 구조물� 수리하는 관통 레�저 빔� 발사합니다. 비행할 수 있습니다. 역장� 가지고 있습니다.
-unit.vela.description = ��게 피해를 주고, 아군 구조물들� 수리하는 거대한 지��� 레�저 빔� 발사합니다. 비행할 수 있습니다.
+#Erekir
+block.core-bastion.description = 기지� 핵심입니다. 튼튼합니다. 한번 파괴�면, 구역� 잃습니다.
+block.core-citadel.description = 기지� 핵심입니다. � 튼튼합니다. 코어: 요새보다 � 많� 양� ��� 저장합니다.
+block.core-acropolis.description = 기지� 핵심입니다. 매우 튼튼합니다. 코어: 성채보다 � 많� 양� ��� 저장합니다.
+block.breach.description = � 대��게 관통하는 베릴륨 �는 텅스� 탄환� 발사합니다.
+block.diffuse.description = 넓� �뿔 모양으로 탄환� 발사합니다. � 대�� 뒤로 밀어냅니다.
+block.sublimate.description = � 대��게 화염� 연� 분사합니다. 장갑� 관통합니다.
+block.titan.description = 지� 목표물� 향해 거대한 �발 �탄� 발사합니다. 수소가 필요합니다.
+block.afflict.description = 대전� 거대한 조��어리 구체를 발사합니다. 열� 필요합니다.
+block.disperse.description = 공중 목표물� 향해 파편 �격� 가합니다.
+block.lustre.description = � 대��게 �리게 움��는 단� 표� 레�저를 발사합니다.
+block.scathe.description = 매우 멀리있는 지� 목표물� 향해 강력한 미사�� 발사합니다.
+block.smite.description = 날카로운 번개를 내뿜는 관통 �발탄� 발사합니다.
+block.malign.description = � 대�� 향해 유� 레�저 전하 세례를 �붓습니다. 대량� 열� 필요합니다.
+block.silicon-arc-furnace.description = 모래와 �연�서 실리콘� 정제합니다.
+block.oxidation-chamber.description = 베릴륨과 오존� 산화물로 전환합니다. 부산물로 열� 방출합니다.
+block.electric-heater.description = 블�� 열� 가합니다. 많� 양� 전력� 필요합니다.
+block.slag-heater.description = 블�� 열� 가합니다. 광재가 필요합니다.
+block.phase-heater.description = 블�� 열� 가합니다. 위� 섬유가 필요합니다.
+block.heat-redirector.description = 누�� 열� 다른 블�으로 전달합니다.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = 축�� 열� 세 가지 출력 방향으로 분산시킵니다.
+block.electrolyzer.description = 물� 수소와 오존 가스로 변환합니다.
+block.atmospheric-concentrator.description = 대기�서 질소를 �축합니다. 열� 필요합니다.
+block.surge-crucible.description = 광재와 실리콘으로 설금� 형성합니다. 열� 필요합니다.
+block.phase-synthesizer.description = 토륨, 모래 � 오존으로부터 위� 섬유를 합성합니다. 열� 필요합니다.
+block.carbide-crucible.description = �연과 텅스�� 탄화물로 융합합니다. 열� 필요합니다.
+block.cyanogen-synthesizer.description = 아르키사�트와 �연으로부터 시아노�� 합성합니다. 열� 필요합니다.
+block.slag-incinerator.description = 비휘발성 �� �는 액체를 소�합니다. 광재가 필요합니다.
+block.vent-condenser.description = 분출구�서 나오는 가스를 물로 �축합니다. 전력� 소비합니다.
+block.plasma-bore.description = 광� 벽� 향하여 배치하면 ��� �임없� 출력합니다. 소량� 전력� 필요합니다.
+block.large-plasma-bore.description = � � 플�즈마 채광기. 텅스�과 토륨� 채굴할 수 있습니다. 수소와 전력� 필요합니다.
+block.cliff-crusher.description = 벽� 부수고 모래를 �임없� 배출합니다. 전력� 필요합니다. 효율� 벽� 유형� 따� 다릅니다.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = 광�� 배치하면 ��� 한번� 몰아서, �임없� 출력합니다. 전력과 물� 필요합니다.
+block.eruption-drill.description = 개선� 충격 드릴. 토륨� 채굴할 수 있습니다. 수소가 필요합니다.
+block.reinforced-conduit.description = 유체를 앞으로 ��합니다. 측면�서 파�프가 아닌 입력� 허용하지 않습니다.
+block.reinforced-liquid-router.description = 유체를 모든 면� 균등하게 분배합니다.
+block.reinforced-liquid-tank.description = 대량� 유체를 저장합니다.
+block.reinforced-liquid-container.description = �당량� 유체를 저장합니다.
+block.reinforced-bridge-conduit.description = 구조물 � 지형 위로 유체를 운반합니다.
+block.reinforced-pump.description = 액체를 � 올리고 출력합니다. 수소가 필요합니다.
+block.beryllium-wall.description = �� 발사체로부터 구조물� 보호합니다.
+block.beryllium-wall-large.description = �� 발사체로부터 구조물� 보호합니다.
+block.tungsten-wall.description = �� 발사체로부터 구조물� 보호합니다.
+block.tungsten-wall-large.description = �� 발사체로부터 구조물� 보호합니다.
+block.carbide-wall.description = �� 발사체로부터 구조물� 보호합니다.
+block.carbide-wall-large.description = �� 발사체로부터 구조물� 보호합니다.
+block.reinforced-surge-wall.description = �� 발사체로부터 구조물� 보호하며, 발사체와 접촉하면 주기�으로 전기 아�를 발사합니다.
+block.reinforced-surge-wall-large.description = �� 발사체로부터 구조물� 보호하며, 발사체와 접촉하면 주기�으로 전기 아�를 발사합니다.
+block.shielded-wall.description = �� 발사체로부터 구조물� 보호합니다. 전�� 공급� 때 대부분� 발사체를 �수하는 보호막� 전개합니다. �접한 블�� 전�� 공급합니다.
+block.blast-door.description = 아군 지� 유닛� 범위 내� 있� 때 열리는 벽입니다. 수�으로 제어할 수 없습니다.
+block.duct.description = ��� 앞으로 ��합니다. 한 개� ��만 저장할 수 있습니다.
+block.armored-duct.description = ��� 앞으로 ��합니다. 측면�서 �관� 아닌 입력� 허용하지 않습니다.
+block.duct-router.description = ��� 세 방향으로 균등하게 분배합니다. 뒤쪽�서만 ��� 받습니다. �� 필터로 활용할 수 있습니다.
+block.overflow-duct.description = 앞쪽 경로가 차단� 경우�만 ��� 왼쪽과 오른쪽으로 출력합니다.
+block.duct-bridge.description = 구조물 � 지형 위로 ��� ��합니다.
+block.duct-unloader.description = 선�한 ��� 뒤� 블��서 빼냅니다. 코어�서 빼낼 수 없습니다.
+block.underflow-duct.description = �화 �관� 반대입니다. 왼쪽 � 오른쪽 경로가 차단� 경우 앞쪽으로 출력합니다.
+block.reinforced-liquid-junction.description = � 개� �차 파�프 사�� 다리 역할� 합니다.
+block.surge-conveyor.description = ��� �괄�으로 ��합니다. 전력� 공급하여 가�할 수 있습니다. �접한 블�� 전�� 공급합니다.
+block.surge-router.description = 설금 컨베�어�서 ��� 세 방향으로 균등하게 분배합니다. 전력� 공급하여 가�할 수 있습니다. �접한 블�� 전�� 공급합니다.
+block.unit-cargo-loader.description = 화물용 드론� 제작합니다. 드론� ��으로 ��과 �치하는 필터로 설정� 기체 화물 하역지�으로 분배합니다.
+block.unit-cargo-unload-point.description = 화물 드론� 하역지� 역할� 합니다. 선�한 필터와 �치하는 ��� 받아들입니다.
+block.beam-node.description = 전력� 다른 블�� �선 방향으로 전송합니다. 소량� 전력� 저장합니다.
+block.beam-tower.description = 전력� 다른 블�� �선 방향으로 전송합니다. 대량� 전력� 저장합니다. 장거리 연결� 가능합니다.
+block.turbine-condenser.description = 분출구� 배치할 때 전력� 발�시킵니다. 소량� 물� �산합니다.
+block.chemical-combustion-chamber.description = 아르키사�트와 오존으로 전력� �산합니다.
+block.pyrolysis-generator.description = 아르키사�트와 광재로 많� 양� 전력� �산합니다. 부산물로 물� 발�합니다.
+block.flux-reactor.description = 가열 시 많� 양� 전력� 발�시킵니다. 안정제로 시아노�� 필요합니다. 전력 출력 � 시아노� 요구량� 열 입력� 비례합니다.\n시아노�� 부족할 경우 �발합니다.
+block.neoplasia-reactor.description = 아르키사�트, 물 � 위� 섬유를 사용하여 많� 양� 전력� �산합니다. 부산물로 열과 위험한 신�물� 발�합니다.\n�관� 통해 반�로�서 신�물� 제거�지 않으면 격렬하게 �발합니다.
+block.build-tower.description = 범위 내� 구조물� ��으로 재구축하고 다른 유닛� 건설� 지�합니다.
+block.regen-projector.description = 정사�형 둘레� 범위 안� 있는 아군 구조물� 천천히 수리합니다. 수소가 필요합니다.
+block.reinforced-container.description = 소량� ��� 저장합니다. 내용물� 언로�를 통해 빼낼 수 있습니다. 코어� 저장 용량� 늘리지 않습니다.
+block.reinforced-vault.description = 대량� ��� 저장합니다. 내용물� 언로�를 통해 빼낼 수 있습니다. 코어� 저장 용량� 늘리지 않습니다.
+block.tank-fabricator.description = 스텔 유닛� �산합니다. �산� 유닛� �접 사용하거나 강화를 위해 재조립 장치로 ��할 수 있습니다.
+block.ship-fabricator.description = �루드 유닛� �산합니다. �산� 유닛� �접 사용하거나 강화를 위해 재조립 장치로 ��할 수 있습니다.
+block.mech-fabricator.description = 메루� 유닛� �산합니다. �산� 유닛� �접 사용하거나 강화를 위해 재조립 장치로 ��할 수 있습니다.
+block.tank-assembler.description = 입력� 블�과 유닛으로 대형 전차를 조립합니다. 모듈� 추가하여 출력�는 유닛� 등급� �향할 수 있습니다.
+block.ship-assembler.description = 입력� 블�과 유닛으로 대형 함선� 조립합니다. 모듈� 추가하여 출력�는 유닛� 등급� �향할 수 있습니다.
+block.mech-assembler.description = 입력� 블�과 유닛으로 대형 기계를 조립합니다. 모듈� 추가하여 출력�는 유닛� 등급� �향할 수 있습니다.
+block.tank-refabricator.description = 입력� 전차 유닛� � 번째 등급으로 강화합니다.
+block.ship-refabricator.description = 입력� 함선 유닛� � 번째 등급으로 강화합니다.
+block.mech-refabricator.description = 입력� 기계 유닛� � 번째 등급으로 강화합니다.
+block.prime-refabricator.description = 입력� 유닛� 세 번째 등급으로 강화합니다.
+block.basic-assembler-module.description = 조립 경계 옆� 배치하면 조립대 등급� �가합니다. 전력� 필요합니다. 화물 입력으로 사용할 수 있습니다.
+block.small-deconstructor.description = 입력� 구조물 � 유닛� 분해합니다. 제작 비용� 100%를 반환합니다.
+block.reinforced-payload-conveyor.description = 화물� 앞으로 ��합니다.
+block.reinforced-payload-router.description = 화물� �접 블�으로 분배합니다. 필터가 설정�면 필터로 작�합니다.
+block.payload-mass-driver.description = 장거리 화물 운송 구조물. 받� 화물� 연결� 화물 매스 드��버로 발사합니다.
+block.large-payload-mass-driver.description = 장거리 화물 운송 구조물. 받� 화물� 연결� 화물 매스 드��버로 발사합니다.
+block.unit-repair-tower.description = 주변� 모든 유닛� 수리합니다. 오존� 필요합니다.
+block.radar.description = 넓� 반경� 지형과 � 유닛� 서서히 파악합니다. 전력� 필요합니다.
+block.shockwave-tower.description = 반경 내 �� 발사체� 피해를 입히고 파괴합니다. 시아노�� 필요합니다.
+block.canvas.description = 미리 정�� 팔레트를 사용하여 단순 �미지를 표시합니다. 편집 가능.
+
+unit.dagger.description = 주변� 모든 �� 향해 �반�� 탄환� 발사합니다.
+unit.mace.description = 주변� 모든 �� 향해 화염 줄기를 발사합니다.
+unit.fortress.description = 지� 목표물� 향해 장거리 �탄� 발사합니다.
+unit.scepter.description = 주변� 모든 �� 향해 장전� 탄환� �제히 발사합니다.
+unit.reign.description = 주변� 모든 �� 향해 거대한 관통 탄환� �제히 발사합니다.
+unit.nova.description = ��게 피해를 주고, 아군 구조물� 수리하는 레�저 볼트를 발사합니다. �륙할 수 있습니다.
+unit.pulsar.description = ��게 피해를 주고, 아군 구조물� 수리하는 전격� 발사합니다. �륙할 수 있습니다.
+unit.quasar.description = ��게 피해를 주고, 아군 구조물� 수리하는 관통 레�저 빔� 발사합니다. �륙할 수 있습니다. 역장� 가지고 있습니다.
+unit.vela.description = ��게 피해를 주고, 아군 구조물� 수리하는 거대한 지��� 레�저 빔� 발사합니다. �륙할 수 있습니다.
 unit.corvus.description = ��게 피해를 주고, 아군 구조물� 수리하는 거대한 레�저 블레스트를 발사합니다. 대부분� 지형 위를 밟� 수 있습니다.
-unit.crawler.description = ��게 달려들어서 거대한 �발� �으키는 ��� 합니다.
-unit.atrax.description = 지� 목표물� 약화하는 광재 구체를 발사합니다. 대부분� 지형 위를 밟� 수 있습니다.
-unit.spiroct.description = ��게 �혈 레�저 빔� 발사하며, �혈� 통해 체력� 회복합니다. 대부분� 지형 위를 밟� 수 있습니다.
-unit.arkyid.description = ��게 � �혈 레�저 빔� 발사하며, �혈� 통해 체력� 회복합니다. 대부분� 지형 위를 밟� 수 있습니다.
-unit.toxopid.description = ��게 � 전격 �탄 무리와 관통 레�저를 발사합니다. 대부분� 지형 위를 밟� 수 있습니다.
-unit.flare.description = 지� 목표물� �반�� 탄환� 발사합니다. 
-unit.horizon.description = 지� 목표물� �탄� 투하합니다. 
-unit.zenith.description = 주변 모든 ��게 미사�� 살�합니다.
-unit.antumbra.description = 주변 모든 ��게 탄환들� �제히 발사합니다.
-unit.eclipse.description = 주변 모든 ��게 � 개� 관통 레�저와 대공 탄� �제히 발사합니다.
-unit.mono.description = ��으로 구리와 납� �서 코어로 넣습니다.
-unit.poly.description = ��으로 부서진 구조물� 재건설하거나 다른 유닛들� 건설� 보조합니다.
-unit.mega.description = ��으로 ��� 구조물� 수리합니다. 블��나 작� 지� 유닛들� 수송할 수 있습니다.
-unit.quad.description = 지� 목표물� ��게 피해를 주고, 아군 구조물� 수리하는 � �탄� 투하합니다. 중간 �기� 지� 유닛들� 수송할 수 있습니다. 
-unit.oct.description = 주변 아군들� 재� 역장으로 보호합니다. 대부분� 지� 유닛들� 수송할 수 있습니다. 
-unit.risso.description = 주변 모든 ��게 탄환과 미사�� �제히 발사합니다. 
-unit.minke.description = 주변 지� ��게 �반�� 탄환과 �탄� 발사합니다.
-unit.bryde.description = ��게 장거리 �탄과 미사�� 발사합니다. 
-unit.sei.description = ��게 방어력 관통 탄환과 미사�� �제히 발사합니다.
-unit.omura.description = ��게 장거리 관통 레�건� 발사합니다. 플레어를 �산합니다.
-unit.alpha.description = �으로부터 코어: 조�� 방어합니다. 구조물� 짓습니다.
-unit.beta.description = �으로부터 코어: 기반� 방어합니다. 구조물� 짓습니다.
-unit.gamma.description = �으로부터 코어: 핵심� 방어합니다. 구조물� 짓습니다.
+unit.crawler.description = �� 향해 달려가 ��하며, � �발� �으킵니다.
+unit.atrax.description = 지� 목표물� 향해 광재 구체를 발사합니다. 대부분� 지형 위를 밟� 수 있습니다.
+unit.spiroct.description = �� 향해 약화 레�저 빔� 발사하며, � 과정�서 스스로 회복합니다. 대부분� 지형 위를 밟� 수 있습니다.
+unit.arkyid.description = �� 향해 많� 약화 레�저 빔� 발사하며, � 과정�서 스스로 회복합니다. 대부분� 지형 위를 밟� 수 있습니다.
+unit.toxopid.description = �� 향해 � 전격 �탄 무리와 관통 레�저를 발사합니다. 대부분� 지형 위를 밟� 수 있습니다.
+unit.flare.description = 지� 목표물� 향해 �반�� 탄환� 발사합니다.
+unit.horizon.description = 지� 목표물� �탄� 투하합니다.
+unit.zenith.description = 주변� 모든 �� 향해 미사�� 발사합니다.
+unit.antumbra.description = 주변� 모든 �� 향해 탄환� �제히 발사합니다.
+unit.eclipse.description = 주변� 모든 �� 향해 � 개� 관통 레�저와 대공 탄환� �제히 발사합니다.
+unit.mono.description = ��으로 구리와 납� 채굴하여 코어� 넣습니다.
+unit.poly.description = ��으로 부서진 구조물� 재건하거나 다른 기체� 건설� 보조합니다.
+unit.mega.description = ��으로 ��� 구조물� 수리합니다. 블��나 작� 지� 기체를 수송할 수 있습니다.
+unit.quad.description = 지� 목표물� 아군 구조물� 수리하고 ��게 피해를 입히는 � �탄� 투하합니다. 중간 �기� 지� 기체를 수송할 수 있습니다.
+unit.oct.description = 재�하는 역장으로 주변 아군� 보호합니다. 대부분� 지� 기체를 수송할 수 있습니다.
+unit.risso.description = 주변� 모든 �� 향해 탄환과 미사�� �제히 발사합니다.
+unit.minke.description = 주변� 지� �� 향해 �반�� 탄환과 �탄� 발사합니다.
+unit.bryde.description = �� 향해 장거리 �탄과 미사�� 발사합니다.
+unit.sei.description = �� 향해 철갑탄과 미사�� �제히 발사합니다.
+unit.omura.description = �� 향해 장거리 관통 레�건� 발사합니다. 플레어를 �산합니다.
+unit.alpha.description = �으로부터 코어: 조�� 방어합니다. 건설할 수 있습니다.
+unit.beta.description = �으로부터 코어: 기반� 방어합니다. 건설할 수 있습니다.
+unit.gamma.description = �으로부터 코어: 핵심� 방어합니다. 건설할 수 있습니다.
+unit.retusa.description = 주변� �� 향해 유� 어뢰를 발사합니다. 아군 유닛� 수리합니다.
+unit.oxynoe.description = 주변� �� 향해 구조물� 수리하는 화염줄기를 발사합니다. 요격 �탑으로 주변� � 탄환� 요격합니다.
+unit.cyerce.description = 주변� �� 향해 유� 집� 미사�� 발사합니다. 아군 유닛� 수리합니다.
+unit.aegires.description = �너지 필드로 들어온 모든 � 기체와 구조물�게 충격� �니다. 모든 아군� 수리합니다.
+unit.navanax.description = � 전력�� �당한 피해를 주고 아군 블�� 수리하는 �발성 EMP 탄환� 발사합니다. 4개� �율 레�저 �탑으로 주변 �� 녹입니다.
+
+#Erekir
+unit.stell.description = � 대��게 �반�� 탄환� 발사합니다.
+unit.locus.description = � 대��게 번갈아 나오는 탄환� 발사합니다.
+unit.precept.description = � 대��게 관통하는 집�탄환� 발사합니다.
+unit.vanquish.description = � 대��게 관통하는 거대한 분열탄환� 발사합니다.
+unit.conquer.description = � 대��게 관통하는 거대한 탄환� ��를 발사합니다.
+unit.merui.description = 지� � 대��게 장사정�를 발사합니다. 대부분� 지형� 뛰어넘� 수 있습니다.
+unit.cleroi.description = � 대��게 �중 �탄� 발사합니다. 집중 방어 �탑으로 �� 발사체를 요격합니다. 대부분� 지형� 뛰어넘� 수 있습니다.
+unit.anthicus.description = � 대��게 장거리 유� 발사체를 발사합니다. 대부분� 지형� 뛰어넘� 수 있습니다.
+unit.tecta.description = � 대��게 유� 플�즈마 발사체를 발사합니다. 전방 보호막으로 스스로를 보호합니다. 대부분� 지형� 뛰어넘� 수 있습니다.
+unit.collaris.description = � 대��게 장거리 분열�탄� 발사합니다. 대부분� 지형� 뛰어넘� 수 있습니다.
+unit.elude.description = � 대��게 한 �� 유� 탄환� 발사합니다. 액체 위� 떠 있� 수 있습니다.
+unit.avert.description = � 대��게 비틀리는 한 �� 탄환� 발사합니다.
+unit.obviate.description = � 대��게 비틀리는 한 �� 전기 구체를 발사합니다.
+unit.quell.description = � 대��게 장거리 유� 발사체를 발사합니다. � 구조물 수리 블�� 억제합니다.
+unit.disrupt.description = � 대��게 장거리 유� 억제 발사체를 발사합니다. � 구조물 수리 블�� 억제합니다.
+unit.evoke.description = 코어: 요새를 지켜내기 위해 구조물� 건설합니다. 빔으로 구조물� 수리합니다.
+unit.incite.description = 코어: 성채를 지켜내기 위해 구조물� 건설합니다. 빔으로 구조물� 수리합니다.
+unit.emanate.description = 코어: �심� 지켜내기 위해 구조물� 건설합니다. 빔으로 구조물� 수리합니다.
+
+lst.read = 연결� 메모리 셀�서 숫�를 �습니다.
+lst.write = 연결� 메모리 셀� 숫�를 작성합니다.
+lst.print = 프린트 버�� �스트를 추가합니다.\n[accent]Print Flush[]가 사용�기 전까진 아무것� 보여주지 않습니다.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = �스트 버�� 다� 플레�스홀�를 값으로 바꿉니다.\n�리 표시� 패턴� 유효하지 않� 경우 아무것� 하지 않습니다.\n플레�스홀� 패턴: "{[accent]number 0-9[]}"\n예:\n[accent]print "test {0}"\nformat "example"
+lst.draw = 드로잉 버�� 실행문� 추가합니다.\n[accent]Draw Flush[]가 사용�기 전까진 아무것� 보여주지 않습니다.
+lst.drawflush = 대기중� [accent]Draw[]실행문� 디스플레�� 출력합니다.
+lst.printflush = 대기중� [accent]Print[]실행문� 메시지 블�� 출력합니다.
+lst.getlink = 순서별로 프로세서� 연결� 가져옵니다. 0부터 시작합니다.
+lst.control = 건물� 조종합니다.
+lst.radar = 건물 주변� 유닛� 검색합니다.
+lst.sensor = 건물 �는 유닛� 정보를 수집합니다.
+lst.set = 변수를 설정합니다.
+lst.operation = 1~2개� 변수로 연산합니다.
+lst.end = 실행줄� 가장 위로 건너�니다.
+lst.wait = �정 시간(초) �안 대기합니다.
+lst.stop = � 프로세서� 실행 중지합니다.
+lst.lookup = id를 통해 특정 유형� ��/액체/유닛/블�� 조회합니다.\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\n...로 � 유형� � 갯수를 알 수 있습니다.
+lst.jump = 조건부로 다른 실행문으로 건너�니다.
+lst.unitbind = type 옆� 있는 유닛� 지정하고, [accent]@unit[]� 저장합니다.
+lst.unitcontrol = 현재 지정� 유닛� 조종합니다.
+lst.unitradar = 현재 지정� 유닛 주변� 다른 유닛� 검색합니다.
+lst.unitlocate = 특정 유형� 위치/건물� 맵 ��서 조회.\n지정� 유닛� 필요합니다.
+lst.getblock = 특정 위치� 타� 정보를 불러옵니다.
+lst.setblock = 특정 위치� 타� 정보 설정합니다.
+lst.spawnunit = 특정 위치� 유닛� 소환합니다.
+lst.applystatus = 유닛�게 �태 ��� �용하거나 삭제합니다.
+lst.weathersense = 어떤 유형� 날씨가 활�하는지 확�합니다.
+lst.weatherset = 날씨 유형� 현재 �태를 설정합니다.
+lst.spawnwave = 특정 위치� �전 단계를 실행합니다.\n실제로 단계가 넘어가지는 않습니다.
+lst.explosion = 특정 위치� �발� �성합니다.
+lst.setrate = 프로세서 실행 ��를 틱당 연산량으로 설정합니다.
+lst.fetch = 유닛, 코어, 플레�어 �는 건물� 엔티티 번호로 조회합니다.\n번호는 0�서 시작하여 엔티티 번호-1�서 �납니다.
+lst.packcolor = 그리기 혹� 규칙 설정� 위해 [0, 1] RGBA 단� 요소로 묶습니다.
+lst.setrule = 게임 규칙� 설정합니다.
+lst.flushmessage = �스트 버�로부터 화면� 메세지를 표시합니다.\n�전 메세지가 완료� 때까지 기다립니다.
+lst.cutscene = 플레�어 카메�를 조작합니다.
+lst.setflag = 모든 프로세서가 �� 수 있는 전역 플래그 설정합니다.
+lst.getflag = 전역 플래그가 설정�어 있는지 확�합니다.
+lst.setprop = 유닛 혹� 건물� �성� 설정합니다.
+lst.effect = 파티� 효과를 만듭니다.
+lst.sync = 네트워� 전체�서 변수를 �기화합니다.\n1초� 최대 10번만 호출�니다.
+lst.playsound = 소리를 재�합니다.\n볼륨과 팬� 전역 값� � 수� 있고, 위치를 기준으로 계산� 수� 있습니다.
+lst.makemarker = 월드� 새로운 논리 마커를 만듭니다.\n � 마커를 �별할 ID를 제공해야 합니다.\n 현재 마커는 월드당 20,000개로 제한�어 있습니다.
+lst.setmarker = 마커� �성� 설정합니다.\n사용� ID는 마커 만들기 지침�서와 ��해야 합니다.
+lst.localeprint = �스트 버�� 맵 언어 팩 �성 값� 추가합니다.\n맵 편집기�서 맵 언어 팩� 설정하려면 [accent]맵 정보 > 언어 팩[]� 선�합니다.\n���언트가 모바� 기기� 경우 먼저 ".mobile"로 �나는 �성� print하려고 시�합니다.
+
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = 수학� �수; 파�(pi) (3.141...)
+lglobal.@e = 수학� �수; �연�수(e) (2.718...)
+lglobal.@degToRad = � 숫�를 곱하여 ��를 �디안으로 변환
+lglobal.@radToDeg = � 숫�를 곱하여 �디안� ��로 변환
+
+lglobal.@time = 현재 저장� 재� 시간(밀리초)
+lglobal.@tick = 현재 저장� 재� 시간(틱 단위, 1초 = 60틱)
+lglobal.@second = 현재 저장� 재� 시간(초)
+lglobal.@minute = 현재 저장 파�� 재� 시간(분)
+lglobal.@waveNumber = 현재 단계 번호(단계가 활성화� 경우)
+lglobal.@waveTime = 단계 카운트다운 타�머(초)
+lglobal.@mapw = 타� ​​단위� 맵 너비
+lglobal.@maph = 타� ​​단위� 맵 높�
+
+lglobal.sectionMap = 맵
+lglobal.sectionGeneral = �반
+lglobal.sectionNetwork = 네트워�/���언트 측 [월드 프로세서 전용]
+lglobal.sectionProcessor = 프로세서
+lglobal.sectionLookup = 조회
+
+lglobal.@this = 코드를 실행하는 로� 블�
+lglobal.@thisx = 코드를 실행하는 블�� X 좌표
+lglobal.@thisy = 코드를 실행하는 블�� Y 좌표
+lglobal.@links = � 프로세서� 연결� � 블� 수
+lglobal.@ipt = 틱당 명령어로 표현� 프로세서� 실행 ��(60틱 = 1초)
+
+lglobal.@unitCount = 게임�서 유닛 콘�츠 유형� � 수; 조회 지침과 함께 사용�
+lglobal.@blockCount = 게임� 블� 콘�츠 유형� � 수; 조회 지침과 함께 사용�
+lglobal.@itemCount = 게임� 아�템 콘�츠 유형� � 수; 조회 지침과 함께 사용�
+lglobal.@liquidCount = 게임� 액체 콘�츠 유형� � 수; 조회 지침과 함께 사용�
+
+lglobal.@server = 코드가 서버 �는 싱글 플레�어�서 실행�는 경우 true, 그렇지 않� 경우 false
+lglobal.@client = 코드가 서버� 연결� ���언트�서 실행�는 경우 true
+
+lglobal.@clientLocale = 코드를 실행하는 ���언트� 언어 팩. 예: en_US (한국어는 ko_KR)
+lglobal.@clientUnit = 코드를 실행하는 ���언트� 단위
+lglobal.@clientName = 코드를 실행하는 ���언트� 플레�어 �름
+lglobal.@clientTeam = 코드를 실행하는 ���언트� 팀 ID
+lglobal.@clientMobile = 코드를 실행하는 ���언트가 모바�� 있는 경우 true, 그렇지 않으면 false
+
+logic.nounitbuild = [red]유닛� 건설 로�� 여기�서 허용�지 않습니다.
+
+lenum.type = 건물/유닛� 유형\n예로 분배기는 문�열� 아니� [accent]@router[]를 반환합니다.
+lenum.shoot = 특정 위치� 발사
+lenum.shootp = 목표물 ��를 예측하여 발사
+lenum.config = 필터� 아�템같� 건물� 설정
+lenum.enabled = 블�� 활성 여부
+
+laccess.currentammotype = �탑� 현재 탄약/액체.
+laccess.color = 조명 색�.
+laccess.controller = 유닛 제어�. 프로세서가 제어하면, 프로세서를 반환합니다.\n다른 유닛� �해 지휘�면(G키), 지휘하는 유닛� 반환합니다.\n그 외�는 �신� 반환합니다.
+laccess.dead = 기체 �는 건물 사�/무효 여부.
+laccess.controlled = 만약 유닛 제어�가 프로세서�면 [accent]@ctrlProcessor[]를 반환합니다.\n만약 유닛/건물 제어�가 플레�어�면 [accent]@ctrlPlayer[]를 반환합니다.\n만약 유닛가 다른 유닛� �해 지휘�면(G키)[accent]@ctrlFormation[]를 반환합니다.\n그 외�는 0� 반환합니다.
+laccess.progress = 작업 진행률, 0 �서 1 로 �.\n�탑 재장전�나 구조물 진행률� 반환합니다.
+laccess.speed = 기체� 최대 ��, 타�/초.
+laccess.id = 유닛/블�/아�템/액체� ID.\n�것� 조회 작업� 역순입니다.
+
+lcategory.unknown = 알 수 없�
+lcategory.unknown.description = 분류�지 않� 설명
+lcategory.io = 입력 & 출력
+lcategory.io.description = 메모리 블� � 프로세서 버�� 내용� 수정
+lcategory.block = 블� 제어
+lcategory.block.description = 블�과 �호 작용
+lcategory.operation = ì—°ì‚°
+lcategory.operation.description = 논리� 연산
+lcategory.control = �름 제어
+lcategory.control.description = 실행 순서 관리
+lcategory.unit = 기체 제어
+lcategory.unit.description = 기체� 명령 하달
+lcategory.world = 세계
+lcategory.world.description = 세계� 작용하는 요소 제어
+
+graphicstype.clear = � 색으로 화면� 채우기
+graphicstype.color = 아래 그래픽 실행문들� 색 설정하기
+graphicstype.col = color와 ��하지만, 묶� 단위입니다.\n묶여진 색�� [accent]%[] 접�사가 있는 16진수 코드로 작성�니다.\n예시: [accent]%ff0000[] 는 빨강
+graphicstype.stroke = 선 굵기 설정하기
+graphicstype.line = 선분 그리기
+graphicstype.rect = �사�형 채우기
+graphicstype.linerect = �사�형 외곽선 그리기
+graphicstype.poly = 정다�형 채우기
+graphicstype.linepoly = 정다�형 외곽선 그리기
+graphicstype.triangle = 삼�형 채우기
+graphicstype.image = �부 콘�츠� �미지 그리기\n예: [accent]@router[] �는 [accent]@dagger[].
+graphicstype.print = 프린트 버��서 �스트를 그립니다.\n프린트 버�를 지�니다.
+
+lenum.always = 항� 참
+lenum.idiv = 정수 나누기
+lenum.div = 나누기\n0으로 나누면 [accent]null[]� 반환합니다.
+lenum.mod = 나머지
+lenum.equal = �치 비�. 형변환 가능\nNull� 아닌 �체가 숫�와 비�하려면 1� �고, 아니면 0� �니다.
+lenum.notequal = �치 부정. 형변환 가능
+lenum.strictequal = 엄격한 �치 비�. 형변환 불가능\n[accent]null[]� 확�할 때 쓸 수 있습니다.
+lenum.shl = 왼쪽으로 비트 ��
+lenum.shr = 오른쪽으로 비트 ��
+lenum.or = 비트연산� OR
+lenum.land = 논리연산� AND
+lenum.and = 비트연산� AND
+lenum.not = 비트연산� NOT
+lenum.xor = 비트연산� XOR
+
+lenum.min = � 수� 최솟값
+lenum.max = � 수� 최댓값
+lenum.angle = 벡터� �(�)
+lenum.anglediff = � �� 사�� 절대 거리(�).
+lenum.len = 벡터� 길�
+
+lenum.sin = 사�(�)
+lenum.cos = 코사�(�)
+lenum.tan = 탄젠트(�)
+
+lenum.asin = 아� 사�(�)
+lenum.acos = 아� 코사�(�)
+lenum.atan = 아� 탄젠트(�)
+
+#not a typo, look up 'range notation'
+lenum.rand = 범위 내 십진법 난수[0 ~ 값)
+lenum.log = �연 로그(진수)
+lenum.log10 = �수 로그
+lenum.noise = 2D 심플렉스 노�즈
+lenum.abs = 절댓값
+lenum.sqrt = 제곱근
+
+lenum.any = 아무 유닛
+lenum.ally = 아군 유닛
+lenum.attacker = 무기를 가진 유닛
+lenum.enemy = � 유닛
+lenum.boss = 수호� 유닛
+lenum.flying = 공중 유닛
+lenum.ground = 지� 유닛
+lenum.player = 플레�어� �해 조종� 유닛
+
+lenum.ore = 광� 매장지
+lenum.damaged = ��� 아군 건물
+lenum.spawn = � 스� 지�\n코어 �는 지�� 수 있습니다.
+lenum.building = 특정 건물 집단� �한 건물
+
+lenum.core = 아무 코어
+lenum.storage = 창고같� 저장 건물
+lenum.generator = 전력� �산하는 건물
+lenum.factory = ��� 변환하는 건물
+lenum.repair = 수리 지�
+lenum.battery = 배터리
+lenum.resupply = 보급 지�\n[accent]"기체 탄약 필요"[]가 활성화�었� 때만 유�미합니다.
+lenum.reactor = 핵융합로/토륨 ��로
+lenum.turret = �탑
+
+sensor.in = �지할 건물/기체
+
+radar.from = �지를 할 건물\n�지 범위는 건물� �지 범위� �해 제한�니다.
+radar.target = 유닛 �지 필터
+radar.and = 추가 필터
+radar.order = 정렬 순서. 0� 반전
+radar.sort = 결과를 정렬할 기준
+radar.output = 찾� 유닛� 대입할 변수
+
+unitradar.target = 유닛 �지 필터
+unitradar.and = 추가 필터
+unitradar.order = 정렬 순서. 0� 반전
+unitradar.sort = 결과를 정렬할 측정 수단
+unitradar.output = 찾� 유닛� 대입할 변수
+
+control.of = 조종할 건물
+control.unit = 조준할 유닛/건물
+control.shoot = 발사 여부
+
+unitlocate.enemy = � 건물 �함 여부
+unitlocate.found = 대� 발견 여부
+unitlocate.building = 찾� 건물� 대입할 변수
+unitlocate.outx = X좌표
+unitlocate.outy = Y좌표
+unitlocate.group = 찾� 건물 집단
+
+playsound.limit = true� 경우, 같� 프레임�서 �미 재�� 사운드는 재��지 않습니다.
+
+lenum.idle = �� 정지, 채광/건설 유지\n기본 �태입니다.
+lenum.stop = ��/채광/건설 중단
+lenum.unbind = 로� 컨트롤 완전 비활성화\n표준 AI를 다시 따릅니다.
+lenum.move = 특정 위치로 ��
+lenum.approach = 특정 위치로 반지름만� 접근
+lenum.pathfind = � 스� 지�으로 길찾기
+lenum.autopathfind = 가장 가까운 �� 코어�나 착륙 지�까지 ��으로 경로를 찾습니다.\n�것� �반�� 웨�브 � 경로 찾기와 ��합니다.
+lenum.target = 특정 위치� 발사
+lenum.targetp = 목표물 ��를 예측하여 발사
+lenum.itemdrop = 아�템 투하
+lenum.itemtake = 건물�서 아�템 수송
+lenum.paydrop = 현재 화물 투하
+lenum.paytake = 현재 위치�서 화물 수송
+lenum.payenter = 유닛 아래� 화물 건물� 착륙/진입
+lenum.flag = 깃발 수 설정
+lenum.mine = 특정 위치�서 채광
+lenum.build = 구조물 건설
+lenum.getblock = 좌표�서 건물, 층, 블� 유형� 가져옵니다.\n단위는 위치 범위 내� 있어야 하며, 그렇지 않으면 null� 반환�니다.
+lenum.within = 좌표 주변 기체 발견 여부
+lenum.boost = �륙 시작/중단
+
+lenum.flushtext = 해당�는 경우, 프린트 버�� 내용� 마커� 플러시.\nFetch가 true로 설정� 경우, 맵 언어 팩 �는 게임 번들�서 �성� 가져오려고 시�합니다.
+lenum.texture = 게임� texture atlas�서 �접 가져온 �스처 �름(케밥� 명명 스타� 사용).\n printFlush가 true로 설정� 경우, �스트 �수로 �스트 버� 내용� 사용합니다.
+lenum.texturesize = 타�� �스처 �기. 0 값� 마커 너비를 �래 �스처 �기� 맞게 조정합니다.
+lenum.autoscale = 플레�어� 확대/축소 레벨� 맞춰 마커� �기를 조정할지 여부.
+lenum.posi = ��스 위치. �� � 쿼드 마커� 사용�며 ��스 0� 첫 번째 위치입니.
+lenum.uvi = 0�서 1까지� �스처 위치, 쿼드 마커� 사용.
+lenum.colori = ��스� 위치, ��스 0� 첫 번째 색��며 �� � 쿼드 마커� 사용.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 0a8290e544..3a75e62e14 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -13,15 +13,18 @@ link.google-play.description = Google Play parduotuvÄ—s elementas
 link.f-droid.description = F-Droid katalogo elementas
 link.wiki.description = Oficialus Mindustry wiki
 link.suggestions.description = Pasiūlykite naujas funkcijas
+link.bug.description = Radot vieną? Praneškite �ia
+linkopen = Šis serveris atsiuntė jums nuorodą. Ar jūs norite atidaryti ją?\n\n[sky]{0}
 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ą.
 gameover = Žaidimas Baigtas
+gameover.disconnect = Atsijungti
 gameover.pvp = [accent] {0}[] komanda laimÄ—jo!
+gameover.waiting = [accent]Laukiama kito žemėlapio...
 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
+indev.notready = Ši žaidimo dalis dar neparuošta
 
 load.sound = Garsai
 load.map = Žemėlapiai
@@ -37,10 +40,23 @@ be.updating = Naujinama...
 be.ignore = Ignoruoti
 be.noupdates = Naujinimų nerasta.
 be.check = Ieškoti naujinimų
+mods.browser = Modifikacijų naršyklė
+mods.browser.selected = Parinkta modifikacija
+mods.browser.add = Įdiegti
+mods.browser.reinstall = Perdiegti
+mods.browser.view-releases = Pažiūrėti leidimus
+mods.browser.noreleases = [scarlet]Nerasti jokių leidimų\n[accent]Nėjo rasti leidimų šiai modifikacijai. Patikrinkite ar modifikacijos repo yra paskelbtų leidimų.
+mods.browser.latest = <Naujausia>
+mods.browser.releases = Leidimai
+mods.github.open = Repo
+mods.github.open-release = Leidimų puslapis
+mods.browser.sortdate = RÅ«Å¡ioti pagal naujausius
+mods.browser.sortstars = Rūšiuoti pagal žvaigždes
 
 schematic = Schema
 schematic.add = IÅ¡saugoti schemÄ…...
 schematics = Schemos
+schematic.search = Ieškoti schemas...
 schematic.replace = Schema Å¡iuo pavadinimu jau egzistuoja. Pakeisti?
 schematic.exists = Schema Å¡iuo pavadinimu jau egzistuoja.
 schematic.import = Importuoti schemÄ…...
@@ -53,20 +69,28 @@ schematic.shareworkshop = Dalintis DirbtuvÄ—je
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Apversti schemÄ…
 schematic.saved = Schema išsaugota.
 schematic.delete.confirm = Ši schema bus negrįžtamai pašalinta.
-schematic.rename = Pervadinti schemÄ…
+schematic.edit = Redaguoti schemÄ…
 schematic.info = {0}x{1}, {2} blokai
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Schemos išjungtos[]\nJums neleidžiama naudoti schemų šiame [accent]žemėlapyje[] ar [accent]serveryje.
+schematic.tags = Žymės:
+schematic.edittags = Redaguoti žymes
+schematic.addtag = Pridėti žymę
+schematic.texttag = Teksto žymė
+schematic.icontag = Piktogramos žymė
+schematic.renametag = Pervadinti žymę
+schematic.tagged = {0} pažymėta
+schematic.tagdelconfirm = Visiškai ištrinti šią žymę?
+schematic.tagexists = Ši žymė jau egzistuoja.
+stats = Statistikos
+stats.wave = Bangos Praeitos
+stats.unitsCreated = Units Created
+stats.enemiesDestroyed = Priešai sunaikinti
+stats.built = Pastatų pastata
+stats.destroyed = Pastatų sugriauta
+stats.deconstructed = Pastatų dekonstruta
+stats.playtime = Laiko žaista
 
-stat.wave = Įveikta bangų:[accent] {0}
-stat.enemiesDestroyed = Sunaikinta priešų:[accent] {0}
-stat.built = Pastatyta pastatų:[accent] {0}
-stat.destroyed = Sunaikinta pastatų:[accent] {0}
-stat.deconstructed = Iškonstruota pastatų:[accent] {0}
-stat.delivered = Paleisti resursai:
-stat.playtime = Žaidimo trukmė:[accent] {0}
-stat.rank = Finalinis laipsnis: [accent]{0}
-
-globalitems = [accent]Global Items
+globalitems = [accent]Globalūs Daiktai
 map.delete = Ar esate tikri, jog norite ištrinti žemėlapį "[accent]{0}[]"?
 level.highscore = Rekordas: [accent]{0}
 level.select = Lygio pasirinkimas
@@ -74,12 +98,15 @@ level.mode = Žaidimo režimas:
 coreattack = < Branduolys yra puolamas! >
 nearpoint = [[ [scarlet]NEDELSDAMI PALIKITE IŠMETIMO ZONĄ[] ]\nneišvengiamas sunaikinimas
 database = Branduolio duomenų dazė
+database.button = Database
 savegame = Išsaugoti žaidimą
 loadgame = Užkrauti žaidimą
 joingame = Įeiti į žaidimą
 customgame = Pasirinktinis žaidimas
 newgame = Naujas žaidimas
 none = <niekas>
+none.found = [lightgray]<none found>
+none.inmap = [lightgray]<none in map>
 minimap = Mini žemėlapis
 position = Pozicija
 close = Uždaryti
@@ -99,35 +126,49 @@ uploadingpreviewfile = Talpinamas peržiūros failas
 committingchanges = Daromi pakeitimai
 done = Baigta
 feature.unsupported = Jūsų įrenginys nepalaiko šios funkcijos.
-
-mods.alphainfo = Prisiminkite, jog modifikacijos vis dar yra  alpha, ir[scarlet] gali būti [].\nPraneškite apie rastas klaidas Mindustry GitHub puslapyje arba Discord serveryje.
+mods.initfailed = [red]âš [] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
 mods = Modifikacijos
 mods.none = [lightgray]Modifikacijos nerastos
 mods.guide = Modifikavimo pagalba
 mods.report = Pranešti apie klaidas
 mods.openfolder = Atidaryti modifikacijų aplanką
+mods.viewcontent = Peržiūrėti turinį
 mods.reload = Perkrauti
-mods.reloadexit = The game will now exit, to reload mods.
+mods.reloadexit = Žadimas dabar išsijungs perkrauti modifikacijas.
+mod.installed = [[Installed]
 mod.display = [gray]Modifikacijos:[orange] {0}
 mod.enabled = [lightgray]Įjungta
 mod.disabled = [scarlet]IÅ¡jungta
+mod.multiplayer.compatible = [gray]Suderinama su keliais žaidėjais
 mod.disable = IÅ¡jungti
+mod.version = Version:
 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.incompatiblegame = [red]Pasenusi žaidimo versija
+mod.incompatiblemod = [red]Nesuderinima
+mod.blacklisted = [red]Nepalaikoma
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Turinio klaidos.
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Nebaigtos PriklausomybÄ—s
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = Šiai modifikacijai trūksta priklausomybių: {0}
+mod.erroredcontent.details = Ši modifikacija kraunant sukėlė klaidų. Paprašykite modifikacijos autoriaus pataisyti jas.
+mod.circulardependencies.details = Ši modifikacija turi priklausomybių kurios priklauso nuo vieno kito.
+mod.incompletedependencies.details = Šios modifikacijos negalima užkrauti dėl netinkamų arba trūkstamų priklausomybių: {0}.
+mod.requiresversion = Reikia žaidimo versijos: [red]{0}
 mod.errors = Įvyko klaida kraunant turinį.
 mod.noerrorplay = [scarlet]Turite modifikacijas su klaidomis.[] Išjunkite modifikacijas su klaidomis arba patasykite jas prieš žaidžiant.
 mod.nowdisabled = [scarlet]Modifikacijai '{0}' trūksta priklausomybių:[accent] {1}\n[lightgray] Šios modifikacijos turi būti atsisiųstos.\nŠi modifikacija bus automatiškai išjungta.
 mod.enable = Įjungti
-mod.requiresrestart = Žaidimas dabar išsijungs modifikacijų pakeitimui.
+mod.requiresrestart = Žaidimas dabar išsijungs modifikacijų perkrovimui.
 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.jarwarn = [scarlet]JAR modifikacijos iš esmės yra nesaugios.[]\nĮsitikinkite, kad importuojate šį modifikaciją iš patikimo šaltinio!
 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}
@@ -139,20 +180,33 @@ 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
+search = Ieškoti:
+planetmap = Planetų žemėlaipis
+launchcore = Paleisti branduolį
 filename = Failo pavadinimas:
 unlocked = Atrakintas naujas turinys!
+available = Naujas turinys pasiekiamas!
+unlock.incampaign = < Atrakinkite kampanijoje detalÄ—m >
+campaign.select = Pasirinkite pradinÄ™ kampanija
+campaign.none = [lightgray]Pasirinkite planetą ant kurios pradėti.\nTai gali būti pakeista bet kada.
+campaign.erekir = Naujesnis, patobulintas turinys. Daugiausia linijinė kampanijos eiga.\n\nAukštesnės kokybės žemėlapiai ir bendra patirtis.
+campaign.serpulo = Senesnis turinys; klasikinė versija. Atviresnis.\n\nPotencialiai nebalancuoti žemelapiai ir kampanijos mechanika. Mažiau tobulinta.
+campaign.difficulty = Difficulty
 completed = [accent]IÅ¡rasta
 techtree = Technologijų Medis
+techtree.select = Technologijų Medį parinkti
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Load
+research.discard = Discard
 research.list = [lightgray]IÅ¡radimai:
 research = IÅ¡rasti
 researched = [lightgray]{0} išrasta.
-research.progress = {0}% complete
+research.progress = {0}% baigta
 players = {0} žaidėjai
 players.single = {0} žaidėjas
 players.search = ieškoti
-players.notfound = [gray]no players found
+players.notfound = [gray]žaidėjų nerasta
 server.closing = [accent]Uždaromas serveris...
 server.kicked.kick = Jūs buvote išmestas iš serverio!
 server.kicked.whitelist = Jūs nesate baltajame sąraše.
@@ -186,16 +240,32 @@ hosts.none = [lightgray]Žaidimų vietiniame tinkle nerasta!
 host.invalid = [scarlet]Negalima prisijungti prie serverio.
 
 servers.local = Vietinio Tinklo Serveriai
+servers.local.steam = Open Games & Local Servers
 servers.remote = Nuotoliniai Serveriai
 servers.global = Globalūs Serveriai
+servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
+servers.showhidden = Rodyti paslÄ—tus serverius
+server.shown = Rodoma
+server.hidden = PaslÄ—pta
+viewplayer = Stebimas žaidėjas: [accent]{0}
 
 trace = Sekti Žaidėją
 trace.playername = Žaidėjo vardas: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Unikalus ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobilus Klientas: [accent]{0}
 trace.modclient = Custom Client: [accent]{0}
+trace.times.joined = Sykių prisijungta: [accent]{0}
+trace.times.kicked = Sykių išmesta: [accent]{0}
+trace.ips = IPs:
+trace.names = Vardai:
 invalidid = Netaisyklingas kliento ID! Praneškite apie klaidą.
+player.ban = Baninti
+player.kick = IÅ¡mesti
+player.trace = Sekti
+player.admin = Perjungti admininistratorių
+player.team = Keisti komandÄ…
 server.bans = Užblokavimai
 server.bans.none = Nerasta užblokuotų žaidėjų!
 server.admins = Administratoriai
@@ -209,10 +279,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Ar esate tikras, jog norite užblokuoti šį žaidėją?
 confirmkick = Ar esate tikras, jog norite išmesti šį žaidėją?
-confirmvotekick = Ar esate tikras, jog norite išbalsuoti šį žaidėją?
 confirmunban = Ar esate tikras, jog norite atblokuoti šį žaidėją?
 confirmadmin = Ar esate tikras, jog norite šį žaidėją padaryti administratoriumi?
 confirmunadmin = Ar esate tikras, jog norite atimti administratoriaus statusą iš šio žaidėjo?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Prisijungti prie žaidimo
 joingame.ip = IP Adresas:
 disconnect = Atsijungta.
@@ -220,15 +291,18 @@ disconnect.error = Prisijungimo klaida.
 disconnect.closed = Prisijungimas uždarytas.
 disconnect.timeout = BaigÄ—si laikas.
 disconnect.data = Nepavyko užkrauti pasaulio informacijos!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Negalima prisijungti prie žaidimo ([accent]{0}[]).
 connecting = [accent]Prisijungiama...
+reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Kraunama pasaulio informacija...
 server.port = Prievadas:
-server.addressinuse = Adresas jau naudojamas!
 server.invalidport = Negaliams prievado numeris!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Įvyko klaida.
 save.new = Naujas IÅ¡saugojimas
 save.overwrite = Ar esate tikras, jog\n norite perrašyti šį elementą?
+save.nocampaign = Individualūs išsaugojimo failai iš kampanijos negali būti importuoti.
 overwrite = Perrašyti
 save.none = Nerasta jokių išsaugojimų!
 savefail = Nepavyko išsaugoti žaidimo!
@@ -249,6 +323,7 @@ save.corrupted = IÅ¡saugojimo failas yra sugadintas arba !
 empty = <empty>
 on = Įjungta
 off = IÅ¡jungta
+save.search = Search saved games...
 save.autosave = Automatinis išsaugojimas: {0}
 save.map = Žemėlapis: {0}
 save.wave = Banga {0}
@@ -264,25 +339,52 @@ ok = Gerai
 open = Atidaryti
 customize = Keisti Taisykles
 cancel = Atšaukti
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Atidaryti NuorodÄ…
 copylink = Kopijuoti NuorodÄ…
 back = Sugrįžti
+max = Max
+objective = Map Objective
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
 data.export = Eksportuoti duomenis
 data.import = Importuoti duomenis
 data.openfolder = Atidaryti duomenų aplanką
 data.exported = Duomenys Eksportuoti.
 data.invalid = Tai nėra veikiantys žaidimo duomenys.
-data.import.confirm = Importuojant išorinius duomenis bus pašalinti[scarlet] visi esami duomenys[] 
+data.import.confirm = Importuojant išorinius duomenis bus pašalinti[scarlet] visi esami duomenys[]
 quit.confirm = Ar tikrai norite išeiti?
-quit.confirm.tutorial = Ar esate tikras, jog žinote ką darote?\nPradininkas gali būti įjungtas iš naujo paspaudus [accent] Nustatymai->Žaidimas->Iš naujo įjungti Pradininką.[]
 loading = [accent]Kraunama...
-reloading = [accent]IÅ¡ naujo kraunamos modifikacijos...
+downloading = [accent]Downloading...
 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
 resumebuilding = [scarlet][[{0}][] statymo pratęsimui
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Banga {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]Banga po {0}
@@ -290,19 +392,21 @@ wave.waveInProgress = [lightgray]Vyksta banga
 waiting = [lightgray]Laukiama...
 waiting.players = Laukiama žaidėjų...
 wave.enemies = [lightgray]{0} Likę priešai
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
 wave.enemy = [lightgray]{0} Likęs priešas
 wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
 wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
-loadimage = Užkrauti vaizdą 
+loadimage = Užkrauti vaizdą
 saveimage = IÅ¡saugoti vaizdÄ…
 unknown = Nežinomas
 custom = Pasirinktinis
 builtin = Integruotas
 map.delete.confirm = Ar esate tikras, jog norite išpašalinti šį žemėlapį? Šis veiksmas negali būti atstatytas
 map.random = [accent]Atsitiktinis žemėlapis
-map.nospawn = Šiame žemėlapyje nėra jokio branduolio atsirasti žaidėjui! Įdėkite[accent] oranžinį[] branduolį į žemėlapį redaktoriuje.
-map.nospawn.pvp = Šiame žemėlapyje nėra jokio priešų branduolio atsirasti žaidėjui! Įdėkite[scarlet] ne oranžinį[] branduolį į žemėlapį redaktoriuje.
-map.nospawn.attack = Šiame žemėlapyje nėra jokio priešo branduolio, kurį reikia sunaikinti žaidėjams! Įdėkite[scarlet] raudoną[] branduolį į žemėlapį redaktoriuje.
+map.nospawn = Šiame žemėlapyje nėra jokio branduolio atsirasti žaidėjui! Įdėkite {0} branduolį į žemėlapį redaktoriuje.
+map.nospawn.pvp = Šiame žemėlapyje nėra jokio priešų branduolio atsirasti žaidėjui! Įdėkite [scarlet]ne oranžinį[] branduolį į žemėlapį redaktoriuje.
+map.nospawn.attack = Šiame žemėlapyje nėra jokio priešo branduolio, kurį reikia sunaikinti žaidėjams! Įdėkite {0} branduolį į žemėlapį redaktoriuje.
 map.invalid = Įvyko klaida kraunant žemėlapį: sugadintas arba klaidingas žemėlapio failas.
 workshop.update = Atnaujinti elementÄ…
 workshop.error = Klaida kraunant DirbtuvÄ—s duomenis: {0}
@@ -310,12 +414,17 @@ map.publish.confirm = Ar tikrai norite publikuoti šį žemėlapį?\n\n[lightgra
 workshop.menu = Pasirinkite kÄ… norite daryti su Å¡iuo elementu.
 workshop.info = Elemento informacija
 changelog = Pasikeitimai (neprivaloma):
+updatedesc = Overwrite Title & Description
 eula = Steam EULA
 missing = Šis elementas buvo ištrintas arba pakeistas.\n[lightgray]Workshop'o elementas buvo automatiškai atsietas.
 publishing = [accent]Publikuojama...
 publish.confirm = Ar tikrai norite publikuoti tai?\n\n[lightgray]Pirma įsitikinkite, jog sustinkate su Workshop'o EULA arba jūsų elementai nebus rodomi!
 publish.error = Įvyko klaida publikuojant elementą: {0}
 steam.error = Nepavyko inicijuoti Steam paslaugų.Klaida: {0}
+editor.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Teptukas
 editor.openin = Atidaryti redaktoriuje
@@ -328,35 +437,71 @@ editor.nodescription = Žemėlapis privalo turėti aprašymą bent iš 4 simboli
 editor.waves = Bangos:
 editor.rules = TaisyklÄ—s:
 editor.generation = Generacija:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Redaguoti žaidime
+editor.playtest = Playtest
 editor.publish.workshop = Publikuoti DirbtuvÄ—je
 editor.newmap = Naujas žemėlapis
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = DirbtuvÄ—
 waves.title = Bangos
 waves.remove = Panaikinti
-waves.never = <niekada>
 waves.every = kiekvienÄ…
 waves.waves = banga(os)
+waves.health = health: {0}%
 waves.perspawn = per spawn
 waves.shields = shields/wave
 waves.to = iki
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Apžiūra
 waves.edit = Redaguoti...
+waves.random = Random
 waves.copy = Kopijuoti į iškarpinę
 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.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
+all = All
 
 editor.default = [lightgray]<Numatytasis>
 details = Detaliau...
 edit = Redaguoti...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Pavadinimas:
 editor.spawn = Atradinti vienetÄ…
 editor.removeunit = Panaikinti vienetÄ…
@@ -368,13 +513,19 @@ editor.errorlegacy = Šis žemėlapis yra per senas ir naudoja seną žemėlapi
 editor.errornot = Tai nėra žemėlapio formatas.
 editor.errorheader = Šis žemėlapis yra netaisyklingas arba sugadintas.
 editor.errorname = Šis žemėlapis neturi nustatyto pavadinimo. Ar bandote užkrauti išsaugotą failą?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Atnaujinti
 editor.randomize = Sumaišyti atsitiktinai
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Taikyti
 editor.generate = Generuoti
+editor.sectorgenerate = Sector Generate
 editor.resize = Pakeisti dydį
 editor.loadmap = Užkrauti žemėlapį
 editor.savemap = Išsaugoti žemėlapį
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = IÅ¡saugota!
 editor.save.noname = Jūsų žemėlapis neturi pavadinimo! Nustatykite meniu 'žemėlapio informacija'.
 editor.save.overwrite = Jūsų žemėlapis perrašo integruotą žemėlapį! Pasirinkite skirtingą pavadinimą 'žemėlapio informacija' meniu.
@@ -413,8 +564,12 @@ toolmode.eraseores = Ištrinti rūdas
 toolmode.eraseores.description = Ištrinti tik rūdas.
 toolmode.fillteams = Užpildyti komandas
 toolmode.fillteams.description = Užpildykite komandas, o ne blokus.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Piešti komandas
 toolmode.drawteams.description = Pieškite komandas, o ne blokus.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]Nėra filtrų! Pridėkite su mygtuku easan�iu žemiau.
 filter.distort = IÅ¡kraipyti
@@ -433,6 +588,7 @@ filter.clear = IÅ¡valyti
 filter.option.ignore = ignoruoti
 filter.scatter = IÅ¡sklaidyti
 filter.terrain = Reljefas
+filter.logic = Logic
 filter.option.scale = Mastelis
 filter.option.chance = TikimybÄ—
 filter.option.mag = Didumas
@@ -441,17 +597,39 @@ filter.option.circle-scale = Apskritimo mastelis
 filter.option.octaves = Oktavos
 filter.option.falloff = Mažėjimas
 filter.option.angle = Kampas
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Kiekis
 filter.option.block = Blokas
 filter.option.floor = Sluoksnis
 filter.option.flooronto = Pasirinktas sluoksnis
 filter.option.target = Target
+filter.option.replacement = Replacement
 filter.option.wall = Siena
 filter.option.ore = RÅ«da
 filter.option.floor2 = Antrasis sluoksnis
 filter.option.threshold2 = Antrasis slenkstis
 filter.option.radius = Spindulys
 filter.option.percentile = ProcentilÄ—
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Plotis:
 height = Aukštis:
@@ -462,6 +640,9 @@ load = Krauti
 save = IÅ¡saugoti
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Pakeitę kalbą turite perkrauti žaidimą.
 settings = Nustatymai
 tutorial = Pamokymas
@@ -476,57 +657,145 @@ complete = [lightgray]Įvykdyta:
 requirement.wave = Pasiekite {0} zonoje {1}
 requirement.core = Sunaikinkite priešų branduolį zonoje {0}
 requirement.research = Research {0}
+requirement.produce = Produce {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Bangos rekordas: {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
+map.multiplayer = Only the host can view sectors.
 uncover = Atidengti
 configure = Keisti resursų kiekį
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
 loadout = Loadout
-resources = Resources 
+resources = Resources
+resources.max = Max
 bannedblocks = Uždrausti blokai
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = PridÄ—ti visus
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = [lightgray]Aptikti resursai:
-zone.objective = [lightgray]Tikslas: [accent]{0}
-zone.objective.survival = IÅ¡gyventi
-zone.objective.attack = Sunaikinti priešų branduolį
 add = PridÄ—ti...
-boss.health = Boso gyvybÄ—s
+guardian = Guardian
 
 connectfail = [crimson]Prisijungimo klaida:\n\n[accent]{0}
 error.unreachable = Serveris nepasiekiamas.\nAr adresas yra parašytas teisingai?
 error.invalidaddress = Klaidingas adresas.
-error.timedout = Baigėsi Laikas!\nĮsitikinkite, jog serverio prievado ekspedijavimas yra sukonfigūruotas ir adresas yra geras. 
+error.timedout = Baigėsi Laikas!\nĮsitikinkite, jog serverio prievado ekspedijavimas yra sukonfigūruotas ir adresas yra geras.
 error.mismatch = Paketų klaida:\ngalimas kliento/serverio versijų nesutapimas.\nĮsitikinkite, jog jūs ir serveris turi naujausią Mindustry versiją!
 error.alreadyconnected = Jau prisijungta.
 error.mapnotfound = Žemėlapis nerastas!
 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Time:
+sectors.threat = Threat:
+sectors.wave = Wave:
 sectors.stored = Stored:
 sectors.resume = Resume
 sectors.launch = Launch
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
+sector.curcapture = Sector Captured
+sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
+sector.attacked = Sector [accent]{0}[white] under attack!
+sector.lost = Sector [accent]{0}[white] lost!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planets
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sun
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -539,6 +808,22 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -551,6 +836,75 @@ 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
 
 settings.language = Kalba
 settings.data = Žaidimo Duomenys
@@ -573,7 +927,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Sustabdyta >
 clear = IÅ¡valyti
 banned = [scarlet]Užblokuota
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Taip
 no = Ne
 info.title = Informacija
@@ -581,13 +935,18 @@ error.title = [crimson]Įvyko klaida
 error.crashtitle = Įvyko klaida
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Purpose
 
 stat.input = Įeiga
 stat.output = IÅ¡eiga
+stat.maxefficiency = Max Efficiency
 stat.booster = Stiprintuvas
-stat.tiles = Privalomi 
+stat.tiles = Privalomi
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Energijos Talpumas
 stat.powershot = Energija per šūvį
 stat.damage = Žala
@@ -610,6 +969,11 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Bazinis Energijos Generavimas
 stat.productiontime = Gamybos Laikas
 stat.repairtime = Pilnas bloko sutaisymo laikas
+stat.repairspeed = Repair Speed
+stat.weapons = Weapons
+stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Grei�io Padidėjimas
 stat.range = Atstumas
 stat.drilltier = Gręžiama
@@ -617,6 +981,7 @@ stat.drillspeed = Bazinis Grąžto Greitis
 stat.boosteffect = Pastiprinimo Efektas
 stat.maxunits = Maks. Aktyvių Vienetų Kiekis
 stat.health = GyvybÄ—s
+stat.armor = Armor
 stat.buildtime = Statymo Laikas
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Statymo Kaina
@@ -632,6 +997,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = HeatCapacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -640,21 +1006,77 @@ stat.buildspeed = Build Speed
 stat.minespeed = Mine Speed
 stat.minetier = Mine Tier
 stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
 stat.abilities = Abilities
+stat.canboost = Can Boost
+stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Privalomas Geresnis Grąžtas
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Grąžto Greitis: {0}/s
 bar.pumpspeed = Pompos Greitis: {0}/s
 bar.efficiency = Efektyvumas: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Energija: {0}/s
 bar.powerstored = Sukaupta: {0}/{1}
 bar.poweramount = Energija: {0}
@@ -663,13 +1085,19 @@ bar.powerlines = Connections: {0}/{1}
 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.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
 bar.power = JÄ—ga
 bar.progress = Statymo Progresas
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Įeiga
 bar.output = IÅ¡eiga
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -677,35 +1105,50 @@ bullet.damage = [stat]{0}[lightgray] žalos
 bullet.splashdamage = [stat]{0}[lightgray] zonos žalos ~[stat] {1}[lightgray] blokai
 bullet.incendiary = [stat]uždegantis
 bullet.homing = [stat]sekimas
-bullet.shock = [stat]Å¡okas
-bullet.frag = [stat]skilantis
+bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] numušimas
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]Å¡aldantis
-bullet.tarred = [stat]dervuotas
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x šovinių daugiklis
 bullet.reload = [stat]{0}[lightgray]x Å¡audymo greitis
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blokai
 unit.blockssquared = blocks²
 unit.powersecond = energijos per sekundÄ™
+unit.tilessecond = tiles/second
 unit.liquidsecond = skys�io per sekundę
 unit.itemssecond = daiktų per sekundę
 unit.liquidunits = skys�io vienetai
 unit.powerunits = energijos vienetai
+unit.heatunits = heat units
 unit.degrees = laipsnių
 unit.seconds = sekundÄ—s
 unit.minutes = mins
 unit.persecond = /sek.
 unit.perminute = /min
 unit.timesspeed = x grei�io
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = daiktai
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Purpose
 category.general = Bendra
 category.power = Energija
 category.liquids = Skys�iai
@@ -713,16 +1156,23 @@ category.items = Daiktai
 category.crafting = Įeiga/Išeiga
 category.function = Function
 category.optional = Galimi Pagerinimai
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 setting.landscape.name = Užrakinti pasukimą
 setting.shadows.name = Šešėliai
 setting.blockreplace.name = Automatiniai Blokų Pasiūlymai
 setting.linear.name = Linijinis Filtravimas
 setting.hints.name = Užuominos
-setting.flow.name = Rodyti Resursų Srauto Geritį[scarlet] (experimental)
+setting.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Automatinis Statybų Sustabdymas
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Vandens Animacija
 setting.animatedshields.name = Skydų Animacija
-setting.antialias.name = Glodinimas[lightgray] (reikalingas perkrovimas)[]
 setting.playerindicators.name = Player Indicators
 setting.indicators.name = Priešų/Sąjungininkų Indikatorius
 setting.autotarget.name = Automatinis Taikymas
@@ -732,14 +1182,11 @@ setting.fpscap.name = Maks. FPS
 setting.fpscap.none = NÄ—ra
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI mastelio keitimas[lightgray] (reikalingas perkrovimas)[]
+setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Visada Įstrižinis Padėjimas
-setting.difficulty.training = Mokymai
-setting.difficulty.easy = Lengvas
-setting.difficulty.normal = Normalus
-setting.difficulty.hard = Sunkus
-setting.difficulty.insane = Beprotiškas
-setting.difficulty.name = Sunkumas:
 setting.screenshake.name = Ekrano DrebÄ—jimas
+setting.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Rodyti Efektus
 setting.destroyedblocks.name = Rodyti Sugriautus Blokus
 setting.blockstatus.name = Rodyti Blokų Būseną
@@ -747,32 +1194,43 @@ setting.conveyorpathfinding.name = Konvejerio Paskirties Vietos Nustatymas
 setting.sensitivity.name = Valdymo Jautrumas
 setting.saveinterval.name = IÅ¡saugojimo Intervalas
 setting.seconds = {0} sekundžių
-setting.blockselecttimeout.name = Maks. Bloko Pasirinkimo Laikas
 setting.milliseconds = {0} milisekundžių
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Langas Be Pakras�ių[lightgray] (gali reikėti perkrauti)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Rodyti FPS ir Ping
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 setting.vsync.name = VSync
 setting.pixelate.name = Pikseliavimas
 setting.minimap.name = Rodyti Mini Žemėlapį
-setting.coreitems.name = Display Core Items (WIP)
+setting.coreitems.name = Display Core Items
 setting.position.name = Rodyti Žaidėjų Pozicijas
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Muzikos Garsumas
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Aplinkos Garsas
 setting.mutemusic.name = Nutildyti MuzikÄ…
 setting.sfxvol.name = SFX Garsumas
 setting.mutesound.name = Nutildyti Garsus
 setting.crashreport.name = Siųsti Anoniminius Strigties Pranešimus
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Automatiškai Kurti Išsaugojimus
-setting.publichost.name = Viešojo Žaidimo Matomumas
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Žaidėjų Limitas
 setting.chatopacity.name = Pokalbių Lentos Nepermatomumas
 setting.lasersopacity.name = Elektros Tinklo Nepermatomumas
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Tilto Nepermatomumas
 setting.playerchat.name = Rodyti Pokalbių Teksto Burbulus Virš Žaidėjų
-public.confirm = Ar norite savo žaidimą paversti viešu?\n[accent]Bet kas galės įeiti į jūsų žaidimą.\n[lightgray]Tai gali būti pakeista nuėjus į Nustatymai->Žaidimas->Viešojo Žaidimo Matomumas.
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Pritaikykite sąsają, kad būtų rodoma įpjova
+setting.macnotch.description = Norint pritaikyti pakeitimus, reikia paleisti iš naujo
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Įsiminkite, jog beta versijoje negalima sukrti viešų kambarių.
 uiscale.reset = UI mastelis buvo pakeistas.\nSpauskite "GERAI", norėdami palikti šį mastelį.\n[scarlet]Atšaukiama ir išeinama po[accent] {0}[] sekundžių...
 uiscale.cancel = Atšaukti ir Išeiti
@@ -781,12 +1239,9 @@ keybind.title = Pakeisti Valdymo Mygtukus
 keybinds.mobile = [scarlet]Dauguma valdymo mygtukų neveikia telefone. Tik paparastas judėjimas yra palaikomas.
 category.general.name = Bendra
 category.view.name = Vaizdas
+category.command.name = Unit Command
 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
@@ -801,6 +1256,27 @@ keybind.move_y.name = Judėjimas Y ašimi
 keybind.mouse_move.name = Sekti PelÄ™
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Pasirinkite RegionÄ…
 keybind.schematic_menu.name = Schemų Meniu
 keybind.schematic_flip_x.name = Apversti schemą per X ašį
@@ -826,16 +1302,20 @@ keybind.select.name = Pasirinkti/Å auti
 keybind.diagonal_placement.name = Įstrižas Padėjimas
 keybind.pick.name = Pasirinkti BlokÄ…
 keybind.break_block.name = IÅ¡griauti BlokÄ…
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 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
 keybind.pause.name = Sustabdyti
 keybind.pause_building.name = Sustabdyti/Tęsti Statymą
 keybind.minimap.name = Mini Žemėlapis
+keybind.planet_map.name = Planet Map
+keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Pakalbiai
 keybind.player_list.name = Žaidėjų Sąrašas
 keybind.console.name = KonsolÄ—
@@ -845,6 +1325,7 @@ keybind.toggle_menus.name = Perjungti Meniu
 keybind.chat_history_prev.name = Pokalbių istorija Ankstesnis
 keybind.chat_history_next.name = Pokalbių istorija Pirmyn
 keybind.chat_scroll.name = Pokalbių Slinktis
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = IÅ¡mesti VienetÄ…
 keybind.zoom_minimap.name = Keisti Mini Žemėlapio Mastelį
 mode.help.title = Modifikacijų Aprašymai
@@ -858,47 +1339,100 @@ mode.pvp.description = Kovokite su kitais žmonėmsi vietiniame tinkle.\n[gray]N
 mode.attack.name = Puolimas
 mode.attack.description = Sunaikinkite priešų branduolį. \n[gray]Norint žaisti žemėlapyje yra reikalingas branduolys su raudona spalva.
 mode.custom = PasirinktinÄ—s TaisyklÄ—s
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Neriboti Resursai
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reaktorių Sprogimai
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Bangų Laikmatis
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Bangos
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Puolimo Režimas
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Neriboti Kompiuterio (Raudonosios Komandos) Resursai
 rules.blockhealthmultiplier = Blokų Gyvybių Daugiklis
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Vienetų Gamybos Grei�io Daugiklis
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Vienetų Gyvybių Daugiklis
 rules.unitdamagemultiplier = Vienetų Žalos Daugiklis
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Nestatymo aplink priešų branduolį spindulys:[lightgray] (blokais)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Tarpai Tarp Bangų:[lightgray] (sek.)
+rules.initialwavespacing = Initial Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Statymo Kainų Daugiklis
 rules.buildspeedmultiplier = Statymo Grei�io Daugiklis
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Laukti, kol pasibaigs banga
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = IÅ¡metimo Zonos Spindulys:[lightgray] (blokais)
 rules.unitammo = Units Require Ammo
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
 rules.title.waves = Bangos
 rules.title.resourcesbuilding = Resursai ir Pastatai
 rules.title.enemy = Priešai
 rules.title.unit = Vienetai
 rules.title.experimental = Eksperimentinis
 rules.title.environment = Environment
+rules.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Apšvietimas
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Aplinkos Å viesa
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Daiktai
 content.liquid.name = Skys�iai
 content.unit.name = Vienetai
 content.block.name = Blokai
+content.status.name = Status Effects
+content.sector.name = Sectors
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Varis
 item.lead.name = Å vinas
@@ -916,10 +1450,23 @@ item.blast-compound.name = Sprogusis Junginys
 item.pyratite.name = Piratitas
 item.metaglass.name = Meta Stiklas
 item.scrap.name = Metalo Laužas
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = Vanduo
 liquid.slag.name = Å lakas
 liquid.oil.name = Nafta
 liquid.cryofluid.name = Krio Skystis
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -947,6 +1494,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,13 +1506,35 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = SmÄ—lio Riedulys
+block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Žolė
-block.slag.name = Slag
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Space
 block.salt.name = Druska
 block.salt-wall.name = Salt Wall
@@ -988,24 +1562,28 @@ block.graphite-press.name = Grafito Presas
 block.multi-press.name = Multi Presas
 block.constructing = {0} [lightgray](Konstruojama)
 block.spawn.name = Priešų Atsiradimo Zona
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Branduolys: Å erdis
 block.core-foundation.name = Branduolys: Pagrindas
 block.core-nucleus.name = Branduolys: Centras
-block.deepwater.name = Gilus Vanduo
-block.water.name = Vanduo
+block.deep-water.name = Gilus Vanduo
+block.shallow-water.name = Vanduo
 block.tainted-water.name = Užterštas Vanduo
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Tamsaus Smėlio Užterštas Vanduo
 block.tar.name = Derva
 block.stone.name = Akmuo
-block.sand.name = SmÄ—lis
+block.sand-floor.name = SmÄ—lis
 block.darksand.name = Tamsus SmÄ—lis
 block.ice.name = Ledas
 block.snow.name = Sniegas
-block.craters.name = Krateriai
+block.crater-stone.name = Krateriai
 block.sand-water.name = SmÄ—lio vanduo
 block.darksand-water.name = Tamsaus SmÄ—lio Vanduo
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Ledinis Sniegas
@@ -1023,6 +1601,7 @@ block.spore-cluster.name = Spore Cluster
 block.metal-floor.name = Metalo Sluoksnis 1
 block.metal-floor-2.name = Metalo Sluoksnis 2
 block.metal-floor-3.name = Metalo Sluoksnis 3
+block.metal-floor-4.name = Metal Floor 4
 block.metal-floor-5.name = Metalo Sluoksnis 4
 block.metal-floor-damaged.name = Metalo Sluoksnis Pažeistas
 block.dark-panel-1.name = Tamsioji Plokštė 1
@@ -1056,15 +1635,16 @@ block.conveyor.name = Konvejeris
 block.titanium-conveyor.name = Titaninis Konvejeris
 block.plastanium-conveyor.name = Plastaninis Konvejeris
 block.armored-conveyor.name = Å arvuotas Konvejeris
-block.armored-conveyor.description = Juda tokuo pa�iu grei�iu kaip titaninis konvejeris, ta�iau turi daugiau šarvų. Nepriima įeigos iš šonų, išskyrus kitus konvejerius.
 block.junction.name = Sandūra
 block.router.name = Maršrutizatorius
 block.distributor.name = Skirstytuvas
 block.sorter.name = RÅ«Å¡iuotojas
 block.inverted-sorter.name = Atbulinis RÅ«Å¡iuotojas
 block.message.name = Žinutė
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Å viestuvas
-block.illuminator.description = Mažas, kompaktiškas, konfigūruojamas šviesos šaltinis. Reikalinga energija funkcionavimui.
 block.overflow-gate.name = Perpildymo Užtvara
 block.underflow-gate.name = Neperpildymo Užtvara
 block.silicon-smelter.name = Silicio Lydykla
@@ -1115,20 +1695,22 @@ block.solar-panel.name = SaulÄ—s Baterija
 block.solar-panel-large.name = DidelÄ— SaulÄ—s Baterija
 block.oil-extractor.name = Naftos Trauktuvas
 block.repair-point.name = Taisymo Taškas
+block.repair-turret.name = Repair Turret
 block.pulse-conduit.name = Pulsinis Vamzdis
 block.plated-conduit.name = Padengtas Vamzdis
 block.phase-conduit.name = Fazinis Vamzdis
 block.liquid-router.name = Skys�ių Maršrutizatorius
 block.liquid-tank.name = Skys�ių Talpa
+block.liquid-container.name = Liquid Container
 block.liquid-junction.name = Skys�ių Sandūra
 block.bridge-conduit.name = Tiltinis Vamzdis
 block.rotary-pump.name = Rotacinis Siurblys
 block.thorium-reactor.name = Torio Reaktorius
 block.mass-driver.name = ElektromagnetinÄ— Katapulta
 block.blast-drill.name = Oro Srovės Grąžtas
-block.thermal-pump.name = Å iluminÄ— Pompa
+block.impulse-pump.name = Å iluminÄ— Pompa
 block.thermal-generator.name = Terminis Generatorius
-block.alloy-smelter.name = Lydinio Lydykla
+block.surge-smelter.name = Lydinio Lydykla
 block.mender.name = Taisytojas
 block.mend-projector.name = Taisymo Projektorius
 block.surge-wall.name = Viršįtampio Siena
@@ -1145,9 +1727,9 @@ block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Talpykla
 block.launch-pad.name = Paleidimo Aikštelė
-block.launch-pad-large.name = Didelė Paleidimo Aikštelė
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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
@@ -1157,78 +1739,335 @@ 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.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
-block.micro-processor.name = Micro Processor
-block.logic-processor.name = Logic Processor
-block.hyper-processor.name = Hyper Processor
+block.micro-processor.name = Mikro Procesorius
+block.logic-processor.name = Loginis Procesorius
+block.hyper-processor.name = Hiper Procesorius
 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 = mÄ—lyna
+team.malis.name = Malis
 team.crux.name = raudona
 team.sharded.name = oranžinė
-team.orange.name = oranžinė
 team.derelict.name = apleista
 team.green.name = žalia
-team.purple.name = violetinÄ—
 
-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
-tutorial.drill = Rankinis kasimas yra neefektyvus.\n[accent]Grąžtai[] gali gręžti automatiškai.\nPaspauskite grąžtų skirtuką esantį apa�ioje dešiniajame kampe.\nPasirinkite[accent] mechaninį grąžtą[]. Pastatykite jį ant Vario venos.\nTaip pat galite pasirinkti grąžtą paspaudę[accent][[2][] ir [accent][[1][] vienu metu, nesvarbu koks skirtukas yra įjungtas.\n[accent]Paspauskite dešinį pelės klavišą[] norėdami sustabydi statymą.
-tutorial.drill.mobile = Rankinis kasimas yra neefektyvus.\n[accent]Grąžtai[] gali gręžti automatiškai.\nPaspauskite grąžtų skirtuką esantį apa�ioje dešiniajame kampe.\nPasirinkite[accent] mechaninį grąžtą[].\nPastatykite jį paspausdami ant Vario gyslos, tada paspauskite[accent] varnelę[] esan�ią apa�ioje norint priimti pasirinkimą.\nSpauskite[accent] X mygtuką[] norėdami atšaukti pasirinkimą.
-tutorial.blockinfo = Kievienas blokas turi skirtingas statistikas. Kiekvienas grąžtas gali kasti tam tikras rūdas\nNorėdami patirkinti daikto informaciją ir statistikas[accent] spauskite "?" mygtuką, kai yra pasirinktas blokas statybų menu.[]\n\n[accent]Dabar apžiūrėkite Mechaninio Grąžto statistikas.[]
-tutorial.conveyor = [accent]Kovejeriai[] yra naudojami medžiagų transportavimui į branduolį.\nNutieskite konvejerių linją nuo grąžto iki branduolio.\n[accent]Laikykite paspaudę pelytės kairiajį klavišą norėdami padėti konvejerius linija.[]\nLaikykite paspaudę[accent] CTRL[] ir pelytės kairiajį klavišą norėdami padėti konvejerius įstrižai.\nNaudokite pelės ratuką blokų pasukimui prieš juos dedant.\n[accent]Padėkite 2 kovejerius su linijų įrankiu, tada pristatykite medžiagas į branduolį.
-tutorial.conveyor.mobile = [accent]Kovejeriai[] yra naudojami medžiagų transportavimui į branduolį.\nNutieskite konvejerių linją nuo grąžto iki branduolio.\n[accent]Padėkite kovejerius linija paspaudus kelioms sekundėms[] ir tempiant bet kuria kryptimi.\n\n[accent]Padėkite 2 kovejerius su linijų įrankiu, tada pristatykite medžiagas į branduolį.
-tutorial.turret = Kai medžiagos įeina į branduolį, jos gali būti naudojamos statyboms.\nPrisiminkite, jog ne visos medžiagos gali būti naudojamos statyboms.\nMedžiagos, kurios yra nenaudojamos statyboms, pvz.[accent] anglis[] ar[accent] metalo laužas[], negali įeiti į branduolį.\nTuri būti naudojamos apsaugų struktūros norint apsisaugoti nuo [lightgray] priešo[].\nPastatykite[accent] duo bokštą[] netoliese bazės.
-tutorial.drillturret = Duo bokštams reikalingi[accent] Vario šoviniai[] šaudymui.\nPadėkite grąžtą netoliese bokšto.\nNuveskite konvejerius į bokštą norint tiekti Varį bokštui šoviniams.\n\n[accent]Pristatyta šovinių: 0/1
-tutorial.pause = Vykstant kovai galite[accent] sustabdyti žaidimą.[]\nTaip pat galite įtraukti pastatus į statybų eilę.\n\n[accent]Paspauskite tarpą norėdami sustabdyti.
-tutorial.pause.mobile = Vykstant kovai galite[accent] sustabdyti žaidimą.[]\nTaip pat galite įtraukti pastatus į statybų eilę.\n\n[accent]Paspauskite mygtuką esanti viršuje kairiajame kampe esantį mygtuką norėdami sustabdyti.
-tutorial.unpause = Dabar paspauskite tarpą dar kartą pratęsimui.
-tutorial.unpause.mobile = Dabar paspauskite mygtuką dar kartą pratęsimui.
-tutorial.breaking = Blokai dažnai turi būti panainkinti.\n[accent]Laikyte dešinį pelės klavišą ir tempkite pelę[] norėdami sunaikinti visus pasirinktus objektus.[]\n\n[accent]Sunaikinkite visus metalo laužo blokus esan�ius branduolio kairėje naudojant pasirinkimą.
-tutorial.breaking.mobile = Blokai dažnai turi būti panainkinti.\n[accent]Pasirinkite dekonstrukcijos režimą[], tada spauskite ant bloko norint pradėti graitu.\nSunaikite zoną palaikę paspaudę kelioms sekundėms[] ir tempdami bet kuria kryptimi.\nPaspauskite varnelę norėdami priimti sunaikinimą\n\n[accent]Sunaikinkite visus metalo laužo blokus esan�ius branduolio kairėje naudojant pasirinkimą.
-tutorial.withdraw = Kai kuriose situacijose reikia paimti medžiagas reikia tiesiogiai iš blokų.\nNorint padaryti tai [accent]paspauskite ant bloko[] su medžiagomis jame, po to [accent]paspauskite ant medžiagos[] esan�ios inventoriuje.\nDaugiau medžiagų galima pasiimti [accent]laikant paspaudus[].\n\n[accent]Pasiimkite šiek tiek Vario iš branduolio.[]
-tutorial.deposit = Įdėkite medžiagas į blokus tempdami nuo savo erdvėlaivio iki bloko.\n\n[accent]Padėkite Varį atgal į branduolį[]
-tutorial.waves = Ateina[lightgray] priešai[].\n\nGinkite savo branduolį dvi bangas.[accent] Paspauskite dešinį pelės klavišą[] norėdami šaudyti.\nPastatykite daugiau bokštų ir grąžtų. Iškaskite daugiau Vario.
-tutorial.waves.mobile = Ateina [lightgray] priešai[].\n\nGinkite savo branduolį dvi bangas. Jūsų erdvėlaivis pradės šaudyti automatiškai.\nPastatykite daugiau bokštų ir grąžtų. Iškaskite daugiau Vario.
-tutorial.launch = Kai pasieksite tam tikrą bangą, galėsite[accent] paleisti branduolį[] palikdami už savęs gynybas už savęs[accent] ir gaudami visus resursus, kurie yra branduolyje.[]\nŠie gauti resursai gali būti naudojami išrasti naujas technologijas.\n\n[accent]Paspauskite paleidimo mygtuką.
+team.blue.name = mÄ—lyna
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Papras�iausia struktūrinė medžiaga. Pla�iai naudojama visų tipų blokams.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Pagrindinė pradinė medžiaga. Pla�iai naudojama elektronikoje ir skys�ių transportacijos blokams.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
 item.metaglass.description = Itin kietas stiklo junginys. Pla�iai naudojamas skys�ių gabenimui ir laikymui.
 item.graphite.description = Mineralizuota anglis, kuri yra naudojama amunicijai ir elektronikos komponentams.
 item.sand.description = Dažnai sutinkama medžiaga, kuri yra pla�iai naudojama lydymui.
 item.coal.description = Suakmenėjusios augalinės medžiagos, susiformavusios dar prieš sėjos įvykį. Pla�iai naudojama kurui ir resursų gamybai.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
 item.titanium.description = Retas ir itin lengvas metalas. Pla�iai naudojamas skys�ių gabenime, grąžtams ir lėktuvams.
 item.thorium.description = Tankus bei radioaktyvus metalas naudojamas struktūriniam palaikymui ir branduoliniam kurui.
 item.scrap.description = Senų struktūrų ir vienetų liekanos. Sudėtyje yra įvairių metalų pėdsakų.
+item.scrap.details = Leftover remnants of old structures and units.
 item.silicon.description = Ypa� naudingas puslaidininkas. Naudojama saulės baterijose, sudėtingose elektronikose ir taikinių sekimo amunicijoje.
 item.plastanium.description = Lengva, plastiška medžiaga naudojama pažangiems lėktuvams ir skilan�ioje aminucijoje.
 item.phase-fabric.description = Beveik besvorė medžiaga naudojama pažangesniuoje elektronikoje ir savitaisėse technologijose.
 item.surge-alloy.description = Pažangus lydinys su unikaliomis elektrinėmis savybėmis.
 item.spore-pod.description = Sintetinių sporų kokonas, susintetintos iš atmosferos industriniam naudojimui. Naudojama konversijai į naftą, sprogmenis ir kurą.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = Nestabilus junginys naudojamas bomboms ir sprogmenims. Susintetintas iš sporų kokonų ir kitų lakiųjų medžiagų. Nerekomenduojama naudoti kaip kurą.
 item.pyratite.description = Ypa� degi medžiaga naudojama uždegantiems ginklams.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 liquid.water.description = Naudingiausias skystis. Dažniausiai naudojamas įrenginių aušinimui ir atliekų perdirbimui.
 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.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Juda tokuo pa�iu grei�iu kaip titaninis konvejeris, ta�iau turi daugiau šarvų. Nepriima įeigos iš šonų, išskyrus kitus konvejerius.
+block.illuminator.description = Mažas, kompaktiškas, konfigūruojamas šviesos šaltinis. Reikalinga energija funkcionavimui.
 
 block.message.description = Laiko žinutę. Naudojama komunikacijai tarp sąjungininkų.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Sukompresuoja anglies gabalus į grynas grafito plokštes.
 block.multi-press.description = Patobulinta grafito preso versija. Pasitelkia vandenį ir energiją greitam ir efektyviam anglies apdirbimui.
 block.silicon-smelter.description = Redukuoja smėlį su gryna anglimi. Gamina silicį.
 block.kiln.description = Sulydo smėlį ir stiklą į junginį žinomą kaip meta stiklas. Veikimui reikalinga nedaug energijos.
 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.surge-smelter.description = Sumaišo titaną, šviną, silicį ir varį į viršįtampį lydinį.
 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ą.
@@ -1244,6 +2083,8 @@ block.item-source.description = Išduoda neribotą kiekį medžiagų. Tik Sandbo
 block.item-void.description = Sunaikina visas įeinan�ias medžiagas. Tik Sandbox režime.
 block.liquid-source.description = Išduoda neribotą kiekį skys�ių. Tik Sandbox režime.
 block.liquid-void.description = Sunaikina visus įeinan�ius skys�ius. Tik Sandbox režime.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
 block.copper-wall.description = Pigus gynybinis blokas.\nNaudingas ginant branduolį ir bokštus pirmose bangose.
 block.copper-wall-large.description = Pigus gynybinis blokas.\nNaudingas ginant branduolį ir bokštus pirmose bangose.\nUžima kelias vietas.
 block.titanium-wall.description = Vidutinio stiprumo gynybinis blokas.\nUžtikrina vidutinę apsaugą nuo priešų.
@@ -1256,6 +2097,10 @@ block.phase-wall.description = Siena padengta specialiu faziniu pagrindu sukurtu
 block.phase-wall-large.description = Siena padengta specialiu faziniu pagrindu sukurtu junginiu. Atmuša daugumą šovinių.\nUžima kelias vietas.
 block.surge-wall.description = Ypa� patvarus gynybinis blokas.\nKaupia krūvį kontakto metu su šoviniu atsitiktinai jį išleisdamas.
 block.surge-wall-large.description = Ypa� patvarus gynybinis blokas.\nKaupia krūvį kontakto metu su šoviniu atsitiktinai jį išleisdamas.\nUžima kelias vietas.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Mažos durys. Gali būti atidarytos ir uždarytos paspaudus.
 block.door-large.description = Didelės durys. Gali būti atidarytos ir uždarytos paspaudus.\nUžima kelias vietas.
 block.mender.description = Periodiškai taiso blokus pasiekiamame plote. Palaiko gynybines konstrukcijas pataisytas tarp bangu.\nPapildomai naudoja silicį atstumo ir efektyvumo padidinimui.
@@ -1272,17 +2117,19 @@ block.phase-conveyor.description = Pažangus daiktų gabenimo blokas. Naudoja en
 block.sorter.description = Rūšiuoja daiktus. Jei daiktas atitinka pasirinkimą, jam leidžiama keliauti pirmyn. Priešingai, daiktas siun�iamas į kairę ir dešinę.
 block.inverted-sorter.description = Apdoroja daiktus kaip paprastas rūšiuotuvas, ta�iau pasirinktas daiktas siun�iamas į kairę arba dešinę, o kita į priekį.
 block.router.description = Priima daiktus, tada paskirsto daiktus į tris kryptis lygiomis dalimis. Naudingas paskirstant medžiagas iš vieno šaltinio į daugiau jung�ių.\n\n[scarlet]Niekada nenaudokite prie pat gamyklos, nes iš gamyklos išeinantis produktas gali užstrigti maršrutizatoriuje.[]
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = Pažangesnis maršrutizatorius. Paskirsto daiktus į septynias kryptis lygiomis dalimis.
 block.overflow-gate.description = Išveda medžiagas į kairę ir dešinę, jei priekis yra užblokuotas.
 block.underflow-gate.description = Veikia priešingai nei perpildymo užtvara. Išveda medžiagas į priekį, jei kairė ir dešinė yra užblokuota.
 block.mass-driver.description = Tobuliausias daiktų gabenimo blokas. Surenka daiktus ir šauna juos į kitą elektromagnetinę katapultą didelias atstumais. Veikimui reikalauja energijos.
 block.mechanical-pump.description = pigi pompa su lėta išeiga, bet nenaudoja energijos.
 block.rotary-pump.description = Pažangesnė pompa. Pumpuoja daugiau skys�ių, bet reikalauja energijos.
-block.thermal-pump.description = Tobuliausia pompa.
+block.impulse-pump.description = Tobuliausia pompa.
 block.conduit.description = Paprastas vandens gabenimo blokas. Gabena skys�ius į priekį. Naudojamas kartu su siurbliais ir kitais vamzdžiais.
 block.pulse-conduit.description = Pažangus vandens gabenimo blokas. Gabena skys�ius grei�iau  ir talpina daugiau skys�ių negu standartinis vamzdis.
 block.plated-conduit.description = Gabena skys�ius tokiuo pa�iu grei�iu kaip pulsinis vamzdis, ta�iau turi daugiau šarvų. Nepriima skys�ių iš šonų, išskyrus kitus vamzdžius.\nMažiau nutekina skys�ių.
 block.liquid-router.description = Priima skys�ius iš vienos krypties ir paskirsto juos į tris skirtingas kryptis vienodai. Gali laikyti tam tikrą kiekį skys�ių. Naudingas paskirstant sksy�ius iš vieno šaltinio į daugiau jung�ių.
+block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Laiko didelį kiekį skys�ių. Naudokite kūriant buferius situacijose su nepastoviu skys�ių suvartojimu arba kaip apsaugą aušinant svarbius blokus.
 block.liquid-junction.description = Veikia kaip tiltas dvejiems besikertantiems vamzdžiams. Naudingas situacijose, kai du skirtingi vamzdžiai neša skirtingus skys�ius į skirtingas vietas.
 block.bridge-conduit.description = Pažangus skys�ių gabenimo blokas. Leidžia skys�ių gabenimą per tris blokus, nesvarbu kas yra tuose trejuose yra.
@@ -1308,15 +2155,21 @@ block.laser-drill.description = Dėl lazerio technologijų leidžia kasti medži
 block.blast-drill.description = Tobuliausias Grąžtas. Reikalauja didelio kiekio energijos.
 block.water-extractor.description = Išgauna vandenį. Naudojamas kur nėra paviršinio vandens.
 block.cultivator.description = Atmosferoje išaugina mažus sporų kiekius į industrijai paruoštus sporų kokonus.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 block.oil-extractor.description = Naudoja didelį kiekį energijos, smėlio ir vandens naftos gamybai.
 block.core-shard.description = Pirma branduolio kapsulÄ—s iteracija. Kai sunaikintas, prarandami visi kontaktai su zona. Neleiskite tam nutikti.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = Antra branduolio kapsulės iteracija. Geriau šarvuota. Laiko daugiau resursų.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = Tre�ia ir paskutinė branduolio kapsulės iteracija. Itin gerai apsaugota. Laiko didelius kiekius resursų.
+block.core-nucleus.details = The third and final iteration.
 block.vault.description = Laiko didelį kiekį skirtingų rūšių medžiagų. Gali būti naudojamas iškroviklis daiktų paėmimui iš seifo.
 block.container.description = Laiko nedidelį kiekį skirtingų rūšių medžiagų. Gali būti naudojamas iškroviklis daiktų paėmimui iš talpyklos.
 block.unloader.description = Paima resursus iš gretimų ne gabenimui skirtų pastatų. Paimamos medžiagos rūšis gali būti pakeista paspaudus ant iškroviklio.
 block.launch-pad.description = Paleidžia daiktų paketus be branduolio paleidimo.
-block.launch-pad-large.description = Patobulinta paleidimo aikštelės versija. Laiko daugiau resursų. Gali būti paleidžiama dažniau.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Mažas ir pigus bokštas. Naudingas prieš antžeminius vienetus.
 block.scatter.description = Pagrindinis bokštas skirtas kovai su oro pajėgomis. Šaudo švino arba metalo laužo gabalais į priešus.
 block.scorch.description = Degina visus netoliese esan�ius priešus. Itin efektyvus artimame nuotolyje.
@@ -1327,9 +2180,433 @@ block.arc.description = Mažas artimojo nuotolio elektros bokštas. Šaudo elekt
 block.swarmer.description = Vidutinio didžio raketsvaidis. Puola, tiek žemę, tiek orą. Šaudo taikinius sekan�ias raketas.
 block.salvo.description = Didelis, pažangesnė Duo bokšto versija. Šaudo šovinių salvas į priešus.
 block.fuse.description = Didelis, artimojo nuotolio energijos bokštas. Šaudo tris prasiskverbian�ius spindulius.
-block.ripple.description = Itin galingas artilerijos bokštas. Dideliais atstumais šaudo būrius artilerijos šovinius į priešus. 
+block.ripple.description = Itin galingas artilerijos bokštas. Dideliais atstumais šaudo būrius artilerijos šovinius į priešus.
 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 block.repair-point.description = Pastoviai gydo artimiausius netoliese esan�ius vienetus.
 block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 6523ead319..b6567d21d8 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -2,71 +2,97 @@ credits.text = Gemaakt door [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Credits
 contributors = Vertalers en Bijdragers
 discord = Word lid van de Mindustry Discord!
-link.discord.description = De officiële Mindustry discord chatroom
+link.discord.description = De offici�le Mindustry discord chatroom
 link.reddit.description = De Mindustry subreddit
-link.github.description = Game broncode
+link.github.description = Spel Broncode
 link.changelog.description = Lijst van updates
 link.dev-builds.description = Onstabiele versies
-link.trello.description = Officiële trello-bord voor geplande functies
+link.trello.description = Offici�le trello-bord voor geplande functies
 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.wiki.description = Offici�le Mindustry wiki
 link.suggestions.description = Stel iets voor
-linkfail = Kan link niet openen!\nDe URL is gekopieerd naar je klembord
+link.bug.description = ��n gevonden? Rapporteer het hier.
+linkopen = Deze server heeft je een link gestuurd. Weet je zeker dat je hem wilt openen?\n\n[sky]{0}
+linkfail = Kon 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.
+screenshot.invalid = Map is te groot, er is mogelijk niet genoeg geheugen beschikbaar voor een schermafbeelding.
 gameover = Spel afgelopen
-gameover.pvp = het[accent] {0}[] team heeft gewonnen!
+gameover.disconnect = Disconnect
+gameover.pvp = Het[accent] {0}[] team heeft gewonnen!
+gameover.waiting = [accent]Wachten op de volgende map...
 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
+indev.notready = Dit gedeelte van het spel is nog niet klaar
 
-load.sound = Geluid
+load.sound = Geluiden
 load.map = Kaarten
 load.image = Afbeeldingen
-load.content = inhoud
+load.content = Inhoud
 load.system = Systeem
 load.mod = Mods
 load.scripts = Scripts
 
 be.update = Er is een nieuwe Bleeding Edge versie beschikbaar:
-be.update.confirm = Download en herstart?
+be.update.confirm = Download en gelijk herstarten?
 be.updating = Updaten...
 be.ignore = Negeer
 be.noupdates = Geen updates gevonden.
 be.check = Check voor updates
 
+mods.browser = Mod Browser
+mods.browser.selected = Geselecteerde mod
+mods.browser.add = Installeer
+mods.browser.reinstall = Herinstalleren
+mods.browser.view-releases = Bekijk Releases
+mods.browser.noreleases = [scarlet]Geen Releases Gevonden\n[accent]Kon geen releases vinden voor deze mod. Controleer of de repository van de mod releases heeft gepubliceerd.
+mods.browser.latest = <Recentst>
+mods.browser.releases = Releases
+mods.github.open = Repo
+mods.github.open-release = Release Pagina
+mods.browser.sortdate = Sorteer op recentst
+mods.browser.sortstars = Sorteer op sterren
+
 schematic = Ontwerp
 schematic.add = Bewaar ontwerp...
 schematics = Ontwerpen
+schematic.search = Search schematics...
 schematic.replace = Er bestaat al een ontwerp met die naam. Overschrijven?
-schematic.exists = A schematic by that name already exists.
+schematic.exists = Een ontwerp met die naam bestaat al.
 schematic.import = Importeer ontwerp...
 schematic.exportfile = Exporteer bestand
 schematic.importfile = Importeer bestand
 schematic.browseworkshop = Blader werkplaats
-schematic.copy = Kopiëren naar Klembord
+schematic.copy = Kopi�ren naar Klembord
 schematic.copy.import = Importeren van Klembord
 schematic.shareworkshop = Delen op de Werkplaats
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Spiegel ontwerp
 schematic.saved = Ontwerp bewaard.
 schematic.delete.confirm = Dit ontwerp zal in een zwart gat verdwijnen.
-schematic.rename = Hernoem ontwerp
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blokken
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Ontwerpen uitgeschakeld[]\nJe hebt geen toestemming om ontwerpen te gebruiken op deze [accent]map[] of [accent]server.
+schematic.tags = Tags:
+schematic.edittags = Wijzig Tags
+schematic.addtag = Voeg Tag toe
+schematic.texttag = Tekst Tag
+schematic.icontag = Icoon Tag
+schematic.renametag = Hernoem Tag
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Deze tag compleet verwijderen?
+schematic.tagexists = Die tag bestaat al.
 
-stat.wave = Waves Verslagen:[accent] {0}
-stat.enemiesDestroyed = Vijanden Vernietigd:[accent] {0}
-stat.built = Gebouwen Gebouwd:[accent] {0}
-stat.destroyed = Gebouwen Vernietigd:[accent] {0}
-stat.deconstructed = Gebouwen Gesloopt:[accent] {0}
-stat.delivered = Middelen Gelanceerd:
-stat.playtime = Time Played:[accent] {0}
-stat.rank = Eindrang: [accent]{0}
+stats = Statistieken
+stats.wave = Waves Verslagen
+stats.unitsCreated = Eenheden Gemaakt
+stats.enemiesDestroyed = Vijanden Vernietigd
+stats.built = Gebouwen Gebouwd
+stats.destroyed = Gebouwen Gesloopt
+stats.deconstructed = Gebouwen Gedeconstrueerd
+stats.playtime = Tijd Gespeeld
 
-globalitems = [accent]Global Items
+globalitems = [accent]Planeet Materialen
 map.delete = Weet je zeker dat je de map wilt verwijderen? "[accent]{0}[]"?
 level.highscore = Topscore: [accent]{0}
 level.select = Selecteer Level
@@ -74,13 +100,16 @@ level.mode = Spelmodus:
 coreattack = < Core wordt aangevallen! >
 nearpoint = [[ [scarlet]VERLAAT DE LANDINGSZONE ONMIDDELIJK[] ]\nlevensgevaarlijk
 database = Core Database
+database.button = Database
 savegame = Opslaan
 loadgame = Laden
 joingame = Treed toe
 customgame = Aangepast spel
 newgame = Nieuw spel
 none = <geen>
-minimap = Landkaart
+none.found = [lightgray]<niks gevonden>
+none.inmap = [lightgray]<geen in map>
+minimap = Minimap
 position = Positie
 close = Aflsuiten
 website = Website
@@ -89,7 +118,7 @@ save.quit = Bewaar & Stop
 maps = Kaarten
 maps.browse = Blader door kaarten
 continue = Ga door
-maps.none = [lightgray]Geen Kaart gevonden!
+maps.none = [lightgray]Geen Kaarten gevonden!
 invalid = Ongeldig
 pickcolor = Kies kleur
 preparingconfig = Configuratie voorbereiden
@@ -100,68 +129,100 @@ committingchanges = Wijzigingen aan het bewaren
 done = Klaar
 feature.unsupported = Je apparaat ondersteunt deze functionaliteit niet.
 
-mods.alphainfo = Houd in gedachten dat mod ondersteuning nieuw is, en daarom[scarlet] mogelijk ontstabiel is[].\nVermeld problemen die je ermee ondervind in de Mindustry GitHub of Discord.
+mods.initfailed = [red]?[] De vorige Mindustry instantie faalde te initialiseren. Dit werd waarschijnlijk veroorzaakt door misdragende mods.\n\nOm een crash loop te voorkomen, zijn [red]alle mods uitgeschakeld.[]
 mods = Mods
 mods.none = [lightgray]Geen mods gevonden!
-mods.guide = Modding Handboek
+mods.guide = Handboek voor modding
 mods.report = Rapporteer Bug
-mods.openfolder = Open Mod Map
-mods.reload = Reload
-mods.reloadexit = The game will now exit, to reload mods.
+mods.openfolder = Open Mod Folder
+mods.viewcontent = Bekijk Inhoud
+mods.reload = Herlaad
+mods.reloadexit = Het spel zal nu afsluiten, om mods te herladen.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
-mod.enabled = [lightgray]Aan
-mod.disabled = [scarlet]Uit
+mod.enabled = [lightgray]Ingeschakeld
+mod.disabled = [scarlet]Uitgeschakeld
+mod.multiplayer.compatible = [gray]Geschikt voor meerdere speleres
 mod.disable = Deactiveer
-mod.content = Content:
+mod.version = Version:
+mod.content = Inhoud:
 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.incompatiblegame = [red]Verouderd spel
+mod.incompatiblemod = [red]Onverenigbaar
+mod.blacklisted = [red]Niet Ondersteund
+mod.unmetdependencies = [red]Onbevredigde Afhankelijkheden
+mod.erroredcontent = [scarlet]Fouten in de inhoud
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+
+mod.requiresversion.details = Vereist spelversie: [accent]{0}[]\nJouw spel is verouderd. Deze mod heeft een nieuwere versie van de game nodig (mogelijk een beta/alpha release) om te functioneren.
+mod.outdatedv7.details = Deze mod is onverenigbaar met de nieuwste versie van het spel. De auteur moet het updaten en [accent]minGameVersion: 136[] toevoegen aan zijn/haar [accent]mod.json[] bestand.
+mod.blacklisted.details = Deze mod is handmatig op de zwarte lijst gezet wegens het veroorzaken van crashes of andere problemen met deze versie van het spel. Gebruik het niet.
+mod.missingdependencies.details = Deze mod mist afhankelijkheden: {0}
+mod.erroredcontent.details = Deze mod veroorzaakte fouten tijdens het laden. Vraag de auteur van de mod om ze te op te lossen.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+
+mod.requiresversion = Vereist spelversie: [red]{0}
+
 mod.errors = Er hebben zich fouten voordaan tijdens het laden van de inhoud.
-mod.noerrorplay = [scarlet]Je mods bevatten fouten.[] Zet de mods uit of los de problemen op voordat je verder gaat.
-mod.nowdisabled = [scarlet]Mod '{0}' mist een aantal benodigdheden:[accent] {1}\n[lightgray]Deze moet je eerst zelf downloaden.\nDeze mod is nu voor je uitgezet.
+mod.noerrorplay = [red]Je mods bevatten fouten.[] Zet de mods uit of los de problemen op voordat je verder gaat met spelen.
+mod.nowdisabled = [red]Mod '{0}' mist een aantal benodigdheden:[accent] {1}\n[lightgray]Deze moet je eerst zelf downloaden.\nDeze mod is nu voor je uitgezet.
 mod.enable = Activeer
-mod.requiresrestart = Deze game zal nu herstarten om de veranderingen aan de mods door te voeren.
-mod.reloadrequired = [scarlet]Herladen Vereist
+mod.requiresrestart = Het spel zal nu afsluiten om de veranderingen aan de mods door te voeren.
+mod.reloadrequired = [scarlet]Herstart Vereist
 mod.import = Importeer Mod
-mod.import.file = Import File
+mod.import.file = Importeer Bestand
 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.jarwarn = [scarlet]JAR mods zijn van nature onveilig.[]\nZorg ervoor dat je deze mod van een vertrouwde bron importeert.
 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}
-mod.missing = Deze Save bevat mods die zijn geupdatet of die je niet meer hebt geinstaleerd. Je save kan mogelijk kapot gaat. Weet je zeker dat je het wilt proberen?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Voordat je je mod publiceert in de workshop moet je een thumbnail toevoegen.\nPlaats een afbeelding genaamd[accent] preview.png[] in de map van die mod en probeer opnieuw.
-mod.folder.missing = Enkel mods in map formaat kunnen worden gepubliceerd in de workshop.\nOm een mod om te zetten in een map, unzip de mod en verwijder de zip, hetstart dan het spel of herlaad de mods.
-mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
+mod.missing = Deze Save bevat mods die zijn geupdatet of die je niet meer hebt geinstaleerd. Er kan corruptie optreden in deze save. Weet je zeker dat je het wilt laden?\n[lightgray]Mods:\n{0}
+mod.preview.missing = Voordat je je mod publiceert in de workshop moet je een thumbnail toevoegen.\nPlaats een afbeelding genaamd[accent] preview.png[] in de folder van die mod en probeer het opnieuw.
+mod.folder.missing = Alleen mods in folder formaat kunnen worden gepubliceerd in de werkplaats.\nOm een mod om te zetten in een folder, unzip de mod en verwijder de zip, herstart dan het spel of herlaad de mods.
+mod.scripts.disable = Uw apparaat ondersteunt geen mods met scripts. Je moet deze mods uitschakelen om het spel te kunnen spelen.
 
 about.button = Over
 name = Naam:
 noname = Maak eerst een[accent] Speler naam[].
-planetmap = Planet Map
-launchcore = Launch Core
+search = Zoek:
+planetmap = Planeten kaart
+launchcore = Lanceer core
 filename = Bestandsnaam:
 unlocked = Nieuwe inhoud ontgrendeld!
+available = Nieuw onderzoek beschikbaar.
+unlock.incampaign = < Ontgrendel in veldtocht voor details >
+campaign.select = Selecteer een veldtocht om mee te starten
+campaign.none = [lightgray]Kies een planeet om op te starten.\nJe kan op elk moment omschakelen naar de andere planeet.
+campaign.erekir = Nieuwere, meer gepolijste inhoud. Grotendeels lineair veldtochtverloop.\n\nKaarten en algemene ervaring van hogere kwaliteit.
+campaign.serpulo = Oudere inhoud; de klassieke ervaring. Meer open veldtochtverloop.\n\nKans op ongebalanceerde kaarten en veldtocht mechanismen. Minder gepolijst.
+campaign.difficulty = Difficulty
 completed = [accent]Voltooid
-techtree = Tech boom
+techtree = Techniekboom
+techtree.select = Techniekboom selectie
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Laad
+research.discard = Wegdoen
 research.list = [lightgray]Onderzoek:
 research = Onderzoek
 researched = [lightgray]{0} Onderzocht.
-research.progress = {0}% complete
+research.progress = {0}% compleet
 players = {0} Spelers online
 players.single = {0} Speler online
-players.search = search
-players.notfound = [gray]no players found
+players.search = zoek
+players.notfound = [gray]geen spelers gevonden
 server.closing = [accent]Server aan het sluiten...
 server.kicked.kick = Je bent verwijderd van deze sessie.
 server.kicked.whitelist = Je staat niet op de whitelist.
 server.kicked.serverClose = Server afgesloten...
-server.kicked.vote = Je bent ge vote-kicked. Tot ziens.
-server.kicked.clientOutdated = Verouderde versie! Update jouw spel!
+server.kicked.vote = Je bent weggestemd. Vaarwel.
+server.kicked.clientOutdated = Verouderde client! Update jouw spel!
 server.kicked.serverOutdated = Verouderde server! Vraag de host om te upgraden!
 server.kicked.banned = Je bent gedegradeerd van deze server.
-server.kicked.typeMismatch = Deze server is niet compatibel met jouw bouwtype.
+server.kicked.typeMismatch = Deze server is niet verenigbaar met jouw bouwtype.
 server.kicked.playerLimit = Deze server is vol. Wacht voor een vrije plek.
 server.kicked.recentKick = Je bent reeds verwijderd.\nWacht voordat je opnieuw verbindt.
 server.kicked.nameInUse = Er is al iemand met die naam\nop deze server.
@@ -171,48 +232,66 @@ server.kicked.customClient = Deze server ondersteunt geen aangepaste spellen . D
 server.kicked.gameover = Spel afgelopen
 server.kicked.serverRestarting = De server is aan het herstarten.
 server.versions = Jouw versie:[accent] {0}[]\nServer versie:[accent] {1}[]
-host.info = De [accent]host[] knop hosts `een server op port [scarlet]6567[]. \nIedereen op hetzelfde [lightgray]wifi or locaal netwerk[] zou jouw server in hun serverlijst moeten zien.\n\nAls je wilt dan vrienden vanaf overal kunnen meedoen via IP, [accent]port forwarding[] is nodig.\n\n[lightgray]Note: IAls iemand moeilijkheden heeft met het meedoen aan jouw spel, kijk of je Mindustry in je firewall instellingen toegang hebt gegeven tot jouw locaal netwerk.
-join.info = Hier kan je een [accent]server IP[] invoeren om te verbinden, of om[accent]locale netwerken[] te vinden.\nBeide LAN en WAN multiplayer is ondersteund.\n\n[lightgray]Note: Er is geen automatische globale serverlijst; Als je met iemands IP wil verbinden, Zou je moeten vragen om hun IP.
-hostserver = Host Game
+host.info = De [accent]host[] knop host een server op port [scarlet]6567[]. \nIedereen op dezelfde [lightgray]wifi of locaal netwerk[] zou jouw server in hun serverlijst moeten zien.\n\nAls je wilt dat vrienden vanaf overal kunnen meedoen via IP, dan is [accent]port forwarding[] vereist.\n\n[lightgray]Let op: Als iemand moeilijkheden heeft met het meedoen aan jouw spel, kijk of je Mindustry in je firewall instellingen toegang hebt gegeven tot jouw locaal netwerk.
+join.info = Hier kan je een [accent]server IP[] invoeren om met een server te verbinden, of om[accent]locale netwerken[] te vinden.\nZowel LAN als WAN multiplayer is ondersteund.\n\n[lightgray]Let op: Er is geen automatische globale serverlijst; Als je met iemands IP wil verbinden, zou je moeten vragen om hun IP.
+hostserver = Host Spel
 invitefriends = Nodig vrienden uit
-hostserver.mobile = Host\nGame
+hostserver.mobile = Host\nSpel
 host = Host
 hosting = [accent]Server openen...
 hosts.refresh = Herlaad
-hosts.discovering = LAN games aan het zoeken
-hosts.discovering.any = games aan het zoeken
+hosts.discovering = LAN spellen aan het zoeken
+hosts.discovering.any = spellen aan het zoeken
 server.refreshing = Herlaad server
-hosts.none = [lightgray]Geen lokale games gevonden!
+hosts.none = [lightgray]Geen lokale spellen gevonden!
 host.invalid = [scarlet]Kan niet verbinden met server.
 
-servers.local = Local Servers
-servers.remote = Remote Servers
+servers.local = Lokale Servers
+servers.local.steam = Open Spellen & Lokale Servers
+servers.remote = Externe servers
 servers.global = Community Servers
 
+servers.disclaimer = Community servers zijn [accent]niet[] in bezit of worden controlleerd door de ontwikkelaar.\n\nServers kunnen door gebruikers gegenereerde inhoud bevatten die niet geschikt is voor alle leeftijden.
+servers.showhidden = Toon Verborgen Servers
+server.shown = Weergegeven
+server.hidden = Verborgen
+
+viewplayer = Viewing Player: [accent]{0}
 trace = Traceer Speler
 trace.playername = Speler naam: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Unieke ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobiel apparaat: [accent]{0}
-trace.modclient = Unofficieël: [accent]{0}
+trace.modclient = Unofficie�l: [accent]{0}
+trace.times.joined = Keren Aangesloten: [accent]{0}
+trace.times.kicked = Keren uit het spel gezet: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Ongeldige speler ID! Raporteer deze bug.
-server.bans = Bans
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
+server.bans = Verbannen
 server.bans.none = Geen gedegradeerde spelers gevonden!
-server.admins = Admins
-server.admins.none = Geen admins gevonden!
-server.add = Voeg server to
-server.delete = Weet je zeker dat je deze server wilt weggooien?
+server.admins = Administrateurs
+server.admins.none = Geen administrateurs gevonden!
+server.add = Voeg server toe
+server.delete = Weet je zeker dat je deze server wilt wegdoen?
 server.edit = Bewerk server
 server.outdated = [crimson]Server draait op een oudere versie![]
-server.outdated.client = [crimson]Server draait en nieuwere versie![]
+server.outdated.client = [crimson]Server draait op een nieuwere versie![]
 server.version = [lightgray]Versie: {0} {1}
-server.custombuild = [accent]Custom Build
+server.custombuild = [accent]Aangespaste Bouw
 confirmban = Weet je zeker dat je deze speler wilt verbannen?
-confirmkick = Weet je zeker dat je deze speler wilt verwijderen?
-confirmvotekick = Weet je zeker dat je deze speler weg wilt stemmen?
-confirmunban = Weet je zeker dat je deze speler weer wil toelaten?
-confirmadmin = Weet je zeker dat je deze speler admin wil geven?
-confirmunadmin = Weet je zeker dat je de admin status van deze speler wilt intrekken?
+confirmkick = Weet je zeker dat je deze speler uit het spel wilt zetten?
+confirmunban = Weet je zeker dat je deze speler weer wilt toelaten?
+confirmadmin = Weet je zeker dat je deze speler administrateur wilt geven?
+confirmunadmin = Weet je zeker dat je de administrateurs status van deze speler wilt intrekken?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Treed toe
 joingame.ip = Adres:
 disconnect = Gesloten.
@@ -220,15 +299,18 @@ disconnect.error = Verbindingsfout.
 disconnect.closed = Verbinding gestopt.
 disconnect.timeout = Verbinding afgekapt.
 disconnect.data = Kon de wereld niet laden!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Geen verbinding mogelijk ([accent]{0}[]).
 connecting = [accent]Aan het verbinden...
+reconnecting = [accent]Aan het herverbinden...
 connecting.data = [accent]Wereld aan het laden...
 server.port = Poort:
-server.addressinuse = Adres is al in gebruik!
 server.invalidport = Poort is geen geldig getal!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Fout met hosten: [accent]{0}
 save.new = Nieuwe Save
 save.overwrite = Weet je zeker dat je deze\nsave wilt overschrijven?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Overschrijf
 save.none = Geen saves gevonden!
 savefail = Bewaren is mislukt!
@@ -245,10 +327,11 @@ save.rename.text = Nieuwe naam:
 selectslot = Selecteer een save.
 slot = [accent]Gleuf {0}
 editmessage = Bewerk bericht
-save.corrupted = [accent]Save bestand misvormd of ongeldig!\nAls je net je game hebt geupdatet, is dit waarschijnlijk een verandering in hoe saves werken, dit is[scarlet]geen[] bug.
+save.corrupted = [accent]Save misvormd of ongeldig!\nAls je net je game hebt geupdatet, is dit waarschijnlijk een verandering in hoe saves werken, dit is[scarlet]geen[] bug.
 empty = <leeg>
 on = Aan
 off = Uit
+save.search = Zoek opgeslagen spellen...
 save.autosave = Autosave: {0}
 save.map = Kaart: {0}
 save.wave = Ronde {0}
@@ -264,35 +347,64 @@ ok = Oke
 open = Open
 customize = Aanpassen
 cancel = Annuleer
+command = Commando
+command.queue = [lightgray][Queuing]
+command.mine = Mijn
+command.repair = Repareer
+command.rebuild = Herbouw
+command.assist = Assist Speler
+command.move = Beweeg
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Open Link
 copylink = Kopieer Link
 back = Terug
+max = Max
+objective = Map Doel
+crash.export = Exporteer Crash Logs
+crash.none = Geen crash logs gevonden.
+crash.exported = Crash logs geexporteerd.
 data.export = Exporteer Data
 data.import = Importeer Data
 data.openfolder = Open Data Folder
-data.exported = Data Geëxporteerd.
+data.exported = Data Ge�xporteerd.
 data.invalid = Dit is geen geldige game data.
 data.import.confirm = Importeren van data verwijderd[scarlet] alle[] huidige data.\n[accent]Dit kan niet ongedaan worden gemaakt![]\n\nWanneer de data is geimport herstart de game automatisch.
 quit.confirm = Weet je zeker dat je wilt stoppen?
-quit.confirm.tutorial = Weet je zeker dat je weet wat je doet?\nJe kan de tutorial opnieuw beginnen via[accent] Instellingen->Game->Herstart Tutorial.[]
 loading = [accent]Laden...
-reloading = [accent]Mods herladen...
+downloading = [accent]Downloaden...
 saving = [accent]Opslaan...
-respawn = [accent][[{0}][] to respawn in core
+respawn = [accent][[{0}][] om te respawnen in de core
 cancelbuilding = [accent][[{0}][] om blauwdruk te verwijderen
-selectschematic = [accent][[{0}][] om te selecteren + kopiëren
+selectschematic = [accent][[{0}][] om te selecteren + kopi�ren
 pausebuilding = [accent][[{0}][] om bouwen te pauzeren
 resumebuilding = [scarlet][[{0}][] om bouwen te hervatten
+enablebuilding = [scarlet][[{0}][] om bouwen in te schakelen
+showui = UI verborgen.\nDruk op [accent][[{0}][] om UI te laten zien.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Ronde {0}
-wave.cap = [accent]Wave {0}/{1}
+wave.cap = [accent]Golf {0}/{1}
 wave.waiting = [lightgray]Volgende ronde over {0}
 wave.waveInProgress = [lightgray]Ronde bezig
 waiting = [lightgray]Wachten...
 waiting.players = Wachten op spelers...
 wave.enemies = [lightgray]{0} Vijanden resterend
+wave.enemycores = [accent]{0}[lightgray] Vijandelijke Cores
+wave.enemycore = [accent]{0}[lightgray] Vijandelijke Core
 wave.enemy = [lightgray]{0} Vijand resterend
-wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
-wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
+wave.guardianwarn = Bewaker nadert in [accent]{0}[] golven.
+wave.guardianwarn.one = Bewaker nadert in [accent]{0}[] golf.
 loadimage = Laad afbeelding
 saveimage = Bewaar afbeelding
 unknown = Onbekend
@@ -300,9 +412,9 @@ custom = Aangepast
 builtin = Ingebouwd
 map.delete.confirm = Weet je zeker dat je deze map wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt!
 map.random = [accent]Willekeurige map
-map.nospawn = Deze map heeft geen cores voor de spelers om in te spawnen! Voeg een[royal] blauwe[] core toe aan de map via de editor.
-map.nospawn.pvp = Deze map heeft geen cores voor je vijanden om in te spawnen! Voeg een[scarlet] rode[] core to aan de map via de editor.
-map.nospawn.attack = Deze map bevat geen vijandige cores om aan te vallen! Voeg een[scarlet] rode[] core toe aan de map via de editor.
+map.nospawn = Deze map heeft geen cores voor de spelers om in te spawnen! Voeg een {0} core toe aan de map via de editor.
+map.nospawn.pvp = Deze map heeft geen cores voor je vijanden om in te spawnen! Voeg een [scarlet]rode[] core to aan de map via de editor.
+map.nospawn.attack = Deze map bevat geen vijandige cores om aan te vallen! Voeg een {0} core toe aan de map via de editor.
 map.invalid = Fout tijdens laden van map: Ongeldig map bestand.
 workshop.update = Bijwerken
 workshop.error = Fout bij laden workshop info: {0}
@@ -310,12 +422,17 @@ map.publish.confirm = Weet je zeker dat je deze map wilt publiceren?\n\n[lightgr
 workshop.menu = Selecteer wat je hiermee wilt doen.
 workshop.info = Informatie
 changelog = Update logboek (optioneel):
+updatedesc = Overschrijf Titel & Beschrijving
 eula = Steam EULA
-missing = Dit object is verwijderd of verplaatst.\n[lightgray]De workshop vermelding is nu niet meer gelinkt.
+missing = Dit object is verwijderd of verplaatst.\n[lightgray]De lijst met workshops is nu automatisch ontkoppeld.
 publishing = [accent]Publiceren...
 publish.confirm = Weet je zeker dat je dit wilt publiceren?\n\n[lightgray]Zorg ervoor dat je de EULA van de workshop leest, anders zal je map niet zichtbaar zijn!
 publish.error = Fout met het publiceren: {0}
 steam.error = Fout met het opstarten van steam diensten.\nError: {0}
+editor.planet = Planeet:
+editor.sector = Sector:
+editor.seed = Zaad:
+editor.cliffs = Muren naar kliffen
 
 editor.brush = Kwast
 editor.openin = Bewerk in editor
@@ -328,73 +445,115 @@ editor.nodescription = De kaart moet een beschrijving van minimaal 4 tekens hebb
 editor.waves = Rondes:
 editor.rules = Regels:
 editor.generation = Generatie:
-editor.ingame = Bewerk In-Game
+editor.objectives = Doelen
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
+editor.ingame = Bewerk In-Spel
+editor.playtest = Speeltest
 editor.publish.workshop = Publiceer in Werkplaats
 editor.newmap = Nieuwe Kaart
-editor.center = Center
+editor.center = Centraaliseer
+editor.search = Zoek kaarten...
+editor.filters = Filter Kaarten
+editor.filters.mode = Spelmodi:
+editor.filters.type = Kaart Type:
+editor.filters.search = Zoek In:
+editor.filters.author = Auteur
+editor.filters.description = Beschrijving
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Werkplaats
 waves.title = Rondes
 waves.remove = Verwijder
-waves.never = <nooit>
 waves.every = elke
 waves.waves = ronde(s)
+waves.health = levenspunten: {0}%
 waves.perspawn = per keer
-waves.shields = shields/wave
+waves.shields = schilden/golven
 waves.to = tot
-waves.guardian = Guardian
+waves.spawn = spawn:
+waves.spawn.all = <allemaal>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]geen spawns gevonden in kaart
+waves.max = maximale eenheden
+waves.guardian = Bewaker
 waves.preview = Voorvertoning
 waves.edit = Bewerk...
-waves.copy = Kopiër naar klembord
+waves.random = Random
+waves.copy = Kopieer naar klembord
 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.
+waves.invalid = Ongeldige rondes in klembord.
+waves.copied = Rondes Gekopi�erd.
+waves.none = Geen vijanden ingesteld.\nLege ronden worden automatisch gevuld met de standaard waarden.
+waves.sort = Sorteer Op
+waves.sort.reverse = Omgekeerd Sorteren
+waves.sort.begin = Begin
+waves.sort.health = Levenspunten
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Verberg Alle
+waves.units.show = Toon Alle
 
-wavemode.counts = counts
-wavemode.totals = totals
-wavemode.health = health
+wavemode.counts = telt
+wavemode.totals = totalen
+wavemode.health = levenspunten
+all = All
 
 editor.default = [lightgray]<Standaard>
 details = Details...
 edit = Bewerk...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Naam:
-editor.spawn = Voeg Unit toe
-editor.removeunit = Verwijder Unit
+editor.spawn = Voeg Eenheid toe
+editor.removeunit = Verwijder Eenheid
 editor.teams = Teams
 editor.errorload = Fout bij laden van bestand:\n[accent]{0}
 editor.errorsave = Fout van bewaren van bestand:\n[accent]{0}
 editor.errorimage = Dat is een afbeelding, geen kaart. Laat de extenties met rust.\n\nAls je een oude kaart wilt importeren gebruik je de knop die hiervoor bedoeld is in de editor.
 editor.errorlegacy = Deze kaart is te oud, bestandsformaat word niet meer ondersteund.
-editor.errornot = Dat is geen kaart bestand.
-editor.errorheader = Dit map bestand is niet geldig of heeft en fout.
+editor.errornot = Dat is geen kaartbestand.
+editor.errorheader = Dit kaartbestand is ongeldig of corrupt.
 editor.errorname = Kaart heeft geen naam.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Bijwerken
 editor.randomize = Willekeurig
+editor.moveup = Beweeg Omhoog
+editor.movedown = Beweeg Omlaag
+editor.copy = Kopieer
 editor.apply = Gebruiken
 editor.generate = Genereer
+editor.sectorgenerate = Sector Genereren
 editor.resize = Verander formaat
 editor.loadmap = Laad Kaart
 editor.savemap = Bewaar Kaart
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Bewaard!
-editor.save.noname = je kaart heeft geen naam! Stel er een in via de kaart instellingen.
+editor.save.noname = Je kaart heeft geen naam! Stel er ��n in het menu 'kaartinfo'.
 editor.save.overwrite = De naam van deze kaart is al in gebruik door een van het spel zelf, kies een andere.
 editor.import.exists = [scarlet]Importeren mislukt:[] een ingebouwde kaart met de naam '{0}' bestaat al!
 editor.import = Importeer...
 editor.importmap = Importeer kaart
-editor.importmap.description = Importeer een al bestande kaart
+editor.importmap.description = Importeer een al bestaande kaart
 editor.importfile = Importeer Bestand
-editor.importfile.description = Importer een extern kaart bestand
-editor.importimage = Importeer Klassieke Afbeelding
+editor.importfile.description = Een extern kaartbestand importeren
+editor.importimage = Afbeeldingsbestand Importeren
 editor.importimage.description = Importeer een oude afbeelding
 editor.export = Exporteer...
 editor.exportfile = Exporteer Bestand
-editor.exportfile.description = Exporteer een kaart bestand
+editor.exportfile.description = Exporteer een kaartbestand
 editor.exportimage = Exporteer Thumbnail
 editor.exportimage.description = Exporteer kaart thumbnail
-editor.loadimage = Importeer Terein
-editor.saveimage = Exporteer Terein
-editor.unsaved = [scarlet]Je hebt onopgeslagen wijzigingen![]\nWeet je zeker dat je eruit wilt?
-editor.resizemap = Verander kaart Formaat
+editor.loadimage = Importeer Terrein
+editor.saveimage = Exporteer Terrein
+editor.unsaved = [scarlet]Weet u zeker dat u wilt afsluiten?[]\nAlle niet opgeslagen veranderingen zullen verloren gaan.
+editor.resizemap = Kaart vergroten of verkleinen
 editor.mapname = Kaart Naam:
 editor.overwrite = [accent]Waarschuwing!\nDit overschrijft een bestaande kaart.
 editor.overwrite.confirm = [scarlet]Waarschuwing![] Een kaart met deze naam bestaat al. Weet je zeker dat je deze wilt overschrijven?
@@ -412,46 +571,75 @@ toolmode.square.description = Vierkante kwast.
 toolmode.eraseores = Verwijder grondstoffen
 toolmode.eraseores.description = Verwijderd enkel grondstoffen.
 toolmode.fillteams = Vervang Teams
-toolmode.fillteams.description = Vervangt teams in plaats van blokken.
+toolmode.fillteams.description = Vervang teams in plaats van blokken.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Teken Teams
 toolmode.drawteams.description = Tekent teams in plaats van blokken.
+toolmode.underliquid = Onder vloeistoffen
+toolmode.underliquid.description = Teken vloeren onder vloeistoffen tegels.
+
+filters.empty = [lightgray]Geen filters! Voeg er ��n toe met de onderstaande knop.
 
-filters.empty = [lightgray]Geen filters! Voeg een toe met onderstaande knop.
 filter.distort = Verdraai
-filter.noise = Geluid
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
-filter.corespawn = Core Select
+filter.noise = Ruis
+filter.enemyspawn = Vijandelijke Spawn Selecteren
+filter.spawnpath = Pad Naar Spawn
+filter.corespawn = Core Selecteren
 filter.median = Mediaan
 filter.oremedian = Ertsmediaan
 filter.blend = Meng
 filter.defaultores = Standaard Grondstoffen
 filter.ore = Grondstof
-filter.rivernoise = Rivier Geluid
+filter.rivernoise = Rivier Ruis
 filter.mirror = Spiegel
 filter.clear = Verwijder
 filter.option.ignore = Negeer
 filter.scatter = Verstrooi
-filter.terrain = Terein
+filter.terrain = Terrein
+filter.logic = Logic
+
 filter.option.scale = Schaal
 filter.option.chance = Verander
 filter.option.mag = Omvang
 filter.option.threshold = Drempel
-filter.option.circle-scale = Formaat Rondje
+filter.option.circle-scale = Formaat Circkel
 filter.option.octaves = Octaven
-filter.option.falloff = Afval
+filter.option.falloff = Falloff
 filter.option.angle = Hoek
-filter.option.amount = Amount
+filter.option.tilt = Kanteling
+filter.option.rotate = Draai
+filter.option.amount = Hoeveelheid
 filter.option.block = Blok
 filter.option.floor = Vloer
-filter.option.flooronto = Doel Vloer
-filter.option.target = Target
+filter.option.flooronto = Doelvloer
+filter.option.target = Doel
+filter.option.replacement = Vervanging
 filter.option.wall = Muur
 filter.option.ore = Grondstof
-filter.option.floor2 = Secundaire vloer
+filter.option.floor2 = Secundaire Vloer
 filter.option.threshold2 = Secundaire Drempel
 filter.option.radius = Straal
-filter.option.percentile = Percentage
+filter.option.percentile = percentiel
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Breedte:
 height = Hoogte:
@@ -462,7 +650,10 @@ load = Laad
 save = Bewaar
 fps = FPS: {0}
 ping = Ping: {0}ms
-language.restart = Herstart het spel om de gewijzigde taal te laden.
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
+language.restart = Start je spel opnieuw op om de taalinstellingen in werking te laten treden.
 settings = Instellingen
 tutorial = Tutorial
 tutorial.retake = Herstart Tutorial
@@ -475,58 +666,147 @@ locked = Op slot
 complete = [lightgray]Voltooid:
 requirement.wave = Bereik ronde {0} in {1}
 requirement.core = Vernietig vijandige core in {0}
-requirement.research = Research {0}
-requirement.capture = Capture {0}
-bestwave = [lightgray]Beste ronde: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
-uncover = Ontdek
+requirement.research = Onderzoek {0}
+requirement.produce = Produceer {0}
+requirement.capture = Verover {0}
+requirement.onplanet = Controlesector Op {0}
+requirement.onsector = Land Op Sector: {0}
+launch.text = Lanceer
+map.multiplayer = Alleen de host kan sectoren bekijken.
+uncover = Ontmasker
 configure = Configureer startinventaris
-loadout = Loadout
-resources = Resources 
+
+objective.research.name = Onderzoek
+objective.produce.name = Verkrijg
+objective.item.name = Verkrijg Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Aantal Gebouwen
+objective.unitcount.name = Aantal Eenheden
+objective.destroyunits.name = Vernietig Eenheden
+objective.timer.name = Timer
+objective.destroyblock.name = Vernietig Blok
+objective.destroyblocks.name = Vernietig Blokken
+objective.destroycore.name = Vernietig Core
+objective.commandmode.name = Commando Modus
+objective.flag.name = Vlag
+marker.shapetext.name = Vorm Tekst
+marker.point.name = Point
+marker.shape.name = Vorm
+marker.text.name = Tekst
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Achtergrond
+marker.outline = Omtrek
+objective.research = [accent]Onderzoek:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Verkrijg:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Vernietig:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Vernietig: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Verkrijg: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Verplaats In Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Bouw: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Bouw Eenheid: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Vernietig: [][lightgray]{0}[]x Eenheden
+objective.enemiesapproaching = [accent]Vijanden naderen in [lightgray]{0}[]
+objective.enemyescelating = [accent]Vijandelijke productie stijgt in [lightgray]{0}[]
+objective.enemyairunits = [accent]De productie van vijandelijke luchtmachteenheden begint in [lightgray]{0}[]
+objective.destroycore = [accent]Vernietig Vijandelijke Core
+objective.command = [accent]Commandeer Eenheden
+objective.nuclearlaunch = [accent]? Nucleaire lancering gedetecteerd: [lightgray]{0}
+announce.nuclearstrike = [red]? NUCLEAIRE AANVAL IN AANTOCHT ?
+loadout = Uitrusting
+resources = Materialen
+resources.max = Max
 bannedblocks = Verboden Blokken
+unbannedblocks = Unbanned Blocks
+objectives = Doelen
+bannedunits = Verboden eenheden
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Verboden eenheden als whitelist
+bannedblocks.whitelist = Verboden blokken als whitelist
 addall = Voeg Alles Toe
-launch.destination = Destination: {0}
+launch.from = Lanceren van: [accent]{0}
+launch.capacity = Lanceercapaciteit: [accent]{0}
+launch.destination = Bestemming: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Hoeveelheid moet een getal zijn tussen 0 en {0}.
-zone.unlocked = [lightgray]{0} vrijgespeeld.
-zone.requirement.complete = Ronde {0} bereikt:\n{1} zone vrijgespeeld.
-zone.resources = Vindbare grondstoffen:
-zone.objective = [lightgray]Doel: [accent]{0}
-zone.objective.survival = Overleef
-zone.objective.attack = Vernietig vijandige core
 add = Voeg toe...
-boss.health = Levens Boss
+guardian = Bewaker
 
 connectfail = [crimson]Kon niet verbinden met server:\n\n[accent]{0}
 error.unreachable = Server onbereikbaar.\nHeb je het adres goed gespeld?
 error.invalidaddress = Ongeldig adres.
-error.timedout = Verbindingspoging duurde te lang!\nDubbelcheck dat je host is geportforward, en dat je het ip wel goed hebt ingetikt!
-error.mismatch = Pakket fout:\nmogelijk is er een versie verschil tussen jou en de server.\nZorg ervoor dat beiden op de meest recente versie van Mindustry zitten!
+error.timedout = Verbindingspoging duurde te lang!\nDubbelcheck dat je host is geportforward, en of je het IP wel goed hebt ingetikt!
+error.mismatch = Pakket fout:\nmogelijk verschilt de versie van jou en de server.\nZorg ervoor dat jullie beiden op de meest recente versie van Mindustry zitten!
 error.alreadyconnected = Al verbonden.
-error.mapnotfound = Kaart bestand niet gevonden!
+error.mapnotfound = Kaartbestand niet gevonden!
 error.io = Netwerk I/O fout.
 error.any = Onbekende netwerk fout.
 error.bloom = Bloom aanzetten mislukt.\nJe apparaat ondersteunt het waarschijnlijk niet.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
-weather.sandstorm.name = Sandstorm
-weather.sporestorm.name = Sporestorm
-weather.fog.name = Fog
+weather.rain.name = Regen
+weather.snowing.name = Sneeuw
+weather.sandstorm.name = Zandstorm
+weather.sporestorm.name = Schimmelstorm
+weather.fog.name = Mist
+campaign.playtime = \uf129 [lightgray]Sector Speeltijd: {0}
+campaign.complete = [accent]Gefeliciteerd.\n\nDe vijand op {0} is verslagen.\n[lightgray]De laatste sector is veroverd.
+sectorlist = Sectoren
+sectorlist.attacked = {0} onder vuur
 
-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)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+sectors.unexplored = [lightgray]Onverkend
+sectors.resources = Grondstoffen:
+sectors.production = Productie:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Tijd:
+sectors.threat = Dreiging:
+sectors.wave = Golf:
+sectors.stored = Opgeslagen:
+sectors.resume = Doorgaan
+sectors.launch = Lanceer
+sectors.select = Selecteer
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]geen (sun)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Hernoem Sector
+sectors.enemybase = [scarlet]Vijandelijke Basis
+sectors.vulnerable = [scarlet]Kwetsbaar
+sectors.underattack = [scarlet]Onder vuur! [accent]{0}% beschadigd
+sectors.underattack.nodamage = [scarlet]Onoverwonnen
+sectors.survives = [accent]Overleeft {0} waves
+sectors.go = Ga
+sector.abandon = Verlaat
+sector.abandon.confirm = De core(s) van deze sector zal(zullen) zichzelf vernietigen. Doorgaan?
+sector.curcapture = Sector Veroverd
+sector.curlost = Sector Verloren
+sector.missingresources = [scarlet]Onvoeldoende Materialen in Core
+sector.attacked = Sector [accent]{0}[white] onder vuur!
+sector.lost = Sector [accent]{0}[white] verloren!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Verander icoon
+sector.noswitch.title = Kan niet van sector wisselen
+sector.noswitch = Je mag niet van sector wisselen terwijl een bestaande sector wordt aangevallen.\n\nSector: [accent]{0}[] op [accent]{1}[]
+sector.view = Bekijk Sector
+threat.low = Laag
+threat.medium = Gemiddeld
+threat.high = Hoog
+threat.extreme = Extreem
+threat.eradication = Uitroeiing
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planeten
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Zon
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -539,21 +819,107 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetery Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.
+sector.groundZero.description = De optimale locatie om nog een keer te beginnen. Lage vijandelijke dreiging. Enkele grondstoffen.\nVerzamel zoveel mogelijk lood en koper.\nGa door.
+sector.frozenForest.description = Zelfs hier, dichter bij de bergen, hebben de schimmels zich verspreid. De koude temperaturen kunnen ze niet eeuwig tegenhouden.\n\nBegin de onderneming in energie. Bouw verbrandingsgeneratoren. Leer herstellers te gebruiken.
+sector.saltFlats.description = Aan de rand van de woestijn liggen de Zoutvlaktes. Weinig grondstoffen zijn te vinden op deze locatie.\n\nDe vijand heeft hier een opslagplaats voor grondstoffen gebouwd. Roei hun core uit. Laat niets overeind staan.
+sector.craters.description = Water heeft zich opgehoopt in deze krater, restant van de oude oorlogen. Herwin het gebied. Verzamel zand. Smelt glasvezel. Pomp water om geschuttorens en boormachines te koelen.
+sector.ruinousShores.description = Voorbij het puin is de kustlijn. Ooit stond hier een kustbeschermingsinstallatie. Er is niet veel van overgebleven. Alleen de meest eenvoudige verdedigingswerken zijn onbeschadigd gebleven, al het andere tot schroot gereduceerd.\nGa door met de uitbreiding naar buiten. Herontdek de technologie.
+sector.stainedMountains.description = Verder landinwaarts liggen de bergen, nog niet aangetast door schimmels.\nWin het overvloedige titanium in dit gebied. Leer het te gebruiken.\n\nDe vijandelijke aanwezigheid is hier groter. Geef ze geen tijd om hun sterkste eenheden te sturen.
+sector.overgrowth.description = Dit gebied is overgroeid, dichter bij de bron van de schimmels.\nDe vijand heeft hier een voorpost gevestigd. Bouw mace-eenheden. Vernietig het. Herover wat verloren was gegaan.
+sector.tarFields.description = De rand van een olieproductiezone, tussen de bergen en de woestijn. Een van de weinige gebieden met bruikbare teerreserves.\nHoewel verlaten, heeft dit gebied enkele gevaarlijke vijandelijke troepen in de buurt. Onderschat ze niet.\n\n[lightgray]Onderzoek olieverwerkingstechnologie indien mogelijk.
+sector.desolateRift.description = Een extreem gevaarlijke zone. Veel grondstoffen, maar weinig ruimte. Hoog risico op vernietiging. Vertrek zo snel mogelijk. Laat je niet misleiden door de grote intervallen tussen vijandelijke aanvallen.
+sector.nuclearComplex.description = Een voormalige faciliteit voor de productie en verwerking van thorium, gereduceerd tot ru�nes.\n[lightgray]Onderzoek het thorium en zijn vele toepassingen.\n\nDe vijand is hier in grote getallen aanwezig en zoekt voortdurend naar aanvallers.
+sector.fungalPass.description = Een overgangsgebied tussen hoge bergen en lagere, met schimmels bezaaide gronden. Een kleine vijandelijke verkenningsbasis bevindt zich hier.\nVernietig het.\nGebruik Dolk en Kruiper eenheden. Schakel de twee cores uit.
+sector.biomassFacility.description = De oorsprong van de schimmels. Dit is de faciliteit waar ze werden onderzocht en aanvankelijk geproduceerd.\nOnderzoek de technologie die erin zit. Kweek schimmels voor de productie van brandstof en plastic.\n\n[lightgray]Bij de ondergang van deze faciliteit werden de schimmels vrijgelaten. Niets in het lokale ecosysteem kon het opnemen tegen zo'n invasief organisme.
+sector.windsweptIslands.description = Verderop langs de kustlijn ligt deze afgelegen keten van eilanden. Uit gegevens blijkt dat ze ooit [accent]Plastanium[]-producerende gebouwen hadden.\n\nScherm de marine-eenheden van de vijand af. Vestig een basis op de eilanden. Onderzoek deze fabrieken.
+sector.extractionOutpost.description = Een afgelegen voorpost, gebouwd door de vijand om grondstoffen naar andere sectoren te lanceren.\n\nCross-sector transport technologie is essentieel voor verdere verovering. Vernietig de basis. Onderzoek hun lanceerplatforms.
+sector.impact0078.description = Hier liggen overblijfselen van het interstellaire transportschip dat dit stelsel als eerste binnenkwam.\n\nHaal zoveel mogelijk uit het wrak. Onderzoek elk stuk nog intacte technologie.
+sector.planetaryTerminal.description = Het einddoel.\n\nDeze kustbasis bevat een structuur die Cores kan lanceren naar lokale planeten. Het wordt extreem goed bewaakt.\n\nProduceer marine eenheden. Schakel de vijand zo snel mogelijk uit. Onderzoek de lanceerstructuur.
+sector.coastline.description = Op deze locatie zijn resten van marinetechnologie gedetecteerd. Sla de vijandelijke aanvallen af, verover deze sector en verkrijg de technologie.
+sector.navalFortress.description = De vijand heeft een basis gevestigd op een afgelegen, natuurlijk versterkt eiland. Vernietig deze voorpost. Verkrijg hun geavanceerde marinetechnologie en onderzoek die.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = Begin de verovering van Erekir. Verzamel grondstoffen, produceer eenheden, en begin onderzoek naar technologie.
+sector.aegis.description = Deze sector bevat afzettingen van wolfraam.\nOnderzoek de [accent]Klopboormachine[] om deze bron te mijnen en vernietig de vijandelijke basis in het gebied.
+sector.lake.description = Het lava meer in deze sector beperkt de levensvatbare eenheden enorm. Een zwevende eenheid is de enige optie.\nOnderzoek de [accent]scheepsbouwerij[] en produceer zo snel mogelijk een [accent]elude[] eenheid.
+sector.intersect.description = Scans geven aan dat deze sector snel na de landing van meerdere kanten zal worden aangevallen.\nZet snel verdedigingen op en breid zo snel mogelijk uit.\n[accent]Mech[] eenheden zullen nodig zijn voor het ruwe terrein.
+sector.atlas.description = Deze sector bevat gevarieerd terrein en vereist een variatie aan eenheden om effectief aan te vallen.\nOpgewaardeerde eenheden kunnen ook van belang zijn om voorbij sommige van de moeilijkere gedetecteerde vijandelijke basissen te komen.\nOnderzoek de [accent]Elektrolyseur[] en de [accent]Tank Reconstructeur[].
+sector.split.description = De minimale vijandelijke aanwezigheid in deze sector maakt het perfect voor het testen van nieuwe transporttechnologie.
+sector.basin.description = Grote vijandelijke aanwezigheid ontdekt in deze sector.\nProduceer snel eenheden en verover vijandelijke Cores om voet aan de grond te krijgen.
+sector.marsh.description = Deze sector heeft een overvloed aan arkyciet, maar heeft beperkte openingen.\nBouw [accent]Chemische Verbrandingskamers[] om energie op te wekken.
+sector.peaks.description = Het bergachtige terrein in deze sector maakt de meeste eenheden nutteloos. Vliegende eenheden zullen nodig zijn.\nLet op vijandelijke luchtafweerinstallaties. Het kan mogelijk zijn sommige van deze installaties uit te schakelen door op hun ondersteunende gebouwen te richten.
+sector.ravine.description = Geen vijandelijke Cores ontdekt in de sector, hoewel het een belangrijke transportroute is voor de vijand. Verwacht een gevarieerd aantal vijandelijke troepen.\nProduceer [accent]golflegering[]. Construeer [accent]Afflict[] turrets.
+sector.caldera-erekir.description = De in deze sector aangetroffen grondstoffen liggen verspreid over verschillende eilanden.\nOnderzoek en implementeer drone-gebasseerd veroer.
+sector.stronghold.description = Het grote vijandelijke kampement in deze sector bewaakt aanzienlijke afzettingen van [accent]torium[].\nGebruik het om geavanceerdere eenheden en geschutstorens te ontwikkelen.
+sector.crevice.description = De vijand zal felle aanvalstroepen sturen om je basis in deze sector uit te schakelen.\nOntwikkeling van [accent]carbid[] en de [accent]Pyrolysegenerator[] kan noodzakelijk zijn om te overleven.
+sector.siege.description = Deze sector heeft twee parallelle ravijnen die een tweeledige aanval zullen forceren.\nOnderzoek [accent]cyanogeen[] om de mogelijkheid te krijgen om nog sterkere tankeenheden te cre�ren.\nAttentie: vijandelijke langeafstandsraketten zijn gedetecteerd. De raketten kunnen worden neergeschoten voordat ze inslaan.
+sector.crossroads.description = De vijandelijke basissen in deze sector zijn gevestigd in verschillend terrein. Onderzoek verschillende eenheden om aan te passen.\nBovendien worden sommige basissen beschermd door schilden. Zoek uit hoe ze worden aangedreven.
+sector.karst.description = Deze sector is rijk aan grondstoffen, maar zal door de vijand worden aangevallen zodra een nieuwe Core aan land komt.Profiteer van de grondstoffen en onderzoek [accent]fasestof[].
+sector.origin.description = De laatste sector met een aanzienlijke vijandelijke aanwezigheid.\nEr blijven geen waarschijnlijke onderzoeksmogelijkheden over - richt je alleen op het vernietigen van alle vijandelijke Cores.
+status.burning.name = Aan het branden
+status.freezing.name = Aan het vriezen
+status.wet.name = Nat
+status.muddy.name = Modderig
+status.melting.name = Smelten
+status.sapped.name = Ondermijnd
+status.electrified.name = Ge�lektrificeerd
+status.spore-slowed.name = Door Schimmel Vertraagd
+status.tarred.name = Geteerd
+status.overdrive.name = Overdrive
+status.overclock.name = Overklok
+status.shocked.name = Geschokt
+status.blasted.name = Gestraald
+status.unmoving.name = Onbeweeglijk
+status.boss.name = Bewaker
 
 settings.language = Taal
-settings.data = Game Data
+settings.data = Spelgegevens
 settings.reset = Terug naar standaardinstellingen
 settings.rebind = Verander
 settings.resetKey = Reset
@@ -561,33 +927,38 @@ settings.controls = Bediening
 settings.game = Spel
 settings.sound = Geluid
 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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
+settings.cleardata = Wis Spelgegevens...
+settings.clear.confirm = Weet je zeker dat je deze gegevens wilt verwijderen?\nDit is niet terug te draaien!
+settings.clearall.confirm = [scarlet]WAARSCHUWING![]\nDit verwijderd alle gegevens, inclusief saves, kaarten, technologie en bedienings-instellingen.\nAls je op doorgaat wist het spel al je gegevens en stopt automatisch.
+settings.clearsaves.confirm = Weet je zeker dat je al je saves wilt verwijderen?
+settings.clearsaves = Wis Saves
+settings.clearresearch = Wis Onderzoek
+settings.clearresearch.confirm = Weet je zeker dat je al je onderzoek wilt verwijderen?
+settings.clearcampaignsaves = Wis Veldtocht Saves
+settings.clearcampaignsaves.confirm = Weet je zeker dat je al je veldtocht saves wilt verwijderen?
 paused = [accent]< Gepauzeerd >
 clear = Wis
 banned = [scarlet]Verbannen
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Niet-ondersteunde Omgeving
 yes = Ja
 no = Nee
 info.title = Informatie
 error.title = [crimson]Een fout is opgetreden
 error.crashtitle = Een fout is opgetreden
-unit.nobuild = [scarlet]Unit can't build
-lastaccessed = [lightgray]Last Accessed: {0}
+unit.nobuild = [scarlet]Eenheid kan niet worden gebouwd
+lastaccessed = [lightgray]Laatste Toegang: {0}
+lastcommanded = [lightgray]Laatst Gecommandeerd: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <laad kaart om te tonen>
+stat.description = Doel
 
-stat.input = Input
-stat.output = Output
+stat.input = Invoer
+stat.output = Uitvoer
+stat.maxefficiency = Max effici�ntie
 stat.booster = Booster
-stat.tiles = Required Tiles
-stat.affinities = Affinities
+stat.tiles = Benodigde Tegels
+stat.affinities = Affiniteiten
+stat.opposites = Tegenstellingen
 stat.powercapacity = Stroomcapaciteit
 stat.powershot = Stroom/Schot
 stat.damage = Schade
@@ -597,212 +968,329 @@ stat.itemsmoved = Beweegingssnelheid
 stat.launchtime = Tijd tussen lanceringen
 stat.shootrange = Bereik
 stat.size = Formaat
-stat.displaysize = Display Size
+stat.displaysize = Weergavegrootte
 stat.liquidcapacity = Vloeistofcapaciteit
 stat.powerrange = Stroombereik
-stat.linkrange = Link Range
-stat.instructions = Instructions
+stat.linkrange = Verbindingsbereik
+stat.instructions = Instructies
 stat.powerconnections = Maximale Hoeveelheid Connecties
 stat.poweruse = Stroomverbruik
 stat.powerdamage = Stroom/Schade
-stat.itemcapacity = Materiaalcapaciteit
-stat.memorycapacity = Memory Capacity
+stat.itemcapacity = Itemcapaciteit
+stat.memorycapacity = Geheugencapaciteit
 stat.basepowergeneration = Standaard Stroom Generatie
 stat.productiontime = Productie Tijd
 stat.repairtime = Volledige Blok Repareertijd
+stat.repairspeed = Repareersnelheid
+stat.weapons = Wapens
+stat.bullet = Kogel
+stat.moduletier = Module Niveau
+stat.unittype = Unit Type
 stat.speedincrease = Snelheidsverhoging
 stat.range = Bereik
 stat.drilltier = Valt te delven
-stat.drillspeed = Standaard mine snelheid
-stat.boosteffect = Boost Effect
+stat.drillspeed = Standaard mijn snelheid
+stat.boosteffect = Boost-effect
 stat.maxunits = Maximaal Actieve Units
 stat.health = Levenspunten
+stat.armor = Pantser
 stat.buildtime = Bouwtijd
-stat.maxconsecutive = Max Consecutive
+stat.maxconsecutive = Max Opeenvolgend
 stat.buildcost = Bouwkosten
 stat.inaccuracy = Onnauwkeurigheid
-stat.shots = Shoten
+stat.shots = Schoten
 stat.reload = Schoten/Seconde
 stat.ammo = Ammunitie
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.shieldhealth = Schild Levenspunten
+stat.cooldowntime = Afkoelingsperiode
+stat.explosiveness = Explosiviteit
+stat.basedeflectchance = Basis Afbuigingskans
+stat.lightningchance = Bliksemkans
+stat.lightningdamage = Bliksemschade
+stat.flammability = Ontvlambaarheid
+stat.radioactivity = Radioactiviteit
+stat.charge = Lading
+stat.heatcapacity = Warmtecapaciteit
+stat.viscosity = Viscositeit
+stat.temperature = Temperatuur
+stat.speed = Snelheid
+stat.buildspeed = Bouw Snelheid
+stat.minespeed = Delvingssnelheid
+stat.minetier = Delvingsniveau
+stat.payloadcapacity = Ladingscapaciteit
+stat.abilities = Capaciteiten
+stat.canboost = Kan Boosten
+stat.flying = Vliegende
+stat.ammouse = Ammunitie gebruik
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Schade Vermenigvuldiger
+stat.healthmultiplier = Levenspunten Vermenigvuldiger
+stat.speedmultiplier = Snelheids Vermenigvuldiger
+stat.reloadmultiplier = Herlaad vermenigvuldiger
+stat.buildspeedmultiplier = Productiesnelheid Vermenigvuldiger
+stat.reactive = Reageert
+stat.immunities = Immuniteiten
+stat.healing = Genezing
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = Krachtveld
+ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.repairfield = Reparatieveld
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Statusveld
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fabriek
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Schild Regeneratie Veld
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Beweging Bliksem
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Schild Boog
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regeneratie Onderdrukkingsveld
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energieveld
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
-bar.drilltierreq = Betere miner nodig
-bar.noresources = Missing Resources
-bar.corereq = Core Base Required
-bar.drillspeed = Mining Snelheid: {0}/s
+bar.onlycoredeposit = Alleen materialen in de Core toegestaan.
+
+bar.drilltierreq = Betere boor nodig
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Er ontbreken materialen
+bar.corereq = Core Basis Vereist
+bar.corefloor = Core Zone Tegel Vereist
+bar.cargounitcap = Vracht eenheid limiet bereikt
+bar.drillspeed = Delvingssnelheid: {0}/s
 bar.pumpspeed = Pompsnelheid: {0}/s
 bar.efficiency = Rendement: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Stroom: {0}
 bar.powerstored = Opgeslagen: {0}/{1}
 bar.poweramount = Stroom: {0}
-bar.poweroutput = Stroom Output: {0}
-bar.powerlines = Connections: {0}/{1}
-bar.items = Items: {0}
+bar.poweroutput = Stroom uitvoer: {0}
+bar.powerlines = Connecties: {0}/{1}
+bar.items = Materialen: {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.cooldown = Cooldown
+bar.instability = Instabiliteit
+bar.heatamount = Warmte: {0}
+bar.heatpercent = Warmte: {0} ({1}%)
 bar.power = Stroom
 bar.progress = Bouw Voortgang
-bar.input = Input
-bar.output = Output
+bar.loadprogress = Voortgang
+bar.launchcooldown = Lancering Afkoelingstijd
+bar.input = Invoer
+bar.output = Uitvoer
+bar.strength = [stat]{0}[lightgray]x sterkte
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]Processor Gestuurd
 
-bullet.damage = [stat]{0}[lightgray] dmg
-bullet.splashdamage = [stat]{0}[lightgray] gebied dmg ~[stat] {1}[lightgray] tiles
+bullet.damage = [stat]{0}[lightgray] schade
+bullet.splashdamage = [stat]{0}[lightgray] gebied scade ~[stat] {1}[lightgray] tegels
 bullet.incendiary = [stat]brandstichtend
 bullet.homing = [stat]doelzoekend
-bullet.shock = [stat]schok
-bullet.frag = [stat]clusterbom
+bullet.armorpierce = [stat]pantserdoorborend
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x fragment kogels:
+bullet.lightning = [stat]{0}[lightgray]x bliksem ~ [stat]{1}[lightgray] schade
+bullet.buildingdamage = [stat]{0}%[lightgray] gebouwschade
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] terugslag
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]bevriezend
-bullet.tarred = [stat]pek
+bullet.pierce = [stat]{0}[lightgray]x doorboor
+bullet.infinitepierce = [stat]doorboor
+bullet.healpercent = [stat]{0}[lightgray]% genezing
+bullet.healamount = [stat]{0}[lightgray] directe reparatie
 bullet.multiplier = [stat]{0}[lightgray]x ammunitieverdubbelaar
 bullet.reload = [stat]{0}[lightgray]x herlaad
+bullet.range = [stat]{0}[lightgray] tegels bereik
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blokken
-unit.blockssquared = blocks²
-unit.powersecond = stroomeenheid/seconde
-unit.liquidsecond = vloeistofeenheid/seconde
-unit.itemssecond = items/seconde
-unit.liquidunits = vloeistofeenheid
-unit.powerunits = stroomeenheid
+unit.blockssquared = blokken�
+unit.powersecond = stroom eenheden/seconde
+unit.tilessecond = tegels/seconde
+unit.liquidsecond = vloeistof eenheden/seconde
+unit.itemssecond = materialen/seconde
+unit.liquidunits = vloeistof eenheden
+unit.powerunits = stroom eenheden
+unit.heatunits = warmte eenheden
 unit.degrees = graden
-unit.seconds = secondes
-unit.minutes = mins
+unit.seconds = seconden
+unit.minutes = minuten
 unit.persecond = /sec
 unit.perminute = /min
 unit.timesspeed = x snelheid
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = shield health
-unit.items = items
+unit.shieldhealth = levenspunten schild
+unit.items = materialen
 unit.thousands = k
-unit.millions = mil
-unit.billions = b
+unit.millions = mln
+unit.billions = mjd
+unit.shots = shots
+unit.pershot = /schot
+category.purpose = Doel
 category.general = Algemeen
 category.power = Stroom
-category.liquids = Vloeisof
-category.items = Items
-category.crafting = Productie
-category.function = Function
+category.liquids = Vloeisoffen
+category.items = Materialen
+category.crafting = Invoer/Uitvoer
+category.function = Functie
 category.optional = Optionele Verbeteringen
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Lancering/Land Animatie
 setting.landscape.name = Vergrendel Landschap
 setting.shadows.name = Schaduwen
 setting.blockreplace.name = Automatische Blok Suggesties
-setting.linear.name = Linear Filtering
+setting.linear.name = Linear Filteren
 setting.hints.name = Hints
-setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
+setting.logichints.name = Logische Hints
+setting.backgroundpause.name = Pauzeer in achtergrond
 setting.buildautopause.name = Pauzeer Bouw Automatisch
+setting.doubletapmine.name = Dubbelklik om te delven
+setting.commandmodehold.name = Vasthouden voor commandomodus
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Mods uitschakelen bij crash opstarten
 setting.animatedwater.name = Animeer Water
 setting.animatedshields.name = Animeer Schilden
-setting.antialias.name = Antialias[lightgray] (herstart vereist)[]
-setting.playerindicators.name = Player Indicators
+setting.playerindicators.name = Spelersindicatoren
 setting.indicators.name = Toon Bondgenoten
-setting.autotarget.name = Auto-Target
+setting.autotarget.name = Automatisch Richten
 setting.keyboard.name = Muis+Toetsenbord Controls
 setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Geen
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI Schaal[lightgray] (herstart vereist)[]
+setting.uiscale.description = Herstart vereist om veranderingen door te voeren.
 setting.swapdiagonal.name = Altijd Diagonaal Plaatsen
-setting.difficulty.training = oefening
-setting.difficulty.easy = makkelijk
-setting.difficulty.normal = normaal
-setting.difficulty.hard = moeilijk
-setting.difficulty.insane = krankzinnig
-setting.difficulty.name = Moeilijkheidsgraad:
 setting.screenshake.name = Schuddend Scherm
+setting.bloomintensity.name = Bloom Intensiteit
+setting.bloomblur.name = Bloom Waas
 setting.effects.name = Toon Effecten
 setting.destroyedblocks.name = Toon Vernietigde Blokken
-setting.blockstatus.name = Display Block Status
-setting.conveyorpathfinding.name = Lopendeband Plaats Hulp
+setting.blockstatus.name = Toon Blok Status
+setting.conveyorpathfinding.name = Transportband Plaats Hulp
 setting.sensitivity.name = Gevoeligheid Controller
 setting.saveinterval.name = Autosave Interval
-setting.seconds = {0} Seconden
-setting.blockselecttimeout.name = Block Select Timeout
+setting.seconds = {0} seconden
 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.fullscreen.name = Volledig Scherm
+setting.borderlesswindow.name = Grenzeloos Venster[lightgray] (wellicht herstart vereist)
+setting.borderlesswindow.name.windows = Grenzeloos Venster
+setting.borderlesswindow.description = Een herstart kan vereist zijn om de wijzigingen door te voeren.
+setting.fps.name = Toon FPS
+setting.console.name = Console Inschakelen
+setting.smoothcamera.name = Vloeiende Camera
 setting.vsync.name = VSync
-setting.pixelate.name = Pixelate [lightgray](mogelijk verminderde performance)
+setting.pixelate.name = Verpixel Spel [lightgray](mogelijk verminderde performance)
 setting.minimap.name = Toon Minimap
-setting.coreitems.name = Display Core Items (WIP)
+setting.coreitems.name = Toon Core Materialen
 setting.position.name = Toon Speler Posities
+setting.mouseposition.name = Toon Muis Positie
 setting.musicvol.name = Muziek Volume
-setting.atmosphere.name = Show Planet Atmosphere
-setting.ambientvol.name = Achtergronds Volume
+setting.atmosphere.name = Toon Atmosfeer Planeet
+setting.drawlight.name = Draw Darkness/Lighting
+setting.ambientvol.name = Achtergrond Volume
 setting.mutemusic.name = Demp Muziek
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Demp Geluid
 setting.crashreport.name = Stuur Anonieme Crashmeldingen
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Bewaar Saves Automatisch
-setting.publichost.name = Publieke Server Zichtbaarheid
-setting.playerlimit.name = Player Limit
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Spelerslijst
 setting.chatopacity.name = Chat Transparantie
-setting.lasersopacity.name = Stroom Draad Transparantie
-setting.bridgeopacity.name = Bridge Opacity
-setting.playerchat.name = Toon chat
-public.confirm = Wil je je game publiek maken?\n[accent]Iedereen kan dan je games joinen.\n[lightgray]Dit kan je later veranderen in Instellingen->Spel->Publieke Server Zichtbaarheid.
-public.beta = Onthoud dat beta versies van het spel niet publiek kunnen lobbyen.
-uiscale.reset = UI formaat is geweizigd.\nKlik op "OK" om het te bevestigen.\n[scarlet]Anders word het in[accent] {0}[] ongedaan gemaakt...
-uiscale.cancel = Anuleer & Sluit
+setting.lasersopacity.name = Stroomdraad Transparantie
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Brug Transparantie
+setting.playerchat.name = Toon Chat
+setting.showweather.name = Toon Weer Graphics
+setting.hidedisplays.name = Verberg Logische Displays
+setting.macnotch.name = Pas de interface aan om de inkeping weer te geven
+setting.macnotch.description = Herstart vereist om veranderingen door te voeren
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
+public.beta = Onthoud dat b�ta versies geen publieke lobby's kunnen maken.
+uiscale.reset = UI formaat is geweizigd.\nKlik op "OK" om het te bevestigen.\n[scarlet]Anders word het in[accent] {0}[] seconden ongedaan gemaakt...
+uiscale.cancel = Annuleer & Sluit
 setting.bloom.name = Bloom
-keybind.title = Verander Keys
-keybinds.mobile = [scarlet]De meeste keybinds werken niet voor mobiel. Enkel standaard bewegingen zijn gesupport.
+keybind.title = Herbind Toetsen
+keybinds.mobile = [scarlet]De meeste toetscombinaties werken niet voor mobiele apparaten. Enkel standaard bewegingen zijn ondersteund.
 category.general.name = Algemeen
 category.view.name = Toon
+category.command.name = Unit Command
 category.multiplayer.name = Multiplayer
-category.blocks.name = Block Select
-command.attack = Val aan
-command.rally = Groepeer
-command.retreat = Terugtrekken
-command.idle = Idle
+category.blocks.name = Selecteer Blok
 placement.blockselectkeys = \n[lightgray]Toets: [{0},
 keybind.respawn.name = Respawn
-keybind.control.name = Control Unit
+keybind.control.name = Bediening Eenheid
 keybind.clear_building.name = Stop met bouwen
 keybind.press = Druk op een toets...
-keybind.press.axis = Druk of swipe een toets...
-keybind.screenshot.name = Map Schermafbeelding
-keybind.toggle_power_lines.name = Wel/Geen Stroom Draden
-keybind.toggle_block_status.name = Toggle Block Statuses
+keybind.press.axis = Druk op een as of toets...
+keybind.screenshot.name = Folder Schermafbeelding
+keybind.toggle_power_lines.name = Wel/Geen Stroomdraden
+keybind.toggle_block_status.name = Schakel Blokstatus in
 keybind.move_x.name = Beweeg x
 keybind.move_y.name = Beweeg y
 keybind.mouse_move.name = Volg Muis
-keybind.pan.name = Pan View
+keybind.pan.name = Schuif Weergave
 keybind.boost.name = Boost
+keybind.command_mode.name = Commandomodus
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Herbouw Regio
 keybind.schematic_select.name = Selecteer gebied
-keybind.schematic_menu.name = Ontwerp Menu
+keybind.schematic_menu.name = Ontwerpmenu
 keybind.schematic_flip_x.name = Spiegel ontwerp X
 keybind.schematic_flip_y.name = Spiegel ontwerp Y
 keybind.category_prev.name = Vorige Categorie
@@ -821,86 +1309,144 @@ keybind.block_select_07.name = Selecteer Categorie/Blok 7
 keybind.block_select_08.name = Selecteer Categorie/Blok 8
 keybind.block_select_09.name = Selecteer Categorie/Blok 9
 keybind.block_select_10.name = Selecteer Categorie/Blok 10
-keybind.fullscreen.name = Schakel Fullscreen
+keybind.fullscreen.name = Schakel Fullscreen In/Uit
 keybind.select.name = Selecteer/Schiet
 keybind.diagonal_placement.name = Plaats Diagonaal
 keybind.pick.name = Kies Blok
 keybind.break_block.name = Breek Blok
+keybind.select_all_units.name = Selecteer Alle Eenheden
+keybind.select_all_unit_factories.name = Selecteer Alle Eenheidsfabrieken
 keybind.deselect.name = Deselecteer
-keybind.pickupCargo.name = Pickup Cargo
-keybind.dropCargo.name = Drop Cargo
-keybind.command.name = Command
+keybind.pickupCargo.name = Pak Vracht Op
+keybind.dropCargo.name = Laat Vracht Vallen
 keybind.shoot.name = Schiet
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pauze
 keybind.pause_building.name = Pauzeer/Hervat Bouwen
 keybind.minimap.name = Minimap
+keybind.planet_map.name = Planetenkaart
+keybind.research.name = Onderzoek
+keybind.block_info.name = Blok Informatie
 keybind.chat.name = Chat
-keybind.player_list.name = Speler list
+keybind.player_list.name = Spelerslijst
 keybind.console.name = Console
 keybind.rotate.name = Roteer
-keybind.rotateplaced.name = Roteer bestaand (Houd vast)
-keybind.toggle_menus.name = Schakel menus
-keybind.chat_history_prev.name = Chat geschiedenis ouder
-keybind.chat_history_next.name = Chat geschiedenis nieuwer
-keybind.chat_scroll.name = Chat scroll
-keybind.drop_unit.name = Drop Unit
-keybind.zoom_minimap.name = Zoom minimap
-mode.help.title = Beschrijving van modes
+keybind.rotateplaced.name = Roteer bestaand (Houdt vast)
+keybind.toggle_menus.name = Schakel Menu's
+keybind.chat_history_prev.name = Chat Geschiedenis Ouder
+keybind.chat_history_next.name = Chat Geschiedenis Nieuwer
+keybind.chat_scroll.name = Chat Scroll
+keybind.chat_mode.name = Verander Chatmodus
+keybind.drop_unit.name = Laat Eenheid Vallen
+keybind.zoom_minimap.name = Zoom Minimap
+mode.help.title = Beschrijving van Modi
 mode.survival.name = Overleving
-mode.survival.description = De normale mode. Standaard grondstoffen en rondes met vijanden.
+mode.survival.description = De normale modus. Standaard grondstoffen en automatisch inkomende golven van vijanden.
 mode.sandbox.name = Zandbak
-mode.sandbox.description = Oneindige resources en geen automatische vijandelijke rondes.
+mode.sandbox.description = Oneindige resources en geen automatische vijandelijke golven.
 mode.editor.name = Editor
 mode.pvp.name = PvP
-mode.pvp.description = Vecht tegen andere spelers.
+mode.pvp.description = Vecht tegen andere spelers.\n[gray]Vereist minstens 2 verschillend gekleurde cores in de kaart om te kunnen spelen.
 mode.attack.name = Aanvallen
 mode.attack.description = Geen rondes, maar met als doel de vijandlijke core(s) te vernietigen.
-mode.custom = Aangepaste regels
+mode.custom = Aangepaste Regels
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Verberg verboden blokken
 
 rules.infiniteresources = Oneindige Resources
+rules.onlydepositcore = Alleen spullen in de core doen toestaan.
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Ontploffende Reactors
-rules.schematic = Schematics Allowed
-rules.wavetimer = Ronde timer
-rules.waves = Rondes
-rules.attack = Aanval modus
-rules.buildai = AI Building
-rules.enemyCheat = Oneindige AI grondstoffen
-rules.blockhealthmultiplier = Blok Health Vermenigvulder
-rules.blockdamagemultiplier = Block Damage Multiplier
-rules.unitbuildspeedmultiplier = Unit Spawn Snelheid Vermenigvulder
-rules.unithealthmultiplier = Unit Health Vermenigvulder
-rules.unitdamagemultiplier = Unit Damage Vermenigvulder
+rules.coreincinerates = Core verbrandt overvloed aan materialen.
+rules.disableworldprocessors = Zet Wereld-Processors Uit.
+rules.schematic = Ontwerpen Toegestaan
+rules.wavetimer = Vijandelijke Golven Timer
+rules.wavesending = Golven Sturen
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
+rules.waves = Golven
+rules.airUseSpawns = Air units use spawn points
+rules.attack = Aanvalmodus
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Ploeg Grootte
+rules.rtsmaxsquadsize = Max Ploeg Grootte
+rules.rtsminattackweight = Min Aanvalsgewicht
+rules.cleanupdeadteams = Ruim verslagen gebouwen van team op (PvP)
+rules.corecapture = Verover Core Bij Vernietiging
+rules.polygoncoreprotection = Veelhoekige Corebescherming
+rules.placerangecheck = Plaatsingsbereik Controle
+rules.enemyCheat = Oneindige AI Materialen
+rules.blockhealthmultiplier = Blok Levenspunten Vermenigvuldiger
+rules.blockdamagemultiplier = Blokschade Vermenigvuldiger
+rules.unitbuildspeedmultiplier = Eenheid Spawnsnelheid Vermenigvuldiger
+rules.unitcostmultiplier = Eenheidskosten Vermenigvuldiger
+rules.unithealthmultiplier = Eenheid Levenspunten Vermenigvuldiger
+rules.unitdamagemultiplier = Eenheid Schade Vermenigvuldiger
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Zonne-Energie Vermenigvuldiger
+rules.unitcapvariable = Cores Dragen Bij Aan Eenheidslimiet
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Bais Eenheidlimiet
+rules.limitarea = Limiteer Kaart Gebied
 rules.enemycorebuildradius = Niet-Bouw Bereik Vijandelijke Cores:[lightgray] (tegels)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 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.initialwavespacing = Initi�le Golfafstand:[lightgray] (sec)
+rules.buildcostmultiplier = Bouwkosten Vermenigvuldiger
+rules.buildspeedmultiplier = Bouwsnelheid Vermenigvuldiger
+rules.deconstructrefundmultiplier = Deconstructie Terugbetalings Vermenigvuldiger
+rules.waitForWaveToEnd = Golven wachten tot alle vijanden zijn verslagen
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Vijandelijke Spawn Diameter:[lightgray] (tegels)
-rules.unitammo = Units Require Ammo
-rules.title.waves = Rondes
+rules.unitammo = Eenheden Gebruiken Ammunitie
+rules.enemyteam = Vijandelijk Team
+rules.playerteam = Spelerteam
+rules.title.waves = Golven
 rules.title.resourcesbuilding = Grondstoffen & Bouwen
-rules.title.enemy = Tegenstanders
-rules.title.unit = Units
+rules.title.enemy = Vijanden
+rules.title.unit = Eenheden
 rules.title.experimental = Experimenteel
-rules.title.environment = Environment
+rules.title.environment = Omgeving
+rules.title.teams = Teams
+rules.title.planet = Planeet
 rules.lighting = Belichting
-rules.enemyLights = Enemy Lights
-rules.fire = Fire
-rules.explosions = Block/Unit Explosion Damage
-rules.ambientlight = Mist
-rules.weather = Weather
-rules.weather.frequency = Frequency:
-rules.weather.duration = Duration:
+rules.fog = Mist van de Oorlog
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = Vuur
+rules.anyenv = <Elk>
+rules.explosions = Blok/Eenheid Explosieschade
+rules.ambientlight = Omgevingslicht
+rules.weather = Weer
+rules.weather.frequency = Frequentie:
+rules.weather.always = Altijd
+rules.weather.duration = Duur:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
-content.item.name = Items
-content.liquid.name = Vloeisof
-content.unit.name = Eenheiden
+content.item.name = Materialen
+content.liquid.name = Vloeistoffen
+content.unit.name = Eenheden
 content.block.name = Blokken
+content.status.name = Status Effecten
+content.sector.name = Sectoren
+content.team.name = Facties
+wallore = (Muur)
 
-item.copper.name = Coper
+item.copper.name = Koper
 item.lead.name = Lood
 item.coal.name = Steenkool
 item.graphite.name = Grafiet
@@ -908,18 +1454,31 @@ item.titanium.name = Titanium
 item.thorium.name = Thorium
 item.silicon.name = Silicium
 item.plastanium.name = Plastanium
-item.phase-fabric.name = Phase Fabric
-item.surge-alloy.name = Surge Alloy
-item.spore-pod.name = Spore Pod
+item.phase-fabric.name = Fasestof
+item.surge-alloy.name = Golflegering
+item.spore-pod.name = Schimmelcapsule
 item.sand.name = Zand
-item.blast-compound.name = Blast Compound
-item.pyratite.name = Pyratite
-item.metaglass.name = Metaglas
-item.scrap.name = Scrap
+item.blast-compound.name = Ontploffingsverbinding
+item.pyratite.name = Pyratiet
+item.metaglass.name = Glasvezel
+item.scrap.name = Schroot
+item.fissile-matter.name = Splijtbare Materie
+item.beryllium.name = Beryllium
+item.tungsten.name = Wolfraam
+item.oxide.name = Oxide
+item.carbide.name = Carbid
+item.dormant-cyst.name = Slapende Cyste
 liquid.water.name = Water
-liquid.slag.name = Slag
+liquid.slag.name = Lava
 liquid.oil.name = Olie
 liquid.cryofluid.name = Koelvloeistof
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arkyciet
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozon
+liquid.hydrogen.name = Waterstof
+liquid.nitrogen.name = Stikstof
+liquid.cyanogen.name = Cyanogeen
 
 unit.dagger.name = Dolk
 unit.mace.name = Mace
@@ -936,7 +1495,7 @@ unit.flare.name = Flare
 unit.horizon.name = Horizon
 unit.zenith.name = Zenith
 unit.antumbra.name = Antumbra
-unit.eclipse.name = Eclipse
+unit.eclipse.name = Eclips
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
@@ -947,6 +1506,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,77 +1518,104 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Spruitstuk
+unit.assembly-drone.name = Montage Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
-block.cliff.name = Cliff
+block.cliff.name = Klif
 block.sand-boulder.name = Zandkei
+block.basalt-boulder.name = Basaltkei
 block.grass.name = Gras
-block.slag.name = Slag
-block.space.name = Space
+block.molten-slag.name = Lava
+block.pooled-cryofluid.name = Koelvloeistof
+block.space.name = Ruimte
 block.salt.name = Zout
-block.salt-wall.name = Salt Wall
+block.salt-wall.name = Zoutmuur
 block.pebbles.name = Steentjes
-block.tendrils.name = Tendrils
-block.sand-wall.name = Sand Wall
-block.spore-pine.name = Sporenden
-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.tendrils.name = Ranken
+block.sand-wall.name = Zandmuur
+block.spore-pine.name = Schimmel Den
+block.spore-wall.name = Schimmelmuur
+block.boulder.name = Kei
+block.snow-boulder.name = Sneeuwkei
+block.snow-pine.name = Sneeuw Den
+block.shale.name = Leisteen
+block.shale-boulder.name = Leisteen Kei
 block.moss.name = Mos
-block.shrubs.name = Bosje
-block.spore-moss.name = Spore Moss
-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
-block.scrap-wall-gigantic.name = Gigantic Scrap Muur
-block.thruster.name = Thruster
+block.shrubs.name = Bosjes
+block.spore-moss.name = Schimmelmos
+block.shale-wall.name = Leisteen Muur
+block.scrap-wall.name = Schrootmuur
+block.scrap-wall-large.name = Grote Schrootmuur
+block.scrap-wall-huge.name = Enorme Schrootmuur
+block.scrap-wall-gigantic.name = Gigantische Schrootmuur
+block.thruster.name = Stuwraket
 block.kiln.name = Glasoven
-block.graphite-press.name = Grafiet Pers
+block.graphite-press.name = Grafietpers
 block.multi-press.name = Super-Pers
 block.constructing = {0} [lightgray](Bouwen)
 block.spawn.name = Vijandelijke Spawn
-block.core-shard.name = Core: Shard
-block.core-foundation.name = Core: Foundation
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
+block.core-shard.name = Core: Scherf
+block.core-foundation.name = Core: Fundament
 block.core-nucleus.name = Core: Nucleus
-block.deepwater.name = Diep Water
-block.water.name = Water
+block.deep-water.name = Diep Water
+block.shallow-water.name = Ondiep Water
 block.tainted-water.name = Vervuild Water
-block.darksand-tainted-water.name = Donker Zand Vervuild Water
-block.tar.name = Olie
+block.deep-tainted-water.name = Diep Vervuild Water
+block.darksand-tainted-water.name = Donkerzand Vervuild Water
+block.tar.name = Teer
 block.stone.name = Steen
-block.sand.name = Donker Zand
-block.darksand.name = Donker Zand
+block.sand-floor.name = Zand
+block.darksand.name = Donkerzand
 block.ice.name = Ijs
 block.snow.name = Sneeuw
-block.craters.name = Krarters
-block.sand-water.name = Zand water
-block.darksand-water.name = Donker Zand Water
+block.crater-stone.name = Kraters
+block.sand-water.name = Zand Water
+block.darksand-water.name = Donkerzand Water
 block.char.name = Char
-block.dacite.name = Dacite
-block.dacite-wall.name = Dacite Wall
-block.dacite-boulder.name = Dacite Boulder
-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.dacite.name = Daciet
+block.rhyolite.name = Rhyoliet
+block.dacite-wall.name = Dacieten Muur
+block.dacite-boulder.name = Dacieten Kei
+block.ice-snow.name = Ijssneeuw
+block.stone-wall.name = Stenen Muur
+block.ice-wall.name = Ijsmuur
+block.snow-wall.name = Sneeuwmuur
+block.dune-wall.name = Duinmuur
 block.pine.name = Den
-block.dirt.name = Dirt
-block.dirt-wall.name = Dirt Wall
-block.mud.name = Mud
+block.dirt.name = Aarde
+block.dirt-wall.name = Aardemuur
+block.mud.name = Modder
 block.white-tree-dead.name = Witte Boom Dood
 block.white-tree.name = Witte Boom
-block.spore-cluster.name = Spore Cluster
-block.metal-floor.name = Metalen Vloer
+block.spore-cluster.name = Schimmel Cluster
+block.metal-floor.name = Metalen Vloer 1
 block.metal-floor-2.name = Metalen Vloer 2
 block.metal-floor-3.name = Metalen Vloer 3
+block.metal-floor-4.name = Metalen Vloer 4
 block.metal-floor-5.name = Metalen Vloer 5
-block.metal-floor-damaged.name = Metalen Vloer Beschadigd
+block.metal-floor-damaged.name = Beschadigde Metalen Vloer
 block.dark-panel-1.name = Donker Paneel 1
 block.dark-panel-2.name = Donker Paneel 2
 block.dark-panel-3.name = Donker Paneel 3
@@ -1033,16 +1624,16 @@ block.dark-panel-5.name = Donker Paneel 5
 block.dark-panel-6.name = Donker Paneel 6
 block.dark-metal.name = Donker Metaal
 block.basalt.name = Basalt
-block.hotrock.name = Lava Steen
-block.magmarock.name = Magma Steen
+block.hotrock.name = Hete Steen
+block.magmarock.name = Magmasteen
 block.copper-wall.name = Koperen Muur
 block.copper-wall-large.name = Grote Koperen Muur
 block.titanium-wall.name = Titanium Muur
 block.titanium-wall-large.name = Grote Titanium Muur
 block.plastanium-wall.name = Plastanium Muur
 block.plastanium-wall-large.name = Grote Plastanium Muur
-block.phase-wall.name = Phase Muur
-block.phase-wall-large.name = Grote Phase Muur
+block.phase-wall.name = Fase Muur
+block.phase-wall-large.name = Grote Fase Muur
 block.thorium-wall.name = Thorium Muur
 block.thorium-wall-large.name = Grote Thorium Muur
 block.door.name = Deur
@@ -1052,87 +1643,90 @@ block.scorch.name = Vlammenwerper
 block.scatter.name = Strooier
 block.hail.name = Hagel
 block.lancer.name = Lansier
-block.conveyor.name = Lopende Band
-block.titanium-conveyor.name = Titanium Lopende Band
-block.plastanium-conveyor.name = Plastanium Conveyor
-block.armored-conveyor.name = Gepantserde Lopende Band
-block.armored-conveyor.description = Verplaatst items met dezelfde snelheid als een van titanium, maar heeft meer levenspunten. Accepteert alleen items van de zijkanten als het ook lopende banden zijn.
+block.conveyor.name = Transportband
+block.titanium-conveyor.name = Titanium Transportband
+block.plastanium-conveyor.name = Plastanium Transportband
+block.armored-conveyor.name = Gepantserde Transportband
 block.junction.name = Kruising
-block.router.name = Router
-block.distributor.name = Distributor
+block.router.name = Verdeler
+block.distributor.name = Distributeur
 block.sorter.name = Sorteerder
 block.inverted-sorter.name = Omgekeerder Sorteerder
 block.message.name = Bericht
+block.reinforced-message.name = Gepansterd Bericht
+block.world-message.name = Wereldbericht
+block.world-switch.name = World Switch
 block.illuminator.name = Lamp
-block.illuminator.description = Een kleine aanpasbare lamp, heeft stroom nodig.
-block.overflow-gate.name = Overflow Gate
-block.underflow-gate.name = Underflow Gate
+block.overflow-gate.name = Overstroom Poort
+block.underflow-gate.name = Onderstroom Poort
 block.silicon-smelter.name = Siliciumsmelter
-block.phase-weaver.name = Phase Weaver
-block.pulverizer.name = Vermorzelaar
-block.cryofluid-mixer.name = Cryofluid Mixer
+block.phase-weaver.name = Fase Wever
+block.pulverizer.name = Verpulveraar
+block.cryofluid-mixer.name = Koelvloeistof Mixer
 block.melter.name = Smelter
 block.incinerator.name = Verbrandingsoven
 block.spore-press.name = Schimmelpers
 block.separator.name = Afscheider
-block.coal-centrifuge.name = Koolcentrifuge
+block.coal-centrifuge.name = Steenkoolcentrifuge
 block.power-node.name = Stroompaal
 block.power-node-large.name = Grote Stroompaal
 block.surge-tower.name = Hoogspanningsmast
 block.diode.name = Batterij Diode
 block.battery.name = Batterij
 block.battery-large.name = Grote Batterij
-block.combustion-generator.name = Fossiele Generator
-block.steam-generator.name = Turbine Generator
-block.differential-generator.name = Verschiltemperatuurgenerator
-block.impact-reactor.name = Impact Reactor
+block.combustion-generator.name = Verbrandingsgenerator
+block.steam-generator.name = Turbinegenerator
+block.differential-generator.name = Temperatuursverschilgenerator
+block.impact-reactor.name = Impactreactor
 block.mechanical-drill.name = Mechanische Boor
 block.pneumatic-drill.name = Pneumatische Boor
 block.laser-drill.name = Lazerboor
 block.water-extractor.name = Waterput
-block.cultivator.name = Cultivator
+block.cultivator.name = Kweekmachine
 block.conduit.name = Pijp
 block.mechanical-pump.name = Mechanische Pomp
-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 Source
-block.unloader.name = Unloader
+block.item-source.name = Materiaalbron
+block.item-void.name = Materiaalgat
+block.liquid-source.name = Vloeistofbron
+block.liquid-void.name = Vloeistofgat
+block.power-void.name = Stroomgat
+block.power-source.name = Stroombron
+block.unloader.name = Losser
 block.vault.name = Kluis
 block.wave.name = Golf
 block.tsunami.name = Tsunami
-block.swarmer.name = Swarmer
+block.swarmer.name = Zwermer
 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.phase-conveyor.name = Fase-transportband
+block.bridge-conveyor.name = Brug-transportband
+block.plastanium-compressor.name = Plastaniumcompressor
+block.pyratite-mixer.name = Pyratietmixer
+block.blast-mixer.name = Ontploffingsmixer
 block.solar-panel.name = Zonnepaneel
 block.solar-panel-large.name = Groot zonnepaneel
 block.oil-extractor.name = Olieput
-block.repair-point.name = Repair Point
-block.pulse-conduit.name = Pulse Conduit
+block.repair-point.name = Repareerpunt
+block.repair-turret.name = Repareergeschutstoren
+block.pulse-conduit.name = Impulsleiding
 block.plated-conduit.name = Gepantserde Pijp
-block.phase-conduit.name = Phase Conduit
-block.liquid-router.name = Liquid Router
+block.phase-conduit.name = Faseleiding
+block.liquid-router.name = Vloeistofverdeler
 block.liquid-tank.name = Vloeistoftank
+block.liquid-container.name = Vloeistofcontainer
 block.liquid-junction.name = Vloeistofkruising
-block.bridge-conduit.name = Bridge Conduit
-block.rotary-pump.name = Rotary Pump
+block.bridge-conduit.name = Brugleiding
+block.rotary-pump.name = Draaipomp
 block.thorium-reactor.name = Thoriumreactor
 block.mass-driver.name = Mass Driver
-block.blast-drill.name = Airblast Drill
-block.thermal-pump.name = Thermische Pomp
+block.blast-drill.name = Luchtstraalboor
+block.impulse-pump.name = Thermische Pomp
 block.thermal-generator.name = Thermische Generator
-block.alloy-smelter.name = Legering Smelterij
-block.mender.name = Mender
-block.mend-projector.name = Mend Projector
-block.surge-wall.name = Surge Muur
-block.surge-wall-large.name = Grote Surge Muur
+block.surge-smelter.name = Golflegering Smelterij
+block.mender.name = Hersteller
+block.mend-projector.name = Herstelprojector
+block.surge-wall.name = Golflegeringen Muur
+block.surge-wall-large.name = Grote Golflegeringen Muur
 block.cyclone.name = Cycloon
 block.fuse.name = Zekering
 block.shock-mine.name = Elektrische Landmijn
@@ -1145,21 +1739,192 @@ block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Doos
 block.launch-pad.name = Lanceerplatform
-block.launch-pad-large.name = Groot Lanceerplatform
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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.ground-factory.name = Grondfabriek
+block.air-factory.name = Luchtfabriek
+block.naval-factory.name = Marinefabriek
+block.additive-reconstructor.name = Additieve Reconstructeur
+block.multiplicative-reconstructor.name = Multiplicatieve Reconstructeur
+block.exponential-reconstructor.name = Exponenti�le Reconstructeur
+block.tetrative-reconstructor.name = Tetratieve Reconstructeur
+block.payload-conveyor.name = Massa-Transportband
+block.payload-router.name = Vrachtverdeler
+
+block.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1169,66 +1934,153 @@ 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 = blauw
+team.malis.name = Malis
 team.crux.name = rood
 team.sharded.name = oranje
-team.orange.name = oranje
 team.derelict.name = wees
 team.green.name = groen
-team.purple.name = paars
 
-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
-tutorial.drill = Met de hand mijnen is inefficient.\n[accent]Boren []kunnen automatisch voor je mijnen.\nPlaats een boor op koper.
-tutorial.drill.mobile = Met de hand mijnen is inefficient.\n[accent]Boren []kunnen automatisch voor je mijnen.\nZoek de boren rechts onderin.\nSelecter de[accent] mechanische boor[].\nPlaats het op de koper door erop te klikken, druk dan op het[accent] vinkje[] om het bouwen te bevestigen.\nKlik op de[accent] X knop[] om het te anuleren.
-tutorial.blockinfo = Elk blok heeft andere statistieken. Elke boor kan enkel bepaalde dingen mijnen.\nOm het van een blok te checken,[accent] druk op de "?" knop terwijl je het blok vast hebt.[]\n\n[accent]Lees de statatistieken van de Mechanische Boor maar eens.[]
-tutorial.conveyor = [accent]Lopende Banden[] worden gebruikt om je items naar je core/basis te krijgen.\nLeg een lijn aan van je boren tot aan je core/basis.
-tutorial.conveyor.mobile = [accent]Lopende Banden[] worden gebruikt om je items naar je core/basis te krijgen.\nLeg een lijn aan van je boren tot aan je core/basis.\n[accent] Doe dit door je vinger een paar seconden stil te houden[] en dan in een richting te slepen.\n\n[accent]{0}/{1} Lopende banden worden in 1x geplaatst\n[accent]0/1 items afgeleverd
-tutorial.turret = Defensieve gebouwen moeten worden gebouwd tegen de[lightgray] vijand[].\nBouw een duo kannon bij je basis.
-tutorial.drillturret = Duo's hebben[accent] koperen ammunitie []nodig om te schieten.\nPlaats een drill ernaast om het van koper te voorzien.
-tutorial.pause = Tijdens een gevecht is het mogelijk[accent] het spel te pauzeren.[]\nJe kan nog wel je gebouwen plannen.\n\n[accent]Pauzeer het spel (spatie) nu.
-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 = Doe het opnieuw om weer verder te gaan.
-tutorial.unpause.mobile = Doe het opnieuw om weer verder te gaan.
-tutorial.breaking = Vaak moet je blokken weer verwijderen.\n[accent]Houd rechts-klik ingedrukt[] om alle geselecteerde blokken te vernietigen.[]\n\n[accent]Vernietig de scrap blokken links van je core om verder te gaan.
-tutorial.breaking.mobile = Vaak moet je blokken weer verwijderen.\n[accent]klik op de hamer voor vernietigigs-mode[], klik dan op een blok om het te breken.\nVernietig een heel gebied door je vinger een paar seconden still te houden en dan te slepen in een richting.\nKlik dan op het vinkje om het te bevestigen.\n\n[accent]Vernietig de scrap blokken links van je core om verder te gaan.
-tutorial.withdraw = In sommige situaties, is het nodig om items uit een blok te kunnen pakken.\nOm dit te doen, [accent]klik je op een blok[] waar items in zitten, en dan [accent]op het item te klikken[] in het zwarte menu.\nMeerdere items tegelijk kan je eruit halen door [accent]het ingedrukt te houden[].\n\n[accent]Pak wat koper uit de core.[]
-tutorial.deposit = Je kan de items weer terugstoppen door van je schip het terug te slepen naar waar je het wilt.\n\n[accent]Stop het nu weer terug in de core.[]
-tutorial.waves = De[lightgray] vijand[] naderd.\n\nVerdedig je core voor 2 rondes. Bouw meer verdedigingen.
-tutorial.waves.mobile = De[lightgray] vijand[] naderd.\n\nVerdedig je core voor 2 rondes. Je schip schiet automatisch op vijanden.\nBouw meer verdedigingen, en mine meer koper.
-tutorial.launch = Tijdens sommige waves, kan je je core[accent] lanceren[], hiermee verlaat je de basis permanent[accent] maar je neemt wel alles dat in de core zit met je mee.[]\nMet deze grondstoffen kan je nieuwe technologieën onderzoeken.\n\n[accent]Druk op de lanceerknop.
+team.blue.name = blauw
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Een nuttig materiaal voor gebouwen. Wordt erg vaak in blokken gebruikt.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Een basismateriaal. Wordt veel gebruikt in elektronica en vloeistoftransport.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
 item.metaglass.description = Een supersterke glas-samenstelling. Veel gebruikt voor vloeistof transport en opslag.
 item.graphite.description = Gemineraliseerde koolstof, gebruikt voor ammunitie en elektrische isolatie.
 item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
 item.coal.description = A common and readily available fuel.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
 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.scrap.details = Leftover remnants of old structures and units.
 item.silicon.description = An extremely useful semiconductor, with applications in solar panels and many complex electronics.
 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 = Used for conversion into oil, explosives and fuel.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
 item.pyratite.description = An extremely flammable substance used in incendiary weapons.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 liquid.water.description = 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 = Can be burnt, exploded or used as a coolant.
 liquid.cryofluid.description = The most efficient liquid for cooling things down.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Verplaatst items met dezelfde snelheid als een van titanium, maar heeft meer levenspunten. Accepteert alleen items van de zijkanten als het ook lopende banden zijn.
+block.illuminator.description = Een kleine aanpasbare lamp, heeft stroom nodig.
 
 block.message.description = Stores a message. Used for communication between allies.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.
 block.kiln.description = Smelts sand and lead into metaglass. Requires small amounts of power.
 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.surge-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
 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.
@@ -1244,6 +2096,8 @@ block.item-source.description = Infinitely outputs items. Sandbox only.
 block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
 block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
 block.liquid-void.description = Removes any liquids. Sandbox only.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. 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.
@@ -1256,6 +2110,10 @@ block.phase-wall.description = Not as strong as a thorium wall but will deflect
 block.phase-wall-large.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.\nSpans multiple tiles.
 block.surge-wall.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.
 block.surge-wall-large.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.\nSpans multiple tiles.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = A small door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.
 block.door-large.description = A large door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.\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.
@@ -1272,17 +2130,19 @@ block.phase-conveyor.description = Advanced item transport block. Uses power to
 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 from one direction and outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.overflow-gate.description = A combination splitter and router that 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 = Ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range.
 block.mechanical-pump.description = A cheap pump with slow output, but no power consumption.
 block.rotary-pump.description = An advanced pump which doubles up speed by using power.
-block.thermal-pump.description = The ultimate pump. Three times as fast as a mechanical pump and the only pump which is able to retrieve lava.
+block.impulse-pump.description = The ultimate pump. Three times as fast as a mechanical pump and the only pump which is able to retrieve lava.
 block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits.
 block.pulse-conduit.description = 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-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Stores a large amount of liquids. Use it for creating buffers when there is a 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.
@@ -1308,15 +2168,21 @@ block.laser-drill.description = Allows drilling even faster through laser techno
 block.blast-drill.description = The ultimate drill. Requires large amounts of power.
 block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
 block.cultivator.description = Cultivates spores with water in order to obtain biomatter.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
 block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.core-nucleus.details = The third and final iteration.
 block.vault.description = Stores a large amount of items of each type. Adjacent containers, vaults and cores will be treated as a single storage unit. An[lightgray] unloader[] can be used to retrieve items from the vault.
 block.container.description = Stores a small amount of items of each type. Adjacent containers, vaults and cores will be treated as a single storage unit. An[lightgray] unloader[] can be used to retrieve items from the container.
 block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
 block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished.
-block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = A small, cheap turret.
 block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
@@ -1331,5 +2197,429 @@ 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 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.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 2f6d94840c..dcf4a0f4a7 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -13,14 +13,17 @@ link.google-play.description = Mindustry op Google Play
 link.f-droid.description = F-Droid catalogus
 link.wiki.description = Officiële Mindustry-wiki
 link.suggestions.description = Suggest new features
+link.bug.description = Found one? Report it here
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 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.
 gameover = Game Over
+gameover.disconnect = Disconnect
 gameover.pvp = Het[accent] {0}[] team heeft gewonnen!
+gameover.waiting = [accent]Waiting for next map...
 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
@@ -37,10 +40,23 @@ be.updating = Updating...
 be.ignore = Ignore
 be.noupdates = No updates found.
 be.check = Check for updates
+mods.browser = Mod Browser
+mods.browser.selected = Selected mod
+mods.browser.add = Install
+mods.browser.reinstall = Reinstall
+mods.browser.view-releases = View Releases
+mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published.
+mods.browser.latest = <Latest>
+mods.browser.releases = Releases
+mods.github.open = Repo
+mods.github.open-release = Release Page
+mods.browser.sortdate = Sort by recent
+mods.browser.sortstars = Sort by stars
 
 schematic = Blauwdruk
 schematic.add = Blauwdruk Opslaan...
 schematics = Blauwdrukken
+schematic.search = Search schematics...
 schematic.replace = Er bestaat al een blaudruk met deze naam. Vervangen?
 schematic.exists = A schematic by that name already exists.
 schematic.import = Importeer Blauwdruk...
@@ -53,18 +69,26 @@ schematic.shareworkshop = Deel op Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
 schematic.saved = Blauwdruk opgeslagen.
 schematic.delete.confirm = This schematic will be utterly eradicated.
-schematic.rename = Blauwdruk Hernoemen
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blokken
 schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
-
-stat.wave = Je overleefde tot aanvalsgolf: [accent]{0}[].
-stat.enemiesDestroyed = Vijanden vernietigd:[accent] {0}
-stat.built = Gebouwen gebouwd:[accent] {0}
-stat.destroyed = Gebouwen vernietigd:[accent] {0}
-stat.deconstructed = Gebouwen afgebroken:[accent] {0}
-stat.delivered = Gronstoffen meegenomen:
-stat.playtime = Time Played:[accent] {0}
-stat.rank = Eindresultaat: [accent]{0}
+schematic.tags = Tags:
+schematic.edittags = Edit Tags
+schematic.addtag = Add Tag
+schematic.texttag = Text Tag
+schematic.icontag = Icon Tag
+schematic.renametag = Rename Tag
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Delete this tag completely?
+schematic.tagexists = That tag already exists.
+stats = Stats
+stats.wave = Waves Defeated
+stats.unitsCreated = Units Created
+stats.enemiesDestroyed = Enemies Destroyed
+stats.built = Buildings Built
+stats.destroyed = Buildings Destroyed
+stats.deconstructed = Buildings Deconstructed
+stats.playtime = Time Played
 
 globalitems = [accent]Global Items
 map.delete = Ben je zeker dat je de kaart "[accent]{0}[]" wilt verwijderen?
@@ -74,12 +98,15 @@ level.mode = Speelmode:
 coreattack = < Kern wordt aangevallen! >
 nearpoint = [[ [scarlet]VERLAAT dit gebied onmiddelijk[] ]\nDirecte vernietiging...
 database = Kern Database
+database.button = Database
 savegame = Opslaan
 loadgame = Openen
 joingame = Multiplayer
 customgame = Aangepaste versie
 newgame = Nieuw spel
 none = <geen>
+none.found = [lightgray]<none found>
+none.inmap = [lightgray]<none in map>
 minimap = Kaartje
 position = Positie
 close = Sluit
@@ -99,25 +126,39 @@ uploadingpreviewfile = Voorbeeldbestand Uploaden
 committingchanges = Veranderingen Toepassen
 done = Klaar
 feature.unsupported = Uw apparaat ondersteunt deze functie niet.
-
-mods.alphainfo = Mods zijn nog in alfa en [scarlet] kunnen zeer onstabiel zijn[].\nMeld problemen die je ondervindt op de Mindustry Github of Discord.
+mods.initfailed = [red]âš [] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
 mods = Mods
 mods.none = [lightgray]Geen mods gevonden!
 mods.guide = Handleiding tot Modding
 mods.report = Bug Rapporteren
 mods.openfolder = Open Mod Folder
+mods.viewcontent = View Content
 mods.reload = Reload
 mods.reloadexit = The game will now exit, to reload mods.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Ingeschakeld
 mod.disabled = [scarlet]Uitgeschakeld
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Schakel uit
+mod.version = Version:
 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.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Content Errors
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Errors have occurred loading content.
 mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
 mod.nowdisabled = [scarlet]De volgende vereisten ontbreken voor mod '{0}':[accent] {1}\n[lightgray]Deze mods moeten eerst gedownload worden.\nDeze mod wordt automatisch uitgeschakeld.
@@ -139,12 +180,25 @@ 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[].
+search = Search:
 planetmap = Planet Map
 launchcore = Launch Core
 filename = Bestandsnaam:
 unlocked = Ontgrendeld!
+available = New research available!
+unlock.incampaign = < Unlock in campaign for details >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Voltooid
 techtree = Technische vooruitgang
+techtree.select = Tech Tree Selection
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Load
+research.discard = Discard
 research.list = [lightgray]Onderzoek:
 research = Onderzoek
 researched = [lightgray]{0} onderzocht.
@@ -171,8 +225,8 @@ server.kicked.customClient = Deze server ondersteunt geen aangepaste versies (mo
 server.kicked.gameover = Game over!
 server.kicked.serverRestarting = The server is restarting.
 server.versions = Jouw versie:[accent] {0}[]\nServerversie:[accent] {1}[]
-host.info = Ook de [accent]host[] knop hosts een server op poort [scarlet]6567[]. \nIedereen die verbonden is met dezelfde [lightgray]wifi of lokaal netwerk[] zou je server moeten zien in zijn server lijst.\n\nAls je wil dat personen kunnen verbinden met je server van ergens anders via IP. Dan is [accent]port forwarding[] is nodig.\n\n[lightgray]Nota: Als iemand problemen heeft met het verbinden tot je LAN spel, zorg dan dat mindustry toestemming heeft tot je lokale netwerk in de Firewall instellingen. 
-join.info = Hier kan je een [accent]server IP[] invullen waarmee je wil verbinden. Je kan hier ook verbinden met servers op je [accent]lokale netwerk[]. LAN en WAN multiplayer wordt ondersteund.\n\n[lightgray]Belangrijk: er is geen automatische globale server lijst; als je met iemand wil verbinden via een IP adres moet je zijn/haar IP adres vragen. 
+host.info = Ook de [accent]host[] knop hosts een server op poort [scarlet]6567[]. \nIedereen die verbonden is met dezelfde [lightgray]wifi of lokaal netwerk[] zou je server moeten zien in zijn server lijst.\n\nAls je wil dat personen kunnen verbinden met je server van ergens anders via IP. Dan is [accent]port forwarding[] is nodig.\n\n[lightgray]Nota: Als iemand problemen heeft met het verbinden tot je LAN spel, zorg dan dat mindustry toestemming heeft tot je lokale netwerk in de Firewall instellingen.
+join.info = Hier kan je een [accent]server IP[] invullen waarmee je wil verbinden. Je kan hier ook verbinden met servers op je [accent]lokale netwerk[]. LAN en WAN multiplayer wordt ondersteund.\n\n[lightgray]Belangrijk: er is geen automatische globale server lijst; als je met iemand wil verbinden via een IP adres moet je zijn/haar IP adres vragen.
 hostserver = Open server voor LAN
 invitefriends = Nodig vrienden uit.
 hostserver.mobile = Open\nServer
@@ -186,16 +240,32 @@ hosts.none = [lightgray]Geen games op je lokale netwerk gevonden.
 host.invalid = [scarlet]Kan niet verbinden met de host (server).
 
 servers.local = Local Servers
+servers.local.steam = Open Games & Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
+servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
+servers.showhidden = Show Hidden Servers
+server.shown = Shown
+server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Spelersinformatie
 trace.playername = Naam: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Unieke ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobiele Client: [accent]{0}
 trace.modclient = Aangepaste Client: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Ongeldige client ID! Verstuur een bug report!
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Verbanningen
 server.bans.none = Geen verbannen spelers gevonden!
 server.admins = Administrators
@@ -209,10 +279,11 @@ server.version = [lightgray]Versie: {0} {1}
 server.custombuild = [accent]Aangepaste versie
 confirmban = Ben je zeker dat je deze speler wilt verbannen?
 confirmkick = Ben je zeker dat je deze speler van de server wilt gooien?
-confirmvotekick = Ben je zeker dat je een stemming wilt starten om deze speler uit de server to gooien?
 confirmunban = Ben je zeker dat je de verbanning wilt opheffen?
 confirmadmin = Ben je zeker dat je deze speler administrator wilt maken?
 confirmunadmin = Ben je zeker dat je de administratorstatus van deze speler wilt intrekken?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Verbinden met server
 joingame.ip = IP adres:
 disconnect = Verbinding verbroken.
@@ -220,15 +291,18 @@ disconnect.error = Verbindingsfout.
 disconnect.closed = Verbinding afgesloten.
 disconnect.timeout = Het duurde te lang voordat de server antwoordde.
 disconnect.data = Laden van mapdata mislukt!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Kon niet tot het spel toetreden. ([accent]{0}[]).
 connecting = [accent]Verbinden...
+reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Laden map data...
 server.port = Poort:
-server.addressinuse = Dit adres wordt al gebruikt!
 server.invalidport = Ongeldige poort!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Fout bij het openen van de server: [accent]{0}
 save.new = Nieuwe save
 save.overwrite = Ben je zeker dat je deze save\nwilt overschrijven?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Vervang
 save.none = Geen saves gevonden!
 savefail = Opslaan mislukt!
@@ -249,6 +323,7 @@ save.corrupted = [accent]Het savebestand is corrupt of ongeldig.\nAls je zonet j
 empty = <leeg>
 on = Aan
 off = Uit
+save.search = Search saved games...
 save.autosave = Autosave: {0}
 save.map = Map: {0}
 save.wave = Golf {0}
@@ -264,9 +339,33 @@ ok = OK
 open = Open
 customize = Pas aan
 cancel = Annuleer
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Open Link
 copylink = Kopiëer Link
 back = Terug
+max = Max
+objective = Map Objective
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
 data.export = Exporteer Data
 data.import = Importeer Data
 data.openfolder = Open Data Folder
@@ -274,15 +373,18 @@ data.exported = Data geëxporteerd.
 data.invalid = Dit is geen geldige speldata.
 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 = Weet je zeker dat je wilt stoppen?
-quit.confirm.tutorial = Ben je zeker dat je nu weet wat je doet?\nDe tutorial kan opnieuw gestart worden via[accent] Instellingen->Spel->Herneem Tutorial.[]
 loading = [accent]Aan het laden...
-reloading = [accent]Mods Herladen...
+downloading = [accent]Downloading...
 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
 resumebuilding = [scarlet][[{0}][] om verder te gaan met bouwen
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Golf {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]Golf in {0}
@@ -290,6 +392,8 @@ wave.waveInProgress = [lightgray]Golf bezig
 waiting = [lightgray]Wachten...
 waiting.players = Aan het wachten op spelers...
 wave.enemies = [lightgray]{0} Vijanden Over
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
 wave.enemy = [lightgray]{0} Vijand Over
 wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
 wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
@@ -300,9 +404,9 @@ custom = Aangepast
 builtin = Ingebouwd
 map.delete.confirm = Weet je zeker dat je deze kaart wilt verwijderen? Deze actie kan niet ongedaan gemaakt worden!
 map.random = [accent]Willekeurige Map
-map.nospawn = Deze map heeft geen cores voor spelers om te spawnen! Voeg een[royal] blauwe[] core toe in de mapbewerker.
-map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Voeg een[scarlet] niet-blauwe[] core toe in de mapbewerker.
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Voeg een[scarlet] rode[] core toe in de mapbewerker.
+map.nospawn = Deze map heeft geen cores voor spelers om te spawnen! Voeg een {0} core toe in de mapbewerker.
+map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Voeg een [scarlet]niet-blauwe[] core toe in de mapbewerker.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Voeg een {0} core toe in de mapbewerker.
 map.invalid = Fout tijdens het laden van de map: Corrupt of ongeldig mapbestand.
 workshop.update = Update Item
 workshop.error = Error fetching workshop details: {0}
@@ -310,12 +414,17 @@ map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]M
 workshop.menu = Select what you would like to do with this item.
 workshop.info = Item Info
 changelog = Changelog (optional):
+updatedesc = Overwrite Title & Description
 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.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Brush
 editor.openin = Open In Editor
@@ -328,35 +437,71 @@ editor.nodescription = A map must have a description of at least 4 characters be
 editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Edit In-Game
+editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
-waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
+waves.health = health: {0}%
 waves.perspawn = per spawn
 waves.shields = shields/wave
 waves.to = to
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
+waves.random = Random
 waves.copy = Copy to Clipboard
 waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
+all = All
 
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Name:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -368,13 +513,19 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Apply
 editor.generate = Generate
+editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Saved!
 editor.save.noname = Your map does not have a name! Set one in the 'map info' menu.
 editor.save.overwrite = Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
@@ -413,8 +564,12 @@ toolmode.eraseores = Erase Ores
 toolmode.eraseores.description = Erase only ores.
 toolmode.fillteams = Fill Teams
 toolmode.fillteams.description = Fill teams instead of blocks.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
 filter.distort = Distort
@@ -433,6 +588,7 @@ filter.clear = Clear
 filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
+filter.logic = Logic
 filter.option.scale = Scale
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -441,17 +597,39 @@ filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.angle = Angle
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Floor
 filter.option.flooronto = Target Floor
 filter.option.target = Target
+filter.option.replacement = Replacement
 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
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Width:
 height = Height:
@@ -462,6 +640,9 @@ load = Load
 save = Save
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Please restart your game for the language settings to take effect.
 settings = Settings
 tutorial = Tutorial
@@ -476,26 +657,71 @@ complete = [lightgray]Reach:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
 requirement.research = Research {0}
+requirement.produce = Produce {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Best Wave: {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
+map.multiplayer = Only the host can view sectors.
 uncover = Uncover
 configure = Configure Loadout
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
 loadout = Loadout
-resources = Resources 
+resources = Resources
+resources.max = Max
 bannedblocks = Banned Blocks
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = Resources Detected:
-zone.objective = [lightgray]Objective: [accent]{0}
-zone.objective.survival = Survive
-zone.objective.attack = Destroy Enemy Core
 add = Add...
-boss.health = Boss Health
+guardian = Guardian
 
 connectfail = [crimson]Failed to connect to server:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
@@ -507,26 +733,69 @@ 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Time:
+sectors.threat = Threat:
+sectors.wave = Wave:
 sectors.stored = Stored:
 sectors.resume = Resume
 sectors.launch = Launch
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
+sector.curcapture = Sector Captured
+sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
+sector.attacked = Sector [accent]{0}[white] under attack!
+sector.lost = Sector [accent]{0}[white] lost!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planets
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sun
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -539,6 +808,22 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -551,6 +836,75 @@ 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
 
 settings.language = Language
 settings.data = Game Data
@@ -573,7 +927,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Yes
 no = No
 info.title = Info
@@ -581,13 +935,18 @@ error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Purpose
 
 stat.input = Input
 stat.output = Output
+stat.maxefficiency = Max Efficiency
 stat.booster = Booster
 stat.tiles = Required Tiles
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Power Capacity
 stat.powershot = Power/Shot
 stat.damage = Damage
@@ -610,6 +969,11 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Base Power Generation
 stat.productiontime = Production Time
 stat.repairtime = Block Full Repair Time
+stat.repairspeed = Repair Speed
+stat.weapons = Weapons
+stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Speed Increase
 stat.range = Range
 stat.drilltier = Drillables
@@ -617,6 +981,7 @@ stat.drillspeed = Base Drill Speed
 stat.boosteffect = Boost Effect
 stat.maxunits = Max Active Units
 stat.health = Health
+stat.armor = Armor
 stat.buildtime = Build Time
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Build Cost
@@ -632,6 +997,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = HeatCapacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -640,21 +1006,77 @@ stat.buildspeed = Build Speed
 stat.minespeed = Mine Speed
 stat.minetier = Mine Tier
 stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
 stat.abilities = Abilities
+stat.canboost = Can Boost
+stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Better Drill Required
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Power: {0}/s
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
@@ -663,13 +1085,19 @@ bar.powerlines = Connections: {0}/{1}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet]î Š {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
+bar.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
 bar.power = Power
 bar.progress = Build Progress
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -677,35 +1105,50 @@ 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.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
 bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blocks
 unit.blockssquared = blocks²
 unit.powersecond = power units/second
+unit.tilessecond = tiles/second
 unit.liquidsecond = liquid units/second
 unit.itemssecond = items/second
 unit.liquidunits = liquid units
 unit.powerunits = power units
+unit.heatunits = heat units
 unit.degrees = degrees
 unit.seconds = seconds
 unit.minutes = mins
 unit.persecond = /sec
 unit.perminute = /min
 unit.timesspeed = x speed
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Purpose
 category.general = General
 category.power = Power
 category.liquids = Liquids
@@ -713,16 +1156,23 @@ category.items = Items
 category.crafting = Input/Output
 category.function = Function
 category.optional = Optional Enhancements
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 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[scarlet] (experimental)
+setting.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animated 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
@@ -732,14 +1182,11 @@ setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI Scaling[lightgray] (requires restart)[]
+setting.uiscale.description = Restart required to apply changes.
 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.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Display Effects
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
@@ -747,32 +1194,43 @@ setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Autosave 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] (may require restart)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Show FPS
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 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.coreitems.name = Display Core Items
 setting.position.name = Show Player Position
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Music Volume
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display In-Game 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.
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Adapt interface to display notch
+setting.macnotch.description = Restart required to apply changes
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
 uiscale.cancel = Cancel & Exit
@@ -781,12 +1239,9 @@ keybind.title = Rebind Keys
 keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
 category.general.name = General
 category.view.name = View
+category.command.name = Unit Command
 category.multiplayer.name = Multiplayer
 category.blocks.name = Block Select
-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
@@ -801,6 +1256,27 @@ keybind.move_y.name = Move y
 keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -826,16 +1302,20 @@ keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo
-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.planet_map.name = Planet Map
+keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Chat
 keybind.player_list.name = Player list
 keybind.console.name = Console
@@ -845,6 +1325,7 @@ keybind.toggle_menus.name = Toggle menus
 keybind.chat_history_prev.name = Chat history prev
 keybind.chat_history_next.name = Chat history next
 keybind.chat_scroll.name = Chat scroll
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = Drop Unit
 keybind.zoom_minimap.name = Zoom minimap
 mode.help.title = Description of modes
@@ -858,47 +1339,100 @@ mode.pvp.description = Fight against other players locally.
 mode.attack.name = Attack
 mode.attack.description = No waves, with the goal to destroy the enemy base.
 mode.custom = Custom Rules
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Infinite Resources
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Waves
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Attack Mode
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
+rules.initialwavespacing = Initial 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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
 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.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Lighting
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
 content.block.name = Blocks
+content.status.name = Status Effects
+content.sector.name = Sectors
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Copper
 item.lead.name = Lead
@@ -916,10 +1450,23 @@ item.blast-compound.name = Blast Compound
 item.pyratite.name = Pyratite
 item.metaglass.name = Metaglass
 item.scrap.name = Scrap
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -947,6 +1494,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,13 +1506,35 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
+block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Grass
-block.slag.name = Slag
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Space
 block.salt.name = Salt
 block.salt-wall.name = Salt Wall
@@ -988,24 +1562,28 @@ block.graphite-press.name = Graphite Press
 block.multi-press.name = Multi-Press
 block.constructing = {0} [lightgray](Constructing)
 block.spawn.name = Enemy Spawn
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 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.deep-water.name = Deep Water
+block.shallow-water.name = Water
 block.tainted-water.name = Tainted Water
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Dark Sand Tainted Water
 block.tar.name = Tar
 block.stone.name = Stone
-block.sand.name = Sand
+block.sand-floor.name = Sand
 block.darksand.name = Dark Sand
 block.ice.name = Ice
 block.snow.name = Snow
-block.craters.name = Craters
+block.crater-stone.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Ice Snow
@@ -1023,6 +1601,7 @@ 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-4.name = Metal Floor 4
 block.metal-floor-5.name = Metal Floor 4
 block.metal-floor-damaged.name = Metal Floor Damaged
 block.dark-panel-1.name = Dark Panel 1
@@ -1056,15 +1635,16 @@ 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 conveyors.
 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.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 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
@@ -1115,20 +1695,22 @@ 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.repair-turret.name = Repair Turret
 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-container.name = Liquid Container
 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.impulse-pump.name = Thermal Pump
 block.thermal-generator.name = Thermal Generator
-block.alloy-smelter.name = Alloy Smelter
+block.surge-smelter.name = Surge Smelter
 block.mender.name = Mender
 block.mend-projector.name = Mend Projector
 block.surge-wall.name = Surge Wall
@@ -1145,9 +1727,9 @@ 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.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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
@@ -1157,9 +1739,179 @@ 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.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1169,66 +1921,153 @@ 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.malis.name = Malis
 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.[]\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
-tutorial.drill = Handmatig delven is inefficiënt.\n[accent]Boren []kunnen automatisch delven.\nPlaats er een op een koperader.
-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]Transportbanden[] worden gebruikt om artikelen naar de kern te transporteren.\nMaak een lijn van transportbanden van de boor tot de kern.
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
-tutorial.turret = Er moeten verdedigingsstructuren worden gebouwd om de[lightgray] vijand[]af te weren.\nBouw een duo geschutstoren in de buurt van je basis.
-tutorial.drillturret = Duo geschutstorens hebben[accent] koper ammunitie []nodig om te schieten.\nPlaats een boor naast de geschutstoren om het van gedolven koper te voorzien.
-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 = De [lightgray] vijand[] nadert.\n\nVerdedig jouw kern voor 2 golven. Bouw meer geschutstorens.
-tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
-tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese resources can then be used to research new technology.\n\n[accent]Press the launch button.
+team.blue.name = blue
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = A useful structure material. Used extensively in all types of blocks.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
 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 insulation.
 item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
 item.coal.description = A common and readily available fuel.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
 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.scrap.details = Leftover remnants of old structures and units.
 item.silicon.description = An extremely useful semiconductor, with applications in solar panels and many complex electronics.
 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 = Used for conversion into oil, explosives and fuel.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
 item.pyratite.description = An extremely flammable substance used in incendiary weapons.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 liquid.water.description = 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 = Can be burnt, exploded or used as a coolant.
 liquid.cryofluid.description = The most efficient liquid for cooling things down.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
+block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 
 block.message.description = Stores a message. Used for communication between allies.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.
 block.kiln.description = Smelts sand and lead into metaglass. Requires small amounts of power.
 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.surge-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
 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.
@@ -1244,6 +2083,8 @@ block.item-source.description = Infinitely outputs items. Sandbox only.
 block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
 block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
 block.liquid-void.description = Removes any liquids. Sandbox only.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. 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.
@@ -1256,6 +2097,10 @@ block.phase-wall.description = Not as strong as a thorium wall but will deflect
 block.phase-wall-large.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.\nSpans multiple tiles.
 block.surge-wall.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.
 block.surge-wall-large.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.\nSpans multiple tiles.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = A small door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.
 block.door-large.description = A large door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.\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.
@@ -1272,17 +2117,19 @@ block.phase-conveyor.description = Advanced item transport block. Uses power to
 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 from one direction and outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.overflow-gate.description = A combination splitter and router that 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 = Ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range.
 block.mechanical-pump.description = A cheap pump with slow output, but no power consumption.
 block.rotary-pump.description = An advanced pump which doubles up speed by using power.
-block.thermal-pump.description = The ultimate pump.
+block.impulse-pump.description = The ultimate pump.
 block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits.
 block.pulse-conduit.description = 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-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Stores a large amount of liquids. Use it for creating buffers when there is a 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.
@@ -1308,15 +2155,21 @@ block.laser-drill.description = Allows drilling even faster through laser techno
 block.blast-drill.description = The ultimate drill. Requires large amounts of power.
 block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
 block.cultivator.description = Cultivates tiny concentrations of spores into industry-ready pods.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
 block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.core-nucleus.details = The third and final iteration.
 block.vault.description = Stores a large amount of items of each type. An[lightgray] unloader[] can be used to retrieve items from the vault.
 block.container.description = Stores a small amount of items of each type. An[lightgray] unloader[] can be used to retrieve items from the container.
 block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
 block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished.
-block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = A small, cheap turret. Useful against ground units.
 block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
@@ -1331,5 +2184,429 @@ 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 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.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index aa26f651db..e9f5038d41 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -7,24 +7,24 @@ link.reddit.description = Subreddit Mindustry
 link.github.description = Kod źródłowy gry
 link.changelog.description = Historia aktualizacji
 link.dev-builds.description = Niestabilne wersje gry
-link.trello.description = Oficjalna tablica Trello z planowanym funkcjami
-link.itch.io.description = Strona itch.io z oficjanymi wersjami do pobrania
+link.trello.description = Oficjalna tablica Trello z planowanymi funkcjami
+link.itch.io.description = Strona itch.io z oficjalnymi wersjami do pobrania
 link.google-play.description = Strona w sklepie Google Play
-link.f-droid.description = Wykaz Katalogu F-Droid
-link.wiki.description = Oficjana Wiki Mindustry
+link.f-droid.description = Pozycja w F-Droid
+link.wiki.description = Oficjalna Wiki Mindustry
 link.suggestions.description = Zaproponuj nowe funkcje
 link.bug.description = Znalazłeś błąd? Zgłoś go tutaj
+linkopen = Serwer wysłał ci link. Czy jesteś pewnien, że chcesz go otworzyć?\n\n[sky]{0}
 linkfail = Nie udało się otworzyć linku!\nURL został skopiowany.
 screenshot = Zapisano zrzut ekranu w {0}
 screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje miejsca w pamięci urządzenia.
 gameover = Koniec Gry
 gameover.disconnect = Odłącz
 gameover.pvp = Zwyciężyła drużyna [accent]{0}[]!
-gameover.waiting =[accent]Czekanie na następną mapę...
+gameover.waiting = [accent]Oczekiwanie na następną mapę...
 highscore = [accent]Nowy rekord!
 copied = Skopiowano.
 indev.notready = Ta część gry nie jest jeszcze ukończona
-indev.campaign = [accent]Udało ci się zakończyć kampanie![]\n\nZawartość kończy się na tym. Podróż międzyplanetarna zostanie dodana w przyszłych aktualizacjach.
 
 load.sound = Dźwięki
 load.map = Mapy
@@ -41,16 +41,24 @@ be.ignore = Zignoruj
 be.noupdates = Nie znaleziono aktualizacji.
 be.check = Sprawdź aktualizacje
 
-mod.featured.title = Wyszukiwarka Modów
-mod.featured.dialog.title = Wyszukiwarka Modów
+mods.browser = Przeglądarka Modów
 mods.browser.selected = Wybrany Mod
-mods.browser.add = Zainstaluj Moda
+mods.browser.add = Zainsta-\nluj Moda
+mods.browser.reinstall = Przeins-\ntaluj
+mods.browser.view-releases = Pokaż wydania
+mods.browser.noreleases = [scarlet]Nie znaleziono wydań\n[accent]Nie znaleziono żadnych wydań tego moda. Sprawdź czy ten mod posiada publiczne wydania w swoim repozytorium.
+mods.browser.latest = <Najnowsze>
+mods.browser.releases = Wydania
 mods.github.open = Otwórz w GitHub'ie
+mods.github.open-release = Strona z wydaniem
+mods.browser.sortdate = Sortuj wg ostatnich
+mods.browser.sortstars = Sortuj wg gwiazdek
 
 schematic = Schemat
 schematic.add = Zapisz schemat...
 schematics = Schematy
-schematic.replace = Schemat o takiej nazwie już istnieje. Czy chcesz go zastąpić?
+schematic.search = Wyszukaj schematy...
+schematic.replace = Schemat o tej nazwie już istnieje. Czy chcesz go zastąpić?
 schematic.exists = Schemat o tej nazwie już istnieje.
 schematic.import = Importuj Schemat...
 schematic.exportfile = Eksportuj plik
@@ -62,21 +70,29 @@ schematic.shareworkshop = Podziel siÄ™ na Warsztacie
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Odwróć schemat
 schematic.saved = Schemat zapisany.
 schematic.delete.confirm = Ten schemat zostanie usunięty.
-schematic.rename = Zmień nazwę schematu
+schematic.edit = Edytuj Schemat
 schematic.info = {0}x{1}, {2} bloków
 schematic.disabled = [scarlet]Schematy są wyłączone[]\nNie możesz używać schematów na tej [accent]mapie[] lub [accent]serwerze.
+schematic.tags = Tagi:
+schematic.edittags = Zmień Znacznik
+schematic.addtag = Dodaj Znacznik
+schematic.texttag = Tekst Znacznika
+schematic.icontag = Ikona Znacznika
+schematic.renametag = Zmień Nazwę Znacznika
+schematic.tagged = {0} Otagowany
+schematic.tagdelconfirm = Czy kompletnie usunąć znacznik?
+schematic.tagexists = Taki znacznik już istnieje.
 
 stats = Statystyki
-stat.wave = Fale powstrzymane:[accent] {0}
-stat.enemiesDestroyed = Przeciwnicy zniszczeni:[accent] {0}
-stat.built = Budynki zbudowane:[accent] {0}
-stat.destroyed = Budynki zniszczone:[accent] {0}
-stat.deconstructed = Budynki zrekonstruowane:[accent] {0}
-stat.delivered = Surowce wystrzelone:
-stat.playtime = Czas Gry:[accent] {0}
-stat.rank = Ocena: [accent]{0}
+stats.wave = Pokonane Fale
+stats.unitsCreated = Wyprodukowane Jednostki
+stats.enemiesDestroyed = Pokonani Wrogowie
+stats.built = Zbudowane Budynki
+stats.destroyed = Zniszczone Budynki
+stats.deconstructed = Zdekonstruowane Budynki
+stats.playtime = Przegrany Czas
 
-globalitems = [accent]Global Items
+globalitems = [accent]Wszystkie przedmioty
 map.delete = Jesteś pewny, że chcesz usunąć "[accent]{0}[]"?
 level.highscore = Rekord: [accent]{0}
 level.select = Wybrany poziom
@@ -84,18 +100,21 @@ level.mode = Tryb gry:
 coreattack = < Rdzeń jest atakowany! >
 nearpoint = [[ [scarlet]NATYCHMIAST OPUŚĆ PUNKT ZRZUTU[] ]\nnadciąga zniszczenie
 database = Centralna baza danych
+database.button = Baza Danych
 savegame = Zapisz GrÄ™
 loadgame = Wczytaj GrÄ™
 joingame = Dołącz Do Gry
 customgame = WÅ‚asna Gra
 newgame = Nowa Gra
 none = <brak>
+none.found = [lightgray]<nie znaleziono>
+none.inmap = [lightgray]<brak na mapie>
 minimap = Minimapa
 position = Pozycja
 close = Zamknij
 website = Strona Gry
 quit = Wyjdź
-save.quit = Zapisz & Wyjdź
+save.quit = Zapisz i Wyjdź
 maps = Mapy
 maps.browse = PrzeglÄ…daj Mapy
 continue = Kontynuuj
@@ -110,30 +129,44 @@ committingchanges = Zatwierdzanie Zmian
 done = Gotowe
 feature.unsupported = Twoje urzÄ…dzenie nie wspiera tej funkcji.
 
-
-mods.alphainfo = Pamiętaj, że mody są wersji alpha, i[scarlet] mogą być pełne błędów[].\nZgłaszaj wszystkie znalezione problemy na Mindustry GitHub lub Discord.
+mods.initfailed = [red]⚠[] Inicjalizacja poprzedniej instancji Mindustry nie powiodła się. Najprawdopodobniej było to spowodowane niewłaściwym działaniem modów.\n\nAby zapobiec pętli awarii, [red]wszystkie mody zostały wyłączone.[]\n\nAby wyłączyć tę funkcję, należy wyłączyć ją w ustawieniach [accent]Ustawienia->Gra->Wyłącz mody w przypadku awarii podczas uruchamiania[].
 mods = Mody
 mods.none = [lightgray]Nie znaleziono modów!
 mods.guide = Poradnik do modów
-mods.report = Zgłoś Błąd
+mods.report = Zgłoś błąd
 mods.openfolder = Otwórz folder z modami
+mods.viewcontent = Zobacz zawartość
 mods.reload = Przeładuj
 mods.reloadexit = Gra zostanie teraz zamknięta, aby ponownie załadować mody.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]WÅ‚Ä…czony
 mod.disabled = [scarlet]Wyłączony
+mod.multiplayer.compatible = [gray]Kompatybilny z trybem wieloosobowym
 mod.disable = Wyłącz
+mod.version = Version:
 mod.content = Zawartość:
 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]Niekompatybilne z wersjÄ… v6 (no minGameVersion: 105)
-mod.missingdependencies = [scarlet]Brakujące zależności: {0}
+mod.incompatiblegame = [red]Przestarzała Gra
+mod.incompatiblemod = [red]Niekompatybilne
+mod.blacklisted = [red]Niewspierane
+mod.unmetdependencies = [red]Niespełnione Zależnośći
 mod.erroredcontent = [scarlet]Błędy Zawartości
+mod.circulardependencies = [red]Zagnieżdżone zależności
+mod.incompletedependencies = [red]Brakujące zależności
+mod.requiresversion.details = Wymaga wersji gry: [accent]{0}[]\nTwoja gra jest przestarzała. Ten mod potrzebuje nowszej wersji gry (możliwe, że wersji w fazie alfa/beta) aby mógł funkcjonować.
+mod.outdatedv7.details = Ten mod jest niekompatybilny z najnowszą wersją gry. Autor musi go zaktualizować, i dodać [accent]minGameVersion: 136[] w pliku [accent]mod.json[].
+mod.blacklisted.details = Ten mod został ręczenie przeniesiony na czarną listę, ponieważ powodował wyłączenia gry i inne problemy na tej wersji. Nie używaj go.
+mod.missingdependencies.details = W tym modzie brakuje zależnośći: {0}
+mod.erroredcontent.details = Ten mod spowodował błędy przy uruchomianu. Poproś autora moda o ich naprawienie.
+mod.circulardependencies.details = Ten mod posiada zależności, które są zależne od innych zależności.
+mod.incompletedependencies.details = Moda nie da się załadować z powodu niepoprawnych lub brakujących zależności: {0}.
+mod.requiresversion = Wymagana wersja gry: [red]{0}
 mod.errors = Wystąpił błąd podczas ładowania treści.
 mod.noerrorplay = [scarlet]Twoje mody zawierają błędy.[] Wyłącz je lub napraw błędy przed rozpoczęciem gry.
 mod.nowdisabled = [scarlet]Brakuje zależności dla moda '{0}':[accent] {1}\n[lightgray]Najpierw trzeba ściągnąć te mody.\nMod zostanie automatycznie wyłączony.
 mod.enable = WÅ‚Ä…cz
-mod.requiresrestart = Gra się wyłączy aby wprowadzić zmiany moda.
+mod.requiresrestart = Gra zostanie wyłączona aby wprowadzić zmiany w modzie.
 mod.reloadrequired = [scarlet]Wymagany restart
 mod.import = Importuj Mod
 mod.import.file = Importuj Plik
@@ -144,24 +177,33 @@ mod.remove.confirm = Ten mod zostanie usunięty.
 mod.author = [lightgray]Autor:[] {0}
 mod.missing = Ten zapis zawiera mody, które zostały niedawno zaktualizowane, bądź nie są już zainstalowane. Zapis może zostać uszkodzony. Czy jesteś pewien, że chcesz go załadować?\n[lightgray]Mody:\n{0}
 mod.preview.missing = Przed opublikowaniem tego moda na Warsztacie musisz dodać zdjęcie podglądowe.\nDodaj zdjęcie o nazwie[accent] preview.png[] do folderu moda i spróbuj jeszcze raz.
-mod.folder.missing = Jedynie mody w formie folderów mogą się znaleźć na Warsztacie.\nBy zamienić moda w folder, wyciągnij go z archiwum, umieść w folderze i usuń archiwum. Później uruchom ponownie grę lub załaduj ponownie mody.
+mod.folder.missing = Jedynie mody w formie folderów mogą się znaleźć na Warsztacie.\nAby zamienić moda w folder, wyciągnij go z archiwum, umieść w folderze i usuń archiwum. Później uruchom ponownie grę lub załaduj ponownie mody.
 mod.scripts.disable = Twoje urządzenie nie wspiera modów ze skryptami. Musisz wyłączyć te modyfikacje, aby móc grać.
 
 about.button = O Grze
 name = Nazwa:
 noname = Najpierw wybierz[accent] nazwÄ™ gracza[].
+search = Szukaj:
 planetmap = Mapa Planety
 launchcore = Wystrzel Rdzeń
 filename = Nazwa Pliku:
 unlocked = Odblokowano nową zawartość!
-available =Nowe Odkrycie dostępne
+available = Nowe Odkrycie dostępne
+unlock.incampaign = < Odblokuj w kampanii dla szczegółów >
+campaign.select = Wybierz poczÄ…tkowÄ… kampaniÄ™
+campaign.none = [lightgray]Wybierz planetę, na której chcesz zacząć.\nMożesz zmienić planetę w każdej chwili.
+campaign.erekir = Nowsza, bardziej dopracowana zawartość. Kampania postępuje bardziej liniowo.\n\nWyższej jakości mapy oraz rozgrywka.
+campaign.serpulo = Starsza zawartość; klasyczne doświadczenia. Bardziej otwarta.\n\nPotencjalnie niezbalansowane mapy i mechaniki. Słabiej dopracowana.
+campaign.difficulty = Difficulty
 completed = [accent]Ukończony
-techtree = Drzewo Technologiczne
-research.legacy = Znaleziono badania z wersji [accent]5.0[].\nCzy chcesz [accent]załadować je[], albo [accent]usunąć[] dane z drzewa technologiczno (rekomendowane)?
+techtree = Drzewo Techno-\nlogiczne
+techtree.select = Wybór Drzewa Technologicznego
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Załaduj
 research.discard = Odrzuć
 research.list = [lightgray]Badania:
-research = Badaj
+research = Badania
 researched = [lightgray]{0} zbadane.
 research.progress = {0}% ukończone
 players = {0} graczy
@@ -170,24 +212,24 @@ players.search = wyszukaj
 players.notfound = [gray]nie znaleziono graczy
 server.closing = [accent]Zamykanie serwera...
 server.kicked.kick = Zostałeś wyrzucony z serwera!
-server.kicked.whitelist = Nie ma cię tu na białej liście.
+server.kicked.whitelist = Nie jesteś na białej liście.
 server.kicked.serverClose = Serwer został zamknięty.
 server.kicked.vote = Zostałeś wyrzucony z gry. Żegnaj.
-server.kicked.clientOutdated = Nieaktualna gra! ZaktualizujÄ… jÄ…!
+server.kicked.clientOutdated = Nieaktualna gra! Zaktualizuj jÄ…!
 server.kicked.serverOutdated = Nieaktualny serwer! PoproÅ› hosta o jego aktualizacjÄ™.
 server.kicked.banned = Zostałeś zbanowany na tym serwerze.
 server.kicked.typeMismatch = Ten serwer jest niekompatybilny z twojÄ… wersjÄ… gry.
 server.kicked.playerLimit = Serwer pełny. Poczekaj na wolne miejsce.
-server.kicked.recentKick = Zostałeś niedawno wyrzucony.\nPoczekaj chwilę przed ponownym połączniem.
+server.kicked.recentKick = Zostałeś niedawno wyrzucony.\nPoczekaj chwilę przed ponownym połączeniem.
 server.kicked.nameInUse = Ta nazwa jest już zajęta na tym serwerze.
 server.kicked.nameEmpty = Wybrana przez Ciebie nazwa jest nieprawidłowa.
-server.kicked.idInUse = Jesteś już na serwerze! �ączenie się z dwóch kont nie jest dozwolone.
+server.kicked.idInUse = Jesteś już na serwerze! �ączenie się z dwóch kont jest niedozwolone.
 server.kicked.customClient = Ten serwer nie wspomaga wersji deweloperskich. Pobierz oficjalnÄ… wersjÄ™.
 server.kicked.gameover = Koniec gry!
 server.kicked.serverRestarting = Restart serwera.
 server.versions = Twoja wersja gry:[accent] {0}[]\nWersja gry serwera:[accent] {1}[]
-host.info = Przycisk [accent]host[] hostuje serwer na porcie [scarlet]6567[]. \nKażdy w tej samej sieci [lightgray]wifi lub hotspocie[] powinien zobaczyć twój serwer na ich liście serwerów.\n\nJeśli chcesz, aby każdy z twoim IP mógł dołączyć, musisz wykonać [accent]przekierowywanie portów[].\n\n[lightgray]Notka: Jeśli ktokolwiek ma problem z dołączeniem do gry lokalnej, upewnij się, że udostępniłeś Mindustry dostęp do sieci w ustawieniach zapory (firewall). Zauważ, że niektóre sieci publiczne mogą nie zezwalać na wykrycie serwerów.
-join.info = Tutaj możesz wpisać [accent]adres IP serwera[] aby do niego dołączyć lub wyszukać [accent]serwery w lokalnej sieci[] lub wyszukać [accent]publiczne[] serwery, do których możesz dołączyć.\nGra wieloosobowa na LAN i WAN jest wspierana.\n\n[lightgray]Jeśli chcesz dołączyć przez IP, musisz zapytać hosta o jego IP, które można znaleźć po wpisaniu "my ip" w przeglądarce na urządzeniu hosta.
+host.info = Przycisk [accent]host[] hostuje serwer na porcie [scarlet]6567[]. \nKażdy w tej samej sieci [lightgray]Wi-Fi lub HotSpocie[] powinien zobaczyć twój serwer na ich liście serwerów.\n\nJeśli chcesz, aby każdy z twoim IP mógł dołączyć, musisz wykonać [accent]przekierowywanie portów[].\n\n[lightgray]Notka: Jeśli ktokolwiek ma problem z dołączeniem do gry lokalnej, upewnij się, że udostępniłeś Mindustry dostęp do sieci w ustawieniach zapory sieciowej (firewall). Zauważ, że niektóre sieci publiczne mogą nie zezwalać na wykrycie serwerów.
+join.info = Tutaj możesz wpisać [accent]adres IP serwera[] aby do niego dołączyć lub wyszukać [accent]serwery w sieci lokalnej[] lub wyszukać [accent]publiczne[] serwery, do których możesz dołączyć.\nGra wieloosobowa na LAN i WAN jest wspierana.\n\n[lightgray]Jeśli chcesz dołączyć przez IP, musisz zapytać hosta o jego IP, które można znaleźć po wpisaniu "my ip" w przeglądarce na urządzeniu hosta.
 hostserver = Stwórz Serwer
 invitefriends = ZaproÅ› Znajomych
 hostserver.mobile = Hostuj GrÄ™
@@ -201,6 +243,7 @@ hosts.none = [lightgray]Brak serwerów w sieci LAN!
 host.invalid = [scarlet]Nie można połączyć się z hostem.
 
 servers.local = Serwery Lokalne
+servers.local.steam = Otwieraj Gry i Lokalne Serwery
 servers.remote = Serwery Zdalne
 servers.global = Serwery Publiczne
 
@@ -208,17 +251,28 @@ servers.disclaimer = Serwery społeczności [accent]nie są[] w posiadaniu ani n
 servers.showhidden = Pokaż Ukryte Serwery
 server.shown = Pokazane
 server.hidden = Ukryte
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Zlokalizuj Gracza
 trace.playername = Nazwa gracza: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = WyjÄ…tkowe ID: [accent]{0}
+trace.language = Język: [accent]{0}
 trace.mobile = Klient Mobilny: [accent]{0}
 trace.modclient = Zmodowany klient: [accent]{0}
-invalidid = Złe ID klienta! Udostępnij raport błędu.
+trace.times.joined = Dołączył: [accent]{0}[] razy
+trace.times.kicked = Wyrzucony: [accent]{0}[] razy
+trace.ips = Adresy IP:
+trace.names = Nazwy:
+invalidid = Złe ID klienta! Wyślij raport błędu.
+player.ban = Zbanuj
+player.kick = Wyrzuć
+player.trace = Namierz
+player.admin = Przyznaj uprawnienia administracyjne
+player.team = Zmień Drużynę
 server.bans = Bany
 server.bans.none = Nie znaleziono zbanowanych osób!
-server.admins = Admini
+server.admins = Administratorzy
 server.admins.none = Nie znaleziono adminów!
 server.add = Dodaj Serwer
 server.delete = Czy na pewno chcesz usunąć ten serwer?
@@ -229,27 +283,30 @@ server.version = [gray]Wersja: {0}
 server.custombuild = [accent]Zmodowany klient
 confirmban = Jesteś pewny, że chcesz zbanować "{0}[white]"?
 confirmkick = Jesteś pewny, że chcesz wyrzucić "{0}[white]"?
-confirmvotekick = Jesteś pewny, że chcesz głosować za wyrzuceniem "{0}[white]"?
 confirmunban = Jesteś pewny, że chcesz odbanować tego gracza?
-confirmadmin = Jesteś pewny, że chcesz dać rangę admina "{0}[white]"?
-confirmunadmin = Jesteś pewny, że chcesz zabrać rangę admina "{0}[white]"?
+confirmadmin = Jesteś pewny, że chcesz dać rangę administratora "{0}[white]"?
+confirmunadmin = Jesteś pewny, że chcesz zabrać rangę administratora "{0}[white]"?
+votekick.reason = Powód głosowania
+votekick.reason.message = Czy jesteś pewien, że chcesz głosować za wyrzuceniem "{0}[white]"?\nJeśli tak, proszę podaj powód:
 joingame.title = Dołącz do gry
-joingame.ip = IP:
+joingame.ip = Adres IP:
 disconnect = Rozłączono.
 disconnect.error = Błąd połączenia.
 disconnect.closed = Połączenie zostało zamknięte.
 disconnect.timeout = Przekroczono limit czasu.
 disconnect.data = Nie udało się załadować mapy!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Nie można dołączyć do gry ([accent]{0}[]).
 connecting = [accent]�ączenie...
 reconnecting = [accent]Ponowne Å‚Ä…czenie...
 connecting.data = [accent]�adowanie danych świata...
 server.port = Port:
-server.addressinuse = Adres jest już w użyciu!
 server.invalidport = Nieprawidłowy numer portu.
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]BÅ‚Ä…d hostowania serwera: [accent]{0}
 save.new = Nowy zapis
 save.overwrite = Czy na pewno chcesz nadpisać zapis gry?
+save.nocampaign = Pojedyńcze zapisy z kampani nie mogą zostać zaimportowane.
 overwrite = Nadpisz
 save.none = Nie znaleziono zapisów gry!
 savefail = Nie udało się zapisać gry!
@@ -259,7 +316,7 @@ save.export = Eksportuj
 save.import.invalid = [accent]Zapis gry jest niepoprawny!
 save.import.fail = [crimson]Nie udało się zaimportować zapisu: [accent]{0}
 save.export.fail = [crimson]Nie udało się wyeksportować zapisu: [accent]{0}
-save.import = Importuj Zapis
+save.import = Importuj zapis
 save.newslot = Zapisz nazwÄ™:
 save.rename = Zmień nazwę
 save.rename.text = Nowa nazwa:
@@ -270,11 +327,12 @@ save.corrupted = Zapis gry jest uszkodzony lub nieprawidłowy!
 empty = <pusto>
 on = WÅ‚Ä…czone
 off = Wyłączone
+save.search = Szukanie zapisanych gier...
 save.autosave = Autozapis: {0}
 save.map = Mapa: {0}
 save.wave = Fala {0}
-save.mode = Tryb Gry: {0}
-save.date = Ostatnio Zapisane: {0}
+save.mode = Tryb gry: {0}
+save.date = Ostatnio zapisane: {0}
 save.playtime = Czas gry: {0}
 warning = Uwaga.
 confirm = Potwierdź
@@ -285,29 +343,52 @@ ok = OK
 open = Otwórz
 customize = Dostosuj zasady
 cancel = Anuluj
+command = Rozkazy
+command.queue = [lightgray][Queuing]
+command.mine = Kop
+command.repair = Naprawiaj
+command.rebuild = Odbudowywuj
+command.assist = Asystuj Graczowi
+command.move = Przemieść
+command.boost = Przyspiesz
+command.enterPayload = Enter Payload Block
+command.loadUnits = Załaduj Jednostki
+command.loadBlocks = Załaduj Bloki
+command.unloadPayload = Rozładuj �adunek
+command.loopPayload = Loop Unit Transfer
+stance.stop = Analuj Rozkazy
+stance.shoot = Strzelaj
+stance.holdfire = Wstrzymaj Ogień
+stance.pursuetarget = Goń Cel
+stance.patrol = Patroluj Obszar
+stance.ram = Taranuj\n[lightgray]Ruch w prostej linii bez znajdowania drogi
 openlink = Otwórz Link
 copylink = Kopiuj Link
 back = Wróć
-crash.export = Eksportuj logi błędów.
+max = Maks.
+objective = Cel Mapy
+crash.export = Eksportuj Logi Błędów
 crash.none = Nie znaleziono logów błędów.
-crash.exported = Logi zostały przeniesione.
+crash.exported = Logi zostały wyeksportowane.
 data.export = Eksportuj Dane
 data.import = Importuj Dane
-data.openfolder = Otwórz folder danych
+data.openfolder = Otwórz Folder Danych
 data.exported = Dane wyeksportowane.
 data.invalid = Nieprawidłowe dane gry.
 data.import.confirm = Zaimportowanie zewnętrznych danych nadpisze[scarlet] wszystkie[] obecne dane gry.\n[accent]Nie można tego cofnąć![]\n\nGdy dane zostaną zaimportowane, gra automatycznie się wyłączy.
 quit.confirm = Czy na pewno chcesz wyjść?
-quit.confirm.tutorial = Jesteś pewien?\nSamouczek może zostać powtórzony w[accent] Ustawienia->Gra->Ponów samouczek.[]
 loading = [accent]�adowanie...
-reloading = [accent]Przeładowywanie Modów...
+downloading = [accent]Pobieranie...
 saving = [accent]Zapisywanie...
 respawn = [accent][[{0}][] by odrodzić się w rdzeniu
 cancelbuilding = [accent][[{0}][] by wyczyścić plan
 selectschematic = [accent][[{0}][] by wybrać+skopiować
 pausebuilding = [accent][[{0}][] by wstrzymać budowę
 resumebuilding = [scarlet][[{0}][] by kontynuować budowę
+enablebuilding = [scarlet][[{0}][] wznów budowę
 showui = Interfejs ukryty.\nNaciśnij [accent][[{0}][] by go pokazać.
+commandmode.name = [accent]Tryb poleceń
+commandmode.nounits = [no units]
 wave = [accent]Fala {0}
 wave.cap = [accent]Fala {0}/{1}
 wave.waiting = [lightgray]Fala za {0}
@@ -318,31 +399,36 @@ wave.enemies = Pozostało [lightgray]{0} wrogów
 wave.enemycores = [accent]{0}[lightgray] Rdzeni Wroga
 wave.enemycore = [accent]{0}[lightgray] Rdzeń Wroga
 wave.enemy = Pozostał [lightgray]{0} wróg
-wave.guardianwarn = Strażnik nadejdzie za [accent]{0}[] fale.
-wave.guardianwarn.one = Strażnik nadejdzie za [accent]{0}[] fale.
+wave.guardianwarn = Strażnik nadejdzie za [accent]{0}[] fal.
+wave.guardianwarn.one = Strażnik nadejdzie za [accent]{0}[] falę.
 loadimage = Załaduj Obraz
 saveimage = Zapisz Obraz
 unknown = Nieznane
 custom = WÅ‚asne
 builtin = Wbudowane
-map.delete.confirm = Jesteś pewny, że chcesz usunąć tę mapę? Nie będzie można jej przywrócić!
+map.delete.confirm = Czy jesteś pewny, że chcesz usunąć tę mapę? Nie będzie można jej przywrócić!
 map.random = [accent]Losowa Mapa
-map.nospawn = Ta mapa nie zawiera żadnego rdzenia! Dodaj [accent]pomarańczowy[] rdzeń do tej mapy w edytorze.
-map.nospawn.pvp = Ta mapa nie ma żadnego rdzenia przeciwnika, aby mogli się zrespić przeciwnicy! Dodaj[scarlet] inny niż pomarańczowy[] rdzeń do mapy w edytorze.
-map.nospawn.attack = Ta mapa nie ma żadnego rdzenia przeciwnika, aby można było go zaatakować! Dodaj[scarlet] czerwony[] rdzeń do mapy w edytorze.
+map.nospawn = Ta mapa nie zawiera żadnego rdzenia! Dodaj {0} rdzeń do tej mapy w edytorze.
+map.nospawn.pvp = Ta mapa nie ma żadnego rdzenia przeciwnika, aby mogli się zrespić przeciwnicy! Dodaj [scarlet]inny niż żółty[] rdzeń do mapy w edytorze.
+map.nospawn.attack = Ta mapa nie ma żadnego rdzenia przeciwnika, aby można było go zaatakować! Dodaj {0} rdzeń do mapy w edytorze.
 map.invalid = BÅ‚Ä…d podczas Å‚adowania mapy: uszkodzony lub niepoprawny plik mapy.
 workshop.update = Aktualizuj pozycjÄ™
 workshop.error = Błąd podczas wczytywania szczegółów z Warsztatu: {0}
 map.publish.confirm = Czy jesteś pewien, że chcesz opublikować tę mapę?\n\n[lightgray]Najpierw upewnij się, że zgadzasz się z umową EULA Warsztatu, w przeciwnym razie twoje mapy nie będą widoczne!
-workshop.menu = Wybierz co chcesz zrobić z tą pozycją.
+workshop.menu = Wybierz, co chcesz zrobić z tą pozycją.
 workshop.info = Informacja o pozycji
 changelog = Historia aktualizacji (opcjonalna):
+updatedesc = Zastąp Tytuł i Opis
 eula = Umowa Użytkownika Końcowego (EULA) Steam
 missing = Ta pozycja została przeniesiona bądź usunięta.\n[lightgray]Pozycja na Warsztacie została automatycznie odłączona.
 publishing = [accent]Publikowanie...
 publish.confirm = Czy jesteś pewien, że chcesz to opublikować?\n\n[lightgray]Najpierw upewnij się, że zgadzasz się z umową EULA Warsztatu, w przeciwnym razie twoje pozycje nie będą widoczne!
 publish.error = BÅ‚Ä…d podczas publikowania pozycji: {0}
 steam.error = Nie udało się zainicjować serwisów Steam.\nBłąd: {0}
+editor.planet = Planeta:
+editor.sector = Sektor:
+editor.seed = Ziarno:
+editor.cliffs = Åšciany Na Klify
 
 editor.brush = Pędzel
 editor.openin = Otwórz w Edytorze
@@ -351,40 +437,76 @@ editor.oregen.info = Generacja Złóż:
 editor.mapinfo = Informacje o Mapie
 editor.author = Autor:
 editor.description = Opis:
-editor.nodescription = Mapa musi posiadać opis o długości co najmniej 4 znaków zanim zostanie opublikowana.
+editor.nodescription = Mapa musi posiadać opis o długości co najmniej 4 znaków, zanim zostanie opublikowana.
 editor.waves = Fale:
 editor.rules = Zasady:
 editor.generation = Generacja:
+editor.objectives = Cele
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Edytuj w Grze
+editor.playtest = Testuj MapÄ™
 editor.publish.workshop = Opublikuj w Warsztacie
 editor.newmap = Nowa Mapa
-editor.center = Center
+editor.center = Wyśrodkuj
+editor.search = Przeszukaj mapy...
+editor.filters = Przefiltruj Mapy
+editor.filters.mode = Tryby Gry:
+editor.filters.type = Typ Mapy:
+editor.filters.search = Szukaj W:
+editor.filters.author = Autor
+editor.filters.description = Opis
+editor.shiftx = Przesunięcie X
+editor.shifty = Przesunięcie Y
 workshop = Warsztat
 waves.title = Fale
 waves.remove = Usuń
-waves.never = <nigdy>
 waves.every = co
 waves.waves = fal(e)
+waves.health = zdrowie: {0}%
 waves.perspawn = co pojawienie
 waves.shields = tarcze/fala
 waves.to = do
+waves.spawn = spawn:
+waves.spawn.all = <wszędzie>
+waves.spawn.select = Wybierz Miejsce Odrodzania
+waves.spawn.none = [scarlet]Brak punktów spawnu na mapie
+waves.max = maks. jednostek
 waves.guardian = Strażnik
 waves.preview = PodglÄ…d
 waves.edit = Edytuj...
+waves.random = Losowe
 waves.copy = Kopiuj Do Schowka
 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.
+waves.sort = Sortuj Według
+waves.sort.reverse = Odwrotne Sortowanie
+waves.sort.begin = Rozpocznij
+waves.sort.health = Zdrowie
+waves.sort.type = Typ
+waves.search = Wyszukaj Fale...
+waves.filter = Filtr jednostek
+waves.units.hide = Schowaj Wszystkie
+waves.units.show = Pokaż Wszystkie
 
 #these are intentionally in lower case
 wavemode.counts = liczba
 wavemode.totals = sumy
 wavemode.health = życie
+all = All
 
 editor.default = [lightgray]<Domyślne>
 details = Detale...
 edit = Edytuj...
+variables = Zmienne
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Nazwa:
 editor.spawn = Stwórz Jednostkę
 editor.removeunit = Usuń Jednostkę
@@ -396,13 +518,19 @@ editor.errorlegacy = Ta mapa jest zbyt stara i używa starszego formatu mapy, kt
 editor.errornot = To nie jest plik mapy.
 editor.errorheader = Ten plik mapy jest nieprawidłowy lub uszkodzony.
 editor.errorname = Mapa nie zawiera nazwy. Czy próbujesz załadować zapis gry?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aktualizuj
 editor.randomize = Losuj
+editor.moveup = Przesuń w górę
+editor.movedown = Przesuń w dół
+editor.copy = Kopiuj
 editor.apply = Zastosuj
 editor.generate = Generuj
+editor.sectorgenerate = Generuj Sektor
 editor.resize = Zmień Rozmiar
 editor.loadmap = Załaduj Mapę
 editor.savemap = Zapisz MapÄ™
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Zapisano!
 editor.save.noname = Twoja mapa nie ma nazwy! Ustaw jÄ… w 'Informacjach o mapie'.
 editor.save.overwrite = Ta mapa nadpisze wbudowanÄ… mapÄ™! Ustaw innÄ… nazwÄ™ w 'Informacjach o mapie'.
@@ -441,8 +569,12 @@ toolmode.eraseores = Wymaż Rudy
 toolmode.eraseores.description = Usuwa tylko rudy.
 toolmode.fillteams = Wypełnij Drużyny
 toolmode.fillteams.description = Wypełnia drużyny zamiast bloków.
+toolmode.fillerase = Usuń Typ
+toolmode.fillerase.description = Usuwa bloki tego samego typu.
 toolmode.drawteams = Rysuj Drużyny
 toolmode.drawteams.description = Rysuje drużyny zamiast bloków.
+toolmode.underliquid = Pod Cieczami
+toolmode.underliquid.description = Narysuj podłogi pod płynnymi obszarami.
 
 filters.empty = [lightgray]Brak filtrów! Dodaj jeden za pomocą przycisku poniżej.
 filter.distort = Zniekształcanie
@@ -461,6 +593,7 @@ filter.clear = Oczyść
 filter.option.ignore = Ignoruj
 filter.scatter = Rozprosz
 filter.terrain = Teren
+filter.logic = Logika
 filter.option.scale = Skala
 filter.option.chance = Szansa
 filter.option.mag = Wielkość
@@ -469,17 +602,39 @@ filter.option.circle-scale = Skala Koła
 filter.option.octaves = Oktawy
 filter.option.falloff = Spadek
 filter.option.angle = KÄ…t
+filter.option.tilt = Nachylenie
+filter.option.rotate = Obróć
 filter.option.amount = Ilość
 filter.option.block = Blok
 filter.option.floor = Podłoga
 filter.option.flooronto = Podłoga Docelowa
-filter.option.target = Target
+filter.option.target = Cel
+filter.option.replacement = ZastÄ…pienie
 filter.option.wall = Åšciana
 filter.option.ore = Ruda
 filter.option.floor2 = Druga Podłoga
 filter.option.threshold2 = Drugi Próg
 filter.option.radius = Zasięg
 filter.option.percentile = Procent
+filter.option.code = Kod
+filter.option.loop = Pętla
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Czy na pewno chcesz usunąć ten pakiet lokalizacji?
+locales.applytoall = Zastosuj Do Wszystkich Lokalizacji
+locales.addtoother = Dodaj Do Innych Lokalizacji
+locales.rollback = Cofnij do ostatnio zastosowanego
+locales.filter = Filtr właściwości
+locales.searchname = Szukaj nazwy...
+locales.searchvalue = Szukaj wartości...
+locales.searchlocale = Szukaj lokalizacji...
+locales.byname = Po nazwie
+locales.byvalue = Po wartośći
+locales.showcorrect = Pokaż właściwości, które są obecne we wszystkich lokalizacjach i wszędzie mają unikalne wartości
+locales.showmissing = Pokaż właściwości, których brakuje w niektórych lokalizacjach
+locales.showsame = Pokaż właściwości, które mają te same wartości w różnych lokalizacjach
+locales.viewproperty = Wyświetlanie we wszystkich lokalizacjach
+locales.viewing = Wyświetlanie właściwości "{0}"
+locales.addicon = Dodaj IkonÄ™
 
 width = Szerokość:
 height = Wysokość:
@@ -490,61 +645,117 @@ load = Wczytaj
 save = Zapisz
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Pam: {0}mb
 memory2 = Pam:\n {0}mb +\n {1}mb
 language.restart = Uruchom grę ponownie, aby nowo ustawiony język zaczął funkcjonować.
 settings = Ustawienia
-tutorial = Poradnik
+tutorial = Samouczek
 tutorial.retake = Ponów Samouczek
 editor = Edytor
 mapeditor = Edytor Map
 
 abandon = Opuść
-abandon.text = Ta strefa i wszystkie jej surowce będą przejęte przez przeciwników.
+abandon.text = Ta strefa i wszystkie jej surowce zostaną przejęte przez przeciwników.
 locked = Zablokowane
 complete = [lightgray]Ukończone:
 requirement.wave = OsiÄ…gnij falÄ™ {0} w {1}
-requirement.core = Zniszcz Rdzeń wroga w {0}
+requirement.core = Zniszcz rdzeń wroga w {0}
 requirement.research = Zbadaj {0}
 requirement.produce = Produkcja {0}
 requirement.capture = Zdobądź {0}
+requirement.onplanet = Kontrolowane Sektory na {0}
+requirement.onsector = WylÄ…duj na Sektorze: {0}
 launch.text = Wystrzel
-research.multiplayer = Tylko host może odkrywać przedmoty.
 map.multiplayer = Tylko host może widzieć sektory
 uncover = Odkryj
 configure = Skonfiguruj �adunek
+objective.research.name = Zbadaj
+objective.produce.name = Zdobądź
+objective.item.name = Zdobądź Przedmiot
+objective.coreitem.name = Przedmiot z Rdzenia
+objective.buildcount.name = Liczba Budynków
+objective.unitcount.name = Liczba Jednostek
+objective.destroyunits.name = Zniszcz Jednostki
+objective.timer.name = Stoper
+objective.destroyblock.name = Zniszcz Blok
+objective.destroyblocks.name = Zniszcz Bloki
+objective.destroycore.name = Zniszcz Rdzeń
+objective.commandmode.name = Tryb Poleceń
+objective.flag.name = Oznaczenie
+marker.shapetext.name = Dostosuj Tekst
+marker.point.name = Point
+marker.shape.name = Figura
+marker.text.name = Tekst
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = TÅ‚o
+marker.outline = Kontur
+objective.research = [accent]Zbadaj:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Zdobądź:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Zniszcz:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Zniszcz: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Zdobądź: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]PrzenieÅ› do Rdzenia:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Buduj: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Zbudowane Jednostki: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Zniszczono: [][lightgray]{0}[]x Jednostek
+objective.enemiesapproaching = [accent]Wrogowie zbliżą się za [lightgray]{0}[]
+objective.enemyescelating = [accent]Produkcja wrogich jednostek za [lightgray]{0}[]
+objective.enemyairunits = [accent]Produkcja latajÄ…cych wrogich jednostek za [lightgray]{0}[]
+objective.destroycore = [accent]Zniszcz Rdzeń Przeciwnika
+objective.command = [accent]Dowódź Jednostkami
+objective.nuclearlaunch = [accent]⚠ Wykryto wystrzał nuklearny: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NADCHODZI UDERZENIE NUKLEARNE âš 
 
-loadout = Loadout
-resources = Zasoby 
+loadout = �adunek
+resources = Zasoby
+resources.max = Maks.
 bannedblocks = Zabronione bloki
+unbannedblocks = Unbanned Blocks
+objectives = Cele
+bannedunits = Zabronione jednostki
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Zablokowane jednostki jako biała lista
+bannedblocks.whitelist = Zablokowane bloki jako biała lista
 addall = Dodaj wszystkie
-launch.from = Wstrzelony Z: [accent]{0}
+launch.from = Wystrzelony z: [accent]{0}
+launch.capacity = Wystrzelona Ilość Przedmiotów: [accent]{0}
 launch.destination = Cel: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Ilość musi być liczbą pomiędzy 0 a {0}.
 add = Dodaj...
-boss.health = Zdrowie Strażnika
+guardian = Zdrowie Strażnika
 
 connectfail = [crimson]Nie można połączyć się z serwerem:\n\n[accent]{0}
-error.unreachable = Serwer niedostępny.\nCzy adres jest wpisany poprawnie?
+error.unreachable = Serwer niedostępny.\nSprawdź, czy adres jest wpisany poprawnie.
 error.invalidaddress = Niepoprawny adres.
 error.timedout = Przekroczono limit czasu!\nUpewnij się, że host ma ustawione przekierowanie portu oraz sprawdź poprawność wpisanego adresu!
-error.mismatch = Błąd pakietu:\nprawdopodobne niedopasowanie klienta/serwera.\nUpewnij się, że ty i host macie najnowszą wersję Mindustry!
+error.mismatch = Błąd pakietu:\nprawdopodobne niedopasowanie klienta/serwera.\nUpewnij się, że ty i host macie taką samą wersję Mindustry!
 error.alreadyconnected = Jesteś już połączony.
 error.mapnotfound = Plik mapy nie został znaleziony!
 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.
+error.bloom = Nie udało się załadować funkcji bloom.\nTwoje urządzenie może nie wspierać tej funkcji.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Deszcz
-weather.snow.name = Åšnieg
+weather.snowing.name = Åšnieg
 weather.sandstorm.name = Burza piaskowa
 weather.sporestorm.name = Burza zarodników
 weather.fog.name = Mgła
+campaign.playtime = \uf129 [lightgray]Czas gry na sektorze: {0}
+campaign.complete = [accent]Gratulacje.\n\nWróg na sektorze {0} został pokonany.\n[lightgray]Ostatni sektor został podbity.
+sectorlist = Sektory
+sectorlist.attacked = {0} atakowanych
 
 sectors.unexplored = [lightgray]Niezbadane
 sectors.resources = Zasoby:
 sectors.production = Produkcja:
 sectors.export = Eksport:
+sectors.import = Import:
 sectors.time = Czas:
 sectors.threat = Zagrożenie:
 sectors.wave = Fala:
@@ -552,30 +763,45 @@ sectors.stored = Zmagazynowane:
 sectors.resume = Kontynuuj
 sectors.launch = Wystrzel
 sectors.select = Wybierz
-sectors.nonelaunch = [lightgray]żaden (słońce)
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]Żaden (Słońce)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Zmień Nazwę Sektora
 sectors.enemybase = [scarlet]Baza Wroga
 sectors.vulnerable = [scarlet]Wrażliwy
 sectors.underattack = [scarlet] Jest Atakowany! [accent]{0}% uszkodzono
+sectors.underattack.nodamage = [scarlet]Nie przejęty
 sectors.survives = [accent]Przeżywa {0} fal
 sectors.go = Idź
+sector.abandon = Porzuć
+sector.abandon.confirm = Ten sektor zostanie samo-zniszczony.\nKontynuować?
 sector.curcapture = Sektor Podbity
 sector.curlost = Sektor Stracony
 sector.missingresources = [scarlet]NiewystarczajÄ…ce Zasoby Rdzenia
 sector.attacked = Sektor [accent]{0}[white] jest atakowany!
 sector.lost = Sektor [accent]{0}[white] został stracony!
-#note: the missing space in the line below is intentional
-sector.captured = Sektor [accent]{0}[white]został podbity!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Zmień Ikonę
+sector.noswitch.title = Nie można zmienić sektorów
+sector.noswitch = Nie możesz zmieniać sektorów, gdy istniejący sektor jest atakowany.\n\nSektor: [accent]{0}[] na [accent]{1}[]
+sector.view = Zobacz Sektor
 
 threat.low = Niski
 threat.medium = Åšredni
 threat.high = Wysoki
 threat.extreme = Ekstremalny
 threat.eradication = Czystka
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = Planety
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Słońce
 
 sector.impact0078.name = Uderzenie 0078
@@ -593,24 +819,101 @@ sector.fungalPass.name = Grzybowa Przełęcz
 sector.biomassFacility.name = Obiekt Syntezy Biomasy
 sector.windsweptIslands.name = Wyspy Wiatru
 sector.extractionOutpost.name = Placówka Ekstrakcji
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Planetarny Terminal Startowy
+sector.coastline.name = Linia Brzegowa
+sector.navalFortress.name = Morska Forteca
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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 prądu. 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 rdzeń. Zniszcz wszystko co stanie ci na drodze.
+sector.groundZero.description = Optymalna lokalizacja, aby rozpocząć jeszcze raz. Niskie zagrożenie. Niewiele zasobów.\nZbierz możliwie jak najwięcej miedzi i ołowiu.\nPrzejdź do następnej strefy jak najszybciej.
+sector.frozenForest.description = Nawet tutaj, bliżej gór, zarodniki się rozprzestrzeniały. Niskie temperatury nie mogą ich zatrzymać na zawsze.\n\nZacznij od produkcji prądu. Buduj generatory spalinowe. Naucz się korzystać z naprawiaczy.
+sector.saltFlats.description = Na obrzeżach pustyni są Solne Równiny. Jest tu niewiele surowców.\n\nWrogowie zbudowali tu bazę składującą surowce. Zniszcz ich rdzeń. 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.
-sector.biomassFacility.description = Miejsce powstania zarodników. Tutał były badane i początkowo produkowane.\nZbadaj zawartą w nim technologię. Hoduj zarodniki dla paliwa i tworzyw sztucznych.\n\n[lightgray]Po upadku tej placówki zarodniki zostały uwolnione. Nic w lokalnym ekosystemie nie mogło konkurować z tak inwazyjnym organizmem.
-sector.windsweptIslands.description = Dalej za linią brzegową znajduje się ten odległy łańcuch wysp. Zapisy wyakzują ze były tu struktury produkujące [accent]Plastan[].\n\nOdeprzyj morskie jednostki wroga. Załóż bazę na wyspach. Odkryj te fabryki.
+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 eksplorację. Odkryj pozostawioną tu technologię.
+sector.stainedMountains.description = W głębi lądu leżą góry, jeszcze nieskażone przez zarodniki.\nWydobądź bogate złoża tytanu w tym obszarze. Dowiedz się, jak z niego korzystać.\n\nObecność wroga jest tutaj większa. Nie pozwól im na wysłanie ich najsilniejszych jednostek.
+sector.overgrowth.description = Obszar ten jest zarośnięty, bliżej źródła zarodników.\nWróg założył tu bazę. Stwórz "Noże". 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 ropy.\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 ropy.
+sector.desolateRift.description = Strefa wyjątkowo niebezpieczna. Bogata w zasoby, ale mała. Wysokie ryzyko zniszczenia. Opuść tę strefę jak najszybciej.\nUwaga: Odstępy między falami są dosyć długie, co nie znaczy, że będzie prosto!
+sector.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru, zredukowany do ruin.\n[lightgray]Zbadaj tor i jego zastosowania.\n\nOgromne zagrożenie ze strony wroga.
+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ą używając jednostek takich jak "Nóż" czy "Pełzak". Zniszcz oba rdzenie.
+sector.biomassFacility.description = Miejsce powstania zarodników. Tutaj były badane i początkowo produkowane.\nZbadaj zawartą w nich technologię. Hoduj zarodniki dla paliwa i tworzyw sztucznych.\n\n[lightgray]Po upadku tej placówki zarodniki zostały uwolnione. Nic w lokalnym ekosystemie nie mogło konkurować z tak inwazyjnym organizmem.
+sector.windsweptIslands.description = Dalej za linią brzegową znajduje się ten odległy łańcuch wysp. Zapisy wykazują, że były tu struktury produkujące [accent]Plastan[].\n\nOdeprzyj morskie jednostki wroga. Załóż bazę na wyspach. Odkryj te fabryki.
 sector.extractionOutpost.description = Odległa placówka zbudowana przez wroga w celu wystrzeliwania zasobów do innych sektorów.\n\nDo dalszych podbojów niezbędna jest międzysektorowa technologia transportu. Zniszcz bazę. Zbadaj ich Wyrzutnie.
 sector.impact0078.description = Tutaj leżą pozostałości międzygwiezdnego statku transportowego, który jako pierwszy wszedł do tego układu.\n\nWydobądź jak najwięcej z wraku. Zbadaj każdą nienaruszoną technologię.
-sector.planetaryTerminal.description = Ostatni cel.\n\nTa baza przybrzeżna zawiera strukturę zdolną do wyrzucania rdzeni na lokalne planety. Jest wyjątkowo dobrze strzeżona.\n\nProdukuj jednostki morskie. Jak najszybciej wyeliminuj wroga. Zbadaj tą strukturę.
+sector.planetaryTerminal.description = Ostatni cel.\n\nTa baza przybrzeżna zawiera strukturę zdolną do wystrzeliwania rdzeni na lokalne planety. Jest wyjątkowo dobrze strzeżona.\n\nProdukuj jednostki morskie. Jak najszybciej wyeliminuj wroga. Zbadaj tą strukturę.
+sector.coastline.description = W tej lokalizacji zostały znalezione resztki technologii jednostek morskich. Odeprzyj ataki wroga, przejmij ten sektor i zdobądź technologię.
+sector.navalFortress.description = Wróg założył bazę na odległej, naturalnie ufortyfikowanej wyspie. Zniszcz tę bazę. Zdobądź zaawansowaną technologię statków morskich i zbadaj ją.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = PoczÄ…tek
+sector.aegis.name = Egida
+sector.lake.name = Jezioro
+sector.intersect.name = Przecięcie
+sector.atlas.name = Atlas
+sector.split.name = Rozłam
+sector.basin.name = Dorzecze
+sector.marsh.name = Bagno
+sector.peaks.name = Szczyty
+sector.ravine.name = Wąwóz
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Twierdza
+sector.crevice.name = Szpara
+sector.siege.name = Oblężenie
+sector.crossroads.name = Rozdroże
+sector.karst.name = Kras
+sector.origin.name = Zalążek
+sector.onset.description = Samouczkowy sektor. Cel nie został jeszcze ustalony. Oczekuj dalszych informacji.
+sector.aegis.description = Wróg jest chroniony przez tarcze. Prototyp Niszczyciela tarcz znajduje się na tym sektorze.\n Znajdź go. Wypełnij go wolframem i zniszcz tarcze wrogów.
+sector.lake.description = Jezioro żużlu znajdujące się na tym sektorze znacznie ogranicza rodzaje jednostek, jakich można użyć. Statki są jedyną sensowną opcją. Odkryj [accent] Fabrykator Statków[] i wytwórz [accent] Wymykacze[] najszybciej jak się da.
+sector.intersect.description = Skany wskazują na możliwe ataki od razu po wylądowaniu. Przeciwnik może zaatakować z wielu stron.\nPrzygotuj obronę i infrastrukturę tak szybko jak to możliwe.\nAby poruszać się w tak trudny terenie potrzebne będą [accent]Mechy[].
+sector.atlas.description = Ten sektor zawiera zróżnicowany teren i do skutecznego ataku będzie trzeba użyć różnych jednostek.\nKonieczne może być uzycie ulepszonych jednostek ze względu na silne bazy wroga.\nZbadaj [accent]Elektrolizer[] oraz [accent]Fabrykę Czołgów[].
+sector.split.description = Minimalna obecność wroga w tym sektorze czyni go idealnym do testowania nowych technologii transportowych.
+sector.basin.description = W sektorze wykryto znaczną liczbę wrogich jednostek.\nWybuduj jednostki jak najszybciej i pozbądź sie wroga.
+sector.marsh.description = Ten sektor jest bogaty w atrakycyt, ale ma mało gejzerów .\nZbuduj [accent]Chemiczną komorę spalania[] by generować prąd.
+sector.peaks.description = Górzyste ukształtowanie terenu powoduje, że większość jednostek staje się bezużyteczna. Będziesz musiał wyprodukować latające jednostki.\nUważaj na wrogie działka przeciwlotnicze. Możesz unieszkodliwić niektóre działka, poprzez odcięcie im zasobów lub zniszczenie innych budynków.
+sector.ravine.description = W tym sektorze nie wykryto rdzeni wroga, jednakże jest on ważnym szlakiem transportowym dla wroga. Spodziewaj się różnorodnych przeciwników.\nWyprodukuj [accent]elektrum[]. Zbuduj działka [accent]Cios.
+sector.caldera-erekir.description = Zasoby wykryte w tym sektorze są rozproszone między kilka wysp.\nZbadaj i wprowadź transport oparty na dronach.
+sector.stronghold.description = Wróg postanowił założyć ogromną bazę na tym sektorze. Chroni niewielkie złoża [accent]toru[]..\nWykorzystaj je do rozwoju jednostek i wieżyczek wyższego poziomu.
+sector.crevice.description = Przeciwnik będzie zaciekle walczyć by przejąć twoją bazę w tym sektorze.\nWyprodukowanie [accent]karbidu[] i wybudowanie [accent]Generatora Pyrolizy[] może być wymagane do przetrwania.
+sector.siege.description = Na tym sektorze znajdują się dwa równoległe kaniony, które zmuszą cię do walki na dwa fronty.\nZbadaj [accent]Cyjan[], aby móc wytwarzać dużo silniejsze czołgi.\nUwaga: Wykryto wrogie rakiety dalekiego. Pociski powinny zostać zestrzelone.
+sector.crossroads.description = Wrogie bazy w tym sektorze zostały założone w zróżnicowanym terenie. Zbadaj różne jednostki by się przystosować.\nParę baz jest chronionych przez tarcze. Dowiedz się jak są zasilane i je zniszcz.
+sector.karst.description = Ten sektor jest bogaty w surowce. Zostaniesz zaatakowany niemalże od razu\nPrzejmij kontrolę nad surowcami i zbadaj [accent]Włókno Fazowe[].
+sector.origin.description = Finalny sektor, gdzie wróg jest wszędzie.\nBardzo złe warunki do prowadzenia badań  - skup się na niszczeniu wszystkich wrogich rdzeni.
+
+status.burning.name = Podpalenie
+status.freezing.name = Zamrożenie
+status.wet.name = Przemoczenie
+status.muddy.name = Zabłocenie
+status.melting.name = Topnienie
+status.sapped.name = Osłabienie
+status.electrified.name = Naelektryzowanie
+status.spore-slowed.name = Zarodnikowe Spowolnienie
+status.tarred.name = Osmołowanie
+status.overdrive.name = Przyspieszenie
+status.overclock.name = Podkręcenie
+status.shocked.name = Porażenie
+status.blasted.name = Wysadzenie
+status.unmoving.name = Unieruchomienie
+status.boss.name = Strażnik
 
 settings.language = Język
 settings.data = Dane Gry
@@ -622,32 +925,37 @@ settings.game = Gra
 settings.sound = Dźwięk
 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 = Jesteś pewny że chcesz usunąć wszystkie zapisy?
+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 zapisami, drzewem technologicznym, mapami, ustawieniami i przypisanymi klawiszami.\nKiedy naciśniesz 'OK', gra usunie wszystkie swoje dane i automatycznie się wyłączy.
+settings.clearsaves.confirm = Czy jesteś pewien, że chcesz usunąć wszystkie zapisy?
 settings.clearsaves = Usuń Zapisy
-settings.clearresearch = Usuń Postęp Drzewa Tech.
-settings.clearresearch.confirm = Jesteś pewny że chcesz usunąć cały postęp drzewa technologicznego?
+settings.clearresearch = Usuń Postęp Drzewa Technologicznego
+settings.clearresearch.confirm = Czy jesteś pewny, że chcesz usunąć cały postęp drzewa technologicznego?
 settings.clearcampaignsaves = Usuń Zapisy Kampanii
-settings.clearcampaignsaves.confirm = Jesteś pewny że chcesz usunąć wszystkie zapisy kampanii?
+settings.clearcampaignsaves.confirm = Czy jesteś pewny, że chcesz usunąć wszystkie zapisy kampanii?
 paused = [accent]< Wstrzymano >
 clear = Wyczyść
 banned = [scarlet]Zbanowano
+unsupported.environment = [scarlet]Niewspierane Åšrodowisko
 yes = Tak
 no = Nie
 info.title = Informacje
 error.title = [crimson]Wystąpił błąd
 error.crashtitle = Wystąpił błąd
 unit.nobuild = [scarlet]Jednostka nie może budować
-lastaccessed = [lightgray]Osatino wpłynął: {0}
+lastaccessed = [lightgray]Ostatnia interakcja: {0}
+lastcommanded = [lightgray]Ostatnio zarzÄ…dzane: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <załaduj mapę do pokazania>
 
 stat.description = Opis
 stat.input = Wejście
 stat.output = Wyjście
+stat.maxefficiency = Maks. Efektywność
 stat.booster = Wzmacniacz
 stat.tiles = Wymagane Pola
-stat.affinities = Uwydajnienie
+stat.affinities = Uwydajnienia
+stat.opposites = Przeciwieństwa
 stat.powercapacity = Pojemność mocy
 stat.powershot = moc/strzał
 stat.damage = Obrażenia
@@ -666,12 +974,15 @@ stat.powerconnections = Maksymalna ilość połączeń
 stat.poweruse = Zużycie prądu
 stat.powerdamage = Moc/Zniszczenia
 stat.itemcapacity = Pojemność przedmiotów
-stat.memorycapacity = Pojemość Pamięci
+stat.memorycapacity = Pojemność pamięci
 stat.basepowergeneration = Podstawowa generacja mocy
 stat.productiontime = Czas produkcji
 stat.repairtime = Czas pełnej naprawy bloku
+stat.repairspeed = Prędkość napraw
 stat.weapons = Bronie
 stat.bullet = Pocisk
+stat.moduletier = Stopień Modułu
+stat.unittype = Typ jednostki
 stat.speedincrease = Zwiększenie prędkości
 stat.range = Zasięg
 stat.drilltier = Co może wykopać
@@ -679,10 +990,11 @@ stat.drillspeed = Podstawowa szybkość kopania
 stat.boosteffect = Efekt wzmocnienia
 stat.maxunits = Maksymalna ilość jednostek
 stat.health = Zdrowie
+stat.armor = Pancerz
 stat.buildtime = Czas budowy
-stat.maxconsecutive = Maksymalnie Kolejny
+stat.maxconsecutive = Maksymalnie kolejnych
 stat.buildcost = Koszt budowy
-stat.inaccuracy = Niecelność
+stat.inaccuracy = Niedokładność
 stat.shots = Strzały
 stat.reload = Strzałów/Sekundę
 stat.ammo = Amunicja
@@ -694,32 +1006,86 @@ stat.lightningchance = Szansa Na BÅ‚yskawicÄ™
 stat.lightningdamage = Obrażenia Błyskawic
 stat.flammability = Palność
 stat.radioactivity = Radioaktywność
+stat.charge = �adunek
 stat.heatcapacity = Pojemność Cieplna
 stat.viscosity = Lepkość
 stat.temperature = Temperatura
-stat.speed = Prędość
+stat.speed = Prędkość
 stat.buildspeed = Prędkość Budowy
 stat.minespeed = Prędkość Wydobycia
 stat.minetier = Stopień Wydobycia
 stat.payloadcapacity = �adowność
-stat.commandlimit = Limit Jednostek ZarzÄ…danych
 stat.abilities = Umiejętności
 stat.canboost = Może przyspieszyć
-stat.flying = Latanie
+stat.flying = Może latać
+stat.ammouse = Zużycie Amunicji
+stat.ammocapacity = Pojemność Amunicji
+stat.damagemultiplier = Mnożnik Obrażeń
+stat.healthmultiplier = Mnożnik Zdrowia
+stat.speedmultiplier = Mnożnik Prędkości
+stat.reloadmultiplier = Mnożnik Prędkości Przeładowywania
+stat.buildspeedmultiplier = Mnożnik Prędkości Budowania
+stat.reactive = Reaguje
+stat.immunities = Odporności
+stat.healing = Leczy
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Pole Mocy
+ability.forcefield = Pole Siłowe
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Pole Naprawy
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Pole Statusu
-ability.unitspawn = Fabryka Jednostek {0}
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fabryka Jednostek
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Strefa Tarczy RegenerujÄ…cej
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Pioruny Poruszania
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = �uk Tarczy
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Pole TÅ‚umienia Regeneracji
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Pole Energii
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneracja
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Dozwolone jest tylko przeniesienie z rdzenia
 
 bar.drilltierreq = Wymagane Lepsze Wiertło
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Brak Zasobów
 bar.corereq = Wymagany Rdzeń
+bar.corefloor = Wymagana strefa dla rdzenia
+bar.cargounitcap = Osiągnieto Limit �adunku Jednostki
 bar.drillspeed = Prędkość wiertła: {0}/s
 bar.pumpspeed = Prędkość pompy: {0}/s
 bar.efficiency = Efektywność: {0}%
+bar.boost = Przyspieszenie: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Moc: {0}
 bar.powerstored = Zmagazynowano: {0}/{1}
 bar.poweramount = Moc: {0}
@@ -728,51 +1094,69 @@ bar.powerlines = Połączenia: {0}/{1}
 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.cooldown = Cooldown
+bar.instability = Niestabilność
+bar.heatamount = Ciepło: {0}
+bar.heatpercent = Ciepło: {0} ({1}%)
 bar.power = PrÄ…d
 bar.progress = Postęp Budowy
+bar.loadprogress = Postęp
+bar.launchcooldown = Czas odnowienia wystrzału
 bar.input = Wejście
 bar.output = Wyjście
+bar.strength = [stat]{0}[lightgray]x siły
 
-units.processorcontrol = [lightgray]Kontrolowany Procesorem
+units.processorcontrol = [lightgray]Kontrolowany przez procesor
 
 bullet.damage = [stat]{0}[lightgray] Obrażenia
 bullet.splashdamage = [stat]{0}[lightgray] Obrażenia obszarowe ~[stat] {1}[lightgray] kratki
 bullet.incendiary = [stat]zapalajÄ…cy
-bullet.sapping = [stat]wyczerpujÄ…cy
 bullet.homing = [stat]naprowadzajÄ…cy
-bullet.shock = [stat]piorunowy
-bullet.frag = [stat]fragmentacyjny
+bullet.armorpierce = [stat]przebijajÄ…cy pancerz
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] wyłączenie naprawy ~ [stat]{1}[lightgray] kratki
+bullet.interval = [stat]{0}/sec[lightgray] częstotliwość strzału:
+bullet.frags = [stat]{0}[lightgray]x pociski odłamkowe:
+bullet.lightning = [stat]{0}[lightgray]x błyskawice ~ [stat]{1}[lightgray] Obrażenia
+bullet.buildingdamage = [stat]{0}%[lightgray] obrażeń budynkom
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] odrzut
 bullet.pierce = [stat]{0}[lightgray]x przebicia
 bullet.infinitepierce = [stat]przebijajÄ…cy
 bullet.healpercent = [stat]{0}[lightgray]% leczenia
-bullet.freezing = [stat]zamrażający
-bullet.tarred = [stat]smolny
+bullet.healamount = [stat]{0}[lightgray] bezpośrednia naprawa
 bullet.multiplier = [stat]{0}[lightgray]x mnożnik amunicji
 bullet.reload = [stat]{0}[lightgray]x szybkość ataku
+bullet.range = [stat]{0}[lightgray] zasięg ataku
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = bloki
 unit.blockssquared = bloki²
 unit.powersecond = jednostek prÄ…du na sekundÄ™
+unit.tilessecond = bloków na sekundę
 unit.liquidsecond = jednostek płynu na sekundę
 unit.itemssecond = przedmiotów na sekundę
 unit.liquidunits = jednostek płynu
 unit.powerunits = jednostek prÄ…du
+unit.heatunits = jednostek ciepła
 unit.degrees = stopnie
 unit.seconds = sekundy
 unit.minutes = mins
 unit.persecond = /sekundÄ™
 unit.perminute = /min
 unit.timesspeed = x prędkość
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = życie tarczy
 unit.items = przedmioty
 unit.thousands = tys.
-unit.millions = mln
-unit.billions = b
+unit.millions = mln.
+unit.billions = mld.
+unit.shots = strzały
+unit.pershot = /strzał
 category.purpose = Opis
 category.general = Główne
 category.power = PrÄ…d
@@ -781,34 +1165,37 @@ category.items = Przedmioty
 category.crafting = Przetwórstwo
 category.function = Funkcja
 category.optional = Dodatkowe ulepszenia
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Pomiń Animację Wystrzału/Lądowania
 setting.landscape.name = Zablokuj tryb panoramiczny
 setting.shadows.name = Cienie
 setting.blockreplace.name = Automatyczne sugestie bloków
-setting.linear.name = Filtrowanie Liniowe
+setting.linear.name = Filtrowanie liniowe
 setting.hints.name = Podpowiedzi
-setting.flow.name = Wyświetl szybkość przepływu zasobów[scarlet] (eksperymentalne)
+setting.logichints.name = Wskazówki dot. logiki
 setting.backgroundpause.name = Wstrzymaj w tle
 setting.buildautopause.name = Automatycznie zatrzymaj budowanie
+setting.doubletapmine.name = Kliknij podwójnie, aby wydobywać
+setting.commandmodehold.name = Przytrzymaj w Trybie Dowodzenia
+setting.distinctcontrolgroups.name = Ograniczaj jednÄ… grupÄ™ kontrolnÄ… na jednostkÄ™
+setting.modcrashdisable.name = Wyłącz mody w przypadku awarii podczas uruchamiania
 setting.animatedwater.name = Animowana woda
 setting.animatedshields.name = Animowana tarcza
-setting.antialias.name = Antyaliasing[lightgray] (wymaga restartu)[]
-setting.playerindicators.name = Znaczniki Graczy
-setting.indicators.name = Znaczniki Przyjaciół
-setting.autotarget.name = Automatyczne Celowanie
+setting.playerindicators.name = Znaczniki graczy
+setting.indicators.name = Znaczniki przyjaciół
+setting.autotarget.name = Automatyczne celowanie
 setting.keyboard.name = Sterowanie - Myszka+Klawiatura
 setting.touchscreen.name = Sterowanie - Ekran Dotykowy
-setting.fpscap.name = Maksymalny FPS
+setting.fpscap.name = Maksymalne FPS
 setting.fpscap.none = Nieograniczone
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Skalowanie Interfejsu[lightgray] (wymaga restartu)[]
+setting.uiscale.name = Skalowanie interfejsu[lightgray] (wymaga restartu)[]
+setting.uiscale.description = Aby zastosować zmiany, wymagane jest ponowne uruchomienie.
 setting.swapdiagonal.name = Pozwala na ukośną budowę
-setting.difficulty.training = Treningowy
-setting.difficulty.easy = �atwy
-setting.difficulty.normal = Normalny
-setting.difficulty.hard = Trudny
-setting.difficulty.insane = Szalony
-setting.difficulty.name = Poziom trudności
 setting.screenshake.name = Siła wstrząsów ekranu
+setting.bloomintensity.name = Intensywaność Rozmycia
+setting.bloomblur.name = Niewyraźność Rozmycia
 setting.effects.name = Wyświetlanie efektów
 setting.destroyedblocks.name = Wyświetl zniszczone bloki
 setting.blockstatus.name = Wyświetl status bloków
@@ -819,61 +1206,90 @@ setting.seconds = {0} sekund
 setting.milliseconds = {0} milisekund
 setting.fullscreen.name = Pełny ekran
 setting.borderlesswindow.name = Bezramkowe okno[lightgray] (może wymagać restartu)
+setting.borderlesswindow.name.windows = Pełny ekran bez obramowania
+setting.borderlesswindow.description = Restart może być wymagany, aby zastowasować zmiany.
 setting.fps.name = Pokazuj FPS oraz ping
-setting.smoothcamera.name = GÅ‚adka Kamera
+setting.console.name = WÅ‚Ä…cz konsolÄ™
+setting.smoothcamera.name = PÅ‚ynna kamera
 setting.vsync.name = Synchronizacja pionowa
 setting.pixelate.name = Pikselacja [lightgray](wyłącza animacje)
-setting.minimap.name = Pokaż Minimapę
-setting.coreitems.name = Poazuj Przedmoty W Rdzeniu (WIP)
+setting.minimap.name = Pokaż minimapę
+setting.coreitems.name = Pokazuj przedmioty w rdzeniu
 setting.position.name = Pokazuj położenie gracza
+setting.mouseposition.name = Pokazuj położenie myszki
 setting.musicvol.name = Głośność muzyki
 setting.atmosphere.name = Pokazuj atmosferÄ™ planety
+setting.drawlight.name = Rysuj Cienie/Światła
 setting.ambientvol.name = Głośność otoczenia
 setting.mutemusic.name = Wycisz muzykÄ™
 setting.sfxvol.name = Głośność dźwięków
 setting.mutesound.name = Wycisz dźwięki
 setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry
-setting.savecreate.name = Automatyczne tworzenie zapisu
-setting.publichost.name = Widoczność Gry Publicznej
-setting.playerlimit.name = Limit Graczy
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = Automatyczne tworzenie zapisów
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Limit graczy
 setting.chatopacity.name = Przezroczystość czatu
 setting.lasersopacity.name = Przezroczystość laserów zasilających
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Przezroczystość mostów
-setting.playerchat.name = Wyświetlaj czat w grze
+setting.playerchat.name = Wyświetlaj dymek czatu w grze
 setting.showweather.name = Pokaż pogodę
-public.confirm = Czy chcesz ustawić swoją grę jako publiczną?\n[accent]Każdy będzie mógł dołączyć do Twojej gry.\n[lightgray]Można to później zmienić w Ustawienia->Gra->Widoczność Gry Publicznej.
+setting.hidedisplays.name = Ukryj wyświetlacze logiczne
+setting.macnotch.name = Dostosuj interfejs do wyświetlania wycięcia ekranu
+setting.macnotch.description = Aby zastosować zmiany, wymagane jest ponowne uruchomienie
+steam.friendsonly = Tylko Znajomi
+steam.friendsonly.tooltip = Czy tylko Znajomi ze Steam będą mogli dołączyć do twojej gry?\nOdznaczenie tego okienka ustawi twoją grę na publiczną - każdy może dołączyć.
 public.beta = Wersje beta gry nie mogą tworzyć publicznych pokoi.
 uiscale.reset = Skala interfejsu uległa zmianie.\nNaciśnij "OK" by potwierdzić zmiany.\n[scarlet]Cofanie zmian i wyjście z gry za[accent] {0}[]
-uiscale.cancel = Anuluj i Wyjdź
-setting.bloom.name = Efekt Bloom
+uiscale.cancel = Anuluj i wyjdź
+setting.bloom.name = Efekt Rozmycia
 keybind.title = Zmień
 keybinds.mobile = [scarlet]Większość skrótów klawiszowych nie funkcjonuje w wersji mobilnej. Tylko podstawowe poruszanie się jest wspierane.
 category.general.name = Ogólne
 category.view.name = Wyświetl
+category.command.name = ZarzÄ…dzanie JednostkÄ…
 category.multiplayer.name = Wielu graczy
 category.blocks.name = Wybierz Blok
-command.attack = Atakuj
-command.rally = Zbierz
-command.retreat = Wycofaj
-command.idle = Nieaktywny
 placement.blockselectkeys = \n[lightgray]Klawisz: [{0},
-keybind.respawn.name = Respawn
-keybind.control.name = Control Unit
+keybind.respawn.name = Odrodzenie
+keybind.control.name = Kontroluj jednostkÄ™
 keybind.clear_building.name = Wyczyść budynek
 keybind.press = Naciśnij wybrany klawisz...
 keybind.press.axis = Naciśnij oś lub klawisz...
 keybind.screenshot.name = Zrzut ekranu mapy
 keybind.toggle_power_lines.name = Zmień widoczność linii energetycznych
-keybind.toggle_block_status.name = Przełączanie Między Statusami Bloków
+keybind.toggle_block_status.name = Przełączanie między statusami bloków
 keybind.move_x.name = Poruszanie w poziomie
 keybind.move_y.name = Poruszanie w pionie
 keybind.mouse_move.name = Podążaj Za Myszą
 keybind.pan.name = Widok Panoramiczny
 keybind.boost.name = Przyspiesz
-keybind.schematic_select.name = Wybierz region
-keybind.schematic_menu.name = Menu schematów
-keybind.schematic_flip_x.name = Obróć schemat horyzontalnie
-keybind.schematic_flip_y.name = Obróć schemat wertykalnie
+keybind.command_mode.name = Tryb Komend
+keybind.command_queue.name = Kolejka Rozkazów Jednostki
+keybind.create_control_group.name = Stwórz Grupę Kontroli
+keybind.cancel_orders.name = Anuluj Rozkazy
+keybind.unit_stance_shoot.name = Strzel
+keybind.unit_stance_hold_fire.name = Wstrzymaj ogień
+keybind.unit_stance_pursue_target.name = Goń Cel
+keybind.unit_stance_patrol.name = Patroluj
+keybind.unit_stance_ram.name = Taranuj
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Odbuduj Region
+keybind.schematic_select.name = Wybierz Region
+keybind.schematic_menu.name = Menu Schematów
+keybind.schematic_flip_x.name = Obróć schemat w poziomie
+keybind.schematic_flip_y.name = Obróć schemat w pionie
 keybind.category_prev.name = Poprzednia kategoria
 keybind.category_next.name = Następna kategoria
 keybind.block_select_left.name = Zaznacz blok po lewej
@@ -895,10 +1311,11 @@ keybind.select.name = Zaznacz
 keybind.diagonal_placement.name = Budowa po skosie
 keybind.pick.name = Wybierz Blok
 keybind.break_block.name = Zniszcz Blok
+keybind.select_all_units.name = Wybierz Wszystkie Jednostki
+keybind.select_all_unit_factories.name = Wybierz Wszystkie Fabryki Jednostek
 keybind.deselect.name = Odznacz
 keybind.pickupCargo.name = Podnieś �adunek
 keybind.dropCargo.name = Opuść �adunek
-keybind.command.name = Command
 keybind.shoot.name = Strzelanie
 keybind.zoom.name = Przybliżanie
 keybind.menu.name = Menu
@@ -907,70 +1324,124 @@ keybind.pause_building.name = Wstrzymaj/kontynuuj budowÄ™
 keybind.minimap.name = Minimapa
 keybind.planet_map.name = Mapa Planety
 keybind.research.name = Odkryj
+keybind.block_info.name = Informacje o Bloku
 keybind.chat.name = Czat
 keybind.player_list.name = Lista graczy
 keybind.console.name = Konsola
 keybind.rotate.name = Obracanie
-keybind.rotateplaced.name = Rotate Existing (Hold)
+keybind.rotateplaced.name = Obracanie bloku pod kursorem (przytrzymaj)
 keybind.toggle_menus.name = Zmiana widoczności menu
 keybind.chat_history_prev.name = Przewiń wiadomości w górę
 keybind.chat_history_next.name = Przewiń wiadomości w dół
 keybind.chat_scroll.name = Przewijaj Wiadomości
+keybind.chat_mode.name = Zmień tryb czatu
 keybind.drop_unit.name = Wyrzucanie przedmiot
 keybind.zoom_minimap.name = Powiększenie mapy
 mode.help.title = Opis trybów
 mode.survival.name = Przeżycie
-mode.survival.description = Zwykły tryb. Limitowane surowce i fale przeciwników.\n[gray]Wymaga spawnów wroga na mapie, aby móc grać w tym trybie.
-mode.sandbox.name = Sandbox
+mode.survival.description = Zwykły tryb. Limitowane surowce i fale przeciwników.\n[gray]Wymaga punktów spawnu wroga na mapie, aby móc grać w tym trybie.
+mode.sandbox.name = Piaskownica
 mode.sandbox.description = Nieskończone surowce i fale bez odliczania.
 mode.editor.name = Edytor
 mode.pvp.name = PvP
-mode.pvp.description = Walcz przeciwko innym graczom.\n[gray]Wymaga co najmniej dwóch rdzeni o róźnych kolorach na mapie, aby móc grać w tym trybie
+mode.pvp.description = Walcz przeciwko innym graczom.\n[gray]Wymaga co najmniej dwóch rdzeni o róźnych kolorach na mapie, aby móc grać w tym trybie.
 mode.attack.name = Atak
-mode.attack.description = Brak fal. Celem jest zniszczenie bazy przeciwnika.\n[gray]Wymaga czerwonego rdzenia na mapie, aby móc grać w tym trybie.
+mode.attack.description = Celem jest zniszczenie bazy przeciwnika.\n[gray]Wymaga czerwonego rdzenia na mapie, aby móc grać w tym trybie.
 mode.custom = WÅ‚asny Tryb
+rules.invaliddata = Niepoprawne dane ze schowka.
+rules.hidebannedblocks = Ukryj zabronione bloki
 
 rules.infiniteresources = Nieskończone Zasoby
+rules.onlydepositcore = Dozwól tylko przenoszenie z rdzenia
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Eksplozje Reaktorów
-rules.schematic = Schematy SÄ… Dozwolone
+rules.coreincinerates = Rdzeń Spala Nadmiarowe Przedmioty
+rules.disableworldprocessors = Wyłącz Procesor Świata
+rules.schematic = Zezwalaj na schematy
 rules.wavetimer = Zegar Fal
+rules.wavesending = Wysyłanie Fal
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Fale
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Tryb Ataku
-rules.buildai = SI Może Budować
-rules.enemyCheat = Nieskończone Zasoby SI (czerwonego zespołu)
+rules.buildai = AI Budowania Baz
+rules.buildaitier = Poziom Budowania AI
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Minimalny Rozmiar Składu
+rules.rtsmaxsquadsize = Maksymalny Rozmiar Składu
+rules.rtsminattackweight = Minimalna Waga Ataku
+rules.cleanupdeadteams = Usuń Budynki Pokonanej Drużyny (PvP)
+rules.corecapture = Przejmij Zniszczony Rdzeń
+rules.polygoncoreprotection = WielokÄ…tna Ochrona Rdzenia
+rules.placerangecheck = Sprawdzanie Zasięgu Podczas Umieszczenia
+rules.enemyCheat = Nieskończone Zasoby SI (wroga)
 rules.blockhealthmultiplier = Mnożnik Życia Bloków
 rules.blockdamagemultiplier = Mnożnik Uszkodzeń Bloków
 rules.unitbuildspeedmultiplier = Mnożnik Prędkości Tworzenia Jednostek
+rules.unitcostmultiplier = Mnożnik Kosztu Jednostek
 rules.unithealthmultiplier = Mnożnik Życia Jednostek
 rules.unitdamagemultiplier = Mnożnik Obrażeń jednostek
+rules.unitcrashdamagemultiplier = Obrażenia Zadawane Po Zniszczeniu
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Mnożnik Mocy Paneli Słonecznych
+rules.unitcapvariable = Rdzenie mają wpływ na limit jednostek
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Podstawowy limit jednostek
+rules.limitarea = Limit Obszaru Mapy
 rules.enemycorebuildradius = Zasięg Blokady Budowy Przy Rdzeniu Wroga:[lightgray] (kratki)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Odstępy Między Falami:[lightgray] (sek)
+rules.initialwavespacing = Początkowy Odstęp Pomię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.wavelimit = Mapa Konczy siÄ™ Po Fali
 rules.dropzoneradius = Zasięg Strefy Zrzutu:[lightgray] (kratki)
 rules.unitammo = Jednostki PotrzebujÄ… Amunicji
+rules.enemyteam = Drużyna Wroga
+rules.playerteam = Drużyna Gracza
 rules.title.waves = Fale
 rules.title.resourcesbuilding = Zasoby i Budowanie
 rules.title.enemy = Przeciwnicy
 rules.title.unit = Jednostki
 rules.title.experimental = Eksperymentalne
-rules.title.environment = Environment
+rules.title.environment = Otoczenie
+rules.title.teams = Drużyny
+rules.title.planet = Planet
 rules.lighting = Oświetlenie
-rules.enemyLights = Wrogowie Emitują Światło
+rules.fog = Mgła Wojny
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Ogień
-rules.explosions = Uszkodzenia Wybuchu Klocka/Jednostki
-rules.ambientlight = Otaczające Światło
+rules.anyenv = <Każda>
+rules.explosions = Uszkodzenia Wybuchu Bloku/Jednostki
+rules.ambientlight = Otaczające\nŚwiatło
 rules.weather = Pogoda
 rules.weather.frequency = Częstotliwość:
+rules.weather.always = Zawsze
 rules.weather.duration = Czas trwania:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Przedmioty
 content.liquid.name = PÅ‚yny
 content.unit.name = Jednostki
-content.block.name = Klocki
+content.block.name = Bloki
+content.status.name = Efekty Statusu
 content.sector.name = Sektory
+content.team.name = Frakcje
+wallore = (Åšciana)
 
 item.copper.name = Miedź
 item.lead.name = Ołów
@@ -988,114 +1459,168 @@ item.blast-compound.name = Wybuchowy ZwiÄ…zek
 item.pyratite.name = Piratian
 item.metaglass.name = Metaszkło
 item.scrap.name = ZÅ‚om
+item.fissile-matter.name = Materiał Roszczepialny
+item.beryllium.name = Beryl
+item.tungsten.name = Wolfram
+item.oxide.name = Tlenek Berylu
+item.carbide.name = Karbid
+item.dormant-cyst.name = DrzemiÄ…ca Torbiel
 liquid.water.name = Woda
 liquid.slag.name = Żużel
 liquid.oil.name = Ropa
 liquid.cryofluid.name = Lodociecz
+liquid.neoplasm.name = Neoplazma
+liquid.arkycite.name = Arkycyt
+liquid.gallium.name = Ciekły Gal
+liquid.ozone.name = Ozon
+liquid.hydrogen.name = Wodór
+liquid.nitrogen.name = Azot
+liquid.cyanogen.name = Cyjan
 
 unit.dagger.name = Nóż
-unit.mace.name = Mace
+unit.mace.name = Buzdygan
 unit.fortress.name = Forteca
-unit.nova.name = Nova
+
+unit.nova.name = Nowa
 unit.pulsar.name = Pulsar
-unit.quasar.name = Quasar
+unit.quasar.name = Kwazar
+
 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.flare.name = Flara
 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.mono.name = Mrówka
+unit.poly.name = Duszek
 unit.mega.name = Mega
 unit.quad.name = Quad
 unit.oct.name = Oct
-unit.risso.name = Risso
+
+unit.risso.name = Delfin
 unit.minke.name = Minke
-unit.bryde.name = Bryde
-unit.sei.name = Sei
+unit.bryde.name = PÅ‚etwal
+unit.sei.name = Sejwal
 unit.omura.name = Omura
-unit.alpha.name = Alpha
+
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oksynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegir
+unit.navanax.name = Nawanaksa
+
+unit.alpha.name = Alfa
 unit.beta.name = Beta
 unit.gamma.name = Gamma
-unit.scepter.name = Scepter
-unit.reign.name = Reign
-unit.vela.name = Vela
+unit.scepter.name = Kostur
+unit.reign.name = Imperator
+unit.vela.name = Wela
 unit.corvus.name = Corvus
+unit.stell.name = Stal
+unit.locus.name = Lokus
+unit.precept.name = Przestrzegacz
+unit.vanquish.name = Pogromca
+unit.conquer.name = Zdobywca
+unit.merui.name = Merui
+unit.cleroi.name = Kleroi
+unit.anthicus.name = Dycyrtomina
+unit.tecta.name = Tekta
+unit.collaris.name = Sleipnir
+unit.elude.name = Wymykacz
+unit.avert.name = Awert
+unit.obviate.name = Likwidator
+unit.quell.name = TÅ‚umiciel
+unit.disrupt.name = Rozrywacz
 
-block.resupply-point.name = Punkt Uzupełnienia
-block.parallax.name = Parallax
+unit.evoke.name = Sygnałek
+unit.incite.name = Nawoływacz
+unit.emanate.name = Pochodnia
+
+unit.manifold.name = Składak
+unit.assembly-drone.name = Dron Montażowy
+unit.latum.name = Latum
+unit.renale.name = Renale
+
+block.parallax.name = Paralaksa
 block.cliff.name = Klif
 block.sand-boulder.name = Piaskowy GÅ‚az
 block.basalt-boulder.name = Bazaltowy GÅ‚az
 block.grass.name = Trawa
-block.slag.name = Żużel
-block.space.name = Space
+block.molten-slag.name = Żużel
+block.pooled-cryofluid.name = Lodociecz
+block.space.name = Kosmos
 block.salt.name = Sól
 block.salt-wall.name = Solna Åšciana
 block.pebbles.name = Kamyki
-block.tendrils.name = Wić
+block.tendrils.name = PnÄ…cza
 block.sand-wall.name = Piaskowa Åšciana
-block.spore-pine.name = Sosna Zarodnikowa
-block.spore-wall.name = Zarodinkowa Åšciana
+block.spore-pine.name = Zarodnikowa Sosna
+block.spore-wall.name = Zarodnikowa Åšciana
 block.boulder.name = GÅ‚az
 block.snow-boulder.name = Śnieżny Głaz
-block.snow-pine.name = Sosna śniegowa
+block.snow-pine.name = Śnieżna Sosna
 block.shale.name = �upek
-block.shale-boulder.name = Głaz �upkowy
+block.shale-boulder.name = �upkowy Głaz
 block.moss.name = Mech
 block.shrubs.name = Krzewy
-block.spore-moss.name = Mech Zarodnikowy
-block.shale-wall.name = Ściana Z �upku
-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
-block.scrap-wall-gigantic.name = Gigantyczna Åšciana ze ZÅ‚omu
+block.spore-moss.name = Zarodnikowy Mech
+block.shale-wall.name = �upkowy Mur
+block.scrap-wall.name = ZÅ‚omowy Mur
+block.scrap-wall-large.name = Duży Złomowy Mur
+block.scrap-wall-huge.name = Ogromny ZÅ‚omowy Mur
+block.scrap-wall-gigantic.name = Gigantyczny ZÅ‚omowy Mur
 block.thruster.name = Silnik
 block.kiln.name = Wypalarka
 block.graphite-press.name = Grafitowa Prasa
 block.multi-press.name = Multi-Prasa
 block.constructing = {0} [lightgray](Budowa)
 block.spawn.name = Spawn wrogów
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Rdzeń: Odłamek
 block.core-foundation.name = Rdzeń: Podstawa
 block.core-nucleus.name = Rdzeń: Jądro
-block.deepwater.name = Głęboka Woda
-block.water.name = Woda
+block.deep-water.name = Głęboka Woda
+block.shallow-water.name = Woda
 block.tainted-water.name = Skażona Woda
+block.deep-tainted-water.name = Głęboka Skażona Woda
 block.darksand-tainted-water.name = Skażona Woda z Ciemnym Piaskiem
 block.tar.name = Smoła
 block.stone.name = Kamień
-block.sand.name = Piasek
+block.sand-floor.name = Piasek
 block.darksand.name = Czarny piasek
 block.ice.name = Lód
 block.snow.name = Åšnieg
-block.craters.name = Kratery
+block.crater-stone.name = Kratery
 block.sand-water.name = Woda z Piaskiem
 block.darksand-water.name = Woda z Ciemnym Piaskiem
 block.char.name = Popiół
-block.dacite.name = Dacite
-block.dacite-wall.name = Dacite Wall
-block.dacite-boulder.name = Dacite Boulder
+block.dacite.name = Dacyt
+block.rhyolite.name = Ryolit
+block.dacite-wall.name = Dacytowa Åšciana
+block.dacite-boulder.name = Dacytowy GÅ‚az
 block.ice-snow.name = Lodowy Åšnieg
-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.stone-wall.name = Kamienna Åšciana
+block.ice-wall.name = Lodowa Åšciana
+block.snow-wall.name = Śnieżna Ściana
+block.dune-wall.name = Wydmowa Åšciana
 block.pine.name = Sosna
-block.dirt.name = Dirt
-block.dirt-wall.name = Dirt Wall
-block.mud.name = Mud
+block.dirt.name = Ziemia
+block.dirt-wall.name = Ziemna Åšciana
+block.mud.name = BÅ‚oto
 block.white-tree-dead.name = Białe Martwe Drzewo
 block.white-tree.name = Białe Drzewo
 block.spore-cluster.name = Skupisko Zarodników
 block.metal-floor.name = Metalowa Podłoga
 block.metal-floor-2.name = Metalowa Podłoga 2
 block.metal-floor-3.name = Metalowa Podłoga 3
+block.metal-floor-4.name = Metalowa Podłoga 4
 block.metal-floor-5.name = Metalowa Podłoga 5
 block.metal-floor-damaged.name = Uszkodzona Metalowa Podłoga
 block.dark-panel-1.name = Ciemny Panel 1
@@ -1105,37 +1630,40 @@ 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.basalt.name = Basalt
+block.basalt.name = Bazalt
 block.hotrock.name = Gorący Kamień
-block.magmarock.name = Skała magmowa
-block.copper-wall.name = Miedziana Åšciana
-block.copper-wall-large.name = Duża Miedziana Ściana
-block.titanium-wall.name = Tytanowa Åšciana
-block.titanium-wall-large.name = Duża Tytanowa Ściana
-block.plastanium-wall.name = Åšciana z Plastanu
-block.plastanium-wall-large.name = Duża Ściana z Plastanu
-block.phase-wall.name = Fazowa Åšciana
-block.phase-wall-large.name = Duża Fazowa Ściana
-block.thorium-wall.name = Torowa Åšciana
-block.thorium-wall-large.name = Duża Torowa Ściana
-block.door.name = Drzwi
-block.door-large.name = Duże drzwi
+block.magmarock.name = Magmowa Skała
+block.copper-wall.name = Miedziany Mur
+block.copper-wall-large.name = Duży Miedziany Mur
+block.titanium-wall.name = Tytanowy Mur
+block.titanium-wall-large.name = Duży Tytanowy Mur
+block.plastanium-wall.name = Plastanowy Mur
+block.plastanium-wall-large.name = Duży Plastanowy Mur
+block.phase-wall.name = Fazowy Mur
+block.phase-wall-large.name = Duży Fazowy Mur
+block.thorium-wall.name = Torowy Mur
+block.thorium-wall-large.name = Duży Torowy Mur
+block.door.name = Wrota
+block.door-large.name = Duże Wrota
 block.duo.name = Podwójne Działko
 block.scorch.name = Płomień
 block.scatter.name = Flak
 block.hail.name = Grad
 block.lancer.name = Lancer
 block.conveyor.name = Przenośnik
-block.titanium-conveyor.name = Przenośnik Tytanowy
-block.plastanium-conveyor.name = Przenośnik Plastanowy
-block.armored-conveyor.name = Przenośnik Opancerzony
+block.titanium-conveyor.name = Tytanowy Przenośnik
+block.plastanium-conveyor.name = Plastanowy Przenośnik
+block.armored-conveyor.name = Opancerzony Przenośnik
 block.junction.name = Węzeł
 block.router.name = Rozdzielacz
 block.distributor.name = Dystrybutor
 block.sorter.name = Sortownik
 block.inverted-sorter.name = Odwrotny Sortownik
 block.message.name = Wiadomość
-block.illuminator.name = Illuminator
+block.reinforced-message.name = Wzmocniona Wiadomość
+block.world-message.name = World Message
+block.world-switch.name = World Switch
+block.illuminator.name = Rozświetlacz
 block.overflow-gate.name = Brama Przepełnieniowa
 block.underflow-gate.name = Brama Niedomiaru
 block.silicon-smelter.name = Huta Krzemu
@@ -1150,33 +1678,33 @@ block.coal-centrifuge.name = Wirówka węglowa
 block.power-node.name = Węzeł Prądu
 block.power-node-large.name = Duży Węzeł Prądu
 block.surge-tower.name = Wieża Energetyczna
-block.diode.name = Dioda baterii
+block.diode.name = Dioda Baterii
 block.battery.name = Bateria
 block.battery-large.name = Duża Bateria
 block.combustion-generator.name = Generator Spalinowy
 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
-block.pneumatic-drill.name = Wiertło Pneumatyczne
-block.laser-drill.name = Wiertło Laserowe
+block.mechanical-drill.name = Mechaniczne Wiertło
+block.pneumatic-drill.name = Pneumatyczne Wiertło
+block.laser-drill.name = Laserowe Wiertło
 block.water-extractor.name = Ekstraktor Wody
 block.cultivator.name = Spulchniacz
 block.conduit.name = Rura
 block.mechanical-pump.name = Mechaniczna Pompa
-block.item-source.name = Źródło przedmiotów
-block.item-void.name = Próżnia przedmiotów
-block.liquid-source.name = Źródło płynów
-block.liquid-void.name = Próżnia płynów
-block.power-void.name = Próżnia prądu
-block.power-source.name = Źródło prądu
+block.item-source.name = Źródło Przedmiotów
+block.item-void.name = Próżnia Przedmiotów
+block.liquid-source.name = Źródło Płynów
+block.liquid-void.name = Próżnia Płynów
+block.power-void.name = Próżnia Prądu
+block.power-source.name = Źródło Prądu
 block.unloader.name = Ekstraktor
 block.vault.name = Magazyn
 block.wave.name = Strumień
 block.tsunami.name = Tsunami
 block.swarmer.name = Działo Rojowe
 block.salvo.name = Działo Salwowe
-block.ripple.name = Działo Falowe
+block.ripple.name = Gradobicie
 block.phase-conveyor.name = Transporter Fazowy
 block.bridge-conveyor.name = Most Transportowy
 block.plastanium-compressor.name = Kompresor Plastanu
@@ -1186,39 +1714,41 @@ block.solar-panel.name = Panel SÅ‚oneczny
 block.solar-panel-large.name = Duży Panel Słoneczny
 block.oil-extractor.name = Ekstraktor Ropy
 block.repair-point.name = Punkt Naprawy
-block.pulse-conduit.name = Rura Pulsacyjna
-block.plated-conduit.name = Opancerzona rura
+block.repair-turret.name = Działo Naprawcze
+block.pulse-conduit.name = Tytanowa Rura
+block.plated-conduit.name = Opancerzona Rura
 block.phase-conduit.name = Rura Fazowa
 block.liquid-router.name = Rozdzielacz Płynów
 block.liquid-tank.name = Zbiornik Płynów
+block.liquid-container.name = Pojemnik Płynów
 block.liquid-junction.name = �ącznik Płynów
 block.bridge-conduit.name = Most Płynów
 block.rotary-pump.name = Wirowa Pompa
 block.thorium-reactor.name = Reaktor Torowy
 block.mass-driver.name = Katapulta Masy
-block.blast-drill.name = Wiertło Wybuchowe
-block.thermal-pump.name = Pompa Termalna
+block.blast-drill.name = Wybuchowe Wiertło
+block.impulse-pump.name = Impulsowa Pompa
 block.thermal-generator.name = Generator Termalny
-block.alloy-smelter.name = Piec MieszajÄ…cy
+block.surge-smelter.name = Piec MieszajÄ…cy
 block.mender.name = Naprawiacz
-block.mend-projector.name = Projektor Napraw
-block.surge-wall.name = Åšciana Elektrum
-block.surge-wall-large.name = Duża Ściana Elektrum
+block.mend-projector.name = Projektor Naprawczy
+block.surge-wall.name = Elektrumowy Mur
+block.surge-wall-large.name = Duży Elektrumowy Mur
 block.cyclone.name = Cyklon
 block.fuse.name = Lont
-block.shock-mine.name = Mina
-block.overdrive-projector.name = Projektor Pola Overdrive
+block.shock-mine.name = Mina Rażąca
+block.overdrive-projector.name = Projektor Pola Przyspieszenia
 block.force-projector.name = Projektor Pola Siłowego
 block.arc.name = Piorun
 block.rtg-generator.name = Generator RTG
 block.spectre.name = Huragan
-block.meltdown.name = Rozpad
-block.foreshadow.name = Foreshadow
+block.meltdown.name = Roztapiacz
+block.foreshadow.name = Zeus
 block.container.name = Kontener
 block.launch-pad.name = Wyrzutnia
-block.launch-pad-large.name = Duża Wyrzutnia
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = Segment
-block.command-center.name = Centrum Dowodzenia
 block.ground-factory.name = Fabryka Naziemna
 block.air-factory.name = Fabryka Powietrzna
 block.naval-factory.name = Fabryka Morska
@@ -1228,165 +1758,399 @@ block.exponential-reconstructor.name = Rekonstruktor Wykładniczy
 block.tetrative-reconstructor.name = Rekonstruktor Tetratywny
 block.payload-conveyor.name = Przenośnik Masowy
 block.payload-router.name = Rozdzielacz �adunku
+block.duct.name = Rura Próżniowa
+block.duct-router.name = Rozdzielacz Próżniowy
+block.duct-bridge.name = Most Próżniowy
+block.large-payload-mass-driver.name = Duża Katapulta �adunku
+block.payload-void.name = Próżnia �adunku
+block.payload-source.name = Źródło �adunku
 block.disassembler.name = Rozkładacz
 block.silicon-crucible.name = Tygiel Krzemu
-block.overdrive-dome.name = Kopuła Pola Overdrive
-#experimental, may be removed
-block.block-forge.name = Piec Bloków
-block.block-loader.name = �adownik Bloków
-block.block-unloader.name = Opróżniacz Bloków
-block.interplanetary-accelerator.name = Przspieszacz Międzyplanetarny
+block.overdrive-dome.name = Kopuła Pola Przyspieszenia
+block.interplanetary-accelerator.name = Przyspieszacz Międzyplanetarny
+block.constructor.name = Konstruktor
+block.constructor.description = Produkuje struktury do rozmiaru 2x2 kratek.
+block.large-constructor.name = Duży Konstruktor
+block.large-constructor.description = Produkuje struktury do rozmiaru 4x4 kratek.
+block.deconstructor.name = Dekonstruktor
+block.deconstructor.description = Dekonstruuje struktury i jednostki. Zwraca 100% kosztów budowy.
+block.payload-loader.name = Punkt Załadunkowy
+block.payload-loader.description = �aduje płyny i surowce do bloków.
+block.payload-unloader.name = Punkt Rozładunkowy
+block.payload-unloader.description = Rozładowuje płyny i surowce z bloków.
+block.heat-source.name = Źródło Ciepła
+block.heat-source.description = Blok dający nieskończone ciepło.
+
+block.empty.name = Pusty
+block.rhyolite-crater.name = Ryolitowy Krater
+block.rough-rhyolite.name = Szorstki Ryolit
+block.regolith.name = Regolit
+block.yellow-stone.name = Żółta Skała
+block.carbon-stone.name = Węglowa Skała
+block.ferric-stone.name = Żelazowa Skała
+block.ferric-craters.name = Żelazowa Skała
+block.beryllic-stone.name = Berylowa Skała
+block.crystalline-stone.name = Kryształowy kamień
+block.crystal-floor.name = Kryształowa Podłoga
+block.yellow-stone-plates.name = Żółte Kamienne Płyty
+block.red-stone.name = Czerwony Kamień
+block.dense-red-stone.name = Gęsty Czerwony Kamień
+block.red-ice.name = Czerwony Lód
+block.arkycite-floor.name = Arkyiczna Podłoga
+block.arkyic-stone.name = Arkyiczny Kamień
+block.rhyolite-vent.name = Ryolitowy Gejzer
+block.carbon-vent.name = Węglowy Gejzer
+block.arkyic-vent.name = Arkyiczny Gejzer
+block.yellow-stone-vent.name = Żółty Kamienny Gejzer
+block.red-stone-vent.name = Czerwony Kamienny Gejzer
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Strefa Rdzenia
+block.regolith-wall.name = Regolitowa Åšciana
+block.yellow-stone-wall.name = Żółta Kamienna Ściana
+block.rhyolite-wall.name = Ryolitowa ściana
+block.carbon-wall.name = Węglowa Ściana
+block.ferric-stone-wall.name = Żelazna Kamienna Ściana
+block.beryllic-stone-wall.name = Berylitowa Åšciana
+block.arkyic-wall.name = Arkyiczna Åšciana
+block.crystalline-stone-wall.name = Kryształowa Kamienna Ściana
+block.red-ice-wall.name = Åšciana z Czerwonego Lodu
+block.red-stone-wall.name = Kamienna Czerwona Åšciana
+block.red-diamond-wall.name = Czerwona Diamentowa Åšciana
+block.redweed.name = Czerwony Chwast
+block.pur-bush.name = Czysty Krzak
+block.yellowcoral.name = Żółty Koralowiec
+block.carbon-boulder.name = Węglowy Głaz
+block.ferric-boulder.name = Żelazny Głaz
+block.beryllic-boulder.name = Berylowy GÅ‚az
+block.yellow-stone-boulder.name = Żółty Kamienny Głaz
+block.arkyic-boulder.name = Arkyiczny GÅ‚az
+block.crystal-cluster.name = Gromada Kryształów
+block.vibrant-crystal-cluster.name = Wibrująca Grupa Kryształów
+block.crystal-blocks.name = Kryształowe Bloki
+block.crystal-orbs.name = Kryształowe Kule
+block.crystalline-boulder.name = Kryształowy Głaz
+block.red-ice-boulder.name = Czerwony Lodowy GÅ‚az
+block.rhyolite-boulder.name = GÅ‚az Ryolitowy
+block.red-stone-boulder.name = Czerwony Kamienny GÅ‚az
+block.graphitic-wall.name = Grafitowa Åšciana
+block.silicon-arc-furnace.name = Krzemowy Piec �ukowy
+block.electrolyzer.name = Elektrolizer
+block.atmospheric-concentrator.name = Skraplacz Atmosferyczny
+block.oxidation-chamber.name = Komora UtleniajÄ…ca
+block.electric-heater.name = Podgrzewacz Elektryczny
+block.slag-heater.name = Podgrzewacz Żużlowy
+block.phase-heater.name = Podgrzewacz Fazowy
+block.heat-redirector.name = Kierownik Ciepła
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Rozdzielacz Ciepła
+block.slag-incinerator.name = Spalarnia Żużla
+block.carbide-crucible.name = Tygiel Karbidu
+block.slag-centrifuge.name = Wirówka Żużlu
+block.surge-crucible.name = Tygiel Elektrum
+block.cyanogen-synthesizer.name = Syntetyzer Cyjanu
+block.phase-synthesizer.name = Fazowy Syntetyzer
+block.heat-reactor.name = Reaktor Cieplny
+block.beryllium-wall.name = Berylowy Mur
+block.beryllium-wall-large.name = Duży Berylowy Mur
+block.tungsten-wall.name = Wolframowy Mur
+block.tungsten-wall-large.name = Duży Wolframowy Mur
+block.blast-door.name = Dotykowe Wrota
+block.carbide-wall.name = Karbidowy Mur
+block.carbide-wall-large.name = Duży Karbidowy Mur
+block.reinforced-surge-wall.name = Wzmocniony Elektrumowy Mur
+block.reinforced-surge-wall-large.name = Duży Wzmocniony Elektrumowy Mur
+block.shielded-wall.name = Osłonowy Mur
+block.radar.name = Radar
+block.build-tower.name = Wieża Budownicza
+block.regen-projector.name = Projektor Regeneracji
+block.shockwave-tower.name = Wieża Antybalistyczna
+block.shield-projector.name = Projektor Ochronny
+block.large-shield-projector.name = Duży Projektor Ochronny
+block.armored-duct.name = Opancerzona Rura Próżniowa
+block.overflow-duct.name = Przeciwprzepełnieniowa Rura Próżniowa
+block.underflow-duct.name = Próżniowa Rura Niedomiaru
+block.duct-unloader.name = Próżniowa Rura Rozładowująca
+block.surge-conveyor.name = Elektrumowy Przenośnik
+block.surge-router.name = Elektrumowy Rozdzielacz
+block.unit-cargo-loader.name = Punkt Załadunku Jednostki Transportowej
+block.unit-cargo-unload-point.name = Punkt Rozładunku Jednostki Transportowej
+block.reinforced-pump.name = Wzmocniona Pompa
+block.reinforced-conduit.name = Wzmocniona Rura
+block.reinforced-liquid-junction.name = Wzmocniony �ącznik Płynów
+block.reinforced-bridge-conduit.name = Wzmocniony Most Płynów
+block.reinforced-liquid-router.name = Wzmocniony Rozdzielacz Płynów
+block.reinforced-liquid-container.name = Wzmocniony Pojemnik Płynów
+block.reinforced-liquid-tank.name = Wzmocniony Zbiornik Płynów
+block.beam-node.name = Węzeł Promieni
+block.beam-tower.name = Wieża Promieni
+block.beam-link.name = �ącznik Promieni
+block.turbine-condenser.name = Turbina Parowa
+block.chemical-combustion-chamber.name = Chemiczna Komora Spalania
+block.pyrolysis-generator.name = Generator Pirolizy
+block.vent-condenser.name = Skraplacz Pary
+block.cliff-crusher.name = Rozdrabniacz Klifów
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plazmowe Wiertło
+block.large-plasma-bore.name = Duże Plazmowe Wiertło
+block.impact-drill.name = Uderzeniowe Wiertło
+block.eruption-drill.name = Erupcyjne Wiertło
+block.core-bastion.name = Rdzeń: Bastion
+block.core-citadel.name = Rdzeń: Cytadela
+block.core-acropolis.name = Rdzeń: Akropol
+block.reinforced-container.name = Wzmocniony Kontener
+block.reinforced-vault.name = Wzmocniony Magazyn
+block.breach.name = Wyłom
+block.sublimate.name = Wyziew
+block.titan.name = Tytan
+block.disperse.name = Burza
+block.afflict.name = Cios
+block.lustre.name = BÅ‚ysk
+block.scathe.name = Zamęt
+block.tank-refabricator.name = Konstruktor Czołgów
+block.mech-refabricator.name = Konstruktor Mechów
+block.ship-refabricator.name = Konstruktor Statków
+block.tank-assembler.name = Monter Czołgów
+block.ship-assembler.name = Monter Statków
+block.mech-assembler.name = Monter Mechów
+block.reinforced-payload-conveyor.name = Wzmocniony Przenośnik �adunku
+block.reinforced-payload-router.name = Wzmocniony Rozdzielacz �adunku
+block.payload-mass-driver.name = Katapula �adunku
+block.small-deconstructor.name = Mały Dekonstruktor
+block.canvas.name = Płótno
+block.world-processor.name = Procesor Åšwiata
+block.world-cell.name = Komórka Świata
+block.tank-fabricator.name = Fabryka Czołgów
+block.mech-fabricator.name = Fabryka Mechów
+block.ship-fabricator.name = Fabryka Statków
+block.prime-refabricator.name = Główny Refabrykator
+block.unit-repair-tower.name = Wieża Napraw
+block.diffuse.name = Rozproszenie
+block.basic-assembler-module.name = Podstawowy Moduł Montażowy
+block.smite.name = Karciciel
+block.malign.name = Malign
+block.flux-reactor.name = Reaktor Strumieniowy
+block.neoplasia-reactor.name = Reaktor neoplazmowy
 
 block.switch.name = Przełącznik
-block.micro-processor.name = Micro Procesor
-block.logic-processor.name = Logiczny Procesor
-block.hyper-processor.name = Hyper Procesor
+block.micro-processor.name = Mikroprocesor
+block.logic-processor.name = Procesor Logiczny
+block.hyper-processor.name = Hiperprocesor
 block.logic-display.name = Wyświetlacz Logiczny
 block.large-logic-display.name = Duży Wyświetlacz Logiczny
 block.memory-cell.name = Komórka Pamięci
 block.memory-bank.name = Bank Pamięci
-
-team.blue.name = niebieski
-team.crux.name = czerwony
-team.sharded.name = żółty
-team.orange.name = pomarańczowy
-team.derelict.name = szary
-team.green.name = zielony
-team.purple.name = fioletowy
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Sharded
+team.derelict.name = Porzuceni
+team.green.name = Zielony
+team.blue.name = Niebieski
 
 hint.skip = Pomiń
 hint.desktopMove = Użyj [accent][[WASD][] by się poruszać.
-hint.zoom = [accent]Przewiń[] by przybliżać lub oddlać obraz.
-hint.mine = Zbliż się do \uf8c4 rudy miedzi i [accent]kliknij[] by kopać manualnie.
+hint.zoom = [accent]Użyj[] by przybliżać lub oddalać obraz.
 hint.desktopShoot = Kliknij [accent][[Lewy przycisk myszy][] by strzelać.
-hint.depositItems = By przenosić przedmoty, przeciągij je ze swojego statku do rdzenia.
+hint.depositItems = By przenosić przedmioty, przeciągij je ze swojego statku do rdzenia.
 hint.respawn = By się odrodzić jako statek, kliknij [accent][[V][].
-hint.respawn.mobile = Przełączyłeś się na inną jednoskę/strukturę. By odrodzić się jako statek, [accent]kliknij w awatar w górnym lewym rogu.[]
-hint.desktopPause = Naciśnij [accent][[Spację][] by zatrzymać lub wznowić grę.
-hint.placeDrill = Wybierz \ue85e [accent]Wiertło[] w menu w prawym dolnym rogu, i wybierz wtedy \uf870 [accent]Wiertło[] i kliknij na miedzi by je postawić.
-hint.placeDrill.mobile = Wybierz zakładkę z \ue85e[accent]Wiertłem[] w menu w prawym dolnym rogu, i wtedy wybierz \uf870 [accent]Wietło[] i kliknij na miedzi by je postawić.\n\nNaciśnij \ue800 [accent]znak potwierdzenia[] w dolnym prawym rogu by potwierdzić.
-hint.placeConveyor = Przenośniki mogą przenosić przedmioty z wierteł. Wybierz \uf896 [accent]Przenośnik[] z zakładki \ue814 [accent]Dystrybucja[].\n\nKliknij i przeciągnij by położyć wiele przeciągników.\n[accent]Przewiń[] by obrócić.
-hint.placeConveyor.mobile = Przenośniki mogą przenosić przedmioty z wierteł. Wybierz \uf896 [accent]Przenośnik[] z zakładki \ue814 [accent]Dystrybucja[].\n\nPrzytrzymaj palcem i przeciągij by położyć wiele przeciągników.
-hint.placeTurret = Postaw \uf861 [accent]Działka[] by bronić się przed wrogami.\n\nDziałka potzebują amunicji - w tym wypadku, \uf838copper.\nUżyj przenośników i wierteł by je naładować.
-hint.breaking = Użyj [accent]Prawego przycisku myszy[] i przeciągnij by zniszczyć bloki.
-hint.breaking.mobile = Aktywuj \ue817 [accent]ikonę młota[] w dolnym prawym rogu by zniszczyć bloki.\n\nPrzytrymaj swój palec i przeciągij by wybrać wiele bloków do zniszczenia.
-hint.research = Klikij przycisk \ue875 [accent]Badań[] by odkrwyać nowe technologie.
-hint.research.mobile = Użyj przycisku \ue875 [accent]Badań[] w \ue88c [accent]Menu[] by odkrwyać nowe technologie.
-hint.unitControl = Przytrzymaj [accent][[Lewy CTRL][] i [accent]kliknij[] to control by kontrolować sojusznicze jednostki i działka.
+hint.respawn.mobile = Przełączyłeś się na inną jednostkę/strukturę. By odrodzić się jako statek, [accent]kliknij w awatar w lewym górnym rogu.[]
+hint.desktopPause = Naciśnij [accent][[Spację][], by zatrzymać lub wznowić grę.
+hint.breaking = Użyj [accent][Prawego przycisku myszy][] i przeciągnij by zniszczyć bloki.
+hint.breaking.mobile = Aktywuj \ue817 [accent]ikonę młota[] w dolnym prawym rogu by zniszczyć bloki.\n\nPrzytrzymaj swój palec i przeciągnij by wybrać wiele bloków do zniszczenia.
+hint.blockInfo = Wyświetl informacje o bloku, wybierając go w [accent]menu budowania[], a następnie wybierając [accent][[?][] przycisk po prawej.
+hint.derelict = [accent]Szare[] struktury są uszkodzonymi pozostałościami starych baz, które już nie funkcjonują.\n\nTe struktury można [accent]zdekonstruować[] dla surowców.
+hint.research = Klikij przycisk \ue875 [accent]Badań[], by odkrywać nowe technologie.
+hint.research.mobile = Użyj przycisku \ue875 [accent]Badań[] w \ue88c [accent]Menu[], by odkrywać nowe technologie.
+hint.unitControl = Przytrzymaj [accent][[Lewy CTRL][] i [accent]kliknij[], by kontrolować sojusznicze jednostki i działka.
 hint.unitControl.mobile = [accent][Kliknij dwukrotnie[] by kontrolować sojusznicze jednostki i działka.
-hint.launch = Gdy zebrałeś wystarczająco materiałów możesz [accent]Wystrzelić[] wybierając \ue827 [accent]Mape[] w dolnym prawym rogu.
-hint.launch.mobile = Gdy zebrałeś wystarczająco materiałów możesz [accent]Wystrzelić[] do pobliskich sektorów klikając w \ue827 [accent]Mape[] w \ue88c [accent]Menu[].
-hint.schematicSelect = Przytrzymaj [accent][[F][] by kopiować i wkleić bloki.\n\n[accent][[Środkowy przycisk myszy][] kopiuje pojedyńczy blok.
-hint.conveyorPathfind = Przeciągij i przytrzymaj [accent][[Lewy CTRL][] w trakcie budowania przenośników by wygenerować ścieżkę.
-hint.conveyorPathfind.mobile = Włącz \ue844 [accent]tryb ukośny[] i przeciągnij w trakcie budowania przenośników by wygenerować ścieżkę.
-hint.boost = Przytrzymaj [accent][[Lewy Shift][] by przelecieć ponad przeszkody.\n\nNie wszystkie jednostki tak mogą.
-hint.command = Kliknij [accent][[G][] by ukształtować formacje z pobliskich jednostek.
-hint.command.mobile = [accent][[Podwójne kliknięcie][] kształtuje formacje z pobliskich jednostek.
-hint.payloadPickup = Kliknij [accent][[[] by podnieść małe bloki lub jednostki.
+hint.unitSelectControl = Żeby kontrolować jednostki wejdź w [accent]tryb komend[] trzymając [accent]Lewy Shift.[]\nW trybie komend, kliknij i przeciągnij, żeby wybrać jednostki. Kliknij [accent]Prawym Przyciskiem Myszy[], żeby wyznaczyc jednostkom cel.
+hint.unitSelectControl.mobile = Aby kontrolować jednostki, wejdź w [accent]tryb dowodzenia[] poprzez naciśnięcie przcisku [accent]dowodzenia[] w lewym dolnym rogu.\nPodczas gdy jesteś w trybie dowodzenia, naciśnij długo i przeciągnij by wybrać jednostki. Stuknij w miejsce lub cel aby je tam wysłać.
+hint.launch = Gdy zebrałeś wystarczająco materiałów możesz [accent]Wystrzelić[] wybierając \ue827 [accent]Mapę[] w dolnym prawym rogu.
+hint.launch.mobile = Gdy zebrałeś wystarczająco materiałów możesz [accent]Wystrzelić[] do pobliskich sektorów klikając w \ue827 [accent]Mapę[] w \ue88c [accent]Menu[].
+hint.schematicSelect = Przytrzymaj [accent][[F][] by kopiować i wkleić bloki.\n\n[accent][[Środkowy przycisk myszy][] kopiuje pojedynczy blok.
+hint.rebuildSelect = Przytrzymaj [accent][[B][] i przeciągnij, by zaznaczyć plany zniszczonych bloków.\nTo naprawi je automatycznie.
+hint.rebuildSelect.mobile = wybierz \ue874 przycisk kopiowania,  wtedy dotnij \ue80f przycisk odbudowy i przeciągnij by zaznaczyć plany zniszczonych bloków.\nTo naprawi je automatycznie.
+hint.conveyorPathfind = Przeciągij i przytrzymaj [accent][[Lewy CTRL][] w trakcie budowania przenośników aby wygenerować ścieżkę.
+hint.conveyorPathfind.mobile = Włącz \ue844 [accent]tryb ukośny[] i przeciągnij w trakcie budowania przenośników aby wygenerować ścieżkę.
+hint.boost = Przytrzymaj [accent][[Lewy Shift][], by przelecieć ponad przeszkody.\n\nTylko część jednostek lądowych może to zrobić.
+hint.payloadPickup = Kliknij [accent][[[], by podnieść małe bloki lub jednostki.
 hint.payloadPickup.mobile = [accent]Kliknij i przytrzymaj[] mały blok by go podnieść.
-hint.payloadDrop = Kliknij [accent]][] by opuścić podniesoiny towar.
-hint.payloadDrop.mobile = [accent]Kliknij i przytrzymaj[] w puste miejsce by opuścić podniesoiny towar.
+hint.payloadDrop = Kliknij [accent]][], by opuścić podniesiony towar.
+hint.payloadDrop.mobile = [accent]Kliknij i przytrzymaj[] w puste miejsce by opuścić podniesiony towar.
 hint.waveFire = [accent]Strumień[] wypełniony wodą będzie gasić pobiskie pożary.
-hint.generator = \uf879 [accent]Generatory Spalinowe[] spalają węgiel i przekuzują moc do pobliskich bloków.\n\nMożesz powiększyć odległość transmitowanej mocy używająć \uf87f [accent]Węzeły Prądu[].
-hint.guardian = Jednostki [accent]Strażnicze[] są uzbrojone. Słaba amunicja - taka jak [accent]Miedź[] oraz [accent]Ołów[] [scarlet]nie jest efektywna[].\n\nUżyj lepszych działek takich jak \uf835 [accent]Naładowane Grafitem[] \uf861Duo/\uf859Salwa by pozbyć się strażników.
-hint.coreUpgrade = Rdzenie mogą być ulepszone poprzez [accent]płożenie na nich rdzeń wyższego poziomu[].\n\nPołóż  rdzeń [accent]Fundacji[] na  rdzeń:[accent]Odłamek[] core. Żadna przeszkoda ani blok nie może stać na miejscu rdzenia.
+hint.generator = \uf879 [accent]Generatory Spalinowe[] spalają węgiel i przekazują moc do pobliskich bloków.\n\nMożesz powiększyć odległość transmitowanej mocy używając \uf87f [accent]Węzły Prądu[].
+hint.guardian = Jednostki [accent]Strażnicze[] są uzbrojone. Słaba amunicja - taka jak [accent]Miedź[] czy [accent]Ołów[] [scarlet]nie jest efektywna[].\n\nUżyj lepszych działek takich jak naładowane \uf835 [accent]Grafitem[] \uf861 [accent]Podwójne Działka[]/\uf859 [accent]Działa Salwowe[] by pozbyć się strażników.
+hint.coreUpgrade = Rdzenie mogą być ulepszone poprzez [accent]postawienie na nich rdzenia wyższej generacji[].\n\nPostaw \uf868 Rdzeń: [accent]Podstawę[] na \uf869  Rdzeń: [accent]Odłamek[]. Żadna przeszkoda ani blok nie może stać na miejscu nowego rdzenia.
 hint.presetLaunch = Szare [accent]sektory[], takie jak [accent]Zamrożony Las[], to sektory do których możesz dotrzeć z każdego miejsca. Nie wymagają podbicia pobliskiego terenu.\n\n[accent]Ponumerowane sektory[], takie jak ten, [accent]są dodatkowe[].
+hint.presetDifficulty = Ten sektor ma [scarlet]wysoki poziom zagrożenia przez wroga[].\nWystrzeliwanie do takich sektorów jest [accent]nie zalecane[] bez odpowiedniej technologii i przygotowania.
 hint.coreIncinerate = Jak rdzeń zostanie w pełni wypełniony danym przedmiotem, reszta przedmiotów tego typu zostanie [accent]spalona[].
-hint.coopCampaign = Gdy grasz [accent]kooperacyjną kampanie[], przedmioty które są produkowane na mapie trafią także [accent]dotwoich lokalnych sektorów[].\n\nWszelkie nowe badania przeprowadzone przez hosta są również przenoszone.
+hint.factoryControl = Aby ustawić punkt docelowy dla [accent]wyprodukowanych jednostek[], kliknij lewym przyciskiem na fabrykę w trybie poleceń, a następnie prawym przyciskiem w miejsce docelowe.\nWyprodukowane przez nią jednostki automatycznie się tam przemieszczą.
+hint.factoryControl.mobile = Aby ustawić punkt docelowy dla [accent]wyprodukowanych jednoste[], dotknij fabryki w trybie poleceń, a następnie miejsce docelowe.\nWyprodukowane przez nią jednostki automatycznie się tam przemieszczą.
+gz.mine = Przemieść się w pobliże \uf8c4 [accent]rudy miedzi[] na ziemi i kliknij, aby zacząć kopać.
+gz.mine.mobile = Przemieść się w pobliże \uf8c4 [accent]rudy miedzi[] na ziemi i dotknij, aby zacząć kopać.
+gz.research = Otwórz \ue875 drzewko technologiczne.\nZbadaj \uf870 [accent]Mechaniczne Wiertło[], Następnie wybierz je z menu w prawym dolnym rogu.\nKliknij na złoże miedzi, aby postawić na nim wiertło.
+gz.research.mobile = Otwórz \ue875 drzewko technologiczne.\nZbadaj \uf870 [accent]Mechaniczne Wiertło[], Następnie wybierz je z menu w prawym dolnym rogu.\nDotknij złoża miedzi aby postawić na nim wiertło.\n\nKliknij w \ue800 [accent]fajkę[] u dołu ekranu z prawej aby potwierdzić.
+gz.conveyors = Zbadaj i postaw \uf896 [accent]przenośniki[], aby przemieścić wykopane surowce\nz wierteł do rdzenia.\n\nNaciśnij i przeciągnij aby postawic wiele przenośników naraz.\n[accent]Użyj kółka myszki[], żeby obrócić.
+gz.conveyors.mobile = Zbadaj i postaw \uf896 [accent]przenośniki[], aby przemieścić wykopane surowce\nz wierteł do rdzenia.\n\nPrzytrzymaj przez sekundę i przeciągnij żeby postawić wiele przenośników naraz.
+gz.drills = Kontynuuj kopanie.\nStawiaj więcej Mechanicznych Wierteł.\nWydobądź 100 miedzi.
+gz.lead = \uf837 [accent]Ołów[] jest kolejnym często używanym surowcem.\nPostaw wiertła kopiące ołów.
+gz.moveup = \ue804 Przejdź do dalszych celów.
+gz.turrets = Zbadaj i postaw 2 \uf861 [accent]Podwójne Działka[] do obrony rdzenia.\nPodwójne działka wymagają \uf838 [accent]amunicji[] z przenośników.
+gz.duoammo = Dostarcz [accent]miedź[], do podwójnych działek przy użyciu przenośników.
+gz.walls = [accent]Mury[] mogą zapobiec uszkodzeniu budynków.\nPostaw \uf8ae [accent]miedziane mury[] wokół działek.
+gz.defend = Nadchodzi wróg, przygotuj się do obrony.
+gz.aa = Latające jednostki trudno zestrzelić standardowymi działkami.\n\uf860 [accent]Flaki[] zapewniają świetną powietrzną obronę, ale używają \uf837 [accent]ołowiu[] jako amunicji.
+gz.scatterammo = Dostarcz [accent]ołowiu[]do Flaka używając przenośników.
+gz.supplyturret = [accent]Załaduj Działko
+gz.zone1 = To jest strefa zrzutu wroga.
+gz.zone2 = Wszytko co jest zbudowane w promieniu strefy zrzutu zostaje zniszczone z poczÄ…tkiem fali.
+gz.zone3 = Teraz zacznie siÄ™ fala.\nPrzygotuj siÄ™.
+gz.finish = Wybuduj więcej działek, wykop więcej surowców\ni obroń się przed wszystkimi falami żeby [accent]przejąć sektor[].
+onset.mine = Naćiśnij żeby wydobywać \uf748 [accent]beryl[] ze ścian.\n\nUżyj [accent][[WASD] aby się poruszać.
+onset.mine.mobile = Kliknij żeby wydobywać \uf748 [accent]beryl[] ze ścian.
+onset.research = Otwórz\ue875 drzewo technologiczne.\nZbadaj, a następnie postaw \uf73e [accent]turbinę parową[] na gejzerze.\nTo zacznie generować [accent]prąd[].
+onset.bore = Zbadaj i postaw \uf741 [accent]plazmowe wiertło[].\nPlazmowe wiertło automatycznie wydobywa surowce ze ścian.
+onset.power = Żeby [accent]zasilić[] plazmowe wiertło, zbadaj i postaw \uf73d [accent]węzeł promieni[].\nPołącz turbinę parową z wiertłem plazmowym.
+onset.ducts = Zbadaj i postaw \uf799 [accent]rury próżniowe[], żeby móc przemieścić surowce z wiertła plazmowego do rdzenia.\nKliknij i przeciągnij żeby postawić wiele rur próżniowych naraz.\n[accent]Użyj kółka myszki[] aby obrócić.
+onset.ducts.mobile = Zbadaj i postaw \uf799 [accent]rury próżniowe[], żeby móc przemieścić surowce z wiertła plazmowego do rdzenia.\n\nPrzytrzymaj sekundę i przeciągnij, aby postawic wiele rur próżniowych naraz.
+onset.moremine = Kontynuuj kopanie.\nStawiaj więcej Wierteł Plazmowych i używaj węzłów promieni oraz rur próżniowych.\nWykop 200 berylu.
+onset.graphite = Bardziej skomplikowane bloki wymagają \uf835 [accent]grafitu[].\nUstaw wiertła plazmowe tak, żeby wydobywały grafit.
+onset.research2 = Zacznij badać [accent]fabryki[].\nZbadaj \uf74d [accent]rozkruszacz klifów[] i \uf779 [accent]krzemowy piec łukowy[].
+onset.arcfurnace = Krzemowy piec łukowy potrzebuje \uf834 [accent]piasku[] i \uf835 [accent]grafitu[], żeby produkować \uf82f [accent]krzem[].\n[accent]Prąt[] także jest potrzebny.
+onset.crusher = Użyj \uf74d [accent]rozkuruszaczy klifów[], aby wydobyć piasek.
+onset.fabricator = Używaj [accent]jednostek[], żeby eksplorować mapę, bron budynki i atakuj wrogów. Zbadaj i postaw \uf6a2 [accent]fabrykę czołgów[].
+onset.makeunit = Wyprodkuj jednostkę.\nUżyj przycisku "?", żeby zobaczyć wymagania potrzebne do wybudowania obecnie wybranej fabryki.
+onset.turrets = Jednostki są efektywne, ale [accent]działka[] zapewniają lepszą efektywność jeśli chodzi o obronę.\nPostaw \uf6eb [accent]Wyłom[].\nDziałka potrzebują \uf748 [accent]amuncji[].
+onset.turretammo = Dostarcz [accent]beryl[] do działka.
+onset.walls = [accent]Mury[] chronią budynki przed obrażeniami.\nPostaw parę \uf6ee [accent]berylowych murów[] naokoło działka.
+onset.enemies = Nadchodzi wróg, przygotuj obronę.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = Wróg jest wrażliwy na atak. Przeprowadź kontratak.
+onset.cores = Nowe rdzenie mogą być postawione tylko w [accent]strefach rdzenia[].\nNowy rdzeń działa tak samo jak każdy poprzedni. Rdzenie współdzielą surowce.\nPostaw nowy \uf725 rdzeń.
+onset.detect = Wróg wykryje cię za 2 minuty.\nPrzygotuj obronę, wydobywaj surowce i je produkuj.
+onset.commandmode = Przytrzymaj [accent]shift[] aby wejść do [accent]trybu poleceń[].\n[accent]Kliknij lewy przycisk myszy i przeciągnij[] aby wybrac jednostki.\n[accent]Kliknij prawy przycisk myszy[] aby rozkazać jednostkom się przemieścić lub zaatakować.
+onset.commandmode.mobile = Naciśnij [accent]przycisk poleceń[] aby wejść do [accent]trybu poleceń[].\nPrzytrzymaj palec, a następnie [accent]przeciągnij[] aby zaznaczyć jednostki.\n[accent]Kliknij[] aby rozkazać jednostkom się przemieścić lub zaatakować.
+aegis.tungsten = Wolfram może być wykopany używając [accent]wiertła udeżeniowego[].\nTa struktura wymaga [accent]wody[] i [accent]zasilania[].
+split.pickup = Niektóre bloki mogą zostać podniesione przez jednostkę rdzeniową.\nPodnieś ten [accent]kontener[] i postaw go w [accent]punkcie załadunkowym[].\n(Domyślne klawisze to [ i ], użyj ich, żeby podnieść lub upuścić blok.)
+split.pickup.mobile = iektóre bloki mogą zostać podniesione przez jednostkę rdzeniową.\nPodnieś ten [accent]kontener[] i postaw go w [accent]punkcie załadunkowym[].\n(Żeby podnieść lub upuścić jakiś blok, przytrzymaj go przez chwilę.)
+split.acquire = Żeby wybudować jednostki musisz pozyskać trochę wolframu.
+split.build = Jednostki trzeba przetransportować na drugą stronę.\nPosaw dwie [accent]Katapulty �adunku[] po każdej ze stron.\nPołącz je klikając najpierw jedną, a nastepnie drugą.
+split.container = Podobnie jak kontenery jednostki także da się transportować przy użyciu [accent]Katapult �adunku[].\nPostaw fabrykę jednostek w taki sposób, żeby dotykała katapulty masy i była w nią skierowana.\n Wyślij jednostki na drugą stronę i zaatakuj bazę wroga.
 
-item.copper.description = Przydatny materiał budowlany. Szeroko używany w prawie każdej konstrukcji.
-item.copper.details = Miedź. Nienormalnie obfity metal na Serpulo. Strukturalnie słaba, chyba że zostanie wzmocniona.
-item.lead.description = Podstawowy materiał. Używany w przesyle przemiotów i płynów. Nie jest on przypadkiem szkodliwy?
-item.lead.details = Gęsty. Obojętny. Intensywnie używany w bateriach. \nUwaga: prawdopodobnie toksyczny dla biologicznych form życia. Nie żeby zostało tu wiele.
-item.metaglass.description = Wyjątkowo wytrzymały stop szkła. Szeroko używany w transporcie i przechowywaniu płynów.
-item.graphite.description = Zmineralizowany węgiel, wykorzystywany do amunicji i izolacji elektrycznej.
-item.sand.description = Zwykły materiał używany pospolicie w przepalaniu, stopach i jako topnik. Dostanie piaskiem po oczach nie jest przyjemne.
+item.copper.description = Używany we wszystkich rodzajach budowli i uzbrojeń.
+item.copper.details = Miedź. Niesamowicie obfity metal na Serpulo. Strukturalnie słaby, chyba że zostanie wzmocniony.
+item.lead.description = Używany w transporcie płynów i strukturach elektrycznych.
+item.lead.details = Gęsty, obojętny metal używany w bateriach oraz amunicji fragmentacyjnej.\n\n[lightgray]Uwaga: Prawdopodobnie toksyczny dla biologicznych form życia. Nie, żeby zostało ich tu wiele...[]
+item.metaglass.description = Używane w transporcie i przechowywaniu płynów.
+item.graphite.description = Wykorzystywany w urzÄ…dzeniach elektrycznych oraz amunicji.
+item.sand.description = Zwykły materiał używany pospolicie w przepalaniu, stopach i jako topnik.\n\n[lightgray]Uwaga: Dostanie piaskiem po oczach nie jest przyjemne.[]
 item.coal.description = Zwykły i łatwo dostępny materiał energetyczny. Używany powszechnie jako paliwo oraz w produkcji surowców.
 item.coal.details = Wygląda na skamieniałą materię roślinną, uformowaną na długo przed siewem.
-item.titanium.description = Rzadki i bardzo lekki materiał. Używany w bardzo zaawansowanym przewodnictwie, wiertłach i samolotach. Poczuj się jak Tytan!
-item.thorium.description = Zwarty i radioaktywny materiał używany w strukturach i paliwie nuklearnym. Nie trzymaj go w rękach!
-item.scrap.description = Pozostałości starych budynków i jednostek. Składa się z małej ilości wszystkiego.
-item.scrap.details = Pozostałości po jednostkach oraz strukturach.
-item.silicon.description = Niesamowicie przydatny półprzewodnik. Używany w panelach słonecznych, skomplikowanej elektronice i pociskach samonaprowadzających.
+item.titanium.description = Używany w transporcie cieczy, wydobyciu, strukturach obronnych i produkcyjnych.\n\n[lightgray]Głównie wydobywany jako dwutlenek, choć nadal użyteczny.[]
+item.thorium.description = Używany w budowie wytrzymałych struktur obronnych i przemyśle jądrowym.\n\n[lightgray]Złoża monacytów z tego systemu są bardzo czyste.[]
+item.scrap.description = Używany w Przetapiaczach i Rozkruszaczach w celu rafinacji na przydatne materiały.
+item.scrap.details = Pozostałości po jednostkach oraz strukturach. Mieszanka wielu surowców. Podobno można z niego zrobić każdy inny surowiec.
+item.silicon.description = Używany praktycznie wszędzie, od amunicji samonaprowadzającej przez elektronikę aż po konstrukcję jednostek i broni.
 item.plastanium.description = Lekki i plastyczny materiał używany w amunicji odłamkowej i samolotach.
-item.phase-fabric.description = Niewiarygodnie lekkie włókno używane w zaawansowanej elektronice i technologii samo-naprawiającej
-item.surge-alloy.description = Zaawansowany materiał z niesłychanymi wartościami energetycznymi.
-item.spore-pod.description = Syntetyczne zarodniki, które mogą być przekształcone na olej, materiały wybuchowe i paliwo.
-item.spore-pod.details = Zarodniki. Prawdopodobnie syntetyczna forma życia. Emitują gazy toksyczne dla innych organizmów biologicznych. Wyjątkowo inwazyjne. W pewnych warunkach wysoce łatwopalny.
-item.blast-compound.description = Niestabilny związek używany w materiałach wybuchowych. Powstaje podczas syntezy z zarodników i innych lotnych substancji. Używanie go jako materiał energetyczny jest niewskazane.
-item.pyratite.description = Niesamowicie palny związek używany w zbrojeniu. Nielegalny w 9 państwach.
+item.phase-fabric.description = Używane w zaawansowanej elektronice, strukturach przyspieszających i samonaprawiających.\n\n[lightgray]Niesamowicie lekkie włókna torowo-kwarcowe.[]
+item.surge-alloy.description = Niesamowicie ciężki stop używany w najsilniejszym uzbrojeniu oraz reaktywnych strukturach obronnych.
+item.spore-pod.description = Syntetyczne zarodniki, które mogą być przekształcone na ropę, materiały wybuchowe i paliwo.
+item.spore-pod.details = Prawdopodobnie syntetyczna forma życia.\nUwaga: Emitują gazy toksyczne dla innych organizmów biologicznych. Wyjątkowo inwazyjne. W pewnych warunkach silnie łatwopalne.
+item.blast-compound.description = Używany w bombach i amunicji wybuchowej.\n\n[lightgray]Uwaga: Powstaje podczas syntezy z zarodników i innych lotnych substancji. Używanie go jako materiał energetyczny jest niezalecane.[]
+item.pyratite.description = Używany w broniach zapalających oraz generatorach spalinowych.\n\n[lightgray]Uwaga: Ołów w nim zawarty może zatruwać atmosferę.[]
+item.beryllium.description = Używany jako materiał budowlany oraz amunicja na Erekirze.
+item.tungsten.description = Używany w wiertłach i infrastrukturze wojennej. Jest konieczny do budowy bardziej zaawansowanej infrastruktury.
+item.oxide.description = Używany jako przewodnik ciepła i izolator mocy.
+item.carbide.description = Używany w zaawansowanych strukturach, ciężkich jednostkach oraz jako amunicja.
 
 liquid.water.description = Powszechnie używana do schładzania budowli i przetwarzania odpadów.
-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.
+liquid.slag.description = Wiele różnych metali stopionych i zmieszanych razem.\n\nMoże zostać rozdzielony na jego metale składowe lub wystrzelony we wrogie jednostki.
+liquid.oil.description = Używany w do produkcji złożonych materiałów.\n\nMoże zostać przetworzony na węgiel lub wystrzelony we wrogów przez wieżyczkę.
+liquid.cryofluid.description = Obojętna, niekorozyjna ciecz utworzona z wody i tytanu.\n\nUżywana jako chłodziwo w reaktorach, rekonstruktorach i wieżyczkach.
+liquid.arkycite.description = Stosowany w reakcjach chemicznych. Używany do wytwarzania energii i syntezy materiałów.
+liquid.ozone.description = Stosowany jako utleniacz w produkcji materiałów oraz jako paliwo. Średnio wybuchowy.
+liquid.hydrogen.description = Używany do wydobywania surowców, produkcji jednostek oraz dp naprawy struktur. �atwopalny.
+liquid.cyanogen.description = Używany jako amunicja oraz materiał do produkcji zaawansowanych jednostek czy też jako składnik różnych reakcji w zaawansowanych strukturach. Bardzo łatwopalny.
+liquid.nitrogen.description = Używany do wydobycia surowców, tworzenia gazów oraz produkcji jednostek. Obojętny.
+liquid.neoplasm.description = Niebezpieczny biologiczny odpad powstający poprzez działanie reaktora neoplazmowego. �atwo się rozprzestrzenia na bloki zawierające wodę niszcząc je. Lepki.
+liquid.neoplasm.details = Neoplazma. Niekontrolowana masa szybko dzielących się komórek syntetycznych o konsystencji szlamu. Odporna na ciepło. Niesamowicie niebezpieczna dla wszelkich struktur zawierających wodę.\n\nZbyt skomplikowana i niestabilna do standardowej analizy. Potencjalne zastosowania, póki co nieznane. Zaleca się spalanie w jeziorach żużlowych.
 
-block.resupply-point.description = Wypełnia pobliskie jednostki amunicją z miedzi. Nie jest kompatybilny z jednostkami, które wykorzystują energię z baterii.
-block.armored-conveyor.description = Przesyła przedmioty z taką samą szybkością jak Przenośnik Tytanowy, ale jest bardziej odporny. Wejściami bocznymi mogą być tylko inne przenośniki.
-block.illuminator.description = Małe, kompaktowe i konfigurowane źródło światła. Wymaga energii do funkcjonowania.
+block.derelict = \uf77e [lightgray]Wrak
+block.armored-conveyor.description = Przesyła przedmioty z taką samą szybkością co Tytanowy Przenośnik, ale jest bardziej odporny. Wejściami bocznymi mogą być tylko inne przenośniki.
+block.illuminator.description = Małe, kompaktowe i konfigurowalne źródło światła. Wymaga energii do funkcjonowania.
 block.message.description = Przechowuje wiadomość. Wykorzystywane do komunikacji pomiędzy sojusznikami.
+block.reinforced-message.description = Przechowuje wiadomość. Wykorzystywane do komunikacji pomiędzy sojusznikami.
+block.world-message.description = Wiadomość używana przez twórców map. Niezniszczalna.
 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.
+block.multi-press.description = Ulepszona wersja prasy grafitowej. Dodanie wody wytwarza grafit znacznie szybciej i efektywniej.
 block.silicon-smelter.description = Redukuje piasek za pomocą wysoce czystego węgla w celu wytworzenia krzemu.
-block.kiln.description = Stapia ołów i piasek na metaszkło. Wymaga małej ilości energii.
-block.plastanium-compressor.description = Wytwarza plastan z oleju i tytanu.
-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.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.kiln.description = Przetapia ołów i piasek na metaszkło.
+block.plastanium-compressor.description = Kompresuje ropÄ™ i tytan w wysoce rozciÄ…gliwy plastan.
+block.phase-weaver.description = Produkuje włókna fazowe z radioaktywnego toru i dużych ilości piasku.
+block.surge-smelter.description = Produkuje Elektrum z tytanu, ołowiu, krzemu i miedzi.
+block.cryofluid-mixer.description = �ączy wodę i tytan w lodociecz, która jest znacznie bardziej wydajna w chłodzeniu niż woda.
+block.blast-mixer.description = Kruszy i miesza skupiska zarodników z piratianem, tworząc wybuchowy związek.
 block.pyratite-mixer.description = Miesza węgiel, ołów i piasek tworząc bardzo łatwopalny piratian.
-block.melter.description = Przetapia złom na żużel do dalszego przetwarzania lub użycia w wieżyczkach
-block.separator.description = Oddziela użyteczne materiały z mieszaniny jaką jest żużel.
+block.melter.description = Przetapia złom na żużel do dalszego przetwarzania lub użycia w wieżyczkach.
+block.separator.description = Oddziela użyteczne materiały z mieszaniny, jaką jest żużel.
 block.spore-press.description = Kompresuje kapsuły zarodników pod ogromnym ciśnieniem tworząc olej.
 block.pulverizer.description = Mieli złom w drobny piasek. Przydatne, gdy brakuje naturalnego piasku.
-block.coal-centrifuge.description = Zestala olej w kawałki węgla.
-block.incinerator.description = Pozbywa się nadmiaru przedmiotów lub płynu
-block.power-void.description = Niszczy całą energię wprowadzoną do tego bloku. Dostępny tylko w trybie sandbox.
-block.power-source.description = Wydziela prąd w nieskończoność. Dostępny tylko w trybie sandbox.
-block.item-source.description = Wydziela przedmioty w nieskończoność. Dostępny tylko w trybie sandbox.
-block.item-void.description = Niszczy wszystkie przedmioty, które idą do tego bloku, który nie wymaga prądu. Dostępny tylko w trybie sandbox.
-block.liquid-source.description = Wydziela ciecz w nieskończoność. Dostępny tylko w trybie sandbox.
-block.liquid-void.description = Usuwa każdą ciecz. Dostępny tylko w trybie sandbox.
+block.coal-centrifuge.description = Zestala ropę w kawałki węgla.
+block.incinerator.description = Pozbywa się nadmiaru przedmiotów lub płynu.
+block.power-void.description = Niszczy całą energię wprowadzoną do tego bloku. Dostępny tylko w trybie piaskownicy.
+block.power-source.description = Wydziela prąd w nieskończoność. Dostępny tylko w trybie piaskownicy.
+block.item-source.description = Wydziela przedmioty w nieskończoność. Dostępny tylko w trybie piaskownicy.
+block.item-void.description = Niszczy wszystkie przedmioty, które do niego wchodzą. Nie wymaga prądu. Dostępny tylko w trybie piaskownicy.
+block.liquid-source.description = Wydziela ciecz w nieskończoność. Dostępny tylko w trybie piaskownicy.
+block.liquid-void.description = Usuwa każdą ciecz. Dostępny tylko w trybie piaskownicy.
+block.payload-source.description = Nieskończenie wyprowadza ładunki. Dostępny tylko w trybie piaskownicy.
+block.payload-void.description = Niszczy przychodzący ładunek. Dostępny tylko w trybie piaskownicy.
 block.copper-wall.description = Tani blok obronny.\nPrzydatny do ochrony rdzenia i wieżyczek w pierwszych kilku falach.
 block.copper-wall-large.description = Tani blok obronny.\nPrzydatny do ochrony rdzenia i wieżyczek w pierwszych kilku falach.\nObejmuje wiele kratek.
 block.titanium-wall.description = Umiarkowanie silny blok obronny.\nZapewnia umiarkowanÄ… ochronÄ™ przed wrogami.
 block.titanium-wall-large.description = Umiarkowanie silny blok obronny.\nZapewnia umiarkowanÄ… ochronÄ™ przed wrogami.\nObejmuje wiele kratek.
-block.plastanium-wall.description = Specjajny typ ściany, który pochłania łuki elektryczne oraz blokuje automatyczne łączenie węzłów.
-block.plastanium-wall-large.description = Specjajny typ ściany, który pochłania łuki elektryczne oraz blokuje automatyczne łączenie węzłów.\nObejmuje wiele kratek.
+block.plastanium-wall.description = Specjalny typ muru, który pochłania łuki elektryczne oraz blokuje automatyczne łączenie węzłów.
+block.plastanium-wall-large.description = Specjalny typ muru, który pochłania łuki elektryczne oraz blokuje automatyczne łączenie węzłów.\nObejmuje wiele kratek.
 block.thorium-wall.description = Silny blok obronny.\nDobra ochrona przed wrogami.
 block.thorium-wall-large.description = Silny blok obronny.\nDobra ochrona przed wrogami.\nObejmuje wiele kratek.
-block.phase-wall.description = Ściana pokryta specjalną mieszanką opartą o Włókna Fazowe, która odbija większość pocisków.
-block.phase-wall-large.description = Ściana pokryta specjalną mieszanką opartą o Włókna Fazowe, która odbija większość pocisków.\nObejmuje wiele kratek.
+block.phase-wall.description = Mur pokryty specjalną mieszanką opartą o Włókna Fazowe, która odbija większość pocisków.
+block.phase-wall-large.description = Mur pokryty specjalną mieszanką opartą o Włókna Fazowe, która odbija większość pocisków.\nObejmuje wiele kratek.
 block.surge-wall.description = Ekstremalnie wytrzymały blok obronny.\nMa niewielką szansę na wywołanie błyskawicy w kierunku atakującego.
 block.surge-wall-large.description = Ekstremalnie wytrzymały blok obronny.\nMa niewielką szansę na wywołanie błyskawicy w kierunku atakującego.\nObejmuje wiele kratek.
-block.door.description = Małe drzwi, które można otwierać i zamykać, klikając na nie.\nJeśli są otwarte, wrogowie mogą strzelać i się przemieszczać przez nie.
-block.door-large.description = Duże drzwi, które można otwierać i zamykać, klikając na nie.\nJeśli są otwarte, wrogowie mogą strzelać i się przemieszczać przez nie.\nObejmuje wiele kratek.
-block.mender.description = Co jakiś czas naprawia bloki w zasięgu. Utrzymuje struktury obronne w dobrym stanie.\nOpcjonalnie używa silikonu do zwiększenia zasięgu i szybkości naprawy.
-block.mend-projector.description = Ulepszona wersja Naprawiacza. Naprawia bloki w jego otoczeniu.\nMoże wykorzystywać włókno fazowe, aby zwiększyć efektywność budowli.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Małe drzwi, które można otwierać i zamykać, klikając na nie.\nJeśli są otwarte, wrogowie mogą przez nie strzelać oraz nimi przechodzić.
+block.door-large.description = Duże drzwi, które można otwierać i zamykać, klikając na nie.\nJeśli są otwarte, wrogowie mogą przez nie strzelać oraz nimi przechodzić.\nObejmują wiele kratek.
+block.mender.description = Co jakiś czas naprawia bloki w zasięgu. Utrzymuje struktury obronne w dobrym stanie.\nOpcjonalnie używa krzemu do zwiększenia zasięgu i szybkości naprawy.
+block.mend-projector.description = Ulepszona wersja Naprawiacza. Naprawia bloki w jego otoczeniu.\nMoże wykorzystywać włókno fazowe, aby zwiększyć efektywność napraw.
 block.overdrive-projector.description = Zwiększa szybkość budynków w zasięgu takich jak wiertła czy przenośniki. Może wykorzystywać włókno fazowe, aby zwiększyć zasięg i efektywność budowli.
 block.force-projector.description = Wytwarza pole siłowe w kształcie sześciokąta wokół siebie, chroniąc budynki i jednostki wewnątrz od obrażeń zadanych przez pociski.
-block.shock-mine.description = Zadaje obrażenia jednostkom wroga którzy na nią wejdą. Ledwo widoczne dla wrogów.
+block.shock-mine.description = Zadaje obrażenia jednostkom wroga, które wejdą na nią. 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 = 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.plastanium-conveyor.description = Przenosi przedmioty 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.
 block.sorter.description = Sortuje przedmioty. Jeśli przedmiot pasuje to przechodzi dalej, jeśli nie - to przechodzi na boki.
 block.inverted-sorter.description = Sortuje przedmioty jak zwykły sortownik, ale odpowiednie surowce wyciągane są na boki.
-block.router.description = Akceptuje przedmioty z jednego miejsca i rozdziela je do trzech innych kierunków. Przydatne w rozdzielaniu materiałów z jednego źródła do wielu celów.\n\n[scarlet]Nigdy nie używaj przy punkcje wejścia materiałów produkcyjnych, ponieważ zostaną one zatkane przez materiały wyjściowe.[]
-block.router.details = Konieczne zło. Nie zaleca się stosowania obok nakładów produkcyjnych, ponieważ zostaną one zatkane.
-block.distributor.description = Zaawansowany rozdzielacz, rozdzielający przedmioty do 7 innych kierunków.
+block.router.description = Przyjmuje przedmioty z jednej strony i równo je dystrybuuje na przylegające przenośniki. \n\n[scarlet]Nigdy nie używaj przy wejściu materiałów produkcyjnych, ponieważ zostaną one zatkane przez materiały wyjściowe.[]\n[scarlet]Cześć mu i chwała na wieki!
+block.router.details = Nieuniknione zło. Nie zaleca się stosowania obok zakładów produkcyjnych, ponieważ zostaną one zatkane.
+block.distributor.description = Zaawansowany rozdzielacz, który jest w stanie dystrybuuować przedmioty na więc
 block.overflow-gate.description = Rozdzielacz, który przerzuca przedmioty, kiedy główna droga jest przepełniona.
-block.underflow-gate.description = Odwrotność bramy przepełnieniowej, który przepuszcza przedmioty główną drogą, gdy boczne drogi są przepełnione.
-block.mass-driver.description = Najlepszy blok do transportu przedmiotów. Zbiera wiele przedmiotów naraz a potem wystrzeliwuje je do kolejnej katapulty masy na bardzo duże odległości.
+block.underflow-gate.description = Odwrotność bramy przepełnieniowej, która przepuszcza przedmioty główną drogą, gdy boczne drogi są przepełnione.
+block.mass-driver.description = Najlepszy blok do transportu przedmiotów. Zbiera wiele przedmiotów naraz, a potem wystrzeliwuje je do kolejnej katapulty masy na bardzo duże odległości.
 block.mechanical-pump.description = Tania pompa o niskiej wydajności. Nie wymaga prądu.
 block.rotary-pump.description = Zaawansowana pompa. Pompuje więcej cieczy, ale wymaga zasilania.
-block.thermal-pump.description = Najlepsza pompa. Pompuje ogromne ilości cieczy, ale wymaga zasilaina.
+block.impulse-pump.description = Najlepsza pompa. Pompuje ogromne ilości cieczy, ale wymaga zasilania.
 block.conduit.description = Podstawowy blok do transportowania cieczy. Używany w połączeniu z pompami i innymi rurami.
 block.pulse-conduit.description = Zaawansowany blok do transportowania cieczy. Transportuje je szybciej i magazynuje więcej niż standardowe rury.
 block.plated-conduit.description = Przesyła ciecze z taką samą szybkością co rura tytanowa, ale jest bardziej odporna. Wejściami bocznymi mogą być tylko inne rury.\nWycieka z niej mniej cieczy.
 block.liquid-router.description = Akceptuje płyny z jednego kierunku i wyprowadza je po równo do trzech innych kierunków. Może również przechowywać pewną ilość płynu. Przydatne do dzielenia płynów z jednego źródła do wielu celów.
+block.liquid-container.description = Przechowuje średnią ilość płynu. Posiada wyjścia na wszystkie strony, podobnie jak w przypadku rozdzielacza płynów.
 block.liquid-tank.description = Magazynuje duże ilości cieczy. Użyj go do stworzenia buforu, gdy występuje różne zapotrzebowanie na materiały lub jako zabezpieczenie dla chłodzenia ważnych bloków.
 block.liquid-junction.description = Działa jak most dla dwóch krzyżujących się rur. Przydatne w sytuacjach, kiedy dwie rury mają różne ciecze do różnych lokacji.
 block.bridge-conduit.description = Zaawansowany blok przenoszący ciecze. Pozwala na przenoszenie cieczy nawet do 3 bloków na każdym terenie, przez każdy budynek.
@@ -1404,15 +2168,15 @@ block.differential-generator.description = Generuje duże ilości prądu. Wykorz
 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ą.
 block.solar-panel-large.description = Wytwarza o wiele więcej prądu niż zwykły panel słoneczny.
-block.thorium-reactor.description = Produkuje bardzo duże ilości prądu z wysoce radioaktywnego toru. Wymaga ciągłego chłodzenia. Silnie eksploduje jeśli nie zostanie dostarczona wystarczająca ilość chłodziwa. Produkcja energii zależy od zapełnienia, produkując bazową ilość energii przy całkowitym zapełnieniu.
+block.thorium-reactor.description = Produkuje bardzo duże ilości prądu z wysoce radioaktywnego toru. Wymaga ciągłego chłodzenia. Silnie eksploduje, jeśli nie zostanie dostarczona wystarczająca ilość chłodziwa. Produkcja energii zależy od zapełnienia, produkując bazową ilość energii przy całkowitym zapełnieniu.
 block.impact-reactor.description = Zaawansowany generator, zdolny do produkcji ogromnych ilości prądu u szczytu swoich możliwości. Wymaga znacznych ilości energii do rozpoczęcia procesu.
 block.mechanical-drill.description = Tanie wiertło. Kiedy zostanie zbudowane na odpowiednich polach, wydobywa surowce w wolnym tempie. Może wydobywać tylko podstawowe rudy.
 block.pneumatic-drill.description = Ulepszone wiertło, zdolne do wydobywania tytanu. Wydobywa w szybszym tempie niż wiertło mechaniczne.
 block.laser-drill.description = Pozwala kopać jeszcze szybciej poprzez technologię laserową, ale wymaga energii. Zdolne do wydobywania toru.
 block.blast-drill.description = Najlepsze wiertło. Wymaga dużych ilości energii.
 block.water-extractor.description = Wydobywa wodę z ziemi. Użyj go, gdy w pobliżu brakuje wody.
-block.cultivator.description = Uprawia małe skupiska zarodników i umieszcza je w gotowych do dalszego przetwarzania kapsułach.
-block.cultivator.details = Odzyskana technologia. Służy do jak najbardziej wydajnej produkcji ogromnych ilości biomasy. Prawdopodobnie początkowy inkubator zarodników pokrywający teraz Serpulo.
+block.cultivator.description = Hoduje zarodniki i umieszcza je w gotowych do dalszego przetwarzania kapsułach.
+block.cultivator.details = Odzyskana technologia. Służy do jak najbardziej wydajnej produkcji ogromnych ilości biomasy. Prawdopodobnie początkowy inkubator zarodników pokrywających teraz Serpulo.
 block.oil-extractor.description = Używa bardzo dużych ilości energii do ekstrakcji ropy z piasku. Używaj go w sytuacji kiedy nie ma bezpośredniego źródła ropy w okolicy.
 block.core-shard.description = Pierwsza wersja rdzenia. Gdy zostaje zniszczony, wszelki kontakt do regionu zostaje utracony. Nie pozwól na to.
 block.core-shard.details = Pierwsza generacja. Kompaktowy. Samoreplikuje się. Wyposażony w jednorazowe silniki startowe. Nie jest przeznaczony do podróży międzyplanetarnych.
@@ -1420,82 +2184,482 @@ block.core-foundation.description = Druga wersja rdzenia. Lepiej opancerzony. Pr
 block.core-foundation.details = Druga generacja.
 block.core-nucleus.description = Trzecia i ostatnia wersja rdzenia. Bardzo dobrze opancerzony. Przechowuje ogromne ilości surowców.
 block.core-nucleus.details = Trzecia i ostatnia generacja.
-block.vault.description = Przechowuje duże ilości przedmiotów każdego rodzaju. Użyj ekstraktora, aby rozładować magazyn.
-block.container.description = Przechowuje małe ilości przedmiotów każdego rodzaju. Użyj ekstraktora, aby rozładować kontener.
+block.vault.description = Przechowuje duże ilości przedmiotów każdego rodzaju. Zawartość magazynu można wyciągnąć za pomocą ekstraktorów.
+block.container.description = Przechowuje małe ilości przedmiotów każdego rodzaju. Zawartość kontenera można wyciągnąć za pomocą ekstraktorów.
 block.unloader.description = Wyciąga przedmioty z przyległych bloków. Typ przedmiotu jaki zostanie wyciągniety może zostać zmieniony poprzez kliknięcie.
-block.launch-pad.description = Wysyła pakiety przedmiotów bez potrzeby wystrzeliwania rdżenia.
-block.duo.description = Mała, tania wieża. Przydatna przeciwko jednostkom naziemnym.
-block.scatter.description = Średniej wielkości wieża przeciwlotnicza. Rozsiewa śruty z ołowiu, złomu lub metaszkła na jednostki wroga.
-block.scorch.description = Spala wszystkich wrogów naziemnych w pobliżu. Bardzo skuteczny z bliskiej odległości.
-block.hail.description = Mała wieża artyleryjska o dużym zasięgu.
-block.wave.description = Średniej wielkości wieżyczka, która wystrzeliwuje strumienie cieczy. Automatycznie gasi ogień jeśli zasilana jest wodą.
-block.lancer.description = Średniej wielkości wieżyczka, która po naładowaniu, wystrzeliwuje silne wiązki energii.
-block.arc.description = Mała wieża bliskiego zasięgu. Wystrzeliwuje wiązki elektryczne w kierunku wroga.
-block.swarmer.description = Średniej wielkości wieżyczka, która wystrzeliwuje rakiety samonaprowadzające.
-block.salvo.description = Większa, bardziej zaawansowana wersja Podwójnego Działka, strzelająca szybkimi salwami.
-block.fuse.description = Duża wieża bliskiego zasięgu. Wystrzeliwuje trzy przeszywające wiązki w pobliskich wrogów.
-block.ripple.description = Duża wieża artyleryjska, która strzela jednocześnie kilkoma strzałami.
-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.foreshadow.description = Strzela potężnym pociskiem z daleka we wrogów.
+block.launch-pad.description = Wysyła pakiety przedmiotów bez potrzeby wystrzeliwania rdzenia.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = Standardowa wieżyczka obronna, strzelająca naprzemian pociskami w jednostki wroga.
+block.scatter.description = Rażąca wieża przeciwlotnicza, rozsiewająca śrut z ołowiu, złomu lub metaszkła w powietrzne jednostki wroga.
+block.scorch.description = Podpalająca wieżyczka obronna, szczególnie efektywna wobec grupek wrogów naziemnych.
+block.hail.description = Standardowa wieżyczka artyleryjska o dużym zasięgu, strzelająca we wrogów na ziemi.
+block.wave.description = Strumieniowa wieża obronna, która automatycznie gasi ogień jeśli zasilana jest wodą.
+block.lancer.description = Laserowa wieża szturmowa, która po naładowaniu, wystrzeliwuje silne wiązki energii w jednostki wroga na ziemi.
+block.arc.description = Elektryczna wieżyczka o dużej niedokładności, wystrzeliwująca łuki elektryczne w kierunku jednostek wroga na ziemi.
+block.swarmer.description = Rakietowa wieża artyleryjska, której pociski są zawsze samonaprowadzające.
+block.salvo.description = Standardowa wieża szturmowa, strzelająca szybkimi salwami pocisków we wrogów.
+block.fuse.description = Duża wieża obronna, wystrzeliwująca przeszywające wiązki we wrogie jednostki.
+block.ripple.description = Duża wieża artyleryjska, która strzela jednocześnie kilkoma pociskami posiadającymi różne efekty.
+block.cyclone.description = Duża wieża szturmowa, która strzela dużą ilością pocisków.
+block.spectre.description = Duże działo szturmowe, które strzela potężnymi pociskami przebijającymi pancerz wrogich jednostek.
+block.meltdown.description = Duże laserowe działo obronne, które strzela pojedynczą ciągłą podpalającą wiązką. Wymaga chłodzenia.
+block.foreshadow.description = Duże działo artyleryjskie, które strzela potężnym pociskiem z daleka w pojedyncze jednostki, najpierw eliminując te najsilniejsze.
 block.repair-point.description = Bez przerw naprawia najbliższą uszkodzoną jednostkę w jego zasięgu.
-block.segment.description = Uszkadza i niszczy wrogie pociskiski poza laserami.
-block.parallax.description = Wykorzystuje laser, który przyciąga do siebie wrogów, zadając im obrażenia.
-block.tsunami.description = Strzela wielkim strumieniem cieczy we wrogów. Automatycznie gasi ogień, gdy jest podłączony do wody.
+block.segment.description = Specjalna wieża obronna. Nie zadaje obrażeń, lecz niszczy wrogie pociski i rakiety. Nie niszczy laserów i łuków elektrycznych.
+block.parallax.description = Laserowa wieża przeciwlotnicza, która strzela ciągłym laserem w jednostki, przyciągając je do siebie.
+block.tsunami.description = Strumieniowe działo obronne, które automatycznie gasi ogień, gdy jest podłączone do wody.
 block.silicon-crucible.description = Oczyszcza krzem z węgla i piasku wykorzystując piratian. Bardziej efektywny w gorących miejscach.
-block.disassembler.description = Oddziela egzotyczne materiały z mieszaniny jaką jest żużel z małą efektywnością. Może wyprodukować tor.
-block.overdrive-dome.description =  Zwiększa szybkość budynków w zasięgu. Wymaga włókna fazowego oraz krzemu by działać.
+block.disassembler.description = Oddziela egzotyczne materiały z mieszaniny, jaką jest żużel. Nie jest zbyt efektywny. Może wyprodukować tor.
+block.overdrive-dome.description = Zwiększa szybkość budynków w zasięgu. Wymaga włókna fazowego oraz krzemu, by działać.
 block.payload-conveyor.description = Przenosi duże ładunki, takie jak jednostki z fabryk.
-block.payload-router.description = Dzieli wejście z przewoźnika masowego i dzieli je w 3 różne strony.
-block.command-center.description = Kontroluje zachowanie jednostek paroma różnymi komendami.
-block.ground-factory.description = Produkuje jednostki naziemne. Jednostki mogą być do razu wykorzystane lub przeniesone do rekonstrukota by je ulepszyć.
-block.air-factory.description = Produkuje jednostki powietrzne. Jednostki mogą być do razu wykorzystane lub przeniesone do rekonstrukota by je ulepszyć.
-block.naval-factory.description = Produkuje jednostki morskie. Jednostki mogą być do razu wykorzystane lub przeniesone do rekonstrukota by je ulepszyć.
+block.payload-router.description = Dzieli wejście z przenośnika masowego w 3 różne strony.
+block.ground-factory.description = Produkuje jednostki naziemne. Jednostki mogą być do razu wykorzystane lub przeniesione do rekonstruktora aby je ulepszyć.
+block.air-factory.description = Produkuje jednostki powietrzne. Jednostki mogą być do razu wykorzystane lub przeniesione do rekonstruktora aby je ulepszyć.
+block.naval-factory.description = Produkuje jednostki morskie. Jednostki mogą być do razu wykorzystane lub przeniesione do rekonstruktora aby je ulepszyć.
 block.additive-reconstructor.description = Ulepsza wsadzone jednostki do stopnia drugiego.
 block.multiplicative-reconstructor.description = Ulepsza wsadzone jednostki do stopnia trzeciego.
 block.exponential-reconstructor.description = Ulepsza wsadzone jednostki do stopnia czwartego.
-block.tetrative-reconstructor.description = Ulepsza wsadzone jednostki do stopnia piÄ…tego i ostatniego.
-block.switch.description = Jest Przełączalny. Stan jego może być odczytywany lub kontrolowany przez procesory.
+block.tetrative-reconstructor.description = Ulepsza wsadzone jednostki do piÄ…tego, ostatniego stopnia.
+block.switch.description = Jest przełączalny. Stan jego może być odczytywany lub kontrolowany przez procesory.
 block.micro-processor.description = Uruchamia sekwencję instrukcji logicznych w pętli. Może być wykorzystany do kontroli bloków lub jednostek.
-block.logic-processor.description = Uruchamia sekwencję instrukcji logicznych w pętli. Może być wykorzystany do kontroli bloków lub jednostek. Szybszy niż mikro procesor.
-block.hyper-processor.description = Uruchamia sekwencję instrukcji logicznych w pętli. Może być wykorzystany do kontroli bloków lub jednostek. Szybszy niż logiczny procesor.
-block.memory-cell.description = Przechowuje informacje dla procesora.
-block.memory-bank.description = Przechowuje informacje dla procesora. Duża pojemność.
+block.logic-processor.description = Uruchamia sekwencję instrukcji logicznych w pętli. Może być wykorzystany do kontroli bloków lub jednostek. Szybszy niż mikroprocesor.
+block.hyper-processor.description = Uruchamia sekwencję instrukcji logicznych w pętli. Może być wykorzystany do kontroli bloków lub jednostek. Szybszy niż procesor logiczny. Wymaga chłodzenia.
+block.memory-cell.description = Przechowuje dane dla procesora.
+block.memory-bank.description = Przechowuje dane dla procesora. Duża pojemność.
 block.logic-display.description = Wyświetla obraz z procesora.
 block.large-logic-display.description = Wyświetla obraz z procesora.
 block.interplanetary-accelerator.description = Masywna elektromagnetyczna wieża. Przyspiesza rdzeń do prędkości ucieczki by wylądować na innych planetach.
+block.repair-turret.description = Na bieżąco naprawia najbliższą uszkodzoną jednostkę w jej sąsiedztwie. Opcjonalnie akceptuje chłodziwo.
+block.core-bastion.description = Rdzeń bazy. Uzbrojony. Po zniszczeniu tracisz sektor.
+block.core-citadel.description = Rdzeń bazy. Bardzo dobrze uzbrojony. Składuje wiecej zasobów niż rdzeń Bastion.
+block.core-acropolis.description = Rdzeń bazy. Wyjątkowo dobrze uzbrojony. Składuje wiecej zasobów niż rdzeń Cytadela.
+block.breach.description = Strzela przebijającymi kulami z berylu bądź wolframu we wrogie cele.
+block.diffuse.description = Strzela serią pocisków na szerokim obszarze. Odpycha wrogie cele.
+block.sublimate.description = Pali wrogie cele ciągłym płomieniem. Przebija pancerz.
+block.titan.description = Wystrzeliwuje potężne pociski artyleryjskie w cele naziemne. Potrzebuje wodoru do działania.
+block.afflict.description = Strzela masywnÄ… fragmentacyjnÄ… kulÄ…. Wymaga podgrzewania.
+block.disperse.description = Celne i szybkostrzelne działo przeciwlotnicze.
+block.lustre.description = Strzela powolnym pojedynczym laserem we wrogie cele.
+block.scathe.description = Wystrzeliwuje potężną rakietę w cele naziemne na gigantyczne odległości.
+block.smite.description = Strzela salwami przebijających, uwalniających błyskawice pocisków.
+block.malign.description = Zasypuje przeciwników dziesiątkami pocisków naprowadzających mogących uwolnić lasery. Wymaga silnego ogrzewania.
+block.silicon-arc-furnace.description = Otrzymuje krzem z piasku i grafitu.
+block.oxidation-chamber.description = Spala beryl w ozonie uzyskując tlenek. Wytwarza ciepło jako produkt uboczny.
+block.electric-heater.description = Ogrzewa bloki naprzeciw, używając do tego sporych ilośći prądu.
+block.slag-heater.description = Ogrzewa bloki naprzeciw, używając do tego żużlu.
+block.phase-heater.description = Ogrzewa bloki naprzeciw, używając do tego włókna fazowego.
+block.heat-redirector.description = Przekazuje zebrane ciepło do bloku naprzeciw.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Rozprowadza zgromadzone ciepło w trzech różnych kierunkach.
+block.electrolyzer.description = Poddaje wodę elektrolizie, uzyskując wodór i ozon w postaci gazowej.
+block.atmospheric-concentrator.description = Koncentruje azot z atmosfery, używając do tego ciepła.
+block.surge-crucible.description = Odlewa stop elektrum z żużlu i krzemu pobierając ciepło. Dostarczając większe ilości ciepła można zwiększyć wydajność procesu.
+block.phase-synthesizer.description = Używa toru, piasku i ozonu do wytworzenia włókna fazowego, pobierając jednocześnie ciepło.
+block.carbide-crucible.description = Wytwarza karbid z grafitu i wolframu pobierając przy tym ciepło.
+block.cyanogen-synthesizer.description = Syntezuje cyjan z arkycytu i grafitu używając ciepła.
+block.slag-incinerator.description = Niszczy przedmioty bądź płyny używając żużlu. Niezalecane wprowadzanie gazów.
+block.vent-condenser.description = Skrapla parÄ™ wodnÄ… z gejzeru.
+block.plasma-bore.description = Wydobywa rudę znajdującą się na ścianach. Wymaga minimalnej ilości prądu. Ilość rudy wydobytej co cykl zależy od ilości bloków rudy naprzeciw wiertła.
+block.large-plasma-bore.description = Większe wiertło plazmowe. Wydobywa rudę znajdującą się na ścianach. Wymaga większej ilości prądu i dodatkowo wodoru, ale może wydobyć wolfram i tor. Ilość rudy wydobytej co cykl zależy od ilości bloków rudy naprzeciw wiertła.
+block.cliff-crusher.description = Kruszy ściany, uzyskując w ten sposób piasek. Wydajność zależy od rodzaju ściany. Wymaga prądu.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Kiedy stoi na rudzie, wydobywa surowce seriami. Wymaga prÄ…du i wody.
+block.eruption-drill.description = Ulepszona wersja wiertła wybuchowego. Zdolne do wydobycia toru. Potrzebuje wodoru do działania.
+block.reinforced-conduit.description = Służy do przemieszczania płynów i gazów. Od boku można podłączyć tylko inne rury.
+block.reinforced-liquid-router.description = Równo rozdziela płyn do wszystkich podłączonych rur.
+block.reinforced-liquid-tank.description = Przechowuje duże ilości płynów.
+block.reinforced-liquid-container.description = Przechowuje umiarkowane ilości płynów.
+block.reinforced-bridge-conduit.description = Transportuje płyny nad rozmaitymi przeszkodami.
+block.reinforced-pump.description = Pompuje płyny. Nie wymaga prądu, ale potrzebuje wodoru.
+block.beryllium-wall.description = Chroni budynki przed wrogimi pociskami.
+block.beryllium-wall-large.description = Chroni budynki przed wrogimi pociskami.
+block.tungsten-wall.description = Chroni budynki przed wrogimi pociskami.
+block.tungsten-wall-large.description = Chroni budynki przed wrogimi pociskami.
+block.carbide-wall.description = Chroni budynki przed wrogimi pociskami.
+block.carbide-wall-large.description = Chroni budynki przed wrogimi pociskami.
+block.reinforced-surge-wall.description = Chroni budynki przed wrogimi pociskami. Losowo uwalnia błyskawice
+block.reinforced-surge-wall-large.description = Chroni budynki przed wrogimi pociskami. Losowo uwalnia błyskawice
+block.shielded-wall.description = Chroni budynki przed wrogimi pociskami. Posiada tarczę, która może absorbować pociski. Przewodzi prąd.
+block.blast-door.description = AOtwierają się kiedy sojusznicze jednostki są w pobliżu. Nie można ich kontrolować ręcznie.
+block.duct.description = Transportuje przedmioty. Może przechować tylko jeden.
+block.armored-duct.description = Transportuje przedmioty. Może przechować tylko jeden. Od boku nie akceptuje innego wejścia niż rura.
+block.duct-router.description = Po równo rozdziela przedmioty w trzech kierunkach. Akceptuje wprowadzenie przedmiotów tylko od tyłu. Może zostać ustawiony jako sortownik.
+block.overflow-duct.description = Odprowadza przedmioty na boki, kiedy droga z przodu jest zapełniona.
+block.duct-bridge.description = Transportuje przedmioty nad różnymi przeszkodami.
+block.duct-unloader.description = Rozładowuje wybrany przedmiot z bloku z tyłu. Nie może wyjmować przedmiotów ze rdzenia.
+block.underflow-duct.description = Odwrotność przepełnieniowej rury próżniowej. Przepuszcza przedmioty do przodu tylko wtedy, gdy boczne wyjścia są zapełnione.
+block.reinforced-liquid-junction.description = Pozwala na przecięcie się dwóch rur, bez mieszania ich zawartości.
+block.surge-conveyor.description = Przenosi przedmioty partiami. Może być przyspieszony przy użyciu prądu. Przewodzi prąd.
+block.surge-router.description = Równomiernie rozdziela przedmioty w trzy różne strony. Montowany na elektrumowych przenośnikach. Może być przyspieszony przy użyciu prądu. Przewodzi prąd.
+block.unit-cargo-loader.description = Tworzy Składaki, które automatycznie rozdzielają przedmioty do Punktów Rozładunku z pasującym filtrem.
+block.unit-cargo-unload-point.description = Pełni funkcję punktu rozładunkowego dla Składaków. Przyjmuje przedmioty pasujące do wybranego filtra.
+block.beam-node.description = Przesyła prąd prostopadłymi promieniami do innych struktur. Przechowuje niewielką ilość energii.
+block.beam-tower.description = Przesyła prąd prostopadłymi promieniami do innych struktur. Przechowuje bardzo duże ilości energii. Działa na dużą odległość.
+block.turbine-condenser.description = Po postawieniu na gejzerze produkuje prąd oraz niewielkie ilości wody.
+block.chemical-combustion-chamber.description = Produkuje prąd używając do tego ozonu i arkycytu.
+block.pyrolysis-generator.description = Wytwarza duże ilości prądu z żużlu i arkycytu. Woda jest produktem ubocznym.
+block.flux-reactor.description = Generuje ogromne ilości prądu. Wymaga silnego ogrzewania. Cyjan używany jest jako stabilizator. Moc wyjściowa i zapotrzebowanie na cyjan jest proporcjonalne do zapewnionego ogrzewania.\nWybucha w przypadku niedostarczenia wystarczającej ilości cyjanu.
+block.neoplasia-reactor.description = Używa arkycytu, wody oraz włókna fazowego aby generować ogromne ilości prądu. Wydziela ciepło oraz neoplazmę jako produkt uboczny.\nGwałtownie wybucha w przypadku nieodprowadzenia neoplazmy przy użyciu rur.
+block.build-tower.description = Automatycznie odbudowuje struktury w swoim zasięgu i pomaga innym jednostkom budować.
+block.regen-projector.description = Powoli naprawia sojusznicze jednostki w obrębie kwadratu. Wymaga wodoru.
+block.reinforced-container.description = Przechowuje małe ilości przedmiotów. Zawartość może być wyjęta poprzez użycie rozładowywacza lub ekstraktora. Nie powiększa pojemności rdzenia.
+block.reinforced-vault.description = Przechowuje duże ilości przedmiotów. Zawartość może być wyjęta poprzez użycie rozładowywacza lub ekstraktora. Nie powiększa pojemności rdzenia.
+block.tank-fabricator.description = Produkuje czołgi Stal. Wytworzone jednostki mogą zostać użyte do walki, bądź przeniesione do konstruktorów w celu ulepszenia.
+block.ship-fabricator.description = Produkuje statki Elude. Wytworzone jednostki mogą zostać użyte do walki, bądź przeniesione do konstruktorów w celu ulepszenia.
+block.mech-fabricator.description = Produkuje mechy Merui. Wytworzone jednostki mogą zostać użyte do walki, bądź przeniesione do konstruktorów w celu ulepszenia.
+block.tank-assembler.description = Składa duże czołgi z jednostek i bloków. Poziom wyjściowego czołgu może zostać zwiększony poprzez postawienie modułu.
+block.ship-assembler.description = Składa duże statki z jednostek i bloków. Poziom wyjściowego statku może zostać zwiększony poprzez postawienie modułu.
+block.mech-assembler.description = Składa duże mechy z jednostek i bloków. Poziom wyjściowego mechu może zostać zwiększony poprzez postawienie modułu.
+block.tank-refabricator.description = Ulepsza czołgi do drugiego poziomu.
+block.ship-refabricator.description = Ulepsza statki do drugiego poziomu.
+block.mech-refabricator.description = Ulepsza mechy do drugiego poziomu.
+block.prime-refabricator.description = Ulepsza jednostki do trzeciego poziomu.
+block.basic-assembler-module.description = Zwiększa poziom składanych jednostek, kiedy jest postawiony obok miejsca budowy. Wymaga prądu, ale może dostarczyć materiały do składania.
+block.small-deconstructor.description = Niszczy wprowadzone budynki i jednostki. Zwraca wszystkie materiały użyte do budowy.
+block.reinforced-payload-conveyor.description = Transportuje Å‚adunek.
+block.reinforced-payload-router.description = Rozdziela ładunek pomiędzy podłączone bloki. Jeśli filtr jest ustawiony, działa jak sortownik.
+block.payload-mass-driver.description = Blok pozwalający na transport ładunku na dalekie odległości. Wystrzeliwuje otrzymany ładunek do podłączonej katapulty.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Naprawia wszystkie jednostki w jego zasięgu, używając ozonu.
+block.radar.description = Stopniowo odkrywa teren i wrogie jednostki. Wymaga prÄ…du.
+block.shockwave-tower.description = Uszkadza i niszczy wrogie pociski, używając cyjanu.
+block.canvas.description = Wyświetla proste obrazki z predefinowaną paletą. Edytowalne.
 
-unit.dagger.description = Strzela standardowymi pociskami w najbliższych wrogów.
-unit.mace.description = Strzela strumieniami ognia w najbliższych wrogów.
-unit.fortress.description = Strzela artylerią dalekiego zasięgu we wrogie jednostki na ziemi.
-unit.scepter.description = Strzela salwą naładowanych pocisków we wszystkich przeciwników.
-unit.reign.description = Strzela salwą masywnych przebijających pocisków we wszystkich przeciwników.
-unit.nova.description = Wystrzeliwuje pioruny, które uszkadzają przeciwników i leczą sojusznicze struktury. Może latać.
-unit.pulsar.description = Wystrzeliwuje elektryczne pioruny, które uszkadzają przeciwników i leczą sojusznicze struktury. Może latać.
-unit.quasar.description = Wystrzeliwuje wiązki laserowe, które uszkadzają przeciwników i leczą sojusznicze struktury. Może latać. Posiada tarcze.
-unit.vela.description = Wystrzeliwuje masywny ciągły laser, który uszkadza przeciwników i leczy sojusznicze struktury. Może latać.
-unit.corvus.description = Wystrzeliwuje masywny laserowy błysk, który uszkadza przeciwników i leczy sojusznicze struktury. Może przejść po większości terenu.
-unit.crawler.description = Wbiega w przeciwników i dokonuje samozniszczenia powodując dużą eksplozje.
-unit.atrax.description = Wystrzeliwuje wyniszczające kule żużlu w cele na ziemi. Może przejść po większości terenu.
-unit.spiroct.description = Strzela wyczerpującymi życie laserami we wrogów, naprawiając siebie. Może przejść po większości terenu.
-unit.arkyid.description = Strzela dużymi wyczerpującymi życie laserami we wrogów, naprawiając siebie. Może przejść po większości terenu.
-unit.toxopid.description = Strzela wielkimi elektrycznymi skupionymi kulami i przebijającymi laserami we wrogów. Może przejść po większości terenu.
-unit.flare.description = Strzela standardowymi pociskami we jednostki naziemne.
-unit.horizon.description = Upuszcza stos bomb na jednostki naziemne.
-unit.zenith.description = Strzela salwą rakiet w każdego pobliskiego wroga.
-unit.antumbra.description = Strzela zaporą rakiet w każdego pobliskiego wroga.
-unit.eclipse.description = Strzela dwoma przebijającymi laserami i pociskami przeciwlotniczymi we wrogów.
-unit.mono.description = Automatycznie wykopuje miedź i ołów i odkłada je do rdzenia.
-unit.poly.description = Automatycznie naprawia zniszczone struktury i asystuje w budowie.
-unit.mega.description = Automatycznie naprawia zniszczone struktury. Może podnosić małe jednostki i bloki.
-unit.quad.description = Upuszcza wielkie bomby na cele na ziemi, które uszkadzają przeciwników i leczą sojusznicze struktury. Może podnosić jednostki naziemne średniej wielkości.
-unit.oct.description = Broni wszystkie jednostki tarczą regeneracyjną. Może podnosić większość jednostek naziemnych.
-unit.risso.description = Strzela sporą ilością pocisków i rakiet w najbliższych przeciwników.
-unit.minke.description = Strzela granatami i standardowymi pociskami w najbliższych przeciwników.
-unit.bryde.description = Strzela granatami i rakietami na dużą odległość we wrogów.
-unit.sei.description = Strzela dużą ilością rakiet oraz przebijających zbroje pocisków we wrogów.
-unit.omura.description = Strzela przebijającym superszybkim pociskiem we wrogów ze sporej odległości. Produkuje Błyski (jednostki).
-unit.alpha.description = Chroni Rdzeń: Odłamek przed wrogami. Buduje struktury.
-unit.beta.description = Chroni Rdzeń: Podstawa przed wrogami. Buduje struktury.
-unit.gamma.description = Chroni Rdzeń: Jądro przed wrogami. Buduje struktury.
+unit.dagger.description = LÄ…dowa jednostka ofensywna, strzelajÄ…ca standardowymi pociskami we wrogie jednostki.
+unit.mace.description = LÄ…dowa jednostka ofensywna, miotajÄ…ca strumieniami ognia we wrogie jednostki.
+unit.fortress.description = Lądowa jednostka szturmowa, której dalekosiężne pociski eliminują lądowe wrogie jednostki.
+unit.scepter.description = Lądowa jednostka ofensywna, strzelająca gradem standardowych i salwami naładowanych pocisków we wrogie jednostki.
+unit.reign.description = Niebywale silna jednostka lądowa zasypująca wrogów gradem ogromnych pocisków przebijających.
+
+unit.nova.description = Lądowo-powietrzna jednostka wsparcia, wystrzeliwująca leczące dla sojuszniczych budynków i zabójcze dla wrogów pociski.
+unit.pulsar.description = Lądowo-powietrzna jednostka wsparcia, wystrzeliwująca leczące sojusznicze struktury wiązki energii. Zadaje spore obrażenia wrogom.
+unit.quasar.description = Lądowo-powietrzna jednostka szturmowa wyposażona w pole siłowe. Naprawia pobliskie struktury oraz skutecznie niszczy wrogów.
+unit.vela.description = Jednostka krocząca zdolna do lotu. Strzela potężnym laserem podpalającym pobliskich wrogów i ich struktury. Naprawia pobliskie sojusznicze budowle.
+unit.corvus.description = Niesamowicie silna jednostka krocząca. Wystrzeliwuje potężny laser niszczący wrogów w sporej odległości. Naprawia sojusznicze struktury. Potrafi pokonać niemalże każdą przeszkodę.
+
+unit.crawler.description = Drobna lądowa jednostka ofensywna, wbiegająca we wrogów dokonując samozniszczenia.
+unit.atrax.description = Lądowa jednostka ofensywna mogąca pokonać niemalże każdą przeszkodę, strzelająca podpalającymi kulami żużlu.
+unit.spiroct.description = Pajęcza jednostka mogąca pokonać niemalże każdą przeszkodę. Ponadto, jej ataki mogą ją uleczyć i jednocześnie przyciągnąć wrogów.
+unit.arkyid.description = Jednostka szturmowa mogąca  pokonać niemalże każdą przeszkodę, strzelająca elektrycznymi pociskami oraz leczącymi ją laserami.
+unit.toxopid.description = Jednostka pajęcza mogąca pokonać niemalże każdą przeszkodę. Na krótki dystans posługuje się przebijającymi laserami, a na dłuższy strzela odłamkowym, uwalniającym błyskawice granatem.
+
+unit.flare.description = Mała latająca jednostka strzelająca standardowymi pociskami we wrogie struktury.
+unit.horizon.description = Jednostka latajÄ…ca zrzucajÄ…ca bomby kasetowe na cele naziemne.
+unit.zenith.description = Lotnicza jednostka szturmowa, strzelająca naprowadzającymi rakietami we wszystkich pobliskich wrogów.
+unit.antumbra.description = Lotnicza jednostka szturmowa, strzelająca naprzemian naprowadzającymi rakietami i potężnymi pociskami we wrogie jednostki.
+unit.eclipse.description = Niebywale silna jednostka lotnicza, strzelająca naprzemian przebijającymi wiązkami laserowymi i gradem wybuchowych pocisków we wrogie jednostki.
+
+unit.mono.description = Latający dron niezdolny do samoobrony, wydobywający miedź i ołów na podstawie ich ilości w rdzeniu.
+unit.poly.description = Lotnicza jednostka wsparcia, będaca kombinacją wszystkich jednostek która może wydobywać surowce, asystować w budowie, naprawiać i odbudowywać zniszczone struktury, a w ostateczności bronić rdzenia.
+unit.mega.description = Lotnicza jednostka wsparcia, która automatycznie naprawia zniszczone struktury oraz może przenosić małe jednostki i bloki.
+unit.quad.description = Lotnicza jednostka szturmowa zrzucająca potężne bomby na wrogie struktury i lecząca struktury sojusznicze. Może podnosić jednostki i bloki średniej wielkośći.
+unit.oct.description = Lotnicza jednostka posiadająca sporą tarczę chroniącą i regenerującą życie pobliskich jednostek. Może podnieść większość jednostek i bloków.
+
+unit.risso.description = Morska jednostka ofensywna, strzelająca sporą ilością pocisków i rakiet we wrogie jednostki.
+unit.minke.description = Morska jednostka ofensywna, strzelajÄ…ca granatami i wybuchowymi pociskami we wrogie jednostki.
+unit.bryde.description = Morska jednostka ofensywna, strzelająca dalekosiężnymi pociskami artyleryjskimi i rakietami we wrogie jednostki.
+unit.sei.description = Morska jednostka szturmowa, strzelająca barażami rakiet oraz salwami przebijających pocisków we wrogie jednostki.
+unit.omura.description = Morski okaz szturmowy wyposażony w dwie platformy tworzące Flary, strzelający przebijającym superszybkim pociskiem we wrogie jednostki.
+
+unit.alpha.description = Lotnicza jednostka administracyjna, która wykonuje podstawowe instrukcje budownicze i wydobywcze. Broni rdzenia Odłamek.
+unit.beta.description = Lotnicza jednostka administracyjna, która buduje i wykopuje surowce znacznie szybciej od poprzedniej wersji. Chroni rdzeń Podstawa przed wrogimi jednostkami.
+unit.gamma.description = Lotnicza jednostka administracyjna, której wyjątkowo dobre uzbrojenie pozwala przeżyć kilka pierwszych fal bez budowy umocnień. Chroni rdzeń Jądro przed wrogami.
+
+unit.retusa.description = Morska jednostka wsparcia, wystrzeliwująca leczące sojuszników naprowadzające torpedy we wrogie jednostki.
+unit.oxynoe.description = Morska jednostka wsparcia, wystrzeliwująca strumienie ognia leczące sojusznicze jednostki i budynki. Specjalne działo obronne niszczy także nadlatujące rakiety i pociski.
+unit.cyerce.description = Morska jednostka wsparcia, wystrzeliwująca kapsuły kasetowe oraz naprawiająca sojusznicze jednostki za pomocą działek naprawczych.
+unit.aegires.description = Morska jednostka wsparcia. Razi wszystkie wrogie jednostki i budowle swoją leczniczą błyskawicą. Potrafi jednocześnie naprawiać sojusznicze jednostki i niszczyć wrogie pociski.
+unit.navanax.description = Morska jednostka wsparcia. Posiada automatyczne działka laserowe. Może także atakować bombami elektromagnetycznymi, które potrafią przyspieszyć sojusznicze budynki.
+
+unit.stell.description = Ostrzeliwuje wrogów zwykłymi pociskami.
+unit.locus.description = Strzela naprzemiennymi pociskami w przeciwników.
+unit.precept.description = Strzela pociskami odłamkowymi z jednego działa.
+unit.vanquish.description = Wystrzeliwuje ogromne pociski odłamkowe.
+unit.conquer.description = Wystrzeliwuje ogromne przebijające serie pocisków we wrogie cele.
+
+unit.merui.description = Wystrzeliwuje pociski o dalekim zasięgu w cele naziemne. Teren w większości przypadków nie stanowi przeszkody.
+unit.cleroi.description = Wystrzeliwuje podwójne pociski we wrogie cele. Namierza wrogie pociski przy pomocy dział. Teren w większości przypadków nie stanowi przeszkody.
+unit.anthicus.description = Strzela naprowadzającymi pociskami dalekiego zasięgu we wrogie cele. Teren w większości przypadków nie stanowi przeszkody.
+unit.tecta.description = Strzela samonaprowadzającymi plazmowymi pociskami we wrogie cele. Chroni się tarczą siłową umieszczoną z przodu. Teren w większości przypadków nie stanowi przeszkody.
+unit.collaris.description = Wystrzeliwuje pociski odłamkowe na bardzo dużą odległość. Teren w większości przypadków nie stanowi przeszkody.
+
+unit.elude.description = Strzela parami pocisków samonaprowadzających we wrogie cele. Moze unosić się nad cieczami.
+unit.avert.description = Wystrzeliwuje skręcające się pary pocisków w cele wroga.
+unit.obviate.description = Wystrzeliwuje skręcające się pary kul energii produkujących wyładowania w cele wroga.
+unit.quell.description = Wystrzeliwuje pociski naprowadzajÄ…ce w cele wroga. Blokuje naprawianie siÄ™ wrogich struktur.
+unit.disrupt.description = Wystrzeliwuje dalekosiężne pociski naprowadzające w cele wroga. Blokuje naprawianie się wrogich struktur.
+
+unit.evoke.description = Lotnicza jednostka aministracyjna zdolna do wydobycia surowców, budowy oraz naprawy struktur przy użyciu wiązek naprawczych. Broni rdzenia Bastion budując struktury.
+unit.incite.description = Lotnicza jednostka aministracyjna zdolna do wydobycia surowców, budowy oraz naprawy struktur przy użyciu wiązek naprawczych. Nieco lepsza od poprzedniej wersji. Broni rdzenia Cytadela budując struktury.
+unit.emanate.description = Lotnicza jednostka aministracyjna zdolna do wydobycia surowców, budowy oraz naprawy struktur przy użyciu wiązek naprawczych. Znacznie lepsza od poprzednich wersji. Broni rdzenia Akropol budując struktury.
+
+lst.read = Wczytuje liczbę z połączonej komórki pamięci.
+lst.write = Zapisuje liczbę do połączonej komórki pamięci.
+lst.print = Dodaje tekst do buforu drukującego.\nNie wyświetla niczego dopóki [accent]Print Flush[] nie jest użyte.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Dodaje operacje do buforu rysującego.\nNie wyświetla niczego dopóki [accent]Draw Flush[] nie jest użyte.
+lst.drawflush = Wyświetla oczekujące operacje z funkcji [accent]Draw[] na wyświetlaczu.
+lst.printflush = Dodaje oczekujące operacje z funkcji [accent]Print[] do bloku wiadomości.
+lst.getlink = Zdobywa połączenie procesora przez indeks. Zaczyna się od 0.
+lst.control = Kontroluje budynek.
+lst.radar = Lokalizuje jednostki wokół budynku w jego zasięgu.
+lst.sensor = Zdobywa dane z budynku lub jednostki.
+lst.set = Ustawia zmiennÄ….
+lst.operation = Wykonuje operacjÄ™ na 1-2 zmiennych.
+lst.end = Przeskakuje na poczÄ…tek stosu instrukcji.
+lst.wait = Czeka określoną liczbę sekund.
+lst.stop = Zatrzymaj wykonywanie instrukcji tego procesora.
+lst.lookup = Znajduje typ przedmiotu/cieczy/jednostki/bloku poprzez ID.\nCałkowite zliczenia każdego typu można uzyskać za pomocą:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Warunkowo przeskakuje do innego stanu.
+lst.unitbind = Powiązuje z następną jednostką danego typu i przechowuje ją w [accent]@unit[].
+lst.unitcontrol = Kontroluje obecnie powiÄ…zanÄ… jednostkÄ™.
+lst.unitradar = Lokalizuje jednostki wokół obecnie powiązanej jednostki.
+lst.unitlocate = Lokalizuje specyficzny typ pozycji/budynku gdziekolwiek na mapie.\nWymaga powiÄ…zanej jednostki.
+lst.getblock = Uzyskaj dane dla dowolnej lokalizacji.
+lst.setblock = Ustaw dane dla dowolnej lokalizacji.
+lst.spawnunit = Odródź jednostkę w lokalizacji.
+lst.applystatus = Zastosuj lub wyczyść efekty statusu jednostki.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Symuluj falę odradzającą się w dowolnym miejscu.\nNie zwiększy licznika fali.
+lst.explosion = Stwórz eksplozję w lokalizacji.
+lst.setrate = Ustaw szybkość wykonywania procesora w instrukcjach/tick.
+lst.fetch = Wyszukaj jednostki, rdzenie, graczy lub budynki według indeksu.\nIndeksy zaczynają się od 0 i kończą na ich zwróconej liczbie.
+lst.packcolor = Spakuj [0, 1] komponenty RGBA w jedną liczbę do rysowania lub ustawiania reguł.
+lst.setrule = Ustaw zasady gry.
+lst.flushmessage = Wyświetl wiadomość na ekranie z bufora tekstowego.\nPoczeka najpierw na zakończenie wyświetlania poprzedniej wiadomości.
+lst.cutscene = Manipuluj kamerÄ… gracza.
+lst.setflag = Ustaw globalną flagę, którą mogą odczytać wszystkie procesory.
+lst.getflag = Sprawdź, czy ustawiona jest flaga globalna.
+lst.setprop = Ustaw właściwość jednostki lub budynku.
+lst.effect = Stwórz efekt cząsteczki.
+lst.sync = Synchronizuje zmienną poprzez sieć.\nWywoływane maksymalnie 10 razy na sekundę.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Stwórz nowy marker logiki.\nMusisz podać ID, aby móc go później zidentyfikować.\nLimit markerów to 20,000.
+lst.setmarker = Ustaw właściwości markera.\nID markera musi być takie samo jak podczas jego tworzenia.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Logika budowania jednostek nie jest tu dozwolona.
+
+lenum.type = Typ budynku/jednostki.\nnp. dla każdego rozdzielacza, zwróci [accent]@router[].\nNie jest łańcuchem znaków (string).
+lenum.shoot = Strzel w określoną pozycje.
+lenum.shootp = Strzel w jednostkÄ™/budynek z zachowaniem trajektorii.
+lenum.config = Konfiguracja budynku, np. sortownika.
+lenum.enabled = Sprawdza czy blok jest włączony.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = Kolor iluminatora.
+laccess.controller = Kontroler jednostki. Jeśli jest kontrolowana przez procesor, zwraca procesor.\nJeśli we formacji, zwraca przywódcę.\nW innym wypadku zwraca samą jednostkę.
+laccess.dead = Sprawdza czy jednostka/budynek jest zniszczony lub już nie istnieje.
+laccess.controlled = Zwraca:\n[accent]@ctrlProcessor[] jeśli kontrolerem jednostki jest procesor\n[accent]@ctrlPlayer[] jeśli kontrolerem jednostki/budynku jest gracz\n[accent]@ctrlFormation[] jeśli jednostka jest w formacji\nW innym wypadku 0.
+laccess.progress = Postęp akcji, od 0 do 1.\nZwraca produkcję, przeładowanie wieżyczki lub postęp konstrukcji.
+laccess.speed = Najwyższa prędkość jednostki, w kratkach/sec.
+laccess.id = ID jednostki/bloku/przedmiotu/płynu.\nOdwrotnośc operacji wyszukiwania.
+
+lcategory.unknown = Inne
+lcategory.unknown.description = Niezkategoryzowane instrukcje.
+lcategory.io = Wejście i Wyjście
+lcategory.io.description = Modyfikuj zawartość banków pamięci oraz buforów procesorów.
+lcategory.block = Kontrolowanie budynków
+lcategory.block.description = Kontroluj budynki.
+lcategory.operation = Operacje
+lcategory.operation.description = Operacje logiczne.
+lcategory.control = Kontrola kolejności instrukcji
+lcategory.control.description = Zarządzaj kolejnością wykonywania instrukcji.
+lcategory.unit = Kontrolowanie jednostek
+lcategory.unit.description = Wydawaj polecenia jednostkom.
+lcategory.world = Åšwiat
+lcategory.world.description = Kontroluj zachowania świata.
+
+graphicstype.clear = Wypełnia wyświetlacz kolorem.
+graphicstype.color = Ustawia kolor następnych operacji rysujących.
+graphicstype.col = Odpowiednik koloru, ale spakowany.\nSpakowane kolory są zapisywane jako kody szesnastkowe z prefiksem [accent]%[].\nPrzykład: [accent]%ff0000[] byłby czerwony.
+graphicstype.stroke = Ustawia grubość linii.
+graphicstype.line = Rysuje część linii.
+graphicstype.rect = Wypełnia prostokąt.
+graphicstype.linerect = Rysuje obwód prostokąta.
+graphicstype.poly = Wypełnia wielokąt foremny.
+graphicstype.linepoly = Rysuje obwód wielokąta foremnego.
+graphicstype.triangle = Wypełnia trójkąt.
+graphicstype.image = Rysuje ikonę jakiejś treści.\nnp. [accent]@router[] lub [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Zawsze prawda.
+lenum.idiv = Dzielenie liczb całkowitych.
+lenum.div = Dzielenie.\nZwraca [accent]null[] w trakcie dzielenia przez zero.
+lenum.mod = Modulo.
+lenum.equal = Równość. Wymusza typ.\nNiezerowe objekty połączone z liczbami stają się 1, w innym wypadku 0.
+lenum.notequal = Nierówność. Wymusza typ.
+lenum.strictequal = Ścisła równość. Nie wymusza typów.\nMoże być użyte do wykrycia [accent]null[].
+lenum.shl = Przesunięcie bitowe w lewo.
+lenum.shr = Przesunięcie bitowe w prawo.
+lenum.or = Bitowe OR (lub).
+lenum.land = Logiczne AND (i).
+lenum.and = Bitowe AND (i).
+lenum.not = Bitowe NOT.
+lenum.xor = Bitowe XOR.
+
+lenum.min = Minimum dwóch liczb.
+lenum.max = Maksimum dwóch liczb.
+lenum.angle = KÄ…t wektoru w stopniach.
+lenum.anglediff = Bezwzględny dystans między dwoma kątami w stopniach.
+lenum.len = Długość wektoru.
+
+lenum.sin = Sinus, w stopniach.
+lenum.cos = Cosinus, w stopniach.
+lenum.tan = Tangens, w stopniach.
+lenum.asin = Arc sinus, w stopniach.
+lenum.acos = Arc cosinus, w stopniach.
+lenum.atan = Arc tangens, w stopniach.
+
+#to nie literówka, spójrz na 'range notation'
+lenum.rand = Losowa liczba w przedziale [0, wartość).
+lenum.log = Logarytm naturalny (ln).
+lenum.log10 = Logarytm o podstawie 10.
+lenum.noise = Szum simplex 2D.
+lenum.abs = Wartość bezwzględna.
+lenum.sqrt = Pierwiastek kwadratowy.
+
+lenum.any = Dowolna jednostka.
+lenum.ally = Sojusznicza jednostka.
+lenum.attacker = Jednostka z broniÄ….
+lenum.enemy = Przeciwnik.
+lenum.boss = Strażnik.
+lenum.flying = LatajÄ…ca jednostka.
+lenum.ground = Jednostka lÄ…dowa.
+lenum.player = Jednostka kontrolowana przez gracza.
+
+lenum.ore = Złoże rudy.
+lenum.damaged = Uszkodzony sojuszniczy budynek.
+lenum.spawn = Punkt zrzutu przeciwnika.\nMoże być rdzeniem lub pozycją.
+lenum.building = Budynek ze specyficznej grupy.
+
+lenum.core = Dowolny rdzeń.
+lenum.storage = Budynek przechowujÄ…cy, np. Magazyn.
+lenum.generator = Budynki generujÄ…ce prÄ…d.
+lenum.factory = Budynki przetwarzajÄ…ce surowce.
+lenum.repair = Punkty naprawy.
+lenum.battery = Dowolna bateria.
+lenum.resupply = Punkty uzupełniające.\nMa znaczenie tylko gdy tryb [accent]"Jednostki Potrzebują Amunicji"[] jest włączony.
+lenum.reactor = Reaktor uderzeniowy/torowy.
+lenum.turret = Dowolna wieżyczka.
+
+sensor.in = Wykrywany budynek/jednostka.
+
+radar.from = Budynek wykrywający.\nZasięg czujnika jest zależny od zasięgu budynku.
+radar.target = Filtr wykrywanych jednostek.
+radar.and = Dodatkowe filtry.
+radar.order = Kolejność sortowania. 0 aby odwrócić.
+radar.sort = Wartość, według której będą sortowane wyniki.
+radar.output = Zmienna, do której zostanie przypisana jednostka wyjściowa.
+
+unitradar.target = Filtr wykrywanych jednostek.
+unitradar.and = Dodatkowe filtry.
+unitradar.order = Kolejność sortowania. 0 aby odwrócić.
+unitradar.sort = Wartość, według której będą sortowane wyniki.
+unitradar.output = Zmienna, do której zostanie przypisana jednostka wyjściowa.
+
+control.of = Kontrolowany budynek.
+control.unit = Jednostka/budynek, będące celem ostrzału.
+control.shoot = Kontrolka strzelania.
+
+unitlocate.enemy = Kontrolka zlokalizowania budynków przeciwnika.
+unitlocate.found = Kontrolka znalezienia obiektu.
+unitlocate.building = Zmienna wyjściowa dla zlokalizowanego budynku.
+unitlocate.outx = Wyjściowa współrzędna X.
+unitlocate.outy = Wyjściowa współrzędna Y.
+unitlocate.group = Grupa szukanych budynków.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Przestań się poruszać, jednak nadal buduj/wydobywaj.\nDomyślny stan.
+lenum.stop = Przestań poruszać się/kopać/budować.
+lenum.unbind = Kompletnie wyłącza kontrolę za pomocą logiki.\nWznawia domyślną SI.
+lenum.move = Przemieść się do określonej pozycji.
+lenum.approach = Zbliż się do pozycji w promieniu.
+lenum.pathfind = Odnajdź ścieżkę do punktu zrzutu przeciwników.
+lenum.autopathfind = Automatycznie znajduję drogę do najbliższego rdzenia wroga lub punktu zrzutu.\nDziała tak samo jak normalne znajdowanie drogi.
+lenum.target = Strzel w określoną pozycję.
+lenum.targetp = Strzel w jednostkÄ™/budynek z zachowaniem trajektorii.
+lenum.itemdrop = Upuść przedmiot.
+lenum.itemtake = Zabierz przedmiot z budynku.
+lenum.paydrop = Upuść obecny ładunek.
+lenum.paytake = PodnieÅ› Å‚adunek z obecnego miejsca.
+lenum.payenter = Wejdź/wyląduj na bloku ładunku, na którym znajduje się jednostka.
+lenum.flag = Numeryczny znacznik jednostki.
+lenum.mine = Kop na danej pozycji.
+lenum.build = Buduj strukturÄ™.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Sprawdź czy jednostka jest w pobliżu pozycji.
+lenum.boost = Zacznij/zakończ przyspieszać.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 0e597d2159..9ebde3f3dd 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1,26 +1,29 @@
 credits.text = Criado por [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Créditos
-contributors = Tradutores e contribuidores
+contributors = Tradutores e Contribuidores
 discord = Junte-se ao Discord do Mindustry! (Lá nós falamos em diversos idiomas!)
 link.discord.description = O Discord oficial do Mindustry
 link.reddit.description = O subreddit do Mindustry
 link.github.description = Código fonte do jogo.
 link.changelog.description = Lista de mudanças da atualização
-link.dev-builds.description = Versões betas
+link.dev-builds.description = Builds de desenvolvimento instáveis
 link.trello.description = Trello oficial para atualizações planejadas
 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.suggestions.description = Sugira novos conteúdos
+link.bug.description = Achou algum? Reporte-o aqui
+linkopen = Este servidor lhe enviou um link. Você tem certeza de que quer abri-lo?\n\n[sky]{0}
 linkfail = Falha ao abrir o link\nO Url foi copiado para a área de transferência.
-screenshot = Screenshot salvo para {0}
+screenshot = Screenshot salva para {0}
 screenshot.invalid = Este mapa é grande demais, você pode estar potencialmente sem memória suficiente para captura de tela.
-gameover = O núcleo foi destruído.
+gameover = Fim de jogo.
+gameover.disconnect = Desconectado
 gameover.pvp = O time[accent] {0}[] ganhou!
+gameover.waiting = [accent]Esperando pelo próximo mapa...
 highscore = [accent]Novo recorde!
-copied = Copiado
-indev.popup = [accent]v6[] está atualmente em [accent]alpha[].\n[lightgray]Isso significa:[]\n[scarlet]- A campanha está inacabada[]\n- Está faltando conteúdo\n - A maioria das [scarlet]IAs das unidades[] não funciona adequadamente\n- A maioria das unidades estão inacabadas\n- Tudo o que você ver está sujeito a mudanças ou remoção.\n\nReporte bugs ou crashes em [accent]Github[].
+copied = Copiado.
 indev.notready = Essa parte do jogo ainda não esta pronta
 
 load.sound = Sons
@@ -31,120 +34,179 @@ load.system = Sistema
 load.mod = Mods
 load.scripts = Scripts
 
-be.update = Uma nova versão beta está disponível:
+be.update = Uma nova versão de teste está disponível:
 be.update.confirm = Baixar e reiniciar o jogo agora?
 be.updating = Atualizando...
-be.ignore = Ignore
+be.ignore = Ignorar
 be.noupdates = Nenhuma atualização encontrada.
-be.check = Cheque por atualizações
+be.check = Checar por atualizações
+
+mods.browser = Navegador de mods
+mods.browser.selected = Mod selecionado
+mods.browser.add = Instalar
+mods.browser.reinstall = Reinstalar
+mods.browser.view-releases = Ver versões
+mods.browser.noreleases = [scarlet]Nenhuma versão encontrada\n[accent]Não foi possível encontrar nenhuma versão do mod. Veja se o repositório do mod possui alguma versão publicada.
+mods.browser.latest = <Mais recente>
+mods.browser.releases = Versões
+mods.github.open = Repositório
+mods.github.open-release = Página da versão
+
+mods.browser.sortdate = Ordenar por mais recente
+mods.browser.sortstars = Ordenar por estrelas
 
 schematic = Esquema
-schematic.add = Salvar esquema
+schematic.add = Salvar esquema...
 schematics = Esquemas
+schematic.search = Procurar esquemas...
 schematic.replace = Um esquema com esse nome já existe. Substituí-lo?
-schematic.exists = Um esquema com esse nome já existe. Substituí-lo?
+schematic.exists = Um esquema com esse nome já existe.
 schematic.import = Importar esquema...
-schematic.exportfile = Exportar arquivo
-schematic.importfile = Importar arquivo
-schematic.browseworkshop = Navegar pela oficina
+schematic.exportfile = Exportar Arquivo
+schematic.importfile = Importar Arquivo
+schematic.browseworkshop = Navegar pela Oficina
 schematic.copy = Copiar para a área de transferência
 schematic.copy.import = Importar da área de transferência
 schematic.shareworkshop = Compartilhar na Oficina
-schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Virar o Esquema
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Espelhar Esquema
 schematic.saved = Esquema salvo.
 schematic.delete.confirm = Esse esquema será apagado. Tem certeza?
-schematic.rename = Renomear esquema
+schematic.edit = Editar Esquema
 schematic.info = {0}x{1}, {2} blocos
-schematic.disabled = [scarlet]Esquemas desativados[]\nVocê precisa de permissão para usar esquemas nesse [accent]mapa[] ou [accent]servidor.
+schematic.disabled = [scarlet]Esquemas desativados[]\nVocê não tem permissão para usar esquemas nesse [accent]mapa[] ou [accent]servidor.
+schematic.tags = Etiquetas:
+schematic.edittags = Editar Etiquetas
+schematic.addtag = Adicionar Etiqueta
+schematic.texttag = Etiqueta de Texto
+schematic.icontag = Etiqueta de �cone
+schematic.renametag = Renomear Etiqueta
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Deletar essa etiqueta completamente?
+schematic.tagexists = Essa etiqueta já existe.
 
-stat.wave = Hordas derrotadas:[accent] {0}
-stat.enemiesDestroyed = Inimigos destruídos:[accent] {0}
-stat.built = Construções construídas:[accent] {0}
-stat.destroyed = Construções destruídas:[accent] {0}
-stat.deconstructed = Construções desconstruídas:[accent] {0}
-stat.delivered = Recursos lançados:
-stat.playtime = Tempo jogado:[accent] {0}
-stat.rank = Classificação final: [accent]{0}
+stats = Estatísticas
+stats.wave = Hordas Derrotadas
+stats.unitsCreated = Unidades Criadas
+stats.enemiesDestroyed = Inimigos Destruídos
+stats.built = Construções Feitas
+stats.destroyed = Construções Destruídas
+stats.deconstructed = Construções Desconstruídas
+stats.playtime = Tempo Jogado
 
-globalitems = [accent]Itens Globais
-map.delete = Certeza que quer deletar o mapa "[accent]{0}[]"?
-level.highscore = Melhor\npontuação: [accent] {0}
+globalitems = [accent]Itens do Planeta
+map.delete = Você tem certeza que quer deletar o mapa "[accent]{0}[]"?
+level.highscore = Melhor pontuação: [accent]{0}
 level.select = Seleção de fase
 level.mode = Modo de jogo:
-coreattack = < O núcleo está sobre ataque! >
-nearpoint = [[ [scarlet]SAIA DO PONTO DE SPAWN IMEDIATAMENTE[] ]\nANIQUILAÇÃO IMINENTE
-database = Banco de dados
-savegame = Salvar jogo
-loadgame = Carregar jogo
-joingame = Entrar no jogo
-customgame = Jogo customi-\nzado
-newgame = Novo jogo
+coreattack = < O Núcleo está sob ataque! >
+nearpoint = [[ [scarlet]SAIA DO PONTO DE QUEDA IMEDIATAMENTE[] ]\naniquilação iminente
+database = Banco de Dados do Núcleo
+database.button = Banco de Dados
+savegame = Salvar Jogo
+loadgame = Carregar Jogo
+joingame = Juntar-se ao Jogo
+customgame = Jogo Customizado
+newgame = Novo Jogo
 none = <nenhum>
-minimap = Mini-mapa
+none.found = [lightgray]<nenhum encontrado>
+none.inmap = [lightgray]<nenhum no mapa>
+minimap = Minimapa
 position = Posição
 close = Fechar
 website = Site
 quit = Sair
-save.quit = Salvar e sair
+save.quit = Salvar e Sair
 maps = Mapas
 maps.browse = Pesquisar mapas
 continue = Continuar
 maps.none = [lightgray]Nenhum mapa encontrado!
 invalid = Inválido
 pickcolor = Escolher Cor
-preparingconfig = Preparando configuração
-preparingcontent = Preparando conteúdo
-uploadingcontent = Fazendo upload do conteúdo
-uploadingpreviewfile = Fazendo upload do arquivo de pré-visualização
-committingchanges = Enviando mudanças
+preparingconfig = Preparando Configuração
+preparingcontent = Preparando Conteúdo
+uploadingcontent = Fazendo Upload do Conteúdo
+uploadingpreviewfile = Fazendo Upload do Arquivo de Pré-visualização
+committingchanges = Enviando Mudanças
 done = Feito
-feature.unsupported = Seu dispositivo não suporta essa função.
+feature.unsupported = Seu dispositivo não suporta este recurso.
 
-mods.alphainfo = Tenha em mente que os mods estão em alpha, e[scarlet] talvez eles contenham erros e instabilidades[].\nReporte quaisquer problemas no Discord ou GitHub do Mindustry.
+mods.initfailed = [red]⚠[] A instância anterior do Mindustry falhou ao inicializar. Provavelmente causado por mods com problema.\n\nPara previnir um loop de crash, [red]todos os mods foram desativados.[]
 mods = Mods
 mods.none = [lightgray]Nenhum mod encontrado!
-mods.guide = Guia de mods
+mods.guide = Guia de Criar Mods
 mods.report = Reportar um Bug
-mods.openfolder = Abrir pasta de mods
+mods.openfolder = Abrir Pasta de Mods
+mods.viewcontent = Ver Conteúdo
 mods.reload = Recarregar
-mods.reloadexit = O jogo vai fechar, para poder recarregar os mods.
+mods.reloadexit = O jogo agora irá fechar, para recarregar os mods.
+mod.installed = [[Instalado]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Ativado
-mod.disabled = [scarlet]Desativado
+mod.disabled = [red]Desativado
+mod.multiplayer.compatible = [gray]Compatível com Multiplayer
 mod.disable = Desati-\nvar
+mod.version = Version:
 mod.content = Conteúdo:
 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]Não compatível com a V6 (sem minGameVersion: 105)
-mod.missingdependencies = [scarlet]Dependências ausentes: {0}
+mod.incompatiblegame = [red]Jogo desatualizado
+mod.incompatiblemod = [red]Incompatível
+mod.blacklisted = [red]Não suportado
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Erros no conteúdo
+mod.circulardependencies = [red]Dependências Mútuas
+mod.incompletedependencies = [red]Dependências Incompletas
+
+mod.requiresversion.details = Requer a versão do jogo: [accent]{0}[]\nSeu jogo está desatualizado. Este mod requer uma versão mais recente do jogo (possivelmente uma versão beta/alfa) para funcionar.
+mod.outdatedv7.details = Este mod é incompatível com a versão mais recente do jogo. O autor deve atualizá-lo e adicionar [accent]minGameVersion: 136[] ao seu arquivo [accent]mod.json[].
+mod.blacklisted.details = Este mod foi manualmente colocado na lista negra por causar falhas ou outros problemas com esta versão do jogo. Não use-o.
+mod.missingdependencies.details = Este mod está com dependências ausentes: {0}
+mod.erroredcontent.details = Este mod causou erros ao carregar. Peça ao autor do mod para corrigi-los.
+mod.circulardependencies.details = Este mod possui dependências que dependem umas das outras.
+mod.incompletedependencies.details = Este mod não pode ser carregado devido a dependências inválidas ou ausentes: {0}.
+
+mod.requiresversion = Requer a versão do jogo: [red]{0}
+
 mod.errors = Ocorreram erros ao carregar o conteúdo.
 mod.noerrorplay = [scarlet]Você tem mods com erros.[] Desative os mods afetados ou conserte os erros antes de jogar.
 mod.nowdisabled = [scarlet]O Mod '{0}' está com dependências ausentes:[accent] {1}\n[lightgray]Esses Mods precisam ser baixados primeiro.\nEsse Mod será desativado automaticamente.
 mod.enable = Ativar
 mod.requiresrestart = O jogo irá fechar para aplicar as mudanças do mod.
-mod.reloadrequired = [scarlet]Recarregamento necessário
-mod.import = Importar mod
+mod.reloadrequired = [scarlet]Recarregamento Necessário
+mod.import = Importar Mod
 mod.import.file = Importar Arquivo
-mod.import.github = Importar mod do GitHub
-mod.jarwarn = [scarlet]mods JAR são altamente inseguros.[]\nTenha certeza que esse mod tenha uma fonte confiável!
+mod.import.github = Importar Mod do GitHub
+mod.jarwarn = [scarlet]Mods JAR são altamente inseguros.[]\nTenha certeza que esse mod tenha uma fonte confiável!
 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}
 mod.missing = Esse jogo salvo foi criado antes de você atualizar ou desinstalar um mod. Pode ocorrer uma corrupção no salvamento. Você tem certeza que quer carregar?\n[lightgray]Mods:\n{0}
 mod.preview.missing = Antes de publicar esse mod na oficina, você deve adicionar uma imagem de pré-visualização.\nColoque uma imagem com o nome[accent] preview.png[] na pasta do mod e tente novamente.
-mod.folder.missing = Somente mods no formato de pasta serão publicados na oficina.\nPara converter qualquer Mod em uma pasta, Simplesmente descompacte seu arquivo numa pasta e delete a compactação antiga, então reinicie seu jogo ou recarregue os mods.
+mod.folder.missing = Somente mods no formato de pasta serão publicados na oficina.\nPara converter qualquer Mod em uma pasta, simplesmente descompacte seu arquivo numa pasta e delete o arquivo ZIP antigo, então reinicie seu jogo ou recarregue os mods.
 mod.scripts.disable = Seu dispositivo não suporta mods com scripts. Você precisa desabilitar esses mods para conseguir jogar.
 
 about.button = Sobre
 name = Nome:
 noname = Escolha[accent] um nome[] primeiro.
+search = Procurar:
 planetmap = Mapa do Planeta
-launchcore = Lançar núcleo
-filename = Nome do arquivo:
-unlocked = Novo bloco desbloqueado!
+launchcore = Lançar Núcleo
+filename = Nome do Arquivo:
+unlocked = Novo conteúdo desbloqueado!
+available = Nova pesquisa disponível!
+unlock.incampaign = < Desbloqueie na campanha para mais detalhes >
+campaign.select = Selecione uma Campanha Inicial
+campaign.none = [lightgray]Selecione um planeta para começar.\nIsso pode ser alterado a qualquer momento.
+campaign.erekir = Conteúdo mais novo e mais polido. Progressão de campanha principalmente linear.\n\nMapas de maior qualidade e experiência geral.
+campaign.serpulo = Conteúdo mais antigo; a experiência clássica. Mais aberto, mais conteúdo.\n\nMapas e mecânicas de campanha potencialmente desbalanceados. Menos polido.
+campaign.difficulty = Difficulty
+
 completed = [accent]Completado
 techtree = �rvore Tecnológica
+techtree.select = Seleção de �rvore Tecnológica
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Carregar
+research.discard = Descartar
 research.list = [lightgray]Pesquise:
 research = Pesquisar
 researched = [lightgray]{0} Pesquisado.
@@ -155,7 +217,7 @@ players.search = Procurar
 players.notfound = [gray]Nenhum jogador encontrado
 server.closing = [accent]Fechando servidor...
 server.kicked.kick = Você foi expulso do servidor!
-server.kicked.whitelist = Você não está na whitelist do servidor.
+server.kicked.whitelist = Você não está na lista branca do servidor.
 server.kicked.serverClose = Servidor fechado.
 server.kicked.vote = Você foi expulso desse servidor. Adeus.
 server.kicked.clientOutdated = Cliente desatualizado! Atualize seu jogo!
@@ -168,155 +230,217 @@ server.kicked.nameInUse = Este nome já está sendo usado\nneste servidor.
 server.kicked.nameEmpty = Você deve ter pelo menos uma letra ou número no nome.
 server.kicked.idInUse = Você ja está neste servidor! Conectar com duas contas não é permitido.
 server.kicked.customClient = Este servidor não suporta versões customizadas. Baixe a versão original.
-server.kicked.gameover = Fim de jogo!
+server.kicked.gameover = Fim do jogo!
 server.kicked.serverRestarting = O servidor esta reiniciando.
 server.versions = Sua versão:[accent] {0}[]\nVersão do servidor:[accent] {1}[]
-host.info = O botão de [accent]Hospedar[] hospeda um servidor no Host[scarlet]6567[] e [scarlet]6568.[]\nQualquer um no [lightgray]Wi-fi ou internet local[] pode ver este servidor na lista de servidores.\n\nSe você quer poder entrar em qualquer servidor em seu ip, [accent]port forwarding[] é requerido.\n\n[lightgray]Nota: Se alguém esta com problemas em conectar no seu servidor lan, Tenha certeza que deixou mindustry Acessar sua internet local nas configurações de firewall
-join.info = Aqui, você pode entar em um [accent]IP de servidor[] para conectar, ou descobrir [accent]servidores[] da rede local.\nAmbos os servidores LAN e WAN são suportados.\n\n[lightgray]Nota: Não há uma lista de servidores automáticos; Se você quer conectar ao IP de alguém, você precisa pedir o IP ao anfitrião.
-hostserver = Hospedar servidor
-invitefriends = Convidar amigos
-hostserver.mobile = Hospedar\nJogo
+host.info = O botão de [accent]Hospedar[] hospeda um servidor no Host[scarlet]6567[] e [scarlet]6568.[]\nQualquer um no [lightgray]Wi-fi ou internet local[] pode ver este servidor na lista de servidores.\n\nSe você quiser poder entrar em qualquer servidor em seu ip, [accent]port forwarding[] é necessário.\n\n[lightgray]Nota: Se alguém está com problemas em conectar no seu servidor lan, tenha certeza que mindustry tem acesso a sua internet local nas configurações do seu firewall
+join.info = Aqui, você pode entar em um [accent]IP de servidor[] para conectar, ou descobrir [accent]servidores[] da rede local.\nAmbos os servidores LAN e WAN são suportados.\n\n[lightgray]Nota: Não há uma lista de servidores automáticos; Se você quiser se conectar ao IP de alguém, você precisa pedir o IP ao anfitrião.
+hostserver = Hospedar Partida Multijogador
+invitefriends = Convidar Amigos
+hostserver.mobile = Hospedar Partida
 host = Hospedar
 hosting = [accent]Abrindo servidor...
 hosts.refresh = Recarregar
-hosts.discovering = Descobrindo jogos em lan
+hosts.discovering = Descobrindo jogos em LAN
 hosts.discovering.any = Descobrindo jogos
 server.refreshing = Atualizando servidor
 hosts.none = [lightgray]Nenhum jogo LAN encontrado!
 host.invalid = [scarlet]Não foi possivel hospedar
 
-servers.local = Servidores locais
-servers.remote = Servidores remotos
-servers.global = Servidores da comunidade
+servers.local = Servidores Locais
+servers.local.steam = Jogos Públicos e Servidores Locais
+servers.remote = Servidores Remotos
+servers.global = Servidores da Comunidade
 
-trace = Rastrear jogador
+servers.disclaimer = Servidores da comunidade [accent]não[] controlados pelo desenvolvedor.\n\nOs servidores podem conter conteúdo não apropriado para todas as idades.
+servers.showhidden = Mostrar servidores ocultos
+server.shown = Mostrar
+server.hidden = Ocultar
+
+viewplayer = Vendo o Jogador: [accent]{0}
+trace = Rastrear Jogador
 trace.playername = Nome do jogador: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = ID unico: [accent]{0}
-trace.mobile = Cliente móvel: [accent]{0}
-trace.modclient = Cliente customizado: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Idioma: [accent]{0}
+trace.mobile = Cliente Móvel: [accent]{0}
+trace.modclient = Cliente Customizado: [accent]{0}
+trace.times.joined = Vezes que se Juntou: [accent]{0}
+trace.times.kicked = Vezes que foi Expulso: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = ID do cliente invalido! Reporte o bug
+
+player.ban = Banir
+player.kick = Expulsar
+player.trace = Rastrear
+player.admin = Alternar Admin
+player.team = Trocar Time
+
 server.bans = Banidos
 server.bans.none = Nenhum jogador banido encontrado!
 server.admins = Administradores
 server.admins.none = Nenhum administrador encontrado!
 server.add = Adicionar servidor
-server.delete = Certeza que quer deletar o servidor?
-server.edit = Editar servidor
-server.outdated = [crimson]Servidor desatualizado![]
-server.outdated.client = [crimson]Cliente desatualizado![]
-server.version = [lightgray]Versão: {0}
-server.custombuild = [accent]Versão customizada
-confirmban = Certeza que quer banir este jogador?
-confirmkick = Certeza que quer expulsar o jogador?
-confirmvotekick = Você tem certeza de que quer votar para expulsar este jogador?
-confirmunban = Certeza que quer desbanir este jogador?
-confirmadmin = Certeza que quer fazer este jogador um administrador?
-confirmunadmin = Certeza que quer remover o status de adminstrador deste jogador?
-joingame.title = Entrar no jogo
-joingame.ip = IP:
+server.delete = Você tem certeza que quer deletar esse servidor?
+server.edit = Editar Servidor
+server.outdated = [scarlet]Servidor Desatualizado![]
+server.outdated.client = [scarlet]Cliente Desatualizado![]
+server.version = [gray]v{0} {1}
+server.custombuild = [accent]Versão Customizada
+confirmban = Você tem certeza que quer banir "{0}[white]"?
+confirmkick = Você tem certeza que quer expulsar "{0}[white]"?
+confirmunban = Você tem certeza que quer desbanir este jogador?
+confirmadmin = Você tem certeza que quer fazer "{0}[white]" um administrador?
+confirmunadmin = Você tem certeza que quer remover o status de adminstrador do "{0}[white]"?
+votekick.reason = Motivo para expulsar por votação
+votekick.reason.message = Tem certeza de que deseja expulsar "{0}[white]" por votação?\nSe sim, digite o motivo:
+joingame.title = Juntar-se ao jogo
+joingame.ip = Endereço IP:
 disconnect = Desconectado.
 disconnect.error = Erro de conexão.
 disconnect.closed = Conexão fechada.
 disconnect.timeout = Tempo esgotado.
-disconnect.data = Falha ao abrir os dados do mundo!
+disconnect.data = Falha ao carregar os dados do mundo!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossível conectar ([accent]{0}[]).
 connecting = [accent]Conectando...
+reconnecting = [accent]Reconectando...
 connecting.data = [accent]Carregando dados do mundo...
-server.port = Port:
-server.addressinuse = Senha em uso!
-server.invalidport = Numero de port inválido!
-server.error = [crimson]Erro ao hospedar o servidor: [accent]{0}
-save.new = Novo save
-save.overwrite = Você tem certeza que quer sobrescrever este save?
-overwrite = sobrescrever
-save.none = Nenhum save encontrado!
+server.port = Porta:
+server.invalidport = Numero de porta inválido!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [scarlet]Erro ao hospedar o servidor.
+save.new = Novo Jogo Salvo
+save.overwrite = Você tem certeza que quer sobrescrever este jogo salvo?
+save.nocampaign = Arquivos de jogos salvos individuais da campanha não podem ser importados.
+
+overwrite = Sobrescrever
+save.none = Nenhum jogo salvo encontrado!
 savefail = Falha ao salvar jogo!
-save.delete.confirm = Certeza que quer deletar este save?
+save.delete.confirm = Certeza que quer deletar este jogo salvo?
 save.delete = Deletar
-save.export = Exportar save
-save.import.invalid = [accent]Este save é inválido!
-save.import.fail = [crimson]Falha ao importar save: [accent]{0}
-save.export.fail = [crimson]Falha ao exportar save: [accent]{0}
-save.import = Importar save
-save.newslot = Nome do save:
+save.export = Exportar Jogo Salvo
+save.import.invalid = [accent]Este jogo salvo é inválido!
+save.import.fail = [crimson]Falha ao importar jogo salvo: [accent]{0}
+save.export.fail = [crimson]Falha ao exportar jogo salvo: [accent]{0}
+save.import = Importar jogo salvo
+save.newslot = Nome do jogo salvo:
 save.rename = Renomear
-save.rename.text = Novo jogo:
-selectslot = Selecione um lugar para salvar.
-slot = [accent]Conexões {0}
-editmessage = Editar mensagem
-save.corrupted = [accent]Save corrompido ou inválido!
+save.rename.text = Novo nome:
+selectslot = Selecione um jogo salvo.
+slot = [accent]Slot {0}
+editmessage = Editar Mensagem
+save.corrupted = [accent]Jogo salvo corrompido ou inválido!
 empty = <vazio>
 on = Ligado
 off = Desligado
+save.search = Procurando jogos salvos...
 save.autosave = Salvar automaticamente: {0}
 save.map = Mapa: {0}
 save.wave = Horda {0}
 save.mode = Modo de jogo: {0}
-save.date = Último salvamento: {0}
+save.date = Último Salvamento: {0}
 save.playtime = Tempo de jogo: {0}
 warning = Aviso.
 confirm = Confirmar
 delete = Excluir
-view.workshop = Ver na oficina
-workshop.listing = Editar a lista da oficina
-ok = OK
+view.workshop = Ver na Oficina
+workshop.listing = Editar a Lista da Oficina
+ok = Certo
 open = Abrir
-customize = Customizar
+customize = Customizar Regras
 cancel = Cancelar
+command = Comando
+command.queue = Fila
+command.mine = Minerar
+command.repair = Reparar
+command.rebuild = Reconstruir
+command.assist = Auxiliar Jogador
+command.move = Mover
+
+command.boost = Impulso
+command.enterPayload = Inserir Bloco de Carga útil
+command.loadUnits = Carregar Unidades
+command.loadBlocks = Carregar Blocos
+command.unloadPayload = Descarregar Carga
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancelar Ordens
+stance.shoot = Modo: Atirar
+stance.holdfire = Modo: Cessar Fogo
+stance.pursuetarget = Modo: Perseguir Alvo
+stance.patrol = Modo: Patrulhar Caminho
+stance.ram = Modo: Vagar\n[lightgray]Andar em linha reta, ignorando o terreno
+
 openlink = Abrir Link
-copylink = Copiar link
+copylink = Copiar Link
 back = Voltar
-data.export = Exportar dados
-data.import = Importar dados
-data.openfolder = Abrir pasta de dados
+max = Máximo
+objective = Objetivo do Mapa
+crash.export = Exportar Logs de Crashes
+crash.none = Nenhum logs de Crashes Encontrado.
+crash.exported = Logs de Crashes Exportado.
+data.export = Exportar Dados
+data.import = Importar Dados
+data.openfolder = Abrir Pasta de Dados
 data.exported = Dados exportados.
-data.invalid = Estes dados de jogo não são válidos.
-data.import.confirm = Importar dados externos irá deletar[scarlet] todos[] os seus dados atuais.\n[accent]Isso não pode ser desfeito![]\n\nQuando sua data é importada, seu jogo ira sair imediatamente.
+data.invalid = Esse dados de jogo não são válidos.
+data.import.confirm = Importar dados externos irá deletar[scarlet] todos[] os seus dados atuais.\n[accent]Isso não pode ser desfeito![]\n\nQuando seus dados serão importados, seu jogo irá fechar imediatamente.
 quit.confirm = Você tem certeza que quer sair?
-quit.confirm.tutorial = Você tem certeza que você sabe o que você esta fazendo?\nO tutorial pode ser refeito nas [accent] Configurações->Jogo->Refazer Tutorial.[]
 loading = [accent]Carregando...
-reloading = [accent]Recarregando mods...
+downloading = [accent]Baixando...
 saving = [accent]Salvando...
-respawn = [accent][[{0}][] para nascer no núcleo
+respawn = [accent][[{0}][] para renascer
 cancelbuilding = [accent][[{0}][] para cancelar a construção
 selectschematic = [accent][[{0}][] para selecionar + copiar
-pausebuilding = [accent][[{0}][] para parar a construção
+pausebuilding = [accent][[{0}][] para pausar a construção
 resumebuilding = [scarlet][[{0}][] para continuar a construção
+enablebuilding = [scarlet][[{0}][] para habilitar construção
+showui = Interface oculta.\nPressione [accent][[{0}][] para exibir a interface.
+commandmode.name = [accent]Modo de Comando
+commandmode.nounits = [sem unidades]
+
 wave = [accent]Horda {0}
 wave.cap = [accent]Horda {0}/{1}
-wave.waiting = Proxima horda em {0}
+wave.waiting = [lightgray]Próxima horda em {0}
 wave.waveInProgress = [lightgray]Horda em progresso
-waiting = Aguardando...
+waiting = [lightgray]Esperando...
 waiting.players = Esperando por jogadores...
-wave.enemies = [lightgray]{0} inimigos restantes
-wave.enemy = [lightgray]{0} inimigo restante
-wave.guardianwarn = Guardião se aproximando em [accent]{0}[] Hordas.
-wave.guardianwarn.one = Guardião se aproximando em [accent]{0}[] Horda.
-loadimage = Carregar\nimagem
-saveimage = Salvar\nimagem
+wave.enemies = [lightgray]{0} Inimigos Restantes
+wave.enemycores = [accent]{0}[lightgray] Núcleos Inimigos
+wave.enemycore = [accent]{0}[lightgray] Núcleo Inimigo
+wave.enemy = [lightgray]{0} Inimigo Restante
+wave.guardianwarn = Guardião se aproximando em [accent]{0}[] hordas.
+wave.guardianwarn.one = Guardião se aproximando em [accent]{0}[] horda.
+loadimage = Carregar Imagem
+saveimage = Salvar Imagem
 unknown = Desconhecido
 custom = Customizado
-builtin = Padrão
-map.delete.confirm = Certeza que quer deletar este mapa? Isto não pode ser desfeito!
-map.random = [accent]Mapa aleatório
-map.nospawn = Este mapa não possui nenhum núcleo para o jogador nascer! Adicione um núcleo[accent] amarelo[] para este mapa no editor.
-map.nospawn.pvp = Esse mapa não tem núcleos inimigos para os jogadores nascerem! Adicione[scarlet] núcleos vermelhos[] no mapa no editor.
-map.nospawn.attack = Esse mapa não tem nenhum núcleo inimigo para o jogador atacar! coloque[scarlet] núcleos[] vermelhos no editor.
+builtin = Embutido
+map.delete.confirm = Você tem certeza que quer deletar este mapa? Isso não pode ser revertido!
+map.random = [accent]Mapa Aleatório
+map.nospawn = Este mapa não possui nenhum Núcleo para o jogador nascer! Adicione um Núcleo {0} para este mapa no editor.
+map.nospawn.pvp = Esse mapa não tem Núcleos inimigos para os jogadores nascerem! Adicione [scarlet]Núcleos não-laranjas[] para este mapa no editor.
+map.nospawn.attack = Esse mapa não tem nenhum Núcleo inimigo para o jogador atacar! Adicione um Núcleos {0} para este mapa no editor.
 map.invalid = Erro ao carregar o mapa: Arquivo de mapa invalido ou corrupto.
-workshop.update = Atualizar item
+workshop.update = Atualizar Item
 workshop.error = Erro buscando os detalhes da oficina: {0}
 map.publish.confirm = Você tem certeza de que quer publicar este mapa?\n\n[lightgray]Tenha certeza de que você concorda com o EULA da oficina primeiro, ou seus mapas não serão mostrados!
 workshop.menu = Selecione oquê você gostaria de fazer com esse item.
 workshop.info = Informação do item
 changelog = Mudanças (opcional):
+updatedesc = Sobrescrever Título e Descrição
 eula = EULA da Steam
 missing = Este item foi deletado ou movido.\n[lightgray]O listamento da oficina foi automaticamente desligado.
 publishing = [accent]Publicando...
 publish.confirm = Você tem certeza de que quer publicar isso?\n\n[lightgray]Primeiramente tenha certeza de que você concorda com o EULA da oficina, ou seus itens não irão aparecer!
-publish.error = Erro publicando o item: {0}
+publish.error = Erro ao publicar o item: {0}
 steam.error = Falha em iniciar os serviços da Steam.\nErro: {0}
 
+editor.planet = Planeta:
+editor.sector = Setor:
+editor.seed = Seed:
+editor.cliffs = Paredes para Penhascos
 editor.brush = Pincel
 editor.openin = Abrir no editor
 editor.oregen = Geração de minério
@@ -324,41 +448,78 @@ editor.oregen.info = Geração de minério:
 editor.mapinfo = Informação do mapa
 editor.author = Autor:
 editor.description = Descrição:
-editor.nodescription = Um mapa deve ter uma descrição de no mínimo 4 caracteres antes de ser publicado.
+editor.nodescription = Um mapa deve ter uma descrição de ao mínimo 4 caracteres antes de ser publicado.
 editor.waves = Hordas:
 editor.rules = Regras:
 editor.generation = Geração:
+editor.objectives = Objetivos:
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Editar em jogo
+editor.playtest = Jogar Teste
 editor.publish.workshop = Publicar na oficina
 editor.newmap = Novo mapa
-editor.center = Center
+editor.center = Centro
+editor.search = Procurar mapas...
+editor.filters = Filtrar mapas
+editor.filters.mode = Modos de jogo:
+editor.filters.type = Tipo:
+editor.filters.search = Procurar em:
+editor.filters.author = Autor
+editor.filters.description = Descrição
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Oficina
 waves.title = Hordas
 waves.remove = Remover
-waves.never = <nunca>
 waves.every = a cada
 waves.waves = Horda(s)
+waves.health = vida: {0}%
 waves.perspawn = por spawn
 waves.shields = Escudo/Horda
 waves.to = para
-waves.guardian = Guardian
+waves.spawn = spawn:
+waves.spawn.all = <tudo>
+waves.spawn.select = Seletor de Spawn
+waves.spawn.none = [scarlet]sem spawns no mapa
+waves.max = quantidade máxima
+waves.guardian = Guardião
 waves.preview = Pré-visualizar
 waves.edit = Editar...
+waves.random = Random
 waves.copy = Copiar para área de transferência
 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.
+waves.sort = Ordenar por
+waves.sort.reverse = Inverter ordem
+waves.sort.begin = Começar
+waves.sort.health = Vida
+waves.sort.type = Tipo
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Esconder tudo
+waves.units.show = Mostrar tudo
 
+#these are intentionally in lower case
 wavemode.counts = quantidade
 wavemode.totals = total
 wavemode.health = vida
+all = All
 
 editor.default = [lightgray]<padrão>
 details = Detalhes...
 edit = Editar...
+variables = Variáveis
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Nome:
-editor.spawn = Criar unidade
+editor.spawn = Spawnar unidade
 editor.removeunit = Remover unidade
 editor.teams = Times
 editor.errorload = Erro ao carregar arquivo:\n[accent]{0}
@@ -368,13 +529,19 @@ editor.errorlegacy = Esse mapa é velho demais, e usa um formato de mapa legacy
 editor.errornot = Este não é um arquivo de mapa.
 editor.errorheader = Este arquivo de mapa não é mais válido ou está corrompido.
 editor.errorname = O mapa não tem nome definido.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Atualizar
 editor.randomize = Aleatorizar
+editor.moveup = Mover para Cima
+editor.movedown = Mover para Baixo
+editor.copy = Copiar
 editor.apply = Aplicar
 editor.generate = Gerar
+editor.sectorgenerate = Gerar Setor
 editor.resize = Redimen-\nsionar
 editor.loadmap = Carregar\nmapa
 editor.savemap = Salvar\nmapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Salvo!
 editor.save.noname = Seu mapa não tem um nome! Coloque um no menu de "Informação do mapa"
 editor.save.overwrite = O seu mapa substitui um mapa já construído! Coloque um nome diferente no menu "Informação do mapa"
@@ -413,16 +580,22 @@ toolmode.eraseores = Apagar minérios
 toolmode.eraseores.description = Apaga apenas minérios.
 toolmode.fillteams = Preencher times
 toolmode.fillteams.description = Muda o time do qual todos os blocos pertencem.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Desenhar times
 toolmode.drawteams.description = Muda o time do qual o bloco pertence.
+#unused
+toolmode.underliquid = sob líquidos
+toolmode.underliquid.description = Desenhe pisos sob ladrilhos líquidos.
+
+filters.empty = [lightgray]Sem filtros! Adicione um usando o botão abaixo.
 
-filters.empty = [lightgray]Sem filtro! Adicione um usando o botão abaixo.
 filter.distort = Distorcedor
 filter.noise = Geração aleatória
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
-filter.corespawn = Core Select
-filter.median = Medio
+filter.enemyspawn = Seleção de Spawn do Inimigo
+filter.spawnpath = Caminho para o Spawn
+filter.corespawn = Seleção de Núcleo
+filter.median = Médio
 filter.oremedian = Minério mediano
 filter.blend = Misturar
 filter.defaultores = Minérios padrão
@@ -433,6 +606,8 @@ filter.clear = Excluir
 filter.option.ignore = Ignorar
 filter.scatter = Dispersão
 filter.terrain = Terreno
+filter.logic = Logic
+
 filter.option.scale = Escala
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -441,17 +616,39 @@ filter.option.circle-scale = Escala de círculo
 filter.option.octaves = Oitavas
 filter.option.falloff = Caída
 filter.option.angle = Ângulo
-filter.option.amount = Amount
+filter.option.tilt = Inclinação
+filter.option.rotate = Rotacionar
+filter.option.amount = Quantidade
 filter.option.block = Bloco
 filter.option.floor = Chão
 filter.option.flooronto = Chão alvo
-filter.option.target = Target
+filter.option.target = Alvo
+filter.option.replacement = Reposição
 filter.option.wall = Parede
 filter.option.ore = Minério
 filter.option.floor2 = Chão secundário
 filter.option.threshold2 = Margem secundária
 filter.option.radius = Raio
 filter.option.percentile = Percentual
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Largura:
 height = Altura:
@@ -462,6 +659,9 @@ load = Carregar
 save = Salvar
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Por favor, reinicie seu jogo para a tradução ser aplicada.
 settings = Configu-\nrações
 tutorial = Tutorial
@@ -472,85 +672,269 @@ mapeditor = Editor de mapa
 abandon = Abandonar
 abandon.text = Esta zona e todos os seus recursos serão perdidos para o inimigo.
 locked = Trancado
-complete = [lightgray]Completo:
+complete = [lightgray]Complete:
 requirement.wave = Alcançar a Horda {0} em {1}
 requirement.core = Destruir o núcleo inimigo em {0}
-requirement.research = Research {0}
+requirement.research = Pesquise {0}
+requirement.produce = Produza {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Melhor: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
+requirement.onplanet = Controle o setor em {0}
+requirement.onsector = Lance no setor: {0}
+launch.text = Lançar
+map.multiplayer = Apenas o host consegue ver os setores.
 uncover = Descobrir
 configure = Configurar carregamento
-loadout = Loadout
-resources = Resources 
+
+objective.research.name = Pesquise
+objective.produce.name = Obtenha
+objective.item.name = Obtenha o Item
+objective.coreitem.name = Item do Núcleo
+objective.buildcount.name = Quantidade de Construções
+objective.unitcount.name = Quantidade de Unidades
+objective.destroyunits.name = Destrua Unidades
+objective.timer.name = Timer
+objective.destroyblock.name = Destrua Bloco
+objective.destroyblocks.name = Destrua Blocos
+objective.destroycore.name = Destrua o Núcleo
+objective.commandmode.name = Modo de Comando
+objective.flag.name = Flag
+
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Texto
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+
+marker.background = Fundo
+marker.outline = Contorno
+
+objective.research = [accent]Pesquise:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtenha:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destrua:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destrua: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtenha: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Mova para o Núcleo:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Construa: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Construa Unidade: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destrua: [][lightgray]{0}[]x Unidades
+objective.enemiesapproaching = [accent]Inimigos se aproximando em [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destrua o Núcleo Inimigo
+objective.command = [accent]Comande Unidades
+objective.nuclearlaunch = [accent]⚠ Lançamento Nuclear Detectado: [lightgray]{0}
+
+announce.nuclearstrike = [red]âš  ATAQUE NUCLEAR CHEGANDO âš 
+
+loadout = Carregamento
+resources = Recursos
+resources.max = Máximo
 bannedblocks = Blocos Banidos
+unbannedblocks = Unbanned Blocks
+objectives = Objetivos
+bannedunits = Unidades Banidas
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Adicionar Todos
-launch.destination = Destination: {0}
+launch.from = Lançando de: [accent]{0}
+launch.capacity = Capacidade para Lançamento de Itens: [accent]{0}
+launch.destination = Destino: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = Recursos detectados:
-zone.objective = [lightgray]Objetivo: [accent]{0}
-zone.objective.survival = Sobreviver
-zone.objective.attack = Destruir o núcleo inimigo
 add = Adicionar...
-boss.health = Vida do Chefão
+guardian = Guardião
 
 connectfail = [crimson]Falha ao entrar no servidor: [accent]{0}
 error.unreachable = Servidor fora de alcance.
 error.invalidaddress = Endereço inválido.
-error.timedout = Desconectado!\nTenha certeza que o anfitrião tenha feito redirecionamento de portas e que o endereço esteja correto!
+error.timedout = Desconectado!\nTenha certeza que o anfitrião tenha feito o port forwarding e que o endereço esteja correto!
 error.mismatch = Erro de pacote:\nPossivel incompatibilidade com a versão do cliente/servidor.\nTenha certeza que você e o anfitrião tenham a última versão!
 error.alreadyconnected = Já conectado.
 error.mapnotfound = Arquivo de mapa não encontrado!
 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
-weather.sandstorm.name = Sandstorm
-weather.sporestorm.name = Sporestorm
-weather.fog.name = Fog
+weather.rain.name = Chuva
+weather.snowing.name = Neve
+weather.sandstorm.name = Tempestade de Areia
+weather.sporestorm.name = Tempestade de Esporos
+weather.fog.name = Névoa
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Parabéns.\n\nO inimigo em {0} foi derrotado.\n[lightgray]O setor final foi conquistado.
 
-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)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+sectorlist = Setores
+sectorlist.attacked = {0} sob ataque
+sectors.unexplored = [lightgray]Inexplorado
+sectors.resources = Recursos:
+sectors.production = Produção:
+sectors.export = Exportar:
+sectors.import = Importar:
+sectors.time = Tempo:
+sectors.threat = Ameaça:
+sectors.wave = Horda:
+sectors.stored = Armazenado:
+sectors.resume = Continuar
+sectors.launch = Lançar
+sectors.select = Selecionar
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]nenhum (sun)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Renomear Setor
+sectors.enemybase = [scarlet]Base Inimiga
+sectors.vulnerable = [scarlet]Vulnerável
+sectors.underattack = [scarlet]Sob Ataque! [accent]{0}% danificado
+sectors.underattack.nodamage = [scarlet]Não Capturado
+sectors.survives = [accent]Sobreviva {0} hordas
+sectors.go = Ir
+sector.abandon = Abandonar
+sector.abandon.confirm = O(s) Núcleo(s) desse setor vão se auto-destruir.\nContinuar?
+sector.curcapture = Setor Capturado
+sector.curlost = Setor Perdido
+sector.missingresources = [scarlet]Recursos Insuficientes no Núcleo
+sector.attacked = Setor [accent]{0}[white] sob ataque!
+sector.lost = Setor [accent]{0}[white] perdido!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Trocar �cone
+sector.noswitch.title = Incapaz de Mudar de Setores
+sector.noswitch = Você não pode trocar de setor enquanto um setor existente estiver sob ataque.\n\nSetor: [accent]{0}[] em [accent]{1}[]
+sector.view = Visualizar Setor
+
+threat.low = Baixa
+threat.medium = Média
+threat.high = Alta
+threat.extreme = Extrema
+threat.eradication = Erradicação
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
+planets = Planetas
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Sol
 
-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.impact0078.name = Impacto 0078
+sector.groundZero.name = Marco Zero
+sector.craters.name = As Crateras
+sector.frozenForest.name = Floresta Congelada
+sector.ruinousShores.name = Costas Ruinosas
+sector.stainedMountains.name = Montanhas Manchadas
+sector.desolateRift.name = Fenda Desolada
+sector.nuclearComplex.name = Complexo de Produção Nuclear
+sector.overgrowth.name = Supercrescimento
+sector.tarFields.name = Campos de Petróleo
+sector.saltFlats.name = Planícies de Sal
+sector.fungalPass.name = Passagem Fúngica
+sector.biomassFacility.name = Instalação de Síntese de Biomassa
+sector.windsweptIslands.name = Ilhas Ventadas
+sector.extractionOutpost.name = Posto Avançado de Extração
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Terminal de Lançamento Planetário.
+sector.coastline.name = Litoral
+sector.navalFortress.name = Fortaleza Naval
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.
+sector.groundZero.description = Um lugar bom para recomeçar. Baixa ameaça inimiga. Poucos recursos.\nConsiga o máximo possível de chumbo e cobre.\nContinue.
+sector.frozenForest.description = Mesmo aqui, perto das montanhas, os esporos se espalharam. As temperaturas baixas não conseguirão contê-los para sempre.\n\nComeçe a aventura com energia. Construa geradores a combustão. Aprenda a usar reparadores.
+sector.saltFlats.description = Nos arredores do deserto ficam as planícies de sal. Muitos recursos podem ser encontrados nesse local.\n\nO inimigo construiu um complexo de armazenamento de recursos aqui. Destrua o núcleo deles. Não deixe nada sobrando.
+sector.craters.description = A água se acumulou nessa cratera, relíquias de guerras antigas. Re-conquiste a área. Colete areia. Faça metavidro. Use a água para melhorar suas brocas e torretas.
+sector.ruinousShores.description = Passando o terreno desolado, está localizada a costa. Antigamente, este local abrigava uma rede de defesa costeira. Não restou muita coisa. Apenas as estruturas de defesas básicas permaneceram ilesas, o resto foi reduzido a sucata.\nContinue expandindo seus territórios, re-descubra a tecnologia.
+sector.stainedMountains.description = Mais para o interior estão as montanhas, ainda não contaminadas pelos esporos.\nExtraia o titânio que é abundante nessa área. Aprenda a usá-lo.\n\nA presença inimiga é maior aqui. Não dê tempo a eles de trazerem fortes unidades.
+sector.overgrowth.description = Essa área coberta por vegetação, próxima ao local de origem dos esporos.\nO inimigo estabeleceu um posto de controle aqui. Faça unidades Titan. Destrua eles. Recupere o que foi perdido.
+sector.tarFields.description = Nos arredores de uma zone de produção de petróleo, entre as montanhas e o deserto. Uma das poucas áreas com reservas de piche utilizáveis.\nMesmo abandonada, essa área tem forças inimigas por perto. Não subestime-os.\n\n[lightgray]Pesquise a tecnologia de processamento de petróleo se possível.
+sector.desolateRift.description = Uma zona extremamente perigosa. Uma zona com recursos abundantes, mas pouco espaço. Grande risco de destruição. Saia o quanto antes. Não se deixe levar pelo tempo entre os ataques inimigos.
+sector.nuclearComplex.description = Uma antiga instalação de produção e processamento de tório, reduzida a ruínas.\n[lightgray]Pesquise sobre o tório e seu vários usos.\n\nO inimigo está presente aqui em grande número, constantemente procurando por atacantes.
+sector.fungalPass.description = Uma área de transição entre altas montanhas e terras baixas, repletas de esporos. Uma pequena base de reconhecimento inimiga está aqui.\nDestrua o núcleo.
+sector.biomassFacility.description = A origem dos esporos. Essa é a instalação onde eles foram pesquisados e produzidos inicialmente. Pesquise a tecnologia contido na instalação. Cultive esporos para a produção de combustíveis e plásticos. \n\nNo falecimento da instalação, os esporos foram liberados. Nada no ecossistema local conseguia competir com um organismo tão invasivo.
+sector.windsweptIslands.description = Um pouco depois do literal tem essa remota série de ilhas. Registros mostram eles haviam estruturas produtoras de [accent]Plastânio[].\n\nAfase as unidades navais inimigas. Estabeleça uma base nas ilhas. Pesquise essas fábricas.
+sector.extractionOutpost.description = Um posto avançado remoto, construído pelo inimigo com o objetivo de lançar recursos para outros setores.\n\nTecnologia de transporte entre setores é essencial para mais conquista de território. Destrua a base. Pesquise suas Plataformas de Lançamento.
+sector.impact0078.description = Aqui repousas restos de um reservatório de transporte interestelar que entrou nesse sistema primeiro.\nSalve o quanto puder dos destroços. Pesquise qualquer tecnologia intacta.
+sector.planetaryTerminal.description = O último alvo.\n\nEssa base costeira contém a estrutura capaz de lançar Núcleos para planetas locais. É extremamente bem guardado.\n\nProduza unidades navais. Elimine o inimigo o mais rápido o possível. pesquise a estrutura de lançamento.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = O Começo
+sector.aegis.name = Aegis
+sector.lake.name = O Lago
+sector.intersect.name = Intersecção
+sector.atlas.name = Atlas
+sector.split.name = A Divisão
+sector.basin.name = A Bacia
+sector.marsh.name = O Brejo
+sector.peaks.name = Picos
+sector.ravine.name = Ravina
+sector.caldera-erekir.name = Caldeira
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = O setor de tutorial. Este objetivo ainda não foi criado. Aguarde mais informações.
+#TODO - no shield breaker anymore.
+sector.aegis.description = O inimigo é protegido por escudos. Um módulo de quebra-escudos experimental foi detectado neste setor.\nLocalize esta estrutura. Forneça munição de tungstênio e destrua a base inimiga.
+sector.lake.description = O lago de escória deste setor limita muito as unidades viáveis. Uma unidade flutuante é a única opção.\nPesquise o [accent]construtor de naves[] e produza uma unidade [accent]elude[] o mais rápido possível.
+sector.intersect.description = Scanners sugerem que este setor será atacado de vários lados logo após o pouso.\nFaça defesas rapidamente e expanda o mais rápido possível.\nUnidades [accent]Mech[] serão necessárias para o terreno acidentado da área.
+sector.atlas.description = Este setor contém terreno variado e exigirá uma variedade de unidades para atacar de forma eficaz.\nUnidades melhoradas também podem ser necessárias para passar por algumas das bases inimigas mais difíceis detectadas aqui.\nPesquise o [accent]Eletrolisador[] e o [accent]Refrabicador de Tanques[].
+sector.split.description = A presença mínima de inimigos neste setor o torna perfeito para testar novas tecnologias de transporte.
+sector.basin.description = {Temporary}\n\nO último setor por enquanto. Considere isso um nível de desafio - mais setores serão adicionados em novas atualizações.
+sector.marsh.description = Este setor tem abundância de arquicita, mas tem respiradouros limitados.\nConstrua [accent]Câmaras de Combustão Química[] para gerar energia.
+sector.peaks.description = O terreno montanhoso neste setor torna a maioria das unidades inúteis. Unidades voadoras serão necessárias.\nEsteja ciente das instalações antiaéreas inimigas. Pode ser possível desativar algumas dessas instalações visando seus edifícios de apoio.
+sector.ravine.description = Nenhum núcleo inimigo detectado no setor, embora seja uma importante rota de transporte para o inimigo. Espere uma variedade de forças inimigas.\nProduza [accent]liga de surto[]. Construa torretas [accent]Afflict[].
+sector.caldera-erekir.description = Os recursos detectados neste setor estão espalhados por várias ilhas.\nPesquise e implante transporte baseado em drones.
+sector.stronghold.description = O grande acampamento inimigo neste setor guarda depósitos significativos de [accent]tório[].\nUse-o para desenvolver unidades e torres de nível superior.
+sector.crevice.description = O inimigo enviará forças de ataque ferozes para destruir sua base neste setor.\nDesenvolver [accent]carbide[] e o [accent]gerador de pirólise[] pode ser imperativo para a sobrevivência.
+sector.siege.description = Este setor apresenta dois desfiladeiros paralelos que forçarão um ataque em duas frentes.\nPesquise [accent]cianogênio[] para obter a capacidade de criar unidades de tanques ainda mais fortes.\nCuidado: mísseis inimigos de longo alcance foram detectados. Os mísseis podem ser derrubados antes do impacto.
+sector.crossroads.description = As bases inimigas neste setor foram estabelecidas em terrenos variados. Pesquise diferentes unidades para adaptar.\nAlém disso, algumas bases são protegidas por escudos. Descubra como eles são alimentados.
+sector.karst.description = Este setor é rico em recursos, mas será atacado pelo inimigo assim que um novo núcleo chegar.\nAproveite os recursos e pesquise [accent]fase de tecido[].
+sector.origin.description = O setor final com uma presença inimiga significativa.\nNenhuma oportunidade de pesquisa provável permanece - concentre-se apenas em destruir todos os núcleos inimigos.
+
+status.burning.name = Queimando
+status.freezing.name = Congelando
+status.wet.name = Molhado
+status.muddy.name = Barrento
+status.melting.name = Derretendo
+status.sapped.name = Enfraquecido
+status.electrified.name = Eletrificado
+status.spore-slowed.name = Esporo-Desaceleração
+status.tarred.name = Alcatroado
+status.overdrive.name = Sobrecarga
+status.overclock.name = Overclock
+status.shocked.name = Chocado
+status.blasted.name = Impactado
+status.unmoving.name = Imóvel
+status.boss.name = Guardião
 
 settings.language = Idioma
 settings.data = Dados do jogo
@@ -564,52 +948,62 @@ 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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
+settings.clearsaves.confirm = Você tem certeza que quer apagar todos os seus saves?
+settings.clearsaves = Apagar Saves
+settings.clearresearch = Apagar Pesquisas
+settings.clearresearch.confirm = Você tem certeza que quer apagar todas as suas pesquisas da campanha?
+settings.clearcampaignsaves = Apagar Saves da Campanha
+settings.clearcampaignsaves.confirm = Você tem certeza que quer apagar todos os seus saves da campanha?
 paused = Pausado
 clear = Limpo
 banned = [scarlet]BANIDO
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Ambiente não suportado
 yes = Sim
 no = Não
 info.title = [accent]Informação
 error.title = [crimson]Ocorreu um Erro.
 error.crashtitle = Ocorreu um Erro
-unit.nobuild = [scarlet]Unit can't build
-lastaccessed = [lightgray]Last Accessed: {0}
+unit.nobuild = [scarlet]Unidades não podem construir
+lastaccessed = [lightgray]Último Acesso: {0}
+lastcommanded = [lightgray]Último Comando: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <carregar mapa para mostrar>
+stat.description = Propósito
 
 stat.input = Entrada
 stat.output = Saída
+stat.maxefficiency = Eficiência Máxima
 stat.booster = Apoio
-stat.tiles = Required Tiles
-stat.affinities = Affinities
+stat.tiles = Blocos Necessários
+stat.affinities = Afinidades
+stat.opposites = Opostos
 stat.powercapacity = Capacidade de Energia
 stat.powershot = Energia/tiro
 stat.damage = Dano
 stat.targetsair = Mira no ar
 stat.targetsground = Mira no chão
 stat.itemsmoved = Velocidade de movimento
-stat.launchtime = Tempo entre Disparos.
+stat.launchtime = Tempo entre Disparos
 stat.shootrange = Alcance
 stat.size = Tamanho
-stat.displaysize = Display Size
+stat.displaysize = Tamanho do Display
 stat.liquidcapacity = Capacidade de Líquido
 stat.powerrange = Alcance da Energia
-stat.linkrange = Link Range
-stat.instructions = Instructions
+stat.linkrange = Alcance do Link
+stat.instructions = Instruções
 stat.powerconnections = Conexões Máximas
 stat.poweruse = Uso de energia
-stat.powerdamage = Dano/Poder
+stat.powerdamage = Dano / Poder
 stat.itemcapacity = Capacidade de Itens
-stat.memorycapacity = Memory Capacity
+stat.memorycapacity = Capacidade de Memória
 stat.basepowergeneration = Geração de poder base
 stat.productiontime = Tempo de produção
 stat.repairtime = Tempo de reparo total do bloco
+stat.repairspeed = Taxa de Reparo
+stat.weapons = Armas
+stat.bullet = Projétil
+stat.moduletier = Tier do Módulo
+stat.unittype = Unit Type
 stat.speedincrease = Aumento de velocidade
 stat.range = Distância
 stat.drilltier = Brocas
@@ -617,129 +1011,212 @@ stat.drillspeed = Velocidade base da Broca
 stat.boosteffect = Efeito do Impulso
 stat.maxunits = Máximo de unidades ativas
 stat.health = Saúde
+stat.armor = Armadura
 stat.buildtime = Tempo de construção
-stat.maxconsecutive = Max Consecutive
+stat.maxconsecutive = Máximo Consecutivo
 stat.buildcost = Custo de construção
 stat.inaccuracy = Imprecisão
 stat.shots = Tiros
 stat.reload = Tempo de recarga
 stat.ammo = Munição
-stat.shieldhealth = Shield Health
+
+stat.shieldhealth = Vida do Escudo
 stat.cooldowntime = Tempo de espera
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.explosiveness = Explosividade
+stat.basedeflectchance = Chance Base de Esquiva
+stat.lightningchance = Chance de Raio
+stat.lightningdamage = Dano por Raio
+stat.flammability = Inflamabilidade
+stat.radioactivity = Radioatividade
+stat.charge = Carga de Eletricidade
+stat.heatcapacity = Capacidade de Aquecimento
+stat.viscosity = Viscosidade
+stat.temperature = Temperatura
+stat.speed = Velocidade
+stat.buildspeed = Velocidade de Construção
+stat.minespeed = Velocidade de Mineração
+stat.minetier = Nível de Mineração
+stat.payloadcapacity = Capacidade de Carga
+stat.abilities = Habilidades
+stat.canboost = Pode impulsionar
+stat.flying = Voador
+stat.ammouse = Consumo de Munição
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Multiplicador de Dano
+stat.healthmultiplier = Multiplicador de Vida
+stat.speedmultiplier = Multiplicador de Velocidade
+stat.reloadmultiplier = Multiplicador de Recarregamento
+stat.buildspeedmultiplier = Multiplicador de Velocidade de Construção
+stat.reactive = Reage
+stat.immunities = Imunidades
+stat.healing = Reparo
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = Campo de Força
+ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.repairfield = Campo de Reparação
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Campo de Status
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fábrica
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Raio de Regeneração do Escudo
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Raio de Movimento
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Arco do Escudo
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Campo de Energia
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
+bar.onlycoredeposit = Somente depósito no núcleo permitido
 bar.drilltierreq = Broca melhor necessária.
-bar.noresources = Missing Resources
-bar.corereq = Core Base Required
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Recursos Insuficientes
+bar.corereq = Base do Núcleo Necessária
+bar.corefloor = Zona do Núcleo Necessária
+bar.cargounitcap = Limite da carga de unidade atingido
 bar.drillspeed = Velocidade da Broca: {0}/s
 bar.pumpspeed = Velocidade da Bomba: {0}/s
 bar.efficiency = Eficiência: {0}%
+bar.boost = Impulso: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Energia: {0}
 bar.powerstored = Armazenada: {0}/{1}
 bar.poweramount = Energia: {0}
 bar.poweroutput = Saída de energia: {0}
-bar.powerlines = Connections: {0}/{1}
+bar.powerlines = Conexões: {0}/{1}
 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.liquid = Líquido
+bar.heat = Calor
+bar.cooldown = Cooldown
+bar.instability = Instabilidade
+bar.heatamount = Calor: {0}
+bar.heatpercent = Calor: {0} ({1}%)
+bar.power = Energia
 bar.progress = Progresso da construção
+bar.loadprogress = Progresso
+bar.launchcooldown = Cooldown de Lançamento
 bar.input = Entrada
-bar.output = Sainda
+bar.output = Saída
+bar.strength = [stat]{0}[lightgray]x força
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]Controlado por Processador
 
 bullet.damage = [stat]{0}[lightgray] de dano
 bullet.splashdamage = [stat]{0}[lightgray] de dano em área ~[stat] {1}[lightgray] bloco(s)
 bullet.incendiary = [stat]Incendiário
 bullet.homing = [stat]Guiado
-bullet.shock = [stat]Choque
-bullet.frag = [stat]Fragmentação
-bullet.knockback = [stat]{0}[lightgray]Impulso
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]Congelamento
-bullet.tarred = [stat]Grudento
+bullet.armorpierce = [stat]pentração de armadura
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x balas de fragmentação:
+bullet.lightning = [stat]{0}[lightgray]x raio ~ [stat]{1}[lightgray] dano
+bullet.buildingdamage = [stat]{0}%[lightgray] dano em construção
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] Impulso
+bullet.pierce = [stat]{0}[lightgray]x perfuração
+bullet.infinitepierce = [stat]perfuração
+bullet.healpercent = [stat]{0}[lightgray]% reparo
+bullet.healamount = [stat]{0}[lightgray] reparo direto
 bullet.multiplier = [stat]{0}[lightgray]x multiplicador de munição
 bullet.reload = [stat]{0}[lightgray]x cadência de tiro
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = Blocos
-unit.blockssquared = blocks²
-unit.powersecond = unidades de energia por segundo
-unit.liquidsecond = líquido segundo
-unit.itemssecond = itens por segundo
-unit.liquidunits = unidades de liquido
+unit.blockssquared = Blocos²
+unit.powersecond = unidades de energia/seg
+unit.tilessecond = blocos/seg
+unit.liquidsecond = líquido/seg
+unit.itemssecond = itens/seg
+unit.liquidunits = unidades de líquido
 unit.powerunits = unidades de energia
+unit.heatunits = unidades de calor
 unit.degrees = Graus
 unit.seconds = segundos
 unit.minutes = mins
-unit.persecond = por segundo
+unit.persecond = /segundo
 unit.perminute = /min
 unit.timesspeed = x Velocidade
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = shield health
+unit.shieldhealth = Saúde do escudo
 unit.items = itens
 unit.thousands = k
 unit.millions = m
 unit.billions = b
+unit.shots = shots
+unit.pershot = /disparo
+category.purpose = Propósito
 category.general = Geral
 category.power = Energia
 category.liquids = Líquidos
 category.items = Itens
 category.crafting = Entrada/Saída
-category.function = Function
+category.function = Função
 category.optional = Melhoras opcionais
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Pular animação de lançamento/pouso do Núcleo
 setting.landscape.name = Travar panorama
 setting.shadows.name = Sombras
 setting.blockreplace.name = Sugestões automáticas de blocos
 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.logichints.name = Dicas de Lógica
+setting.backgroundpause.name = Pausar em segundo plano
+setting.buildautopause.name = Pausar Automaticamente Quando for Construir
+setting.doubletapmine.name = Clique Duplo Para Minerar
+setting.commandmodehold.name = Segure para o modo de comando
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Desativar Mods em Crash de Começo
 setting.animatedwater.name = �gua animada
 setting.animatedshields.name = Escudos animados
-setting.antialias.name = Filtro suavizante[lightgray] (reinicialização requerida)[]
-setting.playerindicators.name = Player Indicators
+setting.playerindicators.name = Indicador de Jogadores
 setting.indicators.name = Indicador de aliados/inimigos
-setting.autotarget.name = Alvo automatico
+setting.autotarget.name = Alvo automático
 setting.keyboard.name = Controles de mouse e teclado
 setting.touchscreen.name = Controles de Touchscreen
 setting.fpscap.name = FPS Máximo
 setting.fpscap.none = Nenhum
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = Escala da\ninterface[lightgray] (reinicialização requerida)[]
+setting.uiscale.description = Reinicialização necessária para aplicar as alterações.
 setting.swapdiagonal.name = Sempre colocação diagonal
-setting.difficulty.training = Treinamento
-setting.difficulty.easy = Fácil
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Difícil
-setting.difficulty.insane = Insano
-setting.difficulty.name = Dificuldade
-setting.screenshake.name = Balanço da Tela
+setting.screenshake.name = Vibração da Tela
+setting.bloomintensity.name = Itensidade do Bloom
+setting.bloomblur.name = Desfoque do Bloom
 setting.effects.name = Efeitos
 setting.destroyedblocks.name = Mostrar Blocos Destruídos
 setting.blockstatus.name = Mostrar a Propriedade dos Blocos
@@ -747,46 +1224,54 @@ setting.conveyorpathfinding.name = Esteiras Encontram Caminho
 setting.sensitivity.name = Sensibilidade do Controle
 setting.saveinterval.name = Intervalo de Auto Salvamento
 setting.seconds = {0} segundos
-setting.blockselecttimeout.name = Tempo limite de seleção de blocos
 setting.milliseconds = {0} milissegundos
 setting.fullscreen.name = Tela Cheia
 setting.borderlesswindow.name = Janela sem borda[lightgray] (Pode precisar reiniciar)
+setting.borderlesswindow.name.windows = Tela cheia sem borda
+setting.borderlesswindow.description = Pode ser necessário reiniciar para aplicar as alterações.
 setting.fps.name = Mostrar FPS e Ping
-setting.smoothcamera.name = Suavizar movimentos da câmera 
+setting.console.name = Ativar console
+setting.smoothcamera.name = Suavizar movimentos da câmera
 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.coreitems.name = Mostrar Itens no Núcleo (WIP)
 setting.position.name = Mostrar a posição do Jogador
+setting.mouseposition.name = Mostrar posição do mouse
 setting.musicvol.name = Volume da Música
 setting.atmosphere.name = Mostrar a atmosfera do planeta
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Volume do Ambiente
 setting.mutemusic.name = Desligar Música
 setting.sfxvol.name = Volume de Efeitos
 setting.mutesound.name = Desligar Som
 setting.crashreport.name = Enviar denúncias anônimas de erros
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Criar salvamentos automaticamente
-setting.publichost.name = Visibilidade do jogo público
-setting.playerlimit.name = Player Limit
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Limites de Player
 setting.chatopacity.name = Opacidade do chat
 setting.lasersopacity.name = Opacidade do laser
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Opacidade da ponte
 setting.playerchat.name = Mostrar chat em jogo
-public.confirm = Você quer fazer sua partida pública?\n[accent]Qualquer um será capaz de entrar na sua partida.\n[lightgray]Isso pode ser mudado depois em Configurações->Jogo->Visibilidade da partida pública.
-public.beta = Note que as versões beta do jogo não podem fazer salas publicas.
+setting.showweather.name = Mostrar Gráficos do Clima
+setting.hidedisplays.name = Ocultar Displays de Lógicos
+setting.macnotch.name = Adaptar a interface para exibir o entalhe
+setting.macnotch.description = Reinicialização necessária para aplicar as alterações
+steam.friendsonly = Amigos apenas
+steam.friendsonly.tooltip = Se apenas amigos do Steam poderão entrar no seu jogo.\nDesmarcar esta caixa tornará seu jogo público - qualquer pessoa pode entrar.
+public.beta = Note que as versões beta do jogo não podem fazer salas públicas.
 uiscale.reset = A escala da interface foi mudada.\nPressione "OK" para confirmar esta escala.\n[scarlet]Revertendo e saindo em[accent] {0}[] segundos...
 uiscale.cancel = Cancelar e sair
 setting.bloom.name = Bloom
 keybind.title = Refazer teclas
-keybinds.mobile = [scarlet]A maior parte das teclas aqui não são funcionais em dispositivos móveis. Apenas movimento básico é suportado.
+keybinds.mobile = [scarlet]A maior parte das teclas aqui não são funcionais em dispositivos móveis. É unicamente suportado movimento básico.
 category.general.name = Geral
 category.view.name = Ver
+category.command.name = Unit Command
 category.multiplayer.name = Multijogador
 category.blocks.name = Selecionar bloco
-command.attack = Atacar
-command.rally = Reunir
-command.retreat = Recuar
-command.idle = Ausente
 placement.blockselectkeys = \n[lightgray]Tecla: [{0},
 keybind.respawn.name = Reaparecer
 keybind.control.name = Controlar unidade
@@ -795,12 +1280,33 @@ keybind.press = Pressione uma tecla...
 keybind.press.axis = Pressione um eixo ou tecla...
 keybind.screenshot.name = Captura do mapa
 keybind.toggle_power_lines.name = Mudar lasers
-keybind.toggle_block_status.name = Mostrar a propriedade dos blocos
+keybind.toggle_block_status.name = Mostrar as propriedades dos blocos
 keybind.move_x.name = Mover no eixo x
 keybind.move_y.name = Mover no eixo Y
 keybind.mouse_move.name = Seguir o Cursor
 keybind.pan.name = Câmera livre
 keybind.boost.name = Impulsionar
+keybind.command_mode.name = Modo de Comando
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 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
@@ -822,20 +1328,24 @@ keybind.block_select_08.name = Categoria/Selecionar bloco 8
 keybind.block_select_09.name = Categoria/Selecionar bloco 9
 keybind.block_select_10.name = Categoria/Selecionar bloco 10
 keybind.fullscreen.name = Alterar tela cheia
-keybind.select.name = selecionar
+keybind.select.name = Selecionar
 keybind.diagonal_placement.name = Posicionamento Diagonal
 keybind.pick.name = Pegar bloco
 keybind.break_block.name = Quebrar bloco
-keybind.deselect.name = Desselecionar
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.deselect.name = Desmarcar
 keybind.pickupCargo.name = Pegar Carga
 keybind.dropCargo.name = Soltar Carga
-keybind.command.name = Comandar
 keybind.shoot.name = Atirar
 keybind.zoom.name = Ampliar
 keybind.menu.name = Menu
 keybind.pause.name = Pausar
 keybind.pause_building.name = Parar/Resumir a construção
 keybind.minimap.name = Minimapa
+keybind.planet_map.name = Mapa do Planeta
+keybind.research.name = Pesquisa
+keybind.block_info.name = Informação do Bloco
 keybind.chat.name = Conversa
 keybind.player_list.name = Lista de jogadores
 keybind.console.name = Console
@@ -845,60 +1355,114 @@ keybind.toggle_menus.name = Ativar menus
 keybind.chat_history_prev.name = Historico do chat anterior
 keybind.chat_history_next.name = Historico do próximo chat
 keybind.chat_scroll.name = Rolar chat
+keybind.chat_mode.name = Mudar modo do chat
 keybind.drop_unit.name = Soltar unidade
 keybind.zoom_minimap.name = Ampliar minimapa
 mode.help.title = Descrição dos modos
 mode.survival.name = Sobrevivência
 mode.survival.description = O modo normal. Recursos limitados e hordas automáticas.
-mode.sandbox.name = Criativo
-mode.sandbox.description = Recursos infinitos e sem tempo para ataques.
+mode.sandbox.name = Sandbox
+mode.sandbox.description = Recursos infinitos não há tempo entre ondas.
 mode.editor.name = Editor
 mode.pvp.name = JxJ
-mode.pvp.description = Lutar contra outros jogadores locais.
+mode.pvp.description = Lute contra outros jogadores locais.
 mode.attack.name = Ataque
 mode.attack.description = Sem hordas, com o objetivo de destruir a base inimiga.
 mode.custom = Regras personalizadas
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Recursos infinitos
+rules.onlydepositcore = Permitir apenas depósito no núcleo
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reatores explodem
-rules.schematic = Schematics Allowed
+rules.coreincinerates = Núcleo incinera itens em excesso
+rules.disableworldprocessors = Desativar processadores mundiais
+rules.schematic = Permitir Esquemas
 rules.wavetimer = Tempo de horda
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Hordas
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Modo de ataque
-rules.buildai = Habilitar construção da IA
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Tamanho mínimo do esquadrão
+rules.rtsmaxsquadsize = Tamanho máximo do esquadrão
+rules.rtsminattackweight = Peso Mínimo de Ataque
+rules.cleanupdeadteams = Limpar construções de equipes derrotadas (PvP)
+rules.corecapture = Capturar Núcleo na Destruição
+rules.polygoncoreprotection = Proteção de núcleo poligonal
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Recursos de IA Infinitos
 rules.blockhealthmultiplier = Multiplicador de vida do bloco
-rules.blockdamagemultiplier = Block Damage Multiplier
+rules.blockdamagemultiplier = Multiplicador de dano do bloco
 rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Multiplicador de vida de unidade
 rules.unitdamagemultiplier = Multiplicador de dano de Unidade
-rules.enemycorebuildradius = Raio de "Não-criação" de core inimigo:[lightgray] (blocos)
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Multiplicador de Energia Solar
+rules.unitcapvariable = Núcleos contribuem para a capacidade da unidade
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Capacidade base da Unidade
+rules.limitarea = Limitar área do mapa
+rules.enemycorebuildradius = Raio de "não-criação" de núcleo inimigo:[lightgray] (blocos)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Espaço de tempo entre hordas:[lightgray] (seg)
+rules.initialwavespacing = Espaçamento de onda inicial:[lightgray] (seg)
 rules.buildcostmultiplier = Multiplicador de custo de construção
 rules.buildspeedmultiplier = Multiplicador de velocidade de construção
-rules.deconstructrefundmultiplier = Multiplicador de reembolso de desconstrução 
+rules.deconstructrefundmultiplier = Multiplicador de reembolso de desconstrução
 rules.waitForWaveToEnd = Hordas esperam inimigos
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Raio da zona de spawn:[lightgray] (blocos)
 rules.unitammo = Unidades requerem munição
+rules.enemyteam = Time Inimigo
+rules.playerteam = Time do Jogador
 rules.title.waves = Hordas
 rules.title.resourcesbuilding = Recursos e Construções
 rules.title.enemy = Inimigos
 rules.title.unit = Unidades
 rules.title.experimental = Experimental
 rules.title.environment = Ambiente
+rules.title.teams = Times
+rules.title.planet = Planeta
 rules.lighting = Iluminação
-rules.enemyLights = Enemy Lights
+rules.fog = Névoa de Guerra
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fogo
+rules.anyenv = <Qualquer>
 rules.explosions = Dano de explosão de unidades/blocos
 rules.ambientlight = Luz ambiente
 rules.weather = Clima
 rules.weather.frequency = Frequência:
+rules.weather.always = Sempre
 rules.weather.duration = Duração:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Itens
 content.liquid.name = Líquidos
 content.unit.name = Unidades
 content.block.name = Blocos
+content.status.name = Efeitos de Status
+content.sector.name = Setores
+content.team.name = Facções
+wallore = (Muro)
 
 item.copper.name = Cobre
 item.lead.name = Chumbo
@@ -906,28 +1470,41 @@ item.coal.name = Carvão
 item.graphite.name = Grafite
 item.titanium.name = Titânio
 item.thorium.name = Tório
-item.silicon.name = Sílicio
+item.silicon.name = Silício
 item.plastanium.name = Plastânio
-item.phase-fabric.name = Tecido de fase
-item.surge-alloy.name = Liga de surto
-item.spore-pod.name = Cápsula de esporos
+item.phase-fabric.name = Tecido de Fase
+item.surge-alloy.name = Liga de Surto
+item.spore-pod.name = Casulo de Esporos
 item.sand.name = Areia
-item.blast-compound.name = Composto de explosão
+item.blast-compound.name = Composto Explosivo
 item.pyratite.name = Piratita
 item.metaglass.name = Metavidro
 item.scrap.name = Sucata
+item.fissile-matter.name = Matéria Físsil
+item.beryllium.name = Berílio
+item.tungsten.name = Tungstênio
+item.oxide.name = Óxido
+item.carbide.name = Carboneto
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = �gua
 liquid.slag.name = Escória
 liquid.oil.name = Petróleo
-liquid.cryofluid.name = Fluído Criogênico
+liquid.cryofluid.name = Criofluido
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gálio
+liquid.ozone.name = Ozônio
+liquid.hydrogen.name = Hidrogênio
+liquid.nitrogen.name = Nitrogênio
+liquid.cyanogen.name = Cianogênio
 
-unit.dagger.name = Adaga
+unit.dagger.name = Dagger
 unit.mace.name = Mace
-unit.fortress.name = Fortaleza
+unit.fortress.name = Fortress
 unit.nova.name = Nova
 unit.pulsar.name = Pulsar
 unit.quasar.name = Quasar
-unit.crawler.name = Rastejante
+unit.crawler.name = Rastejador
 unit.atrax.name = Atrax
 unit.spiroct.name = Spiroct
 unit.arkyid.name = Arkyid
@@ -947,6 +1524,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,60 +1536,86 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Ponto de Reabastecimento
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Drone de Montagem
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Paralaxe
 block.cliff.name = Relevo
-block.sand-boulder.name = Pedregulho de areia
+block.sand-boulder.name = Pedregulho de Areia
+block.basalt-boulder.name = Pedregulho de Basalto
 block.grass.name = Grama
-block.slag.name = Escória
-block.space.name = Space
+block.molten-slag.name = Escória
+block.pooled-cryofluid.name = Criofluido
+block.space.name = Spaço
 block.salt.name = Sal
 block.salt-wall.name = Parede de Sal
 block.pebbles.name = Pedrinhas
 block.tendrils.name = Gavinhas
-block.sand-wall.name = Sand Wall
+block.sand-wall.name = Muro de Areia
 block.spore-pine.name = Pinheiro de esporo
-block.spore-wall.name = Spore Wall
+block.spore-wall.name = Muro de Esporos
 block.boulder.name = Rochedo
-block.snow-boulder.name = Monte de neve
-block.snow-pine.name = Pinheiro com neve
+block.snow-boulder.name = Monte de Neve
+block.snow-pine.name = Pinheiro com Neve
 block.shale.name = Folhelho
 block.shale-boulder.name = Pedra de Folhelho
 block.moss.name = Musgo
 block.shrubs.name = Arbusto
 block.spore-moss.name = Musgo de Esporos
 block.shale-wall.name = Parede de Folhelho
-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
-block.scrap-wall-gigantic.name = Muro gigante de sucata
+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
+block.scrap-wall-gigantic.name = Muro Gigante de Sucata
 block.thruster.name = Propulsor
 block.kiln.name = Forno
 block.graphite-press.name = Prensa de grafite
 block.multi-press.name = Multi-Prensa
 block.constructing = {0}\n[lightgray](Construindo)
-block.spawn.name = �rea inimiga
-block.core-shard.name = Fragmento do núcleo
-block.core-foundation.name = Fundação do núcleo
-block.core-nucleus.name = Centro do núcleo
-block.deepwater.name = �gua profunda
-block.water.name = �gua
-block.tainted-water.name = �gua contaminada
-block.darksand-tainted-water.name = �gua contaminada sobre areia escura
+block.spawn.name = �rea Inimiga
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
+block.core-shard.name = Fragmento do Núcleo
+block.core-foundation.name = Fundação do Núcleo
+block.core-nucleus.name = Centro do Núcleo
+block.deep-water.name = �gua Profunda
+block.shallow-water.name = �gua
+block.tainted-water.name = �gua Contaminada
+block.deep-tainted-water.name = �gua Contaminada Poofunda
+block.darksand-tainted-water.name = �gua Contaminda sobre Areia Escura
 block.tar.name = Piche
 block.stone.name = Pedra
-block.sand.name = Areia
+block.sand-floor.name = Areia
 block.darksand.name = Areia escura
 block.ice.name = Gelo
 block.snow.name = Neve
-block.craters.name = Crateras
-block.sand-water.name = �gua sobre areia
-block.darksand-water.name = �gua sobre areia escura
+block.crater-stone.name = Crateras
+block.sand-water.name = �gua sobre Areia
+block.darksand-water.name = �gua sobre Areia Escura
 block.char.name = Cinzas
 block.dacite.name = Dacito
+block.rhyolite.name = Riólito
 block.dacite-wall.name = Parede de Dacito
-block.dacite-boulder.name = Dacite Boulder
+block.dacite-boulder.name = Pedregulho de Dacito
 block.ice-snow.name = Gelo com Neve
 block.stone-wall.name = Parede de Pedra
 block.ice-wall.name = Parede de Gelo
@@ -1017,24 +1625,25 @@ block.pine.name = Pinheiro
 block.dirt.name = Terra
 block.dirt-wall.name = Parede de Terra
 block.mud.name = Lama
-block.white-tree-dead.name = �rvore branca morta
-block.white-tree.name = �rvore branca
-block.spore-cluster.name = Aglomerado de esporos
-block.metal-floor.name = Chão de metal
-block.metal-floor-2.name = Chão de metal 2
-block.metal-floor-3.name = Chão de metal 3
-block.metal-floor-5.name = Chão de metal 5
-block.metal-floor-damaged.name = Chão de metal danificado
-block.dark-panel-1.name = Painel escuro 1
-block.dark-panel-2.name = Painel escuro 2
-block.dark-panel-3.name = Painel escuro 3
-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.white-tree-dead.name = �rvore Branca Morta
+block.white-tree.name = �rvore Branca
+block.spore-cluster.name = Aglomerado de Esporos
+block.metal-floor.name = Chão de Metal
+block.metal-floor-2.name = Chão de Metal 2
+block.metal-floor-3.name = Chão de Metal 3
+block.metal-floor-4.name = Chão de MEtal 4
+block.metal-floor-5.name = Chão de Metal 5
+block.metal-floor-damaged.name = Chão de Metal Danificado
+block.dark-panel-1.name = Painel Escuro 1
+block.dark-panel-2.name = Painel Escuro 2
+block.dark-panel-3.name = Painel Escuro 3
+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.basalt.name = Basalto
-block.hotrock.name = Rocha quente
-block.magmarock.name = Rocha de magma
+block.hotrock.name = Rocha Quente
+block.magmarock.name = Rocha de Magma
 block.copper-wall.name = Muro de Cobre
 block.copper-wall-large.name = Muralha de Cobre
 block.titanium-wall.name = Muro de Titânio
@@ -1046,45 +1655,46 @@ block.phase-wall-large.name = Muralha de Fase
 block.thorium-wall.name = Muro de Tório
 block.thorium-wall-large.name = Muralha de Tório
 block.door.name = Porta
-block.door-large.name = Porta grande
-block.duo.name = Torreta dupla
-block.scorch.name = Lança-chamas
-block.scatter.name = Dispersão
-block.hail.name = Artilharia
-block.lancer.name = Lanceiro
+block.door-large.name = Porta Grande
+block.duo.name = Duo
+block.scorch.name = Scorch
+block.scatter.name = Scatter
+block.hail.name = Hail
+block.lancer.name = Lancer
 block.conveyor.name = Esteira
-block.titanium-conveyor.name = Esteira de titânio
-block.plastanium-conveyor.name = Esteira de plastânio
-block.armored-conveyor.name = Esteira blindada
-block.armored-conveyor.description = Move os itens com a mesma velocidade das esteiras de titânio, mas tem mais armadura. Não aceita itens dos lados de nada além de outras esteiras.
+block.titanium-conveyor.name = Esteira de Titânio
+block.plastanium-conveyor.name = Esteira de Plastânio
+block.armored-conveyor.name = Esteira Blindada
 block.junction.name = Junção
 block.router.name = Roteador
 block.distributor.name = Distribuidor
 block.sorter.name = Ordenador
 block.inverted-sorter.name = Ordenador invertido
 block.message.name = Mensagem
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminador
-block.illuminator.description = Uma pequena, compacta e configurável fonte de luz. Precisa de energia para funcionar.
-block.overflow-gate.name = Portão de Fluxo
-block.underflow-gate.name = Portão de Fluxo invertido
-block.silicon-smelter.name = Fundidora de silicio
-block.phase-weaver.name = Palheta de fase
+block.overflow-gate.name = Portão de Sobrecarga
+block.underflow-gate.name = Portão de Sobrecarga Invertido
+block.silicon-smelter.name = Fundidora de Silício
+block.phase-weaver.name = Palheta de Fase
 block.pulverizer.name = Pulverizador
-block.cryofluid-mixer.name = Misturador de Crio Fluido
-block.melter.name = Aparelho de fusão
+block.cryofluid-mixer.name = Misturador de Criofluido
+block.melter.name = Aparelho de Fusão
 block.incinerator.name = Incinerador
-block.spore-press.name = Prensa de Esporo
+block.spore-press.name = Prensa de Esporos
 block.separator.name = Separador
-block.coal-centrifuge.name = Centrífuga de Carvão
-block.power-node.name = Célula de energia
-block.power-node-large.name = Célula de energia grande
-block.surge-tower.name = Torre de surto
+block.coal-centrifuge.name = Centrífugador de Carvão
+block.power-node.name = Célula de Energia
+block.power-node-large.name = Célula de Energia Grande
+block.surge-tower.name = Torre de Surto
 block.diode.name = Diodo
 block.battery.name = Bateria
-block.battery-large.name = Bateria grande
-block.combustion-generator.name = Gerador à combustão
-block.steam-generator.name = Gerador à vapor
-block.differential-generator.name = Gerador diferencial
+block.battery-large.name = Bateria Grande
+block.combustion-generator.name = Gerador a Combustão
+block.steam-generator.name = Gerador a Vapor
+block.differential-generator.name = Gerador Diferencial
 block.impact-reactor.name = Reator De impacto
 block.mechanical-drill.name = Broca Mecânica
 block.pneumatic-drill.name = Broca Pneumática
@@ -1093,243 +1703,972 @@ block.water-extractor.name = Extrator de água
 block.cultivator.name = Cultivador
 block.conduit.name = Cano
 block.mechanical-pump.name = Bomba Mecânica
-block.item-source.name = Criador de itens
-block.item-void.name = Destruidor de itens
-block.liquid-source.name = Criador de líquidos
-block.liquid-void.name = Destruidor de líquidos
-block.power-void.name = Anulador de energia
-block.power-source.name = Fonte de energia
+block.item-source.name = Criador de Itens
+block.item-void.name = Destruidor de Itens
+block.liquid-source.name = Criador de Líquidos
+block.liquid-void.name = Destruidor de Líquidos
+block.power-void.name = Anulador de Energia
+block.power-source.name = Fonte de Energia
 block.unloader.name = Descarregador
 block.vault.name = Cofre
-block.wave.name = Onda
+block.wave.name = Wave
 block.tsunami.name = Tsunami
-block.swarmer.name = Enxame
+block.swarmer.name = Swarmer
 block.salvo.name = Salvo
-block.ripple.name = Morteiro
-block.phase-conveyor.name = Transportador de Fase
+block.ripple.name = Ripple
+block.phase-conveyor.name = Esteira de Fase
 block.bridge-conveyor.name = Esteira-Ponte
 block.plastanium-compressor.name = Compressor de Plastânio
 block.pyratite-mixer.name = Misturador de Piratita
 block.blast-mixer.name = Misturador de Explosão
 block.solar-panel.name = Painel Solar
 block.solar-panel-large.name = Painel Solar Grande
-block.oil-extractor.name = Bomba de Petróleo
+block.oil-extractor.name = Extrator de Petróleo
 block.repair-point.name = Ponto de Reparo
+block.repair-turret.name = Torre de Reparo
 block.pulse-conduit.name = Cano de Pulso
 block.plated-conduit.name = Cano Blindado
 block.phase-conduit.name = Cano de Fase
 block.liquid-router.name = Roteador de Líquido
 block.liquid-tank.name = Tanque de Líquido
+block.liquid-container.name = Contêiner de Líquido
 block.liquid-junction.name = Junção de Líquido
 block.bridge-conduit.name = Cano Ponte
-block.rotary-pump.name = Bomba rotatória
-block.thorium-reactor.name = Reator nuclear
-block.mass-driver.name = Catapulta eletromagnética
-block.blast-drill.name = Broca de impacto
-block.thermal-pump.name = Bomba térmica
-block.thermal-generator.name = Gerador térmico
-block.alloy-smelter.name = Fundidora de liga
+block.rotary-pump.name = Bomba Rotatória
+block.thorium-reactor.name = Reator de Tório
+block.mass-driver.name = Catapulta Eletromagnética
+block.blast-drill.name = Broca de Impacto
+block.impulse-pump.name = Bomba Térmica
+block.thermal-generator.name = Gerador Térmico
+block.surge-smelter.name = Fundidora de Liga de Surto
 block.mender.name = Reparador
-block.mend-projector.name = Projetor de reparo
-block.surge-wall.name = Muro de liga de surto
-block.surge-wall-large.name = Muralha de liga de surto
-block.cyclone.name = Ciclone
-block.fuse.name = Fusivel
-block.shock-mine.name = Mina de choque
-block.overdrive-projector.name = Projetor de sobrecarga
-block.force-projector.name = Projetor de campo de força
-block.arc.name = Tesla
+block.mend-projector.name = Projetor de Reparo
+block.surge-wall.name = Muro de Liga de Surto
+block.surge-wall-large.name = Muralha de Liga de Surto
+block.cyclone.name = Cyclone
+block.fuse.name = Fuse
+block.shock-mine.name = Mina de Choque
+block.overdrive-projector.name = Projetor de Sobrecarga
+block.force-projector.name = Projetor de Campo de Força
+block.arc.name = Arc
 block.rtg-generator.name = Gerador GTR
-block.spectre.name = Espectro
-block.meltdown.name = Fusão
+block.spectre.name = Spectre
+block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
-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 = Segmento
-block.command-center.name = Centro de Comando 
-block.ground-factory.name = Fábrica de unidades terrestres
-block.air-factory.name = Fábrica de unidades aéreas
-block.naval-factory.name = Fábrica de unidades navais
+block.container.name = Contêiner
+block.launch-pad.name = Plataforma de Lançamento
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.name = Segment
+block.ground-factory.name = Fábrica de Unidades Terrestres
+block.air-factory.name = Fábrica de Unidades Aéreas
+block.naval-factory.name = Fábrica de Unidades Navais
 block.additive-reconstructor.name = Reconstrutor Aditivo
 block.multiplicative-reconstructor.name = Reconstrutor Multiplicativo
 block.exponential-reconstructor.name = Reconstrutor Exponencial
 block.tetrative-reconstructor.name = Reconstrutor Tetrativo
 block.payload-conveyor.name = Esteira de Carga
 block.payload-router.name = Roteador de Carga
+block.duct.name = Duto
+block.duct-router.name = Duto Roteador
+block.duct-bridge.name = Duto-Ponte
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Destruidor de Cargas
+block.payload-source.name = Criador de Cargas
 block.disassembler.name = Desmontador
-block.silicon-crucible.name = Fornalha De Silício
+block.silicon-crucible.name = Crisol De Silício
 block.overdrive-dome.name = Domo de Sobrecarga
+block.interplanetary-accelerator.name = Acelerador Interplanetário
+block.constructor.name = Construtor
+block.constructor.description = Fabrica estruturas de até 2x2 de tamanho.
+block.large-constructor.name = Construtor Grande
+block.large-constructor.description = Fabrica estruturas de até 4x4 de tamanho.
+block.deconstructor.name = Desconstrutor
+block.deconstructor.description = Desconstrói estruturas e unidades. Retorna 100% do custo de construção.
+block.payload-loader.name = Carregador de Carga
+block.payload-loader.description = Carregue líquidos e itens em blocos.
+block.payload-unloader.name = Descarregador de Carga
+block.payload-unloader.description = Descarrega líquidos e itens de blocos.
+block.heat-source.name = Fonte de Calor
+block.heat-source.description = Um bloco 1x1 que fornece calor infinito.
+block.empty.name = Vazio
+block.rhyolite-crater.name = Cratera de Riólito
+block.rough-rhyolite.name = Riolito �spero
+block.regolith.name = Regolito
+block.yellow-stone.name = Pedra Amarela
+block.carbon-stone.name = Pedra de Carbono
+block.ferric-stone.name = Pedra Férrica
+block.ferric-craters.name = Crateras Férricas
+block.beryllic-stone.name = Pedra Berílica
+block.crystalline-stone.name = Pedra Cristalina
+block.crystal-floor.name = Chão de Cristal
+block.yellow-stone-plates.name = Placas de Pedra Amarela
+block.red-stone.name = Pedra Vermelha
+block.dense-red-stone.name = Pedra Vermelha Densa
+block.red-ice.name = Gelo Vermelho
+block.arkycite-floor.name = Chão de Arkycite
+block.arkyic-stone.name = Pedra Arkyic
+block.rhyolite-vent.name = Ventilação de Riólito
+block.carbon-vent.name = Ventilação de Carbono
+block.arkyic-vent.name = Ventilação Arkyic
+block.yellow-stone-vent.name = Ventilação de Pedra Amarela
+block.red-stone-vent.name = Ventilação de Pedra Vermelha
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Zona do Núcleo
+block.regolith-wall.name = Muro de Regolito
+block.yellow-stone-wall.name = Muro de Pedra Amarela
+block.rhyolite-wall.name = Muro de Riólito
+block.carbon-wall.name = Muro de Carbono
+block.ferric-stone-wall.name = Muro de Pedra Férrica
+block.beryllic-stone-wall.name = Muro de Pedra Berílica
+block.arkyic-wall.name = Muro Arkyic
+block.crystalline-stone-wall.name = Muro de Parede Cristalina
+block.red-ice-wall.name = Muro de Gelo Vermelho
+block.red-stone-wall.name = Muro de Pedra Vermelha
+block.red-diamond-wall.name = Muro de Diamante Vermelho
+block.redweed.name = Erva Vermelha
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Coral Amarelo
+block.carbon-boulder.name = Pedregulho de Carbono
+block.ferric-boulder.name = Pedregulho Férrico
+block.beryllic-boulder.name = Pedregulho Berílico
+block.yellow-stone-boulder.name = Pedregulho de Pedra Amarela
+block.arkyic-boulder.name = Pedregulho Arkyic
+block.crystal-cluster.name = Aglomerado de Cristal
+block.vibrant-crystal-cluster.name = Aglomerado de Cristal Vibrante
+block.crystal-blocks.name = Blocos de Cristal
+block.crystal-orbs.name = Orbes de Cristal
+block.crystalline-boulder.name = Pedregulho Cristalino
+block.red-ice-boulder.name = Pedregulho de Gelo Vermelho
+block.rhyolite-boulder.name = Pedregulho de Riólito
+block.red-stone-boulder.name = Pedregulho de Pedra Vermelha
+block.graphitic-wall.name = Parede Grafítica
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Eletrolisador
+block.atmospheric-concentrator.name = Concentrador Atmosférico
+block.oxidation-chamber.name = Câmara de Oxidação
+block.electric-heater.name = Aquecedor Elétrico
+block.slag-heater.name = Aquecedor de Escória
+block.phase-heater.name = Aquecedor de Fase
+block.heat-redirector.name = Redirecionador de Calor
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Incinerador de Escória
+block.carbide-crucible.name = Crisol de Carboneto
+block.slag-centrifuge.name = Centrifugador de Escória
+block.surge-crucible.name = Crisol de Surto
+block.cyanogen-synthesizer.name = Sintetizador de Cianogênio
+block.phase-synthesizer.name = Sintetizador de Fase
+block.heat-reactor.name = Reator de Calor
+block.beryllium-wall.name = Muro de Berílio
+block.beryllium-wall-large.name = Muralha de Berílio
+block.tungsten-wall.name = Muro de Tungstênio
+block.tungsten-wall-large.name = Muralha de Tungstênio
+block.blast-door.name = Porta de Segurança
+block.carbide-wall.name = Muro de Carboneto
+block.carbide-wall-large.name = Muralha de Carboneto
+block.reinforced-surge-wall.name = Muro de Liga de Surto Reforçada
+block.reinforced-surge-wall-large.name = Muralha de Liga de Surto Reforçada
+block.shielded-wall.name = Muro Blindado
+block.radar.name = Radar
+block.build-tower.name = Torre de Construção
+block.regen-projector.name = Projetor de Regeneração
+block.shockwave-tower.name = Torre de Onda de Choque
+block.shield-projector.name = Projetor de Escudo
+block.large-shield-projector.name = Projetor de Escudo Grande
+block.armored-duct.name = Duto Blindado
+block.overflow-duct.name = Duto de Sobrecarga
+block.underflow-duct.name = Duto de Sobrecarga Invertido
+block.duct-unloader.name = Descarregador de Duto
+block.surge-conveyor.name = Esteira de Liga de Surto
+block.surge-router.name = Roteador de Liga de Surto
+block.unit-cargo-loader.name = Unidade Carregadora de Carga
+block.unit-cargo-unload-point.name = Ponto de Descarga da Unidade de Carga
+block.reinforced-pump.name = Bomba Reforçada
+block.reinforced-conduit.name = Cano Reforçado
+block.reinforced-liquid-junction.name = Junção de Líquido Reforçada
+block.reinforced-bridge-conduit.name = Cano Ponte Reforçado
+block.reinforced-liquid-router.name = Roteador de Líquido Reforçado
+block.reinforced-liquid-container.name = Contêiner de Líquido Reforçado
+block.reinforced-liquid-tank.name = Tanque de Líquido Reforçado
+block.beam-node.name = Célula de Feixe
+block.beam-tower.name = Torre de Feixe
+block.beam-link.name = Link do Feixe
+block.turbine-condenser.name = Condensador de Turbina
+block.chemical-combustion-chamber.name = Câmara de Combustão Química
+block.pyrolysis-generator.name = Gerador de Pirólise
+block.vent-condenser.name = Condensador de Ventilação
+block.cliff-crusher.name = Esmagador de Penhasco
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Mineradora de Plasma
+block.large-plasma-bore.name = Mineradora de Plasma Grande
+block.impact-drill.name = Broca de Impacto
+block.eruption-drill.name = Broca Eruptiva
+block.core-bastion.name = Bastião do Núcleo
+block.core-citadel.name = Cidadela do Núcleo
+block.core-acropolis.name = Núcleo Acrópole
+block.reinforced-container.name = Contêiner Reforçado
+block.reinforced-vault.name = Cofre Rreforçado
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Refabricador de Tanque
+block.mech-refabricator.name = Refabricador de Mech
+block.ship-refabricator.name = Refrabricador de Nave
+block.tank-assembler.name = Montador de Tanque
+block.ship-assembler.name = Montador de Nave
+block.mech-assembler.name = Montador de Mech
+block.reinforced-payload-conveyor.name = Esteira de Carga Reforçada
+block.reinforced-payload-router.name = Roteador de Carga Reforçado
+block.payload-mass-driver.name = Catapulta de Carga Eletromagnética
+block.small-deconstructor.name = Desconstrutor Pequeno
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Fabricador de Tanque
+block.mech-fabricator.name = Fabricador de Mech
+block.ship-fabricator.name = Fabricador de Nave
+block.prime-refabricator.name = Refabricador Prime
+block.unit-repair-tower.name = Torre de Reparo de Unidade
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Módulo Básico do Montador
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Reator de Fluxo
+block.neoplasia-reactor.name = Reactor de Neoplasia
 
 block.switch.name = Alavanca
 block.micro-processor.name = Micro Processador
 block.logic-processor.name = Processador Lógico
 block.hyper-processor.name = Hiper Processador
-block.logic-display.name = Monitor Lógico 
-block.large-logic-display.name = Monitor lógico grande
-block.memory-cell.name = Célula de Memória 
-block.memory-bank.name = Memory Bank
+block.logic-display.name = Monitor Lógico
+block.large-logic-display.name = Monitor Lógico Grande
+block.memory-cell.name = Célula de Memória
+block.memory-bank.name = Banco de Memória
 
-team.blue.name = Azul
-team.crux.name = Vermelho
-team.sharded.name = Fragmentado
-team.orange.name = Alaranjado
-team.derelict.name = Abandonado
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Sharded
+team.derelict.name = Derelict
 team.green.name = Verde
-team.purple.name = Roxa
+team.blue.name = Azul
 
-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
-tutorial.drill = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nColoque uma num veio de cobre.
-tutorial.drill.mobile = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nToque na aba de brocas no canto inferior direito.\nSelecione a[accent] broca mecânica[].\nToque em um veio de cobre para colocá-la, então pressione a[accent] marca de verificação[] abaixo para confirmar sua seleção.\nPressione o[accent] botão "X"[] para cancelar o posicionamento.
-tutorial.blockinfo = Cada bloco tem diferentes status. Cada broca pode extrair certos minérios.\nPara checar as informações e os status de um bloco,[accent] toque o botão "?" enquanto o seleciona no menu de construção.[]\n\n[accent]Acesse os status da broca mecânica agora.[]
-tutorial.conveyor = [accent]Esteiras[] São usadas para transportar itens até o núcleo.\nFaça uma linha de Esteiras da mineradora até o núcleo.
-tutorial.conveyor.mobile = [accent]Esteiras[] são usadas para transportar itens até o núcleo.\nFaça uma linha de esteiras da broca até o núcleo.\n[accent] Coloque uma linha segurando por alguns segundos[] e arrastando em uma direção.\n\n[accent]{0}/{1} esteiras colocadas em linha\n[accent]0/1 itens entregues
-tutorial.turret = Estruturas defensivas devem ser construidas para repelir[lightgray] o inimigo[].\nConstrua uma torre dupla perto de sua base.
-tutorial.drillturret = Torres duplas precisam de[accent] cobre[] como munição para atirar.\nColoque uma broca próxima à torre para carregá-la com o cobre minerado.
-tutorial.pause = Durante uma batalha, você pode[accent] pausar o jogo.[]\nVocê pode enfileirar construções enquanto o jogo está pausado.\n\n[accent]Pressione a barra de espaço para pausar.
-tutorial.pause.mobile = Durante uma batalha, você pode[accent] pausar o jogo.[]\nVocê pode enfileirar construções enquanto o jogo está pausado, contudo, os mesmos não serão construidos ate que os jogo seja despausado.\n\n[accent]Pressione este botão no canto superior direito para pausar.
-tutorial.unpause = Agora pressione novamente a barra de espaço para despausar.
-tutorial.unpause.mobile = Agora pressione novamente para despausar.
-tutorial.breaking = Blocos precisam frequentemente ser destruídos.\n[accent]Segure e arraste o botão direito[] para destruir todos os blocos em uma seleção.[]\n\n[accent]Destrua todos esses blocos de sucata à esquerda do seu núcleo usando a seleção em área.
-tutorial.breaking.mobile = Blocos precisam frequentemente ser destruídos.\n[accent]Selecione o modo de destruição (ícone de martelo)[], e toque em um bloco para começar a quebrar.\nDestrua uma área segurando seu dedo por alguns segundos[] e arrastando em uma direção.\nPressione o botão de "visto" para confirmar a destruição.\n\n[accent]Destrua todos esses blocos de sucata à esquerda do seu núcleo usando a seleção em área.
-tutorial.withdraw = Em algumas situações é necessário pegar itens diretamente do bloco.\nPara fazer isto, [accent]toque em um bloco[] com itens e [accent]toque no item[] no inventário.\nMúltiplos itens podem ser removidos [accent]ao segurar[].\n\n[accent]Tire um pouco de cobre do núcleo.[]
-tutorial.deposit = Deposite itens em blocos arrastando da sua nave até o bloco.\n\n[accent]Deposite seu cobre de volta no núcleo.[]
-tutorial.waves = O[lightgray] inimigo[] se aproxima.\n\nDefenda seu núcleo por 2 hordas. Construa mais torretas.
-tutorial.waves.mobile = O[lightgray] inimigo[] se aproxima.\n\nDefenda seu núcleo por 2 hordas. Seu drone vai atirar nos inimigos automaticamente.\nConstrua mais torretas e brocas. Minere mais cobre.
-tutorial.launch = Quando você atinge uma horda específica, Você é capaz de[accent] lançar o núcleo[], deixando suas defesas para trás e[accent] obtendo todos os recursos em seu núcleo.[]\nEstes recursos podem ser usados para pesquisar novas tecnologias.\n\n[accent]Pressione o botão lançar.
+hint.skip = Pular
+hint.desktopMove = Use [accent][[WASD][] para mover.
+hint.zoom = [accent]Scroll[] para dar e tirar zoom.
+hint.desktopShoot = [accent][[Click-Esquerdo][] para atirar.
+hint.depositItems = Para transferir itens, arraste da sua nave para o núcleo.
+hint.respawn = Para respawnar como nave, aperte [accent][[V][].
+hint.respawn.mobile = Você mudou o controle para uma unidade/estrutura. Para respawnar como nave, [accent]toque no avatar no canto superior esquerdo.[]
+hint.desktopPause = Aperte [accent][[Espaço][] para pausar e despausar o jogo.
+hint.breaking = [accent]Clique-direito[] e arraste para quebrar blocos.
+hint.breaking.mobile = Ative o \ue817 [accent]martelo[] no canto inferior direito e toque para quebrar blocos.\n\nSegure com seu dedo por um segundo e arraste para selecionar o que quebrar.
+hint.blockInfo = Veja informações de um bloco, seleccionando-o no [accent]menu de construção[], então selecione o [accent][[?][] botão na direita.
+hint.derelict = Estruturas [accent]abandonadas[] são restos quebrados de bases antigas que já não funcionam.\n\nEssas estruturas podem ser [accent]desconstruídas[] para ganhar recursos.
+hint.research = Use o botão de \ue875 [accent]Pesquisa[] para pesquisar novas tecnologias.
+hint.research.mobile = Use o botão de \ue875 [accent]Pesquisa[] no \ue88c [accent]Menu[] para pesquisar novas tecnologias.
+hint.unitControl = Segure [accent][[L-ctrl][] e [accent]click[] para controlar suas unidades ou torretas.
+hint.unitControl.mobile = [accent][[Toque duas vezes][] para controlar suas unidades ou torretas.
+hint.unitSelectControl = Para controlar unidades, entre no [accent]modo de comando[] segurando [accent]Shift esquerdo.[]\nEnquanto no modo de comando, clique e segure pra selecionar unidades. Clique com o [accent]Botão direito[] em um lugar ou alvo para mandar as unidades para lá.
+hint.unitSelectControl.mobile = Para controlar unidades, entre no [accent]modo de comando[] segurando o botão de [accent]comando[] no canto inferior esquerdo.\nEnquanto no modo de comando, segure e arraste pra selecionar unidades. Toque em algum lugar ou alvo para mandar as unidades para lá.
+hint.launch = Quando recursos suficientes forem coletados, você pode [accent]Lançar[] selecionando setores próximos a partir do \ue827 [accent]Mapa[] no canto inferior direito.
+hint.launch.mobile = Quando recursos suficientes forem coletados, você pode [accent]Lançar[] selecionando setores próximos a partir do \ue827 [accent]Mapa[] no \ue88c [accent]Menu[].
+hint.schematicSelect = Segure [accent][[F][] e arraste para selecionar blocos para copiar e colar.\n\n[accent][[Middle Click][] para copiar um bloco só.
+hint.rebuildSelect = Segure [accent][[B][] e arraste para selecionar blocos destruídos.\nIsso irá reconstruí-los automaticamente.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Segure [accent][[L-Ctrl][] enquanto arrasta as esteiras para gerar automaticamente um caminho.
+hint.conveyorPathfind.mobile = Ative o \ue844 [accent]modo diagonal[] e arraste as esteiras para gerar automaticamente um caminho.
+hint.boost = Segure [accent][[L-Shift][] para voar sobre obstáculos com a sua unidade.\n\nApenas algumas unidades terrestres tem propulsores.
+hint.payloadPickup = Pressione [accent][[[] para pegar pequenos blocos e unidades.
+hint.payloadPickup.mobile = [accent]Toque e segure[] um pequeno bloco ou unidade para o pegar.
+hint.payloadDrop = Pressione [accent]][] para soltar a carga.
+hint.payloadDrop.mobile = [accent]Toque e segure[] em um local vazio para soltar ali a carga.
+hint.waveFire = Torretas [accent]Onda[] com munição de água vão apagar automaticamente incêndios próximos.
+hint.generator = \uf879 [accent]Geradores a Combustão[] queimam carvão e transmitem energia aos blocos ao lado.\n\nO alcance da transmissão de energia pode ser aumentado com \uf87f [accent]Células de Energia[].
+hint.guardian = Unidades [accent]Guardião[] são blindadas. Munições fracas como [accent]Cobre[] e [accent]Chumbo[] são [scarlet]não efetivas[].\n\nUse torretas melhores ou \uf835 [accent]Grafite[] \uf861Duo/\uf859Salvo como munição para derrotar Guardiões.
+hint.coreUpgrade = Núcleos podem ser melhorados [accent]colocando núcelos melhores sobre eles[].\n\nColoque uma \uf868 [accent]Fundação do Núcleo[] sobre o \uf869 [accent]Fragmento do Núcleo[]. Tenha certeza de que está livre de obstruções próximas.
+hint.presetLaunch = [accent]Zona de setores[] cinzas, como a [accent]Floresta Congelada[], podem ser lançadas de qualquer lugar. Elas não precisam da captura de território próximo.\n\n[accent]Setores numerados[], como esse aqui, são [accent]opcionais[].
+hint.presetDifficulty = Esse setor tem um [scarlet]alto nível de ameaça inimiga[].\nIr para esse setores [accent]não é recomendado[] sem ter tecnologia e preparação adequadas.
+hint.coreIncinerate = Depois que o núcleo ter recebido até a capacidade máxima de um item, qualquer item do mesmo tipo que ele receber será [accent]incinerado[].
+hint.factoryControl = Para definir a [accent]o local de saída[] de uma fábrica de unidades, clique em uma fábrica enquanto estiver no modo de comando, depois clique com o botão direito em um local.\nAs unidades produzidas por ela se moverão automaticamente para lá.
+hint.factoryControl.mobile = Para definir a [accent]o local de saída[] de uma fábrica de unidades, toque em uma fábrica enquanto estiver no modo de comando, depois toque em um local.\nAs unidades produzidas por ela se moverão automaticamente para lá.
+gz.mine = Vá para perto do \uf8c4 [accent]minério de cobre[] no chão e clique para começar a minerar.
+gz.mine.mobile = Vá para perto do \uf8c4 [accent]minério de cobre[] no chão e toque nele para começar a minerar.
+gz.research = Abra a \ue875 árvore tecnológica.\nPesquise a \uf870 [accent]Broca mecânica[], Depois selecione-a pelo menu no canto inferior direito.\nClique no cobre para coloca-la.
+gz.research.mobile = Abra a \ue875 árvore tecnológica.\nPesquise a \uf870 [accent]Broca mecânica[], Depois selecione-a pelo menu no canto inferior direito.\nClique no cobre para colocá-la.\n\nPressione a \ue800 [accent]confirmação[] no canto inferior direito para confirmar.
+gz.conveyors = Pesquise e coloque \uf896 [accent]esteiras[] para mover os recursos minerados\ndas brocas para o núcleo.\n\nClique e arraste para pôr multiplas esteiras.\n[accent]Scroll[] para rotacionar.
+gz.conveyors.mobile = Pesquise e coloque \uf896 [accent]esteiras[] para mover os recursos minerados\ndas brocas para o núcleo.\n\nSegure por um segundo e arraste para colocar múltiplas esteiras.
+gz.drills = Expanda a mineração.\nColoque mais Brocas Mecânicas.\nMinere 100 cobres.
+gz.lead = \uf837 [accent]Chumbo[] é outro recurso comumente usado.\nColoque brocas para minerar chumbo.
+gz.moveup = \ue804 Vá para cima para outros objetivos.
+gz.turrets = Pesquise e coloque 2 torretas \uf861 [accent]Duo[] para defender o núcleo.\ntorretas Duo requerem \uf838 [accent]munição[] de esteiras.
+gz.duoammo = Abasteça as torretas Duo com [accent]cobre[], usando esteiras.
+gz.walls = [accent]Muros[] podem previnir danos recebidos de atingir as construções.\nColoque \uf8ae [accent]muros de cobre[] em volta das torretas.
+gz.defend = Inimigos vindo, prepare-se para defender.
+gz.aa = Unidades flutuantes não podem ser destruidas facilmente por torretas comuns.\nTorretas\uf860 [accent]Scatter[] Proveem ótima defesa aérea, mas requerem \uf837 [accent]chumbo[] como munição.
+gz.scatterammo = Abasteça a torreta Scatter com [accent]chumbo[], usando esteiras.
+gz.supplyturret = [accent]Abasteça a torreta
+gz.zone1 = Essa é a zona de spawn inimigo.
+gz.zone2 = Qualquer coisa construida nesta área será destruida quando uma horda começar.
+gz.zone3 = Uma horda vai começar agora\nSe prepare.
+gz.finish = Construa mais torretas, minere mais recursos,\ne se defenda de todas as hordas para [accent]capturar o setor[].
+onset.mine = Clique para minerar \uf748 [accent]berílio[] das paredes.\n\nUse [accent][[WASD] para se mover.
+onset.mine.mobile = Toque para minerar \uf748 [accent]berílio[] das paredes.
+onset.research = Abra a \ue875 árvore tecnológica.\nPesquise, e então coloque um \uf73e [accent]Condensador de Turbina[] na ventilação.\nIsso vai gerar [accent]energia[].
+onset.bore = Pesquise e coloque uma \uf741 [accent]Mineradora de Plasma[].\nEla minera recursos das paredes automaticamente.
+onset.power = Para[accent]alimentar[] a Mineradora de Plasma, pesquise e coloque uma \uf73d [accent]Célula de Feixe[].\nConecte o condensador de turbina ao minerador de plasma.
+onset.ducts = Pesquise e coloque \uf799 [accent]dutos[] para mover recursos minerados da mineradora de plasma para o núcleo.\nClique e segure para colocar múltiplos dutos.\n[accent]Scroll[] para rotacionar.
+onset.ducts.mobile = Pesquise e coloque \uf799 [accent]dutos[] para mover recursos minerados da mineradora de plasma para o núcleo.\n\nSegure por um segundo e arraste para colocar múltiplos dutos.
+onset.moremine = Expanda a mineração.\nColoque mais Mineradoras de Plasma, use as Células de Feixe e dutos para isso.\nMinere 200 berílios.
+onset.graphite = Blocos mais complexos requerem \uf835 [accent]grafite[].\nColoque Mineradoras de Plasma para minerar grafite.
+onset.research2 = Comece a pesquisar [accent]fábricas[].\nPesquise o \uf74d [accent]Esmagador de Penhasco[] e o \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = O arc furnace precisa de \uf834 [accent]areia[] e \uf835 [accent]grafite[] para criar \uf82f [accent]silício[].\n[accent]Energia[] também é necessária.
+onset.crusher = Use o \uf74d [accent]Esmagador de Areia[] para minerar areia.
+onset.fabricator = Use [accent]unidades[] para explorar o mapa, defender construções e atacar o inimigo. Pesquise e coloque um \uf6a2 [accent]Fabricador de Tanques[].
+onset.makeunit = Produza uma unidade.\nUse o botão "?" para ver os requisitos da fábrica selecionada.
+onset.turrets = Unidades são efetivas, mas [accent]torretas[] proveem melhores capacidades defensivas se usadas efetivamente.\nColoque uma torreta \uf6eb [accent]Breach[].\nTorretas requerem \uf748 [accent]munição[].
+onset.turretammo = Abasteça a torreta com [accent]munição de berílio.[]
+onset.walls = [accent]Muros[] podem previnir danos recebidos de atingir as construções.\nColoque \uf6ee [accent]muros de berílio[] em volta das torretas.
 
-item.copper.description = O material mais básico. Usado em todos os tipos de blocos.
-item.lead.description = Material de começo basico. usado extensivamente em blocos de transporte de líquidos e eletrônicos.
-item.metaglass.description = Composto de vidro super resistente. Extensivamente usado para distribuição e armazenagem de líquidos.
-item.graphite.description = Carbono mineralizado, usado como munição e para isolação elétrica.
-item.sand.description = Um material comum que é usado extensivamente em derretimento, tanto em ligas como em fluxo.
-item.coal.description = Matéria vegetal fossilizada, formada muito depois de semeada. Usado extensivamente para produção de combustível e recursos.
-item.titanium.description = Um material raro super leve usado extensivamente no transporte de líquidos, em brocas e drones aéreos.
-item.thorium.description = Um metal denso e radioativo, Usado como suporte material e combustivel nuclear.
-item.scrap.description = Pedaços remanescentes de estruturas e unidades destruidas. Contem traços de diferentes metais.
-item.silicon.description = Condutor extremamente importante, com aplicação em paineis solares e dispositivos complexos.
-item.plastanium.description = Material leve e maleável usado em drones aéreos avançados e como munição de fragmentação.
-item.phase-fabric.description = Uma substância quase sem peso usada em eletrônica avançada e tecnologia de auto-reparo.
-item.surge-alloy.description = Uma liga avançada com propriedades elétricas únicas.
-item.spore-pod.description = Uma cápsula de esporos sintéticos, sintetizada de concentrações atmosféricas para propósitos industriais. Usada para conversão em petróleo, explosivos e combustíveis.
-item.blast-compound.description = Um composto instável usado em bombas e em explosivos. Sintetizado de cápsulas de esporos e outras substâncias voláteis. Uso como combustível não é recomendado.
-item.pyratite.description = Substância extremamente inflamável usada em armas incendiárias.
-liquid.water.description = O líquido mais útil, comumente usado em resfriamento de máquinas e no processamento de lixo. Dá pra beber, também.
-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.
+onset.enemies = Inimigo vindo, se prepare.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = O inimigo está vulnerável. Contra ataque.
+onset.cores = Novos núcleos podem ser colocados em [accent]ladrilhos de núcleo[].\nNovos núcleos funcionam como bases avançadas e compartilham seus recursos com outros núcleos.\nColoque um \uf725 núcleo.
+onset.detect = O inimigo poderá te detectar em 2 minutos.\nConstrua defesas, mineração e produção.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
 
-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.
-block.silicon-smelter.description = Reduz areia a silicio usando carvão puro. Produz silício.
-block.kiln.description = Derrete chumbo e areia no composto conhecido como metavidro. Requer pequenas quantidades de energia.
-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.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.
-block.separator.description = Separa escória em seus minerais componentes, oferece o resultado refriado.
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
+
+#Serpulo
+item.copper.description = Usado em todos os tipos de construção e munição.
+item.copper.details = Cobre. Metal anormalmente abundante em Serpulo. Estruturalmente fraco a não ser que seja reforçado.
+item.lead.description = Usado em transportação de líquido e estruturas elétricas.
+item.lead.details = Denso. Inerte. Extensivamente usado em baterias.\nObservação: Provavelmente tóxico para formas de vida biológica. Não que tenha muito restando aqui.
+item.metaglass.description = Usado para estruturas de distribuição e armazenagem de líquidos.
+item.graphite.description = Usado em componentes elétricos e como munição de torretas.
+item.sand.description = Usado na produção de outros materiais refinados.
+item.coal.description = Usado como combustível e produção de materiais refinados.
+item.coal.details = Parece ser matéria vegetal fossilizada, formada muito antes do evento da semeadura.
+item.titanium.description = Usado em estruturas de transportação de líquido, brocas e fábricas.
+item.thorium.description = Usado em estruturas duráveis e como combustível nuclear.
+item.scrap.description = Usado em Aparelhos de Fusão e Pulverizadores para refinar em outros materiais.
+item.scrap.details = Pedaços restantes de estruturas e unidades destruidas. Contém traços de diferentes metais.
+item.silicon.description = Usado em paineis solares, eletrônicos complexos e como munição em torretas.
+item.plastanium.description = Usado em unidades avançadas, isolamento e munição de fragmentação.
+item.phase-fabric.description = Usado em eletrônicos avançados e estruturas reparadoras.
+item.surge-alloy.description = Usada em armamento avançado e estruturas defensia reativas.
+item.spore-pod.description = Usado para a conversão em óleo, explosivos e combustível.
+item.spore-pod.details = Esporos. Provavelmente uma forma de vida sintética. Emite gases tóxicos para outras formas de vida biológica. Extremamente invasivo. Altamente inflamável em certas condições.
+item.blast-compound.description = Usado em bombas e como munição explosiva.
+item.pyratite.description = Usado em armas incendiárias e geradores a combustão.
+
+#Erekir
+item.beryllium.description = Usado em muitos tipos de construção e munição em Erekir.
+item.tungsten.description = Utilizado em brocas, armaduras e munições. Necessário na construção de estruturas mais avançadas.
+item.oxide.description = Utilizado como condutor de calor e isolante para energia.
+item.carbide.description = Utilizado em estruturas avançadas, unidades mais pesadas e munições.
+
+liquid.water.description = Usado para refrigerar máquinas e no processamento de lixo.
+liquid.slag.description = Refinada em separadores em metais constituintes. Consumida em torretas de líquido como munição.
+liquid.oil.description = Usado na produção de materiais avançados e como munição incendiária
+liquid.cryofluid.description = Usado como refrigerador em reatores, torretas e fábricas.
+
+#Erekir
+liquid.arkycite.description = Utilizado em reações químicas para geração de energia e síntese de materiais.
+liquid.ozone.description = Utilizado como agente oxidante na produção de material e como combustível. Moderadamente explosivo.
+liquid.hydrogen.description = Utilizado na extração de recursos, produção de unidades e reparo de estruturas. Inflamável.
+liquid.cyanogen.description = Utilizado para munição, construção de unidades avançadas e várias reações em blocos avançados. Altamente inflamável.
+liquid.nitrogen.description = Utilizado na extração de recursos, criação de gás e produção de unidades. Inerte.
+liquid.neoplasm.description = Um subproduto biológico perigoso do reator de Neoplasia. Espalha-se rapidamente para qualquer bloco adjacente contendo água que ele toque, danificando-os no processo. Viscoso.
+liquid.neoplasm.details = Neoplasma. Uma massa incontrolável de células sintéticas de rápida divisão com uma consistência semelhante à de lama. Resistente ao calor. Extremamente perigoso para qualquer estrutura que envolva água.\n\nMuito complexo e instável para análise padrão. Potenciais aplicações desconhecidas. Recomenda-se a incineração em piscinas de escória.
+block.derelict = \uf77e [lightgray]Abandonado
+
+block.armored-conveyor.description = Move os itens com a mesma velocidade das esteiras de titânio, mas tem mais armadura. Não aceita itens dos lados de nada além de outras esteiras.
+block.illuminator.description = Uma fonte de luz pequena, configurável e compacta. Precisa de energia para funcionar.
+
+block.message.description = Mostra uma mensagem. Usado para comunicação entre aliados.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
+block.graphite-press.description = Comprime carvão em Grafite.
+block.multi-press.description = Comprime carvão em Grafite. Usa água como refrigerador.
+block.silicon-smelter.description = Refina silício com carvão e areia.
+block.kiln.description = Derrete areia e chumbo em Metavidro.
+block.plastanium-compressor.description = Produz Plastânio a partir do petróleo e titânio.
+block.phase-weaver.description = Sintetiza Tecido de Fase usando tório e areia.
+block.surge-smelter.description = Funde Titânio, Chumbo, Silício e Cobre para produzir Liga de Surto.
+block.cryofluid-mixer.description = Mistura água e pó fino de Titânio para produzir crio-fluido.
+block.blast-mixer.description = Produz Composto Explosivo da piratita e capsulas de esporo.
+block.pyratite-mixer.description = Mistura Carvão, Chumbo e Areia em Piratita.
+block.melter.description = Derrete sucata em escória.
+block.separator.description = Separa escória em seus minerais componentes.
 block.spore-press.description = Comprime cápsulas de esporos em petróleo.
-block.pulverizer.description = Esmaga sucata em areia. Util quando esta em falta de areia natural.
+block.pulverizer.description = Esmaga sucata em areia.
 block.coal-centrifuge.description = Solidifica petróleo em carvão.
-block.incinerator.description = Se livra de itens em excesso ou liquidos.
-block.power-void.description = Destroi qualquer energia que entre dentro. Apenas caixa de areia.
-block.power-source.description = Infinitivamente da energia. Apenas caixa de areia.
-block.item-source.description = Infinivamente da itens. Apenas caixa de areia.
-block.item-void.description = Destroi qualquer item que entre sem requerir energia. Apenas caixa de areia.
-block.liquid-source.description = Infinitivamente da Liquidos. Apenas caixa de areia.
-block.liquid-void.description = Remove todos os líquidos. Apenas sandbox.
-block.copper-wall.description = Um bloco defensivo e barato.\nUtil para proteger o núcleo e torretas no começo.
-block.copper-wall-large.description = Um bloco defensivo e barato.\nUtil para proteger o núcleo e torretas no começo.\nOcupa múltiplos blocos.
-block.titanium-wall.description = Um bloco defensivo moderadamente forte.\nProvidencia defesa moderada contra inimigos.
-block.titanium-wall-large.description = Um bloco defensivo moderadamente forte.\nProvidencia defesa moderada contra inimigos.\nOcupa múltiplos blocos.
+block.incinerator.description = Vaporiza qualquer item ou líquido que recebe.
+block.power-void.description = Destrói qualquer energia que é recebida. Apenas no modo sandbox.
+block.power-source.description = Gera energia infinita. Apenas no modo sandbox.
+block.item-source.description = Cria itens infinitamente. Apenas no modo sandbox.
+block.item-void.description = Destrói qualquer item que entrar. Apenas no modo sandbox.
+block.liquid-source.description = Cria líquidos infinitamente. Apenas no modo sandbox.
+block.liquid-void.description = Destrói qualquer líquido que entrar. Apenas no modo sandbox.
+block.payload-source.description = Produz cargas infinitamete. Apenas sandbox.
+block.payload-void.description = Destrói qualquer carga. Apenas.
+block.copper-wall.description = Um bloco defensivo barato. Útil para proteger o núcleo e torretas no começo.
+block.copper-wall-large.description = Um bloco defensivo barato. Útil para proteger o núcleo e torretas no começo. Ocupa múltiplos blocos.
+block.titanium-wall.description = Um bloco defensivo moderadamente forte. Providencia defesa moderada contra inimigos.
+block.titanium-wall-large.description = Um bloco defensivo moderadamente forte. Providencia defesa moderada contra inimigos. Ocupa múltiplos blocos.
 block.plastanium-wall.description = Um tipo especial de muro que absorve arcos elétricos e bloqueia conexões automáticas de células de energia.
 block.plastanium-wall-large.description = Um tipo especial de muro que absorve arcos elétricos e bloqueia conexões automáticas de células de energia.\nOcupa múltiplos blocos.
-block.thorium-wall.description = Um bloco defensivo forte.\nBoa proteção contra inimigos.
-block.thorium-wall-large.description = Um bloco defensivo forte.\nBoa proteção contra inimigos.\nOcupa múltiplos blocos.
-block.phase-wall.description = Um muro revestido com um composto especial baseado em tecido de fase. Desvia a maioria das balas no impacto.
-block.phase-wall-large.description = Um muro revestido com um composto especial baseado em tecido de fase. Desvia a maioria das balas no impacto.\nOcupa múltiplos blocos.
-block.surge-wall.description = Um bloco defensivo extremamente durável.\nSe carrega com eletricidade no contato com as balas, soltando-s aleatoriamente.
-block.surge-wall-large.description = Um bloco defensivo extremamente durável.\nSe carrega com eletricidade no contato com as balas, soltando-s aleatoriamente.\nOcupa multiplos blocos.
+block.thorium-wall.description = Um bloco defensivo forte. Boa proteção contra inimigos.
+block.thorium-wall-large.description = Um bloco defensivo forte. Boa proteção contra inimigos. Ocupa múltiplos blocos.
+block.phase-wall.description = Um muro revestido com tecido de fase. Reflete a maioria das balas no impacto.
+block.phase-wall-large.description = Um muro revestido com tecido de fase. Reflete a maioria das balas ao impacto. Ocupa múltiplos blocos.
+block.surge-wall.description = Um bloco defensivo extremamente durável. Se carrega com eletricidade no contato com as balas, soltando-as aleatoriamente.
+block.surge-wall-large.description = Um bloco defensivo extremamente durável. Se carrega com eletricidade no contato com as balas, soltando-as aleatoriamente. Ocupa multiplos blocos.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Uma pequeda porta. Pode ser aberta e fechada ao tocar.
-block.door-large.description = Uma grande porta. Pode ser aberta e fechada ao tocar.\nOcupa múltiplos blocos.
-block.mender.description = Periodicamente repara blocos vizinhos. Mantem as defesas reparadas em e entre ondas.\nPode usar silício para aumentar o alcance e a eficiência.
-block.mend-projector.description = Uma versão melhorada do reparador. Repara blocos vizinhos.\nPode usar tecido de fase para aumentar o alcance e a eficiência.
-block.overdrive-projector.description = Aumenta a velocidade de construções vizinhas.\nPode usar tecido de fase para aumentar o alcance e a eficiência.
-block.force-projector.description = Cria um campo de força hexagonal ao redor de si, protegendo construções e unidades.\nSuperaquece se suportar muito dano. Pode usar líquidos para evitar superaquecimento. Pode-se usar tecido de fase para aumentar o tamanho do escudo.
-block.shock-mine.description = Danifica inimigos em cima da mina. Quase invisivel ao inimigo.
-block.conveyor.description = Bloco de transporte de item basico. Move os itens a frente e os deposita automaticamente em torretas ou construtores. Rotacionável.
-block.titanium-conveyor.description = Bloco de transporte de item avançado. Move itens mais rapidos que esteiras padrões.
-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 = Funciona como uma ponte Para duas esteiras que estejam se cruzando. Util em situações que tenha duas esteiras diferentes carregando materiais diferentes para lugares diferentes.
-block.bridge-conveyor.description = Bloco de transporte de itens avancado. Possibilita o transporte de itens acima de 3 blocos de construção ou paredes.
-block.phase-conveyor.description = Bloco de transporte de item avançado. Usa energia para teleportar itens a uma esteira de fase sobre uma severa distancia.
-block.sorter.description = Filtra itens passando o selecionado para frente e os outros para os lados.
-block.inverted-sorter.description = Filtra os itens como um ordenador normal, porém, os itens escolhidos sairão pelas laterais.
-block.router.description = Aceita itens de uma direção e os divide em 3 direções igualmente. Util para espalhar materiais da fonte para multiplos alvos.
-block.distributor.description = Um roteador avançado que espalhas os itens em 7 outras direções igualmente.
-block.overflow-gate.description = Uma combinação de roteador e divisor Que apenas manda para a esquerda e Direita se a frente estiver bloqueada.
-block.underflow-gate.description = O oposto de um portão de sobrecarga. Manda pra frente se a esquerda e a direita estiverem bloqueadas.
-block.mass-driver.description = Bloco de transporte de itens supremo. Coleta itens severos e atira eles em outro mass driver de uma longa distancia.
-block.mechanical-pump.description = Uma bomba barata com baixa saída de líquidos, mas sem consumo de energia.
-block.rotary-pump.description = Uma bomba avançada. Bombeia mais líquido, mas requer energia.
-block.thermal-pump.description = A bomba final.
-block.conduit.description = Bloco básico de transporte de líquidos. Move líquidos para a frente. Usado em conjunto com bombas e outros canos.
-block.pulse-conduit.description = Bloco avancado de transporte de liquido. Transporta liquidos mais rápido e armazena mais que os canos padrões.
-block.plated-conduit.description = Move líquidos na mesma velocidade que canos de pulso, mas possui mais blindagem. Não aceita fluidos dos lados de nada além de outros canos.\nVaza menos.
-block.liquid-router.description = Aceita liquidos de uma direcão e os joga em 3 direções igualmente. Pode armazenar uma certa quantidade de liquido. Útil para espalhar líquidos de uma fonte para múltiplos alvos.
-block.liquid-tank.description = Armazena grandes quantidades de liquido. Use quando a demanda de materiais não for constante ou para guardar itens para resfriar blocos vitais.
-block.liquid-junction.description = Age como uma ponte para dois canos que se cruzam. Útil em situações em que há dois cano carregando liquidos diferentes até localizações diferentes.
-block.bridge-conduit.description = Bloco de transporte de liquidos avancados. Possibilita o transporte de liquido sobre 3 blocos acima de construções ou paredes
-block.phase-conduit.description = Bloco avancado de transporte de liquido. Usa energia para teleportar liquidos para outro cano de fase em uma grande distância.
+block.door-large.description = Uma grande porta. Pode ser aberta e fechada ao tocar. Ocupa múltiplos blocos.
+block.mender.description = Periodicamente repara blocos vizinhos.\nOpicionalmente usa silício para aumentar o alcance e a eficácia.
+block.mend-projector.description = Reparação de blocos em seu alcance.\nOpcionalmente usa tecido de fase para aumentar o alcance e a eficácia.
+block.overdrive-projector.description = Aumenta a velocidade de construções vizinhas.\nOpcionalmente usa tecido de fase para aumentar o alcance e a eficácia.
+block.force-projector.description = Cria um campo de força hexagonal ao redor de si, protegendo construções e unidades.\nSuperaquece se muito dano for recebido.\nOpcionalmente usa refrigeradores para evitar superaquecimento. Tecido de fase aumenta o tamanho do escudo.
+block.shock-mine.description = Libera arcos elétricos em contato com unidades inimiga.
+block.conveyor.description = Transporta itens para a frente.
+block.titanium-conveyor.description = Move itens mais rapidos que esteiras padrões.
+block.plastanium-conveyor.description = Transporta os itens para frente em lotes. Aceita itens na parte de trás, e os descarrega em três direções na frente. Requer múltiplos pontos de carga e descarga para o pico de produção.
+block.junction.description = Funciona como uma ponte para duas esteiras que estejam se cruzando.
+block.bridge-conveyor.description = Transporta itens sobre terrenos ou construções.
+block.phase-conveyor.description = Transporta instantaneamente itens sobre terrenos ou construções. Maior alcance do que a esteira-ponte, mas requer energia.
+block.sorter.description = Se um item de entrada corresponde à seleção, ele passa para frente. Caso contrário, o item é enviado para a esquerda ou para a direita.
+block.inverted-sorter.description = Semelhante a um ordenador padrão, mas os itens selecionados vão para os lados.
+block.router.description = Distribui igualmente os itens de entrada para 3 direções de saída.
+block.router.details = Um mal necessário. Usar próximo de entradas de produção não é recomendado, pois ele vai entupir a saída de itens.
+block.distributor.description = Espalha os itens em 7 direções igualmente.
+block.overflow-gate.description = Apenas manda itens para a esquerda e direita se a frente estiver bloqueada.
+block.underflow-gate.description = O oposto de um portão de sobrecarga. Apenas manda itens para frente se a esquerda e a direita estiverem bloqueadas.
+block.mass-driver.description = Estrutura de transporte de itens de longo alcance. Coleta grupos de itens e os atira em outras catapultas electromagnéticas.
+block.mechanical-pump.description = Bombeia líquidos. Não requer energia.
+block.rotary-pump.description = Bombeia líquidos. Requer energia.
+block.impulse-pump.description = Bombeia líquidos com o máximo de eficiência, mas requer uma quantidade maior de energia.
+block.conduit.description = Move líquidos para frente. Usado em conjunto com bombas e outros canos.
+block.pulse-conduit.description = Transporta mais rápido e armazena mais do que os canos padrão.
+block.plated-conduit.description = Move líquidos na mesma velocidade que canos de pulso, mas possui blindagem. Não aceita entradas dos lados. Não vaza.
+block.liquid-router.description = Aceita líquidos de uma direcão e os joga em 3 direções igualmente. Pode armazenar uma certa quantidade de líquido.
+block.liquid-container.description = Armazena uma grande quantidade de líquido. Joga para todos os lados, de forma semelhante a um roteador de líquido.
+block.liquid-tank.description = Armazena grandes quantidades de líquido. Manda para todos os lados, similarmente a um roteador de líquido.
+block.liquid-junction.description = Age como uma ponte para dois canos que se cruzam.
+block.bridge-conduit.description = Transporta líquidos sobre terrenos ou construções.
+block.phase-conduit.description = Transporta líquidos sobre terrenos ou construções. Maior alcance do que o cano-ponte, mas requer energia.
 block.power-node.description = Transmite energia para células conectadas. A célula vai receber energia ou alimentar qualquer bloco adjacente.
 block.power-node-large.description = Uma célula de energia avançada com maior alcance e mais conexões.
 block.surge-tower.description = Uma célula de energia com um extremo alcance mas com menos conexões disponíveis.
-block.diode.description = A energia de baterias pode fluir através desse bloco em apenas uma direção, mas apenas se o outro lado possuir menos energia armazenada.
-block.battery.description = Armazena energia em tempos de energia excedente. Libera energia em tempos de déficit.
+block.diode.description = Movimenta a energia da bateria em uma direção, mas somente se o outro lado tiver menos energia armazenada.
+block.battery.description = Armazena energia em tempos de energia excedente. Libera energia quando falta.
 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.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.differential-generator.description = Gera grandes quantidades de energia. Utiliza a diferença de temperatura entre o criofluido e a piratita.
+block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos que não precisa de resfriamento mas dá muito menos energia que o reator de tório.
 block.solar-panel.description = Gera pequenas quantidades de energia do sol.
 block.solar-panel-large.description = Uma versão significantemente mais eficiente que o painel solar padrão.
-block.thorium-reactor.description = Gera altas quantidades de energia do torio radioativo. Requer resfriamento constante. Vai explodir violentamente Se resfriamento insuficiente for fornecido.
+block.thorium-reactor.description = Gera altas quantidades de energia pelo tório. Requer resfriamento constante. Explodirá violentamente se o resfriamento for insuficiente.
 block.impact-reactor.description = Um gerador avançado, capaz de criar quantidades enormes de energia em seu poder total. Requer uma entrada significativa de energia ao iniciar.
-block.mechanical-drill.description = Uma broca barata. Quando colocado em blocos apropriados, retira itens em um ritmo lento e indefinitavamente.
-block.pneumatic-drill.description = Uma broca improvisada que é mais rápida e capaz de processar materiais mais duros usando a pressão do ar
-block.laser-drill.description = Possibilita a mineração ainda mais rapida usando tecnologia a laser, Mas requer poder adcionalmente torio radioativo pode ser recuperado com essa mineradora
-block.blast-drill.description = A melhor mineradora. Requer muita energia.
-block.water-extractor.description = Extrai água subterrânea. Usado em locais sem água superficial disponível.
+block.mechanical-drill.description = Quando colocado sobre minério, produz itens a um ritmo lento indefinidamente. Somente capaz de extrair recursos básicos.
+block.pneumatic-drill.description = Uma broca melhorada, capaz de extrair Titânio. Minera a um ritmo mais rápido que uma broca mecânica.
+block.laser-drill.description = Permite a perfuração ainda mais rápida através da tecnologia laser, mas requer energia. Capaz de minerar tório.
+block.blast-drill.description = A melhor broca. Requer muita energia.
+block.water-extractor.description = Extrai água subterrânea. Usado em locais sem água disponível na superficie.
 block.cultivator.description = Cultiva pequenas concentrações de esporos na atmosfera em cápsulas prontas.
+block.cultivator.details = Tecnologia recuperada. Costumava produzir quantidades massivas de biomassa o mais eficiente o possível. Provavelmente o primeiro incubador de esporos cobrindo Serpulo agora.
 block.oil-extractor.description = Usa altas quantidades de energia para extrair petróleo da areia. Use quando não tiver fontes de petróleo por perto.
-block.core-shard.description = A primeira iteração do núcleo. Uma vez destruído, todo o contato com a região é perdido. Não deixe isso acontecer.
-block.core-foundation.description = A segunda versão do núcleo. Mais bem armadurado. Armazena mais recursos.
-block.core-nucleus.description = A terceira e ultima iteração do núcleo. Extremamente bem armadurada. Guarda quantidades massivas de recursos.
-block.vault.description = Carrega uma alta quantidade de itens. Usado para criar fontes Quando não tem uma necessidade constante de materiais. Um[lightgray] Descarregador[] pode ser usado para recuperar esses itens do container.
-block.container.description = Carrega uma baixa quantidade de itens. Usado para criar fontes Quando não tem uma necessidade constante de materiais. Um[lightgray] Descarregador[] pode ser usado para recuperar esses itens do container.
-block.unloader.description = Descarrega itens de um container, Descarrega em uma esteira ou diretamente em um bloco adjacente. O tipo de item que pode ser descarregado pode ser mudado clicando no descarregador.
-block.launch-pad.description = Lança montes de itens sem qualquer necessidade de um lançamento de núcleo.
-block.launch-pad-large.description = Uma versão melhorada da plataforma de lançamento. Guarda mais itens. Lança mais frequentemente.
-block.duo.description = Uma pequena torre de baixo custo. Útil contra unidades terrestres.
-block.scatter.description = Uma torre antiaérea essencial para a defesa. Dispara vários tiros aglomerados de chumbo, sucata ou metavidro.
-block.scorch.description = Uma torre que queima qualquer unidade que estiver próxima. Altamente efetivo se for a queima-roupa. 
-block.hail.description = Uma pequena torre de artilharia com grande alcance.
-block.wave.description = Uma torre de tamanho médio. Lança jatos de líquidos nos seus inimigos. Automaticamente apaga incêndios se for abastecido com água ou crio fluido.
-block.lancer.description = Uma torre laser anti-terrestre média. Carrega e dispara poderosos feixes de energia. 
-block.arc.description = Uma pequena torre elétrica com curto alcance. Dispara arcos de eletricidade nos seus inimigos. 
-block.swarmer.description = Uma torre de mísseis de tamanho médio. Ataca ambos terrestre e aéreo disparando misseis teleguiados.
-block.salvo.description = Uma grande, versão avançada da dupla. Dispara rápidas rajadas de tiros nos seus inimigos.
-block.fuse.description = Uma torre grande com curto alcance. Dispara três feixes perfurantes nos seus inimigos. 
-block.ripple.description = Uma torre de artilharia extremamente poderosa. Dispara varios tiros aglomerados a uma grande distância nos seus inimigos.
-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 um resfriamento para ser operada.    
+block.core-shard.description = O núcleo da base. Uma vez destruído, o setor é perdido.
+block.core-shard.details = A primeira interação. Compacto. Auto-replicante. Equipado com propulsores de lançamento de uso único. Não projetado para viagens interplanetárias.
+block.core-foundation.description = O núcleo da base. Bem blindado. Armazena mais recursos do que o Fragmento do Núcleo.
+block.core-foundation.details = A segunda versão.
+block.core-nucleus.description = O núcleo da base. Extremamente bem blindado. Armazena enormes quantidades de recursos.
+block.core-nucleus.details = A terceira e última versão.
+block.vault.description = Armazena uma grande quantidade de itens de cada tipo. Expande o armazenamento quando colocado próximo a um núcleo. O conteúdo pode ser recuperado com um descarregador
+block.container.description = Armazena uma pequena quantidade de itens de cada tipo. Expande o armazenamento quando colocado próximo a um núcleo. O conteúdo pode ser recuperado com um descarregador.
+block.unloader.description = Descarrega o item selecionado dos blocos próximos.
+block.launch-pad.description = Lança lotes de itens para setores selecionados.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = Dispara balas alternadas em inimigos.
+block.scatter.description = Dispara tiros aglomerados de chumbo, sucata ou metavidro em unidades aéreas.
+block.scorch.description = Queima qualquer unidade que estiver próxima. Altamente efetivo se for de perto.
+block.hail.description = Dispara pequenas cápsulas em inimigos terrestres a longas distâncias.
+block.wave.description = Lança jatos de líquido nos seus inimigos. Automaticamente apaga incêndios se for abastecido com água ou criofluido.
+block.lancer.description = Carrega e dispara poderosos feixes de energia.
+block.arc.description = Dispara arcos de eletricidade em alvos terrestres.
+block.swarmer.description = Dispara misseis teleguiados em inimigos.
+block.salvo.description = Dispara rápidas rajadas de tiros em inimigos.
+block.fuse.description = Dispara três feixes perfurantes em inimigos.
+block.ripple.description = Dispara grupos de cápsulas em alvos terrestres a longas distâncias.
+block.cyclone.description = Dispara aglomerados de fogo antiaéreo explosivos em inimigos próximos.
+block.spectre.description = Dispara grandes balas em alvos aéreos e terrestres.
+block.meltdown.description = Carrega e dispara um poderoso e persistente feixe de laser em inimigos. Requer refrigeradores para operar.
+block.foreshadow.description = Dispara um feixe gigante de único alvo a grandes distâncias. Prioriza inimigos com maior vida máxima.
 block.repair-point.description = Continuamente repara a unidade danificada mais proxima.
-block.segment.description = Destrói projéteis inimigos que se aproximam. Feixes não serão detectados.
+block.segment.description = Destrói projéteis inimigos que se aproximam. Projéteis a laser não serão detectados.
+block.parallax.description = Dispara um feixe de energia que puxa unidades aéreas, danificando-as no processo.
+block.tsunami.description = Lança poderosos jatos de líquido em inimigos. Automaticamente apaga incêndios se for abastecido com água ou criofluido.
+block.silicon-crucible.description = Refina silício com carvão e areia, usando piratita como uma fonte de calor adicional. Mais eficiente em locais quentes.
+block.disassembler.description = Separa escória em traços de minerais componentes exóticos. Pode produzir tório.
+block.overdrive-dome.description = Aumenta a velocidade de construções vizinhas. Requer tecido de fase e silício para operar.
+block.payload-conveyor.description = Movimenta grandes cargas ,como unidades saindo das fábricas. Magnético. Utilizável em ambientes zero-G.
+block.payload-router.description = Separa cargas recebidas em 3 direções de saída.
+block.ground-factory.description = Produz unidades terrestres. Unidades produzidas podem ser usadas diretamente, ou movido em reconstrutores para melhorar.
+block.air-factory.description = Produz unidades aéreas. Unidades produzidas podem ser usadas diretamente, ou movido em reconstrutores para melhorar.
+block.naval-factory.description = Produz unidades navais. Unidades produzidas podem ser usadas diretamente, ou movido em reconstrutores para melhorar.
+block.additive-reconstructor.description = Melhora unidades recebidas para o seu segundo nível.
+block.multiplicative-reconstructor.description = Melhora unidades recebidas para o seu terceiro nível.
+block.exponential-reconstructor.description = Melhora unidades recebidas para o seu quarto nível.
+block.tetrative-reconstructor.description = Melhora unidades recebidas para o seu quinto e último nível.
+block.switch.description = Uma alavanca alternável. O seu estado pode ser lido e controlado com processadores lógicos.
+block.micro-processor.description = Executa uma sequência de instruções lógicas em um loop. Pode ser usado para controlar unidades e construções.
+block.logic-processor.description = Executa uma sequência de instruções lógicas em um loop. Pode ser usado para controlar unidades e construções. Mais rápido que um micro processador.
+block.hyper-processor.description = Executa uma sequência de instruções lógicas em um loop. Pode ser usado para controlar unidades e construções. Mais rápido que um processador lógico.
+block.memory-cell.description = Guarda informações para um processador lógico.
+block.memory-bank.description = Guarda informações para um processador lógico. Capacidade alta.
+block.logic-display.description = Exibe gráficos arbitrários de um processador lógico.
+block.large-logic-display.description = Exibe gráficos arbitrários de um processador lógico.
+block.interplanetary-accelerator.description = Uma enorme torre eletromagnética. Acelera a velocidade de fuga dos núcleos para o desdobramento interplanetário.
+block.repair-turret.description = Conserta continuamente a unidade danificada mais próxima a ela. Opcionalmente, aceita líquido refrigerante.
+
+#Erekir
+block.core-bastion.description = O núcleo da base. Blindado. Uma vez destruído, o setor é perdido.
+block.core-citadel.description = O núcleo da base. Muito bem blindado. Armazena mais recursos do que um Bastião do Núcleo.
+block.core-acropolis.description = O núcleo da base. Excepcionalmente bem blindado. Armazena mais recursos do que a Cidadela do Núcleo.
+block.breach.description = Dispara munições perfurantes de berílio ou tungstênio em alvos inimigos.
+block.diffuse.description = Dispara balas em um cone largo. Empurra os alvos inimigos de volta.
+block.sublimate.description = Dispara um jato contínuo de chamas sobre alvos inimigos. Penetra armadura.
+block.titan.description = Dispara um enorme projétil de artilharia explosiva em alvos terrestres. Requer hidrogênio.
+block.afflict.description = Dispara uma esfera maciça e carregada de fragmentos. Requer aquecimento.
+block.disperse.description = Dispara projéteis em alvos aéreos.
+block.lustre.description = Dispara um laser de movimento lento de alvo único em alvos inimigos.
+block.scathe.description = Lança um poderoso míssil em alvos terrestres a grandes distâncias.
+block.smite.description = Dispara balas perfurantes e emissoras de raios.
+block.malign.description = Dispara uma barragem de cargas de laser teleguiadas em alvos inimigos. Exige aquecimento extensivo.
+block.silicon-arc-furnace.description = Refina Silício a partir de areia e grafite.
+block.oxidation-chamber.description = Converte Berílio e Ozônio em Oxido. Emite calor como um subproduto.
+block.electric-heater.description = Aquece blocos a frente. Requer grandes quantidades de energia.
+block.slag-heater.description = Aquece blocos a frente. Requer Escória.
+block.phase-heater.description = Aquece blocos a frente. Requer Tecido de Fase
+block.heat-redirector.description = Redireciona o calor acumulado para outros blocos.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converte �gua em Hidrogênio e gás de Ozônio.
+block.atmospheric-concentrator.description = Concentra o Nitrogênio da atmosfera. Requer calor.
+block.surge-crucible.description = Forma Liga de Surto a partir de Escória e Silício. Requer calor.
+block.phase-synthesizer.description = Sintetiza Tecido de Fase a partir do Tório, Areia e Ozônio. Requer calor.
+block.carbide-crucible.description = Funde Grafite e Tungstênio em Carboneto. Requer calor.
+block.cyanogen-synthesizer.description = Sintetiza Cianogênio a partir de Arkycite e Grafite. Requer calor.
+block.slag-incinerator.description = Incinera itens ou líquidos não voláteis. Requer escória.
+block.vent-condenser.description = Condensa os gases de ventilação em água. Consome energia.
+block.plasma-bore.description = Quando colocado de frente para uma parede de minério, produz itens por tempo indeterminado. Requer pequenas quantidades de energia.
+block.large-plasma-bore.description = Uma Broca de Plasma maior. Capaz de extrair tungstênio e tório. Requer hidrogênio e energia.
+block.cliff-crusher.description = Esmaga as paredes, produzindo areia indefinidamente. Requer energia. A eficiência varia de acordo com o tipo de parede.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Quando colocados sobre minério, os itens saem em rajadas indefinidamente. Requer energia e água.
+block.eruption-drill.description = Uma Broca de Impacto melhorada. Capaz de minerar Tório. Requer Hidrogênio.
+block.reinforced-conduit.description = Movimenta fluidos para frente. Não aceita entradas de outros blocos, a não ser canos, dos lados.
+block.reinforced-liquid-router.description = Distribui fluidos igualmente para todos os lados.
+block.reinforced-liquid-tank.description = Armazena uma grande quantidade de fluidos.
+block.reinforced-liquid-container.description = Armazena uma quantidade considerável de fluidos.
+block.reinforced-bridge-conduit.description = Transporta fluidos sobre estruturas e terrenos.
+block.reinforced-pump.description = Bombeia e produz líquidos. Requer hidrogênio.
+block.beryllium-wall.description = Protege estruturas contra projéteis inimigos.
+block.beryllium-wall-large.description = Protege estruturas contra projéteis inimigos.
+block.tungsten-wall.description = Protege estruturas contra projéteis inimigos.
+block.tungsten-wall-large.description = Protege estruturas contra projéteis inimigos.
+block.carbide-wall.description = Protege estruturas contra projéteis inimigos.
+block.carbide-wall-large.description = Protege estruturas contra projéteis inimigos.
+block.reinforced-surge-wall.description = Protege estruturas contra projéteis inimigos, lançando periodicamente arcos elétricos em contato com o projétil.
+block.reinforced-surge-wall-large.description = Protege estruturas contra projéteis inimigos, lançando periodicamente arcos elétricos em contato com o projétil.
+block.shielded-wall.description = Protege estruturas contra projéteis inimigos. Implanta um escudo que absorve a maioria dos projéteis quando energia é fornecida. Conduz energia.
+block.blast-door.description = Uma parede que se abre quando as unidades terrestres aliadas estão no alcance. Não pode ser controlada manualmente.
+block.duct.description = Move itens para frente. Só é capaz de armazenar um único item.
+block.armored-duct.description = Move itens para frente. Não aceita entradas de blocos não-dutos dos lados.
+block.duct-router.description = Distribui os itens igualmente em três direções. Aceita somente itens pela parte de trás. Pode ser configurado como um ordenador de itens.
+block.overflow-duct.description = Só libera itens para os lados se a frente estiver bloqueada.
+block.duct-bridge.description = Move itens sobre estruturas e terrenos.
+block.duct-unloader.description = Descarrega o item selecionado do bloco atrás dele. Não pode descarregar do núcleo.
+block.underflow-duct.description = O contrário de um duto de sobrecarga. Libera itens para a frente se os caminhos esquerdo e direito estiverem bloqueados.
+block.reinforced-liquid-junction.description = Atua como uma junção entre dois canos se cruzando.
+block.surge-conveyor.description = Move itens em lotes. Pode ser acelerado com energia. Conduz energia.
+block.surge-router.description = Distribui igualmente os itens em três direções a partir de Esteiras de Liga de Surto. Podem ser acelerados com energia. Conduz energia.
+block.unit-cargo-loader.description = Constrói drones de carga. Os drones distribuem automaticamente os itens aos pontos de descarga de carga com um filtro correspondente.
+block.unit-cargo-unload-point.description = Atua como um ponto de descarga de drones de carga. Aceita itens que combinam com o filtro selecionado.
+block.beam-node.description = Transmite energia para outros blocos ortogonalmente. Armazena uma pequena quantidade de energia.
+block.beam-tower.description = Transmite energia para outros blocos ortogonalmente. Armazena uma grande quantidade de energia. Longo alcance.
+block.turbine-condenser.description = Gera energia quando colocado em ventilações. Produz uma pequena quantidade de água.
+block.chemical-combustion-chamber.description = Gera energia a partir de arkycite e ozônio.
+block.pyrolysis-generator.description = Gera grandes quantidades de energia a partir de arkycite e escória. Produz água como subproduto.
+block.flux-reactor.description = Gera grandes quantidades de energia quando aquecido. Requer cianogênio como estabilizador. A saída de energia e os requisitos de cianogênio são proporcionais à entrada de calor.\nExplode se o cianogênio for insuficiente.
+block.neoplasia-reactor.description = Utiliza arkycite, água e tecido de fase para gerar grandes quantidades de energia. Produz calor e neoplasma perigoso como subproduto.\nExplode violentamente se o neoplasma não for removido do reator através de canos.
+block.build-tower.description = Reconstrói automaticamente estruturas em alcance e auxilia outras unidades na construção.
+block.regen-projector.description = Lentamente repara estruturas aliadas em um perímetro quadrado. Requer hidrogênio.
+block.reinforced-container.description = Armazena uma pequena quantidade de itens. O conteúdo pode ser recuperado através de descarregadores. Não aumenta a capacidade de armazenamento do núcleo.
+block.reinforced-vault.description = Armazena uma grande quantidade de itens. O conteúdo pode ser recuperado através de descarregadores. Não aumenta a capacidade de armazenamento do núcleo.
+block.tank-fabricator.description = Constrói unidades Stell. As unidades produzidas podem ser usadas diretamente, ou movidas para refabricadores para atualização.
+block.ship-fabricator.description = Constrói unidades Elude. As unidades produzidas podem ser usadas diretamente, ou movidas para refabricadores para atualização.
+block.mech-fabricator.description = Constrói unidades Merui. As unidades produzidas podem ser usadas diretamente, ou movidas para refabricadores para atualização.
+block.tank-assembler.description = Monta grandes tanques a partir dos blocos e unidades inseridos. O tier pode ser aumentado com a adição de módulos.
+block.ship-assembler.description = Monta grandes naves a partir de blocos e unidades inseridos. O tier pode ser aumentado com a adição de módulos.
+block.mech-assembler.description = Monta grandes mechs a partir de blocos e unidades inseridos. O tier pode ser aumentado com a adição de módulos.
+block.tank-refabricator.description = Atualiza as unidades tanques inseridas para o segundo tier.
+block.ship-refabricator.description = Atualiza as unidades naves inseridas para o segundo tier.
+block.mech-refabricator.description = Atualiza as unidades mech inseridas para o segundo tier.
+block.prime-refabricator.description = Atualiza as unidades inseridas para o terceiro tier.
+block.basic-assembler-module.description = Aumenta o tier do montador quando colocado próximo a um limite de construção. Requer energia. Pode ser usado como entrada de carga.
+block.small-deconstructor.description = Desconstrói as estruturas e unidades inseridos. Devolve 100% do custo de construção.
+block.reinforced-payload-conveyor.description = Movimenta cargas para frente.
+block.reinforced-payload-router.description = Distribui cargas em blocos adjacentes. Funciona como um ordenador quando um filtro é configurado.
+block.payload-mass-driver.description = = Estrutura de transporte de carga útil de longo alcance. Atira cargas recebidas para Catapultas de Carga Eletromagnéticas conectadas.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repara todas as unidades em sua proximidade. Requer ozônio.
+block.radar.description = Gradualmente descobre o terreno e as unidades inimigas em um grande raio. Requer energia.
+block.shockwave-tower.description = Danifica e destrói projéteis inimigos em um raio. Requer cianogênio.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+
+unit.dagger.description = Dispara projéteis padrões em todos os inimigos em volta.
+unit.mace.description = Dispara corrents de chamas em todos os inimigos em volta.
+unit.fortress.description = Dispara artilharia de longo alcance em alvos terrestres.
+unit.scepter.description = Dispara uma barragem de projéteis carregados em todos os inimigos em volta.
+unit.reign.description = Dispara uma barragem de projéteis perfuradoes massivos em todos os inimigos em volta.
+unit.nova.description = Dispara raios-lasers que danificam inimigos e repara estruturas aliadas. Capaz de voar.
+unit.pulsar.description = Dispara arcos de eletricidade que danificam inimigos e repara estruturas aliadas. Capaz de voar.
+unit.quasar.description = Dispara feixes penetradores de lasers que danificam inimigos e repara estruturas aliadas. Capaz de voar. Possui um escudo.
+unit.vela.description = Dispara um massivo feixe de laser massivo que danificam inimigos, causa fogo e repara estruturas aliadas. Capaz de voar.
+unit.corvus.description = Dispara um massivo laser que danificam inimigos e repara estruturas aliadas. Pode pisar em cima da maioria do terreno.
+unit.crawler.description = Corre atrás de inimigos e se destrói, causando uma grande explosão.
+unit.atrax.description = Dispara orbes debilitantes de escória em alvos terrestres. Pode pisar em cima da maioria do terreno.
+unit.spiroct.description = Dispara lasers enfraquecedores em inimigos, se reparando no processo. Pode pisar em cima da maioria do terreno.
+unit.arkyid.description = Dispara grandes lasers enfraquecedores em inimigos, se reparando no processo. Pode pisar em cima da maioria do terreno.
+unit.toxopid.description = Dispara grande granadas agrupadas elétricas e lasers penetradoes em inimigos. Pode pisar em cima da maioria do terreno.
+unit.flare.description = Dispara projéteis padrões em alvos terrestres.
+unit.horizon.description = Larga aglomerados de bombas em alvos terrestres.
+unit.zenith.description = Dispara salvos de mísseis em todos os inimigos em volta.
+unit.antumbra.description = Dispara uma barragem de projéteis em todos os inimigos em volta.
+unit.eclipse.description = Dispara dois lasers penetradores e uma barragem de fogo antiaéreo em todos os inimigos em volta.
+unit.mono.description = Automaticamente minera cobre e chumbo, depositando-os no núcleo.
+unit.poly.description = Automaticamente reconstrói estruturas destruídas e ajuda outras unidades em construção.
+unit.mega.description = Automaticamente repara estruturas danificadas. Capaz de carregar blocos e unidades de chão pequenas.
+unit.quad.description = Larga grandes bombas em alvos terrestres, reparando estruturas aliadas e danificando inimigos. Capaz de carregar unidades terrestres de tamanho médio.
+unit.oct.description = Protege aliados em volta com o seu escudo regenerador. Capaz de carregar a maioria das unidades terrestres.
+unit.risso.description = Dispara uma barragem de mísseis e projéteis em todos os inimigos em volta.
+unit.minke.description = Dispara granadas e projéteis padrões em alvos terrestres.
+unit.bryde.description = Dispara granadas de artilharia de longo alcance e mísseis em todos os inimigos em volta.
+unit.sei.description = Dispara uma barragem de mísseis e projéteis penetradoras de armadura em inimigos.
+unit.omura.description = Dispara um raio de longo alcance atravessador em inimigos. Constrói unidades flare.
+unit.alpha.description = Defende o Fragmento do Núcleo de inimigos. Constrói estruturas.
+unit.beta.description = Defende a Fundação do Núcleo de inimigos. Constrói estruturas.
+unit.gamma.description = Defende o Centro do Núcleo de inimigos. Constrói estruturas.
+unit.retusa.description = Atira torpedos teleguiados em inimigos próximos. Repara unidades aliadas.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Dispara fragmentos de mísseis em inimigos. Repara unidades aliadas.
+unit.aegires.description = Causa choque a todas as unidades e estruturas inimigas que entram em seu campo de enrgia. Repara todos os aliados.
+unit.navanax.description = Dispara projéteis de PEM explosivos, causando danos significativos às redes de energia inimigas e reparando as estruturas aliadas. Derrete os inimigos próximos com 4 torres laser autônomas.
+unit.stell.description = Dispara balas padrão em alvos inimigos.
+unit.locus.description = Dispara balas alternadas em alvos inimigos.
+unit.precept.description = Atira balas de fragmentação perfurantes em alvos inimigos.
+unit.vanquish.description = Dispara grandes balas de fragmentação perfurantes em alvos inimigos.
+unit.conquer.description = Dispara grandes cascatas de balas perfurantes em alvos inimigos.
+unit.merui.description = Dispara artilharia de longo alcance em alvos terrestres inimigos. Pode pisar sobre a maioria dos terrenos.
+unit.cleroi.description = Dispara projéteis duplos em alvos inimigos. Ataca projéteis inimigos com torretas de defesa de ponto. Pode pisar sobre a maioria dos terrenos.
+unit.anthicus.description = Atira mísseis teleguiados de longo alcance em alvos inimigos. Pode pisar sobre a maioria dos terrenos.
+unit.tecta.description = Atira mísseis teleguiados de plasma em direção a alvos inimigos. Protege-se com um escudo direcional. Pode pisar sobre a maioria dos terrenos.
+unit.collaris.description = Dispara artilharia de fragmentação de longo alcance em alvos inimigos. Pode pisar sobre a maioria dos terrenos.
+unit.elude.description = Dispara pares de balas teleguiadas em alvos inimigos. Pode flutuar sobre regiões de líquido.
+unit.avert.description = Dispara pares de balas em alvos inimigos.
+unit.obviate.description = Dispara pares de orbes de relâmpagos em alvos inimigos.
+unit.quell.description = Atira mísseis de longo alcance em alvos inimigos. Suprime os blocos de reparo de estruturas inimigas.
+unit.disrupt.description = Dispara mísseis teleguiados de supressão de longo alcance em alvos inimigos. Suprime os blocos de reparo de estruturas inimigas.
+unit.evoke.description = Constrói estruturas para defender o Bastião do Núcleo. Conserta estruturas com um feixe.
+unit.incite.description = Constrói estruturas para defender a Cidadela do Núcleo. Repara estruturas com um feixe.
+unit.emanate.description = Constrói estruturas para defender o Núcelo Acrópole. Repara estruturas com feixes.
+
+lst.read = Ler um número de uma célula de memória vinculada.
+lst.write = Escrever um número de uma célula de memória vinculada.
+lst.print = Adiciona texto ao buffer de impressão.\nNão exibe nada até [accent]Print Flush[] ser usado.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Adicionar uma operação ao buffer de desenho.\nNão exibe nada até [accent]Draw Flush[] ser usado.
+lst.drawflush = Liberar operações [accent]Draw[] enfileiradas para um display.
+lst.printflush = Liberar operações [accent]Print[] enfileiradas para um bloco de mensagem.
+lst.getlink = Obtenha um link de processador por índice. Começa em 0.
+lst.control = Controle uma construção.
+lst.radar = Localize unidades ao redor de um prédio com alcance.
+lst.sensor = Obtenha dados de um edifício ou unidade.
+lst.set = Defina uma variável.
+lst.operation = Execute uma operação em 1-2 variáveis.
+lst.end = Pule para o topo da pilha de instruções.
+lst.wait = Aguarde um determinado número de segundos.
+lst.stop = Interrompa a execução deste processador.
+lst.lookup = Pesquise um tipo de item/líquido/unidade/bloco por ID.\nAs contagens totais de cada tipo podem ser acessadas com:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Salte condicionalmente para outra instrução.
+lst.unitbind = Vincule à próxima unidade de um tipo e armazene-a em [accent]@unit[].
+lst.unitcontrol = Controle a unidade atualmente vinculada.
+lst.unitradar = Localize as unidades ao redor da unidade atualmente vinculada.
+lst.unitlocate = Localize um tipo específico de posição/construção em qualquer lugar do mapa.\nRequer uma unidade vinculada.
+lst.getblock = Obtenha dados de blocos em qualquer local.
+lst.setblock = Defina os dados do bloco em qualquer local.
+lst.spawnunit = Gere uma unidade em um local.
+lst.applystatus = Aplique ou elimine um efeito de status de uma unidade.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Gerar uma onda.
+lst.explosion = Crie uma explosão em um local.
+lst.setrate = Defina a velocidade de execução do processador em instruções/tick.
+lst.fetch = Pesquise unidades, núcleos, jogadores ou edifícios por índice.\nOs índices começam em 0 e terminam na contagem retornada.
+lst.packcolor = Empacote [0, 1] componentes RGBA em um único número para desenho ou configuração de regra.
+lst.setrule = Defina uma regra do jogo.
+lst.flushmessage = Exibe uma mensagem na tela do buffer de texto.\nAguardará até que a mensagem anterior termine.
+lst.cutscene = Manipule a câmera do jogador.
+lst.setflag = Defina um sinalizador global que possa ser lido por todos os processadores.
+lst.getflag = Verifique se um sinalizador global está definido.
+lst.setprop = Define uma propriedade de uma unidade ou edifício.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Lógica de construção de unidades não é permitida aqui.
+
+lenum.type = Tipo de edifício/unidade.\ne.g. para qualquer roteador, isso retornará [accent]@router[].\não uma string.
+lenum.shoot = Atire em uma posição.
+lenum.shootp = Atire em uma unidade/edifício com previsão de velocidade.
+lenum.config = Configuração do edifício, por ex. item classificador.
+lenum.enabled = Se o bloco está ativado.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = Cor do iluminador.
+laccess.controller = Controlador de unidade. Se controlado pelo processador, retorna o processador.\nCaso contrário, retorna a própria unidade.
+laccess.dead = Se uma unidade/edifício está morta ou não é mais válida.
+laccess.controlled = Retorna:\n[accent]@ctrlProcessor[] se o controlador da unidade for o processador\n[accent]@ctrlPlayer[] se o controlador da unidade/edifício for o player\n[accent]@ctrlCommand[] se o controlador da unidade for um comando do player\nCaso contrário , 0.
+laccess.progress = Progresso da ação, 0 a 1.\nRetorna a produção, a recarga da torre ou o progresso da construção.
+laccess.speed = Velocidade máxima de uma unidade, em ladrilhos/seg.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+
+lcategory.unknown = Desconhecido
+lcategory.unknown.description = Instruções não categorizadas.
+lcategory.io = Entrada e Saída
+lcategory.io.description = Modifica o conteúdo dos blocos de memória e buffers do processador.
+lcategory.block = Controle de bloco
+lcategory.block.description = Interaja com os blocos.
+lcategory.operation = Operações
+lcategory.operation.description = Operações lógicas.
+lcategory.control = Controle de fluxo
+lcategory.control.description = Gerencia ordem de execução.
+lcategory.unit = Unidade de controle
+lcategory.unit.description = Dá comandos às unidades.
+lcategory.world = Mundo
+lcategory.world.description = Controla como o mundo se comporta.
+
+graphicstype.clear = Preenche o visor com uma cor.
+graphicstype.color = Define a cor para as próximas operações de desenho.
+graphicstype.col = Equivalente à cor, mas agrupada.\nAs cores agrupadas são escritas como códigos hexadecimais com um prefixo [accent]%[].\nExemplo: [accent]%ff0000[] seria vermelho.
+graphicstype.stroke = Define a largura da linha.
+graphicstype.line = Desenha o segmento de linha.
+graphicstype.rect = Preenche um retângulo.
+graphicstype.linerect = Desenha um contorno retangular.
+graphicstype.poly = Preenche um polígono regular.
+graphicstype.linepoly = Desenha um contorno de polígono regular.
+graphicstype.triangle = Preenche um triângulo.
+graphicstype.image = Desenha uma imagem de algum conteúdo.\nex: [accent]@router[] ou [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Sempre verdade.
+lenum.idiv = Divisão inteira.
+lenum.div = Divisão.\nRetorna [accent]null[] na divisão por zero.
+lenum.mod = Modulo.
+lenum.equal = Igual. Coage tipos.\nObjetos não nulos comparados com números tornam-se 1, caso contrário, 0.
+lenum.notequal = Não igual. Tipos de coerção.
+lenum.strictequal = Igualdade estrita. Não coage tipos.Pode ser usado para verificar [accent]null[].
+lenum.shl = Deslocamento de bit para a esquerda.
+lenum.shr = Deslocamento de bits para a direita.
+lenum.or = OU bit a bit.
+lenum.land = Lógico E.
+lenum.and = E bit a bit.
+lenum.not = Virar bit a bit.
+lenum.xor = XOR bit a bit.
+lenum.min = Mínimo de dois números.
+lenum.max = Máximo de dois números.
+lenum.angle = Ângulo do vetor em graus.
+lenum.anglediff = Distância absoluta entre dois ângulos em graus.
+lenum.len = Comprimento do vetor.
+
+lenum.sin = Seno, em graus.
+lenum.cos = Cosseno, em graus.
+lenum.tan = Tangente, em graus.
+
+lenum.asin = Arco seno, em graus.
+lenum.acos = Arco cosseno, em graus.
+lenum.atan = Arco tangente, em graus.
+
+lenum.rand = Decimal aleatório no intervalo [0, valor).
+lenum.log = Logaritmo natural (ln).
+lenum.log10 = Logaritmo de base 10.
+lenum.noise = Ruído simplex 2D.
+lenum.abs = Valor absoluto.
+lenum.sqrt = Raiz quadrada.
+
+lenum.any = Qualquer unidade.
+lenum.ally = Unidade aliada.
+lenum.attacker = Unidade com uma arma.
+lenum.enemy = Unidade inimiga.
+lenum.boss = Unidade Guardiã.
+lenum.flying = Unidade voadora.
+lenum.ground = Ground unit.
+lenum.player = Unidade controlada por um jogador.
+
+lenum.ore = Depósito de minério.
+lenum.damaged = Edifício aliado danificado.
+lenum.spawn = Ponto de geração do inimigo.\nPode ser um núcleo ou uma posição.
+lenum.building = Construção em um grupo específico.
+
+lenum.core = Qualquer núcleo.
+lenum.storage = Edifício de armazenamento, por ex. Cofre.
+lenum.generator = Edifícios que geram energia.
+lenum.factory = Edifícios que transformam recursos.
+lenum.repair = Pontos de reparo.
+lenum.battery = Qualquer bateria.
+lenum.resupply = Pontos de reabastecimento.\nRelevante apenas quando [accent]"Unit Ammo"[] está habilitado.
+lenum.reactor = Reator de impacto/tório.
+lenum.turret = Qualquer torre.
+
+sensor.in = O edifício/unidade para sentir.
+
+radar.from = Construir para detectar.\nO alcance do sensor é limitado pelo alcance do edifício.
+radar.target = Filtre as unidades a serem detectadas.
+radar.and = Filtros adicionais.
+radar.order = Ordem de classificação. 0 para inverter.
+radar.sort = Métrica pela qual classificar os resultados.
+radar.output = Variável para gravar a unidade de saída.
+
+unitradar.target = Filtre as unidades a serem detectadas.
+unitradar.and = Filtros adicionais.
+unitradar.order = Ordem de classificação. 0 para inverter.
+unitradar.sort = Métrica pela qual classificar os resultados.
+unitradar.output = Variável para gravar a unidade de saída.
+
+control.of = Construir para controlar.
+control.unit = Unidade/edifício a visar.
+control.shoot = Se atirar.
+
+unitlocate.enemy = Se deve localizar edifícios inimigos.
+unitlocate.found = Se o objeto foi encontrado.
+unitlocate.building = Variável de saída para edifício localizado.
+unitlocate.outx = Coordenada X de saída.
+unitlocate.outy = Coordenada Y de saída.
+unitlocate.group = Grupo de construção para procurar.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Não se mova, mas continue construindo/minerando.\nO estado padrão.
+lenum.stop = Pare de mover/mineração/construção.
+lenum.unbind = Desabilite completamente o controle lógico.\nRetome AI padrão.
+lenum.move = Mover para a posição exata.
+lenum.approach = Aproxime-se de uma posição com um raio.
+lenum.pathfind = Pathfind para o spawn inimigo.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Atire em uma posição.
+lenum.targetp = Atire em um alvo com previsão de velocidade.
+lenum.itemdrop = Solte um item.
+lenum.itemtake = Pegue um item de um edifício.
+lenum.paydrop = Solte a carga útil atual.
+lenum.paytake = Pegue a carga no local atual.
+lenum.payenter = Entre/pouse no bloco de carga em que a unidade está.
+lenum.flag = Sinalizador de unidade numérica.
+lenum.mine = Mina em uma posição.
+lenum.build = Construa uma estrutura.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Verifique se a unidade está perto de uma posição.
+lenum.boost = Iniciar/parar o reforço.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 6e08cc7d3f..df4b45fe49 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1,27 +1,30 @@
 credits.text = Criado por [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Créditos
 contributors = Tradutores e contribuidores
-discord = Junte-se ao Discord do Mindustry! (Lá falamos inglês)
-link.discord.description = O discord oficial do Mindustry
-link.reddit.description = The Mindustry subreddit
+discord = Junte-se ao Discord do Mindustry! (Lá falamos várias linguas)
+link.discord.description = O Discord oficial do Mindustry
+link.reddit.description = O subreddit do Minustry
 link.github.description = Código-fonte do jogo.
 link.changelog.description = Lista de mudanças da atualização
-link.dev-builds.description = Desenvolvimentos Instáveis
-link.trello.description = Trello Oficial para Atualizações Planejadas
-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.dev-builds.description = Versões instáves em desenvolvimento
+link.trello.description = Trello Oficial para atualizações planeadas
+link.itch.io.description = Pagina da Itch.io com as transferências
+link.google-play.description = Página da Google Play Store
+link.f-droid.description = Lista do F-Droid
 link.wiki.description = Wiki oficial do Mindustry
 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.
+link.bug.description = Achou algum? Reporte-o aqui
+linkopen = Este servidor enviou-lhe um link. Tem a certeza que o quer abrir?\n\n[sky]{0}
+linkfail = Falha ao abrir a ligação\nO Url foi copiado para a área de transferência
+screenshot = Captura de ecrã gravada em {0}
+screenshot.invalid = Mapa grande demais, potencialmente sem memória suficiente para captura.
 gameover = O núcleo foi destruído.
-gameover.pvp = O time[accent] {0}[] ganhou!
+gameover.disconnect = Desconectar
+gameover.pvp = A equipa [accent] {0}[] ganhou!
+gameover.waiting = [accent]Aguardando pelo próximo mapa...
 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
+indev.notready = Esta parte do jogo ainda não esta pronta
 
 load.sound = Sons
 load.map = Mapas
@@ -31,18 +34,32 @@ load.system = Sistema
 load.mod = Mods
 load.scripts = Scripts
 
-be.update = Uma nova versão do Bleeding Edge está disponível:
+be.update = Uma nova versão Bleeding Edge está disponível:
 be.update.confirm = Transferir e reiniciar agora?
 be.updating = A atualizar...
-be.ignore = Ignora
+be.ignore = Ignorar
 be.noupdates = Atualizações não encontradas.
-be.check = A Verificar por atualizações
+be.check = Verificar por atualizações
+
+mods.browser = Navegador de mods
+mods.browser.selected = Mod selecionado
+mods.browser.add = Instalar
+mods.browser.reinstall = Reinstalar
+mods.browser.view-releases = Ver versões
+mods.browser.noreleases = [scarlet]Nenhuma versão encontrada\n[accent]Não foi possível encontrar nenhuma versão do mod. Verifique se o repositório do mod tem alguma versão publicada.
+mods.browser.latest = <Mais recente>
+mods.browser.releases = Versões
+mods.github.open = Repositório
+mods.github.open-release = Página da versão
+mods.browser.sortdate = Ordenar por mais recente
+mods.browser.sortstars = Ordenar por estrelas
 
 schematic = Esquema
-schematic.add = Gravar Esquema...
+schematic.add = Guardar Esquema...
 schematics = Esquemas
+schematic.search = Procurar esquemas...
 schematic.replace = Um esquema com esse nome já existe. Deseja substituí-lo?
-schematic.exists = A schematic by that name already exists.
+schematic.exists = Um esquema com esse nome já existe.
 schematic.import = Importar Esquema...
 schematic.exportfile = Exportar Ficheiro
 schematic.importfile = Importar Ficheiro
@@ -53,263 +70,359 @@ schematic.shareworkshop = Partilhar na Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Rodar Esquema
 schematic.saved = Esquema gravado.
 schematic.delete.confirm = Este esquema irá ser completamente apagado.
-schematic.rename = Renomear Esquema
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blocos
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Esquemas desativados[]\nNão tens permissão para usar esquemas nesse [accent]mapa[] ou [accent]servidor.
+schematic.tags = Etiquetas:
+schematic.edittags = Editar Etiquetas
+schematic.addtag = Adicionar Etiqueta
+schematic.texttag = Etiqueta de Texto
+schematic.icontag = Etiqueta de �cone
+schematic.renametag = Alterar o nome da etiqueta
+schematic.tagged = {0} Etiquetado/s
+schematic.tagdelconfirm = Apagar esta etiqueta completamente?
+schematic.tagexists = Essa etiqueta já existe.
+stats = Estatísticas
+stats.wave = Hordas Derrotadas
+stats.unitsCreated = Unidades Criadas
+stats.enemiesDestroyed = Inimigos destruídos
+stats.built = Construções feitas
+stats.destroyed = Construções destruídas
+stats.deconstructed = Construções Desconstruídas
+stats.playtime = Tempo de Jogo
 
-stat.wave = Hordas derrotadas:[accent] {0}
-stat.enemiesDestroyed = Inimigos Destruídos:[accent] {0}
-stat.built = Construções construídas:[accent] {0}
-stat.destroyed = Construções destruídas:[accent] {0}
-stat.deconstructed = Construções desconstruídas:[accent] {0}
-stat.delivered = Recursos lançados:
-stat.playtime = Tempo jogado:[accent] {0}
-stat.rank = Rank Final: [accent]{0}
-
-globalitems = [accent]Global Items
-map.delete = Certeza que quer deletar o mapa "[accent]{0}[]"?
+globalitems = [accent]Itens Globais
+map.delete = Tens a certeza que queres apagar o mapa "[accent]{0}[]"?
 level.highscore = Melhor\npontuação: [accent] {0}
-level.select = Seleção de Fase
+level.select = Seleção de Nível
 level.mode = Modo de Jogo:
 coreattack = < O núcleo está sobre ataque! >
-nearpoint = [[ [scarlet]SAIA DO PONTO DE SPAWN IMEDIATAMENTE[] ]\nANIQUILAÇÃO IMINENTE
-database = Banco do núcleo
-savegame = Gravar Jogo
+nearpoint = [[ [scarlet]SAIA DO PONTO DE SPAWN IMEDIATAMENTE[] ]\nAniquilação iminente
+database = Banco de Dados do núcleo
+database.button = Banco de Dados
+savegame = Salvar Jogo
 loadgame = Carregar Jogo
 joingame = Entrar no Jogo
-customgame = Jogo Customi-/nzado
+customgame = Jogo Customizado
 newgame = Novo Jogo
 none = <nenhum>
+none.found = [lightgray]<nenhum encontrado>
+none.inmap = [lightgray]<nenhum no mapa>
 minimap = Mini-Mapa
 position = Posição
 close = Fechar
 website = Site
 quit = Sair
-save.quit = Gravar e sair
+save.quit = Salvar e sair
 maps = Mapas
-maps.browse = Pesquisar mapas
+maps.browse = Pesquisar Mapas
 continue = Continuar
 maps.none = [lightgray]Nenhum Mapa Encontrado!
 invalid = Inválido
 pickcolor = Pick Color
-preparingconfig = Preparando configuração
-preparingcontent = Preparando conteúdo
-uploadingcontent = Enviando conteúdo
-uploadingpreviewfile = Enviando ficheiro de pré-visualização
-committingchanges = Enviando mudanças
+preparingconfig = A preparar a configuração
+preparingcontent = A preparar o conteúdo
+uploadingcontent = A enviar o conteúdo
+uploadingpreviewfile = A enviar o ficheiro de pré-visualização
+committingchanges = A enviar mudanças
 done = Feito
-feature.unsupported = O teu dispositivos não suporta esta característica.
+feature.unsupported = O teu dispositivo não suporta este recurso.
 
-mods.alphainfo = Lembre-se de que os mods estão em alfa, e [scarlet] pode estar cheio de falhas[].\nReporta qualquer problema que encontres no the Mindustry GitHub ou Discord.
+mods.initfailed = [red]⚠[] A instância anterior do Mindustry falhou ao inicializar. Provavelmente causado por mods com problema.\n\nPara previnir um loop de crash, [red]todos os mods foram desativados.[]
 mods = Mods
-mods.none = [lightgray]Mods não encontrados!
+mods.none = [lightgray]Nenhum mod encontrado!
 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.
+mods.viewcontent = Ver Conteúdo
+mods.reload = Recarregar
+mods.reloadexit = O jogo vai fechar, para recarregar os mods.
+mod.installed = [[Instalado]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Ativado
 mod.disabled = [scarlet]Desativado
+mod.multiplayer.compatible = [gray]Compatível com Multiplayer
 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.version = Versão:
+mod.content = Conteúdo:
+mod.delete.error = Incapaz de apagar o mod. O ficheiro pode estar em uso.
+mod.incompatiblegame = [red]Jogo Desatualizado
+mod.incompatiblemod = [red]Incompatível
+mod.blacklisted = [red]Não suportado
+mod.unmetdependencies = [red]Dependências não satisfeitas
+mod.erroredcontent = [scarlet]Erros no conteúdo
+mod.circulardependencies = [red]Dependências redundantes
+mod.incompletedependencies = [red]Dependências incompletas
+mod.requiresversion.details = Requer a versão do jogo: [accent]{0}[]\nO teu jogo está desatualizado. Este mod requer uma versão mais recente do jogo (possivelmente uma versão beta/alfa) para funcionar.
+mod.outdatedv7.details = Este mod é incompatível com a versão mais recente do jogo. O autor deve atualizá-lo e adicionar [accent]minGameVersion: 136[] ao seu arquivo [accent]mod.json[].
+mod.blacklisted.details = Este mod foi manualmente colocado na Lista Negra por causar falhas ou outros problemas com esta versão do jogo. Não o use.
+mod.missingdependencies.details = Este mod tem dependências em falta: {0}
+mod.erroredcontent.details = Este jogo causou erros ao carregar. Peça ao autor do mod para corrigi-los.
+mod.circulardependencies.details = Este mod tem dependências que dependem umas das outras.
+mod.incompletedependencies.details = Este mod não pôde ser carregado devido a dependências inválidas ou ausentes: {0}.
+mod.requiresversion = Requer a versão do jogo: [red]{0}
 mod.errors = Ocorreram erros ao carregar o conteúdo.
-mod.noerrorplay = [scarlet]Tens mods com erros.[] Desative os mods afetados ou corrija os erros antes de jogar.
-mod.nowdisabled = [scarlet]Mod '{0}' está faltando dependências:[accent] {1}\n[lightgray]Esses mods precisam ser baixados primeiro.  NEste mod será automaticamente desativado
+mod.noerrorplay = [scarlet]Tens mods com erros.[] Desativa os mods afetados ou corrije os erros antes de jogar.
+mod.nowdisabled = [scarlet]Mod '{0}' tem dependências em falta:[accent] {1}\n[lightgray]Estes mods precisam de ser baixados primeiro. Este mod será automaticamente desativado
 mod.enable = Ativar
-mod.requiresrestart = O jogo será fechado agora para aplicar as alterações no mod.
+mod.requiresrestart = O jogo irá fechar para aplicar as alterações do mod.
 mod.reloadrequired = [scarlet]É necessario recarregar
 mod.import = Importar Mod
-mod.import.file = Import File
+mod.import.file = Importar Ficheiro
 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.jarwarn = [scarlet]Mods JAR são por natureza inseguros.[]\nTem a certeza de que estás a importar este mod de uma fonte confiável!
+mod.item.remove = Este item faz parte do [accent] '{0}'[] mod. Para removê-lo, desinstala o mod.
+mod.remove.confirm = Este mod será apagado.
 mod.author = [lightgray]Autor:[] {0}
-mod.missing = Este save contém mods que foram recentemente atualizados ou que não estão mais instalados. Ao guardar pode ocorreu corrupção. Tem certeza de que deseja carregá-lo?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Antes de publicar este mod no workshop, você deve adicionar uma visualização da imagem.\nNome da imagem -> [accent] preview.png[] na pasta de mods e tenta outra vez.
-mod.folder.missing = Apenas mods na pasta podem ser publicados no Workshop.\nPara converter qualquer mod para uma pasta, simplesmentes descomprime os ficheiros para a pasta e apague o ficheiro zip antigo, e depois reinicia o jogo ou os teus mods.
-mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
+mod.missing = Este jogo salvo contém mods que foram recentemente atualizados ou que não estão mais instalados. Pode ocorrer corrupção ao guardar. Tens a certeza de que desejas carregá-lo?\n[lightgray]Mods:\n{0}
+mod.preview.missing = Antes de publicar este mod na Workshop, você deve adicionar uma visualização da imagem.\nNome da imagem -> [accent] preview.png[] na pasta de mods e tentar outra vez.
+mod.folder.missing = Apenas mods no formato de pasta podem ser publicados na Workshop.\nPara converter qualquer mod para uma pasta, simplesmente descomprime os ficheiros para a pasta e apague o ficheiro ZIP antigo, e depois reinicia o jogo ou recarrega os teus mods.
+mod.scripts.disable = O teu dispositivo não suporta mods com scripts. Deves desativar estes mods para conseguir jogar.
 
 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!
+
+search = Procurar:
+planetmap = Mapa do Planeta
+launchcore = Lançar Núcleo
+filename = Nome do Ficheiro:
+unlocked = Novo conteúdo desbloqueado!
+available = Nova pesquisa disponível!
+unlock.incampaign = < Desbloqueie na campanha para mais detalhes >
+campaign.select = Selecione a campanha inicial
+campaign.none = [lightgray]Selecione um planeta para onde começar.\nIsto pode ser mudado a qualquer momento.
+campaign.erekir = Novo, conteúdo aperfeiçoado. Progresso de campanha quase linear.\n\nMapas e experiência geral de melhor qualidade.
+campaign.serpulo = Conteúdo antigo, a experiência clássica. Mais amplo.\n\nMapas e mecânicas da campanha potencialmente desbalanceados. Menos aperfeiçoado.
+campaign.difficulty = Dificuldade
+
 completed = [accent]Completado
-techtree = �rvore de tecnologia
+techtree = �rvore da Tecnologia
+techtree.select = �rvore da Tecnologia
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Carregar
+research.discard = Descartar
 research.list = [lightgray]Pesquise:
 research = Pesquisa
 researched = [lightgray]{0} pesquisado.
-research.progress = {0}% complete
+research.progress = {0}% completo
 players = {0} Jogadores Ativos
 players.single = {0} Jogador Ativo
-players.search = search
-players.notfound = [gray]no players found
-server.closing = [accent]Fechando servidor...
-server.kicked.kick = Voce foi expulso do servidor!
-server.kicked.whitelist = Você não está na lista branca do servidor.
+players.search = Pesquisar
+players.notfound = [gray]nenhum jogador encontrado
+server.closing = [accent]A fechar servidor...
+server.kicked.kick = Foste expulso do servidor!
+server.kicked.whitelist = Não estás na lista branca do servidor.
 server.kicked.serverClose = Servidor Fechado.
-server.kicked.vote = Você foi expulso desse servidor. Adeus.
-server.kicked.clientOutdated = Cliente desatualizado! Atualize seu jogo!
+server.kicked.vote = Foste expulso desse servidor por votação. Adeus.
+server.kicked.clientOutdated = Cliente desatualizado! Atualiza o teu jogo!
 server.kicked.serverOutdated = Servidor desatualiado! Peça ao dono para atualizar!
-server.kicked.banned = Você foi banido do servidor.
-server.kicked.typeMismatch = Este servidor não é compatível com a sua versão.
-server.kicked.playerLimit = Este servidor está cheio. Espere por uma vaga.
-server.kicked.recentKick = Voce foi expulso recentemente.\nEspere para conectar de novo.
-server.kicked.nameInUse = Este nome já está sendo usado\nneste servidor.
-server.kicked.nameEmpty = Você deve ter pelo menos uma letra ou número no nome.
-server.kicked.idInUse = Você ja está neste servidor! Conectar com duas contas não é permitido.
-server.kicked.customClient = Este servidor não suporta versões customizadas. Baixe a versão original.
-server.kicked.gameover = Fim de jogo!
-server.kicked.serverRestarting = The server is restarting.
-server.versions = Sua versão:[accent] {0}[]\nVersão do servidor:[accent] {1}[]
-host.info = O [accent]Hospedar[]Botão Hospeda um servidor no Host[scarlet]6567[] e [scarlet]6568.[]\nQualquer um no [lightgray]Wi-fi Ou Internet local[] Pode ver este servidor na lista de servidores.\n\nSe voce quer poder entrar em qualquer servidor em seu ip, [accent]port forwarding[] é requerido.\n\n[lightgray]Note: Se alguem esta com problemas em conectar no seu servidor lan, Tenha certeza que deixou mindustry Acessar sua internet local nas configurações de firewall
-join.info = Aqui, você pode entar em um [accent]IP de servidor[] para conectar, ou descobrir [accent]servidores[] da rede local.\nAmbos os servidores LAN e WAN são suportados.\n\n[lightgray]Note: Não há uma lista de servidores automáticos; Se você quer conectar ao IP de alguém, você precisa pedir o IP ao anfitrião.
-hostserver = Hospedar servidor
+server.kicked.banned = Foste banido do servidor.
+server.kicked.typeMismatch = Este servidor não é compatível com o teu tipo de versão.
+server.kicked.playerLimit = Este servidor está cheio. Espera por uma vaga.
+server.kicked.recentKick = Foste expulso recentemente.\nEspera para conectar de novo.
+server.kicked.nameInUse = Este nome já está a ser usado\nneste servidor.
+server.kicked.nameEmpty = O nome escolhido é inválido.
+server.kicked.idInUse = Já estás conectado neste servidor! Conectar com duas contas não é permitido.
+server.kicked.customClient = Este servidor não suporta versões customizadas. Transfere uma versão original.
+server.kicked.gameover = Fim do jogo!
+server.kicked.serverRestarting = O seridor está a reiniciar.
+server.versions = A tua versão:[accent] {0}[]\nVersão do servidor:[accent] {1}[]
+host.info = O botão de [accent]Hospedar[] hospeda um servidor na porta [scarlet]6567[] e [scarlet]6568.[]\nQualquer jogador na mesma [lightgray]Wi-Fi ou rede local[] pode ver este servidor na lista de servidores.\n\nSe você quiser que os jogadores entrem de qualquer sítio através do seu IP, [accent]port forwarding[] é necessário.\n\n[lightgray]Nota: Se alguém está com problemas a conectar ao seu servidor LAN, tenha a certeza que o Mindustry tem acesso à sua internet local nas configurações do seu firewall. Nota que nem todas as redes públicas permitem a deteção do servidor na rede.
+join.info = Aqui podes inserir um [accent]IP de servidor[] para conectar, ou descobrir [accent]servidores[] da rede local or [accent]servidores[] no mundo.\nAmbos os servidores LAN e WAN são suportados.\n\n[lightgray]Se quiseres conectar ao servidor de alguém por IP, precisas de pedir ao anfitrião o IP, que pode ser descoberto ao pesquisar "meu IP" na Internet.
+hostserver = Host Multiplayer Game
 invitefriends = Convidar amigos
 hostserver.mobile = Hospedar\nJogo
 host = Hospedar
-hosting = [accent]Abrindo servidor...
+hosting = [accent]A abrir servidor...
 hosts.refresh = Atualizar
-hosts.discovering = Descobrindo jogos em lan
-hosts.discovering.any = Descobrindo jogos
+hosts.discovering = A descobrir jogos em LAN
+hosts.discovering.any = A descobrir jogos
 server.refreshing = A atualizar servidor
-hosts.none = [lightgray]Nenhum jogo lan encontrado!
-host.invalid = [scarlet]Não foi possivel Hospedar.
+hosts.none = [lightgray]Nenhum jogo local encontrado!
+host.invalid = [scarlet]Não foi possivel conectar.
 
 servers.local = Servidores Locais
+servers.local.steam = Jogos públicos e Servidores locais
 servers.remote = Servidores Remotos
-servers.global = Servidores Globais
+servers.global = Servidores da Comunidade
 
-trace = Traçar jogador
+servers.disclaimer = Servidores da comunidade [accent]não[] são controlados pelo desenvolvedor.\n\nOs servidores podem conter conteúdo não apropriado para todas as idades.
+servers.showhidden = Mostrar servidores escondidos
+server.shown = Mostrar
+server.hidden = Esconder
+
+viewplayer = A assistir Jogador: [accent]{0}
+trace = Rastrear jogador
 trace.playername = Nome do jogador: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = ID unico: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Idioma: [accent]{0}
 trace.mobile = Cliente móvel: [accent]{0}
-trace.modclient = Cliente Customizado: [accent]{0}
-invalidid = ID do cliente invalido! Reporte o bug.
-server.bans = Banidos
+trace.modclient = Cliente customizado: [accent]{0}
+trace.times.joined = Vezes que entrou: [accent]{0}
+trace.times.kicked = Vezes que foi expulso: [accent]{0}
+trace.ips = IPs:
+trace.names = Nomes:
+invalidid = ID do cliente inválido! Reporte o bug.
+
+player.ban = Banir
+player.kick = Expulsar
+player.trace = Rastrear
+player.admin = Alterar Admin
+player.team = Trocar de Equipa
+server.bans = Banimentos
 server.bans.none = Nenhum jogador banido encontrado!
 server.admins = Administradores
 server.admins.none = Nenhum administrador encontrado!
 server.add = Adicionar servidor
-server.delete = Certeza que quer deletar o servidor?
+server.delete = Tens a certeza que queres apagar o servidor?
 server.edit = Editar servidor
 server.outdated = [crimson]Servidor desatualizado![]
 server.outdated.client = [crimson]Cliente desatualizado![]
 server.version = [lightgray]Versão: {0}
 server.custombuild = [accent]Versão customizada
-confirmban = Certeza que quer banir este jogador?
-confirmkick = Certeza que quer expulsar o jogador?
-confirmvotekick = Você tem certeza de que quer votar para expulsar este jogador?
-confirmunban = Certeza que quer desbanir este jogador?
-confirmadmin = Certeza que quer fazer este jogador um administrador?
+confirmban = Tens a certeza de que queres banir "{0}[white]"?
+confirmkick = Tens a certeza de que queres expulsar "{0}[white]"?
+confirmunban = Tens a certeza de que queres desbanir este jogador?
+confirmadmin = Tens a certeza de que queres fazer este jogador um administrador?
 confirmunadmin = Certeza que quer remover o estatus de adminstrador deste jogador?
+votekick.reason = Razão de expulsão por votação
+votekick.reason.message = Tens a certeza que queres expular "{0}[white]" por votação?\nSe sim, escreva o motivo:
 joingame.title = Entrar no jogo
-joingame.ip = IP:
+joingame.ip = Endereço IP:
 disconnect = Desconectado.
 disconnect.error = Erro de conexão.
 disconnect.closed = Conexão fechada.
 disconnect.timeout = Tempo esgotado.
 disconnect.data = Falha ao abrir os dados do mundo!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossível conectar ([accent]{0}[]).
-connecting = [accent]Conectando...
-connecting.data = [accent]Carregando dados do mundo...
-server.port = Porte:
-server.addressinuse = Endereço em uso!
-server.invalidport = Numero de porta invalido!
+connecting = [accent]A conectar...
+reconnecting = [accent]A reconectar...
+connecting.data = [accent]A carregar o dados do mundo...
+server.port = Porta:
+server.invalidport = Número de porta inválido!
+server.error.addressinuse = [scarlet]Falhou ao iniciar o servidor na porta 6567.[]\n\nCertifica-te que não existem outros servidores do Mindustry em funcionamento no teu dispositivo ou rede local!
 server.error = [crimson]Erro ao hospedar o servidor: [accent]{0}
-save.new = Novo gravamento
-save.overwrite = Você tem certeza que quer sobrescrever este gravamento?
-overwrite = Gravar sobre
-save.none = Nenhum gravamento encontrado!
-savefail = Falha ao gravar jogo!
-save.delete.confirm = Certeza que quer deletar este gravamento?
-save.delete = Deletar
+save.new = Novo save
+save.overwrite = Tens a certeza que queres sobrescrever\neste save?
+save.nocampaign = Arquivos salvos individuais da campanha não podem ser importados.
+overwrite = Sobrescrever
+save.none = Nenhum save encontrado!
+savefail = Falha ao salvar jogo!
+save.delete.confirm = Tens a certeza que queres apagar este save?
+save.delete = Apagar
 save.export = Exportar save
-save.import.invalid = [accent]Este gravamento é inválido!
-save.import.fail = [crimson]Falha ao importar gravamento: [accent]{0}
-save.export.fail = [crimson]Falha ao exportar gravamento: [accent]{0}
-save.import = Importar gravamento
-save.newslot = Nome do gravamento:
+save.import.invalid = [accent]Este save é inválido!
+save.import.fail = [crimson]Falha ao importar o save: [accent]{0}
+save.export.fail = [crimson]Falha ao exportar o save: [accent]{0}
+save.import = Importar save
+save.newslot = Nome do save:
 save.rename = Renomear
 save.rename.text = Novo jogo:
-selectslot = Selecione um lugar para gravar.
+selectslot = Selecione um lugar para salvar.
 slot = [accent]Slot {0}
 editmessage = Edit Message
 save.corrupted = [accent]Ficheiro corrompido ou inválido!
 empty = <vazio>
 on = Ligado
 off = Desligado
-save.autosave = Autogravar: {0}
+save.search = Procurar jogos salvos...
+save.autosave = Gravar automaticamente: {0}
 save.map = Mapa: {0}
 save.wave = Horda {0}
-save.mode = Gamemode: {0}
-save.date = Último gravamento: {0}
-save.playtime = Tempo De Jogo: {0}
+save.mode = Modo de jogo: {0}
+save.date = Último save: {0}
+save.playtime = Tempo de Jogo: {0}
 warning = Aviso.
 confirm = Confirmar
-delete = Excluir
-view.workshop = Ver na oficina
-workshop.listing = Edit Workshop Listing
+delete = Apagar
+view.workshop = Ver na Workshop
+workshop.listing = Editar a lista da Workshop
 ok = OK
 open = Abrir
 customize = Customizar
 cancel = Cancelar
+command = Comando
+command.queue = [lightgray][Queuing]
+
+command.mine = Minerar
+command.repair = reparar
+command.rebuild = Reconstruir
+command.assist = Assistir jogador
+command.move = Mover
+command.boost = Impulsionar
+command.enterPayload = Inserir bloco de carga
+command.loadUnits = Carrgar Unidades
+command.loadBlocks = Carregar Blocos
+command.unloadPayload = Descarregar Carga
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancelar Pedidos
+stance.shoot = Stance: Atirar
+stance.holdfire = Stance: Não disparar
+stance.pursuetarget = Stance: Perseguir alvo
+stance.patrol = Stance: Caminho de Patrulha
+stance.ram = Stance: Ram\n[lightgray]Movimento em linha reta, sem trajetória
+
 openlink = Abrir Ligação
 copylink = Copiar ligação
 back = Voltar
+max = Máximo
+objective = Objetivo do Mapa
+crash.export = Exportar registos de erros
+crash.none = Não foram encontrados registos de erros.
+crash.exported = Registos de erros exportados.
 data.export = Exportar dados
 data.import = Importar dados
 data.openfolder = Abrir pasta de dados
 data.exported = Dados exportados.
 data.invalid = Estes dados de jogo não são válidos.
-data.import.confirm = Importar dados externos irá deletar[scarlet] todos[] os seus dados atuais.\n[accent]Isso não pode ser desfeito![]\n\nQuando sua data é importada, seu jogo ira sair imediatamente.
-quit.confirm = Você tem certeza que quer sair?
-quit.confirm.tutorial = Você tem certeza você sabe o que você esta fazendo?\nO tutorial pode ser refeito nas [accent] Configurações->Jogo->Refazer Tutorial.[]
-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
-resumebuilding = [scarlet][[{0}][] para resumir construção
+data.import.confirm = Importar dados externos irá sobescrever[scarlet] todos[] os seus dados atuais.\n[accent]Não pode ser revertido![]\n\nQuando os dados forem importados, seu jogo irá fechar imediatamente.
+quit.confirm = Tens a certeza que queres sair?
+loading = [accent]A carregar...
+downloading = [accent]A transferir...
+saving = [accent]A gravar...
+respawn = [accent][[{0}][] para renascer
+cancelbuilding = [accent][[{0}][] para cancelar a construção
+selectschematic = [accent][[{0}][] para selecionar+copiar
+pausebuilding = [accent][[{0}][] para pausar a construção
+resumebuilding = [scarlet][[{0}][] para retomar a construção
+enablebuilding = [scarlet][[{0}][] para ativar a construção
+showui = Interface ocultada.\nPressiona [accent][[{0}][] para mostrá-la.
+commandmode.name = [accent]Modo de comando
+commandmode.nounits = [sem unidades]
 wave = [accent]Horda {0}
-wave.cap = [accent]Wave {0}/{1}
+wave.cap = [accent]Horda {0}/{1}
 wave.waiting = Horda em {0}
-wave.waveInProgress = [lightgray]Horda Em Progresso
-waiting = Aguardando...
-waiting.players = Esperando por jogadores...
+wave.waveInProgress = [lightgray]Horda em progresso
+waiting = A aguardar...
+waiting.players = À espera de jogadores...
 wave.enemies = [lightgray]{0} inimigos restantes
-wave.enemy = [lightgray]{0} inimigo restante
-wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
-wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
+wave.enemycores = [accent]{0}[lightgray] Núcleos inimigos
+wave.enemycore = [accent]{0}[lightgray] Núcleo inimigo
+wave.enemy = [lightgray]{0} Inimigo restante
+wave.guardianwarn = Guardião aproximando-se em [accent]{0}[] hordas.
+wave.guardianwarn.one = Guardião aproximando-se em [accent]{0}[] horda.
 loadimage = Carregar\nimagem
-saveimage = Gravarr\nimagem
+saveimage = Salvar\nimagem
 unknown = Desconhecido
 custom = Customizado
 builtin = Embutido
-map.delete.confirm = Certeza que quer deletar este mapa? Isto não pode ser desfeito!
+map.delete.confirm = Tens a certeza que queres apagar este mapa? Esta ação não pode ser desfeita!
 map.random = [accent]Mapa aleatório
-map.nospawn = Este mapa não possui nenhum núcleo para o jogador nascer! Adicione um núcleo[accent] amarelo[] para este mapa no editor.
-map.nospawn.pvp = Esse mapa não tem núcleos inimigos para os jogadores nascerem! Adicione[scarlet] Núcleos vermelhos[] no mapa no editor.
-map.nospawn.attack = Esse mapa não tem nenhum núcleo inimigo para o jogador atacar! coloque[scarlet] Núcleos[] vermelhos no editor.
-map.invalid = Erro ao carregar o mapa: Ficheiro de mapa invalido ou corrupto.
+map.nospawn = Este mapa não possui nenhum núcleo para o jogador nascer! Adicione um {0} núcleo ao mapa no editor.
+map.nospawn.pvp = Esse mapa não tem núcleos inimigos para os jogadores nascerem! Adicione núcleos [scarlet]vermelhos[] ao mapa no editor.
+map.nospawn.attack = Esse mapa não tem nenhum núcleo inimigo para o jogador atacar! Adicione {0} núcleos ao mapa no editor.
+map.invalid = Erro ao carregar o mapa: Ficheiro de mapa inválido ou corrompido.
 workshop.update = Atualizar Item
-workshop.error = Error fetching workshop details: {0}
-map.publish.confirm = Você tem certeza de que quer publicar este mapa?\n\n[lightgray]Tenha certeza de que você concorda com o EULA da oficina primeiro, ou seus mapas não serão mostrados!
-workshop.menu = Seleciona o que tu gostarias de fazer com este item.
+workshop.error = Erro ao buscar os detalhes da Workshop: {0}
+map.publish.confirm = Tens a certeza que queres publicar este mapa?\n\n[lightgray]Certifica-te que concordas com o EULA da Workshop, ou os teus mapas não serão mostrados!
+workshop.menu = Seleciona o que gostarias de fazer com este item.
 workshop.info = Item Info
 changelog = Changelog (optional):
+updatedesc = Overwrite Title & Description
 eula = EULA do Steam
 missing = Este item foi apagodo ou movido.\n[lightgray]A listagem da oficina foi automaticamente desassociada.
 publishing = [accent]A publicar...
@@ -317,6 +430,11 @@ publish.confirm = Tens a certeza que queres publicar isto?\n\n[lightgray]Certifi
 publish.error = Erro ao publicao os items: {0}
 steam.error = Falha ao iniciar os serviços da Steam.\nError: {0}
 
+editor.planet = Planeta:
+editor.sector = Setor:
+editor.seed = Semente:
+editor.cliffs = Paredes para Penhascos
+
 editor.brush = Pincel
 editor.openin = Abrir no Editor
 editor.oregen = Geração de minério
@@ -328,76 +446,119 @@ editor.nodescription = Um mapa deve ter uma descrição de no mínimo 4 caracter
 editor.waves = Hordas:
 editor.rules = Regras:
 editor.generation = Geração:
+editor.objectives = Objectivos
+editor.locales = Pacotes Locais
+editor.worldprocessors = Processadores Globais
+editor.worldprocessors.editname = Mudar Nome
+editor.worldprocessors.none = [lightgray]Nenhum bloco de processadr global encontrado!\nAdiciona um no Editor, ou usa o botão \ue813 Adicionar abaixo.
+editor.worldprocessors.nospace = Sem espaço disponível para colocar um processador global!\nPreencheste o mapa com estruturas? Porque farias isso?
+editor.worldprocessors.delete.confirm = Tens a certeza que queres apagar este processador global?\n\nSe esiver rodeado de paredes, vai ser substituído por uma parede natural.
 editor.ingame = Editar em jogo
-editor.publish.workshop = Publicar na oficina
+editor.playtest = Testar
+editor.publish.workshop = Publicar na Workshop
 editor.newmap = Novo mapa
-editor.center = Center
-workshop = Oficina
+editor.center = Centrar
+editor.search = Procurar mapas...
+editor.filters = Filtrar Mapas
+editor.filters.mode = Modos de jogo:
+editor.filters.type = Tipo de Mapa:
+editor.filters.search = Procurar em:
+editor.filters.author = Autor
+editor.filters.description = Descrição
+editor.shiftx = Mover no eixo X
+editor.shifty = Mover no eixo Y
+workshop = Workshop
 waves.title = Hordas
 waves.remove = Remover
-waves.never = <nunca>
 waves.every = a cada
-waves.waves = Hordas(s)
+waves.waves = hordas(s)
+waves.health = vida: {0}%
 waves.perspawn = por spawn
-waves.shields = shields/wave
+waves.shields = escudos/horda
 waves.to = para
-waves.guardian = Guardian
-waves.preview = Pré visualizar
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Seletor de spawn
+waves.spawn.none = [scarlet]nenhum spawn encontrado no mapa
+waves.max = quantidade máxima de unidades
+waves.guardian = Guardião
+waves.preview = Pré-visualizar
 waves.edit = Editar...
+waves.random = Aleatório
 waves.copy = Copiar para área de transferência
 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.
+waves.none = Sem hordas definidas.\nNote que esquemas de hordas vazios serão automaticamente substituídos pelo esquema padrão.
+waves.sort = Ordenar por
+waves.sort.reverse = Inverter ordem
+waves.sort.begin = Coneçar
+waves.sort.health = Vida
+waves.sort.type = Tipo
+waves.search = Procurar hordas...
+waves.filter = Filtro de Unidades
+waves.units.hide = Ocultar Tudo
+waves.units.show = Mostrar Tudo
 
-wavemode.counts = counts
-wavemode.totals = totals
-wavemode.health = health
+#these are intentionally in lower case
+wavemode.counts = quantidade
+wavemode.totals = total
+wavemode.health = vida
 
-editor.default = [lightgray]<padrão>
+all = Tudo
+editor.default = [lightgray]<Padrão>
 details = Detalhes...
 edit = Editar...
+variables = Variáveis
+logic.clear.confirm = Tens a certeza que querea apagar todo o código deste procesador?
+logic.globals = Variáveis Embutidas
 editor.name = Nome:
-editor.spawn = Criar unidade
-editor.removeunit = Remover unidade
-editor.teams = Times
+editor.spawn = Criar Unidade
+editor.removeunit = Remover Unidade
+editor.teams = Equipas
 editor.errorload = Erro ao carregar o ficheiro:\n[accent]{0}
-editor.errorsave = Erro ao gravar o ficheiro:\n[accent]{0}
-editor.errorimage = Isso é uma imagem, não um mapa. Não vá por aí mudando extensões esperando que funcione.\n\nSe você quer importar um mapa legacy, Use o botão 'Importar mapa legacy'no editor.
-editor.errorlegacy = Esse mapa é velho demais, E usa um formato de mapa legacy que não é mais suportado.
-editor.errornot = Este não é um ficheiro de mapa.
-editor.errorheader = Este ficheiro de mapa não é mais válido ou está corrompido.
-editor.errorname = O mapa não tem nome definido.
+editor.errorsave = Erro ao salvar o ficheiro:\n[accent]{0}
+editor.errorimage = Isto é uma imagem, não um mapa. 
+editor.errorlegacy = Este mapa é antigo demais, e usa um formato antigo que não é mais suportado.
+editor.errornot = Isto não é um ficheiro de mapa.
+editor.errorheader = Este ficheiro de mapa não está mais válido ou está corrompido.
+editor.errorname = O mapa não tem nome definido. Estás a tentar carregar um ficheiro de save?
+editor.errorlocales = Erro ao ler pacotes locais inválidos.
 editor.update = Atualizar
 editor.randomize = Aleatorizar
+editor.moveup = Mover para Cima
+editor.movedown = Mover para Baixo
+editor.copy = Copiar
 editor.apply = Aplicar
 editor.generate = Gerar
+editor.sectorgenerate = Geração de Setor
 editor.resize = Redimen-\nsionar
 editor.loadmap = Carregar\nmapa
 editor.savemap = Gravar\nmapa
+editor.savechanges = [scarlet]Tens modificações não gravadas!\n\n[]Queres gravá-las?
 editor.saved = Gravado!
-editor.save.noname = Seu mapa não tem um nome! Coloque um no menu de "Informação do mapa"
-editor.save.overwrite = O seu mapa substitui um mapa já construído! Coloque um nome diferente no menu "Informação do mapa"
-editor.import.exists = [scarlet]Não foi possivel importar:[] Um mapa construído chamado '{0}' Já existe!
+editor.save.noname = O teu mapa não tem um nome! Coloca um no menu de "Informação do mapa"
+editor.save.overwrite = O teu mapa substitui um mapa incorporado no jogo! Coloca um nome diferente no menu "Informação do mapa"
+editor.import.exists = [scarlet]Não foi possivel importar:[] Um mapa incorporado chamado '{0}' já existe!
 editor.import = Importar...
 editor.importmap = Importar Mapa
-editor.importmap.description = Importar um mapa existente
+editor.importmap.description = Importar um mapa já existente
 editor.importfile = Importar ficheiro
 editor.importfile.description = Importar um ficheiro externo
-editor.importimage = Importar imagem do terreno
-editor.importimage.description = Importar uma imagem de terreno externa
+editor.importimage = Importar Imagem de terreno
+editor.importimage.description = Importar um ficheiro de imagem externo
 editor.export = Exportar...
-editor.exportfile = Exportar ficheiro
+editor.exportfile = Exportar Ficheiro
 editor.exportfile.description = Exportar um ficheiro de mapa
-editor.exportimage = Exportar imagem de terreno
-editor.exportimage.description = Exportar um ficheiro de imagem de mapa
-editor.loadimage = Carregar\nImagem
-editor.saveimage = Gravar\nImagem
-editor.unsaved = [scarlet]Você tem alterações não gradavas![]\nTem certeza que quer sair?
+editor.exportimage = Exportar Imagem de terreno
+editor.exportimage.description = Exportar uma imagem com topografia básica apenas
+editor.loadimage = Importar Terreno
+editor.saveimage = Exportar Terreno
+editor.unsaved = [scarlet]Tens alterações não gravadas![]\nTens a certeza que queres sair?
 editor.resizemap = Redimensionar Mapa
 editor.mapname = Nome do Mapa:
-editor.overwrite = [accent]Aviso!\nIsso Substitui um mapa existente.
-editor.overwrite.confirm = [scarlet]Aviso![] Um mapa com esse nome já existe. Tem certeza que deseja substituir?
+editor.overwrite = [accent]Aviso!\nIsto sobesvreve um mapa já existente.
+editor.overwrite.confirm = [scarlet]Aviso![] Um mapa com este nome já existe. Tens a certeza que desejas substituí-lo?
 editor.exists = Já existe um mapa com este nome.
 editor.selectmap = Selecione uma mapa para carregar:
 
@@ -407,21 +568,28 @@ toolmode.replaceall = Substituir tudo
 toolmode.replaceall.description = Substituir todos os blocos no mapa
 toolmode.orthogonal = Linha reta
 toolmode.orthogonal.description = Desenha apenas linhas retas.
-toolmode.square = Square
+toolmode.square = Quadrado
 toolmode.square.description = Pincel quadrado.
-toolmode.eraseores = Apagar minérios
+toolmode.eraseores = Apagar Minérios
 toolmode.eraseores.description = Apaga apenas minérios.
-toolmode.fillteams = Encher times
-toolmode.fillteams.description = Muda o time do qual todos os blocos pertencem.
-toolmode.drawteams = Desenhar times
-toolmode.drawteams.description = Muda o time do qual o bloco pertence.
+toolmode.fillteams = Preencher Equipas
+toolmode.fillteams.description = Muda a equipa da qual todos os blocos pertencem.
+toolmode.fillerase = Preencher Apagar
+toolmode.fillerase.description = Apaga blocos do mesmo tipo.
+toolmode.drawteams = Desenhar Euipas
+toolmode.drawteams.description = Muda a equipa da qual o bloco pertence.
 
-filters.empty = [lightgray]Sem filtro! Adicione um usando o botão abaixo.
-filter.distort = Distorcedor
+#unused
+toolmode.underliquid = Debaixo de Líquidos
+toolmode.underliquid.description = Desenha o fundo de poças de líquidos.
+
+filters.empty = [lightgray]Sem filtros! Adicione um com o botão abaixo.
+
+filter.distort = Distorcer
 filter.noise = Geração aleatória
-filter.enemyspawn = Enemy Spawn Select
-filter.spawnpath = Path To Spawn
-filter.corespawn = Core Select
+filter.enemyspawn = Selecionar Spawn inimigo
+filter.spawnpath = Caminho para o Spawn
+filter.corespawn = Selecionar Núcleo
 filter.median = Mediano
 filter.oremedian = Minério Mediano
 filter.blend = Misturar
@@ -429,10 +597,11 @@ filter.defaultores = Minérios padrão
 filter.ore = Minério
 filter.rivernoise = Geração aleatória de rios
 filter.mirror = Espelhar
-filter.clear = Excluir
+filter.clear = Apagar
 filter.option.ignore = Ignorar
 filter.scatter = Dispersão
 filter.terrain = Terreno
+filter.logic = Lógica
 filter.option.scale = Escala
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -441,93 +610,218 @@ filter.option.circle-scale = Escala de círculo
 filter.option.octaves = Oitavas
 filter.option.falloff = Caída
 filter.option.angle = Ângulo
-filter.option.amount = Amount
+filter.option.tilt = Inclinação
+filter.option.rotate = Rodar
+filter.option.amount = Quantidade
 filter.option.block = Bloco
 filter.option.floor = Chão
 filter.option.flooronto = Chão alvo
-filter.option.target = Target
+filter.option.target = Alvo
+filter.option.replacement = Substituto
 filter.option.wall = Parede
 filter.option.ore = Minério
 filter.option.floor2 = Chão secundário
 filter.option.threshold2 = Margem secundária
 filter.option.radius = Raio
 filter.option.percentile = Percentual
+filter.option.code = Código
+filter.option.loop = Loop
+locales.info = Aqui podes adicionar pacotes locais para idiomas específicos no teu mapa. Nos pacotes locais, cada propriedade tem um nome e um valor. Estas propriedades podem ser usadas por processadroes globais ou objetivos que usem os seus nomes. Suportam formatação de texto (substituir espaços por valores atuais).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Tens a certeza que queres apagar este pacote local?
+locales.applytoall = Aplicar Modificações a Todos os Locais
+locales.addtoother = Adicionar a Outros Locais
+locales.rollback = Reverter para último aplicado
+locales.filter = Filtro de propriedade
+locales.searchname = Procurar nome...
+locales.searchvalue = Provurar valor...
+locales.searchlocale = Procurar local...
+locales.byname = Por nome
+locales.byvalue = Por valor
+locales.showcorrect = Mostrar propriedades que estão presentes em todos os locais e têm valores únicos em todo o lado
+locales.showmissing = Mostrar propriedades que estão em falta em alguns locais
+locales.showsame = Mostrar propriedades que têm valores iguais em locais diferentes
+locales.viewproperty = Ver em todos os locais
+locales.viewing = A ver propriedade "{0}"
+locales.addicon = Adicionar �cone
 
 width = Largura:
 height = Altura:
 menu = Menu
 play = Jogar
-campaign = Campa-/nnha
+campaign = Campanha
 load = Carregar
 save = Gravar
 fps = FPS: {0}
 ping = Ping: {0}ms
-language.restart = Por favor, reinicie seu jogo para a tradução tomar efeito.
-settings = Configu-/nrações
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
+language.restart = Por favor, reinicia o teu jogo para aplicar a atradução.
+settings = Configurações
 tutorial = Tutorial
 tutorial.retake = Refazer Tutorial
 editor = Editor
 mapeditor = Editor de mapa
 
 abandon = Abandonar
-abandon.text = Esta zona e todos os seus recursos serão perdidos para o inimigo.
-locked = Trancado
+abandon.text = Este setor e todos os seus recursos serão perdidos para o inimigo.
+locked = Bloqueado
 complete = [lightgray]Completo:
-requirement.wave = Ronda alcançada {0} / {1}
+requirement.wave = Horda alcançada {0} / {1}
 requirement.core = Destruir Núcleo Inimigo em {0}
-requirement.research = Research {0}
+requirement.research = Investigue {0}
+requirement.produce = Produza {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Melhor: {0}
-launch.text = Launch
-research.multiplayer = Only the host can research items.
+requirement.onplanet = Controlar setor em {0}
+requirement.onsector = Aterrar no setor: {0}
+launch.text = Lançar
+#research.multiplayer = Apenas o anfitrião pode pesquisar itens
+map.multiplayer = Apenas o anfitrião pode ver os setores
+
 uncover = Descobrir
-configure = Configurar carregamento
-loadout = Loadout
-resources = Resources 
+configure = Configurar Carregamento
+
+objective.research.name = Pesquisa
+objective.produce.name = Obter
+objective.item.name = Obter o Item
+objective.coreitem.name = Item do Núcleo
+objective.buildcount.name = Quantidade de Construções
+objective.unitcount.name = Quantidade de Unidades
+objective.destroyunits.name = Destruir Unidades
+objective.timer.name = Temporizador
+objective.destroyblock.name = Destruir Bloco
+objective.destroyblocks.name = Destruir Blocos
+objective.destroycore.name = Destruir o Núcleo
+objective.commandmode.name = Modo de Comando
+objective.flag.name = Etiqueta
+
+marker.shapetext.name = Forma do Texto
+marker.point.name = Ponto
+marker.shape.name = Forma
+marker.text.name = Texto
+marker.line.name = Linha
+marker.quad.name = Quandrado
+marker.texture.name = Textura
+marker.background = Fundo
+marker.outline = Rebordo
+
+objective.research = [accent]Pesquisa:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtém:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destrói:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destrói: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtém: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move para o Núcleo:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Constrói: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Constrói a Unidade: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destrói: [][lightgray]{0}[]x Unidades
+objective.enemiesapproaching = [accent]Inimigos aproximando em [lightgray]{0}[]
+objective.enemyescelating = [accent]Produção inimiga a aumentar em [lightgray]{0}[]
+objective.enemyairunits = [accent]Produção de unidades aéreas inimigas a partir de [lightgray]{0}[]
+objective.destroycore = [accent]Destrói o Núcleo Inimigo
+objective.command = [accent]Comandar Unidades
+objective.nuclearlaunch = [accent]⚠ Lançamento Nuclear detetado: [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ ATAQUE NUCLEAR APROXIMANDO-SE ⚠\n[lightgray]constrói núcleos de reserva imediatamente
+
+loadout = Carregamento
+resources = Recursos
+resources.max = Máximo
 bannedblocks = Blocos banidos
-addall = Adiciona tudo
-launch.destination = Destination: {0}
+unbannedblocks = Unbanned Blocks
+objectives = Objectivos
+bannedunits = Unidades banidas
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Unidades banidas como Lista branca
+bannedblocks.whitelist = Blocos banidos como Lista branca
+addall = Adicionar tudo
+launch.from = A lançar de: [accent]{0}
+launch.capacity = Capacidade de Itens de Lançamento: [accent]{0}
+launch.destination = Destino: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = Recursos detectados:
-zone.objective = [lightgray]Objetivo: [accent]{0}
-zone.objective.survival = Sobreviver
-zone.objective.attack = Destruir o núcleo inimigo
 add = Adicionar...
-boss.health = Saúde do chefe
+guardian = Guardião
 
 connectfail = [crimson]Falha ao entrar no servidor: [accent]{0}
-error.unreachable = Servidor inalcançável.
+error.unreachable = Servidor inalcançável.\nO endereço está certo?
 error.invalidaddress = Endereço inválido.
-error.timedout = Desconectado!\nTenha certeza que o anfitrião tenha feito redirecionamento de portas e que o endereço esteja correto!
-error.mismatch = Erro de pacote:\nPossivel incompatibilidade com a versão do cliente/servidor.\nTenha certeza que você e o anfitrião tenham a última versão!
+error.timedout = Desconectado!\nTem a certeza que o anfitrião configurou o port forwarding e que o endereço está correto!
+error.mismatch = Erro de pacote:\nPossível incompatibilidade com a versão do cliente/servidor.\nTem a certeza que tu e o anfitrião têm a última versão!
 error.alreadyconnected = Já conectado.
 error.mapnotfound = Ficheiro de mapa não encontrado!
 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.
+error.bloom = Falha ao inicializar bloom.\nTalvez o seu dispositivo não o suporte.
+error.moddex = O Mindustry não consegue carregar este mod.\nO seu dispositivo está a bloquear a importação de mods Java devido a implementações do Android.\nAinda não foi encontrada uma solução.
 
-weather.rain.name = Rain
-weather.snow.name = Snow
-weather.sandstorm.name = Sandstorm
-weather.sporestorm.name = Sporestorm
-weather.fog.name = Fog
+weather.rain.name = Chuva
+weather.snowing.name = Neve
+weather.sandstorm.name = Tempestade de Areia
+weather.sporestorm.name = Tempestade de Esporos
+weather.fog.name = Nevoeiro
 
-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)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+campaign.playtime = \uf129 [lightgray]Tempo de Jogo do setor: {0}
+campaign.complete = [accent]Parabéns.\n\nO Inimigo em {0} foi derrotado.\n[lightgray]O setor final foi conquistado.
+
+sectorlist = Setores
+sectorlist.attacked = {0} sob ataque
+
+sectors.unexplored = [lightgray]Não explorado
+sectors.resources = Recursos:
+sectors.production = Produção:
+sectors.export = Exportar:
+sectors.import = Importar:
+sectors.time = Tempo:
+sectors.threat = Ameaça:
+sectors.wave = Horda:
+sectors.stored = Armazenado:
+sectors.resume = Continuar
+sectors.launch = Lançar
+sectors.select = Selecionar
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]nenhum (sun)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Renomear Setor
+sectors.enemybase = [scarlet]Base Inimiga
+sectors.vulnerable = [scarlet]Vulnerável
+sectors.underattack = [scarlet]Sob ataque! [accent]{0}% danificado
+sectors.underattack.nodamage = [scarlet]Não Capturado
+sectors.survives = [accent]Sobrevive {0} hordas
+sectors.go = ir
+sector.abandon = Abandonar
+sector.abandon.confirm = O(s) núcleo(s) deste setor irão autodestruir-se.\nContinuar?
+sector.curcapture = Setor Capturado
+sector.curlost = Sector Perdido
+sector.missingresources = [scarlet]Recursos Insuficientes no Núcleo
+sector.attacked = Setor [accent]{0}[white] sob ataque!
+sector.lost = Setor [accent]{0}[white] perdido!
+sector.capture = Setor [accent]{0}[white]Capturado!
+sector.capture.current = Setor Capturado!
+sector.changeicon = Mudar ícone
+sector.noswitch.title = Não foi possivel mudar de Setores
+sector.noswitch = Não deves trocar de setores quando existe um sobre ataque.\n\nSetor: [accent]{0}[] em [accent]{1}[]
+sector.view = Ver Setor
+
+threat.low = Baixo
+threat.medium = Médio
+threat.high = Alto
+threat.extreme = Extremo
+threat.eradication = Erradicação
+
+difficulty.casual = Casual
+difficulty.easy = Fácil
+difficulty.normal = Normal
+difficulty.hard = Difícil
+difficulty.eradication = Erradicação
+
+planets = Planetas
 
 planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+planet.erekir.name = Erekir
+planet.sun.name = Sol
 
+sector.impact0078.name = Impact 0078
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
 sector.frozenForest.name = Frozen Forest
@@ -539,366 +833,649 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-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.
+sector.groundZero.description = Um bom lugar para recomeçar. Baixa ameaça inimiga. Poucos recursos.\nConsegue o máximo possível de chumbo e cobre.\nContinua.
+sector.frozenForest.description = Mesmo aqui, perto das montanhas, os esporos espalharam-se. As temperaturas baixas não os podem conter para sempre.\n\nComeça a aventura com energia. Constrói geradores a combustão. Aprende a usar reparadores.
+sector.saltFlats.description = Nos arredores do deserto ficam as planícies de sal. Poucos recursos podem ser encontrados neste local.\n\nO inimigo construiu um complexo de armazenamento de recursos aqui. Destrói o núcleo deles. Não deixes nada de sobra.
+sector.craters.description = A água se acumulou nesta cratera, relíquia das guerras antigas. Reconquista a área. Recolhe areia. Faz metavidro. Usa a água para arrefecer brocas e torres.
+sector.ruinousShores.description = Para além dos resíduos, está a linha costeira. Antigamente, este local abrigava uma rede de defesa costeira. Não restou muita coisa. Apenas as estruturas de defesas básicas permaneceram ilesas, o resto foi reduzido a sucata.\nContinua a expandir os teus territórios, redescobre a tecnologia.
+sector.stainedMountains.description = Mais para o interior estão as montanhas, ainda não contaminadas pelos esporos.\nExtrai o titânio que é abundante nesta área. Aprende a usá-lo.\n\nA presença inimiga é maior aqui. Não lhes dês tempo de trazerem unidades mais fortes.
+sector.overgrowth.description = Esta área coberta por vegetação, próxima ao local de origem dos esporos.\nO inimigo estabeleceu um posto de controlo aqui. Produz unidades Mace. Destrói-o.
+sector.tarFields.description = A periferia de uma zona de produção de petróleo, entre as montanhas e o deserto. Uma das poucas áreas com reservas de alcatrão utilizáveis.\nMesmo abandonada, esta área tem forças inimigas perigosas por perto. Não os subestimes.\n\n[lightgray]Pesquisa a tecnologia de processamento de petróleo se possível.
+sector.desolateRift.description = Uma zona extremamente perigosa. Recursos abundantes, mas pouco espaço. Grande risco de destruição. Constrói defesas aéreas e terrestres o mais rápido possível. Não te deixes levar pelo tempo entre os ataques inimigos.
+sector.nuclearComplex.description = Uma antiga instalação de produção e processamento de tório, reduzida a ruínas.\n[lightgray]Investiga o tório e os seus vários usos.\n\nO inimigo está presente aqui em grande número, constantemente à procura por atacantes.
+sector.fungalPass.description = Uma área de transição entre altas montanhas e terras baixas, repletas de esporos. Uma pequena base de reconhecimento inimiga está aqui.\nDestrua-a. Usa as unidades Dagger e Crawler. Desfaz os dois núcleos.
+sector.biomassFacility.description = A origem dos esporos. Esta é a instalação onde eles foram pesquisados e produzidos inicialmente.\nPesquisa a tecnologia contida na instalação. Cultiva os esporos para a produção de combustíveis e plásticos.\n\n[lightgray]No falecimento da instalação, os esporos foram libertados. Nada no ecossistema local conseguia competir com um organismo tão invasivo.
+sector.windsweptIslands.description = Um pouco depois do literal está esta série remota de ilhas. Registos mostram que haviam estruturas de produção de [accent]Plastânio[].\n\nDefende-te das unidades navais inimigas. Estabelece uma base nas ilhas. Pesquisa estas fábricas.
+sector.extractionOutpost.description = Um posto avançado remoto, construído pelo inimigo com o objetivo de lançar recursos para outros setores.\n\nA tecnologia de transporte entre setores é essencial para conquistas de território posteriores. Destrói a base. Pesquisa as Plataformas de Lançamento deles.
+sector.impact0078.description = Aqui repousam restos de uma nave de transporte interestelar que entrou pela primeira vez neste sistema.\nRecupera o máximo possível dos destroços. Pesquisa qualquer tecnologia intacta.
+sector.planetaryTerminal.description = O último alvo.\n\nEssa base costeira contém a estrutura capaz de lançar Núcleos para planetas locais. Está extremamente bem protegida.\n\nProduz unidades navais. Elimina o inimigo o mais rápido possível. Pesquisa a estrutura de lançamento.
+sector.coastline.description = Restos de tecnologia de unidades navais foram detetados nesta localização. Repele os ataques inimigos, captura o setor, e adquire a tecnologia.
+sector.navalFortress.description = O inimigo estabeleceu uma base numa ilha remota e naturalmente fortificada. Destrói este posto. Adquire a tecnologia avançada de construção naval deles, e desenvolve-a.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
 
-settings.language = Linguagem
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = Inicia a conquista de Erekir. Reúne recursos, produz unidades e começa a pesquisar tecnologia.
+sector.aegis.description = Este setor contém depósitos de tungsténio.\nDesenvolve a [accent]Broca de Impacto[] para minerar este recurso, e destrói a base inimiga nesta área.
+sector.lake.description = O lago de escória neste setor limita muito as unidades viáveis. Uma unidade flutuante é a única opção.\nPesquisa o [accent]Construtor de Naves[] e produza uma unidade [accent]Elude[] o mais rápido possível.
+sector.intersect.description = Scans sugerem que este setor será atacado de vários lados logo após a aterragem.\nPrepara defesas rapidamente e expande o mais rápido possível.\nSerão necessárias unidades [accent]Mech[] para o terreno acidentado da área.
+sector.atlas.description = Este setor contém terreno variado e exigirá uma variedade de unidades para atacar eficazmente.\nUnidades melhoradas também podem ser necessárias para passar por algumas das bases inimigas mais difíceis detectadas aqui.\nPesquisa o [accent]Eletrolisador[] e o [accent]Refrabicador de Tanques[].
+sector.split.description = A presença mínima de inimigos neste setor torna-o perfeito para testar novas tecnologias de transporte.
+sector.basin.description = Grande presença inimiga detetada neste setor.\nConstrói unidades rapidamente e captura os núcleos inimigos para ganhar terreno.
+sector.marsh.description = Este setor tem abundância de arquicita, mas tem respiradouros limitados.\nConstrói [accent]Câmaras de Combustão Química[] para gerar energia.
+sector.peaks.description = O terreno montanhoso neste setor torna a maioria das unidades inúteis. Unidades voadoras serão necessárias.\nEsteja atento das instalações anti-aéreas inimigas. Pode ser possível desativar algumas dessas instalações ao atacar as suas construções de suporte.
+sector.ravine.description = Nenhum núcleo inimigo detetado no setor, embora seja uma importante rota de transporte para o inimigo. Espera uma variedade de forças inimigas.\nProduz [accent]liga de surto[]. Constrói torres [accent]Afflict[].
+sector.caldera-erekir.description = Os recursos detetados neste setor estão espalhados por várias ilhas.\nPesquisa e implanta transporte baseado em drones.
+sector.stronghold.description = O grande acampamento inimigo neste setor guarda depósitos significativos de [accent]tório[].\nUse-o para desenvolver unidades e torres de nível superior.
+sector.crevice.description = O inimigo enviará forças de ataque ferozes para destruir a tua base neste setor.\nDesenvolver [accent]carbide[] e o [accent]Gerador de Pirólise[] pode ser indispensável para sobreviver.
+sector.siege.description = Este setor apresenta dois desfiladeiros paralelos que forçarão um ataque em duas frentes.\nPesquisa o [accent]cianogénio[] para obter a capacidade de criar unidades de tanques ainda mais fortes.\nCuidado: mísseis inimigos de longo alcance foram detectados. Os mísseis podem ser derrubados antes do impacto.
+sector.crossroads.description = As bases inimigas neste setor foram estabelecidas em terrenos variados. Pesquisa diferentes unidades para adaptar.\nAlém disso, algumas bases estão protegidas por escudos. Descobre como eles são alimentados.
+sector.karst.description = Este setor é rico em recursos, mas será atacado pelo inimigo assim que um novo núcleo chegar.\nAproveita os recursos e pesquisa o [accent]tecido de fase[].
+sector.origin.description = O setor final com uma presença inimiga significativa.\nNenhuma oportunidade de pesquisa provável permanece - foca-te apenas em destruir todos os núcleos inimigos.
+status.burning.name = Queimar
+status.freezing.name = Congelar
+status.wet.name = Molhado
+status.muddy.name = Lama
+status.melting.name = Derreter
+status.sapped.name = Enfraquecer
+status.electrified.name = Eletrificar
+status.spore-slowed.name = Lentidão de Esporos
+status.tarred.name = Tarred
+status.overdrive.name = Sobrecarga
+status.overclock.name = Overclock
+status.shocked.name = Choque
+status.blasted.name = Explosão
+status.unmoving.name = Parado
+status.boss.name = Guardião
+
+settings.language = Idioma
 settings.data = Dados do jogo
 settings.reset = Restaurar Padrões
 settings.rebind = Religar
-settings.resetKey = Reset
-settings.controls = Controles
+settings.resetKey = Repor
+settings.controls = Controlos
 settings.game = Jogo
 settings.sound = Som
 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
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
-paused = Pausado
+settings.clear.confirm = Tens a certeza que queres limpar os dados?\nOque é feito não pode ser desfeito!
+settings.clearall.confirm = [scarlet]AVISO![]\nIsto vai limpar todos os dados, incluindo saves, mapas, keybinds e desbloqueios.\nQuando apertar 'ok' o jogo vai apagar todos os dados e fechar automaticamente.
+settings.clearsaves.confirm = Tens a certeza que queres apagar todos os teus saves?
+settings.clearsaves = Apagar Saves
+settings.clearresearch = Limpar Pesquisa
+settings.clearresearch.confirm = Tens a certeza que queres apagar toda a tua pesquisa na campanha?
+settings.clearcampaignsaves = Limpar Saves da Campanha
+settings.clearcampaignsaves.confirm = Tens a certeza que queres limpar todos os teus saves da campanha?
+paused = < Pausado >
 clear = Limpar
 banned = [scarlet]Banido
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Ambiente Não Suportado
 yes = Sim
 no = Não
 info.title = [accent]Informação
 error.title = [crimson]Ocorreu um Erro.
 error.crashtitle = Ocorreu um Erro
-unit.nobuild = [scarlet]Unit can't build
-lastaccessed = [lightgray]Last Accessed: {0}
+unit.nobuild = [scarlet]Unidade não pode construir
+lastaccessed = [lightgray]Último Acesso: {0}
+lastcommanded = [lightgray]Último comando: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <carregar mapa para mostrar>
+stat.description = Finalidade
 stat.input = Entrada
 stat.output = Saida
+stat.maxefficiency = Eficiência Máxima
 stat.booster = Booster
-stat.tiles = Telhas Requeridas
+stat.tiles = Blocos Necessários
 stat.affinities = Afinidades
+stat.opposites = Opostos
 stat.powercapacity = Capacidade de Energia
 stat.powershot = Energia/tiro
 stat.damage = Dano
-stat.targetsair = Mirar no ar
-stat.targetsground = Mirar no chão
+stat.targetsair = Mirar no Ar
+stat.targetsground = Mirar no Chão
 stat.itemsmoved = Velocidade de movimento
-stat.launchtime = Tempo entre tiros
-stat.shootrange = Alcance
+stat.launchtime = Tempo entre Tiros
+stat.shootrange = Alcance de Tiro
 stat.size = Tamanho
-stat.displaysize = Display Size
+stat.displaysize = Mostrar Tamanho
 stat.liquidcapacity = Capacidade de Líquido
 stat.powerrange = Alcance da Energia
-stat.linkrange = Link Range
-stat.instructions = Instructions
-stat.powerconnections = Max Connections
-stat.poweruse = Uso de energia
+stat.linkrange = Alcance do Link
+stat.instructions = Instruções
+stat.powerconnections = Conexões Máximas
+stat.poweruse = Uso de Energia
 stat.powerdamage = Dano/Poder
 stat.itemcapacity = Capacidade de Itens
-stat.memorycapacity = Memory Capacity
-stat.basepowergeneration = Geração de poder base
-stat.productiontime = Tempo de produção
-stat.repairtime = Tempo de reparo total do bloco
-stat.speedincrease = Aumento de velocidade
-stat.range = Distância
-stat.drilltier = Furáveis
-stat.drillspeed = Velocidade da broca base
+stat.memorycapacity = Capacidade de Memória
+stat.basepowergeneration = Geração de Poder Base
+stat.productiontime = Tempo de Produção
+stat.repairtime = Tempo de Reparo Total do Bloco
+stat.repairspeed = Velocidade de Reparação
+stat.weapons = Armas
+stat.bullet = Bala
+stat.moduletier = Nível do Módulo
+stat.unittype = Tipo de Unidade
+stat.speedincrease = Aumento de Velocidade
+stat.range = Alcance
+stat.drilltier = Brocas
+stat.drillspeed = Velocidade base da Broca
 stat.boosteffect = Efeito do Boost
-stat.maxunits = Máximo de unidades ativas
+stat.maxunits = Máximo de Unidades Ativas
 stat.health = Saúde
-stat.buildtime = Tempo de construção
-stat.maxconsecutive = Max Consecutive
-stat.buildcost = Custo de construção
+stat.armor = Armor
+stat.buildtime = Tempo de Construção
+stat.maxconsecutive = Máximo Consecutivo
+stat.buildcost = Custo de Construção
 stat.inaccuracy = Imprecisão
 stat.shots = Tiros
-stat.reload = Tiros por segundo
+stat.reload = Tiros por Segundo
 stat.ammo = Munição
-stat.shieldhealth = Shield Health
-stat.cooldowntime = Cooldown Time
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.shieldhealth = Vida do Escudo
+stat.cooldowntime = Tempo de Espera
+stat.explosiveness = Explosividade
+stat.basedeflectchance = Probabilidade Base de Esquiva
+stat.lightningchance = Probabilidade de Raio
+stat.lightningdamage = Dano de Raio
+stat.flammability = Inflamabilidade
+stat.radioactivity = Radioatividade
+stat.charge = Carga de Eletricidade
+stat.heatcapacity = Capacidade de Calor
+stat.viscosity = Viscosidade
+stat.temperature = Temperatura
+stat.speed = Velocidade
+stat.buildspeed = Velocidade de Construção
+stat.minespeed = Velocidade de Mineração
+stat.minetier = Nível de Mineração
+stat.payloadcapacity = Capacidade da Carga
+stat.abilities = Habilidades
+stat.canboost = Pode Impulsionar
+stat.flying = Voar
+stat.ammouse = Consumo de Munição
+stat.ammocapacity = Capacidade de Munição
+stat.damagemultiplier = Multiplicador de Dano
+stat.healthmultiplier = Multiplicador de Vida
+stat.speedmultiplier = Multiplicador de Velocidade
+stat.reloadmultiplier = Multiplicador de Recarga
+stat.buildspeedmultiplier = Multiplicador de Velocidade de COnstrução
+stat.reactive = Reações
+stat.immunities = Imunidade
+stat.healing = Reparação
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = Campo de Força
+ability.forcefield.description = Cria um campo de força que absorve as balas
+ability.repairfield = Campo de Reparação
+ability.repairfield.description = Repara unidades próximas
+ability.statusfield = Campo de Estado
+ability.statusfield.description = Aplica um estado a unidades próximas
+ability.unitspawn = Fábrica
+ability.unitspawn.description = Constrói unidades
+ability.shieldregenfield = Campo de regeneração do escudo
+ability.shieldregenfield.description = Regenera o escudo de unidades próximas
+ability.movelightning = Raio de Movimento
+ability.movelightning.description = Liberta raios enquanto se move
+ability.armorplate = Placa de Armadura
+ability.armorplate.description = Reduz o dano sofrido ao disparar
+ability.shieldarc = Arco de Escudo
+ability.shieldarc.description = Projeta um campo de escudo em forma de arco que absorve as balas
+ability.suppressionfield = Supressão de Reparo
+ability.suppressionfield.description = Pára reparações de estruturas próximas
+ability.energyfield = Campo de Energia
+ability.energyfield.description = Eletrocuta inimigos próximos
+ability.energyfield.healdescription = Eletrocuta inimigos próximos e cura aliados
+ability.regen = Regeneração
+ability.regen.description = Regenera a própria vida com o tempo
+ability.liquidregen = Absorção de Líquidos
+ability.liquidregen.description = Absorve líquidos para curar-se a si próprio
+ability.spawndeath = Spawns de Morte
+ability.spawndeath.description = Liberta unidades aquando a morte
+ability.liquidexplode = Derrame de morte
+ability.liquidexplode.description = Derrama líquidos aquando a morte
+ability.stat.firingrate = [stat]{0}/seg.[lightgray] taxa de disparo
+ability.stat.regen = [stat]{0}[lightgray] vida/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] vida/pulso
+ability.stat.shield = [stat]{0}[lightgray] escudo
+ability.stat.repairspeed = [stat]{0}/seg.[lightgray] velocidade de reparação
+ability.stat.slurpheal = [stat]{0}[lightgray] unidade de vida/líquido
+ability.stat.cooldown = [stat]{0} seg.[lightgray] espera
+ability.stat.maxtargets = [stat]{0}[lightgray] alvos máximos
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] quantidade de reparação do mesmo tipo
+ability.stat.damagereduction = [stat]{0}%[lightgray] redução de dano
+ability.stat.minspeed = [stat]{0} blocos/seg.[lightgray] velocidade mínima
+ability.stat.duration = [stat]{0} seg.[lightgray] duração
+ability.stat.buildtime = [stat]{0} seg.[lightgray] tempo de construção
 
-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.onlycoredeposit = Depósito no núcleo permitido apenas
+bar.drilltierreq = Melhor broca necessária
+bar.nobatterypower = Insufficient Battery Power
+bar.noresources = Recursos Insuficientes
+bar.corereq = Base de Núcleo Necessária
+bar.corefloor = Chão de colocação do Núcleo Necessária
+bar.cargounitcap = Limite de Carga Atingido
+bar.drillspeed = Velocidade da Broca: {0}/s
+bar.pumpspeed = Velocidade da Bomba: {0}/s
 bar.efficiency = Eficiência: {0}%
-bar.powerbalance = Energia: {0}
+bar.boost = Impulso: +{0}%
+bar.powerbuffer = Batteries: {0}/{1}
+bar.powerbalance = Energia: {0}/s
+
 bar.powerstored = Armazenada: {0}/{1}
 bar.poweramount = Energia: {0}
 bar.poweroutput = Saída de energia: {0}
-bar.powerlines = Connections: {0}/{1}
+bar.powerlines = Conexões: {0}/{1}
 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.input = Input
-bar.output = Output
+bar.liquid = Líquido
+bar.heat = Calor
+bar.cooldown = Cooldown
+bar.instability = Instabilidade
+bar.heatamount = Calor: {0}
+bar.heatpercent = Calor: {0} ({1}%)
 
-units.processorcontrol = [lightgray]Processor Controlled
+bar.power = Poder
+bar.progress = Progresso da Construção
+bar.loadprogress = Progreso
+bar.launchcooldown = Cooldown de Lançamento
+bar.input = Entrada
+bar.output = Saída
+bar.strength = [stat]{0}[lightgray]x força
+
+units.processorcontrol = [lightgray]Controlado por Processador
 
 bullet.damage = [stat]{0}[lightgray] dano
-bullet.splashdamage = [stat]{0}[lightgray] Dano em área ~[stat] {1}[lightgray] Blocos
-bullet.incendiary = [stat]Incendiário
-bullet.homing = [stat]Guiado
-bullet.shock = [stat]Choque
-bullet.frag = [stat]Fragmentação
-bullet.knockback = [stat]{0}[lightgray]Impulso
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]Congelamento
-bullet.tarred = [stat]Grudento
+bullet.splashdamage = [stat]{0}[lightgray] Dano em área ~[stat] {1}[lightgray] Bloco(s)
+bullet.incendiary = [stat]incendiário
+bullet.homing = [stat]guiado
+bullet.armorpierce = [stat]perfuração de armadura
+bullet.maxdamagefraction = [stat]{0}%[lightgray] limite de dano
+bullet.suppression = [stat]{0} seg.[lightgray] supressão de reparação ~ [stat]{1}[lightgray] blocos
+bullet.interval = [stat]{0}/seg.[lightgray] balas de intervalo:
+bullet.frags = [stat]{0}[lightgray]x fragmentos de balas:
+bullet.lightning = [stat]{0}[lightgray]x raio ~ [stat]{1}[lightgray] dano
+bullet.buildingdamage = [stat]{0}%[lightgray] dano em construções
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] impulso
+bullet.pierce = [stat]{0}[lightgray]x perfuração
+bullet.infinitepierce = [stat]perfuração
+bullet.healpercent = [stat]{0}[lightgray]% cura
+bullet.healamount = [stat]{0}[lightgray] reparo direto
 bullet.multiplier = [stat]{0}[lightgray]x multiplicador de munição
 bullet.reload = [stat]{0}[lightgray]x cadência de tiro
+bullet.range = [stat]{0}[lightgray] alcance de blocos
+bullet.notargetsmissiles = [stat] ignora construções
+bullet.notargetsbuildings = [stat] ignora mísseis
 
 unit.blocks = Blocos
-unit.blockssquared = blocks²
-unit.powersecond = Unidades de energia/segundo
-unit.liquidsecond = Unidades de líquido/segundo
-unit.itemssecond = itens/segundo
-unit.liquidunits = Unidades de liquido
+unit.blockssquared = Blocos²
+unit.powersecond = Unidades de energia/seg.
+unit.tilessecond = Blocos/seg.
+unit.liquidsecond = Unidades de líquido/seg.
+unit.itemssecond = Itens/seg.
+unit.liquidunits = Unidades de líquido
 unit.powerunits = Unidades de energia
+unit.heatunits = Unidades de calor
 unit.degrees = Graus
 unit.seconds = segundos
-unit.minutes = mins
-unit.persecond = por segundo
+unit.minutes = minutos
+unit.persecond = /seg.
 unit.perminute = /min
-unit.timesspeed = x Velocidade
+unit.timesspeed = x velocidade
+unit.multiplier = x
+
 unit.percent = %
-unit.shieldhealth = shield health
+unit.shieldhealth = saúde do escudo
 unit.items = itens
-unit.thousands = k
-unit.millions = mil
-unit.billions = b
+unit.thousands = m
+unit.millions = M
+unit.billions = B
+unit.shots = disparos
+unit.pershot = /dispasro
+
+category.purpose = Propósito
 category.general = Geral
 category.power = Poder
 category.liquids = Líquidos
 category.items = Itens
-category.crafting = Construindo
-category.function = Function
-category.optional = Melhoras opcionais
-setting.landscape.name = Travar panorama
+category.crafting = Entrada/Saída
+category.function = Função
+category.optional = Melhorias opcionais
+setting.alwaysmusic.name = Tocar Música Sempre
+setting.alwaysmusic.description = Quando ativado, a música vai ser tocada sempre em loop durante o jogo.\nQUando desativado, só toca em intervalos aleatórios.
+setting.skipcoreanimation.name = Passar Animação de Lançamento/Aterragem do Núcleo
+setting.landscape.name = Bloquear Orientação
 setting.shadows.name = Sombras
-setting.blockreplace.name = Automatic Block Suggestions
+setting.blockreplace.name = Sugestões Automáticas de Blocos
 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.animatedwater.name = �gua animada
-setting.animatedshields.name = Escudos animados
-setting.antialias.name = Filtro suavizante[lightgray] (reinicialização requerida)[]
-setting.playerindicators.name = Player Indicators
-setting.indicators.name = Indicador de aliados
-setting.autotarget.name = Alvo automatico
-setting.keyboard.name = Controles de mouse e teclado
-setting.touchscreen.name = Controles de Touchscreen
-setting.fpscap.name = FPS Máximo
+setting.hints.name = Dicas
+setting.logichints.name = Dicas de Lógica
+setting.backgroundpause.name = Pausar Jogo em Segundo Plano
+setting.buildautopause.name = Auto-Pausar Construções
+setting.doubletapmine.name = Duplo Toque para Minerar
+setting.commandmodehold.name = Segurar para Modo de Comando
+setting.distinctcontrolgroups.name = Limitar um Grupo de Controlo por Unidade
+setting.modcrashdisable.name = Desativar Mods em Crash de Início do Jogo
+setting.animatedwater.name = �gua Animada
+setting.animatedshields.name = Escudos Animados
+setting.playerindicators.name = Indicador de Jogadores
+setting.indicators.name = Indicador de inimigos
+setting.autotarget.name = Alvo Automático
+setting.keyboard.name = Controlos de Rato e Teclado
+setting.touchscreen.name = Controlos de Touchscreen
+setting.fpscap.name = Limite de FPS
 setting.fpscap.none = Nenhum
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Escala da IU[lightgray] (reinicialização requerida)[]
-setting.swapdiagonal.name = Sempre colocação diagnoal
-setting.difficulty.training = Treinamento
-setting.difficulty.easy = Fácil
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Difícil
-setting.difficulty.insane = Insano
-setting.difficulty.name = Dificuldade
-setting.screenshake.name = Balanço do Ecrã
+
+setting.uiscale.name = Escala da IU[lightgray] (reinicío requerida)[]
+setting.uiscale.description = Reinicío necessário para aplicar as alterações.
+setting.swapdiagonal.name = Colocação Diagonal Sempre
+setting.screenshake.name = Vibração do Ecrã
+setting.bloomintensity.name = Intensidade do Bloom
+
+setting.bloomblur.name = Bloom Blur
 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.sensitivity.name = Sensibilidade do Controle
-setting.saveinterval.name = Intervalo de autogravamento
-setting.seconds = {0} Segundos
-setting.blockselecttimeout.name = Tempo limite de seleção do bloco
+setting.destroyedblocks.name = Mostrar Blocos Destruídos
+setting.blockstatus.name = Mostrar Estado do Bloco
+setting.conveyorpathfinding.name = Trajetória de Colocação de Tapetes Rolantes
+setting.sensitivity.name = Sensibilidade dos Controlos
+setting.saveinterval.name = Intervalo de auto-salvamento do jogo
+setting.seconds = {0} segundos
 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.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.fullscreen.name = Ecrã Inteiro
+setting.borderlesswindow.name = Janela sem Bordas
+setting.borderlesswindow.name.windows = Ecrã sem Bordas
+setting.borderlesswindow.description = Pode ser necessário reiniciar para aplicar as alterações.
+setting.fps.name = Mostrar FPS e Ping
+setting.console.name = Ativar Consola
+setting.smoothcamera.name = Câmara Suave
+setting.vsync.name = Sincronização Vertical (VSync)
+setting.pixelate.name = Pixelização
+setting.minimap.name = Mostrar Minimapa
+setting.coreitems.name = Mostrar Itens do Núcleo
+setting.position.name = Mostrar Posição do Jogador
+setting.mouseposition.name = Mostrar Posição do Rato
 setting.musicvol.name = Volume da Música
-setting.atmosphere.name = Show Planet Atmosphere
-setting.ambientvol.name = Volume do ambiente
+setting.atmosphere.name = Mostrar Atmosfera do Planeta
+setting.drawlight.name = Renderizar Iluminação/Escuro
+setting.ambientvol.name = Volume do Ambiente
 setting.mutemusic.name = Desligar Música
-setting.sfxvol.name = Volume de Efeitos
+setting.sfxvol.name = Volume dos Efeitos
 setting.mutesound.name = Desligar Som
-setting.crashreport.name = Enviar denuncias de crash anonimas
-setting.savecreate.name = Criar gravamentos automaticamente
-setting.publichost.name = Visibilidade do jogo público
+setting.crashreport.name = Enviar Relatórios de Crash Anónimos
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = Criar Gravações Automaticamente
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limite de Jogadores
-setting.chatopacity.name = Opacidade do chat
-setting.lasersopacity.name = Opacidade do Power Laser
-setting.bridgeopacity.name = Opacidade da Ponte
-setting.playerchat.name = Mostrar chat em jogo
-public.confirm = Queres que o teu jogo fique publico?\n[accent]Qualquer jogador vai conseguir juntar-se ao teu jogo.\n[lightgray]Isto pode ser alterado mais tarde in Settings->Game->Public Game Visibility.
-public.beta = Observe que as versões beta do jogo não podem criar lobbies públicos.
-uiscale.reset = A escala da IU foi mudada.\nPressione "OK" para confirmar esta escala.\n[scarlet]Revertendo e saindo em[accent] {0}[] settings...
+setting.chatopacity.name = Opacidade do Chat
+setting.lasersopacity.name = Opacidade do Poder do Laser
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Opacidade das Pontes
+setting.playerchat.name = Mostrar Chat em Jogo
+setting.showweather.name = Mostrar Gráficos do Clima
+setting.hidedisplays.name = Ocultar Ecrãs Lógicos
+
+setting.macnotch.name = Adaptar a interface para exibir o entalhe
+setting.macnotch.description = É necessário reiniciar para aplicar as alterações
+steam.friendsonly = Amigos Apenas
+steam.friendsonly.tooltip = Define se apenas amigos da Steam podem juntar-se ao teu jogo.\nDesativar esta opção fará o teu jogo público - qualquer um pode-se juntar ao teu mapa.
+public.beta = Observa que as versões beta do jogo não podem criar lobbies públicos.
+uiscale.reset = A escala da IU foi mudada.\nPressiona "OK" para confirmar esta escala.\n[scarlet]Revertendo e saindo em[accent] {0}[] segundos...
 uiscale.cancel = Cancelar e sair
 setting.bloom.name = Bloom
-keybind.title = Refazer teclas
-keybinds.mobile = [scarlet]A maior parte das teclas aqui não são funcionais em aparelhos móveis. Apenas movimento básico é suportado.
+keybind.title = Revincular teclas
+keybinds.mobile = [scarlet]A maior parte das teclas aqui não funcionam em dispositivos móveis. Apenas é suportado movimento básico.
 category.general.name = Geral
 category.view.name = Ver
+category.command.name = Comando de Unidades
 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...
-keybind.screenshot.name = Captura do mapa
-keybind.toggle_power_lines.name = Toggle Power Lasers
-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.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
-keybind.schematic_flip_y.name = Rodar esquema 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 = Alterar ecrã inteiro
-keybind.select.name = Selecionar
-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
+
+category.blocks.name = Selecionador de Blocos
+placement.blockselectkeys = \n[lightgray]Tecla: [{0},
+keybind.respawn.name = Renascer
+keybind.control.name = Controlar Unidade
+keybind.clear_building.name = Limpar Construção
+keybind.press = Prime uma tecla...
+keybind.press.axis = Prime um eixo ou uma tecla...
+keybind.screenshot.name = Captura de Ecrã do Mapa
+keybind.toggle_power_lines.name = Ativar Lasers de Energia
+keybind.toggle_block_status.name = Ativar Estado de Blocos
+keybind.move_x.name = Mover no Eixo X
+keybind.move_y.name = Mover no Eixo Y
+keybind.mouse_move.name = Seguir Rato
+keybind.pan.name = Vista Panorâmica
+keybind.boost.name = Impulso
+keybind.command_mode.name = Modo de Comando
+keybind.command_queue.name = Fila de Comando de Unidades
+keybind.create_control_group.name = Criar Grupo de Controlo
+keybind.cancel_orders.name = Cancelar Pedidos
+
+keybind.unit_stance_shoot.name = Postura de Unidade: Disparar
+keybind.unit_stance_hold_fire.name = Postura de Unidade: Não Disparar
+keybind.unit_stance_pursue_target.name = Postura de Unidade: Perseguir Alvo
+keybind.unit_stance_patrol.name = Postura de Unidade: Patrulha
+keybind.unit_stance_ram.name = Postura de Unidade: Forçar
+keybind.unit_command_move.name = Controlo de Unidade: Mover
+keybind.unit_command_repair.name = Controlo de Unidade: Reparar
+keybind.unit_command_rebuild.name = Controlo de Unidade: Reconstruir
+keybind.unit_command_assist.name = Controlo de Unidade: Assistir
+keybind.unit_command_mine.name = Controlo de Unidade: Minerar
+keybind.unit_command_boost.name = Controlo de Unidade: Impulsionar
+keybind.unit_command_load_units.name = Controlo de Unidade: Carregar Unidades
+keybind.unit_command_load_blocks.name = Controlo de Unidade: Carregar Blocos
+keybind.unit_command_unload_payload.name = Controlo de Unidade: Descarregar Carga
+keybind.unit_command_enter_payload.name = Controlo de Unidade: Inserir Carga
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+
+keybind.rebuild_select.name = Reconstruir Região
+keybind.schematic_select.name = Selecionar Região
+keybind.schematic_menu.name = Menu de Esquemas
+keybind.schematic_flip_x.name = Rodar Esquema pelo eixo X
+keybind.schematic_flip_y.name = Rodar Esquema pelo eixo Y
+keybind.category_prev.name = Categoria Anterior 
+keybind.category_next.name = Próxima Categoria
+keybind.block_select_left.name = Selecionar Bloco à Esquerda
+keybind.block_select_right.name = Selecionar Bloco à Direita
+keybind.block_select_up.name = Selecionar Bloco Acima
+keybind.block_select_down.name = Seleconar Bloco Abaixo
+keybind.block_select_01.name = Categoria/Seleção de Bloco 1
+keybind.block_select_02.name = Categoria/Seleção de Bloco 2
+keybind.block_select_03.name = Categoria/Seleção de Bloco 3
+keybind.block_select_04.name = Categoria/Seleção de Bloco 4
+keybind.block_select_05.name = Categoria/Seleção de Bloco 5
+keybind.block_select_06.name = Categoria/Seleção de Bloco 6
+keybind.block_select_07.name = Categoria/Seleção de Bloco 7
+keybind.block_select_08.name = Categoria/Seleção de Bloco 8
+keybind.block_select_09.name = Categoria/Seleção de Bloco 9
+keybind.block_select_10.name = Categoria/Seleção de Bloco 10
+keybind.fullscreen.name = Ativar/Desativar Ecrã Inteiro
+keybind.select.name = Selecionar/Atirar
+keybind.diagonal_placement.name = Colocação na Diagonal
+keybind.pick.name = Pegar Bloco
+keybind.break_block.name = Partir Bloco
+keybind.select_all_units.name = Selecionar Todas as Unidades
+keybind.select_all_unit_factories.name = Selecionar Todas as Fábricas
+keybind.deselect.name = Desselecionar
+keybind.pickupCargo.name = Pegar Carga
+keybind.dropCargo.name = Largar Carga
+
 keybind.shoot.name = Atirar
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pausar
-keybind.pause_building.name = Pausar/Resumir construção
+keybind.pause_building.name = Pausar/Resumir Construção
 keybind.minimap.name = Minimapa
-keybind.chat.name = Conversa
-keybind.player_list.name = Lista_de_jogadores
-keybind.console.name = console
-keybind.rotate.name = Girar
-keybind.rotateplaced.name = Rodar existente (Hold)
-keybind.toggle_menus.name = Ativar menus
-keybind.chat_history_prev.name = Histórico do chat anterior
-keybind.chat_history_next.name = Histórico do proximo chat
-keybind.chat_scroll.name = Rolar chat
-keybind.drop_unit.name = Soltar unidade
-keybind.zoom_minimap.name = Zoom do minimapa
+keybind.planet_map.name = Mapa do Planeta
+keybind.research.name = Pesquisa
+keybind.block_info.name = Informação do Bloco
+keybind.chat.name = Chat
+keybind.player_list.name = Lista de Jogadores
+keybind.console.name = Consola
+keybind.rotate.name = Rodar
+keybind.rotateplaced.name = Rodar Existente (Manter)
+keybind.toggle_menus.name = Ativar/Desativar Menus
+keybind.chat_history_prev.name = Histórico do Chat Anterior
+keybind.chat_history_next.name = Próximo Histórico do Chat
+keybind.chat_scroll.name = Percorrer Chat
+keybind.chat_mode.name = Mudar Modo de Chat
+keybind.drop_unit.name = Largar Unidade
+keybind.zoom_minimap.name = Zoom do Minimapa
 mode.help.title = Descrição dos mods
+
 mode.survival.name = Sobrevivência
-mode.survival.description = O modo normal. Recursos limitados e hordas automáticas.
+mode.survival.description = O modo padrão. Recursos limitados e hordas automáticas.
 mode.sandbox.name = Sandbox
-mode.sandbox.description = Recursos infinitos e sem tempo para ataques.
+mode.sandbox.description = Recursos infinitos e sem temporizador para ataques.
 mode.editor.name = Editor
-mode.pvp.name = JXJ
-mode.pvp.description = Lutar contra outros jogadores locais.
+mode.pvp.name = PvP
+mode.pvp.description = Luta contra outros jogadores locais.\n[gray]Necessita de pelo menos 2 núcleos de cores diferentes para jogar.
 mode.attack.name = Ataque
-mode.attack.description = Sem hordas, com o objetivo de destruir a base inimiga.
+mode.attack.description = Destrói a base inimiga.\n[gray]Requer um núcleo de cor vermelha no mapa para jogar.
 mode.custom = Regras personalizadas
 
-rules.infiniteresources = Recursos infinitos
-rules.reactorexplosions = Reactor Explosions
-rules.schematic = Schematics Allowed
-rules.wavetimer = Tempo de horda
+rules.invaliddata = Dados na área de transferência Inválidos
+rules.hidebannedblocks = Ocultar Blocos Banidos
+
+rules.infiniteresources = Recursos Infinitos
+rules.onlydepositcore = Permitir Apenas Depósito no Núcleo
+rules.derelictrepair = Permitir Reparação de Blocos Derelict
+rules.reactorexplosions = Esploções de Reatores
+rules.coreincinerates = Núcleo destrói Itens em Excesso
+rules.disableworldprocessors = Desativar Processadores Globais
+rules.schematic = Esquemas Permitidos
+rules.wavetimer = Tempo de Horda
+rules.wavesending = Envio de Hordas
+rules.allowedit = Permitir Edição de Regras
+rules.allowedit.info = Quando ativado, o jogador pode editar as regras em jogo através do botão no canto sup. esq. nop menu de Pausa.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
+
 rules.waves = Hordas
-rules.attack = Modo de ataque
-rules.buildai = AI Building
-rules.enemyCheat = Recursos de IA Infinitos
-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.unitdamagemultiplier = Multiplicador de dano de Unidade
-rules.enemycorebuildradius = Raio de "Não-criação" de core inimigo:[lightgray] (blocos)
-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.unitammo = Units Require Ammo
+
+rules.airUseSpawns = Unidades Aéreas usam os Pontos de Spawn
+rules.attack = Modo de Ataque
+rules.buildai = Construtor de Base por IA
+rules.buildaitier = Nível de Construtor IA
+rules.rtsai = RTS AI [red](WIP)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Tamanho Mínimo de Esquadrão
+rules.rtsmaxsquadsize = Tamanho Máximo de Esquadrão
+rules.rtsminattackweight = Peso Mínimo de Ataque
+rules.cleanupdeadteams = Limpar Construções Inimigas quando derrotadas (PvP)
+rules.corecapture = Capturar Núcleo na Cestruição
+rules.polygoncoreprotection = Proteção do Núcleo Poligonal
+rules.placerangecheck = Verificação do intervalo de colocação
+rules.enemyCheat = Recursos Infinitos para a Equipa Inimiga
+rules.blockhealthmultiplier = Multiplicador de Vida do Bloco
+rules.blockdamagemultiplier = Multiplicador de Dano do Bloco
+rules.unitbuildspeedmultiplier = Multiplicador de Velocidade de Criação de Unidades
+rules.unitcostmultiplier = Multiplicador de Custo de Unidades
+rules.unithealthmultiplier = Multiplicador de Vida de Unidades
+rules.unitdamagemultiplier = Multiplicador de Dano de Unidades
+rules.unitcrashdamagemultiplier = Multiplicador de Dano de Unidades quando Destruídas.
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Multiplicador de Energia Solar
+rules.unitcapvariable = Núcleos Contribuem para o Limite de Unidades
+rules.unitpayloadsexplode = Cargas carregadas explodem junto com a Unidade
+rules.unitcap = Limite básico de Unidades
+rules.limitarea = Limitar �rea do Mapa
+rules.enemycorebuildradius = Raio de Proteção Contra Construções do Núcleo Inimigo :[lightgray] (blocos)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Tempo entre Hordas:[lightgray] (seg.)
+rules.initialwavespacing = Intervalo da Primeira Horda:[lightgray] (seg.)
+rules.buildcostmultiplier = Multiplicador do Custo de Construção
+rules.buildspeedmultiplier = Multiplicador do Velocidade de Construção
+rules.deconstructrefundmultiplier = Multiplicador do Reemboso de Desconstrução
+rules.waitForWaveToEnd = Hordas Esperam a Anterior Acabar
+rules.wavelimit = Mapa Acaba após a Horda
+rules.dropzoneradius = Raio da Zona de Spawn:[lightgray] (blocos)
+rules.unitammo = UNidades Requerem Munição [red](pode ser removido)
+rules.enemyteam = Equipa Inimiga
+rules.playerteam = Equipa do jogador
+
 rules.title.waves = Hordas
 rules.title.resourcesbuilding = Recursos e Construções
 rules.title.enemy = Inimigos
 rules.title.unit = Unidades
 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.title.environment = Ambiente
+rules.title.teams = Equipas
+rules.title.planet = Planeta
+rules.lighting = Iluminação
+rules.fog = Névoa de guerra
+rules.invasions = Invasões de Setores Inimigos
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Mostrar Spawn de Inimigos
+rules.randomwaveai = IA de hordas imprevisível
+rules.fire = Fogo
+rules.anyenv = <Qualquer>
+rules.explosions = Dano de Explosão a Bloco/Unidade
+rules.ambientlight = Luz Ambiente
+
 rules.weather = Weather
-rules.weather.frequency = Frequency:
-rules.weather.duration = Duration:
+rules.weather.frequency = Frequência:
+rules.weather.always = Sempre
+rules.weather.duration = Duração:
+rules.randomwaveai.info = As unidades spawnadas por hordas atacam estruturas aleatórias em vez atacarem diretamente o núcleo ou geradores de energia.
+rules.placerangecheck.info = Previne os jogadores de colocarem qualquer coisa perto de construções inimigas. Ao tentar colocar uma torre, o raio é aumentado, por isso a torre não conseguirá alcançar o inimigo.
+rules.onlydepositcore.info = Previne as unidades de depositarem itens em qualquer construção excepto núcleos.
 
 content.item.name = Itens
-content.liquid.name = Liquidos
+content.liquid.name = Líquidos
 content.unit.name = Unidades
 content.block.name = Blocos
+content.status.name = Efeitos de Estado
+content.sector.name = Setores
+content.team.name = Equipas
+wallore = (Muro)
 
 item.copper.name = Cobre
 item.lead.name = Chumbo
@@ -908,22 +1485,36 @@ item.titanium.name = Titânio
 item.thorium.name = Urânio
 item.silicon.name = Sílicio
 item.plastanium.name = Plastânio
-item.phase-fabric.name = Tecido de fase
-item.surge-alloy.name = Liga de surto
-item.spore-pod.name = Cápsula de esporos
+item.phase-fabric.name = Tecido de Fase
+item.surge-alloy.name = Liga de Surto
+item.spore-pod.name = Cápsula de Esporos
 item.sand.name = Areia
-item.blast-compound.name = Composto de explosão
+item.blast-compound.name = Composto de Explosão
 item.pyratite.name = Piratita
 item.metaglass.name = Metavidro
 item.scrap.name = Sucata
+item.fissile-matter.name = Matéria Físsil
+item.beryllium.name = Berílio
+item.tungsten.name = Tungsténio
+item.oxide.name = Óxido
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
+
 liquid.water.name = �gua
 liquid.slag.name = Escória
 liquid.oil.name = Petróleo
-liquid.cryofluid.name = Crio Fluido
+liquid.cryofluid.name = Criofluido
+liquid.neoplasm.name = Neoplasma
+liquid.arkycite.name = Arquicite
+liquid.gallium.name = Gálio
+liquid.ozone.name = Ozono
+liquid.hydrogen.name = Hidrogénio
+liquid.nitrogen.name = Nitrogénio
+liquid.cyanogen.name = Cianogénio
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
-unit.fortress.name = Fortaleza
+unit.fortress.name = Fortress
 unit.nova.name = Nova
 unit.pulsar.name = Pulsar
 unit.quasar.name = Quasar
@@ -947,6 +1538,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,97 +1550,124 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Drone de Montagem
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
-block.sand-boulder.name = Pedregulho de areia
-block.grass.name = Grama
-block.slag.name = Slag
-block.space.name = Space
+block.sand-boulder.name = Pedregulho de Areia
+block.basalt-boulder.name = Pedregulho de Basalto
+block.grass.name = Relva
+block.molten-slag.name = Escória
+block.pooled-cryofluid.name = Criofluido
+block.space.name = Espaço
 block.salt.name = Sal
-block.salt-wall.name = Salt Wall
+block.salt-wall.name = Parede de Sal
 block.pebbles.name = Pedrinhas
 block.tendrils.name = Gavinhas
-block.sand-wall.name = Sand Wall
-block.spore-pine.name = Pinheiro de esporo
-block.spore-wall.name = Spore Wall
-block.boulder.name = Boulder
-block.snow-boulder.name = Snow Boulder
-block.snow-pine.name = Pinheiro com neve
+block.sand-wall.name = Parede de Areia
+block.spore-pine.name = Pinheiro de Esporos
+block.spore-wall.name = Parede de Esporos
+block.boulder.name = Pedregulho
+block.snow-boulder.name = Bola de Neve
+block.snow-pine.name = Pinheiro com Neve
 block.shale.name = Xisto
-block.shale-boulder.name = Pedra de xisto
+block.shale-boulder.name = Pedra de Xisto
 block.moss.name = Musgo
 block.shrubs.name = Arbusto
-block.spore-moss.name = Musgo de esporos
-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
-block.scrap-wall-gigantic.name = Muro gigante de sucata
+block.spore-moss.name = Musgo de Esporos
+block.shale-wall.name = Muro de Xisto
+block.scrap-wall.name = Muro de Sucata
+block.scrap-wall-large.name = Muro Grande de Sucata
+block.scrap-wall-huge.name = Muro Enorme de Ducata
+block.scrap-wall-gigantic.name = Muro Gigante de Sucata
 block.thruster.name = Propulsor
-block.kiln.name = Forno para metavidro
-block.graphite-press.name = Prensa de grafite
+block.kiln.name = Forno para Metavidro
+block.graphite-press.name = Prensa de Grafite
 block.multi-press.name = Multi-Prensa
-block.constructing = {0}\n[lightgray](Construindo)
-block.spawn.name = Spawn dos inimigos
-block.core-shard.name = Fragmento do núcleo
-block.core-foundation.name = Fundação do núcleo
-block.core-nucleus.name = Núcleo do núcleo
-block.deepwater.name = �gua profunda
-block.water.name = �gua
-block.tainted-water.name = �gua contaminada
-block.darksand-tainted-water.name = �gua contaminada sobre areia escura
-block.tar.name = Piche
+block.constructing = {0}\n[lightgray](A construir)
+block.spawn.name = Spawn dos Inimigos
+block.remove-wall.name = Remover Parede
+block.remove-ore.name = Remover Minério
+block.core-shard.name = Pedaço do Núcleo
+block.core-foundation.name = Fundação do Núcleo
+block.core-nucleus.name = Núcleo do Núcleo
+block.deep-water.name = �guas Profundas
+block.shallow-water.name = �gua
+block.tainted-water.name = �gua Contaminada
+block.deep-tainted-water.name = �gua Contaminada Profunda
+block.darksand-tainted-water.name = �gua Contaminada sobre Areia Escura
+block.tar.name = Alcatrão
 block.stone.name = Pedra
-block.sand.name = Areia
-block.darksand.name = Areia escura
+block.sand-floor.name = Areia
+block.darksand.name = Areia Escura
 block.ice.name = Gelo
 block.snow.name = Neve
-block.craters.name = Crateras
-block.sand-water.name = �gua sobre areia
-block.darksand-water.name = �gua sobre areia escura
+block.crater-stone.name = Crateras
+block.sand-water.name = �gua sobre Areia
+block.darksand-water.name = �gua sobre Areia Escura
 block.char.name = Char
 block.dacite.name = Dacite
-block.dacite-wall.name = Dacite Wall
-block.dacite-boulder.name = Dacite Boulder
-block.ice-snow.name = Gelo de neve
-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.rhyolite.name = Riolite
+block.dacite-wall.name = Parede de Dacite
+block.dacite-boulder.name = Pedreculho de Dacite
+block.ice-snow.name = Gelo de Neve
+block.stone-wall.name = Parede de Pedra
+block.ice-wall.name = Parede de Gelo
+block.snow-wall.name = Parede de Neve
+block.dune-wall.name = Parede de Duna
 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
-block.metal-floor.name = Chão de metal
-block.metal-floor-2.name = Chão de metal 2
-block.metal-floor-3.name = Chão de metal 3
-block.metal-floor-5.name = Chão de metal 5
-block.metal-floor-damaged.name = Chão de metal danificado
-block.dark-panel-1.name = Painel escuro 1
-block.dark-panel-2.name = Painel escuro 2
-block.dark-panel-3.name = Painel escuro 3
-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.basalt.name = Basalt
-block.hotrock.name = Rocha quente
-block.magmarock.name = Rocha de magma
+block.dirt.name = Terra
+block.dirt-wall.name = Parede de Terra
+block.mud.name = Lama
+block.white-tree-dead.name = �rvore Branca Morta
+block.white-tree.name = �rvore Branca
+block.spore-cluster.name = Aglomerado de Esporos
+block.metal-floor.name = Chão de Metal
+block.metal-floor-2.name = Chão de Metal 2
+block.metal-floor-3.name = Chão de Metal 3
+block.metal-floor-4.name = Chão de Metal 4
+block.metal-floor-5.name = Chão de Metal 5
+block.metal-floor-damaged.name = Chão de Metal Danificado
+block.dark-panel-1.name = Painel Escuro 1
+block.dark-panel-2.name = Painel Escuro 2
+block.dark-panel-3.name = Painel Escuro 3
+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 eEscuro
+block.basalt.name = Basalto
+block.hotrock.name = Rocha Quente
+block.magmarock.name = Rocha de Magma
 block.copper-wall.name = Parede de Cobre
-block.copper-wall-large.name = Parede de Cobre Grande
-block.titanium-wall.name = Parede de titânio
-block.titanium-wall-large.name = Parede de titânio grande
-block.plastanium-wall.name = Plastanium Wall
-block.plastanium-wall-large.name = Large Plastanium Wall
-block.phase-wall.name = Parede de fase
-block.phase-wall-large.name = Parde de fase grande
-block.thorium-wall.name = Parede de tório
-block.thorium-wall-large.name = Parede de tório grande
+block.copper-wall-large.name = Parede Grande de Cobre
+block.titanium-wall.name = Parede de Titânio
+block.titanium-wall-large.name = Parede Grande de Titânio
+block.plastanium-wall.name = Parede de Plastânio
+block.plastanium-wall-large.name = Parede Grande de Plastânio
+block.phase-wall.name = Parede de Fase
+block.phase-wall-large.name = Parde Grande de Fase
+block.thorium-wall.name = Parede de Tório
+block.thorium-wall-large.name = Parede Grande de tório
 block.door.name = Porta
 block.door-large.name = Porta Grande
 block.duo.name = Dupla
@@ -1052,39 +1675,40 @@ block.scorch.name = Queimada
 block.scatter.name = Dispersão
 block.hail.name = Granizo
 block.lancer.name = Lançador
-block.conveyor.name = Esteira
-block.titanium-conveyor.name = Esteira de Titânio
-block.plastanium-conveyor.name = Plastanium Conveyor
-block.armored-conveyor.name = Esteira Armadurada
-block.armored-conveyor.description = Move os itens com a mesma velocidade das esteiras de titânio, mas tem mais armadura. Não aceita itens dos lados de nada além de outras esteiras.
+block.conveyor.name = Tapete Rolante
+block.titanium-conveyor.name = Tapete de Titânio
+block.plastanium-conveyor.name = Tapete de Plastânio
+block.armored-conveyor.name = Tapete Blindado
 block.junction.name = Junção
 block.router.name = Roteador
 block.distributor.name = Distribuidor
 block.sorter.name = Ordenador
-block.inverted-sorter.name = Inverted Sorter
+block.inverted-sorter.name = Ordenador Invertido
 block.message.name = Mensagem
-block.illuminator.name = Illuminator
-block.illuminator.description = A small, compact, configurable light source. Requires power to function.
+block.reinforced-message.name = Mensagem Reforçada
+block.world-message.name = Mensagem Global
+block.world-switch.name = Interruptor Global
+block.illuminator.name = Iluminador
 block.overflow-gate.name = Portão Sobrecarregado
 block.underflow-gate.name = Portão Desobrecarregado
-block.silicon-smelter.name = Fundidora de silicio
+block.silicon-smelter.name = Fundidora de Silício
 block.phase-weaver.name = Palheta de fase
 block.pulverizer.name = Pulverizador
-block.cryofluid-mixer.name = Misturador de Crio Fluido
-block.melter.name = Aparelho de fusão
+block.cryofluid-mixer.name = Misturador de Criofluido
+block.melter.name = Fundidor
 block.incinerator.name = Incinerador
-block.spore-press.name = Prensa de Esporo
+block.spore-press.name = Prensa de Esporos
 block.separator.name = Separador
-block.coal-centrifuge.name = Centrifuga de carvão
-block.power-node.name = Célula de energia
-block.power-node-large.name = Célula de energia Grande
-block.surge-tower.name = Torre de surto
-block.diode.name = Battery Diode
+block.coal-centrifuge.name = Centrifugadora de Carvão
+block.power-node.name = Célula de Energia
+block.power-node-large.name = Célula de Energia Grande
+block.surge-tower.name = Torre de Surto
+block.diode.name = Díodo de bateria
 block.battery.name = Bateria
 block.battery-large.name = Bateria Grande
-block.combustion-generator.name = Gerador a combustão
+block.combustion-generator.name = Gerador a Combustão
 block.steam-generator.name = Gerador de Turbina
-block.differential-generator.name = Gerador diferencial
+block.differential-generator.name = Gerador Diferencial
 block.impact-reactor.name = Reator De Impacto
 block.mechanical-drill.name = Broca Mecânica
 block.pneumatic-drill.name = Broca Pneumática
@@ -1093,12 +1717,12 @@ block.water-extractor.name = Extrator de água
 block.cultivator.name = Cultivador
 block.conduit.name = Cano
 block.mechanical-pump.name = Bomba Mecânica
-block.item-source.name = Criador de itens
-block.item-void.name = Destruidor de itens
-block.liquid-source.name = Criador de líquidos
-block.liquid-void.name = Liquid Void
-block.power-void.name = Anulador de energia
-block.power-source.name = Criador de energia
+block.item-source.name = Criador de Itens
+block.item-void.name = Destruidor de Itens
+block.liquid-source.name = Criador de Líquidos
+block.liquid-void.name = Destruidor de Líquidos
+block.power-void.name = Destruidor de Energia
+block.power-source.name = Criador de Energia
 block.unloader.name = Descarregador
 block.vault.name = Cofre
 block.wave.name = Onda
@@ -1106,129 +1730,403 @@ block.tsunami.name = Tsunami
 block.swarmer.name = Enxame
 block.salvo.name = Salvo
 block.ripple.name = Ondulação
-block.phase-conveyor.name = Esteira de Fases
-block.bridge-conveyor.name = Esteira-Ponte
+block.phase-conveyor.name = Tapete de Fase
+block.bridge-conveyor.name = Tapete-Ponte
 block.plastanium-compressor.name = Compressor de Plastânio
 block.pyratite-mixer.name = Misturador de Piratita
 block.blast-mixer.name = Misturador de Explosão
 block.solar-panel.name = Painel Solar
 block.solar-panel-large.name = Painel Solar Grande
-block.oil-extractor.name = Extrator de petróleo
-block.repair-point.name = Ponto de Reparo
+block.oil-extractor.name = Extrator de Petróleo
+block.repair-point.name = Ponto de Reparação
+block.repair-turret.name = Torre de Reparação
 block.pulse-conduit.name = Cano de Pulso
-block.plated-conduit.name = Plated Conduit
+block.plated-conduit.name = Cano Revestido
 block.phase-conduit.name = Cano de Fase
 block.liquid-router.name = Roteador de Líquido
 block.liquid-tank.name = Tanque de Líquido
+block.liquid-container.name = Contentor de Líquido
 block.liquid-junction.name = Junção de Líquido
-block.bridge-conduit.name = Cano Ponte
-block.rotary-pump.name = Bomba Rotatória
+block.bridge-conduit.name = Cano-Ponte
+block.rotary-pump.name = Bomba Rotativa
 block.thorium-reactor.name = Reator a Tório
 block.mass-driver.name = Drive de Massa
 block.blast-drill.name = Broca de Explosão
-block.thermal-pump.name = Bomba térmica
+block.impulse-pump.name = Bomba Térmica
 block.thermal-generator.name = Gerador Térmico
-block.alloy-smelter.name = Fundidora de Liga
+block.surge-smelter.name = Fundidora de Liga
 block.mender.name = Reparador
-block.mend-projector.name = Projetor de reparo
-block.surge-wall.name = Parede de liga de surto
-block.surge-wall-large.name = Parede de liga de surto grande
+block.mend-projector.name = Projetor de Reparo
+block.surge-wall.name = Parede de Liga de Surto
+block.surge-wall-large.name = Parede Grande de Liga de Surto
 block.cyclone.name = Ciclone
-block.fuse.name = Fundir
+block.fuse.name = Fusível
 block.shock-mine.name = Mina de Choque
-block.overdrive-projector.name = Projetor de sobrecarga
-block.force-projector.name = Projetor de campo de força
+block.overdrive-projector.name = Projetor de Sobrecarga
+block.force-projector.name = Projetor de Campo de Força
 block.arc.name = Arco Elétrico
 block.rtg-generator.name = Gerador GTR
-block.spectre.name = Espectro
+block.spectre.name = Espetro
 block.meltdown.name = Fusão
 block.foreshadow.name = Foreshadow
-block.container.name = Contâiner
-block.launch-pad.name = Plataforma de lançamento
-block.launch-pad-large.name = Plataforma de lançamento grande
+block.container.name = Contentor
+block.launch-pad.name = Plataforma de Lançamento
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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.ground-factory.name = Fábrica Terrestre
+block.air-factory.name = Fábrica Aérea
+block.naval-factory.name = Fábrica Naval
+block.additive-reconstructor.name = Reconstrutor Aditivo
+block.multiplicative-reconstructor.name = Reconstrutor Multiplicador
+block.exponential-reconstructor.name = Reconstrutor Exponencial
+block.tetrative-reconstructor.name = Reconstrutor Tetrativo
+block.payload-conveyor.name = Tapete de Carga
+block.payload-router.name = Roteador de Carga
+block.duct.name = Conduta
+block.duct-router.name = Roteador de Conduta
+block.duct-bridge.name = Ponte de Conduta
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Destruidor de Carga
+block.payload-source.name = Criador de Carga
+block.disassembler.name = Desmontador
 block.silicon-crucible.name = Silicon Crucible
-block.overdrive-dome.name = Overdrive Dome
+block.overdrive-dome.name = Domo de Sobrecarga
+block.interplanetary-accelerator.name = Acelerador Interplanetário
+block.constructor.name = Construtor
+block.constructor.description = Produz estruturas com tamanho até 2x2 blocos.
+block.large-constructor.name = Construtor Grande
+block.large-constructor.description = Produz estruturas com tamanho até 4x4 blocos.
+block.deconstructor.name = Desconstrutor
+block.deconstructor.description = Desconstrói estruturas e unidades. Recupera 100% do custo de produção.
+block.payload-loader.name = Carregador de Carga
+block.payload-loader.description = Carrega itens e líquidos em blocos.
+block.payload-unloader.name = Descarregador de Carga
+block.payload-unloader.description = Descarrega líquidos e itens de blocos.
+block.heat-source.name = Fonte de Calor
+block.heat-source.description = Um bloco de tamanho 1x1 que gera virtualmente calor infinito.
+block.empty.name = Vazio
 
-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
+#Erekir
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Zona de Núcleo
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolizador
+block.atmospheric-concentrator.name = Concentrador Atmosférico
+block.oxidation-chamber.name = Câmara de Oxidação
+block.electric-heater.name = Aquecedor Elétrico
+block.slag-heater.name = Aquededor de Escória
+block.phase-heater.name = Aquecedor de Fase
+block.heat-redirector.name = Redirecionador de Calor
+block.small-heat-redirector.name = Redirecionador de Calor Pequeno
+block.heat-router.name = Roteador de Calor
+block.slag-incinerator.name = Incinerador de Escória
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Centrifugador de Escória
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Sintetizador de Cianogénio
+block.phase-synthesizer.name = Sintetizador de Fase
+block.heat-reactor.name = Reator de Calor
+block.beryllium-wall.name = Parede de Berílio
+block.beryllium-wall-large.name = Parede Grande de Berílio
+block.tungsten-wall.name = Parede de Tungsténio
+block.tungsten-wall-large.name = Parede Grande de Tungsténio
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Parede de Carbide
+block.carbide-wall-large.name = Parede Grande de Carbide
+block.reinforced-surge-wall.name = Parede de Surto Reforçadd
+block.reinforced-surge-wall-large.name = Parede Grande de Surto Reforçado
+block.shielded-wall.name = Parede Blindada
+block.radar.name = Radar
+block.build-tower.name = Torre de Construção
+block.regen-projector.name = Projetor de Regeneração
+block.shockwave-tower.name = Torre de Ondas de Choque
+block.shield-projector.name = Projetor de Escudo
+block.large-shield-projector.name = Projetor de Escudo Grande
+block.armored-duct.name = Conduta Blindada
+block.overflow-duct.name = Conduta de Sobrecarga
+block.underflow-duct.name = Conduta de Desobrecarga
+block.duct-unloader.name = Descarregador de Conduta
+block.surge-conveyor.name = Tapete de Surto
+block.surge-router.name = Roteador de Surto
+block.unit-cargo-loader.name = Carregador de Carga de Unidades
+block.unit-cargo-unload-point.name = Ponto de Descarregamento de Carga de Unidades
+block.reinforced-pump.name = Bomba Reforçada
+block.reinforced-conduit.name = Conduta Reforçada
+block.reinforced-liquid-junction.name = Junção de Líquido Reforçada
+block.reinforced-bridge-conduit.name = Ponte de Conduta Reforçada
+block.reinforced-liquid-router.name = Roteador de Líquido Reforçado
+block.reinforced-liquid-container.name = Contentor de Líquido Reforçado
+block.reinforced-liquid-tank.name = Tanque de Líquido Reforçado
+block.beam-node.name = Nó de Feixe
+block.beam-tower.name = Torre de Feixe
+block.beam-link.name = Conector de Feixe
+block.turbine-condenser.name = Condensador de Turbina
+block.chemical-combustion-chamber.name = Câmara de Combustão Química
+block.pyrolysis-generator.name = Gerador de Pirólise
+block.vent-condenser.name = Condensador de Ventilação
+block.cliff-crusher.name = Destruidor de Arribas
+block.large-cliff-crusher.name = Destruidor de Arribas Grande
+block.plasma-bore.name = Mineradora de Plasma
+block.large-plasma-bore.name = Mineradora Grande de Plasma
+block.impact-drill.name = Broca de Impacto
+block.eruption-drill.name = Broca de Erupção
+block.core-bastion.name = Bastião do Núcleo
+block.core-citadel.name = Citadela do Núcleo
+block.core-acropolis.name = Acrópole do Núcleo
+block.reinforced-container.name = Contentor Reforçado
+block.reinforced-vault.name = Cofre Reforçado
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Refabricador de Tanque
+block.mech-refabricator.name = Refabricador de Mech
+block.ship-refabricator.name = Refabricador de Nave
+block.tank-assembler.name = Montador de Tanque
+block.ship-assembler.name = Montador de Nave
+block.mech-assembler.name = Montador de Mech
+block.reinforced-payload-conveyor.name = Tapete de Carga Reforçado
+block.reinforced-payload-router.name = Roteador de Carga Reforçado
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Desconstrutor Pequeno
+block.canvas.name = Tela
+block.world-processor.name = Processador Global
+block.world-cell.name = Célula Global
+block.tank-fabricator.name = Fabricador de Tanque
+block.mech-fabricator.name = Fabricador de Mech
+block.ship-fabricator.name = Fabricador de Nave
+block.prime-refabricator.name = Refabricador Princial
+block.unit-repair-tower.name = Torre de Reparação de Unidades
+block.diffuse.name = Difusor
+block.basic-assembler-module.name = Módulo Básico de Montagem
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Reator de Fluxo
+block.neoplasia-reactor.name = Reator de Neoplasma
 
-team.blue.name = Azul
-team.crux.name = Vermelho
-team.sharded.name = orange
-team.orange.name = Laranja
-team.derelict.name = derelict
+block.switch.name = Interruptor
+block.micro-processor.name = Microprocessador
+block.logic-processor.name = Processador Lógico
+block.hyper-processor.name = Hiper-processador
+block.logic-display.name = Ecrã Lógico
+block.large-logic-display.name = Ecrã Lógico Grande
+block.memory-cell.name = Célula de Memória
+block.memory-bank.name = Banco de Memória
+team.malis.name = Malis
+team.crux.name = Vermelho (Crux)
+team.sharded.name = Laranja (Sharded)
+team.derelict.name = Derelict
 team.green.name = Verde
-team.purple.name = Roxo
+team.blue.name = Azul
 
-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
-tutorial.drill = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nColoque uma num veio de cobre.
-tutorial.drill.mobile = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nToque na aba de brocas no canto inferior direito.\nSelecione a[accent] broca mecânica[].\nToque em um veio de cobre para colocá-la, então pressione a[accent] marca de verificação[] abaixo para confirmar sua seleção.\nPressione o[accent] botão "X"[] para cancelar o posicionamento.
-tutorial.blockinfo = Cada bloco tem diferentes status. Cada broca pode extrair certos minérios.\nPara checar as informações e os status de um bloco,[accent] toque o botão "?" enquanto o seleciona no menu de construção.[]\n\n[accent]Acesse os status da broca mecânica agora.[]
-tutorial.conveyor = [accent]Esteiras[] São usadas para transportar itens até o núcleo.\nFaça uma linha de Esteiras da mineradora até o núcleo.
-tutorial.conveyor.mobile = [accent]Esteiras[] são usadas para transportar itens até o núcleo.\nFaça uma linha de esteiras da broca até o núcleo.\n[accent] Coloque uma linha segurando por alguns segundos[] e arrastando em uma direção.\n\n[accent]{0}/{1} esteiras postas em linha\n[accent]0/1 itens entregues
-tutorial.turret = Estruturas defensivas devem ser construidas para repelir[lightgray] o inimigo[].\nConstrua uma torre dupla perto de sua base.
-tutorial.drillturret = Torretas duplas precisam de[accent] cobre[] como munição para atirar.\nColoque uma broca próxima à torre para carregá-la com o cobre minerado.
-tutorial.pause = Durante uma batalha, você pode[accent] pausar o jogo.[]\nVocê pode enfileirar construções enquanto o jogo está pausado.\n\n[accent]Pressione a barra de espaço para pausar.
-tutorial.pause.mobile = Durante uma batalha, você pode[accent] pausar o jogo.[]\nVocê pode enfileirar construções enquanto o jogo está pausado.\n\n[accent]Pressione este botão no canto superior direito para pausar.
-tutorial.unpause = Agora pressione novamente a barra de espaço para despausar.
-tutorial.unpause.mobile = Agora pressione novamente para despausar.
-tutorial.breaking = Blocos precisam frequentemente ser destruídos.\n[accent]Segure e arraste o botão direito[] para destruir todos os blocos em uma seleção.[]\n\n[accent]Destrua todos esses blocos de sucata à esquerda do seu núcleo usando a seleção em área.
-tutorial.breaking.mobile = Blocos precisam frequentemente ser destruídos.\n[accent]Selecione o modo de destruição (ícone de martelo)[], e toque em um bloco para começar a quebrar.\nDestrua uma área segurando seu dedo por alguns segundos[] e arrastando em uma direção.\nPressione o botão de "visto" para confirmar a destruição.\n\n[accent]Destrua todos esses blocos de sucata à esquerda do seu núcleo usando a seleção em área.
-tutorial.withdraw = Em algumas situações é necessário pegar itens diretamente do bloco.\nPara fazer isto, [accent]toque em um bloco[] com itens e [accent]toque no item[] no inventário.\nMúltiplos itens podem ser removidos [accent]ao segurar[].\n\n[accent]Tire um pouco de cobre do núcleo.[]
-tutorial.deposit = Deposite itens em blocos arrastando da sua nave até o bloco.\n\n[accent]Deposite seu cobre de volta no núcleo.[]
-tutorial.waves = O[lightgray] inimigo[] se aproxima.\n\nDefenda seu núcleo por 2 hordas. Construa mais torretas.
-tutorial.waves.mobile = O[lightgray] inimigo[] se aproxima.\n\nDefenda seu núcleo por 2 hordas. Seu drone vai atirar nos inimigos automaticamente.\nConstrua mais torretas e brocas. Minere mais cobre.
-tutorial.launch = Quando você atinge uma horda específica, Você é capaz de[accent] lançar o núcleo[], deixando suas defesas para trás e[accent] obtendo todos os recursos em seu núcleo.[]\nEstes recursos podem ser usados para pesquisar novas tecnologias.\n\n[accent]Pressione o botão lançar.
+hint.skip = Saltar
+hint.desktopMove = Usa [accent][[WASD][] para mover.
+hint.zoom = [accent]Scroll[] para aumentar/diminuir zoom.
+hint.desktopShoot = [accent][[Botão esquerdo do rato][] para atirar.
+hint.depositItems = Para transferir itens, arrasta da tua nave para o núcleo.
+hint.respawn = Para renascer como nave, pressiona [accent][[V][].
+hint.respawn.mobile = Trocaste os controlos para uma unidade/estrutura. Para renascer como nave, [accent]toca no avatr no canto sup. esq.[]
+hint.desktopPause = Pressiona [accent][[Espaço][] para pausar/retomar o jogo.
+hint.breaking = Usa o [accent]botão direito do rato[] e arrasta.
+hint.breaking.mobile = Ativa o \ue817 [accent]martelo[] em baixo à direita e clica para partir blocos.\n\nMantém o teu dedo permido por um seg. e arrasta para partir uma seleção.
+hint.blockInfo = Vê as informações sobre um bloco ao selecioná-lo no [accent]menu de construção[], e depois selecionar o botão [accent][[?][] à direita.
+hint.derelict = Estruturas [accent]Derelict[] são restos quebrados de bases antigas que já não funcionam.\n\nEssas estruturas podem ser [accent]desconstruídas[] para ganhar recursos.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Usa o botão de \ue875 [accent]Pesquisa[] para pesquisar novas tecnologias.
+hint.unitControl = Segura a tecla [accent][[ctrl esq.][] e [accent]click[] para controlar unidades ou torres aliadas.
+hint.unitControl.mobile = [accent][[Toca duas vezes][] para controlar unidades ou torres aliadas.
+hint.unitSelectControl = Para controlar unidades, entra no [accent]modo de comando[] segurando [accent]Shift esquerdo.[]\nEnquanto no modo de comando, clica e segura pra selecionar unidades. Clica com o [accent]Botão direito[] nalgum lugar ou alvo para mandar as unidades para lá.
+hint.unitSelectControl.mobile = Para controlar unidades, entra no [accent]modo de comando[] segurando o botão de [accent]comando[] no canto inf. esq.\nEnquanto no modo de comando, segura e arrasta pra selecionar unidades. Toque nalgum lugar ou alvo para mandar as unidades para lá.
+hint.launch = Quando forem recolhidos recursos suficientes, podes [accent]Lançar[] ao selecionar setores próximos a partir do \ue827 [accent]Mapa[] no canto inferior direito.
+hint.launch.mobile = Quando forem recolhidos recursos suficientes, podes [accent]Lançar[] ao selecionar setores próximos a partir do \ue827 [accent]Mapa[] no \ue88c [accent]Menu[].
+hint.schematicSelect = Segura a tecla [accent][[F][] e arrasta para selecionar blocos para copiar e colar.\n\n[accent][[Clique do meiro][] para copiar um bloco só.
+hint.rebuildSelect = Segura a tecla [accent][[B][] e arrasta para selecionar blocos destruídos.\nIsto irá reconstruí-los automaticamente.
+hint.rebuildSelect.mobile = Prime o \ue874 botão de copiar, e depois o botão de \ue80f reonstruir e arrasta para selecionar os planos de blocos destruídos.\nIsto irá reconstruí-los automaticamente.
+hint.conveyorPathfind = Segura a tecla [accent][[Ctrl Esq][] enquanto desenhas os tapetes para gerar automaticamente um caminho.
+hint.conveyorPathfind.mobile = Ativa o \ue844 [accent]modo diagonal[] e desenha os tapetes para gerar automaticamente um caminho.
+hint.boost = Segura a tecla [accent][Shift Esq][] para voar sobre obstáculos com a tua unidade.\n\nApenas algumas unidades terrestres têm propulsores.
+hint.payloadPickup = Prime [accent][[[] para pegar pequenos blocos e unidades.
+hint.payloadPickup.mobile = [accent]Toca e segura[] para pegar pequenos blocos ou unidades.
+#Translations beyond this point is pt_BR. When I'll have time I will rewrite them to pt_PT
+hint.payloadDrop = Pressione [accent]][] para soltar a carga.
+hint.payloadDrop.mobile = [accent]Toque e segure[] em um local vazio para soltar ali a carga.
+hint.waveFire = Torretas [accent]Onda[] com munição de água vão apagar automaticamente incêndios próximos.
+hint.generator = \uf879 [accent]Geradores a Combustão[] queimam carvão e transmitem energia aos blocos ao lado.\n\nO alcance da transmissão de energia pode ser aumentado com \uf87f [accent]Células de Energia[].
+hint.guardian = Unidades [accent]Guardião[] são blindadas. Munições fracas como [accent]Cobre[] e [accent]Chumbo[] são [scarlet]não efetivas[].\n\nUse torretas melhores ou \uf835 [accent]Grafite[] \uf861Duo/\uf859Salvo como munição para derrotar Guardiões.
+hint.coreUpgrade = Núcleos podem ser melhorados [accent]colocando núcelos melhores sobre eles[].\n\nColoque uma \uf868 [accent]Fundação do Núcleo[] sobre o \uf869 [accent]Fragmento do Núcleo[]. Tenha certeza de que está livre de obstruções próximas.
+hint.presetLaunch = [accent]Zona de setores[] cinzas, como a [accent]Floresta Congelada[], podem ser lançadas de qualquer lugar. Elas não precisam da captura de território próximo.\n\n[accent]Setores numerados[], como esse aqui, são [accent]opcionais[].
+hint.presetDifficulty = Esse setor tem um [scarlet]alto nível de ameaça inimiga[].\nIr para esse setores [accent]não é recomendado[] sem ter tecnologia e preparação adequadas.
+hint.coreIncinerate = Depois que o núcleo ter recebido até a capacidade máxima de um item, qualquer item do mesmo tipo que ele receber será [accent]incinerado[].
+hint.factoryControl = Para definir a [accent]o local de saída[] de uma fábrica de unidades, clique em uma fábrica enquanto estiver no modo de comando, depois clique com o botão direito em um local.\nAs unidades produzidas por ela se moverão automaticamente para lá.
+hint.factoryControl.mobile = Para definir a [accent]o local de saída[] de uma fábrica de unidades, toque em uma fábrica enquanto estiver no modo de comando, depois toque em um local.\nAs unidades produzidas por ela se moverão automaticamente para lá.
 
+gz.mine = Vá para perto do \uf8c4 [accent]minério de cobre[] no chão e clique para começar a minerar.
+gz.mine.mobile = Vá para perto do \uf8c4 [accent]minério de cobre[] no chão e toque nele para começar a minerar.
+gz.research = Abra a \ue875 árvore tecnológica.\nPesquise a \uf870 [accent]Broca mecânica[], Depois selecione-a pelo menu no canto inferior direito.\nClique no cobre para coloca-la.
+gz.research.mobile = Abra a \ue875 árvore tecnológica.\nPesquise a \uf870 [accent]Broca mecânica[], Depois selecione-a pelo menu no canto inferior direito.\nClique no cobre para colocá-la.\n\nPressione a \ue800 [accent]confirmação[] no canto inferior direito para confirmar.
+gz.conveyors = Pesquise e coloque \uf896 [accent]esteiras[] para mover os recursos minerados\ndas brocas para o núcleo.\n\nClique e arraste para pôr multiplas esteiras.\n[accent]Scroll[] para rotacionar.
+gz.conveyors.mobile = Pesquise e coloque \uf896 [accent]esteiras[] para mover os recursos minerados\ndas brocas para o núcleo.\n\nSegure por um segundo e arraste para colocar múltiplas esteiras.
+gz.drills = Expanda a mineração.\nColoque mais Brocas Mecânicas.\nMinere 100 cobres.
+gz.lead = \uf837 [accent]Chumbo[] é outro recurso comumente usado.\nColoque brocas para minerar chumbo.
+gz.moveup = \ue804 Vá para cima para outros objetivos.
+gz.turrets = Pesquise e coloque 2 torretas \uf861 [accent]Duo[] para defender o núcleo.\ntorretas Duo requerem \uf838 [accent]munição[] de esteiras.
+gz.duoammo = Abasteça as torretas Duo com [accent]cobre[], usando esteiras.
+gz.walls = [accent]Muros[] podem previnir danos recebidos de atingir as construções.\nColoque \uf8ae [accent]muros de cobre[] em volta das torretas.
+gz.defend = Inimigos vindo, prepare-se para defender.
+gz.aa = Unidades flutuantes não podem ser destruidas facilmente por torretas comuns.\nTorretas\uf860 [accent]Scatter[] Proveem ótima defesa aérea, mas requerem \uf837 [accent]chumbo[] como munição.
+gz.scatterammo = Abasteça a torreta Scatter com [accent]chumbo[], usando esteiras.
+gz.supplyturret = [accent]Abasteça a torreta
+gz.zone1 = Essa é a zona de spawn inimigo.
+gz.zone2 = Qualquer coisa construida nesta área será destruida quando uma horda começar.
+gz.zone3 = Uma horda vai começar agora\nSe prepare.
+gz.finish = Construa mais torretas, minere mais recursos,\ne se defenda de todas as hordas para [accent]capturar o setor[].
+
+onset.mine = Clique para minerar \uf748 [accent]berílio[] das paredes.\n\nUse [accent][[WASD] para se mover.
+onset.mine.mobile = Toque para minerar \uf748 [accent]berílio[] das paredes.
+onset.research = Abra a \ue875 árvore tecnológica.\nPesquise, e então coloque um \uf73e [accent]Condensador de Turbina[] na ventilação.\nIsso vai gerar [accent]energia[].
+onset.bore = Pesquise e coloque uma \uf741 [accent]Mineradora de Plasma[].\nEla minera recursos das paredes automaticamente.
+onset.power = Para[accent]alimentar[] a Mineradora de Plasma, pesquise e coloque uma \uf73d [accent]Célula de Feixe[].\nConecte o condensador de turbina ao minerador de plasma.
+onset.ducts = Pesquise e coloque \uf799 [accent]dutos[] para mover recursos minerados da mineradora de plasma para o núcleo.\nClique e segure para colocar múltiplos dutos.\n[accent]Scroll[] para rotacionar.
+onset.ducts.mobile = Pesquise e coloque \uf799 [accent]dutos[] para mover recursos minerados da mineradora de plasma para o núcleo.\n\nSegure por um segundo e arraste para colocar múltiplos dutos.
+onset.moremine = Expanda a mineração.\nColoque mais Mineradoras de Plasma, use as Células de Feixe e dutos para isso.\nMinere 200 berílios.
+onset.graphite = Blocos mais complexos requerem \uf835 [accent]grafite[].\nColoque Mineradoras de Plasma para minerar grafite.
+onset.research2 = Comece a pesquisar [accent]fábricas[].\nPesquise o \uf74d [accent]Esmagador de Penhasco[] e o \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = O arc furnace precisa de \uf834 [accent]areia[] e \uf835 [accent]grafite[] para criar \uf82f [accent]silício[].\n[accent]Energia[] também é necessária.
+onset.crusher = Use o \uf74d [accent]Esmagador de Areia[] para minerar areia.
+onset.fabricator = Use [accent]unidades[] para explorar o mapa, defender construções e atacar o inimigo. Pesquise e coloque um \uf6a2 [accent]Fabricador de Tanques[].
+onset.makeunit = Produza uma unidade.\nUse o botão "?" para ver os requisitos da fábrica selecionada.
+onset.turrets = Unidades são efetivas, mas [accent]torretas[] proveem melhores capacidades defensivas se usadas efetivamente.\nColoque uma torreta \uf6eb [accent]Breach[].\nTorretas requerem \uf748 [accent]munição[].
+onset.turretammo = Abasteça a torreta com [accent]munição de berílio.[]
+onset.walls = [accent]Muros[] podem previnir danos recebidos de atingir as construções.\nColoque \uf6ee [accent]muros de berílio[] em volta das torretas.
+onset.enemies = Inimigo vindo, se prepare.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = O inimigo está vulnerável. Contra ataque.
+onset.cores = Novos núcleos podem ser colocados em [accent]ladrilhos de núcleo[].\nNovos núcleos funcionam como bases avançadas e compartilham seus recursos com outros núcleos.\nColoque um \uf725 núcleo.
+onset.detect = O inimigo poderá te detectar em 2 minutos.\nConstrua defesas, mineração e produção.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
+
+#Serpulo
 item.copper.description = O material mais básico. Usado em todos os tipos de blocos.
+item.copper.details = Cobre. Metal anormalmente abundante em Serpulo. Estruturalmente fraco a não ser que seja reforçado.
 item.lead.description = Material de começo basico. usado extensivamente em blocos de transporte de líquidos e eletrônicos.
+item.lead.details = Denso. Inerte. Extensivamente usado em baterias.\nObservação: Provavelmente tóxico para formas de vida biológica. Não que tenha muito restando aqui.
 item.metaglass.description = Composto de vidro super resistente. Extensivamente usado para distribuição e armazenagem de líquidos.
 item.graphite.description = Carbono mineralizado, usado como munição e para isolação elétrica.
 item.sand.description = Um material comum que é usado extensivamente em derretimento, tanto em ligas como em fluxo.
 item.coal.description = Matéria vegetal fossilizada, formada muito depois de semeada. Usado extensivamente para produção de combustível e recursos.
+item.coal.details = Parece ser matéria vegetal fossilizada, formada muito antes do evento da semeadura.
 item.titanium.description = Um material raro super leve usado extensivamente no transporte de líquidos, em brocas e drones aéreos.
 item.thorium.description = Um metal denso e radioativo, Usado como suporte material e combustivel nuclear.
 item.scrap.description = Pedaços remanescentes de estruturas e unidades destruidas. Contem traços de diferentes metais.
+item.scrap.details = Pedaços restantes de estruturas e unidades destruidas. Contém traços de diferentes metais.
 item.silicon.description = Condutor extremamente importante, com aplicação em paineis solares e aparelhos complexos.
 item.plastanium.description = Material leve e maleável usado em drones aéreos avançados e como munição de fragmentação.
 item.phase-fabric.description = Uma substância quase sem peso usada em eletrônica avançada e tecnologia de auto-reparo.
 item.surge-alloy.description = Uma liga avançada com propriedades elétricas únicas.
 item.spore-pod.description = Uma cápsula de esporos sintéticos, sintetizada de concentrações atmosféricas para propósitos industriais. Usada para conversão em petróleo, explosivos e combustíveis.
+item.spore-pod.details = Esporos. Provavelmente uma forma de vida sintética. Emite gases tóxicos para outras formas de vida biológica. Extremamente invasivo. Altamente inflamável em certas condições.
 item.blast-compound.description = Um composto instável usado em bombas e em explosivos. Sintetizado de cápsulas de esporos e outras substâncias voláteis. Uso como combustível não é recomendado.
 item.pyratite.description = Substância extremamente inflamável usada em armas incendiárias.
+
+#Erekir
+item.beryllium.description = Usado em muitos tipos de construção e munição em Erekir.
+item.tungsten.description = Utilizado em brocas, armaduras e munições. Necessário na construção de estruturas mais avançadas.
+item.oxide.description = Utilizado como condutor de calor e isolante para energia.
+item.carbide.description = Utilizado em estruturas avançadas, unidades mais pesadas e munições.
+
+#Serpulo
 liquid.water.description = O líquido mais útil, comumente usado em resfriamento de máquinas e no processamento de lixo. Dá pra beber, também.
 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.
 
+#Erekir
+liquid.arkycite.description = Utilizado em reações químicas para geração de energia e síntese de materiais.
+liquid.ozone.description = Utilizado como agente oxidante na produção de material e como combustível. Moderadamente explosivo.
+liquid.hydrogen.description = Utilizado na extração de recursos, produção de unidades e reparo de estruturas. Inflamável.
+liquid.cyanogen.description = Utilizado para munição, construção de unidades avançadas e várias reações em blocos avançados. Altamente inflamável.
+liquid.nitrogen.description = Utilizado na extração de recursos, criação de gás e produção de unidades. Inerte.
+liquid.neoplasm.description = Um subproduto biológico perigoso do reator de Neoplasia. Espalha-se rapidamente para qualquer bloco adjacente contendo água que ele toque, danificando-os no processo. Viscoso.
+liquid.neoplasm.details = Neoplasma. Uma massa incontrolável de células sintéticas de rápida divisão com uma consistência semelhante à de lama. Resistente ao calor. Extremamente perigoso para qualquer estrutura que envolva água.\n\nMuito complexo e instável para análise padrão. Potenciais aplicações desconhecidas. Recomenda-se a incineração em piscinas de escória.
+
+#Serpulo
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Move os itens com a mesma velocidade das esteiras de titânio, mas tem mais armadura. Não aceita itens dos lados de nada além de outras esteiras.
+block.illuminator.description = Uma fonte de luz pequena, configurável e compacta. Precisa de energia para funcionar.
 block.message.description = Armazena uma mensagem. Usado para comunicação entre aliados.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = 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.
 block.silicon-smelter.description = Reduz areia com carvão puro. Produz silício silicio.
 block.kiln.description = Derrete chumbo e areia no composto conhecido como metavidro. Requer pequenas quantidades de energia.
 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.surge-smelter.description = Combina titânio, chumbo, silicio e cobre para produzir liga de surto.
 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
@@ -1243,19 +2141,25 @@ block.power-source.description = Infinitivamente da energia. Apenas caixa de are
 block.item-source.description = Infinivamente da itens. Apenas caixa de areia.
 block.item-void.description = Destroi qualquer item que entre sem requerir energia. Apenas caixa de areia.
 block.liquid-source.description = Infinitivamente da Liquidos. Apenas caixa de areia.
-block.liquid-void.description = Removes any liquids. Sandbox only.
+block.liquid-void.description = Destrói qualquer líquido que entrar. Apenas no modo sandbox.
+block.payload-source.description = Produz cargas infinitamete. Apenas sandbox.
+block.payload-void.description = Destrói qualquer carga. Apenas.
 block.copper-wall.description = Um bloco defensivo e barato.\nUtil para proteger o núcleo e torretas no começo.
 block.copper-wall-large.description = Um bloco defensivo e barato.\nUtil para proteger o núcleo e torretas no começo.\nOcupa múltiplos blocos.
 block.titanium-wall.description = Um bloco defensivo moderadamente forte.\nProvidencia defesa moderada contra inimigos.
 block.titanium-wall-large.description = Um bloco defensivo moderadamente forte.\nProvidencia defesa moderada contra inimigos.\nOcupa múltiplos blocos.
-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.plastanium-wall.description = Um tipo especial de muro que absorve arcos elétricos e bloqueia conexões automáticas de células de energia.
+block.plastanium-wall-large.description = Um tipo especial de muro que absorve arcos elétricos e bloqueia conexões automáticas de células de energia.\nOcupa múltiplos blocos.
 block.thorium-wall.description = Um bloco defensivo forte.\nBoa proteção contra inimigos.
 block.thorium-wall-large.description = Um bloco grande e defensivo.\nBoa proteção contra inimigos.\nOcupa multiplos blocos.
 block.phase-wall.description = Um muro revestido com um composto especial baseado em tecido de fase. Desvia a maioria das balas no impacto.
 block.phase-wall-large.description = Um muro revestido com um composto especial baseado em tecido de fase. Desvia a maioria das balas no impacto.\nSOcupa múltiplos blocos.
 block.surge-wall.description = Um bloco defensivo extremamente durável.\nSe carrega com eletricidade no contato com as balas, soltando-s aleatoriamente.
 block.surge-wall-large.description = Um bloco defensivo extremamente durável.\nSe carrega com eletricidade no contato com as balas, soltando-s aleatoriamente.\nOcupa multiplos blocos.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Uma pequeda porta. Pode ser aberta e fechada ao tocar.
 block.door-large.description = Uma grande porta. Pode ser aberta e fechada ao tocar.\nOcupa múltiplos blocos.
 block.mender.description = Periodicamente repara blocos vizinhos. Mantem as defesas reparadas em e entre ondas.\nPode usar silício para aumentar o alcance e a eficiência.
@@ -1265,24 +2169,26 @@ block.force-projector.description = Cria um campo de forca hexagonal em volta de
 block.shock-mine.description = Danifica inimigos em cima da mina. Quase invisivel ao inimigo.
 block.conveyor.description = Bloco de transporte de item basico. Move os itens a frente e os deposita automaticamente em torretas ou construtores. Rotacionavel.
 block.titanium-conveyor.description = Bloco de transporte de item avançado. Move itens mais rapidos que esteiras padrões.
-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 = Transporta os itens para frente em lotes. Aceita itens na parte de trás, e os descarrega em três direções na frente. Requer múltiplos pontos de carga e descarga para o pico de produção.
 block.junction.description = Funciona como uma ponte Para duas esteiras que estejam se cruzando. Util em situações que tenha duas esteiras diferentes carregando materiais diferentes para lugares diferentes.
 block.bridge-conveyor.description = Bloco de transporte de itens avancado. Possibilita o transporte de itens acima de 3 blocos de construção ou paredes.
 block.phase-conveyor.description = Bloco de transporte de item avançado. Usa energia para teleportar itens a uma esteira de fase sobre uma severa distancia.
-block.sorter.description = [interact]Aperte no bloco para configurar[]
-block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
+block.sorter.description = Se um item de entrada corresponde à seleção, ele passa para frente. Caso contrário, o item é enviado para a esquerda ou para a direita.
+block.inverted-sorter.description = Semelhante a um ordenador padrão, mas os itens selecionados vão para os lados.
 block.router.description = Aceita itens de uma direção e os divide em 3 direções igualmente. Util para espalhar materiais da fonte para multiplos alvos.
+block.router.details = Um mal necessário. Usar próximo de entradas de produção não é recomendado, pois ele vai entupir a saída de itens.
 block.distributor.description = Um roteador avancada que espalhas os itens em 7 outras direções igualmente.
 block.overflow-gate.description = Uma combinação de roteador e divisor Que apenas manda para a esquerda e Direita se a frente estiver bloqueada.
 block.underflow-gate.description = O oposto de um portão de transbordamento. Saídas para a frente se os caminhos esquerdo e direito estiverem bloqueados.
 block.mass-driver.description = Bloco de transporte de itens supremo. Coleta itens severos e atira eles em outro mass driver de uma longa distancia.
 block.mechanical-pump.description = Uma bomba barata com baixa saída de líquidos, mas sem consumo de energia.
 block.rotary-pump.description = Uma bomba avançada. Bombeia mais líquido, mas requer energia.
-block.thermal-pump.description = A bomba final.
+block.impulse-pump.description = A bomba final.
 block.conduit.description = Bloco básico de transporte de líquidos. Move líquidos para a frente. Usado em conjunto com bombas e outros canos.
 block.pulse-conduit.description = Bloco avancado de transporte de liquido. Transporta liquidos mais rápido e armazena mais que os canos padrões.
-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.plated-conduit.description = Move líquidos na mesma velocidade que canos de pulso, mas possui blindagem. Não aceita entradas dos lados. Não vaza.
 block.liquid-router.description = Aceita liquidos de uma direcão e os joga em 3 direções igualmente. Pode armazenar uma certa quantidade de liquido. Util para espalhar liquidos de uma fonte para multiplos alvos.
+block.liquid-container.description = Armazena uma grande quantidade de líquido. Joga para todos os lados, de forma semelhante a um roteador de líquido.
 block.liquid-tank.description = Armazena grandes quantidades de liquido. Use quando a demanda de materiais não for constante ou para guardar itens para resfriar blocos vitais.
 block.liquid-junction.description = Age como uma ponte para dois canos que se cruzam. Útil em situações em que há dois cano carregando liquidos diferentes até localizações diferentes.
 block.bridge-conduit.description = Bloco de transporte de liquidos avancados. Possibilita o transporte de liquido sobre 3 blocos acima de construções ou paredes
@@ -1290,33 +2196,40 @@ block.phase-conduit.description = Bloco avancado de transporte de liquido. Usa e
 block.power-node.description = Transmite energia para células conectadas. A célula vai receber energia ou alimentar qualquer bloco adjacente.
 block.power-node-large.description = Uma célula de energia avançada com maior alcance e mais conexões.
 block.surge-tower.description = Uma célula de energia com um extremo alcance mas com menos conexões disponíveis.
-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.diode.description = Movimenta a energia da bateria em uma direção, mas somente se o outro lado tiver menos energia armazenada.
 block.battery.description = Armazena energia em tempos de energia excedente. Libera energia em tempos de déficit.
 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.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.differential-generator.description = Gera grandes quantidades de energia. Utiliza a diferença de temperatura entre o criofluido e a piratita.
 block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos Que não precisa de refriamento Mas da muito menos energia que o reator de torio.
 block.solar-panel.description = Gera pequenas quantidades de energia do sol.
 block.solar-panel-large.description = Da muito mais energia que o painel solar comum, Mas sua produção é mais cara.
 block.thorium-reactor.description = Gera altas quantidades de energia do torio radioativo. Requer resfriamento constante. Vai explodir violentamente Se resfriamento insuficiente for fornecido.
-block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
+block.impact-reactor.description = Um gerador avançado, capaz de criar quantidades enormes de energia em seu poder total. Requer uma entrada significativa de energia ao iniciar.
 block.mechanical-drill.description = Uma broca barata. Quando posto em blocos apropriados, retira itens em um ritmo lento e indefinitavamente.
 block.pneumatic-drill.description = Uma broca improvisada que é mais rápida e capaz de processar materiais mais duros usando a pressão do ar
 block.laser-drill.description = Possibilita a mineração ainda mais rapida usando tecnologia a laser, Mas requer poder adcionalmente torio radioativo pode ser recuperado com essa mineradora
 block.blast-drill.description = A melhor mineradora. Requer muita energia.
 block.water-extractor.description = Extrai água do chão. Use quando não tive nenhum lago proximo
 block.cultivator.description = Cultiva o solo com agua para pegar bio materia.
+block.cultivator.details = Tecnologia recuperada. Costumava produzir quantidades massivas de biomassa o mais eficiente o possível. Provavelmente o primeiro incubador de esporos cobrindo Serpulo agora.
 block.oil-extractor.description = Usa altas quantidades de energia Para extrair oleo da areia. Use quando não tiver fontes de oleo por perto
 block.core-shard.description = Primeira iteração da cápsula do núcleo. Uma vez destruida, o controle da região inteira é perdido. Não deixe isso acontecer.
+block.core-shard.details = A primeira interação. Compacto. Auto-replicante. Equipado com propulsores de lançamento de uso único. Não projetado para viagens interplanetárias.
 block.core-foundation.description = A segunda versão do núcleo. Melhor armadura. Guarda mais recursos.
+block.core-foundation.details = A segunda versão.
 block.core-nucleus.description = A terceira e ultima iteração do núcleo. Extremamente bem armadurada. Guarda quantidades massivas de recursos.
+block.core-nucleus.details = A terceira e última versão.
 block.vault.description = Carrega uma alta quantidade de itens. Usado para criar fontes Quando não tem uma necessidade constante de materiais. Um[lightgray] Descarregador[] pode ser usado para recuperar esses itens do container.
 block.container.description = Carrega uma baixa quantidade de itens. Usado para criar fontes Quando não tem uma necessidade constante de materiais. Um[lightgray] Descarregador[] pode ser usado para recuperar esses itens do container.
 block.unloader.description = Descarrega itens de um container, Descarrega em uma esteira ou diretamente em um bloco adjacente. O tipo de item que pode ser descarregado pode ser mudado clicando no descarregador.
 block.launch-pad.description = Lança montes de itens sem qualquer necessidade de um lançamento de núcleo.
-block.launch-pad-large.description = Uma versão melhorada da plataforma de lançamento. Guarda mais itens. Lança mais frequentemente.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+
 block.duo.description = Uma torre pequena e barata.
 block.scatter.description = Uma torre anti aerea media. Joga montes de cobre ou sucata aos inimigos.
 block.scorch.description = Queima qualquer inimigo terrestre próximo. Altamente efetivo a curta distncia.
@@ -1331,5 +2244,454 @@ 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.foreshadow.description = Dispara um feixe gigante de único alvo a grandes distâncias. Prioriza inimigos com maior vida máxima.
 block.repair-point.description = Continuamente repara a unidade danificada mais proxima.
-block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
+block.segment.description = Destrói projéteis inimigos que se aproximam. Projéteis a laser não serão detectados.
+block.parallax.description = Dispara um feixe de energia que puxa unidades aéreas, danificando-as no processo.
+block.tsunami.description = Lança poderosos jatos de líquido em inimigos. Automaticamente apaga incêndios se for abastecido com água ou criofluido.
+block.silicon-crucible.description = Refina silício com carvão e areia, usando piratita como uma fonte de calor adicional. Mais eficiente em locais quentes.
+block.disassembler.description = Separa escória em traços de minerais componentes exóticos. Pode produzir tório.
+block.overdrive-dome.description = Aumenta a velocidade de construções vizinhas. Requer tecido de fase e silício para operar.
+block.payload-conveyor.description = Movimenta grandes cargas ,como unidades saindo das fábricas.
+block.payload-router.description = Separa cargas recebidas em 3 direções de saída.
+block.ground-factory.description = Produz unidades terrestres. Unidades produzidas podem ser usadas diretamente, ou movido em reconstrutores para melhorar.
+block.air-factory.description = Produz unidades aéreas. Unidades produzidas podem ser usadas diretamente, ou movido em reconstrutores para melhorar.
+block.naval-factory.description = Produz unidades navais. Unidades produzidas podem ser usadas diretamente, ou movido em reconstrutores para melhorar.
+block.additive-reconstructor.description = Melhora unidades recebidas para o seu segundo nível.
+block.multiplicative-reconstructor.description = Melhora unidades recebidas para o seu terceiro nível.
+block.exponential-reconstructor.description = Melhora unidades recebidas para o seu quarto nível.
+block.tetrative-reconstructor.description = Melhora unidades recebidas para o seu quinto e último nível.
+block.switch.description = Uma alavanca alternável. O seu estado pode ser lido e controlado com processadores lógicos.
+block.micro-processor.description = Executa uma sequência de instruções lógicas em um loop. Pode ser usado para controlar unidades e construções.
+block.logic-processor.description = Executa uma sequência de instruções lógicas em um loop. Pode ser usado para controlar unidades e construções. Mais rápido que um micro processador.
+block.hyper-processor.description = Executa uma sequência de instruções lógicas em um loop. Pode ser usado para controlar unidades e construções. Mais rápido que um processador lógico.
+block.memory-cell.description = Guarda informações para um processador lógico.
+block.memory-bank.description = Guarda informações para um processador lógico. Capacidade alta.
+block.logic-display.description = Exibe gráficos arbitrários de um processador lógico.
+block.large-logic-display.description = Exibe gráficos arbitrários de um processador lógico.
+block.interplanetary-accelerator.description = Uma enorme torre eletromagnética. Acelera a velocidade de fuga dos núcleos para o desdobramento interplanetário.
+block.repair-turret.description = Conserta continuamente a unidade danificada mais próxima a ela. Opcionalmente, aceita líquido refrigerante.
+
+#Erekir
+block.core-bastion.description = O núcleo da base. Blindado. Uma vez destruído, o setor é perdido.
+block.core-citadel.description = O núcleo da base. Muito bem blindado. Armazena mais recursos do que um Bastião do Núcleo.
+block.core-acropolis.description = O núcleo da base. Excepcionalmente bem blindado. Armazena mais recursos do que a Cidadela do Núcleo.
+block.breach.description = Dispara munições perfurantes de berílio ou tungstênio em alvos inimigos.
+block.diffuse.description = Dispara balas em um cone largo. Empurra os alvos inimigos de volta.
+block.sublimate.description = Dispara um jato contínuo de chamas sobre alvos inimigos. Penetra armadura.
+block.titan.description = Dispara um enorme projétil de artilharia explosiva em alvos terrestres. Requer hidrogênio.
+block.afflict.description = Dispara uma esfera maciça e carregada de fragmentos. Requer aquecimento.
+block.disperse.description = Dispara projéteis em alvos aéreos.
+block.lustre.description = Dispara um laser de movimento lento de alvo único em alvos inimigos.
+block.scathe.description = Lança um poderoso míssil em alvos terrestres a grandes distâncias.
+block.smite.description = Dispara balas perfurantes e emissoras de raios.
+block.malign.description = Dispara uma barragem de cargas de laser teleguiadas em alvos inimigos. Exige aquecimento extensivo.
+block.silicon-arc-furnace.description = Refina Silício a partir de areia e grafite.
+block.oxidation-chamber.description = Converte Berílio e Ozono em Óxido. Emite calor como um subproduto.
+block.electric-heater.description = Aquece blocos a frente. Requer grandes quantidades de energia.
+block.slag-heater.description = Aquece blocos a frente. Requer Escória.
+block.phase-heater.description = Aquece blocos a frente. Requer Tecido de Fase
+block.heat-redirector.description = Redireciona o calor acumulado para outros blocos.
+block.small-heat-redirector.description = Redireciona o calor acumulado para outros blocos.
+block.heat-router.description = Espalha o calor acumulado em 3 direções.
+block.electrolyzer.description = Converte �gua em Hidrogénio e gás de Ozono.
+block.atmospheric-concentrator.description = Concentra o Nitrogénio da atmosfera. Requer calor.
+block.surge-crucible.description = Forma Liga de Surto a partir de Escória e Silício. Requer calor.
+block.phase-synthesizer.description = Sintetiza Tecido de Fase a partir do Tório, Areia e Ozono. Requer calor.
+block.carbide-crucible.description = Funde Grafite e Tungsténio em Carboneto. Requer calor.
+block.cyanogen-synthesizer.description = Sintetiza Cianogénio a partir de Arkycite e Grafite. Requer calor.
+block.slag-incinerator.description = Incinera itens ou líquidos não voláteis. Requer escória.
+block.vent-condenser.description = Condensa os gases de ventilação em água. Consome energia.
+block.plasma-bore.description = Quando colocado de frente para uma parede de minério, produz itens por tempo indeterminado. Requer pequenas quantidades de energia.
+block.large-plasma-bore.description = Uma Broca de Plasma maior. Capaz de extrair tungsténio e tório. Requer hidrogénio e energia.
+block.cliff-crusher.description = Esmaga as paredes, produzindo areia indefinidamente. Requer energia. A eficiência varia de acordo com o tipo de parede.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Quando colocados sobre minério, os itens saem em rajadas indefinidamente. Requer energia e água.
+block.eruption-drill.description = Uma Broca de Impacto melhorada. Capaz de minerar Tório. Requer Hidrogénio.
+block.reinforced-conduit.description = Movimenta fluidos para frente. Não aceita entradas de outros blocos, a não ser canos, dos lados.
+block.reinforced-liquid-router.description = Distribui fluidos igualmente para todos os lados.
+block.reinforced-liquid-tank.description = Armazena uma grande quantidade de fluidos.
+block.reinforced-liquid-container.description = Armazena uma quantidade considerável de fluidos.
+block.reinforced-bridge-conduit.description = Transporta fluidos sobre estruturas e terrenos.
+block.reinforced-pump.description = Bombeia e produz líquidos. Requer hidrogênio.
+block.beryllium-wall.description = Protege estruturas contra projéteis inimigos.
+block.beryllium-wall-large.description = Protege estruturas contra projéteis inimigos.
+block.tungsten-wall.description = Protege estruturas contra projéteis inimigos.
+block.tungsten-wall-large.description = Protege estruturas contra projéteis inimigos.
+block.carbide-wall.description = Protege estruturas contra projéteis inimigos.
+block.carbide-wall-large.description = Protege estruturas contra projéteis inimigos.
+block.reinforced-surge-wall.description = Protege estruturas contra projéteis inimigos, lançando periodicamente arcos elétricos em contato com o projétil.
+block.reinforced-surge-wall-large.description = Protege estruturas contra projéteis inimigos, lançando periodicamente arcos elétricos em contato com o projétil.
+block.shielded-wall.description = Protege estruturas contra projéteis inimigos. Implanta um escudo que absorve a maioria dos projéteis quando energia é fornecida. Conduz energia.
+block.blast-door.description = Uma parede que se abre quando as unidades terrestres aliadas estão no alcance. Não pode ser controlada manualmente.
+block.duct.description = Move itens para frente. Só é capaz de armazenar um único item.
+block.armored-duct.description = Move itens para frente. Não aceita entradas de blocos não-dutos dos lados.
+block.duct-router.description = Distribui os itens igualmente em três direções. Aceita somente itens pela parte de trás. Pode ser configurado como um ordenador de itens.
+block.overflow-duct.description = Só libera itens para os lados se a frente estiver bloqueada.
+block.duct-bridge.description = Move itens sobre estruturas e terrenos.
+block.duct-unloader.description = Descarrega o item selecionado do bloco atrás dele. Não pode descarregar do núcleo.
+block.underflow-duct.description = O contrário de um duto de sobrecarga. Libera itens para a frente se os caminhos esquerdo e direito estiverem bloqueados.
+block.reinforced-liquid-junction.description = Atua como uma junção entre dois canos se cruzando.
+block.surge-conveyor.description = Move itens em lotes. Pode ser acelerado com energia. Conduz energia.
+block.surge-router.description = Distribui igualmente os itens em três direções a partir de Esteiras de Liga de Surto. Podem ser acelerados com energia. Conduz energia.
+block.unit-cargo-loader.description = Constrói drones de carga. Os drones distribuem automaticamente os itens aos pontos de descarga de carga com um filtro correspondente.
+block.unit-cargo-unload-point.description = Atua como um ponto de descarga de drones de carga. Aceita itens que combinam com o filtro selecionado.
+block.beam-node.description = Transmite energia para outros blocos ortogonalmente. Armazena uma pequena quantidade de energia.
+block.beam-tower.description = Transmite energia para outros blocos ortogonalmente. Armazena uma grande quantidade de energia. Longo alcance.
+block.turbine-condenser.description = Gera energia quando colocado em ventilações. Produz uma pequena quantidade de água.
+block.chemical-combustion-chamber.description = Gera energia a partir de arkycite e ozônio.
+block.pyrolysis-generator.description = Gera grandes quantidades de energia a partir de arkycite e escória. Produz água como subproduto.
+block.flux-reactor.description = Gera grandes quantidades de energia quando aquecido. Requer cianogênio como estabilizador. A saída de energia e os requisitos de cianogênio são proporcionais à entrada de calor.\nExplode se o cianogênio for insuficiente.
+block.neoplasia-reactor.description = Utiliza arkycite, água e tecido de fase para gerar grandes quantidades de energia. Produz calor e neoplasma perigoso como subproduto.\nExplode violentamente se o neoplasma não for removido do reator através de canos.
+block.build-tower.description = Reconstrói automaticamente estruturas em alcance e auxilia outras unidades na construção.
+block.regen-projector.description = Lentamente repara estruturas aliadas em um perímetro quadrado. Requer hidrogênio.
+block.reinforced-container.description = Armazena uma pequena quantidade de itens. O conteúdo pode ser recuperado através de descarregadores. Não aumenta a capacidade de armazenamento do núcleo.
+block.reinforced-vault.description = Armazena uma grande quantidade de itens. O conteúdo pode ser recuperado através de descarregadores. Não aumenta a capacidade de armazenamento do núcleo.
+block.tank-fabricator.description = Constrói unidades Stell. As unidades produzidas podem ser usadas diretamente, ou movidas para refabricadores para atualização.
+block.ship-fabricator.description = Constrói unidades Elude. As unidades produzidas podem ser usadas diretamente, ou movidas para refabricadores para atualização.
+block.mech-fabricator.description = Constrói unidades Merui. As unidades produzidas podem ser usadas diretamente, ou movidas para refabricadores para atualização.
+block.tank-assembler.description = Monta grandes tanques a partir dos blocos e unidades inseridos. O tier pode ser aumentado com a adição de módulos.
+block.ship-assembler.description = Monta grandes naves a partir de blocos e unidades inseridos. O tier pode ser aumentado com a adição de módulos.
+block.mech-assembler.description = Monta grandes mechs a partir de blocos e unidades inseridos. O tier pode ser aumentado com a adição de módulos.
+block.tank-refabricator.description = Atualiza as unidades tanques inseridas para o segundo tier.
+block.ship-refabricator.description = Atualiza as unidades naves inseridas para o segundo tier.
+block.mech-refabricator.description = Atualiza as unidades mech inseridas para o segundo tier.
+block.prime-refabricator.description = Atualiza as unidades inseridas para o terceiro tier.
+block.basic-assembler-module.description = Aumenta o tier do montador quando colocado próximo a um limite de construção. Requer energia. Pode ser usado como entrada de carga.
+block.small-deconstructor.description = Desconstrói as estruturas e unidades inseridos. Devolve 100% do custo de construção.
+block.reinforced-payload-conveyor.description = Movimenta cargas para frente.
+block.reinforced-payload-router.description = Distribui cargas em blocos adjacentes. Funciona como um ordenador quando um filtro é configurado.
+block.payload-mass-driver.description = = Estrutura de transporte de carga útil de longo alcance. Atira cargas recebidas para Catapultas de Carga Eletromagnéticas conectadas.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repara todas as unidades em sua proximidade. Requer ozônio.
+block.radar.description = Gradualmente descobre o terreno e as unidades inimigas em um grande raio. Requer energia.
+block.shockwave-tower.description = Danifica e destrói projéteis inimigos em um raio. Requer cianogênio.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+
+unit.dagger.description = Dispara projéteis padrões em todos os inimigos em volta.
+unit.mace.description = Dispara corrents de chamas em todos os inimigos em volta.
+unit.fortress.description = Dispara artilharia de longo alcance em alvos terrestres.
+unit.scepter.description = Dispara uma barragem de projéteis carregados em todos os inimigos em volta.
+unit.reign.description = Dispara uma barragem de projéteis perfuradoes massivos em todos os inimigos em volta.
+unit.nova.description = Dispara raios-lasers que danificam inimigos e repara estruturas aliadas. Capaz de voar.
+unit.pulsar.description = Dispara arcos de eletricidade que danificam inimigos e repara estruturas aliadas. Capaz de voar.
+unit.quasar.description = Dispara feixes penetradores de lasers que danificam inimigos e repara estruturas aliadas. Capaz de voar. Possui um escudo.
+unit.vela.description = Dispara um massivo feixe de laser massivo que danificam inimigos, causa fogo e repara estruturas aliadas. Capaz de voar.
+unit.corvus.description = Dispara um massivo laser que danificam inimigos e repara estruturas aliadas. Pode pisar em cima da maioria do terreno.
+unit.crawler.description = Corre atrás de inimigos e se destrói, causando uma grande explosão.
+unit.atrax.description = Dispara orbes debilitantes de escória em alvos terrestres. Pode pisar em cima da maioria do terreno.
+unit.spiroct.description = Dispara lasers enfraquecedores em inimigos, se reparando no processo. Pode pisar em cima da maioria do terreno.
+unit.arkyid.description = Dispara grandes lasers enfraquecedores em inimigos, se reparando no processo. Pode pisar em cima da maioria do terreno.
+unit.toxopid.description = Dispara grande granadas agrupadas elétricas e lasers penetradoes em inimigos. Pode pisar em cima da maioria do terreno.
+unit.flare.description = Dispara projéteis padrões em alvos terrestres.
+unit.horizon.description = Larga aglomerados de bombas em alvos terrestres.
+unit.zenith.description = Dispara salvos de mísseis em todos os inimigos em volta.
+unit.antumbra.description = Dispara uma barragem de projéteis em todos os inimigos em volta.
+unit.eclipse.description = Dispara dois lasers penetradores e uma barragem de fogo antiaéreo em todos os inimigos em volta.
+unit.mono.description = Automaticamente minera cobre e chumbo, depositando-os no núcleo.
+unit.poly.description = Automaticamente reconstrói estruturas destruídas e ajuda outras unidades em construção.
+unit.mega.description = Automaticamente repara estruturas danificadas. Capaz de carregar blocos e unidades de chão pequenas.
+unit.quad.description = Larga grandes bombas em alvos terrestres, reparando estruturas aliadas e danificando inimigos. Capaz de carregar unidades terrestres de tamanho médio.
+unit.oct.description = Protege aliados em volta com o seu escudo regenerador. Capaz de carregar a maioria das unidades terrestres.
+unit.risso.description = Dispara uma barragem de mísseis e projéteis em todos os inimigos em volta.
+unit.minke.description = Dispara granadas e projéteis padrões em alvos terrestres.
+unit.bryde.description = Dispara granadas de artilharia de longo alcance e mísseis em todos os inimigos em volta.
+unit.sei.description = Dispara uma barragem de mísseis e projéteis penetradoras de armadura em inimigos.
+unit.omura.description = Dispara um raio de longo alcance atravessador em inimigos. Constrói unidades flare.
+unit.alpha.description = Defende o Fragmento do Núcleo de inimigos. Constrói estruturas.
+unit.beta.description = Defende a Fundação do Núcleo de inimigos. Constrói estruturas.
+unit.gamma.description = Defende o Centro do Núcleo de inimigos. Constrói estruturas.
+unit.retusa.description = Atira torpedos teleguiados em inimigos próximos. Repara unidades aliadas.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Dispara fragmentos de mísseis em inimigos. Repara unidades aliadas.
+unit.aegires.description = Causa choque a todas as unidades e estruturas inimigas que entram em seu campo de enrgia. Repara todos os aliados.
+unit.navanax.description = Dispara projéteis de PEM explosivos, causando danos significativos às redes de energia inimigas e reparando as estruturas aliadas. Derrete os inimigos próximos com 4 torres laser autônomas.
+unit.stell.description = Dispara balas padrão em alvos inimigos.
+unit.locus.description = Dispara balas alternadas em alvos inimigos.
+unit.precept.description = Atira balas de fragmentação perfurantes em alvos inimigos.
+unit.vanquish.description = Dispara grandes balas de fragmentação perfurantes em alvos inimigos.
+unit.conquer.description = Dispara grandes cascatas de balas perfurantes em alvos inimigos.
+unit.merui.description = Dispara artilharia de longo alcance em alvos terrestres inimigos. Pode pisar sobre a maioria dos terrenos.
+unit.cleroi.description = Dispara projéteis duplos em alvos inimigos. Ataca projéteis inimigos com torretas de defesa de ponto. Pode pisar sobre a maioria dos terrenos.
+unit.anthicus.description = Atira mísseis teleguiados de longo alcance em alvos inimigos. Pode pisar sobre a maioria dos terrenos.
+unit.tecta.description = Atira mísseis teleguiados de plasma em direção a alvos inimigos. Protege-se com um escudo direcional. Pode pisar sobre a maioria dos terrenos.
+unit.collaris.description = Dispara artilharia de fragmentação de longo alcance em alvos inimigos. Pode pisar sobre a maioria dos terrenos.
+unit.elude.description = Dispara pares de balas teleguiadas em alvos inimigos. Pode flutuar sobre regiões de líquido.
+unit.avert.description = Dispara pares de balas em alvos inimigos.
+unit.obviate.description = Dispara pares de orbes de relâmpagos em alvos inimigos.
+unit.quell.description = Atira mísseis de longo alcance em alvos inimigos. Suprime os blocos de reparo de estruturas inimigas.
+unit.disrupt.description = Dispara mísseis teleguiados de supressão de longo alcance em alvos inimigos. Suprime os blocos de reparo de estruturas inimigas.
+unit.evoke.description = Constrói estruturas para defender o Bastião do Núcleo. Conserta estruturas com um feixe.
+unit.incite.description = Constrói estruturas para defender a Cidadela do Núcleo. Repara estruturas com um feixe.
+unit.emanate.description = Constrói estruturas para defender o Núcelo Acrópole. Repara estruturas com feixes.
+
+lst.read = Ler um número de uma célula de memória vinculada.
+lst.write = Escrever um número de uma célula de memória vinculada.
+lst.print = Adiciona texto ao buffer de impressão.\nNão exibe nada até [accent]Print Flush[] ser usado.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Adicionar uma operação ao buffer de desenho.\nNão exibe nada até [accent]Draw Flush[] ser usado.
+lst.drawflush = Liberar operações [accent]Draw[] enfileiradas para um display.
+lst.printflush = Liberar operações [accent]Print[] enfileiradas para um bloco de mensagem.
+lst.getlink = Obtenha um link de processador por índice. Começa em 0.
+lst.control = Controle uma construção.
+lst.radar = Localize unidades ao redor de um prédio com alcance.
+lst.sensor = Obtenha dados de um edifício ou unidade.
+lst.set = Defina uma variável.
+lst.operation = Execute uma operação em 1-2 variáveis.
+lst.end = Pule para o topo da pilha de instruções.
+lst.wait = Aguarde um determinado número de segundos.
+lst.stop = Interrompa a execução deste processador.
+lst.lookup = Pesquise um tipo de item/líquido/unidade/bloco por ID.\nAs contagens totais de cada tipo podem ser acessadas com:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Salte condicionalmente para outra instrução.
+lst.unitbind = Vincule à próxima unidade de um tipo e armazene-a em [accent]@unit[].
+lst.unitcontrol = Controle a unidade atualmente vinculada.
+lst.unitradar = Localize as unidades ao redor da unidade atualmente vinculada.
+lst.unitlocate = Localize um tipo específico de posição/construção em qualquer lugar do mapa.\nRequer uma unidade vinculada.
+lst.getblock = Obtenha dados de blocos em qualquer local.
+lst.setblock = Defina os dados do bloco em qualquer local.
+lst.spawnunit = Gere uma unidade em um local.
+lst.applystatus = Aplique ou elimine um efeito de status de uma unidade.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Gerar uma onda.
+lst.explosion = Crie uma explosão em um local.
+lst.setrate = Defina a velocidade de execução do processador em instruções/tick.
+lst.fetch = Pesquise unidades, núcleos, jogadores ou edifícios por índice.\nOs índices começam em 0 e terminam na contagem retornada.
+lst.packcolor = Empacote [0, 1] componentes RGBA em um único número para desenho ou configuração de regra.
+lst.setrule = Defina uma regra do jogo.
+lst.flushmessage = Exibe uma mensagem na tela do buffer de texto.\nAguardará até que a mensagem anterior termine.
+lst.cutscene = Manipule a câmera do jogador.
+lst.setflag = Defina um sinalizador global que possa ser lido por todos os processadores.
+lst.getflag = Verifique se um sinalizador global está definido.
+lst.setprop = Define uma propriedade de uma unidade ou edifício.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Lógica de construção de unidades não é permitida aqui.
+
+lenum.type = Tipo de edifício/unidade.\ne.g. para qualquer roteador, isso retornará [accent]@router[].\não uma string.
+lenum.shoot = Atire em uma posição.
+lenum.shootp = Atire em uma unidade/edifício com previsão de velocidade.
+lenum.config = Configuração do edifício, por ex. item classificador.
+lenum.enabled = Se o bloco está ativado.
+
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Cor do iluminador.
+laccess.controller = Controlador de unidade. Se controlado pelo processador, retorna o processador.\nCaso contrário, retorna a própria unidade.
+laccess.dead = Se uma unidade/edifício está morta ou não é mais válida.
+laccess.controlled = Retorna:\n[accent]@ctrlProcessor[] se o controlador da unidade for o processador\n[accent]@ctrlPlayer[] se o controlador da unidade/edifício for o player\n[accent]@ctrlCommand[] se o controlador da unidade for um comando do player\nCaso contrário , 0.
+laccess.progress = Progresso da ação, 0 a 1.\nRetorna a produção, a recarga da torre ou o progresso da construção.
+laccess.speed = Velocidade máxima de uma unidade, em ladrilhos/seg.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+
+lcategory.unknown = Desconhecido
+lcategory.unknown.description = Instruções não categorizadas.
+lcategory.io = Entrada e Saída
+lcategory.io.description = Modifica o conteúdo dos blocos de memória e buffers do processador.
+lcategory.block = Controle de bloco
+lcategory.block.description = Interaja com os blocos.
+lcategory.operation = Operações
+lcategory.operation.description = Operações lógicas.
+lcategory.control = Controle de fluxo
+lcategory.control.description = Gerencia ordem de execução.
+lcategory.unit = Unidade de controle
+lcategory.unit.description = Dá comandos às unidades.
+lcategory.world = Mundo
+lcategory.world.description = Controla como o mundo se comporta.
+
+graphicstype.clear = Preenche o visor com uma cor.
+graphicstype.color = Define a cor para as próximas operações de desenho.
+graphicstype.col = Equivalente à cor, mas agrupada.\nAs cores agrupadas são escritas como códigos hexadecimais com um prefixo [accent]%[].\nExemplo: [accent]%ff0000[] seria vermelho.
+graphicstype.stroke = Define a largura da linha.
+graphicstype.line = Desenha o segmento de linha.
+graphicstype.rect = Preenche um retângulo.
+graphicstype.linerect = Desenha um contorno retangular.
+graphicstype.poly = Preenche um polígono regular.
+graphicstype.linepoly = Desenha um contorno de polígono regular.
+graphicstype.triangle = Preenche um triângulo.
+graphicstype.image = Desenha uma imagem de algum conteúdo.\nex: [accent]@router[] ou [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Sempre verdade.
+lenum.idiv = Divisão inteira.
+lenum.div = Divisão.\nRetorna [accent]null[] na divisão por zero.
+lenum.mod = Modulo.
+lenum.equal = Igual. Coage tipos.\nObjetos não nulos comparados com números tornam-se 1, caso contrário, 0.
+lenum.notequal = Não igual. Tipos de coerção.
+lenum.strictequal = Igualdade estrita. Não coage tipos.Pode ser usado para verificar [accent]null[].
+lenum.shl = Deslocamento de bit para a esquerda.
+lenum.shr = Deslocamento de bits para a direita.
+lenum.or = OU bit a bit.
+lenum.land = Lógico E.
+lenum.and = E bit a bit.
+lenum.not = Virar bit a bit.
+lenum.xor = XOR bit a bit.
+
+lenum.min = Mínimo de dois números.
+lenum.max = Máximo de dois números.
+lenum.angle = Ângulo do vetor em graus.
+lenum.anglediff = Distância absoluta entre dois ângulos em graus.
+lenum.len = Comprimento do vetor.
+
+lenum.sin = Seno, em graus.
+lenum.cos = Cosseno, em graus.
+lenum.tan = Tangente, em graus.
+
+lenum.asin = Arco seno, em graus.
+lenum.acos = Arco cosseno, em graus.
+lenum.atan = Arco tangente, em graus.
+
+#not a typo, look up 'range notation'
+lenum.rand = Decimal aleatório no intervalo [0, valor).
+lenum.log = Logaritmo natural (ln).
+lenum.log10 = Logaritmo de base 10.
+lenum.noise = Ruído simplex 2D.
+lenum.abs = Valor absoluto.
+lenum.sqrt = Raiz quadrada.
+
+lenum.any = Qualquer unidade.
+lenum.ally = Unidade aliada.
+lenum.attacker = Unidade com uma arma.
+lenum.enemy = Unidade inimiga.
+lenum.boss = Unidade Guardiã.
+lenum.flying = Unidade voadora.
+lenum.ground = Ground unit.
+lenum.player = Unidade controlada por um jogador.
+
+lenum.ore = Depósito de minério.
+lenum.damaged = Edifício aliado danificado.
+lenum.spawn = Ponto de geração do inimigo.\nPode ser um núcleo ou uma posição.
+lenum.building = Construção em um grupo específico.
+
+lenum.core = Qualquer núcleo.
+lenum.storage = Edifício de armazenamento, por ex. Cofre.
+lenum.generator = Edifícios que geram energia.
+lenum.factory = Edifícios que transformam recursos.
+lenum.repair = Pontos de reparo.
+lenum.battery = Qualquer bateria.
+lenum.resupply = Pontos de reabastecimento.\nRelevante apenas quando [accent]"Unit Ammo"[] está habilitado.
+lenum.reactor = Reator de impacto/tório.
+lenum.turret = Qualquer torre.
+
+sensor.in = O edifício/unidade para sentir.
+
+radar.from = Construir para detectar.\nO alcance do sensor é limitado pelo alcance do edifício.
+radar.target = Filtre as unidades a serem detectadas.
+radar.and = Filtros adicionais.
+radar.order = Ordem de classificação. 0 para inverter.
+radar.sort = Métrica pela qual classificar os resultados.
+radar.output = Variável para gravar a unidade de saída.
+
+unitradar.target = Filtre as unidades a serem detectadas.
+unitradar.and = Filtros adicionais.
+unitradar.order = Ordem de classificação. 0 para inverter.
+unitradar.sort = Métrica pela qual classificar os resultados.
+unitradar.output = Variável para gravar a unidade de saída.
+
+control.of = Construir para controlar.
+control.unit = Unidade/edifício a visar.
+control.shoot = Se atirar.
+
+unitlocate.enemy = Se deve localizar edifícios inimigos.
+unitlocate.found = Se o objeto foi encontrado.
+unitlocate.building = Variável de saída para edifício localizado.
+unitlocate.outx = Coordenada X de saída.
+unitlocate.outy = Coordenada Y de saída.
+unitlocate.group = Grupo de construção para procurar.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Não se mova, mas continue construindo/minerando.\nO estado padrão.
+lenum.stop = Pare de mover/mineração/construção.
+lenum.unbind = Desabilite completamente o controle lógico.\nRetome AI padrão.
+lenum.move = Mover para a posição exata.
+lenum.approach = Aproxime-se de uma posição com um raio.
+lenum.pathfind = Pathfind para o spawn inimigo.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Atire em uma posição.
+lenum.targetp = Atire em um alvo com previsão de velocidade.
+lenum.itemdrop = Solte um item.
+lenum.itemtake = Pegue um item de um edifício.
+lenum.paydrop = Solte a carga útil atual.
+lenum.paytake = Pegue a carga no local atual.
+lenum.payenter = Entre/pouse no bloco de carga em que a unidade está.
+lenum.flag = Sinalizador de unidade numérica.
+lenum.mine = Mina em uma posição.
+lenum.build = Construa uma estrutura.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Verifique se a unidade está perto de uma posição.
+lenum.boost = Iniciar/parar o reforço.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 103b173a72..84b55cd27b 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -14,9 +14,10 @@ link.f-droid.description = Catalogul F-Droid
 link.wiki.description = Wikiul oficial al Mindustry
 link.suggestions.description = Sugerează noi funcții
 link.bug.description = Ai găsit vreunul? Raportează-l aici
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 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.
+screenshot.invalid = Harta e prea mare. Se poate să nu existe suficientă memorie pentru captura de ecran
 gameover = Jocul s-a încheiat
 gameover.disconnect = Deconectare
 gameover.pvp = Echipa [accent] {0}[] este câștigătoare!
@@ -24,12 +25,11 @@ gameover.waiting = [accent]Se așteaptă următoarea hartă...
 highscore = [accent]Scor maxim nou!
 copied = Copiat.
 indev.notready = Această secțiune a jocului nu este gata încă.
-indev.campaign = [accent]Felicitări! Ai ajuns la finalul campaniei![]\n\nAi mers cât de departe se poate momentan. Călătoria interplanetară va fi adăugată într-un update viitor.
 
 load.sound = Sunete
-load.map = Hărți 
+load.map = Hărți
 load.image = Imagini
-load.content = Conținut 
+load.content = Conținut
 load.system = Sistem
 load.mod = Moduri
 load.scripts = Scripturi
@@ -41,15 +41,23 @@ be.ignore = Ignoră
 be.noupdates = Niciun update disponibil.
 be.check = Verifică updateurile
 
-mod.featured.title = Mod browser
-mod.featured.dialog.title = Mod Browser (Neterminat)
+mods.browser = Browser de Moduri
 mods.browser.selected = Mod selectat
-mods.browser.add = Instalează
-mods.github.open = Vezi
+mods.browser.add = Instalare
+mods.browser.reinstall = Reinstal.
+mods.browser.view-releases = View Releases
+mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published.
+mods.browser.latest = <Latest>
+mods.browser.releases = Releases
+mods.github.open = Github
+mods.github.open-release = Release Page
+mods.browser.sortdate = Cele mai recente
+mods.browser.sortstars = Cele mai multe stele
 
 schematic = Schemă
 schematic.add = Salvează Schema...
 schematics = Scheme
+schematic.search = Search schematics...
 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...
@@ -59,22 +67,30 @@ 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 Schema 
-schematic.saved = Schemă salvată. 
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: ÃŽntoarce Schema
+schematic.saved = Schemă salvată.
 schematic.delete.confirm = Schema această va fi ștearsă permanent.
-schematic.rename = Redenumește Schema
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blocuri
 schematic.disabled = [scarlet]Schemele sunt dezactivate[]\nNu ai voie să folosești scheme pe această [accent]hartă[] sau [accent]server.
+schematic.tags = Etichete:
+schematic.edittags = Editează Etichetele
+schematic.addtag = Adaugă Etichetă
+schematic.texttag = Etichetă Text
+schematic.icontag = Etichetă Iconiță
+schematic.renametag = Redenumește Eticheta
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Vrei să ștergi permanent eticheta?
+schematic.tagexists = Acea etichetă există deja.
 
 stats = Informații
-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}
+stats.wave = Waves Defeated
+stats.unitsCreated = Units Created
+stats.enemiesDestroyed = Enemies Destroyed
+stats.built = Buildings Built
+stats.destroyed = Buildings Destroyed
+stats.deconstructed = Buildings Deconstructed
+stats.playtime = Time Played
 
 globalitems = [accent]Materiale Totale
 map.delete = Sigur vrei să ștergi harta "[accent]{0}[]"?
@@ -84,51 +100,68 @@ 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 
+database.button = Bază de date
+savegame = Salvează Jocul
 loadgame = Încarcă Jocul
 joingame = Intră în Joc
 customgame = Personalizat
 newgame = Joc Nou
-none.found = [lightgray]<nu s-a găsit nimic>
 none = <nimic>
+none.found = [lightgray]<nu s-a găsit nimic>
+none.inmap = [lightgray]<niciunul pe hartă>
 minimap = Minihartă
 position = Poziție
-close = ÃŽnchide 
+close = ÃŽnchide
 website = Site
-quit = Abandonează 
+quit = Abandonează
 save.quit = Salvează și Închide
 maps = Hărți
-maps.browse = Selectează 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 
+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[].\nRaportează orice probleme apărute pe Githubul Mindustry.
+mods.initfailed = [red]⚠[] Instanța Mindustry precedentă a eșuat la inițializare. De obicei se întâmplă din cauza unui mod care nu se acționează cum trebuie.\n\nPt a preveni un lanț de crashuri continue, [red]toate modurile au fost dezactivate.[]\n\nPoți dezactiva asta din [accent]Setări->Joc->Dezactivează Modurile în Cazul unui Crash la Pornire[].
 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.viewcontent = Vezi Conținut
+mods.reload = Reîncarcă
 mods.reloadexit = Jocul se va opri ca să reîncarce modurile.
+mod.installed = [[Instalat]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Activat
 mod.disabled = [scarlet]Dezactivat
+mod.multiplayer.compatible = [gray]Compatibil cu Multiplayer
 mod.disable = Dezactivează
+mod.version = Version:
 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.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Erori de Conținut
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
 mod.errors = 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.
@@ -150,18 +183,27 @@ mod.scripts.disable = Dispozitivul tău nu suportă moduri cu scripturi. Trebuie
 about.button = Despre
 name = Nume:
 noname = Mai întâi alege un [accent] nume de jucător[].
+search = Search:
 planetmap = Harta Planetei
 launchcore = Lansează Nucleu
 filename = Nume Fișier:
 unlocked = Nou conținut deblocat!
 available = Poți cerceta noi tehnologii!
+unlock.incampaign = < Deblochează în campanie pt detalii >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Finalizat
 techtree = Cercetează
-research.legacy = Au fost găsite date de cercetare din versiunea [accent]5.0[].\n Dorești să [accent]păstrezi aceste date[], sau [accent]să renunți la ele[] și să reîncepi cercetarea în noua campanie (recomandat)?
+techtree.select = Tech Tree Selection
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
 research.load = Păstrează Datele
 research.discard = Renunță
 research.list = [lightgray]Cercetare:
-research = Cercetează 
+research = Cercetează
 researched = [lightgray]{0} cercetat.
 research.progress = {0}% finalizat
 players = {0} jucători
@@ -191,7 +233,7 @@ join.info = Aici poți scrie un [accent]IP de server[] pt a te conecta sau pt a
 hostserver = Găzduiește Joc Multiplayer
 invitefriends = Invită Prieteni
 hostserver.mobile = Găzduiește Joc
-host = Găzduiește 
+host = Găzduiește
 hosting = [accent]Se deschide serverul...
 hosts.refresh = Reîncarcă
 hosts.discovering = Se caută jocur LAN
@@ -201,22 +243,34 @@ 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.local.steam = Jocuri Deschise & Servere Locale
+servers.remote = Servere de la Distanță
 servers.global = Servere ale Comunității
 
 servers.disclaimer = Serverele comunității [accent]nu[] sunt deținute sau controlate de către dezvoltator.\n\nServerele pot prezenta conținut generat de utilizatori care nu este potrivit tuturor vârstelor.
 servers.showhidden = Vezi Serverele Ascunse
 server.shown = Afișate
 server.hidden = Ascunse
+viewplayer = Viewing Player: [accent]{0}
 
 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.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Client Mobil: [accent]{0}
 trace.modclient = Client Personalizat: [accent]{0}
+trace.times.joined = A Intrat: de [accent]{0}[] ori
+trace.times.kicked = Dat Afară: de [accent]{0}[] ori
+trace.ips = IPs:
+trace.names = Names:
 invalidid = ID client invalid! Raportează bugul.
-server.bans = Interziși 
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
+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!
@@ -226,13 +280,14 @@ 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 
+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?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Alătură-te Jocului
 joingame.ip = Adresă:
 disconnect = Deconectat.
@@ -240,17 +295,19 @@ 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!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Nu te-ai putut alătura jocului ([accent]{0}[]).
 connecting = [accent]Conectare...
 reconnecting = [accent]Reconectare...
 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.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 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.nocampaign = Individual save files from the campaign cannot be imported.
+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?
@@ -270,6 +327,7 @@ save.corrupted = Fișier salvare corupt sau invalid!
 empty = <gol>
 on = Pornit
 off = Oprit
+save.search = Search saved games...
 save.autosave = Autosalvare: {0}
 save.map = Hartă: {0}
 save.wave = Valul {0}
@@ -285,9 +343,30 @@ ok = OK
 open = Deschide
 customize = Personalizează Regulile
 cancel = Anulare
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Deschide Linkul
 copylink = Copiază Linkul
-back = ÃŽnapoi 
+back = ÃŽnapoi
+max = Maximum
+objective = Map Objective
 crash.export = Exportă Crash Logs
 crash.none = Nu s-au găsit crash logs.
 crash.exported = Crash logs exportate.
@@ -298,20 +377,22 @@ 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...
+downloading = [accent]Se descarcă...
 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
+enablebuilding = [scarlet][[{0}][] pt a construi
 showui = Interfață ascunsă.\nApasă [accent][[{0}][] pt a vedea interfața.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Valul {0}
 wave.cap = [accent]Valul {0}/{1}
 wave.waiting = [lightgray]Val în {0}
-wave.waveInProgress = [lightgray]Val în desfășurare 
+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
@@ -327,9 +408,9 @@ 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.nospawn = Harta asta nu are niciun nucleu în care vor apărea jucătorii! Adaugă un nucleu {0} 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ă nuclee {0} 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}
@@ -337,13 +418,18 @@ map.publish.confirm = Sigur vrei să publici această hartă?\n\n[lightgray] Asi
 workshop.menu = Selectează ce ai vrea să faci cu acest item.
 workshop.info = Informații despre Item
 changelog = Schimbări (opțional):
+updatedesc = Overwrite Title & Description
 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.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
 
+editor.cliffs = Pereți >> Dealuri
 editor.brush = Pensulă
 editor.openin = Deschide în Editor
 editor.oregen = Generarea Minereurilor
@@ -355,56 +441,96 @@ editor.nodescription = O hartă trebuie să aibă o descriere care să conțină
 editor.waves = Valuri:
 editor.rules = Reguli:
 editor.generation = Generare:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Editează în Joc
+editor.playtest = Playtest
 editor.publish.workshop = Publică pe Workshop
-editor.newmap = Hartă Nouă 
+editor.newmap = Hartă Nouă
 editor.center = Centrează
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = Valuri
 waves.remove = Elimină
-waves.never = <niciodată>
 waves.every = la fiecare
 waves.waves = val(uri)
+waves.health = health: {0}%
 waves.perspawn = per apariție
 waves.shields = scuturi/val
 waves.to = până la
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = unități maxime
 waves.guardian = Gardian
 waves.preview = Previzualizare
 waves.edit = Editează...
+waves.random = Random
 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ă.
+waves.sort = Sortează După
+waves.sort.reverse = Inversează Sortarea
+waves.sort.begin = ÃŽnceput
+waves.sort.health = Viață
+waves.sort.type = Tip
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Ascunde
+waves.units.show = Vezi Tot
 
 #intenționat cu literă mică
 wavemode.counts = numere
 wavemode.totals = totaluri
 wavemode.health = viață
+all = All
 
 editor.default = [lightgray]<Prestabilit>
 details = Detalii...
-edit = Editare...
+edit = Editează...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Nume:
 editor.spawn = Adaugă Unitate
 editor.removeunit = Înlătură Unitate
 editor.teams = Echipe
 editor.errorload = Eroare la încărcarea fișierului.
-memory = Mem: {0}mb
-memory2 = Mem:\n {0}mb +\n {1}mb
 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.errorimage = Aceasta este o imagine, nu o hartă.
 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.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Aleatoriu
-editor.apply = Aplică 
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
+editor.apply = Aplică
 editor.generate = Generează
+editor.sectorgenerate = Sector Generate
 editor.resize = Schimbă Dimensiune
 editor.loadmap = Încarcă Harta
 editor.savemap = Salvează Harta
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 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ă'.
@@ -415,12 +541,12 @@ 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.importimage.description = Importă o hartă imagine externă
 editor.export = Exportă...
 editor.exportfile = Exportă Fișier
-editor.exportfile.description = Exportă un fișier hartă 
+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.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.
@@ -432,7 +558,7 @@ 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.replace.description = Desenează doar peste blocurile solide.
 toolmode.replaceall = Înlocuiește-le pe toate
 toolmode.replaceall.description = Înlocuiește toate blocurile solide de pe hartă.
 toolmode.orthogonal = Ortogonal
@@ -442,11 +568,16 @@ 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.fillteams.description = Umple harta cu echipe în loc de blocuri.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Desenează Echipe
 toolmode.drawteams.description = Desenează echipe în loc de blocuri.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 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
@@ -457,41 +588,68 @@ filter.oremedian = Mediană Minereu
 filter.blend = Amestecare
 filter.defaultores = Minereuri Prestabilite
 filter.ore = Minereu
-filter.rivernoise = Zgomot Vizual Râuri 
-filter.mirror = Oglindă 
-filter.clear = Curăță 
+filter.rivernoise = Zgomot Vizual Râuri
+filter.mirror = Oglindă
+filter.clear = Curăță
 filter.option.ignore = Ignoră
-filter.scatter = Împrăștie 
+filter.scatter = Împrăștie
 filter.terrain = Teren
+filter.logic = Logic
+
 filter.option.scale = Scară
-filter.option.chance = Șansă 
+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.falloff = Cădere
 filter.option.angle = Unghi
+filter.option.tilt = Tilt
+filter.option.rotate = Rotește
 filter.option.amount = Cantitate
 filter.option.block = Bloc
 filter.option.floor = Podea
 filter.option.flooronto = Podea Țintă
 filter.option.target = Țintă
+filter.option.replacement = ÃŽnlocuitor
 filter.option.wall = Perete
 filter.option.ore = Minereu
 filter.option.floor2 = Podea Secundară
 filter.option.threshold2 = Cantitate Secundară
-filter.option.radius = Rază 
+filter.option.radius = Rază
 filter.option.percentile = Procent
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Lățime:
 height = Înălțime:
 menu = Meniu
-play = Joacă 
+play = Joacă
 campaign = Campanie
 load = Încarcă
 save = Salvează
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Repornește jocul pentru ca setările de limbă să aibă efect.
 settings = Setări
 tutorial = Tutorial
@@ -499,7 +657,7 @@ tutorial.retake = Reia Tutorial
 editor = Editor
 mapeditor = Editor Hărți
 
-abandon = Abandonează 
+abandon = Abandonează
 abandon.text = Zona aceasta și toate resursele ei vor fi cedate inamicului.
 locked = Blocat
 complete = [lightgray]Finalizat:
@@ -508,21 +666,70 @@ requirement.core = Distruge Nucleul Inamic din {0}
 requirement.research = Cercetează {0}
 requirement.produce = Produ {0}
 requirement.capture = Capturează {0}
-launch.text = Lansează 
-research.multiplayer = Doar gazda poate cerceta noi tehnologii.
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
+launch.text = Lansează
 map.multiplayer = Doar gazda poate vedea harta sectoarelor.
 uncover = Descoperă
 configure = Configurează Încărcarea
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
 
-loadout = Încărcare 
+loadout = Încărcare
 resources = Resurse
+resources.max = Max
 bannedblocks = Blocuri Interzise
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Unități Interzise
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Adaugă-le pe toate
 launch.from = Lansează Din: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destinație: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Cantitatea trebuie să fie un număr între 0 și {0}.
 add = Adaugă...
-boss.health = Viața Gardianului
+guardian = Gardian
 
 connectfail = [scarlet]Eroare de conexiune:\n\n[accent]{0}
 error.unreachable = Nu s-a putut ajunge la server.\nesigur adresa e scrisă corect?
@@ -534,17 +741,23 @@ 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.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Ploaie
-weather.snow.name = Ninsoare
+weather.snowing.name = Ninsoare
 weather.sandstorm.name = Furtună de nisip
 weather.sporestorm.name = Furtună de spori
 weather.fog.name = Ceață
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
 
+sectorlist = Sectoare
+sectorlist.attacked = {0} sunt atacate
 sectors.unexplored = [lightgray]Neexplorat
 sectors.resources = Resurse:
 sectors.production = Producție:
-sectors.export = Export:
+sectors.export = Exportă:
+sectors.import = Importă:
 sectors.time = Timp:
 sectors.threat = Amenințare:
 sectors.wave = Valul:
@@ -552,30 +765,45 @@ sectors.stored = Stocat:
 sectors.resume = Revino
 sectors.launch = Lansare
 sectors.select = Selectează
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]nimic (soarele)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Redenumește Sectorul
 sectors.enemybase = [scarlet]Bază Inamică
 sectors.vulnerable = [scarlet]Vulnerabil
 sectors.underattack = [scarlet]Sectorul e atacat! [accent]{0}% deteriorat
+sectors.underattack.nodamage = [scarlet]Uncaptured
 sectors.survives = [accent]Supraviețuiește {0} valuri
 sectors.go = Start
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
 sector.curcapture = Sector Capturat
 sector.curlost = Sector Pierdut
 sector.missingresources = [scarlet]Resurse din Nucleu Insuficiente
 sector.attacked = Sectorul [accent]{0}[white] este atacat!
 sector.lost = Ai pierdut sectorul [accent]{0}[white]!
-#spațiul lipsă de mai jos e intenționat
-sector.captured = Ai capturat sectorul [accent]{0}[white]!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Schimbă Iconița
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
 
 threat.low = Scăzută
 threat.medium = Medie
 threat.high = Mare
 threat.extreme = Extremă
 threat.eradication = Eradicare
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = Planete
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Soare
 
 sector.impact0078.name = Impact 0078
@@ -593,30 +821,107 @@ sector.fungalPass.name = Pasul Fungic
 sector.biomassFacility.name = Facilitatea de Sinteză a Biomasei
 sector.windsweptIslands.name = Insulele Măturate de Vânt
 sector.extractionOutpost.name = Avanpostul de Extracție
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Terminalul de Lansare Planetară
+sector.coastline.name = Zona de Coastă
+sector.navalFortress.name = Fortăreața Navală
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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, sporii 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 Podișurile Saline. Puține resurse pot fi găsite în această locație.\n\nInamicul a ridicat un complex de depozitare 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 simple au rămas în picioare, restul fiind redus la fier vechi.\nContinuă expansiunea înspre exterior. Redescoperă tehnologia.
-sector.stainedMountains.description = Mai spre mijlocul continentului 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.ruinousShores.description = După deșerturi vine țărmul. Odată, locația aceasta avea un sistem de apărare de coastă. N-a rămas mult din el. Doar structurile de apărare cele mai simple au rămas în picioare, restul fiind redus la fier vechi.\nContinuă expansiunea înspre exterior. Redescoperă tehnologia.
+sector.stainedMountains.description = Mai spre mijlocul continentului 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ă trimită cele mai puternice unități.
 sector.overgrowth.description = Această zonă este plină de buruieni, mai aproape de sursa sporilor.\nInamicul și-a stabilit un avanpost aici. Construiește unități Mace. Distruge-l.
-sector.tarFields.description = O zonă aflată la periferia unui complex de producție petrolieră, între munți și deșert. Una din puținele zone cu resurse utilizabile de țiței.\nDeși abandonată, în apropierea zonei se află de forțe inamice periculoase. Nu le subestima.\n\n[lightgray]Cercetează tehnologie de procesare a petrolului pe cât posibil.
+sector.tarFields.description = O zonă aflată la periferia unui complex de producție petrolieră, între munți și deșert. Una din puținele zone cu resurse utilizabile de țiței.\nDeși abandonată, în apropierea zonei se află forțe inamice periculoase. Nu le subestima.\n\n[lightgray]Cercetează tehnologia de procesare a petrolului pe cât posibil.
 sector.desolateRift.description = O zonă extrem de periculoasă. Multe resurse, dar puțin spațiu. Mare risc de distrugere. Pleacă curând, cât mai curând. Nu te lăsa păcălit de pauzele mari dintre atacurile inamice.
 sector.nuclearComplex.description = O fostă facilitate pt producerea și procesarea de toriu, redusă la ruine.\n[lightgray]Cercetează toriul și multele sale utilizări.\n\nInamicul e prezent aici în mari numere, căutând constant 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.
 sector.biomassFacility.description = Originea sporilor. Aceasta este facilitatea în care au fost cercetați și produși inițial.\nCercetează tehnologia ce poate fi găsită aici. Cultivă spori pt producția de combustibil și mase plastice.\n\n[lightgray]Când facilitatea a decăzut, sporii au fost eliberați. Nimic din din ecosistemul local nu a putut concura cu un organism atât de invaziv.
 sector.windsweptIslands.description = Acest arhipelag izolat se află mai departe, după țărm. Datele arată că odată aveau structuri care produceau [accent]Plastaniu[].\n\nApără-te de unitățile navale ale inamicului. Construiește o bază pe insule. Cercetează fabricile necesare.
 sector.extractionOutpost.description = Un avanpost izolat, construit de inamic cu scopul de a lansa resurse către alte sectoare.\n\nTehnologia de transport intersectorial este esențială pt cuceririle ce urmează. Distruge baza. Cercetează platformele lor de lansare.
-sector.impact0078.description = Aici se află rămășițele primei nave de transport interstelar care a intrat în acest sistem stelar.\n\nSalvează cât mai mult posibil din epavă. Cercetează orice tehnologie intactă.
+sector.impact0078.description = Aici se află rămășițele primei nave de transport interstelar care a intrat în acest sistem stelar.\n\nSalvează cât de mult posibil din epavă. Cercetează orice tehnologie intactă.
 sector.planetaryTerminal.description = Ținta finală.\n\nAceastă bază de coastă conține o structură capabilă să lanseze nuclee către alte planete locale. Este extrem de bine păzită.\n\nProdu unități navale. Elimină inamicul cât de rapid se poate. Cercetează structura de lansare.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+
+status.burning.name = Arde
+status.freezing.name = Îngheață
+status.wet.name = Umed
+status.muddy.name = Noroios
+status.melting.name = Topește
+status.sapped.name = Slăbește
+status.electrified.name = Electrificat
+status.spore-slowed.name = ÃŽncetinit de Spori
+status.tarred.name = Păcurit
+status.overdrive.name = Suprasolicitat
+status.overclock.name = Overclock
+status.shocked.name = Electrocutat
+status.blasted.name = Explozie
+status.unmoving.name = Nemișcat
+status.boss.name = Gardian
 
 settings.language = Limbă
 settings.data = Datele Jocului
 settings.reset = Resetează
 settings.rebind = Reatribuie
-settings.resetKey = Resetează 
+settings.resetKey = Resetează
 settings.controls = Controale
 settings.game = Joc
 settings.sound = Sunet
@@ -631,8 +936,9 @@ settings.clearresearch.confirm = Sigur vrei să ștergi toate tehnologiile cerce
 settings.clearcampaignsaves = Șterge Salvările din Campanie
 settings.clearcampaignsaves.confirm = Sigur vrei să ștergi toate salvările din campanie?
 paused = [accent]< Pauză >
-clear = Curăță 
+clear = Curăță
 banned = [scarlet]Interzis
+unsupported.environment = [scarlet]Mediu Neacceptat
 yes = Da
 no = Nu
 info.title = Info
@@ -640,15 +946,19 @@ error.title = [scarlet]A apărut o eroare.
 error.crashtitle = A apărut o eroare.
 unit.nobuild = [scarlet]Unitatea nu poate construi.
 lastaccessed = [lightgray]Ultima Accesare: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <vezi pe hartă>
 stat.description = Utilizare
 stat.input = Necesită
 stat.output = Produce
+stat.maxefficiency = Max Efficiency
 stat.booster = Îmbunătățiri
 stat.tiles = Teren Necesar
-stat.affinities = Efecte Teren
-stat.powercapacity = Capacitate electrică 
+stat.affinities = Afinități
+stat.opposites = Opuși
+stat.powercapacity = Capacitate electrică
 stat.powershot = Electricitate/GlonÈ›
 stat.damage = Forță
 stat.targetsair = Lovește Aeronave
@@ -659,32 +969,36 @@ stat.shootrange = Rază
 stat.size = Mărime
 stat.displaysize = Mărime Monitor Logic
 stat.liquidcapacity = Capacitate Lichid
-stat.powerrange = Rază Electrică 
+stat.powerrange = Rază Electrică
 stat.linkrange = Rază Legături
-stat.instructions = Instrucțiuni 
+stat.instructions = Instrucțiuni
 stat.powerconnections = Maxim Conexiuni
-stat.poweruse = Consum Electricitate 
+stat.poweruse = Consum Electricitate
 stat.powerdamage = Electricitate/Forța Glonțului
 stat.itemcapacity = Capacitate Materiale
 stat.memorycapacity = Capacitate Memorie
 stat.basepowergeneration = Generare Electricitate (Bază)
 stat.productiontime = Timp Producție
 stat.repairtime = Durată Reparare Bloc
+stat.repairspeed = Viteză Reparare
 stat.weapons = Arme
 stat.bullet = GlonÈ›
-stat.speedincrease = Creștere Viteză 
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
+stat.speedincrease = Creștere Viteză
 stat.range = Rază
 stat.drilltier = Minabile
 stat.drillspeed = Viteză Burghiu (Bază)
 stat.boosteffect = Efect de Îmbunătățire
 stat.maxunits = Maxim Unități Active
 stat.health = Viață
+stat.armor = Armură
 stat.buildtime = Timp Construcție
 stat.maxconsecutive = Maxim Consecutive
 stat.buildcost = Cost Construcție
 stat.inaccuracy = Inacuratețe
 stat.shots = Lovituri
-stat.reload = Lovituri/Secundă
+stat.reload = Rata de Tragere
 stat.ammo = Muniție
 stat.shieldhealth = Viață Scut
 stat.cooldowntime = Timp de Reîncărcare
@@ -694,6 +1008,7 @@ stat.lightningchance = Șansă Fulger
 stat.lightningdamage = Forță Fulger
 stat.flammability = Inflamabilitate
 stat.radioactivity = Radioactivitate
+stat.charge = Sarcină Electrică
 stat.heatcapacity = Capacitate de Căldură
 stat.viscosity = Vâscozitate
 stat.temperature = Temperatură
@@ -702,25 +1017,77 @@ stat.buildspeed = Viteză Construcție
 stat.minespeed = Viteză Minare
 stat.minetier = Minabile
 stat.payloadcapacity = Capacitate Încărcătură
-stat.commandlimit = Nr Unități Comandate
 stat.abilities = Abilități
 stat.canboost = Are Propulsor
 stat.flying = Zboară
 stat.ammouse = Consum muniție
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Multiplicator Forță
+stat.healthmultiplier = Multiplicator Viață
+stat.speedmultiplier = Multiplicator Viteză
+stat.reloadmultiplier = Multiplicator Lovituri/sec
+stat.buildspeedmultiplier = Multiplicator Viteză Construcție
+stat.reactive = Reacționează la
+stat.immunities = Immunities
+stat.healing = Reparare
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Câmp de Forță
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Câmp de Reparare
-ability.statusfield = Câmp Suprasolicitare Unități
-ability.unitspawn = Fabrică de {0}
-ability.shieldregenfield = Scurt Regenerabil
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Câmp de Stare
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fabrică
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Câmp Regenerare Scut
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Mișcare Fulger
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Câmp de Energie
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Burghiu Mai Bun Necesar
-bar.noresources = Resurse lipsă 
-bar.corereq = Plasare pe Nucleu Necesară 
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Resurse lipsă
+bar.corereq = Plasare pe Nucleu Necesară
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Viteză Minare: {0}/s
 bar.pumpspeed = Viteză Pompare: {0}/s
 bar.efficiency = Eficiență: {0}%
+bar.boost = Efect Grăbire: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Electricitate: {0}/s
 bar.powerstored = Stocată: {0}/{1}
 bar.poweramount = Electricitate: {0}
@@ -730,50 +1097,67 @@ bar.items = Materiale: {0}
 bar.capacity = Capacitate: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = Lichid
-bar.heat = Căldură 
-bar.power = Electricitate 
+bar.heat = Căldură
+bar.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
+bar.power = Electricitate
 bar.progress = Progres
-bar.input = Necesită 
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
+bar.input = Necesită
 bar.output = Produce
+bar.strength = [stat]{0}[lightgray]x putere
 
 units.processorcontrol = [lightgray]Controlat de Procesor
 
 bullet.damage = [stat]{0}[lightgray] forță
-bullet.splashdamage = [stat]{0}[lightgray] forță explozivă ~[stat] {1}[lightgray] pătrate
+bullet.splashdamage = [stat]{0}[lightgray] forță pe raza ~[stat] {1}[lightgray] pătrate
 bullet.incendiary = [stat]incendiar
-bullet.sapping = [stat]atragere inamici
 bullet.homing = [stat]cu radar
-bullet.shock = [stat]șoc
-bullet.frag = [stat]fragil
+bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x fragmente:
+bullet.lightning = [stat]{0}[lightgray]x fulgere ~ [stat]{1}[lightgray] forță
 bullet.buildingdamage = [stat]{0}%[lightgray] forță/clădire
-bullet.knockback = [stat]{0} [lightgray]împingere
-bullet.pierce = [stat]{0}[lightgray]x penetrare
-bullet.infinitepierce = [stat]penetrare
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] împingere
+bullet.pierce = [stat]{0}[lightgray]x penetrează
+bullet.infinitepierce = [stat]penetrează
 bullet.healpercent = [stat]{0}[lightgray]% reparare
-bullet.freezing = [stat]înghețat 
-bullet.tarred = [stat]lipicios
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x multiplicator muniție
 bullet.reload = [stat]{0}[lightgray]x lovituri
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = blocuri
 unit.blockssquared = blocuri²
 unit.powersecond = electricitate/secundă
+unit.tilessecond = pătrate/secundă
 unit.liquidsecond = unități lichid/secundă
 unit.itemssecond = materiale/secundă
 unit.liquidunits = unități lichid
 unit.powerunits = electricitate
+unit.heatunits = heat units
 unit.degrees = grade
 unit.seconds = secunde
 unit.minutes = min
 unit.persecond = /sec
 unit.perminute = /min
-unit.timesspeed = x viteză 
+unit.timesspeed = x viteză
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = viață scut
 unit.items = materiale
 unit.thousands = mii
 unit.millions = mil
-unit.billions = b
+unit.billions = mld
+unit.shots = shots
 unit.pershot = /lovitură
 category.purpose = Utilizare
 category.general = General
@@ -782,104 +1166,135 @@ category.liquids = Lichide
 category.items = Materiale
 category.crafting = Necesită/Produce
 category.function = Funcționare
-category.optional = Îmbunătățiri opționale 
+category.optional = Îmbunătățiri opționale
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Sari peste Animația de Lansare/Aterizare a Nucleului
 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.logichints.name = Indicii Procesoare Logice
 setting.backgroundpause.name = Pune Pauză în Fundal
+setting.buildautopause.name = Autopauză de la Construit
+setting.doubletapmine.name = Dublu-Click pt a Mina
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Dezactivează Modurile în Cazul unui Crash la Pornire
 setting.animatedwater.name = Suprafețe Animate
 setting.animatedshields.name = Scuturi Animate
-setting.antialias.name = Antialiasing[lightgray] (necesită repornire)[]
-setting.playerindicators.name = Indicatori Jucător 
+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.fpscap.text = FPS {0}
+setting.uiscale.name = Scară Interfață
+setting.uiscale.description = Repornire necesară pt a aplica schimbările.
 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.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Vezi Efectele
 setting.destroyedblocks.name = Vezi Blocurile Distruse
-setting.blockstatus.name = Vezi Statusul Blocului
+setting.blockstatus.name = Vezi Starea 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.milliseconds = {0} millisecunde
 setting.fullscreen.name = Ecran Complet
-setting.borderlesswindow.name = Fereastră Fără Margine[lightgray] (repornirea poate fi necesară)
+setting.borderlesswindow.name = Fereastră Fără Margine
+setting.borderlesswindow.name.windows = Ecran Complet Fără Margine
+setting.borderlesswindow.description = Repornirea poate fi necesară pt a aplica schimbările.
 setting.fps.name = Vezi FPS & Ping
+setting.console.name = Enable Console
 setting.smoothcamera.name = Cameră Graduală
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelează
 setting.minimap.name = Vezi Miniharta
 setting.coreitems.name = Vezi Materialele din Nucleu
 setting.position.name = Vezi Poziția Jucătorului
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Volumul Muzicii
-setting.atmosphere.name = Vezi Atmosfera Planetelor 
+setting.atmosphere.name = Vezi Atmosfera Planetelor
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Volum Ambiental
 setting.mutemusic.name = Muzica pe Mut
 setting.sfxvol.name = Volum Efecte Sonore
 setting.mutesound.name = Sunetul pe Mut
 setting.crashreport.name = Trimite Rapoarte de Crash anonime
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Auto-Creează Salvări
-setting.publichost.name = Vizibilitatea Jocurilor Publice
-setting.playerlimit.name = Limita Jucătorilor 
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Limita Jucătorilor
 setting.chatopacity.name = Opacitate Chat
 setting.lasersopacity.name = Opacitate Laser Electric
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Opacitate Poduri
 setting.playerchat.name = Vezi Chat Temporar
 setting.showweather.name = Vezi Vremea
-public.confirm = Vrei să îți faci jocul public?\n[accent]Oricine va putea intra în jocurile tale.\n[lightgray]Poți schimba asta mai târziu din Setări->Joc->Vizibilitatea Jocurilor Publice.
-public.confirm.really = Dacă vrei să joci cu prietenii, folosește butonul [green]Invită Prieteni[] în loc de un [scarlet]Server Public[]!\nSigur vrei să-ți faci jocul [scarlet]public[]?
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Adaptați interfața pentru a afișa notch-ul
+setting.macnotch.description = Repornire necesară pt a aplica schimbările.
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = 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 
+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.command.name = Unit Command
 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.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.toggle_power_lines.name = Oprește/Pornește Starea Electricelor
+keybind.toggle_block_status.name = Oprește/Pornește Starea 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.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 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_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
@@ -898,22 +1313,24 @@ keybind.select.name = Selectează/Trage
 keybind.diagonal_placement.name = Plasare Diagonală
 keybind.pick.name = Ia Bloc
 keybind.break_block.name = Distruge Bloc
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 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.pause_building.name = Pauză/Reia Construcție
 keybind.minimap.name = Minihartă
 keybind.planet_map.name = Harta Planetei
 keybind.research.name = Cercetare
+keybind.block_info.name = Informațiile Blocului
 keybind.chat.name = Chat
-keybind.player_list.name = Listă Jucători 
+keybind.player_list.name = Listă Jucători
 keybind.console.name = Consolă
-keybind.rotate.name = Rotește 
+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 = Istoric Chat ÃŽnapoi
@@ -931,51 +1348,102 @@ 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.attack.description = Distruge baza inamicului. \n[gray]E nevoie de un nucleu Agresor (roșu) pe hartă pt a juca.
 mode.custom = Reguli Personalizate
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Resurse Infinite
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactoarele Explodează
+rules.coreincinerates = Nucleul Incinerează Resursele în Plus
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Se Pot Folosi Scheme
 rules.wavetimer = Valuri pe Timp
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Valuri
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Modul Atac
-rules.buildai = AI-ul Construiește
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Îndepărtează Clădirile Echipelor Învinse (PvP)
+rules.corecapture = Capturează Nucleele Distruse
+rules.polygoncoreprotection = Protecție Poligonală a Nucleului
+rules.placerangecheck = Placement Range Check
 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.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Multiplicatorul Vieții Unităților
 rules.unitdamagemultiplier = Multiplicatorul Deteriorării Unităților
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Nucleele Contribuie la Limita Unităților
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Limita de Bază a Unităților
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Interzisă Construirea în Jurul Nucleului Inamic:[lightgray] (pătrate)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Spațiul Dintre Valuri:[lightgray] (sec)
+rules.initialwavespacing = Initial Wave Spacing:[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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Raza Zonei de Lansare:[lightgray] (pătrate)
 rules.unitammo = Unitățile Necesită Muniție
+rules.enemyteam = Echipa Inamică
+rules.playerteam = Echipa Jucătorului
 rules.title.waves = Valuri
-rules.title.resourcesbuilding = Resurse și Construit
+rules.title.resourcesbuilding = Resurse și Construcție
 rules.title.enemy = Inamici
 rules.title.unit = Unități
 rules.title.experimental = Experimental
 rules.title.environment = Mediu
+rules.title.teams = Echipe
+rules.title.planet = Planet
 rules.lighting = Luminozitate Ambientală
-rules.enemyLights = Inamicii Luminează
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Foc
+rules.anyenv = <Any>
 rules.explosions = Explozia Deteriorează Blocul/Unitatea
 rules.ambientlight = Ambient
 rules.weather = Vreme
 rules.weather.frequency = Frevență:
 rules.weather.always = ÃŽncontinuu
 rules.weather.duration = Durată:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Materiale
 content.liquid.name = Lichide
 content.unit.name = Unități
 content.block.name = Blocuri
+content.status.name = Efecte de Stare
 content.sector.name = Sectoare
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Cupru
 item.lead.name = Plumb
@@ -993,10 +1461,24 @@ item.blast-compound.name = Compus Explozibil
 item.pyratite.name = Piratită
 item.metaglass.name = Metasticlă
 item.scrap.name = Fier Vechi
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
+
 liquid.water.name = Apă
 liquid.slag.name = Zgură
 liquid.oil.name = Petrol
 liquid.cryofluid.name = Criofluid
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -1024,21 +1506,48 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
-unit.scepter.name = Septer
+unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 
-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.basalt-boulder.name = Bolovan de Bazalt
-block.slag.name = Zgură
+block.grass.name = Iarbă
+block.molten-slag.name = Zgură
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Cosmos
 block.salt.name = Sare
 block.salt-wall.name = Perete de Sare
@@ -1065,27 +1574,31 @@ 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.spawn.name = Punct Inamic de Lansare
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 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.deep-water.name = Apă Adâncă
+block.shallow-water.name = Apă
 block.tainted-water.name = Apă Tulbure
+block.deep-tainted-water.name = Apă Adâncă și 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.sand-floor.name = Nisip
 block.darksand.name = Nisip Negru
 block.ice.name = Gheață
 block.snow.name = Zăpadă
-block.craters.name = Cratere
+block.crater-stone.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-boulder.name = Bolovan de Dacit
+block.rhyolite.name = Riolit
 block.dacite-wall.name = Perete de Dacit
+block.dacite-boulder.name = Bolovan de Dacit
 block.ice-snow.name = Gheață Înzăpezită
 block.stone-wall.name = Perete de Piatră
 block.ice-wall.name = Perete de Gheață
@@ -1101,7 +1614,8 @@ 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-4.name = Podea de Metal 4
+block.metal-floor-5.name = Podea de Metal 5
 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
@@ -1137,13 +1651,12 @@ block.armored-conveyor.name = Bandă Armată
 block.junction.name = Intersecție
 block.router.name = Router
 block.distributor.name = Distributor
-#experimental, pot fi șterse în viitor
-block.block-forge.name = Forjă de Blocuri
-block.block-loader.name = Încărcător de Blocuri
-block.block-unloader.name = Descărcător de Blocuri
 block.sorter.name = Sortator
 block.inverted-sorter.name = Sortator Invers
 block.message.name = Mesaj
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminator
 block.overflow-gate.name = Poartă de Revărsare
 block.underflow-gate.name = Poartă de Subversare
@@ -1174,9 +1687,9 @@ 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.item-void.name = Vid de Material
 block.liquid-source.name = Sursă de Lichid
-block.liquid-void.name = Portal de Lichid
+block.liquid-void.name = Vid de Lichid
 block.power-void.name = Consumator de Electricitate
 block.power-source.name = Sursă de Electricitate
 block.unloader.name = Descărcător
@@ -1195,39 +1708,41 @@ 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.repair-turret.name = Pistol 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-container.name = Liquid Container
 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.impulse-pump.name = Pompă Termală
 block.thermal-generator.name = Generator Termal
-block.alloy-smelter.name = Topitorie Aliaj
+block.surge-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.shock-mine.name = Mină cu Electroș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.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Container
 block.launch-pad.name = Platformă de Lansare
-block.launch-pad-large.name = Platformă de Lansare Mare
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 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
@@ -1237,10 +1752,179 @@ 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.duct.name = Canal
+block.duct-router.name = Router de Canal
+block.duct-bridge.name = Pod de Canal
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Vid de Încărcătură
+block.payload-source.name = Sursă de Încărcătură
 block.disassembler.name = Dezasamblator
 block.silicon-crucible.name = Creuzet de Silicon
 block.overdrive-dome.name = Dom de Suprasolicitare
 block.interplanetary-accelerator.name = Accelerator Interplanetar
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Întrerupător
 block.micro-processor.name = Microprocesor
@@ -1250,43 +1934,40 @@ block.logic-display.name = Monitor Logic
 block.large-logic-display.name = Monitor Logic Mare
 block.memory-cell.name = Celulă de Memorie
 block.memory-bank.name = Bancă de Memorie
+team.malis.name = Malis
+team.crux.name = Agresor
+team.sharded.name = Portocaliu
+team.derelict.name = Ruină
+team.green.name = Verde
 
-team.blue.name = albastră
-team.crux.name = roșie
-team.sharded.name = portocalie
-team.orange.name = portocalie
-team.derelict.name = abandonată
-team.green.name = verde
-team.purple.name = mov
+team.blue.name = Albastru
 
 hint.skip = Treci peste
 hint.desktopMove = Folosește [accent][[WASD][] ca să te miști.
 hint.zoom = [accent]Cu rotița de la mouse[] poți ajusta zoomul.
-hint.mine = Du-te lângă \uf8c4 minereul de cupru și [accent]dă click[] pe el pt a mina manual.
 hint.desktopShoot = [accent][[Click-stânga][] pt a trage cu armele navei.
 hint.depositItems = Pt a transfera materiale, trage-le din nava ta către nucleu.
 hint.respawn = Pt a te regenera ca navă în nucleu, apasă [accent][[V][].
 hint.respawn.mobile = Acum controlezi o unitate/structură. Pt a te regenera ca navă în nucleu, [accent]dă click pe avatarul din colțul din stânga-sus.[]
 hint.desktopPause = Apasă pe [accent][[Space][] pt a da pauză jocului. Apasă din nou pt a ieși din modul pauză.
-hint.placeDrill = Selectează tabul \ue85e [accent]Burghie[] din meniul din dreapta-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina.
-hint.placeDrill.mobile = Selectează tabul \ue85e [accent]Burghie[] din meniul din dreapta-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click un minereu de cupru pt a mina.\n\nApasă pe \ue800 [accent]bifa[] din dreapta-jos pt confirmare.
-hint.placeConveyor = Benzile transportă materiale din burghie către alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nDă click pe ecran și trage pt a desena o linie de bandă.\nFolosește [accent]rotița mouseului[] pt rotire.
-hint.placeConveyor.mobile = Benzile transportă materiale din burghie către alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nȚine apăsat cu degetul pt o secundă și trage pt a desena o linie de bandă.
-hint.placeTurret = Construiește \uf861 [accent]Arme[] pt a-ți apăra baza de inamici.\n\nArmele necesită muniție. Putem folosi \uf838cupru.\nAlimentează arma folosind benzi și burghie.
 hint.breaking = Ține apăsat [accent]click-dreapta[] și trage pe ecran pt a distruge blocuri.
 hint.breaking.mobile = Activează \ue817 [accent]ciocanul[] din dreapta-jos și dă click pt a distruge blocuri.\n\nȚine apăsat cu degetul pt o secundă și trage pt a distruge mai multe blocuri deodată.
+hint.blockInfo = Poți vedea informații despre un bloc selectându-l în [accent]meniul de construcție[] și dând click pe butonul [accent][[?][] din dreapta.
+hint.derelict = [accent]Ruinele[] sunt rămășițe deteriorate ale bazelor vechi care nu mai funcționează.\n\nAceste structuri pot fi [accent]deconstruite[] pt resurse.
 hint.research = Folosește butonul \ue875 [accent]Cercetează[] pt a cerceta noi tehnologii.
 hint.research.mobile = Folosește butonul \ue875 [accent]Cercetează[] din \ue88c [accent]Meniu[] pt a cerceta noi tehnologii.
 hint.unitControl = Ține apăsat [accent][[Ctrl][] și [accent]dă click[] pt a controla unități aliate sau arme.
 hint.unitControl.mobile = [accent][[Dă dublu click][] pt a controla unități aliate sau arme.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
 hint.launch = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către o altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din dreapta-jos.
 hint.launch.mobile = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către o altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din \ue88c [accent]Meniu[].
 hint.schematicSelect = Ține apăsat [accent][[F][] și trage pt a selecta blocuri pt copiere.\n\n[accent][[Click pe rotiță][] pt a copia un singur tip de bloc.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Ține apăsat [accent][[Ctrl][] în timp ce plasezi benzi pt a genera automat o cale între 2 puncte.
 hint.conveyorPathfind.mobile = Activează \ue844 [accent]modul diagonal[] și plasează benzi pt a genera automat o cale între 2 puncte.
 hint.boost = Ține apăsat [accent][[Shift][] pt a zbura peste obstacole cu unitatea ta.\n\nDoar câteva unități de artilerie au propulsoare.
-hint.command = Apasă [accent][[G][] pt a comanda unitățile [accent]similare[] din apropiere în formație.\n\nPt a comanda unități de artilerie, trebuie întâi să controlezi o unitate de artilerie.
-hint.command.mobile = [accent][[Dublu-click][] pe unitatea ta pt a comanda unitățile [accent]similare[] din apropiere în formație.
 hint.payloadPickup = Apasă [accent][[[] pt a ridica blocuri mici sau unități.
 hint.payloadPickup.mobile = [accent]Ține apăsat[] pe un bloc mic/o unitate pt a o ridica.
 hint.payloadDrop = Apasă [accent]][] pt a descărca încărcătura.
@@ -1294,10 +1975,62 @@ hint.payloadDrop.mobile = [accent]Ține apăsat[] pe o locație goală pt a desc
 hint.waveFire = Armele [accent]Wave[] încărcate cu apă vor stinge incendiile automat.
 hint.generator = \uf879 [accent]Generatoarele pe Combustie[] ard cărbunele și transmit electricitatea blocurilor învecinate.\n\nElectricitatea poate fi transmisă pe distanțe lungi folosind \uf87f [accent]Noduri Electrice[].
 hint.guardian = Unitățile [accent]Gardian[] au armuri puternice. Munițiile slabe precum [accent]Cuprul[] și [accent]Plumbul[] [scarlet]nu sunt eficiente[].\n\nFolosește arme mai bune sau muniție de \uf835 [accent]Grafit[] pt \uf861Duo/\uf859Salvo pt a nimici Gardianul.
-hint.coreUpgrade = Un nucleu poate pot fi îmbunătățit [accent]plasând o alt nucleu mai bun peste el[].\n\nPlasează un nucleu  [accent]Foundation[] peste nucleul  [accent]Shard[]. Nucleul nu poate fi plasat decât pe alte nuclee. Asigură-te că nu sunt alte benzi sau obstacole care să împiedice plasarea.
+hint.coreUpgrade = Un nucleu poate pot fi îmbunătățit [accent]plasând o alt nucleu mai bun peste el[].\n\nPlasează un nucleu \uf868 [accent]Foundation[] peste nucleul \uf869 [accent]Shard[]. Nucleul nu poate fi plasat decât pe alte nuclee. Asigură-te că nu sunt alte benzi sau obstacole care să împiedice plasarea.
 hint.presetLaunch = Poți lansa de oriunde în sectoarele gri, precum [accent]Pădurea Glacială[]. Ele sunt [accent]zone[] speciale [accent]de aterizare[]. Nu ai nevoie să capturezi sectoarele învecinate pt a lansa.\n\n[accent]Sectoarele numerotate[], ca acesta, sunt [accent]opționale[].
+hint.presetDifficulty = Acest sector are un [scarlet]nivel ridicat de amenințare inamică[].\n[accent]Nu e recomandat[] să lansezi în asemenea sectoare fără pregătiri sau tehnologie adecvată.
 hint.coreIncinerate = După ce nucleul se umple până la refuz cu un tip de material, toate materialele în plus de acel tip care încearcă să între în nucleu sunt [accent]incinerate[].
-hint.coopCampaign = Când joci [accent]campania cooperând cu alți jucători[], materialele produse în sectorul curent vor fi transferate și către [accent]sectoarele tale locale[].\n\nDe asemenea, vei debloca tot ceea ce cercetează gazda.
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = Folosit în tot felul de construcții și muniție.
 item.copper.details = Cupru. Metal anormal de abundent pe Serpulo. Structural slab dacă nu este consolidat.
@@ -1308,7 +2041,7 @@ item.graphite.description = Folosit pt componente electrice și alimentarea arme
 item.sand.description = Folosit pt producție sau alte materiale rafinate.
 item.coal.description = Folosit extensiv ca combustibil și pt producerea de materiale rafinate.
 item.coal.details = Pare să fie materie vegetală fosilizată, formată cu mult înainte de evenimentul însămânțării.
-item.titanium.description = Folosit pt structuri transportatoare de lichid, burghie și aeronautică.
+item.titanium.description = Folosit pt structuri transportatoare de lichid, burghie și în fabrici.
 item.thorium.description = Folosit în structuri durabile și combustibil nuclear.
 item.scrap.description = Folosit in topitoare și pulverizatoare pt a fi rafinat în alte materiale.
 item.scrap.details = Rămășițe ale structurilor și unităților vechi.
@@ -1320,23 +2053,36 @@ item.spore-pod.description = Folosită pt a fi convertită în petrol, explozibi
 item.spore-pod.details = Spori. Probabil o formă de viață sintetică. Emite gaze toxice altor forme de viață biologică. Nu că ar mai fi rămas prea multe aici.
 item.blast-compound.description = Folosit în bombe și muniție explozibilă.
 item.pyratite.description = Folosită în armele incendiare și generatoarele pe bază de procese de combustie.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 
 liquid.water.description = Folosită pt răcirea mașinăriilor și procesarea deșeurilor.
-liquid.slag.description = Rafinată în separatoare înapoi în materialele constituente, sau pulverizată înspre unitățile inamice ca armă.
-liquid.oil.description = Folosit în producerea avansată de materialet și ca muniție incendiară.
+liquid.slag.description = Rafinată înapoi în materialele constituente cu ajutorul separatoarelor sau pulverizată înspre unitățile inamice ca armă.
+liquid.oil.description = Folosit în producerea avansată de materiale și ca muniție incendiară.
 liquid.cryofluid.description = Folosit ca răcitor în reactoare, arme și fabrici.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
 
-block.resupply-point.description = Realimentează unitățile din apropiere cu muniție de cupru. Nu este compatibil cu unitățile care se încarcă din baterii.
+block.derelict = \ue815 [lightgray]Ruină
 block.armored-conveyor.description = Transportă materialele înainte. Nu acceptă materiale de pe lateral decât de la alte benzi.
 block.illuminator.description = Emite lumină.
 block.message.description = Păstrează un mesaj. Folosit pt comunicarea dintre aliați.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Compresează cărbunele în grafit.
 block.multi-press.description = Compresează cărbunele în grafit. Are nevoie de apă ca răcitor.
 block.silicon-smelter.description = Rafinează silicon din nisip și cărbune.
 block.kiln.description = Toarnă nisipul și plumbul în metasticlă.
 block.plastanium-compressor.description = Produce plastaniu din petrol și titan.
 block.phase-weaver.description = Sintetizează fibră-fază din toriu și nisip.
-block.alloy-smelter.description = Combină titan, plumb, silicon și cupru pt a produce supra aliaj.
+block.surge-smelter.description = Combină titan, plumb, silicon și cupru pt a produce supra aliaj.
 block.cryofluid-mixer.description = Amestecă apă și pudră fină de titan pt a produce criofluid.
 block.blast-mixer.description = Produce un compus explozibil din piratită și păstăi de spori.
 block.pyratite-mixer.description = Amestecă plumb, cărbune și nisip în piratită.
@@ -1352,6 +2098,8 @@ block.item-source.description = Generează materiale la infinit. Doar în modul
 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.payload-source.description = Generează încărcături la infinit. Doar în modul sandbox.
+block.payload-void.description = Distruge orice încărcătură. Doar în modul sandbox.
 block.copper-wall.description = Protejează clădirile de proiectilele inamice.
 block.copper-wall-large.description = Protejează clădirile de proiectilele inamice.
 block.titanium-wall.description = Protejează clădirile de proiectilele inamice.
@@ -1364,6 +2112,10 @@ block.phase-wall.description = Protejează clădirile de proiectilele inamice, r
 block.phase-wall-large.description = Protejează clădirile de proiectilele inamice, reflectând majoritatea gloanțelor la impact.
 block.surge-wall.description = Protejează clădirile de proiectilele inamice, lansând periodic lasere electrice la contactul cu gloanțele.
 block.surge-wall-large.description = Protejează clădirile de proiectilele inamice, lansând periodic lasere electrice la contactul cu gloanțele.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Un perete care poate fi deschis sau închis.
 block.door-large.description = Un perete care poate fi deschis sau închis.
 block.mender.description = Repară periodic blocurile din vecinătate. \nPoate folosi silicon pt a îmbunătăți raza de acțiune și eficiența.
@@ -1382,16 +2134,17 @@ block.inverted-sorter.description = Similar sortatorului standard, dar materialu
 block.router.description = Distribuie materialele primite în alte 3 direcții în mod egal.
 block.router.details = Un rău necesar. Nu folosi niciodată pt a introduce materiale în blocuri, căci vor fi blocate de produșii blocurilor.
 block.distributor.description = Distribuie materialele primite î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. Nu poate fi folosită lângă alte porți.
-block.underflow-gate.description = Opusul porții de revărsare. Transportă materialele în față dacă benzile din stânga și dreapta sunt blocate. Nu poate fi folosită lângă alte porți.
-block.mass-driver.description = Dispozitiv folosit pt transportul materialelor pe distanțe mari. Adună mai multe materiale și apoi le lansează până la un alt distributor în masă pe o rază mare.
+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 = Structură de transport al materialelor pe distanțe mari. Adună mai multe materiale și apoi le lansează către un alt distributor în masă.
 block.mechanical-pump.description = Pompează lichide din mediul înconjurător. Nu necesită electricitate.
 block.rotary-pump.description = Pompează lichide din mediul înconjurător. Necesită electricitate.
-block.thermal-pump.description = Pompează lichide din mediul înconjurător.
+block.impulse-pump.description = Pompează lichide din mediul înconjurător.
 block.conduit.description = Împinge lichidele în față. Folosit cu pompe și alte conducte.
 block.pulse-conduit.description = Împinge lichidele în față. Transportă lichidele mai rapid și stochează mai mult decât conductele standard.
-block.plated-conduit.description =  Împinge lichidele în față. Nu acceptă lichide din lateral de la altceva în afară de conducte. Lichidul nu se varsă la exterior.
+block.plated-conduit.description = Împinge lichidele în față. Nu acceptă lichide din lateral de la altceva în afară de conducte. Lichidul nu se varsă la exterior.
 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.
+block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Stochează o mare cantitate de lichid și îl lasă să curgă prin toate conductele adiacente, similar unui router de lichid.
 block.liquid-junction.description = Acționează ca un pod pt două conducte care se intersectează.
 block.bridge-conduit.description = Transportă lichidele peste orice teren sau clădire.
@@ -1401,7 +2154,7 @@ 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 = Transportă energia din baterii într-o direcție, dar doar dacă partea cealaltă 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ă electricitatea pt rezerve atunci când există un surplus în rețea. Oferă electricitate atunci când există un deficit. Capacitate mai mare decât cea a bateriei obișnuite. 
+block.battery-large.description = Stochează electricitatea pt rezerve atunci când există un surplus în rețea. Oferă electricitate atunci când există un deficit. Capacitate mai mare decât cea a bateriei obișnuite.
 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 = Generează electricitate arzând materiale inflamabile și convertind apa în abur.
@@ -1424,11 +2177,14 @@ block.core-shard.details = Prima versiune. Compact. Autoreprodus. Echipat cu pro
 block.core-foundation.description = Nucleul bazei. Bine armat. Stochează mai multe resurse decât nucleul Shard.
 block.core-foundation.details = A doua versiune.
 block.core-nucleus.description = Nucleul bazei. Extrem de bine armat. Stochează cantități masive de resurse.
-block.core-nucleus.details =  A treia și ultima versiune. 
+block.core-nucleus.details = A treia și ultima versiune.
 block.vault.description = Stochează o mare cantitate de materiale de orice tip. Conținutul poate fi recuperat folosind un descărcător.
 block.container.description = Stochează o mică cantitate de materiale de orice tip. Conținutul poate fi recuperat folosind un descărcător.
 block.unloader.description = Descarcă materialele din orice bloc din apropiere, mai puțin cele de transport.
 block.launch-pad.description = Lansează grămezi de materiale către sectoarele selectate.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Trage cu gloanțe alternante către inamici.
 block.scatter.description = Trage cu bucățele de plumb, fier vechi sau metasticlă către aeronavele inamice.
 block.scorch.description = Arde orice artilerie inamică din apropiere. Foarte eficient la distanță mică.
@@ -1443,24 +2199,24 @@ block.ripple.description = Lovește cu capsule către inamici pe distanțe mari.
 block.cyclone.description = Trage cu grămezi explozive de material către unitățile inamice din apropiere.
 block.spectre.description = Trage cu gloanțe mari care penetrează scuturile inamicilor din apropiere.
 block.meltdown.description = Se încarcă și trage cu un laser continuu la inamicii din apropiere. Necesită răcitor pt a opera.
+block.foreshadow.description = Trage către o țintă cu un glonț imens pe distanțe lungi. Inamicii cu mai multă viață au prioritate.
 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.
 block.parallax.description = Trage cu o rază tractoare care atrage aeronavele inamice, deteriorându-le.
 block.tsunami.description = Trage jeturi puternice de lichid către inamici. Stinge focul automat când este alimentată cu apă.
 block.silicon-crucible.description = Rafinează silicon din nisip și cărbune, folosind piratită ca sursă adițională de cărbune. Mai eficient când e plasat în locuri calde.
 block.disassembler.description = Separă zgura în componentele sale minerale exotice. Eficiență mică. Poate produce toriu.
-block.overdrive-dome.description =  Grăbește blocurile din apropiere. Necesită fibră-fază și silicon pt a opera.
+block.overdrive-dome.description = Grăbește blocurile din apropiere. Necesită fibră-fază și silicon pt a opera.
 block.payload-conveyor.description = Mișcă încărcături mari, cum ar fi unitățile militare din fabrici.
 block.payload-router.description = Distribuie încărcătura primită în 3 direcții diferite.
-block.command-center.description = Controlează comportamentul unităților militare folosind diverse comenzi.
 block.ground-factory.description = Produce unități de artilerie. Unitățile produse pot fi folosite direct sau mutate în reconstructoare pt îmbunătățiri.
 block.air-factory.description = Produce unități aeriene. Unitățile produse pot fi folosite direct sau mutate în reconstructoare pt îmbunătățiri.
 block.naval-factory.description = Produce unități navale. Unitățile produse pot fi folosite direct sau mutate în reconstructoare pt îmbunătățiri.
-block.additive-reconstructor.description = Îmbunătățește unitățile primite, tranformându-le în unități de nivel doi.
-block.multiplicative-reconstructor.description = Îmbunătățește unitățile primite, tranformându-le în unități de nivel trei.
-block.exponential-reconstructor.description = Îmbunătățește unitățile primite, tranformându-le în unități de nivel patru.
-block.tetrative-reconstructor.description =Îmbunătățește unitățile primite, tranformându-le în unități de ltimă generație: nivelul cinci.
-block.switch.description = Un întrerupător. Poate fi pornit sau oprit. Statusul său poate fi citit și controlat de procesoarele logice.
+block.additive-reconstructor.description = Îmbunătățește unitățile primite, transformându-le în unități de nivel doi.
+block.multiplicative-reconstructor.description = Îmbunătățește unitățile primite, transformându-le în unități de nivel trei.
+block.exponential-reconstructor.description = Îmbunătățește unitățile primite, transformându-le în unități de nivel patru.
+block.tetrative-reconstructor.description = Îmbunătățește unitățile primite, transformându-le în unități de ltimă generație: nivelul cinci.
+block.switch.description = Un întrerupător. Poate fi pornit sau oprit. Starea sa poate fi citită și controlată de procesoarele logice.
 block.micro-processor.description = Rulează într-o buclă continuă o secvență de instrucțiuni logice. Poate fi folosit pt a controla unități și diverse clădiri.
 block.logic-processor.description = Rulează într-o buclă continuă o secvență de instrucțiuni logice. Poate fi folosit pt a controla unități și diverse clădiri. Mai rapid decât microprocesorul.
 block.hyper-processor.description = Rulează într-o buclă continuă o secvență de instrucțiuni logice. Poate fi folosit pt a controla unități și diverse clădiri. Mai rapid decât procesorul logic.
@@ -1469,6 +2225,101 @@ block.memory-bank.description = Stochează informație pt un procesor. Capacitat
 block.logic-display.description = Afișează grafica transmisă de un procesor logic.
 block.large-logic-display.description = Afișează grafica transmisă de un procesor logic.
 block.interplanetary-accelerator.description = Un turn masiv cu o armă railgun electromagnetică. Accelerează nucleele la viteză cosmică pt lansare interplanetară.
+block.repair-turret.description = Repară încontinuu cea mai deteriorată unitate din vecinătate. Poate accepta răcitor.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
 
 unit.dagger.description = Trage cu gloanțe standard către toți inamicii din apropiere.
 unit.mace.description = Trage cu jeturi de flacără aprinsă către toți inamicii din apropiere.
@@ -1482,8 +2333,8 @@ unit.vela.description = Trage cu un laser masiv, continuu, inflamabil care deter
 unit.corvus.description = Trage cu e explozie masivă de lasere care deteriorează inamicii și repară structurile aliate. Poate merge peste majoritatea terenurilor.
 unit.crawler.description = Aleargă către inamici și se autodistruge, cauzând o explozie.
 unit.atrax.description = Trage cu globuri de zgură care slăbesc artileria inamică. Poate merge peste majoritatea terenurilor.
-unit.spiroct.description = Trage cu lasere care apropie inamicii, autoreparându-se în acest proces. Poate merge peste majoritatea terenurilor.
-unit.arkyid.description = Trage cu lasere mari care apropie inamicii, autoreparându-se în acest proces. Poate merge peste majoritatea terenurilor.
+unit.spiroct.description = Trage cu lasere care apropie și slăbesc inamicii, autoreparându-se în acest proces. Poate merge peste majoritatea terenurilor.
+unit.arkyid.description = Trage cu lasere mari care apropie și slăbesc inamicii, autoreparându-se în acest proces. Poate merge peste majoritatea terenurilor.
 unit.toxopid.description = Trage cu capsule electrice mari și lasere care penetrează scuturile inamice. Poate merge peste majoritatea terenurilor.
 unit.flare.description = Trage cu gloanțe standard la artileria inamică din apropiere.
 unit.horizon.description = Aruncă grămezi de bombe peste artileria inamică.
@@ -1503,3 +2354,295 @@ unit.omura.description = Trage cu un railgun cu gloanțe care penetrează scutur
 unit.alpha.description = Apără nucleul Shard de inamici. Construiește structuri.
 unit.beta.description = Apără nucleul Foundation de inamici. Construiește structuri.
 unit.gamma.description = Apără nucleul Core de inamici. Construiește structuri.
+unit.retusa.description = Plasează mine de proximitate. Repară unitățile aliate.
+unit.oxynoe.description = Trage cu jeturi de flacără către inamicii din apropiere, reparând structurile aliate. Țintește proiectilele inamice din apropiere cu o armă care le deteriorează și distruge.
+unit.cyerce.description = Trage cu bombe cu dispersie echipate cu radar către inamici. Repară unitățile aliate.
+unit.aegires.description = Electrocutează toate unitățile și structurile inamice care intră în câmpul său de energie. Repară toți aliații.
+unit.navanax.description = Trage cu proiectile EMP explozive, lovind rețelele electrice inamice cu o forță semnificativă și reparând structurile aliate. Topește inamicii din apropiere cu cele 4 arme autonome cu laser.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+
+lst.read = Citește un număr dintr-o celulă de memorie conectată.
+lst.write = Scrie un număr într-o celulă de memorie conectată.
+lst.print = Adaugă text în bufferul de tipărire.\nNu tipărește decât când se execută [accent]Print Flush[].
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Adaugă o operație în bufferul de desenare.\nNu afișează decât când se execută [accent]Draw Flush[].
+lst.drawflush = Afișează pe un monitor instrucțiunile [accent]Draw[] aflate în așteptare.
+lst.printflush = Tipărește  într-un bloc Mesaj instrucțiunile [accent]Print[] aflate în așteptare.
+lst.getlink = Obține o conexiune a procesorului după index. Începe de la 0.
+lst.control = Controlează o clădire.
+lst.radar = Localizează unitățile aflate în jurul unei clădiri. Are o anumită rază de acțiune.
+lst.sensor = Obține date de la o clădire sau unitate.
+lst.set = Setează o variabilă.
+lst.operation = Efectuează o operație pe 1-2 variabile.
+lst.end = Sari la începutul listei de instrucțiuni.
+lst.wait = Așteaptă un anumit număr de secunde.
+lst.stop = Halt execution of this processor.
+lst.lookup = Caută un tip de material/lichid/unitate/bloc după ID.\nNumărul total din fiecare tip poate fi accesat cu:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Dacă condiția este adevărată, mergi la o altă instrucțiune.
+lst.unitbind = Controlează următoarea unitate de tipul selectat și reține-o în [accent]@unit[].
+lst.unitcontrol = Controlează unitatea controlată de procesor.
+lst.unitradar = Localizează unitățile din jurul unității controlate de procesor.
+lst.unitlocate = Localizează o poziție/clădire specifică oriunde pe hartă.\nNecesită o unitate controlată de procesor.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Nu ai voie să construiești cu unitățile folosind procesoare.
+
+lenum.type = Tipul clădirii/unității.\nde ex.: pt orice Router, va returna [accent]@router[].\nNu e un șir de caractere.
+lenum.shoot = Lovește către o locație.
+lenum.shootp = Lovește către o unitate/clădire. Anticipează viteza țintei și a proiectilului.
+lenum.config = Configurația clădirii, de ex. materialul selectat pt Sortator.
+lenum.enabled = Specifică dacă clădirea este pornită.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = Culoarea iluminatorului.
+laccess.controller = Controlorul unității. Dacă e controlată de procesor, returnează procesorul.\nDacă e într-o formație, returnează liderul.\nAltfel, returnează unitatea însăși.
+laccess.dead = Specifică dacă o unitate sau clădire a murit/nu mai e validă.
+laccess.controlled = Returnează:\n[accent]@ctrlProcessor[] dacă controlorul unității e procesor\n[accent]@ctrlPlayer[] dacă controlorul unității/clădirii e jucător\n[accent]@ctrlFormation[] dacă unitatea e într-o formație\nAltfel dă 0.
+laccess.progress = Progresul acțiunii, de la 0 la 1.\nReturnează progresul producției, al construcției sau reîncărcarea armelor.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+
+graphicstype.clear = Umple monitorul cu o culoare.
+graphicstype.color = Setează culoarea pt următoarele instrucțiuni Draw.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Setează grosimea liniei.
+graphicstype.line = Desenează un segment de linie.
+graphicstype.rect = Desenează un dreptunghi.
+graphicstype.linerect = Desenează conturul unui dreptunghi.
+graphicstype.poly = Desenează un poligon regulat.
+graphicstype.linepoly = Desenează conturul unui poligon regulat.
+graphicstype.triangle = Desenează un triunghi.
+graphicstype.image = Desenează imaginea unui obiect din joc.\nde ex.: [accent]@router[] sau [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Mereu adevărat.
+lenum.idiv = Împărțirea naturală a numerelor (int).
+lenum.div = Împărțirea.\nReturnează [accent]null[] dacă împarți la 0.
+lenum.mod = Modulo (restul împărțirii).
+lenum.equal = Egal. Convertește tipurile variabilelor.\nObiectele nenule comparate cu numere devin 1, cele nule devin 0.
+lenum.notequal = Nu e egal. Convertește tipurile variabilelor.
+lenum.strictequal = Egalitate strictă. Nu convertește tipurile variabilelor.\nPoate fi folosit pt a verifica dacă ceva este [accent]null[].
+lenum.shl = Shift left pe biți.
+lenum.shr = Shift right pe biți.
+lenum.or = OR/SAU. Ține cont de biți.
+lenum.land = Logical AND/ȘI logic. Nu ține cont de biți.
+lenum.and = AND/ȘI. Ține cont de biți.
+lenum.not = NOT. Inversează biții.
+lenum.xor = XOR/disjuncție exclusivă. Ține cont de biți.
+
+lenum.min = Minimul a două numere.
+lenum.max = Maximul a două numere.
+lenum.angle = Unghiul unui vector în grade.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Lungimea unui vector.
+
+lenum.sin = Sinus în grade.
+lenum.cos = Cosinus în grade.
+lenum.tan = Tangentă în grade.
+
+lenum.asin = Arcsinus în grade.
+lenum.acos = Arccosinus în grade.
+lenum.atan = Arctangentă în grade.
+
+#cea de mai jos nu-i o greșeală, caută pe net notarea intervalelor în matematică
+lenum.rand = Număr natural aleatoriu în intervalul [0, val).
+lenum.log = Logaritm natural (ln).
+lenum.log10 = Logaritm în baza 10.
+lenum.noise = 2D simplex noise.
+lenum.abs = Valoarea absolută.
+lenum.sqrt = Radical/rădăcina pătrată.
+
+lenum.any = Orice unitate.
+lenum.ally = Unitate aliată.
+lenum.attacker = Unitate cu armă.
+lenum.enemy = Unitate inamică.
+lenum.boss = Unitate gardian.
+lenum.flying = Unitate care zboară.
+lenum.ground = Unitate de artilerie.
+lenum.player = Unitate controlată de un jucător.
+
+lenum.ore = Depozit de minereu.
+lenum.damaged = Clădire aliată deteriorată.
+lenum.spawn = Punct de lansare inamic.\nPoate fi un nucleu sau o poziție.
+lenum.building = Clădire dintr-un grup specific.
+
+lenum.core = Orice nucleu.
+lenum.storage = Clădire de stocare, de ex. Containerul.
+lenum.generator = Clădiri care generează electricitate.
+lenum.factory = Clădiri care transformă resurse.
+lenum.repair = Puncte de Reparare.
+lenum.battery = Orice baterie.
+lenum.resupply = Puncte de Realimentare.\nRelevant doar când [accent]"Unitățile Necesită Muniție"[] este activată.
+lenum.reactor = Reactor de Toriu/Impact.
+lenum.turret = Orice armă.
+
+sensor.in = Clădirea/unitatea care trebuie detectată.
+
+radar.from = Clădirea de la care detectăm.\nRaza senzorului e limitată de raza de costrucție.
+radar.target = Filtru pt unitățile care trebuie detectate.
+radar.and = Adaugă filtre.
+radar.order = Ordinea de sortare. 0 pt a inversa ordinea.
+radar.sort = Modul cum sortăm rezultatele.
+radar.output = Variabila în care se va scrie unitatea detectată.
+
+unitradar.target = Filtru pt unitățile care trebuie detectate.
+unitradar.and = Adaugă filtre.
+unitradar.order = Ordinea de sortare. 0 pt a inversa ordinea.
+unitradar.sort = Modul cum sortăm rezultatele.
+unitradar.output = Variabila în care se reține unitatea detectată.
+
+control.of = Clădirea de controlat.
+control.unit = Unitatea/clădirea către care se țintește.
+control.shoot = Specifică dacă armele trag.
+
+unitlocate.enemy = Specifică dacă se detectează clădirile inamice.
+unitlocate.found = Specifică dacă obiectul a fost găsit.
+unitlocate.building = Clădirea detectată.
+unitlocate.outx = Coordonata X a obiectului detectat.
+unitlocate.outy = Coordonata Y a obiectului detectat.
+unitlocate.group = Grupul clădirilor de detectat.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Nu mișca, dar continuă să construiești/minezi.\nModul prestabilit.
+lenum.stop = Oprește acțiunea curentă. Nu mișca/mina/construi.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Mergi la această poziție.
+lenum.approach = Apropie-te la o anumită distanță de poziție.
+lenum.pathfind = Găsește ruta către punctul de lansare inamic. Poate fi un nucleu.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Lovește către o poziție.
+lenum.targetp = Lovește o țintă. Anticipează viteza țintei și a proiectilului.
+lenum.itemdrop = Descarcă o bucată de material.
+lenum.itemtake = Ia o bucată de material dintr-o clădire.
+lenum.paydrop = Descarcă încărcătura curentă.
+lenum.paytake = Ia o încărcătură de la locația curentă.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Oferă o etichetă numerică unității.
+lenum.mine = Minează din această locație.
+lenum.build = Construiește o structură.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Verifică dacă unitatea se află în apropierea poziției.
+lenum.boost = Pornește/oprește propulsorul.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 23a3b55158..c07ecb18f3 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]XZimur[]\n[#30FF30]Beryllium\n[tan]Félix [slate]Córvus\n[orange]Vanguard\n[#a00000]The [red]Slaylord[][]
+credits.text = Создатель [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЕ�ть недоработки в переводе или хотите найти �оюзников дл� �овме�тной игры?\nПишите в оф. ру��кий [accent]discord-�ервер Mindustry[].\n\nРедакторы и переводчики на ру��кий �зык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZimur[]\n[lightgray]routerchain\n[tan]Félix [slate]Córvus\n[orange]Vanguard\n[#a00000]Slotterleet[]\n[unlaunched]inflexibledarkness[]\n[white]lucin#0949[]
 credits = �вторы
 contributors = Переводчики и помощники
 discord = При�оедин�йте�ь к нашему Discord!
@@ -13,18 +13,18 @@ link.google-play.description = Скачать дл� Android � Google Play
 link.f-droid.description = Скачать дл� Android � F-Droid
 link.wiki.description = Официальна� вики
 link.suggestions.description = Предложить новые возможно�ти
-link.bug.description = �ашли одну? Доложите о ней зде�ь
+link.bug.description = �ашли ошибку? Доложите о ней зде�ь
+linkopen = Этот �ервер отправил вам ��ылку. Вы уверены, что хотите ее открыть?\n\n[sky]{0}
 linkfail = �е удало�ь открыть ��ылку!\nURL-адре� был �копирован в буфер обмена.
 screenshot = Скриншот �охранён в {0}
 screenshot.invalid = Карта �лишком больша�, возможно, не хватает пам�ти дл� �криншота.
 gameover = Игра окончена
 gameover.disconnect = Отключение
-gameover.pvp = [accent]{0}[] команда победила!
+gameover.pvp = Команда [accent]{0}[] победила!
 gameover.waiting = [accent]Ожидание �ледующей карты...
 highscore = [accent]�овый рекорд!
 copied = Скопировано.
 indev.notready = Эта ча�ть игры ещё не готова
-indev.campaign = [accent]Поздравл�ем! Вы до�тигли конца кампании![]\n\nЭто в�ё, что предо�тавл�ет �ейча� контент. Межпланетные путеше�тви� будут добавлены в будущих обновлени�х.
 
 load.sound = Звуки
 load.map = Карты
@@ -36,23 +36,31 @@ load.scripts = Скрипты
 
 be.update = До�тупна нова� �борка Bleeding Edge:
 be.update.confirm = Загрузить её и перезапу�тить игру �ейча�?
-be.updating = Обновл�ет��…
+be.updating = Обновл�ет��...
 be.ignore = Игнорировать
 be.noupdates = Обновлени� не найдены.
 be.check = Проверить обновлени�
 
-mod.featured.title = Обозреватель модов
-mod.featured.dialog.title = Обозреватель модов
+mods.browser = Браузер\nмодификаций
 mods.browser.selected = Выбранный мод
-mods.browser.add = У�тановить мод
-mods.github.open = Открыть GitHub �траницу
+mods.browser.add = Скачать
+mods.browser.reinstall = Переу�тановить
+mods.browser.view-releases = По�мотреть Релизы
+mods.browser.noreleases = [scarlet]Релизы не найдены\n[accent]�е удало�ь найти релизы дл� �того мода. Проверьте, е�ть ли в репозитории мода хот� бы один опубликованный релиз.
+mods.browser.latest = <По�ледний>
+mods.browser.releases = Релизы
+mods.github.open = Сайт
+mods.github.open-release = Страница релиза
+mods.browser.sortdate = Сортировка по дате изменени�
+mods.browser.sortstars = Сортировка по количе�тву звёзд
 
 schematic = Схема
-schematic.add = Сохранить �хему…
+schematic.add = Сохранить �хему...
 schematics = Схемы
+schematic.search = Пои�к �хем...
 schematic.replace = Схема � таким названием уже �уще�твует. Заменить её?
 schematic.exists = Схема � таким названием уже �уще�твует.
-schematic.import = Импортировать �хему…
+schematic.import = Импортировать �хему...
 schematic.exportfile = Эк�портировать файл
 schematic.importfile = Импортировать файл
 schematic.browseworkshop = Про�мотр Ма�тер�кой
@@ -62,19 +70,27 @@ schematic.shareworkshop = Поделить�� в Ма�тер�кой
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Отразить �хему
 schematic.saved = Схема �охранена.
 schematic.delete.confirm = Эта �хема будет поджарена И�пепелителем.
-schematic.rename = Переименовать �хему
+schematic.edit = Редактировать �хему
 schematic.info = {0}x{1}, {2} блоков
-schematic.disabled = [scarlet]Схемы отключены[]\n�а �той [accent]карте[] или [accent]�ервере запрещено и�пользование �хем.
+schematic.disabled = [scarlet]Схемы отключены[]\n�а �той [accent]карте[] или [accent]�ервере[] запрещено и�пользование �хем.
+schematic.tags = Теги:
+schematic.edittags = Редактировать теги
+schematic.addtag = Добавить тег
+schematic.texttag = Тек�товый тег
+schematic.icontag = Символьный тег
+schematic.renametag = Переименовать тег
+schematic.tagged = {0} отмечено
+schematic.tagdelconfirm = Удалить �тот тег нав�егда?
+schematic.tagexists = Такой тег уже �уще�твует.
 
 stats = Стати�тика
-stat.wave = Волн отражено:[accent] {0}
-stat.enemiesDestroyed = Врагов уничтожено:[accent] {0}
-stat.built = Строений по�троено:[accent] {0}
-stat.destroyed = Строений уничтожено:[accent] {0}
-stat.deconstructed = Строений разобрано:[accent] {0}
-stat.delivered = Ре�ур�ов запущено:
-stat.playtime = Врем� игры:[accent] {0}
-stat.rank = Финальный ранг: [accent]{0}
+stats.wave = Волн отражено
+stats.unitsCreated = Боевых единиц �оздано
+stats.enemiesDestroyed = Врагов уничтожено
+stats.built = По�троек возведено
+stats.destroyed = По�троек уничтожено
+stats.deconstructed = По�троек разобрано
+stats.playtime = Проведённое врем�
 
 globalitems = [accent]Общие предметы
 map.delete = Вы дей�твительно хотите удалить карту «[accent]{0}[]»?
@@ -84,12 +100,15 @@ level.mode = Режим игры:
 coreattack = < Ядро находит�� под атакой! >
 nearpoint = [[ [scarlet]ПОКИ�ЬТЕ ТОЧКУ ВЫС�ДКИ �ЕМЕДЛЕ��О[] ]\nаннигил�ци� неизбежна
 database = База данных �дра
+database.button = База данных
 savegame = Сохранить игру
 loadgame = Загрузить игру
 joingame = Сетева� игра
 customgame = Пользователь�ка� игра
 newgame = �ова� игра
 none = <ничего>
+none.found = [lightgray]<ничего не найдено>
+none.inmap = [lightgray]<нет на карте>
 minimap = Мини-карта
 position = Координаты
 close = Закрыть
@@ -110,24 +129,40 @@ committingchanges = Вне�ение изменений
 done = Готово
 feature.unsupported = Ваше у�трой�тво не поддерживает �ту возможно�ть.
 
-mods.alphainfo = Имейте в виду, что модификации наход�т�� в альфа-вер�ии и [scarlet]могут �одержать много ошибок[]. Докладывайте о любых проблемах, которые вы найдете в Mindustry Github.
+mods.initfailed = [red]⚠[] �е удало�ь инициализировать предыдущий запу�к Mindustry. Это могло быть вызвано неи�правными модификаци�ми.\n\nЧтобы предотвратить зацикленные вылеты игры, [red]в�е модификации были отключены.[]
 mods = Модификации
 mods.none = [lightgray]Модификации не найдены!
-mods.guide = Руковод�тво по модам
+mods.guide = Руковод�тво по модификаци�м
 mods.report = Доложить об ошибке
 mods.openfolder = Открыть папку � модификаци�ми
+mods.viewcontent = Про�мотреть �одержимое
 mods.reload = Перезагрузить
 mods.reloadexit = Игра будет закрыта дл� перезагрузки модификаций.
+mod.installed = [[У�тановлено]
 mod.display = [gray]Модификаци�:[orange] {0}
-mod.enabled = [lightgray]Включён
-mod.disabled = [scarlet]Выключен
+mod.enabled = [lightgray]Включено
+mod.disabled = [scarlet]Выключено
+mod.multiplayer.compatible = [gray]До�тупна в игре по �ети
 mod.disable = Выкл.
+mod.version = Version:
 mod.content = Содержимое:
 mod.delete.error = �евозможно удалить модификацию. Возможно, файл и�пользует��.
-mod.requiresversion = [scarlet]Требуема� минимальна� вер�и� игры: [accent]{0}
-mod.outdated = [scarlet]�е �овме�тим � V6 (нет "minGameVersion: 105")
-mod.missingdependencies = [scarlet]�е найдены родитель�кие модификации: {0}
+mod.incompatiblegame = [red]У�таревша� игра
+mod.incompatiblemod = [red]�е�овме�тимый
+mod.blacklisted = [red]�еподдерживаемый
+mod.unmetdependencies = [red]�е найдены зави�имо�ти
 mod.erroredcontent = [scarlet]Ошибки �одержимого
+mod.circulardependencies = [red]Цикличные зави�имо�ти
+mod.incompletedependencies = [red]�едопу�тимые или от�ут�твующие зави�имо�ти
+mod.requiresversion.details = Требует�� вер�и� игры: [accent]{0}[]\nВаша игра у�тарела. Дл� работы �того мода требует�� более нова� вер�и� игры (возможно, альфа/бета-вер�и�).
+mod.outdatedv7.details = Этот мод не�овме�тим � по�ледней вер�ией игры. �втор должен обновить его и добавить [accent]minGameVersion: 136[] в файл [accent]mod.json[].
+mod.blacklisted.details = Этот мод был вручную зане�ен в черный �пи�ок из-за того, что он вызывал �бои или другие проблемы � текущей вер�ией игры. �е и�пользуйте его.
+mod.missingdependencies.details = Дл� �того мода от�ут�твуют зави�имо�ти: {0}
+mod.erroredcontent.details = Этот мод вызвал ошибки при загрузке. Попро�ите автора мода и�править их.
+mod.circulardependencies.details = Этот мод имеет зави�имо�ти, которые зави��т друг от друга.
+mod.incompletedependencies.details = Этот мод не может быть загружен из-за недопу�тимых или от�ут�твующих зави�имо�тей: {0}.
+
+mod.requiresversion = Требует�� вер�и� игры: [red]{0}
 mod.errors = Ошибки были вызваны загружаемым �одержимым.
 mod.noerrorplay = [scarlet]У Ва� е�ть модификации � ошибками.[] Выключите проблемные модификации или и�правьте ошибки перед игрой.
 mod.nowdisabled = [scarlet]Модификации '{0}' требуют�� родитель�кие модификации:[accent] {1}\n[lightgray]Сначала нужно загрузить их.\nЭта модификаци� будет автоматиче�ки отключена.
@@ -136,27 +171,36 @@ mod.requiresrestart = Теперь игра закроет��, чтобы пр
 mod.reloadrequired = [scarlet]�еобходим перезапу�к
 mod.import = Импортировать модификацию
 mod.import.file = Импортировать файл
-mod.import.github = Импортировать мод � GitHub
-mod.jarwarn = [scarlet]JAR-модификации по �ути не безопа�ны.[]\nУбедите�ь, что вы импортируете �тот мод из надежного и�точника!
+mod.import.github = Импортировать модификацию � GitHub
+mod.jarwarn = [scarlet]JAR-модификации по �ути не безопа�ны.[]\nУбедите�ь, что вы импортируете �ту модификацию из надёжного и�точника!
 mod.item.remove = Этот предмет �вл�ет�� ча�тью модификации [accent]«{0}[accent]»[white]. Чтобы удалить его, удалите �аму модификацию.
 mod.remove.confirm = Эта модификаци� будет удалена.
 mod.author = [lightgray]�втор(ы):[] {0}
 mod.missing = В �том �охранении е�ть �леды модификации, котора� от�ут�твует или у�тановлена её обновлённа� вер�и�. Может произойти повреждение �охранени�. Вы уверены, что хотите загрузить его?\n[lightgray]Модификации:\n{0}
 mod.preview.missing = Перед публикацией �той модификации в Ма�тер�кой, вы должны добавить изображение предпро�мотра.\nРазме�тите изображение � именем[accent] preview.png[] в папке модификации и попробуйте �нова.
 mod.folder.missing = Модификации могут быть опубликованы в Ма�тер�кой только в виде папки.\nЧтобы конвертировать любой мод в папку, про�то извлеките его из архива и удалите �тарый архив .zip, затем перезапу�тите игру или перезагрузите модификации.
-mod.scripts.disable = Ваше у�трой�тво не поддерживает модификации �о �криптами. Отключите такие моды, чтобы играть.
+mod.scripts.disable = Ваше у�трой�тво не поддерживает модификации �о �криптами. Отключите такие модификации, чтобы играть.
 
 about.button = Об игре
 name = Им�:
-noname = Дл� начала придумайте[accent] �ебе им�[].
+noname = Дл� начала придумайте �ебе[accent] им�[].
+search = Пои�к:
 planetmap = Карта планеты
 launchcore = Запу�к �дра
 filename = Им� файла:
 unlocked = �овый контент разблокирован!
 available = До�тупно новое и��ледование!
+unlock.incampaign = < Разблокируйте в кампании дл� подробно�тей >
+campaign.select = Выберите �тартовую кампанию
+campaign.none = [lightgray]Выберите планету, � которой хотите начать.\nПереключить планету можно в любое врем�.
+campaign.erekir = �овый, более отточенный контент. В-о�новном линейное продвижение по кампании.\n\nКарты и игровой проце�� более вы�окого каче�тва.
+campaign.serpulo = Старый контент; кла��иче�кий опыт. Более вариативное прохождение.\n\nПотенциально не�балан�ированные карты и механики кампании. Менее отточено.
+campaign.difficulty = Difficulty
 completed = [accent]Завершено
 techtree = Дерево\n технологий
-research.legacy = �айдены данные и��ледований из [accent]5.0[].\nХотите [accent]загрузить �ти данные[], или [accent]отказать�� от них[] и перезапу�тить и��ледовани� в новой кампании (рекомендует��)?
+techtree.select = Выбор дерева технологий
+techtree.serpulo = Серпуло
+techtree.erekir = Эрекир
 research.load = Загрузить
 research.discard = Отказать��
 research.list = [lightgray]И��ледуйте:
@@ -167,7 +211,7 @@ players = Игроков: {0}
 players.single = {0} игрок
 players.search = пои�к
 players.notfound = [gray]игроки не найдены
-server.closing = [accent]Закрытие �ервера…
+server.closing = [accent]Закрытие �ервера...
 server.kicked.kick = Ва� выгнали � �ервера!
 server.kicked.whitelist = Вы не в белом �пи�ке �ервера.
 server.kicked.serverClose = Сервер закрыт.
@@ -191,7 +235,7 @@ hostserver = Запу�тить многопользователь�кий �е
 invitefriends = Пригла�ить друзей
 hostserver.mobile = Запу�тить �ервер
 host = Открыть �ервер
-hosting = [accent]Открытие �ервера…
+hosting = [accent]Открытие �ервера...
 hosts.refresh = Обновить
 hosts.discovering = Пои�к локальных игр
 hosts.discovering.any = Пои�к игр
@@ -200,21 +244,32 @@ hosts.none = [lightgray]Локальных игр не обнаружено!
 host.invalid = [scarlet]�е удаёт�� подключить�� к хо�ту.
 
 servers.local = Локальные �ерверы
+servers.local.steam = Открытые игры и локальные �ерверы
 servers.remote = Удалённые �ерверы
 servers.global = Серверы �ообще�тва
-
 servers.disclaimer = Серверы �ообще�тва [accent]не[] принадлежат разработчику и [accent]не[] контролируют�� им.\n\nСерверы могут �одержать пользователь�кий контент, который не подходит дл� в�ех возра�тов.
 servers.showhidden = Отображать �крытые �ерверы
 server.shown = Отображает��
 server.hidden = Скрыт
+viewplayer = От�леживаем игрока: [accent]{0}
 
 trace = От�леживать игрока
 trace.playername = Им� игрока: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
+trace.language = Язык: [accent]{0}
 trace.mobile = Мобильный клиент: [accent]{0}
 trace.modclient = Пользователь�кий клиент: [accent]{0}
+trace.times.joined = При�оедин�л�� раз: [accent]{0}
+trace.times.kicked = Был выгнан раз: [accent]{0}
+trace.ips = В�е IP:
+trace.names = В�е имена:
 invalidid = �едопу�тимый ID клиента! Отправьте отчёт об ошибке.
+player.ban = Заблокировать
+player.kick = Выгнать
+player.trace = От�леживать
+player.admin = Переключить админи�тратора
+player.team = Сменить команду
 server.bans = Блокировки
 server.bans.none = Заблокированных игроков нет!
 server.admins = �дмини�траторы
@@ -228,27 +283,30 @@ server.version = [gray]Вер�и�: {0} {1}
 server.custombuild = [accent]Пользователь�ка� �борка
 confirmban = Вы дей�твительно хотите заблокировать игрока «{0}[white]»?
 confirmkick = Вы дей�твительно хотите выгнать игрока «{0}[white]»?
-confirmvotekick = Вы дей�твительно хотите голо�ованием выгнать игрока «{0}[white]»?
 confirmunban = Вы дей�твительно хотите разблокировать �того игрока?
 confirmadmin = Вы дей�твительно хотите �делать игрока «{0}[white]» админи�тратором?
 confirmunadmin = Вы дей�твительно хотите убрать игрока «{0}[white]» из админи�траторов?
+votekick.reason = Причина голо�овани�
+votekick.reason.message = Вы уверены, что хотите голо�ованием выгнать "{0}[white]"?\nЕ�ли да, введите причину:
 joingame.title = При�оединить�� к игре
-joingame.ip = �дре�:
+joingame.ip = IP:
 disconnect = Отключено.
 disconnect.error = Ошибка �оединени�.
 disconnect.closed = Соединение закрыто.
 disconnect.timeout = Врем� ожидани� и�текло.
 disconnect.data = Ошибка при загрузке данных мира!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = �е удаёт�� при�оединить�� к игре ([accent]{0}[]).
-connecting = [accent]Подключение…
-reconnecting = [accent]Переподключение…
-connecting.data = [accent]Загрузка данных мира…
+connecting = [accent]Подключение...
+reconnecting = [accent]Переподключение...
+connecting.data = [accent]Загрузка данных мира...
 server.port = Порт:
-server.addressinuse = Данный адре� уже и�пользует��!
 server.invalidport = �еверный номер порта!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [scarlet]Ошибка �оздани� �ервера.
 save.new = �овое �охранение
 save.overwrite = Вы уверены, что хотите перезапи�ать\n�тот �лот дл� �охранени�?
+save.nocampaign = Отдельные �охранени� из кампании не могут быть импортированы.
 overwrite = Перезапи�ать
 save.none = Сохранени� не найдены!
 savefail = �е удало�ь �охранить игру!
@@ -269,6 +327,7 @@ save.corrupted = [accent]Сохранённый файл повреждён ил
 empty = <пу�то>
 on = Вкл
 off = Выкл
+save.search = Пои�к �охранений...
 save.autosave = �вто�охранение: {0}
 save.map = Карта: {0}
 save.wave = Волна {0}
@@ -284,9 +343,31 @@ ok = ОК
 open = Открыть
 customize = �а�троить правила
 cancel = Отмена
+command = Командовать
+command.queue = [lightgray][Queuing]
+command.mine = Добывать
+command.repair = Ремонтировать
+command.rebuild = Во��танавливать
+command.assist = Помогать игроку
+command.move = Двигать��
+command.boost = Лететь
+command.enterPayload = Войти в грузовой блок
+command.loadUnits = Загрузить единицы
+command.loadBlocks = Загрузить по�тройки
+command.unloadPayload = Выгрузить груз
+command.loopPayload = Loop Unit Transfer
+stance.stop = Отменить команду
+stance.shoot = Положение: Стрел�ть
+stance.holdfire = Положение: Удерживать огонь
+stance.pursuetarget = Положение: Пре�ледовать цель
+stance.patrol = Положение: Патрулировать путь
+stance.ram = Положение: Таран\n[lightgray]Движение по пр�мой, без пои�ка пути
+
 openlink = Открыть ��ылку
 copylink = Скопировать ��ылку
 back = �азад
+max = Заполнить полно�тью
+objective = Цель карты
 crash.export = Эк�порт отчёта об ошибках
 crash.none = Отчёты об ошибках не найдены.
 crash.exported = Отчёты об ошибках �к�портированы.
@@ -295,24 +376,26 @@ data.import = Импортировать данные
 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]Сохранение…
+loading = [accent]Загрузка...
+downloading = [accent]Скачивание...
+saving = [accent]Сохранение...
 respawn = [accent][[{0}][] дл� возрождени� из �дра
 cancelbuilding = [accent][[{0}][] дл� очи�тки плана
 selectschematic = [accent][[{0}][] выделить и �копировать
 pausebuilding = [accent][[{0}][] дл� прио�тановки �троитель�тва
 resumebuilding = [scarlet][[{0}][] дл� продолжени� �троитель�тва
+enablebuilding = [scarlet][[{0}][] дл� включени� �троитель�тва
 showui = Интерфей� �крыт.\n�ажмите [accent][[{0}][] дл� отображени� интерфей�а.
+commandmode.name = [accent]Режим командовани�
+commandmode.nounits = [нет единиц]
 wave = [accent]Волна {0}
 wave.cap = [accent]Волна {0}/{1}
 wave.waiting = [lightgray]Волна через {0}
 wave.waveInProgress = [lightgray]Волна продолжает��
-waiting = [lightgray]Ожидание…
-waiting.players = Ожидание игроков…
+waiting = [lightgray]Ожидание...
+waiting.players = Ожидание игроков...
 wave.enemies = [lightgray]Враги: {0}
 wave.enemycores = [lightgray]Враже�ких �дер: [accent]{0}
 wave.enemycore = [accent]{0}[lightgray] враже�кое �дро
@@ -326,9 +409,9 @@ custom = Пользователь�ка�
 builtin = В�троенна�
 map.delete.confirm = Вы дей�твительно хотите удалить �ту карту? Это дей�твие не может быть отменено!
 map.random = [accent]Случайна� карта
-map.nospawn = Эта карта не имеет ни одного �дра, в котором игрок может по�вить��! Добавьте[accent] оранжевое[] �дро на �ту карту в редакторе.
-map.nospawn.pvp = У �той карты нет враже�ких �дер, в которых игрок может по�вить��! Добавьте[scarlet] не оранжевое[] �дро на �ту карту в редакторе.
-map.nospawn.attack = У �той карты нет враже�ких �дер дл� атаки игроком! Добавьте[scarlet] кра�ное[] �дро на �ту карту в редакторе.
+map.nospawn = �а �той карте ни одного �дра, в котором игрок может по�вить��! Добавьте �дро команды {0} на �ту карту в редакторе.
+map.nospawn.pvp = �а �той карте нет враже�ких �дер, в которых игрок может по�вить��! Добавьте [scarlet]враже�кое[] �дро на �ту карту в редакторе.
+map.nospawn.attack = �а �той карте нет враже�ких �дер дл� атаки игроком! Добавьте �дро команды {0} на �ту карту в редакторе.
 map.invalid = Ошибка загрузки карты: повреждённый или недопу�тимый файл карты.
 workshop.update = Обновить �одержимое
 workshop.error = Ошибка загрузки информации из Ма�тер�кой: {0}
@@ -336,12 +419,17 @@ map.publish.confirm = Вы уверены, что хотите опублико
 workshop.menu = Выберите, что вы хотите �делать � �тим предметом.
 workshop.info = Информаци� о предмете
 changelog = Спи�ок изменений (необ�зательно):
+updatedesc = Перезапи�ать заголовок и опи�ание
 eula = Лицензионное �оглашение Steam � конечным пользователем
 missing = Этот предмет был удалён или перемещён.\n[lightgray]Публикаци� в Ма�тер�кой была автоматиче�ки удалена.
-publishing = [accent]Отправка…
+publishing = [accent]Отправка...
 publish.confirm = Вы уверены, что хотите опубликовать �тот предмет?\n\n[lightgray]Убедите�ь, что вы �огла�ны � EULA Ма�тер�кой, иначе ваши предметы не будут отображать��!
 publish.error = Ошибка отправки предмета: {0}
 steam.error = �е удало�ь инициализировать �ерви�ы Steam.\nОшибка: {0}
+editor.planet = Планета:
+editor.sector = Сектор:
+editor.seed = Сид:
+editor.cliffs = Создать �калы из �тен
 
 editor.brush = Ки�ть
 editor.openin = Открыть в редакторе
@@ -354,66 +442,109 @@ editor.nodescription = Чтобы опубликовать карту, она д
 editor.waves = Волны:
 editor.rules = Правила:
 editor.generation = Генераци�:
+editor.objectives = Цели
+editor.locales = �аборы локалей
+editor.worldprocessors = Мировые проце��оры
+editor.worldprocessors.editname = Изменить название
+editor.worldprocessors.none = [lightgray]�е найдено ни одного блока мирового проце��ора\nДобавьте его в редакторе карт или во�пользуйте�ь кнопкой "\ue813 Добавить" ниже.
+editor.worldprocessors.nospace = �ет �вободного ме�та дл� размещени� мирового проце��ора!\n Возможно на карте в�ё зан�то �труктурами
+editor.worldprocessors.delete.confirm = Вы уверены, что хотите удалить �тот мировой проце��ор?\n\nЕ�ли он окружен �тенами, он будет заменен �теной окружени�.
 editor.ingame = Редактировать в игре
+editor.playtest = Опробовать карту
 editor.publish.workshop = Опубликовать в Ма�тер�кой
 editor.newmap = �ова� карта
 editor.center = Центрировать
+editor.search = Пои�к карт...
+editor.filters = Фильтры
+editor.filters.mode = Режимы игры:
+editor.filters.type = Тип карты
+editor.filters.search = И�кать по
+editor.filters.author = �втору
+editor.filters.description = Опи�анию
+editor.shiftx = Сдвиг по X
+editor.shifty = Сдвиг по Y
 workshop = Ма�тер�ка�
 waves.title = Волны
 waves.remove = Удалить
-waves.never = ∞
 waves.every = каждый
 waves.waves = волна(ы)
+waves.health = прочно�ть: {0}%
 waves.perspawn = за по�вление
 waves.shields = ед. щита/волну
-waves.to = к
+waves.to = до
+waves.spawn = точка по�влени�:
+waves.spawn.all = <везде>
+waves.spawn.select = Выбрать точку по�влени�
+waves.spawn.none = [scarlet]не обнаружено точек по�влени� на карте!
+waves.max = мак�имум единиц
 waves.guardian = Страж
 waves.preview = Предварительный про�мотр
-waves.edit = Редактировать…
+waves.edit = Редактировать...
+waves.random = Случайно
 waves.copy = Копировать в буфер обмена
 waves.load = Загрузить из буфера обмена
 waves.invalid = �еверные волны в буфере обмена.
 waves.copied = Волны �копированы.
 waves.none = Враги не были определены.\nОбратите внимание, что пу�тые волны будут автоматиче�ки заменены обычной волной.
+waves.sort = Сортировать по
+waves.sort.reverse = Обратна� �ортировка
+waves.sort.begin = �ачало
+waves.sort.health = Здоровье
+waves.sort.type = Тип
+waves.search = Пои�к волн...
+waves.filter = Фильтр единиц
+waves.units.hide = Скрыть в�е
+waves.units.show = Показать в�е
 
-#these are intentionally in lower case
+#они намеренно напи�аны в нижнем реги�тре
 wavemode.counts = количе�тво единиц
 wavemode.totals = в�его единиц
-wavemode.health = в�его здоровь�
+wavemode.health = в�его прочно�ти
+all = в�его
 
 editor.default = [lightgray]<По умолчанию>
-details = Подробно�ти…
-edit = Редактировать…
+details = Подробно�ти...
+edit = Редактировать...
+variables = Переменные
+logic.clear.confirm = Вы уверены, что хотите удалить ве�ь код из �того проце��ора?
+
+logic.globals = В�троенные переменные
 editor.name = �азвание:
 editor.spawn = Создать боевую единицу
 editor.removeunit = Удалить боевую единицу
 editor.teams = Команды
 editor.errorload = Ошибка загрузки файла.
 editor.errorsave = Ошибка �охранени� файла.
-editor.errorimage = Это изображение, а не карта.\n\nЕ�ли вы хотите импортировать карту вер�ии 3.5/40 �борки, то и�пользуйте кнопку [accent][Импортировать у�таревшую карту][] в редакторе.
+editor.errorimage = Это изображение, а не карта.
 editor.errorlegacy = Эта карта �лишком �тара� и и�пользует у�таревший формат карты, который больше не поддерживает��.
 editor.errornot = Это не файл карты.
 editor.errorheader = Этот файл карты недей�твителен или повреждён.
 editor.errorname = Карта не имеет имени. Может быть, вы пытаете�ь загрузить �охранение?
+editor.errorlocales = Ошибка при чтении недопу�тимых наборов локалей.
 editor.update = Обновить
 editor.randomize = Случайно
+editor.moveup = Выше
+editor.movedown = �иже
+editor.copy = Копировать
 editor.apply = Применить
 editor.generate = Сгенери-\nровать
+editor.sectorgenerate = Генераци� �ектора
 editor.resize = Изменить\nразмер
 editor.loadmap = Загрузить\nкарту
 editor.savemap = Сохранить\nкарту
+editor.savechanges = [scarlet]У ва� е�ть не�охраненные изменени�!\n\n[]Вы хотите �охранить их?
 editor.saved = Сохранено!
 editor.save.noname = У вашей карты нет имени! �азовите её в меню «Информаци� о карте».
 editor.save.overwrite = Ваша карта не может быть запи�ана поверх в�троенной карты! Введите другое название в меню «Информаци� о карте»
 editor.import.exists = [scarlet]�е удало�ь импортировать:[] карта � именем «{0}» уже �уще�твует!
-editor.import = Импорт…
+editor.import = Импорт...
 editor.importmap = Импортировать карту
 editor.importmap.description = Импортировать уже �уще�твующую карту
 editor.importfile = Импортировать файл
 editor.importfile.description = Импортировать файл карты извне
 editor.importimage = Импортировать файл изображени�
 editor.importimage.description = Импортировать изображение карты извне
-editor.export = Эк�порт…
+editor.export = Эк�порт...
 editor.exportfile = Эк�портировать файл
 editor.exportfile.description = Эк�порт файла карты
 editor.exportimage = Эк�портировать ландшафт
@@ -432,18 +563,23 @@ toolmode.replace = Заменить
 toolmode.replace.description = Ри�ует только\nна �плошных блоках.
 toolmode.replaceall = Заменить в�ё
 toolmode.replaceall.description = Замен�ет в�е\nблоки на карте.
-toolmode.orthogonal = Ортогональна�
-toolmode.orthogonal.description = Ри�ует только\nортогональные линии.
+toolmode.orthogonal = Пр�моугольна�
+toolmode.orthogonal.description = Ри�ует только\nпр�моугольные линии.
 toolmode.square = Квадрат
 toolmode.square.description = Квадратна� ки�ть.
 toolmode.eraseores = Стереть руды
-toolmode.eraseores.description = Стереть только руды.
+toolmode.eraseores.description = Стирает только руды.
 toolmode.fillteams = Изменить команду блоков
 toolmode.fillteams.description = Измен�ет принадлежно�ть\nблоков к команде.
+toolmode.fillerase = Стереть заливкой
+toolmode.fillerase.description = Стирает в�е блоки\nодного типа.
 toolmode.drawteams = Изменить команду блока
 toolmode.drawteams.description = Измен�ет принадлежно�ть\nблока к команде.
+toolmode.underliquid = Под жидко�т�ми
+toolmode.underliquid.description = Ри�ует пол под плитками жидко�ти.
 
 filters.empty = [lightgray]�ет фильтров! Добавьте один при помощи кнопки ниже.
+
 filter.distort = И�кажение
 filter.noise = Шум
 filter.enemyspawn = Случайный выбор \nточек вы�адки
@@ -460,6 +596,8 @@ filter.clear = Очи�тить
 filter.option.ignore = Игнорировать
 filter.scatter = Се�тель
 filter.terrain = Ландшафт
+filter.logic = Логика
+
 filter.option.scale = Ма�штаб фильтра
 filter.option.chance = Шан�
 filter.option.mag = Сила применени�
@@ -468,17 +606,39 @@ filter.option.circle-scale = Ма�штаб круга
 filter.option.octaves = Циклично�ть применени�
 filter.option.falloff = Спад циклично�ти
 filter.option.angle = Угол
+filter.option.tilt = �аклон
+filter.option.rotate = Повернуть
 filter.option.amount = Количе�тво
 filter.option.block = Блок
 filter.option.floor = Поверхно�ть
 filter.option.flooronto = Целева� поверхно�ть
 filter.option.target = Цель
+filter.option.replacement = Замена
 filter.option.wall = Стена
 filter.option.ore = Руда
 filter.option.floor2 = Втора� поверхно�ть
 filter.option.threshold2 = Вторичный предельный порог
 filter.option.radius = Радиу�
 filter.option.percentile = Процентиль
+filter.option.code = Код
+filter.option.loop = Цикл
+locales.info = Зде�ь вы можете добавить на карту наборы локалей дл� определенных �зыков. В наборах локалей каждое �вой�тво имеет им� и значение. Эти �вой�тва могут и�пользовать�� мировыми проце��орами и цел�ми по их именам. Они поддерживают форматирование тек�та (замен�� пропу�ки реальными значени�ми).\n\n[cyan]Пример �вой�тва:\n[]name: [accent]timer[]\nvalue: [accent]Пример таймера, о�тавшее�� врем�: {0}[]\n\n[cyan]И�пользование:\n[]У�тановите его как тек�т цели: [accent]@timer\n\n[]Введите его в мировом проце��оре:\n[accent]localeprint «timer»\nformat time\n[gray] (где time - отдельно вычи�л�ема� переменна�)
+locales.deletelocale = Вы уверены, что хотите удалить �тот набор локалей?
+locales.applytoall = Применить изменени� ко в�ем локал�м
+locales.addtoother = Добавить в другие локали
+locales.rollback = Откат к по�леднему примененному значению
+locales.filter = Фильтр �вой�тв
+locales.searchname = Пои�к по имени...
+locales.searchvalue = Пои�к значени�...
+locales.searchlocale = Пои�к локали...
+locales.byname = По имени
+locales.byvalue = По значению
+locales.showcorrect = Показать �вой�тва, которые при�ут�твуют во в�ех локал�х и имеют везде уникальные значени�
+locales.showmissing = Показать �вой�тва, от�ут�твующие в некоторых локал�х
+locales.showsame = Показать �вой�тва, которые имеют одинаковые значени� в разных локал�х
+locales.viewproperty = Смотреть во в�ех локал�х
+locales.viewing = Про�мотр �вой�тва "{0}"
+locales.addicon = Добавить иконку
 
 width = Ширина:
 height = Вы�ота:
@@ -489,8 +649,9 @@ load = Загрузить
 save = Сохранить
 fps = FPS: {0}
 ping = Пинг: {0}м�
-memory = Mem: {0}mb
-memory2 = Mem:\n {0}mb +\n {1}mb
+tps = TPS: {0}
+memory = Mem: {0}МБ
+memory2 = Mem:\n {0}МБ +\n {1}МБ
 language.restart = Перезагрузите игру, чтобы �зыковые на�тройки в�тупили в �илу.
 settings = �а�тройки
 tutorial = Обучение
@@ -507,21 +668,70 @@ requirement.core = Уничтожьте враже�кое �дро в зоне
 requirement.research = И��ледуйте {0}
 requirement.produce = Произведите {0}
 requirement.capture = Захватите {0}
+requirement.onplanet = Возьмите �ектор под контроль на {0}
+requirement.onsector = Вы�адите�ь на �ектор: {0}
 launch.text = Вы�адка
-research.multiplayer = Только хо�т может и��ледовать предметы.
 map.multiplayer = Только хо�т может про�матривать �екторы.
 uncover = Ра�крыть
 configure = Конфигураци� выгрузки
+objective.research.name = И��ледовать
+objective.produce.name = Произве�ти
+objective.item.name = Произве�ти предмет
+objective.coreitem.name = Переме�тить в �дро
+objective.buildcount.name = Количе�тво по�троек
+objective.unitcount.name = Количе�тво единиц
+objective.destroyunits.name = Уничтожить единицы
+objective.timer.name = Таймер
+objective.destroyblock.name = Уничтожить блок
+objective.destroyblocks.name = Уничтожить блоки
+objective.destroycore.name = Уничтожить �дро
+objective.commandmode.name = Командовать единицей
+objective.flag.name = Флаг
+marker.shapetext.name = Фигура � тек�том
+marker.point.name = Точка
+marker.shape.name = Фигура
+marker.text.name = Тек�т
+marker.line.name = Лини�
+marker.quad.name = Четырёхугольник
+marker.texture.name = Тек�тура
+marker.background = Фон
+marker.outline = Контур
+objective.research = [accent]И��ледуйте:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Произведите:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Уничтожьте:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Уничтожьте: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Получите: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Переме�тите в �дро:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]По�тройте: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Произведите боевую единицу: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Уничтожьте: [][lightgray]{0}[]x боевых единиц
+objective.enemiesapproaching = [accent]Враги прибудут через [lightgray]{0}[]
+objective.enemyescelating = [accent]Враже�кое производ�тво возра�тет через [lightgray]{0}[]
+objective.enemyairunits = [accent]Производ�тво враже�ких воздушных единиц начнет�� через [lightgray]{0}[]
+objective.destroycore = [accent]Уничтожьте враже�кое �дро
+objective.command = [accent]Дайте команду боевым единицам
+objective.nuclearlaunch = [accent]⚠ Обнаружен �дерный удар: [lightgray]{0}
+announce.nuclearstrike = [red]⚠ ПРИБЛИЖ�ЕТСЯ ЯДЕР�ЫЙ УД�Р ⚠\n[lightgray]�оздайте резервные �дра немедленно
 
 loadout = Груз
 resources = Ре�ур�ы
+resources.max = Мак�имум
 bannedblocks = Запрещённые блоки
+unbannedblocks = Unbanned Blocks
+objectives = Цели
+bannedunits = Запрещённые единицы
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Запрещенные единицы как белый �пи�ок
+bannedblocks.whitelist = Запрещенные блоки как белый �пи�ок
 addall = Добавить в�ё
 launch.from = Запу�к из: [accent]{0}
+launch.capacity = Вме�тимо�ть запу�каемого предмета: [accent]{0}
 launch.destination = Ме�то назначени�: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Количе�тво должно быть чи�лом между 0 и {0}.
-add = Добавить…
-boss.health = Здоровье �тража
+add = Добавить...
+guardian = Страж
 
 connectfail = [scarlet]Ошибка подключени�:\n\n[accent]{0}
 error.unreachable = Сервер недо�тупен.\nВы уверены, что адре� введён корректно?
@@ -533,17 +743,24 @@ error.mapnotfound = Файл карты не найден!
 error.io = Сетева� ошибка ввода-вывода.
 error.any = �еизве�тна� �етева� ошибка.
 error.bloom = �е удало�ь инициализировать �вечение (Bloom).\nВозможно, ваше у�трой�тво не поддерживает его.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Дождь
-weather.snow.name = Снегопад
-weather.sandstorm.name = Пыльна� бур�
+weather.snowing.name = Снегопад
+weather.sandstorm.name = Пе�чана� бур�
 weather.sporestorm.name = Спорова� бур�
 weather.fog.name = Туман
 
+campaign.playtime = \uf129 [lightgray]Общее врем� игры: {0}
+campaign.complete = [accent]Поздравл�ем.\n\nВраже�ка� фракци� на планете {0} была повержена.\n[lightgray]По�ледний враже�кий �ектор был захвачен.
+
+sectorlist = Секторы
+sectorlist.attacked = {0} под атакой
 sectors.unexplored = [lightgray]�е и��ледовано
 sectors.resources = Ре�ур�ы:
 sectors.production = Производит:
 sectors.export = Эк�порт:
+sectors.import = Импорт:
 sectors.time = Врем�:
 sectors.threat = Угроза:
 sectors.wave = Волна:
@@ -551,30 +768,45 @@ sectors.stored = �акоплено:
 sectors.resume = Продолжить
 sectors.launch = Вы�адка
 sectors.select = Выбор
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]нет (�олнце)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Переименовать �ектор
 sectors.enemybase = [scarlet]Враже�ка� база
 sectors.vulnerable = [scarlet]У�звим
 sectors.underattack = [scarlet]�такован! [accent]{0}% повреждений
+sectors.underattack.nodamage = [scarlet]�е захвачен
 sectors.survives = [accent]Продержит�� {0} волн(ы)
 sectors.go = Перейти
+sector.abandon = Покинуть
+sector.abandon.confirm = В�е �дра данного �ектора будут �амоуничтожены.\nПродолжить?
 sector.curcapture = Сектор захвачен
 sector.curlost = Сектор потер�н
 sector.missingresources = [scarlet]�едо�таточно ре�ур�ов дл� вы�адки
 sector.attacked = Сектор [accent]{0}[white] атакован!
 sector.lost = Сектор [accent]{0}[white] потер�н!
-#note: the missing space in the line below is intentional (недо�тающий пробел управл�ет�� кодом)
-sector.captured = Сектор [accent]{0}[white]захвачен!
+sector.capture = Сектор [accent]{0}[white] захвачен!
+sector.capture.current = Сектор захвачен!
+sector.changeicon = Изменить иконку
+sector.noswitch.title = Перемещение между �екторами
+sector.noswitch = Вы не можете переключать�� между �екторами, пока �уще�твующий �ектор находит�� под атакой.\n\nСектор: [accent]{0}[] на [accent]{1}[]
+sector.view = Про�мотр �ектора
 
 threat.low = �изка�
 threat.medium = Средн��
 threat.high = Вы�ока�
 threat.extreme = Эк�тремальна�
 threat.eradication = И�требл�юща�
+difficulty.casual = Casual
+difficulty.easy = Лёгка�
+difficulty.normal = �ормальна�
+difficulty.hard = Сложна�
+difficulty.eradication = И�требл�юща�
 
 planets = Планеты
 
 planet.serpulo.name = Серпуло
+planet.erekir.name = Эрекир
 planet.sun.name = Солнце
 
 sector.impact0078.name = Крушение 0078
@@ -592,24 +824,101 @@ sector.fungalPass.name = Грибной перевал
 sector.biomassFacility.name = Центр и��ледовани� биома��ы
 sector.windsweptIslands.name = Штормовой архипелаг
 sector.extractionOutpost.name = Добывающа� база
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Планетарный пу�ковой терминал
+sector.coastline.name = Берегова� лини�
+sector.navalFortress.name = Прибрежна� крепо�ть
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-sector.groundZero.description = Оптимальна� локаци� дл� повторных игр. �изка� враже�ка� угроза. �емного ре�ур�ов.\nСоберите как можно больше �винца и меди.\nДвигайте�ь дальше.
+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.tarFields.description = Окраина зоны нефтедобычи, между горами и пу�тыней. Один из немногих районов � полезными запа�ами нефти.\nХот� �та обла�ть заброшена, в ней поблизо�ти при�ут�твуют некоторые опа�ные враже�кие �илы. �е �тоит их недооценивать.\n\n[lightgray]И��ледуйте технологию переработки нефти, е�ли возможно.
 sector.desolateRift.description = Чрезвычайно опа�на� зона. Обилие ре�ур�ов, но мало ме�та. Вы�окий ри�к разрушени�. Эвакуировать�� нужно как можно �корее. �е ра��лабл�йте�ь во врем� больших перерывов между враже�кими атаками.
 sector.nuclearComplex.description = Бывший завод по производ�тву и переработке тори�, превращенный в руины.\n[lightgray]И��ледуйте торий и варианты его многочи�ленного применени�.\n\nВраг при�ут�твует зде�ь в большом чи�ле, по�то�нно разведыва� нападающих.
 sector.fungalPass.description = Переходна� обла�ть между вы�окими горами и более низкими, покрытыми �порами земл�ми. Зде�ь ра�положена небольша� разведывательна� база противника.\nУничтожьте ее.\nИ�пользуйте единицы «Кинжал» и «Ползун». До�таньте до обоих �дер.
 sector.biomassFacility.description = Первои�точник �пор. Объект, на котором они были и��ледованы и изначально получены.\nИ��ледуйте технологию, наход�щую�� внутри. Культивируйте �поры дл� производ�тва топлива и пла�тма��.\n\n[lightgray]По�ле развала �того объекта �поры оказали�ь выброшены наружу. �ичто в ме�тной �ко�и�теме не могло �оперничать � таким агре��ивным организмом.
-sector.windsweptIslands.description = Дальше за береговой линией про�тирает�� �та отдаленна� череда о�тровов. Согла�но запи��м, когда-то они ра�полагали [accent]пла�тано[]производ�щими �ооружени�ми.\n\nОтбейте�ь от мор�ких �ил противника. Обо�нуйте базу на о�тровах. Изучите �ти заводы.
+sector.windsweptIslands.description = Дальше за береговой линией про�тирает�� �та отдаленна� череда о�тровов. Согла�но запи��м, когда-то они ра�полагали [accent]пла�танопроизвод�щими[] �ооружени�ми.\n\nОтбейте�ь от мор�ких �ил противника. Возведите базу на о�тровах. Изучите �ти заводы.
 sector.extractionOutpost.description = Отдаленный аванпо�т, по�троенный противником � целью перебро�ки ре�ур�ов в другие �екторы.\n\nМеж�екторна� тран�портна� технологи� необходима дл� дальнейшего завоевани�. Уничтожьте базу. Изучите их пу�ковые площадки.
 sector.impact0078.description = Зде�ь лежат о�татки межзвездного тран�портного �удна, первым вошедшего в �ту �и�тему.\n\nИзвлеките как можно больше из обломков. Изучите любую уцелевшую технологию.
 sector.planetaryTerminal.description = Конечна� цель.\n\nЭта берегова� база �одержит �ооружение, �по�обное запу�кать �дра к окре�тным планетам. Оно крайне хорошо охран�ет��.\n\nПроизведите мор�кие единицы. Уничтожьте врага как можно �корее. Изучите пу�ковую кон�трукцию.
+sector.coastline.description = В �том ме�те были обнаружены о�татки древней военно-мор�кой технологии. Отбейте атаки противника, захватите �тот �ектор и изучите �ту технологию.
+sector.navalFortress.description = Враг возвел базу на удаленном о�трове � е�те�твенными укреплени�ми. Уничтожьте её. Овладейте их технологией по производ�тву кораблей и изучите ее.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = �ачало
+sector.aegis.name = Защита
+sector.lake.name = Озеро
+sector.intersect.name = Пере�ечение
+sector.atlas.name = �тла�
+sector.split.name = Ра�кол
+sector.basin.name = Котловина
+sector.marsh.name = Болото
+sector.peaks.name = Пики
+sector.ravine.name = Ущелье
+sector.caldera-erekir.name = Кальдера
+sector.stronghold.name = Цитадель
+sector.crevice.name = Ра�щелина
+sector.siege.name = О�ада
+sector.crossroads.name = Ра�путье
+sector.karst.name = Кар�т
+sector.origin.name = И�точник
+sector.onset.description = Собирайте ре�ур�ы, и��ледуйте технологии дл� автоматизации производ�тва.\n�ачните атаку.
+sector.aegis.description = В �том �екторе е�ть залежи вольфрама.\nИ��ледуйте [accent]Ударную дрель[], чтобы добыть �тот ре�ур� и уничтожить враже�кую базу в �том регионе.
+sector.lake.description = Шлаковое озеро в �том �екторе �ильно ограничивает ва� в выборе боевых единиц. Един�твенным вариантом �вл�ют�� пар�щие единицы.\nИ��ледуйте [accent]Сборщик кораблей[] и произведите единицы [accent]Уклонение[] как можно �корее.
+sector.intersect.description = Сканирование предполагает, что �тот �ектор будет атакован � не�кольких �торон в�коре по�ле приземлени�.\nУ�тановите оборону и начните и��ледовать территорию как можно �корее.\n[accent]Мехи[] потребуют�� дл� преодолени� пере�еченной ме�тно�ти, котора� преобладает в �том регионе.
+sector.atlas.description = Ме�тно�ть �того �ектора очень разнообразна и потребует различные типы боевых единиц дл� �ффективной атаки.\nУлучшенные боевые единицы также могут понадобить��, чтобы обойти обнаруженные зде�ь враже�кие базы.\nИ��ледуйте [accent]Электролизер[] и [accent]Рефабрикатор танков[].
+sector.split.description = Минимальное враже�кое при�ут�твие в �том �екторе делает его идеальным дл� те�тировани� новой тран�портной технологии.
+sector.basin.description = В �том �екторе обнаружено большое враже�кое при�ут�твие.\nКак можно �корее произведите боевые единицы и захватите враже�кие �дра, чтобы закрепить�� в �том регионе.
+sector.marsh.description = В �том �екторе находит�� аркицит в больших количе�твах, но ограничены жерла.\nСтройте [accent]химиче�кие камеры �горани�[] дл� генерации �нергии.
+sector.peaks.description = Из-за горной ме�тно�ти в �том �екторе большин�тво боевых единиц бе�полезны. Понадоб�т�� летающие корабли.\nО�терегайте�ь враже�ких противовоздушных у�тановок. Е�ть возможно�ть отключить ча�ть из них, е�ли �не�ти поддерживающие их по�тройки.
+sector.ravine.description = Этот �ектор �вл�ет�� важным тран�портным маршрутом дл� врага. �е�мотр� на то, что враже�ких �дер зде�ь не обнаружено, ожидайте разнообрази� враже�ких атакующих �ил.\nПроизведите [accent]кинетиче�кий �плав[]. По�тройте турели [accent]Бед�твие[].
+sector.caldera-erekir.description = Ре�ур�ы, обнаруженные в �том �екторе, разбро�аны по не�кольким о�тровам.\nИ��ледуйте и запу�тите тран�портную �и�тему на о�нове грузовых дронов.
+sector.stronghold.description = Больша� враже�ка� база в �том �екторе охран�ет огромные залежи [accent]тори�[].\nИ�пользуйте его дл� изучени� боевых единиц и турелей более вы�окого уровн�.
+sector.crevice.description = Своими атаками враг будет �ро�тно пытать�� уничтожить вашу базу в �том �екторе.\nИзучение [accent]карбида[] и [accent]Пиролизного генератора[] может оказать�� необходимым дл� выживани�.
+sector.siege.description = В �том �екторе е�ть два параллельных каньона, которые за�тав�т ва� атаковать � двух �торон.\nИ��ледуйте [accent]циан[], чтобы получить возможно�ть �оздавать еще более �ильные танковые подразделени�.\nВнимание: были обнаружены враже�кие дальнобойные ракеты. Ракеты могут быть �биты до попадани�.
+sector.crossroads.description = Враже�кие базы в �том �екторе ра�положили�ь на пере�еченной ме�тно�ти. И��ледуйте разные типы боевых единиц, чтобы при�по�обить�� к ней.\nКроме того, некоторые базы защищены щитами. Вы��ните, как они получают �нергию.
+sector.karst.description = Этот �ектор богат ре�ур�ами, но будет атакован противником �разу по�ле приземлени�.\nИ�пользуйте �ти ре�ур�ы � умом и и��ледуйте [accent]фазовую ткань[].
+sector.origin.description = По�ледний �ектор � огромным враже�ким при�ут�твием.\nВеро�тных возможно�тей дл� и��ледовани� не о�тало�ь — �о�редоточьте�ь и�ключительно на уничтожении в�ех враже�ких �дер.
+
+status.burning.name = Горение
+status.freezing.name = Заморозка
+status.wet.name = Мокрый
+status.muddy.name = В гр�зи
+status.melting.name = Плавление
+status.sapped.name = И�тощение
+status.electrified.name = �а�лектризован
+status.spore-slowed.name = Замедление �порами
+status.tarred.name = В нефти
+status.overdrive.name = У�корение
+status.overclock.name = Разгон
+status.shocked.name = Зар�жен
+status.blasted.name = Взорван
+status.unmoving.name = Обездвижен
+status.boss.name = Страж
 
 settings.language = Язык
 settings.data = Игровые данные
@@ -620,7 +929,7 @@ settings.controls = Управление
 settings.game = Игра
 settings.sound = Звук
 settings.graphics = Графика
-settings.cleardata = Очи�тить игровые данные…
+settings.cleardata = Очи�тить игровые данные...
 settings.clear.confirm = Вы дей�твительно хотите очи�тить �вои данные?\nЭто нельз� отменить!
 settings.clearall.confirm = [scarlet]ОСТОРОЖ�О![]\nЭто �отрёт в�е данные, включа� �охранени�, карты, прогре�� кампании и на�тройки управлени�.\nПо�ле того как вы нажмёте [accent][ОК][], игра уничтожит в�е данные и автоматиче�ки закроет��.
 settings.clearsaves.confirm = Вы уверены, что хотите удалить в�е �охранени�?
@@ -632,6 +941,7 @@ settings.clearcampaignsaves.confirm = Вы уверены, что хотите 
 paused = [accent]< Пауза >
 clear = Очи�тить
 banned = [scarlet]Запрещено
+unsupported.environment = [scarlet]�еподдерживаемые у�лови�
 yes = Да
 no = �ет
 info.title = Информаци�
@@ -639,14 +949,18 @@ error.title = [scarlet]Произошла ошибка
 error.crashtitle = Произошла ошибка
 unit.nobuild = [scarlet]Единица не может �троить
 lastaccessed = [lightgray]По�ледн�� конфигураци� от {0}
+lastcommanded = [lightgray]По�ледн�� команда от: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <загрузите карту дл� отображени�>
 stat.description = �азначение
 stat.input = Вход
 stat.output = Выход
+stat.maxefficiency = Мак�имальна� �ффективно�ть
 stat.booster = У�коритель
 stat.tiles = �еобходимые плитки
-stat.affinities = Увеличение �ффективно�ти
+stat.affinities = Множитель �ффективно�ти
+stat.opposites = Противоположно�ти
 stat.powercapacity = Вме�тимо�ть �нергии
 stat.powershot = Энерги�/вы�трел
 stat.damage = Урон
@@ -668,9 +982,12 @@ stat.itemcapacity = Вме�тимо�ть предметов
 stat.memorycapacity = Размер пам�ти
 stat.basepowergeneration = Базова� генераци� �нергии
 stat.productiontime = Врем� производ�тва
-stat.repairtime = Врем� полной регенерации
+stat.repairtime = Врем� полного ремонта
+stat.repairspeed = Скоро�ть ремонта
 stat.weapons = Оруди�
 stat.bullet = Снар�д
+stat.moduletier = Уровень модул�
+stat.unittype = Боева� единица
 stat.speedincrease = Увеличение �коро�ти
 stat.range = Радиу� дей�тви�
 stat.drilltier = Бурит
@@ -678,6 +995,7 @@ stat.drillspeed = Базова� �коро�ть бурени�
 stat.boosteffect = У�кор�ющий �ффект
 stat.maxunits = Мак�имальное количе�тво активных единиц
 stat.health = Прочно�ть
+stat.armor = Брон�
 stat.buildtime = Врем� �троитель�тва
 stat.maxconsecutive = Мак�. по�ледовательно�ть
 stat.buildcost = Стоимо�ть �троитель�тва
@@ -693,6 +1011,7 @@ stat.lightningchance = Шан� удара молнии
 stat.lightningdamage = Урон молнии
 stat.flammability = Во�пламен�емо�ть
 stat.radioactivity = Радиоактивно�ть
+stat.charge = Зар�д
 stat.heatcapacity = Теплоёмко�ть
 stat.viscosity = В�зко�ть
 stat.temperature = Температура
@@ -701,25 +1020,77 @@ stat.buildspeed = Скоро�ть �троитель�тва
 stat.minespeed = Скоро�ть добычи
 stat.minetier = Уровень добычи
 stat.payloadcapacity = Грузоподъёмно�ть
-stat.commandlimit = Лимит командовани�
 stat.abilities = Спо�обно�ти
 stat.canboost = Может взлететь
 stat.flying = Летающий
 stat.ammouse = И�пользование боеприпа�ов
+stat.ammocapacity = Вме�тимо�ть боеприпа�ов
+stat.damagemultiplier = Множитель урона
+stat.healthmultiplier = Множитель прочно�ти
+stat.speedmultiplier = Множитель �коро�ти
+stat.reloadmultiplier = Множитель перезар�дки
+stat.buildspeedmultiplier = Множитель �коро�ти �троитель�тва
+stat.reactive = Реактивен
+stat.immunities = �ево�приимчив
+stat.healing = Ремонт
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Силовое поле
+ability.forcefield.description = Создает �иловой щит, поглощающий пули
 ability.repairfield = Ремонтирующее поле
+ability.repairfield.description = Ремонтирует близлежащие единицы
 ability.statusfield = У�иливающее поле
-ability.unitspawn = Завод единиц «{0}»
+ability.statusfield.description = �акладывает �ффект на ближайшие единицы
+ability.unitspawn = Завод единиц �
+ability.unitspawn.description = Кон�труирует единицы
 ability.shieldregenfield = Поле во��тановлени� щита
+ability.shieldregenfield.description = Во��танавливает щиты ближайших юнитов
 ability.movelightning = Молнии при движении
+ability.movelightning.description = Выпу�кает молнии при движении
+ability.armorplate = Бронепла�тина
+ability.armorplate.description = Снижает урон, получаемый при �трельбе
+ability.shieldarc = Дуговой щит
+ability.shieldarc.description = Выпу�кает �иловой щит по дуге, поглощающий пули
+ability.suppressionfield = Поле подавлени� регенерации
+ability.suppressionfield.description = О�танавливает ремонтные здани�
+ability.energyfield = Энергетиче�кое поле
+ability.energyfield.description = Электризует ближайших врагов
+ability.energyfield.healdescription = Электризует ближайших врагов и лечит �оюзников
+ability.regen = Регенераци�
+ability.regen.description = Во��танавливает �об�твенное здоровье � течением времени
+ability.liquidregen = Поглощение жидко�ти
+ability.liquidregen.description = Поглощает жидко�ть дл� �амово��тановлени�
+ability.spawndeath = Смертельное порождение
+ability.spawndeath.description = Создает единицы по�ле �мерти
+ability.liquidexplode = Смертельное разлитие
+ability.liquidexplode.description = Разливает жидко�ть при �мерти
+ability.stat.firingrate = [stat]{0}/�ек[lightgray] темп �трельбы
+ability.stat.regen = [stat]{0}[lightgray] здоровь�/�ек
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] щит
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] �коро�ть регенерации
+ability.stat.slurpheal = [stat]{0}[lightgray] здоровь�/единица жидко�ти
+ability.stat.cooldown = [stat]{0} �ек[lightgray] перезар�дка
+ability.stat.maxtargets = [stat]{0}[lightgray] мак�имум целей
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] тот же тип ремонта
+ability.stat.damagereduction = [stat]{0}%[lightgray] �нижение урона
+ability.stat.minspeed = [stat]{0} плиток/�ек[lightgray] минимальна� �коро�ть
+ability.stat.duration = [stat]{0} �ек[lightgray] продолжительно�ть
+ability.stat.buildtime = [stat]{0} �ек[lightgray] врем� по�тройки
+
+bar.onlycoredeposit = До�тупен перено� только в �дро
 
 bar.drilltierreq = Требует�� бур получше
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = �едо�таточно ре�ур�ов
 bar.corereq = Требует�� о�нова �дра
+bar.corefloor = Требует�� зона �дра
+bar.cargounitcap = До�тигнут предел грузовой единицы
 bar.drillspeed = Скоро�ть бурени�: {0}/�
 bar.pumpspeed = Скоро�ть выкачивани�: {0}/�
 bar.efficiency = Эффективно�ть: {0}%
+bar.boost = У�корение: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Энерги�: {0}/�
 bar.powerstored = �акоплено: {0}/{1}
 bar.poweramount = Энерги�: {0}
@@ -730,49 +1101,66 @@ bar.capacity = Вме�тимо�ть: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = Жидко�ти
 bar.heat = �агрев
+bar.cooldown = Cooldown
+bar.instability = �е�табильно�ть
+bar.heatamount = �агрев: {0}
+bar.heatpercent = �агрев: {0} ({1}%)
 bar.power = Энерги�
 bar.progress = Прогре�� �троитель�тва
+bar.loadprogress = Прогре��
+bar.launchcooldown = Лимит вы�адки
 bar.input = Ввод
 bar.output = Вывод
+bar.strength = [stat]{0}[lightgray]x �ффективно�ть
 
 units.processorcontrol = [lightgray]Управл�ет�� проце��ором
 
 bullet.damage = [stat]{0}[lightgray] урона
 bullet.splashdamage = [stat]{0}[lightgray] урона в радиу�е ~[stat] {1}[lightgray] блоков
 bullet.incendiary = [stat]зажигательный
-bullet.sapping = [stat]и�тощающий
 bullet.homing = [stat]�амонавод�щий��
-bullet.shock = [stat]шоковый
-bullet.frag = [stat]о�колочный
+bullet.armorpierce = [stat]бронебойный
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} �ек[lightgray] подавлени� регенерации в радиу�е ~ [stat]{1}[lightgray] блоков
+bullet.interval = [stat]{0}/�ек[lightgray] интервальный(ых) �нар�д(ов):
+bullet.frags = [stat]{0}[lightgray]x о�колочный(ых) �нар�д(ов):
+bullet.lightning = [stat]{0}[lightgray]x молнии ~ [stat]{1}[lightgray] урона
 bullet.buildingdamage = [stat]{0}%[lightgray] урона по по�тройкам
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] отбра�ывани�
-bullet.pierce = [stat]{0}[lightgray]x пробитие
+bullet.pierce = [stat]{0}[lightgray]x пробити�
 bullet.infinitepierce = [stat]бе�конечное пробитие
-bullet.healpercent = [stat]{0}[lightgray]% лечени�
-bullet.freezing = [stat]замораживающий
-bullet.tarred = [stat]замедл�ющий, горючий
+bullet.healpercent = [stat]{0}[lightgray]% ремонта
+bullet.healamount = [stat]{0}[lightgray] пр�мой ремонт
 bullet.multiplier = [stat]{0}[lightgray]x множитель боеприпа�ов
-bullet.reload = [stat]{0}[lightgray]x �коро�ть �трельбы
+bullet.reload = [stat]{0}%[lightgray] �коро�ть �трельбы
+bullet.range = [stat]{0}[lightgray] диапазон
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = блоков
 unit.blockssquared = блоков²
 unit.powersecond = единиц �нергии/�екунду
+unit.tilessecond = плиток/�екунду
 unit.liquidsecond = жидко�тных единиц/�екунду
 unit.itemssecond = предметов/�екунду
 unit.liquidunits = жидко�тных единиц
 unit.powerunits = �нерг. единиц
+unit.heatunits = единиц тепла
 unit.degrees = °
-unit.seconds = �ек.
-unit.minutes = мин.
+unit.seconds = �ек
+unit.minutes = мин
 unit.persecond = /�ек
 unit.perminute = /мин
 unit.timesspeed = x �коро�ть
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = прочно�ть щита
 unit.items = предметов
 unit.thousands = к
 unit.millions = М
 unit.billions = кM
+unit.shots = вы�трелы
 unit.pershot = /вы�трел
 category.purpose = �азначение
 category.general = О�новные
@@ -782,17 +1170,24 @@ category.items = Предметы
 category.crafting = Ввод/вывод
 category.function = Дей�твие
 category.optional = Дополнительные улучшени�
+setting.alwaysmusic.name = В�егда играть музыку
+setting.alwaysmusic.description = Е�ли включить �ту функцию, музыка в�егда будет во�производить�� в игре по кругу.\nЕ�ли выключить, она будет во�производить�� только через �лучайные промежутки времени.
+
+setting.skipcoreanimation.name = Пропу�кать анимацию запу�ка/приземлени� �дра
 setting.landscape.name = Только альбомный (горизонтальный) режим
 setting.shadows.name = Тени
 setting.blockreplace.name = �втоматиче�ка� замена блоков
 setting.linear.name = Линейна� фильтраци�
 setting.hints.name = Под�казки
-setting.flow.name = Показывать �коро�ть потока ре�ур�ов
+setting.logichints.name = Под�казки дл� логики
 setting.backgroundpause.name = Фонова� пауза
 setting.buildautopause.name = �втоматиче�ка� прио�тановка �троитель�тва
+setting.doubletapmine.name = Добыча руды двойным нажатием
+setting.commandmodehold.name = Удерживать дл� командовани� боевыми единицами
+setting.distinctcontrolgroups.name = Ограничение на одну контрольную группу на единицу 
+setting.modcrashdisable.name = Отключение модификаций по�ле вылета при запу�ке
 setting.animatedwater.name = �нимированные поверхно�ти
 setting.animatedshields.name = �нимированные щиты
-setting.antialias.name = Сглаживание[lightgray] (требует перезапу�ка)[]
 setting.playerindicators.name = Индикаторы направлени� игроков
 setting.indicators.name = Индикаторы направлени� врагов
 setting.autotarget.name = �втозахват цели
@@ -801,15 +1196,12 @@ setting.touchscreen.name = Сен�орное управление
 setting.fpscap.name = Мак�имальный FPS
 setting.fpscap.none = �еограниченный
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Ма�штаб пользователь�кого интерфей�а[lightgray] (необходим перезапу�к)[]
+setting.uiscale.name = Ма�штаб пользователь�кого интерфей�а
+setting.uiscale.description = Дл� в�туплени� изменений в �илу может потребовать�� перезагрузка игры.
 setting.swapdiagonal.name = В�егда диагональное размещение
-setting.difficulty.training = Обучение
-setting.difficulty.easy = Лёгка�
-setting.difficulty.normal = �ормальна�
-setting.difficulty.hard = Сложна�
-setting.difficulty.insane = Безумна�
-setting.difficulty.name = Сложно�ть:
 setting.screenshake.name = Тр��ка �крана
+setting.bloomintensity.name = Интен�ивно�ть �вечени�
+setting.bloomblur.name = Размытие �вечени�
 setting.effects.name = Эффекты
 setting.destroyedblocks.name = Отображать уничтоженные блоки
 setting.blockstatus.name = Показывать �тату� блока
@@ -819,51 +1211,58 @@ setting.saveinterval.name = Интервал �охранени�
 setting.seconds = {0} �екунд
 setting.milliseconds = {0} милли�екунд
 setting.fullscreen.name = Полно�кранный режим
-setting.borderlesswindow.name = Безрамочное окно[lightgray] (может потребовать�� перезапу�к)
+setting.borderlesswindow.name = Безрамочное окно
+setting.borderlesswindow.name.windows = Полно�кранный режим без полей
+setting.borderlesswindow.description = Дл� в�туплени� изменений в �илу может потребовать�� перезагрузка игры.
 setting.fps.name = Показывать FPS и пинг
+setting.console.name = Включить кон�оль
 setting.smoothcamera.name = Плавна� камера
 setting.vsync.name = Вертикальна� �инхронизаци�
 setting.pixelate.name = Пик�елизаци�
 setting.minimap.name = Отображать мини-карту
 setting.coreitems.name = Отображать предметы из �дра
 setting.position.name = Отображать координаты игрока
+setting.mouseposition.name = Показывать позицию кур�ора
 setting.musicvol.name = Громко�ть музыки
 setting.atmosphere.name = Отображать атмо�феру планеты
+setting.drawlight.name = Отображать тени/о�вещение
 setting.ambientvol.name = Громко�ть окружени�
 setting.mutemusic.name = Заглушить музыку
 setting.sfxvol.name = Громко�ть �ффектов
 setting.mutesound.name = Заглушить звук
 setting.crashreport.name = Отправл�ть анонимные отчёты о вылетах
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = �втоматиче�кое �оздание �охранений
-setting.publichost.name = Общедо�тупно�ть игры
+setting.steampublichost.name = Видимо�ть публичной игры
 setting.playerlimit.name = Ограничение игроков
 setting.chatopacity.name = �епрозрачно�ть чата
 setting.lasersopacity.name = �епрозрачно�ть лазеров �нерго�набжени�
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = �епрозрачно�ть мо�тов
 setting.playerchat.name = Отображать облака чата над игроками
 setting.showweather.name = Отображать погоду
-public.confirm = Вы хотите, чтобы ваша игра �тала публичной?\n[accent] Любой игрок �может при�оединить�� к вашим играм.\n[lightgray]Позже, �то можно будет изменить в �а�тройки->Игра->Общедо�тупно�ть игры.
-public.confirm.really = Е�ли вы хотите поиграть � друзь�ми, то и�пользуйте кнопку «[green]Пригла�ить друзей[]» вме�то �оздани� [scarlet]публичного �ервера[]!\nВы уверены, что хотите �делать �вою игру [scarlet]публичной[]?
+setting.hidedisplays.name = Скрыть логиче�кие ди�плеи
+setting.macnotch.name = �даптировать интерфей� к вырезу на �кране
+setting.macnotch.description = Дл� в�туплени� изменений в �илу требует�� перезагрузка игры
+steam.friendsonly = Только друзь�
+steam.friendsonly.tooltip = Только ли друзь� из Steam могут при�оедин�ть�� к вашей игре.\nУбрав �ту галочку, вы �делаете вашу игру публичной - при�оединить�� �может любой желающий.
 public.beta = Имейте в виду, что бета-вер�и� игры не может делать игры публичными.
-uiscale.reset = Ма�штаб пользователь�кого интерфей�а был изменён.\n�ажмите «ОК» дл� подтверждени� �того ма�штаба.\n[scarlet]Возврат на�троек и выход через[accent] {0}[] �екунд…
+uiscale.reset = Ма�штаб пользователь�кого интерфей�а был изменён.\n�ажмите «ОК» дл� подтверждени� �того ма�штаба.\n[scarlet]Возврат на�троек и выход через[accent] {0}[] �екунд...
 uiscale.cancel = Отменить & Выйти
 setting.bloom.name = Свечение
 keybind.title = �а�тройка управлени�
 keybinds.mobile = [scarlet]Большин�тво комбинаций клавиш зде�ь не работает на мобильных у�трой�твах. Поддерживает�� только базовое движение.
 category.general.name = О�новное
 category.view.name = Про�мотр
+category.command.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 = �ажмите о�и или клавишу…
+keybind.press = �ажмите клавишу...
+keybind.press.axis = �ажмите о�ь или клавишу...
 keybind.screenshot.name = Скриншот карты
 keybind.toggle_power_lines.name = Отображение лазеров �нерго�набжени�
 keybind.toggle_block_status.name = Отображение �тату�ов блоков
@@ -872,6 +1271,27 @@ keybind.move_y.name = Движение по о�и Y
 keybind.mouse_move.name = Следовать за кур�ором
 keybind.pan.name = Панорамирование камеры
 keybind.boost.name = Полёт/у�корение
+keybind.command_mode.name = Командование боевыми единицами
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Пере�троить в обла�ти
 keybind.schematic_select.name = Выбрать обла�ть
 keybind.schematic_menu.name = Меню �хем
 keybind.schematic_flip_x.name = Отразить �хему по о�и X
@@ -897,10 +1317,11 @@ keybind.select.name = Выбор/вы�трел
 keybind.diagonal_placement.name = Диагональное размещение
 keybind.pick.name = Выбрать блок
 keybind.break_block.name = Разрушить блок
+keybind.select_all_units.name = Выбрать в�е единицы
+keybind.select_all_unit_factories.name = Выбрать в�е заводы единиц
 keybind.deselect.name = Сн�ть выделение
 keybind.pickupCargo.name = Вз�ть груз
 keybind.dropCargo.name = Сбро�ить груз
-keybind.command.name = Командовать группой
 keybind.shoot.name = Вы�трел
 keybind.zoom.name = Ма�штабирование
 keybind.menu.name = Меню
@@ -909,6 +1330,7 @@ keybind.pause_building.name = Прио�тановить/возобновить
 keybind.minimap.name = Мини-карта
 keybind.planet_map.name = Карта планеты
 keybind.research.name = И��ледовани�
+keybind.block_info.name = Информаци� о блоке
 keybind.chat.name = Чат
 keybind.player_list.name = Спи�ок игроков
 keybind.console.name = Кон�оль
@@ -928,53 +1350,105 @@ mode.sandbox.name = Пе�очница
 mode.sandbox.description = Бе�конечные ре�ур�ы и нет таймера волн. [gray]Можно �амим вызвать волну.
 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 = Бе�конечные ре�ур�ы (Игрок)
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Скрыть запрещенные блоки
+rules.infiniteresources = Бе�конечные ре�ур�ы
+rules.onlydepositcore = Разрешен перено� только в �дро
+rules.derelictrepair = Разрешить починку покинутых по�троек
 rules.reactorexplosions = Взрывы реакторов
-rules.schematic = Схемы разрешены
+rules.coreincinerates = Ядро �жигает избыток ре�ур�ов
+rules.disableworldprocessors = Отключить мировые проце��оры
+rules.schematic = Разрешить �хемы
 rules.wavetimer = Интервал волн
+rules.wavesending = Отправка волн
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Волны
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Режим атаки
-rules.buildai = Строитель�тво ИИ
-rules.enemyCheat = Бе�конечные ре�ур�ы ИИ (кра�на� команда)
-rules.blockhealthmultiplier = Множитель здоровь� блоков
+rules.buildai = ИИ �троит базы
+rules.buildaitier = Уровень баз ИИ
+rules.rtsai = ИИ в реальном времени
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Минимальный размер отр�да
+rules.rtsmaxsquadsize = Мак�имальный размер отр�да
+rules.rtsminattackweight = Минимальный ве� дл� атаки
+
+rules.cleanupdeadteams = Очи�тка �троений побежденных команд (PvP)
+rules.corecapture = Захват �дра по�ле уничтожени�
+rules.polygoncoreprotection = Полигональна� защита �дер
+rules.placerangecheck = Запретить размещение по�троек возле врага
+rules.enemyCheat = Бе�конечные ре�ур�ы ИИ
+rules.blockhealthmultiplier = Множитель прочно�ти блоков
 rules.blockdamagemultiplier = Множитель урона блоков
 rules.unitbuildspeedmultiplier = Множитель �коро�ти производ�тва боев. ед.
-rules.unithealthmultiplier = Множитель здоровь� боев. ед.
+rules.unitcostmultiplier = Множитель �тоимо�ти боев. ед.
+rules.unithealthmultiplier = Множитель прочно�ти боев. ед.
 rules.unitdamagemultiplier = Множитель урона боев. ед.
+rules.unitcrashdamagemultiplier = Множитель урона от падени� боев. ед.
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Множитель �олнечной �нергии
+rules.unitcapvariable = Ядра увеличивают лимит единиц
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = �ачальный лимит единиц
+rules.limitarea = Ограничить обла�ть карты
 rules.enemycorebuildradius = Радиу� защиты враж. �дер:[lightgray] (блок.)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Интервал волн:[lightgray] (�ек)
+rules.initialwavespacing = Врем� до первой волны:[lightgray] (�ек)
 rules.buildcostmultiplier = Множитель затрат на �троитель�тво
 rules.buildspeedmultiplier = Множитель �коро�ти �троитель�тва
 rules.deconstructrefundmultiplier = Множитель возврата ре�ур�ов при разборке
 rules.waitForWaveToEnd = Волны ожидают врагов
+rules.wavelimit = Игра заканчивает�� по�ле волны
 rules.dropzoneradius = Радиу� зоны вы�адки врагов:[lightgray] (блоков)
 rules.unitammo = Боев. ед. требуют боеприпа�ы
+rules.enemyteam = Команда Врагов
+rules.playerteam = Команда Игрока
 rules.title.waves = Волны
 rules.title.resourcesbuilding = Ре�ур�ы & �троитель�тво
 rules.title.enemy = Враги
 rules.title.unit = Боевые единицы
 rules.title.experimental = Эк�периментально
 rules.title.environment = Окружение
+rules.title.teams = Команды
+rules.title.planet = Планета
 rules.lighting = О�вещение
-rules.enemyLights = Враже�кие огни
+rules.fog = Туман войны
+rules.invasions = Вторжени� врагов на �ектора
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Показывать по�вление врагов
+rules.randomwaveai = �епред�казуемый ИИ волн
+
 rules.fire = Огонь
+rules.anyenv = <Люба�>
 rules.explosions = Урон от взрывов блоков/единиц
 rules.ambientlight = Окружающий �вет
 rules.weather = Погода
 rules.weather.frequency = Периодично�ть:
 rules.weather.always = В�егда
 rules.weather.duration = Длительно�ть:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Предметы
 content.liquid.name = Жидко�ти
 content.unit.name = Боевые единицы
 content.block.name = Блоки
+content.status.name = Эффекты �тату�а
 content.sector.name = Секторы
+content.team.name = Фракции
+wallore = (Стена)
 
 item.copper.name = Медь
 item.lead.name = Свинец
@@ -992,10 +1466,24 @@ item.blast-compound.name = Взрывчата� �ме�ь
 item.pyratite.name = Пиротит
 item.metaglass.name = Мета�текло
 item.scrap.name = Металлолом
+item.fissile-matter.name = �е�табильна� матери�
+item.beryllium.name = Бериллий
+item.tungsten.name = Вольфрам
+item.oxide.name = Ок�ид
+item.carbide.name = Карбид
+item.dormant-cyst.name = Дремлюща� оболочка
+
 liquid.water.name = Вода
 liquid.slag.name = Шлак
 liquid.oil.name = �ефть
 liquid.cryofluid.name = Криогенна� жидко�ть
+liquid.neoplasm.name = �еоплазма
+liquid.arkycite.name = �ркицит
+liquid.gallium.name = Галлий
+liquid.ozone.name = Озон
+liquid.hydrogen.name = Водород
+liquid.nitrogen.name = �зот
+liquid.cyanogen.name = Циан
 
 unit.dagger.name = Кинжал
 unit.mace.name = Булава
@@ -1023,6 +1511,11 @@ unit.minke.name = Минке
 unit.bryde.name = Брайд
 unit.sei.name = Сейвал
 unit.omura.name = Омура
+unit.retusa.name = Ретуза
+unit.oxynoe.name = Ок�ино
+unit.cyerce.name = Цир�
+unit.aegires.name = Эгире�
+unit.navanax.name = �аванак�
 unit.alpha.name = �льфа
 unit.beta.name = Бета
 unit.gamma.name = Гамма
@@ -1030,14 +1523,36 @@ unit.scepter.name = Скипетр
 unit.reign.name = Вла�ть
 unit.vela.name = Пару�
 unit.corvus.name = Ворон
+unit.stell.name = О�нова
+unit.locus.name = Очаг
+unit.precept.name = Заповедь
+unit.vanquish.name = Покоритель
+unit.conquer.name = Завоеватель
+unit.merui.name = Меруй
+unit.cleroi.name = Клерой
+unit.anthicus.name = �нтику�
+unit.tecta.name = Текта
+unit.collaris.name = Коллари�
+unit.elude.name = Уклонение
+unit.avert.name = Отвлечение
+unit.obviate.name = У�транение
+unit.quell.name = Подавление
+unit.disrupt.name = Разрушение
+unit.evoke.name = Во�ход
+unit.incite.name = Призыв
+unit.emanate.name = И�ход
+unit.manifold.name = Грузовой дрон
+unit.assembly-drone.name = Сборочный дрон
+unit.latum.name = Латум
+unit.renale.name = Ренале
 
-block.resupply-point.name = Пункт �набжени�
 block.parallax.name = Параллак�
 block.cliff.name = Скала
 block.sand-boulder.name = Пе�чаный валун
 block.basalt-boulder.name = Базальтовый валун
 block.grass.name = Трава
-block.slag.name = Шлак
+block.molten-slag.name = Шлак
+block.pooled-cryofluid.name = Криогенна� жидко�ть
 block.space.name = Ко�мо�
 block.salt.name = Соль
 block.salt-wall.name = Сол�на� �тена
@@ -1065,24 +1580,28 @@ block.graphite-press.name = Графитный пре��
 block.multi-press.name = Мульти-пре��
 block.constructing = {0} [lightgray](Строит��)
 block.spawn.name = Точка по�влени� врагов
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Ядро: «О�колок»
 block.core-foundation.name = Ядро: «Штаб»
 block.core-nucleus.name = Ядро: «�том»
-block.deepwater.name = Глубоководье
-block.water.name = Вода
+block.deep-water.name = Глубоководье
+block.shallow-water.name = Вода
 block.tainted-water.name = Загр�знённа� вода
+block.deep-tainted-water.name = Загр�знённое глубоководье
 block.darksand-tainted-water.name = Тёмный пе�ок � загр�знённой водой
 block.tar.name = �ефть
 block.stone.name = Камень
-block.sand.name = Пе�ок
+block.sand-floor.name = Пе�ок
 block.darksand.name = Тёмный пе�ок
 block.ice.name = Лёд
 block.snow.name = Снег
-block.craters.name = Кратеры
+block.crater-stone.name = Кратеры
 block.sand-water.name = Пе�ок � водой
 block.darksand-water.name = Тёмный пе�ок � водой
 block.char.name = Выжженна� земл�
 block.dacite.name = Дацит
+block.rhyolite.name = Риолит
 block.dacite-wall.name = Дацитова� �тена
 block.dacite-boulder.name = Дацитовый валун
 block.ice-snow.name = За�неженный лёд
@@ -1100,7 +1619,8 @@ block.spore-cluster.name = Скопление �пор
 block.metal-floor.name = Металличе�кий пол 1
 block.metal-floor-2.name = Металличе�кий пол 2
 block.metal-floor-3.name = Металличе�кий пол 3
-block.metal-floor-5.name = Металличе�кий пол 4
+block.metal-floor-4.name = Металличе�кий пол 4
+block.metal-floor-5.name = Металличе�кий пол 5
 block.metal-floor-damaged.name = Повреждённый металличе�кий пол
 block.dark-panel-1.name = Тёмна� панель 1
 block.dark-panel-2.name = Тёмна� панель 2
@@ -1139,6 +1659,9 @@ block.distributor.name = Ра�пределитель
 block.sorter.name = Сортировщик
 block.inverted-sorter.name = Инвертированный �ортировщик
 block.message.name = Сообщение
+block.reinforced-message.name = У�иленное �ообщение
+block.world-message.name = Мировое �ообщение
+block.world-switch.name = World Switch
 block.illuminator.name = О�ветитель
 block.overflow-gate.name = Избыточный затвор
 block.underflow-gate.name = Избыточный шлюз
@@ -1190,24 +1713,26 @@ block.solar-panel.name = Солнечна� панель
 block.solar-panel-large.name = Больша� �олнечна� панель
 block.oil-extractor.name = �ефт�на� вышка
 block.repair-point.name = Ремонтный пункт
+block.repair-turret.name = Ремонтна� турель
 block.pulse-conduit.name = Импуль�ный трубопровод
 block.plated-conduit.name = Укреплённый трубопровод
 block.phase-conduit.name = Фазовый трубопровод
 block.liquid-router.name = Жидко�тный маршрутизатор
 block.liquid-tank.name = Жидко�тный бак
+block.liquid-container.name = Жидко�тна� ци�терна
 block.liquid-junction.name = Жидко�тный перекрё�ток
 block.bridge-conduit.name = Мо�товой трубопровод
 block.rotary-pump.name = Роторный на�о�
 block.thorium-reactor.name = Ториевый реактор
 block.mass-driver.name = Электромагнитна� катапульта
 block.blast-drill.name = Воздушна� бурова� у�тановка
-block.thermal-pump.name = Термальный на�о�
+block.impulse-pump.name = Термальный на�о�
 block.thermal-generator.name = Термальный генератор
-block.alloy-smelter.name = Плавильн� кинетиче�кого �плава
+block.surge-smelter.name = Плавильн� кинетиче�кого �плава
 block.mender.name = Регенератор
 block.mend-projector.name = Ремонтирующий проектор
-block.surge-wall.name = Стена из кинетиче�кого �плава
-block.surge-wall-large.name = Больша� �тена из кинетиче�кого �плава
+block.surge-wall.name = Кинетиче�ка� �тена
+block.surge-wall-large.name = Больша� кинетиче�ка� �тена
 block.cyclone.name = Циклон
 block.fuse.name = Взрыватель
 block.shock-mine.name = Шокова� мина
@@ -1220,9 +1745,9 @@ block.meltdown.name = И�пепелитель
 block.foreshadow.name = Знамение
 block.container.name = Контейнер
 block.launch-pad.name = Пу�кова� площадка
-block.launch-pad-large.name = Больша� пу�кова� площадка
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = Сегмент
-block.command-center.name = Командный центр
 block.ground-factory.name = �аземна� фабрика
 block.air-factory.name = Воздушна� фабрика
 block.naval-factory.name = Мор�ка� фабрика
@@ -1232,14 +1757,179 @@ block.exponential-reconstructor.name = Эк�поненциальный реко
 block.tetrative-reconstructor.name = Тетративный рекон�труктор
 block.payload-conveyor.name = Грузовой конвейер
 block.payload-router.name = Разгрузочный маршрутизатор
+block.duct.name = Предметный канал
+block.duct-router.name = Канальный маршрутизатор
+block.duct-bridge.name = Канальный мо�т
+block.large-payload-mass-driver.name = Больша� грузова� катапульта
+block.payload-void.name = Грузовой вакуум
+block.payload-source.name = Грузовой и�точник
 block.disassembler.name = Разборщик
 block.silicon-crucible.name = Кремниевый тигель
 block.overdrive-dome.name = Сверхприводный купол
-#experimental, may be removed
-block.block-forge.name = Завод блоков
-block.block-loader.name = Загрузчик блоков
-block.block-unloader.name = Разгрузчик блоков
 block.interplanetary-accelerator.name = Межпланетный у�коритель
+block.constructor.name = Кон�труктор
+block.constructor.description = Производит грузы размером 1x1 и 2x2
+block.large-constructor.name = Большой кон�труктор
+block.large-constructor.description = Производит грузы размером 3x3 и 4x4
+block.deconstructor.name = Большой декон�труктор
+block.deconstructor.description = Разбирает грузы и боевые единицы � возвращением 100% и�пользованных ре�ур�ов на их производ�тво.
+block.payload-loader.name = Грузовой загрузчик
+block.payload-loader.description = Загружает жидко�ти и ре�ур�ы в груз.
+block.payload-unloader.name = Грузовой разгрузчик
+block.payload-unloader.description = Выгружает жидко�ти и ре�ур�ы из груза.
+block.heat-source.name = И�точник тепла
+block.heat-source.description = Блок 1x1, дающий практиче�ки бе�конечное количе�тво тепла.
+block.empty.name = Пу�то
+block.rhyolite-crater.name = Риолитовый кратер
+block.rough-rhyolite.name = Грубый риолит
+block.regolith.name = Реголит
+block.yellow-stone.name = Жёлтый камень
+block.carbon-stone.name = Углеродный камень
+block.ferric-stone.name = Железн�к
+block.ferric-craters.name = Железокаменные кратеры
+block.beryllic-stone.name = Берилловый камень
+block.crystalline-stone.name = Кри�талличе�кий камень
+block.crystal-floor.name = Кри�тальна� земл�
+block.yellow-stone-plates.name = Жёлтые каменные плиты
+block.red-stone.name = Кра�ный камень
+block.dense-red-stone.name = Плотный кра�ный камень
+block.red-ice.name = Кра�ный лёд
+block.arkycite-floor.name = �ркицитовый пол
+block.arkyic-stone.name = �ркиче�кий камень
+block.rhyolite-vent.name = Риолитовое жерло
+block.carbon-vent.name = Углеродное жерло
+block.arkyic-vent.name = �ркиче�кое жерло
+block.yellow-stone-vent.name = Жёлтокаменное жерло
+block.red-stone-vent.name = Кра�нокаменное жерло
+block.crystalline-vent.name = Кри�талличе�кое жерло
+block.redmat.name = Кра�на� земл�
+block.bluemat.name = Син�� земл�
+block.core-zone.name = Зона �дра
+block.regolith-wall.name = Реголитова� �тена
+block.yellow-stone-wall.name = Жёлтокаменна� �тена
+block.rhyolite-wall.name = Риолитова� �тена
+block.carbon-wall.name = Углеродна� �тена
+block.ferric-stone-wall.name = Железокаменна� �тена
+block.beryllic-stone-wall.name = Бериллова� каменна� �тена
+block.arkyic-wall.name = �ркиче�ка� �тена
+block.crystalline-stone-wall.name = Кри�талличе�ка� каменна� �тена
+block.red-ice-wall.name = Кра�на� лед�на� �тена
+block.red-stone-wall.name = Кра�на� каменна� �тена
+block.red-diamond-wall.name = Кра�на� алмазна� �тена
+block.redweed.name = Кра�ный �орн�к
+block.pur-bush.name = Фиолетовый ку�т
+block.yellowcoral.name = Желтый коралл
+block.carbon-boulder.name = Углеродный валун
+block.ferric-boulder.name = Железокаменный валун
+block.beryllic-boulder.name = Берилловый валун
+block.yellow-stone-boulder.name = Жёлтокаменный валун
+block.arkyic-boulder.name = �ркиче�кий валун
+block.crystal-cluster.name = Кри�талловый кла�тер
+block.vibrant-crystal-cluster.name = Яркий кри�талловый кла�тер
+block.crystal-blocks.name = Кри�тальные блоки
+block.crystal-orbs.name = Кри�тальные �феры
+block.crystalline-boulder.name = Кри�талличе�кий валун
+block.red-ice-boulder.name = Кра�ный лед�ной валун
+block.rhyolite-boulder.name = Риолитовый валун
+block.red-stone-boulder.name = Кра�ный каменный валун
+block.graphitic-wall.name = Графитова� �тена
+block.silicon-arc-furnace.name = Кремниева� дугова� печь
+block.electrolyzer.name = Электролизер
+block.atmospheric-concentrator.name = �тмо�ферный концентратор
+block.oxidation-chamber.name = Оки�лительна� камера
+block.electric-heater.name = Электриче�кий нагреватель
+block.slag-heater.name = Шлаковый нагреватель
+block.phase-heater.name = Фазовый нагреватель
+block.heat-redirector.name = Тепловой перенаправитель
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Тепловой маршрутизатор
+block.slag-incinerator.name = Му�оро�жигательна� печь
+block.carbide-crucible.name = Карбидовый тигель
+block.slag-centrifuge.name = Шлакова� центрифуга
+block.surge-crucible.name = Тигель кинетиче�кого �плава
+block.cyanogen-synthesizer.name = Синтезатор циана
+block.phase-synthesizer.name = Фазовый �интезатор
+block.heat-reactor.name = Тепловой реактор
+block.beryllium-wall.name = Бериллиева� �тена
+block.beryllium-wall-large.name = Больша� бериллиева� �тена
+block.tungsten-wall.name = Вольфрамова� �тена
+block.tungsten-wall-large.name = Больша� вольфрамова� �тена
+block.blast-door.name = �втоматиче�ка� дверь
+block.carbide-wall.name = Карбидова� �тена
+block.carbide-wall-large.name = Больша� карбидова� �тена
+block.reinforced-surge-wall.name = У�иленна� кинетиче�ка� �тена
+block.reinforced-surge-wall-large.name = Больша� у�иленна� кинетиче�ка� �тена
+block.shielded-wall.name = Экранированна� �тена
+block.radar.name = Радар
+block.build-tower.name = Строительна� башн�
+block.regen-projector.name = Регенерирующий проектор
+block.shockwave-tower.name = Ударно-волнова� башн�
+block.shield-projector.name = Экранный проектор
+block.large-shield-projector.name = Большой �кранный проектор
+block.armored-duct.name = Защищённый предметный канал
+block.overflow-duct.name = Избыточный канальный затвор
+block.underflow-duct.name = Избыточный канальный шлюз
+block.duct-unloader.name = Канальный разгрузчик
+block.surge-conveyor.name = Кинетиче�кий конвейер
+block.surge-router.name = Кинетиче�кий маршрутизатор
+block.unit-cargo-loader.name = Точка погрузки
+block.unit-cargo-unload-point.name = Точка выгрузки
+block.reinforced-pump.name = У�иленный на�о�
+block.reinforced-conduit.name = У�иленный трубопровод
+block.reinforced-liquid-junction.name = У�иленный жидко�тный перекре�ток
+block.reinforced-bridge-conduit.name = У�иленный мо�товой трубопровод
+block.reinforced-liquid-router.name = У�иленный жидко�тный маршрутизатор
+block.reinforced-liquid-container.name = У�иленна� жидко�тна� ци�терна
+block.reinforced-liquid-tank.name = У�иленный жидко�тный бак
+block.beam-node.name = Лучевой узел
+block.beam-tower.name = Лучева� башн�
+block.beam-link.name = Лучевой �оединитель
+block.turbine-condenser.name = Турбинный конден�атор
+block.chemical-combustion-chamber.name = Химиче�ка� камера �горани�
+block.pyrolysis-generator.name = Пиролизный генератор
+block.vent-condenser.name = Жерловой конден�атор
+block.cliff-crusher.name = Дробитель �кал
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Плазменный бур
+block.large-plasma-bore.name = Большой плазменный бур
+block.impact-drill.name = Ударна� дрель
+block.eruption-drill.name = Извергающа� дрель
+block.core-bastion.name = Ядро: «Ба�тион»
+block.core-citadel.name = Ядро: «Цитадель»
+block.core-acropolis.name = Ядро: «�крополь»
+block.reinforced-container.name = У�иленный контейнер
+block.reinforced-vault.name = Укрепленное хранилище
+block.breach.name = Разрыв
+block.sublimate.name = Плам�
+block.titan.name = Титан
+block.disperse.name = Диапазон
+block.afflict.name = Бед�твие
+block.lustre.name = Си�ние
+block.scathe.name = Погибель
+block.tank-refabricator.name = Рефабрикатор танков
+block.mech-refabricator.name = Рефабрикатор мехов
+block.ship-refabricator.name = Рефабрикатор кораблей
+block.tank-assembler.name = Сборщик танков
+block.ship-assembler.name = Сборщик кораблей
+block.mech-assembler.name = Сборщик мехов
+block.reinforced-payload-conveyor.name = Укрепленный грузовой конвейер
+block.reinforced-payload-router.name = Укрепленный разгрузочный маршрутизатор
+block.payload-mass-driver.name = Грузова� катапульта
+block.small-deconstructor.name = Декон�труктор
+block.canvas.name = Хол�т
+block.world-processor.name = Мировой проце��ор
+block.world-cell.name = Мирова� �чейка пам�ти
+block.tank-fabricator.name = Кон�труктор танков
+block.mech-fabricator.name = Кон�труктор мехов
+block.ship-fabricator.name = Кон�труктор кораблей
+block.prime-refabricator.name = О�новной рефабрикатор
+block.unit-repair-tower.name = Ремонтирующа� башн�
+block.diffuse.name = Разбро�
+block.basic-assembler-module.name = Базовый �борочный модуль
+block.smite.name = Кара
+block.malign.name = Злоба
+block.flux-reactor.name = Потоковый реактор
+block.neoplasia-reactor.name = �еоплазменный реактор
 
 block.switch.name = Переключатель
 block.micro-processor.name = Микропроце��ор
@@ -1249,54 +1939,105 @@ 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 = Оранжева�
-team.orange.name = Оранжева�
+team.malis.name = Мали�
+team.crux.name = �гре��оры
+team.sharded.name = Ра�колотые
 team.derelict.name = Покинута�
 team.green.name = Зелёна�
-team.purple.name = Фиолетова�
+team.blue.name = Син��
 
 hint.skip = Пропу�тить
 hint.desktopMove = И�пользуйте [accent][[WASD][], чтобы двигать��.
 hint.zoom = [accent]Покрутите коле�о мыши[] дл� приближени� или отдалени� камеры.
-hint.mine = Приблизьте�ь к \uf8c4 медной руде и [accent]нажмите[] на неё дл� ручной добычи.
 hint.desktopShoot = И�пользуйте [accent][[Левую кнопку мыши][] дл� �трельбы.
 hint.depositItems = Чтобы перене�ти предметы, перет�ните их � вашего корабл� в �дро.
-hint.respawn = Чтобы заново по�вить�� в корабле нажмите [accent][[V][].
-hint.respawn.mobile = Вы переключили управление единицей/�труктурой. Чтобы заново по�вить�� в корабле, [accent]нажмите на аватар �лева �верху.[]
+hint.respawn = Чтобы заново по�вить�� в корабле, нажмите [accent][[V][].
+hint.respawn.mobile = Вы переключили управление единицей/по�тройкой. Чтобы заново по�вить�� в корабле, [accent]нажмите на аватар �лева �верху.[]
 hint.desktopPause = �ажмите [accent][[Пробел][] дл� прио�тановки и возобновлени� игры.
-hint.placeDrill = Выберите в меню �права внизу вкладку \ue85e [accent]Добычи[], затем выберите \uf870 [accent]Бур[] и нажмите на медные вкраплени�, чтобы разме�тить его.
-hint.placeDrill.mobile = Выберите в меню �права внизу вкладку \ue85e [accent]Добычи[], затем выберите \uf870 [accent]Бур[] и ко�ните�ь медных вкраплений, чтобы разме�тить его.\n\n�ажмите \ue800 [accent]галочку[] �права внизу дл� подтверждени�.
-hint.placeConveyor = Конвейеры перемещают предметы из буров в другие блоки. Выберите \uf896 [accent]Конвейер[] во вкладке \ue814 [accent]Тран�портировки[].\n\n�ажмите и переме�тите кур�ор дл� размещени� не�кольких конвейеров.\n[accent]Покрутите коле�о мыши[] дл� �мены направлени�.
-hint.placeConveyor.mobile = Конвейеры перемещают предметы из буров в другие блоки. Выберите \uf896 [accent]Конвейер[] во вкладке \ue814 [accent]Тран�портировки[].\n\nУдерживайте палец �екунду, а затем переме�тите дл� размещени� не�кольких конвейеров.
-hint.placeTurret = У�тановите \uf861 [accent]Турели[] дл� защиты �воей базы от врагов.\n\nТурел�м требуют�� боеприпа�ы — в данном �лучае \uf838медные.\nИ�пользуйте конвейеры и буры дл� их подачи.
 hint.breaking = Выделите блоки в рамку [accent]правой кнопкой мыши[], чтобы разобрать их.
 hint.breaking.mobile = �ктивируйте \ue817 [accent]молоток[] в правом нижнем углу и нажимайте на блоки, чтобы разобрать их. Удерживайте палец в течение �екунды и переме�тите, чтобы разобрать выделением.
+hint.blockInfo = Дл� про�мотра информации о блоке, выберите его в [accent]меню �троитель�тва[], затем нажмите на кнопку [accent][[?][] �права.
+hint.derelict = [accent]Покинутые[] по�тройки - �то о�татки �тарых баз, которые больше не функционируют.\n\nОни могут быть [accent]разобраны[] дл� получени� ре�ур�ов.
 hint.research = И�пользуйте кнопку \ue875 [accent]И��ледований[], чтобы и��ледовать новые технологии.
 hint.research.mobile = И�пользуйте кнопку \ue875 [accent]И��ледований[] в \ue88c [accent]Меню[], чтобы и��ледовать новые технологии.
 hint.unitControl = Зажмите [accent][[Л-Ctrl][] и [accent]нажмите левую кнопку мыши[], чтобы контролировать друже�твенные единицы и турели.
 hint.unitControl.mobile = [accent]Дважды ко�ните�ь[], чтобы контролировать друже�твенные единицы и турели.
+hint.unitSelectControl = Чтобы управл�ть боевыми единицами, войдите в [accent]режим командовани�[], зажав [accent]L-shift.[]\nВ режиме комадовани�, нажмите и перета�кивайте дл� выбора боевых единиц. �ажмите [accent]правой кнопкой мыши[] по ме�ту или цели, чтобы отправить их туда.
+hint.unitSelectControl.mobile = Чтобы управл�ть боевыми единицами, войдите в [accent]режим командовани�[], нажав на кнопку [accent]"Командовать"[] внизу �лева.\nВ режиме командовани�, зажмите и перета�кивайте дл� выбора боевых единиц. �ажмите пальцем по ме�ту или цели, чтобы отправить их туда.
 hint.launch = Как только будет �обрано до�таточно ре�ур�ов, вы �можете о�уще�твить [accent]Запу�к[], выбрав близлежащие �екторы на \ue827 [accent]Карте[] из правого нижнего угла.
 hint.launch.mobile = Как только будет �обрано до�таточно ре�ур�ов, вы �можете о�уще�твить [accent]Запу�к[], выбрав близлежащие �екторы на \ue827 [accent]Карте[] в \ue88c [accent]Меню[].
 hint.schematicSelect = Зажмите [accent][[F][] и переме�тите, чтобы выбрать блоки дл� копировани� и в�тавки.\n\nЩелкните [accent][[колё�иком][] по блоку дл� копировани�.
+hint.rebuildSelect = Удерживайте [accent][[B][] и перета�кивайте, чтобы выбрать уничтоженные блоки.\nОни будут пере�троены автоматиче�ки.
+hint.rebuildSelect.mobile = Выберите кнопку \ue874 копировани�, затем нажмите кнопку \ue80f пере�тройки, и проведите дл� выбора уничтоженных блоков.\nЭто пере�троит их автоматиче�ки.
 hint.conveyorPathfind = Удерживайте [accent][[Л-Ctrl][] при размещении конвейеров дл� автоматиче�кой прокладки пути.
 hint.conveyorPathfind.mobile = Включите \ue844 [accent]диагональный режим[] и перетащите конвейеры дл� автоматиче�кой прокладки пути.
 hint.boost = Удерживайте [accent][[Л-Shift][], чтобы пролететь над преп�т�тви�ми при помощи вашей единицы.\n\nТолько некоторые наземные единицы могут взлетать.
-hint.command = �ажмите [accent][[G][], чтобы объединить ближайшие единицы [accent]�хожего типа[] в группу.\n\nЧтобы управл�ть наземными единицами, вы должны �начала вз�ть под контроль другую наземную единицу.
-hint.command.mobile = [accent][[Дважды нажмите][] на вашу единицу, чтобы объединить ближайшие единицы в группу.
 hint.payloadPickup = �ажмите [accent][[[], чтобы подобрать маленькие блоки или единицы.
 hint.payloadPickup.mobile = [accent]�ажмите и удерживайте[] палец на маленьком блоке или единице, чтобы подобрать их.
 hint.payloadDrop = �ажмите [accent]][], чтобы �бро�ить груз.
 hint.payloadDrop.mobile = [accent]�ажмите и удерживайте[] палец на пу�той локации, чтобы �бро�ить туда груз.
 hint.waveFire = Турели [accent]Волна[] при подаче воды будут автоматиче�ки тушить пожары вокруг.
-hint.generator = \uf879 [accent]Генераторы внутреннего �горани�[] �жигают уголь и передают �нергию р�дом�то�щим блокам.\n\nДально�ть передачи �нергии может быть увеличена при помощи \uf87f [accent]�иловых узлов[].
-hint.guardian = [accent]Стражи[] бронированы. Слабые боеприпа�ы, такие как [accent]медь[] и [accent]�винец[], [scarlet]не �ффективны[].\n\И�пользуйте турели вы�окого уровн� или \uf835 [accent]графитные[] боеприпа�ы в \uf861двойных турел�х/\uf859залпах, чтобы уничтожить Стража.
-hint.coreUpgrade = Ядра могут быть улучшены путем [accent]размещени� над ними �дер более вы�окого уровн�[].\n\nПоме�тите �дро  [accent]Штаб[] поверх �дра  [accent]О�колок[]. Убедите�ь, что никакие преп�т�тви� не мешают ему.
+hint.generator = \uf879 [accent]Генераторы внутреннего �горани�[] �жигают уголь и передают �нергию р�дом �то�щим блокам.\n\nДально�ть передачи �нергии может быть увеличена при помощи \uf87f [accent]�иловых узлов[].
+hint.guardian = [accent]Стражи[] бронированы. Слабые боеприпа�ы, такие как [accent]медь[] и [accent]�винец[], [scarlet]не �ффективны[].\n\nИ�пользуйте турели вы�окого уровн� или \uf835 [accent]графитные[] боеприпа�ы в \uf861двойных турел�х/\uf859залпах, чтобы уничтожить Стража.
+hint.coreUpgrade = Ядра могут быть улучшены путем [accent]размещени� над ними �дер более вы�окого уровн�[].\n\nПоме�тите �дро \uf868 [accent]Штаб[] поверх �дра \uf869 [accent]О�колок[]. Убедите�ь, что никакие преп�т�тви� не мешают ему.
 hint.presetLaunch = В �ерые [accent]�екторы � по�адочными зонами[], такие как [accent]Лед�ной ле�[], можно запу�кать�� из любого ме�та. Они не требуют захвата близлежащей территории.\n\n[accent]�умерованные �екторы[], такие как �тот, [accent]не об�зательны[] дл� прохождени�.
+hint.presetDifficulty = У �того �ектора [scarlet]вы�окий уровень угрозы[].\nЗапу�к на такие �ектора [accent]не рекомендует��[] без до�таточных технологий и подготовки.
 hint.coreIncinerate = По�ле того, как �дро будет заполнено предметом до отказа, любые лишние вход�щие предметы �того типа будут [accent]�ожжены[].
-hint.coopCampaign = Во врем� игры в [accent]кампанию по �ети[], произведённые на текущей карте предметы будут также отправлены [accent]на ваши локальные �екторы[].\n\nЛюбое и��ледование �о �тороны хо�та также будет перене�ено.
+hint.factoryControl = Чтобы у�тановить [accent]ме�то вывода единиц[] фабрики, щелкните на блок фабрики в командном режиме, затем щелкните правой кнопкой мыши на �оответ�твующее ме�то.\nЕдиницы, произведенные ею, автоматиче�ки переме�т�т�� туда.
+hint.factoryControl.mobile = Чтобы у�тановить [accent]ме�то вывода единиц[] фабрики, нажмите на блок фабрики в командном режиме, затем нажмите на �оответ�твующее ме�то.\nЕдиницы, произведенные ею, будут автоматиче�ки перемещены туда.
+
+gz.mine = Приблизьте�ь к \uf8c4 [accent]медной руде[] на земле и нажмите на нее, чтобы начать копать.
+gz.mine.mobile = Приблизьте�ь к \uf8c4 [accent]медной руде[] на земле и нажмите на нее, чтобы начать копать.
+gz.research = Откройте дерево технологий \ue875.\nИ��ледуйте \uf870 [accent]Механиче�кий бур[], затем выберите его в меню в правом нижнем углу.\n�ажмите на медную руду, чтобы начать �троитель�тво бура.
+gz.research.mobile = Откройте дерево технологий \ue875.\nИ��ледуйте \uf870 [accent]Механиче�кий бур[], затем выберите его в меню �права внизу.\n�ажмите на медную руду, чтобы разме�тить бур.\n\n�ажмите на \ue800 [accent]галочку[] �права внизу, чтобы подтвердить �троитель�тво.
+gz.conveyors = И��ледуйте и разме�тите \uf896 [accent]конвейеры[] дл� перемещени� добытых ре�ур�ов\nот буров до �дра.\n\nЗажмите и перетащите, чтобы разме�тить не�колько конвейеров.\n[accent]Scroll[] дл� вращени�.
+gz.conveyors.mobile = И��ледуйте и разме�тите \uf896 [accent]конвейеры[] дл� перемещени� добытых ре�ур�ов\nот буровых до �дра.\n\nЗадержите палец на �екунду и перетащите его, чтобы разме�тить не�колько конвейеров.
+gz.drills = \nУвеличьте объемы добычи.\nПоме�тите больше механиче�ких буров.\nДобудьте 100 �литков меди.
+gz.lead = \uf837 [accent]Свинец[] - еще один ча�то и�пользуемый ре�ур�.\nПодготовьте буры дл� добычи �винца.
+gz.moveup = \ue804 Двигайте�ь вверх дл� получени� дальнейших указаний.
+gz.turrets = И��ледуйте и по�тавьте 2 \uf861 [accent]Двойные турели[] дл� защиты �дра.\nДвойные турели требуют \uf838 [accent]боеприпа�ы[] � конвейеров.
+gz.duoammo = Снабдите двойные турели [accent]медью[] � помощью конвейеров.
+gz.walls = [accent]Стены[] могут предотвратить повреждение близлежащих по�троек.\nПо�тавьте \uf8ae [accent]медные �тены[] вокруг турелей.
+gz.defend = Враг на подходе, приготовьте�ь защищать��.
+gz.aa = Летающие боевые единицы не могут быть легко уничтожены �тандартными турел�ми.\n\uf860 Ра��еиватели[] предо�тавл�ют отличную противовоздушную оборону, но требуют \uf837 [accent]�винец[] в каче�тве боеприпа�ов.
+gz.scatterammo = Снабдите Ра��еиватель [accent]�винцом[] � помощью конвейеров.
+gz.supplyturret = [accent]Запитайте турель.
+gz.zone1 = Это - враже�ка� зона вы�адки.
+gz.zone2 = В�е, что по�троено в её радиу�е, будет уничтожено � началом волны.
+gz.zone3 = Волна начнёт�� пр�мо �ейча�.\nПриготовьте�ь.
+gz.finish = По�тройте больше турелей, добудьте больше ре�ур�ов,\nи от�тойте в�е волны, чтобы [accent]захватить �ектор[].
+
+onset.mine = �ажмите, чтобы добыть \uf748 [accent]бериллий[] из �тен.\n\nИ�пользуйте [accent][[WASD] дл� передвижени�.
+onset.mine.mobile = �ажмите, чтобы добыть \uf748 [accent]бериллий[] из �тен.
+onset.research = Откройте \ue875 дерево и��ледований.\nИ��ледуйте, затем по�тавьте \uf73e [accent]турбинный конден�атор[] на жерло.\nОна будет производить [accent]�нергию[].
+onset.bore = И��ледуйте и по�тавьте \uf741 [accent]плазменный бур[].\nОн будет автоматиче�ки добывать ре�ур�ы из �тен.
+onset.power = Чтобы [accent]подключить[] плазменный бур, и��ледуйте и по�тавьте \uf73d [accent]лучевой узел[].\nСоедините турбинный конден�атор � плазменным буром.
+onset.ducts = И��ледуйте и по�тавьте \uf799 [accent]предметные каналы[] дл� перевозки ре�ур�ов из плазменного бура в �дро.\nПерета�кивайте дл� у�тановки не�кольких каналов.\n[accent]Вращайте колё�ико мыши[] дл� поворота.
+onset.ducts.mobile = И��ледуйте и по�тавьте \uf799 [accent]предметные каналы[] дл� перевозки ре�ур�ов из плазменного бура в �дро.\nЗажмите палец на �екунду, затем перета�кивайте дл� у�тановки не�кольких каналов.
+onset.moremine = Ра�ширьте добычу.\nПо�тавьте больше плазменных буров и и�пользуйте лучевые узлы и предметные каналы дл� их поддержки.\nДобудьте 200 берилли�.
+onset.graphite = Более продвинутые блоки требуют \uf835 [accent]графит[].\nПо�тавьте плазменные буры дл� добычи графита.
+onset.research2 = �ачните и��ледовать [accent]фабрики[].\nИ��ледуйте \uf74d [accent]дробитель �кал[] и \uf779 [accent]кремниевую дуговую печь[].
+onset.arcfurnace = Дугова� печь требует \uf834 [accent]пе�ок[] и \uf835 [accent]графит[] дл� производ�тва \uf82f [accent]кремни�[].\nТакже нужна [accent]�нерги�[].
+onset.crusher = И�пользуйте \uf74d [accent]дробители �кал[] дл� добычи пе�ка.
+onset.fabricator = И�пользуйте [accent]боевые единицы[] дл� и��ледовани� карты, защиты по�троек и нападени� на врага. И��ледуйте и по�тавьте \uf6a2 [accent]кон�труктор танков[].
+onset.makeunit = Произведите боевую единицу.\n�ажмите на кнопку "?", чтобы узнать текущие необходимые ре�ур�ы дл� фабрики.
+onset.turrets = Боевые единицы �ффективны, но [accent]турели[] предо�тавл�ют больший оборонный потенциал при их �ффективном и�пользовании.\nПо�тавьте турель \uf6eb [accent]Разрыв[].\nТурели требуют \uf748 [accent]боеприпа�ы[].
+onset.turretammo = Снабдите турель [accent]бериллиевыми боеприпа�ами.[]
+onset.walls = [accent]Стены[] могут предотвратить повреждение близлежащих по�троек.\nПо�тавьте \uf6ee [accent]бериллиевые �тены[] вокруг турели.
+onset.enemies = Враг на подходе, приготовьте�ь защищать��.
+onset.defenses = [accent]Приготовьте оборону:[lightgray] {0}
+onset.attack = Враг у�звим. �ачните контратаку.
+onset.cores = �овые �дра могут быть по�тавлены на [accent]зоны �дра[].\n�овые �дра функционируют как передовые базы и имеют общий инвентарь между другими �драми.\nПо�тавьте \uf725 �дро.
+onset.detect = Враг обнаружит ва� через 2 минуты.\nПриготовьте оборону, добычу и производ�тво.
+onset.commandmode = Удерживайте [accent]shift[], чтобы войти в [accent]режим командовани�[].\n[accent]Щелкните левой кнопкой мыши и выделите обла�ть[] дл� выбора боевых единиц.\n[accent]Щелкните правой кнопкой мыши[], чтобы приказать выбранным единицам двигать�� или атаковать.
+onset.commandmode.mobile = �ажмите [accent]Командовать[], чтобы войти в [accent]режим командовани�[].\nЗажмите палец, затем [accent]выделите обла�ть[] дл� выбора боевых единиц.\n[accent]�ажмите[], чтобы приказать выбранным единицам двигать�� или атаковать.
+aegis.tungsten = Вольфрам может быть добыт [accent]ударной дрелью[].\nЭта по�тройка требует [accent]воду[] и [accent]�нергию[].
+
+split.pickup = �екоторые блоки можно подобрать боевой единицей �дра.\nВозьмите �тот [accent]контейнер[] и по�тавьте его на [accent]грузовой загрузчик[].\n(Клавиши по умолчанию - [ и ] дл� подн�ти� и разгрузки)
+split.pickup.mobile = �екоторые блоки можно подобрать боевой единицей �дра.\nВозьмите �тот [accent]контейнер[] и по�тавьте его на [accent]грузовой загрузчик[].\n(Чтобы подн�ть или разгрузить что-либо, удерживайте палец.)
+split.acquire = Вы должны получить вольфрам дл� по�тройки боевых единиц.
+split.build = Боевые единицы должны быть перене�ены на другую �торону карты.\nПо�тавьте две [accent]грузовые катапульты[], по одной � каждой �тороны �тены.\nЧтобы �оединить их, нажмите на одну из катапульт, затем выберите другую.
+split.container = �налогично � контейнерами, боевые единицы могут быть перене�ены � помощью [accent]грузовых катапульт[].\nПо�тавьте кон�труктор около катапульты дл� загрузки боевых единиц, затем отправьте их через �тену дл� нападени� на враже�кую базу.
 
 item.copper.description = И�пользует�� во в�ех типах по�троек и боеприпа�ов.
 item.copper.details = Медь. �номально широко ра�про�транённый металл на Серпуло. Структурно �лабый, е�ли не укреплён.
@@ -1307,8 +2048,8 @@ item.graphite.description = И�пользует�� в �лектриче�ки
 item.sand.description = И�пользует�� в производ�тве других обработанных материалов.
 item.coal.description = И�пользует�� как топливо и в производ�тве обработанных материалов.
 item.coal.details = Похоже, что �то окаменевшее ра�тительное веще�тво, образовавшее�� задолго до По�ева.
-item.titanium.description = Широко и�пользует�� в тран�портировке жидко�тей, бурах и авиации.
-item.thorium.description = И�пользует�� в прочных по�тройках и как �дерного топлива.
+item.titanium.description = Широко и�пользует�� в тран�портировке жидко�тей, бурах и фабриках.
+item.thorium.description = И�пользует�� в прочных по�тройках и как �дерное топливо.
 item.scrap.description = И�пользует�� в плавильн�х и измельчител�х дл� получени� других материалов.
 item.scrap.details = О�татки �тарых по�троек и единиц.
 item.silicon.description = И�пользует�� в �олнечных панел�х, �ложной �лектронике и �амонавод�щих�� боеприпа�ах дл� турелей.
@@ -1316,26 +2057,39 @@ item.plastanium.description = И�пользует�� в продвинутой
 item.phase-fabric.description = И�пользует�� в продвинутой �лектронике и �амово��танавливающих�� по�тройках.
 item.surge-alloy.description = И�пользует�� в продвинутом вооружении и реактивных оборонительных по�тройках.
 item.spore-pod.description = И�пользует�� дл� переработки в нефть, взрывчатку и топливо.
-item.spore-pod.details = Споры. Похоже, �вл�ют�� �интетиче�кой формой жизни. Выдел�ют газы, ток�ичные дл� других биологиче�ких форм жизни. Чрезвычайно инвазивны. Легко во�пламен�ют�� при определенных у�лови�х.
+item.spore-pod.details = Споры. Похоже, �вл�ют�� �интетиче�кой формой жизни. Выдел�ют газы, ток�ичные дл� других биологиче�ких форм жизни. Чрезвычайно инвазивны. Легко во�пламен�ют�� при определённых у�лови�х.
 item.blast-compound.description = И�пользует�� в бомбах и взрывчатых веще�твах.
 item.pyratite.description = И�пользует�� в зажигательном оружии и твердотопливных генераторах.
+item.beryllium.description = И�пользует�� во многих блоках, единицах и боеприпа�ах на Эрекире.
+item.tungsten.description = И�пользует�� в буровых у�тановках, броне и боеприпа�ах. Требует�� дл� �троитель�тва более �овершенных кон�трукций.
+item.oxide.description = И�пользует�� в каче�тве проводника тепла и изол�ции.
+item.carbide.description = И�пользует�� в продвинутых кон�трукци�х, более т�желых единицах и боеприпа�ах.
 
 liquid.water.description = И�пользует�� дл� охлаждени� машин и переработки отходов.
 liquid.slag.description = Может быть переработан в разделителе на �о�тавл�ющие металлы или ра�пылён на врагов в каче�тве оружи�.
 liquid.oil.description = И�пользует�� в производ�тве продвинутых материалов и как зажигательный боеприпа�.
 liquid.cryofluid.description = И�пользует�� в каче�тве охлаждающей жидко�ти дл� реакторов, турелей и фабрик.
+liquid.arkycite.description = И�пользует�� в химиче�ких реакци�х дл� производ�тва �лектро�нергии и �интеза материалов.
+liquid.ozone.description = И�пользует�� как оки�литель в производ�тве материалов и как топливо. Умеренно взрывоопа�ен.
+liquid.hydrogen.description = И�пользует�� при добыче ре�ур�ов, производ�тве единиц и ремонте кон�трукций. Легково�пламен�ющий��.
+liquid.cyanogen.description = И�пользует�� дл� боеприпа�ов, �троитель�тва продвинутых единиц и различных реакций в продвинутых блоках. Легково�пламен�ющие��.
+liquid.nitrogen.description = И�пользует�� при добыче ре�ур�ов и производ�тве единиц. Инертный.
+liquid.neoplasm.description = Опа�ный биологиче�кий побочный продукт �еоплазмового реактора. Бы�тро ра�про�тран�ет�� на любой �о�едний блок, �одержащий воду, поврежда� его в проце��е. В�зка�.
+liquid.neoplasm.details = �еоплазма. �еконтролируема� ма��а бы�тро дел�щих�� �интетиче�ких клеток � кон�и�тенцией, напоминающей о�адок. Термо�тойка�. Чрезвычайно опа�на дл� любых по�троек, �в�занных � водой.\n\nСлишком �ложна и не�табильна дл� �тандартного анализа. Потенциальное применение неизве�тно. Рекомендует�� �жигание в шлаковых ба��ейнах.
 
-block.resupply-point.description = Снар�жает медными боеприпа�ами ближайшие боевые единицы. �е �овме�тим � единицами, требующими питани� от батареи.
+block.derelict = \uf77e [lightgray]Заброшенный
 block.armored-conveyor.description = Перемещает предметы вперёд. �е принимает вход по бокам.
 block.illuminator.description = Излучает �вет.
 block.message.description = Сохран�ет �ообщение дл� �в�зи между �оюзниками.
+block.reinforced-message.description = Сохран�ет �ообщение дл� �в�зи между �оюзниками.
+block.world-message.description = Блок �ообщени� дл� и�пользовани� в �оздании карт. �е может быть уничтожен.
 block.graphite-press.description = Сжимает ку�ки угл� в ли�ты графита.
 block.multi-press.description = Сжимает ку�ки угл� в ли�ты графита. Требует�� вода в каче�тве охлаждающей жидко�ти.
 block.silicon-smelter.description = Синтезирует кремний из пе�ка и угл�.
 block.kiln.description = Выплавл�ет пе�ок и �винец в мета�текло.
 block.plastanium-compressor.description = Производит пла�тан из нефти и титана.
 block.phase-weaver.description = Синтезирует фазовую ткань из тори� и пе�ка.
-block.alloy-smelter.description = Соедин�ет титан, �винец, кремний и медь в кинетиче�кий �плав.
+block.surge-smelter.description = Соедин�ет титан, �винец, кремний и медь в кинетиче�кий �плав.
 block.cryofluid-mixer.description = Смешивает воду и мелкий титановый порошок в криогенную жидко�ть.
 block.blast-mixer.description = Производит взрывчатую �ме�ь из пиротита и �тручков �пор.
 block.pyratite-mixer.description = Смешивает уголь, �винец и пе�ок в пиротит.
@@ -1351,6 +2105,8 @@ block.item-source.description = По�то�нно выдаёт предметы
 block.item-void.description = Уничтожает любые предметы. Только пе�очница.
 block.liquid-source.description = По�то�нно выдаёт жидко�ть. Только пе�очница.
 block.liquid-void.description = Уничтожает любые жидко�ти. Только пе�очница.
+block.payload-source.description = По�то�нно выдает грузы. Только пе�очница.
+block.payload-void.description = Уничтожает любые грузы. Только пе�очница.
 block.copper-wall.description = Защищает по�тройки от враже�ких �нар�дов.
 block.copper-wall-large.description = Защищает по�тройки от враже�ких �нар�дов.
 block.titanium-wall.description = Защищает по�тройки от враже�ких �нар�дов.
@@ -1363,12 +2119,16 @@ block.phase-wall.description = Защищает по�тройки от враж
 block.phase-wall-large.description = Защищает по�тройки от враже�ких �нар�дов, отража� большин�тво пуль при ударе.
 block.surge-wall.description = Защищает по�тройки от враже�ких �нар�дов, периодиче�ки выпу�кает �лектриче�кий разр�д при ударе.
 block.surge-wall-large.description = Защищает по�тройки от враже�ких �нар�дов, периодиче�ки выпу�кает �лектриче�кий разр�д при ударе.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = Стена, которую можно открыть или закрыть нажатием.
 block.door-large.description = Стена, которую можно открыть или закрыть нажатием.
 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 = Перемещает предметы вперёд. Бы�трее, чем �тандартный конвейер.
@@ -1381,16 +2141,17 @@ block.inverted-sorter.description = Работает так же, как и �т
 block.router.description = Равномерно ра�предел�ет вход�щие предметы по 3 выход�щим направлени�м.
 block.router.details = �еобходимое зло. �е рекомендует�� к и�пользованию как блок ввода возле производ�твенных зданий, т.к. может �лучить�� затор выходным материалом.
 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 = Перекачивает и выводит жидко�ти. Требует �нергию.
-block.thermal-pump.description = Перекачивает и выводит жидко�ти.
+block.impulse-pump.description = Перекачивает и выводит жидко�ти.
 block.conduit.description = Перемещает жидко�ти вперёд. И�пользует�� вме�те � на�о�ами и другими трубопроводами.
 block.pulse-conduit.description = Перемещает жидко�ти вперёд. Работает бы�трее и вмещает в �ебе больше, чем �тандартный трубопровод.
 block.plated-conduit.description = Перемещает жидко�ти вперёд. �е принимает ввод по бокам. �е протекает.
-block.liquid-router.description = Принимает жидко�ти из одного направлени� и равномерно ра�предел�ет и до 3 других направлений. Также может хранить определенное количе�тво жидко�ти.
+block.liquid-router.description = Принимает жидко�ти из одного направлени� и равномерно ра�предел�ет их до 3 других. Также может хранить определённое количе�тво жидко�ти.
+block.liquid-container.description = Хранит небольшое количе�тво жидко�ти. Выводит жидко�ти во в�е �тороны, подобно жидко�тному маршрутизатору.
 block.liquid-tank.description = Хранит большое количе�тво жидко�ти. Выводит жидко�ти во в�е �тороны, подобно жидко�тному маршрутизатору.
 block.liquid-junction.description = Дей�твует как мо�т дл� двух пере�екающих�� трубопроводов.
 block.bridge-conduit.description = Перемещает жидко�ти над любой ме�тно�тью или здани�ми.
@@ -1405,7 +2166,7 @@ block.combustion-generator.description = Вырабатывает �нергию
 block.thermal-generator.description = Вырабатывает �нергию, когда размещён в гор�чих ме�тах.
 block.steam-generator.description = Вырабатывает �нергию путём �жигани� горючих материалов и преобразовани� воды в пар
 block.differential-generator.description = Вырабатывает большое количе�тво �нергии. И�пользует разницу температур между криогенной жидко�тью и гор�щим пиротитом.
-block.rtg-generator.description = И�пользует тепло ра�падающих�� радиоактивных �оединений дл� вырабатывани� �нергии � низкой �коро�тью.
+block.rtg-generator.description = И�пользует тепло ра�падающих�� радиоактивных �оединений дл� выработки �нергии � низкой �коро�тью.
 block.solar-panel.description = Обе�печивает небольшое количе�тво �нергии от �олнца.
 block.solar-panel-large.description = Обе�печивает небольшое количе�тво �нергии от �олнца. Более �ффективный вариант �тандартной �олнечной панели.
 block.thorium-reactor.description = Вырабатывает значительное количе�тво �нергии из тори�. Требует по�то�нного охлаждени�. Взорвёт�� � большой �илой при недо�таточном количе�тве охлаждающей жидко�ти.
@@ -1428,6 +2189,9 @@ block.vault.description = Хранит большое количе�тво пр
 block.container.description = Хранит небольшое количе�тво предметов каждого типа. Предметы можно извлечь при помощи разгрузчика.
 block.unloader.description = Выгружает выбранный предмет из �о�едних блоков.
 block.launch-pad.description = Запу�кает партии предметов в выбранные �екторы.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Стрел�ет по врагам чередующими�� пул�ми.
 block.scatter.description = Стрел�ет ку�ками �винца, металлолома или мета�текла по враже�ким воздушным единицам.
 block.scorch.description = Сжигает любых наземных врагов р�дом � ним. Вы�око�ффективен на близком ра��то�нии.
@@ -1441,7 +2205,7 @@ block.fuse.description = Стрел�ет трем� пробивающими з
 block.ripple.description = Стрел�ет �коплени�ми �нар�дов по врагам на большой ди�танции.
 block.cyclone.description = Стрел�ет разрывными �нар�дами по ближайшим врагам.
 block.spectre.description = Стрел�ет крупными бронебойными �нар�дами по воздушным и наземным цел�м.
-block.meltdown.description = Зар�жает и �трел�ет по�то�нным лазерным лучом по ближайшим врагам. Требует�� охлаждающа� жидко�ть дл� работы.
+block.meltdown.description = Зар�жает и �трел�ет по�то�нным лазерным лучом по ближайшим врагам. Требует охлаждающую жидко�ть дл� работы.
 block.foreshadow.description = Стрел�ет большим дальнобойным �нар�дом, нано��щим урон только по одной цели.
 block.repair-point.description = �епрерывно ремонтирует ближайшую поврежденную единицу в �воём радиу�е.
 block.segment.description = Повреждает и разрушает приближающие�� �нар�ды. �е взаимодей�твует � лазерными лучами.
@@ -1449,17 +2213,16 @@ block.parallax.description = Прит�гивает воздушные цели
 block.tsunami.description = Стрел�ет мощными потоками жидко�ти по врагам. �втоматиче�ки тушит пожары при подаче воды.
 block.silicon-crucible.description = Синтезирует кремний из пе�ка и угл�, и�пользу� пиротит как дополнительный и�точник тепла. Более �ффективен в гор�чих ме�тах.
 block.disassembler.description = Раздел�ет шлак на крупицы �кзотиче�ких минеральных компонентов � низкой �ффективно�тью. Может производить торий.
-block.overdrive-dome.description =  Увеличивает �коро�ть близлежащих зданий. Требует фазовую ткань и кремний дл� работы.
+block.overdrive-dome.description = Увеличивает �коро�ть близлежащих зданий. Требует фазовую ткань и кремний дл� работы.
 block.payload-conveyor.description = Передвигает большие грузы, такие как единицы из фабрик.
 block.payload-router.description = Раздел�ет вход�щие грузы на 3 выход�щих направлени�.
-block.command-center.description = Управл�ет поведением единиц при помощи различных команд.
 block.ground-factory.description = Производит наземные единицы. Вывод единиц может быть о�уще�твлён напр�мую, либо перенаправлен в рекон�трукторы дл� улучшени�.
 block.air-factory.description = Производит воздушные единицы. Вывод единиц может быть о�уще�твлён напр�мую, либо перенаправлен в рекон�трукторы дл� улучшени�.
 block.naval-factory.description = Производит мор�кие единицы. Вывод единиц может быть о�уще�твлён напр�мую, либо перенаправлен в рекон�трукторы дл� улучшени�.
-block.additive-reconstructor.description = Улучшает введённые юниты до второго уровн�.
-block.multiplicative-reconstructor.description = Улучшает введённые юниты до третьего уровн�.
-block.exponential-reconstructor.description = Улучшает введённые юниты до четвёртого уровн�.
-block.tetrative-reconstructor.description = Улучшает введённые юниты до п�того и по�леднего уровн�.
+block.additive-reconstructor.description = Улучшает введённые единицы до второго уровн�.
+block.multiplicative-reconstructor.description = Улучшает введённые единицы до третьего уровн�.
+block.exponential-reconstructor.description = Улучшает введённые единицы до четвёртого уровн�.
+block.tetrative-reconstructor.description = Улучшает введённые единицы до п�того и по�леднего уровн�.
 block.switch.description = Переключатель. Со�то�ние может быть �читано и изменено при помощи логиче�ких проце��оров.
 block.micro-processor.description = Выполн�ет по�ледовательно�ть логиче�ких ин�трукций в цикле. Может быть и�пользован дл� управлени� единицами и по�тройками.
 block.logic-processor.description = Выполн�ет по�ледовательно�ть логиче�ких ин�трукций в цикле. Может быть и�пользован дл� управлени� единицами и по�тройками. Бы�трее, чем микропроце��ор.
@@ -1468,7 +2231,102 @@ block.memory-cell.description = Хранит информацию дл� лог
 block.memory-bank.description = Хранит информацию дл� логиче�кого проце��ора. Больша� ёмко�ть.
 block.logic-display.description = Отображает произвольную графику из логиче�кого проце��ора.
 block.large-logic-display.description = Отображает произвольную графику из логиче�кого проце��ора.
-block.interplanetary-accelerator.description = Ма��ивный рель�отронный у�коритель. У�кор�ет �дро, позвол�� преодолеть гравитацию дл� межпланетного развёртывани�
+block.interplanetary-accelerator.description = Ма��ивна� �лектромагнитна� башн�-рель�отрон. У�кор�ет �дро, позвол�� преодолеть гравитацию дл� межпланетного развёртывани�.
+block.repair-turret.description = �епрерывно ремонтирует ближайшую поврежденную единицу в �воем радиу�е. Опционально и�пользует охлаждающую жидко�ть.
+block.core-bastion.description = Ядро базы. Бронировано. По�ле уничтожени�, ве�ь контакт � регионом тер�ет��.
+block.core-citadel.description = Ядро базы. Очень хорошо бронировано. Хранит больше ре�ур�ов, чем �дро Ба�тион.
+block.core-acropolis.description = Ядро базы. И�ключительно хорошо бронировано. Хранит больше ре�ур�ов, чем �дро Цитадель.
+block.breach.description = Стрел�ет бронебойными бериллиевыми или вольфрамовыми боеприпа�ами по враже�ким цел�м.
+block.diffuse.description = Стрел�ет очередью пуль в широком кону�е. Отбра�ывает враже�кие цели назад.
+block.sublimate.description = Стрел�ет непрерывной �труей пламени по враже�ким цел�м. Пробивает броню.
+block.titan.description = Стрел�ет мощными фуга�ными �нар�дами по наземным цел�м. Требует водород дл� работы.
+block.afflict.description = Стрел�ет ма��ивной зар�женной ра��ыпающей�� �ферой. Требует тепло дл� работы.
+block.disperse.description = Стрел�ет шрапнелью по воздушным цел�м.
+block.lustre.description = Стрел�ет медленно движущим�� лазером по одной враже�кой цели.
+block.scathe.description = Запу�кает мощные ракеты по наземным цел�м на огромные ра��то�ни�.
+block.smite.description = Стрел�ет пучками бронебойных �нергетиче�ких пуль.
+block.malign.description = Стрел�ет градом �амонавод�щих�� лазерных зар�дов по враже�ким цел�м. Требует большое количе�тво тепла дл� работы.
+block.silicon-arc-furnace.description = Производит кремний из пе�ка и графита.
+block.oxidation-chamber.description = Превращает бериллий и озон в ок�ид. Выдел�ет тепло в каче�тве побочного продукта.
+block.electric-heater.description = �агревает блоки напротив �еб�. Требует большое количе�тво �нергии дл� работы.
+block.slag-heater.description = �агревает блоки напротив �еб�. Требует шлак дл� работы.
+block.phase-heater.description = �агревает блоки напротив �еб�. Требует фазовую ткань дл� работы.
+block.heat-redirector.description = Перенаправл�ет накопленное тепло на другие блоки.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Ра�предел�ет накопленное тепло в трех направлени�х.
+block.electrolyzer.description = Преобразует воду в водород и озон.
+block.atmospheric-concentrator.description = Концентрирует азот из атмо�феры. Требует тепло дл� работы.
+block.surge-crucible.description = Производит кинетиче�кий �плав из шлака и кремни�. Требует тепло дл� работы.
+block.phase-synthesizer.description = Синтезирует фазовую ткань из тори�, пе�ка и озона. Требует тепло дл� работы.
+block.carbide-crucible.description = Выплавл�ет карбид из графита и вольфрама. Требует тепло дл� работы.
+block.cyanogen-synthesizer.description = Синтезирует циан из аркицита и графита. Требует тепло дл� работы.
+block.slag-incinerator.description = Сжигает у�тойчивые предметы или жидко�ти. Требует шлак дл� работы.
+block.vent-condenser.description = Конден�ирует воду из газов жерла. Требует �нергию дл� работы.
+block.plasma-bore.description = При размещении напротив �тены � рудой, по�то�нно выводит предметы. Требует небольшое количе�тво �нергии дл� работы.
+block.large-plasma-bore.description = Большой плазменный бур. Спо�обен добывать вольфрам и торий. Требует водород и �нергию дл� работы.
+block.cliff-crusher.description = Дробит �тены, по�то�нно вывод� пе�ок. Требует �нергию дл� работы. Эффективно�ть зави�ит от типа �тены.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = При размещении на �оответ�твующей руде, по�то�нно выводит предметы очеред�ми. Требует �нергию и воду дл� работы.
+block.eruption-drill.description = У�овершен�твованна� ударна� дрель. Спо�обна добывать торий. Требует водород дл� работы.
+block.reinforced-conduit.description = Перемещает жидко�ти вперед. �е принимает ввод по бокам.
+block.reinforced-liquid-router.description = Равномерно ра�предел�ет жидко�ти во в�е �тороны.
+block.reinforced-liquid-tank.description = Хранит большое количе�тво жидко�ти.
+block.reinforced-liquid-container.description = Хранит небольшое количе�тво жидко�ти.
+block.reinforced-bridge-conduit.description = Перемещает жидко�ти над любой ме�тно�тью или здани�ми.
+block.reinforced-pump.description = Перекачивает и выводит жидко�ти. Требует водород дл� работы.
+block.beryllium-wall.description = Защищает по�тройки от враже�ких �нар�дов.
+block.beryllium-wall-large.description = Защищает по�тройки от враже�ких �нар�дов.
+block.tungsten-wall.description = Защищает по�тройки от враже�ких �нар�дов.
+block.tungsten-wall-large.description = Защищает по�тройки от враже�ких �нар�дов.
+block.carbide-wall.description = Защищает по�тройки от враже�ких �нар�дов.
+block.carbide-wall-large.description = Защищает по�тройки от враже�ких �нар�дов.
+block.reinforced-surge-wall.description = Защищает по�тройки от враже�ких �нар�дов, периодиче�ки выпу�кает �лектриче�кий разр�д при ударе.
+block.reinforced-surge-wall-large.description = Защищает по�тройки от враже�ких �нар�дов, периодиче�ки выпу�кает �лектриче�кий разр�д при ударе.
+block.shielded-wall.description = Защищает по�тройки от враже�ких �нар�дов. При подаче �нергии �оздает щит, который поглощает большин�тво �нар�дов. Проводит �нергию.
+block.blast-door.description = Стена, котора� автоматиче�ки открывает��, когда р�дом наход�т�� �оюзные наземные единицы. �е может управл�ть�� вручную.
+block.duct.description = Перемещает предметы вперёд. Может хранить только один предмет.
+block.armored-duct.description = Перемещает предметы вперёд. �е принимает ввод по бокам.
+block.duct-router.description = Ра�предел�ет предметы поровну по трем направлени�м. Принимает предметы только � обратной �тороны. Может быть на�троен как �ортировщик предметов.
+block.overflow-duct.description = Выводит предметы по бокам только в том �лучае, е�ли передний путь заблокирован.
+block.duct-bridge.description = Перемещает предметы над ме�тно�тью и здани�ми.
+block.duct-unloader.description = Выгружает выбранный предмет из блока позади него. �е может выгружать из �дер.
+block.underflow-duct.description = Противоположно�ть избыточному канальному затвору. Выводит предметы вперед только в том �лучае, е�ли боковые выходы заблокированы.
+block.reinforced-liquid-junction.description = Дей�твует как перекре�ток дл� двух пере�екающих�� трубопроводов.
+block.surge-conveyor.description = Перемещает предметы пачками. Может быть у�корен подачей �нергии. Проводит �нергию.
+block.surge-router.description = Равномерно ра�предел�ет предметы � кинетиче�ких конвейеров в трех направлени�х. Может быть у�корен подачей �нергии. Проводит �нергию.
+block.unit-cargo-loader.description = Производит грузовые дроны. Дроны автоматиче�ки ра�предел�ют предметы по точкам разгрузки в зави�имо�ти от у�тановленного на них фильтра.
+block.unit-cargo-unload-point.description = Дей�твует как точка разгрузки дл� грузовых дронов. Принимает предметы, �оответ�твующие выбранному фильтру.
+block.beam-node.description = Передает �нергию по пр�мой. Хранит небольшое количе�тво �нергии.
+block.beam-tower.description = У�овершен�твованный лучевой узел � большей дально�тью. Хранит большое количе�тво �нергии.
+block.turbine-condenser.description = Вырабатывает �нергию, когда размещен на жерле. Производит небольшое количе�тво воды.
+block.chemical-combustion-chamber.description = Генерирует �нергию из аркицита и озона.
+block.pyrolysis-generator.description = Генерирует большое количе�тво �нергии из аркицита и шлака. Производит воду в каче�тве побочного продукта.
+block.flux-reactor.description = Генерирует большое количе�тво �нергии при получении тепла. Требует циан в каче�тве �табилизатора. Вырабатываема� �нерги� и требуемый циан пропорциональны количе�тву тепла.\nВзрывает�� при недо�таточном количе�тве циана.
+block.neoplasia-reactor.description = И�пользует аркицит, воду и фазовую ткань дл� выработки большого количе�тва �нергии. Производит тепло и опа�ную неоплазму в каче�тве побочного продукта.\nВзрывает�� � большой �илой, е�ли неоплазма не выводит�� по трубопроводам.
+block.build-tower.description = �втоматиче�ки во��танавливает разрушенные по�тройки в пределах до��гаемо�ти и помогает в �троитель�тве другим единицам.
+block.regen-projector.description = Медленно во��танавливает �оюзные по�тройки в пределах квадрата. Требует водород дл� работы.
+block.reinforced-container.description = Хранит небольшое количе�тво предметов. Предметы можно извлечь при помощи разгрузчика. �е увеличивает вме�тимо�ть �дра.
+block.reinforced-vault.description = Хранит большое количе�тво предметов. Предметы можно извлечь при помощи разгрузчика. �е увеличивает вме�тимо�ть �дра.
+block.tank-fabricator.description = Производит единицы «О�нова». Вывод единиц может быть о�уще�твлён напр�мую, либо перенаправлен в рефабрикаторы дл� улучшени�.
+block.ship-fabricator.description = Производит единицы «Уклонение». Вывод единиц может быть о�уще�твлён напр�мую, либо перенаправлен в рефабрикаторы дл� улучшени�.
+block.mech-fabricator.description = Производит единицы «Меруй». Вывод единиц может быть о�уще�твлён напр�мую, либо перенаправлен в рефабрикаторы дл� улучшени�.
+block.tank-assembler.description = Собирает большие танки из введённых блоков и единиц. Уровень �обираемых единиц может быть увеличен путем добавлени� модулей.
+block.ship-assembler.description = Собирает большие корабли из введённых блоков и единиц. Уровень �обираемых единиц может быть увеличен путем добавлени� модулей.
+block.mech-assembler.description = Собирает большие мехи из введённых блоков и единиц. Уровень �обираемых единиц может быть увеличен путем добавлени� модулей.
+block.tank-refabricator.description = Улучшает введённые танки до второго уровн�.
+block.ship-refabricator.description = Улучшает введённые корабли до второго уровн�.
+block.mech-refabricator.description = Улучшает введённые мехи до второго уровн�.
+block.prime-refabricator.description = Улучшает введённые единицы до третьего уровн�.
+block.basic-assembler-module.description = Повышает уровень �борщика, е�ли размещён р�дом � границей �троитель�тва. Требует �нергию дл� работы. Может быть и�пользован дл� ввода грузов.
+block.small-deconstructor.description = Разбирает грузы и боевые единицы � возвращением 100% и�пользованных ре�ур�ов на их производ�тво.
+block.reinforced-payload-conveyor.description = Перемещает грузы вперёд.
+block.reinforced-payload-router.description = Равномерно ра�предел�ет грузы на �о�едние блоки. Работает как �ортировщик, когда у�тановлен фильтр.
+block.payload-mass-driver.description = По�тройка дл� дальней тран�портировки грузов. Стрел�ет полученными грузами в другие катапульты.
+block.large-payload-mass-driver.description = По�тройка дл� дальней тран�портировки грузов. Стрел�ет полученными грузами в другие катапульты.
+block.unit-repair-tower.description = Ремонтирует в�е �оюзные единицы поблизо�ти. Требует озон дл� работы.
+block.radar.description = По�тепенно разведывает ме�тно�ть в большом радиу�е. Требует �нергию дл� работы.
+block.shockwave-tower.description = Повреждает и разрушает приближающие�� �нар�ды. Требует циан дл� работы.
+block.canvas.description = Отображает графиче�кое изображение � предопределенной палитрой. Редактируемый.
 
 unit.dagger.description = Стрел�ет �тандартными пул�ми по в�ем врагам поблизо�ти.
 unit.mace.description = Стрел�ет потоками огн� по в�ем врагам поблизо�ти.
@@ -1495,11 +2353,303 @@ unit.poly.description = �втоматиче�ки во��танавливае
 unit.mega.description = �втоматиче�ки ремонтирует повреждённые по�тройки. Может перено�ить блоки и небольшие единицы.
 unit.quad.description = Сбра�ывает большие бомбы на наземные цели, во��танавлива� �оюзные по�тройки и поврежда� врагов. Может перено�ить единицы �реднего размера.
 unit.oct.description = Защищает �оюзников поблизо�ти при помощи �воего во��танавливающего�� щита. Может перено�ить большин�тво наземных единиц.
-unit.risso.description = Стрел�ет залпом ракет и пуль по в�ем врагам поблизо�ти.
-unit.minke.description = Стрел�ет зажигательными �нар�дами и �тандартными пул�ми по наземным цел�м.
+unit.risso.description = Стрел�ет залпами ракет и пуль по в�ем врагам поблизо�ти.
+unit.minke.description = Стрел�ет артиллерий�кими �нар�дами и �тандартными пул�ми по наземным цел�м.
 unit.bryde.description = Стрел�ет дальнобойными артиллерий�кими �нар�дами и ракетами по врагам.
-unit.sei.description = Стрел�ет залпом ракет и бронебойных пуль по врагам.
+unit.sei.description = Стрел�ет залпами ракет и бронебойных пуль по врагам.
 unit.omura.description = Стрел�ет дальнобойным пробивающим �нар�дом из рель�отрона по врагам. Производит единицы «В�пышка».
 unit.alpha.description = Защищает �дро «О�колок» от врагов. О�новна� �троительна� единица.
-unit.beta.description =  Защищает �дро «Штаб» от врагов. О�новна� �троительна� единица.
+unit.beta.description = Защищает �дро «Штаб» от врагов. О�новна� �троительна� единица.
 unit.gamma.description = Защищает �дро «�том» от врагов. О�новна� �троительна� единица.
+unit.retusa.description = Запу�кает �амонавод�щие�� торпеды в ближайших противников. Ремонтирует �оюзные единицы.
+unit.oxynoe.description = Стрел�ет потоками пламени, которые во��танавливают �оюзные по�тройки и нано��т урон врагам. Разрушает ближайшие враже�кие �нар�ды � помощью турели точечной защиты.
+unit.cyerce.description = Стрел�ет по врагам �коплени�ми ракет. Ремонтирует �оюзные единицы.
+unit.aegires.description = Оглушает в�е враже�кие единицы и по�тройки, которые попадают в его �нергетиче�кое поле. Ремонтирует в�ех �оюзников.
+unit.navanax.description = Запу�кает взрывные ЭМИ-�нар�ды, которые нано��т значительный урон �иловым узлам противника и ремонтируют �оюзные по�тройки. Плавит ближайших врагов � помощью 4 автономных лазерных турелей.
+unit.stell.description = Стрел�ет �тандартными пул�ми по враже�ким цел�м.
+unit.locus.description = Поочередно �трел�ет пул�ми по враже�ким цел�м.
+unit.precept.description = Стрел�ет бронебойными ка��етными пул�ми по враже�ким цел�м.
+unit.vanquish.description = Стрел�ет большими бронебойными пул�ми по враже�ким цел�м.
+unit.conquer.description = Стрел�ет большими бронебойными ка�кадами пуль по враже�ким цел�м.
+unit.merui.description = Стрел�ет дальнобойной артиллерией по наземным цел�м противника. Может перемещать�� по большин�тву уча�тков ме�тно�ти.
+unit.cleroi.description = Стрел�ет парами �нар�дов по враже�ким цел�м. Поражает враже�кие �нар�ды � помощью турелей точечной защиты. Может перемещать�� по большин�тву уча�тков ме�тно�ти.
+unit.anthicus.description = Стрел�ет дальнобойными �амонавод�щими�� ракетами по враже�ким цел�м. Может перемещать�� по большин�тву уча�тков ме�тно�ти.
+unit.tecta.description = Стрел�ет �амонавод�щими�� плазменными ракетами по враже�ким цел�м. Защищает �еб� дуговым щитом. Может перемещать�� по большин�тву уча�тков ме�тно�ти.
+unit.collaris.description = Стрел�ет дальнобойной о�колочно-фуга�ной артиллерией по враже�ким цел�м. Может перемещать�� по большин�тву уча�тков ме�тно�ти.
+unit.elude.description = Стрел�ет парами �амонавод�щих�� пуль по враже�ким цел�м. Может парить над жидко�т�ми.
+unit.avert.description = Стрел�ет парами �кручивающих�� пуль по враже�ким цел�м.
+unit.obviate.description = Стрел�ет парами �кручивающих�� шаровых молний по враже�ким цел�м.
+unit.quell.description = Стрел�ет дальнобойными �амонавод�щими�� ракетами по враже�ким цел�м. Подавл�ет враже�кие ремонтирующие по�тройки.
+unit.disrupt.description = Стрел�ет дальнобойными �амонавод�щими�� ракетами подавлени� по враже�ким цел�м. Подавл�ет враже�кие ремонтирующие по�тройки.
+unit.evoke.description = Защищает �дро «Ба�тион» от врагов. Ремонтирует �оюзные по�тройки � помощью луча.
+unit.incite.description = Защищает �дро «Цитадель» от врагов. Ремонтирует �оюзные по�тройки � помощью луча.
+unit.emanate.description = Защищает �дро «�крополь» от врагов. Ремонтирует �оюзные по�тройки � помощью лучей.
+
+lst.read = Считывает чи�ло из �оединённой �чейки пам�ти.
+lst.write = Запи�ывает чи�ло в �оединённую �чейку пам�ти.
+lst.print = Добавл�ет тек�т в тек�товый буфер. �ичего не отображает, пока не будет вызван [accent]Print Flush[].
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Добавл�ет операцию в буфер отри�овки. �ичего не отображает, пока не будет вызван [accent]Draw Flush[].
+lst.drawflush = Сбра�ывает буфер [accent]Draw[] операций на ди�плей.
+lst.printflush = Сбра�ывает буфер [accent]Print[] операций в блок-�ообщение.
+lst.getlink = Получает �оединение проце��ора по индек�у. �ачинает � 0.
+lst.control = Контролирует блок.
+lst.radar = Обнаруживает единицы вокруг по�тройки � заданным радиу�ом.
+lst.sensor = Получает данные из по�тройки или единицы.
+lst.set = Задаёт значение переменной.
+lst.operation = Совершает операцию над 1-2 переменными.
+lst.end = Переходит к началу �тека операций.
+lst.wait = Ждёт определённое количе�тво �екунд.
+lst.stop = О�танавливает работу данного проце��ора.
+lst.lookup = �аходит тип предмета/жидко�ти/единицы/блока по ID.\nОбщее количе�тво каждого типа может быть получено при помощи:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = У�ловно переходит к другой операции.
+lst.unitbind = Прив�зывает�� к единице определённого типа и �охран�ет её в [accent]@unit[].
+lst.unitcontrol = Управл�ет прив�занной в данный момент единицей.
+lst.unitradar = Обнаруживает единицы вокруг прив�занной в данный момент единицы.
+lst.unitlocate = Обнаруживает позицию/по�тройку определённого типа где-либо на карте. Требует прив�занную единицу.
+lst.getblock = Получает данные о плитке в любом ме�те.
+lst.setblock = У�танавливает плитку в любом ме�те.
+lst.spawnunit = Создает боевую единицу на локации.
+lst.applystatus = Примен�ет или �нимает �ффект �тату�а � боевой единицы.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Имитаци� волны, �оздаваемой в произвольном ме�те.\nСчетчик волн не увеличивает��.
+lst.explosion = Создает взрыв на локации.
+lst.setrate = У�танавливает �коро�ть выполнени� проце��ора в ин�трукци�х/тиках.
+lst.fetch = Ищет единицы, �дра, игроков или зданий по индек�у.\nИндек�ы начинают�� � 0 и заканчивают�� возвращаемым чи�лом.
+lst.packcolor = Упаковывает компоненты RGBA [0, 1] в один номер дл� ри�овани� или у�тановки правил.
+lst.setrule = У�танавливает игровое правило.
+lst.flushmessage = Отображает �ообщение из тек�тового буфера на �кране игрока.\nБудет ожидать окончание предыдущего �ообщени�.
+lst.cutscene = Управл�ет камерой игрока.
+lst.setflag = У�танавливает глобальный флаг, который может быть прочитан в�еми проце��орами.
+lst.getflag = Провер�ет, у�тановлен ли глобальный флаг.
+lst.setprop = У�танавливает �вой�тво единицы или по�тройки.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Строитель�тво � помощью проце��оров зде�ь запрещено.
+
+lenum.type = Тип по�тройки/единицы. \n�апример, дл� маршрутизатора �то будет [accent]@router[].\n�е �трока.
+lenum.shoot = Стрельба в определённую позицию.
+lenum.shootp = Стрельба в единицу/по�тройку � ра�чётом �коро�ти.
+lenum.config = Конфигураци� по�тройки, например, предмет �ортировки.
+lenum.enabled = Включён ли блок.
+laccess.currentammotype = Текущий боеприпа� турели.
+
+laccess.color = Цвет о�ветител�.
+laccess.controller = Командующий единицей. Е�ли единица управл�ет�� проце��ором, возвращает проце��ор. Е�ли в �трою, возвращает командующего.\nВ противном �лучае возвращает �аму единицу.
+laccess.dead = Явл�ет�� ли единица/по�тройка неработающей или не�уще�твующей.
+laccess.controlled = Возвращает:\n[accent]@ctrlProcessor[] е�ли единица управл�ет�� проце��ором\n[accent]@ctrlPlayer[] е�ли единица/по�тройка управл�ет�� игроком\n[accent]@ctrlFormation[] е�ли единица в �трою\nВ противном �лучае — 0.
+laccess.progress = Прогре�� дей�тви� от 0 до 1. Возвращает прогре�� производ�тва, перезар�дку турели или прогре�� по�тройки.
+laccess.speed = Мак�имальна� �коро�ть единицы, в плитках/�ек.
+laccess.id = Идентификатор единицы/блока/предмета/жидко�ти.\nЭто обратна� операци� пои�ка.
+lcategory.unknown = �еизве�тно
+lcategory.unknown.description = �ет категории.
+lcategory.io = Ввод и вывод
+lcategory.io.description = Изменение �одержимого блоков пам�ти и буферов проце��ора.
+lcategory.block = Управление блоками
+lcategory.block.description = Взаимодей�твие � блоками.
+lcategory.operation = Операции
+lcategory.operation.description = Логиче�кие операции.
+lcategory.control = Управление по�ледовательно�тью
+lcategory.control.description = Управление пор�дком выполнени�.
+lcategory.unit = Управление единицами
+lcategory.unit.description = Командование единицами.
+lcategory.world = Мир
+lcategory.world.description = Управление поведением мира.
+
+graphicstype.clear = Заливка ди�пле� цветом.
+graphicstype.color = У�тановка цвета дл� �ледующих операций отри�овки.
+graphicstype.col = Эквивалент цвета, но упакованный.\nУпакованные цвета запи�ывают�� в виде ше�тнадцатеричных кодов � префик�ом [accent]%[].\nПример: [accent]%ff0000[] будет кра�ным.
+graphicstype.stroke = У�тановка толщины линии.
+graphicstype.line = Отри�овка отрезка.
+graphicstype.rect = Отри�овка закрашенного пр�моугольника.
+graphicstype.linerect = Отри�овка контура пр�моугольника.
+graphicstype.poly = Отри�овка закрашенного правильного многоугольника.
+graphicstype.linepoly = Отри�овка контура правильного многоугольника.
+graphicstype.triangle = Отри�овка закрашенного треугольника.
+graphicstype.image = Отри�овка внутриигровых �прайтов.\n�апример: [accent]@router[] или [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = В�егда и�тина.
+lenum.idiv = Целочи�ленное деление.
+lenum.div = Деление.\nВозвращает [accent]null[] при делении на ноль.
+lenum.mod = О�таток от делени�.
+lenum.equal = Равно. Приводит типы.\n�е-null объекты, по �равнению � чи�лами, �танов�т�� 1, иначе — 0.
+lenum.notequal = �е равно. Приводит типы.
+lenum.strictequal = Строгое равен�тво. �е приводит типы.\nМожет быть и�пользовано дл� проверки на [accent]null[].
+lenum.shl = Побитовый �двиг влево.
+lenum.shr = Побитовый �двиг вправо.
+lenum.or = Побитовое ИЛИ.
+lenum.land = Булевое И.
+lenum.and = Побитовое И.
+lenum.not = Побитовое �Е.
+lenum.xor = Побитовое и�ключающее ИЛИ.
+
+lenum.min = Минимальное из двух чи�ел.
+lenum.max = Мак�имальное из двух чи�ел.
+lenum.angle = Угол вектора в граду�ах.
+lenum.anglediff = �б�олютна� ди�танци� между двум� углами, в граду�ах.
+lenum.len = Длина вектора.
+
+lenum.sin = Сину�, в граду�ах.
+lenum.cos = Ко�ину�, в граду�ах.
+lenum.tan = Танген�, в граду�ах.
+
+lenum.asin = �рк�ину�, в граду�ах.
+lenum.acos = �ркко�ину�, в граду�ах.
+lenum.atan = �рктанген�, в граду�ах.
+
+#�то не ошибка, поищите 'обозначение диапазонов'
+lenum.rand = Случайное чи�ло в диапазоне [0, значение).
+lenum.log = �атуральный логарифм (ln).
+lenum.log10 = Логарифм по о�нованию 10.
+lenum.noise = Симплек�ный шум, 2D.
+lenum.abs = �б�олютна� величина.
+lenum.sqrt = Квадратный корень.
+
+lenum.any = Люба� единица.
+lenum.ally = Друже�ка� единица.
+lenum.attacker = Единица � оружием.
+lenum.enemy = Враже�ка� единица.
+lenum.boss = Страж.
+lenum.flying = Летающа� единица.
+lenum.ground = �аземна� единица.
+lenum.player = Единица, управл�ема� игроком.
+
+lenum.ore = И�точник руды.
+lenum.damaged = Повреждённа� друже�ка� по�тройка.
+lenum.spawn = Точка по�влени� врагов.\nМожет быть �дром или позицией на карте.
+lenum.building = По�тройка определённой группы.
+
+lenum.core = Любое �дро.
+lenum.storage = Здание хранени�, например, хранилище.
+lenum.generator = По�тройки, вырабатывающие �нергию.
+lenum.factory = По�тройки, перерабатывающие предметы.
+lenum.repair = Ремонтные пункты.
+lenum.battery = Любой аккумул�тор.
+lenum.resupply = Пункты �набжени�.\n�ктуально только при включённом [accent]"Боев. ед. требуют боеприпа�ы"[].
+lenum.reactor = Импуль�ный/ториевый реактор.
+lenum.turret = Люба� турель.
+
+sensor.in = По�тройка/единица дл� ра�познавани�.
+
+radar.from = По�тройка, от которой ра�познавать.\nДально�ть �ен�ора ограничена дально�тью по�тройки.
+radar.target = Фильтр дл� ра�познавани� единиц.
+radar.and = Дополнительные фильтры.
+radar.order = Пор�док �ортировки. 0 дл� обратного.
+radar.sort = Показатель дл� �ортировки результатов.
+radar.output = Переменна� дл� запи�и конечной единицы.
+
+unitradar.target = Фильтр дл� ра�познавани� единиц.
+unitradar.and = Дополнительные фильтры.
+unitradar.order = Пор�док �ортировки. 0 дл� обратного.
+unitradar.sort = Показатель дл� �ортировки результатов.
+unitradar.output = Переменна� дл� запи�и конечной единицы.
+
+control.of = По�тройка дл� контролировани�.
+control.unit = Единица/по�тройка дл� прицеливани�.
+control.shoot = Стрел�ть ли.
+
+unitlocate.enemy = Обнаруживать ли враже�кие по�тройки.
+unitlocate.found = �айден ли объект.
+unitlocate.building = Переменна� дл� запи�и обнаруженной по�тройки.
+unitlocate.outx = Вывод X координаты.
+unitlocate.outy = Вывод Y координаты.
+unitlocate.group = Группа по�троек дл� пои�ка.
+playsound.limit = Е�ли значение равно true, предотвращает во�произведение �того звука,\n е�ли он уже во�производил�� в том же кадре.
+
+lenum.idle = О�тановка движени�, но продолжение �троитель�тва/копани�.\nСо�то�ние по умолчанию.
+lenum.stop = О�тановка движени�/копани�/�троитель�тва.
+lenum.unbind = Полно�тью отключает управление логикой.\nВо��танавливает �тандартный ИИ.
+lenum.move = Перемещение в определённую позицию.
+lenum.approach = Приближение к позиции � указанным радиу�ом.
+lenum.pathfind = Перемещение к точке по�влени� врагов.
+lenum.autopathfind = �втоматиче�кий пои�к пути к ближайшему враже�кому �дру или точке вы�адки.\nЭто то же �амое, что и �тандартный пои�к пути к врагу во врем� волны.
+lenum.target = Стрельба в определённую позицию.
+lenum.targetp = Стрельба в единицу/по�тройку � ра�чётом �коро�ти.
+lenum.itemdrop = Сбра�ывание предметов.
+lenum.itemtake = Вз�тие предметов из по�тройки.
+lenum.paydrop = Сбра�ывание текущего груза.
+lenum.paytake = Вз�тие груза на текущей позиции.
+lenum.payenter = Войти/приземлить�� на грузовой блок, на котором находит�� единица.
+lenum.flag = Чи�ловой флаг единицы.
+lenum.mine = Копание в заданной позиции.
+lenum.build = Строитель�тво блоков.
+lenum.getblock = Получает тип по�тройки, пола и блока по заданным координатам.\nЕдиница должна быть в диапазоне позиции, иначе возвращает�� null.
+lenum.within = Проверка на нахождение единицы р�дом � позицией.
+lenum.boost = Включение/выключение полёта.
+lenum.flushtext = Сбра�ывает �одержимое тек�тового буфера, е�ли применимо. \nЕ�ли значение fetch равно true, пытае�� получить �вой�тва из набора локали карты или набора локали игры.
+lenum.texture = Им� тек�туры пр�мо из атла�а тек�тур игры (и�пользу� �тиль напи�ани� � дефи�ами, например: build-tower) .\nЕ�ли printFlush имеет значение true, то в каче�тве тек�тового аргумента и�пользует�� �одержимое тек�тового буфера.
+lenum.texturesize = Размер тек�туры в плитках. �улевое значение ма�штабирует ширину маркера до размера и�ходной тек�туры.
+lenum.autoscale = Ма�штабировать ли маркер в �оответ�твии � уровнем ма�штабировани� игрока.
+lenum.posi = Индек�ированна� позици�, и�пользуема� дл� линейных и квадратных маркеров � нулевым индек�ом в каче�тве первой позиции.
+lenum.uvi = Положение тек�туры в диапазоне от нул� до единицы, и�пользует�� дл� квадратных маркеров.
+lenum.colori = Индек�ируема� позици�, и�пользуема� дл� линейных и квадратных маркеров � нулевым индек�ом, �вл�ющим�� первым цветом.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
new file mode 100644
index 0000000000..705bac3024
--- /dev/null
+++ b/core/assets/bundles/bundle_sr.properties
@@ -0,0 +1,2651 @@
+credits.text = Napravio [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits = Zasluge
+contributors = Prevodioci i pomaga�i
+discord = Pridruži se Mindustry discordu!
+link.discord.description = Zvani�no discord ćaskanje za Mindustry
+link.reddit.description = Mindustry subredit
+link.github.description = Izvorni kod za igru
+link.changelog.description = Lista promena za ažuriranja
+link.dev-builds.description = Nestabilne verzije u razvoju
+link.trello.description = Zvani�na Trello tabla za planirane dodatke.
+link.itch.io.description = itch.io stranica, gde se igra preuzima za PC
+link.google-play.description = Google Play stranica igre
+link.f-droid.description = F-Droid stranica igre
+link.wiki.description = Zvani�na Mindustry vikipedia
+link.suggestions.description = Preloži nove dodatke
+link.bug.description = Pronašao si grešku? Prijavi je ovde
+linkopen = Ovaj server vam je poslao link. Da li ste sigurni da ga želite otvoriti?\n\n[sky]{0}
+linkfail = Nemoguće otvoriti link!\nURL adresa je iskopirana
+screenshot = Snimanje ekrana izvršeno {0}
+screenshot.invalid = Mapa je prevelika, moguće je da nema dovoljno memorije za snimanje ekrana.
+gameover = Igra gotova.
+gameover.disconnect = Prekini vezu
+gameover.pvp = [accent] {0}[] tim je pobedio!
+gameover.waiting = [accent]Čeka se na sledeću mapu...
+highscore = [accent]Novi rekord!
+copied = Iskopirano.
+indev.notready = Ovaj deo igre još uvek nije spreman.
+
+load.sound = Zvukovi
+load.map = Mape
+load.image = Slike
+load.content = Sadržaj
+load.system = Sistem
+load.mod = Modovi
+load.scripts = Programi
+
+be.update = Nova razvojna verzija je spremna!
+be.update.confirm = Skinuti sad i restartovati igru?
+be.updating = Ažuriranje...
+be.ignore = Ignoriši
+be.noupdates = Nema dostupnih ažuriranja.
+be.check = Proveri za ažuriranja
+
+mods.browser = Pregleda� modova
+mods.browser.selected = Izabrani mod
+mods.browser.add = Instaliraj
+mods.browser.reinstall = Reinstaliraj
+mods.browser.view-releases = Vidi Verzije
+mods.browser.noreleases = [scarlet]Nema pronađenih verzija!\n[accent]Ne može se naći verzija za ovaj mod. Proverite da li stranica moda ima objavljenu verziju.
+mods.browser.latest = <najnovije>
+mods.browser.releases = Verzije
+mods.github.open = GitHub Stranica
+mods.github.open-release = Otvori Stranicu
+mods.browser.sortdate = Sortiraj od najnovijeg to najstarijeg
+mods.browser.sortstars = Sortiraj po broju "zvezdica"
+
+schematic = Å eme
+schematic.add = Snimi Å¡emu
+schematics = Å eme
+schematic.search = Search schematics...
+schematic.replace = Već postoji šema pod ovim imenom. Zameniti?
+schematic.exists = Šema sa ovimn imenom već postoji.
+schematic.import = Uvezi Å¡emu.
+schematic.exportfile = Izvezi dokument
+schematic.importfile = Uvezi dokument
+schematic.browseworkshop = Pretraži radionicu
+schematic.copy = Iskopiraj u privremenu memoriju
+schematic.copy.import = Uvezi is privremene memoriju
+schematic.shareworkshop = Podeli na radionici
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Prevrni Å¡emu.
+schematic.saved = Å ema snimljena.
+schematic.delete.confirm = Šema će biti potpuno uništena.
+schematic.edit = Edit Schematic
+schematic.info = {0}x{1}, {2} blokova
+schematic.disabled = [scarlet]Šema onemogućena.[]\nZabranjena je upotreba šema na ovoj [accent]mapi[] ili na ovom [accent]serveru.
+schematic.tags = Oznake:
+schematic.edittags = Uredi Oznake
+schematic.addtag = Dodaj Oznaku
+schematic.texttag = Tekstualna Oznaka
+schematic.icontag = Slikovna Oznaka
+schematic.renametag = Preimenuj Oznaku
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Potpuno izbriši oznaku?
+schematic.tagexists = Ova oznaka već postoji.
+
+stats = Statistika
+stats.wave = Talasa Poraženo
+stats.unitsCreated = Jedinica Proizvedeno
+stats.enemiesDestroyed = Neprijatelja Uništeno
+stats.built = Građevina Sagrađeno
+stats.destroyed = Građebina Uništeno
+stats.deconstructed = Građevina Razrušeno
+stats.playtime = Vreme Igre
+
+globalitems = [accent]Ukupni Materijali
+map.delete = Da li ste sigurni da želite izbrisati ovu mapu "[accent]{0}[]"?
+level.highscore = Najbolji rezultat: [accent]{0}
+level.select = Izabrati nivo
+level.mode = Režim igre:
+coreattack = < Jezgro je napadnuto! >
+nearpoint = [[ [scarlet]NAPUSTI ZONU DOLASKA ODMAH[] ]\nauništenje je neizostavno
+database = Baza Podataka
+database.button = Baza Podataka
+savegame = Snimi Igru
+loadgame = U�itaj Igru
+joingame = Priklju�i se na Igru
+customgame = Podesiva Igra
+newgame = Nova Igra
+none = <nema>
+none.found = [lightgray]<ništa nije pronađeno>
+none.inmap = [lightgray]<ne postoji na ovoj mapi>
+minimap = Minimapa
+position = Pozicija
+close = Zatvori
+website = Veb-stranica
+quit = Izađi
+save.quit = Snimi i izađi
+maps = Mape
+maps.browse = Pretraži mape
+continue = Nastavi
+maps.none = [lightgray]Nijedna mapa nije pronađena!
+invalid = Neispravno
+pickcolor = Izaberi boju
+preparingconfig = Spremanje konfiguracije
+preparingcontent = Spremanje sadržaja
+uploadingcontent = Ka�enje sadržaja na internet
+uploadingpreviewfile = Ka�enje pregledne datoteke na internet.
+committingchanges = Vršenje izmena
+done = Gotovo.
+feature.unsupported = Vaš uređaj ne podržava ovu funkciju
+
+mods.initfailed = [red]⚠[] Mindustry se nije mogao podići prethodni put.. To je verovatno izazvano greškom u vezi modova.\n\nDa bi se spre�ilo ve�no ispadanje, [red]svi modovi su onemogućeni..[]
+mods = Modovi
+mods.none = [lightgray]Modovi nisu pronađeni!
+mods.guide = Vodi� za modovanje
+mods.report = Prijavi grešku
+mods.openfolder = Otvori folder
+mods.viewcontent = Pregledaj sadržaj
+mods.reload = Ponovno u�itaj
+mods.reloadexit = Igra će se sada ugasiti, da ponovo u�ita modove.
+mod.installed = [Instalirano]
+mod.display = [gray]Mod:[orange] {0}
+mod.enabled = [lightgray]Omogućeno
+mod.disabled = [scarlet]Onemogućeno
+mod.multiplayer.compatible = [gray]Podesan sa multiplejerom
+mod.disable = Onemogući
+mod.version = Version:
+mod.content = Sadržaj:
+mod.delete.error = Nemoguće izbrisati mod, datoteka je možda u upotrebi.
+mod.incompatiblegame = [red]Zastarela Igra
+mod.incompatiblemod = [red]Nije Podesan
+mod.blacklisted = [red]Nema Podršku
+mod.unmetdependencies = [red]Nedostaju Zavisni Modovi
+mod.erroredcontent = [scarlet]Greška u sadržaju
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Zahteva verziju igre: [accent]{0}[]\nVaša igra je zastarela. Ovaj mod zahteva novu verziju igre (po mogućstvu alfa/beta izdanje) da bi funkcionisala.
+mod.outdatedv7.details = Ovaj mod nije podesan sa novijom verzijom igre. Autor mora da ga ažurira, i da doda [accent]minGameVersion: 136[] u [accent]mod.json[] datoteku.
+mod.blacklisted.details = Ovaj mod nema podršku zato što stalno ispada ili prave razne greške u ovoj verziji igre. Ne koristi te ga.
+mod.missingdependencies.details = Ovaj mod nema sledeće zavisne modove: {0}
+mod.erroredcontent.details = Ova igra sadrži greške. Pitajte autora moda da ih popravi.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
+mod.errors = Greške su nastale tokom u�itavanja sadržaja.
+mod.noerrorplay = [scarlet]Imate modove sa greškama.[] Onemogućite te modove, ili ispravite greške.
+mod.nowdisabled = [scarlet]Mod '{0}'nema potrebne zavisne modove:[accent] {1}\n[lightgray]Ove modove treba instalirati prvo.\nMod se automatski onemogućava.
+mod.enable = Omogući
+mod.requiresrestart = Igra će se zatvoriti da ažurira modove.
+mod.reloadrequired = [scarlet]Ponovno pokretanje potrebno
+mod.import = Uvezi mod
+mod.import.file = Uvezi datoteku
+mod.import.github = Uvezi sa GitHub-a
+mod.jarwarn = [scarlet]JAR modovi su �esto nepouzdani i nebezbedni.[]\nBudite sigurni da je mod skinut sa verodostojnog izvora!
+mod.item.remove = Ova stavka je deo [accent] '{0}'[] moda. Da je uklonite, onemogućite mod.
+mod.remove.confirm = Mod će biti izbrisan.
+mod.author = [lightgray]Autor:[] {0}
+mod.missing = Ovaj snimak sadrži modove koji su ili promenjeni ili onemogućeni. Može doći do korupcije snimka. Da li ste sigurni da ga želite u�itati?\n[lightgray]Modovi:\n{0}
+mod.preview.missing = Pre objavljivanja moda u radionicu, neophodno je staviti sliku za mod.\nPostaviti sliku sa imenom: [accent] preview.png[] u folder moda i pokušati ponovo.
+mod.folder.missing = Mod mora biti u obliku foldera da bi se objavio na radionicu.\nDa pretvorite bilo koji mod u folder, ekstraktujte fajl u neko folder, izbrišite stari .zip, ponovo pokrenite igru i u�itajte modove.
+mod.scripts.disable = Vaš uređaj ne podržava modove sa skriptama. Onemogućite te modove.
+
+about.button = Više Informacija
+name = Ime:
+noname = Izaberite [accent] ime igra�a[] prvo.
+search = Pretraži:
+planetmap = Mapa Planete
+launchcore = Lansirajte Jezgro
+filename = Ime datoteke:
+unlocked = Novi sadržaj otklju�an!
+available = Nova tehnologija dostupna za izu�avanje!
+unlock.incampaign = < Otklju�ajte u kampanji za više detalja >
+campaign.select = Izaberite Po�etnu Kampanju
+campaign.none = [lightgray]Izaberite planetu gde bi ste po�eli.\nOvo se može promeniti u svakom trenutku.
+campaign.erekir = [accent]Preporu�eno za novije igra�e.[]\n\nNovije, poboljšane funkcije. Uglavnom linearni tok kampanje.\n\nKvalitetniji doživljaji i mape. Veća težina.
+campaign.serpulo = [scarlet]Nije preporu�eno za novije igra�e.[]\n\nStarije funkcije; renesansno iskustvo. Otvoreniji pristup.\n\nMoguće je da mape i tok kampanje nisu glatki i balansirani.
+campaign.difficulty = Difficulty
+completed = [accent]Završeno.
+techtree = Drvo Tehnologija
+techtree.select = Izbor Drveća Tehnologija
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = U�itajte
+research.discard = Odbacite
+research.list = [lightgray]Tehnologija:
+research = Izu�ite
+researched = [lightgray]{0} izu�eno.
+research.progress = {0}% završeno
+players = {0} broj igra�a
+players.single = {0} igra�
+players.search = pretraži
+players.notfound = [gray]igra�i nisu pronađeni
+server.closing = [accent]Zatvaranje servera...
+server.kicked.kick = Izba�eni ste iz servera!
+server.kicked.whitelist = Ne nalazite se na beloj listi servera.
+server.kicked.serverClose = Server zatvoren..
+server.kicked.vote = Izglasano je da budete izba�eni. Doviđenja.
+server.kicked.clientOutdated = Zastarela igra - ažurirajte igru!
+server.kicked.serverOutdated = Zastareli server - tražite od vlasnika servera da ažurira!
+server.kicked.banned = Trajno ste izba�eni iz ovog servera.
+server.kicked.typeMismatch = Ovaj server nije podesan sa vašom verzijom igre.
+server.kicked.playerLimit = Server je pun. Sa�ekajte da se oslobodi mesto.
+server.kicked.recentKick = Bili ste izba�eni skoro.\nSa�ekajte pre ponovnog povezivanja.
+server.kicked.nameInUse = Ima neko sa tim imenom koji je prisutan \ntrenutno na serveru.
+server.kicked.nameEmpty = Vaše izabrano ime nije validno.
+server.kicked.idInUse = Već ste na ovom serveru, a prisustvo sa dva naloga je zabranjeno.
+server.kicked.customClient = Ovaj server ne podržava svjojehodnu verziju. Preuzmite zvani�nu verziju.
+server.kicked.gameover = Igra je završena!
+server.kicked.serverRestarting = Server se ponovo pokreće.
+server.versions = Vaša verzija:[accent] {0}[]\nVerzija Servera:[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 = Ovde, možete ukucati [accent]IP servera[] na kojem bi ste se povezali, ili otkrivanje [accent]lokalnih mreža[] ili [accent]zadružnih[] servera na koje bi ste se povezali.\nLAN i WAN onlajn igra je podržana.\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 = Pozovi Prijatelje
+hostserver.mobile = Host Game
+host = Host
+hosting = [accent]Otvaranje servera...
+hosts.refresh = Osveži
+hosts.discovering = Otkrivanje LAN igara
+hosts.discovering.any = Otkrivanje igara
+server.refreshing = Osvežavanje servera
+hosts.none = [lightgray]Nije pronađena lokalna igra!
+host.invalid = [scarlet]Can't connect to host.
+
+servers.local = Lokalni Serveri
+servers.local.steam = Dostupne Igre i Lokalni Serveri
+servers.remote = Dalji Serveri
+servers.global = Zadružni Serveri
+
+servers.disclaimer = Zadružni serveri [accent]nisu[] pod vlasništvom ili upravljani od strane tvorca igre.\n\nServeri mogu da sadrže sadržaj napravljen od strane korisnika koji nisu prikladni za svakog.
+servers.showhidden = Prikaži Skrivene Servere
+server.shown = Prikazano
+server.hidden = Skriveno
+viewplayer = Posmatranje Igra�a: [accent]{0}
+
+trace = Nadgledaj Igra�a
+trace.playername = Ime igra�a: [accent]{0}
+trace.ip = IP: [accent]{0}
+trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
+trace.mobile = Telefonski Klijent: [accent]{0}
+trace.modclient = Svojehodni Klijent: [accent]{0}
+trace.times.joined = Puta Povezano: [accent]{0}
+trace.times.kicked = Puta Izba�eno: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
+invalidid = Invalid client ID! Submit a bug report.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
+server.bans = Bans
+server.bans.none = No banned players found!
+server.admins = Administratori
+server.admins.none = Nema pronađenih administratora!
+server.add = Dodaj Server
+server.delete = Da li želite da obrišete ovaj server?
+server.edit = Izmeni Server
+server.outdated = [scarlet]Zastareli Server![]
+server.outdated.client = [scarlet]Zastareli Klijent![]
+server.version = [gray]v{0} {1}
+server.custombuild = [accent]Svjojehodna Verzija
+confirmban = Da li ste sigurni da želite da [scarlet]trajno[] izbacite "{0}[white]"?
+confirmkick = Da li ste sigurni da želite da izbacite "{0}[white]"?
+confirmunban = Are you sure you want to unban this player?
+confirmadmin = Da li ste sigurni da želite da pretvorite "{0}[white]" u administratora?
+confirmunadmin = Da li ste sigurni da želite ukloni �in administratora sa "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
+joingame.title = Pridruži Se Igri
+joingame.ip = Adresa:
+disconnect = Veza je prekinuta.
+disconnect.error = Greška u povezivanju.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
+disconnect.data = Neuspešno u�itavanje podataka!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
+cantconnect = Ne može se pridružiti igri ([accent]{0}[]).
+connecting = [accent]Povezivanje...
+reconnecting = [accent]Ponovno povezivanje...
+connecting.data = [accent]U�itavanje podataka...
+server.port = Port:
+server.invalidport = Invalid port number!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [scarlet]Error hosting server.
+save.new = Novi Snimak
+save.overwrite = Da li ste sigurni da želite da prerežete\novaj snimak?
+save.nocampaign = Individual save files from the campaign cannot be imported.
+overwrite = Prereži
+save.none = Nema pronađenih snimaka!
+savefail = Greška u snimanju!
+save.delete.confirm = Da li ste sigurni da želite da izbrišete ovaj snimak?
+save.delete = Obriši
+save.export = Izvezi Snimak
+save.import.invalid = [accent]This save is invalid!
+save.import.fail = [scarlet]Greška u uvozu snimka: [accent]{0}
+save.export.fail = [scarlet]Greška u izvozu snimka: [accent]{0}
+save.import = Uvezi Snimak
+save.newslot = Ime snimka:
+save.rename = Preimenuj
+save.rename.text = Novo ime:
+selectslot = Izaberi snimak.
+slot = [accent]Slot {0}
+editmessage = Izmeni Poruku
+save.corrupted = Save file corrupted or invalid!
+empty = <prazno>
+on = Uklju�eno
+off = Isklju�eno
+save.search = Pretraži snimljene igre...
+save.autosave = Automatski snimak: {0}
+save.map = Mapa: {0}
+save.wave = Talas {0}
+save.mode = Režim igre: {0}
+save.date = Poslednji snimak: {0}
+save.playtime = Vreme igre: {0}
+warning = Upozorenje.
+confirm = Potvrdi
+delete = Izbriši
+view.workshop = Pogledaj u radionici
+workshop.listing = Edit Workshop Listing
+ok = OK
+open = Otvori
+customize = Podesi Pravila
+cancel = Obustavi
+command = Upravljaj
+command.queue = [lightgray][Queuing]
+command.mine = Iskopavaj
+command.repair = Popravljaj
+command.rebuild = Ponovna Gradnja
+command.assist = Pomoć Igra�u
+command.move = Kretanje
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
+openlink = Otvori Link
+copylink = Iskopiraj Link
+back = Nazad
+max = Maksimum
+objective = Zadatak
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
+data.export = Izvezi Podatke
+data.import = Uvezi Podatke
+data.openfolder = Otvori Folder Datoteke
+data.exported = Data exported.
+data.invalid = Ovo nisu validni podaci igre.
+data.import.confirm = Uvoz spoljašnih podataka igre prerežuje[scarlet] sve[] vaše trenutne podatke igre.\n[accent]Ovaj �in je nepovratan!![]\n\nJednom kada se podaci uvezu, vaša igra će odmah izaći.
+quit.confirm = Da li ste sigurni da želite izaći?
+loading = [accent]U�itavanje...
+downloading = [accent]Preuzimanje...
+saving = [accent]Snimanje...
+respawn = [accent][[{0}][] da se prizoveš u jezgru
+cancelbuilding = [accent][[{0}][] da o�istiš plan
+selectschematic = [accent][[{0}][] da izabereš+kopiraš
+pausebuilding = [accent][[{0}][] da pauziraš gradnju
+resumebuilding = [scarlet][[{0}][] da nastaviš gradnju
+enablebuilding = [scarlet][[{0}][] da odobriš gradnju
+showui = UI je sakriven.\nPritisni [accent][[{0}][] da prikažeš UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
+wave = [accent]Talas {0}
+wave.cap = [accent]Talas {0}/{1}
+wave.waiting = [lightgray]Talas za {0}
+wave.waveInProgress = [lightgray]Talas je u toku
+waiting = [lightgray]ÄŒeka se...
+waiting.players = Čeka se za igra�e...
+wave.enemies = [lightgray]{0} Neprijatelja Ostalo
+wave.enemycores = [accent]{0}[lightgray] Neprijateljskih Jezgara
+wave.enemycore = [accent]{0}[lightgray] Neprijateljskog Jezgra
+wave.enemy = [lightgray]{0} Neprijatelj Ostalo
+wave.guardianwarn = ÄŒuvar dolazi za [accent]{0}[] talasa.
+wave.guardianwarn.one = ÄŒuvar dolazi za [accent]{0}[] talas.
+loadimage = Nareži Sliku
+saveimage = Sa�uvaj Sliku
+unknown = Nepoznato
+custom = Tkana
+builtin = Ugrađena
+map.delete.confirm = Da li ste sigurni da želite obrisati ovu mapu? Ovaj �in je nepovratan!
+map.random = [accent]Nasumi�na Mapa
+map.nospawn = Ova mapa nema jezgra u kom će se stvoriti igra�! Dodaj {0} jezgro ovoj mapi u editor-u.
+map.nospawn.pvp = Ova mapa nema neprijateljskih jezgara u kom će se stvoriti igra�! Dodaj jezgara[scarlet] od drugih timova[] ovoj mapi u editor-u.
+map.nospawn.attack = Ova mapa nema neprijateljskih jezgara koje će igra� napadati! Dodaj {0} jezgara ovoj mapi u editor-u.
+map.invalid = Greška prilikom u�itavanja mape: datoteka mape sadrži ne�itljive delove.
+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 = Lista Promena (nije neophodna):
+updatedesc = Prereži Ime i Opis
+eula = Steam EULA
+missing = This item has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked.
+publishing = [accent]Objavljivanje...
+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 = Greška pri objavljivanju: {0}
+steam.error = Failed to initialize Steam services.\nError: {0}
+editor.planet = Planeta:
+editor.sector = Sektor:
+editor.seed = Seme:
+
+editor.cliffs = Zidovi u Litice
+editor.brush = ÄŒetka
+editor.openin = Otvori u Editoru
+editor.oregen = Generacija Rude
+editor.oregen.info = Generacija Rude:
+editor.mapinfo = Informacije o Mapi
+editor.author = Autor:
+editor.description = Opis:
+editor.nodescription = Mapa mora imati opis ne manji od 4 simbola pre objave.
+editor.waves = Talasi:
+editor.rules = Pravila:
+editor.generation = Generisanje:
+editor.objectives = Zadaci
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
+editor.ingame = Izmeni "U Igri"
+editor.playtest = Testiranje
+editor.publish.workshop = Objavi u Radionicu
+editor.newmap = Nova Mapa
+editor.center = Centar
+editor.search = Pretraži Mape...
+editor.filters = Filtriraj Mape
+editor.filters.mode = Tip Igre:
+editor.filters.type = Tip Mape:
+editor.filters.search = Pretraži U:
+editor.filters.author = Autor
+editor.filters.description = Opis
+editor.shiftx = Pomeri X
+editor.shifty = Pomeri Y
+workshop = Radionica
+waves.title = Talasi
+waves.remove = Ukloni
+waves.every = svakih
+waves.waves = talas(a)
+waves.health = snaga: {0}%
+waves.perspawn = po tvorbi
+waves.shields = Å¡tita/talasu
+waves.to = do
+waves.spawn = tvorba:
+waves.spawn.all = <svi>
+waves.spawn.select = Biranje Mesta Tvorbe
+waves.spawn.none = [scarlet]nema mesto tvorbe u ovoj mapi
+waves.max = maksimalno jedinica
+waves.guardian = ÄŒuvar
+waves.preview = Prikaz
+waves.edit = Izmeni...
+waves.random = Random
+waves.copy = Kopiraj u Privremenu Memoriju
+waves.load = U�itaj iz Privremene Memorije
+waves.invalid = U privremenoj memoriji se nalaze ne-validni talasi.
+waves.copied = Talasi su kopirani.
+waves.none = Nema definisanih neprijatelja.\nImajte na umu da će prazan skup talasa automatski biti zamenjen standardnim skupom.
+waves.sort = Sortiraj Po
+waves.sort.reverse = Suprotno Sortiraj
+waves.sort.begin = Po�etak
+waves.sort.health = Snaga
+waves.sort.type = Tip
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Sakrij Sve
+waves.units.show = Pokaži Sve
+
+#these are intentionally in lower case
+wavemode.counts = koli�ina
+wavemode.totals = ukupno
+wavemode.health = snaga
+all = All
+
+editor.default = [lightgray]<Default>
+details = Detalji...
+edit = Izmeni...
+variables = Varijabla
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
+editor.name = Ime:
+editor.spawn = Prizovi Jedinicu
+editor.removeunit = Ukloni Jedinicu
+editor.teams = Timovi
+editor.errorload = Greška prilikom �itanja datoteke.
+editor.errorsave = Greška prilikom sa�uvanja datoteke.
+editor.errorimage = To je slika, a ne mapa.
+editor.errorlegacy = Ova mapa je stara, i koristi format mape koji nije podržan.
+editor.errornot = Ovo nije datoteka mape.
+editor.errorheader = This map file is either not valid or corrupt.
+editor.errorname = Mapa nema definisano ime. Da li pokušavate da u�itate sa�uvanu igru?
+editor.errorlocales = Error reading invalid locale bundles.
+editor.update = Aržuriraj
+editor.randomize = Nasumi�no
+editor.moveup = Pomeri Gore
+editor.movedown = Pomeri Dole
+editor.copy = Kopiraj
+editor.apply = Uklopi
+editor.generate = Generiši
+editor.sectorgenerate = Sektorska Generacija
+editor.resize = Preuveli�aj
+editor.loadmap = U�itaj Mapu
+editor.savemap = Sa�uvaj Mapu
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
+editor.saved = Sa�uvano!
+editor.save.noname = Vaša mapa ne sadrži ime! Postavi neko u 'informacije o mapi' meniju.
+editor.save.overwrite = Vaša mapa prerezuje ugrađenu mapu! Izaberi drugo ime u 'informacije o mapi' meniju.
+editor.import.exists = [scarlet]Nemoguće preuzeti mapu:[] ugrađena mapa '{0}' uveliko postoji!
+editor.import = Preuzmi...
+editor.importmap = Preuzmi Mapu
+editor.importmap.description = Preuzmite već postojeću mapu
+editor.importfile = Preuzmi Datoteku Mape
+editor.importfile.description = Preuzmite spoljašnju datoteku mape
+editor.importimage = Preuzmi Slikovnu Datoteku
+editor.importimage.description = Preuzmite spoljašnju datoteku mape putem slike
+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 = U�itaj Teren
+editor.saveimage = Sa�uvaj Teren
+editor.unsaved = Da li ste sigurni da želite da izađete?\n[scarlet]Bilo koja promena koja nije sa�uvana će biti izgubljena.
+editor.resizemap = Preuveli�aj Mapu
+editor.mapname = Ime Mape:
+editor.overwrite = [accent]Upozorenje!\n Ovo će da prereže postojeću mapu.
+editor.overwrite.confirm = [scarlet]Upozorenje![] Mapa sa ovim imenom već postoji. Da li ste sigurni da želite da je prerežete? \n"[accent]{0}[]"
+editor.exists = Mapa sa ovim imenom već postoji.
+editor.selectmap = Izaberite mapu koju bi ste u�itali:
+
+toolmode.replace = Zamena
+toolmode.replace.description = Samo crtaj na �vrstim blokovima.
+toolmode.replaceall = Zameni Sve
+toolmode.replaceall.description = Zameni sve blokove na mapi.
+toolmode.orthogonal = Ortogonalno
+toolmode.orthogonal.description = Crta u samo ortogonalnim crtama.
+toolmode.square = Kocka
+toolmode.square.description = Kockasta �etka.
+toolmode.eraseores = Obriši Rude
+toolmode.eraseores.description = Samo briši rude.
+toolmode.fillteams = Popuni Timove
+toolmode.fillteams.description = Popuni timove umesto blokova.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
+toolmode.drawteams = Crtaj Timove
+toolmode.drawteams.description = Crtaj timove umesto blokova.
+toolmode.underliquid = Ispod Te�nosti
+toolmode.underliquid.description = Crtaj podove ispod te�nosti.
+
+filters.empty = [lightgray]Nema filtera! Dodaj jedan preko dugmati ispod.
+
+filter.distort = Poremeti
+filter.noise = Noise
+filter.enemyspawn = Odabir Neprijateljske Tvorbe
+filter.spawnpath = Put od Tvorbe
+filter.corespawn = Izbor Jezgra
+filter.median = Median
+filter.oremedian = Ore Median
+filter.blend = Utapanje
+filter.defaultores = Default Ores
+filter.ore = Ruda
+filter.rivernoise = River Noise
+filter.mirror = Ogledalo
+filter.clear = O�isti
+filter.option.ignore = Ignoriši
+filter.scatter = Razbaci
+filter.terrain = Teren
+filter.logic = Logic
+
+filter.option.scale = Razmera
+filter.option.chance = Å ansa
+filter.option.mag = Magnituda
+filter.option.threshold = Threshold
+filter.option.circle-scale = Razmera Kruga
+filter.option.octaves = Octave
+filter.option.falloff = Falloff
+filter.option.angle = Ugao
+filter.option.tilt = Nagib
+filter.option.rotate = Rotiraj
+filter.option.amount = Koli�ina
+filter.option.block = Blokovi
+filter.option.floor = Pod
+filter.option.flooronto = Ciljan Pod
+filter.option.target = Ciljanje
+filter.option.replacement = Zamena
+filter.option.wall = Zid
+filter.option.ore = Ruda
+filter.option.floor2 = Drugi Pod
+filter.option.threshold2 = Secondary Threshold
+filter.option.radius = Radius
+filter.option.percentile = Percentile
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
+
+width = Å irina:
+height = Visina:
+menu = Menu
+play = Igraj
+campaign = Kampanja
+load = U�itaj
+save = Sa�uvaj
+fps = FPS: {0}
+ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
+language.restart = Ponovo pokrenite vašu igru da promenite jezi�ka podešavanja.
+settings = Podešavanja
+tutorial = Tutorijal
+tutorial.retake = Ponovi Tutorijal
+editor = Editor
+mapeditor = Editor Mape
+
+abandon = Napusti
+abandon.text = Ova zona i svi njeni resursi će biti izgubljeni od strane neprijatelja.
+locked = zaklju�ano
+complete = [lightgray]Završeno:
+requirement.wave = Dostići Talas {0} u {1}
+requirement.core = Uništi Neprijateljsko Jezgro u {0}
+requirement.research = Izu�i {0}
+requirement.produce = Proizvedi {0}
+requirement.capture = Zauzmi {0}
+requirement.onplanet = Kontroliši Sektor Na {0}
+requirement.onsector = Sleti Na Sektor: {0}
+launch.text = Lansiraj
+map.multiplayer = Only the host can view sectors.
+uncover = Razotkrij
+configure = Konfiguriši Zalihe
+objective.research.name = Izu�i
+objective.produce.name = Dobij
+objective.item.name = Preuzmi Materijal
+objective.coreitem.name = Materijal u Jezgru
+objective.buildcount.name = Sagradi
+objective.unitcount.name = Broj Jedinica
+objective.destroyunits.name = Uništi Jedinice
+objective.timer.name = Å toperica
+objective.destroyblock.name = Uništi Blok
+objective.destroyblocks.name = Uništi Blokove
+objective.destroycore.name = Uništi Jezgro
+objective.commandmode.name = Upravlja�ki Mod
+objective.flag.name = Zastava
+marker.shapetext.name = Tekst i Oblik
+marker.point.name = Point
+marker.shape.name = Oblik
+marker.text.name = Tekst
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Pozadina
+marker.outline = Outline
+objective.research = [accent]Izu�i:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Dobij:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Uništi:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Uništi: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Preuzmi: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Dostavi u jezgro:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Sagradi: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Proizvedi Jedinica: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Uništi: [][lightgray]{0}[]x Jedinica
+objective.enemiesapproaching = [accent]Neprijatelji dolaze za: [lightgray]{0}[]
+objective.enemyescelating = [accent]Neprijateljska proizvodnja se umnožava za [lightgray]{0}[]
+objective.enemyairunits = [accent]Neprijateljska vazdušna proizvodnja po�inje za [lightgray]{0}[]
+objective.destroycore = [accent]Uništi Neprijateljsko Jezgro
+objective.command = [accent]Upravljaj Jedinicama
+objective.nuclearlaunch = [accent]âš  Nuklearno lansiranje u toku: [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ NUKLEARNI NAPAD JE NEIZBEŽAN ⚠\n[lightgray]smesta sagradite rezervna jezgra
+
+loadout = Loadout
+resources = Resursi
+resources.max = Maksimum
+bannedblocks = Nedozvoljeni Blokovi
+unbannedblocks = Unbanned Blocks
+objectives = Zadaci
+bannedunits = Nedozvoljene Jedinice
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Nedozvoljene Jedinice Kao Bela Lista
+bannedblocks.whitelist = Nedozvoljeni Blokovi Kao Bela Lista
+addall = Dodaj Sve
+launch.from = Lansirati Od: [accent]{0}
+launch.capacity = Lansirni Kapacitet Materijala: [accent]{0}
+launch.destination = Destinacija: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = Koli�ina mora biti između 0 i {0}.
+add = Dodaj...
+guardian = ÄŒuvar
+
+connectfail = [scarlet]Greška u povezivanju:\n\n[accent]{0}
+error.unreachable = Server je nedostižan.\nDa li je adresa ispravno napisana?
+error.invalidaddress = Adresa nije validna.
+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 = Već Povezan.
+error.mapnotfound = Datoteka mape nije pronađena!
+error.io = I/O mrežna greška.
+error.any = Nepoznata greška u mreži.
+error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
+
+weather.rain.name = Kiša
+weather.snowing.name = Sneg
+weather.sandstorm.name = Peš�ana Oluja
+weather.sporestorm.name = Sporna Oluja
+weather.fog.name = Magla
+campaign.playtime = \uf129 [lightgray]Vreme Igre na Sektoru: {0}
+campaign.complete = [accent]Čestitam.\n\nNeprijatelj na {0} je poražen.\n[lightgray]Poslednji sektor je zauzet.
+
+sectorlist = Sektori
+sectorlist.attacked = {0} pod napadom
+sectors.unexplored = [lightgray]Neistraženo
+sectors.resources = Resursi:
+sectors.production = Proizvodnja:
+sectors.export = Izvoz:
+sectors.import = Uvoz:
+sectors.time = Vreme:
+sectors.threat = Opasnost:
+sectors.wave = Talas:
+sectors.stored = Skladišćeno:
+sectors.resume = Nastavi
+sectors.launch = Lansiraj
+sectors.select = Izaberi
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]nema (sunce)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = Preimenuj Sektor
+sectors.enemybase = [scarlet]Neprijateljska Baza
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Pod napadom! [accent]{0}% Å¡tete
+sectors.underattack.nodamage = [scarlet]Nije zauzet
+sectors.survives = [accent]Preživeće {0} talasa
+sectors.go = Kreni
+sector.abandon = Napusti
+sector.abandon.confirm = Sva jezgra u ovom sektoru će se samouništiti. Nastaviti?
+sector.curcapture = Sektor Zauzet
+sector.curlost = Sektor Izgubljen
+sector.missingresources = [scarlet]Nedovoljnema Resursa u Jezgru
+sector.attacked = Sektor [accent]{0}[white] je napadnut!
+sector.lost = Sektor [accent]{0}[white] je izgubljen!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Promeni Ikonicu
+sector.noswitch.title = Nije Moguće Promeniti Sektor
+sector.noswitch = Ne možete promeniti sektor dok je drugi napadnut.\n\nSektor: [accent]{0}[] na [accent]{1}[]
+sector.view = Vidi Sektor
+
+threat.low = Nisko
+threat.medium = Srednje
+threat.high = Visoko
+threat.extreme = Ekstremno
+threat.eradication = Istrebljenje
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
+planets = Planete
+
+planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
+planet.sun.name = Sunce
+
+sector.impact0078.name = Udar 0078
+sector.groundZero.name = Po�etna Zona
+sector.craters.name = Krateri
+sector.frozenForest.name = Smrznuta Å uma
+sector.ruinousShores.name = Urušene Obale
+sector.stainedMountains.name = Zatamnjene Planine
+sector.desolateRift.name = Pakleni Prolaz
+sector.nuclearComplex.name = Nuklearno Proizvodni Kompleks
+sector.overgrowth.name = Prerasla Ravnica
+sector.tarFields.name = Polja Katrana
+sector.saltFlats.name = Slane Ravnice
+sector.fungalPass.name = Gljivi�ni Prolaz
+sector.biomassFacility.name = Biosinteti�ko Postrojenje
+sector.windsweptIslands.name = Vetrovita Ostrva
+sector.extractionOutpost.name = Lansirna Utvrda
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetarno Lansirni Terminal
+sector.coastline.name = Obala
+sector.navalFortress.name = Pomorska Tvrđava
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
+
+sector.groundZero.description = Savršena lokacija za ponovni po�etak. Niska neprijateljska pretnja, ali i mala koli�ina resursa.\nSakupite sav bakar i svo olovo koje možete. Nastavite dalje.
+sector.frozenForest.description = Čak i ovde, u blizini planina, spore su se proširile… ledene temperature ih neće ve�no zadržati.\n\nZapo�nite upotrebu elektriciteta. Graditei sagorevne generatore. Nau�ite primenu popravlja�a.
+sector.saltFlats.description = Na ivici pustinja nalaze se Slane Ravnice. Retko šta od resursa se može naći ovde..\n\nNeprijatelj je sazidao skladišno postrenje ovde. Uništite njihovo Jezgro. Sravnite sve sa zemljom.
+sector.craters.description = Voda se nakupila u ovim kraterima, ostacima davnih ratova... Povratite sektor. Kopajte pesak. Topite olovno staklo. Pumpajte vodu da ohladite topove i bušilice.
+sector.ruinousShores.description = Posle pustinja leži obala. Davno, ovde se nalazio sistem obalske odbrane. Malo šta od njega ostade do danas. Samo najosnovnije odbrane ostadoše, sve ostalo je svedeno na opiljke.\nNastavite širenje ka spoljašnjosti. Povratite tehnologiju.
+sector.stainedMountains.description = Dalje u unutrašnjosti nalaze se planine, još nezagađene sporama. \nKopajte titanijum, koji je prisutan u zna�ajnoj koli�ini. Nau�ite sve njegove primene. .\n\nNeprijateljsko prisustvo ovde je veće… ne dajte im vremena da pošalju svoje najmoćnije jedinice...
+sector.overgrowth.description = Ova oblast je potpuno zarasla, već bliska izvoru spora.\nNeprijatelj je ovde podigao utvrdu. Koristeći “Topuz�  jedinice, uništite je.
+sector.tarFields.description = Po�etak zone ekstrakcije nafte, između planina i pustinja. Jedna od retkih oblasti sa upotrebljivim rezervama katrana.\nIako je oblast napuštena, ovde se nalaze smažne neprijateljske jedinice. Ne potcenjujte ih..\n\n[lightgray]Izu�ite tehnologiju prerade nafte ako ste u mogućnosti.
+sector.desolateRift.description = Zona ogromne opasnosti. Mnogo resursa, ali malo prostora. Povucite se �im je moguće. Ne dajte se prevariti duga�kim razmacima između neprijateljskih napada.
+sector.nuclearComplex.description = Bivše postrojenje za proizvodnju i preradu torijuma, sada ništa više od ruševina..\n[lightgray]Izu�i torijum i njegove brojne primene.\n\nNeprijatlje je ovde prisutan u velikim brojevima, stalno tražeći nove pretnje...
+sector.fungalPass.description = Prelazna oblast između planina i nižih, sporama obraslim oblastima. Neprijatelj ovde ima malu izvidni�ku bazu.\nRazorite je..\nKoristite “Bodež� i “Puza�� jedinice. Uništite dva Jezgra.
+sector.biomassFacility.description = Poreklo spora. Ovo je postrojenje gde su prvo otkrivene i proizvedene.\nIzu�tei tehnologiju koja leži unutra. Proizvodi spore za kompresiju u ugalj i plastiku.\n\n[lightgray]Po propasti ovog zlosrećnog postrojenja, spore behu oslobođene. Ništa u lokalnom ekosistemu se nije moglo takmi�iti sa tako invazivnim organizmom...
+sector.windsweptIslands.description = Dalje nakon obale leže zaba�ena ostrva. Izveštaji pokazuju da su se ovde nalazile strukture za proizvodnju [accent]Plastaniuma[].\n\nOterajte neprijateljsku mornaricu. Sagradite bazu na ostrvu. Izu�ite novu tehnologiju tih fabrika.
+sector.extractionOutpost.description = Zaba�ena utvrda, sagrađena od strane neprijatelja za lansiranje resursa u druge sektore..\n\nMeđusektorski transport je kljul�an za dalje osvajanje. Zauzmite bazu. Izu�ite njihove Lansirne Rampe.
+sector.impact0078.description = Ovde padoše ostaci međuzvezdane transportne letelice koja je prva ušla u sistem..\n\nSakupite sve što je ostalo celo, nađite primenu za tu novu tehnologiju.
+sector.planetaryTerminal.description = Krajnji cilj.\n\nOva obalska struktura ima objekat sposoban za lansiranje Jezgara na druge planete. Maksimalno je �uvan.\n\nProizvodite brodove. Elimiši neprijatelja što brže moguće. Sagradi Interplanetarni Akcelerator po osvanjanju sektora.
+sector.coastline.description = Ostaci tehnologije pomorskih jedinica su detektovani u ovom sektoru. Odbijte neprijateljske napade, zauzmite ovaj sektor, i preuzmite tehnologiju.
+sector.navalFortress.description = Neprijatelj je sagradio bazu na dalekom, prirodno-formiranom ostrvu. Uništite ovu bazu. Preuzmite njihovu naprednu pomorsku tehnologiju, i izu�i te je.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = Ža�etak
+sector.aegis.name = Okrilje
+sector.lake.name = Jezero
+sector.intersect.name = Raskrsnica
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Sliv
+sector.marsh.name = Bara
+sector.peaks.name = Vrhovi
+sector.ravine.name = Klisura
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Tvrđava
+sector.crevice.name = Pukotina
+sector.siege.name = Opsada
+sector.crossroads.name = Raskrsnica
+sector.karst.name = Karst
+sector.origin.name = Poreklo
+
+sector.onset.description = Tutorijalni sektor. Ovaj zadatak još nije izrađen. Sake�ajte za dodatne informacije.
+sector.aegis.description = Ovaj sektor sadrži rude Volframa.\nIzu�i [accent]Udarnu Drobilicu[] da bi ste mogli iskopati ovu rudu, takođe uništite obližnju neprijateljsku bazu.
+sector.lake.description = Istopljen metali u ovom sektoru smanjuje koli�inu korisnih jedinica. Lebdeća jedinica je jedina opcija.\nIzu�i [accent]fabrikator brodova[] i proizvedi [accent]izvrda[] jedinicu što pre moguće.
+sector.intersect.description = Preliminarno skeniranje predlaže neprijateljske napade sa više strana odmah posle sletanja.\nPostavi odbranu i prikupi resurse što pre moguće\n[accent]Meka[] jedinice su neophodne za prelaz preko okolnog, grubog terena.
+sector.atlas.description = Ovaj sektor sadrži razne vidove terena i zahteva razve vrste jedinica radi efikasnog sprovođena napada.\nUnapređene jedinice su takođe potrebne da bi se izašlo na kraj sa snažnijim bazama primećenim u sektoru.\nIzu�i [accent]Elektrolizator[] i [accent]Refabrikator Tenkova[].
+sector.split.description = Minimalno prisustvo neprijatelja �ini ovaj sektor savršenim za testiranje novih tehnologija transporta.
+sector.basin.description = Veliko prisustvo neprijatelja primećeno.\nBrzo proizvedi jedine i uništi neprijateljska jezgra da bi imao osnovu.
+sector.marsh.description = Ovaj sektor je bogat lu�arom, ali ima ograni�en broj ventila.\nSagradi [accent]Hemijske Komore Sagorevanja[] za proizvodnju energije.
+sector.peaks.description = Planine u ovom sektoru �ine većiunu jedinica beskoristnim. Lebdeće jedinice će biti neophodne.\nImajte na umu neprijateljski protiv-vazdušnu odbranu. Možda će biti moguće da nekoliko od ovih instalacija da se onesposobe pomoću ciljanja njihove potpore.
+sector.ravine.description = Nema neprijateljskih jezgara u okolini; elem, ovo je bitna transportna ruta za neprijatelja. O�ekuj raznovrsnost neprijateljskih jedinica.\nProizvedi [accent]impulsnu leguru[]. Sagradi [accent]Afflict[] platformu.
+sector.caldera-erekir.description = Resursi primećeni u sektoru su razba�eni na nekoliko ostrva.\nIzu�i i pusti u pogon transport zasnovan na dronovima.
+sector.stronghold.description = Velika neprijateljska baza �uva zna�ajna nalazišta [accent]toriuma[].\nIskoristi ga za stvaranje boljih jedinica i platformi.
+sector.crevice.description = Neprijatelj će slati snažne talase jedinica da ti uništi bazu unutar sektora.Stvaranje [accent]karbida[] i [accent]Generatora Pirolize[] će sigurno biti presudno za preživljavanje.
+sector.siege.description = Ovaj sektor sadrži dva kanjona koja primoravaju napad sa dve strane.\nIzu�i [accent]cioanogen[] da bi imao mogućnosti da proizvedeš još moćnije tenkovske jedinice\nPažnja: neprijateljske rakete na dugi domet su primećene. Rakete mogu biti neutralisane pre kontakta.
+sector.crossroads.description = Neprijateljske baze su sagrađene sa raznolikim terenom. Izu�i razli�ite jedinice da bi se snašao.\nTakođe, štitovi se nalaze unutar nekih baza. Shvati kako su snabdevane energijom.
+sector.karst.description = Ovaj sektoj je bogat resursima, ali će biti napadnuto od strane neprijatelja �im se jezgro spusti.\nIskoristite prednost sa resursima i izu�ite [accent]faznu tkaninu[].
+sector.origin.description = Poslednji sektor sa zna�ajnim prisustvom neprijatelja.\nNema prilike da se nešto dodatno izu�i - sav fokus usmeri ka uništenju neprijateljskih jezgara.
+
+status.burning.name = Zapaljen
+status.freezing.name = Zamrzavanje
+status.wet.name = Mokar
+status.muddy.name = Blatnjav
+status.melting.name = Topljenje
+status.sapped.name = Sapiran
+status.electrified.name = Elektrifikovan
+status.spore-slowed.name = Usporen Sporama
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Å okiran
+status.blasted.name = Prasknut
+status.unmoving.name = Nepokretljiv
+status.boss.name = ÄŒuvar
+
+settings.language = Jezik
+settings.data = Podaci
+settings.reset = Vrati na podrazumevano
+settings.rebind = Rebind
+settings.resetKey = Resetuj
+settings.controls = Kontrole
+settings.game = Igra
+settings.sound = Zvuk
+settings.graphics = Grafika
+settings.cleardata = Ras�isti podatke igre...
+settings.clear.confirm = Da li ste sigurni da želite ras�istiti ove podatke?\nŠta je bilo ne može se vratiti!
+settings.clearall.confirm = [scarlet]UPOZORENJE![]\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 = Da li ste sigurni da želite obrisati sve snimke?
+settings.clearsaves = O�isti Snimke
+settings.clearresearch = O�isti Izu�avanja
+settings.clearresearch.confirm = Da li ste sigurni da želite obrisati sva izu�avanja unutar kampanje?
+settings.clearcampaignsaves = O�isti Snimke Kampanje
+settings.clearcampaignsaves.confirm = Da li ste sigurni da želite obrisati sve snimke u kampanji?
+paused = [accent]< Pauzirano >
+clear = O�isti
+banned = [scarlet]Nedozvoljeno
+unsupported.environment = [scarlet]Ne Podržava Prirodnu Sredinu
+yes = Da
+no = Ne
+info.title = Informacije
+error.title = [scarlet]Greška se desila
+error.crashtitle = Greška se desila
+unit.nobuild = [scarlet]Jedinica ne može graditi
+lastaccessed = [lightgray]Poslednji Pristupio: {0}
+lastcommanded = [lightgray]Poslednji Upravljao: {0}
+block.unknown = [lightgray]???
+
+stat.showinmap = <U�itajte mapu da se vidi>
+stat.description = Namena
+stat.input = Ulaz
+stat.output = Izlaz
+stat.maxefficiency = Maksimalna Efikasnost
+stat.booster = Poja�iva�
+stat.tiles = Potrebni blokovi
+stat.affinities = Afiniteti
+stat.opposites = Suprotnosti
+stat.powercapacity = Skladište energije
+stat.powershot = Energija po pucnju
+stat.damage = Å teta
+stat.targetsair = Nišani vazduh
+stat.targetsground = Nišani zemlju
+stat.itemsmoved = Brzina kretanja
+stat.launchtime = Vreme između lansiranja
+stat.shootrange = Domet
+stat.size = Veli�ina
+stat.displaysize = Veli�ina ekrana
+stat.liquidcapacity = Skladište te�nosti
+stat.powerrange = Domet strujne veze
+stat.linkrange = Domet veze
+stat.instructions = Insturkcije
+stat.powerconnections = Maksimalne veze
+stat.poweruse = Upotreba energije
+stat.powerdamage = Energija po jedinici Å¡tete
+stat.itemcapacity = Skladište materijala
+stat.memorycapacity = Kapacitet memorije
+stat.basepowergeneration = Osnovna generacija struje
+stat.productiontime = Vreme proizvodnje
+stat.repairtime = Vreme popravke celog bloka
+stat.repairspeed = Brzina popravke
+stat.weapons = Oružja
+stat.bullet = Metak
+stat.moduletier = Nivo modula
+stat.unittype = Unit Type
+stat.speedincrease = Povećanje brzine
+stat.range = Domet
+stat.drilltier = Materijali koje je moguće kopati
+stat.drillspeed = Osnovna brzina bušenja
+stat.boosteffect = Efekat poja�iva�a
+stat.maxunits = Maksimalne aktivne jedinice
+stat.health = Izdržljivost
+stat.armor = Oklop
+stat.buildtime = Vreme izgradnje
+stat.maxconsecutive = Maksimalni konzekutivni
+stat.buildcost = Cena izgradnje
+stat.inaccuracy = Nepreciznost
+stat.shots = Broj pucanja
+stat.reload = Brzina paljbe
+stat.ammo = Municija
+stat.shieldhealth = Izdržljivost štita
+stat.cooldowntime = Vreme hlađenja
+stat.explosiveness = Eksplozivnost
+stat.basedeflectchance = Å ansa odbijanja
+stat.lightningchance = Å ansa za stvaranje munje
+stat.lightningdamage = Å teta munje
+stat.flammability = Zapaljivost
+stat.radioactivity = Radioaktivnost
+stat.charge = Elektri�ni naboj
+stat.heatcapacity = Termalni kapacitet
+stat.viscosity = Viskoznost
+stat.temperature = Temperatura
+stat.speed = Brzina
+stat.buildspeed = Brzina gradnje
+stat.minespeed = Brzina kopanja
+stat.minetier = Nivo kopanja
+stat.payloadcapacity = Tovarni kapacitet
+stat.abilities = Spospbnosti
+stat.canboost = Može lebdeti
+stat.flying = Leteća jedinica
+stat.ammouse = Upotreba municije
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Umnožava� štete
+stat.healthmultiplier = Umnožava� izdržljivosti
+stat.speedmultiplier = Umnožava� brzine
+stat.reloadmultiplier = Umnožava� brzine paljbe
+stat.buildspeedmultiplier = Umnožava� brzine gradnje
+stat.reactive = Reaguje sa
+stat.immunities = Imuniteti
+stat.healing = Popravlja
+stat.efficiency = [stat]{0}% Efficiency
+
+ability.forcefield = Polje Sile
+ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.repairfield = Polje Popravke
+ability.repairfield.description = Repairs nearby units
+ability.statusfield = Statusno Polje
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Fabrika
+ability.unitspawn.description = Constructs units
+ability.shieldregenfield = Brzina Obnove Å tita
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Munje Pri Kretanju
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Elektrolu�ni Štit
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Polje Prigušivanja Popravki
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energetsko Polje
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Dozvoljeno Dostavljanje Samo Unutar Jezgra
+
+bar.drilltierreq = Bolja Bušilica Potrebna
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Nedostaju Resursi
+bar.corereq = Potrebno Jezgro kao Osnova
+bar.corefloor = Zahteva Zonu Jezgra
+bar.cargounitcap = Dostigli Ste Maksimalni Broj Tovarnih Jedinica
+bar.drillspeed = Brzina Bušenja: {0}/s
+bar.pumpspeed = Brzina Pumpanja: {0}/s
+bar.efficiency = Efikasnost: {0}%
+bar.boost = Poja�anje: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = Energija: {0}/s
+bar.powerstored = Skladišćeno: {0}/{1}
+bar.poweramount = Koli�ina: {0}
+bar.poweroutput = Proizvedeno Energije: {0}
+bar.powerlines = Povezano: {0}/{1}
+bar.items = Materijali: {0}
+bar.capacity = Kapacitet: {0}
+bar.unitcap = {0} {1}/{2}
+bar.liquid = Te�nost
+bar.heat = Toplota
+bar.cooldown = Cooldown
+bar.instability = Nestabilnost
+bar.heatamount = Koli�ina Toplote: {0}
+bar.heatpercent = Koli�ina Toplote: {0} ({1}%)
+bar.power = Energija
+bar.progress = Tok Gradnje
+bar.loadprogress = Tok Pretovara
+bar.launchcooldown = Launch Cooldown
+bar.input = Ulaz
+bar.output = Izlaz
+bar.strength = [stat]{0}[lightgray]x snage
+
+units.processorcontrol = [lightgray]Procesno Upravljan
+
+bullet.damage = [stat]{0}[lightgray] Å¡teta
+bullet.splashdamage = [stat]{0}[lightgray] oblasna Å¡teta ~[stat] {1}[lightgray] polja
+bullet.incendiary = [stat]zapaljiv
+bullet.homing = [stat]samonavođenje
+bullet.armorpierce = [stat]proboj oklopa
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x Å¡rapnela:
+bullet.lightning = [stat]{0}[lightgray]x munja ~ [stat]{1}[lightgray] Å¡tete
+bullet.buildingdamage = [stat]{0}%[lightgray] Å¡teta za strukture
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] odbacivanje
+bullet.pierce = [stat]{0}[lightgray]x probijanje
+bullet.infinitepierce = [stat]proboj
+bullet.healpercent = [stat]{0}[lightgray]% popravljanje
+bullet.healamount = [stat]{0}[lightgray] direktna popravka
+bullet.multiplier = [stat]{0}[lightgray]x umnožavanje municije
+bullet.reload = [stat]{0}[lightgray]x brzina paljbe
+bullet.range = [stat]{0}[lightgray] domet
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
+
+unit.blocks = blokova
+unit.blockssquared = blokova²
+unit.powersecond = jedinica energije/sekundi
+unit.tilessecond = polja/sekundi
+unit.liquidsecond = jedinica te�nosti/sekundi
+unit.itemssecond = materijala/sekundi
+unit.liquidunits = jedinica te�nosti
+unit.powerunits = jedinica energije
+unit.heatunits = jedinica toplote
+unit.degrees = stepeni
+unit.seconds = sekunde
+unit.minutes = minuti
+unit.persecond = /sekundi
+unit.perminute = /minuti
+unit.timesspeed = x brzina
+unit.multiplier = x
+unit.percent = %
+unit.shieldhealth = snaga Å¡tita
+unit.items = materijali
+unit.thousands = hiljade
+unit.millions = milioni
+unit.billions = milijarde
+unit.shots = shots
+unit.pershot = /pucnju
+category.purpose = Namena
+category.general = Opšte
+category.power = Energija
+category.liquids = Te�nosti
+category.items = Resursi
+category.crafting = Ulaz/izlaz
+category.function = Funkcija
+category.optional = Dotatna Poboljšanja
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Presko�i animacije sletanja i poletanja Jezgra.
+setting.landscape.name = Zaklju�aj Orijentaciju
+setting.shadows.name = Senke
+setting.blockreplace.name = Automatski Predlogi Blokova
+setting.linear.name = Linearni Filteri
+setting.hints.name = Saveti
+setting.logichints.name = Logi�ki Saveti
+setting.backgroundpause.name = Pauziraj u Pozadini
+setting.buildautopause.name = Automatski Pauziraj Gradnju
+setting.doubletapmine.name = Pritisni Dva Puta za Iskopavanje
+setting.commandmodehold.name = Drži za Upravlja�ki Mod
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Onesposobi Modove Prilikom Ispadanja
+setting.animatedwater.name = Animirana Površina
+setting.animatedshields.name = Animirani Å titovi
+setting.playerindicators.name = Indikatori Igra�a
+setting.indicators.name = Indikatori Neprijatelja
+setting.autotarget.name = Auto-nišan
+setting.keyboard.name = Kontrole "Tastatura i Miš"
+setting.touchscreen.name = Kontrole "Ekran na Dodir"
+setting.fpscap.name = Maksimalni FPS
+setting.fpscap.none = Nema
+setting.fpscap.text = {0} FPS
+setting.uiscale.name = UI Skala
+setting.uiscale.description = Restartovanje je zahtevano da bi se u�itale promene.
+setting.swapdiagonal.name = Uvek Dijagonalno Postavljanje
+setting.screenshake.name = Screen Shake
+setting.bloomintensity.name = Bloom Intezitet
+setting.bloomblur.name = Bloom Magliranje
+setting.effects.name = Prikazuj Efekte
+setting.destroyedblocks.name = Prikazuj Uništene Blokove
+setting.blockstatus.name = Prikazuj Status Blokova
+setting.conveyorpathfinding.name = Automatska Putanja Traka
+setting.sensitivity.name = Osetljivost Upravlja�a
+setting.saveinterval.name = Interval ÄŒuvanja
+setting.seconds = {0} sekundi
+setting.milliseconds = {0} milisekundi
+setting.fullscreen.name = Ceo Ekran
+setting.borderlesswindow.name = Bezgrani�ni Prozor
+setting.borderlesswindow.name.windows = Ceo Bezgrani�ni Ekran
+setting.borderlesswindow.description = Restartovanje je zahtevano da bi se u�itale promene.
+setting.fps.name = Prikazuj FPS i Ping
+setting.console.name = Osposobi Konzolu
+setting.smoothcamera.name = Glatka Kamera
+setting.vsync.name = VSync
+setting.pixelate.name = Pikselizuj
+setting.minimap.name = Prikaži Minimapu
+setting.coreitems.name = Prikaži Materijale Unutar Jezgra
+setting.position.name = Prikaži Poziciju Igra�a
+setting.mouseposition.name = Prilaži Poziciju Miša
+setting.musicvol.name = Ja�ina Muzike
+setting.atmosphere.name = Prikaži Atmosferu Planete
+setting.drawlight.name = Draw Darkness/Lighting
+setting.ambientvol.name = Ja�ina Zvuka Ambijenta
+setting.mutemusic.name = Nema Muzike
+setting.sfxvol.name = Ja�ina Zvu�nih Efekata
+setting.mutesound.name = Nema Zvuka
+setting.crashreport.name = Send Anonymous Crash Reports
+setting.communityservers.name = Fetch Community Server List
+setting.savecreate.name = Automatski Snimaj Igru
+setting.steampublichost.name = Public Game Visibility
+setting.playerlimit.name = Limit Igra�a
+setting.chatopacity.name = Prozirnost ÄŒeta
+setting.lasersopacity.name = Prozirnost Energetskih Lasera
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
+setting.bridgeopacity.name = Prozirnost Mostova
+setting.playerchat.name = Prikazuj Čet Mehure Igra�a
+setting.showweather.name = Prikazuj Grafiku Vremena
+setting.hidedisplays.name = Sakrij Logi�ke Displeje
+setting.macnotch.name = Prilagodi interfejs da prikaže zarez
+setting.macnotch.description = Restartovanje je zahtevano da bi se u�itale promene
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
+public.beta = Note that beta versions of the game cannot make public lobbies.
+uiscale.reset = UI skala se promenija.\nPritisnite "OK" da porvdite ovu skali.\n[scarlet]Vraćanje i izlazak za[accent] {0}[] sekundi...
+uiscale.cancel = Obustavi i Izađi
+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 = Generalno
+category.view.name = Pogled
+category.command.name = Unit Command
+category.multiplayer.name = Multiplayer
+category.blocks.name = Biranje Blokova
+placement.blockselectkeys = \n[lightgray]Dugme: [{0},
+keybind.respawn.name = Prizovi iz Jezgra
+keybind.control.name = Kontrološi Jedinicu
+keybind.clear_building.name = O�isti Građevinu
+keybind.press = Pritisni dugme...
+keybind.press.axis = Pritisni dugme ili palicu...
+keybind.screenshot.name = Snimak Mape
+keybind.toggle_power_lines.name = Prikazuj Energetske Lasere
+keybind.toggle_block_status.name = Prikazuj Statuse Blokova
+keybind.move_x.name = Pomeri X
+keybind.move_y.name = Pomeri Y
+keybind.mouse_move.name = Prati Miš
+keybind.pan.name = Gledaj sa Daljine
+keybind.boost.name = Lebdi
+keybind.command_mode.name = Upravlja�ki Mod
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Ponovo Sagradi Region
+keybind.schematic_select.name = Izaberi Region
+keybind.schematic_menu.name = Menu Å ema
+keybind.schematic_flip_x.name = Okreni Å emu X
+keybind.schematic_flip_y.name = Okreni Å emu Y
+keybind.category_prev.name = Prethodna Kategorija
+keybind.category_next.name = Sledeća Kategorija
+keybind.block_select_left.name = Odabir Bloka Levo
+keybind.block_select_right.name = Odabir Bloka Desno
+keybind.block_select_up.name = Odabir Bloka Gore
+keybind.block_select_down.name = Odabir Bloka Dole
+keybind.block_select_01.name = Kategorija/Blok Odabir 1
+keybind.block_select_02.name = Kategorija/Blok Odabir 2
+keybind.block_select_03.name = Kategorija/Blok Odabir 3
+keybind.block_select_04.name = Kategorija/Blok Odabir 4
+keybind.block_select_05.name = Kategorija/Blok Odabir 5
+keybind.block_select_06.name = Kategorija/Blok Odabir 6
+keybind.block_select_07.name = Kategorija/Blok Odabir 7
+keybind.block_select_08.name = Kategorija/Blok Odabir 8
+keybind.block_select_09.name = Kategorija/Blok Odabir 9
+keybind.block_select_10.name = Kategorija/Blok Odabir 10
+keybind.fullscreen.name = Toggle Fullscreen
+keybind.select.name = Izaberi/Pucaj
+keybind.diagonal_placement.name = Diagonalo Postavljanje
+keybind.pick.name = Izaberi Blok
+keybind.break_block.name = Razori Blok
+keybind.select_all_units.name = Izaberi Sve Jedinice
+keybind.select_all_unit_factories.name = Izaberi Sve Fabrike Jedinica
+keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Uzmi Tovar
+keybind.dropCargo.name = Spusti Tovar
+keybind.shoot.name = Ispaljuj
+keybind.zoom.name = Zoom
+keybind.menu.name = Meni
+keybind.pause.name = Pauziraj
+keybind.pause_building.name = Pauziraj/Nastavi Gradnju
+keybind.minimap.name = Minimapa
+keybind.planet_map.name = Planetarna Mapa
+keybind.research.name = Izu�i
+keybind.block_info.name = O Bloku
+keybind.chat.name = ÄŒet
+keybind.player_list.name = Lista Igra�a
+keybind.console.name = Konzola
+keybind.rotate.name = Rotiraj
+keybind.rotateplaced.name = Rotiraj Postojeće (Drži)
+keybind.toggle_menus.name = Toggle Menus
+keybind.chat_history_prev.name = Istorija ÄŒeta (Prethodna)
+keybind.chat_history_next.name = Istorija ÄŒeta (Naredna)
+keybind.chat_scroll.name = Chat Scroll
+keybind.chat_mode.name = Menjaj Tip ÄŒeta
+keybind.drop_unit.name = Spusti Jedinicu
+keybind.zoom_minimap.name = Zumiraj Minimapu
+mode.help.title = Opis Modova
+mode.survival.name = Preživljavanje
+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 = Napad
+mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
+mode.custom = Svojevrsna Pravila
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Sakrij Nedozvoljena Sredstva
+
+rules.infiniteresources = Bezkona�ni Resursi
+rules.onlydepositcore = Samo Dozvoli Dostavu u Jezgro
+rules.derelictrepair = Allow Derelict Block Repair
+rules.reactorexplosions = Eksplozije Reaktora
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Onesposobi Svetovne Procesore
+rules.schematic = Å eme Su Dozvoljene
+rules.wavetimer = Talasna Å toperica
+rules.wavesending = Slanje Talasa
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
+rules.waves = Talasi
+rules.airUseSpawns = Air units use spawn points
+rules.attack = Mod Napada
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI [red](Nedovršeno)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Minimalna Veli�ina Odreda
+rules.rtsmaxsquadsize = Maksimalna Veli�ina Odreda
+rules.rtsminattackweight = Minimalna Težina Napada
+rules.cleanupdeadteams = Po�isti Građevine Poraženog Tima (PvP)
+rules.corecapture = Zauzmi Jezgro Po Uništenju
+rules.polygoncoreprotection = Poligonalna Zaštita Jezgra
+rules.placerangecheck = Placement Range Check
+rules.enemyCheat = Beskona�nost Neprijateljskih Resursa
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
+rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
+rules.unitcostmultiplier = Unit Cost Multiplier
+rules.unithealthmultiplier = Unit Health Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Jezgara Povećavaju Maksimalni Broj Jedinica
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Maksimalni Broj Jedinica (ne ra�unajući jezgra)
+rules.limitarea = Ograni�i Prostor Mape
+rules.enemycorebuildradius = Radius Neprijateljskog jezgra bez gradnje:[lightgray] (polja)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Razmak Između Talasa:[lightgray] (sec)
+rules.initialwavespacing = Po�etni Razmak Talasa:[lightgray] (sec)
+rules.buildcostmultiplier = Build Cost Multiplier
+rules.buildspeedmultiplier = Build Speed Multiplier
+rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
+rules.waitForWaveToEnd = Talasi ÄŒekaju Za Neprijatelje
+rules.wavelimit = Map Ends After Wave
+rules.dropzoneradius = Radijus Zone Prijema:[lightgray] (polja)
+rules.unitammo = Jedinice Zahtevaju Municiju [red](može biti uklonjena)
+rules.enemyteam = Neprilateljski Tim
+rules.playerteam = Tim Igra�a
+rules.title.waves = Talasi
+rules.title.resourcesbuilding = Resursi i Građevine
+rules.title.enemy = Neprijatelji
+rules.title.unit = Jedinice
+rules.title.experimental = Experimental
+rules.title.environment = Okolina
+rules.title.teams = Timovi
+rules.title.planet = Planeta
+rules.lighting = Osvetljenje
+rules.fog = Magla Rata
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
+rules.fire = Plamen
+rules.anyenv = <Bilo Koja>
+rules.explosions = Blokovna/Jedini�na Šteta Eksplozije
+rules.ambientlight = Okolno Osvetljenje
+rules.weather = Vreme
+rules.weather.frequency = U�estalost:
+rules.weather.always = Stalno
+rules.weather.duration = Dužina:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
+
+content.item.name = Materijali
+content.liquid.name = Te�nosti
+content.unit.name = Jedinice
+content.block.name = Blokovi
+content.status.name = Statusni Efekti
+content.sector.name = Sektori
+content.team.name = Factions
+wallore = (Zid)
+
+item.copper.name = Bakar
+item.lead.name = Olovo
+item.coal.name = Ugalj
+item.graphite.name = Grafit
+item.titanium.name = Titanijum
+item.thorium.name = Torijum
+item.silicon.name = Silicijum
+item.plastanium.name = Plastanijum
+item.phase-fabric.name = Fazna Tkanina
+item.surge-alloy.name = Impulsna Legura
+item.spore-pod.name = Kapsula Spora
+item.sand.name = Pesak
+item.blast-compound.name = Eksplozivno Jedinjenje
+item.pyratite.name = Piratit
+item.metaglass.name = Meta-Staklo
+item.scrap.name = Opiljci
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beriljium
+item.tungsten.name = Volfram
+item.oxide.name = Oksid
+item.carbide.name = Karbid
+item.dormant-cyst.name = Dormant Cyst
+
+liquid.water.name = Voda
+liquid.slag.name = Å ljaka
+liquid.oil.name = Nafta
+liquid.cryofluid.name = Kriote�nost
+liquid.neoplasm.name = Neoplazma
+liquid.arkycite.name = Lu�ar
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozon
+liquid.hydrogen.name = Vodonik
+liquid.nitrogen.name = Azot
+liquid.cyanogen.name = Cianogen
+
+unit.dagger.name = Bodež
+unit.mace.name = Topuz
+unit.fortress.name = Tvrđava
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Kvazar
+unit.crawler.name = Puza�
+unit.atrax.name = Atraks
+unit.spiroct.name = Spirokt
+unit.arkyid.name = Arkid
+unit.toxopid.name = Toksopid
+unit.flare.name = Blesak
+unit.horizon.name = Horizont
+unit.zenith.name = Zenit
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Pomra�enje
+unit.mono.name = Mono
+unit.poly.name = Poli
+unit.mega.name = Mega
+unit.quad.name = Kvad
+unit.oct.name = Okt
+unit.risso.name = Riso
+unit.minke.name = Minke
+unit.bryde.name = Bride
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.retusa.name = Retuza
+unit.oxynoe.name = Oksinoe
+unit.cyerce.name = Cierce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanaks
+unit.alpha.name = Alfa
+unit.beta.name = Beta
+unit.gamma.name = Gama
+unit.scepter.name = Skiptar
+unit.reign.name = Vlast
+unit.vela.name = Vela
+unit.corvus.name = Korvus
+unit.stell.name = Stell
+unit.locus.name = Lokus
+unit.precept.name = Propis
+unit.vanquish.name = Savladaj
+unit.conquer.name = Zavladaj
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthikus
+unit.tecta.name = Tekta
+unit.collaris.name = Okovratnik
+unit.elude.name = Izvrda
+unit.avert.name = Odvrat
+unit.obviate.name = Preduhitro
+unit.quell.name = Gasitelj
+unit.disrupt.name = Lobomotija
+unit.evoke.name = Izazvati
+unit.incite.name = Podstaći
+unit.emanate.name = Proizići
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Dron Montiranja
+unit.latum.name = Latum
+unit.renale.name = Renale
+
+block.parallax.name = Odblesak
+block.cliff.name = Litica
+block.sand-boulder.name = Peš�ani Kamen
+block.basalt-boulder.name = Bazaltni Kamen
+block.grass.name = Trava
+block.molten-slag.name = Å ljaka
+block.pooled-cryofluid.name = Kriote�nost
+block.space.name = Svemir
+block.salt.name = So
+block.salt-wall.name = Solni Zid
+block.pebbles.name = Å ljunak
+block.tendrils.name = Rastinje
+block.sand-wall.name = Peš�ani Zid
+block.spore-pine.name = ÄŒetinar Spora
+block.spore-wall.name = Zid Spora
+block.boulder.name = Stena
+block.snow-boulder.name = Snežni Kamen
+block.snow-pine.name = Snežni Četinar
+block.shale.name = Å kriljac
+block.shale-boulder.name = Škrilj�ani Kamen
+block.moss.name = Mahovina
+block.shrubs.name = Žbunovi
+block.spore-moss.name = Mahovina Spora
+block.shale-wall.name = Škrilj�ani Zid
+block.scrap-wall.name = Zid od Opiljaka
+block.scrap-wall-large.name = Veliki Zid od Opiljaka
+block.scrap-wall-huge.name = Ogromni Zid od Opiljaka
+block.scrap-wall-gigantic.name = Džinovski Zid od Opiljaka
+block.thruster.name = Potisnik
+block.kiln.name = Pećnica
+block.graphite-press.name = Grafitna Presa
+block.multi-press.name = Multi-Presa
+block.constructing = {0} [lightgray](U izgradnji)
+block.spawn.name = Mesto Tvorbe Neprijatelja
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
+block.core-shard.name = Jezgro: Krhotina
+block.core-foundation.name = Jezgro: Temelj
+block.core-nucleus.name = Jezgro: Nukleus
+block.deep-water.name = Duboka Voda
+block.shallow-water.name = Voda
+block.tainted-water.name = Zaprljana Voda
+block.deep-tainted-water.name = Duboka Zaprljana Voda
+block.darksand-tainted-water.name = Zaprljana Voda na Tamnom Pesku
+block.tar.name = Katran
+block.stone.name = Kamen
+block.sand-floor.name = Pesak
+block.darksand.name = Tamni Pesak
+block.ice.name = Led
+block.snow.name = Sneg
+block.crater-stone.name = Krateri
+block.sand-water.name = Voda na Pesku
+block.darksand-water.name = Voda na Tamnom Pesku
+block.char.name = Nagoretina
+block.dacite.name = Dacit
+block.rhyolite.name = Rilotit
+block.dacite-wall.name = Dacitni Zid
+block.dacite-boulder.name = Dacitni Kamen
+block.ice-snow.name = Snežni Led
+block.stone-wall.name = Kameni Zid
+block.ice-wall.name = Ledeni Zid
+block.snow-wall.name = Snežni Zid
+block.dune-wall.name = Tamna Peš�ani Zid
+block.pine.name = ÄŒetinar
+block.dirt.name = Zemlja
+block.dirt-wall.name = Zemljani Zid
+block.mud.name = Blato
+block.white-tree-dead.name = Mrtvo Belo Drvo
+block.white-tree.name = Belo Drvo
+block.spore-cluster.name = Kolonija Spora
+block.metal-floor.name = Metalni Pod 1
+block.metal-floor-2.name = Metalni Pod 2
+block.metal-floor-3.name = Metalni Pod 3
+block.metal-floor-4.name = Metalni Pod 4
+block.metal-floor-5.name = Metalni Pod 5
+block.metal-floor-damaged.name = Oštećeni Metalni Pod
+block.dark-panel-1.name = Tamna Plo�a 1
+block.dark-panel-2.name = Tamna Plo�a 2
+block.dark-panel-3.name = Tamna Plo�a 3
+block.dark-panel-4.name = Tamna Plo�a 4
+block.dark-panel-5.name = Tamna Plo�a 5
+block.dark-panel-6.name = Tamna Plo�a 6
+block.dark-metal.name = Tamni Metal
+block.basalt.name = Bazalt
+block.hotrock.name = Vrele Stene
+block.magmarock.name = Magmatske Stene
+block.copper-wall.name = Bakarni Zid
+block.copper-wall-large.name = Veliki Bakarni Zid
+block.titanium-wall.name = Titanijumski Zid
+block.titanium-wall-large.name = Veliki Titanijumski Zid
+block.plastanium-wall.name = Plastanijumski Zid
+block.plastanium-wall-large.name = Veliki Plastanijumski Zid
+block.phase-wall.name = Fazni Zid
+block.phase-wall-large.name = Veliki Fazni Zid
+block.thorium-wall.name = Torijumski Zid
+block.thorium-wall-large.name = Veliki Torijumski Zid
+block.door.name = Vrata
+block.door-large.name = Velika Vrata
+block.duo.name = Duo
+block.scorch.name = Iskra
+block.scatter.name = Rasprskati
+block.hail.name = Grad
+block.lancer.name = Koplje
+block.conveyor.name = Pokretna Traka
+block.titanium-conveyor.name = Titanijumska Traka
+block.plastanium-conveyor.name = Plastanijumska Traka
+block.armored-conveyor.name = Oklopna Traka
+block.junction.name = Raskršće
+block.router.name = Ruter
+block.distributor.name = Distributor
+block.sorter.name = Sorter
+block.inverted-sorter.name = Naopaki Sorter
+block.message.name = Poruka
+block.reinforced-message.name = Armirana Poruka
+block.world-message.name = Svetovna Poruka
+block.world-switch.name = World Switch
+block.illuminator.name = Svetlo
+block.overflow-gate.name = Prelivna Kapija
+block.underflow-gate.name = Podlivna Kapija
+block.silicon-smelter.name = Silicijumska Pećnica
+block.phase-weaver.name = Fazna Tka�nica
+block.pulverizer.name = Usitnjava�
+block.cryofluid-mixer.name = Mešalica Kriote�nosti
+block.melter.name = Topionica
+block.incinerator.name = Spaljiva�
+block.spore-press.name = Kompresor Spora
+block.separator.name = Razdvaja�
+block.coal-centrifuge.name = Centrifuga za Ugajl
+block.power-node.name = Strujni ÄŒvor
+block.power-node-large.name = Veliki Strujni ÄŒvor
+block.surge-tower.name = Impulsni Toranj
+block.diode.name = Baterijska Dioda
+block.battery.name = Baterija
+block.battery-large.name = Velika Baterija
+block.combustion-generator.name = Generator Sagorevanja
+block.steam-generator.name = Parna Turbina
+block.differential-generator.name = Diferencijalni Generator
+block.impact-reactor.name = Udarni Reaktor
+block.mechanical-drill.name = Mehani�ka Bušilica
+block.pneumatic-drill.name = Pneumatska Bušilica
+block.laser-drill.name = Laserka Bušilica
+block.water-extractor.name = Hidrofor
+block.cultivator.name = Kultivator
+block.conduit.name = Cev
+block.mechanical-pump.name = Mehani�ka Pumpa
+block.item-source.name = Izvor Resursa
+block.item-void.name = Brisa� Resursa
+block.liquid-source.name = Izvor Te�nosti
+block.liquid-void.name = Brisa� Te�nosti
+block.power-void.name = Brisa� Struje
+block.power-source.name = Izvor Strujue
+block.unloader.name = Istovariva�
+block.vault.name = Trezor
+block.wave.name = Talas
+block.tsunami.name = Cunami
+block.swarmer.name = Roj
+block.salvo.name = Salvo
+block.ripple.name = Impuls
+block.phase-conveyor.name = Fazna Traka
+block.bridge-conveyor.name = Premostna Traka
+block.plastanium-compressor.name = Kompresor Plastanijuma
+block.pyratite-mixer.name = Mešalica Piratita
+block.blast-mixer.name = Mešalica Eksploziva
+block.solar-panel.name = Solarni Panel
+block.solar-panel-large.name = Veliki Solarni Panel
+block.oil-extractor.name = Naftna Bušotina
+block.repair-point.name = Popravna Ta�ka
+block.repair-turret.name = Popravni Top
+block.pulse-conduit.name = Pulsna Cev
+block.plated-conduit.name = Oklopna Cev
+block.phase-conduit.name = Fazna Cev
+block.liquid-router.name = Ruter Te�nosti
+block.liquid-tank.name = Te�ni Rezervoar
+block.liquid-container.name = Te�no Skladište
+block.liquid-junction.name = Raskršće Te�nosti
+block.bridge-conduit.name = Premostna Cev
+block.rotary-pump.name = Obrtna Pumpa
+block.thorium-reactor.name = Nuklearni Reaktor
+block.mass-driver.name = Akcelerator
+block.blast-drill.name = Vazdušna Bušilica
+block.impulse-pump.name = Impulsna Pumpa
+block.thermal-generator.name = Termalni Generator
+block.surge-smelter.name = Topionica Impulsne legure
+block.mender.name = Popravlja�
+block.mend-projector.name = Projektor Popravke
+block.surge-wall.name = Impulsni Zid
+block.surge-wall-large.name = Veliki Impulsni zid
+block.cyclone.name = Ciklon
+block.fuse.name = Fuzija
+block.shock-mine.name = Å ok-mina
+block.overdrive-projector.name = Projektor Ubrzanja
+block.force-projector.name = Projektor Å tita
+block.arc.name = Luk
+block.rtg-generator.name = RTG Generator
+block.spectre.name = Utvara
+block.meltdown.name = Istopitelj
+block.foreshadow.name = Predznak
+block.container.name = Kontejner
+block.launch-pad.name = Launch Pad
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.name = Segment
+block.ground-factory.name = Zemna Fabrika
+block.air-factory.name = Vazdušna Fabrika
+block.naval-factory.name = Morska Fabrika
+block.additive-reconstructor.name = Dodatni Rekonstruktor
+block.multiplicative-reconstructor.name = Multiplikativni Rekonstruktor
+block.exponential-reconstructor.name = Eksponencijalni Rekonstruktor
+block.tetrative-reconstructor.name = Tetrativni Rekonstruktor
+block.payload-conveyor.name = Tovarna Traka
+block.payload-router.name = Tovarni Ruter
+block.duct.name = Kanal
+block.duct-router.name = Kanalski Ruter
+block.duct-bridge.name = Kanalski Most
+block.large-payload-mass-driver.name = Veliki Tovarni Akcelerator
+block.payload-void.name = Brisa� Tovara
+block.payload-source.name = Izvor Tovara
+block.disassembler.name = Rastavlja�
+block.silicon-crucible.name = Silikonska Topionica
+block.overdrive-dome.name = Kupola Ubrzanja
+block.interplanetary-accelerator.name = Interplanetarni Akcelerator
+block.constructor.name = Zidar
+block.constructor.description = Proizvodi građevine do 2x2 veli�ine.
+block.large-constructor.name = Vekiki Zidar
+block.large-constructor.description = Proizvodi građevine do 4x4 veli�ine.
+block.deconstructor.name = Razlaga�
+block.deconstructor.description = Razgrađuje građevine i jedinice koje uđu unutra. Vraća se 100% cene gradnje.
+block.payload-loader.name = Punilac Tovara
+block.payload-loader.description = Puni u blokove te�nosti i materijale.
+block.payload-unloader.name = Praznilac Tovara
+block.payload-unloader.description = Prazni iz blokova te�nosti i materijale.
+block.heat-source.name = Izvor Toplote
+block.heat-source.description = 1x1 blok koji tehni�ki proizvodi beskona�no toplote. Isklju�ivo za Sandbox mod.
+block.empty.name = Prazno
+block.rhyolite-crater.name = Riolitni Krateri
+block.rough-rhyolite.name = Grub Riolit
+block.regolith.name = Regolit
+block.yellow-stone.name = Žuta Stena
+block.carbon-stone.name = Ugljeni�na Stena
+block.ferric-stone.name = Železna Stena
+block.ferric-craters.name = Železni Krateri
+block.beryllic-stone.name = Berilijumska Stena
+block.crystalline-stone.name = Kristalinska Stena
+block.crystal-floor.name = Kristalni Pod
+block.yellow-stone-plates.name = Plo�e Žute Stene
+block.red-stone.name = Crvena Stena
+block.dense-red-stone.name = Gusta Crvena Stena
+block.red-ice.name = Crveni Led
+block.arkycite-floor.name = Lu�arni Pod
+block.arkyic-stone.name = Lu�arna Stena
+block.rhyolite-vent.name = Riolitni Gejzir
+block.carbon-vent.name = Ugljeni�ni Gejzir
+block.arkyic-vent.name = Lu�arni Gejzir
+block.yellow-stone-vent.name = Gejzir Žute Stene
+block.red-stone-vent.name = Gejzir Crvene Stene
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Zona Jezgra
+block.regolith-wall.name = Regolitni Zid
+block.yellow-stone-wall.name = Zid Žute Stene
+block.rhyolite-wall.name = Riolitni Zid
+block.carbon-wall.name = Ugljeni�ni Zid
+block.ferric-stone-wall.name = Zid Železne Stene
+block.beryllic-stone-wall.name = Zid Berilijumske Stene
+block.arkyic-wall.name = Lu�arni Zid
+block.crystalline-stone-wall.name = Zid Kristalinske Stene
+block.red-ice-wall.name = Zid Crvenog Leda
+block.red-stone-wall.name = Zid Crvene Stene
+block.red-diamond-wall.name = Crveni Dijamanstki Zid
+block.redweed.name = Crvena Trava
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Žuti Koral
+block.carbon-boulder.name = Ugljeni�ni Kamen
+block.ferric-boulder.name = Železni Kamen
+block.beryllic-boulder.name = Berilijumski Kamen
+block.yellow-stone-boulder.name = Kamen Žute Stene
+block.arkyic-boulder.name = Lu�arni Kamen
+block.crystal-cluster.name = Skup Kristala
+block.vibrant-crystal-cluster.name = Vibrantni Skup Kristala
+block.crystal-blocks.name = Kristalni Blokovi
+block.crystal-orbs.name = Kristalne Kugle
+block.crystalline-boulder.name = Kristalinski Kamen
+block.red-ice-boulder.name = Kamen Crvenog Leda
+block.rhyolite-boulder.name = Riolitni Kamen
+block.red-stone-boulder.name = Kamen Crvene Stene
+block.graphitic-wall.name = Grafitni Zid
+block.silicon-arc-furnace.name = Elektrostati�na Silikonska Peć
+block.electrolyzer.name = Elektrolizator
+block.atmospheric-concentrator.name = Atmosferni Koncentrator
+block.oxidation-chamber.name = Oksidaciona Komora
+block.electric-heater.name = Elektri�na Grejalica
+block.slag-heater.name = Å ljakna Grejalica
+block.phase-heater.name = Fazna Grejalica
+block.heat-redirector.name = Preusmeriva� Toplote
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Grejni Ruter
+block.slag-incinerator.name = Å ljakna Spalionica
+block.carbide-crucible.name = Karbidna Topionica
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Impulsna Topionica
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Toplotni Reaktor
+block.beryllium-wall.name = Berilijumski Zid
+block.beryllium-wall-large.name = Veliki Berilijumski Zid
+block.tungsten-wall.name = Volframski Zid
+block.tungsten-wall-large.name = Veliki Volframski Zid
+block.blast-door.name = ÄŒvrsta Vrata
+block.carbide-wall.name = Karbidni Zid
+block.carbide-wall-large.name = Veliki Karbidni Zid
+block.reinforced-surge-wall.name = Armirani Impulsni Zid
+block.reinforced-surge-wall-large.name = Veliki Armirani Impulsni Zid
+block.shielded-wall.name = Å titni Zid
+block.radar.name = Radar
+block.build-tower.name = Toranj Gradnje
+block.regen-projector.name = Projektor Regeneracije
+block.shockwave-tower.name = Toranj Praska
+block.shield-projector.name = Projektor Å tita
+block.large-shield-projector.name = Veliki Projektor Å tita
+block.armored-duct.name = Oklopljeni Kanal
+block.overflow-duct.name = Prelivni Kanal
+block.underflow-duct.name = Podlivni Kanal
+block.duct-unloader.name = Kanalni Praznilac
+block.surge-conveyor.name = Impulsna Traka
+block.surge-router.name = Impulsni Ruter
+block.unit-cargo-loader.name = Utovariva� Tovarnih Jedinica
+block.unit-cargo-unload-point.name = Tovarna Istovarna Ta�ka
+block.reinforced-pump.name = Armirana Pumpa
+block.reinforced-conduit.name = Armirana Cev
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Armirana Mostna Cev
+block.reinforced-liquid-router.name = Armirani Te�ni Ruter
+block.reinforced-liquid-container.name = Armirani Te�ni Rezervoar
+block.reinforced-liquid-tank.name = Armirani Te�ni Tanker
+block.beam-node.name = Snopna Dioda
+block.beam-tower.name = Snopni Toranj
+block.beam-link.name = Snopni Link
+block.turbine-condenser.name = Turbinski Kondezator
+block.chemical-combustion-chamber.name = Elektrana Hemijskog Sagorevanja
+block.pyrolysis-generator.name = Pirolizna Elektrana
+block.vent-condenser.name = Gejzirni Kondezator
+block.cliff-crusher.name = Planinolom
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plazma Bušilica
+block.large-plasma-bore.name = Velika Plazma Bušilica
+block.impact-drill.name = Udarna Drobilica
+block.eruption-drill.name = Eruptivna Drobilica
+block.core-bastion.name = Jezgro: Bastilja
+block.core-citadel.name = Jezgro: Citadela
+block.core-acropolis.name = Jezgro: Veliki Grad
+block.reinforced-container.name = Armirani Kontejner
+block.reinforced-vault.name = Armirani Trezor
+block.breach.name = Proboj
+block.sublimate.name = Sublimat
+block.titan.name = Titan
+block.disperse.name = Raspršiva�
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Refabrikator Tenkova
+block.mech-refabricator.name = Refabrikator Me�ana
+block.ship-refabricator.name = Refabrikator Brodova
+block.tank-assembler.name = Monter Tenkova
+block.ship-assembler.name = Monter Brodova
+block.mech-assembler.name = Monter Me�ana
+block.reinforced-payload-conveyor.name = Armirana Tovarna Traka
+block.reinforced-payload-router.name = Armirani Tovarni Ruter
+block.payload-mass-driver.name = Tovarni Akcelerator
+block.small-deconstructor.name = Mali Razlaga�
+block.canvas.name = Kanvas
+block.world-processor.name = Svetovni Procesor
+block.world-cell.name = Svetovna Ćelija
+block.tank-fabricator.name = Fabrikator Tenkova
+block.mech-fabricator.name = Fabrikator Brodova
+block.ship-fabricator.name = Fabrikator Me�ana
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Toranj Jedini�nih Popravki
+block.diffuse.name = Difuzija
+block.basic-assembler-module.name = Prosti Proizvodni Modul
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Fluksni Reaktor
+block.neoplasia-reactor.name = Neoplasia Reaktor
+
+block.switch.name = Prekida�
+block.micro-processor.name = Mikro Procesor
+block.logic-processor.name = Logi�ki Procesor
+block.hyper-processor.name = Hiper Procesor
+block.logic-display.name = Logi�ki Displej
+block.large-logic-display.name = Veliki Logi�ki Displej
+block.memory-cell.name = Memorijska Ćelija
+block.memory-bank.name = Memorijska Banka
+team.malis.name = Baštovan
+team.crux.name = Srž
+team.sharded.name = Skrhani
+team.derelict.name = Zaba�en
+team.green.name = zeleni
+team.blue.name = plavi
+
+#don't mind this mess; i got college and am not really wanting to mess up translation progress trough automatic bundle updates
+
+hint.skip = Dalje
+hint.desktopMove = Koristi [accent][[WASD][] da bi se kretao.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Levi-klik][] da bi pucao.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = Da se stvoriš kao letelica, pritisni [accent][[V][].
+hint.respawn.mobile = Promenio si kontrolu u jedinicu/građevinu.  Da se stvoriš kao letelica, [accent]pritisni avatar u gornjem levom uglu.[]
+hint.desktopPause = Pritisni [accent][[Space][] da pauziraš, i posle nastaviš igru.
+hint.breaking = [accent]Desni-klik[] i vuci da bi razrušio blokove.
+hint.breaking.mobile = Aktiviraj \ue817 [accent]�ekić[] u donjem desnom uglu i pritiskaj blokove ra rušenje.\n\nDrži prst za trenutak i vuci ga za rušenje u prostoru.
+hint.blockInfo = Da bi video informacije o bloku [accent]meniju gradnje[], pritom izaberite [accent][[?][] dugme desno.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Koristi \ue875 [accent]Izu�i[] dugme da bi izu�io nove tehnologije.
+hint.research.mobile = Koristi \ue875 [accent]Izu�i[] dugme u \ue88c [accent]Meniju[] da bi izu�io nove tehnologije.
+hint.unitControl = Drži [accent][[L-ctrl][] i [accent]klikni[] da bi kontrolisao prijateljsku jedinicu ili platformu.
+hint.unitControl.mobile = [accent][[Pritisni-dva-puta][] da bi kontrolisao prijateljsku jedinicu ili platformu.
+hint.unitSelectControl = Da bi kontrolisao jedinice, uđi u [accent]komandni mod[] pomoću držanja [accent]L-shift.[]\nTokom komandnog moda, drži klik i vuci da bi izabrao jedinice. [accent]Desni-klik[] na lokaciju ili metu da bi komandovao jedinice tamo.
+hint.unitSelectControl.mobile = Da bi kontrolisao jedinice, uđi u [accent]komandni mod[] pomoću pritiskanja [accent]komanda[] dugmeta u donjem levom uglu.\nTokom komadnog moda, dugo pritisni i prevuci da bi izabrao jedinice. Pritisni na lokaciju ili metu da bi komandovao jedinice tamo.
+hint.launch = Jednom kada je dovoljno resursa skupljeno, možeš [accent]Lansirati[] tako što bi izabrao obljižnji sektor iz \ue827 [accent]Mape[] u donjem desnom uglu.
+hint.launch.mobile = Jednom kada je dovoljno resursa skupljeno, možeš [accent]Lansirati[] tako što bi izabrao obljižnji sektor iz \ue827 [accent]Mape[] u \ue88c [accent]Meniju[].
+hint.schematicSelect = Drži [accent][[F][] i vuci da bi izabrao blokove da kopiraš i postaviš.\n\n[accent][[Srednji Klick][] Da iskopiraš samo jedan tip blokova.
+hint.rebuildSelect = Drži [accent][[B][] i vuci da bi izabrao planove izabranih blokova.\nOvo će automatski ponovo da ih sagradi.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Drži [accent][[L-Ctrl][] dok vu�eš trake da automatski stvoriš put.
+hint.conveyorPathfind.mobile = Osposobi \ue844 [accent]dijagonalni mod[] dok vu�eš trake da automatski stvoriš put.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Pritisni [accent][[[] da bi preuzeo male blokove ili jedinice.
+hint.payloadPickup.mobile = [accent]Pritisni i drži[] mali blok ili jedinicu da bi ga preuzeo.
+hint.payloadDrop = Pritisni [accent]][] da bi spustio tovar.
+hint.payloadDrop.mobile = [accent]Pritisni i drži[] prazno mesto da bi spustio tovar tamo.
+hint.waveFire = [accent]Talas[] platforma sa vodom kao municiom automatski gasi vatru.
+hint.generator = \uf879 [accent]Generatori Sagorevanja[] sagorevaju ugalj i proizvode energiju.\n\nDomet prenosa energije se može povećati preko \uf87f [accent]Strujnog Čvora[].
+hint.guardian = [accent]Čuvari[] kao jedinice su oklopljenje. Slaba municija potput [accent]Bakra[] i [accent]Olovo[] [scarlet]nije efikasan[].\n\nKoristi platforme većeg tijera ili\uf835 [accent]Grafit[] \uf861Duo/\uf859Salvo municiju da bi se rešio �uvara.
+hint.coreUpgrade = Jezgra mogu da se unaprede [accent]postavljanjem većih jezgara preko njih[].\n\nPostavi [accent]Temelj[] preko [accent]Krhotina[] jezgra. Osigurajte da bude planiran prostor �ist.
+hint.presetLaunch = [accent]Sektori sa ivicom[] sive boje, kao [accent]Zamrznutna Šuma[], se mogu lansiradi svuda. Oni ne zahtevaju zauzetu obljižnju teritoriju.\n\n[accent]Numerisani sektori[], potput ovog, su [accent]opcionalni[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = Kada je jezgro skroz puno sa specifi�nim materijalom, svaka dodatna jedinica materijala koja je primljena će biti [accent]spaljena[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nJedinice proizvedene iz njih će se automatski pomeriti tamo.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nJedinice proizvedene iz njih će se automatski pomeriti tamo.
+gz.mine = Pomerite se pored \uf8c4 [accent]bakarne rude[] na zemlji i klikni ga da bi zapo�eo iskopavanje.
+gz.mine.mobile = Pomerite se pored \uf8c4 [accent]bakarne rude[] na zemlji i pritisni ga da bi zapo�eo iskopavanje.
+gz.research = Otvorite \ue875 drvo tehnologija.Izu�ite \uf870 [accent]Mehani�ku Drobilicu[], pritom ga izaberi iz menija u donjem desnom uglu.\nKliknite ga na nalazište bakra da bi ga postavio.
+gz.research.mobile = Otvorite \ue875 drvo tehnologija.Izu�ite \uf870 [accent]Mehani�ku Drobilicu[], pritom ga izaberi iz menija u donjem desnom uglu.\nPritisnite nalazište bakra da bi ga postavio..\n\nPritisnite \ue800 [accent]checkmark[] u donjem desnom uglu da potvrdite.
+gz.conveyors = Izu�ite i postavite \uf896 [accent]pokretne trake[] da bi ste pomerili iskopane resurse\niz drobilice u jezgro.\n\nKliknite i držite da bi ste postavili više traka.\n[accent]Scroll[] da rotirate.
+gz.conveyors.mobile = Izu�ite i postavite \uf896 [accent]pokretne trake[] da bi ste pomerili iskopane resurse\niz drobilice u jezgro.\n\nDržite vaš prst na sekundu i vucite da bi ste postavili više traka.
+gz.drills = Proširite rudarsku operaciju.\nPostavite dodatne mehani�ke drobilice.\nIskopajte 100 bakra.
+gz.lead = \uf837 [accent]Olovo[] je takođe �esto korišćen resurs.\nPostavite drobilice za iskopavanje olova.
+gz.moveup = \ue804 Krenite dalje za dodatne zadatke.
+gz.turrets = Izu�ite i postavite 2 \uf861 [accent]Duo[] platforme za odbranu jezgra.\nDuo platforme zahtevaju \uf838 [accent]municiju[] preko pokretnih traka.
+gz.duoammo = Snabdevajte Duo platforma sa [accent]bakrom[] pomoću pokretnih traka.
+gz.walls = [accent]Zidovi[] mogu da spre�e da se šteta nanese na građevine.\nPostavite \uf8ae [accent]bakarne zidove[] preko platformi.
+gz.defend = Neprijatelj stiže, pripremite se za odbranu.
+gz.aa = Teško se možete rešiti lebdećih jedinica sa standarnim platformama.\n\uf860 [accent]Razbaci[] platforme su savršena protiv-vazdušna odbrana, ali zahtevaju \uf837 [accent]olovo[] kao municiju.
+gz.scatterammo = Snabdevajte Razbaci sa [accent]olovom[] pomoću pokretnih traka.
+gz.supplyturret = [accent]Snabdevanje Platforme
+gz.zone1 = Ovo je neprijateljska zona.
+gz.zone2 = Sve sagrađeno u njoj će biti uništeno kada se zapo�ne talas.
+gz.zone3 = Talas će uskoro zapo�eti.\nSpremi se.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Klikni da bi iskopao \uf748 [accent]berilijum[] iz zidova.\nKoristi [accent][[WASD] za kretanje.
+onset.mine.mobile = Pritisni da bi iskopao \uf748 [accent]berilijum[] iz zidova.
+onset.research = Otvori \ue875 drvo tehnologija.\nIzu�i, i pritom postavi \uf73e [accent]Turbinski Kondezator[] na ventil.\nOvo će da proizvodi [accent]energiju[].
+onset.bore = Izu�i i postavi \uf741 [accent]plazma bušilicu[].\nOvo će automatski da iskopava rude sa zida.
+onset.power = Da bi snabdevao plazma bušilicu [accent]energijom[], izu�ite i postavite \uf73d [accent]snopnu diodu[].\nPovežite turbinski kondezator i plazma bušilicu.
+onset.ducts = Izu�ite i postavite \uf799 [accent]kanale[] da bi ste pomerili iskopane resurse iz plazma bušilice u jezgro.\nKliknite i držite da bi ste postavili više kanala.\n[accent]Scroll[] da rotirate.
+onset.ducts.mobile = Izu�ite i postavite \uf799 [accent]kanale[] da bi ste pomerili iskopane resurse iz plazma bušilice u jezgro.\n\nDržite vaš prst na sekundu i vucite da bi ste postavili više kanala.
+onset.moremine = Proširite rudarsku operaciju.\nPostavite dodatne Plazma Bušilice i koristite snopne diode i kanale kao potporu.\nIskopajte 200 berilijuma.
+onset.graphite = Složenije građevine zahtevaju \uf835 [accent]grafit[].\nPostavite plazma bušilice da bi ste iskopali grafit.
+onset.research2 = Zapo�nite izu�avanje [accent]fabrika[].\nIzu�ite \uf74d [accent]planinolome[] i \uf779 [accent]elektrolu�nu silicijumsku pećnicu[].
+onset.arcfurnace = Elektrolu�na pećnica zahteva \uf834 [accent]pesak[] i \uf835 [accent]grafit[] da bi proizveo \uf82f [accent]silicijum[].\nIsto tako je potrebna [accent]Energija[].
+onset.crusher = Koristite \uf74d [accent]planilonome[] da kopate pesak.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Proizvedi jedinicu.\nKoristite "?" da bi ste videli Å¡ta fabrika zahteva.
+onset.turrets = Jedinice su efikasne, ali [accent]platforme[] imaju veći odbrambeni potencijal ako su efikasno postavljene.\nPostavite \uf6eb [accent]Proboj[] platformu.\nPlatforme zahtevaju \uf748 [accent]municiju[].
+onset.turretammo = Snabdevajte platformu sa [accent]berilijumskom municijom.[]
+onset.walls = [accent]Zidovi[] mogu da spre�e da se šteta nanese na građevine.\nPostavite nekoliko \uf6ee [accent]berilijumskih zidova[] oko platformi.
+onset.enemies = Neprijatelj dolazi, spremite se.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = Nova jezgra se mogu postaviti na [accent]poljima jezgra[].\nNova jezgra funkcionišu kao prednje baze i dele resursni invetar sa ostalim jezgrima.\nPostavi \uf725 jezgro.
+onset.detect = Neprijatelj će te primetiti za 2 minuta.\nPostavite odbranu, rudu i proizvodnju.
+onset.commandmode = Drži [accent]shift[] da bi ušao u [accent]komandni mod[].\n[accent]Levi-klik i vuci[] da izabereš jedinice.\n[accent]Desni-klik[] da bi naredio jedinicama da se kreću ili napadaju.
+onset.commandmode.mobile = Pritisni [accent]komandno dugme[] da bi ušao [accent]komandni mod[].\nDrži prstom, pritom [accent]vuci[] da izabereš jedinice.\n[accent]Pritisni[] da bi naredio jedinicama da se kreću ili napadaju.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = Moraš preuzeti nešto volframa da bi proizvodio jedinice.
+split.build = Jedinice moraju da se prenesu sa jedne strane zida na drugu.\nPostavite dva [accent]Tovarna Akceleratora[], jedan sa svake strane zida.\nDa bi se stvorila vezi izaberi jedan akcelerator, i onda izaberi drugi.
+split.container = Kao sa kontejnerom, jedinice takođe mogu da se transportuju preko [accent]Tovarnog Akceleratora[].\nPostavi fabrikator jedinica pored akceleratora da bi ga natovario, i pritom ga pošalji preko zida da bi napao neprijateljsku bazu.
+
+item.copper.description = Koristi se za sve građevine.
+item.copper.details = Bakar. Nenormalno prisutan na Serupulu, strukturno je slab ako nije oja�an.
+item.lead.description = Koristi se za transport te�nosti i elektroniku.
+item.lead.details = Gusto. Inertno. Veoma primenljivo za baterije.\nNapomena: verovatno otrovno po biološke oblike života. Nije kao da ih je ovde mnogo ostalo.
+item.metaglass.description = Koristi se za transport i skladište te�nosti.
+item.graphite.description = Koristi se kao elektri�na komponenta i municija za topove.
+item.sand.description = Koristan za preradu drugih materijala.
+item.coal.description = Koristi se za gorivo i preradu drugih materijala.
+item.coal.details = Izgleda da je biološkog porekla, fosilizovan davno pre Zasejavanja...
+item.titanium.description = Koristi se za transport te�nosti, izgradnju struktura, topova i jedinica.
+item.thorium.description = Koristi se kao izdržljiv građevinski materijal, municija i nuklearno gorivo.
+item.scrap.description = Pretapa i melje se za preradu u druge materijale.
+item.scrap.details = Ostaci davnašnjih jedinica i struktura.
+item.silicon.description = Koristi se za solarne plo�e, topove, jedinice i naprednu elektroniku. Od silicijuma se pravi dirigovana municija.
+item.plastanium.description = Koristi se za napredne jedinice, izloaciju i fragmentacionu municiju.
+item.phase-fabric.description = Koristi se za naprednu elektroniku i samopopravljajuće strukture.
+item.surge-alloy.description = Koristi se kao municija i reaktivna odbrana.
+item.spore-pod.description = Prerađuje se u naftu ili plastiku, može se spaljivati kao gorivo.
+item.spore-pod.details = Spore. Verovatno sinteti�ki obliki života. Emituje gasove otrovne po ostali život. Ekstremno invazivne. Visoko zapaljive u određenim uslovima.
+item.blast-compound.description = Koristi se za bombe i eksplozivnu municiju.
+item.pyratite.description = Koristi se kao zapaljiva municija i odli�no gorivo za elektrane.
+item.beryllium.description = Korišćen u raznim građevinama i municiji na Erekir-u.
+item.tungsten.description = Korišćena u drobilicama, oklopu i kao municija. Potrebna za gradnju naprednijih građevina.
+item.oxide.description = Korišćen kao preusmerava� toplote i elektri�ni izolator.
+item.carbide.description = Korišćena u naprednim građevinama, većim jedinicama i municiji.
+
+liquid.water.description = Koristi se za hlađenje mašina i preradu otpada.
+liquid.slag.description = Može se preraditi u Razdvaja�ima u druge resurse, može se sipati na neprijatelje kao oružje.
+liquid.oil.description = Koristi se za proizvodnju naprednih materijala. Može se koristi kao poja�iva� vatre ako se sipa na neprijatelja dok gori.
+liquid.cryofluid.description = Rashladna te�nost za fabrike, reaktore i topove.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Korišćen kao oksidaciono sredstvo za proizvodnju materijala, i kao gorivo. Srednje eksplozivan.
+liquid.hydrogen.description = Korišćen za iskopavanje ruda, proizvodnju jedinica i za popravke. Zapaljiv.
+liquid.cyanogen.description = Korišćena za izgradnju većih jedinica, kao municija i za razne reakcije u naprednim građevinama. Izuzetno Zapaljiv.
+liquid.nitrogen.description = Korišćen za iskopavanje ruda, proizvodnju gasova i proizvodnju jedinica. Inertan.
+liquid.neoplasm.description = Opasni biološki njusproizvod Neoplasia reaktora. Brzo se širi na svaki povezani blok koji sadrži vodu koju dotakne, oštećuju ih u procesu. Viskozna.
+liquid.neoplasm.details = Neoplazma. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+
+block.derelict = [lightgray]Zaba�en
+block.armored-conveyor.description = Usmerava materijale ispred. Nema prijema sa bokova.
+block.illuminator.description = Osvetljava okolinu.
+block.message.description = Skladišti poruku radi komunikacije među saveznicima.
+block.reinforced-message.description = Skladišti poruku radi komunikacije među saveznicima.
+block.world-message.description = Blok poruke koji je korišćen za pravljenje mapa. Ne može da se uništi.
+block.graphite-press.description = Pritiska ugalj, pretvarajući ga u grafit.
+block.multi-press.description = Pritiska ugalj, pretvarajući ga u grafit. Zahteva vodu za hlađenje.
+block.silicon-smelter.description = Rafinira silicijum iz peska i uglja.
+block.kiln.description = Topi pesak i olovo u meta-staklo.
+block.plastanium-compressor.description = Proizvodi plastanijum iz nafte i titanijuma.
+block.phase-weaver.description = Synthesizes phase fabric from thorium and sand.
+block.surge-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy.
+block.cryofluid-mixer.description = Meša vodu sa finom titanijumskom prašinom u kriote�nost.
+block.blast-mixer.description = Proizvodi eksplozivnu smešu iz piratita i kapsula spora.
+block.pyratite-mixer.description = Meša ugalj, pesak i olovo u piratit.
+block.melter.description = Topi opiljke u Å¡ljaku.
+block.separator.description = Separates slag into its mineral components.
+block.spore-press.description = Pritiska kapsule spora, pretvarajući je u naftu.
+block.pulverizer.description = Drobi opiljke u fini pesak.
+block.coal-centrifuge.description = Transformiše naftu u ugalj.
+block.incinerator.description = Spaljuje svaki materijal ili te�nost koju primi.
+block.power-void.description = Negira svu povezanu energiju. Isklju�ivo za Sandbox mod.
+block.power-source.description = Bezkrajno ispušta energiju. Isklju�ivo za Sandbox mod.
+block.item-source.description = Bezkrajno ispušta materijale. Isklju�ivo za Sandbox mod.
+block.item-void.description = Uništava svaki uba�eni materijal. Isklju�ivo za Sandbox mod.
+block.liquid-source.description = Bezkrajno ispušta te�nosti. Isklju�ivo za Sandbox mod.
+block.liquid-void.description = Uništava svaku uba�enu te�nost. Isklju�ivo za Sandbox mod.
+block.payload-source.description = Bezkrajno ispušta tovar. Isklju�ivo za Sandbox mod.
+block.payload-void.description = Uništava sav uba�en tovar. Isklju�ivo za Sandbox mod.
+block.copper-wall.description = Štiti građevine od neprijateljskih projektila.
+block.copper-wall-large.description = Štiti građevine od neprijateljskih projektila.
+block.titanium-wall.description = Štiti građevine od neprijateljskih projektila.
+block.titanium-wall-large.description = Štiti građevine od neprijateljskih projektila.
+block.plastanium-wall.description = Štiti građevine od neprijateljskih projektila. Upija lasere i elektri�ne udare. Ne dopušta automatska povezivanja energije.
+block.plastanium-wall-large.description = Štiti građevine od neprijateljskih projektila. Upija lasere i elektri�ne udare. Ne dopušta automatska povezivanja energije.
+block.thorium-wall.description = Štiti građevine od neprijateljskih projektila.
+block.thorium-wall-large.description = Štiti građevine od neprijateljskih projektila.
+block.phase-wall.description = Štiti građevine od neprijateljskih projektila, odbijajući većinu metaka pri udaru.
+block.phase-wall-large.description = Štiti građevine od neprijateljskih projektila, odbijajući većinu metaka pri udaru.
+block.surge-wall.description = Štiti građevine od neprijateljskih projektila, povremeno uzrokavajući elektri�ne udare pri kontaktu.
+block.surge-wall-large.description = Štiti građevine od neprijateljskih projektila, povremeno uzrokavajući elektri�ne udare pri kontaktu.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = Zid koji se može otvarati i zatvarati.
+block.door-large.description = Zid koji se može otvarati i zatvarati.
+block.mender.description = Povremeno popravlja blokove u okolini.\nMože koristiti silicijum da poveća domet i efikasnost.
+block.mend-projector.description = Popravlja blokove u okolini.\nMože koristiti faznu tkaninu da poveća domet i efikasnost.
+block.overdrive-projector.description = Ubrzava okolne građevine.\nMože koristiti faznu tkaninu da poveća domet i efikasnost.
+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 increases shield size.
+block.shock-mine.description = Oslobađa elektri�ne udare pri kontaktu sa neprijateljskim jedinicama.
+block.conveyor.description = Usmerava materijale ispred.
+block.titanium-conveyor.description = Usmerava materijale ispredd. Brži od standardnog transportera.
+block.plastanium-conveyor.description = Usmerava materijale ispred u ba�vama. Prima materijale od pozadi, I izbacuje na tri strane spreda. Zahteva više ulaznih i izlaznih ta�aka za maksimalni protok.
+block.junction.description = Acts as a bridge for two crossing conveyor belts.
+block.bridge-conveyor.description = Prebacuje materijale preko terena i građevina.
+block.phase-conveyor.description = Momentalno prebacuje materijale preko terena i građevina. Veći domet nego premostna traka, ali zahteva energiju.
+block.sorter.description = Ako je prijemni materijal slaže sa izabranim, ide napred. U suprotnosti, materijal ide sa strane.
+block.inverted-sorter.description = Kao standardni sorter, ali izabrani materijali idu sa strane.
+block.router.description = Distribuiše primljene materijale podjednako u 3 pravca.
+block.router.details = Neophodno zlo. Predlaže se da se ne postavlja pored proizvodnog prijema, pošto će nastati zastoj od proizvoda.
+block.distributor.description = Distribuiše primljene materijale podjednako u 7 pravaca.
+block.overflow-gate.description = Samo otpušta materijale sa strane u slu�aju da je prednja strana nepropusna.
+block.underflow-gate.description = Suprostnost nadlivne kapije. Otpušta materijale napred samo kad su obe strane nepropusne.
+block.mass-driver.description = Visoko-dometna tranportna građevina za materijale. Skuplja ba�ve materijala i ispaljuje ih na druge akceleratore.
+block.mechanical-pump.description = Pumpa te�nosti. Ne zahteva energiju.
+block.rotary-pump.description = Pumpa te�nosti. Zahteva energiju.
+block.impulse-pump.description = Pumpa te�nosti.
+block.conduit.description = Usmerava te�nosti ka zadatom pravcu. Korišćen sa drugim cevima i pumpama.
+block.pulse-conduit.description = Usmerava te�nosti ka zadatom pravcu. Ima veći kapacitet i brže prenosi od standardnih cevi.
+block.plated-conduit.description = Usmerava te�nosti ka zadatom pravcu. Does not accept input from the sides. Ne curi.
+block.liquid-router.description = Prima te�nosti iz jednog pravca i otpušta podjednako u 3 pravca. Takođe može da skladišti nešto te�nosti.
+block.liquid-container.description = Skladišti dobru koli�inu te�nosti. Sli�no te�nom ruteru, otpušta u svaki pravac.
+block.liquid-tank.description = Skladišti veliku koli�inu te�nosti. Sli�no te�nom ruteru, otpušta u svaki pravac.
+block.liquid-junction.description = Acts as a bridge for two crossing conduits.
+block.bridge-conduit.description = Prebacuje te�nosti preko terena ili građevina.
+block.phase-conduit.description = Momentalno prebacuje te�nosti preko terena i građevina. Veći domet nego premostna cev, ali zahteva energiju.
+block.power-node.description = Distribuiše energiju sa drugim �vorovima. Čvor takođe šalje i prima energiju sa susednim blokovima.
+block.power-node-large.description = Napredni �vor sa većim dometom.
+block.surge-tower.description = Dugo-dometni �vor sa samo nekoliko dostupnih povezivanja.
+block.diode.description = Moves battery power in one direction, but only if the other side has less power stored.
+block.battery.description = Skladišti višak energije. Otpušta energiju kad je deficit.
+block.battery-large.description = Skladišti višak energije. Otpušta energiju kad je deficit. Veći kapacitet od standardne baterije.
+block.combustion-generator.description = Stvara energiju prilikom sagorevanja zapaljivih materijala, potput uglja.
+block.thermal-generator.description = Stvara energiju kada se nalazim u toploj sredini.
+block.steam-generator.description = Stvara energiju prilikom sagorevanja zapaljivih materijala i sa tim vode u paru.
+block.differential-generator.description = Stvara velku koli�inu energije. Koristi temperaturnu razliku između kriote�nosti i zapaljenog piratita.
+block.rtg-generator.description = Koristi toplotu pri polakom razlaganju radioaktivnih elemenata za proizvodnju energije.
+block.solar-panel.description = Proizvodi malu koli�inu energije od sunca.
+block.solar-panel-large.description = Proizvodi malu koli�inu energije od sunca, ali više od standardnog panela.
+block.thorium-reactor.description = Generates significant amounts of power from thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied.
+block.impact-reactor.description = Creates massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
+block.mechanical-drill.description = Kada je postavljeno na rudi, polako i trajno otpušta materijale. Može samo iskopavati jednostavne resurse.
+block.pneumatic-drill.description = Poboljšana drobilica, može iskopavati titanijm. Otkopava brže nego mehani�ka drobilica.
+block.laser-drill.description = Omugućava još brže iskopavanje pomoću tehnologije lasera, ali zahteva energiju. Može iskopavati torijum.
+block.blast-drill.description = Najefikasnija drobilica. Zahteva veliku koli�inu energije.
+block.water-extractor.description = Prikuplja podzemne vode. Korišćeno na mestima bez nadzemne vode.
+block.cultivator.description = Prikuplja malu koli�inu atmosfernih kultura spora u kapsule spora.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
+block.oil-extractor.description = Uses large amounts of power, sand and water to drill for oil.
+block.core-shard.description = Jezgro baze. Jednom uništeno gubi se sector.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
+block.core-foundation.description = Jezgro baze. Dobro oklopljeno. Skladišti više resursa nego Krhotina.
+block.core-foundation.details = The second iteration.
+block.core-nucleus.description = Jezgro baze. Veoma dobro oklopljeno. Skladišti veliku koli�inu resursa.
+block.core-nucleus.details = The third and final iteration.
+block.vault.description = Skladišti veliku koli�inu od svake vrste materijala. Contents can be retrieved with an unloader.
+block.container.description = Skladišti malu koli�inu od svake vrste materijala. Contents can be retrieved with an unloader.
+block.unloader.description = Istovaruje određeni materijal iz obližnih blokova.
+block.launch-pad.description = Lansira ba�ve resursa u izabrani sektor.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = Ispaljuje metke naizmeni�no na neprijatelje.
+block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft.
+block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
+block.hail.description = Fires small shells at ground enemies over long distances.
+block.wave.description = Fires streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.lancer.description = Charges and fires powerful beams of energy at ground targets.
+block.arc.description = Fires arcs of electricity at ground targets.
+block.swarmer.description = Fires homing missiles at enemies.
+block.salvo.description = Ispaljuje brze rafale na neprijatelje.
+block.fuse.description = Fires three close-range piercing blasts at nearby enemies.
+block.ripple.description = Shoots clusters of shells at ground enemies over long distances.
+block.cyclone.description = Fires explosive clumps of flak at nearby enemies.
+block.spectre.description = Fires large armor-piercing bullets at air and ground targets.
+block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
+block.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
+block.repair-point.description = Stalno popravlja najbližu oštećenu jedinicu u okolini.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Rafiniše silicijum iz peska i uglja, korišteći piratit kao dodatni izvor toplote. Efikasnija u toploj sredini.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Ubrzava rad okolnih građevina. Za rad zahteva silicijum i faznu tkaninu.
+block.payload-conveyor.description = Usmerava tovar, potput jedinica iz fabrika.
+block.payload-router.description = Deli tovarni skup u 3 pravca.
+block.ground-factory.description = Proizvodi zemne jedinice. Proizvod se može odmah koristiti, ili pomeren u rekonstruktore za doradu.
+block.air-factory.description = Proizvodi vazdušne jedinice. Proizvod se može odmah koristiti, ili pomeren u rekonstruktore za doradu.
+block.naval-factory.description = Proizvodi morske jedinice. Proizvod se može odmah koristiti, ili pomeren u rekonstruktore za doradu.
+block.additive-reconstructor.description = Dorađuje uba�ene jedinice u drugi tier.
+block.multiplicative-reconstructor.description = Dorađuje uba�ene jedinice u treći tier.
+block.exponential-reconstructor.description = Dorađuje uba�ene jedinice u �etvrti tier.
+block.tetrative-reconstructor.description = Dorađuje uba�ene jedinice u peti i kona�ni tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Jezgro baze. Oklopljeno. Jednom uništeno gubi se sektor.
+block.core-citadel.description = Jezgro baze. Izuzetno dobro oklopljeno. Skladišti više resursa od Bastilje jezgra.
+block.core-acropolis.description = Jezgro baze. Izvrsno dobro oklopljeno. Skladišti više resursa od Citadele jezgra.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Ispaljuje rafale metaka u Å¡irokom uglu. Gura neprijateljske jedinice nazad.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Rafiniše silicijum iz peska i grafita.
+block.oxidation-chamber.description = Pretvara berilijum i ozon u kiseonik. Ispušta toplotu kao njusproizvod.
+block.electric-heater.description = Greje usmerene blokove. Zahteva veliku koli�inu energije.
+block.slag-heater.description = Greje usmerene blokove. Zahteva Å¡ljaku.
+block.phase-heater.description = Greje usmerene blokove. Zahteva faznu tkaninu.
+block.heat-redirector.description = Preusmerava sakupljenu toplotu u druge blokove.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Deli vodu na gasove vodonik i ozon.
+block.atmospheric-concentrator.description = Koncentriše azot iz atmosfere. Zahteva toplotu.
+block.surge-crucible.description = Formira impulsnu rudu iz Å¡ljake i silicijuma. Zahteva toplotu.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Zahteva toplotu.
+block.carbide-crucible.description = Pretvara volfram i grafit u karbid. Zahteva toplotu.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Zahteva toplotu.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Kondezuje ventilacione gasove u vodu. Zahteva energiju.
+block.plasma-bore.description = Kada je postavljeno u smeru zidne rude, beskona�no ispušta materijale. Zahteva malo energije.
+block.large-plasma-bore.description = Velika plazma bušilica. Može iskopavati volfram i torium. Zahteva vodonik i energiju.
+block.cliff-crusher.description = Beskona�no ispušta pesak lomeći stene. Zahteva energiju. Efikasnost zavisi od vrste zida.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Kada je postavljeno na rudi, beskona�no ispušta materijale u ba�vama. Zahteva energiju i vodu.
+block.eruption-drill.description = Poboljšana udarna drobilica. Može iskopavati torijum. Zahteva vodonik.
+block.reinforced-conduit.description = Usmerava te�nosti napred. Ne prihvata unos sa strane od blokova koje nisu cevi.
+block.reinforced-liquid-router.description = Jednako distribuiše te�nosti u svim pravcima.
+block.reinforced-liquid-tank.description = Skladišti veliku koli�inu te�nosti.
+block.reinforced-liquid-container.description = Skladišti dobru koli�inu te�nosti.
+block.reinforced-bridge-conduit.description = Prenosi te�nosti preko terena i građevina.
+block.reinforced-pump.description = Pumpa te�nosti. Zahteva vodonik.
+block.beryllium-wall.description = Štiti građevine od neprijateljskih projektila.
+block.beryllium-wall-large.description = Štiti građevine od neprijateljskih projektila.
+block.tungsten-wall.description = Štiti građevine od neprijateljskih projektila.
+block.tungsten-wall-large.description = Štiti građevine od neprijateljskih projektila.
+block.carbide-wall.description = Štiti građevine od neprijateljskih projektila.
+block.carbide-wall-large.description = Štiti građevine od neprijateljskih projektila.
+block.reinforced-surge-wall.description = Štiti građevine od neprijateljskih projektila, povremeno uzrokavajući elektri�ne udare pri kontaktu.
+block.reinforced-surge-wall-large.description = Štiti građevine od neprijateljskih projektila, povremeno uzrokavajući elektri�ne udare pri kontaktu.
+block.shielded-wall.description = Štiti građevine od neprijateljskih projektila. Stvara štit koji može primiti većinu metaka kada ima dovoljno energije. Provodi energiju.
+block.blast-door.description = Zid koji se otvara kada su savezni�ke jedinice u blizini. Nemoguće je upravljati je ru�no.
+block.duct.description = Usmerava materijale ispred.
+block.armored-duct.description = Usmerava materijale ispred. Ne prihvata unos sa strane od blokova koji nisu kanali.
+block.duct-router.description = Distribuiše materijale podjednako sa 3 strane. Prihvata materijale samo otpozadi. Može da se podesi kao sorter.
+block.overflow-duct.description = Samo otpušta materijale sa strane u slu�aju da je prednja strana nepropusna.
+block.duct-bridge.description = Prenosi materijale preko terena i građevina.
+block.duct-unloader.description = Istovaruje materijale od bloka iza. Ne može istovarivati iz jezgra.
+block.underflow-duct.description = Suprostnost nadlivnog kanala. Otpušta materijale napred samo kad su obe strane nepropusne.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Usmerava materijale u ba�vama. Može se ubrzati sa energijom. Provodi energiju.
+block.surge-router.description = Distribuiše materijale iz impulsnih traka podjednako sa 3 strane. Može se ubrzati sa energijom. Provodi energiju.
+block.unit-cargo-loader.description = Proizvodi tovarne dronove. Dronovi automatski prenose materijale do Tovarne Istovarne Ta�ke sa slažećim filterom.
+block.unit-cargo-unload-point.description = Služi dronovima za mesto dostave materijala. Prima materijale koji su izabrane preko filtera.
+block.beam-node.description = Prenosi energiju na druge blokove ortogonalno. Skladišti malu koli�inu energije.
+block.beam-tower.description = Prenosi energiju na druge blokove ortogonalno. Skladišti veću koli�inu energije. Dugog dometa.
+block.turbine-condenser.description = Proizvodi energiju kada je na ventilu. Proizvodi malu koli�inu vode.
+block.chemical-combustion-chamber.description = Proizvodi energiju od lu�ara i ozona.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Proizvodi veliku koli�inu energije iz primljene toplote. Zahteva cianogen kao stabilizator. Dobijena energija i potreban cianogen su srazmerni sa koli�inom toplote.\nU slu�aju nedovoljnog cianogena dolazi do ekplozije.
+block.neoplasia-reactor.description = Koristi lu�ar, faznu tkaninu i vodu da proizvede veliku koli�inu energije. Proizvodi toplotu i opasnu neoplazmu kao njusproizvod.\nDolazi do jake eksplozije ako neoplasma se ne ispusti iz reaktora pomoću cevi.
+block.build-tower.description = Automatski gradi uništene građevine i pomaže drugim jedinicama u izgradnji novih.
+block.regen-projector.description = Polako popravlja savezni�ke građevine u kockastom dometu. Zahteva vodonik.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Proizvodi Stell jedinice. Proizvod se može odmah koristiti, ili pomeren u refabrikatore za doradu.
+block.ship-fabricator.description = Proizvodi Elude jedinice. Proizvod se može odmah koristiti, ili pomeren u refabrikatore za doradu.
+block.mech-fabricator.description = Proizvodi Merui jedinice. Proizvod se može odmah koristiti, ili pomeren u refabrikatore za doradu.
+block.tank-assembler.description = Montira veće tenkove iz uba�enih blokova i jedinica. Output tier may be increased by adding modules.
+block.ship-assembler.description = Montira veće tenkove iz uba�enih blokova i jedinica. Output tier may be increased by adding modules.
+block.mech-assembler.description = Montira veće tenkove iz uba�enih blokova i jedinica. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Dorađuje uba�ene tenkovske jedinice u drugi tier.
+block.ship-refabricator.description = Dorađuje uba�ene brodne jedinice u drugi tier.
+block.mech-refabricator.description = Dorađuje uba�ene me�anske jedinice u drugi tier.
+block.prime-refabricator.description = Dorađuje uba�ene jedinice u treći tier.
+block.basic-assembler-module.description = Povećava proizvodni tier kad je postavljen pored granice gradilišta. Zahteva energiju. Može da se koristi za prijem tovara.
+block.small-deconstructor.description = Razgrađuje građevine i jedinice koje uđu unutra. Vraća se 100% cene gradnje.
+block.reinforced-payload-conveyor.description = Usmeruje tovar ispred.
+block.reinforced-payload-router.description = Distribuiše tovar između obljižnjih građevina. Funkcioniše kao sorter ako je podešen filter.
+block.payload-mass-driver.description = Visoko-dometna građevina za transport tovara. Ispaljuje primljeni tovar na povezane tovarne akceleratore.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Popravlja sve jedinice u blizine. Zahteva ozon.
+block.radar.description = Postepeno otkriva teren i neprijateljske jedinice u visokom videokrugu. Zahteva energiju.
+block.shockwave-tower.description = Oštećuje i uništava neprijateljske projektile u dometu. Zahteva cianogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+
+unit.dagger.description = Ispaljuje standardne metke na sve neprijatelje u dometu.
+unit.mace.description = Ispaljuje mlazeve plamena na sve neprijatelje u dometu.
+unit.fortress.description = Ispaljuje dalekometne artiljerijske granate na mete na zemlji.
+unit.scepter.description = Ispaljuje rafale naelektrisanih metaka na sve mete u dometu.
+unit.reign.description = Ispaljuje rafale ogromnih probijajućih metaka na sve mete u dometu.
+unit.nova.description = Ispaljuje lasere koji popravljaju savezni�ke, a oštećuju protivni�ke strukure i jedinice. Može leteti.
+unit.pulsar.description = Ispaljuje munje koji oštećuju neprijatelje, a popravljaju saveznike.
+unit.quasar.description = Ispaljuje probijajuće lasere na sve mete u dometu. Laseri oštećuju neprijatelje, a popravljaju saveznike. Može leteti. Ima energetski štit.
+unit.vela.description = Ispaljuje ogromni konstantni laserski zrak koji popravlja saveznike, a oštećuje i pali neprijatelje. Ima dva popravna zraka. Može leteti.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Može da hoda preko većine terena.
+unit.crawler.description = Dolazi do nepprijatelja i samouništava se, izazivaćuji veliku eksploziju.
+unit.atrax.description = Ispaljuje pregrejanu šljaku na neprijatelje u dometu. Može pregaziti preko većine terena i zgrada.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Ispaljuje standardne metke na zemnim neprijateljima.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Ispaljuje rafal raketa na sve obljižnje neprijatelje.
+unit.antumbra.description = Ispaljuje baraž metaka na sve obljižnje neprijatelje.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatski iskopava bakar i olovo, ostavljajući ga u jezgro.
+unit.poly.description = Automatski ponovo gradi uništene građevine i pomaže ostalim jedinicama u izgradnji.
+unit.mega.description = Automatski popravlja oštećene građevine. Sposobno da prenosi blokove i male zemne jedinice.
+unit.quad.description = Baca velike bombe na zemne mete, popravljajući prijateljske građevine i nanošeći štetu neprijateljima.Sposobno da prenosi zemne jedinice srednje veli�ine.
+unit.oct.description = Štiti obljižnje saveznike sa regenerisajućim štitom. Sposobno da prenosi većinu zemnih jedinica.
+unit.risso.description = Ispaljuje baraž raketa i metaka na sve obljižnje neprijatelje.
+unit.minke.description = ispaljuje granate i metke na obljižnje zemne mete.
+unit.bryde.description = Ispaljuje dugo-dometne artiljerijske granate i rakete na neprijatelje.
+unit.sei.description = Ispaljuje baraž raketa i oklopno-probojnih metaka na neprijatelje.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Gradi balkja jedinice.
+unit.alpha.description = Štiti Krhotina jezgro od neprijatelja. Gradi građevine.
+unit.beta.description = Štiti Fondacija jezgro od neprijatelja. Gradi građevine.
+unit.gamma.description = Štiti Nukleus jezgro od neprijatelja. Gradi građevine.
+unit.retusa.description = Ispaljuje torpede na samonavođenje na obljižnje neprijatelje. Popravljuje savezni�ke jedinice.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Šokira sve neprijateljske jedinice i građevine koje mu uđu u energetsko polje. Popravljuje sve savezni�ke jedinice.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Ispaljuje standardne metke na neprijateljske mete.
+unit.locus.description = Ispaljuje naizmeni�ne metke na neprijateljske mete.
+unit.precept.description = Ispaljuje probojne fragmentacione metke na neprijateljske mete.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Ispaljuje dugo-dometnu artiljeriju na zemne mete. Može preći preko većine terena.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Može preći preko većine terena.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Može preći preko većine terena.
+unit.tecta.description = Ispaljuje plazma rakete na neprijateljske mete. Štiti sebe sa usmerenim štitom. Može preći preko većine terena.
+unit.collaris.description = Ispaljuje dugo-dometnu fragmentacionu artiljeriju na neprijateljske mete. Može preći preko većine terena.
+unit.elude.description = Ispaljuje mekte na samonavođenje na neprijatelje. Može da pluta preko te�nih tela.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Ispaljuje dugo-dometne rakete na neprijateljske mete. Onemogućava neprijateljske popravne blokove.
+unit.disrupt.description = Ispaljuje dugo-dometne ugušujuće rakete na neprijateljske mete. Onemogućava neprijateljske popravne blokove.
+unit.evoke.description = Gradi građevine da odbrani Bastilja jezgro. Popravlja građevine sa laserom.
+unit.incite.description = Gradi građevine da odbrani Citadela jezgro. Popravlja građevine sa laserom.
+unit.emanate.description = Gradi građevine da odbrani Veliki Grad jezgro. Popravlja građevine sa laserom.
+
+lst.read = Čita broj iz povezane memorijske ćelije.
+lst.write = Piše broj u povezanu memorijsku ćeliju.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Primi procesorski link po indeksu. Po�inje kod 0.
+lst.control = Upravljaj građevinom.
+lst.radar = Lociraj jedinice oko građevine sa dometom.
+lst.sensor = Primi podatke od građevine ili jedinice.
+lst.set = Definiši varijablu.
+lst.operation = Izvrši operaciju sa 1-2 varijable.
+lst.end = Sko�i do vrha skupa operacija.
+lst.wait = Sa�ekaj definisani broj sekundi.
+lst.stop = Halt execution of this processor.
+lst.lookup = Vidi vrstu materijala/te�nosti/jedinice/bloka po ID-u.\nUkupne koli�ine svake vrste se mogu pristupiti sa:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Prizovi jedinicu na mestu.
+lst.applystatus = Dodaj ili ukloni statusni efekat na jedinicu/e.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Izazovi eksploziju na mestu.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Postavi pravilo igre.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+
+lenum.type = Vrsta građevine/jedinice.\nnpr. za svaki ruter, ovo šalje [accent]@router[].\nNot a string.
+lenum.shoot = Ispaljuj na mestu.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Konfiguracija građevine, npr. sortirani materijal.
+lenum.enabled = Da li je ova građevina osposobljena.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = Boja iluminatora.
+laccess.controller = Upravlja� jedinice. Ako upravljano putem procesora, šalji "processor".\nAko je upravljano u formaciji, šalji "lider".U ostalim slu�ajevima, šalji jedinicu za sebe.
+laccess.dead = Da li je građevina/jedinica mrtva, ili više ne radi.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Maksimalna brzina jedinice, u polja/sekundi.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Nepoznato
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Kontrola Blokova
+lcategory.block.description = Interakcije vezane sa blokovima.
+lcategory.operation = Operacije
+lcategory.operation.description = Logi�ke operacije.
+lcategory.control = Kontrola Toka
+lcategory.control.description = Uređuj tok izvođenja.
+lcategory.unit = Kontrola Jedinica
+lcategory.unit.description = Davanje komandi jedinica.
+lcategory.world = Svet
+lcategory.world.description = Upravljaj funkcijama sveta.
+
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = Uvek Ta�no.
+lenum.idiv = Integer division.
+lenum.div = Deljenje.Å alje [accent]null[] kada se deli sa nulom.
+lenum.mod = Modulo.
+lenum.equal = Jednakost. Primorava vrste.\nObjekti koji nisu [accent]null[] poređeni sa brojevima postaju 1, u suprotnom 0.
+lenum.notequal = Nejednakost. Primorava vrste.
+lenum.strictequal = Zacrtana jednakost. Ne primorava vrste.\nMože se koristiti radi provere [accent]null[]-a.
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+
+lenum.min = Minimum dva broja.
+lenum.max = Maksimum dva broja.
+lenum.angle = Ugao vektora u stepenima.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Dužina bektora.
+
+lenum.sin = Sinus, u stepenima.
+lenum.cos = Cosinus, u stepenima.
+lenum.tan = Tangenta, u stepenima.
+
+lenum.asin = Ark sinus, u stepenima.
+lenum.acos = Ark cosinus, u stepenima.
+lenum.atan = Ark tangenta, u stepenima.
+
+#not a typo, look up 'range notation'
+lenum.rand = Nasumi�ne decimale u dometu [0, vrednost).
+lenum.log = Prirodni logaritam (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Apsolutna vrednost.
+lenum.sqrt = Kvadratni koren.
+
+lenum.any = Bilo koja jedinica.
+lenum.ally = Savezni�ka jedinica.
+lenum.attacker = Jedinica sa oružijem.
+lenum.enemy = Neprijateljska jedinica.
+lenum.boss = ÄŒuvar.
+lenum.flying = Leteća jedinica.
+lenum.ground = Zemna jedinica.
+lenum.player = Jedinica upravljana od strane igra�a.
+
+lenum.ore = Nalazište rude.
+lenum.damaged = Ošte�ena savezni�ka građevina.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+
+lenum.core = Bilo koje jezgro.
+lenum.storage = Skladišnje građevine, npr. Trezor.
+lenum.generator = Građevine koje proizvode energiju.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Mesta za popravku.
+lenum.battery = Bilo koja baterija.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+
+sensor.in = The building/unit to sense.
+
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Dodatni filteri.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+
+unitradar.target = Filter for units to sense.
+unitradar.and = Dodatni filteri.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+
+control.of = Građevina za upravljanje.
+control.unit = Jedinica/građevina koja se nišani.
+control.shoot = Da li da puca.
+
+unitlocate.enemy = Da li da locira neprijateljske građevine.
+unitlocate.found = Da li je objekat pronađen.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Grupa građevina koja se traži.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Zaustavi kretanje, ali nastavi gradnju/iskopavanje.\nThe default state.
+lenum.stop = Zaustavi kretanje/gradnju/iskopavanje.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Idi do ta�nog mesta.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Pucaj na mesto.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 12c3e84a7b..da27d3d739 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1,27 +1,30 @@
 credits.text = Skapad av [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Medverkande
 contributors = Översättare och medarbetare
-discord = GÃ¥ med Mindustrys Discord server!
+discord = GÃ¥ med i Mindustrys Discord server!
 link.discord.description = Officiella Discord chattrummet för Mindustry
-link.reddit.description = Mindustry subredditet
+link.reddit.description = Mindustry subredditen
 link.github.description = Spelets källkod
 link.changelog.description = Lista av uppdateringar
-link.dev-builds.description = Ostabila development builds
+link.dev-builds.description = Ostabila utvecklings builds
 link.trello.description = Officiell Trello tavla för uppkommande funktioner
-link.itch.io.description = itch.io med nedladdningar
+link.itch.io.description = itch.io med nedladdningar för PC
 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.suggestions.description = Föreslå nya funktioner
+link.bug.description = Hittat en? Rapportera den här
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 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.
-gameover = Spelet Slut
+gameover = Spel Slut
+gameover.disconnect = Frånkoppla
 gameover.pvp = Laget [accent] {0}[] vann!
+gameover.waiting = [accent]Väntar på nästa karta...
 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 = Denna del av spelet är iunte färdig ännu
+indev.notready = Denna del av spelet är inte färdig ännu
 
 load.sound = Ljud
 load.map = Kartor
@@ -37,10 +40,23 @@ be.updating = Uppdaterar...
 be.ignore = Ignorera
 be.noupdates = Inga uppdateringar hittades.
 be.check = Leta efter uppdateringar
+mods.browser = Mod Sökare
+mods.browser.selected = Valt mod
+mods.browser.add = Installera
+mods.browser.reinstall = Ominstallera
+mods.browser.view-releases = View Releases
+mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published.
+mods.browser.latest = [lightgray][Latest]
+mods.browser.releases = Releases
+mods.github.open = Repo
+mods.github.open-release = Release Page
+mods.browser.sortdate = Sortera efter senaste
+mods.browser.sortstars = Sortera efter stjärnor
 
 schematic = Schematic
 schematic.add = Spara Schematic...
 schematics = Schematics
+schematic.search = Search schematics...
 schematic.replace = En schematic med det namnet finns redan. Byt ut den?
 schematic.exists = En schematic med det namnet finns redan.
 schematic.import = Importera Schematic...
@@ -53,33 +69,44 @@ schematic.shareworkshop = Dela på Workshoppen
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Vänd Schematic
 schematic.saved = Schematic sparad.
 schematic.delete.confirm = Den här schematicen kommer bli ytterst borttagen.
-schematic.rename = Döp om Schematic
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} block
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Schematics inaktiverade[]\nDu får inte använda schematics på denna [accent]kartan[] eller [accent]servern.
+schematic.tags = Taggar:
+schematic.edittags = Redigera Taggar
+schematic.addtag = Lägg till Taggar
+schematic.texttag = Text Tagg
+schematic.icontag = Ikon Tagg
+schematic.renametag = Döp om Tagg
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Radera denna tagg fullständigt?
+schematic.tagexists = Den taggen finns redan.
+stats = Statistik
+stats.wave = Besegrade VÃ¥gor
+stats.unitsCreated = Enheter Skapade
+stats.enemiesDestroyed = Besegrade Fiender
+stats.built = Byggda Byggnader
+stats.destroyed = Förstörda Byggnader
+stats.deconstructed = Dekonstruerade Byggnader
+stats.playtime = Tid Spelad
 
-stat.wave = Besegrade vågor:[accent] {0}
-stat.enemiesDestroyed = Besegrade fiender:[accent] {0}
-stat.built = Buildings Built:[accent] {0}
-stat.destroyed = Buildings Destroyed:[accent] {0}
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
-stat.delivered = Resources Launched:
-stat.playtime = Tid Spelat:[accent] {0}
-stat.rank = Slutgiltiga Rank: [accent]{0}
-
-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}
+globalitems = [accent]Globala Objekt
+map.delete = Är du säker på att du vill ta bort kartan "[accent]{0}[]"?
+level.highscore = Högsta Poäng: [accent]{0}
 level.select = Nivåval
 level.mode = Spelläge:
 coreattack = < Kärnan är under attack! >
-nearpoint = [[ [scarlet]LÄMNA DROPPZONEN OMEDELBART[] ]\ndu dör snart
+nearpoint = [[ [scarlet]LÄMNA DROPPZONEN OMEDELBART[] ]\nförintelse oundviklig
 database = Kärndatabas
+database.button = Databas
 savegame = Spara Spel
 loadgame = Importera Spel
-joingame = GÃ¥ med Spel
+joingame = GÃ¥ med i Spel
 customgame = Anpassat Spel
 newgame = Nytt Spel
-none = <ingen>
+none = <inget>
+none.found = [lightgray]<ingen hittad>
+none.inmap = [lightgray]<ingen i karta>
 minimap = Minikarta
 position = Position
 close = Stäng
@@ -91,68 +118,95 @@ maps.browse = Bläddra bland kartor
 continue = Fortsätt
 maps.none = [lightgray]Inga kartor hittade!
 invalid = Ogiltig
-pickcolor = Pick Color
+pickcolor = Välj Färg
 preparingconfig = Förbereder konfiguration
 preparingcontent = Förbereder innehåll
 uploadingcontent = Laddar upp innehåll
 uploadingpreviewfile = Laddar upp förhandsgranskningsfil
-committingchanges = Comitting Changes
+committingchanges = Genomför Ändringar
 done = Klar
 feature.unsupported = Din enhet stödjer inte denna funktion.
-
-mods.alphainfo = Kom ihåg att moddar är i alpha, och[scarlet] kan vara väldigt buggiga[].\nReport any issues you find to the Mindustry GitHub or Discord.
+mods.initfailed = [red]⚠[] Den tidigare Mindustry instansen kunde inte initieras. Detta var troligtvis orsakat av misskötta moddar.\n\nFör att förhindra en kraschslinga, [red]har alla mods inaktiverats.[]
 mods = Moddar
 mods.none = [lightgray]Hittar inga Moddar!
 mods.guide = Modding Guide
-mods.report = Report Bug
-mods.openfolder = Open Mod Folder
-mods.reload = Reload
+mods.report = Rapportera Bug
+mods.openfolder = Öppna Mod Mapp
+mods.viewcontent = Visa Innehåll
+mods.reload = Ladda Om
 mods.reloadexit = Spelat kommer nu att starta om, för att ladda om moddarna.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktiverad
 mod.disabled = [scarlet]Inaktiverad
+mod.multiplayer.compatible = [gray]Flerspelar Kompatibel
 mod.disable = Inaktivera
-mod.content = Content:
+mod.version = Version:
+mod.content = Innehåll:
 mod.delete.error = Kunde inte ta bort modden. Filen kanske används.
-mod.requiresversion = [scarlet]Kräver som minst 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.
-mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
-mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
-mod.enable = Enable
-mod.requiresrestart = The game will now close to apply the mod changes.
+mod.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
+mod.erroredcontent = [scarlet]Innehålls Fel
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
+mod.errors = Fel har inträffat under laddning av innehåll.
+mod.noerrorplay = [scarlet]Du har moddar med fel.[] Stäng antingen av de drabbade moddarna eller fixa felen innan du spelar.
+mod.nowdisabled = [scarlet]Mod '{0}' saknar beroenden:[accent] {1}\n[lightgray]Dessa mods måste laddas ned först.\nDetta mod kommer att inaktiveras automatiskt.
+mod.enable = Aktivera
+mod.requiresrestart = Spelet kommer nu att stängas av för att tillämpa mod ändringarna.
 mod.reloadrequired = [scarlet]Omstart krävs
 mod.import = Importera Mod
 mod.import.file = Importera Fil
 mod.import.github = Importera 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}
-mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Before publishing this mod in the workshop, you must add an image preview.\nPlace an image named[accent] preview.png[] into the mod's folder and try again.
-mod.folder.missing = Only mods in folder form can be published on the 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.
+mod.jarwarn = [scarlet]JAR moddar är i sig osäkra.[]\nSe till att du importerar detta mod från en trovärdig källa!
+mod.item.remove = Denna artikel är en del av[accent] '{0}'[] modden. För att ta bort den, avinstallera det moddet.
+mod.remove.confirm = Detta mod kommer att raderas.
+mod.author = [lightgray]Skapare:[] {0}
+mod.missing = Denna sparfil innehåller moddar som du nyligen har uppdaterat eller inte längre har installerade. Spar korruption kan förekomma. Är du säker på att du vill ladda den?\n[lightgray]Moddar:\n{0}
+mod.preview.missing = Innan du publicerar detta mod i workshoppen, måste du lägga till en förhandsgransknings bild.\nPlacera en bild döpt[accent] preview.png[] i moddens mapp och försök igen.
+mod.folder.missing = Endast moddar i mapp form kan bli publicerade på workshoppen.\nFör att konvertera ett mod till en mapp, packa helt enkelt upp filen i en mapp och ta bort den gamla zip-filen, starta sedan om ditt spel eller ladda om dina moddar.
+mod.scripts.disable = Din enhet stödjer inte moddar med skripter. Du måste inaktivera dessa moddar för att kunna spela spelet.
 
 about.button = Om
 name = Namn:
 noname = Välj ett[accent] namn[] först.
+search = Search:
 planetmap = Planet Karta
-launchcore = Launch Core
+launchcore = Avfyra Kärna
 filename = Filnamn:
 unlocked = Nytt innehåll upplåst!
+available = Ny forskning tillgänglig!
+unlock.incampaign = < Lås upp i kampanjen för detaljer >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Avklarad
 techtree = Teknologiträd
+techtree.select = Teknologiträd Väljare
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Ladda
+research.discard = Kassera
 research.list = [lightgray]Forskning:
 research = Forskning
 researched = [lightgray]{0} framforskat.
-research.progress = {0}% complete
+research.progress = {0}% klart
 players = {0} spelare online
 players.single = {0} spelare online
-players.search = search
-players.notfound = [gray]no players found
+players.search = sök
+players.notfound = [gray]inga spelare hittade
 server.closing = [accent]Stänger server...
 server.kicked.kick = Du har blivit kickad från servern!
 server.kicked.whitelist = Du är inte vitlistad här.
@@ -161,41 +215,57 @@ server.kicked.vote = Du har blivit utröstad. Hejdå.
 server.kicked.clientOutdated = Utdaterad klient! Uppdatera ditt spel!
 server.kicked.serverOutdated = Utdaterad server! Be värden att uppdatera!
 server.kicked.banned = Du är bannad från servern.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.typeMismatch = Den här servern är inte kompatibel med din build typ.
 server.kicked.playerLimit = Den här servern är full. Var god vänta på en öppning.
-server.kicked.recentKick = Du har blivit kickad nyligen.\nVänta innan du kopplar igen.
+server.kicked.recentKick = Du har blivit kickad nyligen.\nVänta innan du ansluter igen.
 server.kicked.nameInUse = Någon med det namnet finns redan\npå servern.
 server.kicked.nameEmpty = Ditt namn är ogiltigt.
-server.kicked.idInUse = Du är redan på den här servern! Det är inte tillåtet att koppla med två konton.
-server.kicked.customClient = This server does not support custom builds. Ladda ned en officiell verision.
-server.kicked.gameover = Game over!
+server.kicked.idInUse = Du är redan på den här servern! Det är inte tillåtet att ansluta med två konton.
+server.kicked.customClient = Denna server tillåter inte anpassade builds. Ladda ned en officiell version.
+server.kicked.gameover = Spel slut!
 server.kicked.serverRestarting = Servern startar om.
-server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
-host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. Note that public networks sometimes do not allow server discovery.
-join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
-hostserver = Hosta Multiplayer Spel
-invitefriends = Invite Friends
-hostserver.mobile = Hosta\nSpel
-host = Hosta
+server.versions = Din version:[accent] {0}[]\nServer version:[accent] {1}[]
+host.info = [accent]Värd[] knappen skapar en server på port [scarlet]6567[]. \nVem som helst på samma [lightgray]wifi eller lokala nätverk[] borde kunna se din server på deras server lista.\n\nOm du vill att personer ska kunna ansluta från var som helst med hjälp av IP, så är [accent]portvidarebefordran[] nödvändigt.\n\n[lightgray]Obs: Om någon har problem med att ansluta till ditt LAN spel, se till att du har gett Mindustry åtkomst till ditt lokala nätverk i dina brandväggsinställningar. Observera att offentliga nätverk ibland inte tillåter serverupptäckt.
+join.info = Här, kan du skriva en [accent]server IP[] för att ansluta till, eller upptäcka [accent]lokala nätverks[] servrar att ansluta till.\nBåde LAN och WAN multiplayer stöds.\n\n[lightgray]Obs: Det finns ingen automatisk global serverlista; om du vill ansluta till någon via IP, måste du be värden om deras IP.
+hostserver = Bli Värd För Multiplayer Spel
+invitefriends = Bjud In Vänner
+hostserver.mobile = Bli Värd\nför Spel
+host = Bli värd
 hosting = [accent]Öppnar server...
-hosts.refresh = Refresh
-hosts.discovering = Discovering LAN games
-hosts.discovering.any = Discovering games
-server.refreshing = Refreshing server
-hosts.none = [lightgray]No local games found!
-host.invalid = [scarlet]Can't connect to host.
+hosts.refresh = Uppdatera
+hosts.discovering = Upptäcker LAN spel
+hosts.discovering.any = Upptäcker spel
+server.refreshing = Uppdaterar server
+hosts.none = [lightgray]Inga lokala spel hittades!
+host.invalid = [scarlet]Kan inte ansluta till värd.
 
-servers.local = Local Servers
-servers.remote = Remote Servers
-servers.global = Community Servers
+servers.local = Lokala Servrar
+servers.local.steam = Öppna Spel & Lokala Servrar
+servers.remote = Fjärr Servrar
+servers.global = Gemenskaps Servrar
+servers.disclaimer = Gemenskaps servrar är [accent]inte[] ägda eller kontrollerade av utvecklaren.\n\nServrar kan innehålla användargenererat innehåll som inte är lämpligt för alla åldrar.
+servers.showhidden = Visa Dolda Servrar
+server.shown = Visade
+server.hidden = Dolda
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Trace Player
 trace.playername = Spelarnamn: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Unique ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobile Client: [accent]{0}
 trace.modclient = Custom Client: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Invalid client ID! Submit a bug report.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Bans
 server.bans.none = Inga bannade spelare hittades!
 server.admins = Administratörer
@@ -209,10 +279,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Are you sure you want to ban this player?
 confirmkick = Are you sure you want to kick this player?
-confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make this player an admin?
 confirmunadmin = Are you sure you want to remove admin status from this player?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Join Game
 joingame.ip = Adress:
 disconnect = Frånkopplad.
@@ -220,15 +291,18 @@ disconnect.error = Kopplingsfel.
 disconnect.closed = Koppling stängd.
 disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Ansluter...
+reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Loading world data...
 server.port = Port:
-server.addressinuse = Address already in use!
 server.invalidport = Ogiltigt portnummer!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Error hosting server: [accent]{0}
 save.new = Ny sparfil
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Skriv över
 save.none = Inga sparfiler hittade!
 savefail = Kunde inte spara spelet!
@@ -249,6 +323,7 @@ save.corrupted = [accent]Save file corrupted or invalid!\nIf you have just updat
 empty = <tom>
 on = PÃ¥
 off = Av
+save.search = Search saved games...
 save.autosave = Autospara: {0}
 save.map = Map: {0}
 save.wave = VÃ¥g {0}
@@ -264,9 +339,33 @@ ok = OK
 open = Öppna
 customize = Customize Rules
 cancel = Avbryt
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Öppna Länk
 copylink = Kopiera Länk
 back = Tillbaka
+max = Max
+objective = Map Objective
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
 data.export = Exportera data
 data.import = Importera data
 data.openfolder = Open Data Folder
@@ -274,15 +373,18 @@ data.exported = Data exporterad.
 data.invalid = This isn't valid game data.
 data.import.confirm = Importing external data will erase[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
 quit.confirm = Är du säker på att du vill avsluta?
-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]Läser in...
-reloading = [accent]Reloading Mods...
+downloading = [accent]Downloading...
 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
 resumebuilding = [scarlet][[{0}][] to resume building
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]VÃ¥g {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]VÃ¥g om {0}
@@ -290,6 +392,8 @@ wave.waveInProgress = [lightgray]Wave in progress
 waiting = [lightgray]Väntar...
 waiting.players = Väntar på spelare...
 wave.enemies = [lightgray]{0} Fiender kvarvarande
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
 wave.enemy = [lightgray]{0} Fiende kvar
 wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
 wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
@@ -300,9 +404,9 @@ custom = Anpassad
 builtin = Inbyggd
 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.nospawn = This map does not have any cores for the player to spawn in! Add a {0} core to this map in the editor.
+map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add [scarlet]non-orange[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add {0} 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}
@@ -310,12 +414,17 @@ map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]M
 workshop.menu = Select what you would like to do with this item.
 workshop.info = Item Info
 changelog = Changelog (optional):
+updatedesc = Overwrite Title & Description
 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.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Pensel
 editor.openin = Open In Editor
@@ -328,35 +437,71 @@ editor.nodescription = A map must have a description of at least 4 characters be
 editor.waves = VÃ¥gor:
 editor.rules = Regler:
 editor.generation = Generering:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Edit In-Game
+editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = VÃ¥gor
 waves.remove = Ta bort
-waves.never = <aldrig>
 waves.every = var
 waves.waves = våg(or)
+waves.health = health: {0}%
 waves.perspawn = per spawn
 waves.shields = shields/wave
 waves.to = till
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Förhandsvisning
 waves.edit = Ändra...
+waves.random = Random
 waves.copy = Kopiera till Urklipp
 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.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
+all = All
 
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Redigera...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Namn:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -368,13 +513,19 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Uppdatera
 editor.randomize = Slumpa
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Verkställ
 editor.generate = Generera
+editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Sparad!
 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.
@@ -413,8 +564,12 @@ toolmode.eraseores = Erase Ores
 toolmode.eraseores.description = Erase only ores.
 toolmode.fillteams = Fyll Lag
 toolmode.fillteams.description = Fill teams instead of blocks.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Rita Lag
 toolmode.drawteams.description = Draw teams instead of blocks.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
 filter.distort = Distort
@@ -433,6 +588,7 @@ filter.clear = Rensa
 filter.option.ignore = Ignorera
 filter.scatter = Sprid
 filter.terrain = Terräng
+filter.logic = Logic
 filter.option.scale = Skala
 filter.option.chance = Chans
 filter.option.mag = Magnitud
@@ -441,17 +597,39 @@ filter.option.circle-scale = Cirkelskala
 filter.option.octaves = Oktaver
 filter.option.falloff = Falloff
 filter.option.angle = Vinkel
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Golv
 filter.option.flooronto = Target Floor
 filter.option.target = Target
+filter.option.replacement = Replacement
 filter.option.wall = Vägg
 filter.option.ore = Malm
 filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radie
 filter.option.percentile = Percentile
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Bredd:
 height = Höjd:
@@ -462,6 +640,9 @@ load = Load
 save = Spara
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Starta om spelet för att språkinställningarna ska ta effekt.
 settings = Inställningar
 tutorial = Tutorial
@@ -476,26 +657,71 @@ complete = [lightgray]NÃ¥:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
 requirement.research = Research {0}
+requirement.produce = Produce {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Best Wave: {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
+map.multiplayer = Only the host can view sectors.
 uncover = Uncover
 configure = Configure Loadout
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
 loadout = Loadout
-resources = Resources 
+resources = Resources
+resources.max = Max
 bannedblocks = Banned Blocks
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = [lightgray]Resources Detected:
-zone.objective = [lightgray]Objective: [accent]{0}
-zone.objective.survival = Survive
-zone.objective.attack = Destroy Enemy Core
 add = Lägg till...
-boss.health = Boss Health
+guardian = Guardian
 
 connectfail = [crimson]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
@@ -507,26 +733,69 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Okänt nätverksfel.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 
 sectors.unexplored = [lightgray]Oupptäckt
 sectors.resources = Resurser:
 sectors.production = Produktion:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Time:
+sectors.threat = Threat:
+sectors.wave = Wave:
 sectors.stored = Lagrade:
 sectors.resume = Ã…teruppta
 sectors.launch = Skjuta upp
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Byt namn på sektor
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
+sector.curcapture = Sector Captured
+sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
+sector.attacked = Sector [accent]{0}[white] under attack!
+sector.lost = Sector [accent]{0}[white] lost!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planets
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sun
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
 sector.craters.name = Kratrarna
@@ -539,6 +808,22 @@ sector.overgrowth.name = Överväxt
 sector.tarFields.name = Tjärfält
 sector.saltFlats.name = Saltöken
 sector.fungalPass.name = Svamppass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -551,6 +836,75 @@ 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
 
 settings.language = Språk
 settings.data = Spel Data
@@ -573,7 +927,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Pausat >
 clear = Clear
 banned = [scarlet]Banned
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Ja
 no = Nej
 info.title = Info
@@ -581,13 +935,18 @@ error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Purpose
 
 stat.input = Inmatning
 stat.output = Utmatning
+stat.maxefficiency = Max Efficiency
 stat.booster = Booster
 stat.tiles = Nödvändiga Tiles
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Power Capacity
 stat.powershot = Power/Shot
 stat.damage = Skada
@@ -610,6 +969,11 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Base Power Generation
 stat.productiontime = Production Time
 stat.repairtime = Block Full Repair Time
+stat.repairspeed = Repair Speed
+stat.weapons = Weapons
+stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Speed Increase
 stat.range = Range
 stat.drilltier = Drillables
@@ -617,6 +981,7 @@ stat.drillspeed = Base Drill Speed
 stat.boosteffect = Boost Effect
 stat.maxunits = Max Active Units
 stat.health = Health
+stat.armor = Armor
 stat.buildtime = Build Time
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Build Cost
@@ -632,6 +997,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = HeatCapacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -640,21 +1006,77 @@ stat.buildspeed = Build Speed
 stat.minespeed = Mine Speed
 stat.minetier = Mine Tier
 stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
 stat.abilities = Abilities
+stat.canboost = Can Boost
+stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Bättre Borr Krävs
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Effektivitet: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Power: {0}/s
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
@@ -663,13 +1085,19 @@ bar.powerlines = Connections: {0}/{1}
 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.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
 bar.power = Power
 bar.progress = Build Progress
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -677,35 +1105,50 @@ bullet.damage = [stat]{0}[lightgray] skada
 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.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
 bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = block
 unit.blockssquared = blocks²
 unit.powersecond = power units/second
+unit.tilessecond = tiles/second
 unit.liquidsecond = liquid units/second
 unit.itemssecond = items/second
 unit.liquidunits = liquid units
 unit.powerunits = power units
+unit.heatunits = heat units
 unit.degrees = grader
 unit.seconds = sekunder
 unit.minutes = mins
 unit.persecond = /sek
 unit.perminute = /min
 unit.timesspeed = x hastighet
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = föremål
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Purpose
 category.general = Allmänt
 category.power = Energi
 category.liquids = Vätskor
@@ -713,16 +1156,23 @@ category.items = Föremål
 category.crafting = Inmatning/Utmatning
 category.function = Function
 category.optional = Optional Enhancements
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 setting.landscape.name = Lock Landscape
 setting.shadows.name = Skuggor
 setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Linear Filtering
 setting.hints.name = Hints
-setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
+setting.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animerat Vatten
 setting.animatedshields.name = Animerade Sköldar
-setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.playerindicators.name = Player Indicators
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
@@ -732,14 +1182,11 @@ setting.fpscap.name = Begränsade FPS
 setting.fpscap.none = Inga
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI Scaling[lightgray] (requires restart)[]
+setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Always Diagonal Placement
-setting.difficulty.training = Träning
-setting.difficulty.easy = Lätt
-setting.difficulty.normal = Normalt
-setting.difficulty.hard = Svårt
-setting.difficulty.insane = Galet
-setting.difficulty.name = Svårighetsgrad:
 setting.screenshake.name = Skärmskak
+setting.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Visa Effekter
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
@@ -747,32 +1194,43 @@ setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
 setting.seconds = {0} Sekunder
-setting.blockselecttimeout.name = Block Select Timeout
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullskärm
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Show FPS
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 setting.vsync.name = VSync
 setting.pixelate.name = Pixellera[lightgray] (disables animations)
 setting.minimap.name = Visa Minikarta
-setting.coreitems.name = Display Core Items (WIP)
+setting.coreitems.name = Display Core Items
 setting.position.name = Show Player Position
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Musikvolym
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Stäng Av Musik
 setting.sfxvol.name = Ljudeffektvolym
 setting.mutesound.name = Stäng Av Ljudeffekter
 setting.crashreport.name = Skicka Anonyma Krashrapporter
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chattgenomskinlighet
 setting.lasersopacity.name = Power Laser Opacity
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Bridge Opacity
-setting.playerchat.name = Visa 
-public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
+setting.playerchat.name = Visa
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Anpassa gränssnittet för att visa skåra
+setting.macnotch.description = Omstart krävs för att tillämpa ändringar
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.
 uiscale.reset = UI-skalan har ändrats.\nTryck "OK" för att använda den här skalan.\n[scarlet]Avslutar och återställer om[accent] {0}[] sekunder...
 uiscale.cancel = Avbryt och Avsluta
@@ -781,12 +1239,9 @@ keybind.title = Rebind Keys
 keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
 category.general.name = General
 category.view.name = View
+category.command.name = Unit Command
 category.multiplayer.name = Multiplayer
 category.blocks.name = Block Select
-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
@@ -801,6 +1256,27 @@ keybind.move_y.name = Move y
 keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -826,16 +1302,20 @@ keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo
-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.planet_map.name = Planet Map
+keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Chat
 keybind.player_list.name = Player list
 keybind.console.name = Console
@@ -845,6 +1325,7 @@ keybind.toggle_menus.name = Toggle menus
 keybind.chat_history_prev.name = Chat history prev
 keybind.chat_history_next.name = Chat history next
 keybind.chat_scroll.name = Chat scroll
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = Drop Unit
 keybind.zoom_minimap.name = Zoom minimap
 mode.help.title = Description of modes
@@ -858,47 +1339,100 @@ mode.pvp.description = Fight against other players locally.\n[gray]Requires at l
 mode.attack.name = Attack
 mode.attack.description = Destroy the enemy's base. No waves.\n[gray]Requires a red core in the map to play.
 mode.custom = Custom Rules
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Infinite Resources
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = VÃ¥gtimer
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = VÃ¥gor
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Attack Mode
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
+rules.initialwavespacing = Initial 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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
 rules.title.waves = VÃ¥gor
 rules.title.resourcesbuilding = Resources & Building
 rules.title.enemy = Fiender
 rules.title.unit = Units
 rules.title.experimental = Experimental
 rules.title.environment = Environment
+rules.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Lighting
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Föremål
 content.liquid.name = Vätskor
 content.unit.name = Enheter
 content.block.name = Block
+content.status.name = Status Effects
+content.sector.name = Sectors
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Koppar
 item.lead.name = Bly
@@ -916,10 +1450,23 @@ item.blast-compound.name = Sprängmedel
 item.pyratite.name = Pyratit
 item.metaglass.name = Metaglas
 item.scrap.name = Scrap
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = Vatten
 liquid.slag.name = Slag
 liquid.oil.name = Olja
 liquid.cryofluid.name = Cryofluid
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -947,6 +1494,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,13 +1506,35 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sandbumling
+block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Gräs
-block.slag.name = Slag
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Space
 block.salt.name = Salt
 block.salt-wall.name = Salt Wall
@@ -988,24 +1562,28 @@ block.graphite-press.name = Grapfitpress
 block.multi-press.name = Multi-Press
 block.constructing = {0} [lightgray](Constructing)
 block.spawn.name = Enemy Spawn
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Core: Shard
 block.core-foundation.name = Core: Foundation
 block.core-nucleus.name = Core: Nucleus
-block.deepwater.name = Djupt Vatten
-block.water.name = Vatten
+block.deep-water.name = Djupt Vatten
+block.shallow-water.name = Vatten
 block.tainted-water.name = Tainted Water
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Dark Sand Tainted Water
 block.tar.name = Tjära
 block.stone.name = Sten
-block.sand.name = Sand
+block.sand-floor.name = Sand
 block.darksand.name = Mörk Sand
 block.ice.name = Is
 block.snow.name = Snö
-block.craters.name = Kratrar
+block.crater-stone.name = Kratrar
 block.sand-water.name = Sandvatten
 block.darksand-water.name = Mörksandvatten
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Issnö
@@ -1023,6 +1601,7 @@ block.spore-cluster.name = Spore Cluster
 block.metal-floor.name = Metal Floor 1
 block.metal-floor-2.name = Metallgolv 2
 block.metal-floor-3.name = Metallgolv 3
+block.metal-floor-4.name = Metal Floor 4
 block.metal-floor-5.name = Metallgolv 4
 block.metal-floor-damaged.name = Skadat Metallgolv
 block.dark-panel-1.name = Mörk Panel 1
@@ -1056,15 +1635,16 @@ 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 conveyors.
 block.junction.name = Korsning
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorterare
 block.inverted-sorter.name = Inverted Sorter
 block.message.name = Meddelande
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
-block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 block.overflow-gate.name = Överflödesgrind
 block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Kiselsmältare
@@ -1115,20 +1695,22 @@ block.solar-panel.name = Solpanel
 block.solar-panel-large.name = Stor Solpanel
 block.oil-extractor.name = Oljeextraktor
 block.repair-point.name = Repairationspunkt
+block.repair-turret.name = Repair Turret
 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 = Vätsketank
+block.liquid-container.name = Liquid Container
 block.liquid-junction.name = Vätskekorsning
 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.impulse-pump.name = Thermal Pump
 block.thermal-generator.name = Thermal Generator
-block.alloy-smelter.name = Alloy Smelter
+block.surge-smelter.name = Surge Smelter
 block.mender.name = Mender
 block.mend-projector.name = Mend Projector
 block.surge-wall.name = Surge Wall
@@ -1145,9 +1727,9 @@ 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.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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
@@ -1157,9 +1739,179 @@ 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.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1169,66 +1921,153 @@ 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 = blåa
+team.malis.name = Malis
 team.crux.name = röda
 team.sharded.name = orangea
-team.orange.name = orangea
 team.derelict.name = derelicta
 team.green.name = gröna
-team.purple.name = lila
 
-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
-tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building.
-tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
-tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
-tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\n\n[accent]{0}/{1} conveyors\n[accent]0/1 items delivered
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors\n[accent]0/1 items delivered
-tutorial.turret = Defensive 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 to the turret\n Lead 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 right of your core.
-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 right of your core.
-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. Multiple 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 resources can then be used to research new technology.\n\n[accent]Press the launch button.
+team.blue.name = blåa
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = The most basic structural material. Used extensively in all types of blocks.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
 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 insulation.
 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.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
 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.scrap.details = Leftover remnants of old structures and units.
 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.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 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.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 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.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
+block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 
 block.message.description = Stores a message. Used for communication between allies.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Compresses 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.surge-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.
@@ -1244,6 +2083,8 @@ 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.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. 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.
@@ -1256,6 +2097,10 @@ block.phase-wall.description = A wall coated with special phase-based reflective
 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.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 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.
@@ -1272,17 +2117,19 @@ block.phase-conveyor.description = Advanced item transport block. Uses power to
 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.router.details = A necessary evil. Using next to production inputs is not advised, 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 = A combination splitter and router. 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.impulse-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-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 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.
@@ -1308,15 +2155,21 @@ block.laser-drill.description = Allows drilling even faster through laser techno
 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.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 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-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.core-nucleus.details = The third and final iteration.
 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 a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping.
 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.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = A small, cheap turret. Useful against ground units.
 block.scatter.description = An essential anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
@@ -1331,5 +2184,429 @@ 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 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.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 930887461d..1e7d4bdb92 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1,26 +1,29 @@
 credits.text = สร้างโดย [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = เครดิต
-contributors = ผู้�ปลภาษา�ละผู้ช่วย
-discord = เข้าร่วมเซิฟเวอร์ Discord ของ Mindustry สิ!
-link.discord.description = เซิฟเวอร์ Discord อย่างเป็นทาง�ารของ Mindustry
-link.reddit.description = ซับเรดดิท (subreddit) ของ Mindustry
-link.github.description = source code ของเ�ม
-link.changelog.description = ราย�ารที่อัปเดต
+contributors = ผู้�ปลภาษา�ละผู้ร่วมพัฒนา
+discord = เข้าร่วมเซิร์ฟเวอร์ Discord ของ Mindustry สิ!
+link.discord.description = พื้นที่พูดคุยอย่างเป็นทาง�ารของ Mindustry
+link.reddit.description = Subreddit ของ Mindustry
+link.github.description = �หล่งโค้ดของเ�ม
+link.changelog.description = ราย�ารอัปเดต
 link.dev-builds.description = เวอร์ชั่นระหว่างพัฒนา (ไม่เสถียร)
-link.trello.description = Trello board ทาง�ารสำหรับฟีเจอร์ต่างๆที่วาง�ผนไว้
+link.trello.description = บอร์ด Trello อย่างเป็นทาง�ารสำหรับฟีเจอร์ต่างๆ ที่วาง�ผนไว้
 link.itch.io.description = หน้าเว็บ itch.io สำหรับดาวน์โหลดบน PC
-link.google-play.description = หน้า Google Play store ของเ�ม
-link.f-droid.description = หน้า�คตาลอค F-Droid ของเ�ม
-link.wiki.description = วิ�ิของ Mindustry อย่างเป็นทาง�าร
-link.suggestions.description = เสนอฟีเจอร์ใหม่
-linkfail = ไม่สามารถเปิดลิ้งค์ได้\nคัดลอ� URL ลงในคลิปบอร์ด�ล้ว
-screenshot = Screenshot บันทึ�ที่ {0}
-screenshot.invalid = �มพให�่เ�ินไป, หน่วยความจำอาจจะไม่พอสำหรับ screenshot.
+link.google-play.description = หน้าร้านค้า Google Play ของเ�ม
+link.f-droid.description = หน้า�คตตาล็อ� F-Droid ของเ�ม
+link.wiki.description = วิ�ิอย่างเป็นทาง�ารของ Mindustry
+link.suggestions.description = นำเสนอฟีเจอร์ใหม่
+link.bug.description = เจอบัค? รายงานที่นี่!
+linkopen = เซิร์ฟเวอร์นี้ได้ส่งลิ้งค์ให้คุณ �น่ใจหรือไม่ว่าจะเปิดลิ้งค์นี้?\n\n[sky]{0}
+linkfail = ไม่สามารถเปิดลิ้งค์ได้\nได้ทำ�ารคัดลอ� URL ลงในคลิปบอร์ด�ล้ว
+screenshot = ภาพหน้าจอได้ถู�บันทึ�ไปที่ {0}
+screenshot.invalid = �มพให�่เ�ินไป หน่วยความจำอาจจะไม่พอสำหรับภาพหน้าจอ
 gameover = จบเ�ม
-gameover.pvp = ทีมที่ชนะคือทีม[accent] {0}[]!
+gameover.disconnect = ออ�
+gameover.pvp = ทีมที่ชนะคือทีม [accent]{0}[]!
+gameover.waiting = [accent]�ำลังรอ�มพใหม่...
 highscore = [accent]คะ�นนสูงสุดใหม่!
-copied = คัดลอ��ล้ว.
-indev.popup = [accent]เวอร์ชั่น v6[] ณ ขณะนี้อยู่ในช่วง [accent]alpha[].\n[lightgray]นั้นหมายถึง:[]\n[scarlet]- เคมเป�ไม่ยังเสร็จสมบูรณ์ []\n- เนื้อหาบางอย่างขาดหาย\n - [scarlet]AI ของยูนิต[] ส่วนให�่ทำงานได้�บบไม่สมบูรณ์\n- ยูนิตส่วนมา�ยังไม่เสร็จ\n- ที่อย่างที่เห็นอาจเปลี่ยน�ปลงได้หรือลบออ�โดยสิ้นเชิงในอนาคต\n\n�จ้งบัคหรือปั�หาที่พบเจอได้ที่ [accent]Github[].
+copied = คัดลอ��ล้ว
 indev.notready = ส่วนนี้ของเ�มยังไม่พร้อมให้ใช้งาน
 
 load.sound = เสียง
@@ -28,62 +31,88 @@ load.map = �มพ
 load.image = รูป
 load.content = เนื้อหา
 load.system = ระบบ
-load.mod = มอด
+load.mod = ม็อด
 load.scripts = สคริปต์
 
-be.update = เวอร์ชั้นล่าสุดออ��ล้ว:
+be.update = เวอร์ชั่นรุ่นพัฒนาล่าสุดออ��ล้ว:
 be.update.confirm = ดาวน์โหลดเวอร์ชั่นใหม่�ล้วรีสตาร์ทเลยไหม?
 be.updating = �ำลังอัปเดต...
-be.ignore = ย�เลิ�
-be.noupdates = ไม่พบ�ารอัปเดตใหม่.
-be.check = ตรวจหาอัปเดตใหม่.
+be.ignore = เพิ�เฉย
+be.noupdates = ไม่พบอัปเดตใหม่
+be.check = ตรวจหาอัปเดตใหม่
+
+mods.browser = ค้นหาม็อด
+mods.browser.selected = เลือ��ล้ว
+mods.browser.add = ติดตั้ง
+mods.browser.reinstall = ติดตั้งใหม่
+mods.browser.view-releases = ดูเวอร์ชั่น
+mods.browser.noreleases = [scarlet]ไม่พบเวอร์ชั่น\n[accent]ไม่สามารถหาเวอร์ชั่นใดๆ ของม็อดนี้เจอได้เลย โปรดตรวจสอบว่า�หล่งของม็อดได้มี�ารปล่อยเวอร์ชั่นมา�ล้วหรือไม่
+mods.browser.latest = <ล่าสุด>
+mods.browser.releases = เวอร์ชั่น
+mods.github.open = �หล่ง
+mods.github.open-release = หน้าเวอร์ชั่น
+mods.browser.sortdate = เรียงตามล่าสุด
+mods.browser.sortstars = เรียงตามคะ�นนดาว
 
 schematic = �ผนผัง
-schematic.add = �ำลังบันทึ��ผนผัง...
+schematic.add = บันทึ��ผนผัง...
 schematics = �ผนผัง
-schematic.replace = มี�ผนผังที่ใช้ชื่อนี้�ล้ว. �ทนที่เลยไหม?
+schematic.search = ค้นหา�ผนผัง...
+schematic.replace = มี�ผนผังที่ใช้ชื่อนี้�ล้ว �ทนที่เลยไหม?
 schematic.exists = มี�ผนผังในชื่อนั้นอยู่�ล้ว
 schematic.import = นำเข้า�ผนผัง...
 schematic.exportfile = ส่งออ�ไฟล์
 schematic.importfile = นำเข้าไฟล์
-schematic.browseworkshop = ค้นหาเวิร์�ชอป
+schematic.browseworkshop = ค้นหาในเวิร์�ช็อป
 schematic.copy = คัดลอ�ไปที่คลิปบอร์ด
 schematic.copy.import = นำเข้าจา�คลิปบอร์ด
-schematic.shareworkshop = �ชร์บนเวิร์�ชอป
+schematic.shareworkshop = �ชร์บนเวิร์�ช็อป
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: �ลับ�ผนผัง
-schematic.saved = บันทึ��ผนผัง�ล้ว.
-schematic.delete.confirm = �ผนผังนี้จะถู��ำจัดให้หมดสิ้นโดยสิ้นเชิง
-schematic.rename = เปลี่ยนชื่อของ�ผนผัง
-schematic.info = {0}x{1}, {2} บล็อค
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.saved = บันทึ��ผนผัง�ล้ว
+schematic.delete.confirm = �ผนผังนี้จะถู��ำจัดให้หมดสิ้นไม่เหลือซา�
+schematic.edit = ��้ไข�ผนผัง
+schematic.info = {0}x{1}, {2} บล็อ�
+schematic.disabled = [scarlet]�ารใช้�ผนผังถู�ปิดไว้[]\nคุณไม่สามารถใช้�ผนผังได้ใน[accent]�มพ[]หรือ[accent]เซิร์ฟเวอร์[]นี้
+schematic.tags = �ท็�:
+schematic.edittags = ��้ไข�ท็�
+schematic.addtag = เพิ่ม�ท็�
+schematic.texttag = �ท็�ข้อความ
+schematic.icontag = �ท็�ไอคอน
+schematic.renametag = เปลี่ยนชื่อ�ท็�
+schematic.tagged = {0} ถู��ท็�
+schematic.tagdelconfirm = จะลบ�ท็�นี้ทั่วทั้งหมดเลยใช่ไหม?
+schematic.tagexists = �ท็�นี้มีอยู่�ล้ว
 
-stat.wave = จำนวนคลื่น(รอบ)ที่�ำจัดได้:[accent] {0}
-stat.enemiesDestroyed = จำนวนศัตรูที่ทำลายไปได้:[accent] {0}
-stat.built = จำนวนสิ่ง�่อสร้างที่สร้าง:[accent] {0}
-stat.destroyed = จำนวนสิ่ง�่อสร้างของศัตรูที่ทำลายไปได้:[accent] {0}
-stat.deconstructed = จำนวนสิ่ง�่อสร้างที่ถู�ทำลายไป:[accent] {0}
-stat.delivered = ทรัพยา�รที่ส่งไปได้:
-stat.playtime = ระยะเวลาที่เล่นไป:[accent] {0}
-stat.rank = ระดับ: [accent]{0}
+stats = สถิติ
+stats.wave = จำนวนคลื่นที่อยู่รอด
+stats.unitsCreated = จำนวนยูนิตที่สร้าง
+stats.enemiesDestroyed = จำนวนศัตรูที่ทำลาย
+stats.built = จำนวนสิ่ง�่อสร้างที่สร้าง
+stats.destroyed = จำนวนสิ่ง�่อสร้างที่ถู�ทำลาย
+stats.deconstructed = จำนวนสิ่ง�่อสร้างที่ลบไป
+stats.playtime = ระยะเวลาที่เล่นไป
 
-globalitems = [accent]ไอเท็มโ�ลบอล
-map.delete = คุณ�น่ใจหรือว่าจะลบ�มพชื่อ "[accent]{0}[]"?
+globalitems = [accent]ไอเท็มทั้งหมด
+map.delete = คุณ�น่ใจหรือว่าจะลบ�มพ "[accent]{0}[]"?
 level.highscore = คะ�นนสูงสุด: [accent]{0}
 level.select = เลือ�ด่าน
 level.mode = เ�มโหมด:
-coreattack = < ��น�ลาง�ำลังถู�โจมตี! >
-nearpoint = [[ [scarlet]ออ�จา�ดรอปพอยท์ด่วน IMMEDIATELY[] ]\n�ารทำลายล้าง�ำลังใ�ล้เข้ามา
-database = �านข้อมูลหลั�
+coreattack = < ��น�ลางถู�โจมตี! >
+nearpoint = [[ [scarlet]ออ�จา�จุดเ�ิดด่วน![] ]\n�ารทำลายล้าง�ำลังใ�ล้เข้ามา
+database = �านข้อมูล��น�ลาง
+database.button = �านข้อมูล
 savegame = เซฟเ�ม
 loadgame = โหลดเ�ม
 joingame = เข้าร่วมเ�ม
 customgame = เ�มที่�ำหนดเอง
 newgame = เริ่มเ�มใหม่
 none = <ไม่มี>
+none.found = [lightgray]<ไม่พบอะไรเลย>
+none.inmap = [lightgray]<ไม่มีใน�มพ>
 minimap = มินิ�มพ
 position = ตำ�หน่ง
 close = ปิด
-website = เว็ปไซต์
+website = เว็บไซต์
 quit = ออ�
 save.quit = เซฟ�ล้วออ�
 maps = �มพ
@@ -92,7 +121,7 @@ continue = ต่อ
 maps.none = [lightgray]ไม่มี�มพ!
 invalid = ไม่ถู�ต้อง
 pickcolor = เลือ�สี
-preparingconfig = �ำลังเตรียม Config
+preparingconfig = �ำลังเตรียมค่าปรับ�ต่ง
 preparingcontent = �ำลังเตรียมเนื้อหา
 uploadingcontent = �ำลังอัปโหลดเนื้อหา
 uploadingpreviewfile = �ำลังอัปโหลดไฟล์พรีวิว
@@ -100,135 +129,184 @@ committingchanges = �ำลังทำ�ารเปลี่ยน�ปล
 done = เรียบร้อย
 feature.unsupported = อุป�รณ์ของคุณไม่รองรับฟีเจอร์นี้
 
-mods.alphainfo = จำไว้ว่ามอดนั้นยังอยู่ในขั้น alpha �ละ[scarlet] อาจจะมีบัค[].\nโปรดรายงานปั�หาที่คุณพบใน Github ของ Mindustry หรือ ในเซิฟเวอร์ Discord
-mods = มอด
-mods.none = [lightgray]ไม่พบมอด!
-mods.guide = คู่มือ�ารทำมอด
+mods.initfailed = [red]⚠[] ไม่สามารถเปิดเ�ม Mindustry ได้ อาจเ�ิดจา�ม็อดที่ทำงานผิดป�ติ\n\nเพื่อป้อง�ัน�าร�ครชต่อเนื่อง [red]ม็อดทั้งหมดได้ทำ�ารปิดตัวลง[]
+mods = ม็อด
+mods.none = [lightgray]ไม่พบม็อด!
+mods.guide = คู่มือ�ารทำม็อด
 mods.report = รายงานบัค
-mods.openfolder = เปิดมอดโฟลเดอร์
+mods.openfolder = เปิดโฟลเดอร์ม็อด
+mods.viewcontent = ดูเนื้อหาม็อด
 mods.reload = โหลดใหม่
-mods.reloadexit = เ�มจะออ�เพื่อจะโหลดมอด
-mod.display = [gray]Mod:[orange] {0}
+mods.reloadexit = เ�มจะออ�เพื่อที่จะรีโหลดม็อด
+mod.installed = [[ติดตั้ง�ล้ว]
+mod.display = [gray]ม็อด:[orange] {0}
 mod.enabled = [lightgray]เปิดใช้งาน
 mod.disabled = [scarlet]ปิดใช้งาน
+mod.multiplayer.compatible = [gray]ใช้งานได้�ับโหมดผู้เล่นหลายคน
 mod.disable = ปิดใช้งาน
+mod.version = Version:
 mod.content = เนื้อหา:
-mod.delete.error = ไม่สามารถลบมอดได้. ไฟล์อาจอยู่ในระหว่าง�ารใช้งาน.
-mod.requiresversion = [scarlet]เวอร์ชั่นเ�มขั้นต่ำที่ต้อง�าร: [accent]{0}
-mod.outdated = [scarlet]ไม่สามารถใช้ได้ในเวอร์ชั่น V6 (ไม่มี minGameVersion: 105)
-mod.missingdependencies = [scarlet]dependencies หาย: {0}
+mod.delete.error = ไม่สามารถลบม็อดออ�ได้ ไฟล์อาจอยู่ในระหว่าง�ารใช้งาน
+mod.incompatiblegame = [red]เ�มล้าสมัย
+mod.incompatiblemod = [red]เข้า�ันไม่ได้
+mod.blacklisted = [red]ไม่ได้รับ�ารสนับสนุน
+mod.unmetdependencies = [red]ม็อดพึ่งพาขาดหาย: {0}
 mod.erroredcontent = [scarlet]เนื้อหาผิดพลาด
-mod.errors = มีข้อผิดพลาดเ�ิดขึ้นระหว่าโหลดเนื้อหา
-mod.noerrorplay = [scarlet]คุณมีมอดที่มีข้อผิดพลาด.[] �รุณาปิดมอดนั้นๆหรือ��้ไขข้อผิดพลาด�่อนที่จะเล่น
-mod.nowdisabled = [scarlet]มอด '{0}' ไม่มี dependencies:[accent] {1}\n[lightgray]จำเป็นต้องโหลดมอดพว�นี้�่อน\nมอดนี้จะถู�ปิดใช้งานโดยอัตโนมัติ
+mod.circulardependencies = [red]ม็อดพึ่งพาวนลูป
+mod.incompletedependencies = [red]ม็อดพึ่งพาไม่ครบ
+mod.requiresversion.details = ต้อง�ารเวอร์ชั่นเ�ม: [accent]{0}[]\nเ�มของคุณนั้นเ�่าเ�ินไป ม็อดนี้ต้อง�ารเวอร์ชั่นเ�มที่ใหม่�ว่านี้ (อาจเป็นรุ่น beta/alpha) เพื่อที่จะทำงานได้
+mod.outdatedv7.details = ม็อดนี้ไม่สามารถใช้งานร่วม�ับเ�มเวอร์ชั่นล่าสุดได้ ผู้พัฒนาม็อดจะต้องอัปเดตม็อด �ละเพิ่ม [accent]minGameVersion: 136[] ลงในไฟล์ [accent]mod.json[] ของม็อด
+mod.blacklisted.details = ม็อดนี้ถู�ขึ้นบั�ชีดำเพราะทำให้เ�ิดข้อขัดข้อง�ละปั�หาอื่นๆ ในเวอร์ชั่นเ�มนี้ ห้ามใช้เด็ดขาด
+mod.missingdependencies.details = ม็อดนี้ขาดม็อดพึ่งพา: {0}
+mod.erroredcontent.details = เ�มเ�ิดปั�หาในระหว่าง�ารโหลด �รุณาสอบถามผู้พัฒนาม็อดเพื่อให้��้ไข
+mod.circulardependencies.details = ม็อดนี้มีม็อดพึ่งพาที่พึ่งพาซึ่ง�ัน�ละ�ัน
+mod.incompletedependencies.details = ม็อดนี้ไม่สามารถโหลดได้เนื่องจา�ม็อดพึ่งพามีปั�หาหรือมีม็อดพึ่งพาไม่ครบ: {0}
+mod.requiresversion = ต้อง�ารเวอร์ชั่นเ�ม: [red]{0}
+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 = นำเข้าม็อด
 mod.import.file = นำเข้าไฟล์
-mod.import.github = นำเข้ามอดจา� Github
-mod.jarwarn = [scarlet]มอดไฟล์ JAR นั้นค่อนข้างไม่ปลอดภัย.[]\n�รุณาเช็คให้�น่ใจว่าคุณนำเข้ามอดนี้จะ�หล่งที่เชื่อถือได้!
-mod.item.remove = ไอเทมนี้เป็นส่วนหนึ่งของมอด[accent] '{0}'[]. หา�ต้อง�ารนำออ� �รุณาถอด�ารติดตั้งมอดนั้น
-mod.remove.confirm = มอดนี้จะถู�ลบ
+mod.import.github = นำเข้าม็อดจา� Github
+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 = �่อนที่จะนำมอดไปลงใน workshop, คุณต้องใส่รูปพรีวิว�่อน\nใส่รูปชื่อ[accent] preview.png[] ลงในโฟลเดอร์ของมอด�ล้วลองอี�ครั้ง
-mod.folder.missing = มอดที่อยู่ในรูป�บบโฟลเดอร์เท่านั้นที่สามารถลงใน workshop ได้\nunzip ไฟล์�ล้วลบไฟล์ zip เ�่า �ล้วรีสตาร์ทเ�มหรือรีโหลดมอด
-mod.scripts.disable = เครื่องของคุณไม่รองรับมอดที่มี scripts. คุณจำเป็นต้องปิดมอดเหล่านี้�่อนจึงจะสามารถเล่นได้.
+mod.missing = เซฟนี้มีม็อดที่คุณพึ่งอัปเดตหรือไม่ได้ติดตั้ง�ล้ว อาจทำให้เซฟเสีย คุณ�น่ใจหรือว่าจะโหลดเซฟนี้?\n[lightgray]ม็อดที่ใช้:\n{0}
+mod.preview.missing = �่อนที่จะนำม็อดไปลงในเวิร์�ช็อป คุณต้องใส่รูปพรีวิว�่อน\nใส่รูปชื่อ[accent] preview.png[] ลงในโฟลเดอร์ของม็อด�ล้วลองอี�ครั้ง
+mod.folder.missing = ม็อดที่อยู่ในรูป�บบโฟลเดอร์เท่านั้นที่สามารถลงในเวิร์�ช็อปได้\nunzip ไฟล์�ล้วลบไฟล์ zip เ�่า �ล้วรีสตาร์ทเ�มหรือรีโหลดม็อด
+mod.scripts.disable = เครื่องของคุณไม่รองรับม็อดที่มีสคริปต์  คุณจำเป็นต้องปิดม็อดเหล่านี้�่อนจึงจะสามารถเล่นได้
 
 about.button = เ�ี่ยว�ับ
 name = ชื่อ:
-noname = ใส่ชื่อ[accent] ผู้เล่น[] �่อน.
-planetmap = �ผนที่ดาวเคราะห์
-launchcore = ส่ง Core
+noname = ใส่ชื่อ[accent]ผู้เล่น[]�่อน
+search = ค้นหา:
+planetmap = �ผนที่ดาว
+launchcore = ส่ง��น�ลาง
 filename = ชื่อไฟล์:
-unlocked = เนื้อหาใหม่ปลดล็อค!
-completed = [accent]สำเร็จ
-techtree = ความคืบหน้าใน�ารวิจัย
-research.list = [lightgray]วิจัย:
+unlocked = ปลดล็อ�เนื้อหาใหม่!
+available = มี�ารวิจัยใหม่พร้อมปลดล็อ�!
+unlock.incampaign = < ปลดล็อ�ใน�คมเป�เพื่อดูรายละเอียด >
+campaign.select = เลือ�เนื้อเรื่องที่จะเริ่มต้น
+campaign.none = [lightgray]โปรดเลือ�ดาวที่จะเริ่มต้น\nคุณสามารถสลับ�ลับไปตอนไหน�็ได้
+campaign.erekir = เนื้อหาที่ใหม่�ว่า�ละขัดเ�ลามามา��ว่า เนื้อเรื่องดำเนินเป็นเส้นตรงโดยซะส่วนให�่\n\n�มพมีคุณภาพที่ดี�ว่า ให้ประสบ�ารณ์โดยรวมที่มีคุณภาพ
+campaign.serpulo = ประสบ�ารณ์สุดคลาสสิ� เนื้อหาเยอะ�ว่า เปิด�ว้างมา��ว่า\n\n�มพ�ละ�ลไ�ของ�คมเป�อาจไม่สมดุล ขัดเ�ลามาน้อย�ว่า
+campaign.difficulty = Difficulty
+completed = [accent]วิจัย�ล้ว
+techtree = ต้นไม้เทคโนโลยี
+techtree.select = เลือ�ต้นไม้�ห่งเทคโนโลยี
+techtree.serpulo = เซอร์ปูโล่
+techtree.erekir = เอเรเ�ียร์
+research.load = โหลด
+research.discard = ทอดทิ้ง
+research.list = [lightgray]�ารวิจัย:
 research = วิจัย
-researched = [lightgray]{0} วิจัย�ล้ว.
-research.progress = เสร็จ�ล้ว {0}%
+researched = [lightgray]{0} วิจัย�ล้ว
+research.progress = วิจัย�ล้ว {0}%
 players = {0} ผู้เล่น
 players.single = {0} ผู้เล่น
 players.search = ค้นหา
 players.notfound = [gray]ไม่พบผู้เล่น
-server.closing = [accent]�ำลังปิดเซิฟเวอร์...
-server.kicked.kick = คุณถู�เตะออ�จา�เซิฟเวอร์!
-server.kicked.whitelist = คุณไม่ได้อยู่ใน whitelisted
-server.kicked.serverClose = เซิฟเวอร์ถู�ปิด.
-server.kicked.vote = คุณถู�โหวตเตะออ�. บัยบาย.
-server.kicked.clientOutdated = client เ�่า! �รุณาอัปเดตเ�มของคุณ!
-server.kicked.serverOutdated = server เ�่า! โปรดถามเจ้าของเซิฟเพื่ออัปเดต!
-server.kicked.banned = คุณถู��บนในเซิฟเวอร์นี้
-server.kicked.typeMismatch = เซิฟเวอร์นี้ไม่เข้า�ับ build type ของคุณ.
-server.kicked.playerLimit = เซิฟเวอร์เต็ม. �รุณารอให้เซิฟเวอร์ว่าง�่อน.
-server.kicked.recentKick = คุณเพิ่งถู�เตะออ�จา�เซิฟเวอร์นี้.\n�รุณารอสั�ครู่เพื่อเข้าร่วมอี�ครั้ง
-server.kicked.nameInUse = มีคนที่ใช้ชืชื่อนี้\nอยู่ในเซิฟเวอร์�ล้ว
+server.closing = [accent]�ำลังปิดเซิร์ฟเวอร์...
+server.kicked.kick = คุณถู�เตะออ�จา�เซิร์ฟเวอร์!
+server.kicked.whitelist = คุณไม่ได้ถู�รับเชิ�\nคนที่ถู�รับเชิ�เท่านั้นที่จะเข้าได้
+server.kicked.serverClose = เซิร์ฟเวอร์ถู�ปิด
+server.kicked.vote = คุณถู�โหวตให้เตะออ� บัยบาย
+server.kicked.clientOutdated = ไคลเอนต์ล้าสมัย! �รุณาอัปเดตเ�มของคุณ!
+server.kicked.serverOutdated = เซิร์ฟเวอร์ล้าสมัย! โปรดถามโฮสต์เพื่อให้อัปเดต!
+server.kicked.banned = คุณถู��บนในเซิร์ฟเวอร์นี้
+server.kicked.typeMismatch = เซิร์ฟเวอร์นี้ไม่เข้า�ับประเภทเวอร์ชั่นของคุณ
+server.kicked.playerLimit = เซิร์ฟเวอร์เต็ม �รุณารอให้เซิร์ฟเวอร์ว่าง�่อน
+server.kicked.recentKick = คุณเพิ่งถู�เตะออ�จา�เซิร์ฟเวอร์นี้\n�รุณารอสั�ครู่เพื่อเข้าร่วมอี�ครั้ง
+server.kicked.nameInUse = มีคนที่ใช้ชื่อนี้\nอยู่ในเซิร์ฟเวอร์�ล้ว
 server.kicked.nameEmpty = ชื่อของคุณไม่สามารถใช้ได้
-server.kicked.idInUse = คุณเชื่อมต่อ�ับเซิฟเวอร์นี้อยู่�ล้ว เราไม่อนุ�าตให้เชื่อมต่อ 2 บั�ชีในเซฟเวอร์เดียว�ัน
-server.kicked.customClient = เซิฟเวอร์นี้ไม่รองรับ builds ปรับ�ต่ง. �รุณาโหลดของ official.
+server.kicked.idInUse = คุณเชื่อมต่อ�ับเซิร์ฟเวอร์นี้อยู่�ล้ว เราไม่อนุ�าตให้เชื่อมต่อสองบั�ชีในเซิร์ฟเวอร์เดียว�ัน
+server.kicked.customClient = เซิร์ฟเวอร์นี้ไม่รองรับเวอร์ชั่นที่ถู�ปรับ�ต่ง �รุณาโหลดเวอร์ชั่นอย่างเป็นทาง�ารของ Mindustry
 server.kicked.gameover = จบเ�ม!
-server.kicked.serverRestarting = เซิฟเวอร์�ำลังเริ่มใหม่.
-server.versions = เวอร์ชั่นของคุณ:[accent] {0}[]\nเวอร์ชั่นของเซิฟเวอร์:[accent] {1}[]
-host.info = ปุ่ม [accent]โฮสต์[] นั้นโฮสต์เซฟเวอร์ที่พอร์ท [scarlet]6567[]. \nทุ�คนที่อยู่ใน [lightgray]wifi หรือ local network[] เดียว�ันจะสามารถเห็นเซิฟเวอร์ของคุณในลิสของเซิฟเวอร์ได้\n\nถ้าคุณต้อง�ารให้ผู้เล่นอื่นๆสามารถเชื่อมต่อได้จา�ทุ�ที่โดยใช้ IP, จำเป็นจะต้องใช้�าร [accent]port forwarding[] \n\n[lightgray]Note: ถ้าผู้เล่นคนใดมีปั�หาใน�ารเชื่อมต่อ LAN ของคุณ เช็คให้�น่ใจว่าคุณได้อนุ�าตให้ Mindustry เข้าถึง local network ของคุณใน�ารตั้งค่า firewall. จำให้ว่า network สาธารณะบางครั้งไม่อนุ�าต�ารค้นหาเซิฟเวอร์
-join.info = คุณสามารถใส่ [accent]IP ของเซิฟเวอร์[] เพื่อที่จะเชื่อมต่อหรือค้นหา เซิฟเวอร์ที่ใช้[accent]local network[] จะสามารถเชื่อมโดยใช้\n LAN หรือ WAN �็ได้\n\n[lightgray]โน้ต: เ�มนี้ไม่มีระบบค้นหาเซิฟเวอร์ global ให้อัตโนมัติserver list; ถ้าคุณต้อง�ารเชื่อมต่อ�ับเซิฟเวอร์โดยใช้ IP, คุณจำเป็นต้องถาม IP ผู้เล่นที่โฮสต์เซิฟเวอร์นั้นๆ.
-hostserver = โฮสต์เ�ม Multiplayer
+server.kicked.serverRestarting = เซิร์ฟเวอร์�ำลังเริ่มใหม่
+server.versions = เวอร์ชั่นของคุณ:[accent] {0}[]\nเวอร์ชั่นของเซิร์ฟเวอร์:[accent] {1}[]
+host.info = ปุ่ม[accent]โฮสต์[]นั้นโฮสต์เซิร์ฟเวอร์ที่พอร์ต [scarlet]6567[] \nทุ�คนที่อยู่ใน [lightgray]Wi-Fi หรือเครือข่ายท้องถิ่น[]เดียว�ันจะสามารถเห็นเซิร์ฟเวอร์ของคุณในรายชื่อของ\nเซิร์ฟเวอร์ได้\n\nถ้าคุณต้อง�ารให้ผู้เล่นอื่นๆ สามารถเชื่อมต่อได้จา�ทุ�ที่โดยใช้ IP คุณจำเป็นจะต้องใช้[accent]�ารส่งต่อพอร์ต (Port Forwarding)[] \n\n[lightgray]โน๊ต: ถ้าผู้เล่นคนใดมีปั�หาใน�ารเชื่อมต่อ LAN ของคุณ เช็�ให้�น่ใจว่าคุณได้อนุ�าตให้ Mindustry เข้าถึงเครือข่ายท้องถิ่นของคุณใน�ารตั้งค่า Firewall จำไว้ว่าเครือข่ายสาธารณะบางครั้งอาจไม่อนุ�าต�าร\nค้นหาเซิร์ฟเวอร์
+join.info = คุณสามารถใส่ [accent]IP ของเซิร์ฟเวอร์[]เพื่อที่จะเชื่อมต่อหรือค้นหาเซิร์ฟเวอร์ เซิร์ฟเวอร์ที่ใช้[accent]เครือข่ายท้องถิ่น[]จะสามารถเชื่อมโดยใช้\n LAN หรือ 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 = �ำลังค้นหาเซิฟเวอร์
-server.refreshing = �ำลังรีเฟรชเซิฟเวอร์
-hosts.none = [lightgray]ไม่พบเซิฟเวอร์ใน local!
+hosts.discovering = �ำลังค้นหาเซิร์ฟเวอร์ใน LAN
+hosts.discovering.any = �ำลังค้นหาเซิร์ฟเวอร์
+server.refreshing = �ำลังรีเฟรชเซิร์ฟเวอร์
+hosts.none = [lightgray]ไม่พบเซิร์ฟเวอร์ท้องถิ่น!
 host.invalid = [scarlet]ไม่สามารถเชื่อมต่อ�ับโฮสต์ได้
 
-servers.local = เซิฟเวอร์ Local
-servers.remote = เซิฟเวอร์ Remote
-servers.global = เซิฟเวอร์ Community
+servers.local = เซิร์ฟเวอร์ท้องถิ่น
+servers.local.steam = เ�มสาธารณะ & เซิร์ฟเวอร์ท้องถิ่น
+servers.remote = เซิร์ฟเวอร์ทางไ�ล
+servers.global = เซิร์ฟเวอร์ของชุมชน
 
-trace = Trace ผู้เล่น/ ��ะรอยผู้เล่น
+servers.disclaimer = ผู้พัฒนา[accent]ไม่ได้[]เป็นเจ้าของหรือควบคุมเซิร์ฟเวอร์ของชุมชน\n\nในเซิร์ฟเวอร์อาจมีเนื้อหาของผู้เล่นที่ไม่เหมาะ�ับทุ�เพศทุ�วัย
+servers.showhidden = �สดงเซิร์ฟเวอร์ที่ซ่อนไว้
+server.shown = �สดง
+server.hidden = ซ่อน
+viewplayer = ผู้เล่นที่ดูอยู่: [accent]{0}
+
+trace = ��ะรอยผู้เล่น
 trace.playername = ชื่อผู้เล่น: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = ID พิเศษ: [accent]{0}
-trace.mobile = Mobile Client : [accent]{0}
-trace.modclient = Client �บบ�ำหนดเอง: [accent]{0}
-invalidid = client ID ไม่ถู�ต้อง! �รุณารายงานบัคนี้
+trace.id = ID: [accent]{0}
+trace.language = ภาษา: [accent]{0}
+trace.mobile = ไคลเอนต์โทรศัพท์: [accent]{0}
+trace.modclient = ไคลเอนต์ปรับ�ต่ง: [accent]{0}
+trace.times.joined = ครั้งที่เข้า: [accent]{0}
+trace.times.kicked = ครั้งที่โดนเตะ: [accent]{0}
+trace.ips = IPs:
+trace.names = ชื่อ:
+invalidid = ไคลเอนต์ ID ไม่ถู�ต้อง! �รุณารายงานบัคนี้
+player.ban = �บน
+player.kick = เตะ
+player.trace = ��ะรอย
+player.admin = ปรับสถานะ�อดมิน
+player.team = เปลี่ยนทีม
 server.bans = �บน
 server.bans.none = ไม่พบผู้เล่นที่ถู��บน!
 server.admins = �อดมิน
 server.admins.none = ไม่พบ�อดมิน!
-server.add = เพิ่มเซิฟเวอร์
-server.delete = คุณ�น่ใจหรือว่าจะลบเซิฟเวอร์นี้?
-server.edit = ��้ไขเซิฟเวอร์
-server.outdated = [crimson]Server ล้าสมัย![]
-server.outdated.client = [crimson]Client ล้าสมัย![]
-server.version = [gray]เวอร์ชั่น{0} {1}
-server.custombuild = [accent]Build
+server.add = เพิ่มเซิร์ฟเวอร์
+server.delete = คุณ�น่ใจหรือว่าจะลบเซิร์ฟเวอร์นี้?
+server.edit = ��้ไขเซิร์ฟเวอร์
+server.outdated = [crimson]เซิร์ฟเวอร์ล้าสมัย![]
+server.outdated.client = [crimson]ไคลเอนต์ล้าสมัย![]
+server.version = [gray]v{0} {1}
+server.custombuild = [accent]เวอร์ชั่นปรับ�ต่ง
 confirmban = คุณ�น่ใจหรือว่าจะ�บนผู้เล่นนี้?
 confirmkick = คุณ�น่ใจหรือว่าจะเตะผู้เล่นนี้ออ�?
-confirmvotekick = คุณ�น่ใจหรือว่าจะโหวตเตะผู้เล่นนี้ออ�?
 confirmunban = คุณ�น่ใจหรือว่าจะเลิ��บนผู้เล่นนี้?
-confirmadmin = คุณ�น่ใจหรือว่าจะเปลี่ยนผู้เล่นคนนี้เป็น�อดมิน?
-confirmunadmin = คุณ�น่ใจหรือว่าจะลบสถานะ�ารเป็น�อดมินของผู้เล่นนี้ง?
+confirmadmin = คุณ�น่ใจหรือว่าจะ�ต่งตั้งผู้เล่นคนนี้เป็น�อดมิน?
+confirmunadmin = คุณ�น่ใจหรือว่าจะลบสถานะ�ารเป็น�อดมินของผู้เล่นนี้?
+votekick.reason = เหตุผล�ารโหวตเตะ
+votekick.reason.message = คุณ�น่ใจหรือว่าจะโหวตเตะ "{0}[white]"?\nถ้าใช่ โปรดระบุเหตุผล:
 joingame.title = เข้าร่วมเ�ม
 joingame.ip = ที่อยู่:
 disconnect = ตัด�ารเชื่อมต่อ�ล้ว
 disconnect.error = �ารเชื่อมต่อมีปั�หา
 disconnect.closed = �ารเชื่อมต่อถู�ปิด�ล้ว
-disconnect.timeout = Timed out.
-disconnect.data = �ารโหลดข้อมูลของ world ผิดพลาด!
-cantconnect = ไม่สามารถเข้าร่วมเซิฟเวอร์ ([accent]{0}[]).
+disconnect.timeout = หมดเวลา
+disconnect.data = �ารโหลดข้อมูลของโล�ผิดพลาด!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
+cantconnect = ไม่สามารถเข้าร่วมเซิร์ฟเวอร์ ([accent]{0}[])
 connecting = [accent]�ำลังเชื่อมต่อ...
-connecting.data = [accent]�ำลังโหลดข้อมูลของ world ...
-server.port = Port:
-server.addressinuse = มีคนใช้ Address นี้�ล้ว!
-server.invalidport = เลข port ไม่ถู�ต้อง!
-server.error = [crimson]�ารโฮตส์เซิฟเวอร์ผิดพลาด
+reconnecting = [accent]�ำลังเชื่อมต่อใหม่...
+connecting.data = [accent]�ำลังโหลดข้อมูลของโล� ...
+server.port = พอร์ต:
+server.invalidport = เลขพอร์ตไม่ถู�ต้อง!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
+server.error = [crimson]�ารโฮสต์เซิร์ฟเวอร์ผิดพลาด
 save.new = เซฟใหม่
-save.overwrite = คุณ�ใจหรือว่าจะเซฟทับ\nเซฟนี้?
+save.overwrite = คุณ�น่ใจหรือว่าจะเซฟทับ\nเซฟนี้?
+save.nocampaign = ไม่สามารถนำเข้าไฟล์เซฟเดี่ยวๆ จา��คมเป�ได้
 overwrite = เขียนทับ
 save.none = ไม่พบเซฟ!
 savefail = เซฟเ�มผิดพลาด!
@@ -242,158 +320,236 @@ save.import = นำเข้าเซฟ
 save.newslot = ชื่อเซฟ:
 save.rename = เปลี่ยนชื่อ
 save.rename.text = ชื่อใหม่:
-selectslot = เลือ�เซฟ.
-slot = [accent]Slot {0}
+selectslot = เลือ�เซฟ
+slot = [accent]ช่องที่ {0}
 editmessage = ��้ไขข้อความ
 save.corrupted = ไฟล์เซฟเสียหายหรือไม่ถู�ต้อง!
 empty = <ว่างเปล่า>
 on = เปิด
 off = ปิด
+save.search = ค้นหาเซฟเ�ม...
 save.autosave = เซฟอัตโนมัติ: {0}
 save.map = �มพ: {0}
-save.wave = Wave {0}
-save.mode = โหมดของเ�ม: {0}
+save.wave = คลื่นที่ {0}
+save.mode = เ�มโหมด: {0}
 save.date = เซฟล่าสุด: {0}
 save.playtime = เวลาที่เล่นไป: {0}
-warning = คำเตือน.
+warning = คำเตือน
 confirm = ต�ลง
 delete = ลบ
-view.workshop = เปิดใน Workshop
-workshop.listing = ��้ไข Workshop Listing
+view.workshop = เปิดในเวิร์�ช็อป
+workshop.listing = ��้ไขหน้าราย�ารเวิร์�ช็อป
 ok = โอเค
 open = เปิด
-customize = �ฎ�บบ�ำหนดเอง
+customize = ตั้งค่า�ฎ
 cancel = ย�เลิ�
+command = สั่ง�าร
+command.queue = คิว
+command.mine = ขุด
+command.repair = ซ่อม�ซม
+command.rebuild = สร้างใหม่
+command.assist = ช่วยเหลือผู้เล่น
+command.move = ขยับ
+command.boost = บูสต์
+command.enterPayload = เข้าบล็อ�บรรทุ�
+command.loadUnits = โหลดยูนิต
+command.loadBlocks = โหลดบล็อ�
+command.unloadPayload = วางสิ่งบรรทุ�
+command.loopPayload = วนซำ้�ารขนถ่ายยูนิต
+stance.stop = ย�เลิ�คำสั่ง
+stance.shoot = ท่าที: ยิง
+stance.holdfire = ท่าที: หยุดยิง
+stance.pursuetarget = ท่าที: ไล่ตามเป้าหมาย
+stance.patrol = ท่าที: ลาดตระเวน
+stance.ram = ท่าที: พุ่งชน\n[lightgray]ขยับเป็นเส้นตรงโดยที่ไม่มี�ารตรวจสอบเส้นทาง
 openlink = เปิดลิ้งค์
 copylink = คัดลอ�ลิ้งค์
 back = �ลับ
+max = เต็ม
+objective = เป้าหมาย�มพ
+crash.export = ส่งออ�บันทึ�ข้อขัดข้อง
+crash.none = ไม่พบบันทึ�ข้อขัดข้อง
+crash.exported = ส่งออ�บันทึ�ข้อขัดข้อง�ล้ว
 data.export = ส่งออ�ข้อมูล
 data.import = นำเข้าข้อมูล
 data.openfolder = เปิดโฟลเดอร์ข้อมูล
-data.exported = ข้อมูลส่งออ��ล้ว
-data.invalid = นี่ไม่ใช่ข้อมูลเ�มที่ถู�ต้อง.
-data.import.confirm = �ารนำเข้าข้อมูลจา�ภายนอ�จะเขียนทับข้อมูลเ�่า[scarlet]ทั้งหมด[]\n[accent]�ละไม่สามารถย้อน�ลับได้![]\n\nหลังจา�ที่นำข้อมูล�ล้วเ�มจะปิดลงโดยทันที
+data.exported = ส่งออ�ข้อมูล�ล้ว
+data.invalid = นี่ไม่ใช่ข้อมูลเ�มที่ถู�ต้อง
+data.import.confirm = �ารนำเข้าข้อมูลจา�ภายนอ�จะเขียนทับข้อมูลเ�่า[scarlet]ทั้งหมด[]\n[accent]�ละจะไม่สามารถย้อน�ลับได้![]\n\nหลังจา�ที่นำเข้าข้อมูล�ล้วเ�มจะปิดตัวลงโดยทันที
 quit.confirm = คุณ�น่ใจหรือว่าจะออ�?
-quit.confirm.tutorial = คุณ�น่ใจหรือว่าคุณ�ำลังทำอะไรอยู่?\n�ารสอนเล่นสามารถเล่นได้อี�ครั้งใน[accent] ตั้งค่า->เ�ม->เล่น�ารสอนเล่นอี�ครั้ง[]
 loading = [accent]�ำลังโหลด...
-reloading = [accent]�ำลังรีโหลดมอด...
+downloading = [accent]�ำลังดาวน์โหลด...
 saving = [accent]�ำลังเซฟ...
-respawn = [accent][[{0}]][]เพื่อเ�ิดใหม่ที่ core
-cancelbuilding = [accent][[{0}][]เพื่อเคลีย�ผน
-selectschematic = [accent][[{0}][]เพื่อเลือ��ละคัดลอ�
-pausebuilding = [accent][[{0}][]เพื่อหยุด�ารสร้างชั่วคราว
-resumebuilding = [scarlet][[{0}][]เพื่อสร้างต่อ
-wave = [accent]Wave {0}
-wave.cap = [accent]Wave {0}/{1}
-wave.waiting = [lightgray]Wave ในอี� {0}
-wave.waveInProgress = [lightgray]Wave �ำลังดำเนิน�าร
+respawn = �ด [accent][[{0}][] เพื่อเ�ิดใหม่ที่��น�ลาง
+cancelbuilding = �ด [accent][[{0}][] เพื่อเคลียร์�ผน
+selectschematic = �ด [accent][[{0}][] เพื่อเลือ��ละคัดลอ�
+pausebuilding = �ด [accent][[{0}][] เพื่อหยุด�ารสร้างชั่วคราว
+resumebuilding = �ด [scarlet][[{0}][] เพื่อสร้างต่อ
+enablebuilding = �ด [scarlet][[{0}][] เพื่อเปิดใช้งาน�ารสร้าง
+showui = หน้าต่างถู�ซ่อน\n�ด [accent][[{0}][] เพื่อเปิดหน้าต่าง
+commandmode.name = [accent]โหมดสั่ง�าร
+commandmode.nounits = [ไม่มียูนิต]
+wave = [accent]คลื่นที่ {0}
+wave.cap = [accent]คลื่น {0}/{1}
+wave.waiting = [lightgray]คลื่นต่อไปใน {0}
+wave.waveInProgress = [lightgray]คลื่น�ำลังดำเนิน�าร
 waiting = [lightgray]�ำลังรอ...
 waiting.players = รอผู้เล่น...
-wave.enemies = ศัตรูคงเหลือ [lightgray]{0}
-wave.enemy = ศัตรูคงเหลือ [lightgray]{0} 
-wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
-wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
+wave.enemies = ศัตรูคงเหลือ [lightgray]{0} [accent]ตัว
+wave.enemycores = [accent]{0}[lightgray] ��น�ลางศัตรู
+wave.enemycore = [accent]{0}[lightgray] ��น�ลางศัตรู
+wave.enemy = ศัตรูคงเหลือ [lightgray]{0} [accent]ตัว
+wave.guardianwarn = ผู้พิทั�ษ์จะปรา��ตัวในอี� [accent]{0}[] คลื่น!
+wave.guardianwarn.one = ผู้พิทั�ษ์จะปรา��ตัวในอี� [accent]{0}[] คลื่น! เตรียมตัวให้พร้อม!
 loadimage = โหลดรูป
 saveimage = เซฟรูป
 unknown = ไม่ทราบ
 custom = �ำหนดเอง
-builtin = Built-In
+builtin = ค่าเริ่มต้น
 map.delete.confirm = คุณ�น่ใจหรือว่าจะลบ�มพนี้? �าร�ระทำครั้งนี้ไม่สามารถย้อน�ลับได้!
 map.random = [accent]สุ่ม�มพ
-map.nospawn = �มพนี้ไม่มี core ที่จะให้ผู้เล่นเ�ิด! �รุณาใส่ core[accent] สีส้ม[] ใน editor
-map.nospawn.pvp = �มพนี้ไม่มี core ของศัตรูสำหรับให้ผู้เล่นเ�ิด! �รุณาใส่ core[scarlet] ที่ไม่ใช่สีส้ม[] ใน editor
-map.nospawn.attack = �มพนี้ไม่มี core ของศัตรูสำหรับให้ผู้เล่นโจมตี! �รุณาใส่ core[scarlet] สี�ดง[] ใน editor
+map.nospawn = �มพนี้ไม่มี��น�ลางให้ผู้เล่นเ�ิด! �รุณาใส่��น�ลาง {0} ลงในตัว��้ไข
+map.nospawn.pvp = �มพนี้ไม่มี��น�ลางของศัตรูสำหรับให้ผู้เล่นเ�ิด! �รุณาใส่��น�ลาง[scarlet]ที่ไม่ใช่สีส้ม[] ลงในตัว��้ไข
+map.nospawn.attack = �มพนี้ไม่มี��น�ลางของศัตรูสำหรับให้ผู้เล่นโจมตี! �รุณาใส่��น�ลาง {0} ลงในตัว��้ไข
 map.invalid = โหลด�มพผิดพลาด: ไฟล์�มพเสียหายหรือไม่ถู�ต้อง
 workshop.update = อัปเดตไอเท็ม
-workshop.error = ผิดพลาดใน�ารนำ workshop มา รายละเอียดดังนี้: {0}
-map.publish.confirm = คุณ�น่ใจหรือว่าจะเผย�พร่�มพนี้?\n\n[lightgray]คุณต้อง�น่ใจ�่อนว่าคุณเห็นด้วย�ับ Workshop EULA, มิฉนั้น�มพจะไม่ปรา��!
-workshop.menu = เล์อ�ว่าจะทำอะไร�ับไอเท็มนี้
+workshop.error = เ�ิดข้อผิดพลาดใน�ารนำเข้าเวิร์�ช็อป รายละเอียดดังนี้: {0}
+map.publish.confirm = คุณ�น่ใจหรือว่าจะเผย�พร่�มพนี้?\n\n[lightgray]คุณต้อง�น่ใจ�่อนว่าคุณเห็นด้วย�ับ Workshop EULA มิฉะนั้น�มพของคุณจะไม่ปรา��!
+workshop.menu = เลือ�ว่าจะทำอะไร�ับไอเท็มนี้
 workshop.info = ข้อมูลไอเท็ม
 changelog = สิ่งที่เปลี่ยนไป (ไม่จำเป็น):
+updatedesc = เขียนทับหัวข้อ & คำอธิบาย
 eula = Steam EULA
-missing = ไอเท็มนี้ถู�ลบหรือย้าย\n[lightgray]ย�เลิ��ารเชื่อมต่อของ workshop listing �ล้ว
+missing = ไอเท็มนี้ถู�ลบหรือย้าย\n[lightgray]ย�เลิ��ารเชื่อมต่อของหน้าราย�ารเวิร์�ช็อป�ล้ว
 publishing = [accent]�ำลังเผย�พร่...
-publish.confirm = คุณ�น่ใจหรือว่าจะเผย�พร่สิ่งนี้?\n\n[lightgray]คุณต้อง�น่ใจ�่อนว่าคุณเห็นด้วย�ับ Workshop EULA, มิฉนั้นไอเท็มของคุณจะไม่ปรา��!
-publish.error = �ารเผย�พร่ไอเท็มดังต่อไปนี้ผิดพลาด: {0}
-steam.error = ไม่สามารถเริ่ม Steam service ได้\nError: {0}
+publish.confirm = คุณ�น่ใจหรือว่าจะเผย�พร่สิ่งนี้?\n\n[lightgray]คุณต้อง�น่ใจ�่อนว่าคุณเห็นด้วย�ับ Workshop EULA มิฉะนั้นไอเท็มของคุณจะไม่ปรา��!
+publish.error = เ�ิดข้อผิดพลาด�ารเผย�พร่ไอเท็มดังต่อไปนี้: {0}
+steam.error = ไม่สามารถเริ่ม�ารบริ�าร Steam ได้\nข้อผิดพลาด: {0}
+editor.planet = ดาว:
+editor.sector = เซ็�เตอร์:
+editor.seed = ซีด:
 
+editor.cliffs = เปลี่ยน�ำ�พงเป็นหน้าผา
 editor.brush = �ปรง
-editor.openin = เปิดใน Editor
+editor.openin = เปิดในตัว��้ไข
 editor.oregen = �ารเ�ิดของ�ร่
 editor.oregen.info = �ารเ�ิดของ�ร่:
-editor.mapinfo = ข้อมูลของ�มพ
+editor.mapinfo = ข้อมูล�มพ
 editor.author = ผู้สร้าง:
 editor.description = คำอธิบาย:
 editor.nodescription = �มพจำเป็นต้องมีคำอธิบายอย่างน้อย 4 ตัวอั�ษรจึงจะสามารถเผย�พร่ได้
-editor.waves = Waves:
-editor.rules = �ฎ:
-editor.generation = �ารเ�ิด:
+editor.waves = คลื่น
+editor.rules = �ฎ
+editor.generation = เจนเนอเรชั่น
+editor.objectives = เป้าหมาย
+editor.locales = ชุดภาษาท้องถิ่น
+editor.worldprocessors = ตัวประมวลผลโล�
+editor.worldprocessors.editname = ��้ไขชื่อ
+editor.worldprocessors.none = [lightgray]ไม่พบตัวประมวลผลโล�ใน�มพ!\nสามารถไปเพิ่มในตัว��้ไข�มพ หรือ�ดปุ่ม \ue813 เพิ่ม ด้านล่าง
+editor.worldprocessors.nospace = ไม่มีพื้นที่ให้วางตัวประมวลผลโล�!\nนี่คุณวางสิ่ง�่อสร้างไว้ทั่ว�มพเลยหรอ? ทำไปทำไม?
+editor.worldprocessors.delete.confirm = คุณ�น่ใจหรือว่าจะลบตัวประมวลผลโล�นี้?\n\nถ้าหา�มันถู�ล้อมด้วย�ำ�พงธรรมชาติ มันจะถู��ทนที่ด้วย�ำ�พงนั้น
 editor.ingame = ��้ไขในเ�ม
-editor.publish.workshop = เผย�พร่บน Workshop
+editor.playtest = เล่นทดสอบ
+editor.publish.workshop = เผย�พร่บนเวิร์�ช็อป
 editor.newmap = �มพใหม่
-editor.center = Center
-workshop = Workshop
-waves.title = Waves
+editor.center = ศูนย์�ลาง�มพ
+editor.search = ค้นหา�มพ...
+editor.filters = ตัว�รอง�มพ
+editor.filters.mode = เ�มโหมด:
+editor.filters.type = ประเภท�มพ:
+editor.filters.search = ค้นหาจา�:
+editor.filters.author = ผู้สร้าง
+editor.filters.description = คำอธิบาย
+editor.shiftx = เลื่อน X
+editor.shifty = เลื่อน Y
+workshop = เวิร์�ช็อป
+waves.title = คลื่น
 waves.remove = ลบ
-waves.never = <ไม่เคย>
 waves.every = ทุ�ๆ
-waves.waves = wave(s)
-waves.perspawn = ต่อสปาวน์
-waves.shields = เ�ราะ/wave
+waves.waves = คลื่น
+waves.health = พลังชีวิต: {0}%
+waves.perspawn = ต่อ�ารเ�ิด
+waves.shields = เ�ราะ/คลื่น
 waves.to = ถึง
-waves.guardian = �าร์เดียน
+waves.spawn = จุดเ�ิด:
+waves.spawn.all = <ทั้งหมด>
+waves.spawn.select = เลือ�จุดเ�ิด
+waves.spawn.none = [scarlet]ไม่พบจุดเ�ิดใน�มพ
+waves.max = ยูนิตสูงสุด
+waves.guardian = ผู้พิทั�ษ์
 waves.preview = พรีวิว
 waves.edit = ��้ไข...
+waves.random = สุ่ม
 waves.copy = คัดลอ�ไปยังคลิปบอร์ด
 waves.load = โหลดจา�คลิปบอร์ด
-waves.invalid = waves ในคลิปบอร์ดไม่ถู�ต้อง
-waves.copied = คัดลอ� Waves �ล้ว
-waves.none = ไม่ได้�ำหนดศัตรู\nwave layouts เปล่าจะถู��ทนที่โดย layout ค่าเริ่มต้นของเ�ม
+waves.invalid = �บบคลื่นในคลิปบอร์ดไม่ถู�ต้อง
+waves.copied = คัดลอ��บบคลื่น�ล้ว
+waves.none = ไม่ได้�ำหนดคลื่นศัตรู\n�บบคลื่นเปล่าจะถู��ทนที่โดย�บบคลื่นค่าเริ่มต้นของเ�ม
+waves.sort = จัดเรียงตาม
+waves.sort.reverse = เรียงย้อน�ลับ
+waves.sort.begin = เริ่มต้น
+waves.sort.health = พลังชีวิต
+waves.sort.type = ชนิด
+waves.search = ค้นหาคลื่น...
+waves.filter = ตัว�รองยูนิต
+waves.units.hide = ซ่อนทั้งหมด
+waves.units.show = �สดงทั้งหมด
 
+#these are intentionally in lower case
 wavemode.counts = จำนวน
 wavemode.totals = ทั้งหมด
-wavemode.health = health
+wavemode.health = พลังชีวิต
+all = ทั้งหมด
 
-editor.default = [lightgray]<ค่าเริ่่มต้น>
-details = รสยละเอียด...
+editor.default = [lightgray]<ค่าเริ่มต้น>
+details = รายละเอียด...
 edit = ��้ไข...
+variables = ตัว�ปร
+logic.clear.confirm = คุณ�น่ใจหรือว่าจะเคลียร์โค้ดทั้งหมดของตัวประมวลผลนี้?
+logic.globals = ตัว�ปรค่าเริ่มต้น
 editor.name = ชื่อ:
-editor.spawn = สปาวน์ยูนิต
+editor.spawn = สร้างยูนิต
 editor.removeunit = ลบยูนิต
 editor.teams = ทีม
 editor.errorload = โหลดไฟล์ผิดพลาด
 editor.errorsave = เซฟไฟล์ผิดพลาด
-editor.errorimage = ไฟล์นั้นคือไฟล์รูป ไม่ใช่�มพ\n\nหา�คุณต้อง�ารนำเข้าไฟล์�มพจา�เวอร์ชั่น 3.5/build 40 ใช้ปุ่ม 'นำเข้า�มพ Legacy' ใน editor.
-editor.errorlegacy = �มพนี้เ�่าเ�ินไป�ละใช้ฟอร์�ม็ต�มพ legacy ที่ไม่สนับสนุน�ล้ว
-editor.errornot = นี่ไม่ใช้ไฟล์�มพ
+editor.errorimage = ไฟล์นั้นคือไฟล์รูป ไม่ใช่�มพ\n\nหา�คุณต้อง�ารนำเข้าไฟล์�มพจา�เวอร์ชั่น 3.5/build 40 ใช้ปุ่ม 'นำเข้า�มพรูป�บบเ�่า' ในตัว��้ไข�มพ
+editor.errorlegacy = �มพนี้เ�่าเ�ินไป�ละใช้รูป�บบ�มพ�บบเ�่าที่ไม่สนับสนุน�ล้ว
+editor.errornot = นี่ไม่ใช่ไฟล์�มพ
 editor.errorheader = ไฟล์�มพนี้เสียหรือไม่ถู�ต้อง
-editor.errorname = �มพไม่มี�าร�ำหนดชื่อ คุณ�ำลังโหลดไฟล์เซฟอยู่หรือป่าว?
+editor.errorname = �มพไม่มี�าร�ำหนดชื่อ คุณ�ำลังพยายามโหลดไฟล์เซฟอยู่หรือไม่?
+editor.errorlocales = เ�ิดข้อผิดพลาดจา��ารอ่านชุดภาษาที่ไม่ถู�ต้อง
 editor.update = อัปเดต
 editor.randomize = สุ่ม
-editor.apply = ใช้
-editor.generate = �ารเ�ิด
+editor.moveup = ขยับขึ้น
+editor.movedown = ขยับลง
+editor.copy = คัดลอ�
+editor.apply = ใช้งาน
+editor.generate = เจนเนอเรท
+editor.sectorgenerate = สร้างเซ็�เตอร์
 editor.resize = เปลี่ยนขนาด
 editor.loadmap = โหลด�มพ
 editor.savemap = เซฟ�มพ
+editor.savechanges = [scarlet]คุณมี�าร��้ไขที่ยังไม่ได้เซฟ!\n\n[]คุณต้อง�ารที่จะเซฟมันหรือไม่?
 editor.saved = เซฟเรียบร้อย!
 editor.save.noname = �มพของคุณไม่มีชื่อ! สามารถตั้งชื่อได้ในเมนู 'ข้อมูล�มพ'
-editor.save.overwrite = �มพของคุณไปทับ�ับ�มพ built-in! เปลี่ยนชื่อได้ในเมนู 'ข้อมูล�มพ'
-editor.import.exists = [scarlet]ไม่สามารถนำเข้าได้:[] มี�มพ built-in map ชื่อ '{0}' อยู่�ล้ว!
-editor.import = �ำลังนำเข้า...
+editor.save.overwrite = �มพของคุณไปทับซ้อน�ับ�มพค่าเริ่มต้น! เปลี่ยนชื่อได้ในเมนู 'ข้อมูล�มพ'
+editor.import.exists = [scarlet]ไม่สามารถนำเข้าได้:[] มี�มพค่าเริ่มต้นที่ชื่อ '{0}' อยู่�ล้ว!
+editor.import = นำเข้า...
 editor.importmap = นำเข้า�มพ
 editor.importmap.description = นำเข้า�มพที่มีอยู่�ล้ว
 editor.importfile = นำเข้าไฟล์
 editor.importfile.description = นำเข้า�มพจา�ไฟล์ภายนอ�
-editor.importimage = นำเข้า�มพ�บบ Legacy
+editor.importimage = นำเข้า�มพรูป�บบเ�่า
 editor.importimage.description = นำเข้า�มพจา�ไฟล์รูปภายนอ�
-editor.export = �ำลังส่งออ�...
+editor.export = ส่งออ�...
 editor.exportfile = ส่งออ�ไฟล์
 editor.exportfile.description = ส่งออ�ไฟล์�มพ
-editor.exportimage = ส่งออ�ไฟล์รูป Terrain
+editor.exportimage = ส่งออ�ไฟล์รูปพื้นที่
 editor.exportimage.description = ส่งออ�ไฟล์รูป�มพ
-editor.loadimage = นำเข้า Terrain
-editor.saveimage = ส่งออ� Terrain
-editor.unsaved = [scarlet]คุณมี�ารเปลี่ยน�ปลงที่ยังไม่ได้เซฟ![]\nคุณ�น่ใจหรือว่าจะออ�?
+editor.loadimage = นำเข้า�บบพื้นที่
+editor.saveimage = ส่งออ��บบพื้นที่
+editor.unsaved = คุณ�น่ใจหรือว่าจะออ�?\n[scarlet]�ารเปลี่ยน�ปลงที่ยังไม่ได้เซฟจะถู�ทิ้ง
 editor.resizemap = เปลี่ยนขนาดของ�มพ
 editor.mapname = ชื่อ�มพ:
 editor.overwrite = [accent]ตำเตือน!\n�มพนี้จะเขียนทับ�ับ�มพที่มีอยู่�ล้ว
@@ -402,30 +558,35 @@ editor.exists = มี�มพที่มีชื่อนี้อยู่
 editor.selectmap = เลือ��มพที่จะโหลด:
 
 toolmode.replace = �ทนที่
-toolmode.replace.description = วาดเฉพาะบนบล็อคตัน
+toolmode.replace.description = วาดเฉพาะบนบล็อ�ตัน
 toolmode.replaceall = �ทนที่ทั้งหมด
-toolmode.replaceall.description = �ทนที่บล็อคทั้งหมดใน�มพ
+toolmode.replaceall.description = �ทนที่บล็อ�ทั้งหมดใน�มพ
 toolmode.orthogonal = มุมฉา�
-toolmode.orthogonal.description = วาดเส้นมุมฉา�เท่านั้น.
+toolmode.orthogonal.description = วาดเส้นมุมฉา�เท่านั้น
 toolmode.square = สี่เหลี่ยม
 toolmode.square.description = �ปรงรูปสี่เหลี่ยม
 toolmode.eraseores = ลบ�ร่
 toolmode.eraseores.description = ลบเฉพาะ�ร่เท่านั้น
 toolmode.fillteams = เติมทีม
-toolmode.fillteams.description = เติมทีม�ทนที่จะเป็นบล็อค
+toolmode.fillteams.description = เติมทีม�ทนที่จะเป็นบล็อ�
+toolmode.fillerase = เติมลบล้าง
+toolmode.fillerase.description = ลบล้างบล็อ�ชนิดเดียว�ัน
 toolmode.drawteams = วาดทีม
-toolmode.drawteams.description = วาดทีม�ทนที่จะเป็นบล็อค
+toolmode.drawteams.description = วาดทีม�ทนที่จะเป็นบล็อ�
+toolmode.underliquid = ใต้พื้นของเหลว
+toolmode.underliquid.description = วาดพื้นด้านใต้ช่องของเหลว
+
+filters.empty = [lightgray]ไม่มีฟิลเตอร์! เพิ่มฟิลเตอร์ด้วยปุ่มด้านล่างนี้
 
-filters.empty = [lightgray]ไม่มีฟิลเตอร์! เพิ่มด้วยปุ่มด้านล่างนี้
 filter.distort = บิดเบือน
 filter.noise = นอยส์
-filter.enemyspawn = เบือ�ที่เ�ิดศัตรู
-filter.spawnpath = Path To Spawn
-filter.corespawn = เลือ� Core
+filter.enemyspawn = เลือ�จุดเ�ิดศัตรู
+filter.spawnpath = ทางไปจุดเ�ิด
+filter.corespawn = เลือ���น�ลาง
 filter.median = เฉลี่ย
 filter.oremedian = เฉลี่ย�ร่
 filter.blend = ผสมผสาน
-filter.defaultores = �ร่พื้น�าน
+filter.defaultores = �ร่ค่าเริ่มต้น
 filter.ore = �ร่
 filter.rivernoise = นอยส์�ม่น้ำ
 filter.mirror = สะท้อน
@@ -433,25 +594,50 @@ filter.clear = เคลียร์
 filter.option.ignore = เพิ�เฉย
 filter.scatter = �ระจาย
 filter.terrain = พื้นผิว
+filter.logic = ลอจิ�
+
 filter.option.scale = มาตราส่วน
 filter.option.chance = โอ�าส
-filter.option.mag = �ม็คนิจูต
-filter.option.threshold = Threshold
-filter.option.circle-scale = สเ�ลวง�ลม
-filter.option.octaves = เลอะเลือน
-filter.option.falloff = หลุด
+filter.option.mag = �ม�นิจูด
+filter.option.threshold = เ�ณฑ์
+filter.option.circle-scale = อัตราวง�ลม
+filter.option.octaves = อ็อ�เทฟ
+filter.option.falloff = หลุดร่วง
 filter.option.angle = มุม
+filter.option.tilt = เอียง
+filter.option.rotate = หมุน
 filter.option.amount = จำนวน
-filter.option.block = บล็อค
+filter.option.block = บล็อ�
 filter.option.floor = พื้น
-filter.option.flooronto = พื้น Target
-filter.option.target = Target
+filter.option.flooronto = พื้นเป้าหมาย
+filter.option.target = เป้าหมาย
+filter.option.replacement = �ทนที่
 filter.option.wall = �ำ�พง
 filter.option.ore = �ร่
-filter.option.floor2 = พื้นชั้น 2
-filter.option.threshold2 = Threshold ชั้น 2
+filter.option.floor2 = พื้นชั้นสอง
+filter.option.threshold2 = เ�ณฑ์ชั้นสอง
 filter.option.radius = รัศมี
-filter.option.percentile = เปอร์เซ็น
+filter.option.percentile = เปอร์เซ็นต์ไทล์
+filter.option.code = โค้ดคำสั่ง
+filter.option.loop = วนลูป
+#not translating all these yet: still unstable
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = คุณ�น่ใจหรือว่าจะลบชุดภาษาท้องถิ่นนี้?
+locales.applytoall = เพิ่ม�ารเปลี่ยน�ปลงไปยังทุ�ค่าภาษา
+locales.addtoother = เพิ่มไปยังภาษาอื่น
+locales.rollback = ย้อน�ลับไปเมื่อ�ารใช้งานที่�ล้ว
+locales.filter = ตัว�รองค่า
+locales.searchname = ค้นหาชื่อ...
+locales.searchvalue = ค้นหาค่า...
+locales.searchlocale = ค้นหาภาษา...
+locales.byname = ตามชื่อ
+locales.byvalue = ตามค่า
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = ดูในทุ�ค่าภาษา
+locales.viewing = �ำลังดูค่า "{0}"
+locales.addicon = เพิ่มไอคอน
 
 width = �ว้าง:
 height = สูง:
@@ -462,443 +648,806 @@ load = โหลด
 save = เซฟ
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = �รุณารีสตาร์ทเพื่อที่จะให้เ�มเปลี่ยนเป็นภาษาที่คุณเลือ�
 settings = ตั้งค่า
 tutorial = สอนเล่น
 tutorial.retake = เล่น�ารสอนเล่นอี�ครั้ง
-editor = Editor
-mapeditor = Editor ของ�มพ
+editor = ตัว��้ไข�มพ
+mapeditor = ��้ไข�มพ
 
-abandon = ทิ้ง
-abandon.text = โซนนี้�ละทรัพยา�รทั้งหมดจะ�ลายเป็นของศัตรู
-locked = ล็อค
-complete = [lightgray]สำเร็จ:
-requirement.wave = ถึง Wave ที่ {0} ใน {1}
-requirement.core = ทำลาย Core ของศัตรูใน {0}
-requirement.research = Research {0}
-requirement.capture = Capture {0}
-bestwave = [lightgray]Wave สูงสุด: {0}
-launch.text = ส่ง
-research.multiplayer = Only the host can research items.
+abandon = ละทิ้ง
+abandon.text = โซนนี้�ละทรัพยา�รทั้งหมดจะถู�ยึดไปเป็นของศัตรู
+locked = ล็อ�
+complete = [lightgray]ต้องมี:
+requirement.wave = ถึงคลื่นที่ {0} ใน {1}
+requirement.core = ทำลาย��น�ลางของศัตรูใน {0}
+requirement.research = วิจัย {0}
+requirement.produce = ผลิต {0}
+requirement.capture = ยึดครอง {0}
+requirement.onplanet = ควบคุมเซ็�เตอร์บน {0}
+requirement.onsector = ลงจอดบนเซ็�เตอร์: {0}
+launch.text = ลุย!
+map.multiplayer = โฮสต์เท่านั้นที่สามารถดูเซ็�เตอร์ได้
 uncover = เปิดเผย
-configure = ตั้งค่า Loadout
-loadout = Loadout
-resources = ทรัพยา�ร 
-bannedblocks = บล็อคต้องห้าม
+configure = ตั้งค่าทรัพยา�ร
+objective.research.name = วิจัย
+objective.produce.name = เ�็บเ�ี่ยว
+objective.item.name = เ�็บไอเท็ม
+objective.coreitem.name = ไอเท็มใน��น�ลาง
+objective.buildcount.name = นับสิ่ง�่อสร้าง
+objective.unitcount.name = จำนวนยูนิต
+objective.destroyunits.name = ทำลายยูนิต
+objective.timer.name = จับเวลา
+objective.destroyblock.name = ทำลายบล็อ�
+objective.destroyblocks.name = ทำลายหลายบล็อ�
+objective.destroycore.name = ทำลาย��น�ลาง
+objective.commandmode.name = โหมดสั่ง�าร
+objective.flag.name = ธง
+marker.shapetext.name = ข้อความในรูปทรง
+marker.point.name = จุด
+marker.shape.name = รูปทรง
+marker.text.name = ข้อความ
+marker.line.name = เส้นตรง
+marker.quad.name = สี่เหลี่ยม
+marker.texture.name = เท�เจอร์
+marker.background = พื้นหลัง
+marker.outline = โครงร่าง
+objective.research = [accent]วิจัย:\n[]{0}[lightgray]{1}
+objective.produce = [accent]เ�็บเ�ี่ยว:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]ทำลาย:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]ทำลาย: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]เ�็บเ�ี่ยว: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]นำไปยัง��น�ลาง:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]สร้าง: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]ผลิตยูนิต: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]ทำลาย: [][lightgray]{0}[]x ยูนิต
+objective.enemiesapproaching = [accent]ศัตรูจะปรา��ตัวใน [lightgray]{0}[]
+objective.enemyescelating = [accent]โรงงานศัตรูจะทวีความรุน�รงขึ้นใน [lightgray]{0}[]
+objective.enemyairunits = [accent]�ารผลิตยานบินศัตรูจะเริ่มใน [lightgray]{0}[]
+objective.destroycore = [accent]ทำลาย��น�ลางศัตรู
+objective.command = [accent]สั่ง�ารยูนิต
+objective.nuclearlaunch = [accent]⚠ ตรวจพบจรวดหัวรบปรมาณู: [lightgray]{0}
+announce.nuclearstrike = [red]⚠ !! ขีปนาวุธ�ำลังพุ่งเข้ามา !! ⚠
+
+loadout = ทรัพยา�รเริ่มต้น
+resources = ทรัพยา�ร
+resources.max = เต็ม
+bannedblocks = บล็อ�ต้องห้าม
+unbannedblocks = Unbanned Blocks
+objectives = เป้าหมาย
+bannedunits = ยูนิตต้องห้าม
+unbannedunits = Unbanned Units
+bannedunits.whitelist = ตั้งยูนิตต้องห้ามเป็นไวท์ลิสต์
+bannedblocks.whitelist = ตั้งบล็อ�ต้องห้ามเป็นไวท์ลิสต์
 addall = เพิ่มทั้งหมด
-launch.destination = Destination: {0}
-configure.invalid = จำนวนต้อยู่ระหว่าง 0 ถึง {0}.
-zone.unlocked = [lightgray]{0} ปลดล็อค�ล้ว
-zone.requirement.complete = ข้อเรีย�ร้องสำหรับ {0} สำเร็จ�ล้ว:[lightgray]\n{1}
-zone.resources = [lightgray]ทรัพยา�รที่พบ:
-zone.objective = [lightgray]เป้าหมาย: [accent]{0}
-zone.objective.survival = เอาชีวิตรอด
-zone.objective.attack = ทำลาย Core ของศัตรู
+launch.from = ลงจอดจา�เซ็�เตอร์: [accent]{0}
+launch.capacity = ความจุไอเท็มลงจอด: [accent]{0}
+launch.destination = จุดหมายปลายทาง: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = จำนวนต้องอยู่ระหว่าง 0 ถึง {0}
 add = เพิ่ม...
-boss.health = เลือดบอส
+guardian = ผู้พิทั�ษ์
 
 connectfail = [crimson]�ารเชื่อมต่อผิดพลาด:\n\n[accent]{0}
-error.unreachable = เซิฟเวอร์ไม่สามารถเข้าถึงได้\n�น่ใจหรือว่าที่อยู่เขียนถู�ต้อง?
+error.unreachable = เซิร์ฟเวอร์ไม่สามารถเข้าถึงได้\n�น่ใจหรือว่าที่อยู่เขียนถู�ต้อง?
 error.invalidaddress = ที่อยู่ไม่ถู�ต้อง
-error.timedout = Timed out!\nเช็คให้�น่ใจว่า port forwarding ของโฮสต์เปิดอยู่�ละที่อยู่นั้นถู�ต้อง!
-error.mismatch = Packet error:\nอาจเ�ิดจา�เวอร์ชั่นของ client/server ไม่ตรง�ัน\nเช็คให้�น่ใจว่าเซิฟเวอร์ใช้ Mindustry เวอร์ชั่นล่าสุด!
+error.timedout = หมดเวลา!\nเช็�ให้�น่ใจว่า�ารส่งต่อพอร์ตของโฮสต์เปิดอยู่�ละที่อยู่นั้นถู�ต้อง!
+error.mismatch = ข้อผิดพลาดของ�พ็คเ�็ต:\nอาจเ�ิดจา�เวอร์ชั่นของ ไคลเอนต์/เซิร์ฟเวอร์ ไม่ตรง�ัน\nเช็�ให้�น่ใจว่าคุณ�ละโฮสต์ใช้ Mindustry เวอร์ชั่นล่าสุด!
 error.alreadyconnected = เชื่อมต่ออยู่�ล้ว
 error.mapnotfound = ไม่พบไฟล์�มพ
-error.io = Network I/O error.
-error.any = Unknown network error.
-error.bloom = ไม่สามารถเริ่มต้น bloom ได้\nอุป�รณ์ของคุณอาจไม่รองรับ
+error.io = ข้อผิดพลาด I/O ของเครือข่าย
+error.any = ข้อผิดพลาด: เครือข่ายที่ไม่รู้จั�
+error.bloom = ไม่สามารถเริ่มต้นบลูมได้\nอุป�รณ์ของคุณอาจไม่รองรับ
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = �น
-weather.snow.name = หิมะ
+weather.snowing.name = หิมะต�
 weather.sandstorm.name = พายุทราย
 weather.sporestorm.name = พายุสปอร์
-weather.fog.name = Fog
+weather.fog.name = หมอ�
 
+campaign.playtime = \uf129 [lightgray]เวลาที่เล่นเซ็�เตอร์ไป: {0}
+campaign.complete = [accent]ยินดีด้วย\n\nศัตรูบน {0} ได้ถู��ำจัดหมดสิ้น�ล้ว\n[lightgray]เซ็�เตอร์สุดท้ายได้ถู�ยึดครอง�ล้ว
+
+sectorlist = เซ็�เตอร์
+sectorlist.attacked = {0} ถู�โจมตึ
 sectors.unexplored = [lightgray]ยังไม่ได้สำรวจ
 sectors.resources = ทรัพยา�ร:
 sectors.production = �ารผลิต:
-sectors.stored = เ�็บ:
-sectors.resume = ทำต่อ
-sectors.launch = ส่ง
+sectors.export = �ารส่งออ�:
+sectors.import = �ารนำเข้า:
+sectors.time = เวลา:
+sectors.threat = ภัยคุ�คาม:
+sectors.wave = คลื่น:
+sectors.stored = คลังไอเท็ม:
+sectors.resume = ไปต่อ
+sectors.launch = ลงจอด
 sectors.select = เลือ�
-sectors.nonelaunch = [lightgray]none (sun)
-sectors.rename = Rename Sector
-sector.missingresources = [scarlet]Insufficient Core Resources
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]ไม่มี (ดวงอาทิตย์)
+sectors.redirect = Redirect Launch Pads
+sectors.rename = เปลี่ยนชื่อเซ็�เตอร์
+sectors.enemybase = [scarlet]�านทัพศัตรู
+sectors.vulnerable = [scarlet]เสี่ยงภัย
+sectors.underattack = [scarlet]เซ็�เตอร์ถู�โจมตี! เสียหาย [accent]{0}%
+sectors.underattack.nodamage = [scarlet]ยังไม่ถู�ยึดครอง
+sectors.survives = [accent]จะอยู่รอดได้ {0} คลื่น
+sectors.go = ไป
+sector.abandon = ทอดทิ้ง
+sector.abandon.confirm = ��น�ลางของเซ็�เตอร์นี้จะทำลายตัวเอง\nดำเนิน�ารต่อหรือไม่?
+sector.curcapture = ยึดครอง�ล้ว
+sector.curlost = เราเสียเซ็�เตอร์!
+sector.missingresources = [scarlet]ขาดทรัพยา�รใน�ารลงจอด
+sector.attacked = เซ็�เตอร์ [accent]{0}[white] ถู�โจมตี!
+sector.lost = เราเสียเซ็�เตอร์ [accent]{0}[white]!
+sector.capture = เรายึดครองเซ็�เตอร์ [accent]{0}[white] ได้�ล้ว!
+sector.capture.current = เรายึดครองเซ็�เตอร์นี้ได้�ล้ว!
+sector.changeicon = เปลี่ยนไอคอน
+sector.noswitch.title = ไม่สามารถเปลี่ยนเซ็�เตอร์ได้
+sector.noswitch = คุณไม่สามารถเปลี่ยนเซ็�เตอร์ได้ระหว่างที่อี�เซ็�เตอร์�ำลังถู�โจมตีอยู่\n\nเซ็�เตอร์: [accent]{0}[] บนดาว [accent]{1}[]
+sector.view = ดูเซ็�เตอร์
 
-planet.serpulo.name = Serpulo
-planet.sun.name = Sun
+threat.low = ต่ำ
+threat.medium = �ลาง
+threat.high = สูง
+threat.extreme = วิบัติภัย
+threat.eradication = ทำลายล้าง
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
-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
+planets = ดาว
 
-sector.groundZero.description = ที่ที่ดีที่สุดใน�ารเริ่มต้นอี�ครั้ง. ศัตรูมีน้อย. ทรัพยา�รน้อยฃ.\nเ�็บตะ�ั่ว�ละทอง�ดงให้ได้มา�ที่สุด.\n�ล้วไปต่อ.
-sector.frozenForest.description = �ม้�ต่ที่นี่, ที่ที่อยู่ใ�ล้ภูเขา, สปอร์�็ยัง�พร่มาถึงที่นี่. อา�าศที่เย็นเยือ�ไม่สามารถหยุดยั้งพว�มันได้ตลอดไป.\n\nเริ่มต้น�ารใช้ไฟฟ้า. สร้างเครื่อง�ำเนิดไฟฟ้าเผาไหม้ถ่าน. เรียนรู้ที่จะใช้เครื่องซ่อม�ซม.
-sector.saltFlats.description = ณ ขอบของทะเลทราย เป็นที่ตั้งของ Salt Flats. สามารถพบทรัพยา�รบางอย่างได้ที่นี่.\n\nศัตรูได้ตั้ง�านเ�็บทรัพยา�รไว้ที่นี่. ทำลาย core ของพว�มัน. อย่าให้มีอะไรเหลือ.
-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 = พื้นที่ระหว่างพื้นที่สูง�ละต่ำของภูเขา, พื้นที่นี้เต็มไปด้วยสปอร์. �านลาดตระเวนขนาดเล็�ของศัตรูตั้งอยู่ที่นี่.\nทำลายมันซะ.\nใช้ยูนิตเด็�เ�อร์�ละครอว์เลอร์. ทำลาย core ทั้งสองซะ.
+planet.serpulo.name = เซอร์ปูโล่
+planet.erekir.name = เอเรเ�ียร์
+planet.sun.name = อาทิตย์
+
+sector.impact0078.name = อิม�พค 0078
+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.biomassFacility.name = สถานสังเคราะห์ชีวมวล
+sector.windsweptIslands.name = หมู่เ�าะพหุวายุ
+sector.extractionOutpost.name = ด่านส่งทรัพยา�ร
+sector.facility32m.name = �านผลิต 32 M
+sector.taintedWoods.name = ป่ามลทิน
+sector.infestedCanyons.name = หุบเขาอันมัวหมอง
+sector.planetaryTerminal.name = ท่าปล่อยจรวดอว�าศยาน
+sector.coastline.name = �นวชาย�ั่ง
+sector.navalFortress.name = ปรา�าร�ห่งวารี
+sector.polarAerodrome.name = �านบินขั้วโล�
+sector.atolls.name = อะทอลส์
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
+
+sector.groundZero.description = จุดที่ดีที่สุดใน�ารตั้งต้นใหม่อี�ครั้งนึง ศัตรูน้อย ทรัพยา�รน้อย\nเ�็บ[accent]ตะ�ั่ว[]�ละ[accent]ทอง�ดง[]ให้ได้มา�ที่สุด\n�ล้วลุยต่อ
+sector.frozenForest.description = �ม้�ต่ที่นี่ ณ ที่ที่อยู่ใ�ล้�ับภูเขา [accent]สปอร์[]�็ยัง�พร่มาถึงที่นี่ได้ อา�าศอัน�สนเย็นเยือ�ไม่สามารถหยุดยั้งพว�มันได้ตลอดไป\n\nเริ่มต้น�ารใช้ไฟฟ้า สร้างเครื่อง�ำเนิดไฟฟ้าเผาไหม้ เรียนรู้ที่จะใช้เครื่องซ่อม�ซม
+sector.saltFlats.description = ณ ชายขอบของทะเลทราย เป็นที่ตั้งของที่ราบเ�ลือ สามารถพบทรัพยา�รบางอย่างได้ที่นี่\n\nศัตรูได้ตั้ง�านเ�็บทรัพยา�รไว้ จงทำลาย��น�ลางของพว�มัน อย่าให้มีอะไรเหลือ
+sector.craters.description = น้ำได้สะสมรวมตัว�ันอยู่ในหลุมอุ��าบาศ�ห่งนี้ ซึ่งเป็นมรด�ของสงครามอันเ�่า��่ ยึดครองพื้นที่นี่มา ขุดทราย �ละเผา[accent]�ระจ�เมต้า[] ปั๊มน้ำขึ้นมาเพื่อมาหล่อเย็นป้อมปืน�ละเครื่องขุดเจาะ
+sector.ruinousShores.description = ถัดมาจา�ทะเลทราย เป็นที่ตั้งของชาย�ั่ง ที่ครั้ง�่อนเคยเป็นที่ตั้งของ�านป้อง�ัน�นวชาย�ั่ง ซึ่งทุ�พังทลายไปซะส่วนให�่�ล้ว มีเหลือ�ค่ระบบ�ารป้อง�ันพื้น�าน ทุ�อย่างที่เหลือถู�ทำลายเหลือเพียง�ค่ซา�เศษเหล็�\n\nทำ�ารขยาย�ารสำรวจต่อไป ค้นพบ�ับเทคโนโลยีอี�ครั้ง
+sector.stainedMountains.description = เข้าลึ�ไปในพื้นที่ จะพบ�ับภูเขา ซึ่งยังไม่ถู�สปอร์�ตะต้อง\nขุด[accent]ไทเทเนี่ยม[]ที่อุดมสมบูรณ์ในพื้นที่นี้ เรียนรู้ที่จะใช้มัน\n\nมีศัตรูปรา��ตัวมา�ขึ้นในบริเวณนี้ อย่าปล่อยให้พว�มันส่งยูนิตที่�ข็ง��ร่งที่สุดออ�มา
+sector.overgrowth.description = พื้นที่�ห่งนี้ถู�ป�คลุมไปด้วยพืชร�ร้าง เริ่มเข้าใ�ล้�ับ�หล่งต้น�ำเนิดของสปอร์มา�ขึ้น\nศัตรูได้ตั้ง�านเ�้าระวังไว้ที่นี่ สร้างยูนิตเมส ทำลาย�านทิ้งซะ\nวิจัย[accent]เครื่องพัฒนารุ่นย��ำลัง[]เพื่อผลิตยูนิตขนาดที่ให�่ขึ้น
+sector.tarFields.description = ณ �นวชายขอบของ�หล่งผลิตน้ำมัน ระหว่างภูเขา�ับทะเลทราย เป็นหนึ่งในพื้นที่ที่มี�หล่งน้ำมันดินที่ใช้งานได้\n�ม้ว่าจะถู�ทิ้งร้าง �ต่พื้นที่นี้ยังคงมี�านทัพของศัตรูอยู่ใ�ล้ๆ อย่าประมาท�ับพว�มัน\n\n[lightgray]วิจัยเทคโนโลยี�าร�ปรรูปน้ำมันหา�เป็นไปได้
+sector.desolateRift.description = เป็นพื้นที่ที่อันตรายมา� ทรัพยา�รมา�มาย �ต่พื้นที่คับ�คบ ความเสี่ยงใน�ารโดนทำลายล้างสูง รีบสร้าง�านป้อง�ันให้เร็วที่สุด อย่าหลง�ลระยะเวลาระหว่าง�ารโจมตีของศัตรูที่เว้นไว้นาน�ว่าป�ติ
+sector.nuclearComplex.description = สถานที่ผลิต�ละ�ปรรูป[accent]ทอเรี่ยม[]เ�่า ถู�ทำลายไม่เหลือสิ้น\nวิจัยทอเรี่ยม�ละวิธี�ารใช้มัน\n\nศัตรูในบริเวณนี้มีจำนวนมา� คอยตรวจตราหาผู้บุ�รุ�อยู่ตลอดเวลา
+sector.fungalPass.description = ทางเปลี่ยนผ่านระหว่างพื้นที่เขาสูง�ับที่ราบต่ำที่เต็มไปด้วยสปอร์ มี�านลาดตระเวนขนาดเล็�ของศัตรูตั้งอยู่ที่นี่\nทำลายมันซะ\nผลิตยูนิต�ด็�เ�อร์�ละครอว์เลอร์ ทำลาย��น�ลางของศัตรูไม่ให้เหลือซา�
+sector.biomassFacility.description = �หล่งต้น�ำเนิดของสปอร์ ที่นี่คือ�านวิจัย�ละผลิตสปอร์เริ่ม�ร�\nวิจัยเทคโนโลยีที่อยู่ภายในนั้น เพาะชำ[accent]สปอร์[]เพื่อนำเป็นเชื้อเพลิง�ละใช้ใน�ารผลิตพลาสติ�\n\n[gray]เมื่อสถาน�ห่งนี้ถึงจุดจบลง สปอร์�็ถู�ปล่อยออ�มา ไม่มีสิ่งใดในระบบนิเวศท้องถิ่นที่สามารถ�ข่งขัน�ับ\nสิ่งมีชีวิตที่�พร่�ระจายในระดับนี้ได้
+sector.windsweptIslands.description = เลย�นวชาย�ั่งไป จะพบ�ับหมู่เ�าะที่ตั้งอยู่ห่างไ�ล�ห่งนี้ เคยมีบันทึ�ว่าที่นี่มีโรงงานผลิต[accent]พลาสตาเนี่ยม[]อยู่\n\nทำลายเรือศัตรู สร้าง�านทัพบนเ�าะ วิจัยโรงงานพว�นี้
+sector.extractionOutpost.description = ด่านที่อยู่ห่างไ�ล สร้างโดยศัตรูเพื่อใช้ใน�ารขนส่งทรัพยา�รไปยัง�านทัพอื่น\n\nเทคโนโลยี�ารส่งไอเท็มข้ามเซ็�เตอร์เป็นสิ่งที่จำเป็นสำหรับ�ารพิชิตครั้งถัดๆ ไป บุ�ทำลายด่าน วิจัย�านส่งของ
+sector.impact0078.description = ณ ที่�ห่งนี้คือเศษซา�ของยานขนส่งระหว่างดวงดาวที่เคยเข้ามายังระบบนี้\nเศษซา�เหล็��ละหิมะป�คลุมไปทั่วทั้งพื้นที่\n\n�อบ�ู้ซา�ยานให้ได้มา�ที่สุด วิจัยเทคโนโลยีทั้งหมดที่ยังเหลือรอด\n\n\n[gray]อย่าประมาท�ับ�านทัพศัตรูที่อยู่ใ�ล้ๆ โดยอันขาด\nศัตรูจะส่ง�อง�ำลังมาโจมตีเรื่อยๆ จน�ว่าคุณจะพ่าย�พ้
+sector.planetaryTerminal.description = เป้าหมายสุดท้าย\n\n�านทัพติดชายหาดนี้มีสิ่งปลู�สร้างที่สามารถส่ง��น�ลางไปยังดาวที่อยู่ใ�ล้เคียงได้ ซึ่งมันมี�ารป้อง�ันที่�น่นหนามา�\n\nผลิตยูนิตเรือ �วาดล้างศัตรูให้เร็วที่สุด วิจัยสิ่งประดิษ�์นั่น
+sector.coastline.description = ถัดมาจา�ที่ราบเ�ลือ เป็นที่ตั้งของ�นวชาย�ั่ง พบเศษซา�ของเทคโนโลยียูนิตเรือที่ล้ำหน้าอยู่ในพื้นที่�ห่งนี้\nขับไล่ศัตรูออ�ไป ยึดพื้นที่นี้มา วิจัยเทคโนโลยีนั้น
+sector.navalFortress.description = ศัตรูได้ตั้ง�านทัพอยู่บนเ�าะห่างไ�ลที่มี�ำ�พงธรรมชาติป�ป้อง�านเอาไว้ ทำลาย�านทัพ ยึด�ละวิจัยเทคโนโลยีเรือรบที่ล้ำหน้านั้นมา
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = �ารเริ่มต้น
+sector.aegis.name = อีจีส
+sector.lake.name = ทะเลสาบสีชาด
+sector.intersect.name = อินเตอร์เซค
+sector.atlas.name = �อตลาส
+sector.split.name = สอง�ั่ง
+sector.basin.name = �อ่งยุบ
+sector.marsh.name = บึงหนอง
+sector.peaks.name = ยอดเขา
+sector.ravine.name = หุบเหว
+sector.caldera-erekir.name = �อ่งภูเขาไฟ
+sector.stronghold.name = ป้อมปรา�าร
+sector.crevice.name = ร่องลึ�
+sector.siege.name = �ารรุมล้อม
+sector.crossroads.name = ทางเชื่อม
+sector.karst.name = คาสต์
+sector.origin.name = ต้น�ำเนิด
+
+sector.onset.description = ตั้งต้น�ารบุ�โจมตีเพื่อพิชิตดาว[accent]เอเรเ�ียร์[] เ�็บทรัพยา�ร สร้างยูนิต �ละเริ่มค้นคว้าวิจัยเทคโนโลยี
+sector.aegis.description = พบ�ารสะสมของ�หล่ง�ร่ทังสเตนในพื้นที่นี้\nวิจัย[accent]เครื่องขุด�รง�ระ�ท�[]เพื่อขุดทรัพยา�รนี้ �ละทำลาย�านทัพศัตรูที่อยู่ในพื้นที่
+sector.lake.description = ทะเลสาบ�ร่หลอมในพื้นที่นี้ทำให้ไม่สามารถใช้ยูนิตธรรมดาได้ จะต้องมียูนิตที่ลอยตัวเหนื้อพื้นดินเพื่อที่จะผ่านไปได้\nวิจัย[accent]เครื่องสรรค์สร้างยานบิน[]�ละผลิตยูนิต[accent]เอลูด[]ให้เร็วที่สุดเท่าที่จะเป็นไปได้
+sector.intersect.description = เครื่องส��นเสนอว่าพื้นที่นี้จะถู�โจมตีจา�หลายๆ ด้านไม่นานหลังจา��ารลงจอด\nสร้าง�านป้อง�ันให้ไว�ละขยายพื้นที่ให้เร็วที่สุด\nจำเป็นต้องมียูนิต[accent]จั�ร�ล[]เพื่อสำรวจผ่านบนภูมิประเทศที่หยาบ�ละขรุขระในพื้นที่นี้
+sector.atlas.description = พื้นที่�ห่งนี้มีภูมิประเทศที่หลา�หลาย�ละจำเป็นจะต้องมียูนิตหลา�หลายชนิดเพื่อให้�ารโจมตีมีประสิทธิภาพ\nยูนิตขั้นสูงอาจจำเป็นเพื่อต่อ�ร�ับ�านทัพศัตรูที่�ข็ง��ร่งขึ้นในพื้นที่นี้\nวิจัย[accent]เครื่อง�ย�สลายไฟฟ้า[]�ละ[accent]เครื่อง�ปลงสภาพรถถัง[]
+sector.split.description = จำนวนศัตรูอันน้อยนิดทำให้ที่นี่เป็นพื้นที่ที่เหมาะที่สุดใน�ารทดสอบระบบ�ารขนส่งใหม่
+sector.basin.description = ตรวจพบ�ารมีอยู่ของศัตรูจำนวนมา�ในพื้นที่นี้\nควรรีบสร้างยูนิต�ละยึด��น�ลางศัตรูเพื่อให้ตั้งหลั�ได้
+sector.marsh.description = พื้นที่�ห่งนี้มีบ่ออาร์คย์ไซต์อยู่จำนวนมา� �ต่มีปล่องจำนวนจำ�ัด\nสร้าง[accent]ห้องเผาไหม้ทางเคมี[]เพื่อผลิตพลังงาน
+sector.peaks.description = ภูมิประเทศ�บบขุนเขาในพื้นที่�ห่งนี้ทำให้ยูนิตป�ติใช้�ารไม่ได้ จำเป็นจะต้องมียูนิตที่บินได้เพื่อที่จะบุ�โจมตี\nควรระวังป้อมปืนต่อต้านอา�าศยานของศัตรูให้ดี มีความไปได้ที่จะสามารถตัด�ำลังป้อมปืนบางส่วนได้โดย�ารทำลายสิ่ง�่อสร้างที่รองรับพว�มัน
+sector.ravine.description = ทางเชื่อมขนส่งทรัพยา�รที่สำคั�ของศัตรู ตรวจไม่พบ��น�ลางศัตรูในพื่นที่นี้ �ต่�็ต้องเตรียมตัวรับมือ�ับ�ำลังศัตรูที่จะมาในหลา�หลายรูป�บบ\nผลิต[accent]เสิร์จอัลลอย[]�ล้วสร้างป้อมปืน[accent]อัฟฟลิ�ต์[]มาป้อง�ัน
+sector.caldera-erekir.description = ทรัพยา�รที่ถู�ตรวจพบในพื้นที่นี้นั้น�ระจัด�ระจายไปในหลายๆ เ�าะ\nวิจัย�ละพัฒนาเทคโนโลยี�ารขนส่งด้วยโดรน
+sector.stronghold.description = ปรา�ารขนาดให�่ของศัตรูนี้�ำลังป�ป้อง�หล่ง�ร่[accent]ทอเรี่ยม[]จำนวนมหาศาลในพื้นที่�ห่งนี้\nจงใช้มันเพื่อนำไปพัฒนาป้อมปืน�ละยูนิตขั้นสูง�ว่า
+sector.crevice.description = ศัตรูจะส่ง�ำลังโจมตีที่ดุร้าย�ละทรงพลังเป็นพิเศษเพื่อที่จะทำลาย�านทัพของคุณในพื้นที่นี้\nวิจัย�ละพัฒนา[accent]คาร์ไบต์[]�ับ[accent]เครื่อง�ำเนิดไฟฟ้าไพโรไลซิส[]เพื่อเพิ่มโอ�าส�ารอยู่รอดในพื้นที่นี้
+sector.siege.description = พื้นที่นี้ประ�อบไปด้วยหุบเขาคู่ขนานสอง�ห่งที่ทำให้ต้องทำ�ารบุ�โจมตีทั้งสอง�ั่งพร้อม�ัน\nวิจัย[accent]ไซยาโนเจน[]เพื่อที่จะสามารถสร้างยูนิตรถถังที่�ข็ง��ร่งขึ้น\nโปรดระวัง: ตรวจพบขีปนาวุธพิสัยไ�ลของศัตรู สามารถทำลายหัวรบขีปนาวุธได้�่อนที่มันจะระเบิด
+sector.crossroads.description = �านทัพศัตรูในพื้นที่นี้ได้ถู��่อสร้างในพื้นที่ที่หลา�หลาย วิจัยยูนิต�ต่ละตัวเพื่อปรับใช้ในสถาน�ารณ์ต่างๆ\nเพิ่มเติม: �านทัพบาง�านได้รับ�ารป�ป้องด้วยโล่พลังงาน จงหาวิธีที่จะตัดพลังงานของโล่ออ�ให้ได้
+sector.karst.description = พื้นที่นี้มีความอุดมสมบูรณ์ เต็มไปด้วยทรัพยา�ร �ต่มันจะถู�ศัตรูหมายโจมตีเมื่อมี��น�ลางใหม่มาลงจอด\nใช้ทรัพยา�รที่อุดมสมบูรณ์มาวิจัย[accent]ใยเฟส[] �ละต่อต้าน�ำลังศัตรูให้ได้
+sector.origin.description = เป้าหมายสุดท้าย ตรวจพบ�ารมีอยู่ของศัตรูจำนวนมหาศาล\nไม่มี�ารวิจัยที่เป็นไปได้หลงเหลืออยู่�ล้ว มุ่ง�ต่โจมดี�านทัพของศัตรูให้หมดสิ้น
+
+status.burning.name = เผาไหม้
+status.freezing.name = �ช่�ข็ง
+status.wet.name = เปีย�
+status.muddy.name = เปื้อนเปรอะ
+status.melting.name = หลอมเหลว
+status.sapped.name = อ่อน�ำลัง
+status.electrified.name = ช็อตไฟฟ้า
+status.spore-slowed.name = สปอร์สโลว์
+status.tarred.name = เปื้อนน้ำมัน
+status.overdrive.name = โอเวอร์ไดรฟ์
+status.overclock.name = โอเวอร์คล็อ�
+status.shocked.name = ช็อ�
+status.blasted.name = ระเบิด
+status.unmoving.name = หยุดนิ่ง
+status.boss.name = ผู้พิทั�ษ์
 
 settings.language = ภาษา
 settings.data = ข้อมูลเ�ม
 settings.reset = รีเซ็ตเป็นค่าเริ่มต้น
 settings.rebind = ��้ไขปุ่ม
-settings.resetKey = Reset
+settings.resetKey = รีเซ็ต
 settings.controls = �ารควบคุม
 settings.game = เ�ม
 settings.sound = เสียง
 settings.graphics = �ราฟิ�
 settings.cleardata = เคลียร์ข้อมูลเ�ม...
-settings.clear.confirm = คุณ�น่ใจหรือว่าจะเคลียร์ข้อมูลเ�ม?\nสิ่งที่ทำไป�ล้วจะไม่สามารถย้อน�ลับได้!
-settings.clearall.confirm = [scarlet]คำเตือน![]\n�าร�ระทำนี้จะลบข้อมูลทั้งหมด นั้นรวมไปถึงเซฟ, �มพ, สิ่งที่ปลดล็อค�ล้ว�ละ keybinds.\nเมื่อคุณ�ด 'โอเค' เ�มจะลบข้อมูลทุ�อย่าง�ละออ�โดยอัตโนมัติ
+settings.clear.confirm = คุณ�น่ใจหรือว่าจะเคลียร์ข้อมูลนี้?\nสิ่งที่ทำไป�ล้วจะไม่สามารถย้อน�ลับได้นะ!
+settings.clearall.confirm = [scarlet]คำเตือน![]\n�าร�ระทำนี้จะลบข้อมูลทั้งหมด นั้นรวมไปถึงเซฟ �มพ �ารวิจัย�ล้ว�ละ�็รูป�บบปุ่มควบคุม\nเมื่อคุณ�ด 'โอเค' เ�มจะลบข้อมูลทุ�อย่าง�ละออ�โดยอัตโนมัติ
 settings.clearsaves.confirm = คุณ�น่ใจหรือว่าคุณต้อง�ารเคลียร์เซฟทั้งหมด?
 settings.clearsaves = เคลียร์เซฟ
-settings.clearresearch = Clear Research
-settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research?
-settings.clearcampaignsaves = Clear Campaign Saves
-settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves?
+settings.clearresearch = เคลียร์�ารวิจัย
+settings.clearresearch.confirm = �น่ใจที่จะเคลียร์�ารวิจัยหรือไม่?
+settings.clearcampaignsaves = ลบเซฟ�คมเป�
+settings.clearcampaignsaves.confirm = �น่ใจว่าจะลบเซฟ�คมเป�หรือไม่?
 paused = [accent]< หยุดชั่วคราว >
 clear = เคลียร์
-banned = [scarlet]�บน
-unplaceable.sectorcaptured = [scarlet]ต้อง�าร captured sector
-yes = ใช่
-no = ไม่
+banned = [scarlet]ถู��บน
+unsupported.environment = [scarlet]ไม่รองรับในสภาพ�วดล้อมนี้
+yes = ได้
+no = ไม่ได้
 info.title = ข้อมูล
-error.title = [crimson]มีบางอย่างผิดพลาดเ�ิดขึ้น
-error.crashtitle = มีบางอย่างผิดพลาดเ�ิดขึ้น
-unit.nobuild = [scarlet]ยูนิตไม่สามารถสร้างได้
-lastaccessed = [lightgray]Last Accessed: {0}
+error.title = [crimson]มีข้อผิดพลาดบางอย่างเ�ิดขึ้น
+error.crashtitle = มีข้อผิดพลาดบางอย่างเ�ิดขึ้น
+unit.nobuild = [scarlet]ยูนิตนี้�่อสร้างไม่ได้
+lastaccessed = [lightgray]คนสุดท้ายที่เข้าถึง: {0}
+lastcommanded = [lightgray]คนสุดท้ายที่สั่ง�าร: {0}
 block.unknown = [lightgray]???
 
-stat.input = นำเข้า
+stat.showinmap = <โหลด�มพเพื่อ�สดง>
+stat.description = วัตถุประสงค์
+stat.input = ต้อง�าร
 stat.output = ส่งออ�
+stat.maxefficiency = ประสิทธิภาพสูงสุด
 stat.booster = บูสเตอร์
-stat.tiles = ต้อง�าร Tiles
-stat.affinities = Affinities
+stat.tiles = ช่องที่ต้อง�าร
+stat.affinities = ความสัมพันธ์
+stat.opposites = ตรงข้าม
 stat.powercapacity = ความจุพลังงาน
 stat.powershot = หน่วยพลังงาน/นัด
 stat.damage = ดาเมจ
-stat.targetsair = ยิงอา�าศยาน
-stat.targetsground = ยิงภาคพื้นดิน
-stat.itemsmoved = ความเร็วเคลื่อนที่
+stat.targetsair = ยิงอา�าศ
+stat.targetsground = ยิงพื้นดิน
+stat.itemsmoved = ความเร็ว�ารเคลื่อนย้าย
 stat.launchtime = เวลาระหว่าง�ารส่ง
 stat.shootrange = ระยะยิง
 stat.size = ขนาด
-stat.displaysize = ขนาดที่โชว์
-stat.liquidcapacity = จุของเหลว
+stat.displaysize = ขนาดที่�สดง
+stat.liquidcapacity = ความจุของเหลว
 stat.powerrange = ระยะพลังงาน
-stat.linkrange = Link Range
-stat.instructions = คำ�นะนำ
+stat.linkrange = ระยะ�ารเชื่อมต่อ
+stat.instructions = ความเร็วคำสั่ง
 stat.powerconnections = จำนวน�ารเชื่อมต่อสูงสุด
 stat.poweruse = ใช้พลังงาน
 stat.powerdamage = หน่วยพลังงาน/ดาเมจ
-stat.itemcapacity = จุไอเท็ม
-stat.memorycapacity = Memory Capacity
-stat.basepowergeneration = �ำเนิดพลังงานพื้น�าน
-stat.productiontime = เวลาที่ใช้ใน�ารผลิต
-stat.repairtime = เวลาที่ใช้ใน�ารซ่อม�ซมให้สมบูรณ์
+stat.itemcapacity = ความจุไอเท็ม
+stat.memorycapacity = ความจุหน่วยความจำ
+stat.basepowergeneration = ผลิตพลังงานพื้น�าน
+stat.productiontime = เวลาใน�ารผลิต
+stat.repairtime = เวลาใน�ารซ่อมบล็อ�ให้เสร็จ
+stat.repairspeed = ความเร็ว�ารซ่อม
+stat.weapons = อาวุธ
+stat.bullet = �ระสุน
+stat.moduletier = ระดับหน่วยประ�อบ
+stat.unittype = ชนิดยูนิต
 stat.speedincrease = เพิ่มความเร็ว
 stat.range = ระยะ
-stat.drilltier = ขุดได้
-stat.drillspeed = ความเร็วขุดพื้น�าน
-stat.boosteffect = �อฟเฟ็คของบูสต์
+stat.drilltier = �ร่ที่ขุดได้
+stat.drillspeed = ความเร็ว�ารขุดเฉลี่ย
+stat.boosteffect = เอฟเฟ�ต์ของบูสต์
 stat.maxunits = จำนวนยูนิตสูงสุด
-stat.health = เลือด
+stat.health = พลังชีวิต
+stat.armor = เ�ราะ
 stat.buildtime = เวลาใน�ารสร้าง
-stat.maxconsecutive = ติดต่อ�ันสูงสุด
+stat.maxconsecutive = ติดต่อ�ันได้สูงสุด
 stat.buildcost = ใช้
 stat.inaccuracy = ความคลาดเคลื่อน
 stat.shots = นัด
-stat.reload = นัด/วินาที
+stat.reload = อัตรา�ารยิง
 stat.ammo = �ระสุน
-stat.shieldhealth = เลือดของเ�ราะ
-stat.cooldowntime = เวลา Cooldown
-stat.explosiveness = Explosiveness
-stat.basedeflectchance = Base Deflect Chance
-stat.lightningchance = Lightning Chance
-stat.lightningdamage = Lightning Damage
-stat.flammability = Flammability
-stat.radioactivity = Radioactivity
-stat.heatcapacity = HeatCapacity
-stat.viscosity = Viscosity
-stat.temperature = Temperature
-stat.speed = Speed
-stat.buildspeed = Build Speed
-stat.minespeed = Mine Speed
-stat.minetier = Mine Tier
-stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
-stat.abilities = Abilities
+stat.shieldhealth = พลังชีวิตโล่
+stat.cooldowntime = เวลาคูลดาวน์
+stat.explosiveness = �รงระเบิด
+stat.basedeflectchance = โอ�าส�ระสุนสะท้อน�ลับ
+stat.lightningchance = โอ�าสเ�ิดสายฟ้า
+stat.lightningdamage = ดาเมจสายฟ้า
+stat.flammability = ความไวไฟ
+stat.radioactivity = �ัมมันตภาพรังสี
+stat.charge = ชาร์จไฟฟ้า
+stat.heatcapacity = ความจุความร้อน
+stat.viscosity = ความหนืด
+stat.temperature = อุณหภูมิ
+stat.speed = ความเร็ว
+stat.buildspeed = ความเร็ว�ารสร้าง
+stat.minespeed = ความเร็ว�ารขุด
+stat.minetier = �ร่ที่ขุดได้
+stat.payloadcapacity = ความจุสิ่งบรรทุ�
+stat.abilities = ทั�ษะ
+stat.canboost = บูสต์ได้
+stat.flying = บินได้
+stat.ammouse = �ารใช้�ระสุน
+stat.ammocapacity = ความจุ�ระสุน
+stat.damagemultiplier = พหุคูณดาเมจ
+stat.healthmultiplier = พหุคูณพลังชีวิต
+stat.speedmultiplier = พหุคูณความเร็ว
+stat.reloadmultiplier = พหุคูณ�ารรีโหลด
+stat.buildspeedmultiplier = พหุคูณความเร็ว�ารสร้าง
+stat.reactive = ป�ิ�ิริยา
+stat.immunities = ต่อต้านสถานะ
+stat.healing = �ารรั�ษา
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
+ability.forcefield = โล่พลังงาน
+ability.forcefield.description = ฉายโล่พลังงานที่ดูดซับ�ระสุนต่างๆ
+ability.repairfield = สนามซ่อม�ซม
+ability.repairfield.description = ซ่อม�ซมยูนิตในรอบข้าง
+ability.statusfield = สนามเอฟเฟ�ต์
+ability.statusfield.description = เพิ่มเอฟเฟ�ต์สถานะให้�ับยูนิตรอบข้าง
+ability.unitspawn = โรงงานยูนิต
+ability.unitspawn.description = �่อสร้างยูนิตออ�มาได้
+ability.shieldregenfield = สนามรั�ษาโล่
+ability.shieldregenfield.description = ฟื้นฟูรั�ษาโล่ให้�ับยูนิตรอบข้าง
+ability.movelightning = สายฟ้าฟาด
+ability.movelightning.description = ปลดปล่อยสายฟ้าในขณะที่เคลื่อนที่
+ability.armorplate = �ผ่นเ�ราะป้อง�ัน
+ability.armorplate.description = ลดความเสียหายที่ได้รับในขณะที่ยิง
+ability.shieldarc = โล่พลังงานโค้ง
+ability.shieldarc.description = ฉายโล่พลังงาน�บบโค้งงอที่ดูดซับ�ระสุนต่างๆ
+ability.suppressionfield = สนามระงับ�ารฟื้นฟู
+ability.suppressionfield.description = ระงับยั้บยั้ง�ารทำงานของเครื่องซ่อม�ซมของทีมศัตรูที่อยู่ใ�ล้เคียง
+ability.energyfield = สนามพลังงาน
+ability.energyfield.description = ช็อตไฟฟ้าศัตรูที่อยู่รอบข้าง
+ability.energyfield.healdescription = ช็อตไฟฟ้าศัตรูที่อยู่รอบข้าง�ละฟื้นฟูรั�ษาพันธมิตร
+ability.regen = �ารฟื้นฟู
+ability.regen.description = ฟื้นฟูสถานะสุขภาพ�ละพลังชีวิตของตัวเองเป็นระยะๆ
+ability.liquidregen = ดูดซับของเหลว
+ability.liquidregen.description = ดูดซับของเหลวเพื่อฟื้นฟูพลังชีวิตตัวเอง
+ability.spawndeath = ตัวตายตัว�ทน
+ability.spawndeath.description = ให้�ำเนิดยูนิตออ�มาหลังความตาย
+ability.liquidexplode = ระเบิดของเหลว�ห่งความตาย
+ability.liquidexplode.description = �ระจายของเหลวไปทั่วพื้นหลังความตาย
+ability.stat.firingrate = [stat]{0}/วิ[lightgray] อัตรา�ารยิง
+ability.stat.regen = [stat]{0}[lightgray] พลังชีวิต/วิ
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] เ�ราะ
+ability.stat.repairspeed = [stat]{0}/วิ[lightgray] ความเร็ว�ารซ่อม�ซม
+ability.stat.slurpheal = [stat]{0}[lightgray] พลังชีวิต/หน่วยของเหลว
+ability.stat.cooldown = [stat]{0} วิ[lightgray] คูลดาวน์
+ability.stat.maxtargets = [lightgray]เป้าหมายสูงสุด: [white]{0}
+ability.stat.sametypehealmultiplier = [lightgray]รั�ษาชนิดเดียว�ัน: [white]{0}%
+ability.stat.damagereduction = [stat]{0}%[lightgray] ความเสียหายลดลง
+ability.stat.minspeed = [stat]{0} ช่อง/วิ[lightgray] ความเร็วต่ำสุด
+ability.stat.duration = [stat]{0} วิ[lightgray] ระยะเวลา
+ability.stat.buildtime = [stat]{0} วิ[lightgray] ความใน�ารสร้าง
 
-bar.drilltierreq = จำเป็นต้องใช้เครื่องขุดที่ดี�ว่า
-bar.noresources = ทรัพยา�รหาย
-bar.corereq = �าน Core ที่ต้อง�าร
-bar.drillspeed = ความเร็วขุด: {0}/s
-bar.pumpspeed = ความเร็วปั้ม: {0}/s
+
+bar.onlycoredeposit = ขนย้ายทรัพยา�รลง��น�ลางได้เท่านั้น
+bar.drilltierreq = ต้องมีเครื่องขุดที่ดี�ว่านี้
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = ขาดทรัพยา�ร
+bar.corereq = ต้องวางบน��น�ลาง
+bar.corefloor = ต้องวางบนช่องโซน��น�ลาง
+bar.cargounitcap = ถึงขีดจำ�ัดยูนิตขนส่ง�ล้ว
+bar.drillspeed = ความเร็ว�ารขุด: {0}/วิ
+bar.pumpspeed = ความเร็ว�ารปั้ม: {0}/วิ
 bar.efficiency = ประสิทธิภาพ: {0}%
-bar.powerbalance = พลังงาน: {0}/s
-bar.powerstored = เ�็บ�ล้ว: {0}/{1}
+bar.boost = �ารเร่ง: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = พลังงาน: {0}/วิ
+bar.powerstored = สะสมไว้: {0}/{1}
 bar.poweramount = พลังงาน: {0}
 bar.poweroutput = พลังงานออ�: {0}
-bar.powerlines = Connections: {0}/{1}
+bar.powerlines = �ารเชื่อมต่อ: {0}/{1}
 bar.items = ไอเท็ม: {0}
 bar.capacity = ความจุ: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[ยูนิตถู�ปิด]
 bar.liquid = ของเหลว
 bar.heat = ความร้อน
+bar.cooldown = Cooldown
+bar.instability = ความไม่เสถียร
+bar.heatamount = ความร้อน: {0}
+bar.heatpercent = ความร้อน: {0} ({1}%)
 bar.power = พลังงาน
-bar.progress = ความคืบหน้าใน�ารสร้าง
-bar.input = นำเข้า
-bar.output = ส่งออ�
+bar.progress = ความคืบหน้า
+bar.loadprogress = ความคืบหน้า
+bar.launchcooldown = คูลดาวน์�ารส่งทรัพยา�ร
+bar.input = ด้านเข้า
+bar.output = ด้านออ�
+bar.strength = [lightgray]ความรุน�รง [stat]{0}[lightgray]x
 
-units.processorcontrol = [lightgray]Processor Controlled
+units.processorcontrol = [lightgray]ถู�ตัวประมวลผลควบคุมอยู่
 
 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.homing = [stat]ติดตามตัว
+bullet.armorpierce = [stat]เจาะเ�ราะ
+bullet.maxdamagefraction = [stat]{0}%[lightgray] ความเสียหายสูงสุด
+bullet.suppression = [stat]{0} วิ[lightgray] ระงับ�ารฟื้นฟู ~ [stat]{1}[lightgray] ช่อง
+bullet.interval = [stat]{0}/วิ[lightgray] �ระสุนช่วงระยะ:
+bullet.frags = [stat]{0}[lightgray]x �ระสุน�ระจาย:
+bullet.lightning = [stat]{0}[lightgray]x สายฟ้า ~ [stat]{1}[lightgray] ดาเมจ
+bullet.buildingdamage = [lightgray]ดาเมจต่อสิ่ง�่อสร้าง [stat]{0}%[lightgray]
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] ดัน�ลับ
-bullet.pierce = [stat]{0}[lightgray]x pierce
-bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]�ช่�ข็ง
-bullet.tarred = [stat]เปื้อนน้ำมัน
-bullet.multiplier = [stat]{0}[lightgray]x จำนวน�ระสุนต่อ 1 ไอเท็ม
-bullet.reload = [stat]{0}[lightgray]x ความเร็วยิง
+bullet.pierce = [lightgray]เจาะทะลุ [stat]{0}[lightgray]x
+bullet.infinitepierce = [stat]เจาะทะลุ
+bullet.healpercent = [stat]{0}[lightgray]% รั�ษา
+bullet.healamount = [lightgray]รั�ษาโดยตรง [stat]{0}[lightgray] หน่วย
+bullet.multiplier = [stat]{0}[lightgray] �ระสุน/ไอเท็ม
+bullet.reload = [lightgray]ความเร็ว�ารยิง [stat]{0}[lightgray]%
+bullet.range = [lightgray]ระยะยิง [stat]{0}[lightgray] ช่อง
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
-unit.blocks = บล็อค
-unit.blockssquared = blocks²
-unit.powersecond = หน่วยพลังงาน/วินาที
-unit.liquidsecond = หน่วยของเหลว/วินาที
+unit.blocks = บล็อ�
+unit.blockssquared = บล็อ�²
+unit.powersecond = หน่วย/วินาที
+unit.tilessecond = ช่อง/วินาที
+unit.liquidsecond = หน่วย/วินาที
 unit.itemssecond = ไอเท็ม/วินาที
 unit.liquidunits = หน่วยของเหลว
 unit.powerunits = หน่วยพลังงาน
+unit.heatunits = หน่วยความร้อน
 unit.degrees = องศา
 unit.seconds = วินาที
-unit.minutes = mins
-unit.persecond = /วินาที
-unit.perminute = /min
-unit.timesspeed = เท่าเร็วขึ้น
+unit.minutes = นาที
+unit.persecond = /วิ
+unit.perminute = /นาที
+unit.timesspeed = x เร็วขึ้น
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = เลือดเ�ราะ
+unit.shieldhealth = พลังชีวิตโล่
 unit.items = ไอเท็ม
-unit.thousands = พัน
-unit.millions = ล้าน
-unit.billions = พันล้าน
+unit.thousands = k
+unit.millions = mil
+unit.billions = b
+unit.shots = นัด
+unit.pershot = /�ารยิง
+category.purpose = วัตถุประสงค์
 category.general = ทั่วไป
 category.power = พลังงาน
 category.liquids = ของเหลว
 category.items = ไอเท็ม
-category.crafting = นำเข้า/ส่งออ�
-category.function = Function
-category.optional = �ารเพิ่มประสิทธิภาพทางเลือ�
-setting.landscape.name = ล็อค Landscape �นวนอน
+category.crafting = �ารผลิต
+category.function = ฟังค์ชั่น
+category.optional = ทางเลือ��ารเพิ่มประสิทธิภาพ
+setting.alwaysmusic.name = เล่นเพลงตลอดเวลา
+setting.alwaysmusic.description = เมื่อเปิดใช้งาน เพลงจะเล่นในพื้นหลังวนอยู่ตลอดเวลาในเ�ม\nเมื่อปิดใช้งาน เพลงจะสุ่มเล่นในช่วงระยะเวลาหนึ่งเท่านั้น
+setting.skipcoreanimation.name = ข้าม�อนิเมชั่น�ารบิน/ลงจอดของ��น�ลาง
+setting.landscape.name = ล็อ�ภูมิทัศน์�นวนอน
 setting.shadows.name = เงา
-setting.blockreplace.name = �นะนำบล็อคโดยอัตโนมัติ
+setting.blockreplace.name = �นะนำบล็อ�โดยอัตโนมัติ
 setting.linear.name = �าร�รองเชิงเส้น
 setting.hints.name = คำ�นะนำ
-setting.flow.name = �สดงอัตรา�ารไหลของทรัพยา�ร[scarlet] (รุ่นทดลอง)
+setting.logichints.name = คำ�นะนำลอจิ�
+setting.backgroundpause.name = หยุดในพื้นหลัง
 setting.buildautopause.name = หยุดสร้างชั่วคราว�บบอัตโนมัติ
-setting.animatedwater.name = �อนิเมชั่นน้ำ
-setting.animatedshields.name = �อนิเมชั่นเ�ราะ
-setting.antialias.name = Antialias[lightgray] (จำเป็นต้องรีสตาร์ท)[]
+setting.doubletapmine.name = �ดสองครั้งเพื่อขุด
+setting.commandmodehold.name = �ดค้างเพื่อสั่ง�าร
+setting.distinctcontrolgroups.name = จำ�ัดหนึ่ง�ลุ่มสั่ง�ารต่อยูนิต
+setting.modcrashdisable.name = ปิดม็อดเมื่อเ�มขัดข้อง
+setting.animatedwater.name = �อนิเมชั่นพื้น�ละน้ำ
+setting.animatedshields.name = �อนิเมชั่นโล่พลังงาน
 setting.playerindicators.name = ตัวบอ�ผู้เล่น
-setting.indicators.name = ตัวบอ�ศัตรู/พั�พว�
+setting.indicators.name = ตัวบอ�ศัตรู/พันธมิตร
 setting.autotarget.name = เล็งเป้าอัตโนมัติ
-setting.keyboard.name = �ารควบคุม�บบ เม้าส์+คีย์บอร์ด
+setting.keyboard.name = �ารควบคุม�บบเม้าส์ + คีย์บอร์ด
 setting.touchscreen.name = �ารควบคุม�บบหน้าจอสัมผัส
-setting.fpscap.name = FPS
-setting.fpscap.none = ไม่มี
+setting.fpscap.name = FPS สูงสุด
+setting.fpscap.none = ∞
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = ขนาด UI[lightgray] (จำเป็นต้องรีสตาร์ท)[]
-setting.swapdiagonal.name = �ารวางเป็นเส้นท�ยงเสมอ
-setting.difficulty.training = �ึ�ซ้อม
-setting.difficulty.easy = ง่าย
-setting.difficulty.normal = ปาน�ลาง
-setting.difficulty.hard = ยา�
-setting.difficulty.insane = ยา�มา�
-setting.difficulty.name = ระดับความยา�:
+setting.uiscale.name = อัตราขนาด UI
+setting.uiscale.description = อาจจะต้องรีสตาร์ทเพื่อใช้งาน�ารเปลี่ยน�ปลง
+setting.swapdiagonal.name = วางเป็นเส้นท�ยงเสมอ
 setting.screenshake.name = �ารสั่นของจอ
-setting.effects.name = �สดงเอฟเฟ็ค
-setting.destroyedblocks.name = �สดงบล็อคที่ถู�ทำลาย
-setting.blockstatus.name = �สดงสเตตัสของบล็อค
-setting.conveyorpathfinding.name = Pathfinding
-setting.sensitivity.name = ความไวของตัวควบคุม
-setting.saveinterval.name = ระยะห่าวระหว่างเซฟ
+setting.bloomintensity.name = ความรุน�รงของบลูม
+setting.bloomblur.name = ความเบลอบลูม
+setting.effects.name = �สดงเอฟเฟ�ต์
+setting.destroyedblocks.name = �สดงบล็อ�ที่ถู�ทำลาย
+setting.blockstatus.name = �สดงสถานะของบล็อ�
+setting.conveyorpathfinding.name = ตรวจสอบเส้นทาง�ารวางสายพาน
+setting.sensitivity.name = ความเร็วของตัวควบคุม
+setting.saveinterval.name = ระยะห่างระหว่าง�ารเซฟ
 setting.seconds = {0} วินาที
-setting.blockselecttimeout.name = �ารหมดเวลาใน�ารเลือ�บล็อค
 setting.milliseconds = {0} มิลลิวินาที
 setting.fullscreen.name = เต็มจอ
-setting.borderlesswindow.name = วินโดว์�บบไร้ขอบ[lightgray] (อาจจะต้องรีตาร์ท)
+setting.borderlesswindow.name = หน้าต่าง�บบไร้ขอบ
+setting.borderlesswindow.name.windows = จอเต็ม�บบไร้ขอบ
+setting.borderlesswindow.description = อาจจะต้องรีสตาร์ทเพื่อใช้งาน�ารเปลี่ยน�ปลง
 setting.fps.name = �สดง FPS �ละ Ping
-setting.smoothcamera.name = �ล้อง�บบสมูท
+setting.console.name = เปิดใช้งานคอนโซล
+setting.smoothcamera.name = �ล้อง�บบลื่นไหล
 setting.vsync.name = VSync
-setting.pixelate.name = Pixelate[lightgray] (ปิดใช้งาน�อนิเมชั่น)
+setting.pixelate.name = ภาพ�ราฟิ��บบพิ�เซล
 setting.minimap.name = �สดงมินิ�มพ
-setting.coreitems.name = �สดงไอเท็มใน Core (ยังไม่เสร็จสมบูรณ์)
+setting.coreitems.name = �สดงไอเท็มใน��น�ลาง
 setting.position.name = �สดงตำ�หน่งของผู้เล่น
+setting.mouseposition.name = �สดงตำ�หน่งเม้าส์
 setting.musicvol.name = ระดับเสียงเพลง
-setting.atmosphere.name = �สดงชั้นบรรยา�าศของดาวเคราะห์
-setting.ambientvol.name = ระดับเสียงล้อมรอบ
-setting.mutemusic.name = ปิดเพลง
+setting.atmosphere.name = �สดงชั้นบรรยา�าศของดาว
+setting.drawlight.name = วาด�สงสี�ละความมืด
+setting.ambientvol.name = ระดับเสียง�วดล้อม
+setting.mutemusic.name = ปิดเสียงเพลง
 setting.sfxvol.name = ระดับเสียง SFX
 setting.mutesound.name = ปิดเสียง
-setting.crashreport.name = ส่งรายงาน�าร�ครช�บบไม่ระบุตัวตน
+setting.crashreport.name = ส่งรายงานข้อขัดข้อง�บบไม่ระบุตัวตน
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = สร้างเซฟโดยอัตโนมัติ
-setting.publichost.name = �ารมองเห็นเซิฟเวอร์สาธารณะ
-setting.playerlimit.name = จัด�ัดผู้เล่น
+setting.steampublichost.name = �ารมองเห็นเ�มสาธารณะ
+setting.playerlimit.name = จำ�ัดผู้เล่น
 setting.chatopacity.name = ความโปร่ง�สงของ�ชท
-setting.lasersopacity.name = ความโปร่ง�สงของเลเซอร์พลังงาน
+setting.lasersopacity.name = ความโปร่ง�สงของลำ�สงพลังงาน
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = ความโปร่ง�สงของสะพาน
-setting.playerchat.name = �สดงบับเบิ้ล�ชทของผู้เล่น
-public.confirm = คุณต้อง�ารให้เ�มของคุณเปิดเป็นสาธารณะหรือไม่?\n[accent]ทุ�คนจะสามารถเข้าร่วมเ�มของคุณได้.\n[lightgray]คุณสามารถเปลี่ยน�ารตั้งค่านี้ได้ที่ ตั้งค่า->เ�ม->�ารมองเห็นเซิฟเวอร์สาธารณะ.
-public.beta = เ�มเวอร์ชั่นเบต้าไม่สามารถเปิดเซิฟเวอร์สาธารณะได้
-uiscale.reset = ขนาดของ UI มี�ารเปลี่ยน�ปลง\n�ด "โอเค" เพื่อยืนยันขนาดนี้.\n[scarlet]เปลี่ยน�ลับไปเป็น�บบเดิม�ละออ�ในอี�[accent] {0}[] วินาที...
+setting.playerchat.name = �สดง�ล่อง�ชทบนผู้เล่น
+setting.showweather.name = �สดง�ราฟิ�สภาพอา�าศ
+setting.hidedisplays.name = ซ่อนหน้าจอลอจิ�
+setting.macnotch.name = ปรับอินเตอร์เฟซให้เข้า�ับติ่งหน้าจอ
+setting.macnotch.description = อาจจะต้องรีสตาร์ทเพื่อใช้งาน�ารเปลี่ยน�ปลง
+steam.friendsonly = เพื่อนเท่านั้น
+steam.friendsonly.tooltip = ว่าจะให้�ค่เพื่อนเท่านั้นหรือไม่ที่จะสามารถเข้าร่วมเ�มของคุณได้\nหา�คุณติ๊�ช่องนี้ออ�นั้นจะทำให้เ�มของคุณเปิดเป็นสาธารณะ - ใครๆ�็จะสามารถเข้าร่วมเ�มของคุณได้
+public.beta = เ�มเวอร์ชั่นเบต้าไม่สามารถเปิดเซิร์ฟเวอร์สาธารณะได้
+uiscale.reset = อัตราขนาดของ UI ได้มี�ารเปลี่ยน�ปลง\n�ด "โอเค" เพื่อยืนยันขนาด UI นี้\n[scarlet]จะเปลี่ยน�ลับไปเป็นขนาดเดิม�ละออ�ในอี�[accent] {0}[] วินาที...
 uiscale.cancel = ย�เลิ��ละออ�
-setting.bloom.name = Bloom
+setting.bloom.name = บลูม
 keybind.title = ตั้งค่าปุ่ม
-keybinds.mobile = [scarlet]�ารตั้งค่าปุ่มส่วนให�่ไม่สามารถใช้ในมือถือได้. เฉพาะ�ารเคลื่อนไหวพื้น�านเท่านั้นที่ใช้ได้.
+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]Key: [{0},
+category.view.name = �ารมองเห็น
+category.command.name = คำสั่งยูนิต
+category.multiplayer.name = โหมดผู้เล่นหลายคน
+category.blocks.name = เลือ�บล็อ�
+placement.blockselectkeys = \n[lightgray]ปุ่ม: [{0},
 keybind.respawn.name = เ�ิดใหม่
 keybind.control.name = ควบคุมยูนิต
-keybind.clear_building.name = เคลียร์สิ่ง�็สร้าง
+keybind.clear_building.name = เคลียร์สิ่ง�่อสร้าง
 keybind.press = �ดปุ่มใด�็ได้...
 keybind.press.axis = �ด��นหรือปุ่มใด�็ได้...
-keybind.screenshot.name = �มพ Screenshot
-keybind.toggle_power_lines.name = เปิดปิดเลเซอร์พลังงาน
-keybind.toggle_block_status.name = เปิดปิดสถานะของบล็อค
-keybind.move_x.name = เคลื่อนที่ใน��น x
-keybind.move_y.name = เคลี่อนที่ใน��น y
+keybind.screenshot.name = ถ่ายรูป�มพ
+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.pan.name = �พนวิว
+keybind.pan.name = เคลื่อน�ารมองเห็น
 keybind.boost.name = บูสต์
-keybind.schematic_select.name = เลือ�ภูมิภาค
-keybind.schematic_menu.name = เมนู Schematic
-keybind.schematic_flip_x.name = �ลับ Schematic ใน��น X
-keybind.schematic_flip_y.name = �ลับ Schematic ใน��น Y
+keybind.command_mode.name = โหมดสั่ง�าร
+keybind.command_queue.name = คิวคำสั่งยูนิต
+keybind.create_control_group.name = สร้าง�ลุ่มสั่ง�าร
+keybind.cancel_orders.name = ย�เลิ�คำสั่ง
+keybind.unit_stance_shoot.name = ท่าทียูนิต: ยิง
+keybind.unit_stance_hold_fire.name = ท่าทียูนิต: หยุดยิง
+keybind.unit_stance_pursue_target.name = ท่าทียูนิต: ไล่ตามเป้าหมาย
+keybind.unit_stance_patrol.name = ท่าทียูนิต: ลาดตระเวน
+keybind.unit_stance_ram.name = ท่าทียูนิต: พุ่งชน
+keybind.unit_command_move.name = คำสั่งยูนิต: ขยับ
+keybind.unit_command_repair.name = คำสั่งยูนิต: ซ่อม�ซม
+keybind.unit_command_rebuild.name = คำสั่งยูนิต: สร้างใหม่
+keybind.unit_command_assist.name = คำสั่งยูนิต: ช่วยเหลือผู้เล่น
+keybind.unit_command_mine.name = คำสั่งยูนิต: ขุด
+keybind.unit_command_boost.name = คำสั่งยูนิต: บูสต์
+keybind.unit_command_load_units.name = คำสั่งยูนิต: โหลดยูนิต
+keybind.unit_command_load_blocks.name = คำสั่งยูนิต: โหลดบล็อ�
+keybind.unit_command_unload_payload.name = คำสั่งยูนิต: วางสิ่งบรรทุ�
+keybind.unit_command_enter_payload.name = คำสั่งยูนิต: เข้าบล็อ�บรรทุ�
+keybind.unit_command_loop_payload.name = คำสั่งยูนิต: วนซำ้�ารขนถ่ายยูนิต
+keybind.rebuild_select.name = เลือ�พื้นที่สร้างใหม่
+keybind.schematic_select.name = เลือ�พื้นที่
+keybind.schematic_menu.name = เมนู�ผนผัง
+keybind.schematic_flip_x.name = �ลับด้าน�ผนผัง��น X
+keybind.schematic_flip_y.name = �ลับด้าน�ผนผัง��น Y
 keybind.category_prev.name = หมวดหมู่�่อนหน้า
 keybind.category_next.name = หมวดหมู่ถ้ดไป
-keybind.block_select_left.name = เลือ�บล็อค ซ้าย
-keybind.block_select_right.name = เลือ�บล็อค ขวา
-keybind.block_select_up.name = เลือ�บล็อค ขึ้น
-keybind.block_select_down.name = เลือ�บล็อค ลง
-keybind.block_select_01.name = หมวดหมู่/เลือ�บล็อค 1
-keybind.block_select_02.name = หมวดหมู่/เลือ�บล็อค 2
-keybind.block_select_03.name = หมวดหมู่/เลือ�บล็อค 3
-keybind.block_select_04.name = หมวดหมู่/เลือ�บล็อค 4
-keybind.block_select_05.name = หมวดหมู่/เลือ�บล็อค 5
-keybind.block_select_06.name = หมวดหมู่/เลือ�บล็อค 6
-keybind.block_select_07.name = หมวดหมู่/เลือ�บล็อค 7
-keybind.block_select_08.name = หมวดหมู่/เลือ�บล็อค 8
-keybind.block_select_09.name = หมวดหมู่/เลือ�บล็อค 9
-keybind.block_select_10.name = หมวดหมู่/เลือ�บล็อค 10
-keybind.fullscreen.name = เปิด/ปิด Fullscreen
+keybind.block_select_left.name = เลือ�บล็อ� ซ้าย
+keybind.block_select_right.name = เลือ�บล็อ� ขวา
+keybind.block_select_up.name = เลือ�บล็อ� ขึ้น
+keybind.block_select_down.name = เลือ�บล็อ� ลง
+keybind.block_select_01.name = หมวดหมู่/เลือ�บล็อ� 1
+keybind.block_select_02.name = หมวดหมู่/เลือ�บล็อ� 2
+keybind.block_select_03.name = หมวดหมู่/เลือ�บล็อ� 3
+keybind.block_select_04.name = หมวดหมู่/เลือ�บล็อ� 4
+keybind.block_select_05.name = หมวดหมู่/เลือ�บล็อ� 5
+keybind.block_select_06.name = หมวดหมู่/เลือ�บล็อ� 6
+keybind.block_select_07.name = หมวดหมู่/เลือ�บล็อ� 7
+keybind.block_select_08.name = หมวดหมู่/เลือ�บล็อ� 8
+keybind.block_select_09.name = หมวดหมู่/เลือ�บล็อ� 9
+keybind.block_select_10.name = หมวดหมู่/เลือ�บล็อ� 10
+keybind.fullscreen.name = เปิด/ปิด เต็มจอ
 keybind.select.name = เลือ�/ยิง
 keybind.diagonal_placement.name = วางเป็น�นวท�ยง
-keybind.pick.name = เลือ�บล็อค
-keybind.break_block.name = ทุบบล็อค
-keybind.deselect.name = ย�เลิ��ารเบือ�
-keybind.pickupCargo.name = ย�ของขึ้น
-keybind.dropCargo.name = วางของลง
-keybind.command.name = คำสั่ง
+keybind.pick.name = เลือ�บล็อ�
+keybind.break_block.name = ทุบบล็อ�
+keybind.select_all_units.name = เลือ�ยูนิตทั้งหมด
+keybind.select_all_unit_factories.name = เลือ�โรงงานยูนิตทั้งหมด
+keybind.deselect.name = ย�เลิ��ารเลือ�
+keybind.pickupCargo.name = ย�สิ่งบรรทุ�ขึ้น
+keybind.dropCargo.name = วางสิ่งบรรทุ�ลง
 keybind.shoot.name = ยิง
 keybind.zoom.name = ซูม
 keybind.menu.name = เมนู
 keybind.pause.name = หยุดชั่วคราว
 keybind.pause_building.name = หยุด/สร้างต่อ
-keybind.minimap.name = มินิ�มะ
+keybind.minimap.name = มินิ�มพ
+keybind.planet_map.name = �ผนที่ดาวเคราะห์
+keybind.research.name = �ารวิจัย
+keybind.block_info.name = ข้อมูลบล็อ�
 keybind.chat.name = �ชท
 keybind.player_list.name = รายชื่อผู้เล่น
-keybind.console.name = คอนโซล์
+keybind.console.name = คอนโซล
 keybind.rotate.name = หมุน
 keybind.rotateplaced.name = หมุนที่มีอยู่ (�ดค้าง)
 keybind.toggle_menus.name = เปิด/ปิด เมนู
 keybind.chat_history_prev.name = ประวัติ�ชท�่อนหน้า
 keybind.chat_history_next.name = ประวัติ�ชทถัดไป
 keybind.chat_scroll.name = เลื่อน�ชท
-keybind.drop_unit.name = ดรอปยูนิต
+keybind.chat_mode.name = เปลี่ยนโหมด�ชท
+keybind.drop_unit.name = วางยูนิต
 keybind.zoom_minimap.name = ซูมมินิ�มพ
 mode.help.title = คำอธิบายโหมด
 mode.survival.name = เอาชีวิตรอด
-mode.survival.description = โหมดป�ติ. ทรัพยา�รมีจำ�ัด�ละ wave มาโดยอัตโนมัติ.\n[gray]ต้องมีสปาวน์ของศัตรูเพื่อที่จะเล่น.
+mode.survival.description = โหมดป�ติ ทรัพยา�รมีจำ�ัด�ละคลื่นมาโดยอัตโนมัติ\n[gray]ต้องมีจุดเ�ิดของศัตรูเพื่อที่จะเล่น
 mode.sandbox.name = โหมดอิสระ
-mode.sandbox.description = ทรัพยาดรไม่จำ�ัด�ละ wave ไม่จับเวลา.
-mode.editor.name = Editor
+mode.sandbox.description = ทรัพยา�รไม่จำ�ัด�ละคลื่นไม่จับเวลา
+mode.editor.name = ตัว��้ไข
 mode.pvp.name = PvP
-mode.pvp.description = สู้�ับผู้เล่นอื่น.\n[gray]�มพจำเป็นต้องมี 2 core ที่ไม่ใช่สีเดียว�ัน.
+mode.pvp.description = สู้�ับผู้เล่นอื่น\n[gray]�มพจำเป็นต้องมี��น�ลางสอง��นที่ไม่ใช่สีเดียว�ัน
 mode.attack.name = โจมตี
-mode.attack.description = ทำลาย�านของศัตรู ไม่มี wave.\n[gray]จำเป็นต้องมี core สี�ดงเพื่อเล่น.
+mode.attack.description = ทำลาย�านของศัตรู \n[gray]จำเป็นต้องมี��น�ลางสี�ดงเพื่อเล่น
 mode.custom = �ฎ�บบ�ำหนดเอง
+rules.invaliddata = ข้อมูลคลิปบอร์ดไม่ถู�ต้อง
+rules.hidebannedblocks = ซ่อนบล็อ�ต้องห้าม
 
 rules.infiniteresources = ทรัพยา�รไม่จำ�ัด
-rules.reactorexplosions = �ารระเบิดของ
-rules.schematic = Schematics Allowed
-rules.wavetimer = ตัวนับเวลาปล่อยคลื่น(รอบ)
-rules.waves = คลื่น(รอบ)
+rules.onlydepositcore = ขนย้ายทรัพยา�รลง��น�ลางได้เท่านั้น
+rules.derelictrepair = อนุ�าต�ารซ่อม�ซมบล็อ�ทิ้งร้าง
+rules.reactorexplosions = เปิด�ารระเบิดของเตาป�ิ�ร
+rules.coreincinerates = ��น�ลางเผาทรัพยา�รส่วนเ�ิน
+rules.disableworldprocessors = ปิด�ารทำงานของตัวประมวลผลโล�
+rules.schematic = อนุ�าตให้ใช้�ผนผัง
+rules.wavetimer = นับถอยหลัง�ารปล่อยคลื่น
+rules.wavesending = �ดเพื่อปล่อยคลื่น
+rules.allowedit = อนุ�าต�าร��้ไข�ฎ
+rules.allowedit.info = เมื่อเปิดใช้งาน ผู้เล่นจะสามารถ��้ไข�ฎของ�มพในระหว่างเ�มได้ด้วยปุ่มล่างซ้ายในเมนู
+rules.alloweditworldprocessors = อนุ�าต�าร��้ไขตัวประมวลผลโล�
+rules.alloweditworldprocessors.info = เมื่อเปิดใช้งาน ตัวประมวลผลโล�จะสามารถถู�วาง�ละ��้ไขได้�ม้จะอยู่ภายนอ�ตัว��้ไข
+rules.waves = คลื่น
+rules.airUseSpawns = ยูนิตอา�าศใช้จุดเ�ิด
 rules.attack = โหมด�ารโจมตี
-rules.buildai = สิ่�่อสร้างของ AI
-rules.enemyCheat = AI (ทีมสี�ดง) มีทรัพยา�รไม่จำ�ัด
-rules.blockhealthmultiplier = พหุคูณเลือดของบล็อค
-rules.blockdamagemultiplier = พหุคูณดาเมจของบล็อค
+rules.buildai = AI สร้าง�านทัพ
+rules.buildaitier = ระดับ�ารสร้างของ AI
+rules.rtsai = RTS AI [red](ไม่เสถียร)
+rules.rtsai.campaign = AI โจมตี�บบ RTS
+rules.rtsai.campaign.info = ใน�มพโจมตี จะทำให้ยูนิตรวมตัว�ัน�ละจู่โจม�านทัพของผู้เล่นในวิถี�ารคำนวณที่ฉลาดมา��ว่า
+rules.rtsminsquadsize = ขนาด�องทัพเล็�ที่สุด
+rules.rtsmaxsquadsize = ขนาด�องทัพให�่ที่สุด
+rules.rtsminattackweight = ขนาดน้ำหนั��ารโจมตีน้อยที่สุด
+rules.cleanupdeadteams = ลบล้างสิ่ง�่อสร้างศัตรูที่พ่าย�พ้ (PvP)
+rules.corecapture = ยืด��น�ลางเมื่อทำลาย
+rules.polygoncoreprotection = รัศมีป�ป้อง��น�ลาง�บบหลายเหลี่ยม
+rules.placerangecheck = ตรวจสอบระยะห่าง�ารวาง
+rules.enemyCheat = ทีมศัตรูมีทรัพยา�รไม่จำ�ัด
+rules.blockhealthmultiplier = พหุคูณพลังชีวิตของบล็อ�
+rules.blockdamagemultiplier = พหุคูณดาเมจของบล็อ�
 rules.unitbuildspeedmultiplier = พหุคูณความเร็วใน�ารสร้างยูนิต
-rules.unithealthmultiplier = พหุคูณเลือดของยูนิต
+rules.unitcostmultiplier = พหูคุณราคาทรัพยา�รของยูนิต
+rules.unithealthmultiplier = พหุคูณพลังชีวิตของยูนิต
 rules.unitdamagemultiplier = พหุคูณพลังโจมตีของยูนิต
+rules.unitcrashdamagemultiplier = พหูคูณดาเมจ�ารต�ของยานยูนิต
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = พหูคุณพลังงาน�สงอาทิตย์
+rules.unitcapvariable = เพิ่มจำนวนยูนิตสูงสุดต่อ��น�ลาง
+rules.unitpayloadsexplode = สิ่งบรรทุ�ระเบิดไปพร้อม�ับยูนิต
+rules.unitcap = ขีด�ำจัดยูนิตสูงสุดพื้น�าน
+rules.limitarea = จำ�ัดพื้นที่�มพ
 rules.enemycorebuildradius = รัศมีห้ามสร้างบริเวณ��น�ลางของศัตรู:[lightgray] (ช่อง)
-rules.wavespacing = ระยะเวลาระหว่างคลื่น(รอบ):[lightgray] (วินาที)
-rules.buildcostmultiplier = พหุคูณจำนวนทรัพยา�รที่ใช้ใน�ารสร้าง
-rules.buildspeedmultiplier = พหุคูณความเร็วใน�ารสร้าง
-rules.deconstructrefundmultiplier = พหุคูณ�ารคืนทรัพยา�รเมื่อทำ�ารทำลายสิ่ง�่อสร้าง
-rules.waitForWaveToEnd = คลื่น(รอบ)รอศัตรู
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = ระยะเวลาระหว่างคลื่น:[lightgray] (วินาที)
+rules.initialwavespacing = ระยะเวลาระหว่างคลื่น�ร�:[lightgray] (วินาที)
+rules.buildcostmultiplier = พหุคูณราคาทรัพยา�รใน�ารสร้าง
+rules.buildspeedmultiplier = พหุคูณความเร็ว�ารสร้าง
+rules.deconstructrefundmultiplier = พหุคูณ�ารคืนทรัพยา�รเมื่อทำลาย
+rules.waitForWaveToEnd = คลื่นจะรอศัตรู
+rules.wavelimit = �มพจบหลังคลื่นที่
 rules.dropzoneradius = รัศมีจุดเ�ิดของศัตรู:[lightgray] (ช่อง)
 rules.unitammo = ยูนิตต้องใช้�ระสุน
-rules.title.waves = คลื่น(รอบ)
+rules.enemyteam = ทีมศัตรู
+rules.playerteam = ทีมผู้เล่น
+rules.title.waves = คลื่น
 rules.title.resourcesbuilding = ทรัพยา�ร�ละสิ่ง�่อสร้าง
 rules.title.enemy = ศัตรู
 rules.title.unit = ยูนิต
-rules.title.experimental = Experimental
+rules.title.experimental = ทดลอง
 rules.title.environment = สิ่ง�วดล้อม
+rules.title.teams = ทีม
+rules.title.planet = ดาว
 rules.lighting = �สง
-rules.enemyLights = Enemy Lights
+rules.fog = หมอ��ห่งสงคราม
+rules.invasions = �ารรุ�รานของ�านทัพศัตรู
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = �สดงจุดเ�ิดศัตรู
+rules.randomwaveai = AI คลื่น�บบคาดเดาไม่ได้
 rules.fire = ไฟ
-rules.explosions = ดาเมจบล็อค/ยูนิตระเบิด
+rules.anyenv = <อะไร�็ได้>
+rules.explosions = ดาเมจ�ารระเบิดของบล็อ�/ยูนิต
 rules.ambientlight = �สงจา��วดล้อม
 rules.weather = สภาพอา�าศ
 rules.weather.frequency = ความถี่:
+rules.weather.always = ตลอด
 rules.weather.duration = ระยะเวลา:
 
+rules.randomwaveai.info = ทำให้ยูนิตที่เ�ิดจา�คลิ่นเล็งเป้าหมายสิ่ง�่อสร้างอย่างสุ่ม�ทนที่จะมุ่งโจมตี�ต่��น�ลางหรือเครื่อง�ำเนิดไฟฟ้า
+rules.placerangecheck.info = ป้อง�ันผู้เล่นไม่ให้วางอะไรใ�ล้ๆ�ับสิ่ง�่อสร้างศัตรู เมื่อวางป้อมปืน ระยะนั้นจะขยายออ�มา�ขึ้น เพื่อไม่ให้ป้อมปืนนั้นมีระยะยิงถึงศัตรู
+rules.onlydepositcore.info = ป้อง�ันยูนิตไม่ให้โอนถ่ายไอเท็มลงสิ่ง�่อสร้างใดๆ ย�เว้น��น�ลาง
+
 content.item.name = ไอเท็ม
 content.liquid.name = ของเหลว
 content.unit.name = ยูนิต
-content.block.name = บล็อค
+content.block.name = บล็อ�
+content.status.name = เอฟเฟ�ต์สถานะ
+content.sector.name = เซ็�เตอร์
+content.team.name = �่าย
+wallore = (�ำ�พง)
 
 item.copper.name = ทอง�ดง
 item.lead.name = ตะ�ั่ว
@@ -916,98 +1465,144 @@ item.blast-compound.name = สารระเบิด
 item.pyratite.name = ไพราไทต์
 item.metaglass.name = �ระจ�เมต้า
 item.scrap.name = เศษเหล็�
+item.fissile-matter.name = สสารฟิซไซล์
+item.beryllium.name = เบริลเลี่ยม
+item.tungsten.name = ทังสเตน
+item.oxide.name = อ๊อ�ไซด์
+item.carbide.name = คาร์ไบด์
+item.dormant-cyst.name = ดอร์�มนท์ซิสต์
+
 liquid.water.name = น้ำ
-liquid.slag.name = เศษ�ร่
+liquid.slag.name = �ร่หลอม
 liquid.oil.name = น้ำมัน
-liquid.cryofluid.name = โครโรฟิวล์
+liquid.cryofluid.name = สารหล่อเย็น
+liquid.neoplasm.name = นีโอพลาสม์
+liquid.arkycite.name = อาร์คย์ไซต์
+liquid.gallium.name = ��ลเลียม
+liquid.ozone.name = โอโซน
+liquid.hydrogen.name = ไฮโดรเจน
+liquid.nitrogen.name = ไนโตรเจน
+liquid.cyanogen.name = ไซยาโนเจน
 
 unit.dagger.name = �ด็�เ�อร์
 unit.mace.name = เมส
 unit.fortress.name = ฟอร์เทรส
-unit.nova.name = โนว่า
-unit.pulsar.name = พอวซ่า
-unit.quasar.name = ควอซ่า
+unit.nova.name = โนวา
+unit.pulsar.name = พัลซ่าร์
+unit.quasar.name = ควอซ่าร์
 unit.crawler.name = ครอว์เลอร์
-unit.atrax.name = เอ�ทรซ
+unit.atrax.name = เอ�ทรคซ์
 unit.spiroct.name = สปิรอคท์
-unit.arkyid.name = อาร์คิดย์
-unit.toxopid.name = โทโสพิด
+unit.arkyid.name = อาร์ยคิด
+unit.toxopid.name = ท็อคโซพิด
 unit.flare.name = �ฟลร์
 unit.horizon.name = ฮอไรซอน
-unit.zenith.name = ซีนิท
-unit.antumbra.name = �อนทัมบรา
-unit.eclipse.name = อีคลิปส์
+unit.zenith.name = เซนิธ
+unit.antumbra.name = รัตติ�าล
+unit.eclipse.name = อุปราคา
 unit.mono.name = โมโน
-unit.poly.name = โพลี
+unit.poly.name = โพลิ
 unit.mega.name = เม�้า
 unit.quad.name = ควอด
-unit.oct.name = ออ�ค์
-unit.risso.name = ริสโส
-unit.minke.name = มิงค์
+unit.oct.name = อ็อคท์
+unit.risso.name = ริสโซ่
+unit.minke.name = มิง�ี้
 unit.bryde.name = ไบรดย์
-unit.sei.name = ไซย์
+unit.sei.name = เซย์
 unit.omura.name = โอมูร่า
+unit.retusa.name = เรธูซ่า
+unit.oxynoe.name = อ๊อ�ซิโนอ์
+unit.cyerce.name = เซียรส์
+unit.aegires.name = เอเ�ียเรส
+unit.navanax.name = นาวา�น็คซ์
 unit.alpha.name = อัลฟ่า
-unit.beta.name = บีตเา
+unit.beta.name = เบต้า
 unit.gamma.name = ��มม่า
-unit.scepter.name = สเซปเตอร์
-unit.reign.name = เรน
+unit.scepter.name = ศัสตรา
+unit.reign.name = ไอศวรรย์
 unit.vela.name = เวล่า
 unit.corvus.name = คอร์วัส
+unit.stell.name = สเตลล์
+unit.locus.name = โลคัส
+unit.precept.name = พรีเซ็ปต์
+unit.vanquish.name = �วนควิซ
+unit.conquer.name = คอนเควอร์
+unit.merui.name = เมรุย
+unit.cleroi.name = เคลอรอย
+unit.anthicus.name = �อนธิคัส
+unit.tecta.name = เทคต้า
+unit.collaris.name = คอลลาริส
+unit.elude.name = เอลูด
+unit.avert.name = อเวิร์ต
+unit.obviate.name = อ็อบวีเอท
+unit.quell.name = คเวลล์
+unit.disrupt.name = ดิสรัปต์
+unit.evoke.name = อีโวค
+unit.incite.name = อินไซต์
+unit.emanate.name = อิมาเนต
+unit.manifold.name = �มนิโฟลด์
+unit.assembly-drone.name = โดรนประ�อบร่าง
+unit.latum.name = ลาทัม
+unit.renale.name = รีเนล
 
-block.resupply-point.name = จุดเติมของ
-block.parallax.name = พารา�ล็ซ
-block.cliff.name = หน้าผ่า
+block.parallax.name = พารา�ล็คซ์
+block.cliff.name = หน้าผา
 block.sand-boulder.name = �้อนหินทราย
+block.basalt-boulder.name = �้อนบะซอลต์
 block.grass.name = ห�้า
-block.slag.name = Slag
-block.space.name = Space
+block.molten-slag.name = �ร่หลอมละลาย
+block.pooled-cryofluid.name = บ่อสารหล่อเย็น
+block.space.name = อว�าศ
 block.salt.name = เ�ลือ
 block.salt-wall.name = �ำ�พงเ�ลือ
 block.pebbles.name = �้อน�รวด
-block.tendrils.name = ไม้เลื้อย
+block.tendrils.name = เถาวัลย์
 block.sand-wall.name = �ำ�พงทราย
 block.spore-pine.name = ต้นสนสปอร์
 block.spore-wall.name = �ำ�พงสปอร์
-block.boulder.name = �้อยหินให�่
-block.snow-boulder.name = หินหิมะให�่
-block.snow-pine.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.spore-moss.name = สปอร์ติดมอส
 block.shale-wall.name = �ำ�พงหินดินดาน
 block.scrap-wall.name = �ำ�พงเศษเหล็�
 block.scrap-wall-large.name = �ำ�พงเศษเหล็�ขนาดให�่
-block.scrap-wall-huge.name = �ำ�พงเศษเหล็�ขนาดให�่มา�
-block.scrap-wall-gigantic.name = �ำ�พงเศษเหล็�ขนาดยั�ษ์
-block.thruster.name = ทรัสเตอร์
-block.kiln.name = เตาเผา
+block.scrap-wall-huge.name = �ำ�พงเศษเหล็�ขนาดยั�ษ์
+block.scrap-wall-gigantic.name = �ำ�พงเศษเหล็�ขนาดมหึมา
+block.thruster.name = เครื่องยนต์จรวด
+block.kiln.name = เตาเผา�ระจ�
 block.graphite-press.name = เครื่องอัด�ราไฟต์
-block.multi-press.name = มัลติเพรสต์
+block.multi-press.name = เครื่องอัดสารพัดอย่าง
 block.constructing = {0} [lightgray](�ำลัง�่อสร้าง)
 block.spawn.name = จุดเ�ิดศัตรู
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = ��น�ลาง: ชาร์ด
 block.core-foundation.name = ��น�ลาง: ฟาวน์เดชั่น
 block.core-nucleus.name = ��น�ลาง: นิวเคลียส
-block.deepwater.name = น้ำลึ�
-block.water.name = น้ำ
+block.deep-water.name = น้ำลึ�
+block.shallow-water.name = น้ำ
 block.tainted-water.name = น้ำเสีย
+block.deep-tainted-water.name = น้ำเสียลึ�
 block.darksand-tainted-water.name = น้ำเสียบนทรายดำ
-block.tar.name = น้ำมันดิบ
+block.tar.name = น้ำมันดิน
 block.stone.name = หิน
-block.sand.name = ทราย
+block.sand-floor.name = ทราย
 block.darksand.name = ทรายดำ
 block.ice.name = น้ำ�ข็ง
 block.snow.name = หิมะ
-block.craters.name = หลุมอุ��าบาต
+block.crater-stone.name = หลุมอุ��าบาต
 block.sand-water.name = น้ำบนทราย
 block.darksand-water.name = น้ำบนทรายดำ
 block.char.name = ถ่าน
 block.dacite.name = ดาไซต์
+block.rhyolite.name = ไรโอไลต์
 block.dacite-wall.name = �ำ�พงดาไซต์
-block.dacite-boulder.name = Dacite Boulder
+block.dacite-boulder.name = �้อนหินดาไซต์
 block.ice-snow.name = น้ำ�ข็งหิมะ
 block.stone-wall.name = �ำ�พงหิน
 block.ice-wall.name = �ำ�พงน้ำ�ข็ง
@@ -1017,24 +1612,25 @@ block.pine.name = ต้นสน
 block.dirt.name = ดิน
 block.dirt-wall.name = �ำ�พงดิน
 block.mud.name = โคลน
-block.white-tree-dead.name = ต้นไม้ขาวที่ตาย�ล้ว
+block.white-tree-dead.name = ต้นไม้ขาวตาย
 block.white-tree.name = ต้มไม้ขาว
 block.spore-cluster.name = �ลุ่มสปอร์
-block.metal-floor.name = พื้นเหล็� 1
-block.metal-floor-2.name = พื้นเหล็� 2
-block.metal-floor-3.name = พื้นเหล็� 3
-block.metal-floor-5.name = พื้นเหล็� 4
-block.metal-floor-damaged.name = พื้นเหล็�ที่เสียหาย
+block.metal-floor.name = พื้นโลหะ 1
+block.metal-floor-2.name = พื้นโลหะ 2
+block.metal-floor-3.name = พื้นโลหะ 3
+block.metal-floor-4.name = พื้นโลหะ 4
+block.metal-floor-5.name = พื้นโลหะ 5
+block.metal-floor-damaged.name = พื้นเหล็�ผุพัง
 block.dark-panel-1.name = �ผ่นดำ 1
 block.dark-panel-2.name = �ผ่นดำ 2
 block.dark-panel-3.name = �ผ่นดำ 3
 block.dark-panel-4.name = �ผ่นดำ 4
 block.dark-panel-5.name = �ผ่นดำ 5
 block.dark-panel-6.name = �ผ่นดำ 6
-block.dark-metal.name = เหล็�ดำ
+block.dark-metal.name = โลหะดำ
 block.basalt.name = บะซอลต์
 block.hotrock.name = หินร้อน
-block.magmarock.name = หิน�ม�ม่า
+block.magmarock.name = หิน�ม็�ม่า
 block.copper-wall.name = �ำ�พงทอง�ดง
 block.copper-wall-large.name = �ำ�พงทอง�ดงขนาดให�่
 block.titanium-wall.name = �ำ�พงไทเทเนี่ยม
@@ -1047,289 +1643,1024 @@ block.thorium-wall.name = �ำ�พงทอเรี่ยม
 block.thorium-wall-large.name = �ำ�พงทอเรี่ยมขนาดให�่
 block.door.name = ประตู
 block.door-large.name = ประตูขนาดให�่
-block.duo.name = ดูโอ
+block.duo.name = ดูโอ้
 block.scorch.name = สคอร์ช
-block.scatter.name = ส�คทเทอร์
-block.hail.name = �ฮล
+block.scatter.name = ส��็ตเตอร์
+block.hail.name = ลู�เห็บ
 block.lancer.name = �ลนเซอร์
 block.conveyor.name = สายพาน
 block.titanium-conveyor.name = สายพานไทเทเนี่ยม
-block.plastanium-conveyor.name = สายพานพสาตตาเนี่ยม
+block.plastanium-conveyor.name = สายพานพลาสตาเนี่ยม
 block.armored-conveyor.name = สายพานเสริมเ�ราะ
-block.armored-conveyor.description = เคลื่อนย้ายไอเท็มได้เร็วเทียบเท่าสายพานไทเทเนี่ยม �ต่มีเ�ราะที่�ข็ง�รง�ว่า ไม่สามารถรับไอเท็มจา�ด้านข้าง�ละจา�สายพานชนิดอื่นนอ�จา�สายพานชนิดเดียว�ัน.
 block.junction.name = ทาง�ย�
-block.router.name = ตัว�ระจาย
-block.distributor.name = ตัว�จ�จ่าย
-block.sorter.name = เครื่อง�ย�
-block.inverted-sorter.name = เครื่อง�ย��ลับด้าน
-block.message.name = ตัวเ�็บข้อความ
+block.router.name = เร้าเตอร์
+block.distributor.name = เครื่อง�จ�จ่าย
+block.sorter.name = เครื่องคัด�ย�
+block.inverted-sorter.name = เครื่องคัด�ย��ลับด้าน
+block.message.name = �ล่องข้อความ
+block.reinforced-message.name = �ล่องข้อความเสริม�ำลัง
+block.world-message.name = �ล่องข้อความโล�
+block.world-switch.name = สวิตช์โล�
 block.illuminator.name = ตัวเปล่ง�สง
-block.illuminator.description = �หล่ง�ำเนิด�สงขนาดเล็� สามารถดัด�ปลงได้. จำเป็นต้องใช้พลังงานใน�ารทำงาน.
-block.overflow-gate.name = ประตูระบายไอเทม
-block.underflow-gate.name = ประตูระบายไอเท็มย้อน�ลับ
-block.silicon-smelter.name = เตาเผาซิลิ�อน
+block.overflow-gate.name = ประตูระบาย
+block.underflow-gate.name = ประตูระบายข้าง
+block.silicon-smelter.name = เตาหลอมซิลิ�อน
 block.phase-weaver.name = เครื่องทอใยเฟส
-block.pulverizer.name = เครื่องบด
+block.pulverizer.name = เครื่องบดอัด
 block.cryofluid-mixer.name = เครื่องผสมสารหล่อเย็น
-block.melter.name = เตาหลอม
-block.incinerator.name = เตาเผาขยะ
+block.melter.name = เครื่องหลอมละลาย
+block.incinerator.name = เตาเผาสลาย
 block.spore-press.name = เครื่องอัดสปอร์
-block.separator.name = เครื่อง�ย�
-block.coal-centrifuge.name = เครื่องสังเคราะห์ถ่านหิน
+block.separator.name = เครื่อง�ย�ชิ้นส่วน
+block.coal-centrifuge.name = เครื่อง�ปรรูปถ่านหิน
 block.power-node.name = ตัวจ่ายพลังงาน
 block.power-node-large.name = ตัวจ่ายพลังงานขนาดให�่
 block.surge-tower.name = เสาเสิร์จ
 block.diode.name = ไดโอด�บตเตอรี่
 block.battery.name = �บตเตอรี่
 block.battery-large.name = �บตเตอรี่ขนาดให�่
-block.combustion-generator.name = เครื่อง�ำเนิดไฟฟ้าเผาไหม้ถ่าน
+block.combustion-generator.name = เครื่อง�ำเนิดไฟฟ้าเผาไหม้
 block.steam-generator.name = เครื่อง�ำเนิดไฟฟ้าไอน้ำ
-block.differential-generator.name = เครื่อง�ำเนิดไฟฟ้าดิฟเฟอเร่นเตอร์
-block.impact-reactor.name = เตาป�ิ�รณ์อัด�ระ�ท�
+block.differential-generator.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.water-extractor.name = เครื่องขุดน้ำบาดาล
+block.cultivator.name = เครื่องส�ัดสปอร์
 block.conduit.name = ท่อน้ำ
 block.mechanical-pump.name = ปั๊มเชิง�ล
 block.item-source.name = จุด�ำเนิดไอเท็ม
-block.item-void.name = จุดลบไอเท็ม
+block.item-void.name = หลุมดูดไอเท็ม
 block.liquid-source.name = จุด�ำเนิดของเหลว
-block.liquid-void.name = จุดลบของเหลว
-block.power-void.name = จุดลบพลังงาน
+block.liquid-void.name = หลุมดูดของเหลว
+block.power-void.name = หลุมดูดพลังงาน
 block.power-source.name = จุด�ำเนิดพลังงาน
-block.unloader.name = ตัวถ่ายไอเทม
+block.unloader.name = ตัวถ่ายไอเท็ม
 block.vault.name = ตู้นิรภัย
-block.wave.name = เวฟ
-block.tsunami.name = Tsunami
+block.wave.name = คลื่นสมุทร
+block.tsunami.name = สึนามิ
 block.swarmer.name = สวอร์มเมอร์
 block.salvo.name = ซัลโว
-block.ripple.name = ริปเปิล
+block.ripple.name = ริปเปิ้ล
 block.phase-conveyor.name = สายพานเฟส
-block.bridge-conveyor.name = สายพานสะพาน
-block.plastanium-compressor.name = เครื่องอัดพลาสตาเนียม
+block.bridge-conveyor.name = สะพานไอเท็ม
+block.plastanium-compressor.name = เครื่องอัดพลาสตาเนี่ยม
 block.pyratite-mixer.name = เครื่องผสมไพราไทต์
 block.blast-mixer.name = เครื่องผสมสารระเบิด
-block.solar-panel.name = �ผงโซลาร์
-block.solar-panel-large.name = �ผงโซลาร์ขนาดให�่
+block.solar-panel.name = �ผงโซล่าเซลล์
+block.solar-panel-large.name = �ผงโซล่าเซลล์ขนาดให�่
 block.oil-extractor.name = เครื่องส�ัดน้ำมัน
-block.repair-point.name = จุดซ่อม�ซม
+block.repair-point.name = จุดซ่อม�ซมยูนิต
+block.repair-turret.name = ป้อมซ่อม�ซมยูนิต
 block.pulse-conduit.name = ท่อน้ำพัลซ์
 block.plated-conduit.name = ท่อน้ำเสริมเ�ราะ
 block.phase-conduit.name = ท่อน้ำเฟส
-block.liquid-router.name = เครื่อง�ระจายของเหลว
-block.liquid-tank.name = ถังบรรจุน้ำ
+block.liquid-router.name = เร้าเตอร์ของเหลว
+block.liquid-tank.name = ถังบรรจุของเหลว
+block.liquid-container.name = ตู้บรรจุของเหลว
 block.liquid-junction.name = ทาง�ย�ของเหลว
-block.bridge-conduit.name = ท่อน้ำสะพาน
-block.rotary-pump.name = ปั๊ม�บบหมุน
+block.bridge-conduit.name = สะพานของเหลว
+block.rotary-pump.name = ปั๊มโรตารี่
 block.thorium-reactor.name = เตาป�ิ�รณ์ทอเรี่ยม
 block.mass-driver.name = เครื่องโอนถ่ายมวล
-block.blast-drill.name = เครื่องขุดระเบิดอา�าศ
-block.thermal-pump.name = ปั๊มความร้อน
-block.thermal-generator.name = เครื่อง�ำเนิดไฟฟ้าจา�ความร้อน
-block.alloy-smelter.name = เตาเผาอัลลอย
+block.blast-drill.name = เครื่องขุด�อร์บลาสต์
+block.impulse-pump.name = ปั๊ม�รง�ระตุ้น
+block.thermal-generator.name = เครื่อง�ำเนิดไฟฟ้าพลังอัคคี
+block.surge-smelter.name = เตาหลอมเสิร์จ
 block.mender.name = เครื่องซ่อม�ซม
 block.mend-projector.name = เครื่องฉายซ่อม�ซม
 block.surge-wall.name = �ำ�พงเสิร์จ
 block.surge-wall-large.name = �ำ�พงเสิร์จขนาดให�่
 block.cyclone.name = ไซโคลน
 block.fuse.name = ฟิวส์
-block.shock-mine.name = �ับระเบิดไฟฟ้า
+block.shock-mine.name = �ับระเบิดช็อ�
 block.overdrive-projector.name = เครื่องเร่งประสิทธิภาพ
 block.force-projector.name = เครื่องฉายสนามพลัง
 block.arc.name = อาร์ค
 block.rtg-generator.name = เครื่อง�ำเนิดไฟฟ้า RTG
-block.spectre.name = สเปคเตอร์
+block.spectre.name = สเป็คเตอร์
 block.meltdown.name = เมลท์ดาวน์
-block.foreshadow.name = Foreshadow
+block.foreshadow.name = ฟอร์ชาโดว์
 block.container.name = ตู้เ�็บของ
-block.launch-pad.name = �านส่งของ
-block.launch-pad-large.name = �านส่งของขนาดให�่
-block.segment.name = Segment
-block.command-center.name = ศูนย์ควบคุม
-block.ground-factory.name = โรงงานภาคพื้นดิน
-block.air-factory.name = โรงงานภาคอา�าศ
-block.naval-factory.name = โรงงานทางน้ำ
-block.additive-reconstructor.name = Reconstructor �บบบว�
-block.multiplicative-reconstructor.name = Reconstructor �บบคูณ
-block.exponential-reconstructor.name = Reconstructor �บบเอ็�โพเนนเชียว
-block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.payload-conveyor.name = สายพาน Mass
-block.payload-router.name = ตัวเปลี่ยเส้นทาง Payload
-block.disassembler.name = ตัวชำ�หละ
+block.launch-pad.name = �านส่งทรัพยา�ร
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+block.segment.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.duct.name = ท่อสู��า�าศ
+block.duct-router.name = เร้าเตอร์สู��า�าศ
+block.duct-bridge.name = สะพานสู��า�าศ
+block.large-payload-mass-driver.name = หอโอนถ่ายสิ่งบรรทุ�
+block.payload-void.name = หลุมดูดสิ่งบรรทุ�
+block.payload-source.name = จุด�ำเนิดสิ่งบรรทุ�
+block.disassembler.name = เครื่องถอด�ย�ส่วนประ�อบ
 block.silicon-crucible.name = เบ้าหลอมซิลิคอน
-block.overdrive-dome.name = โดม Overdrive
+block.overdrive-dome.name = โดมเร่งประสิทธิภาพ
+block.interplanetary-accelerator.name = �านเร่งความเร็วระหว่างดาวเคราะห์
+block.constructor.name = เครื่อง�่อสร้าง
+block.constructor.description = สรรค์สร้างสิ่ง�่อสร้างขนาดจนถึง 2x2 ช่อง
+block.large-constructor.name = เครื่อง�่อสร้างขนาดให�่
+block.large-constructor.description = สรรค์สร้างสิ่ง�่อสร้างขนาดจนถึง 4x4 ช่อง
+block.deconstructor.name = เครื่องลบทำลาย
+block.deconstructor.description = ลบทำลายสิ่ง�่อสร้าง�ละยูนิต คืนทรัพยา�รทั้งหมดที่ใช้ใน�าร�่อสร้าง
+block.payload-loader.name = เครื่องโหลดสิ่งบรรทุ�
+block.payload-loader.description = โหลดของเหลว�ละไอเท็มเข้าไปในบล็อ�
+block.payload-unloader.name = เครื่องถ่ายสิ่งบรรทุ�
+block.payload-unloader.description = ถ่ายของเหลว�ละไอเท็มออ�จา�บล็อ�
+block.heat-source.name = จุด�ำเนิดความร้อน
+block.heat-source.description = ส่งออ�ความร้อนอย่างไม่จำ�ัด มีเฉพาะโหมดอิสระ
+block.empty.name = ว่างเปล่า
+block.rhyolite-crater.name = หลุมไรโอไลต์
+block.rough-rhyolite.name = ไรโอไลต์หยาบ
+block.regolith.name = เรโ�ลิทธ์
+block.yellow-stone.name = หินเหลือง
+block.carbon-stone.name = หินคาร์บอน
+block.ferric-stone.name = หินเฟอร์ริ�
+block.ferric-craters.name = หลุมเฟอร์ริ�
+block.beryllic-stone.name = หินเบริลลิค
+block.crystalline-stone.name = หินต�ผลึ�
+block.crystal-floor.name = พื้นคริสตัล
+block.yellow-stone-plates.name = �ผ่นหินเหลือง
+block.red-stone.name = หิน�ดง
+block.dense-red-stone.name = หิน�ดงหนา�น่น
+block.red-ice.name = น้ำ�ข็ง�ดง
+block.arkycite-floor.name = พื้นอาร์คย์ไซต์
+block.arkyic-stone.name = หินอาร์ยคิค
+block.rhyolite-vent.name = ปล่องไรโอไลต์
+block.carbon-vent.name = ปล่องคาร์บอน
+block.arkyic-vent.name = ปล่องอาร์ยคิค
+block.yellow-stone-vent.name = ปล่องหินเหลือง
+block.red-stone-vent.name = ปล่องหิน�ดง
+block.crystalline-vent.name = ปล่องหินต�ผลื�
+block.redmat.name = �มต�ดง
+block.bluemat.name = �มตน้ำเงิน
+block.core-zone.name = โซน��น�ลาง
+block.regolith-wall.name = �ำ�พงเรโ�ลิทธ์
+block.yellow-stone-wall.name = �ำ�พงหินเหลือง
+block.rhyolite-wall.name = �ำ�พงไรโอไลต์
+block.carbon-wall.name = �ำ�พงคาร์บอน
+block.ferric-stone-wall.name = �ำ�พงหินเฟอร์ริ�
+block.beryllic-stone-wall.name = �ำ�พงหินเบริลลิค
+block.arkyic-wall.name = �ำ�พงหินอาร์ยคิค
+block.crystalline-stone-wall.name = �ำ�พงหินต�ผลึ�
+block.red-ice-wall.name = �ำ�พงน้ำ�ข็ง�ดง
+block.red-stone-wall.name = �ำ�พงหิน�ดง
+block.red-diamond-wall.name = �ำ�พงเพชร�ดง
+block.redweed.name = สาหร่าย�ดง
+block.pur-bush.name = พุ่มเพอร์
+block.yellowcoral.name = ปะ�ารังเหลือง
+block.carbon-boulder.name = �้อนหินคาร์บอน
+block.ferric-boulder.name = �้อนหินเฟอร์ริ�
+block.beryllic-boulder.name = �้อนหินเบริลลิค
+block.yellow-stone-boulder.name = �้อนหินเหลือง
+block.arkyic-boulder.name = �้อนหินอาร์ยคิค
+block.crystal-cluster.name = �ระจุ�คริสตัล
+block.vibrant-crystal-cluster.name = �ระจุ�คริสตัลสดใส
+block.crystal-blocks.name = �้อนบล็อ�คริสตัล
+block.crystal-orbs.name = �้อนลู���้วคริสตัล
+block.crystalline-boulder.name = �้อนหินต�ผลึ�
+block.red-ice-boulder.name = �้อนหินน้ำ�ข็ง�ดง
+block.rhyolite-boulder.name = �้อนหินไรโอไลต์
+block.red-stone-boulder.name = �้อนหิน�ดง
+block.graphitic-wall.name = �ำ�พงผลึ��ราไฟต์
+block.silicon-arc-furnace.name = เตาหลอมไฟฟ้าซิลิ�อน
+block.electrolyzer.name = เครื่อง�ย�สลายไฟฟ้า
+block.atmospheric-concentrator.name = เครื่องหลอมรวมบรรยา�าศ
+block.oxidation-chamber.name = ห้องผสมผสานออ�ซิเดชัน
+block.electric-heater.name = เครื่องอุ่นไฟฟ้า
+block.slag-heater.name = เครื่องอุ่น�ร่หลอม
+block.phase-heater.name = เครื่องอุ่นใยเฟส
+block.heat-redirector.name = เครื่องเปลี่ยนเส้นทางความร้อน
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = เร้าเตอร์ความร้อน
+block.slag-incinerator.name = เตาเผาสลาย�ร่หลอม
+block.carbide-crucible.name = เบ้าหลอมคาร์ไบด์
+block.slag-centrifuge.name = เครื่อง�ปรรูป�ร่หลอม
+block.surge-crucible.name = เบ้าหลอมเสิร์จ
+block.cyanogen-synthesizer.name = เครื่องสังเคราะห์ไซยาโนเจน
+block.phase-synthesizer.name = เครื่องสังเคราะห์ใยเฟส
+block.heat-reactor.name = เตาป�ิ�รณ์ความร้อน
+block.beryllium-wall.name = �ำ�พงเบริลเลี่ยม
+block.beryllium-wall-large.name = �ำ�พงเบริลเลี่ยมขนาดให�่
+block.tungsten-wall.name = �ำ�พงทังสเตน
+block.tungsten-wall-large.name = �ำ�พงทังสเตนขนาดให�่
+block.blast-door.name = ประตูนิรภัย
+block.carbide-wall.name = �ำ�พงคาร์ไบด์
+block.carbide-wall-large.name = �ำ�พงคาร์ไบด์ขนาดให�่
+block.reinforced-surge-wall.name = �ำ�พงเสิร์จเสริม�ำลัง
+block.reinforced-surge-wall-large.name = �ำ�พงเสิร์จเสริม�ำลังขนาดให�่
+block.shielded-wall.name = �ำ�พงเสริมโล่
+block.radar.name = เรดาร์
+block.build-tower.name = หอ�่อสร้าง
+block.regen-projector.name = เครื่องฉายฟึ้นฟู
+block.shockwave-tower.name = หอปล่อยคลื่น�ระ�ท�
+block.shield-projector.name = เครื่องฉายโล่
+block.large-shield-projector.name = เครื่องฉายโล่ขนาดให�่
+block.armored-duct.name = ท่อสู��า�าศเสริมเ�ราะ
+block.overflow-duct.name = ท่อระบายสู��า�าศ
+block.underflow-duct.name = ท่อระบายข้างสู��า�าศ
+block.duct-unloader.name = ตัวถ่ายสู��า�าศ
+block.surge-conveyor.name = สายพานเสิร์จ
+block.surge-router.name = เร้าเตอร์เสิร์จ
+block.unit-cargo-loader.name = เครื่องโหลดยูนิตบรรทุ�
+block.unit-cargo-unload-point.name = จุดถ่ายยูนิตบรรทุ�
+block.reinforced-pump.name = ปั้มเสริม�ำลัง
+block.reinforced-conduit.name = ท่อน้ำเสริม�ำลัง
+block.reinforced-liquid-junction.name = ทาง�ย�ของเหลวเสริม�ำลัง
+block.reinforced-bridge-conduit.name = สะพานของเหลวเสริม�ำลัง
+block.reinforced-liquid-router.name = เร้าเตอร์ของเหลวเสริม�ำลัง
+block.reinforced-liquid-container.name = ตู้บรรจุของเหลวเสริม�ำลัง
+block.reinforced-liquid-tank.name = ถังบรรจุของเหลวเสริม�ำลัง
+block.beam-node.name = โหนดลำ�สง
+block.beam-tower.name = เสาลำ�สง
+block.beam-link.name = ลิ้งค์ลำ�สง
+block.turbine-condenser.name = เครื่องควบ�น่น�ังหัน
+block.chemical-combustion-chamber.name = ห้องเผาไหม้ทางเคมี
+block.pyrolysis-generator.name = เครื่อง�ำเนิดไฟฟ้าไพโรไลซิส
+block.vent-condenser.name = เครื่องควบ�น่นปล่อง
+block.cliff-crusher.name = เครื่องบดหน้าผา
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = เครื่องขุดเจาะพลาสม่า
+block.large-plasma-bore.name = เครื่องขุดเจาะพลาสม่าขนาดให�่
+block.impact-drill.name = เครื่องขุด�รง�ระ�ท�
+block.eruption-drill.name = เครื่องขุด�รงปะทุ
+block.core-bastion.name = ��น�ลาง: บาสเชี่ยน
+block.core-citadel.name = ��น�ลาง: ซิทาเดล
+block.core-acropolis.name = ��น�ลาง: อะโครโพลิส
+block.reinforced-container.name = ตู้เ�็บของเสริม�ำลัง
+block.reinforced-vault.name = ตู้นิรภัยเสริม�ำลัง
+block.breach.name = บรีช
+block.sublimate.name = ซับลิเมท
+block.titan.name = ไททั่น
+block.disperse.name = ดิสเพิร์ส
+block.afflict.name = อัฟฟลิ�ต์
+block.lustre.name = ลัสเตอร์
+block.scathe.name = สเ�ซส์
+block.tank-refabricator.name = เครื่อง�ปลงสภาพรถถัง
+block.mech-refabricator.name = เครื่อง�ปลงสภาพจั�ร�ล
+block.ship-refabricator.name = เครื่อง�ปลงสภาพยานบิน
+block.tank-assembler.name = เครื่องประ�อบรถถัง
+block.ship-assembler.name = เครื่องประ�อบยานบิน
+block.mech-assembler.name = เครื่องประ�อบจั�ร�ล
+block.reinforced-payload-conveyor.name = สายพานบรรทุ�เสริม�ำลัง
+block.reinforced-payload-router.name = เร้าเตอร์บรรทุ�เสริม�ำลัง
+block.payload-mass-driver.name = เครื่องโอนถ่ายสิ่งบรรทุ�
+block.small-deconstructor.name = เครื่องลบทำลายขนาดเล็�
+block.canvas.name = หน้าจอวาดรูป
+block.world-processor.name = ตัวประมวลผลโล�
+block.world-cell.name = เซลล์โล�
+block.tank-fabricator.name = เครื่องสรรค์สร้างรถถัง
+block.mech-fabricator.name = เครื่องสรรค์สร้างจั�ร�ล
+block.ship-fabricator.name = เครื่องสรรค์สร้างยานบิน
+block.prime-refabricator.name = เครื่อง�ปลงสภาพเยี่ยมยอด
+block.unit-repair-tower.name = หอซ่อม�ซมยูนิต
+block.diffuse.name = ดิฟฟิวส์
+block.basic-assembler-module.name = หน่วยประ�อบ�ารขั้นพื้น�าน
+block.smite.name = สไมต์
+block.malign.name = มาไลน์
+block.flux-reactor.name = เตาป�ิ�รณ์ฟลั�ซ์
+block.neoplasia-reactor.name = เตาป�ิ�รณ์นีโอพลาเซีย
 
-block.switch.name = สวิชต์
-block.micro-processor.name = ตัวประมวลผล Micro
-block.logic-processor.name = ตัวประมวลผล Logic
-block.hyper-processor.name = ตัวประมวลผล Hyper
-block.logic-display.name = ตัว�สดง Logic
-block.large-logic-display.name = ตัว�สดง Logic ขนาดให�่
+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 = Memory Bank
+block.memory-bank.name = ธนาคารความจำ
 
-team.blue.name = น้ำเงิน
-team.crux.name = �ดง
-team.sharded.name = ส้ม
-team.orange.name = ส้ม
-team.derelict.name = ไม่มี
+team.malis.name = มาลิส
+team.crux.name = ครั�ซ์
+team.sharded.name = ชาร์ด
+team.derelict.name = ทิ้งร้าง
 team.green.name = เขียว
-team.purple.name = ม่วง
+team.blue.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} ชิ้น
-tutorial.drill = ขุดด้วยตัวเองนั้นไม่ค่อยมีประสิทธิภาพ.\n[accent]เครื่องขุด []สามารถขุดได้�บบอัตโนมัติ.\n�ดที่หมวดเครื่องขุดที่มุมล่างขวา.\nเลือ�[accent] เครื่องขุดเชิง�ล[]. วางมันบนสาย�ร่ทอง�ดงด้วย�ารคลิ๊�.\n[accent]คลิ๊�ขวา[] เพื่อหยุด�ารสร้าง.
-tutorial.drill.mobile = ขุดด้วยตัวเองนั้นไม่ค่อยมีประสิทธิภาพ.\n[accent]เครื่องขุด []สามารถขุดได้�บบอัตโนมัติ.\n�ดที่หมวดเครื่องขุดที่มุมล่างขวา.\nเลือ�[accent] เครื่องขุดเชิง�ล[].\nวางมันบนสาย�ร่ทอง�ดงด้วย�าร�ด�ล้ว�ดที่[accent] เครื่องหมายถู�[] ด้านล่างเพื่อยืนยัน�ารสร้าง.\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วางสายพาน 2 อันด้วยเครื่องมือลา�เส้น �ล้วส่งไอเท็มไปยัง��น�ลาง.\n[accent] ลา�เส้นโดย�ดที่หน้าจอค้างสั� 1-2 วินาที[] �ล้วลา�ไปทางที่ต้อง�ารสร้าง\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]�ด space เพื่อหยุดเ�มชั่วคราว.
-tutorial.pause.mobile = ระหว่าง�ารต่อสู้, คุณสามารถ[accent] หยุดเ�มชั่วคราวได้.[]\nคุณอาจจะทำคิว�ารสร้างระหว่างหยุดเ�มชั่วคราว.\n\n[accent]�ดปุ่มที่มุมบนซ้ายเพื่อหยุดเ�มชั่วคราว.
-tutorial.unpause = �ด Space อี�ครั้งเพื่อเล่นต่อ.
-tutorial.unpause.mobile = �ดปุ่มนั้นอี�ครั้งเพื่อเล่นต่อ.
-tutorial.breaking = บล็อคจำเป็นต้องทำลายบ่อยครั้ง.\n[accent]�ดคลิ๊�ขวาค้าง[] เพื่อทำลายบล็อคที่เลือ�.[]\n\n[accent]ทำลายบล็อคเศษเหล็�ทั้งหมดที่ยู่ทางด้านซ้ายของ��น�ลางของคุณโดยใช้�ารเลือ��บบคลุมพื้นที่.
-tutorial.breaking.mobile = บล็อคจำเป็นต้องทำลายบ่อยครั้ง.\n[accent]เลือ�โหมดทำลาย[], �ล้ว�ดบล็อคที่ต้อง�ารทำลายเพื่อเริ่มทำลายมัน.\nทำลายเป็นพื้นที่ด้วย�าร�ดค้าง 1-2 วินาที[] �ล้วลา�คลุมพื้นที่ที่ต้อง�าร.\n�ดเครื่องหมายถู�เพื่อยืนยัน�ารทำลาย.\n\n[accent]ทำลายบล็อคเศษเหล็�ทั้งหมดที่ยู่ทางด้านซ้ายของ��น�ลางของคุณโดยใช้�ารเลือ��บบคลุมพื้นที่.
-tutorial.withdraw = ในบางเหตุ�ารณ์, �ารนำไอเท็มออ�จา�บล็อคนั้นจำเป็น.\nวิธีทำคือ, [accent]�ดที่บล็อค[] ที่มีไอเท็มอยู่, �ล้ว [accent]�ดไอเท็ม[] ในช่องเ�็บของ.\nไอเท็มหลายๆอันสามารถนำออ�มาได้โดย [accent]�ดค้างที่ช่องเ�็บของ[].\n\n[accent]นำทอง�ดงจำนวนหนึ่งออ�จา���น�ลาง.[]
-tutorial.deposit = นำไอเท็มเข้าบล็อคโดยลา�ไอเท็มจา�ยานของคุณไปที่บล็อคที่ต้อง�าร.\n\n[accent]เอาทอง�ดง�ลับเข้า��น�ลาง.[]
-tutorial.waves = [lightgray]ศัตรู[] �ำลังมา.\n\nป�ป้อง��น�ลางของคุณ 2 คลื่น(รอบ).[accent] คลิ๊�[] เพื่อยิง.\nสร้างป้อมปืน�ละเครื่องขุดเพิ่มเพื่อขุดทอง�ดงเพิ่ม�ละป�ป้อง��น�ลาง.
-tutorial.waves.mobile = [lightgray]ศัตรู[] �ำลังมา.\n\nป�ป้อง��น�ลางของคุณ 2 คลื่น(รอบ). ยานของคุณจะยิงศตรูโดยอัตโนมัติ.\nสร้างป้อมปืน�ละเครื่องขุดเพิ่มเพื่อขุดทอง�ดงเพิ่ม�ละป�ป้อง��น�ลาง.
-tutorial.launch = เมื่อถึงคลื่น(รอบ)เฉพาะ�ล้ว, คุณจะสามารถ[accent] ส่ง��น�ลาง[], ทิ้งระบบป้อง�ันทั้งหมด�ละ[accent] ได้รับทรัพยา�รทั้งหมดใน��น�ลาง.[]\nทรัพยา�รพว�นี้สามารถนำไปใช้ใน�ารวิจัยเทคโนโลยีใหม่ได้.\n\n[accent]�ดปุ่มส่งสิ.
+hint.skip = ข้าม
+hint.desktopMove = �ด [accent][[WASD][] เพื่อขยับ
+hint.zoom = [accent]เลื่อน[]เพื่อซูมเข้าหรือซูมออ�
+hint.desktopShoot = �ด [accent][[คลิ๊�ซ้าย][] เพื่อยิง
+hint.depositItems = ถ้าจะขนย้ายไอเท็ม ให้ลา�ไอเท็มจา�ยานไปยัง��น�ลาง
+hint.respawn = ถ้าอยา�เ�ิดใหม่ ให้�ดปุ่ม [accent][[V][]
+hint.respawn.mobile = คุณ�ำลังควบคุมยูนิตหรือบล็อ�อยู่ ถ้าจะเ�ิดใหม่เป็นยาน [accent]�ดที่รูปอวาตาร์ซ้ายบน[]
+hint.desktopPause = �ด [accent][[Space][] เพื่อหยุดชั่วคราวหรือเล่นต่อ
+hint.breaking = [accent]คลิ๊�ขวา[] �ล้วลา�เพื่อทำลายบล็อ�
+hint.breaking.mobile = เปิดใช้ \ue817 [accent]ค้อน[] ตรงล่างขวา�ล้วเลือ�เพื่อทำลายบล็อ�\n\nเอานิ้วจิ้มลงไปสั��ป๊บนึง�ล้วลา�เพื่อเลือ�หลายๆ อัน
+hint.blockInfo = ดูข้อมูลของบล็อ�โดย�ารเลือ�จา�[accent]เมนู�ารสร้าง[] �ล้ว�ดที่รูป [accent][[?][] ตรงด้านขวา
+hint.derelict = สิ่ง�่อสร้างที่ถู�[accent]ทิ้งร้าง[]คือเศษซา�พังทลายของ�านเ�่า��่ที่ไม่สามารถใช้งานได้�ล้ว\n\nสิ่ง�่อสร้างพว�นี้สามารถ[accent]ทุบทิ้ง[]เพื่อเ�็บเ�ี่ยวทรัพยา�รที่อยู่ในนั้นได้
+hint.research = �ดปุ่ม \ue875 [accent]วิจัย[] เพื่อวิจัยเทคโนโลยีใหม่ๆ
+hint.research.mobile = �ดปุ่ม \ue875 [accent]วิจัย[] ใน \ue88c [accent]เมนู[] เพื่อวิจัยเทคโนโลยีใหม่ๆ
+hint.unitControl = �ด [accent][[L-Ctrl][] ค้างไว้�ล้ว�ด[accent]คลิ๊�[]เพื่อควบคุมยานพันธมิตรหรือป้อมปืน
+hint.unitControl.mobile = [accent][[�ดสองครั้ง][] เพื่อควบคุมยานพันธมิตรหรือป้อมปืน
+hint.unitSelectControl = เพื่อที่จะควบคุมยูนิต ให้เปิด[accent]โหมดสั่ง�าร[]โดย�าร�ด [accent]L-shift[]\nระหว่างที่อยู่ในโหมดสั่ง�าร ให้คลิ๊��ล้วลา�เพื่อเลือ�ยูนิต �ล้ว[accent]คลิ๊�ขวา[]ที่ตำ�หน่งหรือเป้าหมายเพื่อสั่ง�ารให้ยูนิตไปที่นั่น
+hint.unitSelectControl.mobile = เพื่อที่จะควบคุมยูนิต ให้เปิด[accent]โหมดสั่ง�าร[]โดย�าร�ดปุ่ม[accent]สั่ง�าร[]ที่ซ้ายล่างของจอ\nระหว่างที่อยู่ในโหมดสั่ง�าร ให้�ดค้าง�ล้วลา�เพื่อเลือ�ยูนิต �ล้ว�ดที่ตำ�หน่งหรือเป้าหมายเพื่อสั่ง�ารให้ยูนิตไปที่นั่น
+hint.launch = เมื่อเ�็บทรัพยา�รเยอะพอ คุณสามารถ[accent]ส่ง��น�ลาง[]ไปยังเซ็�เตอร์ถัดไปโดย�ารเลือ�เซ็�เตอร์จา� \ue827 [accent]�ผนที่[] ตรงขวาล่าง
+hint.launch.mobile = เมื่อเ�็บทรัพยา�รเยอะพอ คุณสามารถ[accent]ส่ง��น�ลาง[]ไปยังเซ็�เตอร์ถัดไปโดย�ารเลือ�เซ็�เตอร์จา� \ue827 [accent]�ผนที่[] ใน \ue88c [accent]เมนู[]
+hint.schematicSelect = �ด [accent][[F][] �ล้วลา�เพื่อเลือ�บล็อ�ที่จะคัดลอ��ละวาง\n\n[accent][[คลิ๊��ลาง][] เพื่อคัดลอ�บล็อ�ชนิดเดียว
+hint.rebuildSelect = �ด [accent][[B][] �ล้วลา�เพื่อเลือ��ผนบล็อ�ที่ถู�ทำลาย\n�ผนบล็อ�ที่เลือ�จะถู�สร้างใหม้โดยอัตโนมัติ
+hint.rebuildSelect.mobile = �ดปุ่ม \ue874 คัดลอ� �ล้ว�ดปุ่ม \ue80f สร้างใหม่�ล้วลา�เพื่อเลือ��ผนบล็อ�ที่ถู�ทำลาย\n�ผนบล็อ�ที่เลือ�จะถู�สร้างใหม้โดยอัตโนมัติ
+hint.conveyorPathfind = �ด [accent][[L-Ctrl][] ในขณะที่�ำลังลา�สายพานเพื่อสร้างเส้นทาง�บบอัตโนมัติ
+hint.conveyorPathfind.mobile = เปิดใช้งาน \ue844 [accent]โหมด�นวท�ยง[] �ล้วลา�สายพานเพื่อสร้างเส้นทาง�บบอัตโนมัติ
+hint.boost = �ด [accent][[L-Shift][] เพื่อบูสต์ข้ามสิ่ง�ีดขวางด้วยยูนิตของคุณ\n\nยูนิตพื้นดินบางประเภทเท่านั้นที่บินได้
+hint.payloadPickup = �ด [accent][[[] เพื่อหยิบบล็อ�เล็�ๆ หรือยูนิต
+hint.payloadPickup.mobile = [accent]�ดค้างไว้[]ที่บล็อ�เล็�ๆ หรือตัวยูนิตเพื่อหยิบขึ้นมา
+hint.payloadDrop = �ด [accent]][] เพื่อวางสิ่งที่บรรทุ�อยู่
+hint.payloadDrop.mobile = [accent]�ดค้างไว้[]ที่พื้นที่โล่งๆ เพื่อวางสิ่งที่บรรทุ�อยู่
+hint.waveFire = ป้อมปืน[accent]คลื่นน้ำ[]หา�เติมน้ำเข้าไปจะช่วยดับไฟรอบข้างให้อัตโนมัติ
+hint.generator = \uf879 [accent]เครื่อง�ำเนิดไฟฟ้าเผาไหม้[]จะเผาถ่าน�ละส่งพลังงานไปยังบล็อ�ที่อยู่ใ�ล้ๆ\n\nระยะของพลังงานสามารถขยายได้ด้วย \uf87f [accent]ตัวจ่ายพลังงาน[]
+hint.guardian = หน่วย[accent]ผู้พิทั�ษ์[]มีเ�ราะป้อง�ันหนา�น่น �ระสุนเปราะบางอย่าง[accent]ทอง�ดง[]�ละ[accent]ตะ�ั่ว[][scarlet]ไม่มีประสิทธิภาพ[]\n\nควรใช้ป้อมปืนที่ดี�ว่านี้หรือใช้ \uf835 [accent]�ราไฟท์[]ใส่ใน \uf861 ดูโอ/ \uf859 ซัลโวเป็น�ระสุนเพื่อทำลายผู้พิทั�ษ์
+hint.coreUpgrade = สามารถอัปเ�รด��น�ลางได้โดย[accent]วาง��น�ลางที่ให�่�ว่าทับมัน[]\n\nวาง \uf868 [accent]��น�ลาง: ฟาวน์เดชั่น[]ทับ \uf869 [accent]��น�ลาง: ชาร์ด[] ต้อง�น่ใจว่ารอบข้างมีที่ว่าง�่อนจะวาง
+hint.presetLaunch = [accent]เซ็�เตอร์ลงจอด[]สีเทา อย่างเช่น[accent]ป่าหนาวเหน็บ[] สามารถลงจอดจา�ที่ไหนที่ได้ใน�ผนที่ พว�นั้นไม่จำเป็นต้องยืดครองเซ็�เตอร์รอบข้างเพื่อส่ง��น�ลางไป\n\n[accent]เซ็�เตอร์ที่มีเลข[] อย่างเช่นอันนี้[accent]ไม่จำเป็น[]ต้องยืดครอง
+hint.presetDifficulty = เซ็�เตอร์นี้มี[scarlet]ระดับภัยคุ�คามศัตรูสูง[]\n[accent]ไม่�นะนำ[]ให้ลงจอดไปยังเซ็�เซอร์พว�นั้นหา�ไม่มี�ารเตรียมพร้อม�ละเทคโนโลยี
+hint.coreIncinerate = เมื่อ��น�ลางมีจำนวนไอเท็มชนิดหนึ่งที่�ั�เ�็บไว้เต็ม ไอเท็มชนิดนั้นที่เข้ามาเพิ่มจะ[accent]ถู�เผา[]
+hint.factoryControl = เพื่อที่จะตั้ง[accent]ตำ�หน่ง�ารส่งออ�[]ของโรงงานยูนิต ให้�ดที่โรงงานยูนิตในระหว่างที่อยู่ในโหมดสั่ง�าร �ล้ว�ดคลิ๊�ขวาที่ตำ�หน่งที่ต้อง�ารตั้ง\nยูนิตที่ถู�ผลิตจะขยับออ�มาที่จุดที่ตั้งโดยอัตโนมัติ
+hint.factoryControl.mobile = เพื่อที่จะตั้ง[accent]ตำ�หน่ง�ารส่งออ�[]ของโรงงานยูนิต ให้�ดที่โรงงานยูนิตในระหว่างที่อยู่ในโหมดสั่ง�าร �ล้ว�ดที่ตำ�หน่งที่ต้อง�ารตั้ง\nยูนิตที่ถู�ผลิตจะขยับออ�มาที่จุดที่ตั้งโดยอัตโนมัติ
 
-item.copper.description = วัสดุ�่อสร้างพื้น�าน. ใช้อย่าง�พร่หลายในบล็อคเ�ือบทุ�ชนิด.
-item.lead.description = ทรัพยา�รพื้น�านสำหรับผู้เริ่มต้นใหม่. ใช้อย่าง�พร่หลายในอิเล็�ทรอนิ�ส์�ละบล็อคขนย้ายของเหลว.
-item.metaglass.description = ส่วนผสมของ�ระจ�ที่�ข็ง�รงมา�. ใช้อย่าง�พร่หลาย�ับตัวจ่ายของเหลว�ละที่เ�็บของ.
-item.graphite.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.surge-alloy.description = อัลลอยขั้นสูงที่มีคุณสมบัติทางไฟฟ้าที่จำเพาะ
-item.spore-pod.description = �ระเปาะของสปอร์สังเคราะห์, สังเคราะห์โดย�ารรวบรวมจา�อา�าศ ใช้ในอุตสาห�รรม. ใช้ใน�าร�ลั่นเป็นน้ำมัน, สารระเบิด�ละเชื้อเพลิง.
-item.blast-compound.description = สารประ�อบที่ไม่เสถียร ใช้ใน�ารระเบิด. สังเคราะห์จา�สปอร์�ละสารระเหยอื่นๆ. ไม่�นะนำให้ใช้เป็นเชื้อเพลิง.
-item.pyratite.description = สารซึ่งติดไฟง่าย ใช้ในอาวุธเพลิง.
-liquid.water.description = ของเหลวที่มีประโยชน์ที่สุด โดยทั่วไปใช้เป็นตัวหล่อเย็น�ละจัด�ารของเสีย.
-liquid.slag.description = โลหะชนิดต่างๆซึ่งหลอมรวม�ัน. สามารถนำไป�ย�โลหะที่จำเป็นหรือเป็นอาวุธพ่นใส่ศัตรู.
-liquid.oil.description = ของเหลวใช้ใน�ารผลิตวัสดุขั้นสูง. สามารถ�ปลงเเป็นถ่านหินเพือใช้เป็นเชื้อเพลิง หรือเป็นอาวุธเพื่อพ่นใส่ศัตรู�ล้วจึงจุดไฟ.
-liquid.cryofluid.description = ของเหลวเฉื่อย�ละไม่�ัด�ร่อน ผลิตจา�น้ำ�ละไทเทเนี่ยม. มีสมบัติ�ารถ่ายเทความร้อนสูง. ใช้อย่าง�พร่หลายใน�ารหล่อเย็น.
+gz.mine = ขยับเข้าไปใ�ล้ๆ �ับ \uf8c4 [accent]�ร่ทอง�ดง[]ที่อยู่บนพื้น�ล้วคลิ๊�เพื่อเริ่ม�ารขุด
+gz.mine.mobile = ขยับเข้าไปใ�ล้ๆ �ับ \uf8c4 [accent]�ร่ทอง�ดง[]ที่อยู่บนพื้น�ล้ว�ดที่�ร่เพื่อเริ่ม�ารขุด
+gz.research = เปิด \ue875 ต้นไม้�ห่งเทคโนโลยี\nวิจัย \uf870 [accent]เครื่องขุดเชิง�ล[] �ล้ว�ดเลือ�จา�เมนูตรง�ถบขวาล่าง\nคลิ๊�ที่�ลุ่ม�ร่ทอง�ดงเพื่อวางที่ขุด
+gz.research.mobile = เปิด \ue875 ต้นไม้�ห่งเทคโนโลยี\nวิจัย \uf870 [accent]เครื่องขุดเชิง�ล[] �ล้ว�ดเลือ�จา�เมนูตรง�ถบขวาล่าง\n�ดที่�ลุ่ม�ร่ทอง�ดงเพื่อวางที่ขุด\n\n�ดปุ่ม \ue800 [accent]ติ๊�ถู�[]ที่�ถบล่างขวาเพื่อยืนยัน
+gz.conveyors = วิจัย�ละวาง \uf896 [accent]สายพาน[] เพื่อเคลื่อนย้ายทรัพยา�รที่ขุดมาได้\nจา�ที่ขุดไปยัง��น�ลาง\n\n�ดคลิ๊��ล้วลา�เพื่อวางสายพานหลายๆ อันให้เป็นทาง\n[accent]หมุนเม้าส์[]เพื่อหมุน
+gz.conveyors.mobile = วิจัย�ละวาง \uf896 [accent]สายพาน[] เพื่อเคลื่อนย้ายทรัพยา�รที่ขุดมาได้\nจา�ที่ขุดไปยัง��น�ลาง\n\nใช้นิ้ว�ดค้างที่ตำ�หน่งซั�วิ�ล้วลา�เพื่อวางสายพานหลายๆ อันให้เป็นทาง
+gz.drills = ขยายปฎิบัติ�ารขุด\nวางเครื่องขุดเชิง�ลเพิ่ม\nขุดทอง�ดง 100 ชิ้น
+gz.lead = \uf837 [accent]ตะ�ั่ว[]เป็นทรัพยา�รอี�ชนิดที่ใช้�ันอย่าง�พร่หลาย\nตั้งเครื่องขุดเพื่อขุด�ร่ตะ�ั่ว
+gz.moveup = \ue804 ขยับขึ้นเพื่อไปยังเป้าหมายถัดไป
+gz.turrets = วิจัย�ละวางป้อมปืน \uf861 [accent]ดูโอ้[]สองป้อมเพื่อป�ป้อง��น�ลางจา�ศัตรู\nป้อมปืนดูโอ้ต้อง�าร \uf838 [accent]�ระสุน[]จา�สายพาน
+gz.duoammo = เติม�ระสุนให้��่ป้อมปืนดูโอ้ด้วย[accent]ทอง�ดง[] โดยใช้สายพาน
+gz.walls = [accent]�ำ�พง[]สามารถป้อง�ันความเสียหายที่จะมาถึงให้ไม่ไปโดนสิ่ง�่อสร้างได้\nวาง \uf8ae [accent]�ำ�พงทอง�ดง[]รอบๆ ป้อมปืน
+gz.defend = ศัตรู�ำลังจะเข้ามา เตรียมตัวป้อง�ันให้ดี
+gz.aa = ป้อมปืนมาตร�านไม่สามารถจัด�ารยูนิตบินได้เร็วพอ\nป้อมปืน \uf860 [accent]ส��็ตเตอร์[]นี้สามารถที่จะต่อต้านยูนิตบินได้อย่างดีเยี่ยม �ต่ต้องใช้ \uf837 [accent]ตะ�ั่ว[]เป็น�ระสุน
+gz.scatterammo = เติม�ระสุนให้��่ป้อมปืนส��็ตเตอร์ด้วย[accent]ตะ�ั่ว[] โดยใช้สายพาน
+gz.supplyturret = [accent]เติม�ระสุนป้อมปืน
+gz.zone1 = นี่คือจุดเ�ิดของศัตรู
+gz.zone2 = สิ่ง�่อสร้างทุ�อย่างในรัศมีจะถู�ทำลายเมื่อมีคลื่นใหม่เริ่มขึ้น
+gz.zone3 = คลื่น�ำลังจะเริ่มขึ้น�ล้ว\nเตรียมตัวให้พร้อม
+gz.finish = สร้างป้อมปืนเพิ่ม ขุดทรัพยา�รให้ได้มา��ว่านี้\n�ล้วป้อง�ันคลื่นทั้งหมดเพื่อ[accent]ยึดครองเซ็�เตอร์[]
 
-block.message.description = เ�็บข้อความ. ใช้สื่อสาร�ับพันธมิตร.
-block.graphite-press.description = อัด�้อนถ่านหินให้เป็น�ผ่น�ราไฟต์บริสุทธิ์.
-block.multi-press.description = เครื่องอัด�ราไฟต์ที่ได้รับ�ารอัปเ�รด. ใช้น้ำ�ละพลังงานใน�าร�ปรรูปถ่านหินให้เร็ว�ละมีประสิทธิภาพมา�ขึ้น.
-block.silicon-smelter.description = เผาทราย�ละถ่านหินบริสุทธิ์. ผลิตซิลิ�้อน
-block.kiln.description = เผาทราย�ละตะ�ั่วเป็นสารประ�อบชื่อ �ระจ�เมต้า. จำเป็นต้องใช้พลังงานเล็�น้อยใน�ารทำ.
-block.plastanium-compressor.description = ผลิตพลาสตาเนี่ยมจา�น้ำมัน�ละไทเทเนี่ยม.
-block.phase-weaver.description = สังเคราะห์ใยเฟสจา�ทอเรี่ยมที่มีรังสี�ละทราย. จำเป็นต้องใช้พลังงานจำนวนมา�จึงจะทำงานง.
-block.alloy-smelter.description = ผสมไทเทเนี่ยม, ตะ�ั่ว, ซิลิ�้อน�ละทอง�ดงเพื่อที่จะผลิตเซิร์จอัลลอย.
-block.cryofluid-mixer.description = ผสมน้ำ�ละผงไทเทเนี่ยมบริสุทธิ์เป็นไครโยฟลูอิด. สำคั�สำหรับเตาป�ิ�รณ์ทอเรี่ยม.
-block.blast-mixer.description = บอ�ละผสมสปอร์�ับไพไรต์เพื่อผลิตสารประ�อบระเบิด.
-block.pyratite-mixer.description = ผสมถ่านหิน, ตะ�ั่ว�ละทรายเข้าด้วย�ันเป็นไฟไรต์ที่ติดไฟได้ง่าย.
-block.melter.description = หลอมเศษเหล็�เป็��า��ร่เพื่อใช้สำหรับ�ระบวน�ารต่อไปหรือใช้ในป้อมปืนเวฟ.
-block.separator.description = �ย��า��ร่ออ�เป็นส่วนประ�อบ�ร่ธาตุของมัน. ส่งออ��ร่ผลลัพธ์ในรูป�บบที่เย็นลง�ล้ว.
-block.spore-press.description = อัด�ระเปาะสปอร์ด้วย�รง�ดมหาศาลเพื่อสังเคราะห์น้ำมัน.
-block.pulverizer.description = บดเศษเหล็�ให้เป็นทรายละเอียด.
-block.coal-centrifuge.description = ทำให้น้ำมัน�ข็งตัวเป็น�้อนถ่านหิน.
-block.incinerator.description = ทำลายไอเท็มหรือของเหลวทุ�อย่างที่ได้รับมา.
-block.power-void.description = ทิ้งพลังงานทั้งหมดที่ได้รับ. เฉพาะ โหมดอิสระ เท่านั้น.
-block.power-source.description = ส่งออ�พลังงานไม่จำ�ัด. เฉพาะ โหมดอิสระ เท่านั้น.
-block.item-source.description = ส่งออ�ไอเท็มไม่จำ�ัด. เฉพาะ โหมดอิสระ เท่านั้น.
-block.item-void.description = ทำลายทุ�ไอเท็ม . เฉพาะ โหมดอิสระ เท่านั้น.
-block.liquid-source.description = ส่งออ�ของเหลวไม่จำ�ัด. เฉพาะ โหมดอิสระ เท่านั้น.
-block.liquid-void.description = ทิ้งของเหลวทุ�ชนิด. เฉพาะ โหมดอิสระ เท่านั้น.
-block.copper-wall.description = บล็อคป้อง�ันราคาถู�.\nมีประโยชน์สำหรับป้อง�ัน core �ละป้อมปืนใน wave �ร�ๆ.
-block.copper-wall-large.description = บล็อคป้อง�ันราคาถู�.\nมีประโยชน์สำหรับป้อง�ัน core �ละป้อมปืนใน wave �ร�ๆ.\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 = �ำ�พงที่เคลือบด้วยวัสดุสะท้อนพิเศษจำพว� phase. เบี่ยงเบน�ระสุนส่วนให�่ที่รับมา.
-block.phase-wall-large.description = �ำ�พงที่เคลือบด้วยวัสดุสะท้อนพิเศษจำพว� phase. เบี่ยงเบน�ระสุนส่วนให�่ที่รับมา.\nคลอบคลุมหลายช่อง.
-block.surge-wall.description = บล็อคป้อง�ันที่มีทนทานสูง.\nสะสมพลังงานจา��ระสุน, �ล้วปล่อยออ�มา�บบสุ่ม.
-block.surge-wall-large.description = บล็อคป้อง�ันที่มีทนทานสูง.\nสะสมพลังงานจา��ระสุน, �ล้วปล่อยออ�มา�บบสุ่ม.\nคลอบคลุมหลายช่อง.
-block.door.description = ประตูขนาดเล็�. สามารถเปิดได้โดย�าร�ด.
-block.door-large.description = ประตูขนาดให�่. สามารถเปิด�ละปิดได้โดย�าร�ด.\nคลอบคลุมหลายช่อง.
-block.mender.description = ซ่อม�ซมบล็อคในวงของมันเป็นระยะๆ. ช่วยซ่อม�ซม�นวป้อง�ันระหว่าง wave.\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 = เคลื่อนย้ายไอเท็มเป็นชุด.\nรับไอดท็มจา�ด้านหลัง, �ละนำออ�ไปสามทางข้างหน้า.
-block.junction.description = มีหน้าที่เป็นสะพานสำหรับสายพาน 2 สายข้าม�ัน. มีประโยชน์สำหรับเวลาสายพาน 2 สายที่ขนไอเท็มมา 2 ชนิดไปยัง 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.overflow-gate.description = ของจะออ�จา�ข้างๆเมื่อทางข้างหน้ถู�บล็อคเท่านั้น.
-block.underflow-gate.description = ตรงข้าม�ับประตูระบายไอเท็ม. ส่งออ�ไอเท็มไปข้างหน้าหา�ทางซ้าย�ละขวาถู�บล็อค.
-block.mass-driver.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.liquid-router.description = รับของเหลวจา�ทางเดียว�ล้วส่งออ� 3 ทางเท่าๆ�ัน. สามารถเ�็บของ้หลวได้จำนวนหนึ่ง. มีประโยชน์สำหรับ�าร�ย�ของเหลวจา��หล่งเดียวไปหลายที่.
-block.liquid-tank.description = เ�็บของเหลวจำนวนมา�. ใช่สำหรับสร้างบัฟเฟอร์ในเวลาที่ความต้อง�ารของทรัพยา�รไม่คงที่หรือเป็นตัวเซฟสำหรับบล็อคที่จำเป็นต้องใช้�ารหล่อเย็น.
-block.liquid-junction.description = ทำหน้าที่เป็นสะพานสำหรับรางน้ำ 2 รางที่ข้าม�ันที่มีของเหลว 2 ชนิด ซึ่งต้อง�ารจะไปคนละที่.
-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-large.description = เ�็บพลังงานได้เยอะ�ว่า�บตเตอรี่ธรรมดา.
-block.combustion-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.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.oil-extractor.description = ใช้พลังงาน, ทราย�ละน้ำเพื่อขุดหาน้ำมัน.
-block.core-shard.description = core รุ่น�ร�. เมื่อถู�ทำลาย �ารติดต่อ�ับพื้นที่นั้นทั้งหมดจะหายไป. อย่าให้มันเ�ิดขึ้น.
-block.core-foundation.description = core รุ่นที่ 2 . เสริมเ�ราะมา�ขึ้น. เ�็บของได้เยอะขึ้น.
-block.core-nucleus.description = core รุ่นที่ 3 �ละเป็นรุ่นสุดท้าย. เสริมเ�ราะดีมา�. เ�็บของได้มหาศาล.
-block.vault.description = เ�็บของ�ต่ละชนิดได้เยอะ. สามารถใช้ตัวถ่ายของใน�ารดึงของออ�มาได้.
-block.container.description = เ�็บของ�ต่ละชนิดได้น้อย. สามารถใช้ตัวถ่ายของใน�ารดึงของออ�มาได้.
-block.unloader.description = ดึงของออ�มาจา�บล็อคที่ไม่ใช่บล็อคขนส่งใ�ล้เคียง. สามารถเปลี่ยนชนิดของของที่จะดึงได้โดย�าร�ด.
-block.launch-pad.description = ส่งของจำนวนหนึ่งได้เลยโดยไม่ต้องรอส่ง core.
-block.launch-pad-large.description = �านส่งของเวอร์ชั่นพัฒนา�ล้ว. เ�็บไอเท็มเยอะขึ้น. ส่งของบ่อยขึ้น.
-block.duo.description = ป้อมปืนราคาถู�ขนาดเล็�. มีประโยชน์สำหรับยูนิตภาคพื้นดิน.
-block.scatter.description = ป้อมปืนต่อต้านอา�าศยานหลั�. ยิง�้อนตะ�ั่วหรือเศษเหล็�ใส่ศัตรู.
-block.scorch.description = เผาศัตรูภาคพื้นดินที่อยู่ใ�ล้ๆ. มีประสิทธิภาพสูงสุดเมื่อใช้ในระยะใ�ล้.
-block.hail.description = ป้อมปืนให�่ขนาดเล็�.
-block.wave.description = ป้อมปืนขนาด�ลาง. พ่นของเหลวสานศัตรู. ดับไฟให้โดยอัตโนมัติถ้าใส่น้ำให้.
-block.lancer.description = ป้อมปืนเลเซอร์ต่อต้านภาคพื้นดินขนาด�ลาง. ชาร์จ�ละยิงลำ�สงพลังงานที่ทรงพลัง.
-block.arc.description = ป้อมปืนไฟฟ้าระยะใ�ล้. ยิงสายฟ้าใส่ศัตรู.
-block.swarmer.description = ป้อมยิงขีปนาวุธขนาด�ลาง. โจมตีศัตรูทั้งอา�าศ�ละภาคพื้นดิน. ยิงขีปนาวุธขนิดติดตาม.
-block.salvo.description = ป้อมปืนดูโอเวอร์ชั่นขั้นสูง�ว่า. ระดมยิง�ระสุนใส่ศัตรู.
-block.fuse.description = ป้อมปืนระยะใ�ล้ขนาดให�่. ยิงลำ�สงทะลุทะลวง 3 เส้นใส่ศัตรู.
-block.ripple.description = ป้อมปืนให�่ที่มีพลังงานสูง. ยิง�ระจุ�ของ�ระสุนใส่ศัตรูจาดระยะไ�ล.
-block.cyclone.description = ป้อมปืนต่อต้านอา�าศยาน�ละต่อต้านภาคพื้นดิน. ยิง�ระจุของ�ระสุนระเบิดใส่ยูนิตศัตรู.
-block.spectre.description = ปืนให�่ลำ�ล้องคูขนาดยั�ษ์. ยิง�ระสุนเจาะเ�ราะใส่ศัตรูทั้งบนอา�าศ�ละภาดพื้นดิน.
-block.meltdown.description = ปืนให�่เลเซอร์ขนาดยั�ษ์. ชาร์จ�ล้วยิงลำ�สงเลเซอร์ใส่ศัตรูที่อยู่ใ�ล้. จำเป็นต้องใช้สารหล่อเย็น.
-block.repair-point.description = ซ่อม�ซมยูนิตที่อยู่ในรัศมีอย่างต่อเนื่อง.
-block.segment.description = ทำดาเมจ�ละทำลายโปรเจ�ไตล์ที่�ำลังเข้ามา. โปรเจ�ไตล์เลเซอร์จะไม่ถู�ล็อคเป้าด้วยบล็อคนี้.
+onset.mine = �ดคลิ๊�ซ้ายเพื่อขุด \uf748 [accent]เบริลเลี่ยม[] จา��ำ�พง\n\n�ด [accent][[WASD][] เพื่อขยับ
+onset.mine.mobile = �ดที่หน้าจอเพื่อขุด \uf748 [accent]เบริลเลี่ยม[] จา��ำ�พง
+onset.research = เปิดหน้า \ue875 ต้นไม้�ห่งเทคโนโลยี\nวิจัย �ล้ววาง \uf73e [accent]เครื่องควบ�น่น�ังหัน[] บนปล่อง\nเครื่องนี้จะผลิต[accent]พลังงาน[]
+onset.bore = วิจัย�ละวาง \uf741 [accent]เครื่องขุดเจาะพลาสม่า[]\nเครื่องนี้จะขุดทรัพยา�รที่อยู่ใน�ำ�พงให้โดยอัตโนมัติ
+onset.power = เพื่อที่จะ[accent]จ่ายพลังงาน[]ให้�ับเครื่องขุดเจาะพลาสม่า วิจัย�ละวาง \uf73d [accent]โหนดลำ�สง[]\nลา�โหนดเพื่อเชื่อมต่อเครื่องควบ�น่น�ังหัน�ับเครื่องขุดเจาะพลาสม่า
+onset.ducts = วิจัย�ละวาง \uf799 [accent]ท่อสู��า�าศ[]เพื่อเคลื่อนย้ายทรัพยา�รที่ขุดมาได้จา�เครื่องขุดเจาะพลาสม่าไปยัง��น�ลาง\n�ดคลิ๊��ล้วลา�เพื่อวางท่อสู��า�าศหลายๆ ท่อให้เป็นทาง\n[accent]หมุนเม้าส์[]เพื่อหมุน
+onset.ducts.mobile = วิจัย�ละวาง \uf799 [accent]ท่อสู��า�าศ[]เพื่อเคลื่อนย้ายทรัพยา�รที่ขุดมาได้จา�เครื่องขุดเจาะพลาสม่าไปยัง��น�ลาง\n\nใช้นิ้ว�ดค้างที่ตำ�หน่งซั�วิ�ล้วลา�เพื่อวางท่อสู��า�าศหลายๆ ท่อให้เป็นทาง
+onset.moremine = ขยายปฎิบัติ�ารขุด\nวางเครื่องขุดเจาะพลาสม่าเพิ่ม�ล้วใช้โหนดลำ�สงเพื่อจ่ายพลังงานให้�ับมัน\nขุดเบริลเลี่ยม 200 ชิ้น
+onset.graphite = บล็อ�ที่สูงขั้น�ว่าจำเป็นต้องใช้ \uf835 [accent]�ราไฟต์[]\nจัดตั้งเครื่องขุดเจาะพลาสม่าเพื่อขุด�ราไฟต์
+onset.research2 = เริ่ม�ารวิจัย[accent]โรงงาน[]\nวิจัย \uf74d [accent]เครื่องบดหน้าผา[]�ละ \uf779 [accent]เตาหลอมไฟฟ้าซิลิ�อน[]
+onset.arcfurnace = เตาหลอมไฟฟ้าจะต้องใช้ \uf834 [accent]ทราย[]�ละ \uf835 [accent]�ราไฟต์[]เพื่อผลิต \uf82f [accent]ซิลิ�อน[]\n�ารผลิตจำเป็นจะต้องใช้[accent]พลังงาน[]ด้วย
+onset.crusher = ใช้ \uf74d [accent]เครื่องบดหน้าผา[]เพื่อผลิตทราย
+onset.fabricator = ใช้[accent]ยูนิต[]เพื่อสำรวจพื้นที่ ป้อง�ันสิ่ง�่อสร้าง �ละโจมตีศัตรู วิจัย�ละวาง \uf6a2 [accent]เครื่องสรรค์สร้างรถถัง[]
+onset.makeunit = ผลิตยูนิตขึ้นมา\nใช้ปุ่ม "?" เพื่อดูความต้อง�ารทรัพยา�รของ�ต่ละโรงงานที่เลือ�มา
+onset.turrets = ยูนิตนั้นมีประสิทธิภาพ �ต่[accent]ป้อมปืน[]นั้นสามารถที่จะใช้ตั้งรับได้ดี�ว่าหา�ใช้อย่างมีประสิทธิภาพ\nวางป้อมปืน \uf6eb [accent]บรีช[]\nป้อมปืนจำเป็นจะต้องใช้ \uf748 [accent]�ระสุน[]
+onset.turretammo = เติม�ระสุนให้��่ป้อมปืนด้วย[accent]�ระสุนเบริลเลี่ยม[]
+onset.walls = [accent]�ำ�พง[]สามารถป้อง�ันความเสียหายที่จะมาถึงให้ไม่ไปโดนสิ่ง�่อสร้างได้\nวาง�ำ�พง \uf6ee [accent]�ำ�พงเบริลเลี่ยม[]รอบๆ ป้อมปืน
+onset.enemies = ศัตรู�ำลังจะเข้ามา เตรียมตัวป้อง�ันให้ดี
+onset.defenses = [accent]ติดตั้ง�นวป้อง�ัน:[lightgray] {0}
+onset.attack = ศัตรูอ่อน�อลง�ล้ว ตอบโต้�ลับ
+onset.cores = ��น�ลางใหม่สามารถวางได้บน[accent]โซน��น�ลาง[]\n��น�ลางใหม่จะทำหน้าที่เป็น�านทัพด่านหน้า�ละจะ�บ่งปันทรัพยา�ร�ับ��น�ลางอื่นๆ\nวาง \uf725 ��น�ลาง
+onset.detect = ศัตรูจะสามารถตรวจจับ�ารมีอยู่ของคุณได้ในอี� 2 นาที\nจัดตั้ง�อง�ำลังป้อง�ัน ป�ิบัติ�ารขุด �ละ�ารผลิต
+
+#Don't translate these yet!
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+
+split.pickup = บล็อ�บางชนิดสามารถถู�หยิบขึ้นมาได้ด้วยยูนิต��น�ลาง\nบรรทุ�[accent]ที่เ�็บของ[]นี้มา�ล้วเอาไปวางใน[accent]เครื่องโหลดสิ่งบรรทุ�[]\n(ปุ่มค่าเริ่มต้นคือ [ สำหรับหยิบ�ละ ] สำหรับวางบล็อ�)
+split.pickup.mobile = บล็อ�บางชนิดสามารถถู�หยิบขึ้นมาได้ด้วยยูนิต��น�ลาง\nบรรทุ�[accent]ตู้เ�็บของ[]นี้มา�ล้วเอาไปวางใน[accent]เครื่องโหลดสิ่งบรรทุ�[]\n(เพื่อจะหยิบหรือวางสิ่งใดๆ ให้�ดค้างที่ตำ�หน่งที่ต้อง�ารหยิบหรือวาง)
+split.acquire = คุณต้องหาทังสเตนมาเพื่อสร้างยูนิต
+split.build = ยูนิตจะต้องถู�ขนย้ายไปยังอี��ั่งของ�ำ�พง\nวาง[accent]เครื่องโอนถ่ายสิ่งบรรทุ�[]สองเครื่อง เครื่องจะ�ั่งของ�ำ�พง\nตั้งค่า�ารเชื่อมต่อโดย�าร�ดที่เครื่องหนึ่ง �ล้วเลิอ�อี�เครื่อง
+split.container = เหมือน�ัน�ับตู้เ�็บของ ยูนิต�็สามารถถู�ขนย้ายได้ด้วย[accent]เครื่องโอนถ่ายสิ่งบรรทุ�[]\nวางเครื่องสรรค์สร้างยูนิตให้ติด�ับเครื่องโอนถ่ายเพื่อที่จะโหลดมัน �ล้วส่งมันข้าม�ำ�พงให้ออ�ไปโจมตี�านทัพศัตรู
+
+item.copper.description = วัสดุ�่อสร้างพื้น�าน ใช้อย่าง�พร่หลายในบล็อ��ทบทุ�ชนิด
+item.copper.details = ทอง�ดง มีอยู่มา�อย่างผิดป�ติบน[accent]เซอร์ปูโล่[] ไม่ค่อย�ข็ง�รงย�เว้นว่าจะเสริมเ�ราะ
+item.lead.description = ทรัพยา�รพื้น�านที่พบเจอได้ง่าย ใช้อย่าง�พร่หลายในอิเล็�ทรอนิ�ส์�ละบล็อ�ขนย้ายของเหลว
+item.lead.details = ทั้งหนา�ละเฉื่อย ใช้�ันอย่างมา�ใน�บตเตอรี่\n\nโน๊ต: มี�นวโน้มจะเป็นพิษต่อรูป�บบสิ่งมีชีวิตทางชีวภาพ ไม่ใช่ว่ามันยังมีเหลืออยู่มา�มายที่นี่
+item.metaglass.description = �ระจ�ที่�ข็ง�รง�ละทนทานอย่างมา� ใช้อย่าง�พร่หลาย�ับท่อน้ำ�ละที่เ�็บของ หรือนำไปเป็น�ระสุน�ระจายใส่ในป้อมปืน
+item.graphite.description = เ�ิดจา��ารจัดเรียงตัวใหม่ของคาร์บอน ใช้เป็นชิ้นส่วนอุป�รณ์ไฟฟ้าหรือนำไปเป็น�ระสุน
+item.sand.description = ทรัพยา�ารที่พบได้ทั่วไป ใช้ใน�าร�ปรรูปเป็นวัสดุอื่นๆ หรือนำไปเผาเป็น[accent]�ระจ�เมต้า[]
+item.coal.description = ใช้เป็นเชื้อเพลิง�ละ�าร�ปรรูปเป็นวัสดุอื่นๆ
+item.coal.details = ดูเหมือนจะเป็นซา�พืชดึ�ดำบรรพ์ เ�ิดขึ้นนาน�่อน�าร�พร่พันธุ์ของสปอร์เสียอี�
+item.titanium.description = ใช้อย่าง�พร่หลายใน�ารขนย้ายของเหลว เครื่องขุดเจาะ�ละอา�าศยาน
+item.thorium.description = ใช้ใน�ารเสริมเ�ราะของสิ่ง�่อสร้างต่างๆ หรือนำไปเป็นเป็นเชื้อเพลิงนิวเคลียร์
+item.scrap.description = ใช้ในเตาหลอม�ร่�ละเครื่องบดอัดเพื่อเปลี่ยนเป็นทรัพยา�รอื่นๆ
+item.scrap.details = เศษที่เหลือจา�สิ่ง�่อสร้าง�ละยูนิตเ�่า มีร่องรอยของโลหะหลายชนิดอยู่ เ�ิดจา��านทัพโบราณในสมัยสงครามเ�่า��่ถู�ทำลาย ทำให้วัสดุต่างๆ พังลงมารวม�ับ
+item.silicon.description = วัสดุ�ึ่งตัวนำที่มีประโยชน์มา� ใช้ใน�ผงโซล่าเซลล์ อุป�รณ์อิเล็�ทรอนิ�ที่ซับซ้อน\nหรือนำไปเป็น�ระสุนติดตามตัวสำหรับป้อมปืน
+item.plastanium.description = วัสดุที่เบา�ละดัดได้ ใช้ในอา�าศยานขั้นสูง เป็นฉนวน�ันความร้อนหรือนำไปเป็น�ระสุน�ระจาย
+item.phase-fabric.description = วัสดุที่เบาจน�ทบจะไร้น้ำหนั� ใช้ในอิเล็�ทรอนิ�ส์ขั้นสูง�ละเทคโนโลยีซ่อม�ซมตนเอง
+item.surge-alloy.description = โลหะผสมขั้นสูงที่มีคุณสมบัติทางไฟฟ้าที่จำเพาะ\nใช้ในอาวุธขั้นสูง�ละ�ารป้อง�ันต่างๆ
+item.spore-pod.description = �ระเปาะของสปอร์สังเคราะห์ สังเคราะห์โดย�ารส�ัดสปอร์ที่อยู่ในบรรยา�าศ\nใช้ในอุตสาห�รรม ใช้ใน�าร�ลั่นเป็นน้ำมัน สารระเบิด�ละเชื้อเพลิง
+item.spore-pod.details = สปอร์ น่าจะเป็นรูป�บบชีวิตสังเคราะห์ ปล่อย��็สที่เป็นพิษต่อระบบสิ่งมีชีวิตอื่น �พร่พันธุ์�ละรุ�รานเร็วมา�ๆ ไวไฟอย่างมา�ในบางสภาวะ
+item.blast-compound.description = ใช้ใน�ารระเบิดหรือนำไปเป็น�ระสุนระเบิดจับคู่�ับสารหล่อเย็น\nเพื่อทำดาเมจอย่างมหาศาล ไม่�นะนำให้ใช้เป็นเชื้อเพลิง
+item.pyratite.description = วัสดุที่ติดไฟได้ง่าย ใช้ในอาวุธเพลิงหรือนำมาผลิตพลังงาน สามารถนำมาผลิตเป็น[accent]สารระเบิด[]ได้
+
+#Erekir
+item.beryllium.description = วัสดุ�่อสร้างพื้น�าน ใช้อย่าง�พร่หลายใน�าร�่อสร้าง�ละเป็น�ระสุนให้�ับบล็อ��ทบทุ�ชนิดในดาวเอเรเ�ียร์
+item.tungsten.description = ใช้ในเครื่องขุด เสริมเ�ราะหรือนำไปเป็น�ระสุน จำเป็นสำหรับ�ารสร้างสิ่ง�่อสร้างที่สูงขั้น�ว่า
+item.oxide.description = ในเป็นตัวนำความร้อน�ละเป็นฉนวนสำหรับไฟฟ้า
+item.carbide.description = ใช้ในสิ่ง�่อสร้างขั้นสูง ยูนิตที่ร้าย�าจยิ่ง�ว่า �ละนำไปเป็น�ระสุน
+
+liquid.water.description = ใช้ใน�ารระบายความร้อนให้�ับสิ่ง�่อสร้าง�ละ�ารจัด�ารของเสียต่างๆ
+liquid.slag.description = สามารถนำไป�ย�เป็นวัสดุต่างๆ หรือเป็นอาวุธพ่นใส่ศัตรู
+liquid.oil.description = ใช้ใน�ารผลิตวัสดุขั้นสูง สามารถ�ปรรูปเป็นถ่านหินเพื่อใช้เป็นเชื้อเพลิง หรือเป็นอาวุธเพื่อพ่นใส่ศัตรูเพื่อให้ศัตรูติดสถานะ[accent]เปื้อนน้ำมัน[]
+liquid.cryofluid.description = ของเหลวเฉื่อย�ละไม่�ัด�ร่อน ใช้ใน�ารหล่อเย็นเตาป�ิ�รณ์ สิ่ง�่อสร้างหรือโรงงานต่างๆ
+
+#Erekir
+liquid.arkycite.description = ใช้ใน�ารทำป�ิ�ิริยาทางเคมีสำหรับ�าร�ำเนิดพลังงาน�ละ�ารผลิตสร้างวัสดุต่างๆ
+liquid.ozone.description = ใช้เป็นตัวช่วย�ารออ�ซิไดซ์ใน�ารผลิตวัสดุต่างๆ รวมไปถึงนำไปเป็นเชื้อเพลิง ค่อนข้างที่จะระเบิดได้ง่าย
+liquid.hydrogen.description = ใช้ใน�ารส�ัดทรัพยา�ร �ารผลิตยูนิต �ละ�ารซ่อม�ซมสิ่ง�่อสร้าง ติดไฟได้ง่าย
+liquid.cyanogen.description = ใช้ใน�ารสร้างยูนิตขั้นสูง �ารทำป�ิ�ิริยาต่างๆ ในบล็อ�ขั้นสูง หรือนำไปเป็น�ระสุน ไวต่อไฟเป็นอย่างมา�
+liquid.nitrogen.description = ใช้ใน�ารส�ัดทรัพยา�ร �ารสร้าง��็ส�ละ�ารผลิตยูนิต มีสภาพเฉื่อย
+liquid.neoplasm.description = ชีวมวลอันตรายที่เป็นผลพลอยได้จา�เตาป�ิ�รนีโอพลาเซีย �พร่�ระจายอย่างรวดเร็วสู่บล็อ�ที่บรรจุน้ำที่ชีวมวลนี้สัมผัส สร้างความเสียหายมันไปในระหว่างทาง หนืดข้น
+liquid.neoplasm.details = นีโอพลาสม์ �้อนเซลล์เนื้องอ�ที่ถู�สังเคราะห์ขึ้น�ละควบคุมไม่ได้ ขยายตัวอย่างรวดเร็วโดยจับตัว�ันเป็น�้อน ทนทานต่อความร้อน เป็นอันตรายอย่างยิ่งต่อสิ่ง�่อสร้างที่เ�ี่ยวข้อง�ับน้ำ\n\nซับซ้อน�ละไม่เสถียรเ�ินไปสำหรับ�ารวินิจฉัยขั้นพื้น�าน ไม่ทราบส่วนผสมที่เป็นไปได้ �นะนำเป็นอย่างยิ่งให้นำมันไปเผาสลายในบ่อ�ร่หลอม
+
+block.derelict = \uf77e [lightgray]ถู�ทิ้งร้าง
+block.armored-conveyor.description = เลื่อนไอเท็มไปข้างหน้า เร็วเท่าสายพานไทเทเนี่ยม �ต่มีเ�ราะที่�ข็ง�รง�ว่า ไม่รับไอเท็มจา�ด้านข้างย�เว้นว่าจะเป็นสายพานด้วย�ันเอง
+block.illuminator.description = ตัวเปล่ง�สงขนาด�ะทัดรัด ส่องสว่างในที่มืดได้ดี\n�ถมยัง�ำหนดค่าสีของ�สงได้อี�ด้วย... เจ๋งใช่มั้ยล่ะ
+block.message.description = เ�็บข้อความ ใช้สื่อสาร�ับพันธมิตร
+block.reinforced-message.description = เ�็บข้อความ ใช้สื่อสาร�ับพันธมิตร
+block.world-message.description = �ล่องข้อความสำหรับ�ารสร้าง�มพ ไม่สามารถทำลายได้
+block.graphite-press.description = อัด�้อนถ่านหินให้เป็น�ผ่น�ราไฟต์บริสุทธิ์
+block.multi-press.description = อัด�้อนถ่านหินให้เป็น�ผ่น�ราไฟต์บริสุทธิ์ ใช้น้ำ�ละพลังงานใน�าร�ปรรูปถ่านหินให้เร็ว�ละมีประสิทธิภาพมา�ขึ้น
+block.silicon-smelter.description = ผลิตซิลิ�อนจา��ารหลอมทราย�ละถ่านหินเข้าด้วย�ัน
+block.kiln.description = เผาทราย�ละตะ�ั่วเป็น�ระจ�เมต้า
+block.plastanium-compressor.description = บีบอัดน้ำมัน�ละไทเทเนี่ยมเข้าด้วย�ันเพื่อผลิตพลาสตาเนี่ยม
+block.phase-weaver.description = สังเคราะห์ใยเฟสจา�ทราย�ละทอเรี่ยม ใช้พลังงานจำนวนมา�ใน�ารทำงาน
+block.surge-smelter.description = หลอมรวมไทเทเนี่ยม ตะ�ั่ว ซิลิ�อน�ละทอง�ดงเพื่อผลิตโลหะผสมเสิร์จ
+block.cryofluid-mixer.description = ผสมน้ำ�ละผงไทเทเนี่ยมบริสุทธิ์เป็นสารหล่อเย็น\nสำคั�สำหรับเตาป�ิ�รณ์ทอเรี่ยม
+block.blast-mixer.description = ผสมสปอร์�ับไพราไทต์เพื่อผลิตสารประ�อบระเบิด
+block.pyratite-mixer.description = ผสมถ่านหิน ตะ�ั่ว�ละทรายเข้าด้วย�ันเป็นไพราไทต์
+block.melter.description = หลอมเศษเหล็�เป็น�ร่หลอมเพื่อใช้ใน�ระบวน�าร�ย��ร่\nหรือใช้เป็นอาวุธเผาศัตรู
+block.separator.description = �ย��ร่หลอมออ�เป็นส่วนประ�อบ�ร่ธาตุของมัน
+block.spore-press.description = อัด�ระเปาะสปอร์ด้วย�รง�ดมหาศาลเพื่อสังเคราะห์น้ำมัน
+block.pulverizer.description = บดเศษเหล็�ให้เป็นทรายละเอียด
+block.coal-centrifuge.description = �ปรรูปน้ำมันให้�ลายเป็นถ่านหิน
+block.incinerator.description = เผาทำลายไอเท็มหรือของเหลวทุ�อย่างที่ได้รับมา
+block.power-void.description = ดูดพลังงานทั้งหมดที่ได้รับ มีเฉพาะโหมดอิสระ
+block.power-source.description = ส่งออ�พลังงานอย่างไม่จำ�ัด มีเฉพาะโหมดอิสระ
+block.item-source.description = ส่งออ�ไอเท็มอย่างไม่จำ�ัด มีเฉพาะโหมดอิสระ
+block.item-void.description = ทำลายไอเท็มทุ�ชนิดที่เข้ามา มีเฉพาะโหมดอิสระ
+block.liquid-source.description = ส่งออ�ของเหลวอย่างไม่จำ�ัด มีเฉพาะโหมดอิสระ
+block.liquid-void.description = ระเหยของเหลวทุ�ชนิดที่เข้ามา มีเฉพาะโหมดอิสระ
+block.payload-source.description = ส่งออ�สิ่งบรรทุ�อย่างไม่จำ�ัด มีเฉพาะโหมดอิสระ
+block.payload-void.description = ทำลายสิ่งบรรทุ�ทุ�ชนิดที่เข้ามา มีเฉพาะโหมดอิสระ
+block.copper-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู
+block.copper-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ครอบคลุมหลายช่อง
+block.titanium-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง�รงอยู่นิดหน่อย
+block.titanium-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง�รงอยู่นิดหน่อย ครอบคลุมหลายช่อง
+block.plastanium-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ค่อนข้าง�ข็ง�รง\nสามารถดูดซับพลังงานไฟฟ้า�ละเลเซอร์ �ละป้อง�ัน�ารต่อไฟ�ับตัวจ่ายพลังงานโดยอัตโนมัติได้
+block.plastanium-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ค่อนข้าง�ข็ง�รง\nสามารถดูดซับพลังงานไฟฟ้า�ละเลเซอร์ �ละป้อง�ัน�ารต่อไฟ�ับตัวจ่ายพลังงานโดยอัตโนมัติได้\nครอบคลุมหลายช่อง
+block.thorium-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง�รงมา� ป้อง�ันศัตรูได้อย่างดี
+block.thorium-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง�รงมา� ป้อง�ันศัตรูได้อย่างดี\nครอบคลุมหลายช่อง
+block.phase-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ทนทาน�ละ�ข็ง�รง\nเคลือบด้วยวัสดุพิเศษที่สะท้อน�ระสุนส่วนให�่ที่รับมา
+block.phase-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ทนทาน�ละ�ข็ง�รง\nเคลือบด้วยวัสดุพิเศษที่สะท้อน�ระสุนส่วนให�่ที่รับมา\nครอบคลุมหลายช่อง
+block.surge-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง��ร่งอย่างมา�\nจะปล่อยพลังงานสายฟ้าออ�มาเป็นระยะๆ เมื่อถู�โจมตี
+block.surge-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง��ร่งอย่างมา�\nจะปล่อยพลังงานสายฟ้าออ�มาเป็นระยะๆ เมื่อถู�โจมตี\nครอบคลุมหลายช่อง
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+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.shock-mine.description = จะปล่อยพลังงานสายฟ้าเมื่อศัตรูเหยียบ�ับดั�
+block.conveyor.description = เลื่อนไอเท็มไปข้างหน้า
+block.titanium-conveyor.description = เลื่อนไอเท็มไปข้างหน้า เลื่อนเร็ว�ว่าสายพานป�ติ
+block.plastanium-conveyor.description = เคลื่อนย้ายไอเท็มเป็นชุด\nรับไอเท็มจา�ด้านหลัง �ละนำออ�ไปด้านหน้าสามทิศทาง
+block.junction.description = มีหน้าที่เป็นสะพานสำหรับสายพานสองสายข้าม�ัน มีประโยชน์สำหรับเวลาสายพานสองสาย\nขนไอเท็มสองชนิดไปยังสองสถานที่
+block.bridge-conveyor.description = เคลื่อนย้ายไอเท็มข้ามสิ่ง�่อสร้างหรือ�ำ�พง
+block.phase-conveyor.description = เคลื่อนย้ายไอเท็มข้ามสิ่ง�่อสร้างหรือ�ำ�พงด้วยความเร็ว�สง\nมีระยะที่ไ�ล�ว่าสะพานไอเท็ม �ต่ต้องใช้พลังงาน
+block.sorter.description = ถ้าไอเท็มที่เข้าไปข้างในตรง�ับที่เลือ�ไว้ �็จะผ่านได้ �ต่ถ้าไม่ตรง ไอเท็ม�็จะถู�ส่งออ�ไปทางซ้ายขวา�ทน
+block.inverted-sorter.description = �ย�ไอเท็มคล้าย�ับเครื่องคัด�ย�ธรรมดา �ต่ไอเท็มที่เลือ�จะออ�ทางซ้ายขวา�ทน
+block.router.description = รับไอเท็ม�ล้วส่งออ�ไปสามทางเท่าๆ�ัน มีประโยชน์สำหรับ�ย�ไอเท็มจา��หล่งเดียวไปหลายที่
+block.router.details = สิ่งชั่วร้ายที่เราจำเป็นต้องใช้ ไม่�นะนำให้ใช้ติด�ัน�ับโรงงาน เพราะของจะถู�อุดตัน�ละปน�ันมั่วไปหมด
+block.distributor.description = �ย�ไอเท็มออ�เป็นเจ็ดทางเท่าๆ �ัน
+block.overflow-gate.description = ไอเท็มจะถู�ระบายออ�ทางซ้ายขวาเมื่อทางข้างหน้าถู�ปิด�ั้น
+block.underflow-gate.description = ตรงข้าม�ับประตูระบาย จะระบายไอเท็มไปข้างหน้าหา�ทางซ้าย�ละขวาถู�ปิด�ั้น
+block.mass-driver.description = บล็อ�ขนส่งไอเท็มทางไ�ล รวบรวมไอเท็มจำนวนหนึ่ง�ล้ว\nยิงไปหาเครื่องโอนถ่ายมวลอี�เครื่องที่อยู่ไ�ลออ�ไป
+block.mechanical-pump.description = ปั้มของเหลวขึ้นมา ไม่ใช้พลังงาน
+block.rotary-pump.description = ปั๊มของเหลวได้มา�ขึ้น �ต่ต้องใช้พลังงาน
+block.impulse-pump.description = ปั๊มขั้นสุดยอด ปั้มของเหลวขึ้นมาได้เป็นจำนวนมา�
+block.conduit.description = เคลื่อนย้ายของเหลวไปข้างหน้า ใช้ร่วม�ับปั๊ม�ละท่อน้ำอื่นๆ
+block.pulse-conduit.description = เคลื่อนย้ายของเหลวไปข้างหน้า เคลื่อนย้ายได้เร็วขึ้น�ละเ�็บของเหลวได้เยอะ�ว่าท่อน้ำธรรมดา
+block.plated-conduit.description = เคลื่อนย้ายของเหลวไปข้างหน้า ไม่รับของเหลวจา�ด้านข้างย�เว้นว่าจะเป็นท่อน้ำด้วย�ันเอง\nไม่รั่วไหล �ละมีเ�ราะที่หนา�ว่า
+block.liquid-router.description = รับของเหลวจา�ทางเดียว�ล้วส่งออ�ไปสามทางเท่าๆ�ัน สามารถเ�็บของเหลวได้จำนวนหนึ่ง\nมีประโยชน์สำหรับ�ารส่งของเหลวจา�ปั้มไปยังหลายที่
+block.liquid-container.description = เ�็บของเหลวจำนวนปาน�ลาง ส่งออ�ไปรอบด้านคล้าย�ับ\nเร้าเตอร์ของเหลว เหมาะใน�ารใช้�ับเครื่องโหลด�ละถ่ายสิ่งบรรทุ�สำหรับ\n�ารขนส่งของเหลวทางไ�ล
+block.liquid-tank.description = เ�็บของเหลวจำนวนมา� ส่งออ�ไปรอบด้านคล้าย�ับเร้าเตอร์ของเหลว\nเหมาะใน�ารใช้เพื่อสร้าง�ันชนในเวลาที่ของเหลวไม่คงที่\nหรือเวลาที่ใช้ของเหลวเป็นจำนวนมา�
+block.liquid-junction.description = ทำหน้าที่เป็นสะพานสำหรับท่อน้ำสองท่อตัด�ันที่มีของเหลวสองชนิด�ล้วจะไปคนละที่
+block.bridge-conduit.description = เคลื่อนย้ายของเหลวข้ามสิ่ง�่อสร้างหรือ�ำ�พง
+block.phase-conduit.description = เคลื่อนย้ายของเหลวข้ามสิ่ง�่อสร้างหรือ�ำ�พงด้วยความเร็ว�สง\nมีระยะที่ไ�ล�ว่าสะพานของเหลว �ต่ต้องใช้พลังงาน
+block.power-node.description = ส่งพลังงานไปยังตัวจ่ายพลังงานที่เชื่อมต่อ ตัวจ่ายจะรับพลังงานจา�ตัวจ่ายอื่น\nหรือ�หล่งพลังงาน�ล้วส่งไปยังบล็อ�ที่ติด�ัน
+block.power-node-large.description = ตัวจ่ายพลังงานขั้นสูง มีระยะเชื่อมต่อ�ว้างขึ้น เชื่อมต่อได้มา�ขึ้น
+block.surge-tower.description = ตัวจ่ายพลังงานที่มีระยะเชื่อมต่อไ�ลมา��ต่เชื่อมต่อได้น้อย\nเหมาะใน�ารใช้เพื่อส่งพลังงานไปที่ไ�ลๆ
+block.diode.description = พลังงาน�บตเตอรี่สามารถไหลผ่านบล็อ�นี้ได้เพียงทางเดียว �ต่เฉพาะเวลาที่อี�ด้านมีพลังงานน้อย�ว่าเท่านั้น
+block.battery.description = เ�็บพลังงานเป็น�ันชนเวลาที่มีพลังงานเ�ิน �ละส่งออ�พลังงานเมื่อพลังงานไม่พอ
+block.battery-large.description = เ�็บพลังงานเป็น�ันชนเวลาที่มีพลังงานเ�ิน �ละส่งออ�พลังงานเมื่อพลังงานไม่พอ\nเ�็บพลังงานได้เยอะ�ว่า�บตเตอรี่ธรรมดา
+block.combustion-generator.description = ผลิตพลังงานจา��ารเผาไหม้วัสดุติดไฟ อย่างเช่นถ่านหิน
+block.thermal-generator.description = ผลิตพลังงานเมื่อวางในพื้นที่ร้อน
+block.steam-generator.description = เครื่อง�ำเนิดไฟฟ้าเผาไหม้ขั้นสูง ประสิทธิภาพสูง�ว่า �ต่ต้องใช้น้ำด้วยเพื่อผลิตไอน้ำ
+block.differential-generator.description = ผลิตไฟฟ้าจำนวนมา� ใช้ความต่างของอุณหภูมิระหว่าง\nสารหล่อเย็น�ละไพราไทต์อันร้อน�รงเพื่อผลิตพลังงานออ�มา
+block.rtg-generator.description = เครื่อง�ำเนิดไฟฟ้าที่ใช้ง่าย�ละไว้ใจได้\nใช้ความร้อนจา��ารสลายตัวของสาร�ัมมันตรังสีมาผลิตพลังงาน\nอย่างช้าๆ
+block.solar-panel.description = ผลิตพลังงานจา��สงอาทิตย์อย่างน้อยๆ
+block.solar-panel-large.description = ผลิตพลังงานจา��สงอาทิตย์อย่างพอประมาณ มีประสิทธิภาพมา��ว่า�ผงโซล่าเซลล์ธรรมดา
+block.thorium-reactor.description = ผลิตพลังงานจำนวนมา�จา�ทอเรี่ยม ต้องมีสารหล่อเย็นมาระบายความร้อนอยู่ตลอดเวลา จะร้อน�ละระเบิดอย่างรุน�รงหา�ขาดสารหล่อเย็น
+block.impact-reactor.description = สามารถผลิตไฟฟ้าได้จำนวนมหาศาลที่ประสิทธิภาพสูงสุด จำเป็นต้องใช้พลังงานจำนวนมา�ใน�ารเดินเครื่อง
+block.mechanical-drill.description = เมื่อวางบนพื้น�ร่ จะขุด�ร่นั้น�ละส่งออ�มาอย่างช้าๆ\nไปเรื่อยๆ ไม่มีที่สิ้นสุด ขุดได้�ค่ทรัพยา�รพื้น�าน
+block.pneumatic-drill.description = เครื่องขุดที่ได้รับ�ารปรับปรุง สามารถขุดไทเทเนี่ยมได้ ขุดได้เร็ว�ว่าเครื่องขุดเชิง�ล
+block.laser-drill.description = ขุดได้เร็วขึ้นด้วยเทคโนโลยีเลเซอร์ �ต่ต้องใช้พลังงาน\nสามารถขุดทอเรี่ยมได้
+block.blast-drill.description = เครื่องขุดขั้นสุดยอด ใช้พลังงานจำนวนมา�
+block.water-extractor.description = ขุดน้ำบาดาลจา�ใต้พื้นดิน ใช้ในพื้นที่ที่ไม่มีน้ำบนดินให้ใช้
+block.cultivator.description = รวบรวมสปอร์ในชั้นบรรยา�าศมาส�ัดเป็น�ระเปาะสปอร์สำหรับ\nอุตสาห�รรม
+block.cultivator.details = เทคโนโลยีที่�อบ�ู้มาได้ ใช้สำหรับส�ัดชีวมวลจำนวนมหาศาล\nอย่างมีประสิทธิภาพให้ได้มา�ที่สุด\nน่าจะเป็นศูนย์บ่มเพาะเริ่ม�ร�ของสปอร์ที่ตอนนี้\nครอบคลุมดาว[accent]เซอร์ปูโล่[]
+block.oil-extractor.description = ใช้พลังงานจำนวนมา��ับทราย�ละน้ำเพื่อขุดหาน้ำมัน
+block.core-shard.description = ��น�ลางเป็นใจ�ลางของ�านทัพ เมื่อถู�ทำลาย �ารติดต่อ�ับพื้นที่นั้นทั้งหมดจะหายไป อย่าให้มันเ�ิดขึ้น
+block.core-shard.details = ��น�ลางรุ่น�ร� �ะทัดรัด สามารถ�ย�ร่างได้ ติดตั้งด้วยเครื่องยนต์จรวดสำหรับใช้ครั้งเดียว ไม่ได้ออ��บบมาเพื่อไปอว�าศ
+block.core-foundation.description = ใจ�ลางของ�านทัพ เสริมเ�ราะมา�ขึ้น เ�็บทรัพยา�รได้เยอะ�ว่า��น�ลางชาร์ด
+block.core-foundation.details = ��น�ลางรุ่นที่สอง ยานบินเบต้าที่ดี�ว่าจะป�ป้อง��น�ลางนี้ไว้
+block.core-nucleus.description = ใจ�ลางของ�านทัพ เสริมเ�ราะมาอย่างดีเยี่ยม เ�็บทรัพยา�รได้อย่างมหาศาล
+block.core-nucleus.details = ��น�ลางรุ่นที่สาม�ละเป็นรุ่นสุดท้าย สุดยอดยานบิน��มม่าจะป�ป้อง��น�ลางนี้ไว้
+block.vault.description = เ�็บไอเท็ม�ต่ละชนิดได้จำนวนมา� สามารถใช้ตัวถ่ายไอเท็มใน�ารดึงไอเท็มออ�มาได้
+block.container.description = เ�็บไอเท็ม�ต่ละชนิดได้นิดหน่อย สามารถใช้ตัวถ่ายไอเท็มใน�ารดึงไอเท็มออ�มาได้
+block.unloader.description = ดึงไอเท็มที่�ำหนดไว้ออ�มาจา�บล็อ�ใ�ล้เคียง
+block.launch-pad.description = ส่งไอเท็มเป็นชุดๆ ไปยังเซ็�เตอร์ที่�ำหนดไว้
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = ป้อมปืนขนาดเล็� ยิง�ระสุนที่อยู่ในตัวมันใส่เป้าหมายศัตรู
+block.scatter.description = ยิง�้อนตะ�ั่ว เศษเหล็�หรือ�ระจ�เมต้าใส่ยานบินศัตรูที่อยู่ใ�ล้เคียง
+block.scorch.description = เผาศัตรูพื้นดินที่อยู่ใ�ล้ๆ มีประสิทธิภาพสูงสุดเมื่อใช้ในระยะใ�ล้
+block.hail.description = ป้อมปืนให�่ขนาดย่อม ยิงลู�ระเบิดใส่ศัตรูพื้นดินจา�ระยะไ�ล
+block.wave.description = พ่นของเหลวสาดใส่ศัตรู จะดับไฟให้อัตโนมัติเมื่อใส่น้ำเข้าไป
+block.lancer.description = ชาร์จ�ล้วยิงลำ�สงพลังงานอันทรงพลังใส่ศัตรูพื้นดิน
+block.arc.description = ยิงสายฟ้าใส่ศัตรูพื้นดิน จะทำดาเมจมหาศาลเมื่อศัตรูเปีย�น้ำ
+block.swarmer.description = ยิงขีปนาวุธติดตามตัวใส่ศัตรูทั้งอา�าศ�ละพื้นดิน
+block.salvo.description = ป้อมปืนขนาด�ลาง ระดมยิง�ระสุนหนั�ใส่ศัตรูอย่างรวดเร็ว
+block.fuse.description = ป้อมปืนระยะใ�ล้ขนาดให�่ ยิงลำ�สงเจาะทะลุสาม�ฉ�ใส่เป้าหมายศัตรูที่อยู่ใ�ล้เคียง
+block.ripple.description = ป้อมปืนให�่อันทรงพลัง ยิงลู�ระเบิดเป็น�ระจุ�ใส่เป้าหมายศัตรูพื้นดินจา�ระยะไ�ล
+block.cyclone.description = ป้อมปืนรวดเร็วดั่งพายุ ยิง�้อนสะเ�็ดระเบิดใส่เป้าหมายศัตรูอย่างรวดเร็ว
+block.spectre.description = ปืนให�่คู่ขนาดยั�ษ์ ยิง�ระสุนเจาะเ�ราะใส่ศัตรูทั้งบนอา�าศ�ละพื้นดิน
+block.meltdown.description = ชาร์จ�ล้วยิงลำ�สงเลเซอร์ใส่ศัตรูที่อยู่ใ�ล้เคียงอย่างต่อเนื่อง ต้องมีของเหลวมาหล่อเย็นป้อมปืนเพื่อทำงาน
+block.foreshadow.description = ป้อมปืนเรล�ันขนาดมหึมา ยิงลำ�สงพลังงานใส่เป้าหมายเดี่ยวขนาดให�่\nมีระยะ�ารยิงไ�ลมา� จะเลือ�ยิงยูนิตที่มีพลังชีวิตมา�ที่สุด�่อน
+block.repair-point.description = ซ่อม�ซมยูนิตที่อยู่ในรัศมีของมันอย่างต่อเนื่อง
+block.segment.description = สร้างความเสียหาย�ละทำลาย�ระสุนที่�ำลังเข้ามา ไม่สามารถทำลายลำ�สงเลเซอร์ได้
+block.parallax.description = ยิงลำ�สงที่ดึงยานบินศัตรูเข้ามาหา สร้างความเสียหาย��่พว�มันระหว่างทาง
+block.tsunami.description = ยิง�ระ�สของเหลวอันทรงพลังใส่ศัตรู จะดับไฟให้อัตโนมัติเมื่อใส่น้ำเข้าไป
+block.silicon-crucible.description = หลอมซิลิ�อนจา�ทราย�ละถ่านหิน ใช้ไพราไทต์เป็น�หล่งความร้อนเพิ่มเติม จะทำงานเร็ว�ว่าถ้าตั้งอยู่ในพื้นที่ร้อน
+block.disassembler.description = �ย��ร่หลอมออ�เป็น�ร่ธาตุปริมาณเล็�น้อยโดยมีประสิทธิภาพต่ำ สามารถผลิตทอเรี่ยมได้
+block.overdrive-dome.description = เร่งประสิทธิภาพสิ่ง�่อสร้างรอบข้างอย่างมหาศาล ต้องมีใยเฟส�ับซิลิ�อนเพื่อทำงาน
+block.payload-conveyor.description = เคลื่อนย้ายสิ่งของบรรทุ�หนั� อย่างเช่นยูนิต
+block.payload-router.description = �ย�สิ่งของบรรทุ�ออ�เป็นสามทิศทาง
+block.ground-factory.description = ผลิตยูนิตทางบ� ยูนิตที่ผลิตสามารถนำไปใช้ได้เลย หรือนำไปใส่ในเครื่องพัฒนาเพื่ออัปเ�รด
+block.air-factory.description = ผลิตยูนิตทางอา�าศ ยูนิตที่ผลิตสามารถนำไปใช้ได้เลย หรือนำไปใส่ในเครื่องพัฒนาเพื่ออัปเ�รด
+block.naval-factory.description = ผลิตยูนิตเรือ ยูนิตที่ผลิตสามารถนำไปใช้ได้เลย หรือนำไปใส่ในเครื่องพัฒนาเพื่ออัปเ�รด
+block.additive-reconstructor.description = อัปเ�รดยูนิตที่อยู่ข้างในให้เป็นรุ่นที่สอง
+block.multiplicative-reconstructor.description = อัปเ�รดยูนิตที่อยู่ข้างในให้เป็นรุ่นที่สาม
+block.exponential-reconstructor.description = อัปเ�รดยูนิตที่อยู่ข้างในให้เป็นรุ่นที่สี่
+block.tetrative-reconstructor.description = อัปเ�รดยูนิตที่อยู่ข้างในให้เป็นรุ่นที่ห้า�ละรุ่นสุดท้าย
+block.switch.description = สวิตช์เปิดปิดได้ สามารถควบคุมหรืออ่านค่าได้ด้วยตัวประมวลผลลอจิ�
+block.micro-processor.description = รันคำสั่งลอจิ�เป็นลำดับวนไปวนมา สามารถใช้ควบคุมยูนิตหรือสิ่ง�่อสร้าง ไม่ค่อยเร็วเท่าไหร่
+block.logic-processor.description = รันคำสั่งลอจิ�เป็นลำดับวนไปวนมา สามารถใช้ควบคุมยูนิตหรือสิ่ง�่อสร้าง ค่อนข้างเร็ว มีระยะ�ารเชื่อมต่อที่ค่อนข้างไ�ล
+block.hyper-processor.description = รันคำสั่งลอจิ�เป็นลำดับวนไปวนมา สามารถใช้ควบคุมยูนิตหรือสิ่ง�่อสร้าง เร็วอย่างมา� �ละเชื่อมต่อได้ไ�ลมา� �ต่ต้องใช้สารหล่อเย็นใน�ารทำงาน
+block.memory-cell.description = เ�็บข้อมูลเป็นตัวเลขสำหรับตัวประมวลผลลอจิ�ไว้สื่อสาร�ันไปมา
+block.memory-bank.description = เ�็บข้อมูลเป็นตัวเลขสำหรับตัวประมวลผลลอจิ�ไว้สื่อสาร�ันไปมา มีพื้นที่เยอะมา�
+block.logic-display.description = �สดง�ราฟิ�โดยควบคุมจา�ตัวประมวลผลลอจิ�
+block.large-logic-display.description = �สดง�ราฟิ�โดยควบคุมจา�ตัวประมวลผลลอจิ� มีขนาดให�่�ว่า
+block.interplanetary-accelerator.description = หอคอยเรล�ัน�ม่เหล็�ไฟฟ้าขนาดมหึมา เร่งความเร็ว��น�ลางเพื่อบินสู่อว�าศไปยังดาวเคราะห์อื่นๆ
+block.repair-turret.description = ซ่อม�ซมยูนิตที่อยู่ในรัศมีของมันอย่างต่อเนื่อง สามารถใช้ของเหลวมาหล่อเย็นเพื่อเพิ่มประสิทธิภาพได้
+
+#Erekir
+block.core-bastion.description = ใจ�ลางของ�านทัพ เสริมเ�ราะมาอย่างดี เมื่อถู�ทำลาย �ารติดต่อ�ับพื้นที่นั้นทั้งหมดจะหายไป อย่าให้มันเ�ิดขึ้น
+block.core-citadel.description = ใจ�ลางของ�านทัพ เสริมเ�ราะมาอย่างดีเยี่ยม เ�็บทรัพยา�รได้เยอะ�ว่า��น�ลางบาสเชี่ยน
+block.core-acropolis.description = ใจ�ลางของ�านทัพ เสริมเ�ราะมาอย่างสุดยอด เ�็บทรัพยา�รได้เยอะ�ว่า��น�ลางซิทาเดล
+block.breach.description = ยิง�ระสุนเบริลเลี่ยมหรือทังสเตนเจาะทะลุใส่เป้าหมายศัตรู
+block.diffuse.description = ป้อมปืนระยะยิงสั้น ปะทุยิง�ลุ่ม�ระสุนใน�นว�ว้าง �ระสุนจะผลั�เป้าหมายศัตรูให้ถอยห่างจา�ป้อมปืน
+block.sublimate.description = ยิงลำ�สงเปลวไฟเจาะเ�ราะใส่เป้าหมายศัตรูอย่างต่อเนื่อง
+block.titan.description = ยิง�ระสุนปืนให�่ระเบิดขนาดให�่ใส่เป้าหมายศัตรูพื้นดิน ต้องใช้ไฮโดรเจน
+block.afflict.description = ยิงลู���้วสะเ�็ดระเบิดสายฟ้าใส่เป้าหมายศัตรู ต้องใช้ความร้อน
+block.disperse.description = ปะทุยิง�้อนสะเ�็ด�ระสุนใส่ยานบินศัตรู
+block.lustre.description = ยิงลำ�สงเลเซอร์เคลื่อนที่ช้าจ่อใส่เป้าหมายศัตรูที่จุดๆเดียว
+block.scathe.description = ป้อมปืนพิสัยไ�ลอย่างมา� ยิงขีปนาวุธทรงพลังใส่เป้าหมายศัตรูพื้นดินจา�ระยะไ�ล ขีปนาวุธอาจถู�ยิงส�ัดระหว่างทางได้
+block.smite.description = บทลงโทษจา�สวรรค์ ปะทุยิง�นว�ระสุนสายฟ้าเจาะ�ราะใส่เป้าหมายศัตรู
+block.malign.description = ระดมยิง�ระสุนเลเซอร์สายฟ้าติดตามตัวจำนวนมา�ใส่เป้าหมายศัตรู ต้องใช้ความร้อนจำนวนมา�เพื่อที่จะทำงานได้อย่างเต็มประสิทธิภาพ
+block.silicon-arc-furnace.description = ผลิตซิลิ�อนจา��ารหลอมทราย�ละ�ราไฟต์เข้าด้วย�ัน
+block.oxidation-chamber.description = �ปลงเบริลเลี่ยม�ละโอโซนให้�ลายเป็นอ๊อ�ไซด์ ปล่อยความร้อนออ�มาซึ่งเป็นผลมาจา�ปฎิบัติ�าร
+block.electric-heater.description = สร้างความร้อนขึ้นมาจา�พลังงาน ใช้พลังงานจำนวนมา� ใช้โดย�ารหันหน้าลู�ศรไปในทางที่ต้อง�ารจะปล่อยความร้อนออ�มา
+block.slag-heater.description = สร้างความร้อนขึ้นมาจา��ร่หลอม ใช้โดย�ารหันหน้าลู�ศรไปในทางที่ต้อง�ารจะปล่อยความร้อนออ�มา
+block.phase-heater.description = สร้างความร้อนขึ้นมาจา��ารอุ่นใยเฟส ใช้โดย�ารหันหน้าลู�ศรไปในทางที่ต้อง�ารจะปล่อยความร้อนออ�มา
+block.heat-redirector.description = เปลี่ยนทิศทางของความร้อนที่สะสมมาให้ไปหาบล็อ�ที่มันหันหน้าเข้าใส่
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = �ระจายความร้อนที่สะสมมาออ�ไปในสามทิศทาง
+block.electrolyzer.description = เปลี่ยนน้ำให้�ลายเป็น��็สไฮโดรเจน�ละโอโซนด้วยขบวน�ารทางเคมี
+block.atmospheric-concentrator.description = หลอมรวมไนโตรเจนจา�ชั้นบรรยา�าศ ใช้ความร้อนใน�ารทำงาน
+block.surge-crucible.description = หลอมรวม�ร่หลอม�ละซิลิ�อนเพื่อผลิตโลหะผสมเสิร์จ ใช้ความร้อนใน�ารทำงาน
+block.phase-synthesizer.description = สังเคราะห์ใยเฟสจา�ทอเรี่ยม ทราย�ละ��็สโอโซน ใช้ความร้อนใน�ารทำงาน
+block.carbide-crucible.description = หลอมรวม�ราไฟต์�ละทังสเตนเพื่อผลิตคาร์ไบต์ ใช้ความร้อนใน�ารทำงาน
+block.cyanogen-synthesizer.description = สังเคราะห์ไซยาโนเจนจา�อาร์คย์ไซต์�ละ�ราไฟต์ ใช้ความร้อนใน�ารทำงาน
+block.slag-incinerator.description = เผาทำลายไอเท็มหรือของเหลวที่เสถียรทั้งหมดที่ได้รับมา ต้องใช้�ร่หลอมเพื่อทำงาน
+block.vent-condenser.description = ควบ�น่น��็สในปล่องให้�ลายเป็นน้ำ ต้องใช้พลังงาน
+block.plasma-bore.description = เมื่อหันหน้าเข้าหา�ร่�ำ�พง จะขุด�ร่นั้น�ละส่งออ�มาอย่างช้าๆ ไปเรื่อยๆ ไม่มีที่สิ้นสุด จำเป็นต้องใช้พลังงานเล็�น้อย สามารถใช้ไฮโดรเจนเพื่อเพิ่มประสิทธิภาพ�ารขุดได้
+block.large-plasma-bore.description = เครื่องขุดเจาะพลาสม่าที่ให�่�ว่า สามารถขุด�ร่ทังสเตน�ละทอเรี่ยมได้ ต้องใช้ไฮโดรเจน�ละพลังงานใน�ารทำงาน สามารถใช้ไนโตรเจนเพื่อเพิ่มประสิทธิภาพ�ารขุดได้
+block.cliff-crusher.description = เมื่อหันหน้าเข้าหา�ำ�พงที่ต้อง�าร จะบดขยี้�ำ�พงนั้น �ละส่งออ�ผงทรายละเอียดออ�มาอย่างไม่มีที่สิ้นสุด จำเป็นต้องใช้พลังงาน ประสิทธิภาพของ�ารบดขึ้นอยู่�ับชนิดของ�ำ�พงที่บด
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = เมื่อวางบนพื้น�ร่ จะขุด�ร่นั้น�ละส่งออ�มาเป็น�ลุ่มไปเรื่อยๆ ไม่มีที่สิ้นสุด จำเป็นต้องใช้พลังงาน�ละน้ำ
+block.eruption-drill.description = เครื่องขุด�รง�ระ�ท�ที่ได้รับ�ารปรับปรุง สามารถขุดทอเรี่ยมได้ จำเป็นต้องใช้ไฮโดรเจน
+block.reinforced-conduit.description = เคลื่อนย้ายของเหลวไปข้างหน้า ไม่รับของเหลวจา�ด้านข้างย�เว้นว่าจะเป็นท่อน้ำด้วย�ันเอง
+block.reinforced-liquid-router.description = รับของเหลวจา�ทางเดียว�ล้วส่งออ�ไปสามทางเท่าๆ�ัน สามารถเ�็บของเหลวได้จำนวนหนึ่ง\nมีประโยชน์สำหรับ�ารส่งของเหลวจา�ปั้มไปยังหลายที่
+block.reinforced-liquid-tank.description = เ�็บของเหลวจำนวนมา� ส่งออ�ไปรอบด้านคล้าย�ับเร้าเตอร์ของเหลว\nเหมาะใน�ารใช้เพื่อสร้าง�ันชนในเวลาที่ของเหลวไม่คงที่\nหรือเวลาที่ใช้ของเหลวเป็นจำนวนมา�
+block.reinforced-liquid-container.description = เ�็บของเหลวจำนวนปาน�ลาง ส่งออ�ไปรอบด้านคล้าย�ับ\nเร้าเตอร์ของเหลว เหมาะใน�ารใช้�ับเครื่องโหลด�ละถ่ายสิ่งบรรทุ�สำหรับ\n�ารขนส่งของเหลวทางไ�ล
+block.reinforced-bridge-conduit.description = เคลื่อนย้ายของเหลวข้ามสิ่ง�่อสร้างหรือ�ำ�พง
+block.reinforced-pump.description = ปั้มของเหลวขึ้นมา ต้องใช้ไฮโดรเจน
+block.beryllium-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู
+block.beryllium-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ครอบคลุมหลายช่อง
+block.tungsten-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ค่อนข้าง�ข็ง�รง
+block.tungsten-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ค่อนข้าง�ข็ง�รง ครอบคลุมหลายช่อง
+block.carbide-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง��ร่งอย่างมา�
+block.carbide-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง��ร่งอย่างมา� ครอบคลุมหลายช่อง
+block.reinforced-surge-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ทนทาน�ละ�ข็ง�รง ปล่อยพลังงานสายฟ้าออ�มาเป็นระยะๆ เมื่อถู�โจมตี
+block.reinforced-surge-wall-large.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู ทนทาน�ละ�ข็ง�รง ปล่อยพลังงานสายฟ้าออ�มาเป็นระยะๆ เมื่อถู�โจมตี\nครอบคลุมหลายช่อง
+block.shielded-wall.description = ป้อง�ันสิ่ง�่อสร้างจา�ศัตรู �ข็ง�รงมา� สร้างโล่พลังงานที่ดูดซับ�ระสุนเ�ือบทั้งหมดเมื่อได้รับพลังงาน มีคุณสมบัตินำไฟฟ้า
+block.blast-door.description = �ำ�พงที่จะเปิดเมื่อยูนิตพื้นดินพันธมิตรอยู่ในระยะ ไม่สามารถควบคุมได้ด้วยตนเอง
+block.duct.description = เลื่อนไอเท็มไปข้างหน้า �ั�เ�็บไอเท็มได้�ค่ชิ้นเดียว
+block.armored-duct.description = เลื่อนไอเท็มไปข้างหน้า เร็วเท่าท่อสู��า�าศ �ต่มีเ�ราะที่�ข็ง�รง�ว่า ไม่รับไอเท็มจา�ด้านข้างย�เว้นว่าจะเป็นท่อสู��า�าศด้วย�ันเอง
+block.duct-router.description = รับไอเท็ม�ล้วส่งออ�ไปสามทางเท่าๆ�ัน รับไอเท็มเฉพาะจา�ด้านหลังเท่านั้น สามารถตั้งค่าให้เป็นเครื่องคัด�ย�ไอเท็มได้
+block.overflow-duct.description = ไอเท็มจะถู�ระบายออ�ทางซ้ายขวาเมื่อทางข้างหน้าถู�ปิด�ั้น
+block.duct-bridge.description = เคลื่อนย้ายไอเท็มข้ามสิ่ง�่อสร้างหรือ�ำ�พง
+block.duct-unloader.description = ดึงไอเท็มที่เลือ�ไว้ออ�มาจา�บล็อ�ใ�ล้เคียง ไม่สามารถดึงไอเท็มออ�มาจา���น�ลางได้
+block.underflow-duct.description = ตรงข้าม�ับท่อระบายสู��า�าศ จะระบายไอเท็มไปข้างหน้าหา�ทางซ้าย�ละขวาถู�ปิด�ั้น
+block.reinforced-liquid-junction.description = ทำหน้าที่เป็นสะพานสำหรับท่อน้ำสองท่อตัด�ันที่มีของเหลวสองชนิด�ล้วจะไปคนละที่
+block.surge-conveyor.description = เคลื่อนย้ายไอเท็มเป็นชุด\nรับไอเท็มจา�ด้านหลัง �ละนำออ�ไปด้านหน้าสามทิศทาง สามารถจ่ายพลังงานเพื่อเร่งความเร็วได้ มีคุณสมบัตินำไฟฟ้า
+block.surge-router.description = รับไอเท็มจา�สายพานเสิร์จ�ล้วส่งออ�ไปสามทางเท่าๆ�ัน สามารถจ่ายพลังงานเพื่อเร่งความเร็วได้ มีคุณสมบัตินำไฟฟ้า
+block.unit-cargo-loader.description = สร้างโดรนบรรทุ�ขึ้นมา โดรนจะเคลื่อนย้ายจะ�จ�จ่ายไอเท็มจา�บล็อ�นี้ไปยังจุดถ่ายยูนิตบรรทุ�ที่มีตัว�รองเดียว�ันอย่างเท่าๆ�ันโดยอัตโนมัติ
+block.unit-cargo-unload-point.description = เป็นจุดสำหรับโดรนบรรทุ�ที่จะถ่ายไอเท็มลง จะรับไอเท็มที่ตรง�ับตัว�รองที่ได้ตั้งไว้เท่านั้น
+block.beam-node.description = ส่งพลังงานไปยังโหนดลำ�สงอื่นใน�นวตั้งฉา� �ั�เ�็บพลังงานได้จำนวนเล็�น้อย
+block.beam-tower.description = ส่งพลังงานไปยังโหนดลำ�สงอื่นใน�นวตั้งฉา� �ั�เ�็บพลังงานได้จำนวนมา� ระยะไ�ล�ว่าโหนดลำ�สง
+block.turbine-condenser.description = ผลิตพลังงานออ�มาเมื่อวางบนปล่อง ผลิตน้ำจำนวนเล็�น้อยเป็นผลมาจา��ารควบ�น่น
+block.chemical-combustion-chamber.description = ผลิตพลังงานจา��ารเผาไหม้ทางเคมีระหว่างอาร์คย์ไซต์�ละโอโซน
+block.pyrolysis-generator.description = ผลิตพลังงานจำนวนมา�จา�อาร์คย์ไซต์�ละ�ร่หลอม ผลิตน้ำออ�มาซึ่งเป็นผลมาจา�ปฎิบัติ�าร
+block.flux-reactor.description = ผลิตพลังงานจำนวนมา�ออ�มาเมื่อได้รับความร้อน จำเป็นต้องใช้ไซยาโนเจนเป็นสารคงความเสถียรของเตาป�ิ�รณ์ พลังงานที่ผลิต�ละจำนวนไซยาโนเจนที่ต้อง�าร\nจะ�ปรผันตรง�ับความร้อนที่ได้รับมา\nจะระเบิดหา�เตาป�ิ�รณ์ไม่ได้รับไซยาโนเจนที่เพียงพอ
+block.neoplasia-reactor.description = ใช้อาร์คย์ไซต์ น้ำ �ละใยเฟสเพื่อผลิตพลังงานจำนวนมา� ปล่อยความร้อน�ละนีโอพลาสม์อันตรายซึ่งเป็นผลมาจา�ปฎิบัติ�าร\nจะระเบิดอย่างรุน�รงหา�ไม่ได้ใช้ท่อน้ำ�ำจัดนีโอพลาสม์ออ�\nจา�เตาป�ิ�รณ์ให้ทันเวลา
+block.build-tower.description = สร้างสิ่ง�่อสร้างในระยะที่ถู�ทำลายให้ใหม่โดยอัตโนมัติ�ละช่วยเหลือยูนิตอื่นใน�าร�่อสร้าง
+block.regen-projector.description = ซ่อม�ซมสิ่ง�่อสร้างพันธมิตรในพื้นที่สี่เหลี่ยมของมันอย่างช้าๆ ต้องใช้ไฮโดรเจน
+block.reinforced-container.description = เ�็บไอเท็ม�ต่ละชนิดได้นิดหน่อย สามารถใช้ตัวถ่ายไอเท็มใน�ารดึงไอเท็มออ�มาได้ จะไม่เพิ่มความจุไอเท็มของ��น�ลาง
+block.reinforced-vault.description = เ�็บไอเท็ม�ต่ละชนิดได้จำนวนมา� สามารถใช้ตัวถ่ายไอเท็มใน�ารดึงไอเท็มออ�มาได้ จะไม่เพิ่มความจุไอเท็มของ��น�ลาง
+block.tank-fabricator.description = ผลิตยูนิตสเตลล์ ยูนิตที่ผลิตสามารถนำไปใช้ได้เลย หรือนำไปใส่ในเครื่อง�ปลงสภาพเพื่ออัปเ�รด
+block.ship-fabricator.description = ผลิตยูนิตเอลูด ยูนิตที่ผลิตสามารถนำไปใช้ได้เลย หรือนำไปใส่ในเครื่อง�ปลงสภาพเพื่ออัปเ�รด
+block.mech-fabricator.description = ผลิตยูนิตเมรุย ยูนิตที่ผลิตสามารถนำไปใช้ได้เลย หรือนำไปใส่ในเครื่อง�ปลงสภาพเพื่ออัปเ�รด
+block.tank-assembler.description = ประ�อบรถถังขนาดให�่จา�บล็อ��ละยูนิตที่ใส่เข้าไป สามารถเพิ่มระดับของยูนิตที่ส่งออ�มาได้โดย�ารเพิ่มหน่วยประ�อบ�าร
+block.ship-assembler.description = ประ�อบยานบินขนาดให�่จา�บล็อ��ละยูนิตที่ใส่เข้าไป สามารถเพิ่มระดับของยูนิตที่ส่งออ�มาได้โดย�ารเพิ่มหน่วยประ�อบ�าร
+block.mech-assembler.description = ประ�อบจั�ร�ลขนาดให�่จา�บล็อ��ละยูนิตที่ใส่เข้าไป สามารถเพิ่มระดับของยูนิตที่ส่งออ�มาได้โดย�ารเพิ่มหน่วยประ�อบ�าร
+block.tank-refabricator.description = พัฒนายูนิตรถถังที่ถู�ใส่เข้าไปให้�ลายเป็นยูนิตรุ่นที่สอง
+block.ship-refabricator.description = พัฒนายูนิตยานบินที่ถู�ใส่เข้าไปให้�ลายเป็นยูนิตรุ่นที่สอง
+block.mech-refabricator.description = พัฒนายูนิตจั�ร�ลที่ถู�ใส่เข้าไปให้�ลายเป็นยูนิตรุ่นที่สอง
+block.prime-refabricator.description = พัฒนายูนิตที่ถู�ใส่เข้าไปให้�ลายเป็นยูนิตรุ่นที่สาม
+block.basic-assembler-module.description = เพิ่มระดับ�ารประ�อบของเครื่องประ�อบเมื่อวางไว้ติด�ับเขต�ารประ�อบ�าร จำเป็นใช้พลังงาน สามารถใช้เป็นทางเข้าของสิ่งบรรทุ�ได้
+block.small-deconstructor.description = ลบทำลายสิ่ง�่อสร้าง�ละยูนิต คืนทรัพยา�รทั้งหมดที่ใช้ใน�าร�่อสร้าง
+block.reinforced-payload-conveyor.description = เคลื่อนย้ายสิ่งของบรรทุ�หนั� อย่างเช่นยูนิต
+block.reinforced-payload-router.description = �ย�สิ่งของบรรทุ�ออ�เป็นสามทิศทาง จะทำงานเป็นเครื่องคัด�ย�หา�ได้ตั้งตัว�รองเอาไว้
+block.payload-mass-driver.description = บล็อ�ขนส่งสิ่งบรรทุ�ทางไ�ล\nยิงสิ่งบรรทุ�ไปยังเครื่องโอนถ่ายสิ่งบรรทุ�อี�เครื่องที่เชื่อมต่อไว้
+block.large-payload-mass-driver.description = บล็อ�ขนส่งสิ่งบรรทุ�ทางไ�ล\nยิงสิ่งบรรทุ�ไปยังหอโอนถ่ายสิ่งบรรทุ�อี�เครื่องที่เชื่อมต่อไว้
+block.unit-repair-tower.description = ซ่อม�ซมยูนิตทั้งหมดที่อยู่ในรัศมีของมัน ต้องใช้โอโซนเพื่อทำงาน
+block.radar.description = ค่อยๆ เปิดเผยพื้นที่�ละยูนิตศัตรูในรัศมีขนาดให�่ ต้องใช้พลังงาน
+block.shockwave-tower.description = สร้างความเสียหาย�ละทำลาย�ระสุนของศัตรูในรัศมีของมัน ต้องใช้ไซยาโนเจนเพื่อทำงาน
+block.canvas.description = �สดงผลรูปวาดที่เรียบง่ายด้วยสีที่มีอยู่จำ�ัด สามารถปรับ�ต่งได้
+
+unit.dagger.description = ยิง�ระสุนธรรมดาใส่เป้าหมายศัตรู
+unit.mace.description = ยิงเปลวไฟเผาไหม้ใส่เป้าหมายศัตรู
+unit.fortress.description = ยิง�ระสุนปืนให�่พิสัยไ�ลไปที่เป้าหมายศัตรูพื้นดิน
+unit.scepter.description = ยิง�ระสุนชาร์จไฟฟ้าใส่เป้าหมายศัตรู �ระสุนจะระเบิดออ�เป็นพลังงานสายฟ้า สร้างความเสียหาย��่ยูนิตรอบข้าง
+unit.reign.description = ยิง�ระสุนเจาะทะลุขนาดให�่ใส่เป้าหมายศัตรู �ระสุนสามารถ�ระจายตัวไปโจมตีป้อมปืนที่หลบอยู่หลัง�ำ�พงได้
+unit.nova.description = ยิงเลเซอร์ที่สร้างความเสียหายให้�ับเป้าหมายศัตรู�ละซ่อม�ซมสิ่ง�่อสร้างของ\nพันธมิตร สามารถบินได้
+unit.pulsar.description = ยิงสายฟ้าที่สร้างความเสียหายให้เป้าหมาย�ับศัตรู�ละซ่อม�ซมสิ่ง�่อสร้างของ\nพันธมิตร สามารถบินได้
+unit.quasar.description = ยิงลำ�สงเลเซอร์เจาะทะลุที่สร้างความเสียหายให้�ับเป้าหมายศัตรู�ละซ่อม�ซม\nสิ่ง�่อสร้างของพันธมิตร มีโล่พลังงานเพื่อป้อง�ันร่าง�ายอันบอบบาง\nสามารถบินได้
+unit.vela.description = ยิงลำ�สงเลเซอร์ต่อเนื่องขนาดให�่ที่สร้างความเสียหายให้�ับเป้าหมายศัตรู ทำให้เ�ิดไฟไหม้ �ละซ่อม�ซมสิ่ง�่อสร้างของพันธมิตร\nสามารถบินได้
+unit.corvus.description = ยิงลำ�สงเลเซอร์พลังงานขนาดให�่ที่สร้างความเสียหายอย่างหนั�\nให้�ับเป้าหมายศัตรู�ละซ่อม�ซมสิ่ง�่อสร้างของพันธมิตร สามารถเหยียบข้าม�ำ�พงได้
+unit.crawler.description = ขยับเข้าหาเป้าหมายศัตรู�ล้วระเบิดตัวเอง เ�ิดเป็นระเบิดขนาดให�่
+unit.atrax.description = ยิงลู���้วหลอมละลายใส่เป้าหมายศัตรูพื้นดิน ทำให้เป้าหมายถู�เผาไหม้ สามารถเหยียบข้าม�ำ�พงได้
+unit.spiroct.description = ยิงเลเซอร์ลดทอน�ำลังใส่เป้าหมายศัตรู ซ่อม�ซมตัวเองไปในตัว สามารถเหยียบข้าม�ำ�พงได้
+unit.arkyid.description = ยิงเลเซอร์ลดทอน�ำลังจำนวนมา�ใส่เป้าหมายศัตรู ซ่อม�ซมตัวเองไปในตัว สามารถเหยียบข้าม�ำ�พงได้
+unit.toxopid.description = ยิงระเบิดไฟฟ้าขนาดให�่�ละเลเซอร์เจาะทะลุใส่เป้าหมายศัตรู สามารถเหยียบข้าม�ำ�พงได้
+unit.flare.description = ยิง�ระสุนธรรมดาไปที่เป้าหมายศัตรูพื้นดินที่อยู่ใ�ล้เคียง
+unit.horizon.description = ทิ้ง�ลุ่มระเบิดขนาดเล็�ใส่เป้าหมายศัตรูพื้นดิน
+unit.zenith.description = ระดมยิงขีปนาวุธติดตามตัวใส่เป้าหมายศัตรู
+unit.antumbra.description = สาด�ระสุนระเบิด�ละยิงขีปนาวุธติดตามตัวใส่เป้าหมายศัตรู
+unit.eclipse.description = ยิงเลเซอร์เจาะทะลุสอง�ระบอ��ละยิง�ระสุนระเบิดใส่เป้าหมายศัตรู
+unit.mono.description = ขุดทอง�ดง�ละตะ�ั่วให้โดยอัตโนมัติ �ล้วนำ�ลับเข้าไปยัง��น�ลาง
+unit.poly.description = สร้างสิ่ง�่อสร้างที่ถู�ทำลายให้ใหม่โดยอัตโนมัติ�ละคอยช่วยเหลือ\nยูนิตอื่นๆ ใน�าร�่อสร้าง
+unit.mega.description = ซ่อม�ซมสิ่ง�่อสร้างที่เสียหายให้โดยอัตโนมัติ สามารถบรรทุ�บล็อ��ละยูนิตพื้นดินขนาดเล็�ได้
+unit.quad.description = ทิ้งระเบิดขนาดให�่ลงบนเป้าหมายพื้นดิน ซ่อม�ซมสิ่ง�่อสร้างของพันธมิตร�ละสร้างความเสียหาย��่เป้าหมายศัตรู สามารถบรรทุ�ยูนิตพื้นดินขนาด�ลางได้
+unit.oct.description = ป�ป้องพันธมิตรที่อยู่ใ�ล้เคียงด้วยโล่พลังงาน สามารถบรรทุ�ยูนิตภาคพื้นดินได้�ทบทุ�ตัว
+unit.risso.description = ยิงขีปนาวุธ�ละสาด�ระสุนจำนวนมา�ใส่เป้าหมายศัตรู
+unit.minke.description = ยิงทั้ง�ระสุนหนั��ละ�ระสุนธรรมดาไปยังเป้าหมายศัตรูพื้นดิน
+unit.bryde.description = ยิง�ระสุนปืนให�่พิสัยไ�ล�ละขีปนาวุธติดตามตัวใส่เป้าหมายศัตรู
+unit.sei.description = ยิงขีปนาวุธติดตามตัว�ละ�ระสุนเจาะเ�ราะใส่เป้าหมายศัตรู
+unit.omura.description = ยิงลำ�สงปืนรางไฟฟ้าเจาะทะลุระยะไ�ลใส่เป้าหมายศัตรู สร้างยูนิต�ฟลร์
+unit.alpha.description = ป�ป้อง��น�ลางชาร์ดจา�ศัตรู สร้างสิ่งต่างๆ
+unit.beta.description = ป�ป้อง��น�ลางฟาวน์เดชั่นจา�ศัตรู สร้างสิ่งต่างๆ
+unit.gamma.description = ป�ป้อง��น�ลางนิวเคลียสจา�ศัตรู สร้างสิ่งต่างๆ
+unit.retusa.description = ยิงตอร์ปิโดติดตามตัวใส่ศัตรูที่อยู่ใ�ล้เคียง �ละซ่อม�ซมยูนิตพันธมิตรที่อยู่ใ�ล้เคียง
+unit.oxynoe.description = ยิงเปลวไฟเผาไหม้ใส่ศัตรูที่อยู่ใ�ล้เคียง�ละซ่อม�ซมสิ่ง�่อสร้างของพันธมิตร\nทำลาย�ระสุนที่�ำลังเข้ามาด้วยปืนป้อง�ันจุด\nให้สถานะ[accent]โอเวอร์คล็อ�[]��่พันธมิตรรอบข้าง ทำให้ยิงเร็ว�ละ�รงขึ้น
+unit.cyerce.description = ยิงขีปนาวุธพลาสม่าติดตามตัวเป็น�ระจุ�ระเบิดใส่ศัตรู\nซ่อม�ซมยูนิตพันธมิตรที่อยู่ใ�ล้เคียงด้วยปืนซ่อม�ซม
+unit.aegires.description = ช็อตทุ�ๆ สิ่ง�่อสร้าง�ละยูนิตศัตรูที่เข้ามาในสนามพลังงานของมัน\nด้วยสายฟ้าฟาด ซ่อม�ซมสิ่ง�่อสร้าง�ละยูนิตพันธมิตร
+unit.navanax.description = ยิงลู�ระเบิดคลื่นชีพจร�ม่เหล็�ขนาดให�่ สร้างความเสียหายอย่างหนั�ให้�ับเครือข่ายพลังงานศัตรู\n�ละซ่อม�ซมสิ่ง�่อสร้างของพันธมิตร\nหลอมละลายศัตรูที่อยู่ใ�ล้เคียงด้วยป้อมปืนเลเซอร์อัตโนมัติสี่ป้อม
+
+#Erekir
+unit.stell.description = ยิง�ระสุนธรรมดาใส่เป้าหมายศัตรู
+unit.locus.description = สลับยิง�ระสุนเลเซอร์ใส่เป้าหมายศัตรู
+unit.precept.description = ยิง�ระจุ��ระสุนเจาะทะลุใส่เป้าหมายศัตรู
+unit.vanquish.description = ยิง�ระสุน�ต��ระจายเจาะทะลุขนาดให�่ใส่เป้าหมายศัตรู ล้อขนาดยั�ษ์สามารถเหยียบทับสร้างความเสียหายให้�ับสิ่ง�่อสร้างศัตรูได้
+unit.conquer.description = ระดมสาด�ระสุนเจาะทะลุใน�นวตรงใส่เป้าหมายศัตรู ล้อขนาดยั�ษ์สามารถเหยียบทับสร้างความเสียหายให้�ับสิ่ง�่อสร้างศัตรูได้
+unit.merui.description = ยิง�ระสุนปืนให�่พิสัยไ�ลใส่เป้าหมายศัตรูพื้นดิน สามารถเหยียบข้าม�ำ�พงได้
+unit.cleroi.description = ยิง�ระสุนหนั�คู่ใส่เป้าหมายศัตรู ทำลาย�ระสุนของศัตรูด้วยปืนป้อง�ันจุด สามารถเหยียบข้าม�ำ�พงได้
+unit.anthicus.description = ยิงขีปนาวุธติดตามตัวพิสัยไ�ลใส่เป้าหมายศัตรู สามารถเหยียบข้าม�ำ�พงได้
+unit.tecta.description = ยิง�ระสุนพลาสม่าติดตามตัวใส่เป้าหมายศัตรู ป้อง�ันตัวเองด้วยโล่พลังงาน�บบโค้ง สามารถเหยียบข้าม�ำ�พงได้
+unit.collaris.description = ยิง�ระสุนปืนให�่�ต��ระจายพิสัยไ�ลใส่เป้าหมายศัตรู สามารถเหยียบข้าม�ำ�พงได้
+unit.elude.description = ยิง�ระสุนติดตามตัวคู่ใส่เป้าหมายศัตรู สามารถลอยตัวเหนือผิวน้ำได้
+unit.avert.description = ยิง�ระสุนหมุนวนคู่ใส่เป้าหมายศัตรู
+unit.obviate.description = ยิงลู���้วสายฟ้าหมุนวนใส่เป้าหมายศัตรู
+unit.quell.description = ยิงจรวดติดตามตัวใส่เป้าหมายศัตรูพื้นดิน ยับยั้งเครื่องซ่อม�ซมสิ่ง�่อสร้างของศัตรู
+unit.disrupt.description = ยิงจรวดยับยั้งติดตามตัวใส่เป้าหมายศัตรูพื้นดิน ยับยั้งเครื่องซ่อม�ซมสิ่ง�่อสร้างของศัตรู
+unit.evoke.description = สร้างสิ่งต่างๆ เพื่อป�ป้อง��น�ลางบาสเชี่ยนจา�ศัตรู\nซ่อม�ซมสิ่ง�่อสร้างด้วยลำ�สงฟื้นฟู
+unit.incite.description = สร้างสิ่งต่างๆ เพื่อป�ป้อง��น�ลางซิทาเดลจา�ศัตรู\nซ่อม�ซมสิ่ง�่อสร้างด้วยลำ�สงฟื้นฟู
+unit.emanate.description = สร้างสิ่งต่างๆ เพื่อป�ป้อง��น�ลางอะโครโพลิสจา�ศัตรู\nซ่อม�ซมสิ่ง�่อสร้างด้วยลำ�สงฟื้นฟู
+
+lst.read = อ่านเลขจา�เซลล์ความจำที่เชื่อมต่อไว้
+lst.write = เขียนเลขไปยังเซลล์ความจำที่เชื่อมต่อไว้
+lst.print = เพิ่มข้อความไปยังคิวข้อความ\nข้อความจะยังไม่�สดงจน�ว่าจะใช้คำสั่ง [accent]Print Flush[]
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = �ทนที่ข้อความตัว�ทนถัดไปในบัฟเฟอร์ข้อความด้วยค่า\nจะไม่ทำอะไรหา�รูป�บบข้อความ�ทนที่นั้นไม่ถู�ต้อง\nรูป�บบข้อความ�ทนที่: "{[accent]ตัวเลข 0-9[]}"\nตัวอย่าง:\n[accent]print "ทดสอบ {0}"\nformat "สวัสดี"
+lst.draw = เพิ่มรูปไปยังคิว�ารวาด\nภาพจะยังไม่�สดงจน�ว่าจะใช้คำสั่ง [accent]Draw Flush[]
+lst.drawflush = ปล่อยคิว [accent]Draw[] ไปยังหน้าจอลอจิ�ที่เชื่อมต่อไว้
+lst.printflush = ปล่อยคิว [accent]Print[] ไปยังตัวเ�็บข้อความที่เชื่อมต่อไว้
+lst.getlink = รับลิงค์จา�ตัวประมวลผลตามดัชนี เริ่มต้นที่ 0
+lst.control = ควบคุมสิ่ง�่อสร้าง
+lst.radar = เรดาร์หายูนิตที่อยู่รอบๆ สิ่ง�่อสร้าง โดยระยะ�ารตรวจสอบขึ้นอยู่�ับระยะของสิ่ง�่อสร้าง
+lst.sensor = รับข้อมูลจา�สิ่ง�่อสร้างหรือยูนิต
+lst.set = ตั้งตัว�ปร
+lst.operation = ทำ�ารคำนวณ�ับ 1-2 ตัว�ปร
+lst.end = ย้อน�ลับไปยังด้านบนสุดของชุดคำสั่ง
+lst.wait = รอเวลาเป็นวินาที
+lst.stop = หยุดยั้ง�ารทำงานของตัวประมวลผล
+lst.lookup = ค้นหาชนิดไอเท็ม/ของเหลว/ยูนิต/บล็อ�ตาม ID\nสามารถหาจำนวนนับทั้งหมดของ�ต่ละชนิดได้ด้วย:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = ข้ามไปยังคำสั่งต่างๆ โดยสามารถตั้งเงื่อนไขได้
+lst.unitbind = เลือ�ยูนิตถัดไปเป็นชนิด �ละเ�็บค่าไว้ในตัว�ปร [accent]@unit[]
+lst.unitcontrol = ควบคุมยูนิตที่เลือ�ไว้
+lst.unitradar = ค้นหายูนิตรอบๆ ยูนิตที่เลือ�ไว้
+lst.unitlocate = ค้นหาตำ�หน่ง/สิ่ง�่อสร้างเฉพาะอย่างที่ใด�็ได้บน�ผนที่\nต้องมียูนิตที่เลือ�ไว้
+lst.getblock = รับข้อมูลของช่องที่ตำ�หน่งใดๆ
+lst.setblock = ปรับ�ต่งข้อมูลของช่องที่ตำ�หน่งใดๆ
+lst.spawnunit = สร้างยูนิตมาที่ตำ�หน่งที่�ำหนดไว้
+lst.applystatus = ใส่หรือล้างเอฟเฟ�ต์สถานะจา�ยูนิต
+lst.weathersense = ตรวจสอบว่าสภาพอา�าศใดๆ �ำลังทำงานอยู่หรือไม่
+lst.weatherset = ตั้งค่าสถานะในปัจจุบันของสภาพอา�าศใดๆ
+lst.spawnwave = จำลองคลื่นที่ตำ�หน่งใดๆ
+lst.explosion = สร้างระเบิดที่ตำ�หน่งใดๆ
+lst.setrate = ตั้งค่าความเร็ว�ารสั่งเป็นคำสั่งใน คำสั่ง/ติ�
+lst.fetch = ค้นหายูนิต ��น�ลาง ผู้เล่น หรือสิ่ง�่อสร้างตามดัชนี\nดัชนีเริ่มที่ 0 �ละจบที่ค่าที่จะส่ง�ลับ
+lst.packcolor = �พ็ค [0, 1] ส่วนประ�อบ RGBA มาเป็นเลขบรรทัดเดียวสำหรับ�ารวาดหรือ�ารตั้งค่า�ฎ
+lst.setrule = ตั้งค่า�ฎของเ�ม
+lst.flushmessage = �สดงข้อความบนหน้าจอจา�บัฟเฟอร์ข้อความ\nถ้าตัว�ปรผลลัพธ์ออ�มาเป็น [accent]@wait[]\nจะรอจน�ว่าข้อความ�่อนหน้าจะเสร็จสิ้น\nนอ�จา�นั้น จะส่งออ�ว่า�าร�สดงผลข้อความสำเร็จหรือไม่
+lst.cutscene = ควบคุมมุม�ล้องของผู้เล่น
+lst.setflag = เซ็ตธงทั่วโล�ที่ตัวประมวลผลทุ�ตัวสามารถอ่านค่าได้
+lst.getflag = เช็�ว่าธงทั่วโล�นั้นได้ถู�เซ็ตอยู่รึเปล่า
+lst.setprop = ตั้งค่าคุณสมบัติของยูนิต�ละสิ่ง�่อสร้าง
+lst.effect = เส�เอฟเฟ�ต์อนุภาค
+lst.sync = ซิงค์หนึ่งตัว�ปรทั่วทั้งเครือข่าย\nสามารถเรีย�ใช้คำสั่งได้�ค่ 10 ครั้งต่อวินาทีอย่างมา�
+lst.playsound = เล่นเสียง\nระดับเสียง�ละ�าร�พนสามารถใช้เป็นค่าสา�ลได้ หรือคำนวณเอาจา�ตำ�หน่ง�็ได้
+lst.makemarker = สร้างเครื่องหมายลอจิ�ใหม่ขึ้นมาใน�มพ\nจะต้องเพิ่ม ID เข้าไปเพื่อบ่งชี้เครื่องหมายนี้\nเครื่องหมายจำ�ัดได้�ค่ 20,000 ต่อ�มพในตอนนี้
+lst.setmarker = ตั้งค่าคุณสมบัติให้�ับเครื่องหมาย\nID ของเครื่องหมายที่ใช้จะต้องเป็น ID เดียว�ัน�ับในคำสั่ง Make Marker\nค่า[accent]ว่างเปล่า[]จะถู�ข้าม
+lst.localeprint = เพิ่มค่าชุดภาษาท้องถิ่นของ�มพลงไปในบัฟเฟอร์ข้อความเพื่อตั้งค่าชุดภาษาของ�มพในตัว��้ไข ให้เปิด [accent]ข้อมูล�มพ > ชุดภาษาท้องถิ่น[].\nถ้าหา�ผู้เล่นอยู่ในมือถือ ให้ลองปริ้นค่าโดยลงท้ายด้วย ".mobile" �่อน
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = ค่าว่างเปล่า
+lglobal.@pi = ค่าคงตัวทางคณิตศาสตร์ pi (3.141...)
+lglobal.@e = ค่าคงตัวทางคณิตศาสตร์ e (2.718...)
+lglobal.@degToRad = คูณค่าด้วยเลขตัวนี้เพื่อ�ปลงองศาเป็นเรเดียน
+lglobal.@radToDeg = คูณค่าด้วยเลขตัวนี้เพื่อ�ปลงเรเดียนเป็นองศา
+lglobal.@time = ระยะเวลาที่เล่นไปของเซฟนี้ ในหน่วยมิลิวินาที
+lglobal.@tick = ระยะเวลาที่เล่นไปของเซฟนี้ ในหน่วยติ� (1 วินาที = 60 ติ�)
+lglobal.@second = ระยะเวลาที่เล่นไปของเซฟนี้ ในหน่วยวินาที
+lglobal.@minute = ระยะเวลาที่เล่นไปของเซฟนี้ ในหน่วยนาที
+lglobal.@waveNumber = ลำดับคลื่นในปัจจุบัน หา�คลื่นเปิดใช้งาน
+lglobal.@waveTime = เวลานับถอยหลังของคลื่นถัดไป ในหน่วยวินาที
+lglobal.@mapw = ความ�ว้างของ�มพ ในหน่วยช่อง
+lglobal.@maph = ความสูงของ�มพ ในหน่วยช่อง
+lglobal.sectionMap = �มพ
+lglobal.sectionGeneral = ทั่วไป
+lglobal.sectionNetwork = เครือข่าย/�ั่งผู้เล่น [เฉพาะตัวประมวลผลโล�]
+lglobal.sectionProcessor = ตัวประมวลผล
+lglobal.sectionLookup = �ารค้นหา
+lglobal.@this = บล็อ�ลอจิ�ที่�ำลังรันโค้ดนี้อยู่
+lglobal.@thisx = พิ�ัด X ของบล็อ�ที่�ำลังรันโค้ดนี้อยู่
+lglobal.@thisy = พิ�ัด Y ของบล็อ�ที่�ำลังรันโค้ดนี้อยู่
+lglobal.@links = จำนวนบล็อ�ทั้งหมดที่เชื่อมต่อ�ับตัวประมวลผลนี้
+lglobal.@ipt = ความเร็ว�ารสั่ง�ารของตัวประมวลผลนี้ ในหน่วยคำสั่งต่อติ� (60 ติ� = 1 วินาที)
+lglobal.@unitCount = จำนวนเนื้อหาของชนิดยูนิตทั้งหมดที่อยู่ในเ�ม ใช้�ับคำสั่ง Lookup
+lglobal.@blockCount = จำนวนเนื้อหาของชนิดบล็อ�ทั้งหมดที่อยู่ในเ�ม ใช้�ับคำสั่ง Lookup
+lglobal.@itemCount = จำนวนเนื้อหาของชนิดไอเท็มทั้งหมดที่อยู่ในเ�ม ใช้�ับคำสั่ง Lookup
+lglobal.@liquidCount = จำนวนเนื้อหาของชนิดของเหลวทั้งหมดที่อยู่ในเ�ม ใช้�ับคำสั่ง Lookup
+lglobal.@server = เป็นจริงหา�โค้ด�ำลังรันบนเซิร์ฟเวอร์หรือในโหมดผู้เล่นคนเดียว นอ�นั้นจะเป็นเท็จ
+lglobal.@client = เป็นจริงหา�โค้ด�ำลังรันบน�ั่งไคลเอนต์ที่เชื่อมต่อ�ับเซิร์ฟเวอร์
+lglobal.@clientLocale = ค่าภาษาของ�ั่งไคลเอนต์ที่�ำลังรันคำสั่ง ย�ตัวอย่างเช่น: th_TH
+lglobal.@clientUnit = หน่วยของ�ั่งไคลเอนต์ที่�ำลังรันคำสั่ง
+lglobal.@clientName = ชื่อผู้เล่นของ�ั่งไคลเอนต์ที่�ำลังรันคำสั่ง
+lglobal.@clientTeam = ID ของทีมของ�ั่งไคลเอนต์ที่�ำลังรันคำสั่ง
+lglobal.@clientMobile = เป็นจริงหา��ั่งไคลเอนต์ที่�ำลังรันคำสั่งบนอุป�รณ์มือถือ นอ�นั้นจะเป็นเท็จ
+
+logic.nounitbuild = [red]ไม่อนุ�าตให้ใช้ลอจิ�ควบคุมให้ยูนิตสร้างที่นี่
+
+lenum.type = ชนิดของสิ่ง�่อสร้าง/ยูนิต\nอย่างเช่น เร้าเตอร์ทุ�ตัวจะส่ง�ลับว่า [accent]@router[]\nไม่ใช่ค่าสตริง
+lenum.shoot = ยิงไปที่ตำ�หน่งเป้าหมาย
+lenum.shootp = ยิงเป้าหมายโดยมี�ารคำนวณ�ารยิง
+lenum.config = �าร�ำหนดค่าของสิ่ง�่อสร้าง เช่น ไอเท็มของเครื่องคัด�ย�
+lenum.enabled = ว่าบล็อ�เปิดใช้งาน/ทำงานอยู่หรือเปล่า
+laccess.currentammotype = ประเภทของ�ระสุนไอเท็ม/ของเหลวในปัจจุบันของป้อมปืน
+
+laccess.color = สีของตัวเปล่ง�สง
+laccess.controller = ผู้ควบคุมยูนิต ถ้าผู้ควบคุมคือตัวประมวลผล จะส่ง�ลับค่า processor\nนอ�นั้น จะส่ง�ลับค่าตัวยูนิตเอง
+laccess.dead = ว่าสิ่ง�่อสร้าง/ยูนิตนั้นตาย�ล้วหรือใช้งานไม่ได้�ล้ว
+laccess.controlled = จะส่ง�ลับ:\n[accent]@ctrlProcessor[] ถ้าผู้ควบคุมคือตัวประมวลผลลอจิ�\n[accent]@ctrlPlayer[] ถ้าสิ่ง�่อสร้าง/ยูนิตถู�ควบคุมโดยผู้เล่น\n[accent]@ctrlCommand[] ถ้ายูนิตถู�สั่ง�ารโดยผู้เล่นอยู่\nนอ�นั้นจะเป็น 0
+laccess.progress = ความคืบหน้า�ารดำเนิน�ารจา� 0 ถึง 1\nจะส่ง�ลับค่า�ารผลิต �ารรีโหลดของป้อมปืน หรือความคืบหน้าใน�ารสร้างสิ่ง�่อสร้าง
+laccess.speed = ความเร็วสูงสุดของยูนิตในหน่วย ช่อง/วินาที
+laccess.id = ID ของยูนิต/บล็อ�/ไอเท็ม/ของเหลว\nคำสั่งนี้จะตรง�ันข้าม�ับคำสั่ง lookup
+
+lcategory.unknown = ไม่ทราบ
+lcategory.unknown.description = คำสั่งที่ไม่อยู่ในหมวดหมู่ใดๆเลย
+lcategory.io = นำเข้า & ส่งออ�
+lcategory.io.description = เปลี่ยนค่าบล็อ�ความจำ�ละนำเข้าหรือส่งออ�คำสั่งจา�ตัวประมวลผล
+lcategory.block = ควบคุมบล็อ�
+lcategory.block.description = ป�ิสัมพันธ์�ับบล็อ�
+lcategory.operation = ป�ิบัติ�าร
+lcategory.operation.description = ป�ิบัติ�ารทางลอจิ�
+lcategory.control = ควบคุมลำดับคำสั่ง
+lcategory.control.description = ควบคุมลำดับ�ารสั่ง�ารของคำสั่ง
+lcategory.unit = ควบคุมยูนิต
+lcategory.unit.description = ควบคุมยูนิตด้วยคำสั่งต่างๆ
+lcategory.world = โล�
+lcategory.world.description = ควบคุมสภาวะ�ละพฤติ�รรมของโล�
+
+graphicstype.clear = เติมจอ�สดงผลด้วยสี
+graphicstype.color = ตั้งค่าสีสำหรับ�ารวาดครั้งต่อไป
+graphicstype.col = เหมือน�ับคำสั่ง color �ต่มี�าร�พ็ค\nสีที่�พ็คจะถู�เขียนเป็นรหัส�านสิบห��ละจะมีอั�ษรขึ้นต้นเป็น [accent]%[]\nตัวอย่าง: [accent]%ff0000[] (สี�ดง)
+graphicstype.stroke = ตั้งค่าความ�ว้างของเส้น
+graphicstype.line = วาดส่วนของเส้นตรง
+graphicstype.rect = เติมรูปเหลี่ยม
+graphicstype.linerect = วาดโครงร่างสี่เหลี่ยม
+graphicstype.poly = เติมรูปหลายเหลี่ยมป�ติ
+graphicstype.linepoly = วาดโครงร่างรูปหลายเหลี่ยมป�ติ
+graphicstype.triangle = เติมสามเหลี่ยม
+graphicstype.image = วาดรูปสิ่งต่างๆ \nตัวอย่างเช่น: [accent]@router[] หรือ [accent]@dagger[]
+graphicstype.print = วาดข้อความจา�บัฟเฟอร์ข้อความ\nใช้ตัวอั�ษร ASCII ได้เท่านั้น\nจะเคลียร์บัฟเฟอร์ข้อความ
+
+lenum.always = เป็นจริงเสมอ
+lenum.idiv = หารจำนวนเต็ม
+lenum.div = หาร\nจะส่ง�ลับ[accent]ค่าว่าง[] หา�หารศูนย์
+lenum.mod = โมดูโล่ (หารหาเศษ)
+lenum.equal = เท่า�ับ �บบบังคับประเภท\nสิ่งที่ไม่ใช่ค่าว่างเมื่อเทียบ�ับตัวเลขจะส่ง�ลับค่า 1 นอ�นั้นจะส่ง�ลับค่า 0
+lenum.notequal = ไม่เท่า�ับ บังคับประเภท
+lenum.strictequal = เท่า�ับที่เข้มงวด ไม่บังคับประเภท\nสามารถใช้ตรวจสอบหา[accent]ค่าว่าง[]ได้
+lenum.shl = เลื่อนบิตไปทางซ้าย
+lenum.shr = เลื่อนบิตไปทางขวา
+lenum.or = หรือ �บบบิต
+lenum.land = �ละ เชิงตรร�ะ
+lenum.and = �ละ �บบบิต
+lenum.not = �ลับด้าน �บบบิต
+lenum.xor = �ย�เฉพาะ �บบบิต
+
+lenum.min = เทียบต่ำสุดของสองหมายเลข
+lenum.max = เทียบสูงสุดของสองหมายเลข
+lenum.angle = มุมของเว�เตอร์ หน่วยเป็นองศา
+lenum.anglediff = ระยะทางสัมบูรณ์ระหว่างมุมสองมุม หน่วยเป็นองศา
+lenum.len = ความยาวของเว�เตอร์
+
+lenum.sin = ไซน์ หน่วยเป็นองศา
+lenum.cos = โคไซน์ หน่วยเป็นองศา
+lenum.tan = �ทนเจนต์ หน่วยเป็นองศา
+
+lenum.asin = อาร์คไซน์ หน่วยเป็นองศา
+lenum.acos = อาร์คโคไซน์ หน่วยเป็นองศา
+lenum.atan = อาร์ค�ทนเจนต์ หน่วยเป็นองศา
+
+#not a typo, look up 'range notation'
+lenum.rand = สุ่มทศนิยมในช่วง [0, ค่า)
+lenum.log = ลอ�าริทึมธรรมชาติ (ln)
+lenum.log10 = ลอ�าริทึม�านสิบ
+lenum.noise = นอยส์ซิมเพล็�ซ์สองมิติ
+lenum.abs = ค่าสัมบูรณ์
+lenum.sqrt = ส�ควร์รูท
+
+lenum.any = ยูนิตใดๆ
+lenum.ally = ยูนิตพันธมิตร
+lenum.attacker = ยูนิตที่มีอาวุธ
+lenum.enemy = ยูนิตศัตรู
+lenum.boss = ยูนิตผู้พิทั�ษ์
+lenum.flying = ยูนิตอา�าศ
+lenum.ground = ยูนิตพื้นดิน
+lenum.player = ยูนิตที่ถู�ควบคุมโดยผู้เล่น
+
+lenum.ore = �ร่ตามพื้นต่างๆ
+lenum.damaged = สิ่ง�่อสร้างที่เสียหาย
+lenum.spawn = จุดเ�ิดของศัตรู\nอาจเป็น��น�ลางหรือตำ�หน่ง
+lenum.building = สิ่ง�่อสร้างเฉพาะ�ลุ่ม
+
+lenum.core = ��น�ลาง
+lenum.storage = บล็อ�เ�็บของ เช่น ตู้นิรภัย
+lenum.generator = สิ่ง�่อสร้างที่ผลิตพลังงาน
+lenum.factory = สิ่ง�่อสร้างที่ผลิตทรัพยา�ร
+lenum.repair = สิ่ง�่อสร้างที่ซ่อม�ซมยูนิต
+lenum.battery = �บตเตอรี่ใดๆ
+lenum.resupply = จุดเติม�ระสุน\nจะใช้งานได้ต่อเมื่อ [accent]"ยูนิตต้องใช้�ระสุน"[] เปิดอยู่
+lenum.reactor = เตาป�ิ�รณ์ใดๆ
+lenum.turret = ป้อมปืนใดๆ
+
+sensor.in = สิ่ง�่อสร้าง/ยูนิตให้ตรวจวัด
+
+radar.from = สิ่ง�่อสร้างที่จะใช้ใน�ารค้นหา\nระยะเซนเซอร์จะขึ้นอยู่�ับระยะของสิ่ง�่อสร้าง
+radar.target = ตัว�รองใน�ารหายูนิต
+radar.and = ตัว�รองเพิ่มเติม
+radar.order = เรียงลำดับคำสั่ง\nใส่ค่า 0 เพื่อเรียงย้อน�ลับ
+radar.sort = เมตริ�เพื่อจัดเรียงผลลัพย์ตาม
+radar.output = ตัว�ปรของยูนิตที่มองหา
+
+unitradar.target = ตัว�รองใน�ารหายูนิต
+unitradar.and = ตัว�รองเพิ่มเติม
+unitradar.order = เรียงลำดับคำสั่ง\nใส่ค่า 0 เพื่อเรียงย้อน�ลับ
+unitradar.sort = เมตริ�เพื่อจัดเรียงผลลัพธ์ตาม
+unitradar.output = ตัว�ปรของยูนิตที่มองหา
+
+control.of = สิ่ง�่อสร้างให้ควบคุม
+control.unit = ยูนิต/สิ่ง�่อสร้างที่จะเล็ง
+control.shoot = ว่าจะยิงหรือไม่
+
+unitlocate.enemy = ว่าจะหาสิ่ง�่อสร้างศัตรูหรือไม่
+unitlocate.found = ตัว�ปรว่าพบเจอหรือไม่\nจะส่ง�ลับว่า true หา�พบสิ่ง�่อสร้าง
+unitlocate.building = ตัว�ปรสิ่ง�่อสร้างที่มองหา
+unitlocate.outx = ตัว�ปรพิ�ัด X
+unitlocate.outy = ตัว�ปรพิ�ัด Y
+unitlocate.group = �ลุ่มสิ่ง�่อสร้างที่มองหา
+playsound.limit = หา�จริง จะหยุดยั้งไม่ให้เล่นเสียงนี้\nถ้าหา�มันถู�เล่นไป�ล้วในเฟรมเดียว�ัน
+
+lenum.idle = หยุดขยับ �ต่ยังคงขุด/�่อสร้าง\nสถานะเริ่มต้นของยูนิต
+lenum.stop = หยุดขยับ/ขุด/�่อสร้าง
+lenum.unbind = ย�เลิ��ารควบคุมลอจิ�ทั้งหมด\nเปลี่ยนไปใช้ AI ธรรมดาต่อ
+lenum.move = ขยับไปที่ตำ�หน่งที่�ำหนดไว้
+lenum.approach = เข้าใ�ล้ตำ�หน่งโดย�ำหนดระยะห่าง
+lenum.pathfind = ขยับไปที่ตำ�หน่งที่�ำหนดไว้ โดยมี�ารคำนวณเพื่อเลี่ยงสิ่ง�ีดขวาง
+lenum.autopathfind = คำนวณเส้นทางที่ใ�ล้ที่สุด�ล้วขยับไปหา��น�ลางหรือจุดเ�ิดของศัตรูโดยอัตโนมัติ\nเหมือน�ัน�ับ�ารคำนวณเส้นทางของคลื่นศัตรู
+lenum.target = ยิงไปที่ตำ�หน่งเป้าหมาย
+lenum.targetp = ยิงไปที่เป้าหมาย โดยมี�ารคำนวณความเร็ว
+lenum.itemdrop = ปล่อยไอเท็ม
+lenum.itemtake = หยิบไอเท็มจา�สิ่ง�่อสร้าง
+lenum.paydrop = วางสิ่งที่บรรทุ�อยู่
+lenum.paytake = หยิบสิ่งบรรทุ� ณ จุดที่อยู่
+lenum.payenter = เข้าไป/ลงจอดบนบล็อ�บรรทุ� ณ จุดที่ยูนิตอยู่
+lenum.flag = ปั�ธงยูนิตเป็นหมายเลข
+lenum.mine = ขุดที่ตำ�หน่งเป้าหมาย
+lenum.build = สร้างสิ่ง�่อสร้าง
+lenum.getblock = ดึงข้อมูลสิ่ง�่อสร้าง�ละประเภทของสิ่ง�่อสร้างที่ตำ�หน่งเป้าหมาย\nยูนิตต้องอยู่ในระยะของตำ�หน่ง\nบล็อ�ตันที่ไม่ใช่สิ่ง�่อสร้างจะมีชนิดเป็น [accent]@solid[]
+lenum.within = ตรวจสอบว่ายูนิตนั้นอยู่ในระยะหรือไม่
+lenum.boost = เริ่ม/หยุด�ารบูสต์
+lenum.flushtext = ระบายเนื้อหาของบัฟเฟอร์ข้อความลงสู่เครื่องหมาย ถ้ามี\nถ้า fetch ถู�ตั้งเป็นจริง จะพยายามดึงค่าจา�ค่าชุดภาษาท้องถิ่นหรือชุดภาษาในเ�ม
+lenum.texture = ชื่อเท�เจอร์ตรงมาจา��อตลาสเท�เจอร์ของเ�ม (ใช้�ารตั้งชื่อ�บบ kebab-case)\nถ้า printFlush ถู�ตั้งเป็นจริง จะใส่เนื้อหาของบัฟเฟอร์ข้อความไปในช่องข้อความ
+lenum.texturesize = ขนาดของเท�เจอร์ในหน่วยช่อง หา�ค่าเป็นศูนย์จะปรับขนาดของเครื่องหมายเป็นขนาดป�ติ
+lenum.autoscale = ว่าจะให้เครื่องหมายเพิ่มลดขนาดตามระดับ�ารซูมของผู้เล่นหรือไม่
+lenum.posi = ตำ�หน่งในดัชนี ใช้สำหรับเครื่องหมายเส้นตรง�ละสี่เหลี่ยมที่มีดัชนีศูนย์เป็นตำ�หน่งเริ่มต้น
+lenum.uvi = ตำ�หน่งของเท�เจอร์ในคาบระหว่างศูนย์ถึงหนึ่ง ใช้สำหรับเครื่องหมายสี่เหลี่ยม
+lenum.colori = ค่าสีในดัชนี ใช้สำหรับเครื่องหมายเส้นตรง�ละสี่เหลี่ยมที่มีดัชนีศูนย์เป็นสีเริ่มต้น
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 8b9f3a97aa..1e094fe79f 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -13,14 +13,17 @@ link.google-play.description = Google Play magaza sayfasi
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Orjinal Mindustry Bilgilendirme Sayfasi
 link.suggestions.description = Suggest new features
+link.bug.description = Found one? Report it here
+linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 linkfail = Link Acilamadi!\nLink sizin icin kopyalandi.
 screenshot = Screenshot saved to {0}
 screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Cekirdegin yok edildi.
+gameover.disconnect = Disconnect
 gameover.pvp = The[accent] {0}[] team is victorious!
+gameover.waiting = [accent]Waiting for next map...
 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
@@ -37,10 +40,23 @@ be.updating = Updating...
 be.ignore = Ignore
 be.noupdates = No updates found.
 be.check = Check for updates
+mods.browser = Mod Browser
+mods.browser.selected = Selected mod
+mods.browser.add = Install
+mods.browser.reinstall = Reinstall
+mods.browser.view-releases = View Releases
+mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published.
+mods.browser.latest = <Latest>
+mods.browser.releases = Releases
+mods.github.open = Repo
+mods.github.open-release = Release Page
+mods.browser.sortdate = Sort by recent
+mods.browser.sortstars = Sort by stars
 
 schematic = Schematic
 schematic.add = Save Schematic...
 schematics = Schematics
+schematic.search = Search schematics...
 schematic.replace = A schematic by that name already exists. Replace it?
 schematic.exists = A schematic by that name already exists.
 schematic.import = Import Schematic...
@@ -53,18 +69,26 @@ schematic.shareworkshop = Share on Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
 schematic.saved = Schematic saved.
 schematic.delete.confirm = This schematic will be utterly eradicated.
-schematic.rename = Rename Schematic
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blocks
 schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
-
-stat.wave = Waves Defeated:[accent] {0}
-stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
-stat.built = Buildings Built:[accent] {0}
-stat.destroyed = Buildings Destroyed:[accent] {0}
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
-stat.delivered = Resources Launched:
-stat.playtime = Time Played:[accent] {0}
-stat.rank = Final Rank: [accent]{0}
+schematic.tags = Tags:
+schematic.edittags = Edit Tags
+schematic.addtag = Add Tag
+schematic.texttag = Text Tag
+schematic.icontag = Icon Tag
+schematic.renametag = Rename Tag
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = Delete this tag completely?
+schematic.tagexists = That tag already exists.
+stats = Stats
+stats.wave = Waves Defeated
+stats.unitsCreated = Units Created
+stats.enemiesDestroyed = Enemies Destroyed
+stats.built = Buildings Built
+stats.destroyed = Buildings Destroyed
+stats.deconstructed = Buildings Deconstructed
+stats.playtime = Time Played
 
 globalitems = [accent]Global Items
 map.delete = Su haritayi silmek istediginden emin misin? "[accent]{0}[]"?
@@ -74,12 +98,15 @@ level.mode = Oyun Modu:
 coreattack = < Cekirdek Saldiri altinda! >
 nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
 database = Core Database
+database.button = Database
 savegame = Oyunu kaydet
 loadgame = Devam et
 joingame = Oyuna katil
 customgame = Ozel oyun
 newgame = New Game
 none = <none>
+none.found = [lightgray]<none found>
+none.inmap = [lightgray]<none in map>
 minimap = Minimap
 position = Position
 close = Kapat
@@ -99,25 +126,39 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
-
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
+mods.initfailed = [red]âš [] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
 mods = Mods
 mods.none = [lightgray]No mods found!
 mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Mod Folder
+mods.viewcontent = View Content
 mods.reload = Reload
 mods.reloadexit = The game will now exit, to reload mods.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Disable
+mod.version = Version:
 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.incompatiblegame = [red]Outdated Game
+mod.incompatiblemod = [red]Incompatible
+mod.blacklisted = [red]Unsupported
+mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Content Errors
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
+mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
+mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
+mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
+mod.missingdependencies.details = This mod is missing dependencies: {0}
+mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
+mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Errors have occurred loading content.
 mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
 mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
@@ -139,12 +180,25 @@ 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.
+search = Search:
 planetmap = Planet Map
 launchcore = Launch Core
 filename = File Name:
 unlocked = Yeni yapi acildi!!
+available = New research available!
+unlock.incampaign = < Unlock in campaign for details >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Completed
 techtree = Tech Tree
+techtree.select = Tech Tree Selection
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Load
+research.discard = Discard
 research.list = [lightgray]Research:
 research = Research
 researched = [lightgray]{0} researched.
@@ -186,16 +240,32 @@ hosts.none = [lightgray]internet oyunu bulunamadi!
 host.invalid = [scarlet]Oyuna baglanilamadi.
 
 servers.local = Local Servers
+servers.local.steam = Open Games & Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
+servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
+servers.showhidden = Show Hidden Servers
+server.shown = Shown
+server.hidden = Hidden
+viewplayer = Viewing Player: [accent]{0}
 
 trace = Oyuncu isaretle
 trace.playername = Player name: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Unik ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Mobile Client: [accent]{0}
 trace.modclient = Ozel islemci Kullanicisi: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Yanlis islemci Linki! Sorunu bildir
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Yasaklamalar
 server.bans.none = Yasaklananlar bulunamadi!
 server.admins = Yetkililer
@@ -209,10 +279,11 @@ server.version = [lightgray]Versiyon: {0}
 server.custombuild = [accent]ozel yapi
 confirmban = Bu oyuncuyu kalici olarak atmak istedigine emin misin?
 confirmkick = Are you sure you want to kick this player?
-confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Bu oyuncunun yasagini geri almak ister misin?
 confirmadmin = Bu oyuncuyu yetkili yapmak istedigine emin misin?
 confirmunadmin = Bu oyuncunun yetkisini almak istedigine emin misin?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Oyuna katil
 joingame.ip = Link:
 disconnect = Cikildi
@@ -220,15 +291,18 @@ disconnect.error = Connection error.
 disconnect.closed = Connection closed.
 disconnect.timeout = Timed out.
 disconnect.data = Oyunun geri yuklenemedi!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Baglaniliyor
+reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Loading world data...
 server.port = Link:
-server.addressinuse = Addres zaten kullaniliyor!
 server.invalidport = Geçersiz Oyun numarasi!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Oyun acarkes sorun olustu: [accent]{0}
 save.new = Yeni Kayit Dosyasi
 save.overwrite = Bu oyunun uzerinden\ngecmek istedigine emin\nmisin?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = uzerinden gec
 save.none = Kayitli oyun bulunamadi
 savefail = Kaydedilemedi!
@@ -249,6 +323,7 @@ save.corrupted = [accent]Kayit gecersiz!\nOyunu guncellediysen, bu buyuk ihtimal
 empty = <empty>
 on = Acik
 off = Kapali
+save.search = Search saved games...
 save.autosave = Otomatik kayit: {0}
 save.map = Harita: {0}
 save.wave = Dalga {0}
@@ -264,9 +339,33 @@ ok = Tamam
 open = Ac
 customize = Customize
 cancel = iptal
+command = Command
+command.queue = [lightgray][Queuing]
+command.mine = Mine
+command.repair = Repair
+command.rebuild = Rebuild
+command.assist = Assist Player
+command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Linki ac
 copylink = Linki kopyala
 back = Geri don
+max = Max
+objective = Map Objective
+crash.export = Export Crash Logs
+crash.none = No crash logs found.
+crash.exported = Crash logs exported.
 data.export = Export Data
 data.import = Import Data
 data.openfolder = Open Data Folder
@@ -274,15 +373,18 @@ data.exported = Data exported.
 data.invalid = This isn't valid game data.
 data.import.confirm = Importing external data will erase[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
 quit.confirm = Cikmak istedigine emin misin?
-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]Yukleniyor...
-reloading = [accent]Reloading Mods...
+downloading = [accent]Downloading...
 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
 resumebuilding = [scarlet][[{0}][] to resume building
+enablebuilding = [scarlet][[{0}][] to enable building
+showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Dalga {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = Dalganin baslamasina: {0}
@@ -290,6 +392,8 @@ wave.waveInProgress = [lightgray]Wave in progress
 waiting = Bekleniyor...
 waiting.players = Waiting for players...
 wave.enemies = [lightgray]{0} Enemies Remaining
+wave.enemycores = [accent]{0}[lightgray] Enemy Cores
+wave.enemycore = [accent]{0}[lightgray] Enemy Core
 wave.enemy = [lightgray]{0} Enemy Remaining
 wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
 wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
@@ -300,9 +404,9 @@ custom = Ozel
 builtin = Yapilandirilmis
 map.delete.confirm = Haritayi silmek istedigine emin misin? Bu geri alinamaz!
 map.random = [accent]Rasgele harita
-map.nospawn = Haritada Oyncularin cikmasi icin cekirdek yok! Haritaya[royal]Mavi[] cekirdek ekle.
-map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[scarlet] red[] cores to this map in the editor.
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[scarlet] red[] cores to this map in the editor.
+map.nospawn = Haritada Oyncularin cikmasi icin cekirdek yok! Haritaya {0} cekirdek ekle.
+map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add [scarlet]non-orange[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add {0} cores to this map in the editor.
 map.invalid = Harita yuklenemedi. Gecersiz yada bozuk dosya.
 workshop.update = Update Item
 workshop.error = Error fetching workshop details: {0}
@@ -310,12 +414,17 @@ map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]M
 workshop.menu = Select what you would like to do with this item.
 workshop.info = Item Info
 changelog = Changelog (optional):
+updatedesc = Overwrite Title & Description
 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.planet = Planet:
+editor.sector = Sector:
+editor.seed = Seed:
+editor.cliffs = Walls To Cliffs
 
 editor.brush = Firca
 editor.openin = Editorde ac
@@ -328,35 +437,71 @@ editor.nodescription = A map must have a description of at least 4 characters be
 editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
+editor.objectives = Objectives
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Edit In-Game
+editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
 editor.center = Center
+editor.search = Search maps...
+editor.filters = Filter Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
+editor.shiftx = Shift X
+editor.shifty = Shift Y
 workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
-waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
+waves.health = health: {0}%
 waves.perspawn = per spawn
 waves.shields = shields/wave
 waves.to = to
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]no spawns found in map
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
+waves.random = Random
 waves.copy = Copy to Clipboard
 waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
+waves.units.hide = Hide All
+waves.units.show = Show All
 
 wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
+all = All
 
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
+variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = isim:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -368,13 +513,19 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
+editor.moveup = Move Up
+editor.movedown = Move Down
+editor.copy = Copy
 editor.apply = Apply
 editor.generate = Yarat
+editor.sectorgenerate = Sector Generate
 editor.resize = Boyutunu degistir
 editor.loadmap = Harita yukle
 editor.savemap = Haritayi kaydet
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Kaydedildi!
 editor.save.noname = Haritanin ismi yok! 'Harita bilgisinden' bi tane ekle
 editor.save.overwrite = Haritanin ismi varolan bir haritanin ismi ile ayni! 'Harita bilgisinden' degisik bir isim sec
@@ -413,8 +564,12 @@ toolmode.eraseores = Erase Ores
 toolmode.eraseores.description = Erase only ores.
 toolmode.fillteams = Fill Teams
 toolmode.fillteams.description = Fill teams instead of blocks.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.
+toolmode.underliquid = Under Liquids
+toolmode.underliquid.description = Draw floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
 filter.distort = Distort
@@ -433,6 +588,7 @@ filter.clear = Clear
 filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
+filter.logic = Logic
 filter.option.scale = Scale
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -441,17 +597,39 @@ filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.angle = Angle
+filter.option.tilt = Tilt
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Floor
 filter.option.flooronto = Target Floor
 filter.option.target = Target
+filter.option.replacement = Replacement
 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
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Genislik:
 height = Yukseklik:
@@ -462,6 +640,9 @@ load = Yukle
 save = Kaydet
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Lutfen dil degisiminin etkin olmasi icin oyunu yeniden baslatin
 settings = ayarlar
 tutorial = Tutorial
@@ -476,26 +657,71 @@ complete = [lightgray]Complete:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
 requirement.research = Research {0}
+requirement.produce = Produce {0}
 requirement.capture = Capture {0}
-bestwave = [lightgray]Best: {0}
+requirement.onplanet = Control Sector On {0}
+requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
+map.multiplayer = Only the host can view sectors.
 uncover = Uncover
 configure = Configure Loadout
+objective.research.name = Research
+objective.produce.name = Obtain
+objective.item.name = Obtain Item
+objective.coreitem.name = Core Item
+objective.buildcount.name = Build Count
+objective.unitcount.name = Unit Count
+objective.destroyunits.name = Destroy Units
+objective.timer.name = Timer
+objective.destroyblock.name = Destroy Block
+objective.destroyblocks.name = Destroy Blocks
+objective.destroycore.name = Destroy Core
+objective.commandmode.name = Command Mode
+objective.flag.name = Flag
+marker.shapetext.name = Shape Text
+marker.point.name = Point
+marker.shape.name = Shape
+marker.text.name = Text
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+marker.background = Background
+marker.outline = Outline
+objective.research = [accent]Research:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
+objective.destroycore = [accent]Destroy Enemy Core
+objective.command = [accent]Command Units
+objective.nuclearlaunch = [accent]âš  Nuclear launch detected: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NUCLEAR STRIKE INBOUND âš 
 loadout = Loadout
-resources = Resources 
+resources = Resources
+resources.max = Max
 bannedblocks = Banned Blocks
+unbannedblocks = Unbanned Blocks
+objectives = Objectives
+bannedunits = Banned Units
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
+launch.from = Launching From: [accent]{0}
+launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = Resources Detected:
-zone.objective = [lightgray]Objective: [accent]{0}
-zone.objective.survival = Survive
-zone.objective.attack = Destroy Enemy Core
 add = Add...
-boss.health = Boss Health
+guardian = Guardian
 
 connectfail = [crimson]Su Oyuna baglanilamadi: [accent]{0}
 error.unreachable = Server unreachable.
@@ -507,26 +733,69 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unkown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
+campaign.playtime = \uf129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+sectorlist = Sectors
+sectorlist.attacked = {0} under attack
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
+sectors.export = Export:
+sectors.import = Import:
+sectors.time = Time:
+sectors.threat = Threat:
+sectors.wave = Wave:
 sectors.stored = Stored:
 sectors.resume = Resume
 sectors.launch = Launch
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
+sectors.enemybase = [scarlet]Enemy Base
+sectors.vulnerable = [scarlet]Vulnerable
+sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
+sectors.underattack.nodamage = [scarlet]Uncaptured
+sectors.survives = [accent]Survives {0} waves
+sectors.go = Go
+sector.abandon = Abandon
+sector.abandon.confirm = This sector's core(s) will self-destruct.\nContinue?
+sector.curcapture = Sector Captured
+sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
+sector.attacked = Sector [accent]{0}[white] under attack!
+sector.lost = Sector [accent]{0}[white] lost!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Change Icon
+sector.noswitch.title = Unable to Switch Sectors
+sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
+sector.view = View Sector
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+planets = Planets
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Sun
+sector.impact0078.name = Impact 0078
 
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -539,6 +808,22 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
+sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
+sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 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.
@@ -551,6 +836,75 @@ 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.
+sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism.
+sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories.
+sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
+sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
+sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
+sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
+sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
+sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.electrified.name = Electrified
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overdrive.name = Overdrive
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+status.boss.name = Guardian
 
 settings.language = Dil
 settings.data = Game Data
@@ -573,7 +927,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = Duraklatildi
 clear = Clear
 banned = [scarlet]Banned
-unplaceable.sectorcaptured = [scarlet]Requires captured sector
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Evet
 no = Hayir
 info.title = [accent]Bilgi
@@ -581,13 +935,18 @@ error.title = [crimson]Bir hata olustu
 error.crashtitle = Bir hata olustu
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
+stat.showinmap = <load map to show>
+stat.description = Purpose
 
 stat.input = Input
 stat.output = Output
+stat.maxefficiency = Max Efficiency
 stat.booster = Booster
 stat.tiles = Required Tiles
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Guc kapasitesi
 stat.powershot = Guc/Saldiri hizi
 stat.damage = Damage
@@ -610,6 +969,11 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Base Power Generation
 stat.productiontime = Production Time
 stat.repairtime = Block Full Repair Time
+stat.repairspeed = Repair Speed
+stat.weapons = Weapons
+stat.bullet = Bullet
+stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Speed Increase
 stat.range = Range
 stat.drilltier = Kazilabilirler
@@ -617,6 +981,7 @@ stat.drillspeed = Ana kazma hizi
 stat.boosteffect = Boost Effect
 stat.maxunits = Max Active Units
 stat.health = Can
+stat.armor = Armor
 stat.buildtime = Build Time
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Build Cost
@@ -632,6 +997,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = HeatCapacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -640,21 +1006,77 @@ stat.buildspeed = Build Speed
 stat.minespeed = Mine Speed
 stat.minetier = Mine Tier
 stat.payloadcapacity = Payload Capacity
-stat.commandlimit = Command Limit
 stat.abilities = Abilities
+stat.canboost = Can Boost
+stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
+stat.immunities = Immunities
+stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.statusfield.description = Applies a status effect to nearby units
+ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
+ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
+ability.energyfield = Energy Field
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+
+bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Better Drill Required
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
+bar.corefloor = Core Zone Tile Required
+bar.cargounitcap = Cargo Unit Cap Reached
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
+bar.boost = Boost: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Power: {0}
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
@@ -663,13 +1085,19 @@ bar.powerlines = Connections: {0}/{1}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet]î Š {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
+bar.cooldown = Cooldown
+bar.instability = Instability
+bar.heatamount = Heat: {0}
+bar.heatpercent = Heat: {0} ({1}%)
 bar.power = Power
 bar.progress = Build Progress
+bar.loadprogress = Progress
+bar.launchcooldown = Launch Cooldown
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -677,35 +1105,50 @@ bullet.damage = [stat]{0}[lightgray] dmg
 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.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
+bullet.healpercent = [stat]{0}[lightgray]% healing
+bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
 bullet.reload = [stat]{0}[lightgray]x reload
+bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
 unit.blocks = Yapilar
 unit.blockssquared = blocks²
 unit.powersecond = saniyede bir
+unit.tilessecond = tiles/second
 unit.liquidsecond = Saniyede bir
 unit.itemssecond = Saniyede bir
 unit.liquidunits = Litre
 unit.powerunits = Volt
+unit.heatunits = heat units
 unit.degrees = derece
 unit.seconds = saniye
 unit.minutes = mins
 unit.persecond = /sec
 unit.perminute = /min
 unit.timesspeed = x speed
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = esya
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
+unit.pershot = /shot
+category.purpose = Purpose
 category.general = General
 category.power = Guc
 category.liquids = sivilar
@@ -713,16 +1156,23 @@ category.items = esyalar
 category.crafting = uretim
 category.function = Function
 category.optional = Optional Enhancements
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 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[scarlet] (experimental)
+setting.logichints.name = Logic Hints
+setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animated Water
 setting.animatedshields.name = Animated Shields
-setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.playerindicators.name = Player Indicators
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
@@ -732,14 +1182,11 @@ setting.fpscap.name = Max FPS
 setting.fpscap.none = Yok
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI Scaling[lightgray] (requires restart)[]
+setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Always Diagonal Placement
-setting.difficulty.training = training
-setting.difficulty.easy = kolay
-setting.difficulty.normal = orta
-setting.difficulty.hard = zor
-setting.difficulty.insane = cok zor
-setting.difficulty.name = Zorluk derecesi:
 setting.screenshake.name = Ekran sallanmasi
+setting.bloomintensity.name = Bloom Intensity
+setting.bloomblur.name = Bloom Blur
 setting.effects.name = Efekleri goster
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
@@ -747,32 +1194,43 @@ setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
 setting.sensitivity.name = Kumanda hassasligi
 setting.saveinterval.name = Otomatik kaydetme suresi
 setting.seconds = {0} Saniye
-setting.blockselecttimeout.name = Block Select Timeout
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Tam ekran
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
+setting.borderlesswindow.name.windows = Borderless Fullscreen
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = FPS'i goster
+setting.console.name = Enable Console
 setting.smoothcamera.name = Smooth Camera
 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.coreitems.name = Display Core Items
 setting.position.name = Show Player Position
+setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Ses yuksekligi
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Sesi kapat
 setting.sfxvol.name = Ses seviyesi
 setting.mutesound.name = Sesi kapat
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display In-Game 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.
+setting.showweather.name = Show Weather Graphics
+setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Kesgitlemek üçin interfeýsi uýgunlaşdyryň
+setting.macnotch.description = Üýtgeşmeleri ulanmak üçin täzeden başlaň
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
 uiscale.cancel = Cancel & Exit
@@ -781,12 +1239,9 @@ keybind.title = Tuslari ayarla
 keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
 category.general.name = General
 category.view.name = Goster
+category.command.name = Unit Command
 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
@@ -801,6 +1256,27 @@ keybind.move_y.name = Yukari/asagi hareket
 keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
+keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -826,16 +1302,20 @@ keybind.select.name = Sec/silahi sik
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
+keybind.select_all_units.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = 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
 keybind.pause.name = Durdur
 keybind.pause_building.name = Pause/Resume Building
 keybind.minimap.name = Minimap
+keybind.planet_map.name = Planet Map
+keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = konus
 keybind.player_list.name = Oyuncu listesi
 keybind.console.name = Konsol
@@ -845,6 +1325,7 @@ keybind.toggle_menus.name = Menuleri ac'kapat
 keybind.chat_history_prev.name = Konusma gecmisi geri
 keybind.chat_history_next.name = Konusma gecmisi ileri
 keybind.chat_scroll.name = Konusma kaydir
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = Unit birak
 keybind.zoom_minimap.name = Haritayi yaklastir
 mode.help.title = Modlarin aciklamalari
@@ -858,47 +1339,100 @@ mode.pvp.description = fight against other players locally.
 mode.attack.name = Attack
 mode.attack.description = No waves, with the goal to destroy the enemy base.
 mode.custom = Custom Rules
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Infinite Resources
+rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
+rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Waves
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Attack Mode
-rules.buildai = AI Building
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Min Squad Size
+rules.rtsmaxsquadsize = Max Squad Size
+rules.rtsminattackweight = Min Attack Weight
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
+rules.corecapture = Capture Core On Destruction
+rules.polygoncoreprotection = Polygonal Core Protection
+rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Solar Power Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Base Unit Cap
+rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
+rules.initialwavespacing = Initial 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.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo
+rules.enemyteam = Enemy Team
+rules.playerteam = Player Team
 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.title.teams = Teams
+rules.title.planet = Planet
 rules.lighting = Lighting
-rules.enemyLights = Enemy Lights
+rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
+rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Esyalar
 content.liquid.name = Sivilar
 content.unit.name = Units
 content.block.name = Blocks
+content.status.name = Status Effects
+content.sector.name = Sectors
+content.team.name = Factions
+wallore = (Wall)
 
 item.copper.name = Bakir
 item.lead.name = Kursun
@@ -916,10 +1450,23 @@ item.blast-compound.name = patlama birlesimi
 item.pyratite.name = Pyratite
 item.metaglass.name = Metaglass
 item.scrap.name = Scrap
+item.fissile-matter.name = Fissile Matter
+item.beryllium.name = Beryllium
+item.tungsten.name = Tungsten
+item.oxide.name = Oxide
+item.carbide.name = Carbide
+item.dormant-cyst.name = Dormant Cyst
 liquid.water.name = Su
 liquid.slag.name = Slag
 liquid.oil.name = Benzin
 liquid.cryofluid.name = kriyo sivisi
+liquid.neoplasm.name = Neoplasm
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gallium
+liquid.ozone.name = Ozone
+liquid.hydrogen.name = Hydrogen
+liquid.nitrogen.name = Nitrogen
+liquid.cyanogen.name = Cyanogen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -947,6 +1494,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -954,13 +1506,35 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
-block.resupply-point.name = Resupply Point
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
+block.basalt-boulder.name = Basalt Boulder
 block.grass.name = Grass
-block.slag.name = Slag
+block.molten-slag.name = Slag
+block.pooled-cryofluid.name = Cryofluid
 block.space.name = Space
 block.salt.name = Salt
 block.salt-wall.name = Salt Wall
@@ -988,24 +1562,28 @@ block.graphite-press.name = Graphite Press
 block.multi-press.name = Multi-Press
 block.constructing = {0}\n[lightgray](Constructing)
 block.spawn.name = Enemy Spawn
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Core: Shard
 block.core-foundation.name = Core: Foundation
 block.core-nucleus.name = Core: Nucleus
-block.deepwater.name = su alti
-block.water.name = su
+block.deep-water.name = su alti
+block.shallow-water.name = su
 block.tainted-water.name = Tainted Water
+block.deep-tainted-water.name = Deep Tainted Water
 block.darksand-tainted-water.name = Dark Sand Tainted Water
 block.tar.name = Tar
 block.stone.name = tas
-block.sand.name = kum
+block.sand-floor.name = kum
 block.darksand.name = Dark Sand
 block.ice.name = buz
 block.snow.name = kar
-block.craters.name = Craters
+block.crater-stone.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Ice Snow
@@ -1023,6 +1601,7 @@ block.spore-cluster.name = Spore Cluster
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
+block.metal-floor-4.name = Metal Floor 4
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
 block.dark-panel-1.name = Dark Panel 1
@@ -1056,15 +1635,16 @@ block.conveyor.name = konvenyor
 block.titanium-conveyor.name = Titanyum konvenyor
 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 conveyors.
 block.junction.name = ayirici
 block.router.name = dagitici
 block.distributor.name = yayici
 block.sorter.name = secici
 block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
-block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 block.overflow-gate.name = Kapali dagatici
 block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silikon eritici
@@ -1115,20 +1695,22 @@ block.solar-panel.name = gunes paneli
 block.solar-panel-large.name = genis gunes paneli
 block.oil-extractor.name = benzin ayirici
 block.repair-point.name = tamirci
+block.repair-turret.name = Repair Turret
 block.pulse-conduit.name = Pulse borusu
 block.plated-conduit.name = Plated Conduit
 block.phase-conduit.name = Phase borusu
 block.liquid-router.name = sivi ayirici
 block.liquid-tank.name = sivi tanki
+block.liquid-container.name = Liquid Container
 block.liquid-junction.name = sivi yonlendirici
 block.bridge-conduit.name = kopru borusu
 block.rotary-pump.name = donen boru
 block.thorium-reactor.name = Thorium Reaktoru
 block.mass-driver.name = kütle surucusu
 block.blast-drill.name = Patlatici kazici
-block.thermal-pump.name = Termal pompa
+block.impulse-pump.name = Termal pompa
 block.thermal-generator.name = Magma jeneratoru
-block.alloy-smelter.name = Alloy eritici
+block.surge-smelter.name = Alloy eritici
 block.mender.name = Mender
 block.mend-projector.name = Mend koruyucu
 block.surge-wall.name = kabarma duvari
@@ -1145,9 +1727,9 @@ 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.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing 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
@@ -1157,9 +1739,179 @@ 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.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.large-payload-mass-driver.name = Large Payload Mass Driver
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
+block.constructor.name = Constructor
+block.constructor.description = Fabricates structures up to 2x2 tiles in size.
+block.large-constructor.name = Large Constructor
+block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Load liquids and items into blocks.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Unloads liquids and items from blocks.
+block.heat-source.name = Heat Source
+block.heat-source.description = A 1x1 block that gives virtualy infinite heat.
+block.empty.name = Empty
+block.rhyolite-crater.name = Rhyolite Crater
+block.rough-rhyolite.name = Rough Rhyolite
+block.regolith.name = Regolith
+block.yellow-stone.name = Yellow Stone
+block.carbon-stone.name = Carbon Stone
+block.ferric-stone.name = Ferric Stone
+block.ferric-craters.name = Ferric Craters
+block.beryllic-stone.name = Beryllic Stone
+block.crystalline-stone.name = Crystalline Stone
+block.crystal-floor.name = Crystal Floor
+block.yellow-stone-plates.name = Yellow Stone Plates
+block.red-stone.name = Red Stone
+block.dense-red-stone.name = Dense Red Stone
+block.red-ice.name = Red Ice
+block.arkycite-floor.name = Arkycite Floor
+block.arkyic-stone.name = Arkyic Stone
+block.rhyolite-vent.name = Rhyolite Vent
+block.carbon-vent.name = Carbon Vent
+block.arkyic-vent.name = Arkyic Vent
+block.yellow-stone-vent.name = Yellow Stone Vent
+block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
+block.redmat.name = Redmat
+block.bluemat.name = Bluemat
+block.core-zone.name = Core Zone
+block.regolith-wall.name = Regolith Wall
+block.yellow-stone-wall.name = Yellow Stone Wall
+block.rhyolite-wall.name = Rhyolite Wall
+block.carbon-wall.name = Carbon Wall
+block.ferric-stone-wall.name = Ferric Stone Wall
+block.beryllic-stone-wall.name = Beryllic Stone Wall
+block.arkyic-wall.name = Arkyic Wall
+block.crystalline-stone-wall.name = Crystalline Stone Wall
+block.red-ice-wall.name = Red Ice Wall
+block.red-stone-wall.name = Red Stone Wall
+block.red-diamond-wall.name = Red Diamond Wall
+block.redweed.name = Redweed
+block.pur-bush.name = Pur Bush
+block.yellowcoral.name = Yellowcoral
+block.carbon-boulder.name = Carbon Boulder
+block.ferric-boulder.name = Ferric Boulder
+block.beryllic-boulder.name = Beryllic Boulder
+block.yellow-stone-boulder.name = Yellow Stone Boulder
+block.arkyic-boulder.name = Arkyic Boulder
+block.crystal-cluster.name = Crystal Cluster
+block.vibrant-crystal-cluster.name = Vibrant Crystal Cluster
+block.crystal-blocks.name = Crystal Blocks
+block.crystal-orbs.name = Crystal Orbs
+block.crystalline-boulder.name = Crystalline Boulder
+block.red-ice-boulder.name = Red Ice Boulder
+block.rhyolite-boulder.name = Rhyolite Boulder
+block.red-stone-boulder.name = Red Stone Boulder
+block.graphitic-wall.name = Graphitic Wall
+block.silicon-arc-furnace.name = Silicon Arc Furnace
+block.electrolyzer.name = Electrolyzer
+block.atmospheric-concentrator.name = Atmospheric Concentrator
+block.oxidation-chamber.name = Oxidation Chamber
+block.electric-heater.name = Electric Heater
+block.slag-heater.name = Slag Heater
+block.phase-heater.name = Phase Heater
+block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Heat Router
+block.slag-incinerator.name = Slag Incinerator
+block.carbide-crucible.name = Carbide Crucible
+block.slag-centrifuge.name = Slag Centrifuge
+block.surge-crucible.name = Surge Crucible
+block.cyanogen-synthesizer.name = Cyanogen Synthesizer
+block.phase-synthesizer.name = Phase Synthesizer
+block.heat-reactor.name = Heat Reactor
+block.beryllium-wall.name = Beryllium Wall
+block.beryllium-wall-large.name = Large Beryllium Wall
+block.tungsten-wall.name = Tungsten Wall
+block.tungsten-wall-large.name = Large Tungsten Wall
+block.blast-door.name = Blast Door
+block.carbide-wall.name = Carbide Wall
+block.carbide-wall-large.name = Large Carbide Wall
+block.reinforced-surge-wall.name = Reinforced Surge Wall
+block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.shielded-wall.name = Shielded Wall
+block.radar.name = Radar
+block.build-tower.name = Build Tower
+block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
+block.shield-projector.name = Shield Projector
+block.large-shield-projector.name = Large Shield Projector
+block.armored-duct.name = Armored Duct
+block.overflow-duct.name = Overflow Duct
+block.underflow-duct.name = Underflow Duct
+block.duct-unloader.name = Duct Unloader
+block.surge-conveyor.name = Surge Conveyor
+block.surge-router.name = Surge Router
+block.unit-cargo-loader.name = Unit Cargo Loader
+block.unit-cargo-unload-point.name = Unit Cargo Unload Point
+block.reinforced-pump.name = Reinforced Pump
+block.reinforced-conduit.name = Reinforced Conduit
+block.reinforced-liquid-junction.name = Reinforced Liquid Junction
+block.reinforced-bridge-conduit.name = Reinforced Bridge Conduit
+block.reinforced-liquid-router.name = Reinforced Liquid Router
+block.reinforced-liquid-container.name = Reinforced Liquid Container
+block.reinforced-liquid-tank.name = Reinforced Liquid Tank
+block.beam-node.name = Beam Node
+block.beam-tower.name = Beam Tower
+block.beam-link.name = Beam Link
+block.turbine-condenser.name = Turbine Condenser
+block.chemical-combustion-chamber.name = Chemical Combustion Chamber
+block.pyrolysis-generator.name = Pyrolysis Generator
+block.vent-condenser.name = Vent Condenser
+block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plasma Bore
+block.large-plasma-bore.name = Large Plasma Bore
+block.impact-drill.name = Impact Drill
+block.eruption-drill.name = Eruption Drill
+block.core-bastion.name = Core Bastion
+block.core-citadel.name = Core Citadel
+block.core-acropolis.name = Core Acropolis
+block.reinforced-container.name = Reinforced Container
+block.reinforced-vault.name = Reinforced Vault
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Refabricator
+block.mech-refabricator.name = Mech Refabricator
+block.ship-refabricator.name = Ship Refabricator
+block.tank-assembler.name = Tank Assembler
+block.ship-assembler.name = Ship Assembler
+block.mech-assembler.name = Mech Assembler
+block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
+block.reinforced-payload-router.name = Reinforced Payload Router
+block.payload-mass-driver.name = Payload Mass Driver
+block.small-deconstructor.name = Small Deconstructor
+block.canvas.name = Canvas
+block.world-processor.name = World Processor
+block.world-cell.name = World Cell
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.prime-refabricator.name = Prime Refabricator
+block.unit-repair-tower.name = Unit Repair Tower
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basic Assembler Module
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1169,66 +1921,153 @@ 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.malis.name = Malis
 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.[]\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
-tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
-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.
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
-tutorial.turret = Defensive structures must be built to repel the[lightgray] enemy[].\nBuild a duo turret near your base.
-tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
-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 your core for 2 waves. Build more turrets.
-tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
-tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese resources can then be used to research new technology.\n\n[accent]Press the launch button.
+team.blue.name = blue
+hint.skip = Skip
+hint.desktopMove = Use [accent][[WASD][] to move.
+hint.zoom = [accent]Scroll[] to zoom in or out.
+hint.desktopShoot = [accent][[Left-click][] to shoot.
+hint.depositItems = To transfer items, drag from your ship to the core.
+hint.respawn = To respawn as a ship, press [accent][[V][].
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
+hint.breaking = [accent]Right-click[] and drag to break blocks.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
+hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
+hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
+hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
+hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
+hint.payloadPickup = Press [accent][[[] to pick up small blocks or units.
+hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up.
+hint.payloadDrop = Press [accent]][] to drop a payload.
+hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
+hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
+hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
+gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
+gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.moveup = \ue804 Move up for further objectives.
+gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.defend = Enemy incoming, prepare to defend.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
+gz.supplyturret = [accent]Supply Turret
+gz.zone1 = This is the enemy drop zone.
+gz.zone2 = Anything built in the radius is destroyed when a wave starts.
+gz.zone3 = A wave will begin now.\nGet ready.
+gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
+onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
+onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = The enemy is vulnerable. Counter-attack.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
+split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
+split.acquire = You must acquire some tungsten to build units.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
 
 item.copper.description = ise yayar bir materyal. Kazma makineleriyle yada tasimayla alinabilir.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Basit bir baslangic materyali. sivi tasimada kullanilabilir.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
 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 insulation.
 item.sand.description = karistirma maddesi olark kullanilan yaygin bir madde.
 item.coal.description = Yaygin bir yakit.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
 item.titanium.description = Nadir ve hafif bir materyal. Hava araclarinda, Kazma makinelerinde ve sivi tasima tuplerinde kullanilir.
 item.thorium.description = Nukleer yakit olarak kullanilan sert ve nukleer bir materyal.
 item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
+item.scrap.details = Leftover remnants of old structures and units.
 item.silicon.description = Gunes panellerinde ve gelismis materallerde kullanilan bir materyal
 item.plastanium.description = hafif bir madde, hava makinelerinde ve silahlara kursun olarak kullanilir.
 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 = Used for conversion into oil, explosives and fuel.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = Bombalar ve patlayicilarda kullanilabilir. Yakit olarak kullanilmasi tavsiye edilmez.
 item.pyratite.description = Yakici silahlar icin yakici bir madde.
+item.beryllium.description = Used in many types of construction and ammunition on Erekir.
+item.tungsten.description = Used in drills, armor and ammunition. Required in the construction of more advanced structures.
+item.oxide.description = Used as a heat conductor and insulator for power.
+item.carbide.description = Used in advanced structures, heavier units, and ammunition.
 liquid.water.description = 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 = Can be burnt, exploded or used as a coolant.
 liquid.cryofluid.description = The most efficient liquid for cooling things down.
+liquid.arkycite.description = Used in chemical reactions for power generation and material synthesis.
+liquid.ozone.description = Used as an oxidizing agent in material production, and as fuel. Moderately explosive.
+liquid.hydrogen.description = Used in resource extraction, unit production and structure repair. Flammable.
+liquid.cyanogen.description = Used for ammunition, construction of advanced units, and various reactions in advanced blocks. Highly flammable.
+liquid.nitrogen.description = Used in resource extraction, gas creation and unit production. Inert.
+liquid.neoplasm.description = A dangerous biological byproduct of the Neoplasia reactor. Quickly spreads to any adjacent water-containing block it touches, damaging them in the process. Viscous.
+liquid.neoplasm.details = Neoplasm. An uncontrollable mass of rapidly-dividing synthetic cells with a sludge-like consistency. Heat-resistant. Extremely dangerous to any structures involving water.\n\nToo complex and unstable for standard analysis. Potential applications unknown. Incineration in slag pools is recommended.
+block.derelict = \uf77e [lightgray]Derelict
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
+block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 
 block.message.description = Stores a message. Used for communication between allies.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coke in order to produce silicon.
 block.kiln.description = Smelts sand and lead into metaglass. Requires small amounts of power.
 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.surge-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
 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.
@@ -1244,6 +2083,8 @@ block.item-source.description = Infinitely outputs items. Sandbox only.
 block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
 block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
 block.liquid-void.description = Removes any liquids. Sandbox only.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. 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.
@@ -1256,6 +2097,10 @@ block.phase-wall.description = Not as strong as a thorium wall but will deflect
 block.phase-wall-large.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.\nSpans multiple tiles.
 block.surge-wall.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.
 block.surge-wall-large.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.\nSpans multiple tiles.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = A small door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.
 block.door-large.description = A large door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.\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.
@@ -1272,17 +2117,19 @@ block.phase-conveyor.description = Advanced item transport block. Uses power to
 block.sorter.description = esyalari secer. rengi ayni olan esya ileriden, digerleri sagdan ve soldan devam eder
 block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
 block.router.description = Accepts items from one direction and outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.overflow-gate.description = sadece saga ve sola dagatir. onu kapalidir
 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 = Ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range.
 block.mechanical-pump.description = A cheap pump with slow output, but no power consumption.
 block.rotary-pump.description = An advanced pump which doubles up speed by using power.
-block.thermal-pump.description = The ultimate pump. Three times as fast as a mechanical pump and the only pump which is able to retrieve lava.
+block.impulse-pump.description = The ultimate pump. Three times as fast as a mechanical pump and the only pump which is able to retrieve lava.
 block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits.
 block.pulse-conduit.description = 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-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router.
 block.liquid-tank.description = Stores a large amount of liquids. Use it for creating buffers when there is a 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.
@@ -1308,15 +2155,21 @@ block.laser-drill.description = Allows drilling even faster through laser techno
 block.blast-drill.description = The ultimate drill. Requires large amounts of power.
 block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
 block.cultivator.description = Cultivates the soil with water in order to obtain biomatter.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
 block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
 block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-foundation.details = The second iteration.
 block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.core-nucleus.details = The third and final iteration.
 block.vault.description = Stores a large amount of items. Use it for creating buffers when there is a non-constant demand of materials. An[lightgray] unloader[] can be used to retrieve items from the vault.
 block.container.description = Stores a small amount of items. Use it for creating buffers when there is a non-constant demand of materials. An[lightgray] unloader[] can be used to retrieve items from the container.
 block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
 block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished.
-block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = A small, cheap turret.
 block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
@@ -1331,5 +2184,429 @@ 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.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 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.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
+block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
+block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
+block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
+block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
+block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
+block.afflict.description = Fires a massive charged orb of fragmentary flak. Requires heating.
+block.disperse.description = Fires bursts of flak at aerial targets.
+block.lustre.description = Fires a slow-moving single-target laser at enemy targets.
+block.scathe.description = Launches a powerful missile at ground targets over vast distances.
+block.smite.description = Fires bursts of piercing, lightning-emitting bullets.
+block.malign.description = Fires a barrage of homing laser charges at enemy targets. Requires extensive heating.
+block.silicon-arc-furnace.description = Refines silicon from sand and graphite.
+block.oxidation-chamber.description = Converts beryllium and ozone into oxide. Emits heat as a by-product.
+block.electric-heater.description = Heats facing blocks. Requires large amounts of power.
+block.slag-heater.description = Heats facing blocks. Requires slag.
+block.phase-heater.description = Heats facing blocks. Requires phase fabric.
+block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
+block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
+block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
+block.carbide-crucible.description = Fuses graphite and tungsten into carbide. Requires heat.
+block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
+block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
+block.vent-condenser.description = Condenses vent gases into water. Consumes power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
+block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
+block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
+block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
+block.reinforced-liquid-tank.description = Stores a large amount of fluids.
+block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
+block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
+block.reinforced-pump.description = Pumps and outputs liquids. Requires hydrogen.
+block.beryllium-wall.description = Protects structures from enemy projectiles.
+block.beryllium-wall-large.description = Protects structures from enemy projectiles.
+block.tungsten-wall.description = Protects structures from enemy projectiles.
+block.tungsten-wall-large.description = Protects structures from enemy projectiles.
+block.carbide-wall.description = Protects structures from enemy projectiles.
+block.carbide-wall-large.description = Protects structures from enemy projectiles.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
+block.duct.description = Moves items forward. Only capable of storing a single item.
+block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
+block.duct-router.description = Distributes items equally across three directions. Only accepts items from the back side. Can be configured as an item sorter.
+block.overflow-duct.description = Only outputs items to the sides if the front path is blocked.
+block.duct-bridge.description = Moves items over structures and terrain.
+block.duct-unloader.description = Unloads the selected item from the block behind it. Cannot unload from cores.
+block.underflow-duct.description = Opposite of an overflow duct. Outputs to the front if the left and right paths are blocked.
+block.reinforced-liquid-junction.description = Acts as a junction between two crossing conduits.
+block.surge-conveyor.description = Moves items in batches. Can be sped up with power. Conducts power.
+block.surge-router.description = Equally distributes items in three directions from surge conveyors. Can be sped up with power. Conducts power.
+block.unit-cargo-loader.description = Constructs cargo drones. Drones automatically distribute items to Cargo Unload Points with a matching filter.
+block.unit-cargo-unload-point.description = Acts as an unloading point for cargo drones. Accepts items that match the selected filter.
+block.beam-node.description = Transmits power to other blocks orthogonally. Stores a small amount of power.
+block.beam-tower.description = Transmits power to other blocks orthogonally. Stores a large amount of power. Long-range.
+block.turbine-condenser.description = Generates power when placed on vents. Produces a small amount of water.
+block.chemical-combustion-chamber.description = Generates power from arkycite and ozone.
+block.pyrolysis-generator.description = Generates large amounts of power from arkycite and slag. Produces water as a byproduct.
+block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
+block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
+block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
+block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.ship-fabricator.description = Constructs Elude units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.mech-fabricator.description = Constructs Merui units. Outputted units can be used directly, or moved into refabricators for upgrading.
+block.tank-assembler.description = Assembles large tanks out of inputted blocks and units. Output tier may be increased by adding modules.
+block.ship-assembler.description = Assembles large ships out of inputted blocks and units. Output tier may be increased by adding modules.
+block.mech-assembler.description = Assembles large mechs out of inputted blocks and units. Output tier may be increased by adding modules.
+block.tank-refabricator.description = Upgrades inputted tank units to the second tier.
+block.ship-refabricator.description = Upgrades inputted ship units to the second tier.
+block.mech-refabricator.description = Upgrades inputted mech units to the second tier.
+block.prime-refabricator.description = Upgrades inputted units to the third tier.
+block.basic-assembler-module.description = Increases assembler tier when placed next to a construction boundary. Requires power. Can be used as a payload input.
+block.small-deconstructor.description = Deconstructs inputted structures and units. Returns 100% of the build cost.
+block.reinforced-payload-conveyor.description = Moves payloads forward.
+block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
+block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
+block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
+block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
+unit.stell.description = Fires standard bullets at enemy targets.
+unit.locus.description = Fires alternating bullets at enemy targets.
+unit.precept.description = Fires piercing cluster bullets at enemy targets.
+unit.vanquish.description = Fires large piercing splitting bullets at enemy targets.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets.
+unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
+unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
+unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.
+unit.tecta.description = Fires homing plasma missiles at enemy targets. Protects itself with a directional shield. Can step over most terrain.
+unit.collaris.description = Fires long-range fragmenting artillery at enemy targets. Can step over most terrain.
+unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
+unit.avert.description = Fires twisting pairs of bullets at enemy targets.
+unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam.
+unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam.
+unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams.
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.wait = Wait a certain number of seconds.
+lst.stop = Halt execution of this processor.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+lst.getblock = Get tile data at any location.
+lst.setblock = Set tile data at any location.
+lst.spawnunit = Spawn unit at a location.
+lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
+lst.explosion = Create an explosion at a location.
+lst.setrate = Set processor execution speed in instructions/tick.
+lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
+lst.setrule = Set a game rule.
+lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.cutscene = Manipulate the player camera.
+lst.setflag = Set a global flag that can be read by all processors.
+lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.config = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
+laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+lcategory.unknown = Unknown
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = Input & Output
+lcategory.io.description = Modify contents of memory blocks and processor buffers.
+lcategory.block = Block Control
+lcategory.block.description = Interact with blocks.
+lcategory.operation = Operations
+lcategory.operation.description = Logical operations.
+lcategory.control = Flow Control
+lcategory.control.description = Manage execution order.
+lcategory.unit = Unit Control
+lcategory.unit.description = Give units commands.
+lcategory.world = World
+lcategory.world.description = Control how the world behaves.
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.col = Equivalent to color, but packed.\nPacked colors are written as hex codes with a [accent]%[] prefix.\nExample: [accent]%ff0000[] would be red.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+sensor.in = The building/unit to sense.
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.unbind = Completely disable logic control.\nResume standard AI.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.payenter = Enter/land on the payload block the unit is on.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index bfe05a9828..2b2e6072e8 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1,28 +1,31 @@
 credits.text = [royal]Anuken[] tarafından yapıldı - [sky]anukendev@gmail.com[]
 credits = Jenerik
 contributors = Çevirmenler ve Katkıda Bulunanlar
-discord = Mindustry'nin Discord sunucusuna Katıl!
+discord = Mindustry Discord sunucusuna katıl!
 link.discord.description = Resmi Mindustry Discord sunucusu
-link.reddit.description = Mindustry subreddit'i
+link.reddit.description = Mindustry subredditi
 link.github.description = Oyun kaynak kodu
 link.changelog.description = Güncelleme değişikliklerinin listesi
-link.dev-builds.description = Dengesiz oyun sürümleri
-link.trello.description = Planlanan özellikler için resmi Trello Sayfası
+link.dev-builds.description = Kararsız oyun sürümleri
+link.trello.description = Planlanan özellikler için resmi Trello sayfası
 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.f-droid.description = F-Droid sayfası
+link.wiki.description = Resmi Mindustry vikisi
 link.suggestions.description = Yeni özellikler öner
+link.bug.description = Hata mı buldun? Hemen şikayet et!
+linkopen = Bu server sana bir link gönderdi. Açmak istediğine emin misin?\n\n[sky]{0}
 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.
-gameover = Kaybettin
+gameover = Oyun Bitti
+gameover.disconnect = Bağlantı Koptu!
 gameover.pvp = [accent] {0}[] Takımı kazandı!
+gameover.waiting = [accent]Sonraki Harita Bekleniyor...
 highscore = [accent]Yeni rekor!
 copied = Panoya Kopyalandı.
-indev.popup = [accent]v6[] şu anda [accent]beta aşamasındadır[].\n[lightgray]Bu demektir ki:[]\n[scarlet]- Mücadele modu tamamlanmamıştır[]\n- Müzik ve ses efektleri tamamlanmamıştır veya eksiktir\n- Gördüğün her şey değişime ya da kaldırılmaya açıktır.\n\nHataları ve çökmeleri [accent]Github[]'da bildir.
 indev.notready = Oyunun bu kısmı henüz hazır değil.
-
+#Ekozet abimize teşekkür edelim. Baya ekleme yaptı buraya.
 load.sound = Sesler
 load.map = Haritalar
 load.image = Resimler
@@ -30,66 +33,86 @@ load.content = İçerik
 load.system = Sistem
 load.mod = Modlar
 load.scripts = Betikler
-
+#the_pawsy tamam be, update atıyom... -RT
 be.update = Yeni bir erken erişim sürümü var:
-be.update.confirm = Yüklenip yeniden başlatılsın mı?
+be.update.confirm = İndirip yeniden başlatılsın mı?
 be.updating = Yeni sürüm yükleniyor...
 be.ignore = Hayır
-be.noupdates = Yeni güncelleme bulunamadı.
+be.noupdates = Yeni Sürüm Güncellemesi bulunamadı.
 be.check = Güncellemeleri kontrol et
 
-mod.featured.title = Mod Tarayıcısı
-mod.featured.dialog.title = Mod Tarayıcısı
-mods.browser.selected = Seçilen Mod
-mods.browser.add = Modu Ä°ndir
-mods.github.open = Modun GitHub Sayfasını Aç
+mods.browser = Mod Tarayıcı
+mods.browser.selected = Seçilmiş Mod
+mods.browser.add = Yükle
+mods.browser.reinstall = Yeniden Yükle
+mods.browser.view-releases = Sürümleri İncele
+mods.browser.noreleases = [scarlet]Sürüm Bulunamadı\n[accent]Bu mod için yayımlanmış bir sürüm bulunamadı.
+mods.browser.latest = <En Son>
+mods.browser.releases = Yayımlar
+mods.github.open = Depo
+mods.github.open-release = Yayım Sayfası
+mods.browser.sortdate = En yeniye göre sırala
+mods.browser.sortstars = Yıldız sayısına göre sırala
 
 schematic = Åžema
 schematic.add = Şemayı Kaydet...
 schematics = Åžemalar
-schematic.replace = Aynı isimde bir şema zaten var. Üzerine yazılsın mı?
-schematic.exists = Aynı isimde bir şema zaten var.
-schematic.import = Şema İçeri Aktar...
-schematic.exportfile = Dışa Aktar
-schematic.importfile = İçe Aktar
-schematic.browseworkshop = Atölyeyi incele
+schematic.search = Åžema ara...
+schematic.replace = Aynı adda bir şema zaten var. Üzerine yazılsın mı?
+schematic.exists = Aynı adda bir şema zaten var.
+schematic.import = Şemayı İçeri Aktar...
+schematic.exportfile = Dışarı Aktar
+schematic.importfile = İçeri Aktar
+schematic.browseworkshop = Atölyeyi araştır
 schematic.copy = Panoya Kopyala
-schematic.copy.import = Panodan İçeri Aktar
-schematic.shareworkshop = Atölyede Kaydet
+schematic.copy.import = Panodan Yapıştır
+schematic.shareworkshop = Atölyede paylaş
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Şemayı döndür
 schematic.saved = Åžema Kaydedildi.
 schematic.delete.confirm = Bu ÅŸema tamamen yok edilecek.
-schematic.rename = Şemayı yeniden adlandır
+schematic.edit = Şemayı Düzenle
 schematic.info = {0}x{1}, {2} blok
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Şema devre dışı bırakıldı[]\nBu şemayı [accent]bu haritada[] veya [accent]server'da kullanma iznin yok.
+schematic.tags = Etiketler:
+schematic.edittags = Etiketleri Düzenle
+schematic.addtag = Etiket Ekle
+schematic.texttag = Yazı Etiketi
+schematic.icontag = Ä°kon Etiketi
+schematic.renametag = Etiketi Yeniden Adlandır
+schematic.tagged = {0} etiketlendi
+schematic.tagdelconfirm = Bu Etiketi Silmek istediÄŸine emin misin?
+schematic.tagexists = Böyle bir Etiket zaten var.
 
-stat.wave = Yenilen Dalgalar:[accent] {0}
-stat.enemiesDestroyed = Yok Edilen Düşmanlar:[accent] {0}
-stat.built = İnşa Edilen Yapılar:[accent] {0}
-stat.destroyed = Yok Edilen Yapılar:[accent] {0}
-stat.deconstructed = Yıkılan Yapılar:[accent] {0}
-stat.delivered = Gönderilen Kaynaklar:
-stat.playtime = Oynama Süresi:[accent] {0}
-stat.rank = Rütbe: [accent]{0}
+stats = Ä°statistikler
+stats.wave = Kazanılan Dalgalar
+stats.unitsCreated = Ãœretilen Birimler
+stats.enemiesDestroyed = Yok Edilen Düşmanlar
+stats.built = İnşa Edilen Yapılar
+stats.destroyed = Yıkılan Yapılar
+stats.deconstructed = Kaldırılan Yapılar
+stats.playtime = Oynanan Süre
 
 globalitems = [accent]Toplanan Kaynaklar
 map.delete = "[accent]{0}[]" haritasını silmek istediğine emin misin?
 level.highscore = Rekor: [accent]{0}
-level.select = Seviye Seçimi
+level.select = Bölüm Seçimi
 level.mode = Oyun Modu:
 coreattack = < Merkez saldırı altında! >
 nearpoint = [[ [scarlet]Ä°NÄ°Åž PÄ°STÄ°NDEN AYRIL[] ]\nimha tehlikesi
-database = Çekirdek Veritabanı
+database = Merkez Veritabanı
+database.button = Veritabanı
 savegame = Oyunu Kaydet
 loadgame = Oyunu Yükle
 joingame = Oyuna Katıl
 customgame = Özel Oyun
 newgame = Yeni Oyun
 none = <yok>
-minimap = Harita
-position = Pozisyon
+none.found = [lightgray]<Bulunamadı>
+none.inmap = [lightgray]<Haritada Bulunamadı>
+minimap = Küçük Harita
+position = Konum
 close = Kapat
-website = Web sitesi
+website = Genel ağ sayfası
 quit = Çık
 save.quit = Kaydet & Çık
 maps = Haritalar
@@ -106,24 +129,39 @@ committingchanges = Değişiklikler Uygulanıyor
 done = Bitti
 feature.unsupported = Cihazınızda bu özellik desteklenmemektedir.
 
-mods.alphainfo = Modların alfa aşamasında olduğunu ve [scarlet]oldukça hatalı olabileceklerini[] unutmayın.\nBulduğunuz sorunları Mindustry GitHub'ı veya Discord'una bildirin.
+mods.initfailed = [red]⚠[] NOLAMAZ! Mindustry Çöktü. Bu Büyük ihtimalle bir moddan kaynaklandı.\n\nSonsuz Çökmeyi önlemek için, [red]tüm modlar kapatıldı.[]\n\nBu özelliği kapamak için, [accent]Ayarlar->Oyun->Modları Başlangıçta Çökme Durumunda Kapat[].
 mods = Modlar
 mods.none = [lightgray]Hiç mod bulunamadı!
 mods.guide = Mod Rehberi
 mods.report = Hata bildir
 mods.openfolder = Mod klasörünü aç
+mods.viewcontent = İçeriği Görüntüle
 mods.reload = Yeniden Yükle
 mods.reloadexit = Modları yeniden yüklemek için oyun kapanacak.
+mod.installed = [[Yüklendi]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Etkin
 mod.disabled = [scarlet]Devre Dışı
+mod.multiplayer.compatible = [gray]Çok Oyunculuya Uygun
 mod.disable = Devre Dışı Bırak
+mod.version = Version:
 mod.content = İçerik:
 mod.delete.error = Mod silinemiyor. Dosya kullanımda olabilir.
-mod.requiresversion = [scarlet]Gereken en düşük oyun versiyonu: [accent]{0}
-mod.outdated = [scarlet]V6 ile uyumlu deÄŸil (minGameVersion: 105 yok)
-mod.missingdependencies = [scarlet]Bu modun çalışması için gereken modlar: {0}
+mod.incompatiblegame = [red]Eski Sürüm
+mod.incompatiblemod = [red]Sürüm Uyuşmazlığı
+mod.blacklisted = [red]Desteklenmeyen Sürüm
+mod.unmetdependencies = [red]UyuÅŸmayan Modlar.
 mod.erroredcontent = [scarlet]İçerik hatası.
+mod.circulardependencies = [red]Döngüsel Bağımlılıklar
+mod.incompletedependencies = [red]Eksik Bağımlılıklar
+mod.requiresversion.details = [accent]{0}[] oyun sürümü gerekiyor.\nSürümün eski. Bu mod, çalışmak için oyunun daha yeni bir sürümünü gerektiriyor (büyük ihtimal alpha/beta).
+mod.outdatedv7.details = Bu mod, oyunun en son sürümüyle uyumsuz. Modun yapmıcısının [accent]mod.json[] dosyasına, [accent]minGameVersion: 146[] eklemesi gerekiyor.
+mod.blacklisted.details = Bu mod, oyunun bu sürümüyle hata verdiğinden veya başka sorunlar ötürü kara listeye alınmıştır. [#ff]KULLANMAYINIZ!
+mod.missingdependencies.details = Bu Mod, şu ek modları gerektiriyor: {0}
+mod.erroredcontent.details = Bu mod yüklenirken hata veriyor, yapımcıdan hataları düzeltmesini isteyin.
+mod.circulardependencies.details = Bu modun birbirine bağlı bağlılıkları var.
+mod.incompletedependencies.details = Eksik veya yanlış bağlılıklardan dolayı mod yüklenemedi: {0}.
+mod.requiresversion = Şu oyun sürümü gerekiyor: [red]{0}
 mod.errors = İçerik yüklenirken bir hata oluştu.
 mod.noerrorplay = [scarlet]Hatalı modlarınız var.[] Oynamadan önce bu modları devre dışı bırakın veya dosyadaki hataları düzeltin.
 mod.nowdisabled = [scarlet]'{0}' modunun çalışması için gerekli olan modlardan bazıları bulunamadı:[accent] {1}\n[lightgray]Önce bu modların indirilmesi gerekmektedir.\nBu mod otomatik olarak devre dışı bırakılacaktır.
@@ -132,25 +170,38 @@ mod.requiresrestart = Oyun mod değişikliklerini uygulamak için kapatılacak.
 mod.reloadrequired = [scarlet]Yeniden Yükleme Gerekli
 mod.import = Mod İçeri Aktar
 mod.import.file = Dosya İçeri Aktar
-mod.import.github = GitHub Modu İçeri Aktar 
-mod.jarwarn = [scarlet]Jar modları doğası gereği güvenli değildir.[]\nBu modu güvenilir bir kaynaktan içeri aktardığına emin ol!
+mod.import.github = GitHub Modu İçeri Aktar
+mod.jarwarn = [scarlet]Java modları doğası gereği güvenli değildir.[]\nBu modu güvenilir bir kaynaktan içeri aktardığına emin ol!
 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.remove.confirm = Bu mod silinecek
 mod.author = [lightgray]Yayıncı:[] {0}
 mod.missing = Bu kayıt yakın zamanda güncellediğiniz ya da artık yüklü olmayan modlar içermekte. Kayıt bozulmaları yaşanabilir. Kaydı yüklemek istediğinizden emin misiniz?\n[lightgray]Modlar:\n{0}
 mod.preview.missing = Bu modu atölyede yayınlamadan önce bir resim önizlemesi eklemelisiniz.\nMod dosyasına [accent]preview.png[] adlı bir resim yerleştirin ve tekrar deneyin.
 mod.folder.missing = Atölyede sadece klasör halindeki modlar yayınlanabilir.Bir modu klasöre çevirmek için, sadece mod dosyalarını bir klasöre çıkarın ve eski sıkıştırılmış dosyayı silin, sonra da oyunu tekrar başlatın ya da modlarınızı tekrar yükleyin.
-mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
+mod.scripts.disable = Cihazınız kod içeren modları desteklemiyor. \nOyunu oynamak için bu modları devre dışı bırakmalısınız.
 
 about.button = Hakkında
 name = Ä°sim:
 noname = Bir[accent] kullanıcı adı[] seçmelisin.
+search = Ara:
 planetmap = Gezegen Haritası
 launchcore = Kalkış
 filename = Dosya Adı:
 unlocked = Yeni içerik açıldı!
+available = Yeni Araştırma Mümkün!
+unlock.incampaign = < Detaylar için Mücadelede Araştır >
+campaign.select = Başlangıç Mücadelesi Seç
+campaign.none = [lightgray]Başlamak için bir gezegen seç.\nBu seçim herhangi bir zamanda değiştirlebilir.
+campaign.erekir = Daha yeni ve cilalanmış içerikler. Genellikle kararlı ilerleme.\n\nDaha kaliteli haritalar ve deneyim (herhalde).
+campaign.serpulo = Eski içerik; klasik deneyim. Daha serbest.\n\nDaha dengesiz harita ve deneyim. Cilayı unutmuşlar işte...
+campaign.difficulty = Zorluk
 completed = [accent]Tamamlandı
 techtree = Teknoloji Ağacı
+techtree.select = Teknoloji Ağacı Seç
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Yükle
+research.discard = Sil
 research.list = [lightgray]Araştırmalar:
 research = Araştır
 researched = [lightgray]{0} Araştırıldı.
@@ -166,59 +217,77 @@ server.kicked.serverClose = Sunucu kapandı.
 server.kicked.vote = Oylama ile sunucudan atıldın.
 server.kicked.clientOutdated = Eski sürüm! Oyununu güncelle!
 server.kicked.serverOutdated = Geçersiz sunucu!\nKurucudan oyununu güncellemesini iste!
-server.kicked.banned = Bu sunucudan yasaklandın.
-server.kicked.typeMismatch = Bu sunucu senin inşa türünle uyumlu değil.
+server.kicked.banned = Bu Sunucudan Yasaklandın! [#ff]LOL\n-[yellow]RT[cyan]Omega
+server.kicked.typeMismatch = Bu sunucu senin sürümünle uyumlu değil.
 server.kicked.playerLimit = Sunucu dolu. Yer açılmasını bekle.
 server.kicked.recentKick = Yakın bir zamanda bir sunucudan atıldın.\nBağlanmadan önce bir süre bekle.
 server.kicked.nameInUse = Sunucuda zaten o isimde biri var.
 server.kicked.nameEmpty = Seçtiğin isim geçersiz.
 server.kicked.idInUse = Zaten bu sunucudasın! İki hesapla bir sunucuya bağlanamazsın.
-server.kicked.customClient = Bu sunucu özel sürümleri kabul etmiyor. Resmi bir sürüm indir.
+server.kicked.customClient = Bu sunucu özel sürümleri kabul etmiyor. Resmî bir sürüm indir.
 server.kicked.gameover = Oyun bitti!
-server.kicked.serverRestarting = Sunucu yeniden başlatılıyor.
-server.versions = Kullandığın surum:[accent] {0}[]\nSunucunun sürümü:[accent] {1}[]
-host.info = [accent]host[], [scarlet]6567[] portunda bir sunucuya ev sahipliği yapıyor. \nAynı [lightgray]wifi veya yerel ağdaki[] herkes sunucu listelerinde senin sunucunu görebiliyor olmalı.\n\nEğer diğerlerinin herhangi bir yerden IP ile bağlanabilmesini istiyorsan [accent]port yönlendirmesi[] gerekli.\n\n[lightgray]Not: Eğer birisi senin yerel ağ oyununa katılmakta sorun yaşıyorsa güvenlik duvarı ayarlarında Mindustry'ye yerel ağ bağlantısı izni verdiğinden emin olun. Halka açık ağların zaman zaman sunucu aramaya engel olduğunu unutmayın.
-join.info = Burada, bağlanmak istediğin sunucunun [accent]IP[] adresini girebilir veya [accent]yerel ağ[] sunucularını görebilirsin..\nHem yerel ağ hem de geniş alan ağı çoklu oyuncu için destekleniyor.\n\n[lightgray]Not: Otomatik bir global sunucu listesi yok; eğer birisine IP adresi kullanarak bağlanmak istiyorsan IP adresini istemelisin.
+server.kicked.serverRestarting = Sunucu yeniden başlatılıyor...
+server.versions = Kullandığın Sürüm:[accent] {0}[]\nSunucunun Sürümü:[accent] {1}[]
+host.info = [accent]Kurucu[], [scarlet]6567[] portunda bir sunucuya ev sahipliği yapıyor. \nAynı [lightgray]wifi veya yerel ağdaki[] herkes sunucu listelerinde senin sunucunu görebiliyor olmalı.\n\nEğer diğerlerinin herhangi bir yerden IP ile bağlanabilmesini istiyorsan [accent]port yönlendirmesi[] gerekli.\n\n[lightgray]Not: Eğer birisi senin yerel ağ oyununa katılmakta sorun yaşıyorsa güvenlik duvarı ayarlarında Mindustry'ye yerel ağ bağlantısı izni verdiğinden emin olun. Halka açık ağların zaman zaman sunucu aramaya engel olduğunu unutmayın.
+join.info = Burada, bağlanmak istediğin sunucunun [accent]IP[] adresini girebilir veya [accent]yerel ağ[] sunucularını görebilirsin..\nHem yerel ağ hem de geniş alan ağı çoklu oyuncu için destekleniyor.\n\n[lightgray]Not: Otomatik bir küresel sunucu listesi yok; eğer birisine IP adresi kullanarak bağlanmak istiyorsan IP adresini istemelisin.
 hostserver = Çok Oyunculu Oyun Aç
-invitefriends = Arkadaşlarını Davet Et
-hostserver.mobile = Oyun Kur
-host = Kur
+invitefriends = Arkadaşlarını (Tabi Varsa) Davet Et
+hostserver.mobile = Sunucu Kur
+host = Sunucu Kur
 hosting = [accent]Sunucu açılıyor...
 hosts.refresh = Yenile
-hosts.discovering = Yerel ağ oyunu aranıyor
+hosts.discovering = Yerel Ağ oyunu aranıyor
 hosts.discovering.any = Oyun aranıyor
 server.refreshing = Sunucu yenileniyor
 hosts.none = [lightgray]Yerel oyun bulunamadı!
-host.invalid = [scarlet]Kurucuya bağlanılamıyor.
+host.invalid = [scarlet]Sunucuya bağlanılamıyor.
 
 servers.local = Yerel Sunucular
+servers.local.steam = Açık Oyunlar & Yerel Sunucular
 servers.remote = Uzak Sunucular
 servers.global = Topluluk Sunucuları
 
+servers.disclaimer = Topluluk Sunucuları, [accent]Yapımcı tarafından yönetilmiyor!\n\nSunucularda, her yaşa uygun olmayan yapı ve içerikler içerebilir!
+servers.showhidden = Gizli Sunucuları Göster
+server.shown = Görünür
+server.hidden = Gizli
+viewplayer = Oyuncu Ä°zleniyor: [accent]{0}
+
 trace = Oyuncuyu Takip Et
 trace.playername = Oyuncu Ä°smi: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = Özel ID: [accent]{0}
+trace.id = Özel Kimlik: [accent]{0}
+trace.language = Dil: [accent]{0}
 trace.mobile = Mobil Sürüm: [accent]{0}
 trace.modclient = Özel Sürüm: [accent]{0}
-invalidid = Geçersiz Sürüm ID'si! Bir hata raporu gönder.
+trace.times.joined = Girme Sayısı: [accent]{0}
+trace.times.kicked = Atılma Sayısı: [accent]{0}
+trace.ips = IPler:
+trace.names = Ä°simler:
+invalidid = Geçersiz Sürüm Kimliği! Bir hata raporu gönder.
+player.ban = Yasakla
+player.kick = At
+player.trace = İzini Sür
+player.admin = Admin Aç/Kapa
+player.team = Takım Değiştir
 server.bans = Yasaklılar
 server.bans.none = Yasaklanmış oyuncu bulunamadı!
-server.admins = Yönetici
+server.admins = Yöneticiler
 server.admins.none = Yönetici bulunamadı!
 server.add = Sunucu Ekle
 server.delete = Bu sunucuyu silmek istediÄŸine emin misin?
 server.edit = Sunucuyu Düzenle
-server.outdated = [crimson]Güncel Olmayan Sunucu![]
-server.outdated.client = [crimson]Güncel Olmayan Sürüm![]
+server.outdated = [crimson]Sunucu Sürümü Uyuşmuyor![]
+server.outdated.client = [crimson]Oyun Sürümü Uyuşmuyor![]
 server.version = [gray]v{0} {1}
 server.custombuild = [accent]Özel Sürüm
 confirmban = Bu kullanıcıyı yasaklamak istediğine emin misin?
 confirmkick = Bu kullanıcıyı atmak istediğine emin misin?
-confirmvotekick = Bu kullanıcıyı oylayıp atmak istediğinize emin misiniz?
 confirmunban = Bu kullanıcının yasağını kaldırmak istediğine emin misin?
 confirmadmin = Bu kullanıcıyı bir yönetici yapmak istediğine emin misin?
 confirmunadmin = Bu kullanıcının yönetici yetkilerini almak istediğine istediğine emin misin?
+votekick.reason = Oylama Sebebi
+votekick.reason.message = "{0}[white]" adlı kişiyi oylama ile atmak istediğinize emin misiniz?\nEğer istiyorsanız, lütfen sebebini giriniz:
 joingame.title = Oyuna Katıl
 joingame.ip = Adres:
 disconnect = Bağlantı kesildi.
@@ -226,19 +295,22 @@ disconnect.error = Bağlantı hatası.
 disconnect.closed = Bağlantı kapatıldı.
 disconnect.timeout = Zaman aşımı.
 disconnect.data = Dünya verisi yüklenemedi!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Oyuna girilemiyor ([accent]{0}[]).
 connecting = [accent]Bağlanılıyor...
+reconnecting = [accent]Yeniden Bağlanılıyor...
 connecting.data = [accent]Dünya verisi yükleniyor...
 server.port = Port:
-server.addressinuse = Adres zaten kullanılıyor!
 server.invalidport = Geçersiz port sayısı!
+server.error.addressinuse = [scarlet]Port 6567 açılamadı.[]\n\nCihaz ve internetinde başka bir Mindustry sunucusu açık olmadığından emin ol!
 server.error = [crimson]Sunucu kurulamadı: [accent]{0}
 save.new = Yeni kayıt
 save.overwrite = Bu kaydın üstüne yazmak istediğine\nemin misin?
+save.nocampaign = Mücadeleden tek bir kayıt yüklenemez.
 overwrite = Üstüne yaz
 save.none = Kayıt bulunamadı!
 savefail = Oyun kaydedilemedi!
-save.delete.confirm = Bu kaydı silmek istediğine emin misin?
+save.delete.confirm = Bu kaydı silmek istediğine gerçekten emin misin?
 save.delete = Sil
 save.export = Kaydı Dışa Aktar
 save.import.invalid = [accent]Bu kayıt geçersiz!
@@ -255,10 +327,11 @@ save.corrupted = [accent]Kayıt dosyası bozuk veya geçersiz!
 empty = <boÅŸ>
 on = Aç
 off = Kapa
+save.search = Kayıtlı Oyun Ara...
 save.autosave = Otomatik kayıt: {0}
 save.map = Harita: {0}
 save.wave = Dalga {0}
-save.mode = Oyun modu: {0}
+save.mode = Oyun Modu: {0}
 save.date = Son Kayıt: {0}
 save.playtime = Oynama süresi: {0}
 warning = Uyarı.
@@ -270,33 +343,62 @@ ok = Tamam
 open = Aç
 customize = Kuralları Özelleştir
 cancel = Ä°ptal
+command = Komuta Modu
+command.queue = [lightgray][Sıralanıyor]
+command.mine = Kaz
+command.repair = Tamir Et
+command.rebuild = Yeniden Ä°nÅŸaa Et
+command.assist = Oyuncuya Yardım Et
+command.move = Hareket Et
+command.boost = Gazla
+command.enterPayload = Kargo Bloğu Seç
+command.loadUnits = Birim Yükle
+command.loadBlocks = Blok Yükle
+command.unloadPayload = Birim Bırak
+command.loopPayload = Birim Transferini Döngüye Sok
+stance.stop = Emri Ä°ptal Et
+stance.shoot = Duruş: Saldırı
+stance.holdfire = Duruş: Hazır Ol
+stance.pursuetarget = DuruÅŸ: Hedefi Takip Et
+stance.patrol = DuruÅŸ: Devriye Gez
+stance.ram = Duruş: Düz\n[lightgray]Düz bir ol halinde ilerle.
 openlink = Bağlantıyı Aç
 copylink = Bağlantıyı Kopyala
 back = Geri
+max = Maks
+objective = Harita Görevi
+crash.export = Çökme Hatasını Günlüğünü Dışarı Aktar
+crash.none = Çökme Hatası Günlüğü Bulunamadı.
+crash.exported = Çökme Hatası Günlüğü Dışarı Aktarıldı.
 data.export = Veriyi Dışa Aktar
 data.import = Veriyi İçe Aktar
 data.openfolder = Veri Klasörü Aç
 data.exported = Veri dışa aktarıldı.
-data.invalid = Bu oyun verisi geçerli değil.
+data.invalid = Bu oyun verisi geçerli değil. RIP
 data.import.confirm = Dışarıdan içeri veri aktarmak şu anki verilerinizin [scarlet]tamamını[] silecektir.[accent]Bu işlem geri alınamaz![]\n\nVeri içeri aktarıldığında oyundan çıkacaksınız.
 quit.confirm = Çıkmak istediğinize emin misiniz?
-quit.confirm.tutorial = Ne yaptığınıza emin misiniz?\nÖğreticiyi [accent] Ayarlar -> Oyun -> Öğreticiyi Yeniden Al[]'dan tekrar yapabilirsiniz.
 loading = [accent]Yükleniyor...
-reloading = [accent]Modlar Yeniden Yükleniyor...
+downloading = [accent]Ä°ndiriliyor...
 saving = [accent]Kayıt ediliyor...
-respawn = [accent][[{0}][] Çekirdekte yeniden doğ
+respawn = [accent][[{0}][] Merkezde yeniden doÄŸ
 cancelbuilding = [accent][[{0}][] Planı temizle
 selectschematic = [accent][[{0}][] Seç ve kopyala
 pausebuilding = [accent][[{0}][] İnşaatı durdur
 resumebuilding = [scarlet][[{0}][] Ä°nÅŸaata devam et
+enablebuilding = [scarlet][[{0}][] Ä°nÅŸa Etmeyi BaÅŸlat
+showui = Arayüz Kapalı.\nAçmak için [accent][[{0}][] bas.
+commandmode.name = [accent]Komuta Modu
+commandmode.nounits = [birim yok]
 wave = [accent]Dalga {0}
 wave.cap = [accent]Dalga {0}/{1}
 wave.waiting = [lightgray]{0} saniye içinde dalga başlayacak
 wave.waveInProgress = [lightgray]Dalga gerçekleşiyor
 waiting = [lightgray]Bekleniliyor...
 waiting.players = Oyuncular bekleniliyor...
-wave.enemies = [lightgray]{0} Tane Düşman Kaldı
-wave.enemy = [lightgray]{0} Tane Düşman Kaldı
+wave.enemies = [lightgray]{0} tane Düşman Kaldı
+wave.enemycores = [accent]{0}[lightgray] Düşman Merkezler
+wave.enemycore = [accent]{0}[lightgray] Düşman Merkez
+wave.enemy = [lightgray]{0} tane Düşman Kaldı
 wave.guardianwarn = [accent]{0}[] dalga sonra gardiyan yaklaşıyor.
 wave.guardianwarn.one = [accent]{0}[] dalga sonra gardiyan yaklaşıyor.
 loadimage = Resim Aç
@@ -306,9 +408,9 @@ custom = Özel
 builtin = YerleÅŸik
 map.delete.confirm = Bu haritayı silmek istediğinizden emin misiniz? Bunu geri alamazsınız!
 map.random = [accent]Rastgele Harita
-map.nospawn = Bu haritada oyuncunun doğacağı hiç çekirdek yok! Editörden bu haritaya[accent] turuncu[] bir çekirdek ekleyin. 
-map.nospawn.pvp = Bu Haritada düşmanın doğacağı hiç çekirdek yok! Editörden bu haritaya [scarlet]turuncu olmayan[] çekirdekler ekleyin.
-map.nospawn.attack = Bu haritada oyuncunun saldıracağı hiç düşman çekirdeği yok! Editörden haritaya[scarlet] kırmızı[] çekirdekler ekleyin.
+map.nospawn = Bu haritada oyuncunun doğacağı hiç bir Merkez yok! Düzenleyiciden bu haritaya {0} bir Merkez ekleyin.
+map.nospawn.pvp = Bu Haritada düşmanın doğacağı hiç Merkez yok! Düzenleyiciden bu haritaya [scarlet]turuncu olmayan[] Merkezler ekleyin.
+map.nospawn.attack = Bu haritada oyuncunun saldıracağı hiç düşman çekirdeği yok! Editörden haritaya {0} Merkezler ekleyin.
 map.invalid = Haritayı açarken hata oldu: bozulmuş ya da geçersiz harita dosyası.-
 workshop.update = Nesneyi Güncelle
 workshop.error = Atölye ayrıntılarını alırken hata oluştu: {0}
@@ -316,13 +418,18 @@ map.publish.confirm = Bu haritayı yayınlamak istediğinize emin misiniz?\n[lig
 workshop.menu = Bu eşya ile ne yapmak istediğinizi seçin.
 workshop.info = Eşya açıklaması
 changelog = Değişim Listesi (isteğe bağlı):
+updatedesc = Başlık ve Açıklamanın Üzerine Yaz
 eula = Steam Kullanıcı Sözleşmesi
 missing = Bu eşya silinmiş veya taşınmış.\n[lightgray]Workshop listesinden kaldırıldı.
-publishing = [accent]Yayınlanıyor...
+publishing = [accent]Yayımlanıyor...
 publish.confirm = Bunu yayınlamak istediğinize emin misiniz?\n[lightgray]önce Atölye Sözleşmesine uyduğunuza emin olun, yoksa yapıtlarınız gözükmeyecektir!
-publish.error = Nesneyi yayınlarken hata oluştu: {0}
+publish.error = Nesneyi yayımlarken hata oluştu: {0}
 steam.error = Steam hatası.\nHata kodu: {0}
+editor.planet = Gezegen:
+editor.sector = Sektör:
+editor.seed = Tohum:
 
+editor.cliffs = Duvardan Kayalığa
 editor.brush = Fırça
 editor.openin = Düzenleyici'de Aç
 editor.oregen = Maden OluÅŸumu
@@ -334,76 +441,119 @@ editor.nodescription = Haritanın en az 4 harflik bir açıklaması olması gere
 editor.waves = Dalgalar:
 editor.rules = Kurallar:
 editor.generation = OluÅŸum:
+editor.objectives = Görevler:
+editor.locales = Dil Paketleri
+editor.worldprocessors = Evrensel Ä°ÅŸlemciler
+editor.worldprocessors.editname = Adı Düzenle
+editor.worldprocessors.none = [lightgray]Evrensel İşlemci bloğu bulunamadı!\nHarita düzenleyicisinden ekleyin veya aşağıdaki \ue813 Ekle butonunu kullanın.
+editor.worldprocessors.nospace = Evrensel İşlemci yerleştirecek yer yok!\n Gerçekten bütün haritayı yapılarla mı doldurdun? Bunu neden yaparsın?
+editor.worldprocessors.delete.confirm = Bu Evrensel İşlemciyi silmek istediğine emin misin?\n\nEğer etrafında duvar varsa bir doğal duvarla yer değiştirilecek.
 editor.ingame = Oyun içinde düzenle
+editor.playtest = Test Et
 editor.publish.workshop = Atölyede Yayınla
 editor.newmap = Yeni Harita
 editor.center = Ortala
+editor.search = Harita Ara...
+editor.filters = Harita Filtrele
+editor.filters.mode = Oyun Modları:
+editor.filters.type = Harita Türleri:
+editor.filters.search = Ara:
+editor.filters.author = Yapımcı
+editor.filters.description = Açıklama
+editor.shiftx = X Ekseninde Kaydır
+editor.shifty = Y Ekseninde Kaydır
 workshop = Atölye
 waves.title = Dalgalar
 waves.remove = Kaldır
-waves.never = <asla>
 waves.every = her
 waves.waves = dalga(lar)
+waves.health = can: {0}%
 waves.perspawn = doğma noktası başına
 waves.shields = kalkan/dalga
 waves.to = doÄŸru
+waves.spawn = doğma bölgesi:
+waves.spawn.all = <tüm>
+waves.spawn.select = Doğma Bölgesi Seçme
+waves.spawn.none = [scarlet]bu haritada doğma noktası bulunmuyor
+waves.max = maks birim
 waves.guardian = Gardiyan
 waves.preview = Önizleme
 waves.edit = Düzenle...
+waves.random = Rastgele
 waves.copy = Panodan kopyala
 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
+waves.sort = Sıralama Ölçeği:
+waves.sort.reverse = Ters Sırala
+waves.sort.begin = BaÅŸla
+waves.sort.health = Can
+waves.sort.type = Tür
+waves.search = Dalga ara...
+waves.filter = Birim Filtresi
+waves.units.hide = Hepsini Gizle
+waves.units.show = Hepsini Göster
 
+#bunlar özellikle küçük başlıyor.
 wavemode.counts = miktarlar
 wavemode.totals = toplamlar
 wavemode.health = can
+all = Tüm
 
 editor.default = [lightgray]<Varsayılan>
 details = Detaylar...
 edit = Düzenle...
+variables = DeÄŸiÅŸkenler
+logic.clear.confirm = Bu işlemciden bütün kodları silmek istediğinze emin misiniz?
+logic.globals = Dahili DeÄŸiÅŸkenler
 editor.name = Ä°sim:
-editor.spawn = Eleman OluÅŸtur
-editor.removeunit = Eleman Kaldır
+editor.spawn = Birim OluÅŸtur
+editor.removeunit = Birim Kaldır
 editor.teams = Takımlar
 editor.errorload = Dosya yüklerken hata oluştu:\n[accent]{0}
 editor.errorsave = Dosya kaydederken hata oluÅŸtu:\n[accent]{0}
-editor.errorimage = Bu bir harita değil, bir resim.\n\nEğer 3.5/build 40 bir haritayı içeri aktarmak istiyorsanız, editördeki "Legacy Harita İçeri Aktar" butonunu kullanın.
+editor.errorimage = Bu bir harita değil, bir resim.\n\nEğer 3.5/b40 bir haritayı içeri aktarmak istiyorsanız, düzenleyicideki "Legacy Harita İçeri Aktar" butonunu kullanın.
 editor.errorlegacy = Bu harita çok eski ve artık desteklenmeyen bir legacy harita biçimi kullanıyor.
 editor.errornot = Bu bir harita dosyası değil.
 editor.errorheader = Bu harita dosyası geçerli değil ya da bozuk.
-editor.errorname = Haritanın ismi yok. Bir kayıt dosyası mı yüklemeye çalışıyorsunuz?
+editor.errorname = Haritanın ismi yok!?! Bir kayıt dosyası mı yüklemeye çalışıyorsunuz?
+editor.errorlocales = Yerel Paketleri okurkan hata oluÅŸtu.
 editor.update = Güncelle
 editor.randomize = Rastgele Yap
+editor.moveup = Yukarı Kaydır
+editor.movedown = Aşağı Kaydır
+editor.copy = Kopyala
 editor.apply = Uygula
-editor.generate = OluÅŸtur
+editor.generate = OluÅŸum
+editor.sectorgenerate = Sektör Oluştur
 editor.resize = Yeniden Boyutlandır
 editor.loadmap = Harita Yükle
-editor.savemap = Harita Kaydet
+editor.savemap = Haritayı Kaydet
+editor.savechanges = [scarlet]KaydedilmemiÅŸ deÄŸiÅŸiklikleriniz var!\n\n[]Kaydetmek ister misiniz?
 editor.saved = Kaydedildi!
 editor.save.noname = Haritanın bir ismi yok! 'Harita bilgileri' menüsünden bir isim seç.
 editor.save.overwrite = Haritan bir yerleşik haritayla örtüşüyor! 'Harita bilgileri' menüsünden farklı bir isim seç.
 editor.import.exists = [scarlet]İçeri aktarılamadı:[] '{0}' isminde zaten bir yerleşik harita var!
-editor.import = İçeri Aktar...
+editor.import = İçeri Aktar
 editor.importmap = Haritayı İçeri Aktar
 editor.importmap.description = Var olan bir haritayı içeri aktar
 editor.importfile = Dosyayı İçeri Aktar
 editor.importfile.description = Dışarıdaki bir harita dosyasını içeriye aktar
 editor.importimage = Eski Haritayı İçeri Aktar
 editor.importimage.description = Dışarıdaki bir resim-harita dosyasını içeriye aktar
-editor.export = Dışarı Aktar...
+editor.export = Dışarı Aktar
 editor.exportfile = Dosyayı Dışarı Aktar
 editor.exportfile.description = Harita dosyasını dışarıya aktar
 editor.exportimage = Arazi Görüntüsü Dışa Aktar
 editor.exportimage.description = Bir harita resim dosyasını dışa aktar
 editor.loadimage = Arazi İçeri Aktar
 editor.saveimage = Arazi Dışa Aktar
-editor.unsaved = [scarlet]Kaydedilmemiş değişiklikleriniz var![]\nÇıkmak istediğinize emin misiniz?
+editor.unsaved = [scarlet]Kaydedilmemiş değişikliklerin var![]\nÇıkmak istediğinize emin misiniz?
 editor.resizemap = Haritayı Yeniden Boyutlandır
 editor.mapname = Harita Ä°smi:
 editor.overwrite = [accent]Uyarı!\nBu işlem var olan bir haritanın üstüne yazar.
-editor.overwrite.confirm = [scarlet]Uyarı![] Bu ada sahip bir harita zaten var. Onun üstüne yazmak ister misiniz?
+editor.overwrite.confirm = [scarlet]Uyarı![] Bu ada sahip bir harita zaten var. Onun üstüne yazmak istediğine emin misiniz?
 editor.exists = Bu ada sahip bir harita zaten var.
 editor.selectmap = Yüklemek için bir harita seçin:
 
@@ -417,17 +567,22 @@ toolmode.square = Kare
 toolmode.square.description = Kare fırça.
 toolmode.eraseores = Maden Sil
 toolmode.eraseores.description = Sadece madenleri siler..
-toolmode.fillteams = Takımları Doldur 
+toolmode.fillteams = Takımları Doldur
 toolmode.fillteams.description = Bloklar yerine takımları doldurur.
+toolmode.fillerase = Doldur Sil
+toolmode.fillerase.description = Aynı türden blokları sil.
 toolmode.drawteams = Takım Çiz
 toolmode.drawteams.description = Bloklar yerine takımları çizer..
+toolmode.underliquid = Sıvı Altı
+toolmode.underliquid.description = Sıvıların altına zemin koyma.
+
+filters.empty = [lightgray]Hiç filtre yok! Aşağıdaki düğmelerle bir adet ekle.
 
-filters.empty = [lightgray]Hiç filtre yok! Aşağıdaki butonla bir adet ekleyin.
 filter.distort = Çarpıt
 filter.noise = Gürültü
 filter.enemyspawn = Düşman Doğma Alanı Seçimi
 filter.spawnpath = Doğma Noktasına Yol
-filter.corespawn = Çekirdek Seçimi
+filter.corespawn = Merkez Seçimi
 filter.median = Medyan
 filter.oremedian = Maden Medyanı
 filter.blend = Geçiş
@@ -439,6 +594,8 @@ filter.clear = Temizle
 filter.option.ignore = Yoksay
 filter.scatter = Saç
 filter.terrain = Arazi
+filter.logic = Mantık
+
 filter.option.scale = Ölçek
 filter.option.chance = Åžans
 filter.option.mag = Genlik
@@ -447,20 +604,42 @@ filter.option.circle-scale = Daire Ölçek
 filter.option.octaves = Oktavlar
 filter.option.falloff = Düşüş
 filter.option.angle = Açı
+filter.option.tilt = EÄŸim
+filter.option.rotate = Döndür
 filter.option.amount = Miktar
 filter.option.block = Blok
 filter.option.floor = Zemin
 filter.option.flooronto = Hedef Zemin
-filter.option.target = Target
+filter.option.target = Hedef
+filter.option.replacement = DeÄŸiÅŸtirme
 filter.option.wall = Duvar
 filter.option.ore = Maden
 filter.option.floor2 = Ä°kincil Duvar
 filter.option.threshold2 = Ä°kincil EÅŸik
 filter.option.radius = Yarıçap
 filter.option.percentile = Yüzdelik
+filter.option.code = Kod
+filter.option.loop = Döngü
+locales.info = Burada, haritanız için dil paketleri ekleyebilirsiniz. Dil paketlerinde, her sabitin bir adı ve de bir değeri olur. Bu sabitler adları ile evrensel işlemciler ve hedefler tarafından kullanılabilirler. Metin biçimlendirme desteklerler (placeholder değerleri asıllarıyla değiştirmeyi).\n\n[cyan]Örnek sabit:\n[]ad: [accent]timer[]\ndeğer: [accent]Örnek zamanlayıcı, kalan zaman: {0}[]\n\n[cyan]Kullanım:\n[]Bir görevin metni olarak ayarla: [accent]@timer\n\n[]Evrensel işlemcide yazdır:\n[accent]localeprint "timer"\nformat time\n[gray](time burada ayrıca hesaplanan bir değişken)
+locales.deletelocale = Bu dil paketini silmek istediÄŸinze emin misiniz?
+locales.applytoall = Değişiklikleri Tüm Dil Paketlerine Uygula
+locales.addtoother = DiÄŸer Dil Paketlerine Ekle
+locales.rollback = Son uygulanana geri dön
+locales.filter = Sabit filtresi
+locales.searchname = Ad ara...
+locales.searchvalue = DeÄŸer ara...
+locales.searchlocale = Dil paketi ara...
+locales.byname = Ada göre
+locales.byvalue = Değere göre
+locales.showcorrect = Bütün dil paketlerinde bulunan ve her yerde özel değeri olan sabitleri göster
+locales.showmissing = Bazı dil paketlerinde eksik olan sabitleri göster
+locales.showsame = Farklı dil paketlerinde aynı değere sahip sabitleri göster
+locales.viewproperty = Bütün dillerde göster
+locales.viewing = Sabit "{0}" gösteriliyor.
+locales.addicon = Simge Ekle
 
-width = Eni:
-height = Boyu:
+width = En:
+height = Boy:
 menu = Menü
 play = Oyna
 campaign = Mücadele
@@ -468,87 +647,197 @@ load = Yükle
 save = Kaydet
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
+memory = Mem: {0}mb
+memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Dil ayarlarının çalışması için lütfen oyunu yeniden başlatın.
 settings = Ayarlar
 tutorial = Öğretici
-tutorial.retake = Öğreticiyi Yeniden Al
+tutorial.retake = Öğreticiyi Yeniden Gör
 editor = Düzenleyici
 mapeditor = Harita Düzenleyicisi
 
 abandon = Terk Et
-abandon.text = Bu bölge ve toplanan bütün kaynaklar düşmana kaybedilecek.
+abandon.text = Bu bölge ve toplanan bütün kaynaklar düşmana kaybedilecek!
 locked = Kilitli
 complete = [lightgray]UlaÅŸ:
 requirement.wave = Bölge {1}'de Dalga {0}
 requirement.core = {0}`da Düşman Çekirdeği Yok Et
 requirement.research = {0} araştır
+requirement.produce = {0} üret
 requirement.capture = {0} sektörünü ele geçir
-bestwave = [lightgray]En Ä°yi Dalga: {0}
+requirement.onplanet = Sektör {0} Kontrol Et
+requirement.onsector = Sektör {0}e İniş Yap
 launch.text = Kalkış
-research.multiplayer = Sadece kurucu araştırma yapabilir.
+map.multiplayer = Sadece sunucu sahibi sektörleri görebilir.
 uncover = Aç
 configure = Ekipmanı Yapılandır
+objective.research.name = Araştır
+objective.produce.name = Ãœret
+objective.item.name = Elde Et
+objective.coreitem.name = Merkez Eşyası
+objective.buildcount.name = Bina Sayısı
+objective.unitcount.name = Birim Sayısı
+objective.destroyunits.name = Birim Yoket
+objective.timer.name = Sayaç
+objective.destroyblock.name = Blok Yok Et
+objective.destroyblocks.name = Blokları Yok Et
+objective.destroycore.name = Merkezi Yok Et
+objective.commandmode.name = Komuta Et
+objective.flag.name = Bayrak
+marker.shapetext.name = Şekilli Yazı
+marker.point.name = Nokta
+marker.shape.name = Åžekil
+marker.text.name = Yazı
+marker.line.name = Hat
+marker.quad.name = Dörtlü
+marker.texture.name = Doku
+marker.background = Arka Plan
+marker.outline = Ana Hat
+objective.research = [accent]Araştır:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Ãœret:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Yok Et:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Yok Et: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Elde Et: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Merkeze Taşı:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Ä°nÅŸa Et: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Birim Ä°nÅŸa Et: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Yok Et: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Düşman saldırısına: [lightgray]{0}[]
+objective.enemyescelating = [accent]Düşman üretimi [lightgray]{0}[] içinde hızlanacak.
+objective.enemyairunits = [accent]Düşman hava birimi üretimi [lightgray]{0}[] içinde başlayacak.
+objective.destroycore = [accent]Düşman Merkezini Yok Et
+objective.command = [accent]Birimleri Kumanda Et
+objective.nuclearlaunch = [accent]⚠ Nükleer Saldırı tespit edildi: [lightgray]{0}
+announce.nuclearstrike = [red]âš  NÃœKLEER SALDIRI âš 
+
 loadout = Yükleme
 resources = Kaynaklar
+resources.max = Maks
 bannedblocks = Yasaklı Bloklar
+unbannedblocks = Unbanned Blocks
+objectives = Görevler
+bannedunits = Yasaklı Birimler
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Yasaklı Birimleri Beyazlisteye Ata
+bannedblocks.whitelist = Yasaklı Binaları Beyazlisteye Ata
 addall = Hepsini Ekle
+launch.from = [accent]{0} dan fırlatılıyor.
+launch.capacity = Fırlatılan Malzeme Kapasitesi: [accent]{0}
 launch.destination = Varış Yeri: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 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.resources = [lightgray]Tespit Edilen Kaynaklar:
-zone.objective = [lightgray]Hedef: [accent]{0}
-zone.objective.survival = Hayatta Kal
-zone.objective.attack = Düşman Merkezini Yok Et
 add = Ekle...
-boss.health = Boss Canı
+guardian = Gardiyan
 
 connectfail = [crimson]Bağlantı hatası:\n\n[accent]{0}
 error.unreachable = Sunucuya ulaşılamıyor.\nAdresin doğru yazıldığına emin misiniz?
 error.invalidaddress = Geçersiz adres.
-error.timedout = Zaman aşımı!\nSunucunun port yönlendirmeyi ayarladığına ve adresin doğru olduğuna emin olun! 
+error.timedout = Zaman aşımı!\nSunucunun port yönlendirmeyi ayarladığına ve adresin doğru olduğuna emin ol!
 error.mismatch = Paket hatası:\nSunucu ve alıcı arasında versiyon uyuşmazlığı ihtimali var.\nHem sizde hem de sunucuda Mindustry'nin en son sürümü yüklü olduğuna emin olun!
 error.alreadyconnected = Zaten bağlanıldı.
 error.mapnotfound = Harita dosyası bulunamadı!
 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.
+error.moddex = Mindustry bu modu yükleyemedi.\nAndroid'de son değişimlerden dolayı cihazın Java modlarını yükleyemiyor.\nBu sorunun bilinen bir çözümü yok, zaten oyunu git pc de oyna, mobil kontroller kanser...
 
 weather.rain.name = YaÄŸmur
-weather.snow.name = Kar
+weather.snowing.name = Kar
 weather.sandstorm.name = Kum Fırtınası
-weather.sporestorm.name = Spor YaÄŸmuru
+weather.sporestorm.name = Spor Fırtınası
 weather.fog.name = Sis
+campaign.playtime = \uf129 [lightgray]Sektörde Oynama Süresi: {0}
+campaign.complete = [accent]Tebrikler!.\n\n{0} üzerinde bulunan düşman bozguna uğratılmıştır.\n[lightgray]Son sektör fethedilmiştir. GG!
 
+sectorlist = Sektörler
+sectorlist.attacked = {0} saldırı altında
 sectors.unexplored = [lightgray]KeÅŸfedilmemiÅŸ
 sectors.resources = Kaynaklar:
 sectors.production = Ãœretim:
+sectors.export = Ä°hracat:
+sectors.import = Ä°thalat:
+sectors.time = Zaman:
+sectors.threat = Zorluk:
+sectors.wave = Dalga:
 sectors.stored = Depolanan:
 sectors.resume = Devam Et
-sectors.launch = Kalkış
+sectors.launch = Fırlat
 sectors.select = Seç
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]yok (güneş)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Sektörü Yeniden Adlandır
-sector.missingresources = [scarlet]Yetersiz Çekirdek Kaynakları
+sectors.enemybase = [scarlet]Düşman Üs
+sectors.vulnerable = [scarlet]Dayanıksız
+sectors.underattack = [scarlet]Saldırı Altında! [accent]{0}% hasarlı
+sectors.underattack.nodamage = [scarlet]Elegeçirilmemeiş
+sectors.survives = [accent]{0} Dalgaya dayanabilir!
+sectors.go = Git
+sector.abandon = Terk Et
+sector.abandon.confirm = Bu sektörün merkezi kendini imha edecek.\nDevam Et?
+sector.curcapture = Sektör Elegeçirildi
+sector.curlost = Sektör Kaybedildi
+sector.missingresources = [scarlet]Yetersiz Merkez Kaynakları
+sector.attacked = Sektör [accent]{0}[white] saldırı altında!
+sector.lost = Sektör [accent]{0}[white] kaybedildi!
+sector.capture = Sektör [accent]{0}[white]Ele geçirildi!
+sector.capture.current = Sektör Ele geçirildi!
+sector.changeicon = Ä°kon DeÄŸiÅŸtir
+sector.noswitch.title = Sektör Değiştirilemiyor
+sector.noswitch = Bir Sektör saldırı altındayken başka bir sektöre geçemezsin.\n\nSektör: [accent]{1}[] deki [accent]{0}[]
+sector.view = Sektörü Göster
+
+threat.low = Düşük
+threat.medium = Orta
+threat.high = Yüksek
+threat.extreme = Aşırı
+threat.eradication = İmkansız
+difficulty.casual = Sakin
+difficulty.easy = Kolay
+difficulty.normal = Normal
+difficulty.hard = Zor
+difficulty.eradication = Absürd
+
+planets = Gezegenler
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Güneş
 
+sector.impact0078.name = Darbe 0078
 sector.groundZero.name = Sıfır Noktası
 sector.craters.name = Kraterler
 sector.frozenForest.name = DonmuÅŸ Orman
 sector.ruinousShores.name = Harap Kıyılar
 sector.stainedMountains.name = Lekeli DaÄŸlar
-sector.desolateRift.name = Issız Aralık
-sector.nuclearComplex.name = Kompleks Nükleer Üretimi
-sector.overgrowth.name = Fazla Büyüme
-sector.tarFields.name = Katran Alanları
+sector.desolateRift.name = Issız Kanyon
+sector.nuclearComplex.name = Nükleer Santral Kompleksi
+sector.overgrowth.name = Sarmaşık Sporlar
+sector.tarFields.name = Katran Çölü
 sector.saltFlats.name = Tuz Düzlükleri
 sector.fungalPass.name = Mantar Geçidi
+sector.biomassFacility.name = Sentetik Biyokütle Tesisi
+sector.windsweptIslands.name = Rüzgarlı Adalar
+sector.extractionOutpost.name = Kazı Üssü
+sector.facility32m.name = 32 M Üssü
+sector.taintedWoods.name = Ä°sli Orman
+sector.infestedCanyons.name = Ä°stila EdilmiÅŸ Canyon
+sector.planetaryTerminal.name = Gezegenler Arası Terminal
+sector.coastline.name = Kıyı Şeridi
+sector.navalFortress.name = Deniz Kalesi
+sector.polarAerodrome.name = Polar Havaalanı
+sector.atolls.name = Atoller
+sector.testingGrounds.name = Test Arazisi
+sector.seaPort.name = Deniz Limanı
+sector.weatheredChannels.name = Erezyonlu Kanallar
+sector.mycelialBastion.name = Mantar Kale
+sector.frontier.name = Öncü Üs
 
 sector.groundZero.description = Yeniden başlamak için ideal bölge. Düşük düşman tehlikesi ve az miktarda kaynak mevcut. Mümkün olduğunca çok bakır ve kurşun topla.\nİlerle.
 sector.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.
-sector.saltFlats.description = Çölün kenar kısımlarında tuz düzlükleri uzanır. Bu konumda az miktarda kaynak bulunur.\n\nDüşman burada kompleks bir kaynak depolama sistemi inşa etti. Çekirdeklerini yok et. Ayakta hiçbir şey bırakma.
+sector.saltFlats.description = Çölün kenar kısımlarında tuz düzlükleri uzanır. Bu konumda az miktarda kaynak bulunur.\n\nDüşman burada kompleks bir kaynak depolama sistemi inşa etti. Merkezlerini yok et. Ayakta hiçbir şey bırakma.
 sector.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.
 sector.ruinousShores.description = Yıkıntıların ardında bir kıyı var. Bir zamanlar bu konum bir dizi kıyı defansına ev sahipliği yapmış. Geriye pek bir şey kalmamış. Sadece en temel savunma yapıları zarar görmeden kaldı, onun dışındaki her şey hurdaya geri dönüştü.\nDışa doğru genişletmeye devam et. Teknolojiyi yeniden keşfet.
 sector.stainedMountains.description = Daha uzaklarda dağlar uzanıyor, daha sporlar tarafından istilaya uğramamışlar.\nAlandaki serbest titanyumu çıkart ve kullanmasını öğren.\n\nDüşman varlığı burada daha fazla. Onların daha güçlü birimlerini göndermelerine izin verme.
@@ -557,6 +846,75 @@ sector.tarFields.description = Bir petrol üretim bölgesinin eteklerinde, dağl
 sector.desolateRift.description = Aşırı tehlikeli bir bölge. Bol kaynaklar, ama az yer mevcut. Yüksek yıkım riski. Mümkün olduğunca çabuk ayrılmaya çalış. Düşman saldırıları arasındaki uzun mesafeye aldanma.
 sector.nuclearComplex.description = Toryum üretimi ve işlenmesi için eski bir tesistir, harabeye dönüşmüştür.\n[lightgray]Toryumu ve onun birçok kullanımını araştır. \n\nDüşman burada çok sayıda mevcut ve sürekli saldırganları arıyorlar.
 sector.fungalPass.description = Yüksek dağlar ve daha alçak, sporla dolu topraklar arasında bir geçiş alanıdır. Burada küçük bir düşman keşif üssü bulunuyor.\nOnu yok et.\nDagger ve Crawler birlikleri kullan. İki çekirdeği çıkar.
+sector.biomassFacility.description = Sporların ana kaynağı. Burası, onların üretim yeri.\nOnların içindeki gücü araştır. Sporları parçala, enerji ve plastik üret..\n\n[lightgray]Bu Fabrika yıkıldığında, sporlar etrafa yayldı. Hiçbir yaşam formu, bu forma üstün gelemedi.
+sector.windsweptIslands.description = Kıyının hemen yanında, bir adalar topluluğu. Kayıtlar bir zamanlar, [accent]Plastik[]-üreten binalar olduğunu gösteriyor.\n\nDüşman gemilerini batır, bir üs inşa et ve plastik üretmeye başla.
+sector.extractionOutpost.description = Uzak bir üs, düşman tarafından inşa edildiği düşünülüyor.\n\nSektörler arası aktarım, gelecek için çok önemli bir kademe. Üssü yok et, Fırlatış rampasını aç!
+sector.impact0078.description = Burası, eskiden buraya düşmüş bir yıldızlar arası uzay gemisinin kalıntıları.\n\nOlabildiğince çok şeyi araştır. Teknolojiden yararlan.
+sector.planetaryTerminal.description = Son aşama.\n\nBu üs, başka gezegenlere gitmeyi sağlayan teknolojiyi barıdırıyor. Aşırı iyi bir şekilde korunuyor.\n\nOlabildiğince hızlı bir şekilde gemi üret ve düşman üssü elegeçir. Gezegenler Arası Hızladırıcıyı aç!
+sector.coastline.description = Bu bölgede denizel birim teknoloji kalıntıları tespit edildi. Düşman saldırılarını püskürt, sektörü ele geçir ve teknolojiyi kurtar.
+sector.navalFortress.description = Düşman bu uzak adaya doğal olarak korunan bir üs kurmuş. Bu üssü yok et. Onların gelişmiş savaş gemisi teknolojilerini elde et ve araştır.
+sector.cruxscape.name = Crux Düzlüğü
+sector.geothermalStronghold.name = Jeotermal Sığınağı
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+sector.onset.name = Yeni Başlangıç
+sector.aegis.name = Siper
+sector.lake.name = Göletçik
+sector.intersect.name = KesiÅŸim
+sector.atlas.name = Atlas
+sector.split.name = Ayrılım
+sector.basin.name = Havza
+sector.marsh.name = Bataklık
+sector.peaks.name = Doruk Noktası
+sector.ravine.name = Kanyon
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Sığınak
+sector.crevice.name = Çatlak
+sector.siege.name = KuÅŸatma
+sector.crossroads.name = KavÅŸak
+sector.karst.name = Karst
+sector.origin.name = Başlangıç
+sector.onset.description = Öğretici Sektör. Bu Sektörün Görevleri daha belirlenmedi. Daha fazla bilgi için beklemede kal.
+sector.aegis.description = Düşman Kalkanların arkasına Sığınmış Durumda! Bu Sektörde Deneysel bir Kalkan Kırıcı Bulunmakta.\nBu Yapıyı Bul, Tungsten ile çalıştır ve Düşman Base i Fethet!
+sector.lake.description = Bu Sektörün Cürüf Gölü, birimleri büyük oranda engelliyor. Bir Hovercraft tek seçeneğin.\n[accent]Gemi Fabrikatörünü[] araştır ve [accent]elude[] birimini olabildiğince kısa sürede üret!
+sector.intersect.description = Taramalar, bu Sektörün farklı yönlerden salıdırya uğrayacağını belirtiyor.\nHızlı bir şekilde savunma kur.\n[accent]Mech[] birimleri bu Sektör için bir olmazssa olmaz!
+sector.atlas.description = Bu Sektör, farklı tür saldırılar isteyen dengesiz bir araziden oluşuyor.\nDüşman Üssünü yenebilmek için Geliştirilmiş birimler gerekebilir.\n[accent]Elektolizörü[] ve [accent]Tank Yeniden Yapılandırıcı[] yı araştırmadan bu sektör oldukça zor.
+sector.split.description = Bu sektörde az düşman oluşu burayı yeni taşıma teknolojisini test etmek için çok uygun bir yer yapıyor. UwU
+sector.basin.description = Bu sektörde çok sayıda düşman tespit edildi.\nHızlıca birim üret ve düşman merkezlerini ele geçir.
+sector.marsh.description = Bu sektörde bolca arkisit bulunuyor ancak az sayıda baca deliği var.\n[accent]Kimyasal Yanma Odası[] inşa ederek elektrik üret.
+sector.peaks.description = Bu sektördeki dağlık arazi çoğu birimi kullanışsız kılıyor. Uçan birimler gerekecektir.\nDüşman hava savunmalarına dikkat et. Hava savunmaların destekçi binalarını hedef alarak bazılarını devre dışı bırakmak mümkün olabilir.
+sector.ravine.description = Burada düşman merkezi tespit edilemedi, ancak düşman için önemli bir geçiş rotası. Değişik türde birimler geçebilir.\n[accent]Akı[] üret. [accent]Afflict[] taretleri inşa et.
+sector.caldera-erekir.description = Bu haritadaki madenler çok sayıda adaya dağılmış durumda.\nDron taşımcılığını aç ve taşıma sistemi kur.
+sector.stronghold.description = Bu sektörde düşmanlar senin [accent]toryum[] almanı engellemek için ellerinden geleni yapıyor!\nOnların HAİN planlarını boz ve teknolojini geliştir.
+sector.crevice.description = Düşman senin üssünü ele geçirmek için çok sayıda birim gönderecek.\n[accent]Karbür[] elde et ve [accent]Piroliz Jeneratörü[]'nü aç. Bu hayatta kalmak için tek şansın olabilir!
+sector.siege.description = Bu sektör, iki farklı kanyon içeriyor. İki tarafdan aynı anda savunmaya hazır ol.\n[accent]Siyanojen[] üret daha da güçlü tankları aç.\nDikkat: Uzun menzilli füzeler tespit edildi! Füzeler hedefe varmadan havada vurulabilir.
+sector.crossroads.description = Bu sektördeki üsler farklı seviyelerde inşa edilmiş. Adapte olmak için başka birimleri araştır.\nEk olarak, bazı üslerin koruma kalkanları bulunmakta. Nasıl çalıştıklarını bulmaya çalış.
+sector.karst.description = Bu sektör kaynak bakımından zengin, ancak yeni bir merkez iniş yaptığı anda düşman üzerimize çökecek.\nKaynakları iyi deyerlendir ve [accent]faz[]'ı aç.
+sector.origin.description = Güçlü düşmanları barındıran son sektör.\nDaha fazla uyumlu araştırma kalmadı - tüm gücünle düşmanı yenmeye çalış!
+
+status.burning.name = Yanıyor
+status.freezing.name = Donuyor
+status.wet.name = Islak
+status.muddy.name = Çamurlu
+status.melting.name = Eriyor
+status.sapped.name = EmilmiÅŸ
+status.electrified.name = ElektriklenmiÅŸ
+status.spore-slowed.name = Sporlanmış
+status.tarred.name = ZiftlenmiÅŸ
+status.overdrive.name = Yüksek Hızlı
+status.overclock.name = Hızlandırlımış
+status.shocked.name = Çarpılmış
+status.blasted.name = Patlatılmış
+status.unmoving.name = SabitlenmiÅŸ
+status.boss.name = Gardiyan
 
 settings.language = Dil
 settings.data = Oyun Verisi
@@ -567,8 +925,8 @@ settings.controls = Kontroller
 settings.game = Oyun
 settings.sound = Ses
 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.cleardata = ⚠ Tüm 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"Tamam" tuşuna bastığınızda bütün verileriniz silinecek ve oyun kapanacaktır.
 settings.clearsaves.confirm = Tüm kayıtlarınızı silmek istediğinizden emin misiniz?
 settings.clearsaves = Kayıtları Sil
@@ -579,7 +937,7 @@ settings.clearcampaignsaves.confirm = Mücadele modundaki oynadığınız tüm s
 paused = [accent]<Durduruldu>
 clear = Temizle
 banned = [scarlet]Yasaklı
-unplaceable.sectorcaptured = [scarlet]Ele geçirilmiş sektör gerekir
+unsupported.environment = [scarlet]Desteklenmeyen Ortam
 yes = Evet
 no = Hayır
 info.title = Bilgi
@@ -587,13 +945,18 @@ error.title = [crimson]Bir hata oldu
 error.crashtitle = Bir hata oldu
 unit.nobuild = [scarlet]Birlik inÅŸa edemiyor
 lastaccessed = [lightgray]Son EriÅŸme: {0}
+lastcommanded = [lightgray]Son Kontrol Edilen: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <görüntülenecek haritayı yükle>
+stat.description = Açıklama
 stat.input = GiriÅŸ
 stat.output = Çıkış
+stat.maxefficiency = Maks Verimlilik
 stat.booster = Güçlendirici
 stat.tiles = Gereken Kare
-stat.affinities = Yakınlıklar
+stat.affinities = Durum Özellikleri
+stat.opposites = Zıtlıklar
 stat.powercapacity = Enerji Kapasitesi
 stat.powershot = Enerji/Atış
 stat.damage = Hasar
@@ -615,7 +978,12 @@ stat.itemcapacity = EÅŸya Kapasitesi
 stat.memorycapacity = Bellek Kapasitesi
 stat.basepowergeneration = Temel Enerji Ãœretimi
 stat.productiontime = Üretim Süresi
-stat.repairtime = Tamir Tamir Edilme Süresi
+stat.repairtime = Tamir Edilme Süresi
+stat.repairspeed = Tamir Hızı
+stat.weapons = Silahlar
+stat.bullet = Mermi
+stat.moduletier = Modül Seviyesi
+stat.unittype = Birlik Türü
 stat.speedincrease = Hız Artışı
 stat.range = Menzil
 stat.drilltier = Kazılabilenler
@@ -623,44 +991,101 @@ stat.drillspeed = Temel Matkap Hızı
 stat.boosteffect = Hızlandırma Efekti
 stat.maxunits = Maksimum Aktif Birim
 stat.health = Can
+stat.armor = Zırh
 stat.buildtime = İnşaat Süresi
 stat.maxconsecutive = Art Arda En Fazla
 stat.buildcost = İnşaat Fiyatı
-stat.inaccuracy = İskalama Oranı
+stat.inaccuracy = Iskalama Oranı
 stat.shots = Atışlar
 stat.reload = Atışlar/Sn
 stat.ammo = Mermi
 stat.shieldhealth = Kalkan Canı
 stat.cooldowntime = Soğuma Süresi
 stat.explosiveness = Patlayıcılık
-stat.basedeflectchance = Mermi Sekme Şansı
-stat.lightningchance = Yıldırım Çarpma Şansı
+stat.basedeflectchance = Mermi Sekme Ä°htimali
+stat.lightningchance = Yıldırım Çarpma İhtimali
 stat.lightningdamage = Yıldırım Hasarı
 stat.flammability = Yanıcılık
 stat.radioactivity = Radyoaktivite
+stat.charge = Elektrik Yükü
 stat.heatcapacity = Isı Kapasitesi
-stat.viscosity = Viskosite
+stat.viscosity = Viskozite
 stat.temperature = Sıcaklık
 stat.speed = Hız
 stat.buildspeed = İnşa Hızı
 stat.minespeed = Kazı Hızı
 stat.minetier = Kazı Seviyesi
 stat.payloadcapacity = Yük Kapasitesi
-stat.commandlimit = Komut Limiti
 stat.abilities = Kabiliyetler
+stat.canboost = Gazlayabilir
+stat.flying = Uçuyor
+stat.ammouse = Mermi Kullanıyor
+stat.ammocapacity = Mermi Kapasitesi
+stat.damagemultiplier = Hasar Çarpanı
+stat.healthmultiplier = Can Çarpanı
+stat.speedmultiplier = Hız Çarpanı
+stat.reloadmultiplier = Yeniden Yükleme Çarpanı
+stat.buildspeedmultiplier = İnşa Hızı Çarpanı
+stat.reactive = Tepki Verir
+stat.immunities = Bağışıklıklar
+stat.healing = Tamir Eder
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Güç Kalkanı
+ability.forcefield.description = Mermilere karşı bir güç kalkanı açar
 ability.repairfield = Onarma Alanı
+ability.repairfield.description = Etraftaki birimleri tamir eder
 ability.statusfield = Hızlandırma Alanı
-ability.unitspawn = {0} Birliği Fabrikası
+ability.statusfield.description = Etraftaki birimlere efekt uygular
+ability.unitspawn = Birliği Fabrikası
+ability.unitspawn.description = Birim inÅŸaa eder
 ability.shieldregenfield = Kalkan Yenileme Alanı
+ability.shieldregenfield.description = Yakındaki birimlerin kalkanını yeniler
+ability.movelightning = Hareket Enerjisi
+ability.movelightning.description = Hareket ederken yıldırım yardırır
+ability.armorplate = Zırh Plakası
+ability.armorplate.description = Ateş ederken alınan hasarı azaltır
+ability.shieldarc = Ark Kalkanı
+ability.shieldarc.description = Mermileri bloklayan bir arc ışını atar
+ability.suppressionfield = Tamir Engelleme Alanı
+ability.suppressionfield.description = Yakındaki tamircileri durdurur
+ability.energyfield = Güç Kalkanı
+ability.energyfield.description = Yakındaki düşmanları şoklar
+ability.energyfield.healdescription = Yakındaki düşmanları şoklar, dostları tamir eder
+ability.regen = Yenilenme
+ability.regen.description = Kendi canını zamanla tamir eder
+ability.liquidregen = Sıvı Emme
+ability.liquidregen.description = Kendini tamir etmek için sıvı emer
+ability.spawndeath = Son Bağırış
+ability.spawndeath.description = Öldüğünde birim salar
+ability.liquidexplode = Son Ä°syan
+ability.liquidexplode.description = Ölürken sıvı fışkırtır
+ability.stat.firingrate = [stat]{0}/sn[lightgray] ateş hızı
+ability.stat.regen = [stat]{0}[lightgray] can/sn
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] kalkan
+ability.stat.repairspeed = [stat]{0}/sn[lightgray] tamir hızı
+ability.stat.slurpheal = [stat]{0}[lightgray] can/sıvı miktarı
+ability.stat.cooldown = [stat]{0} sn[lightgray] bekleme süresi
+ability.stat.maxtargets = [stat]{0}[lightgray] maks hedef
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] aynı tamir miktarı
+ability.stat.damagereduction = [stat]{0}%[lightgray] hasar indüksiyonu
+ability.stat.minspeed = [stat]{0} blok/sn[lightgray] min hız
+ability.stat.duration = [stat]{0} sn[lightgray] süre
+ability.stat.buildtime = [stat]{0} sn[lightgray] inşa süresi
+bar.onlycoredeposit = Sadece Merkeze Aktarım Mümkün
 
-bar.drilltierreq = Daha Ä°yi Matkap Gerekli
-bar.noresources = Eksik Kaynaklar
-bar.corereq = Çekirdek Tabanı Gerekli
+bar.drilltierreq = Daha Güçlü Matkap Gerekli
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = Kaynak Yetersiz
+bar.corereq = Merkez Tabanı Gerekli
+bar.corefloor = Merkez Alan Zemini Gerekli
+bar.cargounitcap = Kargo Birim Kapasitesine Ulaşıldı
 bar.drillspeed = Matkap Hızı: {0}/s
 bar.pumpspeed = Pompa Hızı: {0}/s
 bar.efficiency = Verim: {0}%
+bar.boost = Hızlanış: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = Enerji: {0}/sn
 bar.powerstored = Depolanan: {0}/{1}
 bar.poweramount = Enerji: {0}
@@ -669,13 +1094,19 @@ bar.powerlines = Bağlantılar: {0}/{1}
 bar.items = EÅŸyalar: {0}
 bar.capacity = Kapasite: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet]î Š {0} / {1}[white] {2}\n[lightgray][[birlik engellendi]
 bar.liquid = Sıvı
 bar.heat = Isı
+bar.cooldown = Cooldown
+bar.instability = Dengesizlik
+bar.heatamount = Isı: {0}
+bar.heatpercent = Isı: {0} ({1}%)
 bar.power = Enerji
 bar.progress = Ä°nÅŸa Ä°lerlemesi
+bar.loadprogress = Ä°lerleme
+bar.launchcooldown = Fırlatış Bekleme Süresi
 bar.input = Girdi
 bar.output = Çıktı
+bar.strength = [stat]{0}[lightgray]x Güç
 
 units.processorcontrol = [lightgray]İşlemci Kontrolünde
 
@@ -683,35 +1114,50 @@ bullet.damage = [stat]{0} [lightgray]hasar
 bullet.splashdamage = [stat]{0} [lightgray]alan hasarı ~[stat] {1} [lightgray]kare
 bullet.incendiary = [stat]yakıcı
 bullet.homing = [stat]güdümlü
-bullet.shock = [stat]şoklayıcı
-bullet.frag = [stat]parça tesirli
+bullet.armorpierce = [stat]zırh delici
+bullet.maxdamagefraction = [stat]{0}%[lightgray] hasar limiti
+bullet.suppression = [stat]{0} sn[lightgray] tamir bastırması ~ [stat]{1}[lightgray] karolar
+bullet.interval = [stat]{0}/sn[lightgray] ara mermiler:
+bullet.frags = [stat]{0}[lightgray]x parçalı mermiler:
+bullet.lightning = [stat]{0}[lightgray]x elektrik ~ [stat]{1}[lightgray] hasarı
+bullet.buildingdamage = [stat]{0}%[lightgray] inşa hasarı
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0} [lightgray]savurma
 bullet.pierce = [stat]{0}[lightgray]x delme
 bullet.infinitepierce = [stat]delme
-bullet.freezing = [stat]dondurucu
-bullet.tarred = [stat]katranlı
+bullet.healpercent = [stat]{0}[lightgray]% ototamir
+bullet.healamount = [stat]{0}[lightgray] direkt tamir
 bullet.multiplier = [stat]{0}[lightgray]x mermi çarpanı
 bullet.reload = [stat]{0}[lightgray]x atış hızı
+bullet.range = [stat]{0}[lightgray] blok menzil
+bullet.notargetsmissiles = [stat] binaları görmezden gelir
+bullet.notargetsbuildings = [stat] füzeleri görmezden gelir
 
 unit.blocks = blok
 unit.blockssquared = blok²
 unit.powersecond = enerji birimi/saniye
+unit.tilessecond = alan/saniye
 unit.liquidsecond = sıvı birimi/saniye
 unit.itemssecond = eÅŸya/saniye
 unit.liquidunits = sıvı birimi
 unit.powerunits = enerji birimi
+unit.heatunits = ısı birimi
 unit.degrees = derece
 unit.seconds = saniye
 unit.minutes = dakika
 unit.persecond = /sn
 unit.perminute = /dk
 unit.timesspeed = x hız
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = kalkan canı
 unit.items = eÅŸya
 unit.thousands = k
-unit.millions = mil
+unit.millions = m
 unit.billions = b
+unit.shots = atış
+unit.pershot = /vuruÅŸ
+category.purpose = Açıklama
 category.general = Genel
 category.power = Enerji
 category.liquids = Sıvılar
@@ -719,66 +1165,81 @@ category.items = EÅŸyalar
 category.crafting = Ãœretim
 category.function = Fonksiyon
 category.optional = İsteğe Bağlı Geliştirmeler
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Merkez Fırlatma/İnme Animasyonunu Atla
 setting.landscape.name = Yatayda sabitle
 setting.shadows.name = Gölgeler
-setting.blockreplace.name = Otomatik Blok önerileri
+setting.blockreplace.name = Otomatik Blok Önerileri
 setting.linear.name = Lineer Filtreleme
 setting.hints.name = İpuçları
-setting.flow.name = Kaynak Geçiş Hızını Göster[scarlet] (deneysel)
-setting.buildautopause.name = Ä°nÅŸa etmeyi otomatik olarak durdur
-setting.animatedwater.name = Animasyonlu Su
-setting.animatedshields.name = Animasyonlu Kalkanlar
-setting.antialias.name = Düzgünleştirme [lightgray](yeniden başlatma gerekebilir)[]
+setting.logichints.name = İşlemci İpuçları
+setting.backgroundpause.name = Arka Planda Durdur
+setting.buildautopause.name = Ä°nÅŸa Etmeyi Otomatik Olarak Durdur
+setting.doubletapmine.name = Çift Tıklamayla Kaz
+setting.commandmodehold.name = Komuta Modu için Basılı Tut
+setting.distinctcontrolgroups.name = Birim Başı Bir Kontrol Grubuna Sınırla 
+setting.modcrashdisable.name = Çökmede Modları Kapa
+setting.animatedwater.name = Hareketli Su
+setting.animatedshields.name = Hareketli Kalkanlar
 setting.playerindicators.name = Oyuncu Belirteçleri
 setting.indicators.name = Düşman/Müttefik Belirteçleri
 setting.autotarget.name = Otomatik Hedef Alma
 setting.keyboard.name = Fare+Klavye Kontrolleri
 setting.touchscreen.name = Dokunmatik Ekran Kontrolleri
 setting.fpscap.name = Maksimum FPS
-setting.fpscap.none = Limitsiz
+setting.fpscap.none = Limitsiz ∞
 setting.fpscap.text = {0} FPS
 setting.uiscale.name = Arayüz Ölçeği [lightgray](yeniden başlatma gerekebilir)[]
+setting.uiscale.description = Değişikleri uygulamak için yeniden başlatma gerekli.
 setting.swapdiagonal.name = Her Zaman Çapraz Yerleştirme
-setting.difficulty.training = EÄŸitim
-setting.difficulty.easy = Kolay
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Zor
-setting.difficulty.insane = Çılgın
-setting.difficulty.name = Zorluk:
-setting.screenshake.name = Ekranı Salla
+setting.screenshake.name = Ekran Sarsılması
+setting.bloomintensity.name = Parlaklık Şiddeti
+setting.bloomblur.name = Parlaklık Bulanıklılığı
 setting.effects.name = Efektleri Görüntüle
 setting.destroyedblocks.name = Kırılmış Blokları Göster
 setting.blockstatus.name = Blok Durumunu Göster
 setting.conveyorpathfinding.name = Konveyör Yol Bulma
-setting.sensitivity.name = Kontrolcü Hassasiyeti
+setting.sensitivity.name = Kumanda Hassasiyeti
 setting.saveinterval.name = Kayıt Aralığı
-setting.seconds = {0} Saniye
-setting.blockselecttimeout.name = Blok Seçme Zaman Aşımı
+setting.seconds = {0} saniye
 setting.milliseconds = {0} milisaniye
 setting.fullscreen.name = Tam Ekran
-setting.borderlesswindow.name = Kenarsız Pencere [lightgray](yeniden açmak gerekebilir)
+setting.borderlesswindow.name = Kenarsız Pencere
+setting.borderlesswindow.name.windows = Kenrasız TamEkran
+setting.borderlesswindow.description = Oyunu baştan açman gerekebilir.
 setting.fps.name = FPS Göster
+setting.console.name = Konsolu AktifleÅŸtir
 setting.smoothcamera.name = Yumuşak Geçişli Kamera
 setting.vsync.name = VSync
-setting.pixelate.name = Pixelleştir [lightgray](animasyonları kapatır)
+setting.pixelate.name = Pikselleştir [lightgray](animasyonları kapatır)
 setting.minimap.name = Haritayı Göster
-setting.coreitems.name = Çekirdekteki Eşyaları Göster [lightgray](üzerinde çalışılıyor)
+setting.coreitems.name = Merkezdeki Eşyaları Göster [lightgray](üzerinde çalışılıyor)
 setting.position.name = Oyuncu Noktasını Göster
-setting.musicvol.name = Müzik
+setting.mouseposition.name = Fareyi Göster
+setting.musicvol.name = Müzik Sesi
 setting.atmosphere.name = Gezegen Atmosferini Göster
+setting.drawlight.name = Karanlığı/Aydınlığı Çiz
 setting.ambientvol.name = Çevresel Ses
 setting.mutemusic.name = Müziği Kapat
 setting.sfxvol.name = Oyun Sesi
 setting.mutesound.name = Sesi Kapat
 setting.crashreport.name = Anonim Çökme Raporları Gönder
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Otomatik Kayıt Oluştur
-setting.publichost.name = Halka Açık Oyunlar
+setting.steampublichost.name = Herkese Açık Oyun Görünürlüğü
 setting.playerlimit.name = Oyuncu Limiti
 setting.chatopacity.name = Mesajlaşma Opaklığı
 setting.lasersopacity.name = Enerji Lazeri Opaklığı
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Köprü Opaklığı
 setting.playerchat.name = Oyun-içi Konuşmayı Göster
-public.confirm = Oyununuzu halka açık yapmak ister misiniz?\n[accent]Oyunlarınıza herkes katılabilecektir.\n[lightgray]Bu seçenek daha sonra Ayarlar->Oyun->Halka Açık Oyunlar'dan değiştirilebilir.
+setting.showweather.name = Hava Durmu Grafiklerini Göster
+setting.hidedisplays.name = İşlemci İpuçlarını Gizle
+setting.macnotch.name = Arayüzü çentik gösterecek şekilde uyarlayın
+setting.macnotch.description = Değişikleri uygulamak için yeniden başlatma gerekli
+steam.friendsonly = Arkadaşlara özel
+steam.friendsonly.tooltip = Sadece Steam arkadaşlarının katılıp katılabilemeyeceğini belirler.\nBu kutudan tiki kaldırmak oyununuzu herkese açık yapacaktır.
 public.beta = Oyunun beta sürümlerinin halka açık lobiler yapamayacağını unutmayın.
 uiscale.reset = Arayüz ölçeği değiştirildi.\nBu ölçeği onaylamak için "Tamam" butonuna basın.\n[accent] {0}[] [scarlet]saniye içinde eski ayarlara geri dönülüp oyundan çıkılıyor…[]
 uiscale.cancel = İptal Et ve Çık
@@ -787,12 +1248,9 @@ keybind.title = Tuşları Yeniden Ata
 keybinds.mobile = [scarlet]Buradaki çoğu tuş ataması mobilde geçerli değildir. Sadece temel hareket desteklenmektedir.
 category.general.name = Genel
 category.view.name = Görünüm
+category.command.name = Birim Komutu
 category.multiplayer.name = Çok Oyunculu
 category.blocks.name = Blok Seçimi
-command.attack = Saldır
-command.rally = Toplan
-command.retreat = Geri Çekil
-command.idle = BoÅŸta
 placement.blockselectkeys = \n[lightgray]TuÅŸ: [{0},
 keybind.respawn.name = Yeniden DoÄŸ
 keybind.control.name = BirliÄŸi Kontrol Et
@@ -807,9 +1265,30 @@ keybind.move_y.name = y Ekseninde Hareket
 keybind.mouse_move.name = Fareyi Takip Et
 keybind.pan.name = Yatay Kaydırma Görünümü
 keybind.boost.name = Yükselt
+keybind.command_mode.name = Komuta Modu
+keybind.command_queue.name = Birim Komuta Sırası
+keybind.create_control_group.name = Komuta Grubu OluÅŸtur
+keybind.cancel_orders.name = Emri Hükümsüz Kıl
+keybind.unit_stance_shoot.name = Birim Duruşu: Saldır
+keybind.unit_stance_hold_fire.name = Birim Duruşu: Hazır Ol
+keybind.unit_stance_pursue_target.name = Birim DuruÅŸu: Takip Et
+keybind.unit_stance_patrol.name = Birim DuruÅŸu: Devriye Gez
+keybind.unit_stance_ram.name = Birim DuruÅŸu: VUR
+keybind.unit_command_move.name = Birim Komutu: Git
+keybind.unit_command_repair.name = Birim Komutu: Tamir Et
+keybind.unit_command_rebuild.name = Birim Komutu: Yeniden Ä°nÅŸaa Et
+keybind.unit_command_assist.name = Biirm Komutu: Yardım Et
+keybind.unit_command_mine.name = Birim Komutu: Kaz
+keybind.unit_command_boost.name = Birim Komutu: Gazla
+keybind.unit_command_load_units.name = Birim Komutu: Birim Kargola
+keybind.unit_command_load_blocks.name = Birim Komutu: Blok Kargola
+keybind.unit_command_unload_payload.name = Birim Komutu: Kargo BoÅŸalt
+keybind.unit_command_enter_payload.name = Birim Komutu: Kargoya Gir
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Alanı Geri İşaa Et
 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
+keybind.schematic_flip_x.name = Şemayı X Ekseninde Döndür
 keybind.schematic_flip_y.name = Şemayı Y Ekseninde Döndür
 keybind.category_prev.name = Önceki Kategori
 keybind.category_next.name = Sonraki Kategori
@@ -832,17 +1311,21 @@ keybind.select.name = Seç/Ateş Et
 keybind.diagonal_placement.name = Çapraz Yerleştirme
 keybind.pick.name = Blok Seç
 keybind.break_block.name = Blok Kır
+keybind.select_all_units.name = Tüm Birimleri Seç
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Seçimleri Kaldır
 keybind.pickupCargo.name = Kargoyu Al
 keybind.dropCargo.name = Kargoyu Bırak
-keybind.command.name = Komut
 keybind.shoot.name = AteÅŸ Et
 keybind.zoom.name = Yakınlaştırma/Uzaklaştırma
 keybind.menu.name = Menü
 keybind.pause.name = Durdur
 keybind.pause_building.name = İnşaatı Duraklat/İnşaata Devam Et
 keybind.minimap.name = Harita
-keybind.chat.name = KonuÅŸ
+keybind.planet_map.name = Gezegen Haritası
+keybind.research.name = Araştırma
+keybind.block_info.name = Blok Bilgisi
+keybind.chat.name = Yazış
 keybind.player_list.name = Oyuncu Listesi
 keybind.console.name = Konsol
 keybind.rotate.name = Döndür
@@ -851,60 +1334,114 @@ keybind.toggle_menus.name = Menüleri Aç/Kapa
 keybind.chat_history_prev.name = Sohbet geçmişi önceki
 keybind.chat_history_next.name = Sohbet geçmişi sonraki
 keybind.chat_scroll.name = Sohbet Kaydırma
+keybind.chat_mode.name = KonuÅŸma Modunu DeÄŸiÅŸtir
 keybind.drop_unit.name = Birlik Düşürme
 keybind.zoom_minimap.name = Haritada Yakınlaştırma/Uzaklaştırma
-mode.help.title = Modların açıklamaları
+mode.help.title = Oyun Modlarının açıklamaları
 mode.survival.name = Hayatta Kalma
 mode.survival.description = Normal oyun oyun modu. Kaynak sınırlı ve dalgalar otomatik olarak gönderilir.\n[gray]Oynamak için haritada düşman doğma noktaları olması gerekir.
 mode.sandbox.name = Yaratıcı
-mode.sandbox.description = Sonsuz kaynaklar ve dalgalar için zamanlayıcı yok.
+mode.sandbox.description = Sonsuz kaynak bulunur ve dalgalar için zamanlayıcı yok. Hayellerindeki her şeyi yapmayı dene ama sadece dene.
 mode.editor.name = Düzenleyici
 mode.pvp.name = PvP
-mode.pvp.description = Yerel olarak başkaları ile savaş.\n[gray]Oynamak için haritada en az iki farklı renkli çekirdek olması gerekir.
+mode.pvp.description = Yerel olarak başkaları ile savaş.\n[gray]Oynamak için haritada en az iki farklı renkli merkez olması gerekir.
 mode.attack.name = Saldırı
-mode.attack.description = Düşman üssünü yok et. Dalga yok.\n[gray]Oynamak için haritada kırmızı çekirdek olması gerekir. 
+mode.attack.description = Düşman üssünü yok et. Dalga yok.\n[gray]Oynamak için haritada düşman merkezi olması gerekir.
 mode.custom = Özel Kurallar
+rules.invaliddata = Hatalı pano verisi.
+rules.hidebannedblocks = Yasaklı Blokları Sakla
 
 rules.infiniteresources = Sınırsız Kaynaklar
+rules.onlydepositcore = Sadece Merkeze Aktarmaya Ä°zin Ver
+rules.derelictrepair = Kalıntıları Tamir Etmeye İzin Ver
 rules.reactorexplosions = Reaktör Patlamaları
-rules.schematic = Schematics Allowed
+rules.coreincinerates = Merkez Taşanları Eritir
+rules.disableworldprocessors = Evrensel İşlemcileri Devredışı Bırak
+rules.schematic = Şema Kullanılabilir
 rules.wavetimer = Dalga Zamanlayıcısı
+rules.wavesending = Dalga Gönderiliyor
+rules.allowedit = Ayaraları Düzenlemeye İzin Ver
+rules.allowedit.info = Açıldığında, oyuncular durdurma tuşunun altındaki bir tuş ile ayarları düzenleyebilir.
+rules.alloweditworldprocessors = Evrensel İşlemcileri Düzenlemeye İzin Ver
+rules.alloweditworldprocessors.info = Açıldığında, oyuncular evren işlemcileri oyun içinde düzenleyebilir.
 rules.waves = Dalgalar
+rules.airUseSpawns = Hava Birimleri Doğum Noktalarını Kullanır
 rules.attack = Saldırı Modu
-rules.buildai = Yapay Zeka İnşası
-rules.enemyCheat = Sonsuz AI (Kırmızı Takım) Kaynakları
-rules.blockhealthmultiplier = Blok Canı Çarpanı
-rules.blockdamagemultiplier = Blok Hasarı Çarpanı
-rules.unitbuildspeedmultiplier = Birim Üretim Hızı Çarpanı
-rules.unithealthmultiplier = Birim Canı Çarpanı
-rules.unitdamagemultiplier = Birim Hasarı Çapanı
-rules.enemycorebuildradius = Düşman Çekirdeği İnşa Yasağı Yarıçapı: [lightgray](kare)
+rules.buildai = Ãœs inÅŸa edici YZ
+rules.buildaitier = İnşaatçı YZ sınıfı
+rules.rtsai = RTS YZ
+rules.rtsai.campaign = RTS Saldırı YZ
+rules.rtsai.campaign.info = Saldırı Haritalarında, yapay zekayı daha 'zeki' yapar.
+rules.rtsminsquadsize = Asgari Gurup Boyutu
+rules.rtsmaxsquadsize = Azami Gurup Boyutu
+rules.rtsminattackweight = Asgari Saldırı Boyutu
+rules.cleanupdeadteams = Kaybeden Takımın Bloklarını Temizle (PvP)
+rules.corecapture = Yıkımda Çekirdeği Elegeçir
+rules.polygoncoreprotection = Çokgenli Merkez Koruması
+rules.placerangecheck = Ä°nÅŸa Menzilini DoÄŸrula
+rules.enemyCheat = Sınırsız YZ (Düşman Takım) Kaynakları
+rules.blockhealthmultiplier = Blok Can Çarpanı
+rules.blockdamagemultiplier = Blok Hasar Çarpanı
+rules.unitbuildspeedmultiplier = Birim Üretim Hız Çarpanı
+rules.unitcostmultiplier = Birim Fiyat Çarpanı
+rules.unithealthmultiplier = Birim Can Çarpanı
+rules.unitdamagemultiplier = Birim Hasar Çapanı
+rules.unitcrashdamagemultiplier = Birim Çakılma Hasar Çarpanı
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Güneş Paneli Üretim Çarpanı
+rules.unitcapvariable = Merkezler Birim Sınırını Etkiler
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Sabit Birim Sınırı
+rules.limitarea = Haritayı Sınırla
+rules.enemycorebuildradius = Düşman Merkezi İnşa Yasağı Yarıçapı: [lightgray](kare)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Dalga Aralığı: [lightgray](sn)
+rules.initialwavespacing = Başlangıç Dalga Aralığı:[lightgray] (sn)
 rules.buildcostmultiplier = İnşa Ücreti Çarpanı
 rules.buildspeedmultiplier = İnşa Hızı Çarpanı
 rules.deconstructrefundmultiplier = Yıkım İade Çarpanı
 rules.waitForWaveToEnd = Dalgalar Düşmanı Bekler
+rules.wavelimit = Harita .. Dalgadan Sonra Biter
 rules.dropzoneradius = İniş Noktası Yarıçapı: [lightgray](kare)
-rules.unitammo = Birlikler Mermi Gerektiriyor
+rules.unitammo = Birlikler Mermi Gerektirir
+rules.enemyteam = Düşman Takım
+rules.playerteam = Oyuncu Takımı
 rules.title.waves = Dalgalar
 rules.title.resourcesbuilding = Kaynaklar & Ä°nÅŸa
 rules.title.enemy = Düşmanlar
 rules.title.unit = Birlikler
 rules.title.experimental = Deneysel
 rules.title.environment = Çevre
+rules.title.teams = Takımlar
+rules.title.planet = Gezegen
 rules.lighting = Işıklandırma
-rules.enemyLights = Enemy Lights
+rules.fog = SavaÅŸ Sisi
+rules.invasions = Düşman Sektör Saldırıları
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Düşman Doğuş Noktalarını Göster
+rules.randomwaveai = Tahmin Edilemez Dalgalar
 rules.fire = AteÅŸ
+rules.anyenv = <Herhangi>
 rules.explosions = Blok/Birlik Patlama Hasarı
 rules.ambientlight = Ortam Işığı
-rules.weather = Hava
+rules.weather = Hava Durumu
 rules.weather.frequency = Sıklık:
+rules.weather.always = Her zaman
 rules.weather.duration = Süreklilik:
+rules.randomwaveai.info = Düşman Birimler Rastgele Saldırır ve direkt çekirdeğe veya enerji kaynaklarına gitmezler.
+rules.placerangecheck.info = Oyuncuların düşman üssüne yakın inşa etmesini engeller. Bu, silah kurarken daha da fazla.
+rules.onlydepositcore.info = Birimlerin Merkez dışında malzeme aktarmasını engeller.
 
-content.item.name = EÅŸyalar
+content.item.name = Malzemeler
 content.liquid.name = Sıvılar
 content.unit.name = Birimler
 content.block.name = Bloklar
+content.status.name = Durum Etkileri
+content.sector.name = Sektörler
+content.team.name = Takımlar
+wallore = (Duvar)
 
 item.copper.name = Bakır
 item.lead.name = KurÅŸun
@@ -912,20 +1449,34 @@ item.coal.name = Kömür
 item.graphite.name = Grafit
 item.titanium.name = Titanyum
 item.thorium.name = Toryum
-item.silicon.name = Silikon
+item.silicon.name = Silisyum
 item.plastanium.name = Plastanyum
 item.phase-fabric.name = Faz Örgüsü
 item.surge-alloy.name = Akı Alaşımı
 item.spore-pod.name = Spor Kapsülü
 item.sand.name = Kum
 item.blast-compound.name = Patlayıcı Bileşik
-item.pyratite.name = Pirratit
+item.pyratite.name = Piratit
 item.metaglass.name = Metacam
 item.scrap.name = Hurda
+item.fissile-matter.name = Bölünebilir Madde
+item.beryllium.name = Berilyum
+item.tungsten.name = Tungsten
+item.oxide.name = Oksit
+item.carbide.name = Karbür
+item.dormant-cyst.name = Etkin Olmayan Kist
+
 liquid.water.name = Su
 liquid.slag.name = Cüruf
 liquid.oil.name = Petrol
 liquid.cryofluid.name = Kriyosıvı
+liquid.neoplasm.name = Neoplazm
+liquid.arkycite.name = Arkisit
+liquid.gallium.name = Galyum
+liquid.ozone.name = Ozon
+liquid.hydrogen.name = Hidrojen
+liquid.nitrogen.name = Azot
+liquid.cyanogen.name = Siyanojen
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -953,6 +1504,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -960,13 +1516,36 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Manifold
+unit.assembly-drone.name = Assembly Drone
+unit.latum.name = Latum
+unit.renale.name = Renale
 
-block.resupply-point.name = Resupply Point
 block.parallax.name = Parallax
 block.cliff.name = Uçurum
 block.sand-boulder.name = Kumlu Kaya Parçaları
+block.basalt-boulder.name = Bazalt Kaya
 block.grass.name = Çimen
-block.slag.name = Cüruf
+block.molten-slag.name = Cüruf
+block.pooled-cryofluid.name = Kriyosıvı
 block.space.name = Uzay
 block.salt.name = Tuz
 block.salt-wall.name = Tuz Duvar
@@ -976,7 +1555,7 @@ block.sand-wall.name = Kum Duvar
 block.spore-pine.name = Spor Çamı
 block.spore-wall.name = Spor Duvar
 block.boulder.name = Kaya Parçaları
-block.snow-boulder.name = Karlı Kaya PArçaları
+block.snow-boulder.name = Karlı Kaya Parçaları
 block.snow-pine.name = Karlı Çam
 block.shale.name = Åžist
 block.shale-boulder.name = Şist Kayası
@@ -990,30 +1569,34 @@ block.scrap-wall-huge.name = Dev Hurda Duvar
 block.scrap-wall-gigantic.name = Devasa Hurda Duvar
 block.thruster.name = Ä°tici
 block.kiln.name = Fırın
-block.graphite-press.name = Grafit Presi
-block.multi-press.name = Çoklu-Pres
+block.graphite-press.name = Grafit Ezici
+block.multi-press.name = Çoklu-Ezici
 block.constructing = {0} [lightgray](Ä°nÅŸa Ediliyor)
-block.spawn.name = Düşman Doğma Noktası
+block.spawn.name = Düşman Doğum Noktası
+block.remove-wall.name = Duvar Kaldır
+block.remove-ore.name = Maden Kaldır
 block.core-shard.name = Merkez: Parçacık
 block.core-foundation.name = Merkez: Temel
 block.core-nucleus.name = Merkez: Çekirdek
-block.deepwater.name = Derin Su
-block.water.name = Su
+block.deep-water.name = Derin Su
+block.shallow-water.name = Su
 block.tainted-water.name = Kirli Su
+block.deep-tainted-water.name = Derin Kirli Su
 block.darksand-tainted-water.name = Kara Kumlu Kirli Su
 block.tar.name = Katran
 block.stone.name = TaÅŸ
-block.sand.name = Kum
+block.sand-floor.name = Kum
 block.darksand.name = Kara Kum
 block.ice.name = Buz
 block.snow.name = Kar
-block.craters.name = Krater
+block.crater-stone.name = Krater
 block.sand-water.name = Kumlu Su
 block.darksand-water.name = Kara Kumlu Su
 block.char.name = Kömür
-block.dacite.name = Dakit
-block.dacite-wall.name = Dakit Duvar
-block.dacite-boulder.name = Dakit Kaya Parçaları
+block.dacite.name = Daist
+block.rhyolite.name = Riyolit
+block.dacite-wall.name = Daist Duvar
+block.dacite-boulder.name = Daist Kaya Parçaları
 block.ice-snow.name = Buzlu Kar
 block.stone-wall.name = TaÅŸ Duvar
 block.ice-wall.name = Buz Duvar
@@ -1029,7 +1612,8 @@ block.spore-cluster.name = Spor Kümesi
 block.metal-floor.name = Metal Zemin 1
 block.metal-floor-2.name = Metal Zemin 2
 block.metal-floor-3.name = Metal Zemin 3
-block.metal-floor-5.name = Metal Zemin 4
+block.metal-floor-4.name = Metal Zemin 4
+block.metal-floor-5.name = Metal Zemin 5
 block.metal-floor-damaged.name = Hasarlı Metal Zemin
 block.dark-panel-1.name = Kara Panel 1
 block.dark-panel-2.name = Kara Panel 2
@@ -1062,30 +1646,31 @@ block.conveyor.name = Konveyör
 block.titanium-conveyor.name = Titanyum Konveyör
 block.plastanium-conveyor.name = Plastanyum Konveyör
 block.armored-conveyor.name = Zırhlı Konveyör
-block.armored-conveyor.description = Materyalleri titanyum konveyörlerle aynı hızda taşır ama daha fazla zırha sahiptir. Diğer konveyörler dışında yan taraflardan materyal kabul etmez.
 block.junction.name = KavÅŸak
 block.router.name = Yönlendirici
 block.distributor.name = Dağıtıcı
 block.sorter.name = Ayıklayıcı
 block.inverted-sorter.name = Ters Ayıklayıcı
-block.message.name = Mesaj
+block.message.name = Mesaj BloÄŸu
+block.reinforced-message.name = Güçlendirilmiş Mesaj Bloğu
+block.world-message.name = Evrensel Mesaj BloÄŸu
+block.world-switch.name = Evrensel Åžalter
 block.illuminator.name = Aydınlatıcı
-block.illuminator.description = Küçük, kompakt, yapılandırılabilir bir ışık kaynağı. Çalışması için enerji gerekir.
 block.overflow-gate.name = Taşma Geçidi
-block.underflow-gate.name = Yana Taşma Geçidi
-block.silicon-smelter.name = Silikon Fırını 
+block.underflow-gate.name = Ters Taşma Geçidi
+block.silicon-smelter.name = Silisyum Fırını
 block.phase-weaver.name = Faz Örücü
-block.pulverizer.name = Pulverizatör
-block.cryofluid-mixer.name = Kriyosıvı Mikseri
+block.pulverizer.name = Ufalayıcı
+block.cryofluid-mixer.name = Kriyosıvı Karıştırıcı
 block.melter.name = Eritici
 block.incinerator.name = Yakıcı
-block.spore-press.name = Spor Presi
+block.spore-press.name = Spor Ezici
 block.separator.name = Ayırıcı
 block.coal-centrifuge.name = Kömür Santrifüjü
 block.power-node.name = Enerji Noktası
 block.power-node-large.name = Büyük Enerji Noktası
 block.surge-tower.name = Akı Kulesi
-block.diode.name = Batarya Diyotu
+block.diode.name = Diyot
 block.battery.name = Batarya
 block.battery-large.name = Büyük Batarya
 block.combustion-generator.name = Termik Jeneratör
@@ -1115,26 +1700,28 @@ block.ripple.name = Ripple
 block.phase-conveyor.name = Faz Konveyörü
 block.bridge-conveyor.name = Konveyör Köprüsü
 block.plastanium-compressor.name = Plastanyum Kompresörü
-block.pyratite-mixer.name = Pirratit Mikseri
+block.pyratite-mixer.name = Piratit Mikseri
 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.repair-point.name = Tamir Noktası
+block.repair-turret.name = Tamir Kulesi
 block.pulse-conduit.name = Dalga Borusu
-block.plated-conduit.name = Kaplı Boru
+block.plated-conduit.name = Yalıtımlı Boru
 block.phase-conduit.name = Faz Borusu
 block.liquid-router.name = Sıvı Yönlendiricisi
 block.liquid-tank.name = Sıvı Tankı
+block.liquid-container.name = Sıvı Konteyneri
 block.liquid-junction.name = Sıvı Kavşağı
 block.bridge-conduit.name = Köprülü Boru
 block.rotary-pump.name = Döner Pompa
 block.thorium-reactor.name = Toryum Reaktörü
 block.mass-driver.name = Kütle Sürücüsü
 block.blast-drill.name = Hava Patlamalı Matkap
-block.thermal-pump.name = Termal Pompa
+block.impulse-pump.name = Termal Pompa
 block.thermal-generator.name = Termal Jeneratör
-block.alloy-smelter.name = Alaşım Fırını
+block.surge-smelter.name = Alaşım Fırını
 block.mender.name = Tamirci
 block.mend-projector.name = Büyük Tamirci
 block.surge-wall.name = Akı Duvarı
@@ -1143,17 +1730,17 @@ block.cyclone.name = Cyclone
 block.fuse.name = Fuse
 block.shock-mine.name = Şok Mayını
 block.overdrive-projector.name = Hızlandırma Projektörü
-block.force-projector.name = Kalkan Projektörü
+block.force-projector.name = Enerji Kalkan Projektörü
 block.arc.name = Arc
-block.rtg-generator.name = RTG Jeneratörü
+block.rtg-generator.name = RTG Jeneratör
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Konteyner
-block.launch-pad.name = Kalkış Pisti
-block.launch-pad-large.name = Büyük Kalkış Pisti
+block.launch-pad.name = Fıralatış Rampası
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = Segment
-block.command-center.name = Komuta Merkezi
 block.ground-factory.name = Yer Birimi Fabrikası
 block.air-factory.name = Hava Birimi Fabrikası
 block.naval-factory.name = Deniz Birimi Fabrikası
@@ -1161,12 +1748,184 @@ block.additive-reconstructor.name = Eklemeli Yeniden Yapılandırıcı
 block.multiplicative-reconstructor.name = Çarpmalı Yeniden Yapılandırıcı
 block.exponential-reconstructor.name = Üstel Yeniden Yapılandırıcı
 block.tetrative-reconstructor.name = Dörtlü Yeniden Yapılandırıcı
-block.payload-conveyor.name = Yük Konveyörü
-block.payload-router.name = Yük Yönlendirici
+block.payload-conveyor.name = Kargo Konveyörü
+block.payload-router.name = Kargo Yönlendirici
+block.duct.name = Tüp
+block.duct-router.name = Tüp Yönlendirici
+block.duct-bridge.name = Tüp Köprü
+block.large-payload-mass-driver.name = Büyük Kargo Kütle Sürücü
+block.payload-void.name = Kargo Yokedici
+block.payload-source.name = Kargo Kaynağı
 block.disassembler.name = Sökücü
-block.silicon-crucible.name = Büyük Silikon Fırını
+block.silicon-crucible.name = Silisyum Krozesi
 block.overdrive-dome.name = Hızlandırma Kubbesi
+block.interplanetary-accelerator.name = Gezegenler Arası Hızlandırıcı
+#Düzgün tutun bu TR translatei uğraştırıyonuz beni. -RTOmega (harbi ya XD)
+block.constructor.name = İnşaatçı
+block.constructor.description = 2x2 ve daha küçük blokları inşa edebilir.
+block.large-constructor.name = Büyük İnşaatçı
+block.large-constructor.description = 4x4 ve daha küçük blokları inşa edebilir.
+block.deconstructor.name = Yıkıcı
+block.deconstructor.description = Blok ve Birimleri yok eder, 100% iade saÄŸlar.
+block.payload-loader.name = Kargo Yükleyici
+block.payload-loader.description = Sıvı ve malzemeleri bloklara yükler.
+block.payload-unloader.name = Kargo Boşaltıcı
+block.payload-unloader.description = Sıvı ve Malzemeleri bloklardan boşaltır.
+block.heat-source.name = Sonsuz Isı Kaynağı
+block.heat-source.description = Neredeyese Sonsuz Isı Veren 1x1 bir blok.
+block.empty.name = BoÅŸ
+block.rhyolite-crater.name = Riyolit Krateri
+block.rough-rhyolite.name = Kaba Riyolit
+block.regolith.name = Regolit
+block.yellow-stone.name = Sarı Taş
+block.carbon-stone.name = Karbon TaÅŸ
+block.ferric-stone.name = Ferrik TaÅŸ
+block.ferric-craters.name = Ferrik Krater
+block.beryllic-stone.name = Beril TaÅŸ
+block.crystalline-stone.name = Kristal TaÅŸ
+block.crystal-floor.name = Kristal Zemin
+block.yellow-stone-plates.name = Sarı Taş Zemin
+block.red-stone.name = Kızıl Taş
+block.dense-red-stone.name = Yoğun Kızıl Kaya
+block.red-ice.name = Kızıl Buz
+block.arkycite-floor.name = Arkisit Zemin
+block.arkyic-stone.name = Arkisit TaÅŸ
+block.rhyolite-vent.name = Riyolit Baca
+block.carbon-vent.name = Karbon Baca
+block.arkyic-vent.name = Arkisit Baca
+block.yellow-stone-vent.name = Sarı Taş Baca
+block.red-stone-vent.name = Kızıl Taş Baca
+block.crystalline-vent.name = Kristal Baca
+block.redmat.name = KızılMat
+block.bluemat.name = MaviMat
+block.core-zone.name = Merkez Alanı
+block.regolith-wall.name = Regolit Duvar
+block.yellow-stone-wall.name = Sarı Taş Duvar
+block.rhyolite-wall.name = Regolit Duvar
+block.carbon-wall.name = Karbon Duvar
+block.ferric-stone-wall.name = Demir TaÅŸ Duvar
+block.beryllic-stone-wall.name = Berilik TaÅŸ Duvar
+block.arkyic-wall.name = Arkisit Duvar
+block.crystalline-stone-wall.name = Kristal TaÅŸ Duvar
+block.red-ice-wall.name = Kızıl Buz Duvar
+block.red-stone-wall.name = Kızıl Taş Duvar
+block.red-diamond-wall.name = Kızıl Elmas Duvar
+block.redweed.name = Kızıl Ot
+block.pur-bush.name = Pur Çalı
+block.yellowcoral.name = Sarı Mercan
+block.carbon-boulder.name = Karbon Kaya
+block.ferric-boulder.name = Demir Kaya
+block.beryllic-boulder.name = Berilik Kaya
+block.yellow-stone-boulder.name = Sarı Taş Kaya
+block.arkyic-boulder.name = Arkisit Kaya
+block.crystal-cluster.name = Kristal TopluluÄŸu
+block.vibrant-crystal-cluster.name = Enerjik Kristal TopluluÄŸu
+block.crystal-blocks.name = Kristal Blok
+block.crystal-orbs.name = Kristal Küreler
+block.crystalline-boulder.name = Kristal Kaya
+block.red-ice-boulder.name = Kızıl Buz Kaya
+block.rhyolite-boulder.name = Riyolit Kaya
+block.red-stone-boulder.name = Kızıl Riyolit Kaya
+block.graphitic-wall.name = Grafit Duvar
+block.silicon-arc-furnace.name = Ark Silicon Fırın
+block.electrolyzer.name = Elektrolizör
+block.atmospheric-concentrator.name = Atmosferik Yoğunlaştırıcı
+block.oxidation-chamber.name = Oksitleme Odası
+block.electric-heater.name = Elektrikli Isıtıcı
+block.slag-heater.name = Cürüflü Isıtıcı
+block.phase-heater.name = Faz Isıtıcı
+block.heat-redirector.name = Isı Aktarıcı
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Isı Yönlendirici
+block.slag-incinerator.name = Cürüf Yakıcı
+block.carbide-crucible.name = Karbür Krozesi
+block.slag-centrifuge.name = Cürüf Sentrifüjü
+block.surge-crucible.name = Akı Krozesi
+block.cyanogen-synthesizer.name = Siyanojen Sentezleyici
+block.phase-synthesizer.name = Faz Sentezleyici
+block.heat-reactor.name = Isı Reaktörü
+block.beryllium-wall.name = Berilyum Duvar
+block.beryllium-wall-large.name = Büyük Berilyum Duvar
+block.tungsten-wall.name = Tungsten Duvar
+block.tungsten-wall-large.name = Büyük Tungsten Duvar
+block.blast-door.name = Zırhlı Kapı
+block.carbide-wall.name = Karbür Duvar
+block.carbide-wall-large.name = Büyük Karbür Duvar
+block.reinforced-surge-wall.name = Zırhlı Akı Duvar
+block.reinforced-surge-wall-large.name = Büyük Zırhlı Akı Duvar
+block.shielded-wall.name = Kalkanlı Duvar
+block.radar.name = Radar
+block.build-tower.name = Ä°nÅŸa Kulesi
+block.regen-projector.name = Tamir Projektörü
+block.shockwave-tower.name = Åžokdalga Kulesi
+block.shield-projector.name = Kalkan Projektörü
+block.large-shield-projector.name = Büyük Kalkan Projektörü
+block.armored-duct.name = Zırhlı Tüp
+block.overflow-duct.name = Taşma Tüpü
+block.underflow-duct.name = Alt-Taşma Tüpü
+block.duct-unloader.name = Tüp Boşaltıcı
+block.surge-conveyor.name = Akı Konveyör
+block.surge-router.name = Akı Yönlendirici
+block.unit-cargo-loader.name = Birim Kargo Yükleyici
+block.unit-cargo-unload-point.name = Birim Kargo Boşaltma Noktası
+block.reinforced-pump.name = Güçlendirilmiş Pompa
+block.reinforced-conduit.name = Güçlendirilmiş Boru
+block.reinforced-liquid-junction.name = Güçlendirilmiş Sıvı Kavşağı
+block.reinforced-bridge-conduit.name = Güçlendirilmiş Köprü Borusu
+block.reinforced-liquid-router.name = Güçlendirilmiş Sıvı Yönlendirici
+block.reinforced-liquid-container.name = Güçlendirilmiş Sıvı Konteyneri
+block.reinforced-liquid-tank.name = Güçlendirilmiş Sıvı Tankı
+block.beam-node.name = Işın Noktası
+block.beam-tower.name = Işın Kulesi
+block.beam-link.name = Işın Bağlantısı
+block.turbine-condenser.name = Türbin Kondensatörü
+block.chemical-combustion-chamber.name = Kimyasal Yanma Odası
+block.pyrolysis-generator.name = Piroliz Jeneratörü
+block.vent-condenser.name = Baca Sıkıştırıcı
+block.cliff-crusher.name = Kayalık Delici
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Plazma Kayalık Kazıcı
+block.large-plasma-bore.name = Büyük Plazma Kayalık Kazıcı
+block.impact-drill.name = Darbeli Matkap
+block.eruption-drill.name = Patlamalı Matkap
+block.core-bastion.name = Merkez: Sur
+block.core-citadel.name = Merkez: Kale
+block.core-acropolis.name = Merkez: Akropolis
+block.reinforced-container.name = Güçlendirilmiş Konteyner
+block.reinforced-vault.name = Güçlendirilmiş Depo
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Tank Yeniden Yapılandırıcı
+block.mech-refabricator.name = Robot Yeniden Yapılandırıcı
+block.ship-refabricator.name = Gemi Yeniden Yapılandırıcı
+block.tank-assembler.name = Tank İnşaatcı
+block.ship-assembler.name = Gemi İnşaatcı
+block.mech-assembler.name = Robot İnşaatcı
+block.reinforced-payload-conveyor.name = Güçlendirilmiş Kargo Konveyör
+block.reinforced-payload-router.name = Güçlendirilmiş Kargo Yönlendirici
+block.payload-mass-driver.name = Kargo Kütle Sürücü
+block.small-deconstructor.name = Küçük Yapı Sökücü
+block.canvas.name = Tuval
+block.world-processor.name = Evrensel Ä°ÅŸlemci
+block.world-cell.name = Evrensel Bellek Hücresi
+block.tank-fabricator.name = Tank Fabrikatörü
+block.mech-fabricator.name = Robot Fabrikatörü
+block.ship-fabricator.name = Gemi Fabrikatörü
+block.prime-refabricator.name = Birincil Yeniden Yapılandırma Fabrikatörü
+block.unit-repair-tower.name = Birim Tamir Kulesi
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Basit İnşa Modülü
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Akım Reaktörü
+block.neoplasia-reactor.name = Neoplazmik Reaktör
 
+#ama tüp ne aga -Anti Dragon
 block.switch.name = Düğme
 block.micro-processor.name = Mikro Ä°ÅŸlemci
 block.logic-processor.name = Ä°ÅŸlemci
@@ -1175,69 +1934,158 @@ block.logic-display.name = Ekran
 block.large-logic-display.name = Büyük Ekran
 block.memory-cell.name = Bellek Hücresi
 block.memory-bank.name = Bellek Bankası
-
-team.blue.name = mavi
-team.crux.name = öz
-team.sharded.name = parçalanmış
-team.orange.name = turuncu
-team.derelict.name = sahipsiz
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Sharded
+team.derelict.name = Kalıntı
 team.green.name = yeÅŸil
-team.purple.name = mor
-
-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 = [scarlet]Mindustry öğreticisine hoş geldiniz.[]\nHareket etmek için ekranı kaydırın.\nYakınlaştırmak ve uzaklaştırmak için [accent]iki parmakla kıstırın[].\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.drill = Manuel olarak kazmak verimsizdir.\n[accent]Matkaplar []otomatikman kazabilir.\nSağ alttaki matkap sekmesine tıklayınız.\n[accent]Mekanik matkabı[] seçiniz. Tıklayarak bir bakır madenine yerleştirin.\n Yapımı durdurmak için [accent]sağ tıklayın[] ve yakınlaştırmak ve uzaklaştırmak için [accent]CTRL basılı tutarak tekerleği kaydırın[].
-tutorial.drill.mobile = Manuel olarak kazmak verimsizdir.\n[accent]Matkaplar []otomatik olarak kazabilir.\nSağ alttaki matkap sekmesine dokunun.\n[accent]Mekanik matkabı[] seçin. \nDokunarak bir bakır madenine yerleştirin, sonra seçiminizi onaylamak için alttaki [accent] tik düğmesine[] basın.\nYerleştirmenizi iptal etmek için [accent] X butonuna[] basın.
-tutorial.blockinfo = Her bloğun farklı istatistikleri vardır. Her matkap sadece belirli madenleri kazabilir.\nBir bloğun bilgi ve istatistiklerine bakmak için,[accent] yapım menüsünde seçerken "?" tuşuna dokunun.[]\n\n[accent]Şimdi mekanik matkabın istatistiklerine erişin.[]
-tutorial.conveyor = [accent]Konveyörler[] merkeze eşyaları ulaştırmak için kullanılır.\nMatkaptan merkeze konveyörlerden oluşan bir sıra yapın.\n[accent]Bir sıra halinde yerleştirmek için farenizi basılı tutun.[]\nÇaprazlama bir yol konveyör yerleştirmek için [accent]CTRL[] tuşunu basılı tutun.\n\n[accent]Sıra aracı ile 2 konveyör yerleştirin, sonra bir eşyayı merkeze götürün.
-tutorial.conveyor.mobile = [accent]Konveyörler[] merkeze eşyaları ulaştırmak için kullanılır.\nMatkaptan merkeze konveyörlerden oluşan bir sıra yapın.\n[accent] Bir sıra halinde yerleştirmek için parmağınızı birkaç saniye basılı tutup[] bir yöne çekin.\n\n[accent]Sıra aracı ile 2 konveyör yerleştirin, sonra bir eşyayı merkeze götürün.
-tutorial.turret = Bir eşya merkezinize girdiğinde, inşa için kullanılabilir.\nHer eşyaların sadece inşa için kullanılmadığını aklınızda tutun.\nİnşa için kullanılmayan eşyalar,[accent] kömür[] ya da[accent] hurda[] gibi materyaller merkeze konulamaz.\n[lightgray]Düşmanı[] püskürtmek için savunma yapıları inşa edilmelidir.\nÜssünüze yakın bir yerde [accent] duo tareti[] inşa edin.
-tutorial.drillturret = Duo taretleri ateş etmek için [accent]bakır mühimmata[] ihtiyaç duyar.\nTaretin yakınına bir matkap yerleştirin.\nKonveyörleri tarete yönelterek tarete bakır ikmal edin.\n\n[accent]İkmal edilen mühimmat: 0/1
-tutorial.pause = Mücadele sırasında [accent]oyunu durdurabilirsiniz.[]\nOyun durmaktayken inşaat emirlerini kuyruğa alabilirsiniz.\n\n[accent]Oyunu durdurmak için boşluk tuşuna basın.
-tutorial.pause.mobile = Mücadele sırasında [accent]oyunu durdurabilirsiniz.[]\nOyun durmaktayken inşaat emirlerini kuyruğa alabilirsiniz.\n\n[accent]Oyunu durdurmak için sol üstteki bu butona basın.
-tutorial.unpause = Şimdi devam etmek için boşluk tuşuna tekrar basın.
-tutorial.unpause.mobile = Şimdi devam etmek için butona tekrar basın.
-tutorial.breaking = Blokların sık sık yok edilmesi gerekir.\n[accent]Sağ fare butonuna basılı tutarak[] bir alan içindeki blokları seçip yok edebilirsiniz.[]\n\n[accent]Çekirdeğinizin solundaki bütün hurda bloklarını bu şekilde yok edin.
-tutorial.breaking.mobile = Blokların sık sık yok edilmesi gerekir.\n[accent]Yıkım modunu seçin[], sonra bir bloğa dokunarak onu yok edin. Ekrana birkaç saniye basılı tutarak bir alan içindeki blokları seçip yok edebilirsiniz.\nTik butonuna basarak yıkım işlemini onaylayın.\n\n[accent]Çekirdeğinizin solundaki bütün hurda bloklarını bu şekilde yok edin.
-tutorial.withdraw = Bazı durumlarda bloklardan materyalleri direkt olarak almak gerekir.\nBunun için önce içinde materyaller olan [accent]bir bloğa dokunun[], sonra envanterdeki [accent]malzemeye dokunun[].\n[accent]dokunup basılı tutarak[] birden fazla materyali alabilirsiniz.\n\nÇekirdekten biraz bakır alın.
-tutorial.deposit = Malzemeleri geminizden hedef bloğa sürükleyerek malzemeleri bırakabilirsiniz.\n\n[accent]Bakırı çekirdeğe geri bırakın.[]
-tutorial.waves = [lightgray]Düşman[] yaklaşıyor.\n\nÇekirdeği 2 dalga boyunca koruyun. Ateş etmek için [accent]tıklayın[].\nDaha fazla taret ve matkap inşa edin ve daha fazla bakır toplayın.
-tutorial.waves.mobile = [lightgray]Düşman[] yaklaşıyor.\n\nÇekirdeği 2 dalga boyunca koruyun. Geminiz düşmanlara otomatik olarak ateş edecektir.\nDaha fazla taret ve matkap inşa edin ve daha fazla bakır toplayın.
-tutorial.launch = Belirli bir dalgaya ulaşınca, çekirdeği bulunduğu bölgeden [accent]kaldırabilir[], bütün binalarınızı arkada bırakıp [accent]çekirdeğinizdeki bütün materyallere sahip olabilirsiniz.[]Bu materyaller daha sonra yeni teknolojiler geliştirmek için kullanılabilir.\n\n[accent]Kalkış butonuna basın.
-
-item.copper.description = En basit materyal. Her türlü blokda kullanılır.
+#Tüpü bilmem ama yeni çıkan erekir çok iyi değil mi -siyah pulsar
+team.blue.name = mavi
+#erekir cidden güzelmiş -siyah pulsar
+hint.skip = Geç
+hint.desktopMove = [accent][[WASD][] ile hareket et.
+hint.zoom = [accent]Scroll[] ile Zoom yap.
+hint.desktopShoot = [accent][[Sol Tılayarak][] ateş et.
+hint.depositItems = Malzeme transferi için, kendi biriminden çekirdeğe sürkle ve bıraz.
+hint.respawn = Tekrar doğmak için, [accent][[V][] ye bas.
+hint.respawn.mobile = Bir Bina veya Birimi kontrol ediyorsun. Tekrar doğmak için, [accent]sol üstteki avatara tıkla.[]
+hint.desktopPause = [accent][[BoÅŸluk][] tuÅŸuna basarak oyunu durdurup yeniden baÅŸlata bilrisin.
+hint.breaking = Blokları silmek için silmek istediğiniz objelerin üstüne [accent]Sağ Tıklayın[]. Birden fazla obje silmek için sağ tuşu basılı tutun ve farenizi sürükleyin.
+hint.breaking.mobile = Ekranın sağ altındaki \ue817 [accent]çekiç[] tuşuna basın ve silmek istediğiniz objelere tıklayın. \n\nBirden fazla obje silmek için parmağınızı ekranda 1 saniye basılı tutun ve parmağınızı sürükleyin.
+hint.blockInfo = Bir blok hakkında bilgiyi görüntülemek için [accent]inşa menüsüne[] tıklayın. Sonra sağdaki [accent][[?][] sembolüne tıklayın.
+hint.derelict = [accent]Sahipsiz[] binalar artık çalışmaz durumdadır. \n\nBu binaları [accent]yıkarsanız[] size malzeme verirler.
+hint.research = \ue875 [accent]Araştırma[] sekmesini kullanarak yeni teknolojiler araştırabilirsiniz.
+hint.research.mobile = \ue88c [accent]Menüdeki[] \ue875 [accent]Araştırma[] sekmesini kullanarak yeni teknolojiler araştırabilirsiniz.
+hint.unitControl = Kendi takımınızdaki taret ve birimleri kontrol etmek için [accent][[Sol CTRL][] tuşunu basılı tutarak istediğiniz taretin yada birimin üstüne sol tıklayın.
+hint.unitControl.mobile = Kendi takımınızdaki taret ve birimleri kontrol etmek için istediğiniz taretin yada birimin üstüne [accent][[2 kere tıklayın.][]
+hint.unitSelectControl = Birim kontrol etmek için [accent]komuta moduna[] geç: [accent]L-shift.[]\nKomuta modunda iken, basılı tut ve sürükle. Bir yere [accent]Sağ-tık[]layarak birimleri oraya yönlendir.
+hint.unitSelectControl.mobile = Birim kontrol etmek için [accent]komuta moduna[] geç: [accent]komuta[] düğmesine bas.\nKomuta modunda iken, basılı tut ve sürükle. Bir yere tıklayarak birimleri oraya yönlendir.
+hint.launch = Yeterince kaynak topladıktan sonra, üssünüzü başka bir sektöre [accent]fırlatmak[] için sağ alttaki \ue827 [accent]harita[] tuşuna basın.
+hint.launch.mobile = Yeterince kaynak topladıktan sonra, üssünüzü başka bir sektöre [accent]fırlatmak[] için sağ alttaki \ue88c [accent]menüden[] \ue827 [accent]harita[] tuşuna basın.
+hint.schematicSelect = İstediğiniz blokları kopyalayıp yapıştırmak için [accent][[F][] tuşunu basılı tutun ve farenizi sürükleyin.\n\n[accent][[Orta Tuş'a (Fare Tekerleği'ne)][] basarak tek bir blok seçebilirsiniz.
+hint.rebuildSelect = [accent][[B][] ye basılı tutarak, yok edilmiş blokları seç.\nBu binaları yeniden inşa etmeni sağlar.
+hint.rebuildSelect.mobile = \ue874 kopya tuşunu seç, sonra \ue80f yeniden inşa tuşuna bas ve yok olmuş blok planlarını seçmek için sürükle.\nBu onları otomatik olarak tekrardan inşa edecektir.
+hint.conveyorPathfind = Konveyörler ile yol yaparken bir noktadan diğer noktaya otomatik yol oluşturmak için [accent][[Sol CTRL][] tuşunu basılı tutun.
+hint.conveyorPathfind.mobile = Konveyörler ile yol yaparken bir noktadan diğer noktaya otomatik yol oluşturmak için \ue844 [accent]Çapraz Mod'u[] etkinleştirin.
+hint.boost = Bazı yer birimleri duvarların, taretlerin, diğer birimlerin üstünden uçma özelliği vardır. [accent][[Sol Shift][] tuşunu basılı tutarak bazı yer üniteleri ile uçabilirsiniz.
+hint.payloadPickup = Bazı birimlerin binaları ve birimleri alma özelliği vardır. Bir binanın yada birimin üstündeyken [accent][[[] tuşuna basarak kendinizden küçük binaları ve birimleri alabilirsiniz.
+hint.payloadPickup.mobile = Bazı birimlerin binaları ve birimleri alma özelliği vardır. Bir binaya yada birime [accent]Tıklayıp Basılı Tutarak[] kendinizden küçük binaları ve birimleri alabilirsiniz.
+hint.payloadDrop = [accent]][] tuşuna basarak taşıdğınız yükü bırakabilirsiniz.
+hint.payloadDrop.mobile = Boş bir yere [accent]tıklayıp basılı tutarak[] taşıdığınız yükü bırakabilirsiniz.
+hint.waveFire = [accent]Wave[] tareti su ile dolu olduğu zaman etrafta çıkan yangınları otomatik olarak söndürür.
+hint.generator = \uf879 [accent]Termik Jeneratör[] kömür yakarak enerji üretir.\n\nEnerjiyi bir yerden başka bir yere götürmek için \uf87f [accent]Enerji Noktalarını[] kullanırız.
+hint.guardian = [accent]Gardiyan[] birimleri güçlü bir zırha sahiptir. [accent]bakır[] ve [accent]kurşun[] gibi mermilere karşı [scarlet]Dayanıklıdır[].\n\nGardiyanları öldürmek için [accent]salvo[] gibi daha güçlü taretleri ve \uf835 [accent]grafit[] gibi daha çok hasar veren mermileri kullanın.
+hint.coreUpgrade = Merkezinizi, [accent]merkezinizin üstüne daha gelişmiş bir merkez[] koyarak geliştirebilirsiniz. \n\n[accent]Parçacık[] olarak adlandırılan fakirhanenizin üstüne [accent]Temel[] olarak adlandırılan merkezinizi koyun. Merkezinizin etrafında hiçbir yapı olmamalıdır.
+hint.presetLaunch = [accent]Donmuş Ormanlar[] gibi [accent]ana sektörlere iniş[] herhangi bir yerden yapılabilir. Yakındaki bir sektörden fırlatma gerektirmez.\n\nBunun gibi [accent]sayı ile isimlendirilmiş[] sektörleri ele geçirmek [accent]isteğe bağlıdır.[].
+hint.presetDifficulty = Bu sektör, [scarlet]yüksek tehlike[] barındırıyor.\nBöyle bir sektöre hazırlıksız fırlatış yapmak [accent]tavsiye edilmez[].
+hint.coreIncinerate = Bir merkez ağzına kadar dolduktan sonra, ekstra itemler [accent]eritilir[].
+hint.factoryControl = Bir Birim Fabrikasının [accent]üretim noktasını[] seçmek için Komuta modundayken sol tıkla ve ardından birimlerin gitmesini isteidğin noktaya sağ tıkla.\nÜretilen birimler, otomatik o noktaya gidecektir.
+hint.factoryControl.mobile = Bir Birim Fabrikasının [accent]üretim noktasını[] seçmek için Komuta modundayken tıkla ve ardından birimlerin gitmesini isteidğin noktaya tıkla.\nÜretilen birimler, otomatik o noktaya gidecektir.
+gz.mine = \uf8c4 [accent]Bakır madeni[]nin yanına giderek üzerine tıklayarak kazmaya başla.
+gz.mine.mobile = \uf8c4 [accent]Bakır madeni[]nin yanına giderek üzerine tıklayarak kazmaya başla.
+gz.research = \ue875 Teknoloji Ağacını aç.\n\uf870 [accent]Mekanik Matkap[]'ı aç, ardından sağ alttaki menüden seç.\nBakır madenine tıklayarak üzerine matkapı yerleştir.
+gz.research.mobile = \ue875 Teknoloji Ağacını aç.\n\uf870 [accent]Mekanik Matkap[]'ı aç, ardından sağ alttaki menüden seç.\nBakır madenine tıklayarak üzerine matkapı yerleştir.\n\nArdından \ue800 [accent]tik[] tuşuna basarak inşayı onayla.
+gz.conveyors = \uf896 [accent]Konveyör[]'ü aç ve yerleştirerek madenleri merkeze taşı.\n\nBasılı tutup sürükleyerek birden fazla konveyör koy.\n[accent]Scroll[] ile döndür.
+gz.conveyors.mobile = \uf896 [accent]Konveyör[]'ü aç ve yerleştirerek madenleri merkeze taşı.\n\nBasılı tutup sürükleyerek birden fazla konveyör koy.
+gz.drills = Operasyonunu genişlet.\nDaha fazla Mekanik Matkap yerleştir.\n100 Bakır kaz.
+gz.lead = \uf837 [accent]Kurşun[], kullanılan basit madenlerden biridir.\nKurşun kazmak için matkap kullan.
+gz.moveup = \ue804 Daha fazla talimat için yukarı ilerle.
+gz.turrets = 2 adet\uf861 [accent]Duo[] tareti araştır ve koy.\nDuo tareti bakır\uf838 [accent]mermi[]ye ihtiyaç duyar.
+gz.duoammo = Duo'ya konveyörler ile [accent]bakır[] besle.
+gz.walls = [accent]Duvarlar[] gelen hasarı engelleyebilir.\nSilahların etrafına, koruma amçlı\uf8ae [accent]Bakır Duvar[] inşa et.
+gz.defend = DÜŞMAN GELİYO!!! Hazırlan.
+gz.aa = Uçan birimler standart taretlerle kolay kolay durdurulamaz..\n\uf860 Onları daha kolay durdurmak için, [accent]Scatter[] tareti kullan, ancak mermi olarak\uf837 [accent]kurşun[] gerektirir.
+gz.scatterammo = Scatter taretini [accent]kurÅŸun[] ile besle.
+gz.supplyturret = [accent]Tareti Besle
+gz.zone1 = Burası düşman iniş noktası.
+gz.zone2 = Buraya inÅŸa edilien her ÅŸey otomatik yok edilir!
+gz.zone3 = Dalga başlamak üzere.\nHazır ol. Dikkat! ... Korkma sönmez bu şafak-
+gz.finish = Daha fazla taret inşa et, daha fazla maden kaz\nve tüm dalgaları yenerek [accent]sektörü feth et[]. Bol şans, RTOmega.
+onset.mine = Tıklayarak, duvarlardan\uf748 [accent]berillyum[] kaz.\n\n[accent][[WASD] ile hareket et.
+onset.mine.mobile = Tıklayarak, duvarlardan\uf748 [accent]berillyum[] kaz.
+onset.research = \ue875 Teknoloji Ağacını aç.\n\uf73e [accent]Türbin Sıkıştırıcı[]'sını aç ve bir bacanın üstüne yerleştir.\nBu [accent]enerji[] üretecktir.
+onset.bore = \uf741[accent]Plazma Kayalık Kazıcı[]'yı araştır ve koy.\nBu durvarlardan otomatik kum kazacak.
+onset.power = Plazma kazıcıya [accent]enerji[] vermek için\uf73d [accent]Işın Noktası[]'nı araştır ve inşa et.\nTürbin Sıkıştırıcısı'nı Plazma Kazıcıya bağla.
+onset.ducts = \uf799[accent]Tüp[]'ü aç ve konveyör gibi kullanarak madenleri merkeze taşı.\nTıklayığ basılı tutarak birden fazla tüp koy.\n[accent]Scroll[] ile döndür.
+onset.ducts.mobile = \uf799[accent]Tüp[]'ü aç ve konveyör gibi kullanarak madenleri merkeze taşı.\nTıklayığ basılı tutarak birden fazla tüp koy.
+onset.moremine = Kazı operasyonunu genişlet.\nDaha fazla Plazma Kayalık Kazıcı inşa et.\n200 Berilyum kaz.
+onset.graphite = Daha gelişmiş bloklar\uf835 [accent]grafit[] gerektirir.\nGafit kazmak için Plazma Kayalık Kazıcıları inşa et.
+onset.research2 = [accent]Fabrikaları[] araştırmaya başla.\n\uf74d[accent]Kayalık Delici[] ve\uf779 [accent]Ark Silisyum Fırını[]'nı araştır.
+onset.arcfurnace = Ark Fırın,\uf834 [accent]kum[] ve \uf835 [accent]grafit[]'ten \uf82f [accent]silisyum[] üret.\nBu işlem [accent]Enerji[] de gerektirir.
+onset.crusher = \uf74d [accent]Kayalık Delici[] kullanarak kum kaz.
+onset.fabricator = [accent]Birim[] kullanarak haritayı gez, binalarını koru ve düşmanları alt et. \uf6a2 [accent]Tank İnşaatcı[]'sını araştır ve inşa et.
+onset.makeunit = Bir Birim üret.\n"?" tuşunu kullanarak gereksinimleri görebilirsin.
+onset.turrets = Birimler etkili, ancak [accent]taretler[] daha iyi bir savunma sağlar.\n\uf6eb [accent]Breach[] taretini inşa et.\nTaretler\uf748 [accent]mermi[]ye ihtiyaç duyar.
+onset.turretammo = Tareti [accent]berilyum mermi[] ile besle.
+onset.walls = [accent]Duvarlar[] gelen hasarı engelleyebilir.\nSilahların etrafına, koruma amçlı\uf8ae [accent]Berilyum Duvar[] inşa et.
+onset.enemies = DÜŞMAN GELİYO!!! Hazırlan.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = Düşman zayıf! Hemen geri dal!
+onset.cores = [accent]Merkez Zemin[]lerinin üzerine yeni merkezler inşa edilebilir.\nTüm merkezler birbirleri ile malzemeleri paylaşır.\n\uf725 Bir merkez inşa et.
+onset.detect = Düşman seni 2 dakika içinde tespit edicek.\nSavunma, maden ve üretime başla.
+onset.commandmode = [accent]Shift[] e basılı tutarak [accent]Komuta Modu[]na geç.\n[accent]Sol Tıklayıp sürekleyerek[] birim seç.\n[accent]Sağ Tıklayarak[] Birimleri Yönlendir veya saldırt.
+onset.commandmode.mobile = [accent]Komuta Düğmesine[] basarak [accent]Komuta Moduna[] gir.\nBir Parmağını basılı tut ve değirini [accent]sürükle[]yerek birim seç.\n[accent]Tıkla[]yarak birimleri saldırttırabilir veya yönlendirebilirsin.
+aegis.tungsten = Tungsten [accent]darbeli matkap[] kullanılarak kazılabilir.\nBu bina [accent]su[] ve [accent]elektrik[] ister.
+split.pickup = Bazı bloklar merkez birimi ile taşınabilir.\nBu [accent]Konteyner[]i kaldır ve [accent]Küyle Yükleyici[]ye koy.\n([ ve ] tuşlarını kullan)
+split.pickup.mobile = Bazı bloklar merkez birimi ile taşınabilir.\nBu [accent]Konteyner[]i kaldır ve [accent]Küyle Yükleyici[]ye koy.\n(Uzun basarak bir şeyi taşı.)
+split.acquire = Birim üretmek için Tungsten kaz.
+split.build = Birimler duvarın öbür tarafına taşınmalı.\nİki adet [accent]Kargo Kütle Sürücü[] inşa et, duvarın iki farklı tarafında.\nBir tanesine tıklayarak birbirlerine bağla.
+split.container = Konteynerler gibi, birimler de [accent]Kargo Kütle Sürücü[] ile taşınabilir.\nKütle Sürücün yanına bir Birim İnşaatcı inşa et ve birim üreterek düşman üsse saldır.
+#Yukarıdaki bağzı cümleler Anti Dragon tarafından çevirildi.
+item.copper.description = En basit materyal. Her türlü blokta kullanılır.
+item.copper.details = Bakır. En basit materyal. Tüm alt düzey binalarda gerekir. Zayıf ve dayanıksızdır.
 item.lead.description = Basit bir materyal. Elektronikte ve sıvı taşımada kullanılır.
+item.lead.details = Yoğun. Durağan. Pillerde yaygın olarak kullanılır.\nNot: Yaşam formlarına toksik. Tabi burda onlardan pek yok...
 item.metaglass.description = Süper sert camdan bir bileşim. Sıvı dağıtımı ve depolamak için yaygın olarak kullanılır.
 item.graphite.description = Mineralize karbon. Mermi ve elektrik yalıtımında kullanılır.
 item.sand.description = Hem alaşım yapmada hem de arıtkan olarak metalurji işlemlerinde kullanılan bir malzeme.
 item.coal.description = Tohumlama olayından çok önce oluşmuş, fosilleşmiş bitki maddesi. Yaygın olarak yakıt ve kaynak üretimi için kullanılır.
+item.coal.details = Fosilleşmiş bitki kalıntısına benziyor. Herhalde tohumlanmadan çok uzun zaman önce ölmüşler.
 item.titanium.description = Yaygın olarak sıvı taşımada, matkaplarda ve uçaklarda kullanılan nadir bir süper-hafif metal.
 item.thorium.description = Yapısal destek ve nükleer yakıt olarak kullanılan yoğun, radyoaktif bir metal.
 item.scrap.description = Eski yapılar ve birimlerin kalıntıları. Birçok farklı metalden eser miktarları içerir.
+item.scrap.details = Eski bina ve birimlerin kalıntıları.
 item.silicon.description = Kullanışlı bir yarı iletken. Güneş panellerinde, elektronikler ve güdümlü cephanesi için kullanılır.
 item.plastanium.description = Gelişmiş uçak ve parçalama için kullanılan hafif, sünek bir malzeme.
 item.phase-fabric.description = Gelişmiş elektronik ve kendi kendini tamir etme teknolojisınde kullanılan neredeyse ağırlıksız bir madde.
 item.surge-alloy.description = Kendine özgü elektriksel özelliklere sahip gelişmiş bir alaşım.
 item.spore-pod.description = Endüstriyel kullanım için atmosferik partiküllerden üretilen sentetik sporlarla dolu bir kapsül. Yağ, patlayıcı ve yakıt yapımı için kullanılır.
+item.spore-pod.details = Spor. Büyük ihtimalle sentetik bir yaşam formu. Tokisk bir gaz yayıyor. Aşırı istilacı. Aşırı yanıcı.
 item.blast-compound.description = Bomba ve patlayıcılarda kullanılan dengesiz bir bileşim. Spor kapsülleri ve diğer uçucu maddelerden sentezlenir. Yakıt olarak tavsiye edilmez.
 item.pyratite.description = Yakıcı silahlarda kullanılan son derece yanıcı bir madde.
+item.beryllium.description = Erekirde mermi olarak kullanılır.
+item.tungsten.description = Matkap, savunma ve üretim için kullanılır. Daha gelişmiş binalarda kullanılır.
+item.oxide.description = Enerji ve ısı taşımada kullanılır.
+item.carbide.description = Daha gelişmiş bina ve birimlerde kullanılır.
+
 liquid.water.description = En kullanışlı sıvı. Makineleri soğutmak ve atık işlenmesi için kullanılır.
 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.
+liquid.arkycite.description = Sentez ve Kimyasal Reaksiyonlarda kullanılır.
+liquid.ozone.description = Oksitlemede, üretimde ve enerji üretiminde kullanılır. Patlayıcı.
+liquid.hydrogen.description = Maden çıkarmada, birim üretiminde ve taşımada kullanılır. Yanıcı.
+liquid.cyanogen.description = Mermi olarak, gelişmiş bina ve birimlerde kullanılır. Yüksek derecede Yanıcı.
+liquid.nitrogen.description = Gaz çıkarmada ve üretimde kullanılır. Durağan.
+liquid.neoplasm.description = Neoplazmik Reaktörün tehlikeli bir yan ürünü. Su ile taşınır ve su içerek tüm bloklara zarar verir.
+liquid.neoplasm.details = Neoplazma. Kontrolsüz bölünen kanserli hücre topluluğu. Isıya dayanıklı. Su içerek her binaya karşı aşırı tehlikeli.\n\nAnaliz için fazla dengesiz. Kullanımı bilmiyor. Cürüf göletlerinde eritmeniz öneirlir. [#ff]!SERPULOYA GÖTÜRME!
 
+block.derelict = [lightgray]\ue815 Kalıntı
+block.armored-conveyor.description = Materyalleri titanyum konveyörlerle aynı hızda taşır ama daha fazla zırha sahiptir. Diğer konveyörler dışında yan taraflardan materyal kabul etmez.
+block.illuminator.description = Küçük, kompakt, yapılandırılabilir bir ışık kaynağı. Çalışması için enerji gerekir.
 block.message.description = Bir mesajı saklar. Müttefikler arasındaki haberleşmede kullanılır.
+block.reinforced-message.description = Dostlarınla muhabbet için bir mesaj bloğu.
+block.world-message.description = Harita yapımcıları için bir mesaj bloğu. Yokedilemez.
 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.
-block.silicon-smelter.description = Kumu saf kömürle eritip silikon üretir.
+block.silicon-smelter.description = Kumu saf kömürle eritip silisyum üretir.
 block.kiln.description = Kum ve kurşunu eritir ve metacam olarak bilinen malzemeyi oluşturur. Çalıştırması için az miktar enerji gerekir.
 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.surge-smelter.description = Akı alaşımı üretmek için titanyum, kurşun, silisyum ve bakırı birleştirir.
 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.blast-mixer.description = Patlayıcı bileşen üretmek için spor kapsüllerini Piratit 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 Piratit üretir.
 block.melter.description = Wave taretlerinde kullanılması veya daha çok işlemesi için hurdayı eritip cürufa çevirir.
 block.separator.description = Cürufu mineral bileşenlerine ayırır. Soğutulmuş bileşenleri çıkarır.
 block.spore-press.description = Yağ çıkartmak için aşırı basınç altında spor kapsüllerini sıkıştırır.
@@ -1250,6 +2098,8 @@ block.item-source.description = Seçilen eşyadan sonsuz verir. Sadece Yaratıc
 block.item-void.description = Verilen eşyaları yok eder. Sadece Yaratıcı Modda.
 block.liquid-source.description = Seçilen sıvıyı sonsuz verir. Sadece Yaratıcı Modda.
 block.liquid-void.description = Verilen sıvıları yok eder. Sadece Yaratıcı Modda.
+block.payload-source.description = Sınırsız bir şekilde Birim ve Kargo oluşturur. Sadece Yaratıcı Modda.
+block.payload-void.description = Tüm Yük ve Birimleri Yok Eder. Sadece Yaratıcı Modda.
 block.copper-wall.description = Ucuz bir savunma bloğu.\nİlk birkaç dalgada merkezi ve silahları korumak için kullanışlıdır.
 block.copper-wall-large.description = Ucuz bir savunma bloğu.\nİlk birkaç dalgada merkezi ve taretleri korumak için kullanışlıdır.\nBirçok blok alan kaplar.
 block.titanium-wall.description = Orta derecede güçlü savunma bloğu.\nDüşmanlardan orta derecede koruma sağlar.
@@ -1262,9 +2112,13 @@ block.phase-wall.description = Özel faz örgüsü bazlı yansıtıcı materyal
 block.phase-wall-large.description = Özel faz bazlı yansıtıcı bileşik ile kaplanmış bir duvar. Çoğu mermi çarpma anında geri sektirir.\nBirçok blok alan kaplar.
 block.surge-wall.description = Son derece dayanıklı bir savunma bloğu.\nMermi temasıyla yükü toplar ve bu yükü rastgele serbest bırakır.
 block.surge-wall-large.description = Son derece dayanıklı bir savunma bloğu.\nMermi temasıyla yükü toplar ve bu yükü rastgele serbest bırakır.\nBirçok blok alan kaplar.
+block.scrap-wall.description = Binaları düşman mermilerinden korur.
+block.scrap-wall-large.description = Binaları düşman mermilerinden korur.
+block.scrap-wall-huge.description = Binaları düşman mermilerinden korur.
+block.scrap-wall-gigantic.description = Binaları düşman mermilerinden korur.
 block.door.description = Küçük bir kapı. Dokunarak açılabilir veya kapatılabilir.
 block.door-large.description = Büyük bir kapı. Dokunarak açılabilir veya kapatılabilir.\nBirçok blok alan kaplar.
-block.mender.description = Çevresindeki blokları periyodik olarak tamir eder. Savunmaları dalgalar arasında tamir eder.\nİsteğe bağlı olarak menzili ve verimi arttırmak için silikon kullanılabilir.
+block.mender.description = Çevresindeki blokları periyodik olarak tamir eder. Savunmaları dalgalar arasında tamir eder.\nİsteğe bağlı olarak menzili ve verimi arttırmak için silisyum kullanılabilir.
 block.mend-projector.description = Tamircinin yükseltilmiş bir versiyonu. Çevresindeki blokları onarır.\nİsteğe bağlı olarak menzili ve verimliliği artırmak için faz örgüsü kullanılabilir.
 block.overdrive-projector.description = Yakınındaki binaların hızını artırır.\nİsteğe bağlı olarak menzili ve verimliliği artırmak için faz örgüsü kullanılabilir.
 block.force-projector.description = Kendi etrafında altıgen güç alanı oluşturur. Çok fazla zarar gördüğünde aşırı ısınır ve kapanır.\nİsteğe bağlı olarak aşırı ısınmasını önlemek için soğutma sıvısı,koruyucu boyutunu artırmak için ise faz örgüsü kullanılabilir.
@@ -1278,51 +2132,59 @@ block.phase-conveyor.description = Gelişmiş materyal taşıma bloğu. Materyal
 block.sorter.description = Materyalleri ayıklar. Eğer materyal seçilen ile eşleşiyorsa geçmesine izin verilir. Yoksa materyal sağa ya da sola atılır.
 block.inverted-sorter.description = Materyalleri sıradan bir ayıklayıcı gibi işler, ancak seçili öğeleri önden değil yanlardan geçirir.
 block.router.description = Materyalleri bir yönden alıp diğer üç yöne eşit olarak dağıtır. Materyalleri bir kaynaktan birden fazla hedefe iletmek için kullanılır.\n\n[scarlet]Asla üretim yapan binaların dibine yerleştirmeyin, yoksa istenmeyen materyaller tarafından tıkanabilir.[]
+block.router.details = [#ff]Sakın, asla, kattiyen iki tanesini yan yana koyma! Yoksa Tüm Evren Parçalanabilir!
 block.distributor.description = Gelişmiş bir yönlendirici. Materyalleri yedi farklı yöne dağıtabilir.
 block.overflow-gate.description = Ayırıcı ve yönlendiricinin bir karışımı. Materyalleri sadece ön kısım kapalı olduğunda sağa ve sola atar.
 block.underflow-gate.description = Taşma geçidinin zıttıdır. Sol ve sağ taraf kapalıysa materyalleri ön tarafa atar.
 block.mass-driver.description = En gelişmiş materyal taşıma bloğu. bir miktar materyalı alır ve onları uzak mesafedeki bir başka kütle sürücüsüne ateşler. Çalışması için enerji gerekir.
 block.mechanical-pump.description = Hiç enerji harcamayan, düşük çıktılı, ucuz bir pompa.
 block.rotary-pump.description = Daha gelişmiş bir pompa. Daha fazla sıvı depolar ama çalışması için enerji gerekir.
-block.thermal-pump.description = En iyi pompa.
+block.impulse-pump.description = En iyi pompa. Çalışması için enerji gerekir.
 block.conduit.description = Temel sıvı taşıma bloğu. Sıvıları ileri taşır. Pompalar ve diğer borularla birlikte kullanılır.
 block.pulse-conduit.description = Gelişmiş bir sıvı taşıma bloğu. Sıvıları normal borulardan daha hızlı taşır ve onlardan daha fazla sıvı alır.
 block.plated-conduit.description = Sıvıları dalga borusuyla aynı güçte taşır ancak daha fazla zırha sahiptir. Borular dışında başka bir şekilde yandan sıvı kabul etmez.\nDaha az sızıntı yapar.
 block.liquid-router.description = Sıvıları bir yönden alıp diğer üç yöne eşit olarak dağıtır. Ayrıca kendisi de bir miktar sıvı depolayabilir. Sıvıları bir kaynaktan birden fazla hedefe iletmek için kullanılır.
+block.liquid-container.description = Az bir miktarda sıvı depolar, her yöne dağıtır.
 block.liquid-tank.description = Çok miktarda sıvıyı depolar. İhtiyaçları devamlı olmayan sıvıları yedek olarak saklamakta ya da önemli blokların devamlı olarak soğutulmasında kullanılabilir.
 block.liquid-junction.description = Çakışan iki boru hattı arasında bir köprü görevi görür. İki farklı borunun farklı hedeflere farklı sıvıları taşıdığı durumlarda kullanışlıdır.
 block.bridge-conduit.description = Gelişmiş sıvı taşıma bloğu. Sıvıları her türlü arazi veya binanın üzerinden üç bloğa kadar uzağa taşıyabilir.
 block.phase-conduit.description = Gelişmiş sıvı taşıma bloğu. Sıvıları kendisine bağlı başka bir faz borusuna ışınlamak için enerji kullanır.
-block.power-node.description = Bağlı düğümlere enerji sağlar. Ayrıca dibindeki bloklardan da enerji alıp onlara enerji verebilir.
-block.power-node-large.description = Daha fazla menzil ve bağlantıya sahip daha gelişmiş bir güç düğümü
-block.surge-tower.description = Daha az bağlantı sayısına sahip oldukça uzun menzilli bir güç düğümü.
+block.power-node.description = Bağlı noktalara enerji aktarır. Ayrıca dibindeki bloklardan da enerji alıp onlara enerji verebilir.
+block.power-node-large.description = Daha fazla menzil ve bağlantıya sahip daha gelişmiş bir enerji noktası.
+block.surge-tower.description = Daha az bağlantı sayısına sahip oldukça uzun menzilli bir enerji noktası.
 block.diode.description = Pil gücü, bu bloktan yalnızca diğer tarafta daha az güç depolandığında sadece tek bir yöne akabilir.
 block.battery.description = Enerji fazlasını yedek olarak saklar. Enerji açığında sakladığı enerjiyi salar.
 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.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.differential-generator.description = Çok miktarda enerji üretir. Kriyosıvı ve yanan Piratit 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.
+block.solar-panel.description = Güneşten az miktarda enerji üretir.
 block.solar-panel-large.description = Standart güneş panelinin daha verimli bir versiyonu.
 block.thorium-reactor.description = Toryumdan, yüksek miktarda enerji üretir. Devamlı soğutulmaya ihtiyacı vardır. Yeterli soğutucu temin edilmezse şiddetle patlar. ürettiği enerji doluluk oranına bağlıdır, tam dolu iken temel düzeyde enerji üretir.
-block.impact-reactor.description = Gelişmiş bir jeneratör, tam verimle dev miktarda enerji üretebilir. İşlemi başlatmak için dışarıdan bir miktar enerjiye ihtiyacı vardır.
+block.impact-reactor.description = Gelişmiş bir jeneratör, tam verimle çok yüksek miktarda enerji üretebilir. İşlemi başlatmak için dışarıdan bir miktar enerjiye ihtiyacı vardır.
 block.mechanical-drill.description = Ucuz bir matkap. Doğru karelere konulduğunda, bir materyalden yavaş ama durmaksızın üretir. Sadece temel kaynaklardan kazabilir.
 block.pneumatic-drill.description = Titanyumu kazabilen, daha gelişmiş bir matkap. Mekanik matkaptan daha hızlıdır.
 block.laser-drill.description = Lazer teknolojisi sayesinde daha da hızlı kazmaya izin verir ancak çalışması için enerji gerekir. Toryumu kazabilir.
 block.blast-drill.description = En iyi matkap. Çalışması için çok miktarda enerji gerekir.
 block.water-extractor.description = Yeraltındaki suyu çıkarır. Hiç su bulunmayan yerlerde kullanılır.
 block.cultivator.description = Atmosferdeki küçük spor partiküllerini büyütüp endüstriyel kullanıma hazır kapsüllere çevirir.
-block.oil-extractor.description = Çokça enerji, su kullanarak yerden petrol çıkarır.
-block.core-shard.description = Çekirdek kapsülünün ilk versiyonu. Yok edilirse, bölge ile bütün iletişim kesilir. Bunun olmasına izin verme.
-block.core-foundation.description = Çekirdek kapsülünün ikinci versiyonu. Daha iyi zırhlı ve daha çok materyal depolayabilir.
-block.core-nucleus.description = Çekirdek kapsülünün üçüncü ve son versiyonu. Aşırı derecede zırhlı ve dev miktarda materyal depolayabilir.
+block.cultivator.details = Geri Dönüştürülmüş Teknoloji. Yüksek miktarda bio kütle üretmede kullanılır. Serpulo yu kaplayan sporların kaynağı.
+block.oil-extractor.description = Çokça enerji, su kullanarak kumdan petrol çıkarır.
+block.core-shard.description = Merkez kapsülünün ilk versiyonu. Yok edilirse, bölge ile bütün iletişim kesilir. Bunun olmasına izin verme.
+block.core-shard.details = İlk aşama. Bu üstün makine, kendini kopyalama ve tek inişlik roket özelliklerine sahip. Gezegenler arası ulaşımda kullanılamaz!
+block.core-foundation.description = Merkez kapsülünün ikinci versiyonu. Daha iyi zırhlı ve daha çok materyal depolayabilir.
+block.core-foundation.details = Ä°kinci AÅŸama.
+block.core-nucleus.description = Merkez kapsülünün üçüncü ve son versiyonu. Aşırı derecede zırhlı ve çok yüksek miktarda materyal depolayabilir.
+block.core-nucleus.details = Üçüncü ve Son Aşama. Daha sonrası var mı acaba?
 block.vault.description = Her materyalden az miktarda saklar. Materyalleri kasadan almak için bir boşaltıcı bloğu kullanılabilir.
 block.container.description = Her materyalden az miktarda saklar. Materyalleri konteynerden almak için bir boşaltıcı bloğu kullanılabilir.
-block.unloader.description = Materyalleri bir konteyner, kasa, veya çekirdekten çıkarıp; bir konveyöre veya dibindeki bir bloğa koyar. Çıkardığı materyal türü dokunularak değiştirilebilir.
-block.launch-pad.description = Çekirdek kalkışına gerek duymadan materyalleri üsse gönderir.
-block.launch-pad-large.description = Kalkış pistinin daha gelişmiş bir versiyonu. Daha fazla materyali daha sık gönderebilir.
+block.unloader.description = Materyalleri bir konteyner, depo veya merkezden çıkarıp; bir konveyöre veya dibindeki bir bloğa koyar. Çıkardığı materyal türü dokunularak değiştirilebilir.
+block.launch-pad.description = Başka Bir Sektöre item gönderir.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Küçük, ucuz bir taret. Yer birimlerine karşı etkilidir.
 block.scatter.description = Önemli bir uçaksavar tareti. Düşman birimlerine hurda ya da kurşun uçaksavar mermileri atar.
 block.scorch.description = Etrafındaki düşmanları ateşe verir. Yakın mesafede çok etkilidir.
@@ -1337,5 +2199,450 @@ 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.foreshadow.description = Çok uzaktaki Tek bir hedefe inanılmaz güçlü bir şok ışını vurur. En fazla canı olan birimi hedef alır.
 block.repair-point.description = Kendisine en yakın hasarlı birimi tamir eder.
 block.segment.description = Gelen mermilere zarar verir ve onları yok eder. Lazer mermilere etki etmez.
+block.parallax.description = Çekici bir ışın fırlatarak hava düşmanlarını kendine çeker. Onlara az da olsa zarar verir.
+block.tsunami.description = Düşmanlara yüksek miktarda sıvı püskürtür. Ateşleri otomatik söndürür.
+block.silicon-crucible.description = Kum ve kömürü, piratitle eriterek silisyum üretir. Sıcak ortamda daha iyi çalışır.
+block.disassembler.description = Cürufü eser miktardaki egzotik bileşenlerine düşük verimde ayırır. Toryum elde edebilir.
+block.overdrive-dome.description = Yakındaki binaları hızlandırır. Çalışmak için silisyum ve faz gerektirir.
+block.payload-conveyor.description = Büyük yükleri hareket ettirir. Birimler gibi.
+block.payload-router.description = Büyük Yükleri 3 Ayrı yöne aktarır.
+block.ground-factory.description = Yer Birimi üretir. Bu birimler direk kullanılabilir veya geliştirilebilir.
+block.air-factory.description = Hava Birimi üretir. Bu birimler direk kullanılabilir veya geliştirilebilir.
+block.naval-factory.description = Su Birimi üretir. Bu birimler direk kullanılabilir veya geliştirilebilir.
+block.additive-reconstructor.description = Birimleri 2. seviyeye yükseltir.
+block.multiplicative-reconstructor.description = Birimleri 3. seviyeye yükseltir.
+block.exponential-reconstructor.description = Birimleri 4. seviyeye yükseltir.
+block.tetrative-reconstructor.description = Birimleri 5. ve son seviyeye yükseltir.
+block.switch.description = Aktif edilebilen bir düğme.
+block.micro-processor.description = Birtakım işlemleri döngü halinde yapar. Birimleri ve binaları kontrol edebilir.
+block.logic-processor.description = Birtakım işlemleri döngü halinde yapar. Birimleri ve binaları kontrol edebilir. Daha hızlı çalışır.
+block.hyper-processor.description = Birtakım işlemleri döngü halinde yapar. Birimleri ve binaları kontrol edebilir. Daha-da hızlı çalışır.
+block.memory-cell.description = Bilgi saklar.
+block.memory-bank.description = Bilgi saklar. Yüksek kapasiteye sahiptir.
+block.logic-display.description = Bir işlemciden bilgi alarak grafik gösteririr.
+block.large-logic-display.description = Bir işlemciden bilgi alarak grafik gösteririr.
+block.interplanetary-accelerator.description = Gezegenler Arası ulaşım şimdi parmaklarının ucunda...
+block.repair-turret.description = Sürekli en yakın birimi tamir eder. Soğutucu kullanabilir.
+block.core-bastion.description = Ana Merkez. Güçlendirilmiş. Yok edildiğinde sektör kaybedilir.
+block.core-citadel.description = Ana Merkez. Yüksek Seviyede Güçlendirilmiş. Yok edildiğinde sektör kaybedilir. Daha fazla malzeme depolar.
+block.core-acropolis.description = Ana Merkez. Aşırı Yüksek Seviyede Güçlendirilmiş. Yok edildiğinde sektör kaybedilir. Daha da fazla malzeme depolar.
+block.breach.description = Düşmana delici berilyum mermilerle ateş eder.
+block.diffuse.description = Koni şeklinde ateş eder. Düşmanı geri iter.
+block.sublimate.description = Devamlı alev püskürtür. Zırh deler.
+block.titan.description = Yer birimlerine devasa füzelerle ateş eder. Hidrojen gerektirir.
+block.afflict.description = Devasa enerji küreleri fırlatır. Isı gerektirir.
+block.disperse.description = Parçacıklı hava mermileri ateşler.
+block.lustre.description = Düşmanlara yavaş hareket eden ve tek bir birimi hedef alabilen lazer ateşler.
+block.scathe.description = Uzak yer birimerline çok uzun bir mesafeden füzelerle saldırır.
+block.smite.description = Delici enerji saçıcı mermiler fırlatır.
+block.malign.description = Takipçi lazerlerle saldırır. Yüksek mikatrda ısı ister.
+block.silicon-arc-furnace.description = Kum ve grafitten silisyum üretir. Hayal Gibi...
+block.oxidation-chamber.description = Beriliyum ve ozonu oksite çevirir. Yan ürün olarak ısı üretir.
+block.electric-heater.description = Önündeki bloğu ısıtır. Enerji gerektirir.
+block.slag-heater.description = Önündeki bloğu ısıtır. Cürüf gerektirir.
+block.phase-heater.description = Önündeki bloğu ısıtır. Faz gerektirir.
+block.heat-redirector.description = Isıyı önündeki bloğa aktarır.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = Isıyı üç yöne dağtırır.
+block.electrolyzer.description = Suyu Oksijen ve Hidrojene ayırır. H₂O
+block.atmospheric-concentrator.description = Atmosferden Nitrojen emcikler. Isı gerktirir.
+block.surge-crucible.description = Silisyum ve cürüften Akı üretir. Isı gerktirir.
+block.phase-synthesizer.description = Toryum, kum ve ozon'dan Faz üretir. Isı gerktirir.
+block.carbide-crucible.description = Grafit ve Tungsteni birleştirip Karbür üretir. Isı gerktirir.
+block.cyanogen-synthesizer.description = Arkyisit ve Grafiti birleştirip Siyanojen üretir. Isı gerktirir.
+block.slag-incinerator.description = Her şeyi eriterek yok eder. Cürüf gerektirir.
+block.vent-condenser.description = Baca gazlarını suya çevirir. Enerji gerektirir.
+block.plasma-bore.description = Bir duvar madeninine bakarken sonsuza dek maden üretir. Az da olsa enerji gerektirir.
+block.large-plasma-bore.description = Büyük bir duvar kazıcı. Tungsten ve Toryum kazabilir. Hidrojen ve Enerji gerektirir.
+block.cliff-crusher.description = Duvarları parçalar ve Kum üretir. enerji gerektirir. Verimlilik duvar tipine göre değişir.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = Bir madenin üstüne konduğu zaman ara ara maden kazar. Enerji ve su gerektirir.
+block.eruption-drill.description = GeliÅŸmiÅŸ bir Matkap. Toryum kazabilir. Hidrojen gerektirir.
+block.reinforced-conduit.description = Sıvıları iletir. Yandan başka borular dışında sıvı almaz.
+block.reinforced-liquid-router.description = Tüm sıvıları eşit dağıtır.
+block.reinforced-liquid-tank.description = Daha Bol miktarda sıvı depolar.
+block.reinforced-liquid-container.description = Bol miktarda sıvı depolar.
+block.reinforced-bridge-conduit.description = Sıvıları bina ve duvarların üzerinden geçirmek için bir köprü.
+block.reinforced-pump.description = Sıvı pompalar. Hidrojen gerektirir.
+block.beryllium-wall.description = Binaları düşmanlardan korur.
+block.beryllium-wall-large.description = Binaları Biraz daha iyi düşmanlardan korur.
+block.tungsten-wall.description = Binaları Biraz daha da iyi düşmanlardan korur.
+block.tungsten-wall-large.description = Binaları Daha iyi düşmanlardan korur.
+block.carbide-wall.description = Binaları Daha da iyi düşmanlardan korur.
+block.carbide-wall-large.description = Binaları Çok Daha iyi düşmanlardan korur.
+block.reinforced-surge-wall.description = Binaları Çok Daha da iyi düşmanlardan korur, arada elektirik atar.
+block.reinforced-surge-wall-large.description = Binaları Çok Daha Daha iyi düşmanlardan korur, arada elektirik atar.
+block.shielded-wall.description = Binaları Daha da Çok Daha Daha iyi düşmanlardan korur. Enerji verince minik bir güç kalkanı oluşturur.
+block.blast-door.description = Dost birimlerin geçişini sağlayan otomatik bir kapı.
+block.duct.description = Malzemeleri taşır.
+block.armored-duct.description = Malzemeleri taşır. Yanlardan Tüp dışında malzeme kabul etmez.
+block.duct-router.description = Malzemeleri üç yana eşit paylaşır. Sadece arkadan malzeme kabul eder. Ayrıca filtre haline getirilebilir.
+block.overflow-duct.description = Yana sadece ön kapalıysa aktarır.
+block.duct-bridge.description = Malzemeleri bina ve duvarların üstünden taşır.
+block.duct-unloader.description = Arkasındaki bloktan spesifik bir malzemeyi çeker. Merkez üzerinde çalışmaz.
+block.underflow-duct.description = Malzemeleri sadece yanlar kapalıysa öne aktarır.
+block.reinforced-liquid-junction.description = Kesişen iki boru arasında bir kavşak.
+block.surge-conveyor.description = Malzemeleri toplu taşır. Enerji ile hızlandırılabilir.
+block.surge-router.description = Malzemeleri üç yöne eşit paylaştırır. Enerji ile hızlandırılabilir.
+block.unit-cargo-loader.description = Kargo Dronları üretir. Kargo Dronları otomatik malzemeleri noktalar arası taşır.
+block.unit-cargo-unload-point.description = Kargo Dronları için malzeme bırakma noktası.
+block.beam-node.description = X ve Y kordinatında enerji aktarır. Az da olsa enerji depolar.
+block.beam-tower.description = X ve Y kordinatında enerji aktarır. Enerji depolar. Uzun Mesafeli.
+block.turbine-condenser.description = Baca üstüne konunca enerji üretir. Azcık da su.
+block.chemical-combustion-chamber.description = Arkisit ve Ozondan enerji üretir.
+block.pyrolysis-generator.description = Arkisit ve Cürüften enerji üretir. Yan ürün olarak su çıkarır.
+block.flux-reactor.description = Isıtıldığında bol mikatrda enerji üretir. Stabilize etmek için Siyanojen gerektirir. \nSiyanojen yetersizliğinde BOOM!
+block.neoplasia-reactor.description = Arkisit, su ve faz ile bol miktarda enerji üretir. Isı ve tehlikeli Neoplazma ortaya çıkarır.\nNeoplazma yok edilmezse patlar!
+block.build-tower.description = Otomatik kırılan binaları geri işaa eder. Oyuncuya işaatta yardımcı olur.
+block.regen-projector.description = Hidrojen kullanarak etrafındaki blokları tamir eder.
+block.reinforced-container.description = Az da olsa malzeme depolar. Merkezle birleÅŸemez.
+block.reinforced-vault.description = Malzeme depolar. Merkezle birleÅŸemez.
+block.tank-fabricator.description = Stell birimleri üretir. Üretilen birimler direk kullanılabilir veya geliştirilebilir.
+block.ship-fabricator.description = Elude birimleri üretir. Üretilen birimler direk kullanılabilir veya geliştirilebilir.
+block.mech-fabricator.description = Merui birimleri üretir. Üretilen birimler direk kullanılabilir veya geliştirilebilir.
+block.tank-assembler.description = Blok ve Birimleri bilrşetirerek gelişmiş Tanklar üretir. Modül takarak daha gelişmiş birimler üretilebilir.
+block.ship-assembler.description = Blok ve Birimleri bilrşetirerek gelişmiş Gemiler üretir. Modül takarak daha gelişmiş birimler üretilebilir.
+block.mech-assembler.description = Blok ve Birimleri bilrşetirerek gelişmiş Robotlar üretir. Modül takarak daha gelişmiş birimler üretilebilir.
+block.tank-refabricator.description = Tankları 2. seviyeye yükseltme modülü.
+block.ship-refabricator.description = Gemileri 2. seviyeye yükseltme modülü.
+block.mech-refabricator.description = Robotları 2. seviyeye yükseltme modülü.
+block.prime-refabricator.description = Birimleri 3. seviyeye yükseltme modülü.
+block.basic-assembler-module.description = Birim üretim seviyesini arttırır. Enerji gerektirir.
+block.small-deconstructor.description = Bina ve Birimleri parçalar. Kullanılan malzemelerin 100% ünü geri iade eder.
+block.reinforced-payload-conveyor.description = Kargoyu taşır.
+block.reinforced-payload-router.description = Kargoyu üç yöne paylaştırır. Filtrelenebilir.
+block.payload-mass-driver.description = Uzun mesafe kargo taşımacılığı yapar.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.unit-repair-tower.description = Etrafındaki tüm birimleri tamir eder. Ozon gerektirir.
+block.radar.description = Haritayı tarar. Enerji gerektirir.
+block.shockwave-tower.description = Düşman mermilerinini parçalar. Siyanojen gerektirir.
+block.canvas.description = Önceden tanımlanmış paletle basit bir fotoğraf sergiler. Düzenlenebilir.
+#burdan sonraki ve önceki her şeyi benim translate etmem gerekti!!! -RTOmega XD
+unit.dagger.description = Düşmanlara basit mermilerle ateş eder.
+unit.mace.description = Düşmanlara alev püskürtür.
+unit.fortress.description = Düşmanlara uzun menzilli gülleler fırlatır.
+unit.scepter.description = Düşmanlara akı yüklü mermiler fırlatır.
+unit.reign.description = Düşmanlara devasa delici mermilerle ateş eder.
+unit.nova.description = Minik lazerler atar ve binaları tamir eder. Uçabilir.
+unit.pulsar.description = Minik elektroşoklar atar ve binaları tamir eder. Uçabilir.
+unit.quasar.description = Delici lazerlerle ateş eder ve binaları tamir eder. Uçabilir.
+unit.vela.description = Uzun süreli büyük bir lazer ateş eder ve binaları tamir eder. Uçabilir.
+unit.corvus.description = Çok Yüksek Menzilli devasa bir lazer atar. Her şeyi deler. Binaların üstünden yürüyebilir.
+unit.crawler.description = Düşmana doğru koşar ve kendini imha eder.
+unit.atrax.description = Cürüf topları fırlatır. Binaların üstünden yürüyebilir.
+unit.spiroct.description = Emici lazerler ateş eder, kendini onarır. Binaların üstünden yürüyebilir.
+unit.arkyid.description = Emici ilazerler ateş eder ve devasa bir gülle fırlatır. Binaların üstünden yürüyebilir.
+unit.toxopid.description = Devasa bir enerji topu fırlatır. Binaların üstünden yürüyebilir.
+unit.flare.description = Yakındakilere basit mermi atar.
+unit.horizon.description = Yakındaki yer düşmanlarına bombarduman yapar.
+unit.zenith.description = Swarmer-gibi füzeler fırlatır.
+unit.antumbra.description = Büyük boyutta mermiler fırlatır.
+unit.eclipse.description = Büyük mermiler fırlatır ve lazer atar.
+unit.mono.description = Otomatik bir şekilde Bakır ve Kurşun kazar ve çekirdeğe getirir.
+unit.poly.description = Otomatik bir şekilde kırılmış binaları geri inşa eder ve oyuncuya inşatta yardımcı olur.
+unit.mega.description = Otomatik bir şekilde hasarlı bolkları onarır. Blokları ve Birimleri taşıyabilir.
+unit.quad.description = Büyük bombalar atar, hasarlı blokları onarır ve düşmanlara zarar verir. Bolkları ve Birimleri taşıyabilir.
+unit.oct.description = Yakındaki birimleri korur ve tamir eder. Blokları ve Birimleri taşıyabilir.
+unit.risso.description = Yakındaki düşmanlara Füze atar.
+unit.minke.description = Yakındaki düşmanlara basit mermi ve toplarla saldırır.
+unit.bryde.description = Düşmanlara uzun menzil havanıyla saldırır.
+unit.sei.description = Düşmanlara füze atar ve devasa zırh delici mermilerle saldırır.
+unit.omura.description = Uzun menzil bir ışın atıcıya sahiptir. Mermisi nerdeyse her bolğu delebilir. Flare üretir.
+unit.alpha.description = Çekirdeği korur. Bina inşa eder.
+unit.beta.description = Çekirdeği korur. Bina inşa eder.
+unit.gamma.description = Çekirdeği korur. Bina inşa eder.
+unit.retusa.description = Sensörlü mayın döşer. Yakındakileri tamir eder.
+unit.oxynoe.description = Tamir edici ateş fırlatır. Düşman mermilerini havada vurur.
+unit.cyerce.description = Takipçi toplu füze atar. Yakındakileri tamir eder.
+unit.aegires.description = Enerji alanına giren düşmanları şoklar. Yakındakileri tamir eder.
+unit.navanax.description = Devasa patlayıcı EMP gülleleri fırlatır, düşman elektir sistemlerini yok eder ve müttefiklerini tamir eder. Yaklaşan düşmanları 4 mini oto-laser tareti ile eritir.
+unit.stell.description = Hedef Düşmanlara standart mermilerle saldırır.
+unit.locus.description = Hedef Düşmanlara değişken mermilerle saldırır.
+unit.precept.description = Hedef Düşmanlara Delici Toplu Mermilerle saldırır.
+unit.vanquish.description = Hedef Düşmanlara Büyük Delici Parçalı Mermilerle saldırır.
+unit.conquer.description = Hedef Düşmanlara Büyük Delici Kademeli Mermilerle saldırır.
+unit.merui.description = Yer Düşmanlarına Uzun-Mesafeli Toplarla saldırır. Çoğu araziden geçebilir.
+unit.cleroi.description = Düşmanlara İkili kapsüllerle saldırır. Düşman mermilerini havada vurur. Çoğu araziden geçebilir.
+unit.anthicus.description = Düşman Birimlere Uzun-Mesafe Takipçi Füzelerle saldırır. Çoğu araziden geçebilir.
+unit.tecta.description = Düşman Birimlere Takipçi Plazma Füzeleri ile saldırır. Yönlü kalkanıyla kendini korur. Çoğu araziden geçebilir.
+unit.collaris.description = Düşman Birimlere Uzun-Mesafeli Parçalı Toplarla saldırır. Çoğu araziden geçebilir.
+unit.elude.description = Düşman Birimlere İkili Takipçi mermilerle saldırır. Sıvıların üzerinden geçebilir.
+unit.avert.description = Düşman Birimlere Dönen Mermilerle ile saldırır.
+unit.obviate.description = Düşman Birimlere Dönen Işın Topları ile saldırır.
+unit.quell.description = Düşman Birimlere Uzun-Mesafe Takipçi Füzelerle saldırır. Düşman Tamir Bloklarını Bloklar.
+unit.disrupt.description = Düşman Birimlere Uzun-Mesafe Takipçi Bloke-edici Füzelerle saldırır. Düşman Tamir Bloklarını Bloklar.
+unit.evoke.description = Sur Merkezini korumak için binalar inşa eder. Binaları Işınıyla Tamir Eder.
+unit.incite.description = Kale Merkezini korumak için binalar inşa eder. Binaları Işınıyla Tamir Eder.
+unit.emanate.description = Akropolis Merkezini korumak için binalar inşa eder. Binaları Işınıyla Tamir Eder.
+#inÅŸaa->inÅŸa -ekozet
+lst.read = Bağlı hafıza kutusundaki numarayı okur.
+lst.write = Bağlı hafıza kutuaundaki numaraya yazar.
+lst.print = Yazı yazar.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Yazı Haznesindeki son değeri başka bir değerle değiştirir.\nYerleştiricek değer boş ise hiç bir şey yapmaz.\nÖrnek Değer: "{[accent]sayı 0-9[]}"\nÖrnek:\n[accent]print "test {0}"\nformat "örnek"
+lst.draw = Ekrana Çizer.
+lst.drawflush = Ekrana Çizimi Aktarır.
+lst.printflush = Mesaj bloğuna metnini aktarır,
+lst.getlink = Bağlı blokları alır.
+lst.control = Bir binayı yönet.
+lst.radar = Bir silahın yakınındaki birimleri alıgılar,
+lst.sensor = Bloklardan bilgi alır.
+lst.set = Bir deÄŸiÅŸken ata.
+lst.operation = DeÄŸiÅŸkenlerle iÅŸlem yap.
+lst.end = Döngünün sonuna atla.
+lst.wait = Belli süre bekler.
+lst.stop = Ä°ÅŸlemciyi durdurur.
+lst.lookup = ID kullanarak herhangi bir blok, birim, bina vs ye bak.\nToplam sayı kullanımı:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Bir yerden baÅŸka bir yere atla.
+lst.unitbind = Bir birimi baÄŸla: [accent]@unit[].
+lst.unitcontrol = Bağlı birimi kontrol et.
+lst.unitradar = Bağlı birimin etrafındaki birimleri tara.
+lst.unitlocate = Etraftaki blokları algılar.\nBağlı birim gerektirir.
+lst.getblock = Herhangi bir yerdeki blok bilgisini al.
+lst.setblock = Herhangi bir yerdeki blok bilgisini deÄŸiÅŸtir.
+lst.spawnunit = Herhangi bir yerde birim var et.
+lst.applystatus = Bir Birime Durum Etkisi ekle.
+lst.weathersense = Hava durumunu kontrol et.
+lst.weatherset = Hava durumunu deÄŸiÅŸtir.
+lst.spawnwave = Bellir bir noktada dalga başlat.\nDalga Zamanlayıcı Oluşturmaz!
+lst.explosion = Bir Noktada Patlama oluÅŸtur.
+lst.setrate = İşlemci Hızını Ayarla (işlem/tick)
+lst.fetch = Numara ile Merkez, Birim veya Oyuncu Ara.\nNumaralar, 0dan başlar ve birim sayısında biter.
+lst.packcolor = Derle [0, 1] RGBA bileşenleri, çizim veya kural belirleme için tek bir sayıya dönüştürülür.
+lst.setrule = Bir Oyun Kuralı Ata.
+lst.flushmessage = Ekranda bir yazı göster.\nBir önceki yazı kaybolana kadar bekler.
+lst.cutscene = Oyuncu Kamerasını hareket ettir.
+lst.setflag = Tüm İşlemciler tarafından okunabilen bir Numara İşaretle.
+lst.getflag = Evrensel Ä°ÅŸaretli Numara Oku.
+lst.setprop = Bir bina veya birime nitelik atar.
+lst.effect = Parçacık efekti oluştur.
+lst.sync = Ağ boyunca bir değişkeni senkronize et.\nSaniyede en fazla 10 kere yapılabilir.
+lst.playsound = Bir ses çal.\nSes şiddeti bir küresel değer olabilir veya konuma göre belirlenebilir.
+lst.makemarker = Dünyada yeni bir İşlemci İşareti koy.\nBu İşarete bir Kimlik adamalısın.\nDünya başına 20.000 limit bulunmakta.
+lst.setmarker = Bir İşlemci İşareti için bir arazi seç.\nKimlik, İşaret Koyucudaki ile aynı olmalı.
+lst.localeprint = Harita yerel paket özellik değerini metin arabelleğine ekleyin.\nHarita düzenleyicide harita yerel ayar paketlerini ayarlamak için şunu işaretleyin: [accent]Harita Bilgisi > Yerel Paketler[].\nİstemci bir mobil cihazsa, önce ".mobile" ile biten bir özelliği yazdırmaya çalışır.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = Matematiksel sabit (Ï€) pi (3.141...)
+lglobal.@e = Matematiksel sabit e (2.718...)
+lglobal.@degToRad = Bu sayı ile çarparak dereceyi radyana çevir
+lglobal.@radToDeg = Bu sayı ile çarparak radyanı dereceye çevir
+lglobal.@time = Bu kayıttaki oynama süren, milisaniyesine kadar
+lglobal.@tick = Bu kayıttaki oynama süren, tick halinde (1 sn = 60 tick)
+lglobal.@second = Bu kayıttaki oynama süren, saniyeler halinde
+lglobal.@minute = Bu kayıttaki oynama süren, dakikalar halinde
+lglobal.@waveNumber = Şuanki Dalga sayısı
+lglobal.@waveTime = Bir sonraki dalga için süre, saniyeyle
+lglobal.@mapw = Bloklarla Harita GeniÅŸliÄŸi
+lglobal.@maph = Bloklarla Harita Yüksekliği
+lglobal.sectionMap = Harita
+lglobal.sectionGeneral = Genel
+lglobal.sectionNetwork = Bağlantı/Oyuncu Tarafı [Sadece Evrensel İşlemci]
+lglobal.sectionProcessor = Ä°ÅŸlemci
+lglobal.sectionLookup = Arat
+lglobal.@this = Kodu çalıştıran işlemci
+lglobal.@thisx = Kodu çalıştıran işlemcinin X kordinatı
+lglobal.@thisy = Kodu çalıştıran işlemcinin Y kordinatı
+lglobal.@links = Bu işlemciye bağlı toplam blok sayısı
+lglobal.@ipt = Tick hızıyla bu işlemcinin işlem hızı (60 tick = 1 sn)
+lglobal.@unitCount = Oyundaki toplam birim türü sayısı, Aratla kullan.
+lglobal.@blockCount = Oyundaki toplam blok türü sayısı, Aratla kullan.
+lglobal.@itemCount = Oyundaki toplam malzeme türü sayısı, Aratla kullan.
+lglobal.@liquidCount = Oyundaki toplam sıvı türü sayısı, Aratla kullan.
+lglobal.@server = Oyun bir sunucuda veya tek kişilikte ise Doğru, değil ise Yanlış geri dönüt
+lglobal.@client = Oyun bir suncuya bağlanmış bir oyuncu tarafından çalıştırılıyorsa Doğru, değil ise Yanlış.
+lglobal.@clientLocale = Oyunu çalıştıran oyuncunun yerel dili. Örnek: tr_TR
+lglobal.@clientUnit = Oyunu çalıştıran oyuncunun birimi
+lglobal.@clientName = Oyunu çalıştıran oyuncunun ismi
+lglobal.@clientTeam = Oyunu çalıştıran oyuncunun takım kimliği
+lglobal.@clientMobile = Oyuncu mobildeyse Doğru, değil ise Yanlış geri dönüt
+
+logic.nounitbuild = [red]Birim İnşası Yasak!
+
+lenum.type = Bir bina/birim türü.\nörnek: [accent]@router[].
+lenum.shoot = Bir konuma ateÅŸ et.
+lenum.shootp = Belli bir birim veya binaya ateÅŸ et.
+lenum.config = Bina yapılandırması, örnek: Ayıklayıcı Türü
+lenum.enabled = Blok aktif mi?
+laccess.currentammotype = Bir turretin içindeki şuanki mermi/sıvı.
+
+laccess.color = Aydınlatıcı Rengi
+laccess.controller = Birim Kontrol edici. Eğer işlemci kontrol ediyorsa işlemci döner. \nFormasyon durumundaysa, lider döner.\nDiğer şekilde, birimi kendi döner.
+laccess.dead = Bir bina veya birim hala var mı?
+laccess.controlled = Bir birim ne tarafından kontrol ediliyor?
+laccess.progress = Bir şeyin oluş aşaması, örnek: bir turetin yeniden doldurma süresindeki aşama.
+laccess.speed = Bir Birimin Maks hızı, blok/sn.
+laccess.id = Bir birim/blok/eşya/sıvı kimliği. \nBu arama operasyonun zıttıdır.
+lcategory.unknown = ???
+lcategory.unknown.description = Kategorize edilmemiÅŸ talimatlar
+lcategory.io = Giriş & Çıkış
+lcategory.io.description = Bir Hafıza biloğunun içeriğini değiştirir.
+lcategory.block = Blok Kontrol
+lcategory.block.description = Bloklarla etkileÅŸ.
+lcategory.operation = Ä°ÅŸlemler
+lcategory.operation.description = Logic Ä°ÅŸlemler.
+lcategory.control = Akış Kontrolü
+lcategory.control.description = Çalışma Sırasını Kontrol et.
+lcategory.unit = Birim Kontrol
+lcategory.unit.description = Birimleri komuta et.
+lcategory.world = Evrensel
+lcategory.world.description = Evrenin Yasalarını, kaza ve kaderden bağımsız bir şekilde modifiye et.
+
+graphicstype.clear = Ekranı bir renkle kapla.
+graphicstype.color = Bir sonraki çizim için Renk.
+graphicstype.col = Derlenmiş renk.\nDerlenmiş renkler [accent]%[] şeklinde Hex kodlarıyla gösterilir.Örnek: [accent]%ffff00[] sarı demektir.
+graphicstype.stroke = Çizgi Kalınlığını belirle.
+graphicstype.line = Çizgiyi Belirle.
+graphicstype.rect = Bir Dikdörtgeni doldur.
+graphicstype.linerect = İçi boş Dikdörtgen çiz.
+graphicstype.poly = İçi Dolu Çokgen Çiz.
+graphicstype.linepoly = İçi Boş Çokgen Çiz.
+graphicstype.triangle = İçi Dolu Üçgen Çiz.
+graphicstype.image = Bir ikon çiz. \nörnek: [accent]@router[] veya [accent]@dagger[].
+graphicstype.print = Yazdırma arabelleğinden metin çizer.\nYazdırma arabelleğini temizler.
+
+lenum.always = Her Zaman DoÄŸru
+lenum.idiv = Tamsayı Bölme
+lenum.div = Bölme
+lenum.mod = Mod
+lenum.equal = EÅŸit
+lenum.notequal = EÅŸit DeÄŸil
+lenum.strictequal = Aynı
+lenum.shl = Shift Sol
+lenum.shr = Shift SaÄŸ
+lenum.or = Veya
+lenum.land = Çapraz Ve
+lenum.and = Ve
+lenum.not = DeÄŸil
+lenum.xor = Çapraz Veya
+
+lenum.min = İki sayıdan en küçüğü.
+lenum.max = İki sayıdan en büyüğü.
+lenum.angle = İki ışının yaptığı açı.
+lenum.anglediff = İki açı arasındaki derece cinsinden mutlak mesafe.
+lenum.len = Bir Işının Uzunluğu.
+
+lenum.sin = Sinüs
+lenum.cos = Kosinüs
+lenum.tan = Tanjant
+
+lenum.asin = Ark Sinüs
+lenum.acos = Ark Kosinüs
+lenum.atan = Ark Tanjant
+
+#not a typo, look up 'range notation'
+lenum.rand = [0 ile Sayı) arasında rastgele bir sayı.
+lenum.log = Logaritma
+lenum.log10 = Logaritma 10
+lenum.noise = 2D Noise
+lenum.abs = Mutlak
+lenum.sqrt = KareKök
+
+lenum.any = Herhangi bir Birim.
+lenum.ally = Aynı Takımdan Birim.
+lenum.attacker = Silahlı Birim.
+lenum.enemy = Düşman Birim.
+lenum.boss = Gardiyan Biri.
+lenum.flying = Uçan Birim.
+lenum.ground = Yürüyen Birim.
+lenum.player = Oyuncu olan bir Birim.
+
+lenum.ore = Maden.
+lenum.damaged = Hasarlı Aynı Takımdan bir Blok.
+lenum.spawn = Düşman Oluşum Noktası
+lenum.building = Bir guruptan bir blok.
+
+lenum.core = Herhangi bir Merkez
+lenum.storage = Depolama BloÄŸu
+lenum.generator = Enerji Ãœreten bir Blok
+lenum.factory = Fabrika BloÄŸu
+lenum.repair = Tamir BloÄŸu
+lenum.battery = Pil
+lenum.resupply = Mermi Aktarım Bloğu
+lenum.reactor = Patlama/Toryum Reaktör
+lenum.turret = Herhangi bir taret
+
+sensor.in = Algılanan Blok/Birim.
+
+radar.from = Algı Oluşturulan Blok.
+radar.target = Algılanan Birimler için Filtre.
+radar.and = Ekstra Filtre.
+radar.order = Sıralama Filtresi.
+radar.sort = Sıralama Sırası.
+radar.output = Dışarı Aktarılan Değişken.
+
+unitradar.target = Algılanan Birim için Filtre.
+unitradar.and = Ekstra Filtre.
+unitradar.order = Sıralama Filtresi.
+unitradar.sort = Sıralama Sırası.
+unitradar.output = Dışarı Aktarılan Değişken.
+
+control.of = Kontrol Edilen.
+control.unit = AteÅŸ ediceÄŸimiz Obje.
+control.shoot = AteÅŸ edilsin mi?
+
+unitlocate.enemy = Düşman mı?
+unitlocate.found = Obje bulundu mu?
+unitlocate.building = Bulunan binanın Türü.
+unitlocate.outx = X kordinatı.
+unitlocate.outy = Y kordinatı.
+unitlocate.group = Aranan binanın türü.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Hareket etmez ancak kazmaya ve inÅŸa etmeye devam eder.
+lenum.stop = Dur!
+lenum.unbind = Mantık Kontrolü tamaman devre dışı bırak.\nNormal YZ'yı devreye sok.
+lenum.move = Tam konuma git.
+lenum.approach = Bir Konuma yaklaÅŸ.
+lenum.pathfind = Düşman Doğuş noktasına git.
+lenum.autopathfind = Otomatik olarak en yakındaki düşman çekirdeği veya iniş pistine doğru yolunu bulur.\nBu her dalgadaki düşmanların yol bulmasıyla aynıdır.
+lenum.target = Bir alana ateÅŸ et.
+lenum.targetp = Bir cisme ateÅŸ et.
+lenum.itemdrop = Bir itemi bırak.
+lenum.itemtake = Bir binadan item al.
+lenum.paydrop = Kargoyu bırak.
+lenum.paytake = Kargo al.
+lenum.payenter = Bir birimi, kargo tutabilen bir bloÄŸa indir.
+lenum.flag = Numara ile iÅŸaretle.
+lenum.mine = Kaz.
+lenum.build = Bina inÅŸa et.
+lenum.getblock = Kordinattaki yapıyı, zemini ve blok türünü al.\nKonum birimin alanında olmalı yoksa null dönülür.  
+lenum.within = Bir birim menzil alanında mı?
+lenum.boost = Gazlamaya baÅŸla/dur
+lenum.flushtext = Varsa, yazdırma arabelleğinin içeriğini işaretleyiciye boşaltın.\nGetirme doğru olarak ayarlanmışsa, harita yerel dil paketinden veya oyun paketinden bilgileri getirmeye çalışır.
+lenum.texture = Doğrudan oyunun doku atlasından alınan doku adı (kebab-tarzı isimlendirme XD).\nprintFlush doğru olarak ayarlanırsa metin arabelleği içeriğini metin bağımsız değişkeni olarak kullanır.
+lenum.texturesize = Zemindeki doku boyutu. Sıfır değeri, işaretleyici genişliğini orijinal dokunun boyutuna ölçeklendirir.
+lenum.autoscale = İşaretçinin oyuncunun yakınlaştırma düzeyine göre ölçeklenip ölçeklenmeyeceği.
+lenum.posi = Sıfır indeksinin ilk konum olduğu çizgi ve dörtlü işaretleyiciler için kullanılan indekslenmiş konum.
+lenum.uvi = Dokunun sıfırdan bire kadar değişen konumu, dörtlü işaretçiler için kullanılır.
+lenum.colori = Sıfır indeksinin ilk renk olduğu çizgi ve dörtlü işaretleyiciler için kullanılan indekslenmiş konum.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index bdb83b4ca3..3753873745 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1,5 +1,5 @@
 credits.text = Створив [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nМаєте питанн� за грою або знайшли помилки в перекладі?\nДолучайте�� до офіційного �ервера Mindustry у Discord\nв канал #україн�ька.\nУкраїн�ький перекладач — Prosta4ok_ua#6336.
-credits = Творці
+credits = �втори
 contributors = Перекладачі та помічники
 discord = Офіційний �ервер Mindustry в Discord
 link.discord.description = Приєднуйте�ь до Discord-�ервера Mindustry
@@ -13,17 +13,19 @@ link.google-play.description = Завантажити дл� Android з Google P
 link.f-droid.description = Завантажити дл� Android з F-Droid
 link.wiki.description = Офіційна ігрова Wiki
 link.suggestions.description = Запропонувати нові функції
+link.bug.description = Знайшли хибу? Повідомте про неї тут
+linkopen = Сервер наді�лав вам по�иланн�. Ви �правді хочете перейти за ним?\n\n[sky]{0}
 linkfail = �е вдало�� перейти за по�иланн�м!\nURL-адре�а �копійована в буфер обміну.
 screenshot = Зн�ток мапи збережено до {0}
 screenshot.invalid = Мапа занадто велика, тому, мабуть, не ви�тачає пам’�ті дл� зн�тку мапи.
 gameover = Гра завершена
 gameover.disconnect = Від’єднати��
-gameover.pvp = [accent]{0}[] команда перемогла!
-gameover.waiting = [accent]Очікуємо на�тупно мапу…
+gameover.pvp = [accent]{0}[] перемогли!
+gameover.waiting = [accent]Очікуємо на�тупну мапу…
 highscore = [accent]�овий рекорд!
 copied = Скопійовано.
 indev.notready = Ц� ча�тина гри ще не готова.
-indev.campaign = [accent]Вітанн�! Ви до��гли кінц� кампанії![]\n\n�аразі це в�е, що може запропонувати вам гра. Міжпланетні подорожі зʼ�вл�ть�� в на�тупних оновленн�х.
+
 load.sound = Звуки
 load.map = Мапи
 load.image = Зображенн�
@@ -31,15 +33,31 @@ load.content = Змі�т
 load.system = Си�тема
 load.mod = Модифікації
 load.scripts = Скрипти
+
 be.update = До�тупна нова збірка Bleeding Edge:
 be.update.confirm = Завантажити та перезавантажити зараз?
 be.updating = Оновленн�…
 be.ignore = Ігнорувати
 be.noupdates = Оновлень не знайдено.
 be.check = Перевірити на на�вні�ть оновлень
+
+mods.browser = Перегл�дач модифікацій
+mods.browser.selected = Вибрана модифікаці�
+mods.browser.add = У�тановити
+mods.browser.reinstall = Перев�тановити
+mods.browser.view-releases = Перегл�нути релізи
+mods.browser.noreleases = [scarlet]Релізи від�утні\n[accent]�е вдало�� знайти жодного релізу цієї модифікації. Перевірте, чи є в репозиторії модифікації опубліковані релізи.
+mods.browser.latest = <�айновіший>
+mods.browser.releases = Релізи
+mods.github.open = Відкрити репозиторій
+mods.github.open-release = По�иланн�
+mods.browser.sortdate = Сортувати за давні�тю
+mods.browser.sortstars = Сортувати за попул�рні�тю
+
 schematic = Схема
 schematic.add = Зберегти �хему…
 schematics = Схеми
+schematic.search = Шукати �хеми...
 schematic.replace = Схема з такою назвою вже є. Замінити її?
 schematic.exists = Схема з такою назвою вже є.
 schematic.import = Імпортувати �хему…
@@ -52,26 +70,29 @@ schematic.shareworkshop = Поширити в Май�терню
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Обернути �хему
 schematic.saved = Схема збережена.
 schematic.delete.confirm = Ви �правді хочете видалити цю �хему?
-schematic.rename = Перейменувати �хему
+schematic.edit = Редагувати �хему
 schematic.info = {0}x{1}, блоків: {2}
-schematic.disabled = [scarlet]Схеми вимкнені[]\nВам не дозвол�єть�� викори�товувати �хеми на цій [accent]мапі[] чи [accent]�ервері.
-
-mod.featured.title = Перегл�дач модифікацій
-mod.featured.dialog.title = Перегл�дач модифікацій
-mods.browser.selected = Обрана модифікаці�
-mods.browser.add = У�тановити модифікацію
-mods.github.open = Відкрити в Github
+schematic.disabled = [scarlet]Схеми вимкнено[]\nВам не дозвол�єть�� викори�товувати �хеми на цій [accent]мапі[] чи [accent]�ервері.
+schematic.tags = Мітки:
+schematic.edittags = Редагувати мітки
+schematic.addtag = Додати мітку
+schematic.texttag = Тек�това мітка
+schematic.icontag = Мітка із значком
+schematic.renametag = Перейменувати мітку
+schematic.tagged = {0} з міткою
+schematic.tagdelconfirm = Видалити цю мітку повні�тю?
+schematic.tagexists = Схожа мітка вже і�нує.
 
 stats = Стати�тика
-stat.wave = Хвиль відбито:[accent] {0}
-stat.enemiesDestroyed = Противників знищено:[accent] {0}
-stat.built = Будівель збудовано:[accent] {0}
-stat.destroyed = Будівель знищено:[accent] {0}
-stat.deconstructed = Будівель декон�труйовано:[accent] {0}
-stat.delivered = Ре�ур�ів запущено:
-stat.playtime = Ча� у грі:[accent] {0}
-stat.rank = Фінальний рахунок:[accent] {0}
-globalitems = [accent]У�ього предметів
+stats.wave = Хвиль відбито:[accent] {0}
+stats.unitsCreated = Одиниць �творено:[accent] {0}
+stats.enemiesDestroyed = Противників знищено:[accent] {0}
+stats.built = Будівель збудовано:[accent] {0}
+stats.destroyed = Будівель знищено:[accent] {0}
+stats.deconstructed = Будівель декон�труйовано:[accent] {0}
+stats.playtime = Ча� у грі:[accent] {0}
+
+globalitems = [accent]У�ього ре�ур�ів
 map.delete = Ви впевнені, що хочете видалити мапу «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
 level.select = Вибір мапи
@@ -79,17 +100,20 @@ level.mode = Режим гри:
 coreattack = < Ядро перебуває під атакою! >
 nearpoint = [[ [scarlet]З�ЛИШТЕ ЗО�У ВИС�ДКИ �ЕГ�Й�О[] ]\nанігіл�ці� неминуча
 database = База даних �дра
+database.button = База даних
 savegame = Зберегти гру
 loadgame = Завантажити гру
-joingame = Мережева гра
+joingame = Багатоо�ібна гра
 customgame = Кори�тувацька гра
 newgame = �ова гра
 none = <нічого>
+none.found = [lightgray]<нічого не знайдено>
+none.inmap = [lightgray]<на мапі нічого не знайдено>
 minimap = Мінімапа
 position = Мі�цезнаходженн�
 close = Закрити
 website = Веб�айт
-quit = Вихід
+quit = Вийти
 save.quit = Зберегти та вийти
 maps = Мапи
 maps.browse = Перегл�д мап
@@ -104,30 +128,48 @@ uploadingpreviewfile = Вивантаженн� файлу попередньо
 committingchanges = Здій�ненн� змін
 done = Зроблено
 feature.unsupported = Ваш при�трій не підтримує цю функцію
-mods.alphainfo = Майте на увазі, що модифікації перебувають в альфі, і [scarlet]можуть бути дуже не�правними[].\nПовідомте про будь-�кі проблеми, �кі ви знайдете до Mindustry Github або Discord.
+
+mods.initfailed = [red]⚠[] Попереднього разу не вдало�� ініціалізувати Mindustry. Це, ймовірно, �причинено неправильною поведінкою модифікацій.\n\nДл� запобіганн� не�кінченним аварійним циклам [red]необхідно вимкнути в�і модифікації.[]\n\nДл� вимкненн� цієї функції перейдіть до [accent]�алаштуванн� -> Гра -> Вимикати модифікації пі�л� аварійного запу�ку[].
 mods = Модифікації
 mods.none = [lightgray]Модифікацій не знайдено!
 mods.guide = По�ібник із модифікацій
 mods.report = Повідомити про ваду
 mods.openfolder = Відкрити теку
+mods.viewcontent = Подивити�� вмі�т
 mods.reload = Перезавантажити
 mods.reloadexit = Гра зараз закриєть��, щоби перезавантажити модифікації
+mod.installed = [[У�тановлено]
 mod.display = [gray]Модифікаці�:[orange] {0}
 mod.enabled = [lightgray]Увімкнено
-mod.disabled = [scarlet]Вимкнено
+mod.disabled = [scarlet]Вимкнена
+mod.multiplayer.compatible = [gray]До�тупна у багатоо�ібній грі
 mod.disable = Вимкнути
+mod.version = Version:
 mod.content = Змі�т:
 mod.delete.error = �еможливо видалити модифікацію. Файл, можливо, викори�товуєть��.
-mod.requiresversion = [scarlet]�еобхідна мінімальна вер�і� гри: [accent]{0}
-mod.outdated = [scarlet]�е �умі�на з V6
-mod.missingdependencies = [scarlet]Від�утні залежно�ті: {0}
+
+mod.incompatiblegame = [red]За�таріла гра
+mod.incompatiblemod = [red]�е�умі�но
+mod.blacklisted = [red]�е підтримуєть��
+mod.unmetdependencies = [red]Від�утні залежно�ті
 mod.erroredcontent = [scarlet]Помилки під ча� завантаженн�
+
+mod.circulardependencies = [red]Кругові залежно�ті
+mod.incompletedependencies = [red]�еповні залежно�ті
+mod.requiresversion.details = �еобхідна вер�і� гри: [accent]{0}[]\nВаша гра за�таріла. Мод потребує новішу вер�ію гри (можливо бета- чи альфа-вер�ію) дл� роботи.
+mod.outdatedv7.details = Ц� модифікаці� не �умі�на з о�танньою вер�ією гри. Розробник модифікації має оновити її та додати [accent]minGameVersion: 136[] у �вій [accent]mod.json[] файл.
+mod.blacklisted.details = Цю модифікацію було вручну вне�ено у чорний �пи�ок за по�тійні збої або інші проблеми з цією вер�ією гри. �е викори�товуйте її.
+mod.missingdependencies.details = У цій модифікації від�утні на�тупні залежно�ті: {0}
+mod.erroredcontent.details = Ц� модифікаці� �причинила помилки під ча� завантаженн�. Попро�іть автора виправити їх.
+mod.circulardependencies.details = Цей мод має залежно�ті, �кі залежать одна від одної.
+mod.incompletedependencies.details = Цей мод неможливо завантажити через недій�ні або від�утні залежно�ті: {0}
+mod.requiresversion = �еобхідна вер�і� гри: [red]{0}
 mod.errors = Виникли помилки під ча� завантаженн� змі�ту.
-mod.noerrorplay = [scarlet]Ви маєте модифікації з помилками.[] �бо вимкніть проблемні модифікації, або виправте їх.
-mod.nowdisabled = [scarlet]Модифікації «{0}» не ви�тачає залежних модифікацій:[accent] {1}\n[lightgray]Ці модифікації потрібно завантажити �початку.\nЦ� модифікаці� буде автоматично вимкнена.
+mod.noerrorplay = [red]Ви маєте модифікації з помилками.[] �бо вимкніть проблемні модифікації, або виправте їх.
+mod.nowdisabled = [red]Модифікації «{0}» не ви�тачає залежних модифікацій:[accent] {1}\n[lightgray]Ці модифікації потрібно завантажити �початку.\nЦ� модифікаці� буде автоматично вимкнена.
 mod.enable = Увімкнути
 mod.requiresrestart = � тепер гра закриєть��, щоби за�то�увати зміни модифікацій.
-mod.reloadrequired = [scarlet]Потрібно перезавантаженн�
+mod.reloadrequired = [red]Потрібно перезавантаженн�
 mod.import = Імпортувати модифікацію
 mod.import.file = Імпортувати файл
 mod.import.github = Імпортувати з GitHub
@@ -135,21 +177,31 @@ mod.jarwarn = [scarlet]JAR-модифікації за �воєю �уттю н
 mod.item.remove = Цей предмет є ча�тиною модифікації [accent] «{0}»[]. Щоби видалити його, видаліть цю модифікацію.
 mod.remove.confirm = Цю модифікацію буде видалено.
 mod.author = [lightgray]�втор:[] {0}
-mod.missing = Це збереженн� мі�тить модифікації, �кі ви нещодавно оновили або більше не в�тановлювали. Збереженн� може зіп�увати��. Ви впевнені, що хочете завантажити його?\n[lightgray]Модифікації:\n{0}
+mod.missing = Це збереженн� мі�тить модифікації, що ви нещодавно оновили або більше не в�тановлювали. Збереженн� може зіп�увати��. Ви впевнені, що хочете завантажити його?\n[lightgray]Модифікації:\n{0}
 mod.preview.missing = До публікації цієї модифікації в Май�терні, ви му�ите додати зображенн� попереднього перегл�ду.\nПомі�тіть зображенн� з назвою [accent] preview.png[] у теку з модифікаці�ми та �пробуйте знову.
 mod.folder.missing = Тільки модифікації у формі теці можуть бути опубліковані в Май�терні.\nЩоб перетворити будь-�ку модифікацію в теку, про�то розархівуйте цей файл у теку та видаліть �тарий архів, і потім перезапу�тіть гру або перезавантажте ваші модифікації.
 mod.scripts.disable = Ваш при�трій не підтримує модифікації зі �криптами. Вимкніть модифікацію дл� запу�ку гри.
+
 about.button = Про гру
 name = Ім’�:
 noname = Спочатку придумайте[accent] �обі ім’�[].
+search = Пошук:
 planetmap = Планетна мапа
 launchcore = Запу�тити �дро
 filename = �азва файлу:
 unlocked = До�тупний новий вмі�т!
 available = �ове до�лідженн� до�тупно!
+unlock.incampaign = < Розблокуйте в кампанії дл� отриманн� подробиць >
+campaign.select = Виберіть початкову кампанію
+campaign.none = [lightgray]Виберіть планету дл� �тарту.\nЇї можна змінити в будь-�кий момент.
+campaign.erekir = �овіший, більш відшліфований змі�т. Переважно лінійний розвиток кампанії.\n\nВища �кі�ть мап та ліпший загальний до�від.
+campaign.serpulo = Старий змі�т; кла�ичний до�від. Більш відкрита.\n\nПотенційно незбалан�овані мапи й механіки кампанії. Менш відшліфована.
+campaign.difficulty = Difficulty
 completed = [accent]Завершено
 techtree = Дерево технологій
-research.legacy = Були знайдені до�лідженн� з [accent]5.0[].\nЧи бажаєте ви [accent]завантажити ці дані[] або [accent]ви хочете відмовити�� від цього[] і почати до�ліджувати із �амого початку в новій кампанії (рекомендовано)?
+techtree.select = Вибір дерева технологій
+techtree.serpulo = Серпуло
+techtree.erekir = Ерекір
 research.load = Завантажити
 research.discard = Відмовити��
 research.list = [lightgray]До�лідженн�:
@@ -180,7 +232,7 @@ 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 до�туп до вашої локальної мережі в налаштуванн�х брандмауера. Зауважте, що публічні мережі іноді не дають змогу ви�вити �ервер.
 join.info = Тут ви можете вве�ти [accent]IP �ервера[] дл� під’єднанн� або знайти �ервери у [accent]локальній[] чи [accent]глобальній мережі[] дл� приєднанн� до них.\nПідтримуєть�� локальна мережа(LAN) і широко�мугова мережа(WAN).\n\n[lightgray] Примітка. Це не є автоматичним глобальним �пи�ком �ерверів; �кщо ви хочете приєднати�� до кого�ь через IP, вам доведеть�� попро�ити вла�ника �ервера дати �вій ip.
-hostserver = Запу�тити багатокори�тувацький �ервер
+hostserver = Запу�тити багатоо�ібний �ервер
 invitefriends = Запро�ити друзів
 hostserver.mobile = Запу�тити �ервер
 host = Запу�тити
@@ -191,21 +243,35 @@ hosts.discovering.any = Пошук ігор
 server.refreshing = Оновленн� �ервера
 hosts.none = [lightgray]Локальних ігор не знайдено
 host.invalid = [scarlet]�е вдало�� під’єднати�� до �ервера.
+
 servers.local = Локальні �ервери
+servers.local.steam = Локальні �ервери й �ервери від гравців Steam
 servers.remote = Віддалені �ервери
 servers.global = Глобальні �ервери
 
-servers.disclaimer = Сервери �пільноли [accent]не[] належать чи контролюють�� вла�ником.\n\nСервери можуть мі�тити кори�тувацький вмі�т, �кий не підходить дл� �кого�ь віку.
+servers.disclaimer = Сервери �пільноти [accent]не[] належать чи контролюють�� вла�ником.\n\nСервери можуть мі�тити кори�тувацький вмі�т, що не підходить дл� �кого�ь віку.
 servers.showhidden = Показати приховані �ервери
 server.shown = Показано
 server.hidden = Приховано
+
+viewplayer = Перегл�д гравц�: [accent]{0}
 trace = Стежити за гравцем
 trace.playername = Ім’� гравц�: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = Унікальний ідентифікатор: [accent]{0}
+trace.id = Ідентифікатор: [accent]{0}
+trace.language = Мова: [accent]{0}
 trace.mobile = Мобільний клієнт: [accent]{0}
 trace.modclient = Кори�тувацький клієнт: [accent]{0}
+trace.times.joined = Кількі�ть приєднань: [accent]{0}
+trace.times.kicked = Кількі�ть вигнань: [accent]{0}
+trace.ips = IP:
+trace.names = Імена:
 invalidid = �евірний ідентифікатор клієнта! �адішліть звіт про помилку.
+player.ban = Заблокувати
+player.kick = Вигнати
+player.trace = Від�тежити
+player.admin = Перемкнути адміні�тратора
+player.team = Змінити команду
 server.bans = Блокуванн�
 server.bans.none = Заблокованих гравців немає!
 server.admins = �дміні�тратори
@@ -219,27 +285,30 @@ server.version = [gray]Вер�і�: {0} {1}
 server.custombuild = [accent]Кори�тувацька збірка
 confirmban = Ви дій�но хочете заблокувати «{0}[white]»?
 confirmkick = Ви дій�но хочете вигнати «{0}[white]»?
-confirmvotekick = Ви дій�но хочете вигнати «{0}[white]» за допомогою голо�уванн�?
 confirmunban = Ви дій�но хочете розблокувати цього гравц�?
 confirmadmin = Ви дій�но хочете зробити «{0}[white]» адміні�тратором?
 confirmunadmin = Ви дій�но хочете видалити �тату� адміні�тратора з «{0}[white]»?
-joingame.title = Мережева гра
+votekick.reason = Причина голо�уванн� за вигнанн� гравц�
+votekick.reason.message = Ви впевнені, що хочете вигнати голо�уванн�м "{0}[white]"?\nЯкщо так, то, будь ла�ка, вкажіть причину:
+joingame.title = Багатоо�ібна гра
 joingame.ip = IP:
 disconnect = Відключено.
 disconnect.error = Помилка з’єднанн�.
 disconnect.closed = З’єднанн� закрито.
 disconnect.timeout = Ча� вийшов.
 disconnect.data = �е вдало�� завантажити �вітові дані!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = �е вдало�� під’єднати�� до гри ([accent]{0}[]).
 connecting = [accent]Приєднанн�…
-reconnecting = [accent]Повторне зʼєднанн�…
+reconnecting = [accent]Повторне з’єднанн�…
 connecting.data = [accent]Завантаженн� даних �віту…
 server.port = Порт:
-server.addressinuse = Ц� адре�а вже викори�товуєть��!
 server.invalidport = �едій�ний номер порту!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]Помилка �творенн� �ервера.
 save.new = �ове збереженн�
 save.overwrite = Ви дій�но хочете перезапи�ати це мі�це збереженн�?
+save.nocampaign = Окремі файли збереженн� з кампанії не можна імпортувати.
 overwrite = Перезапи�ати
 save.none = Збережень не знайдено!
 savefail = �е вдало�� зберегти гру!
@@ -260,6 +329,7 @@ save.corrupted = Збережений файл пошкоджено або ві
 empty = <порожньо>
 on = Увімкнено
 off = Вимкнено
+save.search = Пошук збережених ігор…
 save.autosave = �втозбереженн�: {0}
 save.map = Мапа: {0}
 save.wave = Хвил� {0}
@@ -275,29 +345,52 @@ ok = Гаразд
 open = Відкрити
 customize = �алаштувати правила
 cancel = Ска�увати
+command = Командувати
+command.queue = [lightgray][У черзі]
+command.mine = Видобувати
+command.repair = Ремонтувати
+command.rebuild = Відбудовувати
+command.assist = Допомагати гравцеві
+command.move = Рухати��
+command.boost = Летіти
+command.enterPayload = Увійти до вантажного блока
+command.loadUnits = Завантажити одиниці
+command.loadBlocks = Завантажити блоки
+command.unloadPayload = Вивантажити вантаж
+command.loopPayload = Loop Unit Transfer
+stance.stop = Ска�увати накази
+stance.shoot = Позиці�: �тріл�ти
+stance.holdfire = Позиці�: припинити вогонь
+stance.pursuetarget = Позиці�: пере�лідувати ціль
+stance.patrol = Позиці�: шл�х патрулюванн�
+stance.ram = Позиці�: на таран\n[lightgray]Рух по пр�мій лінії, без пошуку шл�ху
 openlink = Перейти за по�иланн�м
 copylink = Скопіювати по�иланн�
 back = �азад
+max = Мак�.
+objective = Завданн� мапи
 crash.export = Ек�портувати аварійні звіти
 crash.none = �варійних звітів не знайдено
 crash.exported = �варійні звіти ек�портовано
 data.export = Вивантажити дані
 data.import = Завантажити дані
-data.openfolder = Відчинити теку з даними
+data.openfolder = Відкрити теку з даними
 data.exported = Дані вивантажено.
 data.invalid = Це не дій�ні ігрові дані.
 data.import.confirm = Вивантаженн� зовнішніх даних перезапише[scarlet] ВСІ[] ваші поточні ігрові дані.\n[accent]Це неможливо �ка�увати![]\n\nЯк тільки дані імпортують��, гра негайно закриєть��.
 quit.confirm = Ви дій�но хочете вийти?
-quit.confirm.tutorial = Ви впевнені, що знаєте, що робите?\n�авчанн� можна пройти наново[accent] �алаштуванн�->Гра->Пройти навчанн� ще раз.[]
 loading = [accent]Завантаженн�…
-reloading = [accent]Перезавантаженн� модифікацій…
+downloading = [accent]Завантаженн�…
 saving = [accent]Збереженн�…
 respawn = [accent][[{0}][], щоби відродити�� в �дрі
-cancelbuilding = [accent][[{0}][], щоб очи�тити план
+cancelbuilding = [accent][[{0}][] дл� очищенн� плану
 selectschematic = [accent][[{0}][], щоби вибрати та �копіювати
-pausebuilding = [accent][[{0}][], щоби призупинити будуванн�
-resumebuilding = [scarlet][[{0}][], щоби продовжити будуванн�
+pausebuilding = [accent][[{0}][] дл� призупиненн� будуванн�
+resumebuilding = [scarlet][[{0}][] дл� продовженн� будуванн�
+enablebuilding = [scarlet][[{0}][] дл� увімкненн� будуванн�
 showui = Кори�тувацький інтерфей� приховано.\n�ати�ніть [accent][[{0}][], щоби показати його знову.
+commandmode.name = [accent]Режим командуванн�
+commandmode.nounits = [одиниць немає]
 wave = [accent]Хвил� {0}
 wave.cap = [accent]Хвил� {0}/{1}
 wave.waiting = [lightgray]�а�тупна хвил�\nчерез {0}
@@ -317,9 +410,9 @@ custom = Кори�тувацька
 builtin = Вбудована
 map.delete.confirm = Ви дій�но хочете видалити цю мапу? Цю дію неможливо буде �ка�увати!
 map.random = [accent]Випадкова мапа
-map.nospawn = Ц� мапа не має жодного �дра дл� по�ви гравц�! Додайте [accent]помаранчеве[] �дро до цієї мапи в редакторі.
-map.nospawn.pvp = У цієї мапи немає ворожих �дер, у �ких гравець може з’�вити��! Додайте [scarlet]не помаранчеве[] �дро до цієї мапи в редакторі.
-map.nospawn.attack = У цієї мапи немає ворожих �дер, у �ких гравець може з’�вити��! Додайте [scarlet]червоне[] �дро до цієї мапи в редакторі.
+map.nospawn = Ц� мапа не має жодного �дра дл� по�ви гравц�! Додайте {0} �дро до цієї мапи в редакторі.
+map.nospawn.pvp = У цієї мапи немає ворожих �дер, у �ких гравець може з’�вити��! Додайте [scarlet]вороже[] �дро до цієї мапи в редакторі.
+map.nospawn.attack = У цієї мапи немає ворожих �дер дл� атаки гравцем! Додайте {0} �дро до цієї мапи в редакторі.
 map.invalid = Помилка завантаженн� мапи: пошкоджений або невірний файл мапи.
 workshop.update = Оновити предмет
 workshop.error = Помилка під ча� отриманн� інформації з Май�терні: {0}
@@ -327,68 +420,119 @@ map.publish.confirm = Ви дій�но хочете опублікувати ц
 workshop.menu = Виберіть, що ви хочете зробити з цим предметом.
 workshop.info = Інформаці� про предмет
 changelog = Змінопи� (за бажанн�м):
+updatedesc = Перезапи�ати назву та опи�
 eula = Ліцензійна угода Steam
 missing = Цей предмет було видалено або переміщено.\n[lightgray]Спи�ок Май�терні тепер автоматично від’єднано.
 publishing = [accent]Публікаці�…
 publish.confirm = Ви дій�но хочете опублікувати це?\n\n[lightgray]Переконайте��, що ви �початку погоджуєте�� з EULA Май�терні, або ваші предмети не з’�вл�ть��!
 publish.error = Виникла помилка під ча� публікації предмета: {0}
 steam.error = �е вдало�� ініціалізувати �ерві�и Steam.\nПомилка: {0}
-editor.brush = Пензлик
+
+editor.planet = Планета:
+editor.sector = Сектор:
+editor.seed = Зерно:
+editor.cliffs = Стіни в �келі
+editor.brush = Пензель
 editor.openin = Відкрити в редакторі
 editor.oregen = Генераці� руд
 editor.oregen.info = Генераці� руд:
 editor.mapinfo = Інформаці� про мапу
 editor.author = �втор:
 editor.description = Опи�:
-editor.nodescription = Мапа му�ить мати щонайменше 4 �имволи дл� публікації.
-editor.waves = Хвилі:
-editor.rules = Правила:
-editor.generation = Генераці�:
+editor.nodescription = Мапа му�ить мати щонайменше 4 �имволи в опи�і дл� публікації.
+editor.waves = Хвилі
+editor.rules = Правила
+editor.generation = Генераці�
+editor.objectives = Завданн�
+editor.locales = Мовні пакети
+editor.worldprocessors = Світові проце�ори
+editor.worldprocessors.editname = Редагувати назву
+editor.worldprocessors.none = [lightgray]Блоки �вітового проце�ора не знайдено!\nДодайте його у редакторі мапи або �кори�тайте�� кнопкою \ue813 «Додати» нижче.
+editor.worldprocessors.nospace = �емає вільного мі�ц� дл� розміщенн� �вітового проце�ора! \nВи заповнили карту �труктурами? �авіщо ви це зробили?
+editor.worldprocessors.delete.confirm = Ви �правді хочете видалити цей �вітовий проце�ор?\n\nЯкщо він оточений �тінами, його буде замінено �тіною оточенн�.
 editor.ingame = Редагувати в грі
+editor.playtest = Проте�тувати в грі
 editor.publish.workshop = Опублікувати в Май�терні Steam
 editor.newmap = �ова мапа
 editor.center = Центрувати
+editor.search = Шукати мапи…
+editor.filters = Фільтрувати мапи
+editor.filters.mode = Режими гри:
+editor.filters.type = Тип мапи:
+editor.filters.search = Шукати в
+editor.filters.author = �втор
+editor.filters.description = Опи�
+editor.shiftx = Зміщенн� за ві��ю X
+editor.shifty = Зміщенн� за ві��ю Y
 workshop = Май�терн�
 waves.title = Хвилі
 waves.remove = Видалити
-waves.never = <ніколи>
 waves.every = кожен
 waves.waves = хвил�(і)
+waves.health = здоров’�: {0}%
 waves.perspawn = за по�ву
 waves.shields = щитів за хвилю
 waves.to = до
+waves.spawn = По�ва:
+waves.spawn.all = <в�юди>
+waves.spawn.select = Вибір мі�ц� по�ви
+waves.spawn.none = [scarlet]на мапі не знайдено мі�ць по�ви
+waves.max = мак�. одиниць
 waves.guardian = Вартовий
 waves.preview = Попередній перегл�д
 waves.edit = Редагувати…
+waves.random = Випадково
 waves.copy = Копіювати в буфер обміну
 waves.load = Завантажити з буфера обміну
 waves.invalid = �едій�ні хвилі в буфері обміну.
 waves.copied = Хвилі �копійовані.
 waves.none = Противники не були в�тановлені.\nЗазначимо, що пу�ті хвилі будуть автоматично замінені звичайною хвилею.
+waves.sort = Сортуванн� за
+waves.sort.reverse = Зворотне �ортуванн�
+waves.sort.begin = Хвил�ми
+waves.sort.health = Здоров’�м
+waves.sort.type = Типом
+waves.search = Шукати хвилі...
+waves.filter = Фільтр одиниць
+waves.units.hide = Сховати в�е
+waves.units.show = Показати в�е
+
+#these are intentionally in lower case
 wavemode.counts = кількі�ть
 wavemode.totals = у�ього
 wavemode.health = здоров’�
+all = All
+
 editor.default = [lightgray]<За замовчуванн�м>
 details = Подробиці…
-edit = Редагувати…
+edit = Змінити…
+variables = Змінні
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = Built-in Variables
 editor.name = Ім’�:
 editor.spawn = Створити бойову одиницю
 editor.removeunit = Видалити бойову одиницю
 editor.teams = Команди
 editor.errorload = Помилка завантаженн� зображенн�.
 editor.errorsave = Помилка збереженн� зображенн�.
-editor.errorimage = Це зображенн�, а не мапа.\n\nЯкщо ви хочете імпортувати за�тарілу мапу, то викори�товуйте кнопку «Імпортувати за�тарілу мапу» в редакторі.
-editor.errorlegacy = Ц� мапа занадто �тара і викори�товує попередній формат мапи, �кий більше не підтримуєть��.
+editor.errorimage = Це зображенн�, а не мапа.
+editor.errorlegacy = Ц� мапа занадто �тара і викори�товує попередній формат мапи, що більше не підтримуєть��.
 editor.errornot = Це не мапа.
 editor.errorheader = Цей файл мапи недій�ний або пошкоджений.
 editor.errorname = Мапа не має назви. Може, ви намагаєте�� завантажити збереженн�?
+editor.errorlocales = Виникла помилка під ча� читанн� мовних пакетів: недій�ний мовний пакет.
 editor.update = Оновити
 editor.randomize = Випадково
+editor.moveup = Підн�ти вище
+editor.movedown = Опу�тити нижче
+editor.copy = Скопіювати
 editor.apply = За�то�увати
 editor.generate = Згенерувати
+editor.sectorgenerate = Згенерувати �ектор
 editor.resize = Змінити\nрозмір
 editor.loadmap = Завантажити мапу
 editor.savemap = Зберегти мапу
+editor.savechanges = [scarlet]У ва� є незбережені зміни!\n\n[]Чи хочете ви їх зберегти?
 editor.saved = Збережено!
 editor.save.noname = Ваша мапа не має назви! У�тановіть його в «Інформаці� про мапу».
 editor.save.overwrite = Ваша мапа перезапи�ує вбудовану мапу! Виберіть іншу назву в «Інформаці� про мапу».
@@ -414,6 +558,7 @@ editor.overwrite = [accent]Попередженн�!\nЦе перезапи�у
 editor.overwrite.confirm = [scarlet]Попередженн�![] Мапа з такою назвою вже є. Ви впевнені, що хочете перепи�ати її?\n«[accent]{0}[]»
 editor.exists = Мапа з такою назвою вже є.
 editor.selectmap = Виберіть мапу дл� завантаженн�:
+
 toolmode.replace = Замінити
 toolmode.replace.description = Малює тільки\nна �уцільних блоках.
 toolmode.replaceall = Замінити в�е
@@ -426,9 +571,16 @@ toolmode.eraseores = Видаленн� руд
 toolmode.eraseores.description = Видалити тільки руди.
 toolmode.fillteams = Змінити блок у команді
 toolmode.fillteams.description = Змінює належні�ть\nблоків до команди.
+toolmode.fillerase = Видалити однотипне
+toolmode.fillerase.description = Видал�є однотипні блоки.
 toolmode.drawteams = Змінити команду блока
 toolmode.drawteams.description = Змінює належні�ть\nблока до команди.
+#unused
+toolmode.underliquid = Під рідинами
+toolmode.underliquid.description = Малюйте поверхні під плитками рідин.
+
 filters.empty = [lightgray]�емає фільтрів! Додайте хоча б один за допомогою кнопки нижче.
+
 filter.distort = Спотворенн�
 filter.noise = Шум
 filter.enemyspawn = Вибір точки по�ви противників
@@ -445,6 +597,8 @@ filter.clear = Очи�тити
 filter.option.ignore = Ігнорувати
 filter.scatter = Роз�іювач
 filter.terrain = Ландшафт
+filter.logic = Logic
+
 filter.option.scale = Ма�штаб фільтра
 filter.option.chance = Шан�
 filter.option.mag = Сила за�то�уванн�
@@ -453,17 +607,40 @@ filter.option.circle-scale = Ма�штаб круга
 filter.option.octaves = Циклічні�ть за�то�уванн�
 filter.option.falloff = Спад циклічно�ті
 filter.option.angle = Кут
+filter.option.tilt = �ахил
+filter.option.rotate = Повернути
 filter.option.amount = Кількі�ть
 filter.option.block = Блок
 filter.option.floor = Поверхн�
 filter.option.flooronto = Цільова поверхн�
 filter.option.target = Ціль
+filter.option.replacement = Заміщенн�
 filter.option.wall = Стіна
 filter.option.ore = Руда
 filter.option.floor2 = Друга поверхн�
 filter.option.threshold2 = Вторинний граничний поріг
 filter.option.radius = Радіу�
 filter.option.percentile = Спад
+filter.option.code = Код
+filter.option.loop = Цикл
+locales.info = Тут ви можете додати на мапу мовні пакети дл� певних мов. У мовних пакетах кожна вла�тиві�ть має назву і значенн�. Ці вла�тиво�ті можуть бути викори�тані �вітовими проце�орами та завданн�ми їхніми назвами. Вони підтримують форматуванн� тек�ту (замінюючи заповнювачі на дій�ні значенн�).\n\n[cyan]Приклад вла�тиво�ті:\n[]name: [accent]timer[]\nvalue: [accent]Приклад таймеру, ча�у лишило�ь: @[]\n\n[cyan]Викори�танн�:\n[]У�тановіть його �к тек�т завданн�: [accent]@timer\n\n[]�адрукуйте його у �вітовому проце�орі:\n[accent]localeprint "timer"\nformat time\n[gray](де ча� - окремо обчи�лена змінна)
+locales.deletelocale = Ви �правді хочете видалити цей мовний пакет?
+locales.applytoall = За�то�увати зміни до в�іх мовних пакетів
+locales.addtoother = Додати до інших мовних пакетів
+locales.rollback = Поверненн� до о�танньої за�то�ованої зміни
+locales.filter = Фільтр вла�тиво�тей
+locales.searchname = Шукати назву...
+locales.searchvalue = Шукати значенн�...
+locales.searchlocale = Шукати мовний пакет...
+locales.byname = За назвою
+locales.byvalue = За значенн�м
+locales.showcorrect = Показати вла�тиво�ті, �кі при�утні в у�іх мовних пакетах і мають унікальні значенн� �крізь
+locales.showmissing = Показати вла�тиво�ті, �кі від�утні в де�ких мовних пакетах
+locales.showsame = Показати вла�тиво�ті, �кі мають однакові значенн� в різних мовних пакетах
+locales.viewproperty = Перегл�нути в у�іх мовних пакетах
+locales.viewing = Перегл�д вла�тиво�ті "{0}"
+locales.addicon = Додати значок
+
 width = Ширина:
 height = Ви�ота:
 menu = Меню
@@ -473,14 +650,16 @@ load = Завантажити
 save = Зберегти
 fps = FPS: {0}
 ping = Затримка: {0} м�
-memory = Mem: {0}мб
-memory2 = Mem:\n {0}мб +\n {1}мб
+tps = TPS: {0}
+memory = Пам’�ть: {0} мб
+memory2 = Пам’�ть:\n {0}мб +\n {1}мб
 language.restart = Перезапу�тіть �вою гру, щоби налаштуванн� мови набули чинно�ті.
 settings = �алаштуванн�
 tutorial = �авчанн�
 tutorial.retake = Пройти навчанн� ще раз
 editor = Редактор
 mapeditor = Редактор мап
+
 abandon = Покинути
 abandon.text = Ц� зона і в�і її ре�ур�и будуть утрачені.
 locked = Заблоковано
@@ -490,20 +669,76 @@ requirement.core = Знищте вороже �дро в зоні «{0}»
 requirement.research = До�лідіть {0}
 requirement.produce = Виробіть {0}
 requirement.capture = Захопіть {0}
+requirement.onplanet = У�тановіть контроль над �ектором на {0}
+requirement.onsector = Приземліть�� на такий �ектор: {0}
 launch.text = Запу�к
-research.multiplayer = Лише вла�ник �ервера має змогу до�ліджувати предмети.
 map.multiplayer = Лише вла�ник може перегл�дати �ектори.
 uncover = Розкрити
 configure = �алаштувати вивантаженн�
+
+objective.research.name = До�лідити
+objective.produce.name = Отримати
+objective.item.name = Отримати предмет
+objective.coreitem.name = Предметів у �дрі
+objective.buildcount.name = Кількі�ть �поруд
+objective.unitcount.name = Кількі�ть одиниць
+objective.destroyunits.name = Знищити одиниці
+objective.timer.name = Таймер
+objective.destroyblock.name = Знищити блок
+objective.destroyblocks.name = Знищити блоки
+objective.destroycore.name = Знищити �дро
+objective.commandmode.name = Режим командуванн�
+objective.flag.name = Прапорець
+
+marker.shapetext.name = Форма тек�ту
+marker.point.name = Point
+marker.shape.name = Форма
+marker.text.name = Тек�т
+marker.line.name = Ліні�
+marker.quad.name = Квад
+marker.texture.name = Тек�тура
+
+marker.background = Фон
+marker.outline = Контур
+
+objective.research = [accent]До�лідіть:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Виробіть:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Знищте:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Знищте: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Виробіть: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Перемі�тіть до �дра:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Збудуйте: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Скон�труюйте одиницю: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Знищте: [][lightgray]{0}[]x Units
+objective.enemiesapproaching = [accent]Вороги наблиз�ть�� через [lightgray]{0}[]
+objective.enemyescelating = [accent]�арощуванн� ворожого виробництва почнеть�� через [lightgray]{0}[]
+objective.enemyairunits = [accent]Виробництво ворожих повітр�них одиниць почнеть�� через [lightgray]{0}[]
+objective.destroycore = [accent]Знищте вороже �дро
+objective.command = [accent]Командуйте над одиниц�ми
+objective.nuclearlaunch = [accent]⚠ Ви�влено �дерний запу�к: [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ ЯДЕР�ИЙ УД�Р ��БЛИЖ�ЄТЬСЯ ⚠
+
 loadout = Вивантаженн�
 resources = Ре�ур�и
+resources.max = Мак�имум
 bannedblocks = Заборонені блоки
+unbannedblocks = Unbanned Blocks
+objectives = Завданн�
+bannedunits = Заборонені одиниці
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Заборонені одиниці �к білий �пи�ок
+bannedblocks.whitelist = Заборонені блоки �к білий �пи�ок
 addall = Додати в�е
 launch.from = Запу�к з [accent]{0}
+launch.capacity = Мі�ткі�ть предметів, що запу�кають��: [accent]{0}
 launch.destination = Пункт призначенн�: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Кількі�ть має бути чи�лом між 0 та {0}.
 add = Додати…
-boss.health = Здоров’� Вартового
+guardian = Вартовий
+
 connectfail = [crimson]Помилка з’єднанн�:\n\n[accent]{0}
 error.unreachable = Сервер не є до�тупним.\nЧи правильно напи�ана адре�а?
 error.invalidaddress = �екоректна адре�а.
@@ -514,15 +749,24 @@ error.mapnotfound = Файл мапи не знайдено!
 error.io = Мережева помилка введенн�-виведенн�.
 error.any = �евідома мережева помилка
 error.bloom = �е вдало�� ініціалізувати �вітінн�.\nВаш при�трій, мабуть, не підтримує це.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
+
 weather.rain.name = Дощ
-weather.snow.name = Сніг
+weather.snowing.name = Сніг
 weather.sandstorm.name = Піщана бур�
 weather.sporestorm.name = Спорова бур�
 weather.fog.name = Туман
+
+campaign.playtime = \uf129 [lightgray]Ча� гри на �екторі: {0}
+campaign.complete = [accent]Вітаємо.\n\nВорога на {0} розгромлено.\n[lightgray]Фінальний �ектор підкорено.
+
+sectorlist = Сектори
+sectorlist.attacked = {0} під атакою
 sectors.unexplored = [lightgray]�е до�ліджено
 sectors.resources = Ре�ур�и:
 sectors.production = Виробництво:
 sectors.export = Ек�портуванн�:
+sectors.import = Імпортуванн�:
 sectors.time = Ча�:
 sectors.threat = Загроза:
 sectors.wave = Хвил�:
@@ -530,27 +774,47 @@ sectors.stored = Зберігає:
 sectors.resume = Продовжити
 sectors.launch = Запу�тити
 sectors.select = Вибрати
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]нічого (�онце)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Перейменуванн� �ектору
 sectors.enemybase = [scarlet]Ворожа база
 sectors.vulnerable = [scarlet]Уразливий
 sectors.underattack = [scarlet]�таковано! [accent]{0}% пошкоджено
+sectors.underattack.nodamage = [scarlet]�е захоплено
 sectors.survives = [accent]Протримайте�� {0} хвиль
 sectors.go = Перейти
+sector.abandon = Покинути
+sector.abandon.confirm = У�і �дра в цьому �екторі �амознищать��.\nПродовжити?
 sector.curcapture = Сектор захоплено
 sector.curlost = Сектор втрачено
 sector.missingresources = [scarlet]�едо�татньо ре�ур�ів у �дрі
 sector.attacked = Сектор [accent]{0}[white] під атакою!
 sector.lost = Сектор [accent]{0}[white] втрачено!
-sector.captured = Сектор [accent]{0}[white]захоплено!
+sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
+sector.changeicon = Змінити значок
+sector.noswitch.title = �еможливо переключити �ектори
+sector.noswitch = Ви не можете змінювати �ектори, поки поточний �ектор піддаєть�� атаці.\n\nСектор: [accent]{0}[] на [accent]{1}[]
+sector.view = Перегл�нути �ектор
+
 threat.low = низька
 threat.medium = �ередн�
 threat.high = ви�ока
 threat.extreme = ек�тремальна
 threat.eradication = викорінювальна
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
 planets = Планети
-planet.serpulo.name = Cерпуло
+
+planet.serpulo.name = Серпуло
+planet.erekir.name = Ерекір
 planet.sun.name = Сонце
+
 sector.impact0078.name = �варійне приземленн� 0078
 sector.groundZero.name = Відправний пункт
 sector.craters.name = Кратери
@@ -566,23 +830,103 @@ sector.fungalPass.name = Грибний перевал
 sector.biomassFacility.name = Центр до�лідженн� �интезу біома�и
 sector.windsweptIslands.name = Вітр�ні о�трови
 sector.extractionOutpost.name = Видобувна за�тава
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Термінал планетарного запу�ку
+sector.coastline.name = Узбережж�
+sector.navalFortress.name = Мор�ька фортец�
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
+
 sector.groundZero.description = Оптимальне мі�це дл� повторних ігор. �изька ворожа загроза. Мало ре�ур�ів.\nЗберіть �комога більше �винцю та міді.\n�е затримуйте�ь і йдіть далі.
 sector.frozenForest.description = �авіть тут, ближче до гір, уже поширили�� �пори. Холодна температура не змогла �тримати їх назавжди.\n\nЗважте�ь �творити енергію. Побудуйте генератори внутрішнього згоранн�. �авчіть�� кори�тувати�� регенераторами.
 sector.saltFlats.description = �а околиц�х пу�телі лежать Сол�ні рівнини. У цьому мі�ці небагато ре�ур�ів.\n\nСаме тут противники �порудили комплек� зі зберіганн� ре�ур�ів. Викорініть їхнє �дро. �е лишайте нічого цінного.
 sector.craters.description = У цьому кратері накопичила�� вода — пережиток �тарих воєн. Відновіть мі�цеві�ть. Видобудьте пі�ок. Виплавте мета�кло. Качайте воду, щоб охолоджувати башти та бури.
-sector.ruinousShores.description = Повз пу�ток — берегова ліні�. Коли�ь у цьому мі�ці розташував�� береговий оборонний ма�ив. Проте з тих давніх залишило�� не дуже й багато чого. Тільки о�новні оборонні �поруди лишили�� неушкодженими, а в�е інше перетворило�� на брухт.\nПродовжуйте ек�пан�ію назовні. До�лідіть повторно забуті технології.
+sector.ruinousShores.description = Повз пу�тки — берегова ліні�. Коли�ь у цьому мі�ці розташував�� береговий оборонний ма�ив. Проте з тих давніх ча�ів залишило�� не дуже й багато чого. Тільки о�новні оборонні �поруди лишили�� неушкодженими, а в�е інше перетворило�� на брухт.\nПродовжуйте ек�пан�ію назовні. До�лідіть повторно забуті технології.
 sector.stainedMountains.description = Якщо йти далі у вглиб материка, то можна побачити гори, що ще не заражені �порами.\nВидобудьте надлишковий титан у цій мі�цево�ті й дізнайте�� �к викори�товувати його.\n\nВорожа при�утні�ть у цій мі�цево�ті значно більша. �е дайте ворогам ча�у наді�лати �вої най�ильніші одиниці.
-sector.overgrowth.description = Ближче до джерела �пор є територі�, що заро�ла.\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 = Перехідна зона між ви�окими й низькими горами, що заповнені �порами. Тут розташована невелика розвідувальна база противника.\nЗнищте її.\nВикори�товуйте Кинджалів і Плазунів. Зруйнуйте два �дра.
-sector.biomassFacility.description = Батьківщина �пор. Це �аме той обʼєкт, у �кому вони вперше були до�ліджені та виготовлені.\nДо�лідіть технологію, що мі�тить�� в�ередині. Вирощуйте �пори дл� виробництва палива та пла�тма�. \n\n[lightgray]Пі�л� руйнації цього обʼєкта �пори �тали вільними. �іщо в мі�цевій еко�и�темі не змогло �кла�ти конкуренцію такому загарбницькому організму.
+sector.biomassFacility.description = Батьківщина �пор. Це �аме той об’єкт, у �кому вони вперше були до�ліджені та виготовлені.\nДо�лідіть технологію, що мі�тить�� в�ередині. Вирощуйте �пори дл� виробництва палива та пла�тма�. \n\n[lightgray]Пі�л� руйнації цього об’єкта �пори �тали вільними. �іщо в мі�цевій еко�и�темі не змогло �кла�ти конкуренцію такому загарбницькому організму.
 sector.windsweptIslands.description = Далі, за береговою лінією, розташовуєть�� цей віддалений ланцюжок о�тровів. Запи�и чітко вказують на те, що коли�ь вони мали �труктури, що виробл�ли [accent]пла�таній[] \n\nВідбивайте�ь від мор�ьких підрозділів противника. Створіть базу на о�тровах. До�лідіть ці заводи.
 sector.extractionOutpost.description = Віддалений форпо�т, побудований ворогом дл� запу�ку ре�ур�ів в інші �ектори. \n\nМіж�екторна тран�портна технологі� має важливе значенн� дл� подальшого завоюванн�. Знищте базу. До�лідіть їхні пу�кові майданчики.
-sector.impact0078.description = Тут лежать залишки міжзор�ного тран�портного �удна, �ке вперше потрапило в цю �и�тему. \n\nВилучіть �комога більше кори�ного з уламків. До�лідіть будь-�ку вцілілу технологію.
+sector.impact0078.description = Тут лежать залишки міжзор�ного тран�портного �удна, що вперше потрапило в цю �и�тему. \n\nВилучіть �комога більше кори�ного з уламків. До�лідіть будь-�ку вцілілу технологію.
 sector.planetaryTerminal.description = Кінцева мета.\n\nЦ� прибережна база мі�тить �труктуру, здатну запу�кати �дра на навколишні планети. �адзвичайно добре охорон�єть��.\n\nВиробл�є вій�ьково-мор�ькі підрозділи. У�уньте ворога �комога швидше. До�лідіть �труктуру запу�ку.
+sector.coastline.description = �а цьому мі�ці ви�влено залишки вій�ьково-мор�ьких одиниць. Відбийте атаки �упротивника, захопіть цей �ектор та заволодійте технологією.
+sector.navalFortress.description = Ворог �творив базу на віддаленому, природно-укріпленому о�трові. Знищте цей форпо�т. Заволодійте їхніми передовими технологі�ми мор�ьких кораблів і до�лідіть їх.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = Перший на�туп
+sector.aegis.name = Егіда
+sector.lake.name = Озеро
+sector.intersect.name = Роздоріжж�
+sector.atlas.name = �тлант
+sector.split.name = Розколина
+sector.basin.name = Ставок
+sector.marsh.name = Болото
+sector.peaks.name = Вершини
+sector.ravine.name = Яр
+sector.caldera-erekir.name = Кальдера
+sector.stronghold.name = Сторожова за�тава
+sector.crevice.name = Провалл�
+sector.siege.name = Облога
+sector.crossroads.name = Перехре�т�
+sector.karst.name = Кар�т
+sector.origin.name = Джерело
+
+sector.onset.description = Зберіть ре�ур�и і до�лідіть технології дл� автоматизації виробництва.\nПочніть атаку.\n
+sector.aegis.description = Ворог захищений щитами. У цьому �екторі ви�влено ек�периментальний модуль зламувача щитів.\nЗнайдіть цю будівлю. Забезпечте її вольфрамовими боєприпа�ами та знищіть ворожу базу.
+sector.lake.description = Шлакове озеро в цьому �екторі значно обмежує вибір одиниць. Єдиний варіант — одиниц�, що може підтримувати �ебе над землею.\nДо�лідіть [accent]корабельний виробник[] і виготовте одиницю [accent]Ухил�ч[] �комога швидше.
+sector.intersect.description = Скануванн� показує, що цей �ектор буде атаковано з кількох �торін невдовзі пі�л� приземленн�.Швидко підготуйте захи�т і розширте його �кнайшвидше.\nВам знадобл�ть�� [accent]Мехи[] дл� подоланн� нерівної мі�цево�ті.
+sector.atlas.description = Цей �ектор мі�тить різноманітну мі�цеві�ть і потребує різноманітних одиниць дл� ефективної атаки.\nМодернізовані одиниці також можуть знадобити��, щоби подолати де�кі �кладніші бази противника, ви�влені тут.\nДо�лідіть [accent]Електролізер[] і [accent]Танковий рефабрикатор[].
+sector.split.description = Мінімальна ворожа при�утні�ть в цьому �екторі робить його ідеальним дл� те�туванн� нових тран�портних технологій.
+sector.basin.description = У цьому �екторі ви�влено велику при�утні�ть ворога.\nШвидко �творюйте одиниці та захоплюйте ворожі �дра, щоби закріпити��.
+sector.marsh.description = У цьому �екторі багато аркіциту, але мало отворів.\nСпоруджуйте [accent]камери хімічного згор�нн�[], щоби виробл�ти енергію.
+sector.peaks.description = Гір�ька мі�цеві�ть в цьому �екторі робить більші�ть одиниць непотрібними. Знадобить�� при�утні�ть повітр�них одиниць.\nБудьте уважні до ворожої ППО. Можливо, вда�ть�� виве�ти з ладу де�кі з цих у�тановок, націливши�ь на їхні допоміжні будівлі.
+sector.ravine.description = Важливий тран�портний маршрут дл� ворога. У �екторі не ви�влено �дер, але очікуєть�� при�утні�ть різноманітних �ил противника.\nВиробіть [accent]кінетичний �плав[]. Побудуйте башти [accent]уражач[].
+sector.caldera-erekir.description = Ви�влені в цьому �екторі ре�ур�и розкидані по декількох о�тровах.\nДо�лідіть і розгорніть перевезенн� на базі дронів.
+sector.stronghold.description = Великий ворожий табір в цьому �екторі охорон�є значні поклади [accent]торію[].\nВикори�тайте його дл� розвитку одиниць вищого рівн� і башт.
+sector.crevice.description = Ворог відправить запеклі штурмові �или, щоби знищити вашу базу в цьому �екторі.\nРозробка [accent]карбіду[] і [accent]генератора піролізу[] може бути необхідною дл� виживанн�.
+sector.siege.description = У цьому �екторі є два паралельні каньйони, �кі зму��ть ве�ти дво�торонню атаку.\nДо�лідіть [accent]ціаноген[], щоб отримати можливі�ть �творювати ще �ильніші танкові ча�тини.\nУвага: ви�влено ворожі ракети дальнього радіу�у дії. Ракети можуть бути збиті до входженн� в атмо�феру.
+sector.crossroads.description = Ворожі бази в цьому �екторі були �творені на пере�іченій мі�цево�ті. До�лідіть різні одиниці, щоб при�то�увати��.\nДо того ж, де�кі бази захищені щитами. З'��уйте, �к вони отримують енергію.
+sector.karst.description = Цей �ектор багатий на ре�ур�и, але буде атакований ворогом, �к тільки приземлить�� нове �дро.\nВикори�товуйте ре�ур�и та до�лідіть [accent]фазову тканину[].
+sector.origin.description = О�танній �ектор зі значною при�утні�тю ворога.\n�е залишаєть�� ймовірних можливо�тей дл� до�ліджень, тому зо�ередьте�� виключно на знищенні в�іх ворожих �дер.
+
+status.burning.name = Горінн�
+status.freezing.name = Замерзанн�
+status.wet.name = Зволожені�ть
+status.muddy.name = Забруднені�ть гр�ззю
+status.melting.name = Плавленн�
+status.sapped.name = Ви�нажені�ть
+status.electrified.name = �аелектризовані�ть
+status.spore-slowed.name = Сповільнені�ть через �пори
+status.tarred.name = Покритт� нафтою
+status.overdrive.name = Перевантаженн�
+status.overclock.name = При�коренн�
+status.shocked.name = Приголомшенн�
+status.blasted.name = Понівеченн�
+status.unmoving.name = �езворушні�ть
+status.boss.name = Вартовий
+
 settings.language = Мова
 settings.data = Ігрові дані
 settings.reset = За замовчуванн�м
@@ -600,10 +944,11 @@ settings.clearsaves = Очи�тити збереженн�
 settings.clearresearch = Очи�тити до�лідженн�
 settings.clearresearch.confirm = Ви �правді хочете очи�тити до�лідженн� кампанії?
 settings.clearcampaignsaves = Очи�тити збереженн� в кампанії
-settings.clearcampaignsaves.confirm = Ви �правді хочете очи�тити в�і збереженні в кампанії?
+settings.clearcampaignsaves.confirm = Ви �правді хочете очи�тити в�і збереженн� в кампанії?
 paused = [accent]< Пауза >
 clear = Очи�тити
 banned = [scarlet]Заблоковано
+unsupported.environment = [scarlet]�епідтримуване �ередовище
 yes = Так
 no = �і
 info.title = Інформаці�
@@ -611,13 +956,18 @@ error.title = [crimson]Виникла помилка
 error.crashtitle = Виникла помилка
 unit.nobuild = [scarlet]Ц� одиниц� не може будувати
 lastaccessed = [lightgray]О�танн� зміна від {0}
+lastcommanded = [lightgray]О�танній наказ від {0}
 block.unknown = [lightgray]???
+
+stat.showinmap = <завантажте мапу дл� показу>
 stat.description = Призначенн�
 stat.input = Ввід
 stat.output = Вивід
+stat.maxefficiency = Мак�имальна ефективні�ть
 stat.booster = При�корювач
 stat.tiles = �еобхідні плитки
 stat.affinities = Збільшенн� ефективно�ті
+stat.opposites = Зменшенн� ефективно�ті
 stat.powercapacity = Мі�ткі�ть енергії
 stat.powershot = Енергі� за по�тріл
 stat.damage = Шкода
@@ -631,17 +981,20 @@ stat.displaysize = Розмір ди�плею
 stat.liquidcapacity = Рідинна мі�ткі�ть
 stat.powerrange = Радіу� передачі енергії
 stat.linkrange = Радіу� з’єднанн�
-stat.instructions = Ін�трукції
+stat.instructions = Операції
 stat.powerconnections = Мак�имальна кількі�ть з’єднань
 stat.poweruse = Енергії викори�товує
 stat.powerdamage = Енергії за од. шкоди
 stat.itemcapacity = Мі�ткі�ть предметів
-stat.memorycapacity = Ємні�ть пам’�ті
+stat.memorycapacity = Мі�ткі�ть пам’�ті
 stat.basepowergeneration = Базова генераці� енергії
 stat.productiontime = Ча� виробництва
 stat.repairtime = Ча� повного відновленн� блоку
+stat.repairspeed = Швидкі�ть відновленн�
 stat.weapons = Збро�
 stat.bullet = Кулі
+stat.moduletier = Рівень модул�
+stat.unittype = Тип одиниці
 stat.speedincrease = Збільшенн� швидко�ті
 stat.range = Радіу� дії
 stat.drilltier = Видобуває
@@ -649,12 +1002,13 @@ stat.drillspeed = Базова швидкі�ть бурінн�
 stat.boosteffect = При�корювальний ефект
 stat.maxunits = Мак�имальна кількі�ть активних одиниць
 stat.health = Здоров’�
+stat.armor = Брон�
 stat.buildtime = Ча� будуванн�
 stat.maxconsecutive = Мак�имальна по�лідовні�ть
 stat.buildcost = Варті�ть будуванн�
 stat.inaccuracy = Розкид
 stat.shots = По�тріли
-stat.reload = По�тріли за �ек.
+stat.reload = Скоро�трільні�ть
 stat.ammo = Боєприпа�и
 stat.shieldhealth = Міцні�ть щита
 stat.cooldowntime = Тривалі�ть охолодженн�
@@ -664,6 +1018,7 @@ stat.lightningchance = Шан� удару бли�кавки
 stat.lightningdamage = Шкода від удару бли�кавки
 stat.flammability = Займи�ті�ть
 stat.radioactivity = Радіоактивні�ть
+stat.charge = Зар�д
 stat.heatcapacity = Тепломі�ткі�ть
 stat.viscosity = В’�зкі�ть
 stat.temperature = Температура
@@ -672,23 +1027,77 @@ stat.buildspeed = Швидкі�ть будуванн�
 stat.minespeed = Швидкі�ть видобутку
 stat.minetier = Рівень видобутку
 stat.payloadcapacity = Вантажні�ть
-stat.commandlimit = Мак�имум у загоні
 stat.abilities = Здібно�ті
 stat.canboost = Можна при�корити
 stat.flying = Літає
-ability.forcefield = Щитове поле
+stat.ammouse = Патронів викори�товує
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = Множник шкоди
+stat.healthmultiplier = Множник здоров’�
+stat.speedmultiplier = Множник швидко�ті
+stat.reloadmultiplier = Множник перезар�дки
+stat.buildspeedmultiplier = Множник швидко�ті будуванн�
+stat.reactive = Реактивний
+stat.immunities = Імунітети
+stat.healing = Відновлюванн�
+stat.efficiency = [stat]{0}% Efficiency
+
+ability.forcefield = Силовий щит
+ability.forcefield.description = Створює �илове поле, �кий поглинає кулі
 ability.repairfield = Ремонтувальне поле
+ability.repairfield.description = Ремонтує найближчі одиниці
 ability.statusfield = Поле під�иленн�
-ability.unitspawn = Завод одиниць «{0}»
-ability.shieldregenfield = Поле, що відновлює щити
+ability.statusfield.description = За�то�овує ефект �тану до �у�ідніх одиниць
+ability.unitspawn = Завод одиниць
+ability.unitspawn.description = Створює одиниці
+ability.shieldregenfield = Щитовідновлювальне поле
+ability.shieldregenfield.description = Відновлює щити �у�ідніх одиниць
 ability.movelightning = Бли�кавки під ча� руху
-bar.drilltierreq = Потребуєть�� кращий бур
+ability.movelightning.description = Випу�кає бли�кавки під ча� руху
+ability.armorplate = Бронеплита
+ability.armorplate.description = Зменшує шкоду під ча� �трільби
+ability.shieldarc = Щитова дуга
+ability.shieldarc.description = Проєктує �иловий щит у вигл�ді дуги, що поглинає кулі
+ability.suppressionfield = Поле пригніченн� відновленн�
+ability.suppressionfield.description = Зупин�єть�� поблизу ремонтних будівель
+ability.energyfield = Енергетичне поле
+ability.energyfield.description = Вражає найближчих ворогів
+ability.energyfield.healdescription = Вражає ворогів поблизу та зцілює �оюзників
+ability.regen = Лікуванн�
+ability.regen.description = Відновлює вла�не здоров'� з ча�ом
+ability.liquidregen = Поглинанн� рідини
+ability.liquidregen.description = Поглинає рідину дл� �амолікуванн�
+ability.spawndeath = Смертельне породженн�
+ability.spawndeath.description = Випу�кає одиниць пі�л� �мерті
+ability.liquidexplode = Смертельний розлив
+ability.liquidexplode.description = Розливає рідину пі�л� �мерті
+ability.stat.firingrate = [lightgray]Швидкі�ть �трільби[stat]{0} за �ек.
+ability.stat.regen = Відновленн� здоров'�: [stat]{0} за �ек.
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [lightgray]Щит: [stat]{0}
+ability.stat.repairspeed = [lightgray]Швидкі�ть відновленн�: [stat]{0} за �ек.
+ability.stat.slurpheal = [lightgray]Здоров'� за одиницю рідини: [stat]{0}
+ability.stat.cooldown = [lightgray]Перезар�джанн�: [stat]{0} за �ек.
+ability.stat.maxtargets = [lightgray]Мак�имум цілей: [white]{0}
+ability.stat.sametypehealmultiplier = [lightgray]Однотипне відновленн�: [white]{0}%
+ability.stat.damagereduction = [lightgray]Зменшенн� шкоди: [stat]{0}%
+ability.stat.minspeed = [lightgray]Мінімальна швидкі�ть: [stat]{0} плиток за �ек.
+ability.stat.duration = [lightgray]Тривалі�ть: [stat]{0} за �ек.
+ability.stat.buildtime = [lightgray]Ча� побудови: [stat]{0} за �ек.
+
+bar.onlycoredeposit = Передача предметів дозволена лише до �дра
+bar.drilltierreq = Потрібен ліпший бур
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = Бракує ре�ур�ів
 bar.corereq = �еобхідне о�новне �дро
-bar.drillspeed = Швидкі�ть бурінн�: {0} за �.
-bar.pumpspeed = Швидкі�ть викачуванн�: {0} за �.
+bar.corefloor = �еобхідні плитки зони �дра
+bar.cargounitcap = До��гнуто межі одиниць дл� вантажу
+bar.drillspeed = Швидкі�ть бурінн�: {0} за �ек.
+bar.pumpspeed = Швидкі�ть викачуванн�: {0} за �ек.
 bar.efficiency = Ефективні�ть: {0}%
-bar.powerbalance = Енергі�: {0} за �.
+bar.boost = Під�иленн�: +{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = Енергі�: {0} за �ек.
 bar.powerstored = Зберігає: {0}/{1}
 bar.poweramount = Енергі�: {0}
 bar.poweroutput = Вихідна енергі�: {0}
@@ -696,67 +1105,94 @@ bar.powerlines = З’єднань: {0}/{1}
 bar.items = Предмети: {0}
 bar.capacity = Мі�ткі�ть: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[одиниц� вимкнена]
 bar.liquid = Рідина
 bar.heat = �агріванн�
+bar.cooldown = Cooldown
+bar.instability = �е�табільні�ть
+bar.heatamount = �агріванн�: {0}
+bar.heatpercent = �агріванн�: {0} ({1}%)
 bar.power = Енергі�
 bar.progress = Хід будуванн�
+bar.loadprogress = Прогре�
+bar.launchcooldown = Перезар�дка запу�ку
 bar.input = Ввід
 bar.output = Вивід
+bar.strength = x[stat]{0}[lightgray] �ила
+
 units.processorcontrol = [lightgray]Керуєть�� проце�ором
+
 bullet.damage = [stat]{0}[lightgray] шкода
 bullet.splashdamage = [stat]{0}[lightgray] шкода по діл�нці ~[stat] {1}[lightgray] плиток
 bullet.incendiary = [stat]запальний
-bullet.sapping = [stat]ви�нажує
 bullet.homing = [stat]�амонаведенн�
-bullet.shock = [stat]шок
-bullet.frag = [stat]шкода по діл�нці
+bullet.armorpierce = [stat]бронебійні�ть
+bullet.maxdamagefraction = [stat]{0}%[lightgray] обмеженн� шкоди
+bullet.suppression = [stat]{0}[lightgray] �ек. пригніченн� відновленн� ~ [stat]{1}[lightgray] плит.
+bullet.interval = [stat]{0} за �ек. [lightgray] період між кул�ми:
+bullet.frags = [stat]{0}[lightgray]x шкода по діл�нці від �нар�дів:
+bullet.lightning = [stat]{0}[lightgray]x бли�кавки ~ [stat]{1}[lightgray] шкоди
+bullet.buildingdamage = [stat]{0}%[lightgray] шкода по будівл�х
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] відкиданн�
 bullet.pierce = [stat]{0}[lightgray]x пробитт�
 bullet.infinitepierce = [stat]пробитт�
 bullet.healpercent = [stat]{0}[lightgray]% лікуванн�
-bullet.freezing = [stat]заморожуванн�
-bullet.tarred = [stat]дьогтьовий
+bullet.healamount = [stat]{0}[lightgray] безпо�ереднього ремонту
 bullet.multiplier = [stat]{0}[lightgray]x патронів
-bullet.reload = [stat]{0}[lightgray]x швидкі�ть перезар�джанн�
+bullet.reload = [stat]{0}%[lightgray] швидкі�ть перезар�джанн�
+bullet.range = [stat]{0}[lightgray] плиток
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
+
 unit.blocks = блоки
 unit.blockssquared = блоків²
-unit.powersecond = одиниць енергії за �екунду
-unit.liquidsecond = одиниць рідини за �екунду
-unit.itemssecond = предметів за �екунду
+unit.powersecond = одиниць енергії за �ек.
+unit.tilessecond = плиток за �ек.
+unit.liquidsecond = одиниць рідини за �ек.
+unit.itemssecond = предметів за �ек.
 unit.liquidunits = одиниць рідини
 unit.powerunits = одиниць енергії
+unit.heatunits = одиниць нагріванн�
 unit.degrees = град.
-unit.seconds = �
-unit.minutes = хв
-unit.persecond = за �екунду
-unit.perminute = за хвилину
+unit.seconds = �ек.
+unit.minutes = хв.
+unit.persecond = за �ек.
+unit.perminute = за хв.
 unit.timesspeed = x швидкі�ть
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = міцні�ть щита
 unit.items = предм.
 unit.thousands = ти�
 unit.millions = млн
 unit.billions = млрд
+unit.shots = shots
+unit.pershot = за по�тріл
 category.purpose = Призначенн�
 category.general = Загальне
 category.power = Енергі�
 category.liquids = Рідини
 category.items = Предмети
 category.crafting = Виробництво
-category.function = Стрільба
+category.function = Функціонал
 category.optional = Додаткові поліпшенн�
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = Пропу�тити запу�к �дра та анімацію приземленн�
 setting.landscape.name = Тільки альбомний (горизонтальний) режим
 setting.shadows.name = Тіні
 setting.blockreplace.name = Пропонуванн� щодо автоматичної заміни блоків
 setting.linear.name = Лінійна фільтраці�
 setting.hints.name = Підказки
-setting.flow.name = Показувати темп швидко�ті ре�ур�ів
-setting.backgroundpause.name = Пауза в разі згортанні
+setting.logichints.name = Підказки під ча� роботи з логікою
+setting.backgroundpause.name = Пауза в разі згортанн�
 setting.buildautopause.name = �втоматичне призупиненн� будуванн�
+setting.doubletapmine.name = Подвійне швидке нати�канн� дл� початку видобутку
+setting.commandmodehold.name = Утримуйте дл� переходу в режим командуванн�
+setting.distinctcontrolgroups.name = Обмежити одну групу контролю на одиницю 
+setting.modcrashdisable.name = Вимикати модифікації пі�л� аварійного запу�ку
 setting.animatedwater.name = �німаційні рідини
 setting.animatedshields.name = �німаційні щити
-setting.antialias.name = Згладжуванн�[lightgray] (потребує перезапу�ку)[]
 setting.playerindicators.name = Позначки гравців
 setting.indicators.name = Позначки противників
 setting.autotarget.name = �вто�трільба
@@ -765,15 +1201,12 @@ setting.touchscreen.name = Керуванн� �ен�орним екраном
 setting.fpscap.name = Мак�имальний FPS
 setting.fpscap.none = Жодне
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Ма�штабуванн� кори�тувацького інтерфей�у[lightgray] (потребує перезапу�ку)[]
+setting.uiscale.name = Ма�штабуванн� кори�тувацького інтерфей�у
+setting.uiscale.description = Потрібен перезапу�к дл� за�то�уванн� змін.
 setting.swapdiagonal.name = Завжди діагональне розміщенн�
-setting.difficulty.training = �авчанн�
-setting.difficulty.easy = Легка
-setting.difficulty.normal = �ормальна
-setting.difficulty.hard = Важка
-setting.difficulty.insane = �еможлива
-setting.difficulty.name = Складні�ть:
 setting.screenshake.name = Тр��ка екрану
+setting.bloomintensity.name = Інтен�ивні�ть �вітінн�
+setting.bloomblur.name = Розмитт� �вітінн�
 setting.effects.name = Ефекти
 setting.destroyedblocks.name = Показувати зруйновані блоки
 setting.blockstatus.name = Показувати �тан блоку
@@ -783,43 +1216,52 @@ setting.saveinterval.name = Інтервал збереженн�
 setting.seconds = {0} �екунд
 setting.milliseconds = {0} мілі�екунд
 setting.fullscreen.name = Повноекранний режим
-setting.borderlesswindow.name = Вікно без полів[lightgray] (може потребувати перезапу�ку)
+setting.borderlesswindow.name = Безрамкове вікно
+setting.borderlesswindow.name.windows = Повне безрамкове вікно
+setting.borderlesswindow.description = Можливо, потрібен перезапу�к дл� за�то�уванн� змін.
 setting.fps.name = Показувати FPS і затримку до �ервера
+setting.console.name = Увімкнути кон�оль
 setting.smoothcamera.name = Гладка камера
 setting.vsync.name = Вертикальна �инхронізаці�
 setting.pixelate.name = Пік�елізаці�
 setting.minimap.name = Показувати мінімапу
 setting.coreitems.name = Показувати предмети в �дрі
 setting.position.name = Показувати координати гравц�
+setting.mouseposition.name = Показувати координати кур�ора
 setting.musicvol.name = Гучні�ть музики
 setting.atmosphere.name = Показувати планетарну атмо�феру
+setting.drawlight.name = Малювати темр�ву/�вітло
 setting.ambientvol.name = Звуки довкілл�
 setting.mutemusic.name = Заглушити музику
 setting.sfxvol.name = Гучні�ть звукових ефектів
 setting.mutesound.name = Заглушити звук
 setting.crashreport.name = Від�илати анонімні звіти про аварійне завершенн� гри
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = �втоматичне �творенн� збережень
-setting.publichost.name = Загальнодо�тупні�ть гри
+setting.steampublichost.name = Загальнодо�тупні�ть гри
 setting.playerlimit.name = Обмеженн� гравців
 setting.chatopacity.name = �епрозорі�ть чату
 setting.lasersopacity.name = �епрозорі�ть лазерів енергопо�тачанн�
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = �епрозорі�ть мо�тів
 setting.playerchat.name = Показувати хмару чата над гравц�ми
-public.confirm = Ви хочете зробити цю гру загальнодо�тупною?\n[accent]Будь-хто може приєднати�� до вашої гри.\n[lightgray]Це можна змінити в �алаштуванн�->Гра->Загальнодо�тупні�ть гри.
+setting.showweather.name = Показувати погоду
+setting.hidedisplays.name = Приховувати логічні ди�плеї
+setting.macnotch.name = �даптуйте інтерфей� дл� показу виїмки
+setting.macnotch.description = Потрібен перезапу�к дл� за�то�уванн� змін
+steam.friendsonly = Лише друзі
+steam.friendsonly.tooltip = Чи лише друзі Steam зможуть приєднати�� до вашої гри.Якщо зн�ти цей прапорець, ваша гра �тане загальнодо�тупною – будь-хто зможе приєднати��.
 public.beta = Зауважте, що в бета-вер�ії гри ви не можете робити публічні ігри.
 uiscale.reset = Ма�штаб кори�тувацького інтерфей�у було змінено.\n�ати�ніть «Гаразд» дл� підтвердженн� цього ма�штабу.\n[scarlet]Поверненн� налаштувань і вихід через[accent] {0}[] �екунд…
-uiscale.cancel = Ска�увати і вийти
+uiscale.cancel = Ска�увати й вийти
 setting.bloom.name = Світінн�
 keybind.title = �алаштуванн� керуванн�
 keybinds.mobile = [scarlet]Більші�ть прив’�заних клавіш не функціональні дл� мобільних при�троїв. Підтримуєть�� лише базовий рух.
 category.general.name = Загальне
 category.view.name = Перегл�д
+category.command.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 = Контролюванн� одиниці
@@ -834,6 +1276,27 @@ keybind.move_y.name = Рух за ві��ю Y
 keybind.mouse_move.name = Рухати�� за мишею
 keybind.pan.name = Політ камери за мишею
 keybind.boost.name = При�коренн�
+keybind.command_mode.name = Режим командуванн�
+keybind.command_queue.name = Черга команд одиниць
+keybind.create_control_group.name = Створити контрольну групу
+keybind.cancel_orders.name = Ска�увати накази
+keybind.unit_stance_shoot.name = Позиці� одиниці: відкрити воонь
+keybind.unit_stance_hold_fire.name = Позиці� одиниці: припинити вогонь
+keybind.unit_stance_pursue_target.name = Позиці� одиниці: пере�лідувати ціль
+keybind.unit_stance_patrol.name = Позиці� одиниці: патрулювати
+keybind.unit_stance_ram.name = Позиці� одиниці: на таран
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Команда одиниці: завантажити вантаж
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = Відбудувати регіон
 keybind.schematic_select.name = Вибрати діл�нку
 keybind.schematic_menu.name = Меню �хем
 keybind.schematic_flip_x.name = Віддзеркалити за ві��ю X
@@ -859,10 +1322,11 @@ keybind.select.name = Вибір/По�тріл
 keybind.diagonal_placement.name = Діагональне розміщенн�
 keybind.pick.name = Вибрати блок
 keybind.break_block.name = Зламати блок
+keybind.select_all_units.name = Вибрати в�і одиниці
+keybind.select_all_unit_factories.name = Вибрати в�і заводи одиниць
 keybind.deselect.name = Ска�увати
 keybind.pickupCargo.name = Вз�ти вантаж
 keybind.dropCargo.name = Скинути вантаж
-keybind.command.name = Вз�ти командуванн� над одиниц�ми
 keybind.shoot.name = По�тріл
 keybind.zoom.name = �аблизити
 keybind.menu.name = Меню
@@ -871,6 +1335,7 @@ keybind.pause_building.name = Призупинити/продовжити буд
 keybind.minimap.name = Мінімапа
 keybind.planet_map.name = Планетна мапа
 keybind.research.name = До�лідженн�
+keybind.block_info.name = Інформаці� про блок
 keybind.chat.name = Чат
 keybind.player_list.name = Спи�ок гравців
 keybind.console.name = Кон�оль
@@ -880,6 +1345,7 @@ keybind.toggle_menus.name = Меню перемиканн�
 keybind.chat_history_prev.name = Попередн� і�торі� чату
 keybind.chat_history_next.name = �а�тупна і�торі� чату
 keybind.chat_scroll.name = Прокрутка чату
+keybind.chat_mode.name = Змінити режим чату
 keybind.drop_unit.name = Скинути бойову одиницю
 keybind.zoom_minimap.name = Збільшити мінімапу
 mode.help.title = Опи� режимів гри
@@ -888,51 +1354,107 @@ mode.survival.description = Звичайний режим. У цьому реж
 mode.sandbox.name = Пі�очниц�
 mode.sandbox.description = �е�кінченні ре�ур�и та хвилі йдуть за вашим бажанн�м.
 mode.editor.name = Редактор
-mode.pvp.name = PVP
+mode.pvp.name = ГПГ
 mode.pvp.description = Боріть�� проти інших гравців.\n[gray]Дл� гри потрібно принаймні 2 �дра різного кольору на мапі.
-mode.attack.name = �така
+mode.attack.name = �а�туп
 mode.attack.description = Зруйнуйте ворожу базу. \n[gray]Потрібно червоне �дро на мапі дл� гри.
 mode.custom = Кори�тувацькі правила
+rules.invaliddata = �едій�ні дані з клавіатури.
+rules.hidebannedblocks = Приховати заборонені блоки
+
 rules.infiniteresources = �е�кінченні ре�ур�и
+rules.onlydepositcore = Дозволити лише о�новне розміщенн� �дер
+rules.derelictrepair = Дозволити відновленн� блоків Переможених
 rules.reactorexplosions = Вибухи реактора
+rules.coreincinerates = Ядро �палює надлишкові предмети
+rules.disableworldprocessors = Вимкнути �вітові проце�ори
 rules.schematic = Викори�танн� �хем дозволено
 rules.wavetimer = Таймер дл� хвиль
+rules.wavesending = Ручне над�иланн� хвиль
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Хвилі
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Режим атаки
-rules.buildai = Будуванн� ШІ
+rules.buildai = Базовий ШІ-будівельник
+rules.buildaitier = Рівень ШІ-будівельника
+rules.rtsai = ШІ зі �тратегій реального ча�у
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = Мінімальний розмір загону
+rules.rtsmaxsquadsize = Мак�имальний розмір загону
+rules.rtsminattackweight = Мінімальна ударна вага
+rules.cleanupdeadteams = Очи�тити будівлі переможеної команди (ГПГ)
+rules.corecapture = Захопленн� �дра пі�л� знищенн�
+rules.polygoncoreprotection = Полігональний захи�т �дер
+rules.placerangecheck = Перевірка діапазону розміщенн�
 rules.enemyCheat = �е�кінченні ре�ур�и дл� червоної команди ШІ
 rules.blockhealthmultiplier = Множник здоров’� блоків
 rules.blockdamagemultiplier = Множник шкоди блоків
 rules.unitbuildspeedmultiplier = Множник швидко�ті виробництва бойових одиниць
+rules.unitcostmultiplier = Множник варто�ті одиниць
 rules.unithealthmultiplier = Множник здоров’� бойових одиниць
 rules.unitdamagemultiplier = Множник шкоди бойових одиниць
+rules.unitcrashdamagemultiplier = Множник шкоди одиниці при зіткненні одиниць
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = Множник �он�чної енергії
+rules.unitcapvariable = Ядра збільшують обмеженн� на кількі�ть одиниць
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitcap = Початкове обмеженн� одиниць
+rules.limitarea = Обмежити територію мапи
 rules.enemycorebuildradius = Радіу� оборони дл� ворожого �дра:[lightgray] (плитки)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Інтервал хвиль:[lightgray] (�екунди)
+rules.initialwavespacing = Початковий інтервал хвиль:[lightgray] (�екунди)
 rules.buildcostmultiplier = Множник затрат на будуванн�
 rules.buildspeedmultiplier = Множник швидко�ті будуванн�
 rules.deconstructrefundmultiplier = Множник відшкодуванн� в разі демонтажу
 rules.waitForWaveToEnd = Хвилі чекають на завершенн� попередньої
-rules.dropzoneradius = Радіу� зони ви�адки:[lightgray] (у плитках)
+rules.wavelimit = Мапа закінчуєть�� пі�л� хвилі
+rules.dropzoneradius = Радіу� зони ви�адки:[lightgray] (плитки)
 rules.unitammo = Бойові одиниці потребують боєприпа�ів
+rules.enemyteam = Ворожа команда
+rules.playerteam = Команда гравц�
 rules.title.waves = Хвилі
 rules.title.resourcesbuilding = Ре�ур�и й будуванн�
 rules.title.enemy = Противники
 rules.title.unit = Бойові одиниці
 rules.title.experimental = Ек�периментальне
 rules.title.environment = Середовище
+rules.title.teams = Команди
+rules.title.planet = Планета
 rules.lighting = Світлотінь
-rules.enemyLights = Ворожі вогні
+rules.fog = Туман війни
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Вогонь
+rules.anyenv = <Будь-�ка>
 rules.explosions = Шкода від вибухів блоків і одиниць
 rules.ambientlight = �авколишнє �вітло
 rules.weather = Погода
 rules.weather.frequency = Повторювані�ть:
+rules.weather.always = Завжди
 rules.weather.duration = Тривалі�ть:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
+
 content.item.name = Предмети
 content.liquid.name = Рідини
 content.unit.name = Бойові одиниці
 content.block.name = Блоки
-content.sector.name = Cектори
+content.status.name = Ефекти �тану
+content.sector.name = Сектори
+content.team.name = Фракції
+
+wallore = (Стіна)
+
 item.copper.name = Мідь
 item.lead.name = Свинець
 item.coal.name = Вугілл�
@@ -949,10 +1471,25 @@ item.blast-compound.name = Вибухова �уміш
 item.pyratite.name = Пиротит
 item.metaglass.name = Мета�кло
 item.scrap.name = Брухт
+item.fissile-matter.name = Розщеплюваний матеріал
+item.beryllium.name = Берилій
+item.tungsten.name = Вольфрам
+item.oxide.name = Ок�ид
+item.carbide.name = Карбід
+item.dormant-cyst.name = Спл�ча кі�та
+
 liquid.water.name = Вода
 liquid.slag.name = Шлак
 liquid.oil.name = �афта
 liquid.cryofluid.name = Кріогенна рідина
+liquid.neoplasm.name = �еоплазма
+liquid.arkycite.name = �ркицит
+liquid.gallium.name = Галій
+liquid.ozone.name = Озон
+liquid.hydrogen.name = Водень
+liquid.nitrogen.name = �зот
+liquid.cyanogen.name = Ціан
+
 unit.dagger.name = Кинджал
 unit.mace.name = Булава
 unit.fortress.name = Фортец�
@@ -964,7 +1501,7 @@ unit.atrax.name = �трак�
 unit.spiroct.name = Павучник
 unit.arkyid.name = �ркиїд
 unit.toxopid.name = Отруйник
-unit.flare.name = Фальшфейєр
+unit.flare.name = Спалах
 unit.horizon.name = Горизонт
 unit.zenith.name = Зеніт
 unit.antumbra.name = Тіньовик
@@ -979,20 +1516,49 @@ unit.minke.name = Смугач
 unit.bryde.name = Брайд
 unit.sei.name = Сейвал
 unit.omura.name = Омура
+unit.retusa.name = Ретуза
+unit.oxynoe.name = Ок�ино�
+unit.cyerce.name = Сає�
+unit.aegires.name = Еґіре�
+unit.navanax.name = �аванак�
 unit.alpha.name = �льфа
 unit.beta.name = Бета
 unit.gamma.name = Гамма
-unit.scepter.name = Верховна влада
+unit.scepter.name = Скіпетр
 unit.reign.name = Верховний Пор�док
 unit.vela.name = Пуль�ар Вітрил
-unit.corvus.name = Ворон
-block.resupply-point.name = Пункт по�тачанн�
+unit.corvus.name = �ава
+
+unit.stell.name = Стел
+unit.locus.name = Локу�
+unit.precept.name = Повчальник
+unit.vanquish.name = Переможець
+unit.conquer.name = Завойовник
+unit.merui.name = Меруй
+unit.cleroi.name = Клерой
+unit.anthicus.name = �нтіку�
+unit.tecta.name = Текта
+unit.collaris.name = Коларі�
+unit.elude.name = Ухил�ч
+unit.avert.name = Запобігач
+unit.obviate.name = Уникач
+unit.quell.name = Придушувач
+unit.disrupt.name = Розривник
+unit.evoke.name = Провокатор
+unit.incite.name = Підбурювач
+unit.emanate.name = Випромінювач
+unit.manifold.name = Колектор
+unit.assembly-drone.name = Монтажний дрон
+unit.latum.name = Латум
+unit.renale.name = Реналь
+
 block.parallax.name = Паралак�
 block.cliff.name = Скел�
-block.sand-boulder.name = Пі�очний валун
-block.basalt-boulder.name = Базальтовий валун
+block.sand-boulder.name = Пі�очна брила
+block.basalt-boulder.name = Базальтова брила
 block.grass.name = Трава
-block.slag.name = Шлак
+block.molten-slag.name = Шлак
+block.pooled-cryofluid.name = Кріогенна рідина
 block.space.name = Ко�мо�
 block.salt.name = Сіль
 block.salt-wall.name = Сол�на �тіна
@@ -1005,7 +1571,7 @@ block.boulder.name = Брила
 block.snow-boulder.name = Снігова брила
 block.snow-pine.name = Сніжні �о�ни
 block.shale.name = Сланець
-block.shale-boulder.name = Сланцевий валун
+block.shale-boulder.name = Сланцева брила
 block.moss.name = Мох
 block.shrubs.name = Кущі
 block.spore-moss.name = Споровий мох
@@ -1020,26 +1586,30 @@ block.graphite-press.name = Графітний пре�
 block.multi-press.name = Мультипре�
 block.constructing = {0}\n[lightgray](У проце�і)
 block.spawn.name = Мі�це по�ви противника
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Ядро «Уламок»
 block.core-foundation.name = Ядро «Штаб»
 block.core-nucleus.name = Ядро «�том»
-block.deepwater.name = Глибоководд�
-block.water.name = Вода
+block.deep-water.name = Глибоководд�
+block.shallow-water.name = Вода
 block.tainted-water.name = Забруднена вода
+block.deep-tainted-water.name = Забруднене глибоководд�
 block.darksand-tainted-water.name = Темний пі�ок із забрудненою водою
 block.tar.name = Дьоготь
 block.stone.name = Камінь
-block.sand.name = Пі�ок
+block.sand-floor.name = Пі�ок
 block.darksand.name = Темний пі�ок
 block.ice.name = Лід
 block.snow.name = Сніг
-block.craters.name = Кратери
+block.crater-stone.name = Кратери
 block.sand-water.name = Пі�ок із водою
 block.darksand-water.name = Темний пі�ок із водою
 block.char.name = Випалена земл�
 block.dacite.name = Дацит
+block.rhyolite.name = Риоліт
 block.dacite-wall.name = Дацитова �тіна
-block.dacite-boulder.name = Дацитовий валун
+block.dacite-boulder.name = Дацитова брила
 block.ice-snow.name = Крижаний �ніг
 block.stone-wall.name = Кам’�на �тіна
 block.ice-wall.name = Крижана �тіна
@@ -1052,11 +1622,12 @@ block.mud.name = Багно
 block.white-tree-dead.name = Мертве біле дерево
 block.white-tree.name = Біле дерево
 block.spore-cluster.name = Скупченн� �пор
-block.metal-floor.name = Металева підлога 1
-block.metal-floor-2.name = Металева підлога 2
-block.metal-floor-3.name = Металева підлога 3
-block.metal-floor-5.name = Металева підлога 4
-block.metal-floor-damaged.name = Пошкоджена металева підлога
+block.metal-floor.name = Металева поверхн� 1
+block.metal-floor-2.name = Металева поверхн� 2
+block.metal-floor-3.name = Металева поверхн� 3
+block.metal-floor-4.name = Металева поверхн� 4
+block.metal-floor-5.name = Металева поверхн� 5
+block.metal-floor-damaged.name = Пошкоджена металева поверхн�
 block.dark-panel-1.name = Темна панель 1
 block.dark-panel-2.name = Темна панель 2
 block.dark-panel-3.name = Темна панель 3
@@ -1092,8 +1663,11 @@ block.junction.name = Перехре�т�
 block.router.name = Маршрутизатор
 block.distributor.name = Розподілювач
 block.sorter.name = Сортувальник
-block.inverted-sorter.name = Зворотній �ортувальник
+block.inverted-sorter.name = Зворотний �ортувальник
 block.message.name = Повідомленн�
+block.reinforced-message.name = По�илене повідомленн�
+block.world-message.name = Світове повідомленн�
+block.world-switch.name = World Switch
 block.illuminator.name = О�вітлювач
 block.overflow-gate.name = �адмірний затвор
 block.underflow-gate.name = �едо�татній затвор
@@ -1119,7 +1693,7 @@ block.impact-reactor.name = Імпуль�ний реактор
 block.mechanical-drill.name = Механічний бур
 block.pneumatic-drill.name = Пневматичний бур
 block.laser-drill.name = Лазерний бур
-block.water-extractor.name = Конден�атор води
+block.water-extractor.name = Ек�трактор води
 block.cultivator.name = Культиватор
 block.conduit.name = Трубопровід
 block.mechanical-pump.name = Механічна помпа
@@ -1145,20 +1719,22 @@ block.solar-panel.name = Сон�чна панель
 block.solar-panel-large.name = Велика �он�чна панель
 block.oil-extractor.name = Ек�трактор нафти
 block.repair-point.name = Ремонтний пункт
+block.repair-turret.name = Ремонтна башта
 block.pulse-conduit.name = Імпуль�ний трубопровід
 block.plated-conduit.name = Зміцнений трубопровід
 block.phase-conduit.name = Фазовий трубопровід
 block.liquid-router.name = Рідинний маршрутизатор
 block.liquid-tank.name = Рідинний резервуар
+block.liquid-container.name = Рідинний контейнер
 block.liquid-junction.name = Рідинне перехре�т�
 block.bridge-conduit.name = Мо�товий трубопровід
-block.rotary-pump.name = Роторний на�о�
+block.rotary-pump.name = Роторна помпа
 block.thorium-reactor.name = Торієвий реактор
 block.mass-driver.name = Електромагнітна катапульта
 block.blast-drill.name = Бурова у�тановка
-block.thermal-pump.name = Тепловий на�о�
+block.impulse-pump.name = Теплова помпа
 block.thermal-generator.name = Теплогенератор
-block.alloy-smelter.name = Сплавовий завод
+block.surge-smelter.name = Сплавовий завод
 block.mender.name = Ремонтник
 block.mend-projector.name = Великий ремонтник
 block.surge-wall.name = Кінетична �тіна
@@ -1175,9 +1751,9 @@ block.meltdown.name = Розплавлювач
 block.foreshadow.name = Передві�ник
 block.container.name = Сховище
 block.launch-pad.name = Пу�ковий майданчик
-block.launch-pad-large.name = Великий пу�ковий майданчик
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = Сегмент
-block.command-center.name = Командний центр
 block.ground-factory.name = �аземний завод
 block.air-factory.name = Повітр�ний завод
 block.naval-factory.name = Мор�ький завод
@@ -1187,13 +1763,182 @@ block.exponential-reconstructor.name = Ек�поненційний рекон�
 block.tetrative-reconstructor.name = Тетративний рекон�труктор
 block.payload-conveyor.name = Вантажний конвеєр
 block.payload-router.name = Розвантажувальний маршрутизатор
+block.duct.name = Канал
+block.duct-router.name = Канальний маршрутизатор
+block.duct-bridge.name = Канальний мі�т
+block.large-payload-mass-driver.name = Велика вантажна катапульта
+block.payload-void.name = Вантажний вакуум
+block.payload-source.name = Вантажне джерело
 block.disassembler.name = Розбирач
 block.silicon-crucible.name = Кремнієвий тигель
 block.overdrive-dome.name = Великий при�корювач
-block.block-forge.name = Блок-кузн�
-block.block-loader.name = Блок-завантажувач
-block.block-unloader.name = Блок-вивантажувач
 block.interplanetary-accelerator.name = Міжпланетний при�корювач
+block.constructor.name = Кон�труктор
+block.constructor.description = �нглій�ька назва: Constructor\nЗбирає �поруди. До�тупні розміри дл� збиранн�: 1x1, 2x2.
+block.large-constructor.name = Великий кон�труктор
+block.large-constructor.description = �нглій�ька назва: Large Constructor\nЗбирає �поруди. До�тупні розміри дл� збиранн�: 1x1, 2x2, 3x3 та 4x4.
+block.deconstructor.name = Декон�труктор
+block.deconstructor.description = �нглій�ька назва: Deconstructor\nДекон�труює �поруди та одиниці. Повертає 100% варто�ті збірки.
+block.payload-loader.name = Вантажний завантажувач
+block.payload-loader.description = �нглій�ька назва: Payload Loader\nЗавантажує рідини та предмети в блоки.
+block.payload-unloader.name = Вантажний розвантажувач
+block.payload-unloader.description = �нглій�ька назва: Payload Unloader\nРозвантажує рідини та предмети з блоків.
+block.heat-source.name = Джерело тепла
+block.heat-source.description = �нглій�ька назва: Heat Source\nБлок, що не�кінченно виробл�є тепло.
+
+#Erekir
+block.empty.name = Порожнеча
+block.rhyolite-crater.name = Кратер ліпариту
+block.rough-rhyolite.name = Грубий ліпарит
+block.regolith.name = Реголіт
+block.yellow-stone.name = Жовтий камінь
+block.carbon-stone.name = Вуглецевий камінь
+block.ferric-stone.name = Залізний камінь
+block.ferric-craters.name = Залізні кратери
+block.beryllic-stone.name = Берилієвий камінь
+block.crystalline-stone.name = Кри�тальний камінь
+block.crystal-floor.name = Кри�тальна поверхн�
+block.yellow-stone-plates.name = Жовті кам’�ні плити
+block.red-stone.name = Червоний камінь
+block.dense-red-stone.name = Щільний червоний камінь
+block.red-ice.name = Червоний лід
+block.arkycite-floor.name = �ркицитова поверхн�
+block.arkyic-stone.name = �ркицитовий камінь
+block.rhyolite-vent.name = Ліпаритове джерело
+block.carbon-vent.name = Вуглецеве джерело
+block.arkyic-vent.name = �ркицитове джерело
+block.yellow-stone-vent.name = Жовте кам’�не джерело
+block.red-stone-vent.name = Червоне кам’�не джерело
+block.crystalline-vent.name = Кри�талічне джерело
+block.redmat.name = Редмат
+block.bluemat.name = Блюмат
+block.core-zone.name = Зона �дра
+block.regolith-wall.name = Реголітова �тіна
+block.yellow-stone-wall.name = Жовта кам’�на �тіна
+block.rhyolite-wall.name = Ліпаритова �тіна
+block.carbon-wall.name = Вуглецева �тіна
+block.ferric-stone-wall.name = Залізно-кам’�на �тіна
+block.beryllic-stone-wall.name = Берилієва кам’�на �тіна
+block.arkyic-wall.name = �ркицитова �тіна
+block.crystalline-stone-wall.name = Кри�талічна кам’�на �тіна
+block.red-ice-wall.name = Червона льодова �тіна
+block.red-stone-wall.name = Червона кам’�на �тіна
+block.red-diamond-wall.name = Червона діамантова �тіна
+block.redweed.name = Червоний бур’�н
+block.pur-bush.name = Мор�ький кущ
+block.yellowcoral.name = Жовтий корал
+block.carbon-boulder.name = Вуглецева брила
+block.ferric-boulder.name = Залізна брила
+block.beryllic-boulder.name = Берилієва брила
+block.yellow-stone-boulder.name = Жовта кам’�на брила
+block.arkyic-boulder.name = �ркицитова брила
+block.crystal-cluster.name = Кришталевий кла�тер
+block.vibrant-crystal-cluster.name = Я�кравий кришталевий кла�тер
+block.crystal-blocks.name = Кришталеві блоки
+block.crystal-orbs.name = Кришталеві �фери
+block.crystalline-boulder.name = Кри�талічна брила
+block.red-ice-boulder.name = Червона льод�на брила
+block.rhyolite-boulder.name = Ліпаритовий брила
+block.red-stone-boulder.name = Червона кам’�на брила
+block.graphitic-wall.name = Графітна �тіна
+block.silicon-arc-furnace.name = Кремнієва дугова піч
+block.electrolyzer.name = Електролізер
+block.atmospheric-concentrator.name = �тмо�ферний концентратор
+block.oxidation-chamber.name = Оки�лювальна камера
+block.electric-heater.name = Електричний нагрівач
+block.slag-heater.name = Шлаковий нагрівач
+block.phase-heater.name = Фазовий нагрівач
+block.heat-redirector.name = Перенаправл�ч тепла
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = Тепловий маршрутизатор
+block.slag-incinerator.name = Шлаковий �міттє�палювальний завод
+block.carbide-crucible.name = Карбідний тигель
+block.slag-centrifuge.name = Шлакова центрифуга
+block.surge-crucible.name = Кінетичний тигель
+block.cyanogen-synthesizer.name = Ціановий �интезатор
+block.phase-synthesizer.name = Фазовий �интезатор
+block.heat-reactor.name = Тепловий реактор
+block.beryllium-wall.name = Берилієва �тіна
+block.beryllium-wall-large.name = Велика берилієва �тіна
+block.tungsten-wall.name = Вольфрамова �тіна
+block.tungsten-wall-large.name = Велика вольфрамова �тіна
+block.blast-door.name = По�илені двері
+block.carbide-wall.name = Карбідна �тіна
+block.carbide-wall-large.name = Велика карбідна �тіна
+block.reinforced-surge-wall.name = По�илена кінетична �тіна
+block.reinforced-surge-wall-large.name = Велика по�илена кінетична �тіна
+block.shielded-wall.name = Щитова �тіна
+block.radar.name = Радар
+block.build-tower.name = Будівельна вежа
+block.regen-projector.name = Відновлювальний проєктор
+block.shockwave-tower.name = Башта ударної хвилі
+block.shield-projector.name = Щитовий проєктор
+block.large-shield-projector.name = Великий щитовий проєктор
+block.armored-duct.name = Броньований канал
+block.overflow-duct.name = �адмірний канальний затвор
+block.underflow-duct.name = �едо�татній канальний затвор
+block.duct-unloader.name = Канальний розвантажувач
+block.surge-conveyor.name = Кінетичний конвеєр
+block.surge-router.name = Кінетичний маршрутизатор
+block.unit-cargo-loader.name = Завантажувальна точка дл� одиниць
+block.unit-cargo-unload-point.name = Розвантажувальна точка дл� одиниць
+block.reinforced-pump.name = По�илена помпа
+block.reinforced-conduit.name = По�илений трубопровід
+block.reinforced-liquid-junction.name = По�илене рідинне перехре�т�
+block.reinforced-bridge-conduit.name = По�илений мо�товий трубопровід
+block.reinforced-liquid-router.name = По�илений рідинний маршрутизатор
+block.reinforced-liquid-container.name = По�илений рідинний контейнер
+block.reinforced-liquid-tank.name = По�илений рідинний резервуар
+block.beam-node.name = Променевий вузол
+block.beam-tower.name = Променева вежа
+block.beam-link.name = Променевий з’єднувач
+block.turbine-condenser.name = Турбінний конден�атор
+block.chemical-combustion-chamber.name = Камера хімічного згор�нн�
+block.pyrolysis-generator.name = Пиролізовий генератор
+block.vent-condenser.name = Джерельний конден�атор
+block.cliff-crusher.name = Дробарка �кель
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = Плазмовий бурильник
+block.large-plasma-bore.name = Великий плазмовий бурильник
+block.impact-drill.name = Імпуль�ний бур
+block.eruption-drill.name = Вивергальний бур
+block.core-bastion.name = Ядро «Ба�тіон»
+block.core-citadel.name = Ядро «Цитадель»
+block.core-acropolis.name = Ядро «�крополь»
+block.reinforced-container.name = По�илене �ховище
+block.reinforced-vault.name = По�илений �клад
+block.breach.name = Прорив
+block.sublimate.name = Сублімаці�
+block.titan.name = Титан
+block.disperse.name = Розпорошувач
+block.afflict.name = Уражач
+block.lustre.name = Бли�к
+block.scathe.name = Знищувач
+block.tank-refabricator.name = Танковий перебудовний завод
+block.mech-refabricator.name = Меховий перебудовний завод
+block.ship-refabricator.name = Корабельний перебудовний завод
+block.tank-assembler.name = Танковий збирач
+block.ship-assembler.name = Корабельний збирач
+block.mech-assembler.name = Меховий збирач
+block.reinforced-payload-conveyor.name = По�илений вантажний конвеєр
+block.reinforced-payload-router.name = По�илений вантажний маршрутизатор
+block.payload-mass-driver.name = Вантажна катапульта
+block.small-deconstructor.name = Малий декон�труктор
+block.canvas.name = Полотно
+block.world-processor.name = Світовий проце�ор
+block.world-cell.name = Світова комірка пам’�ті
+block.tank-fabricator.name = Танкобудівний завод
+block.mech-fabricator.name = Мехобудівний завод
+block.ship-fabricator.name = Кораблебудівний завод
+block.prime-refabricator.name = Головний переробник
+block.unit-repair-tower.name = Відновлювальна вежа
+block.diffuse.name = Дифузатор
+block.basic-assembler-module.name = Базовий збиральний модуль
+block.smite.name = Занапащач
+block.malign.name = Згубник
+block.flux-reactor.name = Потоковий реактор
+block.neoplasia-reactor.name = �еоплазмовий реактор
+
 block.switch.name = Перемикач
 block.micro-processor.name = Мікропроце�ор
 block.logic-processor.name = Логічний проце�ор
@@ -1202,251 +1947,730 @@ 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 = Помаранчева
-team.orange.name = Помаранчева
-team.derelict.name = Знедолена
-team.green.name = Зелена
-team.purple.name = Фіолетова
+
+team.malis.name = Малізи
+team.crux.name = Загарбники
+team.sharded.name = Розколоті
+team.derelict.name = Переможені
+team.green.name = Зелені
+team.blue.name = Сині
+
 hint.skip = Пропу�тити
 hint.desktopMove = Викори�товуйте [accent][[WASD][], щоби рухати��.
 hint.zoom = [accent]Прокручуйте коліщатком миші[], щоби збільшити чи зменшити ма�штаб мапи.
-hint.mine = �аблизьте�ь до  мідної руди і [accent]торкніть��[] її, щоби видобувати вручну.
 hint.desktopShoot = [accent][[ЛКМ][] дл� �трільби.
 hint.depositItems = Дл� передачі предметів про�то перет�гніть із корабл� в �дро.
 hint.respawn = Дл� відродженн� кораблем нати�ніть [accent][[V][].
 hint.respawn.mobile = Ви контролюєте одиницю чи �труктуру. Щоби відродити�� �к корабель, [accent]торкніть�� �вого аватара вгорі ліворуч.[]
 hint.desktopPause = �ати�ніть [accent][[Пробіл][], щоби зупинити чи продовжити гру.
-hint.placeDrill = Виберіть у меню внизу праворуч вкладку  [accent]Бур[], потім виберіть  [accent]Механічний бур[] та нати�ніть на мідний клаптик дл� його розміщенн�.
-hint.placeDrill.mobile = Виберіть у меню внизу праворуч вкладку  [accent]Бур[], потім виберіть  [accent]Механічний бур[] та нати�ніть на мідний клаптик дл� його розміщенн�.\n\n�ати�ніть внизу праворуч  [accent]галку[] дл� підтвердженн�.
-hint.placeConveyor = Конвеєри переміщують предмети з бурів до інших блоків. Виберіть  [accent]конвеєр[] з вкладки  [accent]Тран�портуванн�[].\n\n�ати�ніть і т�гніть, щоби розмі�тити декілька конвеєрів.\n[accent]Прокручуйте коліщатком миші[], щоб обертати їх.
-hint.placeConveyor.mobile = Конвеєри переміщують предмети з бурів до інших блоків. Виберіть  [accent]конвеєр[] з вкладки  [accent]Тран�портуванн�[].\n\nУтримуйте палець прот�гом �екунди і прот�гніть, щоби розмі�тити декілька конвеєрів.
-hint.placeTurret = Розмі�тіть  [accent]башти[], щоби захи�тити базу від ворогів.\n\nБашти потребують боєприпа�ів. У цьому випадку \uf838мідь.\nДл� її подачі викори�товуйте конвеєри та бури.
-hhint.breaking = �ати�ніть [accent]ПКМ[] і т�гніть, щоби зруйнувати блоки.
-hint.breaking.mobile = �ктивуйте  [accent]молот[] внизу праворуч і торкніть�� блоків, щоби їх розібрати.\n\nУтримуйте палець прот�гом �екунди і прот�гніть, щоби розібрати виділене.
-hint.research = Викори�товуйте кнопку  [accent]До�лідженн�[] дл� до�лідженн� нової технології.
-hint.research.mobile = Викори�товуйте  [accent]До�лідженн�[] в  [accent]меню[] дл� до�лідженн� нової технології.
+hint.breaking = �ати�ніть [accent]ПКМ[] і т�гніть, щоби зруйнувати блоки.
+hint.breaking.mobile = �ктивуйте \ue817 [accent]молот[] внизу праворуч і зробіть швидке нати�канн� блоків, щоби їх розібрати.\n\nУтримуйте палець прот�гом �екунди й прот�гніть, щоби розібрати виділене.
+hint.blockInfo = Подивіть�� інформацію про блок. Перейдіть до [accent]меню будівництва[] і нати�ніть на кнопку [accent][[?][] праворуч.
+hint.derelict = Будівлі [accent]Переможених[] є зламаними залишками �тарих баз, що більше не функціонують.\n\nЇх можна [accent]розібрати[] дл� отриманн� ре�ур�ів або відбудувати.
+hint.research = Викори�товуйте кнопку \ue875 [accent]До�лідженн�[] дл� до�лідженн� нової технології.
+hint.research.mobile = Викори�товуйте \ue875 [accent]До�лідженн�[] в \ue88c [accent]меню[] дл� до�лідженн� нової технології.
 hint.unitControl = Утримуйте [accent][[лівий Ctrl][] і [accent]нати�ніть[] на одиницю чи башту, щоби контролювати її.
-hint.unitControl.mobile = [accent][Торкніть�� двічі[], щоби контролювати �оюзні одиниці чи башти.
-hint.launch = Як тільки буде зібрано до�татньо ре�ур�ів, ви зможете зробити [accent]Запу�к[] за допомогою вибору найближчих �екторів  [accent]мапи[] внизу праворуч.
-hint.launch.mobile = Як тільки буде зібрано до�татньо ре�ур�ів, ви зможете зробити [accent]Запу�к[] за допомогою вибору найближчих �екторів з  [accent]мапи[] у  [accent]меню[].
+hint.unitControl.mobile = [accent][Зробіть коротке нати�канн� двічі[], щоби контролювати �оюзні одиниці чи башти.
+hint.unitSelectControl = Дл� керуванн� одиниц�ми увійдіть в [accent]режим командуванн�[], утримуючи [accent]лівий Shift[].\nПеребуваючи в командному режимі, нати�ніть і прот�гуйте дл� вибору одиниць. �ати�ніть [accent]ПКМ[] на позицію або ціль, щоби віддати наказ одиниц�м, �кі там знаход�ть��.
+hint.unitSelectControl.mobile = Дл� керуванн� одиниц�ми увійдіть в [accent]режим командуванн�[], нати�нувши кнопку [accent]командувати[] ліворуч знизу.\nПеребуваючи в командному режимі, зробіть довгий нати�к і прот�гуйте дл� вибору одиниць. Торкніть�� позиції або цілі, щоби віддати наказ одиниц�м, �кі там знаход�ть��.
+hint.launch = Як тільки буде зібрано до�татньо ре�ур�ів, ви зможете зробити [accent]Запу�к[] до на�тупних �екторів \ue827 [accent]мапи[] внизу праворуч і перейти на нову локацію..
+hint.launch.mobile = Як тільки буде зібрано до�татньо ре�ур�ів, ви зможете зробити [accent]Запу�к[] за допомогою вибору найближчих �екторів з \ue827 [accent]мапи[] у \ue88c [accent]меню[].
 hint.schematicSelect = Утримуйте [accent][[F][] і т�гніть, щоби вибрати блоки дл� їхнього подальшого копіюванн� і в�тавленн�.\n\n�ати�ніть [accent][[СКМ][], щоби �копіювати певний тип блоку.
-hint.conveyorPathfind = Утримуйте [accent][[лівий Ctrl][], коли т�гнете конвеєри, щоб автоматично прокла�ти шл�х.
-hint.conveyorPathfind.mobile = Увімкніть  [accent]діагональний режим[] і т�гніть конвеєри, щоб автоматично прокла�ти шл�х.
-hint.boost = Утримуйте [accent][[лівий Shift][], щоби літати над перешкодами поточною одиницею.\n\nЛише декілька наземних одиниць мають цю перевагу.
-hint.command = �ати�ніть [accent][[G][], щоб уз�ти командуванн� над найближчими одиниц�ми [accent]�хожого типу[] і �формувати загін.\n\nЩоб командувати наземними одиниц�ми, ви му�ите �першу вз�ти контроль над іншою наземною одиницею.
-hint.command.mobile = [accent][[Торкніть�� двічі][] �воєї одиниці, щоб уз�ти командуванн� над найближчими �оюзними одиниц�ми і �формувати загін.
-hint.payloadPickup = �ати�ніть [accent][[[], щоби підібрати невеличкі блоки чи одиниці.
-hint.payloadPickup.mobile = [accent]Торкніть�� й утримуйте[] невеличкий блок чи одиницю, щоби підібрати їх.
-hint.payloadDrop = �ати�ніть [accent]][], щоби вивантажити вантаж.
-hint.payloadDrop.mobile = [accent]Торкніть��[] вільного мі�ц� й [accent]утримуйте[], щоби вивантажити туди вантаж.
-hint.waveFire = Башта [accent]Хвил�[] з водою буде автоматично га�ити найближчі пожежі.
-hint.generator =  [accent]Генератори внутрішнього згоранн�[] �палюють вугілл� і передають енергію прилеглим блокам.\n\nРадіу� передачі енергії можна збільшити за допомогою  [accent]�илових вузлів[].
-hint.guardian = [accent]Вартові[] одиниці броньовані. Слабкі боєприпа�и, �к-от [accent]мідь[] чи [accent]�винець[], [scarlet]не є ефективними[].\n\nВикори�товуйте башти вищого рангу чи  [accent]графітові боєприпа�и[] дл� Подвійної башти чиЗалпу, щоб убити Вартових.
-hint.coreUpgrade = Ядро можна покращити, �кщо [accent]розмі�тити поверх нього �дро вищого рівн�[].\n\nРозмі�тіть  �дро [accent]«Штаб»[] поверх  �дра [accent]«Уламок»[]. Переконайте�ь, що поблизу �дер немає перешкод (зайвих блоків).
-hint.presetLaunch = Сірі [accent]�ектори зони по�адки[], �к-от [accent]Крижаний лі�[], можна запу�тити з будь-�кого мі�ц�. Вони не вимагають захопленн� �у�ідньої території.\n\n[accent]�умеровані �ектори[], �к цей, [accent]необовʼ�зкові[].
-hint.coreIncinerate = Пі�л� того, �к �дро наповнить�� предметом, будь-�кі додаткові предмети того ж типу, �кі воно отримує, будуть [accent]�палені[].
+hint.rebuildSelect = Утримуючи [accent][[B][], прот�гніть, щоби вибрати зруйновані проєкти блоків.\nЦе призведе до їхньої автоматичної перебудови.
+hint.rebuildSelect.mobile = �ати�ніть кнопку \ue874 копіюванн�, потім нати�ніть кнопку \ue80f перебудови і перет�гніть, щоби вибрати знищені проєкти блоків.\nЦе призведе до їхньої автоматичної перебудови.
 
-item.copper.description = Викори�товуєть�� у в�іх типах блоків і боєприпа�ах.
+hint.conveyorPathfind = Утримуйте [accent][[лівий Ctrl][], коли т�гнете конвеєри, щоб автоматично прокла�ти шл�х.
+hint.conveyorPathfind.mobile = Увімкніть \ue844 [accent]діагональний режим[] і т�гніть конвеєри, щоб автоматично прокла�ти шл�х.
+hint.boost = Утримуйте [accent][[лівий Shift][], щоби літати над перешкодами поточною одиницею.\n\nЛише декілька наземних одиниць мають цю перевагу.
+hint.payloadPickup = �ати�ніть [accent][[[], щоби підібрати невеличкі блоки чи одиниці.
+hint.payloadPickup.mobile = [accent]�ати�ніть й утримуйте[] невеличкий блок чи одиницю, щоби підібрати їх.
+hint.payloadDrop = �ати�ніть [accent]][], щоби вивантажити вантаж.
+hint.payloadDrop.mobile = [accent]�ати�ніть[] на вільне мі�це й [accent]утримуйте[], щоби вивантажити туди вантаж.
+hint.waveFire = Башта [accent]хвил�[] з водою буде автоматично га�ити найближчі пожежі.
+hint.generator = \uf879 [accent]Генератори внутрішнього згоранн�[] �палюють вугілл� і передають енергію прилеглим блокам.\n\nРадіу� передачі енергії можна збільшити за допомогою \uf87f [accent]�илових вузлів[].
+hint.guardian = [accent]Вартові[] одиниці броньовані. Слабкі боєприпа�и, �к-от [accent]мідь[] чи [accent]�винець[], [scarlet]не є ефективними[].\n\nВикори�товуйте башти вищого рангу чи \uf835 [accent]графітові боєприпа�и[] дл� Подвійної башти чи\uf859Залпу, щоб убити Вартових.
+hint.coreUpgrade = Ядро можна покращити, �кщо [accent]розмі�тити поверх нього �дро вищого рівн�[].\n\nРозмі�тіть \uf868 �дро [accent]«Штаб»[] поверх \uf869 �дра [accent]«Уламок»[]. Переконайте�ь, що поблизу �дер немає перешкод (зайвих блоків).
+hint.presetLaunch = Сірі [accent]�ектори зони по�адки[], �к-от [accent]Крижаний лі�[], можна запу�тити з будь-�кого мі�ц�. Вони не вимагають захопленн� �у�ідньої території.\n\n[accent]�умеровані �ектори[], �к цей, [accent]необов’�зкові[].
+hint.presetDifficulty = Цей �ектор має [scarlet]ви�окий рівень ворожої загрози[].\nРобити запу�к в такі [accent]не рекомендуєть��[] без належних технологій та підготовки.
+hint.coreIncinerate = Пі�л� того, �к �дро наповнить�� предметом, будь-�кі додаткові предмети того ж типу, �кі воно отримує, будуть [accent]�палені[].
+hint.factoryControl = Щоб у�тановити [accent]мі�це виводу[] заводу одиниць, клацніть на неї у режимі командуванн�, потім клацніть ПКМ на мі�це призначенн�. \nВироблені нею одиниці автоматично перемі�т�ть�� туди.
+hint.factoryControl.mobile = Щоб у�тановити [accent]мі�це виводу[] заводу одиниць, швидко нати�ніть на неї у режимі командуванн�, потім зробіть коротке нати�канн� на мі�це призначенн�. \nВироблені нею одиниці автоматично перемі�т�ть�� туди.
+
+gz.mine = �аблизьте�� до \uf8c4 [accent]мідної руди[] і почніть видобувати її.
+gz.mine.mobile = �аблизьте�� до \uf8c4 [accent]мідної руди[] і торкніть�� її, щоби почати видобуток.
+gz.research = Відкрийте \ue875 дерево технологій.\nДо�лідіть \uf870 [accent]механічний бур[], потім виберіть його з правого нижнього меню.\n�ати�ніть на мідний клаптик, щоби почати видобуток.
+gz.research.mobile = Відкрийте \ue875 дерево технологій.\nДо�лідіть \uf870 [accent]механічний бур[], потім виберіть його з правого нижнього меню.\nТоркніть�� до мідного клаптика, щоби розмі�тити його.\n\n�ати�ніть на\ue800 [accent]галочку[] праворуч внизу дл� підтвердженн�.
+gz.conveyors = До�лідіть і розташуйте\uf896 [accent]конвеєри[], щоби переміщувати видобуті ре�ур�и\nвід бурів до �дра.\n\n�ати�ніть і прот�гніть дл� розміщенн� кількох конвеєрів.\n[accent]Прокручуйте[] дл� обертанн�.
+gz.conveyors.mobile = До�лідіть і розташуйте \uf896 [accent]конвеєри[], щоби переміщувати видобуті ре�ур�и\nвід бурів до �дра.\n\nУтримуйте �вій палець близько �екунди прот�гніть його дл� розміщенн� кількох конвеєрів.
+gz.drills = �аро�тіть видобуток кори�них копалин.\nРозмі�тіть більше механічних бурів.\nВидобудьте 100 міді.
+gz.lead = \uf837 [accent]Свинець[] є ще одним ча�то викори�товуваним ре�ур�ом.\nУ�тановіть бури, щоби розпочати видобуток.
+gz.moveup = \ue804 Рухайте�� вперед до подальших цілей.
+gz.turrets = До�лідіть і розмі�тіть 2 \uf861 [accent]подвійні[] башти, щоби захи�тити �дро.\nПодвійні башти потребують \uf838 [accent]боєприпа�и[] з конвеєрів.
+gz.duoammo = Забезпечте подвійні башти [accent]міддю[], викори�товуючи конвеєри.
+gz.walls = [accent]Стіни[] можуть запобігти потрапл�нню зу�трічних пошкоджень на будівлі\nРозмі�тіть \uf8ae [accent]мідні �тіни[] навколо башт.
+gz.defend = Ворог на�тупає, приготуйте�� до оборони.
+gz.aa = Повітр�ні одиниці не можуть бути легко знищені зі �тандартними баштами.\n\uf860 Башта [accent]роз�іювач[] забезпечує відмінну протиповітр�ну оборону, але потребує \uf837 [accent]�винець[] �к боєприпа�.
+gz.scatterammo = Забезпечте башту роз�іювач \uf837 [accent]�винцем[], викори�товуючи конвеєр.
+gz.supplyturret = [accent]По�тачанн� до башти
+gz.zone1 = Це зона ви�адки ворога.
+gz.zone2 = У�е, що побудовано в цьому радіу�і, знищуєть��, коли починаєть�� хвил�.
+gz.zone3 = Зараз почнеть�� хвил�.\nПриготуйет��
+gz.finish = Збудуйте більше башт, видобудьте більше ре�ур�ів \nі захи�тіть�� проти в�іх хвиль, щоби [accent]захопити �ектор[].
+
+onset.mine = �ати�ніть, щоби видобути \uf748 [accent]берилій[]зі �тін.\n\nДл� переміщенн� викори�товуйте [accent][[WASD].
+onset.mine.mobile = Торкніть��, щоби видобути \uf748 [accent]берилій[]зі �тін.
+onset.research = Відкрийте \ue875 дерево технологій.\nДо�лідіть, а потім розмі�тіть \uf73e [accent]Турбінний конде�атор[] на джерелі (отворі).\nЦе буде генерувати [accent]енергію[].
+onset.bore = До�лідіть і розмі�тіть \uf741 [accent]плазмовий бурильник[].\nВін автоматично видобуває ре�ур�и зі �тін.
+onset.power = Дл� підключенн� [accent]енергії[] до плазмового бурильника, до�лідіть і розмі�тіть \uf73d [accent]променевий вузол[].\nПід’єднайте турбінний коден�атор до плазмового бурильника.
+onset.ducts = До�лідіть і розмі�тіть \uf799 [accent]канали[], щоби переміщувати видобуті ре�ур�и від плазмового бурильника до �дра.\n�ати�ніть і про�т�гніть, щоби розмі�тити декілька каналів.\n[accent]Прокрутіть[], щоб обернути.
+onset.ducts.mobile = До�лідіть і розмі�тіть \uf799 [accent]канали[], щоби переміщувати видобуті ре�ур�и від плазмового бурильника до �дра.\n\nУтримуйте �вій палець близько �екунди і про�т�гніть, щоби розмі�тити декілька каналів.
+onset.moremine = �аро�тіть видобуток кори�них копалин.\nРозмі�тіть більше плазмових бурильників і викори�тайте променеві вузли та канали дл� їхнього об�луговуванн�.\nВидобудьте 200 берилію.
+onset.graphite = Складніші блоки потребують \uf835 [accent]графіту[].\nУ�тановіть плазмові бурильники дл� видобуванн� графіту.
+onset.research2 = Почніть до�лідженн� [accent]заводів[].\nДо�лідіть \uf74d [accent]дробарку �кель[] і \uf779 [accent]кремнієву дугову піч[].
+onset.arcfurnace = Дугова піч потребує \uf834 [accent]пі�ок[] і \uf835 [accent]графіт[] задл� \uf82f [accent]кремнію[].\n[accent]Енергі�[] також потрібна.
+onset.crusher = Викори�тайте \uf74d [accent]дробарку �кель[], щоби видобути пі�ок.
+onset.fabricator = Викори�товуйте [accent]одиниць[] дл� до�лідженн�, захи�ту будівель та нападу на ворога. До�лідіть і розмі�тіть \uf6a2 [accent]танкобудівний завод[].
+onset.makeunit = Виробіть одиницю.\nВикори�тайте кнопку «?», щоби побачити вимоги дл� вибраного заводу.
+onset.turrets = Одиниці ефективні, але [accent]башти[] забезпечують ліпші оборонні можливо�ті, �кщо їх ефективно викори�товувати.\nУ�тановіть \uf6eb башту [accent]Прорив[].\nБашти вимагають \uf748 [accent]боєприпа�ів[].
+onset.turretammo = Забезпечте башту [accent]берилієвими боєприпа�ами[].
+onset.walls = [accent]Стіни[] cможе запобігти потрапл�нню зу�трічної шкоди на будівлі.\nРозмі�тіть декілька \uf6ee [accent]берилієвих �тін[] навколо башти.
+onset.enemies = Ворог на�тупає, готуйте�� до оборони.
+onset.defenses = [accent]Підготуйте захи�т:[lightgray] {0}
+onset.attack = Ворог беззахи�ний. Контратакуйте.
+onset.cores = �ові �дра можуть бути розміщені на плитках [accent]зони �дра[].\n�ові �дра функціонують �к передові бази й мають �пільний інвентар ре�ур�ів з іншими �драми.\nРозмі�тіть \uf725 �дро.
+onset.detect = Ворог зможе ви�вити ва� за 2 хвилини.\nОрганізуйте оборону, видобуток кори�них копалин та виробництво.
+
+#Don't translate these yet!
+onset.commandmode = Утримуйте [accent]Shift[], щоб увійти в [accent]режим командуванн�[].\n[accent]Зажміть ЛКМ і пот�гніть,[] щоб обрати одиниці.\n[accent]Викори�товуйте ПКМ[], щоби наказати обраним одиниц�м рухати�� чи атакувати.
+onset.commandmode.mobile = �ати�ніть кнопку [accent]Командувати[], щоб увійти [accent]в режим командуванн�[].\nУтримуйте палець і [accent]пот�гніть[], щоби вибрати одиниці.\n[accent] Зробіть коротке нати�канн�[], щоби наказати обраним одиниц�м рухати�� чи атакувати.
+aegis.tungsten = Вольфрам можна видобувати за допомогою [accent]імпуль�ного буру[].\nЦ� будівл� потребує [accent]води[] та [accent]енергію[].
+
+split.pickup = Де�кі блоки можуть бути підібрані о�новною �дровою одиницею.\nПідніміть цей [accent]контейнер[] і помі�тіть його до [accent]вантажного завантажувача[].\n(Клавіші за замовчуванн�м - [[ і ] дл� підн�тт� та �киданн�)
+split.pickup.mobile = Де�кі блоки можуть бути підібрані о�новною �дровою одиницею.\nПідніміть цей [accent]контейнер[] і помі�тіть його до [accent]вантажного завантажувача[].\n(Щоб підн�ти або �кинути що�ь, довго нати�кайте на це що�ь.)
+split.acquire = Ви повинні ді�тати трохи вольфраму, щоби побудувати одиниці.
+split.build = Одиниці повинні бути перене�ені на іншу �торону �тіни.\nУ�тановіть дві [accent]великі вантажні катапульти[], по одній на кожну �торону �тіни.\nУ�тановіть зв’�зок, нати�нувши на одну з них, а потім вибравши іншу.
+split.container = Подібно до контейнера, одиниці також можуть бути перевезені за допомогою [accent]великої вантажної катапульти[].\nРозмі�тіть завод, що �творює одиниці, поруч з вантажною катапультою, щоби завантажити одиниць, а потім відправити їх через �тіну в атаку на базу противника.
+
+item.copper.description = �нглій�ька назва: Copper\nВикори�товуєть�� у в�іх типах блоків і боєприпа�ах.
 item.copper.details = Мідь. �апрочуд багато жил цієї руди на Серпуло. За �воєю �труктурою �лабка, �кщо не зміцнена.
-item.lead.description = Широко викори�товуєть�� в електроніці та в тран�портуванні рідин.
-item.lead.details = Сплав. Інертний. Широко викори�товуєть�� в акумул�торах.\nПримітка. Мабуть, ток�ичний дл� біологічних форм житт�. �е те щоби тут залишило�� багато…
-item.metaglass.description = Викори�товуєть�� дл� розподілу чи зберіганн� рідини.
-item.graphite.description = Викори�товуєть�� дл� боєприпа�ів та електричних компонентів.
-item.sand.description = Викори�товуєть�� дл� виробництва інших удо�коналених матеріалів.
-item.coal.description = Викори�товуєть�� дл� виробництва палива і вдо�коналених матеріалів.
+item.lead.description = �нглій�ька назва: Lead\nШироко викори�товуєть�� в електроніці та в тран�портуванні рідин.
+item.lead.details = Інертний �плав, що широко викори�товуєть�� в акумул�торах.\nПримітка. Мабуть, ток�ичний дл� біологічних форм житт�. �е те щоби їх тут залишило�� багато…
+item.metaglass.description = �нглій�ька назва: Metaglass\nВикори�товуєть�� дл� розподілу чи зберіганн� рідини.
+item.graphite.description = �нглій�ька назва: Graphite\nВикори�товуєть�� дл� боєприпа�ів та електричних компонентів.
+item.sand.description = �нглій�ька назва: Sand\nВикори�товуєть�� дл� виробництва інших удо�коналених матеріалів.
+item.coal.description = �нглій�ька назва: Coal\nВикори�товуєть�� дл� виробництва палива і вдо�коналених матеріалів.
 item.coal.details = Вигл�дає �кам’�нілою ро�линною речовиною, утвореною задовго до Сівби.
-item.titanium.description = Викори�товуєть�� в тран�портуванні рідин, бурів та авіації.
-item.thorium.description = Викори�товуєть�� в міцних кон�трукці�х і �к �дерне паливо.
-item.scrap.description = Викори�товуєть�� в Плавильн�х і Подрібнювачах дл� переробленн� в інші матеріали в інші матеріали.
+item.titanium.description = �нглій�ька назва: Titanium\nВикори�товуєть�� в тран�портуванні будівель, бурів та в заводах.
+item.thorium.description = �нглій�ька назва: Thorium\nВикори�товуєть�� в міцних кон�трукці�х і �к �дерне паливо.
+item.scrap.description = �нглій�ька назва: Scrap\nВикори�товуєть�� в Плавильн�х і Подрібнювачах дл� переробленн� в інші матеріали.
 item.scrap.details = Залишки �тарих �поруд та підрозділів.
-item.silicon.description = Викори�товуєть�� в �он�чних панел�х, �кладній електроніці та боєприпа�ах �амонаведенн� дл� башт.
-item.plastanium.description = Викори�товуєть�� в передових одиниц�х та у фрагментованих боєприпа�ах.
-item.phase-fabric.description = Викори�товуєть�� в передовій електроніці й технології �амовідновленн�.
-item.surge-alloy.description = Викори�товуєть�� в передовій зброї та реактивних захи�них кон�трукці�х.
-item.spore-pod.description = Викори�товуєть�� дл� перетворенн� на нафту, вибухівку та паливо.
+item.silicon.description = �нглій�ька назва: Silicon\nВикори�товуєть�� в �он�чних панел�х, �кладній електроніці та боєприпа�ах �амонаведенн� дл� башт.
+item.plastanium.description = �нглій�ька назва: Plastanium\nВикори�товуєть�� в передових одиниц�х та у фрагментованих боєприпа�ах.
+item.phase-fabric.description = �нглій�ька назва: Phase Fabric\nВикори�товуєть�� в передовій електроніці й технології �амовідновленн�.
+item.surge-alloy.description = �нглій�ька назва: Surge Alloy\nВикори�товуєть�� в передовій зброї та реактивних захи�них кон�трукці�х.
+item.spore-pod.description = �нглій�ька назва: Spore Pod\nВикори�товуєть�� дл� перетворенн� на нафту, вибухівку та паливо.
 item.spore-pod.details = Спори. �айімовірніше, �интетична форма житт�. Виділ�ють гази, ток�ичні дл� іншого біологічного житт�. �адзвичайно загарбницька поведінка. Легкозайми�ті при певних умовах.
-item.blast-compound.description = Викори�товуєть�� в бомбах та в розривних боєприпа�ах.
-item.pyratite.description = Викори�товуєть�� в запальній зброї і твердопаливних генераторах.
-liquid.water.description = Викори�товуєть�� дл� охолодженн� машин та перероблюванн� відходів.
-liquid.slag.description = Переробл�єть�� у відокремлювачах у �кладові метали або розпорошуєть�� на ворогів �к збро�.
-liquid.oil.description = Викори�товуєть�� у виробництві передових матеріалів і �к запальні боєприпа�и.
-liquid.cryofluid.description = Викори�товуєть�� �к теплоно�ій у реакторах, баштах і заводах.
-block.resupply-point.description = Поповнює найближчі одиниці мідними боєприпа�ами. �е�умі�ний з одиниц�ми, що потребують зар�ду акумул�тора.
-block.armored-conveyor.description = Переміщує предмети вперед. �е приймає введенн� з боків ні з чого, крім інших конвеєрних �трічок.
-block.illuminator.description = Випромінює �вітло.
-block.message.description = Зберігає повідомленн� дл� комунікації між �оюзниками.
-block.graphite-press.description = Сти�кає вугілл� в графіт.
-block.multi-press.description = Сти�кає вугілл� в графіт. Потребує воду дл� охолодженн�.
-block.silicon-smelter.description = Синтезує пі�ок із вугілл�м дл� отриманн� кремнію.
-block.kiln.description = Виплавл�є пі�ок та �винець у мета�кло.
-block.plastanium-compressor.description = Виробл�є пла�таній із нафти й титану.
-block.phase-weaver.description = Синтезує фазову тканину з торію та пі�ку.
-block.alloy-smelter.description = Поєднує титан, �винець, кремній і мідь дл� отриманн� кінетичного �плаву.
-block.cryofluid-mixer.description = Змішує воду й подрібнений титан, щоби виробити кріогенну рідину.
-block.blast-mixer.description = Виробл�є вибухову �уміш із піратиту і �порових �тручків.
-block.pyratite-mixer.description = Змішує вугілл�, �винець та пі�ок у легкозайми�тий пиротит.
-block.melter.description = Розплавл�є брухт у шлак.
-block.separator.description = Відокремлює шлак на його мінеральні компоненти.
-block.spore-press.description = Сти�кає �порові �тручки дл� �интезуванн� нафти.
-block.pulverizer.description = Подрібнює брухт у дрібний пі�ок.
-block.coal-centrifuge.description = �афта перетворюєть�� у вугілл�.
-block.incinerator.description = Випаровує будь-�кий предмет або рідину, що отримує.
-block.power-void.description = Знищує будь-�ку під’єднану енергію. Тільки пі�очниц�.
-block.power-source.description = По�тійно генерує енергію. Тільки пі�очниц�.
-block.item-source.description = По�тійно �творює предмети. Тільки пі�очниц�.
-block.item-void.description = Руйнує будь-�кі предмети. Тільки пі�очниц�.
-block.liquid-source.description = По�тійно виробл�є рідини. Тільки пі�очниц�.
-block.liquid-void.description = Випаровує будь-�кі рідини. Тільки пі�очниц�.
-block.copper-wall.description = Захищає �поруди від ворожих �нар�дів.
-block.copper-wall-large.description = Захищає �поруди від ворожих �нар�дів.
-block.titanium-wall.description = Захищає �поруди від ворожих �нар�дів.
-block.titanium-wall-large.description = Захищає �поруди від ворожих �нар�дів.
-block.plastanium-wall.description = Захищає �поруди від ворожих �нар�дів. Поглинає електричні дуги й лазери. Блокує автоматичні з’єднанн� енергетичних вузлів.
-block.plastanium-wall-large.description = Захищає �поруди від ворожих �нар�дів. Поглинає електричні дуги й лазери. Блокує автоматичні з’єднанн� енергетичних вузлів.
-block.thorium-wall.description = Захищає �поруди від ворожих �нар�дів.
-block.thorium-wall-large.description = Захищає �поруди від ворожих �нар�дів.
-block.phase-wall.description = Захищає �поруди від ворожих �нар�дів, відбиває більші�ть куль у разі зіткненні.
-block.phase-wall-large.description = Захищає �поруди від ворожих �нар�дів, відбиває більші�ть куль у разі зіткненні.
-block.surge-wall.description = Захищає �поруди від ворожих �нар�дів, періодично випу�кає електричні дуги в разі зіткненні.
-block.surge-wall-large.description = Захищає �поруди від ворожих �нар�дів, періодично випу�кає електричні дуги в разі зіткненні.
-block.door.description = Стіна, �ку можна відчинити й зачинити.
-block.door-large.description = Стіна, �ку можна відчинити й зачинити.
-block.mender.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.junction.description = Діє �к мі�т дл� двох перехре�них конвеєрних �трічок.
-block.bridge-conveyor.description = Тран�портує предмети через будівлі або мі�цеві�ть
-block.phase-conveyor.description = Миттєво тран�портує предмети через мі�цево�ті або будівлі. Більший діапазон, ніж у мо�тового конвеєра, але потребує енергії.
-block.sorter.description = Якщо елемент відповідає вибраному, його можна передати. В іншому випадку елемент виводить�� ліворуч та праворуч.
-block.inverted-sorter.description = Схожий на звичайний �ортувальник, але виводить обрані елементи на бокові �торони.
-block.router.description = Розподіл�є елементи, що надход�ть, порівну на 3 різні напр�мки.
+item.blast-compound.description = �нглій�ька назва: Blast Compound\nВикори�товуєть�� в бомбах та в розривних боєприпа�ах.
+item.pyratite.description = �нглій�ька назва: Pyratite\nВикори�товуєть�� в запальній зброї й твердопаливних генераторах.
+
+#Erekir
+item.beryllium.description = �нглій�ька назва: Beryllium\nВикори�товуєть�� в багатьох типах будівництва та боєприпа�ів на Ерекірі.
+item.tungsten.description = �нглій�ька назва: Tungsten\nВикори�товуєть�� в бурах, броні та боєприпа�ах. �еобхідний при будівництві більш до�коналих кон�трукцій.
+item.oxide.description = �нглій�ька назва: Oxide\nВикори�товуєть�� �к теплопровідник та ізол�тор дл� електроенергії.
+item.carbide.description = �нглій�ька назва: Carbide\nВикори�товуєть�� у передових кон�трукці�х, важких одиниц�х та боєприпа�ах.
+
+liquid.water.description = �нглій�ька назва: Water\nВикори�товуєть�� дл� охолодженн� машин та перероблюванн� відходів.
+liquid.slag.description = �нглій�ька назва: Slag\nПереробл�єть�� у відокремлювачах у �кладові метали або розпорошуєть�� на ворогів �к збро�.
+liquid.oil.description = �нглій�ька назва: Oil\nВикори�товуєть�� у виробництві передових матеріалів і �к запальні боєприпа�и.
+liquid.cryofluid.description = �нглій�ька назва: Cryofluid\nВикори�товуєть�� �к теплоно�ій у реакторах, баштах і заводах.
+
+#Erekir
+liquid.arkycite.description = �нглій�ька назва: Arkycite\nВикори�товуєть�� в хімічних реакці�х дл� виробництва електроенергії та �интезу матеріалів.
+liquid.ozone.description = �нглій�ька назва: Ozone\nВикори�товуєть�� �к оки�лювач у матеріальному виробництві, а також �к паливо. Трохи вибухонебезпечний.
+liquid.hydrogen.description = �нглій�ька назва: Hydrogen\nЗа�то�овуєть�� при видобутку кори�них копалин, виробництві одиниць та ремонті �поруд. Легкозайми�тий.
+liquid.cyanogen.description = �нглій�ька назва: Cyanogen\nВикори�товуєть�� дл� виготовленн� боєприпа�ів, будівництва передових одиниць, проведенн� різних реакцій в передових блоках. Легкозайми�тий.
+liquid.nitrogen.description = �нглій�ька назва: Nitrogen\nВикори�товуєть�� при видобутку кори�них копалин, газоутворенні та агрегатному виробництві. Інертний.
+liquid.neoplasm.description = �нглій�ька назва: Neoplasm\n�ебезпечний біологічний побічний продукт неоплазмового реактора. Швидко поширюєть�� на будь-�кі �у�ідні водовмі�ні блоки, �ких торкаєть��, пошкоджуючи їх в проце�і. В’�зка.
+liquid.neoplasm.details = �еоплазма. �еконтрольована ма�а �интетичних клітин, що швидко діл�ть��, з кон�и�тенцією, подібною до о�аду. Термо�тійка. �адзвичайно небезпечна дл� будь-�ких кон�трукцій, пов’�заних з водою.\n\nЗанадто �кладна і не�табільна дл� звичайного аналізу. Потенційне за�то�уванн� невідоме. Рекомендуєть�� �палюванн� в шлакових ба�ейнах.
+
+block.derelict = \uf77e [lightgray]Переможені
+block.armored-conveyor.description = �нглій�ька назва: Armored Conveyor\nПереміщує предмети вперед. �е приймає введенн� з боків ні з чого, крім інших конвеєрних �трічок.
+block.illuminator.description = �нглій�ька назва: Illuminator\nВипромінює �вітло.
+block.message.description = �нглій�ька назва: Message\nЗберігає повідомленн� дл� комунікації між �оюзниками.
+block.reinforced-message.description = �нглій�ька назва: Reinforced Message\nЗберігає повідомленн� дл� комунікації між �оюзниками.
+block.world-message.description = �нглій�ька назва: World Message\nБлок повідомленн� дл� викори�танн� у �творенні мап. �е можна знищити.
+block.graphite-press.description = �нглій�ька назва: Graphite Press\nСти�кає вугілл� в графіт.
+block.multi-press.description = �нглій�ька назва: Multi Press\nСти�кає вугілл� в графіт. Потребує воду дл� охолодженн�.
+block.silicon-smelter.description = �нглій�ька назва: Silicon Smelter\nСинтезує пі�ок із вугілл�м дл� отриманн� кремнію.
+block.kiln.description = �нглій�ька назва: Kiln\nВиплавл�є пі�ок та �винець у мета�кло.
+block.plastanium-compressor.description = �нглій�ька назва: Plastanium Compressor\nВиробл�є пла�таній із нафти й титану.
+block.phase-weaver.description = �нглій�ька назва: Phase Weaver\nСинтезує фазову тканину з торію та пі�ку.
+block.surge-smelter.description = �нглій�ька назва: Surge Smelter\nПоєднує титан, �винець, кремній і мідь у кінетичний �плав.
+block.cryofluid-mixer.description = �нглій�ька назва: Cryofluid Mixer\nЗмішує воду й подрібнений титан, щоби виробити кріогенну рідину.
+block.blast-mixer.description = �нглій�ька назва: Blast Mixer\nВиробл�є вибухову �уміш із пиротиту і �порових �тручків.
+block.pyratite-mixer.description = �нглій�ька назва: Pyratite Mixer\nЗмішує вугілл�, �винець та пі�ок у легкозайми�тий пиротит.
+block.melter.description = �нглій�ька назва: Melter\nРозплавл�є брухт у шлак.
+block.separator.description = �нглій�ька назва: Separator\nВідокремлює шлак на його мінеральні компоненти.
+block.spore-press.description = �нглій�ька назва: Spore Press\nСти�кає �порові �тручки дл� �интезуванн� нафти.
+block.pulverizer.description = �нглій�ька назва: Pulverizer\nПодрібнює брухт у дрібний пі�ок.
+block.coal-centrifuge.description = �нглій�ька назва: Coal Centrifuge\n�афта перетворюєть�� у вугілл�.
+block.incinerator.description = �нглій�ька назва: Incinerator\nВипаровує будь-�кий предмет або рідину, що отримує.
+block.power-void.description = �нглій�ька назва: Power Void\nЗнищує будь-�ку під’єднану енергію. Тільки пі�очниц�.
+block.power-source.description = �нглій�ька назва: Power Source\nПо�тійно генерує енергію. Тільки пі�очниц�.
+block.item-source.description = �нглій�ька назва: Item Source\nПо�тійно �творює предмети. Тільки пі�очниц�.
+block.item-void.description = �нглій�ька назва: Item Void\nРуйнує будь-�кі предмети. Тільки пі�очниц�.
+block.liquid-source.description = �нглій�ька назва: Liquid Source\nПо�тійно виробл�є рідини. Тільки пі�очниц�.
+block.liquid-void.description = �нглій�ька назва: Liquid Void\nВипаровує будь-�кі рідини. Тільки пі�очниц�.
+block.payload-source.description = �нглій�ька назва: Payload Source\n�е�кінченно �творює і виводить вантажі. Тільки пі�очниц�.
+block.payload-void.description = �нглій�ька назва: Payload Void\nЗнищує будь-�кі вантажі. Тільки пі�очниц�.
+block.copper-wall.description = �нглій�ька назва: Copper Wall\nЗахищає �поруди від ворожих �нар�дів.
+block.copper-wall-large.description = �нглій�ька назва: Copper Wall Large\nЗахищає �поруди від ворожих �нар�дів.
+block.titanium-wall.description = �нглій�ька назва: Titanium Wall\nЗахищає �поруди від ворожих �нар�дів.
+block.titanium-wall-large.description = �нглій�ька назва: Titanium Wall Large\nЗахищає �поруди від ворожих �нар�дів.
+block.plastanium-wall.description = �нглій�ька назва: Plastanium Wall\nЗахищає �поруди від ворожих �нар�дів. Поглинає електричні дуги й лазери. Блокує автоматичні з’єднанн� енергетичних вузлів.
+block.plastanium-wall-large.description = �нглій�ька назва: Plastanium Wall Large\nЗахищає �поруди від ворожих �нар�дів. Поглинає електричні дуги й лазери. Блокує автоматичні з’єднанн� енергетичних вузлів.
+block.thorium-wall.description = �нглій�ька назва: Thorium Wall\nЗахищає �поруди від ворожих �нар�дів.
+block.thorium-wall-large.description = �нглій�ька назва: Thorium Wall Large\nЗахищає �поруди від ворожих �нар�дів.
+block.phase-wall.description = �нглій�ька назва: Phase Wall\nЗахищає �поруди від ворожих �нар�дів, відбиває більші�ть куль у разі зіткненні.
+block.phase-wall-large.description = �нглій�ька назва: Phase Wall Large\nЗахищає �поруди від ворожих �нар�дів, відбиває більші�ть куль у разі зіткненні.
+block.surge-wall.description = �нглій�ька назва: Surge Wall\nЗахищає �поруди від ворожих �нар�дів, періодично випу�кає електричні дуги в разі зіткненні.
+block.surge-wall-large.description = �нглій�ька назва: Surge Wall Large\nЗахищає �поруди від ворожих �нар�дів, періодично випу�кає електричні дуги в разі зіткненні.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
+block.door.description = �нглій�ька назва: Door\nСтіна, �ку можна відчинити й зачинити.
+block.door-large.description = �нглій�ька назва: Door Large\nСтіна, �ку можна відчинити й зачинити.
+block.mender.description = �нглій�ька назва: Mender\nПеріодично ремонтує блоки у �воєму радіу�і дії.\nЗа бажанн�м можна викори�тати кремній задл� підвищенн� радіу�у дії й ефективно�ті.
+block.mend-projector.description = �нглій�ька назва: Mend Projector\nРемонтує блоки у �воєму радіу�і дії.\nЗа бажанн�м можна викори�тати фазову тканину задл� підвищенн� радіу�у дії й ефективно�ті.
+block.overdrive-projector.description = �нглій�ька назва: Overdrive Projector\nЗбільшує швидкі�ть найближчих будівель.\nЗа бажанн�м можна викори�тати фазову тканину задл� підвищенн� радіу�у дії й ефективно�ті.
+block.force-projector.description = �нглій�ька назва: Force Projector\nСтворює навколо �ебе ше�тикутне �илове поле, захищаючи будівлі та блоки в�ередині від пошкоджень.\nПерегріваєть��, �кщо завдано занадто великої шкоди. За бажанн�м можна викори�тати теплоно�ій дл� запобіганн� перегріву. Дл� збільшенн� розміру щита можна викори�товувати фазову тканину.
+block.shock-mine.description = �нглій�ька назва: Shock Mine\nВипу�кає електричні дуги в разі контакту з ворогом.
+block.conveyor.description = �нглій�ька назва: Conveyor\nПереміщує предмети вперед.
+block.titanium-conveyor.description = �нглій�ька назва: Titanium Conveyor\nПереміщує предмети швидше, ніж звичайний конвеєр.
+block.plastanium-conveyor.description = �нглій�ька назва: Plastanium Conveyor\nПереміщує предмети парті�ми. Приймає предмети на задній ча�тині та вивантажує їх у трьох напр�мках �переду. Потребує кілька точок завантаженн� та розвантаженн� дл� мак�имальної пропу�кної здатно�ті.
+block.junction.description = �нглій�ька назва: Junction\nДіє �к мі�т дл� двох перехре�них конвеєрних �трічок.
+block.bridge-conveyor.description = �нглій�ька назва: Bridge Conveyor\nТран�портує предмети через будівлі або мі�цеві�ть
+block.phase-conveyor.description = �нглій�ька назва: Phase Conveyor\nМиттєво тран�портує предмети через мі�цево�ті або будівлі. Більший діапазон, ніж у мо�тового конвеєра, але потребує енергії.
+block.sorter.description = �нглій�ька назва: Sorter\nЯкщо предмет відповідає вибраному, його можна передати. В іншому випадку предмет виводить�� ліворуч та праворуч.
+block.inverted-sorter.description = �нглій�ька назва: Inverted Sorter\nСхожий на звичайний �ортувальник, але виводить обрані предмети на бокові �торони.
+block.router.description = �нглій�ька назва: Router\nРозподіл�є предмети, що надход�ть, порівну на 3 різні напр�мки.
 block.router.details = �еобхідне зло. �е викори�товуйте поруч із входами до механізмів, о�кільки вони, входи, будуть забиті вихідними предметами.
-block.distributor.description = Розділ�є предмети до 7 інших напр�мків порівну.
-block.overflow-gate.description = Вивантажує лише ліворуч і праворуч, �кщо передній шл�х заблокований.
-block.underflow-gate.description = Повна протилежні�ть надмірному затвору. Виводить предмет пр�мо, �кщо лівий і правий шл�х заблоковано.
-block.mass-driver.description = �айкращий блок дл� тран�портуванн� предметів. Збирає кілька предметів, а потім ви�трілює їх до іншої електромагнітної катапульти на велику від�тань. Дл� роботи потребує енергі�.
-block.mechanical-pump.description = Дешевий на�о� із повільним виходом, але не потребує енерго�поживанн�.
-block.rotary-pump.description = Удо�коналений на�о�. �а�о�и більше викачують, але потребують енергію.
-block.thermal-pump.description = �айкращий на�о�.
-block.conduit.description = Пере�уває рідини вперед. За�то�овуєть�� �пільно з на�о�ами та іншими трубопроводами.
-block.pulse-conduit.description = Пере�уває рідини вперед. Швидше тран�портує і зберігає більше рідини, ніж �тандартні трубопроводи.
-block.plated-conduit.description = Пере�уває рідини вперед. �е приймає рідин із боків окрім інших трубопроводів. �е протікає.
-block.liquid-router.description = Приймає рідини з одного напр�мку та виводить їх до трьох інших напр�мків порівну. Також може зберігати певну кількі�ть рідини.
-block.liquid-tank.description = Зберігає велику кількі�ть рідини. Виводить воду на в�і �торони, через це �хожий на рідинний маршрутизатор.
-block.liquid-junction.description = Діє �к мі�т дл� двох трубопроводів.
-block.bridge-conduit.description = Тран�портує рідину через мі�цеві�ть і будівлі.
-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-large.description = Зберігає енергію �к буфер у ча�и надлишкової енергії. Виводить енергію в періоди дефіциту. Більша ємні�ть ніж у звичайного акумул�тора.
-block.combustion-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.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.details = Відновлена технологі�. Викори�товуєть�� дл� отриманн� величезної кілько�ті біома�и �комога ефективніше. Ймовірно, початковий інкубатор �пор, що зараз покриває Серпуло.
-block.oil-extractor.description = Викори�товуєть�� велика кількі�ть енергії, пі�ку та води дл� отриманн� нафти.
-block.core-shard.description = Ядро бази. Пі�л� знищенн� �ектор втрачаєть��. �айперша вер�і� кап�ули �дра. Пі�л� його знищенн� в�і контакти з регіоном втрачають��. �е допу�тіть цього.
-block.core-shard.details = �айперша вер�і� кап�ули �дра. Компактне. Самовідтворюванне. О�нащене одноразовими пу�ковими руші�ми. �е призначено дл� міжпланетних подорожей.
-block.core-foundation.description = Ядро бази. Добре броньоване. Зберігає більше ре�ур�ів.
+block.distributor.description = �нглій�ька назва: Distributor\nРозділ�є предмети до 7 інших напр�мків порівну.
+block.overflow-gate.description = �нглій�ька назва: Overflow Gate\nВивантажує лише ліворуч і праворуч, �кщо передній шл�х заблокований.
+block.underflow-gate.description = �нглій�ька назва: Underflow Gate\nПовна протилежні�ть надмірному затвору. Виводить предмет пр�мо, �кщо лівий і правий шл�х заблоковано.
+block.mass-driver.description = �нглій�ька назва: Mass Driver\n�айкращий блок дл� тран�портуванн� предметів. Збирає кілька предметів, а потім ви�трілює їх до іншої електромагнітної катапульти на велику від�тань. Дл� роботи потребує енергію.
+block.mechanical-pump.description = �нглій�ька назва: Mechanical Pump\nДешева помпа із повільним виходом, але не потребує енерго�поживанн�.
+block.rotary-pump.description = �нглій�ька назва: Rotary Pump\nПоліпшена механічна помпа. Більше викачує, але потребує енергію.
+block.impulse-pump.description = �нглій�ька назва: Impulse Pump\n�айкраща помпа.
+block.conduit.description = �нглій�ька назва: Conduit\nПере�уває рідини вперед. За�то�овуєть�� �пільно з помпами та іншими трубопроводами.
+block.pulse-conduit.description = �нглій�ька назва: Pulse Conduit\nПере�уває рідини вперед. Швидше тран�портує і зберігає більше рідини, ніж �тандартні трубопроводи.
+block.plated-conduit.description = �нглій�ька назва: Plated Conduit\nПере�уває рідини вперед. �е приймає рідин із боків окрім інших трубопроводів. �е протікає.
+block.liquid-router.description = �нглій�ька назва: Liquid Router\nПриймає рідини з одного напр�мку та виводить їх до трьох інших напр�мків порівну. Також може зберігати певну кількі�ть рідини.
+block.liquid-container.description = �нглій�ька назва: Liquid Container\nЗберігає чималу кількі�ть рідини. Виводить у в�і �торони, подібно до рідинного маршрутизатора.
+block.liquid-tank.description = �нглій�ька назва: Liquid Tank\nЗберігає велику кількі�ть рідини. Виводить воду на в�і �торони, через це �хожий на рідинний маршрутизатор.
+block.liquid-junction.description = �нглій�ька назва: Liquid Junction\nДіє �к мі�т дл� двох трубопроводів.
+block.bridge-conduit.description = �нглій�ька назва: Bridge Conduit\nТран�портує рідину через мі�цеві�ть і будівлі.
+block.phase-conduit.description = �нглій�ька назва: Phase Conduit\nТран�портує рідину через мі�цеві�ть і будівлі. Діапазон дії більший ніж у мо�тового трубопроводу.
+block.power-node.description = �нглій�ька назва: Power Node\nПередає живленн� на приєднані вузли. Вузол буде отримувати живленн� від будь-�ких �у�ідніх блоків або подавати живленн� до них.
+block.power-node-large.description = �нглій�ька назва: Power Node Large\nПередовий вузол живленн� з більшим радіу�ом дії.
+block.surge-tower.description = �нглій�ька назва: Surge Tower\nВузол живленн� з меншою кількі�тю до�тупних з’єднань і з найбільшим радіу�ом дії.
+block.diode.description = �нглій�ька назва: Diode\nЖивленн� акумул�тора може протікати через цей блок лише в одному напр�мку, але лише в тому випадку, �кщо інша �торона має менше енергії.
+block.battery.description = �нглій�ька назва: Battery\nЗберігає енергію �к буфер у ча�и надлишкової енергії. Виводить енергію в періоди дефіциту.
+block.battery-large.description = �нглій�ька назва: Battery Large\nЗберігає енергію �к буфер у ча�и надлишкової енергії. Виводить енергію в періоди дефіциту. Більша ємні�ть ніж у звичайного акумул�тора.
+block.combustion-generator.description = �нглій�ька назва: Combustion Generator\nВиробл�є енергію, �палюючи легкозайми�ті матеріали, �к-от вугілл�.
+block.thermal-generator.description = �нглій�ька назва: Thermal Generator\nВиробл�є енергію в разі розміщенн� в гар�чих мі�ц�х.
+block.steam-generator.description = �нглій�ька назва: Steam Generator\nВиробл�є енергію, �палюючи легкозайми�ті матеріали й перетворює воду в пару.
+block.differential-generator.description = �нглій�ька назва: Differential Generator\nВиробл�є велику кількі�ть енергії. Викори�товує різницю температур між кріогенною рідиною й пиротитом, що горить.
+block.rtg-generator.description = �нглій�ька назва: Rtg Generator\nВикори�товує тепло радіоактивних �полук, що розкладають��, дл� отриманн� енергії з повільною швидкі�тю.
+block.solar-panel.description = �нглій�ька назва: Solar Panel\nЗабезпечує невелику кількі�ть енергії від �онц�.
+block.solar-panel-large.description = �нглій�ька назва: Solar Panel Large\nЗабезпечує невелику кількі�ть енергії від �онц�. Значно ефективніша ніж �тандартна �он�чна панель.
+block.thorium-reactor.description = �нглій�ька назва: Thorium Reactor\nВиробл�є значну кількі�ть енергії з торію. Потребує по�тійного охолодженн�. Сильно вибухне, �кщо подаватиметь�� недо�татн� кількі�ть теплоно�і�.
+block.impact-reactor.description = �нглій�ька назва: Impact Reactor\nЗдатний �творювати величезну кількі�ть енергії за мак�имальної ефективно�ті. Дл� запу�ку проце�у потрібно значні об��ги енергії.
+block.mechanical-drill.description = �нглій�ька назва: Mechanical Drill\nЯкщо розмі�тити на доречних плитках, то виводитиме предмети по�тійно, але повільно. Придатний лише дл� базових ре�ур�ів.
+block.pneumatic-drill.description = �нглій�ька назва: Pneumatic Drill\nПоліпшений бур, здатний видобувати титан. Видобуває швидше, ніж механічний бур.
+block.laser-drill.description = �нглій�ька назва: Laser Drill\nДає змогу видобувати ще швидше за допомогою лазерної технології, але потребує енергії. Здатний видобувати торій.
+block.blast-drill.description = �нглій�ька назва: Blast Drill\n�айкращий бур. Потребує великої кілько�ті енергії.
+block.water-extractor.description = �нглій�ька назва: Water Extractor\nВикачує підземні води. Викори�товуєть�� в мі�ц�х, де немає поверхневої води.
+block.cultivator.description = �нглій�ька назва: Cultivator\nКультивує невеликі концентрації �пор у �тручки.
+block.cultivator.details = Відновлена технологі�. Викори�товуєть�� дл� отриманн� великої кілько�ті біома�и �комога ефективніше. Ймовірно, початковий інкубатор �пор, що зараз покриває Серпуло.
+block.oil-extractor.description = �нглій�ька назва: Oil Extractor\nВикори�товуєть�� велика кількі�ть енергії, пі�ку та води дл� отриманн� нафти.
+block.core-shard.description = �нглій�ька назва: Core Shard\nЯдро бази. Пі�л� знищенн� �ектор втрачаєть��. �айперша вер�і� кап�ули �дра. Пі�л� його знищенн� в�і контакти з регіоном втрачають��. �е допу�тіть цього.
+block.core-shard.details = �айперша вер�і� кап�ули �дра. Компактне. Самовідтворюване. О�нащене одноразовими пу�ковими руші�ми. �е призначено дл� міжпланетних подорожей.
+block.core-foundation.description = �нглій�ька назва: Core Foundation\nЯдро бази. Добре броньоване. Зберігає більше ре�ур�ів.
 block.core-foundation.details = Друга вер�і� �дра.
-block.core-nucleus.description = Ядро бази. �апрочуд добре броньовано. Зберігає величезну кількі�ть ре�ур�ів.
+block.core-nucleus.description = �нглій�ька назва: Core Nucleus\nЯдро бази. �апрочуд добре броньовано. Зберігає величезну кількі�ть ре�ур�ів.
 block.core-nucleus.details = Трет� і фінальна вер�і� �дра.
-block.vault.description = Зберігає велику кількі�ть предметів кожного типу. Блок розвантажувача може викори�товувати�� дл� отриманн� предметів зі �ховища.
-block.container.description = Зберігає малу кількі�ть предметів кожного типу. Блок розвантажувача може викори�товувати�� дл� отриманн� предметів зі �ховища.
-block.unloader.description = Вивантажує предмети з найближчих блоків
-block.launch-pad.description = Запу�кає партії предметів без необхідно�ті запу�ку �дра.
-block.duo.description = Ви�трілює чергами куль у ворогів.
-block.scatter.description = Ви�трілює �купченн�м �винцю, брухту чи мета�кла в повітр�них противників.
-block.scorch.description = Підпалює будь-�ких наземних противників поблизу. Ви�окоефективна на близькій від�тані.
-block.hail.description = Ви�трілює невеликі �нар�ди в наземних ворогів на великі від�тані.
-block.wave.description = Ви�трілює потоки рідин у ворогів. �втоматично га�ить пожежі в разі по�тачанн� води.
-block.lancer.description = Зар�джає і ви�трілює потужні пучки енергії в наземних противників.
-block.arc.description = Ви�трілює дугами електрики в наземних противників.
-block.swarmer.description = Запу�кає ракети, що автоматично навод�ть�� в противників.
-block.salvo.description = Ви�трілює швидкий залп куль у противника.
-block.fuse.description = Ви�трілює трьома промен�ми, що пронизують броню, у малому радіу�і в противників.
-block.ripple.description = Ви�трілює �купченн�м �нар�дів у противників.
-block.cyclone.description = Підпалює вибухові грудки �купченн� противників.
-block.spectre.description = Ви�трілює великі бронебійні кулі в повітр�ні та наземні цілі.
-block.meltdown.description = Зар�джає і ви�трілює лазерним променем у найближчих противників. Дл� роботи потрібен теплоно�ій.
-block.foreshadow.description = Ви�трілює великим болтом в одну ціль на велику ди�танцію
-block.repair-point.description = Безперервно ремонтує найближчу пошкоджену бойову одиницю у �воєму радіу�і дії.
-block.segment.description = Пошкоджує та руйнує вхідні �нар�ди. Окрім лазерних.
-block.parallax.description = Прит�гає ворожі повітр�ні одиниці, пошкоджуючи їх у проце�і.
-block.tsunami.description = Ви�трілює потужними потоками рідини у ворогів. �втоматично га�ить пожежі в разі по�тачанн� води.
-block.silicon-crucible.description = Очищає кремній від пі�ку та вугілл�, викори�товуючи пиратит �к додаткове джерело тепла. Більш ефективний у жарких мі�ц�х.
-block.disassembler.description = Поділ�є шлак на незначні кілько�ті екзотичних мінеральних компонентів за низькою ефективно�ті. Може виробл�ти торій.
-block.overdrive-dome.description = Збільшує швидкі�ть найближчих будівель. Потребує фазову тканину і кремній.
-block.payload-conveyor.description = Переміщує великі вантажі, �к-от одиниці з заводів.
-block.payload-router.description = Розділ�є вантажі, що надход�ть, у 3 різні �торони.
-block.command-center.description = Контролює поведінку одиниць за допомогою декількох різних команд.
-block.ground-factory.description = Виробл�є наземних одиниць. Вивід одиниць можна здій�нити безпо�ередньо на мі�цеві�ть, або �пр�мувати до рекон�трукторів дл� поліпшенн�.
-block.air-factory.description = Виробл�є повітр�них одиниць. Вивід одиниць можна здій�нити безпо�ередньо на мі�цеві�ть, або �пр�мувати до рекон�трукторів дл� поліпшенн�.
-block.naval-factory.description = Виробл�є одиниць. Вивід одиниць можна здій�нити безпо�ередньо на мі�цеві�ть, або �пр�мувати до рекон�трукторів дл� поліпшенн�.
-block.additive-reconstructor.description = Поліпшує введених одиниць до другого рівн�.
-block.multiplicative-reconstructor.description = Поліпшує введених одиниць до третього рівн�.
-block.exponential-reconstructor.description = Поліпшує введених одиниць до четвертого рівн�.
-block.tetrative-reconstructor.description = Поліпшує введених одиниць до п’�того і фінального рівн�.
-block.switch.description = Перемикач. Стан можна читати й контролювати за допомогою логічних проце�орів.
-block.micro-processor.description = Запу�кає по�лідовні�ть логічних вказівок (ін�трукцій) у не�кінченному циклі. Може викори�товувати�� дл� керуванн� блоків та будівель.
-block.logic-processor.description = Запу�кає по�лідовні�ть логічних вказівок (ін�трукцій) у не�кінченному циклі. Може викори�товувати�� дл� керуванн� блоків та будівель. Швидше ніж Мікропроце�ор.
-block.hyper-processor.description = Запу�кає по�лідовні�ть логічних вказівок (ін�трукцій) у не�кінченному циклі. Може викори�товувати�� дл� керуванн� блоків та будівель. Швидше ніж Логічний проце�ор
-block.memory-cell.description = Зберігає інформацію дл� логічного проце�ора.
-block.memory-bank.description = Зберігає інформацію дл� логічного проце�ора. Ви�ока мі�ткі�ть.
-block.logic-display.description = Показує довільну графіку з логічного проце�ора.
-block.large-logic-display.description = Показує довільну графіку з логічного проце�ора.
-block.interplanetary-accelerator.description = Велика електромагнітна башта-рейкотрон. При�корює �дра, щоби подолати планетне т�жінн� дл� міжпланетного розгортанн�.
-unit.dagger.description = Ви�трілює �тандартними кул�ми в найближчих ворогах.
-unit.mace.description = Ви�трілює потоками полум’� в найближчих ворогів.
-unit.fortress.description = Ви�трілює з дальнобійної артилерії в наземних цілей.
-unit.scepter.description = Ви�трілює шквалом зар�джених куль у найближчих ворогів.
-unit.reign.description = Ви�трілює шквалом ма�ивних пронизливих куль у найближчих ворогів.
-unit.nova.description = Ви�трілює лазерними болтами, �кі пошкоджують ворогів та відновлюють �оюзні �поруди. Здатний до польоту.
-unit.pulsar.description = Випу�кає дуги електрики, �кі завдають шкоди ворогам та відновлюють �оюзні �поруди. Здатний до польоту.
-unit.quasar.description = Ви�трілює пробивними лазерними промені, �кі пошкоджують ворогів та відновлюють �поріднені кон�трукції. Здатний до польоту. Захищений.
-unit.vela.description = Ви�трілює ма�ивним безперервним лазерним променем, �кий завдає шкоди ворогам, �причин�є пожежі та відновлює �оюзні �поруди. Здатний до польоту.
-unit.corvus.description = Спричин�є ма�ивний лазерний вибух, �кий завдає шкоди ворогам та відновлює �поріднені �поруди. Може пере�тупати через більші�ть мі�цево�ті.
-unit.crawler.description = Біжить до ворогів і �амознищуєть��, викликаючи великий вибух.
-unit.atrax.description = Випалює ви�нажливі шари шлаку в наземних ціл�х. Може пере�тупити більші�ть мі�цево�ті.
-unit.spiroct.description = Ви�трілює ви�нажливими лазерними промен�ми у ворогів, відновлюючи�ь водноча�. Може пере�тупати через більші�ть мі�цево�ті.
-unit.arkyid.description = Ви�трілює у ворогів великими ви�нажливими лазерними промен�ми, відновлюючи�ь при цьому.
-unit.toxopid.description = Ви�трілює у ворогів великими електричними ка�етними �нар�дами та пробивними лазерами. Може пере�тупати через більші�ть мі�цево�ті.
-unit.flare.description = Ви�трілює �тандартними кул�ми в найближчі цілі.
-unit.horizon.description = Кидає купу бомб на наземні цілі.
-unit.zenith.description = Ви�трілює залпи ракет у в�іх найближчих ворогів.
-unit.antumbra.description = Ви�трілює шквал куль у в�іх найближчих ворогів.
-unit.eclipse.description = Ви�трілює двома пронизливими лазерами та шквалом куль у в�іх найближчих ворогів.
-unit.mono.description = �втоматично видобуває мідь і �винець і кладе їх у �дро.
-unit.poly.description = �втоматично перебудовує зруйновані �поруди та допомагає іншим одиниц�м у будівництві.
-unit.mega.description = �втоматично відновлює пошкоджені кон�трукції. Здатний не�ти блоки та невеликі наземні блоки.
-unit.quad.description = Кидає великі бомби на наземні цілі, відновлюючи �оюзні �поруди та завдаючи шкоди ворогам. Здатний не�ти �ередні наземні одиниці.
-unit.oct.description = Захищає найближчих �оюзників �воїм відновлювальним щитом. Здатний не�ти більші�ть наземних одиниць.
-unit.risso.description = Ви�трілює шквалом ракет і куль по в�іх найближчих ворогах.
-unit.minke.description = Ви�трілює запальними �нар�дами та �тандартними кул�ми по найближчих наземних ціл�х.
-unit.bryde.description = Ви�трілює у ворогів артилерій�ькими �нар�дами та ракетами великої дально�ті.
-unit.sei.description = Ви�трілює у ворогів шквалом ракет і бронебійних куль.
-unit.omura.description = Ви�трілює у ворогів далекобійним болтом, що пробиває броню. Виробл�є повітр�них Фальшфеєрів.
-unit.alpha.description = Захищає �дро «Уламок» від противників. Будує �поруди.
-unit.beta.description = Захищає �дро «Штаб» від противників. Будує �поруди.
-unit.gamma.description = Захищає �дро «�том» від противників. Будує �поруди.
+block.vault.description = �нглій�ька назва: Vault\nЗберігає велику кількі�ть предметів кожного типу. Блок розвантажувача може викори�товувати�� дл� отриманн� предметів зі �ховища.
+block.container.description = �нглій�ька назва: Container\nЗберігає малу кількі�ть предметів кожного типу. Блок розвантажувача може викори�товувати�� дл� отриманн� предметів зі �ховища.
+block.unloader.description = �нглій�ька назва: Unloader\nВивантажує предмети з найближчих блоків
+block.launch-pad.description = �нглій�ька назва: Launch Pad\nЗапу�кає партії предметів без необхідно�ті запу�ку �дра.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
+block.duo.description = �нглій�ька назва: Duo\nВи�трілює чергами куль у ворогів.
+block.scatter.description = �нглій�ька назва: Scatter\nВи�трілює �купченн�м �винцю, брухту чи мета�кла в повітр�них противників.
+block.scorch.description = �нглій�ька назва: Scorch\nПідпалює будь-�ких наземних противників поблизу. Ви�окоефективна на близькій від�тані.
+block.hail.description = �нглій�ька назва: Hail\nВи�трілює невеликі �нар�ди в наземних ворогів на великі від�тані.
+block.wave.description = �нглій�ька назва: Wave\nВи�трілює потоки рідин у ворогів. �втоматично га�ить пожежі в разі по�тачанн� води.
+block.lancer.description = �нглій�ька назва: Lancer\nЗар�джає і ви�трілює потужні пучки енергії в наземних противників.
+block.arc.description = �нглій�ька назва: Arc\nВи�трілює дугами електрики в наземних противників.
+block.swarmer.description = �нглій�ька назва: Swarmer\nЗапу�кає ракети, що автоматично навод�ть�� в противників.
+block.salvo.description = �нглій�ька назва: Salvo\nВи�трілює швидкий залп куль у противника.
+block.fuse.description = �нглій�ька назва: Fuse\nВи�трілює трьома промен�ми, що пронизують броню, у малому радіу�і в противників.
+block.ripple.description = �нглій�ька назва: Ripple\nВи�трілює �купченн�м �нар�дів у противників.
+block.cyclone.description = �нглій�ька назва: Cyclone\nПідпалює вибухові грудки й ви�трілює їх у �купченн� противників.
+block.spectre.description = �нглій�ька назва: Spectre\nВи�трілює великі бронебійні кулі в повітр�ні та наземні цілі.
+block.meltdown.description = �нглій�ька назва: Meltdown\nЗар�джає і ви�трілює лазерним променем у найближчих противників. Дл� роботи потрібен теплоно�ій.
+block.foreshadow.description = �нглій�ька назва: Foreshadow\nВи�трілює великим болтом в одну ціль на велику ди�танцію.
+block.repair-point.description = �нглій�ька назва: Repair Point\nБезперервно ремонтує найближчу пошкоджену бойову одиницю у �воєму радіу�і дії. Пріоритетні �оюзники з вищим мак�имальним здоров’�м.
+block.segment.description = �нглій�ька назва: Segment\nПошкоджує та руйнує вхідні �нар�ди. Окрім лазерних.
+block.parallax.description = �нглій�ька назва: Parallax\nПрит�гає ворожі повітр�ні одиниці, пошкоджуючи їх у проце�і.
+block.tsunami.description = �нглій�ька назва: Tsunami\nВи�трілює потужними потоками рідини у ворогів. �втоматично га�ить пожежі в разі по�тачанн� води.
+block.silicon-crucible.description = �нглій�ька назва: Silicon Crucible\nОчищає кремній від пі�ку та вугілл�, викори�товуючи пиратит �к додаткове джерело тепла. Більш ефективний у жарких мі�ц�х.
+block.disassembler.description = �нглій�ька назва: Disassembler\nПоділ�є шлак на незначні кілько�ті екзотичних мінеральних компонентів за низької ефективно�ті. Може виробл�ти торій.
+block.overdrive-dome.description = �нглій�ька назва: Overdrive Dome\nЗбільшує швидкі�ть найближчих будівель. Потребує фазову тканину і кремній.
+block.payload-conveyor.description = �нглій�ька назва: Payload Conveyor\nПереміщує великі вантажі, �к-от одиниці з заводів.
+block.payload-router.description = �нглій�ька назва: Payload Router\nРозділ�є вантажі, що надход�ть, у 3 різні �торони.
+block.ground-factory.description = �нглій�ька назва: Ground Factory\nВиробл�є наземних одиниць. Вивід одиниць можна здій�нити безпо�ередньо на мі�цеві�ть, або �пр�мувати до рекон�трукторів дл� поліпшенн�.
+block.air-factory.description = �нглій�ька назва: Air Factory\nВиробл�є повітр�них одиниць. Вивід одиниць можна здій�нити безпо�ередньо на мі�цеві�ть, або �пр�мувати до рекон�трукторів дл� поліпшенн�.
+block.naval-factory.description = �нглій�ька назва: Naval Factory\nВиробл�є одиниць. Вивід одиниць можна здій�нити безпо�ередньо на мі�цеві�ть, або �пр�мувати до рекон�трукторів дл� поліпшенн�.
+block.additive-reconstructor.description = �нглій�ька назва: Additive Reconstructor\nПоліпшує введених одиниць до другого рівн�.
+block.multiplicative-reconstructor.description = �нглій�ька назва: Multiplicative Reconstructor\nПоліпшує введених одиниць до третього рівн�.
+block.exponential-reconstructor.description = �нглій�ька назва: Exponential Reconstructor\nПоліпшує введених одиниць до четвертого рівн�.
+block.tetrative-reconstructor.description = �нглій�ька назва: Tetrative Reconstructor\nПоліпшує введених одиниць до п’�того і фінального рівн�.
+block.switch.description = �нглій�ька назва: Switch\nПеремикач. Стан можна читати й контролювати за допомогою логічних проце�орів.
+block.micro-processor.description = �нглій�ька назва: Micro Processor\nЗапу�кає по�лідовні�ть логічних вказівок (операцій) у не�кінченному циклі. Може викори�товувати�� дл� керуванн� блоків та будівель.
+block.logic-processor.description = �нглій�ька назва: Logic Processor\nЗапу�кає по�лідовні�ть логічних вказівок (операцій) у не�кінченному циклі. Може викори�товувати�� дл� керуванн� блоків та будівель. Швидше ніж Мікропроце�ор.
+block.hyper-processor.description = �нглій�ька назва: Hyper Processor\nЗапу�кає по�лідовні�ть логічних вказівок (операцій) у не�кінченному циклі. Може викори�товувати�� дл� керуванн� блоків та будівель. Швидше ніж Логічний проце�ор
+block.memory-cell.description = �нглій�ька назва: Memory Cell\nЗберігає інформацію дл� логічного проце�ора.
+block.memory-bank.description = �нглій�ька назва: Memory Bank\nЗберігає інформацію дл� логічного проце�ора. Ви�ока мі�ткі�ть.
+block.logic-display.description = �нглій�ька назва: Logic Display\nПоказує довільну графіку з логічного проце�ора.
+block.large-logic-display.description = �нглій�ька назва: Large Logic Display\nПоказує довільну графіку з логічного проце�ора.
+block.interplanetary-accelerator.description = �нглій�ька назва: Interplanetary Accelerator\nВелика електромагнітна башта-рейкотрон. При�корює �дра, щоби подолати планетне т�жінн� дл� міжпланетного розгортанн�.
+block.repair-turret.description = �нглій�ька назва: Repair Turret\nБезпервно ремонтує найближчу пошкоджену одиницю. Дл� при�коренн� ремонтуванн� можна охолодити.
+
+#Erekir
+block.core-bastion.description = �нглій�ька назва: Core Bastion\nЯдро бази. Броньоване. Пі�л� знищенн� �ектор втрачаєть��.
+block.core-citadel.description = �нглій�ька назва: Core Citadel\nЯдро бази. Дуже добре броньоване. Зберігає більше ре�ур�ів, ніж �дро «Ба�тіон».
+block.core-acropolis.description = �нглій�ька назва: Core Acropolis\nЯдро бази. �адзвичайно добре броньоване. Зберігає більше ре�ур�ів, ніж �дро «Цитадель».
+block.breach.description = �нглій�ька назва: Breach\nВеде вогонь по ворожих ціл�х бронебійними берилієвими або вольфрамовими боєприпа�ами.
+block.diffuse.description = �нглій�ька назва: Diffuse\nВи�трілює шквалом куль у формі широкого кону�а. Відкидає ворожі цілі назад.
+block.sublimate.description = �нглій�ька назва: Sublimate\nВеде вогонь безперервним �труменем полум’� по ворожих ціл�х. Пробиває броню.
+block.titan.description = �нглій�ька назва: Titan\nВеде вогонь о�колково-фуга�ним артилерій�ьким �нар�дом по наземних ціл�х. Потребує водню.
+block.afflict.description = �нглій�ька назва: Afflict\nСтріл�є ма�ивною зар�дженою кулею о�колково-фуга�них �нар�дів. Потребує підігріву.
+block.disperse.description = �нглій�ька назва: Disperse\nВеде вогонь зенітними чергами по повітр�них ціл�м.
+block.lustre.description = �нглій�ька назва: Lustre\nВеде вогонь по ворожих ціл�х повільно рухомим одноцільовим лазером.
+block.scathe.description = �нглій�ька назва: Scathe\nЗапу�кає потужну ракету по наземних ціл�м на величезні від�тані.
+block.smite.description = �нглій�ька назва: Smite\nВогонь веде чергами зі шрапнельних, бли�кавичних куль.
+block.malign.description = �нглій�ька назва: Malign\nВипу�кає шквал �амонавідних лазерних зар�дів по ворожих ціл�х. Потребує значного нагріву.
+block.silicon-arc-furnace.description = �нглій�ька назва: Silicon Arc Furnace\nРафінує кремній з пі�ку і графіту.
+block.oxidation-chamber.description = �нглій�ька назва: Oxidation Chamber\nПеретворює берилій та озон в ок�ид. Виділ�є тепло �к побічний продукт.
+block.electric-heater.description = �нглій�ька назва: Electric Heater\n�агріває лицьові блоки. Вимагає великої кілько�ті електроенергії.
+block.slag-heater.description = �нглій�ька назва: Slag Heater\n�агріває лицьові блоки. Потребує шлаку.
+block.phase-heater.description = �нглій�ька назва: Phase Heater\n�агріває лицьові блоки. Потрібна фазова тканина.
+block.heat-redirector.description = �нглій�ька назва: Heat Redirector\nПеренаправл�є отримане тепло на інші блоки.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = �нглій�ька назва: Heat Router\nРозподіл�є отримане тепло в трьох вихідних напр�мках.
+block.electrolyzer.description = �нглій�ька назва: Electrolyzer\nПеретворює воду на водень та озоновий газ.
+block.atmospheric-concentrator.description = �нглій�ька назва: Atmospheric Concentrator\nВбирає азот з атмо�фери. Потребує тепла.
+block.surge-crucible.description = �нглій�ька назва: Surge Crucible\nУтворює кінетичний �плав зі шлаку і кремнію. Потребує тепла.
+block.phase-synthesizer.description = �нглій�ька назва: Phase Synthesizer\nСинтезує фазову тканину з торію, пі�ку та озону. Потребує тепла.
+block.carbide-crucible.description = �нглій�ька назва: Carbide Crucible\nПереплавл�є графіт і вольфрам в карбід. Потребує тепла.
+block.cyanogen-synthesizer.description = �нглій�ька назва: Cyanogen Synthesizer\nСинтезує ціаноген з аркициту і графіту. Потребує тепла.
+block.slag-incinerator.description = �нглій�ька назва: Slag Incinerator\nСпалює нелеткі предмети або рідини. Потребує шлаку.
+block.vent-condenser.description = �нглій�ька назва: Vent Condenser\nКонден�ує гази із джерела у воду. Споживає енергію.
+block.plasma-bore.description = �нглій�ька назва: Plasma Bore\nПри розміщенні лицем до рудної �тіни видає предмети не�кінченно довго. Потребує невеликої кілько�ті енергії.
+block.large-plasma-bore.description = �нглій�ька назва: Large Plasma Bore\nБільший плазмовий бурильник. Здатний видобувати вольфрам і торій. Потребує водню та енергії.
+block.cliff-crusher.description = �нглій�ька назва: Cliff Crusher\nДробить �тіни, вивод�чи пі�ок не�кінченно довго. Вимагає енергію. Ефективні�ть залежить від типу �тіни.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = �нглій�ька назва: Impact Drill\nПри розміщенні на руді видає предмети �ері�ми до не�кінченно�ті. Потребує енергії та води.
+block.eruption-drill.description = �нглій�ька назва: Eruption Drill\nПоліпшений імпуль�ний бур. Здатний видобувати торій. Потребує водню.
+block.reinforced-conduit.description = �нглій�ька назва: Reinforced Conduit\nПереміщує рідини вперед. �е приймає нетрубоповідні входи з боків.
+block.reinforced-liquid-router.description = �нглій�ька назва: Reinforced Liquid Router\nРівномірно розподіл�є рідини на в�і �торони.
+block.reinforced-liquid-tank.description = �нглій�ька назва: Reinforced Liquid Tank\nЗберігає велику кількі�ть рідини.
+block.reinforced-liquid-container.description = �нглій�ька назва: Reinforced Liquid Container\nЗберігає значну кількі�ть рідини.
+block.reinforced-bridge-conduit.description = �нглій�ька назва: Reinforced Bridge Conduit\nТран�портує рідини над �порудами та мі�цеві�тю.
+block.reinforced-pump.description = �нглій�ька назва: Reinforced Pump\nПерекачує і виводить рідини. Потребує водню.
+block.beryllium-wall.description = �нглій�ька назва: Beryllium Wall\nЗахищає �поруди від ворожих �нар�дів.
+block.beryllium-wall-large.description = �нглій�ька назва: Beryllium Wall Large\nЗахищає �поруди від ворожих �нар�дів.
+block.tungsten-wall.description = �нглій�ька назва: Tungsten Wall\nЗахищає �поруди від ворожих �нар�дів.
+block.tungsten-wall-large.description = �нглій�ька назва: Tungsten Wall Large\nЗахищає �поруди від ворожих �нар�дів.
+block.carbide-wall.description = �нглій�ька назва: Carbide Wall\nЗахищає �поруди від ворожих �нар�дів.
+block.carbide-wall-large.description = �нглій�ька назва: Carbide Wall Large\nЗахищає �поруди від ворожих �нар�дів.
+block.reinforced-surge-wall.description = �нглій�ька назва: Reinforced Surge Wall\nЗахищає �поруди від ворожих �нар�дів, періодично випу�каючи електричні дуги при зіткненні зі �нар�дом.
+block.reinforced-surge-wall-large.description = �нглій�ька назва: Reinforced Surge Wall Large\nЗахищає �поруди від ворожих �нар�дів, періодично випу�каючи електричні дуги при зіткненні зі �нар�дом.
+block.shielded-wall.description = �нглій�ька назва: Shielded Wall\nЗахищає �поруди від ворожих �нар�дів. Розгортає щит, �кий поглинає більші�ть �нар�дів при подачі живленн�. Проводить енергію.
+block.blast-door.description = �нглій�ька назва: Blast Door\nСтіна, �ка відкриваєть��, коли наземні одиниці �оюзників знаход�ть�� в межах до��жно�ті. �е може управл�ти�� вручну.
+block.duct.description = �нглій�ька назва: Duct\nПереміщує предмети вперед. Здатний зберігати лише один предмет.
+block.armored-duct.description = �нглій�ька назва: Armored Duct\nПереміщує предмети вперед. �е приймає неканальні входи з боків.
+block.duct-router.description = �нглій�ька назва: Duct Router\nРозподіл�є речі рівномірно по трьох напр�мках. Приймає предмети тільки зі зворотного боку. Може бути налаштований �к �ортувальник предметів.
+block.overflow-duct.description = �нглій�ька назва: Overflow Duct\nВиводить предмети в �торони тільки в тому випадку, �кщо передній шл�х заблокований.
+block.duct-bridge.description = �нглій�ька назва: Duct Bridge\nПереміщує предмети по �порудах та мі�цево�ті.
+block.duct-unloader.description = �нглій�ька назва: Duct Unloader\nВивантажує вибраний елемент з блоку, що знаходить�� за ним. �еможливо вивантажити з �дер.
+block.underflow-duct.description = �нглій�ька назва: Underflow Duct\n�нтонім до надмірного затвора. Виводить на передню ча�тину, �кщо лівий і правий шл�хи заблоковані.
+block.reinforced-liquid-junction.description = �нглій�ька назва: Reinforced Liquid Junction\nВиконує функцію з’єднанн� між двома перехре�ними каналами.
+block.surge-conveyor.description = �нглій�ька назва: Surge Conveyor\nПереміщує предмети парті�ми. Можна при�корити за допомогою енергії. Проводить енергію.
+block.surge-router.description = �нглій�ька назва: Surge Router\nРівномірно розподіл�є предмети в трьох напр�мках від кінетичних конвеєрів. Можна при�корити за допомогою енергії. Проводить енергію.
+block.unit-cargo-loader.description = �нглій�ька назва: Unit Cargo Loader\nСтворює вантажні дрони. Дрони автоматично розподіл�ють предмети по пунктах розвантаженн� за допомогою відповідного фільтра.
+block.unit-cargo-unload-point.description = �нглій�ька назва: Unit Cargo Unload Point\nВи�тупає в �ко�ті пункта розвантаженн� дл� вантажних дронів. Приймає вантажі, �кі відповідають вибраному фільтру.
+block.beam-node.description = �нглій�ька назва: Beam Node\nПередає енергію іншим блокам ортогонально. Запа�ає невелику кількі�ть енергії.
+block.beam-tower.description = �нглій�ька назва: Beam Tower\nПередає енергію іншим блокам ортогонально. Зберігає велику кількі�ть енергії. Має великий радіу� дії.
+block.turbine-condenser.description = �нглій�ька назва: Turbine Condenser\nВиробл�є енергію при розміщенні на джерелах. Виробл�є невелику кількі�ть води.
+block.chemical-combustion-chamber.description = �нглій�ька назва: Chemical Combustion Chamber\nВиробл�є енергію з аркициту та озону.
+block.pyrolysis-generator.description = �нглій�ька назва: Pyrolysis Generator\nВиробл�є велику кількі�ть електроенергії з аркициту та шлаку. Виробл�є воду �к побічний продукт.
+block.flux-reactor.description = �нглій�ька назва: Flux Reactor\nПри нагріванні виділ�є велику кількі�ть енергії. Потребує ціаногену �к �табілізатора. Вихідна енергі� і потреба в ціаногені пропорційні тепловому навантаженню.\nВибухає при недо�татній кілько�ті ціаногену.
+block.neoplasia-reactor.description = �нглій�ька назва: Neoplasia Reactor\nВикори�товує аркіцит, воду і фазову тканину дл� виробництва великої кілько�ті енергії. Виробл�є тепло і небезпечні новоутворенн� �к побічний продукт.\nВибухає з �илою, �кщо новоутворенн� не видалити з реактора через трубопроводи.
+block.build-tower.description = �нглій�ька назва: Build Tower\n�втоматично перебудовує �поруди в зоні до��жно�ті та допомагає іншим одиниц�м у будівництві.
+block.regen-projector.description = �нглій�ька назва: Regen Projector\nПовільно ремонтує �уміжні �поруди у квадратному периметрі. Потребує водню.
+block.reinforced-container.description = �нглій�ька назва: Reinforced Container\nЗберігає невелику кількі�ть предметів. Вмі�т можна отримати за допомогою розвантажувачів. �е збільшує ємні�ть о�новного �ховища.
+block.reinforced-vault.description = �нглій�ька назва: Reinforced Vault\nЗберігає велику кількі�ть предметів. Вмі�т можна отримати за допомогою розвантажувачів. �е збільшує ємні�ть �дра.
+block.tank-fabricator.description = �нглій�ька назва: Tank Fabricator\nСтворює одиниці «Стел». Випущені одиниці можна викори�товувати безпо�ередньо або перемі�тити в переробний завод дл� поліпшенн�.
+block.ship-fabricator.description = �нглій�ька назва: Ship Fabricator\nСтворює одиниці «Ухил�ч». Випущені одиниці можна викори�товувати безпо�ередньо або перемі�тити в переробний завод дл� поліпшенн�.
+block.mech-fabricator.description = �нглій�ька назва: Mech Fabricator\nСтворює одиниці «Меруй». Випущені одиниці можна викори�товувати безпо�ередньо або перемі�тити в переробний завод дл� поліпшенн�.
+block.tank-assembler.description = �нглій�ька назва: Tank Assembler\nЗбирає великі танки з введених блоків та одиниць. Рівень виходу може бути збільшений шл�хом додаванн� модулів.
+block.ship-assembler.description = �нглій�ька назва: Ship Assembler\nЗбирає великі кораблі з введених блоків та одиниць. Рівень виходу може бути збільшений шл�хом додаванн� модулів.
+block.mech-assembler.description = �нглій�ька назва: Mech Assembler\nЗбирає великі мехи з введених блоків та одиниць. Рівень виходу може бути збільшений шл�хом додаванн� модулів.
+block.tank-refabricator.description = �нглій�ька назва: Tank Refabricator\nПоліпшує введені танкові одиниці до другого рівн�.
+block.ship-refabricator.description = �нглій�ька назва: Ship Refabricator\nПоліпшує введені корабельні одиниці до другого рівн�.
+block.mech-refabricator.description = �нглій�ька назва: Mech Refabricator\nПоліпшує введені мехові одиниці до другого рівн�.
+block.prime-refabricator.description = �нглій�ька назва: Prime Refabricator\nПоліпшує введені одиниці до другого рівн�.
+block.basic-assembler-module.description = �нглій�ька назва: Basic Assembler Module\nПідвищує рівень збирача, �кщо його розмі�тити поруч з межею будівлі. Потребує енергії. Може викори�товувати�� �к вхід дл� вантажу.
+block.small-deconstructor.description = �нглій�ька назва: Small Deconstructor\nДекон�труює введені кон�трукції та блоки. Повертає 100% варто�ті побудови.
+block.reinforced-payload-conveyor.description = �нглій�ька назва: Reinforced Payload Conveyor\nПереміщує вантаж вперед.
+block.reinforced-payload-router.description = �нглій�ька назва: Reinforced Payload Router\nРозподіл�є вантажі в �у�ідні блоки. Функціонує �к �ортувальник при в�тановленому фільтрі.
+block.payload-mass-driver.description = �нглій�ька назва: Payload Mass Driver\nСтруктура тран�портуванн� вантажу великої дально�ті. Ви�трілює отриманий вантаж на зв’�зані вантажні катапульти.
+block.large-payload-mass-driver.description = �нглій�ька назва: Large Payload Mass Driver\nСтруктура тран�портуванн� вантажу великої дально�ті. Ви�трілює отриманий вантаж на зв’�зані вантажні катапульти.
+block.unit-repair-tower.description = �нглій�ька назва: Unit Repair Tower\nРемонтує в�і одиниці, що знаход�ть�� поблизу. Потребує озону.
+block.radar.description = �нглій�ька назва: Radar\nПо�тупово про�вл�є мі�цеві�ть та одиниці противника у великому радіу�і. Вимагає енергії.
+block.shockwave-tower.description = �нглій�ька назва: Shockwave Tower\nПошкоджує та знищує ворожі �нар�ди в радіу�і. Потребує ціаногену.
+block.canvas.description = �нглій�ька назва: Canvas\nПоказує про�те зображенн� із заздалегідь визначеною палітрою. Можна редагувати.
+
+unit.dagger.description = �нглій�ька назва: Dagger\nВи�трілює �тандартними кул�ми в найближчих ворогах.
+unit.mace.description = �нглій�ька назва: Mace\nВи�трілює потоками полум’� в найближчих ворогів.
+unit.fortress.description = �нглій�ька назва: Fortress\nВи�трілює з далекобійної артилерії в наземних цілей.
+unit.scepter.description = �нглій�ька назва: Scepter\nВи�трілює шквалом зар�джених куль у найближчих ворогів.
+unit.reign.description = �нглій�ька назва: Reign\nВи�трілює шквалом ма�ивних пронизливих куль у найближчих ворогів.
+unit.nova.description = �нглій�ька назва: Nova\nВи�трілює лазерними болтами, що завдають шкоди ворогам та відновлюють �оюзні �поруди. Здатний до польоту.
+unit.pulsar.description = �нглій�ька назва: Pulsar\nВипу�кає дуги електрики, що завдають шкоди ворогам та відновлюють �оюзні �поруди. Здатний до польоту.
+unit.quasar.description = �нглій�ька назва: Quasar\nВи�трілює пробивними лазерними промен�ми, що пошкоджують ворогів та відновлюють �оюзні �поруди. Здатний до польоту. Захищений.
+unit.vela.description = �нглій�ька назва: Vela\nВи�трілює ма�ивним безперервним лазерним променем, що завдає шкоди ворогам, �причин�є пожежі та відновлює �оюзні �поруди. Здатний до польоту.
+unit.corvus.description = �нглій�ька назва: Corvus\nСпричин�є ма�ивний лазерний вибух, що завдає шкоди ворогам та відновлює �поріднені �поруди. Може пере�тупати через більші�ть мі�цево�ті.
+unit.crawler.description = �нглій�ька назва: Crawler\nБіжить до ворогів і �амознищуєть��, викликаючи великий вибух.
+unit.atrax.description = �нглій�ька назва: Atrax\nВипалює ви�нажливі шари шлаку в наземних ціл�х. Може пере�тупити більші�ть мі�цево�ті.
+unit.spiroct.description = �нглій�ька назва: Spiroct\nВи�трілює ви�нажливими лазерними промен�ми у ворогів, відновлюючи�ь водноча�. Може пере�тупати через більші�ть мі�цево�ті.
+unit.arkyid.description = �нглій�ька назва: Arkyid\nВи�трілює у ворогів великими ви�нажливими лазерними промен�ми, відновлюючи�ь при цьому.
+unit.toxopid.description = �нглій�ька назва: Toxopid\nВи�трілює у ворогів великими електричними ка�етними �нар�дами та пробивними лазерами. Може пере�тупати через більші�ть мі�цево�ті.
+unit.flare.description = �нглій�ька назва: Flare\nВи�трілює �тандартними кул�ми в найближчі цілі.
+unit.horizon.description = �нглій�ька назва: Horizon\nКидає купу бомб на наземні цілі.
+unit.zenith.description = �нглій�ька назва: Zenith\nВи�трілює залпи ракет у в�іх найближчих ворогів.
+unit.antumbra.description = �нглій�ька назва: Antumbra\nВи�трілює шквал куль у в�іх найближчих ворогів.
+unit.eclipse.description = �нглій�ька назва: Eclipse\nВи�трілює двома пронизливими лазерами та шквалом куль у в�іх найближчих ворогів.
+unit.mono.description = �нглій�ька назва: Mono\n�втоматично видобуває мідь і �винець і кладе їх у �дро.
+unit.poly.description = �нглій�ька назва: Poly\n�втоматично перебудовує зруйновані �поруди та допомагає іншим одиниц�м у будівництві.
+unit.mega.description = �нглій�ька назва: Mega\n�втоматично відновлює пошкоджені �поруди. Здатний не�ти блоки та невеликі наземні одиниці.
+unit.quad.description = �нглій�ька назва: Quad\nКидає великі бомби на наземні цілі, відновлюючи �оюзні �поруди та завдаючи шкоди ворогам. Здатний не�ти �ередні наземні одиниці.
+unit.oct.description = �нглій�ька назва: Oct\nЗахищає найближчих �оюзників �воїм відновлювальним щитом. Здатний не�ти більші�ть наземних одиниць.
+unit.risso.description = �нглій�ька назва: Risso\nВи�трілює шквалом ракет і куль по в�іх найближчих ворогах.
+unit.minke.description = �нглій�ька назва: Minke\nВи�трілює запальними �нар�дами та �тандартними кул�ми по найближчих наземних ціл�х.
+unit.bryde.description = �нглій�ька назва: Bryde\nВи�трілює у ворогів артилерій�ькими �нар�дами та ракетами великої дально�ті.
+unit.sei.description = �нглій�ька назва: Sei\nВи�трілює у ворогів шквалом ракет і бронебійних куль.
+unit.omura.description = �нглій�ька назва: Omura\nВи�трілює у ворогів далекобійним болтом, що пробиває броню. Виробл�є повітр�них �палахів.
+unit.alpha.description = �нглій�ька назва: Alpha\nЗахищає �дро «Уламок» від противників. Будує �поруди.
+unit.beta.description = �нглій�ька назва: Beta\nЗахищає �дро «Штаб» від противників. Будує �поруди.
+unit.gamma.description = �нглій�ька назва: Gamma\nЗахищає �дро «�том» від противників. Будує �поруди.
+unit.retusa.description = �нглій�ька назва: Retusa\nВи�трілює �амонаведеними торпедами по ворогах. Ремонтує найближчі одиниці.
+unit.oxynoe.description = �нглій�ька назва: Oxynoe\nВи�трілює потоками полум’�, що ремонтують �поруди та завдають шкоду ворогам. Захищає від ворожих �нар�дів за допомогою башти точкової оборони.
+unit.cyerce.description = �нглій�ька назва: Cyerce\nВи�трілює у ворогів навідними ка�етними ракетами. Ремонтує найближчі одиниці.
+unit.aegires.description = �нглій�ька назва: Aegires\nЕлектризує ворожі одиниці та будівлі, що вход�ть до його енергетичного пол�. Ремонтує в�іх �оюзників.
+unit.navanax.description = �нглій�ька назва: Navanax\nВи�трілює вибухонебезпечні �нар�ди електромагнітного імпуль�у, завдаючи значної шкоди ворожим енергетичним мережам та ремонтуючи �оюзницькі �поруди. Розплавл�є �у�ідніх ворогів за допомогою 4 автономних лазерних веж.
+
+#Erekir
+unit.stell.description = �нглій�ька назва: Stell\nВеде вогонь по ворожих ціл�х звичайними кул�ми.
+unit.locus.description = �нглій�ька назва: Locus\nВеде почерговий вогонь по ворожих ціл�х.
+unit.precept.description = �нглій�ька назва: Precept\nВеде вогонь по ворожих ціл�х ка�етними кумул�тивними кул�ми.
+unit.vanquish.description = �нглій�ька назва: Vanquish\nВеде вогонь по ворожих ціл�х великими пробивними о�колково-фуга�ними кул�ми.
+unit.conquer.description = �нглій�ька назва: Conquer\nВеде вогонь великими пробивними ка�кадами куль по ворожих ціл�х.
+unit.merui.description = �нглій�ька назва: Merui\nВеде вогонь з далекобійної артилерії по наземних ціл�х противника. Може пере�увати�� по більшо�ті видів мі�цево�ті.
+unit.cleroi.description = �нглій�ька назва: Cleroi\nВеде вогонь здвоєними �нар�дами по ворожих ціл�х. Прицільно знищує �нар�ди противника за допомогою точкових захи�них башт. Може пере�увати�� по більшо�ті видів мі�цево�ті.
+unit.anthicus.description = �нглій�ька назва: Anthicus\nВеде вогонь по ворожих ціл�х ракетами дальнього радіу�а дії з �амонаведенн�м. Може пере�увати�� по більшо�ті видів мі�цево�ті.
+unit.tecta.description = �нглій�ька назва: Tecta\nВеде вогонь �амонавідними плазмовими ракетами по ворожих ціл�х. Захищаєть�� за допомогою щита �пр�мованої дії. Може пере�увати�� по більшо�ті видів мі�цево�ті.
+unit.collaris.description = �нглій�ька назва: Collaris\nВеде дальній о�колково-фуга�ний вогонь по ворожих ціл�х. Може пере�увати�� по більшо�ті видів мі�цево�ті.
+unit.elude.description = �нглій�ька назва: Elude\nСтріл�є парами �амонавідних куль по ворожих ціл�х. Може парити над об’єктами з рідиною.
+unit.avert.description = �нглій�ька назва: Avert\nВеде вогонь по ворожих ціл�х закрученими парами куль.
+unit.obviate.description = �нглій�ька назва: Obviate\nСтріл�є по ворожих ціл�х закрученими парами бли�кавичних куль.
+unit.quell.description = �нглій�ька назва: Quell\nВеде вогонь далекобійними �амонавідними ракетами по об’єктах противника. Блокує ремонтні пункти �упротивника. �такує тільки наземні цілі.
+unit.disrupt.description = �нглій�ька назва: Disrupt\nВеде вогонь ракетами дальнього радіу�а дії з �амонаведенн�м по об’єктах противника. Блокує ремонтні пункти �упротивника. �такує тільки наземні цілі.
+unit.evoke.description = �нглій�ька назва: Evoke\nБудує �поруди дл� захи�ту �дра «Ба�тіон». Ремонтує �поруди за допомогою промен�.
+unit.incite.description = �нглій�ька назва: Incite\nБудує �поруди дл� захи�ту �дра «Цитадель». Ремонтує �поруди за допомогою промен�.
+unit.emanate.description = �нглій�ька назва: Emanate\nБудує �поруди дл� захи�ту �дра «�крополь». Ремонтує �поруди за допомогою промен�.
+
+lst.read = Зчитує чи�ло із з’єднаної комірки пам’�ті.
+lst.write = Запи�ує чи�лу у з’єднану комірку пам’�ті.
+lst.print = Додайте тек�т до буфера друку.\n�ічого не відображає, поки [accent]Print Flush[] викори�товуєть��.
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Замінити на�тупний замінник у тек�товому буфері значенн�м.\n�е робить нічого, �кщо шаблон заповнювача є недій�ним.\nШаблон заповнювача: "{[accent]number 0-9[]}"\nПриклад:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Додає операцію до буфера ри�унка.\n�ічого не відображає, поки [accent]Draw Flush[] викори�товуєть��.
+lst.drawflush = Скидає буфер операцій [accent]Draw[] на ди�плей.
+lst.printflush = Скидає буфер операцій [accent]Print[] у блок «Повідомленн�».
+lst.getlink = Отримати по�иланн� на проце�ор за допомогою індек�а. Починаєть�� з 0.
+lst.control = Контролює будівлю.
+lst.radar = Знаходженн� одиниць навколо будівлі у радіу�і дії.
+lst.sensor = Отримати дані з певної будівлі чи одиниці.
+lst.set = У�тановити значенн� змінної.
+lst.operation = Виконує операцію над 1-2 змінними.
+lst.end = Перейти до верхньої ча�тини �теку операцій.
+lst.wait = Чекати певну кількі�ть �екунд.
+lst.stop = Зупин�є виконанн� проце�ора.
+lst.lookup = Знайти тип предмета, рідини, одиниці чи блоку за ідентифікатором.\nМожна отримати до�туп до загальної кілько�ті кожного типу через \n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nДл� зворотної операції викори�товуйте [accent]@id[] об'єкта.
+lst.jump = Умовне переходженн� до іншої операції.
+lst.unitbind = Прив’�зка до одиниці певного типу та його зберіганн� в [accent]@unit[].
+lst.unitcontrol = Контролювати поточну прив’�зану одиницю.
+lst.unitradar = Знайти одиницю біл� поточної прив’�заної одиниці.
+lst.unitlocate = Ви�вл�є позицію чи будівлю певного типу де завгодно на мапі.\nПотрібна прив’�зана одиниц�.
+lst.getblock = Отримує дані плитки в будь-�кому мі�ці.
+lst.setblock = У�тановлює дані плитки в будь-�кому мі�ці.
+lst.spawnunit = Породжує одиницю на певному мі�ці.
+lst.applystatus = За�то�овує або видал�є ефект �тану з одиниці.
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = Змодельовує хвилю, що виникає у довільному мі�ці.\n�е збільшує лічильник хвиль.
+lst.explosion = Створює вибух у певному мі�ці.
+lst.setrate = У�тановлює швидкі�ть виконанн� проце�ора в ін�трукці�х за такт.
+lst.fetch = Пошук одиниць, �дер, гравців або будівель за індек�ом.\nІндек�и починають�� з 0 і закінчують�� на поверненій кілько�ті.
+lst.packcolor = Упаковує [0, 1] компоненти RGBA в єдине чи�ло дл� малюванн� або в�тановленн� правил.
+lst.setrule = У�тановлює ігрове правило.
+lst.flushmessage = Показує повідомленн� на екрані з тек�тового буфера.\nЧекатиме, поки не закінчить�� попереднє повідомленн�.
+lst.cutscene = Керує камерою гравц�.
+lst.setflag = У�тановлює глобальний прапорець, �кий можуть прочитати у�і проце�ори.
+lst.getflag = Перевір�є, чи в�тановлено глобальний прапорець.
+lst.setprop = У�тановлює вла�тиві�ть одиниці чи будівлі.
+lst.effect = Створює ефект ча�тинок.
+lst.sync = Синхронізувати змінну по мережі.\nВикликаєть�� щонайбільше 10 разів за �екунду.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Створює новий логічний маркер у �віті.\nПотрібно надати ідентифікатор дл� ідентифікації цього маркера.\n�аразі кількі�ть маркерів на �віт обмежена 20 ти��чами.
+lst.setmarker = У�тановлює вла�тиві�ть дл� маркера.\nВикори�таний ідентифікатор має збігати�� з ін�трукцією «Створити маркер».
+lst.localeprint = Додає значенн� вла�тиво�ті мовного пакету мапи до тек�тового буфера.\nЩоби в�тановити мовного пакету мапи в редакторі мапи, перейдіть до [accent]Інформаці� про мапу > Мовні пакети [].\nЯкщо клієнтом є мобільний при�трій, то �початку намагаєть�� надрукувати вла�тиві�ть, що закінчуєть�� на ".mobile".
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = Математична кон�танта пі (3.141...)
+lglobal.@e = Математична кон�танта e (2.718...)
+lglobal.@degToRad = Помножте на це чи�ло, щоб переве�ти граду�и в радіани
+lglobal.@radToDeg = Помножте на це чи�ло, щоб переве�ти радіани в граду�и
+lglobal.@time = Ча� гри поточного збереженн�, у мілі�екундах
+lglobal.@tick = Ча� гри поточного збереженн�, in ticks (1 �екунда = 60 ticks)
+lglobal.@second = Ча� гри поточного збереженн�, в �екундах
+lglobal.@minute = Ча� гри поточного збереженн�, у хвилинах
+lglobal.@waveNumber = Поточний номер хвилі, �кщо хвилі ввімкнено
+lglobal.@waveTime = Таймер зворотного відліку дл� хвиль, в �екундах
+lglobal.@mapw = Ширина мапи в плитках
+lglobal.@maph = Ви�ота мапи в плитках
+lglobal.sectionMap = Мапа
+lglobal.sectionGeneral = Загальне
+lglobal.sectionNetwork = Мережа/Клієнт�ька ча�тина [Тільки �вітовий проце�ор]
+lglobal.sectionProcessor = Проце�ор
+lglobal.sectionLookup = Пошук
+lglobal.@this = Логічний блок, що виконує код
+lglobal.@thisx = X координата блоку, що виконує код
+lglobal.@thisy = Y координата блоку, що виконує код
+lglobal.@links = Загальна кількі�ть блоків, пов'�заних з цим проце�ором
+lglobal.@ipt = Швидкі�ть виконанн� проце�ора в ін�трукці�х за тик (60 ticks = 1 �екунда)
+lglobal.@unitCount = Загальна кількі�ть типів вмі�ту одиниць у грі; викори�товуєть�� з ін�трукцією lookup 
+lglobal.@blockCount = Загальна кількі�ть типів вмі�ту блоків у грі; викори�товуєть�� з ін�трукцією lookup
+lglobal.@itemCount = Загальна кількі�ть типів вмі�ту предметів у грі; викори�товуєть�� з ін�трукцією lookup
+lglobal.@liquidCount = Загальна кількі�ть типів вмі�ту рідин у грі; викори�товуєть�� з ін�трукцією lookup 
+lglobal.@server = І�тина, �кщо код виконуєть�� на �ервері або в одноо�ібній грі, інакше хиба
+lglobal.@client = І�тина, �кщо код виконуєть�� на клієнті, підключеному до �ервера
+lglobal.@clientLocale = Локалізаці� клієнта, на �кому виконуєть�� код. �априклад: en_US чи uk_UA
+lglobal.@clientUnit = Одиниц� клієнта, що виконує код
+lglobal.@clientName = Ім'� гравц� клієнта, на �кому запущено код
+lglobal.@clientTeam = Ідентифікатор команди клієнта, що запу�кає код
+lglobal.@clientMobile = І�тина, �кщо клієнт, на �кому виконуєть�� код, є мобільним, інакше хиба
+
+logic.nounitbuild = [red]Будуванн� за допомогою проце�орів заборонено.
+
+lenum.type = Тип будівлі чи одиниці.\n�априклад, дл� будь-�кого маршрутизатора (англ. router), функці� вертатиме [accent]@router[].\n�е є р�дком.
+lenum.shoot = Стріл�ти в зазначену позицію.
+lenum.shootp = Стріл�ти в одиницю чи будівлю із передбаченн�м швидко�ті.
+lenum.config = Конфігураці� будівлі, �к-от в �ортувальника.
+lenum.enabled = Чи блок увімкнено.
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = Колір о�вітлювача.
+laccess.controller = Керувач одиниц�ми. Якщо проце�ор керує одиницею, повертає проце�ор.\nЯкщо у формуванні, повертаєть�� лідер.\nІнакше повертає �аму одиницю.
+laccess.dead = Чи є одиниц� або будівл� мертвою або недій�ною.
+laccess.controlled = Повертає \n[accent]@ctrlProcessor[] �кщо одиниц� контролюєть�� проце�ором;\n[accent]@ctrlPlayer[] �кщо одиниц� чи будівл� контролюєть гравцем\n[accent]@ctrlFormation[] �кщо одиниц� у загоні (формуванні)\nІнакше — 0.
+laccess.progress = Прогре� дії, від 0 до 1.\nПовертає виробництво, перезавантаженн� башти або хід будівництва.
+laccess.speed = Мак�имальна швидкі�ть одиниці, у плитках за �екунду.
+laccess.id = Ідентифікатор одиниці/блоку/предмету/рідини.\nЦе зворотна операці� до операції пошуку.
+
+lcategory.unknown = �евідома категорі�
+lcategory.unknown.description = Команди без категорії.
+lcategory.io = Ввід та вивід
+lcategory.io.description = Змінюйте вмі�т комірок/блоків пам’�ті та буфера проце�ора.
+lcategory.block = Контроль блоків
+lcategory.block.description = Взаємодійте з блоками.
+lcategory.operation = Операції
+lcategory.operation.description = Логічні операції.
+lcategory.control = Управлінн� кодом
+lcategory.control.description = Контролюйте пор�док виконанн� коду.
+lcategory.unit = Управлінн� одиниц�ми
+lcategory.unit.description = Віддавайте одиниц�м команди.
+lcategory.world = Світ
+lcategory.world.description = Контролюйте поведінку �віту.
+
+graphicstype.clear = Залити ди�плей вказаним кольором.
+graphicstype.color = У�тановити колір дл� подальшої операції малюванн�.
+graphicstype.col = Еквівалент кольору, але упакований.\nЗапаковані кольори запи�ують�� �к ші�тнадц�ткові коди з префік�ом [accent]%[].\n�априклад, [accent]%ff0000[] — це червоний.
+graphicstype.stroke = У�тановити ширину ліній.
+graphicstype.line = �акре�лити відрізок лінії.
+graphicstype.rect = Залити кольором пр�мокутник.
+graphicstype.linerect = �амалювати контур пр�мокутника.
+graphicstype.poly = Залити кольором правильний багатокутник.
+graphicstype.linepoly = �амалювати контур правильного багатокутника.
+graphicstype.triangle = Залити кольором трикутник.
+graphicstype.image = �амалювати зображенн� із де�ким вмі�том.\n�априклад: [accent]@router[] чи [accent]@dagger[].
+graphicstype.print = Малює тек�т з буфера друку.\nОчищає буфер друку.
+
+lenum.always = Завжди і�тинне.
+lenum.idiv = Ціле діленн�.
+lenum.div = Діленн�.\nПовертає [accent]null[] при діленні на нуль.
+lenum.mod = Залишок від діленн�.
+lenum.equal = Рівно. Приму�ове приведенн� типів.\n�е-null об’єкти у порівн�нні з чи�лами �тають 1, інакше — 0.
+lenum.notequal = �е рівно. Приму�ове приведенн� типів.
+lenum.strictequal = Сувора рівні�ть. Приму�ового приведенн� типів немає.\nМожна викори�тати дл� перевірки на [accent]null[].
+lenum.shl = З�ув бітів ліворуч.
+lenum.shr = З�ув бітів праворуч.
+lenum.or = Побітове �БО (OR).
+lenum.land = Побітове логічне І.
+lenum.and = Побітове І.
+lenum.not = Побітове запереченн�.
+lenum.xor = Виключне �БО (XOR).
+
+lenum.min = Мінімум з двох чи�ел.
+lenum.max = Мак�имум з двох чи�ел.
+lenum.angle = Кут вектора у граду�ах.
+lenum.anglediff = �б�олютна від�тань між двома кутами в граду�ах.
+lenum.len = Довжина вектора.
+
+lenum.sin = Сину�, у граду�ах.
+lenum.cos = Ко�ину�, у граду�ах.
+lenum.tan = Танген�, у граду�ах.
+
+lenum.asin = �рк�ину�, у граду�ах.
+lenum.acos = �ркко�ину�, у граду�ах.
+lenum.atan = �рктанген�, у граду�ах.
+
+#not a typo, look up 'range notation'
+lenum.rand = Випадкове де��ткове чи�ло у діапазоні [0, значенн�).
+lenum.log = �атуральний логарифм (ln).
+lenum.log10 = Де��тковий логарифм.
+lenum.noise = Двовимірний �имлек�-шум.
+lenum.abs = �б�олютне значенн�.
+lenum.sqrt = Квадратний корінь.
+
+lenum.any = Будь-�ка одиниц�.
+lenum.ally = Союзна одиниц�.
+lenum.attacker = Одиниц� зі зброєю.
+lenum.enemy = Ворожа одиниц�.
+lenum.boss = Одиниц� «Вартовий».
+lenum.flying = Одиниц�, що літає.
+lenum.ground = �аземна одиниц�.
+lenum.player = Одиниц�, керована гравцем.
+
+lenum.ore = Родовище руди.
+lenum.damaged = Пошкоджені �оюзні будівлі.
+lenum.spawn = Точка по�ви ворогів.\nМоже бути �дром чи позицією.
+lenum.building = Будуванн� певної групи.
+
+lenum.core = Будь-�ке �дро.
+lenum.storage = Склад�ьке приміщенн�, �к-от �ховище.
+lenum.generator = Будівлі, що виробл�ють енергію.
+lenum.factory = Будівлі, що видозмінюють ре�ур�и.
+lenum.repair = Ремонтні пункти.
+lenum.battery = Будь-�кий акумул�тор.
+lenum.resupply = Пункти по�тачанн�.\nДоречні лише коли кори�тувацьке правило [accent]«Бойові одиниці потребують боєприпа�ів»[] увімкнено.
+lenum.reactor = Імпуль�ний чи торієвий реактор.
+lenum.turret = Будь-�ка башта.
+
+sensor.in = Будівл� чи одиниц� дл� розпізнаванн�.
+
+radar.from = Від �кої будівлі треба розпізнавати.\nРадіу� розпізнаванн� обмежено радіу�ом будівництва.
+radar.target = Фільтр дл� розпізнаванн� одиниць.
+radar.and = Додаткові фільтри.
+radar.order = Пор�док �ортуванн�. 0 — �ортуванн� у зворотному пор�дку.
+radar.sort = Показник дл� �ортуванн� результатів.
+radar.output = Змінна дл� запи�ув вихідної одиниці.
+
+unitradar.target = Фільтр дл� розпізнаванн� одиниць.
+unitradar.and = Додаткові фільтри.
+unitradar.order = Пор�док �ортуванн�. 0 — �ортуванн� у зворотному пор�дку.
+unitradar.sort = Показник дл� �ортуванн� результатів.
+unitradar.output = Змінна дл� запи�ув вихідної одиниці.
+
+control.of = Будівл� дл� контролюванн�.
+control.unit = Одиниц� чи будівл� дл� прицілюванн�.
+control.shoot = Чи �тріл�є.
+
+unitlocate.enemy = Чи знаходити ворожі будівлі.
+unitlocate.found = Чи був об’єкт знайдений.
+unitlocate.building = Змінна дл� запи�у знайденої будівлі
+unitlocate.outx = Виводить координату X.
+unitlocate.outy = Виводить координату Y.
+unitlocate.group = Група будівель дл� пошуку.
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = Зупин�ти рух, проте продовжути будувати чи видобувати.\nСтан за замовчуванн�м.
+lenum.stop = Зупинити або рух, або видобуток, або будівництво.
+lenum.unbind = Повні�тю вимикає у�ю логіку.\nПродовжує �тандартний ШІ.
+lenum.move = Перемі�тити в точне положенн�.
+lenum.approach = �аближенн� до позиції із зазначеним радіу�ом.
+lenum.pathfind = Знайденн� шл�ху до певної позиції.
+lenum.autopathfind = �втоматично прокладає шл�х до найближчого �дра або точки �киданн� ворога.\nЦе те �аме, що і �тандартне прокладанн� шл�ху у ворогів з хвиль.
+lenum.target = Стрільба в задану позицію.
+lenum.targetp = Стріл�ти в ціль із передбаченн�м швидко�ті.
+lenum.itemdrop = Викинути предмет.
+lenum.itemtake = Вз�ти предмет з будівлі.
+lenum.paydrop = Скинути поточний вантаж.
+lenum.paytake = Підібрати вантаж у поточному мі�церозташуванні.
+lenum.payenter = Увійти чи вийти з вантажного блока, над �ким перебуває одиниц�.
+lenum.flag = Чи�ловий прапорець одиниці.
+lenum.mine = Видобувати у заданій позиції.
+lenum.build = Побудувати будівлю.
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = Чи знаходить�� одиниц� біл� позиції.
+lenum.boost = Почати чи зупинити політ.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index d45c16a170..1f904b1334 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1,18 +1,20 @@
 credits.text = �ược tạo ra bởi [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Danh đ�
 contributors = Ngư�i dịch và đóng góp
-discord = Tham gia Mindustry Discord!
-link.discord.description = Mindustry Discord chính thức
-link.reddit.description = Mindustry subreddit
+discord = Tham gia Discord của Mindustry!
+link.discord.description = Discord chính thức của Mindustry
+link.reddit.description = Subreddit của Mindustry
 link.github.description = Mã nguồn trò chơi
-link.changelog.description = Danh sách các thay đổi.
+link.changelog.description = Danh sách các thay đổi
 link.dev-builds.description = Các bản dựng phát triển không ổn định
-link.trello.description = Official Trello board cho các tính năng được lên kế hoạch
-link.itch.io.description = itch.io page với bản tải xuống cho PC
-link.google-play.description = Google Play store listing
-link.f-droid.description = F-Droid listing
-link.wiki.description = Mindustry wiki chính thức
+link.trello.description = Bảng Trello chính thức cho các tính năng được lên kế hoạch
+link.itch.io.description = Trang itch.io với bản tải xuống cho PC
+link.google-play.description = Xem trên Google Play store
+link.f-droid.description = Xem trên F-Droid
+link.wiki.description = Wiki chính thức của Mindustry
 link.suggestions.description = �� xuất các tính năng mới
+link.bug.description = Tìm thấy lỗi? Báo cáo ở đây
+linkopen = Máy chủ này đã gửi cho bạn một liên kết. Có chắc muốn mở nó chứ?\n\n[sky]{0}
 linkfail = Không mở được liên kết!\nURL đã được sao chép vào bộ nhớ tạm.
 screenshot = Ảnh chụp màn hình được lưu vào {0}
 screenshot.invalid = Bản đồ quá lớn, có khả năng không đủ bộ nhớ để chụp ảnh màn hình.
@@ -23,134 +25,186 @@ gameover.waiting = [accent]�ang đợi bản đồ tiếp theo...
 highscore = [accent]�iểm cao mới!
 copied = �ã sao chép.
 indev.notready = Phần này của trò chơi chưa sẵn sàng
-indev.campaign = [accent]Bạn đã đến cuối chiến dịch![]\n\nDu hành liên hành tinh sẽ được bổ sung trong các bản cập nhật tương lai.
 
 load.sound = Âm thanh
 load.map = Bản đồ
 load.image = Hình ảnh
 load.content = Ná»™i dung
 load.system = Hệ thống
-load.mod = Mods
-load.scripts = Scripts
+load.mod = Danh sách mod
+load.scripts = Ngữ lệnh
 
-be.update = �ã tìm thấy bản cập nhật mới:
+be.update = �ã tìm thấy bản dựng mới của Bleeding Edge:
 be.update.confirm = Tải xuống và khởi động lại ngay bây gi�?
 be.updating = �ang cập nhật...
-be.ignore = B� qua
-be.noupdates = Không tìm thấy bản cập nhật mới.
-be.check = Kiểm tra các bản cập nhật.
+be.ignore = Phớt l�
+be.noupdates = Không tìm thấy bản cập nhật.
+be.check = Kiểm tra các bản cập nhật
 
-schematic = Schematic
-schematic.add = LÆ°u Schematic...
-schematics = Schematics
-schematic.replace = Schematics có tên đó đã tồn tại. Thay thế nó?
-schematic.exists = Schematics có tên đó đã tồn tại.
-schematic.import = Nhập Schematic...
+mods.browser = Duyệt mod
+mods.browser.selected = Mod đã ch�n
+mods.browser.add = Cài đặt
+mods.browser.reinstall = Cài đặt lại
+mods.browser.view-releases = Xem các bản phát hành
+mods.browser.noreleases = [scarlet]Không Tìm Thấy Bản Phát Hành Nào\n[accent]Không thể tìm thấy bất cứ bản phát hành nào cho mod này. Hãy kiểm tra xem kho lưu trữ (repo) của mod đã có bản phát hành nào chưa.
+mods.browser.latest = [lightgray][Mới nhất]
+mods.browser.releases = Các bản phát hành
+mods.github.open = Repo
+mods.github.open-release = Trang phát hành
+mods.browser.sortdate = Sắp xếp theo gần đây
+mods.browser.sortstars = Sắp xếp theo sao
+
+schematic = Bản thiết kế
+schematic.add = Lưu bản thiết kế...
+schematics = Các bản thiết kế
+schematic.search = Tìm kiếm các bản thiết kế...
+schematic.replace = Bản thiết kế có tên đó đã tồn tại. Thay thế nó?
+schematic.exists = Bản thiết kế có tên đó đã tồn tại.
+schematic.import = Nhập Bản thiết kế...
 schematic.exportfile = Xuất tệp
 schematic.importfile = Nhập tệp
 schematic.browseworkshop = Duyệt qua Workshop
-schematic.copy = Sao chép vào bộ nhớ tạm
-schematic.copy.import = Nhập từ bộ nhớ tạm
-schematic.shareworkshop = Chia sẻ từ Workshop
-schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Lật Schematic
-schematic.saved = �ã lưu Schematic.
-schematic.delete.confirm = Schematic này sẽ bị xóa hoàn toàn.
-schematic.rename = �ổi tên Schematic
+schematic.copy = Sao chép vào Bộ nhớ tạm
+schematic.copy.import = Thêm từ Bộ nhớ tạm
+schematic.shareworkshop = Chia sẻ lên Workshop
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Lật bản thiết kế
+schematic.saved = �ã lưu bản thiết kế.
+schematic.delete.confirm = Bản thiết kế này sẽ bị xóa hoàn toàn.
+schematic.edit = Chỉnh sửa bản thiết kế
 schematic.info = {0}x{1}, {2} khối
-schematic.disabled = [scarlet]Tính năng Schematics đã bị tắt[]\nBạn không được sử dụng schematic trong [accent]bản đồ[] hoặc [accent]máy chủ.
+schematic.disabled = [scarlet]Bản thiết kế đã bị tắt[]\nBạn không được sử dụng bản thiết kế trong [accent]bản đồ[] hoặc [accent]máy chủ.
+schematic.tags = Thẻ:
+schematic.edittags = Chỉnh sửa thẻ
+schematic.addtag = Thêm thẻ
+schematic.texttag = Thẻ văn bản
+schematic.icontag = Thẻ biểu tượng
+schematic.renametag = �ổi tên thẻ
+schematic.tagged = {0} thẻ đã gắn
+schematic.tagdelconfirm = Xóa hoàn toàn thẻ này?
+schematic.tagexists = Thẻ đó đã tồn tại.
 
 stats = Thống kê
-stat.wave = �ợt đã vượt qua:[accent] {0}
-stat.enemiesDestroyed = Kẻ thù bị tiêu diệt:[accent] {0}
-stat.built = Số công trình đã xây dựng:[accent] {0}
-stat.destroyed = Số công trình đã bị phá:[accent] {0}
-stat.deconstructed = Số công trình được xây dựng lại:[accent] {0}
-stat.delivered = Lượng tài nguyên được phóng:
-stat.playtime = Th�i gian chơi:[accent] {0}
-stat.rank = Xếp hạng: [accent]{0}
+stats.wave = �ợt đã vượt qua
+stats.unitsCreated = Số đơn vị đã tạo
+stats.enemiesDestroyed = Số kẻ địch đã tiêu diệt
+stats.built = Số công trình đã xây
+stats.destroyed = Số công trình bị phá hủy
+stats.deconstructed = Số công trình đã phá dỡ
+stats.playtime = Th�i gian chơi
 
-globalitems = [accent]Toàn bộ vật phẩm
+globalitems = [accent]Vật phẩm của hành tinh
 map.delete = Bạn có chắc chắn muốn xóa bản đồ "[accent]{0}[]"?
-level.highscore = �iểm cao nhất: [accent]{0}
+level.highscore = �iểm cao: [accent]{0}
 level.select = Ch�n cấp độ
-level.mode = Chế độ:
-coreattack = < Căn cứ đang bị tấn công! >
-nearpoint = [[ [scarlet]RỜI KHỎI �IỂM THẢ NGAY LẬP TỨC[] ]\nsự hủy diệt sắp xảy ra
-database = Cơ sở dữ liệu căn cứ
+level.mode = Chế độ chơi:
+coreattack = < Lõi đang bị tấn công! >
+nearpoint = [[ [scarlet]RỜI KHỎI �IỂM ��P NGAY LẬP TỨC[] ]\nsự hủy diệt sắp xảy ra
+database = Cơ sở dữ liệu cốt lõi
+database.button = Cơ sở dữ liệu
 savegame = Lưu trò chơi
-loadgame = Tải trò chơi
+loadgame = Tải lại màn chơi
 joingame = Tham gia trò chơi
-customgame = Tùy chỉnh
+customgame = Trò chơi tùy chỉnh
 newgame = Trò chơi mới
-none = <trống>
-minimap = Bản đồ mini
+none = <không có>
+none.found = [lightgray]<không tìm thấy>
+none.inmap = [lightgray]<không có trong bản đồ>
+minimap = Bản đồ nh�
 position = Vị trí
 close = �óng
-website = Website
+website = Trang web
 quit = Thoát
 save.quit = Lưu & Thoát
-maps = Maps
-maps.browse = Duyệt bản đồ
+maps = Bản đồ
+maps.browse = Duyệt qua bản đồ
 continue = Tiếp tục
-maps.none = [lightgray]Không có bản đồ nào được tìm thấy!
+maps.none = [lightgray]Không tìm thấy bản đồ!
 invalid = Không hợp lệ
 pickcolor = Ch�n màu
 preparingconfig = �ang chuẩn bị cấu hình
 preparingcontent = �ang chuẩn bị nội dung
 uploadingcontent = �ang tải lên nội dung
 uploadingpreviewfile = �ang tải lên tệp xem trước
-committingchanges = �ang cập nhật các thay đổi
+committingchanges = �ang ủy thác các thay đổi
 done = Hoàn tất
 feature.unsupported = Thiết bị của bạn không hỗ trợ tính năng này.
 
-mods.alphainfo = Hãy nhớ rằng các bản mod đang ở giai đoạn alpha, và[scarlet] có thể chứa rất rất lỗi[].\nBáo cáo bất kỳ vấn đ� nào bạn gặp phải tại Mindustry GitHub.
-mods = Mods
-mods.none = [lightgray]Không có mod nào được tìm thấy!
+mods.initfailed = [red]⚠[] Mindustry không khởi chạy được. �i�u này có thể do các mod bị lỗi.\n\n�ể tránh gặp sự cố lặp lại, [red]tất cả các mod đã bị tắt.[]
+mods = Danh sách mod
+mods.none = [lightgray]Không tìm thấy mod!
 mods.guide = Hướng dẫn mod
 mods.report = Báo lỗi
 mods.openfolder = Mở thư mục
+mods.viewcontent = Xem ná»™i dung
 mods.reload = Tải lại
-mods.reloadexit = Trò chơi sẽ đóng để tải lại mod.
+mods.reloadexit = Trò chơi sẽ đóng để mod được tải lại.
+mod.installed = [[�ã cài đặt]
 mod.display = [gray]Mod:[orange] {0}
-mod.enabled = [lightgray]�ã Bật
-mod.disabled = [scarlet]�ã Tắt
+mod.enabled = [lightgray]�ã bật
+mod.disabled = [red]�ã tắt
+mod.multiplayer.compatible = [gray]Tương thích với chế độ nhi�u ngư�i chơi
 mod.disable = Tắt
+mod.version = Phiên bản:
 mod.content = Ná»™i dung:
 mod.delete.error = Không thể xóa mod. Tệp có thể đang được sử dụng.
-mod.requiresversion = [scarlet]Cần phiên bản tối thiểu: [accent]{0}
-mod.outdated = [scarlet]Không tương thích với V6 (no minGameVersion: 105)
-mod.missingdependencies = [scarlet]Thiếu phụ thuộc: {0}
+
+mod.incompatiblegame = [red]Trò chơi lỗi th�i
+mod.incompatiblemod = [red]Không tương thích
+mod.blacklisted = [red]Không được hỗ trợ
+mod.unmetdependencies = [red]Phụ thuộc chưa đáp ứng
 mod.erroredcontent = [scarlet]Lá»—i ná»™i dung
+mod.circulardependencies = [red]Phụ thuộc tròn
+mod.incompletedependencies = [red]Phụ thuộc chưa hoàn thiện
+
+mod.requiresversion.details = Yêu cầu phiên bản trò chơi: [accent]{0}[]\nPhiên bản của bạn đã lỗi th�i. Mod này yêu cầu phiên bản mới hơn của trò chơi (có thể là các bản phát hành beta/alpha) để hoạt động.
+mod.outdatedv7.details = Mod này không tương thích với phiên bản mới nhất của trò chơi. Tác giả cần phải cập nhật nó, và thêm [accent]minGameVersion: 136[] vào tệp [accent]mod.json[].
+mod.blacklisted.details = Mod này đã bị đưa vào danh sách đen do gây ra các sự cố đối với phiên bản trò chơi này. �ừng sử dụng nó.
+mod.missingdependencies.details = Mod này thiếu các phụ thuộc: {0}
+mod.erroredcontent.details = Mod này gây lỗi khi tải. Vui lòng yêu cầu tác giả của mod sửa chúng.
+mod.circulardependencies.details = Mod này có chứa các phụ thuộc mà chúng phụ thuộc lẫn nhau.
+mod.incompletedependencies.details = Mod này không thể tải được do không hợp lệ hoặc thiếu các phụ thuộc: {0}.
+
+mod.requiresversion = Yêu cầu phiên bản trò chơi: [red]{0}
+
 mod.errors = �ã xảy ra lỗi khi tải nội dung.
-mod.noerrorplay = [scarlet]Bạn có mod bị lỗi.[]Tắt các mod bị ảnh hưởng hoặc sửa chữa các lỗi trước khi chơi.
-mod.nowdisabled = [scarlet]Mod '{0}' cần mod này để chạy:[accent] {1}\n[lightgray]Trước tiên bạn cần tải các mod này xuống.\nBản mod này sẽ tự động tắt.
+mod.noerrorplay = [red]Bạn có mod bị lỗi.[] Tắt các mod bị ảnh hưởng hoặc sửa các lỗi trước khi chơi.
+mod.nowdisabled = [red]Mod '{0}' thiếu phụ thuộc:[accent] {1}\n[lightgray]Bạn cần tải các mod này xuống trước.\nBản mod này sẽ tự động tắt.
 mod.enable = Bật
 mod.requiresrestart = Trò chơi sẽ đóng để áp dụng các thay đổi của mod.
 mod.reloadrequired = [scarlet]Yêu cầu khởi động lại
 mod.import = Nhập Mod
-mod.import.file = Nhập tệp
+mod.import.file = Nhập từ tệp
 mod.import.github = Nhập từ GitHub
-mod.jarwarn = [scarlet]JAR mod vốn dĩ không an toàn.[]\n�ảm bảo rằng bạn đang nhập bản mod này từ một nguồn đáng tin cậy!
-mod.item.remove = Mục này là một phần của[accent] '{0}'[] mod. �ể xóa nó, hãy gỡ cài đặt mod này.
+mod.jarwarn = [scarlet]Các mod JAR vốn dĩ không an toàn.[]\n�ảm bảo rằng bạn đang thêm mod này từ một nguồn đáng tin cậy!
+mod.item.remove = Mục này là một phần của mod[accent] '{0}'[]. �ể xóa nó, hãy gỡ cài đặt mod đó.
 mod.remove.confirm = Mod này sẽ bị xóa.
 mod.author = [lightgray]Tác giả:[] {0}
-mod.missing = Bản lưu này chứa các mod mà bạn đã cập nhật gần đây hoặc không còn cài đặt nữa. Có thể gây ra lỗi khi mở. Bạn có chắc muốn mở nó?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Trước khi xuất bản bản mod này lên workshop, bạn phải thêm hình ảnh xem trước.\n�ặt một hình ảnh có tên[accent] preview.png[] vào thư mục của mod và thử lại.
-mod.folder.missing = Chỉ có thể xuất bản các mod ở dạng thư mục lên workshop.\n�ể chuyển đổi bất kỳ mod nào thành một thư mục, chỉ cần giải nén tệp của nó vào một thư mục và xóa tệp nén cũ, sau đó khởi động lại trò chơi của bạn hoặc tải lại các bản mod của bạn.
-mod.scripts.disable = Thiết bị của bạn không hổ trợ mod chứa scripts này. Bạn phải tắt các mod này để chơi trò chơi.
+mod.missing = Bản lưu này chứa các mod mà bạn đã cập nhật gần đây hoặc không được cài đặt. Có thể gây ra lỗi khi mở. Bạn có chắc muốn mở nó?\n[lightgray]Các mod:\n{0}
+mod.preview.missing = Trước khi đăng bản mod này lên workshop, bạn phải thêm hình ảnh xem trước.\n�ặt một hình ảnh có tên[accent] preview.png[] vào thư mục của mod và thử lại.
+mod.folder.missing = Chỉ có thể đăng các mod ở dạng thư mục lên workshop.\n�ể chuyển đổi bất kỳ mod nào thành một thư mục, chỉ cần giải nén tệp của nó vào một thư mục và xóa tệp nén cũ, sau đó khởi động lại trò chơi của bạn hoặc tải lại các bản mod của bạn.
+mod.scripts.disable = Thiết bị của bạn không hỗ trợ mod chứa các ngữ lệnh. Bạn phải tắt các mod này để chơi trò chơi.
 
-about.button = Thông tin
+about.button = Giới thiệu
 name = Tên:
-noname = Hãy nhập[accent] tên[] trước.
+noname = Hãy nhập một[accent] tên ngư�i chơi[] trước.
+search = Tìm kiếm:
 planetmap = Bản đồ hành tinh
-launchcore = Phóng căn cứ
+launchcore = Phóng lõi
 filename = Tên tệp:
 unlocked = �ã mở khóa nội dung mới!
 available = �ã có mục nghiên cứu mới!
-completed = [accent]Hoàn tất
-techtree = Tiến trình
-research.legacy = Dữ liệu nghiên cứu từ phiên bản[accent]5.0[] được tìm thấy.\nBạn có muốn [accent]tải dữ liệu này[], hoặc [accent]b� qua[] và bắt đầu nghiên cứu lại trong chiến dịch mới (khuyến nghị)?
-research.load = Tải
+unlock.incampaign = < Mở khóa trong chiến dịch để biết thêm chi tiết >
+campaign.select = Ch�n chiến dịch khởi đầu
+campaign.none = [lightgray]Ch�n một hành tinh để bắt đầu.\nCó thể thay đổi sang hành tinh khác bất cứ lúc nào.
+campaign.erekir = Nội dung mới và được trau chuốt. Quá trình chiến dịch li�n mạch hơn.\n\nKhó hơn. Bản đồ chất lượng hơn và trải nghiệm tổng thể tốt hơn.
+campaign.serpulo = Nội dung cũ; trải nghiệm cơ bản. Tiến trình mở hơn, nhi�u nội dung hơn.\n\nRất có thể vẫn còn cơ chế bản đồ và chiến dịch bị mất cân bằng. �t được trau chuốt.
+campaign.difficulty = �ộ khó
+completed = [accent]�ã nghiên cứu
+techtree = Cây công nghệ
+techtree.select = Ch�n nhánh công nghệ
+techtree.serpulo = Serpulo
+techtree.erekir = Erekir
+research.load = Nạp
 research.discard = B� qua
 research.list = [lightgray]Nghiên cứu:
 research = Nghiên cứu
@@ -161,89 +215,107 @@ players.single = {0} ngư�i chơi
 players.search = tìm kiếm
 players.notfound = [gray]không tìm thấy ngư�i chơi
 server.closing = [accent]�ang đóng máy chủ...
-server.kicked.kick = Bạn đã bị kick kh�i máy chủ!
+server.kicked.kick = Bạn đã bị buộc r�i kh�i máy chủ!
 server.kicked.whitelist = Bạn không nằm trong danh sách được vào máy chủ này.
 server.kicked.serverClose = Máy chủ đã đóng.
-server.kicked.vote = Bạn đã bị vote-kick. Tạm biệt.
-server.kicked.clientOutdated = Phiên bản máy chủ này mới hơn phiên bản trò chơi! Hãy cập nhật trò chơi của bạn!
-server.kicked.serverOutdated = Phiên bản máy chủ đã cũ! Hãy yêu cầu máy chủ đó cập nhật!
+server.kicked.vote = Bạn đã bị b� phiếu buộc r�i. Tạm biệt.
+server.kicked.clientOutdated = Phiên bản máy khách lỗi th�i! Hãy cập nhật trò chơi của bạn!
+server.kicked.serverOutdated = Phiên bản máy chủ lỗi th�i! Hãy yêu cầu máy chủ đó cập nhật!
 server.kicked.banned = Bạn đã bị cấm trên máy chủ này.
-server.kicked.typeMismatch = Máy chủ này không tương thích với phiên bản của bạn.
+server.kicked.typeMismatch = Máy chủ này không tương thích với kiểu bản dựng của bạn.
 server.kicked.playerLimit = Máy chủ đã đầy. Hãy ch� một chỗ trống.
-server.kicked.recentKick = Bạn đã bị kick gần đây.\nHãy ch� một lúc sau đó kết nối lại.
+server.kicked.recentKick = Bạn đã bị buộc r�i gần đây.\nHãy ch� một lúc sau đó kết nối lại.
 server.kicked.nameInUse = Có ai đó với cái tên này\nđã ở trong máy chủ.
 server.kicked.nameEmpty = Tên bạn đã ch�n không hợp lệ.
 server.kicked.idInUse = Bạn đã ở trên máy chủ này! Bạn không được phép kết nối với hai tài khoản.
-server.kicked.customClient = Máy chủ này không hổ trợ phiên bản tùy chỉnh. Hãy tải phiên bản chính thức.
+server.kicked.customClient = Máy chủ này không hỗ trợ bản dựng tùy chỉnh. Hãy tải phiên bản chính thức.
 server.kicked.gameover = Trò chơi kết thúc!
 server.kicked.serverRestarting = Máy chủ đang khởi động lại.
 server.versions = Phiên bản của bạn:[accent] {0}[]\nPhiên bản máy chủ:[accent] {1}[]
-host.info = Nút [accent]Mở máy chủ[] mở máy chủ trên cổng [scarlet]6567[]. \nBất kỳ ai trên cùng [lightgray]wifi hoặc mạng cục bộ[] sẽ có thể thấy máy chủ của bạn trong danh sách máy chủ của h�.\n\nNếu bạn muốn m�i ngư�i có thể kết nối từ m�i nơi bằng IP, [accent]port forwarding[] là bắt buộc.\n\n[lightgray]Lưu ý: Nếu ai đó đang gặp sự cố khi kết nối với máy chủ trong mạng LAN của bạn, đảm bảo rằng bạn đã cho phép Mindustry truy cập vào mạng cục bộ của mình trong cài đặt tư�ng lửa. Lưu ý rằng các mạng công cộng đôi khi không cho phép khám phá máy chủ.
-join.info = Tại đây, bạn có thể nhập [accent]IP máy chủ[] kết nối , hoặc khám phá [accent]mạng cục bộ[] hay kết nối đến máy chủ [accent]toàn cầu[].\nCả mạng LAN và WAN đ�u được hỗ trợ.\n\n[lightgray]Nếu bạn muốn kết nối với ai đó bằng IP, bạn sẽ cần phải h�i IP của h�, có thể được tìm thấy bằng cách kiểm tra IP thiết bị của h�.
-hostserver = Mở máy chủ.
+host.info = Nút [accent]Mở máy chủ[] mở máy chủ trên cổng [scarlet]6567[].\nBất kỳ ai trên cùng [lightgray]wifi hoặc mạng cục bộ[] sẽ có thể thấy máy chủ của bạn trong danh sách máy chủ của h�.\n\nNếu bạn muốn m�i ngư�i có thể kết nối từ m�i nơi bằng IP, [accent]chuyển tiếp cổng (port forwarding)[] là bắt buộc.\n\n[lightgray]Lưu ý: Nếu ai đó đang gặp sự cố khi kết nối với máy chủ trong mạng LAN của bạn, đảm bảo rằng bạn đã cho phép Mindustry truy cập vào mạng cục bộ của mình trong cài đặt tư�ng lửa. Lưu ý rằng các mạng công cộng đôi khi không cho phép khám phá máy chủ.
+join.info = Tại đây, bạn có thể nhập [accent]IP máy chủ[] kết nối, hoặc khám phá [accent]mạng cục bộ[] hay kết nối đến máy chủ [accent]toàn cầu[].\nCả mạng LAN và WAN đ�u được hỗ trợ.\n\n[lightgray]Nếu bạn muốn kết nối với ai đó bằng IP, bạn sẽ cần phải h�i IP của h�, có thể được tìm thấy bằng cách tra google với từ khóa "my ip" trên thiết bị của h�.
+hostserver = Mở máy chủ nhi�u ngư�i chơi
 invitefriends = M�i bạn bè
-hostserver.mobile = Mở máy chủ
+hostserver.mobile = Mở máy chủ trò chơi
 host = Mở máy chủ
 hosting = [accent]�ang mở máy chủ...
 hosts.refresh = Làm mới
-hosts.discovering = �ang tìm máy chủ trong mạng LAN
-hosts.discovering.any = �ang tìm máy chủ
-server.refreshing = Làm mới máy chủ
-hosts.none = [lightgray]Không có máy chủ cục bộ nào được tìm thấy!
+hosts.discovering = �ang khám phá trò chơi trong mạng LAN
+hosts.discovering.any = �ang khám phá trò chơi
+server.refreshing = �ang làm mới máy chủ
+hosts.none = [lightgray]Không có trò chơi cục bộ nào được tìm thấy!
 host.invalid = [scarlet]Không thể kết nối đến máy chủ.
 
 servers.local = Máy chủ cục bộ
-servers.remote = Máy chủ tùy chỉnh
-servers.global = Máy chủ từ cộng đồng
+servers.local.steam = Trò chơi hiện có & Máy chủ cục bộ
+servers.remote = Máy chủ từ xa
+servers.global = Máy chủ cộng đồng
 
-servers.showhidden = Hiển thị Máy chủ Ẩn
-server.shown = Hiện
-server.hidden = Ẩn
+servers.disclaimer = Các máy chỉ cộng đồng [accent]không[] được sở hữu và kiểm soát bởi nhà phát triển.\n\nMáy chủ có thể chứa nội dung do ngư�i dùng tạo và không phù hợp với m�i lứa tuổi.
+servers.showhidden = Hiện máy chủ ẩn
+server.shown = �ã hiện
+server.hidden = �ã ẩn
 
-trace = Tìm ngư�i chơi
+viewplayer = �ang xem ngư�i chơi: [accent]{0}
+trace = Truy vết ngư�i chơi
 trace.playername = Tên ngư�i chơi: [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 = Client ID không hợp lệ! Vui lòng gửi báo cáo lỗi.
+trace.id = �ịnh danh (ID): [accent]{0}
+trace.language = Ngôn ngữ: [accent]{0}
+trace.mobile = Máy khách di động: [accent]{0}
+trace.modclient = Máy khách tùy chỉnh: [accent]{0}
+trace.times.joined = Số lần tham gia: [accent]{0}
+trace.times.kicked = Số lần bị buộc r�i: [accent]{0}
+trace.ips = Các IP:
+trace.names = Các tên:
+invalidid = �ịnh danh máy khách không hợp lệ! Vui lòng gửi báo cáo lỗi.
+
+player.ban = Cấm
+player.kick = Buộc r�i
+player.trace = Truy vết
+player.admin = Hoán đổi quản trị viên
+player.team = �ổi đội
+
 server.bans = Cấm
-server.bans.none = Không có ngư�i chơi nào bị cấm!
+server.bans.none = Không tìm thấy ngư�i chơi nào bị cấm!
 server.admins = Quản trị viên
-server.admins.none = Không có quản trị viên nào được tìm thấy!
+server.admins.none = Không tìm thấy quản trị viên nào!
 server.add = Thêm máy chủ
 server.delete = Bạn có chắc chắn muốn xóa máy chủ này không?
 server.edit = Chỉnh sửa máy chủ
 server.outdated = [scarlet]Máy chủ lỗi th�i![]
-server.outdated.client = [scarlet]Trò chơi lỗi th�i![]
+server.outdated.client = [scarlet]Máy khách lỗi th�i![]
 server.version = [gray]v{0} {1}
-server.custombuild = [accent]Phiên bản tùy chỉnh
+server.custombuild = [accent]Bản dựng tùy chỉnh
 confirmban = Bạn có chắc chắn muốn cấm "{0}[white]"?
-confirmkick = Bạn có chắc chắn muốn kick "{0}[white]"?
-confirmvotekick = Bạn có chắc chắn muốn vote-kick "{0}[white]"?
+confirmkick = Bạn có chắc chắn muốn buộc "{0}[white]" r�i đi?
 confirmunban = Bạn có chắc chắn muốn gỡ cấm ngư�i chơi này?
 confirmadmin = Bạn có chắc chắn muốn thêm "{0}[white]" làm quản trị viên?
-confirmunadmin = Bạn có chắc chắn muốn xóa quy�n quản trị viên của "{0}[white]" ?
+confirmunadmin = Bạn có chắc chắn muốn xóa quy�n quản trị viên của "{0}[white]"?
+votekick.reason = Lý do b� phiếu buộc r�i
+votekick.reason.message = Bạn có chắc muốn b� phiếu buộc r�i cho "{0}[white]"?\nNếu có, xin hãy nhập lý do:
 joingame.title = Tham gia trò chơi
 joingame.ip = �ịa chỉ:
-disconnect = Ngắt kết nối.
+disconnect = �ã ngắt kết nối.
 disconnect.error = Lỗi kết nối.
 disconnect.closed = Kết nối đã bị đóng.
 disconnect.timeout = Hết th�i gian ch�.
 disconnect.data = Không tải được dữ liệu thế giới!
+disconnect.snapshottimeout = �ã hết th�i gian trong khi nhận ảnh chụp nhanh UDP.\n�i�u này xảy ra do mạng hoặc kết nối không ổn định.
 cantconnect = Không thể tham gia trò chơi ([accent]{0}[]).
 connecting = [accent]�ang kết nối...
 reconnecting = [accent]�ang kết nối lại...
 connecting.data = [accent]�ang tải dữ liệu thế giới...
 server.port = Cổng:
-server.addressinuse = �ịa chỉ đang được sử dụng!
-server.invalidport = Cổng không hợp lệ!
-server.error = [scarlet]Lỗi máy chủ.
+server.invalidport = Số cổng không hợp lệ!
+server.error.addressinuse = [scarlet]Mở máy chủ trên cổng 6567 thất bại.[]\n\nChắc rằng không có máy chủ Mindustry nào đang chạy trên thiết bị hoặc mạng của bạn!
+server.error = [scarlet]Lỗi tạo máy chủ.
 save.new = Bản lưu mới
 save.overwrite = Bạn có chắc muốn ghi đè\nbản lưu này?
+save.nocampaign = Không thể nhập các tập tin đơn lẻ từ chiến dịch.
 overwrite = Ghi đè
 save.none = Không có bản lưu nào được tìm thấy!
-savefail = Không thể lưu trò chơi này!
+savefail = Không lưu được trò chơi!
 save.delete.confirm = Bạn có chắc chắn muốn xóa bản lưu này không?
 save.delete = Xóa
 save.export = Xuất bản lưu
@@ -254,17 +326,18 @@ save.import = Nhập bản lưu
 save.newslot = Tên bản lưu:
 save.rename = �ổi tên
 save.rename.text = Tên mới:
-selectslot = Hãy ch�n một bản lưu.
+selectslot = Ch�n một bản lưu.
 slot = [accent]Vị trí {0}
 editmessage = Chỉnh sửa l�i nhắn
 save.corrupted = Tệp bản lưu bị h�ng hoặc không hợp lệ!
 empty = <trống>
 on = Bật
 off = Tắt
+save.search = Tìm kiếm màn chơi đã lưu...
 save.autosave = Tá»± Ä‘á»™ng lÆ°u: {0}
 save.map = Bản đồ: {0}
 save.wave = �ợt {0}
-save.mode = Chế độ: {0}
+save.mode = Chế độ chơi: {0}
 save.date = Lưu lần cuối: {0}
 save.playtime = Th�i gian chơi: {0}
 warning = Cảnh báo.
@@ -272,128 +345,199 @@ confirm = Xác nhận
 delete = Xóa
 view.workshop = Xem trong Workshop
 workshop.listing = Chỉnh sửa danh sách Workshop
-ok = OK
+ok = �ồng ý
 open = Mở
-customize = Luật tùy chỉnh
+customize = Quy tắc tùy chỉnh
 cancel = Hủy
-openlink = Mở link
-copylink = Sao chép link
+command = Mệnh lệnh
+command.queue = Lệnh tuần tự
+command.mine = �ào
+command.repair = Sửa chữa
+command.rebuild = Xây lại
+command.assist = Hỗ trợ Ngư�i chơi
+command.move = Di Chuyển
+command.boost = Tăng cư�ng
+command.enterPayload = Nhập Khối hàng vào Công trình
+command.loadUnits = Nhận �ơn vị
+command.loadBlocks = Nhận Khối công trình
+command.unloadPayload = Dỡ Khối hàng
+command.loopPayload = Lặp vận chuyển đơn vị
+stance.stop = Hủy Mệnh lệnh
+stance.shoot = Tư thế: Bắn
+stance.holdfire = Tư thế: Ngừng bắn
+stance.pursuetarget = Tư thế: Bám đuổi Mục tiêu
+stance.patrol = Tư thế: �ư�ng tuần tra
+stance.ram = Tư thế: Tông thẳng\n[lightgray]�i theo đư�ng thẳng, không tìm đư�ng
+openlink = Mở liên kết
+copylink = Sao chép liên kết
 back = Quay lại
-crash.export = Xuất Crash Logs
-crash.none = Không có Crash Logs nào được tìm thấy.
-crash.exported = Crash logs đã được xuất.
+max = Tối đa
+objective = Nhiệm vụ bản đồ
+crash.export = Xuất Nhật ký sự cố
+crash.none = Không có Nhật ký sự cố nào được tìm thấy.
+crash.exported = Nhật ký sự cố đã được xuất.
 data.export = Xuất dữ liệu
 data.import = Nhập dữ liệu
 data.openfolder = Mở thư mục dữ liệu
 data.exported = Dữ liệu đã được xuất.
 data.invalid = �ây không phải dữ liệu trò chơi hợp lệ.
-data.import.confirm = Nhập dữ liệu bên ngoài sẽ ghi đè[scarlet] tất cả[] dữ liệu trò chơi hiện tại.\n[accent]�i�u này không thể hoàn tác![]\n\nSau khi dữ liệu được nhập, trò chơi của bạn sẽ thoát ngay lập tức.
+data.import.confirm = Nhập dữ liệu bên ngoài sẽ ghi đè[scarlet] tất cả[] dữ liệu trò chơi hiện tại của bạn.\n[accent]�i�u này không thể hoàn tác![]\n\nSau khi dữ liệu được nhập, trò chơi của bạn sẽ thoát ngay lập tức.
 quit.confirm = Bạn có chắc muốn thoát?
-quit.confirm.tutorial = Bạn có chắc chắn biết mình đang làm gì không?\nHướng dẫn có thể được thực hiện lại trong[accent] Cài đặt->Trò chơi>Thực hiện lại hướng dẫn.[]
 loading = [accent]�ang tải...
-reloading = [accent]�ang tải lại Mods...
+downloading = [accent]�ang tải xuống...
 saving = [accent]�ang lưu...
-respawn = [accent][[{0}][] để hồi sinh tại căn cứ
+respawn = [accent][[{0}][] để hồi sinh
 cancelbuilding = [accent][[{0}][] để hủy xây
-selectschematic = [accent][[{0}][] to để ch�n+sao chép
+selectschematic = [accent][[{0}][] để ch�n+sao chép
 pausebuilding = [accent][[{0}][] để tạm dừng xây dựng
 resumebuilding = [scarlet][[{0}][] để tiếp tục xây dựng
-showui = UI hidden.\nPress [accent][[{0}][] để hiện UI.
+enablebuilding = [scarlet][[{0}][] để bật xây dựng
+showui = �ã ẩn giao diện.\nNhấn [accent][[{0}][] để hiện lại giao diện.
+commandmode.name = [accent]Chế độ chỉ huy
+commandmode.nounits = [không có đơn vị]
 wave = [accent]�ợt {0}
 wave.cap = [accent]�ợt {0}/{1}
-wave.waiting = [lightgray]Kẻ địch xuất hiện sau {0}
-wave.waveInProgress = [lightgray]�ịch đang xuất hiện.
-waiting = [lightgray]Ch�...
-waiting.players = �ang ch� thêm ngư�i chơi...
+wave.waiting = [lightgray]�ợt kế tiếp sau {0}
+wave.waveInProgress = [lightgray]�ợt đang tấn công
+waiting = [lightgray]�ang ch�...
+waiting.players = �ang ch� ngư�i chơi...
 wave.enemies = [lightgray]{0} Kẻ địch còn lại
-wave.enemycores = [accent]{0}[lightgray] Căn cứ địch
-wave.enemycore = [accent]{0}[lightgray] Căn cứ địch
+wave.enemycores = [accent]{0}[lightgray] Lõi kẻ địch
+wave.enemycore = [accent]{0}[lightgray] Lõi kẻ địch
 wave.enemy = [lightgray]{0} Kẻ địch còn lại
-wave.guardianwarn = Boss sẽ xuất hiện sau [accent]{0}[] đợt.
-wave.guardianwarn.one = Boss sẽ xuất hiện sau [accent]{0}[] đợt.
+wave.guardianwarn = Trùm sẽ xuất hiện sau [accent]{0}[] đợt.
+wave.guardianwarn.one = Trùm sẽ xuất hiện sau [accent]{0}[] đợt.
 loadimage = Tải hình ảnh
 saveimage = Lưu hình ảnh
 unknown = Không xác định
 custom = Tùy chỉnh
-builtin = Xây trong
+builtin = Có sẵn
 map.delete.confirm = Bạn có chắc chắn muốn xóa bản đồ này không? Hành động này không thể hoàn tác!
 map.random = [accent]Bản đồ ngẫu nhiên
-map.nospawn = Bản đồ này không có bất kỳ căn cứ nào để ngư�i chơi hồi sinh! Thêm một căn cứ [accent] cam[] vào bản đồ ở trình chỉnh sửa.
-map.nospawn.pvp = Bản đồ này không có bất kỳ căn cứ kẻ thù nào để ngư�i chơi hồi sinh! Thêm một căn cứ khác màu [scarlet]cam [] vào bản đồ ở trình chỉnh sửa.
-map.nospawn.attack = Bản đồ này không có bất kỳ căn cứ kẻ thù nào để ngư�i chơi tấn công! Thêm một căn cứ màu[scarlet] đ�[] vào bản đồ ở trình chỉnh sửa.
+map.nospawn = Bản đồ này không có bất kỳ lõi nào để ngư�i chơi hồi sinh! Thêm một lõi {0} vào bản đồ này ở trình chỉnh sửa.
+map.nospawn.pvp = Bản đồ này không có bất kỳ lõi kẻ địch nào để ngư�i chơi hồi sinh! Thêm một lõi[scarlet] không phải màu cam[] vào bản đồ này ở trình chỉnh sửa.
+map.nospawn.attack = Bản đồ này không có bất kỳ lõi kẻ địch nào để ngư�i chơi tấn công! Thêm một lõi {0} vào bản đồ này ở trình chỉnh sửa.
 map.invalid = Lỗi khi tải bản đồ: tệp bản đồ bị h�ng hoặc không hợp lệ.
 workshop.update = Cập nhật mục
-workshop.error = Lỗi khi tìm nạp thông tin chi tiết ở workshop: {0}
-map.publish.confirm = Bạn có chắc chắn muốn xuất bản bản đồ này không?\n\n[lightgray]�ảm bảo rằng bạn đồng ý với Workshop EULA trước, hoặc bản đồ của bạn sẽ không hiển thị!
+workshop.error = Lỗi khi tìm lấy chi tiết ở workshop: {0}
+map.publish.confirm = Bạn có chắc chắn muốn xuất bản bản đồ này không?\n\n[lightgray]�ảm bảo rằng bạn đồng ý với Th�a thuận cấp phép ngư�i dùng cuối (EULA) của Workshop trước, hoặc bản đồ của bạn sẽ không hiển thị!
 workshop.menu = Ch�n những gì bạn muốn làm với mục này.
 workshop.info = Thông tin mục
-changelog = Danh sách các thay đổi (không bắt buộc):
-eula = Steam EULA
+changelog = Nhật ký thay đổi (tùy ch�n):
+updatedesc = Ghi đè Tiêu đ� & Mô tả
+eula = Th�a thuận cấp phép ngư�i dùng cuối (EULA) của Steam
 missing = Mục này đã bị xóa hoặc di chuyển.\n[lightgray]Danh sách workshop hiện đã được tự động hủy liên kết.
 publishing = [accent]�ang xuất bản...
-publish.confirm = Bạn có chắc chắn muốn xuất bản không?\n\n[lightgray]�ảm bảo rằng bạn đồng ý với Workshop EULA trước, hoặc mục của bạn sẽ không hiển thị!
-publish.error = Lỗi khi xuất bản: {0}
+publish.confirm = Bạn có chắc chắn muốn xuất bản không?\n\n[lightgray]�ảm bảo rằng bạn đồng ý với Th�a thuận cấp phép ngư�i dùng cuối (EULA) của Workshop trước, hoặc mục của bạn sẽ không hiển thị!
+publish.error = Lỗi khi xuất bản mục: {0}
 steam.error = Không thể khởi chạy dịch vụ Steam.\nLỗi: {0}
 
-editor.brush = Kích thước
+editor.planet = Hành tinh:
+editor.sector = Khu vá»±c:
+editor.seed = Mầm:
+editor.cliffs = Chuyển tư�ng thành vách đá
+editor.brush = Cỡ c�
 editor.openin = Mở trong trình chỉnh sửa
-editor.oregen = Cấu trúc quặng
-editor.oregen.info = Cấu trúc quặng:
+editor.oregen = Tạo quặng
+editor.oregen.info = Tạo quặng:
 editor.mapinfo = Thông tin bản đồ
 editor.author = Tác giả:
 editor.description = Mô tả:
 editor.nodescription = Bản đồ phải có mô tả ít nhất 4 ký tự trước khi được xuất bản.
-editor.waves = Lượt:
-editor.rules = Luật:
-editor.generation = Cấu trúc:
+editor.waves = �ợt
+editor.rules = Quy tắc
+editor.generation = Tạo ra
+editor.objectives = Mục tiêu nhiệm vụ
+editor.locales = Gói ngôn ngữ
+editor.worldprocessors = Các bộ xử lý thế giới
+editor.worldprocessors.editname = Sửa tên
+editor.worldprocessors.none = [lightgray]không tìm thấy khối bộ xử lý thế giới nào!\nThêm một bộ trong trình chỉnh sửa bản đồ, hoặc dùng nút \ue813 Thêm ở dưới.
+editor.worldprocessors.nospace = Không có không gian trống để đặt một bộ xử lý thế giới!\nCó phải bạn đã đi�n đầy bản đồ bằng các công trình? Tại sao bạn lại làm vậy?
+editor.worldprocessors.delete.confirm = Bạn có muốn xóa bộ xử lý thế giới này?\n\nNếu nó được bao quanh bởi các vách tư�ng, nó sẽ được thay thế bằng vách tư�ng quanh đó.
 editor.ingame = Chỉnh sửa trong trò chơi
+editor.playtest = Chơi thử
 editor.publish.workshop = Xuất bản lên Workshop
 editor.newmap = Bản đồ mới
 editor.center = Trung tâm
+editor.search = Tìm kiếm bản đồ...
+editor.filters = L�c bản đồ
+editor.filters.mode = Chế độ chơi:
+editor.filters.type = Kiểu bản đồ:
+editor.filters.search = Tìm kiếm trong:
+editor.filters.author = Tác giả
+editor.filters.description = Mô tả
+editor.shiftx = Dịch theo X
+editor.shifty = Dịch theo Y
 workshop = Workshop
 waves.title = �ợt
-waves.remove = Xóa
-waves.never = <vô hạn>
+waves.remove = Loại b�
 waves.every = má»—i
 waves.waves = đợt
+waves.health = độ b�n: {0}%
 waves.perspawn = mỗi lần xuất hiện
 waves.shields = khiên/đợt
 waves.to = đến
-waves.guardian = Boss
+waves.spawn = xuất hiện từ:
+waves.spawn.all = <tất cả>
+waves.spawn.select = Ch�n điểm xuất hiện
+waves.spawn.none = [scarlet]không tìm thấy điểm xuất hiện nào trên bản đồ
+waves.max = đơn vị tối đa
+waves.guardian = Trùm
 waves.preview = Xem trÆ°á»›c
 waves.edit = Chỉnh sửa...
-waves.copy = Sao chép vào bộ nhớ tạm
-waves.load = Lấy từ bộ nhớ tạm
-waves.invalid = Lượt không hợp lệ trong bộ nhớ tạm.
-waves.copied = �ã sao chép lượt.
-waves.none = Không có kẻ thù được xác định.\nLưu ý rằng bố cục mỗi đợt trống sẽ tự động được thay thế bằng bố cục mặc định.
+waves.random = Ngẫu nhiên
+waves.copy = Sao chép vào Bộ nhớ tạm
+waves.load = Nạp từ Bộ nhớ tạm
+waves.invalid = �ợt không hợp lệ trong bộ nhớ tạm.
+waves.copied = �ã sao chép các đợt.
+waves.none = Không có kẻ địch được xác định.\nLưu ý rằng bố cục mỗi đợt trống sẽ tự động được thay thế bằng bố cục mặc định.
+waves.sort = Sắp xếp theo
+waves.sort.reverse = �ảo ngược sắp xếp
+waves.sort.begin = Bắt đầu
+waves.sort.health = �ộ b�n
+waves.sort.type = Loại
+waves.search = Tìm kiếm các đợt...
+waves.filter = Bộ l�c đơn vị
+waves.units.hide = Ẩn tất cả
+waves.units.show = Hiện tất cả
 
 #these are intentionally in lower case
 wavemode.counts = số lượng
 wavemode.totals = tổng số
-wavemode.health = máu
+wavemode.health = độ b�n
 
+all = Tất cả
 editor.default = [lightgray]<Mặc định>
 details = Chi tiết...
-edit = Chỉnh sửa...
+edit = Chỉnh sửa
+variables = Biến số
+logic.clear.confirm = Bạn có muốn xóa sạch tất cả mã kh�i bộ xử lý này?
+logic.globals = Biến số sẵn có
+
 editor.name = Tên:
-editor.spawn = Thêm kẻ địch
-editor.removeunit = Xóa kẻ địch
+editor.spawn = �ơn vị xuất hiện
+editor.removeunit = Loại b� đơn vị
 editor.teams = �ội
 editor.errorload = Lỗi khi tải tệp.
 editor.errorsave = Lỗi khi lưu tệp.
-editor.errorimage = �ó là một hình ảnh, không phải bản đồ.\n\nNếu bạn muốn nhập một bản đồ 3.5/build 40, sử dụng nút 'Nhập bản đồ thay thế' trong trình chỉnh sửa.
+editor.errorimage = �ó là một hình ảnh, không phải bản đồ.
 editor.errorlegacy = Bản đồ này quá cũ, và sử dụng định dạng bản đồ cũ không còn được hỗ trợ.
 editor.errornot = �ây không phải là tệp bản đồ.
 editor.errorheader = Tệp bản đồ này không hợp lệ hoặc bị h�ng.
 editor.errorname = Bản đồ không có tên được xác định. Bạn đang cố gắng tải một bản lưu?
+editor.errorlocales = Lỗi khi đ�c gói ngôn ngữ không hợp lệ.
 editor.update = Cập nhật
 editor.randomize = Ngẫu nhiên
+editor.moveup = Di chuyển lên
+editor.movedown = Di chuyển xuống
+editor.copy = Sao Chép
 editor.apply = �p dụng
 editor.generate = Tạo ra
+editor.sectorgenerate = Tạo ra khu vực
 editor.resize = Thay đổi kích thước
-editor.loadmap = Mở bản đồ
+editor.loadmap = Nạp bản đồ
 editor.savemap = Lưu bản đồ
+editor.savechanges = [scarlet]Bạn có thay đổi chưa lưu!\n\n[]Bạn có muốn lưu chúng không?
 editor.saved = �ã lưu!
 editor.save.noname = Bản đồ của bạn không có tên! Hãy đặt một cái tên trong 'Thông tin bản đồ'.
 editor.save.overwrite = Bản đồ của bạn ghi đè lên một bản đồ đã có sẵn! Hãy ch�n một cái tên khác trong 'Thông tin bản đồ'.
@@ -418,7 +562,7 @@ editor.mapname = Tên bản đồ:
 editor.overwrite = [accent]Cảnh báo!\n�i�u này có thể ghi đè lên một bản đồ hiện có.
 editor.overwrite.confirm = [scarlet]Cảnh báo![] Bản đồ có tên này đã tồn tại. Bạn có chắc chắn muốn ghi đè lên nó không?\n"[accent]{0}[]"
 editor.exists = Bản đồ có tên này đã tồn tại.
-editor.selectmap = Ch�n bản đồ cần mở:
+editor.selectmap = Ch�n bản đồ cần nạp:
 
 toolmode.replace = Thay thế
 toolmode.replace.description = Chỉ vẽ trên các khối rắn.
@@ -430,133 +574,235 @@ toolmode.square = Vuông
 toolmode.square.description = C� vẽ vuông.
 toolmode.eraseores = Xóa quặng
 toolmode.eraseores.description = Chỉ xóa quặng.
-toolmode.fillteams = Fill Teams
-toolmode.fillteams.description = Fill teams instead of blocks.
-toolmode.drawteams = Draw Teams
-toolmode.drawteams.description = Draw teams instead of blocks.
+toolmode.fillteams = �i�n đội
+toolmode.fillteams.description = �i�n các đội thay cho các khối.
+toolmode.fillerase = �i�n xóa
+toolmode.fillerase.description = Xóa các khối cùng kiểu.
+toolmode.drawteams = Vẽ đội
+toolmode.drawteams.description = Vẽ các đội thay vì các khối.
+#unused
+toolmode.underliquid = Dưới chất l�ng
+toolmode.underliquid.description = Vẽ n�n dưới các ô chất l�ng.
+
+filters.empty = [lightgray]Không có bộ l�c! Thêm một bộ bằng nút bên dưới.
 
-filters.empty = [lightgray]Không có bộ l�c! Thêm một cái bằng nút bên dưới.
 filter.distort = Cong vẹo
 filter.noise = Nhiá»…u
-filter.enemyspawn = Khu vực xuất hiện của kẻ thù
-filter.spawnpath = Khu tạo ra
-filter.corespawn = Ch�n Căn cứ
-filter.median = Trung bình
-filter.oremedian = Quặng Trung bình
+filter.enemyspawn = Ch�n điểm xuất hiện của kẻ địch
+filter.spawnpath = �ư�ng đến điểm xuất hiện
+filter.corespawn = Ch�n lõi
+filter.median = Trung vị
+filter.oremedian = Quặng Trung vị
 filter.blend = Trá»™n
 filter.defaultores = Quặng mặc định
 filter.ore = Quặng
 filter.rivernoise = Nhiễu sông
 filter.mirror = �ối xứng
 filter.clear = Xóa
-filter.option.ignore = B� qua
+filter.option.ignore = Phớt l�
 filter.scatter = Phân tán
 filter.terrain = �ịa hình
-filter.option.scale = Kích thước
-filter.option.chance = Tỷ lệ
+filter.logic = Logic
+
+filter.option.scale = Quy mô
+filter.option.chance = CÆ¡ há»™i
 filter.option.mag = �ộ lớn
 filter.option.threshold = Ngưỡng
-filter.option.circle-scale = �ộ lớn vòng tròn
-filter.option.octaves = Octaves
-filter.option.falloff = Falloff
+filter.option.circle-scale = Quy mô vòng tròn
+filter.option.octaves = Bát độ
+filter.option.falloff = Suy giảm
 filter.option.angle = Góc
+filter.option.tilt = Nghiêng
+filter.option.rotate = Xoay
 filter.option.amount = Số lượng
 filter.option.block = Khối
 filter.option.floor = N�n
-filter.option.flooronto = N�n thay thế
+filter.option.flooronto = N�n đích
 filter.option.target = Mục tiêu
+filter.option.replacement = Thay thế
 filter.option.wall = Tư�ng
 filter.option.ore = Quặng
 filter.option.floor2 = N�n phụ
 filter.option.threshold2 = Ngưỡng phụ
 filter.option.radius = Bán kính
 filter.option.percentile = Phần trăm
+filter.option.code = Mã
+filter.option.loop = Lặp
+
+locales.info = Tại đây, bạn có thể thêm gói ngôn ngữ cho ngôn ngữ cụ thể vào bản đồ của bạn. Trong gói ngôn ngữ, mỗi thuộc tính có tên và giá trị. Những thuộc tính này có thể được sử dụng bởi Bộ xử lý thế giới và Mục tiêu nhiệm vụ bằng tên của chúng. Chúng hỗ trợ định dạng văn bản (thay thế từ giữ chỗ bằng giá trị thực tế).\n\n[cyan]Ví dụ thuộc tính:\n[]tên: [accent]timer[]\ngiá trị: [accent]Bộ đếm th�i gian ví dụ, th�i gian còn lại: {0}[]\n\n[cyan]Cách dùng:\n[]�ặt làm văn bản cho Mục tiêu nhiệm vụ: [accent]@timer\n\n[]In nó trong Bộ xử lý thế giới:\n[accent]localeprint "timer"\nformat time\n[gray](với time là biến được tính toán riêng biệt)
+locales.deletelocale = Bạn có chắc muốn xóa gói ngôn ngữ này?
+locales.applytoall = �p dụng thay đổi cho tất cả gói ngôn ngữ
+locales.addtoother = Thêm vào các gói ngôn ngữ khác
+locales.rollback = Khôi phục lại lần áp dụng cuối
+locales.filter = Bộ l�c thuộc tính
+locales.searchname = Tìm tên...
+locales.searchvalue = Tìm giá trị...
+locales.searchlocale = Tìm ngôn ngữ...
+locales.byname = Theo tên
+locales.byvalue = Theo giá trị
+locales.showcorrect = Hiện thuộc tính có trong tất cả ngôn ngữ và có giá trị riêng biệt mỗi nơi
+locales.showmissing = Hiện thuộc tính bị thiếu trong một số ngôn ngữ
+locales.showsame = Hiện thuộc tính có giá trị giống nhau trong các ngôn ngữ khác nhau
+locales.viewproperty = Xem trong tất cả ngôn ngữ
+locales.viewing = �ang xem thuộc tính "{0}"
+locales.addicon = Thêm biểu tượng
 
 width = Chi�u rộng:
 height = Chi�u cao:
-menu = Menu
+menu = Trình đơn
 play = Chơi
 campaign = Chiến dịch
-load = Tải
+load = Nạp
 save = LÆ°u
 fps = FPS: {0}
 ping = Ping: {0}ms
-memory = Mem: {0}mb
-memory2 = Mem:\n {0}mb +\n {1}mb
+tps = TPS: {0}
+memory = Bá»™ nhá»›: {0}mb
+memory2 = Bá»™ nhá»›:\n {0}mb +\n {1}mb
 language.restart = Khởi động lại trò chơi của bạn để cài đặt ngôn ngữ có hiệu lực.
 settings = Cài đặt
 tutorial = Hướng dẫn
 tutorial.retake = Thực hiện lại Hướng dẫn
-editor = Chỉnh sửa
+editor = Trình chỉnh sửa
 mapeditor = Trình chỉnh sửa bản đồ
 
-abandon = B�
+abandon = Từ b�
 abandon.text = Khu vực này và tất cả tài nguyên của nó sẽ bị mất vào tay kẻ địch.
 locked = �ã khóa
 complete = [lightgray]Hoàn thành:
 requirement.wave = �ạt đến đợt {0} ở {1}
-requirement.core = Phá hủy căn cứ địch ở {0}
+requirement.core = Phá hủy lõi địch ở {0}
 requirement.research = Nghiên cứu {0}
-requirement.produce = Sản lượng {0}
+requirement.produce = Sản xuất {0}
 requirement.capture = Chiếm {0}
+requirement.onplanet = Kiểm soát khu vực {0}
+requirement.onsector = �áp xuống khu vực: {0}
 launch.text = Phóng
-research.multiplayer = Chỉ máy chủ mới có thể nghiên cứu các mục.
 map.multiplayer = Chỉ máy chủ mới có thể xem các khu vực.
 uncover = Khám phá
-configure = Tùy chỉnh vật phẩm
+configure = Cấu hình vật phẩm khởi đầu
 
-loadout = Vật phẩm
+objective.research.name = Nghiên cứu
+objective.produce.name = Nhận
+objective.item.name = Nhận vật phẩm
+objective.coreitem.name = Vật phẩm trong lõi
+objective.buildcount.name = Xây công trình
+objective.unitcount.name = Sản xuất đơn vị
+objective.destroyunits.name = Tiêu diệt đơn vị
+objective.timer.name = Hẹn gi�
+objective.destroyblock.name = Phá huỷ khối
+objective.destroyblocks.name = Phá huỷ khối
+objective.destroycore.name = Phá huỷ lõi
+objective.commandmode.name = Chế độ mệnh lệnh
+objective.flag.name = C�
+
+marker.shapetext.name = Hình dạng văn bản
+marker.point.name = �iểm
+marker.shape.name = Hình dạng
+marker.text.name = Văn bản
+marker.line.name = �ư�ng kẻ
+marker.quad.name = Tứ giác
+marker.texture.name = Kết cấu
+
+marker.background = N�n
+marker.outline = �ư�ng vi�n
+
+objective.research = [accent]Nghiên cứu:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Nhận:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Phá huỷ:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Phá huỷ: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Nhận: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Chuyển vào lõi:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Xây: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]Tạo đơn vị: [][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Tiêu diệt: [][lightgray]{0}[]x �ơn vị
+objective.enemiesapproaching = [accent]Kẻ địch đến sau [lightgray]{0}[]
+objective.enemyescelating = [accent]Kẻ địch leo thang sản xuất sau [lightgray]{0}[]
+objective.enemyairunits = [accent]Kẻ địch bắt đầu sản xuất đơn vị bay sau [lightgray]{0}[]
+objective.destroycore = [accent]Phá huỷ lõi kẻ địch
+objective.command = [accent]Mệnh lệnh đơn vị
+objective.nuclearlaunch = [accent]⚠ Phát hiện việc phóng tên lửa: [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ TÊN LỬA SẮP VA CHẠM ⚠\nxây lõi dự phòng ngay
+
+loadout = Vật phẩm khởi đầu
 resources = Tài nguyên
+resources.max = Tối đa
 bannedblocks = Khối bị cấm
+unbannedblocks = Unbanned Blocks
+objectives = Mục tiêu nhiệm vụ
+bannedunits = �ơn vị bị cấm
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Chỉ dùng các đơn vị bị cấm
+bannedblocks.whitelist = Chỉ dùng các khối bị cấm
 addall = Thêm tất cả
 launch.from = �ang phóng từ: [accent]{0}
+launch.capacity = Trữ lượng vật phẩm khi phóng: [accent]{0}
 launch.destination = �ích đến: {0}
+landing.sources = Khu vực nguồn: [accent]{0}[]
+landing.import = Tổng nhập tối đa: {0}[accent]{1}[lightgray]/phút
 configure.invalid = Số lượng phải là số trong khoảng 0 đến {0}.
 add = Thêm...
-boss.health = Máu Boss
+guardian = Trùm
 
 connectfail = [scarlet]Lỗi kết nối:\n\n[accent]{0}
-error.unreachable = Không thể truy cập máy chủ.\nKiểm tra lại xem địa chỉ có đúng không?
+error.unreachable = Không thể truy cập máy chủ.\n�ịa chỉ liệu có đúng không?
 error.invalidaddress = �ịa chỉ không hợp lệ.
-error.timedout = Hết th�i gian ch�!\n�ảm bảo máy chủ đã thiết lập port forwarding, và địa chỉ đó là chính xác!
-error.mismatch = Lỗi packet:\nphiên bản máy khách / máy chủ có thể không khớp.\n�ảm bảo bạn và máy chủ có phiên bản Mindustry mới nhất!
-error.alreadyconnected = �ã kết nối.
+error.timedout = Hết th�i gian ch�!\n�ảm bảo máy chủ đã thiết lập chuyển tiếp cổng, và địa chỉ đó là chính xác!
+error.mismatch = Lỗi gói tin:\nphiên bản máy khách/máy chủ có thể không khớp.\n�ảm bảo bạn và máy chủ có phiên bản Mindustry mới nhất!
+error.alreadyconnected = �ã kết nối rồi.
 error.mapnotfound = Không tìm thấy tệp bản đồ!
-error.io = Lá»—i Network I/O.
+error.io = Lỗi mạng đầu vào/ra.
 error.any = Lỗi mạng không xác định.
 error.bloom = Không khởi tạo được hiệu ứng phát sáng.\nThiết bị của bạn có thể không hỗ trợ.
+error.moddex = Mindustry không thể nạp bản mod này.\nThiết bị của bạn đang chặn nhập mod Java do thay đổi gần đây trong Android.\nVấn đ� này không thể sửa được. Không có giải pháp tạm th�i nào cho vấn đ� này.
 
 weather.rain.name = MÆ°a
-weather.snow.name = Tuyết
+weather.snowing.name = Tuyết
 weather.sandstorm.name = Bão cát
 weather.sporestorm.name = Bão bào tử
 weather.fog.name = Sương mù
 
+campaign.playtime = \uf129 [lightgray]Th�i gian chơi trên khu vực: {0}
+campaign.complete = [accent]Chúc mừng.\n\nKẻ địch trên {0} đã bị đánh bại.\n[lightgray]Khu vực cuối cùng đã được chinh phục.
+
+sectorlist = Khu vá»±c
+sectorlist.attacked = {0} đang bị tấn công
 sectors.unexplored = [lightgray]Chưa được khám phá
 sectors.resources = Tài nguyên:
 sectors.production = Sản lượng:
 sectors.export = Xuất:
+sectors.import = Nhập:
 sectors.time = Th�i gian:
 sectors.threat = Mối đe d�a:
 sectors.wave = �ợt:
 sectors.stored = Lưu trữ:
 sectors.resume = Tiếp tục
 sectors.launch = Phóng
-sectors.select = Lựa ch�n
-sectors.nonelaunch = [lightgray]trống (mặt tr�i)
+sectors.select = Chọn
+sectors.launchselect = Ch�n đích phóng
+sectors.nonelaunch = [lightgray]không có (mặt tr�i)
+sectors.redirect = Chuyển hướng bệ phóng
 sectors.rename = �ổi tên khu vực
 sectors.enemybase = [scarlet]Căn cứ địch
 sectors.vulnerable = [scarlet]Dễ bị tổn thất
 sectors.underattack = [scarlet]�ang bị tấn công! [accent]{0}% tổn thất
+sectors.underattack.nodamage = [scarlet]Chưa được chiếm
 sectors.survives = [accent]Vượt qua {0} đợt
 sectors.go = �i
+sector.abandon = R�i b�
+sector.abandon.confirm = Những lõi ở đây sẽ tự huỷ.\nTiếp tục chứ?
 sector.curcapture = Khu vực đã chiếm
 sector.curlost = Khu vực đã mất
-sector.missingresources = [scarlet]Không đủ tài nguyên căn cứ
+sector.missingresources = [scarlet]Không đủ tài nguyên lõi
 sector.attacked = Khu vực [accent]{0}[white] đang bị tấn công!
 sector.lost = Khu vực [accent]{0}[white] đã mất!
-#note: the missing space in the line below is intentional
-sector.captured = Khu vực [accent]{0}[white]đã chiếm!
+sector.capture = Khu vực [accent]{0}[white] đã chiếm!
+sector.capture.current = Khu vực đã chiếm!
+sector.changeicon = Thay đổi biểu tượng
+sector.noswitch.title = Không thể đổi khu vực
+sector.noswitch = Bạn không thể đổi khu vực khi một khu vực đang bị tấn công.\n\nKhu vực: [accent]{0}[] ở [accent]{1}[]
+sector.view = Xem khu vá»±c
 
 threat.low = Thấp
 threat.medium = Trung bình
@@ -564,12 +810,18 @@ threat.high = Cao
 threat.extreme = Cá»±c cao
 threat.eradication = Hủy diệt
 
+difficulty.casual = Giải tri�
+difficulty.easy = Dá»…
+difficulty.normal = Vừa
+difficulty.hard = Khó
+difficulty.eradication = Hủy diệt
+
 planets = Hành tinh
 
 planet.serpulo.name = Serpulo
+planet.erekir.name = Erekir
 planet.sun.name = Mặt tr�i
 
-#Why we should translate this ??
 sector.impact0078.name = Impact 0078
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -585,108 +837,197 @@ sector.fungalPass.name = Fungal Pass
 sector.biomassFacility.name = Biomass Synthesis Facility
 sector.windsweptIslands.name = Windswept Islands
 sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
-#TODO: The Last
-sector.groundZero.description = Vị trí tối ưu để bắt đầu một lần nữa. Mối đe d�a của kẻ thù thấp. �t tài nguyên.\nThu thập càng nhi�u chì và đồng càng tốt.\nTiến lên.
-sector.frozenForest.description = Ngay cả ở đây, gần núi hơn, các bào tử đã phát tán. Nhiệt độ lạnh giá không thể chứa chúng mãi mãi.\n\nBắt đầu tham gia vào quy�n lực. Chế tạo máy phát điện đốt. H�c cách sử dụng Máy sửa chữa.
-sector.saltFlats.description = Ở vùng ngoại ô của sa mạc Salt Flats. Có thể tìm thấy ít tài nguyên ở khu vực này.\n\nKẻ thù đã dựng lên một khu phức hợp lưu trữ tài nguyên ở đây. Loại b� căn cứ của h�. Không để lại gì.
-sector.craters.description = Nước đã tích tụ trong miệng núi lửa này, di tích của các cuộc chiến tranh cũ. Hãy chiếm lại khu vực. Thu gom cát, metaglass . Bơm nước để làm mát súng và mũi khoan.
-sector.ruinousShores.description = Qua những chất thải, là b� biển. Một th�i, vị trí này là nơi đặt một hệ thống phòng thủ ven biển. Không còn lại nhi�u. Chỉ những công trình phòng thủ cơ bản nhất vẫn không bị tổn thương, m�i thứ khác đ�u trở thành đống sắt vụn.\nTiếp tục mở rộng ra bên ngoài. Khám phá lại công nghệ.
-sector.stainedMountains.description = Xa hơn trong đất li�n là những ng�n núi, chưa bị bào tử xâm hại.\nKhai thác titan dồi dào trong khu vực này. Tìm hiểu làm thế nào để sử dụng nó.\n\nSự hiện diện của kẻ thù ở đây lớn hơn. �ừng cho h� th�i gian để có quân lính mạnh nhất của h�.
-sector.overgrowth.description = Khu vực này cây cối m�c um tùm, gần nguồn bào tử hơn.\n�ịch đã lập ti�n đồn ở đây. Chế tạo Mace. Phá hủy nó. �òi lại thứ đã mất.
-sector.tarFields.description = Vùng ngoại ô của khu sản xuất dầu, giữa núi và sa mạc. Một trong số ít khu vực có trữ lượng dầu có thể sử dụng được.\nMặc dù bị b� hoang, khu vực này có một số lực lượng địch nguy hiểm gần đó. �ừng đánh giá thấp chúng.\n\n[lightgray]Nghiên cứu công nghệ chế biến dầu nếu có thể.
-sector.desolateRift.description = Một vùng cực kỳ nguy hiểm. Tài nguyên dồi dào, nhưng ít không gian. Nguy cơ phá hủy cao. Hãy r�i đi càng sớm càng tốt. �ừng để bị lừa bởi khoảng cách dài giữa các cuộc tấn công của kẻ thù.
-sector.nuclearComplex.description = Một cơ sở trước đây để sản xuất và chế biến thorium, đã biến thành đống đổ nát.\n[lightgray]Nghiên cứu thorium và nhi�u công dụng của nó.\n\nKẻ thù có mặt ở đây với số lượng rất lớn, liên tục lùng sục những kẻ tấn công.
-sector.fungalPass.description = Khu vực chuyển tiếp giữa vùng núi cao và vùng đất thấp hơn, đầy bào tử. Một căn cứ trinh sát nh� của địch được đặt tại đây.\nPhá hủy nó.\nSử dụng quân lính Dagger và Crawler. Phá hủy hai căn cứ của địch.
-sector.biomassFacility.description = Nguồn gốc của bào tử. �ây là cơ sở mà chúng được nghiên cứu và sản xuất ban đầu.\nNghiên cứu công nghệ có bên trong. Nuôi cấy bào tử để sản xuất nhiên liệu và chất dẻo.\n\n[lightgray]Khi cơ sở này sụp đổ, các bào tử đã được giải phóng. Không có gì trong hệ sinh thái địa phương có thể cạnh tranh với một sinh vật xâm lấn như vậy.
-sector.windsweptIslands.description = Xa hơn đư�ng b� biển là chuỗi đảo xa xôi này. Hồ sơ cho thấy h� đã từng có công trình sản xuất [accent]Plastanium[] .\n\nChống lại các lực lượng hải quân của kẻ thù. Thiết lập căn cứ trên quần đảo. Nghiên cứu các nhà máy này.
-sector.extractionOutpost.description = Một ti�n đồn xa, được kẻ thù xây dựng với mục đích phóng nguồn lực sang các khu vực khác.\n\nCông nghệ vận tải xuyên ngành là đi�u cần thiết để chinh phục hơn nữa. Phá hủy căn cứ. Nghiên cứu bệ phóng của h�.
-sector.impact0078.description = �ây là tàn tích của tàu vận chuyển giữa các vì sao lần đầu tiên đi vào hệ thống này.\n\nLấy càng nhi�u càng tốt từ đống đổ nát. Nghiên cứu bất kỳ công nghệ nguyên vẹn nào.
-sector.planetaryTerminal.description = Mục tiêu cuối cùng.\n\nCăn cứ ven biển này chứa một cấu trúc có khả năng phóng căn cứ tới các hành tinh địa phương. Nó được bảo vệ cực kỳ cẩn thận.\n\nSản xuất quân lính hải quân. Loại b� kẻ thù càng nhanh càng tốt. Nghiên cứu cấu trúc phóng.
+sector.groundZero.description = Vị trí tối ưu để bắt đầu một lần nữa. Mối đe d�a của kẻ địch thấp. �t tài nguyên.\nThu thập càng nhi�u đồng và chì càng tốt.\nTiến lên.
+sector.frozenForest.description = Dù ở đây, gần núi cao, các bào tử vẫn bắt đầu phát tán. Nhiệt độ lạnh giá không thể giữ chúng lại mãi.\n\nBắt đầu tạo năng lượng. Hãy xây dựng máy phát điện đốt. H�c cách sử dụng máy sửa chữa.
+sector.saltFlats.description = Ở vùng rìa sa mạc chính là Salt Flats. Có thể tìm thấy một ít tài nguyên ở khu vực này.\n\nKẻ địch đã dựng lên một khu phức hợp lưu trữ tài nguyên ở đây. Hãy loại b� hoàn toàn căn cứ này.
+sector.craters.description = Nước đã tích tụ trong miệng núi lửa ở đây, vốn là dấu tích của các cuộc chiến tranh cũ. Hãy chiếm lại khu vực. Thu gom cát. Nung thủy tinh. Bơm nước để làm mát súng và mũi khoan.
+sector.ruinousShores.description = Vượt qua những địa hình mấp mô, là b� biển. Vị trí này từng là nơi đặt một hệ thống phòng thủ ven biển. Không còn lại gì nhi�u, chỉ những công trình phòng thủ cơ bản nhất vẫn không bị tổn thương, m�i thứ khác đ�u trở thành đống sắt vụn.\nTiếp tục mở rộng ra bên ngoài. Khám phá lại công nghệ có ở đây.
+sector.stainedMountains.description = Xa hơn trong đất li�n là những ng�n núi, chưa bị bào tử xâm lấn.\nKhai thác titan dồi dào trong khu vực này. Tìm hiểu làm thế nào để sử dụng nó.\n\nSự hiện diện của kẻ địch ở đây lớn hơn. �ừng cho chúng th�i gian để có đơn vị mạnh nhất của chúng.
+sector.overgrowth.description = Khu vực này phát triển quá mức, gần nguồn bào tử hơn.\n�ịch đã lập ti�n đồn ở đây. Chế tạo đơn vị Mace. Phá hủy nó.
+sector.tarFields.description = Vùng ngoại ô của khu sản xuất dầu, nằm giữa núi và sa mạc. Một trong số ít khu vực có trữ lượng dầu có thể sử dụng được.\nMặc dù bị b� hoang, khu vực này có một số lực lượng địch nguy hiểm gần đó. �ừng đánh giá thấp chúng.\n\n[lightgray]Nghiên cứu công nghệ chế biến dầu nếu có thể.
+sector.desolateRift.description = Một vùng cực kỳ nguy hiểm. Tài nguyên dồi dào, nhưng ít không gian. Nguy cơ thất thủ cao. Xây dựng phòng thủ trên không và mặt đất sớm nhất có thể. �ừng để bị lừa bởi khoảng cách dài giữa các cuộc tấn công của kẻ địch.
+sector.nuclearComplex.description = Một cơ sở từng sản xuất và chế biến thori, đã biến thành đống đổ nát.\n[lightgray]Nghiên cứu thori và nhi�u công dụng của nó.\n\nKẻ địch có mặt ở đây với số lượng rất lớn, liên tục lùng sục những kẻ tấn công.
+sector.fungalPass.description = Khu vực chuyển tiếp giữa vùng núi cao và vùng đất thấp hơn, đầy bào tử. Một căn cứ trinh sát nh� của địch được đặt tại đây.\nPhá hủy nó.\nSử dụng đơn vị Dagger và Crawler. Phá hủy hai lõi của địch.
+sector.biomassFacility.description = Nguồn gốc của bào tử. �ây là cơ sở mà chúng được nghiên cứu và sản xuất ban đầu.\nNghiên cứu công nghệ có ở đây. Nuôi cấy bào tử để sản xuất nhiên liệu và chất dẻo.\n\n[lightgray]Khi cơ sở này sụp đổ, các bào tử đã được giải phóng. Không có gì trong hệ sinh thái địa phương có thể cạnh tranh với một dạng sống xâm lấn mạnh như vậy.
+sector.windsweptIslands.description = Xa hơn đư�ng b� biển là chuỗi đảo xa xôi này. Hồ sơ cho thấy h� đã từng có công trình sản xuất [accent]Nhựa[].\n\nChống lại các lực lượng hải quân của kẻ địch. Thiết lập căn cứ trên quần đảo. Nghiên cứu các nhà máy này.
+sector.extractionOutpost.description = Một ti�n đồn xa, được kẻ địch xây dựng với mục đích phóng nguồn lực sang các khu vực khác.\n\nCông nghệ vận chuyển qua lại giữa các khu vực rất cần thiết cho việc mở rộng chinh phục. Phá hủy căn cứ. Nghiên cứu bệ phóng của h�.
+sector.impact0078.description = �ây là tàn tích của tàu vận chuyển giữa các vì sao đã từng đến được hệ sao này.\n\nLấy càng nhi�u càng tốt từ đống đổ nát. Nghiên cứu bất kỳ công nghệ nguyên vẹn nào.
+sector.planetaryTerminal.description = Mục tiêu cuối cùng.\n\nCăn cứ ven biển này chứa một cấu trúc có khả năng phóng các lõi tới các hành tinh lân cận. Nó được bảo vệ cực kỳ cẩn thận.\n\nSản xuất đơn vị hải quân. Loại b� kẻ địch càng nhanh càng tốt. Nghiên cứu cấu trúc phóng.
+sector.coastline.description = Phát hiện tàn dư công nghệ của các đơn vị hải quân tại địa điểm này. �ẩy lùi các cuộc tấn công của kẻ địch, chiếm khu vực này, và lấy công nghệ.
+sector.navalFortress.description = Kẻ địch đã thiết lập một căn cứ từ xa, trên đảo tự nhiên. Phá hủy ti�n đồn này. Chiếm công nghệ chế tạo đơn vị hải quân tiên tiến của địch và nghiên cứu nó.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+
+#do not translate
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = The Onset
+sector.aegis.name = Aegis
+sector.lake.name = Lake
+sector.intersect.name = Intersect
+sector.atlas.name = Atlas
+sector.split.name = Split
+sector.basin.name = Basin
+sector.marsh.name = Marsh
+sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
+
+sector.onset.description = Bắt đầu hành trình chinh phục Erekir. Thu thập tài nguyên, sản xuất đơn vị, và bắt đầu nghiên cứu công nghệ.
+sector.aegis.description = Khu vực này chứa các kho lưu trữ của tungsten.\nNghiên cứu [accent]Máy khoan động lực[] để khai thác tài nguyên này này, và phá hủy căn cứ của địch ở khu vực này.
+sector.lake.description = Hồ xỉ nóng chảy của khu vực này giới hạn rất nhi�u các loại đơn vị. Một loại đơn vị lướt được là sự lựa ch�n duy nhất.\nNghiên cứu [accent]Máy chế tạo phi thuy�n[] và sản xuất một đơn vị [accent]elude[] nhanh nhất có thể.
+sector.intersect.description = Việc thăm dò cho thấy khu vực này sẽ bị tấn công từ nhi�u hướng ngay sau khi đáp.\nThiết lập các lớp phòng thủ nhanh chóng và mở rộng sớm nhất có thể.\n[accent]Máy cơ động[] sẽ là cần thiết cho địa hình khó khăn của khu vực này.
+sector.atlas.description = Khu vực này có địa hình phong phú và sẽ cần nhi�u loại đơn vị đa dạng để tấn công hiệu quả.\nCác loại đơn vị được nâng cấp cũng có thể cần thiết để vượt qua một số căn cứ của địch được phát hiện ở đây.\nNghiên cứu [accent]Máy điện phân[] và [accent]Máy chế tạo xe tăng[].
+sector.split.description = Sự hiện diện ít �i của kẻ địch ở khu vực này làm nó là một khu vực hoàn hảo để thử nghiệm công nghệ vận chuyển mới.
+sector.basin.description = �ã phát hiện sự hiện diện lớn mạnh của kẻ địch ở khu vực này.\nSản xuất đơn vị nhanh chóng và chiếm được các lõi của địch để có được một vị thế vững chắc.
+sector.marsh.description = Khu vực này có trữ lượng lớn arkycite, nhưng có rất ít các lỗ hơi nước.\nXây dựng [accent]Bể điện hóa[] để tạo năng lượng.
+sector.peaks.description = �ịa hình đồi núi của khu vực này khiến hầu hết các loại đơn vị vô dụng. Các loại đơn vị bay trở nên cần thiết.\nHãy cẩn thận với các công trình phòng thủ trên không của địch. Có thể bị vô hiệu hóa bằng cách tấn công các công trình hỗ trợ.
+sector.ravine.description = Một tuyến đư�ng vận chuyển quan tr�ng cho kẻ địch. Không phát hiện lõi nào trong khu vực, nhưng dự đoán sẽ có nhi�u loại kẻ địch đa dạng.\nSản xuất [accent]hợp kim[]. Xây dựng bệ súng [accent]Afflict[].
+sector.caldera-erekir.description = Các tài nguyên được phát hiện ở khu vực này được phân bố trên nhi�u đảo.\nNghiên cứu và triển khai vận chuyển dựa trên máy bay không ngư�i lái.
+sector.stronghold.description = Các căn cứ của địch ở khu vực này đang bảo vệ một lượng lớn [accent]thori[].\nSử dụng nó để phát triển các loại đơn vị và bệ súng cao cấp hơn.
+sector.crevice.description = �ịch sẽ gửi các đơn vị tấn công mạnh mẽ để triệt hạ căn cứ của bạn ở khu vực này.\nPhát triển [accent]carbide[] và [accent]Máy nhiệt phân[] là đi�u cần thiết để sống sót.
+sector.siege.description = Khu vực này có hai hẻm núi song song sẽ tạo ra một cuộc tấn công theo hai hướng.\nNghiên cứu [accent]cyano[] để có thể chế tạo những đơn vị xe tăng mạnh hơn.\nChú ý: Phát hiện tên lửa tầm xa của kẻ địch. Các tên lửa có thể bị bắn hạ trước khi va chạm.
+sector.crossroads.description = Các căn cứ của địch ở khu vực này được xây dựng trên các địa hình khác nhau. Nghiên cứu các loại đơn vị khác nhau sao cho phù hợp.\nNgoài ra, một số căn cứ được bảo vệ bởi các máy chiếu khiên chắn. Tìm hiểu cách chúng được cung cấp năng lượng.
+sector.karst.description = Khu vực này có rất nhi�u tài nguyên, nhưng sẽ bị địch tấn công khi một lõi mới đáp xuống.\nTận dụng các tài nguyên và nghiên cứu [accent]sợi lượng tử[].
+sector.origin.description = Khu vực cuối cùng với sự hiện diện của địch rất lớn.\nKhông còn bất cứ thứ gì cần nghiên cứu - tập trung hoàn toàn vào việc tiêu diệt tất cả các lõi của địch.
+
+status.burning.name = �ốt cháy
+status.freezing.name = �óng băng
+status.wet.name = Ẩm ướt
+status.muddy.name = Sa lầy
+status.melting.name = Tan chảy
+status.sapped.name = Ăn mòn
+status.electrified.name = Nhiễm điện
+status.spore-slowed.name = Nhiễm bào tử chậm
+status.tarred.name = Nhiễm dầu
+status.overdrive.name = Tăng cư�ng
+status.overclock.name = Gia tốc
+status.shocked.name = Sốc
+status.blasted.name = Nổ
+status.unmoving.name = Bất động
+status.boss.name = Trùm
 
 settings.language = Ngôn ngữ
 settings.data = Dữ liệu trò chơi
 settings.reset = Khôi phục v� mặc định
-settings.rebind = Sá»­a
+settings.rebind = Gán lại
 settings.resetKey = �ặt lại
 settings.controls = �i�u khiển
 settings.game = Trò chơi
 settings.sound = Âm thanh
 settings.graphics = �ồ h�a
 settings.cleardata = Xóa dữ liệu trò chơi...
-settings.clear.confirm = Bạn có chắc chắn muốn xóa dữ liệu này không?\nHành động này không thể hoàn tác!
-settings.clearall.confirm = [scarlet]CẢNH B�O![]\nThao tác này sẽ xóa tất cả dữ liệu, bao gồm bản đồ và các cài đặt.\nSau khi bạn nhấn vào 'ok' trò chơi sẽ xóa tất cả dữ liệu và tự động thoát.
+settings.clear.confirm = Bạn có chắc chắn muốn xóa dữ liệu này không?\nThực hiện xong không thể hoàn tác!
+settings.clearall.confirm = [scarlet]CẢNH B�O![]\nThao tác này sẽ xóa tất cả dữ liệu, bao gồm các bản lưu, bản đồ, mở khóa và phím đã gán. \nMột khi bạn nhấn vào '�ồng ý' thì trò chơi sẽ xóa tất cả dữ liệu và tự động thoát.
 settings.clearsaves.confirm = Bạn có chắc muốn xóa tất cả bản lưu?
 settings.clearsaves = Xóa bản lưu
-settings.clearresearch = Xóa dữ liệu nghiên cứu
-settings.clearresearch.confirm = Bạn có chắc muốn xóa tất cả dữ liệu nghiên cứu từ Chiến dịch?
-settings.clearcampaignsaves = Xóa dữ liệu Chiến dịch
-settings.clearcampaignsaves.confirm = Bạn có chắc muốn xóa toàn bộ dữ liệu Chiến dịch?
+settings.clearresearch = Xóa nghiên cứu
+settings.clearresearch.confirm = Bạn có chắc muốn xóa tất cả nghiên cứu từ chiến dịch?
+settings.clearcampaignsaves = Xóa bản lưu chiến dịch
+settings.clearcampaignsaves.confirm = Bạn có chắc muốn xóa toàn bộ bản lưu chiến dịch?
 paused = [accent]< Tạm dừng >
 clear = Xóa
-banned = [scarlet]Cấm
-yes = Có 
+banned = [scarlet]Bị cấm
+unsupported.environment = [scarlet]Môi trư�ng không được hỗ trợ
+yes = Có
 no = Không
 info.title = Thông tin
 error.title = [scarlet]�ã xảy ra lỗi
 error.crashtitle = �ã xảy ra lỗi
-unit.nobuild = [scarlet]Quân lính/Công trình không thể xây dựng
+unit.nobuild = [scarlet]�ơn vị không thể xây dựng
 lastaccessed = [lightgray]Truy cập lần cuối: {0}
+lastcommanded = [lightgray]�ược ra lệnh lần cuối: {0}
 block.unknown = [lightgray]???
 
-stat.description = Mô tả
+stat.showinmap = <mở bản đồ để hiện>
+stat.description = Mục đích
 stat.input = �ầu vào
-stat.output = Sản phẩm
+stat.output = �ầu ra
+stat.maxefficiency = Hiệu suất tối đa
 stat.booster = Tăng cư�ng
-stat.tiles = Yêu cầu khu vực
+stat.tiles = Yêu cầu ô n�n
 stat.affinities = Phù hợp
-stat.powercapacity = Dung lượng pin
+stat.opposites = �ối nghịch
+stat.powercapacity = Dung lượng điện
 stat.powershot = Năng lượng/Phát bắn
 stat.damage = Sát thương
 stat.targetsair = Mục tiêu trên không
 stat.targetsground = Mục tiêu mặt đất
 stat.itemsmoved = Tốc độ dịch chuyển
-stat.launchtime = Th�i gian giữa các lần phóng.
+stat.launchtime = Th�i gian giữa các lần phóng
 stat.shootrange = Phạm vi
 stat.size = Kích thước
-stat.displaysize = Kích thước màn hình
+stat.displaysize = Kích thước hiển thị
 stat.liquidcapacity = Dung tích chất l�ng
 stat.powerrange = Phạm vi năng lượng
-stat.linkrange = Phạm vi kết nối
-stat.instructions = Hướng dẫn
+stat.linkrange = Phạm vi liên kết
+stat.instructions = Chỉ lệnh
 stat.powerconnections = Số lượng kết nối tối đa
 stat.poweruse = Năng lượng sử dụng
 stat.powerdamage = Năng lượng/Sát thương
 stat.itemcapacity = Sức chứa vật phẩm
 stat.memorycapacity = Dung lượng bộ nhớ
-stat.basepowergeneration = Năng lượng tạo ra (cơ bản)
+stat.basepowergeneration = Năng lượng tạo ra cơ bản
 stat.productiontime = Th�i gian sản xuất
-stat.repairtime = Th�i gian sửa
+stat.repairtime = Th�i gian hoàn thành sửa chữa
+stat.repairspeed = Tốc độ sửa
 stat.weapons = Vũ khí
-stat.bullet = �ạn
+stat.bullet = Loại đạn
+stat.moduletier = Cấp mô-đun
+stat.unittype = Kiểu đơn vị
 stat.speedincrease = Tăng tốc
 stat.range = Phạm vi
-stat.drilltier = Khoang được
-stat.drillspeed = Tốc độ khoang cơ bản
+stat.drilltier = Khoan được
+stat.drillspeed = Tốc độ khoan cơ bản
 stat.boosteffect = Hiệu ứng tăng cư�ng
-stat.maxunits = Số quân lính hoạt động tối đa
+stat.maxunits = Số đơn vị hoạt động tối đa
 stat.health = �ộ b�n
+stat.armor = Giáp
 stat.buildtime = Th�i gian xây
-stat.maxconsecutive = �ầu ra tối đa
-stat.buildcost = Chi phí
+stat.maxconsecutive = Nối tiếp tối đa
+stat.buildcost = Chi phí xây
 stat.inaccuracy = �ộ lệch
 stat.shots = Phát bắn
-stat.reload = Phát bắn/Giây
+stat.reload = Tốc độ bắn
 stat.ammo = �ạn
 stat.shieldhealth = �ộ b�n khiên
-stat.cooldowntime = Th�i gian ch�
+stat.cooldowntime = Th�i gian hồi phục
 stat.explosiveness = Gây nổ
 stat.basedeflectchance = Tỷ lệ phản đạn
 stat.lightningchance = Tỷ lệ phóng điện
 stat.lightningdamage = Sát thương tia điện
 stat.flammability = Dễ cháy
 stat.radioactivity = Phóng xạ
+stat.charge = Tích điện
 stat.heatcapacity = Nhiệt dung
 stat.viscosity = �ộ nhớt
 stat.temperature = Nhiệt độ
@@ -694,25 +1035,78 @@ stat.speed = Vận tốc
 stat.buildspeed = Tốc độ xây
 stat.minespeed = Tốc độ đào
 stat.minetier = Cấp độ đào
-stat.payloadcapacity = Sức chứa khối hàng
-stat.commandlimit = Giới hạn lệnh
-stat.abilities = Khả năng
-stat.canboost = Nâng cấp
+stat.payloadcapacity = Tải tr�ng
+stat.abilities = Khả năng
+stat.canboost = Có thể tăng cư�ng
 stat.flying = Bay
+stat.ammouse = Sử dụng đạn
+stat.ammocapacity = Trữ lượng đạn
+stat.damagemultiplier = Hệ số sát thương
+stat.healthmultiplier = Hệ số độ b�n
+stat.speedmultiplier = Hệ số tốc độ
+stat.reloadmultiplier = Hệ số hồi đạn
+stat.buildspeedmultiplier = Hệ số tốc độ xây dựng
+stat.reactive = Phản ứng
+stat.immunities = Miá»…n nhiá»…m
+stat.healing = Hồi phục
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = Force Field
-ability.repairfield = Repair Field
-ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
-ability.shieldregenfield = Shield Regen Field
-ability.movelightning = Movement Lightning
+ability.forcefield = Khiên trư�ng lực
+ability.forcefield.description = Phát một khiên trư�ng lực hấp thụ các loại đạn
+ability.repairfield = Trư�ng sửa chữa
+ability.repairfield.description = Sửa chữa các đơn vị gần đó
+ability.statusfield = Trư�ng trạng thái
+ability.statusfield.description = �p dụng hiệu ứng trạng thái vào các đơn vị gần đó
+ability.unitspawn = Chế tạo
+ability.unitspawn.description = Sản xuất đơn vị
+ability.shieldregenfield = Trư�ng hồi khiên
+ability.shieldregenfield.description = Hồi phục khiên cho các đơn vị gần đó
+ability.movelightning = Di chuyển phóng điện
+ability.movelightning.description = Giải phóng tia điện khi di chuyển
+ability.armorplate = Mảnh giáp
+ability.armorplate.description = Giảm sát thương gánh chịu trong khi bắn
+ability.shieldarc = Khiên vòng cung
+ability.shieldarc.description = Phát một khiên trư�ng lực vòng cung hấp thụ các loại đạn
+ability.suppressionfield = Ngăn chặn sửa chữa
+ability.suppressionfield.description = Dừng các công trình sửa chữa gần đó
+ability.energyfield = Trư�ng điện từ
+ability.energyfield.description = Giật điện các kẻ địch gần đó
+ability.energyfield.healdescription = Giật điện các kẻ địch gần đó và hồi phục đồng minh
+ability.regen = Tự hồi phục
+ability.regen.description = Tự hồi phục độ b�n theo th�i gian
+ability.liquidregen = Hấp thụ chất l�ng
+ability.liquidregen.description = Hấp thụ chất l�ng để tự hồi phục
+ability.spawndeath = Chết sản sinh
+ability.spawndeath.description = Sinh ra đơn vị khi chết
+ability.liquidexplode = Chết tràn dịch
+ability.liquidexplode.description = Tràn chất l�ng khi chết
 
+ability.stat.firingrate = tốc độ bắn [stat]{0}/giây[lightgray]
+ability.stat.regen = [stat]{0}[lightgray] độ b�n/giây
+ability.stat.pulseregen = [stat]{0}[lightgray] độ b�n/xung nhịp
+ability.stat.shield = [stat]{0}[lightgray] khiên tối đa
+ability.stat.repairspeed = [stat]{0}/giây[lightgray] tốc độ sửa chữa
+ability.stat.slurpheal = [stat]{0}[lightgray] độ b�n/đơn vị chất l�ng
+ability.stat.cooldown = [stat]{0} giây[lightgray] hồi phục
+ability.stat.maxtargets = [stat]{0}[lightgray] mục tiêu tối đa
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] số lượng sửa chữa cùng kiểu
+ability.stat.damagereduction = [stat]{0}%[lightgray] giảm sát thương
+ability.stat.minspeed = tốc độ tối thiểu [stat]{0} ô/giây[lightgray]
+ability.stat.duration = th�i hạn [stat]{0} giây[lightgray]
+ability.stat.buildtime = th�i gian xây [stat]{0} giây[lightgray]
+
+bar.onlycoredeposit = Chỉ được phép đưa vào lõi
 bar.drilltierreq = Cần máy khoan tốt hơn
+bar.nobatterypower = Thiếu năng lượng pin
 bar.noresources = Thiếu tài nguyên
-bar.corereq = Yêu cầu căn cứ
+bar.corereq = Yêu cầu lõi cơ bản
+bar.corefloor = Yêu cầu ô n�n lõi
+bar.cargounitcap = �ã đạt tải tr�ng tối đa
 bar.drillspeed = Tốc độ khoan: {0}/giây
 bar.pumpspeed = Tốc độ bơm: {0}/giây
 bar.efficiency = Hiệu suất: {0}%
+bar.boost = Tăng tốc: +{0}%
+bar.powerbuffer = Pin: {0}/{1}
 bar.powerbalance = Năng lượng: {0}/giây
 bar.powerstored = Lưu trữ: {0}/{1}
 bar.poweramount = Năng lượng: {0}
@@ -721,271 +1115,395 @@ bar.powerlines = Số lượng kết nối: {0}/{1}
 bar.items = Vật phẩm: {0}
 bar.capacity = Sức chứa: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[quân lính bị vô hiệu hóa]
 bar.liquid = Chất l�ng
-bar.heat = Nhiệt độ
+bar.heat = Nhiệt lượng
+bar.cooldown = Hồi phục
+bar.instability = Bất ổn định
+bar.heatamount = Nhiệt lượng: {0}
+bar.heatpercent = Nhiệt lượng: {0} ({1}%)
 bar.power = Năng lượng
-bar.progress = �ang xây dựng
+bar.progress = Tiến độ xây dựng
+bar.loadprogress = Tiến độ
+bar.launchcooldown = Hồi phóng
 bar.input = �ầu vào
-bar.output = Sản phẩm
+bar.output = �ầu ra
+bar.strength = [stat]{0}[lightgray]x sức mạnh
 
 units.processorcontrol = [lightgray]�i�u khiển bởi bộ xử lý
 
 bullet.damage = [stat]{0}[lightgray] sát thương
 bullet.splashdamage = [stat]{0}[lightgray] sát thương diện rộng ~[stat] {1}[lightgray] ô
-bullet.incendiary = [stat]cháy
-bullet.sapping = [stat]sapping
-bullet.homing = [stat]homing
-bullet.shock = [stat]sốc
-bullet.frag = [stat]frag
-bullet.knockback = [stat]{0}[lightgray] bật lùi
-bullet.pierce = [stat]{0}[lightgray]x xuyên giáp
-bullet.infinitepierce = [stat]pierce
-bullet.healpercent = [stat]{0}[lightgray]% sá»­a chá»­a
-bullet.freezing = [stat]đóng băng
-bullet.tarred = [stat]tarred
-bullet.multiplier = [stat]{0}[lightgray]x lượng đạn
-bullet.reload = [stat]{0}[lightgray]x tốc độ bắn
+bullet.incendiary = [stat]gây cháy
+bullet.homing = [stat]truy đuổi
+bullet.armorpierce = [stat]xuyên giáp
+bullet.maxdamagefraction = [stat]{0}%[lightgray] giới hạn sát thương
+bullet.suppression = [stat]{0}[lightgray] giây ngăn sửa chữa ~ [stat]{1}[lightgray] ô
+bullet.interval = [stat]{0}/giây[lightgray] đạn ngắt quãng:
+bullet.frags = [stat]{0}x[lightgray] đạn phá mảnh:
+bullet.lightning = [stat]{0}[lightgray]x phóng điện ~ [stat]{1}[lightgray] sát thương
+bullet.buildingdamage = [stat]{0}%[lightgray] sát thương công trình
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray] đẩy lùi
+bullet.pierce = [stat]{0}[lightgray]x xuyên thấu
+bullet.infinitepierce = [stat]xuyên thấu
+bullet.healpercent = [stat]{0}%[lightgray] sửa chữa
+bullet.healamount = [stat]{0}[lightgray] sửa chữa trực tiếp
+bullet.multiplier = [stat]{0}[lightgray] đạn/vật phẩm
+bullet.reload = [stat]{0}%[lightgray] tốc độ bắn
+bullet.range = [stat]{0}[lightgray] ô phạm vi
+bullet.notargetsmissiles = [stat] phớt l� tên lửa
+bullet.notargetsbuildings = [stat] phớt l� công trình
 
-unit.blocks = Khối
-unit.blockssquared = Khối²
+unit.blocks = khối
+unit.blockssquared = khối²
 unit.powersecond = đơn vị năng lượng/giây
+unit.tilessecond = ô/giây
 unit.liquidsecond = đơn vị chất l�ng/giây
 unit.itemssecond = vật phẩm/giây
 unit.liquidunits = đơn vị chất l�ng
 unit.powerunits = đơn vị năng lượng
+unit.heatunits = đơn vị nhiệt
 unit.degrees = Ä‘á»™
 unit.seconds = giây
 unit.minutes = phút
 unit.persecond = /giây
 unit.perminute = /phút
 unit.timesspeed = x tốc độ
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = độ b�n khiên
 unit.items = vật phẩm
-unit.thousands = nghìn
-unit.millions = triệu
+unit.thousands = ng
+unit.millions = tr
 unit.billions = tá»·
-category.purpose = Mô tả
+unit.shots = phát bắn
+unit.pershot = /phát bắn
+category.purpose = Mục đích
 category.general = Chung
 category.power = Năng lượng
 category.liquids = Chất l�ng
 category.items = Vật phẩm
-category.crafting = Vào/Sản phẩm
+category.crafting = �ầu vào/ra
 category.function = Chức năng
-category.optional = Cải tiến
+category.optional = Cải tiến tùy ch�n
+setting.alwaysmusic.name = Luôn phát nhạc
+setting.alwaysmusic.description = Khi bật, âm nhạc sẽ luôn phát lặp lại khi chơi.\nKhi tắt, nó chỉ phát tại các khoảng th�i gian ngẫu nhiên.
+setting.skipcoreanimation.name = B� qua hiệu ứng phóng/đáp lõi
 setting.landscape.name = Khóa ngang
-setting.shadows.name = Bóng đổ
+setting.shadows.name = �ổ bóng
 setting.blockreplace.name = Tự động đ� xuất khối
 setting.linear.name = L�c tuyến tính
 setting.hints.name = Gợi ý
-setting.flow.name = Hiện thị tốc độ chuy�n tài nguyên
+setting.logichints.name = Gợi ý Logic
 setting.backgroundpause.name = Tạm dừng trong n�n
 setting.buildautopause.name = Tự động dừng xây dựng
-setting.animatedwater.name = Hiệu ứng nước
-setting.animatedshields.name = Hiệu ứng khiên
-setting.antialias.name = Khử răng cưa[lightgray] (yêu cầu khởi động lại)[]
-setting.playerindicators.name = Hướng ngư�i chơi
-setting.indicators.name = Hướng kẻ địch
+setting.doubletapmine.name = Nhấn đúp để �ào
+setting.commandmodehold.name = Nhấn giữ để vào chế độ mệnh lệnh
+setting.distinctcontrolgroups.name = Giới hạn một nhóm đi�u khiển cho mỗi đơn vị
+setting.modcrashdisable.name = Tắt các mod khi gặp sự cố trong khởi động
+setting.animatedwater.name = Chuyển động b� mặt
+setting.animatedshields.name = Chuyển động khiên
+setting.playerindicators.name = Chỉ hướng ngư�i chơi
+setting.indicators.name = Chỉ hướng kẻ địch
 setting.autotarget.name = Tự động nhắm mục tiêu
-setting.keyboard.name = �i�u khiển bằng chuột+bàn phím
-setting.touchscreen.name = �i�u khiển bằng màng hình cảm ứng
+setting.keyboard.name = �i�u khiển bằng chuột + bàn phím
+setting.touchscreen.name = �i�u khiển bằng màn hình cảm ứng
 setting.fpscap.name = FPS tối đa
-setting.fpscap.none = Không giới hạn
+setting.fpscap.none = Không có
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Kích thước UI[lightgray] (yêu cầu khởi động lại)[]
-setting.swapdiagonal.name = �ặt luôn theo đư�ng chéo
-setting.difficulty.training = Luyện tập
-setting.difficulty.easy = Dá»…
-setting.difficulty.normal = Vừa
-setting.difficulty.hard = Khó
-setting.difficulty.insane = Rất khó
-setting.difficulty.name = �ộ khó:
+setting.uiscale.name = Tỉ lệ giao diện
+setting.uiscale.description = Cần khởi động lại để áp dụng các thay đổi.
+setting.swapdiagonal.name = Luôn đặt theo đư�ng chéo
 setting.screenshake.name = Rung chuyển khung hình
+setting.bloomintensity.name = Mức độ phát sáng
+setting.bloomblur.name = Xoá m� phát sáng
 setting.effects.name = Hiển thị hiệu ứng
 setting.destroyedblocks.name = Hiển thị khối bị phá
 setting.blockstatus.name = Hiển thị trạng thái khối
-setting.conveyorpathfinding.name = Tìm đư�ng dẫn băng chuy�n
+setting.conveyorpathfinding.name = Tìm đư�ng dẫn băng chuy�n khi đặt
 setting.sensitivity.name = �ộ nhạy đi�u khiển
 setting.saveinterval.name = Khoảng th�i gian lưu
 setting.seconds = {0} giây
-setting.milliseconds = {0} mili giây
-setting.fullscreen.name = Toàn màng hình
-setting.borderlesswindow.name = Không vi�n[lightgray] (yêu cầu khởi động lại)
-setting.fps.name = Hiển thị FPS & Ping
-setting.smoothcamera.name = Chế độ mượt mà
-setting.vsync.name = VSync
+setting.milliseconds = {0} mili-giây
+setting.fullscreen.name = Toàn màn hình
+setting.borderlesswindow.name = Cửa sổ không vi�n
+setting.borderlesswindow.name.windows = Toàn màn hình không vi�n
+setting.borderlesswindow.description = Có thể cần khởi động lại để áp dụng các thay đổi.
+setting.fps.name = Hiện FPS & Ping
+setting.console.name = Bật Bảng đi�u khiển
+setting.smoothcamera.name = Khung quay mượt mà
+setting.vsync.name = �ồng bộ d�c (VSync)
 setting.pixelate.name = �ồ h�a pixel
-setting.minimap.name = Hiển thị bảng đồ mini
-setting.coreitems.name = Hiển thị vật phẩm trong căn cứ
-setting.position.name = Hiển thị vị trí ngư�i chơi
+setting.minimap.name = Hiện bản đồ nh�
+setting.coreitems.name = Hiển thị vật phẩm trong lõi
+setting.position.name = Hiện vị trí ngư�i chơi
+setting.mouseposition.name = Hiện vị trí tr� chuột
 setting.musicvol.name = Âm lượng nhạc
-setting.atmosphere.name = Hiển thị bầu khí quyển hành tinh
-setting.ambientvol.name = Âm lượng tổng
+setting.atmosphere.name = Hiện bầu khí quyển hành tinh
+setting.drawlight.name = Vẽ Bóng tối/�nh sáng
+setting.ambientvol.name = Âm lượng môi trư�ng
 setting.mutemusic.name = Tắt nhạc
-setting.sfxvol.name = Âm lượng SFX
-setting.mutesound.name = Tắt tiếng
-setting.crashreport.name = Gửi báo cáo sự cố
-setting.savecreate.name = Tá»± Ä‘á»™ng lÆ°u
-setting.publichost.name = Hiển thị trò chơi công khai
+setting.sfxvol.name = Âm lượng hiệu ứng âm thanh (SFX)
+setting.mutesound.name = Tắt âm
+setting.crashreport.name = Gửi báo cáo sự cố ẩn danh
+setting.communityservers.name = Lấy danh sách máy chủ cộng đồng
+setting.savecreate.name = Tự động tạo bản lưu
+setting.steampublichost.name = Hiển thị trò chơi công khai
 setting.playerlimit.name = Giới hạn ngư�i chơi
 setting.chatopacity.name = �ộ m� trò chuyện
 setting.lasersopacity.name = �ộ m� kết nối năng lượng
+setting.unitlaseropacity.name = �ộ m� tia khai khoáng của đơn vị
 setting.bridgeopacity.name = �ộ m� cầu
 setting.playerchat.name = Hiển thị bong bóng trò chuyện của ngư�i chơi
-public.confirm = Bạn có muốn công khai trò chơi của mình không?\n[accent]Bất kỳ ai cũng có thể tham gia trò chơi của bạn.\n[lightgray]�i�u này có thể được thay đổi sau trong Cài đặt-> Trò chơi-> Hiển thị trò chơi công khai.
+setting.showweather.name = Hiện đồ h�a th�i tiết
+setting.hidedisplays.name = Ẩn hiển thị logic
+setting.macnotch.name = Giao diện phù hợp với hiển thị tai th� (notch)
+setting.macnotch.description = Cần khởi động lại để áp dụng các thay đổi
+steam.friendsonly = Chỉ bạn bè
+steam.friendsonly.tooltip = Liệu chỉ bạn bè trên Steam mới có thể tham gia trò chơi của bạn hay không.\nB� ch�n ô này sẽ làm trò chơi của bạn công khai - m�i ngư�i có thể tham gia.
 public.beta = Lưu ý rằng phiên bản beta của trò chơi không thể tạo sảnh công khai.
-uiscale.reset = Kích thước UI đã được thay đổi.\nNhấn "OK" để xác nhận.\n[scarlet]Hoàn lại và thoát trong[accent] {0}[] giây...
+uiscale.reset = Tỉ lệ giao diện đã được thay đổi.\nNhấn "�ồng ý" để xác nhận tỉ lệ này.\n[scarlet]Hoàn lại và thoát trong[accent] {0}[] giây...
 uiscale.cancel = Hủy & Thoát
 setting.bloom.name = Hiệu ứng phát sáng
-keybind.title = Sửa phím
+keybind.title = Gán lại phím
 keybinds.mobile = [scarlet]Hầu hết phím ở đây không hoạt động trên thiết bị di động. Chỉ hỗ trợ di chuyển cơ bản.
 category.general.name = Chung
 category.view.name = Xem
+category.command.name = Mệnh lệnh đơn vị
 category.multiplayer.name = Nhi�u ngư�i chơi
 category.blocks.name = Ch�n khối
-command.attack = Tấn công
-command.rally = Tập hợp
-command.retreat = Rút lui
-command.idle = Không hoạt động
 placement.blockselectkeys = \n[lightgray]Phím: [{0},
 keybind.respawn.name = Hồi sinh
-keybind.control.name = �i�u khiển quân lính
+keybind.control.name = �i�u khiển đơn vị
 keybind.clear_building.name = Xóa công trình
 keybind.press = Nhấn một phím...
-keybind.press.axis = Nhấn một tổ hợp phím hoặc một phím...
+keybind.press.axis = Nhấn một trục xoay hoặc một phím...
 keybind.screenshot.name = Chụp ảnh bản đồ
-keybind.toggle_power_lines.name = Toggle Power Lasers
-keybind.toggle_block_status.name = Toggle Block Statuses
+keybind.toggle_power_lines.name = Ẩn/Hiện đư�ng truy�n năng lượng
+keybind.toggle_block_status.name = Ẩn/Hiện trạng thái khối
 keybind.move_x.name = Di chuyển X
 keybind.move_y.name = Di chuyển Y
 keybind.mouse_move.name = Theo chuá»™t
-keybind.pan.name = Xem Pan
+keybind.pan.name = Di chuyển góc nhìn
 keybind.boost.name = Tăng tốc
+keybind.command_mode.name = Chế độ mệnh lệnh
+keybind.command_queue.name = Lệnh tuần tự đơn vị
+keybind.create_control_group.name = Tạo nhóm đi�u khiển
+keybind.cancel_orders.name = Hủy lệnh
+
+keybind.unit_stance_shoot.name = Tư thế đơn vị: Bắn
+keybind.unit_stance_hold_fire.name = Tư thế đơn vị: Ngừng bắn
+keybind.unit_stance_pursue_target.name = Tư thế đơn vị: Bám đuổi mục tiêu
+keybind.unit_stance_patrol.name = Tư thế đơn vị: Tuần tra
+keybind.unit_stance_ram.name = Tư thế đơn vị: Tông thẳng
+
+keybind.unit_command_move.name = Mệnh lệnh đơn vị: Di chuyển
+keybind.unit_command_repair.name = Mệnh lệnh đơn vị: Sửa chữa
+keybind.unit_command_rebuild.name = Mệnh lệnh đơn vị: Xây lại
+keybind.unit_command_assist.name = Mệnh lệnh đơn vị: Hỗ trợ
+keybind.unit_command_mine.name = Mệnh lệnh đơn vị: Khai thác
+keybind.unit_command_boost.name = Mệnh lệnh đơn vị: Tăng cư�ng
+keybind.unit_command_load_units.name = Mệnh lệnh đơn vị: Nhập đơn vị
+keybind.unit_command_load_blocks.name = Mệnh lệnh đơn vị: Nhập khối công trình
+keybind.unit_command_unload_payload.name = Mệnh lệnh đơn vị: Dỡ khối hàng
+keybind.unit_command_enter_payload.name = Mệnh lệnh đơn vị: Vào khối hàng
+keybind.unit_command_loop_payload.name = Mệnh lệnh đơn vị: Lặp vận chuyển đơn vi
+
+keybind.rebuild_select.name = Xây dựng lại khu vực
 keybind.schematic_select.name = Ch�n khu vực
-keybind.schematic_menu.name = Menu Schematic
-keybind.schematic_flip_x.name = Lật Schematic X
-keybind.schematic_flip_y.name = Lật Schematic Y
+keybind.schematic_menu.name = Trình đơn bản thiết kế
+keybind.schematic_flip_x.name = Lật bản thiết kế X
+keybind.schematic_flip_y.name = Lật bản thiết kế Y
 keybind.category_prev.name = Danh mục trước
 keybind.category_next.name = Danh mục tiếp theo
 keybind.block_select_left.name = Ch�n khối trái
 keybind.block_select_right.name = Ch�n khối phải
 keybind.block_select_up.name = Ch�n khối trên
 keybind.block_select_down.name = Ch�n khối dưới
-keybind.block_select_01.name = Danh mục/Khối 1
-keybind.block_select_02.name = Danh mục/Khối 2
-keybind.block_select_03.name = Danh mục/Khối 3
-keybind.block_select_04.name = Danh mục/Khối 4
-keybind.block_select_05.name = Danh mục/Khối 5
-keybind.block_select_06.name = Danh mục/Khối 6
-keybind.block_select_07.name = Danh mục/Khối 7
-keybind.block_select_08.name = Danh mục/Khối 8
-keybind.block_select_09.name = Danh mục/Khối 9
-keybind.block_select_10.name = Danh mục/Khối 10
-keybind.fullscreen.name = Chế độ toàn màn hình
+keybind.block_select_01.name = Ch�n Danh mục/Khối 1
+keybind.block_select_02.name = Ch�n Danh mục/Khối 2
+keybind.block_select_03.name = Ch�n Danh mục/Khối 3
+keybind.block_select_04.name = Ch�n Danh mục/Khối 4
+keybind.block_select_05.name = Ch�n Danh mục/Khối 5
+keybind.block_select_06.name = Ch�n Danh mục/Khối 6
+keybind.block_select_07.name = Ch�n Danh mục/Khối 7
+keybind.block_select_08.name = Ch�n Danh mục/Khối 8
+keybind.block_select_09.name = Ch�n Danh mục/Khối 9
+keybind.block_select_10.name = Ch�n Danh mục/Khối 10
+keybind.fullscreen.name = Hoán chuyển toàn màn hình
 keybind.select.name = Ch�n/Bắn
 keybind.diagonal_placement.name = �ặt chéo
-keybind.pick.name = Ch�n khối
+keybind.pick.name = Nhặt khối
 keybind.break_block.name = Phá khối
+keybind.select_all_units.name = Ch�n tất cả đơn vị
+keybind.select_all_unit_factories.name = Ch�n tất cả các nhà máy đơn vị
 keybind.deselect.name = B� ch�n
 keybind.pickupCargo.name = Nhặt hàng
 keybind.dropCargo.name = Thả hàng
-keybind.command.name = Lệnh
 keybind.shoot.name = Bắn
 keybind.zoom.name = Thu phóng
-keybind.menu.name = Menu
+keybind.menu.name = Trình đơn
 keybind.pause.name = Tạm dừng
-keybind.pause_building.name = Tạm dừng/Tiếp tục Xây
-keybind.minimap.name = Bản đồ mini
+keybind.pause_building.name = Tạm dừng/Tiếp tục xây dựng
+keybind.minimap.name = Bản đồ nh�
 keybind.planet_map.name = Bản đồ hành tinh
 keybind.research.name = Nghiên cứu
+keybind.block_info.name = Thông tin khối
 keybind.chat.name = Trò chuyện
 keybind.player_list.name = Danh sách ngư�i chơi
 keybind.console.name = Bảng đi�u khiển
 keybind.rotate.name = Xoay
-keybind.rotateplaced.name = Xoay hiện có (Giữ)
-keybind.toggle_menus.name = Chuyển đổi Menus
+keybind.rotateplaced.name = Xoay khối đã có (Giữ)
+keybind.toggle_menus.name = Ẩn/Hiện Trình đơn
 keybind.chat_history_prev.name = Lịch sử trò chuyện trước
 keybind.chat_history_next.name = Lịch sử trò chuyện sau
 keybind.chat_scroll.name = Cuộn trò chuyện
-keybind.drop_unit.name = Thả quân
-keybind.zoom_minimap.name = Thu phóng bản đồ mini
+keybind.chat_mode.name = Thay đổi chế độ trò chuyện
+keybind.drop_unit.name = Thả đơn vị
+keybind.zoom_minimap.name = Thu phóng bản đồ nh�
 mode.help.title = Mô tả chế độ
 mode.survival.name = Sinh tồn
-mode.survival.description = Chế độ bình thư�ng. Tài nguyên hạn chế và lượt đến tự động.\n[gray]Yêu cầu nơi xuất hiện kẻ địch trong bản đồ để chơi.
+mode.survival.description = Chế độ bình thư�ng. Tài nguyên hạn chế và các đợt đến tự động.\n[gray]Yêu cầu nơi xuất hiện kẻ địch trong bản đồ để chơi.
 mode.sandbox.name = Tá»± do
 mode.sandbox.description = Tài nguyên vô hạn và không có th�i gian ch� giữa các đợt.
 mode.editor.name = Chỉnh sửa
 mode.pvp.name = PvP
-mode.pvp.description = Chiến đấu với những ngư�i chơi khác trên cùng một bản đồ.\n[gray]Cần ít nhất hai căn cứ có màu khác nhau để chơi.
+mode.pvp.description = Chiến đấu với những ngư�i chơi khác trên cùng một bản đồ.\n[gray]Cần ít nhất hai lõi có màu khác nhau để chơi.
 mode.attack.name = Tấn công
-mode.attack.description = Phá hủy căn cứ của kẻ địch. \n[gray]Cần căn cứ màu đ� trong bản đồ để chơi.
-mode.custom = Tùy chỉnh luật
+mode.attack.description = Phá hủy căn cứ của kẻ địch. \n[gray]Cần lõi màu đ� trong bản đồ để chơi.
+mode.custom = Tùy chỉnh quy tắc
 
-rules.infiniteresources = Tài nguyên vô hạn
-rules.reactorexplosions = Nổ lò phản ứng
-rules.schematic = Cho phép dùng schematic
-rules.wavetimer = �ếm ngược đợt
+rules.invaliddata = Dữ liệu bộ nhớ tạm không hợp lệ.
+rules.hidebannedblocks = Ẩn Các Khối Bị Cấm
+rules.infiniteresources = Tài Nguyên Vô Hạn
+rules.onlydepositcore = Chỉ Cho Phép �ưa Tài Nguyên Vào Lõi
+rules.derelictrepair = Cho Phép Sửa Khối B� Hoang
+rules.reactorexplosions = Nổ Nò Phản Ứng
+rules.coreincinerates = Hủy Vật Phẩm Khi Lõi �ầy
+rules.disableworldprocessors = Vô Hiệu Hoá Bộ Xử Lý Thế Giới
+rules.schematic = Cho Phép Dùng Bản Thiết Kế
+rules.wavetimer = �ếm Ngược �ợt
+rules.wavesending = Gửi đợt
+rules.allowedit = Cho Phép Sửa Quy Tắc
+rules.allowedit.info = Khi được bật, ngư�i chơi có thể chỉnh sửa các quy tắc trong lúc chơi thông qua nút ở góc dưới bên trái của Trình đơn tạm dừng.
+rules.alloweditworldprocessors = Cho Phép Chỉnh Sửa Bộ Xử Lý Thế Giới
+rules.alloweditworldprocessors.info = Khi bật, Bộ xử lý thế giới có thể được đặt và chỉnh sửa ngay cả bên ngoài trình chỉnh sửa.
 rules.waves = �ợt
-rules.attack = Chế độ tấn công
-rules.buildai = AI Xây dựng
-rules.enemyCheat = Tài nguyên vô hạn (kẻ địch)
-rules.blockhealthmultiplier = Hệ số độ b�n khối
-rules.blockdamagemultiplier = Hệ số sát thương của khối
-rules.unitbuildspeedmultiplier = Hệ số tốc độ sản xuất lính
-rules.unithealthmultiplier = Hệ số máu của quân lính
-rules.unitdamagemultiplier = Hệ số sát thương của quân lính
-rules.enemycorebuildradius = Bán kính không xây dựng trong căn cứ của kẻ địch:[lightgray] (ô)
-rules.wavespacing = Th�i gian giữa các đợt:[lightgray] (giây)
-rules.buildcostmultiplier = Hệ số chi phí xây dựng
-rules.buildspeedmultiplier = Hệ số tốc độ xây dựng
-rules.deconstructrefundmultiplier = Hệ số số vật phẩm hoàn lại khi phá công trình
-rules.waitForWaveToEnd = �ợt ch� hết kẻ địch
-rules.dropzoneradius = Bán kính vùng thả:[lightgray] (ô)
-rules.unitammo = Quân lính cần đạn
+rules.airUseSpawns = Các �ơn Vị Không Quân Dùng �iểm Xuất Hiện
+rules.attack = Chế �ộ Tấn Công
+rules.buildai = AI Xây Dựng Căn Cứ
+rules.buildaitier = Cấp �ộ AI Xây Dựng
+rules.rtsai = AI Chiến Thuật [red](WIP - �ang hoàn thiện)
+rules.rtsai.campaign = AI chiến thuật tấn công
+rules.rtsai.campaign.info = Trong bản đồ kiểu tấn công, làm các đơn vị tập hợp nhóm và tấn công căn cứ ngư�i chơi theo phương pháp thông minh hơn.
+rules.rtsminsquadsize = Kích Thước �ội Hình Tối Thiểu
+rules.rtsmaxsquadsize = Kích Thước �ội Hình Tối �a
+rules.rtsminattackweight = Sức Tấn Công Tối Thiểu
+rules.cleanupdeadteams = D�n Sạch Công Trình Của �ội Bị �ánh Bại (PvP)
+rules.corecapture = Chiếm Lõi Khi Phá Hủy
+rules.polygoncoreprotection = Bảo Vệ Lõi Kiểu �a Giác
+rules.placerangecheck = Kiểm Tra Phạm Vi Xây Dựng
+rules.enemyCheat = Tài Nguyên Kẻ �ịch Vô Hạn
+rules.blockhealthmultiplier = Hệ Số �ộ B�n Khối
+rules.blockdamagemultiplier = Hệ Số Sát Thương Của Khối
+rules.unitbuildspeedmultiplier = Hệ Số Tốc �ộ Sản Xuất �ơn Vị
+rules.unitcostmultiplier = Hệ Số Chi Phí Sản Xuất �ơn Vị
+rules.unithealthmultiplier = Hệ Số �ộ B�n Của �ơn Vị
+rules.unitdamagemultiplier = Hệ Số Sát Thương Của �ơn Vị
+rules.unitcrashdamagemultiplier = Hệ Số Sát Thương Của �ơn Vị Khi Bị Bắn Rơi
+rules.unitminespeedmultiplier = Hệ Số Tốc �ộ Khai Khoáng �ơn Vị
+rules.solarmultiplier = Hệ Số Năng Lượng Mặt Tr�i
+rules.unitcapvariable = Lõi Tăng Giới Hạn �ơn Vị
+rules.unitpayloadsexplode = Khối Hàng Mang Theo Phát Nổ Cùng �ơn Vị
+rules.unitcap = Giới Hạn �ơn Vị Ban �ầu
+rules.limitarea = Giới Hạn Kích Thước Bản �ồ
+rules.enemycorebuildradius = Bán Kính Không Xây Dựng Từ Lõi Của Kẻ �ịch:[lightgray] (ô)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Giãn Cách �ợt:[lightgray] (giây)
+rules.initialwavespacing = Giãn Cách �ợt �ầu:[lightgray] (giây)
+rules.buildcostmultiplier = Hệ Số Chi Phí Xây Dựng
+rules.buildspeedmultiplier = Hệ Số Tốc �ộ Xây Dựng
+rules.deconstructrefundmultiplier = Hệ Số Hoàn Trả Khi Phá Dỡ
+rules.waitForWaveToEnd = �ợt Ch� Hết Kẻ �ịch
+rules.wavelimit = Bản �ồ Kết Thúc Sau �ợt
+rules.dropzoneradius = Bán Kính Vùng Thả:[lightgray] (ô)
+rules.unitammo = �ơn Vị Cần Có �ạn [red](có thể bị loại b�)
+rules.enemyteam = �ội Kẻ �ịch
+rules.playerteam = �ội Ngư�i Chơi
 rules.title.waves = �ợt
-rules.title.resourcesbuilding = Tài nguyên & Xây dựng
-rules.title.enemy = Kẻ địch
-rules.title.unit = Quân lính
-rules.title.experimental = Thực nghiệm
-rules.title.environment = Môi trư�ng
-rules.lighting = �nh sáng
-rules.enemyLights = �èn địch
+rules.title.resourcesbuilding = Tài Nguyên & Xây Dựng
+rules.title.enemy = Kẻ Dịch
+rules.title.unit = �ơn Vị
+rules.title.experimental = Thử Nghiệm
+rules.title.environment = Môi Trư�ng
+rules.title.teams = �ội
+rules.title.planet = Hành Tinh
+rules.lighting = �nh Sáng
+rules.fog = Sương Mù Chiến Tranh
+rules.invasions = Kẻ �ịch Xâm Lược Khu Vực
+rules.legacylaunchpads = Cơ chế bệ phóng di sản
+rules.legacylaunchpads.info = Cho phép dùng bệ phóng mà không cần bệ đáp, như trong bản 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 �ã tắt[lightgray] (Bệ phóng di sản được bật)
+rules.showspawns = Hiện Khu Kẻ �ịch Xuất Hiện
+rules.randomwaveai = �ợt Tấn Công AI Không �oán Trước
 rules.fire = Lá»­a
-rules.explosions = Sát thương nổ của Khối/Quân lính
-rules.ambientlight = �nh sáng môi trư�ng
-rules.weather = Th�i tiết
-rules.weather.frequency = Tần suất:
-rules.weather.duration = Th�i gian:
+rules.anyenv = <Bất kỳ>
+rules.explosions = Sát Thương Nổ Của Khối/�ơn Vị
+rules.ambientlight = �nh Sáng Môi Trư�ng
+rules.weather = Th�i Tiết
+rules.weather.frequency = Tần Suất:
+rules.weather.always = Luôn Có
+rules.weather.duration = Th�i Lượng:
+
+rules.randomwaveai.info = Làm các đơn vị xuất hiện trong các lượt nhắm vào công trình ngẫu nhiên thay vì tấn công trực tiếp vào lõi hoặc máy phát năng lượng.
+rules.placerangecheck.info = Ngăn chặn ngư�i chơi kh�i việc đặt bất kỳ thứ gì gần công trình kẻ địch. Khi cố đặt một bệ súng, phạm vi sẽ bị tăng lên, để bệ súng không thể bắn tới kẻ địch.
+rules.onlydepositcore.info = Ngăn chặn các đơn vị kh�i việc thả vật phẩm vào bất kỳ công trình nào ngoài lõi.
 
 content.item.name = Vật phẩm
 content.liquid.name = Chất l�ng
-content.unit.name = Quân lính
+content.unit.name = �ơn vị
 content.block.name = Khối
+content.status.name = Hiệu ứng trạng thái
 content.sector.name = Khu vÆ°Ì£c
+content.team.name = Phe
+
+wallore = (Tư�ng)
 
 item.copper.name = �ồng
 item.lead.name = Chì
 item.coal.name = Than
 item.graphite.name = Than chì
 item.titanium.name = Titan
-item.thorium.name = Thorium
+item.thorium.name = Thori
 item.silicon.name = Silicon
-item.plastanium.name = Plastanium
-item.phase-fabric.name = Phase Fabric
-item.surge-alloy.name = Surge Alloy
+item.plastanium.name = Nhá»±a
+item.phase-fabric.name = Sợi lượng tử
+item.surge-alloy.name = Hợp kim
 item.spore-pod.name = V� bào tử
 item.sand.name = Cát
 item.blast-compound.name = Chất nổ
-item.pyratite.name = Pyratite
-item.metaglass.name = Metaglass
+item.pyratite.name = Nhiệt thạch
+item.metaglass.name = Thuá»· tinh
 item.scrap.name = Phế liệu
+item.fissile-matter.name = Vật liệu phóng xạ
+item.beryllium.name = Beryli
+item.tungsten.name = Tungsten
+item.oxide.name = Ôxit
+item.carbide.name = Carbide
+item.dormant-cyst.name = U nang bất hoạt
+
 liquid.water.name = NÆ°á»›c
 liquid.slag.name = Xỉ nóng chảy
 liquid.oil.name = Dầu
-liquid.cryofluid.name = Cryofluid
+liquid.cryofluid.name = Chất làm lạnh
+liquid.neoplasm.name = Tế bào tân sinh
+liquid.arkycite.name = Arkycite
+liquid.gallium.name = Gali
+liquid.ozone.name = Ôzôn
+liquid.hydrogen.name = Hy-dro l�ng
+liquid.nitrogen.name = Ni-tơ l�ng
+liquid.cyanogen.name = Cyano
 
-#Why we should translate this ???
 unit.dagger.name = Dagger
 unit.mace.name = Mace
 unit.fortress.name = Fortress
@@ -1012,6 +1530,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1020,13 +1543,36 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = �iểm tiếp tế
+unit.stell.name = Stell
+unit.locus.name = Locus
+unit.precept.name = Precept
+unit.vanquish.name = Vanquish
+unit.conquer.name = Conquer
+unit.merui.name = Merui
+unit.cleroi.name = Cleroi
+unit.anthicus.name = Anthicus
+unit.tecta.name = Tecta
+unit.collaris.name = Collaris
+unit.elude.name = Elude
+unit.avert.name = Avert
+unit.obviate.name = Obviate
+unit.quell.name = Quell
+unit.disrupt.name = Disrupt
+unit.evoke.name = Evoke
+unit.incite.name = Incite
+unit.emanate.name = Emanate
+unit.manifold.name = Thiết bị bay vận chuyển
+unit.assembly-drone.name = Thiết bị bay lắp ráp
+unit.latum.name = Latum
+unit.renale.name = Renale
+
 block.parallax.name = Parallax
 block.cliff.name = Vách đá
-block.sand-boulder.name = Tư�ng cát
-block.basalt-boulder.name = Tư�ng đá basalt
+block.sand-boulder.name = Tảng cát
+block.basalt-boulder.name = Tảng đá huy�n nhũ
 block.grass.name = C�
-block.slag.name = Xỉ nóng chảy
+block.molten-slag.name = Xỉ nóng chảy
+block.pooled-cryofluid.name = Chất làm lạnh
 block.space.name = Không gian
 block.salt.name = Muối
 block.salt-wall.name = Tư�ng muối
@@ -1036,7 +1582,7 @@ block.sand-wall.name = Tư�ng cát
 block.spore-pine.name = Cây thông bào tử
 block.spore-wall.name = Tư�ng bào tử
 block.boulder.name = Tảng đá
-block.snow-boulder.name = Tảng băng
+block.snow-boulder.name = Tảng tuyết
 block.snow-pine.name = Cây thông tuyết
 block.shale.name = �á phiến sét
 block.shale-boulder.name = Tảng đá phiến sét
@@ -1044,41 +1590,45 @@ block.moss.name = Rêu
 block.shrubs.name = Bụi cây
 block.spore-moss.name = Rêu bào tử
 block.shale-wall.name = Tư�ng đá phiến sét
-block.scrap-wall.name = Tư�ng sắt vụn
+block.scrap-wall.name = Tư�ng phế liệu
 block.scrap-wall-large.name = Tư�ng phế liệu lớn
 block.scrap-wall-huge.name = Tư�ng phế liệu khổng lồ
 block.scrap-wall-gigantic.name = Tư�ng phế liệu siêu khổng lồ
-block.thruster.name = Thruster
+block.thruster.name = Máy đẩy
 block.kiln.name = Lò nung
-block.graphite-press.name = Máy nén thang chì
-block.multi-press.name = Máy nén thang chì lớn
+block.graphite-press.name = Máy nén than chì
+block.multi-press.name = Máy nén than chì lớn
 block.constructing = {0} [lightgray](�ang xây dựng)
-block.spawn.name = Khu vực tạo ra kẻ địch
-block.core-shard.name = Căn cứ: Cơ sở
-block.core-foundation.name = Căn cứ: Trụ sở
-block.core-nucleus.name = Căn cứ: Trung tâm
-block.deepwater.name = Nước sâu
-block.water.name = NÆ°á»›c
-block.tainted-water.name = Nước nhiểm bẩn
+block.spawn.name = �iểm tạo ra kẻ địch
+block.remove-wall.name = Loại b� tư�ng
+block.remove-ore.name = Loại b� khoáng sản
+block.core-shard.name = Lõi: Cơ sở
+block.core-foundation.name = Lõi: Trụ sở
+block.core-nucleus.name = Lõi: Trung tâm
+block.deep-water.name = Nước sâu
+block.shallow-water.name = NÆ°á»›c
+block.tainted-water.name = Nước nhiễm bẩn
+block.deep-tainted-water.name = Nước nhiễm bẩn sâu
 block.darksand-tainted-water.name = Nước nhiễm bẩn cát đen
 block.tar.name = Dầu
 block.stone.name = �á
-block.sand.name = Cát
+block.sand-floor.name = Cát
 block.darksand.name = Cát đen
 block.ice.name = Băng
 block.snow.name = Tuyết
-block.craters.name = Miệng núi lửa
+block.crater-stone.name = �á miệng núi lửa
 block.sand-water.name = Nước cát
 block.darksand-water.name = Nước cát đen
-block.char.name = Char
+block.char.name = Than
 block.dacite.name = �á Dacit
+block.rhyolite.name = �á Ryolit
 block.dacite-wall.name = Tư�ng Dacit
 block.dacite-boulder.name = Tảng đá Dacit
 block.ice-snow.name = Băng tuyết
 block.stone-wall.name = Tư�ng đá
 block.ice-wall.name = Tư�ng băng
 block.snow-wall.name = Tư�ng tuyết
-block.dune-wall.name = Dune Wall
+block.dune-wall.name = Tư�ng cồn cát
 block.pine.name = Cây thông
 block.dirt.name = �ất
 block.dirt-wall.name = Tư�ng đất
@@ -1089,8 +1639,9 @@ block.spore-cluster.name = Cụm bào tử
 block.metal-floor.name = N�n kim loại 1
 block.metal-floor-2.name = N�n kim loại 2
 block.metal-floor-3.name = N�n kim loại 3
-block.metal-floor-5.name = N�n kim loại 4
-block.metal-floor-damaged.name = N�n kim loại bị hư h�ng
+block.metal-floor-4.name = N�n kim loại 4
+block.metal-floor-5.name = N�n kim loại 5
+block.metal-floor-damaged.name = N�n kim loại bị h�ng
 block.dark-panel-1.name = N�n tối 1
 block.dark-panel-2.name = N�n tối 2
 block.dark-panel-3.name = N�n tối 3
@@ -1105,12 +1656,12 @@ block.copper-wall.name = Tư�ng đồng
 block.copper-wall-large.name = Tư�ng đồng lớn
 block.titanium-wall.name = Tư�ng titan
 block.titanium-wall-large.name = Tư�ng titan lớn
-block.plastanium-wall.name = Tư�ng Plastanium
-block.plastanium-wall-large.name = Tư�ng Plastanium lớn
-block.phase-wall.name = Tư�ng Phase
-block.phase-wall-large.name = Tư�ng Phase lớn
-block.thorium-wall.name = Tư�ng Thorium
-block.thorium-wall-large.name = Tư�ng Thorium lớn
+block.plastanium-wall.name = Tư�ng Nhựa
+block.plastanium-wall-large.name = Tư�ng Nhựa lớn
+block.phase-wall.name = Tư�ng lượng tử
+block.phase-wall-large.name = Tư�ng lượng tử lớn
+block.thorium-wall.name = Tư�ng Thori
+block.thorium-wall-large.name = Tư�ng Thori lớn
 block.door.name = Cá»­a
 block.door-large.name = Cá»­a lá»›n
 block.duo.name = Duo
@@ -1120,30 +1671,33 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Băng chuy�n
 block.titanium-conveyor.name = Băng chuy�n titan
-block.plastanium-conveyor.name = Băng chuy�n Plastanium
-block.armored-conveyor.name = Băng chuy�n b�c thép
-block.junction.name = Junction
-block.router.name = Router
-block.distributor.name = Distributor
-block.sorter.name = Sorter
-block.inverted-sorter.name = Sorter ngược
+block.plastanium-conveyor.name = Băng chuy�n nhựa
+block.armored-conveyor.name = Băng chuy�n b�c giáp
+block.junction.name = Giao điểm
+block.router.name = Bộ phân phát
+block.distributor.name = Bộ phân phát lớn
+block.sorter.name = Bộ l�c
+block.inverted-sorter.name = Bộ l�c ngược
 block.message.name = Thông điệp
+block.reinforced-message.name = Thông điệp [Gia cố]
+block.world-message.name = Thông điệp thế giới
+block.world-switch.name = Công tắc thế giới
 block.illuminator.name = �èn
-block.overflow-gate.name = Overflow Gate
-block.underflow-gate.name = Underflow Gate
+block.overflow-gate.name = Cổng tràn
+block.underflow-gate.name = Cổng tràn ngược
 block.silicon-smelter.name = Máy nấu silicon
-block.phase-weaver.name = Máy tạo Phase
+block.phase-weaver.name = Máy dệt lượng tử
 block.pulverizer.name = Máy nghi�n
-block.cryofluid-mixer.name = Máy trộn Cryofluid
-block.melter.name = Máy nung chảy
-block.incinerator.name = Máy phân hủy
+block.cryofluid-mixer.name = Máy trộn chất làm lạnh
+block.melter.name = Lò nung chảy
+block.incinerator.name = Máy thiêu hủy
 block.spore-press.name = Máy nén bào tử
 block.separator.name = Máy phân tách
-block.coal-centrifuge.name = Máy tạo than
+block.coal-centrifuge.name = Máy ly tâm than
 block.power-node.name = Chốt điện
 block.power-node-large.name = Chốt điện lớn
-block.surge-tower.name = Tháp Surge
-block.diode.name = Diode pin
+block.surge-tower.name = Tháp điện hợp kim
+block.diode.name = Chuyển dòng pin
 block.battery.name = Pin
 block.battery-large.name = Pin lá»›n
 block.combustion-generator.name = Máy phát điện đốt cháy
@@ -1151,10 +1705,10 @@ block.steam-generator.name = Máy phát điện hơi nước
 block.differential-generator.name = Máy phát điện vi sai
 block.impact-reactor.name = Lò phản ứng nhiệt hạch
 block.mechanical-drill.name = Máy khoan cơ khí
-block.pneumatic-drill.name = Khoan khí nén
+block.pneumatic-drill.name = Máy khoan khí nén
 block.laser-drill.name = Máy khoan laser
 block.water-extractor.name = Máy khoan nước
-block.cultivator.name = Máy nuôi cấy bào tử
+block.cultivator.name = Máy nuôi cấy
 block.conduit.name = �ng dẫn
 block.mechanical-pump.name = Bơm cơ khí
 block.item-source.name = Nguồn vật phẩm
@@ -1162,222 +1716,472 @@ block.item-void.name = Hủy vật phẩm
 block.liquid-source.name = Nguồn chất l�ng
 block.liquid-void.name = Hủy chất l�ng
 block.power-void.name = Hủy năng lượng
-block.power-source.name = Vô hạn năng lượng
-block.unloader.name = Unloader
-block.vault.name = Vault
+block.power-source.name = Nguồn năng lượng
+block.unloader.name = �iểm dỡ hàng
+block.vault.name = Kho chứa
 block.wave.name = Wave
 block.tsunami.name = Tsunami
 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 = Máy nén Plastanium
-block.pyratite-mixer.name = Máy trộn Pyratite
+block.phase-conveyor.name = Băng chuy�n lượng tử
+block.bridge-conveyor.name = Cầu dẫn băng chuy�n
+block.plastanium-compressor.name = Máy nén nhựa
+block.pyratite-mixer.name = Máy trộn nhiệt thạch
 block.blast-mixer.name = Máy trộn chất nổ
-block.solar-panel.name = Pin mặt tr�i
-block.solar-panel-large.name = Pin mặt tr�i lớn
+block.solar-panel.name = Tấm pin mặt tr�i
+block.solar-panel-large.name = Tấm pin mặt tr�i lớn
 block.oil-extractor.name = Máy khoan dầu
 block.repair-point.name = �iểm sửa chữa
-block.pulse-conduit.name = �ng dẫn titan
-block.plated-conduit.name = �ng dẫn b�c thép
-block.phase-conduit.name = �ng dẫn Phase
-block.liquid-router.name = Liquid Router
-block.liquid-tank.name = Thùng chất l�ng
-block.liquid-junction.name = Liquid Junction
-block.bridge-conduit.name = Bridge Conduit
-block.rotary-pump.name = Bơm điện
-block.thorium-reactor.name = Lò phản ứng Thorium
-block.mass-driver.name = Mass Driver
-block.blast-drill.name = Máy khoang thủy lực
-block.thermal-pump.name = Bơm nhiệt
+block.repair-turret.name = Súng sữa chữa
+block.pulse-conduit.name = �ng dẫn xung mạch
+block.plated-conduit.name = �ng dẫn b�c giáp
+block.phase-conduit.name = �ng dẫn lượng tử
+block.liquid-router.name = Bộ phân phát chất l�ng
+block.liquid-tank.name = Bể chứa chất l�ng
+block.liquid-container.name = Thùng chứa chất l�ng
+block.liquid-junction.name = Giao điểm chất l�ng
+block.bridge-conduit.name = Cầu ống dẫn
+block.rotary-pump.name = Bơm xoáy
+block.thorium-reactor.name = Lò phản ứng Thori
+block.mass-driver.name = Máy phóng điện từ
+block.blast-drill.name = Máy khoan khí nổ
+block.impulse-pump.name = BÆ¡m xung lá»±c
 block.thermal-generator.name = Máy phát nhiệt điện
-block.alloy-smelter.name = Lò luyện hợp kim
+block.surge-smelter.name = Lò luyện hợp kim
 block.mender.name = Máy sửa chữa
-block.mend-projector.name = Máy sửa lớn
-block.surge-wall.name = Tư�ng Surge
-block.surge-wall-large.name = Tư�ng Surge lớn
+block.mend-projector.name = Máy sửa chữa lớn
+block.surge-wall.name = Tư�ng hợp kim
+block.surge-wall-large.name = Tư�ng hợp kim lớn
 block.cyclone.name = Cyclone
 block.fuse.name = Fuse
 block.shock-mine.name = Mìn gây sốc
-block.overdrive-projector.name = Máy tăng tốc
-block.force-projector.name = Máy chiếu trư�ng lực (Khiên)
+block.overdrive-projector.name = Máy chiếu tăng tốc
+block.force-projector.name = Máy chiếu trư�ng lực
 block.arc.name = Arc
-block.rtg-generator.name = Máy phát điện RTG
+block.rtg-generator.name = Máy phát diện đồng vị phóng xạ
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
-block.container.name = Container
-block.launch-pad.name = Bệ phóng
-block.launch-pad-large.name = Bệ phóng lớn
+block.container.name = Thùng chứa
+block.launch-pad.name = Bệ phóng [lightgray](Di sản)
+block.advanced-launch-pad.name = Bệ phóng
+block.landing-pad.name = Bệ đáp
+
 block.segment.name = Segment
-block.command-center.name = Trung tâm chỉ huy
-block.ground-factory.name = Nhà máy bộ binh
+block.ground-factory.name = Nhà máy Bộ binh
 block.air-factory.name = Nhà máy Không quân
-block.naval-factory.name = Nhà máy Hải quân 
-block.additive-reconstructor.name = Máy nâng cấp quân đội cấp 2
-block.multiplicative-reconstructor.name = Máy nâng cấp quân đội cấp 3
-block.exponential-reconstructor.name = Máy nâng cấp quân đội cấp 4
-block.tetrative-reconstructor.name = Máy nâng cấp quân đội cấp 5
+block.naval-factory.name = Nhà máy Hải quân
+block.additive-reconstructor.name = Máy tái thiết cấp cộng
+block.multiplicative-reconstructor.name = Máy tái thiết cấp nhân
+block.exponential-reconstructor.name = Máy tái thiết cấp mũ
+block.tetrative-reconstructor.name = Máy tái thiết cấp lũy thừa lặp
 block.payload-conveyor.name = Băng chuy�n khối hàng
-block.payload-router.name = Payload Router
-block.disassembler.name = Máy phân tách lớn
+block.payload-router.name = Bộ phân phát khối hàng
+block.duct.name = �ng chân không
+block.duct-router.name = Bộ phân phát chân không
+block.duct-bridge.name = Cầu dẫn chân không
+block.large-payload-mass-driver.name = Máy phóng từ trư�ng lớn
+block.payload-void.name = Huỷ khối hàng
+block.payload-source.name = Nguồn khối hàng
+block.disassembler.name = Máy phân rã
 block.silicon-crucible.name = Máy nấu Silicon lớn
-block.overdrive-dome.name = Máy tăng tốc lớn
-#experimental, may be removed
-block.block-forge.name = Block Forge
-block.block-loader.name = Block Loader
-block.block-unloader.name = Block Unloader
+block.overdrive-dome.name = Máy chiếu tăng tốc lớn
 block.interplanetary-accelerator.name = Máy gia tốc liên hành tinh
+block.constructor.name = Máy chế tạo
+block.constructor.description = Chế tạo các khối có kích thước 2x2 ô.
+block.large-constructor.name = Máy chế tạo lớn
+block.large-constructor.description = Chế tạo các khối có kích thước lên đến 4x4 ô.
+block.deconstructor.name = Máy tháo dỡ lớn
+block.deconstructor.description = Tháo dỡ khối và đơn vị, trả lại 100% nguyên liệu.
+block.payload-loader.name = Máy nạp vật phẩm
+block.payload-loader.description = Nạp chất l�ng và vật phẩm vào khối.
+block.payload-unloader.name = Máy dỡ vật phẩm
+block.payload-unloader.description = Lấy chất l�ng và vật phẩm từ khối.
+block.heat-source.name = Nguồn nhiệt
+block.heat-source.description = Xuất ra lượng nhiệt lớn. Chỉ chế độ Tự do.
+
+#Erekir
+block.empty.name = Trống
+block.rhyolite-crater.name = Miệng núi lửa Rhyolit
+block.rough-rhyolite.name = Rhyolit thô
+block.regolith.name = Lớp đất mặt
+block.yellow-stone.name = �á vàng
+block.carbon-stone.name = �á Carbon
+block.ferric-stone.name = �á Ferric
+block.ferric-craters.name = Miệng núi lửa Ferric
+block.beryllic-stone.name = �á Beryllic
+block.crystalline-stone.name = �á pha lê
+block.crystal-floor.name = N�n pha lê
+block.yellow-stone-plates.name = Tấm đá vàng
+block.red-stone.name = �á đ�
+block.dense-red-stone.name = �á đ� dày
+block.red-ice.name = Băng đ�
+block.arkycite-floor.name = N�n Arkycite
+block.arkyic-stone.name = �á Arkyic
+block.rhyolite-vent.name = Lỗ hơi nước Rhyolit
+block.carbon-vent.name = Lỗ hơi nước Carbon
+block.arkyic-vent.name = Lỗ hơi nước Arkyic
+block.yellow-stone-vent.name = Lỗ hơi nước đá vàng
+block.red-stone-vent.name = Lỗ hơi nước đá đ�
+block.crystalline-vent.name = Lỗ hơi nước pha lê
+block.redmat.name = Thảm đ�
+block.bluemat.name = Thảm xanh
+block.core-zone.name = Vùng đặt lõi
+block.regolith-wall.name = Tư�ng đất mặt
+block.yellow-stone-wall.name = Tư�ng đá vàng
+block.rhyolite-wall.name = Tư�ng Rhyolit
+block.carbon-wall.name = Tư�ng Carbon
+block.ferric-stone-wall.name = Tư�ng đá Ferric
+block.beryllic-stone-wall.name = Tư�ng đá Beryllic
+block.arkyic-wall.name = Tư�ng Arkyic
+block.crystalline-stone-wall.name = Tư�ng đá pha lê
+block.red-ice-wall.name = Tư�ng băng đ�
+block.red-stone-wall.name = Tư�ng đá đ�
+block.red-diamond-wall.name = Tư�ng kim cương đ�
+block.redweed.name = Rêu đ�
+block.pur-bush.name = Bụi cây tím
+block.yellowcoral.name = San hô vàng
+block.carbon-boulder.name = Tảng đá Carbon
+block.ferric-boulder.name = Tảng đá Ferric
+block.beryllic-boulder.name = Tảng đá Beryllic
+block.yellow-stone-boulder.name = Tảng đá vàng
+block.arkyic-boulder.name = Tảng đá Arkyic
+block.crystal-cluster.name = Cụm pha lê
+block.vibrant-crystal-cluster.name = Cụm pha lê sống động
+block.crystal-blocks.name = Khối pha lê
+block.crystal-orbs.name = Quả cầu pha lê
+block.crystalline-boulder.name = Tảng đá pha lê
+block.red-ice-boulder.name = Tảng băng đ�
+block.rhyolite-boulder.name = Tảng đá Rhyolit
+block.red-stone-boulder.name = Tảng đá đ�
+block.graphitic-wall.name = Tư�ng than chì
+block.silicon-arc-furnace.name = Lò tinh luyện Silicon
+block.electrolyzer.name = Máy điện phân
+block.atmospheric-concentrator.name = Máy ngưng tụ khí quyển
+block.oxidation-chamber.name = Bể Oxy hoá
+block.electric-heater.name = Máy nhiệt từ điện
+block.slag-heater.name = Máy nhiệt từ xỉ
+block.phase-heater.name = Máy nhiệt từ lượng tử
+block.heat-redirector.name = Khối đi�u hướng nhiệt
+block.small-heat-redirector.name = Khối đi�u hướng nhiệt nh�
+block.heat-router.name = Khối phân phát nhiệt
+block.slag-incinerator.name = Lò xỉ huỷ vật phẩm
+block.carbide-crucible.name = Máy nấu Carbide
+block.slag-centrifuge.name = Máy ly tâm xỉ
+block.surge-crucible.name = Máy nấu hợp kim
+block.cyanogen-synthesizer.name = Máy tổng hợp Cyano
+block.phase-synthesizer.name = Máy tổng hợp lượng tử
+block.heat-reactor.name = Lò phản ứng nhiệt
+block.beryllium-wall.name = Tư�ng Beryl
+block.beryllium-wall-large.name = Tư�ng Beryl lớn
+block.tungsten-wall.name = Tư�ng Tungsten
+block.tungsten-wall-large.name = Tư�ng Tungsten lớn
+block.blast-door.name = Cá»­a tá»± Ä‘á»™ng
+block.carbide-wall.name = Tư�ng Carbide
+block.carbide-wall-large.name = Tư�ng Carbide lớn
+block.reinforced-surge-wall.name = Tư�ng Hợp kim cứng
+block.reinforced-surge-wall-large.name = Tư�ng Hợp kim cứng lớn
+block.shielded-wall.name = Tư�ng khiên chắn
+block.radar.name = Máy quét
+block.build-tower.name = Tháp xây dựng
+block.regen-projector.name = Máy chiếu hồi phục
+block.shockwave-tower.name = Máy tạo xung điện
+block.shield-projector.name = Máy chiếu khiên chắn
+block.large-shield-projector.name = Máy chiếu khiên chắn lớn
+block.armored-duct.name = �ng chân không b�c giáp
+block.overflow-duct.name = �ng tràn chân không
+block.underflow-duct.name = �ng tràn ngược chân không
+block.duct-unloader.name = �iểm dỡ hàng chân không
+block.surge-conveyor.name = Băng chuy�n hợp kim
+block.surge-router.name = Bộ phân phát hợp kim
+block.unit-cargo-loader.name = �iểm tải hàng đơn vị
+block.unit-cargo-unload-point.name = �iểm thả hàng đơn vị
+block.reinforced-pump.name = Máy bơm gia cố
+block.reinforced-conduit.name = �ng dẫn gia cố
+block.reinforced-liquid-junction.name = �iểm giao chất l�ng gia cố
+block.reinforced-bridge-conduit.name = Cầu ống dẫn gia cố
+block.reinforced-liquid-router.name = Bộ phân phát chất l�ng gia cố
+block.reinforced-liquid-container.name = Thùng chứa chất l�ng gia cố
+block.reinforced-liquid-tank.name = Bể chứa chất l�ng gia cố
+block.beam-node.name = Chốt tia điện
+block.beam-tower.name = Tháp tia điện
+block.beam-link.name = Liên kết tia điện
+block.turbine-condenser.name = Tua-bin điện hơi nước
+block.chemical-combustion-chamber.name = Bể điện hoá
+block.pyrolysis-generator.name = Máy phát điện nhiệt phân
+block.vent-condenser.name = Máy ngưng tụ hơi nước
+block.cliff-crusher.name = Máy nghi�n vách đá
+block.large-cliff-crusher.name = Máy nghi�n vách đá cao cấp
+block.plasma-bore.name = Khoan plasma
+block.large-plasma-bore.name = Khoan plasma cao cấp
+block.impact-drill.name = Máy khoan động lực
+block.eruption-drill.name = Máy khoan siêu động lực
+block.core-bastion.name = Lõi: Pháo đài
+block.core-citadel.name = Lõi: Thủ phủ
+block.core-acropolis.name = Lõi: �ại đô
+block.reinforced-container.name = Thùng chứa gia cố
+block.reinforced-vault.name = Kho chứa gia cố
+block.breach.name = Breach
+block.sublimate.name = Sublimate
+block.titan.name = Titan
+block.disperse.name = Disperse
+block.afflict.name = Afflict
+block.lustre.name = Lustre
+block.scathe.name = Scathe
+block.tank-refabricator.name = Máy tái tạo xe tăng
+block.mech-refabricator.name = Máy tái tạo máy cơ động
+block.ship-refabricator.name = Máy tái tạo phi thuy�n
+block.tank-assembler.name = Máy lắp ráp xe tăng
+block.ship-assembler.name = Máy lắp ráp phi thuy�n
+block.mech-assembler.name = Máy lắp ráp máy cơ động
+block.reinforced-payload-conveyor.name = Băng chuy�n khối hàng gia cố
+block.reinforced-payload-router.name = Bộ phân phát khối hàng gia cố
+block.payload-mass-driver.name = Máy phóng từ trư�ng khối hàng
+block.small-deconstructor.name = Máy tháo dỡ
+block.canvas.name = Màn hình vẽ
+block.world-processor.name = Bộ xử lý thế giới
+block.world-cell.name = Bộ nhớ thế giới
+block.tank-fabricator.name = Máy chế tạo xe tăng
+block.mech-fabricator.name = Máy chế tạo cơ động
+block.ship-fabricator.name = Máy chế tạo phi thuy�n
+block.prime-refabricator.name = Máy tái tạo hoàn thiện
+block.unit-repair-tower.name = Tháp sửa chữa đơn vị
+block.diffuse.name = Diffuse
+block.basic-assembler-module.name = Mô-đun lắp ráp đơn vị
+block.smite.name = Smite
+block.malign.name = Malign
+block.flux-reactor.name = Lò phản ứng thông lượng
+block.neoplasia-reactor.name = Lò phản ứng siêu tân sinh
 
 block.switch.name = Công tắc
-block.micro-processor.name = Bộ xử lí mini
-block.logic-processor.name = Bộ xử lý
-block.hyper-processor.name = Bộ xử lý lớn
-block.logic-display.name = Màng hình
-block.large-logic-display.name = Màng hình lớn
-block.memory-cell.name = Bá»™ nhá»›
-block.memory-bank.name = Bá»™ nhá»› lá»›n
+block.micro-processor.name = Bộ xử lý vi cấp
+block.logic-processor.name = Bộ xử lý trung cấp
+block.hyper-processor.name = Bộ xử lý siêu cấp
+block.logic-display.name = Màn hình hiển thị
+block.large-logic-display.name = Màn hình hiển thị lớn
+block.memory-cell.name = Ô bộ nhớ
+block.memory-bank.name = Khối bộ nhớ
 
-team.blue.name = Xanh dÆ°Æ¡ng
-team.crux.name = ��
-team.sharded.name = Cam
-team.orange.name = Cam
-team.derelict.name = không xác định
+team.malis.name = Malis
+team.crux.name = Crux
+team.sharded.name = Sharded
+team.derelict.name = B� hoang
 team.green.name = Xanh lá cây
-team.purple.name = Tím
+team.blue.name = Xanh dÆ°Æ¡ng
 
 hint.skip = B� qua
 hint.desktopMove = Sử dụng [accent][[WASD][] để di chuyển.
 hint.zoom = [accent]Cuộn[] để phóng to hoặc thu nh�.
-hint.mine = Di chuyển đến gần \uf8c4 khu vực quặng đồng và [accent]nhấn[] vào để khai thác thủ công.
-hint.desktopShoot = [accent][[chuột trái][] để bắn.
-hint.depositItems = �ể di chuyển các vật phẩm, hãy kéo từ tàu của bạn đến căn cứ.
-hint.respawn = �ể hồi sinh như tàu của bạn, nhấn [accent][[V][].
-hint.respawn.mobile = Bạn đã chuyển đi�u khiển một quân lính/cấu trúc. �ể hồi sinh như một con tàu, [accent]nhấn vào hình đại diện ở phía trên cùng bên trái.[]
-hint.desktopPause = Nhấn [accent][[Space][] để tạm dừng và tiếp tục trò chơi.
-hint.placeDrill = Ch�n mục \ue85e [accent]Máy khoan[] trong menu ở dưới cùng bên phải, sau đó ch�n một \uf870 [accent]Máy khoan[] và nhấp vào quặng đồng để đặt nó.
-hint.placeDrill.mobile = Ch�n mục \ue85e[accent]Máy khoan[] trong menu ở dưới cùng bên phải, sau đó ch�n một \uf870 [accent]Máy khoan[] và chạm vào quặng đồng để đặt nó.\n\nNhấn nút \ue800 [accent]Xác nhận[] ở phía dưới cùng bên phải để xác nhận.
-hint.placeConveyor = Băng chuy�n di chuyển các mặt hàng từ các mũi khoan sang các khối khác. Ch�n một \uf896 [accent]Băng chuy�n[] từ mục \ue814 [accent]Phân phối[].\n\nNhấp và kéo để đặt nhi�u băng chuy�n.\n[accent]Cuộn[] để xoay.
-hint.placeConveyor.mobile = Băng chuy�n di chuyển các vật phẩm từ khoan sang các khối khác. Ch�n một \uf896 [accent]Băng chuy�n[] từ mục \ue814 [accent]Phân phối[].\n\nGiữ ngón tay của bạn trong một giây và kéo để đặt nhi�u băng chuy�n.
-hint.placeTurret = �ặt \uf861 [accent]Súng[] để bảo vệ căn cứ của bạn kh�i kẻ thù.\n\nSúng cần đạn - trong trư�ng hợp này sử dụng \uf838�ồng.\nSử dụng băng chuy�n và máy khoan để cung cấp cho chúng.
-hint.breaking = [accent]Chuột phải[] và kéo để phá vỡ các khối.
-hint.breaking.mobile = Kích hoạt \ue817 [accent]Cây búa[] ở phía dưới cùng bên phải và nhấn để phá vỡ các khối.\n\nGiữ ngón tay của bạn trong một giây và kéo để phá khối trong vùng được ch�n.
+hint.desktopShoot = [accent][[nhấn chuột trái][] để bắn.
+hint.depositItems = �ể di chuyển các vật phẩm, hãy kéo từ phi thuy�n của bạn đến lõi.
+hint.respawn = �ể hồi sinh dưới dạng phi thuy�n, nhấn [accent][[V][].
+hint.respawn.mobile = Bạn đã chuyển đi�u khiển một đơn vị/công trình. �ể hồi sinh dưới dạng phi thuy�n, [accent]nhấn vào hình đại diện ở phía trên cùng bên trái.[]
+hint.desktopPause = Nhấn [accent][[Phím cách][] để tạm dừng và tiếp tục trò chơi.
+hint.breaking = [accent]Nhấn chuột phải[] và kéo để phá vỡ các khối.
+hint.breaking.mobile = Kích hoạt \ue817 [accent]cây búa[] ở phía dưới cùng bên phải và nhấn để phá vỡ các khối.\n\nGiữ ngón tay của bạn trong một giây và kéo để phá khối trong vùng được ch�n.
+hint.blockInfo = Xem thông tin của một khối bằng cách ch�n nó trong [accent]trình đơn xây dựng[], Sau đó ch�n nút [accent][[?][] ở bên phải.
+hint.derelict = [accent]B� hoang[] là các công trình bị h�ng của các căn cứ cũ mà không còn hoạt động.\n\nCác công trình này có thể [accent]được tháo dỡ[] để nhận được tài nguyên hoặc sửa chữa.
 hint.research = Sử dụng nút \ue875 [accent]Nghiên cứu[] để nghiên cứu công nghệ mới.
-hint.research.mobile = Sử dụng nút \ue875 [accent]Nghiên cứu[] trong \ue88c [accent]Menu[] để nghiên cứu công nghệ mới.
-hint.unitControl = Giữ [accent][[L-ctrl][] và [accent]click[] để đi�u khiển quân lính của bạn hoặc súng.
-hint.unitControl.mobile = [accent][Double-tap[] để đi�u khiển quân lính của bạn hoặc súng.
-hint.launch = Sau khi thu thập đủ tài nguyên, bạn có thể [accent]Phóng[] bằng cách ch�n các khu vực lân cận từ \ue827 [accent]Bản đồ[] ở phía dưới cùng bên phải.
-hint.launch.mobile = Sau khi thu thập đủ tài nguyên, bạn có thể [accent]Phóng[] bằng cách ch�n các khu vực lân cận từ \ue827 [accent]Bản đồ[] trong \ue88c [accent]Menu[].
-hint.schematicSelect = Giữ [accent][[F][] và kéo để ch�n các khối để sao chép và dán.\n\n[accent][[Middle Click][] để sao chép một khối.
-hint.conveyorPathfind = Giữ [accent][[L-Ctrl][] trong khi kéo băng chuy�n để tự động tạo đư�ng dẫn.
-hint.conveyorPathfind.mobile = Mở \ue844 [accent]chế độ đư�ng chéo[] và kéo băng chuy�n để tự động tạo đư�ng dẫn.
-hint.boost = Giữ [accent][[L-Shift][] bay qua các chướng ngại vật với quân lính hiện tại của bạn.\n\nChỉ một số quân lính mặt đất có thể bay được.
-hint.command = Nhấn [accent][[G][] để chỉ huy quân lính lân cận hoặc [accent]loại tương tự[].\n\n�ể chỉ huy các quân lính mặt đất, trước tiên bạn phải đi�u khiển một quân lính mặt đất khác.
-hint.command.mobile = [accent][[Nhấn đúp][] quân lính của bạn để chỉ huy các quân lính lân cận thành đội.
-hint.payloadPickup = Nhấn [accent][[[] để nhặt một khối nh� hoặc một quân lính.
-hint.payloadPickup.mobile = [accent]Nhấn và giữ[] một khối nh� hoặc một quân lính để nhặt nó.
-hint.payloadDrop = Nhấn [accent]][] để thả một vật phẩm.
-hint.payloadDrop.mobile = [accent]Nhấn và giữ[] tại một khu vực trống để thả vật phẩm.
+hint.research.mobile = Sử dụng nút \ue875 [accent]Nghiên cứu[] trong \ue88c [accent]Trình đơn[] để nghiên cứu công nghệ mới.
+hint.unitControl = Giữ [accent][[Ctrl trái][] và [accent]nhấn chuột[] để đi�u khiển thủ công đơn vị của bạn hoặc súng.
+hint.unitControl.mobile = [accent][[Nhấn đúp][] để đi�u khiển thủ công đơn vị của bạn hoặc súng.
+hint.unitSelectControl = �ể đi�u khiển đơn vị, hãy nhấn [accent]chế độ mệnh lệnh[] bằng cách giữ [accent]Shift trái[].\nKhi ở chế độ mệnh lệnh, hãy nhấn và kéo để ch�n đơn vị. [accent]Nhấn chuột phải[] vào một vị trí hoặc mục tiêu để ra lệnh đơn vị đến đó.
+hint.unitSelectControl.mobile = �ể đi�u khiển đơn vị, hãy nhấn [accent]chế độ mệnh lệnh[] bằng cách nhấn nút [accent]mệnh lệnh[] ở phía dưới cùng bên trái.\nKhi ở chế độ mệnh lệnh, hãy nhấn giữ và kéo để ch�n đơn vị. Nhấp vào một vị trí hoặc mục tiêu để ra lệnh đơn vị đến đó.
+hint.launch = Một khi thu thập đủ tài nguyên, bạn có thể [accent]Phóng[] bằng cách ch�n các khu vực lân cận bằng cách mở \ue827 [accent]Bản đồ[] ở phía dưới cùng bên phải, và lướt ch�n vị trí mới.
+hint.launch.mobile = Một khi thu thập đủ tài nguyên, bạn có thể [accent]Phóng[] bằng cách ch�n các khu vực lân cận từ \ue827 [accent]Bản đồ[] trong \ue88c [accent]Trình đơn[].
+hint.schematicSelect = Giữ [accent][[F][] và kéo để ch�n các khối để sao chép và dán.\n\n[accent][[Nhấn chuột giữa][] để sao chép một kiểu khối đơn lẻ.
+hint.rebuildSelect = Giữ [accent][[B][] và kéo để ch�n các khối đã bị phá hủy.\nChúng sẽ được tự động được xây lại.
+hint.rebuildSelect.mobile = Ch�n nút \ue874 sao chép, sau đó nhấp nút \ue80f xây lại và kéo để ch�n khu vực của các khối đã bị phá hủy.\nViệc này sẽ giúp xây lại chúng một cách tự động.
+hint.conveyorPathfind = Giữ [accent][[Ctrl trái][] trong khi kéo băng chuy�n để tự động tạo đư�ng dẫn.
+hint.conveyorPathfind.mobile = Bật \ue844 [accent]chế độ đư�ng chéo[] và kéo băng chuy�n để tự động tạo đư�ng dẫn.
+hint.boost = Giữ [accent][[Shift trái][] bay qua các chướng ngại vật với đơn vị hiện tại của bạn.\n\nChỉ một số đơn vị mặt đất có thể bay được.
+hint.payloadPickup = Nhấn [accent][[[] để nhặt một khối nh� hoặc một đơn vị.
+hint.payloadPickup.mobile = [accent]Nhấn và giữ[] một khối nh� hoặc một đơn vị để nhặt nó.
+hint.payloadDrop = Nhấn [accent]][] để thả một khối hàng.
+hint.payloadDrop.mobile = [accent]Nhấn và giữ[] tại một khu vực trống để thả khối hàng tại đó.
 hint.waveFire = [accent]Wave[] súng có nước làm đạn dược sẽ tự động dập tắt các đám cháy gần đó.
 hint.generator = \uf879 [accent]Máy phát điện đốt cháy[] đốt than và truy�n năng lượng cho các khối li�n k�.\n\nPhạm vi truy�n tải năng lượng có thể được mở rộng với \uf87f [accent]Chốt điện[].
-hint.guardian = [accent]Boss[] được b�c giáp. Sử dụng loại đạn yếu chẳng hạn như [accent]�ồng[] và [accent]Chì[] là [scarlet]không hiệu quả[].\n\nSử dụng súng tiên tiến hơn hoặc sử dụng \uf835 [accent]Than chì làm đạn [] \uf861Duo/\uf859Salvo đạn dược để hạ gục Boss.
+hint.guardian = [accent]Trùm[] được b�c giáp. Sử dụng loại đạn yếu chẳng hạn như [accent]�ồng[] và [accent]Chì[] là [scarlet]không hiệu quả[].\n\nSử dụng súng tiên tiến hơn hoặc sử dụng \uf835 [accent]Than chì[] làm đạn \uf861Duo/\uf859Salvo đạn dược để hạ gục Trùm.
+hint.coreUpgrade = Các lõi có thể được nâng cấp bằng cách [accent]đặt lõi cấp cao hơn trên chúng[].\n\n�ặt một lõi \uf868 [accent]Trụ sở[] trên lõi \uf869 [accent]Cơ sở[]. �ảm bảo không có vật cản gần đó.
+hint.presetLaunch = [accent]Khu vực đáp[] xám, như [accent]Frozen Forest[], có thể được phóng đến từ bất cứ đâu. Nó không yêu cầu chiếm các khu vực lân cận.\n\n[accent]Các khu vực được đánh số[], chẳng hạn như cái này, là [accent]không bắt buộc[].
+hint.presetDifficulty = Khu vực này có [scarlet]mối đe d�a thù địch cao[].\nPhóng đến khu vực như vậy [accent]không được khuyến khích[] nếu không có công nghệ và chuẩn bị phù hợp.
+hint.coreIncinerate = Sau khi lõi đầy một loại vật phẩm, bất kỳ vật phẩm vào thuộc loại đó nhận được sẽ bị [accent]tiêu hủy[].
+hint.factoryControl = �ể đặt [accent]điểm đầu ra[] của một nhà máy, nhấn vào một khối nhà máy trong chế độ ra lệnh, sau đó nhấn chuột phải vào một vị trí.\nCác đơn vị sản xuất bởi nó sẽ tự động di chuyển đến đó.
+hint.factoryControl.mobile = �ể đặt [accent]điểm đầu ra[] của một nhà máy, nhấp vào một khối nhà máy trong chế độ ra lệnh, sau đó nhấp vào một vị trí.\nCác đơn vị sản xuất bởi nó sẽ tự động di chuyển đến đó.
 
-item.copper.description = Dùng trong tất cả các khu xây dựng và các loại đạn dược.
-item.copper.details = �ồng, là kim loại phổ biến trên Serpulo. Có cấu trúc yếu trừ khi được tôi luyện.
-item.lead.description = Dùng trong vận chuyển chất l�ng và cấu trúc liên quan đến điện.
-item.lead.details = �ặc, trơ. Dùng nhi�u trong pin.\nLưu ý: Có thể độc hại đối với các dạng sống sinh h�c. Không phải vì nó còn nhi�u ở xung quanh đây.
-item.metaglass.description = Dùng trong cấu trúc phân phối/lưu trữ chất l�ng.
-item.graphite.description = Dùng trong các bộ phận điện và đạn dược.
-item.sand.description = Dùng để sản xuất các vật liệu tinh chế khác.
-item.coal.description = Dùng để sản xuất nhiên liệu và nguyên liệu sản xuất vật liệu tinh chế.
+gz.mine = Di chuyển gần \uf8c4 [accent]quặng đồng[] trên đất và nhấn vào nó để bắt đầu khai thác.
+gz.mine.mobile = Di chuyển gần \uf8c4 [accent]quặng đồng[] trên đất và nhấp vào nó để bắt đầu khai thác.
+gz.research = Mở \ue875 cây công nghệ.\nNghiên cứu \uf870 [accent]Máy khoan cơ khí[], sau đó ch�n nó từ \ue85e trình đơn ở góc dưới bên phải.\nNhấp vào một khoảng quặng đồng để đặt nó.
+gz.research.mobile = Mở \ue875 cây công nghệ.\nNghiên cứu \uf870 [accent]Máy khoan cơ khí[], sau đó ch�n nó từ \ue85e trình đơn ở góc dưới bên phải.\nNhấp vào một khoảng quặng đồng để đặt nó.\n\nNhấp vào \ue800 [accent]dấu tích[] ở góc dưới bên phải để xác nhận.
+gz.conveyors = Nghiên cứu và đặt \uf896 [accent]băng chuy�n[] để di chuyển các tài nguyên được khai thác\ntừ các máy khoan đến lõi.\n\nNhấn và kéo để đặt nhi�u băng chuy�n.\n[accent]Cuộn[] để xoay.
+gz.conveyors.mobile = Nghiên cứu và đặt \uf896 [accent]băng chuy�n[] để di chuyển các tài nguyên được khai thác\ntừ các máy khoan đến lõi.\n\nGiữ ngón tay một giây và kéo để đặt nhi�u băng chuy�n.
+gz.drills = Mở rộng hoạt động khai thác.\n�ặt thêm Máy khoan cơ khí.\nKhai thác 100 đồng.
+gz.lead = \uf837 [accent]Chì[] là một tài nguyên được sử dụng phổ biến.\nHãy đặt các máy khoan để khai thác chì.
+gz.moveup = \ue804 Di chuyển lên để xem các nhiệm vụ tiếp theo.
+gz.turrets = Nghiên cứu và đặt 2 súng \uf861 [accent]Duo[] để bảo vệ lõi.\nSúng Duo cần \uf838 [accent]đạn[] từ băng chuy�n.
+gz.duoammo = Tiếp đạn cho súng Duo bằng [accent]đồng[], sử dụng băng chuy�n.
+gz.walls = [accent]Tư�ng[] có thể ngăn chặn sát thương đến các công trình.\n�ặt \uf8ae [accent]tư�ng đồng[] xung quanh các súng.
+gz.defend = Quân địch đang đến, hãy chuẩn bị phòng thủ.
+gz.aa = Các đơn vị bay không thể dễ dàng bị bắn hạ với các súng tiêu chuẩn.\n\uf860 [accent]Scatter[] cung cấp tốt khả năng phòng không, nhưng cần \uf837 [accent]chì[] là đạn.
+gz.scatterammo = Tiếp đạn cho súng Scatter bằng \uf837 [accent]chì[], sử dụng băng chuy�n.
+gz.supplyturret = [accent]Cấp đạn cho súng
+gz.zone1 = �ây là khu vực quân địch đáp xuống.
+gz.zone2 = Bất kỳ thứ gì được xây dựng trong bán kính này sẽ bị phá hủy khi một đợt mới bắt đầu.
+gz.zone3 = Một đợt sẽ bắt đầu ngay bây gi�.\nHãy chuẩn bị.
+gz.finish = �ặt thêm các súng, khai thác thêm nguyên liệu,\nvà vượt qua tất cả các đợt để [accent]chiếm khu vực[].
+
+onset.mine = Nhấn để khai thác \uf748 [accent]beryl[] từ tư�ng.\n\nSử dụng [accent][[WASD] để di chuyển.
+onset.mine.mobile = Nhấp để khai thác \uf748 [accent]beryl[] từ tư�ng.
+onset.research = Mở \ue875 cây công nghệ.\nNghiên cứu, sau đó đặt \uf73e [accent]tua-bin điện tụ nước[] trên lỗ hơi nước.\n�i�u này sẽ tạo ra [accent]điện[].
+onset.bore = Nghiên cứu và đặt \uf741 [accent]khoan plasma[].\n�i�u này sẽ tự động khai thác tài nguyên từ tư�ng.
+onset.power = �ể nối [accent]điện[] cho khoan plasma, nghiên cứu và đặt \uf73d [accent]Chốt tia điện[].\nKết nối tua-bin điện hơi nước với khoan plasma.
+onset.ducts = Nghiên cứu và đặt \uf799 [accent]ống chân không[] để di chuyển các tài nguyên được khai thác từ các máy khoan plasma đến lõi.\nNhấn và kéo để đặt nhi�u ống chân không.\n[accent]Cuộn[] để xoay.
+onset.ducts.mobile = Nghiên cứu và đặt \uf799 [accent]ống chân không[] để di chuyển các tài nguyên được khai thác từ các máy khoan plasma đến lõi.\n\nGiữ ngón tay một giây và kéo để đặt nhi�u ống chân không.
+onset.moremine = Mở rộng hoạt động khai thác.\n�ặt thêm Máy khoan plasma và sử dụng chốt tia điện và ống chân không để cùng phụ trợ chúng.\nKhai thác 200 beryl.
+onset.graphite = Các khối phức tạp hơn cần \uf835 [accent]than chì[].\n�ặt khoan plasma để khai thác than chì.
+onset.research2 = Bắt đầu nghiên cứu [accent]các nhà máy[].\nNghiên cứu \uf74d [accent]máy phá đá[] và \uf779 [accent]lò tinh luyện silicon[].
+onset.arcfurnace = Lò tinh luyện cần \uf834 [accent]cát[] và \uf835 [accent]than chì[] để tạo \uf82f [accent]silicon[].\nYêu cầu có [accent]�iện[].
+onset.crusher = Sử dụng \uf74d [accent]máy nghi�n vách đá[] để khai thác cát.
+onset.fabricator = Sử dụng [accent]đơn vị[] để khám phá bản đồ, bảo vệ các công trình, và tấn công quân địch.\nNghiên cứu và đặt \uf6a2 [accent]máy chế tạo xe tăng[].
+onset.makeunit = Sản xuất một đơn vị.\nSử dụng nút "?" để xem các yêu cầu của máy đã ch�n.
+onset.turrets = Các đơn vị rất hiệu quả, nhưng [accent]súng[] cung cấp khả năng phòng thủ tốt hơn nếu được sử dụng hiệu quả.\n�ặt một \uf6eb [accent]Breach[].\nSúng cần \uf748 [accent]đạn[].
+onset.turretammo = Tiếp đạn cho súng bằng [accent]beryl[] dùng ống chân không.
+onset.walls = [accent]Tư�ng[] có thể ngăn chặn sát thương đến các công trình.\n�ặt một số \uf6ee [accent]tư�ng beryl[] xung quanh súng.
+onset.enemies = Quân địch đang đến, hãy chuẩn bị phòng thủ.
+onset.defenses = [accent]Thiết lập phòng thủ:[lightgray] {0}
+onset.attack = Quân địch đã suy yếu. Hãy phản công.
+onset.cores = Các lõi mới có thể được đặt trên [accent]ô đặt lõi[].\nCác lõi mới hoạt động như một ti�n cứ và chia sẻ kho tài nguyên với các lõi khác.\n�ặt một \uf725 lõi.
+onset.detect = Quân địch sẽ phát hiện bạn trong vòng 2 phút.\nHãy chuẩn bị phòng thủ, khai thác, và sản xuất.
+onset.commandmode = Giữ [accent]Shift[] để vào [accent]chế độ mệnh lệnh[].\n[accent]Nhấn chuột trái và kéo[] để ch�n các đơn vị.\n[accent]Nhấn chuột phải[] để ra lệnh các đơn vị di chuyển hoặc tấn công.
+onset.commandmode.mobile = Nhấn vào [accent]nút mệnh lệnh[] để vào [accent]chế độ mệnh lệnh[].\nGiữ một ngón tay, sau đó [accent]kéo[] để ch�n các đơn vị.\n[accent]Nhấp[] để ra lệnh các đơn vị di chuyển hoặc tấn công.
+aegis.tungsten = Tungsten có thể khai thác bằng [accent]khoan thủy lực[].\nCông trình này cần có [accent]nước[] và [accent]điện[].
+
+split.pickup = Một số khối có thể được mang theo bởi đơn vị từ lõi.\nNhấn vào [accent]thùng chứa[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(Phím mặc định là [[ và ] để mang theo và thả)
+split.pickup.mobile = Một số khối có thể được mang theo bởi đơn vị từ lõi.\nNhấp vào [accent]thùng chứa[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(�ể mang theo hoặc thả thứ gì đó, ấn giữ nó một chút.)
+split.acquire = Bạn cần một số tungsten để sản xuất đơn vị.
+split.build = �ơn vị phải được vận chuyển đến phía bên kia của tư�ng.\n�ặt hai [accent]Máy phóng từ trư�ng khối hàng[], một ở mỗi bên của tư�ng.\n�ặt liên kết bằng cách nhấp vào một trong số chúng, sau đó ch�n cái còn lại.
+split.container = Tương tự như thùng chứa, đơn vị cũng có thể được vận chuyển bằng [accent]Máy phóng từ trư�ng khối hàng[].\n�ặt một máy chế tạo đơn vị cạnh máy phóng từ trư�ng để nạp chúng, sau đó gửi chúng qua tư�ng để tấn công căn cứ địch.
+
+item.copper.description = Dùng trong tất cả các loại xây dựng và các loại đạn dược.
+item.copper.details = �ồng. Kim loại nhi�u bất thư�ng trên Serpulo. Có cấu trúc yếu trừ khi được tôi luyện.
+item.lead.description = �ược dùng trong vận chuyển chất l�ng và cấu trúc liên quan đến điện.
+item.lead.details = �ặc. Trơ. Dùng cực nhi�u trong pin.\nLưu ý: Có thể độc hại đối với các dạng sống sinh h�c; không phải vì nó còn nhi�u ở xung quanh đây.
+item.metaglass.description = �ược dùng trong cấu trúc phân phối/lưu trữ chất l�ng.
+item.graphite.description = �ược dùng trong các bộ phận điện và đạn súng.
+item.sand.description = �ược dùng để sản xuất các vật liệu tinh chế khác.
+item.coal.description = �ược dùng để sản xuất nhiên liệu và nguyên liệu sản xuất vật liệu tinh chế.
 item.coal.details = Có vẻ là vật chất hóa thạch của thực vật, hình thành từ rất lâu trước khi được khai thác.
-item.titanium.description = Dùng trong cấu trúc vận chuyển chất l�ng, máy khoan và máy bay.
-item.thorium.description = Dùng trong các công trình b�n vững và có thể dùng làm nhiên liệu hạt nhân.
-item.scrap.description = Dùng làm nguyên liệu cho Máy nung phế liệu và Máy nghi�n để tinh luyện thành các vật liệu khác.
-item.scrap.details = Tàn tích còn lại của các công trình và robot cũ.
-item.silicon.description = Dùng trong các tấm pin mặt tr�i, thiết bị điện tử phức tạp và một số loại đạn dược.
-item.plastanium.description = Dùng trong các robot tiên tiến, các cấu trúc cách điện và đạn tự phân mảnh.
-item.phase-fabric.description = Dùng trong các thiết bị điện tử tiên tiến và các cấu trúc tự sửa chữa.
-item.surge-alloy.description = Dùng trong các vũ khí tiên tiến và các cấu trúc phòng thủ phản ứng.
-item.spore-pod.description = Dùng để chuyển đổi thành dầu, chất nổ và nhiên liệu.
+item.titanium.description = �ược dùng trong cấu trúc vận chuyển chất l�ng, máy khoan và các nhà máy.
+item.thorium.description = �ược dùng trong các công trình b�n vững và có thể dùng làm nhiên liệu hạt nhân.
+item.scrap.description = �ược dùng trong Máy nung và Máy nghi�n để tinh luyện thành các vật liệu khác.
+item.scrap.details = Tàn tích còn lại của các công trình và đơn vị cũ.
+item.silicon.description = �ược dùng trong các tấm pin mặt tr�i, thiết bị điện tử phức tạp và một số loại đạn truy đuổi.
+item.plastanium.description = �ược dùng trong các đơn vị tiên tiến, các cấu trúc cách điện và đạn tự phân mảnh.
+item.phase-fabric.description = �ược dùng trong các thiết bị điện tử tiên tiến và các cấu trúc tự sửa chữa.
+item.surge-alloy.description = �ược dùng trong các vũ khí tiên tiến và các cấu trúc phòng thủ phản hồi.
+item.spore-pod.description = �ược dùng để chuyển đổi thành dầu, chất nổ và nhiên liệu.
 item.spore-pod.details = Bào tử. Có thể là một dạng sống tổng hợp. Phát thải khí độc đối với sinh vật khác. Cực kỳ xâm lấn. Rất dễ cháy trong một số trư�ng hợp nhất định.
-item.blast-compound.description = Dùng trong bom hoặc đạn nổ.
-item.pyratite.description = Dùng trong vũ khí gây cháy và máy phát điện chạy bằng nhiên liệu đốt.
+item.blast-compound.description = �ược dùng trong bom hoặc đạn nổ.
+item.pyratite.description = �ược dùng trong vũ khí gây cháy và máy phát điện chạy bằng nhiên liệu đốt.
 
-liquid.water.description = Dùng để làm mát máy móc và xử lý chất thải.
-liquid.slag.description = Dùng để tách các kim loại, hoặc phun vào kẻ thù như một loại vũ khí.
-liquid.oil.description = Dùng trong sản xuất vật liệu tiên tiến và làm đạn gây cháycháy.
-liquid.cryofluid.description = Dùng làm chất làm mát trong lò phản ứng, súng và nhà máy.
+#Erekir
+item.beryllium.description = �ược dùng trong nhi�u loại công trình và đạn dược trên Erekir.
+item.tungsten.description = �ược dùng trong các máy khoan, b�c giáp và đạn dược. Yêu cầu trong việc xây dựng các công trình cao cấp hơn.
+item.oxide.description = �ược dùng làm chất dẫn nhiệt và cách điện cho nguồn điện.
+item.carbide.description = �ược dùng trong các công trình tiên tiến, các đơn vị hạng nặng và đạn dược.
 
-block.resupply-point.description = Cung cấp đạn đồng cho các quân lính ở gần. Không tương thích với quân lính sử dụng điện.
-block.armored-conveyor.description = Vận chuyển vật phẩm v� phía . Không nhận đầu vào từ phía bên.
+liquid.water.description = �ược dùng để làm mát máy móc và xử lý chất thải.
+liquid.slag.description = Tinh chế để tách các kim loại thành phần. Dùng trong các loại súng chất l�ng như một loại đạn.
+liquid.oil.description = �ược dùng trong sản xuất vật liệu tiên tiến và làm đạn gây cháy.
+liquid.cryofluid.description = �ược dùng như chất làm mát trong lò phản ứng, súng và nhà máy.
+
+#Erekir
+liquid.arkycite.description = �ược dùng trong các phản ứng hóa h�c để phát điện và tổng hợp vật liệu.
+liquid.ozone.description = �ược sử dụng như một chất ôxy hóa trong sản xuất vật liệu, và làm nhiên liệu. Gây nổ vừa phải.
+liquid.hydrogen.description = �ược dùng trong khai thác tài nguyên, sản xuất đơn vị và sửa chữa công trình. Dễ cháy.
+liquid.cyanogen.description = �ược dùng cho đạn dược, xây dựng các đơn vị tiên tiến và các phản ứng khác nhau trong các khối tiên tiến. Rất dễ cháy.
+liquid.nitrogen.description = �ược dùng trong khai thác tài nguyên, tạo khí và sản xuất đơn vị. Trơ.
+liquid.neoplasm.description = Một sản phẩm phụ sinh h�c nguy hiểm của lò phản ứng Neoplasia. Lan nhanh sang bất kỳ khối chứa nước nào mà nó chạm vào, gây hư hại chúng. Nhớt.
+liquid.neoplasm.details = Tế bào tân sinh. Một khối lượng các tế bào tổng hợp phân chia nhanh chóng không kiểm soát với độ đặc giống như bùn. Kháng nhiệt. Cực kỳ nguy hiểm cho bất cứ khối nào có liên quan đến nước.\n\nQuá phức tạp và không ổn định để được phân tích. Chưa rõ được ti�m năng và ứng dụng của nó. Khuyến nghị đốt chúng trong xỉ nóng chảy.
+
+block.derelict = \uf77e [lightgray]B� hoang
+block.armored-conveyor.description = Vận chuyển vật phẩm v� phía trước. Không nhận đầu vào không phải băng chuy�n từ phía bên cạnh.
 block.illuminator.description = Phát sáng.
-block.message.description = Lưu trữ tin nhắn giao tiếp giữa đồng đội.
+block.message.description = Lưu trữ thông điệp giao tiếp giữa các đồng đội.
+block.reinforced-message.description = Lưu trữ thông điệp giao tiếp giữa các đồng đội.
+block.world-message.description = Một khối thông điệp đùng để sử dụng trong việc tạo bản đồ. Không thể bị phá hủy.
 block.graphite-press.description = Nén than thành than chì.
-block.multi-press.description = Nén than thành than chì. Cần nước làm chất làm mát.
+block.multi-press.description = Nén than thành than chì. Cần nước làm mát.
 block.silicon-smelter.description = Tinh chế silicon từ cát và than.
-block.kiln.description = Nấu chảy cát và chì thành metaglass.
-block.plastanium-compressor.description = Sản xuất plastanium từ dầu và titan.
-block.phase-weaver.description = Tổng hợp phase fabric từ thorium và cát.
-block.alloy-smelter.description = Trộn titan, chì, silicon và đồng thành hợp kim surge.
-block.cryofluid-mixer.description = Trộn nước và bột titan để sản xuất cryofluid.
-block.blast-mixer.description = Tạo ra hợp chất nổ từ pyratite và v� bào tử.
-block.pyratite-mixer.description = Trộn than, chì và cát thành pyratite.
+block.kiln.description = Nấu chảy cát và chì thành thuỷ tinh.
+block.plastanium-compressor.description = Sản xuất nhựa từ dầu và titan.
+block.phase-weaver.description = Tổng hợp sợi lượng tử từ thori và cát.
+block.surge-smelter.description = Hợp nhất titan, chì, silicon và đồng thành hợp kim.
+block.cryofluid-mixer.description = Trộn nước và bột titan mịn để sản xuất chất làm mát.
+block.blast-mixer.description = Tạo ra hợp chất nổ từ nhiệt thạch và v� bào tử.
+block.pyratite-mixer.description = Trộn than, chì và cát thành nhiệt thạch.
 block.melter.description = Nung phế liệu thành xỉ.
 block.separator.description = Tách xỉ thành các thành phần khoáng của nó.
 block.spore-press.description = Nén v� bào tử thành dầu.
-block.pulverizer.description = Nghi�n phế liệu thành cát.
-block.coal-centrifuge.description = Biến dầu thành than.
+block.pulverizer.description = Nghi�n phế liệu thành cát mịn.
+block.coal-centrifuge.description = Biến đổi dầu thành than.
 block.incinerator.description = Tiêu hủy bất kỳ vật phẩm hoặc chất l�ng nào mà nó nhận được.
-block.power-void.description = Hủy tất cả năng lượng nhận được. Chỉ có trong chế độ Sandbox.
-block.power-source.description = Tạo ra năng lượng mãi mãi. Chỉ có trong chế độ Sandbox.
-block.item-source.description = Tạo ra vật phẩm mãi mãi. Chỉ có trong chế độ Sandbox.
-block.item-void.description = Hủy m�i vật phẩm. Chỉ có trong chế độ Sandbox.
-block.liquid-source.description = Tạo ra chất l�ng mãi mãi. Chỉ có trong chế độ Sandbox.
-block.liquid-void.description = Loại b� m�i chất l�ng. Chỉ có trong chế độ Sandbox.
-block.copper-wall.description = Bảo vệ các công trình kh�i đạn của kẻ thù.
-block.copper-wall-large.description = Bảo vệ nhi�u công trình kh�i đạn của kẻ thù.
-block.titanium-wall.description = Bảo vệ các công trình kh�i đạn của kẻ thù.
-block.titanium-wall-large.description = Bảo vệ nhi�u công trình kh�i đạn của kẻ thù.
-block.plastanium-wall.description = Bảo vệ công trình kh�i đạn của kẻ thù. Hấp thụ tia laser và tia điện. Chặn kết nối nguồn tự động.
-block.plastanium-wall-large.description = Bảo vệ nhi�u công trình kh�i đạn của kẻ thù. Hấp thụ tia laser và tia điện. Chặn kết nối nguồn tự động.
-block.thorium-wall.description = Bảo vệ công trình kh�i đạn của kẻ thù.
-block.thorium-wall-large.description = Bảo vệ nhi�u công trình kh�i đạn của kẻ thù.
-block.phase-wall.description = Bảo vệ công trình kh�i đạn của kẻ thù, phản hầu hết đạn khi va chạm.
-block.phase-wall-large.description = Bảo vệ nhi�u công trình kh�i đạn của kẻ thù, phản hầu hết đạn khi va chạm.
-block.surge-wall.description = Bảo vệ công trình kh�i đạn của kẻ thù, đôi khi tạo ra tia điện khi bị bắn.
-block.surge-wall-large.description = Bảo vệ nhi�u công trình kh�i đạn của kẻ thù, đôi khi tạo ra tia điện khi bị bắn.
-block.door.description = Một bức tư�ng có thể đóng mở.
-block.door-large.description = Một bức tư�ng có thể đóng mở.
-block.mender.description = Sửa chữa định kỳ các khối trong vùng lân cận.\nSử dụng silicon để tăng phạm vi và hiệu quả.
-block.mend-projector.description = Sửa chữa các khối lân cận.\nSử dụng silicon để tăng phạm vi và hiệu quả.
-block.overdrive-projector.description = Tăng tốc độ làm việc của các công trình lân cận.\nSử dụng phase fabric để tăng phạm vi và hiệu quả.
-block.force-projector.description = Tạo ra một trư�ng lực lục giác xung quanh nó, bảo vệ các tòa nhà và quân lính bên trong kh�i bị hư hại.\nQuá nóng nếu chịu quá nhi�u sát thương. Sử dụng chất làm mát để giảm nhiệt độ. Sử dụng Phase fabric để tăng kích thước lá chắn.
-block.shock-mine.description = Giải phóng tia điện khi tiếp xúc với quân lính đối phương.
+block.power-void.description = Hủy tất cả năng lượng nhận được. Chỉ chế độ Tự do.
+block.power-source.description = Tạo ra năng lượng vô hạn. Chỉ chế độ Tự do.
+block.item-source.description = Tạo ra vật phẩm vô hạn. Chỉ chế độ Tự do.
+block.item-void.description = Hủy m�i vật phẩm. Chỉ chế độ Tự do.
+block.liquid-source.description = Tạo ra chất l�ng vô hạn. Chỉ chế độ Tự do.
+block.liquid-void.description = Loại b� m�i chất l�ng. Chỉ chế độ Tự do.
+block.payload-source.description = Tạo ra bất kỳ khối hàng nào. Chỉ chế độ Tự do.
+block.payload-void.description = Phá hủy bất kỳ khối hàng nào. Chỉ chế độ Tự do.
+block.copper-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.copper-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.titanium-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.titanium-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.plastanium-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch. Hấp thụ tia laser và tia điện. Chặn kết nối điện tự động.
+block.plastanium-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch. Hấp thụ tia laser và tia điện. Chặn kết nối điện tự động.
+block.thorium-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.thorium-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.phase-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch, phản hầu hết đạn khi va chạm.
+block.phase-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch, phản hầu hết đạn khi va chạm.
+block.surge-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch, thư�ng phóng ra các tia điện khi đạn va chạm.
+block.surge-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch, thư�ng phóng ra các tia điện khi đạn va chạm.
+block.scrap-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.scrap-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.scrap-wall-huge.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.scrap-wall-gigantic.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.door.description = Một bức tư�ng có thể mở và đóng.
+block.door-large.description = Một bức tư�ng có thể mở và đóng.
+block.mender.description = Sửa chữa định kỳ các khối trong vùng lân cận.\nTùy ch�n sử dụng silicon để tăng phạm vi và hiệu quả.
+block.mend-projector.description = Sửa chữa các khối lân cận.\nTùy ch�n sử dụng sợi lượng tử để tăng phạm vi và hiệu quả.
+block.overdrive-projector.description = Tăng tốc độ làm việc của các công trình gần đó.\nTùy ch�n sử dụng sợi lượng tử để tăng phạm vi và hiệu quả. Không cộng dồn.
+block.force-projector.description = Tạo ra một trư�ng lực lục giác xung quanh nó, bảo vệ các công trình và đơn vị bên trong kh�i bị hư hại.\nQuá nóng nếu chịu quá nhi�u sát thương. Tùy ch�n sử dụng chất làm mát để chống quá nhiệt. Sử dụng sợi lượng tử để tăng kích thước lá chắn.
+block.shock-mine.description = Giải phóng tia điện khi tiếp xúc với đơn vị đối phương.
 block.conveyor.description = Vận chuyển vật phẩm v� phía trước.
 block.titanium-conveyor.description = Vận chuyển vật phẩm v� phía trước. Nhanh hơn băng chuy�n tiêu chuẩn.
-block.plastanium-conveyor.description =  Vận chuyển vật phẩm v� phía trước theo lô. Nhận các vật phẩm ở phía sau và dỡ chúng theo ba hướng ở phía trước. Yêu cầu nhi�u điểm tải và dỡ hàng để có hiệu quả cao nhất.
-block.junction.description = Hoạt động như một cầu nối cho hai băng chuy�n băng qua.
+block.plastanium-conveyor.description = Vận chuyển vật phẩm v� phía trước theo lô. Nhận các vật phẩm ở phía sau và dỡ chúng theo ba hướng ở phía trước. Yêu cầu nhi�u điểm tải và dỡ hàng để có hiệu quả cao nhất.
+block.junction.description = Hoạt động như một cầu nối cho hai băng chuy�n băng qua nhau.
 block.bridge-conveyor.description = Vận chuyển vật phẩm qua nhi�u loại địa hình hoặc công trình.
 block.phase-conveyor.description = Vận chuyển tức th�i vật phẩm qua địa hình hoặc công trình. Phạm vi dài hơn cầu nối, nhưng cần năng lượng.
-block.sorter.description = Nếu vật phẩm giống vật được ch�n sẽ được chuyển đến trước, nếu không sẽ được chuyển qua trái hoặc phải.
-block.inverted-sorter.description = Giống như máy phân loại, nhưng vật được ch�n sẽ được chuyển qua trái hoặc phải.
+block.sorter.description = Nếu vật phẩm giống vật phẩm được ch�n, sẽ được chuyển đến trước. Nếu không, sẽ được chuyển qua trái hoặc phải.
+block.inverted-sorter.description = Giống như bộ l�c, nhưng vật phẩm được ch�n sẽ được chuyển qua trái hoặc phải.
 block.router.description = Phân phối các vật phẩm đầu vào thành 3 hướng đầu ra như nhau.
-block.router.details = Không khuyên dùng cạnh đầu vào dây chuy�n vì sẽ bị kẹt bởi đầu ra.
+block.router.details = Một đi�u xấu không thể tránh kh�i. Không khuyên dùng cạnh đầu vào sản xuất, vì sẽ bị kẹt bởi đầu ra.
 block.distributor.description = Phân phối các vật phẩm đầu vào thành 7 hướng đầu ra như nhau.
-block.overflow-gate.description = Chỉ đưa vật phẩm ra 2 phía nếu phía trước bị chặn, không thể đặt cạnh nhau.
-block.underflow-gate.description = Ngược với cổng tràn, chỉ đưa vật phẩm đến trước khi hai bên bị chặn, không thể đặt cạnh nhau.
-block.mass-driver.description = Cấu trúc vận chuyển vật phẩm tầm xa. Thu thập các lô vật phẩm và bắn chúng cho các mass driver khác.
-block.mechanical-pump.description = Bơm chất l�ng, không yêu cầu năng lượng.
-block.rotary-pump.description = Bơm chất l�ng, yêu cầu năng lượng.
-block.thermal-pump.description = Bơm chất l�ng.
-block.conduit.description = �ẩy chất l�ng đến trước, dùng với bơm và các ống dẫn khác.
-block.pulse-conduit.description = �ẩy chất l�ng đến trước, vận chuyển nhanh và trữ nhi�u hơn so với ống tiêu chuẩn.
-block.plated-conduit.description = �ẩy chất l�ng đến trước, không nhận đầu vào ở bên, không bị rò rỉ.
-block.liquid-router.description = Nhận chất l�ng từ một phía và đưa đ�u ra ba phía còn lại. Có thể trữ một lượng chất l�ng nhất định.
-block.liquid-tank.description = Trữ được nhi�u chất l�ng. �ưa đ�u ra m�i phía như bộ phân nhánh chất l�ng.
-block.liquid-junction.description = Chức năng như cầu cho hai ống nước băng chéo nhau.
+block.overflow-gate.description = Chỉ đưa vật phẩm ra hai bên nếu phía trước bị chặn.
+block.underflow-gate.description = Ngược với cổng tràn, chỉ đưa vật phẩm ra trước khi hai bên bị chặn.
+block.mass-driver.description = Cấu trúc vận chuyển vật phẩm tầm xa. Thu thập các lô vật phẩm và bắn chúng cho các máy phóng điện từ khác.
+block.mechanical-pump.description = Bơm và cho ra chất l�ng. Không yêu cầu năng lượng.
+block.rotary-pump.description = Bơm và cho ra chất l�ng. Yêu cầu năng lượng.
+block.impulse-pump.description = Bơm và cho ra chất l�ng.
+block.conduit.description = �ẩy chất l�ng đến trước, được dùng để nối với bơm và các ống dẫn khác.
+block.pulse-conduit.description = �ẩy chất l�ng đến trước. Vận chuyển nhanh và trữ nhi�u hơn so với ống tiêu chuẩn.
+block.plated-conduit.description = �ẩy chất l�ng đến trước. Không nhận đầu vào ở bên. Không bị rò rỉ.
+block.liquid-router.description = Nhận chất l�ng từ một phía và phân phát đ�u ra 3 phía còn lại. Có thể trữ một lượng chất l�ng nhất định.
+block.liquid-container.description = Lưu trữ một lượng vừa phải chất l�ng. �ưa đ�u ra m�i phía như bộ phân phát chất l�ng.
+block.liquid-tank.description = Trữ được một lượng lớn chất l�ng. �ưa đ�u ra m�i phía như bộ phân phát chất l�ng.
+block.liquid-junction.description = Chức năng như cầu cho hai ống dẫn băng qua nhau.
 block.bridge-conduit.description = Vận chuyển chất l�ng qua nhi�u loại địa hình hoặc công trình.
 block.phase-conduit.description = Vận chuyển chất l�ng qua địa hình hoặc công trình. Phạm vi dài hơn cầu nối, nhưng cần năng lượng.
 block.power-node.description = Truy�n năng lượng cho các chốt được kết nối. Chốt sẽ nhận năng lượng hoặc cấp năng lượng cho bất kỳ khối nào li�n k�.
@@ -1385,106 +2189,509 @@ block.power-node-large.description = Một chốt điện với phạm vi lớn
 block.surge-tower.description = Một chốt điện tầm xa với ít kết nối khả dụng hơn.
 block.diode.description = Di chuyển năng lượng trong pin theo một hướng, nhưng chỉ khi phía bên kia có ít năng lượng được lưu trữ hơn.
 block.battery.description = Tích trữ năng lượng khi dư thừa. Xuất năng lượng khi thiếu hụt.
-block.battery-large.description =  Tích trữ năng lượng khi dư thừa. Xuất năng lượng khi thiếu hụt. Dung lượng cao hơn pin thông thư�ng.
-block.combustion-generator.description = Tạo ra năng lượng bằng cách đốt các vật liệu dễ cháy như than.
+block.battery-large.description = Tích trữ năng lượng khi dư thừa. Xuất năng lượng khi thiếu hụt. Dung lượng cao hơn pin thông thư�ng.
+block.combustion-generator.description = Tạo ra năng lượng bằng cách đốt các vật liệu dễ cháy, như than.
 block.thermal-generator.description = Tạo ra năng lượng khi đặt ở những nơi nóng.
 block.steam-generator.description = Tạo ra năng lượng bằng cách đốt cháy các vật liệu dễ cháy và chuyển nước thành hơi nước.
-block.differential-generator.description = Tạo ra một lượng lớn năng lượng. Sử dụng sự chênh lệch nhiệt độ giữa cryofluid và pyratite đang cháy.
+block.differential-generator.description = Tạo ra một lượng lớn năng lượng. Sử dụng sự chênh lệch nhiệt độ giữa chất làm lạnh và nhiệt thạch đang cháy.
 block.rtg-generator.description = Sử dụng nhiệt của các hợp chất phóng xạ đang phân hủy để tạo ra năng lượng với tốc độ chậm.
 block.solar-panel.description = Cung cấp một lượng nh� năng lượng từ mặt tr�i.
 block.solar-panel-large.description = Cung cấp một lượng nh� năng lượng từ mặt tr�i. Hiệu quả hơn pin mặt tr�i tiêu chuẩn.
-block.thorium-reactor.description = Tạo ra lượng năng lượng lớn từ thorium. Yêu cầu làm mát liên tục. Sẽ phát nổ dữ dội nếu không cung cấp đủ chất làm mát.
-block.impact-reactor.description = Tạo ra lượng năng lượng khổng lồ khi đạt hiệu quả cao nhất. Yêu cầu nguồn năng lượng lớn để bắt đầu quá trình.
-block.mechanical-drill.description = Khi đặt trên quặng, xuất các vật phẩm với tốc độ chậm. Chỉ có khả năng khai thác các tài nguyên cơ bản.
+block.thorium-reactor.description = Tạo ra lượng năng lượng lớn từ thori. Yêu cầu làm mát liên tục. Sẽ phát nổ dữ dội nếu không cung cấp đủ chất làm mát.
+block.impact-reactor.description = Tạo ra lượng năng lượng khổng lồ khi đạt hiệu quả cao nhất. Yêu cầu nguồn năng lượng lớn để khởi động quá trình.
+block.mechanical-drill.description = Khi đặt trên quặng, xuất vô hạn các vật phẩm với tốc độ chậm. Chỉ có khả năng khai thác các tài nguyên cơ bản.
 block.pneumatic-drill.description = Máy khoan cải tiến, có khả năng khai thác titan. Khai thác với tốc độ nhanh hơn máy khoan cơ khí.
-block.laser-drill.description = Cho phép khoan nhanh hơn nh� công nghệ laser, nhưng đòi h�i năng lượng. Có khả năng khai thác thorium.
+block.laser-drill.description = Cho phép khoan nhanh hơn nh� công nghệ laser, nhưng đòi h�i năng lượng. Có khả năng khai thác thori.
 block.blast-drill.description = Máy khoan siêu cấp. Yêu cầu lượng năng lượng lớn.
-block.water-extractor.description = Khai thác nước ngầm. �ược sử dụng ở những nơi không có sẵn nước.
-block.cultivator.description = L�c bào tử có trong không khí và nuôi cấy thành v� bào tử.
+block.water-extractor.description = Khai thác nước ngầm. �ược dùng ở những nơi b� mặt không có sẵn nước.
+block.cultivator.description = L�c bào tử có trong không khí để nuôi cấy thành v� bào tử.
 block.cultivator.details = Công nghệ được phục hồi. �ược sử dụng để sản xuất một lượng lớn bào tử. Có thể là nơi ủ ban đầu của các bào tử hiện đang bao phủ Serpulo.
-block.oil-extractor.description = Sử dụng lượng năng lượng năng lớn, sử dụng cát và nước để khoan dầu.
+block.oil-extractor.description = Sử dụng lượng năng lượng lớn, cát và nước để khoan dầu.
 block.core-shard.description = Trung tâm của căn cứ. Sau khi bị phá hủy, khu vực này sẽ bị mất.
-block.core-shard.details = Lần thử đầu tiên. G�n nhẹ. Tự thay thế. �ược trang bị tên lửa đẩy dùng một lần. Không được thiết kế để di chuyển giữa các hành tinh.
-block.core-foundation.description = Core of the base. Well armored. Stores more resources than a Shard.
-block.core-foundation.details = The second iteration.
-block.core-nucleus.description = Lõi của căn cứ. B�c giáp chắc chắn. Lưu trữ lượng lớn tài nguyên.
-block.core-nucleus.details = Lần thử thứ ba và  lần thử cuối.
-block.vault.description = Lưu trữ lượng lớn vật phẩm mỗi loại. Nội dung có thể được lấy ra với Unloader.
-block.container.description = Lưu trữ lượng lớn vật phẩm mỗi loại. Nội dung có thể được lấy ra với Unloader.
-block.unloader.description = Lấy các vật phẩm được ch�n từ các ô gần đó.
-block.launch-pad.description = Phóng lô vật phẩm vào phân vùng.
+block.core-shard.details = Cấp độ thứ nhất. G�n nhẹ. Tự thay thế. �ược trang bị tên lửa đẩy dùng một lần. Không được thiết kế để di chuyển giữa các hành tinh.
+block.core-foundation.description = Trung tâm của căn cứ. �ược b�c giáp. Chứa được nhi�u tài nguyên hơn Lõi: Cơ sở.
+block.core-foundation.details = Cấp độ thứ 2.
+block.core-nucleus.description = Trung của căn cứ. B�c giáp chắc chắn. Lưu trữ lượng lớn tài nguyên.
+block.core-nucleus.details = Cấp độ thứ 3 và cũng là cấp cuối cùng.
+block.vault.description = Lưu trữ lượng lớn vật phẩm mỗi loại. Mở rộng kho lưu trữ khi đặt kế bên một lõi. Nội dung có thể được lấy ra với điểm dỡ hàng.
+block.container.description = Lưu trữ lượng nh� vật phẩm mỗi loại. Mở rộng kho lưu trữ khi đặt kế bên một lõi. Nội dung có thể được lấy ra với điểm dỡ hàng.
+block.unloader.description = Lấy các vật phẩm được ch�n từ các khối gần đó.
+block.launch-pad.description = Phóng lô vật phẩm vào khu vực được ch�n.
+block.advanced-launch-pad.description = Phóng lô vật phẩm vào khu vực được ch�n. Chỉ nhận một kiểu vật phẩm một lúc.
+block.advanced-launch-pad.details = Hệ thống tiểu quỹ đạo để vận chuyển tài nguyên từ điểm này đến điểm khác.
+block.landing-pad.description = Nhận vật phẩm từ bệ phóng ở khu vực khác. Cần một lượng nước lớn để bảo vệ chống lại va chạm khi đáp.
 block.duo.description = Bắn xen kẽ đạn vào kẻ địch.
-block.scatter.description = Bắn chì, phế liệu hoặc metaglass vào máy bay địch.
-block.scorch.description = �ốt m�i kẻ địch trên mặt đất. Hiệu quả cao ở tầm gần.
-block.hail.description = Phóng đạn nh� vào kẻ địch trên mặt đất ở tầm xa.
-block.wave.description = Phóng một tia chất l�ng vào kẻ địch. Tự chữa cháy nếu được cung cấp nước.
-block.lancer.description = Tích tụ và phóng tia năng lượng mạnh vào kẻ địch trên mặt đất.
-block.arc.description = Phóng tia điện vào kẻ địch trên mặt đất.
-block.swarmer.description = Bắn tên lửa homing vào kẻ địch.
-block.salvo.description = Bắn đạn salvo vào kẻ địch.
-block.fuse.description = Bắn ba đạn xuyên giáp tầm gần vào kẻ địch.
+block.scatter.description = Bắn khối chì, phế liệu hoặc thuỷ tinh vào kẻ địch trên không.
+block.scorch.description = �ốt m�i kẻ địch trên mặt đất ở gần. Hiệu quả cao ở tầm gần.
+block.hail.description = Bắn đạn nh� vào kẻ địch trên mặt đất ở tầm xa.
+block.wave.description = Bắn một tia chất l�ng vào kẻ địch. Tự chữa cháy nếu được cung cấp nước.
+block.lancer.description = Tích tụ và bắn tia năng lượng mạnh vào kẻ địch trên mặt đất.
+block.arc.description = Bắn tia hồ quang điện vào kẻ địch trên mặt đất.
+block.swarmer.description = Bắn tên lửa truy đuổi vào kẻ địch.
+block.salvo.description = Bắn loạt đạn nhanh vào kẻ địch.
+block.fuse.description = Bắn ba tia đạn xuyên giáp tầm gần vào kẻ địch.
 block.ripple.description = Bắn cụm đạn vào kẻ địch trên mặt đất ở tầm xa.
-block.cyclone.description = Bắn đạn nổ vào kẻ địch ở gần.
-block.spectre.description = Bắn đạn xuyên giáp lớn ở kẻ địch trên không và trên mặt đất.
-block.meltdown.description = Nạp và bắn một tia laser liên tục vào kẻ địch ở gần. Cần có chất làm mát để hoạt động.
-block.foreshadow.description = Bắn viên một viên đạn tỉa lớn ở tầm xa.
-block.repair-point.description = Liên tục sửa chữa robot ở gần trong phạm vi hoạt động.
-block.segment.description = Gây hư hại và phá hủy đạn đến. Ngoại trừ tia laser.
-block.parallax.description = Bắn một tia kéo máy bay địch và làm hư h�ng nó trong quá trình kéo.
-block.tsunami.description = Phóng một tia chất l�ng mạnh vào kẻ địch. Tự chữa cháy nếu được cung cấp nước.
-block.silicon-crucible.description = Tinh chế silicon từ cát và than, sử dụng pyratite làm nguồn nhiệt phụ. Có hiệu quả cao hơn khi ở nơi nóng.
-block.disassembler.description = Tách xỉ thành các kim loại khác nhau với hiệu suất thấp. Có thể sản xuất thorium.
-block.overdrive-dome.description = Tăng tốc độ làm việc của các công trình lân cận. Sử dụng phase fabric and silicon để hoạt động.
-block.payload-conveyor.description = Di chuyển những khối hàng lớn, chẳng hạn như các quân lính từ nhà máy.
-block.payload-router.description = Tách những khối hàng đầu vào thành 3 hướng đầu ra.
-block.command-center.description = Kiểm soát hoạt động của của quân lính bằng một số lệnh khác nhau.
-block.ground-factory.description = Sản xuất binh lính bộ binh. Các quân lính đầu ra có thể được sử dụng trực tiếp, hoặc đem nâng cấp.
-block.air-factory.description = Sản xuất binh lính không quân. Các quân lính đầu ra có thể được sử dụng trực tiếp, hoặc đem nâng cấp.
-block.naval-factory.description = Sản xuất binh lính hải quân. Các quân lính đầu ra có thể được sử dụng trực tiếp, hoặc đem nâng cấp.
-block.additive-reconstructor.description = Nâng cấp quân của bạn lên cấp hai.
-block.multiplicative-reconstructor.description = Nâng cấp quân của bạn lên cấp ba.
-block.exponential-reconstructor.description = Nâng cấp quân của bạn lên cấp bốn.
-block.tetrative-reconstructor.description = Nâng cấp quân của bạn nên cấp năm (cuối cùng).
-block.switch.description = Công tắc, trạng thái có thể được đ�c và đi�u khiển với vi xử lí logic.
-block.micro-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để đi�u khiển robot và công trình.
-block.logic-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để đi�u khiển robot và công trình. Nhanh hơn vi xử lí micro.
-block.hyper-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để đi�u khiển robot và công trình. Nhanh hơn vi xử lí logic.
-block.memory-cell.description = Lưu trữ thông tin cho bộ xử lí logic.
-block.memory-bank.description = Lưu trữ thông tin cho bộ xử lí logic. Dung lượng cao.
-block.logic-display.description = Hiển thị đồ h�a tùy ý từ bộ xử lí logic.
-block.large-logic-display.description = Hiển thị đồ h�a tùy ý từ bộ xử lí logic.
-block.interplanetary-accelerator.description = Tòa súng từ trư�ng cỡ lớn. Tăng tốc vật phóng đến vận tốc thoát để di chuyển giữa các hành tinh.
+block.cyclone.description = Bắn cụm đạn nổ vào kẻ địch ở gần.
+block.spectre.description = Bắn đạn lớn ở kẻ địch trên không và trên mặt đất.
+block.meltdown.description = Tích tụ và bắn một tia laser liên tục vào kẻ địch ở gần. Cần có chất làm mát để hoạt động.
+block.foreshadow.description = Bắn viên một viên đạn tỉa lớn ở tầm xa. Ưu tiên kẻ địch có độ b�n tối đa cao nhất.
+block.repair-point.description = Liên tục sửa chữa đơn vị ở trong phạm vi hoạt động.
+block.segment.description = Gây hư hại và phá hủy đạn hướng đến. Không nhắm vào tia laser.
+block.parallax.description = Bắn một tia kéo mục tiêu trên không và làm hư h�ng nó trong quá trình kéo.
+block.tsunami.description = Phóng một tia chất l�ng mạnh vào kẻ địch. Tự chữa cháy nếu được cung cấp nước hoặc chất làm mát.
+block.silicon-crucible.description = Tinh chế silicon từ cát và than, sử dụng nhiệt thạch làm nguồn nhiệt phụ. Có hiệu quả cao hơn khi ở nơi nóng.
+block.disassembler.description = Tách xỉ thành lượng nh� các thành phần khoáng chất lạ với hiệu suất thấp. Có thể sản xuất thori.
+block.overdrive-dome.description = Tăng tốc độ làm việc của các công trình lân cận. Sử dụng sợi lượng tử và silicon để hoạt động. Không cộng dồn.
+block.payload-conveyor.description = Di chuyển những khối hàng lớn, chẳng hạn như các đơn vị từ nhà máy. Từ tính. Sử dụng ở những môi trư�ng không tr�ng lực.
+block.payload-router.description = Tách những khối hàng đầu vào thành 3 hướng đầu ra. Hoạt động như một bộ l�c khi được thiết lập. Từ tính. Sử dụng ở những môi trư�ng không tr�ng lực.
+block.ground-factory.description = Sản xuất đơn vị bộ binh. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đưa vào máy tái thiết để nâng cấp.
+block.air-factory.description = Sản xuất đơn vị không quân. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đưa vào máy tái thiết để nâng cấp.
+block.naval-factory.description = Sản xuất đơn vị hải quân. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đưa vào máy tái thiết để nâng cấp.
+block.additive-reconstructor.description = Nâng cấp đơn vị đầu vào lên cấp thứ hai.
+block.multiplicative-reconstructor.description = Nâng cấp đơn vị đầu vào lên cấp thứ ba.
+block.exponential-reconstructor.description = Nâng cấp đơn vị đầu vào lên cấp thứ bốn.
+block.tetrative-reconstructor.description = Nâng cấp đơn vị đầu vào lên cấp thứ năm và là cấp cuối cùng.
+block.switch.description = Công tắc có thể bật/tắt. Trạng thái có thể được đ�c và đi�u khiển với xử lý logic.
+block.micro-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp. Có thể dùng để đi�u khiển đơn vị và công trình.
+block.logic-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp. Có thể dùng để đi�u khiển đơn vị và công trình. Nhanh hơn bộ xử lý vi cấp.
+block.hyper-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp. Có thể dùng để đi�u khiển đơn vị và công trình. Nhanh hơn bộ xử lý trung cấp.
+block.memory-cell.description = Lưu trữ thông tin cho bộ xử lý.
+block.memory-bank.description = Lưu trữ thông tin cho bộ xử lý. Dung lượng cao.
+block.logic-display.description = Hiển thị đồ h�a tùy ý từ bộ xử lý.
+block.large-logic-display.description = Hiển thị đồ h�a tùy ý từ bộ xử lý.
+block.interplanetary-accelerator.description = Tòa tháp súng điện từ cỡ lớn. Tăng tốc vật phóng đến vận tốc thoát để triển khai giữa các hành tinh.
+block.repair-turret.description = Sửa chữa những đơn vị bị hư h�ng trong khu vực nhất định. Tùy ch�n làm mát để tăng hiệu quả.
 
-unit.dagger.description = Bắn đạn tiêu chuẩn vào tất cả kẻ địch xung quanh.
-unit.mace.description = Phun lửa vào tất cả kẻ địch xung quanh.
-unit.fortress.description = Bắn pháo tầm xa lên kẻ địch trên mặt đất.
-unit.scepter.description = Bắn một chùm đạn vào kẻ địch ở gần.
-unit.reign.description = Bắn một chùm đạn xuyên giáp vào kẻ địch ở gần.
-unit.nova.description = Bắn tia laser làm tổn hại kẻ địch và sửa chữa các tòa nhà. Có khả năng bay.
-unit.pulsar.description = Bắn tia điện làm tổn hại kẻ địch và sửa chữa các tòa nhà. Có khả năng bay.
-unit.quasar.description = Bắn tia laser xuyên giáp làm tổn hại kẻ địch và sửa chữa các tòa nhà. Có khả năng bay. �ược b�c giáp.
-unit.vela.description = Bắn tia laser liên tục xuyên giáp làm tổn hại kẻ địch, gây cháy và sửa chữa các tòa nhà. Có khả năng bay.
-unit.corvus.description = Bắn đia laser đánh bật kẻ địch và sửa chữa các tòa nhà. Có thể đi qua đa số địa hình.
-unit.crawler.description = Chạy đến kẻ địch và nổ.
-unit.atrax.description = Bắn cục xỉ vào kẻ địch trên mặt đất. Có thể đi qua đa số địa hình.
-unit.spiroct.description = Bắn tia laser vào kẻ địch trên mặt đất và tự sửa chữa nó. Có thể đi qua đa số địa hình.
-unit.arkyid.description = Bắn tia laser lớn vào kẻ địch trên mặt đất và tự sửa chữa chính nó. Có thể đi qua đa số địa hình.
-unit.toxopid.description = Bắn chùm đạn điện và tia laser xuyên giáp vào kẻ địch trên mặt đất và tự sửa chữa chính nó. Có thể đi qua đa số địa hình.
-unit.flare.description = Bắn đạn thư�ng vào kẻ địch tầm gần trên mặt đất.
-unit.horizon.description = Thả chùm bom lên kẻ địch trên mặt đất.
-unit.zenith.description = Bắn chùm tên lửa vào m�i kẻ địch tầm gần.
-unit.antumbra.description = Bắn chùm đạn vào m�i kẻ địch tầm gần.
-unit.eclipse.description = Bắn hai tia laser xuyên giáp và chùm flak vào m�i kẻ địch tầm gần.
-unit.mono.description = Tự động khai thác đồng và chì, và vận chuyển vào căn cứ.
-unit.poly.description = Tự động xây dựng lại các công trình bị h�ng và hỗ trợ các quân lính khác thi công.
-unit.mega.description = Tự động sửa chữa các công trình bị h�ng. Có khả năng mang bộ binh nh�.
-unit.quad.description = Thả bom to lên kẻ địch, sửa chữa các tòa nhà và tổn hại kẻ địch. Có khả năng mang bộ binh vừa.
-unit.oct.description = Bảo vệ đồng minh với giáp. Có kả năng mang đa số bộ binh.
-unit.risso.description = Bắn chùm tên lửa và đạn lên kẻ địch tầm gần.
-unit.minke.description = Bắn đạn và đạn thư�ng lên kẻ địch tầm gần trên mặt đất.
-unit.bryde.description = Bắn đạn tầm xa và tên lửa vào kẻ địch.
-unit.sei.description = Bắn chùm tên lửa và đạn xuyên giáp vào kẻ địch.
-unit.omura.description = Bắn đạn từ trư�ng xuyên giáp tầm xa vào kẻ địch. Tạo nên robot báo hiệu.
-unit.alpha.description = Bảo vệ căn cứ cơ sở kh�i kẻ thù. Có thể xây dựng.
-unit.beta.description = Bảo vệ căn cứ trụ sở kh�i kẻ thù. Có thể xây dựng.
-unit.gamma.description = Bảo vệ căn cứ trung tâm kh�i kẻ thù. Có thể xây dựng.
+#Erekir
+block.core-bastion.description = Trung tâm của căn cứ. B�c giáp. Một khi bị phá hủy, khu vực sẽ mất.
+block.core-citadel.description = Trung tâm của căn cứ. B�c giáp tốt hơn. Lưu trữ nhi�u vật phẩm hơn lõi Pháo đài.
+block.core-acropolis.description = Trung tâm của căn cứ. �ược b�c giáp rất tốt. Lưu trữ nhi�u vật phẩm hơn lõi Thủ Phủ.
+block.breach.description = Bắn các loại đạn xuyên thấu vào kẻ địch.
+block.diffuse.description = Bắn một loạt đạn mảnh theo hình nón. �ẩy kẻ địch v� phía sau.
+block.sublimate.description = Thổi tia lửa mạnh liên tục vào kẻ địch. Xuyên giáp.
+block.titan.description = Bắn đạn pháo nổ khổng lồ vào các mục tiêu trên mặt đất. Yêu cầu hy-đrô l�ng.
+block.afflict.description = Bắn ra các mảnh vỡ của một quả cầu tích điện khổng lồ. Yêu cầu nhiệt.
+block.disperse.description = Bắn các mảnh vỡ vào các mục tiêu trên không.
+block.lustre.description = Bắn một tia laser di chuyển chậm một mục tiêu vào các mục tiêu của địch.
+block.scathe.description = Phóng một tên lửa mạnh vào các mục tiêu trên mặt đất ở khoảng cách lớn.
+block.smite.description = Bắn viên đạn phát sáng nổ xuyên thấu.
+block.malign.description = Bắn chùm hàng loạt những tia laser dẫn đư�ng nhắm thẳng mục tiêu kẻ địch. Yêu cầu lượng nhệt lớn.
+block.silicon-arc-furnace.description = Tinh chế silicone từ cát và than chì.
+block.oxidation-chamber.description = Chuyển đổi beryl và ôzôn thành ôxit. Tạo ra nhiệt như sản phẩm phụ.
+block.electric-heater.description = Làm nóng công trình. Yêu cầu một lượng điện lớn.
+block.slag-heater.description = Làm nóng công trinh. Yêu cầu xỉ.
+block.phase-heater.description = Làm nóng công trình. Yêu cầu sợi lượng tử.
+block.heat-redirector.description = Chuyển lượng nhiệt nhận được sang các khối khác.
+block.small-heat-redirector.description = Chuyển lượng nhiệt nhận được sang các khối khác.
+block.heat-router.description = Phân phát nhiệt nhận được sang ba hướng đầu ra.
+block.electrolyzer.description = Chuyển đổi nước thành hy-đrô l�ng và khí ô-zôn. Các khí xuất hai hướng đối nhau, được đánh dấu bằng các màu tương ứng.
+block.atmospheric-concentrator.description = Cô đặc ni-tơ từ khí quyển. Yêu cầu nhiệt.
+block.surge-crucible.description = Tinh chế hợp kim từ xỉ và silicon. Yêu cầu nhiệt.
+block.phase-synthesizer.description = Tổng hợp sợi lượng tử từ thori, cát, và ôzôn. Yêu cầu nhiệt.
+block.carbide-crucible.description = Kết hợp than chì và tungsten để tạo ra carbide. Yêu cầu nhiệt.
+block.cyanogen-synthesizer.description = Tổng hợp cyano từ arkycite và than chì. Yêu cầu nhiệt.
+block.slag-incinerator.description = �ốt các vật phẩm hoặc chất l�ng không bay hơi. Yêu cầu xỉ.
+block.vent-condenser.description = Ngưng tụ khí từ lỗ hơi nước để tạo ra nước. Tiêu thụ điện.
+block.plasma-bore.description = Khi được đặt đối diện với một bức tư�ng quặng, sản xuất vô hạn vật phẩm. Yêu cầu một lượng điện nh�.\nTùy ch�n sử dụng hy-đrô l�ng để tăng hiệu suất.
+block.large-plasma-bore.description = Một máy khoan plasma lớn hơn. Có thể khoan tungsten và thori. Yêu cầu hy-đrô l�ng và điện.\nTùy ch�n sử dụng ni-tơ l�ng để tăng hiệu suất.
+block.cliff-crusher.description = Nghi�n vách đá, xuất ra cát vô hạn. Yêu cầu năng lượng. Hiệu quả thay đổi dựa theo loại vách đá.
+block.large-cliff-crusher.description = Nghi�n vách đá, xuất ra cát vô hạn. Yêu cầu năng lượng và ôzôn. Hiệu quả thay đổi dựa theo loại vách đá. Tùy ch�n tiêu thụ tungsten để gia tăng hiệu suất.
+block.impact-drill.description = Khi được đặt lên một loại quặng, sản xuất vô hạn vật phẩm. Yêu cầu điện và nước.
+block.eruption-drill.description = Phiên bản cải tiến của máy khoan động lực. Có thể khoan thori. Yêu cầu hy-đrô l�ng.
+block.reinforced-conduit.description = Di chuyển chất l�ng v� phía trước. Không nhận đầu vào nếu không phải ống dẫn từ các bên.
+block.reinforced-liquid-router.description = Phân chia chất l�ng đ�u cho tất cả các bên.
+block.reinforced-liquid-tank.description = Lưu trữ một lượng chất l�ng lớn.
+block.reinforced-liquid-container.description = Lưu trữ một lượng chất l�ng vừa phải.
+block.reinforced-bridge-conduit.description = Vận chuyển chất l�ng qua các công trình và địa hình.
+block.reinforced-pump.description = Bơm chất l�ng lên. Yêu cầu hy-đrô l�ng.
+block.beryllium-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.beryllium-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.tungsten-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.tungsten-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.carbide-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.carbide-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch.
+block.reinforced-surge-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch, thư�ng phóng ra các tia điện khi đạn va chạm.
+block.reinforced-surge-wall-large.description = Bảo vệ các công trình kh�i đạn của kẻ địch, thư�ng phóng ra các tia điện khi đạn va chạm.
+block.shielded-wall.description = Bảo vệ các công trình kh�i đạn của kẻ địch, phản hồi hầu hết các loại đạn khi va chạm. Triển khai một lá chắn chống đạn khi được cung cấp điện. Dẫn điện.
+block.blast-door.description = Một loại tư�ng tự động mở ra khi đơn vị mặt đất đang ở gần. Không thể đi�u khiển một cách thủ công.
+block.duct.description = Di chuyển vật phẩm v� phía trước. Chỉ có thể lưu trữ một vật phẩm.
+block.armored-duct.description = Di chuyển vật phẩm v� phía trước. Không nhận đầu vào nếu không phải ống chân không từ các bên.
+block.duct-router.description = Phân chia vật phẩm đ�u cho tất cả các bên. Chỉ nhận đầu vào từ phía sau. Có thể được cấu hình thành một bộ sắp xếp vật phẩm.
+block.overflow-duct.description = Chỉ xuất vật phẩm ra các bên nếu đư�ng phía trước bị chặn.
+block.duct-bridge.description = Vận chuyển vật phẩm qua các công trình và địa hình.
+block.duct-unloader.description = Lấy ra vật phẩm đã ch�n từ khối phía sau nó. Không thể lấy ra từ các lõi.
+block.underflow-duct.description = Ngược lại với một ống tràn chân không. Xuất ra phía trước nếu các đư�ng bên trái và phải bị chặn.
+block.reinforced-liquid-junction.description = Làm cầu nối cho hai ống dẫn chất l�ng giao nhau.
+block.surge-conveyor.description = Di chuyển vật phẩm theo lô. Có thể được tăng tốc bằng điện. Dẫn điện.
+block.surge-router.description = Phân chia vật phẩm đ�u cho tất cả các bên từ các băng chuy�n hợp kim. Có thể được tăng tốc bằng điện. Dẫn điện.
+block.unit-cargo-loader.description = Tạo thiết bị bay chở hàng. Thiết bị bay tự động phân phát các món đồ đến �iểm thả hàng khớp với bộ l�c.
+block.unit-cargo-unload-point.description = Hoạt động như một điểm thả hàng cho thiết bị bay chở hàng. Nhận món đồ khớp với bộ l�c đã ch�n.
+block.beam-node.description = Truy�n điện cho các khối khác theo hướng thẳng. Lưu trữ một lượng điện nh�.
+block.beam-tower.description = Truy�n điện cho các khối khác theo hướng thẳng. Lưu trữ một lượng điện lớn. Có phạm vi rộng.
+block.turbine-condenser.description = Tạo ra điện khi được đặt trên các lỗ hơi nước. Tạo ra một lượng nước nh�.
+block.chemical-combustion-chamber.description = Tạo ra điện từ arkycite và ôzôn.
+block.pyrolysis-generator.description = Tạo ra một lượng điện lớn từ arkycite và xỉ nóng chảy. Tạo ra nước như một sản phẩm phụ.
+block.flux-reactor.description = Tạo ra một lượng điện lớn khi được làm nóng. Yêu cầu sử dụng cyano như một chất làm ổn định. Lượng điện tạo ra và lượng tiêu thụ cyano tỷ lệ thuận với lượng nhiệt nhận được.\nPhát nổ nếu không cung cấp đủ cyano.
+block.neoplasia-reactor.description = Sử dụng arkycite, nước và sợi lượng tử để tạo ra lượng điện khổng lồ. Tạo ra nhiệt và lượng tế bào tân sinh nguy hiểm như sản phẩm phụ trong quá trình hoạt động.\nPhát nổ dữ dội nếu tế bào tân sinh không được loại b� kh�i lò phản ứng.
+block.build-tower.description = Tự động xây dựng lại các công trình trong phạm vi và hỗ trợ các đơn vị khác trong quá trình xây dựng.
+block.regen-projector.description = Sửa chữa các công trình một cách chậm rãi trong phạm vi hình vuông. Yêu cầu hy-đrô l�ng.\nTùy ch�n sử dụng sợi lượng tử để tăng hiệu suất.
+block.reinforced-container.description = Lưu trữ một lượng nh� vật phẩm. Nội dung có thể được lấy ra thông qua các điểm dỡ hàng. Không làm tăng khả năng lưu trữ của lõi.
+block.reinforced-vault.description = Lưu trữ một lượng lớn vật phẩm. Nội dung có thể được lấy ra thông qua các điểm dỡ hàng. Không làm tăng khả năng lưu trữ của lõi.
+block.tank-fabricator.description = Chế tạo đơn vị Stell. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy tái chế tạo khác để được nâng cấp.
+block.ship-fabricator.description = Chế tạo đơn vị Elude. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy tái chế tạo khác để được nâng cấp.
+block.mech-fabricator.description = Chế tạo đơn vị Merui. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy tái chế tạo khác để được nâng cấp.
+block.tank-assembler.description = Lắp ráp các xe tăng lớn từ các khối và đơn vị. Cấp độ đầu ra có thể được tăng bằng cách thêm các mô-đun.
+block.ship-assembler.description = Lắp ráp các phi thuy�n lớn từ các khối và đơn vị. Cấp độ đầu ra có thể được tăng bằng cách thêm các mô-đun.
+block.mech-assembler.description = Lắp ráp các máy cơ động lớn từ các khối và đơn vị. Cấp độ đầu ra có thể được tăng bằng cách thêm các mô-đun.
+block.tank-refabricator.description = Nâng cấp các xe tăng đầu vào lên cấp thứ hai.
+block.ship-refabricator.description = Nâng cấp các phi thuy�n đầu vào lên cấp thứ hai.
+block.mech-refabricator.description = Nâng cấp các máy cơ động đầu vào lên cấp thứ hai.
+block.prime-refabricator.description = Nâng cấp các đơn vị đầu vào lên cấp thứ ba.
+block.basic-assembler-module.description = Tăng cấp lắp ráp khi đặt cạnh một hệ thống lắp ráp. Yêu cầu điện. Có thể sử dụng như nơi nhập các khối hàng.
+block.small-deconstructor.description = Tháo dỡ các công trình và đơn vị đầu vào. Trả lại 100% chi phí xây dựng.
+block.reinforced-payload-conveyor.description = Di chuyển khối hàng tiến v� phía trước.
+block.reinforced-payload-router.description = Phân chia các khối hàng vào các khối li�n k�. Hoạt động như một bộ l�c khi được thiết lập.
+block.payload-mass-driver.description = Công trình vận chuyển khối hàng tầm xa. Bắn các khối hàng nhận được đến các máy phóng từ trư�ng được liên kết.
+block.large-payload-mass-driver.description = Công trình vận chuyển khối hàng tầm xa. Bắn các khối hàng nhận được đến các máy phóng từ trư�ng được liên kết.
+block.unit-repair-tower.description = Sửa chữa tất cả các đơn vị trong phạm vi. Yêu cầu ôzôn.
+block.radar.description = Rà soát địa hình và đơn vị kẻ địch một cách từ từ trong môt phạm vi lớn. Yêu cầu điện.
+block.shockwave-tower.description = Phá hủy và tiêu diệt các loại đạn của kẻ địch trong một phạm vi. Yêu cầu cyano.
+block.canvas.description = Hiển thị một hình ảnh đơn giản với một bảng màu được định sẵn. Có thể chỉnh sửa.
+
+unit.dagger.description = Bắn các viên đạn tiêu chuẩn vào các mục tiêu kẻ địch.
+unit.mace.description = Phun tia lửa vào các mục tiêu kẻ địch.
+unit.fortress.description = Bắn pháo tầm xa lên các mục tiêu kẻ địch trên mặt đất.
+unit.scepter.description = Bắn một chùm đạn tích tụ vào các mục tiêu kẻ địch.
+unit.reign.description = Bắn một chùm đạn xuyên giáp mạnh vào các mục tiêu kẻ địch.
+unit.nova.description = Bắn tia laser gây sát thương lên các mục tiêu kẻ địch và sửa chữa các công trình đồng minh. Có khả năng bay.
+unit.pulsar.description = Bắn tia điện gây sát thương lên các mục tiêu kẻ địch và sửa chữa các công trình đồng minh. Có khả năng bay.
+unit.quasar.description = Bắn tia laser xuyên giáp gây sát thương lên các mục tiêu kẻ địch và sửa chữa các công trình đồng minh. Có khả năng bay. Có lá chắn.
+unit.vela.description = Bắn tia laser liên tục xuyên giáp gây sát thương lên các mục tiêu kẻ địch, gây cháy và sửa chữa các công trình đồng minh. Có khả năng bay.
+unit.corvus.description = Bắn đia laser cực mạnh gây sát thương lên các mục tiêu kẻ địch và sửa chữa các công trình đồng minh. Có thể đi qua hầu hết loại địa hình.
+unit.crawler.description = Chạy thẳng đến kẻ địch và tự hủy, gây ra vụ nổ lớn.
+unit.atrax.description = Phun tia xỉ nóng chảy gây suy nhược vào kẻ địch trên mặt đất. Có thể đi qua hầu hết loại địa hình.
+unit.spiroct.description = Bắn tia laser gây ăn mòn vào các mục tiêu kẻ địch trên mặt đất và tự sửa chữa chính nó. Có thể đi qua hầu hết loại địa hình.
+unit.arkyid.description = Bắn tia laser lớn gây ăn mòn vào các mục tiêu kẻ địch trên mặt đất và tự sửa chữa chính nó. Có thể đi qua hầu hết loại địa hình.
+unit.toxopid.description = Bắn chùm đạn điện và tia laser xuyên giáp vào các mục tiêu kẻ địch trên mặt đất. Có thể đi qua hầu hết loại địa hình.
+unit.flare.description = Bắn đạn tiêu chuẩn vào các mục tiêu kẻ địch trên mặt đất.
+unit.horizon.description = Thả chùm bom lên các mục tiêu kẻ địch trên mặt đất.
+unit.zenith.description = Bắn chùm tên lửa vào các mục tiêu kẻ địch.
+unit.antumbra.description = Bắn chùm đạn vào các mục tiêu kẻ địch.
+unit.eclipse.description = Bắn hai tia laser xuyên giáp và pháo chùm vào các mục tiêu kẻ địch.
+unit.mono.description = Tự động khai thác đồng và chì, vận chuyển vào lõi.
+unit.poly.description = Tự động xây dựng lại các công trình bị phá hủy và hỗ trợ các đơn vị khác thi công.
+unit.mega.description = Tự động sửa chữa các công trình bị h�ng. Có khả năng mang theo một số khối và đơn vị bộ binh nh�.
+unit.quad.description = Thả bom plasma to lên kẻ địch, sửa chữa các công trình và sát thương các mục kẻ địch trên mặt đất. Có khả năng mang theo đơn vị bộ binh cỡ trung.
+unit.oct.description = Bảo vệ đồng minh với lá chắn tự hồi phục. Có khả năng mang theo hầu hết các loại đơn vị bộ binh.
+unit.risso.description = Bắn chùm tên lửa và đạn vào các mục tiêu kẻ địch.
+unit.minke.description = Bắn chùm đạn và đạn tiêu chuẩn vào các mục tiêu kẻ địch trên mặt đất.
+unit.bryde.description = Bắn đạn tầm xa và tên lửa vào các mục tiêu kẻ địch.
+unit.sei.description = Bắn chùm tên lửa và đạn xuyên giáp vào các mục tiêu kẻ địch.
+unit.omura.description = Bắn đạn điện trư�ng xuyên giáp tầm xa vào các mục tiêu kẻ địch. Tạo ra các đơn vị Flare.
+unit.alpha.description = Bảo vệ lõi Cơ sở kh�i kẻ địch. Có thể xây dựng.
+unit.beta.description = Bảo vệ lõi Trụ sở kh�i kẻ địch. Có thể xây dựng.
+unit.gamma.description = Bảo vệ lõi Trung tâm kh�i kẻ địch. Có thể xây dựng.
+unit.retusa.description = Bắn ngư lôi dẫn đư�ng vào các mục tiêu kẻ địch. Sửa đơn vị đồng minh.
+unit.oxynoe.description = Bắn luồng tia lửa sửa công trình vào các mục tiêu kẻ địch. Nhắm vào viên đạn kẻ địch với bệ súng phòng thủ mũi nh�n.
+unit.cyerce.description = Bắn chùm tên lửa dẫn đư�ng vào các mục tiêu kẻ địch. Sửa đơn vị đồng minh.
+unit.aegires.description = Gây sốc lên tất cả đơn vị và công trình bên trong trư�ng năng lượng của nó. Sửa chữa tất cả đồng minh.
+unit.navanax.description = Bắn tia xung điện từ (EMP) nổ, gây thiệt hại đáng kể lên mạng lưới năng lượng và sửa chữa công trình đồng minh. Nung chảy kẻ địch ở gần với 4 bệ súng laser tự hành.
+
+#Erekir
+unit.stell.description = Bắn các viên đạn tiêu chuẩn vào các mục tiêu kẻ địch.
+unit.locus.description = Bắn các viên đạn xen kẽ vào các mục tiêu kẻ địch.
+unit.precept.description = Bắn các viên đạn phân cụm xuyên thấu vào các mục tiêu kẻ địch.
+unit.vanquish.description = Bắn các viên đạn phân chia xuyên thấu lớn vào các mục tiêu kẻ địch.
+unit.conquer.description = Bắn các viên đạn xếp tầng xuyên thấu vào các mục tiêu kẻ địch.
+unit.merui.description = Bắn pháo tầm xa vào các mục tiêu kẻ địch trên mặt đất. Có thể đi qua hầu hết loại địa hình.
+unit.cleroi.description = Bắn trái phá kép vào các mục tiêu kẻ địch. Nhắm vào viên đạn kẻ địch với các bệ súng phòng thủ mũi nh�n. Có thể đi qua hầu hết loại địa hình.
+unit.anthicus.description = Bắn tên lửa dẫn đư�ng tầm xa vào các mục tiêu kẻ địch. Có thể đi qua hầu hết loại địa hình.
+unit.tecta.description = Bắn tên lửa plasma dẫn đư�ng vào các mục tiêu kẻ địch. Tự bảo vệ chính nó với khiên định hướng. Có thể đi qua hầu hết loại địa hình.
+unit.collaris.description = Bắn pháo phân mảnh tầm xa vào các mục tiêu kẻ địch. Có thể đi qua hầu hết loại địa hình.
+unit.elude.description = Bắn một cặp viên đạn dẫn đư�ng vào các mục tiêu kẻ địch. Có thể lướt trên mặt chất l�ng.
+unit.avert.description = Bắn một cặp viên đạn xoắn vào các mục tiêu kẻ địch.
+unit.obviate.description = Bắn một cặp cầu điện xoắn vào các mục tiêu kẻ địch.
+unit.quell.description = Bắn tên lửa dẫn đư�ng tầm xa vào các mục tiêu kẻ địch. Ngăn chặn khối công trình sửa chữa của kẻ địch. Chỉ tấn công mục tiêu mặt đất.
+unit.disrupt.description = Bắn tên lửa oanh tạc dẫn đư�ng tầm xa vào các mục tiêu kẻ địch. Ngăn chặn khối công trình sửa chữa của kẻ địch. Chỉ tấn công mục tiêu mặt đất.
+unit.evoke.description = Xây công trình để phòng thủ lõi Pháo đài. Sửa các công trình với một tia sáng. Có khả năng mang khối công trình 2x2.
+unit.incite.description = Xây công trình để phòng thủ lõi Thủ phủ. Sửa các công trình với một tia sáng. Có khả năng mang khối công trình 2x2.
+unit.emanate.description = Xây công trình để phòng thủ lõi �ại đô. Sửa các công trình với chùm tia sáng. Có khả năng mang khối công trình 2x2.
+
+lst.read = ��c một số từ bộ nhớ được liên kết.
+lst.write = Ghi một số vào bộ nhớ được liên kết.
+lst.print = Thêm văn bản vào bộ đệm in.\nKhông hiển thị gì cho đến khi [accent]Print Flush[] được sử dụng.
+lst.printchar = Thêm một ký tự UTF-16 hoặc biểu tượng nội dung vào bộ đệm in.\nKhông hiển thị gì cho đến khi [accent]Print Flush[] được sử dụng.
+lst.format = Thay thế từ giữ chỗ tiếp theo trong bộ đệm văn bản bằng giá trị.\nKhông làm gì nếu khuôn mẫu từ giữ chỗ không hợp lệ.\nKhuôn mẫu từ giữ chỗ: "{[accent]số 0-9[]}"\nVí dụ:\n[accent]print "ví dụ {0}"\nformat "mẫu"
+lst.draw = Thêm một thao tác vào bộ đệm vẽ.\nKhông hiển thị gì cho đến khi [accent]Draw Flush[] được sử dụng.
+lst.drawflush = �ẩy các thao tác [accent]Draw[] theo trình tự đến màn hình.
+lst.printflush = �ẩy các thao tác [accent]Print[] theo trình tự đến khối thông điệp.
+lst.getlink = Nhận liên kết bộ xử lý theo chỉ số. Bắt đầu từ 0.
+lst.control = �i�u khiển một công trình.
+lst.radar = �ịnh vị các đơn vị trong phạm vi xung quanh một công trình.
+lst.sensor = Lấy dữ liệu từ một công trình hoặc đơn vị.
+lst.set = Thiết đặt một biến.
+lst.operation = Thực hiện một thao tác trên 1-2 biến.
+lst.end = Nhảy đến chỉ lệnh đầu tiên.
+lst.wait = Ch� trong số giây nhất định.
+lst.stop = Ngừng thực thi khối xử lý này.
+lst.lookup = Tra cứu một kiểu vật phẩm/chất l�ng/đơn vị/khối bởi định danh (ID).\nTổng số đếm của mỗi kiểu có thể truy xuất qua:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\n�ể thao tác ngược lại, dùng sense [accent]@id[] của vật thể đó.
+lst.jump = Nhảy có đi�u kiện qua lệnh khác.
+lst.unitbind = Gắn kết đơn vị tiếp theo của một kiểu, và lưu nó trong [accent]@unit[].
+lst.unitcontrol = �i�u khiển đơn vị đang gắn kết.
+lst.unitradar = Xác định đơn vị xung quanh đơn vị đang gắn kết.
+lst.unitlocate = Xác định một kiểu cố định của vị trí/công trình bất kỳ đâu trên bản đồ.\nYêu cầu một đơn vị đang gắn kết.
+lst.getblock = Lấy dữ liệu của ô tại vị trí bất kỳ.
+lst.setblock = Chỉnh sửa dữ liệu của ô tại vị trí bất kỳ.
+lst.spawnunit = Tạo ra đơn vị tại một vị trí.
+lst.applystatus = �p dụng hoặc loại b� một hiệu ứng trạng thái cho một đơn vị.
+lst.weathersense = Kiểm tra kiểu th�i tiết có đang hoạt động.
+lst.weatherset = Thiết lập trạng thái hiện tại của kiểu th�i tiết.
+lst.spawnwave = Làm xuất hiện một đợt.
+lst.explosion = Tạo ra một vụ nổ tại một vị trí.
+lst.setrate = �ặt tốc độ thực thi khối xử lý theo chỉ lệnh/tích-tắc.
+lst.fetch = Tra cứu các đơn vị, lõi, ngư�i chơi hoặc công trình bằng chỉ số.\nCác chỉ số bắt đầu từ 0 và kết thúc tại số lượng đếm của chúng.
+lst.packcolor = �óng gói màu thành phần RGBA [0, 1] thành một số đơn dùng cho vẽ hoặc thiết lập quy tắc.
+lst.setrule = Thiết đặt một quy tắc trò chơi.
+lst.flushmessage = Hiển thị một tin nhắn trên màn hình từ bộ đệm văn bản.\nNếu giá trị [accent]thành công[] (success) trả v� là [accent]@wait[],\nsẽ đợi cho đến khi tin nhắn trước đó hoàn tất.\nNgược lại, xuất ra liệu rằng tin nhắn đã hiển thị thành công.
+lst.cutscene = �i�u khiển máy quay của ngư�i chơi.
+lst.setflag = Thiết đặt một c� toàn cục mà có thể đ�c được bởi tất cả khối xử lý.
+lst.getflag = Kiểm tra nếu c� toàn cục được đặt.
+lst.setprop = Thiết đặt một thuộc tính của đơn vị hoặc công trình.
+lst.effect = Tạo một phần hiệu ứng nh�.
+lst.sync = �ồng bộ biến số qua mạng.\nChỉ g�i tối đa 20 lần mỗi giây cho mỗi biến.
+lst.playsound = Phát một âm thanh.\nÂm lượng và hướng xoay có thể là một giá trị toàn cục, hoặc được tính toán dựa vào vị trí.
+lst.makemarker = Tạo mới điểm đánh dấu logic trên thế giới.\nMột định danh cho điểm đánh dấu này phải được cung cấp.\n�iểm đánh dấu hiện tại bị giới hạn 20,000 trên mỗi thế giới.
+lst.setmarker = Thiết đặt một thuộc tính cho một điểm đánh dấu.\n�ịnh danh phải giống như định danh ở chỉ lệnh Tạo �iểm đánh dấu (Make Marker).\nGiá trị [accent]null[] sẽ bị phớt l�.
+lst.localeprint = Thêm một giá trị thuộc tính ngôn ngữ của bản đồ vào bộ đệm văn bản.\n�ể thiết đặt gói ngôn ngữ trong trình chỉnh sửa bản đồ, xem qua [accent]Thông tin bản đồ > Gói ngôn ngữ[].\nNếu máy khách là một thiết bị di động, sẽ cố in thuộc tính kết thúc bằng ".mobile" trước tiên.
+
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = Hằng số toán h�c pi (3.141...)
+lglobal.@e = Hằng số toán h�c e (2.718...)
+lglobal.@degToRad = Nhân với số này để chuyển từ độ (deg) sang radian (rad)
+lglobal.@radToDeg = Nhân với số này để chuyển từ radian (rad) sang độ (deg)
+
+lglobal.@time = Th�i gian chơi của bản lưu hiện tại, tính bằng mili-giây
+lglobal.@tick = Th�i gian chơi của bản lưu hiện tại, tính bằng tích-tắc (1 giây = 60 tích-tắc)
+lglobal.@second = Th�i gian chơi của bản lưu hiện tại, tính bằng giây
+lglobal.@minute = Th�i gian chơi của bản lưu hiện tại, tính bằng phút
+lglobal.@waveNumber = Số đợt hiện tại, nếu chế độ đợt được bật
+lglobal.@waveTime = Th�i gian đếm ngược của đợt, tính bằng giây
+lglobal.@mapw = �ộ rộng bản đồ, tính bằng ô
+lglobal.@maph = �ộ cao bản đồ, tính bằng ô
+
+lglobal.sectionMap = Bản đồ
+lglobal.sectionGeneral = Chung
+lglobal.sectionNetwork = Mạng/Máy khách [Chỉ Bộ xử lý thế giới]
+lglobal.sectionProcessor = Bộ xử lý
+lglobal.sectionLookup = Tra cứu
+
+lglobal.@this = Khối logic đang thực thi đoạn mã
+lglobal.@thisx = T�a độ x của khối đang thực thi đoạn mã
+lglobal.@thisy = T�a độ y của khối đang thực thi đoạn mã
+lglobal.@links = Tổng số khối đã liên kết đến bộ xử lý này
+lglobal.@ipt = Tốc độ thực thi của bộ xử lý tính bằng lệnh mỗi tích-tắc (60 tích-tắc = 1 giây)
+
+lglobal.@unitCount = Tổng số kiểu mẫu đơn vị trong trò chơi; được dùng với lệnh tra cứu (lookup)
+lglobal.@blockCount = Tổng số kiểu mẫu khối trong trò chơi; được dùng với lệnh tra cứu (lookup)
+lglobal.@itemCount = Tổng số kiểu mẫu vật phẩm trong trò chơi; được dùng với lệnh tra cứu (lookup)
+lglobal.@liquidCount = Tổng số kiểu mẫu chất l�ng trong trò chơi; được dùng với lệnh tra cứu (lookup)
+
+lglobal.@server = True nếu đoạn mã chạy trên máy chủ hoặc chơi đơn, ngược lại là false
+lglobal.@client = True nếu đoạn mã chạy trên máy khách được kết nối đến máy chủ
+
+lglobal.@clientLocale = Ngôn ngữ của máy khách đang chạy đoạn mã. Ví dụ: vi_VN
+lglobal.@clientUnit = �ơn vị máy khách đang chạy đoạn mã
+lglobal.@clientName = Tên ngư�i chơi của máy khách đang chạy đoạn mã
+lglobal.@clientTeam = �ịnh danh đội của máy khách đang chạy đoạn mã
+lglobal.@clientMobile = True nếu máy khách đang chạy đoạn mã trên thiết bị di động, ngược lại là false
+
+logic.nounitbuild = [red]Logic xây dựng đơn vị không được phép ở đây.
+
+lenum.type = Kiểu của công trình/đơn vị.\nVí dụ cho Bộ phân phát (router), nó sẽ trả v� [accent]@router[].\nKhông phải một chuỗi.
+lenum.shoot = Bắn vào một vị trí.
+lenum.shootp = Bắn vào một đơn vị/công trình với tốc độ dự đoán.
+lenum.config = Cấu hình công trình, kiểu như vật phẩm của Khối sắp xếp.
+lenum.enabled = Khối có đang hoạt động.
+
+laccess.currentammotype = �ạn vật phẩm/chất l�ng hiện tại của bệ súng.
+laccess.color = Màu đèn chiếu sáng.
+laccess.controller = Thứ đi�u khiển đơn vị. Nếu khối xử lý đã đi�u khiển, trả v� khối xử lý.\nNgược lại, trả v� chính đơn vị đó.
+laccess.dead = �ơn vị/công trình đã chết hoặc không còn hợp lệ hay không.
+laccess.controlled = Trả v�:\n[accent]@ctrlProcessor[] nếu đi�u khiển là khối xử lý\n[accent]@ctrlPlayer[] nếu đi�u khiển đơn vị/công trình là ngư�i chơi\n[accent]@ctrlCommand[] nếu đi�u khiển đơn vị là một mệnh lệnh ngư�i chơi\nNgược lại, 0.
+laccess.progress = Tiến trình thực hiện, 0 đến 1.\nTrả v� tiến trình sản xuất, nạp đạn bệ súng hoặc xây dựng.
+laccess.speed = Tốc độ cao nhất của đơn vị, tính bằng ô/giây.
+laccess.id = �ịnh danh của một đơn vị/khối/vật phẩm/chất l�ng.\nViệc này làm ngược lại với thao tác tra cứu.
+
+lcategory.unknown = Không xác định
+lcategory.unknown.description = Chỉ lệnh không được phân loại.
+lcategory.io = �ầu Vào & Ra
+lcategory.io.description = Chỉnh sửa nội dung của khối ô nhớ và bộ đệm khối xử lý.
+lcategory.block = �i�u khiển khối
+lcategory.block.description = Tương tác với khối.
+lcategory.operation = Các phép toán
+lcategory.operation.description = Các phép toán logic.
+lcategory.control = �i�u khiển luồng
+lcategory.control.description = Quản lý trình tự thực thi.
+lcategory.unit = �i�u khiển đơn vị
+lcategory.unit.description = Ra lệnh cho đơn vị.
+lcategory.world = Thế giới
+lcategory.world.description = Kiểm soát hành vi của thế giới.
+
+graphicstype.clear = Tô màu cho toàn màn hình.
+graphicstype.color = Thiết đặt màu cho thao tác vẽ tiếp theo.
+graphicstype.col = Tương tự màu, nhưng được đóng gói.\nMàu đã đóng gói được viết theo mã thập lục phân với ti�n tố [accent]%[].\nVí dụ: [accent]%ff0000[] sẽ là màu đ�.
+graphicstype.stroke = Thiết đặt chi�u rộng đoạn thẳng.
+graphicstype.line = Vẽ đoạn thẳng.
+graphicstype.rect = Tô một hình chữ nhật.
+graphicstype.linerect = Vẽ đư�ng vi�n một hình chữ nhật.
+graphicstype.poly = Tô một đa giác đ�u.
+graphicstype.linepoly = Vẽ đư�ng vi�n một đa giác đ�u.
+graphicstype.triangle = Tô một hình tam giác.
+graphicstype.image = Vẽ hình ảnh một số nội dung.\nVí dụ: [accent]@router[] hoặc [accent]@dagger[].
+graphicstype.print = Vẽ văn bản từ bộ đệm in.\nChỉ được phép dùng các kí tự ASCII.\nLàm sạch bộ đệm.
+
+lenum.always = Luôn đúng.
+lenum.idiv = Chia lấy phần nguyên.
+lenum.div = Phép chia.\nTrả v� [accent]rỗng (null)[] khi chia cho 0.
+lenum.mod = Chia lấy phần dư.
+lenum.equal = Bằng nhau. Ép kiểu.\n�ối tượng không-rỗng (non-null) so sánh với số sẽ thành 1, ngược lại là 0.
+lenum.notequal = Không bằng nhau. Ép kiểu.
+lenum.strictequal = Bằng nhau ràng buộc. Không ép kiểu.\nCó thể dùng để kiểm tra [accent]rỗng (null)[].
+lenum.shl = Nhảy bit sang trái.
+lenum.shr = Nhảy bit sang phải.
+lenum.or = Phép toán bit OR.
+lenum.land = Phép toán logic AND.
+lenum.and = Phép toán bit AND.
+lenum.not = Phép toán lật bit.
+lenum.xor = Phép toán bit XOR.
+
+lenum.min = Số nh� nhất giữa hai số.
+lenum.max = Số lớn nhất giữa hai số.
+lenum.angle = Góc của vectơ tính bằng độ.
+lenum.anglediff = Khoảng cách tuyệt đối giữa hai góc tính bằng độ.
+lenum.len = Chi�u dài của vectơ.
+
+lenum.sin = Sin, tính bằng độ.
+lenum.cos = Cos, tính bằng độ.
+lenum.tan = Tan, tính bằng độ.
+
+lenum.asin = Sin nghịch đảo, tính bằng độ.
+lenum.acos = Cos nghịch đảo, tính bằng độ.
+lenum.atan = Tan nghịch đảo, tính bằng độ.
+
+#not a typo, look up 'range notation'
+lenum.rand = Tạo ra số nguyên ngẫu nhiên trong phạm vi [0, giá trị).
+lenum.log = Lôgarit tự nhiên (ln).
+lenum.log10 = Lôgarit cơ số 10.
+lenum.noise = Nhiá»…u Ä‘Æ¡n 2D.
+lenum.abs = Giá trị tuyệt đối.
+lenum.sqrt = Căn bậc hai.
+
+lenum.any = �ơn vị bất kỳ.
+lenum.ally = �ơn vị đồng minh.
+lenum.attacker = �ơn vị với vũ khí.
+lenum.enemy = �ơn vị kẻ địch.
+lenum.boss = Trùm.
+lenum.flying = �ơn vị không quân.
+lenum.ground = �ơn vị bộ binh.
+lenum.player = �ơn vị do ngư�i chơi đi�u khiển.
+
+lenum.ore = M� quặng.
+lenum.damaged = Công trình bị hư tổn của đồng minh.
+lenum.spawn = �iểm xuất hiện của kẻ địch.\nCó thể là một lõi hoặc một vị trí.
+lenum.building = Công trình trong một nhóm nhất định.
+
+lenum.core = Bất kỳ lõi nào.
+lenum.storage = Khối lưu trữ, ví dụ như Nhà kho.
+lenum.generator = Khối tạo ra năng lượng.
+lenum.factory = Khối biến đổi vật phẩm.
+lenum.repair = �iểm sửa chữa.
+lenum.battery = Bất kỳ pin.
+lenum.resupply = �iểm tiếp tế.\nChỉ phù hợp khi [accent]"�ơn vị cần đạn"[] được bật.
+lenum.reactor = Lò phản ứng Thori/Nhiệt hạch.
+lenum.turret = Súng bất kỳ.
+
+sensor.in = Công trình/�ơn vị để cảm biến.
+
+radar.from = Công trình để cảm biến.\nPhạm vi cảm biến bị giới hạn bởi phạm vi của công trình.
+radar.target = Bộ l�c cho các đơn vị được cảm biến.
+radar.and = Bộ l�c bổ sung.
+radar.order = Sắp xếp theo thứ tự. 0 để đảo ngược.
+radar.sort = Số liệu để sắp xếp kết quả theo đó.
+radar.output = Biến để ghi đơn vị được xuất ra.
+
+unitradar.target = Bộ l�c cho các đơn vị được cảm biến.
+unitradar.and = Bộ l�c bổ sung.
+unitradar.order = Sắp xếp theo thứ tự. 0 để đảo ngược.
+unitradar.sort = Số liệu để sắp xếp kết quả theo đó.
+unitradar.output = Biến để ghi đơn vị được xuất ra.
+
+control.of = Công trình được đi�u khiển.
+control.unit = �ơn vị/Công trình để ngắm vào.
+control.shoot = Có bắn hay không.
+
+unitlocate.enemy = Có định vị công trình kẻ địch hay không.
+unitlocate.found = �ối tượng có tìm được hay không.
+unitlocate.building = Biến xuất ra cho công trình đã định vị.
+unitlocate.outx = T�a độ X xuất ra.
+unitlocate.outy = T�a độ Y xuất ra.
+unitlocate.group = Nhóm công trình để tìm kiếm.
+
+playsound.limit = Nếu [accent]true[], ngăn âm thanh này phát\nnếu nó đã phát trong chung một khung hình.
+
+lenum.idle = Không di chuyển, nhưng vẫn xây dựng/đào.\nTrạng thái mặc định.
+lenum.stop = Dừng di chuyển/đào/xây dựng.
+lenum.unbind = Vô hiệu hóa hoàn toàn đi�u khiển logic.\nKhôi phục AI tiêu chuẩn.
+lenum.move = Di chuyển đến vị trí xác định.
+lenum.approach = Tiếp cận một vị trí với bán kính.
+lenum.pathfind = Tìm đư�ng đến một vị trí xác định.
+lenum.autopathfind = Tự động tìm đư�ng đến lõi hoặc nơi hạ cánh gần nhất của kẻ địch.\nViệc này tương tự như việc tìm đư�ng của kẻ địch trong các đợt.
+lenum.target = Bắn vào một vị trí.
+lenum.targetp = Bắn vào một mục tiêu với tốc độ dự đoán.
+lenum.itemdrop = Thả một vật phẩm.
+lenum.itemtake = Lấy một vật phẩm từ một công trình.
+lenum.paydrop = Thả khối hàng hiện tại.
+lenum.paytake = Nhận khối hàng tại vị trí hiện tại.
+lenum.payenter = Vào trong/hạ cánh trên khối hàng mà đơn vị đang ở trên nó.
+lenum.flag = C� đơn vị kiểu số.
+lenum.mine = �ào tại một vị trí.
+lenum.build = Xây một công trình.
+lenum.getblock = Lấy kiểu công trình, n�n và khối tại t�a độ.\n�ơn vị phải nằm trong phạm vi của vị trí, ngược lại null được trả v�.
+lenum.within = Kiểm tra xem đơn vị có gần một vị trí không.
+lenum.boost = Bắt đầu/Dừng tăng tốc.
+
+lenum.flushtext = �ẩy nội dung của bộ đệm cho điểm đánh dấu, nếu có thể áp dụng.\nNếu [accent]fetch[] đặt là [accent]true[], sẽ cố truy vấn các thuộc tính từ gói ngôn ngữ của bản đồ hoặc trò chơi.
+lenum.texture = Tên kết cấu lấy thẳng từ bản khung kết cấu của trò chơi (dùng kiểu tên kebab-case, tên-chữ-thư�ng-chứa-gạch-nối).\nNếu printFlush đặt là true, sẽ sử dụng nội dung bộ đệm văn bản làm tham số văn bản.
+lenum.texturesize = Kích thước của kết cấu bằng ô. Giá trị 0 chia tỷ lệ chi�u rộng của điểm đánh dấu theo kích thước của kết cấu ban đầu.
+lenum.autoscale = Có chia tỷ lệ điểm đánh dấu tương ứng với mức thu phóng của ngư�i chơi hay không.
+lenum.posi = Vị trí theo chỉ số, dùng cho điểm đánh dấu đư�ng kẻ và tứ giác với 0 là vị trí đầu tiên.
+lenum.uvi = Vị trí của kết cấu trong phạm vi từ 0 đến 1, dùng cho đánh dấu tứ giác.
+lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đư�ng kẻ và tứ giác với 0 là màu đầu tiên.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 4e5074ae4c..03e8d4b12f 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -3,28 +3,28 @@ credits = 致谢
 contributors = 翻译者和贡献者
 discord = 加入 Mindustry 的 Discord�
 link.discord.description = Mindustry 官方的 Discord �天室
-link.reddit.description = Mindustry 的 reddit ��
+link.reddit.description = Mindustry 的 Reddit ��
 link.github.description = 游��代�
 link.changelog.description = 更新日志
 link.dev-builds.description = �稳定的开�版本
-link.trello.description = 官方列于 Trello 的功能计划表
+link.trello.description = 官方列于 Trello 的特性计划表
 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.suggestions.description = �出新特性的建议
+link.bug.description = �现了 Bug ？在这里报告
+linkopen = 这个�务器�您��了一�链接，你确定想�打开它�？\n\n[sky]{0}
 linkfail = 打开链接失败�\n网�已�制到您的剪贴�。
 screenshot = �幕截图已�存到 {0}
 screenshot.invalid = 地图太大，�能没有足够的内存用于截图。
 gameover = 游�结�
 gameover.disconnect = 断开连接
 gameover.pvp = [accent] {0}[]队获胜�
-gameover.waiting = [accent]正在更�下一张地图...
+gameover.waiting = [accent]正在更�下一张地图…
 highscore = [accent]新纪录�
 copied = 已�制
-indev.popup = [accent]6.0[]�在[accent]测试版[].\n[lightgray]这�味�:[]\n[scarlet]- 战役玩法完全没有完�[]\n- 很多内容还没有�完\n- 大多[scarlet]��AI[]无法正确地�行\n- ��系统完全没有完�\n- 一切您所看到的内容都�能会移除或调整。\n\n在[accent]Github[]�交错误报告。
 indev.notready = 这部分玩法还未开�完�。
-indev.campaign = [accent]�喜�您已�到达战役模�的结尾�[]\n\n这是目�内容的全部。 未�的更新中将添加行星际旅行。
 
 load.sound = 音�加载中
 load.map = 地图加载中
@@ -34,56 +34,81 @@ load.system = 系统加载中
 load.mod = 模组加载中
 load.scripts = 脚本加载中
 
-be.update = �现游�最新版本:
-be.update.confirm = 现在下载并��游�?
-be.updating = æ›´æ–°...
+be.update = �现游�最新BE版本：
+be.update.confirm = 现在下载并��游�？
+be.updating = 更新中…
 be.ignore = 忽略
 be.noupdates = 未�现更新。
 be.check = 检测更新
 
+mods.browser = 模组�览器
+mods.browser.selected = 已选模组
+mods.browser.add = 安装
+mods.browser.reinstall = �新安装
+mods.browser.view-releases = 查看版本
+mods.browser.noreleases = [scarlet]找�到任何版本\n[accent]未能找到该模组有任何版本。请检查这个模组的github仓库是�已��布了版本。
+mods.browser.latest = <最新>
+mods.browser.releases = 版本
+mods.github.open = 查看
+mods.github.open-release = �布页�
+mods.browser.sortdate = 按时间排�
+mods.browser.sortstars = 按星数排�
+
 schematic = �图
 schematic.add = �存�图…
 schematics = �图
-schematic.replace = 此�称的�图已存在，是�覆盖？
-schematic.exists = 此�称的�图已存在。
+schematic.search = 查找�图中…
+schematic.replace = 存在���图，是�覆盖？
+schematic.exists = 存在���图。
 schematic.import = 导入�图…
 schematic.exportfile = 导出文件
-schematic.importfile = 导入�图
+schematic.importfile = 从文件导入
 schematic.browseworkshop = �览创�工�
-schematic.copy = �制�图到剪贴�
-schematic.copy.import = 从剪贴�导入�图
-schematic.shareworkshop = 在创�工�上分享�图
+schematic.copy = �制到剪贴�
+schematic.copy.import = 从剪贴�导入
+schematic.shareworkshop = 在创�工�上分享
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]：翻转�图
 schematic.saved = �图已�存。
-schematic.delete.confirm = 确认删除�图？
-schematic.rename = �命��图
-schematic.info = {0}x{1}，{2} 个方�
-schematic.disabled = [scarlet]�图已�用�[]\n您�能在此[accent]地图[]或[accent]�务器[]上使用�图.
+schematic.delete.confirm = 确定删除�图？
+schematic.edit = Edit Schematic
+schematic.info = {0}x{1}，{2} 个建筑
+schematic.disabled = [scarlet]�图已�用�[]\n您�能在此[accent]地图[]或[accent]�务器[]上使用�图。
+schematic.tags = 标签：
+schematic.edittags = 编辑标签
+schematic.addtag = 添加新标签
+schematic.texttag = 文字标签
+schematic.icontag = 图标标签
+schematic.renametag = �命�标签
+schematic.tagged = {0} tagged
+schematic.tagdelconfirm = 确定�完全删除这个标签�？
+schematic.tagexists = 此标签已�存在。
 
 stats = 统计资料
-stat.wave = 防守波数：[accent]{0}
-stat.enemiesDestroyed = 消�敌人：[accent]{0}
-stat.built = 建造建筑：[accent]{0}
-stat.destroyed = 摧�建筑：[accent]{0}
-stat.deconstructed = 拆除建筑：[accent]{0}
-stat.delivered = 装�资�：
-stat.playtime = 游玩时间：[accent] {0}
-stat.rank = 最终评级：[accent]{0}
+stats.wave = 防守波数
+stats.unitsCreated = 生产��
+stats.enemiesDestroyed = 消�敌人
+stats.built = 建造建筑
+stats.destroyed = 摧�建筑
+stats.deconstructed = 拆除建筑
+stats.playtime = 游玩时间
 
-globalitems = [accent]全局物�
-map.delete = 确定�删除“[accent]{0}[]�地图�？
+globalitems = [accent]行星物�
+map.delete = 确定�删除地图“[accent]{0}[]��？
 level.highscore = 最高分：[accent]{0}
 level.select = 选择关�
 level.mode = 游�模�：
-coreattack = < 核心正在�到攻击�>
+coreattack = < 核心正在�到攻击� >
 nearpoint = [[ [scarlet]立�离开敌人出生点[] ]\n摧�在�
 database = 核心数�库
+database.button = 数�库
 savegame = �存游�
 loadgame = 载入游�
 joingame = 加入游�
 customgame = 自定义游�
 newgame = 新游�
 none = <æ— >
+none.found = [lightgray]<未�现>
+none.inmap = [lightgray]<此地图中未�现>
 minimap = �地图
 position = �置
 close = 关闭
@@ -101,200 +126,272 @@ preparingcontent = 正在准备内容
 uploadingcontent = 正在上传内容
 uploadingpreviewfile = 正在上传预览文件
 committingchanges = 正在�交更改
-done = 已完�
-feature.unsupported = 您的设备�支�此功能。
+done = 完�
+feature.unsupported = 您的设备�支�此特性。
 
-mods.alphainfo = 请注�，测试版本中的模组[scarlet]很容易存在缺陷[]。\n在 Mindustry 的 GitHub 或 Discord 上报告你�现的问题。
+mods.initfailed = [red]⚠[]Mindustry的上一次�动失败了，�能是异常的模组导致的。 \n\n为了防止连续崩溃，[red]所有模组都被�用了。[]
 mods = 模组
 mods.none = [lightgray]没有找到模组�
 mods.guide = 模组制作教程
 mods.report = 报告 Bug
 mods.openfolder = 打开模组文件夹
-mods.reload = �载
-mods.reloadexit = 游�将退出以�载模组。
-mod.display = [gray]模组：[orange] {0}
+mods.viewcontent = 查看内容
+mods.reload = �新加载
+mods.reloadexit = 游�将退出以�新加载模组。
+mod.installed = [[已安装]
+mod.display = [gray]模组：[orange]{0}
 mod.enabled = [lightgray]已�用
-mod.disabled = [scarlet]已�用
+mod.disabled = [scarlet]未�用
+mod.multiplayer.compatible = [gray]多人游�兼容性
 mod.disable = �用
+mod.version = Version:
 mod.content = 内容：
-mod.delete.error = 无法删除模组。�能文件被�用。
-mod.requiresversion = [scarlet]所需的游�版本：[accent]{0}
-mod.outdated = [scarlet]该模组�能�能在6.0上正确地�行(缺失 minGameVersion: 105)
-mod.missingdependencies = [scarlet]缺少�置模组：{0}
+mod.delete.error = 无法删除模组。 文件�能正被�用。
+
+mod.incompatiblegame = [red]游�版本过低
+mod.incompatiblemod = [red]�兼容
+mod.blacklisted = [red]�支�
+mod.unmetdependencies = [red]缺少�置模组
 mod.erroredcontent = [scarlet]内容错误
-mod.errors = 读�内容时�生错误.
-mod.noerrorplay = [scarlet]你的模组�生了错误.[] �用相关模组或修�错误��能进入游�.
-mod.nowdisabled = [scarlet]“{0}�模组缺少�赖�件：[accent] {1}\n[lightgray]需�先下载上述模组。\n此模组现在将自动�用。
+mod.circulardependencies = [red]循环�赖
+mod.incompletedependencies = [red]缺失�赖
+
+mod.requiresversion.details = 所需的最低游�版本：[accent]{0}[]\n您的游�版本过低。 此模组需�更新的游�版本（通常是beta/alpha版本）�能工作。
+mod.outdatedv7.details = 此模组与最新版游��兼容。 作者必须更新它，并在[accent]mod.json[]文件中写入[accent]minGameVersion: 136[]。
+mod.blacklisted.details = 此模组由于造�该版本游�崩溃或其他原因被手动�用了。 ��使用它。
+mod.missingdependencies.details = 缺少�置模组：{0}
+mod.erroredcontent.details = 此模组在游�加载时�生了错误。 请通知模组作者修�它。
+mod.circulardependencies.details = 此模组与其他模组相互�赖。
+mod.incompletedependencies.details = 由于�赖项无效或缺失，此模组无法加载：{0}.
+mod.requiresversion = 需�游�版本: [red]{0}
+
+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.jarwarn = [scarlet]JAR模组注定存在�险性。[]\n请确�此模组��安全���
-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.scripts.disable = 您的设备�支��有脚本的模组。必须�用相关模组以进入游�。
+mod.author = [lightgray]作者：[]{0}
+mod.missing = 此存档包�您最近更新或者尚未安装的模组，加载�能会导致存档��。 确定�加载�？\n[lightgray]模组：\n{0}
+mod.preview.missing = 在创�工�中�布此模组�，您必须添加一张预览图片。 \n请将�为[accent]preview.png[]的图片放入模组文件夹，然��试。
+mod.folder.missing = �有文件夹形�的模组能在创�工�上�布。 \n�将模组转�为文件夹，�需将其文件解压缩到文件夹中并删除压缩包，然��新�动游�或�新加载模组。
+mod.scripts.disable = 您的设备�支��有脚本的模组，必须�用相关模组�能进入游�。
 
 about.button = 关于
 name = �字：
-noname = 先�一个[accent]玩家�[]。
+noname = 先�一个[accent]玩家�称[]。
+search = �索:
 planetmap = 行星地图
 launchcore = �射核心
 filename = 文件�：
 unlocked = 解�了新内容�
+available = �研究新科技�
+unlock.incampaign = < 在战役中解�以显示详情 >
+campaign.select = 选择战役出�点
+campaign.none = [lightgray]选择�始星�。\n�以在任�时刻切�。
+campaign.erekir = 更新，更精致的内容。 战役大部分是线性的。\n\n难度更高，但地图质�与整体体验也更好。
+campaign.serpulo = 较旧的内容； �典的体验。 更加开放，且内容更丰富。\n\n地图与战役机制�能�平衡。 更�完美。
+campaign.difficulty = Difficulty
 completed = [accent]己研究
 techtree = 科技树
+techtree.select = 切�科技树
+techtree.serpulo = 塞普罗
+techtree.erekir = 埃里克尔
+research.load = 加载
+research.discard = 丢弃
 research.list = [lightgray]研究：
 research = 研究
 researched = [lightgray]{0}己研究。
-research.progress = {0}% 完�度
-players = {0} �玩家在线
-players.single = {0} �玩家在线
-players.search = 研究
+research.progress = {0}%完�度
+players = {0}�玩家在线
+players.single = {0}�玩家在线
+players.search = �索
 players.notfound = [gray]没有找到玩家。
-server.closing = [accent]�务器关闭…
-server.kicked.kick = 你被踢出了�务器。
-server.kicked.whitelist = 你�在�务器白��中。
+server.closing = [accent]关闭�务器…
+server.kicked.kick = 您被踢出了�务器。
+server.kicked.whitelist = 您�在�务器的白��中。
 server.kicked.serverClose = �务器已关闭。
 server.kicked.vote = 您被投票踢出了�务器。
-server.kicked.clientOutdated = 客户端过旧，请更新你的游�。
-server.kicked.serverOutdated = �务器过旧，请�系�务器管�员�级�务器。
+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.nameEmpty = 无效的�字�
-server.kicked.idInUse = 您已�连接了这个�务器���许在一�设备上用两个客户端连接。
-server.kicked.customClient = 这个�务器�支�自定义客户端。请下载官方版本。
+server.kicked.recentKick = 您最近被踢出过�务器。 \n请���新连接�
+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] Wi-Fi 或本地网络[]下的人应该都�以在�务器列表中看到你的�务器。\n\n如果你想让别人在任何地方都能通过 IP 地�连接，你需�设定[accent]端�转�[]。\n\n[lightgray]注�：如果�人无法连接到你的局域网游�，请确�你在防�墙设置里�许了 Mindustry 访问本地网络。
-join.info = 您�以输入[accent]�务器的 IP 地�[]�连接，或寻找[accent]本地网络[]中的�务器�连接。\n支�局域网或广域网的多人游�。\n\n[lightgray]注�：没有全��务器列表；如果你想通过 IP 地�连接�个�务器，你需���主询问 IP 地�。
-hostserver = 创建�务器
-invitefriends = 邀请朋�
-hostserver.mobile = 创建\n�务器
+server.kicked.serverRestarting = �务器正在��。
+server.versions = 客户端版本：[accent]{0}[]\n�务器版本：[accent]{1}[]
+host.info = [accent]创建[]按钮会在[scarlet]6567 []端��动一个�务器。 []\n�一个[lightgray]Wi-Fi或局域网[]下的玩家，在�务器列表中都应该能看到您的�务器。 \n\n如果您想让别人从任何地方通过IP地�连接，需�设定[accent]端�转�[]。 \n\n[lightgray]注�：如果�人无法连接到您的局域网游�，请确�在防�墙里设置了�许Mindustry访问本地网络。 注�公有网络有时�能��许�务器�现。
+join.info = 您�以输入[accent]�务器的IP地�[]，也�以寻找[accent]局域网[]或[accent]全局[]中的�务器�连接。 \n支�局域网或广域网的多人游�。 \n\n[lightgray]如果您想通过IP地�连接�个�务器，需���务器建立者询问他的IP地�。 �以在�务器所在的设备上百度“IP地���获�。
+hostserver = 创建多人游�
+invitefriends = 邀请好�
+hostserver.mobile = 创建多人游�
 host = 创建
-hosting = [accent]正在开��务器…
+hosting = [accent]正在�动�务器…
 hosts.refresh = 刷新
 hosts.discovering = 正在�索局域网�务器
 hosts.discovering.any = 正在�索�务器
 server.refreshing = 正在刷新�务器
-hosts.none = [lightgray]未�现局域网游��
+hosts.none = [lightgray]未�现局域网�务器�
 host.invalid = [scarlet]无法连接�务器。
 
 servers.local = 本地�务器
+servers.local.steam = 公开游�与本地�务器
 servers.remote = 远程�务器
-servers.global = 全��务器
+servers.global = 社区�务器
 
+servers.disclaimer = 社区�务器[accent]并�[]由开�者拥有或管�。 \n\n其中�能有其他玩家制作的，�适�所有年龄段的内容。
 servers.showhidden = 显示��的�务器
 server.shown = 显示
 server.hidden = ��
 
+viewplayer = 查看玩家: [accent]{0}
 trace = 跟踪玩家
 trace.playername = 玩家�称：[accent]{0}
-trace.ip = IP 地�：[accent]{0}
-trace.id = 唯一的 ID：[accent]{0}
+trace.ip = IP地�：[accent]{0}
+trace.id = 玩家 ID：[accent]{0}
+trace.language = 语言: [accent]{0}
 trace.mobile = 移动客户端：[accent]{0}
 trace.modclient = 自定义客户端：[accent]{0}
-invalidid = 无效的客户端 ID��交一个错误报告。
+trace.times.joined = 进入�务器次数: [accent]{0}
+trace.times.kicked = 踢出�务器次数: [accent]{0}
+trace.ips = 曾用IP:
+trace.names = 曾用�:
+invalidid = 无效的客户端ID��交一个错误报告。
+player.ban = ��
+player.kick = 踢出
+player.trace = 追朔
+player.admin = 切�管�员
+player.team = 改�队�
 server.bans = 黑��
 server.bans.none = 没有被��的玩家�
 server.admins = 管�员
-server.admins.none = 该�务器没有管�员�
+server.admins.none = 没有管�员�
 server.add = 添加�务器
 server.delete = 您确定�删除这个�务器�？
 server.edit = 编辑�务器
-server.outdated = [crimson]�务器过旧�[]
-server.outdated.client = [crimson]客户端过旧�[]
-server.version = [lightgray]版本：{0} {1}
-server.custombuild = [accent]自定义
-confirmban = 确认��这�玩家？
-confirmkick = 确定踢出这�玩家？
-confirmvotekick = 确定投票踢出这�玩家？
-confirmunban = 确定�消��这�玩家？
-confirmadmin = 确定给予这�玩家管�员��？
-confirmunadmin = 确定�消这�玩家的管�员��？
+server.outdated = [scarlet]�务器版本过低�[]
+server.outdated.client = [scarlet]客户端版本过低�[]
+server.version = [gray]版本：{0} {1}
+server.custombuild = [accent]自行编译
+confirmban = 确定��玩家“{0}[white]�？
+confirmkick = 确定踢出玩家“{0}[white]�？
+confirmunban = 确定解�这�玩家？
+confirmadmin = 确定给予玩家“{0}[white]�管�员��？
+confirmunadmin = 确定收回玩家“{0}[white]�的管�员��？
+votekick.reason = 投票踢出�由
+votekick.reason.message = 确定投票踢出玩家"{0}[white]"?\n如果是，请输入�由：
 joingame.title = 加入游�
 joingame.ip = 地�：
-disconnect = 已断开
+disconnect = 已断开连接
 disconnect.error = 连接错误。
 disconnect.closed = 连接关闭。
 disconnect.timeout = 连接超时。
-disconnect.data = 读��务器数�失败�
-cantconnect = 无法加入([accent]{0}[])。
+disconnect.data = 地图加载失败�
+disconnect.snapshottimeout = 接收 UDP 快照时超时。\n这�能是由�稳定的网络或连接引起的。
+cantconnect = 无法加入游�（[accent]{0}[]）。
 connecting = [accent]连接中…
-connecting.data = [accent]加载中…
+reconnecting = [accent]�新连接中…
+connecting.data = [accent]地图加载中…
 server.port = 端�：
-server.addressinuse = 地�已在使用�
 server.invalidport = 无效的端��
-server.error = [crimson]创建�务器错误：[accent]{0}
+server.error.addressinuse = [scarlet]无法在端� 6567 上打开�务器。[]\n\n确�您的设备或网络上没有其他 Mindustry �务器正在�行�
+server.error = [scarlet]创建�务器错误。
 save.new = 新存档
-save.overwrite = 您确定�覆盖这个存档�？
+save.overwrite = 确定�覆盖这个存档�？
+save.nocampaign = 无法导入战役中的�个�存文件。
 overwrite = 覆盖
 save.none = 没有找到存档�
 savefail = �存失败�
-save.delete.confirm = 您确定�删除这个存档�？
+save.delete.confirm = 确定�删除这个存档�？
 save.delete = 删除
 save.export = 导出存档
-save.import.invalid = [accent]此存档无效�
-save.import.fail = [crimson]导入存档失败：[accent]{0}
-save.export.fail = [crimson]导出存档失败：[accent]{0}
+save.import.invalid = [accent]存档无效�
+save.import.fail = [scarlet]导入存档失败：[accent]{0}
+save.export.fail = [scarlet]导出存档失败：[accent]{0}
 save.import = 导入存档
-save.newslot = �存的�称：
+save.newslot = 存档�称：
 save.rename = �命�
 save.rename.text = 新�称：
 selectslot = 选择一个存档。
-slot = [accent]存档� {0}
+slot = [accent]存档�{0}
 editmessage = 编辑消�
-save.corrupted = [accent]存档��或无效�\n如果您刚刚�级了游�，那么这�能是因为存档格�改�了，而[scarlet]�是[] bug 。
+save.corrupted = 存档��或无效�
 empty = < 空 >
 on = å¼€
 off = å…³
+save.search = �索已�存的游�…
 save.autosave = 自动�存：{0}
 save.map = 地图：{0}
 save.wave = 波次：{0}
-save.mode = 模�：{0}
+save.mode = 游�模�：{0}
 save.date = 最��存：{0}
 save.playtime = 游�时间：{0}
 warning = 警告�
-confirm = 确认
+confirm = 确定
 delete = 删除
 view.workshop = �览创�工�
 workshop.listing = 编辑创�工�目录
 ok = 确定
 open = 打开
-customize = 自定义
+customize = 自定义规则
 cancel = �消
+command = 指挥
+command.queue = [lightgray][排队中]
+command.mine = 挖矿
+command.repair = ç»´ä¿®
+command.rebuild = �建
+command.assist = �助建造
+command.move = 移动
+command.boost = 助推
+command.enterPayload = 进入载�建筑
+command.loadUnits = 拾���
+command.loadBlocks = 拾�建筑
+command.unloadPayload = �载载�
+command.loopPayload = Loop Unit Transfer
+stance.stop = �消指令
+stance.shoot = 姿�: 射击
+stance.holdfire = 姿�: ��
+stance.pursuetarget = 姿�: 追�目标
+stance.patrol = 姿�: 路径巡逻
+stance.ram = 姿�: 冲锋\n[lightgray]径直移动，�进行寻路。
 openlink = 打开链接
 copylink = �制链接
 back = 返回
+max = 最大值
+objective = 任务目标
 crash.export = 导出崩溃日志
-crash.none = 找�到崩溃日志。
+crash.none = 未找到崩溃日志。
 crash.exported = 崩溃日志已导出。
 data.export = 导出数�
 data.import = 导入数�
 data.openfolder = 打开数�文件夹
 data.exported = 数�已导出。
-data.invalid = �有效游�数�。
-data.import.confirm = 导入外部游�数�将覆盖本地[scarlet]全部[]的游�数�。\n[accent]此�作无法撤销�[]\n\n数�导入�将自动退出游�。
+data.invalid = 游�数�无效。
+data.import.confirm = 导入外部游�数�将覆盖本地[scarlet]全部[]的游�数�。 \n[accent]此�作无法撤销�[]\n\n数�导入�将自动退出游�。
 quit.confirm = 确定退出？
-quit.confirm.tutorial = 确定�跳过教程？\n您�以通过[accent]设置->游�->�玩教程[]��玩教程。
 loading = [accent]加载中…
-reloading = [accent]�载模组中…
+downloading = [accent]下载中…
 saving = [accent]�存中…
-respawn = [accent][[{0}][]��生
-cancelbuilding = [accent][[{0}][]�清除规划
-selectschematic = [accent][[{0}][]�选择�制
-pausebuilding = [accent][[{0}][]�暂�建造
-resumebuilding = [scarlet][[{0}][]���建造
-showui = UI已��\n按[accent][[{0}][]显示UI
+respawn = 按[accent][[{0}][]键�生
+cancelbuilding = 按[accent][[{0}][]键清除规划
+selectschematic = 按�[accent][[{0}][]键选择�制
+pausebuilding = 按[accent][[{0}][]键暂�建造
+resumebuilding = 按[scarlet][[{0}][]键��建造
+enablebuilding = 按[scarlet][[{0}][]键�用建造
+showui = UI已��\n按[accent][[{0}][]键显示UI
+commandmode.name = [accent]指挥模�
+commandmode.nounits = [无��]
 wave = [accent]第{0}波
 wave.cap = [accent]波次 {0}/{1}
 wave.waiting = [lightgray]下一波倒计时：{0}秒
@@ -302,8 +399,8 @@ wave.waveInProgress = [lightgray]波次袭�
 waiting = [lightgray]等待中…
 waiting.players = 等待玩家中…
 wave.enemies = [lightgray]剩余 {0} 个敌人
-wave.enemycores = [accent]{0}[lightgray] 敌人核心
-wave.enemycore = [accent]{0}[lightgray] 敌人核心
+wave.enemycores = [accent]{0}[lightgray] 敌方核心
+wave.enemycore = [accent]{0}[lightgray] 敌方核心
 wave.enemy = [lightgray]剩余 {0} 个敌人
 wave.guardianwarn = Boss 将在[accent]{0}[]波�到�。
 wave.guardianwarn.one = Boss 将在[accent]{0}[]波�到�。
@@ -311,258 +408,412 @@ loadimage = 加载图片
 saveimage = �存图片
 unknown = 未知
 custom = 自定义
-builtin = 内置的
-map.delete.confirm = 您确定你想�删除这张地图�？这个�作无法撤销�
+builtin = 内置
+map.delete.confirm = 您确定�删除这张地图�？这个�作无法撤销�
 map.random = [accent]�机地图
-map.nospawn = 这个地图没有核心�请在编辑器中添加一个[royal]己方[]的核心。
-map.nospawn.pvp = 这个地图没有敌人的核心�请在编辑器中添加一个[royal]敌人[]的核心。
-map.nospawn.attack = 这个地图没有敌人的核心�请在编辑中�地图添加一个[scarlet]敌人[]的核心。
+map.nospawn = 这个地图缺少己方核心�请在地图编辑器中添加一个{0}队的核心。
+map.nospawn.pvp = 这个地图缺少对方核心�请在地图编辑器中添加一个[scarlet]除黄队以外[]的核心。
+map.nospawn.attack = 这个地图缺少敌方核心�请在地图编辑器中添加一个{0}队的核心。
 map.invalid = 地图载入错误：地图文件�能已���。
-workshop.update = 更新地图
+workshop.update = 更新内容
 workshop.error = 获�创�工�详细信�时出错：{0}
-map.publish.confirm = 确定上传此地图？\n\n[lightgray]确定你�� Steam 创�工�的最终用户许��议，�则你的地图将�会被展示�
-workshop.menu = 选择此项目的目的。
+map.publish.confirm = 确定上传此地图？\n\n[lightgray]确定您��Steam创�工�的最终用户许��议，�则您的地图将无法展示�
+workshop.menu = 选择�对此项目进行的�作。
 workshop.info = 项目信�
 changelog = 更新日志（�选）：
-eula = Steam 最终用户许��议
-missing = 此项目已被删除或转移。\n[lightgray]链接已在创�工�中被删除。
-publishing = [accent]正在�布...
-publish.confirm = 确定�布？\n\n[lightgray]请确认您已���创�工�的最终用户许��议，�则您的项目�会展示�
-publish.error = �布项目出错：{0}
-steam.error = �始化 Steam �务失败。\n错误：{0}
+updatedesc = 覆盖标题和�述
+eula = Steam最终用户许��议
+missing = 此项目已被删除或转移。 \n[lightgray]链接已在创�工�中被删除。
+publishing = [accent]正在�布…
+publish.confirm = 确定�布？\n\n[lightgray]请确认您��创�工�的最终用户许��议，�则您的项目无法展示�
+publish.error = �布项目时出错：{0}
+steam.error = �始化Steam�务失败。 \n错误：{0}
 
-editor.brush = 笔刷
-editor.openin = 在编辑器中打开
-editor.oregen = 矿石的生�
-editor.oregen.info = 矿石的生�：
+editor.planet = 星�:
+editor.sector = 区�:
+editor.seed = ��:
+editor.cliffs = 所有墙�\n替�为悬崖
+editor.brush = 笔触大�
+editor.openin = 用地图编辑器打开
+editor.oregen = 矿脉的生�
+editor.oregen.info = 矿脉的生�：
 editor.mapinfo = 地图信�
 editor.author = 作者：
 editor.description = �述：
-editor.nodescription = 地图�布�，�述�得少于4个字符。
-editor.waves = 波数：
-editor.rules = 规则：
-editor.generation = 筛选器：
+editor.nodescription = 地图需�至少4个字符的�述�能�布。
+editor.waves = 波次
+editor.rules = 规则
+editor.generation = 生�
+editor.objectives = 目标
+editor.locales = 本地化语言包
+editor.worldprocessors = 世界处�器
+editor.worldprocessors.editname = 命�
+editor.worldprocessors.none = [lightgray]未找到世界处�器�\n请在地图编辑器中添加或使用下方的\ue813 添加按钮。
+editor.worldprocessors.nospace = 没有足够空间放置世界处�器�\n您是�在地图上布满了建筑？为什么�这样�？
+editor.worldprocessors.delete.confirm = 你确定�删除这个世界处�器�？\n\n如果其周围有环境墙体，将由环境墙体�代。
 editor.ingame = 游�内编辑
+editor.playtest = 游�内测试
 editor.publish.workshop = 上传到创�工�
 editor.newmap = 新地图
 editor.center = 居中
+editor.search = �索地图…
+editor.filters = 筛选地图
+editor.filters.mode = 游�模�：
+editor.filters.type = 地图类型：
+editor.filters.search = 在特定关键�中进行�索：
+editor.filters.author = 作者
+editor.filters.description = �述
+editor.shiftx = x轴平移
+editor.shifty = y轴平移
 workshop = 创�工�
-waves.title = 波数
+waves.title = 波次
 waves.remove = 移除
-waves.never = < 无� >
 waves.every = �
 waves.waves = æ³¢
-waves.perspawn = �次生�
+waves.health = 生命值: {0}%
+waves.perspawn = �波
 waves.shields = 护盾/波
 waves.to = 至
+waves.spawn = 出生点:
+waves.spawn.all = <全部>
+waves.spawn.select = 出生点选择
+waves.spawn.none = [scarlet]地图上没有出生点
+waves.max = 最大��数
 waves.guardian = Boss
 waves.preview = 预览
 waves.edit = 编辑…
+waves.random = �机
 waves.copy = �制到剪贴�
 waves.load = 从剪贴�读�
 waves.invalid = 剪贴�中的波次信�无效。
 waves.copied = 波次信�已�制。
-waves.none = 没有定义敌人。\n请注�，这将自动替�为默认的敌人列表。
+waves.none = 没有定义敌人波次。 \n注�，这将自动替�为默认的波次列表。
+waves.sort = 排�方�
+waves.sort.reverse = ��排�
+waves.sort.begin = 出场顺�
+waves.sort.health = 生命值
+waves.sort.type = 类型
+waves.search = �索波次...
+waves.filter = ��过滤器
+waves.units.hide = 全部��
+waves.units.show = 全部显示
 
 #these are intentionally in lower case
 wavemode.counts = æ•°ç›®
-wavemode.totals = 总和
+wavemode.totals = 总数
 wavemode.health = 生命值
+all = All
 
 editor.default = [lightgray]<默认>
 details = 详情…
 edit = 编辑…
+variables = ��
+logic.clear.confirm = 您确定�清除该处�器的所有代��？
+logic.globals = 内置��
 editor.name = �称：
 editor.spawn = 生���
 editor.removeunit = 移除��
 editor.teams = 队�
-editor.errorload = 读�文件出错：\n[accent]{0}
-editor.errorsave = �存文件出错：\n[accent]{0}
-editor.errorimage = 这是一幅图片，�是地图。请��更改文件的扩展��导入。\n\n如果您想导入地图，请在编辑器中使用“导入地图�按钮。
+editor.errorload = 读�文件出错。
+editor.errorsave = �存文件出错。
+editor.errorimage = 这是一幅图片，而�是地图。
 editor.errorlegacy = 此地图太旧了，旧的地图格�已��支�。
 editor.errornot = 这�是地图文件。
 editor.errorheader = 此地图文件无效或已��。
-editor.errorname = 地图没有定义�称。是��加载一个存档文件？
+editor.errorname = 地图没有定义�称。 加载的�能是存档文件？
+editor.errorlocales = 读�无效本地化语言包时出错。
 editor.update = æ›´æ–°
-editor.randomize = �机化
+editor.randomize = �新生�
+editor.moveup = 上移
+editor.movedown = 下移
+editor.copy = �制
 editor.apply = 应用
-editor.generate = 生�
-editor.resize = 调整大�
+editor.generate = 自动生�
+editor.sectorgenerate = 生�区�
+editor.resize = 改�尺寸
 editor.loadmap = 载入地图
 editor.savemap = �存地图
+editor.savechanges = [scarlet]您有未�存的更改�\n\n[]您想��存他们�？
 editor.saved = 已�存�
-editor.save.noname = 您的地图没有�字�在“地图信����里设置一个。
-editor.save.overwrite = 您的地图覆盖了一个内置的地图�在“地图信����里�新设置一个��的�称。
+editor.save.noname = 您还没有指定地图的�称�在“地图信����里设置一个�称。
+editor.save.overwrite = 您正试图覆盖一张内置地图�在“地图信����里�新设置一个其他的�称。
 editor.import.exists = [scarlet]无法导入：[]存在�为“{0}�的内置地图�
 editor.import = 导入…
-editor.importmap = 导入地图
-editor.importmap.description = 导入一个已�存在的地图
+editor.importmap = 加载地图
+editor.importmap.description = 加载一张已�存在的地图
 editor.importfile = 导入文件
-editor.importfile.description = 导入一个外置的地图文件
-editor.importimage = 导入地形图�
-editor.importimage.description = 导入一个外置的地图图�文件
+editor.importfile.description = 从游�外导入一个地图文件
+editor.importimage = 导入图片
+editor.importimage.description = 从游�外导入一个地图图片文件
 editor.export = 导出…
 editor.exportfile = 导出文件
 editor.exportfile.description = 导出一个地图文件
-editor.exportimage = 导出一个地形文件
-editor.exportimage.description = 导出一个地图图�文件
+editor.exportimage = 导出地形图片
+editor.exportimage.description = 将地形导出为一个图片文件
 editor.loadimage = 导入地形
 editor.saveimage = 导出地形
-editor.unsaved = [scarlet]更改未�存�[]\n确定退出？
-editor.resizemap = 调整地图大�
+editor.unsaved = 确定退出？\n[scarlet]未�存的更改将会丢失�
+editor.resizemap = 改�地图尺寸
 editor.mapname = 地图�称：
 editor.overwrite = [accent]警告�\n这将会覆盖一个已�存在的地图。
-editor.overwrite.confirm = [scarlet]警告�[]存在��地图。你确定你想�覆盖？
-editor.exists = 已�存在��地图。
-editor.selectmap = 选择一个地图加载：
+editor.overwrite.confirm = [scarlet]警告�[]存在��地图。 �覆盖�？\n"[accent]{0}[]"
+editor.exists = 存在��地图。
+editor.selectmap = 加载一张地图：
 
-toolmode.replace = 替�
-toolmode.replace.description = 仅在实心�上绘制。
+toolmode.replace = 墙�替�
+toolmode.replace.description = 仅在墙�上绘制墙�。
 toolmode.replaceall = 全部替�
-toolmode.replaceall.description = 替�地图中的所有方�。
-toolmode.orthogonal = 正交线
-toolmode.orthogonal.description = �绘制正交线。
+toolmode.replaceall.description = 替�地图中所有�类地形。
+toolmode.orthogonal = 水平/垂直线
+toolmode.orthogonal.description = �绘制水平/垂直线。
 toolmode.square = 方形
-toolmode.square.description = 方形刷�
-toolmode.eraseores = 清除矿石
-toolmode.eraseores.description = �清除矿石。
-toolmode.fillteams = 填充团队
-toolmode.fillteams.description = 填充团队而�是方�。
-toolmode.drawteams = 绘制团队
-toolmode.drawteams.description = 绘制团队而�是方�。
+toolmode.square.description = 将笔触改为正方形。
+toolmode.eraseores = 擦除矿脉
+toolmode.eraseores.description = 仅擦除矿脉，�影�其他物体。
+toolmode.fillteams = 填充队�
+toolmode.fillteams.description = ��填充方�，而是填充队�颜色。
+toolmode.fillerase = 擦除�类
+toolmode.fillerase.description = 擦除���类的方�。
+toolmode.drawteams = 绘制队�
+toolmode.drawteams.description = ��绘制方�，而是绘制队�颜色。
+#未使用
+toolmode.underliquid = 水下地形
+toolmode.underliquid.description = 绘制�于液体下的地形
 
-filters.empty = [lightgray]没有过滤�件�用下方的按钮添加。
-filter.distort = 扭曲程度
-filter.noise = 波动程度
-filter.enemyspawn = 敌人生�点选择
-filter.spawnpath = 敌人生�途径
+filters.empty = [lightgray]未创建生�器�用下方的按钮创建。
+
+filter.distort = 扭曲
+filter.noise = 地表�机化
+filter.enemyspawn = 敌人出生点选择
+filter.spawnpath = 敌人生�路径
 filter.corespawn = 核心��点选择
-filter.median = 平�数
-filter.oremedian = 矿石平�数
-filter.blend = 混�程度
-filter.defaultores = 默认矿石
-filter.ore = 矿石
-filter.rivernoise = 河�波动程度
+filter.median = 地形圆润化
+filter.oremedian = 矿脉圆润化
+filter.blend = 镶边
+filter.defaultores = 默认的矿脉生�规则
+filter.ore = 矿脉生�
+filter.rivernoise = 河��机化
 filter.mirror = 镜�
-filter.clear = 清�
+filter.clear = 替�
 filter.option.ignore = 忽略
-filter.scatter = 分散程度
-filter.terrain = 地形
-filter.option.scale = 规模大�
-filter.option.chance = 几率大�
-filter.option.mag = 巨大程度
-filter.option.threshold = 最大阈值
-filter.option.circle-scale = 圆规模
-filter.option.octaves = 递增
-filter.option.falloff = 递�
-filter.option.angle = 角度大�
+filter.scatter = 散布
+filter.terrain = 地图边界
+filter.logic = Logic
+
+filter.option.scale = 缩放
+filter.option.chance = 散布数�
+filter.option.mag = 渗�
+filter.option.threshold = 比例
+filter.option.circle-scale = �径
+filter.option.octaves = 蔓延
+filter.option.falloff = 分散
+filter.option.angle = 角度
+filter.option.tilt = 倾斜
+filter.option.rotate = 中心对称
 filter.option.amount = 数�
-filter.option.block = 方�
-filter.option.floor = 地�
-filter.option.flooronto = 地�目标
-filter.option.target = 目标
+filter.option.block = 地表方�
+filter.option.floor = 地表
+filter.option.flooronto = 替�目标
+filter.option.target = 替�目标
+filter.option.replacement = 替�为
 filter.option.wall = 墙
-filter.option.ore = 矿石
-filter.option.floor2 = 二�地�
-filter.option.threshold2 = 二�阈值
-filter.option.radius = �径大�
+filter.option.ore = 矿脉
+filter.option.floor2 = 内层地形
+filter.option.threshold2 = 内层比例
+filter.option.radius = �径
 filter.option.percentile = 百分比
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = 在这里，您�以为特定语言添加本地化语言包到您的地图中。在本地化语言包中，�个文本属性都有一个�称和一个值。这些文本属性�以由世界处�器和游�目标使用它们的�称。它们支�文本格�化（用实际值替���符）。\n\n[cyan]示例文本属性：\n[]�称: [accent]timer[]值: [accent]示例计时器, 剩余时间: {0}[]\n\n[cyan]用法:\n[]将其设置为目标的文本: [accent]@timer\n\n[]在世界处�器中打�它：\n[accent]localeprint "timer"\n格�化时间\n[gray](时间是一个�独计算的��)
+locales.deletelocale = 您确定�删除该本地化语言包�？
+locales.applytoall = 将更改应用于所有本地化语言包
+locales.addtoother = 添加到其他本地化语言包
+locales.rollback = 回滚到上次应用的状�
+locales.filter = 文本属性过滤器
+locales.searchname = �索�称...
+locales.searchvalue = �索值...
+locales.searchlocale = �索本地化...
+locales.byname = 按�称
+locales.byvalue = 按值
+locales.showcorrect = 显示所有本地化语言包中存在并且在所有地方具有唯一值的文本属性
+locales.showmissing = 显示在�些本地化语言包中缺失的文本属性
+locales.showsame = 显示在��本地化语言包中具有相�值的文本属性
+locales.viewproperty = 在所有本地化语言包中查看
+locales.viewing = 查看文本属性 "{0}"
+locales.addicon = 添加图标
 
 width = 宽度：
 height = 高度：
 menu = ��
 play = 开始游�
 campaign = 战役模�
-load = 载入游�
+load = 读�
 save = �存
 fps = 帧数：{0}
 ping = 延迟：{0}毫秒
-memory = 内存: {0}mb
-memory2 = 内存:\n {0}mb +\n {1}mb
-language.restart = 为了使语言设置生效请��游�。
+tps = TPS: {0}
+memory = 内存：{0}MB
+memory2 = 内存：\n {0}MB +\n {1}MB
+language.restart = ��游��语言设置�能生效。
 settings = 设置
 tutorial = 教程
 tutorial.retake = �玩教程
-editor = 编辑器
+editor = 地图编辑器
 mapeditor = 地图编辑器
 
 abandon = 放弃
-abandon.text = 这个区域�其资�会被敌人�置。
-locked = 已�定
-complete = [lightgray]完�：
-requirement.wave = {1}中的第{0}波次
-requirement.core = 在{0}中摧�敌方核心
-requirement.research = 研究 {0}
-requirement.produce = 生产 {0}
-requirement.capture = �领 {0}
+abandon.text = 这个区��其资�将会�入敌手。
+locked = �定
+complete = [lightgray]解��件：
+requirement.wave = 在{1}��到第{0}波
+requirement.core = 摧�{0}的敌方核心
+requirement.research = 研究{0}
+requirement.produce = 生产{0}
+requirement.capture = �领{0}
+requirement.onplanet = 控制区�{0}
+requirement.onsector = �陆区�：{0}
 launch.text = �射
-research.multiplayer = 仅有�主�研究物�。
-map.multiplayer = 仅有�主�查看区域。
-uncover = 解�
-configure = 设定装�的数�
+map.multiplayer = �有�务器创建者能查看区�。
+uncover = 已解�
+configure = 设定装�的物资
+
+objective.research.name = 研究
+objective.produce.name = 获�
+objective.item.name = 获�物�
+objective.coreitem.name = 核心物�
+objective.buildcount.name = 建造数�
+objective.unitcount.name = ��数�
+objective.destroyunits.name = 摧���
+objective.timer.name = 计时器
+objective.destroyblock.name = 摧�建筑
+objective.destroyblocks.name = 摧�建筑
+objective.destroycore.name = 摧�核心
+objective.commandmode.name = 指挥模�
+objective.flag.name = 标签
+
+marker.shapetext.name = 带形状文本
+marker.point.name = 点
+marker.shape.name = 形状
+marker.text.name = 文本
+marker.line.name = 线
+marker.quad.name = 四边形
+marker.texture.name = Texture
+
+marker.background = 背景
+marker.outline = 轮廓
+
+objective.research = [accent]研究：\n[]{0}[lightgray]{1}
+objective.produce = [accent]生产：\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]摧�：\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]摧�：[lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]获得：[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]移动至核心：\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]建造：[][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]生产��：[][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]摧���：[][lightgray]{0}[]x
+objective.enemiesapproaching = [accent]敌人�袭：[lightgray]{0}[]
+objective.enemyescelating = [accent]敌方在[lightgray]{0}[]�扩大��生产
+objective.enemyairunits = [accent]敌方在[lightgray]{0}[]�开始生产空军��
+objective.destroycore = [accent]摧�敌方核心
+objective.command = [accent]指挥��
+objective.nuclearlaunch = [accent]⚠ 侦测到核打击：[lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ 核打击接近中 ⚠\n[lightgray]立刻建造备用核心
 
 loadout = 装�
-resources = 资� 
+resources = 资�
+resources.max = 最大
 bannedblocks = �用建筑
-addall = 添加所有
-launch.from = �射地: [accent]{0}
-launch.destination = 目的地: {0}
-configure.invalid = 数�必须是0到{0}之间的数字。
+unbannedblocks = Unbanned Blocks
+objectives = 任务目标
+bannedunits = �用��
+unbannedunits = Unbanned Units
+bannedunits.whitelist = 仅�用选中的��
+bannedblocks.whitelist = 仅�用选中的建筑
+addall = 全部装�
+launch.from = �射自：[accent]{0}
+launch.capacity = 装�物�: [accent]{0}
+launch.destination = 目的地：{0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
+configure.invalid = 数�必须在0到{0}之间。
 add = 添加…
-boss.health = Boss 生命值
+guardian = Boss
 
-connectfail = [crimson]�务器连接失败：[accent]{0}
-error.unreachable = 无法访问�务器。\n确定输对地�了�？
+connectfail = [scarlet]�务器连接失败：\n\n[accent]{0}
+error.unreachable = 无法访问�务器。 \n请检查输入的地�。
 error.invalidaddress = 地�无效。
 error.timedout = 连接超时�\n请确认�务器设置了端�转�且地�无误�
-error.mismatch = 数�包错误。\n�能是客户端/�务器的版本�匹�。\n请确�客户端和�务器都是最新的版本�
-error.alreadyconnected = 已连接。
+error.mismatch = 数�包错误。 \n�能是客户端/�务器的版本�匹�。 \n请确�客户端和�务器都是最新的版本�
+error.alreadyconnected = 已�建立连接。
 error.mapnotfound = 找�到地图文件�
-error.io = 网络 I/O 错误。
+error.io = 网络I/O错误。
 error.any = 未知网络错误。
-error.bloom = 未能�始化特效。\n您的设备�能�支�。
+error.bloom = 未能�始化光效。 \n您的设备�能�支�。
+error.moddex = Mindustry 无法加载此模组。\n您的设备由于最近的 Android 系统更新，正在阻止导入 Java 模组。\n目�对此问题尚无已知的解决方法
 
 weather.rain.name = �雨
-weather.snow.name = �雪
+weather.snowing.name = �雪
 weather.sandstorm.name = 沙尘暴
-weather.sporestorm.name = 孢�雾
+weather.sporestorm.name = 孢�风暴
 weather.fog.name = 雾
 
+campaign.playtime = \uf129 [lightgray]区�游玩时间：{0}
+campaign.complete = [accent]�喜�\n\n{0}上的敌军已被消�。\n[lightgray]最终区�已被��。
+
+sectorlist = 区�列表
+sectorlist.attacked = {0}�到攻击
 sectors.unexplored = [lightgray]未探索
-sectors.resources = 资�:
-sectors.production = 产出:
-sectors.export = 输出:
-sectors.time = 时间:
-sectors.threat = ��
-sectors.wave = 进攻波:
-sectors.stored = 贮存:
+sectors.resources = 资�：
+sectors.production = 产出：
+sectors.export = 输出：
+sectors.import = 输入：
+sectors.time = 时间：
+sectors.threat = ��：
+sectors.wave = 波次：
+sectors.stored = 贮存：
 sectors.resume = 继续
 sectors.launch = �射
 sectors.select = 选择
-sectors.nonelaunch = [lightgray]无 (太阳)
+sectors.launchselect = Select Launch Destination
+sectors.nonelaunch = [lightgray]无（自动销�）
+sectors.redirect = Redirect Launch Pads
 sectors.rename = �命�区�
-sectors.enemybase = [scarlet]敌人基地
-sectors.vulnerable = [scarlet]脆弱的
-sectors.underattack = [scarlet]�到攻击�[accent]{0}% ��度
-sectors.survives = [accent]存活{0}波
+sectors.enemybase = [scarlet]敌方基地
+sectors.vulnerable = [scarlet]易�攻击
+sectors.underattack = [scarlet]�到攻击�[accent]{0}%��度
+sectors.underattack.nodamage = [scarlet]未�领
+sectors.survives = [accent]预测�守{0}波
 sectors.go = 进入
+sector.abandon = �弃
+sector.abandon.confirm = 此区�核心将自�。\n确认？
 sector.curcapture = 区�已�领
 sector.curlost = 区�已丢失
-sector.missingresources = [scarlet]核心资��足
-sector.attacked = 区�[accent]{0}[white]�到攻击!
-sector.lost = 区�[accent]{0}[white]已丢失!
-#note: the missing space in the line below is intentional
-sector.captured = 区�[accent]{0}[white]已�领!
+sector.missingresources = [scarlet]建造核心所需资��足
+sector.attacked = 区�[accent]{0}[white]�到攻击�
+sector.lost = 区�[accent]{0}[white]已丢失�
+sector.capture = 区�[accent]{0}[white]已�领!
+sector.capture.current = 区�已�领!
+sector.changeicon = 更改图标
+sector.noswitch.title = 无法切�区�
+sector.noswitch = 你无法在当�区���攻击时切�区�。\n\n区�：[accent]{0}[]�于[accent]{1}[]
+sector.view = 查看区�
 
 threat.low = 低度
 threat.medium = 中度
 threat.high = 高度
 threat.extreme = �高
-threat.eradication = 扫�
+threat.eradication = ��
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = 行星
 
 planet.serpulo.name = 塞普罗
+planet.erekir.name = 埃里克尔
 planet.sun.name = 太阳
 
 sector.impact0078.name = 冲击区0078
@@ -580,278 +831,476 @@ sector.fungalPass.name = 真�通�
 sector.biomassFacility.name = 生物质��区
 sector.windsweptIslands.name = 风�群岛
 sector.extractionOutpost.name = ���哨
+sector.facility32m.name = 工业区 32 M
+sector.taintedWoods.name = 孢染丛林
+sector.infestedCanyons.name = �疫峡谷
 sector.planetaryTerminal.name = 行星�射终端
+sector.coastline.name = 边际海湾
+sector.navalFortress.name = 海军�塞
+sector.polarAerodrome.name = �地空港
+sector.atolls.name = 环�群岛
+sector.testingGrounds.name = 实验�区
+sector.seaPort.name = 边海港�
+sector.weatheredChannels.name = 风化海峡
+sector.mycelialBastion.name = ��堡垒
+sector.frontier.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 = 介于高山和低矮孢�丛生的土地之间的过渡地带。这里有一个�型的敌方侦察基地。\n侦察它。\n使用尖刀和爬行者���摧�两个核心。
+sector.groundZero.description = �上旅程的最佳�置。 这里的敌人��很�，但资�也少。\n\n尽你所能收集铅和铜，出���
+sector.frozenForest.description = 一个�近山脉的地方。 哪怕是在这里，也有了孢�扩散的痕迹。\n连�寒也无法长久地约�它们。\n\n开始�用电力，建造�力�电机并学会使用修�器。
+sector.saltFlats.description = �碱�滩，�于沙漠的边缘地带，几乎没有什么资�。\n敌人在这里建立了一个资�存储区。\n\n摧�他们的核心，片甲�留。
+sector.craters.description = 这片陨石地带有积水，它也是旧时战争的�迹。\n\n夺下该区�，收集沙�冶炼玻璃。\n用水泵抽水加速炮塔和钻头。
+sector.ruinousShores.description = 穿过�地就是海滩。\n这里曾�有一�海岸防线，但现在已所剩无几。\n一些基础的防御建筑还完好无�，除此之外都��了废墟。\n\n继续�外扩张并研究科技。
+sector.stainedMountains.description = 深入内陆地区便是山脉，这里目�还未被孢�污染。\n敌人势力更加强大，别给他们的精�部队留下喘�之机。\n\n这一地区分布�丰富的钛，试�开采并利用它。
+sector.overgrowth.description = 这里的孢��近它最�的��地，因此得以疯狂生长。\n\n敌人在此处建立了一个�哨站，建造尖刀���摧�它。
+sector.tarFields.description = 产油区边缘，�于山脉和沙漠之间。 它是为数�多蕴�了石油的地区之一。\n尽管这里一片废墟，附近�有一些�险的敌方��。 ��低估他们。\n\n[lightgray]尽你所能研究石油加工技术。
+sector.desolateRift.description = �常�险的区�，资�丰富但空间狭窄，敌人也�分�险。\n\n尽快�展与防御，��因敌人的进攻间隔太长而掉以轻心。
+sector.nuclearComplex.description = 曾用�生产加工�的设施，如今已��了废墟。\n这里有大�的敌人，�断�寻�入侵者。\n\n[lightgray]研究�以�它的��用途。
+sector.fungalPass.description = 一边是高山，�一边是孢�丛生的平原。\n这里有一个敌方的�型侦察基地，摧�它。\n\n使用尖刀和爬虫��，摧�两个核心。
+sector.biomassFacility.description = 孢�的��地，有研究和生产孢�的原始设施。\n[lightgray]设施���，孢�散播了出去，原生生�系统完全无法抵挡这�外�物�。\n\n研究这里的科技，培养孢��制造燃料和��物。
+sector.windsweptIslands.description = 海岸线之外���这一串群岛。 �记载这里曾有生产[accent]塑钢[]的建筑。\n\n抵御敌人的海军，在岛上建立基地，研究生产建筑。
+sector.extractionOutpost.description = 一座�远的�哨，敌人建造它�其他区��射资�。\n跨区��输是��这个星���或缺的一项技术。\n\n摧�敌方基地，研究�射�。
+sector.impact0078.description = 最�进入这个星系的星际�输船，残骸留在了这里。\n\n尽�回收�以利用的资�，研究科技。
+sector.planetaryTerminal.description = 最终目标。\n这座滨海基地有一个�以将核心�射到其他行星的建筑，防�森严。\n\n制造海军��，尽快消�敌人，研究�射建筑。
+sector.coastline.description = 这里探测到了海军��科技的�迹。 击退敌人的进攻，�领区�，获�技术。
+sector.navalFortress.description = 敌人在一个有天然防御�障的�远岛屿上建立了基地。 摧�它，并研究高级海军科技。
+sector.cruxscape.name = 赤色总部
+sector.geothermalStronghold.name = 熔石�塞
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+sector.onset.name = 始�地区
+sector.aegis.name = 庇护�哨
+sector.lake.name = 岩浆湖
+sector.intersect.name = 交错丘陵
+sector.atlas.name = 风化山脉
+sector.split.name = 横断山谷
+sector.basin.name = 风蚀盆地
+sector.marsh.name = 芳油湿地
+sector.peaks.name = 横堑峰峦
+sector.ravine.name = 贫瘠峡谷
+sector.caldera-erekir.name = 破碎�山
+sector.stronghold.name = 晶石�塞
+sector.crevice.name = 碳岩裂隙
+sector.siege.name = 平行岭谷
+sector.crossroads.name = �字路�
+sector.karst.name = 岩溶洞穴
+sector.origin.name = 起�
+
+sector.onset.description = 收集资�，研究科技以自动化生产。\n开始进攻。
+sector.aegis.description = 这个区�有钨矿床分布。\n研究[accent]冲击钻头[]挖掘钨，并摧�这里的敌方基地。
+sector.lake.description = 这个区�的岩浆湖�制了大部分��的移动，悬浮��是唯一选择。\n尽快研究[accent]飞船制造厂[]并生产一个[accent]挣脱[]。
+sector.intersect.description = 扫�显示，这个区�在�陆��久将�到多方�的攻击。\n迅速建立防御并尽快扩张。\n[accent]机甲[]���用于在这里的崎岖地形活动。
+sector.atlas.description = 这个区�包���地形，需�多兵���进行有效进攻。\n这里�现的一些更为�固的敌方基地需�使用高级��摧�。\n研究[accent]电解机[]和[accent]�克�构厂[]。
+sector.split.description = 这个区�的敌人数�很少，�常适�测试新的�输技术。
+sector.basin.description = 这个区�探测到了大�敌人。\n快速生产��并攻�敌方核心以在此地立足。
+sector.marsh.description = 这个区�有大�芳油，但喷�数�有�。\n利用[accent]化学燃烧室[]�电。
+sector.peaks.description = 这个区�的山区地形使大部分��毫无用处。 需�使用空军��。\n注�敌人的防空设施。 �试切断它的供弹。
+sector.ravine.description = 这里是敌人的���输路线。 区�中未探测到敌方核心，但预计会有多�敌军。\n尽快生产[accent]巨浪�金[]并建造[accent]劫难[]炮塔。
+sector.caldera-erekir.description = 这个区�的资�分散在多个岛屿上。\n研究并部署无人机�输。
+sector.stronghold.description = 这个区�的敌方基地守��大�的[accent]�[]。\n使用它研究高级��和炮塔。
+sector.crevice.description = 这个区�敌人的攻势�常猛烈。\n尽快研究[accent]碳化物[]与[accent]热解�电机[]以求得生存。
+sector.siege.description = 这个区�中的两�平行的山谷使你�得�进行�线作战。\n研究[accent]氰气[]以生产更强力的�克��。\n警告：侦测到敌方长�离导弹塔。 导弹命中��被拦截。
+sector.crossroads.description = 这个区�的敌方基地建立在��的地形上。 �试研究多���以进攻。\n�些敌方基地有护盾�护。 �试切断它们的供电。
+sector.karst.description = 这个区�资�丰富，但敌人会立刻�动进攻。\n充分利用资�并研究[accent]相织布[]。
+sector.origin.description = 最终区�，敌人数��多。\n所有科技�已研究完毕，�需专注于摧�所有敌方基地。
+
+status.burning.name = 燃烧
+status.freezing.name = 冻结
+status.wet.name = 潮湿
+status.muddy.name = 泥泞
+status.melting.name = 熔化
+status.sapped.name = 弱化
+status.electrified.name = 麻痹
+status.spore-slowed.name = 孢��速
+status.tarred.name = 油浸
+status.overdrive.name = 过载
+status.overclock.name = 超频
+status.shocked.name = 电击
+status.blasted.name = 爆炸
+status.unmoving.name = �止
+status.boss.name = 守�者
 
 settings.language = 语言
 settings.data = 游�数�
-settings.reset = ��默认设置
+settings.reset = 全部��默认
 settings.rebind = �新绑定
-settings.resetKey = �置按键
+settings.resetKey = ��默认
 settings.controls = 控制
 settings.game = 游�
 settings.sound = 声音
-settings.graphics = 图�
+settings.graphics = 图形
 settings.cleardata = 清除游�数�…
-settings.clear.confirm = 您确定�清除此数�？\n此�作无法撤销�
-settings.clearall.confirm = [scarlet]警告�[]\n这将清除所有数�，包括存档�地图�解�和按键绑定。\n按「是��，游�将删除所有数�并自动退出。
-settings.clearsaves.confirm = 您确定�清除存档？
+settings.clear.confirm = 确定清除此数�？\n此�作无法撤销�
+settings.clearall.confirm = [scarlet]警告�[]\n这将清除所有数�，包括存档� 地图� 解�进度和按键绑定。\n按“确定��，游�将删除所有数�并自动退出。
+settings.clearsaves.confirm = 确定清除所有存档？
 settings.clearsaves = 清除存档
 settings.clearresearch = 清除研究进度
-settings.clearresearch.confirm = 您确定�清除战役研究进度?
+settings.clearresearch.confirm = 确定清除战役研究进度?
 settings.clearcampaignsaves = 清除战役进度
-settings.clearcampaignsaves.confirm = 您确定�清除战役进度?
+settings.clearcampaignsaves.confirm = 确定清除战役进度?
 paused = [accent]< 暂� >
 clear = 清除
-banned = [scarlet]已�止
+banned = [scarlet]�用
+unsupported.environment = [scarlet]�支�的环境
 yes = 是
 no = �
-info.title = [accent]详情
-error.title = [crimson]�生了一个错误
+info.title = 详情
+error.title = [scarlet]�生了一个错误
 error.crashtitle = �生了一个错误
-unit.nobuild = [scarlet]��未能建造
-lastaccessed = [lightgray]上次�作: {0}
-block.unknown = [lightgray]???
+unit.nobuild = [scarlet]无法建造
+lastaccessed = [lightgray]上次�作：{0}
+lastcommanded = [lightgray]上次指挥：{0}
+block.unknown = [lightgray]？？
 
+stat.showinmap = <进入地图�显示>
 stat.description = 介�
 stat.input = 输入
 stat.output = 输出
-stat.booster = 增强物�/液体
-stat.tiles = 所需地型
-stat.affinities = 相关
-stat.powercapacity = 能�容�
-stat.powershot = 能�/�射
+stat.maxefficiency = 最高效率
+stat.booster = 强化所需
+stat.tiles = 所需地形
+stat.affinities = 影�因素
+stat.opposites = 互斥
+stat.powercapacity = 电力容�
+stat.powershot = 电力/�
 stat.damage = 伤害
 stat.targetsair = 攻击空中��
 stat.targetsground = 攻击地���
 stat.itemsmoved = 移动速度
-stat.launchtime = �射间隔时间
+stat.launchtime = �射间隔
 stat.shootrange = 范围
 stat.size = 尺寸
 stat.displaysize = 显示尺寸
 stat.liquidcapacity = 液体容�
-stat.powerrange = 能�范围
+stat.powerrange = 连接范围
 stat.linkrange = 连接范围
-stat.instructions = 指令数�
-stat.powerconnections = 最多连接
-stat.poweruse = 使用能�
-stat.powerdamage = 功率/�伤
+stat.instructions = 指令�行速度
+stat.powerconnections = 最大连接数
+stat.poweruse = 消耗电力
+stat.powerdamage = 电力/伤害
 stat.itemcapacity = 物�容�
 stat.memorycapacity = 内存容�
-stat.basepowergeneration = 基础能�输出
+stat.basepowergeneration = 基础电力输出
 stat.productiontime = 生产时间
 stat.repairtime = 建筑完全修�时间
+stat.repairspeed = 修�速度
 stat.weapons = 武器
 stat.bullet = �弹
+stat.moduletier = 模�等级
+stat.unittype = ��类型
 stat.speedincrease = �速
 stat.range = 范围
 stat.drilltier = �钻探矿物
 stat.drillspeed = 基础钻探速度
-stat.boosteffect = 增强效果
+stat.boosteffect = 强化效果
 stat.maxunits = 最大��数�
 stat.health = 生命值
+stat.armor = 护甲
 stat.buildtime = 建造时间
-stat.maxconsecutive = 最大连续
+stat.maxconsecutive = 连续放置�制
 stat.buildcost = 建造花费
-stat.inaccuracy = 误差
+stat.inaccuracy = 射击误差
 stat.shots = �射数
-stat.reload = �秒�射数
+stat.reload = 开�速率
 stat.ammo = 弹�
-stat.shieldhealth = 盾容
+stat.shieldhealth = 护盾容�
 stat.cooldowntime = 冷�时间
 stat.explosiveness = 爆炸性
-stat.basedeflectchance = 基础�射几率
-stat.lightningchance = 激�闪电几率
+stat.basedeflectchance = 基础�射概率
+stat.lightningchance = 激�闪电概率
 stat.lightningdamage = 激�闪电伤害
 stat.flammability = 燃烧性
 stat.radioactivity = 放射性
+stat.charge = 放电性
 stat.heatcapacity = 热容�
 stat.viscosity = 粘度
 stat.temperature = 温度
-stat.speed = 速度
+stat.speed = 移动速度
 stat.buildspeed = 建造速度
 stat.minespeed = 采矿速度
-stat.minetier = 采矿等级
-stat.payloadcapacity = 载货容�
-stat.commandlimit = 指挥上�
+stat.minetier = �采集矿物
+stat.payloadcapacity = 载�容�
 stat.abilities = 能力
 stat.canboost = �助推
-stat.flying = �飞行
+stat.flying = 空中��
+stat.ammouse = 弹�
+stat.ammocapacity = Ammo Capacity
+stat.damagemultiplier = 伤害�率
+stat.healthmultiplier = 生命值�率
+stat.speedmultiplier = 移动速度�率
+stat.reloadmultiplier = 开�速率�率
+stat.buildspeedmultiplier = 建造速度�率
+stat.reactive = �应
+stat.immunities = �疫
+stat.healing = 治疗
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = 力墙场
+ability.forcefield.description = 投射一个能�收�弹的力场护盾
 ability.repairfield = 修�场
+ability.repairfield.description = 修�附近的��
 ability.statusfield = 状�场
-ability.unitspawn = {0} ��工厂
+ability.statusfield.description = 对附近的��施加状�效果
+ability.unitspawn = ��生�
+ability.unitspawn.description = 建造��
 ability.shieldregenfield = 护盾�生场
+ability.shieldregenfield.description = �生附近��的护盾
 ability.movelightning = 闪电助推器
+ability.movelightning.description = 移动时释放闪电
+ability.armorplate = 装甲�
+ability.armorplate.description = 在射击时�少�到的伤害
+ability.shieldarc = 弧形护盾
+ability.shieldarc.description = 投射一个弧形的力场护盾，能�收�弹
+ability.suppressionfield = 修�压制场
+ability.suppressionfield.description = 使附近的修�建筑�止工作
+ability.energyfield = 能�场
+ability.energyfield.description = 对附近的敌人释放电击
+ability.energyfield.healdescription = 对附近的敌人释放电击，并治疗�方
+ability.regen = �生
+ability.regen.description = ��时间的推移��自己的生命值
+ability.liquidregen = 液体�收
+ability.liquidregen.description = �收液体以治疗自身
+ability.spawndeath = 死亡产生��
+ability.spawndeath.description = 死亡时释放��
+ability.liquidexplode = 死亡溢液
+ability.liquidexplode.description = 死亡时释放液体
+ability.stat.firingrate = [stat]{0}/秒[lightgray] 射速
+ability.stat.regen = [stat]{0}/秒[lightgray] 生命��速度
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] 护盾
+ability.stat.repairspeed = [stat]{0}/秒[lightgray] 修�速度
+ability.stat.slurpheal = [stat]{0}[lightgray] 生命/液体��
+ability.stat.cooldown = [stat]{0} 秒[lightgray] 冷�时间
+ability.stat.maxtargets = [stat]{0}[lightgray] 最大目标数
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] �类型修��
+ability.stat.damagereduction = [stat]{0}%[lightgray] 伤害��
+ability.stat.minspeed = [stat]{0} 格/秒[lightgray] 最低速度
+ability.stat.duration = [stat]{0} 秒[lightgray] �续时间
+ability.stat.buildtime = [stat]{0} 秒[lightgray] 建造时间
 
+
+bar.onlycoredeposit = 仅核心�丢入资�
 bar.drilltierreq = 需�更高级的钻头
-bar.noresources = 缺失资�
-bar.corereq = 缺失核心基座
+bar.nobatterypower = Insufficieny Battery Power
+bar.noresources = 资��足
+bar.corereq = 需�核心基座
+bar.corefloor = 需�核心地�
+bar.cargounitcap = 达到货���上�
 bar.drillspeed = 挖掘速度：{0}/秒
-bar.pumpspeed = 泵压速度：{0}/秒
+bar.pumpspeed = 泵�速度：{0}/秒
 bar.efficiency = 效率：{0}%
-bar.powerbalance = 能�：{0}/秒
-bar.powerstored = 储能：{0}/{1}
-bar.poweramount = 能�：{0}
-bar.poweroutput = 能�输出：{0}
-bar.powerlines = 链接: {0}/{1}
+bar.boost = 超速：+{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
+bar.powerbalance = 电力：{0}/秒
+bar.powerstored = 电力储存：{0}/{1}
+bar.poweramount = 电力：{0}
+bar.poweroutput = 电力输出：{0}
+bar.powerlines = 连接数：{0}/{1}
 bar.items = 物�：{0}
 bar.capacity = 容�：{0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[已达��上�]
 bar.liquid = 液体
 bar.heat = 热�
+bar.cooldown = Cooldown
+bar.instability = �稳定性
+bar.heatamount = 热�: {0}
+bar.heatpercent = 热�: {0} （{1}%）
 bar.power = 电力
 bar.progress = 制造进度
+bar.loadprogress = 进度
+bar.launchcooldown = �射冷�
 bar.input = 输入
 bar.output = 输出
+bar.strength = [stat]{0}[lightgray]x效率
 
 units.processorcontrol = [lightgray]由处�器控制
 
-bullet.damage = [stat]{0}[lightgray] 伤害
-bullet.splashdamage = [stat]{0}[lightgray] 范围伤害 ~[stat] {1}[lightgray] 格
-bullet.incendiary = [stat] 燃烧
-bullet.sapping = [stat] 削弱
-bullet.homing = [stat] 追踪
-bullet.shock = [stat] 电击
-bullet.frag = [stat] 分裂
-bullet.knockback = [stat]{0}[lightgray] 击退
-bullet.pierce = [stat]{0}[lightgray]x 穿�
-bullet.infinitepierce = [stat] 穿�
-bullet.healpercent = [stat]{0}[lightgray]% 修�
-bullet.freezing = [stat] 冰冻
-bullet.tarred = [stat] �速
-bullet.multiplier = [stat]{0}[lightgray]x 装弹数�
-bullet.reload = [stat]{0}[lightgray]x 装弹速度
+bullet.damage = [stat]{0}[lightgray]伤害
+bullet.splashdamage = [stat]{0}[lightgray]范围伤害~[stat] {1}[lightgray]格
+bullet.incendiary = [stat]燃烧
+bullet.homing = [stat]追踪
+bullet.armorpierce = [stat]穿甲
+bullet.maxdamagefraction = [stat]{0}%[lightgray] 伤害上�
+bullet.suppression = [stat]{0}秒[lightgray] 修�压制 ~ [stat]{1}[lightgray] 格
+bullet.interval = [stat]{0}/秒[lightgray] 分裂�弹：
+bullet.frags = [stat]{0}[lightgray]x分裂�弹：
+bullet.lightning = [stat]{0}[lightgray]x闪电~[stat]{1}[lightgray]伤害
+bullet.buildingdamage = [stat]{0}%[lightgray]对建筑伤害
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
+bullet.knockback = [stat]{0}[lightgray]击退
+bullet.pierce = [stat]{0}[lightgray]x穿�
+bullet.infinitepierce = [stat]无�穿�
+bullet.healpercent = [stat]{0}[lightgray]%修�
+bullet.healamount = [stat]{0}[lightgray]修��
+bullet.multiplier = [stat]{0}[lightgray]x装填�数
+bullet.reload = [stat]{0}%[lightgray]开�速率
+bullet.range = [stat]{0}[lightgray]射程（格）
+bullet.notargetsmissiles = [stat] ignores buildings
+bullet.notargetsbuildings = [stat] ignores missiles
 
-unit.blocks = 方�
-unit.blockssquared = 方�²
-unit.powersecond = 能�/秒
+unit.blocks = æ ¼
+unit.blockssquared = 格²
+unit.powersecond = 电力/秒
+unit.tilessecond = 格/秒
 unit.liquidsecond = 液体/秒
 unit.itemssecond = 物�/秒
 unit.liquidunits = 液体
-unit.powerunits = 能�
+unit.powerunits = 电力
+unit.heatunits = ��热�
 unit.degrees = 度
 unit.seconds = 秒
 unit.minutes = 分
 unit.persecond = /秒
 unit.perminute = /分
-unit.timesspeed = � 速度
+unit.timesspeed = x速度
+unit.multiplier = x
 unit.percent = %
-unit.shieldhealth = 盾容
+unit.shieldhealth = 护盾容�
 unit.items = 物�
 unit.thousands = K
 unit.millions = M
 unit.billions = B
-category.purpose = 介�
-category.general = 普通
-category.power = 能�
+unit.shots = shots
+unit.pershot = /�
+category.purpose = 用途
+category.general = 基础
+category.power = 电力
 category.liquids = 液体
 category.items = 物�
-category.crafting = 制造
+category.crafting = 输入/输出
 category.function = 功能
-category.optional = �选的增强
+category.optional = 强化（�选）
+setting.alwaysmusic.name = 始终播放音�
+setting.alwaysmusic.description = �用时，音�将在游�中始终循环播放。\n�用时，音�仅会在�机间隔播放。
+setting.skipcoreanimation.name = 跳过核心�射与�陆动画
 setting.landscape.name = �定横�
 setting.shadows.name = 影�
 setting.blockreplace.name = 自动推��适的建筑
 setting.linear.name = 抗锯齿
 setting.hints.name = �示
-setting.flow.name = 显示资�传�速度[scarlet]
-setting.backgroundpause.name = 在背景中暂�
+setting.logichints.name = 逻辑指令�示
+setting.backgroundpause.name = 游�在��时自动暂�
 setting.buildautopause.name = 自动暂�建造
-setting.animatedwater.name = �动的水
-setting.animatedshields.name = 动�画�
-setting.antialias.name = 抗锯齿
-setting.playerindicators.name = 玩家指示�
-setting.indicators.name = 队�指示器
-setting.autotarget.name = 自动射击
+setting.doubletapmine.name = �击采矿
+setting.commandmodehold.name = 长按��指挥模�
+setting.distinctcontrolgroups.name = ����制一个编队
+setting.modcrashdisable.name = 游��动崩溃��用模组
+setting.animatedwater.name = 动�液体
+setting.animatedshields.name = 动�力场
+setting.playerindicators.name = 玩家指示器
+setting.indicators.name = 敌人指示器
+setting.autotarget.name = 自动瞄准
 setting.keyboard.name = 鼠标+键盘�控
 setting.touchscreen.name = 触��控
-setting.fpscap.name = 最大FPS
+setting.fpscap.name = 最大帧数
 setting.fpscap.none = æ— 
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI缩放比例[lightgray]（需��新�动）[]
+setting.uiscale.name = UI缩放比例
+setting.uiscale.description = 需��新�动
 setting.swapdiagonal.name = 总是斜线建造
-setting.difficulty.training = 训练
-setting.difficulty.easy = 简�
-setting.difficulty.normal = 普通
-setting.difficulty.hard = å›°éš¾
-setting.difficulty.insane = 疯狂
-setting.difficulty.name = 难度：
 setting.screenshake.name = �幕抖动
-setting.effects.name = 显示效果
-setting.destroyedblocks.name = 显示摧�的建筑
-setting.blockstatus.name = 显示方�状�
+setting.bloomintensity.name = 光效强度
+setting.bloomblur.name = 光效模糊
+setting.effects.name = 建筑特效
+setting.destroyedblocks.name = 显示已摧�的建筑
+setting.blockstatus.name = 显示建筑状�
 setting.conveyorpathfinding.name = 传�带自动寻路
 setting.sensitivity.name = 控制器��度
 setting.saveinterval.name = 自动�存间隔
-setting.seconds = {0} 秒
-setting.milliseconds = {0} 毫秒
+setting.seconds = {0}秒
+setting.milliseconds = {0}毫秒
 setting.fullscreen.name = 全�
-setting.borderlesswindow.name = 无边界窗�[lightgray]（�能需���）
-setting.fps.name = 显示 FPS 和网络延迟
-setting.smoothcamera.name = 镜头平滑
+setting.borderlesswindow.name = 无边框窗�
+setting.borderlesswindow.name.windows = 无边框全�
+setting.borderlesswindow.description = �能需���
+setting.fps.name = 显示帧数和网络延迟
+setting.console.name = �用控制�
+setting.smoothcamera.name = 平滑镜头
 setting.vsync.name = 垂直�步
-setting.pixelate.name = �素画� [lightgray]
+setting.pixelate.name = �素画�
 setting.minimap.name = 显示�地图
 setting.coreitems.name = 显示核心物资
 setting.position.name = 显示玩家�标
+setting.mouseposition.name = 显示鼠标�标
 setting.musicvol.name = 音�音�
 setting.atmosphere.name = 显示行星大气层
+setting.drawlight.name = 绘制阴影/光照
 setting.ambientvol.name = 环境音�
 setting.mutemusic.name = �用音�
 setting.sfxvol.name = 音效音�
 setting.mutesound.name = �用音效
 setting.crashreport.name = ��匿�的崩溃报告
+setting.communityservers.name = 获�社区�务器列表
 setting.savecreate.name = 自动创建存档
-setting.publichost.name = 游�公开��
-setting.playerlimit.name = 玩家�制
+setting.steampublichost.name = 公共游���性
+setting.playerlimit.name = 玩家数��制
 setting.chatopacity.name = �天界���明度
-setting.lasersopacity.name = 能�激光��明度
+setting.lasersopacity.name = 电力连接线��明度
+setting.unitlaseropacity.name = ��采矿光���明度
 setting.bridgeopacity.name = 桥���明度
 setting.playerchat.name = 显示玩家�天气泡
-public.confirm = 确定使您的游�公开��？\n[accent]其他人将�以加入到您的游�。\n[lightgray]您之��以在 设置->游�->游�公开�� 更改。
+setting.showweather.name = 显示天气效果
+setting.hidedisplays.name = �显示逻辑绘图
+setting.macnotch.name = 立陶宛語
+setting.macnotch.description = 需��新�动
+steam.friendsonly = 仅�好�
+steam.friendsonly.tooltip = 是��有 Steam 好��能加入您的游�。\n�消选中此选项将使您的游�公开 - 任何人都�以加入。
 public.beta = 请注�，测试版的游��能公开��。
-uiscale.reset = UI 缩放比例已更改。\n按下“确定��执行缩放比例的更改。\n[accent]{0}[]秒�[scarlet]将自动退出并还原设置。
+uiscale.reset = UI缩放比例已更改。\n点击“确定�接�更改。\n[accent]{0}[]秒�[scarlet]将自动退出并还原设置。
 uiscale.cancel = �消并退出
-setting.bloom.name = 特效
+setting.bloom.name = 光效
 keybind.title = �新绑定按键
-keybinds.mobile = [scarlet]这里的大多数按键绑定在移动设备上都�能用。仅支�基本的移动。
+keybinds.mobile = [scarlet]除了基本的移动以外，大多数按键绑定在移动设备上无效。
 category.general.name = 常规
 category.view.name = 视图
-category.multiplayer.name = 多人
-category.blocks.name = 选择方�
-command.attack = 攻击
-command.rally = 集�
-command.retreat = 撤退
-command.idle = 闲置
+category.command.name = ��指挥
+category.multiplayer.name = 多人游�
+category.blocks.name = 建筑选择
 placement.blockselectkeys = \n[lightgray]按键：[{0},
 keybind.respawn.name = �生
 keybind.control.name = 控制��
-keybind.clear_building.name = 清除建筑
+keybind.clear_building.name = 清除规划
 keybind.press = 请按一个键…
 keybind.press.axis = 请按一个轴或键…
-keybind.screenshot.name = 地图截图
-keybind.toggle_power_lines.name = 显示/��能�标识线
-keybind.toggle_block_status.name = 显示/��方�状�
+keybind.screenshot.name = 全地图截图
+keybind.toggle_power_lines.name = 显示/��电力连接线
+keybind.toggle_block_status.name = 显示/��建筑状�
 keybind.move_x.name = 水平移动
 keybind.move_y.name = 竖直移动
-keybind.mouse_move.name = 跟�鼠标
-keybind.pan.name = 平移视图
-keybind.boost.name = 推进
-keybind.schematic_select.name = 选择区域
+keybind.mouse_move.name = ��跟�鼠标
+keybind.pan.name = 鼠标控制镜头
+keybind.boost.name = �动助推
+keybind.command_mode.name = 指挥模�
+keybind.command_queue.name = ��指挥队列
+keybind.create_control_group.name = 创建�控队�
+keybind.cancel_orders.name = �消指令
+keybind.unit_stance_shoot.name = ��姿�：射击
+keybind.unit_stance_hold_fire.name = ��姿�：��
+keybind.unit_stance_pursue_target.name = ��姿�：追�目标
+keybind.unit_stance_patrol.name = ��姿�：巡逻
+keybind.unit_stance_ram.name = ��姿�：冲锋
+keybind.unit_command_move.name = ��命令: 移动
+keybind.unit_command_repair.name = ��命令: 修�
+keybind.unit_command_rebuild.name = ��命令: �建
+keybind.unit_command_assist.name = ��命令: �助
+keybind.unit_command_mine.name = ��命令: 采矿
+keybind.unit_command_boost.name = ��命令: 助推
+keybind.unit_command_load_units.name = ��命令: 装载��
+keybind.unit_command_load_blocks.name = ��命令: 转载建筑
+keybind.unit_command_unload_payload.name = ��命令: �载有效载�
+keybind.unit_command_enter_payload.name = ��命令: 进入入有效载�
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+
+keybind.rebuild_select.name = �建建筑
+keybind.schematic_select.name = 框选建筑
 keybind.schematic_menu.name = �图目录
 keybind.schematic_flip_x.name = 水平翻转
 keybind.schematic_flip_y.name = 竖直翻转
@@ -875,83 +1324,141 @@ keybind.fullscreen.name = 切�全�
 keybind.select.name = 选择/射击
 keybind.diagonal_placement.name = 斜线建造
 keybind.pick.name = 选择建筑
-keybind.break_block.name = 破�建筑
+keybind.break_block.name = 拆除建筑
+keybind.select_all_units.name = 选择所有��
+keybind.select_all_unit_factories.name = 选择所有��工厂
 keybind.deselect.name = �消选择
-keybind.pickupCargo.name = 拾�货物
-keybind.dropCargo.name = 释放货物
-keybind.command.name = 指挥
+keybind.pickupCargo.name = 拾�载�
+keybind.dropCargo.name = 释放载�
 keybind.shoot.name = 射击
 keybind.zoom.name = 缩放
 keybind.menu.name = ��
 keybind.pause.name = 暂�
 keybind.pause_building.name = 暂�/继续建造
-keybind.minimap.name = �地图
-keybind.planet_map.name = 行星地图
-keybind.research.name = 研究
+keybind.minimap.name = 打开�地图
+keybind.planet_map.name = 打开行星地图
+keybind.research.name = 打开科技树
+keybind.block_info.name = 显示建筑信�
 keybind.chat.name = �天
 keybind.player_list.name = 玩家列表
 keybind.console.name = 控制�
 keybind.rotate.name = 旋转
-keybind.rotateplaced.name = 旋转全部（长按）
-keybind.toggle_menus.name = 显�选项
+keybind.rotateplaced.name = 旋转已放置的建筑（长按）
+keybind.toggle_menus.name = 显示/��UI
 keybind.chat_history_prev.name = �天记录��
 keybind.chat_history_next.name = �天记录��
 keybind.chat_scroll.name = �天记录滚动
-keybind.drop_unit.name = �开��
+keybind.chat_mode.name = 切��天模�
+keybind.drop_unit.name = 释放��
 keybind.zoom_minimap.name = �地图缩放
-mode.help.title = 模�说明
+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.sandbox.description = 无�资�，�会自动生�敌人波次。
+mode.editor.name = 地图编辑器
 mode.pvp.name = PvP
-mode.pvp.description = 与本地玩家对战。\n[gray]需�地图中有��队�（颜色）的核心。
-mode.attack.name = 攻击
-mode.attack.description = 没有波次，但需�摧�敌人的基地。\n[gray]需�地图中有红色的核心。
+mode.pvp.description = 与其他玩家对战。 \n[gray]需�地图中有至少2���颜色的核心。
+mode.attack.name = 进攻
+mode.attack.description = 摧�敌人的基地。 \n[gray]需�地图中有敌方队�的核心。
 mode.custom = 自定义模�
+rules.invaliddata = 无效剪贴�数�。
+rules.hidebannedblocks = ���用的建筑
 
 rules.infiniteresources = 无�资�
+rules.onlydepositcore = 仅核心�放入资�
+rules.derelictrepair = �许修�残骸建筑
 rules.reactorexplosions = �应堆爆炸
-rules.schematic = �用�图
+rules.coreincinerates = 核心焚烧
+rules.disableworldprocessors = �用世界处�器
+rules.schematic = �许使用�图
 rules.wavetimer = 波次计时器
+rules.wavesending = 波次�跳波
+rules.allowedit = �许编辑规则
+rules.allowedit.info = �用�，玩家�以通过暂���左下角的按钮在游�中编辑规则。
+rules.alloweditworldprocessors = �许编辑世界处�器
+rules.alloweditworldprocessors.info = �用�，世界逻辑��以�使在编辑器外也能被放置和编辑。
+
 rules.waves = 波次
-rules.attack = 攻击模�
-rules.buildai = AI建造
+rules.airUseSpawns = 空军��刷怪点
+rules.attack = 进攻模�
+rules.buildai = 基础建筑者 AI
+rules.buildaitier = 建筑者 AI 等级
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = 在攻击地图中，使��能够组队并以更智能的方�攻击玩家基地。
+rules.rtsminsquadsize = 最�部队规模
+rules.rtsmaxsquadsize = 最大部队规模
+rules.rtsminattackweight = 最低进攻强度
+rules.cleanupdeadteams = 清除已战败队�的建筑
+rules.corecapture = 摧�核心时将其�领
+rules.polygoncoreprotection = 根�核心�置平分�建造区域
+rules.placerangecheck = 敌对建筑周围�建
 rules.enemyCheat = 敌人（红队）无�资�
-rules.blockhealthmultiplier = 建筑生命�数
-rules.blockdamagemultiplier = 建筑伤害�数
-rules.unitbuildspeedmultiplier = ��生产速度�数
-rules.unithealthmultiplier = ��生命�数
-rules.unitdamagemultiplier = ��伤害�数
-rules.enemycorebuildradius = 敌对核心�建设区�径：[lightgray]（格）
-rules.wavespacing = 波次间隔时间：[lightgray]（秒）
-rules.buildcostmultiplier = 建设花费�数
-rules.buildspeedmultiplier = 建设时间�数
-rules.deconstructrefundmultiplier = 拆除返还�数
-rules.waitForWaveToEnd = 等待敌人时间
+rules.blockhealthmultiplier = 建筑生命�率
+rules.blockdamagemultiplier = 建筑伤害�率
+rules.unitbuildspeedmultiplier = ��生产速度�率
+rules.unitcostmultiplier = ��生产花费�率
+rules.unithealthmultiplier = ��生命�率
+rules.unitdamagemultiplier = ��伤害�率
+rules.unitcrashdamagemultiplier = ����伤害�率
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.solarmultiplier = 太阳能�电�率
+rules.unitcapvariable = 核心�增加��上�
+rules.unitpayloadsexplode = ���带载�与��一起爆炸
+rules.unitcap = 基础��上�
+rules.limitarea = �制地图有效区域
+rules.enemycorebuildradius = 敌方核心��建造区域�径：[lightgray]（格）
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = 波次间隔：[lightgray]（秒）
+rules.initialwavespacing = 第一波间隔：[lightgray]（秒）
+rules.buildcostmultiplier = 建造花费�率
+rules.buildspeedmultiplier = 建造速度�率
+rules.deconstructrefundmultiplier = 拆除返还�率
+rules.waitForWaveToEnd = 等待波次结�
+rules.wavelimit = 地图在有�波次�结�
 rules.dropzoneradius = 敌人出生点�区大�：[lightgray]（格）
-rules.unitammo = ��消耗�弹
+rules.unitammo = ��有弹��制
+rules.enemyteam = 敌方队�
+rules.playerteam = 玩家队�
 rules.title.waves = 波次
 rules.title.resourcesbuilding = 资�和建造
-rules.title.enemy = 敌人
+rules.title.enemy = AI 敌人
 rules.title.unit = ��
 rules.title.experimental = 实验性
-rules.title.environment = 环境性
-rules.lighting = 光照
-rules.enemyLights = ��光照
-rules.fire = �焰
+rules.title.environment = 环境
+rules.title.teams = 队�
+rules.title.planet = 星�
+rules.lighting = 环境光
+rules.fog = 战争迷雾
+rules.invasions = 敌方区�入侵
+rules.legacylaunchpads = 旧版�射�机制
+rules.legacylaunchpads.info = �许在没有�陆垫的情况下使用�射�，如� 7.0 版本。
+landingpad.legacy.disabled = [scarlet]\ue815 �用[lightgray] (旧版�射�已�用)
+rules.showspawns = 显示敌方刷怪点
+rules.randomwaveai = ��预测的波次 AI
+rules.fire = �许�焰产生并蔓延
+rules.anyenv = <任�>
 rules.explosions = 建筑/��爆炸伤害
-rules.ambientlight = 环境光
-rules.weather = 气候
-rules.weather.frequency = 频率:
-rules.weather.duration = 时长:
+rules.ambientlight = 环境光颜色
+rules.weather = 天气
+rules.weather.frequency = 周期：
+rules.weather.always = 永久
+rules.weather.duration = 时长：
+rules.randomwaveai.info = 使波次生�的��攻击�机结构，而�是直接攻击核心或�电机组。
+rules.placerangecheck.info = 防止玩家在敌方建筑附近放置任何东西。在�试放置炮塔时，范围会增大，因此炮塔无法接近敌人。
+rules.onlydepositcore.info = 阻止���除核心区以外的任何建筑物存放物�。
+
 
 content.item.name = 物�
 content.liquid.name = 液体
-content.unit.name = 部队
-content.block.name = �
-content.sector.name = 区域
+content.unit.name = ��
+content.block.name = 建筑
+content.status.name = 状�效果
+content.sector.name = 战役区�
+content.team.name = 队�
+
+wallore = （墙）
 
 item.copper.name = 铜
 item.lead.name = é“…
@@ -961,19 +1468,32 @@ item.titanium.name = é’›
 item.thorium.name = é’�
 item.silicon.name = ç¡…
 item.plastanium.name = å¡‘é’¢
-item.phase-fabric.name = 相�物
+item.phase-fabric.name = 相织布
 item.surge-alloy.name = 巨浪�金
 item.spore-pod.name = 孢��
 item.sand.name = æ²™
 item.blast-compound.name = 爆炸混�物
-item.pyratite.name = ç¡«
+item.pyratite.name = 硫化物
 item.metaglass.name = 钢化玻璃
 item.scrap.name = 废料
+item.fissile-matter.name = 裂�产物
+item.beryllium.name = �
+item.tungsten.name = é’¨
+item.oxide.name = 氧化物
+item.carbide.name = 碳化物
+item.dormant-cyst.name = 休眠囊肿
 
 liquid.water.name = æ°´
 liquid.slag.name = 矿渣
 liquid.oil.name = 石油
 liquid.cryofluid.name = 冷冻液
+liquid.neoplasm.name = 瘤液
+liquid.arkycite.name = 芳油
+liquid.gallium.name = é•“
+liquid.ozone.name = 臭氧
+liquid.hydrogen.name = 氢气
+liquid.nitrogen.name = 氮气
+liquid.cyanogen.name = æ°°æ°”
 
 unit.dagger.name = 尖刀
 unit.mace.name = 战锤
@@ -1001,6 +1521,11 @@ unit.minke.name = 飞鲨
 unit.bryde.name = 戟鲸
 unit.sei.name = 蛟龙
 unit.omura.name = 海神
+unit.retusa.name = 潜螺
+unit.oxynoe.name = 电鳗
+unit.cyerce.name = 江豚
+unit.aegires.name = 玄武
+unit.navanax.name = 龙王
 unit.alpha.name = 阿尔法
 unit.beta.name = �塔
 unit.gamma.name = 伽马
@@ -1009,13 +1534,36 @@ unit.reign.name = 王座
 unit.vela.name = �星
 unit.corvus.name = 死星
 
-block.resupply-point.name = 补给点
-block.parallax.name = 差扰光�
+unit.stell.name = 围护
+unit.locus.name = 循迹
+unit.precept.name = 准绳
+unit.vanquish.name = ��
+unit.conquer.name = 领主
+unit.merui.name = 天守
+unit.cleroi.name = 天�
+unit.anthicus.name = 天�
+unit.tecta.name = 天�
+unit.collaris.name = 天�
+unit.elude.name = 挣脱
+unit.avert.name = �蔽
+unit.obviate.name = 消散
+unit.quell.name = �止
+unit.disrupt.name = 悲怆
+unit.evoke.name = �醒
+unit.incite.name = 策动
+unit.emanate.name = �散
+unit.manifold.name = 货�无人机
+unit.assembly-drone.name = 装�无人机
+unit.latum.name = Latum
+unit.renale.name = Renale
+
+block.parallax.name = 差扰
 block.cliff.name = 悬崖
 block.sand-boulder.name = 砂岩
-block.basalt-boulder.name = 玄武岩巨石
+block.basalt-boulder.name = 玄武岩石�
 block.grass.name = �地
-block.slag.name = 矿渣
+block.molten-slag.name = 矿渣液
+block.pooled-cryofluid.name = 冷冻液
 block.space.name = 太空
 block.salt.name = �碱地
 block.salt-wall.name = �墙
@@ -1024,11 +1572,11 @@ block.tendrils.name = �须
 block.sand-wall.name = 沙墙
 block.spore-pine.name = 孢�树
 block.spore-wall.name = 孢�墙
-block.boulder.name = 巨石
-block.snow-boulder.name = 雪石
+block.boulder.name = 石�
+block.snow-boulder.name = 雪石�
 block.snow-pine.name = 雪树
 block.shale.name = 页岩地
-block.shale-boulder.name = 页岩巨石
+block.shale-boulder.name = 页岩石�
 block.moss.name = 苔藓地
 block.shrubs.name = �木丛
 block.spore-moss.name = 孢�苔藓地
@@ -1041,28 +1589,32 @@ block.thruster.name = 推进器残骸
 block.kiln.name = 窑炉
 block.graphite-press.name = 石墨压缩机
 block.multi-press.name = 多�压缩机
-block.constructing = {0}\n[lightgray](建造中)
+block.constructing = {0}[lightgray]（建造中）
 block.spawn.name = 敌人出生点
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = �代核心
 block.core-foundation.name = 次代核心
 block.core-nucleus.name = 终代核心
-block.deepwater.name = 深水
-block.water.name = æ°´
+block.deep-water.name = 深水
+block.shallow-water.name = æ°´
 block.tainted-water.name = 污水
-block.darksand-tainted-water.name = 暗沙 污水
+block.deep-tainted-water.name = 深污水
+block.darksand-tainted-water.name = 黑沙污水
 block.tar.name = 石油
 block.stone.name = 石头
-block.sand.name = 沙�
+block.sand-floor.name = 沙�
 block.darksand.name = 黑沙
 block.ice.name = 冰
 block.snow.name = 雪
-block.craters.name = 陨石�
-block.sand-water.name = æ²™ æ°´
-block.darksand-water.name = æš—æ²™ æ°´
+block.crater-stone.name = 陨石�
+block.sand-water.name = 浅滩
+block.darksand-water.name = 黑沙浅滩
 block.char.name = 焦土
-block.dacite.name = 英安岩
-block.dacite-wall.name = 英安岩墙
-block.dacite-boulder.name = 英安巨岩
+block.dacite.name = 安山岩
+block.rhyolite.name = �纹岩
+block.dacite-wall.name = 安山岩墙
+block.dacite-boulder.name = 安山石�
 block.ice-snow.name = 冰雪地
 block.stone-wall.name = 石墙
 block.ice-wall.name = 冰墙
@@ -1078,7 +1630,8 @@ block.spore-cluster.name = 孢�簇
 block.metal-floor.name = 金属地�1
 block.metal-floor-2.name = 金属地�2
 block.metal-floor-3.name = 金属地�3
-block.metal-floor-5.name = 金属地�4
+block.metal-floor-4.name = 金属地�4
+block.metal-floor-5.name = 金属地�5
 block.metal-floor-damaged.name = ��的金属地�
 block.dark-panel-1.name = 暗��1
 block.dark-panel-2.name = 暗��2
@@ -1088,40 +1641,43 @@ block.dark-panel-5.name = 暗��5
 block.dark-panel-6.name = 暗��6
 block.dark-metal.name = 暗金属
 block.basalt.name = 玄武岩
-block.hotrock.name = 热石头
-block.magmarock.name = 岩浆石头
+block.hotrock.name = �热岩石
+block.magmarock.name = 熔�岩石
 block.copper-wall.name = 铜墙
 block.copper-wall-large.name = 大型铜墙
 block.titanium-wall.name = 钛墙
 block.titanium-wall-large.name = 大型钛墙
 block.plastanium-wall.name = 塑钢墙
 block.plastanium-wall-large.name = 大型塑钢墙
-block.phase-wall.name = 相�物墙
-block.phase-wall-large.name = 大型相�物墙
+block.phase-wall.name = 相织布墙
+block.phase-wall-large.name = 大型相织布墙
 block.thorium-wall.name = �墙
 block.thorium-wall-large.name = 大型�墙
 block.door.name = é—¨
 block.door-large.name = 大门
-block.duo.name = �管炮
-block.scorch.name = �焰炮
-block.scatter.name = 分裂炮
-block.hail.name = 冰雹炮
-block.lancer.name = �瑟炮
+block.duo.name = �管
+block.scorch.name = �焰
+block.scatter.name = 分裂
+block.hail.name = 冰雹
+block.lancer.name = �瑟
 block.conveyor.name = 传�带
 block.titanium-conveyor.name = 钛传�带
 block.plastanium-conveyor.name = 塑钢传�带
 block.armored-conveyor.name = 装甲传�带
-block.junction.name = 连接器
+block.junction.name = 交�器
 block.router.name = 路由器
 block.distributor.name = 分�器
 block.sorter.name = 分类器
 block.inverted-sorter.name = ��分类器
 block.message.name = 信��
+block.reinforced-message.name = 强化信��
+block.world-message.name = 世界信��
+block.world-switch.name = 世界开关
 block.illuminator.name = 照明器
 block.overflow-gate.name = 溢�门
 block.underflow-gate.name = ��溢�门
 block.silicon-smelter.name = 硅冶炼厂
-block.phase-weaver.name = 相�物编织器
+block.phase-weaver.name = 相织布编织器
 block.pulverizer.name = 粉碎机
 block.cryofluid-mixer.name = 冷冻液混�器
 block.melter.name = 熔炉
@@ -1129,9 +1685,9 @@ block.incinerator.name = 焚化炉
 block.spore-press.name = 孢�压缩机
 block.separator.name = 分离机
 block.coal-centrifuge.name = 煤炭离心机
-block.power-node.name = 能�节点
-block.power-node-large.name = 大型能�节点
-block.surge-tower.name = 波动能�塔
+block.power-node.name = 电力节点
+block.power-node-large.name = 大型电力节点
+block.surge-tower.name = 巨浪电力塔
 block.diode.name = 二�管
 block.battery.name = 电池
 block.battery-large.name = 大型电池
@@ -1150,16 +1706,16 @@ block.item-source.name = 物��
 block.item-void.name = 物�黑洞
 block.liquid-source.name = 液体�
 block.liquid-void.name = 液体黑洞
-block.power-void.name = 能�黑洞
-block.power-source.name = 无�能�
+block.power-void.name = 电力黑洞
+block.power-source.name = 电力�
 block.unloader.name = 装�器
 block.vault.name = 仓库
 block.wave.name = 波浪
 block.tsunami.name = 海啸
 block.swarmer.name = 蜂群
-block.salvo.name = �射炮
+block.salvo.name = �射
 block.ripple.name = 浪涌
-block.phase-conveyor.name = 相�物传�带桥
+block.phase-conveyor.name = 相织布传�带桥
 block.bridge-conveyor.name = 传�带桥
 block.plastanium-compressor.name = 塑钢压缩机
 block.pyratite-mixer.name = 硫化物混�器
@@ -1168,29 +1724,31 @@ block.solar-panel.name = 太阳能�
 block.solar-panel-large.name = 大型太阳能�
 block.oil-extractor.name = 石油钻井
 block.repair-point.name = 维修点
+block.repair-turret.name = 维修塔
 block.pulse-conduit.name = 脉冲导管
 block.plated-conduit.name = 电镀导管
-block.phase-conduit.name = 相�物导管桥
-block.liquid-router.name = 液体路由器
-block.liquid-tank.name = 储液�
-block.liquid-junction.name = 液体交�器
+block.phase-conduit.name = 相织布导管桥
+block.liquid-router.name = �体路由器
+block.liquid-tank.name = �体储�
+block.liquid-container.name = �体容器
+block.liquid-junction.name = �体交�器
 block.bridge-conduit.name = 导管桥
-block.rotary-pump.name = 回旋泵
+block.rotary-pump.name = 回转泵
 block.thorium-reactor.name = ��应堆
 block.mass-driver.name = 质�驱动器
 block.blast-drill.name = 爆破钻头
-block.thermal-pump.name = 热能泵
+block.impulse-pump.name = 脉冲泵
 block.thermal-generator.name = 热能�电机
-block.alloy-smelter.name = �金冶炼厂
-block.mender.name = 修�器
-block.mend-projector.name = 修�投影器
-block.surge-wall.name = 波动墙
-block.surge-wall-large.name = 大型波动墙
+block.surge-smelter.name = �金冶炼厂
+block.mender.name = 修�器
+block.mend-projector.name = 修�投影
+block.surge-wall.name = �金墙
+block.surge-wall-large.name = 大型�金墙
 block.cyclone.name = 气旋
 block.fuse.name = é›·å…‰
 block.shock-mine.name = 脉冲地雷
-block.overdrive-projector.name = 超速投影器
-block.force-projector.name = 力墙投影器
+block.overdrive-projector.name = 超速投影
+block.force-projector.name = 力墙投影
 block.arc.name = 电弧
 block.rtg-generator.name = RTG �电机
 block.spectre.name = 幽�
@@ -1198,9 +1756,9 @@ block.meltdown.name = 熔�
 block.foreshadow.name = 厄兆
 block.container.name = 容器
 block.launch-pad.name = �射�
-block.launch-pad-large.name = 大型�射�
-block.segment.name = 裂解光�
-block.command-center.name = 指挥中心
+block.advanced-launch-pad.name = 新�射�
+block.landing-pad.name = �陆�
+block.segment.name = 裂解
 block.ground-factory.name = 陆军工厂
 block.air-factory.name = 空军工厂
 block.naval-factory.name = 海军工厂
@@ -1210,14 +1768,181 @@ block.exponential-reconstructor.name = 多幂级���构工厂
 block.tetrative-reconstructor.name = 无�级���构工厂
 block.payload-conveyor.name = 载�传�带
 block.payload-router.name = 载�路由器
+block.duct.name = 物�管�
+block.duct-router.name = 物�管�路由器
+block.duct-bridge.name = 物�管�桥
+block.large-payload-mass-driver.name = 大型载�质�驱动器
+block.payload-void.name = 载�黑洞
+block.payload-source.name = 载��
 block.disassembler.name = 解离机
 block.silicon-crucible.name = 热能�埚
-block.overdrive-dome.name = 超速穹顶投射器
-#experimental, may be removed
-block.block-forge.name = 方�熔炉
-block.block-loader.name = 方�装载机
-block.block-unloader.name = 方��载机
+block.overdrive-dome.name = 超速穹顶
 block.interplanetary-accelerator.name = 行星际加速器
+block.constructor.name = 构筑器
+block.constructor.description = 构筑 1x1 至 2x2 大�的方�。
+block.large-constructor.name = 大型构筑器
+block.large-constructor.description = 构筑 3x3 至 4x4 大�的方�。
+block.deconstructor.name = 大型解构器
+block.deconstructor.description = 解构方�和��，返还100%资�。
+block.payload-loader.name = 载�装载器
+block.payload-loader.description = �载�方�装载液体和物�。
+block.payload-unloader.name = 载��载器
+block.payload-unloader.description = 从载�方��载液体和物�。
+block.heat-source.name = 热��
+block.heat-source.description = 无�输出热�，仅�沙盒。
+
+#埃里克尔
+block.empty.name = 空
+block.rhyolite-crater.name = �纹岩�
+block.rough-rhyolite.name = 粗糙�纹岩
+block.regolith.name = �纹岩
+block.yellow-stone.name = 黄石
+block.carbon-stone.name = 碳石
+block.ferric-stone.name = �石
+block.ferric-craters.name = �陨石�
+block.beryllic-stone.name = �石
+block.crystalline-stone.name = 晶石
+block.crystal-floor.name = 晶石地�
+block.yellow-stone-plates.name = 黄石地�
+block.red-stone.name = 红石
+block.dense-red-stone.name = 高密红石
+block.red-ice.name = 红冰
+block.arkycite-floor.name = 芳油
+block.arkyic-stone.name = 芳石
+block.rhyolite-vent.name = �纹石喷�
+block.carbon-vent.name = 碳石喷�
+block.arkyic-vent.name = 芳石喷�
+block.yellow-stone-vent.name = 黄石喷�
+block.red-stone-vent.name = 红石喷�
+block.crystalline-vent.name = 晶石喷�
+block.redmat.name = 红地垫
+block.bluemat.name = �地垫
+block.core-zone.name = 核心区
+block.regolith-wall.name = 风化墙
+block.yellow-stone-wall.name = 黄石墙
+block.rhyolite-wall.name = �纹岩墙
+block.carbon-wall.name = 碳石墙
+block.ferric-stone-wall.name = �石墙
+block.beryllic-stone-wall.name = �石墙
+block.arkyic-wall.name = 芳石墙
+block.crystalline-stone-wall.name = 晶石墙
+block.red-ice-wall.name = 红冰墙
+block.red-stone-wall.name = 红石墙
+block.red-diamond-wall.name = 红钻墙
+block.redweed.name = 赤藻
+block.pur-bush.name = 紫�木丛
+block.yellowcoral.name = 黄�瑚
+block.carbon-boulder.name = 碳石�
+block.ferric-boulder.name = �石�
+block.beryllic-boulder.name = �石�
+block.yellow-stone-boulder.name = 黄石�
+block.arkyic-boulder.name = 芳石�
+block.crystal-cluster.name = 水晶簇
+block.vibrant-crystal-cluster.name = 鲜艳水晶簇
+block.crystal-blocks.name = 风化晶体
+block.crystal-orbs.name = 晶石�
+block.crystalline-boulder.name = 晶石�
+block.red-ice-boulder.name = 红冰石�
+block.rhyolite-boulder.name = �纹石�
+block.red-stone-boulder.name = 红石�
+block.graphitic-wall.name = 石墨墙
+block.silicon-arc-furnace.name = 电弧硅炉
+block.electrolyzer.name = 电解机
+block.atmospheric-concentrator.name = 大气收集器
+block.oxidation-chamber.name = 氧化室
+block.electric-heater.name = 电制热机
+block.slag-heater.name = 矿渣制热机
+block.phase-heater.name = 相织制热机
+block.heat-redirector.name = 热�传输机
+block.small-heat-redirector.name = �型热�传输机
+block.heat-router.name = 热�路由器
+block.slag-incinerator.name = 矿渣焚化炉
+block.carbide-crucible.name = 碳化物�埚
+block.slag-centrifuge.name = 矿渣离心机
+block.surge-crucible.name = �金�埚
+block.cyanogen-synthesizer.name = 氰��机
+block.phase-synthesizer.name = 相织布��机
+block.heat-reactor.name = 热��应堆
+block.beryllium-wall.name = �墙
+block.beryllium-wall-large.name = 大型�墙
+block.tungsten-wall.name = 钨墙
+block.tungsten-wall-large.name = 大型钨墙
+block.blast-door.name = 防爆闸门
+block.carbide-wall.name = 碳化物墙
+block.carbide-wall-large.name = 大型碳化物墙
+block.reinforced-surge-wall.name = 强化�金墙
+block.reinforced-surge-wall-large.name = 大型强化�金墙
+block.shielded-wall.name = 盾墙
+block.radar.name = é›·è¾¾
+block.build-tower.name = 建造塔
+block.regen-projector.name = �生投影器
+block.shockwave-tower.name = 震爆塔
+block.shield-projector.name = 护盾投影器
+block.large-shield-projector.name = 大型护盾投影器
+block.armored-duct.name = 装甲管�
+block.overflow-duct.name = 溢�管�
+block.underflow-duct.name = ��溢�管
+block.duct-unloader.name = 管�装�器
+block.surge-conveyor.name = �金传�带
+block.surge-router.name = �金路由器
+block.unit-cargo-loader.name = ��物�装载器
+block.unit-cargo-unload-point.name = ��物��载点
+block.reinforced-pump.name = 强化泵
+block.reinforced-conduit.name = 强化导管
+block.reinforced-liquid-junction.name = 强化�体交�器
+block.reinforced-bridge-conduit.name = 强化�体带桥
+block.reinforced-liquid-router.name = 强化�体路由器
+block.reinforced-liquid-container.name = 强化�体容器
+block.reinforced-liquid-tank.name = 强化�体储�
+block.beam-node.name = 激光节点
+block.beam-tower.name = 激光塔
+block.beam-link.name = 激光连接器
+block.turbine-condenser.name = 涡轮冷�器
+block.chemical-combustion-chamber.name = 化学燃烧室
+block.pyrolysis-generator.name = 热解�生器
+block.vent-condenser.name = 排气冷�器
+block.cliff-crusher.name = 墙�粉碎机
+block.large-cliff-crusher.name = 高级墙�粉碎机
+block.plasma-bore.name = 等离�钻机
+block.large-plasma-bore.name = 大型等离�钻机
+block.impact-drill.name = 冲击钻头
+block.eruption-drill.name = 爆裂钻头
+block.core-bastion.name = 城堡核心
+block.core-citadel.name = 堡垒核心
+block.core-acropolis.name = �城核心
+block.reinforced-container.name = 强化容器
+block.reinforced-vault.name = 强化仓库
+block.breach.name = 撕裂
+block.sublimate.name = ��
+block.titan.name = 泰�
+block.disperse.name = 驱离
+block.afflict.name = 劫难
+block.lustre.name = 光辉
+block.scathe.name = 创伤
+block.tank-refabricator.name = �克�构厂
+block.mech-refabricator.name = 机甲�构厂
+block.ship-refabricator.name = 飞船�构厂
+block.tank-assembler.name = �克组装厂
+block.ship-assembler.name = 飞船组装厂
+block.mech-assembler.name = 机甲组装厂
+block.reinforced-payload-conveyor.name = 强化载�传�带
+block.reinforced-payload-router.name = 强化载�路由器
+block.payload-mass-driver.name = 载�质�驱动器
+block.small-deconstructor.name = 解构器
+block.canvas.name = 画�
+block.world-processor.name = 世界处�器
+block.world-cell.name = 世界内存元
+block.tank-fabricator.name = �克制造厂
+block.mech-fabricator.name = 机甲制造厂
+block.ship-fabricator.name = 飞船制造厂
+block.prime-refabricator.name = 高级��构工厂
+block.unit-repair-tower.name = ��维修塔
+block.diffuse.name = 扩散
+block.basic-assembler-module.name = 基本装�厂模�
+block.smite.name = 天谴
+block.malign.name = 魔�
+block.flux-reactor.name = 通��应堆
+block.neoplasia-reactor.name = 瘤��应堆
 
 block.switch.name = 开关
 block.micro-processor.name = 微型处�器
@@ -1228,253 +1953,729 @@ block.large-logic-display.name = 大型逻辑显示�
 block.memory-cell.name = 内存元
 block.memory-bank.name = 内存库
 
-team.blue.name = �
+team.malis.name = ç´«
 team.crux.name = 红
 team.sharded.name = 黄
-team.orange.name = æ©™
 team.derelict.name = �
 team.green.name = 绿
-team.purple.name = ç´«
+team.blue.name = �
 
 hint.skip = 跳过
-hint.desktopMove = 使用[accent][[WASD][]�移动.
-hint.zoom = 滚动[accent]鼠标滚轮[]放大或缩�.
-hint.mine = 移动到\uf8c4 铜矿附近并[accent]点按[]进行手动开采.
-hint.desktopShoot = [accent][[鼠标左键][]射击.
-hint.depositItems = �转移物�，请将其从飞船上拖到核心。
-hint.respawn = �于核心中�生，请按[accent][[V][].
-hint.respawn.mobile = 您已切�控制�元/结构. 如果��生飞船，请[accent]点击左上方的图标(您的�元/结构图标).[]
-hint.desktopPause = 按[accent][[Space][]暂�和�消暂�游�.
-hint.placeDrill = 选择�下角��中的\ue85e [accent]钻头[]分类，然�选择一个\uf870 [accent]钻头[]然��击铜矿将其放置.
-hint.placeDrill.mobile = 选择�下角��中的\ue85e [accent]钻头[]分类，然�选择一个\uf870 [accent]钻头[]，然�点击铜矿将其放置.\n\n点击�下角\ue800 [accent]�选标记[]以确认.
-hint.placeConveyor = 传�带将物�从钻头移到其他方�中。从\ue814 [accent]布局[]分类选择\uf896 [accent]传�带[].\n\n�击并拖动以放置多个传�带.\n[accent]滚动[]以旋转.
-hint.placeConveyor.mobile = 传�带将物�从钻头移到其他�中。从\ue814 [accent]布局[]分类选择\uf896 [accent]传�带[].\n\n长按一秒钟，然�拖动以放置多个传�带.
-hint.placeTurret = 放置\uf861 [accent]炮塔[]以抵御敌人，��你的核心.\n\n炮塔需�弹�-\uf838 铜.\n使用传�带和钻头为它们供弹。
-hint.breaking = [accent]�击[]并拖动以拆除方�.
-hint.breaking.mobile = 点击在�下角的\ue817 [accent]锤�[]点击以拆除方�.\n\n按�手指一秒钟，然�拖动并选择.
-hint.research = 点击\ue875 [accent]科技树[]按钮研究新技术.
-hint.research.mobile = 点击在\ue88c [accent]��[]中的\ue875 [accent]科技树[]按钮以研究新技术.
-hint.unitControl = 按�[accent][[L-ctrl][]并[accent]点击[]�军��或炮塔�进行控制。
-hint.unitControl.mobile = [accent][�击][]�军��或炮塔�进行控制。
-hint.launch = 一旦收集到足够的资�，您就�以通过从�下角的\ue827 [accent]地图[]选择附近的区域[accent]�射[]核心.
-hint.launch.mobile = 一旦收集到足够的资�，您就�以通过在\ue88c [accent]��[]的\ue827 [accent]地图[]选择附近的区域[accent]�射[]核心.
-hint.schematicSelect = 按�[accent][[F][]并拖动以选择��制和粘贴的�.\n\n[accent][鼠标中键][]�制�个�类型.
-hint.conveyorPathfind = 按�[accent][[L-Ctrl][]拖动传�带并使其自动寻路.
-hint.conveyorPathfind.mobile = �用\ue844 [accent]传�带自动寻路[]并拖动，传�带会自动生�路径.
-hint.boost = 按�[accent][[L-Shift][]用当���飞越障�物.\n\n但�有少数地���有助推器.
-hint.command = 按�[accent][[G][]指挥附近的��编队.
-hint.command.mobile = [accent][[�击][]您的部队指挥附近的部队编队.
-hint.payloadPickup = 按[accent][[[]�起�方�或��.
-hint.payloadPickup.mobile = [accent]长按一个�方�或一个����起�.
-hint.payloadDrop = 按[accent]][]放下有效载�.
-hint.payloadDrop.mobile = [accent]点�[]一个空的�置将有效载�丢到那里.
-hint.waveFire = [accent]波浪[]炮塔加水弹�会自动扑�附近的�.
-hint.generator = \uf879 [accent]燃烧�电机[]燃烧煤炭并将电力传输到相邻方�.\n\n用\uf87f [accent]能�节点[]�以扩展电力传输范围.
-hint.guardian = [accent]Boss[]��装甲厚�.[accent]铜[]和[accent]铅[]这类较弱的�弹对其[scarlet]作用�佳[].\n\n使用高级别炮塔或使用\uf835 [accent]石墨[]作为\uf861 �管炮�\uf859 �射炮的弹��消�Boss.
+hint.desktopMove = 使用[accent][[WASD][]键移动。
+hint.zoom = 滚动[accent]鼠标滚轮[]放大或缩�。
+hint.desktopShoot = [accent][[鼠标左键][]射击。
+hint.depositItems = �转移物�，请将其从飞船上拖动到核心中。
+hint.respawn = �以�始飞船的形��生，请按[accent][[V][]键。
+hint.respawn.mobile = 您正在控制�个��或建筑。 �以�始飞船的形��生，请[accent]点击左上方的图标（您的��/建筑图标）。[]
+hint.desktopPause = 按[accent][[空格][]键暂�或��游�。
+hint.breaking = 按�[accent]�键[]拖动以拆除建筑。
+hint.breaking.mobile = 激活�下角的\ue817[accent]锤�[]并点击以拆除建筑。  \n\n长按一秒�拖动，�拆除范围内多个建筑。
+hint.blockInfo = �查看建筑信�，�以先在[accent]建造��[]中选择建筑，然�点击�侧的[accent][[?][]按钮。
+hint.derelict = [accent]废墟[]建筑是已废弃基地的残骸。 \n\n�以[accent]拆除[]这些建筑获�资�。
+hint.research = 点击\ue875[accent]科技树[]按钮研究新科技。
+hint.research.mobile = 点击\ue88c[accent]��[]中的\ue875[accent]科技树[]按钮以研究新科技。
+hint.unitControl = 按�[accent][[L-ctrl][]键并[accent]点击[]己方��或炮塔进行控制。
+hint.unitControl.mobile = [accent][�击][]己方��或炮塔进行控制。
+hint.unitSelectControl = 按[accent]L-shift[]键进入[accent]指挥模�[]以控制��。\n在指挥模�下，点击并拖动框选��。[accent]�键[]命令��移动或攻击。
+hint.unitSelectControl.mobile = 按左下角的[accent]指挥[]按钮进入[accent]指挥模�[]以控制��。\n在指挥模�下，长按并拖动框选��。[accent]点击[]命令��移动或攻击。
+hint.launch = 一旦收集了足够的资�，您就�以通过�下角的\ue827[accent]地图[]选择附近的区�[accent]�射[]核心。
+hint.launch.mobile = 一旦收集到足够的资�，您就�以通过\ue88c[accent]��[]中的\ue827[accent]地图[]选择附近的区�[accent]�射[]核心。
+hint.schematicSelect = 按�[accent][[F][]键用鼠标框选建筑以�制粘贴。 \n\n[accent][鼠标中键][]�制�个建筑。
+hint.rebuildSelect = 按�[accent][[B][]用鼠标框选被摧�的建筑以自动�建。
+hint.rebuildSelect.mobile = 选择\ue874�制按钮，然�点击\ue80f�建按钮并拖动以选中被摧�的建筑。\n这将自动�建这些建筑。
 
-item.copper.description = 用于所有类型的建筑和弹�。
-item.copper.details = 铜。在塞普罗上的异常丰富的金属。��加固，结构会较脆弱。
-item.lead.description = 用于液体输�和电气结构。
-item.lead.details = 致密且呈惰性。广泛用于电池中。\n注�：�能对生物生命体有毒。虽说这里还有很多。
-item.metaglass.description = 用于液体传输/储存结构。
-item.graphite.description = 用于电�元件和炮塔弹�。
+hint.conveyorPathfind = 按�[accent][[L-Ctrl][]键并拖动传�带，使其自动寻路。
+hint.conveyorPathfind.mobile = �用\ue844[accent]传�带自动寻路[]�，拖动传�带�使其自动寻路。
+hint.boost = 按�[accent][[L-Shift][]控制当���助推，�飞越障�物。 \n\n�有一部分地���有助推功能。
+hint.payloadPickup = 按[accent][[[]键拾��型建筑或��作为载�。
+hint.payloadPickup.mobile = [accent]长按[]拾�一个�型建筑或��作为载�。
+hint.payloadDrop = 按[accent]][]键放下载�。
+hint.payloadDrop.mobile = [accent]长按[]一个空的�置将载�放在那里。
+hint.waveFire = [accent]波浪[]炮塔以水作弹�时，会自动扑�附近的�焰。
+hint.generator = \uf879[accent]�力�电机[]燃煤�电，并将电力输�至相邻建筑。 \n\n用\uf87f[accent]电力节点[]�以扩展电力输�范围。
+hint.guardian = [accent]Boss[]��装甲厚�。 [accent]铜[]和[accent]铅[]这类较弱的�弹对其[scarlet]作用�佳[]。 \n\n使用高级别炮塔或使用\uf835[accent]石墨[]作为\uf861�管炮�\uf859�射炮的弹��消�Boss。
+hint.coreUpgrade = 核心�以通过[accent]在上�覆盖更高等级的核心[]进行�级。 \n\n在\uf869[accent]�代核心[]上放置一个\uf868[accent]次代核心[]。 确�周围没有障�物。
+hint.presetLaunch = �色的[accent]�陆区�[]，如[accent]冰冻森林[]，从其他任何地方�射都�以到达，�需�先�领邻近的区�。 \n\n[accent]数字编�的区�[]，比如这个，�以[accent]选择性[]�领。
+hint.presetDifficulty = 这个区��敌人[scarlet]��程度很高[]。 \n解�适当的科技，并�好充分准备，�则[accent]�建议[]�这里�射。
+hint.coreIncinerate = 核心内一�物�达到容�上��，��物��进入时会被[accent]销�[]。
+hint.factoryControl = 如果�设置���工厂的[accent]集�点[]，在指挥模�下点击该��工厂，然��键点击��置，由它制造的��将会自动移动到那里。
+hint.factoryControl.mobile = 如果�设置���工厂的[accent]集�点[]，在指挥模�下点击该��工厂，然��点击��置，由它制造的��将会自动移动到那里。
+
+gz.mine = 接近\uf8c4[accent]铜矿[]并点击以手动开采。
+gz.mine.mobile = 接近\uf8c4[accent]铜矿[]并点击以手动开采。
+gz.research = 打开\ue875科技树。\n研究\uf870[accent]机械钻头[]，然�在�下角的��中将其选中。\n点击铜矿放置钻头。
+gz.research.mobile = 打开\ue875科技树。\n研究\uf870[accent]机械钻头[]，然�在�下角的��中将其选中。\n点击铜矿放置钻头。\n\n点击�下角的\ue800[accent]勾[]以确认。
+gz.conveyors = 研究并放置\uf896[accent]传�带[]\n将钻头挖掘的矿物移至核心。\n\n点击并拖动以连续放置传�带。\n滚动[accent]鼠标滚轮[]以转�。
+gz.conveyors.mobile = 研究并放置\uf896[accent]传�带[]\n将钻头挖掘的矿物移至核心。\n\n长按一秒，然�拖动以连续放置传�带。
+gz.drills = 扩大挖掘规模。\n放置更多的机械钻头。\n挖掘100铜。
+gz.lead = \uf837[accent]铅[]是�一�常用资�。\n用钻头挖掘铅矿。
+gz.moveup = \ue804扩张以推进任务。
+gz.turrets = 研究并放置2个\uf861[accent]�管[]��核心。\n�管需�传�带供给\uf838[accent]弹�[]。
+gz.duoammo = 用传�带给�管供给[accent]铜[]。
+gz.walls = [accent]墙[]�以防止建筑�到伤害。\n在炮塔周围放置一些\uf8ae[accent]铜墙[]。
+gz.defend = 敌人�袭，准备防御。
+gz.aa = 普通炮塔难以快速击�空中��。\n\uf860[accent]分裂[]防空能力出色，但使用[accent]铅[]弹�。
+gz.scatterammo = 用传�带给分裂供给[accent]铅[]。
+gz.supplyturret = [accent]给炮塔供弹
+gz.zone1 = 这是敌人的出生点。
+gz.zone2 = 波次开始时，范围内的所有建筑都会被摧�。
+gz.zone3 = 波次�将开始。\n�好准备。
+gz.finish = 建造更多炮塔，挖掘更多资�，\n击退所有波次以[accent]�领区�[]。
+
+onset.mine = 点击墙�上的\uf748[accent]�矿[]以手动开采。\n\n使用[accent][[WASD]移动。
+onset.mine.mobile = 点击墙�上的\uf748[accent]�矿[]以手动开采。
+onset.research = 打开\ue875科技树。\n研究\uf73e[accent]涡轮冷�器[]，并放置在喷�上。\n它�以产生[accent]电力[]。
+onset.bore = 研究并放置\uf741[accent]等离�钻机[]。\n它�以自动挖掘墙上的资�。
+onset.power = 为了给等离�钻机�供[accent]电力[]，研究并放置一个\uf73d[accent]激光节点[]。\n它会连接涡轮冷�器与等离�钻机。
+onset.ducts = 研究并放置\uf799[accent]物�管�[]将等离�钻机挖掘的矿物移至核心。\n\n点击并拖动以连续放置物�管�。\n滚动[accent]鼠标滚轮[]以转�。
+onset.ducts.mobile = 研究并放置\uf799[accent]物�管�[]将等离�钻机挖掘的矿物移至核心。\n\n长按一秒，然�拖动以连续放置物�管�。
+onset.moremine = 扩大挖掘规模。\n放置更多的等离�钻机，并用激光节点与物�管��使它们正常工作。\n挖掘200�。
+onset.graphite = �建造更高级的建筑，需�\uf835[accent]石墨[]。\n使用等离�钻机挖掘石墨。
+onset.research2 = 开始研究[accent]工厂[]。\n研究\uf74d[accent]墙�粉碎机[]和\uf779[accent]电弧硅炉[]。
+onset.arcfurnace = 电弧硅炉需�\uf834[accent]沙[]与\uf835[accent]石墨[]以冶炼\uf82f[accent]硅[]。\n它也需�[accent]电力[]。
+onset.crusher = 使用\uf74d[accent]墙�粉碎机[]挖掘沙。
+onset.fabricator = 使用[accent]��[]探索地图，进行防御，�动攻击。\n研究并放置一个\uf6a2[accent]�克制造厂[]。
+onset.makeunit = 生产��。\n点击"?"以显示生产��所需资�。
+onset.turrets = 使用��防御很有效，但��使用[accent]炮塔[]�以�供更好的防御力。\n放置一个\uf6eb[accent]撕裂[]。\n炮塔需�供给\uf748[accent]弹�[]。
+onset.turretammo = 给炮塔供给[accent]�[]。
+onset.walls = [accent]墙[]�以防止建筑�到伤害。\n在炮塔周围放置一些\uf6ee[accent]�墙[]。
+onset.enemies = 敌人�袭，准备防御。
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.attack = 敌军基地�分脆弱。 �动�攻。
+onset.cores = 你�以在[accent]核心地�[]上建造新的核心。\n新核心的功能类似于�沿基地，且与其他核心共享资�仓库。\n放置一个\uf725核心。
+onset.detect = 敌军将在2分钟内�现你。\n设立防御，挖掘矿物，并建造生产设施。
+onset.commandmode = 按�[accent]shift[]键进入[accent]指挥模�[]。\n按�[accent]鼠标左键[]框选��。\n[accent]�键[]指挥所选��移动或攻击。
+onset.commandmode.mobile = 点击左下角的[accent]指挥[]进入[accent]指挥模�[]。\n按��幕，[accent]拖动[]框选��。\n[accent]点击[]指挥所选��移动或攻击。
+aegis.tungsten = 钨�以使用[accent]冲击钻[]进行开采。\n该结构需�[accent]水[]和[accent]电力[]。
+
+split.pickup = 核心���以拾�一些方�。\n拾�这个[accent]强化容器[]并将其放到[accent]载�装载器[]中。\n（默认使用快�键“[�拾�载�，“]“放下载�）
+split.pickup.mobile = 核心���以拾�一些方�。\n拾�这个[accent]强化容器[]并将其放到[accent]载�装载器[]中。\n（长按以拾�或放下载�）
+split.acquire = 你需�获�钨�生产��。
+split.build = ��必须被�输到墙的�一侧。\n在墙�两侧�放置一个[accent]载�质�驱动器[]。\n点击其中一个，然�点击�一个以连接它们。
+split.container = 与强化容器类似，��也�以使用[accent]载�质�驱动器[]�输。\n在载�质�驱动器�放置��制造厂以�其装载��，然�将���输到墙的�一侧，摧�敌方基地。
+
+item.copper.description = 用于建造大多数建筑，或作为弹�使用。
+item.copper.details = 铜，塞普罗星上异常丰富的金属。 ��处�的�，结构很脆弱。
+item.lead.description = 用于建造液体输�和电力相关的建筑。
+item.lead.details = 致密，惰性，广泛用于电池中。 \n注�：�能对生命体有毒，虽说这里已�没有多少生物了。
+item.metaglass.description = 用于建造输�或储存液体的建筑。
+item.graphite.description = 用于制造电�元件，或作为炮塔弹�。
 item.sand.description = 用于生产其他精炼�料。
-item.coal.description = 用于燃料和精炼�料生产。
-item.coal.details = 似乎是�物的化石，在孢��出现�很久就形�了。
-item.titanium.description = 用于液体�输结构�钻头和飞行器。
-item.thorium.description = 用于�用结构和核燃料。
-item.scrap.description = 用于熔炉和粉碎机�精炼�其他�料。
-item.scrap.details = 旧结构和��的残余物。
-item.silicon.description = 用于太阳能�，��的电气元件和追踪性弹�。
-item.plastanium.description = 用于先进����缘和分裂性弹�。
-item.phase-fabric.description = 用于高级电�设备和自修�结构。
-item.surge-alloy.description = 用于先进武器和�应防御结构。
-item.spore-pod.description = 用于转化�石油�爆炸物和燃料。
-item.spore-pod.details = 孢�。�能是人工��的生命形�。释放对其他生物有毒的气体。�具侵略性。在�些�件下高度易燃。
-item.blast-compound.description = 用于炸弹和爆炸性弹�。
-item.pyratite.description = 用于燃烧武器和燃烧燃料�电机。
+item.coal.description = 用作燃料，或用于精炼�料生产。
+item.coal.details = 似乎是�物的化石，在孢�出现很久�就形�了。
+item.titanium.description = 用于液体输�建筑� 钻头和工厂。
+item.thorium.description = 用于�用建筑以�作为核燃料。
+item.scrap.description = 用于在熔炉和粉碎机中精炼�其他�料。
+item.scrap.details = 废旧建筑和��的残骸。
+item.silicon.description = 用于太阳能�� ��的电气元件或作为追踪性弹�。
+item.plastanium.description = 用于高级��� �缘�料，或作为分裂性弹�。
+item.phase-fabric.description = 用于高级电�设备和自修�建筑。
+item.surge-alloy.description = 用于先进武器和�应防御建筑。
+item.spore-pod.description = 用于转化�石油� 爆炸混�物或作为燃料。
+item.spore-pod.details = 孢�。 �能是人工��的生命形�，释放对其他生物有毒的气体，�具侵略性。 在�些�件下高度易燃。
+item.blast-compound.description = 用作炸弹或爆炸性弹�。
+item.pyratite.description = 用于�焰�射类武器和使用燃料的�电设备。
+
+#埃里克尔
+item.beryllium.description = 用于埃里克尔的多�建筑和弹�。
+item.tungsten.description = 用于钻头� 装甲和弹�。 用于建造更先进的建筑。
+item.oxide.description = 用作热导体和�缘体。
+item.carbide.description = 用于先进的建筑� �型��和弹�。
 
 liquid.water.description = 用于冷�机器和废物处�。
 liquid.slag.description = 在分离器中�炼�金属�分，或作为武器弹�喷�敌人。
-liquid.oil.description = 用于先进�料生产和燃烧弹�。
-liquid.cryofluid.description = 用作�应堆�炮塔和工厂的冷�剂。
+liquid.oil.description = 用于先进�料生产和喷射类武器。
+liquid.cryofluid.description = 用作�应堆� 炮塔和工厂的冷�剂。
 
-block.resupply-point.description = 为附近的部队�供铜弹�。与需�电池供电的设备�兼容。
-block.armored-conveyor.description = ��方移动物�。�接�边上的输入。
-block.illuminator.description = 释放光�。
-block.message.description = �存一�文字信�。用于队�之间进行交�。
+#埃里克尔
+liquid.arkycite.description = 用于�电和���料的化学�应。
+liquid.ozone.description = 用作�料生产的氧化剂和燃料。 有一定爆炸性。
+liquid.hydrogen.description = 用于资�开采� ��生产和结构修�。 易燃。
+liquid.cyanogen.description = 用于构建高级建筑和��，也用作弹�。 高度易燃。
+liquid.nitrogen.description = 用于资�开采� 气体生产和��生产。
+liquid.neoplasm.description = 瘤��应堆产出的�险生物性副产物。 会很快扩散至它能接触到的�水方�并破�它们。 有粘性。
+liquid.neoplasm.details = 瘤液。 由一�无法控制并快速分裂的��细胞团组�，具有污泥状的粘稠度。 �热。 对任何�有水的结构�为�险。\n\n从标准分��看过于��和�稳定，潜在的应用未知。 建议在矿渣池中焚�。
+
+block.derelict = \uf77e[lightgray]废墟
+block.armored-conveyor.description = ���输物�，�接�侧�输入，除��自其他传�带。
+block.illuminator.description = �供照明。
+block.message.description = �存文字信�，用于队�间进行交�。
+block.reinforced-message.description = �存文字信�，用于队�间进行交�。
+block.world-message.description = 一个用于制图的信��。 无法被摧�。
 block.graphite-press.description = 将煤炭压缩为石墨。
-block.multi-press.description = 将煤炭压缩为石墨。需�水进行冷�。
+block.multi-press.description = 将煤炭压缩为石墨，需�水进行冷�。
 block.silicon-smelter.description = 将沙和煤炭精炼为硅。
 block.kiln.description = 将沙和铅熔炼为钢化玻璃。
 block.plastanium-compressor.description = 用石油和钛生产塑钢。
-block.phase-weaver.description = 从�和沙��相�物。
-block.alloy-smelter.description = 将钛�铅�硅和铜熔��巨浪�金。
+block.phase-weaver.description = 用�和沙��相织布。
+block.surge-smelter.description = 将钛� 铅� 硅和铜熔炼�巨浪�金。
 block.cryofluid-mixer.description = 将水和细钛粉混�制�冷冻液。
-block.blast-mixer.description = 从硫化物和孢��中产生爆炸化�物。
-block.pyratite-mixer.description = 把煤�铅和沙�混和为硫化物。
-block.melter.description = 将废料熔化�矿渣。
-block.separator.description = 将矿渣分离�矿物�分。
+block.blast-mixer.description = 利用硫化物和孢��生产爆炸混�物。
+block.pyratite-mixer.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.item-void.description = 销�输入的所有物�。仅�沙盒。
-block.liquid-source.description = 无�输出液体。仅�沙盒。
-block.liquid-void.description = 移除输入的所有液体。仅�沙盒。
-block.copper-wall.description = �护己方结构，挡下敌方炮弹。
-block.copper-wall-large.description = �护己方结构，挡下敌方炮弹。
-block.titanium-wall.description = �护己方结构，挡下敌方炮弹。
-block.titanium-wall-large.description = �护己方结构，挡下敌方炮弹。
-block.plastanium-wall.description = �护己方结构，挡下敌方炮弹。�收激光和电弧。阻止电力节点自动连接。
-block.plastanium-wall-large.description = �护己方结构，挡下敌方炮弹。�收激光和电弧。阻止电力节点自动连接。
-block.thorium-wall.description = �护己方结构，挡下敌方炮弹。
-block.thorium-wall-large.description = �护己方结构，挡下敌方炮弹。
-block.phase-wall.description = �护己方结构，挡下敌方炮弹。在�攻击时�射大多数�弹。
-block.phase-wall-large.description = �护己方结构，挡下敌方炮弹。在�攻击时�射大多数�弹。
-block.surge-wall.description = �护己方结构，挡下敌方炮弹。�攻击时定期释放电弧。
-block.surge-wall-large.description = �护己方结构，挡下敌方炮弹。�攻击时定期释放电弧。
+block.power-void.description = 消耗输入的所有电力，仅�沙盒。
+block.power-source.description = 无�输出电力，仅�沙盒。
+block.item-source.description = 无�输出物�，仅�沙盒。
+block.item-void.description = 销�输入的所有物�，仅�沙盒。
+block.liquid-source.description = 无�输出液体，仅�沙盒。
+block.liquid-void.description = 蒸�输入的所有液体，仅�沙盒。
+block.payload-source.description = 无�输出载�，仅�沙盒。
+block.payload-void.description = 销�输入的所有载�，仅�沙盒。
+block.copper-wall.description = �护己方建筑，挡下敌方炮弹。
+block.copper-wall-large.description = �护己方建筑，挡下敌方炮弹。
+block.titanium-wall.description = �护己方建筑，挡下敌方炮弹。
+block.titanium-wall-large.description = �护己方建筑，挡下敌方炮弹。
+block.plastanium-wall.description = �护己方建筑，挡下敌方炮弹。 能�收激光和电弧，但也会阻止电力节点自动连接。
+block.plastanium-wall-large.description = �护己方建筑，挡下敌方炮弹。 能�收激光和电弧，但也会阻止电力节点自动连接。
+block.thorium-wall.description = �护己方建筑，挡下敌方炮弹。
+block.thorium-wall-large.description = �护己方建筑，挡下敌方炮弹。
+block.phase-wall.description = �护己方建筑，挡下敌方炮弹。 �大多数�弹攻击时有概率将其�弹。
+block.phase-wall-large.description = �护己方建筑，挡下敌方炮弹。 �大多数�弹攻击时有概率将其�弹。
+block.surge-wall.description = �护己方建筑，挡下敌方炮弹。 �攻击时间断释放电弧。
+block.surge-wall-large.description = �护己方建筑，挡下敌方炮弹。 �攻击时间断释放电弧。
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = �以开关的墙。
 block.door-large.description = �以开关的墙。
-block.mender.description = 定期修�附近的区�。\n�使用硅��高范围和效率。
-block.mend-projector.description = 修�其附近的区�。\n�使用相�物��高射程和效率。
-block.overdrive-projector.description = �高附近建筑物的速度。\n�使用相�物��高射程和效率。
-block.force-projector.description = 在自身周围创建一个六角形力场，使里�的建筑物和����伤害。\n�续承�高伤害会导致过热，�以使用冷�液�温。相织物�用于增加护盾大�。
+block.mender.description = 定期修�附近的建筑。\n�使用硅�高范围和效率。
+block.mend-projector.description = 定期修�附近的建筑。\n�使用相织布�高范围和效率。
+block.overdrive-projector.description = ��附近建筑的工作效率。\n�使用相织布�高范围和效率。
+block.force-projector.description = 在自身周围创建一个六边形力场，使里�的建筑和����伤害。\n承�过多伤害会导致过热，�以使用冷�液�温。 相织布�用于增加力场尺寸。
 block.shock-mine.description = 对踩到它的敌人释放电弧进行攻击。
-block.thermal-pump.description = 终级液泵。
-block.conveyor.description = 将物���输�。
-block.titanium-conveyor.description = 将物���输�。快于�级传�带。
-block.plastanium-conveyor.description =  打包物�进行�输。\n在�方输入物�，在�方三个方�输出物�。需�多个装载和�载点�能达到峰值载�。
+block.conveyor.description = ���输物�。
+block.titanium-conveyor.description = ���输物�，比�级传�带更快。
+block.plastanium-conveyor.description = 打包物�进行�输。\n从�方输入物�，三个方�输出物�。 需�多个装载和�载点�能达到最大���。
 block.junction.description = 两�交�传�带的桥�。
-block.bridge-conveyor.description = 跨越任�地形或建筑物�输物�。
-block.phase-conveyor.description = 跨越任�地形或建筑物�时�输物�。比传�带桥范围更大，但需�电力。
-block.sorter.description = 如果物�与所选�类相�，则�许其通过。�则，物�将从左边和�边输出。
-block.inverted-sorter.description = �分类器一样处�物�，但�是�两侧输出选定的物�。
+block.bridge-conveyor.description = 跨越任�地形或建筑�输物�。
+block.phase-conveyor.description = 跨越任�地形或建筑�时�输物�。 比传�带桥范围更大，但需�电力。
+block.sorter.description = 如果物�与所选�类相�，则�许其通过。 �则，物�将�两侧输出。
+block.inverted-sorter.description = �分类器一样处�物�，�过是�两侧输出所选的物�。
 block.router.description = 将物�平�分�到其他3个方�。
-block.router.details = 这是个好东西，也�以带�麻烦。�建议在工厂�边使用，因为它们会被产出堵塞。
+block.router.details = 这是个好东西，但也会带�麻烦。 �建议在工厂�边使用，因为它们会被产出堵塞。
 block.distributor.description = 将物�平�分�到其他7个方�。
-block.overflow-gate.description = 当�方被阻塞时�会�左和�输出，用于处�多余的物�。
-block.underflow-gate.description = 与溢�门相�。 当左��堵塞时���方�输。
-block.mass-driver.description = 长�离物�传输结构，收集若干物��将其射到远处的�一个质�驱动器。
-block.mechanical-pump.description = 泵�液体，�需�能�。
-block.rotary-pump.description = 泵�液体，需�能�。
-block.thermal-pump.description = 泵�液体。
-block.conduit.description = ��传输液体。用于从泵或其他导管中��液体。
-block.pulse-conduit.description = ��传输液体。比普通导管更快地输�液体且能储存更多液体。
-block.plated-conduit.description = ��传输液体。�接�侧边输入。�会�生泄露。
-block.liquid-router.description = 接�一个方�的液体并将它们平�输出到其他3个方�。�时�以储存一定�的液体。
-block.liquid-tank.description = 储存大�液体。�液体路由器��个方�输出液体。
-block.liquid-junction.description = 两�交��管的桥�。
-block.bridge-conduit.description = 跨越任�地形或建筑物�输液体。
-block.phase-conduit.description = 跨越任�地形或建筑物�输液体。比导管桥范围更大，但需�电力。
-block.power-node.description = �连接的节点传输电力。该节点将从任何相邻的�接收电力或�其供电。
-block.power-node-large.description = 具有更大范围的高级电�节点。
-block.surge-tower.description = �用连接较少的远程电�节点。
-block.diode.description = 仅当一侧存储的电�较少时��一侧传输电池电�。
+block.overflow-gate.description = 当�方被阻塞时�会�两侧输出，用于处�多余的物�。
+block.underflow-gate.description = 与溢�门相�，当两侧�堵塞时����输。
+block.mass-driver.description = 远�离物�传输建筑，收集若干物��将其�射到远处的�一个质�驱动器。
+block.mechanical-pump.description = 泵�液体，�需�电力。
+block.rotary-pump.description = 泵�液体，需�电力。
+block.impulse-pump.description = 泵�液体。
+block.conduit.description = ��传输液体。 与泵或者其他导管��使用。
+block.pulse-conduit.description = ��传输液体。 比普通导管传输液体更快，且能储存更多液体。
+block.plated-conduit.description = ��传输液体，�接�侧�输入。 �会�生泄�。
+block.liquid-router.description = 接�一个方�的液体输入，并平�输出到其他3个方�。 �以储存一定�的液体。
+block.liquid-container.description = 储存数��观的液体，并�液体路由器一样��个方�输出液体。
+block.liquid-tank.description = 储存大�的液体，并�液体路由器一样��个方�输出液体。
+block.liquid-junction.description = 两�交�导管的桥�。
+block.bridge-conduit.description = 跨越任�地形或建筑物传输液体。
+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-large.description =  储存电网多余电力，并在电网供电�足时放电。比普通电池容�更高。
-block.combustion-generator.description = 燃烧煤等�燃�料�电。
+block.battery-large.description = 储存电网多余电力，并在电网供电�足时放电。 比普通电池容�更高。
+block.combustion-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.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.details = ��的技术。用于尽�能高效地生产大�的生物质。很�能是现在覆盖了塞普罗的最�的孢�培养器。
-block.oil-extractor.description = 使用大�能��沙�和水钻�石油。
-block.core-shard.description = 基地的核心。一旦被摧�，此区�就会丢失。
-block.core-shard.details = �代核心。�固且�自我�制。�具备星际旅行的能力。
-block.core-foundation.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.pneumatic-drill.description = 一�改进的钻头，能开采钛。 采矿速度比机械钻头快。
+block.laser-drill.description = 通过激光技术更快地开采，但需�电力。 这�钻头�以开采放射性的�。
+block.blast-drill.description = 终�钻头，需�大�电力。
+block.water-extractor.description = 从地下��水，适用于附近没有地表水的情况。
+block.cultivator.description = 将大气中低浓度的孢�培养�孢��。
+block.cultivator.details = 一�失传已久的技术，用于尽�能高效地生产大�生物质。 现在覆盖了塞普罗的孢�，最�的培养设备�能就是它。
+block.oil-extractor.description = 使用沙�� 水和大�电力钻�石油。
+block.core-shard.description = 基地的核心。 一旦被摧�，此区�就会丢失。
+block.core-shard.details = �代核心，�固且能够自我维�。 �具备星际旅行的能力。
+block.core-foundation.description = 基地的核心。 装甲优良。 容�比�代核心更大。
 block.core-foundation.details = 次代核心。
-block.core-nucleus.description = 基地的核心。装甲�佳。容��大。
+block.core-nucleus.description = 基地的核心。 装甲�佳，容��大。
 block.core-nucleus.details = 三代也是终代核心。
-block.vault.description = 存储��类型的大�物�。�使用�载器�载物�。
-block.container.description = 存储��类型的少�物�。�使用�载器�载物�。
-block.unloader.description = 从周围方��载指定物�。
+block.vault.description = 大�存储��类型的物�。 �使用装�器�载物�。
+block.container.description = 少�存储��类型的物�。 �使用装�器�载物�。
+block.unloader.description = 从周围的建筑�载指定物�。
 block.launch-pad.description = 将货物�射至指定区�。
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = 交替�敌人�射�弹。
-block.scatter.description = �敌机�射铅�废料或钢化玻璃高射炮弹。
-block.scorch.description = 焚烧任何�近它的地�敌人。近�离高效
+block.scatter.description = �敌方战机�射铅� 废料或钢化玻璃高射炮弹。
+block.scorch.description = 焚烧任何�近它的地�敌人。 近�离内�分有效。
 block.hail.description = �远�离地�敌人�射�型炮弹。
-block.wave.description = �敌人射出液体�。使用水作弹�时能够自动��。
-block.lancer.description = 充能并�地����射强力的的波�。
+block.wave.description = �敌人喷射液体�。 使用水作弹�时能够自动��。
+block.lancer.description = 充能并�地����射强力能��。
 block.arc.description = �地����射电弧。
 block.swarmer.description = �敌人�射追踪导弹。
-block.salvo.description = �敌人快速射击�弹。
-block.fuse.description = �附近的敌人�射三次近�离穿�性爆炸�弹。
+block.salvo.description = 快速地�敌人�射�弹。
+block.fuse.description = �附近的敌人�射三�近�离穿�性爆炸�弹。
 block.ripple.description = �远�离地�敌人�射密集的炮弹。
-block.cyclone.description = �附近的敌人�射密集的高射炮弹。
+block.cyclone.description = �附近的敌人�射密集的爆炸�弹。
 block.spectre.description = �空中和地�目标�射大型穿甲�弹。
-block.meltdown.description = �附近的敌人�射�续的激光�。需�供冷。
-block.foreshadow.description = �远�离�目标射击。
-block.repair-point.description = �续修�其附近��最严�的��。
-block.segment.description = 摧�袭�的除激光以外的�弹或导弹。
-block.parallax.description = 通过牵引光�牵引空中目标，并在这个过程中对其造�伤害。
-block.tsunami.description = �敌人射出强力的液体�。使用水作弹�时能够自动��。
-block.silicon-crucible.description = 从沙�和煤中�炼硅，用硫化物作为附加热�。在炙热地型上更高效。
-block.disassembler.description = 以低效率将矿渣分离�微�的外�矿物�分。能产生�。
-block.overdrive-dome.description = �高附近建筑物的速度。需�相�物和硅�工作。
-block.payload-conveyor.description = 移动大型有效载�，例如从工厂生产的��。
-block.payload-router.description = 将输入的有效载��3个方�输出。
-block.command-center.description = 使用多个��的命令控制��。
-block.ground-factory.description = 产生陆军��。输出的���以直接使用，也�以移入�构厂进行�级。
-block.air-factory.description = 产生空军��。输出的���以直接使用，也�以移入�构厂进行�级。
-block.naval-factory.description = 产生海军��。输出的���以直接使用，也�以移入�构厂进行�级。
+block.meltdown.description = 充能并�附近的敌人�射�续的激光�。 需�冷�液。
+block.foreshadow.description = �远�离�个目标射击。 优先攻击生命值上�较高的��。
+block.repair-point.description = �续修�范围内��的��。
+block.segment.description = 摧��袭的�弹或导弹，对激光无效。
+block.parallax.description = 通过牵引光�拉扯空中目标，并对其造�伤害。
+block.tsunami.description = �敌人喷射强力的液体�。 使用水作弹�时能够自动��。
+block.silicon-crucible.description = 从沙�和煤中�炼硅，用硫化物作为附加热�。 在炙热地形上更高效。
+block.disassembler.description = 以低效率将矿渣液分离�微�的外�矿物�分。 能产生�。
+block.overdrive-dome.description = �高附近建筑物的工作效率。 需�相织布和硅。
+block.payload-conveyor.description = ��大型载�，例如从工厂生产的��。
+block.payload-router.description = 将输入的载��3个方�轮�输出。
+block.ground-factory.description = 生产陆军��。 产出的���以直接投入战场，也�以�入�构工厂进行�级。
+block.air-factory.description = 生产空军��。 产出的���以直接投入战场，也�以�入�构工厂进行�级。
+block.naval-factory.description = 生产海军��。 产出的���以直接投入战场，也�以�入�构工厂进行�级。
 block.additive-reconstructor.description = 将输入的���级到第二级。
 block.multiplicative-reconstructor.description = 将输入的���级到第三级。
 block.exponential-reconstructor.description = 将输入的���级到第四级。
-block.tetrative-reconstructor.description = 将输入的���级到第五级，也是最终�。
-block.switch.description = �切�开关。状��以用逻辑处�器读�和控制。
-block.micro-processor.description = 在循环中�行一系列逻辑指令。�用于控制�元和建筑物。
-block.logic-processor.description = 在循环中�行一系列逻辑指令。�用于控制�元和建筑物。比微型处�器快。
-block.hyper-processor.description = 在循环中�行一系列逻辑指令。�用于控制�元和建筑物。�用于控制�元和建筑物。比逻辑处�器快。
+block.tetrative-reconstructor.description = 将输入的���级到第五级，�最终�。
+block.switch.description = �切�的开关。 开关状��以用逻辑处�器读�和控制。
+block.micro-processor.description = 循环�行一系列逻辑指令，�用于控制��和建筑物。
+block.logic-processor.description = 循环�行一系列逻辑指令，�用于控制��和建筑物。 比微型处�器更快。
+block.hyper-processor.description = 循环�行一系列逻辑指令，�用于控制��和建筑物。 比逻辑处�器更快。
 block.memory-cell.description = 存储处�器的信�。
-block.memory-bank.description = 存储处�器的信�。内存�更大。
-block.logic-display.description = 显示处�器中的任�图形。
-block.large-logic-display.description = 显示处�器中的任�图形。
-block.interplanetary-accelerator.description = 一个巨大的电�轨�加速器。加速核心逃逸速度以进行星际部署。
+block.memory-bank.description = 存储处�器的信�。 容�更大。
+block.logic-display.description = 显示处�器中绘制的��图�。
+block.large-logic-display.description = 显示处�器中绘制的��图�。
+block.interplanetary-accelerator.description = 一个巨大的电�轨�加速器。 将核心加速至逃逸速度以进行星际部署。
+block.repair-turret.description = �续修�范围内��的��。 �以用冷�液强化。
 
-unit.dagger.description = 攻击附近所有敌人。�射标准�弹。
-unit.mace.description = 攻击附近所有敌人。�射�焰。
-unit.fortress.description = 攻击地�敌人。�射远程�炮。
-unit.scepter.description = 攻击附近所有敌人。�射充能弹。
-unit.reign.description = 攻击附近所有敌人。�射穿�性�弹。
-unit.nova.description = �射激光弹�攻击敌人并修�盟军建筑。能够飞行。
-unit.pulsar.description = �射电弧�攻击敌人并修�盟军建筑。能够飞行。
-unit.quasar.description = �射穿�性激光��攻击敌人并修�盟军建筑。能够飞行。拥有护盾。
-unit.vela.description = �射巨大的�续激光�攻击敌人，引起��并修�盟军建筑。能够飞行。
-unit.corvus.description = �射巨大的激光爆破�，摧�敌人并修�盟军建筑。�以跨越大多数地形。
-unit.crawler.description = 冲�敌人并自�，造�大爆炸。
-unit.atrax.description = �地�目标�射削弱性的矿渣�体。�以跨越大多数地形。
-unit.spiroct.description = �敌人�射激光�，并在此过程中自我修�。�以跨越大多数地形。
-unit.arkyid.description = �敌人�射大�激光�，并在此过程中自我修�。�以跨越大多数地形。
-unit.toxopid.description = �敌人�射大型电能集�炮弹和穿�激光。�以跨越大多数地形。
-unit.flare.description = 攻击地�敌人。�射标准�弹。
-unit.horizon.description = 攻击地�敌人。投下炸弹。
-unit.zenith.description = 攻击附近所有敌人。�射导弹群。
-unit.antumbra.description = 攻击附近所有敌人。�射密集的�弹。
-unit.eclipse.description = 攻击附近所有敌人。�射穿�性激光和分裂弹。
+#埃里克尔
+block.core-bastion.description = 基地的核心。 拥有装甲。 一旦被摧�，此区�就会丢失。
+block.core-citadel.description = 基地的核心。 装甲优良。 容�比城堡核心更大。
+block.core-acropolis.description = 基地的核心。 装甲�佳。 容�比堡垒核心更大。
+block.breach.description = �敌人�射�或钨穿��弹。
+block.diffuse.description = ��方锥形区域�射�弹。 并把敌人击退。
+block.sublimate.description = �敌人�续喷射�焰。 穿�敌方装甲。
+block.titan.description = �地�敌人�射巨大的爆炸炮弹。 需�氢气。
+block.afflict.description = �敌人�射巨大的带电碎片弹。 需�热�。
+block.disperse.description = �空中敌人�射高射炮弹。
+block.lustre.description = �敌人�射慢速�目标激光。
+block.scathe.description = �地�敌人�射�力强大的远程导弹。
+block.smite.description = �敌人�射放电穿��弹。
+block.malign.description = �敌方�射一连串的激光导弹。 需�大�热�。
+block.silicon-arc-furnace.description = 将沙和石墨精炼�硅。
+block.oxidation-chamber.description = 将�和臭氧转化为氧化物。 副产出热�。
+block.electric-heater.description = 加热��的建筑。 需�大�电力。
+block.slag-heater.description = 加热��的建筑。 需�矿渣。
+block.phase-heater.description = 加热��的建筑。 需�相织布。
+block.heat-redirector.description = 将累积的热�传输到其他建筑。
+block.small-heat-redirector.description = 将累积的热�传输到其他建筑。
+block.heat-router.description = 将累积的热�平�分�到其它3个方�。
+block.electrolyzer.description = 将水电解为氢和臭氧气体。
+block.atmospheric-concentrator.description = 从大气中浓缩氮气。 需�热�。
+block.surge-crucible.description = 用矿渣和硅��巨浪�金。 需�热�。
+block.phase-synthesizer.description = 用�� 沙�和臭氧��相织布。 需�热�。
+block.carbide-crucible.description = 将石墨和钨熔炼为碳化物。 需�热�。
+block.cyanogen-synthesizer.description = 用芳油和石墨��氰气。 需�热�。
+block.slag-incinerator.description = 焚烧稳定的物�和液体。 需�矿渣。
+block.vent-condenser.description = 将排出的水蒸气冷��水。 消耗电力。
+block.plasma-bore.description = ��矿�放置时，以缓慢的速度无�产出物�。 需�少�电力。
+block.large-plasma-bore.description = 更大的等离�钻机。 能够开采钨和�。 需�氢气和电力。
+block.cliff-crusher.description = 粉碎墙�，以缓慢的速度无�产出沙�。 需�电力。 效率因墙的类型而异。
+block.large-cliff-crusher.description = 粉碎墙�，�续产出沙�。 需�电力和臭氧。 效率因墙的类型而异。 �选消耗钨以�高效率。
+block.impact-drill.description = 放置在矿物上时，以缓慢的速度无�产出物�。 需�电力和水。
+block.eruption-drill.description = 改进过的冲击钻头。 能够开采�。 需�氢。
+block.reinforced-conduit.description = ��传输�体。 �接�侧�的�导管输入。
+block.reinforced-liquid-router.description = 将�体平�分�到所有侧�方�。
+block.reinforced-liquid-tank.description = 储存大�的�体。
+block.reinforced-liquid-container.description = 储存数��观的�体。
+block.reinforced-bridge-conduit.description = 跨越任�地形或建筑物传输�体。
+block.reinforced-pump.description = 泵�液体。 需�氢气。
+block.beryllium-wall.description = �护己方建筑，挡下敌方炮弹。
+block.beryllium-wall-large.description = �护己方建筑，挡下敌方炮弹。
+block.tungsten-wall.description = �护己方建筑，挡下敌方炮弹。
+block.tungsten-wall-large.description = �护己方建筑，挡下敌方炮弹。
+block.carbide-wall.description = �护己方建筑，挡下敌方炮弹。
+block.carbide-wall-large.description = �护己方建筑，挡下敌方炮弹。
+block.reinforced-surge-wall.description = �护己方建筑，挡下敌方炮弹。 �攻击时间断释放电弧。
+block.reinforced-surge-wall-large.description = �护己方建筑，挡下敌方炮弹。 �攻击时间断释放电弧。
+block.shielded-wall.description = �护己方建筑，挡下敌方炮弹。 创建一个力场，并在通电时�收大部分炮弹。 �以传导电力。
+block.blast-door.description = 当己方地���在范围内时自动打开的墙。 无法手动控制。
+block.duct.description = ���输物�。 �能存储一个物�。
+block.armored-duct.description = ���输物�。 �接�侧�的�管�输入。
+block.duct-router.description = 将物�平�分�到其它3个方�。 �接�背�的物�。 �被�置为分类器。
+block.overflow-duct.description = 当�方被堵塞时�会�两侧输出，用于处�多余的物�。
+block.duct-bridge.description = 跨越任�地形或建筑物传输物�。
+block.duct-unloader.description = 从背�的建筑�载指定物�。 无法从核心�载。
+block.underflow-duct.description = 与溢�管�相�。 当两侧�堵塞时����输。
+block.reinforced-liquid-junction.description = 两�交�强化导管的桥�。
+block.surge-conveyor.description = 打包物�进行�输。 �以用电力加速。 �以传导电力。
+block.surge-router.description = 将�金传�带上的物�平�分�到其它3个方�。 �以用电力加速。 �以传导电力。
+block.unit-cargo-loader.description = 建造货�无人机。 无人机通过需求自动将物�分�到��物��载点。
+block.unit-cargo-unload-point.description = 作为货�无人机的�货点。接�需求的物�。
+block.beam-node.description = �其他互相垂直的节点传输电力。 存储少�电力。
+block.beam-tower.description = �其他互相垂直的节点传输电力。 存储大�电力。 连接�离远。
+block.turbine-condenser.description = 当放置在喷�上时产生电力。 �时产生少�水。
+block.chemical-combustion-chamber.description = 利用芳油和臭氧�电。
+block.pyrolysis-generator.description = 使用矿渣热解芳油产生大�电力。 �时产生水。
+block.flux-reactor.description = 在加热时产生大�电力。 需�氰气作为稳定剂。 电力输出和氰气需求与热�输入�比例。\n如果�供的氰气�足则会爆炸。
+block.neoplasia-reactor.description = 利用芳油� 水和相织布产生大�电力。 �时产生热�和�险的瘤液。\n如果瘤液未通过导管从�应堆中移除，则会剧烈爆炸。
+block.build-tower.description = 自动�建范围内的建筑，并在其他��进行建造时�供�助。
+block.regen-projector.description = 在方形范围内缓慢修�己方建筑。 需�氢气。
+block.reinforced-container.description = 少�存储��类型的物�。 �使用�载器�载物�。 �会增加核心存储容�。
+block.reinforced-vault.description = 大�存储��类型的物�。 �使用�载器�载物�。 �会增加核心存储容�。
+block.tank-fabricator.description = 生产�克��。 产出的���以直接投入战场，也�以�入�构工厂进行�级。
+block.ship-fabricator.description = 生产飞船��。 产出的���以直接投入战场，也�以�入�构工厂进行�级。
+block.mech-fabricator.description = 生产机甲��。 产出的���以直接投入战场，也�以�入�构工厂进行�级。
+block.tank-assembler.description = 利用输入的方�和��组装大型�克。 �以通过添加基本装�厂模��增加输出等级。
+block.ship-assembler.description = 利用输入的方�和��组装大型飞船。 �以通过添加基本装�厂模��增加输出等级。
+block.mech-assembler.description = 利用输入的方�和��组装大型机甲。 �以通过添加基本装�厂模��增加输出等级。
+block.tank-refabricator.description = 将输入的�克���级到第二级。
+block.ship-refabricator.description = 将输入的飞船���级到第二级。
+block.mech-refabricator.description = 将输入的机甲���级到第二级。
+block.prime-refabricator.description = 将输入的���级到第三级。
+block.basic-assembler-module.description = 当放置在构造边界�边时，增加输出等级。 需�电力。 �以用作载�输入。
+block.small-deconstructor.description = 解构方�和��，返还100%资�。
+block.reinforced-payload-conveyor.description = ���输载�。
+block.reinforced-payload-router.description = 将载��3个方�轮�输出。设置载�时�用作分类器。
+block.payload-mass-driver.description = 远�离�载�输建筑。 �相连的其它载�质�驱动器�射载�。
+block.large-payload-mass-driver.description = 远�离�载�输建筑。 �相连的其它大型载�质�驱动器�射载�。
+block.unit-repair-tower.description = 修�附近的所有��。 需�臭氧。
+block.radar.description = ���现大范围内的地形和敌人��。 需�电力。
+block.shockwave-tower.description = 破�和摧��径范围内的敌人炮弹。 需�氰气。
+block.canvas.description = 显示使用预定义的调色�绘制的图�。 �手动编辑。
+
+unit.dagger.description = �敌人�射标准�弹。
+unit.mace.description = �敌人喷射�焰。
+unit.fortress.description = �地�敌人�射远程�炮。
+unit.scepter.description = �敌人快速�射带电�弹。
+unit.reign.description = �敌人快速�射大型穿��弹。
+unit.nova.description = �射激光弹攻击敌人并修�己方建筑。 能够助推。
+unit.pulsar.description = �射电弧攻击敌人并修�己方建筑。 能够助推。
+unit.quasar.description = �射穿�性激光�攻击敌人并修�己方建筑。 能够助推。 拥有护盾。
+unit.vela.description = �射巨大的�续激光�攻击敌人并引起燃烧，修�己方建筑。 能够助推。
+unit.corvus.description = �射巨大的爆�激光�，摧�敌人并修�己方建筑。 �以跨越大多数地形。
+unit.crawler.description = 冲�敌人并自�，造�大范围爆炸。
+unit.atrax.description = �地�目标�射削弱性的�状矿渣液。 �以跨越大多数地形。
+unit.spiroct.description = �敌人�射较弱的激光�，并在此过程中自我修�。 �以跨越大多数地形。
+unit.arkyid.description = �敌人�射大型激光�，并在此过程中自我修�。 �以跨越大多数地形。
+unit.toxopid.description = �敌人�射大型带电集�炮弹和穿�性激光。 �以跨越大多数地形。
+unit.flare.description = �地�敌人�射标准�弹。
+unit.horizon.description = �正下方的地�敌人投掷炸弹。
+unit.zenith.description = �敌人�射多枚导弹。
+unit.antumbra.description = �敌人�射密集的�弹。
+unit.eclipse.description = �敌人�射穿�性激光和爆炸性炮弹。
 unit.mono.description = 自动开采铜和铅，并将其放入核心中。
-unit.poly.description = 自动�建��结构，�助其他��建造。
-unit.mega.description = 自动修���结构。能够�带方�和�型地�部队。
-unit.quad.description = �地�目标投掷大型炸弹，修�盟军建筑并摧�敌人。能够�带中型地�部队。
-unit.oct.description = 用它的�生护盾�护附近的盟�。能够�带大多数地�部队。
-unit.risso.description = 攻击附近所有敌人。�射一连串的导弹和�弹。
-unit.minke.description = 攻击附近所有敌人。�射炮弹和标准�弹。
-unit.bryde.description = 攻击附近所有敌人。�射�射远程炮弹和导弹。
-unit.sei.description = 攻击附近所有敌人。�射一连串的导弹和穿甲弹。
-unit.omura.description = 攻击附近所有敌人。�射远程穿�轨�炮。�构造星耀�元。
-unit.alpha.description = �护�代核心。�构建结构。
-unit.beta.description = �护次代核心。�构建结构。
-unit.gamma.description = �护终代核心。�构建结构。
+unit.poly.description = 自动�建被摧�的建筑，并�助其他��进行建造。
+unit.mega.description = 自动修���建筑。 能够�带建筑和�型地���。
+unit.quad.description = �地�目标投掷等离�炸弹，修�己方建筑并摧�敌人。 能够�带中型地���。
+unit.oct.description = 用它的�生护盾�护附近的己方��。 能够�带大多数地���。
+unit.risso.description = �敌人�射一串导弹与�弹。
+unit.minke.description = �敌人�射炮弹和标准�弹。
+unit.bryde.description = �敌人�射远程炮弹和导弹。
+unit.sei.description = �敌人�射一串导弹与穿甲弹。
+unit.omura.description = �敌人�射远程穿�轨�炮。 自动生产星辉��。
+unit.alpha.description = �护�代核心，�建造建筑。
+unit.beta.description = �护次代核心，�建造建筑。
+unit.gamma.description = �护终代核心，�建造建筑。
+unit.retusa.description = �敌人�射追踪鱼雷，并修�己方��。
+unit.oxynoe.description = �敌人�射�焰�，并修�己方建筑。 �载一��点防御炮塔，能够防御�袭的�弹。
+unit.cyerce.description = �敌人�射追踪集�导弹，并修�己方��。
+unit.aegires.description = 产生能�场，使范围内的敌方建筑与���到电击，对己方则进行修�。
+unit.navanax.description = �射大型电�爆弹，对敌方电网造�显著破�并修�己方建筑。 �载4�自动激光炮�，能熔化�近的敌人。
+
+#埃里克尔
+unit.stell.description = �敌人�射普通�弹。
+unit.locus.description = �敌人交替�射�弹。
+unit.precept.description = �敌人�射穿�性集��弹。
+unit.vanquish.description = �敌人�射大型穿�性分裂�弹。
+unit.conquer.description = �敌人�射大�大型穿�性�弹。
+unit.merui.description = �地�敌人�射远程�炮。 �以跨越大多数地形。
+unit.cleroi.description = �敌人�射��炮弹。 �载一��点防御炮塔，能够防御�袭的�弹。 �以跨越大多数地形。
+unit.anthicus.description = �敌人�射远程追踪导弹。 �以跨越大多数地形。
+unit.tecta.description = �敌人�射等离�追踪导弹。 用它�方的护盾�护自己。 �以跨越大多数地形。
+unit.collaris.description = �敌人�射远程分裂�炮。 �以跨越大多数地形。
+unit.elude.description = �敌人�射螺旋状追踪�弹。 �以在液体上悬浮。
+unit.avert.description = �敌人�射螺旋状扭曲�弹。
+unit.obviate.description = �敌人�射螺旋状闪电�。
+unit.quell.description = �敌人�射远程追踪导弹。 能够压制敌方修�建筑。
+unit.disrupt.description = �敌人�射远程压制性追踪导弹。 能够压制敌方修�建筑。
+unit.evoke.description = �护城堡核心，�建造建筑。 使用激光�修�建筑。
+unit.incite.description = �护堡垒核心，�建造建筑。 使用激光�修�建筑。
+unit.emanate.description = �护�城核心，�建造建筑。 使用一对激光�修�建筑。
+
+lst.read = 从连接的内存读�数字
+lst.write = �连接的内存写入数字
+lst.print = 添加文字到打�缓存\n使用[accent]Print Flush[]��会真正显示
+lst.printchar = �打�缓存添加一个 UTF-16 字符或内容图标。\n直到使用 [accent]Print Flush[] ��会真正显示。
+lst.format = 用一个值替�文本缓冲区中的下一个��符。\n如果��符模�无效，则�会执行任何�作。\n��模�: "{[accent]number 0-9[]}"\n示例:\n[accent]print "test {0}"\n格� "示例"
+lst.draw = 添加绘图�作到绘图缓存\n使用[accent]Draw Flush[]��会真正显示
+lst.drawflush = 将绘图缓存中的[accent]Draw[]队列刷新到显示�
+lst.printflush = 将打�缓存中的[accent]Print[]队列刷新到信��
+lst.getlink = 获�与处�器连接的建筑\n建筑编�从0开始
+lst.control = 控制建筑
+lst.radar = 让建筑�寻感知范围内的��
+lst.sensor = 从建筑或者��中获�数�
+lst.set = 给��赋值
+lst.operation = 使用1至2个�数执行�算/函数
+lst.end = 跳转至第一�指令
+lst.wait = 等待指定的秒数
+lst.stop = �止该处�器的�行
+lst.lookup = 根�ID查阅一�物�/液体/��/建筑\n�个分类中的项目总数是\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = 根��件判断，决定是�跳转至�一�指令
+lst.unitbind = 绑定�个类型的下一个��，或直接绑定指定的��\n并�存至[accent]@unit[]
+lst.unitcontrol = 控制已绑定的��
+lst.unitradar = 让绑定的���寻感知范围内的其他��
+lst.unitlocate = 让绑定的���寻整个地图中特定的建筑或�置
+lst.getblock = 获�任��置的地�数�
+lst.setblock = 设置任��置的地�数�
+lst.spawnunit = 在指定�置生���
+lst.applystatus = 添加或清除��的一个状�效果
+lst.weathersense = 检查特定�类的天气当�是��用。
+lst.weatherset = 设置当�状�为特定类型天气。
+lst.spawnwave = 在任��置生�一波敌人\n并�记录在波数计数器中
+lst.explosion = 在�个�置生�爆炸
+lst.setrate = 在指令/时间刻的时间下设置处�器处�速度
+lst.fetch = 按索引查找��� 核心� 玩家或建筑物\n索引从 0 开始，以其返回的计数结�
+lst.packcolor = 将[0,1]范围内的RGBA分�整���个数字，用于绘图或规则设置
+lst.setrule = 设置地图规则
+lst.flushmessage = 在�幕中央投影文字缓存区的内容\n会等待上一个文字显示结�
+lst.cutscene = 控制玩家游�视角
+lst.setflag = 设置一个�以被所有处�器读�的全局标志。
+lst.getflag = 检查是�设置了全局标志。
+lst.setprop = 设置��或建筑物的属性。
+lst.effect = 创建一个粒�效果。
+lst.sync = 在网络中�步一个��。\n最多�秒调用10次。
+lst.playsound = 播放声音。\n音�和声场�置�以是全局值，也�以根��置计算得出。
+lst.makemarker = 在世界中创建一个新的逻辑标记。\n必须�供一个用于标识此标记的ID。\n目��个世界�制最多20000个标记。
+lst.setmarker = 为标记设置属性。\n使用的ID必须与制作标记指令中的相�。
+lst.localeprint = 将地图本地化文本属性值添加到文本缓冲区中。\n�在地图编辑器中设置地图本地化包，请检查 [accent]地图信� > 本地化包[]。\n如果客户端是移动设备，则�试首先打�以 ".mobile" 结尾的属性。
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = 数学常数 pi (3.141...)
+lglobal.@e = 数学常数 e (2.718...)
+lglobal.@degToRad = 将角度制转�为弧度制
+lglobal.@radToDeg = 将弧度制转�为角度制
+lglobal.@time = 当��存的游�时间，以毫秒为��
+lglobal.@tick = 当��存的游�时间，以tick为��（1秒 = 60 tick）
+lglobal.@second = 当��存的游�时间，以秒为��
+lglobal.@minute = 当��存的游�时间，以分钟为��
+lglobal.@waveNumber = 如果�用了波次，则为当�波次编�
+lglobal.@waveTime = 波次的倒计时计时器，以秒为��
+lglobal.@mapw = 地图宽度（��：格）
+lglobal.@maph = 地图高度（��：格）
+lglobal.sectionMap = 地图
+lglobal.sectionGeneral = 通用
+lglobal.sectionNetwork = 网络/客户端 [仅�世界处�器]
+lglobal.sectionProcessor = 处�器
+lglobal.sectionLookup = 查找
+lglobal.@this = 执行代�的逻辑�
+lglobal.@thisx = 执行代�的逻辑�的 X �标
+lglobal.@thisy = 执行代�的逻辑�的 Y �标
+lglobal.@links = 连接到此处�器的总�数
+lglobal.@ipt = 处�器� tick 的执行速度（�秒 60 tick）
+lglobal.@unitCount = 游�中��内容的类型总数；与查找指令一起使用
+lglobal.@blockCount = 游�中�内容的类型总数；与查找指令一起使用
+lglobal.@itemCount = 游�中物�内容的类型总数；与查找指令一起使用
+lglobal.@liquidCount = 游�中液体内容的类型总数；与查找指令一起使用
+lglobal.@server = 如果代�正在�务器上�行或�人游�中�行，则为真，�则为�
+lglobal.@client = 如果代�正在连接到�务器的客户端上�行，则为真
+lglobal.@clientLocale = �行代�的客户端的区域设置。例如：en_US
+lglobal.@clientUnit = �行代�的客户端的��
+lglobal.@clientName = �行代�的客户端的玩家�称
+lglobal.@clientTeam = �行代�的客户端的团队 ID
+lglobal.@clientMobile = 如果�行代�的客户端在移动设备上，则为真，�则为�
+
+
+logic.nounitbuild = [red]此处��许处�器�控��去建设
+
+lenum.type = 建筑和��的类型，返回一个“类型�而�字符串\n例如对路由器使用，会返回[accent]@router[]
+lenum.shoot = ��个�置瞄准/射击
+lenum.shootp = 根������个��或建筑瞄准/射击
+lenum.config = 建筑设置，例如分类器所设置的筛选物��类
+lenum.enabled = 建筑是�已�用
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = 照明器�光的颜色
+laccess.controller = ��的控制方\n如果��由处�器控制，返回对应的处�器\n如果��在编队中，返回编队的领队\n其他情况，返回��自身
+laccess.dead = ��或建筑是�已被摧�或者已失效
+laccess.controlled = 若��的控制方是处�器，返回[accent]@ctrlProcessor[]\n若��/建筑由玩家控制，返回[accent]@ctrlPlayer[]\n若��在编队中，返回[accent]@ctrlFormation[]\n其他情况，返回0
+laccess.progress = 进度，0到1之间的数值。 \n返回工厂生产� 炮塔装填，或者建筑建造的进度
+laccess.speed = ��的最高速度（格/秒）
+laccess.id = ��/�/物�/液体的ID。\n这是 Lookup 的���作。
+
+lcategory.unknown = 未知
+lcategory.unknown.description = 未分类的指令
+lcategory.io = 输入 & 输出
+lcategory.io.description = 修改内存�和处�器内存的内容
+lcategory.block = 控制方�
+lcategory.block.description = 交互控制方�
+lcategory.operation = �作
+lcategory.operation.description = �作该逻辑
+lcategory.control = 控制顺�
+lcategory.control.description = 管�执行顺�
+lcategory.unit = 控制��
+lcategory.unit.description = 指挥��
+lcategory.world = 世界
+lcategory.world.description = 控制世界的�类设置
+
+graphicstype.clear = 用指定的颜色填充整个显示�
+graphicstype.color = 设置�续画图�作所使用的颜色
+graphicstype.col = 颜色代�。\n为以[accent]%[]开头的�六进制代�形�。\n举例: [accent]%ff0000[] 为[red]红色
+graphicstype.stroke = 设置线�宽度
+graphicstype.line = 绘制线段
+graphicstype.rect = 绘制实心矩形
+graphicstype.linerect = 绘制矩形轮廓
+graphicstype.poly = 绘制实心正多边形
+graphicstype.linepoly = 绘制正多边形轮廓
+graphicstype.triangle = 绘制实心三角形
+graphicstype.image = 画出�个游�内容的图�\n例如[accent]@router[]或者[accent]@dagger[]
+graphicstype.print = 从打�缓冲区绘制文本。\n清除打�缓冲区。
+
+lenum.always = 无�件跳转
+lenum.idiv = 整数除法，返回�带�数的商
+lenum.div = 除法，除以0时返回[accent]null[]
+lenum.mod = 求除法的余数
+lenum.equal = 相等。 转��数类型�进行比较\n与数字进行比较时，null转�为0，�null对象转�为1
+lenum.notequal = �相等。 转��数类型�进行比较
+lenum.strictequal = 严格相等。 �转��数类型\n�用于准确检查[accent]null[]对象
+lenum.shl = 左移�
+lenum.shr = �移�
+lenum.or = 按�或
+lenum.land = 逻辑与
+lenum.and = 按�与
+lenum.not = 按��
+lenum.xor = 按�异或
+
+lenum.min = �较�值
+lenum.max = �较大值
+lenum.angle = 返回��的�角（角度制）
+lenum.anglediff = 返回两个角度之间的�对�离（角度制）。
+lenum.len = 返回��的长度
+
+lenum.sin = 正弦（角度制）
+lenum.cos = 余弦（角度制）
+lenum.tan = 正切（角度制）
+
+lenum.asin = �正弦（角度制）
+lenum.acos = �余弦（角度制）
+lenum.atan = �正切（角度制）
+
+#not a typo, look up 'range notation'（括����笔误，实乃区间表示法）
+lenum.rand = � [0, �数）范围内的一个�机数
+lenum.log = 自然对数（ln）
+lenum.log10 = 以10为底的对数
+lenum.noise = 二维�形噪声
+lenum.abs = �对值
+lenum.sqrt = 开平方
+
+lenum.any = 任���
+lenum.ally = 己方��
+lenum.attacker = 有武器的��
+lenum.enemy = 敌方��
+lenum.boss = Boss��
+lenum.flying = 空中��
+lenum.ground = 地���
+lenum.player = 玩家控制的��
+
+lenum.ore = 矿脉
+lenum.damaged = ��的己方建筑
+lenum.spawn = 敌人出生点\n�以是核心或者�个�标
+lenum.building = �个分类下的建筑
+
+lenum.core = 核心
+lenum.storage = 仓储建筑（容器/仓库）
+lenum.generator = �电建筑
+lenum.factory = 生产物�的工厂
+lenum.repair = 维修点
+lenum.battery = 电池
+lenum.resupply = 补给点\n仅当�用了[accent]“��有弹��制�[]时生效
+lenum.reactor = ��应堆/冲击�应堆
+lenum.turret = 炮塔
+
+sensor.in = 所获�数�的建筑或��
+
+radar.from = 以哪个建筑为中心展开�寻\n�寻�离��于该建筑的感知范围
+radar.target = 筛选�寻的��类型
+radar.and = �外的筛选�件
+radar.order = 排�方�：1/true从�到大，0/false�之
+radar.sort = 排�标准
+radar.output = 找到的��存入此��
+
+unitradar.target = 筛选�寻的��类型
+unitradar.and = �外的筛选�件
+unitradar.order = 排�方�：1/true从�到大，0/false�之
+unitradar.sort = 排�标准
+unitradar.output = 找到的��存入此��
+
+control.of = �控制的建筑
+control.unit = �瞄准的��或建筑
+control.shoot = 是�射击
+
+unitlocate.enemy = 是��寻敌方建筑（0或false则�寻己方建筑）
+unitlocate.found = 若找到，在此��中存入true；未找到则存入false
+unitlocate.building = 找到的建筑存入此��
+unitlocate.outx = 存入找到的X轴�标
+unitlocate.outy = 存入找到的Y轴�标
+unitlocate.group = 所�寻的建筑分类
+playsound.limit = 如果为真，则阻止此声音在�一帧内��播放。
+
+lenum.idle = 原地�动，但继续进行手上的采矿/建造动作\n��的默认状�
+lenum.stop = �止移动/采矿/建造动作
+lenum.unbind = �用��的逻辑控制\n��常规AI
+lenum.move = 移动到�个�置
+lenum.approach = �近�个�置至一定的�离内
+lenum.pathfind = 寻路移动至敌人出生点
+lenum.autopathfind = "自动寻找最近的敌方核心或敌人生�点。\n这与波次中的敌人寻路相�。"
+lenum.target = ��个�置瞄准/射击
+lenum.targetp = 根������个目标瞄准/射击
+lenum.itemdrop = 将�带的物�放入一座建筑
+lenum.itemtake = 从建筑中�出��物�
+lenum.paydrop = �下当�载�
+lenum.paytake = 从当��置拾�载�
+lenum.payenter = 进入/��到��下方的�载方�中
+lenum.flag = 给��赋予数字形�的标记
+lenum.mine = 从�个�置采集矿物
+lenum.build = 建造建筑
+lenum.getblock = 根��标获�建筑物�环境�和环境墙体类型。\n��必须在�置范围内，�则返回空值。
+lenum.within = 检查��是�接近了�个�置
+lenum.boost = 开始/�止助推
+lenum.flushtext = 如果适用的�，将打�缓冲区的内容刷新到标记。\n如果 fetch 设置为 true，则�试从地图本地化包或游�的包中获�属性。
+lenum.texture = 直接�自游�纹�图集的纹��称（使用 kebab-case 命�风格）。\n如果 printFlush 设置为 true，则将文本缓冲区内容作为文本�数消耗。
+lenum.texturesize = 纹�的大�（格）。零值将标记宽度缩放为原始纹�的大�。
+lenum.autoscale = 是�根�玩家的缩放级别缩放标记。
+lenum.posi = 索引�置，用于线和四边形标记，索引零表示第一个�置。
+lenum.uvi = 纹�的�置范围从零到一，用于四边形标记。
+lenum.colori = 索引�置，用于线和四边形标记，索引零表示第一个颜色。
+
+lenum.wavetimer = 波次是�自动出现在计时器上。如果没有，按下播放按钮时会出现波次
+lenum.wave = 当�波数，�以是�波次模�下的任何值
+lenum.currentwavetime = 波次倒计时（以tick为��）
+lenum.waves = 波次是��以生�
+lenum.wavesending = 是��以通过播放按钮手动生�波次
+lenum.attackmode = 确定游�模�是�为攻击模�
+lenum.wavespacing = 波形之间的时间（以tick为��）
+lenum.enemycorebuildradius = 敌人核心�径周围无建筑区
+lenum.dropzoneradius = 敌人出生点周围的�径
+lenum.unitcap = 基本��上�。但�然�以通过方�增加
+lenum.lighting = 是��用环境照明
+lenum.buildspeed = 建筑速度�率
+lenum.unithealth = ���伤��, 计算方�是伤害除以��值
+lenum.unitbuildspeed = �元工厂建造�元的速度
+lenum.unitcost = ��建设所需资�的�率
+lenum.unitdamage = ��造�多少伤害
+lenum.blockhealth = 方��伤��, 计算方�是伤害除以��值
+lenum.blockdamage = 方�（炮塔）造�的伤害有多大
+lenum.rtsminweight = 进攻�队所需的最�“优势�。越高->越谨慎
+lenum.rtsminsquad = 攻击�队的最�规模
+lenum.maparea = 设置区域范围
+lenum.ambientlight = 环境光颜色，�用照明时使用
+lenum.solarmultiplier = 太阳能电池�的功率输出�率
+lenum.dragmultiplier = 环境阻力乘数
+lenum.ban = 无法放置或构建的�或�元
+lenum.unban = �消ban
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 77a37663b1..a946efcbc5 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -5,7 +5,7 @@ discord = 加入 Mindustry 的 Discord �天室�
 link.discord.description = 官方 Mindustry Discord �天室
 link.reddit.description = Mindustry Reddit論壇
 link.github.description = �戲原始碼
-link.changelog.description = �戲更新清單
+link.changelog.description = �戲更新日誌
 link.dev-builds.description = 開發中版本
 link.trello.description = 官方 Trello 功能�劃看�
 link.itch.io.description = itch.io 電腦版下載網�
@@ -13,7 +13,8 @@ link.google-play.description = Google Play 商店��
 link.f-droid.description = F-Droid 目錄��
 link.wiki.description = 官方 Mindustry 維基
 link.suggestions.description = 建議新功能
-link.bug.description = 找到臭蟲？在這裡回報
+link.bug.description = 發�錯誤？在這裡回報
+linkopen = 網路連�由伺�器�供。確定�打開連�？\n\n[sky]{0}
 linkfail = 無法打開連��\n我們已將該網�複製到您的剪貼簿。
 screenshot = 截圖儲存到{0}
 screenshot.invalid = 地圖太大了，�能沒有足夠的記憶體用於截圖。
@@ -24,7 +25,6 @@ gameover.waiting = [accent]等待下一張地圖中……
 highscore = [accent]新的高分紀錄!
 copied = 已複製。
 indev.notready = 這部份的�戲尚未完�
-indev.campaign = [accent]�喜你完�戰役了�[]\n\n這是截至目�的�戲內容。星際旅行會在未來的更新加入�戲~
 
 load.sound = 音效載入中
 load.map = 地圖載入中
@@ -41,14 +41,23 @@ be.ignore = 忽略
 be.noupdates = 沒有新的更新。
 be.check = 檢查是�有新的更新
 
-mod.featured.dialog.title = 模組�覽器 (尚未完�)
+mods.browser = 模組�覽器
 mods.browser.selected = 已�模組
 mods.browser.add = 安�
-mods.github.open = 查看
+mods.browser.reinstall = �新安�
+mods.browser.view-releases = 檢視發行
+mods.browser.noreleases = [scarlet]無發行紀錄\n[accent]無法找到該模組的任何發行。請確�此模組是�有發表。
+mods.browser.latest = <最新>
+mods.browser.releases = 所有發行
+mods.github.open = 查看Github
+mods.github.open-release = 發行網�
+mods.browser.sortdate = 以最近篩�
+mods.browser.sortstars = 以星數篩�
 
 schematic = �圖
 schematic.add = 儲存�圖……
 schematics = �圖
+schematic.search = �尋�圖...
 schematic.replace = 相��稱的�圖已經存在。是��代它？
 schematic.exists = 相��稱的�圖已經存在。
 schematic.import = 匯入�圖……
@@ -61,19 +70,27 @@ schematic.shareworkshop = 分享到工作�
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]:翻轉�圖
 schematic.saved = �圖已儲存。
 schematic.delete.confirm = 該�圖將被完全清除。
-schematic.rename = �新命��圖
+schematic.edit = 編輯�圖
 schematic.info = {0}x{1}, {2}方塊
-schematic.disabled = [scarlet]�圖被進用[]\n你�能在這個[accent]地圖[] 或 [accent]伺�器中使用�圖.
+schematic.disabled = [scarlet]�圖被進用[]\n您�能在這個[accent]地圖[]或[accent]伺�器中使用�圖.
+schematic.tags = 標籤：
+schematic.edittags = 編輯標籤
+schematic.addtag = 新增標籤
+schematic.texttag = 文字標籤
+schematic.icontag = 圖�標籤
+schematic.renametag = �新命�
+schematic.tagged = {0} 已被加上標籤
+schematic.tagdelconfirm = 確�刪除此標籤？
+schematic.tagexists = 該標籤已存在。
 
 stats = 統計
-stat.wave = 打敗的波次：[accent]{0}
-stat.enemiesDestroyed = 摧毀的敵人：[accent]{0}
-stat.built = 建設的建築：[accent]{0}
-stat.destroyed = 摧毀的建築：[accent]{0}
-stat.deconstructed = 拆除的建築：[accent]{0}
-stat.delivered = 發射的核心資�：
-stat.playtime = �玩時間：[accent] {0}
-stat.rank = 最終排�：[accent]{0}
+stats.wave = 防守波數
+stats.unitsCreated = 生產單�
+stats.enemiesDestroyed = 摧毀敵人
+stats.built = 建造建築
+stats.destroyed = 摧�建築
+stats.deconstructed = 拆除建築
+stats.playtime = �戲時間
 
 globalitems = [accent]全域物�
 map.delete = 確��刪除「[accent]{0}[]�地圖嗎？
@@ -82,13 +99,16 @@ level.select = �擇關�
 level.mode = �戲模�：
 coreattack = 〈核心正在�到攻擊�〉
 nearpoint = �[scarlet]立�離開空��[]】\n湮滅�將來臨
-database = 核心數據庫
+database = 核心資料庫
+database.button = 資料庫
 savegame = 儲存�戲
 loadgame = 載入�戲
 joingame = 多人連線
 customgame = 自訂�戲
 newgame = 新�戲
 none = 〈沒有〉
+none.found = [lightgray]〈查無�果〉
+none.inmap = [lightgray]〈地圖中無�果〉
 minimap = �地圖
 position = �置
 close = 關閉
@@ -109,26 +129,42 @@ committingchanges = �交變更
 done = 完�
 feature.unsupported = 您的�置�支�此功能。
 
-mods.alphainfo = 請記�，模組�處於Alpha狀態，[scarlet]�能會有很多臭蟲[]。\n請到Mindustry GitHub或Discord報告發�的任何�題。
+mods.initfailed = [red]⚠[] Mindustry 無法啟動。這�能是因模組造�。\n\n為了���斷閃退，[red]所有的模組已被�用。[]
 mods = 模組
 mods.none = [lightgray]找�到模組!
 mods.guide = 模組指�
 mods.report = 回報錯誤
 mods.openfolder = 開啟模組資料夾
+mods.viewcontent = 查看內容
 mods.reload = �新載入
 mods.reloadexit = �戲將會��以�新載入模組。
+mod.installed = [[已安�]
 mod.display = [gray]模組：[orange]{0}
 mod.enabled = [lightgray]已啟用
 mod.disabled = [scarlet]已�用
+mod.multiplayer.compatible = [gray]與多人模�相容
 mod.disable = �用
+mod.version = Version:
 mod.content = 內容：
 mod.delete.error = 無法刪除模組，檔案�能在使用中。
-mod.requiresversion = [scarlet]最低�戲版本�求：[accent]{0}
-mod.outdated = [scarlet]與 V6 �相容（無 最低�戲版本：105）
-mod.missingdependencies = [scarlet]缺少�賴關係：{0}
+mod.incompatiblegame = [red]�戲版本�低
+mod.incompatiblemod = [red]無法兼容
+mod.blacklisted = [red]�支�
+mod.unmetdependencies = [red]缺少�置模組
 mod.erroredcontent = [scarlet]內容錯誤
+mod.circulardependencies = [red]循環�賴錯誤
+mod.incompletedependencies = [red]�賴項缺失
+mod.requiresversion.details = 所需最低�戲版本： [accent]{0}[]\n您的�戲版本�低。此模組需�更新的�戲版本（通常是beta/alpha版本）�能�作
+
+mod.outdatedv7.details = 這個模組與�戲的最新版本�相容。作者必須將其更新，並在其 mod.json 文件中添加 [accent]minGameVersion: 136[]。
+mod.blacklisted.details = 這個模組已被手動列入黑�單，因為它在此版本的�戲中引起崩潰或其他�題。請勿使用。
+mod.missingdependencies.details = 此模組缺少�賴項：{0}
+mod.erroredcontent.details = 此模組在加載時引發錯誤。請求模組作者修復它們。
+mod.circulardependencies.details = 這個模組具有相互�賴的�賴項。
+mod.incompletedependencies.details = 由於無效或缺失的�賴項，此模組無法加載：{0}。
+mod.requiresversion = 需��戲版本：[red]{0}
 mod.errors = 載入內容時發生錯誤
-mod.noerrorplay = [scarlet]你使用了有�題的模組。[] �戲�請先�用相關模組或修正�題。
+mod.noerrorplay = [scarlet]您使用了有�題的模組。[] �戲�請先�用相關模組或修正�題。
 mod.nowdisabled = [scarlet]「{0}�模組缺少�賴關係：[accent] {1}\n[lightgray]必須先下載這些模組。\n此模組將被自動�用。
 mod.enable = 啟用
 mod.requiresrestart = �戲將立�關閉以套用模組變更。
@@ -148,14 +184,24 @@ mod.scripts.disable = 您的�置�支�包�指令檔的模組。您必須
 about.button = 關於
 name = �稱：
 noname = 請先�擇一個[accent]玩家�稱[]。
+search = �尋:
 planetmap = 星�地圖
 launchcore = 發射核心
 filename = 檔案�稱︰
 unlocked = 已解鎖新內容�
 available = �研究新科技�
+unlock.incampaign = <在戰役中解鎖>
+campaign.select = �擇戰役出發點
+campaign.none = [lightgray]�擇�始星�。\n星�隨時都�以切�。
+campaign.erekir = 更新�更精緻的內容。戰役大部分都是連貫性的。\n\n難度更高，但有高�質的地圖和整體的經驗。
+campaign.serpulo = 較舊的內容，經典的體驗。更加開放且有更多內容。\n\n有�能會有�平衡的地圖以�戰役機制，較�完美。
+campaign.difficulty = Difficulty
+
 completed = [accent]完�
 techtree = 科技樹
-research.legacy = [accent]5.0[] �測到舊有科技資料。\n請��[accent]載入[]資料，還是[accent]放棄[]並�置新戰役的科技樹(建議)？
+techtree.select = �擇科技樹
+techtree.serpulo = 蕈孢星
+techtree.erekir = 熾熱之境
 research.load = 載入
 research.discard = 放棄
 research.list = [lightgray]研究︰
@@ -178,8 +224,8 @@ server.kicked.typeMismatch = 該伺�器與您的版本�相容。
 server.kicked.playerLimit = 該伺�器已滿。請等待玩家離開。
 server.kicked.recentKick = 您最近曾被踢出伺�器。\n請�後�進行連線。
 server.kicked.nameInUse = 伺�器中已經\n有人有相�的�稱了。
-server.kicked.nameEmpty = 你的�稱必須至少包�一個字�或數字。
-server.kicked.idInUse = 你已經在伺�器中���許使用兩個帳號。
+server.kicked.nameEmpty = 您的�稱必須至少包�一個字�或數字。
+server.kicked.idInUse = 您已經在伺�器中���許使用兩個帳號。
 server.kicked.customClient = 這個伺�器�支�自訂的客戶端，請下載官方版本。
 server.kicked.gameover = �戲���
 server.kicked.serverRestarting = 伺�器正在�新啟動。
@@ -199,6 +245,7 @@ hosts.none = [lightgray]找�到�域網路伺�器�
 host.invalid = [scarlet]無法連線至伺�器。
 
 servers.local = �域伺�器
+servers.local.steam = 開放�戲間與�域伺�器
 servers.remote = �端伺�器
 servers.global = 社群伺�器
 
@@ -206,14 +253,25 @@ servers.disclaimer = 社群伺�器[accent]�是[]由開發者�有或管�
 servers.showhidden = 顯示被隱�的伺�器
 server.shown = 已顯示
 server.hidden = 已隱�
+viewplayer = 檢視玩家：[accent]{0}
 
 trace = 追蹤玩家
 trace.playername = 玩家�稱：[accent]{0}
 trace.ip = IP：[accent]{0}
 trace.id = ID：[accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = 行動客戶端：[accent]{0}
 trace.modclient = 自訂客戶端：[accent]{0}
+trace.times.joined = 加入次數：[accent]{0}
+trace.times.kicked = 踢除次數：[accent]{0}
+trace.ips = IP:
+trace.names = �字:
 invalidid = 無效的客戶端 ID�請�交錯誤回報。
+player.ban = �鎖
+player.kick = 踢除
+player.trace = 追蹤
+player.admin = 切�管�員
+player.team = 切�隊�
 server.bans = �鎖
 server.bans.none = 沒有玩家被�鎖�
 server.admins = 管�員
@@ -227,10 +285,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]自訂客戶端
 confirmban = 您確定��鎖「[white]{0}[]�嗎？
 confirmkick = 您確定�踢出「[white]{0}[]�嗎？
-confirmvotekick = 您確定�投票踢出「[white]{0}[]�嗎?
 confirmunban = 您確定�解除�鎖這個玩家嗎？
 confirmadmin = 您確定�晉�「[white]{0}[]�為管�員嗎？
 confirmunadmin = 您確定�解除「[white]{0}[]�的管�員嗎？
+votekick.reason = 投票踢出原因
+votekick.reason.message = 確定�投票踢出玩家"{0}[white]"？\n如果是，請輸入�由：
 joingame.title = 加入�戲
 joingame.ip = IP �置：
 disconnect = 已中斷連線。
@@ -238,16 +297,18 @@ disconnect.error = 連線錯誤。
 disconnect.closed = 連線關閉。
 disconnect.timeout = 連線逾時。
 disconnect.data = 無法載入地圖資料�
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = 無法加入�戲 ([accent]{0}[]).
 connecting = [accent]連線中……
 reconnecting = [accent]�新連接中……
 connecting.data = [accent]地圖資料載入中……
 server.port = 連接埠：
-server.addressinuse = 該�置已被使用�
 server.invalidport = 無效的連接埠�
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [crimson]建立伺�器時發生錯誤。
 save.new = 新存檔
 save.overwrite = 您確定�覆寫存檔嗎？
+save.nocampaign = 無法匯入單一戰役中的存檔。
 overwrite = 覆寫
 save.none = 找�到存檔�
 savefail = 存檔失敗�
@@ -268,6 +329,7 @@ save.corrupted = 此存檔無效或已�毀�
 empty = 〈空白〉
 on = é–‹å•Ÿ
 off = 關閉
+save.search = �尋儲存的�戲……
 save.autosave = 自動存檔：{0}
 save.map = 地圖：{0}
 save.wave = 波次：{0}
@@ -283,9 +345,31 @@ ok = 確定
 open = é–‹å•Ÿ
 customize = 自訂
 cancel = �消
+command = 命令
+command.queue = [lightgray][Queuing]
+command.mine = 挖礦
+command.repair = 修復
+command.rebuild = �建
+command.assist = �助玩家
+command.move = 移動
+command.boost = 推進
+command.enterPayload = 進入負�方塊
+command.loadUnits = 拾�單�
+command.loadBlocks = 拾�方塊
+command.unloadPayload = �下負載
+command.loopPayload = Loop Unit Transfer
+stance.stop = �消指令
+stance.shoot = 狀態：射擊
+stance.holdfire = 狀態: ��
+stance.pursuetarget = 狀態：追�目標
+stance.patrol = 狀態：路徑巡�
+stance.ram = 狀態：�鋒\n[lightgray]直線移動，�進行尋路。
+
 openlink = 開啟連�
 copylink = 複製連�
 back = 返回
+max = 最大�
+objective = 地圖目標
 crash.export = 匯出當機報告。
 crash.none = 無當機報告。
 crash.exported = 已匯出當機報告。
@@ -296,18 +380,20 @@ data.exported = 資料已匯出。
 data.invalid = 這�是有效的�戲資料。
 data.import.confirm = 導入外部資料將會覆寫您目�[scarlet]所有的[]�戲資料，\n[accent]此動作無法復原�[]\n\n匯入資料後，您的�戲將立刻��。
 quit.confirm = 您確定���嗎？
-quit.confirm.tutorial = 您確定您知�自己在�什麼嗎?\n�以在[accent] 設定->�戲[] �項中�設教學。
 loading = [accent]載入中……
-reloading = [accent]模組�新載入中……
+downloading = [accent]下載中……
 saving = [accent]儲存中……
 respawn = [accent][[{0}][]�生
 cancelbuilding = [accent][[{0}][]清除計畫
 selectschematic = [accent][[{0}][]�擇並複製
 pausebuilding = [accent][[{0}][]暫�建造
 resumebuilding = [scarlet][[{0}][]繼續建造
+enablebuilding = [scarlet][[{0}][]啟用建造
 showui = 已隱�介�。\n按[accent][[{0}][]顯示介�。
+commandmode.name = [accent]指�模�
+commandmode.nounits = [no units]
 wave = [accent]第{0}波
-wave.cap = [accent]Wave {0}/{1}
+wave.cap = [accent]æ³¢ {0}/{1}
 wave.waiting = [lightgray]將於{0}秒後抵�
 wave.waveInProgress = [lightgray]波次進行中
 waiting = [lightgray]等待中……
@@ -325,9 +411,9 @@ custom = 自訂
 builtin = 内建
 map.delete.confirm = 確��刪除地圖嗎？此動作無法復原�
 map.random = [accent]隨機地圖
-map.nospawn = 這個地圖沒有核心�請在編輯器中添加一個[accent]橘色[]的核心。
+map.nospawn = 這個地圖沒有核心�請在編輯器中添加一個{0}的核心。
 map.nospawn.pvp = 這個地圖沒有敵�核心讓玩家�生�請在編輯器中添加一個[scarlet]�是橘色[]的核心。
-map.nospawn.attack = 這個地圖沒有敵人核心�以攻擊�請在編輯器中添加一個[scarlet]紅色[]的核心。
+map.nospawn.attack = 這個地圖沒有敵人核心�以攻擊�請在編輯器中添加一個{0}的核心。
 map.invalid = 地圖載入錯誤：地圖�能已經�毀。
 workshop.update = æ›´æ–°é …ç›®
 workshop.error = 擷�工作�詳細資訊時出錯：{0}
@@ -335,6 +421,7 @@ map.publish.confirm = 您確定�發布此地圖嗎?\n\n[lightgray]首先請先
 workshop.menu = �擇您��此項目執行的動作。
 workshop.info = 項目資訊
 changelog = 變動紀錄（�擇性）：
+updatedesc = 更新標題和�述
 eula = Steam EULA
 missing = 此項目已被刪除或移動。\n[lightgray]工作�列表�在已自動�消連�。
 publishing = [accent]發佈中……
@@ -342,6 +429,10 @@ publish.confirm = 您確定�發布嗎？\n\n[lightgray]首先確定您�� W
 publish.error = 發佈項目時發生�題：{0}
 steam.error = Steam �務�始化失敗。\n錯誤：{0}
 
+editor.planet = 行星：
+editor.sector = 地�：
+editor.seed = 種�：
+editor.cliffs = 牆轉為懸崖
 editor.brush = 筆刷
 editor.openin = 在編輯器中開啟
 editor.oregen = 礦石生�
@@ -353,54 +444,97 @@ editor.nodescription = 在地圖發佈�必須有至少四個字以上的�述
 editor.waves = 波次：
 editor.rules = �則：
 editor.generation = 自動生�：
+editor.objectives = 目標
+editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = 在�戲中編輯
+editor.playtest = 測試
 editor.publish.workshop = 在工作�上發佈
 editor.newmap = 新地圖
 editor.center = 中心
+editor.search = 尋找地圖…
+editor.filters = 篩�地圖
+editor.filters.mode = �戲模�：
+editor.filters.type = 地圖種類：
+editor.filters.search = �尋的資料夾：
+editor.filters.author = 作者
+editor.filters.description = �述
+editor.shiftx = X�移
+editor.shifty = Y�移
 workshop = 工作�
 waves.title = 波次
 waves.remove = 移除
-waves.never = 〈永�〉
 waves.every = �
 waves.waves = 波次
+waves.health = 血�：{0}%
 waves.perspawn = �次生�
 waves.shields = 護盾/波次
 waves.to = 至
-waves.guardian = é ­ç›®
+waves.spawn = spawn:
+waves.spawn.all = <all>
+waves.spawn.select = Spawn Select
+waves.spawn.none = [scarlet]地圖中找�到���
+waves.max = 最大單�數
+waves.guardian = 守衛者
 waves.preview = �覽
 waves.edit = 編輯……
+waves.random = 隨機
 waves.copy = 複製到剪貼簿
 waves.load = 從剪貼簿載入
 waves.invalid = 剪貼簿中的波次無效。
 waves.copied = 波次已複製。
 waves.none = 無自訂敵人。\n請注�，若沒有波次佈局將自動替�為�設佈局。
+waves.sort = 分類排�：
+waves.sort.reverse = ��排�
+waves.sort.begin = 開始
+waves.sort.health = 血�
+waves.sort.type = 兵種
+waves.search = �尋波...
+waves.filter = 單��濾
+waves.units.hide = 全部隱�
+waves.units.show = 全部顯示
 
-#校正用空行
+#these are intentionally in lower case
 wavemode.counts = 數�
 wavemode.totals = 總數
 wavemode.health = 生命值
+all = All
 
 editor.default = [lightgray]（�設）
 details = 詳細資訊……
 edit = 編輯……
+variables = 變數
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.globals = 內建變數
+
 editor.name = �稱：
 editor.spawn = �生單�
 editor.removeunit = 移除單�
 editor.teams = 隊�
 editor.errorload = 載入檔案時發生�題。
 editor.errorsave = 儲存檔案時發生�題。
-editor.errorimage = 這是圖片檔，而�地圖。��試圖修改副檔�讓它�以使用。\n\n如果�匯入地形圖片檔，請使用編輯器中的「匯入地形圖片檔�按鈕。
+editor.errorimage = 這是圖片檔，而�地圖。
 editor.errorlegacy = 此地圖太舊，並使用�支�的舊地圖格�。
 editor.errornot = 這�是地圖檔。
 editor.errorheader = 此地圖檔無效或已�毀。
 editor.errorname = 地圖沒有定義�稱。
+editor.errorlocales = 讀�語言包時出錯。
 editor.update = æ›´æ–°
 editor.randomize = 隨機化
+editor.moveup = �上移動
+editor.movedown = �下移動
+editor.copy = 複製
 editor.apply = 使用
 editor.generate = 產生
+editor.sectorgenerate = 產生地�
 editor.resize = 調整大�
 editor.loadmap = 載入地圖
 editor.savemap = 儲存地圖
+editor.savechanges = [scarlet]您有尚未�存的更改�\n\n[]您想��存這些更改嗎？
 editor.saved = 已儲存�
 editor.save.noname = 您的地圖沒有�稱�在「地圖資訊�畫�設定一個�稱。
 editor.save.overwrite = 您的地圖覆寫了內建的地圖�在「地圖資訊�畫�設定其他�稱。
@@ -419,7 +553,7 @@ editor.exportimage = 匯出地形圖片檔
 editor.exportimage.description = 匯出地形圖片檔
 editor.loadimage = 載入圖片
 editor.saveimage = 儲存圖片
-editor.unsaved = [scarlet]尚未儲存變更�[]\n您確定�退出嗎？
+editor.unsaved = 您確定�退出嗎？\n[scarlet](將�失未儲存的變更)[]
 editor.resizemap = 調整地圖大�
 editor.mapname = 地圖�稱：
 editor.overwrite = [accent]警告�這將會覆蓋�有的地圖。
@@ -439,10 +573,16 @@ toolmode.eraseores = 清除礦物
 toolmode.eraseores.description = 僅清除礦物。
 toolmode.fillteams = 填充團隊
 toolmode.fillteams.description = 填充團隊而�方塊。
+toolmode.fillerase = 清除相�
+toolmode.fillerase.description = 清除相�種類的方塊。
 toolmode.drawteams = 繪製團隊
 toolmode.drawteams.description = 繪製團隊而�方塊。
+#unused
+toolmode.underliquid = 水下地形
+toolmode.underliquid.description = 繪製液體下的地形
 
 filters.empty = [lightgray]沒有�濾器�使用下�的按鈕新增一個。
+
 filter.distort = 扭曲
 filter.noise = 雜訊
 filter.enemyspawn = 敵人�生�擇
@@ -459,6 +599,8 @@ filter.clear = 清除
 filter.option.ignore = 忽略
 filter.scatter = 分散
 filter.terrain = 地形
+filter.logic = �輯
+
 filter.option.scale = �模
 filter.option.chance = 機會
 filter.option.mag = 大�
@@ -467,17 +609,39 @@ filter.option.circle-scale = 圓形�模
 filter.option.octaves = �頻
 filter.option.falloff = 衰減
 filter.option.angle = 角度
+filter.option.tilt = 歪斜
+filter.option.rotate = 旋轉
 filter.option.amount = 數�
 filter.option.block = 方塊
 filter.option.floor = 地�
 filter.option.flooronto = 目標地�
 filter.option.target = 目標
+filter.option.replacement = �代
 filter.option.wall = 牆
 filter.option.ore = 礦石
 filter.option.floor2 = 次�地�
 filter.option.threshold2 = 次�閾值
 filter.option.radius = �徑
 filter.option.percentile = 百分比
+filter.option.code = Code
+filter.option.loop = Loop
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = 寬度：
 height = 長度：
@@ -488,6 +652,7 @@ load = 載入
 save = 儲存
 fps = FPS：{0}
 ping = 延�：{0}毫秒
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = 請�新啟動�戲以使��的語言生效。
@@ -506,21 +671,76 @@ requirement.core = 在{0}摧毀敵人核心
 requirement.research = 研究 {0}
 requirement.produce = 生產 {0}
 requirement.capture = �� {0}
-bestwave = [lightgray]最高波次：{0}
+requirement.onplanet = 控制�域：{0}
+requirement.onsector = 登陸�域：{0}
 launch.text = 發射
-research.multiplayer = �有管�者�以使用這個物�
+map.multiplayer = �有管�者�以查看地圖
 uncover = 探索
-configure = 設定
+configure = 資��置
+
+objective.research.name = 研究
+objective.produce.name = 生產
+objective.item.name = ��物�
+objective.coreitem.name = 核心物�
+objective.buildcount.name = 建造
+objective.unitcount.name = 製造單�
+objective.destroyunits.name = 摧毀單�
+objective.timer.name = 計時器
+objective.destroyblock.name = 摧毀
+objective.destroyblocks.name = 摧毀
+objective.destroycore.name = 摧毀核心
+objective.commandmode.name = 指�模�
+objective.flag.name = 全局Flag
+
+marker.shapetext.name = 稜框+文字標示
+marker.point.name = Point
+marker.shape.name = 稜框標示
+marker.text.name = 文字標示
+marker.line.name = Line
+marker.quad.name = Quad
+marker.texture.name = Texture
+
+marker.background = �黑背景
+marker.outline = �邊
+
+objective.research = [accent]研究：\n[]{0}[lightgray]{1}
+objective.produce = [accent]�得：\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]摧毀：\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]摧毀：[lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]�得：[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]建造：[][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.buildunit = [accent]產生單�：[][lightgray]{0}[]x\n{1}[lightgray]{2}
+objective.destroyunits = [accent]摧毀：[][lightgray]{0}[]x 單�
+objective.enemiesapproaching = [accent]的人在 [lightgray]{0} 到�[]
+objective.enemyescelating = [accent]敵人在[lightgray]{0}[]後擴大單�生產
+objective.enemyairunits = [accent]敵人在[lightgray]{0}[]後產生空�單�
+
+objective.destroycore = [accent]摧毀敵人核心
+objective.command = [accent]指�單�
+objective.nuclearlaunch = [accent]⚠ �測到核彈打擊： [lightgray]{0}
+
+announce.nuclearstrike = [red]⚠ 核彈打擊入侵警告 ⚠
 
 loadout = �載
 resources = 資�
-bannedblocks = �用方塊
+resources.max = 最大
+bannedblocks = �用方塊
+unbannedblocks = Unbanned Blocks
+objectives = 目標
+bannedunits = �用單�
+unbannedunits = Unbanned Units
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = 全部加入
 launch.from = 發射來�：[accent]{0}
+launch.capacity = 發射物�容�：[accent]{0}
 launch.destination = 目的地：{0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = 數值必須介於 0 到 {0}。
 add = 新增……
-boss.health = 頭目血�
+guardian = é ­ç›®
 
 connectfail = [scarlet]伺�器連線錯誤：\n\n[accent]{0}
 error.unreachable = 無法連線到伺�器。請確�拼字是�正確？
@@ -532,17 +752,23 @@ error.mapnotfound = 找�到地圖�
 error.io = 網路錯誤。
 error.any = 未知網路錯誤。
 error.bloom = �始化特效失敗。\n您的�置�能�支�
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
-weather.rain.name = 雨
-weather.snow.name = 雪
+weather.rain.name = �雨
+weather.snowing.name = �雪
 weather.sandstorm.name = 沙塵暴
 weather.sporestorm.name = 孢�風暴
 weather.fog.name = 霧
+campaign.playtime = \uf129 [lightgray]地��玩時間： {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
 
+sectorlist = 地�
+sectorlist.attacked = {0} ��攻擊
 sectors.unexplored = [lightgray]未探索
 sectors.resources = 資�：
 sectors.production = 生產：
-sectors.export = 出�：
+sectors.export = 輸出：
+sectors.import = 輸入：
 sectors.time = 佔領時間：
 sectors.threat = �險性：
 sectors.wave = 波次：
@@ -550,30 +776,45 @@ sectors.stored = 儲存：
 sectors.resume = 繼續
 sectors.launch = 發射
 sectors.select = ��
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]無（太陽）
+sectors.redirect = Redirect Launch Pads
 sectors.rename = �新命��域
 sectors.enemybase = [scarlet]敵方基地
 sectors.vulnerable = [scarlet]易�攻擊
 sectors.underattack = [scarlet]敵�來襲� [accent]{0}% ��
+sectors.underattack.nodamage = [scarlet]尚未佔領
 sectors.survives = [accent]存活 {0} 波次
 sectors.go = 進入
+sector.abandon = 放棄
+sector.abandon.confirm = 此地�的核心將會自我銷毀\n是�繼續?
 sector.curcapture = 已佔領地�
 sector.curlost = 已失去該地�
 sector.missingresources = [scarlet]核心資��足
 sector.attacked = 地� [accent]{0}[white] ��攻擊�
 sector.lost = 地� [accent]{0}[white] 戰敗�
-#note: 校正用空行
-sector.captured = �功佔領地�[accent]{0}[white]�
+sector.capture = Sector [accent]{0}[white]已佔領!
+sector.capture.current = 地�已佔領!
+sector.changeicon = 更改圖標
+sector.noswitch.title = 無法切�地�
+sector.noswitch = 當�地���攻擊時，無法切�地�\n\n地�: [accent]{0}[] 於 [accent]{1}[]
+sector.view = 檢視地�
 
 threat.low = 低
 threat.medium = 中
 threat.high = 高
 threat.extreme = 極高
 threat.eradication = 毀滅性
+difficulty.casual = 休閒模�
+difficulty.easy = 簡單模�
+difficulty.normal = 普通模�
+difficulty.hard = 困難模�
+difficulty.eradication = 滅絕模�
 
 planets = 行星
 
 planet.serpulo.name = 蕈孢星
+planet.erekir.name = 熾熱之境
 planet.sun.name = 太陽
 
 sector.impact0078.name = �擊0078
@@ -585,30 +826,109 @@ sector.stainedMountains.name = 多色山脈
 sector.desolateRift.name = �谷
 sector.nuclearComplex.name = 核能電網
 sector.overgrowth.name = 雜��生
-sector.tarFields.name = 油田
+sector.tarFields.name = 焦油田
 sector.saltFlats.name = 鹽�
-sector.fungalPass.name = 真�走廊
+sector.fungalPass.name = 真�廊�
 sector.biomassFacility.name = 生物質��工廠
 sector.windsweptIslands.name = 風之島
 sector.extractionOutpost.name = ��哨站
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = 星際發射站
+sector.coastline.name = 海岸
+sector.navalFortress.name = 海上�塞
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 sector.groundZero.description = �次開始的最佳�置。敵人�脅程度低。資�少。\n盡�能地採集鉛與銅。\n繼續�進。
-sector.frozenForest.description = �使是在如此�近山脈的地方，孢�也已經擴散了。如此低溫也無法永��止它們。\n\n開始冒險發電。建造�力發電機。並學習使用修�單�。
+sector.frozenForest.description = �使是在如此�近山脈的地方，孢�也已經擴散了。低溫無法永��止它們。\n\n開始探索電力。建造�力發電機。學習如何修�方塊。
 sector.saltFlats.description = 鹽�在沙漠的外�。此處資��多。\n\n敵人已在此建立了一座資�倉庫。剷除他們的核心。��留下任何�西。
-sector.craters.description = 在曾發生��代戰爭的�山��了很多水。開墾這個�域。採集沙�。煉製玻璃。抽水冷�砲塔與鑽頭。
+sector.craters.description = 在曾發生��代戰爭的�山��了很多水。開墾這個�域。採集沙�。煉製玻璃。抽水冷�砲�與鑽頭。
 sector.ruinousShores.description = 越�廢棄物就是海岸線。此處曾設有海岸防禦陣線。但剩下的�多。�有最基本的防禦�構沒有�毀，其他的一切都已然變為廢墟。\n繼續�外擴展。�新發�技術。
 sector.stainedMountains.description = 還未�孢�污染的山脈�內陸延伸。\n在此�域開採鈦金屬。學習如何使用它。\n\n這裡的敵人更為強大。��讓他們有以最強大武力攻擊的機會。
-sector.overgrowth.description = 此�域雜��生，離孢�的�頭很近。\n敵人在此建立了�哨站。建造泰�單�。摧毀它。然後找回�失的�西。
+sector.overgrowth.description = 此�域雜��生，離孢�的�頭很近。\n敵人在此建立了�哨站。建造�槌機甲，把這夷為平地。
 sector.tarFields.description = 產油�的外�，在山脈與沙漠之間。少數有油料儲備的地�。\n雖然看似被廢棄，但此�域附近�有一些�險的敵�。���看他們。\n\n[lightgray]如果�以的話，請研究石油加工科技。
-sector.desolateRift.description = �常�險的�域。資��富，但空間狹�。有高破壞風險。盡快離開。��被敵人的攻擊間�太長而被愚弄。
-sector.nuclearComplex.description = 曾是釷的生產與加工設施，但�在已�廢墟。\n[lightgray]研究釷�其許多用途。\n\n敵人�常多，�斷�尋�攻擊的�象。
+sector.desolateRift.description = �常�險的�域。資��富，但空間狹�。有高破壞風險。盡早設置防禦。��因很長的攻擊間�時間被騙了�
+sector.nuclearComplex.description = 曾是釷的生產與加工設施，但�在已�廢墟。\n[lightgray]研究釷�其許多用途。\n\n這裡敵人�常多，正�斷�尋�攻擊的�象。
 sector.fungalPass.description = 高山與滿是孢�的低谷間的�渡�域。這裡有敵人的�型�察基地。\n摧毀它。\n使用匕首機甲與爬行機甲。拿下兩個核心。
 sector.biomassFacility.description = 「孢��的發�地。這項設施是�去研究和生產該生物質的地方。\n研究�留於此的技術。培養孢�以加工�燃料和��物。\n\n[lightgray]在設施�毀後，孢�散播了出去。��如此強勢的外來種，當地生態系中沒有任何物種能與之匹敵……
 sector.windsweptIslands.description = ��於海岸線外的一串群島。紀錄顯示此地�去有生產[accent]塑鋼[]的建築物。抵禦敵方的海�進攻。在島嶼上建造基地。研究這些工廠。
 sector.extractionOutpost.description = 由敵方建造的�端哨站，用來發射資�到其他地�。\n\n跨地��輸是��星���或缺的技術。摧毀該基地。研究他們的發射�。
-sector.impact0078.description = 沉�在此的是第一個進入本星系的星際�輸船。\n\n回收任何能利用的�西。研究任何�有的科技。
+sector.impact0078.description = 沉�在此的是第一個進入本星系的星際�輸船。\n\n回收任何能利用的�西。研究任何殘存的科技。
 sector.planetaryTerminal.description = 最終目標。\n\n這麼濱海基地具有能夠發射核心到其他行星的建築。 其防禦�常嚴密。\n\n生產海上單�。盡速摧毀敵人。研究該發射建築。
+sector.coastline.description = �測到海�單�科技的�跡。擊退敵人的進攻，佔領地�，並�得科技。
+sector.navalFortress.description = 敵人已在這個有天然防禦�障的��島嶼設置了一座海�基地。摧毀它。�得海上科技的進階科技。
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
+
+
+sector.onset.name = 啟程之處
+sector.aegis.name = 神盾領域
+sector.lake.name = 岩漿之湖
+sector.intersect.name = 交會之地
+sector.atlas.name = 亞特拉斯
+sector.split.name = 分割地帶
+sector.basin.name = 沉�盆地
+sector.marsh.name = 芳油沼澤
+sector.peaks.name = 峰頂之境
+sector.ravine.name = �輸深谷
+sector.caldera-erekir.name = 熔岩群島
+sector.stronghold.name = �壘�塞
+sector.crevice.name = 狹縫之界
+sector.siege.name = 平行窄�
+sector.crossroads.name = �字路�
+sector.karst.name = 岩溶洞窟
+sector.origin.name = 終局之戰
+
+sector.onset.description = 新手教學地�。尚無作戰目標，請等候後續指示。
+sector.aegis.description = 敵人�護盾�護。一個在實驗階段的護盾破壞器��在此�域，找到並�供鎢原料啟用它。摧毀敵方基地。
+sector.lake.description = 本地�的熔渣湖嚴��縮普通單�的機動性。懸浮艇是唯一�擇。\n研究 [accent]飛船兵工廠[] 並盡早生產 [accent]掙脫[] 單�。
+sector.intersect.description = 掃�顯示本�域會在��後��多�攻擊。快速築起防禦，加速擴張。必須建造\n [accent]機甲[] 單�通�陡峭的地形。
+sector.atlas.description = 本地�有多樣地形，建造��單�以有效進攻。這裡�測到大型敵方基地，�能需�用�級�的單��破。\n研究 [accent]電解槽[] 和 [accent]戰車�塑者[]。
+sector.split.description = 較少敵�活動��本地�測試最新的�輸科技。
+sector.basin.description = 本�域有大�敵�。\n儘快建造單�並摧毀敵方基地以在此地立足。
+sector.marsh.description = 本地�有大�芳油，但�有少數的噴�。 \n建造[accent]化學燃燒發電機[]以發電。
+sector.peaks.description = 本地�的山�地形使得大多數單�無法正常發�。需�使用飛行單�。\n請注�敵�的防空設備，切斷這些設備的輔助建築��使其�止發射。
+sector.ravine.description = 雖然在本地�沒有發�任何的敵人基地，但此地其實是敵�的一個���輸路線。\n 請準備好�抗多種敵�。\n儘快生產[accent]波浪�金[]並建造[accent]折磨[]砲塔。
+sector.caldera-erekir.description = 根據�測，本�域的資�分佈在多個島嶼上。\n研究並部署無人機�輸設備。
+sector.stronghold.description = 本地�的敵�基地的守護者大�的[accent]釷[]\n使用它來研究高級的單�和炮塔。
+sector.crevice.description = 敵�會派�猛烈的打擊攻擊來徹底擊潰您的基地。\n盡快研究[accent]碳化鎢[]�[accent]熱解發電機[]以確�生存。
+sector.siege.description = 本�域的兩�平行山谷使得�得�進行兩線作戰。\n研究[accent]氰氣[]以生產更強的戰車單�。\n警告：�測到敵方長�離的導彈，導彈爆炸��以被攔截。
+sector.crossroads.description = 本�域的敵�基地建立在多種的地形上。嘗試研究��的單�以�應此環境。\n還有，有些敵�基地是被護盾�護的，找出他們是如何被供電的。
+sector.karst.description = 本�域的資��富，但敵人在一��就會馬上發動攻勢。\n利用資�優勢以研究[accent]相織布[].
+sector.origin.description = 終局之戰，敵人數�極多。\n所有研究�已完畢，�需專注摧毀所有的人基地。
+
+status.burning.name = 燃燒
+status.freezing.name = ��
+status.wet.name = 浸濕
+status.muddy.name = 泥濘
+status.melting.name = �化
+status.sapped.name = ��血
+status.electrified.name = 觸電
+status.spore-slowed.name = 孢�緩速
+status.tarred.name = 焦油
+status.overdrive.name = 超載
+status.overclock.name = 快轉
+status.shocked.name = 電擊
+status.blasted.name = 爆炸
+status.unmoving.name = �止
+status.boss.name = 守衛者
 
 settings.language = 語言
 settings.data = �戲資料
@@ -621,31 +941,36 @@ 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 = 清除存檔
 settings.clearresearch = 清除研究
-settings.clearresearch.confirm = 你確定�清除所有研究？
+settings.clearresearch.confirm = 您確定�清除所有研究？
 settings.clearcampaignsaves = 清除戰役紀錄
-settings.clearcampaignsaves.confirm = 你確定�清除所有戰役紀錄？
+settings.clearcampaignsaves.confirm = 您確定�清除所有戰役紀錄？
 paused = [accent]（已暫�）
 clear = 清除
 banned = [scarlet]已被�鎖
+unsupported.environment = [scarlet]�支�的環境
 yes = 是
 no = �
 info.title = 資訊
 error.title = [crimson]發生錯誤
 error.crashtitle = 發生錯誤
 unit.nobuild = [scarlet]單��能建造
-lastaccessed = [lightgray]最後使用：{0}
+lastaccessed = [lightgray]�一使用單�：{0}
+lastcommanded = [lightgray]�一指�單�：{0}
 block.unknown = [lightgray]？？？
 
+stat.showinmap = <加載地圖以顯示>
 stat.description = 用途
 stat.input = 輸入
 stat.output = 輸出
+stat.maxefficiency = 最高效率
 stat.booster = 強化
 stat.tiles = 需求方塊
-stat.affinities = 親和方塊
+stat.affinities = 加�傷害
+stat.opposites = ��狀態
 stat.powercapacity = 蓄電�
 stat.powershot = 能�/射擊
 stat.damage = 傷害
@@ -668,8 +993,11 @@ stat.memorycapacity = 記憶體容�
 stat.basepowergeneration = 基礎能�生產
 stat.productiontime = 生產時間
 stat.repairtime = 方塊完全修復時間
+stat.repairspeed = 修復速度
 stat.weapons = 武器
 stat.bullet = �彈
+stat.moduletier = 模組等級
+stat.unittype = 單�類別
 stat.speedincrease = 速度��
 stat.range = 範�
 stat.drilltier = �鑽�礦物
@@ -677,12 +1005,13 @@ stat.drillspeed = 基本鑽�速度
 stat.boosteffect = 加速效果
 stat.maxunits = 最大活�單�
 stat.health = �久度
+stat.armor = �甲
 stat.buildtime = 建設時間
 stat.maxconsecutive = 最大連續
 stat.buildcost = 建造�本
 stat.inaccuracy = 誤差
 stat.shots = 射擊數
-stat.reload = 射擊次數/秒
+stat.reload = 射擊速率
 stat.ammo = 彈藥
 stat.shieldhealth = 護盾生命值
 stat.cooldowntime = 冷確時間
@@ -692,6 +1021,7 @@ stat.lightningchance = 燃燒機率
 stat.lightningdamage = 燃燒傷害
 stat.flammability = 易燃性
 stat.radioactivity = 輻射性
+stat.charge = 蓄電力
 stat.heatcapacity = 熱容�
 stat.viscosity = �度
 stat.temperature = 溫度
@@ -700,25 +1030,77 @@ stat.buildspeed = 建築速度
 stat.minespeed = 挖掘速度
 stat.minetier = 挖掘等級
 stat.payloadcapacity = 負��
-stat.commandlimit = 指令�制
 stat.abilities = 能力
-stat.canboost = �加速
-stat.flying = 飛行中
+stat.canboost = 推進器
+stat.flying = 飛行單�
 stat.ammouse = 彈藥使用
+stat.ammocapacity = 彈藥容�
+stat.damagemultiplier = 傷害加�
+stat.healthmultiplier = 血�加�
+stat.speedmultiplier = 速度加�
+stat.reloadmultiplier = 射速加�
+stat.buildspeedmultiplier = 建造速度加�
+stat.reactive = 狀態傷害加�
+stat.immunities = �疫
+stat.healing = 治癒
+stat.efficiency = [stat]{0}% Efficiency
 
-ability.forcefield = 防護罩
+ability.forcefield = 防護力場
+ability.forcefield.description = 投射一個�以�收�彈的防護力場
 ability.repairfield = 維修力場
+ability.repairfield.description = 修復周�的單�
 ability.statusfield = 狀態力場
-ability.unitspawn = {0}工廠
+ability.statusfield.description = �周�的單�施加狀態效果
+ability.unitspawn = 工廠
+ability.unitspawn.description = 建造單�
 ability.shieldregenfield = 護盾充能力場
+ability.shieldregenfield.description = 為周�的單��新生�護盾
 ability.movelightning = 移動閃電
+ability.movelightning.description = 在移動時放出閃電
+ability.armorplate = �甲�
+ability.armorplate.description = 減少射擊時所�到的傷害
+ability.shieldarc = 電弧護盾
+ability.shieldarc.description = 投射一個弧形的力場護盾，能�收�彈
+ability.suppressionfield = 抑制修復力場
+ability.suppressionfield.description = �止周�的修復建築工作
+ability.energyfield = 能�場
+ability.energyfield.description = �周�敵人發射電擊
+ability.energyfield.healdescription = �周�敵人發射電極並治療�方
+ability.regen = �生
+ability.regen.description = 隨著時間的推移�復自己的生命值
+ability.liquidregen = 液體�收
+ability.liquidregen.description = �收液體以治療自己
+ability.spawndeath = 死亡產生單�
+ability.spawndeath.description = 在死亡時產生單�
+ability.liquidexplode = 死亡溢液
+ability.liquidexplode.description = 在死亡時產生液體
+ability.stat.firingrate = [stat]{0}/秒[lightgray] 射擊速度
+ability.stat.regen = [stat]{0}[lightgray]生命�復/秒
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray]護盾
+ability.stat.repairspeed = [stat]{0}/秒[lightgray]修復速度
+ability.stat.slurpheal = [stat]{0}[lightgray]生命/液體單�
+ability.stat.cooldown = [stat]{0}秒[lightgray]冷�時間
+ability.stat.maxtargets = [stat]{0}[lightgray]最大目標數
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray]�類型修復數�
+ability.stat.damagereduction = [stat]{0}%[lightgray]傷害減�
+ability.stat.minspeed = [stat]{0} 格/秒[lightgray]最低速度
+ability.stat.duration = [stat]{0} 秒[lightgray]�續時間
+ability.stat.buildtime = [stat]{0} 秒[lightgray]建造時間
 
+
+bar.onlycoredeposit = 僅�許�核心放置物�
 bar.drilltierreq = 需�更好的鑽頭
+bar.nobatterypower = Insufficieny Battery Power
 bar.noresources = 缺少資�
 bar.corereq = 需由核心�級
+bar.corefloor = 需�核心地塊
+bar.cargounitcap = 逹到單�容�上�
 bar.drillspeed = 鑽頭速度：{0}/秒
 bar.pumpspeed = 液體泵�速度：{0}/秒
 bar.efficiency = 效率：{0}%
+bar.boost = 速度加�：+{0}%
+bar.powerbuffer = Battery Power: {0}/{1}
 bar.powerbalance = 能�變化：{0}
 bar.powerstored = 能�存�：{0}/{1}
 bar.poweramount = 能�：{0}
@@ -729,49 +1111,67 @@ bar.capacity = 容�：{0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = 液體
 bar.heat = 熱
+bar.cooldown = Cooldown
+bar.instability = �穩定度
+bar.heatamount = 熱: {0}
+bar.heatpercent = 熱: {0} ({1}%)
 bar.power = 能�
 bar.progress = 建造進度
+bar.loadprogress = 進度
+bar.launchcooldown = 發射間隔
 bar.input = 輸入
 bar.output = 輸出
+bar.strength = [stat]{0}[lightgray]x 強度
 
 units.processorcontrol = [lightgray]由微處�器控制
 
 bullet.damage = [stat]{0}[lightgray]傷害
 bullet.splashdamage = [stat]{0}[lightgray]範�傷害 ~[stat] {1}[lightgray]格
 bullet.incendiary = [stat]燃燒
-bullet.sapping = [stat]�血
 bullet.homing = [stat]追蹤
-bullet.shock = [stat]震懾
-bullet.frag = [stat]破片彈
+bullet.armorpierce = [stat]穿甲
+bullet.maxdamagefraction = [stat]{0}%[lightgray]傷害上�
+bullet.suppression = [stat]{0}秒[lightgray]抑制修復 ~ [stat]{1}[lightgray]格
+bullet.interval = [stat]{0}/秒[lightgray]分裂�彈：
+bullet.frags = [stat]{0}[lightgray]x 集��彈:
+bullet.lightning = [stat]{0}[lightgray]x 電弧 ~ [stat]{1}[lightgray] 傷害
 bullet.buildingdamage = [stat]{0}%[lightgray] 建築傷害
+bullet.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray]擊退
 bullet.pierce = [stat]{0}[lightgray]×穿刺
 bullet.infinitepierce = [stat]穿刺
 bullet.healpercent = [stat]{0}[lightgray]% 回復
-bullet.freezing = [stat]冷�
-bullet.tarred = [stat]焦油
+bullet.healamount = [stat]{0}[lightgray] 直接回復
 bullet.multiplier = [stat]{0}[lightgray]×彈藥�數
 bullet.reload = [stat]{0}[lightgray]×射擊速率
+bullet.range = [stat]{0}[lightgray]射程（格）
+bullet.notargetsmissiles = [stat] ignores missiles
+bullet.notargetsbuildings = [stat] ignores buildings
 
-unit.blocks = 方塊
-unit.blockssquared = 方塊²
+
+unit.blocks = æ ¼
+unit.blockssquared = 格²
 unit.powersecond = 能�單�/秒
+unit.tilessecond = 格/秒
 unit.liquidsecond = 液體單�/秒
 unit.itemssecond = 物�/秒
 unit.liquidunits = 液體單�
 unit.powerunits = 能�單�
+unit.heatunits = 熱�單�
 unit.degrees = 度
 unit.seconds = 秒
 unit.minutes = 分
 unit.persecond = /秒
 unit.perminute = /分
 unit.timesspeed = ×速度
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = 護盾生命值
 unit.items = 物�
-unit.thousands = �
-unit.millions = 百�
-unit.billions = �億
+unit.thousands = K
+unit.millions = M
+unit.billions = B
+unit.shots = 發
 unit.pershot = /發
 category.purpose = 用途
 category.general = 一般
@@ -779,19 +1179,25 @@ category.power = 能�
 category.liquids = 液體
 category.items = 物�
 category.crafting = 需求
-category.function = 方法
-category.optional = ��的強化
+category.function = 功能
+category.optional = �外的強化效果
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.skipcoreanimation.name = 跳�核心發射/��動畫
 setting.landscape.name = 鎖定水平畫�
 setting.shadows.name = é™°å½±
 setting.blockreplace.name = 方塊建造建議
 setting.linear.name = 線性�濾
 setting.hints.name = �示
-setting.flow.name = 顯示資�輸�速度
-setting.backgroundpause.name = 背景執行時暫�
+setting.logichints.name = �輯�示
+setting.backgroundpause.name = 背景執行時暫��戲
 setting.buildautopause.name = 自動暫�建築
-setting.animatedwater.name = 液體動畫
-setting.animatedshields.name = 護盾動畫
-setting.antialias.name = 消除鋸齒[lightgray]（需��新啟動�戲）[]
+setting.doubletapmine.name = 連續點擊以挖礦
+setting.commandmodehold.name = 長按進入指�模�
+setting.distinctcontrolgroups.name = �單��制一個編隊
+setting.modcrashdisable.name = 閃退後�用模組
+setting.animatedwater.name = 顯示液�動畫
+setting.animatedshields.name = 顯示護盾動畫
 setting.playerindicators.name = 盟�標示
 setting.indicators.name = 敵方標示
 setting.autotarget.name = 自動射擊
@@ -800,15 +1206,12 @@ setting.touchscreen.name = 觸控螢幕控制
 setting.fpscap.name = 最大FPS
 setting.fpscap.none = ç„¡
 setting.fpscap.text = {0}FPS
-setting.uiscale.name = 使用者介�縮放[lightgray]（需��新啟動�戲）[]
+setting.uiscale.name = �作介�大�
+setting.uiscale.description = 需��新啟動�戲以更改大�
 setting.swapdiagonal.name = �設�角線放置
-setting.difficulty.training = 訓練
-setting.difficulty.easy = ç°¡å–®
-setting.difficulty.normal = 普通
-setting.difficulty.hard = 困難
-setting.difficulty.insane = 瘋狂
-setting.difficulty.name = 難度：
 setting.screenshake.name = 畫�抖動
+setting.bloomintensity.name = �花強度
+setting.bloomblur.name = �花模糊
 setting.effects.name = 顯示特效
 setting.destroyedblocks.name = 顯示被破壞的方塊
 setting.blockstatus.name = 顯示方塊狀態
@@ -818,31 +1221,41 @@ setting.saveinterval.name = 自動存檔間隔
 setting.seconds = {0}秒
 setting.milliseconds = {0}毫秒
 setting.fullscreen.name = 全螢幕
-setting.borderlesswindow.name = 無邊框視窗[lightgray]（�能需��新啟動�戲）
+setting.borderlesswindow.name = 無邊框視窗
+setting.borderlesswindow.name.windows = 無邊框全螢幕
+setting.borderlesswindow.description = �能需�新啟動�戲以變更
 setting.fps.name = 顯示FPS與延�
+setting.console.name = 啟用�桿
 setting.smoothcamera.name = 平滑�影機
 setting.vsync.name = 垂直�步
 setting.pixelate.name = �素化
 setting.minimap.name = 顯示�地圖
 setting.coreitems.name = 顯示核心物�
 setting.position.name = 顯示玩家�置
+setting.mouseposition.name = 顯示滑鼠座標
 setting.musicvol.name = 音樂音�
 setting.atmosphere.name = 顯示星�大氣層
+setting.drawlight.name = 繪製陰影/光照
 setting.ambientvol.name = 環境音�
 setting.mutemusic.name = �音
 setting.sfxvol.name = 音效音�
 setting.mutesound.name = �音
 setting.crashreport.name = 傳�匿�當機回報
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = 自動建立存檔
-setting.publichost.name = 公開�戲�見度
+setting.steampublichost.name = 公開�戲�見性
 setting.playerlimit.name = 玩家數�制
 setting.chatopacity.name = �天框��明度
 setting.lasersopacity.name = 雷射��明度
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = 橋�明度
 setting.playerchat.name = 在�戲中顯示�天視窗
 setting.showweather.name = 顯示天氣動畫
-public.confirm = 您想公開�戲嗎？\n[accent]任何人都�以加入您的�戲。\n[lightgray]之後�以在「設定�→「�戲�→「公開�戲�見度�中進行更改。
-public.confirm.really = 如果你想和朋�一起�玩，�利用[green]邀請好�[]而�是[scarlet]公開伺�器[]�\n你確定�將伺�設為[scarlet]公開[]？
+setting.hidedisplays.name = 隱��輯顯示
+setting.macnotch.name = 使界��應顯示槽�
+setting.macnotch.description = 需��新啟動�戲以更改大�
+steam.friendsonly = 僅�好�
+steam.friendsonly.tooltip = 是��有 Steam 好��以加入您的�戲。\n�消勾�後，�戲為公開的，任何人都�以加入。
 public.beta = 請注�，該�戲的Beta版本無法公開�戲大廳。
 uiscale.reset = 使用者介�縮放已變更\n按下「確定�確�這個比例\n[scarlet][accent] {0}[] 秒後退出並還原設定
 uiscale.cancel = �消並退出
@@ -851,12 +1264,9 @@ keybind.title = �新�定按�
 keybinds.mobile = [scarlet]此處的大多數快��在行動�置上�無法�作。僅支�基本移動。
 category.general.name = 一般
 category.view.name = 查看
+category.command.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 = 控制單�
@@ -871,6 +1281,27 @@ keybind.move_y.name = 垂直移動
 keybind.mouse_move.name = 跟隨滑鼠
 keybind.pan.name = 平移�頭
 keybind.boost.name = 加速
+keybind.command_mode.name = 指�模�
+keybind.command_queue.name = 單�指�隊列
+keybind.create_control_group.name = 創建�控隊�
+keybind.cancel_orders.name = �消指令
+keybind.unit_stance_shoot.name = 單�狀態：射擊
+keybind.unit_stance_hold_fire.name = 單�狀態：��
+keybind.unit_stance_pursue_target.name = 單�狀態：追�目標
+keybind.unit_stance_patrol.name = 單�狀態：巡�
+keybind.unit_stance_ram.name = 單�狀態：冲鋒
+keybind.unit_command_move.name = 單�指令：移動
+keybind.unit_command_repair.name = 單�指令：修�
+keybind.unit_command_rebuild.name = 單�指令：�建
+keybind.unit_command_assist.name = 單�指令：�助
+keybind.unit_command_mine.name = 單�指令：挖礦
+keybind.unit_command_boost.name = 單�指令：推進
+keybind.unit_command_load_units.name = 單�指令：�載單�
+keybind.unit_command_load_blocks.name = 單�指令：�載方塊
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
+keybind.rebuild_select.name = �建�域
 keybind.schematic_select.name = �擇�域
 keybind.schematic_menu.name = �圖目錄
 keybind.schematic_flip_x.name = X軸翻轉
@@ -896,10 +1327,11 @@ keybind.select.name = ��
 keybind.diagonal_placement.name = �角線放置
 keybind.pick.name = �擇方塊
 keybind.break_block.name = 移除方塊
+keybind.select_all_units.name = �擇所有單�
+keybind.select_all_unit_factories.name = �擇所有單�工廠
 keybind.deselect.name = �消��
 keybind.pickupCargo.name = 撿起貨物
 keybind.dropCargo.name = 丟棄貨物
-keybind.command.name = 指令
 keybind.shoot.name = å°„æ“Š
 keybind.zoom.name = 縮放
 keybind.menu.name = 主�單
@@ -908,6 +1340,7 @@ keybind.pause_building.name = 暫��繼續建造
 keybind.minimap.name = �地圖
 keybind.planet_map.name = 行星地圖
 keybind.research.name = 研究
+keybind.block_info.name = 方塊資訊
 keybind.chat.name = �天
 keybind.player_list.name = 玩家列表
 keybind.console.name = 終端機
@@ -931,49 +1364,102 @@ mode.pvp.description = 和其他玩家競爭�戰鬥。\n[gray]地圖中需�
 mode.attack.name = 進攻
 mode.attack.description = 目標是摧毀敵人的基地。\n[gray]地圖中需�有一個紅色核心。
 mode.custom = 自訂�則
+rules.invaliddata = 無效的剪貼�數據
+rules.hidebannedblocks = 隱��用的建築
 
 rules.infiniteresources = 無�資�
+rules.onlydepositcore = 僅�許�核心放置物�
+rules.derelictrepair = �許修復殘骸建築
 rules.reactorexplosions = �應�爆炸
+rules.coreincinerates = 核心銷毀物�
+rules.disableworldprocessors = �用世界處�器
 rules.schematic = �許使用�圖
 rules.wavetimer = 波次時間
+rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = 波次
+rules.airUseSpawns = Air units use spawn points
 rules.attack = 攻擊模�
-rules.buildai = 電腦自動建築
+rules.buildai = 基地建築者 AI
+rules.buildaitier = 建築者 AI 等級
+rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
+rules.rtsminsquadsize = 最�隊��模
+rules.rtsmaxsquadsize = 最大隊��模
+rules.rtsminattackweight = 最�攻擊力
+rules.cleanupdeadteams = 移除戰敗玩家的建築(�戰)
+rules.corecapture = 佔領摧毀的核心
+rules.polygoncoreprotection = 核心�築�呈多邊形
+rules.placerangecheck = 檢查放置範�
 rules.enemyCheat = 電腦無�資�
-rules.blockhealthmultiplier = 建築物�久度�數
-rules.blockdamagemultiplier = 建築物傷害�數
-rules.unitbuildspeedmultiplier = 單�建設速度�數
-rules.unithealthmultiplier = 單�生命值�數
-rules.unitdamagemultiplier = 單�傷害�數
+rules.blockhealthmultiplier = 建築物�久度加�
+rules.blockdamagemultiplier = 建築物傷害加�
+rules.unitbuildspeedmultiplier = 單�建設速度加�
+rules.unitcostmultiplier = 單�生產花費�率
+rules.unithealthmultiplier = 單�血�加�
+rules.unitdamagemultiplier = 單�傷害加�
+rules.unitcrashdamagemultiplier = 單�墜毀傷害�率
+rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+
+rules.solarmultiplier = 太陽能電加�
+rules.unitcapvariable = 核心�制單�上�
+rules.unitpayloadsexplode = 單�攜帶之負載與單�一起爆炸
+rules.unitcap = 基礎單�上�
+rules.limitarea = �制地圖�域
 rules.enemycorebuildradius = 敵人核心�止建設�徑︰[lightgray]（格）
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = 波次間�︰[lightgray]（秒）
+rules.initialwavespacing = �始等待時間：[lightgray]（秒）
 rules.buildcostmultiplier = 建設�本�數
 rules.buildspeedmultiplier = 建設速度�數
 rules.deconstructrefundmultiplier = 拆除資�返還比例
 rules.waitForWaveToEnd = 等待所有敵人毀滅�開始下一波次
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = 空���徑：[lightgray]（格）
 rules.unitammo = 單�需�彈藥
+rules.enemyteam = 敵方隊�
+rules.playerteam = 玩家隊�
 rules.title.waves = 波次
 rules.title.resourcesbuilding = 資�與建築
 rules.title.enemy = 敵人
 rules.title.unit = 單�
 rules.title.experimental = 實驗中
 rules.title.environment = 環境
+rules.title.teams = 分隊
+rules.title.planet = 星�
 rules.lighting = 光照
-rules.enemyLights = 敵方發光
+rules.fog = 戰爭迷霧
+rules.invasions = Enemy Sector Invasions
+rules.legacylaunchpads = Legacy Launch Pad Mechanics
+rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0.
+landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled)
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = �
+rules.anyenv = <任�>
 rules.explosions = 方塊�單�爆炸傷害
 rules.ambientlight = 環境光照
 rules.weather = 天氣
 rules.weather.frequency = 頻率：
 rules.weather.always = 永�
 rules.weather.duration = �續時間：
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = 物�
 content.liquid.name = 液體
 content.unit.name = 單�
 content.block.name = 方塊
+content.status.name = 狀態效果
 content.sector.name = 地�
+content.team.name = 隊�
+
+wallore = (牆)
 
 item.copper.name = 銅
 item.lead.name = 鉛
@@ -991,13 +1477,27 @@ item.blast-compound.name = 爆炸化�物
 item.pyratite.name = �焰彈
 item.metaglass.name = 鋼化玻璃
 item.scrap.name = 廢料
+item.fissile-matter.name = 裂變物質
+item.beryllium.name = 鈹
+item.tungsten.name = 鎢
+item.oxide.name = 氧化鈹
+item.carbide.name = 碳化鎢
+item.dormant-cyst.name = 休眠囊胞
+
 liquid.water.name = æ°´
 liquid.slag.name = 熔渣
 liquid.oil.name = 原油
 liquid.cryofluid.name = 冷�液
+liquid.neoplasm.name = 囊胞液
+liquid.arkycite.name = 芳油
+liquid.gallium.name = 鎵液
+liquid.ozone.name = 臭氧
+liquid.hydrogen.name = æ°«æ°£
+liquid.nitrogen.name = 氮氣
+liquid.cyanogen.name = æ°°æ°£
 
 unit.dagger.name = 匕首機甲
-unit.mace.name = 甩�
+unit.mace.name = �槌機甲
 unit.fortress.name = �塞
 unit.nova.name = 超新星
 unit.pulsar.name = 脈�星
@@ -1022,6 +1522,11 @@ unit.minke.name = 鬚鯨號
 unit.bryde.name = 鯷鯨號
 unit.sei.name = 塞鯨號
 unit.omura.name = 角島鯨號
+unit.retusa.name = 凹塔螺
+unit.oxynoe.name = 囊舌
+unit.cyerce.name = æµ·å…”
+unit.aegires.name = 海蛞�
+unit.navanax.name = 海牛
 unit.alpha.name = 阿爾法
 unit.beta.name = �塔
 unit.gamma.name = 伽瑪
@@ -1030,13 +1535,36 @@ unit.reign.name = �王
 unit.vela.name = 船帆座
 unit.corvus.name = �鴉座
 
-block.resupply-point.name = 補給點
+unit.stell.name = �蹄
+unit.locus.name = 權�
+unit.precept.name = 戒嚴
+unit.vanquish.name = æ“Šæ½°
+unit.conquer.name = ��
+unit.merui.name = �衛
+unit.cleroi.name = �賜
+unit.anthicus.name = ��
+unit.tecta.name = 天�
+unit.collaris.name = ��
+unit.elude.name = 掙脫
+unit.avert.name = �蔽
+unit.obviate.name = 影�
+unit.quell.name = 終局
+unit.disrupt.name = 瓦解
+unit.evoke.name = 甦醒
+unit.incite.name = 激發
+unit.emanate.name = æ“´å¼µ
+unit.manifold.name = 貨�無人機
+unit.assembly-drone.name = ��無人機
+unit.latum.name = 囊胞蟲
+unit.renale.name = �囊胞蟲
+
 block.parallax.name = 視差
 block.cliff.name = 峭�
 block.sand-boulder.name = 沙礫巨岩
 block.basalt-boulder.name = 玄武岩巨石
 block.grass.name = �
-block.slag.name = 熔渣
+block.molten-slag.name = 熔渣
+block.pooled-cryofluid.name = 冷�液
 block.space.name = 太空
 block.salt.name = é¹½
 block.salt-wall.name = 鹽牆
@@ -1064,24 +1592,28 @@ block.graphite-press.name = 石墨壓縮機
 block.multi-press.name = 多�壓縮機
 block.constructing = {0}\n[lightgray]（建設中）
 block.spawn.name = 敵人生�
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = 核心：碎片
 block.core-foundation.name = 核心：基地
 block.core-nucleus.name = 核心：核�
-block.deepwater.name = 深水
-block.water.name = æ°´
+block.deep-water.name = 深水
+block.shallow-water.name = æ°´
 block.tainted-water.name = 污水
+block.deep-tainted-water.name = 深汙水
 block.darksand-tainted-water.name = 黑沙污水
 block.tar.name = 焦油
 block.stone.name = 石頭
-block.sand.name = æ²™
+block.sand-floor.name = æ²™
 block.darksand.name = 黑沙
 block.ice.name = 冰
 block.snow.name = 雪
-block.craters.name = 彈�
+block.crater-stone.name = 彈�
 block.sand-water.name = 沙水
 block.darksand-water.name = 黑沙水
 block.char.name = 燒焦
 block.dacite.name = 英安岩
+block.rhyolite.name = �紋岩
 block.dacite-wall.name = 英安岩牆
 block.dacite-boulder.name = 英安岩石塊
 block.ice-snow.name = 冰雪
@@ -1099,6 +1631,7 @@ block.spore-cluster.name = 孢�簇
 block.metal-floor.name = 金屬地�
 block.metal-floor-2.name = 金屬地� 2
 block.metal-floor-3.name = 金屬地� 3
+block.metal-floor-4.name = 金屬地� 4
 block.metal-floor-5.name = 金屬地� 5
 block.metal-floor-damaged.name = �壞的金屬地�
 block.dark-panel-1.name = 黑�� 1
@@ -1138,6 +1671,9 @@ block.distributor.name = 大型分�器
 block.sorter.name = 分類器
 block.inverted-sorter.name = ��分類器
 block.message.name = 訊��
+block.reinforced-message.name = 強化訊�版
+block.world-message.name = 世界訊�版
+block.world-switch.name = World Switch
 block.illuminator.name = 照明燈
 block.overflow-gate.name = 溢�器
 block.underflow-gate.name = ��溢�器
@@ -1159,7 +1695,7 @@ block.battery-large.name = 大型電池
 block.combustion-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 = 雷射鑽頭
@@ -1175,11 +1711,11 @@ block.power-void.name = 能�虛空
 block.power-source.name = 能��
 block.unloader.name = ��器
 block.vault.name = 儲存庫
-block.wave.name = 波浪砲
+block.wave.name = 波浪
 block.tsunami.name = 海嘯
-block.swarmer.name = 蜂�砲
-block.salvo.name = 齊射砲
-block.ripple.name = 波紋砲
+block.swarmer.name = 蜂群
+block.salvo.name = 齊射
+block.ripple.name = 波紋
 block.phase-conveyor.name = 相織傳�帶
 block.bridge-conveyor.name = 輸�帶橋
 block.plastanium-compressor.name = 塑鋼壓縮機
@@ -1189,39 +1725,41 @@ block.solar-panel.name = 太陽能�
 block.solar-panel-large.name = 大型太陽能�
 block.oil-extractor.name = 原油鑽井
 block.repair-point.name = 維修點
+block.repair-turret.name = 維修機�
 block.pulse-conduit.name = 脈�管線
 block.plated-conduit.name = �甲管線
 block.phase-conduit.name = 相織管線
 block.liquid-router.name = 液體分�器
 block.liquid-tank.name = 液體儲存槽
+block.liquid-container.name = 液體容器
 block.liquid-junction.name = 液體樞�
 block.bridge-conduit.name = 管線橋
-block.rotary-pump.name = è¿´æ—‹æ³µ
-block.thorium-reactor.name = 釷�應堆
+block.rotary-pump.name = 迴轉幫浦
+block.thorium-reactor.name = 釷�應�
 block.mass-driver.name = 質�驅動器
 block.blast-drill.name = 氣爆鑽頭
-block.thermal-pump.name = 熱能泵
+block.impulse-pump.name = �擊泵
 block.thermal-generator.name = 地熱發電機
-block.alloy-smelter.name = �金冶煉廠
+block.surge-smelter.name = �金熔�
 block.mender.name = 修�方塊
 block.mend-projector.name = 修�投影器
 block.surge-wall.name = 波動牆
 block.surge-wall-large.name = 大型波動牆
-block.cyclone.name = 颶風砲
+block.cyclone.name = 颶風
 block.fuse.name = ��砲
 block.shock-mine.name = �擊地雷
-block.overdrive-projector.name = 超速�轉投影器
-block.force-projector.name = 護盾投影器
-block.arc.name = 電弧砲
+block.overdrive-projector.name = 超速投放儀
+block.force-projector.name = 護盾投放儀
+block.arc.name = 電弧
 block.rtg-generator.name = 放射性��素熱發電機
-block.spectre.name = 鬼影砲
+block.spectre.name = 鬼影
 block.meltdown.name = 熔毀砲
 block.foreshadow.name = 狙擊砲
 block.container.name = 容器
 block.launch-pad.name = �型發射�
-block.launch-pad-large.name = 大型發射�
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
 block.segment.name = 片段
-block.command-center.name = 指�中心
 block.ground-factory.name = 地�工廠
 block.air-factory.name = 航空工廠
 block.naval-factory.name = 海�工廠
@@ -1229,19 +1767,186 @@ 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.payload-conveyor.name = �物輸�帶
+block.payload-router.name = �物分�器
+block.duct.name = 類真空管
+block.duct-router.name = 真空管分�器
+block.duct-bridge.name = 真空管橋
+block.large-payload-mass-driver.name = 巨型�物質�驅動器
+block.payload-void.name = 原料虛空
+block.payload-source.name = 原料�
 block.disassembler.name = 還原機
 block.silicon-crucible.name = 矽�
-block.overdrive-dome.name = 高速拱頂
-#以下為實驗性建築，未來�能移除 experimental, may be removed
-block.block-forge.name = 方塊鑄造�
-block.block-loader.name = 方塊�載器
-block.block-unloader.name = 方塊�載器
+block.overdrive-dome.name = 超高速拱頂
 block.interplanetary-accelerator.name = 星際加速站
+block.constructor.name = 建造器
+block.constructor.description = 建造� 2x2 的方塊。
+block.large-constructor.name = 大型建造器
+block.large-constructor.description = 建造� 4x4 的方塊。
+block.deconstructor.name = 拆解器
+block.deconstructor.description = 拆解方塊和單�，返還所有建造花費。
+block.payload-loader.name = �物�載機
+block.payload-loader.description = 將物�或是液體�入方塊。
+block.payload-unloader.name = �物�物機
+block.payload-unloader.description = 將物�或是液體從方塊�出。
+block.heat-source.name = 熱��
+block.heat-source.description = 輸出大�熱的方塊。僅�沙盒。
 
-block.switch.name = 按鈕
-block.micro-processor.name = 微處�器
+#Erekir
+block.empty.name = 虛無
+block.rhyolite-crater.name = �紋岩隕�
+block.rough-rhyolite.name = 粗糙�紋岩
+block.regolith.name = 風化層
+block.yellow-stone.name = 黃岩
+block.carbon-stone.name = 碳岩
+block.ferric-stone.name = �岩
+block.ferric-craters.name = �岩隕�
+block.beryllic-stone.name = 綠柱岩
+block.crystalline-stone.name = 晶岩
+block.crystal-floor.name = 晶體地�
+block.yellow-stone-plates.name = 黃岩地�
+block.red-stone.name = 紅岩
+block.dense-red-stone.name = 質密紅岩
+block.red-ice.name = 紅冰
+block.arkycite-floor.name = 芳油池
+block.arkyic-stone.name = ��石
+block.rhyolite-vent.name = �紋岩燌�
+block.carbon-vent.name = 碳噴�
+block.arkyic-vent.name = ��石噴�
+block.yellow-stone-vent.name = 黃岩噴�
+block.red-stone-vent.name = 紅岩噴�
+block.crystalline-vent.name = 晶岩噴�
+block.redmat.name = 紅地�
+block.bluemat.name = �地�
+block.core-zone.name = 核心地塊
+block.regolith-wall.name = 風化牆
+block.yellow-stone-wall.name = 黃岩牆
+block.rhyolite-wall.name = �紋岩牆
+block.carbon-wall.name = 碳牆
+block.ferric-stone-wall.name = �岩牆
+block.beryllic-stone-wall.name = 綠柱岩牆
+block.arkyic-wall.name = ��岩牆
+block.crystalline-stone-wall.name = 晶岩牆
+block.red-ice-wall.name = 紅冰牆
+block.red-stone-wall.name = 紅岩牆
+block.red-diamond-wall.name = 紅鑽牆
+block.redweed.name = 赤藻
+block.pur-bush.name = 紫�木
+block.yellowcoral.name = 黃�瑚
+block.carbon-boulder.name = 碳岩巨石
+block.ferric-boulder.name = �岩巨石
+block.beryllic-boulder.name = 綠柱岩巨石
+block.yellow-stone-boulder.name = 黃岩巨石
+block.arkyic-boulder.name = ��岩巨石
+block.crystal-cluster.name = 晶簇
+block.vibrant-crystal-cluster.name = 鮮豔晶簇
+block.crystal-blocks.name = 塊狀晶體
+block.crystal-orbs.name = �狀晶體
+block.crystalline-boulder.name = 晶岩巨石
+block.red-ice-boulder.name = 紅冰巨石
+block.rhyolite-boulder.name = �紋岩巨石
+block.red-stone-boulder.name = 紅岩巨石
+block.graphitic-wall.name = 石墨礦牆
+block.silicon-arc-furnace.name = 電弧冶矽�
+block.electrolyzer.name = 電解槽
+block.atmospheric-concentrator.name = 氮氣富集器
+block.oxidation-chamber.name = 氧化室
+block.electric-heater.name = 電加熱器
+block.slag-heater.name = 熔渣加熱器
+block.phase-heater.name = 相織布加熱器
+block.heat-redirector.name = 熱��新定�器
+block.small-heat-redirector.name = Small Heat Redirector
+block.heat-router.name = 熱�分�器
+block.slag-incinerator.name = 熔渣焚化�
+block.carbide-crucible.name = 碳化鎢��
+block.slag-centrifuge.name = 熔渣離心機
+block.surge-crucible.name = �金��
+block.cyanogen-synthesizer.name = 氰氣��器
+block.phase-synthesizer.name = 相織布��器
+block.heat-reactor.name = 熱�應堆
+block.beryllium-wall.name = 鈹牆
+block.beryllium-wall-large.name = 大型鈹牆
+block.tungsten-wall.name = 鎢牆
+block.tungsten-wall-large.name = 大型鎢牆
+block.blast-door.name = 防爆自動門
+block.carbide-wall.name = 碳化鎢牆
+block.carbide-wall-large.name = 大型碳化鎢牆
+block.reinforced-surge-wall.name = 強化�金牆
+block.reinforced-surge-wall-large.name = 大型強化�金牆
+block.shielded-wall.name = 護盾牆
+block.radar.name = 雷逹
+block.build-tower.name = 建造塔
+block.regen-projector.name = �生投影儀
+block.shockwave-tower.name = 震波塔
+block.shield-projector.name = 護盾投影儀
+block.large-shield-projector.name = 大型護盾投影儀
+block.armored-duct.name = �甲真空管
+block.overflow-duct.name = 真空管溢�器
+block.underflow-duct.name = ��真空管溢�器
+block.duct-unloader.name = 真空管��器
+block.surge-conveyor.name = 波動輸�帶
+block.surge-router.name = 波動分�器
+block.unit-cargo-loader.name = 貨物�載器
+block.unit-cargo-unload-point.name = 貨物�載點
+block.reinforced-pump.name = 強化幫補
+block.reinforced-conduit.name = 強化管線
+block.reinforced-liquid-junction.name = 強化液體樞�
+block.reinforced-bridge-conduit.name = 強化管線橋
+block.reinforced-liquid-router.name = 強化液體分�器
+block.reinforced-liquid-container.name = 強化液體容器
+block.reinforced-liquid-tank.name = 強化液體槽
+block.beam-node.name = 光�節點
+block.beam-tower.name = 光�塔
+block.beam-link.name = 光��接
+block.turbine-condenser.name = 渦輪冷�器
+block.chemical-combustion-chamber.name = 化學燃燒發電機
+block.pyrolysis-generator.name = 熱解發電機
+block.vent-condenser.name = 氣體冷�器
+block.cliff-crusher.name = 牆體挖鑿機
+block.large-cliff-crusher.name = Advanced Cliff Crusher
+block.plasma-bore.name = 電漿鑽頭
+block.large-plasma-bore.name = 大型電漿鑽頭
+block.impact-drill.name = �擊鑽頭
+block.eruption-drill.name = 噴發鑽頭
+block.core-bastion.name = 核心：碉堡
+block.core-citadel.name = 核心：�壘
+block.core-acropolis.name = 核心：衛城
+block.reinforced-container.name = 強化容器
+block.reinforced-vault.name = 強化存儲庫
+block.breach.name = �破者
+block.sublimate.name = 昇�
+block.titan.name = 巨人
+block.disperse.name = 驅離者
+block.afflict.name = 折磨
+block.lustre.name = 餘光
+block.scathe.name = 毀�
+block.tank-refabricator.name = 戰車�塑者
+block.mech-refabricator.name = 機甲�塑者
+block.ship-refabricator.name = 飛船�塑者
+block.tank-assembler.name = �戰車組�廠
+block.ship-assembler.name = 飛行艦組�廠
+block.mech-assembler.name = �機甲組�廠
+block.reinforced-payload-conveyor.name = 強化�物輸�帶
+block.reinforced-payload-router.name = 強化�物分�器
+block.payload-mass-driver.name = �物質�驅動器
+block.small-deconstructor.name = �型解構器
+block.canvas.name = 畫布
+block.world-processor.name = 世界處�器
+block.world-cell.name = 世界單元
+block.tank-fabricator.name = 戰車兵工廠
+block.mech-fabricator.name = 機甲兵工廠
+block.ship-fabricator.name = 飛船兵工廠
+block.prime-refabricator.name = 高級單��塑者
+block.unit-repair-tower.name = 單�維修塔
+block.diffuse.name = æ“´æ•£
+block.basic-assembler-module.name = 支�組�廠
+block.smite.name = 天譴
+block.malign.name = 熱核
+block.flux-reactor.name = 通��應�
+block.neoplasia-reactor.name = 囊胞�應�
+
+block.switch.name = 開關
+block.micro-processor.name = 微型處�器
 block.logic-processor.name = �輯處�器
 block.hyper-processor.name = 超級處�器
 block.logic-display.name = 顯示器
@@ -1249,58 +1954,111 @@ block.large-logic-display.name = 大型顯示器
 block.memory-cell.name = 記憶單元
 block.memory-bank.name = 記憶體
 
-team.blue.name = è—�
+team.malis.name = ç´«
 team.crux.name = ç´…
 team.sharded.name = 黃
-team.orange.name = 橘
 team.derelict.name = �
 team.green.name = 綠
-team.purple.name = ç´«
+team.blue.name = è—�
 
 hint.skip = 跳�
 hint.desktopMove = 使用[accent][[WASD][]來移動。
-hint.zoom = 滾動 [accent]滾輪[] 來放大縮�畫�。
-hint.mine = �近並 [accent]點擊[] \uf8c4 銅礦以自行採礦。
+hint.zoom = 滾動[accent]滾輪[]來放大縮�畫�。
 hint.desktopShoot = [accent][[點擊左�][]射擊。
 hint.depositItems = 從船身拖曳到核心以存放採完的礦物。
 hint.respawn = 按[accent][[V][]以�生。
-hint.respawn.mobile = 你目�在控制單�/建築。[accent]點擊左上角的頭�[]�生。
+hint.respawn.mobile = 您目�在控制單�/建築。[accent]點擊左上角的頭�[]�生。
 hint.desktopPause = 按[accent][[空白�][]暫��繼續�戲。
-hint.placeDrill = 點��下介�的 \ue85e [accent]鑽頭[]�。�擇 \uf870 [accent]鑽頭[]並點擊畫�將鑽頭放到銅礦上。
-hint.placeDrill.mobile = 點��下介�的 \ue85e [accent]鑽頭[]�。�擇 \uf870 [accent]鑽頭[]並點擊畫�將鑽頭放到銅礦上。\n\n按下 \ue800 [accent]勾勾[]來確�建造。
-hint.placeConveyor = [accent]輸�帶[]能夠將物��到其他地方。從 \ue814 [accent]�輸[]�中點� \uf896 [accent]輸�帶[]。\n\n按�並拖曳以建造多個輸�帶。\n[accent]滑動滾輪[]以旋轉。
-hint.placeConveyor.mobile = [accent]輸�帶[]能夠將物��到其他地方。從 \ue814 [accent]�輸[]�中點� \uf896 [accent]輸�帶[]。\n\n按�畫�超�一秒後拖曳以建造多個輸�帶。
-hint.placeTurret = 建造 \uf861 [accent]砲塔[]抵禦進犯的敵�。\n\n砲塔需�彈藥，�在則是需� \uf838銅。\n用輸�帶和鑽頭供應砲塔。
 hint.breaking = [accent]按���[]並拖曳以破壞方塊。
 hint.breaking.mobile = 點亮�下角的 \ue817 [accent]�鎚[]圖案並點擊畫��直接拆除方塊。\n\n按�畫�超�一秒後拖曳以連續摧毀多個方塊。
-hint.research = 使用 \ue875 [accent]研究[] 按鈕來研究新科技。
-hint.research.mobile = 使用 \ue875 [accent]研究[] 按鈕來研究新科技。
+hint.blockInfo = 點擊�種方塊的[accent][[？][]按鈕以檢視該方塊的資訊
+hint.derelict = [accent]殘骸[]地圖上有先�基地留下的殘骸。\n\n�以[accent]銷毀[]這些建築�得資�。
+hint.research = 使用\ue875[accent]研究[]按鈕來研究新科技。
+hint.research.mobile = 使用\ue875[accent]研究[]按鈕來研究新科技。
 hint.unitControl = 按�[accent][[L-ctrl][]並[accent]點擊[]以控制我方的機甲和砲�。
 hint.unitControl.mobile = [accent][[點擊兩下][]以控制我方的機甲和砲�。
-hint.launch = 一旦�集到足夠的資�，你�以���下角的 \ue827 [accent]地圖[]來��你�[accent]發射[]的�域。
-hint.launch.mobile = 一旦�集到足夠的資�，你�以���單中的 \ue827 [accent]地圖[]來��你�[accent]發射[]的�域。
-hint.schematicSelect = 按�[accent][[F][]並拖曳�以��方塊並貼上。\n\n按下[accent][[滑鼠中�][]�以複製單一方塊。
+hint.unitSelectControl = 若�控制單�，請按�[accent]L-Shift[]�進入[accent]指�模�[]。\n在指�模�下，左�點擊並拖曳以��單�。[accent]��[]點擊地點或目標來命令單�移動或攻擊。
+hint.unitSelectControl.mobile = 若�控制單�，請按左下角的[accent]指�[]按鈕進入 [accent]指�模�[]。\n在指�模�下，長按並拖曳以��單�。點擊地點或目標來命令單�移動或攻擊。
+hint.launch = 一旦�集到足夠的資�，您�以���下角的\ue827[accent]地圖[]來��您�[accent]發射[]的�域。
+hint.launch.mobile = 一旦�集到足夠的資�，您�以���單中的\ue827[accent]地圖[]來��您�[accent]發射[]的�域。
+hint.schematicSelect = 按�[accent][[F][]�並拖曳以��建築並複製�貼上。\n\n點擊[accent][滑鼠中�][]�以複製單一建築。
+hint.rebuildSelect = 按�[accent][[B][]�並拖曳以��被摧毀的建築。\n這將自動�建它們。
+hint.rebuildSelect.mobile = �擇\ue874複製按鈕，然後點擊\ue80f�建按鈕並拖曳以��被摧毀的建築。\n這將自動�建它們。
+
 hint.conveyorPathfind = 在建造輸�帶時按下[accent][[L-Ctrl][]�以自動產生路徑。
 hint.conveyorPathfind.mobile = 啟用 \ue844 [accent]�角線模�[]�以在建造輸�帶時自動產生路徑。
-hint.boost = 按�[accent][[L-Shift][]�以帶著你的機甲一起飛越障礙物\n\n�有少數陸行機甲有推進器。
-hint.command = 按下[accent][[G][]集�附近[accent]相似類別[]的機甲進入編隊。\n\n你�先控制一�陸行機甲�能集�其他陸行機甲。
-hint.command.mobile = [accent][[點擊兩下][]你的機甲使其他機甲進入編隊。
+hint.boost = 按�[accent][[L-Shift][]�以帶著您的機甲一起飛越障礙物\n\n�有少數陸行機甲有推進器。
 hint.payloadPickup = 按下 [accent][[[] 拾起�方塊或機甲。
 hint.payloadPickup.mobile = [accent]長按[]一個方塊或單��將其拾起。
 hint.payloadDrop = 按下 [accent]][] �以放下�有的方塊或單�。
 hint.payloadDrop.mobile = [accent]長按[]任何空白處�以放下�有的方塊或單�。
 hint.waveFire = 以[accent]水[]�填的[accent]波浪[]會自動撲滅附近�勢。
-hint.generator = \uf879 [accent]燃燒發電機[]消耗煤炭產生能�給相鄰的方塊。\n\n使用 \uf87f [accent]能�節點[]增加電力涵蓋範�。
+hint.generator = \uf879 [accent]燃燒發電機[]消耗煤炭產生電力給相鄰的方塊。\n\n使用\uf87f[accent]能�節點[]增加電力涵蓋範�。
 hint.guardian = [accent]頭目[]�有厚實的�甲。較弱的彈藥如[accent]銅[]和[accent]鉛[]並[scarlet]沒有效果[].\n\n使用更高等的砲臺或以\uf835 [accent]石墨[]��\uf861雙砲�\uf859齊射砲摧毀頭目。
-hint.coreUpgrade = 核心�以��在上�[accent]覆蓋一個更高等級的核心[]來�級。\n\n放置  [accent]核心：基地[] 到  [accent]核心：碎片[] 上. 確�沒有其他障礙物。
-hint.presetLaunch = �色的[accent]��地�[]，例如[accent]冰�森林[]，�由任何地�發射。這類地�無須由相鄰地�進攻。\n\n[accent]數字編號地�[]，�是這一個，��是完�戰役的必��件。
+hint.coreUpgrade = 核心�以��在上�[accent]覆蓋一個更高等級的核心[]來�級。\n\n放置 \uf868 [accent]核心：基地[] 到 \uf869 [accent]核心：碎片[] 上. 確�沒有其他障礙物。
+hint.presetLaunch = �色的[accent]��地�[]，例如[accent]冰�森林[]，�由任何地�發射。這類地�無須由相鄰地�進攻。\n\n[accent]數字編號地�[]則是一般的�域，�自由佔領，�影響戰役的完�。
+hint.presetDifficulty = 此地�為[scarlet]高�險等級[]�域。\n[accent]�建議[]在準備好科技和資�以�發射至此�域。
 hint.coreIncinerate = 當任一物�的核心庫存滿了後，後續進入的�種資�會被[accent]銷毀[]。
-hint.coopCampaign = �玩[accent]多人�作戰役[]時，�地圖所生產的資�皆會被�入[accent]自己的地�[]。\n\n任何新科技也會單��步到自己的科技。
+hint.factoryControl = 若�設置兵工廠的[accent]集�點[]，在指�模�中點�工廠，���點擊指定�置。\n此工廠產生的單�將自動移動到集�點。
+hint.factoryControl.mobile = 若�設置兵工廠的[accent]集�點[]，在指�模�中��工廠，�點擊指定�置。\n此工廠產生的單�將自動移動到集�點。
+gz.mine = 接近在地上的\uf8c4 [accent]銅礦[]，然後點擊它來開始挖掘。
+gz.mine.mobile = 接近地上的\uf8c4[accent]銅礦[]，然後點擊它來開始挖掘。
+gz.research = 打開\ue875科技樹。\n研究\uf870[accent]機械鑽頭[]，然後在�下角的�單中將其��。\n點擊銅礦放置鑽頭。
+gz.research.mobile = 打開\ue875科技樹。\n研究\uf870[accent]機械鑽頭[]，然後在�下角的�單中將其��。\n點擊銅礦放置鑽頭。\n\n點擊�下角的\ue800[accent]勾[]以確�。
+gz.conveyors = 研究並放置\uf896[accent]傳�帶[]\n將鑽頭挖掘的礦物移至核心。\n\n點擊並拖動以連續放置傳�帶。\n滾動[accent]滑鼠滾輪[]以轉�。
+gz.conveyors.mobile = 研究並放置\uf896[accent]傳�帶[]\n將鑽頭挖掘的礦物移至核心。\n\n長按一秒，然後拖動以連續放置傳�帶。
+gz.drills = 擴大挖掘�模。\n放置更多的機械鑽頭。\n挖掘100個銅。
+gz.lead = \uf837[accent]鉛[]是�一種常用資�。\n用鑽頭挖掘鉛礦。
+gz.moveup = \ue804擴張以推進任務。
+gz.turrets = 研究並放置2個\uf861[accent]雙砲[]�衛核心。\n雙砲需�傳�帶供給\uf838[accent]彈藥[]。
+gz.duoammo = 用傳�帶給雙砲供給[accent]銅[]。
+gz.walls = [accent]牆[]�以防止建築�到�壞。\n在砲塔周�放置一些\uf8ae[accent]銅牆[]。
+gz.defend = 敵人來襲，準備防禦。
+gz.aa = 普通砲塔難以快速擊�空中單�。\n\uf860[accent]驅離者[]防空能力出色，但使用[accent]鉛[]彈藥。
+gz.scatterammo = 用傳�帶給驅離者供給[accent]鉛[]。
+gz.supplyturret = [accent]給砲塔供彈
+gz.zone1 = 這是敵人的出生點。
+gz.zone2 = 波次開始時，範�內的所有建築都會被摧毀。
+gz.zone3 = 波次�將開始。\n�好準備。
+gz.finish = 建造更多砲塔，挖掘更多資�，\n擊退所有波次以[accent]佔領�域[]。
+onset.mine = 點擊牆上的\uf748[accent]鈹礦[]進行手動開採。\n\n使用[accent][[WASD]移動。
+onset.mine.mobile = 點擊牆上的\uf748[accent]鈹礦[]進行手動開採。
+onset.research = 打開\ue875科技樹。\n研究\uf73e[accent]渦輪冷�器[]，然後將其放置在噴�上。\n這將產生[accent]電力[]。
+onset.bore = 研究並放置\uf741[accent]電漿鑽頭[]。\n它�以自動從牆�上挖掘資�。
+onset.power = 為了�供電漿鑽頭[accent]電力[]，研究並放置一個\uf73d[accent]光�節點[]。\n將渦輪冷�器連接到電漿鑽頭。
+onset.ducts = 研究並放置\uf799[accent]類真空管[]將電漿鑽頭挖掘的礦物移至核心。\n\n點擊並拖動以連續放置類真空管。\n滾動[accent]滑鼠滾輪[]以旋轉。
+onset.ducts.mobile = 研究並放置\uf799[accent]類真空管[]將電漿鑽頭挖掘的礦物移至核心。\n\n長按一秒，然後拖動以連續放置類真空管。
+onset.moremine = 擴大開採�模。\n放置更多的電漿鑽頭，並使用光�節點和類真空管來支�它們。\n開採200個鈹。
+onset.graphite = 較複雜的方塊需�\uf835[accent]石墨[]。\n使用電漿鑽頭開採石墨。
+onset.research2 = 開始研究[accent]工廠[]。\n研究\uf74d[accent]牆體挖鑿機[]和\uf779[accent]電弧冶矽�[]。
+onset.arcfurnace = 電弧冶矽�需�\uf834[accent]沙[]和\uf835[accent]石墨[]來冶煉\uf82f[accent]矽[]。\n�時也需�[accent]電力[]。
+onset.crusher = 使用\uf74d[accent]牆體挖鑿機[]來開採沙。
+onset.fabricator = 使用[accent]單�[]探索地圖，�衛建築物並進行攻擊。\n研究並放置一個\uf6a2[accent]戰車製造廠[]。
+onset.makeunit = 生產單�。\n點擊"?"以查看所�工廠的需求資�。
+onset.turrets = 單��於防禦很有效，但��使用[accent]炮塔[]�以�供更好的防禦能力。\n放置一個\uf6eb[accent]�破者[]炮塔。\n炮塔需�供給\uf748[accent]彈藥[]。
+onset.turretammo = 為炮塔供應[accent]鈹[]彈藥。
+onset.walls = [accent]牆[]�以防止建築�到傷害。\n在炮塔周�放置一些\uf6ee[accent]鈹牆[]。
+onset.enemies = 敵人�將到來，準備防禦。
+onset.defenses = [accent]建立防禦:[lightgray] {0}
+onset.attack = 敵�基地�常脆弱。發動�擊。
+onset.cores = �以在[accent]核心地磚[]上建立新的核心。\n新的核心功能類似�進基地，並與其他基地共享資�倉庫。\n放置一個\uf725核心。
+onset.detect = 敵�將在 2 分�內發�您。\n設置防禦�開採礦物和建造生產設施。
+onset.commandmode = 按�[accent]Shift[]進入[accent]指�模�[]。\n[accent]左�點擊並拖曳[]以�擇單�。\n[accent]��點擊[]以命令所�單�移動或進攻。
+onset.commandmode.mobile = 按下[accent]指�按鈕[]進入[accent]指�模�[]。\n長按一秒，然後[accent]拖曳[]以�擇單�。\n[accent]點擊[]以命令所�單�移動或進攻。
+
+aegis.tungsten = 鎢�以使用[accent]�擊鑽頭[]來開採。\n此�構需�[accent]水[]和[accent]電力[]。
+
+split.pickup = �些物��以被核心單�撿起。\n撿起這個[accent]容器[]，然後放到[accent]�物�載機[]上。\n(�設撿起與放下的按�分別是 [[ 和 ] )
+split.pickup.mobile = �些物��以被核心單�撿起。\n撿起這個[accent]容器[]，然後放到 [accent]�物�載機[] 上。\n(�撿起或放下�西，請長按該物�。)
+split.acquire = 您必須��一些鎢�能建造單�。
+split.build = 單�必須被��到牆的�一邊。\n在牆的兩��放一個[accent]�物質�驅動器[]。\n通�按壓其中一個來設置連�，然後�擇�一個。
+split.container = 類似於容器，單�也�以使用[accent]�物質�驅動器[]進行�輸。\n將一個單�兵工廠放置在�物�載機�邊以�載它們，然後將它們�到牆的�一�以進攻敵方基地。
+
 
 item.copper.description = 最基本的�構�料。在�種類型的方塊中廣泛使用。
 item.copper.details = 銅，蕈孢星上異常常見的金屬。加工��構脆弱。
 item.lead.description = 一種基本的起始�料。被廣泛用於電�設備和液體�輸方塊。
-item.lead.details = 密度高�穩定。廣泛用於電池中。\n附記：�能�生物有毒性。�便這裡也沒剩多少。
+item.lead.details = 密度高�穩定。廣泛用於電池中。\n附記：�能�生物有毒性。雖然這裡也沒剩多少。
 item.metaglass.description = 一種超高強度的玻璃。廣泛用於液體分�和儲存。
 item.graphite.description = 礦化的碳，用於彈藥和電氣元件。
 item.sand.description = 一種常見的�料，廣泛用於冶煉，包括製作�金和作為助熔劑。
@@ -1308,33 +2066,46 @@ item.coal.description = �在「播種�事件�就形�的�物化石。
 item.coal.details = 看似�物化石，形�時間�早於「播種�事件。
 item.titanium.description = 一種罕見的超輕金屬，被廣泛�用於�輸液體�鑽頭和飛行載具。
 item.thorium.description = 一種高密度的放射性金屬，用作�構支�和核燃料。
-item.scrap.description = 舊�構和單�的殘骸。�有微�的�種金屬。
+item.scrap.description = 舊建築和單�的殘骸。�有微�的�種金屬。
 item.scrap.details = ��建築�兵器留下的殘骸。
 item.silicon.description = 一種�常有用的�導體，被用於太陽能電池��很多複雜的電�設備和追蹤導彈彈藥。
 item.plastanium.description = 一種輕���延展的�料，用於高級的飛行載具和破片彈藥。
 item.phase-fabric.description = 一種近乎無��的物質，用於先進的電�設備和自修復技術。
 item.surge-alloy.description = 一種具有�特電�特性的高級�金。
-item.spore-pod.description = ��的孢�莢。��大氣濃度的孢��為工業用途。用於轉化為原油�爆炸物和燃料。
+item.spore-pod.description = 孢�莢，從大氣中汲�孢�而��。用於轉化為原油�爆炸物和燃料。
 item.spore-pod.details = 充滿孢�。很�能是人造生物。會釋放�其他生物有毒的氣體。極具侵略性。特定情�下極為易燃。
 item.blast-compound.description = 用於炸彈和高爆彈的混�物。
 item.pyratite.description = 用於至燃武器和燃燒型發電機的物質。
+item.beryllium.description = 用於熾熱之境的建築和彈藥。
+item.tungsten.description = 用於鑽頭��甲和彈藥。在建造更先進的建築有其必�性。
+item.oxide.description = 作為熱導體和絕緣體。
+item.carbide.description = 用於高級的建築��型單�和彈藥。
 
-liquid.water.description = 最有用的液體。常用於冷�機器和廢物處�。
+liquid.water.description = 最常見的液體。常用於冷�機器和廢物處�。
 liquid.slag.description = �種��類型的熔�金屬混�在一起的液體。�以被分解�其所組�之礦物，或作為武器�敵方單�噴�。
 liquid.oil.description = 用於進階�料製造的液體。�以轉化為煤炭作為燃料或噴��敵方單�後點燃作為武器。
-liquid.cryofluid.description = 一種安定，無��性的液體，用水�鈦混��。具有很高的比熱。廣泛的用作冷�劑。
+liquid.cryofluid.description = 一種安定，無��性的液體。具有很高的比熱，廣泛的用作工廠�砲��或�應�的冷�劑。
+liquid.arkycite.description = 用於發電與���料的化學�應。
+liquid.ozone.description = 用於�料製造的氧化劑，以�作為燃料。有中度爆炸性。
+liquid.hydrogen.description = 用於資�開採�單�製造與建築修復。易燃。
+liquid.cyanogen.description = 用於�彈�製造單�與在其他高級建築上的�應。高度易燃。
+liquid.nitrogen.description = 用於資�開採�氣體生產與單�製造。相�惰性。
+liquid.neoplasm.description = 囊胞�應�所生產出的�險生物性副產物。如果�到�有水的建築，囊胞液會擴散到那些建築上，並�其造�傷害。有粘性。
+liquid.neoplasm.details = 囊胞液，由一種無法控制並快速分裂的��細胞團組�，具有�淤泥般的�稠度。�熱。��有水的建築�其�險。\n\n以�在的技術來說，由於其複雜性�其�穩定性，�進行標準分��分困難。潛在的應用目�未知。建議在熔渣池中焚毀。
 
-block.resupply-point.description = 補給銅礦彈藥給附近的單�。無法用於需�電池電力的單�。
+block.derelict = [lightgray]殘骸
 block.armored-conveyor.description = 以與鈦輸�帶相�的速度移動物�，但�有更高的防禦。�接�任何從��輸入的資�。
 block.illuminator.description = �而美的光�。
 block.message.description = 儲存一�訊�。用於盟�之間的�通。
+block.reinforced-message.description = 儲存一�訊�。用於盟�之間的�通。
+block.world-message.description = 一個用於製圖的訊�版。無法被銷毀。
 block.graphite-press.description = 將煤炭壓縮�石墨。
 block.multi-press.description = 石墨壓縮機的�級版。利用水和電力快速高效地處�煤炭。
 block.silicon-smelter.description = 使用高純度焦炭還原沙�以生產矽。
 block.kiln.description = 將沙�和鉛熔煉�鋼化玻璃。需�少�能�。
 block.plastanium-compressor.description = 將原油和鈦壓縮製造塑鋼。
 block.phase-weaver.description = 使用放射性的釷和大�的沙�生產相織布。
-block.alloy-smelter.description = 使用鈦�鉛�矽和銅以生產波動�金。
+block.surge-smelter.description = 熔化鈦�鉛�矽以�銅�爲波動�金。
 block.cryofluid-mixer.description = 混�水和研磨的鈦粉製造冷�效率更高的冷�液。�釷�應堆是必�的。
 block.blast-mixer.description = 混�胞�碎塊將�焰彈變�比較�易燃但更具爆炸性的爆炸混�物。
 block.pyratite-mixer.description = 混�煤�鉛和沙�混��為易燃的�焰彈。
@@ -1347,9 +2118,11 @@ block.incinerator.description = 銷毀所有接收的物�或液體。
 block.power-void.description = 銷毀所有輸入的能�。僅�沙盒。
 block.power-source.description = 無�輸出能�。僅�沙盒。
 block.item-source.description = 無�輸出物�。僅�沙盒。
-block.item-void.description = �使用能�銷毀任何進入它的物�。僅�沙盒。
+block.item-void.description = 銷毀所有進入的物�。僅�沙盒。
 block.liquid-source.description = 無�輸出液體。僅�沙盒。
 block.liquid-void.description = 銷毀所有輸入的液體。僅�沙盒。
+block.payload-source.description = 無�輸出原料。僅�沙盒。
+block.payload-void.description = 銷毀所有進入的原料。僅�沙盒。
 block.copper-wall.description = 一種便宜的防禦方塊。\n用於�幾波防衛核心和砲塔。
 block.copper-wall-large.description = 一種便宜的防禦方塊。\n用於�幾波防禦核心和砲塔\n佔據多個方塊。
 block.titanium-wall.description = 一個中等強度的防禦方塊。\n�供�敵人的�度�護。
@@ -1362,6 +2135,10 @@ block.phase-wall.description = 沒有釷牆那麼堅固但特殊的相�化�
 block.phase-wall-large.description = 沒有釷牆那麼堅固但特殊的相�化�物塗層會使大多的�彈�離。\n佔據多個方塊。
 block.surge-wall.description = 最強的防禦方塊。\n有低機率�攻擊者觸發閃電。
 block.surge-wall-large.description = 最強的防禦方塊。\n有低機率�攻擊者觸發閃電。\n佔據多個方塊。
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = �以通�點擊打開和關閉的一扇�門。\n如果打開，敵人�以穿�它射擊和移動。
 block.door-large.description = �以通�點擊打開和關閉的一扇大門。\n如果打開，敵人�以穿�它射擊和移動。\n佔據多個方塊。
 block.mender.description = 定期修復附近的建築物。在�一波之間��防禦力的修復。\n��擇使用矽來�高範�和效率。
@@ -1382,14 +2159,15 @@ block.router.details = 必�之惡。�建議放置在生產建築�，�然
 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 = 終極的泵。
+block.impulse-pump.description = 泵�液體。
 block.conduit.description = 基本液體�輸方塊。將液體往�輸�。用於��器�泵或其他管線。
 block.pulse-conduit.description = 高級的液體�輸方塊。比標準管線更快地輸�並儲存更多液體。
 block.plated-conduit.description = 用和脈�管線相�的速率��液體，但有更強的�甲。除了其他管線以外，�會接�來自��的其他液體\n比較�會�液。
 block.liquid-router.description = 接�來自一個方�的液體並將它們平�輸出到最多3個其他方�。�以儲存一定�的液體。用於將液體從一個來�分�多個目標。
+block.liquid-container.description = 儲存�觀的液體。由四邊輸出，與液體分�器雷�。
 block.liquid-tank.description = 儲存大�液體。當液體需求��定時，使用它來創建緩�或作為冷���方塊的�障。
 block.liquid-junction.description = 作為兩個交�管線的橋樑。�用於兩���管線將��液體��到���置的情�。
 block.bridge-conduit.description = 高級的液體�輸方塊。�許跨�最多3個任何地形或建築物的方塊�輸液體。
@@ -1408,7 +2186,7 @@ block.rtg-generator.description = 一種簡單���的發電機，使用放
 block.solar-panel.description = ��太陽產生少�的能�。
 block.solar-panel-large.description = ��太陽產生少�的能�。效率較普通太陽能�高。
 block.thorium-reactor.description = 從高度放射性釷產生大�能�。需��續冷�。如果供應的冷�劑�足，會劇烈爆炸。產生的能��決於釷�載�，滿載時會�到基礎發電功率。
-block.impact-reactor.description = 先進的發電機，在最高效率時能產生大�能�。需�先消耗大�的能��能啟動。
+block.impact-reactor.description = 先進的發電機，在最高效率時能產生大�能�。需�先消耗大�的電力�能啟動。
 block.mechanical-drill.description = 一種便宜的鑽頭。當放置在�當的方塊上時，以緩慢的速度無�期地輸出物�。�能挖掘基本的原料。
 block.pneumatic-drill.description = 一種改進的鑽頭，�以挖掘鈦。比機械鑽頭挖掘的更快。
 block.laser-drill.description = 通�雷射技術�以更快地挖掘，但需�能�。此外，這種鑽頭�以挖掘放射性釷。
@@ -1427,6 +2205,9 @@ block.vault.description = 儲存大�的�一種物�。當物�需求��
 block.container.description = 儲存少�的�一種物�。當物�需求��定時，使用它來創建緩�。使用[lightgray]��器[]以從容器��物�。
 block.unloader.description = 將物�從容器�倉庫或核心�載到傳輸帶上或直接�貨到相鄰的方塊中。��點擊�貨器來更改��貨的物�類型。
 block.launch-pad.description = 無需發射核心��直接發射物�。
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = 一種�而便宜的砲塔。
 block.scatter.description = ��或缺的中型防空砲塔。�敵方單�噴射鉛塊�廢料或是鋼化玻璃彈片。
 block.scorch.description = 燃燒所有�近它的地�敵人。在近�離�常有效。
@@ -1439,19 +2220,18 @@ block.salvo.description = 一種更大�更先進版本的雙炮。快速地�
 block.fuse.description = 一種近�的大型能�砲塔。�敵人發射三�貫穿性的能��。
 block.ripple.description = 極為強大的迫擊炮塔。一次�敵人發射數發�彈。
 block.cyclone.description = 一種�空和�地的大型砲塔。�附近單�發射爆裂性的碎塊。
-block.spectre.description = 一種雙炮管的巨型砲塔。�空中�地�敵人發射大型的穿甲彈。
+block.spectre.description = 一種雙炮管的巨型砲塔。�空中�地�敵人發射大型的砲彈。
 block.meltdown.description = 一種巨型雷射砲塔。充電並發射�續性的雷射光�。需�冷�液以�作。
-block.foreshadow.description = 在�方狙擊單一目標。
+block.foreshadow.description = 在�方狙擊單一目標。優先攻擊總血�較高的單�。
 block.repair-point.description = �續治療附近最近的��單�。
 block.segment.description = 傷害並摧毀來襲的砲彈。無法將雷射武器的光�作為目標。
 block.parallax.description = 發射牽引光�，牽引空中目標，並在此�程中�壞它們。
 block.tsunami.description = �敵人發射強大的液體。如果�供水會自動滅�。
 block.silicon-crucible.description = 使用�焰彈作為附加熱�，從沙�和煤炭中�煉矽。在高溫地�效率更高。
 block.disassembler.description = 以低效率將熔渣分離�少�的礦物�分。�生產釷。
-block.overdrive-dome.description =  用相織布和矽增加附近建築物的速度。
+block.overdrive-dome.description = 用相織布和矽增加附近建築物的速度。
 block.payload-conveyor.description = 移動大型物體，�是從工廠出來的機甲。
 block.payload-router.description = 把大型物體分�到三個方�。
-block.command-center.description = 用幾個��的指令控制機甲的行為。
 block.ground-factory.description = 生產陸行機甲，造好的機甲�以直接使用或者是�進�塑機�級。
 block.air-factory.description = 生產空中機甲，造好的機甲�以直接使用或者是�進�塑機�級。
 block.naval-factory.description = 生產海上機甲，造好的機甲�以直接使用或者是�進�塑機�級。
@@ -1464,12 +2244,108 @@ block.micro-processor.description = �覆執行所有的�輯指令。能控
 block.logic-processor.description = �覆執行所有的�輯指令。能控制機甲和建築。速度較微處�器快。
 block.hyper-processor.description = �覆執行所有的�輯指令。能控制機甲和建築。速度較�輯處�器快。
 block.memory-cell.description = 為�輯處�器儲存資料。
-block.memory-bank.description = 為�輯處�器儲存資料。大容�。
+block.memory-bank.description = 為�輯處�器儲存資料。具備更大容�。
 block.logic-display.description = 顯示由處�器輸出的任�圖�。
 block.large-logic-display.description = 顯示由處�器輸出的任�圖�。
 block.interplanetary-accelerator.description = 巨大的電�砲塔。將核心加速至脫離速度以在其他星�部署。
+block.repair-turret.description = �續修復最�近的��單�。能使用冷�劑。
+block.core-bastion.description = 基地的核心。具有�甲。一旦所有基地核心被摧毀，此�域�戰敗。
+block.core-citadel.description = 基地的核心。�甲厚實。儲存的資�比核心：碉堡更多。
+block.core-acropolis.description = 基地的核心。�甲極佳。儲存的資�比核心：�壘更多。
+block.breach.description = �敵方單�發射穿�性的鈹或鎢砲彈。
+block.diffuse.description = 在寬廣的�形範�內發射砲彈，擊退敵方單�。
+block.sublimate.description = �敵方單�發射連續的�焰射�。穿�敵方護盾。
+block.titan.description = �地�單�發射巨大的爆炸砲彈。需�氫氣。
+block.afflict.description = 發射大型的帶電破片高射炮彈。需�熱�。
+block.disperse.description = �敵方空中單�發射高射炮彈。
+block.lustre.description = �敵方單�發射移動緩慢的單一目標雷射。
+block.scathe.description = ��處的敵方地�單�發射強大的導彈。
+block.smite.description = 發射穿�性的閃電砲彈。
+block.malign.description = �敵方單�發射一連串的追蹤雷射導彈。需�大�熱�。
+block.silicon-arc-furnace.description = 從沙和石墨中�煉矽。
+block.oxidation-chamber.description = 將鈹和臭氧轉化為氧化鈹。�程中產生熱�。
+block.electric-heater.description = 加熱��的建築。需�大�的電力。
+block.slag-heater.description = 加熱��的建築。需�熔渣。
+block.phase-heater.description = 加熱��的建築。需�相織布。
+block.heat-redirector.description = 將累�的熱��新導�到其他建築。
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
+block.heat-router.description = �三個方�傳播累�的熱�。
+block.electrolyzer.description = 將水轉�為氫氣和臭氧。輸出的兩種氣體於相�方�輸出，由�應的�色表示。
+block.atmospheric-concentrator.description = 從大氣中濃縮氮氣。需�熱�。
+block.surge-crucible.description = 從熔渣和矽��波動�金。需�熱�。
+block.phase-synthesizer.description = 從釷�沙�和臭氧��相織布。需�熱�。
+block.carbide-crucible.description = 將石墨和鎢���碳化鎢。需�熱�。
+block.cyanogen-synthesizer.description = 從芳油和石墨��氰氣。需�熱�。
+block.slag-incinerator.description = 燃燒穩定的物�或液體。需�熔渣。
+block.vent-condenser.description = 將噴�的氣體���水。消耗電力。
+block.plasma-bore.description = 當放置在礦牆��時，無�的輸出物�。需�少�電力。
+block.large-plasma-bore.description = 更大的電漿鑽頭。能夠挖掘鎢和釷。需�氫氣和電力。
+block.cliff-crusher.description = 粉碎牆�，無�的輸出沙�。需�電力。效率�決於牆�類型。
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
+block.impact-drill.description = 當放置在礦石上時，無�的輸出物�。需�電力和水。
+block.eruption-drill.description = 改良型�擊鑽頭。能夠挖掘釷。需�氫氣。
+block.reinforced-conduit.description = 將液體��移動。�接��邊的�強化管線輸入。
+block.reinforced-liquid-router.description = 將液體�勻分佈到所有�邊方�。
+block.reinforced-liquid-tank.description = 儲存大�的液體。
+block.reinforced-liquid-container.description = 儲存數��觀的液體。
+block.reinforced-bridge-conduit.description = 使液體�以穿越建築與地形。
+block.reinforced-pump.description = 泵�並輸出液體。需�氫氣。
+block.beryllium-wall.description = �護建築��敵方砲彈的攻擊。
+block.beryllium-wall-large.description = �護建築��敵方砲彈的攻擊。
+block.tungsten-wall.description = �護建築��敵方砲彈的攻擊。
+block.tungsten-wall-large.description = �護建築��敵方砲彈的攻擊。
+block.carbide-wall.description = �護建築��敵方砲彈的攻擊。
+block.carbide-wall-large.description = �護建築��敵方砲彈的攻擊。
+block.reinforced-surge-wall.description = �護建築��敵方砲彈的攻擊，並定期在砲彈接觸時發射電弧。
+block.reinforced-surge-wall-large.description = �護建築��敵方砲彈的攻擊，並定期在砲彈接觸時發射電弧。
+block.shielded-wall.description = �護建築��敵方砲彈的攻擊。在�供能�時展開一個�以�收大部分砲彈的護盾。�導電。
+block.blast-door.description = 當��地�單�進入範�時，牆�開啟。無法手動控制。
+block.duct.description = 將物���移動。�能存儲一個物�。
+block.armored-duct.description = 將物���移動。�接��邊的�類真空管輸入。
+block.duct-router.description = 在三個方�上�勻分佈物�。�接�後方的物�。�作為物�分類器。
+block.overflow-duct.description = �有在�方通�被阻塞時，���邊輸出物�。
+block.duct-bridge.description = 使物��以穿越建築與地形。
+block.duct-unloader.description = 從其後的建築�載所�擇的物�。無法從基地核心�載。
+block.underflow-duct.description = 溢�器的相�作用。�有左�通��被阻塞時，���輸出。
+block.reinforced-liquid-junction.description = 在兩個交�強化管線之間起連接作用。
+block.surge-conveyor.description = 批�移動物�。�以用電力加速。�導電。
+block.surge-router.description = 從波動輸�帶�勻分佈物�到三個方�。�以用能�加速。�導電。
+block.unit-cargo-loader.description = 構造貨物無人機。無人機自動將物�分�到具有�定相�物�的貨物�載點。
+block.unit-cargo-unload-point.description = 作為貨物無人機的�載點。接�與�濾器相�的物�。
+block.beam-node.description = 垂直地�其他建築傳�能�。儲存一�部分能�。
+block.beam-tower.description = 垂直地�其他建築傳�能�。儲存大�能�。��離。
+block.turbine-condenser.description = 放置在噴�上時生�電力。產生少�水。
+block.chemical-combustion-chamber.description = 從芳油和臭氧產生電力。
+block.pyrolysis-generator.description = 從芳油和熔渣生�大�的電力。產生水作為副產物。
+block.flux-reactor.description = 當加熱時產生大�電力。需�氰氣作為穩定劑。電力輸出和氰氣需求與加熱輸入�正比。\n如果�供的氰氣�足，則會爆炸。
+block.neoplasia-reactor.description = 使用芳油�水和相織布生�大�的電力。產生熱和�險的囊胞液作為副產�。\n如果�通�強化管線從�應器中去除囊胞液，則會發生劇烈爆炸。
+block.build-tower.description = 自動�建範�內的建築並�助其他單�建造。
+block.regen-projector.description = 慢慢修復周�範�內的��建築。需�臭氧。
+block.reinforced-container.description = 儲存一�部分物�。內容�以通��載器�出。�增加基地核心的儲存容�。
+block.reinforced-vault.description = 儲存大�的物�。內容�以通��載器�出。�增加基地核心的儲存容�。
+block.tank-fabricator.description = 建造戰車單�。輸出的單��以直接使用，或移入戰車�塑者進行�級。
+block.ship-fabricator.description = 建造飛船單�。輸出的單��以直接使用，或移入飛船�塑者進行�級。
+block.mech-fabricator.description = 建造機甲單�。輸出的單��以直接使用，或移入機甲�塑者進行�級。
+block.tank-assembler.description = 通�輸入的方塊和單�組�大型戰車。�以通�支�組�廠增加輸出等級。
+block.ship-assembler.description = 通�輸入的方塊和單�組�大型飛船。�以通�支�組�廠增加輸出等級。
+block.mech-assembler.description = 通�輸入的方塊和單�組�大型機甲。�以通�支�組�廠增加輸出等級。
+block.tank-refabricator.description = 將輸入的戰車單��級到第二級。
+block.ship-refabricator.description = 將輸入的飛船單��級到第二級。
+block.mech-refabricator.description = 將輸入的機甲單��級到第二級。
+block.prime-refabricator.description = 將輸入的單��級到第三級。
+block.basic-assembler-module.description = 當放置在建造邊界�邊時，�增加組�廠等級。需�電力。�以用作�物輸入。
+block.small-deconstructor.description = 拆解輸入的建築和單�。返回建造�本的100%。
+block.reinforced-payload-conveyor.description = 將�物��移動。
+block.reinforced-payload-router.description = 將�物�勻分�到相鄰的方塊。設置�濾器時，�以作為分類器使用。
+block.payload-mass-driver.description = ��離�物�輸建築。將接收到的�物射擊到連接的�物質�驅動器。
+block.large-payload-mass-driver.description = ��離�物�輸建築。將接收到的�物射擊到連接的�物質�驅動器。
+block.unit-repair-tower.description = 修復其周�所有單�。需�臭氧。
+block.radar.description = �漸顯示大範�內的地形和敵方單�。需�電力。
+block.shockwave-tower.description = 在一定範�內破壞和摧毀敵方砲彈。需�氰氣。
+block.canvas.description = 顯示使用�設調色�的簡單圖�。�編輯。
 
-unit.dagger.description = 發射普通�彈攻擊所有附近敵人。
+
+unit.dagger.description = 發射普通�彈攻擊附近敵人。
 unit.mace.description = 噴發烈焰攻擊所有附近敵人。
 unit.fortress.description = 發射�程迫砲攻擊地�目標。
 unit.scepter.description = 發射大�續能�彈打擊所有附近敵人。
@@ -1502,3 +2378,298 @@ unit.omura.description = �敵人發射�程穿�型砲彈。建造曳光戰
 unit.alpha.description = 抵禦敵��核心：碎片的攻擊。建造建築物。
 unit.beta.description = 抵禦敵��核心：基地的攻擊。建造建築物。
 unit.gamma.description = 抵禦敵��核心：核�的攻擊。建造建築物。
+unit.retusa.description = �周�敵人發射追蹤魚雷。修復�方單�。
+unit.oxynoe.description = 射出帶回復建築的�焰。具�型方陣炮。
+unit.cyerce.description = 發射追蹤集�飛彈。修復�方單�。
+unit.aegires.description = 電擊所有在能�場內的敵方單��建築。修復�方單�。
+unit.navanax.description = 發射電�脈�砲彈。能�敵方電力建築造�大�傷害，並修復�方建築。具4座雷射自動砲�攻擊附近敵人。
+
+#Erekir
+unit.stell.description = �敵方目標發射標準�彈。
+unit.locus.description = �敵方目標交替發射�彈。
+unit.precept.description = �敵方目標發射穿�性集��彈。
+unit.vanquish.description = �敵方目標發射大型穿�分裂�彈。
+unit.conquer.description = �敵方目標發射大型穿�連續�彈串。
+unit.merui.description = �敵方地�目標發射�程炮彈。�以跨越大多數地形。
+unit.cleroi.description = �敵方目標發射雙彈。使用點防禦炮塔瞄準敵方砲彈。�以跨越大多數地形。
+unit.anthicus.description = �敵方目標發射�程導彈。�以跨越大多數地形。
+unit.tecta.description = �敵方目標發射導彈。通��方謢盾�護自己。�以跨越大多數地形。
+unit.collaris.description = �敵方目標發射�程破片炮彈。�以跨越大多數地形。
+unit.elude.description = �敵方目標發射��的導彈。�以漂浮在液體上。
+unit.avert.description = �敵方目標發射螺旋狀�彈�。
+unit.obviate.description = �敵方目標發射螺旋狀閃電��。
+unit.quell.description = �敵方目標發射�程導彈。抑制敵方建築修復方塊。
+unit.disrupt.description = �敵方目標發射�程導彈。抑制敵方建築修復方塊。
+unit.evoke.description = 建造建築以�護核心：碉堡。用光�修復建築。
+unit.incite.description = 建造建築以�護核心：�壘。用光�修復建築。
+unit.emanate.description = 建造建築以�護核心：衛城。用光�修復建築。
+
+lst.read = [accent]讀�[]記憶體中的一項數值
+lst.write = [accent]寫入[]一項數值到記憶體中
+lst.print = 將文字加入輸出的暫存中，��[accent]Print Flush[], [accent]Flush message[]使用
+lst.printchar = Add a UTF-16 character or content icon to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.draw = 將圖形加入顯示的暫存中，��[accent]Draw Flush[]使用
+lst.drawflush = 將所有暫存的[accent]Draw[]指令推到顯示器上
+lst.printflush = 將所有暫存的[accent]Print[]指令推到訊��上
+lst.getlink = 由連接順�回傳連接的建築，第一個從"0"開始
+lst.control = 控制一個建築
+lst.radar = �測建築範�內的單�
+lst.sensor = ��該建築或單�的數據
+lst.set = 設一個變數
+lst.operation = 加減乘除和數字��元�算
+lst.end = 跳到第一個�頭開始執行
+lst.wait = 等待特定秒數
+lst.stop = Halt execution of this processor.
+lst.lookup = 以 ID �尋物�/液體/單�/方塊。\n�種類的總數�由 \n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[] 讀�。
+lst.jump = �件�跳到其他指令執行
+lst.unitbind = �定下一�種單�，存入[accent]@unit[]中.
+lst.unitcontrol = 控制�在�定的單�
+lst.unitradar = �測�定單�附近的單�
+lst.unitlocate = 尋找整個地圖上特定的�置/建築\n需��定的單�
+lst.getblock = 由�置�方塊數據
+lst.setblock = 由�置設置方塊數據
+lst.spawnunit = 在�一�置生�單�
+lst.applystatus = 爲單�添加或移除狀態效果
+lst.weathersense = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
+lst.spawnwave = 在�一�置生�一波敵人\n�計入波數
+lst.explosion = 在�一�置製造爆炸
+lst.setrate = 以指令/�時刻設置處�器速度
+lst.fetch = 按索引查找單��核心�玩家或建築物\n索引從 0 開始，以返回的計數��
+lst.packcolor = 將 [0, 1] 範�內的 RGBA 分��爲單個數字，用於繪圖或設置�則
+lst.setrule = 設置�戲�則
+lst.flushmessage = 从文本緩存中讀�並於�幕上顯示一�消�\n會等待上一�消���
+lst.cutscene = 控制玩家�頭
+lst.setflag = 設置一個全局flag，�被所有處�器讀�
+lst.getflag = 檢查�一全局flag是�存在
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
+logic.nounitbuild = [red]單�建造�輯已被�止。
+
+lenum.type = 建築/單�種類。\n例：�控單�建造光矛砲應使用[accent]@lancer[]，而�字串
+lenum.shoot = �該�置開�
+lenum.shootp = �指定單�/建築開�，具自瞄功能
+lenum.config = 建築設置，例如分類器篩选的物�種類
+lenum.enabled = 確�該建築是�啟用
+laccess.currentammotype = Current ammo item/liquid of a turret.
+
+laccess.color = 照明燈�色
+laccess.controller = 單�的控制者。�處�器控制時回傳處�器。\n在隊形中回傳領導的單�。\n�則回傳單�自己。
+laccess.dead = 單�或建築是�已死亡或�存在。
+laccess.controlled = 將回傳：\n處�器控制：[accent]@ctrlProcessor[]\n玩家控制：[accent]@ctrlPlayer[]\n在隊形中：[accent]@ctrlFormation[]\n其他：[accent]0[]。
+laccess.progress = 建造�生產進度。以 0 到 1 表示。以�砲��填。
+laccess.speed = 單�最快速度(格�/秒)
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+
+lcategory.unknown = 未知
+lcategory.unknown.description = Uncategorized instructions.
+lcategory.io = 輸入和輸出
+lcategory.io.description = 修改記憶體與處�器快�。
+lcategory.block = 方塊控制
+lcategory.block.description = 與方塊互動。
+lcategory.operation = �作
+lcategory.operation.description = �輯�作。
+lcategory.control = �程控制
+lcategory.control.description = 控制指令埶行的順�。
+lcategory.unit = 單�控制
+lcategory.unit.description = 給予單�指令。
+lcategory.world = 世界
+lcategory.world.description = 控制世界的行為
+
+graphicstype.clear = �製版�為指定�色
+graphicstype.color = 為後續所有圖畫指令設定�色
+graphicstype.col = 整�後的色彩信�\n以�六進制 [accent]%[] 開頭\n例如: 紅色爲 [accent]%ff0000[]
+graphicstype.stroke = 為後續所有圖畫指令設定直線寬度
+graphicstype.line = 畫一直線
+graphicstype.rect = 畫實心長方形
+graphicstype.linerect = 畫空心長方形
+graphicstype.poly = 畫實心正多邊形
+graphicstype.linepoly = 畫空心正多邊形
+graphicstype.triangle = 畫實心三角形
+graphicstype.image = 繪製內建圖畫\n如: [accent]@router[]或[accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+
+lenum.always = 永� true (直接跳).
+lenum.idiv = 整數除法，無�件�去.
+lenum.div = 除法.\n除以零時回傳 [accent]null[]
+lenum.mod = Modulo，求餘數
+lenum.equal = 是�相等，�管資料型態。\n�null 物件和數值相比時回傳1
+lenum.notequal = 是��相等，�管資料型態.
+lenum.strictequal = 嚴格檢查是�相等，會比照資料型態。\n�用來檢查[accent]null[]
+lenum.shl = 左移n�元
+lenum.shr = �移n�元
+lenum.or = �元 OR
+lenum.land = �輯 AND
+lenum.and = �元 AND
+lenum.not = �元 NOT
+lenum.xor = �元 XOR
+
+lenum.min = 兩數��
+lenum.max = 兩數�大
+lenum.angle = ��與X軸夾角
+lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.len = ��長度
+
+lenum.sin = 度數sin值
+lenum.cos = 度數cos值
+lenum.tan = 度數tan值
+
+lenum.asin = Arc sin，輸出度數
+lenum.acos = Arc cos，輸出度數
+lenum.atan = Arc tan，輸出度數
+
+#not a typo, look up 'range notation'
+lenum.rand = 產生隨機數值: [0, 值)
+lenum.log = 自然�數(ln�log_e)
+lenum.log10 = log_10
+lenum.noise = 二維單形噪�
+lenum.abs = �絕�值
+lenum.sqrt = 開根號
+
+lenum.any = 任何單�
+lenum.ally = �方單�
+lenum.attacker = 具武器的單�
+lenum.enemy = 敵方單�
+lenum.boss = 頭目單�
+lenum.flying = 飛行單�
+lenum.ground = 陸上單�
+lenum.player = 玩家單�
+
+lenum.ore = 尋找礦物
+lenum.damaged = 尋找���方建築
+lenum.spawn = 敵方�生點\n�以是核心或一個�置
+lenum.building = 尋找特定建築
+
+lenum.core = 任何核心
+lenum.storage = 儲�建築
+lenum.generator = 會發電的建築
+lenum.factory = 生產加工資�的建築，如煉矽場
+lenum.repair = 維修點
+lenum.battery = 電池
+lenum.resupply = 補給點\n�有在[accent]"單�需�彈藥"[]被啟用時�有效果
+lenum.reactor = �擊/釷�應�
+lenum.turret = 任何砲塔
+
+sensor.in = 想查閱的建築/單�
+
+radar.from = 作為雷�的建築\n�測範��該建築的範�
+radar.target = �索�件
+radar.and = �外�件
+radar.order = 輸出順�，1：�離最近�血�最大
+radar.sort = 篩�方�
+radar.output = 回傳該單�為變數
+
+unitradar.target = �索�件
+unitradar.and = �外�件
+unitradar.order = 輸出順�，1：�離最近�血�最大
+unitradar.sort = 篩�方�
+unitradar.output = 存該單�的變數
+
+control.of = �控制的建築
+control.unit = 指定的建築/單�
+control.shoot = 是�開�
+
+unitlocate.enemy = �索敵方或�方建築
+unitlocate.found = 回傳是�找到建築
+unitlocate.building = 回傳找到的建築為變數
+unitlocate.outx = 回傳 X 座標
+unitlocate.outy = 回傳 Y 座標
+unitlocate.group = �索建築種類
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
+lenum.idle = �設AI
+lenum.stop = �止
+lenum.unbind = 完全�用�輯控制\n�復爲原始AI
+lenum.move = 移動到指定�置
+lenum.approach = 移動到�離指定�置一段�離的地方
+lenum.pathfind = 由內建AI�往敵方�生點
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.target = 射擊指定�域
+lenum.targetp = 帶自瞄射擊指定的目標
+lenum.itemdrop = 放下物�
+lenum.itemtake = 從建築拿�物�
+lenum.paydrop = 放下拾�的負載
+lenum.paytake = 拾�船身下方的單�/建築
+lenum.payenter = 進入/��到載�方塊
+lenum.flag = 單�編號(�異)
+lenum.mine = 挖指定�置的礦物
+lenum.build = 建造一個建築
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.within = 單�是�在指定範�內
+lenum.boost = 使用推進器
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.
diff --git a/core/assets/contributors b/core/assets/contributors
index 59f40b3ef2..08655bb08c 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -5,6 +5,7 @@ Timmeey86
 Epowerj
 Baltazár Radics
 Dexapnow
+Somka
 Milinai
 키�르
 skybldev
@@ -27,8 +28,9 @@ William So
 beito
 BeefEX
 Lorex
-�滑稽
+�滑稽/酪桦姬
 Spico The Spirit Guy
+RTOmega
 TunacanGamer
 kemalinanc13
 Zachary
@@ -39,6 +41,7 @@ Carter Gale
 Jan Polák
 JustYanns
 BasedUser
+Rex Aliis
 BLucky-gh
 DinoWattz
 Jae
@@ -91,7 +94,7 @@ DeltaNedas
 GioIacca9
 SnakkiZXZ
 sk7725
-The Slaylord
+Slotterleet
 ThePlayerA
 YellOw139
 NgLamVN
@@ -104,12 +107,69 @@ jalastram (freesound.org)
 newlocknew (freesound.org)
 dsmolenaers (freesound.org)
 Headphaze (freesound.org)
+Michel Baradari (opengameart.org)
+Michael Klier (opengameart.org)
+Neoqueto (Darktech LDR Font)
 Nikolass
 VolasYouKnow
 Quick-Korx
-�ngel Rodríguez Aguilera
+Angel-24
 Catchears
 younggam
 simba-fs
 RedRadiation
 Marko Zajc
+PCX-LK (CPX MC)
+Phinner
+BTA_Susideur
+nilq
+AsgerHB
+AzCraft
+foo
+Skat
+WilloIzCitron
+SAMBUYYA
+genNAowl
+JniTrRny
+TranquillyUnpleasant
+Darkness6030
+hortiSquash
+King-BR
+citrusMarmelade
+Evolveye
+Jerzy Paciorkiewicz
+YozoZChomutova
+Qendolin
+Goobrr
+xem8k5��魔
+BlueWolf
+[Error_27]
+code-explorer786
+Alex25820
+KayAyeAre
+SMOLKEYS
+1stvaliduser(SUS)
+GlennFolker
+BlackDeluxeCat
+zenonet
+AyuKo-o
+JojoFR1
+Xasmedy
+xStaBUx
+WayZer
+SITUVNgcd
+Gabriel "red" Fondato
+CoCo Snow
+summoner
+OpalSoPL
+apollovy
+BalaM314
+Redstonneur1256
+ApsZoldat
+Mythril
+hexagon-recursion
+JasonP01
+BlueTheCube
+sasha0552
+1ue999
+6-BennyLi-9
diff --git a/core/assets/cubemaps/stars/back.png b/core/assets/cubemaps/stars/back.png
index 05f3375811..b0f9074a31 100644
Binary files a/core/assets/cubemaps/stars/back.png and b/core/assets/cubemaps/stars/back.png differ
diff --git a/core/assets/cubemaps/stars/bottom.png b/core/assets/cubemaps/stars/bottom.png
index bfcded64e3..089cefc75e 100644
Binary files a/core/assets/cubemaps/stars/bottom.png and b/core/assets/cubemaps/stars/bottom.png differ
diff --git a/core/assets/cubemaps/stars/front.png b/core/assets/cubemaps/stars/front.png
index 8e9dbcd437..7916c07721 100644
Binary files a/core/assets/cubemaps/stars/front.png and b/core/assets/cubemaps/stars/front.png differ
diff --git a/core/assets/cubemaps/stars/left.png b/core/assets/cubemaps/stars/left.png
index f99a70ab1b..f1ddf1b770 100644
Binary files a/core/assets/cubemaps/stars/left.png and b/core/assets/cubemaps/stars/left.png differ
diff --git a/core/assets/cubemaps/stars/right.png b/core/assets/cubemaps/stars/right.png
index f1c6f5c807..87f4c3c20f 100644
Binary files a/core/assets/cubemaps/stars/right.png and b/core/assets/cubemaps/stars/right.png differ
diff --git a/core/assets/cubemaps/stars/top.png b/core/assets/cubemaps/stars/top.png
index 078e1a3d3f..6cc55de5b2 100644
Binary files a/core/assets/cubemaps/stars/top.png and b/core/assets/cubemaps/stars/top.png differ
diff --git a/core/assets/cursors/repair.png b/core/assets/cursors/repair.png
new file mode 100644
index 0000000000..0604903f1d
Binary files /dev/null and b/core/assets/cursors/repair.png differ
diff --git a/core/assets/cursors/target.png b/core/assets/cursors/target.png
new file mode 100644
index 0000000000..1b5d8d519d
Binary files /dev/null and b/core/assets/cursors/target.png differ
diff --git a/core/assets/fonts/font.woff b/core/assets/fonts/font.woff
index c031c478de..92cf31f69a 100644
Binary files a/core/assets/fonts/font.woff and b/core/assets/fonts/font.woff differ
diff --git a/core/assets/fonts/icon.ttf b/core/assets/fonts/icon.ttf
index badd3e3b66..9359cde43a 100644
Binary files a/core/assets/fonts/icon.ttf and b/core/assets/fonts/icon.ttf differ
diff --git a/core/assets/fonts/logic.ttf b/core/assets/fonts/logic.ttf
new file mode 100644
index 0000000000..0270cdfe3c
Binary files /dev/null and b/core/assets/fonts/logic.ttf differ
diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 008fb1289a..5c3bcdf0de 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -1,320 +1,599 @@
-63743=spawn|block-spawn-medium
-63742=deepwater|block-deepwater-medium
-63741=water|block-water-medium
-63740=tainted-water|block-tainted-water-medium
-63739=darksand-tainted-water|block-darksand-tainted-water-medium
-63738=sand-water|block-sand-water-medium
-63737=darksand-water|block-darksand-water-medium
-63736=tar|block-tar-medium
-63735=stone|block-stone-medium
-63734=craters|block-craters-medium
-63733=char|block-char-medium
-63732=ignarock|block-ignarock-medium
-63731=hotrock|block-hotrock-medium
-63730=magmarock|block-magmarock-medium
-63729=sand|block-sand-medium
-63728=darksand|block-darksand-medium
-63727=holostone|block-holostone-medium
-63726=grass|block-grass-medium
-63725=salt|block-salt-medium
-63724=snow|block-snow-medium
-63723=ice|block-ice-medium
-63722=ice-snow|block-ice-snow-medium
-63721=cliffs|block-cliffs-medium
-63718=rock|block-rock-medium
-63717=snowrock|block-snowrock-medium
-63711=spore-pine|block-spore-pine-medium
-63710=snow-pine|block-snow-pine-medium
-63709=pine|block-pine-medium
-63708=shrubs|block-shrubs-medium
-63707=white-tree-dead|block-white-tree-dead-medium
-63706=white-tree|block-white-tree-medium
-63705=spore-cluster|block-spore-cluster-medium
-63704=shale|block-shale-medium
-63702=shale-boulder|block-shale-boulder-medium
-63701=sand-boulder|block-sand-boulder-medium
-63700=moss|block-moss-medium
-63699=spore-moss|block-spore-moss-medium
-63698=metal-floor|block-metal-floor-medium
-63697=metal-floor-damaged|block-metal-floor-damaged-medium
-63696=metal-floor-2|block-metal-floor-2-medium
-63695=metal-floor-3|block-metal-floor-3-medium
-63694=metal-floor-5|block-metal-floor-5-medium
-63693=dark-panel-1|block-dark-panel-1-medium
-63692=dark-panel-2|block-dark-panel-2-medium
-63691=dark-panel-3|block-dark-panel-3-medium
-63690=dark-panel-4|block-dark-panel-4-medium
-63689=dark-panel-5|block-dark-panel-5-medium
-63688=dark-panel-6|block-dark-panel-6-medium
-63687=dark-metal|block-dark-metal-medium
-63686=pebbles|block-pebbles-medium
-63685=tendrils|block-tendrils-medium
-63684=ore-copper|block-ore-copper-medium
-63683=ore-lead|block-ore-lead-medium
-63682=ore-scrap|block-ore-scrap-medium
-63681=ore-coal|block-ore-coal-medium
-63680=ore-titanium|block-ore-titanium-medium
-63679=ore-thorium|block-ore-thorium-medium
-63678=graphite-press|block-graphite-press-medium
-63677=multi-press|block-multi-press-medium
-63676=silicon-smelter|block-silicon-smelter-medium
-63675=kiln|block-kiln-medium
-63674=plastanium-compressor|block-plastanium-compressor-medium
-63673=phase-weaver|block-phase-weaver-medium
-63672=alloy-smelter|block-alloy-smelter-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
-63667=separator|block-separator-medium
-63666=spore-press|block-spore-press-medium
-63665=pulverizer|block-pulverizer-medium
-63664=coal-centrifuge|block-coal-centrifuge-medium
-63663=incinerator|block-incinerator-medium
-63662=copper-wall|block-copper-wall-medium
-63661=copper-wall-large|block-copper-wall-large-medium
-63660=titanium-wall|block-titanium-wall-medium
-63659=titanium-wall-large|block-titanium-wall-large-medium
-63658=plastanium-wall|block-plastanium-wall-medium
-63657=plastanium-wall-large|block-plastanium-wall-large-medium
-63656=thorium-wall|block-thorium-wall-medium
-63655=thorium-wall-large|block-thorium-wall-large-medium
-63654=phase-wall|block-phase-wall-medium
-63653=phase-wall-large|block-phase-wall-large-medium
-63652=surge-wall|block-surge-wall-medium
-63651=surge-wall-large|block-surge-wall-large-medium
-63650=door|block-door-medium
-63649=door-large|block-door-large-medium
-63648=scrap-wall|block-scrap-wall-medium
-63647=scrap-wall-large|block-scrap-wall-large-medium
-63646=scrap-wall-huge|block-scrap-wall-huge-medium
-63645=scrap-wall-gigantic|block-scrap-wall-gigantic-medium
-63644=thruster|block-thruster-medium
-63643=mender|block-mender-medium
-63642=mend-projector|block-mend-projector-medium
-63641=overdrive-projector|block-overdrive-projector-medium
-63640=force-projector|block-force-projector-medium
-63639=shock-mine|block-shock-mine-medium
-63638=conveyor|block-conveyor-medium
-63637=titanium-conveyor|block-titanium-conveyor-medium
-63636=armored-conveyor|block-armored-conveyor-medium
-63635=junction|block-junction-medium
-63634=bridge-conveyor|block-bridge-conveyor-medium
-63633=phase-conveyor|block-phase-conveyor-medium
-63632=sorter|block-sorter-medium
-63631=inverted-sorter|block-inverted-sorter-medium
-63630=router|block-router-medium
-63629=distributor|block-distributor-medium
-63628=overflow-gate|block-overflow-gate-medium
-63627=mass-driver|block-mass-driver-medium
-63626=mechanical-pump|block-mechanical-pump-medium
-63625=rotary-pump|block-rotary-pump-medium
-63624=thermal-pump|block-thermal-pump-medium
-63623=conduit|block-conduit-medium
-63622=pulse-conduit|block-pulse-conduit-medium
-63621=plated-conduit|block-plated-conduit-medium
-63620=liquid-router|block-liquid-router-medium
-63619=liquid-tank|block-liquid-tank-medium
-63618=liquid-junction|block-liquid-junction-medium
-63617=bridge-conduit|block-bridge-conduit-medium
-63616=phase-conduit|block-phase-conduit-medium
-63615=power-node|block-power-node-medium
-63614=power-node-large|block-power-node-large-medium
-63613=surge-tower|block-surge-tower-medium
-63612=diode|block-diode-medium
-63611=battery|block-battery-medium
-63610=battery-large|block-battery-large-medium
-63609=combustion-generator|block-combustion-generator-medium
-63608=thermal-generator|block-thermal-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
-63603=solar-panel-large|block-solar-panel-large-medium
-63602=thorium-reactor|block-thorium-reactor-medium
-63601=impact-reactor|block-impact-reactor-medium
-63600=mechanical-drill|block-mechanical-drill-medium
-63599=pneumatic-drill|block-pneumatic-drill-medium
-63598=laser-drill|block-laser-drill-medium
-63597=blast-drill|block-blast-drill-medium
-63596=water-extractor|block-water-extractor-medium
-63595=cultivator|block-cultivator-medium
-63594=oil-extractor|block-oil-extractor-medium
-63593=core-shard|block-core-shard-medium
-63592=core-foundation|block-core-foundation-medium
-63591=core-nucleus|block-core-nucleus-medium
-63590=vault|block-vault-medium
-63589=container|block-container-medium
-63588=unloader|block-unloader-medium
-63587=launch-pad|block-launch-pad-medium
-63586=launch-pad-large|block-launch-pad-large-medium
-63585=duo|block-duo-medium
-63584=scatter|block-scatter-medium
-63583=scorch|block-scorch-medium
-63582=hail|block-hail-medium
-63581=wave|block-wave-medium
-63580=lancer|block-lancer-medium
-63579=arc|block-arc-medium
-63578=swarmer|block-swarmer-medium
-63577=salvo|block-salvo-medium
-63576=fuse|block-fuse-medium
-63575=ripple|block-ripple-medium
-63574=cyclone|block-cyclone-medium
-63573=spectre|block-spectre-medium
-63572=meltdown|block-meltdown-medium
-63571=draug-factory|block-draug-factory-medium
-63570=spirit-factory|block-spirit-factory-medium
-63569=phantom-factory|block-phantom-factory-medium
-63568=command-center|block-command-center-medium
-63567=wraith-factory|block-wraith-factory-medium
-63566=ghoul-factory|block-ghoul-factory-medium
-63565=revenant-factory|block-revenant-factory-medium
-63564=dagger-factory|block-dagger-factory-medium
-63563=crawler-factory|block-crawler-factory-medium
-63562=titan-factory|block-titan-factory-medium
-63561=fortress-factory|block-fortress-factory-medium
-63560=repair-point|block-repair-point-medium
-63559=dart-mech-pad|block-dart-mech-pad-medium
-63558=delta-mech-pad|block-delta-mech-pad-medium
-63557=tau-mech-pad|block-tau-mech-pad-medium
-63556=omega-mech-pad|block-omega-mech-pad-medium
-63555=javelin-ship-pad|block-javelin-ship-pad-medium
-63554=trident-ship-pad|block-trident-ship-pad-medium
-63553=glaive-ship-pad|block-glaive-ship-pad-medium
-63552=power-source|block-power-source-medium
-63551=power-void|block-power-void-medium
-63550=item-source|block-item-source-medium
-63549=item-void|block-item-void-medium
-63548=liquid-source|block-liquid-source-medium
-63547=liquid-void|block-liquid-void-medium
-63546=message|block-message-medium
-63545=illuminator|block-illuminator-medium
-63544=copper|item-copper-icon
-63543=lead|item-lead-icon
-63542=metaglass|item-metaglass-icon
-63541=graphite|item-graphite-icon
-63540=sand|item-sand-icon
-63539=coal|item-coal-icon
-63538=titanium|item-titanium-icon
-63537=thorium|item-thorium-icon
-63536=scrap|item-scrap-icon
-63535=silicon|item-silicon-icon
-63534=plastanium|item-plastanium-icon
-63533=phase-fabric|item-phase-fabric-icon
-63532=surge-alloy|item-surge-alloy-icon
-63531=spore-pod|item-spore-pod-icon
-63530=blast-compound|item-blast-compound-icon
-63529=pyratite|item-pyratite-icon
-63528=water|liquid-water-icon
-63527=slag|liquid-slag-icon
-63526=oil|liquid-oil-icon
-63525=cryofluid|liquid-cryofluid-icon
-63524=underflow-gate|block-underflow-gate-medium
-63523=dart-ship-pad|block-dart-ship-pad-medium
-63522=alpha-mech-pad|block-alpha-mech-pad-medium
-63521=cliff|block-cliff-medium
-63520=legacy-mech-pad|block-legacy-mech-pad-medium
-63519=ground-factory|block-ground-factory-medium
-63518=legacy-unit-factory|block-legacy-unit-factory-medium
-63517=mass-conveyor|block-mass-conveyor-medium
-63516=legacy-command-center|block-legacy-command-center-medium
-63515=block-forge|block-block-forge-medium
-63514=block-launcher|block-block-launcher-medium
-63513=plastanium-conveyor|block-plastanium-conveyor-medium
+63743=spawn|block-spawn-ui
+63742=deepwater|block-deepwater-ui
+63741=shallow-water|block-shallow-water-ui
+63740=tainted-water|block-tainted-water-ui
+63739=darksand-tainted-water|block-darksand-tainted-water-ui
+63738=sand-water|block-sand-water-ui
+63737=darksand-water|block-darksand-water-ui
+63736=tar|block-tar-ui
+63735=stone|block-stone-ui
+63734=craters|block-craters-ui
+63733=char|block-char-ui
+63732=ignarock|block-ignarock-ui
+63731=hotrock|block-hotrock-ui
+63730=magmarock|block-magmarock-ui
+63729=sand|block-sand-ui
+63728=darksand|block-darksand-ui
+63726=grass|block-grass-ui
+63725=salt|block-salt-ui
+63724=snow|block-snow-ui
+63723=ice|block-ice-ui
+63722=ice-snow|block-ice-snow-ui
+63721=cliffs|block-cliffs-ui
+63718=rock|block-rock-ui
+63717=snowrock|block-snowrock-ui
+63711=spore-pine|block-spore-pine-ui
+63710=snow-pine|block-snow-pine-ui
+63709=pine|block-pine-ui
+63708=shrubs|block-shrubs-ui
+63707=white-tree-dead|block-white-tree-dead-ui
+63706=white-tree|block-white-tree-ui
+63705=spore-cluster|block-spore-cluster-ui
+63704=shale|block-shale-ui
+63702=shale-boulder|block-shale-boulder-ui
+63701=sand-boulder|block-sand-boulder-ui
+63700=moss|block-moss-ui
+63699=spore-moss|block-spore-moss-ui
+63698=metal-floor|block-metal-floor-ui
+63697=metal-floor-damaged|block-metal-floor-damaged-ui
+63696=metal-floor-2|block-metal-floor-2-ui
+63695=metal-floor-3|block-metal-floor-3-ui
+63694=metal-floor-5|block-metal-floor-5-ui
+63693=dark-panel-1|block-dark-panel-1-ui
+63692=dark-panel-2|block-dark-panel-2-ui
+63691=dark-panel-3|block-dark-panel-3-ui
+63690=dark-panel-4|block-dark-panel-4-ui
+63689=dark-panel-5|block-dark-panel-5-ui
+63688=dark-panel-6|block-dark-panel-6-ui
+63687=dark-metal|block-dark-metal-ui
+63686=pebbles|block-pebbles-ui
+63685=tendrils|block-tendrils-ui
+63684=ore-copper|block-ore-copper-ui
+63683=ore-lead|block-ore-lead-ui
+63682=ore-scrap|block-ore-scrap-ui
+63681=ore-coal|block-ore-coal-ui
+63680=ore-titanium|block-ore-titanium-ui
+63679=ore-thorium|block-ore-thorium-ui
+63678=graphite-press|block-graphite-press-ui
+63677=multi-press|block-multi-press-ui
+63676=silicon-smelter|block-silicon-smelter-ui
+63675=kiln|block-kiln-ui
+63674=plastanium-compressor|block-plastanium-compressor-ui
+63673=phase-weaver|block-phase-weaver-ui
+63672=surge-smelter|block-surge-smelter-ui
+63671=cryofluid-mixer|block-cryofluid-mixer-ui
+63670=blast-mixer|block-blast-mixer-ui
+63669=pyratite-mixer|block-pyratite-mixer-ui
+63668=melter|block-melter-ui
+63667=separator|block-separator-ui
+63666=spore-press|block-spore-press-ui
+63665=pulverizer|block-pulverizer-ui
+63664=coal-centrifuge|block-coal-centrifuge-ui
+63663=incinerator|block-incinerator-ui
+63662=copper-wall|block-copper-wall-ui
+63661=copper-wall-large|block-copper-wall-large-ui
+63660=titanium-wall|block-titanium-wall-ui
+63659=titanium-wall-large|block-titanium-wall-large-ui
+63658=plastanium-wall|block-plastanium-wall-ui
+63657=plastanium-wall-large|block-plastanium-wall-large-ui
+63656=thorium-wall|block-thorium-wall-ui
+63655=thorium-wall-large|block-thorium-wall-large-ui
+63654=phase-wall|block-phase-wall-ui
+63653=phase-wall-large|block-phase-wall-large-ui
+63652=surge-wall|block-surge-wall-ui
+63651=surge-wall-large|block-surge-wall-large-ui
+63650=door|block-door-ui
+63649=door-large|block-door-large-ui
+63648=scrap-wall|block-scrap-wall-ui
+63647=scrap-wall-large|block-scrap-wall-large-ui
+63646=scrap-wall-huge|block-scrap-wall-huge-ui
+63645=scrap-wall-gigantic|block-scrap-wall-gigantic-ui
+63644=thruster|block-thruster-ui
+63643=mender|block-mender-ui
+63642=mend-projector|block-mend-projector-ui
+63641=overdrive-projector|block-overdrive-projector-ui
+63640=force-projector|block-force-projector-ui
+63639=shock-mine|block-shock-mine-ui
+63638=conveyor|block-conveyor-ui
+63637=titanium-conveyor|block-titanium-conveyor-ui
+63636=armored-conveyor|block-armored-conveyor-ui
+63635=junction|block-junction-ui
+63634=bridge-conveyor|block-bridge-conveyor-ui
+63633=phase-conveyor|block-phase-conveyor-ui
+63632=sorter|block-sorter-ui
+63631=inverted-sorter|block-inverted-sorter-ui
+63630=router|block-router-ui
+63629=distributor|block-distributor-ui
+63628=overflow-gate|block-overflow-gate-ui
+63627=mass-driver|block-mass-driver-ui
+63626=mechanical-pump|block-mechanical-pump-ui
+63625=rotary-pump|block-rotary-pump-ui
+63624=impulse-pump|block-impulse-pump-ui
+63623=conduit|block-conduit-ui
+63622=pulse-conduit|block-pulse-conduit-ui
+63621=plated-conduit|block-plated-conduit-ui
+63620=liquid-router|block-liquid-router-ui
+63619=liquid-tank|block-liquid-tank-ui
+63618=liquid-junction|block-liquid-junction-ui
+63617=bridge-conduit|block-bridge-conduit-ui
+63616=phase-conduit|block-phase-conduit-ui
+63615=power-node|block-power-node-ui
+63614=power-node-large|block-power-node-large-ui
+63613=surge-tower|block-surge-tower-ui
+63612=diode|block-diode-ui
+63611=battery|block-battery-ui
+63610=battery-large|block-battery-large-ui
+63609=combustion-generator|block-combustion-generator-ui
+63608=thermal-generator|block-thermal-generator-ui
+63607=steam-generator|block-steam-generator-ui
+63606=differential-generator|block-differential-generator-ui
+63605=rtg-generator|block-rtg-generator-ui
+63604=solar-panel|block-solar-panel-ui
+63603=solar-panel-large|block-solar-panel-large-ui
+63602=thorium-reactor|block-thorium-reactor-ui
+63601=impact-reactor|block-impact-reactor-ui
+63600=mechanical-drill|block-mechanical-drill-ui
+63599=pneumatic-drill|block-pneumatic-drill-ui
+63598=laser-drill|block-laser-drill-ui
+63597=blast-drill|block-blast-drill-ui
+63596=water-extractor|block-water-extractor-ui
+63595=cultivator|block-cultivator-ui
+63594=oil-extractor|block-oil-extractor-ui
+63593=core-shard|block-core-shard-ui
+63592=core-foundation|block-core-foundation-ui
+63591=core-nucleus|block-core-nucleus-ui
+63590=vault|block-vault-ui
+63589=container|block-container-ui
+63588=unloader|block-unloader-ui
+63587=launch-pad|block-launch-pad-ui
+63586=launch-pad-large|block-launch-pad-large-ui
+63585=duo|block-duo-ui
+63584=scatter|block-scatter-ui
+63583=scorch|block-scorch-ui
+63582=hail|block-hail-ui
+63581=wave|block-wave-ui
+63580=lancer|block-lancer-ui
+63579=arc|block-arc-ui
+63578=swarmer|block-swarmer-ui
+63577=salvo|block-salvo-ui
+63576=fuse|block-fuse-ui
+63575=ripple|block-ripple-ui
+63574=cyclone|block-cyclone-ui
+63573=spectre|block-spectre-ui
+63572=meltdown|block-meltdown-ui
+63571=draug-factory|block-draug-factory-ui
+63570=spirit-factory|block-spirit-factory-ui
+63569=phantom-factory|block-phantom-factory-ui
+63568=command-center|block-command-center-ui
+63567=wraith-factory|block-wraith-factory-ui
+63566=ghoul-factory|block-ghoul-factory-ui
+63565=revenant-factory|block-revenant-factory-ui
+63564=dagger-factory|block-dagger-factory-ui
+63563=crawler-factory|block-crawler-factory-ui
+63562=titan-factory|block-titan-factory-ui
+63561=fortress-factory|block-fortress-factory-ui
+63560=repair-point|block-repair-point-ui
+63559=dart-mech-pad|block-dart-mech-pad-ui
+63558=delta-mech-pad|block-delta-mech-pad-ui
+63557=tau-mech-pad|block-tau-mech-pad-ui
+63556=omega-mech-pad|block-omega-mech-pad-ui
+63555=javelin-ship-pad|block-javelin-ship-pad-ui
+63554=trident-ship-pad|block-trident-ship-pad-ui
+63553=glaive-ship-pad|block-glaive-ship-pad-ui
+63552=power-source|block-power-source-ui
+63551=power-void|block-power-void-ui
+63550=item-source|block-item-source-ui
+63549=item-void|block-item-void-ui
+63548=liquid-source|block-liquid-source-ui
+63547=liquid-void|block-liquid-void-ui
+63546=message|block-message-ui
+63545=illuminator|block-illuminator-ui
+63544=copper|item-copper-ui
+63543=lead|item-lead-ui
+63542=metaglass|item-metaglass-ui
+63541=graphite|item-graphite-ui
+63540=sand|item-sand-ui
+63539=coal|item-coal-ui
+63538=titanium|item-titanium-ui
+63537=thorium|item-thorium-ui
+63536=scrap|item-scrap-ui
+63535=silicon|item-silicon-ui
+63534=plastanium|item-plastanium-ui
+63533=phase-fabric|item-phase-fabric-ui
+63532=surge-alloy|item-surge-alloy-ui
+63531=spore-pod|item-spore-pod-ui
+63530=blast-compound|item-blast-compound-ui
+63529=pyratite|item-pyratite-ui
+63528=water|liquid-water-ui
+63527=slag|liquid-slag-ui
+63526=oil|liquid-oil-ui
+63525=cryofluid|liquid-cryofluid-ui
+63524=underflow-gate|block-underflow-gate-ui
+63523=dart-ship-pad|block-dart-ship-pad-ui
+63522=alpha-mech-pad|block-alpha-mech-pad-ui
+63521=cliff|block-cliff-ui
+63520=legacy-mech-pad|block-legacy-mech-pad-ui
+63519=ground-factory|block-ground-factory-ui
+63518=legacy-unit-factory|block-legacy-unit-factory-ui
+63517=mass-conveyor|block-mass-conveyor-ui
+63516=legacy-command-center|block-legacy-command-center-ui
+63515=block-forge|block-block-forge-ui
+63514=block-launcher|block-block-launcher-ui
+63513=plastanium-conveyor|block-plastanium-conveyor-ui
 63512=crater|crater
-63511=naval-factory|block-naval-factory-medium
-63510=air-factory|block-air-factory-medium
-63509=basic-reconstructor|block-basic-reconstructor-medium
-63508=block-loader|block-block-loader-medium
-63507=block-unloader|block-block-unloader-medium
-63506=core-silo|block-core-silo-medium
-63505=data-processor|block-data-processor-medium
-63504=payload-router|block-payload-router-medium
-63503=silicon-crucible|block-silicon-crucible-medium
-63502=segment|block-segment-medium
-63501=large-overdrive-projector|block-large-overdrive-projector-medium
-63500=disassembler|block-disassembler-medium
-63499=advanced-reconstructor|block-advanced-reconstructor-medium
-63498=reconstructor-basis|block-reconstructor-basis-medium
-63497=reconstructor-morphism|block-reconstructor-morphism-medium
-63496=reconstructor-functor|block-reconstructor-functor-medium
-63495=reconstructor-prime|block-reconstructor-prime-medium
-63494=additive-reconstructor|block-additive-reconstructor-medium
-63493=multiplicative-reconstructor|block-multiplicative-reconstructor-medium
-63492=exponential-reconstructor|block-exponential-reconstructor-medium
-63491=tetrative-reconstructor|block-tetrative-reconstructor-medium
-63490=resupply-point|block-resupply-point-medium
-63489=parallax|block-parallax-medium
-63488=dagger|unit-dagger-medium
-63487=mace|unit-mace-medium
-63486=fortress|unit-fortress-medium
-63485=nova|unit-nova-medium
-63484=pulsar|unit-pulsar-medium
-63483=quasar|unit-quasar-medium
-63482=crawler|unit-crawler-medium
-63481=atrax|unit-atrax-medium
-63480=spiroct|unit-spiroct-medium
-63479=arkyid|unit-arkyid-medium
-63478=flare|unit-flare-medium
-63477=horizon|unit-horizon-medium
-63476=zenith|unit-zenith-medium
-63475=antumbra|unit-antumbra-medium
-63474=eclipse|unit-eclipse-medium
-63473=mono|unit-mono-medium
-63472=poly|unit-poly-medium
-63471=mega|unit-mega-medium
-63470=risse|unit-risse-medium
-63469=minke|unit-minke-medium
-63468=bryde|unit-bryde-medium
-63467=alpha|unit-alpha-medium
-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
-63420=space|block-space-medium
-63419=legacy-unit-factory-air|block-legacy-unit-factory-air-medium
-63418=legacy-unit-factory-ground|block-legacy-unit-factory-ground-medium
-63417=interplanetary-accelerator|block-interplanetary-accelerator-medium
-63416=basalt-boulder|block-basalt-boulder-medium
+63511=naval-factory|block-naval-factory-ui
+63510=air-factory|block-air-factory-ui
+63509=basic-reconstructor|block-basic-reconstructor-ui
+63508=block-loader|block-block-loader-ui
+63507=block-unloader|block-block-unloader-ui
+63506=core-silo|block-core-silo-ui
+63505=data-processor|block-data-processor-ui
+63504=payload-router|block-payload-router-ui
+63503=silicon-crucible|block-silicon-crucible-ui
+63502=segment|block-segment-ui
+63501=large-overdrive-projector|block-large-overdrive-projector-ui
+63500=disassembler|block-disassembler-ui
+63494=additive-reconstructor|block-additive-reconstructor-ui
+63493=multiplicative-reconstructor|block-multiplicative-reconstructor-ui
+63492=exponential-reconstructor|block-exponential-reconstructor-ui
+63491=tetrative-reconstructor|block-tetrative-reconstructor-ui
+63490=resupply-point|block-resupply-point-ui
+63489=parallax|block-parallax-ui
+63488=dagger|unit-dagger-ui
+63487=mace|unit-mace-ui
+63486=fortress|unit-fortress-ui
+63485=nova|unit-nova-ui
+63484=pulsar|unit-pulsar-ui
+63483=quasar|unit-quasar-ui
+63482=crawler|unit-crawler-ui
+63481=atrax|unit-atrax-ui
+63480=spiroct|unit-spiroct-ui
+63479=arkyid|unit-arkyid-ui
+63478=flare|unit-flare-ui
+63477=horizon|unit-horizon-ui
+63476=zenith|unit-zenith-ui
+63475=antumbra|unit-antumbra-ui
+63474=eclipse|unit-eclipse-ui
+63473=mono|unit-mono-ui
+63472=poly|unit-poly-ui
+63471=mega|unit-mega-ui
+63470=risse|unit-risse-ui
+63469=minke|unit-minke-ui
+63468=bryde|unit-bryde-ui
+63467=alpha|unit-alpha-ui
+63466=beta|unit-beta-ui
+63465=gamma|unit-gamma-ui
+63464=block|unit-block-ui
+63463=risso|unit-risso-ui
+63462=overdrive-dome|block-overdrive-dome-ui
+63461=logic-processor|block-logic-processor-ui
+63460=micro-processor|block-micro-processor-ui
+63459=logic-display|block-logic-display-ui
+63458=switch|block-switch-ui
+63457=memory-cell|block-memory-cell-ui
+63456=payload-conveyor|block-payload-conveyor-ui
+63455=hyper-processor|block-hyper-processor-ui
+63454=toxopid|unit-toxopid-ui
+63453=vestige|unit-vestige-ui
+63452=cataclyst|unit-cataclyst-ui
+63451=scepter|unit-scepter-ui
+63450=reign|unit-reign-ui
+63449=dirt|block-dirt-ui
+63447=stone-wall|block-stone-wall-ui
+63446=spore-wall|block-spore-wall-ui
+63445=ice-wall|block-ice-wall-ui
+63444=snow-wall|block-snow-wall-ui
+63443=dune-wall|block-dune-wall-ui
+63442=sand-wall|block-sand-wall-ui
+63441=salt-wall|block-salt-wall-ui
+63440=shale-wall|block-shale-wall-ui
+63439=dirt-wall|block-dirt-wall-ui
+63437=basalt|block-basalt-ui
+63436=dacite|block-dacite-ui
+63435=boulder|block-boulder-ui
+63434=snow-boulder|block-snow-boulder-ui
+63433=dacite-wall|block-dacite-wall-ui
+63432=dacite-boulder|block-dacite-boulder-ui
+63431=large-logic-display|block-large-logic-display-ui
+63430=omura|unit-omura-ui
+63429=mud|block-mud-ui
+63428=sei|unit-sei-ui
+63427=quad|unit-quad-ui
+63426=oct|unit-oct-ui
+63425=vela|unit-vela-ui
+63424=corvus|unit-corvus-ui
+63423=memory-bank|block-memory-bank-ui
+63422=foreshadow|block-foreshadow-ui
+63421=tsunami|block-tsunami-ui
+63420=space|block-space-ui
+63419=legacy-unit-factory-air|block-legacy-unit-factory-air-ui
+63418=legacy-unit-factory-ground|block-legacy-unit-factory-ground-ui
+63417=interplanetary-accelerator|block-interplanetary-accelerator-ui
+63416=basalt-boulder|block-basalt-boulder-ui
+63415=none|status-none-ui
+63414=burning|status-burning-ui
+63413=freezing|status-freezing-ui
+63412=unmoving|status-unmoving-ui
+63411=slow|status-slow-ui
+63410=wet|status-wet-ui
+63409=muddy|status-muddy-ui
+63408=melting|status-melting-ui
+63407=sapped|status-sapped-ui
+63406=spore-slowed|status-spore-slowed-ui
+63405=tarred|status-tarred-ui
+63404=overdrive|status-overdrive-ui
+63403=overclock|status-overclock-ui
+63402=shielded|status-shielded-ui
+63401=boss|status-boss-ui
+63400=shocked|status-shocked-ui
+63399=blasted|status-blasted-ui
+63398=corroded|status-corroded-ui
+63397=disarmed|status-disarmed-ui
+63385=duct|block-duct-ui
+63376=repair-turret|block-repair-turret-ui
+63374=payload-incinerator|block-payload-incinerator-ui
+63373=payload-void|block-payload-void-ui
+63372=payload-source|block-payload-source-ui
+63368=retusa|unit-retusa-ui
+63366=duct-router|block-duct-router-ui
+63365=duct-bridge|block-duct-bridge-ui
+63364=oxynoe|unit-oxynoe-ui
+63363=cyerce|unit-cyerce-ui
+63362=aegires|unit-aegires-ui
+63361=electrified|status-electrified-ui
+63360=navanax|unit-navanax-ui
+63353=silicon-arc-furnace|block-silicon-arc-furnace-ui
+63352=metal-floor-4|block-metal-floor-4-ui
+63351=invincible|status-invincible-ui
+63356=sharded|team-sharded
+63357=crux|team-crux
+63358=derelict|team-derelict
+63350=deep-water|block-deep-water-ui
+63348=molten-slag|block-molten-slag-ui
+63347=crater-stone|block-crater-stone-ui
+63346=deep-tainted-water|block-deep-tainted-water-ui
+63345=pooled-cryofluid|block-pooled-cryofluid-ui
+63344=empty|block-empty-ui
+63343=liquid-container|block-liquid-container-ui
+63342=deconstructor|block-deconstructor-ui
+63341=constructor|block-constructor-ui
+63340=large-constructor|block-large-constructor-ui
+63339=payload-loader|block-payload-loader-ui
+63338=payload-unloader|block-payload-unloader-ui
+63337=rhyolite|block-rhyolite-ui
+63336=rhyolite-crater|block-rhyolite-crater-ui
+63335=regolith|block-regolith-ui
+63334=yellow-stone|block-yellow-stone-ui
+63333=carbon-stone|block-carbon-stone-ui
+63332=ferric-stone|block-ferric-stone-ui
+63331=ferric-craters|block-ferric-craters-ui
+63330=beryllic-stone|block-beryllic-stone-ui
+63329=red-ice|block-red-ice-ui
+63328=redmat|block-redmat-ui
+63327=bluemat|block-bluemat-ui
+63326=regolith-wall|block-regolith-wall-ui
+63325=yellow-stone-wall|block-yellow-stone-wall-ui
+63324=rhyolite-wall|block-rhyolite-wall-ui
+63323=carbon-wall|block-carbon-wall-ui
+63322=ferric-stone-wall|block-ferric-stone-wall-ui
+63321=beryllic-stone-wall|block-beryllic-stone-wall-ui
+63320=red-ice-wall|block-red-ice-wall-ui
+63319=redweed|block-redweed-ui
+63318=pur-bush|block-pur-bush-ui
+63317=yellowcoral|block-yellowcoral-ui
+63315=carbon-boulder|block-carbon-boulder-ui
+63314=ferric-boulder|block-ferric-boulder-ui
+63313=beryllic-boulder|block-beryllic-boulder-ui
+63312=wall-ore-beryllium|block-wall-ore-beryllium-ui
+63311=graphitic-wall|block-graphitic-wall-ui
+63310=cell-synthesis-chamber|block-cell-synthesis-chamber-ui
+63309=cliff-crusher|block-cliff-crusher-ui
+63308=beam-drill|block-beam-drill-ui
+63307=nuclear-warhead|block-nuclear-warhead-ui
+63306=warhead-assembler|block-warhead-assembler-ui
+63305=ballistic-silo|block-ballistic-silo-ui
+63304=beryllium|item-beryllium-ui
+63303=fissile-matter|item-fissile-matter-ui
+63302=dormant-cyst|item-dormant-cyst-ui
+63301=neoplasm|liquid-neoplasm-ui
+63297=plasma-bore|block-plasma-bore-ui
+63296=steam-vent|block-steam-vent-ui
+63295=pressure-turbine|block-pressure-turbine-ui
+63294=turbine-condenser|block-turbine-condenser-ui
+63293=beam-node|block-beam-node-ui
+63291=beam-tower|block-beam-tower-ui
+63290=build-tower|block-build-tower-ui
+63289=tungsten|item-tungsten-ui
+63288=ore-tungsten|block-ore-tungsten-ui
+63287=impact-drill|block-impact-drill-ui
+63286=carbide|item-carbide-ui
+63285=evoke|unit-evoke-ui
+63284=carbide-crucible|block-carbide-crucible-ui
+63283=surge-duct|block-surge-duct-ui
+63282=surge-conveyor|block-surge-conveyor-ui
+63281=duct-unloader|block-duct-unloader-ui
+63280=surge-router|block-surge-router-ui
+63279=reinforced-conduit|block-reinforced-conduit-ui
+63278=reinforced-liquid-router|block-reinforced-liquid-router-ui
+63277=reinforced-liquid-container|block-reinforced-liquid-container-ui
+63275=reinforced-liquid-tank|block-reinforced-liquid-tank-ui
+63274=reinforced-bridge-conduit|block-reinforced-bridge-conduit-ui
+63272=core-citadel|block-core-citadel-ui
+63271=core-acropolis|block-core-acropolis-ui
+63270=heat-reactor|block-heat-reactor-ui
+63269=core-bastion|block-core-bastion-ui
+63268=incite|unit-incite-ui
+63267=oxidizer|block-oxidizer-ui
+63266=reinforced-pump|block-reinforced-pump-ui
+63265=oxide|item-oxide-ui
+63264=oxygen|liquid-oxygen-ui
+63263=hydrogen|liquid-hydrogen-ui
+63262=electrolyzer|block-electrolyzer-ui
+63261=ozone|liquid-ozone-ui
+63260=reinforced-liquid-junction|block-reinforced-liquid-junction-ui
+63259=oxidation-chamber|block-oxidation-chamber-ui
+63258=surge-crucible|block-surge-crucible-ui
+63257=emanate|unit-emanate-ui
+63256=overflow-duct|block-overflow-duct-ui
+63255=large-plasma-bore|block-large-plasma-bore-ui
+63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui
+63252=cyanogen|liquid-cyanogen-ui
+63251=gallium|liquid-gallium-ui
+63250=slag-centrifuge|block-slag-centrifuge-ui
+63248=slag-incinerator|block-slag-incinerator-ui
+63247=phase-synthesizer|block-phase-synthesizer-ui
+63246=sublimate|block-sublimate-ui
+63245=reinforced-container|block-reinforced-container-ui
+63244=reinforced-vault|block-reinforced-vault-ui
+63243=nitrogen|liquid-nitrogen-ui
+63242=atmospheric-concentrator|block-atmospheric-concentrator-ui
+63241=unit-cargo-loader|block-unit-cargo-loader-ui
+63240=unit-cargo-unload-point|block-unit-cargo-unload-point-ui
+63239=manifold|unit-manifold-ui
+63238=arkycite-floor|block-arkycite-floor-ui
+63237=arkycite|liquid-arkycite-ui
+63236=chemical-combustion-chamber|block-chemical-combustion-chamber-ui
+63235=arkyic-stone|block-arkyic-stone-ui
+63234=yellow-stone-boulder|block-yellow-stone-boulder-ui
+63233=pyrolysis-generator|block-pyrolysis-generator-ui
+63232=wall-ore-tungsten|block-wall-ore-tungsten-ui
+63231=regen-projector|block-regen-projector-ui
+63230=titan|block-titan-ui
+63228=small-deconstructor|block-small-deconstructor-ui
+63227=barrier-projector|block-barrier-projector-ui
+63225=vent-condenser|block-vent-condenser-ui
+63224=electric-heater|block-electric-heater-ui
+63223=phase-heater|block-phase-heater-ui
+63222=arkyic-wall|block-arkyic-wall-ui
+63221=heat-redirector|block-heat-redirector-ui
+63220=vanquish|unit-vanquish-ui
+63219=tungsten-wall|block-tungsten-wall-ui
+63218=tungsten-wall-large|block-tungsten-wall-large-ui
+63217=tank-assembler|block-tank-assembler-ui
+63216=assembly-drone|unit-assembly-drone-ui
+63214=beryllium-wall|block-beryllium-wall-ui
+63213=beryllium-wall-large|block-beryllium-wall-large-ui
+63212=quell|unit-quell-ui
+63211=breach|block-breach-ui
+63210=eruption-drill|block-eruption-drill-ui
+63209=ship-assembler|block-ship-assembler-ui
+63208=quell-missile|unit-quell-missile-ui
+63206=mech-assembler|block-mech-assembler-ui
+63205=ore-crystal-thorium|block-ore-crystal-thorium-ui
+63204=ore-wall-beryllium|block-ore-wall-beryllium-ui
+63203=ore-wall-tungsten|block-ore-wall-tungsten-ui
+63202=arkyic-boulder|block-arkyic-boulder-ui
+63201=crystalline-stone|block-crystalline-stone-ui
+63200=crystalline-stone-wall|block-crystalline-stone-wall-ui
+63199=crystal-cluster|block-crystal-cluster-ui
+63198=crystalline-boulder|block-crystalline-boulder-ui
+63197=crystal-floor|block-crystal-floor-ui
+63196=vibrant-crystal-cluster|block-vibrant-crystal-cluster-ui
+63195=red-ice-boulder|block-red-ice-boulder-ui
+63194=crystal-blocks|block-crystal-blocks-ui
+63193=yellow-stone-plates|block-yellow-stone-plates-ui
+63192=rough-rhyolite|block-rough-rhyolite-ui
+63191=rhyolite-boulder|block-rhyolite-boulder-ui
+63190=red-stone|block-red-stone-ui
+63189=dense-red-stone|block-dense-red-stone-ui
+63188=red-stone-wall|block-red-stone-wall-ui
+63186=red-stone-boulder|block-red-stone-boulder-ui
+63185=red-diamond-wall|block-red-diamond-wall-ui
+63184=crystal-orbs|block-crystal-orbs-ui
+63183=conquer|unit-conquer-ui
+63182=disrupt|unit-disrupt-ui
+63180=disrupt-missile|unit-disrupt-missile-ui
+63179=rhyolite-vent|block-rhyolite-vent-ui
+63178=arkyic-vent|block-arkyic-vent-ui
+63177=yellow-stone-vent|block-yellow-stone-vent-ui
+63176=red-stone-vent|block-red-stone-vent-ui
+63175=carbon-vent|block-carbon-vent-ui
+63174=shield-projector|block-shield-projector-ui
+63173=beam-link|block-beam-link-ui
+63171=effect-drone|unit-effect-drone-ui
+63170=world-processor|block-world-processor-ui
+63169=reinforced-payload-conveyor|block-reinforced-payload-conveyor-ui
+63168=reinforced-payload-router|block-reinforced-payload-router-ui
+63167=disperse|block-disperse-ui
+63166=large-shield-projector|block-large-shield-projector-ui
+63165=payload-mass-driver|block-payload-mass-driver-ui
+63164=world-cell|block-world-cell-ui
+63163=carbide-wall|block-carbide-wall-ui
+63162=carbide-wall-large|block-carbide-wall-large-ui
+63160=ore-wall-thorium|block-ore-wall-thorium-ui
+63159=core-zone|block-core-zone-ui
+63158=fabricator|block-fabricator-ui
+63157=stell|unit-stell-ui
+63156=ore-beryllium|block-ore-beryllium-ui
+63155=locus|unit-locus-ui
+63154=avert|unit-avert-ui
+63153=cleroi|unit-cleroi-ui
+63152=tank-reconstructor|block-tank-reconstructor-ui
+63151=mech-reconstructor|block-mech-reconstructor-ui
+63150=ship-reconstructor|block-ship-reconstructor-ui
+63149=radar|block-radar-ui
+63148=turret-unit-build-tower|unit-turret-unit-build-tower-ui
+63147=blast-door|block-blast-door-ui
+63146=alphaaaa|alphaaaa
+63145=malis|team-malis
+63144=canvas|block-canvas-ui
+63143=armored-duct|block-armored-duct-ui
+63142=anthicus|unit-anthicus-ui
+63141=anthicus-missile|unit-anthicus-missile-ui
+63139=obviate|unit-obviate-ui
+63138=tank-fabricator|block-tank-fabricator-ui
+63137=mech-fabricator|block-mech-fabricator-ui
+63136=ship-fabricator|block-ship-fabricator-ui
+63135=unit-repair-tower|block-unit-repair-tower-ui
+63134=merui|unit-merui-ui
+63133=osc|unit-osc-ui
+63132=precept|unit-precept-ui
+63131=diffuse|block-diffuse-ui
+63130=basic-assembler-module|block-basic-assembler-module-ui
+63129=tecta|unit-tecta-ui
+63128=collaris|unit-collaris-ui
+63127=elude|unit-elude-ui
+63126=refabricator|block-refabricator-ui
+63125=prime-refabricator|block-prime-refabricator-ui
+63124=latum|unit-latum-ui
+63123=reinforced-surge-wall|block-reinforced-surge-wall-ui
+63122=reinforced-surge-wall-large|block-reinforced-surge-wall-large-ui
+63121=tank-refabricator|block-tank-refabricator-ui
+63120=mech-refabricator|block-mech-refabricator-ui
+63119=ship-refabricator|block-ship-refabricator-ui
+63118=slag-heater|block-slag-heater-ui
+63117=afflict|block-afflict-ui
+63116=shielded-wall|block-shielded-wall-ui
+63115=fracture|block-fracture-ui
+63114=renale|unit-renale-ui
+63113=lustre|block-lustre-ui
+63112=scathe|block-scathe-ui
+63111=scathe-missile|unit-scathe-missile-ui
+63110=ravage|block-ravage-ui
+63109=underflow-duct|block-underflow-duct-ui
+63108=malign|block-malign-ui
+63107=smite|block-smite-ui
+63106=shockwave-tower|block-shockwave-tower-ui
+63105=heat-source|block-heat-source-ui
+63104=flux-reactor|block-flux-reactor-ui
+63103=neoplasia-reactor|block-neoplasia-reactor-ui
+63102=sand-floor|block-sand-floor-ui
+63101=crystalline-vent|block-crystalline-vent-ui
+63100=heat-router|block-heat-router-ui
+63099=large-payload-mass-driver|block-large-payload-mass-driver-ui
+63098=reinforced-message|block-reinforced-message-ui
+63097=world-message|block-world-message-ui
+63096=fast|status-fast-ui
+63095=ranai|ranai
+63094=cat|cat
+63093=world-switch|block-world-switch-ui
+63092=dynamic|status-dynamic-ui
+63091=remove-wall|block-remove-wall-ui
+63090=remove-ore|block-remove-ore-ui
+63089=small-heat-redirector|block-small-heat-redirector-ui
+63088=large-cliff-crusher|block-large-cliff-crusher-ui
+63087=scathe-missile-phase|unit-scathe-missile-phase-ui
+63086=scathe-missile-surge|unit-scathe-missile-surge-ui
+63085=scathe-missile-surge-split|unit-scathe-missile-surge-split-ui
+63084=advanced-launch-pad|block-advanced-launch-pad-ui
+63083=landing-pad|block-landing-pad-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
new file mode 100644
index 0000000000..e690bd925b
Binary files /dev/null and b/core/assets/logicids.dat differ
diff --git a/core/assets/maps/aegis.msav b/core/assets/maps/aegis.msav
new file mode 100644
index 0000000000..961e30718c
Binary files /dev/null and b/core/assets/maps/aegis.msav differ
diff --git a/core/assets/maps/archipelago.msav b/core/assets/maps/archipelago.msav
index 24764ccf20..196113cdf8 100644
Binary files a/core/assets/maps/archipelago.msav and b/core/assets/maps/archipelago.msav differ
diff --git a/core/assets/maps/atlas.msav b/core/assets/maps/atlas.msav
new file mode 100644
index 0000000000..c769dcef39
Binary files /dev/null and b/core/assets/maps/atlas.msav differ
diff --git a/core/assets/maps/atolls.msav b/core/assets/maps/atolls.msav
new file mode 100644
index 0000000000..42a70ab90c
Binary files /dev/null and b/core/assets/maps/atolls.msav differ
diff --git a/core/assets/maps/basin.msav b/core/assets/maps/basin.msav
new file mode 100644
index 0000000000..6cd15494fb
Binary files /dev/null and b/core/assets/maps/basin.msav differ
diff --git a/core/assets/maps/biomassFacility.msav b/core/assets/maps/biomassFacility.msav
index 738d890f70..cd355b9c62 100644
Binary files a/core/assets/maps/biomassFacility.msav and b/core/assets/maps/biomassFacility.msav differ
diff --git a/core/assets/maps/caldera-erekir.msav b/core/assets/maps/caldera-erekir.msav
new file mode 100644
index 0000000000..a0f2611f2b
Binary files /dev/null and b/core/assets/maps/caldera-erekir.msav differ
diff --git a/core/assets/maps/coastline.msav b/core/assets/maps/coastline.msav
new file mode 100644
index 0000000000..63f46969a1
Binary files /dev/null and b/core/assets/maps/coastline.msav differ
diff --git a/core/assets/maps/craters.msav b/core/assets/maps/craters.msav
index c52303c3a1..52aa3f3714 100644
Binary files a/core/assets/maps/craters.msav and b/core/assets/maps/craters.msav differ
diff --git a/core/assets/maps/crevice.msav b/core/assets/maps/crevice.msav
new file mode 100644
index 0000000000..b061f03a80
Binary files /dev/null and b/core/assets/maps/crevice.msav differ
diff --git a/core/assets/maps/crossroads.msav b/core/assets/maps/crossroads.msav
new file mode 100644
index 0000000000..535724643d
Binary files /dev/null and b/core/assets/maps/crossroads.msav differ
diff --git a/core/assets/maps/cruxscape.msav b/core/assets/maps/cruxscape.msav
new file mode 100644
index 0000000000..33489c6854
Binary files /dev/null and b/core/assets/maps/cruxscape.msav differ
diff --git a/core/assets/maps/desolateRift.msav b/core/assets/maps/desolateRift.msav
index 71c433d81a..11d62928a0 100644
Binary files a/core/assets/maps/desolateRift.msav and b/core/assets/maps/desolateRift.msav differ
diff --git a/core/assets/maps/domain.msav b/core/assets/maps/domain.msav
new file mode 100644
index 0000000000..443c15b309
Binary files /dev/null and b/core/assets/maps/domain.msav differ
diff --git a/core/assets/maps/extractionOutpost.msav b/core/assets/maps/extractionOutpost.msav
index 7ce6a6904e..6ea0ae63dd 100644
Binary files a/core/assets/maps/extractionOutpost.msav and b/core/assets/maps/extractionOutpost.msav differ
diff --git a/core/assets/maps/facility32m.msav b/core/assets/maps/facility32m.msav
new file mode 100644
index 0000000000..a42a2deb39
Binary files /dev/null and b/core/assets/maps/facility32m.msav differ
diff --git a/core/assets/maps/frontier.msav b/core/assets/maps/frontier.msav
new file mode 100644
index 0000000000..765c4082ce
Binary files /dev/null and b/core/assets/maps/frontier.msav differ
diff --git a/core/assets/maps/frozenForest.msav b/core/assets/maps/frozenForest.msav
index 09f7e2a546..57b06ee25d 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 2b593a2482..6ef6328c79 100644
Binary files a/core/assets/maps/fungalPass.msav and b/core/assets/maps/fungalPass.msav differ
diff --git a/core/assets/maps/geothermalStronghold.msav b/core/assets/maps/geothermalStronghold.msav
new file mode 100644
index 0000000000..e76157110d
Binary files /dev/null and b/core/assets/maps/geothermalStronghold.msav differ
diff --git a/core/assets/maps/glacier.msav b/core/assets/maps/glacier.msav
index 73796f7643..cdb524a0d4 100644
Binary files a/core/assets/maps/glacier.msav and b/core/assets/maps/glacier.msav differ
diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav
index bb169dbbc7..9ece04c2ba 100644
Binary files a/core/assets/maps/groundZero.msav and b/core/assets/maps/groundZero.msav differ
diff --git a/core/assets/maps/impact0078.msav b/core/assets/maps/impact0078.msav
index 08a71a5673..d73d5bad9d 100644
Binary files a/core/assets/maps/impact0078.msav and b/core/assets/maps/impact0078.msav differ
diff --git a/core/assets/maps/infestedCanyons.msav b/core/assets/maps/infestedCanyons.msav
new file mode 100644
index 0000000000..02f0c043de
Binary files /dev/null and b/core/assets/maps/infestedCanyons.msav differ
diff --git a/core/assets/maps/intersect.msav b/core/assets/maps/intersect.msav
new file mode 100644
index 0000000000..df68823481
Binary files /dev/null and b/core/assets/maps/intersect.msav differ
diff --git a/core/assets/maps/karst.msav b/core/assets/maps/karst.msav
new file mode 100644
index 0000000000..f04b1216cb
Binary files /dev/null and b/core/assets/maps/karst.msav differ
diff --git a/core/assets/maps/labyrinth.msav b/core/assets/maps/labyrinth.msav
index d63ca28bf9..9087a6da89 100644
Binary files a/core/assets/maps/labyrinth.msav and b/core/assets/maps/labyrinth.msav differ
diff --git a/core/assets/maps/lake.msav b/core/assets/maps/lake.msav
new file mode 100644
index 0000000000..e1a75c0035
Binary files /dev/null and b/core/assets/maps/lake.msav differ
diff --git a/core/assets/maps/marsh.msav b/core/assets/maps/marsh.msav
new file mode 100644
index 0000000000..13b23e2b22
Binary files /dev/null and b/core/assets/maps/marsh.msav differ
diff --git a/core/assets/maps/mudFlats.msav b/core/assets/maps/mudFlats.msav
index 1ba2e25ceb..adca422b83 100644
Binary files a/core/assets/maps/mudFlats.msav and b/core/assets/maps/mudFlats.msav differ
diff --git a/core/assets/maps/mycelialBastion.msav b/core/assets/maps/mycelialBastion.msav
new file mode 100644
index 0000000000..e4d41aab47
Binary files /dev/null and b/core/assets/maps/mycelialBastion.msav differ
diff --git a/core/assets/maps/navalFortress.msav b/core/assets/maps/navalFortress.msav
new file mode 100644
index 0000000000..2d9dda6171
Binary files /dev/null and b/core/assets/maps/navalFortress.msav differ
diff --git a/core/assets/maps/nuclearComplex.msav b/core/assets/maps/nuclearComplex.msav
index 1b15a5878b..a6d6169cfb 100644
Binary files a/core/assets/maps/nuclearComplex.msav and b/core/assets/maps/nuclearComplex.msav differ
diff --git a/core/assets/maps/onset.msav b/core/assets/maps/onset.msav
new file mode 100644
index 0000000000..62d0340842
Binary files /dev/null and b/core/assets/maps/onset.msav differ
diff --git a/core/assets/maps/origin.msav b/core/assets/maps/origin.msav
new file mode 100644
index 0000000000..c04eba0728
Binary files /dev/null and b/core/assets/maps/origin.msav differ
diff --git a/core/assets/maps/overgrowth.msav b/core/assets/maps/overgrowth.msav
index a51978cb0f..e13fd71bf5 100644
Binary files a/core/assets/maps/overgrowth.msav and b/core/assets/maps/overgrowth.msav differ
diff --git a/core/assets/maps/passage.msav b/core/assets/maps/passage.msav
new file mode 100644
index 0000000000..fb14ff3032
Binary files /dev/null and b/core/assets/maps/passage.msav differ
diff --git a/core/assets/maps/peaks.msav b/core/assets/maps/peaks.msav
new file mode 100644
index 0000000000..2413b06126
Binary files /dev/null and b/core/assets/maps/peaks.msav differ
diff --git a/core/assets/maps/planetaryTerminal.msav b/core/assets/maps/planetaryTerminal.msav
index 7c45ebfca2..96459e74e0 100644
Binary files a/core/assets/maps/planetaryTerminal.msav and b/core/assets/maps/planetaryTerminal.msav differ
diff --git a/core/assets/maps/polarAerodrome.msav b/core/assets/maps/polarAerodrome.msav
new file mode 100644
index 0000000000..b960bbd922
Binary files /dev/null and b/core/assets/maps/polarAerodrome.msav differ
diff --git a/core/assets/maps/ravine.msav b/core/assets/maps/ravine.msav
new file mode 100644
index 0000000000..271afb2bfa
Binary files /dev/null and b/core/assets/maps/ravine.msav differ
diff --git a/core/assets/maps/ruinousShores.msav b/core/assets/maps/ruinousShores.msav
index 441fb2044d..22c4fe7908 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 f4979da57b..e9b53e2691 100644
Binary files a/core/assets/maps/saltFlats.msav and b/core/assets/maps/saltFlats.msav differ
diff --git a/core/assets/maps/seaPort.msav b/core/assets/maps/seaPort.msav
new file mode 100644
index 0000000000..47148b8ce9
Binary files /dev/null and b/core/assets/maps/seaPort.msav differ
diff --git a/core/assets/maps/shoreline.msav b/core/assets/maps/shoreline.msav
deleted file mode 100644
index b0320b4350..0000000000
Binary files a/core/assets/maps/shoreline.msav and /dev/null differ
diff --git a/core/assets/maps/siege.msav b/core/assets/maps/siege.msav
new file mode 100644
index 0000000000..a3be106191
Binary files /dev/null and b/core/assets/maps/siege.msav differ
diff --git a/core/assets/maps/split.msav b/core/assets/maps/split.msav
new file mode 100644
index 0000000000..fdb7c01457
Binary files /dev/null and b/core/assets/maps/split.msav differ
diff --git a/core/assets/maps/stainedMountains.msav b/core/assets/maps/stainedMountains.msav
index b5ec28c9d4..ca4ad5dc6e 100644
Binary files a/core/assets/maps/stainedMountains.msav and b/core/assets/maps/stainedMountains.msav differ
diff --git a/core/assets/maps/stronghold.msav b/core/assets/maps/stronghold.msav
new file mode 100644
index 0000000000..d0315f7979
Binary files /dev/null and b/core/assets/maps/stronghold.msav differ
diff --git a/core/assets/maps/taintedWoods.msav b/core/assets/maps/taintedWoods.msav
new file mode 100644
index 0000000000..237bae65ba
Binary files /dev/null and b/core/assets/maps/taintedWoods.msav differ
diff --git a/core/assets/maps/tarFields.msav b/core/assets/maps/tarFields.msav
index 04055ac8b7..36d33eb11c 100644
Binary files a/core/assets/maps/tarFields.msav and b/core/assets/maps/tarFields.msav differ
diff --git a/core/assets/maps/testingGrounds.msav b/core/assets/maps/testingGrounds.msav
new file mode 100644
index 0000000000..b02ba9da54
Binary files /dev/null and b/core/assets/maps/testingGrounds.msav differ
diff --git a/core/assets/maps/veins.msav b/core/assets/maps/veins.msav
index 3273feb74b..ad6a8b5c01 100644
Binary files a/core/assets/maps/veins.msav and b/core/assets/maps/veins.msav differ
diff --git a/core/assets/maps/weatheredChannels.msav b/core/assets/maps/weatheredChannels.msav
new file mode 100644
index 0000000000..f9ef2030e1
Binary files /dev/null and b/core/assets/maps/weatheredChannels.msav differ
diff --git a/core/assets/maps/windsweptIslands.msav b/core/assets/maps/windsweptIslands.msav
index 690a924716..32daa4dbff 100644
Binary files a/core/assets/maps/windsweptIslands.msav and b/core/assets/maps/windsweptIslands.msav differ
diff --git a/core/assets/music/boss1.mp3 b/core/assets/music/boss1.mp3
deleted file mode 100644
index 4a54f750c9..0000000000
Binary files a/core/assets/music/boss1.mp3 and /dev/null differ
diff --git a/core/assets/music/boss1.ogg b/core/assets/music/boss1.ogg
new file mode 100644
index 0000000000..1ed21ad266
Binary files /dev/null and b/core/assets/music/boss1.ogg differ
diff --git a/core/assets/music/boss2.mp3 b/core/assets/music/boss2.mp3
deleted file mode 100644
index cd9eaf1b25..0000000000
Binary files a/core/assets/music/boss2.mp3 and /dev/null differ
diff --git a/core/assets/music/boss2.ogg b/core/assets/music/boss2.ogg
new file mode 100644
index 0000000000..26c0cea224
Binary files /dev/null and b/core/assets/music/boss2.ogg differ
diff --git a/core/assets/music/coreLaunch.ogg b/core/assets/music/coreLaunch.ogg
new file mode 100644
index 0000000000..4dd82b35b8
Binary files /dev/null and b/core/assets/music/coreLaunch.ogg differ
diff --git a/core/assets/music/editor.mp3 b/core/assets/music/editor.mp3
deleted file mode 100644
index 0b3a8e6182..0000000000
Binary files a/core/assets/music/editor.mp3 and /dev/null differ
diff --git a/core/assets/music/editor.ogg b/core/assets/music/editor.ogg
new file mode 100644
index 0000000000..c24a141c3b
Binary files /dev/null and b/core/assets/music/editor.ogg differ
diff --git a/core/assets/music/fine.ogg b/core/assets/music/fine.ogg
new file mode 100644
index 0000000000..5b9dbe5ee4
Binary files /dev/null and b/core/assets/music/fine.ogg differ
diff --git a/core/assets/music/game1.mp3 b/core/assets/music/game1.mp3
deleted file mode 100644
index bfb9b3d468..0000000000
Binary files a/core/assets/music/game1.mp3 and /dev/null differ
diff --git a/core/assets/music/game1.ogg b/core/assets/music/game1.ogg
new file mode 100644
index 0000000000..1688419305
Binary files /dev/null and b/core/assets/music/game1.ogg differ
diff --git a/core/assets/music/game2.mp3 b/core/assets/music/game2.mp3
deleted file mode 100644
index baeddf2914..0000000000
Binary files a/core/assets/music/game2.mp3 and /dev/null differ
diff --git a/core/assets/music/game2.ogg b/core/assets/music/game2.ogg
new file mode 100644
index 0000000000..8d6d36c5b7
Binary files /dev/null and b/core/assets/music/game2.ogg differ
diff --git a/core/assets/music/game3.mp3 b/core/assets/music/game3.mp3
deleted file mode 100644
index e7f8e34f75..0000000000
Binary files a/core/assets/music/game3.mp3 and /dev/null differ
diff --git a/core/assets/music/game3.ogg b/core/assets/music/game3.ogg
new file mode 100644
index 0000000000..9b0ad6179d
Binary files /dev/null and b/core/assets/music/game3.ogg differ
diff --git a/core/assets/music/game4.mp3 b/core/assets/music/game4.mp3
deleted file mode 100644
index c21cf226f0..0000000000
Binary files a/core/assets/music/game4.mp3 and /dev/null differ
diff --git a/core/assets/music/game4.ogg b/core/assets/music/game4.ogg
new file mode 100644
index 0000000000..586edefcfc
Binary files /dev/null and b/core/assets/music/game4.ogg differ
diff --git a/core/assets/music/game5.mp3 b/core/assets/music/game5.mp3
deleted file mode 100644
index 2bcc7e7a94..0000000000
Binary files a/core/assets/music/game5.mp3 and /dev/null differ
diff --git a/core/assets/music/game5.ogg b/core/assets/music/game5.ogg
new file mode 100644
index 0000000000..d306db44d3
Binary files /dev/null and b/core/assets/music/game5.ogg differ
diff --git a/core/assets/music/game6.mp3 b/core/assets/music/game6.mp3
deleted file mode 100644
index 9e0cfc97d6..0000000000
Binary files a/core/assets/music/game6.mp3 and /dev/null differ
diff --git a/core/assets/music/game6.ogg b/core/assets/music/game6.ogg
new file mode 100644
index 0000000000..86b6e1531a
Binary files /dev/null and b/core/assets/music/game6.ogg differ
diff --git a/core/assets/music/game7.mp3 b/core/assets/music/game7.mp3
deleted file mode 100644
index 4a8d5187b8..0000000000
Binary files a/core/assets/music/game7.mp3 and /dev/null differ
diff --git a/core/assets/music/game7.ogg b/core/assets/music/game7.ogg
new file mode 100644
index 0000000000..2d49c70927
Binary files /dev/null and b/core/assets/music/game7.ogg differ
diff --git a/core/assets/music/game8.mp3 b/core/assets/music/game8.mp3
deleted file mode 100644
index a2cebbc465..0000000000
Binary files a/core/assets/music/game8.mp3 and /dev/null differ
diff --git a/core/assets/music/game8.ogg b/core/assets/music/game8.ogg
new file mode 100644
index 0000000000..380fb2ce40
Binary files /dev/null and b/core/assets/music/game8.ogg differ
diff --git a/core/assets/music/game9.mp3 b/core/assets/music/game9.mp3
deleted file mode 100644
index a852b4c4c9..0000000000
Binary files a/core/assets/music/game9.mp3 and /dev/null differ
diff --git a/core/assets/music/game9.ogg b/core/assets/music/game9.ogg
new file mode 100644
index 0000000000..c7d31cce41
Binary files /dev/null and b/core/assets/music/game9.ogg differ
diff --git a/core/assets/music/land.mp3 b/core/assets/music/land.mp3
deleted file mode 100644
index 80720c478c..0000000000
Binary files a/core/assets/music/land.mp3 and /dev/null differ
diff --git a/core/assets/music/land.ogg b/core/assets/music/land.ogg
new file mode 100644
index 0000000000..d9ea5aa88c
Binary files /dev/null and b/core/assets/music/land.ogg differ
diff --git a/core/assets/music/launch.mp3 b/core/assets/music/launch.mp3
deleted file mode 100644
index 7aeb2a3340..0000000000
Binary files a/core/assets/music/launch.mp3 and /dev/null differ
diff --git a/core/assets/music/launch.ogg b/core/assets/music/launch.ogg
new file mode 100644
index 0000000000..22e1705652
Binary files /dev/null and b/core/assets/music/launch.ogg differ
diff --git a/core/assets/music/menu.mp3 b/core/assets/music/menu.mp3
deleted file mode 100644
index 6423eba4b2..0000000000
Binary files a/core/assets/music/menu.mp3 and /dev/null differ
diff --git a/core/assets/music/menu.ogg b/core/assets/music/menu.ogg
new file mode 100644
index 0000000000..2768054f01
Binary files /dev/null and b/core/assets/music/menu.ogg differ
diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js
index 368ebff42d..4cfe9ef574 100755
--- a/core/assets/scripts/base.js
+++ b/core/assets/scripts/base.js
@@ -1,23 +1,25 @@
 "use strict";
 
-function log(context, obj){
-    Vars.mods.scripts.log(context, String(obj))
-}
-
-const readString = path => Vars.mods.scripts.readString(path)
-const readBytes = path => Vars.mods.scripts.readBytes(path)
-const loadMusic = path => Vars.mods.scripts.loadMusic(path)
-const loadSound = path => Vars.mods.scripts.loadSound(path)
-
-const readFile = (purpose, ext, cons) => Vars.mods.scripts.readFile(purpose, ext, cons);
-const readBinFile = (purpose, ext, cons) => Vars.mods.scripts.readBinFile(purpose, ext, cons);
-const writeFile = (purpose, ext, str) => Vars.mods.scripts.writeFile(purpose, ext, str);
-const writeBinFile = (purpose, ext, bytes) => Vars.mods.scripts.writeBinFile(purpose, ext, bytes);
-
 let scriptName = "base.js"
 let modName = "none"
 
-const print = text => log(modName + "/" + scriptName, text);
+const log = (context, obj) => Vars.mods.scripts.log(context, String(obj))
+const print = text => log(modName + "/" + scriptName, text)
+
+const newFloats = cap => Vars.mods.getScripts().newFloats(cap);
+
+//these are not strictly 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 Effect.Effect(lifetime, new Effect.EffectRenderer({render: renderer}))
+Call = Packages.mindustry.gen.Call
 
 //js 'extend(Base, ..., {})' = java 'new Base(...) {}'
 function extend(/*Base, ..., def*/){
@@ -36,19 +38,3 @@ function extend(/*Base, ..., def*/){
     }
     return instance
 }
-
-//For backwards compatibility, use extend instead
-const extendContent = extend;
-
-//these are not strictly 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 Effect.Effect(lifetime, new Effect.EffectRenderer({render: renderer}))
-Call = Packages.mindustry.gen.Call
diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js
index 92a7fd5562..d91fe9950c 100755
--- a/core/assets/scripts/global.js
+++ b/core/assets/scripts/global.js
@@ -2,24 +2,26 @@
 
 "use strict";
 
-function log(context, obj){
-    Vars.mods.scripts.log(context, String(obj))
-}
-
-const readString = path => Vars.mods.scripts.readString(path)
-const readBytes = path => Vars.mods.scripts.readBytes(path)
-const loadMusic = path => Vars.mods.scripts.loadMusic(path)
-const loadSound = path => Vars.mods.scripts.loadSound(path)
-
-const readFile = (purpose, ext, cons) => Vars.mods.scripts.readFile(purpose, ext, cons);
-const readBinFile = (purpose, ext, cons) => Vars.mods.scripts.readBinFile(purpose, ext, cons);
-const writeFile = (purpose, ext, str) => Vars.mods.scripts.writeFile(purpose, ext, str);
-const writeBinFile = (purpose, ext, bytes) => Vars.mods.scripts.writeBinFile(purpose, ext, bytes);
-
 let scriptName = "base.js"
 let modName = "none"
 
-const print = text => log(modName + "/" + scriptName, text);
+const log = (context, obj) => Vars.mods.scripts.log(context, String(obj))
+const print = text => log(modName + "/" + scriptName, text)
+
+const newFloats = cap => Vars.mods.getScripts().newFloats(cap);
+
+//these are not strictly 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 Effect.Effect(lifetime, new Effect.EffectRenderer({render: renderer}))
+Call = Packages.mindustry.gen.Call
 
 //js 'extend(Base, ..., {})' = java 'new Base(...) {}'
 function extend(/*Base, ..., def*/){
@@ -39,27 +41,15 @@ function extend(/*Base, ..., def*/){
     return instance
 }
 
-//For backwards compatibility, use extend instead
-const extendContent = extend;
-
-//these are not strictly 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 Effect.Effect(lifetime, new Effect.EffectRenderer({render: renderer}))
-Call = Packages.mindustry.gen.Call
-
 importPackage(Packages.arc)
+importPackage(Packages.arc.audio)
+importPackage(Packages.arc.files)
+importPackage(Packages.arc.flabel)
 importPackage(Packages.arc.func)
 importPackage(Packages.arc.graphics)
 importPackage(Packages.arc.graphics.g2d)
 importPackage(Packages.arc.graphics.gl)
+importPackage(Packages.arc.input)
 importPackage(Packages.arc.math)
 importPackage(Packages.arc.math.geom)
 importPackage(Packages.arc.scene)
@@ -71,10 +61,13 @@ importPackage(Packages.arc.scene.ui.layout)
 importPackage(Packages.arc.scene.utils)
 importPackage(Packages.arc.struct)
 importPackage(Packages.arc.util)
+importPackage(Packages.arc.util.io)
+importPackage(Packages.arc.util.noise)
+importPackage(Packages.arc.util.pooling)
+importPackage(Packages.arc.util.serialization)
+importPackage(Packages.arc.util.viewport)
 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)
@@ -85,8 +78,9 @@ 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.effect)
+importPackage(Packages.mindustry.entities.part)
+importPackage(Packages.mindustry.entities.pattern)
 importPackage(Packages.mindustry.entities.units)
 importPackage(Packages.mindustry.game)
 importPackage(Packages.mindustry.gen)
@@ -94,13 +88,19 @@ importPackage(Packages.mindustry.graphics)
 importPackage(Packages.mindustry.graphics.g3d)
 importPackage(Packages.mindustry.input)
 importPackage(Packages.mindustry.io)
+importPackage(Packages.mindustry.io.versions)
 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.mod)
 importPackage(Packages.mindustry.net)
+importPackage(Packages.mindustry.service)
 importPackage(Packages.mindustry.type)
+importPackage(Packages.mindustry.type.ammo)
+importPackage(Packages.mindustry.type.unit)
+importPackage(Packages.mindustry.type.weapons)
 importPackage(Packages.mindustry.type.weather)
 importPackage(Packages.mindustry.ui)
 importPackage(Packages.mindustry.ui.dialogs)
@@ -113,7 +113,7 @@ 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.heat)
 importPackage(Packages.mindustry.world.blocks.legacy)
 importPackage(Packages.mindustry.world.blocks.liquid)
 importPackage(Packages.mindustry.world.blocks.logic)
@@ -126,8 +126,8 @@ 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 AdminRequestEvent = Packages.mindustry.game.EventType.AdminRequestEvent
 const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent
 const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent
 const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent
@@ -135,35 +135,60 @@ const PlayerBanEvent = Packages.mindustry.game.EventType.PlayerBanEvent
 const PlayerLeave = Packages.mindustry.game.EventType.PlayerLeave
 const PlayerConnect = Packages.mindustry.game.EventType.PlayerConnect
 const PlayerJoin = Packages.mindustry.game.EventType.PlayerJoin
+const PlayerConnectionConfirmed = Packages.mindustry.game.EventType.PlayerConnectionConfirmed
+const ConnectPacketEvent = Packages.mindustry.game.EventType.ConnectPacketEvent
+const ConnectionEvent = Packages.mindustry.game.EventType.ConnectionEvent
 const UnitChangeEvent = Packages.mindustry.game.EventType.UnitChangeEvent
+const UnitUnloadEvent = Packages.mindustry.game.EventType.UnitUnloadEvent
+const UnitSpawnEvent = Packages.mindustry.game.EventType.UnitSpawnEvent
 const UnitCreateEvent = Packages.mindustry.game.EventType.UnitCreateEvent
 const UnitDrownEvent = Packages.mindustry.game.EventType.UnitDrownEvent
+const UnitDamageEvent = Packages.mindustry.game.EventType.UnitDamageEvent
+const UnitBulletDestroyEvent = Packages.mindustry.game.EventType.UnitBulletDestroyEvent
 const UnitDestroyEvent = Packages.mindustry.game.EventType.UnitDestroyEvent
+const BuildingBulletDestroyEvent = Packages.mindustry.game.EventType.BuildingBulletDestroyEvent
+const GeneratorPressureExplodeEvent = Packages.mindustry.game.EventType.GeneratorPressureExplodeEvent
 const BlockDestroyEvent = Packages.mindustry.game.EventType.BlockDestroyEvent
 const BuildSelectEvent = Packages.mindustry.game.EventType.BuildSelectEvent
+const BuildRotateEvent = Packages.mindustry.game.EventType.BuildRotateEvent
 const BlockBuildEndEvent = Packages.mindustry.game.EventType.BlockBuildEndEvent
 const BlockBuildBeginEvent = Packages.mindustry.game.EventType.BlockBuildBeginEvent
 const ResearchEvent = Packages.mindustry.game.EventType.ResearchEvent
 const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent
 const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent
+const CoreChangeEvent = Packages.mindustry.game.EventType.CoreChangeEvent
+const BuildTeamChangeEvent = Packages.mindustry.game.EventType.BuildTeamChangeEvent
 const TileChangeEvent = Packages.mindustry.game.EventType.TileChangeEvent
+const TilePreChangeEvent = Packages.mindustry.game.EventType.TilePreChangeEvent
+const BuildDamageEvent = Packages.mindustry.game.EventType.BuildDamageEvent
 const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent
+const BuildingCommandEvent = Packages.mindustry.game.EventType.BuildingCommandEvent
 const UnitControlEvent = Packages.mindustry.game.EventType.UnitControlEvent
+const PayloadDropEvent = Packages.mindustry.game.EventType.PayloadDropEvent
 const PickupEvent = Packages.mindustry.game.EventType.PickupEvent
 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 ClientChatEvent = Packages.mindustry.game.EventType.ClientChatEvent
 const PlayerChatEvent = Packages.mindustry.game.EventType.PlayerChatEvent
+const TextInputEvent = Packages.mindustry.game.EventType.TextInputEvent
+const MenuOptionChooseEvent = Packages.mindustry.game.EventType.MenuOptionChooseEvent
+const ClientServerConnectEvent = Packages.mindustry.game.EventType.ClientServerConnectEvent
 const ClientPreConnectEvent = Packages.mindustry.game.EventType.ClientPreConnectEvent
-const CommandIssueEvent = Packages.mindustry.game.EventType.CommandIssueEvent
 const SchematicCreateEvent = Packages.mindustry.game.EventType.SchematicCreateEvent
+const SectorLaunchLoadoutEvent = Packages.mindustry.game.EventType.SectorLaunchLoadoutEvent
 const SectorLaunchEvent = Packages.mindustry.game.EventType.SectorLaunchEvent
 const LaunchItemEvent = Packages.mindustry.game.EventType.LaunchItemEvent
 const SectorInvasionEvent = Packages.mindustry.game.EventType.SectorInvasionEvent
 const SectorLoseEvent = Packages.mindustry.game.EventType.SectorLoseEvent
+const SaveLoadEvent = Packages.mindustry.game.EventType.SaveLoadEvent
+const WorldLoadEndEvent = Packages.mindustry.game.EventType.WorldLoadEndEvent
+const WorldLoadBeginEvent = Packages.mindustry.game.EventType.WorldLoadBeginEvent
 const WorldLoadEvent = Packages.mindustry.game.EventType.WorldLoadEvent
+const FileTreeInitEvent = Packages.mindustry.game.EventType.FileTreeInitEvent
+const MusicRegisterEvent = Packages.mindustry.game.EventType.MusicRegisterEvent
 const ClientLoadEvent = Packages.mindustry.game.EventType.ClientLoadEvent
 const ContentInitEvent = Packages.mindustry.game.EventType.ContentInitEvent
 const BlockInfoEvent = Packages.mindustry.game.EventType.BlockInfoEvent
@@ -172,12 +197,13 @@ const TurretAmmoDeliverEvent = Packages.mindustry.game.EventType.TurretAmmoDeliv
 const LineConfirmEvent = Packages.mindustry.game.EventType.LineConfirmEvent
 const TurnEvent = Packages.mindustry.game.EventType.TurnEvent
 const WaveEvent = Packages.mindustry.game.EventType.WaveEvent
+const HostEvent = Packages.mindustry.game.EventType.HostEvent
 const ResetEvent = Packages.mindustry.game.EventType.ResetEvent
 const PlayEvent = Packages.mindustry.game.EventType.PlayEvent
 const DisposeEvent = Packages.mindustry.game.EventType.DisposeEvent
 const ServerLoadEvent = Packages.mindustry.game.EventType.ServerLoadEvent
 const ClientCreateEvent = Packages.mindustry.game.EventType.ClientCreateEvent
-const SaveLoadEvent = Packages.mindustry.game.EventType.SaveLoadEvent
+const SaveWriteEvent = Packages.mindustry.game.EventType.SaveWriteEvent
 const MapPublishEvent = Packages.mindustry.game.EventType.MapPublishEvent
 const MapMakeEvent = Packages.mindustry.game.EventType.MapMakeEvent
 const ResizeEvent = Packages.mindustry.game.EventType.ResizeEvent
diff --git a/core/assets/shaders/arkycite.frag b/core/assets/shaders/arkycite.frag
new file mode 100644
index 0000000000..863b3f6d64
--- /dev/null
+++ b/core/assets/shaders/arkycite.frag
@@ -0,0 +1,54 @@
+#define HIGHP
+
+#define S1 vec4(96.0, 131.0, 66.0, 255.0) / 255.0
+#define S2 vec3(132.0, 169.0, 79.0) / 255.0
+#define S3 vec3(210.0, 221.0, 118.0) / 255.0
+
+#define NSCALE 170.0 / 2.0
+#define DSCALE 160.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 = (c * u_resolution) + u_campos;
+
+    vec4 orig = texture2D(u_texture, c);
+
+    float atime = u_time / 15000.0;
+    float noise = (texture2D(u_noise, (coords) / DSCALE + vec2(atime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / DSCALE + vec2(atime * 1.1) * vec2(0.8, -1.0)).r) / 2.0;
+
+    noise = abs(noise - 0.5) * 7.0 + 0.23;
+
+    float btime = u_time / 9000.0;
+
+    c += (vec2(
+        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
+    ) - vec2(0.5)) * 20.0 / u_resolution;
+
+    vec4 color = texture2D(u_texture, c);
+
+    if(noise > 0.85){
+        if(color.g >= (S2).g - 0.1){
+            color.rgb = S3;
+        }else{
+            color.rgb = S2;
+        }
+    }else if(noise > 0.5){
+        color.rgb = S2;
+    }
+
+    if(orig.g > 0.01){
+        color = max(S1, color);
+    }
+
+    gl_FragColor = color;
+}
diff --git a/core/assets/shaders/atmosphere.frag b/core/assets/shaders/atmosphere.frag
index f5f437f298..1c8c4966df 100644
--- a/core/assets/shaders/atmosphere.frag
+++ b/core/assets/shaders/atmosphere.frag
@@ -1,3 +1,5 @@
+#define HIGHP
+
 const float PI = 3.14159265359;
 const float MAX = 10000.0;
 
diff --git a/core/assets/shaders/blockbuild.frag b/core/assets/shaders/blockbuild.frag
index fe877e873b..dc58d20761 100644
--- a/core/assets/shaders/blockbuild.frag
+++ b/core/assets/shaders/blockbuild.frag
@@ -1,3 +1,5 @@
+#define HIGHP
+
 uniform sampler2D u_texture;
 
 uniform vec2 u_texsize;
@@ -16,11 +18,17 @@ bool id(vec2 coords, vec4 base){
 }
 
 bool cont(vec2 T, vec2 v){
-    const float step = 3.0;
+    const float step = 3.5;
     vec4 base = texture2D(u_texture, T);
     return base.a > 0.1 &&
            		(id(T + vec2(0, step) * v, base) || id(T + vec2(0, -step) * v, base) ||
-           		id(T + vec2(step, 0) * v, base) || id(T + vec2(-step, 0) * v, base));
+           		id(T + vec2(step, 0) * v, base) || id(T + vec2(-step, 0) * v, base) ||
+                id(T + vec2(step, step) * v, base) || id(T + vec2(step, -step) * v, base) ||
+                id(T + vec2(-step, -step) * v, base) || id(T + vec2(-step, step) * v, base));
+}
+
+vec4 blend(vec4 dst, vec4 src){
+    return src * src.a + dst * (1.0 - src.a);
 }
 
 void main(){
@@ -37,11 +45,11 @@ void main(){
 	float dst = (abs(center.x - coords.x) + abs(center.y - coords.y))/2.0;
 
 	if((mod(u_time / 1.5 + value, 20.0) < 15.0 && cont(t, v))){
-        gl_FragColor = v_color;
+        gl_FragColor = blend(color, v_color);
     }else if(dst > (1.0-u_progress) * (center.x)){
         gl_FragColor = color;
-    }else if((dst + 1.0 > (1.0-u_progress) * (center.x)) && color.a > 0.1){
-        gl_FragColor = v_color;
+    }else if((dst + 2.0 > (1.0-u_progress) * (center.x)) && color.a > 0.1){
+        gl_FragColor = blend(color, v_color);
     }else{
         gl_FragColor = vec4(0.0);
     }
diff --git a/core/assets/shaders/caustics.frag b/core/assets/shaders/caustics.frag
new file mode 100644
index 0000000000..ddc4b80bbc
--- /dev/null
+++ b/core/assets/shaders/caustics.frag
@@ -0,0 +1,24 @@
+#define HIGHP
+
+#define NSCALE 200.0 / 1.8
+
+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 / 3400.0;
+    vec4 noise1 = texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8));
+    vec4 noise2 = texture2D(u_noise, (coords) / NSCALE + vec2(btime * 1.1) * vec2(0.8, -1.0));
+    //vec4 noise3 = texture2D(u_noise, (coords) / (NSCALE * 2.0) + vec2(btime * 0.9) * vec2(0.8, 1.0));
+
+    gl_FragColor = vec4(vec3(min(noise1.r, noise2.r)), 0.2);
+}
diff --git a/core/assets/shaders/clouds.vert b/core/assets/shaders/clouds.vert
new file mode 100755
index 0000000000..869b40b964
--- /dev/null
+++ b/core/assets/shaders/clouds.vert
@@ -0,0 +1,20 @@
+attribute vec4 a_position;
+attribute vec3 a_normal;
+attribute vec4 a_color;
+
+uniform mat4 u_proj;
+uniform mat4 u_trans;
+uniform vec3 u_lightdir;
+uniform vec3 u_ambientColor;
+uniform float u_alpha;
+
+varying vec4 v_col;
+
+const vec3 diffuse = vec3(0.01);
+
+void main(){
+	vec3 norc = u_ambientColor * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0)));
+
+	v_col = a_color * vec4(norc, u_alpha);
+    gl_Position = u_proj * u_trans * a_position;
+}
diff --git a/core/assets/shaders/cryofluid.frag b/core/assets/shaders/cryofluid.frag
new file mode 100644
index 0000000000..6bfac12520
--- /dev/null
+++ b/core/assets/shaders/cryofluid.frag
@@ -0,0 +1,33 @@
+#define HIGHP
+
+//shades of cryofluid
+#define S1 vec3(53.0, 83.0, 93.0) / 100.0
+#define S2 vec3(68.0, 90.0, 97.0) / 100.0
+#define NSCALE 100.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 / 5000.0;
+    float wave = abs(sin(coords.x * 1.1 + coords.y) + 0.1 * sin(2.5 * coords.x) + 0.15 * sin(3.0 * coords.y)) / 30.0;
+    float noise = wave + (texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.2, 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(noise > 0.54 && noise < 0.57){
+        color.rgb = S2;
+    }else if (noise > 0.49 && noise < 0.62){
+        color.rgb = S1;
+    }
+
+    gl_FragColor = color;
+}
diff --git a/core/assets/shaders/fog.frag b/core/assets/shaders/fog.frag
new file mode 100644
index 0000000000..6f474c7ddd
--- /dev/null
+++ b/core/assets/shaders/fog.frag
@@ -0,0 +1,12 @@
+#define HIGHP
+#define QUANT 0.3
+
+uniform sampler2D u_texture;
+
+varying vec4 v_color;
+varying vec2 v_texCoords;
+
+void main(){
+    vec4 color = texture2D(u_texture, v_texCoords.xy);
+    gl_FragColor = vec4(1.0, 1.0, 1.0, (1.0 - floor(color.r / QUANT) * QUANT) * (step(color.r, 0.99))) * v_color;
+}
diff --git a/core/assets/shaders/mud.frag b/core/assets/shaders/mud.frag
index 3858cdec63..c185c0e552 100644
--- a/core/assets/shaders/mud.frag
+++ b/core/assets/shaders/mud.frag
@@ -20,9 +20,9 @@ void main(){
     vec4 color = texture2D(u_texture, c);
 
     if(noise > 0.54 && noise < 0.68){
-        color.rgb *= 1.4;
+        color.rgb *= vec3(1.4);
     }else if(!(noise > 0.40 && noise < 0.54)){
-        color.rgb *= 1.2;
+        color.rgb *= vec3(1.2);
     }
 
     gl_FragColor = color;
diff --git a/core/assets/shaders/planet.vert b/core/assets/shaders/planet.vert
index 182fe68972..7c73fb8aa5 100755
--- a/core/assets/shaders/planet.vert
+++ b/core/assets/shaders/planet.vert
@@ -6,20 +6,26 @@ uniform mat4 u_proj;
 uniform mat4 u_trans;
 uniform vec3 u_lightdir;
 uniform vec3 u_camdir;
+uniform vec3 u_campos;
 uniform vec3 u_ambientColor;
 
 varying vec4 v_col;
 
 const vec3 diffuse = vec3(0.01);
-const float shinefalloff = 4.0;
-const float shinelen = 0.2;
 
 void main(){
-	vec3 norc = u_ambientColor * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0)));
-    float shinedot = max((-dot(u_camdir, a_normal) - (1.0 - shinelen)) / shinelen, 0.0);
-    float albedo = (1.0 - a_color.a) * pow(shinedot, shinefalloff);
-    vec4 baseCol = vec4(a_color.rgb, 1.0);
+    vec3 specular = vec3(0.0, 0.0, 0.0);
 
-	v_col = mix(baseCol * vec4(norc, 1.0), vec4(1.0), albedo * norc.r);
+    //TODO this calculation is probably wrong
+    vec3 lightReflect = normalize(reflect(a_normal, u_lightdir));
+    vec3 vertexEye = normalize(u_campos - (u_trans * a_position).xyz);
+    float specularFactor = dot(vertexEye, lightReflect);
+    if(specularFactor > 0.0){
+        specular = vec3(1.0 * pow(specularFactor, 40.0)) * (1.0-a_color.a);
+    }
+
+	vec3 norc = (u_ambientColor + specular) * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0)));
+
+	v_col = vec4(a_color.rgb, 1.0) * vec4(norc, 1.0);
     gl_Position = u_proj * u_trans * a_position;
 }
diff --git a/core/assets/shaders/shield.frag b/core/assets/shaders/shield.frag
index d4fdd10998..098f62c7b1 100644
--- a/core/assets/shaders/shield.frag
+++ b/core/assets/shaders/shield.frag
@@ -18,24 +18,24 @@ void main(){
 
     T += vec2(sin(coords.y / 3.0 + u_time / 20.0), sin(coords.x / 3.0 + u_time / 20.0)) / u_texsize;
 
-	vec4 color = texture2D(u_texture, T);
-	vec2 v = u_invsize;
+    vec4 color = texture2D(u_texture, T);
+    vec2 v = u_invsize;
 
     vec4 maxed = max(max(max(texture2D(u_texture, T + vec2(0, step) * v), texture2D(u_texture, T + vec2(0, -step) * v)), texture2D(u_texture, T + vec2(step, 0) * v)), texture2D(u_texture, T + vec2(-step, 0) * v));
 
-	if(texture2D(u_texture, T).a < 0.9 && maxed.a > 0.9){
+    if(texture2D(u_texture, T).a < 0.9 && maxed.a > 0.9){
 
-		gl_FragColor = vec4(maxed.rgb, maxed.a * 100.0);
-	}else{
+        gl_FragColor = vec4(maxed.rgb, maxed.a * 100.0);
+    }else{
 
-	    if(color.a > 0.0){
-	        if(mod(coords.x / u_dp + coords.y / u_dp + sin(coords.x / u_dp / 5.0) * 3.0 + sin(coords.y / u_dp / 5.0) * 3.0  + u_time / 4.0, 10.0) < 2.0){
-	            color *= 1.65;
-	        }
-	        
-	        color.a = ALPHA;
-	    }
-		
-		gl_FragColor = color;
-	}
+        if(color.a > 0.0){
+            if(mod(coords.x / u_dp + coords.y / u_dp + sin(coords.x / u_dp / 5.0) * 3.0 + sin(coords.y / u_dp / 5.0) * 3.0  + u_time / 4.0, 10.0) < 2.0){
+                color *= 1.65;
+            }
+
+            color.a = ALPHA;
+        }
+
+        gl_FragColor = color;
+    }
 }
diff --git a/core/assets/shaders/shockwave.frag b/core/assets/shaders/shockwave.frag
new file mode 100644
index 0000000000..d9397920e8
--- /dev/null
+++ b/core/assets/shaders/shockwave.frag
@@ -0,0 +1,42 @@
+#define MAX_SHOCKWAVES 64
+#define WAVE_RADIUS 5.0
+#define DIFF_SCL 1.5
+#define WAVE_POW 0.8
+
+varying vec2 v_texCoords;
+
+uniform sampler2D u_texture;
+uniform vec2 u_resolution;
+uniform vec2 u_campos;
+uniform vec4 u_shockwaves[MAX_SHOCKWAVES];
+uniform int u_shockwave_count;
+
+void main(){
+    vec2 worldCoords = v_texCoords * u_resolution + u_campos;
+    vec2 uv = v_texCoords;
+    vec2 displacement = vec2(0.0, 0.0);
+
+    for(int i = 0; i < MAX_SHOCKWAVES; i ++){
+        vec4 wave = u_shockwaves[i];
+        float radius = wave.z;
+        float dst = distance(worldCoords, wave.xy);
+        float strength = wave.w * (1.0 - abs(dst - radius) / WAVE_RADIUS);
+
+        if(abs(dst - radius) <= WAVE_RADIUS){
+            float diff = (dst - radius);
+
+            float pdiff = 1.0 - pow(abs(diff * DIFF_SCL), WAVE_POW);
+            float diffTime = diff  * pdiff;
+            vec2 relative = normalize(worldCoords - wave.xy);
+
+            displacement += (relative * diffTime * strength) / u_resolution;
+        }
+
+        if(i >= u_shockwave_count - 1){
+            break;
+        }
+    }
+
+    vec4 c = texture2D(u_texture, uv + displacement);
+    gl_FragColor = c;
+}
\ No newline at end of file
diff --git a/core/assets/shaders/slag.frag b/core/assets/shaders/slag.frag
index c038baf292..2750d32ecd 100755
--- a/core/assets/shaders/slag.frag
+++ b/core/assets/shaders/slag.frag
@@ -18,7 +18,7 @@ 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 / 4000.0;
+    float btime = u_time / 5000.0;
     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);
 
diff --git a/core/assets/shaders/unitarmor.frag b/core/assets/shaders/unitarmor.frag
new file mode 100644
index 0000000000..1e475fda17
--- /dev/null
+++ b/core/assets/shaders/unitarmor.frag
@@ -0,0 +1,21 @@
+uniform sampler2D u_texture;
+
+uniform float u_time;
+uniform float u_progress;
+uniform vec2 u_uv;
+uniform vec2 u_uv2;
+uniform vec2 u_texsize;
+
+varying vec4 v_color;
+varying vec2 v_texCoords;
+
+void main(){
+    vec2 coords = (v_texCoords - u_uv) / (u_uv2 - u_uv);
+    vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
+
+    vec4 c = texture2D(u_texture, v_texCoords);
+    c.a *= u_progress;
+    c.a *= step(abs(sin(coords.y*3.0 + u_time)), 0.9);
+
+    gl_FragColor = c * v_color;
+}
diff --git a/core/assets/shaders/unitbuild.frag b/core/assets/shaders/unitbuild.frag
index d4657060da..9f4386aba7 100644
--- a/core/assets/shaders/unitbuild.frag
+++ b/core/assets/shaders/unitbuild.frag
@@ -1,5 +1,3 @@
-#define step 3.0
-
 uniform sampler2D u_texture;
 
 uniform float u_time;
@@ -12,40 +10,17 @@ uniform vec2 u_texsize;
 varying vec4 v_color;
 varying vec2 v_texCoords;
 
-bool id(vec4 v){
-    return v.a > 0.1;
-}
-
-bool id(vec2 coords, vec4 base){
-    vec4 target = texture2D(u_texture, coords);
-    return  target.a < 0.1 || (coords.x < u_uv.x || coords.y < u_uv.y || coords.x > u_uv2.x || coords.y > u_uv2.y);
-}
-
-bool cont(vec2 T, vec2 v){
-    vec4 base = texture2D(u_texture, T);
-    return base.a > 0.1 &&
-           		(id(T + vec2(0, step) * v, base) || id(T + vec2(0, -step) * v, base) ||
-           		id(T + vec2(step, 0) * v, base) || id(T + vec2(-step, 0) * v, base) ||
-           		id(T + vec2(step, step) * v, base) || id(T + vec2(-step, -step) * v, base) ||
-                           		id(T + vec2(step, -step) * v, base) || id(T + vec2(-step, step) * v, base));
-}
-
 void main(){
-    vec2 coords = (v_texCoords.xy - u_uv) / (u_uv2 - u_uv);
-    vec2 t = v_texCoords.xy;
+    vec2 coords = (v_texCoords - u_uv) / (u_uv2 - u_uv);
     vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
 
-	vec4 c = texture2D(u_texture, v_texCoords.xy);
+	vec4 c = texture2D(u_texture, v_texCoords);
     float alpha = c.a;
 
     c.a *= u_progress;
 
     if(c.a > 0.01){
-        float f = abs(sin(coords.x*2.0 + u_time));
-        if(f > 0.9)
-            f = 1.0;
-        else
-            f = 0.0;
+        float f = step(abs(sin(coords.x*2.0 + u_time)), 0.9);
         c = mix(c, u_color, f * u_color.a);
     }
 
diff --git a/core/assets/shaders/water.frag b/core/assets/shaders/water.frag
index e7f4ee1016..30679b2da5 100644
--- a/core/assets/shaders/water.frag
+++ b/core/assets/shaders/water.frag
@@ -14,13 +14,13 @@ const float mth = 7.0;
 void main(){
 
 	vec2 c = v_texCoords;
-
 	vec2 v = vec2(1.0/u_resolution.x, 1.0/u_resolution.y);
 	vec2 coords = vec2(c.x / v.x + u_campos.x, c.y / v.y + u_campos.y);
 
 	float stime = u_time / 5.0;
 
-    vec3 color = texture2D(u_texture, c + vec2(sin(stime/3.0 + coords.y/0.75) * v.x, 0.0)).rgb * vec3(0.9, 0.9, 1);
+    vec4 sampled = texture2D(u_texture, c + vec2(sin(stime/3.0 + coords.y/0.75) * v.x, 0.0));
+    vec3 color = sampled.rgb * vec3(0.9, 0.9, 1);
 
     float tester = mod((coords.x + coords.y*1.1 + sin(stime / 8.0 + coords.x/5.0 - coords.y/100.0)*2.0) +
                            sin(stime / 20.0 + coords.y/3.0) * 1.0 +
@@ -33,5 +33,5 @@ void main(){
         color *= 1.2;
     }
 
-	gl_FragColor = vec4(color.rgb, 1.0);
+	gl_FragColor = vec4(color.rgb, min(sampled.a * 100.0, 1.0));
 }
diff --git a/core/assets/sounds/bioLoop.ogg b/core/assets/sounds/bioLoop.ogg
new file mode 100644
index 0000000000..8face415ae
Binary files /dev/null and b/core/assets/sounds/bioLoop.ogg differ
diff --git a/core/assets/sounds/blaster.ogg b/core/assets/sounds/blaster.ogg
new file mode 100644
index 0000000000..eaade08fd1
Binary files /dev/null and b/core/assets/sounds/blaster.ogg differ
diff --git a/core/assets/sounds/bolt.ogg b/core/assets/sounds/bolt.ogg
new file mode 100644
index 0000000000..7088f30da7
Binary files /dev/null and b/core/assets/sounds/bolt.ogg differ
diff --git a/core/assets/sounds/build.ogg b/core/assets/sounds/build.ogg
index 8235d41eb9..e39daef50b 100644
Binary files a/core/assets/sounds/build.ogg and b/core/assets/sounds/build.ogg differ
diff --git a/core/assets/sounds/cannon.ogg b/core/assets/sounds/cannon.ogg
new file mode 100644
index 0000000000..c8ee4264ff
Binary files /dev/null and b/core/assets/sounds/cannon.ogg differ
diff --git a/core/assets/sounds/drill.ogg b/core/assets/sounds/drill.ogg
index f21898b646..ea75df8198 100644
Binary files a/core/assets/sounds/drill.ogg and b/core/assets/sounds/drill.ogg differ
diff --git a/core/assets/sounds/drillCharge.ogg b/core/assets/sounds/drillCharge.ogg
new file mode 100644
index 0000000000..a22f5efa1c
Binary files /dev/null and b/core/assets/sounds/drillCharge.ogg differ
diff --git a/core/assets/sounds/drillImpact.ogg b/core/assets/sounds/drillImpact.ogg
new file mode 100644
index 0000000000..f14e992170
Binary files /dev/null and b/core/assets/sounds/drillImpact.ogg differ
diff --git a/core/assets/sounds/dullExplosion.ogg b/core/assets/sounds/dullExplosion.ogg
new file mode 100644
index 0000000000..37eb43c3a3
Binary files /dev/null and b/core/assets/sounds/dullExplosion.ogg differ
diff --git a/core/assets/sounds/electricHum.ogg b/core/assets/sounds/electricHum.ogg
new file mode 100644
index 0000000000..40a4a40761
Binary files /dev/null and b/core/assets/sounds/electricHum.ogg differ
diff --git a/core/assets/sounds/extractLoop.ogg b/core/assets/sounds/extractLoop.ogg
new file mode 100644
index 0000000000..a41369ed31
Binary files /dev/null and b/core/assets/sounds/extractLoop.ogg differ
diff --git a/core/assets/sounds/flux.ogg b/core/assets/sounds/flux.ogg
new file mode 100644
index 0000000000..39f64f3828
Binary files /dev/null and b/core/assets/sounds/flux.ogg differ
diff --git a/core/assets/sounds/glow.ogg b/core/assets/sounds/glow.ogg
new file mode 100644
index 0000000000..1d4764ead8
Binary files /dev/null and b/core/assets/sounds/glow.ogg differ
diff --git a/core/assets/sounds/largeCannon.ogg b/core/assets/sounds/largeCannon.ogg
new file mode 100644
index 0000000000..b5b7e3b81a
Binary files /dev/null and b/core/assets/sounds/largeCannon.ogg differ
diff --git a/core/assets/sounds/largeExplosion.ogg b/core/assets/sounds/largeExplosion.ogg
new file mode 100644
index 0000000000..35e62f0c30
Binary files /dev/null and b/core/assets/sounds/largeExplosion.ogg differ
diff --git a/core/assets/sounds/laserbeam.ogg b/core/assets/sounds/laserbeam.ogg
new file mode 100644
index 0000000000..30cfe4f9a4
Binary files /dev/null and b/core/assets/sounds/laserbeam.ogg differ
diff --git a/core/assets/sounds/malignShoot.ogg b/core/assets/sounds/malignShoot.ogg
new file mode 100644
index 0000000000..1debfea2ea
Binary files /dev/null and b/core/assets/sounds/malignShoot.ogg differ
diff --git a/core/assets/sounds/mediumCannon.ogg b/core/assets/sounds/mediumCannon.ogg
new file mode 100644
index 0000000000..84153aa7e5
Binary files /dev/null and b/core/assets/sounds/mediumCannon.ogg differ
diff --git a/core/assets/sounds/mineDeploy.ogg b/core/assets/sounds/mineDeploy.ogg
new file mode 100644
index 0000000000..69fb5d2f98
Binary files /dev/null and b/core/assets/sounds/mineDeploy.ogg differ
diff --git a/core/assets/sounds/missileLarge.ogg b/core/assets/sounds/missileLarge.ogg
new file mode 100644
index 0000000000..36ea32baf5
Binary files /dev/null and b/core/assets/sounds/missileLarge.ogg differ
diff --git a/core/assets/sounds/missileLaunch.ogg b/core/assets/sounds/missileLaunch.ogg
new file mode 100644
index 0000000000..f8a0765989
Binary files /dev/null and b/core/assets/sounds/missileLaunch.ogg differ
diff --git a/core/assets/sounds/missileSmall.ogg b/core/assets/sounds/missileSmall.ogg
new file mode 100644
index 0000000000..1ed8349395
Binary files /dev/null and b/core/assets/sounds/missileSmall.ogg differ
diff --git a/core/assets/sounds/missileTrail.ogg b/core/assets/sounds/missileTrail.ogg
new file mode 100644
index 0000000000..68ad990341
Binary files /dev/null and b/core/assets/sounds/missileTrail.ogg differ
diff --git a/core/assets/sounds/pew_.ogg b/core/assets/sounds/pew_.ogg
deleted file mode 100644
index 0c1df7f711..0000000000
Binary files a/core/assets/sounds/pew_.ogg and /dev/null differ
diff --git a/core/assets/sounds/plantBreak.ogg b/core/assets/sounds/plantBreak.ogg
new file mode 100644
index 0000000000..08d911b3e7
Binary files /dev/null and b/core/assets/sounds/plantBreak.ogg differ
diff --git a/core/assets/sounds/pulseBlast.ogg b/core/assets/sounds/pulseBlast.ogg
new file mode 100644
index 0000000000..9344179346
Binary files /dev/null and b/core/assets/sounds/pulseBlast.ogg differ
diff --git a/core/assets/sounds/rockBreak.ogg b/core/assets/sounds/rockBreak.ogg
new file mode 100644
index 0000000000..6a17a5edc2
Binary files /dev/null and b/core/assets/sounds/rockBreak.ogg differ
diff --git a/core/assets/sounds/shockBlast.ogg b/core/assets/sounds/shockBlast.ogg
new file mode 100644
index 0000000000..c4feef952f
Binary files /dev/null and b/core/assets/sounds/shockBlast.ogg differ
diff --git a/core/assets/sounds/shootAlt.ogg b/core/assets/sounds/shootAlt.ogg
new file mode 100644
index 0000000000..e2c35502f6
Binary files /dev/null and b/core/assets/sounds/shootAlt.ogg differ
diff --git a/core/assets/sounds/shootAltLong.ogg b/core/assets/sounds/shootAltLong.ogg
new file mode 100644
index 0000000000..f0936a6683
Binary files /dev/null and b/core/assets/sounds/shootAltLong.ogg differ
diff --git a/core/assets/sounds/shootSmite.ogg b/core/assets/sounds/shootSmite.ogg
new file mode 100644
index 0000000000..6a24bb748c
Binary files /dev/null and b/core/assets/sounds/shootSmite.ogg differ
diff --git a/core/assets/sounds/spellLoop.ogg b/core/assets/sounds/spellLoop.ogg
new file mode 100644
index 0000000000..b148ef3888
Binary files /dev/null and b/core/assets/sounds/spellLoop.ogg differ
diff --git a/core/assets/sounds/titanExplosion.ogg b/core/assets/sounds/titanExplosion.ogg
new file mode 100644
index 0000000000..57f0f8ca71
Binary files /dev/null and b/core/assets/sounds/titanExplosion.ogg differ
diff --git a/core/assets/sounds/torch.ogg b/core/assets/sounds/torch.ogg
new file mode 100644
index 0000000000..cd59e9f7b8
Binary files /dev/null and b/core/assets/sounds/torch.ogg differ
diff --git a/core/assets/sounds/ui/chatMessage.ogg b/core/assets/sounds/ui/chatMessage.ogg
new file mode 100644
index 0000000000..4d7e07ab4d
Binary files /dev/null and b/core/assets/sounds/ui/chatMessage.ogg differ
diff --git a/core/assets/sounds/ui/press.ogg b/core/assets/sounds/ui/press.ogg
index 7085dc00a0..419cd38847 100644
Binary files a/core/assets/sounds/ui/press.ogg and b/core/assets/sounds/ui/press.ogg differ
diff --git a/core/assets/sounds/wind3.ogg b/core/assets/sounds/wind3.ogg
new file mode 100644
index 0000000000..315edc4146
Binary files /dev/null and b/core/assets/sounds/wind3.ogg differ
diff --git a/core/assets/sounds/windowHide.ogg b/core/assets/sounds/windowHide.ogg
deleted file mode 100644
index 9039d4e3b4..0000000000
Binary files a/core/assets/sounds/windowHide.ogg and /dev/null differ
diff --git a/core/assets/sprites/caustics.png b/core/assets/sprites/caustics.png
new file mode 100644
index 0000000000..69b344adcc
Binary files /dev/null and b/core/assets/sprites/caustics.png differ
diff --git a/core/assets/sprites/clouds.png b/core/assets/sprites/clouds.png
new file mode 100644
index 0000000000..adcf7a97db
Binary files /dev/null and b/core/assets/sprites/clouds.png differ
diff --git a/core/assets/sprites/distortAlpha.png b/core/assets/sprites/distortAlpha.png
new file mode 100644
index 0000000000..06810a4d71
Binary files /dev/null and b/core/assets/sprites/distortAlpha.png differ
diff --git a/core/assets/sprites/planets/erekir.png b/core/assets/sprites/planets/erekir.png
new file mode 100644
index 0000000000..f3e887205a
Binary files /dev/null and b/core/assets/sprites/planets/erekir.png differ
diff --git a/core/assets/sprites/planets/serpulo.png b/core/assets/sprites/planets/serpulo.png
new file mode 100644
index 0000000000..b90097673e
Binary files /dev/null and b/core/assets/sprites/planets/serpulo.png differ
diff --git a/core/assets/sprites/rays.png b/core/assets/sprites/rays.png
new file mode 100644
index 0000000000..28e281c510
Binary files /dev/null and b/core/assets/sprites/rays.png differ
diff --git a/core/build.gradle b/core/build.gradle
index caba473d6c..f7f291ef1a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1 +1,2 @@
 sourceSets.main.java.srcDirs = ["src/", "$buildDir/generated/sources/annotationProcessor/java/main"]
+sourceSets.main.kotlin.srcDirs = ["src/"]
\ No newline at end of file
diff --git a/core/convert_sounds.sh b/core/convert_sounds.sh
deleted file mode 100755
index 02db793811..0000000000
--- a/core/convert_sounds.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#convert from stereo to mono
-cd assets/sounds/
-for i in *.ogg; do
-  echo $i
-  ffmpeg -i "$i" -ac 1 "OUT_$i"
-done
-
-find . -type f ! -name "OUT_*" -delete
-
-for file in OUT_*; do mv "$file" "${file#OUT_}"; done;
-
-cd ../../
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
index 978361898a..3e2fbca7df 100644
--- a/core/src/mindustry/ClientLauncher.java
+++ b/core/src/mindustry/ClientLauncher.java
@@ -4,11 +4,11 @@ import arc.*;
 import arc.assets.*;
 import arc.assets.loaders.*;
 import arc.audio.*;
+import arc.files.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
-import arc.util.async.*;
 import mindustry.ai.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
@@ -18,7 +18,7 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.maps.*;
 import mindustry.mod.*;
-import mindustry.net.Net;
+import mindustry.net.*;
 import mindustry.ui.*;
 
 import static arc.Core.*;
@@ -27,13 +27,20 @@ import static mindustry.Vars.*;
 public abstract class ClientLauncher extends ApplicationCore implements Platform{
     private static final int loadingFPS = 20;
 
-    private long lastTime;
+    private long nextFrame;
     private long beginTime;
+    private long lastTargetFps = -1;
     private boolean finished = false;
     private LoadRenderer loader;
 
     @Override
     public void setup(){
+        String dataDir = System.getProperty("mindustry.data.dir", OS.env("MINDUSTRY_DATA_DIR"));
+        if(dataDir != null){
+            Core.settings.setDataDirectory(files.absolute(dataDir));
+        }
+
+        checkLaunch();
         loadLogger();
 
         loader = new LoadRenderer();
@@ -41,30 +48,101 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
         loadFileLogger();
         platform = this;
+        maxTextureSize = Gl.getInt(Gl.maxTextureSize);
         beginTime = Time.millis();
 
         //debug GL information
         Log.info("[GL] Version: @", graphics.getGLVersion());
-        Log.info("[GL] Max texture size: @", Gl.getInt(Gl.maxTextureSize));
+        Log.info("[GL] Max texture size: @", maxTextureSize);
         Log.info("[GL] Using @ context.", gl30 != null ? "OpenGL 3" : "OpenGL 2");
-        Log.info("[JAVA] Version: @", System.getProperty("java.version"));
+        if(NvGpuInfo.hasMemoryInfo()){
+            Log.info("[GL] Total available VRAM: @mb", NvGpuInfo.getMaxMemoryKB()/1024);
+        }
+        if(maxTextureSize < 4096) Log.warn("[GL] Your maximum texture size is below the recommended minimum of 4096. This will cause severe performance issues.");
+        Log.info("[JAVA] Version: @", OS.javaVersion);
+        if(Core.app.isAndroid()){
+            Log.info("[ANDROID] API level: @", Core.app.getVersion());
+        }
+        long ram = Runtime.getRuntime().maxMemory();
+        boolean gb = ram >= 1024 * 1024 * 1024;
+        if(!OS.isIos){
+            Log.info("[RAM] Available: @ @", Strings.fixed(gb ? ram / 1024f / 1024 / 1024f : ram / 1024f / 1024f, 1), gb ? "GB" : "MB");
+        }
 
         Time.setDeltaProvider(() -> {
             float result = Core.graphics.getDeltaTime() * 60f;
-            return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Mathf.clamp(result, 0.0001f, 60f / 10f);
+            return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Mathf.clamp(result, 0.0001f, maxDeltaClient);
         });
 
-        batch = new SortedSpriteBatch();
+        UI.loadColors();
+        batch = new SpriteBatch();
         assets = new AssetManager();
         assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
 
         tree = new FileTree();
-        assets.setLoader(Sound.class, new SoundLoader(tree));
-        assets.setLoader(Music.class, new MusicLoader(tree));
+        assets.setLoader(Sound.class, new SoundLoader(tree){
+            @Override
+            public void loadAsync(AssetManager manager, String fileName, Fi file, SoundParameter parameter){
+
+            }
+
+            @Override
+            public Sound loadSync(AssetManager manager, String fileName, Fi file, SoundParameter parameter){
+                if(parameter != null && parameter.sound != null){
+                    mainExecutor.submit(() -> parameter.sound.load(file));
+
+                    return parameter.sound;
+                }else{
+                    Sound sound = new Sound();
+
+                    mainExecutor.submit(() -> {
+                        try{
+                            sound.load(file);
+                        }catch(Throwable t){
+                            Log.err("Error loading sound: " + file, t);
+                        }
+                    });
+
+                    return sound;
+                }
+            }
+        });
+        assets.setLoader(Music.class, new MusicLoader(tree){
+            @Override
+            public void loadAsync(AssetManager manager, String fileName, Fi file, MusicParameter parameter){}
+
+            @Override
+            public Music loadSync(AssetManager manager, String fileName, Fi file, MusicParameter parameter){
+                if(parameter != null && parameter.music != null){
+                    mainExecutor.submit(() -> {
+                        try{
+                            parameter.music.load(file);
+                        }catch(Throwable t){
+                            Log.err("Error loading music: " + file, t);
+                        }
+                    });
+
+                    return parameter.music;
+                }else{
+                    Music music = new Music();
+
+                    mainExecutor.submit(() -> {
+                        try{
+                            music.load(file);
+                        }catch(Throwable t){
+                            Log.err("Error loading music: " + file, t);
+                        }
+                    });
+
+                    return music;
+                }
+            }
+        });
 
         assets.load("sprites/error.png", Texture.class);
         atlas = TextureAtlas.blankAtlas();
         Vars.net = new Net(platform.getNet());
+        MapPreviewLoader.setupLoaders();
         mods = new Mods();
         schematics = new Schematics();
 
@@ -75,11 +153,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
         Fonts.loadDefaultFont();
 
         //load fallback atlas if max texture size is below 4096
-        assets.load(new AssetDescriptor<>(Gl.getInt(Gl.maxTextureSize) >= 4096  ? "sprites/sprites.atlas" : "sprites/fallback/sprites.atlas", TextureAtlas.class)).loaded = t -> {
-            atlas = (TextureAtlas)t;
-            Fonts.mergeFontAtlas(atlas);
-        };
-
+        assets.load(new AssetDescriptor<>(maxTextureSize >= 4096 ? "sprites/sprites.aatls" : "sprites/fallback/sprites.aatls", TextureAtlas.class)).loaded = t -> atlas = t;
         assets.loadRun("maps", Map.class, () -> maps.loadPreviews());
 
         Musics.load();
@@ -93,6 +167,9 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
             content.createModContent();
         });
 
+        assets.load(mods);
+        assets.loadRun("mergeUI", PixmapPacker.class, () -> {}, () -> Fonts.mergeFontAtlas(atlas));
+
         add(logic = new Logic());
         add(control = new Control());
         add(renderer = new Renderer());
@@ -100,7 +177,6 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
         add(netServer = new NetServer());
         add(netClient = new NetClient());
 
-        assets.load(mods);
         assets.load(schematics);
 
         assets.loadRun("contentinit", ContentLoader.class, () -> content.init(), () -> content.load());
@@ -130,6 +206,18 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
     @Override
     public void update(){
+        int targetfps = Core.settings.getInt("fpscap", 120);
+        boolean changed = lastTargetFps != targetfps && lastTargetFps != -1;
+        boolean limitFps = targetfps > 0 && targetfps <= 240;
+
+        lastTargetFps = targetfps;
+
+        if(limitFps && !changed){
+            nextFrame += (1000 * 1000000) / targetfps;
+        }else{
+            nextFrame = Time.nanos();
+        }
+
         if(!finished){
             if(loader != null){
                 loader.draw();
@@ -137,15 +225,21 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
             if(assets.update(1000 / loadingFPS)){
                 loader.dispose();
                 loader = null;
-                Log.info("Total time to load: @", Time.timeSinceMillis(beginTime));
+                Log.info("Total time to load: @ms", Time.timeSinceMillis(beginTime));
                 for(ApplicationListener listener : modules){
                     listener.init();
                 }
                 mods.eachClass(Mod::init);
                 finished = true;
                 Events.fire(new ClientLoadEvent());
+                clientLoaded = true;
                 super.resize(graphics.getWidth(), graphics.getHeight());
-                app.post(() -> app.post(() -> app.post(() -> app.post(() -> super.resize(graphics.getWidth(), graphics.getHeight())))));
+                app.post(() -> app.post(() -> app.post(() -> app.post(() -> {
+                    super.resize(graphics.getWidth(), graphics.getHeight());
+
+                    //mark initialization as complete
+                    finishLaunch();
+                }))));
             }
         }else{
             asyncCore.begin();
@@ -155,21 +249,24 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
             asyncCore.end();
         }
 
-        int targetfps = Core.settings.getInt("fpscap", 120);
-
-        if(targetfps > 0 && targetfps <= 240){
-            long target = (1000 * 1000000) / targetfps; //target in nanos
-            long elapsed = Time.timeSinceNanos(lastTime);
-            if(elapsed < target){
-                Threads.sleep((target - elapsed) / 1000000, (int)((target - elapsed) % 1000000));
+        if(limitFps){
+            long current = Time.nanos();
+            if(nextFrame > current){
+                long toSleep = nextFrame - current;
+                Threads.sleep(toSleep / 1000000, (int)(toSleep % 1000000));
             }
         }
+    }
 
-        lastTime = Time.nanos();
+    @Override
+    public void exit(){
+        //on graceful exit, finish the launch normally.
+        Vars.finishLaunch();
     }
 
     @Override
     public void init(){
+        nextFrame = Time.nanos();
         setup();
     }
 
@@ -182,6 +279,11 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
     @Override
     public void pause(){
+        //when the user tabs out on mobile, the exit() event doesn't fire reliably - in that case, just assume they're about to kill the app
+        //this isn't 100% reliable but it should work for most cases
+        if(mobile){
+            Vars.finishLaunch();
+        }
         if(finished){
             super.pause();
         }
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index d8928a434e..eacdd4bd2d 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -11,37 +11,52 @@ import arc.util.Log.*;
 import mindustry.ai.*;
 import mindustry.async.*;
 import mindustry.core.*;
+import mindustry.ctype.*;
+import mindustry.editor.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.input.*;
 import mindustry.io.*;
 import mindustry.logic.*;
 import mindustry.maps.Map;
 import mindustry.maps.*;
 import mindustry.mod.*;
-import mindustry.net.Net;
 import mindustry.net.*;
+import mindustry.service.*;
+import mindustry.ui.dialogs.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
+import mindustry.world.meta.*;
 
 import java.io.*;
 import java.nio.charset.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 import static arc.Core.*;
 
 public class Vars implements Loadable{
+    /** Whether the game failed to launch last time. */
+    public static boolean failedToLaunch = false;
     /** Whether to load locales.*/
     public static boolean loadLocales = true;
     /** Whether the logger is loaded. */
     public static boolean loadedLogger = false, loadedFileLogger = false;
-    /** Whether to enable various experimental features (e.g. cliffs) */
-    public static boolean experimental = false;
+    /** Name of current Steam player. */
+    public static String steamPlayerName = "";
+    /** If true, the BE server list is always used. */
+    public static boolean forceBeServers = false;
+    /** Default accessible content types used for player-selectable icons. */
+    public static final ContentType[] defaultContentIcons = {ContentType.item, ContentType.liquid, ContentType.block, ContentType.unit};
+    /** Default rule environment. */
+    public static final int defaultEnv = Env.terrestrial | Env.spores | Env.groundOil | Env.groundWater | Env.oxygen;
+    /** Wall darkness radius. */
+    public static final int darkRadius = 4;
     /** Maximum extra padding around deployment schematics. */
     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 ="bXNjaA";
     /** IO buffer size. */
@@ -50,20 +65,18 @@ public class Vars implements Loadable{
     public static final Charset charset = Charset.forName("UTF-8");
     /** main application name, capitalized */
     public static final String appName = "Mindustry";
-    /** URL for itch.io donations. */
-    public static final String donationURL = "https://anuke.itch.io/mindustry/purchase";
+    /** Github API URL. */
+    public static final String ghApi = "https://api.github.com";
     /** URL for discord invite. */
     public static final String discordURL = "https://discord.gg/mindustry";
-    /** URL for sending crash reports to */
-    public static final String crashReportURL = "http://192.99.169.18/report";
     /** URL the links to the wiki's modding guide.*/
     public static final String modGuideURL = "https://mindustrygame.github.io/wiki/modding/1-modding/";
-    /** URL to the JSON file containing all the global, public servers. Not queried in BE. */
-    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";
+    /** URLs to the JSON file containing all the BE servers. Only queried in BE. */
+    public static final String[] serverJsonBeURLs = {"https://raw.githubusercontent.com/Anuken/MindustryServerList/master/servers_be.json", "https://cdn.jsdelivr.net/gh/anuken/mindustryserverlist/servers_be.json"};
+    /** URLs to the JSON file containing all the stable servers.  */
+    public static final String[] serverJsonURLs = {"https://raw.githubusercontent.com/Anuken/MindustryServerList/master/servers_v8.json", "https://cdn.jsdelivr.net/gh/anuken/mindustryserverlist/servers_v8.json"};
+    /** URLs to the JSON files containing the list of mods.  */
+    public static final String[] modJsonURLs = {"https://raw.githubusercontent.com/Anuken/MindustryMods/master/mods.json", "https://cdn.jsdelivr.net/gh/anuken/mindustrymods/mods.json"};
     /** URL of the github issue report template.*/
     public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?labels=bug&template=bug_report.md";
     /** list of built-in servers.*/
@@ -78,12 +91,12 @@ public class Vars implements Loadable{
     public static final int maxNameLength = 40;
     /** displayed item size when ingame. */
     public static final float itemSize = 5f;
-    /** units outside of this bound will die instantly */
-    public static final float finalWorldBounds = 500;
-    /** mining range for manual miners */
-    public static final float miningRange = 70f;
-    /** range for building */
+    /** units outside this bound will die instantly */
+    public static final float finalWorldBounds = 250;
+    /** default range for building */
     public static final float buildingRange = 220f;
+    /** scaling for unit circle collider radius, based on hitbox size */
+    public static final float unitCollisionRadiusScale = 0.6f;
     /** range for moving items */
     public static final float itemTransferRange = 220f;
     /** range for moving items for logic units */
@@ -92,18 +105,20 @@ public class Vars implements Loadable{
     public static final float turnDuration = 2 * Time.toMinutes;
     /** chance of an invasion per turn, 1 = 100% */
     public static final float baseInvasionChance = 1f / 100f;
-    /** how many turns have to pass before invasions start */
-    public static final int invasionGracePeriod = 20;
+    /** how many minutes have to pass before invasions in a *captured* sector start */
+    public static final float invasionGracePeriod = 20;
     /** min armor fraction damage; e.g. 0.05 = at least 5% damage */
     public static final float minArmorDamage = 0.1f;
-    /** launch animation duration */
-    public static final float launchDuration = 140f;
+    /** @deprecated see {@link CoreBlock#landDuration} instead! */
+    public static final @Deprecated float coreLandDuration = 160f;
     /** 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;
+    /** icon sizes for UI */
+    public static final float iconXLarge = 8*6f, iconLarge = 8*5f, iconMed = 8*4f, iconSmall = 8*3f;
+    /** macbook screen notch height */
+    public static float macNotchHeight = 32f;
     /** for map generator dialog */
     public static boolean updateEditorOnChange = false;
     /** all choosable player colors in join/host dialog */
@@ -125,14 +140,41 @@ public class Vars implements Loadable{
         Color.valueOf("4b5ef1"),
         Color.valueOf("2cabfe"),
     };
+    /** Icons available to the user for customization in certain dialogs. */
+    public static final String[] accessibleIcons = {
+    "effect", "power", "logic", "units", "liquid", "production", "defense", "turret", "distribution", "crafting",
+    "settings", "cancel", "zoom", "ok", "star", "home", "pencil", "up", "down", "left", "right",
+    "hammer", "warning", "tree", "admin", "map", "modePvp", "terrain",
+    "modeSurvival", "commandRally", "commandAttack",
+    };
+    /** maximum TCP packet size */
+    public static final int maxTcpSize = 1100;
     /** default server port */
     public static final int port = 6567;
     /** multicast discovery port.*/
     public static final int multicastPort = 20151;
+    /** Maximum char length of mod subtitles in browser/viewer. */
+    public static final int maxModSubtitleLength = 40;
     /** multicast group for discovery.*/
     public static final String multicastGroup = "227.2.7.7";
+    /** Maximum delta time. If the actual delta time (*60) between frames is higher than this number, the game will start to slow down. */
+    public static float maxDeltaClient = 6f, maxDeltaServer = 10f;
+    /** whether the graphical game client has loaded */
+    public static boolean clientLoaded = false;
+    /** max GL texture size */
+    public static int maxTextureSize = 2048;
+    /** Maximum schematic size.*/
+    public static int maxSchematicSize = 64;
+    /** Whether to show sector info upon landing. */
+    public static boolean showSectorLandInfo = true;
+    /** Whether to check for memory use before taking screenshots. */
+    public static boolean checkScreenshotMemory = true;
+    /** Whether to prompt the user to confirm exiting. */
+    public static boolean confirmExit = true;
     /** if true, UI is not drawn */
     public static boolean disableUI;
+    /** if true, most autosaving is disabled. internal use only! */
+    public static boolean disableSave;
     /** if true, game is set up in mobile mode, even on desktop. used for debugging */
     public static boolean testMobile;
     /** whether the game is running on a mobile device */
@@ -145,8 +187,6 @@ public class Vars implements Loadable{
     public static boolean headless;
     /** whether steam is enabled for this game */
     public static boolean steam;
-    /** whether typing into the console is enabled - developers only */
-    public static boolean enableConsole = false;
     /** whether to clear sector saves when landing */
     public static boolean clearSectors = false;
     /** whether any light rendering is enabled */
@@ -172,18 +212,27 @@ public class Vars implements Loadable{
     public static Fi schematicDirectory;
     /** data subdirectory used for bleeding edge build versions */
     public static Fi bebuildDirectory;
+    /** file used to store launch ID */
+    public static Fi launchIDFile;
     /** empty map, indicates no current map */
     public static Map emptyMap;
+    /** empty tile for payloads */
+    public static Tile emptyTile;
     /** map file extension */
     public static final String mapExtension = "msav";
     /** save file extension */
     public static final String saveExtension = "msav";
     /** schematic file extension */
     public static final String schematicExtension = "msch";
+    /** path to the java executable */
+    public static String javaPath;
 
     /** list of all locales that can be switched to */
     public static Locale[] locales;
 
+    //the main executor will only have at most [cores] number of threads active
+    public static ExecutorService mainExecutor = Threads.executor("Main Executor", OS.cores);
+
     public static FileTree tree = new FileTree();
     public static Net net;
     public static ContentLoader content;
@@ -196,7 +245,9 @@ public class Vars implements Loadable{
     public static BeControl becontrol;
     public static AsyncCore asyncCore;
     public static BaseRegistry bases;
-    public static GlobalConstants constants;
+    public static GlobalVars logicVars;
+    public static MapEditor editor;
+    public static GameService service = new GameService();
 
     public static Universe universe;
     public static World world;
@@ -204,6 +255,8 @@ public class Vars implements Loadable{
     public static WaveSpawner spawner;
     public static BlockIndexer indexer;
     public static Pathfinder pathfinder;
+    public static ControlPathfinder controlPath;
+    public static FogControl fogControl;
 
     public static Control control;
     public static Logic logic;
@@ -236,11 +289,16 @@ public class Vars implements Loadable{
                 }
             }
 
-            Arrays.sort(locales, Structs.comparing(l -> l.getDisplayName(l), String.CASE_INSENSITIVE_ORDER));
-            locales = Seq.with(locales).and(new Locale("router")).toArray(Locale.class);
+            Arrays.sort(locales, Structs.comparing(LanguageDialog::getDisplayName, String.CASE_INSENSITIVE_ORDER));
+            locales = Seq.with(locales).add(new Locale("router")).toArray(Locale.class);
         }
 
         Version.init();
+        CacheLayer.init();
+
+        if(!headless){
+            Log.info("[Mindustry] Version: @", Version.buildString());
+        }
 
         dataDirectory = settings.getDataDirectory();
         screenshotDirectory = dataDirectory.child("screenshots/");
@@ -252,7 +310,6 @@ public class Vars implements Loadable{
         schematicDirectory = dataDirectory.child("schematics/");
         bebuildDirectory = dataDirectory.child("be_builds/");
         emptyMap = new Map(new StringMap());
-        emptyTile = null;
 
         if(tree == null) tree = new FileTree();
         if(mods == null) mods = new Mods();
@@ -264,13 +321,21 @@ public class Vars implements Loadable{
         universe = new Universe();
         becontrol = new BeControl();
         asyncCore = new AsyncCore();
+        if(!headless) editor = new MapEditor();
 
         maps = new Maps();
         spawner = new WaveSpawner();
         indexer = new BlockIndexer();
         pathfinder = new Pathfinder();
+        controlPath = new ControlPathfinder();
+        fogControl = new FogControl();
         bases = new BaseRegistry();
-        constants = new GlobalConstants();
+        logicVars = new GlobalVars();
+        javaPath =
+            new Fi(OS.prop("java.home")).child("bin/java").exists() ? new Fi(OS.prop("java.home")).child("bin/java").absolutePath() :
+            Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() : // Unix
+            Core.files.local("jre/bin/java.exe").exists() ? Core.files.local("jre/bin/java.exe").absolutePath() : // Windows
+            "java";
 
         state = new GameState();
 
@@ -280,10 +345,35 @@ public class Vars implements Loadable{
 
         modDirectory.mkdirs();
 
+        Events.on(ContentInitEvent.class, e -> {
+            emptyTile = new Tile(Short.MAX_VALUE - 20, Short.MAX_VALUE - 20);
+        });
+
         mods.load();
         maps.load();
     }
 
+    /** Checks if a launch failure occurred.
+     * If this is the case, failedToLaunch is set to true. */
+    public static void checkLaunch(){
+        settings.setAppName(appName);
+        launchIDFile = settings.getDataDirectory().child("launchid.dat");
+
+        if(launchIDFile.exists()){
+            failedToLaunch = true;
+        }else{
+            failedToLaunch = false;
+            launchIDFile.writeString("go away");
+        }
+    }
+
+    /** Cleans up after a successful launch. */
+    public static void finishLaunch(){
+        if(launchIDFile != null){
+            launchIDFile.delete();
+        }
+    }
+
     public static void loadLogger(){
         if(loadedLogger) return;
 
@@ -292,26 +382,28 @@ public class Vars implements Loadable{
 
         Seq<String> logBuffer = new Seq<>();
         Log.logger = (level, text) -> {
-            String result = text;
-            String rawText = Log.format(stags[level.ordinal()] + "&fr " + text);
-            System.out.println(rawText);
+            synchronized(logBuffer){
+                String result = text;
+                String rawText = Log.format(stags[level.ordinal()] + "&fr " + text);
+                System.out.println(rawText);
 
-            result = tags[level.ordinal()] + " " + result;
+                result = tags[level.ordinal()] + " " + result;
 
-            if(!headless && (ui == null || ui.scriptfrag == null)){
-                logBuffer.add(result);
-            }else if(!headless){
-                if(!OS.isWindows){
-                    for(String code : ColorCodes.values){
-                        result = result.replace(code, "");
+                if(!headless && (ui == null || ui.consolefrag == null)){
+                    logBuffer.add(result);
+                }else if(!headless){
+                    if(!OS.isWindows){
+                        for(String code : ColorCodes.values){
+                            result = result.replace(code, "");
+                        }
                     }
-                }
 
-                ui.scriptfrag.addMessage(Log.removeColors(result));
+                    ui.consolefrag.addMessage(Log.removeColors(result));
+                }
             }
         };
 
-        Events.on(ClientLoadEvent.class, e -> logBuffer.each(ui.scriptfrag::addMessage));
+        Events.on(ClientLoadEvent.class, e -> logBuffer.each(ui.consolefrag::addMessage));
 
         loadedLogger = true;
     }
@@ -324,12 +416,11 @@ public class Vars implements Loadable{
         try{
             Writer writer = settings.getDataDirectory().child("last_log.txt").writer(false);
             LogHandler log = Log.logger;
-            //ignore it
             Log.logger = (level, text) -> {
                 log.log(level, text);
 
                 try{
-                    writer.write("[" + Character.toUpperCase(level.name().charAt(0)) +"] " + Log.removeColors(text) + "\n");
+                    writer.write("[" + Character.toUpperCase(level.name().charAt(0)) + "] " + Log.removeColors(text) + "\n");
                     writer.flush();
                 }catch(IOException e){
                     e.printStackTrace();
@@ -345,7 +436,7 @@ public class Vars implements Loadable{
     }
 
     public static void loadSettings(){
-        settings.setJson(JsonIO.json());
+        settings.setJson(JsonIO.json);
         settings.setAppName(appName);
 
         if(steam || (Version.modifier != null && Version.modifier.contains("steam"))){
@@ -357,7 +448,12 @@ public class Vars implements Loadable{
         settings.setAutosave(false);
         settings.load();
 
-        Scl.setProduct(settings.getInt("uiscale", 100) / 100f);
+        //https://github.com/Anuken/Mindustry/issues/8483
+        if(settings.getInt("uiscale") == 5){
+            settings.put("uiscale", 100);
+        }
+
+        Scl.setProduct(Math.max(settings.getInt("uiscale", 100), 25) / 100f);
 
         if(!loadLocales) return;
 
@@ -371,7 +467,7 @@ public class Vars implements Loadable{
             Log.info("NOTE: external translation bundle has been loaded.");
 
             if(!headless){
-                Time.run(10f, () -> ui.showInfo("Note: You have successfully loaded an external translation bundle."));
+                Time.run(10f, () -> ui.showInfo("Note: You have successfully loaded an external translation bundle.\n[accent]" + handle.absolutePath()));
             }
         }catch(Throwable e){
             //no external bundle found
@@ -397,8 +493,12 @@ public class Vars implements Loadable{
             Core.bundle = I18NBundle.createBundle(handle, locale);
 
             //router
-            if(locale.getDisplayName().equals("router")){
-                bundle.debug("router");
+            if(locale.toString().equals("router")){
+                I18NBundle defBundle = I18NBundle.createBundle(Core.files.internal("bundles/bundle"));
+                String router = Character.toString(Iconc.blockRouter);
+                for(String s : bundle.getKeys()){
+                    bundle.getProperties().put(s, Strings.stripColors(defBundle.get(s)).replaceAll("\\S", router));
+                }
             }
         }
     }
diff --git a/core/src/mindustry/ai/Astar.java b/core/src/mindustry/ai/Astar.java
index df50547d22..23241e65cf 100644
--- a/core/src/mindustry/ai/Astar.java
+++ b/core/src/mindustry/ai/Astar.java
@@ -6,6 +6,8 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.world.*;
 
+import java.util.*;
+
 import static mindustry.Vars.*;
 
 public class Astar{
@@ -13,18 +15,18 @@ public class Astar{
 
     private static final Seq<Tile> out = new Seq<>();
     private static final PQueue<Tile> queue = new PQueue<>(200 * 200 / 4, (a, b) -> 0);
-    private static final IntFloatMap costs = new IntFloatMap();
+    private static float[] costs;
     private static byte[][] rotations;
 
-    public static Seq<Tile> pathfind(Tile from, Tile to, TileHueristic th, Boolf<Tile> passable){
+    public static Seq<Tile> pathfind(Tile from, Tile to, TileHeuristic th, Boolf<Tile> passable){
         return pathfind(from.x, from.y, to.x, to.y, th, manhattan, passable);
     }
 
-    public static Seq<Tile> pathfind(int startX, int startY, int endX, int endY, TileHueristic th, Boolf<Tile> passable){
+    public static Seq<Tile> pathfind(int startX, int startY, int endX, int endY, TileHeuristic th, Boolf<Tile> passable){
         return pathfind(startX, startY, endX, endY, th, manhattan, passable);
     }
 
-    public static Seq<Tile> pathfind(int startX, int startY, int endX, int endY, TileHueristic th, DistanceHeuristic dh, Boolf<Tile> passable){
+    public static Seq<Tile> pathfind(int startX, int startY, int endX, int endY, TileHeuristic th, DistanceHeuristic dh, Boolf<Tile> passable){
         Tiles tiles = world.tiles;
 
         Tile start = tiles.getn(startX, startY);
@@ -32,9 +34,14 @@ public class Astar{
 
         GridBits closed = new GridBits(tiles.width, tiles.height);
 
-        costs.clear();
+        if(costs == null || costs.length != tiles.width * tiles.height){
+            costs = new float[tiles.width * tiles.height];
+        }
+
+        Arrays.fill(costs, 0);
+
         queue.clear();
-        queue.comparator = Structs.comparingFloat(a -> costs.get(a.pos(), 0f) + dh.cost(a.x, a.y, end.x, end.y));
+        queue.comparator = Structs.comparingFloat(a -> costs[a.array()] + dh.cost(a.x, a.y, end.x, end.y));
         queue.add(start);
         if(rotations == null || rotations.length != world.width() || rotations[0].length != world.height()){
             rotations = new byte[world.width()][world.height()];
@@ -43,7 +50,7 @@ public class Astar{
         boolean found = false;
         while(!queue.empty()){
             Tile next = queue.poll();
-            float baseCost = costs.get(next.pos(), 0f);
+            float baseCost = costs[next.array()];
             if(next == end){
                 found = true;
                 break;
@@ -58,7 +65,7 @@ public class Astar{
                         if(!closed.get(child.x, child.y)){
                             closed.set(child.x, child.y);
                             rotations[child.x][child.y] = child.relativeTo(next.x, next.y);
-                            costs.put(child.pos(), newCost);
+                            costs[child.array()] = newCost;
                             queue.add(child);
                         }
                     }
@@ -87,7 +94,7 @@ public class Astar{
         float cost(int x1, int y1, int x2, int y2);
     }
 
-    public interface TileHueristic{
+    public interface TileHeuristic{
         float cost(Tile tile);
 
         default float cost(Tile from, Tile tile){
diff --git a/core/src/mindustry/ai/BaseAI.java b/core/src/mindustry/ai/BaseBuilderAI.java
similarity index 58%
rename from core/src/mindustry/ai/BaseAI.java
rename to core/src/mindustry/ai/BaseBuilderAI.java
index 85e6656d28..e9126f6ca5 100644
--- a/core/src/mindustry/ai/BaseAI.java
+++ b/core/src/mindustry/ai/BaseBuilderAI.java
@@ -14,31 +14,28 @@ import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
-import mindustry.world.blocks.defense.*;
-import mindustry.world.blocks.distribution.*;
+import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.blocks.storage.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static mindustry.Vars.*;
 
-public class BaseAI{
+public class BaseBuilderAI{
     private static final Vec2 axis = new Vec2(), rotator = new Vec2();
-    private static final float correctPercent = 0.5f;
-    private static final int attempts = 4;
+    private static final int attempts = 6, coreUnitMultiplier = 2;
     private static final float emptyChance = 0.01f;
     private static final int timerStep = 0, timerSpawn = 1, timerRefreshPath = 2;
+    private static final float placeIntervalMin = 12f, placeIntervalMax = 2f;
     private static final int pathStep = 50;
     private static final Seq<Tile> tmpTiles = new Seq<>();
 
     private static int correct = 0, incorrect = 0;
-    private static boolean anyDrills;
 
-    private int lastX, lastY, lastW, lastH;
-    private boolean triedWalls, foundPath;
+    private boolean foundPath;
 
-    TeamData data;
-    Interval timer = new Interval(4);
+    final TeamData data;
+    final Interval timer = new Interval(4);
 
     IntSet path = new IntSet();
     IntSet calcPath = new IntSet();
@@ -47,17 +44,26 @@ public class BaseAI{
     int calcCount = 0;
     int totalCalcs = 0;
 
-    public BaseAI(TeamData data){
+    public BaseBuilderAI(TeamData data){
         this.data = data;
     }
 
     public void update(){
-        if(data.team.rules().aiCoreSpawn && timer.get(timerSpawn, 60 * 2.5f) && data.hasCore()){
+
+        //fill cores.
+        if(data.team.cores().size > 0){
+            var core = data.team.cores().first();
+            for(Item item : content.items()){
+                core.items.set(item, core.getMaximumAccepted(item));
+            }
+        }
+
+        if(data.team.rules().aiCoreSpawn && timer.get(timerSpawn, 60 * 6f) && data.hasCore()){
             CoreBlock block = (CoreBlock)data.core().block;
-            int coreUnits = Groups.unit.count(u -> u.team == data.team && u.type == block.unitType);
+            int coreUnits = data.countType(block.unitType);
 
             //create AI core unit(s)
-            if(!state.isEditor() && coreUnits < data.cores.size){
+            if(!state.isEditor() && coreUnits < data.cores.size * coreUnitMultiplier){
                 Unit unit = block.unitType.create(data.team);
                 unit.set(data.cores.random());
                 unit.add();
@@ -88,61 +94,59 @@ public class BaseAI{
                     calculating = false;
                 }
             }else{
-                var field = pathfinder.getField(state.rules.waveTeam, Pathfinder.costGround, Pathfinder.fieldCore);
+                var field = pathfinder.getField(data.team, Pathfinder.costGround, Pathfinder.fieldCore);
 
-                int[][] weights = field.weights;
-                for(int i = 0; i < pathStep; i++){
-                    int minCost = Integer.MAX_VALUE;
-                    int cx = calcTile.x, cy = calcTile.y;
-                    boolean foundAny = false;
-                    for(Point2 p : Geometry.d4){
-                        int nx = cx + p.x, ny = cy + p.y;
+                if(field.hasCompleteWeights()){
+                    int[] weights = field.completeWeights;
+                    for(int i = 0; i < pathStep; i++){
+                        int minCost = Integer.MAX_VALUE;
+                        int cx = calcTile.x, cy = calcTile.y;
+                        boolean foundAny = false;
+                        for(Point2 p : Geometry.d4){
+                            int nx = cx + p.x, ny = cy + p.y, packed = world.packArray(nx, ny);
 
-                        Tile other = world.tile(nx, ny);
-                        if(other != null && weights[nx][ny] < minCost && weights[nx][ny] != -1){
-                            minCost = weights[nx][ny];
-                            calcTile = other;
-                            foundAny = true;
+                            Tile other = world.tile(nx, ny);
+                            if(other != null && weights[packed] < minCost && weights[packed] != -1){
+                                minCost = weights[packed];
+                                calcTile = other;
+                                foundAny = true;
+                            }
                         }
+
+                        //didn't find anything, break out of loop, this will trigger a clear later
+                        if(!foundAny){
+                            calcCount = Integer.MAX_VALUE;
+                            break;
+                        }
+
+                        calcPath.add(calcTile.pos());
+                        for(Point2 p : Geometry.d8){
+                            calcPath.add(Point2.pack(p.x + calcTile.x, p.y + calcTile.y));
+                        }
+
+                        //found the end.
+                        if(calcTile.build instanceof CoreBuild b && b.team != data.team){
+                            //clean up calculations and flush results
+                            calculating = false;
+                            calcCount = 0;
+                            path.clear();
+                            path.addAll(calcPath);
+                            calcPath.clear();
+                            calcTile = null;
+                            totalCalcs ++;
+                            foundPath = true;
+
+                            break;
+                        }
+
+                        calcCount ++;
                     }
-
-                    //didn't find anything, break out of loop, this will trigger a clear later
-                    if(!foundAny){
-                        calcCount = Integer.MAX_VALUE;
-                        break;
-                    }
-
-                    calcPath.add(calcTile.pos());
-                    for(Point2 p : Geometry.d8){
-                        calcPath.add(Point2.pack(p.x + calcTile.x, p.y + calcTile.y));
-                    }
-
-                    //found the end.
-                    if(calcTile.build instanceof CoreBuild b && b.team == state.rules.defaultTeam){
-                        //clean up calculations and flush results
-                        calculating = false;
-                        calcCount = 0;
-                        path.clear();
-                        path.addAll(calcPath);
-                        calcPath.clear();
-                        calcTile = null;
-                        totalCalcs ++;
-                        foundPath = true;
-
-                        break;
-                    }
-
-                    calcCount ++;
                 }
             }
         }
 
         //only schedule when there's something to build.
-        if(foundPath && data.blocks.isEmpty() && timer.get(timerStep, Mathf.lerp(20f, 4f, data.team.rules().aiTier))){
-            if(!triedWalls){
-                tryWalls();
-                triedWalls = true;
-            }
+        if((foundPath || !calculating) && data.plans.isEmpty() && timer.get(timerStep, Mathf.lerp(placeIntervalMin, placeIntervalMax, data.team.rules().buildAiTier))){
 
             for(int i = 0; i < attempts; i++){
                 int range = 150;
@@ -209,6 +213,16 @@ public class BaseAI{
             }
             Tile wtile = world.tile(realX, realY);
 
+            if(tile.block instanceof PayloadConveyor || tile.block instanceof PayloadBlock){
+                //near a building
+                for(Point2 point : Edges.getEdges(tile.block.size)){
+                    var t = world.build(tile.x + point.x, tile.y + point.y);
+                    if(t != null){
+                        return false;
+                    }
+                }
+            }
+
             //may intersect AI path
             tmpTiles.clear();
             if(tile.block.solid && wtile != null && wtile.getLinkedTilesAs(tile.block, tmpTiles).contains(t -> path.contains(t.pos()))){
@@ -218,7 +232,7 @@ public class BaseAI{
 
         //make sure at least X% of resource requirements are met
         correct = incorrect = 0;
-        anyDrills = false;
+        boolean anyDrills = false;
 
         if(part.required instanceof Item){
             for(Stile tile : result.tiles){
@@ -244,55 +258,9 @@ public class BaseAI{
 
         //queue it
         for(Stile tile : result.tiles){
-            data.blocks.add(new BlockPlan(cx + tile.x, cy + tile.y, tile.rotation, tile.block.id, tile.config));
+            data.plans.add(new BlockPlan(cx + tile.x, cy + tile.y, tile.rotation, tile.block, tile.config));
         }
 
-        lastX = cx - 1;
-        lastY = cy - 1;
-        lastW = result.width + 2;
-        lastH = result.height + 2;
-
-        triedWalls = false;
-
         return true;
     }
-
-    private void tryWalls(){
-        Block wall = Blocks.copperWall;
-        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++){
-                Tile tile = world.tile(wx, wy);
-
-                if(tile == null || !tile.block().alwaysReplace) continue;
-
-                boolean any = false;
-
-                for(Point2 p : Geometry.d8){
-                    if(Angles.angleDist(Angles.angle(p.x, p.y), spawn.angleTo(tile)) > 70){
-                        continue;
-                    }
-
-                    Tile o = world.tile(tile.x + p.x, tile.y + p.y);
-                    if(o != null && (o.block() instanceof PayloadAcceptor || o.block() instanceof PayloadConveyor)){
-                        break;
-                    }
-
-                    if(o != null && o.team() == data.team && !(o.block() instanceof Wall)){
-                        any = true;
-                        break;
-                    }
-                }
-
-                tmpTiles.clear();
-                if(any && Build.validPlace(wall, data.team, tile.x, tile.y, 0) && !tile.getLinkedTilesAs(wall, tmpTiles).contains(t -> path.contains(t.pos()))){
-                    data.blocks.add(new BlockPlan(tile.x, tile.y, (short)0, wall.id, null));
-                }
-            }
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/ai/BaseRegistry.java b/core/src/mindustry/ai/BaseRegistry.java
index 735e9162ef..d37f7b8826 100644
--- a/core/src/mindustry/ai/BaseRegistry.java
+++ b/core/src/mindustry/ai/BaseRegistry.java
@@ -39,8 +39,8 @@ public class BaseRegistry{
 
         //load ore types and corresponding items
         for(Block block : content.blocks()){
-            if(block instanceof OreBlock && block.asFloor().itemDrop != null){
-                ores.put(block.asFloor().itemDrop, (OreBlock)block);
+            if(block instanceof OreBlock ore && ore.itemDrop != null && !ore.wallOre && !ores.containsKey(ore.itemDrop)){
+                ores.put(ore.itemDrop, ore);
             }else if(block.isFloor() && block.asFloor().itemDrop != null && !oreFloors.containsKey(block.asFloor().itemDrop)){
                 oreFloors.put(block.asFloor().itemDrop, block.asFloor());
             }
diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
index 683d04cc78..7f944a3eb0 100644
--- a/core/src/mindustry/ai/BlockIndexer.java
+++ b/core/src/mindustry/ai/BlockIndexer.java
@@ -4,262 +4,374 @@ import arc.*;
 import arc.func.*;
 import arc.math.*;
 import arc.math.geom.*;
-import arc.struct.EnumSet;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
-import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
-import mindustry.world.blocks.*;
 import mindustry.world.meta.*;
 
-import java.util.*;
-
 import static mindustry.Vars.*;
 
 /** Class used for indexing special target blocks for AI. */
 public class BlockIndexer{
     /** Size of one quadrant. */
-    private static final int quadrantSize = 16;
+    private static final int quadrantSize = 20;
+    private static final Rect rect = new Rect();
+    private static boolean returnBool = false;
 
-    /** Set of all ores that are being scanned. */
-    private final ObjectSet<Item> scanOres = new ObjectSet<>();
-    private final IntSet intSet = new IntSet();
-    private final ObjectSet<Item> itemSet = new ObjectSet<>();
-    /** Stores all ore quadtrants on the map. */
-    private ObjectMap<Item, TileArray> ores = new ObjectMap<>();
-    /** 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;
+    private int quadWidth, quadHeight;
+
+    /** Stores all ore quadrants on the map. Maps ID to qX to qY to a list of tiles with that ore. */
+    private IntSeq[][][] ores;
     /** Stores all damaged tile entities by team. */
-    private ObjectSet<Building>[] damagedTiles = new ObjectSet[Team.all.length];
+    private Seq<Building>[] damagedTiles = new Seq[Team.all.length];
     /** All ores available on this map. */
-    private ObjectSet<Item> allOres = new ObjectSet<>();
+    private ObjectIntMap<Item> allOres = new ObjectIntMap<>();
     /** Stores teams that are present here as tiles. */
     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. */
-    private int[] unitCaps = new int[Team.all.length];
-    /** Maps tile positions to their last known tile index data. */
-    private IntMap<TileIndex> typeMap = new IntMap<>();
-    /** Empty set used for returning. */
-    private TileArray emptySet = new TileArray();
+    private Seq<Building>[][] flagMap = new Seq[Team.all.length][BlockFlag.all.length];
+    /** Counts whether a certain floor is present in the world upon load. */
+    private boolean[] blocksPresent;
     /** Array used for returning and reusing. */
-    private Seq<Tile> returnArray = new Seq<>();
-    /** Array used for returning and reusing. */
-    private Seq<Building> breturnArray = new Seq<>();
+    private Seq<Building> breturnArray = new Seq<>(Building.class);
 
     public BlockIndexer(){
+        clearFlags();
+
+        Events.on(TilePreChangeEvent.class, event -> {
+            removeIndex(event.tile);
+        });
+
         Events.on(TileChangeEvent.class, event -> {
-            updateIndices(event.tile);
+            addIndex(event.tile);
         });
 
         Events.on(WorldLoadEvent.class, event -> {
-            scanOres.clear();
-            scanOres.addAll(Item.getAllOres());
-            damagedTiles = new ObjectSet[Team.all.length];
-            flagMap = new TileArray[Team.all.length][BlockFlag.all.length];
-            unitCaps = new int[Team.all.length];
+            damagedTiles = new Seq[Team.all.length];
+            flagMap = new Seq[Team.all.length][BlockFlag.all.length];
             activeTeams = new Seq<>(Team.class);
 
-            for(int i = 0; i < flagMap.length; i++){
-                for(int j = 0; j < BlockFlag.all.length; j++){
-                    flagMap[i][j] = new TileArray();
+            clearFlags();
+
+            allOres.clear();
+            ores = new IntSeq[content.items().size][][];
+            quadWidth = Mathf.ceil(world.width() / (float)quadrantSize);
+            quadHeight = Mathf.ceil(world.height() / (float)quadrantSize);
+            blocksPresent = new boolean[content.blocks().size];
+
+            //so WorldLoadEvent gets called twice sometimes... ugh
+            for(Team team : Team.all){
+                var data = state.teams.get(team);
+                if(data != null){
+                    if(data.buildingTree != null) data.buildingTree.clear();
+                    if(data.turretTree != null) data.turretTree.clear();
                 }
             }
 
-            typeMap.clear();
-            allOres.clear();
-            ores = null;
-
-            //create bitset for each team type that contains each quadrant
-            structQuadrants = new GridBits[Team.all.length];
-
             for(Tile tile : world.tiles){
                 process(tile);
 
-                if(tile.build != null && tile.build.damaged()){
-                    notifyTileDamaged(tile.build);
-                }
+                var drop = tile.drop();
 
-                if(tile.drop() != null) allOres.add(tile.drop());
-            }
+                if(drop != null){
+                    int qx = (tile.x / quadrantSize);
+                    int qy = (tile.y / quadrantSize);
 
-            for(int x = 0; x < quadWidth(); x++){
-                for(int y = 0; y < quadHeight(); y++){
-                    updateQuadrant(world.tile(x * quadrantSize, y * quadrantSize));
+                    //add position of quadrant to list
+                    if(tile.block() == Blocks.air){
+                        if(ores[drop.id] == null){
+                            ores[drop.id] = new IntSeq[quadWidth][quadHeight];
+                        }
+                        if(ores[drop.id][qx][qy] == null){
+                            ores[drop.id][qx][qy] = new IntSeq(false, 16);
+                        }
+                        ores[drop.id][qx][qy].add(tile.pos());
+                        allOres.increment(drop);
+                    }
                 }
             }
-
-            scanOres();
         });
     }
 
-    public void updateIndices(Tile tile){
-        if(typeMap.get(tile.pos()) != null){
-            TileIndex index = typeMap.get(tile.pos());
-            for(BlockFlag flag : index.flags){
-                getFlagged(index.team)[flag.ordinal()].remove(tile);
+    public void removeIndex(Tile tile){
+        var team = tile.team();
+        if(tile.build != null && tile.isCenter()){
+            var build = tile.build;
+            var flags = tile.block().flags;
+            var data = team.data();
+
+            if(flags.size > 0){
+                for(BlockFlag flag : flags.array){
+                    getFlagged(team)[flag.ordinal()].remove(build);
+                }
             }
 
-            if(index.flags.contains(BlockFlag.unitModifier)){
-                updateCap(index.team);
+            //no longer part of the building list
+            data.buildings.remove(build);
+            data.buildingTypes.get(build.block, () -> new Seq<>(false)).remove(build);
+
+            //update the unit cap when building is removed
+            data.unitCap -= tile.block().unitCapModifier;
+
+            //unregister building from building quadtree
+            if(data.buildingTree != null){
+                data.buildingTree.remove(build);
             }
+
+            //remove indexed turret
+            if(data.turretTree != null && build.block.attacks){
+                data.turretTree.remove(build);
+            }
+
+            //unregister damaged buildings
+            if(build.wasDamaged && damagedTiles[team.id] != null){
+                damagedTiles[team.id].remove(build);
+            }
+
+            //is no longer registered
+            build.wasDamaged = false;
         }
+    }
+
+    public void addIndex(Tile tile){
         process(tile);
-        updateQuadrant(tile);
-    }
 
-    private TileArray[] getFlagged(Team team){
-        return flagMap[team.id];
-    }
+        var drop = tile.drop();
+        if(drop != null && ores != null){
+            int qx = tile.x / quadrantSize;
+            int qy = tile.y / quadrantSize;
 
-    private GridBits structQuadrant(Team t){
-        if(structQuadrants[t.id] == null){
-            structQuadrants[t.id] = new GridBits(Mathf.ceil(world.width() / (float)quadrantSize), Mathf.ceil(world.height() / (float)quadrantSize));
-        }
-        return structQuadrants[t.id];
-    }
+            if(ores[drop.id] == null){
+                ores[drop.id] = new IntSeq[quadWidth][quadHeight];
+            }
+            if(ores[drop.id][qx][qy] == null){
+                ores[drop.id][qx][qy] = new IntSeq(false, 16);
+            }
 
-    /** Updates all the structure quadrants for a newly activated team. */
-    public void updateTeamIndex(Team team){
-        if(structQuadrants == null) return;
+            int pos = tile.pos();
+            var seq = ores[drop.id][qx][qy];
 
-        //go through every tile... ouch
-        for(Tile tile : world.tiles){
-            if(tile.team() == team){
-                int quadrantX = tile.x / quadrantSize;
-                int quadrantY = tile.y / quadrantSize;
-                structQuadrant(team).set(quadrantX, quadrantY);
+            if(tile.block() == Blocks.air){
+                //add the index if it is a valid new spot to mine at
+                if(!seq.contains(pos)){
+                    seq.add(pos);
+                    allOres.increment(drop);
+                }
+            }else if(seq.contains(pos)){ //otherwise, it likely became blocked, remove it
+                seq.removeValue(pos);
+                allOres.increment(drop, -1);
             }
         }
+
+    }
+
+    /** @return whether a certain block is anywhere on this map. */
+    public boolean isBlockPresent(Block block){
+        return blocksPresent != null && blocksPresent[block.id];
+    }
+
+    private void clearFlags(){
+        for(int i = 0; i < flagMap.length; i++){
+            for(int j = 0; j < BlockFlag.all.length; j++){
+                flagMap[i][j] = new Seq();
+            }
+        }
+    }
+
+    private Seq<Building>[] getFlagged(Team team){
+        return flagMap[team.id];
     }
 
     /** @return whether this item is present on this map. */
     public boolean hasOre(Item item){
-        return allOres.contains(item);
+        return allOres.get(item) > 0;
     }
 
     /** Returns all damaged tiles by team. */
-    public ObjectSet<Building> getDamaged(Team team){
-        breturnArray.clear();
-
+    public Seq<Building> getDamaged(Team team){
         if(damagedTiles[team.id] == null){
-            damagedTiles[team.id] = new ObjectSet<>();
+            return damagedTiles[team.id] = new Seq<>(false);
         }
 
-        ObjectSet<Building> set = damagedTiles[team.id];
-        for(Building build : set){
-            if((!build.isValid() || build.team != team || !build.damaged()) || build.block instanceof ConstructBlock){
-                breturnArray.add(build);
-            }
-        }
+        var tiles = damagedTiles[team.id];
+        tiles.removeAll(b -> !b.damaged());
 
-        for(Building tile : breturnArray){
-            set.remove(tile);
-        }
-
-        return set;
+        return tiles;
     }
 
     /** Get all allied blocks with a flag. */
-    public TileArray getAllied(Team team, BlockFlag type){
+    public Seq<Building> getFlagged(Team team, BlockFlag type){
         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 Building findClosestFlag(float x, float y, Team team, BlockFlag flag){
+        return Geometry.findClosest(x, y, getFlagged(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);
     }
 
-    public boolean eachBlock(Team team, float wx, float wy, float range, Boolf<Building> pred, Cons<Building> cons){
-        intSet.clear();
+    public boolean eachBlock(@Nullable Team team, float wx, float wy, float range, Boolf<Building> pred, Cons<Building> cons){
 
-        int tx = World.toTile(wx);
-        int ty = World.toTile(wy);
+        if(team == null){
+            returnBool = false;
 
-        int tileRange = (int)(range / tilesize + 1);
-        boolean any = false;
-
-        for(int x = -tileRange + tx; x <= tileRange + tx; x++){
-            for(int y = -tileRange + ty; y <= tileRange + ty; y++){
-                if(!Mathf.within(x * tilesize, y * tilesize, wx, wy, range)) continue;
-
-                Building other = world.build(x, y);
-
-                if(other == null) continue;
-
-                if((team == null || other.team == team) && pred.get(other) && intSet.add(other.pos())){
-                    cons.get(other);
-                    any = true;
+            allBuildings(wx, wy, range, b -> {
+                if(pred.get(b)){
+                    returnBool = true;
+                    cons.get(b);
                 }
-            }
+            });
+            return returnBool;
+        }else{
+            breturnArray.clear();
+
+            var buildings = team.data().buildingTree;
+            if(buildings == null) return false;
+            buildings.intersect(wx - range, wy - range, range*2f, range*2f, b -> {
+                if(b.within(wx, wy, range + b.hitSize() / 2f) && pred.get(b)){
+                    breturnArray.add(b);
+                }
+            });
         }
 
-        return any;
+        int size = breturnArray.size;
+        var items = breturnArray.items;
+        for(int i = 0; i < size; i++){
+            cons.get(items[i]);
+            items[i] = null;
+        }
+        breturnArray.size = 0;
+
+        return size > 0;
+    }
+
+    /** Does not work with null teams. */
+    public boolean eachBlock(Team team, Rect rect, Boolf<Building> pred, Cons<Building> cons){
+        if(team == null) return false;
+
+        breturnArray.clear();
+
+        var buildings = team.data().buildingTree;
+        if(buildings == null) return false;
+        buildings.intersect(rect, b -> {
+            if(pred.get(b)){
+                breturnArray.add(b);
+            }
+        });
+
+        int size = breturnArray.size;
+        var items = breturnArray.items;
+        for(int i = 0; i < size; i++){
+            cons.get(items[i]);
+            items[i] = null;
+        }
+        breturnArray.size = 0;
+
+        return size > 0;
     }
 
     /** Get all enemy blocks with a flag. */
-    public Seq<Tile> getEnemy(Team team, BlockFlag type){
-        returnArray.clear();
+    public Seq<Building> getEnemy(Team team, BlockFlag type){
+        breturnArray.clear();
         Seq<TeamData> data = state.teams.present;
         //when team data is not initialized, scan through every team. this is terrible
         if(data.isEmpty()){
             for(Team enemy : Team.all){
-                if(enemy == team) continue;
-                TileArray set = getFlagged(enemy)[type.ordinal()];
+                if(enemy == team || (enemy == Team.derelict && !state.rules.coreCapture)) continue;
+                var set = getFlagged(enemy)[type.ordinal()];
                 if(set != null){
-                    for(Tile tile : set){
-                        returnArray.add(tile);
-                    }
+                    breturnArray.addAll(set);
                 }
             }
         }else{
             for(int i = 0; i < data.size; i++){
                 Team enemy = data.items[i].team;
-                if(enemy == team) continue;
-                TileArray set = getFlagged(enemy)[type.ordinal()];
+                if(enemy == team || (enemy == Team.derelict && !state.rules.coreCapture)) continue;
+                var set = getFlagged(enemy)[type.ordinal()];
                 if(set != null){
-                    for(Tile tile : set){
-                        returnArray.add(tile);
-                    }
+                    breturnArray.addAll(set);
                 }
             }
         }
 
-        return returnArray;
+        return breturnArray;
     }
 
-    public void notifyTileDamaged(Building entity){
-        if(damagedTiles[entity.team.id] == null){
-            damagedTiles[entity.team.id] = new ObjectSet<>();
+    public void notifyHealthChanged(Building build){
+        boolean damaged = build.damaged();
+
+        if(build.wasDamaged != damaged){
+            if(damagedTiles[build.team.id] == null){
+                damagedTiles[build.team.id] = new Seq<>(false);
+            }
+
+            if(damaged){
+                //is now damaged, add to array
+                damagedTiles[build.team.id].add(build);
+            }else{
+                //no longer damaged, remove
+                damagedTiles[build.team.id].remove(build);
+            }
+
+            build.wasDamaged = damaged;
+        }
+    }
+
+    public void allBuildings(float x, float y, float range, Cons<Building> cons){
+        breturnArray.clear();
+        for(int i = 0; i < activeTeams.size; i++){
+            Team team = activeTeams.items[i];
+            var buildings = team.data().buildingTree;
+            if(buildings == null) continue;
+            buildings.intersect(x - range, y - range, range*2f, range*2f, breturnArray);
         }
 
-        damagedTiles[entity.team.id].add(entity);
+        var items = breturnArray.items;
+        int size = breturnArray.size;
+        for(int i = 0; i < size; i++){
+            var b = items[i];
+            if(b != null && b.within(x, y, range + b.hitSize()/2f)){
+                cons.get(b);
+            }
+            items[i] = null;
+        }
+        breturnArray.size = 0;
     }
 
     public Building findEnemyTile(Team team, float x, float y, float range, Boolf<Building> pred){
+        Building target = null;
+        float targetDist = 0;
+
         for(int i = 0; i < activeTeams.size; i++){
             Team enemy = activeTeams.items[i];
+            if(enemy == team || (enemy == Team.derelict && !state.rules.coreCapture)) continue;
 
-            if(enemy == team || team == Team.derelict) continue;
+            Building candidate = indexer.findTile(enemy, x, y, range, b -> pred.get(b) && b.isDiscovered(team), true);
+            if(candidate == null) continue;
 
-            Building entity = indexer.findTile(enemy, x, y, range, pred, true);
-            if(entity != null){
-                return entity;
+            //if a block has the same priority, the closer one should be targeted
+            float dist = candidate.dst(x, y) - candidate.hitSize() / 2f;
+            if(target == null ||
+            //if its closer and is at least equal priority
+            (dist < targetDist && candidate.block.priority >= target.block.priority) ||
+            // block has higher priority (so range doesnt matter)
+            (candidate.block.priority > target.block.priority)){
+                target = candidate;
+                targetDist = dist;
             }
         }
 
-        return null;
+        return target;
     }
 
     public Building findTile(Team team, float x, float y, float range, Boolf<Building> pred){
@@ -269,59 +381,52 @@ public class BlockIndexer{
     public Building findTile(Team team, float x, float y, float range, Boolf<Building> pred, boolean usePriority){
         Building closest = null;
         float dst = 0;
-        float range2 = range * range;
+        var buildings = team.data().buildingTree;
+        if(buildings == null) return null;
 
-        for(int rx = Math.max((int)((x - range) / tilesize / quadrantSize), 0); rx <= (int)((x + range) / tilesize / quadrantSize) && rx < quadWidth(); rx++){
-            for(int ry = Math.max((int)((y - range) / tilesize / quadrantSize), 0); ry <= (int)((y + range) / tilesize / quadrantSize) && ry < quadHeight(); ry++){
+        breturnArray.clear();
+        buildings.intersect(rect.setCentered(x, y, range * 2f), breturnArray);
 
-                if(!getQuad(team, rx, ry)) continue;
+        for(int i = 0; i < breturnArray.size; i++){
+            var next = breturnArray.items[i];
 
-                for(int tx = rx * quadrantSize; tx < (rx + 1) * quadrantSize && tx < world.width(); tx++){
-                    for(int ty = ry * quadrantSize; ty < (ry + 1) * quadrantSize && ty < world.height(); ty++){
-                        Building e = world.build(tx, ty);
+            if(!pred.get(next) || !next.block.targetable) continue;
 
-                        if(e == null || e.team != team || !pred.get(e) || !e.block.targetable || e.team == Team.derelict) 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())) ||
-                        //priority is used, and new block has higher priority regardless of range
-                        (usePriority && closest.block.priority.ordinal() < e.block.priority.ordinal()))){
-                            dst = ndst;
-                            closest = e;
-                        }
-                    }
-                }
+            float bdst = next.dst(x, y) - next.hitSize() / 2f;
+            if(bdst < range && (closest == null ||
+            //this one is closer, and it is at least of equal priority
+            (bdst < dst && (!usePriority || closest.block.priority <= next.block.priority)) ||
+            //priority is used, and new block has higher priority regardless of range
+            (usePriority && closest.block.priority < next.block.priority))){
+                dst = bdst;
+                closest = next;
             }
         }
 
         return closest;
     }
 
-    /**
-     * Returns a set of tiles that have ores of the specified type nearby.
-     * While each tile in the set is not guaranteed to have an ore directly on it,
-     * each tile will at least have an ore within {@link #quadrantSize} / 2 blocks of it.
-     * Only specific ore types are scanned. See {@link #scanOres}.
-     */
-    public TileArray getOrePositions(Item item){
-        return ores.get(item, emptySet);
-    }
-
     /** Find the closest ore block relative to a position. */
     public Tile findClosestOre(float xp, float yp, Item item){
-        Tile tile = Geometry.findClosest(xp, yp, getOrePositions(item));
-
-        if(tile == null) return null;
-
-        for(int x = Math.max(0, tile.x - quadrantSize / 2); x < tile.x + quadrantSize / 2 && x < world.width(); x++){
-            for(int y = Math.max(0, tile.y - quadrantSize / 2); y < tile.y + quadrantSize / 2 && y < world.height(); y++){
-                Tile res = world.tile(x, y);
-                if(res.block() == Blocks.air && res.drop() == item){
-                    return res;
+        if(ores[item.id] != null){
+            float minDst = 0f;
+            Tile closest = null;
+            for(int qx = 0; qx < quadWidth; qx++){
+                for(int qy = 0; qy < quadHeight; qy++){
+                    var arr = ores[item.id][qx][qy];
+                    if(arr != null && arr.size > 0){
+                        Tile tile = world.tile(arr.first());
+                        if(tile.block() == Blocks.air){
+                            float dst = Mathf.dst2(xp, yp, tile.worldx(), tile.worldy());
+                            if(closest == null || dst < minDst){
+                                closest = tile;
+                                minDst = dst;
+                            }
+                        }
+                    }
                 }
             }
+            return closest;
         }
 
         return null;
@@ -332,177 +437,73 @@ public class BlockIndexer{
         return findClosestOre(unit.x, unit.y, item);
     }
 
-    /** @return extra unit cap of a team. This is added onto the base value. */
-    public int getExtraUnits(Team team){
-        return unitCaps[team.id];
-    }
-
-    private void updateCap(Team team){
-        TileArray capped = getFlagged(team)[BlockFlag.unitModifier.ordinal()];
-        unitCaps[team.id] = 0;
-        for(Tile capper : capped){
-            unitCaps[team.id] += capper.block().unitCapModifier;
-        }
-    }
-
     private void process(Tile tile){
-        if(tile.block().flags.size() > 0 && tile.team() != Team.derelict && tile.isCenter()){
-            TileArray[] map = getFlagged(tile.team());
+        var team = tile.team();
+        //only process entity changes with centered tiles
+        if(tile.isCenter() && tile.build != null){
+            var data = team.data();
 
-            for(BlockFlag flag : tile.block().flags){
+            if(tile.block().flags.size > 0 && tile.isCenter()){
+                var map = getFlagged(team);
 
-                TileArray arr = map[flag.ordinal()];
-
-                arr.add(tile);
-
-                map[flag.ordinal()] = arr;
-            }
-
-            if(tile.block().flags.contains(BlockFlag.unitModifier)){
-                updateCap(tile.team());
-            }
-
-            typeMap.put(tile.pos(), new TileIndex(tile.block().flags, tile.team()));
-        }
-
-        if(!activeTeams.contains(tile.team())){
-            activeTeams.add(tile.team());
-        }
-
-        if(ores == null) return;
-
-        int quadrantX = tile.x / quadrantSize;
-        int quadrantY = tile.y / quadrantSize;
-        itemSet.clear();
-
-        Tile rounded = world.rawTile(Mathf.clamp(quadrantX * quadrantSize + quadrantSize / 2, 0, world.width() - 1), Mathf.clamp(quadrantY * quadrantSize + quadrantSize / 2, 0, world.height() - 1));
-
-        //find all items that this quadrant contains
-        for(int x = Math.max(0, rounded.x - quadrantSize / 2); x < rounded.x + quadrantSize / 2 && x < world.width(); x++){
-            for(int y = Math.max(0, rounded.y - quadrantSize / 2); y < rounded.y + quadrantSize / 2 && y < world.height(); y++){
-                Tile result = world.tile(x, y);
-                if(result == null || result.drop() == null || !scanOres.contains(result.drop()) || result.block() != Blocks.air) continue;
-
-                itemSet.add(result.drop());
-            }
-        }
-
-        //update quadrant at this position
-        for(Item item : scanOres){
-            TileArray set = ores.get(item);
-
-            //update quadrant status depending on whether the item is in it
-            if(!itemSet.contains(item)){
-                set.remove(rounded);
-            }else{
-                set.add(rounded);
-            }
-        }
-    }
-
-    private void updateQuadrant(Tile tile){
-        if(structQuadrants == null) return;
-
-        //this quadrant is now 'dirty', re-scan the whole thing
-        int quadrantX = tile.x / quadrantSize;
-        int quadrantY = tile.y / quadrantSize;
-
-        for(Team team : activeTeams){
-            GridBits bits = structQuadrant(team);
-
-            //fast-set this quadrant to 'occupied' if the tile just placed is already of this team
-            if(tile.team() == team && tile.build != null && tile.block().targetable){
-                bits.set(quadrantX, quadrantY);
-                continue; //no need to process futher
-            }
-
-            bits.set(quadrantX, quadrantY, false);
-
-            outer:
-            for(int x = quadrantX * quadrantSize; x < world.width() && x < (quadrantX + 1) * quadrantSize; x++){
-                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){
-                        bits.set(quadrantX, quadrantY);
-                        break outer;
-                    }
+                for(BlockFlag flag : tile.block().flags.array){
+                    map[flag.ordinal()].add(tile.build);
                 }
             }
-        }
-    }
 
-    private boolean getQuad(Team team, int quadrantX, int quadrantY){
-        return structQuadrant(team).get(quadrantX, quadrantY);
-    }
+            //record in list of buildings
+            data.buildings.add(tile.build);
+            data.buildingTypes.get(tile.block(), () -> new Seq<>(false)).add(tile.build);
 
-    private int quadWidth(){
-        return Mathf.ceil(world.width() / (float)quadrantSize);
-    }
+            //update the unit cap when new tile is registered
+            data.unitCap += tile.block().unitCapModifier;
 
-    private int quadHeight(){
-        return Mathf.ceil(world.height() / (float)quadrantSize);
-    }
-
-    private void scanOres(){
-        ores = new ObjectMap<>();
-
-        //initialize ore map with empty sets
-        for(Item item : scanOres){
-            ores.put(item, new TileArray());
-        }
-
-        for(Tile tile : world.tiles){
-            int qx = (tile.x / quadrantSize);
-            int qy = (tile.y / quadrantSize);
-
-            //add position of quadrant to list when an ore is found
-            if(tile.drop() != null && scanOres.contains(tile.drop()) && tile.block() == Blocks.air){
-                ores.get(tile.drop()).add(world.tile(
-                //make sure to clamp quadrant middle position, since it might go off bounds
-                Mathf.clamp(qx * quadrantSize + quadrantSize / 2, 0, world.width() - 1),
-                Mathf.clamp(qy * quadrantSize + quadrantSize / 2, 0, world.height() - 1)));
+            if(!activeTeams.contains(team)){
+                activeTeams.add(team);
             }
+
+            //insert the new tile into the quadtree for targeting
+            if(data.buildingTree == null){
+                data.buildingTree = new QuadTree<>(new Rect(0, 0, world.unitWidth(), world.unitHeight()));
+            }
+            data.buildingTree.insert(tile.build);
+
+            if(tile.block().attacks && tile.build instanceof Ranged){
+                if(data.turretTree == null){
+                    data.turretTree = new TurretQuadtree(new Rect(0, 0, world.unitWidth(), world.unitHeight()));
+                }
+
+                data.turretTree.insert(tile.build);
+            }
+
+            notifyHealthChanged(tile.build);
         }
+
+        if(blocksPresent != null){
+            if(!tile.block().isStatic()){
+                blocksPresent[tile.floorID()] = true;
+                blocksPresent[tile.overlayID()] = true;
+            }
+            //bounds checks only needed in very specific scenarios
+            if(tile.blockID() < blocksPresent.length) blocksPresent[tile.blockID()] = true;
+        }
+
     }
 
-    private static class TileIndex{
-        public final EnumSet<BlockFlag> flags;
-        public final Team team;
+    static class TurretQuadtree extends QuadTree<Building>{
 
-        public TileIndex(EnumSet<BlockFlag> flags, Team team){
-            this.flags = flags;
-            this.team = team;
-        }
-    }
-
-    public static class TileArray implements Iterable<Tile>{
-        Seq<Tile> tiles = new Seq<>(false, 16);
-        IntSet contained = new IntSet();
-
-        public void add(Tile tile){
-            if(contained.add(tile.pos())){
-                tiles.add(tile);
-            }
-        }
-
-        public void remove(Tile tile){
-            if(contained.remove(tile.pos())){
-                tiles.remove(tile);
-            }
-        }
-
-        public int size(){
-            return tiles.size;
-        }
-
-        public Tile first(){
-            return tiles.first();
+        public TurretQuadtree(Rect bounds){
+            super(bounds);
         }
 
         @Override
-        public Iterator<Tile> iterator(){
-            return tiles.iterator();
+        public void hitbox(Building build){
+            tmp.setCentered(build.x, build.y, ((Ranged)build).range() * 2f);
+        }
+
+        @Override
+        protected QuadTree<Building> newChild(Rect rect){
+            return new TurretQuadtree(rect);
         }
     }
 }
diff --git a/core/src/mindustry/ai/ControlPathfinder.java b/core/src/mindustry/ai/ControlPathfinder.java
new file mode 100644
index 0000000000..ba9e3e6c75
--- /dev/null
+++ b/core/src/mindustry/ai/ControlPathfinder.java
@@ -0,0 +1,1635 @@
+package mindustry.ai;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+import static mindustry.ai.Pathfinder.*;
+
+//https://webdocs.cs.ualberta.ca/~mmueller/ps/hpastar.pdf
+//https://www.gameaipro.com/GameAIPro/GameAIPro_Chapter23_Crowd_Pathfinding_and_Steering_Using_Flow_Field_Tiles.pdf
+public class ControlPathfinder implements Runnable{
+    private static final int wallImpassableCap = 1_000_000;
+    private static final int solidCap = 7000;
+
+    public static boolean showDebug;
+
+    public static final PathCost
+
+    costGround = (team, tile) ->
+    //deep is impassable
+    PathTile.allDeep(tile) ? impassable :
+    //impassable same-team or neutral block
+    PathTile.solid(tile) && ((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0) ? impassable :
+    //impassable synthetic enemy block
+    ((PathTile.team(tile) != team && PathTile.team(tile) != 0) && PathTile.solid(tile) ? wallImpassableCap : 0) +
+    1 +
+    (PathTile.nearSolid(tile) ? 6 : 0) +
+    (PathTile.nearLiquid(tile) ? 8 : 0) +
+    (PathTile.deep(tile) ? 6000 : 0) +
+    (PathTile.damages(tile) ? 50 : 0),
+
+    //same as ground but ignores liquids/deep stuff
+    costHover = (team, tile) ->
+    //impassable same-team or neutral block
+    PathTile.solid(tile) && ((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0) ? impassable :
+    //impassable synthetic enemy block
+    ((PathTile.team(tile) != team && PathTile.team(tile) != 0) && PathTile.solid(tile) ? wallImpassableCap : 0) +
+    1 +
+    (PathTile.nearSolid(tile) ? 6 : 0),
+
+    costLegs = (team, tile) ->
+    PathTile.legSolid(tile) ? impassable : 1 +
+    (PathTile.deep(tile) ? 6000 : 0) +
+    (PathTile.nearLegSolid(tile) ? 3 : 0),
+
+    costNaval = (team, tile) ->
+    //impassable same-team neutral block, or non-liquid
+    (PathTile.solid(tile) && ((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0)) ? impassable :
+    (!PathTile.liquid(tile) ? 6000 : 1) +
+    //impassable synthetic enemy block
+    ((PathTile.team(tile) != team && PathTile.team(tile) != 0) && PathTile.solid(tile) ? wallImpassableCap : 0) +
+    (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 6 : 0);
+
+    public static final int
+    costIdGround = 0,
+    costIdHover = 1,
+    costIdLegs = 2,
+    costIdNaval = 3;
+
+    public static final Seq<PathCost> costTypes = Seq.with(
+    costGround,
+    costHover,
+    costLegs,
+    costNaval
+    );
+
+    private static final long maxUpdate = Time.millisToNanos(12);
+    private static final int updateStepInterval = 200;
+    private static final int updateFPS = 30;
+    private static final int updateInterval = 1000 / updateFPS, invalidateCheckInterval = 1000;
+
+    static final int clusterSize = 12;
+
+    static final int[] offsets = {
+    1, 0, //right: bottom to top
+    0, 1, //top: left to right
+    0, 0, //left: bottom to top
+    0, 0  //bottom: left to right
+    };
+
+    static final int[] moveDirs = {
+    0, 1,
+    1, 0,
+    0, 1,
+    1, 0
+    };
+
+    static final int[] nextOffsets = {
+    1, 0,
+    0, 1,
+    -1, 0,
+    0, -1
+    };
+
+    //maps team -> pathCost -> flattened array of clusters in 2D
+    //(what about teams? different path costs?)
+    Cluster[][][] clusters;
+
+    int cwidth, cheight;
+
+    //temporarily used for resolving connections for intra-edges
+    IntSet usedEdges = new IntSet();
+    //tasks to run on pathfinding thread
+    TaskQueue queue = new TaskQueue();
+
+    //individual requests based on unit - MAIN THREAD ONLY
+    ObjectMap<Unit, PathRequest> unitRequests = new ObjectMap<>();
+
+    Seq<PathRequest> threadPathRequests = new Seq<>(false);
+
+    //TODO: very dangerous usage;
+    //TODO - it is accessed from the main thread
+    //TODO - it is written to on the pathfinding thread
+    //maps position in world in (x + y * width format) | path type | team (bitpacked to long with FieldIndex.get) to a cache of flow fields
+    LongMap<FieldCache> fields = new LongMap<>();
+    //MAIN THREAD ONLY
+    Seq<FieldCache> fieldList = new Seq<>(false);
+
+    //these are for inner edge A* (temporary!)
+    IntFloatMap innerCosts = new IntFloatMap();
+    PathfindQueue innerFrontier = new PathfindQueue();
+
+    //ONLY modify on pathfinding thread.
+    IntSet clustersToUpdate = new IntSet();
+    IntSet clustersToInnerUpdate = new IntSet();
+
+    //PATHFINDING THREAD - requests that should be recomputed
+    ObjectSet<PathRequest> invalidRequests = new ObjectSet<>();
+
+    /** Current pathfinding thread */
+    @Nullable Thread thread;
+
+    //path requests are per-unit
+    static class PathRequest{
+        final Unit unit;
+        final int destination, team, costId;
+        //resulting path of nodes
+        final IntSeq resultPath = new IntSeq();
+
+        //node index -> total cost
+        @Nullable IntFloatMap costs = new IntFloatMap();
+        //node index (NodeIndex struct) -> node it came from TODO merge them, make properties of FieldCache?
+        @Nullable IntIntMap cameFrom = new IntIntMap();
+        //frontier for A*
+        @Nullable PathfindQueue frontier = new PathfindQueue();
+
+        //main thread only!
+        long lastUpdateId = state.updateId;
+
+        //both threads
+        volatile boolean notFound = false;
+        volatile boolean invalidated = false;
+        //old field assigned before everything was recomputed
+        @Nullable volatile FieldCache oldCache;
+
+        boolean lastRaycastResult = false;
+        int lastRaycastTile, lastWorldUpdate;
+        int lastTile;
+        @Nullable Tile lastTargetTile;
+
+        PathRequest(Unit unit, int team, int costId, int destination){
+            this.unit = unit;
+            this.costId = costId;
+            this.team = team;
+            this.destination = destination;
+        }
+    }
+
+    static class FieldCache{
+        final PathCost cost;
+        final int costId;
+        final int team;
+        final int goalPos;
+        //frontier for flow fields
+        final IntQueue frontier = new IntQueue();
+        //maps cluster index to field weights; 0 means uninitialized
+        final IntMap<int[]> fields = new IntMap<>();
+        //packed (goalPos | costId | team) long key to use in the global fields map
+        final long mapKey;
+
+        //main thread only!
+        long lastUpdateId = state.updateId;
+
+        //TODO: how are the nodes merged? CAN they be merged?
+
+        FieldCache(PathCost cost, int costId, int team, int goalPos){
+            this.cost = cost;
+            this.team = team;
+            this.goalPos = goalPos;
+            this.costId = costId;
+            this.mapKey = FieldIndex.get(goalPos, costId, team);
+        }
+    }
+
+    static class Cluster{
+        IntSeq[] portals = new IntSeq[4];
+        //maps rotation + index of portal to list of IntraEdge objects
+        LongSeq[][] portalConnections = new LongSeq[4][];
+    }
+
+    public ControlPathfinder(){
+
+        Events.on(ResetEvent.class, event -> stop());
+
+        Events.on(WorldLoadEvent.class, event -> {
+            stop();
+
+            //TODO: can the pathfinding thread even see these?
+            unitRequests = new ObjectMap<>();
+            fields = new LongMap<>();
+            fieldList = new Seq<>(false);
+
+            clusters = new Cluster[256][][];
+            cwidth = Mathf.ceil((float)world.width() / clusterSize);
+            cheight = Mathf.ceil((float)world.height() / clusterSize);
+
+
+            start();
+        });
+
+        Events.on(TileChangeEvent.class, e -> {
+
+            updateTile(e.tile);
+
+            //TODO: recalculate affected flow fields? or just all of them? how to reflow?
+        });
+
+        //invalidate paths
+        Events.run(Trigger.update, () -> {
+            for(var req : unitRequests.values()){
+                //skipped N update -> drop it
+                if(req.lastUpdateId <= state.updateId - 10 || !req.unit.isAdded()){
+                    req.invalidated = true;
+                    //concurrent modification!
+                    queue.post(() -> threadPathRequests.remove(req));
+                    Core.app.post(() -> unitRequests.remove(req.unit));
+                }
+            }
+
+            for(var field : fieldList){
+                //skipped N update -> drop it
+                if(field.lastUpdateId <= state.updateId - 30){
+                    //make sure it's only modified on the main thread...? but what about calling get() on this thread??
+                    queue.post(() -> fields.remove(field.mapKey));
+                    Core.app.post(() -> fieldList.remove(field));
+                }
+            }
+        });
+
+        if(showDebug){
+            Events.run(Trigger.draw, () -> {
+                int team = player.team().id;
+                int cost = 0;
+
+                Draw.draw(Layer.overlayUI, () -> {
+                    Lines.stroke(1f);
+
+                    if(clusters[team] != null && clusters[team][cost] != null){
+                        for(int cx = 0; cx < cwidth; cx++){
+                            for(int cy = 0; cy < cheight; cy++){
+
+                                var cluster = clusters[team][cost][cy * cwidth + cx];
+                                if(cluster != null){
+                                    Lines.stroke(0.5f);
+                                    Draw.color(Color.gray);
+                                    Lines.stroke(1f);
+
+                                    Lines.rect(cx * clusterSize * tilesize - tilesize/2f, cy * clusterSize * tilesize - tilesize/2f, clusterSize * tilesize, clusterSize * tilesize);
+
+
+                                    for(int d = 0; d < 4; d++){
+                                        IntSeq portals = cluster.portals[d];
+                                        if(portals != null){
+
+                                            for(int i = 0; i < portals.size; i++){
+                                                int pos = portals.items[i];
+                                                int from = Point2.x(pos), to = Point2.y(pos);
+                                                float width = tilesize * (Math.abs(from - to) + 1), height = tilesize;
+
+                                                portalToVec(cluster, cx, cy, d, i, Tmp.v1);
+
+                                                Draw.color(Color.brown);
+                                                Lines.ellipse(30, Tmp.v1.x, Tmp.v1.y, width / 2f, height / 2f, d * 90f - 90f);
+
+                                                LongSeq connections = cluster.portalConnections[d] == null ? null : cluster.portalConnections[d][i];
+
+                                                if(connections != null){
+                                                    Draw.color(Color.forest);
+                                                    for(int coni = 0; coni < connections.size; coni ++){
+                                                        long con = connections.items[coni];
+
+                                                        portalToVec(cluster, cx, cy, IntraEdge.dir(con), IntraEdge.portal(con), Tmp.v2);
+
+                                                        float
+                                                        x1 = Tmp.v1.x, y1 = Tmp.v1.y,
+                                                        x2 = Tmp.v2.x, y2 = Tmp.v2.y;
+                                                        Lines.line(x1, y1, x2, y2);
+
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    for(var fields : fieldList){
+                        try{
+                            for(var entry : fields.fields){
+                                int cx = entry.key % cwidth, cy = entry.key / cwidth;
+                                for(int y = 0; y < clusterSize; y++){
+                                    for(int x = 0; x < clusterSize; x++){
+                                        int value = entry.value[x + y * clusterSize];
+                                        Tmp.c1.a = 1f;
+                                        Lines.stroke(0.8f, Tmp.c1.fromHsv(value * 3f, 1f, 1f));
+                                        Draw.alpha(0.5f);
+                                        Fill.square((x + cx * clusterSize) * tilesize, (y + cy * clusterSize) * tilesize, tilesize / 2f);
+                                    }
+                                }
+                            }
+                        }catch(Exception ignored){} //probably has some concurrency issues when iterating but I don't care, this is for debugging
+                    }
+                });
+
+                Draw.reset();
+            });
+        }
+    }
+
+    public void updateTile(Tile tile){
+        tile.getLinkedTiles(this::updateSingleTile);
+    }
+
+    public void updateSingleTile(Tile t){
+        int x = t.x, y = t.y, mx = x % clusterSize, my = y % clusterSize, cx = x / clusterSize, cy = y / clusterSize, cluster = cx + cy * cwidth;
+
+        //is at the edge of a cluster; this means the portals may have changed.
+        if(mx == 0 || my == 0 || mx == clusterSize - 1 || my == clusterSize - 1){
+
+            if(mx == 0) queueClusterUpdate(cx - 1, cy); //left
+            if(my == 0) queueClusterUpdate(cx, cy - 1); //bottom
+            if(mx == clusterSize - 1) queueClusterUpdate(cx + 1, cy); //right
+            if(my == clusterSize - 1) queueClusterUpdate(cx, cy + 1); //top
+
+            queueClusterUpdate(cx, cy);
+            //TODO: recompute edge clusters too.
+        }else{
+            //there is no need to recompute portals for block updates that are not on the edge.
+            queue.post(() -> clustersToInnerUpdate.add(cluster));
+        }
+    }
+
+    void queueClusterUpdate(int cx, int cy){
+        if(cx >= 0 && cy >= 0 && cx < cwidth && cy < cheight){
+            queue.post(() -> clustersToUpdate.add(cx + cy * cwidth));
+        }
+    }
+
+    //debugging only!
+    void portalToVec(Cluster cluster, int cx, int cy, int direction, int portalIndex, Vec2 out){
+        int pos = cluster.portals[direction].items[portalIndex];
+        int from = Point2.x(pos), to = Point2.y(pos);
+        int addX = moveDirs[direction * 2], addY = moveDirs[direction * 2 + 1];
+        float average = (from + to) / 2f;
+
+        float
+        x = (addX * average + cx * clusterSize + offsets[direction * 2] * (clusterSize - 1) + nextOffsets[direction * 2] / 2f) * tilesize,
+        y = (addY * average + cy * clusterSize + offsets[direction * 2 + 1] * (clusterSize - 1) + nextOffsets[direction * 2 + 1] / 2f) * tilesize;
+
+        out.set(x, y);
+    }
+
+    /** Starts or restarts the pathfinding thread. */
+    private void start(){
+        stop();
+        if(net.client()) return;
+
+        thread = new Thread(this, "Control Pathfinder");
+        thread.setPriority(Thread.MIN_PRIORITY);
+        thread.setDaemon(true);
+        thread.start();
+    }
+
+    /** Stops the pathfinding thread. */
+    private void stop(){
+        if(thread != null){
+            thread.interrupt();
+            thread = null;
+        }
+        queue.clear();
+    }
+
+    /** @return a cluster at coordinates; can be null if not cluster was created yet*/
+    @Nullable Cluster getCluster(int team, int pathCost, int cx, int cy){
+        return getCluster(team, pathCost, cx + cy * cwidth);
+    }
+
+    /** @return a cluster at coordinates; can be null if not cluster was created yet*/
+    @Nullable Cluster getCluster(int team, int pathCost, int clusterIndex){
+        if(clusters == null) return null;
+
+        Cluster[][] dim1 = clusters[team];
+
+        if(dim1 == null) return null;
+
+        Cluster[] dim2 = dim1[pathCost];
+
+        //TODO: how can index out of bounds happen? || clusterIndex >= dim2.length
+        if(dim2 == null) return null;
+
+        return dim2[clusterIndex];
+    }
+
+    /** @return the cluster at specified coordinates; never null. */
+    Cluster getCreateCluster(int team, int pathCost, int cx, int cy){
+        return getCreateCluster(team, pathCost, cx + cy * cwidth);
+    }
+
+    /** @return the cluster at specified coordinates; never null. */
+    Cluster getCreateCluster(int team, int pathCost, int clusterIndex){
+        Cluster result = getCluster(team, pathCost, clusterIndex);
+        if(result == null){
+            return updateCluster(team, pathCost, clusterIndex % cwidth, clusterIndex / cwidth);
+        }else{
+            return result;
+        }
+    }
+
+    Cluster updateCluster(int team, int pathCost, int cx, int cy){
+        //TODO: what if clusters are null for thread visibility reasons?
+
+        Cluster[][] dim1 = clusters[team];
+
+        if(dim1 == null){
+            dim1 = clusters[team] = new Cluster[Team.all.length][];
+        }
+
+        Cluster[] dim2 = dim1[pathCost];
+
+        if(dim2 == null){
+            dim2 = dim1[pathCost] = new Cluster[cwidth * cheight];
+        }
+
+        Cluster cluster = dim2[cy * cwidth + cx];
+        if(cluster == null){
+            cluster = dim2[cy * cwidth + cx] = new Cluster();
+        }else{
+            //reset data
+            for(var p : cluster.portals){
+                if(p != null){
+                    p.clear();
+                }
+            }
+        }
+
+        PathCost cost = idToCost(pathCost);
+
+        for(int direction = 0; direction < 4; direction++){
+            int otherX = cx + Geometry.d4x(direction), otherY = cy + Geometry.d4y(direction);
+            //out of bounds, no portals in this direction
+            if(otherX < 0 || otherY < 0 || otherX >= cwidth || otherY >= cheight){
+                continue;
+            }
+
+            Cluster other = dim2[otherX + otherY * cwidth];
+            IntSeq portals;
+
+            if(other == null){
+                //create new portals at direction
+                portals = cluster.portals[direction] = new IntSeq(4);
+            }else{
+                //share portals with the other cluster
+                portals = cluster.portals[direction] = other.portals[(direction + 2) % 4];
+
+                //clear the portals, they're being recalculated now
+                portals.clear();
+            }
+
+            int addX = moveDirs[direction * 2], addY = moveDirs[direction * 2 + 1];
+            int
+            baseX = cx * clusterSize + offsets[direction * 2] * (clusterSize - 1),
+            baseY = cy * clusterSize + offsets[direction * 2 + 1] * (clusterSize - 1),
+            nextBaseX = baseX + Geometry.d4[direction].x,
+            nextBaseY = baseY + Geometry.d4[direction].y;
+
+            int lastPortal = -1;
+            boolean prevSolid = true;
+
+            for(int i = 0; i < clusterSize; i++){
+                int x = baseX + addX * i, y = baseY + addY * i;
+
+                //scan for portals
+                if(solid(team, cost, x, y) || solid(team, cost, nextBaseX + addX * i, nextBaseY + addY * i)){
+                    int previous = i - 1;
+                    //hit a wall, create portals between the two points
+                    if(!prevSolid && previous >= lastPortal){
+                        //portals are an inclusive range
+                        portals.add(Point2.pack(previous, lastPortal));
+                    }
+                    prevSolid = true;
+                }else{
+                    //empty area encountered, mark the location of portal start
+                    if(prevSolid){
+                        lastPortal = i;
+                    }
+                    prevSolid = false;
+                }
+            }
+
+            //at the end of the loop, close any un-initialized portals; this is copy pasted code
+            int previous = clusterSize - 1;
+            if(!prevSolid && previous >= lastPortal){
+                //portals are an inclusive range
+                portals.add(Point2.pack(previous, lastPortal));
+            }
+        }
+
+        updateInnerEdges(team, cost, cx, cy, cluster);
+
+        return cluster;
+    }
+
+    void updateInnerEdges(int team, int cost, int cx, int cy, Cluster cluster){
+        updateInnerEdges(team, idToCost(cost), cx, cy, cluster);
+    }
+
+    void updateInnerEdges(int team, PathCost cost, int cx, int cy, Cluster cluster){
+        int minX = cx * clusterSize, minY = cy * clusterSize, maxX = Math.min(minX + clusterSize - 1, wwidth - 1), maxY = Math.min(minY + clusterSize - 1, wheight - 1);
+
+        usedEdges.clear();
+
+        //clear all connections, since portals changed, they need to be recomputed.
+        cluster.portalConnections = new LongSeq[4][];
+
+        for(int direction = 0; direction < 4; direction++){
+            var portals = cluster.portals[direction];
+            if(portals == null) continue;
+
+            int addX = moveDirs[direction * 2], addY = moveDirs[direction * 2 + 1];
+
+            for(int i = 0; i < portals.size; i++){
+                usedEdges.add(Point2.pack(direction, i));
+
+                int
+                portal = portals.items[i],
+                from = Point2.x(portal), to = Point2.y(portal),
+                average = (from + to) / 2,
+                x = (addX * average + cx * clusterSize + offsets[direction * 2] * (clusterSize - 1)),
+                y = (addY * average + cy * clusterSize + offsets[direction * 2 + 1] * (clusterSize - 1));
+
+                for(int otherDir = 0; otherDir < 4; otherDir++){
+                    var otherPortals = cluster.portals[otherDir];
+                    if(otherPortals == null) continue;
+
+                    for(int j = 0; j < otherPortals.size; j++){
+
+                        if(!usedEdges.contains(Point2.pack(otherDir, j))){
+
+                            int
+                            other = otherPortals.items[j],
+                            otherFrom = Point2.x(other), otherTo = Point2.y(other),
+                            otherAverage = (otherFrom + otherTo) / 2,
+                            ox = cx * clusterSize + offsets[otherDir * 2] * (clusterSize - 1),
+                            oy = cy * clusterSize + offsets[otherDir * 2 + 1] * (clusterSize - 1),
+                            otherX = (moveDirs[otherDir * 2] * otherAverage + ox),
+                            otherY = (moveDirs[otherDir * 2 + 1] * otherAverage + oy);
+
+                            //duplicate portal; should never happen.
+                            if(Point2.pack(x, y) == Point2.pack(otherX, otherY)){
+                                continue;
+                            }
+
+                            float connectionCost = innerAstar(
+                                team, cost,
+                                minX, minY, maxX, maxY,
+                                x + y * wwidth,
+                                otherX + otherY * wwidth,
+                                (moveDirs[otherDir * 2] * otherFrom + ox),
+                                (moveDirs[otherDir * 2 + 1] * otherFrom + oy),
+                                (moveDirs[otherDir * 2] * otherTo + ox),
+                                (moveDirs[otherDir * 2 + 1] * otherTo + oy)
+                            );
+
+                            if(connectionCost != -1f){
+                                if(cluster.portalConnections[direction] == null) cluster.portalConnections[direction] = new LongSeq[cluster.portals[direction].size];
+                                if(cluster.portalConnections[otherDir] == null) cluster.portalConnections[otherDir] = new LongSeq[cluster.portals[otherDir].size];
+                                if(cluster.portalConnections[direction][i] == null) cluster.portalConnections[direction][i] = new LongSeq(8);
+                                if(cluster.portalConnections[otherDir][j] == null) cluster.portalConnections[otherDir][j] = new LongSeq(8);
+
+                                //TODO: can there be duplicate edges??
+                                cluster.portalConnections[direction][i].add(IntraEdge.get(otherDir, j, connectionCost));
+                                cluster.portalConnections[otherDir][j].add(IntraEdge.get(direction, i, connectionCost));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    //distance heuristic: manhattan
+    private static float heuristic(int a, int b){
+        int x = a % wwidth, x2 = b % wwidth, y = a / wwidth, y2 = b / wwidth;
+        return Math.abs(x - x2) + Math.abs(y - y2);
+    }
+
+    private static int tcost(int team, PathCost cost, int tilePos){
+        return cost.getCost(team, pathfinder.tiles[tilePos]);
+    }
+
+    private static float tileCost(int team, PathCost type, int a, int b){
+        //currently flat cost
+        return cost(team, type, b);
+    }
+
+    /** @return -1 if no path was found */
+    float innerAstar(int team, PathCost cost, int minX, int minY, int maxX, int maxY, int startPos, int goalPos, int goalX1, int goalY1, int goalX2, int goalY2){
+        var frontier = innerFrontier;
+        var costs = innerCosts;
+
+        frontier.clear();
+        costs.clear();
+
+        //TODO: this can be faster and more memory efficient by making costs a NxN array... probably?
+        costs.put(startPos, 0);
+        frontier.add(startPos, 0);
+
+        if(goalX2 < goalX1){
+            int tmp = goalX1;
+            goalX1 = goalX2;
+            goalX2 = tmp;
+        }
+
+        if(goalY2 < goalY1){
+            int tmp = goalY1;
+            goalY1 = goalY2;
+            goalY2 = tmp;
+        }
+
+        while(frontier.size > 0){
+            int current = frontier.poll();
+
+            int cx = current % wwidth, cy = current / wwidth;
+
+            //found the goal (it's in the portal rectangle)
+            if((cx >= goalX1 && cy >= goalY1 && cx <= goalX2 && cy <= goalY2) || current == goalPos){
+                return costs.get(current);
+            }
+
+            for(Point2 point : Geometry.d4){
+                int newx = cx + point.x, newy = cy + point.y;
+                int next = newx + wwidth * newy;
+
+                if(newx > maxX || newy > maxY || newx < minX || newy < minY || tcost(team, cost, next) == impassable) continue;
+
+                float add = tileCost(team, cost, current, next);
+
+                if(add < 0) continue;
+
+                float newCost = costs.get(current) + add;
+
+                if(newCost < costs.get(next, Float.POSITIVE_INFINITY)){
+                    costs.put(next, newCost);
+                    float priority = newCost + heuristic(next, goalPos);
+                    frontier.add(next, priority);
+                }
+            }
+        }
+
+        return -1f;
+    }
+
+    int makeNodeIndex(int cx, int cy, int dir, int portal){
+        //to make sure there's only one way to refer to each node, the direction must be 0 or 1 (referring to portals on the top or right edge)
+
+        //direction can only be 2 if cluster X is 0 (left edge of map)
+        if(dir == 2 && cx != 0){
+            dir = 0;
+            cx --;
+        }
+
+        //direction can only be 3 if cluster Y is 0 (bottom edge of map)
+        if(dir == 3 && cy != 0){
+            dir = 1;
+            cy --;
+        }
+
+        return NodeIndex.get(cx + cy * cwidth, dir, portal);
+    }
+
+    //uses A* to find the closest node index to specified coordinates
+    //this node is used in cluster A*
+    /** @return MAX_VALUE if no node is found */
+    private int findClosestNode(int team, int pathCost, int tileX, int tileY){
+        int cx = tileX / clusterSize, cy = tileY / clusterSize;
+
+        if(cx < 0 || cy < 0 || cx >= cwidth || cy >= cheight){
+            return Integer.MAX_VALUE;
+        }
+
+        PathCost cost = idToCost(pathCost);
+        Cluster cluster = getCreateCluster(team, pathCost, cx, cy);
+        int minX = cx * clusterSize, minY = cy * clusterSize, maxX = Math.min(minX + clusterSize - 1, wwidth - 1), maxY = Math.min(minY + clusterSize - 1, wheight - 1);
+
+        int bestPortalPair = Integer.MAX_VALUE;
+        float bestCost = Float.MAX_VALUE;
+
+        //A* to every node, find the best one (I know there's a better algorithm for this, probably dijkstra)
+        for(int dir = 0; dir < 4; dir++){
+            var portals = cluster.portals[dir];
+            if(portals == null) continue;
+
+            for(int j = 0; j < portals.size; j++){
+
+                int
+                other = portals.items[j],
+                otherFrom = Point2.x(other), otherTo = Point2.y(other),
+                otherAverage = (otherFrom + otherTo) / 2,
+                ox = cx * clusterSize + offsets[dir * 2] * (clusterSize - 1),
+                oy = cy * clusterSize + offsets[dir * 2 + 1] * (clusterSize - 1),
+                otherX = (moveDirs[dir * 2] * otherAverage + ox),
+                otherY = (moveDirs[dir * 2 + 1] * otherAverage + oy);
+
+                float connectionCost = innerAstar(
+                team, cost,
+                minX, minY, maxX, maxY,
+                tileX + tileY * wwidth,
+                otherX + otherY * wwidth,
+                (moveDirs[dir * 2] * otherFrom + ox),
+                (moveDirs[dir * 2 + 1] * otherFrom + oy),
+                (moveDirs[dir * 2] * otherTo + ox),
+                (moveDirs[dir * 2 + 1] * otherTo + oy)
+                );
+
+                //better cost found, update and return
+                if(connectionCost != -1f && connectionCost < bestCost){
+                    bestPortalPair = Point2.pack(dir, j);
+                    bestCost = connectionCost;
+                }
+            }
+        }
+
+        if(bestPortalPair != Integer.MAX_VALUE){
+            return makeNodeIndex(cx, cy, Point2.x(bestPortalPair), Point2.y(bestPortalPair));
+        }
+
+
+        return Integer.MAX_VALUE;
+    }
+
+    //distance heuristic: manhattan
+    private float clusterNodeHeuristic(int team, int pathCost, int nodeA, int nodeB){
+        int
+        clusterA = NodeIndex.cluster(nodeA),
+        dirA = NodeIndex.dir(nodeA),
+        portalA = NodeIndex.portal(nodeA),
+        clusterB = NodeIndex.cluster(nodeB),
+        dirB = NodeIndex.dir(nodeB),
+        portalB = NodeIndex.portal(nodeB),
+        rangeA = getCreateCluster(team, pathCost, clusterA).portals[dirA].items[portalA],
+        rangeB = getCreateCluster(team, pathCost, clusterB).portals[dirB].items[portalB];
+
+        float
+        averageA = (Point2.x(rangeA) + Point2.y(rangeA)) / 2f,
+        x1 = (moveDirs[dirA * 2] * averageA + (clusterA % cwidth) * clusterSize + offsets[dirA * 2] * (clusterSize - 1) + nextOffsets[dirA * 2] / 2f),
+        y1 = (moveDirs[dirA * 2 + 1] * averageA + (clusterA / cwidth) * clusterSize + offsets[dirA * 2 + 1] * (clusterSize - 1) + nextOffsets[dirA * 2 + 1] / 2f),
+
+        averageB = (Point2.x(rangeB) + Point2.y(rangeB)) / 2f,
+        x2 = (moveDirs[dirB * 2] * averageB + (clusterB % cwidth) * clusterSize + offsets[dirB * 2] * (clusterSize - 1) + nextOffsets[dirB * 2] / 2f),
+        y2 = (moveDirs[dirB * 2 + 1] * averageB + (clusterB / cwidth) * clusterSize + offsets[dirB * 2 + 1] * (clusterSize - 1) + nextOffsets[dirB * 2 + 1] / 2f);
+
+        return Math.abs(x1 - x2) + Math.abs(y1 - y2);
+    }
+
+    @Nullable IntSeq clusterAstar(PathRequest request, int pathCost, int startNodeIndex, int endNodeIndex){
+        var result = request.resultPath;
+
+        if(startNodeIndex == endNodeIndex){
+            result.clear();
+            result.add(startNodeIndex);
+            return result;
+        }
+
+        var team = request.team;
+
+        if(request.costs == null) request.costs = new IntFloatMap();
+        if(request.cameFrom == null) request.cameFrom = new IntIntMap();
+        if(request.frontier == null) request.frontier = new PathfindQueue();
+
+        //note: these are NOT cleared, it is assumed that this function cleans up after itself at the end
+        //is this a good idea? don't know, might hammer the GC with unnecessary objects too
+        var costs = request.costs;
+        var cameFrom = request.cameFrom;
+        var frontier = request.frontier;
+
+        cameFrom.put(startNodeIndex, startNodeIndex);
+        costs.put(startNodeIndex, 0);
+        frontier.add(startNodeIndex, 0);
+
+        boolean foundEnd = false;
+
+        while(frontier.size > 0){
+            int current = frontier.poll();
+
+            if(current == endNodeIndex){
+                foundEnd = true;
+                break;
+            }
+
+            int cluster = NodeIndex.cluster(current), dir = NodeIndex.dir(current), portal = NodeIndex.portal(current);
+            int cx = cluster % cwidth, cy = cluster / cwidth;
+
+            //invalid cluster index (TODO: how?)
+            if(cx >= cwidth || cy >= cheight || cx < 0 || cy < 0) continue;
+
+            Cluster clust = getCreateCluster(team, pathCost, cluster);
+            LongSeq innerCons = clust.portalConnections[dir] == null || portal >= clust.portalConnections[dir].length ? null : clust.portalConnections[dir][portal];
+
+            //edges for the cluster the node is 'in'
+            if(innerCons != null){
+                checkEdges(request, team, pathCost, current, endNodeIndex, cx, cy, innerCons);
+            }
+
+            //edges that this node 'faces' from the other side
+            int nextCx = cx + Geometry.d4[dir].x, nextCy = cy + Geometry.d4[dir].y;
+            if(nextCx >= 0 && nextCy >= 0 && nextCx < cwidth && nextCy < cheight){
+                Cluster nextCluster = getCreateCluster(team, pathCost, nextCx, nextCy);
+                int relativeDir = (dir + 2) % 4;
+                LongSeq outerCons = nextCluster.portalConnections[relativeDir] == null || nextCluster.portalConnections[relativeDir].length <= portal ? null : nextCluster.portalConnections[relativeDir][portal];
+                if(outerCons != null){
+                    checkEdges(request, team, pathCost, current, endNodeIndex, nextCx, nextCy, outerCons);
+                }
+            }
+        }
+
+        //null them out, so they get GC'ed later
+        //there's no reason to keep them around and waste memory, since this path may never be recalculated
+        request.costs = null;
+        request.cameFrom = null;
+        request.frontier = null;
+
+        if(foundEnd){
+            result.clear();
+
+            int cur = endNodeIndex;
+            while(cur != startNodeIndex){
+                result.add(cur);
+                cur = cameFrom.get(cur);
+            }
+
+            result.reverse();
+
+            return result;
+        }
+        return null;
+    }
+
+    private void checkEdges(PathRequest request, int team, int pathCost, int current, int goal, int cx, int cy, LongSeq connections){
+        for(int i = 0; i < connections.size; i++){
+            long con = connections.items[i];
+            float cost = IntraEdge.cost(con);
+            int otherDir = IntraEdge.dir(con), otherPortal = IntraEdge.portal(con);
+            int next = makeNodeIndex(cx, cy, otherDir, otherPortal);
+
+            float newCost = request.costs.get(current) + cost;
+
+            if(newCost < request.costs.get(next, Float.POSITIVE_INFINITY)){
+                request.costs.put(next, newCost);
+
+                request.frontier.add(next, newCost + clusterNodeHeuristic(team, pathCost, next, goal));
+                request.cameFrom.put(next, current);
+            }
+        }
+    }
+
+    private void updateFields(FieldCache cache, long nsToRun){
+        var frontier = cache.frontier;
+        var fields = cache.fields;
+        var goalPos = cache.goalPos;
+        var pcost = cache.cost;
+        var team = cache.team;
+
+        long start = Time.nanos();
+        int counter = 0;
+
+        //actually do the flow field part
+        while(frontier.size > 0){
+            int tile = frontier.removeLast();
+            int baseX = tile % wwidth, baseY = tile / wwidth;
+            int curWeightIndex = (baseX / clusterSize) + (baseY / clusterSize) * cwidth;
+
+            //TODO: how can this be null??? serious problem!
+            int[] curWeights = fields.get(curWeightIndex);
+            if(curWeights == null) continue;
+
+            int cost = curWeights[baseX % clusterSize + ((baseY % clusterSize) * clusterSize)];
+
+            if(cost != impassable){
+                for(Point2 point : Geometry.d4){
+
+                    int
+                    dx = baseX + point.x, dy = baseY + point.y,
+                    clx = dx / clusterSize, cly = dy / clusterSize;
+
+                    if(clx < 0 || cly < 0 || dx >= wwidth || dy >= wheight) continue;
+
+                    int nextWeightIndex = clx + cly * cwidth;
+
+                    int[] weights = nextWeightIndex == curWeightIndex ? curWeights : fields.get(nextWeightIndex);
+
+                    //out of bounds; not allowed to move this way because no weights were registered here
+                    if(weights == null) continue;
+
+                    int newPos = tile + point.x + point.y * wwidth;
+
+                    //can't move back to the goal
+                    if(newPos == goalPos) continue;
+
+                    if(dx - clx * clusterSize < 0 || dy - cly * clusterSize < 0) continue;
+
+                    int newPosArray = (dx - clx * clusterSize) + (dy - cly * clusterSize) * clusterSize;
+
+                    int otherCost = pcost.getCost(team, pathfinder.tiles[newPos]);
+                    int oldCost = weights[newPosArray];
+
+                    //a cost of 0 means uninitialized, OR it means we're at the goal position, but that's handled above
+                    if((oldCost == 0 || oldCost > cost + otherCost) && otherCost != impassable){
+                        frontier.addFirst(newPos);
+                        weights[newPosArray] = cost + otherCost;
+                    }
+                }
+            }
+
+            //every N iterations, check the time spent - this prevents extra calls to nano time, which itself is slow
+            if(nsToRun >= 0 && (counter++) >= updateStepInterval){
+                counter = 0;
+                if(Time.timeSinceNanos(start) >= nsToRun){
+                    return;
+                }
+            }
+        }
+    }
+
+    private void addFlowCluster(FieldCache cache, int cluster, boolean addingFrontier){
+        addFlowCluster(cache, cluster % cwidth, cluster / cwidth, addingFrontier);
+    }
+
+    private void addFlowCluster(FieldCache cache, int cx, int cy, boolean addingFrontier){
+        //out of bounds
+        if(cx < 0 || cy < 0 || cx >= cwidth || cy >= cheight) return;
+
+        var fields = cache.fields;
+        int key = cx + cy * cwidth;
+
+        if(!fields.containsKey(key)){
+            fields.put(key, new int[clusterSize * clusterSize]);
+
+            if(addingFrontier){
+                for(int dir = 0; dir < 4; dir++){
+                    int ox = cx + nextOffsets[dir * 2], oy = cy + nextOffsets[dir * 2 + 1];
+
+                    if(ox < 0 || oy < 0 || ox >= cwidth || oy >= cheight) continue;
+
+                    var otherField = fields.get(ox + oy * cwidth);
+
+                    if(otherField == null) continue;
+
+                    int
+                    relOffset = (dir + 2) % 4,
+                    movex = moveDirs[relOffset * 2],
+                    movey = moveDirs[relOffset * 2 + 1],
+                    otherx1 = offsets[relOffset * 2] * (clusterSize - 1),
+                    othery1 = offsets[relOffset * 2 + 1] * (clusterSize - 1);
+
+                    //scan the edge of the cluster
+                    for(int i = 0; i < clusterSize; i++){
+                        int x = otherx1 + movex * i, y = othery1 + movey * i;
+
+                        //check to make sure it's not 0 (uninitialized flowfield data)
+                        if(otherField[x + y * clusterSize] > 0){
+                            int worldX = x + ox * clusterSize, worldY = y + oy * clusterSize;
+
+                            //add the world-relative position to the frontier, so it recalculates
+                            cache.frontier.addFirst(worldX + worldY * wwidth);
+
+                            if(showDebug){
+                                Core.app.post(() -> Fx.placeBlock.at(worldX *tilesize, worldY * tilesize, 1f));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void initializePathRequest(PathRequest request, int team, int costId, int unitX, int unitY, int goalX, int goalY){
+        PathCost pcost = idToCost(costId);
+
+        int goalPos = (goalX + goalY * wwidth);
+
+        int node = findClosestNode(team, costId, unitX, unitY);
+        int dest = findClosestNode(team, costId, goalX, goalY);
+
+        if(dest == Integer.MAX_VALUE){
+            request.notFound = true;
+            //no node found (TODO: invalid state??)
+            return;
+        }
+
+        var nodePath = clusterAstar(request, costId, node, dest);
+
+        //no result found, bail out.
+        if(nodePath == null){
+            request.notFound = true;
+            //stop following the old path, it's not relevant now, it's just not possible to reach the destination anymore
+            request.oldCache = null;
+            return;
+        }
+
+        FieldCache cache = fields.get(FieldIndex.get(goalPos, costId, team));
+        //if true, extra values are added on the sides of existing field cells that face new cells.
+        boolean addingFrontier = true;
+
+        //create the cache if it doesn't exist, and initialize it
+        if(cache == null){
+            cache = new FieldCache(pcost, costId, team, goalPos);
+            fields.put(cache.mapKey, cache);
+            FieldCache fcache = cache;
+            //register field in main thread for iteration
+            Core.app.post(() -> fieldList.add(fcache));
+            cache.frontier.addFirst(goalPos);
+            addingFrontier = false; //when it's a new field, there is no need to add to the frontier to merge the flowfield
+        }
+
+        if(nodePath != null){
+            int cx = unitX / clusterSize, cy = unitY / clusterSize;
+
+            addFlowCluster(cache, cx, cy, addingFrontier);
+
+            for(int i = -1; i < nodePath.size; i++){
+                int
+                current = i == -1 ? node : nodePath.items[i],
+                cluster = NodeIndex.cluster(current),
+                dir = NodeIndex.dir(current),
+                dx = Geometry.d4[dir].x,
+                dy = Geometry.d4[dir].y,
+                ox = cluster % cwidth + dx,
+                oy = cluster / cwidth + dy;
+
+                addFlowCluster(cache, cluster, addingFrontier);
+
+                //store directional/flipped version of cluster
+                if(ox >= 0 && oy >= 0 && ox < cwidth && oy < cheight){
+                    int other = ox + oy * cwidth;
+
+                    addFlowCluster(cache, other, addingFrontier);
+                }
+            }
+        }
+    }
+
+    private PathCost idToCost(int costId){
+        return ControlPathfinder.costTypes.get(costId);
+    }
+
+    public static boolean isNearObstacle(Unit unit, int x1, int y1, int x2, int y2){
+        return raycast(unit.team().id, unit.type.pathCost, x1, y1, x2, y2);
+    }
+
+    @Deprecated
+    public int nextTargetId(){
+        return 0;
+    }
+
+    @Deprecated
+    public boolean getPathPosition(Unit unit, int pathId, Vec2 destination, Vec2 out){
+        return getPathPosition(unit, pathId, destination, out, null);
+    }
+
+    @Deprecated
+    public boolean getPathPosition(Unit unit, int pathId, Vec2 destination, Vec2 out, @Nullable boolean[] noResultFound){
+        return getPathPosition(unit, destination, destination, out, noResultFound);
+    }
+
+    public boolean getPathPosition(Unit unit, Vec2 destination, Vec2 out, @Nullable boolean[] noResultFound){
+        return getPathPosition(unit, destination, destination, out, noResultFound);
+    }
+
+    public boolean getPathPosition(Unit unit, Vec2 destination, Vec2 mainDestination, Vec2 out, @Nullable boolean[] noResultFound){
+        if(noResultFound != null){
+            noResultFound[0] = false;
+        }
+
+        int costId = unit.type.pathCostId;
+        PathCost cost = idToCost(costId);
+
+        int
+        team = unit.team.id,
+        tileX = unit.tileX(),
+        tileY = unit.tileY(),
+        packedPos = world.packArray(tileX, tileY),
+        destX = World.toTile(mainDestination.x),
+        destY = World.toTile(mainDestination.y),
+        actualDestX = World.toTile(destination.x),
+        actualDestY = World.toTile(destination.y),
+        actualDestPos = actualDestX + actualDestY * wwidth,
+        destPos = destX + destY * wwidth;
+
+        PathRequest request = unitRequests.get(unit);
+
+        unit.hitboxTile(Tmp.r3);
+        //tile rect size has tile size factored in, since the ray cannot have thickness
+        float tileRectSize = tilesize + Tmp.r3.height;
+
+        int lastRaycastTile = request == null || world.tileChanges != request.lastWorldUpdate ? -1 : request.lastRaycastTile;
+        boolean raycastResult = request != null && request.lastRaycastResult;
+
+        //cache raycast results to run every time the world updates, and every tile the unit crosses
+        if(lastRaycastTile != packedPos){
+            //near the destination, standard raycasting tends to break down, so use the more permissive 'near' variant that doesn't take into account edges of walls
+            raycastResult = unit.within(destination, tilesize * 2.5f) ?
+                !raycastRect(unit.x, unit.y, destination.x, destination.y, team, cost, tileX, tileY, actualDestX, actualDestY, tileRectSize) :
+                !raycast(team, cost, tileX, tileY, actualDestX, actualDestY);
+
+            if(request != null){
+                request.lastRaycastTile = packedPos;
+                request.lastRaycastResult = raycastResult;
+                request.lastWorldUpdate = world.tileChanges;
+            }
+        }
+
+        //if the destination can be trivially reached in a straight line, do that.
+        if(raycastResult){
+            out.set(destination);
+            return true;
+        }
+
+        boolean any = false;
+
+        long fieldKey = FieldIndex.get(destPos, costId, team);
+
+        //use existing request if it exists.
+        if(request != null && request.destination == destPos){
+            request.lastUpdateId = state.updateId;
+
+            Tile tileOn = unit.tileOn(), initialTileOn = tileOn;
+            //TODO: should fields be accessible from this thread?
+            FieldCache fieldCache = null;
+            try{
+                fieldCache = fields.get(fieldKey);
+            }catch(ArrayIndexOutOfBoundsException ignored){ //TODO fix this, rare crash due to remove() elsewhere
+            }
+            if(fieldCache == null) fieldCache = request.oldCache;
+
+            if(fieldCache != null && tileOn != null){
+                FieldCache old = request.oldCache;
+                FieldCache targetCache = old != null ? old : fieldCache;
+                boolean requeue = old == null;
+                //nullify the old field to be GCed, as it cannot be relevant anymore (this path is complete)
+                if(fieldCache != request.oldCache && fieldCache.frontier.isEmpty() && old != null){
+                    request.oldCache = null;
+                }
+
+                fieldCache.lastUpdateId = state.updateId;
+                int maxIterations = 30; //TODO higher/lower number? is this still too slow?
+                int i = 0;
+                boolean recalc = false;
+
+                if(packedPos == actualDestPos){
+                    request.lastTargetTile = tileOn;
+                //TODO last pos can change if the flowfield changes.
+                }else if(initialTileOn.pos() != request.lastTile || request.lastTargetTile == null){
+                    boolean anyNearSolid = false;
+
+                    //find the next tile until one near a solid block is discovered
+                    while(i ++ < maxIterations){
+                        int value = getCost(targetCache, tileOn.x, tileOn.y, requeue);
+
+                        Tile current = null;
+                        int minCost = 0;
+                        for(int dir = 0; dir < 4; dir ++){
+                            Point2 point = Geometry.d4[dir];
+                            int dx = tileOn.x + point.x, dy = tileOn.y + point.y;
+
+                            Tile other = world.tile(dx, dy);
+
+                            if(other == null) continue;
+
+                            int packed = world.packArray(dx, dy);
+                            int otherCost = getCost(targetCache, dx, dy, requeue), relCost = otherCost - value;
+
+                            if(relCost > 2 || otherCost <= 0){
+                                anyNearSolid = true;
+                            }
+
+                            if((value == 0 || otherCost < value) && otherCost != impassable && ((otherCost != 0 && (current == null || otherCost < minCost)) || packed == actualDestPos || packed == destPos) && passable(unit.team.id, cost, packed)){
+                                current = other;
+                                minCost = otherCost;
+                                //no need to keep searching.
+                                if(packed == destPos || packed == actualDestPos){
+                                    break;
+                                }
+                            }
+                        }
+
+                        //TODO raycast spam = extremely slow
+                        //...flowfield integration spam is also really slow.
+                        if(!(current == null || (costId == costIdGround && current.dangerous() && !tileOn.dangerous()))){
+
+                            //when anyNearSolid is false, no solid tiles have been encountered anywhere so far, so raycasting is a waste of time
+                            if(anyNearSolid && !(tileOn.dangerous() && costId == costIdGround) && raycastRect(unit.x, unit.y, current.x * tilesize, current.y * tilesize, team, cost, initialTileOn.x, initialTileOn.y, current.x, current.y, tileRectSize)){
+
+                                //TODO this may be a mistake
+                                if(tileOn == initialTileOn){
+                                    recalc = true;
+                                    any = true;
+                                }
+
+                                break;
+                            }else{
+                                tileOn = current;
+                                any = true;
+
+                                int a = current.array();
+
+                                if(a == destPos || a == actualDestPos){
+                                    break;
+                                }
+                            }
+
+                        }else{
+                            break;
+                        }
+                    }
+
+                    request.lastTargetTile = any ? tileOn : null;
+                    if(showDebug && tileOn != null && Core.graphics.getFrameId() % 30 == 0){
+                        Fx.placeBlock.at(tileOn.worldx(), tileOn.worldy(), 1);
+                    }
+                }
+
+                if(request.lastTargetTile != null){
+                    if(showDebug && Core.graphics.getFrameId() % 30 == 0){
+                        Fx.breakBlock.at(request.lastTargetTile.worldx(), request.lastTargetTile.worldy(), 1);
+                    }
+                    out.set(request.lastTargetTile);
+                    request.lastTile = recalc ? -1 : initialTileOn.pos();
+                    return true;
+                }
+            }
+        }else{
+            //destroy the old one immediately, it's invalid now
+            if(request != null){
+                request.lastUpdateId = -1000;
+            }
+
+            //queue new request.
+            unitRequests.put(unit, request = new PathRequest(unit, team, costId, destPos));
+
+            PathRequest f = request;
+
+            //on the pathfinding thread: initialize the request
+            queue.post(() -> {
+                threadPathRequests.add(f);
+                recalculatePath(f);
+            });
+
+            return false;
+        }
+
+        if(noResultFound != null){
+            noResultFound[0] = request.notFound;
+        }
+        return false;
+    }
+
+    private void recalculatePath(PathRequest request){
+        initializePathRequest(request, request.team, request.costId, request.unit.tileX(), request.unit.tileY(), request.destination % wwidth, request.destination / wwidth);
+    }
+
+    private int getCost(FieldCache cache, int x, int y, boolean requeue){
+        try{
+            int[] field = cache.fields.get(x / clusterSize + (y / clusterSize) * cwidth);
+            if(field == null){
+                if(!requeue) return 0;
+                //request a new flow cluster if one wasn't found; this may be a spammed a bit, but the function will return early once it's created the first time
+                queue.post(() -> addFlowCluster(cache, x / clusterSize, y / clusterSize, true));
+                return 0;
+            }
+            return field[(x % clusterSize) + (y % clusterSize) * clusterSize];
+        }catch(ArrayIndexOutOfBoundsException e){
+            //TODO: this crashes because the fields are being added while they're accessed. really bad. needs a long-term solution and some way to cache the map lookup results.
+            //using an array instead of a map would be nice, but that can mean something like 2500 entries in a sparse array, which is pretty terrible...
+            return 0;
+        }
+    }
+
+    private static boolean raycast(int team, PathCost type, int x1, int y1, int x2, int y2){
+        int ww = wwidth, wh = wheight;
+        int x = x1, dx = Math.abs(x2 - x), sx = x < x2 ? 1 : -1;
+        int y = y1, dy = Math.abs(y2 - y), sy = y < y2 ? 1 : -1;
+        int e2, err = dx - dy;
+
+        while(x >= 0 && y >= 0 && x < ww && y < wh){
+            if(avoid(team, type, x + y * wwidth)) return true;
+            if(x == x2 && y == y2) return false;
+
+            //diagonal ver
+            e2 = 2 * err;
+            if(e2 > -dy){
+                err -= dy;
+                x += sx;
+            }
+
+            if(e2 < dx){
+                err += dx;
+                y += sy;
+            }
+        }
+
+        return true;
+    }
+
+    /** @return 0 if nothing was hit, otherwise the packed coordinates. This is an internal function and will likely be moved - do not use!*/
+    public static int raycastFast(int team, PathCost type, int x1, int y1, int x2, int y2){
+        int ww = world.width(), wh = world.height();
+        int x = x1, dx = Math.abs(x2 - x), sx = x < x2 ? 1 : -1;
+        int y = y1, dy = Math.abs(y2 - y), sy = y < y2 ? 1 : -1;
+        int err = dx - dy;
+
+        while(x >= 0 && y >= 0 && x < ww && y < wh){
+            if(solid(team, type, x + y * wwidth, true)) return Point2.pack(x, y);
+            if(x == x2 && y == y2) return 0;
+
+            //no diagonals
+            if(2 * err + dy > dx - 2 * err){
+                err -= dy;
+                x += sx;
+            }else{
+                err += dx;
+                y += sy;
+            }
+        }
+
+        return 0;
+    }
+
+    /** @return 0 if nothing was hit, otherwise the packed coordinates. This is an internal function and will likely be moved - do not use!*/
+    public static int raycastFastAvoid(int team, PathCost type, int x1, int y1, int x2, int y2){
+        int ww = world.width(), wh = world.height();
+        int x = x1, dx = Math.abs(x2 - x), sx = x < x2 ? 1 : -1;
+        int y = y1, dy = Math.abs(y2 - y), sy = y < y2 ? 1 : -1;
+        int err = dx - dy;
+
+        while(x >= 0 && y >= 0 && x < ww && y < wh){
+            if(avoid(team, type, x + y * wwidth)) return Point2.pack(x, y);
+            if(x == x2 && y == y2) return 0;
+
+            //no diagonals
+            if(2 * err + dy > dx - 2 * err){
+                err -= dy;
+                x += sx;
+            }else{
+                err += dx;
+                y += sy;
+            }
+        }
+
+        return 0;
+    }
+
+    private static boolean overlap(int team, PathCost type, int x, int y, float startX, float startY, float endX, float endY, float rectSize){
+        if(x < 0 || y < 0 || x >= wwidth || y >= wheight) return false;
+        if(!nearPassable(team, type, x + y * wwidth)){
+            return Intersector.intersectSegmentRectangleFast(startX, startY, endX, endY, x * tilesize - rectSize/2f, y * tilesize - rectSize/2f, rectSize, rectSize);
+        }
+        return false;
+    }
+
+    private static boolean raycastRect(float startX, float startY, float endX, float endY, int team, PathCost type, int x1, int y1, int x2, int y2, float rectSize){
+        int ww = wwidth, wh = wheight;
+        int x = x1, dx = Math.abs(x2 - x), sx = x < x2 ? 1 : -1;
+        int y = y1, dy = Math.abs(y2 - y), sy = y < y2 ? 1 : -1;
+        int e2, err = dx - dy;
+
+        while(x >= 0 && y >= 0 && x < ww && y < wh){
+            if(
+            !nearPassable(team, type, x + y * wwidth) ||
+            overlap(team, type, x + 1, y, startX, startY, endX, endY, rectSize) ||
+            overlap(team, type, x - 1, y, startX, startY, endX, endY, rectSize) ||
+            overlap(team, type, x, y + 1, startX, startY, endX, endY, rectSize) ||
+            overlap(team, type, x, y - 1, startX, startY, endX, endY, rectSize)
+            ) return true;
+
+            if(x == x2 && y == y2) return false;
+
+            //diagonal ver
+            e2 = 2 * err;
+            if(e2 > -dy){
+                err -= dy;
+                x += sx;
+            }
+
+            if(e2 < dx){
+                err += dx;
+                y += sy;
+            }
+        }
+
+        return true;
+    }
+
+    private static boolean avoid(int team, PathCost type, int tilePos){
+        int cost = cost(team, type, tilePos);
+        return cost == impassable || cost >= 2;
+    }
+
+    private static boolean passable(int team, PathCost cost, int pos){
+        int amount = cost.getCost(team, pathfinder.tiles[pos]);
+        return amount != impassable && amount < solidCap;
+    }
+
+    private static boolean nearPassable(int team, PathCost cost, int pos){
+        int amount = cost.getCost(team, pathfinder.tiles[pos]);
+        //for standard units: never consider deep water (cost = 6000) passable
+        //for leg units: consider it passable
+        return amount != impassable && amount < (cost == costLegs ? solidCap : 50);
+    }
+
+    private static boolean solid(int team, PathCost type, int x, int y){
+        return x < 0 || y < 0 || x >= wwidth || y >= wheight || solid(team, type, x + y * wwidth, true);
+    }
+
+    private static boolean solid(int team, PathCost type, int tilePos, boolean checkWall){
+        int cost = cost(team, type, tilePos);
+        return cost == impassable || cost >= solidCap;
+    }
+
+    private static int cost(int team, PathCost cost, int tilePos){
+        if(state.rules.limitMapArea && !Team.get(team).isAI()){
+            int x = tilePos % wwidth, y = tilePos / wwidth;
+            if(x < state.rules.limitX || y < state.rules.limitY || x > state.rules.limitX + state.rules.limitWidth || y > state.rules.limitY + state.rules.limitHeight){
+                return impassable;
+            }
+        }
+        return cost.getCost(team, pathfinder.tiles[tilePos]);
+    }
+
+    private void clusterChanged(int team, int pathCost, int cx, int cy){
+        int index = cx + cy * cwidth;
+
+        for(var req : threadPathRequests){
+            long mapKey = FieldIndex.get(req.destination, pathCost, team);
+            var field = fields.get(mapKey);
+            if((field != null && field.fields.containsKey(index)) || req.notFound){
+                invalidRequests.add(req);
+            }
+        }
+
+    }
+
+    private void updateClustersComplete(int clusterIndex){
+        for(int team = 0; team < clusters.length; team++){
+            var dim1 = clusters[team];
+            if(dim1 != null){
+                for(int pathCost = 0; pathCost < dim1.length; pathCost++){
+                    var dim2 = dim1[pathCost];
+                    if(dim2 != null){
+                        var cluster = dim2[clusterIndex];
+                        if(cluster != null){
+                            updateCluster(team, pathCost, clusterIndex % cwidth, clusterIndex / cwidth);
+                            clusterChanged(team, pathCost, clusterIndex % cwidth, clusterIndex / cwidth);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void updateClustersInner(int clusterIndex){
+        for(int team = 0; team < clusters.length; team++){
+            var dim1 = clusters[team];
+            if(dim1 != null){
+                for(int pathCost = 0; pathCost < dim1.length; pathCost++){
+                    var dim2 = dim1[pathCost];
+                    if(dim2 != null){
+                        var cluster = dim2[clusterIndex];
+                        if(cluster != null){
+                            updateInnerEdges(team, pathCost, clusterIndex % cwidth, clusterIndex / cwidth, cluster);
+                            clusterChanged(team, pathCost, clusterIndex % cwidth, clusterIndex / cwidth);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void run(){
+        long lastInvalidCheck = Time.millis() + invalidateCheckInterval;
+
+        while(true){
+            if(net.client()) return;
+            try{
+
+
+                if(state.isPlaying()){
+                    queue.run();
+
+                    clustersToUpdate.each(cluster -> {
+                        updateClustersComplete(cluster);
+
+                        //just in case: don't redundantly update inner clusters after you've recalculated it entirely
+                        clustersToInnerUpdate.remove(cluster);
+                    });
+
+                    clustersToInnerUpdate.each(cluster -> {
+                        //only recompute the inner links
+                        updateClustersInner(cluster);
+                    });
+
+                    clustersToInnerUpdate.clear();
+                    clustersToUpdate.clear();
+
+                    //periodically check for invalidated paths
+                    if(Time.timeSinceMillis(lastInvalidCheck) > invalidateCheckInterval){
+                        lastInvalidCheck = Time.millis();
+
+                        var it = invalidRequests.iterator();
+                        while(it.hasNext()){
+                            var request = it.next();
+
+                            //invalid request, ignore it
+                            if(request.invalidated){
+                                it.remove();
+                                continue;
+                            }
+
+                            long mapKey = FieldIndex.get(request.destination, request.costId, request.team);
+
+                            var field = fields.get(mapKey);
+
+                            if(field != null){
+                                //it's only worth recalculating a path when the current frontier has finished; otherwise the unit will be following something incomplete.
+                                if(field.frontier.isEmpty()){
+
+                                    //remove the field, to be recalculated next update once recalculatePath is processed
+                                    fields.remove(field.mapKey);
+                                    Core.app.post(() -> fieldList.remove(field));
+
+                                    //once the field is invalidated, make sure that all the requests that have it stored in their 'old' field, so units don't stutter during recalculations
+                                    for(var otherRequest : threadPathRequests){
+                                        if(otherRequest.destination == request.destination){
+                                            otherRequest.oldCache = field;
+
+                                            if(otherRequest != request){
+                                                queue.post(() -> recalculatePath(otherRequest));
+                                            }
+                                        }
+                                    }
+
+                                    //the recalculation is done next update, so multiple path requests in the same batch don't end up removing and recalculating the field multiple times.
+                                    queue.post(() -> recalculatePath(request));
+                                    //it has been processed.
+                                    it.remove();
+                                }
+                            }else{ //there's no field, presumably because a previous request already invalidated it.
+                                queue.post(() -> recalculatePath(request));
+                                it.remove();
+                            }
+                        }
+                    }
+
+                    //each update time (not total!) no longer than maxUpdate
+                    for(FieldCache cache : fields.values()){
+                        updateFields(cache, maxUpdate);
+                    }
+                }
+
+                try{
+                    Thread.sleep(updateInterval);
+                }catch(InterruptedException e){
+                    //stop looping when interrupted externally
+                    return;
+                }
+            }catch(Throwable e){
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Struct
+    static class FieldIndexStruct{
+        int pos;
+        @StructField(8)
+        int costId;
+        @StructField(8)
+        int team;
+    }
+
+    @Struct
+    static class IntraEdgeStruct{
+        @StructField(8)
+        int dir;
+        @StructField(8)
+        int portal;
+
+        float cost;
+    }
+
+    @Struct
+    static class NodeIndexStruct{
+        @StructField(22)
+        int cluster;
+        @StructField(2)
+        int dir;
+        @StructField(8)
+        int portal;
+    }
+}
diff --git a/core/src/mindustry/ai/PathfindQueue.java b/core/src/mindustry/ai/PathfindQueue.java
new file mode 100644
index 0000000000..aab2d7df82
--- /dev/null
+++ b/core/src/mindustry/ai/PathfindQueue.java
@@ -0,0 +1,146 @@
+package mindustry.ai;
+
+import arc.util.*;
+
+/** A priority queue. */
+@SuppressWarnings("unchecked")
+public class PathfindQueue{
+    private static final double CAPACITY_RATIO_LOW = 1.5f;
+    private static final double CAPACITY_RATIO_HI = 2f;
+
+    /**
+     * Priority queue represented as a balanced binary heap: the two children of queue[n] are queue[2*n+1] and queue[2*(n+1)]. The
+     * priority queue is ordered by the elements' natural ordering: For each node n in the heap and each descendant d of n, n <= d.
+     * The element with the lowest value is in queue[0], assuming the queue is nonempty.
+     */
+    public int[] queue;
+    /** Weights of each object in the queue. */
+    public float[] weights;
+    /** The number of elements in the priority queue. */
+    public int size = 0;
+
+    public PathfindQueue(){
+        this(12);
+    }
+
+    public PathfindQueue(int initialCapacity){
+        this.queue = new int[initialCapacity];
+        this.weights = new float[initialCapacity];
+    }
+
+    public boolean empty(){
+        return size == 0;
+    }
+
+    /**
+     * Inserts the specified element into this priority queue. If {@code uniqueness} is enabled and this priority queue already
+     * contains the element, the call leaves the queue unchanged and returns false.
+     * @return true if the element was added to this queue, else false
+     * @throws ClassCastException if the specified element cannot be compared with elements currently in this priority queue
+     * according to the priority queue's ordering
+     * @throws IllegalArgumentException if the specified element is null
+     */
+    public boolean add(int e, float weight){
+        int i = size;
+        if(i >= queue.length) growToSize(i + 1);
+        size = i + 1;
+        if(i == 0){
+            queue[0] = e;
+            weights[0] = weight;
+        }else{
+            siftUp(i, e, weight);
+        }
+        return true;
+    }
+
+    /**
+     * Retrieves, but does not remove, the head of this queue. If this queue is empty, {@code 0} is returned.
+     * @return the head of this queue
+     */
+    public int peek(){
+        return size == 0 ? 0 : queue[0];
+    }
+
+    /** Removes all of the elements from this priority queue. The queue will be empty after this call returns. */
+    public void clear(){
+        size = 0;
+    }
+
+    /**
+     * Retrieves and removes the head of this queue, or returns {@code null} if this queue is empty.
+     * @return the head of this queue, or {@code null} if this queue is empty.
+     */
+    public int poll(){
+        if(size == 0) return 0;
+        int s = --size;
+        int result = queue[0];
+        int x = queue[s];
+        if(s != 0) siftDown(0, x, weights[s]);
+        return result;
+    }
+
+    /**
+     * Inserts item x at position k, maintaining heap invariant by promoting x up the tree until it is greater than or equal to its
+     * parent, or is the root.
+     * @param k the position to fill
+     * @param x the item to insert
+     */
+    private void siftUp(int k, int x, float weight){
+        while(k > 0){
+            int parent = (k - 1) >>> 1;
+            int e = queue[parent];
+            if(weight >= weights[parent]) break;
+            queue[k] = e;
+            weights[k] = weights[parent];
+            k = parent;
+        }
+        queue[k] = x;
+        weights[k] = weight;
+    }
+
+    /**
+     * Inserts item x at position k, maintaining heap invariant by demoting x down the tree repeatedly until it is less than or
+     * equal to its children or is a leaf.
+     * @param k the position to fill
+     * @param x the item to insert
+     */
+    private void siftDown(int k, int x, float weight){
+        int half = size >>> 1; // loop while a non-leaf
+        while(k < half){
+            int child = (k << 1) + 1; // assume left child is least
+            int c = queue[child];
+            int right = child + 1;
+            if(right < size && weights[child] > weights[right]){
+                c = queue[child = right];
+            }
+            if(weight <= weights[child]) break;
+            queue[k] = c;
+            weights[k] = weights[child];
+            k = child;
+        }
+        queue[k] = x;
+        weights[k] = weight;
+    }
+
+    /**
+     * Increases the capacity of the array.
+     * @param minCapacity the desired minimum capacity
+     */
+    private void growToSize(int minCapacity){
+        if(minCapacity < 0) // overflow
+            throw new ArcRuntimeException("Capacity upper limit exceeded.");
+        int oldCapacity = queue.length;
+        // Double size if small; else grow by 50%
+        int newCapacity = (int)((oldCapacity < 64) ? ((oldCapacity + 1) * CAPACITY_RATIO_HI) : (oldCapacity * CAPACITY_RATIO_LOW));
+        if(newCapacity < 0) // overflow
+            newCapacity = Integer.MAX_VALUE;
+        if(newCapacity < minCapacity) newCapacity = minCapacity;
+
+        int[] newQueue = new int[newCapacity];
+        float[] newWeights = new float[newCapacity];
+        System.arraycopy(queue, 0, newQueue, 0, size);
+        System.arraycopy(weights, 0, newWeights, 0, size);
+        queue = newQueue;
+        weights = newWeights;
+    }
+}
\ No newline at end of file
diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java
index 8c9a9cda6d..615568aed7 100644
--- a/core/src/mindustry/ai/Pathfinder.java
+++ b/core/src/mindustry/ai/Pathfinder.java
@@ -2,46 +2,50 @@ package mindustry.ai;
 
 import arc.*;
 import arc.func.*;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.async.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.storage.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
+import static mindustry.world.meta.BlockFlag.*;
 
 public class Pathfinder implements Runnable{
-    private static final long maxUpdate = Time.millisToNanos(7);
+    private static final long maxUpdate = Time.millisToNanos(8);
     private static final int updateFPS = 60;
     private static final int updateInterval = 1000 / updateFPS;
-    private static final int impassable = -1;
-    private static final int fieldTimeout = 1000 * 60 * 2;
+
+    /** cached world size */
+    static int wwidth, wheight;
+
+    static final int impassable = -1;
 
     public static final int
-        fieldCore = 0,
-        fieldRally = 1;
+        fieldCore = 0;
 
     public static final Seq<Prov<Flowfield>> fieldTypes = Seq.with(
-        EnemyCoreField::new,
-        RallyField::new
+        EnemyCoreField::new
     );
 
     public static final int
         costGround = 0,
         costLegs = 1,
-        costNaval = 2;
+        costNaval = 2,
+        costHover = 3;
 
     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 +
+        (team, tile) ->
+            (PathTile.allDeep(tile) || ((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0) && PathTile.solid(tile)) ? impassable : 1 +
             PathTile.health(tile) * 5 +
             (PathTile.nearSolid(tile) ? 2 : 0) +
             (PathTile.nearLiquid(tile) ? 6 : 0) +
@@ -49,21 +53,31 @@ public class Pathfinder implements Runnable{
             (PathTile.damages(tile) ? 30 : 0),
 
         //legs
-        (team, tile) -> PathTile.legSolid(tile) ? impassable : 1 +
+        (team, tile) ->
+            PathTile.legSolid(tile) ? impassable : 1 +
+            (PathTile.deep(tile) ? 6000 : 0) + //leg units can now drown
             (PathTile.solid(tile) ? 5 : 0),
 
         //water
-        (team, tile) -> PathTile.solid(tile) || !PathTile.liquid(tile) ? 200 : 2 +
+        (team, tile) ->
+            (!PathTile.liquid(tile) ? 6000 : 1) +
+            PathTile.health(tile) * 5 +
             (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) +
-            (PathTile.deep(tile) ? -1 : 0) +
-            (PathTile.damages(tile) ? 35 : 0)
+            (PathTile.deep(tile) ? 0 : 1) +
+            (PathTile.damages(tile) ? 35 : 0),
+
+        //hover
+        (team, tile) ->
+            (((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0) && PathTile.solid(tile)) ? impassable : 1 +
+            PathTile.health(tile) * 5 +
+            (PathTile.nearSolid(tile) ? 2 : 0)
     );
 
-    //maps team, cost, type to flow field
-    Flowfield[][][] cache;
+    /** tile data, see PathTileStruct - kept as a separate array for threading reasons */
+    int[] tiles = new int[0];
 
-    /** tile data, see PathTileStruct */
-    int[][] tiles = new int[0][0];
+    /** maps team, cost, type to flow field*/
+    Flowfield[][][] cache;
     /** unordered array of path data for iteration only. DO NOT iterate or access this in the main thread. */
     Seq<Flowfield> threadList = new Seq<>(), mainList = new Seq<>();
     /** handles task scheduling on the update thread. */
@@ -79,20 +93,29 @@ public class Pathfinder implements Runnable{
             stop();
 
             //reset and update internal tile array
-            tiles = new int[world.width()][world.height()];
+            tiles = new int[world.width() * world.height()];
+            wwidth = world.width();
+            wheight = world.height();
             threadList = new Seq<>();
             mainList = new Seq<>();
             clearCache();
 
-            for(Tile tile : world.tiles){
-                tiles[tile.x][tile.y] = packTile(tile);
+            for(int i = 0; i < tiles.length; i++){
+                Tile tile = world.tiles.geti(i);
+                tiles[i] = packTile(tile);
             }
 
-            preloadPath(getField(state.rules.waveTeam, costGround, fieldCore));
+            //don't bother setting up paths unless necessary
+            if(state.rules.waveTeam.needsFlowField() && !net.client()){
+                preloadPath(getField(state.rules.waveTeam, costGround, fieldCore));
+                Log.debug("Preloading ground enemy flowfield.");
+
+                //preload water on naval maps
+                if(spawner.getSpawns().contains(t -> t.floor().isLiquid)){
+                    preloadPath(getField(state.rules.waveTeam, costNaval, fieldCore));
+                    Log.debug("Preloading naval enemy flowfield.");
+                }
 
-            //preload water on naval maps
-            if(spawner.getSpawns().contains(t -> t.floor().isLiquid)){
-                preloadPath(getField(state.rules.waveTeam, costNaval, fieldCore));
             }
 
             start();
@@ -101,6 +124,35 @@ public class Pathfinder implements Runnable{
         Events.on(ResetEvent.class, event -> stop());
 
         Events.on(TileChangeEvent.class, event -> updateTile(event.tile));
+
+        //remove nearSolid flag for tiles
+        Events.on(TilePreChangeEvent.class, event -> {
+            Tile tile = event.tile;
+
+            if(tile.solid()){
+                for(int i = 0; i < 4; i++){
+                    Tile other = tile.nearby(i);
+                    if(other != null){
+                        //other tile needs to update its nearSolid to be false if it's not solid and this tile just got un-solidified
+                        if(!other.solid()){
+                            boolean otherNearSolid = false;
+                            for(int j = 0; j < 4; j++){
+                                Tile othernear = other.nearby(i);
+                                if(othernear != null && othernear.solid()){
+                                    otherNearSolid = true;
+                                    break;
+                                }
+                            }
+                            int arr = other.array();
+                            //the other tile is no longer near solid, remove the solid bit
+                            if(!otherNearSolid && tiles.length > arr){
+                                tiles[arr] &= ~(PathTile.bitMaskNearSolid);
+                            }
+                        }
+                    }
+                }
+            }
+        });
     }
 
     private void clearCache(){
@@ -108,36 +160,60 @@ public class Pathfinder implements Runnable{
     }
 
     /** Packs a tile into its internal representation. */
-    private int packTile(Tile tile){
-        boolean nearLiquid = false, nearSolid = false, nearGround = false;
+    public int packTile(Tile tile){
+        boolean nearLiquid = false, nearSolid = false, nearLegSolid = false, nearGround = false, solid = tile.solid(), allDeep = tile.floor().isDeep();
 
         for(int i = 0; i < 4; i++){
             Tile other = tile.nearby(i);
             if(other != null){
-                if(other.floor().isLiquid) nearLiquid = true;
-                if(other.solid()) nearSolid = true;
-                if(!other.floor().isLiquid) nearGround = true;
+                Floor floor = other.floor();
+                boolean osolid = other.solid();
+                if(floor.isLiquid && floor.isDeep()) nearLiquid = true;
+                //TODO potentially strange behavior when teamPassable is false for other teams?
+                if(osolid && !other.block().teamPassable) nearSolid = true;
+                if(!floor.isLiquid) nearGround = true;
+                if(!floor.isDeep()) allDeep = false;
+                if(other.legSolid()) nearLegSolid = true;
+
+                //other tile is now near solid
+                if(solid && !tile.block().teamPassable){
+                    tiles[other.array()] |= PathTile.bitMaskNearSolid;
+                }
             }
         }
 
+        int tid = tile.getTeamID();
+
         return PathTile.get(
-            tile.build == null || !tile.solid() || tile.block() instanceof CoreBlock ? 0 : Math.min((int)(tile.build.health / 40), 80),
-            tile.getTeamID(),
-            tile.solid(),
+            tile.build == null || !solid || tile.block() instanceof CoreBlock ? 0 : Math.min((int)(tile.build.health / 40), 80),
+            tid == 0 && tile.build != null && state.rules.coreCapture ? 255 : tid, //use teamid = 255 when core capture is enabled to mark out derelict structures
+            solid,
             tile.floor().isLiquid,
-            tile.staticDarkness() >= 2 || (tile.floor().solid && tile.block() == Blocks.air),
+            tile.legSolid(),
             nearLiquid,
             nearGround,
             nearSolid,
+            nearLegSolid,
             tile.floor().isDeep(),
-            tile.floor().damageTaken > 0.00001f
+            tile.floor().damageTaken > 0.00001f,
+            allDeep,
+            tile.block().teamPassable
         );
     }
 
+    public int get(int x, int y){
+        return tiles[x + y * wwidth];
+    }
+
     /** Starts or restarts the pathfinding thread. */
     private void start(){
         stop();
-        thread = Threads.daemon(this);
+        if(net.client()) return;
+
+        thread = new Thread(this, "Pathfinder");
+        thread.setPriority(Thread.MIN_PRIORITY);
+        thread.setDaemon(true);
+        thread.start();
     }
 
     /** Stops the pathfinding thread. */
@@ -150,15 +226,14 @@ public class Pathfinder implements Runnable{
     }
 
     /** Update a tile in the internal pathfinding grid.
-     * Causes a complete pathfinding reclaculation. Main thread only. */
+     * Causes a complete pathfinding recalculation. Main thread only. */
     public void updateTile(Tile tile){
         if(net.client()) return;
 
-        int x = tile.x, y = tile.y;
-
         tile.getLinkedTiles(t -> {
-            if(Structs.inBounds(t.x, t.y, tiles)){
-                tiles[t.x][t.y] = packTile(t);
+            int pos = t.array();
+            if(pos < tiles.length){
+                tiles[pos] = packTile(t);
             }
         });
 
@@ -166,17 +241,19 @@ public class Pathfinder implements Runnable{
         for(Flowfield path : mainList){
             if(path != null){
                 synchronized(path.targets){
-                    path.targets.clear();
-                    path.getPositions(path.targets);
+                    path.updateTargetPositions();
                 }
             }
         }
 
+        //mark every flow field as dirty, so it updates when it's done
         queue.post(() -> {
             for(Flowfield data : threadList){
-                updateTargets(data, x, y);
+                data.dirty = true;
             }
         });
+
+        controlPath.updateTile(tile);
     }
 
     /** Thread implementation. */
@@ -189,34 +266,16 @@ public class Pathfinder implements Runnable{
                 if(state.isPlaying()){
                     queue.run();
 
-                    //total update time no longer than maxUpdate
+                    //each update time (not total!) no longer than maxUpdate
                     for(Flowfield data : threadList){
-                        updateFrontier(data, maxUpdate / threadList.size);
 
-                        //TODO implement timeouts... or don't
-                        /*
-                        //remove flowfields that have 'timed out' so they can be garbage collected and no longer waste space
-                        if(data.refreshRate > 0 && Time.timeSinceMillis(data.lastUpdateTime) > fieldTimeout){
-                            //make sure it doesn't get removed twice
-                            data.lastUpdateTime = Time.millis();
+                        //if it's dirty and there is nothing to update, begin updating once more
+                        if(data.dirty && data.frontier.size == 0){
+                            updateTargets(data);
+                            data.dirty = false;
+                        }
 
-                            Team team = data.team;
-
-                            Core.app.post(() -> {
-                                //remove its used state
-                                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);
-                            });
-
-                            queue.post(() -> {
-                                //remove from this thread list with a delay
-                                threadList.remove(data);
-                            });
-                        }*/
+                        updateFrontier(data, maxUpdate);
                     }
                 }
 
@@ -265,8 +324,7 @@ public class Pathfinder implements Runnable{
             synchronized(path.targets){
                 //make sure the position actually changed
                 if(!(path.targets.size == 1 && tmpArray.size == 1 && path.targets.first() == tmpArray.first())){
-                    path.targets.clear();
-                    path.getPositions(path.targets);
+                    path.updateTargetPositions();
 
                     //queue an update
                     queue.post(() -> updateTargets(path));
@@ -274,8 +332,10 @@ public class Pathfinder implements Runnable{
             }
         }
 
-        int[][] values = path.weights;
-        int value = values[tile.x][tile.y];
+        //use complete weights if possible; these contain a complete flow field that is not being updated
+        int[] values = path.hasComplete ? path.completeWeights : path.weights;
+        int apos = tile.array();
+        int value = values[apos];
 
         Tile current = null;
         int tl = 0;
@@ -285,42 +345,20 @@ 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) && 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
+            int packed = world.packArray(dx, dy);
+
+            if(values[packed] < value && (current == null || values[packed] < tl) && path.passable(packed) &&
+            !(point.x != 0 && point.y != 0 && (!path.passable(world.packArray(tile.x + point.x, tile.y)) || !path.passable(world.packArray(tile.x, tile.y + point.y))))){ //diagonal corner trap
                 current = other;
-                tl = values[dx][dy];
+                tl = values[packed];
             }
         }
 
-        if(current == null || tl == impassable) return tile;
+        if(current == null || tl == impassable || (path.cost == costTypes.items[costGround] && current.dangerous() && !tile.dangerous())) return tile;
 
         return current;
     }
 
-    /**
-     * Clears the frontier, increments the search and sets up all flow sources.
-     * This only occurs for active teams.
-     */
-    private void updateTargets(Flowfield path, int x, int y){
-        if(!Structs.inBounds(x, y, path.weights)) return;
-
-        if(path.weights[x][y] == 0){
-            //this was a previous target
-            path.frontier.clear();
-        }else if(!path.frontier.isEmpty()){
-            //skip if this path is processing
-            return;
-        }
-
-        //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();
-
-        updateTargets(path);
-    }
-
     /** Increments the search and sets up flow sources. Does not change the frontier. */
     private void updateTargets(Flowfield path){
 
@@ -331,18 +369,16 @@ public class Pathfinder implements Runnable{
             //add targets
             for(int i = 0; i < path.targets.size; i++){
                 int pos = path.targets.get(i);
-                int tx = Point2.x(pos), ty = Point2.y(pos);
 
-                path.weights[tx][ty] = 0;
-                path.searches[tx][ty] = path.search;
+                path.weights[pos] = 0;
+                path.searches[pos] = path.search;
                 path.frontier.addFirst(pos);
             }
         }
     }
 
     private void preloadPath(Flowfield path){
-        path.targets.clear();
-        path.getPositions(path.targets);
+        path.updateTargetPositions();
         registerPath(path);
         updateFrontier(path, -1);
     }
@@ -354,7 +390,7 @@ public class Pathfinder implements Runnable{
      */
     private void registerPath(Flowfield path){
         path.lastUpdateTime = Time.millis();
-        path.setup(tiles.length, tiles[0].length);
+        path.setup(tiles.length);
 
         threadList.add(path);
 
@@ -362,28 +398,29 @@ public class Pathfinder implements Runnable{
         Core.app.post(() -> mainList.add(path));
 
         //fill with impassables by default
-        for(int x = 0; x < world.width(); x++){
-            for(int y = 0; y < world.height(); y++){
-                path.weights[x][y] = impassable;
-            }
+        for(int i = 0; i < tiles.length; i++){
+            path.weights[i] = impassable;
         }
 
         //add targets
         for(int i = 0; i < path.targets.size; i++){
             int pos = path.targets.get(i);
-            path.weights[Point2.x(pos)][Point2.y(pos)] = 0;
+            path.weights[pos] = 0;
             path.frontier.addFirst(pos);
         }
     }
 
     /** Update the frontier for a path. Pathfinding thread only. */
     private void updateFrontier(Flowfield path, long nsToRun){
+        boolean hadAny = path.frontier.size > 0;
         long start = Time.nanos();
 
-        while(path.frontier.size > 0 && (nsToRun < 0 || Time.timeSinceNanos(start) <= nsToRun)){
-            Tile tile = world.tile(path.frontier.removeLast());
-            if(tile == null || path.weights == null) return; //something went horribly wrong, bail
-            int cost = path.weights[tile.x][tile.y];
+        int counter = 0;
+
+        while(path.frontier.size > 0){
+            int tile = path.frontier.removeLast();
+            if(path.weights == null) return; //something went horribly wrong, bail
+            int cost = path.weights[tile];
 
             //pathfinding overflowed for some reason, time to bail. the next block update will handle this, hopefully
             if(path.frontier.size >= world.width() * world.height()){
@@ -394,47 +431,79 @@ public class Pathfinder implements Runnable{
             if(cost != impassable){
                 for(Point2 point : Geometry.d4){
 
-                    int dx = tile.x + point.x, dy = tile.y + point.y;
+                    int dx = (tile % wwidth) + point.x, dy = (tile / wwidth) + point.y;
 
-                    if(dx < 0 || dy < 0 || dx >= tiles.length || dy >= tiles[0].length) continue;
+                    if(dx < 0 || dy < 0 || dx >= wwidth || dy >= wheight) continue;
 
-                    int otherCost = path.cost.getCost(path.team, tiles[dx][dy]);
+                    int newPos = tile + point.x + point.y * wwidth;
+                    int otherCost = path.cost.getCost(path.team.id, tiles[newPos]);
 
-                    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 + otherCost;
-                        path.searches[dx][dy] = (short)path.search;
+                    if((path.weights[newPos] > cost + otherCost || path.searches[newPos] < path.search) && otherCost != impassable){
+                        path.frontier.addFirst(newPos);
+                        path.weights[newPos] = cost + otherCost;
+                        path.searches[newPos] = (short)path.search;
                     }
                 }
             }
+
+            //every N iterations, check the time spent - this prevents extra calls to nano time, which itself is slow
+            if(nsToRun >= 0 && (counter++) >= 200){
+                counter = 0;
+                if(Time.timeSinceNanos(start) >= nsToRun){
+                    return;
+                }
+            }
+        }
+
+        //there WERE some things in the frontier, but now they are gone, so the path is done; copy over latest data
+        if(hadAny && path.frontier.size == 0){
+            System.arraycopy(path.weights, 0, path.completeWeights, 0, path.weights.length);
+            path.hasComplete = true;
         }
     }
 
     public static class EnemyCoreField extends Flowfield{
+        private final static BlockFlag[] randomTargets = {storage, generator, launchPad, factory, repair, battery, reactor, drill};
+        private Rand rand = new Rand();
+
         @Override
         protected void getPositions(IntSeq out){
-            for(Tile other : indexer.getEnemy(team, BlockFlag.core)){
-                out.add(other.pos());
+            if(state.rules.randomWaveAI && team == state.rules.waveTeam){
+                rand.setSeed(state.rules.waves ? state.wave : (int)(state.tick / (5400)) + hashCode());
+
+                //maximum amount of different target flag types they will attack
+                int max = 1;
+
+                for(int attempt = 0; attempt < 5 && max > 0; attempt++){
+                    var targets = indexer.getEnemy(team, randomTargets[rand.random(randomTargets.length - 1)]);
+                    if(!targets.isEmpty()){
+                        boolean any = false;
+                        for(Building other : targets){
+                            if((other.items != null && other.items.any()) || other.status() != BlockStatus.noInput){
+                                out.add(other.tile.array());
+                                any = true;
+                            }
+                        }
+                        if(any){
+                            max --;
+                        }
+                    }
+                }
+            }
+
+            for(Building other : indexer.getEnemy(team, BlockFlag.core)){
+                out.add(other.tile.array());
             }
 
             //spawn points are also enemies.
             if(state.rules.waves && team == state.rules.defaultTeam){
                 for(Tile other : spawner.getSpawns()){
-                    out.add(other.pos());
+                    out.add(other.array());
                 }
             }
         }
     }
 
-    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;
 
@@ -445,7 +514,7 @@ public class Pathfinder implements Runnable{
 
         @Override
         public void getPositions(IntSeq out){
-            out.add(Point2.pack(World.toTile(position.getX()), World.toTile(position.getY())));
+            out.add(world.packArray(World.toTile(position.getX()), World.toTile(position.getY())));
         }
     }
 
@@ -460,11 +529,18 @@ public class Pathfinder implements Runnable{
         protected Team team = Team.derelict;
         /** Function for calculating path cost. Set before using. */
         protected PathCost cost = costTypes.get(costGround);
+        /** Whether there are valid weights in the complete array. */
+        protected volatile boolean hasComplete;
+        /** If true, this flow field needs updating. This flag is only set to false once the flow field finishes and the weights are copied over. */
+        protected boolean dirty = false;
 
         /** costs of getting to a specific tile */
-        public int[][] weights;
+        public int[] weights;
         /** search IDs of each position - the highest, most recent search is prioritized and overwritten */
-        public int[][] searches;
+        public int[] searches;
+        /** the last "complete" weights of this tilemap. */
+        public int[] completeWeights;
+
         /** search frontier, these are Pos objects */
         IntQueue frontier = new IntQueue();
         /** all target positions; these positions have a cost of 0, and must be synchronized on! */
@@ -476,23 +552,35 @@ public class Pathfinder implements Runnable{
         /** whether this flow field is ready to be used */
         boolean initialized;
 
-        void setup(int width, int height){
-            this.weights = new int[width][height];
-            this.searches = new int[width][height];
-            this.frontier.ensureCapacity((width + height) * 3);
+        void setup(int length){
+            this.weights = new int[length];
+            this.searches = new int[length];
+            this.completeWeights = new int[length];
+            this.frontier.ensureCapacity((length) / 4);
             this.initialized = true;
         }
 
-        protected boolean passable(int x, int y){
-            return cost.getCost(team, pathfinder.tiles[x][y]) != impassable;
+        public boolean hasCompleteWeights(){
+            return hasComplete && completeWeights != null;
+        }
+
+        public void updateTargetPositions(){
+            targets.clear();
+            getPositions(targets);
+        }
+
+        protected boolean passable(int pos){
+            int amount = cost.getCost(team.id, pathfinder.tiles[pos]);
+            //edge case: naval reports costs of 6000+ for non-liquids, even though they are not technically passable
+            return amount != impassable && !(cost == costTypes.get(costNaval) && amount >= 6000);
         }
 
         /** 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);
+    public interface PathCost{
+        int getCost(int team, int tile);
     }
 
     /** Holds a copy of tile data for a specific tile position. */
@@ -514,9 +602,15 @@ public class Pathfinder implements Runnable{
         boolean nearGround;
         //whether this block is near a solid object
         boolean nearSolid;
+        //whether this block is near a block that is solid for legged units
+        boolean nearLegSolid;
         //whether this block is deep / drownable
         boolean deep;
         //whether the floor damages
         boolean damages;
+        //whether all tiles nearby are deep
+        boolean allDeep;
+        //block teamPassable is true
+        boolean teamPassable;
     }
 }
diff --git a/core/src/mindustry/ai/RtsAI.java b/core/src/mindustry/ai/RtsAI.java
new file mode 100644
index 0000000000..b97e58e464
--- /dev/null
+++ b/core/src/mindustry/ai/RtsAI.java
@@ -0,0 +1,353 @@
+package mindustry.ai;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.ai.types.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.game.Teams.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.defense.turrets.BaseTurret.*;
+import mindustry.world.blocks.defense.turrets.*;
+import mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
+import mindustry.world.meta.*;
+
+public class RtsAI{
+    static final Seq<Building> targets = new Seq<>();
+    static final Seq<Unit> squad = new Seq<>(false);
+    static final IntSet used = new IntSet();
+    static final IntSet assignedTargets = new IntSet(), invalidTarget = new IntSet();
+    static final float squadRadius = 140f;
+    static final int timeUpdate = 0, timerSpawn = 1, maxTargetsChecked = 15;
+
+    //in order of priority??
+    static final BlockFlag[] flags = {BlockFlag.generator, BlockFlag.factory, BlockFlag.core, BlockFlag.battery, BlockFlag.drill};
+    static final ObjectFloatMap<Building> weights = new ObjectFloatMap<>();
+    static final boolean debug = OS.hasProp("mindustry.debug");
+
+    final Interval timer = new Interval(10);
+    final TeamData data;
+    final ObjectSet<Building> damagedSet = new ObjectSet<>();
+    final Seq<Building> damaged = new Seq<>(false);
+
+    //must be static, as this class can get instantiated many times; event listeners are hard to clean up
+    static{
+        Events.on(BuildDamageEvent.class, e -> {
+            if(e.build.team.rules().rtsAi){
+                var ai = e.build.team.data().rtsAi;
+                if(ai != null){
+                    ai.damagedSet.add(e.build);
+                }
+            }
+        });
+    }
+
+    public RtsAI(TeamData data){
+        this.data = data;
+        timer.reset(0, Mathf.random(60f * 2f));
+
+        //TODO remove: debugging!
+
+        if(debug){
+            Events.run(Trigger.draw, () -> {
+
+                Draw.draw(Layer.overlayUI, () -> {
+
+                    float s = Fonts.outline.getScaleX();
+                    Fonts.outline.getData().setScale(0.5f);
+                    for(var target : weights){
+                        Fonts.outline.draw("[sky]" + Strings.fixed(target.value, 2), target.key.x, target.key.y, Align.center);
+                    }
+                    Fonts.outline.getData().setScale(s);
+                });
+
+            });
+        }
+    }
+
+    public void update(){
+
+        if(timer.get(timeUpdate, 60f * 2f)){
+            assignSquads();
+            checkBuilding();
+        }
+    }
+
+    //TODO atrocious implementation
+    void checkBuilding(){
+        if(data.team.rules().aiCoreSpawn && timer.get(timerSpawn, 60 * 7f) && data.hasCore()){
+            CoreBlock block = (CoreBlock)data.core().block;
+            int coreUnits = data.countType(block.unitType);
+
+            //create AI core unit(s) at random cores
+            if(coreUnits < data.cores.size){
+                Unit unit = block.unitType.create(data.team);
+                unit.set(data.cores.random());
+                unit.add();
+                Fx.spawn.at(unit);
+            }
+        }
+    }
+
+    void assignSquads(){
+        assignedTargets.clear();
+        used.clear();
+        damaged.addAll(damagedSet);
+        damagedSet.clear();
+
+        boolean didDefend = false;
+
+        for(var unit : data.units){
+            if(used.add(unit.id) && unit.isCommandable() && !unit.command().hasCommand() && !unit.command().isAttacking()){
+                squad.clear();
+                float rad = squadRadius + unit.hitSize*1.5f;
+                data.tree().intersect(unit.x - rad/2f, unit.y - rad/2f, rad, rad, squad);
+
+                squad.truncate(data.team.rules().rtsMaxSquad);
+
+                //remove overlapping squads
+                squad.removeAll(u -> (u != unit && used.contains(u.id)) || !u.isCommandable() || u.command().hasCommand() || ((u.flag == 0) != (unit.flag == 0)));
+                //mark used so other squads can't steal them
+                for(var item : squad){
+                    used.add(item.id);
+                }
+
+                //TODO flawed, squads
+                if(handleSquad(squad, !didDefend)){
+                    didDefend = true;
+                }
+            }
+        }
+
+        damaged.clear();
+    }
+
+    boolean handleSquad(Seq<Unit> units, boolean noDefenders){
+        if(units.isEmpty()) return false;
+
+        float health = 0f, dps = 0f;
+        float ax = 0f, ay = 0f;
+        boolean targetAir = true, targetGround = true;
+
+        for(var unit : units){
+            if(!unit.type.targetAir) targetAir = false;
+            if(!unit.type.targetGround) targetGround = false;
+
+            ax += unit.x;
+            ay += unit.y;
+            health += unit.health;
+            dps += unit.type.dpsEstimate;
+        }
+        ax /= units.size;
+        ay /= units.size;
+
+        if(debug){
+            Vars.ui.showLabel("Squad: " + units.size, 2f, ax, ay);
+        }
+
+        Building defend = null;
+        boolean defendingCore = false;
+
+        //there is something to defend, see if it's worth the time
+        if(damaged.size > 0){
+            //TODO do the weights matter at all?
+            //for(var build : damaged){
+                //float w = estimateStats(ax, ay, dps, health);
+                //weights.put(build, w);
+            //}
+
+            //screw you java
+            float aax = ax, aay = ay;
+
+            Building best = damaged.min(b -> {
+                //rush to core IMMEDIATELY
+                if(b instanceof CoreBuild){
+                    return -999999f;
+                }
+
+                return b.dst(aax, aay);
+            });
+
+            //defend when close, or this is the only squad defending
+            //TODO will always rush to defense no matter what
+            if(best != null && (best instanceof CoreBuild || (units.size >= data.team.rules().rtsMinSquad || (units.size > 0 && units.first().flag != 0)) || best.within(ax, ay, 1000f))){
+                defend = best;
+
+                if(debug){
+                    Vars.ui.showLabel("Defend, dst = " + (int)(best.dst(ax, ay)), 8f, best.x, best.y);
+                }
+
+                if(best instanceof CoreBuild){
+                    defendingCore = true;
+                }
+            }
+        }
+
+        boolean tair = targetAir, tground = targetGround;
+
+        //find aggressor, or else, the thing being attacked
+        Vec2 defendPos = null;
+        Teamc defendTarget = null;
+        if(defend != null){
+            float checkRange = 350f;
+
+            //TODO could be made faster by storing bullet shooter
+            Unit aggressor = Units.closestEnemy(data.team, defend.x, defend.y, checkRange, u -> u.checkTarget(tair, tground));
+            if(aggressor != null){
+                //do not target it directly - target the position?
+                //defendTarget = aggressor;
+                defendPos = new Vec2(aggressor.x, aggressor.y);
+                defendTarget = aggressor;
+            }else if(false){ //TODO currently ignored, no use defending against nothing
+                //should it even go there if there's no aggressor found?
+                Tile closest = defend.findClosestEdge(units.first(), Tile::solid);
+                if(closest != null){
+                    defendPos = new Vec2(closest.worldx(), closest.worldy());
+                }
+            }else{
+                float mindst = Float.MAX_VALUE;
+                Building build = null;
+
+                //find closest turret to attack.
+                for(var turret : Vars.indexer.getEnemy(data.team, BlockFlag.turret)){
+                    if(turret.within(defend, ((Ranged)turret).range())){
+                        float dst = turret.dst2(defend);
+                        if(dst < mindst){
+                            mindst = dst;
+                            build = turret;
+                        }
+                    }
+                }
+
+                if(build != null){
+                    defendTarget = build;
+                }
+            }
+        }
+
+        boolean anyDefend = defendPos != null || defendTarget != null;
+
+        invalidTarget.clear();
+
+        for(var unit : squad){
+            if(unit.controller() instanceof CommandAI ai){
+                invalidTarget.addAll(ai.unreachableBuildings);
+            }
+        }
+
+        var build = anyDefend ? null : findTarget(ax, ay, units.size, dps, health, units.first().flag == 0, units.first().isFlying());
+
+        if(build != null || anyDefend){
+            for(var unit : units){
+                if(unit.isCommandable() && !unit.command().hasCommand()){
+                    if(defendPos != null && !unit.isPathImpassable(World.toTile(defendPos.x), World.toTile(defendPos.y))){
+                        unit.command().commandPosition(defendPos, true);
+                    }else{
+                        //TODO stopAtTarget parameter could be false, could be tweaked
+                        unit.command().commandTarget(defendTarget == null ? build : defendTarget, defendTarget != null);
+                    }
+
+                    //assign a flag, so it will be "mobilized" more easily later
+                    if(!defendingCore){
+                        unit.flag = 1;
+                    }
+                }
+            }
+        }
+
+        return anyDefend;
+    }
+
+    @Nullable Building findTarget(float x, float y, int total, float dps, float health, boolean checkWeight, boolean air){
+        if(total < data.team.rules().rtsMinSquad) return null;
+
+        //flag priority?
+        //1. generator
+        //2. factory
+        //3. core
+        targets.clear();
+        for(var flag : flags){
+            targets.addAll(Vars.indexer.getEnemy(data.team, flag));
+        }
+        targets.removeAll(b -> assignedTargets.contains(b.id) || invalidTarget.contains(b.pos()));
+
+        if(targets.size == 0) return null;
+
+        weights.clear();
+
+        //only check a maximum number of targets to prevent hammering the CPU with estimateStats calls
+        targets.shuffle();
+        targets.truncate(maxTargetsChecked);
+
+        for(var target : targets){
+            weights.put(target, estimateStats(x, y, target.x, target.y, dps, health, air));
+        }
+
+        var result = targets.min(
+            Structs.comps(
+                //weight is most important?
+                Structs.comparingFloat(b -> (1f - weights.get(b, 0f)) + b.dst(x, y)/10000f),
+                //then distance TODO why weight above
+                Structs.comparingFloat(b -> b.dst2(x, y))
+            )
+        );
+
+        float weight = weights.get(result, 0f);
+        if(checkWeight && weight < data.team.rules().rtsMinWeight && total < Units.getCap(data.team)){
+            return null;
+        }
+
+        assignedTargets.add(result.id);
+        return result;
+    }
+
+    //TODO extremely slow especially with many squads.
+    float estimateStats(float fromX, float fromY, float x, float y, float selfDps, float selfHealth, boolean air){
+        float[] health = {0f}, dps = {0f};
+        float extraRadius = 50f;
+
+        for(var turret : Vars.indexer.getEnemy(data.team, BlockFlag.turret)){
+            if(turret instanceof BaseTurretBuild t && turret.block instanceof Turret tb && ((tb.targetAir && air) || (tb.targetGround && !air)) && Intersector.distanceSegmentPoint(fromX, fromY,  x, y, t.x, t.y) <= t.range() + extraRadius){
+                health[0] += t.health;
+                dps[0] += t.estimateDps();
+            }
+        }
+
+        Tmp.r1.set(fromX, fromY, x - fromX, y - fromY).normalize().grow(140f * 2f);
+
+        //add on extra radius, assume unit range is below that...?
+        Units.nearbyEnemies(data.team, Tmp.r1, other -> {
+            if(Intersector.distanceSegmentPoint(fromX, fromY, x, y, other.x, other.y) <= other.range() + extraRadius){
+                health[0] += other.health;
+                dps[0] += other.type.dpsEstimate;
+            }
+        });
+
+        float hp = health[0], dp = dps[0];
+
+        float timeDestroyOther = Mathf.zero(selfDps, 0.001f) ? Float.POSITIVE_INFINITY : hp / selfDps;
+        float timeDestroySelf = Mathf.zero(dp) ? Float.POSITIVE_INFINITY : selfHealth / dp;
+
+        //other can never be destroyed | other destroys self instantly
+        if(Float.isInfinite(timeDestroyOther) || Mathf.zero(timeDestroySelf)) return 0f;
+        //self can never be destroyed | self destroys other instantly
+        if(Float.isInfinite(timeDestroySelf) || Mathf.zero(timeDestroyOther)) return 100000f;
+
+        //examples:
+        // self 10 sec / other 10 sec -> can destroy target with 100 % losses -> returns 1
+        // self 5 sec / other 10 sec -> can destroy about half of other -> returns 0.5 (needs to be 2x stronger to defeat)
+        return timeDestroySelf / timeDestroyOther;
+    }
+}
diff --git a/core/src/mindustry/ai/UnitCommand.java b/core/src/mindustry/ai/UnitCommand.java
new file mode 100644
index 0000000000..85eff6be00
--- /dev/null
+++ b/core/src/mindustry/ai/UnitCommand.java
@@ -0,0 +1,119 @@
+package mindustry.ai;
+
+import arc.*;
+import arc.func.*;
+import arc.scene.style.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.ai.types.*;
+import mindustry.ctype.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.input.*;
+
+/** Defines a pattern of behavior that an RTS-controlled unit should follow. Shows up in the command UI. */
+public class UnitCommand extends MappableContent{
+    /** @deprecated now a content type, use the methods in Vars.content instead */
+    @Deprecated
+    public static final Seq<UnitCommand> all = new Seq<>();
+
+    public static UnitCommand moveCommand, repairCommand, rebuildCommand, assistCommand, mineCommand, boostCommand, enterPayloadCommand, loadUnitsCommand, loadBlocksCommand, unloadPayloadCommand, loopPayloadCommand;
+
+    /** Name of UI icon (from Icon class). */
+    public final String icon;
+    /** Controller that this unit will use when this command is used. Return null for "default" behavior. */
+    public final Func<Unit, AIController> controller;
+    /** If true, this unit will automatically switch away to the move command when given a position. */
+    public boolean switchToMove = true;
+    /** Whether to draw the movement/attack target. */
+    public boolean drawTarget = false;
+    /** Whether to reset targets when switching to or from this command. */
+    public boolean resetTarget = true;
+    /** */
+    public boolean exactArrival = false;
+    /** Key to press for this command. */
+    public @Nullable Binding keybind = null;
+
+    public UnitCommand(String name, String icon, Func<Unit, AIController> controller){
+        super(name);
+
+        this.icon = icon;
+        this.controller = controller == null ? u -> null : controller;
+
+        all.add(this);
+    }
+
+    public UnitCommand(String name, String icon, Binding keybind, Func<Unit, AIController> controller){
+        this(name, icon, controller);
+        this.keybind = keybind;
+    }
+
+    public String localized(){
+        return Core.bundle.get("command." + name);
+    }
+
+    public TextureRegionDrawable getIcon(){
+        return Icon.icons.get(icon, Icon.cancel);
+    }
+
+    public char getEmoji() {
+        return (char)Iconc.codes.get(icon, Iconc.cancel);
+    }
+
+    @Override
+    public ContentType getContentType(){
+        return ContentType.unitCommand;
+    }
+
+    @Override
+    public String toString(){
+        return "UnitCommand:" + name;
+    }
+
+    public static void loadAll(){
+
+        moveCommand = new UnitCommand("move", "right", Binding.unit_command_move, null){{
+            drawTarget = true;
+            resetTarget = false;
+        }};
+        repairCommand = new UnitCommand("repair", "modeSurvival", Binding.unit_command_repair, u -> new RepairAI());
+        rebuildCommand = new UnitCommand("rebuild", "hammer", Binding.unit_command_rebuild, u -> new BuilderAI());
+        assistCommand = new UnitCommand("assist", "players", Binding.unit_command_assist, u -> {
+            var ai = new BuilderAI();
+            ai.onlyAssist = true;
+            return ai;
+        });
+        mineCommand = new UnitCommand("mine", "production", Binding.unit_command_mine, u -> new MinerAI());
+        boostCommand = new UnitCommand("boost", "up", Binding.unit_command_boost, u -> new BoostAI()){{
+            switchToMove = false;
+            drawTarget = true;
+            resetTarget = false;
+        }};
+        enterPayloadCommand = new UnitCommand("enterPayload", "downOpen", Binding.unit_command_enter_payload, null){{
+            switchToMove = false;
+            drawTarget = true;
+            resetTarget = false;
+        }};
+        loadUnitsCommand = new UnitCommand("loadUnits", "upload", Binding.unit_command_load_units, null){{
+            switchToMove = false;
+            drawTarget = true;
+            resetTarget = false;
+        }};
+        loadBlocksCommand = new UnitCommand("loadBlocks", "up", Binding.unit_command_load_blocks, null){{
+            switchToMove = false;
+            drawTarget = true;
+            resetTarget = false;
+            exactArrival = true;
+        }};
+        unloadPayloadCommand = new UnitCommand("unloadPayload", "download", Binding.unit_command_unload_payload, null){{
+            switchToMove = false;
+            drawTarget = true;
+            resetTarget = false;
+        }};
+        loopPayloadCommand = new UnitCommand("loopPayload", "resize", Binding.unit_command_loop_payload, null){{
+            switchToMove = false;
+            drawTarget = true;
+            resetTarget = false;
+        }};
+    }
+}
diff --git a/core/src/mindustry/ai/UnitGroup.java b/core/src/mindustry/ai/UnitGroup.java
new file mode 100644
index 0000000000..0c0366cf29
--- /dev/null
+++ b/core/src/mindustry/ai/UnitGroup.java
@@ -0,0 +1,186 @@
+package mindustry.ai;
+
+import arc.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.ai.Pathfinder.*;
+import mindustry.async.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.gen.*;
+
+public class UnitGroup{
+    public Seq<Unit> units = new Seq<>();
+    public int collisionLayer;
+    public volatile float[] positions, originalPositions;
+    public volatile boolean valid;
+
+    public void calculateFormation(Vec2 dest, int collisionLayer){
+        this.collisionLayer = collisionLayer;
+
+        float cx = 0f, cy = 0f;
+        for(Unit unit : units){
+            cx += unit.x;
+            cy += unit.y;
+        }
+        cx /= units.size;
+        cy /= units.size;
+        positions = new float[units.size * 2];
+
+
+        //all positions are relative to the center
+        for(int i = 0; i < units.size; i ++){
+            Unit unit = units.get(i);
+            positions[i * 2] = unit.x - cx;
+            positions[i * 2 + 1] = unit.y - cy;
+            unit.command().groupIndex = i;
+        }
+
+        //run on new thread to prevent stutter
+        Vars.mainExecutor.submit(() -> {
+            //unused space between circles that needs to be reached for compression to end
+            float maxSpaceUsage = 0.7f;
+            boolean compress = true;
+
+            int compressionIterations = 0;
+            int physicsIterations = 0;
+            int totalIterations = 0;
+            int maxPhysicsIterations = Math.min(1 + (int)(Math.pow(units.size, 0.65) / 10), 6);
+
+            //yep, new allocations, because this is a new thread.
+            IntQuadTree tree = new IntQuadTree(new Rect(0f, 0f, Vars.world.unitWidth(), Vars.world.unitHeight()),
+                (index, hitbox) -> hitbox.setCentered(positions[index * 2], positions[index * 2 + 1], units.get(index).hitSize));
+            IntSeq tmpseq = new IntSeq();
+            Vec2 v1 = new Vec2();
+            Vec2 v2 = new Vec2();
+
+            //this algorithm basically squeezes all the circle colliders together, then proceeds to simulate physics to push them apart across several iterations.
+            //it's rather slow, but shouldn't be too much of an issue when run in a different thread
+            while(totalIterations++ < 40 && physicsIterations < maxPhysicsIterations){
+                float spaceUsed = 0f;
+
+                if(compress){
+                    compressionIterations ++;
+
+                    float maxDst = 1f, totalArea = 0f;
+                    for(int a = 0; a < units.size; a ++){
+                        v1.set(positions[a * 2], positions[a * 2 + 1]).lerp(v2.set(0f, 0f), 0.3f);
+                        positions[a * 2] = v1.x;
+                        positions[a * 2 + 1] = v1.y;
+
+                        float rad = units.get(a).hitSize * Vars.unitCollisionRadiusScale;
+
+                        maxDst = Math.max(maxDst, v1.dst(0f, 0f) + rad);
+                        totalArea += Mathf.PI * rad * rad;
+                    }
+
+                    //total area of bounding circle
+                    float boundingArea = Mathf.PI * maxDst * maxDst;
+                    spaceUsed = totalArea / boundingArea;
+
+                    //ex: 60% (0.6) of the total area is used, this will not be enough to satisfy a maxSpaceUsage of 70% (0.7)
+                    compress = spaceUsed <= maxSpaceUsage && compressionIterations < 20;
+                }
+
+                //uncompress units
+                if(!compress || spaceUsed > 0.5f){
+                    physicsIterations++;
+
+                    tree.clear();
+
+                    for(int a = 0; a < units.size; a++){
+                        tree.insert(a);
+                    }
+
+                    for(int a = 0; a < units.size; a++){
+                        Unit unit = units.get(a);
+                        float x = positions[a * 2], y = positions[a * 2 + 1], radius = unit.hitSize/2f;
+
+                        tmpseq.clear();
+                        tree.intersect(x - radius, y - radius, radius * 2f, radius * 2f, tmpseq);
+                        for(int res = 0; res < tmpseq.size; res ++){
+                            int b = tmpseq.items[res];
+
+                            //simulate collision physics
+                            if(a != b){
+                                float ox = positions[b * 2], oy = positions[b * 2 + 1];
+                                Unit other = units.get(b);
+
+                                float rs = (radius + other.hitSize/2f) * 1.2f;
+                                float dst = Mathf.dst(x, y, ox, oy);
+
+                                if(dst < rs){
+                                    v2.set(x - ox, y - oy).setLength(rs - dst);
+                                    float mass1 = unit.hitSize, mass2 = other.hitSize;
+                                    float ms = mass1 + mass2;
+                                    float m1 = mass2 / ms, m2 = mass1 / ms;
+                                    float scl = 1f;
+
+                                    positions[a * 2] += v2.x * m1 * scl;
+                                    positions[a * 2 + 1] += v2.y * m1 * scl;
+
+                                    positions[b * 2] -= v2.x * m2 * scl;
+                                    positions[b * 2 + 1] -= v2.y * m2 * scl;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            originalPositions = positions.clone();
+
+            //raycast from the destination to the offset to make sure it's reachable
+            for(int a = 0; a < units.size; a ++){
+                updateRaycast(a, dest, v1);
+            }
+
+            valid = true;
+
+            if(ControlPathfinder.showDebug){
+                Core.app.post(() -> {
+                    for(int i = 0; i < units.size; i ++){
+                        float x = positions[i * 2], y = positions[i * 2 + 1];
+
+                        Fx.placeBlock.at(x + dest.x, y + dest.y, 1f, Color.green);
+                    }
+                });
+            }
+        });
+    }
+
+    public void updateRaycast(int index, Vec2 dest){
+        updateRaycast(index, dest, Tmp.v1);
+    }
+
+    private void updateRaycast(int index, Vec2 dest, Vec2 v1){
+        if(collisionLayer != PhysicsProcess.layerFlying){
+
+            //coordinates in world space
+            float
+                x = originalPositions[index * 2] + dest.x,
+                y = originalPositions[index * 2 + 1] + dest.y;
+
+            Unit unit = units.get(index);
+
+            PathCost cost = unit.type.pathCost;
+            int res = ControlPathfinder.raycastFastAvoid(unit.team.id, cost, World.toTile(dest.x), World.toTile(dest.y), World.toTile(x), World.toTile(y));
+
+            //collision found, make the destination the point right before the collision
+            if(res != 0){
+                v1.set(Point2.x(res) * Vars.tilesize - dest.x, Point2.y(res) * Vars.tilesize - dest.y);
+                v1.setLength(Math.max(v1.len() - Vars.tilesize - 4f, 0));
+                positions[index * 2] = v1.x;
+                positions[index * 2 + 1] = v1.y;
+            }
+
+            if(ControlPathfinder.showDebug){
+                Core.app.post(() -> Fx.debugLine.at(unit.x, unit.y, 0f, Color.green, new Vec2[]{new Vec2(dest.x, dest.y), new Vec2(x, y)}));
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/ai/UnitStance.java b/core/src/mindustry/ai/UnitStance.java
new file mode 100644
index 0000000000..8d4f59bb2e
--- /dev/null
+++ b/core/src/mindustry/ai/UnitStance.java
@@ -0,0 +1,61 @@
+package mindustry.ai;
+
+import arc.*;
+import arc.scene.style.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.input.*;
+
+public class UnitStance extends MappableContent{
+    /** @deprecated now a content type, use the methods in Vars.content instead */
+    @Deprecated
+    public static final Seq<UnitStance> all = new Seq<>();
+
+    public static UnitStance stop, shoot, holdFire, pursueTarget, patrol, ram;
+
+    /** Name of UI icon (from Icon class). */
+    public final String icon;
+    /** Key to press for this stance. */
+    public @Nullable Binding keybind = null;
+
+    public UnitStance(String name, String icon, Binding keybind){
+        super(name);
+        this.icon = icon;
+        this.keybind = keybind;
+
+        all.add(this);
+    }
+
+    public String localized(){
+        return Core.bundle.get("stance." + name);
+    }
+
+    public TextureRegionDrawable getIcon(){
+        return Icon.icons.get(icon, Icon.cancel);
+    }
+
+    public char getEmoji() {
+        return (char) Iconc.codes.get(icon, Iconc.cancel);
+    }
+
+    @Override
+    public ContentType getContentType(){
+        return ContentType.unitStance;
+    }
+
+    @Override
+    public String toString(){
+        return "UnitStance:" + name;
+    }
+
+    public static void loadAll(){
+        stop = new UnitStance("stop", "cancel", Binding.cancel_orders);
+        shoot = new UnitStance("shoot", "commandAttack", Binding.unit_stance_shoot);
+        holdFire = new UnitStance("holdfire", "none", Binding.unit_stance_hold_fire);
+        pursueTarget = new UnitStance("pursuetarget", "right", Binding.unit_stance_pursue_target);
+        patrol = new UnitStance("patrol", "refresh", Binding.unit_stance_patrol);
+        ram = new UnitStance("ram", "rightOpen", Binding.unit_stance_ram);
+    }
+}
diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java
index afc8ab30db..7935418c5f 100644
--- a/core/src/mindustry/ai/WaveSpawner.java
+++ b/core/src/mindustry/ai/WaveSpawner.java
@@ -19,8 +19,9 @@ import mindustry.world.*;
 import static mindustry.Vars.*;
 
 public class WaveSpawner{
-    private static final float margin = 40f, coreMargin = tilesize * 2f, maxSteps = 30;
+    private static final float margin = 0f, coreMargin = tilesize * 2f, maxSteps = 30;
 
+    private int tmpCount;
     private Seq<Tile> spawns = new Seq<>();
     private boolean spawning = false;
     private boolean any = false;
@@ -55,7 +56,7 @@ public class WaveSpawner{
     public void spawnEnemies(){
         spawning = true;
 
-        eachGroundSpawn((spawnX, spawnY, doShockwave) -> {
+        eachGroundSpawn(-1, (spawnX, spawnY, doShockwave) -> {
             if(doShockwave){
                 doShockwave(spawnX, spawnY);
             }
@@ -65,23 +66,33 @@ public class WaveSpawner{
             if(group.type == null) continue;
 
             int spawned = group.getSpawned(state.wave - 1);
+            if(spawned == 0) continue;
+
+            if(state.isCampaign()){
+                //when spawning a boss, round down, so 1.5x (hard) * 1 boss does not result in 2 bosses
+                spawned = Math.max(1, group.effect == StatusEffects.boss ?
+                          (int)(spawned * state.getPlanet().campaignRules.difficulty.enemySpawnMultiplier) :
+                    Mathf.round(spawned * state.getPlanet().campaignRules.difficulty.enemySpawnMultiplier));
+            }
+
+            int spawnedf = spawned;
 
             if(group.type.flying){
                 float spread = margin / 1.5f;
 
-                eachFlyerSpawn((spawnX, spawnY) -> {
-                    for(int i = 0; i < spawned; i++){
+                eachFlyerSpawn(group.spawn, (spawnX, spawnY) -> {
+                    for(int i = 0; i < spawnedf; i++){
                         Unit unit = group.createUnit(state.rules.waveTeam, state.wave - 1);
                         unit.set(spawnX + Mathf.range(spread), spawnY + Mathf.range(spread));
-                        unit.add();
+                        spawnEffect(unit);
                     }
                 });
             }else{
                 float spread = tilesize * 2;
 
-                eachGroundSpawn((spawnX, spawnY, doShockwave) -> {
+                eachGroundSpawn(group.spawn, (spawnX, spawnY, doShockwave) -> {
 
-                    for(int i = 0; i < spawned; i++){
+                    for(int i = 0; i < spawnedf; i++){
                         Tmp.v1.rnd(spread);
 
                         Unit unit = group.createUnit(state.rules.waveTeam, state.wave - 1);
@@ -92,7 +103,7 @@ public class WaveSpawner{
             }
         }
 
-        Time.runTask(121f, () -> spawning = false);
+        Time.run(121f, () -> spawning = false);
     }
 
     public void doShockwave(float x, float y){
@@ -101,12 +112,14 @@ public class WaveSpawner{
     }
 
     public void eachGroundSpawn(Intc2 cons){
-        eachGroundSpawn((x, y, shock) -> cons.get(World.toTile(x), World.toTile(y)));
+        eachGroundSpawn(-1, (x, y, shock) -> cons.get(World.toTile(x), World.toTile(y)));
     }
 
-    private void eachGroundSpawn(SpawnConsumer cons){
+    private void eachGroundSpawn(int filterPos, SpawnConsumer cons){
         if(state.hasSpawns()){
             for(Tile spawn : spawns){
+                if(filterPos != -1 && filterPos != spawn.pos()) continue;
+
                 cons.accept(spawn.worldx(), spawn.worldy(), true);
             }
         }
@@ -114,6 +127,8 @@ 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()){
+                if(filterPos != -1 && filterPos != core.pos()) continue;
+
                 Tmp.v1.set(firstCore).sub(core).limit(coreMargin + core.block.size * tilesize /2f * Mathf.sqrt2);
 
                 boolean valid = false;
@@ -146,28 +161,51 @@ public class WaveSpawner{
         }
     }
 
-    private void eachFlyerSpawn(Floatc2 cons){
-        for(Tile tile : spawns){
-            float angle = Angles.angle(world.width() / 2, world.height() / 2, tile.x, tile.y);
+    private void eachFlyerSpawn(int filterPos, Floatc2 cons){
+        boolean airUseSpawns = state.rules.airUseSpawns;
 
-            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);
-            float spawnY = Mathf.clamp(world.height() * tilesize / 2f + Angles.trnsy(angle, trns), -margin, world.height() * tilesize + margin);
-            cons.get(spawnX, spawnY);
+        for(Tile tile : spawns){
+            if(filterPos != -1 && filterPos != tile.pos()) continue;
+
+            if(!airUseSpawns){
+
+                float angle = Angles.angle(world.width() / 2f, world.height() / 2f, 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);
+                float spawnY = Mathf.clamp(world.height() * tilesize / 2f + Angles.trnsy(angle, trns), -margin, world.height() * tilesize + margin);
+                cons.get(spawnX, spawnY);
+            }else{
+                cons.get(tile.worldx(), tile.worldy());
+            }
         }
 
         if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam)){
-            for(Building core : state.teams.get(state.rules.waveTeam).cores){
+            for(Building core : state.rules.waveTeam.data().cores){
+                if(filterPos != -1 && filterPos != core.pos()) continue;
+
                 cons.get(core.x, core.y);
             }
         }
     }
 
+    public int countGroundSpawns(){
+        tmpCount = 0;
+        eachGroundSpawn((x, y) -> tmpCount ++);
+        return tmpCount;
+    }
+
+    public int countFlyerSpawns(){
+        tmpCount = 0;
+        eachFlyerSpawn(-1, (x, y) -> tmpCount ++);
+        return tmpCount;
+    }
+
     public boolean isSpawning(){
         return spawning && !net.client();
     }
 
-    private void reset(){
+    public void reset(){
+        spawning = false;
         spawns.clear();
 
         for(Tile tile : world.tiles){
@@ -177,9 +215,21 @@ public class WaveSpawner{
         }
     }
 
-    private void spawnEffect(Unit unit){
-        Call.spawnEffect(unit.x, unit.y, unit.type);
-        Time.run(30f, unit::add);
+    /** Applies the standard wave spawn effects to a unit - invincibility, unmoving. */
+    public void spawnEffect(Unit unit){
+        spawnEffect(unit, unit.angleTo(world.width()/2f * tilesize, world.height()/2f * tilesize));
+    }
+
+    /** Applies the standard wave spawn effects to a unit - invincibility, unmoving. */
+    public void spawnEffect(Unit unit, float rotation){
+        unit.rotation = rotation;
+        unit.apply(StatusEffects.unmoving, 30f);
+        unit.apply(StatusEffects.invincible, 60f);
+        unit.add();
+        unit.unloaded();
+
+        Events.fire(new UnitSpawnEvent(unit));
+        Call.spawnEffect(unit.x, unit.y, unit.rotation, unit.type);
     }
 
     private interface SpawnConsumer{
@@ -187,8 +237,9 @@ public class WaveSpawner{
     }
 
     @Remote(called = Loc.server, unreliable = true)
-    public static void spawnEffect(float x, float y, UnitType type){
-        Fx.unitSpawn.at(x, y, 0f, type);
+    public static void spawnEffect(float x, float y, float rotation, UnitType u){
+
+        Fx.unitSpawn.at(x, y, rotation, u);
 
         Time.run(30f, () -> Fx.spawn.at(x, y));
     }
diff --git a/core/src/mindustry/ai/formations/BoundedSlotAssignmentStrategy.java b/core/src/mindustry/ai/formations/BoundedSlotAssignmentStrategy.java
deleted file mode 100644
index 62461bde31..0000000000
--- a/core/src/mindustry/ai/formations/BoundedSlotAssignmentStrategy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package mindustry.ai.formations;
-
-
-import arc.struct.*;
-
-/**
- * {@code BoundedSlotAssignmentStrategy} is an abstract implementation of {@link SlotAssignmentStrategy} that supports roles.
- * Generally speaking, there are hard and soft roles. Hard roles cannot be broken, soft roles can.
- * <p>
- * This abstract class provides an implementation of the {@link #calculateNumberOfSlots(Seq) calculateNumberOfSlots} method that
- * is more general (and costly) than the simplified implementation in {@link FreeSlotAssignmentStrategy}. It scans the assignment
- * list to find the number of filled slots, which is the highest slot number in the assignments.
- * @author davebaol
- */
-public abstract class BoundedSlotAssignmentStrategy implements SlotAssignmentStrategy{
-
-    @Override
-    public abstract void updateSlotAssignments(Seq<SlotAssignment> assignments);
-
-    @Override
-    public int calculateNumberOfSlots(Seq<SlotAssignment> assignments){
-        // Find the number of filled slots: it will be the
-        // highest slot number in the assignments
-        int filledSlots = -1;
-        for(int i = 0; i < assignments.size; i++){
-            SlotAssignment assignment = assignments.get(i);
-            if(assignment.slotNumber >= filledSlots) filledSlots = assignment.slotNumber;
-        }
-
-        // Add one to go from the index of the highest slot to the number of slots needed.
-        return filledSlots + 1;
-    }
-
-    @Override
-    public void removeSlotAssignment(Seq<SlotAssignment> assignments, int index){
-        int sn = assignments.get(index).slotNumber;
-        for(int i = 0; i < assignments.size; i++){
-            SlotAssignment sa = assignments.get(i);
-            if(sa.slotNumber >= sn) sa.slotNumber--;
-        }
-        assignments.remove(index);
-    }
-
-}
diff --git a/core/src/mindustry/ai/formations/DistanceAssignmentStrategy.java b/core/src/mindustry/ai/formations/DistanceAssignmentStrategy.java
deleted file mode 100644
index 9713e66862..0000000000
--- a/core/src/mindustry/ai/formations/DistanceAssignmentStrategy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package mindustry.ai.formations;
-
-import arc.math.*;
-import arc.math.geom.*;
-import arc.struct.*;
-
-public class DistanceAssignmentStrategy implements SlotAssignmentStrategy{
-    private final Vec3 vec = new Vec3();
-    private final FormationPattern form;
-
-    public DistanceAssignmentStrategy(FormationPattern form){
-        this.form = form;
-    }
-
-    @Override
-    public void updateSlotAssignments(Seq<SlotAssignment> assignments){
-        IntSeq slots = IntSeq.range(0, assignments.size);
-
-        for(SlotAssignment slot : assignments){
-            int mindex = 0;
-            float mcost = Float.MAX_VALUE;
-
-            for(int i = 0; i < slots.size; i++){
-                float cost = cost(slot.member, slots.get(i));
-                if(cost < mcost){
-                    mcost = cost;
-                    mindex = i;
-                }
-            }
-
-            slot.slotNumber = slots.get(mindex);
-            slots.removeIndex(mindex);
-
-        }
-    }
-
-    @Override
-    public int calculateNumberOfSlots(Seq<SlotAssignment> assignments){
-        return assignments.size;
-    }
-
-    @Override
-    public void removeSlotAssignment(Seq<SlotAssignment> assignments, int index){
-        assignments.remove(index);
-    }
-
-    float cost(FormationMember member, int slot){
-        form.calculateSlotLocation(vec, slot);
-        return Mathf.dst2(member.formationPos().x, member.formationPos().y, vec.x, vec.y);
-    }
-}
diff --git a/core/src/mindustry/ai/formations/Formation.java b/core/src/mindustry/ai/formations/Formation.java
deleted file mode 100644
index db2ce02e14..0000000000
--- a/core/src/mindustry/ai/formations/Formation.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package mindustry.ai.formations;
-
-import arc.math.*;
-import arc.math.geom.*;
-import arc.struct.*;
-
-/**
- * A {@code Formation} coordinates the movement of a group of characters so that they retain some group organization. Characters
- * belonging to a formation must implement the {@link FormationMember} interface. At its simplest, a formation can consist of
- * moving in a fixed geometric pattern such as a V or line abreast, but it is not limited to that. Formations can also make use of
- * the environment. Squads of characters can move between cover points using formation steering with only minor modifications, for
- * example.
- * <p>
- * Formation motion is used in team sports games, squad-based games, real-time strategy games, and sometimes in first-person
- * shooters, driving games, and action adventures too. It is a simple and flexible technique that is much quicker to write and
- * execute and can produce much more stable behavior than collaborative tactical decision making.
- * @author davebaol
- */
-public class Formation{
-    /** A list of slots assignments. */
-    public Seq<SlotAssignment> slotAssignments;
-    /** The anchor point of this formation. */
-    public Vec3 anchor;
-    /** The formation pattern */
-    public FormationPattern pattern;
-    /** The strategy used to assign a member to his slot */
-    public SlotAssignmentStrategy slotAssignmentStrategy;
-    /** The formation motion moderator */
-    public FormationMotionModerator motionModerator;
-
-    private final Vec2 positionOffset;
-    private final Mat orientationMatrix = new Mat();
-
-    /** The location representing the drift offset for the currently filled slots. */
-    private final Vec3 driftOffset;
-
-    /**
-     * Creates a {@code Formation} for the specified {@code pattern} using a {@link FreeSlotAssignmentStrategy} and no motion
-     * moderator.
-     * @param anchor the anchor point of this formation, Cannot be {@code null}.
-     * @param pattern the pattern of this formation
-     * @throws IllegalArgumentException if the anchor point is {@code null}
-     */
-    public Formation(Vec3 anchor, FormationPattern pattern){
-        this(anchor, pattern, new FreeSlotAssignmentStrategy(), null);
-    }
-
-    /**
-     * Creates a {@code Formation} for the specified {@code pattern} and {@code slotAssignmentStrategy} using no motion moderator.
-     * @param anchor the anchor point of this formation, Cannot be {@code null}.
-     * @param pattern the pattern of this formation
-     * @param slotAssignmentStrategy the strategy used to assign a member to his slot
-     * @throws IllegalArgumentException if the anchor point is {@code null}
-     */
-    public Formation(Vec3 anchor, FormationPattern pattern, SlotAssignmentStrategy slotAssignmentStrategy){
-        this(anchor, pattern, slotAssignmentStrategy, null);
-    }
-
-    /**
-     * Creates a {@code Formation} for the specified {@code pattern}, {@code slotAssignmentStrategy} and {@code moderator}.
-     * @param anchor the anchor point of this formation, Cannot be {@code null}.
-     * @param pattern the pattern of this formation
-     * @param slotAssignmentStrategy the strategy used to assign a member to his slot
-     * @param motionModerator the motion moderator. Can be {@code null} if moderation is not needed
-     * @throws IllegalArgumentException if the anchor point is {@code null}
-     */
-    public Formation(Vec3 anchor, FormationPattern pattern, SlotAssignmentStrategy slotAssignmentStrategy,
-                     FormationMotionModerator motionModerator){
-        if(anchor == null) throw new IllegalArgumentException("The anchor point cannot be null");
-        this.anchor = anchor;
-        this.pattern = pattern;
-        this.slotAssignmentStrategy = slotAssignmentStrategy;
-        this.motionModerator = motionModerator;
-
-        this.slotAssignments = new Seq<>();
-        this.driftOffset = new Vec3();
-        this.positionOffset = new Vec2(anchor.x, anchor.y).cpy();
-    }
-
-    /** Updates the assignment of members to slots */
-    public void updateSlotAssignments(){
-        pattern.slots = slotAssignments.size;
-
-        // Apply the strategy to update slot assignments
-        slotAssignmentStrategy.updateSlotAssignments(slotAssignments);
-
-        // Set the newly calculated number of slots
-        pattern.slots = slotAssignmentStrategy.calculateNumberOfSlots(slotAssignments);
-
-        // Update the drift offset if a motion moderator is set
-        if(motionModerator != null) motionModerator.calculateDriftOffset(driftOffset, slotAssignments, pattern);
-    }
-
-    /**
-     * Changes the pattern of this formation and updates slot assignments if the number of member is supported by the given
-     * pattern.
-     * @param pattern the pattern to set
-     * @return {@code true} if the pattern has effectively changed; {@code false} otherwise.
-     */
-    public boolean changePattern(FormationPattern pattern){
-        // Find out how many slots we have occupied
-        int occupiedSlots = slotAssignments.size;
-
-        // Check if the pattern supports one more slot
-        if(pattern.supportsSlots(occupiedSlots)){
-           this.pattern = pattern;
-
-            // Update the slot assignments and return success
-            updateSlotAssignments();
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /** Much more efficient than adding a single member.
-     * @return number of members added. */
-    public int addMembers(Iterable<? extends FormationMember> members){
-        int added = 0;
-        for(FormationMember member : members){
-            if(pattern.supportsSlots(slotAssignments.size + 1)){
-                slotAssignments.add(new SlotAssignment(member, slotAssignments.size));
-                added ++;
-            }
-        }
-
-        updateSlotAssignments();
-        return added;
-    }
-
-    /**
-     * Adds a new member to the first available slot and updates slot assignments if the number of member is supported by the
-     * current pattern.
-     * @param member the member to add
-     * @return {@code false} if no more slots are available; {@code true} otherwise.
-     */
-    public boolean addMember(FormationMember member){
-        // Check if the pattern supports one more slot
-        if(pattern.supportsSlots(slotAssignments.size + 1)){
-            // Add a new slot assignment
-            slotAssignments.add(new SlotAssignment(member, slotAssignments.size));
-
-            // Update the slot assignments and return success
-            updateSlotAssignments();
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes a member from its slot and updates slot assignments.
-     * @param member the member to remove
-     */
-    public void removeMember(FormationMember member){
-        // Find the member's slot
-        int slot = findMemberSlot(member);
-
-        // Make sure we've found a valid result
-        if(slot >= 0){
-            // Remove the slot
-            // slotAssignments.removeIndex(slot);
-            slotAssignmentStrategy.removeSlotAssignment(slotAssignments, slot);
-
-            // Update the assignments
-            updateSlotAssignments();
-        }
-    }
-
-    private int findMemberSlot(FormationMember member){
-        for(int i = 0; i < slotAssignments.size; i++){
-            if(slotAssignments.get(i).member == member) return i;
-        }
-        return -1;
-    }
-
-    // debug
-    public SlotAssignment getSlotAssignmentAt(int index){
-        return slotAssignments.get(index);
-    }
-
-    // debug
-    public int getSlotAssignmentCount(){
-        return slotAssignments.size;
-    }
-
-    /** Writes new slot locations to each member */
-    public void updateSlots(){
-        positionOffset.set(anchor);
-        float orientationOffset = anchor.z;
-        if(motionModerator != null){
-            positionOffset.sub(driftOffset);
-            orientationOffset -= driftOffset.z;
-        }
-
-        // Get the orientation of the anchor point as a matrix
-        orientationMatrix.idt().rotate(anchor.z);
-
-        // Go through each member in turn
-        for(int i = 0; i < slotAssignments.size; i++){
-            SlotAssignment slotAssignment = slotAssignments.get(i);
-
-            // Retrieve the location reference of the formation member to calculate the new value
-            Vec3 relativeLoc = slotAssignment.member.formationPos();
-            float z = relativeLoc.z;
-
-            // Ask for the location of the slot relative to the anchor point
-            pattern.calculateSlotLocation(relativeLoc, slotAssignment.slotNumber);
-
-            // Transform it by the anchor point's position and orientation
-            relativeLoc.mul(orientationMatrix);
-
-            // Add the anchor and drift components
-            relativeLoc.add(positionOffset.x, positionOffset.y, 0);
-            relativeLoc.z = z + orientationOffset;
-        }
-
-        // Possibly reset the anchor point if a moderator is set
-        if(motionModerator != null){
-            motionModerator.updateAnchorPoint(anchor);
-        }
-    }
-}
diff --git a/core/src/mindustry/ai/formations/FormationMember.java b/core/src/mindustry/ai/formations/FormationMember.java
deleted file mode 100644
index 2fdf259f62..0000000000
--- a/core/src/mindustry/ai/formations/FormationMember.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package mindustry.ai.formations;
-
-import arc.math.geom.*;
-
-/**
- * Game characters coordinated by a {@link Formation} must implement this interface. Any {@code FormationMember} has a target
- * location which is the place where it should be in order to stay in formation. This target location is calculated by the
- * formation itself.
- * @author davebaol
- */
-public interface FormationMember{
-    /** Returns the target location of this formation member. */
-    Vec3 formationPos();
-
-    float formationSize();
-}
diff --git a/core/src/mindustry/ai/formations/FormationMotionModerator.java b/core/src/mindustry/ai/formations/FormationMotionModerator.java
deleted file mode 100644
index 65e55951c9..0000000000
--- a/core/src/mindustry/ai/formations/FormationMotionModerator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package mindustry.ai.formations;
-
-import arc.math.geom.*;
-import arc.struct.*;
-
-/**
- * A {@code FormationMotionModerator} moderates the movement of the formation based on the current positions of the members in its
- * slots: in effect to keep the anchor point on a leash. If the members in the slots are having trouble reaching their targets,
- * then the formation as a whole should be held back to give them a chance to catch up.
- * @author davebaol
- */
-public abstract class FormationMotionModerator{
-    private Vec3 tempLocation;
-
-    /**
-     * Update the anchor point to moderate formation motion. This method is called at each frame.
-     * @param anchor the anchor point
-     */
-    public abstract void updateAnchorPoint(Vec3 anchor);
-
-    /**
-     * Calculates the drift offset when members are in the given set of slots for the specified pattern.
-     * @param centerOfMass the output location set to the calculated drift offset
-     * @param slotAssignments the set of slots
-     * @param pattern the pattern
-     * @return the given location for chaining.
-     */
-    public Vec3 calculateDriftOffset(Vec3 centerOfMass, Seq<SlotAssignment> slotAssignments, FormationPattern pattern){
-        // Clear the center of mass
-        centerOfMass.x = centerOfMass.y = 0;
-        float centerOfMassOrientation = 0;
-
-        // Make sure tempLocation is instantiated
-        if(tempLocation == null) tempLocation = new Vec3();
-
-        // Go through each assignment and add its contribution to the center
-        float numberOfAssignments = slotAssignments.size;
-        for(int i = 0; i < numberOfAssignments; i++){
-            pattern.calculateSlotLocation(tempLocation, slotAssignments.get(i).slotNumber);
-            centerOfMass.add(tempLocation);
-            centerOfMassOrientation += tempLocation.z;
-        }
-
-        // Divide through to get the drift offset.
-        centerOfMass.scl(1f / numberOfAssignments);
-        centerOfMassOrientation /= numberOfAssignments;
-        centerOfMass.z = centerOfMassOrientation;
-
-        return centerOfMass;
-    }
-
-}
diff --git a/core/src/mindustry/ai/formations/FormationPattern.java b/core/src/mindustry/ai/formations/FormationPattern.java
deleted file mode 100644
index 5fe84bcda9..0000000000
--- a/core/src/mindustry/ai/formations/FormationPattern.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package mindustry.ai.formations;
-
-import arc.math.geom.*;
-
-/**
- * The {@code FormationPattern} interface represents the shape of a formation and generates the slot offsets, relative to its
- * anchor point. Since formations can be scalable the pattern must be able to determine if a given number of slots is supported.
- * <p>
- * Each particular pattern (such as a V, wedge, circle) needs its own instance of a class that implements this
- * {@code FormationPattern} interface.
- * @author davebaol
- */
-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);
-
-    /**
-     * Returns true if the pattern can support the given number of slots
-     * @param slotCount the number of slots
-     * @return {@code true} if this pattern can support the given number of slots; {@code false} othervwise.
-     */
-    public boolean supportsSlots(int slotCount){
-        return true;
-    }
-}
diff --git a/core/src/mindustry/ai/formations/FreeSlotAssignmentStrategy.java b/core/src/mindustry/ai/formations/FreeSlotAssignmentStrategy.java
deleted file mode 100644
index 89e51054d2..0000000000
--- a/core/src/mindustry/ai/formations/FreeSlotAssignmentStrategy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package mindustry.ai.formations;
-
-
-import arc.struct.*;
-
-/**
- * {@code FreeSlotAssignmentStrategy} is the simplest implementation of {@link SlotAssignmentStrategy}. It simply go through
- * each assignment in the list and assign sequential slot numbers. The number of slots is just the length of the list.
- * <p>
- * Because each member can occupy any slot this implementation does not support roles.
- * @author davebaol
- */
-public class FreeSlotAssignmentStrategy implements SlotAssignmentStrategy{
-
-    @Override
-    public void updateSlotAssignments(Seq<SlotAssignment> assignments){
-        // A very simple assignment algorithm: we simply go through
-        // each assignment in the list and assign sequential slot numbers
-        for(int i = 0; i < assignments.size; i++){
-            assignments.get(i).slotNumber = i;
-        }
-    }
-
-    @Override
-    public int calculateNumberOfSlots(Seq<SlotAssignment> assignments){
-        return assignments.size;
-    }
-
-    @Override
-    public void removeSlotAssignment(Seq<SlotAssignment> assignments, int index){
-        assignments.remove(index);
-    }
-
-}
diff --git a/core/src/mindustry/ai/formations/SlotAssignment.java b/core/src/mindustry/ai/formations/SlotAssignment.java
deleted file mode 100644
index c30cc6e226..0000000000
--- a/core/src/mindustry/ai/formations/SlotAssignment.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package mindustry.ai.formations;
-
-
-/**
- * A {@code SlotAssignment} instance represents the assignment of a single {@link FormationMember} to its slot in the
- * {@link Formation}.
- * @author davebaol
- */
-public class SlotAssignment{
-    public FormationMember member;
-    public int slotNumber;
-
-    /**
-     * Creates a {@code SlotAssignment} for the given {@code member}.
-     * @param member the member of this slot assignment
-     */
-    public SlotAssignment(FormationMember member){
-        this(member, 0);
-    }
-
-    /**
-     * Creates a {@code SlotAssignment} for the given {@code member} and {@code slotNumber}.
-     * @param member the member of this slot assignment
-     */
-    public SlotAssignment(FormationMember member, int slotNumber){
-        this.member = member;
-        this.slotNumber = slotNumber;
-    }
-}
diff --git a/core/src/mindustry/ai/formations/SlotAssignmentStrategy.java b/core/src/mindustry/ai/formations/SlotAssignmentStrategy.java
deleted file mode 100644
index 2ccea7aa15..0000000000
--- a/core/src/mindustry/ai/formations/SlotAssignmentStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package mindustry.ai.formations;
-
-import arc.struct.*;
-
-/**
- * This interface defines how each {@link FormationMember} is assigned to a slot in the {@link Formation}.
- * @author davebaol
- */
-public interface SlotAssignmentStrategy{
-
-    /** Updates the assignment of members to slots */
-    void updateSlotAssignments(Seq<SlotAssignment> assignments);
-
-    /** Calculates the number of slots from the assignment data. */
-    int calculateNumberOfSlots(Seq<SlotAssignment> assignments);
-
-    /** Removes the slot assignment at the specified index. */
-    void removeSlotAssignment(Seq<SlotAssignment> assignments, int index);
-
-}
diff --git a/core/src/mindustry/ai/formations/SoftRoleSlotAssignmentStrategy.java b/core/src/mindustry/ai/formations/SoftRoleSlotAssignmentStrategy.java
deleted file mode 100644
index 59c933c205..0000000000
--- a/core/src/mindustry/ai/formations/SoftRoleSlotAssignmentStrategy.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package mindustry.ai.formations;
-
-
-import arc.struct.*;
-import arc.util.*;
-
-/**
- * {@code SoftRoleSlotAssignmentStrategy} is a concrete implementation of {@link BoundedSlotAssignmentStrategy} that supports soft
- * roles, i.e. roles that can be broken. Rather than a member having a list of roles it can fulfill, it has a set of values
- * representing how difficult it would find it to fulfill every role. The value is known as the slot cost. To make a slot
- * impossible for a member to fill, its slot cost should be infinite (you can even set a threshold to ignore all slots whose cost
- * is too high; this will reduce computation time when several costs are exceeding). To make a slot ideal for a member, its slot
- * cost should be zero. We can have different levels of unsuitable assignment for one member.
- * <p>
- * Slot costs do not necessarily have to depend only on the member and the slot roles. They can be generalized to include any
- * difficulty a member might have in taking up a slot. If a formation is spread out, for example, a member may choose a slot that
- * is close by over a more distant slot. Distance can be directly used as a slot cost.
- * <p>
- * <b>IMPORTANVec2 NOTES:</b>
- * <ul>
- * <li>In order for the algorithm to work properly the slot costs can not be negative.</li>
- * <li>This algorithm is often not fast enough to be used regularly. However, slot assignment happens relatively seldom (when the
- * player selects a new pattern, for example, or adds a member to the formation, or a member is removed from the formation).</li>
- * </ul>
- * @author davebaol
- */
-public class SoftRoleSlotAssignmentStrategy extends BoundedSlotAssignmentStrategy{
-    protected SlotCostProvider slotCostProvider;
-    protected float costThreshold;
-    private BoolSeq filledSlots;
-
-    /**
-     * Creates a {@code SoftRoleSlotAssignmentStrategy} with the given slot cost provider and no cost threshold.
-     * @param slotCostProvider the slot cost provider
-     */
-    public SoftRoleSlotAssignmentStrategy(SlotCostProvider slotCostProvider){
-        this(slotCostProvider, Float.POSITIVE_INFINITY);
-    }
-
-    /**
-     * Creates a {@code SoftRoleSlotAssignmentStrategy} with the given slot cost provider and cost threshold.
-     * @param slotCostProvider the slot cost provider
-     * @param costThreshold is a slot-cost limit, beyond which a slot is considered to be too expensive to consider occupying.
-     */
-    public SoftRoleSlotAssignmentStrategy(SlotCostProvider slotCostProvider, float costThreshold){
-        this.slotCostProvider = slotCostProvider;
-        this.costThreshold = costThreshold;
-
-        this.filledSlots = new BoolSeq();
-    }
-
-    @Override
-    public void updateSlotAssignments(Seq<SlotAssignment> assignments){
-        // Holds a list of member and slot data for each member.
-        Seq<MemberAndSlots> memberData = new Seq<>();
-
-        // Compile the member data
-        int numberOfAssignments = assignments.size;
-        for(int i = 0; i < numberOfAssignments; i++){
-            SlotAssignment assignment = assignments.get(i);
-
-            // Create a new member datum, and fill it
-            MemberAndSlots datum = new MemberAndSlots(assignment.member);
-
-            // Add each valid slot to it
-            for(int j = 0; j < numberOfAssignments; j++){
-
-                // Get the cost of the slot
-                float cost = slotCostProvider.getCost(assignment.member, j);
-
-                // Make sure the slot is valid
-                if(cost >= costThreshold) continue;
-
-                SlotAssignment slot = assignments.get(j);
-
-                // Store the slot information
-                CostAndSlot slotDatum = new CostAndSlot(cost, slot.slotNumber);
-                datum.costAndSlots.add(slotDatum);
-
-                // Add it to the member's ease of assignment
-                datum.assignmentEase += 1f / (1f + cost);
-            }
-
-            // Add member datum
-            memberData.add(datum);
-        }
-
-        // Reset the array to keep track of which slots we have already filled.
-        if(numberOfAssignments > filledSlots.size) filledSlots.ensureCapacity(numberOfAssignments - filledSlots.size);
-        filledSlots.size = numberOfAssignments;
-        for(int i = 0; i < numberOfAssignments; i++)
-            filledSlots.set(i, false);
-
-        // Arrange members in order of ease of assignment, with the least easy first.
-        memberData.sort();
-        MEMBER_LOOP:
-        for(int i = 0; i < memberData.size; i++){
-            MemberAndSlots memberDatum = memberData.get(i);
-
-            // Choose the first slot in the list that is still empty (non-filled)
-            memberDatum.costAndSlots.sort();
-            int m = memberDatum.costAndSlots.size;
-            for(int j = 0; j < m; j++){
-                int slotNumber = memberDatum.costAndSlots.get(j).slotNumber;
-
-                // Check if this slot is valid
-                if(!filledSlots.get(slotNumber)){
-                    // Fill this slot
-                    SlotAssignment slot = assignments.get(slotNumber);
-                    slot.member = memberDatum.member;
-                    slot.slotNumber = slotNumber;
-
-                    // Reserve the slot
-                    filledSlots.set(slotNumber, true);
-
-                    // Go to the next member
-                    continue MEMBER_LOOP;
-                }
-            }
-
-            // If we reach here, it's because a member has no valid assignment.
-            //
-            // TODO
-            // Some sensible action should be taken, such as reporting to the player.
-            throw new ArcRuntimeException("SoftRoleSlotAssignmentStrategy cannot find valid slot assignment for member " + memberDatum.member);
-        }
-    }
-
-    static class CostAndSlot implements Comparable<CostAndSlot>{
-        float cost;
-        int slotNumber;
-
-        public CostAndSlot(float cost, int slotNumber){
-            this.cost = cost;
-            this.slotNumber = slotNumber;
-        }
-
-        @Override
-        public int compareTo(CostAndSlot other){
-            return Float.compare(cost, other.cost);
-        }
-    }
-
-    static class MemberAndSlots implements Comparable<MemberAndSlots>{
-        FormationMember member;
-        float assignmentEase;
-        Seq<CostAndSlot> costAndSlots;
-
-        public MemberAndSlots(FormationMember member){
-            this.member = member;
-            this.assignmentEase = 0f;
-            this.costAndSlots = new Seq<>();
-        }
-
-        @Override
-        public int compareTo(MemberAndSlots other){
-            return Float.compare(assignmentEase, other.assignmentEase);
-        }
-    }
-
-    public interface SlotCostProvider{
-        float getCost(FormationMember member, int slotNumber);
-    }
-}
diff --git a/core/src/mindustry/ai/formations/patterns/CircleFormation.java b/core/src/mindustry/ai/formations/patterns/CircleFormation.java
deleted file mode 100644
index 9636d97036..0000000000
--- a/core/src/mindustry/ai/formations/patterns/CircleFormation.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package mindustry.ai.formations.patterns;
-
-import arc.math.*;
-import arc.math.geom.*;
-import mindustry.ai.formations.*;
-
-public class CircleFormation extends FormationPattern{
-    /** Angle offset. */
-    public float angleOffset = 0;
-
-    @Override
-    public Vec3 calculateSlotLocation(Vec3 outLocation, int slotNumber){
-        if(slots > 1){
-            float angle = (360f * slotNumber) / slots;
-            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, spacing * 1.1f, 360f * slotNumber);
-        }
-
-        outLocation.z += angleOffset;
-
-        return outLocation;
-    }
-
-}
diff --git a/core/src/mindustry/ai/formations/patterns/SquareFormation.java b/core/src/mindustry/ai/formations/patterns/SquareFormation.java
deleted file mode 100644
index 9d7ddab549..0000000000
--- a/core/src/mindustry/ai/formations/patterns/SquareFormation.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package mindustry.ai.formations.patterns;
-
-import arc.math.*;
-import arc.math.geom.*;
-import mindustry.ai.formations.*;
-
-public class SquareFormation extends FormationPattern{
-
-    @Override
-    public Vec3 calculateSlotLocation(Vec3 out, int slot){
-        //side of each square of formation
-        int side = Mathf.ceil(Mathf.sqrt(slots + 1));
-        int cx = slot % side, cy = slot / side;
-
-        //don't hog the middle spot
-        if(cx == side /2 && cy == side/2 && (side%2)==1){
-            slot = slots;
-
-            cx = slot % side;
-            cy = slot / side;
-        }
-
-        return out.set(cx - (side/2f - 0.5f), cy - (side/2f - 0.5f), 0).scl(spacing);
-    }
-}
diff --git a/core/src/mindustry/ai/types/AssemblerAI.java b/core/src/mindustry/ai/types/AssemblerAI.java
new file mode 100644
index 0000000000..c3db6f264b
--- /dev/null
+++ b/core/src/mindustry/ai/types/AssemblerAI.java
@@ -0,0 +1,25 @@
+package mindustry.ai.types;
+
+import arc.math.*;
+import arc.math.geom.*;
+import mindustry.entities.units.*;
+
+public class AssemblerAI extends AIController{
+    public Vec2 targetPos = new Vec2();
+    public float targetAngle;
+
+    @Override
+    public void updateMovement(){
+        if(!targetPos.isZero()){
+            moveTo(targetPos, 1f, 3f);
+        }
+
+        if(unit.within(targetPos, 5f)){
+            unit.lookAt(targetAngle);
+        }
+    }
+
+    public boolean inPosition(){
+        return unit.within(targetPos, 10f) && Angles.within(unit.rotation, targetAngle, 15f);
+    }
+}
diff --git a/core/src/mindustry/ai/types/BoostAI.java b/core/src/mindustry/ai/types/BoostAI.java
new file mode 100644
index 0000000000..bed0428c5d
--- /dev/null
+++ b/core/src/mindustry/ai/types/BoostAI.java
@@ -0,0 +1,21 @@
+package mindustry.ai.types;
+
+import mindustry.ai.*;
+import mindustry.entities.units.*;
+
+//not meant to be used outside RTS-AI-controlled units
+public class BoostAI extends AIController{
+
+    @Override
+    public void updateUnit(){
+        if(unit.controller() instanceof CommandAI ai){
+            ai.defaultBehavior();
+            unit.updateBoosting(true);
+
+            //auto land when near target
+            if(ai.attackTarget != null && unit.within(ai.attackTarget, unit.range())){
+                unit.command().command(UnitCommand.moveCommand);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java
index ce8b5ae92d..7932ad8d9c 100644
--- a/core/src/mindustry/ai/types/BuilderAI.java
+++ b/core/src/mindustry/ai/types/BuilderAI.java
@@ -1,6 +1,5 @@
 package mindustry.ai.types;
 
-import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.entities.*;
@@ -13,20 +12,55 @@ import mindustry.world.blocks.ConstructBlock.*;
 import static mindustry.Vars.*;
 
 public class BuilderAI extends AIController{
-    float buildRadius = 1500;
+    public static float buildRadius = 1500, retreatDst = 110f, retreatDelay = Time.toSeconds * 2f, defaultRebuildPeriod = 60f * 2f;
+
+    public @Nullable Unit assistFollowing;
+    public @Nullable Unit following;
+    public @Nullable Teamc enemy;
+    public @Nullable BlockPlan lastPlan;
+
+    public float fleeRange = 370f, rebuildPeriod = defaultRebuildPeriod;
+    public boolean alwaysFlee;
+    public boolean onlyAssist;
+
     boolean found = false;
-    @Nullable Unit following;
+    float retreatTimer;
+
+    public BuilderAI(boolean alwaysFlee, float fleeRange){
+        this.alwaysFlee = alwaysFlee;
+        this.fleeRange = fleeRange;
+    }
+
+    public BuilderAI(){
+    }
+
+    @Override
+    public void init(){
+        //rebuild much faster with buildAI; there are usually few builder units so this is fine
+        if(rebuildPeriod == defaultRebuildPeriod && unit.team.rules().buildAi){
+            rebuildPeriod = 10f;
+        }
+    }
 
     @Override
     public void updateMovement(){
 
         if(target != null && shouldShoot()){
             unit.lookAt(target);
+        }else if(!unit.type.flying){
+            unit.lookAt(unit.prefRotation());
         }
 
         unit.updateBuilding = true;
 
+        if(assistFollowing != null && assistFollowing.activelyBuilding()){
+            following = assistFollowing;
+        }
+
+        boolean moving = false;
+
         if(following != null){
+            retreatTimer = 0f;
             //try to follow and mimic someone
 
             //validate follower
@@ -39,39 +73,68 @@ public class BuilderAI extends AIController{
             //set to follower's first build plan, whatever that is
             unit.plans.clear();
             unit.plans.addFirst(following.buildPlan());
+            lastPlan = null;
+        }else if(unit.buildPlan() == null || alwaysFlee){
+            //not following anyone or building
+            if(timer.get(timerTarget4, 40)){
+                enemy = target(unit.x, unit.y, fleeRange, true, true);
+            }
+
+            //fly away from enemy when not doing anything, but only after a delay
+            if((retreatTimer += Time.delta) >= retreatDelay || alwaysFlee){
+                if(enemy != null){
+                    unit.clearBuilding();
+                    var core = unit.closestCore();
+                    if(core != null && !unit.within(core, retreatDst)){
+                        moveTo(core, retreatDst);
+                        moving = true;
+                    }
+                }
+            }
         }
 
         if(unit.buildPlan() != null){
-            //approach request if building
+            if(!alwaysFlee) retreatTimer = 0f;
+            //approach plan if building
             BuildPlan req = unit.buildPlan();
 
-            //clear break plan if another player is breaking something.
+            //clear break plan if another player is breaking something
             if(!req.breaking && timer.get(timerTarget2, 40f)){
                 for(Player player : Groups.player){
                     if(player.isBuilder() && player.unit().activelyBuilding() && player.unit().buildPlan().samePos(req) && player.unit().buildPlan().breaking){
                         unit.plans.removeFirst();
+                        //remove from list of plans
+                        unit.team.data().plans.remove(p -> p.x == req.x && p.y == req.y);
                         return;
                     }
                 }
             }
 
             boolean valid =
-                (req.tile() != null && req.tile().build instanceof ConstructBuild cons && cons.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));
+                !(lastPlan != null && lastPlan.removed) &&
+                    ((req.tile() != null && req.tile().build instanceof ConstructBuild cons && cons.current == req.block) ||
+                    (req.breaking ?
+                        Build.validBreak(unit.team(), req.x, req.y) :
+                        Build.validPlace(req.block, unit.team(), req.x, req.y, req.rotation)));
 
             if(valid){
-                //move toward the request
-                moveTo(req.tile(), buildingRange - 20f);
+                //move toward the plan
+                moveTo(req.tile(), unit.type.buildRange - 20f, 20f);
+                moving = !unit.within(req.tile(), unit.type.buildRange - 10f);
             }else{
-                //discard invalid request
+                //discard invalid plan
                 unit.plans.removeFirst();
+                lastPlan = null;
             }
         }else{
 
+            if(assistFollowing != null){
+                moveTo(assistFollowing, assistFollowing.type.hitSize + unit.type.hitSize/2f + 60f);
+                moving = !unit.within(assistFollowing, assistFollowing.type.hitSize + unit.type.hitSize/2f + 65f);
+            }
+
             //follow someone and help them build
-            if(timer.get(timerTarget2, 60f)){
+            if(timer.get(timerTarget2, 20f)){
                 found = false;
 
                 Units.nearby(unit.team, unit.x, unit.y, buildRadius, u -> {
@@ -82,9 +145,9 @@ public class BuilderAI extends AIController{
 
                         Building build = world.build(plan.x, plan.y);
                         if(build instanceof ConstructBuild cons){
-                            float dist = Math.min(cons.dst(unit) - buildingRange, 0);
+                            float dist = Math.min(cons.dst(unit) - unit.type.buildRange, 0);
 
-                            //make sure you can reach the request in time
+                            //make sure you can reach the plan in time
                             if(dist / unit.speed() < cons.buildCost * 0.9f){
                                 following = u;
                                 found = true;
@@ -92,30 +155,52 @@ public class BuilderAI extends AIController{
                         }
                     }
                 });
+
+                if(onlyAssist){
+                    float minDst = Float.MAX_VALUE;
+                    Player closest = null;
+                    for(var player : Groups.player){
+                        if(!player.dead() && player.isBuilder() && player.team() == unit.team){
+                            float dst = player.dst2(unit);
+                            if(dst < minDst){
+                                closest = player;
+                                minDst = dst;
+                            }
+                        }
+                    }
+
+                    assistFollowing = closest == null ? null : closest.unit();
+                }
             }
 
-            float rebuildTime = (unit.team.rules().ai ? Mathf.lerp(15f, 2f, unit.team.rules().aiTier) : 2f) * 60f;
-
-            //find new request
-            if(!unit.team.data().blocks.isEmpty() && following == null && timer.get(timerTarget3, rebuildTime)){
-                Queue<BlockPlan> blocks = unit.team.data().blocks;
+            //find new plan
+            if(!onlyAssist && !unit.team.data().plans.isEmpty() && following == null && timer.get(timerTarget3, rebuildPeriod)){
+                Queue<BlockPlan> blocks = unit.team.data().plans;
                 BlockPlan block = blocks.first();
 
                 //check if it's already been placed
-                if(world.tile(block.x, block.y) != null && world.tile(block.x, block.y).block().id == block.block){
+                if(world.tile(block.x, block.y) != null && world.tile(block.x, block.y).block() == block.block){
                     blocks.removeFirst();
-                }else if(Build.validPlace(content.block(block.block), unit.team(), block.x, block.y, block.rotation)){ //it's valid.
-                    //add build request.
-                    unit.addBuild(new BuildPlan(block.x, block.y, block.rotation, content.block(block.block), block.config));
-                    //shift build plan to tail so next unit builds something else.
+                }else if(Build.validPlace(block.block, unit.team(), block.x, block.y, block.rotation) && (!alwaysFlee || !nearEnemy(block.x, block.y))){ //it's valid
+                    lastPlan = block;
+                    //add build plan
+                    unit.addBuild(new BuildPlan(block.x, block.y, block.rotation, block.block, block.config));
+                    //shift build plan to tail so next unit builds something else
                     blocks.addLast(blocks.removeFirst());
                 }else{
                     //shift head of queue to tail, try something else next time
-                    blocks.removeFirst();
-                    blocks.addLast(block);
+                    blocks.addLast(blocks.removeFirst());
                 }
             }
         }
+
+        if(!unit.type.flying){
+            unit.updateBoosting(unit.type.boostWhenBuilding || moving || unit.floorOn().isDuct || unit.floorOn().damageTaken > 0f || unit.floorOn().isDeep());
+        }
+    }
+
+    protected boolean nearEnemy(int x, int y){
+        return Units.nearEnemy(unit.team, x * tilesize - fleeRange/2f, y * tilesize - fleeRange/2f, fleeRange, fleeRange);
     }
 
     @Override
@@ -125,11 +210,11 @@ public class BuilderAI extends AIController{
 
     @Override
     public boolean useFallback(){
-        return state.rules.waves && unit.team == state.rules.waveTeam && !unit.team.rules().ai;
+        return state.rules.waves && unit.team == state.rules.waveTeam && !unit.team.rules().rtsAi;
     }
 
     @Override
     public boolean shouldShoot(){
-        return !unit.isBuilding();
+        return !unit.isBuilding() && unit.type.canAttack;
     }
 }
diff --git a/core/src/mindustry/ai/types/CargoAI.java b/core/src/mindustry/ai/types/CargoAI.java
new file mode 100644
index 0000000000..8fb522e900
--- /dev/null
+++ b/core/src/mindustry/ai/types/CargoAI.java
@@ -0,0 +1,193 @@
+package mindustry.ai.types;
+
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.blocks.units.UnitCargoUnloadPoint.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class CargoAI extends AIController{
+    static Seq<Item> orderedItems = new Seq<>();
+    static Seq<UnitCargoUnloadPointBuild> targets = new Seq<>();
+
+    public static float emptyWaitTime = 60f * 2f, dropSpacing = 60f * 1.5f;
+    public static float transferRange = 20f, moveRange = 6f, moveSmoothing = 20f;
+
+    public @Nullable UnitCargoUnloadPointBuild unloadTarget;
+    public @Nullable Item itemTarget;
+    public float noDestTimer = 0f;
+    public int targetIndex = 0;
+
+    @Override
+    public void updateMovement(){
+        if(!(unit instanceof BuildingTetherc tether) || tether.building() == null) return;
+
+        var build = tether.building();
+
+        if(build.items == null) return;
+
+        //empty, approach the loader, even if there's nothing to pick up (units hanging around doing nothing looks bad)
+        if(!unit.hasItem()){
+            moveTo(build, moveRange, moveSmoothing);
+
+            //check if ready to pick up
+            if(build.items.any() && unit.within(build, transferRange)){
+                if(retarget()){
+                    findAnyTarget(build);
+
+                    //target has been found, grab items and go
+                    if(unloadTarget != null){
+                        Call.takeItems(build, itemTarget, Math.min(unit.type.itemCapacity, build.items.get(itemTarget)), unit);
+                    }
+                }
+            }
+        }else{ //the unit has an item, deposit it somewhere.
+
+            //there may be no current target, try to find one
+            if(unloadTarget == null){
+                if(retarget()){
+                    findDropTarget(unit.item(), 0, null);
+
+                    //if there is not even a single place to unload, dump items.
+                    if(unloadTarget == null){
+                        unit.clearItem();
+                    }
+                }
+            }else{
+
+                //what if some prankster reconfigures or picks up the target while the unit is moving? we can't have that!
+                if(unloadTarget.item != itemTarget || unloadTarget.isPayload()){
+                    unloadTarget = null;
+                    return;
+                }
+
+                moveTo(unloadTarget, moveRange, moveSmoothing);
+
+                //deposit in bursts, unloading can take a while
+                if(unit.within(unloadTarget, transferRange) && timer.get(timerTarget2, dropSpacing)){
+                    int max = unloadTarget.acceptStack(unit.item(), unit.stack.amount, unit);
+
+                    //deposit items when it's possible
+                    if(max > 0){
+                        noDestTimer = 0f;
+                        Call.transferItemTo(unit, unit.item(), max, unit.x, unit.y, unloadTarget);
+
+                        //try the next target later
+                        if(!unit.hasItem()){
+                            targetIndex ++;
+                        }
+                    }else if((noDestTimer += dropSpacing) >= emptyWaitTime){
+                        //oh no, it's out of space - wait for a while, and if nothing changes, try the next destination
+
+                        //next targeting attempt will try the next destination point
+                        targetIndex = findDropTarget(unit.item(), targetIndex, unloadTarget) + 1;
+
+                        //nothing found at all, clear item
+                        if(unloadTarget == null){
+                            unit.clearItem();
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+    /** find target for the unit's current item */
+    public int findDropTarget(Item item, int offset, UnitCargoUnloadPointBuild ignore){
+        unloadTarget = null;
+        itemTarget = item;
+
+        //autocast for convenience... I know all of these must be cargo unload points anyway
+        targets.selectFrom((Seq<UnitCargoUnloadPointBuild>)(Seq)Vars.indexer.getFlagged(unit.team, BlockFlag.unitCargoUnloadPoint), u -> u.item == item);
+
+        if(targets.isEmpty()) return 0;
+
+        UnitCargoUnloadPointBuild lastStale = null;
+
+        offset %= targets.size;
+
+        int i = 0;
+
+        for(var target : targets){
+            if(i >= offset && target != ignore){
+                if(target.stale){
+                    lastStale = target;
+                }else{
+                    unloadTarget = target;
+                    targets.clear();
+                    return i;
+                }
+            }
+            i ++;
+        }
+
+        //it's still possible that the ignored target may become available at some point, try that, so it doesn't waste items
+        if(ignore != null){
+            unloadTarget = ignore;
+        }else if(lastStale != null){ //a stale target is better than nothing
+            unloadTarget = lastStale;
+        }
+
+        targets.clear();
+        return -1;
+    }
+
+    public void findAnyTarget(Building build){
+        unloadTarget = null;
+        itemTarget = null;
+
+        //autocast for convenience... I know all of these must be cargo unload points anyway
+        var baseTargets = (Seq<UnitCargoUnloadPointBuild>)(Seq)Vars.indexer.getFlagged(unit.team, BlockFlag.unitCargoUnloadPoint);
+
+        if(baseTargets.isEmpty()) return;
+
+        orderedItems.size = 0;
+        for(Item item : content.items()){
+            if(build.items.get(item) > 0){
+                orderedItems.add(item);
+            }
+        }
+
+        //sort by most items in descending order, and try each one.
+        orderedItems.sort(i -> -build.items.get(i));
+
+        UnitCargoUnloadPointBuild lastStale = null;
+
+        outer:
+        for(Item item : orderedItems){
+            targets.selectFrom(baseTargets, u -> u.item == item);
+
+            if(targets.size > 0) itemTarget = item;
+
+            for(int i = 0; i < targets.size; i ++){
+                var target = targets.get((i + targetIndex) % targets.size);
+
+                lastStale = target;
+
+                if(!target.stale){
+                    unloadTarget = target;
+                    break outer;
+                }
+            }
+        }
+
+        //if the only thing that was found was a "stale" target, at least try that...
+        if(unloadTarget == null && lastStale != null){
+            unloadTarget = lastStale;
+        }
+
+        targets.clear();
+    }
+
+    //unused, might change later
+    void sortTargets(Seq<UnitCargoUnloadPointBuild> targets){
+        //find sort by "most desirable" first
+        targets.sort(Structs.comps(Structs.comparingInt(b -> b.items.total()), Structs.comparingFloat(b -> b.dst2(unit))));
+    }
+}
diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java
new file mode 100644
index 0000000000..48a465ceb9
--- /dev/null
+++ b/core/src/mindustry/ai/types/CommandAI.java
@@ -0,0 +1,516 @@
+package mindustry.ai.types;
+
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.ai.*;
+import mindustry.core.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+import mindustry.world.blocks.payloads.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class CommandAI extends AIController{
+    protected static final int maxCommandQueueSize = 50, avoidInterval = 10;
+    protected static final Vec2 vecOut = new Vec2(), vecMovePos = new Vec2();
+    protected static final boolean[] noFound = {false};
+    protected static final UnitPayload tmpPayload = new UnitPayload(null);
+    protected static final int transferStateNone = 0, transferStateLoad = 1, transferStateUnload = 2;
+
+    public Seq<Position> commandQueue = new Seq<>(5);
+    public @Nullable Vec2 targetPos;
+    public @Nullable Teamc attackTarget;
+    /** Group of units that were all commanded to reach the same point. */
+    public @Nullable UnitGroup group;
+    public int groupIndex = 0;
+    /** All encountered unreachable buildings of this AI. Why a sequence? Because contains() is very rarely called on it. */
+    public IntSeq unreachableBuildings = new IntSeq(8);
+    /** ID of unit read as target. This is set up after reading. Do not access! */
+    public int readAttackTarget = -1;
+
+    protected boolean stopAtTarget, stopWhenInRange;
+    protected Vec2 lastTargetPos;
+    protected boolean blockingUnit;
+    protected float timeSpentBlocked;
+    protected float payloadPickupCooldown;
+    protected int transferState = transferStateNone;
+
+    /** Stance, usually related to firing mode. */
+    public UnitStance stance = UnitStance.shoot;
+    /** Current command this unit is following. */
+    public UnitCommand command = UnitCommand.moveCommand;
+    /** Current controller instance based on command. */
+    protected @Nullable AIController commandController;
+    /** Last command type assigned. Used for detecting command changes. */
+    protected @Nullable UnitCommand lastCommand;
+
+    public UnitCommand currentCommand(){
+        return command == null ? UnitCommand.moveCommand : command;
+    }
+
+    /** Attempts to assign a command to this unit. If not supported by the unit type, does nothing. */
+    public void command(UnitCommand command){
+        if(unit.type.commands.contains(command)){
+            //clear old state.
+            unit.mineTile = null;
+            unit.clearBuilding();
+            this.command = command;
+        }
+    }
+
+    @Override
+    public boolean isLogicControllable(){
+        return !hasCommand();
+    }
+
+    public boolean isAttacking(){
+        return target != null && unit.within(target, unit.range() + 10f);
+    }
+
+    @Override
+    public void updateUnit(){
+        //this should not be possible
+        if(stance == UnitStance.stop) stance = UnitStance.shoot;
+
+        //pursue the target if relevant
+        if(stance == UnitStance.pursueTarget && target != null && attackTarget == null && targetPos == null){
+            commandTarget(target, false);
+        }
+
+        //pursue the target for patrol, keeping the current position
+        if(stance == UnitStance.patrol && target != null && attackTarget == null){
+            //commanding a target overwrites targetPos, so add it to the queue
+            if(targetPos != null){
+                commandQueue.add(targetPos.cpy());
+            }
+            commandTarget(target, false);
+        }
+
+        //remove invalid targets
+        if(commandQueue.any()){
+            commandQueue.removeAll(e -> e instanceof Healthc h && !h.isValid());
+        }
+
+        //assign defaults
+        if(command == null && unit.type.commands.size > 0){
+            command = unit.type.defaultCommand == null ? unit.type.commands.first() : unit.type.defaultCommand;
+        }
+
+        //update command controller based on index.
+        var curCommand = command;
+        if(lastCommand != curCommand){
+            lastCommand = curCommand;
+            commandController = (curCommand == null ? null : curCommand.controller.get(unit));
+        }
+
+        //use the command controller if it is provided, and bail out.
+        if(commandController != null){
+            if(commandController.unit() != unit) commandController.unit(unit);
+            commandController.updateUnit();
+        }else{
+            defaultBehavior();
+            //boosting control is not supported, so just don't.
+            unit.updateBoosting(false);
+        }
+    }
+
+    public void clearCommands(){
+        commandQueue.clear();
+        targetPos = null;
+        attackTarget = null;
+    }
+
+    void tryPickupUnit(Payloadc pay){
+        Unit target = Units.closest(unit.team, unit.x, unit.y, unit.type.hitSize * 2f, u -> u.isAI() && u != unit && u.isGrounded() && pay.canPickup(u) && u.within(unit, u.hitSize + unit.hitSize));
+        if(target != null){
+            Call.pickedUnitPayload(unit, target);
+        }
+    }
+
+    @Override
+    public Teamc findMainTarget(float x, float y, float range, boolean air, boolean ground){
+        if(!unit.type.autoFindTarget && !(targetPos == null || nearAttackTarget(unit.x, unit.y, unit.range()))){
+            return null;
+        }
+        return super.findMainTarget(x, y, range, air, ground);
+    }
+
+    public void defaultBehavior(){
+
+        if(!net.client() && unit instanceof Payloadc pay){
+            payloadPickupCooldown -= Time.delta;
+
+            //auto-drop everything
+            if(command == UnitCommand.unloadPayloadCommand && pay.hasPayload()){
+                Call.payloadDropped(unit, unit.x, unit.y);
+            }
+
+            //try to pick up what's under it
+            if(command == UnitCommand.loadUnitsCommand){
+                tryPickupUnit(pay);
+            }
+
+            //try to pick up a block
+            if(command == UnitCommand.loadBlocksCommand && (targetPos == null || unit.within(targetPos, 1f))){
+                Building build = world.buildWorld(unit.x, unit.y);
+
+                if(build != null && state.teams.canInteract(unit.team, build.team)){
+                    //pick up block's payload
+                    Payload current = build.getPayload();
+                    if(current != null && pay.canPickupPayload(current)){
+                        Call.pickedBuildPayload(unit, build, false);
+                        //pick up whole building directly
+                    }else if(build.block.buildVisibility != BuildVisibility.hidden && build.canPickup() && pay.canPickup(build)){
+                        Call.pickedBuildPayload(unit, build, true);
+                    }
+                }
+            }
+        }
+
+        if(!net.client() && command == UnitCommand.enterPayloadCommand && unit.buildOn() != null && (targetPos == null || (world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y) == unit.buildOn()))){
+            var build = unit.buildOn();
+            tmpPayload.unit = unit;
+            if(build.team == unit.team && build.acceptPayload(build, tmpPayload)){
+                Call.unitEnteredPayload(unit, build);
+                return; //no use updating after this, the unit is gone!
+            }
+        }
+
+        updateVisuals();
+        updateTargeting();
+
+        if(attackTarget != null && invalid(attackTarget)){
+            attackTarget = null;
+            targetPos = null;
+        }
+
+        //move on to the next target
+        if(attackTarget == null && targetPos == null){
+            finishPath();
+        }
+
+        if(attackTarget != null){
+            if(targetPos == null){
+                targetPos = new Vec2();
+                lastTargetPos = targetPos;
+            }
+            targetPos.set(attackTarget);
+
+            if(unit.isGrounded() && attackTarget instanceof Building build && build.tile.solid() && unit.pathType() != Pathfinder.costLegs && stance != UnitStance.ram){
+                Tile best = build.findClosestEdge(unit, Tile::solid);
+                if(best != null){
+                    targetPos.set(best);
+                }
+            }
+        }
+
+        boolean alwaysArrive = false;
+
+        float engageRange = unit.type.range - 10f;
+        boolean withinAttackRange = attackTarget != null && unit.within(attackTarget, engageRange) && stance != UnitStance.ram;
+
+        if(targetPos != null){
+            boolean move = true, isFinalPoint = commandQueue.size == 0;
+            vecOut.set(targetPos);
+            vecMovePos.set(targetPos);
+
+            //the enter payload command requires an exact position
+            if(group != null && group.valid && groupIndex < group.units.size && command != UnitCommand.enterPayloadCommand){
+                vecMovePos.add(group.positions[groupIndex * 2], group.positions[groupIndex * 2 + 1]);
+            }
+
+            Building targetBuild = world.buildWorld(targetPos.x, targetPos.y);
+
+            //TODO: should the unit stop when it finds a target?
+            if(
+                (stance == UnitStance.patrol && target != null && unit.within(target, unit.type.range - 2f) && !unit.type.circleTarget) ||
+                (command == UnitCommand.enterPayloadCommand && unit.within(targetPos, 4f) || (targetBuild != null && unit.within(targetBuild, targetBuild.block.size * tilesize/2f * 0.9f))) ||
+                (command == UnitCommand.loopPayloadCommand && unit.within(targetPos, 10f))
+            ){
+                move = false;
+            }
+
+            if(unit.isGrounded() && stance != UnitStance.ram){
+                //TODO: blocking enable or disable?
+                if(timer.get(timerTarget3, avoidInterval)){
+                    Vec2 dstPos = Tmp.v1.trns(unit.rotation, unit.hitSize/2f);
+                    float max = unit.hitSize/2f;
+                    float radius = Math.max(7f, max);
+                    float margin = 4f;
+                    blockingUnit = Units.nearbyCheck(unit.x + dstPos.x - radius/2f, unit.y + dstPos.y - radius/2f, radius, radius,
+                        u -> u != unit && u.within(unit, u.hitSize/2f + unit.hitSize/2f + margin) && u.controller() instanceof CommandAI ai && ai.targetPos != null &&
+                        //stop for other unit only if it's closer to the target
+                        (ai.targetPos.equals(targetPos) && u.dst2(targetPos) < unit.dst2(targetPos)) &&
+                        //don't stop if they're facing the same way
+                        !Angles.within(unit.rotation, u.rotation, 15f) &&
+                        //must be near an obstacle, stopping in open ground is pointless
+                        ControlPathfinder.isNearObstacle(unit, unit.tileX(), unit.tileY(), u.tileX(), u.tileY()));
+                }
+
+                float maxBlockTime = 60f * 5f;
+
+                if(blockingUnit){
+                    timeSpentBlocked += Time.delta;
+
+                    if(timeSpentBlocked >= maxBlockTime*2f){
+                        timeSpentBlocked = 0f;
+                    }
+                }else{
+                    timeSpentBlocked = 0f;
+                }
+
+                //if the unit is next to the target, stop asking the pathfinder how to get there, it's a waste of CPU
+                //TODO maybe stop moving too?
+                if(withinAttackRange){
+                    move = true;
+                    noFound[0] = false;
+                    vecOut.set(vecMovePos);
+                }else{
+                    move = controlPath.getPathPosition(unit, vecMovePos, targetPos, vecOut, noFound) && (!blockingUnit || timeSpentBlocked > maxBlockTime);
+
+                    //TODO: what to do when there's a target and it can't be reached?
+                    /*
+                    if(noFound[0] && attackTarget != null && attackTarget.within(unit, unit.type.range * 2f)){
+                        move = true;
+                        vecOut.set(targetPos);
+                    }*/
+                }
+
+                //rare case where unit must be perfectly aligned (happens with 1-tile gaps)
+                alwaysArrive = vecOut.epsilonEquals(unit.tileX() * tilesize, unit.tileY() * tilesize);
+                //we've reached the final point if the returned coordinate is equal to the supplied input
+                isFinalPoint &= vecMovePos.epsilonEquals(vecOut, 4.1f);
+
+                //if the path is invalid, stop trying and record the end as unreachable
+                if(unit.team.isAI() && (noFound[0] || unit.isPathImpassable(World.toTile(vecMovePos.x), World.toTile(vecMovePos.y)))){
+                    if(attackTarget instanceof Building build){
+                        unreachableBuildings.addUnique(build.pos());
+                    }
+                    attackTarget = null;
+                    finishPath();
+                    return;
+                }
+            }else{
+                vecOut.set(vecMovePos);
+            }
+
+            if(move){
+                if(unit.type.circleTarget && attackTarget != null){
+                    target = attackTarget;
+                    circleAttack(80f);
+                }else{
+                    moveTo(vecOut,
+                    withinAttackRange ? engageRange :
+                    unit.isGrounded() ? 0f :
+                    attackTarget != null && stance != UnitStance.ram ? engageRange : 0f,
+                    unit.isFlying() ? 40f : 100f, false, null, isFinalPoint || alwaysArrive);
+                }
+            }
+
+            //if stopAtTarget is set, stop trying to move to the target once it is reached - used for defending
+            if(attackTarget != null && stopAtTarget && unit.within(attackTarget, engageRange - 1f)){
+                attackTarget = null;
+            }
+
+            if(unit.isFlying() && move && (attackTarget == null || !unit.within(attackTarget, unit.type.range))){
+                unit.lookAt(vecMovePos);
+            }else{
+                faceTarget();
+            }
+
+            //reached destination, end pathfinding
+            if(attackTarget == null && unit.within(vecMovePos, command.exactArrival && commandQueue.size == 0 ? 1f : Math.max(5f, unit.hitSize / 2f))){
+                finishPath();
+            }
+
+            if(stopWhenInRange && targetPos != null && unit.within(vecMovePos, engageRange * 0.9f)){
+                finishPath();
+                stopWhenInRange = false;
+            }
+
+        }else if(target != null){
+            faceTarget();
+        }
+    }
+
+    void finishPath(){
+        //the enter payload command never finishes until they are actually accepted
+        if(command == UnitCommand.enterPayloadCommand && commandQueue.size == 0 && targetPos != null && world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y).block.acceptsUnitPayloads){
+            return;
+        }
+
+        if(!net.client() && command == UnitCommand.loopPayloadCommand && unit instanceof Payloadc pay){
+
+            if(transferState == transferStateNone){
+                transferState = pay.hasPayload() ? transferStateUnload : transferStateLoad;
+            }
+
+            if(payloadPickupCooldown > 0f) return;
+
+            if(transferState == transferStateUnload){
+                //drop until there's a failure
+                int prev = -1;
+                while(pay.hasPayload() && prev != pay.payloads().size){
+                    prev = pay.payloads().size;
+                    Call.payloadDropped(unit, unit.x, unit.y);
+                }
+
+                //wait for everything to unload before running code below
+                if(pay.hasPayload()){
+                    return;
+                }
+                payloadPickupCooldown = 60f;
+            }else if(transferState == transferStateLoad){
+                //pick up units until there's a failure
+                int prev = -1;
+                while(prev != pay.payloads().size){
+                    prev = pay.payloads().size;
+                    tryPickupUnit(pay);
+                }
+
+                //wait to load things before running code below
+                if(!pay.hasPayload()){
+                    return;
+                }
+                payloadPickupCooldown = 60f;
+            }
+
+            //it will never finish
+            if(commandQueue.size == 0){
+                return;
+            }
+        }
+
+        transferState = transferStateNone;
+
+        Vec2 prev = targetPos;
+        targetPos = null;
+
+        if(commandQueue.size > 0){
+            var next = commandQueue.remove(0);
+            if(next instanceof Teamc target){
+                commandTarget(target, this.stopAtTarget);
+            }else if(next instanceof Vec2 position){
+                commandPosition(position);
+            }
+
+            if(prev != null && (stance == UnitStance.patrol || command == UnitCommand.loopPayloadCommand)){
+                commandQueue.add(prev.cpy());
+            }
+
+            //make sure spot in formation is reachable
+            if(group != null){
+                group.updateRaycast(groupIndex, next instanceof Vec2 position ? position : Tmp.v3.set(next));
+            }
+        }else{
+            if(group != null){
+                group = null;
+            }
+        }
+    }
+
+    @Override
+    public void removed(Unit unit){
+        clearCommands();
+    }
+
+    public void commandQueue(Position location){
+        if(targetPos == null && attackTarget == null){
+            if(location instanceof Teamc t){
+                commandTarget(t, this.stopAtTarget);
+            }else if(location instanceof Vec2 position){
+                commandPosition(position);
+            }
+        }else if(commandQueue.size < maxCommandQueueSize && !commandQueue.contains(location)){
+            commandQueue.add(location);
+        }
+    }
+
+    @Override
+    public void afterRead(Unit unit){
+        if(readAttackTarget != -1){
+            attackTarget = Groups.unit.getByID(readAttackTarget);
+            readAttackTarget = -1;
+        }
+    }
+
+    @Override
+    public boolean shouldFire(){
+        return stance != UnitStance.holdFire;
+    }
+
+    @Override
+    public void hit(Bullet bullet){
+        if(unit.team.isAI() && bullet.owner instanceof Teamc teamc && teamc.team() != unit.team && attackTarget == null &&
+            //can only counter-attack every few seconds to prevent rapidly changing targets
+            !(teamc instanceof Unit u && !u.checkTarget(unit.type.targetAir, unit.type.targetGround)) && timer.get(timerTarget4, 60f * 10f)){
+            commandTarget(teamc, true);
+        }
+    }
+
+    @Override
+    public boolean keepState(){
+        return true;
+    }
+
+    @Override
+    public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
+        return !nearAttackTarget(x, y, range) ? super.findTarget(x, y, range, air, ground) : Units.isHittable(attackTarget, air, ground) ? attackTarget : null;
+    }
+
+    public boolean nearAttackTarget(float x, float y, float range){
+        return attackTarget != null && attackTarget.within(x, y, range + 3f + (attackTarget instanceof Sized s ? s.hitSize()/2f : 0f));
+    }
+
+    @Override
+    public boolean retarget(){
+        //retarget faster when there is an explicit target
+        return attackTarget != null ? timer.get(timerTarget, 10) : timer.get(timerTarget, 20);
+    }
+
+    public boolean hasCommand(){
+        return targetPos != null;
+    }
+
+    public void setupLastPos(){
+        lastTargetPos = targetPos;
+    }
+
+    @Override
+    public void commandPosition(Vec2 pos){
+        if(pos == null) return;
+
+        commandPosition(pos, false);
+        if(commandController != null){
+            commandController.commandPosition(pos);
+        }
+    }
+
+    public void commandPosition(Vec2 pos, boolean stopWhenInRange){
+        if(pos == null) return;
+
+        //this is an allocation, but it's relatively rarely called anyway, and outside mutations must be prevented
+        targetPos = lastTargetPos = pos.cpy();
+        attackTarget = null;
+        this.stopWhenInRange = stopWhenInRange;
+    }
+
+    @Override
+    public void commandTarget(Teamc moveTo){
+        commandTarget(moveTo, false);
+        if(commandController != null){
+            commandController.commandTarget(moveTo);
+        }
+    }
+
+    public void commandTarget(Teamc moveTo, boolean stopAtTarget){
+        attackTarget = moveTo;
+        this.stopAtTarget = stopAtTarget;
+    }
+
+}
diff --git a/core/src/mindustry/ai/types/DefenderAI.java b/core/src/mindustry/ai/types/DefenderAI.java
new file mode 100644
index 0000000000..01c38e69c6
--- /dev/null
+++ b/core/src/mindustry/ai/types/DefenderAI.java
@@ -0,0 +1,46 @@
+package mindustry.ai.types;
+
+import arc.math.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+
+import static mindustry.Vars.*;
+
+public class DefenderAI extends AIController{
+
+    @Override
+    public void updateMovement(){
+        unloadPayloads();
+
+        if(target != null){
+            moveTo(target, (target instanceof Sized s ? s.hitSize()/2f * 1.1f : 0f) + unit.hitSize/2f + 15f, 50f);
+            unit.lookAt(target);
+        }
+    }
+
+    @Override
+    public void updateTargeting(){
+        if(retarget()) target = findTarget(unit.x, unit.y, unit.range(), true, true);
+    }
+    
+    @Override
+    public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
+
+        //Sort by max health and closer target.
+        var result = Units.closest(unit.team, x, y, Math.max(range, 400f), u -> !u.dead() && u.type != unit.type && u.targetable(unit.team) && u.type.playerControllable,
+            (u, tx, ty) -> -u.maxHealth + Mathf.dst2(u.x, u.y, tx, ty) / 6400f);
+        if(result != null) return result;
+
+        //return core if found
+        var core = unit.closestCore();
+        if(core != null) return core;
+
+        //for enemies, target the enemy core.
+        if(state.rules.waves && unit.team == state.rules.waveTeam){
+            return unit.closestEnemyCore();
+        }
+
+        return null;
+    }
+}
diff --git a/core/src/mindustry/ai/types/FlyingAI.java b/core/src/mindustry/ai/types/FlyingAI.java
index 239e48682a..a412c6f4da 100644
--- a/core/src/mindustry/ai/types/FlyingAI.java
+++ b/core/src/mindustry/ai/types/FlyingAI.java
@@ -2,61 +2,98 @@ package mindustry.ai.types;
 
 import arc.math.*;
 import mindustry.entities.units.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
+import static mindustry.world.meta.BlockFlag.*;
 
 public class FlyingAI extends AIController{
+    final static Rand rand = new Rand();
+    final static BlockFlag[] randomTargets = {core, storage, generator, launchPad, factory, repair, battery, reactor, drill};
 
     @Override
     public void updateMovement(){
-        if(target != null && unit.hasWeapons() && command() == UnitCommand.attack){
-            if(!unit.type.circleTarget){
-                moveTo(target, unit.range() * 0.8f);
-                unit.lookAt(target);
+        unloadPayloads();
+
+        if(target != null && unit.hasWeapons()){
+            if(unit.type.circleTarget){
+                circleAttack(120f);
             }else{
-                attack(120f);
+                moveTo(target, unit.type.range * 0.8f);
+                unit.lookAt(target);
             }
         }
 
-        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);
+        if(target == null && state.rules.waves && unit.team == state.rules.defaultTeam){
+            moveTo(getClosestSpawner(), state.rules.dropZoneRadius + 130f);
         }
     }
 
     @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;
+    public Teamc targetFlag(float x, float y, BlockFlag flag, boolean enemy){
+        if(state.rules.randomWaveAI){
+            if(unit.team == Team.derelict) return null;
+            var list = enemy ? indexer.getEnemy(unit.team, flag) : indexer.getFlagged(unit.team, flag);
+            if(list.isEmpty()) return null;
 
-        if(ground) result = targetFlag(x, y, BlockFlag.generator, true);
-        if(result != null) return result;
-
-        if(ground) result = targetFlag(x, y, BlockFlag.core, true);
-        if(result != null) return result;
-
-        return null;
+            Building closest = null;
+            float cdist = 0f;
+            for(Building t : list){
+                if((t.items != null && t.items.any()) || t.status() != BlockStatus.noInput){
+                    float dst = t.dst2(x, y);
+                    if(closest == null || dst < cdist){
+                        closest = t;
+                        cdist = dst;
+                    }
+                }
+            }
+            return closest;
+        }else{
+            return super.targetFlag(x, y, flag, enemy);
+        }
     }
 
-    protected void attack(float circleLength){
-        vec.set(target).sub(unit);
+    @Override
+    public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
+        var result = findMainTarget(x, y, range, air, ground);
 
-        float ang = unit.angleTo(target);
-        float diff = Angles.angleDist(ang, unit.rotation());
+        //if the main target is in range, use it, otherwise target whatever is closest
+        return checkTarget(result, x, y, range) ? target(x, y, range, air, ground) : result;
+    }
 
-        if(diff > 100f && vec.len() < circleLength){
-            vec.setAngle(unit.vel().angle());
-        }else{
-            vec.setAngle(Mathf.slerpDelta(unit.vel().angle(), vec.angle(), 0.6f));
+    @Override
+    public Teamc findMainTarget(float x, float y, float range, boolean air, boolean ground){
+        var core = targetFlag(x, y, BlockFlag.core, true);
+
+        if(core != null && Mathf.within(x, y, core.getX(), core.getY(), range)){
+            return core;
         }
 
-        vec.setLength(unit.speed());
+        if(state.rules.randomWaveAI){
+            //when there are no waves, it's just random based on the unit
+            rand.setSeed(unit.type.id + (state.rules.waves ? state.wave : unit.id));
+            //try a few random flags first
+            for(int attempt = 0; attempt < 5; attempt++){
+                Teamc result = targetFlag(x, y, randomTargets[rand.random(randomTargets.length - 1)], true);
+                if(result != null) return result;
+            }
+            //try the closest target
+            Teamc result = target(x, y, range, air, ground);
+            if(result != null) return result;
+        }else{
+            for(var flag : unit.type.targetFlags){
+                if(flag == null){
+                    Teamc result = target(x, y, range, air, ground);
+                    if(result != null) return result;
+                }else if(ground){
+                    Teamc result = targetFlag(x, y, flag, true);
+                    if(result != null) return result;
+                }
+            }
+        }
 
-        unit.moveAt(vec);
+        return core;
     }
 }
diff --git a/core/src/mindustry/ai/types/FlyingFollowAI.java b/core/src/mindustry/ai/types/FlyingFollowAI.java
new file mode 100644
index 0000000000..f870f136f3
--- /dev/null
+++ b/core/src/mindustry/ai/types/FlyingFollowAI.java
@@ -0,0 +1,61 @@
+package mindustry.ai.types;
+
+import arc.math.*;
+import mindustry.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+
+//TODO generally strange behavior
+/** AI/wave team only! This is used for wave support flyers. */
+public class FlyingFollowAI extends FlyingAI{
+    public Teamc following;
+
+    @Override
+    public void updateMovement(){
+        unloadPayloads();
+
+        if(following != null){
+            moveTo(following, (following instanceof Sized s ? s.hitSize()/2f * 1.1f : 0f) + unit.hitSize/2f + 15f, 50f);
+        }else if(target != null && unit.hasWeapons()){
+            moveTo(target, 80f);
+        }
+
+        if(shouldFaceTarget()){
+            unit.lookAt(target);
+        }else if(following != null){
+            unit.lookAt(following);
+        }
+
+        if(timer.get(timerTarget3, 30f)){
+            following = Units.closest(unit.team, unit.x, unit.y, Math.max(unit.type.range, 400f), u -> !u.dead() && u.type != unit.type, (u, tx, ty) -> -u.maxHealth + Mathf.dst2(u.x, u.y, tx, ty) / 6400f);
+        }
+    }
+
+    public boolean shouldFaceTarget(){
+        return target != null && (following == null || unit.within(target, unit.range()));
+    }
+
+    @Override
+    public void updateVisuals(){
+        if(unit.isFlying()){
+            if(unit.type.wobble) unit.wobble();
+
+            if(!shouldFaceTarget()){
+                unit.lookAt(unit.prefRotation());
+            }
+        }
+    }
+
+    @Override
+    public AIController fallback(){
+        return new FlyingAI();
+    }
+
+    @Override
+    public boolean useFallback(){
+        //only AI teams use this controller
+        return Vars.state.rules.pvp || Vars.state.rules.waveTeam != unit.team;
+    }
+
+}
diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java
deleted file mode 100644
index 8a4f351b4e..0000000000
--- a/core/src/mindustry/ai/types/FormationAI.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package mindustry.ai.types;
-
-import arc.math.*;
-import arc.math.geom.*;
-import arc.util.*;
-import mindustry.ai.formations.*;
-import mindustry.entities.units.*;
-import mindustry.gen.*;
-import mindustry.world.blocks.storage.CoreBlock.*;
-
-public class FormationAI extends AIController implements FormationMember{
-    public Unit leader;
-
-    private Vec3 target = new Vec3();
-    private @Nullable Formation formation;
-
-    public FormationAI(Unit leader, Formation formation){
-        this.leader = leader;
-        this.formation = formation;
-    }
-
-    @Override
-    public void init(){
-        target.set(unit.x, unit.y, 0);
-    }
-
-    @Override
-    public void updateUnit(){
-
-        if(leader == null || leader.dead){
-            unit.resetController();
-            return;
-        }
-
-        if(unit.type.canBoost){
-            unit.elevation = Mathf.approachDelta(unit.elevation, unit.onSolid() ? 1f : leader.type.canBoost ? leader.elevation : 0f, 0.08f);
-        }
-
-        unit.controlWeapons(true, leader.isShooting);
-
-        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).add(leader.vel.x, leader.vel.y);
-
-        float speed = unit.realSpeed() * unit.floorSpeedMultiplier() * Time.delta;
-        unit.approach(Mathf.arrive(unit.x, unit.y, realtarget.x, realtarget.y, unit.vel, speed, 0f, speed, 1f).scl(1f / Time.delta));
-
-        if(unit.canMine() && leader.canMine()){
-            if(leader.mineTile != null && unit.validMine(leader.mineTile)){
-                unit.mineTile(leader.mineTile);
-
-                CoreBuild core = unit.team.core();
-
-                if(core != null && leader.mineTile.drop() != null && unit.within(core, unit.type.range) && !unit.acceptsItem(leader.mineTile.drop())){
-                    if(core.acceptStack(unit.stack.item, unit.stack.amount, unit) > 0){
-                        Call.transferItemTo(unit, unit.stack.item, unit.stack.amount, unit.x, unit.y, core);
-
-                        unit.clearItem();
-                    }
-                }
-            }else{
-                unit.mineTile(null);
-            }
-        }
-
-        if(unit.canBuild() && leader.canBuild() && leader.activelyBuilding()){
-            unit.clearBuilding();
-            unit.addBuild(leader.buildPlan());
-        }
-    }
-
-    @Override
-    public void removed(Unit unit){
-        if(formation != null){
-            formation.removeMember(this);
-            unit.resetController();
-        }
-    }
-
-    @Override
-    public float formationSize(){
-        return unit.hitSize * 1.1f;
-    }
-
-    @Override
-    public boolean isBeingControlled(Unit player){
-        return leader == player;
-    }
-
-    @Override
-    public Vec3 formationPos(){
-        return target;
-    }
-}
diff --git a/core/src/mindustry/ai/types/GroundAI.java b/core/src/mindustry/ai/types/GroundAI.java
index 2a711235c9..602ceaea7c 100644
--- a/core/src/mindustry/ai/types/GroundAI.java
+++ b/core/src/mindustry/ai/types/GroundAI.java
@@ -2,13 +2,9 @@ package mindustry.ai.types;
 
 import arc.math.*;
 import mindustry.ai.*;
-import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.world.*;
-import mindustry.world.meta.*;
-
-import java.util.*;
 
 import static mindustry.Vars.*;
 
@@ -19,41 +15,36 @@ public class GroundAI extends AIController{
 
         Building core = unit.closestEnemyCore();
 
-        if(core != null && unit.within(core, unit.range() / 1.1f + core.block.size * tilesize / 2f)){
+        if(core != null && unit.within(core, unit.range() / 1.3f + core.block.size * tilesize / 2f)){
             target = core;
-            Arrays.fill(targets, core);
+            for(var mount : unit.mounts){
+                if(mount.weapon.controllable && mount.weapon.bullet.collidesGround){
+                    mount.target = core;
+                }
+            }
         }
 
-        if((core == null || !unit.within(core, unit.range() * 0.5f)) && command() == UnitCommand.attack){
+        if((core == null || !unit.within(core, unit.type.range * 0.5f))){
             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(spawner == null && core == null) move = false;
+            }
+
+            //no reason to move if there's nothing there
+            if(core == null && (!state.rules.waves || getClosestSpawner() == null)){
+                move = false;
             }
 
             if(move) pathfind(Pathfinder.fieldCore);
         }
 
-        if(command() == UnitCommand.rally){
-            Teamc target = targetFlag(unit.x, unit.y, BlockFlag.rally, false);
-
-            if(target != null && !unit.within(target, 70f)){
-                pathfind(Pathfinder.fieldRally);
-            }
-        }
-
-        if(unit.type.canBoost && !unit.onSolid()){
-            unit.elevation = Mathf.approachDelta(unit.elevation, 0f, 0.08f);
-        }
-
-        if(!Units.invalidateTarget(target, unit, unit.range()) && unit.type.rotateShooting){
-            if(unit.type.hasWeapons()){
-                unit.lookAt(Predict.intercept(unit, target, unit.type.weapons.first().bullet.speed));
-            }
-        }else if(unit.moving()){
-            unit.lookAt(unit.vel().angle());
+        if(unit.type.canBoost && unit.elevation > 0.001f && !unit.onSolid()){
+            unit.elevation = Mathf.approachDelta(unit.elevation, 0f, unit.type.riseSpeed);
         }
 
+        faceTarget();
     }
 }
diff --git a/core/src/mindustry/ai/types/HugAI.java b/core/src/mindustry/ai/types/HugAI.java
new file mode 100644
index 0000000000..ff672ff5bc
--- /dev/null
+++ b/core/src/mindustry/ai/types/HugAI.java
@@ -0,0 +1,63 @@
+package mindustry.ai.types;
+
+import arc.math.*;
+import arc.math.geom.*;
+import mindustry.ai.*;
+import mindustry.core.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class HugAI extends AIController{
+
+    @Override
+    public void updateMovement(){
+
+        Building core = unit.closestEnemyCore();
+
+        if(core != null && unit.within(core, unit.range() / 1.1f + core.block.size * tilesize / 2f)){
+            target = core;
+            for(var mount : unit.mounts){
+                if(mount.weapon.controllable && mount.weapon.bullet.collidesGround){
+                    mount.target = core;
+                }
+            }
+        }
+
+        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;
+        }
+
+        //raycast for target
+        if(target != null && unit.within(target, unit.type.range) && !World.raycast(unit.tileX(), unit.tileY(), target.tileX(), target.tileY(), (x, y) -> {
+            for(Point2 p : Geometry.d4c){
+                if(!unit.canPass(x + p.x, y + p.y)){
+                    return true;
+                }
+            }
+            return false;
+        })){
+            if(unit.within(target, (unit.hitSize + (target instanceof Sized s ? s.hitSize() : 1f)) * 0.5f)){
+                //circle target
+                unit.movePref(vec.set(target).sub(unit).rotate(90f).setLength(unit.speed()));
+            }else{
+                //move toward target in a straight line
+                unit.movePref(vec.set(target).sub(unit).limit(unit.speed()));
+            }
+        }else if(move){
+            pathfind(Pathfinder.fieldCore);
+        }
+
+        if(unit.type.canBoost && unit.elevation > 0.001f && !unit.onSolid()){
+            unit.elevation = Mathf.approachDelta(unit.elevation, 0f, unit.type.riseSpeed);
+        }
+
+        faceTarget();
+    }
+}
diff --git a/core/src/mindustry/ai/types/LogicAI.java b/core/src/mindustry/ai/types/LogicAI.java
index a0eb6d1fa9..f6be1965b3 100644
--- a/core/src/mindustry/ai/types/LogicAI.java
+++ b/core/src/mindustry/ai/types/LogicAI.java
@@ -1,7 +1,6 @@
 package mindustry.ai.types;
 
 import arc.math.*;
-import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.ai.*;
@@ -9,19 +8,18 @@ import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.logic.*;
 import mindustry.world.*;
-import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class LogicAI extends AIController{
     /** Minimum delay between item transfers. */
-    public static final float transferDelay = 60f * 2f;
+    public static final float transferDelay = 60f * 1.5f;
     /** Time after which the unit resets its controlled and reverts to a normal unit. */
-    public static final float logicControlTimeout = 10f * 60f;
+    public static final float logicControlTimeout = 60f * 10f;
 
-    public LUnitControl control = LUnitControl.stop;
+    public LUnitControl control = LUnitControl.idle;
     public float moveX, moveY, moveRad;
-    public float itemTimer, payTimer, controlTimer = logicControlTimeout, targetTimer;
+    public float controlTimer = logicControlTimeout, targetTimer;
     @Nullable
     public Building controller;
     public BuildPlan plan = new BuildPlan();
@@ -43,11 +41,14 @@ public class LogicAI extends AIController{
 
     private ObjectSet<Object> radars = new ObjectSet<>();
 
+    // LogicAI state should not be reset after reading.
     @Override
-    protected void updateMovement(){
-        if(itemTimer >= 0) itemTimer -= Time.delta;
-        if(payTimer >= 0) payTimer -= Time.delta;
+    public boolean keepState(){
+        return true;
+    }
 
+    @Override
+    public void updateMovement(){
         if(targetTimer > 0f){
             targetTimer -= Time.delta;
         }else{
@@ -68,27 +69,38 @@ public class LogicAI extends AIController{
                 moveTo(Tmp.v1.set(moveX, moveY), 1f, 30f);
             }
             case approach -> {
-                moveTo(Tmp.v1.set(moveX, moveY), moveRad - 7f, 7);
+                moveTo(Tmp.v1.set(moveX, moveY), moveRad - 7f, 7, true, null);
             }
             case pathfind -> {
+                if(unit.isFlying()){
+                    moveTo(Tmp.v1.set(moveX, moveY), 1f, 30f);
+                }else{
+                    if(controlPath.getPathPosition(unit, Tmp.v2.set(moveX, moveY), Tmp.v2, Tmp.v1, null)){
+                        moveTo(Tmp.v1, 1f, Tmp.v2.epsilonEquals(Tmp.v1, 4.1f) ? 30f : 0f);
+                    }
+                }
+            }
+            case autoPathfind -> {
                 Building core = unit.closestEnemyCore();
 
-                if((core == null || !unit.within(core, unit.range() * 0.5f)) && command() == UnitCommand.attack){
+                if((core == null || !unit.within(core, unit.range() * 0.5f))){
                     boolean move = true;
+                    Tile spawner = null;
 
                     if(state.rules.waves && unit.team == state.rules.defaultTeam){
-                        Tile spawner = getClosestSpawner();
+                        spawner = getClosestSpawner();
                         if(spawner != null && unit.within(spawner, state.rules.dropZoneRadius + 120f)) move = false;
                     }
 
-                    if(move) pathfind(Pathfinder.fieldCore);
-                }
-
-                if(command() == UnitCommand.rally){
-                    Teamc target = targetFlag(unit.x, unit.y, BlockFlag.rally, false);
-
-                    if(target != null && !unit.within(target, 70f)){
-                        pathfind(Pathfinder.fieldRally);
+                    if(move){
+                        if(unit.isFlying()){
+                            var target = core == null ? spawner : core;
+                            if(target != null){
+                                moveTo(target, unit.range() * 0.5f);
+                            }
+                        }else{
+                            pathfind(Pathfinder.fieldCore);
+                        }
                     }
                 }
             }
@@ -98,13 +110,13 @@ public class LogicAI extends AIController{
         }
 
         if(unit.type.canBoost && !unit.type.flying){
-            unit.elevation = Mathf.approachDelta(unit.elevation, Mathf.num(boost || unit.onSolid()), 0.08f);
+            unit.elevation = Mathf.approachDelta(unit.elevation, Mathf.num(boost || unit.onSolid() || (unit.isFlying() && !unit.canLand())), unit.type.riseSpeed);
         }
 
         //look where moving if there's nothing to aim at
-        if(!shoot){
+        if(!shoot || !unit.type.omniMovement){
             unit.lookAt(unit.prefRotation());
-        }else if(unit.hasWeapons() && unit.mounts.length > 0){ //if there is, look at the object
+        }else if(unit.hasWeapons() && unit.mounts.length > 0 && !unit.mounts[0].weapon.ignoreRotation){ //if there is, look at the object
             unit.lookAt(unit.mounts[0].aimX, unit.mounts[0].aimY);
         }
     }
@@ -114,42 +126,29 @@ public class LogicAI extends AIController{
     }
 
     @Override
-    protected void moveTo(Position target, float circleLength, float smooth){
-        if(target == null) return;
-
-        vec.set(target).sub(unit);
-
-        float length = circleLength <= 0.001f ? 1f : Mathf.clamp((unit.dst(target) - circleLength) / smooth, -1f, 1f);
-
-        vec.setLength(unit.realSpeed() * length);
-        if(length < -0.5f){
-            vec.rotate(180f);
-        }else if(length < 0){
-            vec.setZero();
-        }
-
-        unit.approach(vec);
+    public boolean checkTarget(Teamc target, float x, float y, float range){
+        return false;
     }
 
     //always retarget
     @Override
-    protected boolean retarget(){
+    public boolean retarget(){
         return true;
     }
 
     @Override
-    protected boolean invalid(Teamc target){
+    public boolean invalid(Teamc target){
         return false;
     }
 
     @Override
-    protected boolean shouldShoot(){
+    public boolean shouldShoot(){
         return shoot && !(unit.type.canBoost && boost);
     }
 
     //always aim for the main target
     @Override
-    protected Teamc target(float x, float y, float range, boolean air, boolean ground){
+    public Teamc target(float x, float y, float range, boolean air, boolean ground){
         return switch(aimControl){
             case target -> posTarget;
             case targetp -> mainTarget;
diff --git a/core/src/mindustry/ai/types/MinerAI.java b/core/src/mindustry/ai/types/MinerAI.java
index 28306deb84..eb4307021b 100644
--- a/core/src/mindustry/ai/types/MinerAI.java
+++ b/core/src/mindustry/ai/types/MinerAI.java
@@ -9,29 +9,29 @@ import mindustry.world.*;
 import static mindustry.Vars.*;
 
 public class MinerAI extends AIController{
-    boolean mining = true;
-    Item targetItem;
-    Tile ore;
+    public boolean mining = true;
+    public Item targetItem;
+    public Tile ore;
 
     @Override
-    protected void updateMovement(){
+    public void updateMovement(){
         Building core = unit.closestCore();
 
         if(!(unit.canMine()) || core == null) return;
 
-        if(unit.mineTile != null && !unit.mineTile.within(unit, unit.type.range)){
+        if(!unit.validMine(unit.mineTile)){
             unit.mineTile(null);
         }
 
         if(mining){
             if(timer.get(timerTarget2, 60 * 4) || targetItem == null){
-                targetItem = unit.team.data().mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i));
+                targetItem = unit.type.mineItems.min(i -> indexer.hasOre(i) && unit.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();
-                unit.mineTile(null);
+                unit.mineTile = null;
                 return;
             }
 
@@ -39,14 +39,14 @@ public class MinerAI extends AIController{
             if(unit.stack.amount >= unit.type.itemCapacity || (targetItem != null && !unit.acceptsItem(targetItem))){
                 mining = false;
             }else{
-                if(timer.get(timerTarget, 60) && targetItem != null){
+                if(timer.get(timerTarget3, 60) && targetItem != null){
                     ore = indexer.findClosestOre(unit, targetItem);
                 }
 
                 if(ore != null){
-                    moveTo(ore, unit.type.range / 2f, 20f);
+                    moveTo(ore, unit.type.mineRange / 2f, 20f);
 
-                    if(unit.within(ore, unit.type.range)){
+                    if(ore.block() == Blocks.air && unit.within(ore, unit.type.mineRange)){
                         unit.mineTile = ore;
                     }
 
@@ -75,8 +75,4 @@ public class MinerAI extends AIController{
             circle(core, unit.type.range / 1.8f);
         }
     }
-
-    @Override
-    protected void updateTargeting(){
-    }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/ai/types/MissileAI.java b/core/src/mindustry/ai/types/MissileAI.java
new file mode 100644
index 0000000000..082c445048
--- /dev/null
+++ b/core/src/mindustry/ai/types/MissileAI.java
@@ -0,0 +1,49 @@
+package mindustry.ai.types;
+
+import arc.math.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+
+public class MissileAI extends AIController{
+    public @Nullable Unit shooter;
+
+    @Override
+    protected void resetTimers(){
+        timer.reset(timerTarget, 5f);
+    }
+
+    @Override
+    public void updateMovement(){
+        unloadPayloads();
+
+        float time = unit instanceof TimedKillc t ? t.time() : 1000000f;
+
+        if(time >= unit.type.homingDelay && shooter != null && !shooter.dead()){
+            unit.lookAt(shooter.aimX, shooter.aimY);
+        }
+
+        //move forward forever
+        unit.moveAt(vec.trns(unit.rotation, unit.type.missileAccelTime <= 0f ? unit.speed() : Mathf.pow(Math.min(time / unit.type.missileAccelTime, 1f), 2f) * unit.speed()));
+
+        var build = unit.buildOn();
+
+        //kill instantly on enemy building contact
+        if(build != null && build.team != unit.team && (build == target || !build.block.underBullets)){
+            unit.kill();
+        }
+    }
+
+    @Override
+    public 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) && !u.isMissile(), t -> ground && (!t.block.underBullets || (shooter != null && t == Vars.world.buildWorld(shooter.aimX, shooter.aimY))));
+    }
+
+    @Override
+    public boolean retarget(){
+        //more frequent retarget due to high speed. TODO won't this lag?
+        return timer.get(timerTarget, 4f);
+    }
+}
diff --git a/core/src/mindustry/ai/types/RepairAI.java b/core/src/mindustry/ai/types/RepairAI.java
index db20cc7d60..af0140eaba 100644
--- a/core/src/mindustry/ai/types/RepairAI.java
+++ b/core/src/mindustry/ai/types/RepairAI.java
@@ -1,14 +1,20 @@
 package mindustry.ai.types;
 
+import arc.util.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.world.blocks.ConstructBlock.*;
 
 public class RepairAI extends AIController{
+    public static float retreatDst = 160f, fleeRange = 310f, retreatDelay = Time.toSeconds * 3f;
+
+    @Nullable Teamc avoid;
+    float retreatTimer;
+    Building damagedTarget;
 
     @Override
-    protected void updateMovement(){
+    public void updateMovement(){
         if(target instanceof Building){
             boolean shoot = false;
 
@@ -22,25 +28,49 @@ public class RepairAI extends AIController{
             unit.controlWeapons(false);
         }
 
-        if(target != null){
-            if(!target.within(unit, unit.type.range * 0.65f) && target instanceof Building b && b.team == unit.team){
+        if(target != null && target instanceof Building b && b.team == unit.team){
+            if(unit.type.circleTarget){
+                circleAttack(120f);
+            }else if(!target.within(unit, unit.type.range * 0.65f)){
                 moveTo(target, unit.type.range * 0.65f);
             }
 
-            unit.lookAt(target);
+            if(!unit.type.circleTarget){
+                unit.lookAt(target);
+            }
+        }
+
+        //not repairing
+        if(!(target instanceof Building)){
+            if(timer.get(timerTarget4, 40)){
+                avoid = target(unit.x, unit.y, fleeRange, true, true);
+            }
+
+            if((retreatTimer += Time.delta) >= retreatDelay){
+                //fly away from enemy when not doing anything
+                if(avoid != null){
+                    var core = unit.closestCore();
+                    if(core != null && !unit.within(core, retreatDst)){
+                        moveTo(core, retreatDst);
+                    }
+                }
+            }
+        }else{
+            retreatTimer = 0f;
         }
     }
 
     @Override
-    protected void updateTargeting(){
-        Building target = Units.findDamagedTile(unit.team, unit.x, unit.y);
+    public void updateTargeting(){
+        if(timer.get(timerTarget, 15)){
+            damagedTarget = Units.findDamagedTile(unit.team, unit.x, unit.y);
+            if(damagedTarget instanceof ConstructBuild) damagedTarget = null;
+        }
 
-        if(target instanceof ConstructBuild) target = null;
-
-        if(target == null){
+        if(damagedTarget == null){
             super.updateTargeting();
         }else{
-            this.target = target;
+            this.target = damagedTarget;
         }
     }
 }
diff --git a/core/src/mindustry/ai/types/SuicideAI.java b/core/src/mindustry/ai/types/SuicideAI.java
index 1143f31675..ed2e4ffded 100644
--- a/core/src/mindustry/ai/types/SuicideAI.java
+++ b/core/src/mindustry/ai/types/SuicideAI.java
@@ -1,21 +1,24 @@
 package mindustry.ai.types;
 
+import arc.math.geom.*;
 import mindustry.*;
 import mindustry.ai.*;
+import mindustry.core.*;
 import mindustry.entities.*;
-import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.distribution.*;
 import mindustry.world.blocks.liquid.*;
+import mindustry.world.blocks.storage.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class SuicideAI extends GroundAI{
     static boolean blockedByBlock;
 
     @Override
     public void updateUnit(){
-
         if(Units.invalidateTarget(target, unit.team, unit.x, unit.y, Float.MAX_VALUE)){
             target = null;
         }
@@ -28,17 +31,17 @@ public class SuicideAI extends GroundAI{
 
         boolean rotate = false, shoot = false, moveToTarget = false;
 
+        if(target == null){
+            target = core;
+        }
+
         if(!Units.invalidateTarget(target, unit, unit.range()) && unit.hasWeapons()){
             rotate = true;
-            shoot = unit.within(target, unit.type.weapons.first().bullet.range() +
+            shoot = unit.within(target, unit.type.weapons.first().bullet.range +
                 (target instanceof Building b ? b.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));
-            }
-
             //do not move toward walls or transport blocks
-            if(!(target instanceof Building build && (
+            if(!(target instanceof Building build && !(build.block instanceof CoreBlock) && (
                 build.block.group == BlockGroup.walls ||
                 build.block.group == BlockGroup.liquids ||
                 build.block.group == BlockGroup.transportation
@@ -46,15 +49,18 @@ public class SuicideAI extends GroundAI{
                 blockedByBlock = false;
 
                 //raycast for target
-                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()){
-                        blockedByBlock = true;
-                        return true;
-                    }else{
-                        return tile == null || tile.solid();
+                boolean blocked = World.raycast(unit.tileX(), unit.tileY(), target.tileX(), target.tileY(), (x, y) -> {
+                    for(Point2 p : Geometry.d4c){
+                        Tile tile = Vars.world.tile(x + p.x, y + p.y);
+                        if(tile != null && tile.build == target) return false;
+                        if(tile != null && tile.build != null && tile.build.team != unit.team()){
+                            blockedByBlock = true;
+                            return true;
+                        }else{
+                            return tile == null || tile.solid();
+                        }
                     }
+                    return false;
                 });
 
                 //shoot when there's an enemy block in the way
@@ -65,30 +71,34 @@ public class SuicideAI extends GroundAI{
                 if(!blocked){
                     moveToTarget = true;
                     //move towards target directly
-                    unit.moveAt(vec.set(target).sub(unit).limit(unit.speed()));
+                    unit.movePref(vec.set(target).sub(unit).limit(unit.speed()));
                 }
             }
         }
 
         if(!moveToTarget){
-            if(command() == UnitCommand.rally){
-                Teamc target = targetFlag(unit.x, unit.y, BlockFlag.rally, false);
+            boolean move = true;
 
-                if(target != null && !unit.within(target, 70f)){
-                    pathfind(Pathfinder.fieldRally);
+            //stop moving toward the drop zone if applicable
+            if(core == null && state.rules.waves && unit.team == state.rules.defaultTeam){
+                Tile spawner = getClosestSpawner();
+                if(spawner != null && unit.within(spawner, state.rules.dropZoneRadius + 120f)){
+                    move = false;
                 }
-            }else if(command() == UnitCommand.attack && core != null){
-                pathfind(Pathfinder.fieldCore);
             }
 
-            if(unit.moving()) unit.lookAt(unit.vel().angle());
+            if(move){
+                pathfind(Pathfinder.fieldCore);
+            }
         }
 
         unit.controlWeapons(rotate, shoot);
+
+        faceTarget();
     }
 
     @Override
-    protected Teamc target(float x, float y, float range, boolean air, boolean ground){
+    public 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 &&
             !(t.block instanceof Conveyor || t.block instanceof Conduit)); //do not target conveyors/conduits
     }
diff --git a/core/src/mindustry/async/AsyncCore.java b/core/src/mindustry/async/AsyncCore.java
index a9d4cdd90d..9987bc31bd 100644
--- a/core/src/mindustry/async/AsyncCore.java
+++ b/core/src/mindustry/async/AsyncCore.java
@@ -2,6 +2,7 @@ package mindustry.async;
 
 import arc.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.game.EventType.*;
 
 import java.util.concurrent.*;
@@ -10,19 +11,14 @@ import static mindustry.Vars.*;
 
 public class AsyncCore{
     //all processes to be executed each frame
-    private final Seq<AsyncProcess> processes = Seq.with(
+    public final Seq<AsyncProcess> processes = Seq.with(
         new PhysicsProcess()
     );
 
     //futures to be awaited
     private final Seq<Future<?>> futures = new Seq<>();
 
-    private final ExecutorService executor = Executors.newFixedThreadPool(processes.size, r -> {
-        Thread thread = new Thread(r, "AsyncLogic-Thread");
-        thread.setDaemon(true);
-        thread.setUncaughtExceptionHandler((t, e) -> Core.app.post(() -> { throw new RuntimeException(e); }));
-        return thread;
-    });
+    private ExecutorService executor;
 
     public AsyncCore(){
         Events.on(WorldLoadEvent.class, e -> {
@@ -49,6 +45,16 @@ public class AsyncCore{
 
             futures.clear();
 
+            //init executor with size of potentially-modified process list
+            if(executor == null){
+                executor = Executors.newFixedThreadPool(processes.size, r -> {
+                    Thread thread = new Thread(r, "AsyncLogic-Thread");
+                    thread.setDaemon(true);
+                    thread.setUncaughtExceptionHandler((t, e) -> Threads.throwAppException(e));
+                    return thread;
+                });
+            }
+
             //submit all tasks
             for(AsyncProcess p : processes){
                 if(p.shouldProcess()){
@@ -71,7 +77,7 @@ public class AsyncCore{
 
     private void complete(){
         //wait for all threads to stop processing
-        for(Future future : futures){
+        for(var future : futures){
             try{
                 future.get();
             }catch(Throwable t){
diff --git a/core/src/mindustry/async/PhysicsProcess.java b/core/src/mindustry/async/PhysicsProcess.java
index a60dab7f68..a38f28eeb2 100644
--- a/core/src/mindustry/async/PhysicsProcess.java
+++ b/core/src/mindustry/async/PhysicsProcess.java
@@ -10,11 +10,11 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 
 public class PhysicsProcess implements AsyncProcess{
-    private static final int
-        layers = 3,
-        layerGround = 0,
-        layerLegs = 1,
-        layerFlying = 2;
+    public static final int
+    layers = 3,
+    layerGround = 0,
+    layerLegs = 1,
+    layerFlying = 2;
 
     private PhysicsWorld physics;
     private Seq<PhysicRef> refs = new Seq<>(false);
@@ -24,6 +24,7 @@ public class PhysicsProcess implements AsyncProcess{
     @Override
     public void begin(){
         if(physics == null) return;
+        boolean local = !Vars.net.client();
 
         //remove stale entities
         refs.removeAll(ref -> {
@@ -35,32 +36,32 @@ public class PhysicsProcess implements AsyncProcess{
             return false;
         });
 
-        //find Unit without bodies and assign them
+        //find Units without bodies and assign them
         for(Unit entity : group){
+            if(entity == null || entity.type == null || !entity.type.physics) continue;
 
-            if(entity.physref() == null){
+            if(entity.physref == null){
                 PhysicsBody body = new PhysicsBody();
-                body.x = entity.x();
-                body.y = entity.y();
+                body.x = entity.x;
+                body.y = entity.y;
                 body.mass = entity.mass();
-                body.radius = entity.hitSize() / 2f;
+                body.radius = entity.hitSize * Vars.unitCollisionRadiusScale;
 
                 PhysicRef ref = new PhysicRef(entity, body);
                 refs.add(ref);
 
-                entity.physref(ref);
+                entity.physref = ref;
 
                 physics.add(body);
             }
 
             //save last position
-            PhysicRef ref = entity.physref();
+            PhysicRef ref = entity.physref;
 
-            ref.body.layer =
-                entity.type.allowLegStep ? layerLegs :
-                entity.isGrounded() ? layerGround : layerFlying;
-            ref.x = entity.x();
-            ref.y = entity.y();
+            ref.body.layer = entity.collisionLayer();
+            ref.x = entity.x;
+            ref.y = entity.y;
+            ref.body.local = local || entity.isLocal();
         }
     }
 
@@ -147,21 +148,30 @@ public class PhysicsProcess implements AsyncProcess{
                 trees[i].clear();
             }
 
-            for(int i = 0; i < bodies.size; i++){
-                PhysicsBody body = bodies.items[i];
+            var bodyItems = bodies.items;
+            int bodySize = bodies.size;
+
+            for(int i = 0; i < bodySize; i++){
+                PhysicsBody body = bodyItems[i];
                 body.collided = false;
                 trees[body.layer].insert(body);
             }
 
-            for(int i = 0; i < bodies.size; i++){
-                PhysicsBody body = bodies.items[i];
+            for(int i = 0; i < bodySize; i++){
+                PhysicsBody body = bodyItems[i];
+
+                //for clients, the only body that collides is the local one; all other physics simulations are handled by the server.
+                if(!body.local) continue;
+
                 body.hitbox(rect);
 
                 seq.size = 0;
                 trees[body.layer].intersect(rect, seq);
+                int size = seq.size;
+                var items = seq.items;
 
-                for(int j = 0; j < seq.size; j++){
-                    PhysicsBody other = seq.items[j];
+                for(int j = 0; j < size; j++){
+                    PhysicsBody other = items[j];
 
                     if(other == body || other.collided) continue;
 
@@ -173,10 +183,14 @@ public class PhysicsProcess implements AsyncProcess{
                         float ms = body.mass + other.mass;
                         float m1 = other.mass / ms, m2 = body.mass / ms;
 
+                        //first body is always local due to guard check above
                         body.x += vec.x * m1 / scl;
                         body.y += vec.y * m1 / scl;
-                        other.x -= vec.x * m2 / scl;
-                        other.y -= vec.y * m2 / scl;
+
+                        if(other.local){
+                            other.x -= vec.x * m2 / scl;
+                            other.y -= vec.y * m2 / scl;
+                        }
                     }
                 }
                 body.collided = true;
@@ -186,7 +200,7 @@ public class PhysicsProcess implements AsyncProcess{
         public static class PhysicsBody implements QuadTreeObject{
             public float x, y, radius, mass;
             public int layer = 0;
-            public boolean collided = false;
+            public boolean collided = false, local = true;
 
             @Override
             public void hitbox(Rect out){
diff --git a/core/src/mindustry/audio/SoundControl.java b/core/src/mindustry/audio/SoundControl.java
index bed176f972..432a3c05b6 100644
--- a/core/src/mindustry/audio/SoundControl.java
+++ b/core/src/mindustry/audio/SoundControl.java
@@ -17,7 +17,7 @@ import static mindustry.Vars.*;
 
 /** Controls playback of multiple audio tracks.*/
 public class SoundControl{
-    protected static final float finTime = 120f, foutTime = 120f, musicInterval = 60 * 60 * 3f, musicChance = 0.6f, musicWaveChance = 0.46f;
+    public float finTime = 120f, foutTime = 120f, musicInterval = 3f * Time.toMinutes, musicChance = 0.8f, musicWaveChance = 0.46f;
 
     /** normal, ambient music, plays at any time */
     public Seq<Music> ambientMusic = Seq.with();
@@ -28,6 +28,7 @@ public class SoundControl{
 
     protected Music lastRandomPlayed;
     protected Interval timer = new Interval(4);
+    protected long lastPlayed;
     protected @Nullable Music current;
     protected float fade;
     protected boolean silenced;
@@ -55,6 +56,10 @@ public class SoundControl{
         }));
 
         setupFilters();
+
+        Events.on(ResetEvent.class, e -> {
+            lastPlayed = Time.millis();
+        });
     }
 
     protected void setupFilters(){
@@ -65,7 +70,7 @@ public class SoundControl{
     protected void reload(){
         current = null;
         fade = 0f;
-        ambientMusic = Seq.with(Musics.game1, Musics.game3, Musics.game6, Musics.game8, Musics.game9);
+        ambientMusic = Seq.with(Musics.game1, Musics.game3, Musics.game6, Musics.game8, Musics.game9, Musics.fine);
         darkMusic = Seq.with(Musics.game2, Musics.game5, Musics.game7, Musics.game4);
         bossMusic = Seq.with(Musics.boss1, Musics.boss2, Musics.game2, Musics.game5);
 
@@ -76,6 +81,8 @@ public class SoundControl{
                 sound.setBus(uiBus);
             }
         }
+
+        Events.fire(new MusicRegisterEvent());
     }
 
     public void loop(Sound sound, float volume){
@@ -130,14 +137,21 @@ public class SoundControl{
                 Core.audio.soundBus.play();
                 setupFilters();
             }else{
+                //stopping a single audio bus stops everything else, yay!
                 Core.audio.soundBus.stop();
+                //play music bus again, as it was stopped above
+                Core.audio.musicBus.play();
+
+                Core.audio.soundBus.play();
             }
         }
 
+        Core.audio.setPaused(Core.audio.soundBus.id, state.isPaused());
+
         if(state.isMenu()){
             silenced = false;
             if(ui.planet.isShown()){
-                play(Musics.launch);
+                play(ui.planet.state.planet.launchMusic);
             }else if(ui.editor.isShown()){
                 play(Musics.editor);
             }else{
@@ -150,10 +164,14 @@ public class SoundControl{
             //this just fades out the last track to make way for ingame music
             silence();
 
-            //play music at intervals
-            if(timer.get(musicInterval)){
+            if(Core.settings.getBool("alwaysmusic")){
+                if(current == null){
+                    playRandom();
+                }
+            }else if(Time.timeSinceMillis(lastPlayed) > 1000 * musicInterval / 60f){
                 //chance to play it per interval
                 if(Mathf.chance(musicChance)){
+                    lastPlayed = Time.millis();
                     playRandom();
                 }
             }
@@ -172,7 +190,7 @@ public class SoundControl{
         float avol = Core.settings.getInt("ambientvol", 100) / 100f;
 
         sounds.each((sound, data) -> {
-            data.curVolume = Mathf.lerpDelta(data.curVolume, data.volume * avol, 0.2f);
+            data.curVolume = Mathf.lerpDelta(data.curVolume, data.volume * avol, 0.11f);
 
             boolean play = data.curVolume > 0.01f;
             float pan = Mathf.zero(data.total, 0.0001f) ? 0f : sound.calcPan(data.sum.x / data.total, data.sum.y / data.total);
@@ -198,7 +216,9 @@ public class SoundControl{
 
     /** Plays a random track.*/
     public void playRandom(){
-        if(isDark()){
+        if(state.boss() != null){
+            playOnce(bossMusic.random(lastRandomPlayed));
+        }else if(isDark()){
             playOnce(darkMusic.random(lastRandomPlayed));
         }else{
             playOnce(ambientMusic.random(lastRandomPlayed));
@@ -207,7 +227,7 @@ public class SoundControl{
 
     /** Whether to play dark music.*/
     protected boolean isDark(){
-        if(state.teams.get(player.team()).hasCore() && state.teams.get(player.team()).core().healthf() < 0.85f){
+        if(player.team().data().hasCore() && player.team().data().core().healthf() < 0.85f){
             //core damaged -> dark
             return true;
         }
diff --git a/core/src/mindustry/audio/SoundLoop.java b/core/src/mindustry/audio/SoundLoop.java
index d10eb02214..5b1baff79c 100644
--- a/core/src/mindustry/audio/SoundLoop.java
+++ b/core/src/mindustry/audio/SoundLoop.java
@@ -19,11 +19,15 @@ public class SoundLoop{
     }
 
     public void update(float x, float y, boolean play){
+        update(x, y, play, 1f);
+    }
+
+    public void update(float x, float y, boolean play, float volumeScl){
         if(baseVolume <= 0) return;
 
         if(id < 0){
             if(play){
-                id = sound.loop(sound.calcVolume(x, y) * volume * baseVolume, 1f, sound.calcPan(x, y));
+                id = sound.loop(sound.calcVolume(x, y) * volume * baseVolume * volumeScl, 1f, sound.calcPan(x, y));
             }
         }else{
             //fade the sound in or out
@@ -38,7 +42,7 @@ public class SoundLoop{
                 }
             }
 
-            Core.audio.set(id, sound.calcPan(x, y), sound.calcVolume(x, y) * volume * baseVolume);
+            Core.audio.set(id, sound.calcPan(x, y), sound.calcVolume(x, y) * volume * baseVolume * volumeScl);
         }
     }
 
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index d071e7dab9..e62a70f62a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1,15 +1,20 @@
 package mindustry.content;
 
-import arc.*;
 import arc.graphics.*;
-import arc.graphics.g2d.*;
+import arc.math.*;
 import arc.struct.*;
 import mindustry.*;
-import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.part.DrawPart.*;
+import mindustry.entities.part.*;
+import mindustry.entities.pattern.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.type.unit.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.campaign.*;
@@ -17,10 +22,11 @@ import mindustry.world.blocks.defense.*;
 import mindustry.world.blocks.defense.turrets.*;
 import mindustry.world.blocks.distribution.*;
 import mindustry.world.blocks.environment.*;
-import mindustry.world.blocks.experimental.*;
+import mindustry.world.blocks.heat.*;
 import mindustry.world.blocks.legacy.*;
 import mindustry.world.blocks.liquid.*;
 import mindustry.world.blocks.logic.*;
+import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.blocks.sandbox.*;
@@ -30,103 +36,148 @@ import mindustry.world.consumers.*;
 import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
 import static mindustry.type.ItemStack.*;
 
-public class Blocks implements ContentList{
+public class Blocks{
     public static Block
 
     //environment
-    air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space,
-    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, boulder, snowBoulder, basaltBoulder, grass, salt,
-    metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
+    air, spawn, removeWall, removeOre, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty,
+    dacite, rhyolite, rhyoliteCrater, roughRhyolite, regolith, yellowStone, redIce, redStone, denseRedStone,
+    arkyciteFloor, arkyicStone,
+    redmat, bluemat,
+    stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
+    redweed, purbush, yellowCoral,
+    rhyoliteVent, carbonVent, arkyicVent, yellowStoneVent, redStoneVent, crystallineVent,
+    regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall, arkyicWall, crystallineStoneWall, redStoneWall, redDiamondWall,
+    ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, yellowStonePlates,
+    iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
+    coreZone,
+    //boulders
+    shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
+    arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder,
+    metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
     darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
     pebbles, tendrils,
 
     //ores
     oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium,
+    oreBeryllium, oreTungsten, oreCrystalThorium, wallOreThorium,
+
+    //wall ores
+    wallOreBeryllium, graphiticWall, wallOreTungsten,
 
     //crafting
     siliconSmelter, siliconCrucible, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
     melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
 
+    //crafting - erekir
+    siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, slagHeater, phaseHeater, heatRedirector, smallHeatRedirector, heatRouter, slagIncinerator,
+    carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor,
+
     //sandbox
-    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, illuminator,
+    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, heatSource,
 
     //defense
     copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
-    phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, overdriveDome, forceProjector, shockMine,
+    phaseWall, phaseWallLarge, surgeWall, surgeWallLarge,
+
+    //walls - erekir
+    berylliumWall, berylliumWallLarge, tungstenWall, tungstenWallLarge, blastDoor, reinforcedSurgeWall, reinforcedSurgeWallLarge, carbideWall, carbideWallLarge,
+    shieldedWall,
+
+    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
 
+    //defense - erekir
+    radar,
+    buildTower,
+    regenProjector, barrierProjector, shockwaveTower,
+    //campaign only
+    shieldProjector,
+    largeShieldProjector,
+    shieldBreaker,
+
     //transport
     conveyor, titaniumConveyor, plastaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router,
-    overflowGate, underflowGate, massDriver, payloadConveyor, payloadRouter,
+    overflowGate, underflowGate, massDriver,
+
+    //transport - alternate
+    duct, armoredDuct, ductRouter, overflowDuct, underflowDuct, ductBridge, ductUnloader,
+    surgeConveyor, surgeRouter,
+
+    unitCargoLoader, unitCargoUnloadPoint,
 
     //liquid
-    mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
+    mechanicalPump, rotaryPump, impulsePump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
+
+    //liquid - reinforced
+    reinforcedPump, reinforcedConduit, reinforcedLiquidJunction, reinforcedBridgeConduit, reinforcedLiquidRouter, reinforcedLiquidContainer, reinforcedLiquidTank,
 
     //power
     combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
     impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower, diode,
 
+    //power - erekir
+    turbineCondenser, ventCondenser, chemicalCombustionChamber, pyrolysisGenerator, fluxReactor, neoplasiaReactor,
+    beamNode, beamTower, beamLink,
+
     //production
     mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, waterExtractor, oilExtractor, cultivator,
+    cliffCrusher, largeCliffCrusher, plasmaBore, largePlasmaBore, impactDrill, eruptionDrill,
 
     //storage
     coreShard, coreFoundation, coreNucleus, vault, container, unloader,
+    //storage - erekir
+    coreBastion, coreCitadel, coreAcropolis, reinforcedContainer, reinforcedVault,
 
     //turrets
     duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami,
 
+    //turrets - erekir
+    breach, diffuse, sublimate, titan, disperse, afflict, lustre, scathe, smite, malign,
+
     //units
-    commandCenter,
     groundFactory, airFactory, navalFactory,
     additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor,
-    repairPoint, resupplyPoint,
+    repairPoint, repairTurret,
+
+    //units - erekir
+    tankFabricator, shipFabricator, mechFabricator,
+
+    tankRefabricator, shipRefabricator, mechRefabricator,
+    primeRefabricator,
+
+    tankAssembler, shipAssembler, mechAssembler,
+    basicAssemblerModule,
+
+    unitRepairTower,
+
+    //payloads
+    payloadConveyor, payloadRouter, reinforcedPayloadConveyor, reinforcedPayloadRouter, payloadMassDriver, largePayloadMassDriver, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
 
     //logic
     message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
+    canvas, reinforcedMessage,
+    worldProcessor, worldCell, worldMessage, worldSwitch,
 
     //campaign
-    launchPad, launchPadLarge, interplanetaryAccelerator,
+    launchPad, advancedLaunchPad, landingPad,
+    interplanetaryAccelerator
 
-    //misc experimental
-    blockForge, blockLoader, blockUnloader;
+    ;
 
-    @Override
-    public void load(){
+    public static void load(){
         //region environment
 
-        air = new Floor("air"){
-            {
-                alwaysReplace = true;
-                hasShadow = false;
-                useColor = false;
-                wall = this;
-            }
+        air = new AirBlock("air");
 
-            @Override public void drawBase(Tile tile){}
-            @Override public void load(){}
-            @Override public void init(){}
-            @Override public boolean isHidden(){ return true; }
+        spawn = new SpawnBlock("spawn");
 
-            @Override
-            public TextureRegion[] variantRegions(){
-                if(variantRegions == null){
-                    variantRegions = new TextureRegion[]{Core.atlas.find("clear")};
-                }
-                return variantRegions;
-            }
-        };
+        removeWall = new RemoveWall("remove-wall");
 
-        spawn = new OverlayFloor("spawn"){
-            {
-                variants = 0;
-                needsSurface = false;
-            }
-            @Override
-            public void drawBase(Tile tile){}
-        };
+        removeOre = new RemoveOre("remove-ore");
 
         cliff = new Cliff("cliff"){{
             inEditor = false;
@@ -139,7 +190,7 @@ public class Blocks implements ContentList{
             new ConstructBlock(i);
         }
 
-        deepwater = new Floor("deepwater"){{
+        deepwater = new Floor("deep-water"){{
             speedMultiplier = 0.2f;
             variants = 0;
             liquidDrop = Liquids.water;
@@ -147,12 +198,13 @@ public class Blocks implements ContentList{
             isLiquid = true;
             status = StatusEffects.wet;
             statusDuration = 120f;
-            drownTime = 140f;
+            drownTime = 200f;
             cacheLayer = CacheLayer.water;
-            albedo = 0.5f;
+            albedo = 0.9f;
+            supportsOverlay = true;
         }};
 
-        water = new Floor("water"){{
+        water = new Floor("shallow-water"){{
             speedMultiplier = 0.5f;
             variants = 0;
             status = StatusEffects.wet;
@@ -160,43 +212,61 @@ public class Blocks implements ContentList{
             liquidDrop = Liquids.water;
             isLiquid = true;
             cacheLayer = CacheLayer.water;
-            albedo = 0.5f;
+            albedo = 0.9f;
+            supportsOverlay = true;
         }};
 
         taintedWater = new Floor("tainted-water"){{
-            speedMultiplier = 0.17f;
+            speedMultiplier = 0.5f;
             variants = 0;
             status = StatusEffects.wet;
-            statusDuration = 140f;
-            drownTime = 120f;
+            statusDuration = 90f;
             liquidDrop = Liquids.water;
             isLiquid = true;
             cacheLayer = CacheLayer.water;
-            albedo = 0.5f;
+            albedo = 0.9f;
             attributes.set(Attribute.spores, 0.15f);
+            supportsOverlay = true;
+        }};
+
+        deepTaintedWater = new Floor("deep-tainted-water"){{
+            speedMultiplier = 0.18f;
+            variants = 0;
+            status = StatusEffects.wet;
+            statusDuration = 140f;
+            drownTime = 200f;
+            liquidDrop = Liquids.water;
+            isLiquid = true;
+            cacheLayer = CacheLayer.water;
+            albedo = 0.9f;
+            attributes.set(Attribute.spores, 0.15f);
+            supportsOverlay = true;
         }};
 
         darksandTaintedWater = new ShallowLiquid("darksand-tainted-water"){{
             speedMultiplier = 0.75f;
             statusDuration = 60f;
-            albedo = 0.5f;
+            albedo = 0.9f;
             attributes.set(Attribute.spores, 0.1f);
+            supportsOverlay = true;
         }};
 
         sandWater = new ShallowLiquid("sand-water"){{
             speedMultiplier = 0.8f;
             statusDuration = 50f;
-            albedo = 0.5f;
+            albedo = 0.9f;
+            supportsOverlay = true;
         }};
 
         darksandWater = new ShallowLiquid("darksand-water"){{
             speedMultiplier = 0.8f;
             statusDuration = 50f;
-            albedo = 0.5f;
+            albedo = 0.9f;
+            supportsOverlay = true;
         }};
 
         tar = new Floor("tar"){{
-            drownTime = 150f;
+            drownTime = 230f;
             status = StatusEffects.tarred;
             statusDuration = 240f;
             speedMultiplier = 0.19f;
@@ -206,8 +276,24 @@ public class Blocks implements ContentList{
             cacheLayer = CacheLayer.tar;
         }};
 
-        slag = new Floor("slag"){{
+        cryofluid = new Floor("pooled-cryofluid"){{
             drownTime = 150f;
+            status = StatusEffects.freezing;
+            statusDuration = 240f;
+            speedMultiplier = 0.5f;
+            variants = 0;
+            liquidDrop = Liquids.cryofluid;
+            liquidMultiplier = 0.5f;
+            isLiquid = true;
+            cacheLayer = CacheLayer.cryofluid;
+
+            emitLight = true;
+            lightRadius = 25f;
+            lightColor = Color.cyan.cpy().a(0.19f);
+        }};
+
+        slag = new Floor("molten-slag"){{
+            drownTime = 230f;
             status = StatusEffects.melting;
             statusDuration = 240f;
             speedMultiplier = 0.19f;
@@ -227,11 +313,14 @@ public class Blocks implements ContentList{
             placeableOn = false;
             solid = true;
             variants = 0;
+            canShadow = false;
         }};
 
+        empty = new EmptyFloor("empty");
+
         stone = new Floor("stone");
 
-        craters = new Floor("craters"){{
+        craters = new Floor("crater-stone"){{
             variants = 3;
             blendGroup = stone;
         }};
@@ -257,7 +346,6 @@ public class Blocks implements ContentList{
         magmarock = new Floor("magmarock"){{
             attributes.set(Attribute.heat, 0.75f);
             attributes.set(Attribute.water, -0.75f);
-            updateEffect = Fx.magmasmoke;
             blendGroup = basalt;
 
             emitLight = true;
@@ -265,7 +353,7 @@ public class Blocks implements ContentList{
             lightColor = Color.orange.cpy().a(0.3f);
         }};
 
-        sand = new Floor("sand"){{
+        sand = new Floor("sand-floor"){{
             itemDrop = Items.sand;
             playerUnmineable = true;
             attributes.set(Attribute.oil, 0.7f);
@@ -286,7 +374,6 @@ public class Blocks implements ContentList{
             statusDuration = 30f;
             attributes.set(Attribute.water, 1f);
             cacheLayer = CacheLayer.mud;
-            albedo = 0.35f;
             walkSound = Sounds.mud;
             walkSoundVolume = 0.08f;
             walkSoundPitchMin = 0.4f;
@@ -299,7 +386,127 @@ public class Blocks implements ContentList{
 
         dacite = new Floor("dacite");
 
+        rhyolite = new Floor("rhyolite"){{
+            attributes.set(Attribute.water, -1f);
+        }};
+
+        rhyoliteCrater = new Floor("rhyolite-crater"){{
+            attributes.set(Attribute.water, -1f);
+            blendGroup = rhyolite;
+        }};
+
+        roughRhyolite = new Floor("rough-rhyolite"){{
+            attributes.set(Attribute.water, -1f);
+            variants = 3;
+        }};
+
+        regolith = new Floor("regolith"){{
+            attributes.set(Attribute.water, -1f);
+        }};
+
+        yellowStone = new Floor("yellow-stone"){{
+            attributes.set(Attribute.water, -1f);
+        }};
+
+        carbonStone = new Floor("carbon-stone"){{
+            attributes.set(Attribute.water, -1f);
+            variants = 4;
+        }};
+
+        ferricStone = new Floor("ferric-stone"){{
+            attributes.set(Attribute.water, -1f);
+        }};
+
+        ferricCraters = new Floor("ferric-craters"){{
+            variants = 3;
+            attributes.set(Attribute.water, -1f);
+            blendGroup = ferricStone;
+        }};
+
+        beryllicStone = new Floor("beryllic-stone"){{
+            variants = 4;
+        }};
+
+        crystallineStone = new Floor("crystalline-stone"){{
+            variants = 5;
+        }};
+
+        crystalFloor = new Floor("crystal-floor"){{
+            variants = 4;
+        }};
+
+        yellowStonePlates = new Floor("yellow-stone-plates"){{
+            variants = 3;
+        }};
+
+        redStone = new Floor("red-stone"){{
+            attributes.set(Attribute.water, -1f);
+            variants = 4;
+        }};
+
+        denseRedStone = new Floor("dense-red-stone"){{
+            attributes.set(Attribute.water, -1f);
+            variants = 4;
+        }};
+
+        redIce = new Floor("red-ice"){{
+            dragMultiplier = 0.4f;
+            speedMultiplier = 0.9f;
+            attributes.set(Attribute.water, 0.4f);
+        }};
+
+        arkyciteFloor = new Floor("arkycite-floor"){{
+            speedMultiplier = 0.3f;
+            variants = 0;
+            liquidDrop = Liquids.arkycite;
+            isLiquid = true;
+            //TODO no status for now
+            //status = StatusEffects.slow;
+            //statusDuration = 120f;
+            drownTime = 200f;
+            cacheLayer = CacheLayer.arkycite;
+            albedo = 0.9f;
+        }};
+
+        arkyicStone = new Floor("arkyic-stone"){{
+            variants = 3;
+        }};
+
+        rhyoliteVent = new SteamVent("rhyolite-vent"){{
+            parent = blendGroup = rhyolite;
+            attributes.set(Attribute.steam, 1f);
+        }};
+
+        carbonVent = new SteamVent("carbon-vent"){{
+            parent = blendGroup = carbonStone;
+            attributes.set(Attribute.steam, 1f);
+        }};
+
+        arkyicVent = new SteamVent("arkyic-vent"){{
+            parent = blendGroup = arkyicStone;
+            attributes.set(Attribute.steam, 1f);
+        }};
+
+        yellowStoneVent = new SteamVent("yellow-stone-vent"){{
+            parent = blendGroup = yellowStone;
+            attributes.set(Attribute.steam, 1f);
+        }};
+
+        redStoneVent = new SteamVent("red-stone-vent"){{
+            parent = blendGroup = denseRedStone;
+            attributes.set(Attribute.steam, 1f);
+        }};
+
+        crystallineVent = new SteamVent("crystalline-vent"){{
+            parent = blendGroup = crystallineStone;
+            attributes.set(Attribute.steam, 1f);
+        }};
+
+        redmat = new Floor("redmat");
+        bluemat = new Floor("bluemat");
+
         grass = new Floor("grass"){{
+            //TODO grass needs a bush? classic had grass bushes.
             attributes.set(Attribute.water, 0.1f);
         }};
 
@@ -311,155 +518,290 @@ public class Blocks implements ContentList{
 
         snow = new Floor("snow"){{
             attributes.set(Attribute.water, 0.2f);
+            albedo = 0.7f;
         }};
 
         ice = new Floor("ice"){{
             dragMultiplier = 0.35f;
             speedMultiplier = 0.9f;
             attributes.set(Attribute.water, 0.4f);
+            albedo = 0.65f;
         }};
 
         iceSnow = new Floor("ice-snow"){{
             dragMultiplier = 0.6f;
             variants = 3;
             attributes.set(Attribute.water, 0.3f);
+            albedo = 0.6f;
         }};
 
         shale = new Floor("shale"){{
             variants = 3;
-            attributes.set(Attribute.oil, 1f);
+            attributes.set(Attribute.oil, 1.6f);
+        }};
+
+        moss = new Floor("moss"){{
+            variants = 3;
+            attributes.set(Attribute.spores, 0.15f);
+        }};
+
+        coreZone = new Floor("core-zone"){{
+            variants = 0;
+            allowCorePlacement = true;
+        }};
+
+        sporeMoss = new Floor("spore-moss"){{
+            variants = 3;
+            attributes.set(Attribute.spores, 0.3f);
         }};
 
         stoneWall = new StaticWall("stone-wall"){{
-            variants = 2;
+            attributes.set(Attribute.sand, 1f);
         }};
 
         sporeWall = new StaticWall("spore-wall"){{
-            variants = 2;
+            taintedWater.asFloor().wall = deepTaintedWater.asFloor().wall = sporeMoss.asFloor().wall = this;
         }};
 
-        dirtWall = new StaticWall("dirt-wall"){{
-            variants = 2;
-        }};
+        dirtWall = new StaticWall("dirt-wall");
 
-        daciteWall = new StaticWall("dacite-wall"){{
-            variants = 2;
-        }};
+        daciteWall = new StaticWall("dacite-wall");
 
         iceWall = new StaticWall("ice-wall"){{
-            variants = 2;
             iceSnow.asFloor().wall = this;
+            albedo = 0.6f;
         }};
 
-        snowWall = new StaticWall("snow-wall"){{
-            variants = 2;
-        }};
+        snowWall = new StaticWall("snow-wall");
 
         duneWall = new StaticWall("dune-wall"){{
-            variants = 2;
-            basalt.asFloor().wall = darksandWater.asFloor().wall = darksandTaintedWater.asFloor().wall = this;
+            hotrock.asFloor().wall = magmarock.asFloor().wall = basalt.asFloor().wall = darksandWater.asFloor().wall = darksandTaintedWater.asFloor().wall = this;
+            attributes.set(Attribute.sand, 2f);
+        }};
+
+        regolithWall = new StaticWall("regolith-wall"){{
+            regolith.asFloor().wall = this;
+            attributes.set(Attribute.sand, 1f);
+        }};
+
+        yellowStoneWall = new StaticWall("yellow-stone-wall"){{
+            yellowStone.asFloor().wall = slag.asFloor().wall = yellowStonePlates.asFloor().wall = this;
+            attributes.set(Attribute.sand, 1.5f);
+        }};
+
+        rhyoliteWall = new StaticWall("rhyolite-wall"){{
+            rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = roughRhyolite.asFloor().wall = this;
+            attributes.set(Attribute.sand, 1f);
+        }};
+
+        carbonWall = new StaticWall("carbon-wall"){{
+            carbonStone.asFloor().wall = this;
+            attributes.set(Attribute.sand, 0.7f);
+        }};
+
+        ferricStoneWall = new StaticWall("ferric-stone-wall"){{
+            ferricStone.asFloor().wall = this;
+            attributes.set(Attribute.sand, 0.5f);
+        }};
+
+        beryllicStoneWall = new StaticWall("beryllic-stone-wall"){{
+            beryllicStone.asFloor().wall = this;
+            attributes.set(Attribute.sand, 1.2f);
+        }};
+
+        arkyicWall = new StaticWall("arkyic-wall"){{
+            variants = 3;
+            arkyciteFloor.asFloor().wall = arkyicStone.asFloor().wall = this;
+        }};
+
+        crystallineStoneWall = new StaticWall("crystalline-stone-wall"){{
+            variants = 4;
+            crystallineStone.asFloor().wall = crystalFloor.asFloor().wall = this;
+        }};
+
+        redIceWall = new StaticWall("red-ice-wall"){{
+            redIce.asFloor().wall = this;
+        }};
+
+        redStoneWall = new StaticWall("red-stone-wall"){{
+            redStone.asFloor().wall = denseRedStone.asFloor().wall = this;
+            attributes.set(Attribute.sand, 1.5f);
+        }};
+
+        redDiamondWall = new StaticTree("red-diamond-wall"){{
+            variants = 3;
         }};
 
         sandWall = new StaticWall("sand-wall"){{
-            variants = 2;
-            sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = this;
+            sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = sand.asFloor().wall = this;
+            attributes.set(Attribute.sand, 2f);
         }};
 
         saltWall = new StaticWall("salt-wall");
 
         shrubs = new StaticWall("shrubs");
 
-        shaleWall = new StaticWall("shale-wall"){{
-            variants = 2;
-        }};
+        shaleWall = new StaticWall("shale-wall");
 
         sporePine = new StaticTree("spore-pine"){{
-            variants = 0;
+            moss.asFloor().wall = this;
         }};
 
-        snowPine = new StaticTree("snow-pine"){{
-            variants = 0;
-        }};
+        snowPine = new StaticTree("snow-pine");
 
-        pine = new StaticTree("pine"){{
-            variants = 0;
-        }};
+        pine = new StaticTree("pine");
 
         whiteTreeDead = new TreeBlock("white-tree-dead");
 
         whiteTree = new TreeBlock("white-tree");
 
-        sporeCluster = new Boulder("spore-cluster"){{
+        sporeCluster = new Prop("spore-cluster"){{
             variants = 3;
+            breakSound = Sounds.plantBreak;
         }};
 
-        boulder = new Boulder("boulder"){{
+        redweed = new Seaweed("redweed"){{
+            variants = 3;
+            redmat.asFloor().decoration = this;
+        }};
+
+        purbush = new SeaBush("pur-bush"){{
+            bluemat.asFloor().decoration = this;
+        }};
+
+        yellowCoral = new SeaBush("yellowcoral"){{
+            lobesMin = 2;
+            lobesMax = 3;
+            magMax = 8f;
+            magMin = 2f;
+            origin = 0.3f;
+            spread = 40f;
+            sclMin = 60f;
+            sclMax = 100f;
+        }};
+
+        boulder = new Prop("boulder"){{
             variants = 2;
+            stone.asFloor().decoration = craters.asFloor().decoration = charr.asFloor().decoration = this;
         }};
 
-        snowBoulder = new Boulder("snow-boulder"){{
+        snowBoulder = new Prop("snow-boulder"){{
             variants = 2;
             snow.asFloor().decoration = ice.asFloor().decoration = iceSnow.asFloor().decoration = salt.asFloor().decoration = this;
         }};
 
-        shaleBoulder = new Boulder("shale-boulder"){{
+        shaleBoulder = new Prop("shale-boulder"){{
             variants = 2;
+            shale.asFloor().decoration = this;
         }};
 
-        sandBoulder = new Boulder("sand-boulder"){{
+        sandBoulder = new Prop("sand-boulder"){{
             variants = 2;
+            sand.asFloor().decoration = this;
         }};
 
-        daciteBoulder = new Boulder("dacite-boulder"){{
+        daciteBoulder = new Prop("dacite-boulder"){{
             variants = 2;
+            dacite.asFloor().decoration = this;
         }};
 
-        basaltBoulder = new Boulder("basalt-boulder"){{
+        basaltBoulder = new Prop("basalt-boulder"){{
             variants = 2;
+            basalt.asFloor().decoration = hotrock.asFloor().decoration = darksand.asFloor().decoration = magmarock.asFloor().decoration = this;
         }};
 
-        moss = new Floor("moss"){{
+        carbonBoulder = new Prop("carbon-boulder"){{
+            variants = 2;
+            carbonStone.asFloor().decoration = this;
+        }};
+
+        ferricBoulder = new Prop("ferric-boulder"){{
+            variants = 2;
+            ferricStone.asFloor().decoration = ferricCraters.asFloor().decoration = this;
+        }};
+
+        beryllicBoulder = new Prop("beryllic-boulder"){{
+            variants = 2;
+            beryllicStone.asFloor().decoration = this;
+        }};
+
+        yellowStoneBoulder = new Prop("yellow-stone-boulder"){{
+            variants = 2;
+            yellowStone.asFloor().decoration = regolith.asFloor().decoration = yellowStonePlates.asFloor().decoration = this;
+        }};
+
+        //1px outline + 4.50 gaussian shadow in gimp
+        arkyicBoulder = new Prop("arkyic-boulder"){{
             variants = 3;
-            attributes.set(Attribute.spores, 0.15f);
-            wall = sporePine;
+            customShadow = true;
+            arkyicStone.asFloor().decoration = this;
         }};
 
-        sporeMoss = new Floor("spore-moss"){{
+        crystalCluster = new TallBlock("crystal-cluster"){{
             variants = 3;
-            attributes.set(Attribute.spores, 0.3f);
-            wall = sporeWall;
+            clipSize = 128f;
         }};
 
-        metalFloor = new Floor("metal-floor"){{
-            variants = 0;
-        }};
-
-        metalFloorDamaged = new Floor("metal-floor-damaged"){{
+        vibrantCrystalCluster = new TallBlock("vibrant-crystal-cluster"){{
             variants = 3;
+            clipSize = 128f;
         }};
 
-        metalFloor2 = new Floor("metal-floor-2"){{
-            variants = 0;
+        crystalBlocks = new TallBlock("crystal-blocks"){{
+            variants = 3;
+            clipSize = 128f;
+            shadowAlpha = 0.5f;
+            shadowOffset = -2.5f;
         }};
 
-        metalFloor3 = new Floor("metal-floor-3"){{
-            variants = 0;
+        crystalOrbs = new TallBlock("crystal-orbs"){{
+            variants = 3;
+            clipSize = 128f;
+            shadowAlpha = 0.5f;
+            shadowOffset = -2.5f;
         }};
 
-        metalFloor5 = new Floor("metal-floor-5"){{
-            variants = 0;
+        crystallineBoulder = new Prop("crystalline-boulder"){{
+            variants = 2;
+            crystallineStone.asFloor().decoration = this;
         }};
 
-        darkPanel1 = new Floor("dark-panel-1"){{ variants = 0; }};
-        darkPanel2 = new Floor("dark-panel-2"){{ variants = 0; }};
-        darkPanel3 = new Floor("dark-panel-3"){{ variants = 0; }};
-        darkPanel4 = new Floor("dark-panel-4"){{ variants = 0; }};
-        darkPanel5 = new Floor("dark-panel-5"){{ variants = 0; }};
-        darkPanel6 = new Floor("dark-panel-6"){{ variants = 0; }};
+        redIceBoulder = new Prop("red-ice-boulder"){{
+            variants = 3;
+            redIce.asFloor().decoration = this;
+        }};
+
+        rhyoliteBoulder = new Prop("rhyolite-boulder"){{
+            variants = 3;
+            rhyolite.asFloor().decoration = roughRhyolite.asFloor().decoration = this;
+        }};
+
+        redStoneBoulder = new Prop("red-stone-boulder"){{
+            variants = 4;
+            denseRedStone.asFloor().decoration = redStone.asFloor().decoration = this;
+        }};
+
+        metalFloor = new Floor("metal-floor", 0);
+        metalFloorDamaged = new Floor("metal-floor-damaged", 3);
+
+        metalFloor2 = new Floor("metal-floor-2", 0);
+        metalFloor3 = new Floor("metal-floor-3", 0);
+        metalFloor4 = new Floor("metal-floor-4", 0);
+        metalFloor5 = new Floor("metal-floor-5", 0);
+
+        darkPanel1 = new Floor("dark-panel-1", 0);
+        darkPanel2 = new Floor("dark-panel-2", 0);
+        darkPanel3 = new Floor("dark-panel-3", 0);
+        darkPanel4 = new Floor("dark-panel-4", 0);
+        darkPanel5 = new Floor("dark-panel-5", 0);
+        darkPanel6 = new Floor("dark-panel-6", 0);
 
         darkMetal = new StaticWall("dark-metal");
 
-        pebbles = new DoubleOverlayFloor("pebbles");
+        Seq.with(metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6)
+        .each(b -> b.asFloor().wall = darkMetal);
+
+        pebbles = new OverlayFloor("pebbles");
 
         tendrils = new OverlayFloor("tendrils");
 
@@ -498,6 +840,30 @@ public class Blocks implements ContentList{
             oreScale = 25.380953f;
         }};
 
+        oreBeryllium = new OreBlock(Items.beryllium);
+
+        oreTungsten = new OreBlock(Items.tungsten);
+
+        oreCrystalThorium = new OreBlock("ore-crystal-thorium", Items.thorium);
+
+        wallOreThorium = new OreBlock("ore-wall-thorium", Items.thorium){{
+            wallOre = true;
+        }};
+
+        wallOreBeryllium = new OreBlock("ore-wall-beryllium", Items.beryllium){{
+            wallOre = true;
+        }};
+
+        graphiticWall = new StaticWall("graphitic-wall"){{
+            itemDrop = Items.graphite;
+            variants = 3;
+        }};
+
+        //TODO merge with standard ore?
+        wallOreTungsten = new OreBlock("ore-wall-tungsten", Items.tungsten){{
+            wallOre = true;
+        }};
+
         //endregion
         //region crafting
 
@@ -510,7 +876,7 @@ public class Blocks implements ContentList{
             size = 2;
             hasItems = true;
 
-            consumes.item(Items.coal, 2);
+            consumeItem(Items.coal, 2);
         }};
 
         multiPress = new GenericCrafter("multi-press"){{
@@ -519,17 +885,18 @@ public class Blocks implements ContentList{
             craftEffect = Fx.pulverizeMedium;
             outputItem = new ItemStack(Items.graphite, 2);
             craftTime = 30f;
+            itemCapacity = 20;
             size = 3;
             hasItems = true;
             hasLiquids = true;
             hasPower = true;
 
-            consumes.power(1.8f);
-            consumes.item(Items.coal, 3);
-            consumes.liquid(Liquids.water, 0.1f);
+            consumePower(1.8f);
+            consumeItem(Items.coal, 3);
+            consumeLiquid(Liquids.water, 0.1f);
         }};
 
-        siliconSmelter = new GenericSmelter("silicon-smelter"){{
+        siliconSmelter = new GenericCrafter("silicon-smelter"){{
             requirements(Category.crafting, with(Items.copper, 30, Items.lead, 25));
             craftEffect = Fx.smeltsmoke;
             outputItem = new ItemStack(Items.silicon, 1);
@@ -537,13 +904,15 @@ public class Blocks implements ContentList{
             size = 2;
             hasPower = true;
             hasLiquids = false;
-            flameColor = Color.valueOf("ffef99");
+            drawer = new DrawMulti(new DrawDefault(), new DrawFlame(Color.valueOf("ffef99")));
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.07f;
 
-            consumes.items(with(Items.coal, 1, Items.sand, 2));
-            consumes.power(0.50f);
+            consumeItems(with(Items.coal, 1, Items.sand, 2));
+            consumePower(0.50f);
         }};
 
-        siliconCrucible = new AttributeSmelter("silicon-crucible"){{
+        siliconCrucible = new AttributeCrafter("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, 8);
@@ -551,25 +920,29 @@ public class Blocks implements ContentList{
             size = 3;
             hasPower = true;
             hasLiquids = false;
-            flameColor = Color.valueOf("ffef99");
             itemCapacity = 30;
             boostScale = 0.15f;
+            drawer = new DrawMulti(new DrawDefault(), new DrawFlame(Color.valueOf("ffef99")));
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.07f;
 
-            consumes.items(with(Items.coal, 4, Items.sand, 6, Items.pyratite, 1));
-            consumes.power(4f);
+            consumeItems(with(Items.coal, 4, Items.sand, 6, Items.pyratite, 1));
+            consumePower(4f);
         }};
 
-        kiln = new GenericSmelter("kiln"){{
+        kiln = new GenericCrafter("kiln"){{
             requirements(Category.crafting, with(Items.copper, 60, Items.graphite, 30, Items.lead, 30));
             craftEffect = Fx.smeltsmoke;
             outputItem = new ItemStack(Items.metaglass, 1);
             craftTime = 30f;
             size = 2;
             hasPower = hasItems = true;
-            flameColor = Color.valueOf("ffc099");
+            drawer = new DrawMulti(new DrawDefault(), new DrawFlame(Color.valueOf("ffc099")));
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.07f;
 
-            consumes.items(with(Items.lead, 1, Items.sand, 1));
-            consumes.power(0.60f);
+            consumeItems(with(Items.lead, 1, Items.sand, 1));
+            consumePower(0.60f);
         }};
 
         plastaniumCompressor = new GenericCrafter("plastanium-compressor"){{
@@ -583,11 +956,11 @@ public class Blocks implements ContentList{
             hasPower = hasLiquids = true;
             craftEffect = Fx.formsmoke;
             updateEffect = Fx.plasticburn;
-            drawer = new DrawGlow();
+            drawer = new DrawMulti(new DrawDefault(), new DrawFade());
 
-            consumes.liquid(Liquids.oil, 0.25f);
-            consumes.power(3f);
-            consumes.item(Items.titanium, 2);
+            consumeLiquid(Liquids.oil, 0.25f);
+            consumePower(3f);
+            consumeItem(Items.titanium, 2);
         }};
 
         phaseWeaver = new GenericCrafter("phase-weaver"){{
@@ -597,17 +970,18 @@ public class Blocks implements ContentList{
             craftTime = 120f;
             size = 2;
             hasPower = true;
-            drawer = new DrawWeave();
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawWeave(), new DrawDefault());
+            envEnabled |= Env.space;
 
             ambientSound = Sounds.techloop;
             ambientSoundVolume = 0.02f;
 
-            consumes.items(with(Items.thorium, 4, Items.sand, 10));
-            consumes.power(5f);
-            itemCapacity = 20;
+            consumeItems(with(Items.thorium, 4, Items.sand, 10));
+            consumePower(5f);
+            itemCapacity = 30;
         }};
 
-        surgeSmelter = new GenericSmelter("alloy-smelter"){{
+        surgeSmelter = new GenericCrafter("surge-smelter"){{
             requirements(Category.crafting, with(Items.silicon, 80, Items.lead, 80, Items.thorium, 70));
             craftEffect = Fx.smeltsmoke;
             outputItem = new ItemStack(Items.surgeAlloy, 1);
@@ -615,15 +989,15 @@ public class Blocks implements ContentList{
             size = 3;
             hasPower = true;
             itemCapacity = 20;
+            drawer = new DrawMulti(new DrawDefault(), new DrawFlame());
 
-            consumes.power(4f);
-            consumes.items(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3));
+            consumePower(4f);
+            consumeItems(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3));
         }};
 
-        cryofluidMixer = new LiquidConverter("cryofluid-mixer"){{
+        cryofluidMixer = new GenericCrafter("cryofluid-mixer"){{
             requirements(Category.crafting, with(Items.lead, 65, Items.silicon, 40, Items.titanium, 60));
-            outputLiquid = new LiquidStack(Liquids.cryofluid, 0.2f);
-            craftTime = 120f;
+            outputLiquid = new LiquidStack(Liquids.cryofluid, 12f / 60f);
             size = 2;
             hasPower = true;
             hasItems = true;
@@ -631,24 +1005,28 @@ public class Blocks implements ContentList{
             rotate = false;
             solid = true;
             outputsLiquid = true;
-            drawer = new DrawMixer();
+            envEnabled = Env.any;
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.water), new DrawLiquidTile(Liquids.cryofluid){{drawLiquidLight = true;}}, new DrawDefault());
+            liquidCapacity = 36f;
+            craftTime = 120;
+            lightLiquid = Liquids.cryofluid;
 
-            consumes.power(1f);
-            consumes.item(Items.titanium);
-            consumes.liquid(Liquids.water, 0.2f);
+            consumePower(1f);
+            consumeItem(Items.titanium);
+            consumeLiquid(Liquids.water, 12f / 60f);
         }};
 
-        pyratiteMixer = new GenericSmelter("pyratite-mixer"){{
+        pyratiteMixer = new GenericCrafter("pyratite-mixer"){{
             requirements(Category.crafting, with(Items.copper, 50, Items.lead, 25));
-            flameColor = Color.clear;
             hasItems = true;
             hasPower = true;
             outputItem = new ItemStack(Items.pyratite, 1);
+            envEnabled |= Env.space;
 
             size = 2;
 
-            consumes.power(0.20f);
-            consumes.items(with(Items.coal, 1, Items.lead, 2, Items.sand, 2));
+            consumePower(0.20f);
+            consumeItems(with(Items.coal, 1, Items.lead, 2, Items.sand, 2));
         }};
 
         blastMixer = new GenericCrafter("blast-mixer"){{
@@ -657,70 +1035,85 @@ public class Blocks implements ContentList{
             hasPower = true;
             outputItem = new ItemStack(Items.blastCompound, 1);
             size = 2;
+            envEnabled |= Env.space;
 
-            consumes.items(with(Items.pyratite, 1, Items.sporePod, 1));
-            consumes.power(0.40f);
+            consumeItems(with(Items.pyratite, 1, Items.sporePod, 1));
+            consumePower(0.40f);
         }};
 
         melter = new GenericCrafter("melter"){{
             requirements(Category.crafting, with(Items.copper, 30, Items.lead, 35, Items.graphite, 45));
             health = 200;
-            outputLiquid = new LiquidStack(Liquids.slag, 2f);
+            outputLiquid = new LiquidStack(Liquids.slag, 12f / 60f);
+
             craftTime = 10f;
             hasLiquids = hasPower = true;
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawDefault());
 
-            consumes.power(1f);
-            consumes.item(Items.scrap, 1);
+            consumePower(1f);
+            consumeItem(Items.scrap, 1);
         }};
 
         separator = new Separator("separator"){{
             requirements(Category.crafting, with(Items.copper, 30, Items.titanium, 25));
             results = with(
-            Items.copper, 5,
-            Items.lead, 3,
-            Items.graphite, 2,
-            Items.titanium, 2
+                Items.copper, 5,
+                Items.lead, 3,
+                Items.graphite, 2,
+                Items.titanium, 2
             );
             hasPower = true;
             craftTime = 35f;
             size = 2;
 
-            consumes.power(1f);
-            consumes.liquid(Liquids.slag, 0.07f);
+            consumePower(1.1f);
+            consumeLiquid(Liquids.slag, 4f / 60f);
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3, true), new DrawDefault());
         }};
 
         disassembler = new Separator("disassembler"){{
-            requirements(Category.crafting, with(Items.graphite, 140, Items.titanium, 100, Items.silicon, 150, Items.surgeAlloy, 70));
+            requirements(Category.crafting, with(Items.plastanium, 40, Items.titanium, 100, Items.silicon, 150, Items.thorium, 80));
             results = with(
-            Items.sand, 4,
-            Items.graphite, 2,
-            Items.titanium, 2,
-            Items.thorium, 1
+                Items.sand, 2,
+                Items.graphite, 1,
+                Items.titanium, 1,
+                Items.thorium, 1
             );
             hasPower = true;
             craftTime = 15f;
             size = 3;
             itemCapacity = 20;
 
-            consumes.power(4f);
-            consumes.item(Items.scrap);
-            consumes.liquid(Liquids.slag, 0.12f);
+            consumePower(4f);
+            consumeItem(Items.scrap);
+            consumeLiquid(Liquids.slag, 0.12f);
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3, true), new DrawDefault());
         }};
 
         sporePress = new GenericCrafter("spore-press"){{
             requirements(Category.crafting, with(Items.lead, 35, Items.silicon, 30));
             liquidCapacity = 60f;
             craftTime = 20f;
-            outputLiquid = new LiquidStack(Liquids.oil, 6f);
+            outputLiquid = new LiquidStack(Liquids.oil, 18f / 60f);
             size = 2;
             health = 320;
             hasLiquids = true;
             hasPower = true;
             craftEffect = Fx.none;
-            drawer = new DrawAnimation();
+            drawer = new DrawMulti(
+            new DrawRegion("-bottom"),
+            new DrawPistons(){{
+                sinMag = 1f;
+            }},
+            new DrawDefault(),
+            new DrawLiquidRegion(),
+            new DrawRegion("-top")
+            );
 
-            consumes.item(Items.sporePod, 1);
-            consumes.power(0.7f);
+            consumeItem(Items.sporePod, 1);
+            consumePower(0.7f);
         }};
 
         pulverizer = new GenericCrafter("pulverizer"){{
@@ -730,30 +1123,399 @@ public class Blocks implements ContentList{
             craftTime = 40f;
             updateEffect = Fx.pulverizeSmall;
             hasItems = hasPower = true;
-            drawer = new DrawRotator();
+            drawer = new DrawMulti(new DrawDefault(), new DrawRegion("-rotator"){{
+                spinSprite = true;
+                rotateSpeed = 2f;
+            }}, new DrawRegion("-top"));
             ambientSound = Sounds.grinding;
             ambientSoundVolume = 0.025f;
 
-            consumes.item(Items.scrap, 1);
-            consumes.power(0.50f);
+            consumeItem(Items.scrap, 1);
+            consumePower(0.50f);
         }};
 
         coalCentrifuge = new GenericCrafter("coal-centrifuge"){{
             requirements(Category.crafting, with(Items.titanium, 20, Items.graphite, 40, Items.lead, 30));
-            craftEffect = Fx.smeltsmoke;
+            craftEffect = Fx.coalSmeltsmoke;
             outputItem = new ItemStack(Items.coal, 1);
             craftTime = 30f;
             size = 2;
             hasPower = hasItems = hasLiquids = true;
+            rotateDraw = false;
 
-            consumes.liquid(Liquids.oil, 0.1f);
-            consumes.power(0.7f);
+            consumeLiquid(Liquids.oil, 0.1f);
+            consumePower(0.7f);
         }};
 
         incinerator = new Incinerator("incinerator"){{
             requirements(Category.crafting, with(Items.graphite, 5, Items.lead, 15));
             health = 90;
-            consumes.power(0.50f);
+            envEnabled |= Env.space;
+            consumePower(0.50f);
+        }};
+
+        //erekir
+
+        siliconArcFurnace = new GenericCrafter("silicon-arc-furnace"){{
+            requirements(Category.crafting, with(Items.beryllium, 70, Items.graphite, 80));
+            craftEffect = Fx.none;
+            outputItem = new ItemStack(Items.silicon, 4);
+            craftTime = 50f;
+            size = 3;
+            hasPower = true;
+            hasLiquids = false;
+            envEnabled |= Env.space | Env.underwater;
+            envDisabled = Env.none;
+            itemCapacity = 30;
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawArcSmelt(), new DrawDefault());
+            fogRadius = 3;
+            researchCost = with(Items.beryllium, 150, Items.graphite, 50);
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.12f;
+
+            consumeItems(with(Items.graphite, 1, Items.sand, 4));
+            consumePower(6f);
+        }};
+
+        electrolyzer = new GenericCrafter("electrolyzer"){{
+            requirements(Category.crafting, with(Items.silicon, 50, Items.graphite, 40, Items.beryllium, 130, Items.tungsten, 80));
+            size = 3;
+
+            researchCostMultiplier = 1.2f;
+            craftTime = 10f;
+            rotate = true;
+            invertFlip = true;
+            group = BlockGroup.liquids;
+            itemCapacity = 0;
+
+            liquidCapacity = 50f;
+
+            consumeLiquid(Liquids.water, 10f / 60f);
+            consumePower(1f);
+
+            drawer = new DrawMulti(
+                new DrawRegion("-bottom"),
+                new DrawLiquidTile(Liquids.water, 2f),
+                new DrawBubbles(Color.valueOf("7693e3")){{
+                    sides = 10;
+                    recurrence = 3f;
+                    spread = 6;
+                    radius = 1.5f;
+                    amount = 20;
+                }},
+                new DrawRegion(),
+                new DrawLiquidOutputs(),
+                new DrawGlowRegion(){{
+                    alpha = 0.7f;
+                    color = Color.valueOf("c4bdf3");
+                    glowIntensity = 0.3f;
+                    glowScale = 6f;
+                }}
+            );
+
+            ambientSound = Sounds.electricHum;
+            ambientSoundVolume = 0.08f;
+
+            regionRotated1 = 3;
+            outputLiquids = LiquidStack.with(Liquids.ozone, 4f / 60, Liquids.hydrogen, 6f / 60);
+            liquidOutputDirections = new int[]{1, 3};
+        }};
+
+        atmosphericConcentrator = new HeatCrafter("atmospheric-concentrator"){{
+            requirements(Category.crafting, with(Items.oxide, 60, Items.beryllium, 180, Items.silicon, 150));
+            size = 3;
+            hasLiquids = true;
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.nitrogen, 4.1f), new DrawDefault(), new DrawHeatInput(),
+            new DrawParticles(){{
+                color = Color.valueOf("d4f0ff");
+                alpha = 0.6f;
+                particleSize = 4f;
+                particles = 10;
+                particleRad = 12f;
+                particleLife = 140f;
+            }});
+
+            researchCostMultiplier = 1.1f;
+            itemCapacity = 0;
+            liquidCapacity = 60f;
+            consumePower(2f);
+            ambientSound = Sounds.extractLoop;
+            ambientSoundVolume = 0.06f;
+
+            heatRequirement = 6f;
+
+            outputLiquid = new LiquidStack(Liquids.nitrogen, 4f / 60f);
+
+            researchCost = with(Items.silicon, 2000, Items.oxide, 900, Items.beryllium, 2400);
+        }};
+
+        oxidationChamber = new HeatProducer("oxidation-chamber"){{
+            requirements(Category.crafting, with(Items.tungsten, 120, Items.graphite, 80, Items.silicon, 100, Items.beryllium, 120));
+            size = 3;
+
+            outputItem = new ItemStack(Items.oxide, 1);
+            researchCostMultiplier = 1.1f;
+
+            consumeLiquid(Liquids.ozone, 2f / 60f);
+            consumeItem(Items.beryllium);
+            consumePower(0.5f);
+
+            rotateDraw = false;
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidRegion(), new DrawDefault(), new DrawHeatOutput());
+            ambientSound = Sounds.extractLoop;
+            ambientSoundVolume = 0.08f;
+
+            regionRotated1 = 2;
+            craftTime = 60f * 2f;
+            liquidCapacity = 30f;
+            heatOutput = 5f;
+        }};
+
+        electricHeater = new HeatProducer("electric-heater"){{
+            requirements(Category.crafting, with(Items.tungsten, 30, Items.oxide, 30, Items.beryllium, 30));
+
+            researchCostMultiplier = 4f;
+
+            drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput());
+            rotateDraw = false;
+            size = 2;
+            heatOutput = 3f;
+            regionRotated1 = 1;
+            ambientSound = Sounds.hum;
+            itemCapacity = 0;
+            consumePower(100f / 60f);
+        }};
+
+        slagHeater = new HeatProducer("slag-heater"){{
+            requirements(Category.crafting, with(Items.tungsten, 50, Items.oxide, 20, Items.beryllium, 20));
+
+            researchCostMultiplier = 4f;
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.slag), new DrawDefault(), new DrawHeatOutput());
+            size = 3;
+            itemCapacity = 0;
+            liquidCapacity = 120f;
+            rotateDraw = false;
+            regionRotated1 = 1;
+            ambientSound = Sounds.hum;
+            consumeLiquid(Liquids.slag, 40f / 60f);
+            heatOutput = 8f;
+
+            researchCost = with(Items.tungsten, 1200, Items.oxide, 900, Items.beryllium, 2400);
+        }};
+
+        phaseHeater = new HeatProducer("phase-heater"){{
+            requirements(Category.crafting, with(Items.oxide, 30, Items.carbide, 30, Items.beryllium, 30));
+
+            drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput());
+            size = 2;
+            heatOutput = 15f;
+            craftTime = 60f * 8f;
+            ambientSound = Sounds.hum;
+            consumeItem(Items.phaseFabric);
+        }};
+
+        heatRedirector = new HeatConductor("heat-redirector"){{
+            requirements(Category.crafting, with(Items.tungsten, 10, Items.graphite, 10));
+
+            researchCostMultiplier = 10f;
+
+            group = BlockGroup.heat;
+            size = 3;
+            drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(), new DrawHeatInput("-heat"));
+            regionRotated1 = 1;
+        }};
+
+        smallHeatRedirector = new HeatConductor("small-heat-redirector"){{
+            requirements(Category.crafting, with(Items.surgeAlloy, 10, Items.graphite, 10));
+
+            researchCostMultiplier = 10f;
+
+            group = BlockGroup.heat;
+            size = 2;
+            drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(), new DrawHeatInput("-heat"));
+            regionRotated1 = 1;
+        }};
+
+        heatRouter = new HeatConductor("heat-router"){{
+            requirements(Category.crafting, with(Items.tungsten, 15, Items.graphite, 10));
+
+            researchCostMultiplier = 10f;
+
+            group = BlockGroup.heat;
+            size = 3;
+            drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(-1, false), new DrawHeatOutput(), new DrawHeatOutput(1, false), new DrawHeatInput("-heat"));
+            regionRotated1 = 1;
+            splitHeat = true;
+        }};
+
+        slagIncinerator = new ItemIncinerator("slag-incinerator"){{
+            requirements(Category.crafting, with(Items.tungsten, 15));
+            size = 1;
+            consumeLiquid(Liquids.slag, 0f);
+        }};
+
+        carbideCrucible = new HeatCrafter("carbide-crucible"){{
+            requirements(Category.crafting, with(Items.tungsten, 110, Items.thorium, 150, Items.oxide, 60));
+            craftEffect = Fx.none;
+            outputItem = new ItemStack(Items.carbide, 1);
+            craftTime = 60f * 2.25f;
+            size = 3;
+            itemCapacity = 20;
+            hasPower = hasItems = true;
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCrucibleFlame(), new DrawDefault(), new DrawHeatInput());
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.09f;
+
+            heatRequirement = 10f;
+
+            consumeItems(with(Items.tungsten, 2, Items.graphite, 3));
+            consumePower(2f);
+        }};
+
+        slagCentrifuge = new GenericCrafter("slag-centrifuge"){{
+            requirements(Category.crafting, BuildVisibility.debugOnly, with(Items.carbide, 70, Items.graphite, 60, Items.silicon, 40, Items.oxide, 40));
+
+            consumePower(2f / 60f);
+
+            size = 3;
+            consumeItem(Items.sand, 1);
+            consumeLiquid(Liquids.slag, 40f / 60f);
+            liquidCapacity = 80f;
+
+            var drawers = Seq.with(new DrawRegion("-bottom"), new DrawLiquidRegion(Liquids.slag){{ alpha = 0.7f; }});
+
+            for(int i = 0; i < 5; i++){
+                int fi = i;
+                drawers.add(new DrawGlowRegion(-1f){{
+                    glowIntensity = 0.3f;
+                    rotateSpeed = 3f / (1f + fi/1.4f);
+                    alpha = 0.4f;
+                    color = new Color(1f, 0.5f, 0.5f, 1f);
+                }});
+            }
+
+            drawer = new DrawMulti(drawers.add(new DrawDefault()));
+
+            craftTime = 60f * 2f;
+
+            outputLiquid = new LiquidStack(Liquids.gallium, 1f / 60f);
+            //TODO something else?
+            //outputItem = new ItemStack(Items.scrap, 1);
+        }};
+
+        surgeCrucible = new HeatCrafter("surge-crucible"){{
+            requirements(Category.crafting, with(Items.silicon, 100, Items.graphite, 80, Items.tungsten, 80, Items.oxide, 80));
+
+            size = 3;
+
+            itemCapacity = 20;
+            heatRequirement = 10f;
+            craftTime = 60f * 3f;
+            liquidCapacity = 80f * 5;
+
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.9f;
+
+            outputItem = new ItemStack(Items.surgeAlloy, 1);
+
+            craftEffect = new RadialEffect(Fx.surgeCruciSmoke, 4, 90f, 5f);
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCircles(){{
+                color = Color.valueOf("ffc073").a(0.24f);
+                strokeMax = 2.5f;
+                radius = 10f;
+                amount = 3;
+            }}, new DrawLiquidRegion(Liquids.slag), new DrawDefault(), new DrawHeatInput(),
+            new DrawHeatRegion(){{
+                color = Color.valueOf("ff6060ff");
+            }},
+            new DrawHeatRegion("-vents"){{
+                color.a = 1f;
+            }});
+
+            consumeItem(Items.silicon, 3);
+            consumeLiquid(Liquids.slag, 40f / 60f);
+            consumePower(2f);
+        }};
+
+        cyanogenSynthesizer = new HeatCrafter("cyanogen-synthesizer"){{
+            requirements(Category.crafting, with(Items.carbide, 50, Items.silicon, 80, Items.beryllium, 90));
+
+            heatRequirement = 5f;
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.cyanogen),
+            new DrawParticles(){{
+                color = Color.valueOf("89e8b6");
+                alpha = 0.5f;
+                particleSize = 3f;
+                particles = 10;
+                particleRad = 9f;
+                particleLife = 200f;
+                reverse = true;
+                particleSizeInterp = Interp.one;
+            }}, new DrawDefault(), new DrawHeatInput(), new DrawHeatRegion("-heat-top"));
+
+            size = 3;
+
+            ambientSound = Sounds.extractLoop;
+            ambientSoundVolume = 0.08f;
+
+            liquidCapacity = 80f;
+            outputLiquid = new LiquidStack(Liquids.cyanogen, 3f / 60f);
+
+            consumeLiquid(Liquids.arkycite, 40f / 60f);
+            consumeItem(Items.graphite);
+            consumePower(2f);
+        }};
+
+        phaseSynthesizer = new HeatCrafter("phase-synthesizer"){{
+            requirements(Category.crafting, with(Items.carbide, 90, Items.silicon, 100, Items.thorium, 100, Items.tungsten, 200));
+
+            size = 3;
+
+            itemCapacity = 40;
+            heatRequirement = 8f;
+            craftTime = 60f * 2f;
+            liquidCapacity = 10f * 4;
+
+            ambientSound = Sounds.techloop;
+            ambientSoundVolume = 0.04f;
+
+            outputItem = new ItemStack(Items.phaseFabric, 1);
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawSpikes(){{
+                color = Color.valueOf("ffd59e");
+                stroke = 1.5f;
+                layers = 2;
+                amount = 12;
+                rotateSpeed = 0.5f;
+                layerSpeed = -0.9f;
+            }}, new DrawMultiWeave(){{
+                glowColor = new Color(1f, 0.4f, 0.4f, 0.8f);
+            }}, new DrawDefault(), new DrawHeatInput(), new DrawHeatRegion("-vents"){{
+                color = new Color(1f, 0.4f, 0.3f, 1f);
+            }});
+
+            consumeItems(with(Items.thorium, 2, Items.sand, 6));
+            consumeLiquid(Liquids.ozone, 2f / 60f);
+            consumePower(8f);
+        }};
+
+        heatReactor = new HeatProducer("heat-reactor"){{
+            requirements(Category.crafting, BuildVisibility.debugOnly, with(Items.oxide, 70, Items.graphite, 20, Items.carbide, 10, Items.thorium, 80));
+            size = 3;
+            craftTime = 60f * 10f;
+
+            craftEffect = new RadialEffect(Fx.heatReactorSmoke, 4, 90f, 7f);
+
+            itemCapacity = 20;
+            outputItem = new ItemStack(Items.fissileMatter, 1);
+
+            consumeItem(Items.thorium, 3);
+            consumeLiquid(Liquids.nitrogen, 1f / 60f);
         }};
 
         //endregion
@@ -764,6 +1526,7 @@ public class Blocks implements ContentList{
         copperWall = new Wall("copper-wall"){{
             requirements(Category.defense, with(Items.copper, 6));
             health = 80 * wallHealthMultiplier;
+            researchCostMultiplier = 0.1f;
         }};
 
         copperWallLarge = new Wall("copper-wall-large"){{
@@ -785,17 +1548,19 @@ public class Blocks implements ContentList{
 
         plastaniumWall = new Wall("plastanium-wall"){{
             requirements(Category.defense, with(Items.plastanium, 5, Items.metaglass, 2));
-            health = 130 * wallHealthMultiplier;
+            health = 125 * wallHealthMultiplier;
             insulated = true;
             absorbLasers = true;
+            schematicPriority = 10;
         }};
 
         plastaniumWallLarge = new Wall("plastanium-wall-large"){{
             requirements(Category.defense, ItemStack.mult(plastaniumWall.requirements, 4));
-            health = 130 * wallHealthMultiplier * 4;
+            health = 125 * wallHealthMultiplier * 4;
             size = 2;
             insulated = true;
             absorbLasers = true;
+            schematicPriority = 10;
         }};
 
         thoriumWall = new Wall("thorium-wall"){{
@@ -851,39 +1616,129 @@ public class Blocks implements ContentList{
         }};
 
         scrapWall = new Wall("scrap-wall"){{
-            requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 6));
+            requirements(Category.defense, with(Items.scrap, 6));
             health = 60 * wallHealthMultiplier;
             variants = 5;
+            buildCostMultiplier = 4f;
         }};
 
         scrapWallLarge = new Wall("scrap-wall-large"){{
-            requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 4));
+            requirements(Category.defense, ItemStack.mult(scrapWall.requirements, 4));
             health = 60 * 4 * wallHealthMultiplier;
             size = 2;
             variants = 4;
+            buildCostMultiplier = 4f;
         }};
 
         scrapWallHuge = new Wall("scrap-wall-huge"){{
-            requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 9));
+            requirements(Category.defense, ItemStack.mult(scrapWall.requirements, 9));
             health = 60 * 9 * wallHealthMultiplier;
             size = 3;
             variants = 3;
+            buildCostMultiplier = 4f;
         }};
 
         scrapWallGigantic = new Wall("scrap-wall-gigantic"){{
-            requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 16));
+            requirements(Category.defense, ItemStack.mult(scrapWall.requirements, 16));
             health = 60 * 16 * wallHealthMultiplier;
             size = 4;
+            buildCostMultiplier = 4f;
         }};
 
         thruster = new Thruster("thruster"){{
+            requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 96));
             health = 55 * 16 * wallHealthMultiplier;
             size = 4;
         }};
 
+        berylliumWall = new Wall("beryllium-wall"){{
+            requirements(Category.defense, with(Items.beryllium, 6));
+            health = 130 * wallHealthMultiplier;
+            armor = 2f;
+            buildCostMultiplier = 8f;
+        }};
+
+        berylliumWallLarge = new Wall("beryllium-wall-large"){{
+            requirements(Category.defense, ItemStack.mult(berylliumWall.requirements, 4));
+            health = 130 * wallHealthMultiplier * 4;
+            armor = 2f;
+            buildCostMultiplier = 5f;
+            size = 2;
+        }};
+
+        tungstenWall = new Wall("tungsten-wall"){{
+            requirements(Category.defense, with(Items.tungsten, 6));
+            health = 180 * wallHealthMultiplier;
+            armor = 14f;
+            buildCostMultiplier = 8f;
+        }};
+
+        tungstenWallLarge = new Wall("tungsten-wall-large"){{
+            requirements(Category.defense, ItemStack.mult(tungstenWall.requirements, 4));
+            health = 180 * wallHealthMultiplier * 4;
+            armor = 14f;
+            buildCostMultiplier = 5f;
+            size = 2;
+        }};
+
+        blastDoor = new AutoDoor("blast-door"){{
+            requirements(Category.defense, with(Items.tungsten, 24, Items.silicon, 24));
+            health = 175 * wallHealthMultiplier * 4;
+            armor = 14f;
+            size = 2;
+        }};
+
+        reinforcedSurgeWall = new Wall("reinforced-surge-wall"){{
+            requirements(Category.defense, with(Items.surgeAlloy, 6, Items.tungsten, 2));
+            health = 250 * wallHealthMultiplier;
+            lightningChance = 0.05f;
+            lightningDamage = 30f;
+            armor = 20f;
+            researchCost = with(Items.surgeAlloy, 20, Items.tungsten, 100);
+        }};
+
+        reinforcedSurgeWallLarge = new Wall("reinforced-surge-wall-large"){{
+            requirements(Category.defense, ItemStack.mult(reinforcedSurgeWall.requirements, 4));
+            health = 250 * wallHealthMultiplier * 4;
+            lightningChance = 0.05f;
+            lightningDamage = 30f;
+            armor = 20f;
+            size = 2;
+            researchCost = with(Items.surgeAlloy, 40, Items.tungsten, 200);
+        }};
+
+        carbideWall = new Wall("carbide-wall"){{
+            requirements(Category.defense, with(Items.thorium, 6, Items.carbide, 6));
+            health = 270 * wallHealthMultiplier;
+            armor = 16f;
+        }};
+
+        carbideWallLarge = new Wall("carbide-wall-large"){{
+            requirements(Category.defense, ItemStack.mult(carbideWall.requirements, 4));
+            health = 270 * wallHealthMultiplier * 4;
+            armor = 16f;
+            size = 2;
+        }};
+
+        shieldedWall = new ShieldWall("shielded-wall"){{
+            requirements(Category.defense, ItemStack.with(Items.phaseFabric, 20, Items.surgeAlloy, 12, Items.beryllium, 12));
+            consumePower(3f / 60f);
+
+            outputsPower = false;
+            hasPower = true;
+            consumesPower = true;
+            conductivePower = true;
+
+            chanceDeflect = 8f;
+
+            health = 260 * wallHealthMultiplier * 4;
+            armor = 15f;
+            size = 2;
+        }};
+
         mender = new MendProjector("mender"){{
             requirements(Category.effect, with(Items.lead, 30, Items.copper, 25));
-            consumes.power(0.3f);
+            consumePower(0.3f);
             size = 1;
             reload = 200f;
             range = 40f;
@@ -891,37 +1746,37 @@ public class Blocks implements ContentList{
             phaseBoost = 4f;
             phaseRangeBoost = 20f;
             health = 80;
-            consumes.item(Items.silicon).boost();
+            consumeItem(Items.silicon).boost();
         }};
 
         mendProjector = new MendProjector("mend-projector"){{
-            requirements(Category.effect, with(Items.lead, 100, Items.titanium, 25, Items.silicon, 40));
-            consumes.power(1.5f);
+            requirements(Category.effect, with(Items.lead, 100, Items.titanium, 25, Items.silicon, 40, Items.copper, 50));
+            consumePower(1.5f);
             size = 2;
             reload = 250f;
             range = 85f;
             healPercent = 11f;
             phaseBoost = 15f;
-            health = 80 * size * size;
-            consumes.item(Items.phaseFabric).boost();
+            scaledHealth = 80;
+            consumeItem(Items.phaseFabric).boost();
         }};
 
         overdriveProjector = new OverdriveProjector("overdrive-projector"){{
             requirements(Category.effect, with(Items.lead, 100, Items.titanium, 75, Items.silicon, 75, Items.plastanium, 30));
-            consumes.power(3.50f);
+            consumePower(3.50f);
             size = 2;
-            consumes.item(Items.phaseFabric).boost();
+            consumeItem(Items.phaseFabric).boost();
         }};
 
         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);
+            consumePower(10f);
             size = 3;
             range = 200f;
             speedBoost = 2.5f;
             useTime = 300f;
             hasBoost = false;
-            consumes.items(with(Items.phaseFabric, 1, Items.silicon, 1));
+            consumeItems(with(Items.phaseFabric, 1, Items.silicon, 1));
         }};
 
         forceProjector = new ForceProjector("force-projector"){{
@@ -934,8 +1789,8 @@ public class Blocks implements ContentList{
             cooldownLiquid = 1.2f;
             cooldownBrokenBase = 0.35f;
 
-            consumes.item(Items.phaseFabric).boost();
-            consumes.power(4f);
+            itemConsumer = consumeItem(Items.phaseFabric).boost();
+            consumePower(4f);
         }};
 
         shockMine = new ShockMine("shock-mine"){{
@@ -948,15 +1803,106 @@ public class Blocks implements ContentList{
             tendrils = 4;
         }};
 
+        radar = new Radar("radar"){{
+            requirements(Category.effect, BuildVisibility.fogOnly, with(Items.silicon, 60, Items.graphite, 50, Items.beryllium, 10));
+            outlineColor = Color.valueOf("4a4b53");
+            fogRadius = 34;
+            researchCost = with(Items.silicon, 70, Items.graphite, 70);
+
+            consumePower(0.6f);
+        }};
+
+        buildTower = new BuildTurret("build-tower"){{
+            requirements(Category.effect, with(Items.silicon, 150, Items.oxide, 40, Items.thorium, 60));
+            outlineColor = Pal.darkOutline;
+
+            range = 200f;
+            size = 3;
+            buildSpeed = 1.5f;
+
+            consumePower(3f);
+            consumeLiquid(Liquids.nitrogen, 3f / 60f);
+        }};
+
+        regenProjector = new RegenProjector("regen-projector"){{
+            requirements(Category.effect, with(Items.silicon, 80, Items.tungsten, 60, Items.oxide, 40, Items.beryllium, 80));
+            size = 3;
+            range = 28;
+            baseColor = Pal.regen;
+
+            consumePower(1f);
+            consumeLiquid(Liquids.hydrogen, 1f / 60f);
+            consumeItem(Items.phaseFabric).boost();
+
+            healPercent = 4f / 60f;
+
+            Color col = Color.valueOf("8ca9e8");
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.hydrogen, 9f / 4f), new DrawDefault(), new DrawGlowRegion(){{
+                color = Color.sky;
+            }}, new DrawPulseShape(false){{
+                layer = Layer.effect;
+                color = col;
+            }}, new DrawShape(){{
+                layer = Layer.effect;
+                radius = 3.5f;
+                useWarmupRadius = true;
+                timeScl = 2f;
+                color = col;
+            }});
+        }};
+
+        //TODO implement
+        if(false)
+        barrierProjector = new DirectionalForceProjector("barrier-projector"){{
+            requirements(Category.effect, with(Items.surgeAlloy, 100, Items.silicon, 125));
+            size = 3;
+            width = 50f;
+            length = 36;
+            shieldHealth = 2000f;
+            cooldownNormal = 3f;
+            cooldownBrokenBase = 0.35f;
+
+            consumePower(4f);
+        }};
+
+        shockwaveTower = new ShockwaveTower("shockwave-tower"){{
+            requirements(Category.effect, with(Items.surgeAlloy, 50, Items.silicon, 150, Items.oxide, 30, Items.tungsten, 100));
+            size = 3;
+            consumeLiquids(LiquidStack.with(Liquids.cyanogen, 1.5f / 60f));
+            consumePower(100f / 60f);
+            range = 170f;
+            reload = 80f;
+        }};
+
+        //TODO 5x5??
+        shieldProjector = new BaseShield("shield-projector"){{
+            requirements(Category.effect, BuildVisibility.editorOnly, with());
+
+            size = 3;
+
+            consumePower(5f);
+        }};
+
+        largeShieldProjector = new BaseShield("large-shield-projector"){{
+            requirements(Category.effect, BuildVisibility.editorOnly, with());
+
+            size = 4;
+            radius = 400f;
+
+            consumePower(5f);
+        }};
+
         //endregion
         //region distribution
 
         conveyor = new Conveyor("conveyor"){{
-            requirements(Category.distribution, with(Items.copper, 1), true);
+            requirements(Category.distribution, with(Items.copper, 1));
             health = 45;
             speed = 0.03f;
             displayedSpeed = 4.2f;
             buildCostMultiplier = 2f;
+            researchCost = with(Items.copper, 5);
         }};
 
         titaniumConveyor = new Conveyor("titanium-conveyor"){{
@@ -968,20 +1914,20 @@ 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;
+            health = 90;
             speed = 4f / 60f;
             itemCapacity = 10;
         }};
 
         armoredConveyor = new ArmoredConveyor("armored-conveyor"){{
             requirements(Category.distribution, with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1));
-            health = 180;
+            health = 280;
             speed = 0.08f;
             displayedSpeed = 11f;
         }};
 
         junction = new Junction("junction"){{
-            requirements(Category.distribution, with(Items.copper, 2), true);
+            requirements(Category.distribution, with(Items.copper, 2));
             speed = 26;
             capacity = 6;
             health = 30;
@@ -989,18 +1935,24 @@ public class Blocks implements ContentList{
         }};
 
         itemBridge = new BufferedItemBridge("bridge-conveyor"){{
-            requirements(Category.distribution, with(Items.lead, 6, Items.copper, 6));
+            requirements(Category.distribution, with(Items.lead, 10, Items.copper, 10));
+            fadeIn = moveArrows = false;
             range = 4;
             speed = 74f;
+            arrowSpacing = 6f;
             bufferCapacity = 14;
+            buildCostMultiplier = 2f;
         }};
 
         phaseConveyor = new ItemBridge("phase-conveyor"){{
             requirements(Category.distribution, with(Items.phaseFabric, 5, Items.silicon, 7, Items.lead, 10, Items.graphite, 10));
             range = 12;
-            canOverdrive = false;
+            arrowPeriod = 0.9f;
+            arrowTimeScl = 2.75f;
             hasPower = true;
-            consumes.power(0.30f);
+            pulse = true;
+            envEnabled |= Env.space;
+            consumePower(0.30f);
         }};
 
         sorter = new Sorter("sorter"){{
@@ -1021,6 +1973,7 @@ public class Blocks implements ContentList{
 
         distributor = new Router("distributor"){{
             requirements(Category.distribution, with(Items.lead, 4, Items.copper, 4));
+            buildCostMultiplier = 3f;
             size = 2;
         }};
 
@@ -1039,19 +1992,127 @@ public class Blocks implements ContentList{
             requirements(Category.distribution, with(Items.titanium, 125, Items.silicon, 75, Items.lead, 125, Items.thorium, 50));
             size = 3;
             itemCapacity = 120;
-            reloadTime = 200f;
+            reload = 200f;
             range = 440f;
-            consumes.power(1.75f);
+            consumePower(1.75f);
         }};
 
-        payloadConveyor = new PayloadConveyor("payload-conveyor"){{
-            requirements(Category.distribution, with(Items.graphite, 10, Items.copper, 20));
-            canOverdrive = false;
+        //erekir transport blocks
+
+        duct = new Duct("duct"){{
+            requirements(Category.distribution, with(Items.beryllium, 1));
+            health = 90;
+            speed = 4f;
+            researchCost = with(Items.beryllium, 5);
         }};
 
-        payloadRouter = new PayloadRouter("payload-router"){{
-            requirements(Category.distribution, with(Items.graphite, 15, Items.copper, 20));
-            canOverdrive = false;
+        armoredDuct = new Duct("armored-duct"){{
+            requirements(Category.distribution, with(Items.beryllium, 2, Items.tungsten, 1));
+            health = 140;
+            speed = 4f;
+            armored = true;
+            researchCost = with(Items.beryllium, 300, Items.tungsten, 100);
+        }};
+
+        ductRouter = new DuctRouter("duct-router"){{
+            requirements(Category.distribution, with(Items.beryllium, 10));
+            health = 90;
+            speed = 4f;
+            regionRotated1 = 1;
+            solid = false;
+            researchCost = with(Items.beryllium, 30);
+        }};
+
+        overflowDuct = new OverflowDuct("overflow-duct"){{
+            requirements(Category.distribution, with(Items.graphite, 8, Items.beryllium, 8));
+            health = 90;
+            speed = 4f;
+            solid = false;
+            researchCostMultiplier = 1.5f;
+        }};
+
+        underflowDuct = new OverflowDuct("underflow-duct"){{
+            requirements(Category.distribution, with(Items.graphite, 8, Items.beryllium, 8));
+            health = 90;
+            speed = 4f;
+            solid = false;
+            researchCostMultiplier = 1.5f;
+            invert = true;
+        }};
+
+        ductBridge = new DuctBridge("duct-bridge"){{
+            requirements(Category.distribution, with(Items.beryllium, 20));
+            health = 90;
+            speed = 4f;
+            buildCostMultiplier = 2f;
+            researchCostMultiplier = 0.3f;
+        }};
+
+        ductUnloader = new DirectionalUnloader("duct-unloader"){{
+            requirements(Category.distribution, with(Items.graphite, 20, Items.silicon, 20, Items.tungsten, 10));
+            health = 120;
+            speed = 4f;
+            solid = false;
+            underBullets = true;
+            regionRotated1 = 1;
+        }};
+
+        surgeConveyor = new StackConveyor("surge-conveyor"){{
+            requirements(Category.distribution, with(Items.surgeAlloy, 1, Items.tungsten, 1));
+            health = 130;
+            //TODO different base speed/item capacity?
+            speed = 5f / 60f;
+            itemCapacity = 10;
+
+            outputRouter = false;
+            hasPower = true;
+            consumesPower = true;
+            conductivePower = true;
+
+            underBullets = true;
+            baseEfficiency = 1f;
+            consumePower(1f / 60f);
+            researchCost = with(Items.surgeAlloy, 30, Items.tungsten, 80);
+        }};
+
+        surgeRouter = new StackRouter("surge-router"){{
+            requirements(Category.distribution, with(Items.surgeAlloy, 5, Items.tungsten, 1));
+            health = 130;
+
+            speed = 6f;
+
+            hasPower = true;
+            consumesPower = true;
+            conductivePower = true;
+            baseEfficiency = 1f;
+            underBullets = true;
+            solid = false;
+            consumePower(3f / 60f);
+        }};
+
+        unitCargoLoader = new UnitCargoLoader("unit-cargo-loader"){{
+            requirements(Category.distribution, with(Items.silicon, 80, Items.surgeAlloy, 50, Items.oxide, 20));
+
+            size = 3;
+            buildTime = 60f * 8f;
+
+            consumePower(8f / 60f);
+
+            //intentionally set absurdly high to make this block not overpowered
+            consumeLiquid(Liquids.nitrogen, 10f / 60f);
+
+            itemCapacity = 200;
+            researchCost = with(Items.silicon, 2500, Items.surgeAlloy, 20, Items.oxide, 30);
+        }};
+
+        unitCargoUnloadPoint = new UnitCargoUnloadPoint("unit-cargo-unload-point"){{
+            requirements(Category.distribution, with(Items.silicon, 60, Items.tungsten, 60));
+
+            size = 2;
+
+            itemCapacity = 100;
+
+            researchCost = with(Items.silicon, 3000, Items.oxide, 20);
         }};
 
         //endregion
@@ -1059,90 +2120,184 @@ public class Blocks implements ContentList{
 
         mechanicalPump = new Pump("mechanical-pump"){{
             requirements(Category.liquid, with(Items.copper, 15, Items.metaglass, 10));
-            pumpAmount = 0.11f;
+            pumpAmount = 7f / 60f;
+            liquidCapacity = 20f;
         }};
 
         rotaryPump = new Pump("rotary-pump"){{
             requirements(Category.liquid, with(Items.copper, 70, Items.metaglass, 50, Items.silicon, 20, Items.titanium, 35));
             pumpAmount = 0.2f;
-            consumes.power(0.3f);
-            liquidCapacity = 30f;
+            consumePower(0.3f);
+            liquidCapacity = 80f;
             hasPower = true;
             size = 2;
         }};
 
-        thermalPump = new Pump("thermal-pump"){{
+        impulsePump = new Pump("impulse-pump"){{
             requirements(Category.liquid, with(Items.copper, 80, Items.metaglass, 90, Items.silicon, 30, Items.titanium, 40, Items.thorium, 35));
             pumpAmount = 0.22f;
-            consumes.power(1.3f);
-            liquidCapacity = 40f;
+            consumePower(1.3f);
+            liquidCapacity = 200f;
             hasPower = true;
             size = 3;
         }};
 
         conduit = new Conduit("conduit"){{
             requirements(Category.liquid, with(Items.metaglass, 1));
+            liquidCapacity = 20f;
             health = 45;
         }};
 
         pulseConduit = new Conduit("pulse-conduit"){{
             requirements(Category.liquid, with(Items.titanium, 2, Items.metaglass, 1));
-            liquidCapacity = 16f;
+            liquidCapacity = 40f;
             liquidPressure = 1.025f;
             health = 90;
         }};
 
         platedConduit = new ArmoredConduit("plated-conduit"){{
             requirements(Category.liquid, with(Items.thorium, 2, Items.metaglass, 1, Items.plastanium, 1));
-            liquidCapacity = 16f;
+            liquidCapacity = 50f;
             liquidPressure = 1.025f;
             health = 220;
         }};
 
         liquidRouter = new LiquidRouter("liquid-router"){{
             requirements(Category.liquid, with(Items.graphite, 4, Items.metaglass, 2));
-            liquidCapacity = 20f;
+            liquidCapacity = 120f;
+            underBullets = true;
+            solid = false;
+        }};
+
+        liquidContainer = new LiquidRouter("liquid-container"){{
+            requirements(Category.liquid, with(Items.titanium, 10, Items.metaglass, 15));
+            liquidCapacity = 700f;
+            size = 2;
+            solid = true;
         }};
 
         liquidTank = new LiquidRouter("liquid-tank"){{
-            requirements(Category.liquid, with(Items.titanium, 25, Items.metaglass, 25));
+            requirements(Category.liquid, with(Items.titanium, 30, Items.metaglass, 40));
             size = 3;
-            liquidCapacity = 1500f;
+            solid = true;
+            liquidCapacity = 1800f;
             health = 500;
         }};
 
         liquidJunction = new LiquidJunction("liquid-junction"){{
-            requirements(Category.liquid, with(Items.graphite, 2, Items.metaglass, 2));
+            requirements(Category.liquid, with(Items.graphite, 4, Items.metaglass, 8));
+            solid = false;
         }};
 
-        bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{
+        bridgeConduit = new LiquidBridge("bridge-conduit"){{
             requirements(Category.liquid, with(Items.graphite, 4, Items.metaglass, 8));
+            fadeIn = moveArrows = false;
+            arrowSpacing = 6f;
             range = 4;
             hasPower = false;
+            liquidCapacity = 100f;
         }};
 
         phaseConduit = new LiquidBridge("phase-conduit"){{
             requirements(Category.liquid, with(Items.phaseFabric, 5, Items.silicon, 7, Items.metaglass, 20, Items.titanium, 10));
             range = 12;
+            arrowPeriod = 0.9f;
+            arrowTimeScl = 2.75f;
             hasPower = true;
             canOverdrive = false;
-            consumes.power(0.30f);
+            pulse = true;
+            liquidCapacity = 100f;
+            consumePower(0.30f);
+        }};
+
+        //reinforced stuff
+
+        reinforcedPump = new Pump("reinforced-pump"){{
+            requirements(Category.liquid, with(Items.beryllium, 40, Items.tungsten, 30, Items.silicon, 20));
+            consumeLiquid(Liquids.hydrogen, 1.5f / 60f);
+
+            pumpAmount = 80f / 60f / 4f;
+            liquidCapacity = 160f;
+            size = 2;
+        }};
+
+        reinforcedConduit = new ArmoredConduit("reinforced-conduit"){{
+            requirements(Category.liquid, with(Items.beryllium, 2));
+            botColor = Pal.darkestMetal;
+            leaks = true;
+            liquidCapacity = 50f;
+            liquidPressure = 1.03f;
+            health = 250;
+            researchCostMultiplier = 3;
+            underBullets = true;
+        }};
+
+        reinforcedLiquidJunction = new LiquidJunction("reinforced-liquid-junction"){{
+            requirements(Category.liquid, with(Items.graphite, 4, Items.beryllium, 8));
+            buildCostMultiplier = 3f;
+            health = 250;
+            ((Conduit)reinforcedConduit).junctionReplacement = this;
+            researchCostMultiplier = 1;
+            solid = false;
+            underBullets = true;
+        }};
+
+        reinforcedBridgeConduit = new DirectionLiquidBridge("reinforced-bridge-conduit"){{
+            requirements(Category.liquid, with(Items.graphite, 8, Items.beryllium, 20));
+            range = 4;
+            hasPower = false;
+            liquidCapacity = 120f;
+            researchCostMultiplier = 1;
+            underBullets = true;
+            health = 250;
+
+            ((Conduit)reinforcedConduit).rotBridgeReplacement = this;
+        }};
+
+        reinforcedLiquidRouter = new LiquidRouter("reinforced-liquid-router"){{
+            requirements(Category.liquid, with(Items.graphite, 8, Items.beryllium, 4));
+            liquidCapacity = 150f;
+            liquidPadding = 3f/4f;
+            researchCostMultiplier = 3;
+            underBullets = true;
+            solid = false;
+            health = 250;
+        }};
+
+        reinforcedLiquidContainer = new LiquidRouter("reinforced-liquid-container"){{
+            requirements(Category.liquid, with(Items.tungsten, 10, Items.beryllium, 16));
+            liquidCapacity = 1000f;
+            size = 2;
+            liquidPadding = 6f/4f;
+            researchCostMultiplier = 4;
+            solid = true;
+            health = 400;
+        }};
+
+        reinforcedLiquidTank = new LiquidRouter("reinforced-liquid-tank"){{
+            requirements(Category.liquid, with(Items.tungsten, 40, Items.beryllium, 50));
+            size = 3;
+            solid = true;
+            liquidCapacity = 2700f;
+            liquidPadding = 2f;
+            health = 900;
         }};
 
         //endregion
         //region power
 
         powerNode = new PowerNode("power-node"){{
-            requirements(Category.power, with(Items.copper, 1, Items.lead, 3));
+            requirements(Category.power, with(Items.copper, 2, Items.lead, 6));
             maxNodes = 10;
             laserRange = 6;
+            buildCostMultiplier = 2.5f;
         }};
 
         powerNodeLarge = new PowerNode("power-node-large"){{
             requirements(Category.power, with(Items.titanium, 5, Items.lead, 10, Items.silicon, 3));
             size = 2;
             maxNodes = 15;
-            laserRange = 9.5f;
+            laserRange = 15f;
         }};
 
         surgeTower = new PowerNode("surge-tower"){{
@@ -1150,6 +2305,7 @@ public class Blocks implements ContentList{
             size = 2;
             maxNodes = 2;
             laserRange = 40f;
+            schematicPriority = -15;
         }};
 
         diode = new PowerDiode("diode"){{
@@ -1158,47 +2314,74 @@ public class Blocks implements ContentList{
 
         battery = new Battery("battery"){{
             requirements(Category.power, with(Items.copper, 5, Items.lead, 20));
-            consumes.powerBuffered(4000f);
+            consumePowerBuffered(4000f);
+            baseExplosiveness = 1f;
         }};
 
         batteryLarge = new Battery("battery-large"){{
-            requirements(Category.power, with(Items.titanium, 20, Items.lead, 40, Items.silicon, 20));
+            requirements(Category.power, with(Items.titanium, 20, Items.lead, 50, Items.silicon, 30));
             size = 3;
-            consumes.powerBuffered(50000f);
+            consumePowerBuffered(50000f);
+            baseExplosiveness = 5f;
         }};
 
-        combustionGenerator = new BurnerGenerator("combustion-generator"){{
+        combustionGenerator = new ConsumeGenerator("combustion-generator"){{
             requirements(Category.power, with(Items.copper, 25, Items.lead, 15));
             powerProduction = 1f;
             itemDuration = 120f;
 
             ambientSound = Sounds.smelter;
             ambientSoundVolume = 0.03f;
+            generateEffect = Fx.generatespark;
+
+            consume(new ConsumeItemFlammable());
+            consume(new ConsumeItemExplode());
+
+            drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion());
         }};
 
         thermalGenerator = new ThermalGenerator("thermal-generator"){{
             requirements(Category.power, with(Items.copper, 40, Items.graphite, 35, Items.lead, 50, Items.silicon, 35, Items.metaglass, 40));
             powerProduction = 1.8f;
             generateEffect = Fx.redgeneratespark;
+            effectChance = 0.011f;
             size = 2;
             floating = true;
             ambientSound = Sounds.hum;
             ambientSoundVolume = 0.06f;
         }};
 
-        steamGenerator = new BurnerGenerator("steam-generator"){{
+        steamGenerator = new ConsumeGenerator("steam-generator"){{
             requirements(Category.power, with(Items.copper, 35, Items.graphite, 25, Items.lead, 40, Items.silicon, 30));
             powerProduction = 5.5f;
             itemDuration = 90f;
-            consumes.liquid(Liquids.water, 0.1f);
+            consumeLiquid(Liquids.water, 0.1f);
             hasLiquids = true;
             size = 2;
+            generateEffect = Fx.generatespark;
 
             ambientSound = Sounds.smelter;
             ambientSoundVolume = 0.06f;
+
+            consume(new ConsumeItemFlammable());
+            consume(new ConsumeItemExplode());
+
+            drawer = new DrawMulti(
+            new DrawDefault(),
+            new DrawWarmupRegion(),
+            new DrawRegion("-turbine"){{
+                rotateSpeed = 2f;
+            }},
+            new DrawRegion("-turbine"){{
+                rotateSpeed = -2f;
+                rotation = 45f;
+            }},
+            new DrawRegion("-cap"),
+            new DrawLiquidRegion()
+            );
         }};
 
-        differentialGenerator = new SingleTypeGenerator("differential-generator"){{
+        differentialGenerator = new ConsumeGenerator("differential-generator"){{
             requirements(Category.power, with(Items.copper, 70, Items.titanium, 50, Items.lead, 100, Items.silicon, 65, Items.metaglass, 50));
             powerProduction = 18f;
             itemDuration = 220f;
@@ -1206,28 +2389,37 @@ public class Blocks implements ContentList{
             hasItems = true;
             size = 3;
             ambientSound = Sounds.steam;
+            generateEffect = Fx.generatespark;
             ambientSoundVolume = 0.03f;
 
-            consumes.item(Items.pyratite).optional(true, false);
-            consumes.liquid(Liquids.cryofluid, 0.1f);
+            drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion(), new DrawLiquidRegion());
+
+            consumeItem(Items.pyratite);
+            consumeLiquid(Liquids.cryofluid, 0.1f);
         }};
 
-        rtgGenerator = new DecayGenerator("rtg-generator"){{
+        rtgGenerator = new ConsumeGenerator("rtg-generator"){{
             requirements(Category.power, with(Items.lead, 100, Items.silicon, 75, Items.phaseFabric, 25, Items.plastanium, 75, Items.thorium, 50));
             size = 2;
             powerProduction = 4.5f;
             itemDuration = 60 * 14f;
+            envEnabled = Env.any;
+            generateEffect = Fx.generatespark;
+
+            itemDurationMultipliers.put(Items.phaseFabric, 210f / 14f);
+            drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion());
+            consume(new ConsumeItemRadioactive());
         }};
 
         solarPanel = new SolarGenerator("solar-panel"){{
-            requirements(Category.power, with(Items.lead, 10, Items.silicon, 15));
-            powerProduction = 0.1f;
+            requirements(Category.power, with(Items.lead, 10, Items.silicon, 8));
+            powerProduction = 0.12f;
         }};
 
         largeSolarPanel = new SolarGenerator("solar-panel-large"){{
-            requirements(Category.power, with(Items.lead, 80, Items.silicon, 110, Items.phaseFabric, 15));
+            requirements(Category.power, with(Items.lead, 60, Items.silicon, 70, Items.phaseFabric, 15));
             size = 3;
-            powerProduction = 1.3f;
+            powerProduction = 1.6f;
         }};
 
         thoriumReactor = new NuclearReactor("thorium-reactor"){{
@@ -1238,9 +2430,10 @@ public class Blocks implements ContentList{
             health = 700;
             itemDuration = 360f;
             powerProduction = 15f;
-            consumes.item(Items.thorium);
             heating = 0.02f;
-            consumes.liquid(Liquids.cryofluid, heating / coolantPower).update(false);
+
+            consumeItem(Items.thorium);
+            consumeLiquid(Liquids.cryofluid, heating / coolantPower).update(false);
         }};
 
         impactReactor = new ImpactReactor("impact-reactor"){{
@@ -1251,22 +2444,239 @@ public class Blocks implements ContentList{
             itemDuration = 140f;
             ambientSound = Sounds.pulse;
             ambientSoundVolume = 0.07f;
+            liquidCapacity = 80f;
 
-            consumes.power(25f);
-            consumes.item(Items.blastCompound);
-            consumes.liquid(Liquids.cryofluid, 0.25f);
+            consumePower(25f);
+            consumeItem(Items.blastCompound);
+            consumeLiquid(Liquids.cryofluid, 0.25f);
+        }};
+
+        //erekir
+
+        beamNode = new BeamNode("beam-node"){{
+            requirements(Category.power, with(Items.beryllium, 10));
+            consumesPower = outputsPower = true;
+            health = 90;
+            range = 10;
+            fogRadius = 1;
+            researchCost = with(Items.beryllium, 5);
+            buildCostMultiplier = 2f;
+
+            consumePowerBuffered(1000f);
+        }};
+
+        beamTower = new BeamNode("beam-tower"){{
+            requirements(Category.power, with(Items.beryllium, 30, Items.oxide, 10, Items.silicon, 10));
+            size = 3;
+            consumesPower = outputsPower = true;
+            range = 23;
+            scaledHealth = 90;
+            fogRadius = 2;
+
+            consumePowerBuffered(40000f);
+        }};
+
+        beamLink = new LongPowerNode("beam-link"){{
+            requirements(Category.power, BuildVisibility.editorOnly, with());
+            size = 3;
+            maxNodes = 1;
+            laserRange = 1000f;
+            autolink = false;
+            laserColor2 = Color.valueOf("ffd9c2");
+            laserScale = 0.8f;
+            scaledHealth = 130;
+        }};
+
+        turbineCondenser = new ThermalGenerator("turbine-condenser"){{
+            requirements(Category.power, with(Items.beryllium, 60));
+            attribute = Attribute.steam;
+            group = BlockGroup.liquids;
+            displayEfficiencyScale = 1f / 9f;
+            minEfficiency = 9f - 0.0001f;
+            powerProduction = 3f / 9f;
+            displayEfficiency = false;
+            generateEffect = Fx.turbinegenerate;
+            effectChance = 0.04f;
+            size = 3;
+            ambientSound = Sounds.hum;
+            ambientSoundVolume = 0.06f;
+
+            drawer = new DrawMulti(new DrawDefault(), new DrawBlurSpin("-rotator", 0.6f * 9f){{
+                blurThresh = 0.01f;
+            }});
+
+            hasLiquids = true;
+            outputLiquid = new LiquidStack(Liquids.water, 5f / 60f / 9f);
+            liquidCapacity = 20f;
+            fogRadius = 3;
+            researchCost = with(Items.beryllium, 15);
+        }};
+
+        chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{
+            requirements(Category.power, with(Items.graphite, 40, Items.tungsten, 40, Items.oxide, 40f, Items.silicon, 30));
+            powerProduction = 10f;
+            researchCost = with(Items.graphite, 2000, Items.tungsten, 1000, Items.oxide, 10, Items.silicon, 1500);
+            consumeLiquids(LiquidStack.with(Liquids.ozone, 2f / 60f, Liquids.arkycite, 40f / 60f));
+            size = 3;
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{
+                sinMag = 3f;
+                sinScl = 5f;
+            }}, new DrawRegion("-mid"), new DrawLiquidTile(Liquids.arkycite, 37f / 4f), new DrawDefault(), new DrawGlowRegion(){{
+                alpha = 1f;
+                glowScale = 5f;
+                color = Color.valueOf("c967b099");
+            }});
+            generateEffect = Fx.none;
+
+            liquidCapacity = 20f * 5;
+
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.06f;
+        }};
+
+        pyrolysisGenerator = new ConsumeGenerator("pyrolysis-generator"){{
+            requirements(Category.power, with(Items.graphite, 50, Items.carbide, 50, Items.oxide, 60f, Items.silicon, 50));
+            powerProduction = 25f;
+
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{
+                sinMag = 2.75f;
+                sinScl = 5f;
+                sides = 8;
+                sideOffset = Mathf.PI / 2f;
+            }}, new DrawRegion("-mid"), new DrawLiquidTile(Liquids.arkycite, 38f / 4f), new DrawDefault(), new DrawGlowRegion(){{
+                alpha = 1f;
+                glowScale = 5f;
+                color = Pal.slagOrange;
+            }});
+
+            consumeLiquids(LiquidStack.with(Liquids.slag, 20f / 60f, Liquids.arkycite, 40f / 60f));
+            size = 3;
+
+            liquidCapacity = 30f * 5;
+
+            outputLiquid = new LiquidStack(Liquids.water, 20f / 60f);
+
+            generateEffect = Fx.none;
+
+            ambientSound = Sounds.smelter;
+            ambientSoundVolume = 0.06f;
+
+            researchCostMultiplier = 0.4f;
+        }};
+
+        fluxReactor = new VariableReactor("flux-reactor"){{
+            requirements(Category.power, with(Items.graphite, 300, Items.carbide, 200, Items.oxide, 100, Items.silicon, 600, Items.surgeAlloy, 300));
+            powerProduction = 240f;
+            maxHeat = 150f;
+
+            consumeLiquid(Liquids.cyanogen, 9f / 60f);
+            liquidCapacity = 30f;
+            explosionMinWarmup = 0.5f;
+
+            explosionRadius = 17;
+            explosionDamage = 2500;
+
+            ambientSound = Sounds.flux;
+            ambientSoundVolume = 0.13f;
+
+            size = 5;
+
+            drawer = new DrawMulti(
+            new DrawRegion("-bottom"),
+            new DrawLiquidTile(Liquids.cyanogen),
+            new DrawRegion("-mid"),
+            new DrawSoftParticles(){{
+                alpha = 0.35f;
+                particleRad = 12f;
+                particleSize = 9f;
+                particleLife = 120f;
+                particles = 27;
+            }},
+            new DrawDefault(),
+            new DrawHeatInput(),
+            new DrawGlowRegion("-ventglow"){{
+                color = Color.valueOf("32603a");
+            }}
+            );
+        }};
+
+        neoplasiaReactor = new HeaterGenerator("neoplasia-reactor"){{
+            requirements(Category.power, with(Items.tungsten, 1000, Items.carbide, 300, Items.oxide, 150, Items.silicon, 500, Items.phaseFabric, 300, Items.surgeAlloy, 200));
+
+            size = 5;
+            liquidCapacity = 80f;
+            outputLiquid = new LiquidStack(Liquids.neoplasm, 20f / 60f);
+            explodeOnFull = true;
+
+            heatOutput = 60f;
+
+            consumeLiquid(Liquids.arkycite, 80f / 60f);
+            consumeLiquid(Liquids.water, 10f / 60f);
+            consumeItem(Items.phaseFabric);
+
+            itemDuration = 60f * 3f;
+            itemCapacity = 10;
+
+            explosionRadius = 9;
+            explosionDamage = 2000;
+            explodeEffect = new MultiEffect(Fx.bigShockwave, new WrapEffect(Fx.titanSmoke, Liquids.neoplasm.color), Fx.neoplasmSplat);
+            explodeSound = Sounds.largeExplosion;
+
+            powerProduction = 140f;
+
+            ambientSound = Sounds.bioLoop;
+            ambientSoundVolume = 0.2f;
+
+            explosionPuddles = 80;
+            explosionPuddleRange = tilesize * 7f;
+            explosionPuddleLiquid = Liquids.neoplasm;
+            explosionPuddleAmount = 200f;
+            explosionMinWarmup = 0.5f;
+
+            consumeEffect = new RadialEffect(Fx.neoplasiaSmoke, 4, 90f, 54f / 4f);
+
+            drawer = new DrawMulti(
+            new DrawRegion("-bottom"),
+            new DrawLiquidTile(Liquids.arkycite, 3f),
+            new DrawCircles(){{
+                color = Color.valueOf("feb380").a(0.8f);
+                strokeMax = 3.25f;
+                radius = 65f / 4f;
+                amount = 5;
+                timeScl = 200f;
+            }},
+
+            new DrawRegion("-center"),
+
+            new DrawCells(){{
+                color = Color.valueOf("c33e2b");
+                particleColorFrom = Color.valueOf("e8803f");
+                particleColorTo = Color.valueOf("8c1225");
+                particles = 50;
+                range = 4f;
+            }},
+            new DrawDefault(),
+            new DrawHeatOutput(),
+            new DrawGlowRegion("-glow"){{
+                color = Color.valueOf("70170b");
+                alpha = 0.7f;
+            }}
+            );
         }};
 
         //endregion power
         //region production
 
         mechanicalDrill = new Drill("mechanical-drill"){{
-            requirements(Category.production, with(Items.copper, 12), true);
+            requirements(Category.production, with(Items.copper, 12));
             tier = 2;
             drillTime = 600;
             size = 2;
+            //mechanical drill doesn't work in space
+            envEnabled ^= Env.space;
+            researchCost = with(Items.copper, 10);
 
-            consumes.liquid(Liquids.water, 0.05f).boost();
+            consumeLiquid(Liquids.water, 0.05f).boost();
         }};
 
         pneumaticDrill = new Drill("pneumatic-drill"){{
@@ -1275,7 +2685,7 @@ public class Blocks implements ContentList{
             drillTime = 400;
             size = 2;
 
-            consumes.liquid(Liquids.water, 0.06f).boost();
+            consumeLiquid(Liquids.water, 0.06f).boost();
         }};
 
         laserDrill = new Drill("laser-drill"){{
@@ -1287,8 +2697,8 @@ public class Blocks implements ContentList{
             updateEffect = Fx.pulverizeMedium;
             drillEffect = Fx.mineBig;
 
-            consumes.power(1.10f);
-            consumes.liquid(Liquids.water, 0.08f).boost();
+            consumePower(1.10f);
+            consumeLiquid(Liquids.water, 0.08f).boost();
         }};
 
         blastDrill = new Drill("blast-drill"){{
@@ -1303,68 +2713,224 @@ public class Blocks implements ContentList{
             drillEffect = Fx.mineHuge;
             rotateSpeed = 6f;
             warmupSpeed = 0.01f;
+            itemCapacity = 20;
 
             //more than the laser drill
             liquidBoostIntensity = 1.8f;
 
-            consumes.power(3f);
-            consumes.liquid(Liquids.water, 0.1f).boost();
+            consumePower(3f);
+            consumeLiquid(Liquids.water, 0.1f).boost();
         }};
 
         waterExtractor = new SolidPump("water-extractor"){{
-            requirements(Category.production, with(Items.copper, 25, Items.graphite, 25, Items.lead, 20));
+            requirements(Category.production, with(Items.metaglass, 30, Items.graphite, 30, Items.lead, 30, Items.copper, 30));
             result = Liquids.water;
             pumpAmount = 0.11f;
             size = 2;
-            liquidCapacity = 30f;
+            liquidCapacity = 40f;
             rotateSpeed = 1.4f;
             attribute = Attribute.water;
+            envRequired |= Env.groundWater;
 
-            consumes.power(1.5f);
+            consumePower(1.5f);
         }};
 
-        cultivator = new Cultivator("cultivator"){{
+        cultivator = new AttributeCrafter("cultivator"){{
             requirements(Category.production, with(Items.copper, 25, Items.lead, 25, Items.silicon, 10));
             outputItem = new ItemStack(Items.sporePod, 1);
-            craftTime = 140;
+            craftTime = 100;
             size = 2;
             hasLiquids = true;
             hasPower = true;
             hasItems = true;
+            liquidCapacity = 80f;
 
-            consumes.power(0.9f);
-            consumes.liquid(Liquids.water, 0.2f);
+            craftEffect = Fx.none;
+            envRequired |= Env.spores;
+            attribute = Attribute.spores;
+
+            legacyReadWarmup = true;
+            drawer = new DrawMulti(
+            new DrawRegion("-bottom"),
+            new DrawLiquidTile(Liquids.water),
+            new DrawDefault(),
+            new DrawCultivator(),
+            new DrawRegion("-top")
+            );
+            maxBoost = 2f;
+
+            consumePower(80f / 60f);
+            consumeLiquid(Liquids.water, 18f / 60f);
         }};
 
         oilExtractor = new Fracker("oil-extractor"){{
             requirements(Category.production, with(Items.copper, 150, Items.graphite, 175, Items.lead, 115, Items.thorium, 115, Items.silicon, 75));
             result = Liquids.oil;
             updateEffect = Fx.pulverize;
-            liquidCapacity = 50f;
             updateEffectChance = 0.05f;
             pumpAmount = 0.25f;
             size = 3;
-            liquidCapacity = 30f;
+            liquidCapacity = 40f;
             attribute = Attribute.oil;
             baseEfficiency = 0f;
             itemUseTime = 60f;
 
-            consumes.item(Items.sand);
-            consumes.power(3f);
-            consumes.liquid(Liquids.water, 0.15f);
+            consumeItem(Items.sand);
+            consumePower(3f);
+            consumeLiquid(Liquids.water, 0.15f);
+        }};
+
+        ventCondenser = new AttributeCrafter("vent-condenser"){{
+            requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 60));
+            attribute = Attribute.steam;
+            group = BlockGroup.liquids;
+            minEfficiency = 9f - 0.0001f;
+            baseEfficiency = 0f;
+            displayEfficiency = false;
+            craftEffect = Fx.turbinegenerate;
+            drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawBlurSpin("-rotator", 6f), new DrawRegion("-mid"), new DrawLiquidTile(Liquids.water, 38f / 4f), new DrawDefault());
+            craftTime = 120f;
+            size = 3;
+            ambientSound = Sounds.hum;
+            ambientSoundVolume = 0.06f;
+            hasLiquids = true;
+            boostScale = 1f / 9f;
+            itemCapacity = 0;
+            outputLiquid = new LiquidStack(Liquids.water, 30f / 60f);
+            consumePower(0.5f);
+            liquidCapacity = 60f;
+        }};
+
+        cliffCrusher = new WallCrafter("cliff-crusher"){{
+            requirements(Category.production, with(Items.graphite, 25, Items.beryllium, 20));
+            consumePower(11 / 60f);
+
+            drillTime = 110f;
+            size = 2;
+            attribute = Attribute.sand;
+            output = Items.sand;
+            fogRadius = 2;
+            researchCost = with(Items.beryllium, 100, Items.graphite, 40);
+            ambientSound = Sounds.drill;
+            ambientSoundVolume = 0.04f;
+        }};
+
+        largeCliffCrusher = new WallCrafter("large-cliff-crusher"){{
+            requirements(Category.production, with(Items.silicon, 80, Items.surgeAlloy, 15, Items.beryllium, 100, Items.tungsten, 50));
+            consumePower(30 / 60f);
+
+            drillTime = 48f;
+            size = 3;
+            attribute = Attribute.sand;
+            output = Items.sand;
+            fogRadius = 3;
+            ambientSound = Sounds.drill;
+            ambientSoundVolume = 0.08f;
+
+            consumeLiquid(Liquids.ozone, 1f / 60f);
+
+            itemConsumer = consumeItem(Items.tungsten).boost();
+            itemCapacity = 20;
+            boostItemUseTime = 60f * 10f;
+
+            //alternatively, boost using nitrogen:
+            //consumeLiquid(Liquids.nitrogen, 3f / 60f).boost();
+        }};
+
+        plasmaBore = new BeamDrill("plasma-bore"){{
+            requirements(Category.production, with(Items.beryllium, 40));
+            consumePower(0.15f);
+
+            drillTime = 160f;
+            tier = 3;
+            size = 2;
+            range = 5;
+            fogRadius = 3;
+            researchCost = with(Items.beryllium, 10);
+
+            consumeLiquid(Liquids.hydrogen, 0.25f / 60f).boost();
+        }};
+
+        largePlasmaBore = new BeamDrill("large-plasma-bore"){{
+            requirements(Category.production, with(Items.silicon, 100, Items.oxide, 25, Items.beryllium, 100, Items.tungsten, 70));
+            consumePower(0.8f);
+            drillTime = 100f;
+
+            tier = 5;
+            size = 3;
+            range = 6;
+            fogRadius = 4;
+            laserWidth = 0.7f;
+            itemCapacity = 20;
+
+            consumeLiquid(Liquids.hydrogen, 0.5f / 60f);
+            consumeLiquid(Liquids.nitrogen, 3f / 60f).boost();
+
+            researchCost = with(Items.silicon, 1500, Items.oxide, 200, Items.beryllium, 3000, Items.tungsten, 1200);
+        }};
+
+        impactDrill = new BurstDrill("impact-drill"){{
+            requirements(Category.production, with(Items.silicon, 70, Items.beryllium, 90, Items.graphite, 60));
+            drillTime = 60f * 12f;
+            size = 4;
+            hasPower = true;
+            tier = 6;
+            drillEffect = new MultiEffect(Fx.mineImpact, Fx.drillSteam, Fx.mineImpactWave.wrap(Pal.redLight, 40f));
+            shake = 4f;
+            itemCapacity = 40;
+            //can't mine thorium for balance reasons, needs better drill
+            blockedItem = Items.thorium;
+            researchCostMultiplier = 0.5f;
+
+            drillMultipliers.put(Items.beryllium, 2.5f);
+
+            fogRadius = 4;
+
+            consumePower(160f / 60f);
+            consumeLiquid(Liquids.water, 10f/60f);
+        }};
+
+        eruptionDrill = new BurstDrill("eruption-drill"){{
+            requirements(Category.production, with(Items.silicon, 200, Items.oxide, 20, Items.tungsten, 200, Items.thorium, 120));
+            drillTime = 60f * 6f;
+            size = 5;
+            hasPower = true;
+            tier = 7;
+            //TODO better effect
+            drillEffect = new MultiEffect(
+                Fx.mineImpact,
+                Fx.drillSteam,
+                Fx.dynamicSpikes.wrap(Liquids.hydrogen.color, 30f),
+                Fx.mineImpactWave.wrap(Liquids.hydrogen.color, 45f)
+            );
+            shake = 4f;
+            itemCapacity = 50;
+            arrowOffset = 2f;
+            arrowSpacing = 5f;
+            arrows = 2;
+            glowColor.a = 0.6f;
+            fogRadius = 5;
+
+            drillMultipliers.put(Items.beryllium, 2.5f);
+
+            //TODO different requirements
+            consumePower(6f);
+            consumeLiquids(LiquidStack.with(Liquids.hydrogen, 4f / 60f));
         }};
 
         //endregion
         //region storage
 
         coreShard = new CoreBlock("core-shard"){{
-            requirements(Category.effect, BuildVisibility.editorOnly, with(Items.copper, 1000, Items.lead, 800));
+            requirements(Category.effect, BuildVisibility.coreZoneOnly, with(Items.copper, 1000, Items.lead, 800));
             alwaysUnlocked = true;
 
+            isFirstTier = true;
             unitType = UnitTypes.alpha;
             health = 1100;
             itemCapacity = 4000;
             size = 3;
+            buildCostMultiplier = 2f;
 
             unitCapModifier = 8;
         }};
@@ -1376,9 +2942,10 @@ public class Blocks implements ContentList{
             health = 3500;
             itemCapacity = 9000;
             size = 4;
+            thrusterLength = 34/4f;
 
             unitCapModifier = 16;
-            researchCostMultiplier = 0.04f;
+            researchCostMultiplier = 0.07f;
         }};
 
         coreNucleus = new CoreBlock("core-nucleus"){{
@@ -1388,163 +2955,408 @@ public class Blocks implements ContentList{
             health = 6000;
             itemCapacity = 13000;
             size = 5;
+            thrusterLength = 40/4f;
 
             unitCapModifier = 24;
-            researchCostMultiplier = 0.06f;
+            researchCostMultiplier = 0.11f;
         }};
 
-        vault = new StorageBlock("vault"){{
-            requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125));
-            size = 3;
-            itemCapacity = 1000;
-            flags = EnumSet.of(BlockFlag.storage);
+        coreBastion = new CoreBlock("core-bastion"){{
+            //TODO cost
+            requirements(Category.effect, with(Items.graphite, 1000, Items.silicon, 1000, Items.beryllium, 800));
+
+            isFirstTier = true;
+            unitType = UnitTypes.evoke;
+            health = 4500;
+            itemCapacity = 2000;
+            size = 4;
+            thrusterLength = 34/4f;
+            armor = 5f;
+            alwaysUnlocked = true;
+            incinerateNonBuildable = true;
+            requiresCoreZone = true;
+
+            //TODO should this be higher?
+            buildCostMultiplier = 0.7f;
+
+            unitCapModifier = 15;
+            researchCostMultiplier = 0.07f;
+        }};
+
+        coreCitadel = new CoreBlock("core-citadel"){{
+            requirements(Category.effect, with(Items.silicon, 4000, Items.beryllium, 4000, Items.tungsten, 3000, Items.oxide, 1000));
+
+            unitType = UnitTypes.incite;
+            health = 16000;
+            itemCapacity = 3000;
+            size = 5;
+            thrusterLength = 40/4f;
+            armor = 10f;
+            incinerateNonBuildable = true;
+            buildCostMultiplier = 0.7f;
+            requiresCoreZone = true;
+
+            unitCapModifier = 15;
+            researchCostMultipliers.put(Items.silicon, 0.5f);
+            researchCostMultiplier = 0.17f;
+        }};
+
+        coreAcropolis = new CoreBlock("core-acropolis"){{
+            requirements(Category.effect, with(Items.beryllium, 6000, Items.silicon, 5000, Items.tungsten, 5000, Items.carbide, 3000, Items.oxide, 3000));
+
+            unitType = UnitTypes.emanate;
+            health = 30000;
+            itemCapacity = 4000;
+            size = 6;
+            thrusterLength = 48/4f;
+            armor = 15f;
+            incinerateNonBuildable = true;
+            buildCostMultiplier = 0.7f;
+            requiresCoreZone = true;
+
+            unitCapModifier = 15;
+            researchCostMultipliers.put(Items.silicon, 0.4f);
+            researchCostMultiplier = 0.1f;
         }};
 
         container = new StorageBlock("container"){{
             requirements(Category.effect, with(Items.titanium, 100));
             size = 2;
             itemCapacity = 300;
-            flags = EnumSet.of(BlockFlag.storage);
+            scaledHealth = 55;
         }};
 
+        vault = new StorageBlock("vault"){{
+            requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125));
+            size = 3;
+            itemCapacity = 1000;
+            scaledHealth = 55;
+        }};
+
+        //TODO move tabs?
         unloader = new Unloader("unloader"){{
             requirements(Category.effect, with(Items.titanium, 25, Items.silicon, 30));
-            speed = 6f;
+            speed = 60f / 11f;
             group = BlockGroup.transportation;
         }};
 
+        reinforcedContainer = new StorageBlock("reinforced-container"){{
+            requirements(Category.effect, with(Items.tungsten, 30, Items.graphite, 40));
+            size = 2;
+            itemCapacity = 160;
+            scaledHealth = 120;
+            coreMerge = false;
+        }};
+
+        reinforcedVault = new StorageBlock("reinforced-vault"){{
+            requirements(Category.effect, with(Items.tungsten, 125, Items.thorium, 70, Items.beryllium, 100));
+            size = 3;
+            itemCapacity = 900;
+            scaledHealth = 120;
+            coreMerge = false;
+        }};
+
         //endregion
         //region turrets
 
         duo = new ItemTurret("duo"){{
-            requirements(Category.turret, with(Items.copper, 35), true);
+            requirements(Category.turret, with(Items.copper, 35));
             ammo(
-            Items.copper, Bullets.standardCopper,
-            Items.graphite, Bullets.standardDense,
-            Items.pyratite, Bullets.standardIncendiary,
-            Items.silicon, Bullets.standardHoming
+                Items.copper,  new BasicBulletType(2.5f, 9){{
+                    width = 7f;
+                    height = 9f;
+                    lifetime = 60f;
+                    ammoMultiplier = 2;
+                }},
+                Items.graphite, new BasicBulletType(3.5f, 18){{
+                    width = 9f;
+                    height = 12f;
+                    reloadMultiplier = 0.6f;
+                    ammoMultiplier = 4;
+                    lifetime = 60f;
+                }},
+                Items.silicon, new BasicBulletType(3f, 12){{
+                    width = 7f;
+                    height = 9f;
+                    homingPower = 0.1f;
+                    reloadMultiplier = 1.5f;
+                    ammoMultiplier = 5;
+                    lifetime = 60f;
+                }}
             );
 
-            spread = 4f;
-            shots = 2;
-            alternate = true;
-            reloadTime = 20f;
-            restitution = 0.03f;
-            range = 100;
+            shoot = new ShootAlternate(3.5f);
+
+            recoils = 2;
+            drawer = new DrawTurret(){{
+                for(int i = 0; i < 2; i ++){
+                    int f = i;
+                    parts.add(new RegionPart("-barrel-" + (i == 0 ? "l" : "r")){{
+                        progress = PartProgress.recoil;
+                        recoilIndex = f;
+                        under = true;
+                        moveY = -1.5f;
+                    }});
+                }
+            }};
+
+            recoil = 0.5f;
+            shootY = 3f;
+            reload = 20f;
+            range = 110;
             shootCone = 15f;
             ammoUseEffect = Fx.casing1;
             health = 250;
             inaccuracy = 2f;
             rotateSpeed = 10f;
+            coolant = consumeCoolant(0.1f);
+            researchCostMultiplier = 0.05f;
+
+            limitRange();
         }};
 
         scatter = new ItemTurret("scatter"){{
             requirements(Category.turret, with(Items.copper, 85, Items.lead, 45));
             ammo(
-            Items.scrap, Bullets.flakScrap,
-            Items.lead, Bullets.flakLead,
-            Items.metaglass, Bullets.flakGlass
+                Items.scrap, new FlakBulletType(4f, 3){{
+                    lifetime = 60f;
+                    ammoMultiplier = 5f;
+                    shootEffect = Fx.shootSmall;
+                    reloadMultiplier = 0.5f;
+                    width = 6f;
+                    height = 8f;
+                    hitEffect = Fx.flakExplosion;
+                    splashDamage = 22f * 1.5f;
+                    splashDamageRadius = 24f;
+                }},
+                Items.lead, new FlakBulletType(4.2f, 3){{
+                    lifetime = 60f;
+                    ammoMultiplier = 4f;
+                    shootEffect = Fx.shootSmall;
+                    width = 6f;
+                    height = 8f;
+                    hitEffect = Fx.flakExplosion;
+                    splashDamage = 27f * 1.5f;
+                    splashDamageRadius = 15f;
+                }},
+                Items.metaglass, new FlakBulletType(4f, 3){{
+                    lifetime = 60f;
+                    ammoMultiplier = 5f;
+                    shootEffect = Fx.shootSmall;
+                    reloadMultiplier = 0.8f;
+                    width = 6f;
+                    height = 8f;
+                    hitEffect = Fx.flakExplosion;
+                    splashDamage = 30f * 1.5f;
+                    splashDamageRadius = 20f;
+                    fragBullets = 6;
+                    fragBullet = new BasicBulletType(3f, 5){{
+                        width = 5f;
+                        height = 12f;
+                        shrinkY = 1f;
+                        lifetime = 20f;
+                        backColor = Pal.gray;
+                        frontColor = Color.white;
+                        despawnEffect = Fx.none;
+                        collidesGround = false;
+                    }};
+                }}
             );
-            reloadTime = 18f;
-            range = 160f;
+
+            drawer = new DrawTurret(){{
+                parts.add(new RegionPart("-mid"){{
+                    progress = PartProgress.recoil;
+                    under = false;
+                    moveY = -1.25f;
+                }});
+            }};
+
+            reload = 18f;
+            range = 220f;
             size = 2;
-            burstSpacing = 5f;
-            shots = 2;
             targetGround = false;
 
-            recoilAmount = 2f;
+            shoot.shotDelay = 5f;
+            shoot.shots = 2;
+
+            recoil = 1f;
             rotateSpeed = 15f;
             inaccuracy = 17f;
             shootCone = 35f;
 
-            health = 200 * size * size;
+            scaledHealth = 200;
             shootSound = Sounds.shootSnap;
+            coolant = consumeCoolant(0.2f);
+            researchCostMultiplier = 0.05f;
+
+            limitRange(2);
         }};
 
         scorch = new ItemTurret("scorch"){{
             requirements(Category.turret, with(Items.copper, 25, Items.graphite, 22));
             ammo(
-            Items.coal, Bullets.basicFlame,
-            Items.pyratite, Bullets.pyraFlame
+                Items.coal, new BulletType(3.35f, 17f){{
+                    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;
+                }},
+                Items.pyratite, new BulletType(4f, 60f){{
+                    ammoMultiplier = 6f;
+                    hitSize = 7f;
+                    lifetime = 18f;
+                    pierce = true;
+                    collidesAir = false;
+                    statusDuration = 60f * 10;
+                    shootEffect = Fx.shootPyraFlame;
+                    hitEffect = Fx.hitFlameSmall;
+                    despawnEffect = Fx.none;
+                    status = StatusEffects.burning;
+                    hittable = false;
+                }}
             );
-            recoilAmount = 0f;
-            reloadTime = 6f;
+            recoil = 0f;
+            reload = 6f;
             coolantMultiplier = 1.5f;
             range = 60f;
+            shootY = 3;
             shootCone = 50f;
             targetAir = false;
             ammoUseEffect = Fx.none;
             health = 400;
             shootSound = Sounds.flame;
+            coolant = consumeCoolant(0.1f);
         }};
 
         hail = new ItemTurret("hail"){{
             requirements(Category.turret, with(Items.copper, 40, Items.graphite, 17));
             ammo(
-            Items.graphite, Bullets.artilleryDense,
-            Items.silicon, Bullets.artilleryHoming,
-            Items.pyratite, Bullets.artilleryIncendiary
+                Items.graphite, new ArtilleryBulletType(3f, 20){{
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 11f;
+                    collidesTiles = false;
+                    splashDamageRadius = 25f * 0.75f;
+                    splashDamage = 33f;
+                }},
+                Items.silicon, new ArtilleryBulletType(3f, 20){{
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 11f;
+                    collidesTiles = false;
+                    splashDamageRadius = 25f * 0.75f;
+                    splashDamage = 33f;
+                    reloadMultiplier = 1.2f;
+                    ammoMultiplier = 3f;
+                    homingPower = 0.08f;
+                    homingRange = 50f;
+                }},
+                Items.pyratite, new ArtilleryBulletType(3f, 25){{
+                    hitEffect = Fx.blastExplosion;
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 13f;
+                    collidesTiles = false;
+                    splashDamageRadius = 25f * 0.75f;
+                    splashDamage = 45f;
+                    status = StatusEffects.burning;
+                    statusDuration = 60f * 12f;
+                    frontColor = Pal.lightishOrange;
+                    backColor = Pal.lightOrange;
+                    makeFire = true;
+                    trailEffect = Fx.incendTrail;
+                    ammoMultiplier = 4f;
+                }}
             );
             targetAir = false;
-            reloadTime = 60f;
-            recoilAmount = 2f;
-            range = 230f;
+            reload = 60f;
+            recoil = 2f;
+            range = 235f;
             inaccuracy = 1f;
             shootCone = 10f;
             health = 260;
             shootSound = Sounds.bang;
+            coolant = consumeCoolant(0.1f);
+            limitRange(0f);
         }};
 
         wave = new LiquidTurret("wave"){{
-            requirements(Category.turret, with(Items.metaglass, 45, Items.lead, 75));
+            requirements(Category.turret, with(Items.metaglass, 45, Items.lead, 75, Items.copper, 25));
             ammo(
-            Liquids.water, Bullets.waterShot,
-            Liquids.slag, Bullets.slagShot,
-            Liquids.cryofluid, Bullets.cryoShot,
-            Liquids.oil, Bullets.oilShot
+                Liquids.water,new LiquidBulletType(Liquids.water){{
+                    knockback = 0.7f;
+                    drag = 0.01f;
+                    layer = Layer.bullet - 2f;
+                }},
+                Liquids.slag, new LiquidBulletType(Liquids.slag){{
+                    damage = 4;
+                    drag = 0.01f;
+                }},
+                Liquids.cryofluid, new LiquidBulletType(Liquids.cryofluid){{
+                    drag = 0.01f;
+                }},
+                Liquids.oil, new LiquidBulletType(Liquids.oil){{
+                    drag = 0.01f;
+                    layer = Layer.bullet - 2f;
+                }}
             );
             size = 2;
-            recoilAmount = 0f;
-            reloadTime = 2f;
+            recoil = 0f;
+            reload = 3f;
             inaccuracy = 5f;
             shootCone = 50f;
             liquidCapacity = 10f;
             shootEffect = Fx.shootLiquid;
             range = 110f;
-            health = 250 * size * size;
+            scaledHealth = 250;
             flags = EnumSet.of(BlockFlag.turret, BlockFlag.extinguisher);
         }};
 
+        //TODO these may work in space, but what's the point?
         lancer = new PowerTurret("lancer"){{
-            requirements(Category.turret, with(Items.copper, 60, Items.lead, 70, Items.silicon, 50));
+            requirements(Category.turret, with(Items.copper, 60, Items.lead, 70, Items.silicon, 60, Items.titanium, 30));
             range = 165f;
-            chargeTime = 40f;
-            chargeMaxDelay = 30f;
-            chargeEffects = 7;
-            recoilAmount = 2f;
-            reloadTime = 80f;
-            cooldown = 0.03f;
-            powerUse = 6f;
-            shootShake = 2f;
+
+            shoot.firstShotDelay = 40f;
+
+            recoil = 2f;
+            reload = 80f;
+            shake = 2f;
             shootEffect = Fx.lancerLaserShoot;
             smokeEffect = Fx.none;
-            chargeEffect = Fx.lancerLaserCharge;
-            chargeBeginEffect = Fx.lancerLaserChargeBegin;
             heatColor = Color.red;
             size = 2;
-            health = 280 * size * size;
+            scaledHealth = 280;
             targetAir = false;
+            moveWhileCharging = false;
+            accurateDelay = false;
             shootSound = Sounds.laser;
+            coolant = consumeCoolant(0.2f);
+
+            consumePower(6f);
 
             shootType = new LaserBulletType(140){{
-                colors = new Color[]{Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.white};
+                colors = new Color[]{Pal.lancerLaser.cpy().a(0.4f), Pal.lancerLaser, Color.white};
+                //TODO merge
+                chargeEffect = new MultiEffect(Fx.lancerLaserCharge, Fx.lancerLaserChargeBegin);
+
+                buildingDamageMultiplier = 0.25f;
                 hitEffect = Fx.hitLancer;
-                despawnEffect = Fx.none;
                 hitSize = 4;
                 lifetime = 16f;
                 drawSize = 400f;
                 collidesAir = false;
                 length = 173f;
+                ammoMultiplier = 1f;
+                pierceCap = 4;
             }};
         }};
 
@@ -1554,200 +3366,520 @@ public class Blocks implements ContentList{
                 damage = 20;
                 lightningLength = 25;
                 collidesAir = false;
+                ammoMultiplier = 1f;
+
+                //for visual stats only.
+                buildingDamageMultiplier = 0.25f;
+
+                lightningType = new BulletType(0.0001f, 0f){{
+                    lifetime = Fx.lightning.lifetime;
+                    hitEffect = Fx.hitLancer;
+                    despawnEffect = Fx.none;
+                    status = StatusEffects.shocked;
+                    statusDuration = 10f;
+                    hittable = false;
+                    lightColor = Color.white;
+                    collidesAir = false;
+                    buildingDamageMultiplier = 0.25f;
+                }};
             }};
-            reloadTime = 35f;
+            reload = 35f;
             shootCone = 40f;
             rotateSpeed = 8f;
-            powerUse = 3.3f;
             targetAir = false;
             range = 90f;
             shootEffect = Fx.lightningShoot;
             heatColor = Color.red;
-            recoilAmount = 1f;
+            recoil = 1f;
             size = 1;
             health = 260;
             shootSound = Sounds.spark;
+            consumePower(3.3f);
+            coolant = consumeCoolant(0.1f);
         }};
 
         parallax = new TractorBeamTurret("parallax"){{
-            requirements(Category.turret, with(Items.silicon, 120, Items.titanium, 90, Items.graphite, 30));
+            requirements(Category.turret, with(Items.silicon, 160, Items.titanium, 110, Items.graphite, 50));
 
             hasPower = true;
             size = 2;
-            force = 8f;
-            scaledForce = 7f;
-            range = 230f;
-            damage = 0.3f;
-            health = 160 * size * size;
-            rotateSpeed = 10;
+            force = 16f;
+            scaledForce = 9f;
+            range = 300f;
+            damage = 0.5f;
+            scaledHealth = 160;
+            rotateSpeed = 12;
 
-            consumes.powerCond(3f, (TractorBeamBuild e) -> e.target != null);
+            consumePower(3.3f);
         }};
 
         swarmer = new ItemTurret("swarmer"){{
             requirements(Category.turret, with(Items.graphite, 35, Items.titanium, 35, Items.plastanium, 45, Items.silicon, 30));
             ammo(
-            Items.blastCompound, Bullets.missileExplosive,
-            Items.pyratite, Bullets.missileIncendiary,
-            Items.surgeAlloy, Bullets.missileSurge
+                Items.blastCompound, new MissileBulletType(3.7f, 10){{
+                    width = 8f;
+                    height = 8f;
+                    shrinkY = 0f;
+                    splashDamageRadius = 30f;
+                    splashDamage = 30f * 1.5f;
+                    ammoMultiplier = 5f;
+                    hitEffect = Fx.blastExplosion;
+                    despawnEffect = Fx.blastExplosion;
+
+                    status = StatusEffects.blasted;
+                    statusDuration = 60f;
+                }},
+                Items.pyratite, new MissileBulletType(3.7f, 12){{
+                    frontColor = Pal.lightishOrange;
+                    backColor = Pal.lightOrange;
+                    width = 7f;
+                    height = 8f;
+                    shrinkY = 0f;
+                    homingPower = 0.08f;
+                    splashDamageRadius = 20f;
+                    splashDamage = 30f * 1.5f;
+                    makeFire = true;
+                    ammoMultiplier = 5f;
+                    hitEffect = Fx.blastExplosion;
+                    status = StatusEffects.burning;
+                }},
+                Items.surgeAlloy, new MissileBulletType(3.7f, 18){{
+                    width = 8f;
+                    height = 8f;
+                    shrinkY = 0f;
+                    splashDamageRadius = 25f;
+                    splashDamage = 25f * 1.4f;
+                    hitEffect = Fx.blastExplosion;
+                    despawnEffect = Fx.blastExplosion;
+                    ammoMultiplier = 4f;
+                    lightningDamage = 10;
+                    lightning = 2;
+                    lightningLength = 10;
+                }}
             );
-            reloadTime = 30f;
-            shots = 4;
-            burstSpacing = 5;
+
+            shoot = new ShootBarrel(){{
+                barrels = new float[]{
+                    -4, -1.25f, 0,
+                    0, 0, 0,
+                    4, -1.25f, 0
+                };
+                shots = 4;
+                shotDelay = 5f;
+            }};
+
+            shootY = 4.5f;
+            reload = 30f;
             inaccuracy = 10f;
-            range = 190f;
-            xRand = 6f;
+            range = 240f;
+            consumeAmmoOnce = false;
             size = 2;
-            health = 300 * size * size;
+            scaledHealth = 300;
             shootSound = Sounds.missile;
+            envEnabled |= Env.space;
+
+            limitRange(5f);
+            coolant = consumeCoolant(0.3f);
         }};
 
         salvo = new ItemTurret("salvo"){{
-            requirements(Category.turret, with(Items.copper, 100, Items.graphite, 90, Items.titanium, 60));
+            requirements(Category.turret, with(Items.copper, 100, Items.graphite, 80, Items.titanium, 50));
             ammo(
-            Items.copper, Bullets.standardCopper,
-            Items.graphite, Bullets.standardDense,
-            Items.pyratite, Bullets.standardIncendiary,
-            Items.silicon, Bullets.standardHoming,
-            Items.thorium, Bullets.standardThorium
+                Items.copper,  new BasicBulletType(2.5f, 11){{
+                    width = 7f;
+                    height = 9f;
+                    lifetime = 60f;
+                    ammoMultiplier = 2;
+                }},
+                Items.graphite, new BasicBulletType(3.5f, 20){{
+                    width = 9f;
+                    height = 12f;
+                    reloadMultiplier = 0.6f;
+                    ammoMultiplier = 4;
+                    lifetime = 60f;
+                }},
+                Items.pyratite, new BasicBulletType(3.2f, 18){{
+                    width = 10f;
+                    height = 12f;
+                    frontColor = Pal.lightishOrange;
+                    backColor = Pal.lightOrange;
+                    status = StatusEffects.burning;
+                    hitEffect = new MultiEffect(Fx.hitBulletSmall, Fx.fireHit);
+
+                    ammoMultiplier = 5;
+
+                    splashDamage = 12f;
+                    splashDamageRadius = 22f;
+
+                    makeFire = true;
+                    lifetime = 60f;
+                }},
+                Items.silicon, new BasicBulletType(3f, 15, "bullet"){{
+                    width = 7f;
+                    height = 9f;
+                    homingPower = 0.1f;
+                    reloadMultiplier = 1.5f;
+                    ammoMultiplier = 5;
+                    lifetime = 60f;
+                }},
+                Items.thorium, new BasicBulletType(4f, 29, "bullet"){{
+                    width = 10f;
+                    height = 13f;
+                    shootEffect = Fx.shootBig;
+                    smokeEffect = Fx.shootBigSmoke;
+                    ammoMultiplier = 4;
+                    lifetime = 60f;
+                }}
             );
 
+            drawer = new DrawTurret(){{
+                parts.add(new RegionPart("-side"){{
+                    progress = PartProgress.warmup;
+                    moveX = 0.6f;
+                    moveRot = -15f;
+                    mirror = true;
+                    layerOffset = 0.001f;
+                    moves.add(new PartMove(PartProgress.recoil, 0.5f, -0.5f, -8f));
+                }}, new RegionPart("-barrel"){{
+                    progress = PartProgress.recoil;
+                    moveY = -2.5f;
+                }});
+            }};
+
             size = 2;
-            range = 150f;
-            reloadTime = 38f;
-            restitution = 0.03f;
+            range = 190f;
+            reload = 31f;
+            consumeAmmoOnce = false;
             ammoEjectBack = 3f;
-            cooldown = 0.03f;
-            recoilAmount = 3f;
-            shootShake = 1f;
-            burstSpacing = 3f;
-            shots = 4;
+            recoil = 0f;
+            shake = 1f;
+            shoot.shots = 4;
+            shoot.shotDelay = 3f;
+
             ammoUseEffect = Fx.casing2;
-            health = 240 * size * size;
+            scaledHealth = 240;
             shootSound = Sounds.shootBig;
+
+            limitRange();
+            coolant = consumeCoolant(0.2f);
         }};
 
         segment = new PointDefenseTurret("segment"){{
-            requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phaseFabric, 40));
+            requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phaseFabric, 40, Items.titanium, 40));
 
-            health = 250 * size * size;
-            range = 160f;
+            scaledHealth = 250;
+            range = 180f;
             hasPower = true;
-            consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null);
+            consumePower(8f);
             size = 2;
             shootLength = 5f;
-            bulletDamage = 25f;
-            reloadTime = 9f;
+            bulletDamage = 30f;
+            reload = 8f;
+            envEnabled |= Env.space;
         }};
 
         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
+                Liquids.water, new LiquidBulletType(Liquids.water){{
+                    lifetime = 49f;
+                    speed = 4f;
+                    knockback = 1.7f;
+                    puddleSize = 8f;
+                    orbSize = 4f;
+                    drag = 0.001f;
+                    ammoMultiplier = 0.4f;
+                    statusDuration = 60f * 4f;
+                    damage = 0.2f;
+                    layer = Layer.bullet - 2f;
+                }},
+                Liquids.slag,  new LiquidBulletType(Liquids.slag){{
+                    lifetime = 49f;
+                    speed = 4f;
+                    knockback = 1.3f;
+                    puddleSize = 8f;
+                    orbSize = 4f;
+                    damage = 4.75f;
+                    drag = 0.001f;
+                    ammoMultiplier = 0.4f;
+                    statusDuration = 60f * 4f;
+                }},
+                Liquids.cryofluid, new LiquidBulletType(Liquids.cryofluid){{
+                    lifetime = 49f;
+                    speed = 4f;
+                    knockback = 1.3f;
+                    puddleSize = 8f;
+                    orbSize = 4f;
+                    drag = 0.001f;
+                    ammoMultiplier = 0.4f;
+                    statusDuration = 60f * 4f;
+                    damage = 0.2f;
+                }},
+                Liquids.oil, new LiquidBulletType(Liquids.oil){{
+                    lifetime = 49f;
+                    speed = 4f;
+                    knockback = 1.3f;
+                    puddleSize = 8f;
+                    orbSize = 4f;
+                    drag = 0.001f;
+                    ammoMultiplier = 0.4f;
+                    statusDuration = 60f * 4f;
+                    damage = 0.2f;
+                    layer = Layer.bullet - 2f;
+                }}
             );
             size = 3;
-            recoilAmount = 0f;
-            reloadTime = 2f;
-            shots = 2;
-            velocityInaccuracy = 0.1f;
+            reload = 3f;
+            shoot.shots = 2;
+            velocityRnd = 0.1f;
             inaccuracy = 4f;
-            recoilAmount = 1f;
-            restitution = 0.04f;
+            recoil = 1f;
             shootCone = 45f;
             liquidCapacity = 40f;
             shootEffect = Fx.shootLiquid;
             range = 190f;
-            health = 250 * size * size;
+            scaledHealth = 250;
+            flags = EnumSet.of(BlockFlag.turret, BlockFlag.extinguisher);
         }};
 
         fuse = new ItemTurret("fuse"){{
             requirements(Category.turret, with(Items.copper, 225, Items.graphite, 225, Items.thorium, 100));
 
-            reloadTime = 35f;
-            shootShake = 4f;
+            reload = 35f;
+            shake = 4f;
             range = 90f;
-            recoilAmount = 5f;
-            shots = 3;
-            spread = 20f;
-            restitution = 0.1f;
+            recoil = 5f;
+
+            shoot = new ShootSpread(3, 20f);
+
             shootCone = 30;
             size = 3;
+            envEnabled |= Env.space;
 
-            health = 220 * size * size;
+            scaledHealth = 220;
             shootSound = Sounds.shotgun;
+            coolant = consumeCoolant(0.3f);
 
             float brange = range + 10f;
 
             ammo(
-            Items.titanium, new ShrapnelBulletType(){{
-                length = brange;
-                damage = 66f;
-                ammoMultiplier = 4f;
-                width = 17f;
-                reloadMultiplier = 1.3f;
-            }},
-            Items.thorium, new ShrapnelBulletType(){{
-                length = brange;
-                damage = 105f;
-                ammoMultiplier = 5f;
-                toColor = Pal.thoriumPink;
-                shootEffect = smokeEffect = Fx.thoriumShoot;
-            }}
+                Items.titanium, new ShrapnelBulletType(){{
+                    length = brange;
+                    damage = 66f;
+                    ammoMultiplier = 4f;
+                    width = 17f;
+                    reloadMultiplier = 1.3f;
+                }},
+                Items.thorium, new ShrapnelBulletType(){{
+                    length = brange;
+                    damage = 105f;
+                    ammoMultiplier = 5f;
+                    toColor = Pal.thoriumPink;
+                    shootEffect = smokeEffect = Fx.thoriumShoot;
+                }}
             );
         }};
 
         ripple = new ItemTurret("ripple"){{
             requirements(Category.turret, with(Items.copper, 150, Items.graphite, 135, Items.titanium, 60));
             ammo(
-            Items.graphite, Bullets.artilleryDense,
-            Items.silicon, Bullets.artilleryHoming,
-            Items.pyratite, Bullets.artilleryIncendiary,
-            Items.blastCompound, Bullets.artilleryExplosive,
-            Items.plastanium, Bullets.artilleryPlastic
+                Items.graphite, new ArtilleryBulletType(3f, 20){{
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 11f;
+                    collidesTiles = false;
+                    splashDamageRadius = 25f * 0.75f;
+                    splashDamage = 33f;
+                }},
+                Items.silicon, new ArtilleryBulletType(3f, 20){{
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 11f;
+                    collidesTiles = false;
+                    splashDamageRadius = 25f * 0.75f;
+                    splashDamage = 33f;
+                    reloadMultiplier = 1.2f;
+                    ammoMultiplier = 3f;
+                    homingPower = 0.08f;
+                    homingRange = 50f;
+                }},
+                Items.pyratite, new ArtilleryBulletType(3f, 24){{
+                    hitEffect = Fx.blastExplosion;
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 13f;
+                    collidesTiles = false;
+                    splashDamageRadius = 25f * 0.75f;
+                    splashDamage = 45f;
+                    status = StatusEffects.burning;
+                    statusDuration = 60f * 12f;
+                    frontColor = Pal.lightishOrange;
+                    backColor = Pal.lightOrange;
+                    makeFire = true;
+                    trailEffect = Fx.incendTrail;
+                    ammoMultiplier = 4f;
+                }},
+                Items.blastCompound, new ArtilleryBulletType(2f, 20, "shell"){{
+                    hitEffect = Fx.blastExplosion;
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 14f;
+                    collidesTiles = false;
+                    ammoMultiplier = 4f;
+                    splashDamageRadius = 45f * 0.75f;
+                    splashDamage = 55f;
+                    backColor = Pal.missileYellowBack;
+                    frontColor = Pal.missileYellow;
+
+                    status = StatusEffects.blasted;
+                }},
+                Items.plastanium, new ArtilleryBulletType(3.4f, 20, "shell"){{
+                    hitEffect = Fx.plasticExplosion;
+                    knockback = 1f;
+                    lifetime = 80f;
+                    width = height = 13f;
+                    collidesTiles = false;
+                    splashDamageRadius = 35f * 0.75f;
+                    splashDamage = 45f;
+                    fragBullet = new BasicBulletType(2.5f, 10, "bullet"){{
+                        width = 10f;
+                        height = 12f;
+                        shrinkY = 1f;
+                        lifetime = 15f;
+                        backColor = Pal.plastaniumBack;
+                        frontColor = Pal.plastaniumFront;
+                        despawnEffect = Fx.none;
+                        collidesAir = false;
+                    }};
+                    fragBullets = 10;
+                    backColor = Pal.plastaniumBack;
+                    frontColor = Pal.plastaniumFront;
+                }}
             );
 
             targetAir = false;
             size = 3;
-            shots = 4;
+            shoot.shots = 4;
             inaccuracy = 12f;
-            reloadTime = 60f;
+            reload = 60f;
             ammoEjectBack = 5f;
             ammoUseEffect = Fx.casing3Double;
             ammoPerShot = 2;
-            cooldown = 0.03f;
-            velocityInaccuracy = 0.2f;
-            restitution = 0.02f;
-            recoilAmount = 6f;
-            shootShake = 2f;
+            velocityRnd = 0.2f;
+            scaleLifetimeOffset = 1f / 9f;
+            recoil = 6f;
+            shake = 2f;
             range = 290f;
             minRange = 50f;
+            coolant = consumeCoolant(0.3f);
 
-            health = 130 * size * size;
+            scaledHealth = 130;
             shootSound = Sounds.artillery;
         }};
 
         cyclone = new ItemTurret("cyclone"){{
             requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80));
             ammo(
-            Items.metaglass, Bullets.fragGlass,
-            Items.blastCompound, Bullets.fragExplosive,
-            Items.plastanium, Bullets.fragPlastic,
-            Items.surgeAlloy, Bullets.fragSurge
+                Items.metaglass, new FlakBulletType(4f, 6){{
+                    ammoMultiplier = 2f;
+                    shootEffect = Fx.shootSmall;
+                    reloadMultiplier = 0.8f;
+                    width = 6f;
+                    height = 8f;
+                    hitEffect = Fx.flakExplosion;
+                    splashDamage = 45f;
+                    splashDamageRadius = 25f;
+                    fragBullet = new BasicBulletType(3f, 12, "bullet"){{
+                        width = 5f;
+                        height = 12f;
+                        shrinkY = 1f;
+                        lifetime = 20f;
+                        backColor = Pal.gray;
+                        frontColor = Color.white;
+                        despawnEffect = Fx.none;
+                    }};
+                    fragBullets = 4;
+                    explodeRange = 20f;
+                    collidesGround = true;
+                }},
+                Items.blastCompound, new FlakBulletType(4f, 8){{
+                    shootEffect = Fx.shootBig;
+                    ammoMultiplier = 5f;
+                    splashDamage = 45f;
+                    splashDamageRadius = 60f;
+                    collidesGround = true;
+
+                    status = StatusEffects.blasted;
+                    statusDuration = 60f;
+                }},
+                Items.plastanium, new FlakBulletType(4f, 8){{
+                    ammoMultiplier = 4f;
+                    splashDamageRadius = 40f;
+                    splashDamage = 37.5f;
+                    fragBullet = new BasicBulletType(2.5f, 12, "bullet"){{
+                        width = 10f;
+                        height = 12f;
+                        shrinkY = 1f;
+                        lifetime = 15f;
+                        backColor = Pal.plastaniumBack;
+                        frontColor = Pal.plastaniumFront;
+                        despawnEffect = Fx.none;
+                    }};
+                    fragBullets = 6;
+                    hitEffect = Fx.plasticExplosion;
+                    frontColor = Pal.plastaniumFront;
+                    backColor = Pal.plastaniumBack;
+                    shootEffect = Fx.shootBig;
+                    collidesGround = true;
+                    explodeRange = 20f;
+                }},
+                Items.surgeAlloy, new FlakBulletType(4.5f, 13){{
+                    ammoMultiplier = 5f;
+                    splashDamage = 50f * 1.5f;
+                    splashDamageRadius = 38f;
+                    lightning = 2;
+                    lightningLength = 7;
+                    shootEffect = Fx.shootBig;
+                    collidesGround = true;
+                    explodeRange = 20f;
+                }}
             );
-            xRand = 4f;
-            reloadTime = 8f;
+            shootY = 10f;
+
+            shoot = new ShootBarrel(){{
+                barrels = new float[]{
+                0f, 1f, 0f,
+                3f, 0f, 0f,
+                -3f, 0f, 0f,
+                };
+            }};
+
+            recoils = 3;
+            drawer = new DrawTurret(){{
+                for(int i = 3; i > 0; i--){
+                    int f = i;
+                    parts.add(new RegionPart("-barrel-" + i){{
+                        progress = PartProgress.recoil;
+                        recoilIndex = f - 1;
+                        under = true;
+                        moveY = -2f;
+                    }});
+                }
+            }};
+
+            reload = 8f;
             range = 200f;
             size = 3;
-            recoilAmount = 3f;
+            recoil = 1.5f;
+            recoilTime = 10;
             rotateSpeed = 10f;
             inaccuracy = 10f;
             shootCone = 30f;
             shootSound = Sounds.shootSnap;
+            coolant = consumeCoolant(0.3f);
 
-            health = 145 * size * size;
+            scaledHealth = 145;
+            limitRange();
         }};
 
         foreshadow = new ItemTurret("foreshadow"){{
@@ -1755,118 +3887,1978 @@ public class Blocks implements ContentList{
 
             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;
-                buildingDamageMultiplier = 0.3f;
-                speed = brange;
-                hitShake = 6f;
-                ammoMultiplier = 1f;
-            }}
+                Items.surgeAlloy, new RailBulletType(){{
+                    shootEffect = Fx.instShoot;
+                    hitEffect = Fx.instHit;
+                    pierceEffect = Fx.railHit;
+                    smokeEffect = Fx.smokeCloud;
+                    pointEffect = Fx.instTrail;
+                    despawnEffect = Fx.instBomb;
+                    pointEffectSpace = 20f;
+                    damage = 1350;
+                    buildingDamageMultiplier = 0.2f;
+                    maxDamageFraction = 0.6f;
+                    pierceDamageFactor = 1f;
+                    length = brange;
+                    hitShake = 6f;
+                    ammoMultiplier = 1f;
+                }}
             );
 
             maxAmmo = 40;
-            ammoPerShot = 4;
+            ammoPerShot = 5;
             rotateSpeed = 2f;
-            reloadTime = 200f;
+            reload = 200f;
             ammoUseEffect = Fx.casing3Double;
-            recoilAmount = 5f;
-            restitution = 0.009f;
-            cooldown = 0.009f;
-            shootShake = 4f;
-            shots = 1;
+            recoil = 5f;
+            cooldownTime = reload;
+            shake = 4f;
             size = 4;
             shootCone = 2f;
             shootSound = Sounds.railgun;
-            unitSort = (u, x, y) -> -u.maxHealth;
+            unitSort = UnitSorts.strongest;
+            envEnabled |= Env.space;
 
             coolantMultiplier = 0.4f;
+            scaledHealth = 150;
 
-            health = 150 * size * size;
-            coolantUsage = 1f;
-
-            consumes.powerCond(10f, TurretBuild::isActive);
+            coolant = consumeCoolant(1f);
+            consumePower(10f);
         }};
 
         spectre = new ItemTurret("spectre"){{
             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,
-            Items.thorium, Bullets.standardThoriumBig
+                Items.graphite, new BasicBulletType(7.5f, 50){{
+                    hitSize = 4.8f;
+                    width = 15f;
+                    height = 21f;
+                    shootEffect = Fx.shootBig;
+                    ammoMultiplier = 4;
+                    reloadMultiplier = 1.7f;
+                    knockback = 0.3f;
+                }},
+                Items.thorium, new BasicBulletType(8f, 80){{
+                    hitSize = 5;
+                    width = 16f;
+                    height = 23f;
+                    shootEffect = Fx.shootBig;
+                    pierceCap = 2;
+                    pierceBuilding = true;
+                    knockback = 0.7f;
+                }},
+                Items.pyratite, new BasicBulletType(7f, 70){{
+                    hitSize = 5;
+                    width = 16f;
+                    height = 21f;
+                    frontColor = Pal.lightishOrange;
+                    backColor = Pal.lightOrange;
+                    status = StatusEffects.burning;
+                    hitEffect = new MultiEffect(Fx.hitBulletSmall, Fx.fireHit);
+                    shootEffect = Fx.shootBig;
+                    makeFire = true;
+                    pierceCap = 2;
+                    pierceBuilding = true;
+                    knockback = 0.6f;
+                    ammoMultiplier = 3;
+                    splashDamage = 20f;
+                    splashDamageRadius = 25f;
+                }}
             );
-            reloadTime = 6f;
+            reload = 7f;
+            recoilTime = reload * 2f;
             coolantMultiplier = 0.5f;
-            restitution = 0.1f;
             ammoUseEffect = Fx.casing3;
-            range = 200f;
+            range = 260f;
             inaccuracy = 3f;
-            recoilAmount = 3f;
-            spread = 8f;
-            alternate = true;
-            shootShake = 2f;
-            shots = 2;
+            recoil = 3f;
+            shoot = new ShootAlternate(8f);
+            shake = 2f;
             size = 4;
             shootCone = 24f;
             shootSound = Sounds.shootBig;
 
-            health = 160 * size * size;
-            coolantUsage = 1f;
+            scaledHealth = 160;
+            coolant = consumeCoolant(1f);
+
+            limitRange();
         }};
 
         meltdown = new LaserTurret("meltdown"){{
             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;
+            recoil = 4f;
             size = 4;
-            shootShake = 2f;
-            range = 190f;
-            reloadTime = 90f;
+            shake = 2f;
+            range = 195f;
+            reload = 90f;
             firingMoveFract = 0.5f;
-            shootDuration = 220f;
-            powerUse = 17f;
+            shootDuration = 230f;
             shootSound = Sounds.laserbig;
             loopSound = Sounds.beam;
             loopSoundVolume = 2f;
+            envEnabled |= Env.space;
 
-            shootType = new ContinuousLaserBulletType(70){{
+            shootType = new ContinuousLaserBulletType(78){{
                 length = 200f;
                 hitEffect = Fx.hitMeltdown;
+                hitColor = Pal.meltdownHit;
+                status = StatusEffects.melting;
                 drawSize = 420f;
+                timescaleDamage = true;
 
                 incendChance = 0.4f;
                 incendSpread = 5f;
                 incendAmount = 1;
+                ammoMultiplier = 1f;
             }};
 
-            health = 200 * size * size;
-            consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false);
+            scaledHealth = 200;
+            coolant = consumeCoolant(0.5f);
+            consumePower(17f);
+        }};
+
+        breach = new ItemTurret("breach"){{
+            requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.graphite, 250));
+
+            Effect sfe = new MultiEffect(Fx.shootBigColor, Fx.colorSparkBig);
+
+            ammo(
+            Items.beryllium, new BasicBulletType(7.5f, 85){{
+                width = 12f;
+                hitSize = 7f;
+                height = 20f;
+                shootEffect = sfe;
+                smokeEffect = Fx.shootBigSmoke;
+                ammoMultiplier = 1;
+                pierceCap = 2;
+                pierce = true;
+                pierceBuilding = true;
+                hitColor = backColor = trailColor = Pal.berylShot;
+                frontColor = Color.white;
+                trailWidth = 2.1f;
+                trailLength = 10;
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+                buildingDamageMultiplier = 0.3f;
+            }},
+            Items.tungsten, new BasicBulletType(8f, 95){{
+                width = 13f;
+                height = 19f;
+                hitSize = 7f;
+                shootEffect = sfe;
+                smokeEffect = Fx.shootBigSmoke;
+                ammoMultiplier = 1;
+                reloadMultiplier = 1f;
+                pierceCap = 4;
+                pierce = true;
+                pierceBuilding = true;
+                hitColor = backColor = trailColor = Pal.tungstenShot;
+                frontColor = Color.white;
+                trailWidth = 2.2f;
+                trailLength = 11;
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+                rangeChange = 40f;
+                buildingDamageMultiplier = 0.3f;
+            }},
+            Items.carbide, new BasicBulletType(12f, 325f/0.75f){{
+                width = 15f;
+                height = 21f;
+                hitSize = 7f;
+                shootEffect = sfe;
+                smokeEffect = Fx.shootBigSmoke;
+                ammoMultiplier = 2;
+                reloadMultiplier = 0.2f;
+                hitColor = backColor = trailColor = Color.valueOf("ab8ec5");
+                frontColor = Color.white;
+                trailWidth = 2.2f;
+                trailLength = 11;
+                trailEffect = Fx.disperseTrail;
+                trailInterval = 2f;
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+                rangeChange = 7f*8f;
+                buildingDamageMultiplier = 0.3f;
+                //targetBlocks = false;
+                //targetMissiles = false;
+                trailRotation = true;
+
+                fragBullets = 3;
+                fragRandomSpread = 0f;
+                fragSpread = 25f;
+                fragVelocityMin = 1f;
+
+                fragBullet = new BasicBulletType(8.1f, 227f){{
+                    lifetime = 8f;
+                    width = 11f;
+                    height = 14f;
+                    hitSize = 7f;
+                    shootEffect = sfe;
+                    ammoMultiplier = 1;
+                    reloadMultiplier = 1f;
+                    pierceCap = 2;
+                    pierce = true;
+                    pierceBuilding = true;
+                    hitColor = backColor = trailColor = Color.valueOf("ab8ec5");
+                    frontColor = Color.white;
+                    trailWidth = 1.8f;
+                    trailLength = 11;
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                    buildingDamageMultiplier = 0.2f;
+                }};
+            }}
+            );
+
+            coolantMultiplier = 15f;
+            shootSound = Sounds.shootAlt;
+
+            targetUnderBlocks = false;
+            shake = 1f;
+            ammoPerShot = 2;
+            drawer = new DrawTurret("reinforced-");
+            shootY = -2;
+            outlineColor = Pal.darkOutline;
+            size = 3;
+            envEnabled |= Env.space;
+            reload = 40f;
+            recoil = 2f;
+            range = 190;
+            shootCone = 3f;
+            scaledHealth = 180;
+            rotateSpeed = 1.5f;
+            researchCostMultiplier = 0.05f;
+
+            coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f));
+            limitRange(12f);
+        }};
+
+        diffuse = new ItemTurret("diffuse"){{
+            requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 200, Items.graphite, 200, Items.tungsten, 50));
+
+            ammo(
+            Items.graphite, new BasicBulletType(8f, 41){{
+                knockback = 4f;
+                width = 25f;
+                hitSize = 7f;
+                height = 20f;
+                shootEffect = Fx.shootBigColor;
+                smokeEffect = Fx.shootSmokeSquareSparse;
+                ammoMultiplier = 1;
+                hitColor = backColor = trailColor = Color.valueOf("ea8878");
+                frontColor = Pal.redLight;
+                trailWidth = 6f;
+                trailLength = 3;
+                hitEffect = despawnEffect = Fx.hitSquaresColor;
+                buildingDamageMultiplier = 0.2f;
+            }},
+            Items.oxide, new BasicBulletType(8f, 120){{
+                knockback = 3f;
+                width = 25f;
+                hitSize = 7f;
+                height = 20f;
+                shootEffect = Fx.shootBigColor;
+                smokeEffect = Fx.shootSmokeSquareSparse;
+                ammoMultiplier = 2;
+                hitColor = backColor = trailColor = Color.valueOf("a0b380");
+                frontColor = Color.valueOf("e4ffd6");
+                trailWidth = 6f;
+                trailLength = 3;
+                hitEffect = despawnEffect = Fx.hitSquaresColor;
+                buildingDamageMultiplier = 0.2f;
+            }},
+            Items.silicon, new BasicBulletType(8f, 35){{
+                knockback = 3f;
+                width = 25f;
+                hitSize = 7f;
+                height = 20f;
+                homingPower = 0.045f;
+                shootEffect = Fx.shootBigColor;
+                smokeEffect = Fx.shootSmokeSquareSparse;
+                ammoMultiplier = 1;
+                hitColor = backColor = trailColor = Color.valueOf("858a9b");
+                frontColor = Color.valueOf("dae1ee");
+                trailWidth = 6f;
+                trailLength = 6;
+                hitEffect = despawnEffect = Fx.hitSquaresColor;
+                buildingDamageMultiplier = 0.2f;
+            }}
+            );
+
+            shoot = new ShootSpread(15, 4f);
+
+            coolantMultiplier = 15f;
+
+            inaccuracy = 0.2f;
+            velocityRnd = 0.17f;
+            shake = 1f;
+            ammoPerShot = 3;
+            maxAmmo = 30;
+            consumeAmmoOnce = true;
+            targetUnderBlocks = false;
+
+            shootSound = Sounds.shootAltLong;
+
+            drawer = new DrawTurret("reinforced-"){{
+                parts.add(new RegionPart("-front"){{
+                    progress = PartProgress.warmup;
+                    moveRot = -10f;
+                    mirror = true;
+                    moves.add(new PartMove(PartProgress.recoil, 0f, -3f, -5f));
+                    heatColor = Color.red;
+                }});
+            }};
+            shootY = 5f;
+            outlineColor = Pal.darkOutline;
+            size = 3;
+            envEnabled |= Env.space;
+            reload = 30f;
+            recoil = 2f;
+            range = 125;
+            shootCone = 40f;
+            scaledHealth = 210;
+            rotateSpeed = 3f;
+
+            coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f));
+            limitRange(25f);
+        }};
+
+        sublimate = new ContinuousLiquidTurret("sublimate"){{
+            requirements(Category.turret, with(Items.tungsten, 150, Items.silicon, 200, Items.oxide, 40, Items.beryllium, 400));
+
+            drawer = new DrawTurret("reinforced-"){{
+
+                Color heatc = Color.valueOf("fa2859");
+                heatColor = heatc;
+
+                parts.addAll(
+                new RegionPart("-back"){{
+                    progress = PartProgress.warmup;
+                    mirror = true;
+                    moveRot = 40f;
+                    x = 22 / 4f;
+                    y = -1f / 4f;
+                    moveY = 6f / 4f;
+                    under = true;
+                    heatColor = heatc;
+                }},
+                new RegionPart("-front"){{
+                    progress = PartProgress.warmup;
+                    mirror = true;
+                    moveRot = 40f;
+                    x = 20 / 4f;
+                    y = 17f / 4f;
+                    moveX = 1f;
+                    moveY = 1f;
+                    under = true;
+                    heatColor = heatc;
+                }},
+                new RegionPart("-nozzle"){{
+                    progress = PartProgress.warmup;
+                    mirror = true;
+                    moveX = 8f / 4f;
+                    heatColor = Color.valueOf("f03b0e");
+                }});
+            }};
+            outlineColor = Pal.darkOutline;
+
+            liquidConsumed = 10f / 60f;
+            targetInterval = 5f;
+            newTargetInterval = 30f;
+            targetUnderBlocks = false;
+
+            float r = range = 130f;
+
+            loopSound = Sounds.torch;
+            shootSound = Sounds.none;
+            loopSoundVolume = 1f;
+
+            ammo(
+            Liquids.ozone, new ContinuousFlameBulletType(){{
+                damage = 60f;
+                length = r;
+                knockback = 1f;
+                pierceCap = 2;
+                buildingDamageMultiplier = 0.3f;
+
+                colors = new Color[]{Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white};
+            }},
+            Liquids.cyanogen, new ContinuousFlameBulletType(){{
+                damage = 130f;
+                rangeChange = 70f;
+                length = r + rangeChange;
+                knockback = 2f;
+                pierceCap = 3;
+                buildingDamageMultiplier = 0.3f;
+
+                colors = new Color[]{Color.valueOf("465ab8").a(0.55f), Color.valueOf("66a6d2").a(0.7f), Color.valueOf("89e8b6").a(0.8f), Color.valueOf("cafcbe"), Color.white};
+                flareColor = Color.valueOf("89e8b6");
+
+                lightColor = hitColor = flareColor;
+            }}
+            );
+
+            scaledHealth = 210;
+            shootY = 7f;
+            size = 3;
+
+            researchCost = with(Items.tungsten, 400, Items.silicon, 400, Items.oxide, 80, Items.beryllium, 800);
+        }};
+
+        titan = new ItemTurret("titan"){{
+            requirements(Category.turret, with(Items.tungsten, 250, Items.silicon, 300, Items.thorium, 400));
+
+            ammo(
+            //TODO another ammo type
+            Items.thorium, new ArtilleryBulletType(2.5f, 350, "shell"){{
+                hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke);
+                despawnEffect = Fx.none;
+                knockback = 2f;
+                lifetime = 140f;
+                height = 19f;
+                width = 17f;
+                splashDamageRadius = 65f;
+                splashDamage = 350f;
+                scaledSplashDamage = true;
+                backColor = hitColor = trailColor = Color.valueOf("ea8878").lerp(Pal.redLight, 0.5f);
+                frontColor = Color.white;
+                ammoMultiplier = 1f;
+                hitSound = Sounds.titanExplosion;
+
+                status = StatusEffects.blasted;
+
+                trailLength = 32;
+                trailWidth = 3.35f;
+                trailSinScl = 2.5f;
+                trailSinMag = 0.5f;
+                trailEffect = Fx.none;
+                despawnShake = 7f;
+
+                shootEffect = Fx.shootTitan;
+                smokeEffect = Fx.shootSmokeTitan;
+
+                trailInterp = v -> Math.max(Mathf.slope(v), 0.8f);
+                shrinkX = 0.2f;
+                shrinkY = 0.1f;
+                buildingDamageMultiplier = 0.3f;
+            }},
+            Items.carbide, new ArtilleryBulletType(2.5f, 500, "shell"){{
+                hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke);
+                despawnEffect = Fx.none;
+                knockback = 3f;
+                lifetime = 140f;
+                height = 19f;
+                width = 17f;
+                splashDamageRadius = 55f;
+                splashDamage = 650f;
+                rangeChange = 10f*8f;
+                scaledSplashDamage = true;
+                backColor = hitColor = trailColor = Color.valueOf("ab8ec5");
+                frontColor = Color.white;
+                ammoMultiplier = 1f;
+                hitSound = Sounds.titanExplosion;
+
+                status = StatusEffects.blasted;
+
+                trailLength = 32;
+                trailWidth = 3.35f;
+                trailSinScl = 2.5f;
+                trailSinMag = 0.5f;
+                trailEffect = Fx.disperseTrail;
+                trailInterval = 2f;
+                despawnShake = 7f;
+
+                shootEffect = Fx.shootTitan;
+                smokeEffect = Fx.shootSmokeTitan;
+                trailRotation = true;
+
+                trailInterp = v -> Math.max(Mathf.slope(v), 0.8f);
+                shrinkX = 0.2f;
+                shrinkY = 0.1f;
+                buildingDamageMultiplier = 0.2f;
+            }},
+            Items.oxide, new ArtilleryBulletType(2.5f, 300, "shell"){{
+                hitEffect = new MultiEffect(Fx.titanExplosionLarge, Fx.titanSmokeLarge, Fx.smokeAoeCloud);
+                despawnEffect = Fx.none;
+                knockback = 2f;
+                lifetime = 190f;
+                height = 19f;
+                width = 17f;
+                reloadMultiplier = 0.8f;
+                splashDamageRadius = 110f;
+                rangeChange = 8f;
+                splashDamage = 300f;
+                scaledSplashDamage = true;
+                hitColor = backColor = trailColor = Color.valueOf("a0b380");
+                frontColor = Color.valueOf("e4ffd6");
+                ammoMultiplier = 1f;
+                hitSound = Sounds.titanExplosion;
+
+                status = StatusEffects.blasted;
+
+                trailLength = 32;
+                trailWidth = 3.35f;
+                trailSinScl = 2.5f;
+                trailSinMag = 0.5f;
+                trailEffect = Fx.vapor;
+                trailInterval = 3f;
+                despawnShake = 7f;
+
+                shootEffect = Fx.shootTitan;
+                smokeEffect = Fx.shootSmokeTitan;
+
+                trailInterp = v -> Math.max(Mathf.slope(v), 0.8f);
+                shrinkX = 0.2f;
+                shrinkY = 0.1f;
+                buildingDamageMultiplier = 0.25f;
+
+                fragBullets = 1;
+                fragBullet = new EmptyBulletType(){{
+                    lifetime = 60f * 2.5f;
+                    bulletInterval = 20f;
+                    intervalBullet = new EmptyBulletType(){{
+                        splashDamage = 30f;
+                        collidesGround = true;
+                        collidesAir = false;
+                        collides = false;
+                        hitEffect = Fx.none;
+                        pierce = true;
+                        instantDisappear = true;
+                        splashDamageRadius = 90f;
+                        buildingDamageMultiplier = 0.2f;
+                    }};
+                }};
+            }}
+            );
+
+            shootSound = Sounds.mediumCannon;
+            ammoPerShot = 4;
+            maxAmmo = ammoPerShot * 3;
+            targetAir = false;
+            shake = 4f;
+            recoil = 1f;
+            reload = 60f * 2.3f;
+            shootY = 7f;
+            rotateSpeed = 1.4f;
+            minWarmup = 0.85f;
+
+            newTargetInterval = 40f;
+            shootWarmupSpeed = 0.07f;
+            warmupMaintainTime = 120f;
+
+            coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f));
+            coolantMultiplier = 3.75f;
+
+            drawer = new DrawTurret("reinforced-"){{
+                parts.addAll(
+                new RegionPart("-barrel"){{
+                    progress = PartProgress.recoil.curve(Interp.pow2In);
+                    moveY = -5f * 4f / 3f;
+                    heatColor = Color.valueOf("f03b0e");
+                    mirror = false;
+                }},
+                new RegionPart("-side"){{
+                    heatProgress = PartProgress.warmup;
+                    progress = PartProgress.warmup;
+                    mirror = true;
+                    moveX = 2f * 4f / 3f;
+                    moveY = -0.5f;
+                    moveRot = -40f;
+                    under = true;
+                    heatColor = Color.red.cpy();
+                }});
+            }};
+
+            shootWarmupSpeed = 0.08f;
+
+            outlineColor = Pal.darkOutline;
+
+            consumeLiquid(Liquids.hydrogen, 5f / 60f);
+
+            scaledHealth = 250;
+            range = 390f;
+            size = 4;
+        }};
+
+        disperse = new ItemTurret("disperse"){{
+            requirements(Category.turret, with(Items.thorium, 50, Items.oxide, 150, Items.silicon, 200, Items.beryllium, 350));
+
+            ammo(
+            Items.tungsten, new BasicBulletType(){{
+                damage = 65;
+                speed = 8.5f;
+                width = height = 16;
+                shrinkY = 0.3f;
+                backSprite = "large-bomb-back";
+                sprite = "mine-bullet";
+                velocityRnd = 0.11f;
+                collidesGround = false;
+                collidesTiles = false;
+                shootEffect = Fx.shootBig2;
+                smokeEffect = Fx.shootSmokeDisperse;
+                frontColor = Color.white;
+                backColor = trailColor = hitColor = Color.sky;
+                trailChance = 0.44f;
+                ammoMultiplier = 3f;
+
+                lifetime = 34f;
+                rotationOffset = 90f;
+                trailRotation = true;
+                trailEffect = Fx.disperseTrail;
+
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+            }},
+            Items.thorium, new BasicBulletType(){{
+                damage = 90;
+                reloadMultiplier = 0.85f;
+                speed = 9.5f;
+                width = height = 16;
+                pierceCap = 2;
+                shrinkY = 0.3f;
+                backSprite = "large-bomb-back";
+                sprite = "mine-bullet";
+                velocityRnd = 0.5f;
+                collidesGround = false;
+                collidesTiles = false;
+                shootEffect = Fx.shootBig2;
+                smokeEffect = Fx.shootSmokeDisperse;
+                frontColor = Color.white;
+                backColor = trailColor = hitColor = Color.valueOf("e89dbd");
+                trailChance = 0.44f;
+                ammoMultiplier = 2f;
+
+                lifetime = 34f;
+                rotationOffset = 90f;
+                trailRotation = true;
+                trailEffect = Fx.disperseTrail;
+
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+            }},
+            Items.silicon, new BasicBulletType(){{
+                damage = 35;
+                homingPower = 0.045f;
+
+                reloadMultiplier = 0.9f;
+                speed = 9f;
+                width = height = 16;
+                shrinkY = 0.3f;
+                backSprite = "large-bomb-back";
+                sprite = "mine-bullet";
+                velocityRnd = 0.11f;
+                collidesGround = false;
+                collidesTiles = false;
+                shootEffect = Fx.shootBig2;
+                smokeEffect = Fx.shootSmokeDisperse;
+                frontColor = Color.valueOf("dae1ee");
+                backColor = trailColor = hitColor = Color.valueOf("858a9b");
+                ammoMultiplier = 3f;
+
+                lifetime = 34f;
+                rotationOffset = 90f;
+                trailLength = 7;
+                //for chasing targets
+                extraRangeMargin = 32f;
+
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+            }},
+
+            Items.surgeAlloy, new BasicBulletType(){{
+                reloadMultiplier = 0.5f;
+                damage = 65;
+                rangeChange = 8f * 3f;
+                lightning = 3;
+                lightningLength = 4;
+                lightningDamage = 18f;
+                lightningLengthRand = 3;
+                speed = 6f;
+                width = height = 16;
+                shrinkY = 0.3f;
+                backSprite = "large-bomb-back";
+                sprite = "mine-bullet";
+                velocityRnd = 0.11f;
+                collidesGround = false;
+                collidesTiles = false;
+                shootEffect = Fx.shootBig2;
+                smokeEffect = Fx.shootSmokeDisperse;
+                frontColor = Color.white;
+                backColor = trailColor = hitColor = Pal.surge;
+                trailChance = 0.44f;
+                ammoMultiplier = 3f;
+
+                lifetime = 34f;
+                rotationOffset = 90f;
+                trailRotation = true;
+                trailEffect = Fx.disperseTrail;
+
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+
+                bulletInterval = 4f;
+
+                intervalBullet = new BulletType(){{
+                    collidesGround = false;
+                    collidesTiles = false;
+                    lightningLengthRand = 4;
+                    lightningLength = 2;
+                    lightningCone = 30f;
+                    lightningDamage = 20f;
+                    lightning = 1;
+                    hittable = collides = false;
+                    instantDisappear = true;
+                    hitEffect = despawnEffect = Fx.none;
+                }};
+            }}
+            );
+
+            reload = 9f;
+            shootY = 15f;
+            rotateSpeed = 5f;
+            shootCone = 30f;
+            consumeAmmoOnce = true;
+            shootSound = Sounds.shootBig;
+
+            drawer = new DrawTurret("reinforced-"){{
+                parts.add(new RegionPart("-side"){{
+                    mirror = true;
+                    under = true;
+                    moveX = 1.75f;
+                    moveY = -0.5f;
+                }},
+                new RegionPart("-mid"){{
+                    under = true;
+                    moveY = -1.5f;
+                    progress = PartProgress.recoil;
+                    heatProgress = PartProgress.recoil.add(0.25f).min(PartProgress.warmup);
+                    heatColor = Color.sky.cpy().a(0.9f);
+                }},
+                new RegionPart("-blade"){{
+                    heatProgress = PartProgress.warmup;
+                    heatColor = Color.sky.cpy().a(0.9f);
+                    mirror = true;
+                    under = true;
+                    moveY = 1f;
+                    moveX = 1.5f;
+                    moveRot = 8;
+                }});
+            }};
+
+            shoot = new ShootAlternate(){{
+                spread = 4.7f;
+                shots = 4;
+                barrels = 4;
+            }};
+
+            targetGround = false;
+            inaccuracy = 8f;
+
+            shootWarmupSpeed = 0.08f;
+
+            outlineColor = Pal.darkOutline;
+
+            scaledHealth = 280;
+            range = 310f;
+            size = 4;
+
+            coolant = consume(new ConsumeLiquid(Liquids.water, 20f / 60f));
+            coolantMultiplier = 6.25f;
+
+            limitRange(16f);
+        }};
+
+        afflict = new PowerTurret("afflict"){{
+            requirements(Category.turret, with(Items.surgeAlloy, 125, Items.silicon, 200, Items.graphite, 250, Items.oxide, 40));
+
+            shootType = new BasicBulletType(){{
+                shootEffect = new MultiEffect(Fx.shootTitan, new WaveEffect(){{
+                    colorTo = Pal.surge;
+                    sizeTo = 26f;
+                    lifetime = 14f;
+                    strokeFrom = 4f;
+                }});
+                smokeEffect = Fx.shootSmokeTitan;
+                hitColor = Pal.surge;
+
+                sprite = "large-orb";
+                trailEffect = Fx.missileTrail;
+                trailInterval = 3f;
+                trailParam = 4f;
+                pierceCap = 2;
+                buildingDamageMultiplier = 0.5f;
+                fragOnHit = false;
+                speed = 5f;
+                damage = 180f;
+                lifetime = 80f;
+                width = height = 16f;
+                backColor = Pal.surge;
+                frontColor = Color.white;
+                shrinkX = shrinkY = 0f;
+                trailColor = Pal.surge;
+                trailLength = 12;
+                trailWidth = 2.2f;
+                despawnEffect = hitEffect = new ExplosionEffect(){{
+                    waveColor = Pal.surge;
+                    smokeColor = Color.gray;
+                    sparkColor = Pal.sap;
+                    waveStroke = 4f;
+                    waveRad = 40f;
+                }};
+                despawnSound = Sounds.dullExplosion;
+
+                //TODO shoot sound
+                shootSound = Sounds.cannon;
+
+                fragBullet = intervalBullet = new BasicBulletType(3f, 35){{
+                    width = 9f;
+                    hitSize = 5f;
+                    height = 15f;
+                    pierce = true;
+                    lifetime = 35f;
+                    pierceBuilding = true;
+                    hitColor = backColor = trailColor = Pal.surge;
+                    frontColor = Color.white;
+                    trailWidth = 2.1f;
+                    trailLength = 5;
+                    hitEffect = despawnEffect = new WaveEffect(){{
+                        colorFrom = colorTo = Pal.surge;
+                        sizeTo = 4f;
+                        strokeFrom = 4f;
+                        lifetime = 10f;
+                    }};
+                    buildingDamageMultiplier = 0.3f;
+                    homingPower = 0.2f;
+                }};
+
+                bulletInterval = 3f;
+                intervalRandomSpread = 20f;
+                intervalBullets = 2;
+                intervalAngle = 180f;
+                intervalSpread = 300f;
+
+                fragBullets = 20;
+                fragVelocityMin = 0.5f;
+                fragVelocityMax = 1.5f;
+                fragLifeMin = 0.5f;
+            }};
+
+            drawer = new DrawTurret("reinforced-"){{
+                parts.add(new RegionPart("-blade"){{
+                    progress = PartProgress.recoil;
+                    heatColor = Color.valueOf("ff6214");
+                    mirror = true;
+                    under = true;
+                    moveX = 2f;
+                    moveY = -1f;
+                    moveRot = -7f;
+                }},
+                new RegionPart("-blade-glow"){{
+                    progress = PartProgress.recoil;
+                    heatProgress = PartProgress.warmup;
+                    heatColor = Color.valueOf("ff6214");
+                    drawRegion = false;
+                    mirror = true;
+                    under = true;
+                    moveX = 2f;
+                    moveY = -1f;
+                    moveRot = -7f;
+                }});
+            }};
+
+            consumePower(5f);
+            heatRequirement = 10f;
+            maxHeatEfficiency = 2f;
+
+            newTargetInterval = 40f;
+
+            inaccuracy = 1f;
+            shake = 2f;
+            shootY = 4;
+            outlineColor = Pal.darkOutline;
+            size = 4;
+            envEnabled |= Env.space;
+            reload = 100f;
+            cooldownTime = reload;
+            recoil = 3f;
+            range = 350;
+            shootCone = 20f;
+            scaledHealth = 220;
+            rotateSpeed = 1.5f;
+            researchCostMultiplier = 0.04f;
+
+            limitRange(9f);
+        }};
+
+        lustre = new ContinuousTurret("lustre"){{
+            requirements(Category.turret, with(Items.silicon, 250, Items.graphite, 200, Items.oxide, 50, Items.carbide, 90));
+
+            shootType = new PointLaserBulletType(){{
+                damage = 210f;
+                buildingDamageMultiplier = 0.3f;
+                hitColor = Color.valueOf("fda981");
+            }};
+
+            drawer = new DrawTurret("reinforced-"){{
+                var heatp = PartProgress.warmup.blend(p -> Mathf.absin(2f, 1f) * p.warmup, 0.2f);
+
+                parts.add(new RegionPart("-blade"){{
+                    progress = PartProgress.warmup;
+                    heatProgress = PartProgress.warmup;
+                    heatColor = Color.valueOf("ff6214");
+                    mirror = true;
+                    under = true;
+                    moveX = 2f;
+                    moveRot = -7f;
+                    moves.add(new PartMove(PartProgress.warmup, 0f, -2f, 3f));
+                }},
+                new RegionPart("-inner"){{
+                    heatProgress = heatp;
+                    progress = PartProgress.warmup;
+                    heatColor = Color.valueOf("ff6214");
+                    mirror = true;
+                    under = false;
+                    moveX = 2f;
+                    moveY = -8f;
+                }},
+                new RegionPart("-mid"){{
+                    heatProgress = heatp;
+                    progress = PartProgress.warmup;
+                    heatColor = Color.valueOf("ff6214");
+                    moveY = -8f;
+                    mirror = false;
+                    under = true;
+                }});
+            }};
+
+            scaleDamageEfficiency = true;
+            shootSound = Sounds.none;
+            loopSoundVolume = 1f;
+            loopSound = Sounds.laserbeam;
+
+            shootWarmupSpeed = 0.08f;
+            shootCone = 360f;
+
+            aimChangeSpeed = 0.9f;
+            rotateSpeed = 0.9f;
+
+            shootY = 0.5f;
+            outlineColor = Pal.darkOutline;
+            size = 4;
+            envEnabled |= Env.space;
+            range = 250f;
+            scaledHealth = 210;
+
+            unitSort = UnitSorts.strongest;
+
+            consumeLiquid(Liquids.nitrogen, 6f / 60f);
+            consumePower(200f / 60f);
+        }};
+
+        scathe = new ItemTurret("scathe"){{
+            requirements(Category.turret, with(Items.silicon, 450, Items.graphite, 400, Items.tungsten, 500, Items.oxide, 100, Items.carbide, 200));
+
+            predictTarget = false;
+
+            ammo(
+            Items.carbide, new BulletType(0f, 0f){{
+                shootEffect = Fx.shootBig;
+                smokeEffect = Fx.shootSmokeMissileColor;
+                hitColor = Pal.redLight;
+                ammoMultiplier = 1f;
+
+                spawnUnit = new MissileUnitType("scathe-missile"){{
+                    speed = 4.6f;
+                    maxRange = 6f;
+                    lifetime = 60f * 5.5f;
+                    outlineColor = Pal.darkOutline;
+                    engineColor = trailColor = Pal.redLight;
+                    engineLayer = Layer.effect;
+                    engineSize = 3.1f;
+                    engineOffset = 10f;
+                    rotateSpeed = 0.25f;
+                    trailLength = 18;
+                    missileAccelTime = 50f;
+                    lowAltitude = true;
+                    loopSound = Sounds.missileTrail;
+                    loopSoundVolume = 0.6f;
+                    deathSound = Sounds.largeExplosion;
+                    targetAir = false;
+                    targetUnderBlocks = false;
+
+                    fogRadius = 6f;
+
+                    health = 210;
+
+                    weapons.add(new Weapon(){{
+                        shootCone = 360f;
+                        mirror = false;
+                        reload = 1f;
+                        deathExplosionEffect = Fx.massiveExplosion;
+                        shootOnDeath = true;
+                        shake = 10f;
+                        bullet = new ExplosionBulletType(1500f, 65f){{
+                            hitColor = Pal.redLight;
+                            shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosion, Fx.scatheLight, new WaveEffect(){{
+                                lifetime = 10f;
+                                strokeFrom = 4f;
+                                sizeTo = 130f;
+                            }});
+
+                            collidesAir = false;
+                            buildingDamageMultiplier = 0.25f;
+
+                            ammoMultiplier = 1f;
+                            fragLifeMin = 0.1f;
+                            fragBullets = 7;
+                            fragBullet = new ArtilleryBulletType(3.4f, 32){{
+                                buildingDamageMultiplier = 0.3f;
+                                drag = 0.02f;
+                                hitEffect = Fx.massiveExplosion;
+                                despawnEffect = Fx.scatheSlash;
+                                knockback = 0.8f;
+                                lifetime = 23f;
+                                width = height = 18f;
+                                collidesTiles = false;
+                                splashDamageRadius = 40f;
+                                splashDamage = 160f;
+                                backColor = trailColor = hitColor = Pal.redLight;
+                                frontColor = Color.white;
+                                smokeEffect = Fx.shootBigSmoke2;
+                                despawnShake = 7f;
+                                lightRadius = 30f;
+                                lightColor = Pal.redLight;
+                                lightOpacity = 0.5f;
+
+                                trailLength = 20;
+                                trailWidth = 3.5f;
+                                trailEffect = Fx.none;
+                            }};
+                        }};
+                    }});
+
+                    abilities.add(new MoveEffectAbility(){{
+                        effect = Fx.missileTrailSmoke;
+                        rotation = 180f;
+                        y = -9f;
+                        color = Color.grays(0.6f).lerp(Pal.redLight, 0.5f).a(0.4f);
+                        interval = 7f;
+                    }});
+                }};
+            }},
+
+            Items.phaseFabric, new BulletType(0f, 0f){{
+                shootEffect = Fx.shootBig;
+                smokeEffect = Fx.shootSmokeMissileColor;
+                hitColor = Color.valueOf("ffd37f");
+                ammoMultiplier = 5f;
+                reloadMultiplier = 0.8f;
+
+                spawnUnit = new MissileUnitType("scathe-missile-phase"){{
+                    speed = 4f;
+                    maxRange = 6f;
+                    lifetime = 60f * 6.1f;
+                    outlineColor = Pal.darkOutline;
+                    engineColor = trailColor = Color.valueOf("ffd37f");
+                    engineLayer = Layer.effect;
+                    engineSize = 3.1f;
+                    engineOffset = 10f;
+                    rotateSpeed = 0.2f;
+                    trailLength = 18;
+                    missileAccelTime = 50f;
+                    lowAltitude = true;
+                    loopSound = Sounds.missileTrail;
+                    loopSoundVolume = 0.6f;
+                    deathSound = Sounds.largeExplosion;
+                    targetAir = false;
+                    targetUnderBlocks = false;
+
+                    parts.add(new ShapePart(){{
+                        progress = PartProgress.constant(1f);
+                        color = Pal.accent;
+                        sides = 6;
+                        radius = 3f;
+                        rotateSpeed = 3f;
+                        hollow = true;
+                        layer = Layer.effect;
+                        y = 1.8f;
+                    }});
+
+                    fogRadius = 6f;
+
+                    health = 500;
+
+                    weapons.add(new Weapon(){{
+                        shootCone = 360f;
+                        mirror = false;
+                        reload = 1f;
+                        deathExplosionEffect = Fx.massiveExplosion;
+                        shootOnDeath = true;
+                        shake = 10f;
+                        bullet = new ExplosionBulletType(400f, 120f){{
+                            hitColor = engineColor;
+                            shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosion, Fx.scatheLight, new WaveEffect(){{
+                                lifetime = 10f;
+                                strokeFrom = 4f;
+                                sizeTo = 130f;
+                            }});
+
+                            collidesAir = false;
+                            buildingDamageMultiplier = 0.1f;
+
+                            ammoMultiplier = 1f;
+                            fragLifeMin = 0.1f;
+                            fragBullets = 7;
+                            fragBullet = new ArtilleryBulletType(3.4f, 32){{
+                                buildingDamageMultiplier = 0.2f;
+                                drag = 0.02f;
+                                hitEffect = Fx.massiveExplosion;
+                                despawnEffect = Fx.scatheSlash;
+                                knockback = 0.8f;
+                                lifetime = 23f;
+                                width = height = 18f;
+                                collidesTiles = false;
+                                splashDamageRadius = 56f;
+                                splashDamage = 164f;
+                                backColor = trailColor = hitColor = engineColor;
+                                frontColor = Color.white;
+                                smokeEffect = Fx.shootBigSmoke2;
+                                despawnShake = 7f;
+                                lightRadius = 30f;
+                                lightColor = engineColor;
+                                lightOpacity = 0.5f;
+
+                                trailLength = 20;
+                                trailWidth = 3.5f;
+                                trailEffect = Fx.none;
+                            }};
+                        }};
+                    }});
+
+                    abilities.add(new MoveEffectAbility(){{
+                        effect = Fx.missileTrailSmoke;
+                        rotation = 180f;
+                        y = -9f;
+                        color = Color.grays(0.6f).lerp(Pal.redLight, 0.5f).a(0.4f);
+                        interval = 7f;
+                    }});
+
+                    abilities.add(new ForceFieldAbility(90f, 0f, 2000f, 999999999f));
+
+                }};
+            }},
+
+            Items.surgeAlloy, new BulletType(0f, 0f){{
+                shootEffect = Fx.shootBig;
+                smokeEffect = Fx.shootSmokeMissileColor;
+                hitColor = Color.valueOf("f7e97e");
+
+                ammoMultiplier = 1f;
+                rangeChange = -8f*9f;
+                reloadMultiplier = 0.9f;
+
+                spawnUnit = new MissileUnitType("scathe-missile-surge"){{
+                    speed = 4.4f;
+                    maxRange = 6f;
+                    lifetime = 60f * 1.4f;
+                    outlineColor = Pal.darkOutline;
+                    engineColor = trailColor = Color.valueOf("f7e97e");
+                    engineLayer = Layer.effect;
+                    engineSize = 3.1f;
+                    engineOffset = 10f;
+                    rotateSpeed = 0.25f;
+                    trailLength = 18;
+                    missileAccelTime = 30f;
+                    lowAltitude = true;
+                    loopSound = Sounds.missileTrail;
+                    loopSoundVolume = 0.6f;
+                    deathSound = Sounds.largeExplosion;
+                    targetAir = false;
+                    targetUnderBlocks = false;
+
+                    fogRadius = 6f;
+
+                    health = 400;
+
+                    weapons.add(new Weapon(){{
+                        shootCone = 360f;
+                        rotate = true;
+                        rotationLimit = rotateSpeed = 0f;
+                        reload = 1f;
+                        deathExplosionEffect = Fx.massiveExplosion;
+                        shootOnDeath = true;
+                        shake = 10f;
+                        bullet = new ExplosionBulletType(300f, 40f){{
+                            hitColor = engineColor;
+                            shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosionSmall);
+
+                            collidesAir = false;
+                            buildingDamageMultiplier = 0.1f;
+
+                            ammoMultiplier = 1f;
+                            fragLifeMin = 0.1f;
+                            fragBullets = 5;
+                            fragRandomSpread = 0f;
+                            fragSpread = 30f;
+                            fragBullet = new BulletType(){{
+                                shootEffect = Fx.shootBig;
+                                smokeEffect = Fx.shootSmokeMissileColor;
+                                hitColor = engineColor;
+                                ammoMultiplier = 1f;
+
+                                spawnUnit = new MissileUnitType("scathe-missile-surge-split"){{
+                                    speed = 4.8f;
+                                    maxRange = 6f;
+                                    lifetime = 60f * 3.5f;
+                                    outlineColor = Pal.darkOutline;
+                                    engineColor = trailColor = Color.valueOf("f7e97e");
+                                    engineLayer = Layer.effect;
+                                    engineSize = 2.2f;
+                                    engineOffset = 8f;
+                                    rotateSpeed = 1.4f;
+                                    trailLength = 12;
+                                    lowAltitude = true;
+                                    loopSound = Sounds.missileTrail;
+                                    loopSoundVolume = 0.6f;
+                                    deathSound = Sounds.largeExplosion;
+                                    targetAir = false;
+                                    targetUnderBlocks = false;
+
+                                    fogRadius = 6f;
+
+                                    health = 100;
+
+                                    weapons.add(new Weapon(){{
+                                        shootCone = 360f;
+                                        mirror = false;
+                                        reload = 1f;
+                                        deathExplosionEffect = Fx.massiveExplosion;
+                                        shootOnDeath = true;
+                                        shake = 10f;
+                                        bullet = new ExplosionBulletType(360f, 35f){{
+                                            lightning = 6;
+                                            lightningDamage = 35f;
+                                            lightningLength = 8;
+
+                                            hitColor = engineColor;
+                                            shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosionSmall, Fx.scatheLightSmall, new WaveEffect(){{
+                                                lifetime = 10f;
+                                                strokeFrom = 4f;
+                                                sizeTo = 100f;
+                                            }});
+
+                                            collidesAir = false;
+                                            buildingDamageMultiplier = 0.1f;
+                                        }};
+                                    }});
+
+                                    abilities.add(new MoveEffectAbility(){{
+                                        effect = Fx.missileTrailSmokeSmall;
+                                        rotation = 180f;
+                                        y = -9f;
+                                        color = Color.grays(0.6f).lerp(Color.valueOf("f7e97e"), 0.5f).a(0.4f);
+                                        interval = 5f;
+                                    }});
+                                }};
+                            }};
+                        }};
+                    }});
+
+                    abilities.add(new MoveEffectAbility(){{
+                        effect = Fx.missileTrailSmoke;
+                        rotation = 180f;
+                        y = -9f;
+                        color = Color.grays(0.6f).lerp(Color.valueOf("f7e97e"), 0.5f).a(0.4f);
+                        interval = 7f;
+                    }});
+                }};
+            }}
+            );
+
+            drawer = new DrawTurret("reinforced-"){{
+                parts.add(new RegionPart("-blade"){{
+                    progress = PartProgress.warmup;
+                    heatProgress = PartProgress.warmup;
+                    heatColor = Color.red;
+                    moveRot = -22f;
+                    moveX = 0f;
+                    moveY = -5f;
+                    mirror = true;
+                    children.add(new RegionPart("-side"){{
+                        progress = PartProgress.warmup.delay(0.6f);
+                        heatProgress = PartProgress.recoil;
+                        heatColor = Color.red;
+                        mirror = true;
+                        under = false;
+                        moveY = -4f;
+                        moveX = 1f;
+
+                        moves.add(new PartMove(PartProgress.recoil, 1f, 6f, -40f));
+                    }});
+                }},
+                new RegionPart("-mid"){{
+                    progress = PartProgress.recoil;
+                    heatProgress = PartProgress.warmup.add(-0.2f).add(p -> Mathf.sin(9f, 0.2f) * p.warmup);
+                    mirror = false;
+                    under = true;
+                    moveY = -5f;
+                }}, new RegionPart("-missile"){{
+                    progress = PartProgress.reload.curve(Interp.pow2In);
+
+                    colorTo = new Color(1f, 1f, 1f, 0f);
+                    color = Color.white;
+                    mixColorTo = Pal.accent;
+                    mixColor = new Color(1f, 1f, 1f, 0f);
+                    outline = false;
+                    under = true;
+
+                    layerOffset = -0.01f;
+
+                    moves.add(new PartMove(PartProgress.warmup.inv(), 0f, -4f, 0f));
+                }});
+            }};
+
+            recoil = 0.5f;
+
+            fogRadiusMultiplier = 0.4f;
+            coolantMultiplier = 15f;
+            shootSound = Sounds.missileLaunch;
+
+            minWarmup = 0.94f;
+            newTargetInterval = 40f;
+            unitSort = UnitSorts.strongest;
+            shootWarmupSpeed = 0.03f;
+            targetAir = false;
+            targetUnderBlocks = false;
+
+            shake = 6f;
+            ammoPerShot = 15;
+            maxAmmo = 45;
+            shootY = -1;
+            outlineColor = Pal.darkOutline;
+            size = 4;
+            envEnabled |= Env.space;
+            reload = 600f;
+            range = 1350;
+            shootCone = 1f;
+            scaledHealth = 220;
+            rotateSpeed = 0.9f;
+
+            coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f));
+            limitRange();
+        }};
+
+        smite = new ItemTurret("smite"){{
+            requirements(Category.turret, with(Items.oxide, 200, Items.surgeAlloy, 400, Items.silicon, 800, Items.carbide, 500, Items.phaseFabric, 300));
+
+            ammo(
+            Items.surgeAlloy, new BasicBulletType(7f, 250){{
+                sprite = "large-orb";
+                width = 17f;
+                height = 21f;
+                hitSize = 8f;
+
+                shootEffect = new MultiEffect(Fx.shootTitan, Fx.colorSparkBig, new WaveEffect(){{
+                    colorFrom = colorTo = Pal.accent;
+                    lifetime = 12f;
+                    sizeTo = 20f;
+                    strokeFrom = 3f;
+                    strokeTo = 0.3f;
+                }});
+                smokeEffect = Fx.shootSmokeSmite;
+                ammoMultiplier = 1;
+                pierceCap = 4;
+                pierce = true;
+                pierceBuilding = true;
+                hitColor = backColor = trailColor = Pal.accent;
+                frontColor = Color.white;
+                trailWidth = 2.8f;
+                trailLength = 9;
+                hitEffect = Fx.hitBulletColor;
+                buildingDamageMultiplier = 0.3f;
+
+                despawnEffect = new MultiEffect(Fx.hitBulletColor, new WaveEffect(){{
+                    sizeTo = 30f;
+                    colorFrom = colorTo = Pal.accent;
+                    lifetime = 12f;
+                }});
+
+                trailRotation = true;
+                trailEffect = Fx.disperseTrail;
+                trailInterval = 3f;
+
+                intervalBullet = new LightningBulletType(){{
+                    damage = 30;
+                    collidesAir = false;
+                    ammoMultiplier = 1f;
+                    lightningColor = Pal.accent;
+                    lightningLength = 5;
+                    lightningLengthRand = 10;
+
+                    //for visual stats only.
+                    buildingDamageMultiplier = 0.25f;
+
+                    lightningType = new BulletType(0.0001f, 0f){{
+                        lifetime = Fx.lightning.lifetime;
+                        hitEffect = Fx.hitLancer;
+                        despawnEffect = Fx.none;
+                        status = StatusEffects.shocked;
+                        statusDuration = 10f;
+                        hittable = false;
+                        lightColor = Color.white;
+                        buildingDamageMultiplier = 0.25f;
+                    }};
+                }};
+
+                bulletInterval = 3f;
+            }}
+            );
+
+            shoot = new ShootMulti(new ShootAlternate(){{
+                spread = 3.3f * 1.9f;
+                shots = barrels = 5;
+            }}, new ShootHelix(){{
+                scl = 4f;
+                mag = 3f;
+            }});
+
+            shootSound = Sounds.shootSmite;
+            minWarmup = 0.99f;
+            coolantMultiplier = 15f;
+
+            var haloProgress = PartProgress.warmup.delay(0.5f);
+            float haloY = -15f, haloRotSpeed = 1f;
+
+            shake = 2f;
+            ammoPerShot = 2;
+            drawer = new DrawTurret("reinforced-"){{
+                parts.addAll(
+
+                new RegionPart("-mid"){{
+                    heatProgress = PartProgress.heat.blend(PartProgress.warmup, 0.5f);
+                    mirror = false;
+                }},
+                new RegionPart("-blade"){{
+                    progress = PartProgress.warmup;
+                    heatProgress = PartProgress.warmup;
+                    mirror = true;
+                    moveX = 5.5f;
+                    moves.add(new PartMove(PartProgress.recoil, 0f, -3f, 0f));
+                }},
+                new RegionPart("-front"){{
+                    progress = PartProgress.warmup;
+                    heatProgress = PartProgress.recoil;
+                    mirror = true;
+                    under = true;
+                    moveY = 4f;
+                    moveX = 6.5f;
+                    moves.add(new PartMove(PartProgress.recoil, 0f, -5.5f, 0f));
+                }},
+                new RegionPart("-back"){{
+                    progress = PartProgress.warmup;
+                    heatProgress = PartProgress.warmup;
+                    mirror = true;
+                    under = true;
+                    moveX = 5.5f;
+                }},
+                new ShapePart(){{
+                    progress = PartProgress.warmup.delay(0.2f);
+                    color = Pal.accent;
+                    circle = true;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = 2f;
+                    radius = 10f;
+                    layer = Layer.effect;
+                    y = haloY;
+                    rotateSpeed = haloRotSpeed;
+                }},
+                new ShapePart(){{
+                    progress = PartProgress.warmup.delay(0.2f);
+                    color = Pal.accent;
+                    circle = true;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = 1.6f;
+                    radius = 4f;
+                    layer = Layer.effect;
+                    y = haloY;
+                    rotateSpeed = haloRotSpeed;
+                }},
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = Pal.accent;
+                    layer = Layer.effect;
+                    y = haloY;
+
+                    haloRotation = 90f;
+                    shapes = 2;
+                    triLength = 0f;
+                    triLengthTo = 20f;
+                    haloRadius = 16f;
+                    tri = true;
+                    radius = 4f;
+                }},
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = Pal.accent;
+                    layer = Layer.effect;
+                    y = haloY;
+
+                    haloRotation = 90f;
+                    shapes = 2;
+                    triLength = 0f;
+                    triLengthTo = 5f;
+                    haloRadius = 16f;
+                    tri = true;
+                    radius = 4f;
+                    shapeRotation = 180f;
+                }},
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = Pal.accent;
+                    layer = Layer.effect;
+                    y = haloY;
+                    haloRotateSpeed = -haloRotSpeed;
+
+                    shapes = 4;
+                    triLength = 0f;
+                    triLengthTo = 5f;
+                    haloRotation = 45f;
+                    haloRadius = 16f;
+                    tri = true;
+                    radius = 8f;
+                }},
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = Pal.accent;
+                    layer = Layer.effect;
+                    y = haloY;
+                    haloRotateSpeed = -haloRotSpeed;
+
+                    shapes = 4;
+                    shapeRotation = 180f;
+                    triLength = 0f;
+                    triLengthTo = 2f;
+                    haloRotation = 45f;
+                    haloRadius = 16f;
+                    tri = true;
+                    radius = 8f;
+                }},
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = Pal.accent;
+                    layer = Layer.effect;
+                    y = haloY;
+                    haloRotateSpeed = haloRotSpeed;
+
+                    shapes = 4;
+                    triLength = 0f;
+                    triLengthTo = 3f;
+                    haloRotation = 45f;
+                    haloRadius = 10f;
+                    tri = true;
+                    radius = 6f;
+                }}
+                );
+
+                for(int i = 0; i < 3; i++){
+                    int fi = i;
+                    parts.add(new RegionPart("-blade-bar"){{
+                        progress = PartProgress.warmup;
+                        heatProgress = PartProgress.warmup;
+                        mirror = true;
+                        under = true;
+                        outline = false;
+                        layerOffset = -0.3f;
+                        turretHeatLayer = Layer.turret - 0.2f;
+                        y = 44f / 4f - fi * 38f / 4f;
+                        moveX = 2f;
+
+                        color = Pal.accent;
+                    }});
+                }
+
+                for(int i = 0; i < 4; i++){
+                    int fi = i;
+                    parts.add(new RegionPart("-spine"){{
+                        progress = PartProgress.warmup.delay(fi / 5f);
+                        heatProgress = PartProgress.warmup;
+                        mirror = true;
+                        under = true;
+                        layerOffset = -0.3f;
+                        turretHeatLayer = Layer.turret - 0.2f;
+                        moveY = -22f / 4f - fi * 3f;
+                        moveX = 52f / 4f - fi * 1f + 2f;
+                        moveRot = -fi * 30f;
+
+                        color = Pal.accent;
+                        moves.add(new PartMove(PartProgress.recoil.delay(fi / 5f), 0f, 0f, 35f));
+                    }});
+                }
+            }};
+
+            shootWarmupSpeed = 0.04f;
+            shootY = 15f;
+            outlineColor = Pal.darkOutline;
+            size = 5;
+            envEnabled |= Env.space;
+            warmupMaintainTime = 120f;
+            reload = 100f;
+            recoil = 2f;
+            range = 300;
+            trackingRange = range * 1.4f;
+            shootCone = 30f;
+            scaledHealth = 350;
+            rotateSpeed = 1.5f;
+
+            coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f));
+            limitRange();
+
+            loopSound = Sounds.glow;
+            loopSoundVolume = 0.8f;
+        }};
+
+        malign = new PowerTurret("malign"){{
+            requirements(Category.turret, with(Items.carbide, 200, Items.beryllium, 1000, Items.silicon, 500, Items.graphite, 500, Items.phaseFabric, 200));
+
+            var haloProgress = PartProgress.warmup;
+            Color haloColor = Color.valueOf("d370d3"), heatCol = Color.purple;
+            float haloY = -15f, haloRotSpeed = 1.5f;
+
+            var circleProgress = PartProgress.warmup.delay(0.9f);
+            var circleColor = haloColor;
+            float circleY = 25f, circleRad = 11f, circleRotSpeed = 3.5f, circleStroke = 1.6f;
+
+            shootSound = Sounds.malignShoot;
+            loopSound = Sounds.spellLoop;
+            loopSoundVolume = 1.3f;
+
+            shootType = new FlakBulletType(8f, 70f){{
+                sprite = "missile-large";
+
+                lifetime = 45f;
+                width = 12f;
+                height = 22f;
+
+                hitSize = 7f;
+                shootEffect = Fx.shootSmokeSquareBig;
+                smokeEffect = Fx.shootSmokeDisperse;
+                ammoMultiplier = 1;
+                hitColor = backColor = trailColor = lightningColor = circleColor;
+                frontColor = Color.white;
+                trailWidth = 3f;
+                trailLength = 12;
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+                buildingDamageMultiplier = 0.3f;
+
+                trailEffect = Fx.colorSpark;
+                trailRotation = true;
+                trailInterval = 3f;
+                lightning = 1;
+                lightningCone = 15f;
+                lightningLength = 20;
+                lightningLengthRand = 30;
+                lightningDamage = 20f;
+
+                homingPower = 0.17f;
+                homingDelay = 19f;
+                homingRange = 160f;
+
+                explodeRange = 160f;
+                explodeDelay = 0f;
+
+                flakInterval = 20f;
+                despawnShake = 3f;
+
+                fragBullet = new LaserBulletType(65f){{
+                    colors = new Color[]{haloColor.cpy().a(0.4f), haloColor, Color.white};
+                    buildingDamageMultiplier = 0.25f;
+                    width = 19f;
+                    hitEffect = Fx.hitLancer;
+                    sideAngle = 175f;
+                    sideWidth = 1f;
+                    sideLength = 40f;
+                    lifetime = 22f;
+                    drawSize = 400f;
+                    length = 180f;
+                    pierceCap = 2;
+                }};
+
+                fragSpread = fragRandomSpread = 0f;
+
+                splashDamage = 0f;
+                hitEffect = Fx.hitSquaresColor;
+                collidesGround = true;
+            }};
+
+            size = 5;
+            drawer = new DrawTurret("reinforced-"){{
+                parts.addAll(
+
+                //summoning circle
+                new ShapePart(){{
+                    progress = circleProgress;
+                    color = circleColor;
+                    circle = true;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = circleStroke;
+                    radius = circleRad;
+                    layer = Layer.effect;
+                    y = circleY;
+                }},
+
+                new ShapePart(){{
+                    progress = circleProgress;
+                    rotateSpeed = -circleRotSpeed;
+                    color = circleColor;
+                    sides = 4;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = circleStroke;
+                    radius = circleRad - 1f;
+                    layer = Layer.effect;
+                    y = circleY;
+                }},
+
+                //outer squares
+
+                new ShapePart(){{
+                    progress = circleProgress;
+                    rotateSpeed = -circleRotSpeed;
+                    color = circleColor;
+                    sides = 4;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = circleStroke;
+                    radius = circleRad - 1f;
+                    layer = Layer.effect;
+                    y = circleY;
+                }},
+
+                //inner square
+                new ShapePart(){{
+                    progress = circleProgress;
+                    rotateSpeed = -circleRotSpeed/2f;
+                    color = circleColor;
+                    sides = 4;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = 2f;
+                    radius = 3f;
+                    layer = Layer.effect;
+                    y = circleY;
+                }},
+
+                //spikes on circle
+                new HaloPart(){{
+                    progress = circleProgress;
+                    color = circleColor;
+                    tri = true;
+                    shapes = 3;
+                    triLength = 0f;
+                    triLengthTo = 5f;
+                    radius = 6f;
+                    haloRadius = circleRad;
+                    haloRotateSpeed = haloRotSpeed / 2f;
+                    shapeRotation = 180f;
+                    haloRotation = 180f;
+                    layer = Layer.effect;
+                    y = circleY;
+                }},
+
+                //actual turret
+                new RegionPart("-mouth"){{
+                    heatColor = heatCol;
+                    heatProgress = PartProgress.warmup;
+
+                    moveY = -8f;
+                }},
+                new RegionPart("-end"){{
+                    moveY = 0f;
+                }},
+
+                new RegionPart("-front"){{
+                    heatColor = heatCol;
+                    heatProgress = PartProgress.warmup;
+
+                    mirror = true;
+                    moveRot = 33f;
+                    moveY = -4f;
+                    moveX = 10f;
+                }},
+                new RegionPart("-back"){{
+                    heatColor = heatCol;
+                    heatProgress = PartProgress.warmup;
+
+                    mirror = true;
+                    moveRot = 10f;
+                    moveX = 2f;
+                    moveY = 5f;
+                }},
+
+                new RegionPart("-mid"){{
+                    heatColor = heatCol;
+                    heatProgress = PartProgress.recoil;
+
+                    moveY = -9.5f;
+                }},
+
+                new ShapePart(){{
+                    progress = haloProgress;
+                    color = haloColor;
+                    circle = true;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = 2f;
+                    radius = 10f;
+                    layer = Layer.effect;
+                    y = haloY;
+                }},
+                new ShapePart(){{
+                    progress = haloProgress;
+                    color = haloColor;
+                    sides = 3;
+                    rotation = 90f;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = 2f;
+                    radius = 4f;
+                    layer = Layer.effect;
+                    y = haloY;
+                }},
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = haloColor;
+                    sides = 3;
+                    shapes = 3;
+                    hollow = true;
+                    stroke = 0f;
+                    strokeTo = 2f;
+                    radius = 3f;
+                    haloRadius = 10f + radius/2f;
+                    haloRotateSpeed = haloRotSpeed;
+                    layer = Layer.effect;
+                    y = haloY;
+                }},
+
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = haloColor;
+                    tri = true;
+                    shapes = 3;
+                    triLength = 0f;
+                    triLengthTo = 10f;
+                    radius = 6f;
+                    haloRadius = 16f;
+                    haloRotation = 180f;
+                    layer = Layer.effect;
+                    y = haloY;
+                }},
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = haloColor;
+                    tri = true;
+                    shapes = 3;
+                    triLength = 0f;
+                    triLengthTo = 3f;
+                    radius = 6f;
+                    haloRadius = 16f;
+                    shapeRotation = 180f;
+                    haloRotation = 180f;
+                    layer = Layer.effect;
+                    y = haloY;
+                }},
+
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = haloColor;
+                    sides = 3;
+                    tri = true;
+                    shapes = 3;
+                    triLength = 0f;
+                    triLengthTo = 10f;
+                    shapeRotation = 180f;
+                    radius = 6f;
+                    haloRadius = 16f;
+                    haloRotateSpeed = -haloRotSpeed;
+                    haloRotation = 180f / 3f;
+                    layer = Layer.effect;
+                    y = haloY;
+                }},
+
+                new HaloPart(){{
+                    progress = haloProgress;
+                    color = haloColor;
+                    sides = 3;
+                    tri = true;
+                    shapes = 3;
+                    triLength = 0f;
+                    triLengthTo = 4f;
+                    radius = 6f;
+                    haloRadius = 16f;
+                    haloRotateSpeed = -haloRotSpeed;
+                    haloRotation = 180f / 3f;
+                    layer = Layer.effect;
+                    y = haloY;
+                }}
+                );
+
+                Color heatCol2 = heatCol.cpy().add(0.1f, 0.1f, 0.1f).mul(1.2f);
+                for(int i = 1; i < 4; i++){
+                    int fi = i;
+                    parts.add(new RegionPart("-spine"){{
+                        outline = false;
+                        progress = PartProgress.warmup.delay(fi / 5f);
+                        heatProgress = PartProgress.warmup.add(p -> (Mathf.absin(3f, 0.2f) - 0.2f) * p.warmup);
+                        mirror = true;
+                        under = true;
+                        layerOffset = -0.3f;
+                        turretHeatLayer = Layer.turret - 0.2f;
+                        moveY = 9f;
+                        moveX = 1f + fi * 4f;
+                        moveRot = fi * 60f - 130f;
+
+                        color = Color.valueOf("bb68c3");
+                        heatColor = heatCol2;
+                        moves.add(new PartMove(PartProgress.recoil.delay(fi / 5f), 1f, 0f, 3f));
+                    }});
+                }
+            }};
+
+            velocityRnd = 0.15f;
+            heatRequirement = 72f;
+            maxHeatEfficiency = 2f;
+            warmupMaintainTime = 120f;
+            consumePower(40f);
+            unitSort = UnitSorts.strongest;
+            shoot = new ShootSummon(0f, 0f, circleRad, 20f);
+
+            minWarmup = 0.96f;
+            shootWarmupSpeed = 0.08f;
+
+            shootY = circleY - 5f;
+
+            outlineColor = Pal.darkOutline;
+            envEnabled |= Env.space;
+            reload = 7f;
+            range = 380;
+            trackingRange = range * 1.4f;
+            shootCone = 100f;
+            scaledHealth = 370;
+            rotateSpeed = 2.6f;
+            recoil = 0.5f;
+            recoilTime = 30f;
+            shake = 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 = Seq.with(
                 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.crawler, 60f * 10, with(Items.silicon, 8, Items.coal, 10)),
                 new UnitPlan(UnitTypes.nova, 60f * 40, with(Items.silicon, 30, Items.lead, 20, Items.titanium, 20))
             );
             size = 3;
-            consumes.power(1.2f);
+            consumePower(1.2f);
         }};
 
         airFactory = new UnitFactory("air-factory"){{
@@ -1876,16 +5868,17 @@ public class Blocks implements ContentList{
                 new UnitPlan(UnitTypes.mono, 60f * 35, with(Items.silicon, 30, Items.lead, 15))
             );
             size = 3;
-            consumes.power(1.2f);
+            consumePower(1.2f);
         }};
 
         navalFactory = new UnitFactory("naval-factory"){{
             requirements(Category.units, with(Items.copper, 150, Items.lead, 130, Items.metaglass, 120));
             plans = Seq.with(
-                new UnitPlan(UnitTypes.risso, 60f * 45f, with(Items.silicon, 20, Items.metaglass, 35))
+                new UnitPlan(UnitTypes.risso, 60f * 45f, with(Items.silicon, 20, Items.metaglass, 35)),
+                new UnitPlan(UnitTypes.retusa, 60f * 35f, with(Items.silicon, 15, Items.titanium, 20))
             );
             size = 3;
-            consumes.power(1.2f);
+            consumePower(1.2f);
             floating = true;
         }};
 
@@ -1893,8 +5886,8 @@ public class Blocks implements ContentList{
             requirements(Category.units, with(Items.copper, 200, Items.lead, 120, Items.silicon, 90));
 
             size = 3;
-            consumes.power(3f);
-            consumes.items(with(Items.silicon, 40, Items.graphite, 40));
+            consumePower(3f);
+            consumeItems(with(Items.silicon, 40, Items.graphite, 40));
 
             constructTime = 60f * 10f;
 
@@ -1904,7 +5897,8 @@ public class Blocks implements ContentList{
                 new UnitType[]{UnitTypes.crawler, UnitTypes.atrax},
                 new UnitType[]{UnitTypes.flare, UnitTypes.horizon},
                 new UnitType[]{UnitTypes.mono, UnitTypes.poly},
-                new UnitType[]{UnitTypes.risso, UnitTypes.minke}
+                new UnitType[]{UnitTypes.risso, UnitTypes.minke},
+                new UnitType[]{UnitTypes.retusa, UnitTypes.oxynoe}
             );
         }};
 
@@ -1912,8 +5906,8 @@ public class Blocks implements ContentList{
             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, 40));
+            consumePower(6f);
+            consumeItems(with(Items.silicon, 130, Items.titanium, 80, Items.metaglass, 40));
 
             constructTime = 60f * 30f;
 
@@ -1923,7 +5917,8 @@ public class Blocks implements ContentList{
                 new UnitType[]{UnitTypes.poly, UnitTypes.mega},
                 new UnitType[]{UnitTypes.minke, UnitTypes.bryde},
                 new UnitType[]{UnitTypes.pulsar, UnitTypes.quasar},
-                new UnitType[]{UnitTypes.atrax, UnitTypes.spiroct}
+                new UnitType[]{UnitTypes.atrax, UnitTypes.spiroct},
+                new UnitType[]{UnitTypes.oxynoe, UnitTypes.cyerce}
             );
         }};
 
@@ -1931,9 +5926,9 @@ public class Blocks implements ContentList{
             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(13f);
-            consumes.items(with(Items.silicon, 850, Items.titanium, 750, Items.plastanium, 650));
-            consumes.liquid(Liquids.cryofluid, 1f);
+            consumePower(13f);
+            consumeItems(with(Items.silicon, 850, Items.titanium, 750, Items.plastanium, 650));
+            consumeLiquid(Liquids.cryofluid, 1f);
 
             constructTime = 60f * 60f * 1.5f;
             liquidCapacity = 60f;
@@ -1944,7 +5939,8 @@ public class Blocks implements ContentList{
                 new UnitType[]{UnitTypes.fortress, UnitTypes.scepter},
                 new UnitType[]{UnitTypes.bryde, UnitTypes.sei},
                 new UnitType[]{UnitTypes.mega, UnitTypes.quad},
-                new UnitType[]{UnitTypes.quasar, UnitTypes.vela}
+                new UnitType[]{UnitTypes.quasar, UnitTypes.vela},
+                new UnitType[]{UnitTypes.cyerce, UnitTypes.aegires}
             );
         }};
 
@@ -1952,9 +5948,9 @@ public class Blocks implements ContentList{
             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, 1000, Items.plastanium, 600, Items.surgeAlloy, 500, Items.phaseFabric, 350));
-            consumes.liquid(Liquids.cryofluid, 3f);
+            consumePower(25f);
+            consumeItems(with(Items.silicon, 1000, Items.plastanium, 600, Items.surgeAlloy, 500, Items.phaseFabric, 350));
+            consumeLiquid(Liquids.cryofluid, 3f);
 
             constructTime = 60f * 60f * 4;
             liquidCapacity = 180f;
@@ -1965,26 +5961,321 @@ public class Blocks implements ContentList{
                 new UnitType[]{UnitTypes.scepter, UnitTypes.reign},
                 new UnitType[]{UnitTypes.sei, UnitTypes.omura},
                 new UnitType[]{UnitTypes.quad, UnitTypes.oct},
-                new UnitType[]{UnitTypes.vela, UnitTypes.corvus}
+                new UnitType[]{UnitTypes.vela, UnitTypes.corvus},
+                new UnitType[]{UnitTypes.aegires, UnitTypes.navanax}
             );
         }};
 
-        repairPoint = new RepairPoint("repair-point"){{
-            requirements(Category.units, with(Items.lead, 15, Items.copper, 15, Items.silicon, 15));
-            repairSpeed = 0.5f;
-            repairRadius = 65f;
+        repairPoint = new RepairTurret("repair-point"){{
+            requirements(Category.units, with(Items.lead, 30, Items.copper, 30, Items.silicon, 20));
+            repairSpeed = 0.45f;
+            repairRadius = 60f;
+            beamWidth = 0.73f;
             powerUse = 1f;
+            pulseRadius = 5f;
         }};
 
-        resupplyPoint = new ResupplyPoint("resupply-point"){{
-            requirements(Category.units, BuildVisibility.ammoOnly, with(Items.lead, 20, Items.copper, 15, Items.silicon, 15));
+        repairTurret = new RepairTurret("repair-turret"){{
+            requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 60));
+            size = 2;
+            length = 6f;
+            repairSpeed = 3f;
+            repairRadius = 145f;
+            powerUse = 5f;
+            beamWidth = 1.1f;
+            pulseRadius = 6.1f;
+            coolantUse = 0.16f;
+            coolantMultiplier = 1.6f;
+            acceptCoolant = true;
+        }};
+
+        //endregion
+        //region units - erekir
+
+        tankFabricator = new UnitFactory("tank-fabricator"){{
+            requirements(Category.units, with(Items.silicon, 200, Items.beryllium, 150));
+            size = 3;
+            configurable = false;
+            plans.add(new UnitPlan(UnitTypes.stell, 60f * 35f, with(Items.beryllium, 40, Items.silicon, 50)));
+            researchCost = with(Items.beryllium, 200, Items.graphite, 80, Items.silicon, 80);
+            regionSuffix = "-dark";
+            fogRadius = 3;
+            consumePower(2f);
+        }};
+
+        shipFabricator = new UnitFactory("ship-fabricator"){{
+            requirements(Category.units, with(Items.silicon, 250, Items.beryllium, 200));
+
+            size = 3;
+            configurable = false;
+            plans.add(new UnitPlan(UnitTypes.elude, 60f * 40f, with(Items.graphite, 50, Items.silicon, 70)));
+            regionSuffix = "-dark";
+            fogRadius = 3;
+            researchCostMultiplier = 0.5f;
+            consumePower(2f);
+        }};
+
+        mechFabricator = new UnitFactory("mech-fabricator"){{
+            requirements(Category.units, with(Items.silicon, 200, Items.graphite, 300, Items.tungsten, 60));
+            size = 3;
+            configurable = false;
+            plans.add(new UnitPlan(UnitTypes.merui, 60f * 40f, with(Items.beryllium, 50, Items.silicon, 70)));
+            regionSuffix = "-dark";
+            fogRadius = 3;
+            researchCostMultiplier = 0.65f;
+            consumePower(2f);
+        }};
+
+        tankRefabricator = new Reconstructor("tank-refabricator"){{
+            requirements(Category.units, with(Items.beryllium, 200, Items.tungsten, 80, Items.silicon, 100));
+            regionSuffix = "-dark";
+
+            size = 3;
+            consumePower(3f);
+            consumeLiquid(Liquids.hydrogen, 3f / 60f);
+            consumeItems(with(Items.silicon, 40, Items.tungsten, 30));
+
+            constructTime = 60f * 30f;
+            researchCostMultiplier = 0.75f;
+
+            upgrades.addAll(
+            new UnitType[]{UnitTypes.stell, UnitTypes.locus}
+            );
+        }};
+
+        shipRefabricator = new Reconstructor("ship-refabricator"){{
+            requirements(Category.units, with(Items.beryllium, 200, Items.tungsten, 100, Items.silicon, 150, Items.oxide, 40));
+            regionSuffix = "-dark";
+
+            size = 3;
+            consumePower(2.5f);
+            consumeLiquid(Liquids.hydrogen, 3f / 60f);
+            consumeItems(with(Items.silicon, 60, Items.tungsten, 40));
+
+            constructTime = 60f * 50f;
+
+            upgrades.addAll(
+            new UnitType[]{UnitTypes.elude, UnitTypes.avert}
+            );
+
+            researchCost = with(Items.beryllium, 500, Items.tungsten, 200, Items.silicon, 300, Items.oxide, 80);
+        }};
+
+        mechRefabricator = new Reconstructor("mech-refabricator"){{
+            requirements(Category.units, with(Items.beryllium, 250, Items.tungsten, 120, Items.silicon, 150));
+            regionSuffix = "-dark";
+
+            size = 3;
+            consumePower(2.5f);
+            consumeLiquid(Liquids.hydrogen, 3f / 60f);
+            consumeItems(with(Items.silicon, 50, Items.tungsten, 40));
+
+            constructTime = 60f * 45f;
+            researchCostMultiplier = 0.75f;
+
+            upgrades.addAll(
+            new UnitType[]{UnitTypes.merui, UnitTypes.cleroi}
+            );
+        }};
+
+        //yes very silly name
+        primeRefabricator = new Reconstructor("prime-refabricator"){{
+            requirements(Category.units, with(Items.thorium, 250, Items.oxide, 200, Items.tungsten, 200, Items.silicon, 400));
+            regionSuffix = "-dark";
+
+            researchCostMultipliers.put(Items.thorium, 0.2f);
+
+            size = 5;
+            consumePower(5f);
+            consumeLiquid(Liquids.nitrogen, 10f / 60f);
+            consumeItems(with(Items.thorium, 80, Items.silicon, 100));
+
+            constructTime = 60f * 60f;
+
+            upgrades.addAll(
+            new UnitType[]{UnitTypes.locus, UnitTypes.precept},
+            new UnitType[]{UnitTypes.cleroi, UnitTypes.anthicus},
+            new UnitType[]{UnitTypes.avert, UnitTypes.obviate}
+            );
+        }};
+
+        tankAssembler = new UnitAssembler("tank-assembler"){{
+            requirements(Category.units, with(Items.thorium, 500, Items.oxide, 150, Items.carbide, 80, Items.silicon, 500));
+            regionSuffix = "-dark";
+            size = 5;
+            plans.add(
+            new AssemblerUnitPlan(UnitTypes.vanquish, 60f * 50f, PayloadStack.list(UnitTypes.stell, 4, Blocks.tungstenWallLarge, 10)),
+            new AssemblerUnitPlan(UnitTypes.conquer, 60f * 60f * 3f, PayloadStack.list(UnitTypes.locus, 6, Blocks.carbideWallLarge, 20))
+            );
+            areaSize = 13;
+            researchCostMultiplier = 0.4f;
+
+            consumePower(3f);
+            consumeLiquid(Liquids.cyanogen, 9f / 60f);
+        }};
+
+        shipAssembler = new UnitAssembler("ship-assembler"){{
+            requirements(Category.units, with(Items.carbide, 100, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 800, Items.thorium, 400));
+            regionSuffix = "-dark";
+            size = 5;
+            plans.add(
+            new AssemblerUnitPlan(UnitTypes.quell, 60f * 60f, PayloadStack.list(UnitTypes.elude, 4, Blocks.berylliumWallLarge, 12)),
+            new AssemblerUnitPlan(UnitTypes.disrupt, 60f * 60f * 3f, PayloadStack.list(UnitTypes.avert, 6, Blocks.carbideWallLarge, 20))
+            );
+            areaSize = 13;
+
+            consumePower(3f);
+            consumeLiquid(Liquids.cyanogen, 12f / 60f);
+        }};
+
+        mechAssembler = new UnitAssembler("mech-assembler"){{
+            requirements(Category.units, with(Items.carbide, 200, Items.thorium, 600, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 900));
+            regionSuffix = "-dark";
+            size = 5;
+            //TODO different reqs
+            plans.add(
+            new AssemblerUnitPlan(UnitTypes.tecta, 60f * 70f, PayloadStack.list(UnitTypes.merui, 5, Blocks.tungstenWallLarge, 12)),
+            new AssemblerUnitPlan(UnitTypes.collaris, 60f * 60f * 3f, PayloadStack.list(UnitTypes.cleroi, 6, Blocks.carbideWallLarge, 20))
+            );
+            areaSize = 13;
+
+            consumePower(3.5f);
+            consumeLiquid(Liquids.cyanogen, 12f / 60f);
+        }};
+
+        //TODO requirements / only accept inputs
+        basicAssemblerModule = new UnitAssemblerModule("basic-assembler-module"){{
+            requirements(Category.units, with(Items.carbide, 300, Items.thorium, 500, Items.oxide, 200, Items.phaseFabric, 400));
+            consumePower(4f);
+            regionSuffix = "-dark";
+            researchCostMultiplier = 0.75f;
+
+            size = 5;
+        }};
+
+        unitRepairTower = new RepairTower("unit-repair-tower"){{
+            requirements(Category.units, with(Items.graphite, 90, Items.silicon, 90, Items.tungsten, 80));
 
             size = 2;
-            range = 80f;
-            itemCapacity = 20;
-            ammoAmount = 5;
+            range = 100f;
+            healAmount = 1.5f;
 
-            consumes.item(Items.copper, 1);
+            consumePower(1f);
+            consumeLiquid(Liquids.ozone, 3f / 60f);
+        }};
+
+        //endregion
+        //region payloads
+
+        payloadConveyor = new PayloadConveyor("payload-conveyor"){{
+            requirements(Category.units, with(Items.graphite, 10, Items.copper, 10));
+            canOverdrive = false;
+        }};
+
+        payloadRouter = new PayloadRouter("payload-router"){{
+            requirements(Category.units, with(Items.graphite, 15, Items.copper, 10));
+            canOverdrive = false;
+        }};
+
+        reinforcedPayloadConveyor = new PayloadConveyor("reinforced-payload-conveyor"){{
+            requirements(Category.units, with(Items.tungsten, 10));
+            moveTime = 35f;
+            canOverdrive = false;
+            health = 800;
+            researchCostMultiplier = 4f;
+            underBullets = true;
+        }};
+
+        reinforcedPayloadRouter = new PayloadRouter("reinforced-payload-router"){{
+            requirements(Category.units, with(Items.tungsten, 15));
+            moveTime = 35f;
+            health = 800;
+            canOverdrive = false;
+            researchCostMultiplier = 4f;
+            underBullets = true;
+        }};
+
+        payloadMassDriver = new PayloadMassDriver("payload-mass-driver"){{
+            requirements(Category.units, with(Items.tungsten, 120, Items.silicon, 120, Items.graphite, 50));
+            regionSuffix = "-dark";
+            size = 3;
+            reload = 130f;
+            chargeTime = 90f;
+            range = 700f;
+            maxPayloadSize = 2.5f;
+            fogRadius = 5;
+            consumePower(0.5f);
+        }};
+
+        largePayloadMassDriver = new PayloadMassDriver("large-payload-mass-driver"){{
+            requirements(Category.units, with(Items.thorium, 200, Items.tungsten, 200, Items.silicon, 200, Items.graphite, 100, Items.oxide, 30));
+            regionSuffix = "-dark";
+            size = 5;
+            reload = 130f;
+            chargeTime = 100f;
+            range = 1100f;
+            maxPayloadSize = 3.5f;
+            consumePower(3f);
+        }};
+
+        smallDeconstructor = new PayloadDeconstructor("small-deconstructor"){{
+            requirements(Category.units, with(Items.beryllium, 100, Items.silicon, 100, Items.oxide, 40, Items.graphite, 80));
+            regionSuffix = "-dark";
+            itemCapacity = 100;
+            consumePower(1f);
+            size = 3;
+            deconstructSpeed = 1f;
+        }};
+
+        deconstructor = new PayloadDeconstructor("deconstructor"){{
+            requirements(Category.units, with(Items.beryllium, 250, Items.oxide, 100, Items.silicon, 250, Items.carbide, 250));
+            regionSuffix = "-dark";
+            itemCapacity = 250;
+            consumePower(3f);
+            size = 5;
+            deconstructSpeed = 2f;
+        }};
+
+        constructor = new Constructor("constructor"){{
+            requirements(Category.units, with(Items.silicon, 100, Items.beryllium, 150, Items.tungsten, 80));
+            regionSuffix = "-dark";
+            hasPower = true;
+            buildSpeed = 0.6f;
+            consumePower(2f);
+            size = 3;
+            //TODO expand this list
+            filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.carbideWallLarge, Blocks.reinforcedSurgeWallLarge, Blocks.reinforcedLiquidContainer, Blocks.reinforcedContainer, Blocks.beamNode);
+        }};
+
+        //yes this block is pretty much useless
+        largeConstructor = new Constructor("large-constructor"){{
+            requirements(Category.units, with(Items.silicon, 150, Items.oxide, 150, Items.tungsten, 200, Items.phaseFabric, 40));
+            regionSuffix = "-dark";
+            hasPower = true;
+            buildSpeed = 0.75f;
+            maxBlockSize = 4;
+            minBlockSize = 3;
+            size = 5;
+
+            consumePower(2f);
+        }};
+
+        payloadLoader = new PayloadLoader("payload-loader"){{
+            requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.tungsten, 80));
+            regionSuffix = "-dark";
+            hasPower = true;
+            consumePower(2f);
+            size = 3;
+            fogRadius = 5;
+        }};
+
+        payloadUnloader = new PayloadUnloader("payload-unloader"){{
+            requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.tungsten, 30));
+            regionSuffix = "-dark";
+            hasPower = true;
+            consumePower(2f);
+            size = 3;
+            fogRadius = 5;
         }};
 
         //endregion
@@ -1992,7 +6283,7 @@ public class Blocks implements ContentList{
 
         powerSource = new PowerSource("power-source"){{
             requirements(Category.power, BuildVisibility.sandboxOnly, with());
-            powerProduction = 100000f / 60f;
+            powerProduction = 1000000f / 60f;
             alwaysUnlocked = true;
         }};
 
@@ -2021,11 +6312,38 @@ public class Blocks implements ContentList{
             alwaysUnlocked = true;
         }};
 
+        payloadSource = new PayloadSource("payload-source"){{
+            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            size = 5;
+            alwaysUnlocked = true;
+        }};
+
+        payloadVoid = new PayloadVoid("payload-void"){{
+            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            size = 5;
+            alwaysUnlocked = true;
+        }};
+
+        heatSource = new HeatProducer("heat-source"){{
+            requirements(Category.crafting, BuildVisibility.sandboxOnly, with());
+            drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput());
+            rotateDraw = false;
+            size = 1;
+            heatOutput = 1000f;
+            warmupRate = 1000f;
+            regionRotated1 = 1;
+            itemCapacity = 0;
+            alwaysUnlocked = true;
+            ambientSound = Sounds.none;
+            allDatabaseTabs = true;
+        }};
+
+        //TODO move
         illuminator = new LightBlock("illuminator"){{
-            requirements(Category.effect, BuildVisibility.lightingOnly, with(Items.graphite, 12, Items.silicon, 8));
+            requirements(Category.effect, BuildVisibility.lightingOnly, with(Items.graphite, 12, Items.silicon, 8, Items.lead, 8));
             brightness = 0.75f;
-            radius = 120f;
-            consumes.power(0.05f);
+            radius = 140f;
+            consumePower(0.05f);
         }};
 
         //endregion
@@ -2041,87 +6359,102 @@ public class Blocks implements ContentList{
             replacement = Blocks.groundFactory;
         }};
 
+        new LegacyCommandCenter("command-center"){{
+            size = 2;
+        }};
+
         //endregion
         //region campaign
 
         launchPad = new LaunchPad("launch-pad"){{
-            requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150));
+            requirements(Category.effect, BuildVisibility.legacyLaunchPadOnly, with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150));
             size = 3;
             itemCapacity = 100;
             launchTime = 60f * 20;
             hasPower = true;
-            consumes.power(4f);
+            acceptMultipleItems = true;
+            consumePower(4f);
         }};
 
-        //TODO remove
-        launchPadLarge = new LaunchPad("launch-pad-large"){{
-            requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75));
+        advancedLaunchPad = new LaunchPad("advanced-launch-pad"){{
+            requirements(Category.effect, BuildVisibility.notLegacyLaunchPadOnly, with(Items.copper, 350, Items.silicon, 250, Items.lead, 300, Items.titanium, 200));
             size = 4;
-            itemCapacity = 300;
-            launchTime = 60f * 35;
+            itemCapacity = 100;
+            launchTime = 60f * 30;
+            liquidCapacity = 40f;
             hasPower = true;
-            consumes.power(6f);
+            drawLiquid = Liquids.oil;
+            consumeLiquid(Liquids.oil, 9f/60f);
+            consumePower(8f);
+        }};
+
+        landingPad = new LandingPad("landing-pad"){{
+            requirements(Category.effect, BuildVisibility.notLegacyLaunchPadOnly, with(Items.copper, 200, Items.graphite, 100, Items.titanium, 100));
+            size = 4;
+
+            itemCapacity = 100;
+
+            coolingEffect = new RadialEffect(Fx.steamCoolSmoke, 4, 90f, 9.5f, 180f);
+            liquidCapacity = 3000f;
+            consumeLiquidAmount = 1500f;
         }};
 
         interplanetaryAccelerator = new Accelerator("interplanetary-accelerator"){{
             requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 16000, Items.silicon, 11000, Items.thorium, 13000, Items.titanium, 12000, Items.surgeAlloy, 6000, Items.phaseFabric, 5000));
             researchCostMultiplier = 0.1f;
+            powerBufferRequirement = 1_000_000f;
             size = 7;
             hasPower = true;
-            consumes.power(10f);
+            consumePower(10f);
             buildCostMultiplier = 0.5f;
+            scaledHealth = 80;
         }};
 
         //endregion campaign
         //region logic
 
         message = new MessageBlock("message"){{
-            requirements(Category.logic, with(Items.graphite, 5));
+            requirements(Category.logic, with(Items.graphite, 5, Items.copper, 5));
         }};
 
         switchBlock = new SwitchBlock("switch"){{
-            requirements(Category.logic, with(Items.graphite, 5));
+            requirements(Category.logic, with(Items.graphite, 5, Items.copper, 5));
         }};
 
         microProcessor = new LogicBlock("micro-processor"){{
-            requirements(Category.logic, with(Items.copper, 80, Items.lead, 50, Items.silicon, 30));
+            requirements(Category.logic, with(Items.copper, 90, Items.lead, 50, Items.silicon, 50));
 
             instructionsPerTick = 2;
-
             size = 1;
         }};
 
         logicProcessor = new LogicBlock("logic-processor"){{
-            requirements(Category.logic, with(Items.lead, 320, Items.silicon, 60, Items.graphite, 60, Items.thorium, 50));
+            requirements(Category.logic, with(Items.lead, 320, Items.silicon, 80, 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, 130, Items.thorium, 75, Items.surgeAlloy, 50));
+            requirements(Category.logic, with(Items.lead, 450, Items.silicon, 150, Items.thorium, 75, Items.surgeAlloy, 50));
 
-            consumes.liquid(Liquids.cryofluid, 0.08f);
+            consumeLiquid(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));
+            requirements(Category.logic, with(Items.graphite, 30, Items.silicon, 30, Items.copper, 30));
 
             memoryCapacity = 64;
         }};
 
         memoryBank = new MemoryBlock("memory-bank"){{
-            requirements(Category.logic, with(Items.graphite, 80, Items.silicon, 80, Items.phaseFabric, 30));
+            requirements(Category.logic, with(Items.graphite, 80, Items.silicon, 80, Items.phaseFabric, 30, Items.copper, 30));
 
             memoryCapacity = 512;
             size = 2;
@@ -2143,28 +6476,54 @@ public class Blocks implements ContentList{
             size = 6;
         }};
 
-        //endregion
-        //region experimental
+        canvas = new CanvasBlock("canvas"){{
+            requirements(Category.logic, BuildVisibility.shown, with(Items.silicon, 10, Items.beryllium, 10));
 
-        blockForge = new BlockForge("block-forge"){{
-            requirements(Category.crafting, BuildVisibility.debugOnly, with(Items.thorium, 100));
-            hasPower = true;
-            consumes.power(2f);
-            size = 3;
+            canvasSize = 12;
+            padding = 7f / 4f * 2f;
+
+            size = 2;
         }};
 
-        blockLoader = new BlockLoader("block-loader"){{
-            requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.thorium, 100));
-            hasPower = true;
-            consumes.power(2f);
-            size = 3;
+        reinforcedMessage = new MessageBlock("reinforced-message"){{
+            requirements(Category.logic, with(Items.graphite, 10, Items.beryllium, 5));
+            health = 100;
         }};
 
-        blockUnloader = new BlockUnloader("block-unloader"){{
-            requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.thorium, 100));
-            hasPower = true;
-            consumes.power(2f);
-            size = 3;
+        worldProcessor = new LogicBlock("world-processor"){{
+            requirements(Category.logic, BuildVisibility.worldProcessorOnly, with());
+
+            canOverdrive = false;
+            targetable = false;
+            instructionsPerTick = 8;
+            forceDark = true;
+            privileged = true;
+            size = 1;
+            maxInstructionsPerTick = 1000;
+            range = Float.MAX_VALUE;
+        }};
+
+        worldCell = new MemoryBlock("world-cell"){{
+            requirements(Category.logic, BuildVisibility.worldProcessorOnly, with());
+
+            targetable = false;
+            privileged = true;
+            memoryCapacity = 512;
+            forceDark = true;
+        }};
+
+        worldMessage = new MessageBlock("world-message"){{
+            requirements(Category.logic, BuildVisibility.worldProcessorOnly, with());
+
+            targetable = false;
+            privileged = true;
+        }};
+
+        worldSwitch = new SwitchBlock("world-switch"){{
+            requirements(Category.logic, BuildVisibility.worldProcessorOnly, with());
+
+            targetable = false;
+            privileged = true;
         }};
 
         //endregion
diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index dbed9cc7ac..4536a3b826 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -1,46 +1,26 @@
 package mindustry.content;
 
 import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.util.*;
-import mindustry.ctype.*;
-import mindustry.entities.*;
 import mindustry.entities.bullet.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.io.*;
-import mindustry.world.*;
 
-import static mindustry.Vars.*;
-
-public class Bullets implements ContentList{
+/**
+ * Class for holding special internal bullets.
+ * Formerly used to define preset bullets for turrets; as of v7, these have been inlined at the source.
+ * */
+public class Bullets{
     public static BulletType
 
-    //artillery
-    artilleryDense, artilleryPlastic, artilleryPlasticFrag, artilleryHoming, artilleryIncendiary, artilleryExplosive,
+    placeholder, spaceLiquid, damageLightning, damageLightningGround, damageLightningAir, fireball;
 
-    //flak
-    flakScrap, flakLead, flakGlass, flakGlassFrag,
+    public static void load(){
 
-    //frag (flak-like but hits ground)
-    fragGlass, fragExplosive, fragPlastic, fragSurge, fragGlassFrag, fragPlasticFrag,
-
-    //missiles
-    missileExplosive, missileIncendiary, missileSurge,
-
-    //standard
-    standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary,
-    standardDenseBig, standardThoriumBig, standardIncendiaryBig,
-
-    //liquid
-    waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot,
-
-    //environment, misc.
-    damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt;
-
-    @Override
-    public void load(){
+        //not allowed in weapons - used only to prevent NullPointerExceptions
+        placeholder = new BasicBulletType(2.5f, 9, "ohno"){{
+            width = 7f;
+            height = 9f;
+            lifetime = 60f;
+            ammoMultiplier = 2;
+        }};
 
         //lightning bullets need to be initialized first.
         damageLightning = new BulletType(0.0001f, 0f){{
@@ -50,464 +30,24 @@ public class Bullets implements ContentList{
             status = StatusEffects.shocked;
             statusDuration = 10f;
             hittable = false;
+            lightColor = Color.white;
         }};
 
         //this is just a copy of the damage lightning bullet that doesn't damage air units
-        damageLightningGround = new BulletType(0.0001f, 0f){};
-        JsonIO.copy(damageLightning, damageLightningGround);
+        damageLightningGround = damageLightning.copy();
         damageLightningGround.collidesAir = false;
 
-        artilleryDense = new ArtilleryBulletType(3f, 20, "shell"){{
-            hitEffect = Fx.flakExplosion;
-            knockback = 0.8f;
-            lifetime = 80f;
-            width = height = 11f;
-            collidesTiles = false;
-            splashDamageRadius = 25f;
-            splashDamage = 33f;
-        }};
+        damageLightningAir = damageLightning.copy();
+        damageLightningAir.collidesGround = false;
+        damageLightningAir.collidesTiles = false;
 
-        artilleryPlasticFrag = new BasicBulletType(2.5f, 10, "bullet"){{
-            width = 10f;
-            height = 12f;
-            shrinkY = 1f;
-            lifetime = 15f;
-            backColor = Pal.plastaniumBack;
-            frontColor = Pal.plastaniumFront;
-            despawnEffect = Fx.none;
-            collidesAir = false;
-        }};
-
-        artilleryPlastic = new ArtilleryBulletType(3.4f, 20, "shell"){{
-            hitEffect = Fx.plasticExplosion;
-            knockback = 1f;
-            lifetime = 80f;
-            width = height = 13f;
-            collidesTiles = false;
-            splashDamageRadius = 35f;
-            splashDamage = 45f;
-            fragBullet = artilleryPlasticFrag;
-            fragBullets = 10;
-            backColor = Pal.plastaniumBack;
-            frontColor = Pal.plastaniumFront;
-        }};
-
-        artilleryHoming = new ArtilleryBulletType(3f, 20, "shell"){{
-            hitEffect = Fx.flakExplosion;
-            knockback = 0.8f;
-            lifetime = 80f;
-            width = height = 11f;
-            collidesTiles = false;
-            splashDamageRadius = 25f;
-            splashDamage = 33f;
-            reloadMultiplier = 1.2f;
-            ammoMultiplier = 3f;
-            homingPower = 0.08f;
-            homingRange = 50f;
-        }};
-
-        artilleryIncendiary = new ArtilleryBulletType(3f, 20, "shell"){{
-            hitEffect = Fx.blastExplosion;
-            knockback = 0.8f;
-            lifetime = 80f;
-            width = height = 13f;
-            collidesTiles = false;
-            splashDamageRadius = 25f;
-            splashDamage = 35f;
-            status = StatusEffects.burning;
-            frontColor = Pal.lightishOrange;
-            backColor = Pal.lightOrange;
-            makeFire = true;
-            trailEffect = Fx.incendTrail;
-        }};
-
-        artilleryExplosive = new ArtilleryBulletType(2f, 20, "shell"){{
-            hitEffect = Fx.blastExplosion;
-            knockback = 0.8f;
-            lifetime = 80f;
-            width = height = 14f;
-            collidesTiles = false;
-            ammoMultiplier = 4f;
-            splashDamageRadius = 45f;
-            splashDamage = 50f;
-            backColor = Pal.missileYellowBack;
-            frontColor = Pal.missileYellow;
-
-            status = StatusEffects.blasted;
-            statusDuration = 60f;
-        }};
-
-        flakGlassFrag = new BasicBulletType(3f, 5, "bullet"){{
-            width = 5f;
-            height = 12f;
-            shrinkY = 1f;
-            lifetime = 20f;
-            backColor = Pal.gray;
-            frontColor = Color.white;
-            despawnEffect = Fx.none;
-            collidesGround = false;
-        }};
-
-        flakLead = new FlakBulletType(4.2f, 3){{
-            lifetime = 60f;
-            ammoMultiplier = 4f;
-            shootEffect = Fx.shootSmall;
-            width = 6f;
-            height = 8f;
-            hitEffect = Fx.flakExplosion;
-            splashDamage = 27f;
-            splashDamageRadius = 15f;
-        }};
-
-        flakScrap = new FlakBulletType(4f, 3){{
-            lifetime = 60f;
-            ammoMultiplier = 5f;
-            shootEffect = Fx.shootSmall;
-            reloadMultiplier = 0.5f;
-            width = 6f;
-            height = 8f;
-            hitEffect = Fx.flakExplosion;
-            splashDamage = 22f;
-            splashDamageRadius = 24f;
-        }};
-
-        flakGlass = new FlakBulletType(4f, 3){{
-            lifetime = 60f;
-            ammoMultiplier = 5f;
-            shootEffect = Fx.shootSmall;
-            reloadMultiplier = 0.8f;
-            width = 6f;
-            height = 8f;
-            hitEffect = Fx.flakExplosion;
-            splashDamage = 22f;
-            splashDamageRadius = 20f;
-            fragBullet = flakGlassFrag;
-            fragBullets = 5;
-        }};
-
-        fragGlassFrag = new BasicBulletType(3f, 5, "bullet"){{
-            width = 5f;
-            height = 12f;
-            shrinkY = 1f;
-            lifetime = 20f;
-            backColor = Pal.gray;
-            frontColor = Color.white;
-            despawnEffect = Fx.none;
-        }};
-
-        fragPlasticFrag = new BasicBulletType(2.5f, 10, "bullet"){{
-            width = 10f;
-            height = 12f;
-            shrinkY = 1f;
-            lifetime = 15f;
-            backColor = Pal.plastaniumBack;
-            frontColor = Pal.plastaniumFront;
-            despawnEffect = Fx.none;
-        }};
-
-        fragGlass = new FlakBulletType(4f, 3){{
-            ammoMultiplier = 3f;
-            shootEffect = Fx.shootSmall;
-            reloadMultiplier = 0.8f;
-            width = 6f;
-            height = 8f;
-            hitEffect = Fx.flakExplosion;
-            splashDamage = 18f;
-            splashDamageRadius = 16f;
-            fragBullet = fragGlassFrag;
-            fragBullets = 3;
-            explodeRange = 20f;
-            collidesGround = true;
-        }};
-
-        fragPlastic = new FlakBulletType(4f, 6){{
-            splashDamageRadius = 40f;
-            splashDamage = 25f;
-            fragBullet = fragPlasticFrag;
-            fragBullets = 5;
-            hitEffect = Fx.plasticExplosion;
-            frontColor = Pal.plastaniumFront;
-            backColor = Pal.plastaniumBack;
-            shootEffect = Fx.shootBig;
-            collidesGround = true;
-            explodeRange = 20f;
-        }};
-
-        fragExplosive = new FlakBulletType(4f, 5){{
-            shootEffect = Fx.shootBig;
-            ammoMultiplier = 4f;
-            splashDamage = 18f;
-            splashDamageRadius = 55f;
-            collidesGround = true;
-
-            status = StatusEffects.blasted;
-            statusDuration = 60f;
-        }};
-
-        fragSurge = new FlakBulletType(4.5f, 13){{
-            ammoMultiplier = 4f;
-            splashDamage = 50f;
-            splashDamageRadius = 40f;
-            lightning = 2;
-            lightningLength = 7;
-            shootEffect = Fx.shootBig;
-            collidesGround = true;
-            explodeRange = 20f;
-        }};
-
-        missileExplosive = new MissileBulletType(3.7f, 10){{
-            width = 8f;
-            height = 8f;
-            shrinkY = 0f;
-            drag = -0.01f;
-            splashDamageRadius = 30f;
-            splashDamage = 30f;
-            ammoMultiplier = 4f;
-            hitEffect = Fx.blastExplosion;
-            despawnEffect = Fx.blastExplosion;
-
-            status = StatusEffects.blasted;
-            statusDuration = 60f;
-        }};
-
-        missileIncendiary = new MissileBulletType(3.7f, 12){{
-            frontColor = Pal.lightishOrange;
-            backColor = Pal.lightOrange;
-            width = 7f;
-            height = 8f;
-            shrinkY = 0f;
-            drag = -0.01f;
-            homingPower = 0.08f;
-            splashDamageRadius = 20f;
-            splashDamage = 20f;
-            makeFire = true;
-            hitEffect = Fx.blastExplosion;
-            status = StatusEffects.burning;
-        }};
-
-        missileSurge = new MissileBulletType(3.7f, 18){{
-            width = 8f;
-            height = 8f;
-            shrinkY = 0f;
-            drag = -0.01f;
-            splashDamageRadius = 25f;
-            splashDamage = 25f;
-            hitEffect = Fx.blastExplosion;
-            despawnEffect = Fx.blastExplosion;
-            lightningDamage = 10;
-            lightning = 2;
-            lightningLength = 10;
-        }};
-
-        standardCopper = new BasicBulletType(2.5f, 9){{
-            width = 7f;
-            height = 9f;
-            lifetime = 60f;
-            shootEffect = Fx.shootSmall;
-            smokeEffect = Fx.shootSmallSmoke;
-            ammoMultiplier = 2;
-        }};
-
-        standardDense = new BasicBulletType(3.5f, 18){{
-            width = 9f;
-            height = 12f;
-            reloadMultiplier = 0.6f;
-            ammoMultiplier = 4;
-            lifetime = 60f;
-        }};
-
-        standardThorium = new BasicBulletType(4f, 29, "bullet"){{
-            width = 10f;
-            height = 13f;
-            shootEffect = Fx.shootBig;
-            smokeEffect = Fx.shootBigSmoke;
-            ammoMultiplier = 4;
-            lifetime = 60f;
-        }};
-
-        standardHoming = new BasicBulletType(3f, 12, "bullet"){{
-            width = 7f;
-            height = 9f;
-            homingPower = 0.08f;
-            reloadMultiplier = 1.5f;
-            ammoMultiplier = 5;
-            lifetime = 60f;
-        }};
-
-        standardIncendiary = new BasicBulletType(3.2f, 11, "bullet"){{
-            width = 10f;
-            height = 12f;
-            frontColor = Pal.lightishOrange;
-            backColor = Pal.lightOrange;
-            status = StatusEffects.burning;
-            makeFire = true;
-            inaccuracy = 3f;
-            lifetime = 60f;
-        }};
-
-        standardDenseBig = new BasicBulletType(7f, 55, "bullet"){{
-            width = 15f;
-            height = 21f;
-            shootEffect = Fx.shootBig;
-        }};
-
-        standardThoriumBig = new BasicBulletType(8f, 80, "bullet"){{
-            width = 16f;
-            height = 23f;
-            shootEffect = Fx.shootBig;
-            pierceCap = 2;
-            pierceBuilding = true;
-            knockback = 0.7f;
-        }};
-
-        standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{
-            width = 16f;
-            height = 21f;
-            frontColor = Pal.lightishOrange;
-            backColor = Pal.lightOrange;
-            status = StatusEffects.burning;
-            shootEffect = Fx.shootBig;
-            makeFire = true;
-            pierceCap = 2;
-            pierceBuilding = true;
-            knockback = 0.7f;            
-        }};
-
-        fireball = new BulletType(1f, 4){
-            {
-                pierce = true;
-                collidesTiles = false;
-                collides = false;
-                drag = 0.03f;
-                hitEffect = despawnEffect = Fx.none;
-            }
-
-            @Override
-            public void init(Bullet b){
-                b.vel.setLength(0.6f + Mathf.random(2f));
-            }
-
-            @Override
-            public void draw(Bullet b){
-                Draw.color(Pal.lightFlame, Pal.darkFlame, Color.gray, b.fin());
-                Fill.circle(b.x, b.y, 3f * b.fout());
-                Draw.reset();
-            }
-
-            @Override
-            public void update(Bullet b){
-                if(Mathf.chance(0.04 * Time.delta)){
-                    Tile tile = world.tileWorld(b.x, b.y);
-                    if(tile != null){
-                        Fires.create(tile);
-                    }
-                }
-
-                if(Mathf.chance(0.1 * Time.delta)){
-                    Fx.fireballsmoke.at(b.x, b.y);
-                }
-
-                if(Mathf.chance(0.1 * Time.delta)){
-                    Fx.ballfire.at(b.x, b.y);
-                }
-            }
-        };
-
-        basicFlame = new BulletType(3.35f, 16f){{
-            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;
+        fireball = new FireBulletType(1f, 4){{
             hittable = false;
         }};
 
-        pyraFlame = new BulletType(3.35f, 25f){{
-            ammoMultiplier = 4f;
-            hitSize = 7f;
-            lifetime = 18f;
-            pierce = true;
-            collidesAir = false;
-            statusDuration = 60f * 6;
-            shootEffect = Fx.shootPyraFlame;
-            hitEffect = Fx.hitFlameSmall;
-            despawnEffect = Fx.none;
-            status = StatusEffects.burning;
-            hittable = false;
-        }};
-
-        waterShot = new LiquidBulletType(Liquids.water){{
+        spaceLiquid = new SpaceLiquidBulletType(){{
             knockback = 0.7f;
             drag = 0.01f;
         }};
-
-        cryoShot = new LiquidBulletType(Liquids.cryofluid){{
-            drag = 0.01f;
-        }};
-
-        slagShot = new LiquidBulletType(Liquids.slag){{
-            damage = 4;
-            drag = 0.01f;
-        }};
-
-        oilShot = new LiquidBulletType(Liquids.oil){{
-            drag = 0.01f;
-        }};
-
-        heavyWaterShot = new LiquidBulletType(Liquids.water){{
-            lifetime = 49f;
-            speed = 4f;
-            knockback = 1.7f;
-            puddleSize = 8f;
-            orbSize = 4f;
-            drag = 0.001f;
-            ammoMultiplier = 0.4f;
-            statusDuration = 60f * 4f;
-            damage = 0.2f;
-        }};
-
-        heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{
-            lifetime = 49f;
-            speed = 4f;
-            knockback = 1.3f;
-            puddleSize = 8f;
-            orbSize = 4f;
-            drag = 0.001f;
-            ammoMultiplier = 0.4f;
-            statusDuration = 60f * 4f;
-            damage = 0.2f;
-        }};
-
-        heavySlagShot = new LiquidBulletType(Liquids.slag){{
-            lifetime = 49f;
-            speed = 4f;
-            knockback = 1.3f;
-            puddleSize = 8f;
-            orbSize = 4f;
-            damage = 4.75f;
-            drag = 0.001f;
-            ammoMultiplier = 0.4f;
-            statusDuration = 60f * 4f;
-        }};
-
-        heavyOilShot = new LiquidBulletType(Liquids.oil){{
-            lifetime = 49f;
-            speed = 4f;
-            knockback = 1.3f;
-            puddleSize = 8f;
-            orbSize = 4f;
-            drag = 0.001f;
-            ammoMultiplier = 0.4f;
-            statusDuration = 60f * 4f;
-            damage = 0.2f;
-        }};
-
-        driverBolt = new MassDriverBolt();
     }
 }
diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java
new file mode 100644
index 0000000000..680c0194dd
--- /dev/null
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -0,0 +1,468 @@
+package mindustry.content;
+
+import arc.struct.*;
+import arc.util.*;
+import mindustry.entities.bullet.*;
+import mindustry.game.Objectives.*;
+import mindustry.type.*;
+import mindustry.type.unit.*;
+import mindustry.world.blocks.defense.turrets.*;
+
+import static mindustry.Vars.*;
+import static mindustry.content.Blocks.*;
+import static mindustry.content.SectorPresets.*;
+import static mindustry.content.TechTree.*;
+
+public class ErekirTechTree{
+    static IntSet balanced = new IntSet();
+
+    static void rebalanceBullet(BulletType bullet){
+        if(balanced.add(bullet.id)){
+            bullet.damage *= 0.75f;
+        }
+    }
+
+    //TODO remove this
+    public static void rebalance(){
+        for(var unit : content.units().select(u -> u instanceof ErekirUnitType)){
+            for(var weapon : unit.weapons){
+                rebalanceBullet(weapon.bullet);
+            }
+        }
+
+        for(var block : content.blocks()){
+            if(block instanceof Turret turret && Structs.contains(block.requirements, i -> !Items.serpuloItems.contains(i.item))){
+                if(turret instanceof ItemTurret item){
+                    for(var bullet : item.ammoTypes.values()){
+                        rebalanceBullet(bullet);
+                    }
+                }else if(turret instanceof ContinuousLiquidTurret cont){
+                    for(var bullet : cont.ammoTypes.values()){
+                        rebalanceBullet(bullet);
+                    }
+                }else if(turret instanceof ContinuousTurret cont){
+                    rebalanceBullet(cont.shootType);
+                }
+            }
+        }
+    }
+
+    public static void load(){
+        rebalance();
+
+        //TODO might be unnecessary with no asteroids
+        Seq<Objective> erekirSector = Seq.with(new OnPlanet(Planets.erekir));
+
+        var costMultipliers = new ObjectFloatMap<Item>();
+        for(var item : content.items()) costMultipliers.put(item, 0.9f);
+
+        //these are hard to make
+        costMultipliers.put(Items.oxide, 0.5f);
+        costMultipliers.put(Items.surgeAlloy, 0.7f);
+        costMultipliers.put(Items.carbide, 0.3f);
+        costMultipliers.put(Items.phaseFabric, 0.2f);
+
+        Planets.erekir.techTree = nodeRoot("erekir", coreBastion, true, () -> {
+            context().researchCostMultipliers = costMultipliers;
+
+            node(duct, erekirSector, () -> {
+                node(ductRouter, () -> {
+                    node(ductBridge, () -> {
+                        node(armoredDuct, () -> {
+                            node(surgeConveyor, () -> {
+                                node(surgeRouter);
+                            });
+                        });
+
+                        node(unitCargoLoader, () -> {
+                            node(unitCargoUnloadPoint, () -> {
+
+                            });
+                        });
+                    });
+
+                    node(overflowDuct, Seq.with(new OnSector(aegis)), () -> {
+                        node(underflowDuct);
+                        node(reinforcedContainer, () -> {
+                            node(ductUnloader, () -> {
+
+                            });
+
+                            node(reinforcedVault, () -> {
+
+                            });
+                        });
+                    });
+
+                    node(reinforcedMessage, Seq.with(new OnSector(aegis)), () -> {
+                        node(canvas);
+                    });
+                });
+
+                node(reinforcedPayloadConveyor, Seq.with(new OnSector(atlas)), () -> {
+                    //TODO should only be unlocked in unit sector
+                    node(payloadMassDriver, Seq.with(new Research(siliconArcFurnace), new OnSector(split)), () -> {
+                        //TODO further limitations
+                        node(payloadLoader, () -> {
+                            node(payloadUnloader, () -> {
+                                node(largePayloadMassDriver, () -> {
+
+                                });
+                            });
+                        });
+
+                        node(constructor, Seq.with(new OnSector(split)), () -> {
+                            node(smallDeconstructor, Seq.with(new OnSector(peaks)), () -> {
+                                node(largeConstructor, Seq.with(new OnSector(siege)), () -> {
+
+                                });
+
+                                node(deconstructor, Seq.with(new OnSector(siege)), () -> {
+
+                                });
+                            });
+                        });
+                    });
+
+                    node(reinforcedPayloadRouter, () -> {
+
+                    });
+                });
+            });
+
+            //TODO move into turbine condenser?
+            node(plasmaBore, () -> {
+                node(impactDrill, Seq.with(new OnSector(aegis)), () -> {
+                    node(largePlasmaBore, Seq.with(new OnSector(caldera)), () -> {
+                        node(eruptionDrill, Seq.with(new OnSector(stronghold)), () -> {
+
+                        });
+
+                        node(largeCliffCrusher, Seq.with(new OnSector(stronghold)), () -> {
+
+                        });
+                    });
+                });
+            });
+
+            node(turbineCondenser, () -> {
+                node(beamNode, () -> {
+                    node(ventCondenser, Seq.with(new OnSector(aegis)), () -> {
+                        node(chemicalCombustionChamber, Seq.with(new OnSector(basin)), () -> {
+                            node(pyrolysisGenerator, Seq.with(new OnSector(crevice)), () -> {
+                                node(fluxReactor, Seq.with(new OnSector(crossroads), new Research(cyanogenSynthesizer)), () -> {
+                                    node(neoplasiaReactor, Seq.with(new OnSector(karst)), () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+                    node(beamTower, Seq.with(new OnSector(peaks)), () -> {
+
+                    });
+
+
+                    node(regenProjector, Seq.with(new OnSector(peaks)), () -> {
+                        //TODO more tiers of build tower or "support" structures like overdrive projectors
+                        node(buildTower, Seq.with(new OnSector(stronghold)), () -> {
+                            node(shockwaveTower, Seq.with(new OnSector(siege)), () -> {
+
+                            });
+                        });
+                    });
+                });
+
+                node(reinforcedConduit, Seq.with(new OnSector(aegis)), () -> {
+                    //TODO maybe should be even later
+                    node(reinforcedPump, Seq.with(new OnSector(basin)), () -> {
+                        //TODO T2 pump, consume cyanogen or similar
+                    });
+
+                    node(reinforcedLiquidJunction, () -> {
+                        node(reinforcedBridgeConduit, () -> {
+
+                        });
+
+                        node(reinforcedLiquidRouter, () -> {
+                            node(reinforcedLiquidContainer, () -> {
+                                node(reinforcedLiquidTank, Seq.with(new SectorComplete(intersect)), () -> {
+
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(cliffCrusher, () -> {
+                    node(siliconArcFurnace, () -> {
+                        node(electrolyzer, Seq.with(new OnSector(atlas)), () -> {
+                            node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(marsh)), () -> {
+
+                                node(surgeCrucible, Seq.with(new OnSector(ravine)), () -> {
+
+                                });
+                                node(heatRedirector, Seq.with(new OnSector(ravine)), () -> {
+                                    node(electricHeater, Seq.with(new OnSector(ravine), new Research(afflict)), () -> {
+                                        node(slagHeater, Seq.with(new OnSector(caldera)), () -> {
+
+                                        });
+
+                                        node(atmosphericConcentrator, Seq.with(new OnSector(caldera)), () -> {
+                                            node(cyanogenSynthesizer, Seq.with(new OnSector(siege)), () -> {
+
+                                            });
+                                        });
+
+                                        node(carbideCrucible, Seq.with(new OnSector(crevice)), () -> {
+                                            node(phaseSynthesizer, Seq.with(new OnSector(karst)), () -> {
+                                                node(phaseHeater, Seq.with(new Research(phaseSynthesizer)), () -> {
+
+                                                });
+                                            });
+                                        });
+
+                                        node(heatRouter, () -> {
+                                            node(smallHeatRedirector, () -> {
+
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+
+                            node(slagIncinerator, Seq.with(new OnSector(basin)), () -> {
+
+                                //TODO these are unused.
+                                //node(slagCentrifuge, () -> {});
+                                //node(heatReactor, () -> {});
+                            });
+                        });
+                    });
+                });
+            });
+
+
+            node(breach, Seq.with(new Research(siliconArcFurnace), new Research(tankFabricator)), () -> {
+                node(berylliumWall, () -> {
+                    node(berylliumWallLarge, () -> {
+
+                    });
+
+                    node(tungstenWall, () -> {
+                        node(tungstenWallLarge, () -> {
+                            node(blastDoor, () -> {
+
+                            });
+                        });
+
+                        node(reinforcedSurgeWall, () -> {
+                            node(reinforcedSurgeWallLarge, () -> {
+                                node(shieldedWall, () -> {
+
+                                });
+                            });
+                        });
+
+                        node(carbideWall, () -> {
+                            node(carbideWallLarge, () -> {
+
+                            });
+                        });
+                    });
+                });
+
+                node(diffuse, Seq.with(new OnSector(lake)), () -> {
+                    node(sublimate, Seq.with(new OnSector(marsh)), () -> {
+                        node(afflict, Seq.with(new OnSector(ravine)), () -> {
+                            node(titan, Seq.with(new OnSector(stronghold)), () -> {
+                                node(lustre, Seq.with(new OnSector(crevice)), () -> {
+                                    node(smite, Seq.with(new OnSector(karst)), () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+                    node(disperse, Seq.with(new OnSector(stronghold)), () -> {
+                        node(scathe, Seq.with(new OnSector(siege)), () -> {
+                            node(malign, Seq.with(new SectorComplete(karst)), () -> {
+
+                            });
+                        });
+                    });
+                });
+
+
+                node(radar, Seq.with(new Research(beamNode), new Research(turbineCondenser), new Research(tankFabricator), new OnSector(SectorPresets.aegis)), () -> {
+
+                });
+            });
+
+            node(coreCitadel, Seq.with(new SectorComplete(peaks)), () -> {
+                node(coreAcropolis, Seq.with(new SectorComplete(siege)), () -> {
+
+                });
+            });
+
+            node(tankFabricator, Seq.with(new Research(siliconArcFurnace), new Research(plasmaBore), new Research(turbineCondenser)), () -> {
+                node(UnitTypes.stell);
+
+                node(unitRepairTower, Seq.with(new OnSector(ravine), new Research(mechRefabricator)), () -> {
+
+                });
+
+                node(shipFabricator, Seq.with(new OnSector(lake)), () -> {
+                    node(UnitTypes.elude);
+
+                    node(mechFabricator, Seq.with(new OnSector(intersect)), () -> {
+                        node(UnitTypes.merui);
+
+                        node(tankRefabricator, Seq.with(new OnSector(atlas)), () -> {
+                            node(UnitTypes.locus);
+
+                            node(mechRefabricator, Seq.with(new OnSector(basin)), () -> {
+                                node(UnitTypes.cleroi);
+
+                                node(shipRefabricator, Seq.with(new OnSector(peaks)), () -> {
+                                    node(UnitTypes.avert);
+
+                                    //TODO
+                                    node(primeRefabricator, Seq.with(new OnSector(stronghold)), () -> {
+                                        node(UnitTypes.precept);
+                                        node(UnitTypes.anthicus);
+                                        node(UnitTypes.obviate);
+                                    });
+
+                                    node(tankAssembler, Seq.with(new OnSector(siege), new Research(constructor), new Research(atmosphericConcentrator)), () -> {
+
+                                        node(UnitTypes.vanquish, () -> {
+                                            node(UnitTypes.conquer, Seq.with(new OnSector(karst)), () -> {
+
+                                            });
+                                        });
+
+                                        node(shipAssembler, Seq.with(new OnSector(crossroads)), () -> {
+                                            node(UnitTypes.quell, () -> {
+                                                node(UnitTypes.disrupt, Seq.with(new OnSector(karst)), () -> {
+
+                                                });
+                                            });
+                                        });
+
+                                        node(mechAssembler, Seq.with(new OnSector(crossroads)), () -> {
+                                            node(UnitTypes.tecta, () -> {
+                                                node(UnitTypes.collaris, Seq.with(new OnSector(karst)), () -> {
+
+                                                });
+                                            });
+                                        });
+
+                                        node(basicAssemblerModule, Seq.with(new SectorComplete(karst)), () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(onset, () -> {
+                node(aegis, Seq.with(new SectorComplete(onset), new Research(ductRouter), new Research(ductBridge)), () -> {
+                    node(lake, Seq.with(new SectorComplete(aegis)), () -> {
+
+                    });
+
+                    node(intersect, Seq.with(new SectorComplete(aegis), new SectorComplete(lake), new Research(ventCondenser), new Research(shipFabricator)), () -> {
+                        node(atlas, Seq.with(new SectorComplete(intersect), new Research(mechFabricator)), () -> {
+                            node(split, Seq.with(new SectorComplete(atlas), new Research(reinforcedPayloadConveyor), new Research(reinforcedContainer)), () -> {
+
+                            });
+
+                            node(basin, Seq.with(new SectorComplete(atlas)), () -> {
+                                node(marsh, Seq.with(new SectorComplete(basin)), () -> {
+                                    node(ravine, Seq.with(new SectorComplete(marsh), new Research(Liquids.slag)), () -> {
+                                        node(caldera, Seq.with(new SectorComplete(peaks), new Research(heatRedirector)), () -> {
+                                            node(stronghold, Seq.with(new SectorComplete(caldera), new Research(coreCitadel)), () -> {
+                                                node(crevice, Seq.with(new SectorComplete(stronghold)), () -> {
+                                                    node(siege, Seq.with(new SectorComplete(crevice)), () -> {
+                                                        node(crossroads, Seq.with(new SectorComplete(siege)), () -> {
+                                                            node(karst, Seq.with(new SectorComplete(crossroads), new Research(coreAcropolis)), () -> {
+                                                                node(origin, Seq.with(new SectorComplete(karst), new Research(coreAcropolis), new Research(UnitTypes.vanquish), new Research(UnitTypes.disrupt), new Research(UnitTypes.collaris), new Research(malign), new Research(basicAssemblerModule), new Research(neoplasiaReactor)), () -> {
+
+                                                                });
+                                                            });
+                                                        });
+                                                    });
+                                                });
+                                            });
+                                        });
+                                    });
+
+                                    node(peaks, Seq.with(new SectorComplete(marsh), new SectorComplete(split)), () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+
+            nodeProduce(Items.beryllium, () -> {
+                nodeProduce(Items.sand, () -> {
+                    nodeProduce(Items.silicon, () -> {
+                        nodeProduce(Items.oxide, () -> {
+                            //nodeProduce(Items.fissileMatter, () -> {});
+                        });
+                    });
+                });
+
+                nodeProduce(Liquids.water, () -> {
+                    nodeProduce(Liquids.ozone, () -> {
+                        nodeProduce(Liquids.hydrogen, () -> {
+                            nodeProduce(Liquids.nitrogen, () -> {
+
+                            });
+
+                            nodeProduce(Liquids.cyanogen, () -> {
+                                nodeProduce(Liquids.neoplasm, () -> {
+
+                                });
+                            });
+                        });
+                    });
+                });
+
+                nodeProduce(Items.graphite, () -> {
+                    nodeProduce(Items.tungsten, () -> {
+                        nodeProduce(Liquids.slag, () -> {
+
+                        });
+
+                        nodeProduce(Liquids.arkycite, () -> {
+
+                        });
+
+                        nodeProduce(Items.thorium, () -> {
+                            nodeProduce(Items.carbide, () -> {
+
+                                //nodeProduce(Liquids.gallium, () -> {});
+                            });
+                        });
+
+                        nodeProduce(Items.surgeAlloy, () -> {
+                            nodeProduce(Items.phaseFabric, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 7688108ebe..25c604c986 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -8,11 +8,12 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.entities.*;
-import mindustry.game.*;
+import mindustry.entities.abilities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
-import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.units.UnitAssembler.*;
 
 import static arc.graphics.g2d.Draw.rect;
 import static arc.graphics.g2d.Draw.*;
@@ -21,23 +22,53 @@ import static arc.math.Angles.*;
 import static mindustry.Vars.*;
 
 public class Fx{
+    public static final Rand rand = new Rand();
+    public static final Vec2 v = new Vec2();
+
     public static final Effect
 
     none = new Effect(0, 0f, e -> {}),
 
+    blockCrash = new Effect(90f, e -> {
+        if(!(e.data instanceof Block block)) return;
+
+        alpha(e.fin() + 0.5f);
+        float offset = Mathf.lerp(0f, 180f, e.fout());
+        color(0f, 0f, 0f, 0.44f);
+        rect(block.fullIcon, e.x - offset * 4f, e.y, (float)block.size * 8f, (float)block.size * 8f);
+        color(Color.white);
+        rect(block.fullIcon, e.x + offset, e.y + offset * 5f, (float)block.size * 8f, (float)block.size * 8f);
+    }),
+
+    trailFade = new Effect(400f, e -> {
+        if(!(e.data instanceof Trail trail)) return;
+        //lifetime is how many frames it takes to fade out the trail
+        e.lifetime = trail.length * 1.4f;
+
+        if(!state.isPaused()){
+            trail.shorten();
+        }
+        trail.drawCap(e.color, e.rotation);
+        trail.draw(e.color, e.rotation);
+    }),
+
     unitSpawn = new Effect(30f, e -> {
-        if(!(e.data instanceof UnitType)) return;
+        if(!(e.data instanceof UnitType unit)) return;
+
+        TextureRegion region = unit.fullIcon;
+
+        float scl = (1f + e.fout() * 2f) * region.scl();
+
+        alpha(e.fout());
+        mixcol(Color.white, e.fin());
+
+        rect(region, e.x, e.y, 180f);
+
+        reset();
 
         alpha(e.fin());
 
-        float scl = 1f + e.fout() * 2f;
-
-        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);
-
+        rect(region, e.x, e.y, region.width * scl, region.height * scl, e.rotation - 90);
     }),
 
     unitCapKill = new Effect(80f, e -> {
@@ -48,15 +79,22 @@ public class Fx{
         Draw.rect(Icon.warning.getRegion(), e.x, e.y, size, size);
     }),
 
+    unitEnvKill = new Effect(80f, e -> {
+        color(Color.scarlet);
+        alpha(e.fout(Interp.pow4Out));
+
+        float size = 10f + e.fout(Interp.pow10In) * 25f;
+        Draw.rect(Icon.cancel.getRegion(), e.x, e.y, size, size);
+    }),
+
     unitControl = new Effect(30f, e -> {
-        if(!(e.data instanceof Unit)) return;
+        if(!(e.data instanceof Unit select)) return;
 
-        Unit select = e.data();
         boolean block = select instanceof BlockUnitc;
 
         mixcol(Pal.accent, 1f);
         alpha(e.fout());
-        rect(block ? ((BlockUnitc)select).tile().block.icon(Cicon.full) : select.type.icon(Cicon.full), select.x, select.y, block ? 0f : select.rotation - 90f);
+        rect(block ? ((BlockUnitc)select).tile().block.fullIcon : select.type.fullIcon, select.x, select.y, block ? 0f : select.rotation - 90f);
         alpha(1f);
         Lines.stroke(e.fslope());
         Lines.square(select.x, select.y, e.fout() * select.hitSize * 2f, 45);
@@ -66,23 +104,21 @@ public class Fx{
     }),
 
     unitDespawn = new Effect(100f, e -> {
-        if(!(e.data instanceof Unit) || e.<Unit>data().type == null) return;
+        if(!(e.data instanceof Unit select) || select.type == null) return;
 
-        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.fullIcon, select.x, select.y, select.rotation - 90f);
         reset();
 
         Draw.scl = p;
     }),
 
     unitSpirit = new Effect(17f, e -> {
-        if(!(e.data instanceof Position)) return;
-        Position to = e.data();
+        if(!(e.data instanceof Position to)) return;
 
         color(Pal.accent);
 
@@ -100,29 +136,26 @@ public class Fx{
     }),
 
     itemTransfer = new Effect(12f, e -> {
-        if(!(e.data instanceof Position)) return;
-        Position to = e.data();
+        if(!(e.data instanceof Position to)) return;
         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 = 1f;
 
-        stroke(e.fslope() * 2f * size, Pal.accent);
-        Lines.circle(x, y, e.fslope() * 2f * size);
+        color(Pal.accent);
+        Fill.circle(x, y, e.fslope() * 3f * size);
 
         color(e.color);
         Fill.circle(x, y, e.fslope() * 1.5f * size);
     }),
 
-    pointBeam = new Effect(25f, e -> {
-        if(!(e.data instanceof Position)) return;
+    pointBeam = new Effect(25f, 300f, e -> {
+        if(!(e.data instanceof Position pos)) return;
 
-        Position pos = e.data();
-
-        Draw.color(e.color);
-        Draw.alpha(e.fout());
+        Draw.color(e.color, e.fout());
         Lines.stroke(1.5f);
         Lines.line(e.x, e.y, pos.getX(), pos.getY());
+        Drawf.light(e.x, e.y, pos.getX(), pos.getY(), 20f, e.color, 0.6f * e.fout());
     }),
 
     pointHit = new Effect(8f, e -> {
@@ -150,16 +183,60 @@ public class Fx{
         }
     }),
 
+    coreBuildShockwave = new Effect(120, 500f, e -> {
+        e.lifetime = e.rotation;
+
+        color(Pal.command);
+        stroke(e.fout(Interp.pow5Out) * 4f);
+        Lines.circle(e.x, e.y, e.fin() * e.rotation * 2f);
+    }),
+
+    coreBuildBlock = new Effect(80f, e -> {
+        if(!(e.data instanceof Block block)) return;
+
+        mixcol(Pal.accent, 1f);
+        alpha(e.fout());
+        rect(block.fullIcon, e.x, e.y);
+    }).layer(Layer.turret - 5f),
+
+    pointShockwave = new Effect(20, e -> {
+        color(e.color);
+        stroke(e.fout() * 2f);
+        Lines.circle(e.x, e.y, e.finpow() * e.rotation);
+        randLenVectors(e.id + 1, 8, 1f + 23f * e.finpow(), (x, y) ->
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f));
+    }),
+
+    moveCommand = new Effect(20, e -> {
+        color(Pal.command);
+        stroke(e.fout() * 5f);
+        Lines.circle(e.x, e.y, 6f + e.fin() * 2f);
+    }).layer(Layer.overlayUI),
+
+    attackCommand = new Effect(20, e -> {
+        color(Pal.remove);
+        stroke(e.fout() * 5f);
+        poly(e.x, e.y, 4, 7f + e.fin() * 2f);
+    }).layer(Layer.overlayUI),
+
     commandSend = new Effect(28, e -> {
         color(Pal.command);
         stroke(e.fout() * 2f);
-        Lines.circle(e.x, e.y, 4f + e.finpow() * 120f);
+        Lines.circle(e.x, e.y, 4f + e.finpow() * e.rotation);
     }),
 
     upgradeCore = new Effect(120f, e -> {
-        color(Color.white, Pal.accent, e.fin());
+        if(!(e.data instanceof Block block)) return;
+
+        mixcol(Tmp.c1.set(Color.white).lerp(Pal.accent, e.fin()), 1f);
         alpha(e.fout());
-        Fill.square(e.x, e.y, tilesize / 2f * e.rotation);
+        rect(block.fullIcon, e.x, e.y);
+    }).layer(Layer.turret - 5f),
+
+    upgradeCoreBloom = new Effect(80f, e -> {
+        color(Pal.accent);
+        stroke(4f * e.fout());
+        Lines.square(e.x, e.y, tilesize / 2f * e.rotation + 2f);
     }),
 
     placeBlock = new Effect(16, e -> {
@@ -168,6 +245,16 @@ public class Fx{
         Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f);
     }),
 
+    coreLaunchConstruct = new Effect(35, e -> {
+        color(Pal.accent);
+        stroke(4f - e.fin() * 3f);
+        Lines.square(e.x, e.y, tilesize / 2f * e.rotation * 1.2f + e.fin() * 5f);
+
+        randLenVectors(e.id, 5 + (int)(e.rotation * 5), e.rotation * 3f + (tilesize * e.rotation) * e.finpow() * 1.5f, (x, y) -> {
+            Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * (4f + e.rotation));
+        });
+    }),
+
     tapBlock = new Effect(12, e -> {
         color(Pal.accent);
         stroke(3f - e.fin() * 2f);
@@ -184,6 +271,22 @@ public class Fx{
         });
     }),
 
+    payloadDeposit = new Effect(30f, e -> {
+        if(!(e.data instanceof YeetData data)) return;
+        Tmp.v1.set(e.x, e.y).lerp(data.target, e.finpow());
+        float x = Tmp.v1.x, y = Tmp.v1.y;
+
+        scl(e.fout(Interp.pow3Out) * 1.05f);
+        if(data.item instanceof Block block){
+            Drawf.squareShadow(x, y, block.size * tilesize * 1.85f, 1f);
+        }else if(data.item instanceof UnitType unit){
+            unit.drawSoftShadow(e.x, e.y, e.rotation, 1f);
+        }
+
+        mixcol(Pal.accent, e.fin());
+        rect(data.item.fullIcon, x, y, data.item instanceof Block ? 0f : e.rotation - 90f);
+    }).layer(Layer.flyingUnitLow - 5f),
+
     select = new Effect(23, e -> {
         color(Pal.accent);
         stroke(e.fout() * 3f);
@@ -201,11 +304,10 @@ public class Fx{
     }),
 
     unitWreck = new Effect(200f, e -> {
-        if(!(e.data instanceof TextureRegion)) return;
+        if(!(e.data instanceof TextureRegion reg)) return;
 
         Draw.mixcol(Pal.rubble, 1f);
 
-        TextureRegion reg = e.data();
         float vel = e.fin(Interp.pow5Out) * 2f * Mathf.randomSeed(e.id, 1f);
         float totalRot = Mathf.randomSeed(e.id + 1, 10f);
         Tmp.v1.trns(Mathf.randomSeed(e.id + 2, 360f), vel);
@@ -239,18 +341,27 @@ public class Fx{
         Lines.poly(e.x, e.y, 4, 5f + e.fin() * 12f);
     }),
 
+    unitAssemble = new Effect(70, e -> {
+        if(!(e.data instanceof UnitType type)) return;
+
+        alpha(e.fout());
+        mixcol(Pal.accent, e.fout());
+        rect(type.fullIcon, e.x, e.y, e.rotation);
+    }).layer(Layer.flyingUnit + 5f),
+
     padlaunch = new Effect(10, e -> {
         stroke(4f * e.fout());
         color(Pal.accent);
         Lines.poly(e.x, e.y, 4, 5f + e.fin() * 60f);
     }),
 
-    vtolHover = new Effect(40f, e -> {
-        float len = e.finpow() * 10f;
-        float ang = e.rotation + Mathf.randomSeedRange(e.id, 30f);
-        color(Pal.lightFlame, Pal.lightOrange, e.fin());
-        Fill.circle(e.x + trnsx(ang, len), e.y + trnsy(ang, len), 2f * e.fout());
-    }),
+    breakProp = new Effect(23, e -> {
+        float scl = Math.max(e.rotation, 1);
+        color(Tmp.c1.set(e.color).mul(1.1f));
+        randLenVectors(e.id, 6, 19f * e.finpow() * scl, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() * 3.5f * scl + 0.3f);
+        });
+    }).layer(Layer.debris),
 
     unitDrop = new Effect(30, e -> {
         color(Pal.lightishGray);
@@ -261,11 +372,19 @@ public class Fx{
 
     unitLand = new Effect(30, e -> {
         color(Tmp.c1.set(e.color).mul(1.1f));
+        //TODO doesn't respect rotation / size
         randLenVectors(e.id, 6, 17f * e.finpow(), (x, y) -> {
             Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.3f);
         });
     }).layer(Layer.debris),
 
+    unitDust = new Effect(30, e -> {
+        color(Tmp.c1.set(e.color).mul(1.3f));
+        randLenVectors(e.id, 3, 8f * e.finpow(), e.rotation, 30f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.3f);
+        });
+    }).layer(Layer.debris),
+
     unitLandSmall = new Effect(30, e -> {
         color(Tmp.c1.set(e.color).mul(1.1f));
         randLenVectors(e.id, (int)(6 * e.rotation), 12f * e.finpow() * e.rotation, (x, y) -> {
@@ -279,6 +398,13 @@ public class Fx{
         Lines.poly(e.x, e.y, 4, 13f * e.fout());
     }).layer(Layer.debris),
 
+    crawlDust = new Effect(35, e -> {
+        color(Tmp.c1.set(e.color).mul(1.6f));
+        randLenVectors(e.id, 2, 10f * e.finpow(), (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fslope() * 4f + 0.3f);
+        });
+    }).layer(Layer.debris),
+
     landShock = new Effect(12, e -> {
         color(Pal.lancerLaser);
         stroke(e.fout() * 3f);
@@ -291,10 +417,236 @@ public class Fx{
         Lines.spikes(e.x, e.y, 1f + e.fin() * 6f, e.fout() * 4f, 6);
     }),
 
+    sparkExplosion = new Effect(30f, 160f, e -> {
+        color(e.color);
+        stroke(e.fout() * 3f);
+        float circleRad = 6f + e.finpow() * e.rotation;
+        Lines.circle(e.x, e.y, circleRad);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 16; i++){
+            float angle = rand.random(360f);
+            float lenRand = rand.random(0.5f, 1f);
+            Lines.lineAngle(e.x, e.y, angle, e.foutpow() * e.rotation * 0.8f * rand.random(1f, 0.6f) + 2f, e.finpow() * e.rotation * 1.2f * lenRand + 6f);
+        }
+    }),
+
+    titanExplosion = new Effect(30f, 160f, e -> {
+        color(e.color);
+        stroke(e.fout() * 3f);
+        float circleRad = 6f + e.finpow() * 60f;
+        Lines.circle(e.x, e.y, circleRad);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 16; i++){
+            float angle = rand.random(360f);
+            float lenRand = rand.random(0.5f, 1f);
+            Lines.lineAngle(e.x, e.y, angle, e.foutpow() * 50f * rand.random(1f, 0.6f) + 2f, e.finpow() * 70f * lenRand + 6f);
+        }
+    }),
+
+    titanExplosionLarge = new Effect(45f, 220f, e -> {
+        color(e.color);
+        stroke(e.fout() * 3f);
+        float circleRad = 6f + e.finpow() * 110f;
+        Lines.circle(e.x, e.y, circleRad);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 21; i++){
+            float angle = rand.random(360f);
+            float lenRand = rand.random(0.5f, 1f);
+            Lines.lineAngle(e.x, e.y, angle, e.foutpow() * 50f * rand.random(1f, 0.6f) + 2f, e.finpow() * 100f * lenRand + 6f);
+        }
+    }),
+
+    titanSmoke = new Effect(300f, 300f, b -> {
+        float intensity = 3f;
+
+        color(b.color, 0.7f);
+        for(int i = 0; i < 4; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.5f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(2.9f * intensity), 22f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    float rad = fout * ((2f + intensity) * 2.35f);
+
+                    Fill.circle(e.x + x, e.y + y, rad);
+                    Drawf.light(e.x + x, e.y + y, rad * 2.5f, b.color, 0.5f);
+                });
+            });
+        }
+    }),
+
+    titanSmokeLarge = new Effect(400f, 400f, b -> {
+        float intensity = 4f;
+
+        color(b.color, 0.65f);
+        for(int i = 0; i < 4; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.5f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(2.9f * intensity), 26f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    float rad = fout * ((2f + intensity) * 2.35f);
+
+                    Fill.circle(e.x + x, e.y + y, rad);
+                    Drawf.light(e.x + x, e.y + y, rad * 2.5f, b.color, 0.5f);
+                });
+            });
+        }
+    }),
+
+    smokeAoeCloud = new Effect(60f * 3f, 250f, e -> {
+        color(e.color, 0.65f);
+
+        randLenVectors(e.id, 80, 90f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, 6f * Mathf.clamp(e.fin() / 0.1f) * Mathf.clamp(e.fout() / 0.1f));
+        });
+    }),
+
+    missileTrailSmoke = new Effect(180f, 300f, b -> {
+        float intensity = 2f;
+
+        color(b.color, 0.7f);
+        for(int i = 0; i < 4; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.5f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(2.9f * intensity), 13f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    float rad = fout * ((2f + intensity) * 2.35f);
+
+                    Fill.circle(e.x + x, e.y + y, rad);
+                    Drawf.light(e.x + x, e.y + y, rad * 2.5f, b.color, 0.5f);
+                });
+            });
+        }
+    }).layer(Layer.bullet - 1f),
+
+    missileTrailSmokeSmall = new Effect(120f, 200f, b -> {
+        float intensity = 1.3f;
+
+        color(b.color, 0.7f);
+        for(int i = 0; i < 3; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.5f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(2.9f * intensity), 13f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    float rad = fout * ((2f + intensity) * 2.35f);
+
+                    Fill.circle(e.x + x, e.y + y, rad);
+                    Drawf.light(e.x + x, e.y + y, rad * 2.5f, b.color, 0.5f);
+                });
+            });
+        }
+    }).layer(Layer.bullet - 1f),
+
+    neoplasmSplat = new Effect(400f, 300f, b -> {
+        float intensity = 3f;
+
+        color(Pal.neoplasm1);
+        for(int i = 0; i < 4; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.5f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(5f * intensity), 22f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    float rad = fout * ((2f + intensity) * 1.35f);
+
+                    Fill.circle(e.x + x, e.y + y, rad);
+                    Drawf.light(e.x + x, e.y + y, rad * 2.5f, b.color, 0.5f);
+                });
+            });
+        }
+    }).layer(Layer.bullet - 2f),
+
+    scatheExplosion = new Effect(60f, 160f, e -> {
+        color(e.color);
+        stroke(e.fout() * 5f);
+        float circleRad = 6f + e.finpow() * 60f;
+        Lines.circle(e.x, e.y, circleRad);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 16; i++){
+            float angle = rand.random(360f);
+            float lenRand = rand.random(0.5f, 1f);
+            Tmp.v1.trns(angle, circleRad);
+
+            for(int s : Mathf.signs){
+                Drawf.tri(e.x + Tmp.v1.x, e.y + Tmp.v1.y, e.foutpow() * 40f, e.fout() * 30f * lenRand + 6f, angle + 90f + s * 90f);
+            }
+        }
+    }),
+
+    scatheExplosionSmall = new Effect(40f, 160f, e -> {
+        color(e.color);
+        stroke(e.fout() * 4f);
+        float circleRad = 6f + e.finpow() * 40f;
+        Lines.circle(e.x, e.y, circleRad);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 16; i++){
+            float angle = rand.random(360f);
+            float lenRand = rand.random(0.5f, 1f);
+            Tmp.v1.trns(angle, circleRad);
+
+            for(int s : Mathf.signs){
+                Drawf.tri(e.x + Tmp.v1.x, e.y + Tmp.v1.y, e.foutpow() * 30f, e.fout() * 25f * lenRand + 6f, angle + 90f + s * 90f);
+            }
+        }
+    }),
+
+    scatheLight = new Effect(60f, 160f, e -> {
+        float circleRad = 6f + e.finpow() * 60f;
+
+        color(e.color, e.foutpow());
+        Fill.circle(e.x, e.y, circleRad);
+    }).layer(Layer.bullet + 2f),
+
+    scatheLightSmall = new Effect(60f, 160f, e -> {
+        float circleRad = 6f + e.finpow() * 40f;
+
+        color(e.color, e.foutpow());
+        Fill.circle(e.x, e.y, circleRad);
+    }).layer(Layer.bullet + 2f),
+
+    scatheSlash = new Effect(40f, 160f, e -> {
+        Draw.color(e.color);
+        for(int s : Mathf.signs){
+            Drawf.tri(e.x, e.y, e.fout() * 25f, e.foutpow() * 66f + 6f, e.rotation + s * 90f);
+        }
+    }),
+
+    dynamicSpikes = new Effect(40f, 100f, e -> {
+        color(e.color);
+        stroke(e.fout() * 2f);
+        float circleRad = 4f + e.finpow() * e.rotation;
+        Lines.circle(e.x, e.y, circleRad);
+
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 6f, e.rotation * 1.5f * e.fout(), i*90);
+        }
+
+        color();
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 3f, e.rotation * 1.45f / 3f * e.fout(), i*90);
+        }
+
+        Drawf.light(e.x, e.y, circleRad * 1.6f, Pal.heal, e.fout());
+    }),
+
     greenBomb = new Effect(40f, 100f, e -> {
         color(Pal.heal);
         stroke(e.fout() * 2f);
-        Lines.circle(e.x, e.y, 4f + e.finpow() * 65f);
+        float circleRad = 4f + e.finpow() * 65f;
+        Lines.circle(e.x, e.y, circleRad);
 
         color(Pal.heal);
         for(int i = 0; i < 4; i++){
@@ -305,6 +657,8 @@ public class Fx{
         for(int i = 0; i < 4; i++){
             Drawf.tri(e.x, e.y, 3f, 35f * e.fout(), i*90);
         }
+
+        Drawf.light(e.x, e.y, circleRad * 1.6f, Pal.heal, e.fout());
     }),
 
     greenLaserCharge = new Effect(80f, 100f, e -> {
@@ -316,17 +670,26 @@ public class Fx{
 
         randLenVectors(e.id, 20, 40f * e.fout(), (x, y) -> {
             Fill.circle(e.x + x, e.y + y, e.fin() * 5f);
+            Drawf.light(e.x + x, e.y + y, e.fin() * 15f, Pal.heal, 0.7f);
         });
 
         color();
 
         Fill.circle(e.x, e.y, e.fin() * 10);
-    }),
+        Drawf.light(e.x, e.y, e.fin() * 20f, Pal.heal, 0.7f);
+    }).followParent(true).rotWithParent(true),
 
     greenLaserChargeSmall = new Effect(40f, 100f, e -> {
         color(Pal.heal);
         stroke(e.fin() * 2f);
         Lines.circle(e.x, e.y, e.fout() * 50f);
+    }).followParent(true).rotWithParent(true),
+
+    greenCloud = new Effect(80f, e -> {
+        color(Pal.heal);
+        randLenVectors(e.id, e.fin(), 7, 9f, (x, y, fin, fout) -> {
+            Fill.circle(e.x + x, e.y + y, 5f * fout);
+        });
     }),
 
     healWaveDynamic = new Effect(22, e -> {
@@ -347,18 +710,37 @@ public class Fx{
         Lines.circle(e.x, e.y, 2f + e.finpow() * 7f);
     }),
 
+    dynamicWave = new Effect(22, e -> {
+        color(e.color, 0.7f);
+        stroke(e.fout() * 2f);
+        Lines.circle(e.x, e.y, 4f + e.finpow() * e.rotation);
+    }),
+
     shieldWave = new Effect(22, e -> {
-        color(Pal.shield);
+        color(e.color, 0.7f);
         stroke(e.fout() * 2f);
         Lines.circle(e.x, e.y, 4f + e.finpow() * 60f);
     }),
 
     shieldApply = new Effect(11, e -> {
-        color(Pal.shield);
+        color(e.color, 0.7f);
         stroke(e.fout() * 2f);
         Lines.circle(e.x, e.y, 2f + e.finpow() * 7f);
     }),
 
+    disperseTrail = new Effect(13, e -> {
+        color(Color.white, e.color, e.fin());
+        stroke(0.6f + e.fout() * 1.7f);
+        rand.setSeed(e.id);
+
+        for(int i = 0; i < 2; i++){
+            float rot = e.rotation + rand.range(15f) + 180f;
+            v.trns(rot, rand.random(e.fin() * 27f));
+            lineAngle(e.x + v.x, e.y + v.y, rot, e.fout() * rand.random(2f, 7f) + 1.5f);
+        }
+    }),
+
+
     hitBulletSmall = new Effect(14, e -> {
         color(Color.white, Pal.lightOrange, e.fin());
 
@@ -373,6 +755,44 @@ public class Fx{
             float ang = Mathf.angle(x, y);
             lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f);
         });
+
+        Drawf.light(e.x, e.y, 20f, Pal.lightOrange, 0.6f * e.fout());
+    }),
+
+    hitBulletColor = new Effect(14, e -> {
+        color(Color.white, e.color, e.fin());
+
+        e.scaled(7f, s -> {
+            stroke(0.5f + s.fout());
+            Lines.circle(e.x, e.y, s.fin() * 5f);
+        });
+
+        stroke(0.5f + e.fout());
+
+        randLenVectors(e.id, 5, e.fin() * 15f, (x, y) -> {
+            float ang = Mathf.angle(x, y);
+            lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f);
+        });
+
+        Drawf.light(e.x, e.y, 20f, e.color, 0.6f * e.fout());
+    }),
+
+    hitSquaresColor = new Effect(14, e -> {
+        color(Color.white, e.color, e.fin());
+
+        e.scaled(7f, s -> {
+            stroke(0.5f + s.fout());
+            Lines.circle(e.x, e.y, s.fin() * 5f);
+        });
+
+        stroke(0.5f + e.fout());
+
+        randLenVectors(e.id, 5, e.fin() * 17f, (x, y) -> {
+            float ang = Mathf.angle(x, y);
+            Fill.square(e.x + x, e.y + y, e.fout() * 3.2f, ang);
+        });
+
+        Drawf.light(e.x, e.y, 20f, e.color, 0.6f * e.fout());
     }),
 
     hitFuse = new Effect(14, e -> {
@@ -405,7 +825,17 @@ public class Fx{
         color(Pal.lightFlame, Pal.darkFlame, e.fin());
         stroke(0.5f + e.fout());
 
-        randLenVectors(e.id, 2, e.fin() * 15f, e.rotation, 50f, (x, y) -> {
+        randLenVectors(e.id, 2, 1f + e.fin() * 15f, e.rotation, 50f, (x, y) -> {
+            float ang = Mathf.angle(x, y);
+            lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f);
+        });
+    }),
+
+    hitFlamePlasma = new Effect(14, e -> {
+        color(Color.white, Pal.heal, e.fin());
+        stroke(0.5f + e.fout());
+
+        randLenVectors(e.id, 2, 1f + e.fin() * 15f, e.rotation, 50f, (x, y) -> {
             float ang = Mathf.angle(x, y);
             lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f);
         });
@@ -414,26 +844,64 @@ public class Fx{
     hitLiquid = new Effect(16, e -> {
         color(e.color);
 
-        randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 60f, (x, y) -> {
+        randLenVectors(e.id, 5, 1f + e.fin() * 15f, e.rotation, 60f, (x, y) -> {
             Fill.circle(e.x + x, e.y + y, e.fout() * 2f);
         });
     }),
 
+    hitLaserBlast = new Effect(12, e -> {
+        color(e.color);
+        stroke(e.fout() * 1.5f);
+
+        randLenVectors(e.id, 8, e.finpow() * 17f, (x, y) -> {
+            float ang = Mathf.angle(x, y);
+            lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f);
+        });
+    }),
+
+    hitEmpSpark = new Effect(40, e -> {
+        color(Pal.heal);
+        stroke(e.fout() * 1.6f);
+
+        randLenVectors(e.id, 18, e.finpow() * 27f, e.rotation, 360f, (x, y) -> {
+            float ang = Mathf.angle(x, y);
+            lineAngle(e.x + x, e.y + y, ang, e.fout() * 6 + 1f);
+        });
+    }),
+
     hitLancer = new Effect(12, e -> {
         color(Color.white);
         stroke(e.fout() * 1.5f);
 
-        randLenVectors(e.id, 8, e.finpow() * 17f, e.rotation, 360f, (x, y) -> {
+        randLenVectors(e.id, 8, e.finpow() * 17f, (x, y) -> {
             float ang = Mathf.angle(x, y);
             lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f);
         });
     }),
 
+    hitBeam = new Effect(12, e -> {
+        color(e.color);
+        stroke(e.fout() * 2f);
+
+        randLenVectors(e.id, 6, e.finpow() * 18f, (x, y) -> {
+            float ang = Mathf.angle(x, y);
+            lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f);
+        });
+    }),
+
+    hitFlameBeam = new Effect(19, e -> {
+        color(e.color);
+
+        randLenVectors(e.id, 7, e.finpow() * 11f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() * 2 + 0.5f);
+        });
+    }),
+
     hitMeltdown = new Effect(12, e -> {
         color(Pal.meltdownHit);
         stroke(e.fout() * 2f);
 
-        randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> {
+        randLenVectors(e.id, 6, e.finpow() * 18f, (x, y) -> {
             float ang = Mathf.angle(x, y);
             lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f);
         });
@@ -443,7 +911,7 @@ public class Fx{
         color(Pal.heal);
         stroke(e.fout() * 2f);
 
-        randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> {
+        randLenVectors(e.id, 6, e.finpow() * 18f, (x, y) -> {
             float ang = Mathf.angle(x, y);
             lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f);
         });
@@ -462,6 +930,8 @@ public class Fx{
         for(int i = 0; i < 4; i++){
             Drawf.tri(e.x, e.y, 3f, 30f * e.fout(), i*90 + 45);
         }
+
+        Drawf.light(e.x, e.y, 150f, Pal.bulletYellowBack, 0.9f * e.fout());
     }),
 
     instTrail = new Effect(30, e -> {
@@ -475,6 +945,8 @@ public class Fx{
             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);
         }
+
+        Drawf.light(e.x, e.y, 60f, Pal.bulletYellowBack, 0.6f * e.fout());
     }),
 
     instShoot = new Effect(24f, e -> {
@@ -490,6 +962,8 @@ public class Fx{
             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);
         }
+
+        Drawf.light(e.x, e.y, 180f, Pal.bulletYellowBack, 0.9f * e.fout());
     }),
 
     instHit = new Effect(20f, 200f, e -> {
@@ -526,12 +1000,16 @@ public class Fx{
         color(Color.white, Pal.heal, e.fin());
         stroke(0.5f + e.fout());
         Lines.circle(e.x, e.y, e.fin() * 5f);
+
+        Drawf.light(e.x, e.y, 23f, Pal.heal, e.fout() * 0.7f);
     }),
 
-    hitYellowLaser = new Effect(8, e -> {
-        color(Color.white, Pal.lightTrail, e.fin());
+    hitLaserColor = new Effect(8, e -> {
+        color(Color.white, e.color, e.fin());
         stroke(0.5f + e.fout());
         Lines.circle(e.x, e.y, e.fin() * 5f);
+
+        Drawf.light(e.x, e.y, 23f, e.color, e.fout() * 0.7f);
     }),
 
     despawn = new Effect(12, e -> {
@@ -545,6 +1023,12 @@ public class Fx{
 
     }),
 
+    airBubble = new Effect(100f, e -> {
+        randLenVectors(e.id, 1, e.fin() * 12f, (x, y) -> {
+            rect(renderer.bubbles[Math.min((int)(renderer.bubbles.length * Mathf.curveMargin(e.fin(), 0.11f, 0.06f)), renderer.bubbles.length - 1)], e.x + x, e.y + y);
+        });
+    }).layer(Layer.flyingUnitLow + 1),
+
     flakExplosion = new Effect(20, e -> {
         color(Pal.bulletYellow);
 
@@ -565,6 +1049,8 @@ public class Fx{
         randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> {
             lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f);
         });
+
+        Drawf.light(e.x, e.y, 50f, Pal.lighterOrange, 0.8f * e.fout());
     }),
 
     plasticExplosion = new Effect(24, e -> {
@@ -587,6 +1073,8 @@ public class Fx{
         randLenVectors(e.id + 1, 4, 1f + 25f * e.finpow(), (x, y) -> {
             lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f);
         });
+
+        Drawf.light(e.x, e.y, 50f, Pal.plastaniumBack, 0.8f * e.fout());
     }),
 
     plasticExplosionFlak = new Effect(28, e -> {
@@ -631,6 +1119,8 @@ public class Fx{
         randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> {
             lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f);
         });
+
+        Drawf.light(e.x, e.y, 45f, Pal.missileYellowBack, 0.8f * e.fout());
     }),
 
     sapExplosion = new Effect(25, e -> {
@@ -653,6 +1143,8 @@ public class Fx{
         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);
         });
+
+        Drawf.light(e.x, e.y, 90f, Pal.sapBulletBack, 0.8f * e.fout());
     }),
 
     massiveExplosion = new Effect(30, e -> {
@@ -675,6 +1167,8 @@ public class Fx{
         randLenVectors(e.id + 1, 6, 1f + 29f * e.finpow(), (x, y) -> {
             lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 4f);
         });
+
+        Drawf.light(e.x, e.y, 50f, Pal.missileYellowBack, 0.8f * e.fout());
     }),
 
     artilleryTrail = new Effect(50, e -> {
@@ -690,6 +1184,16 @@ public class Fx{
     missileTrail = new Effect(50, e -> {
         color(e.color);
         Fill.circle(e.x, e.y, e.rotation * e.fout());
+    }).layer(Layer.bullet - 0.001f), //below bullets
+
+    missileTrailShort = new Effect(22, e -> {
+        color(e.color);
+        Fill.circle(e.x, e.y, e.rotation * e.fout());
+    }).layer(Layer.bullet - 0.001f),
+
+    colorTrail = new Effect(50, e -> {
+        color(e.color);
+        Fill.circle(e.x, e.y, e.rotation * e.fout());
     }),
 
     absorb = new Effect(12, e -> {
@@ -698,6 +1202,19 @@ public class Fx{
         Lines.circle(e.x, e.y, 5f * e.fout());
     }),
 
+    forceShrink = new Effect(20, e -> {
+        color(e.color, e.fout());
+        if(renderer.animateShields){
+            Fill.poly(e.x, e.y, 6, e.rotation * e.fout());
+        }else{
+            stroke(1.5f);
+            Draw.alpha(0.09f);
+            Fill.poly(e.x, e.y, 6, e.rotation * e.fout());
+            Draw.alpha(1f);
+            Lines.poly(e.x, e.y, 6, e.rotation * e.fout());
+        }
+    }).layer(Layer.shields),
+
     flakExplosionBig = new Effect(30, e -> {
         color(Pal.bulletYellowBack);
 
@@ -718,6 +1235,8 @@ public class Fx{
         randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> {
             lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f);
         });
+
+        Drawf.light(e.x, e.y, 60f, Pal.bulletYellowBack, 0.7f * e.fout());
     }),
 
     burning = new Effect(35f, e -> {
@@ -728,6 +1247,13 @@ public class Fx{
         });
     }),
 
+    fireRemove = new Effect(70f, e -> {
+        if(Fire.regions[0] == null) return;
+        alpha(e.fout());
+        rect(Fire.regions[((int)(e.rotation + e.fin() * Fire.frames)) % Fire.frames], e.x + Mathf.randomSeedRange((int)e.y, 2), e.y + Mathf.randomSeedRange((int)e.x, 2));
+        Drawf.light(e.x, e.y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f  * e.fout());
+    }),
+
     fire = new Effect(50f, e -> {
         color(Pal.lightFlame, Pal.darkFlame, e.fin());
 
@@ -737,7 +1263,17 @@ public class Fx{
 
         color();
 
-        Drawf.light(Team.derelict, e.x, e.y, 20f * e.fslope(), Pal.lightFlame, 0.5f);
+        Drawf.light(e.x, e.y, 20f * e.fslope(), Pal.lightFlame, 0.5f);
+    }),
+
+    fireHit = new Effect(35f, e -> {
+        color(Pal.lightFlame, Pal.darkFlame, e.fin());
+
+        randLenVectors(e.id, 3, 2f + e.fin() * 10f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, 0.2f + e.fout() * 1.6f);
+        });
+
+        color();
     }),
 
     fireSmoke = new Effect(35f, e -> {
@@ -748,6 +1284,15 @@ public class Fx{
         });
     }),
 
+    //TODO needs a lot of work
+    neoplasmHeal = new Effect(120f, e -> {
+        color(Pal.neoplasm1, Pal.neoplasm2, e.fin());
+
+        randLenVectors(e.id, 1, e.fin() * 3f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 2f);
+        });
+    }).followParent(true).rotWithParent(true).layer(Layer.bullet - 2),
+
     steam = new Effect(35f, e -> {
         color(Color.lightGray);
 
@@ -756,6 +1301,62 @@ public class Fx{
         });
     }),
 
+    ventSteam = new Effect(140f, e -> {
+        color(e.color, Pal.vent2, e.fin());
+
+        alpha(e.fslope() * 0.78f);
+
+        float length = 3f + e.finpow() * 10f;
+        rand.setSeed(e.id);
+        for(int i = 0; i < rand.random(3, 5); i++){
+            v.trns(rand.random(360f), rand.random(length));
+            Fill.circle(e.x + v.x, e.y + v.y, rand.random(1.2f, 3.5f) + e.fslope() * 1.1f);
+        }
+    }).layer(Layer.darkness - 1),
+
+    drillSteam = new Effect(220f, e -> {
+
+        float length = 3f + e.finpow() * 20f;
+        rand.setSeed(e.id);
+        for(int i = 0; i < 13; i++){
+            v.trns(rand.random(360f), rand.random(length));
+            float sizer = rand.random(1.3f, 3.7f);
+
+            e.scaled(e.lifetime * rand.random(0.5f, 1f), b -> {
+                color(Color.gray, b.fslope() * 0.93f);
+
+                Fill.circle(e.x + v.x, e.y + v.y, sizer + b.fslope() * 1.2f);
+            });
+        }
+    }).startDelay(30f),
+
+    fluxVapor = new Effect(140f, e -> {
+        color(e.color);
+        alpha(e.fout() * 0.7f);
+
+        randLenVectors(e.id, 2, 3f + e.finpow() * 10f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, 0.6f + e.fin() * 5f);
+        });
+    }).layer(Layer.bullet - 1f),
+
+    vapor = new Effect(110f, e -> {
+        color(e.color);
+        alpha(e.fout());
+
+        randLenVectors(e.id, 3, 2f + e.finpow() * 11f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, 0.6f + e.fin() * 5f);
+        });
+    }),
+
+    vaporSmall = new Effect(50f, e -> {
+        color(e.color);
+        alpha(e.fout());
+
+        randLenVectors(e.id, 4, 2f + e.finpow() * 5f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, 1f + e.fin() * 4f);
+        });
+    }),
+
     fireballsmoke = new Effect(25f, e -> {
         color(Color.gray);
 
@@ -796,7 +1397,7 @@ public class Fx{
     }),
 
     muddy = new Effect(80f, e -> {
-        color(Color.valueOf("432722"));
+        color(Pal.muddy);
         alpha(Mathf.clamp(e.fin() * 2f));
 
         Fill.circle(e.x, e.y, e.fout());
@@ -810,6 +1411,14 @@ public class Fx{
         });
     }),
 
+    electrified = new Effect(40f, e -> {
+        color(Pal.heal);
+
+        randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> {
+            Fill.square(e.x + x, e.y + y, e.fslope() * 1.1f, 45f);
+        });
+    }),
+
     sporeSlowed = new Effect(40f, e -> {
         color(Pal.spore);
 
@@ -825,7 +1434,7 @@ public class Fx{
     }),
 
     overdriven = new Effect(20f, e -> {
-        color(Pal.accent);
+        color(e.color);
 
         randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> {
             Fill.square(e.x + x, e.y + y, e.fout() * 2.3f + 0.5f);
@@ -833,7 +1442,7 @@ public class Fx{
     }),
 
     overclocked = new Effect(50f, e -> {
-        color(Pal.accent);
+        color(e.color);
 
         Fill.square(e.x, e.y, e.fslope() * 2f, 45f);
     }),
@@ -842,7 +1451,9 @@ public class Fx{
         float length = 20f * e.finpow();
         float size = 7f * e.fout();
 
-        rect(((Item)e.data).icon(Cicon.medium), e.x + trnsx(e.rotation, length), e.y + trnsy(e.rotation, length), size, size);
+        if(!(e.data instanceof Item item)) return;
+
+        rect(item.fullIcon, e.x + trnsx(e.rotation, length), e.y + trnsy(e.rotation, length), size, size);
     }),
 
     shockwave = new Effect(10f, 80f, e -> {
@@ -857,24 +1468,18 @@ public class Fx{
         Lines.circle(e.x, e.y, e.fin() * 50f);
     }),
 
-    nuclearShockwave = new Effect(10f, 200f, e -> {
-        color(Color.white, Color.lightGray, e.fin());
-        stroke(e.fout() * 3f + 0.2f);
-        Lines.circle(e.x, e.y, e.fin() * 140f);
-    }),
-
-    impactShockwave = new Effect(13f, 300f, e -> {
-        color(Pal.lighterOrange, Color.lightGray, e.fin());
-        stroke(e.fout() * 4f + 0.2f);
-        Lines.circle(e.x, e.y, e.fin() * 200f);
-    }),
-
     spawnShockwave = new Effect(20f, 400f, e -> {
         color(Color.white, Color.lightGray, e.fin());
         stroke(e.fout() * 3f + 0.5f);
         Lines.circle(e.x, e.y, e.fin() * (e.rotation + 50f));
     }),
 
+    podLandShockwave = new Effect(12f, 80f, e -> {
+        color(Pal.accent);
+        stroke(e.fout() * 2f + 0.2f);
+        Lines.circle(e.x, e.y, e.fin() * 26f);
+    }),
+
     explosion = new Effect(30, e -> {
         e.scaled(7, i -> {
             stroke(3f * i.fout());
@@ -896,47 +1501,123 @@ public class Fx{
         });
     }),
 
-    dynamicExplosion = new Effect(30, e -> {
-        float intensity = e.rotation;
-
-        e.scaled(5 + intensity * 2, i -> {
-            stroke(3.1f * i.fout());
-            Lines.circle(e.x, e.y, (3f + i.fin() * 14f) * intensity);
-        });
+    dynamicExplosion = new Effect(30, 500f, b -> {
+        float intensity = b.rotation;
+        float baseLifetime = 26f + intensity * 15f;
+        b.lifetime = 43f + intensity * 35f;
 
         color(Color.gray);
+        //TODO awful borders with linear filtering here
+        alpha(0.9f);
+        for(int i = 0; i < 4; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.4f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(3f * intensity), 14f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    Fill.circle(e.x + x, e.y + y, fout * ((2f + intensity) * 1.8f));
+                });
+            });
+        }
 
-        randLenVectors(e.id, e.finpow(), (int)(6 * intensity), 21f * intensity, (x, y, in, out) -> {
-            Fill.circle(e.x + x, e.y + y, out * (2f + intensity) * 3 + 0.5f);
-            Fill.circle(e.x + x / 2f, e.y + y / 2f, out * (intensity) * 3);
-        });
+        b.scaled(baseLifetime, e -> {
+            e.scaled(5 + intensity * 2.5f, i -> {
+                stroke((3.1f + intensity/5f) * i.fout());
+                Lines.circle(e.x, e.y, (3f + i.fin() * 14f) * intensity);
+                Drawf.light(e.x, e.y, i.fin() * 14f * 2f * intensity, Color.white, 0.9f * e.fout());
+            });
 
-        color(Pal.lighterOrange, Pal.lightOrange, Color.gray, e.fin());
-        stroke((1.7f * e.fout()) * (1f + (intensity - 1f) / 2f));
+            color(Pal.lighterOrange, Pal.lightOrange, Color.gray, e.fin());
+            stroke((1.7f * e.fout()) * (1f + (intensity - 1f) / 2f));
 
-        randLenVectors(e.id + 1, e.finpow(), (int)(9 * intensity), 40f * intensity, (x, y, in, out) -> {
-            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + out * 4 * (3f + intensity));
+            Draw.z(Layer.effect + 0.001f);
+            randLenVectors(e.id + 1, e.finpow() + 0.001f, (int)(9 * intensity), 40f * intensity, (x, y, in, out) -> {
+                lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + out * 4 * (3f + intensity));
+                Drawf.light(e.x + x, e.y + y, (out * 4 * (3f + intensity)) * 3.5f, Draw.getColor(), 0.8f);
+            });
         });
     }),
 
-    blockExplosion = new Effect(30, e -> {
-        e.scaled(7, i -> {
-            stroke(3.1f * i.fout());
-            Lines.circle(e.x, e.y, 3f + i.fin() * 14f);
+    reactorExplosion = new Effect(30, 500f, b -> {
+        float intensity = 6.8f;
+        float baseLifetime = 25f + intensity * 11f;
+        b.lifetime = 50f + intensity * 65f;
+
+        color(Pal.reactorPurple2);
+        alpha(0.7f);
+        for(int i = 0; i < 4; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.4f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(2.9f * intensity), 22f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    float rad = fout * ((2f + intensity) * 2.35f);
+
+                    Fill.circle(e.x + x, e.y + y, rad);
+                    Drawf.light(e.x + x, e.y + y, rad * 2.5f, Pal.reactorPurple, 0.5f);
+                });
+            });
+        }
+
+        b.scaled(baseLifetime, e -> {
+            Draw.color();
+            e.scaled(5 + intensity * 2f, i -> {
+                stroke((3.1f + intensity/5f) * i.fout());
+                Lines.circle(e.x, e.y, (3f + i.fin() * 14f) * intensity);
+                Drawf.light(e.x, e.y, i.fin() * 14f * 2f * intensity, Color.white, 0.9f * e.fout());
+            });
+
+            color(Pal.lighterOrange, Pal.reactorPurple, e.fin());
+            stroke((2f * e.fout()));
+
+            Draw.z(Layer.effect + 0.001f);
+            randLenVectors(e.id + 1, e.finpow() + 0.001f, (int)(8 * intensity), 28f * intensity, (x, y, in, out) -> {
+                lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + out * 4 * (4f + intensity));
+                Drawf.light(e.x + x, e.y + y, (out * 4 * (3f + intensity)) * 3.5f, Draw.getColor(), 0.8f);
+            });
         });
+    }),
 
-        color(Color.gray);
+    impactReactorExplosion = new Effect(30, 500f, b -> {
+        float intensity = 8f;
+        float baseLifetime = 25f + intensity * 15f;
+        b.lifetime = 50f + intensity * 64f;
 
-        randLenVectors(e.id, 6, 2f + 19f * e.finpow(), (x, y) -> {
-            Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f);
-            Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout());
-        });
+        color(Pal.lighterOrange);
+        alpha(0.8f);
+        for(int i = 0; i < 5; i++){
+            rand.setSeed(b.id*2 + i);
+            float lenScl = rand.random(0.25f, 1f);
+            int fi = i;
+            b.scaled(b.lifetime * lenScl, e -> {
+                randLenVectors(e.id + fi - 1, e.fin(Interp.pow10Out), (int)(2.8f * intensity), 25f * intensity, (x, y, in, out) -> {
+                    float fout = e.fout(Interp.pow5Out) * rand.random(0.5f, 1f);
+                    float rad = fout * ((2f + intensity) * 2.35f);
 
-        color(Pal.lighterOrange, Pal.lightOrange, Color.gray, e.fin());
-        stroke(1.7f * e.fout());
+                    Fill.circle(e.x + x, e.y + y, rad);
+                    Drawf.light(e.x + x, e.y + y, rad * 2.6f, Pal.lighterOrange, 0.7f);
+                });
+            });
+        }
 
-        randLenVectors(e.id + 1, 9, 1f + 23f * e.finpow(), (x, y) -> {
-            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f);
+        b.scaled(baseLifetime, e -> {
+            Draw.color();
+            e.scaled(5 + intensity * 2f, i -> {
+                stroke((3.1f + intensity/5f) * i.fout());
+                Lines.circle(e.x, e.y, (3f + i.fin() * 14f) * intensity);
+                Drawf.light(e.x, e.y, i.fin() * 14f * 2f * intensity, Color.white, 0.9f * e.fout());
+            });
+
+            color(Color.white, Pal.lighterOrange, e.fin());
+            stroke((2f * e.fout()));
+
+            Draw.z(Layer.effect + 0.001f);
+            randLenVectors(e.id + 1, e.finpow() + 0.001f, (int)(8 * intensity), 30f * intensity, (x, y, in, out) -> {
+                lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + out * 4 * (4f + intensity));
+                Drawf.light(e.x + x, e.y + y, (out * 4 * (3f + intensity)) * 3.5f, Draw.getColor(), 0.8f);
+            });
         });
     }),
 
@@ -949,6 +1630,24 @@ public class Fx{
         });
     }),
 
+    steamCoolSmoke = new Effect(35f, e -> {
+        color(Pal.water, Color.lightGray, e.fin(Interp.pow2Out));
+        alpha(e.fout(Interp.pow3Out));
+
+        randLenVectors(e.id, 4, e.finpow() * 7f, e.rotation, 30f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, Math.max(e.fout(), Math.min(1f, e.fin() * 8f)) * 2.8f);
+        });
+    }),
+
+    smokePuff = new Effect(30, e -> {
+        color(e.color);
+
+        randLenVectors(e.id, 6, 4f + 30f * e.finpow(), (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() * 3f);
+            Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout());
+        });
+    }),
+
     shootSmall = new Effect(8, e -> {
         color(Pal.lighterOrange, Pal.lightOrange, e.fin());
         float w = 1f + 5 * e.fout();
@@ -956,6 +1655,13 @@ public class Fx{
         Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f);
     }),
 
+    shootSmallColor = new Effect(8, e -> {
+        color(e.color, Color.gray, e.fin());
+        float w = 1f + 5 * e.fout();
+        Drawf.tri(e.x, e.y, w, 15f * e.fout(), e.rotation);
+        Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f);
+    }),
+
     shootHeal = new Effect(8, e -> {
         color(Pal.heal);
         float w = 1f + 5 * e.fout();
@@ -992,6 +1698,20 @@ public class Fx{
         Drawf.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f);
     }),
 
+    shootBigColor = new Effect(11, e -> {
+        color(e.color, Color.gray, e.fin());
+        float w = 1.2f +9 * e.fout();
+        Drawf.tri(e.x, e.y, w, 32f * e.fout(), e.rotation);
+        Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f);
+    }),
+
+    shootTitan = new Effect(10, e -> {
+        color(Pal.lightOrange, e.color, e.fin());
+        float w = 1.3f + 10 * e.fout();
+        Drawf.tri(e.x, e.y, w, 35f * e.fout(), e.rotation);
+        Drawf.tri(e.x, e.y, w, 6f * e.fout(), e.rotation + 180f);
+    }),
+
     shootBigSmoke = new Effect(17f, e -> {
         color(Pal.lighterOrange, Color.lightGray, Color.gray, e.fin());
 
@@ -1008,6 +1728,224 @@ public class Fx{
         });
     }),
 
+    shootSmokeDisperse = new Effect(25f, e -> {
+        color(Pal.lightOrange, Color.white, Color.gray, e.fin());
+
+        randLenVectors(e.id, 9, e.finpow() * 29f, e.rotation, 18f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() * 2.2f + 0.1f);
+        });
+    }),
+
+    shootSmokeSquare = new Effect(20f, e -> {
+        color(Color.white, e.color, e.fin());
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 6; i++){
+            float rot = e.rotation + rand.range(22f);
+            v.trns(rot, rand.random(e.finpow() * 21f));
+            Fill.poly(e.x + v.x, e.y + v.y, 4, e.fout() * 2f + 0.2f, rand.random(360f));
+        }
+    }),
+
+    shootSmokeSquareSparse = new Effect(30f, e -> {
+        color(Color.white, e.color, e.fin());
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 2; i++){
+            float rot = e.rotation + rand.range(30f);
+            v.trns(rot, rand.random(e.finpow() * 27f));
+            Fill.poly(e.x + v.x, e.y + v.y, 4, e.fout() * 3.8f + 0.2f, rand.random(360f));
+        }
+    }),
+
+    shootSmokeSquareBig = new Effect(32f, e -> {
+        color(Color.white, e.color, e.fin());
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 13; i++){
+            float rot = e.rotation + rand.range(26f);
+            v.trns(rot, rand.random(e.finpow() * 30f));
+            Fill.poly(e.x + v.x, e.y + v.y, 4, e.fout() * 4f + 0.2f, rand.random(360f));
+        }
+    }),
+
+    shootSmokeTitan = new Effect(70f, e -> {
+        rand.setSeed(e.id);
+        for(int i = 0; i < 13; i++){
+            v.trns(e.rotation + rand.range(30f), rand.random(e.finpow() * 40f));
+            e.scaled(e.lifetime * rand.random(0.3f, 1f), b -> {
+                color(e.color, Pal.lightishGray, b.fin());
+                Fill.circle(e.x + v.x, e.y + v.y, b.fout() * 3.4f + 0.3f);
+            });
+        }
+    }),
+
+    shootSmokeSmite = new Effect(70f, e -> {
+        rand.setSeed(e.id);
+        for(int i = 0; i < 13; i++){
+            float a = e.rotation + rand.range(30f);
+            v.trns(a, rand.random(e.finpow() * 50f));
+            e.scaled(e.lifetime * rand.random(0.3f, 1f), b -> {
+                color(e.color);
+                Lines.stroke(b.fout() * 3f + 0.5f);
+                Lines.lineAngle(e.x + v.x, e.y + v.y, a, b.fout() * 8f + 0.4f);
+            });
+        }
+    }),
+
+    shootSmokeMissile = new Effect(130f, 300f, e -> {
+        color(Pal.redLight);
+        alpha(0.5f);
+        rand.setSeed(e.id);
+        for(int i = 0; i < 35; i++){
+            v.trns(e.rotation + 180f + rand.range(21f), rand.random(e.finpow() * 90f)).add(rand.range(3f), rand.range(3f));
+            e.scaled(e.lifetime * rand.random(0.2f, 1f), b -> {
+                Fill.circle(e.x + v.x, e.y + v.y, b.fout() * 9f + 0.3f);
+            });
+        }
+    }),
+
+    shootSmokeMissileColor = new Effect(130f, 300f, e -> {
+        color(e.color);
+        alpha(0.5f);
+        rand.setSeed(e.id);
+        for(int i = 0; i < 35; i++){
+            v.trns(e.rotation + 180f + rand.range(21f), rand.random(e.finpow() * 90f)).add(rand.range(3f), rand.range(3f));
+            e.scaled(e.lifetime * rand.random(0.2f, 1f), b -> {
+                Fill.circle(e.x + v.x, e.y + v.y, b.fout() * 9f + 0.3f);
+            });
+        }
+    }),
+
+    regenParticle = new Effect(100f, e -> {
+        color(Pal.regen);
+
+        Fill.square(e.x, e.y, e.fslope() * 1.5f + 0.14f, 45f);
+    }),
+
+    regenSuppressParticle = new Effect(35f, e -> {
+        color(e.color, Color.white, e.fin());
+        stroke(e.fout() * 1.4f + 0.5f);
+
+        randLenVectors(e.id, 4, 17f * e.fin(), (x, y) -> {
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 3f + 0.5f);
+        });
+    }),
+
+    regenSuppressSeek = new Effect(140f, e -> {
+        e.lifetime = Mathf.randomSeed(e.id, 120f, 200f);
+
+        if(!(e.data instanceof Position to)) return;
+
+        Tmp.v2.set(to).sub(e.x, e.y).nor().rotate90(1).scl(Mathf.randomSeedRange(e.id, 1f) * 50f);
+
+        Tmp.bz2.set(Tmp.v1.set(e.x, e.y), Tmp.v2.add(e.x, e.y), Tmp.v3.set(to));
+
+        Tmp.bz2.valueAt(Tmp.v4, e.fout());
+
+        color(e.color);
+        Fill.circle(Tmp.v4.x, Tmp.v4.y, e.fslope() * 2f + 0.1f);
+    }).followParent(false).rotWithParent(false),
+
+    surgeCruciSmoke = new Effect(160f, e -> {
+        color(Pal.slagOrange);
+        alpha(0.6f);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 3; i++){
+            float len = rand.random(6f), rot = rand.range(40f) + e.rotation;
+
+            e.scaled(e.lifetime * rand.random(0.3f, 1f), b -> {
+                v.trns(rot, len * b.finpow());
+                Fill.circle(e.x + v.x, e.y + v.y, 2f * b.fslope() + 0.2f);
+            });
+        }
+    }),
+
+    neoplasiaSmoke = new Effect(280f, e -> {
+        color(Pal.neoplasmMid);
+        alpha(0.6f);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 6; i++){
+            float len = rand.random(10f), rot = rand.range(120f) + e.rotation;
+
+            e.scaled(e.lifetime * rand.random(0.3f, 1f), b -> {
+                v.trns(rot, len * b.finpow());
+                Fill.circle(e.x + v.x, e.y + v.y, 3.3f * b.fslope() + 0.2f);
+            });
+        }
+    }),
+
+    heatReactorSmoke = new Effect(180f, e -> {
+        color(Color.gray);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 5; i++){
+            float len = rand.random(6f), rot = rand.range(50f) + e.rotation;
+
+            e.scaled(e.lifetime * rand.random(0.3f, 1f), b -> {
+                alpha(0.9f * b.fout());
+                v.trns(rot, len * b.finpow());
+                Fill.circle(e.x + v.x, e.y + v.y, 2.4f * b.fin() + 0.6f);
+            });
+        }
+    }),
+
+    circleColorSpark = new Effect(21f, e -> {
+        color(Color.white, e.color, e.fin());
+        stroke(e.fout() * 1.1f + 0.5f);
+
+        randLenVectors(e.id, 9, 27f * e.fin(), 9f, (x, y) -> {
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 5f + 0.5f);
+        });
+    }),
+
+    colorSpark = new Effect(21f, e -> {
+        color(Color.white, e.color, e.fin());
+        stroke(e.fout() * 1.1f + 0.5f);
+
+        randLenVectors(e.id, 5, 27f * e.fin(), e.rotation, 9f, (x, y) -> {
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 5f + 0.5f);
+        });
+    }),
+
+    colorSparkBig = new Effect(25f, e -> {
+        color(Color.white, e.color, e.fin());
+        stroke(e.fout() * 1.3f + 0.7f);
+
+        randLenVectors(e.id, 8, 41f * e.fin(), e.rotation, 10f, (x, y) -> {
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 6f + 0.5f);
+        });
+    }),
+
+    randLifeSpark = new Effect(24f, e -> {
+        color(Color.white, e.color, e.fin());
+        stroke(e.fout() * 1.5f + 0.5f);
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 15; i++){
+            float ang = e.rotation + rand.range(9f), len = rand.random(90f * e.finpow());
+            e.scaled(e.lifetime * rand.random(0.5f, 1f), p -> {
+                v.trns(ang, len);
+                lineAngle(e.x + v.x, e.y + v.y, ang, p.fout() * 7f + 0.5f);
+            });
+        }
+    }),
+
+    shootPayloadDriver = new Effect(30f, e -> {
+        color(Pal.accent);
+        Lines.stroke(0.5f + 0.5f*e.fout());
+        float spread = 9f;
+
+        rand.setSeed(e.id);
+        for(int i = 0; i < 20; i++){
+            float ang = e.rotation + rand.range(17f);
+            v.trns(ang, rand.random(e.fin() * 55f));
+            Lines.lineAngle(e.x + v.x + rand.range(spread), e.y + v.y + rand.range(spread), ang, e.fout() * 5f * rand.random(1f) + 1f);
+        }
+    }),
+
     shootSmallFlame = new Effect(32f, 80f, e -> {
         color(Pal.lightFlame, Pal.darkFlame, Color.gray, e.fin());
 
@@ -1024,10 +1962,10 @@ public class Fx{
         });
     }),
 
-    shootLiquid = new Effect(40f, 80f, e -> {
-        color(e.color, Color.white, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f));
+    shootLiquid = new Effect(15f, 80f, e -> {
+        color(e.color);
 
-        randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> {
+        randLenVectors(e.id, 2, e.finpow() * 15f, e.rotation, 11f, (x, y) -> {
             Fill.circle(e.x + x, e.y + y, 0.5f + e.fout() * 2.5f);
         });
     }),
@@ -1149,6 +2087,8 @@ public class Fx{
         for(int i : Mathf.signs){
             Drawf.tri(e.x, e.y, 10f * e.fout(), 24f, e.rotation + 90 + 90f * i);
         }
+
+        Drawf.light(e.x, e.y, 60f * e.fout(), Pal.orangeSpark, 0.5f);
     }),
 
     railHit = new Effect(18f, 200f, e -> {
@@ -1179,17 +2119,20 @@ public class Fx{
     lancerLaserCharge = new Effect(38f, e -> {
         color(Pal.lancerLaser);
 
-        randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> {
+        randLenVectors(e.id, 14, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> {
             lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 3f + 1f);
         });
     }),
 
     lancerLaserChargeBegin = new Effect(60f, e -> {
+        float margin = 1f - Mathf.curve(e.fin(), 0.9f);
+        float fin = Math.min(margin, e.fin());
+
         color(Pal.lancerLaser);
-        Fill.circle(e.x, e.y, e.fin() * 3f);
+        Fill.circle(e.x, e.y, fin * 3f);
 
         color();
-        Fill.circle(e.x, e.y, e.fin() * 2f);
+        Fill.circle(e.x, e.y, fin * 2f);
     }),
 
     lightningCharge = new Effect(38f, e -> {
@@ -1235,68 +2178,46 @@ public class Fx{
         });
     }),
 
-    nuclearsmoke = new Effect(40, e -> {
-        randLenVectors(e.id, 4, e.fin() * 13f, (x, y) -> {
-            float size = e.fslope() * 4f;
-            color(Color.lightGray, Color.gray, e.fin());
-            Fill.circle(e.x + x, e.y + y, size/2f);
-        });
-    }),
+    redgeneratespark = new Effect(90, e -> {
+        color(Pal.redSpark);
+        alpha(e.fslope());
 
-    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);
-        });
-    }),
+        rand.setSeed(e.id);
+        for(int i = 0; i < 2; i++){
+            v.trns(rand.random(360f), rand.random(e.finpow() * 9f)).add(e.x, e.y);
+            Fill.circle(v.x, v.y, rand.random(1.4f, 2.4f));
+        }
+    }).layer(Layer.bullet - 1f),
 
-    nuclearcloud = new Effect(90, 200f, e -> {
-        randLenVectors(e.id, 10, e.finpow() * 90f, (x, y) -> {
-            float size = e.fout() * 14f;
-            color(Color.lime, Color.gray, e.fin());
-            Fill.circle(e.x + x, e.y + y, size/2f);
-        });
-    }),
+    turbinegenerate = new Effect(100, e -> {
+        color(Pal.vent);
+        alpha(e.fslope() * 0.8f);
 
-    impactsmoke = new Effect(60, e -> {
-        randLenVectors(e.id, 7, e.fin() * 20f, (x, y) -> {
-            float size = e.fslope() * 4f;
-            color(Color.lightGray, Color.gray, e.fin());
-            Fill.circle(e.x + x, e.y + y, size/2f);
-        });
-    }),
-
-    impactcloud = new Effect(140, 400f, e -> {
-        randLenVectors(e.id, 20, e.finpow() * 160f, (x, y) -> {
-            float size = e.fout() * 15f;
-            color(Pal.lighterOrange, Color.lightGray, e.fin());
-            Fill.circle(e.x + x, e.y + y, size/2f);
-        });
-    }),
-
-    redgeneratespark = new Effect(18, e -> {
-        randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
-            float len = e.fout() * 4f;
-            color(Pal.redSpark, Color.gray, e.fin());
-            Fill.circle(e.x + x, e.y + y, len/2f);
-        });
-    }),
+        rand.setSeed(e.id);
+        for(int i = 0; i < 3; i++){
+            v.trns(rand.random(360f), rand.random(e.finpow() * 14f)).add(e.x, e.y);
+            Fill.circle(v.x, v.y, rand.random(1.4f, 3.4f));
+        }
+    }).layer(Layer.bullet - 1f),
 
     generatespark = new Effect(18, e -> {
         randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
-            float len = e.fout() * 4f;
             color(Pal.orangeSpark, Color.gray, e.fin());
-            Fill.circle(e.x + x, e.y + y, len/2f);
+            Fill.circle(e.x + x, e.y + y, e.fout() * 4f /2f);
         });
     }),
 
     fuelburn = new Effect(23, e -> {
         randLenVectors(e.id, 5, e.fin() * 9f, (x, y) -> {
-            float len = e.fout() * 4f;
             color(Color.lightGray, Color.gray, e.fin());
-            Fill.circle(e.x + x, e.y + y, len/2f);
+            Fill.circle(e.x + x, e.y + y, e.fout() * 2f);
+        });
+    }),
+
+    incinerateSlag = new Effect(34, e -> {
+        randLenVectors(e.id, 4, e.finpow() * 5f, (x, y) -> {
+            color(Pal.slagOrange, Color.gray, e.fin());
+            Fill.circle(e.x + x, e.y + y, e.fout() * 1.7f);
         });
     }),
 
@@ -1310,11 +2231,18 @@ public class Fx{
 
     plasticburn = new Effect(40, e -> {
         randLenVectors(e.id, 5, 3f + e.fin() * 5f, (x, y) -> {
-            color(Color.valueOf("e9ead3"), Color.gray, e.fin());
+            color(Pal.plasticBurn, Color.gray, e.fin());
             Fill.circle(e.x + x, e.y + y, e.fout());
         });
     }),
 
+    conveyorPoof = new Effect(35, e -> {
+        color(Pal.plasticBurn, Color.gray, e.fin());
+        randLenVectors(e.id, 4, 3f + e.fin() * 4f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() * 1.11f);
+        });
+    }),
+
     pulverize = new Effect(40, e -> {
         randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> {
             color(Pal.stoneGray);
@@ -1329,13 +2257,6 @@ public class Fx{
         });
     }),
 
-    pulverizeRedder = new Effect(40, e -> {
-        randLenVectors(e.id, 5, 3f + e.fin() * 9f, (x, y) -> {
-            color(Pal.redderDust, Pal.stoneGray, e.fin());
-            Fill.square(e.x + x, e.y + y, e.fout() * 2.5f + 0.5f, 45);
-        });
-    }),
-
     pulverizeSmall = new Effect(30, e -> {
         randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> {
             color(Pal.stoneGray);
@@ -1357,6 +2278,21 @@ public class Fx{
         });
     }),
 
+    artilleryTrailSmoke = new Effect(50, e -> {
+        color(e.color);
+        rand.setSeed(e.id);
+        for(int i = 0; i < 13; i++){
+            float fin = e.fin() / rand.random(0.5f, 1f), fout = 1f - fin, angle = rand.random(360f), len = rand.random(0.5f, 1f);
+
+            if(fin <= 1f){
+                Tmp.v1.trns(angle, fin * 24f * len);
+
+                alpha((0.5f - Math.abs(fin - 0.5f)) * 2f);
+                Fill.circle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, 0.5f + fout * 4f);
+            }
+        }
+    }),
+
     smokeCloud = new Effect(70, e -> {
         randLenVectors(e.id, e.fin(), 30, 30f, (x, y, fin, fout) -> {
             color(Color.gray);
@@ -1372,6 +2308,13 @@ public class Fx{
         });
     }),
 
+    coalSmeltsmoke = new Effect(40f, e -> {
+        randLenVectors(e.id, 0.2f + e.fin(), 4, 6.3f, (x, y, fin, out) -> {
+            color(Color.darkGray, Pal.coalBlack, e.finpowdown());
+            Fill.circle(e.x + x, e.y + y, out * 2f + 0.35f);
+        });
+    }),
+
     formsmoke = new Effect(40, e -> {
         randLenVectors(e.id, 6, 5f + e.fin() * 8f, (x, y) -> {
             color(Pal.plasticSmoke, Color.lightGray, e.fin());
@@ -1397,12 +2340,12 @@ public class Fx{
 
     dooropen = new Effect(10, e -> {
         stroke(e.fout() * 1.6f);
-        Lines.square(e.x, e.y, tilesize / 2f + e.fin() * 2f);
+        Lines.square(e.x, e.y, e.rotation * tilesize / 2f + e.fin() * 2f);
     }),
 
     doorclose = new Effect(10, e -> {
         stroke(e.fout() * 1.6f);
-        Lines.square(e.x, e.y, tilesize / 2f + e.fout() * 2f);
+        Lines.square(e.x, e.y, e.rotation * tilesize / 2f + e.fout() * 2f);
     }),
 
     dooropenlarge = new Effect(10, e -> {
@@ -1415,55 +2358,73 @@ public class Fx{
         Lines.square(e.x, e.y, tilesize + e.fout() * 2f);
     }),
 
-    purify = new Effect(10, e -> {
-        color(Color.royal, Color.gray, e.fin());
-        stroke(2f);
-        Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
-    }),
-
-    purifyoil = new Effect(10, e -> {
-        color(Color.black, Color.gray, e.fin());
-        stroke(2f);
-        Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
-    }),
-
-    purifystone = new Effect(10, e -> {
-        color(Color.orange, Color.gray, e.fin());
-        stroke(2f);
-        Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
-    }),
-
     generate = new Effect(11, e -> {
         color(Color.orange, Color.yellow, e.fin());
         stroke(1f);
         Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8);
     }),
 
+    mineWallSmall = new Effect(50, e -> {
+        color(e.color, Color.darkGray, e.fin());
+        randLenVectors(e.id, 2, e.fin() * 6f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() + 0.5f);
+        });
+    }),
+
+    mineSmall = new Effect(30, e -> {
+        color(e.color, Color.lightGray, e.fin());
+        randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> {
+            Fill.square(e.x + x, e.y + y, e.fout() + 0.5f, 45);
+        });
+    }),
+
     mine = new Effect(20, e -> {
+        color(e.color, Color.lightGray, e.fin());
         randLenVectors(e.id, 6, 3f + e.fin() * 6f, (x, y) -> {
-            color(e.color, Color.lightGray, e.fin());
             Fill.square(e.x + x, e.y + y, e.fout() * 2f, 45);
         });
     }),
 
     mineBig = new Effect(30, e -> {
+        color(e.color, Color.lightGray, e.fin());
         randLenVectors(e.id, 6, 4f + e.fin() * 8f, (x, y) -> {
-            color(e.color, Color.lightGray, e.fin());
             Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.2f, 45);
         });
     }),
 
     mineHuge = new Effect(40, e -> {
+        color(e.color, Color.lightGray, e.fin());
         randLenVectors(e.id, 8, 5f + e.fin() * 10f, (x, y) -> {
-            color(e.color, Color.lightGray, e.fin());
             Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45);
         });
     }),
 
-    smelt = new Effect(20, e -> {
-        randLenVectors(e.id, 6, 2f + e.fin() * 5f, (x, y) -> {
-            color(Color.white, e.color, e.fin());
-            Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45);
+    mineImpact = new Effect(90, e -> {
+        color(e.color, Color.lightGray, e.fin());
+        randLenVectors(e.id, 12, 5f + e.finpow() * 22f, (x, y) -> {
+            Fill.square(e.x + x, e.y + y, e.fout() * 2.5f + 0.5f, 45);
+        });
+    }),
+
+    mineImpactWave = new Effect(50f, e -> {
+        color(e.color);
+
+        stroke(e.fout() * 1.5f);
+
+        randLenVectors(e.id, 12, 4f + e.finpow() * e.rotation, (x, y) -> {
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fout() * 5 + 1f);
+        });
+
+        e.scaled(30f, b -> {
+            Lines.stroke(5f * b.fout());
+            Lines.circle(e.x, e.y, b.finpow() * 28f);
+        });
+    }),
+
+    payloadReceive = new Effect(30, e -> {
+        color(Color.white, Pal.accent, e.fin());
+        randLenVectors(e.id, 12, 7f + e.fin() * 13f, (x, y) -> {
+            Fill.square(e.x + x, e.y + y, e.fout() * 2.1f + 0.5f, 45);
         });
     }),
 
@@ -1513,11 +2474,17 @@ public class Fx{
     bubble = new Effect(20, e -> {
         color(Tmp.c1.set(e.color).shiftValue(0.1f));
         stroke(e.fout() + 0.2f);
-        randLenVectors(e.id, 2, 8f, (x, y) -> {
+        randLenVectors(e.id, 2, e.rotation * 0.9f, (x, y) -> {
             Lines.circle(e.x + x, e.y + y, 1f + e.fin() * 3f);
         });
     }),
 
+    launchAccelerator = new Effect(22, e -> {
+        color(Pal.accent);
+        stroke(e.fout() * 2f);
+        Lines.circle(e.x, e.y, 4f + e.finpow() * 160f);
+    }),
+
     launch = new Effect(28, e -> {
         color(Pal.command);
         stroke(e.fout() * 2f);
@@ -1559,8 +2526,22 @@ public class Fx{
     }),
 
     healBlockFull = new Effect(20, e -> {
-        color(e.color);
+        if(!(e.data instanceof Block block)) return;
+
+        mixcol(e.color, 1f);
         alpha(e.fout());
+        Draw.rect(block.fullIcon, e.x, e.y);
+    }),
+
+    rotateBlock = new Effect(30, e -> {
+        color(Pal.accent);
+        alpha(e.fout() * 1);
+        Fill.square(e.x, e.y, e.rotation * tilesize / 2f);
+    }),
+
+    lightBlock = new Effect(60, e -> {
+        color(e.color);
+        alpha(e.fout() * 1);
         Fill.square(e.x, e.y, e.rotation * tilesize / 2f);
     }),
 
@@ -1573,18 +2554,55 @@ public class Fx{
     shieldBreak = new Effect(40, e -> {
         color(e.color);
         stroke(3f * e.fout());
+        if(e.data instanceof ForceFieldAbility ab){
+            Lines.poly(e.x, e.y, ab.sides, e.rotation + e.fin(), ab.rotation);
+            return;
+        }
+
         Lines.poly(e.x, e.y, 6, e.rotation + e.fin());
-    }),
+    }).followParent(true),
+
+    arcShieldBreak = new Effect(40, e -> {
+        Lines.stroke(3 * e.fout(), e.color);
+        if(e.data instanceof Unit u){
+            ShieldArcAbility ab = (ShieldArcAbility) Structs.find(u.abilities, a -> a instanceof ShieldArcAbility);
+            if(ab != null){
+                Vec2 pos = Tmp.v1.set(ab.x, ab.y).rotate(u.rotation - 90f).add(u);
+                Lines.arc(pos.x, pos.y, ab.radius + ab.width/2, ab.angle / 360f, u.rotation + ab.angleOffset - ab.angle / 2f);
+                Lines.arc(pos.x, pos.y, ab.radius - ab.width/2, ab.angle / 360f, u.rotation + ab.angleOffset - ab.angle / 2f);
+                for(int i : Mathf.signs){
+                    float
+                            px = pos.x + Angles.trnsx(u.rotation + ab.angleOffset - ab.angle / 2f * i, ab.radius + ab.width / 2),
+                            py = pos.y + Angles.trnsy(u.rotation + ab.angleOffset - ab.angle / 2f * i, ab.radius + ab.width / 2),
+                            px1 = pos.x + Angles.trnsx(u.rotation + ab.angleOffset - ab.angle / 2f * i, ab.radius - ab.width / 2),
+                            py1 = pos.y + Angles.trnsy(u.rotation + ab.angleOffset - ab.angle / 2f * i, ab.radius - ab.width / 2);
+                    Lines.line(px, py, px1, py1);
+                }
+            }
+        }
+    }).followParent(true),
+
+    coreLandDust = new Effect(100f, e -> {
+        color(e.color, e.fout(0.1f));
+        rand.setSeed(e.id);
+        Tmp.v1.trns(e.rotation, e.finpow() * 90f * rand.random(0.2f, 1f));
+        Fill.circle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, 8f * rand.random(0.6f, 1f) * e.fout(0.2f));
+    }).layer(Layer.groundUnit + 1f),
+
+    podLandDust = new Effect(70f, e -> {
+        color(e.color, e.fout(0.1f));
+        rand.setSeed(e.id);
+        Tmp.v1.trns(e.rotation, e.finpow() * 35f * rand.random(0.2f, 1f));
+        Fill.circle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, 5f * rand.random(0.6f, 1f) * e.fout(0.2f));
+    }).layer(Layer.groundUnit + 1f),
 
     unitShieldBreak = new Effect(35, e -> {
-        if(!(e.data instanceof Unitc)) return;
-
-        Unit unit = e.data();
+        if(!(e.data instanceof Unit unit)) return;
 
         float radius = unit.hitSize() * 1.3f;
 
         e.scaled(16f, c -> {
-            color(Pal.shield);
+            color(e.color, 0.9f);
             stroke(c.fout() * 2f + 0.1f);
 
             randLenVectors(e.id, (int)(radius * 1.2f), radius/2f + c.finpow() * radius*1.25f, (x, y) -> {
@@ -1592,11 +2610,125 @@ public class Fx{
             });
         });
 
-        color(Pal.shield, e.fout());
+        color(e.color, e.fout() * 0.9f);
         stroke(e.fout());
         Lines.circle(e.x, e.y, radius);
     }),
 
-    coreLand = new Effect(120f, e -> {
+    chainLightning = new Effect(20f, 300f, e -> {
+        if(!(e.data instanceof Position p)) return;
+        float tx = p.getX(), ty = p.getY(), dst = Mathf.dst(e.x, e.y, tx, ty);
+        Tmp.v1.set(p).sub(e.x, e.y).nor();
+
+        float normx = Tmp.v1.x, normy = Tmp.v1.y;
+        float range = 6f;
+        int links = Mathf.ceil(dst / range);
+        float spacing = dst / links;
+
+        Lines.stroke(2.5f * e.fout());
+        Draw.color(Color.white, e.color, e.fin());
+
+        Lines.beginLine();
+
+        Lines.linePoint(e.x, e.y);
+
+        rand.setSeed(e.id);
+
+        for(int i = 0; i < links; i++){
+            float nx, ny;
+            if(i == links - 1){
+                nx = tx;
+                ny = ty;
+            }else{
+                float len = (i + 1) * spacing;
+                Tmp.v1.setToRandomDirection(rand).scl(range/2f);
+                nx = e.x + normx * len + Tmp.v1.x;
+                ny = e.y + normy * len + Tmp.v1.y;
+            }
+
+            Lines.linePoint(nx, ny);
+        }
+
+        Lines.endLine();
+    }).followParent(false).rotWithParent(false),
+
+    chainEmp = new Effect(30f, 300f, e -> {
+        if(!(e.data instanceof Position p)) return;
+        float tx = p.getX(), ty = p.getY(), dst = Mathf.dst(e.x, e.y, tx, ty);
+        Tmp.v1.set(p).sub(e.x, e.y).nor();
+
+        float normx = Tmp.v1.x, normy = Tmp.v1.y;
+        float range = 6f;
+        int links = Mathf.ceil(dst / range);
+        float spacing = dst / links;
+
+        Lines.stroke(4f * e.fout());
+        Draw.color(Color.white, e.color, e.fin());
+
+        Lines.beginLine();
+
+        Lines.linePoint(e.x, e.y);
+
+        rand.setSeed(e.id);
+
+        for(int i = 0; i < links; i++){
+            float nx, ny;
+            if(i == links - 1){
+                nx = tx;
+                ny = ty;
+            }else{
+                float len = (i + 1) * spacing;
+                Tmp.v1.setToRandomDirection(rand).scl(range/2f);
+                nx = e.x + normx * len + Tmp.v1.x;
+                ny = e.y + normy * len + Tmp.v1.y;
+            }
+
+            Lines.linePoint(nx, ny);
+        }
+
+        Lines.endLine();
+    }).followParent(false).rotWithParent(false),
+
+    legDestroy = new Effect(90f, 100f, e -> {
+        if(!(e.data instanceof LegDestroyData data)) return;
+        rand.setSeed(e.id);
+
+        e.lifetime = rand.random(70f, 130f);
+
+        Tmp.v1.trns(rand.random(360f), rand.random(data.region.width / 8f) * e.finpow());
+        float ox = Tmp.v1.x, oy = Tmp.v1.y;
+
+        alpha(e.foutpowdown());
+
+        stroke(data.region.height * scl);
+        line(data.region, data.a.x + ox, data.a.y + oy, data.b.x + ox, data.b.y + oy, false);
+    }).layer(Layer.groundUnit + 5f),
+
+    debugLine = new Effect(90f, 1000000000000f, e -> {
+       if(!(e.data instanceof Vec2[] vec)) return;
+
+       Draw.color(e.color);
+       Lines.stroke(2f);
+
+       if(vec.length == 2){
+           Lines.line(vec[0].x, vec[0].y, vec[1].x, vec[1].y);
+       }else{
+           Lines.beginLine();
+           for(Vec2 v : vec)
+               Lines.linePoint(v.x, v.y);
+           Lines.endLine();
+       }
+
+       Draw.reset();
+    }),
+    debugRect = new Effect(90f, 1000000000000f, e -> {
+        if(!(e.data instanceof Rect rect)) return;
+
+        Draw.color(e.color);
+        Lines.stroke(2f);
+
+        Lines.rect(rect);
+
+        Draw.reset();
     });
 }
diff --git a/core/src/mindustry/content/Items.java b/core/src/mindustry/content/Items.java
index 65c464a249..00cc3cc5d5 100644
--- a/core/src/mindustry/content/Items.java
+++ b/core/src/mindustry/content/Items.java
@@ -1,15 +1,18 @@
 package mindustry.content;
 
 import arc.graphics.*;
-import mindustry.ctype.*;
+import arc.struct.*;
 import mindustry.type.*;
 
-public class Items implements ContentList{
-    public static Item scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, phaseFabric, surgeAlloy,
-    sporePod, sand, blastCompound, pyratite, metaglass;
+public class Items{
+    public static Item
+    scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium,
+    phaseFabric, surgeAlloy, sporePod, sand, blastCompound, pyratite, metaglass,
+    beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst;
 
-    @Override
-    public void load(){
+    public static final Seq<Item> serpuloItems = new Seq<>(), erekirItems = new Seq<>(), erekirOnlyItems = new Seq<>();
+
+    public static void load(){
         copper = new Item("copper", Color.valueOf("d99d73")){{
             hardness = 1;
             cost = 0.5f;
@@ -19,7 +22,6 @@ public class Items implements ContentList{
         lead = new Item("lead", Color.valueOf("8c7fa9")){{
             hardness = 1;
             cost = 0.7f;
-            alwaysUnlocked = true;
         }};
 
         metaglass = new Item("metaglass", Color.valueOf("ebeef5")){{
@@ -31,14 +33,17 @@ public class Items implements ContentList{
         }};
 
         sand = new Item("sand", Color.valueOf("f7cba4")){{
-            alwaysUnlocked = true;
             lowPriority = true;
+            buildable = false;
+            //needed to show up as requirement
+            alwaysUnlocked = true;
         }};
 
         coal = new Item("coal", Color.valueOf("272727")){{
             explosiveness = 0.2f;
             flammability = 1f;
             hardness = 2;
+            buildable = false;
         }};
 
         titanium = new Item("titanium", Color.valueOf("8da1e3")){{
@@ -51,10 +56,11 @@ public class Items implements ContentList{
             hardness = 4;
             radioactivity = 1f;
             cost = 1.1f;
+            healthScaling = 0.2f;
         }};
 
         scrap = new Item("scrap", Color.valueOf("777777")){{
-
+            cost = 0.5f;
         }};
 
         silicon = new Item("silicon", Color.valueOf("53565c")){{
@@ -65,29 +71,81 @@ public class Items implements ContentList{
             flammability = 0.1f;
             explosiveness = 0.2f;
             cost = 1.3f;
+            healthScaling = 0.1f;
         }};
 
         phaseFabric = new Item("phase-fabric", Color.valueOf("f4ba6e")){{
             cost = 1.3f;
             radioactivity = 0.6f;
+            healthScaling = 0.25f;
         }};
 
         surgeAlloy = new Item("surge-alloy", Color.valueOf("f3e979")){{
             cost = 1.2f;
+            charge = 0.75f;
+            healthScaling = 0.25f;
         }};
 
         sporePod = new Item("spore-pod", Color.valueOf("7457ce")){{
             flammability = 1.15f;
+            buildable = false;
         }};
 
         blastCompound = new Item("blast-compound", Color.valueOf("ff795e")){{
             flammability = 0.4f;
             explosiveness = 1.2f;
+            buildable = false;
         }};
 
         pyratite = new Item("pyratite", Color.valueOf("ffaa5f")){{
             flammability = 1.4f;
             explosiveness = 0.4f;
+            buildable = false;
         }};
+
+        beryllium = new Item("beryllium", Color.valueOf("3a8f64")){{
+            hardness = 3;
+            cost = 1.2f;
+            healthScaling = 0.6f;
+        }};
+
+        tungsten = new Item("tungsten", Color.valueOf("768a9a")){{
+            hardness = 5;
+            cost = 1.5f;
+            healthScaling = 0.8f;
+        }};
+
+        oxide = new Item("oxide", Color.valueOf("e4ffd6")){{
+            cost = 1.2f;
+            healthScaling = 0.5f;
+        }};
+
+        carbide = new Item("carbide", Color.valueOf("89769a")){{
+            cost = 1.4f;
+            healthScaling = 1.1f;
+        }};
+
+        fissileMatter = new Item("fissile-matter", Color.valueOf("5e988d")){{
+            radioactivity = 1.5f;
+            hidden = true;
+        }};
+
+        dormantCyst = new Item("dormant-cyst", Color.valueOf("df824d")){{
+            flammability = 0.1f;
+            hidden = true;
+        }};
+
+        serpuloItems.addAll(
+        scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium,
+        phaseFabric, surgeAlloy, sporePod, sand, blastCompound, pyratite, metaglass
+        );
+
+        erekirItems.addAll(
+        graphite, thorium, silicon, phaseFabric, surgeAlloy, sand,
+        beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst
+        );
+
+        erekirOnlyItems.addAll(erekirItems).removeAll(serpuloItems);
+
     }
 }
diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java
index 7ff39522f1..432b4463cc 100644
--- a/core/src/mindustry/content/Liquids.java
+++ b/core/src/mindustry/content/Liquids.java
@@ -1,19 +1,21 @@
 package mindustry.content;
 
 import arc.graphics.*;
-import mindustry.ctype.*;
 import mindustry.type.*;
 
-public class Liquids implements ContentList{
-    public static Liquid water, slag, oil, cryofluid;
+public class Liquids{
+    public static Liquid water, slag, oil, cryofluid,
+    arkycite, gallium, neoplasm,
+    ozone, hydrogen, nitrogen, cyanogen;
 
-    @Override
-    public void load(){
+    public static void load(){
 
         water = new Liquid("water", Color.valueOf("596ab8")){{
             heatCapacity = 0.4f;
-            alwaysUnlocked = true;
             effect = StatusEffects.wet;
+            boilPoint = 0.5f;
+            gasColor = Color.grays(0.9f);
+            alwaysUnlocked = true;
         }};
 
         slag = new Liquid("slag", Color.valueOf("ffa166")){{
@@ -24,12 +26,15 @@ public class Liquids implements ContentList{
         }};
 
         oil = new Liquid("oil", Color.valueOf("313131")){{
-            viscosity = 0.7f;
+            viscosity = 0.75f;
             flammability = 1.2f;
             explosiveness = 1.2f;
             heatCapacity = 0.7f;
             barColor = Color.valueOf("6b675f");
             effect = StatusEffects.tarred;
+            boilPoint = 0.65f;
+            gasColor = Color.grays(0.4f);
+            canStayOn.add(water);
         }};
 
         cryofluid = new Liquid("cryofluid", Color.valueOf("6ecdec")){{
@@ -37,6 +42,56 @@ public class Liquids implements ContentList{
             temperature = 0.25f;
             effect = StatusEffects.freezing;
             lightColor = Color.valueOf("0097f5").a(0.2f);
+            boilPoint = 0.55f;
+            gasColor = Color.valueOf("c1e8f5");
+        }};
+
+        neoplasm = new CellLiquid("neoplasm", Color.valueOf("c33e2b")){{
+            heatCapacity = 0.4f;
+            temperature = 0.54f;
+            viscosity = 0.85f;
+            flammability = 0f;
+            capPuddles = false;
+            spreadTarget = Liquids.water;
+            moveThroughBlocks = true;
+            incinerable = false;
+            blockReactive = false;
+            canStayOn.addAll(water, oil, cryofluid);
+
+            colorFrom = Color.valueOf("e8803f");
+            colorTo = Color.valueOf("8c1225");
+        }};
+
+        arkycite = new Liquid("arkycite", Color.valueOf("84a94b")){{
+            flammability = 0.4f;
+            viscosity = 0.7f;
+            neoplasm.canStayOn.add(this);
+        }};
+
+        gallium = new Liquid("gallium", Color.valueOf("9a9dbf")){{
+            coolant = false;
+            hidden = true;
+        }};
+
+        ozone = new Liquid("ozone", Color.valueOf("fc81dd")){{
+            gas = true;
+            barColor = Color.valueOf("d699f0");
+            explosiveness = 1f;
+            flammability = 1f;
+        }};
+
+        hydrogen = new Liquid("hydrogen", Color.valueOf("9eabf7")){{
+            gas = true;
+            flammability = 1f;
+        }};
+
+        nitrogen = new Liquid("nitrogen", Color.valueOf("efe3ff")){{
+            gas = true;
+        }};
+
+        cyanogen = new Liquid("cyanogen", Color.valueOf("89e8b6")){{
+            gas = true;
+            flammability = 2f;
         }};
     }
 }
diff --git a/core/src/mindustry/content/Loadouts.java b/core/src/mindustry/content/Loadouts.java
index 2a7c4435db..7724c89b6f 100644
--- a/core/src/mindustry/content/Loadouts.java
+++ b/core/src/mindustry/content/Loadouts.java
@@ -1,18 +1,18 @@
 package mindustry.content;
 
-import mindustry.ctype.*;
 import mindustry.game.*;
 
-public class Loadouts implements ContentList{
+public class Loadouts{
     public static Schematic
     basicShard,
     basicFoundation,
-    basicNucleus;
+    basicNucleus,
+    basicBastion;
 
-    @Override
-    public void load(){
-        basicShard = Schematics.readBase64("bXNjaAB4nD2K2wqAIBiD5ymibnoRn6YnEP1BwUMoBL19FuJ2sbFvUFgYZDaJsLeQrkinN9UJHImsNzlYE7WrIUastuSbnlKx2VJJt+8IQGGKdfO/8J5yrGJSMegLg+YUIA==");
-        basicFoundation = Schematics.readBase64("bXNjaAB4nD1OSQ6DMBBzFhVu8BG+0X8MQyoiJTNSukj8nlCi2Adbtg/GA4OBF8oB00rvyE/9ykafqOIw58A7SWRKy1ZiShhZ5RcOLZhYS1hefQ1gRIeptH9jq/qW2lvc1d2tgWsOfVX/tOwE86AYBA==");
-        basicNucleus = Schematics.readBase64("bXNjaAB4nD2MUQqAIBBEJy0s6qOLdJXuYNtCgikYBd2+LNmdj308hkGHtkId7M4YFns4mk/yfB4a48602eDI+mlNznu0FMPFd0wYKCaewl8F0EOueqM+yKSLVfJrNKWnSw/FZGzEGXFG9sy/px4gEBW1");
+    public static void load(){
+        basicShard = Schematics.readBase64("bXNjaAF4nGNgZmBmZmDJS8xNZZDJKCkpKLbS16/MLy0p1UtK1XcNi/Q3cKwwyqkyYOBOSS1OLsosKMnMz2NgYGDLSUxKzSlmYIqOZWTgSs4vStUtzkgsSgFKMYIQkAAAhSEXTA==");
+        basicFoundation = Schematics.readBase64("bXNjaAF4nGNgYWBhZmDJS8xNZWBNSk3MK2bgTkktTi7KLCjJzM9jYGBgy0lMSs0pZmCKjmVk4E/OL0rVTcsvzUtJhMozghCQAACx6RHB");
+        basicNucleus = Schematics.readBase64("bXNjaAF4nA3CwQ2AIBAEwAXFjxRBA1ZkfCDcgwh3BiTG7iUzMDATZvaFYGOK7pPuLpYXa6QWarqfJAxVsGR/Um7Q+6Fgg1TauIdMvQFQgB7wAza8E4M=");
+        basicBastion = Schematics.readBase64("bXNjaAF4nGNgYWBhZmDJS8xNZWBNzMsEUtwpqcXJRZkFJZn5eQyClfmlCin5Cnn5JQqpFZnFJVwMbDmJSak5xQxM0bGMDDzJ+UWpukmJxWDVDAyMIAQkACMdFqE=");
     }
 }
diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java
index 9450c441da..def60e56d6 100644
--- a/core/src/mindustry/content/Planets.java
+++ b/core/src/mindustry/content/Planets.java
@@ -1,25 +1,35 @@
 package mindustry.content;
 
+import arc.func.*;
 import arc.graphics.*;
-import mindustry.ctype.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.game.*;
+import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
+import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.maps.planet.*;
 import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
 
-public class Planets implements ContentList{
+public class Planets{
     public static Planet
     sun,
-    //tantros,
-    serpulo;
+    erekir,
+    tantros,
+    serpulo,
+    gier,
+    notva,
+    verilus;
 
-    @Override
-    public void load(){
-        sun = new Planet("sun", null, 0, 2){{
+    public static void load(){
+        sun = new Planet("sun", null, 4f){{
             bloom = true;
             accessible = false;
 
-            //lightColor = Color.valueOf("f4ee8e");
-
             meshLoader = () -> new SunMesh(
                 this, 4,
                 5, 0.3, 1.7, 1.2, 1,
@@ -33,22 +43,167 @@ public class Planets implements ContentList{
             );
         }};
 
-        /*tantros = new Planet("tantros", sun, 2, 0.8f){{
+        erekir = new Planet("erekir", sun, 1f, 2){{
+            generator = new ErekirPlanetGenerator();
+            meshLoader = () -> new HexMesh(this, 5);
+            cloudMeshLoader = () -> new MultiMesh(
+                new HexSkyMesh(this, 2, 0.15f, 0.14f, 5, Color.valueOf("eba768").a(0.75f), 2, 0.42f, 1f, 0.43f),
+                new HexSkyMesh(this, 3, 0.6f, 0.15f, 5, Color.valueOf("eea293").a(0.75f), 2, 0.42f, 1.2f, 0.45f)
+            );
+            alwaysUnlocked = true;
+            landCloudColor = Color.valueOf("ed6542");
+            atmosphereColor = Color.valueOf("f07218");
+            defaultEnv = Env.scorching | Env.terrestrial;
+            startSector = 10;
+            atmosphereRadIn = 0.02f;
+            atmosphereRadOut = 0.3f;
+            tidalLock = true;
+            orbitSpacing = 2f;
+            totalRadius += 2.6f;
+            lightSrcTo = 0.5f;
+            lightDstFrom = 0.2f;
+            clearSectorOnLose = true;
+            defaultCore = Blocks.coreBastion;
+            iconColor = Color.valueOf("ff9266");
+            enemyBuildSpeedMultiplier = 0.4f;
+
+            //TODO disallowed for now
+            allowLaunchToNumbered = false;
+
+            //TODO SHOULD there be lighting?
+            updateLighting = false;
+
+            defaultAttributes.set(Attribute.heat, 0.8f);
+
+            ruleSetter = r -> {
+                r.waveTeam = Team.malis;
+                r.placeRangeCheck = false;
+                r.showSpawns = true;
+                r.fog = true;
+                r.staticFog = true;
+                r.lighting = false;
+                r.coreDestroyClear = true;
+                r.onlyDepositCore = true;
+            };
+            campaignRuleDefaults.fog = true;
+            campaignRuleDefaults.showSpawns = true;
+
+            unlockedOnLand.add(Blocks.coreBastion);
+        }};
+
+        //TODO names
+        gier = makeAsteroid("gier", erekir, Blocks.ferricStoneWall, Blocks.carbonWall, -5, 0.4f, 7, 1f, gen -> {
+            gen.min = 25;
+            gen.max = 35;
+            gen.carbonChance = 0.6f;
+            gen.iceChance = 0f;
+            gen.berylChance = 0.1f;
+        });
+
+        notva = makeAsteroid("notva", sun, Blocks.ferricStoneWall, Blocks.beryllicStoneWall, -4, 0.55f, 9, 1.3f, gen -> {
+            gen.berylChance = 0.8f;
+            gen.iceChance = 0f;
+            gen.carbonChance = 0.01f;
+            gen.max += 2;
+        });
+
+        tantros = new Planet("tantros", sun, 1f, 2){{
             generator = new TantrosPlanetGenerator();
             meshLoader = () -> new HexMesh(this, 4);
+            accessible = false;
+            visible = false;
             atmosphereColor = Color.valueOf("3db899");
+            iconColor = Color.valueOf("597be3");
             startSector = 10;
             atmosphereRadIn = -0.01f;
             atmosphereRadOut = 0.3f;
-        }};*/
+            defaultEnv = Env.underwater | Env.terrestrial;
+            ruleSetter = r -> {
 
-        serpulo = new Planet("serpulo", sun, 3, 1){{
+            };
+        }};
+
+        serpulo = new Planet("serpulo", sun, 1f, 3){{
             generator = new SerpuloPlanetGenerator();
             meshLoader = () -> new HexMesh(this, 6);
+            cloudMeshLoader = () -> new MultiMesh(
+                new HexSkyMesh(this, 11, 0.15f, 0.13f, 5, new Color().set(Pal.spore).mul(0.9f).a(0.75f), 2, 0.45f, 0.9f, 0.38f),
+                new HexSkyMesh(this, 1, 0.6f, 0.16f, 5, Color.white.cpy().lerp(Pal.spore, 0.55f).a(0.75f), 2, 0.45f, 1f, 0.41f)
+            );
+
+            launchCapacityMultiplier = 0.5f;
+            sectorSeed = 2;
+            allowWaves = true;
+            allowLegacyLaunchPads = true;
+            allowWaveSimulation = true;
+            allowSectorInvasion = true;
+            allowLaunchSchematics = true;
+            enemyCoreSpawnReplace = true;
+            allowLaunchLoadout = true;
+            //doesn't play well with configs
+            prebuildBase = false;
+            ruleSetter = r -> {
+                r.waveTeam = Team.crux;
+                r.placeRangeCheck = false;
+                r.showSpawns = false;
+                r.coreDestroyClear = true;
+            };
+            iconColor = Color.valueOf("7d4dff");
             atmosphereColor = Color.valueOf("3c1b8f");
             atmosphereRadIn = 0.02f;
             atmosphereRadOut = 0.3f;
             startSector = 15;
+            alwaysUnlocked = true;
+            allowSelfSectorLaunch = true;
+            landCloudColor = Pal.spore.cpy().a(0.5f);
+        }};
+
+        verilus = makeAsteroid("verlius", sun, Blocks.stoneWall, Blocks.iceWall, -1, 0.5f, 12, 2f, gen -> {
+            gen.berylChance = 0f;
+            gen.iceChance = 0.6f;
+            gen.carbonChance = 0.1f;
+            gen.ferricChance = 0f;
+        });
+    }
+
+    private static Planet makeAsteroid(String name, Planet parent, Block base, Block tint, int seed, float tintThresh, int pieces, float scale, Cons<AsteroidGenerator> cgen){
+        return new Planet(name, parent, 0.12f){{
+            hasAtmosphere = false;
+            updateLighting = false;
+            sectors.add(new Sector(this, Ptile.empty));
+            camRadius = 0.68f * scale;
+            minZoom = 0.6f;
+            drawOrbit = false;
+            accessible = false;
+            clipRadius = 2f;
+            defaultEnv = Env.space;
+            icon = "commandRally";
+            generator = new AsteroidGenerator();
+            cgen.get((AsteroidGenerator)generator);
+
+            meshLoader = () -> {
+                iconColor = tint.mapColor;
+                Color tinted = tint.mapColor.cpy().a(1f - tint.mapColor.a);
+                Seq<GenericMesh> meshes = new Seq<>();
+                Color color = base.mapColor;
+                Rand rand = new Rand(id + 2);
+
+                meshes.add(new NoiseMesh(
+                    this, seed, 2, radius, 2, 0.55f, 0.45f, 14f,
+                    color, tinted, 3, 0.6f, 0.38f, tintThresh
+                ));
+
+                for(int j = 0; j < pieces; j++){
+                    meshes.add(new MatMesh(
+                        new NoiseMesh(this, seed + j + 1, 1, 0.022f + rand.random(0.039f) * scale, 2, 0.6f, 0.38f, 20f,
+                        color, tinted, 3, 0.6f, 0.38f, tintThresh),
+                        new Mat3D().setToTranslation(Tmp.v31.setToRandomDirection(rand).setLength(rand.random(0.44f, 1.4f) * scale)))
+                    );
+                }
+
+                return new MultiMesh(meshes.toArray(GenericMesh.class));
+            };
         }};
     }
+
 }
diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index e84547dd5f..af9a2bc53e 100644
--- a/core/src/mindustry/content/SectorPresets.java
+++ b/core/src/mindustry/content/SectorPresets.java
@@ -1,30 +1,42 @@
 package mindustry.content;
 
-import mindustry.ctype.*;
 import mindustry.type.*;
 
 import static mindustry.content.Planets.*;
 
-public class SectorPresets implements ContentList{
+public class SectorPresets{
     public static SectorPreset
     groundZero,
-    craters, biomassFacility, frozenForest, ruinousShores, windsweptIslands, stainedMountains, tarFields,
-    fungalPass, extractionOutpost, saltFlats, overgrowth,
-    impact0078, desolateRift, nuclearComplex, planetaryTerminal;
+    craters, biomassFacility, taintedWoods, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields,
+    frontier, fungalPass, infestedCanyons, atolls, mycelialBastion, extractionOutpost, saltFlats, testingGrounds, overgrowth, //polarAerodrome,
+    impact0078, desolateRift, nuclearComplex, planetaryTerminal,
+    coastline, navalFortress, weatheredChannels, seaPort,
 
-    @Override
-    public void load(){
+    geothermalStronghold, cruxscape,
+
+    onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera,
+    stronghold, crevice, siege, crossroads, karst, origin;
+
+    public static void load(){
+        //region serpulo
 
         groundZero = new SectorPreset("groundZero", serpulo, 15){{
             alwaysUnlocked = true;
             addStartingItems = true;
             captureWave = 10;
             difficulty = 1;
+            overrideLaunchDefaults = true;
+            noLighting = true;
+            startWaveTimeMultiplier = 3f;
         }};
 
         saltFlats = new SectorPreset("saltFlats", serpulo, 101){{
             difficulty = 5;
-            useAI = false;
+        }};
+
+        testingGrounds = new SectorPreset("testingGrounds", serpulo, 3){{
+            difficulty = 7;
+            captureWave = 33;
         }};
 
         frozenForest = new SectorPreset("frozenForest", serpulo, 86){{
@@ -37,6 +49,11 @@ public class SectorPresets implements ContentList{
             difficulty = 3;
         }};
 
+        taintedWoods = new SectorPreset("taintedWoods", serpulo, 221){{
+            captureWave = 33;
+            difficulty = 5;
+        }};
+
         craters = new SectorPreset("craters", serpulo, 18){{
             captureWave = 20;
             difficulty = 2;
@@ -47,6 +64,15 @@ public class SectorPresets implements ContentList{
             difficulty = 3;
         }};
 
+        seaPort = new SectorPreset("seaPort", serpulo, 47){{
+            difficulty = 4;
+        }};
+
+        facility32m = new SectorPreset("facility32m", serpulo, 64){{
+            captureWave = 25;
+            difficulty = 4;
+        }};
+
         windsweptIslands = new SectorPreset("windsweptIslands", serpulo, 246){{
             captureWave = 30;
             difficulty = 4;
@@ -59,17 +85,49 @@ public class SectorPresets implements ContentList{
 
         extractionOutpost = new SectorPreset("extractionOutpost", serpulo, 165){{
             difficulty = 5;
-            useAI = false;
+        }};
+
+        //TODO: removed for now
+        //polarAerodrome = new SectorPreset("polarAerodrome", serpulo, 68){{
+        //    difficulty = 7;
+        //}};
+
+        coastline = new SectorPreset("coastline", serpulo, 108){{
+            captureWave = 30;
+            difficulty = 5;
+        }};
+
+        weatheredChannels = new SectorPreset("weatheredChannels", serpulo, 39){{
+            captureWave = 40;
+            difficulty = 9;
+        }};
+
+        navalFortress = new SectorPreset("navalFortress", serpulo, 216){{
+            difficulty = 8;
+        }};
+
+        frontier = new SectorPreset("frontier", serpulo, 203){{
+            difficulty = 4;
         }};
 
         fungalPass = new SectorPreset("fungalPass", serpulo, 21){{
             difficulty = 4;
-            useAI = false;
+        }};
+
+        infestedCanyons = new SectorPreset("infestedCanyons", serpulo, 210){{
+            difficulty = 4;
+        }};
+
+        atolls = new SectorPreset("atolls", serpulo, 1){{
+            difficulty = 7;
+        }};
+
+        mycelialBastion = new SectorPreset("mycelialBastion", serpulo, 260){{
+            difficulty = 8;
         }};
 
         overgrowth = new SectorPreset("overgrowth", serpulo, 134){{
             difficulty = 5;
-            useAI = false;
         }};
 
         tarFields = new SectorPreset("tarFields", serpulo, 23){{
@@ -94,6 +152,96 @@ public class SectorPresets implements ContentList{
 
         planetaryTerminal = new SectorPreset("planetaryTerminal", serpulo, 93){{
             difficulty = 10;
+            isLastSector = true;
         }};
+
+        geothermalStronghold = new SectorPreset("geothermalStronghold", serpulo, 264){{
+            difficulty = 10;
+        }};
+
+        cruxscape = new SectorPreset("cruxscape", serpulo, 54){{
+            difficulty = 10;
+        }};
+
+        //endregion
+        //region erekir
+
+        onset = new SectorPreset("onset", erekir, 10){{
+            addStartingItems = true;
+            alwaysUnlocked = true;
+            difficulty = 1;
+        }};
+
+        aegis = new SectorPreset("aegis", erekir, 88){{
+            difficulty = 3;
+        }};
+
+        lake = new SectorPreset("lake", erekir, 41){{
+            difficulty = 4;
+        }};
+
+        intersect = new SectorPreset("intersect", erekir, 36){{
+            difficulty = 5;
+            captureWave = 9;
+            attackAfterWaves = true;
+        }};
+
+        atlas = new SectorPreset("atlas", erekir, 14){{ //TODO random sector, pick a better one
+            difficulty = 5;
+        }};
+
+        split = new SectorPreset("split", erekir, 19){{ //TODO random sector, pick a better one
+            difficulty = 2;
+        }};
+
+        basin = new SectorPreset("basin", erekir, 29){{
+            difficulty = 6;
+        }};
+
+        marsh = new SectorPreset("marsh", erekir, 25){{
+            difficulty = 4;
+        }};
+
+        peaks = new SectorPreset("peaks", erekir, 30){{
+            difficulty = 3;
+        }};
+
+        ravine = new SectorPreset("ravine", erekir, 39){{
+            difficulty = 4;
+            captureWave = 24;
+        }};
+
+        caldera = new SectorPreset("caldera-erekir", erekir, 43){{
+            difficulty = 4;
+        }};
+
+        stronghold = new SectorPreset("stronghold", erekir, 18){{
+            difficulty = 7;
+        }};
+
+        crevice = new SectorPreset("crevice", erekir, 3){{
+            difficulty = 6;
+            captureWave = 46;
+        }};
+
+        siege = new SectorPreset("siege", erekir, 58){{
+            difficulty = 8;
+        }};
+
+        crossroads = new SectorPreset("crossroads", erekir, 37){{
+            difficulty = 7;
+        }};
+
+        karst = new SectorPreset("karst", erekir, 5){{
+            difficulty = 9;
+            captureWave = 10;
+        }};
+
+        origin = new SectorPreset("origin", erekir, 12){{
+            difficulty = 10;
+            isLastSector = true;
+        }};
+
+        //endregion
     }
 }
diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java
new file mode 100644
index 0000000000..e791f67680
--- /dev/null
+++ b/core/src/mindustry/content/SerpuloTechTree.java
@@ -0,0 +1,780 @@
+package mindustry.content;
+
+import arc.struct.*;
+import mindustry.game.Objectives.*;
+import mindustry.type.*;
+
+import static mindustry.content.Blocks.*;
+import static mindustry.content.SectorPresets.craters;
+import static mindustry.content.SectorPresets.*;
+import static mindustry.content.TechTree.*;
+import static mindustry.content.UnitTypes.*;
+
+public class SerpuloTechTree{
+
+    public static void load(){
+        Planets.serpulo.techTree = nodeRoot("serpulo", coreShard, () -> {
+
+            node(conveyor, () -> {
+
+                node(junction, () -> {
+                    node(router, () -> {
+                        node(advancedLaunchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> {
+                            node(landingPad, () -> {
+                                node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> {
+
+                                });
+                            });
+                        });
+
+                        node(distributor);
+                        node(sorter, () -> {
+                            node(invertedSorter);
+                            node(overflowGate, () -> {
+                                node(underflowGate);
+                            });
+                        });
+                        node(container, Seq.with(new SectorComplete(biomassFacility)), () -> {
+                            node(unloader);
+                            node(vault, Seq.with(new SectorComplete(stainedMountains)), () -> {
+
+                            });
+                        });
+
+                        node(itemBridge, () -> {
+                            node(titaniumConveyor, Seq.with(new SectorComplete(craters)), () -> {
+                                node(phaseConveyor, () -> {
+                                    node(massDriver, () -> {
+
+                                    });
+                                });
+
+                                node(payloadConveyor, () -> {
+                                    node(payloadRouter, () -> {
+
+                                    });
+                                });
+
+                                node(armoredConveyor, () -> {
+                                    node(plastaniumConveyor, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(coreFoundation, () -> {
+                node(coreNucleus, () -> {
+
+                });
+            });
+
+            node(mechanicalDrill, () -> {
+
+                node(mechanicalPump, () -> {
+                    node(conduit, () -> {
+                        node(liquidJunction, () -> {
+                            node(liquidRouter, () -> {
+                                node(liquidContainer, () -> {
+                                    node(liquidTank);
+                                });
+
+                                node(bridgeConduit);
+
+                                node(pulseConduit, Seq.with(new SectorComplete(windsweptIslands)), () -> {
+                                    node(phaseConduit, () -> {
+
+                                    });
+
+                                    node(platedConduit, () -> {
+
+                                    });
+
+                                    node(rotaryPump, () -> {
+                                        node(impulsePump, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(graphitePress, () -> {
+                    node(pneumaticDrill, Seq.with(new SectorComplete(frozenForest)), () -> {
+                        node(cultivator, Seq.with(new SectorComplete(biomassFacility)), () -> {
+
+                        });
+
+                        node(laserDrill, () -> {
+                            node(blastDrill, Seq.with(new SectorComplete(nuclearComplex)), () -> {
+
+                            });
+
+                            node(waterExtractor, Seq.with(new SectorComplete(saltFlats)), () -> {
+                                node(oilExtractor, () -> {
+
+                                });
+                            });
+                        });
+                    });
+
+                    node(pyratiteMixer, () -> {
+                        node(blastMixer, Seq.with(new SectorComplete(facility32m)), () -> {
+
+                        });
+                    });
+
+                    node(siliconSmelter, () -> {
+
+                        node(sporePress, () -> {
+                            node(coalCentrifuge, () -> {
+                                node(multiPress, () -> {
+                                    node(siliconCrucible, () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(plastaniumCompressor, Seq.with(new SectorComplete(windsweptIslands), new OnSector(tarFields)), () -> {
+                                node(phaseWeaver, Seq.with(new SectorComplete(tarFields)), () -> {
+
+                                });
+                            });
+                        });
+
+                        node(kiln, Seq.with(new SectorComplete(craters)), () -> {
+                            node(pulverizer, () -> {
+                                node(incinerator, () -> {
+                                    node(melter, () -> {
+                                        node(surgeSmelter, () -> {
+
+                                        });
+
+                                        node(separator, () -> {
+                                            node(disassembler, () -> {
+
+                                            });
+                                        });
+
+                                        node(cryofluidMixer, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+
+                        //logic disabled until further notice
+                        node(microProcessor, () -> {
+                            node(switchBlock, () -> {
+                                node(message, () -> {
+                                    node(logicDisplay, () -> {
+                                        node(largeLogicDisplay, () -> {
+
+                                        });
+                                    });
+
+                                    node(memoryCell, () -> {
+                                        node(memoryBank, () -> {
+
+                                        });
+                                    });
+                                });
+
+                                node(logicProcessor, () -> {
+                                    node(hyperProcessor, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+
+                        node(illuminator, () -> {
+
+                        });
+                    });
+                });
+
+
+                node(combustionGenerator, Seq.with(new Research(Items.coal)), () -> {
+                    node(powerNode, () -> {
+                        node(powerNodeLarge, () -> {
+                            node(diode, () -> {
+                                node(surgeTower, () -> {
+
+                                });
+                            });
+                        });
+
+                        node(battery, () -> {
+                            node(batteryLarge, () -> {
+
+                            });
+                        });
+
+                        node(mender, () -> {
+                            node(mendProjector, () -> {
+                                node(forceProjector, Seq.with(new SectorComplete(impact0078)), () -> {
+                                    node(overdriveProjector, Seq.with(new SectorComplete(impact0078)), () -> {
+                                        node(overdriveDome, Seq.with(new SectorComplete(impact0078)), () -> {
+
+                                        });
+                                    });
+                                });
+
+                                node(repairPoint, () -> {
+                                    node(repairTurret, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+
+                        node(steamGenerator, Seq.with(new SectorComplete(craters)), () -> {
+                            node(thermalGenerator, () -> {
+                                node(differentialGenerator, () -> {
+                                    node(thoriumReactor, Seq.with(new Research(Liquids.cryofluid)), () -> {
+                                        node(impactReactor, () -> {
+
+                                        });
+
+                                        node(rtgGenerator, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+
+                        node(solarPanel, () -> {
+                            node(largeSolarPanel, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(duo, () -> {
+                node(copperWall, () -> {
+                    node(copperWallLarge, () -> {
+                        node(scrapWall, () -> {
+                            node(scrapWallLarge, () -> {
+                                node(scrapWallHuge, () -> {
+                                    node(scrapWallGigantic);
+                                });
+                            });
+                        });
+
+                        node(titaniumWall, () -> {
+                            node(titaniumWallLarge);
+
+                            node(door, () -> {
+                                node(doorLarge);
+                            });
+
+                            node(plastaniumWall, () -> {
+                                node(plastaniumWallLarge, () -> {
+
+                                });
+                            });
+                            node(thoriumWall, () -> {
+                                node(thoriumWallLarge);
+                                node(surgeWall, () -> {
+                                    node(surgeWallLarge);
+                                    node(phaseWall, () -> {
+                                        node(phaseWallLarge);
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(scatter, () -> {
+                    node(hail, Seq.with(new SectorComplete(craters)), () -> {
+                        node(salvo, () -> {
+                            node(swarmer, () -> {
+                                node(cyclone, () -> {
+                                    node(spectre, Seq.with(new SectorComplete(nuclearComplex)), () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(ripple, () -> {
+                                node(fuse, () -> {
+
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(scorch, () -> {
+                    node(arc, () -> {
+                        node(wave, () -> {
+                            node(parallax, () -> {
+                                node(segment, () -> {
+
+                                });
+                            });
+
+                            node(tsunami, () -> {
+
+                            });
+                        });
+
+                        node(lancer, () -> {
+                            node(meltdown, () -> {
+                                node(foreshadow, () -> {
+
+                                });
+                            });
+
+                            node(shockMine, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(groundFactory, () -> {
+
+                node(dagger, () -> {
+                    node(mace, () -> {
+                        node(fortress, () -> {
+                            node(scepter, () -> {
+                                node(reign, () -> {
+
+                                });
+                            });
+                        });
+                    });
+
+                    node(nova, () -> {
+                        node(pulsar, () -> {
+                            node(quasar, () -> {
+                                node(vela, () -> {
+                                    node(corvus, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+                    //override research requirements to have graphite, not coal
+                    node(crawler, ItemStack.with(Items.silicon, 400, Items.graphite, 400), () -> {
+                        node(atrax, () -> {
+                            node(spiroct, () -> {
+                                node(arkyid, () -> {
+                                    node(toxopid, Seq.with(new SectorComplete(mycelialBastion)), () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(airFactory, () -> {
+                    node(flare, () -> {
+                        node(horizon, () -> {
+                            node(zenith, () -> {
+                                node(antumbra, () -> {
+                                    node(eclipse, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+
+                        node(mono, () -> {
+                            node(poly, () -> {
+                                node(mega, () -> {
+                                    node(quad, () -> {
+                                        node(oct, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+                    node(navalFactory, Seq.with(new OnSector(windsweptIslands)), () -> {
+                        node(risso, () -> {
+                            node(minke, () -> {
+                                node(bryde, () -> {
+                                    node(sei, () -> {
+                                        node(omura, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+
+                            node(retusa, Seq.with(new SectorComplete(windsweptIslands)), () -> {
+                                node(oxynoe, Seq.with(new SectorComplete(coastline)), () -> {
+                                    node(cyerce, () -> {
+                                        node(aegires, () -> {
+                                            node(navanax, Seq.with(new SectorComplete(navalFortress)), () -> {
+
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(additiveReconstructor, Seq.with(new SectorComplete(biomassFacility)), () -> {
+                    node(multiplicativeReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> {
+                        node(exponentialReconstructor, () -> {
+                            node(tetrativeReconstructor, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+
+            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(frontier, Seq.with(
+                        new Research(groundFactory),
+                        new Research(airFactory),
+                        new Research(thermalGenerator),
+                        new Research(dagger),
+                        new Research(mono)
+                        ), () -> {
+
+                        });
+
+                        node(ruinousShores, Seq.with(
+                        new SectorComplete(craters),
+                        new Research(graphitePress),
+                        new Research(kiln),
+                        new Research(mechanicalPump)
+                        ), () -> {
+                            node(windsweptIslands, Seq.with(
+                            new SectorComplete(ruinousShores),
+                            new Research(pneumaticDrill),
+                            new Research(hail),
+                            new Research(siliconSmelter),
+                            new Research(steamGenerator)
+                            ), () -> {
+                                node(seaPort, Seq.with(
+                                new SectorComplete(biomassFacility),
+                                new Research(navalFactory),
+                                new Research(risso),
+                                new Research(retusa),
+                                new Research(steamGenerator),
+                                new Research(cultivator),
+                                new Research(coalCentrifuge)
+                                ), () -> {
+
+                                });
+
+                                node(tarFields, Seq.with(
+                                new SectorComplete(windsweptIslands),
+                                new Research(coalCentrifuge),
+                                new Research(conduit),
+                                new Research(wave)
+                                ), () -> {
+                                    node(impact0078, Seq.with(
+                                    new SectorComplete(tarFields),
+                                    new Research(Items.thorium),
+                                    new Research(lancer),
+                                    new Research(salvo),
+                                    new Research(coreFoundation)
+                                    ), () -> {
+                                        node(desolateRift, Seq.with(
+                                        new SectorComplete(impact0078),
+                                        new Research(thermalGenerator),
+                                        new Research(thoriumReactor),
+                                        new Research(coreNucleus)
+                                        ), () -> {
+                                            node(planetaryTerminal, Seq.with(
+                                            new SectorComplete(desolateRift),
+                                            new SectorComplete(nuclearComplex),
+                                            new SectorComplete(overgrowth),
+                                            new SectorComplete(extractionOutpost),
+                                            new SectorComplete(saltFlats),
+                                            new Research(risso),
+                                            new Research(minke),
+                                            new Research(bryde),
+                                            new Research(sei),
+                                            new Research(omura),
+                                            new Research(spectre),
+                                            new Research(advancedLaunchPad),
+                                            new Research(massDriver),
+                                            new Research(impactReactor),
+                                            new Research(additiveReconstructor),
+                                            new Research(exponentialReconstructor),
+                                            new Research(tetrativeReconstructor)
+                                            ), () -> {
+                                                node(geothermalStronghold, Seq.with(
+                                                new Research(omura),
+                                                new Research(navanax),
+                                                new Research(eclipse),
+                                                new Research(oct),
+                                                new Research(reign),
+                                                new Research(corvus),
+                                                new Research(toxopid)
+                                                ), () -> {
+
+                                                });
+
+                                                node(cruxscape, Seq.with(
+                                                new Research(omura),
+                                                new Research(navanax),
+                                                new Research(eclipse),
+                                                new Research(oct),
+                                                new Research(reign),
+                                                new Research(corvus),
+                                                new Research(toxopid)
+                                                ), () -> {
+
+                                                });
+                                            });
+                                        });
+                                    });
+                                });
+
+                                node(facility32m, Seq.with(
+                                new Research(pneumaticDrill),
+                                new SectorComplete(stainedMountains)
+                                ), () -> {
+                                    node(extractionOutpost, Seq.with(
+                                    new SectorComplete(windsweptIslands),
+                                    new SectorComplete(facility32m),
+                                    new Research(groundFactory),
+                                    new Research(nova),
+                                    new Research(airFactory),
+                                    new Research(mono)
+                                    ), () -> {
+                                        //TODO: removed for now
+                                        /*node(polarAerodrome, Seq.with(
+                                        new SectorComplete(fungalPass),
+                                        new SectorComplete(desolateRift),
+                                        new SectorComplete(overgrowth),
+                                        new Research(multiplicativeReconstructor),
+                                        new Research(zenith),
+                                        new Research(swarmer),
+                                        new Research(cyclone),
+                                        new Research(blastDrill),
+                                        new Research(blastDrill),
+                                        new Research(massDriver)
+                                        ), () -> {
+
+                                        });
+                                        */
+                                    });
+                                });
+
+                                node(saltFlats, Seq.with(
+                                new SectorComplete(windsweptIslands),
+                                new Research(groundFactory),
+                                new Research(additiveReconstructor),
+                                new Research(airFactory),
+                                new Research(door)
+                                ), () -> {
+                                    node(testingGrounds, Seq.with(
+                                    new Research(cryofluidMixer),
+                                    new Research(Liquids.cryofluid),
+                                    new Research(waterExtractor),
+                                    new Research(ripple)
+                                    ), () -> {
+
+                                    });
+
+                                    node(coastline, Seq.with(
+                                    new SectorComplete(windsweptIslands),
+                                    new SectorComplete(saltFlats),
+                                    new Research(navalFactory),
+                                    new Research(payloadConveyor)
+                                    ), () -> {
+
+                                        node(navalFortress, Seq.with(
+                                        new SectorComplete(coastline),
+                                        new SectorComplete(extractionOutpost),
+                                        new Research(coreNucleus),
+                                        new Research(massDriver),
+                                        new Research(oxynoe),
+                                        new Research(minke),
+                                        new Research(bryde),
+                                        new Research(cyclone),
+                                        new Research(ripple)
+                                        ), () -> {
+                                            node(weatheredChannels, Seq.with(
+                                            new SectorComplete(impact0078),
+                                            new Research(bryde),
+                                            new Research(surgeSmelter),
+                                            new Research(overdriveProjector)
+                                            ), () -> {
+
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+
+                        node(overgrowth, Seq.with(
+                        new SectorComplete(craters),
+                        new SectorComplete(fungalPass),
+                        new Research(cultivator),
+                        new Research(sporePress),
+                        new Research(additiveReconstructor),
+                        new Research(UnitTypes.mace),
+                        new Research(UnitTypes.flare)
+                        ), () -> {
+                            node(mycelialBastion, Seq.with(
+                            new Research(atrax),
+                            new Research(spiroct),
+                            new Research(multiplicativeReconstructor),
+                            new Research(exponentialReconstructor)
+                            ), () -> {
+
+                            });
+
+                            node(atolls, Seq.with(
+                            new SectorComplete(windsweptIslands),
+                            new Research(multiplicativeReconstructor),
+                            new Research(mega)
+                            ), () -> {
+
+                            });
+                        });
+                    });
+
+                    node(biomassFacility, Seq.with(
+                    new SectorComplete(frozenForest),
+                    new Research(powerNode),
+                    new Research(steamGenerator),
+                    new Research(scatter),
+                    new Research(graphitePress)
+                    ), () -> {
+                        node(taintedWoods, Seq.with(
+                        new SectorComplete(biomassFacility),
+                        new Research(Items.sporePod),
+                        new Research(wave)
+                        ), () -> {
+
+                        });
+
+                        node(stainedMountains, Seq.with(
+                        new SectorComplete(biomassFacility),
+                        new Research(pneumaticDrill),
+                        new Research(siliconSmelter)
+                        ), () -> {
+                            node(fungalPass, Seq.with(
+                            new SectorComplete(stainedMountains),
+                            new Research(groundFactory),
+                            new Research(door)
+                            ), () -> {
+                                node(infestedCanyons, Seq.with(
+                                new SectorComplete(fungalPass),
+                                new Research(navalFactory),
+                                new Research(risso),
+                                new Research(minke),
+                                new Research(additiveReconstructor)
+                                ), () -> {
+
+                                });
+
+                                node(nuclearComplex, Seq.with(
+                                new SectorComplete(fungalPass),
+                                new Research(thermalGenerator),
+                                new Research(laserDrill),
+                                new Research(Items.plastanium),
+                                new Research(swarmer)
+                                ), () -> {
+
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+
+            nodeProduce(Items.copper, () -> {
+                nodeProduce(Liquids.water, () -> {
+
+                });
+
+                nodeProduce(Items.lead, () -> {
+                    nodeProduce(Items.titanium, () -> {
+                        nodeProduce(Liquids.cryofluid, () -> {
+
+                        });
+
+                        nodeProduce(Items.thorium, () -> {
+                            nodeProduce(Items.surgeAlloy, () -> {
+
+                            });
+
+                            nodeProduce(Items.phaseFabric, () -> {
+
+                            });
+                        });
+                    });
+
+                    nodeProduce(Items.metaglass, () -> {
+
+                    });
+                });
+
+                nodeProduce(Items.sand, () -> {
+                    nodeProduce(Items.scrap, () -> {
+                        nodeProduce(Liquids.slag, () -> {
+
+                        });
+                    });
+
+                    nodeProduce(Items.coal, () -> {
+                        nodeProduce(Items.graphite, () -> {
+                            nodeProduce(Items.silicon, () -> {
+
+                            });
+                        });
+
+                        nodeProduce(Items.pyratite, () -> {
+                            nodeProduce(Items.blastCompound, () -> {
+
+                            });
+                        });
+
+                        nodeProduce(Items.sporePod, () -> {
+
+                        });
+
+                        nodeProduce(Liquids.oil, () -> {
+                            nodeProduce(Items.plastanium, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java
index b20463a65f..1ccaabc80f 100644
--- a/core/src/mindustry/content/StatusEffects.java
+++ b/core/src/mindustry/content/StatusEffects.java
@@ -3,34 +3,33 @@ package mindustry.content;
 import arc.*;
 import arc.graphics.*;
 import arc.math.*;
-import mindustry.ctype.*;
 import mindustry.game.EventType.*;
-import mindustry.type.*;
+import mindustry.game.*;
 import mindustry.graphics.*;
-
+import mindustry.type.*;
 
 import static mindustry.Vars.*;
 
-public class StatusEffects implements ContentList{
-    public static StatusEffect none, burning, freezing, unmoving, slow, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed;
+public class StatusEffects{
+    public static StatusEffect none, burning, freezing, unmoving, slow, fast, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed, disarmed, electrified, invincible, dynamic;
 
-    @Override
-    public void load(){
+    public static void load(){
 
         none = new StatusEffect("none");
 
         burning = new StatusEffect("burning"){{
-            color = Pal.lightFlame;
-            damage = 0.12f; //over 8 seconds, this would be 60 damage
+            color = Color.valueOf("ffc455");
+            damage = 0.167f;
             effect = Fx.burning;
+            transitionDamage = 8f;
 
             init(() -> {
                 opposite(wet, freezing);
-                trans(tarred, ((unit, time, newTime, result) -> {
-                    unit.damagePierce(8f);
+                affinity(tarred, (unit, result, time) -> {
+                    unit.damagePierce(transitionDamage);
                     Fx.burning.at(unit.x + Mathf.range(unit.bounds() / 2f), unit.y + Mathf.range(unit.bounds() / 2f));
-                    result.set(this, Math.min(time + newTime, 300f));
-                }));
+                    result.set(burning, Math.min(time + result.time, 300f));
+                });
             });
         }};
 
@@ -39,25 +38,37 @@ public class StatusEffects implements ContentList{
             speedMultiplier = 0.6f;
             healthMultiplier = 0.8f;
             effect = Fx.freezing;
+            transitionDamage = 18f;
 
             init(() -> {
                 opposite(melting, burning);
 
-                trans(blasted, ((unit, time, newTime, result) -> {
-                    unit.damagePierce(18f);
-                    result.set(this, time);
-                }));
+                affinity(blasted, (unit, result, time) -> {
+                    unit.damagePierce(transitionDamage);
+                    if(unit.team == state.rules.waveTeam){
+                        Events.fire(Trigger.blastFreeze);
+                    }
+                });
             });
         }};
 
         unmoving = new StatusEffect("unmoving"){{
             color = Pal.gray;
-            speedMultiplier = 0.001f;
+            speedMultiplier = 0f;
         }};
 
         slow = new StatusEffect("slow"){{
             color = Pal.lightishGray;
             speedMultiplier = 0.4f;
+
+            init(() -> opposite(fast));
+        }};
+
+        fast = new StatusEffect("fast"){{
+            color = Pal.boostTo;
+            speedMultiplier = 1.6f;
+
+            init(() -> opposite(slow));
         }};
 
         wet = new StatusEffect("wet"){{
@@ -65,24 +76,26 @@ public class StatusEffects implements ContentList{
             speedMultiplier = 0.94f;
             effect = Fx.wet;
             effectChance = 0.09f;
+            transitionDamage = 14;
 
             init(() -> {
-                trans(shocked, ((unit, time, newTime, result) -> {
-                    unit.damagePierce(14f);
+                affinity(shocked, (unit, result, time) -> {
+                    unit.damage(transitionDamage);
+
                     if(unit.team == state.rules.waveTeam){
                         Events.fire(Trigger.shock);
                     }
-                    result.set(this, time);
-                }));
-                opposite(burning);
+                });
+                opposite(burning, melting);
             });
         }};
-		
+
         muddy = new StatusEffect("muddy"){{
             color = Color.valueOf("46382a");
             speedMultiplier = 0.94f;
             effect = Fx.muddy;
             effectChance = 0.09f;
+            show = false;
         }};
 
         melting = new StatusEffect("melting"){{
@@ -94,11 +107,11 @@ public class StatusEffects implements ContentList{
 
             init(() -> {
                 opposite(wet, freezing);
-                trans(tarred, ((unit, time, newTime, result) -> {
+                affinity(tarred, (unit, result, time) -> {
                     unit.damagePierce(8f);
                     Fx.burning.at(unit.x + Mathf.range(unit.bounds() / 2f), unit.y + Mathf.range(unit.bounds() / 2f));
-                    result.set(this, Math.min(time + newTime, 200f));
-                }));
+                    result.set(melting, Math.min(time + result.time, 200f));
+                });
             });
         }};
 
@@ -110,6 +123,14 @@ public class StatusEffects implements ContentList{
             effectChance = 0.1f;
         }};
 
+        electrified = new StatusEffect("electrified"){{
+            color = Pal.heal;
+            speedMultiplier = 0.7f;
+            reloadMultiplier = 0.6f;
+            effect = Fx.electrified;
+            effectChance = 0.1f;
+        }};
+
         sporeSlowed = new StatusEffect("spore-slowed"){{
             color = Pal.spore;
             speedMultiplier = 0.8f;
@@ -123,8 +144,8 @@ public class StatusEffects implements ContentList{
             effect = Fx.oily;
 
             init(() -> {
-                trans(melting, ((unit, time, newTime, result) -> result.set(melting, newTime + time)));
-                trans(burning, ((unit, time, newTime, result) -> result.set(burning, newTime + time)));
+                affinity(melting, (unit, result, time) -> result.set(melting, result.time + time));
+                affinity(burning, (unit, result, time) -> result.set(burning, result.time + time));
             });
         }};
 
@@ -153,7 +174,7 @@ public class StatusEffects implements ContentList{
         }};
 
         boss = new StatusEffect("boss"){{
-            color = Pal.health;
+            color = Team.crux.color;
             permanent = true;
             damageMultiplier = 1.3f;
             healthMultiplier = 1.5f;
@@ -161,15 +182,32 @@ public class StatusEffects implements ContentList{
 
         shocked = new StatusEffect("shocked"){{
             color = Pal.lancerLaser;
+            reactive = true;
         }};
 
         blasted = new StatusEffect("blasted"){{
             color = Color.valueOf("ff795e");
+            reactive = true;
         }};
 
         corroded = new StatusEffect("corroded"){{
             color = Pal.plastanium;
             damage = 0.1f;
         }};
+
+        disarmed = new StatusEffect("disarmed"){{
+            color = Color.valueOf("e9ead3");
+            disarm = true;
+        }};
+
+        invincible = new StatusEffect("invincible"){{
+            healthMultiplier = Float.POSITIVE_INFINITY;
+        }};
+
+        dynamic = new StatusEffect("dynamic"){{
+            show = false;
+            dynamic = true;
+            permanent = true;
+        }};
     }
 }
diff --git a/core/src/mindustry/content/TeamEntries.java b/core/src/mindustry/content/TeamEntries.java
new file mode 100644
index 0000000000..0d4be79241
--- /dev/null
+++ b/core/src/mindustry/content/TeamEntries.java
@@ -0,0 +1,14 @@
+package mindustry.content;
+
+public class TeamEntries{
+
+    public static void load(){
+        //more will be added later - do these need references?
+
+        //TODO
+        //new TeamEntry(Team.derelict);
+        //new TeamEntry(Team.sharded);
+        //new TeamEntry(Team.malis);
+        //new TeamEntry(Team.crux);
+    }
+}
diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index 2e0a0f3646..eade391c03 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -1,652 +1,42 @@
 package mindustry.content;
 
 import arc.*;
+import arc.func.*;
+import arc.scene.style.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.ctype.*;
 import mindustry.game.Objectives.*;
 import mindustry.type.*;
 
-import static mindustry.content.Blocks.*;
-import static mindustry.content.SectorPresets.craters;
-import static mindustry.content.SectorPresets.*;
-import static mindustry.content.UnitTypes.*;
+/** Class for storing a list of TechNodes with some utility tree builder methods; context dependent. See {@link SerpuloTechTree#load} source for example usage. */
+public class TechTree{
+    private static TechNode context = null;
 
-public class TechTree implements ContentList{
-    static ObjectMap<UnlockableContent, TechNode> map = new ObjectMap<>();
-    static TechNode context = null;
+    public static Seq<TechNode> all = new Seq<>();
+    public static Seq<TechNode> roots = new Seq<>();
 
-    public static Seq<TechNode> all;
-    public static TechNode root;
-
-    @Override
-    public void load(){
-        setup();
-
-        root = node(coreShard, () -> {
-
-            node(conveyor, () -> {
-
-                node(junction, () -> {
-                    node(router, () -> {
-                        node(launchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> {
-                            node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> {
-                                
-                            });
-                        });
-
-                        node(distributor);
-                        node(sorter, () -> {
-                            node(invertedSorter);
-                            node(overflowGate, () -> {
-                                node(underflowGate);
-                            });
-                        });
-                        node(container, Seq.with(new SectorComplete(biomassFacility)), () -> {
-                            node(unloader);
-                            node(vault, Seq.with(new SectorComplete(stainedMountains)), () -> {
-
-                            });
-                        });
-
-                        node(itemBridge, () -> {
-                            node(titaniumConveyor, Seq.with(new SectorComplete(craters)), () -> {
-                                node(phaseConveyor, () -> {
-                                    node(massDriver, () -> {
-
-                                    });
-                                });
-
-                                node(payloadConveyor, () -> {
-                                    node(payloadRouter, () -> {
-
-                                    });
-                                });
-
-                                node(armoredConveyor, () -> {
-                                    node(plastaniumConveyor, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-            });
-
-            node(coreFoundation, () -> {
-                node(coreNucleus, () -> {
-
-                });
-            });
-
-            node(mechanicalDrill, () -> {
-
-                node(mechanicalPump, () -> {
-                    node(conduit, () -> {
-                        node(liquidJunction, () -> {
-                            node(liquidRouter, () -> {
-                                node(liquidTank);
-
-                                node(bridgeConduit);
-
-                                node(pulseConduit, Seq.with(new SectorComplete(windsweptIslands)), () -> {
-                                    node(phaseConduit, () -> {
-
-                                    });
-
-                                    node(platedConduit, () -> {
-
-                                    });
-
-                                    node(rotaryPump, () -> {
-                                        node(thermalPump, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(graphitePress, () -> {
-                    node(pneumaticDrill, Seq.with(new SectorComplete(frozenForest)), () -> {
-                        node(cultivator, Seq.with(new SectorComplete(biomassFacility)), () -> {
-
-                        });
-
-                        node(laserDrill, () -> {
-                            node(blastDrill, Seq.with(new SectorComplete(nuclearComplex)), () -> {
-
-                            });
-
-                            node(waterExtractor, Seq.with(new SectorComplete(saltFlats)), () -> {
-                                node(oilExtractor, () -> {
-
-                                });
-                            });
-                        });
-                    });
-
-                    node(pyratiteMixer, () -> {
-                        node(blastMixer, () -> {
-
-                        });
-                    });
-
-                    node(siliconSmelter, () -> {
-
-                        node(sporePress, () -> {
-                            node(coalCentrifuge, () -> {
-                                node(multiPress, () -> {
-                                    node(siliconCrucible, () -> {
-
-                                    });
-                                });
-                            });
-
-                            node(plastaniumCompressor, Seq.with(new SectorComplete(windsweptIslands)), () -> {
-                                node(phaseWeaver, Seq.with(new SectorComplete(tarFields)), () -> {
-
-                                });
-                            });
-                        });
-
-                        node(kiln, Seq.with(new SectorComplete(craters)), () -> {
-                            node(pulverizer, () -> {
-                                node(incinerator, () -> {
-                                    node(melter, () -> {
-                                        node(surgeSmelter, () -> {
-
-                                        });
-
-                                        node(separator, () -> {
-                                            node(disassembler, () -> {
-
-                                            });
-                                        });
-
-                                        node(cryofluidMixer, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-
-                        node(microProcessor, () -> {
-                            node(switchBlock, () -> {
-                                node(message, () -> {
-                                    node(logicDisplay, () -> {
-                                        node(largeLogicDisplay, () -> {
-
-                                        });
-                                    });
-
-                                    node(memoryCell, () -> {
-                                        node(memoryBank, () -> {
-
-                                        });
-                                    });
-                                });
-
-                                node(logicProcessor, () -> {
-                                    node(hyperProcessor, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-
-                        node(illuminator, () -> {
-
-                        });
-                    });
-                });
-
-
-                node(combustionGenerator, Seq.with(new Research(Items.coal)), () -> {
-                    node(powerNode, () -> {
-                        node(powerNodeLarge, () -> {
-                            node(diode, () -> {
-                                node(surgeTower, () -> {
-
-                                });
-                            });
-                        });
-
-                        node(battery, () -> {
-                            node(batteryLarge, () -> {
-
-                            });
-                        });
-
-                        node(mender, () -> {
-                            node(mendProjector, () -> {
-                                node(forceProjector, Seq.with(new SectorComplete(impact0078)), () -> {
-                                    node(overdriveProjector, Seq.with(new SectorComplete(impact0078)), () -> {
-                                        node(overdriveDome, Seq.with(new SectorComplete(impact0078)), () -> {
-
-                                        });
-                                    });
-                                });
-
-                                node(repairPoint, () -> {
-
-                                });
-                            });
-                        });
-
-                        node(steamGenerator, Seq.with(new SectorComplete(craters)), () -> {
-                            node(thermalGenerator, () -> {
-                                node(differentialGenerator, () -> {
-                                    node(thoriumReactor, Seq.with(new Research(Liquids.cryofluid)), () -> {
-                                        node(impactReactor, () -> {
-
-                                        });
-
-                                        node(rtgGenerator, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-
-                        node(solarPanel, () -> {
-                            node(largeSolarPanel, () -> {
-
-                            });
-                        });
-                    });
-                });
-            });
-
-            node(duo, () -> {
-                node(copperWall, () -> {
-                    node(copperWallLarge, () -> {
-                        node(titaniumWall, () -> {
-                            node(titaniumWallLarge);
-
-                            node(door, () -> {
-                                node(doorLarge);
-                            });
-                            node(plastaniumWall, () -> {
-                                node(plastaniumWallLarge, () -> {
-
-                                });
-                            });
-                            node(thoriumWall, () -> {
-                                node(thoriumWallLarge);
-                                node(surgeWall, () -> {
-                                    node(surgeWallLarge);
-                                    node(phaseWall, () -> {
-                                        node(phaseWallLarge);
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(scatter, () -> {
-                    node(hail, Seq.with(new SectorComplete(craters)), () -> {
-                        node(salvo, () -> {
-                            node(swarmer, () -> {
-                                node(cyclone, () -> {
-                                    node(spectre, Seq.with(new SectorComplete(nuclearComplex)), () -> {
-
-                                    });
-                                });
-                            });
-
-                            node(ripple, () -> {
-                                node(fuse, () -> {
-
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(scorch, () -> {
-                    node(arc, () -> {
-                        node(wave, () -> {
-                            node(parallax, () -> {
-                                node(segment, () -> {
-
-                                });
-                            });
-
-                            node(tsunami, () -> {
-
-                            });
-                        });
-
-                        node(lancer, () -> {
-                            node(meltdown, () -> {
-                                node(foreshadow, () -> {
-
-                                });
-                            });
-
-                            node(shockMine, () -> {
-
-                            });
-                        });
-                    });
-                });
-            });
-
-            node(groundFactory, () -> {
-                node(commandCenter, () -> {
-
-                });
-
-                node(dagger, () -> {
-                    node(mace, () -> {
-                        node(fortress, () -> {
-                            node(scepter, () -> {
-                                node(reign, () -> {
-
-                                });
-                            });
-                        });
-                    });
-
-                    node(nova, () -> {
-                        node(pulsar, () -> {
-                            node(quasar, () -> {
-                                node(vela, () -> {
-                                    node(corvus, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-                    });
-
-                    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(navalFactory, Seq.with(new SectorComplete(ruinousShores)), () -> {
-                        node(risso, () -> {
-                            node(minke, () -> {
-                                node(bryde, () -> {
-                                    node(sei, () -> {
-                                        node(omura, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(additiveReconstructor, Seq.with(new SectorComplete(biomassFacility)), () -> {
-                    node(multiplicativeReconstructor, () -> {
-                        node(exponentialReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> {
-                            node(tetrativeReconstructor, () -> {
-                                
-                            });
-                        });
-                    });
-                });
-            });
-
-            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(windsweptIslands, Seq.with(
-                                new SectorComplete(ruinousShores),
-                                new Research(pneumaticDrill),
-                                new Research(hail),
-                                new Research(siliconSmelter),
-                                new Research(steamGenerator)
-                            ), () -> {
-                                node(tarFields, Seq.with(
-                                    new SectorComplete(windsweptIslands),
-                                    new Research(coalCentrifuge),
-                                    new Research(conduit),
-                                    new Research(wave)
-                                ), () -> {
-                                    node(impact0078, Seq.with(
-                                        new SectorComplete(tarFields),
-                                        new Research(Items.thorium),
-                                        new Research(lancer),
-                                        new Research(salvo),
-                                        new Research(coreFoundation)
-                                    ), () -> {
-                                        node(desolateRift, Seq.with(
-                                            new SectorComplete(impact0078),
-                                            new Research(thermalGenerator),
-                                            new Research(thoriumReactor),
-                                            new Research(coreNucleus)
-                                        ), () -> {
-                                            node(planetaryTerminal, Seq.with(
-                                                new SectorComplete(desolateRift),
-                                                new SectorComplete(nuclearComplex),
-                                                new SectorComplete(overgrowth),
-                                                new SectorComplete(extractionOutpost),
-                                                new SectorComplete(saltFlats),
-                                                new Research(risso),
-                                                new Research(minke),
-                                                new Research(bryde),
-                                                new Research(spectre),
-                                                new Research(launchPad),
-                                                new Research(massDriver),
-                                                new Research(impactReactor),
-                                                new Research(additiveReconstructor),
-                                                new Research(exponentialReconstructor)
-                                            ), () -> {
-
-                                            });
-                                        });
-                                    });
-                                });
-
-                                node(extractionOutpost, Seq.with(
-                                    new SectorComplete(stainedMountains),
-                                    new SectorComplete(windsweptIslands),
-                                    new Research(groundFactory),
-                                    new Research(nova),
-                                    new Research(airFactory),
-                                    new Research(mono)
-                                ), () -> {
-
-                                });
-
-                                node(saltFlats, Seq.with(
-                                    new SectorComplete(windsweptIslands),
-                                    new Research(commandCenter),
-                                    new Research(groundFactory),
-                                    new Research(additiveReconstructor),
-                                    new Research(airFactory),
-                                    new Research(door)
-                                ), () -> {
-
-                                });
-                            });
-                        });
-
-                        node(overgrowth, Seq.with(
-                            new SectorComplete(craters),
-                            new SectorComplete(fungalPass),
-                            new Research(cultivator),
-                            new Research(sporePress),
-                            new Research(additiveReconstructor),
-                            new Research(UnitTypes.mace),
-                            new Research(UnitTypes.flare)
-                        ), () -> {
-
-                        });
-                    });
-
-                    node(biomassFacility, Seq.with(
-                        new SectorComplete(frozenForest),
-                        new Research(powerNode),
-                        new Research(steamGenerator),
-                        new Research(scatter),
-                        new Research(graphitePress)
-                    ), () -> {
-                        node(stainedMountains, Seq.with(
-                            new SectorComplete(biomassFacility),
-                            new Research(pneumaticDrill),
-                            new Research(siliconSmelter)
-                        ), () -> {
-                            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),
-                                    new Research(Items.plastanium),
-                                    new Research(swarmer)
-                                ), () -> {
-
-                                });
-                            });
-                        });
-                    });
-                });
-            });
-
-            nodeProduce(Items.copper, () -> {
-                nodeProduce(Liquids.water, () -> {
-
-                });
-
-                nodeProduce(Items.lead, () -> {
-                    nodeProduce(Items.titanium, () -> {
-                        nodeProduce(Liquids.cryofluid, () -> {
-
-                        });
-
-                        nodeProduce(Items.thorium, () -> {
-                            nodeProduce(Items.surgeAlloy, () -> {
-
-                            });
-
-                            nodeProduce(Items.phaseFabric, () -> {
-
-                            });
-                        });
-                    });
-
-                    nodeProduce(Items.metaglass, () -> {
-
-                    });
-                });
-
-                nodeProduce(Items.sand, () -> {
-                    nodeProduce(Items.scrap, () -> {
-                        nodeProduce(Liquids.slag, () -> {
-
-                        });
-                    });
-
-                    nodeProduce(Items.coal, () -> {
-                        nodeProduce(Items.graphite, () -> {
-                            nodeProduce(Items.silicon, () -> {
-
-                            });
-                        });
-
-                        nodeProduce(Items.pyratite, () -> {
-                            nodeProduce(Items.blastCompound, () -> {
-
-                            });
-                        });
-
-                        nodeProduce(Items.sporePod, () -> {
-
-                        });
-
-                        nodeProduce(Liquids.oil, () -> {
-                            nodeProduce(Items.plastanium, () -> {
-
-                            });
-                        });
-                    });
-                });
-            });
-        });
+    public static TechNode nodeRoot(String name, UnlockableContent content, Runnable children){
+        return nodeRoot(name, content, false, children);
     }
 
-    public static void setup(){
-        context = null;
-        map = new ObjectMap<>();
-        all = new Seq<>();
+    public static TechNode nodeRoot(String name, UnlockableContent content, boolean requireUnlock, Runnable children){
+        var root = node(content, content.researchRequirements(), children);
+        root.name = name;
+        root.requiresUnlock = requireUnlock;
+        roots.add(root);
+        return root;
     }
 
-    //all the "node" methods are hidden, because they are for internal context-dependent use only
-    //for custom research, just use the TechNode constructor
-
-    static TechNode node(UnlockableContent content, Runnable children){
+    public static TechNode node(UnlockableContent content, Runnable children){
         return node(content, content.researchRequirements(), children);
     }
 
-    static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){
+    public static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){
         return node(content, requirements, null, children);
     }
 
-    static TechNode node(UnlockableContent content, ItemStack[] requirements, Seq<Objective> objectives, Runnable children){
+    public static TechNode node(UnlockableContent content, ItemStack[] requirements, Seq<Objective> objectives, Runnable children){
         TechNode node = new TechNode(context, content, requirements);
         if(objectives != null){
             node.objectives.addAll(objectives);
@@ -660,61 +50,74 @@ public class TechTree implements ContentList{
         return node;
     }
 
-    static TechNode node(UnlockableContent content, Seq<Objective> objectives, Runnable children){
+    public static TechNode node(UnlockableContent content, Seq<Objective> objectives, Runnable children){
         return node(content, content.researchRequirements(), objectives, children);
     }
 
-    static TechNode node(UnlockableContent block){
+    public static TechNode node(UnlockableContent block){
         return node(block, () -> {});
     }
 
-    static TechNode nodeProduce(UnlockableContent content, Seq<Objective> objectives, Runnable children){
-        return node(content, content.researchRequirements(), objectives.and(new Produce(content)), children);
+    public static TechNode nodeProduce(UnlockableContent content, Seq<Objective> objectives, Runnable children){
+        return node(content, content.researchRequirements(), objectives.add(new Produce(content)), children);
     }
 
-    static TechNode nodeProduce(UnlockableContent content, Runnable children){
+    public static TechNode nodeProduce(UnlockableContent content, Runnable children){
         return nodeProduce(content, new Seq<>(), children);
     }
 
-    @Nullable
-    public static TechNode get(UnlockableContent content){
-        return map.get(content);
-    }
-
-    public static TechNode getNotNull(UnlockableContent content){
-        return map.getThrow(content, () -> new RuntimeException(content + " does not have a tech node"));
+    public static @Nullable TechNode context(){
+        return context;
     }
 
     public static class TechNode{
         /** Depth in tech tree. */
         public int depth;
+        /** Icon displayed in tech tree selector. */
+        public @Nullable Drawable icon;
+        /** Name for root node - used in tech tree selector. */
+        public @Nullable String name;
+        /** For roots only. If true, this needs to be unlocked before it is selectable in the research dialog. Does not apply when you are on the planet itself. */
+        public boolean requiresUnlock = false;
         /** Requirement node. */
         public @Nullable TechNode parent;
+        /** Multipliers for research costs on a per-item basis. Inherits from parent. */
+        public @Nullable ObjectFloatMap<Item> researchCostMultipliers;
         /** Content to be researched. */
         public UnlockableContent content;
         /** Item requirements for this content. */
         public ItemStack[] requirements;
         /** Requirements that have been fulfilled. Always the same length as the requirement array. */
-        public final ItemStack[] finishedRequirements;
+        public ItemStack[] finishedRequirements;
         /** Extra objectives needed to research this. */
         public Seq<Objective> objectives = new Seq<>();
         /** Nodes that depend on this node. */
         public final Seq<TechNode> children = new Seq<>();
+        /** Planet associated with this tech node. Null to auto-detect, or use Serpulo if no associated planet is found. */
+        public @Nullable Planet planet;
 
         public TechNode(@Nullable TechNode parent, UnlockableContent content, ItemStack[] requirements){
-            if(parent != null) parent.children.add(this);
+            if(parent != null){
+                parent.children.add(this);
+                planet = parent.planet;
+                researchCostMultipliers = parent.researchCostMultipliers;
+            }else if(researchCostMultipliers == null){
+                researchCostMultipliers = new ObjectFloatMap<>();
+            }
 
             this.parent = parent;
             this.content = content;
-            this.requirements = requirements;
             this.depth = parent == null ? 0 : parent.depth + 1;
-            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));
+            if(researchCostMultipliers.size > 0){
+                requirements = ItemStack.copy(requirements);
+                for(ItemStack requirement : requirements){
+                    requirement.amount = (int)(requirement.amount * researchCostMultipliers.get(requirement.item, 1));
+                }
             }
 
+            setupRequirements(requirements);
+
             var used = new ObjectSet<Content>();
 
             //add dependencies as objectives.
@@ -724,10 +127,47 @@ public class TechTree implements ContentList{
                 }
             });
 
-            map.put(content, this);
+            content.techNode = this;
+            content.techNodes.add(this);
             all.add(this);
         }
 
+        /** Recursively iterates through everything that is a child of this node. Includes itself. */
+        public void each(Cons<TechNode> consumer){
+            consumer.get(this);
+            for(var child : children){
+                child.each(consumer);
+            }
+        }
+
+        /** Adds the specified database tab to all the content in this tree. */
+        public void addDatabaseTab(UnlockableContent tab){
+            each(node -> node.content.databaseTabs.add(tab));
+        }
+
+        /** Adds the specified planet to the shownPlanets of all the content in this tree. */
+        public void addPlanet(Planet planet){
+            each(node -> node.content.shownPlanets.add(planet));
+        }
+
+        public Drawable icon(){
+            return icon == null ? new TextureRegionDrawable(content.uiIcon) : icon;
+        }
+
+        public String localizedName(){
+            return Core.bundle.get("techtree." + name, name);
+        }
+
+        public void setupRequirements(ItemStack[] requirements){
+            this.requirements = requirements;
+            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));
+            }
+        }
+
         /** Resets finished requirements and saves. */
         public void reset(){
             for(ItemStack stack : finishedRequirements){
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 99895be719..6e3514620c 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1,91 +1,126 @@
 package mindustry.content;
 
 import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
 import arc.struct.*;
+import arc.util.*;
+import mindustry.ai.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.ctype.*;
+import mindustry.entities.*;
 import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.part.*;
+import mindustry.entities.pattern.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.type.ammo.*;
+import mindustry.type.unit.*;
+import mindustry.type.weapons.*;
 import mindustry.world.meta.*;
 
+import static arc.graphics.g2d.Draw.*;
+import static arc.graphics.g2d.Lines.*;
+import static arc.math.Angles.*;
 import static mindustry.Vars.*;
 
-public class UnitTypes implements ContentList{
-    //region definitions
-
-    //(the wall of shame - should fix the legacy stuff eventually...)
+public class UnitTypes{
+    //region standard
 
     //mech
-    public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, scepter, reign;
+    public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, scepter, reign, vela;
 
-    //mech
+    //mech, legacy
     public static @EntityDef(value = {Unitc.class, Mechc.class}, legacy = true) UnitType nova, pulsar, quasar;
 
-    //mech
-    public static @EntityDef({Unitc.class, Mechc.class}) UnitType vela;
-
     //legs
-    public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus, atrax;
+    public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus, atrax,
+    merui, cleroi, anthicus,
+    tecta, collaris;
 
-    //legs
+    //legs, legacy
     public static @EntityDef(value = {Unitc.class, Legsc.class}, legacy = true) UnitType spiroct, arkyid, toxopid;
 
-    //air
-    public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra;
+    //hover
+    public static @EntityDef({Unitc.class, ElevationMovec.class}) UnitType elude;
 
     //air
+    public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra,
+    avert, obviate;
+
+    //air, legacy
     public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType mono;
 
-    //air
+    //air, legacy
     public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType poly;
 
     //air + payload
-    public static @EntityDef({Unitc.class, Payloadc.class}) UnitType mega;
+    public static @EntityDef({Unitc.class, Payloadc.class}) UnitType mega,
+    evoke, incite, emanate, quell, disrupt;
 
-    //air + payload
+    //air + payload, legacy
     public static @EntityDef(value = {Unitc.class, Payloadc.class}, legacy = true) UnitType quad;
 
-    //air + payload + ammo distribution
-    public static @EntityDef({Unitc.class, Payloadc.class, AmmoDistributec.class}) UnitType oct;
+    //air + payload + legacy (different branch)
+    public static @EntityDef(value = {Unitc.class, Payloadc.class}, legacy = true) UnitType oct;
 
-    //air
+    //air, legacy
     public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType alpha, beta, gamma;
 
-    //water
-    public static @EntityDef({Unitc.class, WaterMovec.class}) UnitType risso, minke, bryde, sei, omura;
+    //naval
+    public static @EntityDef({Unitc.class, WaterMovec.class}) UnitType risso, minke, bryde, sei, omura, retusa, oxynoe, cyerce, aegires, navanax;
 
     //special block unit type
     public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
 
+    //special building tethered (has payload capability, because it's necessary sometimes)
+    public static @EntityDef({Unitc.class, BuildingTetherc.class, Payloadc.class}) UnitType manifold, assemblyDrone;
+
+    //tank
+    public static @EntityDef({Unitc.class, Tankc.class}) UnitType stell, locus, precept, vanquish, conquer;
+
     //endregion
 
-    @Override
-    public void load(){
+    //missile definition, unused here but needed for codegen
+    public static @EntityDef({Unitc.class, TimedKillc.class}) UnitType missile;
+
+    //region neoplasm
+
+    public static @EntityDef({Unitc.class, Crawlc.class}) UnitType latum, renale;
+
+    //endregion
+
+    public static void load(){
         //region ground attack
 
         dagger = new UnitType("dagger"){{
             speed = 0.5f;
             hitSize = 8f;
-            health = 140;
+            health = 150;
             weapons.add(new Weapon("large-weapon"){{
-                reload = 14f;
+                reload = 13f;
                 x = 4f;
                 y = 2f;
                 top = false;
                 ejectEffect = Fx.casing1;
-                bullet = Bullets.standardCopper;
+                bullet = new BasicBulletType(2.5f, 9){{
+                    width = 7f;
+                    height = 9f;
+                    lifetime = 60f;
+                }};
             }});
         }};
 
         mace = new UnitType("mace"){{
-            speed = 0.4f;
-            hitSize = 9f;
-            health = 500;
+            speed = 0.5f;
+            hitSize = 10f;
+            health = 550;
             armor = 4f;
+            ammoType = new ItemAmmoType(Items.coal);
 
             immunities.add(StatusEffects.burning);
 
@@ -93,14 +128,16 @@ public class UnitTypes implements ContentList{
                 top = false;
                 shootSound = Sounds.flame;
                 shootY = 2f;
-                reload = 14f;
+                reload = 11f;
                 recoil = 1f;
                 ejectEffect = Fx.none;
-                bullet = new BulletType(3.9f, 30f){{
+                bullet = new BulletType(4.2f, 37f){{
                     ammoMultiplier = 3f;
                     hitSize = 7f;
-                    lifetime = 12f;
+                    lifetime = 13f;
                     pierce = true;
+                    pierceBuilding = true;
+                    pierceCap = 2;
                     statusDuration = 60f * 4;
                     shootEffect = Fx.shootSmallFlame;
                     hitEffect = Fx.hitFlameSmall;
@@ -113,13 +150,14 @@ public class UnitTypes implements ContentList{
         }};
 
         fortress = new UnitType("fortress"){{
-            speed = 0.39f;
+            speed = 0.43f;
             hitSize = 13f;
             rotateSpeed = 3f;
             targetAir = false;
-            health = 790;
+            health = 900;
             armor = 9f;
             mechFrontSway = 0.55f;
+            ammoType = new ItemAmmoType(Items.graphite);
 
             weapons.add(new Weapon("artillery"){{
                 top = false;
@@ -130,15 +168,15 @@ public class UnitTypes implements ContentList{
                 shake = 2f;
                 ejectEffect = Fx.casing2;
                 shootSound = Sounds.artillery;
-                bullet = new ArtilleryBulletType(2f, 8, "shell"){{
+                bullet = new ArtilleryBulletType(2f, 20, "shell"){{
                     hitEffect = Fx.blastExplosion;
                     knockback = 0.8f;
-                    lifetime = 110f;
+                    lifetime = 120f;
                     width = height = 14f;
                     collides = true;
                     collidesTiles = true;
-                    splashDamageRadius = 24f;
-                    splashDamage = 45f;
+                    splashDamageRadius = 35f;
+                    splashDamage = 80f;
                     backColor = Pal.bulletYellowBack;
                     frontColor = Pal.bulletYellow;
                 }};
@@ -146,17 +184,26 @@ public class UnitTypes implements ContentList{
         }};
 
         scepter = new UnitType("scepter"){{
-            speed = 0.35f;
-            hitSize = 20f;
+            speed = 0.36f;
+            hitSize = 22f;
             rotateSpeed = 2.1f;
             health = 9000;
-            armor = 11f;
-            canDrown = false;
+            armor = 10f;
             mechFrontSway = 1f;
+            ammoType = new ItemAmmoType(Items.thorium);
 
             mechStepParticles = true;
-            mechStepShake = 0.15f;
+            stepShake = 0.15f;
             singleTarget = true;
+            drownTimeMultiplier = 4f;
+
+            abilities.add(new ShieldRegenFieldAbility(25f, 250f, 60f * 1, 60f));
+
+            BulletType smallBullet = new BasicBulletType(3f, 10){{
+                width = 7f;
+                height = 9f;
+                lifetime = 50f;
+            }};
 
             weapons.add(
             new Weapon("scepter-weapon"){{
@@ -169,14 +216,15 @@ public class UnitTypes implements ContentList{
                 shake = 2f;
                 ejectEffect = Fx.casing3;
                 shootSound = Sounds.bang;
-                shots = 3;
                 inaccuracy = 3f;
-                shotDelay = 4f;
 
-                bullet = new BasicBulletType(7f, 50){{
+                shoot.shots = 3;
+                shoot.shotDelay = 4f;
+
+                bullet = new BasicBulletType(8f, 80){{
                     width = 11f;
                     height = 20f;
-                    lifetime = 25f;
+                    lifetime = 27f;
                     shootEffect = Fx.shootBig;
                     lightning = 2;
                     lightningLength = 6;
@@ -192,7 +240,7 @@ public class UnitTypes implements ContentList{
                 y = 6f;
                 rotate = true;
                 ejectEffect = Fx.casing1;
-                bullet = Bullets.standardCopper;
+                bullet = smallBullet;
             }},
             new Weapon("mount-weapon"){{
                 reload = 16f;
@@ -200,23 +248,23 @@ public class UnitTypes implements ContentList{
                 y = -7f;
                 rotate = true;
                 ejectEffect = Fx.casing1;
-                bullet = Bullets.standardCopper;
+                bullet = smallBullet;
             }}
-
             );
         }};
 
         reign = new UnitType("reign"){{
-            speed = 0.35f;
-            hitSize = 26f;
+            speed = 0.4f;
+            hitSize = 30f;
             rotateSpeed = 1.65f;
             health = 24000;
-            armor = 14f;
+            armor = 18f;
             mechStepParticles = true;
-            mechStepShake = 0.75f;
-            canDrown = false;
+            stepShake = 0.75f;
+            drownTimeMultiplier = 6f;
             mechFrontSway = 1.9f;
             mechSideSway = 0.6f;
+            ammoType = new ItemAmmoType(Items.thorium);
 
             weapons.add(
             new Weapon("reign-weapon"){{
@@ -230,7 +278,7 @@ public class UnitTypes implements ContentList{
                 ejectEffect = Fx.casing4;
                 shootSound = Sounds.bang;
 
-                bullet = new BasicBulletType(13f, 60){{
+                bullet = new BasicBulletType(13f, 80){{
                     pierce = true;
                     pierceCap = 10;
                     width = 14f;
@@ -241,13 +289,13 @@ public class UnitTypes implements ContentList{
 
                     hitEffect = Fx.blastExplosion;
                     splashDamage = 18f;
-                    splashDamageRadius = 30f;
+                    splashDamageRadius = 13f;
 
-                    fragBullets = 2;
+                    fragBullets = 3;
                     fragLifeMin = 0f;
-                    fragCone = 30f;
+                    fragRandomSpread = 30f;
 
-                    fragBullet = new BasicBulletType(9f, 15){{
+                    fragBullet = new BasicBulletType(9f, 20){{
                         width = 10f;
                         height = 10f;
                         pierce = true;
@@ -257,7 +305,7 @@ public class UnitTypes implements ContentList{
                         lifetime = 20f;
                         hitEffect = Fx.flakExplosion;
                         splashDamage = 15f;
-                        splashDamageRadius = 15f;
+                        splashDamageRadius = 10f;
                     }};
                 }};
             }}
@@ -274,12 +322,11 @@ public class UnitTypes implements ContentList{
             speed = 0.55f;
             hitSize = 8f;
             health = 120f;
-            buildSpeed = 0.8f;
+            buildSpeed = 0.3f;
             armor = 1f;
-            commandLimit = 8;
 
             abilities.add(new RepairFieldAbility(10f, 60f * 4, 60f));
-            ammoType = AmmoTypes.power;
+            ammoType = new PowerAmmoType(1000);
 
             weapons.add(new Weapon("heal-weapon"){{
                 top = false;
@@ -291,8 +338,8 @@ public class UnitTypes implements ContentList{
                 recoil = 2f;
                 shootSound = Sounds.lasershoot;
 
-                bullet = new LaserBoltBulletType(5.2f, 14){{
-                    lifetime = 37f;
+                bullet = new LaserBoltBulletType(5.2f, 13){{
+                    lifetime = 30f;
                     healPercent = 5f;
                     collidesTeam = true;
                     backColor = Pal.heal;
@@ -305,38 +352,38 @@ public class UnitTypes implements ContentList{
             canBoost = true;
             boostMultiplier = 1.6f;
             speed = 0.7f;
-            hitSize = 10f;
+            hitSize = 11f;
             health = 320f;
-            buildSpeed = 0.9f;
+            buildSpeed = 0.5f;
             armor = 4f;
+            riseSpeed = 0.07f;
 
             mineTier = 2;
             mineSpeed = 5f;
-            commandLimit = 9;
 
             abilities.add(new ShieldRegenFieldAbility(20f, 40f, 60f * 5, 60f));
-            ammoType = AmmoTypes.power;
+            ammoType = new PowerAmmoType(1300);
 
             weapons.add(new Weapon("heal-shotgun-weapon"){{
                 top = false;
                 x = 5f;
                 shake = 2.2f;
                 y = 0.5f;
-                shootY = 5f;
-
                 shootY = 2.5f;
-                reload = 38f;
-                shots = 3;
+
+                reload = 36f;
                 inaccuracy = 35;
-                shotDelay = 0.5f;
-                spacing = 0f;
+
+                shoot.shots = 3;
+                shoot.shotDelay = 0.5f;
+
                 ejectEffect = Fx.none;
                 recoil = 2.5f;
                 shootSound = Sounds.spark;
 
                 bullet = new LightningBulletType(){{
                     lightningColor = hitColor = Pal.heal;
-                    damage = 12f;
+                    damage = 14f;
                     lightningLength = 7;
                     lightningLengthRand = 7;
                     shootEffect = Fx.shootHeal;
@@ -350,7 +397,7 @@ public class UnitTypes implements ContentList{
                         status = StatusEffects.shocked;
                         statusDuration = 10f;
                         hittable = false;
-                        healPercent = 2f;
+                        healPercent = 1.6f;
                         collidesTeam = true;
                     }};
                 }};
@@ -359,20 +406,19 @@ public class UnitTypes implements ContentList{
 
         quasar = new UnitType("quasar"){{
             mineTier = 3;
-            hitSize = 12f;
             boostMultiplier = 2f;
-            health = 650f;
-            buildSpeed = 1.7f;
+            health = 640f;
+            buildSpeed = 1.1f;
             canBoost = true;
             armor = 9f;
-            landShake = 2f;
+            mechLandShake = 2f;
+            riseSpeed = 0.05f;
 
-            commandLimit = 10;
             mechFrontSway = 0.55f;
-            ammoType = AmmoTypes.power;
+            ammoType = new PowerAmmoType(1500);
 
             speed = 0.4f;
-            hitSize = 10f;
+            hitSize = 13f;
 
             mineSpeed = 6f;
             drawShields = false;
@@ -384,7 +430,7 @@ public class UnitTypes implements ContentList{
                 shake = 2f;
                 shootY = 4f;
                 x = 6.5f;
-                reload = 50f;
+                reload = 55f;
                 recoil = 4f;
                 shootSound = Sounds.laser;
 
@@ -396,46 +442,50 @@ public class UnitTypes implements ContentList{
                     sideLength = 70f;
                     healPercent = 10f;
                     collidesTeam = true;
+                    length = 135f;
                     colors = new Color[]{Pal.heal.cpy().a(0.4f), Pal.heal, Color.white};
                 }};
             }});
         }};
 
         vela = new UnitType("vela"){{
-            hitSize = 23f;
+            hitSize = 24f;
 
-            rotateSpeed = 1.6f;
-            canDrown = false;
+            rotateSpeed = 1.8f;
             mechFrontSway = 1f;
+            buildSpeed = 3f;
 
             mechStepParticles = true;
-            mechStepShake = 0.15f;
-            ammoType = AmmoTypes.powerHigh;
+            stepShake = 0.15f;
+            ammoType = new PowerAmmoType(2500);
+            drownTimeMultiplier = 4f;
 
-            speed = 0.35f;
-            boostMultiplier = 2.1f;
+            speed = 0.44f;
+            boostMultiplier = 2.4f;
             engineOffset = 12f;
             engineSize = 6f;
             lowAltitude = true;
+            riseSpeed = 0.02f;
 
-            health = 7000f;
-            armor = 7f;
+            health = 8200f;
+            armor = 9f;
             canBoost = true;
-            landShake = 4f;
+            mechLandShake = 4f;
             immunities = ObjectSet.with(StatusEffects.burning);
 
-            commandLimit = 8;
+            singleTarget = true;
 
             weapons.add(new Weapon("vela-weapon"){{
                 mirror = false;
                 top = false;
                 shake = 4f;
-                shootY = 13f;
+                shootY = 14f;
                 x = y = 0f;
 
-                firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f;
+                shoot.firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f;
+                parentizeEffects = true;
 
-                reload = 160f;
+                reload = 155f;
                 recoil = 0f;
                 chargeSound = Sounds.lasercharge2;
                 shootSound = Sounds.beam;
@@ -443,8 +493,8 @@ public class UnitTypes implements ContentList{
                 cooldownTime = 200f;
 
                 bullet = new ContinuousLaserBulletType(){{
-                    damage = 23f;
-                    length = 160f;
+                    damage = 35f;
+                    length = 180f;
                     hitEffect = Fx.hitMeltHeal;
                     drawSize = 420f;
                     lifetime = 160f;
@@ -452,9 +502,9 @@ public class UnitTypes implements ContentList{
                     despawnEffect = Fx.smokeCloud;
                     smokeEffect = Fx.none;
 
-                    shootEffect = Fx.greenLaserChargeSmall;
+                    chargeEffect = Fx.greenLaserChargeSmall;
 
-                    incendChance = 0.075f;
+                    incendChance = 0.1f;
                     incendSpread = 5f;
                     incendAmount = 1;
 
@@ -466,35 +516,42 @@ public class UnitTypes implements ContentList{
                 }};
 
                 shootStatus = StatusEffects.slow;
-                shootStatusDuration = bullet.lifetime + firstShotDelay;
+                shootStatusDuration = bullet.lifetime + shoot.firstShotDelay;
+            }});
+
+            weapons.add(new RepairBeamWeapon("repair-beam-weapon-center-large"){{
+                x = 44 / 4f;
+                y = -30f / 4f;
+                shootY = 6f;
+                beamWidth = 0.8f;
+                repairSpeed = 1.4f;
+
+                bullet = new BulletType(){{
+                    maxRange = 120f;
+                }};
             }});
         }};
 
         corvus = new UnitType("corvus"){{
-            mineTier = 1;
             hitSize = 29f;
             health = 18000f;
             armor = 9f;
-            landShake = 1.5f;
+            stepShake = 1.5f;
             rotateSpeed = 1.5f;
-
-            commandLimit = 8;
+            drownTimeMultiplier = 6f;
 
             legCount = 4;
             legLength = 14f;
             legBaseOffset = 11f;
             legMoveSpace = 1.5f;
-            legTrns = 0.58f;
+            legForwardScl = 0.58f;
             hovering = true;
-            visualElevation = 0.2f;
-            allowLegStep = true;
-            ammoType = AmmoTypes.powerHigh;
+            shadowElevation = 0.2f;
+            ammoType = new PowerAmmoType(4000);
             groundLayer = Layer.legUnit;
 
             speed = 0.3f;
 
-            mineTier = 2;
-            mineSpeed = 7f;
             drawShields = false;
 
             weapons.add(new Weapon("corvus-weapon"){{
@@ -513,7 +570,8 @@ public class UnitTypes implements ContentList{
 
                 shootStatusDuration = 60f * 2f;
                 shootStatus = StatusEffects.unmoving;
-                firstShotDelay = Fx.greenLaserCharge.lifetime;
+                shoot.firstShotDelay = Fx.greenLaserCharge.lifetime;
+                parentizeEffects = true;
 
                 bullet = new LaserBulletType(){{
                     length = 460f;
@@ -531,7 +589,7 @@ public class UnitTypes implements ContentList{
                     largeHit = true;
                     lightColor = lightningColor = Pal.heal;
 
-                    shootEffect = Fx.greenLaserCharge;
+                    chargeEffect = Fx.greenLaserCharge;
 
                     healPercent = 25f;
                     collidesTeam = true;
@@ -548,24 +606,33 @@ public class UnitTypes implements ContentList{
         //region ground legs
 
         crawler = new UnitType("crawler"){{
-            defaultController = SuicideAI::new;
+            aiController = SuicideAI::new;
 
             speed = 1f;
             hitSize = 8f;
-            health = 180;
+            health = 150;
             mechSideSway = 0.25f;
             range = 40f;
+            ammoType = new ItemAmmoType(Items.coal);
 
             weapons.add(new Weapon(){{
+                shootOnDeath = true;
+                targetUnderBlocks = false;
                 reload = 24f;
                 shootCone = 180f;
                 ejectEffect = Fx.none;
                 shootSound = Sounds.explosion;
-                bullet = new BombBulletType(0f, 0f, "clear"){{
+                x = shootY = 0f;
+                mirror = false;
+                bullet = new BulletType(){{
+                    collidesTiles = false;
+                    collides = false;
+                    hitSound = Sounds.explosion;
+
+                    rangeOverride = 25f;
                     hitEffect = Fx.pulverize;
-                    lifetime = 10f;
-                    speed = 1f;
-                    splashDamageRadius = 70f;
+                    speed = 0f;
+                    splashDamageRadius = 44f;
                     instantDisappear = true;
                     splashDamage = 80f;
                     killShooter = true;
@@ -576,9 +643,9 @@ public class UnitTypes implements ContentList{
         }};
 
         atrax = new UnitType("atrax"){{
-            speed = 0.5f;
+            speed = 0.6f;
             drag = 0.4f;
-            hitSize = 10f;
+            hitSize = 13f;
             rotateSpeed = 3f;
             targetAir = false;
             health = 600;
@@ -586,60 +653,56 @@ public class UnitTypes implements ContentList{
 
             legCount = 4;
             legLength = 9f;
-            legTrns = 0.6f;
+            legForwardScl = 0.6f;
             legMoveSpace = 1.4f;
             hovering = true;
             armor = 3f;
+            ammoType = new ItemAmmoType(Items.coal);
 
-            allowLegStep = true;
-            visualElevation = 0.2f;
+            shadowElevation = 0.2f;
             groundLayer = Layer.legUnit - 1f;
 
-            weapons.add(new Weapon("eruption"){{
+            weapons.add(new Weapon("atrax-weapon"){{
                 top = false;
                 shootY = 3f;
-                reload = 10f;
+                reload = 9f;
                 ejectEffect = Fx.none;
                 recoil = 1f;
                 x = 7f;
                 shootSound = Sounds.flame;
 
                 bullet = new LiquidBulletType(Liquids.slag){{
-                    damage = 11;
-                    speed = 2.3f;
-                    drag = 0.01f;
+                    damage = 13;
+                    speed = 2.5f;
+                    drag = 0.009f;
                     shootEffect = Fx.shootSmall;
-                    lifetime = 56f;
+                    lifetime = 57f;
                     collidesAir = false;
                 }};
             }});
         }};
 
         spiroct = new UnitType("spiroct"){{
-            speed = 0.4f;
+            speed = 0.54f;
             drag = 0.4f;
-            hitSize = 12f;
+            hitSize = 15f;
             rotateSpeed = 3f;
-            health = 900;
-            immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
+            health = 1000;
             legCount = 6;
             legLength = 13f;
-            legTrns = 0.8f;
+            legForwardScl = 0.8f;
             legMoveSpace = 1.4f;
             legBaseOffset = 2f;
             hovering = true;
             armor = 5f;
-            ammoType = AmmoTypes.power;
+            ammoType = new PowerAmmoType(1000);
 
-            buildSpeed = 0.75f;
-
-            allowLegStep = true;
-            visualElevation = 0.3f;
+            shadowElevation = 0.3f;
             groundLayer = Layer.legUnit;
 
             weapons.add(new Weapon("spiroct-weapon"){{
                 shootY = 4f;
-                reload = 15f;
+                reload = 14f;
                 ejectEffect = Fx.none;
                 recoil = 2f;
                 rotate = true;
@@ -649,9 +712,9 @@ public class UnitTypes implements ContentList{
                 y = -1.5f;
 
                 bullet = new SapBulletType(){{
-                    sapStrength = 0.4f;
+                    sapStrength = 0.5f;
                     length = 75f;
-                    damage = 20;
+                    damage = 23;
                     shootEffect = Fx.shootSmall;
                     hitColor = color = Color.valueOf("bf92f9");
                     despawnEffect = Fx.none;
@@ -662,7 +725,7 @@ public class UnitTypes implements ContentList{
             }});
 
             weapons.add(new Weapon("mount-purple-weapon"){{
-                reload = 20f;
+                reload = 18f;
                 rotate = true;
                 x = 4f;
                 y = 3f;
@@ -671,7 +734,7 @@ public class UnitTypes implements ContentList{
                 bullet = new SapBulletType(){{
                     sapStrength = 0.8f;
                     length = 40f;
-                    damage = 16;
+                    damage = 18;
                     shootEffect = Fx.shootSmall;
                     hitColor = color = Color.valueOf("bf92f9");
                     despawnEffect = Fx.none;
@@ -684,8 +747,8 @@ public class UnitTypes implements ContentList{
 
         arkyid = new UnitType("arkyid"){{
             drag = 0.1f;
-            speed = 0.5f;
-            hitSize = 21f;
+            speed = 0.62f;
+            hitSize = 23f;
             health = 8000;
             armor = 6f;
 
@@ -697,25 +760,24 @@ public class UnitTypes implements ContentList{
             legLength = 30f;
             legExtension = -15;
             legBaseOffset = 10f;
-            landShake = 1f;
+            stepShake = 1f;
             legLengthScl = 0.96f;
             rippleScale = 2f;
             legSpeed = 0.2f;
-            ammoType = AmmoTypes.power;
-            buildSpeed = 1f;
+            ammoType = new PowerAmmoType(2000);
 
             legSplashDamage = 32;
             legSplashRange = 30;
+            drownTimeMultiplier = 2f;
 
             hovering = true;
-            allowLegStep = true;
-            visualElevation = 0.65f;
+            shadowElevation = 0.65f;
             groundLayer = Layer.legUnit;
 
             BulletType sapper = new SapBulletType(){{
                 sapStrength = 0.85f;
                 length = 55f;
-                damage = 37;
+                damage = 40;
                 shootEffect = Fx.shootSmall;
                 hitColor = color = Color.valueOf("bf92f9");
                 despawnEffect = Fx.none;
@@ -734,7 +796,7 @@ public class UnitTypes implements ContentList{
                 shootSound = Sounds.sap;
             }},
             new Weapon("spiroct-weapon"){{
-                reload = 15f;
+                reload = 14f;
                 x = 9f;
                 y = 6f;
                 rotate = true;
@@ -742,7 +804,7 @@ public class UnitTypes implements ContentList{
                 shootSound = Sounds.sap;
             }},
             new Weapon("spiroct-weapon"){{
-                reload = 23f;
+                reload = 22f;
                 x = 14f;
                 y = 0f;
                 rotate = true;
@@ -769,7 +831,7 @@ public class UnitTypes implements ContentList{
                     width = height = 19f;
                     collidesTiles = true;
                     ammoMultiplier = 4f;
-                    splashDamageRadius = 95f;
+                    splashDamageRadius = 70f;
                     splashDamage = 65f;
                     backColor = Pal.sapBulletBack;
                     frontColor = lightningColor = Pal.sapBullet;
@@ -787,11 +849,13 @@ public class UnitTypes implements ContentList{
         toxopid = new UnitType("toxopid"){{
             drag = 0.1f;
             speed = 0.5f;
-            hitSize = 21f;
+            hitSize = 26f;
             health = 22000;
             armor = 13f;
+            lightRadius = 140f;
 
             rotateSpeed = 1.9f;
+            drownTimeMultiplier = 3f;
 
             legCount = 8;
             legMoveSpace = 0.8f;
@@ -799,20 +863,17 @@ public class UnitTypes implements ContentList{
             legLength = 75f;
             legExtension = -20;
             legBaseOffset = 8f;
-            landShake = 1f;
-            legSpeed = 0.1f;
+            stepShake = 1f;
             legLengthScl = 0.93f;
             rippleScale = 3f;
             legSpeed = 0.19f;
-            ammoType = AmmoTypes.powerHigh;
-            buildSpeed = 1f;
+            ammoType = new ItemAmmoType(Items.graphite, 8);
 
             legSplashDamage = 80;
             legSplashRange = 60;
 
             hovering = true;
-            allowLegStep = true;
-            visualElevation = 0.95f;
+            shadowElevation = 0.95f;
             groundLayer = Layer.legUnit;
 
             weapons.add(
@@ -828,8 +889,8 @@ public class UnitTypes implements ContentList{
                 rotate = true;
                 shadow = 12f;
                 recoil = 3f;
-                shots = 2;
-                spacing = 17f;
+
+                shoot = new ShootSpread(2, 17f);
 
                 bullet = new ShrapnelBulletType(){{
                     length = 90f;
@@ -860,6 +921,8 @@ public class UnitTypes implements ContentList{
                 rotate = true;
                 shadow = 30f;
 
+                rotationLimit = 80f;
+
                 bullet = new ArtilleryBulletType(3f, 50){{
                     hitEffect = Fx.sapExplosion;
                     knockback = 0.8f;
@@ -867,7 +930,7 @@ public class UnitTypes implements ContentList{
                     width = height = 25f;
                     collidesTiles = collides = true;
                     ammoMultiplier = 4f;
-                    splashDamageRadius = 90f;
+                    splashDamageRadius = 80f;
                     splashDamage = 75f;
                     backColor = Pal.sapBulletBack;
                     frontColor = lightningColor = Pal.sapBullet;
@@ -875,6 +938,9 @@ public class UnitTypes implements ContentList{
                     lightningLength = 20;
                     smokeEffect = Fx.shootBigSmoke2;
                     hitShake = 10f;
+                    lightRadius = 40f;
+                    lightColor = Pal.sap;
+                    lightOpacity = 0.6f;
 
                     status = StatusEffects.sapped;
                     statusDuration = 60f * 10;
@@ -888,7 +954,7 @@ public class UnitTypes implements ContentList{
                         lifetime = 90f;
                         width = height = 20f;
                         collidesTiles = false;
-                        splashDamageRadius = 80f;
+                        splashDamageRadius = 70f;
                         splashDamage = 40f;
                         backColor = Pal.sapBulletBack;
                         frontColor = lightningColor = Pal.sapBullet;
@@ -896,6 +962,9 @@ public class UnitTypes implements ContentList{
                         lightningLength = 5;
                         smokeEffect = Fx.shootBigSmoke2;
                         hitShake = 5f;
+                        lightRadius = 30f;
+                        lightColor = Pal.sap;
+                        lightOpacity = 0.5f;
 
                         status = StatusEffects.sapped;
                         statusDuration = 60f * 10;
@@ -908,21 +977,22 @@ public class UnitTypes implements ContentList{
         //region air attack
 
         flare = new UnitType("flare"){{
-            speed = 3f;
+            speed = 2.7f;
             accel = 0.08f;
-            drag = 0.01f;
+            drag = 0.04f;
             flying = true;
-            health = 75;
-            engineOffset = 5.5f;
-            range = 140f;
-            targetAir = false;
-            commandLimit = 4;
-            circleTarget = true;
+            health = 70;
+            engineOffset = 5.75f;
+            //TODO balance
+            //targetAir = false;
+            targetFlags = new BlockFlag[]{BlockFlag.generator, null};
+            hitSize = 9;
+            itemCapacity = 10;
 
             weapons.add(new Weapon(){{
                 y = 0f;
                 x = 2f;
-                reload = 13f;
+                reload = 20f;
                 ejectEffect = Fx.casing1;
                 bullet = new BasicBulletType(2.5f, 9){{
                     width = 7f;
@@ -938,19 +1008,20 @@ public class UnitTypes implements ContentList{
 
         horizon = new UnitType("horizon"){{
             health = 340;
-            speed = 1.7f;
+            speed = 1.65f;
             accel = 0.08f;
             drag = 0.016f;
             flying = true;
-            hitSize = 9f;
+            hitSize = 11f;
             targetAir = false;
             engineOffset = 7.8f;
             range = 140f;
             faceTarget = false;
             armor = 3f;
-            targetFlag = BlockFlag.factory;
-            commandLimit = 5;
+            itemCapacity = 0;
+            targetFlags = new BlockFlag[]{BlockFlag.factory, null};
             circleTarget = true;
+            ammoType = new ItemAmmoType(Items.graphite);
 
             weapons.add(new Weapon(){{
                 minShootVelocity = 0.75f;
@@ -971,30 +1042,34 @@ public class UnitTypes implements ContentList{
 
                     status = StatusEffects.blasted;
                     statusDuration = 60f;
+                    damage = splashDamage * 0.5f;
                 }};
             }});
         }};
 
         zenith = new UnitType("zenith"){{
             health = 700;
-            speed = 1.8f;
+            speed = 1.7f;
             accel = 0.04f;
             drag = 0.016f;
             flying = true;
             range = 140f;
             hitSize = 20f;
             lowAltitude = true;
+            forceMultiTarget = true;
             armor = 5f;
 
+            targetFlags = new BlockFlag[]{BlockFlag.launchPad, BlockFlag.storage, BlockFlag.battery, null};
             engineOffset = 12f;
             engineSize = 3f;
+            ammoType = new ItemAmmoType(Items.graphite);
 
             weapons.add(new Weapon("zenith-missiles"){{
                 reload = 40f;
                 x = 7f;
                 rotate = true;
                 shake = 1f;
-                shots = 2;
+                shoot.shots = 2;
                 inaccuracy = 5f;
                 velocityRnd = 0.2f;
                 shootSound = Sounds.missile;
@@ -1007,8 +1082,8 @@ public class UnitTypes implements ContentList{
                     homingRange = 60f;
                     keepVelocity = false;
                     splashDamageRadius = 25f;
-                    splashDamage = 16f;
-                    lifetime = 60f;
+                    splashDamage = 15f;
+                    lifetime = 50f;
                     trailColor = Pal.unitBack;
                     backColor = Pal.unitBack;
                     frontColor = Pal.unitFront;
@@ -1027,20 +1102,21 @@ public class UnitTypes implements ContentList{
             rotateSpeed = 1.9f;
             flying = true;
             lowAltitude = true;
-            health = 7000;
+            health = 7200;
             armor = 9f;
             engineOffset = 21;
             engineSize = 5.3f;
-            hitSize = 56f;
-            targetFlag = BlockFlag.battery;
+            hitSize = 46f;
+            targetFlags = new BlockFlag[]{BlockFlag.generator, BlockFlag.core, null};
+            ammoType = new ItemAmmoType(Items.thorium);
 
-            BulletType missiles = new MissileBulletType(2.7f, 10){{
+            BulletType missiles = new MissileBulletType(2.7f, 18){{
                 width = 8f;
                 height = 8f;
                 shrinkY = 0f;
                 drag = -0.01f;
                 splashDamageRadius = 20f;
-                splashDamage = 30f;
+                splashDamage = 37f;
                 ammoMultiplier = 4f;
                 lifetime = 50f;
                 hitEffect = Fx.blastExplosion;
@@ -1084,7 +1160,7 @@ public class UnitTypes implements ContentList{
                 shootSound = Sounds.shootBig;
                 rotate = true;
                 shadow = 8f;
-                bullet = new BasicBulletType(7f, 50){{
+                bullet = new BasicBulletType(7f, 55){{
                     width = 12f;
                     height = 18f;
                     lifetime = 25f;
@@ -1095,27 +1171,27 @@ public class UnitTypes implements ContentList{
         }};
 
         eclipse = new UnitType("eclipse"){{
-            speed = 0.52f;
+            speed = 0.54f;
             accel = 0.04f;
             drag = 0.04f;
             rotateSpeed = 1f;
             flying = true;
             lowAltitude = true;
-            health = 20000;
+            health = 22000;
             engineOffset = 38;
             engineSize = 7.3f;
             hitSize = 58f;
-            destructibleWreck = false;
             armor = 13f;
-            targetFlag = BlockFlag.reactor;
+            targetFlags = new BlockFlag[]{BlockFlag.reactor, BlockFlag.battery, BlockFlag.core, null};
+            ammoType = new ItemAmmoType(Items.thorium);
 
-            BulletType fragBullet = new FlakBulletType(4f, 5){{
+            BulletType fragBullet = new FlakBulletType(4f, 15){{
                 shootEffect = Fx.shootBig;
                 ammoMultiplier = 4f;
-                splashDamage = 42f;
+                splashDamage = 65f;
                 splashDamageRadius = 25f;
                 collidesGround = true;
-                lifetime = 38f;
+                lifetime = 47f;
 
                 status = StatusEffects.blasted;
                 statusDuration = 60f;
@@ -1135,12 +1211,12 @@ public class UnitTypes implements ContentList{
                 rotate = true;
 
                 bullet = new LaserBulletType(){{
-                    damage = 90f;
+                    damage = 115f;
                     sideAngle = 20f;
                     sideWidth = 1.5f;
                     sideLength = 80f;
                     width = 25f;
-                    length = 200f;
+                    length = 230f;
                     shootEffect = Fx.shockwave;
                     colors = new Color[]{Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
                 }};
@@ -1154,7 +1230,7 @@ public class UnitTypes implements ContentList{
                 shadow = 7f;
                 rotate = true;
                 recoil = 0.5f;
-
+                shootY = 7.25f;
                 bullet = fragBullet;
             }},
             new Weapon("large-artillery"){{
@@ -1167,6 +1243,7 @@ public class UnitTypes implements ContentList{
                 shootSound = Sounds.shoot;
                 rotate = true;
                 shadow = 12f;
+                shootY = 7.25f;
                 bullet = fragBullet;
             }});
         }};
@@ -1175,7 +1252,11 @@ public class UnitTypes implements ContentList{
         //region air support
 
         mono = new UnitType("mono"){{
-            defaultController = MinerAI::new;
+            //there's no reason to command monos anywhere. it's just annoying.
+            controller = u -> new MinerAI();
+
+            defaultCommand = UnitCommand.mineCommand;
+            allowChangeCommands = false;
 
             flying = true;
             drag = 0.06f;
@@ -1185,16 +1266,16 @@ public class UnitTypes implements ContentList{
             engineSize = 1.8f;
             engineOffset = 5.7f;
             range = 50f;
-            isCounted = false;
+            isEnemy = false;
 
-            ammoType = AmmoTypes.powerLow;
+            ammoType = new PowerAmmoType(500);
 
             mineTier = 1;
             mineSpeed = 2.5f;
         }};
 
         poly = new UnitType("poly"){{
-            defaultController = BuilderAI::new;
+            defaultCommand = UnitCommand.rebuildCommand;
 
             flying = true;
             drag = 0.05f;
@@ -1205,25 +1286,23 @@ public class UnitTypes implements ContentList{
             health = 400;
             buildSpeed = 0.5f;
             engineOffset = 6.5f;
-            hitSize = 8f;
+            hitSize = 9f;
             lowAltitude = true;
 
-            ammoType = AmmoTypes.power;
-
+            ammoType = new PowerAmmoType(900);
             mineTier = 2;
             mineSpeed = 3.5f;
 
-            abilities.add(new RepairFieldAbility(5f, 60f * 5, 50f));
+            abilities.add(new RepairFieldAbility(5f, 60f * 8, 50f));
 
-            weapons.add(new Weapon("heal-weapon-mount"){{
+            weapons.add(new Weapon("poly-weapon"){{
                 top = false;
                 y = -2.5f;
-                x = 3.5f;
+                x = 3.75f;
                 reload = 30f;
                 ejectEffect = Fx.none;
                 recoil = 2f;
                 shootSound = Sounds.missile;
-                shots = 1;
                 velocityRnd = 0.5f;
                 inaccuracy = 15f;
                 alternate = true;
@@ -1232,7 +1311,7 @@ public class UnitTypes implements ContentList{
                     homingPower = 0.08f;
                     weaveMag = 4;
                     weaveScale = 4;
-                    lifetime = 56f;
+                    lifetime = 50f;
                     keepVelocity = false;
                     shootEffect = Fx.shootHeal;
                     smokeEffect = Fx.hitLaser;
@@ -1242,6 +1321,7 @@ public class UnitTypes implements ContentList{
 
                     healPercent = 5.5f;
                     collidesTeam = true;
+                    reflectable = false;
                     backColor = Pal.heal;
                     trailColor = Pal.heal;
                 }};
@@ -1249,7 +1329,7 @@ public class UnitTypes implements ContentList{
         }};
 
         mega = new UnitType("mega"){{
-            defaultController = RepairAI::new;
+            defaultCommand = UnitCommand.repairCommand;
 
             mineTier = 3;
             mineSpeed = 4f;
@@ -1261,19 +1341,19 @@ public class UnitTypes implements ContentList{
             lowAltitude = true;
             flying = true;
             engineOffset = 10.5f;
-            rotateShooting = false;
-            hitSize = 15f;
+            faceTarget = false;
+            hitSize = 16.05f;
             engineSize = 3f;
             payloadCapacity = (2 * 2) * tilePayload;
             buildSpeed = 2.6f;
-            isCounted = false;
+            isEnemy = false;
 
-            ammoType = AmmoTypes.power;
+            ammoType = new PowerAmmoType(1100);
 
             weapons.add(
             new Weapon("heal-weapon-mount"){{
                 shootSound = Sounds.lasershoot;
-                reload = 25f;
+                reload = 24f;
                 x = 8f;
                 y = -6f;
                 rotate = true;
@@ -1304,25 +1384,25 @@ public class UnitTypes implements ContentList{
         quad = new UnitType("quad"){{
             armor = 8f;
             health = 6000;
-            speed = 1.4f;
+            speed = 1.2f;
             rotateSpeed = 2f;
             accel = 0.05f;
             drag = 0.017f;
             lowAltitude = false;
             flying = true;
             circleTarget = true;
-            engineOffset = 12f;
-            engineSize = 6f;
-            rotateShooting = false;
-            hitSize = 32f;
+            engineOffset = 13f;
+            engineSize = 7f;
+            faceTarget = false;
+            hitSize = 36f;
             payloadCapacity = (3 * 3) * tilePayload;
             buildSpeed = 2.5f;
             buildBeamOffset = 23;
             range = 140f;
             targetAir = false;
-            targetFlag = BlockFlag.battery;
+            targetFlags = new BlockFlag[]{BlockFlag.battery, BlockFlag.factory, null};
 
-            ammoType = AmmoTypes.powerHigh;
+            ammoType = new PowerAmmoType(3000);
 
             weapons.add(
             new Weapon(){{
@@ -1349,7 +1429,7 @@ public class UnitTypes implements ContentList{
 
                     shootCone = 180f;
                     ejectEffect = Fx.none;
-                    despawnShake = 4f;
+                    hitShake = 4f;
 
                     collidesAir = false;
 
@@ -1362,17 +1442,20 @@ public class UnitTypes implements ContentList{
 
                     shrinkX = shrinkY = 0.7f;
 
-                    speed = 0.001f;
+                    speed = 0f;
                     collides = false;
 
                     healPercent = 15f;
-                    splashDamage = 230f;
-                    splashDamageRadius = 120f;
+                    splashDamage = 220f;
+                    splashDamageRadius = 80f;
+                    damage = splashDamage * 0.7f;
                 }};
             }});
         }};
 
         oct = new UnitType("oct"){{
+            aiController = DefenderAI::new;
+
             armor = 16f;
             health = 24000;
             speed = 0.8f;
@@ -1382,19 +1465,16 @@ public class UnitTypes implements ContentList{
             flying = true;
             engineOffset = 46f;
             engineSize = 7.8f;
-            rotateShooting = false;
-            hitSize = 60f;
-            payloadCapacity = (5.3f * 5.3f) * tilePayload;
+            faceTarget = false;
+            hitSize = 66f;
+            payloadCapacity = (5.5f * 5.5f) * tilePayload;
             buildSpeed = 4f;
             drawShields = false;
-            commandLimit = 6;
             lowAltitude = true;
             buildBeamOffset = 43;
+            ammoCapacity = 1;
 
-            ammoCapacity = 1300;
-            ammoResupplyAmount = 20;
-
-            abilities.add(new ForceFieldAbility(140f, 4f, 7000f, 60f * 8), new RepairFieldAbility(130f, 60f * 2, 140f));
+            abilities.add(new ForceFieldAbility(140f, 4f, 7000f, 60f * 8, 8, 0f), new RepairFieldAbility(130f, 60f * 2, 140f));
         }};
 
         //endregion
@@ -1403,28 +1483,32 @@ public class UnitTypes implements ContentList{
         risso = new UnitType("risso"){{
             speed = 1.1f;
             drag = 0.13f;
-            hitSize = 9f;
+            hitSize = 10f;
             health = 280;
             accel = 0.4f;
             rotateSpeed = 3.3f;
-            trailLength = 20;
-            rotateShooting = false;
+            faceTarget = false;
 
             armor = 2f;
 
             weapons.add(new Weapon("mount-weapon"){{
-                reload = 12f;
+                reload = 13f;
                 x = 4f;
                 shootY = 4f;
                 y = 1.5f;
                 rotate = true;
                 ejectEffect = Fx.casing1;
-                bullet = Bullets.standardCopper;
+                bullet = new BasicBulletType(2.5f, 9){{
+                    width = 7f;
+                    height = 9f;
+                    lifetime = 60f;
+                    ammoMultiplier = 2;
+                }};
             }});
 
             weapons.add(new Weapon("missiles-mount"){{
                 mirror = false;
-                reload = 20f;
+                reload = 25f;
                 x = 0f;
                 y = -5f;
                 rotate = true;
@@ -1439,7 +1523,7 @@ public class UnitTypes implements ContentList{
                     homingRange = 60f;
                     splashDamageRadius = 25f;
                     splashDamage = 10f;
-                    lifetime = 80f;
+                    lifetime = 65f;
                     trailColor = Color.gray;
                     backColor = Pal.bulletYellowBack;
                     frontColor = Pal.bulletYellow;
@@ -1455,29 +1539,37 @@ public class UnitTypes implements ContentList{
             health = 600;
             speed = 0.9f;
             drag = 0.15f;
-            hitSize = 11f;
+            hitSize = 13f;
             armor = 4f;
             accel = 0.3f;
             rotateSpeed = 2.6f;
-            rotateShooting = false;
+            faceTarget = false;
+            ammoType = new ItemAmmoType(Items.graphite);
 
             trailLength = 20;
-            trailX = 5.5f;
-            trailY = -4f;
+            waveTrailX = 5.5f;
+            waveTrailY = -4f;
             trailScl = 1.9f;
 
-            abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 6, 60f * 6f, 60f));
-
             weapons.add(new Weapon("mount-weapon"){{
-                reload = 15f;
+                reload = 10f;
                 x = 5f;
                 y = 3.5f;
                 rotate = true;
                 rotateSpeed = 5f;
-                inaccuracy = 10f;
+                inaccuracy = 8f;
                 ejectEffect = Fx.casing1;
                 shootSound = Sounds.shoot;
-                bullet = Bullets.flakLead;
+                bullet = new FlakBulletType(4.2f, 3){{
+                    lifetime = 60f;
+                    ammoMultiplier = 4f;
+                    shootEffect = Fx.shootSmall;
+                    width = 6f;
+                    height = 8f;
+                    hitEffect = Fx.flakExplosion;
+                    splashDamage = 27f * 1.5f;
+                    splashDamageRadius = 15f;
+                }};
             }});
 
             weapons.add(new Weapon("artillery-mount"){{
@@ -1490,23 +1582,32 @@ public class UnitTypes implements ContentList{
                 shake = 1.5f;
                 ejectEffect = Fx.casing2;
                 shootSound = Sounds.bang;
-                bullet = Bullets.artilleryDense;
+                bullet = new ArtilleryBulletType(3f, 20, "shell"){{
+                    hitEffect = Fx.flakExplosion;
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 11f;
+                    collidesTiles = false;
+                    splashDamageRadius = 30f * 0.75f;
+                    splashDamage = 40f;
+                }};
             }});
         }};
 
         bryde = new UnitType("bryde"){{
-            health = 900;
+            health = 910;
             speed = 0.85f;
             accel = 0.2f;
             rotateSpeed = 1.8f;
             drag = 0.17f;
-            hitSize = 16f;
+            hitSize = 20f;
             armor = 7f;
-            rotateShooting = false;
+            faceTarget = false;
+            ammoType = new ItemAmmoType(Items.graphite);
 
             trailLength = 22;
-            trailX = 7f;
-            trailY = -9f;
+            waveTrailX = 7f;
+            waveTrailY = -9f;
             trailScl = 1.5f;
 
             abilities.add(new ShieldRegenFieldAbility(20f, 40f, 60f * 4, 60f));
@@ -1523,22 +1624,20 @@ public class UnitTypes implements ContentList{
                 recoil = 4f;
                 shadow = 12f;
 
-                shots = 1;
                 inaccuracy = 3f;
                 ejectEffect = Fx.casing3;
                 shootSound = Sounds.artillery;
 
-                bullet = new ArtilleryBulletType(3.2f, 12){{
+                bullet = new ArtilleryBulletType(3.2f, 15){{
                     trailMult = 0.8f;
                     hitEffect = Fx.massiveExplosion;
                     knockback = 1.5f;
-                    lifetime = 100f;
+                    lifetime = 84f;
                     height = 15.5f;
                     width = 15f;
                     collidesTiles = false;
-                    ammoMultiplier = 4f;
-                    splashDamageRadius = 60f;
-                    splashDamage = 80f;
+                    splashDamageRadius = 40f;
+                    splashDamage = 70f;
                     backColor = Pal.missileYellowBack;
                     frontColor = Pal.missileYellow;
                     trailEffect = Fx.artilleryTrail;
@@ -1561,11 +1660,13 @@ public class UnitTypes implements ContentList{
 
                 rotateSpeed = 4f;
                 rotate = true;
-                shots = 2;
-                shotDelay = 3f;
+                shoot.shots = 2;
+                shoot.shotDelay = 3f;
+
                 inaccuracy = 5f;
                 velocityRnd = 0.1f;
                 shootSound = Sounds.missile;
+                ammoType = new ItemAmmoType(Items.thorium);
 
                 ejectEffect = Fx.none;
                 bullet = new MissileBulletType(2.7f, 12){{
@@ -1577,7 +1678,7 @@ public class UnitTypes implements ContentList{
                     keepVelocity = false;
                     splashDamageRadius = 25f;
                     splashDamage = 10f;
-                    lifetime = 80f;
+                    lifetime = 70f;
                     trailColor = Color.gray;
                     backColor = Pal.bulletYellowBack;
                     frontColor = Pal.bulletYellow;
@@ -1590,7 +1691,7 @@ public class UnitTypes implements ContentList{
         }};
 
         sei = new UnitType("sei"){{
-            health = 10000;
+            health = 11000;
             armor = 12f;
 
             speed = 0.73f;
@@ -1598,11 +1699,12 @@ public class UnitTypes implements ContentList{
             hitSize = 39f;
             accel = 0.2f;
             rotateSpeed = 1.3f;
-            rotateShooting = false;
+            faceTarget = false;
+            ammoType = new ItemAmmoType(Items.thorium);
 
             trailLength = 50;
-            trailX = 18f;
-            trailY = -21f;
+            waveTrailX = 18f;
+            waveTrailY = -21f;
             trailScl = 3f;
 
             weapons.add(new Weapon("sei-launcher"){{
@@ -1615,18 +1717,21 @@ public class UnitTypes implements ContentList{
 
                 shadow = 20f;
 
-                shootY = 2f;
+                shootY = 4.5f;
                 recoil = 4f;
                 reload = 45f;
-                shots = 6;
-                spacing = 10f;
                 velocityRnd = 0.4f;
                 inaccuracy = 7f;
                 ejectEffect = Fx.none;
-                shake = 3f;
+                shake = 1f;
                 shootSound = Sounds.missile;
-                xRand = 8f;
-                shotDelay = 1f;
+
+                shoot = new ShootAlternate(){{
+                    shots = 6;
+                    shotDelay = 1.5f;
+                    spread = 4f;
+                    barrels = 3;
+                }};
 
                 bullet = new MissileBulletType(4.2f, 42){{
                     homingPower = 0.12f;
@@ -1663,8 +1768,9 @@ public class UnitTypes implements ContentList{
                 ejectEffect = Fx.casing3;
                 shootSound = Sounds.shootBig;
 
-                shots = 3;
-                shotDelay = 4f;
+                shoot.shots = 3;
+                shoot.shotDelay = 4f;
+
                 inaccuracy = 1f;
                 bullet = new BasicBulletType(7f, 57){{
                     width = 13f;
@@ -1679,19 +1785,20 @@ public class UnitTypes implements ContentList{
             health = 22000;
             speed = 0.62f;
             drag = 0.18f;
-            hitSize = 50f;
+            hitSize = 58f;
             armor = 16f;
             accel = 0.19f;
             rotateSpeed = 0.9f;
-            rotateShooting = false;
+            faceTarget = false;
+            ammoType = new PowerAmmoType(4000);
 
             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;
+            waveTrailX = 23f;
+            waveTrailY = -32f;
             trailScl = 3.5f;
 
             weapons.add(new Weapon("omura-cannon"){{
@@ -1708,15 +1815,14 @@ public class UnitTypes implements ContentList{
                 shadow = 50f;
                 shootSound = Sounds.railgun;
 
-                shots = 1;
                 ejectEffect = Fx.none;
 
                 bullet = new RailBulletType(){{
                     shootEffect = Fx.railShoot;
                     length = 500;
-                    updateEffectSeg = 60f;
+                    pointEffectSpace = 60f;
                     pierceEffect = Fx.railHit;
-                    updateEffect = Fx.railTrail;
+                    pointEffect = Fx.railTrail;
                     hitEffect = Fx.massiveExplosion;
                     smokeEffect = Fx.shootBig2;
                     damage = 1250;
@@ -1725,13 +1831,546 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        //endregion
+        //region naval support
+        retusa = new UnitType("retusa"){{
+            speed = 0.9f;
+            drag = 0.14f;
+            hitSize = 11f;
+            health = 270;
+            accel = 0.4f;
+            rotateSpeed = 5f;
+            trailLength = 20;
+            waveTrailX = 5f;
+            trailScl = 1.3f;
+            faceTarget = false;
+            range = 100f;
+            ammoType = new PowerAmmoType(900);
+            armor = 3f;
+
+            buildSpeed = 1.5f;
+            rotateToBuilding = false;
+
+            weapons.add(new RepairBeamWeapon("repair-beam-weapon-center"){{
+                x = 0f;
+                y = -5.5f;
+                shootY = 6f;
+                beamWidth = 0.8f;
+                mirror = false;
+                repairSpeed = 0.75f;
+
+                bullet = new BulletType(){{
+                    maxRange = 120f;
+                }};
+            }});
+
+            weapons.add(new Weapon("retusa-weapon"){{
+                shootSound = Sounds.lasershoot;
+                reload = 22f;
+                x = 4.5f;
+                y = -3.5f;
+                rotateSpeed = 5f;
+                mirror = true;
+                rotate = true;
+                bullet = new LaserBoltBulletType(5.2f, 12){{
+                    lifetime = 30f;
+                    healPercent = 5.5f;
+                    collidesTeam = true;
+                    backColor = Pal.heal;
+                    frontColor = Color.white;
+                }};
+            }});
+
+            weapons.add(new Weapon(){{
+                mirror = false;
+                rotate = true;
+                reload = 90f;
+                x = y = shootX = shootY = 0f;
+                shootSound = Sounds.mineDeploy;
+                rotateSpeed = 180f;
+                targetAir = false;
+
+                shoot.shots = 3;
+                shoot.shotDelay = 7f;
+
+                bullet = new BasicBulletType(){{
+                    sprite = "mine-bullet";
+                    width = height = 8f;
+                    layer = Layer.scorch;
+                    shootEffect = smokeEffect = Fx.none;
+
+                    maxRange = 50f;
+                    ignoreRotation = true;
+                    healPercent = 4f;
+
+                    backColor = Pal.heal;
+                    frontColor = Color.white;
+                    mixColorTo = Color.white;
+
+                    hitSound = Sounds.plasmaboom;
+
+                    ejectEffect = Fx.none;
+                    hitSize = 22f;
+
+                    collidesAir = false;
+
+                    lifetime = 87f;
+
+                    hitEffect = new MultiEffect(Fx.blastExplosion, Fx.greenCloud);
+                    keepVelocity = false;
+
+                    shrinkX = shrinkY = 0f;
+
+                    inaccuracy = 2f;
+                    weaveMag = 5f;
+                    weaveScale = 4f;
+                    speed = 0.7f;
+                    drag = -0.017f;
+                    homingPower = 0.05f;
+                    collideFloor = true;
+                    trailColor = Pal.heal;
+                    trailWidth = 3f;
+                    trailLength = 8;
+
+                    splashDamage = 40f;
+                    splashDamageRadius = 32f;
+                }};
+            }});
+        }};
+
+        oxynoe = new UnitType("oxynoe"){{
+            health = 560;
+            speed = 0.83f;
+            drag = 0.14f;
+            hitSize = 14f;
+            armor = 4f;
+            accel = 0.4f;
+            rotateSpeed = 4f;
+            faceTarget = false;
+
+            trailLength = 22;
+            waveTrailX = 5.5f;
+            waveTrailY = -4f;
+            trailScl = 1.9f;
+            ammoType = new ItemAmmoType(Items.coal);
+
+            abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 6, 60f * 6f, 60f));
+
+            buildSpeed = 2f;
+            rotateToBuilding = false;
+
+            weapons.add(new Weapon("plasma-mount-weapon"){{
+
+                reload = 5f;
+                x = 4.5f;
+                y = 6.5f;
+                rotate = true;
+                rotateSpeed = 5f;
+                inaccuracy = 10f;
+                ejectEffect = Fx.casing1;
+                shootSound = Sounds.flame;
+                shootCone = 30f;
+
+                bullet = new BulletType(3.4f, 23f){{
+                    healPercent = 1.5f;
+                    collidesTeam = true;
+                    ammoMultiplier = 3f;
+                    hitSize = 7f;
+                    lifetime = 18f;
+                    pierce = true;
+                    collidesAir = false;
+                    statusDuration = 60f * 4;
+                    hitEffect = Fx.hitFlamePlasma;
+                    ejectEffect = Fx.none;
+                    despawnEffect = Fx.none;
+                    status = StatusEffects.burning;
+                    keepVelocity = false;
+                    hittable = false;
+                    shootEffect = new Effect(32f, 80f, e -> {
+                        color(Color.white, Pal.heal, Color.gray, e.fin());
+
+                        randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> {
+                            Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f);
+                            Drawf.light(e.x + x, e.y + y, 16f * e.fout(), Pal.heal, 0.6f);
+                        });
+                    });
+                }};
+            }});
+
+            weapons.add(new PointDefenseWeapon("point-defense-mount"){{
+                mirror = false;
+                x = 0f;
+                y = 1f;
+                reload = 9f;
+                targetInterval = 10f;
+                targetSwitchInterval = 15f;
+
+                bullet = new BulletType(){{
+                    shootEffect = Fx.sparkShoot;
+                    hitEffect = Fx.pointHit;
+                    maxRange = 100f;
+                    damage = 17f;
+                }};
+            }});
+
+        }};
+
+        cyerce = new UnitType("cyerce"){{
+            health = 870;
+            speed = 0.86f;
+            accel = 0.22f;
+            rotateSpeed = 2.6f;
+            drag = 0.16f;
+            hitSize = 20f;
+            armor = 6f;
+            faceTarget = false;
+            ammoType = new ItemAmmoType(Items.graphite);
+
+            trailLength = 23;
+            waveTrailX = 9f;
+            waveTrailY = -9f;
+            trailScl = 2f;
+
+            buildSpeed = 2f;
+            rotateToBuilding = false;
+
+            weapons.add(new RepairBeamWeapon("repair-beam-weapon-center"){{
+                x = 11f;
+                y = -10f;
+                shootY = 6f;
+                beamWidth = 0.8f;
+                repairSpeed = 0.7f;
+
+                bullet = new BulletType(){{
+                    maxRange = 130f;
+                }};
+            }});
+
+            weapons.add(new Weapon("plasma-missile-mount"){{
+                reload = 60f;
+                x = 9f;
+                y = 3f;
+
+                shadow = 5f;
+
+                rotateSpeed = 4f;
+                rotate = true;
+                inaccuracy = 1f;
+                velocityRnd = 0.1f;
+                shootSound = Sounds.missile;
+
+                ejectEffect = Fx.none;
+                bullet = new FlakBulletType(2.5f, 25){{
+                    sprite = "missile-large";
+                    //for targeting
+                    collidesGround = collidesAir = true;
+                    explodeRange = 40f;
+                    width = height = 12f;
+                    shrinkY = 0f;
+                    drag = -0.003f;
+                    homingRange = 60f;
+                    keepVelocity = false;
+                    lightRadius = 60f;
+                    lightOpacity = 0.7f;
+                    lightColor = Pal.heal;
+
+                    splashDamageRadius = 30f;
+                    splashDamage = 25f;
+
+                    lifetime = 80f;
+                    backColor = Pal.heal;
+                    frontColor = Color.white;
+
+                    hitEffect = new ExplosionEffect(){{
+                        lifetime = 28f;
+                        waveStroke = 6f;
+                        waveLife = 10f;
+                        waveRadBase = 7f;
+                        waveColor = Pal.heal;
+                        waveRad = 30f;
+                        smokes = 6;
+                        smokeColor = Color.white;
+                        sparkColor = Pal.heal;
+                        sparks = 6;
+                        sparkRad = 35f;
+                        sparkStroke = 1.5f;
+                        sparkLen = 4f;
+                    }};
+
+                    weaveScale = 8f;
+                    weaveMag = 1f;
+
+                    trailColor = Pal.heal;
+                    trailWidth = 4.5f;
+                    trailLength = 29;
+
+                    fragBullets = 7;
+                    fragVelocityMin = 0.3f;
+
+                    fragBullet = new MissileBulletType(3.9f, 11){{
+                        homingPower = 0.2f;
+                        weaveMag = 4;
+                        weaveScale = 4;
+                        lifetime = 60f;
+                        keepVelocity = false;
+                        shootEffect = Fx.shootHeal;
+                        smokeEffect = Fx.hitLaser;
+                        splashDamage = 13f;
+                        splashDamageRadius = 20f;
+                        frontColor = Color.white;
+                        hitSound = Sounds.none;
+
+                        lightColor = Pal.heal;
+                        lightRadius = 40f;
+                        lightOpacity = 0.7f;
+
+                        trailColor = Pal.heal;
+                        trailWidth = 2.5f;
+                        trailLength = 20;
+                        trailChance = -1f;
+
+                        healPercent = 2.8f;
+                        collidesTeam = true;
+                        backColor = Pal.heal;
+
+                        despawnEffect = Fx.none;
+                        hitEffect = new ExplosionEffect(){{
+                            lifetime = 20f;
+                            waveStroke = 2f;
+                            waveColor = Pal.heal;
+                            waveRad = 12f;
+                            smokeSize = 0f;
+                            smokeSizeBase = 0f;
+                            sparkColor = Pal.heal;
+                            sparks = 9;
+                            sparkRad = 35f;
+                            sparkLen = 4f;
+                            sparkStroke = 1.5f;
+                        }};
+                    }};
+                }};
+            }});
+        }};
+
+        aegires = new UnitType("aegires"){{
+            health = 12000;
+            armor = 12f;
+
+            speed = 0.7f;
+            drag = 0.17f;
+            hitSize = 44f;
+            accel = 0.2f;
+            rotateSpeed = 1.4f;
+            faceTarget = false;
+            ammoType = new PowerAmmoType(3500);
+            ammoCapacity = 40;
+
+            //clip size is massive due to energy field
+            clipSize = 250f;
+
+            trailLength = 50;
+            waveTrailX = 18f;
+            waveTrailY = -17f;
+            trailScl = 3.2f;
+
+            buildSpeed = 3f;
+            rotateToBuilding = false;
+
+            abilities.add(new EnergyFieldAbility(40f, 65f, 180f){{
+                statusDuration = 60f * 6f;
+                maxTargets = 25;
+                healPercent = 1.5f;
+                sameTypeHealMult = 0.5f;
+            }});
+
+            for(float mountY : new float[]{-18f, 14}){
+                weapons.add(new PointDefenseWeapon("point-defense-mount"){{
+                    x = 12.5f;
+                    y = mountY;
+                    reload = 4f;
+                    targetInterval = 8f;
+                    targetSwitchInterval = 8f;
+
+                    bullet = new BulletType(){{
+                        shootEffect = Fx.sparkShoot;
+                        hitEffect = Fx.pointHit;
+                        maxRange = 180f;
+                        damage = 30f;
+                    }};
+                }});
+            }
+        }};
+
+        navanax = new UnitType("navanax"){{
+            health = 20000;
+            speed = 0.65f;
+            drag = 0.17f;
+            hitSize = 58f;
+            armor = 16f;
+            accel = 0.2f;
+            rotateSpeed = 1.1f;
+            faceTarget = false;
+            ammoType = new PowerAmmoType(4500);
+
+            trailLength = 70;
+            waveTrailX = 23f;
+            waveTrailY = -32f;
+            trailScl = 3.5f;
+
+            buildSpeed = 3.5f;
+            rotateToBuilding = false;
+
+            for(float mountY : new float[]{-117/4f, 50/4f}){
+                for(float sign : Mathf.signs){
+                    weapons.add(new Weapon("plasma-laser-mount"){{
+                        shadow = 20f;
+                        controllable = false;
+                        autoTarget = true;
+                        mirror = false;
+                        shake = 3f;
+                        shootY = 7f;
+                        rotate = true;
+                        x = 84f/4f * sign;
+                        y = mountY;
+
+                        targetInterval = 20f;
+                        targetSwitchInterval = 35f;
+
+                        rotateSpeed = 3.5f;
+                        reload = 170f;
+                        recoil = 1f;
+                        shootSound = Sounds.beam;
+                        continuous = true;
+                        cooldownTime = reload;
+                        immunities.add(StatusEffects.burning);
+
+                        bullet = new ContinuousLaserBulletType(){{
+                            maxRange = 90f;
+                            damage = 27f;
+                            length = 95f;
+                            hitEffect = Fx.hitMeltHeal;
+                            drawSize = 200f;
+                            lifetime = 155f;
+                            shake = 1f;
+
+                            shootEffect = Fx.shootHeal;
+                            smokeEffect = Fx.none;
+                            width = 4f;
+                            largeHit = false;
+
+                            incendChance = 0.03f;
+                            incendSpread = 5f;
+                            incendAmount = 1;
+
+                            healPercent = 0.4f;
+                            collidesTeam = true;
+
+                            colors = new Color[]{Pal.heal.cpy().a(.2f), Pal.heal.cpy().a(.5f), Pal.heal.cpy().mul(1.2f), Color.white};
+                        }};
+                    }});
+                }
+            }
+            abilities.add(new SuppressionFieldAbility(){{
+                orbRadius = 5;
+                particleSize = 3;
+                y = -10f;
+                particles = 10;
+                color = particleColor = effectColor = Pal.heal;
+            }});
+            weapons.add(new Weapon("emp-cannon-mount"){{
+                rotate = true;
+
+                x = 70f/4f;
+                y = -26f/4f;
+
+                reload = 65f;
+                shake = 3f;
+                rotateSpeed = 2f;
+                shadow = 30f;
+                shootY = 7f;
+                recoil = 4f;
+                cooldownTime = reload - 10f;
+                //TODO better sound
+                shootSound = Sounds.laser;
+
+                bullet = new EmpBulletType(){{
+                    float rad = 100f;
+
+                    scaleLife = true;
+                    lightOpacity = 0.7f;
+                    unitDamageScl = 0.8f;
+                    healPercent = 20f;
+                    timeIncrease = 3f;
+                    timeDuration = 60f * 20f;
+                    powerDamageScl = 3f;
+                    damage = 60;
+                    hitColor = lightColor = Pal.heal;
+                    lightRadius = 70f;
+                    clipSize = 250f;
+                    shootEffect = Fx.hitEmpSpark;
+                    smokeEffect = Fx.shootBigSmoke2;
+                    lifetime = 60f;
+                    sprite = "circle-bullet";
+                    backColor = Pal.heal;
+                    frontColor = Color.white;
+                    width = height = 12f;
+                    shrinkY = 0f;
+                    speed = 5f;
+                    trailLength = 20;
+                    trailWidth = 6f;
+                    trailColor = Pal.heal;
+                    trailInterval = 3f;
+                    splashDamage = 70f;
+                    splashDamageRadius = rad;
+                    hitShake = 4f;
+                    trailRotation = true;
+                    status = StatusEffects.electrified;
+                    hitSound = Sounds.plasmaboom;
+
+                    trailEffect = new Effect(16f, e -> {
+                        color(Pal.heal);
+                        for(int s : Mathf.signs){
+                            Drawf.tri(e.x, e.y, 4f, 30f * e.fslope(), e.rotation + 90f*s);
+                        }
+                    });
+
+                    hitEffect = new Effect(50f, 100f, e -> {
+                        e.scaled(7f, b -> {
+                            color(Pal.heal, b.fout());
+                            Fill.circle(e.x, e.y, rad);
+                        });
+
+                        color(Pal.heal);
+                        stroke(e.fout() * 3f);
+                        Lines.circle(e.x, e.y, rad);
+
+                        int points = 10;
+                        float offset = Mathf.randomSeed(e.id, 360f);
+                        for(int i = 0; i < points; i++){
+                            float angle = i* 360f / points + offset;
+                            //for(int s : Mathf.zeroOne){
+                                Drawf.tri(e.x + Angles.trnsx(angle, rad), e.y + Angles.trnsy(angle, rad), 6f, 50f * e.fout(), angle/* + s*180f*/);
+                            //}
+                        }
+
+                        Fill.circle(e.x, e.y, 12f * e.fout());
+                        color();
+                        Fill.circle(e.x, e.y, 6f * e.fout());
+                        Drawf.light(e.x, e.y, rad * 1.6f, Pal.heal, e.fout());
+                    });
+                }};
+            }});
+        }};
+
         //endregion
         //region core
 
         alpha = new UnitType("alpha"){{
-            defaultController = BuilderAI::new;
-            isCounted = false;
+            aiController = () -> new BuilderAI(true, 400f);
+            controller = u -> u.team.isAI() ? aiController.get() : new CommandAI();
+            isEnemy = false;
 
+            lowAltitude = true;
             flying = true;
             mineSpeed = 6.5f;
             mineTier = 1;
@@ -1740,11 +2379,11 @@ public class UnitTypes implements ContentList{
             speed = 3f;
             rotateSpeed = 15f;
             accel = 0.1f;
+            fogRadius = 0f;
             itemCapacity = 30;
             health = 150f;
             engineOffset = 6f;
             hitSize = 8f;
-            commandLimit = 3;
             alwaysUnlocked = true;
 
             weapons.add(new Weapon("small-basic-weapon"){{
@@ -1766,8 +2405,9 @@ public class UnitTypes implements ContentList{
         }};
 
         beta = new UnitType("beta"){{
-            defaultController = BuilderAI::new;
-            isCounted = false;
+            aiController = () -> new BuilderAI(true, 400f);
+            controller = u -> u.team.isAI() ? aiController.get() : new CommandAI();
+            isEnemy = false;
 
             flying = true;
             mineSpeed = 7f;
@@ -1777,13 +2417,13 @@ public class UnitTypes implements ContentList{
             speed = 3.3f;
             rotateSpeed = 17f;
             accel = 0.1f;
+            fogRadius = 0f;
             itemCapacity = 50;
             health = 170f;
             engineOffset = 6f;
             hitSize = 9f;
-            rotateShooting = false;
+            faceTarget = false;
             lowAltitude = true;
-            commandLimit = 4;
 
             weapons.add(new Weapon("small-mount-weapon"){{
                 top = false;
@@ -1791,9 +2431,8 @@ public class UnitTypes implements ContentList{
                 x = 3f;
                 y = 0.5f;
                 rotate = true;
-                shots = 2;
-                shotDelay = 4f;
-                spacing = 0f;
+                shoot.shots = 2;
+                shoot.shotDelay = 4f;
                 ejectEffect = Fx.casing1;
 
                 bullet = new BasicBulletType(3f, 11){{
@@ -1808,9 +2447,11 @@ public class UnitTypes implements ContentList{
         }};
 
         gamma = new UnitType("gamma"){{
-            defaultController = BuilderAI::new;
-            isCounted = false;
+            aiController = () -> new BuilderAI(true, 400f);
+            controller = u -> u.team.isAI() ? aiController.get() : new CommandAI();
+            isEnemy = false;
 
+            lowAltitude = true;
             flying = true;
             mineSpeed = 8f;
             mineTier = 2;
@@ -1819,21 +2460,24 @@ public class UnitTypes implements ContentList{
             speed = 3.55f;
             rotateSpeed = 19f;
             accel = 0.11f;
+            fogRadius = 0f;
             itemCapacity = 70;
             health = 220f;
             engineOffset = 6f;
             hitSize = 11f;
-            commandLimit = 5;
 
             weapons.add(new Weapon("small-mount-weapon"){{
                 top = false;
                 reload = 15f;
                 x = 1f;
                 y = 2f;
-                shots = 2;
-                spacing = 2f;
+                shoot = new ShootSpread(){{
+                    shots = 2;
+                    shotDelay = 3f;
+                    spread = 2f;
+                }};
+
                 inaccuracy = 3f;
-                shotDelay = 3f;
                 ejectEffect = Fx.casing1;
 
                 bullet = new BasicBulletType(3.5f, 11){{
@@ -1849,23 +2493,1874 @@ public class UnitTypes implements ContentList{
         }};
 
         //endregion
-        //region internal
+        //region erekir - tank
 
-        block = new UnitType("block"){
-            {
-                speed = 0f;
-                hitSize = 0f;
-                health = 1;
-                rotateSpeed = 360f;
-                itemCapacity = 0;
-                commandLimit = 0;
+        stell = new TankUnitType("stell"){{
+            hitSize = 12f;
+            treadPullOffset = 3;
+            speed = 0.75f;
+            rotateSpeed = 3.5f;
+            health = 850;
+            armor = 6f;
+            itemCapacity = 0;
+            treadRects = new Rect[]{new Rect(12 - 32f, 7 - 32f, 14, 51)};
+            researchCostMultiplier = 0f;
+
+            weapons.add(new Weapon("stell-weapon"){{
+                layerOffset = 0.0001f;
+                reload = 50f;
+                shootY = 4.5f;
+                recoil = 1f;
+                rotate = true;
+                rotateSpeed = 2.2f;
+                mirror = false;
+                x = 0f;
+                y = -0.75f;
+                heatColor = Color.valueOf("f9350f");
+                cooldownTime = 30f;
+
+                bullet = new BasicBulletType(4f, 40){{
+                    sprite = "missile-large";
+                    smokeEffect = Fx.shootBigSmoke;
+                    shootEffect = Fx.shootBigColor;
+                    width = 5f;
+                    height = 7f;
+                    lifetime = 40f;
+                    hitSize = 4f;
+                    hitColor = backColor = trailColor = Color.valueOf("feb380");
+                    frontColor = Color.white;
+                    trailWidth = 1.7f;
+                    trailLength = 5;
+                    despawnEffect = hitEffect = Fx.hitBulletColor;
+                }};
+            }});
+        }};
+
+        locus = new TankUnitType("locus"){{
+            hitSize = 18f;
+            treadPullOffset = 5;
+            speed = 0.7f;
+            rotateSpeed = 2.6f;
+            health = 2100;
+            armor = 8f;
+            itemCapacity = 0;
+            treadRects = new Rect[]{new Rect(17 - 96f/2f, 10 - 96f/2f, 19, 76)};
+            researchCostMultiplier = 0f;
+
+            weapons.add(new Weapon("locus-weapon"){{
+                shootSound = Sounds.bolt;
+                layerOffset = 0.0001f;
+                reload = 18f;
+                shootY = 10f;
+                recoil = 1f;
+                rotate = true;
+                rotateSpeed = 1.4f;
+                mirror = false;
+                shootCone = 2f;
+                x = 0f;
+                y = 0f;
+                heatColor = Color.valueOf("f9350f");
+                cooldownTime = 30f;
+
+                shoot = new ShootAlternate(3.5f);
+
+                bullet = new RailBulletType(){{
+                    length = 160f;
+                    damage = 48f;
+                    hitColor = Color.valueOf("feb380");
+                    hitEffect = endEffect = Fx.hitBulletColor;
+                    pierceDamageFactor = 0.8f;
+
+                    smokeEffect = Fx.colorSpark;
+
+                    endEffect = new Effect(14f, e -> {
+                        color(e.color);
+                        Drawf.tri(e.x, e.y, e.fout() * 1.5f, 5f, e.rotation);
+                    });
+
+                    shootEffect = new Effect(10, e -> {
+                        color(e.color);
+                        float w = 1.2f + 7 * e.fout();
+
+                        Drawf.tri(e.x, e.y, w, 30f * e.fout(), e.rotation);
+                        color(e.color);
+
+                        for(int i : Mathf.signs){
+                            Drawf.tri(e.x, e.y, w * 0.9f, 18f * e.fout(), e.rotation + i * 90f);
+                        }
+
+                        Drawf.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f);
+                    });
+
+                    lineEffect = new Effect(20f, e -> {
+                        if(!(e.data instanceof Vec2 v)) return;
+
+                        color(e.color);
+                        stroke(e.fout() * 0.9f + 0.6f);
+
+                        Fx.rand.setSeed(e.id);
+                        for(int i = 0; i < 7; i++){
+                            Fx.v.trns(e.rotation, Fx.rand.random(8f, v.dst(e.x, e.y) - 8f));
+                            Lines.lineAngleCenter(e.x + Fx.v.x, e.y + Fx.v.y, e.rotation + e.finpow(), e.foutpowdown() * 20f * Fx.rand.random(0.5f, 1f) + 0.3f);
+                        }
+
+                        e.scaled(14f, b -> {
+                            stroke(b.fout() * 1.5f);
+                            color(e.color);
+                            Lines.line(e.x, e.y, v.x, v.y);
+                        });
+                    });
+                }};
+            }});
+        }};
+
+        precept = new TankUnitType("precept"){{
+            hitSize = 26f;
+            treadPullOffset = 5;
+            speed = 0.64f;
+            rotateSpeed = 1.5f;
+            health = 5000;
+            armor = 11f;
+            itemCapacity = 0;
+            treadRects = new Rect[]{new Rect(16 - 60f, 48 - 70f, 30, 75), new Rect(44 - 60f, 17 - 70f, 17, 60)};
+            researchCostMultiplier = 0f;
+
+            weapons.add(new Weapon("precept-weapon"){{
+                shootSound = Sounds.dullExplosion;
+                layerOffset = 0.0001f;
+                reload = 80f;
+                shootY = 16f;
+                recoil = 3f;
+                rotate = true;
+                rotateSpeed = 1.3f;
+                mirror = false;
+                shootCone = 2f;
+                x = 0f;
+                y = -1f;
+                heatColor = Color.valueOf("f9350f");
+                cooldownTime = 30f;
+                bullet = new BasicBulletType(7f, 120){{
+                    sprite = "missile-large";
+                    width = 7.5f;
+                    height = 13f;
+                    lifetime = 28f;
+                    hitSize = 6f;
+                    pierceCap = 2;
+                    pierce = true;
+                    pierceBuilding = true;
+                    hitColor = backColor = trailColor = Color.valueOf("feb380");
+                    frontColor = Color.white;
+                    trailWidth = 2.8f;
+                    trailLength = 8;
+                    hitEffect = despawnEffect = Fx.blastExplosion;
+                    shootEffect = Fx.shootTitan;
+                    smokeEffect = Fx.shootSmokeTitan;
+                    splashDamageRadius = 20f;
+                    splashDamage = 50f;
+
+                    trailEffect = Fx.hitSquaresColor;
+                    trailRotation = true;
+                    trailInterval = 3f;
+
+                    fragBullets = 4;
+
+                    fragBullet = new BasicBulletType(5f, 35){{
+                        sprite = "missile-large";
+                        width = 5f;
+                        height = 7f;
+                        lifetime = 15f;
+                        hitSize = 4f;
+                        pierceCap = 3;
+                        pierce = true;
+                        pierceBuilding = true;
+                        hitColor = backColor = trailColor = Color.valueOf("feb380");
+                        frontColor = Color.white;
+                        trailWidth = 1.7f;
+                        trailLength = 3;
+                        drag = 0.01f;
+                        despawnEffect = hitEffect = Fx.hitBulletColor;
+                    }};
+                }};
+            }});
+        }};
+
+        vanquish = new TankUnitType("vanquish"){{
+            hitSize = 28f;
+            treadPullOffset = 4;
+            speed = 0.63f;
+            health = 11000;
+            armor = 20f;
+            itemCapacity = 0;
+            crushDamage = 13f / 5f;
+            treadRects = new Rect[]{new Rect(22 - 154f/2f, 16 - 154f/2f, 28, 130)};
+
+            weapons.add(new Weapon("vanquish-weapon"){{
+                shootSound = Sounds.mediumCannon;
+                layerOffset = 0.0001f;
+                reload = 70f;
+                shootY = 71f / 4f;
+                shake = 5f;
+                recoil = 4f;
+                rotate = true;
+                rotateSpeed = 1f;
+                mirror = false;
+                x = 0f;
+                y = 0;
+                shadow = 28f;
+                heatColor = Color.valueOf("f9350f");
+                cooldownTime = 80f;
+
+                bullet = new BasicBulletType(8f, 190){{
+                    sprite = "missile-large";
+                    width = 9.5f;
+                    height = 13f;
+                    lifetime = 18f;
+                    hitSize = 6f;
+                    shootEffect = Fx.shootTitan;
+                    smokeEffect = Fx.shootSmokeTitan;
+                    pierceCap = 2;
+                    pierce = true;
+                    pierceBuilding = true;
+                    hitColor = backColor = trailColor = Color.valueOf("feb380");
+                    frontColor = Color.white;
+                    trailWidth = 3.1f;
+                    trailLength = 8;
+                    hitEffect = despawnEffect = Fx.blastExplosion;
+                    splashDamageRadius = 20f;
+                    splashDamage = 50f;
+
+                    fragOnHit = false;
+                    fragRandomSpread = 0f;
+                    fragSpread = 10f;
+                    fragBullets = 5;
+                    fragVelocityMin = 1f;
+                    despawnSound = Sounds.dullExplosion;
+
+                    fragBullet = new BasicBulletType(8f, 35){{
+                        sprite = "missile-large";
+                        width = 8f;
+                        height = 12f;
+                        lifetime = 15f;
+                        hitSize = 4f;
+                        hitColor = backColor = trailColor = Color.valueOf("feb380");
+                        frontColor = Color.white;
+                        trailWidth = 2.8f;
+                        trailLength = 6;
+                        hitEffect = despawnEffect = Fx.blastExplosion;
+                        splashDamageRadius = 10f;
+                        splashDamage = 20f;
+                    }};
+                }};
+            }});
+
+            int i = 0;
+            for(float f : new float[]{34f / 4f, -36f / 4f}){
+                int fi = i ++;
+                weapons.add(new Weapon("vanquish-point-weapon"){{
+                    reload = 35f + fi * 5;
+                    x = 48f / 4f;
+                    y = f;
+                    shootY = 5.5f;
+                    recoil = 2f;
+                    rotate = true;
+                    rotateSpeed = 2f;
+
+                    bullet = new BasicBulletType(4.5f, 25){{
+                        width = 6.5f;
+                        height = 11f;
+                        shootEffect = Fx.sparkShoot;
+                        smokeEffect = Fx.shootBigSmoke;
+                        hitColor = backColor = trailColor = Color.valueOf("feb380");
+                        frontColor = Color.white;
+                        trailWidth = 1.5f;
+                        trailLength = 4;
+                        hitEffect = despawnEffect = Fx.hitBulletColor;
+                    }};
+                }});
+            }
+        }};
+
+        conquer = new TankUnitType("conquer"){{
+            hitSize = 46f;
+            treadPullOffset = 1;
+            speed = 0.48f;
+            health = 22000;
+            armor = 26f;
+            crushDamage = 25f / 5f;
+            rotateSpeed = 0.8f;
+
+            float xo = 231f/2f, yo = 231f/2f;
+            treadRects = new Rect[]{new Rect(27 - xo, 152 - yo, 56, 73), new Rect(24 - xo, 51 - 9 - yo, 29, 17), new Rect(59 - xo, 18 - 9 - yo, 39, 19)};
+
+            weapons.add(new Weapon("conquer-weapon"){{
+                shootSound = Sounds.largeCannon;
+                layerOffset = 0.1f;
+                reload = 100f;
+                shootY = 32.5f;
+                shake = 5f;
+                recoil = 5f;
+                rotate = true;
+                rotateSpeed = 0.6f;
+                mirror = false;
+                x = 0f;
+                y = -2f;
+                shadow = 50f;
+                heatColor = Color.valueOf("f9350f");
+                shootWarmupSpeed = 0.06f;
+                cooldownTime = 110f;
+                heatColor = Color.valueOf("f9350f");
+                minWarmup = 0.9f;
+
+                parts.addAll(
+                new RegionPart("-glow"){{
+                    color = Color.red;
+                    blending = Blending.additive;
+                    outline = mirror = false;
+                }},
+                new RegionPart("-sides"){{
+                    progress = PartProgress.warmup;
+                    mirror = true;
+                    under = true;
+                    moveX = 0.75f;
+                    moveY = 0.75f;
+                    moveRot = 82f;
+                    x = 37 / 4f;
+                    y = 8 / 4f;
+                }},
+                new RegionPart("-sinks"){{
+                    progress = PartProgress.warmup;
+                    mirror = true;
+                    under = true;
+                    heatColor = new Color(1f, 0.1f, 0.1f);
+                    moveX = 17f / 4f;
+                    moveY = -15f / 4f;
+                    x = 32 / 4f;
+                    y = -34 / 4f;
+                }},
+                new RegionPart("-sinks-heat"){{
+                    blending = Blending.additive;
+                    progress = PartProgress.warmup;
+                    mirror = true;
+                    outline = false;
+                    colorTo = new Color(1f, 0f, 0f, 0.5f);
+                    color = colorTo.cpy().a(0f);
+                    moveX = 17f / 4f;
+                    moveY = -15f / 4f;
+                    x = 32 / 4f;
+                    y = -34 / 4f;
+                }}
+                );
+
+                for(int i = 1; i <= 3; i++){
+                    int fi = i;
+                    parts.add(new RegionPart("-blade"){{
+                        progress = PartProgress.warmup.delay((3 - fi) * 0.3f).blend(PartProgress.reload, 0.3f);
+                        heatProgress = PartProgress.heat.add(0.3f).min(PartProgress.warmup);
+                        heatColor = new Color(1f, 0.1f, 0.1f);
+                        mirror = true;
+                        under = true;
+                        moveRot = -40f * fi;
+                        moveX = 3f;
+                        layerOffset = -0.002f;
+
+                        x = 11 / 4f;
+                    }});
+                }
+
+                bullet = new BasicBulletType(8f, 360f){{
+                    sprite = "missile-large";
+                    width = 12f;
+                    height = 20f;
+                    lifetime = 35f;
+                    hitSize = 6f;
+
+                    smokeEffect = Fx.shootSmokeTitan;
+                    pierceCap = 3;
+                    pierce = true;
+                    pierceBuilding = true;
+                    hitColor = backColor = trailColor = Color.valueOf("feb380");
+                    frontColor = Color.white;
+                    trailWidth = 4f;
+                    trailLength = 9;
+                    hitEffect = despawnEffect = Fx.massiveExplosion;
+
+                    shootEffect = new ExplosionEffect(){{
+                        lifetime = 40f;
+                        waveStroke = 4f;
+                        waveColor = sparkColor = trailColor;
+                        waveRad = 15f;
+                        smokeSize = 5f;
+                        smokes = 8;
+                        smokeSizeBase = 0f;
+                        smokeColor = trailColor;
+                        sparks = 8;
+                        sparkRad = 40f;
+                        sparkLen = 4f;
+                        sparkStroke = 3f;
+                    }};
+
+                    int count = 6;
+                    for(int j = 0; j < count; j++){
+                        int s = j;
+                        for(int i : Mathf.signs){
+                            float fin = 0.05f + (j + 1) / (float)count;
+                            float spd = speed;
+                            float life = lifetime / Mathf.lerp(fin, 1f, 0.5f);
+                            spawnBullets.add(new BasicBulletType(spd * fin, 60){{
+                                drag = 0.002f;
+                                width = 12f;
+                                height = 11f;
+                                lifetime = life + 5f;
+                                weaveRandom = false;
+                                hitSize = 5f;
+                                pierceCap = 2;
+                                pierce = true;
+                                pierceBuilding = true;
+                                hitColor = backColor = trailColor = Color.valueOf("feb380");
+                                frontColor = Color.white;
+                                trailWidth = 2.5f;
+                                trailLength = 7;
+                                weaveScale = (3f + s/2f) / 1.2f;
+                                weaveMag = i * (4f - fin * 2f);
+
+                                splashDamage = 65f;
+                                splashDamageRadius = 30f;
+                                despawnEffect = new ExplosionEffect(){{
+                                    lifetime = 50f;
+                                    waveStroke = 4f;
+                                    waveColor = sparkColor = trailColor;
+                                    waveRad = 30f;
+                                    smokeSize = 7f;
+                                    smokes = 6;
+                                    smokeSizeBase = 0f;
+                                    smokeColor = trailColor;
+                                    sparks = 5;
+                                    sparkRad = 30f;
+                                    sparkLen = 3f;
+                                    sparkStroke = 1.5f;
+                                }};
+                            }});
+                        }
+                    }
+                }};
+            }});
+
+            parts.add(new RegionPart("-glow"){{
+                color = Color.red;
+                blending = Blending.additive;
+                layer = -1f;
+                outline = false;
+            }});
+        }};
+
+        //endregion
+        //region erekir - mech
+
+        merui = new ErekirUnitType("merui"){{
+            speed = 0.72f;
+            drag = 0.11f;
+            hitSize = 9f;
+            rotateSpeed = 3f;
+            health = 680;
+            armor = 4f;
+            legStraightness = 0.3f;
+            stepShake = 0f;
+
+            legCount = 6;
+            legLength = 8f;
+            lockLegBase = true;
+            legContinuousMove = true;
+            legExtension = -2f;
+            legBaseOffset = 3f;
+            legMaxLength = 1.1f;
+            legMinLength = 0.2f;
+            legLengthScl = 0.96f;
+            legForwardScl = 1.1f;
+            legGroupSize = 3;
+            rippleScale = 0.2f;
+
+            legMoveSpace = 1f;
+            allowLegStep = true;
+            hovering = true;
+            legPhysicsLayer = false;
+
+            shadowElevation = 0.1f;
+            groundLayer = Layer.legUnit - 1f;
+            targetAir = false;
+            researchCostMultiplier = 0f;
+
+            weapons.add(new Weapon("merui-weapon"){{
+                shootSound = Sounds.missile;
+                mirror = false;
+                showStatSprite = false;
+                x = 0f;
+                y = 1f;
+                shootY = 4f;
+                reload = 60f;
+                cooldownTime = 42f;
+                heatColor = Pal.turretHeat;
+
+                bullet = new ArtilleryBulletType(3f, 40){{
+                    shootEffect = new MultiEffect(Fx.shootSmallColor, new Effect(9, e -> {
+                        color(Color.white, e.color, e.fin());
+                        stroke(0.7f + e.fout());
+                        Lines.square(e.x, e.y, e.fin() * 5f, e.rotation + 45f);
+
+                        Drawf.light(e.x, e.y, 23f, e.color, e.fout() * 0.7f);
+                    }));
+
+                    collidesTiles = true;
+                    backColor = hitColor = Pal.techBlue;
+                    frontColor = Color.white;
+
+                    knockback = 0.8f;
+                    lifetime = 50f;
+                    width = height = 9f;
+                    splashDamageRadius = 19f;
+                    splashDamage = 30f;
+
+                    trailLength = 27;
+                    trailWidth = 2.5f;
+                    trailEffect = Fx.none;
+                    trailColor = backColor;
+
+                    trailInterp = Interp.slope;
+
+                    shrinkX = 0.6f;
+                    shrinkY = 0.2f;
+
+                    hitEffect = despawnEffect = new MultiEffect(Fx.hitSquaresColor, new WaveEffect(){{
+                        colorFrom = colorTo = Pal.techBlue;
+                        sizeTo = splashDamageRadius + 2f;
+                        lifetime = 9f;
+                        strokeFrom = 2f;
+                    }});
+                }};
+            }});
+
+        }};
+
+        cleroi = new ErekirUnitType("cleroi"){{
+            speed = 0.7f;
+            drag = 0.1f;
+            hitSize = 14f;
+            rotateSpeed = 3f;
+            health = 1100;
+            armor = 5f;
+            stepShake = 0f;
+
+            legCount = 4;
+            legLength = 14f;
+            lockLegBase = true;
+            legContinuousMove = true;
+            legExtension = -3f;
+            legBaseOffset = 5f;
+            legMaxLength = 1.1f;
+            legMinLength = 0.2f;
+            legLengthScl = 0.95f;
+            legForwardScl = 0.7f;
+
+            legMoveSpace = 1f;
+            hovering = true;
+
+            shadowElevation = 0.2f;
+            groundLayer = Layer.legUnit - 1f;
+
+            for(int i = 0; i < 5; i++){
+                int fi = i;
+                parts.add(new RegionPart("-spine"){{
+                    y = 21f / 4f - 45f / 4f * fi / 4f;
+                    moveX = 21f / 4f + Mathf.slope(fi / 4f) * 1.25f;
+                    moveRot = 10f - fi * 14f;
+                    float fin = fi  / 4f;
+                    progress = PartProgress.reload.inv().mul(1.3f).add(0.1f).sustain(fin * 0.34f, 0.14f, 0.14f);
+                    layerOffset = -0.001f;
+                    mirror = true;
+                }});
             }
 
-            @Override
-            public boolean isHidden(){
-                return true;
+            weapons.add(new Weapon("cleroi-weapon"){{
+                shootSound = Sounds.blaster;
+                x = 14f / 4f;
+                y = 33f / 4f;
+                reload = 30f;
+                layerOffset = -0.002f;
+                alternate = false;
+                heatColor = Color.red;
+                cooldownTime = 25f;
+                smoothReloadSpeed = 0.15f;
+                recoil = 2f;
+
+                bullet = new BasicBulletType(3.5f, 30){{
+                    backColor = trailColor = hitColor = Pal.techBlue;
+                    frontColor = Color.white;
+                    width = 7.5f;
+                    height = 10f;
+                    lifetime = 40f;
+                    trailWidth = 2f;
+                    trailLength = 4;
+                    shake = 1f;
+
+                    trailEffect = Fx.missileTrail;
+                    trailParam = 1.8f;
+                    trailInterval = 6f;
+
+                    splashDamageRadius = 30f;
+                    splashDamage = 43f;
+
+                    hitEffect = despawnEffect = new MultiEffect(Fx.hitBulletColor, new WaveEffect(){{
+                        colorFrom = colorTo = Pal.techBlue;
+                        sizeTo = splashDamageRadius + 3f;
+                        lifetime = 9f;
+                        strokeFrom = 3f;
+                    }});
+
+                    shootEffect = new MultiEffect(Fx.shootBigColor, new Effect(9, e -> {
+                        color(Color.white, e.color, e.fin());
+                        stroke(0.7f + e.fout());
+                        Lines.square(e.x, e.y, e.fin() * 5f, e.rotation + 45f);
+
+                        Drawf.light(e.x, e.y, 23f, e.color, e.fout() * 0.7f);
+                    }));
+                    smokeEffect = Fx.shootSmokeSquare;
+                    ammoMultiplier = 2;
+                }};
+            }});
+
+            weapons.add(new PointDefenseWeapon("cleroi-point-defense"){{
+                x = 16f / 4f;
+                y = -20f / 4f;
+                reload = 9f;
+
+                targetInterval = 9f;
+                targetSwitchInterval = 12f;
+                recoil = 0.5f;
+
+                bullet = new BulletType(){{
+                    shootSound = Sounds.lasershoot;
+                    shootEffect = Fx.sparkShoot;
+                    hitEffect = Fx.pointHit;
+                    maxRange = 100f;
+                    damage = 38f;
+                }};
+            }});
+        }};
+
+        anthicus = new ErekirUnitType("anthicus"){{
+            speed = 0.65f;
+            drag = 0.1f;
+            hitSize = 21f;
+            rotateSpeed = 3f;
+            health = 2900;
+            armor = 7f;
+            fogRadius = 40f;
+            stepShake = 0f;
+
+            legCount = 6;
+            legLength = 18f;
+            legGroupSize = 3;
+            lockLegBase = true;
+            legContinuousMove = true;
+            legExtension = -3f;
+            legBaseOffset = 7f;
+            legMaxLength = 1.1f;
+            legMinLength = 0.2f;
+            legLengthScl = 0.95f;
+            legForwardScl = 0.9f;
+
+            legMoveSpace = 1f;
+            hovering = true;
+
+            shadowElevation = 0.2f;
+            groundLayer = Layer.legUnit - 1f;
+
+            for(int j = 0; j < 3; j++){
+                int i = j;
+                parts.add(new RegionPart("-blade"){{
+                    layerOffset = -0.01f;
+                    heatLayerOffset = 0.005f;
+                    x = 2f;
+                    moveX = 6f + i * 1.9f;
+                    moveY = 8f + -4f * i;
+                    moveRot = 40f - i * 25f;
+                    mirror = true;
+                    progress = PartProgress.warmup.delay(i * 0.2f);
+                    heatProgress = p -> Mathf.absin(Time.time + i * 14f, 7f, 1f);
+
+                    heatColor = Pal.techBlue;
+                }});
             }
-        };
+
+            weapons.add(new Weapon("anthicus-weapon"){{
+                shootSound = Sounds.missileLarge;
+                x = 29f / 4f;
+                y = -11f / 4f;
+                shootY = 1.5f;
+                showStatSprite = false;
+                reload = 130f;
+                layerOffset = 0.01f;
+                heatColor = Color.red;
+                cooldownTime = 60f;
+                smoothReloadSpeed = 0.15f;
+                shootWarmupSpeed = 0.05f;
+                minWarmup = 0.9f;
+                rotationLimit = 70f;
+                rotateSpeed = 2f;
+                inaccuracy = 20f;
+                shootStatus = StatusEffects.slow;
+                alwaysShootWhenMoving = true;
+
+                rotate = true;
+
+                shoot = new ShootPattern(){{
+                    shots = 2;
+                    shotDelay = 6f;
+                }};
+
+                parts.add(new RegionPart("-blade"){{
+                    mirror = true;
+                    moveRot = -25f;
+                    under = true;
+                    moves.add(new PartMove(PartProgress.reload, 1f, 0f, 0f));
+
+                    heatColor = Color.red;
+                    cooldownTime = 60f;
+                }});
+
+                parts.add(new RegionPart("-blade"){{
+                    mirror = true;
+                    moveRot = -50f;
+                    moveY = -2f;
+                    moves.add(new PartMove(PartProgress.reload.shorten(0.5f), 1f, 0f, -15f));
+                    under = true;
+
+                    heatColor = Color.red;
+                    cooldownTime = 60f;
+                }});
+
+                bullet = new BulletType(){{
+                    shootEffect = new MultiEffect(Fx.shootBigColor, new Effect(9, e -> {
+                        color(Color.white, e.color, e.fin());
+                        stroke(0.7f + e.fout());
+                        Lines.square(e.x, e.y, e.fin() * 5f, e.rotation + 45f);
+
+                        Drawf.light(e.x, e.y, 23f, e.color, e.fout() * 0.7f);
+                    }), new WaveEffect(){{
+                        colorFrom = colorTo = Pal.techBlue;
+                        sizeTo = 15f;
+                        lifetime = 12f;
+                        strokeFrom = 3f;
+                    }});
+
+                    smokeEffect = Fx.shootBigSmoke2;
+                    shake = 2f;
+                    speed = 0f;
+                    keepVelocity = false;
+                    inaccuracy = 2f;
+
+                    spawnUnit = new MissileUnitType("anthicus-missile"){{
+                        trailColor = engineColor = Pal.techBlue;
+                        engineSize = 1.75f;
+                        engineLayer = Layer.effect;
+                        speed = 3.7f;
+                        maxRange = 6f;
+                        lifetime = 60f * 1.5f;
+                        outlineColor = Pal.darkOutline;
+                        health = 55;
+                        lowAltitude = true;
+
+                        parts.add(new FlarePart(){{
+                            progress = PartProgress.life.slope().curve(Interp.pow2In);
+                            radius = 0f;
+                            radiusTo = 35f;
+                            stroke = 3f;
+                            rotation = 45f;
+                            y = -5f;
+                            followRotation = true;
+                        }});
+
+                        weapons.add(new Weapon(){{
+                            shootCone = 360f;
+                            mirror = false;
+                            reload = 1f;
+                            shootOnDeath = true;
+                            bullet = new ExplosionBulletType(140f, 25f){{
+                                shootEffect = new MultiEffect(Fx.massiveExplosion, new WrapEffect(Fx.dynamicSpikes, Pal.techBlue, 24f), new WaveEffect(){{
+                                    colorFrom = colorTo = Pal.techBlue;
+                                    sizeTo = 40f;
+                                    lifetime = 12f;
+                                    strokeFrom = 4f;
+                                }});
+                            }};
+                        }});
+                    }};
+                }};
+            }});
+        }};
+
+        tecta = new ErekirUnitType("tecta"){{
+            drag = 0.1f;
+            speed = 0.6f;
+            hitSize = 23f;
+            health = 7300;
+            armor = 5f;
+
+            lockLegBase = true;
+            legContinuousMove = true;
+            legGroupSize = 3;
+            legStraightness = 0.4f;
+            baseLegStraightness = 0.5f;
+            legMaxLength = 1.3f;
+            researchCostMultiplier = 0f;
+
+            abilities.add(new ShieldArcAbility(){{
+                region = "tecta-shield";
+                radius = 36f;
+                angle = 82f;
+                regen = 0.6f;
+                cooldown = 60f * 8f;
+                max = 2000f;
+                y = -20f;
+                width = 6f;
+                whenShooting = false;
+            }});
+
+            rotateSpeed = 2.1f;
+
+            legCount = 6;
+            legLength = 15f;
+            legForwardScl = 0.45f;
+            legMoveSpace = 1.4f;
+            rippleScale = 2f;
+            stepShake = 0.5f;
+            legExtension = -5f;
+            legBaseOffset = 5f;
+
+            ammoType = new PowerAmmoType(2000);
+
+            legSplashDamage = 32;
+            legSplashRange = 30;
+            drownTimeMultiplier = 2f;
+
+            hovering = true;
+            shadowElevation = 0.4f;
+            groundLayer = Layer.legUnit;
+
+            weapons.add(new Weapon("tecta-weapon"){{
+                shootSound = Sounds.malignShoot;
+                mirror = true;
+                top = false;
+
+                x = 62/4f;
+                y = 1f;
+                shootY = 47 / 4f;
+                recoil = 3f;
+                reload = 40f;
+                shake = 3f;
+                cooldownTime = 40f;
+
+                shoot.shots = 3;
+                inaccuracy = 3f;
+                velocityRnd = 0.33f;
+                heatColor = Color.red;
+
+                bullet = new MissileBulletType(4.2f, 60){{
+                    homingPower = 0.2f;
+                    weaveMag = 4;
+                    weaveScale = 4;
+                    lifetime = 55f;
+                    shootEffect = Fx.shootBig2;
+                    smokeEffect = Fx.shootSmokeTitan;
+                    splashDamage = 70f;
+                    splashDamageRadius = 30f;
+                    frontColor = Color.white;
+                    hitSound = Sounds.none;
+                    width = height = 10f;
+
+                    lightColor = trailColor = backColor = Pal.techBlue;
+                    lightRadius = 40f;
+                    lightOpacity = 0.7f;
+
+                    trailWidth = 2.8f;
+                    trailLength = 20;
+                    trailChance = -1f;
+                    despawnSound = Sounds.dullExplosion;
+
+                    despawnEffect = Fx.none;
+                    hitEffect = new ExplosionEffect(){{
+                        lifetime = 20f;
+                        waveStroke = 2f;
+                        waveColor = sparkColor = trailColor;
+                        waveRad = 12f;
+                        smokeSize = 0f;
+                        smokeSizeBase = 0f;
+                        sparks = 10;
+                        sparkRad = 35f;
+                        sparkLen = 4f;
+                        sparkStroke = 1.5f;
+                    }};
+                }};
+            }});
+        }};
+
+        collaris = new ErekirUnitType("collaris"){{
+            drag = 0.1f;
+            speed = 1.1f;
+            hitSize = 44f;
+            health = 18000;
+            armor = 9f;
+            rotateSpeed = 1.6f;
+            lockLegBase = true;
+            legContinuousMove = true;
+            legStraightness = 0.6f;
+            baseLegStraightness = 0.5f;
+
+            legCount = 8;
+            legLength = 30f;
+            legForwardScl = 2.1f;
+            legMoveSpace = 1.05f;
+            rippleScale = 1.2f;
+            stepShake = 0.5f;
+            legGroupSize = 2;
+            legExtension = -6f;
+            legBaseOffset = 19f;
+            legStraightLength = 0.9f;
+            legMaxLength = 1.2f;
+
+            ammoType = new PowerAmmoType(2000);
+
+            legSplashDamage = 32;
+            legSplashRange = 32;
+            drownTimeMultiplier = 2f;
+
+            hovering = true;
+            shadowElevation = 0.4f;
+            groundLayer = Layer.legUnit;
+
+            targetAir = false;
+            alwaysShootWhenMoving = true;
+
+            weapons.add(new Weapon("collaris-weapon"){{
+                shootSound = Sounds.pulseBlast;
+                mirror = true;
+                rotationLimit = 30f;
+                rotateSpeed = 0.4f;
+                rotate = true;
+
+                x = 48 / 4f;
+                y = -28f / 4f;
+                shootY = 64f / 4f;
+                recoil = 4f;
+                reload = 130f;
+                cooldownTime = reload * 1.2f;
+                shake = 7f;
+                layerOffset = 0.02f;
+                shadow = 10f;
+
+                shootStatus = StatusEffects.slow;
+                shootStatusDuration = reload + 1f;
+
+                shoot.shots = 1;
+                heatColor = Color.red;
+
+                for(int i = 0; i < 5; i++){
+                    int fi = i;
+                    parts.add(new RegionPart("-blade"){{
+                        under = true;
+                        layerOffset = -0.001f;
+                        heatColor = Pal.techBlue;
+                        heatProgress = PartProgress.heat.add(0.2f).min(PartProgress.warmup);
+                        progress = PartProgress.warmup.blend(PartProgress.reload, 0.1f);
+                        x = 13.5f / 4f;
+                        y = 10f / 4f - fi * 2f;
+                        moveY = 1f - fi * 1f;
+                        moveX = fi * 0.3f;
+                        moveRot = -45f - fi * 17f;
+
+                        moves.add(new PartMove(PartProgress.reload.inv().mul(1.8f).inv().curve(fi / 5f, 0.2f), 0f, 0f, 36f));
+                    }});
+                }
+
+                bullet = new ArtilleryBulletType(5.5f, 260){{
+                    collidesTiles = collides = true;
+                    lifetime = 70f;
+                    shootEffect = Fx.shootBigColor;
+                    smokeEffect = Fx.shootSmokeSquareBig;
+                    frontColor = Color.white;
+                    trailEffect = new MultiEffect(Fx.artilleryTrail, Fx.artilleryTrailSmoke);
+                    hitSound = Sounds.none;
+                    width = 18f;
+                    height = 24f;
+
+                    lightColor = trailColor = hitColor = backColor = Pal.techBlue;
+                    lightRadius = 40f;
+                    lightOpacity = 0.7f;
+
+                    trailWidth = 4.5f;
+                    trailLength = 19;
+                    trailChance = -1f;
+
+                    despawnEffect = Fx.none;
+                    despawnSound = Sounds.dullExplosion;
+
+                    hitEffect = despawnEffect = new ExplosionEffect(){{
+                        lifetime = 34f;
+                        waveStroke = 4f;
+                        waveColor = sparkColor = trailColor;
+                        waveRad = 25f;
+                        smokeSize = 0f;
+                        smokeSizeBase = 0f;
+                        sparks = 10;
+                        sparkRad = 25f;
+                        sparkLen = 8f;
+                        sparkStroke = 3f;
+                    }};
+
+                    splashDamage = 85f;
+                    splashDamageRadius = 20f;
+
+                    fragBullets = 15;
+                    fragVelocityMin = 0.5f;
+                    fragRandomSpread = 130f;
+                    fragLifeMin = 0.3f;
+                    despawnShake = 5f;
+
+                    fragBullet = new BasicBulletType(5.5f, 50){{
+                        pierceCap = 2;
+                        pierceBuilding = true;
+
+                        homingPower = 0.09f;
+                        homingRange = 150f;
+
+                        lifetime = 50f;
+                        shootEffect = Fx.shootBigColor;
+                        smokeEffect = Fx.shootSmokeSquareBig;
+                        frontColor = Color.white;
+                        hitSound = Sounds.none;
+                        width = 12f;
+                        height = 20f;
+
+                        lightColor = trailColor = hitColor = backColor = Pal.techBlue;
+                        lightRadius = 40f;
+                        lightOpacity = 0.7f;
+
+                        trailWidth = 2.2f;
+                        trailLength = 7;
+                        trailChance = -1f;
+
+                        collidesAir = false;
+
+                        despawnEffect = Fx.none;
+                        splashDamage = 46f;
+                        splashDamageRadius = 30f;
+
+                        hitEffect = despawnEffect = new MultiEffect(new ExplosionEffect(){{
+                            lifetime = 30f;
+                            waveStroke = 2f;
+                            waveColor = sparkColor = trailColor;
+                            waveRad = 5f;
+                            smokeSize = 0f;
+                            smokeSizeBase = 0f;
+                            sparks = 5;
+                            sparkRad = 20f;
+                            sparkLen = 6f;
+                            sparkStroke = 2f;
+                        }}, Fx.blastExplosion);
+                    }};
+                }};
+            }});
+        }};
+
+        //endregion
+        //region erekir - flying
+
+        elude = new ErekirUnitType("elude"){{
+            hovering = true;
+            shadowElevation = 0.1f;
+
+            drag = 0.07f;
+            speed = 1.8f;
+            rotateSpeed = 5f;
+
+            accel = 0.09f;
+            health = 600f;
+            armor = 1f;
+            hitSize = 11f;
+            engineOffset = 7f;
+            engineSize = 2f;
+            itemCapacity = 0;
+            useEngineElevation = false;
+            researchCostMultiplier = 0f;
+
+            abilities.add(new MoveEffectAbility(0f, -7f, Pal.sapBulletBack, Fx.missileTrailShort, 4f){{
+                teamColor = true;
+            }});
+
+            for(float f : new float[]{-3f, 3f}){
+                parts.add(new HoverPart(){{
+                    x = 3.9f;
+                    y = f;
+                    mirror = true;
+                    radius = 6f;
+                    phase = 90f;
+                    stroke = 2f;
+                    layerOffset = -0.001f;
+                    color = Color.valueOf("bf92f9");
+                }});
+            }
+
+            weapons.add(new Weapon("elude-weapon"){{
+                shootSound = Sounds.blaster;
+                y = -2f;
+                x = 4f;
+                top = true;
+                mirror = true;
+                reload = 40f;
+                baseRotation = -35f;
+                shootCone = 360f;
+
+                shoot = new ShootSpread(2, 11f);
+
+                bullet = new BasicBulletType(5f, 16){{
+                    homingPower = 0.19f;
+                    homingDelay = 4f;
+                    width = 7f;
+                    height = 12f;
+                    lifetime = 30f;
+                    shootEffect = Fx.sparkShoot;
+                    smokeEffect = Fx.shootBigSmoke;
+                    hitColor = backColor = trailColor = Pal.suppress;
+                    frontColor = Color.white;
+                    trailWidth = 1.5f;
+                    trailLength = 5;
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                }};
+            }});
+        }};
+
+        avert = new ErekirUnitType("avert"){{
+            lowAltitude = false;
+            flying = true;
+            drag = 0.08f;
+            speed = 2f;
+            rotateSpeed = 4f;
+            accel = 0.09f;
+            health = 1100f;
+            armor = 3f;
+            hitSize = 12f;
+            engineSize = 0;
+            fogRadius = 25;
+            itemCapacity = 0;
+
+            setEnginesMirror(
+            new UnitEngine(35 / 4f, -38 / 4f, 3f, 315f),
+            new UnitEngine(39 / 4f, -16 / 4f, 3f, 315f)
+            );
+
+            weapons.add(new Weapon("avert-weapon"){{
+                shootSound = Sounds.blaster;
+                reload = 35f;
+                x = 0f;
+                y = 6.5f;
+                shootY = 5f;
+                recoil = 1f;
+                top = false;
+                layerOffset = -0.01f;
+                rotate = false;
+                mirror = false;
+                shoot = new ShootHelix();
+
+                bullet = new BasicBulletType(5f, 34){{
+                    width = 7f;
+                    height = 12f;
+                    lifetime = 18f;
+                    shootEffect = Fx.sparkShoot;
+                    smokeEffect = Fx.shootBigSmoke;
+                    hitColor = backColor = trailColor = Pal.suppress;
+                    frontColor = Color.white;
+                    trailWidth = 1.5f;
+                    trailLength = 5;
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                }};
+            }});
+        }};
+
+        obviate = new ErekirUnitType("obviate"){{
+            flying = true;
+            drag = 0.08f;
+            speed = 1.8f;
+            rotateSpeed = 2.5f;
+            accel = 0.09f;
+            health = 2300f;
+            armor = 6f;
+            hitSize = 25f;
+            engineSize = 4.3f;
+            engineOffset = 54f / 4f;
+            fogRadius = 25;
+            itemCapacity = 0;
+            lowAltitude = true;
+
+            setEnginesMirror(
+            new UnitEngine(38 / 4f, -46 / 4f, 3.1f, 315f)
+            );
+
+            parts.add(
+            new RegionPart("-blade"){{
+                moveRot = -10f;
+                moveX = -1f;
+                moves.add(new PartMove(PartProgress.reload, 2f, 1f, -5f));
+                progress = PartProgress.warmup;
+                mirror = true;
+
+                children.add(new RegionPart("-side"){{
+                    moveX = 2f;
+                    moveY = -2f;
+                    progress = PartProgress.warmup;
+                    under = true;
+                    mirror = true;
+                    moves.add(new PartMove(PartProgress.reload, -2f, 2f, 0f));
+                }});
+            }});
+
+            weapons.add(new Weapon(){{
+                shootSound = Sounds.shockBlast;
+                x = 0f;
+                y = -2f;
+                shootY = 0f;
+                reload = 140f;
+                mirror = false;
+                minWarmup = 0.95f;
+                shake = 3f;
+                cooldownTime = reload - 10f;
+
+                bullet = new BasicBulletType(){{
+                    shoot = new ShootHelix(){{
+                        mag = 1f;
+                        scl = 5f;
+                    }};
+
+                    shootEffect = new MultiEffect(Fx.shootTitan, new WaveEffect(){{
+                        colorTo = Pal.sapBulletBack;
+                        sizeTo = 26f;
+                        lifetime = 14f;
+                        strokeFrom = 4f;
+                    }});
+                    smokeEffect = Fx.shootSmokeTitan;
+                    hitColor = Pal.sapBullet;
+                    despawnSound = Sounds.spark;
+
+                    sprite = "large-orb";
+                    trailEffect = Fx.missileTrail;
+                    trailInterval = 3f;
+                    trailParam = 4f;
+                    speed = 3f;
+                    damage = 75f;
+                    lifetime = 60f;
+                    width = height = 15f;
+                    backColor = Pal.sapBulletBack;
+                    frontColor = Pal.sapBullet;
+                    shrinkX = shrinkY = 0f;
+                    trailColor = Pal.sapBulletBack;
+                    trailLength = 12;
+                    trailWidth = 2.2f;
+                    despawnEffect = hitEffect = new ExplosionEffect(){{
+                        waveColor = Pal.sapBullet;
+                        smokeColor = Color.gray;
+                        sparkColor = Pal.sap;
+                        waveStroke = 4f;
+                        waveRad = 40f;
+                    }};
+
+                    intervalBullet = new LightningBulletType(){{
+                        damage = 16;
+                        collidesAir = false;
+                        ammoMultiplier = 1f;
+                        lightningColor = Pal.sapBullet;
+                        lightningLength = 3;
+                        lightningLengthRand = 6;
+
+                        //for visual stats only.
+                        buildingDamageMultiplier = 0.25f;
+
+                        lightningType = new BulletType(0.0001f, 0f){{
+                            lifetime = Fx.lightning.lifetime;
+                            hitEffect = Fx.hitLancer;
+                            despawnEffect = Fx.none;
+                            status = StatusEffects.shocked;
+                            statusDuration = 10f;
+                            hittable = false;
+                            lightColor = Color.white;
+                            buildingDamageMultiplier = 0.25f;
+                        }};
+                    }};
+
+                    bulletInterval = 4f;
+
+                    lightningColor = Pal.sapBullet;
+                    lightningDamage = 17;
+                    lightning = 8;
+                    lightningLength = 2;
+                    lightningLengthRand = 8;
+                }};
+
+            }});
+        }};
+
+        quell = new ErekirUnitType("quell"){{
+            aiController = FlyingFollowAI::new;
+            envDisabled = 0;
+
+            lowAltitude = false;
+            flying = true;
+            drag = 0.06f;
+            speed = 1.1f;
+            rotateSpeed = 3.2f;
+            accel = 0.1f;
+            health = 6000f;
+            armor = 4f;
+            hitSize = 36f;
+            payloadCapacity = Mathf.sqr(3f) * tilePayload;
+            researchCostMultiplier = 0f;
+            targetAir = false;
+
+            engineSize = 4.8f;
+            engineOffset = 61 / 4f;
+
+            abilities.add(new SuppressionFieldAbility(){{
+                orbRadius = 5.3f;
+                y = 1f;
+            }});
+
+            weapons.add(new Weapon("quell-weapon"){{
+                shootSound = Sounds.missileSmall;
+                x = 51 / 4f;
+                y = 5 / 4f;
+                rotate = true;
+                rotateSpeed = 2f;
+                reload = 55f;
+                layerOffset = -0.001f;
+                recoil = 1f;
+                rotationLimit = 60f;
+
+                bullet = new BulletType(){{
+                    shootEffect = Fx.shootBig;
+                    smokeEffect = Fx.shootBigSmoke2;
+                    shake = 1f;
+                    speed = 0f;
+                    keepVelocity = false;
+                    collidesAir = false;
+
+                    spawnUnit = new MissileUnitType("quell-missile"){{
+                        targetAir = false;
+                        speed = 4.3f;
+                        maxRange = 6f;
+                        lifetime = 60f * 1.4f;
+                        outlineColor = Pal.darkOutline;
+                        engineColor = trailColor = Pal.sapBulletBack;
+                        engineLayer = Layer.effect;
+                        health = 45;
+                        loopSoundVolume = 0.1f;
+
+                        weapons.add(new Weapon(){{
+                            shootCone = 360f;
+                            mirror = false;
+                            reload = 1f;
+                            shootOnDeath = true;
+                            bullet = new ExplosionBulletType(110f, 25f){{
+                                shootEffect = Fx.massiveExplosion;
+                                collidesAir = false;
+                            }};
+                        }});
+                    }};
+                }};
+            }});
+
+            setEnginesMirror(
+            new UnitEngine(62 / 4f, -60 / 4f, 3.9f, 315f),
+            new UnitEngine(72 / 4f, -29 / 4f, 3f, 315f)
+            );
+        }};
+
+        disrupt = new ErekirUnitType("disrupt"){{
+            aiController = FlyingFollowAI::new;
+            envDisabled = 0;
+
+            lowAltitude = false;
+            flying = true;
+            drag = 0.07f;
+            speed = 1f;
+            rotateSpeed = 2f;
+            accel = 0.1f;
+            health = 12000f;
+            armor = 9f;
+            hitSize = 46f;
+            payloadCapacity = Mathf.sqr(6f) * tilePayload;
+            targetAir = false;
+
+            engineSize = 6f;
+            engineOffset = 25.25f;
+
+            float orbRad = 5f, partRad = 3f;
+            int parts = 10;
+
+            abilities.add(new SuppressionFieldAbility(){{
+                orbRadius = orbRad;
+                particleSize = partRad;
+                y = 10f;
+                particles = parts;
+            }});
+
+            for(int i : Mathf.signs){
+                abilities.add(new SuppressionFieldAbility(){{
+                    orbRadius = orbRad;
+                    particleSize = partRad;
+                    y = -32f / 4f;
+                    x = 43f * i / 4f;
+                    particles = parts;
+                    //visual only, the middle one does the actual suppressing
+                    active = false;
+                }});
+            }
+
+            weapons.add(new Weapon("disrupt-weapon"){{
+                shootSound = Sounds.missileLarge;
+                x = 78f / 4f;
+                y = -10f / 4f;
+                mirror = true;
+                rotate = true;
+                rotateSpeed = 0.4f;
+                reload = 70f;
+                layerOffset = -20f;
+                recoil = 1f;
+                rotationLimit = 22f;
+                minWarmup = 0.95f;
+                shootWarmupSpeed = 0.1f;
+                shootY = 2f;
+                shootCone = 40f;
+                shoot.shots = 3;
+                shoot.shotDelay = 5f;
+                inaccuracy = 28f;
+
+                parts.add(new RegionPart("-blade"){{
+                    heatProgress = PartProgress.warmup;
+                    progress = PartProgress.warmup.blend(PartProgress.reload, 0.15f);
+                    heatColor = Color.valueOf("9c50ff");
+                    x = 5 / 4f;
+                    y = 0f;
+                    moveRot = -33f;
+                    moveY = -1f;
+                    moveX = -1f;
+                    under = true;
+                    mirror = true;
+                }});
+
+                bullet = new BulletType(){{
+                    shootEffect = Fx.sparkShoot;
+                    smokeEffect = Fx.shootSmokeTitan;
+                    hitColor = Pal.suppress;
+                    shake = 1f;
+                    speed = 0f;
+                    keepVelocity = false;
+                    collidesAir = false;
+
+                    spawnUnit = new MissileUnitType("disrupt-missile"){{
+                        targetAir = false;
+                        speed = 4.6f;
+                        maxRange = 5f;
+                        outlineColor = Pal.darkOutline;
+                        health = 70;
+                        homingDelay = 10f;
+                        lowAltitude = true;
+                        engineSize = 3f;
+                        engineColor = trailColor = Pal.sapBulletBack;
+                        engineLayer = Layer.effect;
+                        deathExplosionEffect = Fx.none;
+                        loopSoundVolume = 0.1f;
+
+                        parts.add(new ShapePart(){{
+                            layer = Layer.effect;
+                            circle = true;
+                            y = -0.25f;
+                            radius = 1.5f;
+                            color = Pal.suppress;
+                            colorTo = Color.white;
+                            progress = PartProgress.life.curve(Interp.pow5In);
+                        }});
+
+                        parts.add(new RegionPart("-fin"){{
+                            mirror = true;
+                            progress = PartProgress.life.mul(3f).curve(Interp.pow5In);
+                            moveRot = 32f;
+                            rotation = -6f;
+                            moveY = 1.5f;
+                            x = 3f / 4f;
+                            y = -6f / 4f;
+                        }});
+
+                        weapons.add(new Weapon(){{
+                            shootCone = 360f;
+                            mirror = false;
+                            reload = 1f;
+                            shootOnDeath = true;
+                            bullet = new ExplosionBulletType(140f, 25f){{
+                                collidesAir = false;
+                                suppressionRange = 140f;
+                                shootEffect = new ExplosionEffect(){{
+                                    lifetime = 50f;
+                                    waveStroke = 5f;
+                                    waveLife = 8f;
+                                    waveColor = Color.white;
+                                    sparkColor = smokeColor = Pal.suppress;
+                                    waveRad = 40f;
+                                    smokeSize = 4f;
+                                    smokes = 7;
+                                    smokeSizeBase = 0f;
+                                    sparks = 10;
+                                    sparkRad = 40f;
+                                    sparkLen = 6f;
+                                    sparkStroke = 2f;
+                                }};
+                            }};
+                        }});
+                    }};
+                }};
+            }});
+
+            setEnginesMirror(
+            new UnitEngine(95 / 4f, -56 / 4f, 5f, 330f),
+            new UnitEngine(89 / 4f, -95 / 4f, 4f, 315f)
+            );
+        }};
+
+        //endregion
+        //region erekir - neoplasm
+
+        renale = new NeoplasmUnitType("renale"){{
+            health = 500;
+            armor = 2;
+            hitSize = 9f;
+            omniMovement = false;
+            rotateSpeed = 2.5f;
+            drownTimeMultiplier = 2f;
+            segments = 3;
+            drawBody = false;
+            hidden = true;
+            crushDamage = 0.5f;
+            aiController = HugAI::new;
+            targetAir = false;
+
+            segmentScl = 3f;
+            segmentPhase = 5f;
+            segmentMag = 0.5f;
+            speed = 1.2f;
+        }};
+
+        latum = new NeoplasmUnitType("latum"){{
+            health = 20000;
+            armor = 12;
+            hitSize = 48f;
+            omniMovement = false;
+            rotateSpeed = 1.7f;
+            drownTimeMultiplier = 4f;
+            segments = 4;
+            drawBody = false;
+            hidden = true;
+            crushDamage = 2f;
+            aiController = HugAI::new;
+            targetAir = false;
+
+            segmentScl = 4f;
+            segmentPhase = 5f;
+            speed = 1f;
+
+            abilities.add(new SpawnDeathAbility(renale, 5, 11f));
+        }};
+
+        //endregion
+        //region erekir - core
+
+        float coreFleeRange = 500f;
+
+        evoke = new ErekirUnitType("evoke"){{
+            coreUnitDock = true;
+            controller = u -> new BuilderAI(true, coreFleeRange);
+            isEnemy = false;
+            envDisabled = 0;
+
+            range = 60f;
+            faceTarget = true;
+            targetPriority = -2;
+            lowAltitude = false;
+            mineWalls = true;
+            mineFloor = false;
+            mineHardnessScaling = false;
+            flying = true;
+            mineSpeed = 6f;
+            mineTier = 3;
+            buildSpeed = 1.2f;
+            drag = 0.08f;
+            speed = 5.6f;
+            rotateSpeed = 7f;
+            accel = 0.09f;
+            itemCapacity = 60;
+            health = 300f;
+            armor = 1f;
+            hitSize = 9f;
+            engineSize = 0;
+            payloadCapacity = 2f * 2f * tilesize * tilesize;
+            pickupUnits = false;
+            vulnerableWithPayloads = true;
+
+            fogRadius = 0f;
+            targetable = false;
+            hittable = false;
+
+            setEnginesMirror(
+            new UnitEngine(21 / 4f, 19 / 4f, 2.2f, 45f),
+            new UnitEngine(23 / 4f, -22 / 4f, 2.2f, 315f)
+            );
+
+            weapons.add(new RepairBeamWeapon(){{
+                widthSinMag = 0.11f;
+                reload = 20f;
+                x = 0f;
+                y = 6.5f;
+                rotate = false;
+                shootY = 0f;
+                beamWidth = 0.7f;
+                repairSpeed = 3.1f;
+                fractionRepairSpeed = 0.06f;
+                aimDst = 0f;
+                shootCone = 15f;
+                mirror = false;
+
+                targetUnits = false;
+                targetBuildings = true;
+                autoTarget = false;
+                controllable = true;
+                laserColor = Pal.accent;
+                healColor = Pal.accent;
+
+                bullet = new BulletType(){{
+                    maxRange = 60f;
+                }};
+            }});
+        }};
+
+        incite = new ErekirUnitType("incite"){{
+            coreUnitDock = true;
+            controller = u -> new BuilderAI(true, coreFleeRange);
+            isEnemy = false;
+            envDisabled = 0;
+
+            range = 60f;
+            targetPriority = -2;
+            lowAltitude = false;
+            faceTarget = true;
+            mineWalls = true;
+            mineFloor = false;
+            mineHardnessScaling = false;
+            flying = true;
+            mineSpeed = 8f;
+            mineTier = 3;
+            buildSpeed = 1.4f;
+            drag = 0.08f;
+            speed = 7f;
+            rotateSpeed = 8f;
+            accel = 0.09f;
+            itemCapacity = 90;
+            health = 500f;
+            armor = 2f;
+            hitSize = 11f;
+            payloadCapacity = 2f * 2f * tilesize * tilesize;
+            pickupUnits = false;
+            vulnerableWithPayloads = true;
+
+            fogRadius = 0f;
+            targetable = false;
+            hittable = false;
+
+            engineOffset = 7.2f;
+            engineSize = 3.1f;
+
+            setEnginesMirror(
+            new UnitEngine(25 / 4f, -1 / 4f, 2.4f, 300f)
+            );
+
+            weapons.add(new RepairBeamWeapon(){{
+                widthSinMag = 0.11f;
+                reload = 20f;
+                x = 0f;
+                y = 7.5f;
+                rotate = false;
+                shootY = 0f;
+                beamWidth = 0.7f;
+                aimDst = 0f;
+                shootCone = 15f;
+                mirror = false;
+
+                repairSpeed = 3.3f;
+                fractionRepairSpeed = 0.06f;
+
+                targetUnits = false;
+                targetBuildings = true;
+                autoTarget = false;
+                controllable = true;
+                laserColor = Pal.accent;
+                healColor = Pal.accent;
+
+                bullet = new BulletType(){{
+                    maxRange = 60f;
+                }};
+            }});
+
+            drawBuildBeam = false;
+
+            weapons.add(new BuildWeapon("build-weapon"){{
+                rotate = true;
+                rotateSpeed = 7f;
+                x = 14/4f;
+                y = 15/4f;
+                layerOffset = -0.001f;
+                shootY = 3f;
+            }});
+        }};
+
+        emanate = new ErekirUnitType("emanate"){{
+            coreUnitDock = true;
+            controller = u -> new BuilderAI(true, coreFleeRange);
+            isEnemy = false;
+            envDisabled = 0;
+
+            range = 65f;
+            faceTarget = true;
+            targetPriority = -2;
+            lowAltitude = false;
+            mineWalls = true;
+            mineFloor = false;
+            mineHardnessScaling = false;
+            flying = true;
+            mineSpeed = 9f;
+            mineTier = 3;
+            buildSpeed = 1.5f;
+            drag = 0.08f;
+            speed = 7.5f;
+            rotateSpeed = 8f;
+            accel = 0.08f;
+            itemCapacity = 110;
+            health = 700f;
+            armor = 3f;
+            hitSize = 12f;
+            buildBeamOffset = 8f;
+            payloadCapacity = 2f * 2f * tilesize * tilesize;
+            pickupUnits = false;
+            vulnerableWithPayloads = true;
+
+            fogRadius = 0f;
+            targetable = false;
+            hittable = false;
+
+            engineOffset = 7.5f;
+            engineSize = 3.4f;
+
+            setEnginesMirror(
+            new UnitEngine(35 / 4f, -13 / 4f, 2.7f, 315f),
+            new UnitEngine(28 / 4f, -35 / 4f, 2.7f, 315f)
+            );
+
+            weapons.add(new RepairBeamWeapon(){{
+                widthSinMag = 0.11f;
+                reload = 20f;
+                x = 19f/4f;
+                y = 19f/4f;
+                rotate = false;
+                shootY = 0f;
+                beamWidth = 0.7f;
+                aimDst = 0f;
+                shootCone = 40f;
+                mirror = true;
+
+                repairSpeed = 3.6f / 2f;
+                fractionRepairSpeed = 0.03f;
+
+                targetUnits = false;
+                targetBuildings = true;
+                autoTarget = false;
+                controllable = true;
+                laserColor = Pal.accent;
+                healColor = Pal.accent;
+
+                bullet = new BulletType(){{
+                    maxRange = 65f;
+                }};
+            }});
+        }};
+
+        //endregion
+        //region internal + special
+
+        block = new UnitType("block"){{
+            speed = 0f;
+            hitSize = 0f;
+            health = 1;
+            rotateSpeed = 360f;
+            itemCapacity = 0;
+            hidden = true;
+            internal = true;
+        }};
+
+        manifold = new ErekirUnitType("manifold"){{
+            controller = u -> new CargoAI();
+            isEnemy = false;
+            allowedInPayloads = false;
+            logicControllable = false;
+            playerControllable = false;
+            envDisabled = 0;
+            payloadCapacity = 0f;
+
+            lowAltitude = false;
+            flying = true;
+            drag = 0.06f;
+            speed = 3.5f;
+            rotateSpeed = 9f;
+            accel = 0.1f;
+            itemCapacity = 100;
+            health = 200f;
+            hitSize = 11f;
+            engineSize = 2.3f;
+            engineOffset = 6.5f;
+            hidden = true;
+
+            setEnginesMirror(
+                new UnitEngine(24 / 4f, -24 / 4f, 2.3f, 315f)
+            );
+        }};
+
+        assemblyDrone = new ErekirUnitType("assembly-drone"){{
+            controller = u -> new AssemblerAI();
+
+            flying = true;
+            drag = 0.06f;
+            accel = 0.11f;
+            speed = 1.3f;
+            health = 90;
+            engineSize = 2f;
+            engineOffset = 6.5f;
+            payloadCapacity = 0f;
+            targetable = false;
+            bounded = false;
+
+            outlineColor = Pal.darkOutline;
+            isEnemy = false;
+            hidden = true;
+            useUnitCap = false;
+            logicControllable = false;
+            playerControllable = false;
+            allowedInPayloads = false;
+            createWreck = false;
+            envEnabled = Env.any;
+            envDisabled = Env.none;
+        }};
 
         //endregion
     }
diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java
index 8e3ea38a92..d69a6b4b43 100644
--- a/core/src/mindustry/content/Weathers.java
+++ b/core/src/mindustry/content/Weathers.java
@@ -2,23 +2,22 @@ package mindustry.content;
 
 import arc.graphics.*;
 import arc.util.*;
-import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.type.weather.*;
 import mindustry.world.meta.*;
 
-public class Weathers implements ContentList{
+public class Weathers{
     public static Weather
     rain,
     snow,
     sandstorm,
     sporestorm,
-    fog;
+    fog,
+    suspendParticles;
 
-    @Override
-    public void load(){
-        snow = new ParticleWeather("snow"){{
+    public static void load(){
+        snow = new ParticleWeather("snowing"){{
             particleRegion = "particle";
             sizeMax = 13f;
             sizeMin = 2.6f;
@@ -102,5 +101,19 @@ public class Weathers implements ContentList{
             attrs.set(Attribute.water, 0.05f);
             opacityMultiplier = 0.47f;
         }};
+
+        suspendParticles = new ParticleWeather("suspend-particles"){{
+            color = noiseColor = Color.valueOf("a7c1fa");
+            particleRegion = "particle";
+            statusGround = false;
+            useWindVector = true;
+            hidden = true;
+            sizeMax = 4f;
+            sizeMin = 1.4f;
+            minAlpha = 0.5f;
+            maxAlpha = 1f;
+            density = 10000f;
+            baseSpeed = 0.03f;
+        }};
     }
 }
diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java
index fef7cc528b..4e2f86410a 100644
--- a/core/src/mindustry/core/ContentLoader.java
+++ b/core/src/mindustry/core/ContentLoader.java
@@ -6,10 +6,12 @@ import arc.func.*;
 import arc.graphics.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.ai.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
-import mindustry.game.EventType.*;
 import mindustry.entities.bullet.*;
+import mindustry.game.EventType.*;
+import mindustry.io.*;
 import mindustry.mod.Mods.*;
 import mindustry.type.*;
 import mindustry.world.*;
@@ -25,47 +27,36 @@ import static mindustry.Vars.*;
 public class ContentLoader{
     private ObjectMap<String, MappableContent>[] contentNameMap = new ObjectMap[ContentType.all.length];
     private Seq<Content>[] contentMap = new Seq[ContentType.all.length];
+    private ObjectMap<String, MappableContent> nameMap = new ObjectMap<>();
     private MappableContent[][] temporaryMapper;
     private @Nullable LoadedMod currentMod;
     private @Nullable Content lastAdded;
     private ObjectSet<Cons<Content>> initialization = new ObjectSet<>();
-    private ContentList[] content = {
-        new Items(),
-        new StatusEffects(),
-        new Liquids(),
-        new Bullets(),
-        new AmmoTypes(),
-        new UnitTypes(),
-        new Blocks(),
-        new Loadouts(),
-        new Weathers(),
-        new Planets(),
-        new SectorPresets(),
-        new TechTree(),
-    };
 
     public ContentLoader(){
-        clear();
-    }
-
-    /** Clears all initialized content.*/
-    public void clear(){
-        contentNameMap = new ObjectMap[ContentType.all.length];
-        contentMap = new Seq[ContentType.all.length];
-        initialization = new ObjectSet<>();
-
         for(ContentType type : ContentType.all){
             contentMap[type.ordinal()] = new Seq<>();
             contentNameMap[type.ordinal()] = new ObjectMap<>();
         }
     }
 
-
     /** Creates all base types. */
     public void createBaseContent(){
-        for(ContentList list : content){
-            list.load();
-        }
+        UnitCommand.loadAll();
+        UnitStance.loadAll();
+        TeamEntries.load();
+        Items.load();
+        StatusEffects.load();
+        Liquids.load();
+        Bullets.load();
+        UnitTypes.load();
+        Blocks.load();
+        Loadouts.load();
+        Weathers.load();
+        Planets.load();
+        SectorPresets.load();
+        SerpuloTechTree.load();
+        ErekirTechTree.load();
     }
 
     /** Creates mod content, if applicable. */
@@ -75,7 +66,7 @@ public class ContentLoader{
         }
     }
 
-    /** Logs content statistics.*/
+    /** Logs content statistics. */
     public void logContent(){
         //check up ID mapping, make sure it's linear (debug only)
         for(Seq<Content> arr : contentMap){
@@ -91,19 +82,21 @@ public class ContentLoader{
         for(int k = 0; k < contentMap.length; k++){
             Log.debug("[@]: loaded @", ContentType.all[k].name(), contentMap[k].size);
         }
-        Log.debug("Total content loaded: @", Seq.with(ContentType.all).mapInt(c -> contentMap[c.ordinal()].size).sum());
+        Log.debug("Total content loaded: @", Seq.with(ContentType.all).sum(c -> contentMap[c.ordinal()].size));
         Log.debug("-------------------");
     }
 
-    /** Calls Content#init() on everything. Use only after all modules have been created.*/
+    /** Calls Content#init() on everything. Use only after all modules have been created. */
     public void init(){
         initialize(Content::init);
-        if(constants != null) constants.init();
+        initialize(Content::postInit);
+        if(logicVars != null) logicVars.init();
         Events.fire(new ContentInitEvent());
     }
 
-    /** Calls Content#load() on everything. Use only after all modules have been created on the client.*/
+    /** Calls Content#loadIcon() and Content#load() on everything. Use only after all modules have been created on the client. */
     public void load(){
+        initialize(Content::loadIcon);
         initialize(Content::load);
     }
 
@@ -132,9 +125,9 @@ public class ContentLoader{
     /** Loads block colors. */
     public void loadColors(){
         Pixmap pixmap = new Pixmap(files.internal("sprites/block_colors.png"));
-        for(int i = 0; i < pixmap.getWidth(); i++){
+        for(int i = 0; i < pixmap.width; i++){
             if(blocks().size > i){
-                int color = pixmap.getPixel(i, 0);
+                int color = pixmap.get(i, 0);
 
                 if(color == 0 || color == 255) continue;
 
@@ -150,11 +143,6 @@ public class ContentLoader{
         ColorMapper.load();
     }
 
-    public void dispose(){
-        initialize(Content::dispose);
-        clear();
-    }
-
     /** Get last piece of content created for error-handling purposes. */
     public @Nullable Content getLastAdded(){
         return lastAdded;
@@ -185,6 +173,13 @@ public class ContentLoader{
 
     public void handleMappableContent(MappableContent content){
         if(contentNameMap[content.getContentType().ordinal()].containsKey(content.name)){
+            var list = contentMap[content.getContentType().ordinal()];
+
+            //this method is only called when registering content, and after handleContent.
+            //If this is the last registered content, and it is invalid, make sure to remove it from the list to prevent invalid stuff from being registered
+            if(list.size > 0 && list.peek() == content){
+                list.pop();
+            }
             throw new IllegalArgumentException("Two content objects cannot have the same name! (issue: '" + content.name + "')");
         }
         if(currentMod != null){
@@ -194,12 +189,18 @@ public class ContentLoader{
             }
         }
         contentNameMap[content.getContentType().ordinal()].put(content.name, content);
+        nameMap.put(content.name, content);
     }
 
     public void setTemporaryMapper(MappableContent[][] temporaryMapper){
         this.temporaryMapper = temporaryMapper;
     }
 
+    /** @return the last registered content with the specified name. Note that the content loader makes no attempt to resolve name conflicts. This method can be unreliable. */
+    public @Nullable MappableContent byName(String name){
+        return nameMap.get(name);
+    }
+
     public Seq<Content>[] getContentMap(){
         return contentMap;
     }
@@ -211,10 +212,16 @@ public class ContentLoader{
     }
 
     public <T extends MappableContent> T getByName(ContentType type, String name){
-        if(contentNameMap[type.ordinal()] == null){
-            return null;
+        var map = contentNameMap[type.ordinal()];
+
+        if(map == null) return null;
+
+        //load fallbacks
+        if(type == ContentType.block){
+            name = SaveVersion.modContentNameMap.get(name, name);
         }
-        return (T)contentNameMap[type.ordinal()].get(name);
+
+        return (T)map.get(name);
     }
 
     public <T extends Content> T getByID(ContentType type, int id){
@@ -262,6 +269,10 @@ public class ContentLoader{
         return getByID(ContentType.item, id);
     }
 
+    public Item item(String name){
+        return getByName(ContentType.item, name);
+    }
+
     public Seq<Liquid> liquids(){
         return getBy(ContentType.liquid);
     }
@@ -270,6 +281,10 @@ public class ContentLoader{
         return getByID(ContentType.liquid, id);
     }
 
+    public Liquid liquid(String name){
+        return getByName(ContentType.liquid, name);
+    }
+
     public Seq<BulletType> bullets(){
         return getBy(ContentType.bullet);
     }
@@ -278,15 +293,71 @@ public class ContentLoader{
         return getByID(ContentType.bullet, id);
     }
 
+    public Seq<StatusEffect> statusEffects(){
+        return getBy(ContentType.status);
+    }
+
+    public StatusEffect statusEffect(String name){
+        return getByName(ContentType.status, name);
+    }
+
     public Seq<SectorPreset> sectors(){
         return getBy(ContentType.sector);
     }
 
+    public SectorPreset sector(String name){
+        return getByName(ContentType.sector, name);
+    }
+
     public Seq<UnitType> units(){
         return getBy(ContentType.unit);
     }
 
+    public UnitType unit(int id){
+        return getByID(ContentType.unit, id);
+    }
+
+    public UnitType unit(String name){
+        return getByName(ContentType.unit, name);
+    }
+
     public Seq<Planet> planets(){
         return getBy(ContentType.planet);
     }
+
+    public Planet planet(String name){
+        return getByName(ContentType.planet, name);
+    }
+
+    public Seq<Weather> weathers(){
+        return getBy(ContentType.weather);
+    }
+
+    public Weather weather(String name){
+        return getByName(ContentType.weather, name);
+    }
+
+    public Seq<UnitStance> unitStances(){
+        return getBy(ContentType.unitStance);
+    }
+
+    public UnitStance unitStance(int id){
+        return getByID(ContentType.unitStance, id);
+    }
+
+    public UnitStance unitStance(String name){
+        return getByName(ContentType.unitStance, name);
+    }
+
+    public Seq<UnitCommand> unitCommands(){
+        return getBy(ContentType.unitCommand);
+    }
+
+    public UnitCommand unitCommand(int id){
+        return getByID(ContentType.unitCommand, id);
+    }
+
+    public UnitCommand unitCommand(String name){
+        return getByName(ContentType.unitCommand, name);
+    }
 }
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 8dd487034b..dd49e90f88 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -16,9 +16,9 @@ import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.core.GameState.*;
 import mindustry.entities.*;
+import mindustry.game.*;
 import mindustry.game.EventType.*;
 import mindustry.game.Objectives.*;
-import mindustry.game.*;
 import mindustry.game.Saves.*;
 import mindustry.gen.*;
 import mindustry.input.*;
@@ -28,16 +28,15 @@ import mindustry.maps.Map;
 import mindustry.maps.*;
 import mindustry.net.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 import java.io.*;
 import java.text.*;
 import java.util.*;
 
 import static arc.Core.*;
-import static mindustry.Vars.net;
 import static mindustry.Vars.*;
 
 /**
@@ -50,14 +49,33 @@ public class Control implements ApplicationListener, Loadable{
     public Saves saves;
     public SoundControl sound;
     public InputHandler input;
+    public AttackIndicators indicators;
 
     private Interval timer = new Interval(2);
     private boolean hiscore = false;
-    private boolean wasPaused = false;
+    private boolean wasPaused = false, backgroundPaused = false;
+    private Seq<Building> toBePlaced = new Seq<>(false);
 
     public Control(){
         saves = new Saves();
         sound = new SoundControl();
+        indicators = new AttackIndicators();
+
+        Events.on(BuildDamageEvent.class, e -> {
+            if(e.build.team == Vars.player.team()){
+                indicators.add(e.build.tileX(), e.build.tileY());
+            }
+        });
+
+        //show dialog saying that mod loading was skipped.
+        Events.on(ClientLoadEvent.class, e -> {
+            if(Vars.mods.skipModLoading() && Vars.mods.list().any()){
+                Time.runTask(4f, () -> {
+                    ui.showInfo("@mods.initfailed");
+                });
+            }
+            checkAutoUnlocks();
+        });
 
         Events.on(StateChangeEvent.class, event -> {
             if((event.from == State.playing && event.to == State.menu) || (event.from == State.menu && event.to != State.menu)){
@@ -74,7 +92,7 @@ public class Control implements ApplicationListener, Loadable{
 
         Events.on(WorldLoadEvent.class, event -> {
             if(Mathf.zero(player.x) && Mathf.zero(player.y)){
-                Building core = state.teams.closestCore(0, 0, player.team());
+                Building core = player.bestCore();
                 if(core != null){
                     player.set(core);
                     camera.position.set(core);
@@ -90,6 +108,8 @@ public class Control implements ApplicationListener, Loadable{
 
         Events.on(ResetEvent.class, event -> {
             player.reset();
+            toBePlaced.clear();
+            indicators.clear();
 
             hiscore = false;
             saves.resetSave();
@@ -114,6 +134,10 @@ public class Control implements ApplicationListener, Loadable{
         //add player when world loads regardless
         Events.on(WorldLoadEvent.class, e -> {
             player.add();
+            //make player admin on any load when hosting
+            if(net.active() && net.server()){
+                player.admin = true;
+            }
         });
 
         //autohost for pvp maps
@@ -121,7 +145,7 @@ public class Control implements ApplicationListener, Loadable{
             if(state.rules.pvp && !net.active()){
                 try{
                     net.host(port);
-                    player.admin(true);
+                    player.admin = true;
                 }catch(IOException e){
                     ui.showException("@server.error", e);
                     state.set(State.menu);
@@ -130,42 +154,28 @@ public class Control implements ApplicationListener, Loadable{
         }));
 
         Events.on(UnlockEvent.class, e -> {
-            ui.hudfrag.showUnlock(e.content);
+            if(e.content.showUnlock()){
+                ui.hudfrag.showUnlock(e.content);
+            }
 
             checkAutoUnlocks();
 
             if(e.content instanceof SectorPreset){
                 for(TechNode node : TechTree.all){
                     if(!node.content.unlocked() && node.objectives.contains(o -> o instanceof SectorComplete sec && sec.preset == e.content) && !node.objectives.contains(o -> !o.complete())){
-                        ui.hudfrag.showToast(new TextureRegionDrawable(node.content.icon(Cicon.large)), bundle.get("available"));
+                        ui.hudfrag.showToast(new TextureRegionDrawable(node.content.uiIcon), iconLarge, bundle.get("available"));
                     }
                 }
             }
         });
 
         Events.on(SectorCaptureEvent.class, e -> {
-            checkAutoUnlocks();
-        });
+            app.post(this::checkAutoUnlocks);
 
-        Events.on(BlockBuildEndEvent.class, e -> {
-            if(e.team == player.team()){
-                if(e.breaking){
-                    state.stats.buildingsDeconstructed++;
-                }else{
-                    state.stats.buildingsBuilt++;
-                }
-            }
-        });
-
-        Events.on(BlockDestroyEvent.class, e -> {
-            if(e.tile.team() == player.team()){
-                state.stats.buildingsDestroyed++;
-            }
-        });
-
-        Events.on(UnitDestroyEvent.class, e -> {
-            if(e.unit.team() != player.team()){
-                state.stats.enemyUnitsDestroyed++;
+            if(!net.client() && e.sector.preset != null && e.sector.preset.isLastSector && e.initialCapture){
+                Time.run(60f * 2f, () -> {
+                    ui.campaignComplete.show(e.sector.planet);
+                });
             }
         });
 
@@ -181,35 +191,104 @@ public class Control implements ApplicationListener, Loadable{
         });
 
         Events.run(Trigger.newGame, () -> {
-            Building core = player.closestCore();
-
+            var core = player.bestCore();
             if(core == null) return;
 
-            //TODO this sounds pretty bad due to conflict
-            if(settings.getInt("musicvol") > 0){
-                Musics.land.stop();
-                Musics.land.play();
-                Musics.land.setVolume(settings.getInt("musicvol") / 100f);
-            }
-
-            app.post(() -> ui.hudfrag.showLand());
-            renderer.zoomIn(Fx.coreLand.lifetime);
-            app.post(() -> Fx.coreLand.at(core.getX(), core.getY(), 0, core.block));
             camera.position.set(core);
             player.set(core);
 
-            Time.run(Fx.coreLand.lifetime, () -> {
-                Fx.launch.at(core);
-                Effect.shake(5f, 5f, core);
-
-                if(state.isCampaign()){
-                    ui.announce("[accent]" + state.rules.sector.name() + "\n" +
-                        (state.rules.sector.info.resources.any() ? "[lightgray]" + bundle.get("sectors.resources") + "[white] " +
-                            state.rules.sector.info.resources.toString(" ", u -> u.emoji()) : ""), 5);
+            float coreDelay = 0f;
+            if(!settings.getBool("skipcoreanimation") && !state.rules.pvp){
+                coreDelay = core.launchDuration();
+                //delay player respawn so animation can play.
+                player.deathTimer = Player.deathDelay - core.launchDuration();
+                //TODO this sounds pretty bad due to conflict
+                if(settings.getInt("musicvol") > 0){
+                    //TODO what to do if another core with different music is already playing?
+                    Music music = core.landMusic();
+                    music.stop();
+                    music.play();
+                    music.setVolume(settings.getInt("musicvol") / 100f);
                 }
-            });
+
+                renderer.showLanding(core);
+            }
+
+            if(state.isCampaign()){
+                if(state.rules.sector.info.importRateCache != null){
+                    state.rules.sector.info.refreshImportRates(state.rules.sector.planet);
+                }
+
+                //don't run when hosting, that doesn't really work.
+                if(state.rules.sector.planet.prebuildBase){
+                    toBePlaced.clear();
+                    float unitsPerTick = 2f;
+                    float buildRadius = state.rules.enemyCoreBuildRadius * 1.5f;
+
+                    //TODO if the save is unloaded or map is hosted, these blocks do not get built.
+                    boolean anyBuilds = false;
+                    for(var build : state.rules.defaultTeam.data().buildings.copy()){
+                        if(!(build instanceof CoreBuild) && !build.block.privileged){
+                            var ccore = build.closestCore();
+
+                            if(ccore != null){
+                                anyBuilds = true;
+
+                                if(!net.active()){
+                                    build.pickedUp();
+                                    build.tile.remove();
+
+                                    toBePlaced.add(build);
+
+                                    Time.run(build.dst(ccore) / unitsPerTick + coreDelay, () -> {
+                                        if(build.tile.build != build){
+                                            placeLandBuild(build);
+
+                                            toBePlaced.remove(build);
+                                        }
+                                    });
+                                }else{
+                                    //when already hosting, instantly build everything. this looks bad but it's better than a desync
+                                    Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block);
+                                    build.block.placeEffect.at(build.x, build.y, build.block.size);
+                                }
+                            }
+                        }
+                    }
+
+                    if(anyBuilds){
+                        for(var ccore : state.rules.defaultTeam.data().cores){
+                            Time.run(coreDelay, () -> {
+                                Fx.coreBuildShockwave.at(ccore.x, ccore.y, buildRadius);
+                            });
+                        }
+                    }
+                }
+            }
         });
 
+        Events.on(SaveWriteEvent.class, e -> forcePlaceAll());
+        Events.on(HostEvent.class, e -> forcePlaceAll());
+        Events.on(HostEvent.class, e -> {
+            state.set(State.playing);
+        });
+    }
+
+    private void forcePlaceAll(){
+        //force set buildings when a save is done or map is hosted, to prevent desyncs
+        for(var build : toBePlaced){
+            placeLandBuild(build);
+        }
+
+        toBePlaced.clear();
+    }
+
+    private void placeLandBuild(Building build){
+        build.tile.setBlock(build.block, build.team, build.rotation, () -> build);
+        build.dropped();
+
+        Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block);
+        build.block.placeEffect.at(build.x, build.y, build.block.size);
     }
 
     @Override
@@ -230,12 +309,12 @@ public class Control implements ApplicationListener, Loadable{
         saves.load();
     }
 
-    /** Automatically unlocks things with no requirements. */
-    void checkAutoUnlocks(){
+    /** Automatically unlocks things with no requirements and no locked parents. */
+    public void checkAutoUnlocks(){
         if(net.client()) return;
 
         for(TechNode node : TechTree.all){
-            if(!node.content.unlocked() && node.requirements.length == 0 && !node.objectives.contains(o -> !o.complete())){
+            if(!node.content.unlocked() && (node.parent == null || node.parent.content.unlocked()) && node.requirements.length == 0 && !node.objectives.contains(o -> !o.complete())){
                 node.content.unlock();
             }
         }
@@ -244,6 +323,13 @@ public class Control implements ApplicationListener, Loadable{
     void createPlayer(){
         player = Player.create();
         player.name = Core.settings.getString("name");
+
+        String locale = Core.settings.getString("locale");
+        if(locale.equals("default")){
+            locale = Locale.getDefault().toString();
+        }
+        player.locale = locale;
+
         player.color.set(Core.settings.getInt("color-0"));
 
         if(mobile){
@@ -271,17 +357,31 @@ public class Control implements ApplicationListener, Loadable{
     }
 
     public void playMap(Map map, Rules rules){
+        playMap(map, rules, false);
+    }
+
+    public void playMap(Map map, Rules rules, boolean playtest){
         ui.loadAnd(() -> {
             logic.reset();
             world.loadMap(map, rules);
             state.rules = rules;
+            if(playtest) state.playtestingMap = map;
             state.rules.sector = null;
             state.rules.editor = false;
             logic.play();
-            if(settings.getBool("savecreate") && !world.isInvalidMap()){
+            if(settings.getBool("savecreate") && !world.isInvalidMap() && !playtest){
                 control.saves.addSave(map.name() + " " + new SimpleDateFormat("MMM dd h:mm", Locale.getDefault()).format(new Date()));
             }
             Events.fire(Trigger.newGame);
+
+            //booted out of map, resume editing
+            if(world.isInvalidMap() && playtest){
+                Dialog current = scene.getDialog();
+                ui.editor.resumeAfterPlaytest(map);
+                if(current != null){
+                    current.update(current::toFront);
+                }
+            }
         });
     }
 
@@ -300,82 +400,101 @@ public class Control implements ApplicationListener, Loadable{
                 control.saves.resetSave();
             }
 
+            //for planet launches, mostly
+            if(sector.preset != null){
+                sector.preset.quietUnlock();
+            }
+
             ui.planet.hide();
             SaveSlot slot = sector.save;
             sector.planet.setLastSector(sector);
-            if(slot != null && !clearSectors){
+            if(slot != null && !clearSectors && (!(sector.planet.clearSectorOnLose || sector.info.hasWorldProcessor) || sector.info.hasCore)){
 
                 try{
+                    boolean hadNoCore = !sector.info.hasCore;
                     reloader.begin();
                     slot.load();
                     slot.setAutosave(true);
                     state.rules.sector = sector;
+                    state.rules.cloudColor = sector.planet.landCloudColor;
 
                     //if there is no base, simulate a new game and place the right loadout at the spawn position
-                    if(state.rules.defaultTeam.cores().isEmpty()){
+                    if(state.rules.defaultTeam.cores().isEmpty() || hadNoCore){
 
-                        //no spawn set -> delete the sector save
-                        if(sector.info.spawnPosition == 0){
-                            //delete old save
-                            sector.save = null;
-                            slot.delete();
-                            //play again
-                            playSector(origin, sector, reloader);
-                            return;
-                        }
+                        if(sector.planet.clearSectorOnLose || sector.info.hasWorldProcessor){
+                            playNewSector(origin, sector, reloader);
+                        }else{
+                            //no spawn set -> delete the sector save
+                            if(sector.info.spawnPosition == 0){
+                                //delete old save
+                                sector.save = null;
+                                slot.delete();
+                                //play again
+                                playSector(origin, sector, reloader);
+                                return;
+                            }
 
-                        //set spawn for sector damage to use
-                        Tile spawn = world.tile(sector.info.spawnPosition);
-                        spawn.setBlock(Blocks.coreShard, state.rules.defaultTeam);
+                            //set spawn for sector damage to use
+                            Tile spawn = world.tile(sector.info.spawnPosition);
+                            spawn.setBlock(sector.planet.defaultCore, state.rules.defaultTeam);
 
-                        //add extra damage.
-                        SectorDamage.apply(1f);
+                            //add extra damage.
+                            SectorDamage.apply(1f);
 
-                        //reset wave so things are more fair
-                        state.wave = 1;
-                        //set up default wave time
-                        state.wavetime = state.rules.waveSpacing * 2f;
-                        //reset captured state
-                        sector.info.wasCaptured = false;
-                        //re-enable waves
-                        state.rules.waves = true;
+                            //reset wave so things are more fair
+                            state.wave = 1;
+                            //set up default wave time
+                            state.wavetime = state.rules.initialWaveSpacing <= 0f ? (state.rules.waveSpacing * (sector.preset == null ? 2f : sector.preset.startWaveTimeMultiplier)) : state.rules.initialWaveSpacing;
+                            state.wavetime *= sector.planet.campaignRules.difficulty.waveTimeMultiplier;
+                            //reset captured state
+                            sector.info.wasCaptured = false;
 
-                        //reset win wave??
-                        state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null && sector.preset.captureWave > 0 ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 30;
+                            if(state.rules.sector.planet.allowWaves){
+                                //re-enable waves
+                                state.rules.waves = true;
+                                //reset win wave??
+                                state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null && sector.preset.captureWave > 0 ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 30;
+                            }
 
-                        //if there's still an enemy base left, fix it
-                        if(state.rules.attackMode){
-                            //replace all broken blocks
-                            for(var plan : state.rules.waveTeam.data().blocks){
-                                Tile tile = world.tile(plan.x, plan.y);
-                                if(tile != null){
-                                    tile.setBlock(content.block(plan.block), state.rules.waveTeam, plan.rotation);
-                                    if(plan.config != null && tile.build != null){
-                                        tile.build.configureAny(plan.config);
+                            //if there's still an enemy base left, fix it
+                            if(state.rules.attackMode){
+                                //replace all broken blocks
+                                for(var plan : state.rules.waveTeam.data().plans){
+                                    Tile tile = world.tile(plan.x, plan.y);
+                                    if(tile != null){
+                                        tile.setBlock(plan.block, state.rules.waveTeam, plan.rotation);
+                                        if(plan.config != null && tile.build != null){
+                                            tile.build.configureAny(plan.config);
+                                        }
                                     }
                                 }
+                                state.rules.waveTeam.data().plans.clear();
                             }
-                            state.rules.waveTeam.data().blocks.clear();
+
+                            //kill all units, since they should be dead anyway
+                            Groups.unit.clear();
+                            Groups.fire.clear();
+                            Groups.puddle.clear();
+
+                            //reset to 0, so replaced cores don't count
+                            state.rules.defaultTeam.data().unitCap = 0;
+                            Schematics.placeLaunchLoadout(spawn.x, spawn.y);
+
+                            //set up camera/player locations
+                            player.set(spawn.x * tilesize, spawn.y * tilesize);
+                            camera.position.set(player);
+
+                            Events.fire(new SectorLaunchEvent(sector));
+                            Events.fire(Trigger.newGame);
+
+                            state.set(State.playing);
+                            reloader.end();
                         }
-
-                        //kill all units, since they should be dead anyway
-                        Groups.unit.clear();
-                        Groups.fire.clear();
-                        Groups.puddle.clear();
-
-                        Schematics.placeLaunchLoadout(spawn.x, spawn.y);
-
-                        //set up camera/player locations
-                        player.set(spawn.x * tilesize, spawn.y * tilesize);
-                        camera.position.set(player);
-
-                        Events.fire(new SectorLaunchEvent(sector));
-                        Events.fire(Trigger.newGame);
+                    }else{
+                        state.set(State.playing);
+                        reloader.end();
                     }
 
-                    state.set(State.playing);
-                    reloader.end();
-
                 }catch(SaveException e){
                     Log.err(e);
                     sector.save = null;
@@ -385,21 +504,26 @@ public class Control implements ApplicationListener, Loadable{
                 }
                 ui.planet.hide();
             }else{
-                reloader.begin();
-                world.loadSector(sector);
-                state.rules.sector = sector;
-                //assign origin when launching
-                sector.info.origin = origin;
-                sector.info.destination = origin;
-                logic.play();
-                control.saves.saveSector(sector);
-                Events.fire(new SectorLaunchEvent(sector));
-                Events.fire(Trigger.newGame);
-                reloader.end();
+                playNewSector(origin, sector, reloader);
             }
         });
     }
 
+    public void playNewSector(@Nullable Sector origin, Sector sector, WorldReloader reloader){
+        reloader.begin();
+        world.loadSector(sector);
+        state.rules.sector = sector;
+        //assign origin when launching
+        sector.info.origin = origin;
+        sector.info.destination = origin;
+        logic.play();
+        control.saves.saveSector(sector);
+        Events.fire(new SectorLaunchEvent(sector));
+        Events.fire(Trigger.newGame);
+        reloader.end();
+        state.set(State.playing);
+    }
+
     public boolean isHighScore(){
         return hiscore;
     }
@@ -407,7 +531,7 @@ public class Control implements ApplicationListener, Loadable{
     @Override
     public void dispose(){
         //try to save when exiting
-        if(saves != null && saves.getCurrent() != null && saves.getCurrent().isAutosave() && !net.client() && !state.isMenu()){
+        if(saves != null && saves.getCurrent() != null && saves.getCurrent().isAutosave() && !net.client() && !state.isMenu() && !state.gameOver){
             try{
                 SaveIO.save(control.saves.getCurrent().file);
                 Log.info("Saved on exit.");
@@ -420,16 +544,13 @@ public class Control implements ApplicationListener, Loadable{
             music.stop();
         }
 
-        content.dispose();
         net.dispose();
-        Musics.dispose();
-        Sounds.dispose();
-        if(ui != null && ui.editor != null) ui.editor.dispose();
     }
 
     @Override
     public void pause(){
-        if(settings.getBool("backgroundpause", true)){
+        if(settings.getBool("backgroundpause", true) && !net.active()){
+            backgroundPaused = true;
             wasPaused = state.is(State.paused);
             if(state.is(State.playing)) state.set(State.paused);
         }
@@ -437,9 +558,10 @@ public class Control implements ApplicationListener, Loadable{
 
     @Override
     public void resume(){
-        if(state.is(State.paused) && !wasPaused && settings.getBool("backgroundpause", true)){
+        if(state.is(State.paused) && !wasPaused && settings.getBool("backgroundpause", true) && !net.active()){
             state.set(State.playing);
         }
+        backgroundPaused = false;
     }
 
     @Override
@@ -502,7 +624,7 @@ public class Control implements ApplicationListener, Loadable{
             if(full){
                 graphics.setWindowedMode(graphics.getWidth(), graphics.getHeight());
             }else{
-                graphics.setFullscreenMode(graphics.getDisplayMode());
+                graphics.setFullscreen();
             }
             settings.put("fullscreen", !full);
         }
@@ -516,6 +638,9 @@ public class Control implements ApplicationListener, Loadable{
 
         if(state.isGame()){
             input.update();
+            if(!state.isPaused()){
+                indicators.update();
+            }
 
             //auto-update rpc every 5 seconds
             if(timer.get(0, 60 * 5)){
@@ -528,8 +653,17 @@ public class Control implements ApplicationListener, Loadable{
                 core.items.each((i, a) -> i.unlock());
             }
 
-            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);
+            if(backgroundPaused && settings.getBool("backgroundpause") && !net.active()){
+                state.set(State.paused);
+            }
+
+            //cannot launch while paused
+            if(state.isPaused() && renderer.isCutscene()){
+                state.set(State.playing);
+            }
+
+            if(!net.client() && Core.input.keyTap(Binding.pause) && !renderer.isCutscene() && !scene.hasDialog() && !scene.hasKeyboard() && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){
+                state.set(state.isPaused() ? State.playing : State.paused);
             }
 
             if(Core.input.keyTap(Binding.menu) && !ui.restart.isShown() && !ui.minimapfrag.shown()){
@@ -537,11 +671,13 @@ public class Control implements ApplicationListener, Loadable{
                     ui.chatfrag.hide();
                 }else if(!ui.paused.isShown() && !scene.hasDialog()){
                     ui.paused.show();
-                    state.set(State.paused);
+                    if(!net.active()){
+                        state.set(State.paused);
+                    }
                 }
             }
 
-            if(!mobile && Core.input.keyTap(Binding.screenshot) && !(scene.getKeyboardFocus() instanceof TextField) && !scene.hasKeyboard()){
+            if(!mobile && Core.input.keyTap(Binding.screenshot) && !scene.hasField() && !scene.hasKeyboard()){
                 renderer.takeMapScreenshot();
             }
 
diff --git a/core/src/mindustry/core/FileTree.java b/core/src/mindustry/core/FileTree.java
index d9ca5694c1..06c6c3f96d 100644
--- a/core/src/mindustry/core/FileTree.java
+++ b/core/src/mindustry/core/FileTree.java
@@ -2,15 +2,22 @@ package mindustry.core;
 
 import arc.*;
 import arc.assets.loaders.*;
+import arc.assets.loaders.MusicLoader.*;
+import arc.assets.loaders.SoundLoader.*;
+import arc.audio.*;
 import arc.files.*;
 import arc.struct.*;
+import mindustry.*;
+import mindustry.gen.*;
 
 /** Handles files in a modded context. */
 public class FileTree implements FileHandleResolver{
     private ObjectMap<String, Fi> files = new ObjectMap<>();
+    private ObjectMap<String, Sound> loadedSounds = new ObjectMap<>();
+    private ObjectMap<String, Music> loadedMusic = new ObjectMap<>();
 
     public void addFile(String path, Fi f){
-        files.put(path, f);
+        files.put(path.replace('\\', '/'), f);
     }
 
     /** Gets an asset file.*/
@@ -40,4 +47,42 @@ public class FileTree implements FileHandleResolver{
     public Fi resolve(String fileName){
         return get(fileName);
     }
+
+    /**
+     * Loads a sound by name from the sounds/ folder. OGG and MP3 are supported; the extension is automatically added to the end of the file name.
+     * Results are cached; consecutive calls to this method with the same name will return the same sound instance.
+     * */
+    public Sound loadSound(String soundName){
+        if(Vars.headless) return Sounds.none;
+
+        return loadedSounds.get(soundName, () -> {
+            String name = "sounds/" + soundName;
+            String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
+
+            var sound = new Sound();
+            var desc = Core.assets.load(path, Sound.class, new SoundParameter(sound));
+            desc.errored = Throwable::printStackTrace;
+
+            return sound;
+        });
+    }
+
+    /**
+     * Loads a music file by name from the music/ folder. OGG and MP3 are supported; the extension is automatically added to the end of the file name.
+     * Results are cached; consecutive calls to this method with the same name will return the same music instance.
+     * */
+    public Music loadMusic(String musicName){
+        if(Vars.headless) return new Music();
+
+        return loadedMusic.get(musicName, () -> {
+            String name = "music/" + musicName;
+            String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
+
+            var music = new Music();
+            var desc = Core.assets.load(path, Music.class, new MusicParameter(music));
+            desc.errored = Throwable::printStackTrace;
+
+            return music;
+        });
+    }
 }
diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java
index de7cf6f60c..1066e6d2a6 100644
--- a/core/src/mindustry/core/GameState.java
+++ b/core/src/mindustry/core/GameState.java
@@ -16,37 +16,52 @@ public class GameState{
     public int wave = 1;
     /** Wave countdown in ticks. */
     public float wavetime;
+    /** Logic tick. */
+    public double tick;
+    /** Continuously ticks up every non-paused update. */
+    public long updateId;
     /** Whether the game is in game over state. */
-    public boolean gameOver = false, serverPaused = false, wasTimeout;
+    public boolean gameOver = false;
+    /** Whether the player's team won the match. */
+    public boolean won = false;
+    /** Server ticks/second. Only valid in multiplayer. */
+    public int serverTps = -1;
     /** Map that is currently being played on. */
     public Map map = emptyMap;
     /** The current game rules. */
     public Rules rules = new Rules();
     /** Statistics for this save/game. Displayed after game over. */
     public GameStats stats = new GameStats();
+    /** Markers not linked to objectives. Controlled by world processors. */
+    public MapMarkers markers = new MapMarkers();
+    /** Locale-specific string bundles of current map */
+    public MapLocales mapLocales = new MapLocales();
     /** Global attributes of the environment, calculated by weather. */
     public Attributes envAttrs = new Attributes();
     /** Team data. Gets reset every new game. */
     public Teams teams = new Teams();
     /** Number of enemies in the game; only used clientside in servers. */
     public int enemies;
+    /** Map being playtested (not edited!) */
+    public @Nullable Map playtestingMap;
     /** Current game state. */
     private State state = State.menu;
 
+    @Nullable
     public Unit boss(){
-        return teams.boss;
+        return teams.bosses.firstOpt();
     }
 
     public void set(State astate){
-        //cannot pause when in multiplayer
-        if(astate == State.paused && net.active()) return;
+        //nothing to change.
+        if(state == astate) return;
 
         Events.fire(new StateChangeEvent(state, astate));
         state = astate;
     }
 
     public boolean hasSpawns(){
-        return rules.waves && !(isCampaign() && rules.attackMode);
+        return rules.waves && ((rules.waveTeam.cores().size > 0 && rules.attackMode) || rules.spawns.size > 0);
     }
 
     /** Note that being in a campaign does not necessarily mean having a sector. */
@@ -58,21 +73,25 @@ public class GameState{
         return rules.sector != null;
     }
 
-    @Nullable
-    public Sector getSector(){
+    public @Nullable Sector getSector(){
         return rules.sector;
     }
 
+    public @Nullable Planet getPlanet(){
+        return rules.sector != null ? rules.sector.planet : rules.planet;
+    }
+
     public boolean isEditor(){
         return rules.editor;
     }
 
     public boolean isPaused(){
-        return (is(State.paused) && !net.active()) || (gameOver && (!net.active() || isCampaign())) || (serverPaused && !isMenu());
+        return state == State.paused;
     }
 
+    /** @return whether there is an unpaused game in progress. */
     public boolean isPlaying(){
-        return (state == State.playing) || (state == State.paused && !isPaused());
+        return state == State.playing;
     }
 
     /** @return whether the current state is *not* the menu. */
diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index 91a0c410c1..328d838c4c 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -3,6 +3,7 @@ package mindustry.core;
 import arc.*;
 import arc.math.*;
 import arc.util.*;
+import mindustry.ai.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.core.GameState.*;
 import mindustry.ctype.*;
@@ -14,6 +15,7 @@ import mindustry.maps.*;
 import mindustry.type.*;
 import mindustry.type.Weather.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 import java.util.*;
 
@@ -32,85 +34,108 @@ public class Logic implements ApplicationListener{
     public Logic(){
 
         Events.on(BlockDestroyEvent.class, event -> {
+            //skip if rule is off
+            if(!state.rules.ghostBlocks) return;
+
             //blocks that get broken are appended to the team's broken block queue
             Tile tile = event.tile;
-            //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;
+            //skip null entities or un-rebuildables, for obvious reasons
+            if(tile.build == null || !tile.block().rebuildable) return;
 
             tile.build.addPlan(true);
         });
 
         Events.on(BlockBuildEndEvent.class, event -> {
             if(!event.breaking){
-                TeamData data = state.teams.get(event.team);
-                Iterator<BlockPlan> it = data.blocks.iterator();
-                while(it.hasNext()){
-                    BlockPlan b = it.next();
-                    Block block = content.block(b.block);
-                    if(event.tile.block().bounds(event.tile.x, event.tile.y, Tmp.r1).overlaps(block.bounds(b.x, b.y, Tmp.r2))){
-                        it.remove();
-                    }
+                checkOverlappingPlans(event.team, event.tile);
+
+                if(event.team == state.rules.defaultTeam){
+                    state.stats.placedBlockCount.increment(event.tile.block());
                 }
             }
         });
 
+        Events.on(PayloadDropEvent.class, e -> {
+            if(e.build != null){
+                checkOverlappingPlans(e.build.team, e.build.tile);
+            }
+        });
+
         //when loading a 'damaged' sector, propagate the damage
         Events.on(SaveLoadEvent.class, e -> {
             if(state.isCampaign()){
-                SectorInfo info = state.rules.sector.info;
-                info.write();
+                state.rules.coreIncinerates = true;
 
-                //how much wave time has passed
-                int wavesPassed = info.wavesPassed;
+                //TODO why is this even a thing?
+                state.rules.canGameOver = true;
 
-                //wave has passed, remove all enemies, they are assumed to be dead
-                if(wavesPassed > 0){
-                    Groups.unit.each(u -> {
-                        if(u.team == state.rules.waveTeam){
-                            u.remove();
+                //fresh map has no sector info
+                if(!e.isMap){
+                    SectorInfo info = state.rules.sector.info;
+                    info.write();
+
+                    //only simulate waves if the planet allows it
+                    if(state.rules.sector.planet.allowWaveSimulation){
+                        //how much wave time has passed
+                        int wavesPassed = info.wavesPassed;
+
+                        //wave has passed, remove all enemies, they are assumed to be dead
+                        if(wavesPassed > 0){
+                            Groups.unit.each(u -> {
+                                if(u.team == state.rules.waveTeam){
+                                    u.remove();
+                                }
+                            });
                         }
-                    });
-                }
 
-                //simulate passing of waves
-                if(wavesPassed > 0){
-                    //simulate wave counter moving forward
-                    state.wave += wavesPassed;
-                    state.wavetime = state.rules.waveSpacing;
+                        //simulate passing of waves
+                        if(wavesPassed > 0){
+                            //simulate wave counter moving forward
+                            state.wave += wavesPassed;
+                            state.wavetime = state.rules.waveSpacing * state.getPlanet().campaignRules.difficulty.waveTimeMultiplier;
 
-                    SectorDamage.applyCalculatedDamage();
-
-                    //make sure damaged buildings are counted
-                    for(Tile tile : world.tiles){
-                        if(tile.build != null && tile.build.damaged()){
-                            indexer.notifyTileDamaged(tile.build);
+                            SectorDamage.applyCalculatedDamage();
                         }
                     }
+
+                    state.getSector().planet.applyRules(state.rules);
+
+                    //reset values
+                    info.damage = 0f;
+                    info.wavesPassed = 0;
+                    info.hasCore = true;
+                    info.secondsPassed = 0;
+
+                    state.rules.sector.saveInfo();
                 }
-
-                //reset values
-                info.damage = 0f;
-                info.wavesPassed = 0;
-                info.hasCore = true;
-                info.secondsPassed = 0;
-
-                state.rules.sector.saveInfo();
             }
         });
 
+        Events.on(PlayEvent.class, e -> {
+            //reset weather on play
+            var randomWeather = state.rules.weather.copy().shuffle();
+            float sum = 0f;
+            for(var weather : randomWeather){
+                weather.cooldown = sum + Mathf.random(weather.maxFrequency);
+                sum += weather.cooldown;
+            }
+            //tick resets on new save play
+            state.tick = 0f;
+        });
+
         Events.on(WorldLoadEvent.class, e -> {
             //enable infinite ammo for wave team by default
             state.rules.waveTeam.rules().infiniteAmmo = true;
 
             if(state.isCampaign()){
                 //enable building AI on campaign unless the preset disables it
-                if(!(state.getSector().preset != null && !state.getSector().preset.useAI)){
-                    state.rules.waveTeam.rules().ai = true;
-                }
-                state.rules.waveTeam.rules().aiTier = state.getSector().threat * 0.8f;
-                state.rules.waveTeam.rules().infiniteResources = true;
 
-                //fill enemy cores by default.
+                state.rules.coreIncinerates = true;
+                state.rules.allowEditWorldProcessors = false;
+                state.rules.waveTeam.rules().infiniteResources = true;
+                state.rules.waveTeam.rules().buildSpeedMultiplier *= state.getPlanet().enemyBuildSpeedMultiplier;
+
+                //fill enemy cores by default? TODO decide
                 for(var core : state.rules.waveTeam.cores()){
                     for(Item item : content.items()){
                         core.items.set(item, core.block.itemCapacity);
@@ -131,61 +156,95 @@ public class Logic implements ApplicationListener{
 
         Events.on(SectorCaptureEvent.class, e -> {
             if(!net.client() && e.sector == state.getSector() && e.sector.isBeingPlayed()){
-                for(Tile tile : world.tiles){
-                    //convert all blocks to neutral, randomly killing them
-                    if(tile.isCenter() && tile.build != null && tile.build.team == state.rules.waveTeam){
-                        Building b = tile.build;
-                        Call.setTeam(b, Team.derelict);
-                        Time.run(Mathf.random(0f, 60f * 6f), () -> {
-                            if(Mathf.chance(0.25)){
-                                b.kill();
-                            }
-                        });
-                    }
+                state.rules.waveTeam.data().destroyToDerelict();
+            }
+        });
+
+        Events.on(BlockDestroyEvent.class, e -> {
+            if(e.tile.build instanceof CoreBuild core && core.team.isAI() && state.rules.coreDestroyClear){
+                Core.app.post(() -> {
+                    core.team.data().timeDestroy(core.x, core.y, state.rules.enemyCoreBuildRadius);
+                });
+            }
+        });
+
+        //listen to core changes; if all cores have been destroyed, set to derelict.
+        Events.on(CoreChangeEvent.class, e -> Core.app.post(() -> {
+            if(state.rules.cleanupDeadTeams && state.rules.pvp && !e.core.isAdded() && e.core.team != Team.derelict && e.core.team.cores().isEmpty()){
+                e.core.team.data().destroyToDerelict();
+            }
+        }));
+
+        Events.on(BlockBuildEndEvent.class, e -> {
+            if(e.team == state.rules.defaultTeam){
+                if(e.breaking){
+                    state.stats.buildingsDeconstructed++;
+                }else{
+                    state.stats.buildingsBuilt++;
                 }
-
-                //kill all units
-                Groups.unit.each(u -> {
-                    if(u.team == state.rules.waveTeam){
-                        Time.run(Mathf.random(0f, 60f * 5f), u::kill);
-                    }
-                });
             }
         });
 
-        //send out items to each client
-        Events.on(TurnEvent.class, e -> {
-            if(net.server() && state.isCampaign()){
-                int[] out = new int[content.items().size];
-                state.getSector().info.production.each((item, stat) -> {
-                    out[item.id] = Math.max(0, (int)(stat.mean * turnDuration / 60));
-                });
-
-                Call.sectorProduced(out);
+        Events.on(BlockDestroyEvent.class, e -> {
+            if(e.tile.team() == state.rules.defaultTeam){
+                state.stats.buildingsDestroyed ++;
             }
         });
 
+        Events.on(UnitDestroyEvent.class, e -> {
+            if(e.unit.team() != state.rules.defaultTeam){
+                state.stats.enemyUnitsDestroyed ++;
+            }
+        });
+
+        Events.on(UnitCreateEvent.class, e -> {
+            if(e.unit.team == state.rules.defaultTeam){
+                state.stats.unitsCreated++;
+            }
+        });
+    }
+
+    private void checkOverlappingPlans(Team team, Tile tile){
+        TeamData data = team.data();
+        Iterator<BlockPlan> it = data.plans.iterator();
+        var bounds = tile.block().bounds(tile.x, tile.y, Tmp.r1);
+        while(it.hasNext()){
+            BlockPlan b = it.next();
+            if(bounds.overlaps(b.block.bounds(b.x, b.y, Tmp.r2))){
+                b.removed = true;
+                it.remove();
+            }
+        }
     }
 
     /** Adds starting items, resets wave time, and sets state to playing. */
     public void play(){
         state.set(State.playing);
         //grace period of 2x wave time before game starts
-        state.wavetime = state.rules.waveSpacing * 2;
+        state.wavetime = (state.rules.initialWaveSpacing <= 0 ? state.rules.waveSpacing * 2 : state.rules.initialWaveSpacing) * (state.isCampaign() ? state.getPlanet().campaignRules.difficulty.waveTimeMultiplier : 1f);;
         Events.fire(new PlayEvent());
 
         //add starting items
-        if(!state.isCampaign()){
+        if(!state.isCampaign() || !state.rules.sector.planet.allowLaunchLoadout || (state.rules.sector.preset != null && state.rules.sector.preset.addStartingItems)){
             for(TeamData team : state.teams.getActive()){
                 if(team.hasCore()){
-                    Building entity = team.core();
+                    CoreBuild entity = team.core();
                     entity.items.clear();
+
                     for(ItemStack stack : state.rules.loadout){
-                        entity.items.add(stack.item, stack.amount);
+                        //make sure to cap storage
+                        entity.items.add(stack.item, Math.min(stack.amount, entity.storageCapacity - entity.items.get(stack.item)));
                     }
                 }
             }
         }
+
+        //heal all cores on game start
+        for(TeamData team : state.teams.getActive()){
+            for(var entity : team.cores){
+                entity.heal();
+            }
+        }
     }
 
     public void reset(){
@@ -198,19 +257,20 @@ public class Logic implements ApplicationListener{
         Groups.clear();
         Time.clear();
         Events.fire(new ResetEvent());
+        world.tiles = new Tiles(0, 0);
 
         //save settings on reset
         Core.settings.manualSave();
     }
 
     public void skipWave(){
-        state.wavetime = 0;
+        runWave();
     }
 
     public void runWave(){
         spawner.spawnEnemies();
         state.wave++;
-        state.wavetime = state.rules.waveSpacing;
+        state.wavetime = state.rules.waveSpacing * (state.isCampaign() ? state.getPlanet().campaignRules.difficulty.waveTimeMultiplier : 1f);
 
         Events.fire(new WaveEvent());
     }
@@ -234,7 +294,14 @@ public class Logic implements ApplicationListener{
             if(state.rules.waves && (state.enemies == 0 && state.rules.winWave > 0 && state.wave >= state.rules.winWave && !spawner.isSpawning()) ||
                 (state.rules.attackMode && state.rules.waveTeam.cores().isEmpty())){
 
-                Call.sectorCapture();
+                if(state.rules.sector.preset != null && state.rules.sector.preset.attackAfterWaves && !state.rules.attackMode){
+                    //activate attack mode to destroy cores after waves are done.
+                    state.rules.attackMode = true;
+                    state.rules.waves = false;
+                    Call.setRules(state.rules);
+                }else{
+                    Call.sectorCapture();
+                }
             }
         }else{
             if(!state.rules.attackMode && state.teams.playerCores().size == 0 && !state.gameOver){
@@ -242,19 +309,22 @@ public class Logic implements ApplicationListener{
                 Events.fire(new GameOverEvent(state.rules.waveTeam));
             }else if(state.rules.attackMode){
                 //count # of teams alive
-                int countAlive = state.teams.getActive().count(TeamData::hasCore);
+                int countAlive = state.teams.getActive().count(t -> t.hasCore() && t.team != Team.derelict);
 
                 if((countAlive <= 1 || (!state.rules.pvp && state.rules.defaultTeam.core() == null)) && !state.gameOver){
                     //find team that won
-                    TeamData left = state.teams.getActive().find(TeamData::hasCore);
+                    TeamData left = state.teams.getActive().find(t -> t.hasCore() && t.team != Team.derelict);
                     Events.fire(new GameOverEvent(left == null ? Team.derelict : left.team));
                     state.gameOver = true;
                 }
+            }else if(!state.gameOver && state.rules.waves && (state.enemies == 0 && state.rules.winWave > 0 && state.wave >= state.rules.winWave && !spawner.isSpawning())){
+                state.gameOver = true;
+                Events.fire(new GameOverEvent(state.rules.defaultTeam));
             }
         }
     }
 
-    private void updateWeather(){
+    protected void updateWeather(){
         state.rules.weather.removeAll(w -> w.weather == null);
 
         for(WeatherEntry entry : state.rules.weather){
@@ -282,14 +352,21 @@ public class Logic implements ApplicationListener{
             return;
         }
 
+        boolean initial = !state.rules.sector.info.wasCaptured;
+
         state.rules.sector.info.wasCaptured = true;
 
         //fire capture event
-        Events.fire(new SectorCaptureEvent(state.rules.sector));
+        Events.fire(new SectorCaptureEvent(state.rules.sector, initial));
 
         //disable attack mode
         state.rules.attackMode = false;
 
+        //map is over, no more world processor objective stuff
+        state.rules.disableWorldProcessors = true;
+
+        Call.clearObjectives();
+
         //save, just in case
         if(!headless && !net.client()){
             control.saves.saveSector(state.rules.sector);
@@ -299,12 +376,16 @@ public class Logic implements ApplicationListener{
     @Remote(called = Loc.both)
     public static void updateGameOver(Team winner){
         state.gameOver = true;
+        if(!headless){
+            state.won = player.team() == winner;
+        }
     }
 
     @Remote(called = Loc.both)
     public static void gameOver(Team winner){
         state.stats.wavesLasted = state.wave;
-        ui.restart.show(winner);
+        state.won = player.team() == winner;
+        Time.run(60f * 3f, () -> ui.restart.show(winner));
         netClient.setQuiet();
     }
 
@@ -313,51 +394,20 @@ public class Logic implements ApplicationListener{
     public static void researched(Content content){
         if(!(content instanceof UnlockableContent u)) return;
 
-        var node = u.node();
+        boolean was = u.unlockedNowHost();
+        state.rules.researched.add(u);
 
-        //unlock all direct dependencies on client, permanently
-        while(node != null){
-            node.content.unlock();
-            node = node.parent;
-        }
-
-        state.rules.researched.add(u.name);
-    }
-
-    //called when the remote server runs a turn and produces something
-    @Remote
-    public static void sectorProduced(int[] amounts){
-        if(!state.isCampaign()) return;
-        Planet planet = state.rules.sector.planet;
-        boolean any = false;
-
-        for(Item item : content.items()){
-            int am = amounts[item.id];
-            if(am > 0){
-                int sumMissing = planet.sectors.sum(s -> s.hasBase() ? s.info.storageCapacity - s.info.items.get(item) : 0);
-                if(sumMissing == 0) continue;
-                //how much % to add
-                double percent = Math.min((double)am / sumMissing, 1);
-                for(Sector sec : planet.sectors){
-                    if(sec.hasBase()){
-                        int added = (int)Math.ceil(((sec.info.storageCapacity - sec.info.items.get(item)) * percent));
-                        sec.info.items.add(item, added);
-                        any = true;
-                    }
-                }
-            }
-        }
-
-        if(any){
-            for(Sector sec : planet.sectors){
-                sec.saveInfo();
-            }
+        if(!was){
+            Events.fire(new UnlockEvent(u));
         }
     }
 
     @Override
     public void dispose(){
         //save the settings before quitting
+        if(netServer != null){
+            netServer.admins.forceSave();
+        }
         Core.settings.manualSave();
     }
 
@@ -367,16 +417,29 @@ public class Logic implements ApplicationListener{
         universe.updateGlobal();
 
         if(Core.settings.modified() && !state.isPlaying()){
+            netServer.admins.forceSave();
             Core.settings.forceSave();
         }
 
+        boolean runStateCheck = !net.client() && !world.isInvalidMap() && !state.isEditor() && state.rules.canGameOver;
+
         if(state.isGame()){
             if(!net.client()){
-                state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.type.isCounted);
+                state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.isEnemy());
             }
 
             if(!state.isPaused()){
+                Events.fire(Trigger.beforeGameUpdate);
+
+                float delta = Core.graphics.getDeltaTime();
+                state.tick += Float.isNaN(delta) || Float.isInfinite(delta) ? 0f : delta * 60f;
+                state.updateId ++;
                 state.teams.updateTeamStats();
+                MapPreviewLoader.checkPreviews();
+
+                if(state.rules.fog){
+                    fogControl.update();
+                }
 
                 if(state.isCampaign()){
                     state.rules.sector.info.update();
@@ -387,17 +450,30 @@ public class Logic implements ApplicationListener{
                 }
                 Time.update();
 
+                logicVars.update();
+
                 //weather is serverside
                 if(!net.client() && !state.isEditor()){
                     updateWeather();
 
                     for(TeamData data : state.teams.getActive()){
-                        if(data.hasAI()){
-                            data.ai.update();
+                        //does not work on PvP so built-in attack maps can have it on by default without issues
+                        if(data.team.rules().buildAi && !state.rules.pvp){
+                            if(data.buildAi == null) data.buildAi = new BaseBuilderAI(data);
+                            data.buildAi.update();
+                        }
+
+                        if(data.team.rules().rtsAi){
+                            if(data.rtsAi == null) data.rtsAi = new RtsAI(data);
+                            data.rtsAi.update();
                         }
                     }
                 }
 
+                if(!state.isEditor()){
+                    state.rules.objectives.update();
+                }
+
                 if(state.rules.waves && state.rules.waveTimer && !state.gameOver){
                     if(!isWaitingWave()){
                         state.wavetime = Math.max(state.wavetime - Time.delta, 0);
@@ -410,14 +486,19 @@ public class Logic implements ApplicationListener{
 
                 //apply weather attributes
                 state.envAttrs.clear();
+                state.envAttrs.add(state.rules.attributes);
                 Groups.weather.each(w -> state.envAttrs.add(w.weather.attrs, w.opacity));
 
                 Groups.update();
+
+                Events.fire(Trigger.afterGameUpdate);
             }
 
-            if(!net.client() && !world.isInvalidMap() && !state.isEditor() && state.rules.canGameOver){
+            if(runStateCheck){
                 checkGameState();
             }
+        }else if(netServer.isWaitingForPlayers() && runStateCheck){
+            checkGameState();
         }
     }
 
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 32b058997b..32c4543043 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -1,6 +1,7 @@
 package mindustry.core;
 
 import arc.*;
+import arc.audio.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.math.*;
@@ -9,31 +10,36 @@ import arc.util.*;
 import arc.util.CommandHandler.*;
 import arc.util.io.*;
 import arc.util.serialization.*;
+import arc.util.serialization.JsonValue.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.core.GameState.*;
 import mindustry.entities.*;
-import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
+import mindustry.game.Teams.*;
 import mindustry.gen.*;
+import mindustry.io.*;
+import mindustry.logic.*;
 import mindustry.net.Administration.*;
-import mindustry.net.Net.*;
 import mindustry.net.*;
 import mindustry.net.Packets.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.modules.*;
 
 import java.io.*;
+import java.util.*;
 import java.util.zip.*;
 
 import static mindustry.Vars.*;
 
 public class NetClient implements ApplicationListener{
-    private static final float dataTimeout = 60 * 18;
-    private static final float playerSyncTime = 2;
-    public static final float viewScale = 2f;
+    private static final long entitySnapshotTimeout = 1000 * 20;
+    private static final float dataTimeout = 60 * 30;
+    /** ticks between syncs, e.g. 5 means 60/5 = 12 syncs/sec*/
+    private static final float playerSyncTime = 4;
+    private static final Reads dataReads = new Reads(null);
+    private static final JsonValue tmpJsonMap = new JsonValue(ValueType.object);
 
     private long ping;
     private Interval timer = new Interval(5);
@@ -45,6 +51,8 @@ public class NetClient implements ApplicationListener{
     private boolean quietReset = false;
     /** Counter for data timeout. */
     private float timeoutTime = 0f;
+    /** Timestamp for last UDP state snapshot received. */
+    private long lastSnapshotTimestamp;
     /** Last sent client snapshot ID. */
     private int lastSent;
 
@@ -55,16 +63,25 @@ public class NetClient implements ApplicationListener{
     private DataInputStream dataStream = new DataInputStream(byteStream);
     /** Packet handlers for custom types of messages. */
     private ObjectMap<String, Seq<Cons<String>>> customPacketHandlers = new ObjectMap<>();
+    /** Packet handlers for custom types of messages, in binary. */
+    private ObjectMap<String, Seq<Cons<byte[]>>> customBinaryPacketHandlers = new ObjectMap<>();
 
     public NetClient(){
 
         net.handleClient(Connect.class, packet -> {
             Log.info("Connecting to server: @", packet.addressTCP);
 
-            player.admin(false);
+            player.admin = false;
 
             reset();
 
+            //connection after reset
+            if(!net.client()){
+                Log.info("Connection canceled.");
+                disconnectQuietly();
+                return;
+            }
+
             ui.loadfrag.hide();
             ui.loadfrag.show("@connecting.data");
 
@@ -73,12 +90,18 @@ public class NetClient implements ApplicationListener{
                 disconnectQuietly();
             });
 
-            ConnectPacket c = new ConnectPacket();
+            String locale = Core.settings.getString("locale");
+            if(locale.equals("default")){
+                locale = Locale.getDefault().toString();
+            }
+
+            var c = new ConnectPacket();
             c.name = player.name;
+            c.locale = locale;
             c.mods = mods.getModStrings();
             c.mobile = mobile;
             c.versionType = Version.type;
-            c.color = player.color().rgba();
+            c.color = player.color.rgba();
             c.usid = getUsid(packet.addressTCP);
             c.uuid = platform.getUUID();
 
@@ -89,7 +112,7 @@ public class NetClient implements ApplicationListener{
                 return;
             }
 
-            net.send(c, SendMode.tcp);
+            net.send(c, true);
         });
 
         net.handleClient(Disconnect.class, packet -> {
@@ -98,19 +121,19 @@ public class NetClient implements ApplicationListener{
             connecting = false;
             logic.reset();
             platform.updateRPC();
-            player.name(Core.settings.getString("name"));
-            player.color().set(Core.settings.getInt("color-0"));
+            player.name = Core.settings.getString("name");
+            player.color.set(Core.settings.getInt("color-0"));
 
             if(quiet) return;
 
             Time.runTask(3f, ui.loadfrag::hide);
 
             if(packet.reason != null){
-                switch(packet.reason){
-                    case "closed" -> ui.showSmall("@disconnect", "@disconnect.closed");
-                    case "timeout" -> ui.showSmall("@disconnect", "@disconnect.timeout");
-                    case "error" -> ui.showSmall("@disconnect", "@disconnect.error");
-                }
+                ui.showSmall(switch(packet.reason){
+                    case "closed" -> "@disconnect.closed";
+                    case "timeout" -> "@disconnect.timeout";
+                    default -> "@disconnect.error";
+                }, "@disconnect.closed");
             }else{
                 ui.showErrorMessage("@disconnect");
             }
@@ -122,10 +145,6 @@ public class NetClient implements ApplicationListener{
 
             finishConnecting();
         });
-
-        net.handleClient(InvokePacket.class, packet -> {
-            RemoteReadClient.readPacket(packet.reader(), packet.type);
-        });
     }
 
     public void addPacketHandler(String type, Cons<String> handler){
@@ -136,10 +155,34 @@ public class NetClient implements ApplicationListener{
         return customPacketHandlers.get(type, Seq::new);
     }
 
+    public void addBinaryPacketHandler(String type, Cons<byte[]> handler){
+        customBinaryPacketHandlers.get(type, Seq::new).add(handler);
+    }
+
+    public Seq<Cons<byte[]>> getBinaryPacketHandlers(String type){
+        return customBinaryPacketHandlers.get(type, Seq::new);
+    }
+
+    @Remote(targets = Loc.server, variants = Variant.both)
+    public static void clientBinaryPacketReliable(String type, byte[] contents){
+        var arr = netClient.customBinaryPacketHandlers.get(type);
+        if(arr != null){
+            for(var c : arr){
+                c.get(contents);
+            }
+        }
+    }
+
+    @Remote(targets = Loc.server, variants = Variant.both, unreliable = true)
+    public static void clientBinaryPacketUnreliable(String type, byte[] contents){
+        clientBinaryPacketReliable(type, contents);
+    }
+
     @Remote(targets = Loc.server, variants = Variant.both)
     public static void clientPacketReliable(String type, String contents){
-        if(netClient.customPacketHandlers.containsKey(type)){
-            for(Cons<String> c : netClient.customPacketHandlers.get(type)){
+        var arr = netClient.customPacketHandlers.get(type);
+        if(arr != null){
+            for(Cons<String> c : arr){
                 c.get(contents);
             }
         }
@@ -150,16 +193,52 @@ public class NetClient implements ApplicationListener{
         clientPacketReliable(type, contents);
     }
 
-    //called on all clients
+    @Remote(variants = Variant.both, unreliable = true, called = Loc.server)
+    public static void sound(Sound sound, float volume, float pitch, float pan){
+        if(sound == null || headless) return;
+
+        sound.play(Mathf.clamp(volume, 0, 8f) * Core.settings.getInt("sfxvol") / 100f, Mathf.clamp(pitch, 0f, 20f), pan, false, false);
+    }
+
+    @Remote(variants = Variant.both, unreliable = true, called = Loc.server)
+    public static void soundAt(Sound sound, float x, float y, float volume, float pitch){
+        if(sound == null || headless) return;
+
+        sound.at(x, y, Mathf.clamp(pitch, 0f, 20f), Mathf.clamp(volume, 0, 4f));
+    }
+
+    @Remote(variants = Variant.both, unreliable = true)
+    public static void effect(Effect effect, float x, float y, float rotation, Color color){
+        if(effect == null) return;
+
+        effect.at(x, y, rotation, color);
+    }
+
+    @Remote(variants = Variant.both, unreliable = true)
+    public static void effect(Effect effect, float x, float y, float rotation, Color color, Object data){
+        if(effect == null) return;
+
+        effect.at(x, y, rotation, color, data);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void effectReliable(Effect effect, float x, float y, float rotation, Color color){
+        effect(effect, x, y, rotation, color);
+    }
+
     @Remote(targets = Loc.server, variants = Variant.both)
-    public static void sendMessage(String message, String sender, Player playersender){
+    public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){
         if(Vars.ui != null){
-            Vars.ui.chatfrag.addMessage(message, sender);
+            Vars.ui.chatfrag.addMessage(message);
+            Sounds.chatMessage.play();
         }
 
-        if(playersender != null){
-            playersender.lastText(message);
+        if(playersender != null && unformatted != null){
+            //display raw unformatted text above player head
+            playersender.lastText(unformatted);
             playersender.textFadeTime(1f);
+
+            Events.fire(new PlayerChatEvent(playersender, unformatted));
         }
     }
 
@@ -167,76 +246,83 @@ public class NetClient implements ApplicationListener{
     @Remote(called = Loc.server, targets = Loc.server)
     public static void sendMessage(String message){
         if(Vars.ui != null){
-            Vars.ui.chatfrag.addMessage(message, null);
+            Vars.ui.chatfrag.addMessage(message);
+            Sounds.chatMessage.play();
         }
     }
 
     //called when a server receives a chat message from a player
     @Remote(called = Loc.server, targets = Loc.client)
     public static void sendChatMessage(Player player, String message){
+
+        //do not receive chat messages from clients that are too young or not registered
+        if(net.server() && player != null && player.con != null && (Time.timeSinceMillis(player.con.connectTime) < 500 || !player.con.hasConnected || !player.isAdded())) return;
+
+        //detect and kick for foul play
+        if(player != null && player.con != null && !player.con.chatRate.allow(2000, Config.chatSpamLimit.num())){
+            player.con.kick(KickReason.kick);
+            netServer.admins.blacklistDos(player.con.address);
+            return;
+        }
+
+        if(message == null) return;
+
         if(message.length() > maxTextLength){
             throw new ValidateException(player, "Player has sent a message above the text limit.");
         }
 
+        message = message.replace("\n", "");
+
         Events.fire(new PlayerChatEvent(player, message));
 
+        //log commands before they are handled
+        if(message.startsWith(netServer.clientCommands.getPrefix())){
+            //log with brackets
+            Log.info("<&fi@: @&fr>", "&lk" + player.plainName(), "&lw" + message);
+        }
+
         //check if it's a command
         CommandResponse response = netServer.clientCommands.handleMessage(message, player);
         if(response.type == ResponseType.noCommand){ //no command to handle
             message = netServer.admins.filterMessage(player, message);
-            //supress chat message if it's filtered out
+            //suppress chat message if it's filtered out
             if(message == null){
                 return;
             }
 
             //special case; graphical server needs to see its message
             if(!headless){
-                sendMessage(message, colorizeName(player.id(), player.name), player);
+                sendMessage(netServer.chatFormatter.format(player, message), message, player);
             }
 
             //server console logging
-            Log.info("&fi@: @", "&lc" + player.name, "&lw" + message);
+            Log.info("&fi@: @", "&lc" + player.plainName(), "&lw" + message);
 
             //invoke event for all clients but also locally
             //this is required so other clients get the correct name even if they don't know who's sending it yet
-            Call.sendMessage(message, colorizeName(player.id(), player.name), player);
+            Call.sendMessage(netServer.chatFormatter.format(player, message), message, player);
         }else{
-            //log command to console but with brackets
-            Log.info("<&fi@: @&fr>", "&lk" + player.name, "&lw" + message);
 
             //a command was sent, now get the output
             if(response.type != ResponseType.valid){
-                String text;
-
-                //send usage
-                if(response.type == ResponseType.manyArguments){
-                    text = "[scarlet]Too many arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
-                }else if(response.type == ResponseType.fewArguments){
-                    text = "[scarlet]Too few arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
-                }else{ //unknown command
-                    text = "[scarlet]Unknown command. Check [lightgray]/help[scarlet].";
+                String text = netServer.invalidHandler.handle(player, response);
+                if(text != null){
+                    player.sendMessage(text);
                 }
-
-                player.sendMessage(text);
             }
         }
     }
 
-    public static String colorizeName(int id, String name){
-        Player player = Groups.player.getByID(id);
-        if(name == null || player == null) return null;
-        return "[#" + player.color().toString().toUpperCase() + "]" + name;
-    }
-
     @Remote(called = Loc.client, variants = Variant.one)
     public static void connect(String ip, int port){
+        if(!steam && ip.startsWith("steam:")) return;
         netClient.disconnectQuietly();
         logic.reset();
 
         ui.join.connect(ip, port);
     }
 
-    @Remote(targets = Loc.client)
+    @Remote(targets = Loc.client, priority = PacketPriority.high)
     public static void ping(Player player, long time){
         Call.pingResponse(player.con, time);
     }
@@ -257,7 +343,7 @@ public class NetClient implements ApplicationListener{
     public static void kick(KickReason reason){
         netClient.disconnectQuietly();
         logic.reset();
-        
+
         if(reason == KickReason.serverRestarting){
             ui.join.reconnect();
             return;
@@ -281,83 +367,42 @@ public class NetClient implements ApplicationListener{
         ui.loadfrag.hide();
     }
 
-    @Remote(variants = Variant.both, unreliable = true)
-    public static void setHudText(String message){
-        if(message == null) return;
-
-        ui.hudfrag.setHudText(message);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void hideHudText(){
-        ui.hudfrag.toggleHudText(false);
-    }
-
-    /** TCP version */
-    @Remote(variants = Variant.both)
-    public static void setHudTextReliable(String message){
-        setHudText(message);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void announce(String message){
-        if(message == null) return;
-
-        ui.announce(message);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void infoMessage(String message){
-        if(message == null) return;
-
-        ui.showText("", message);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void infoPopup(String message, float duration, int align, int top, int left, int bottom, int right){
-        if(message == null) return;
-
-        ui.showInfoPopup(message, duration, align, top, left, bottom, right);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void label(String message, float duration, float worldx, float worldy){
-        if(message == null) return;
-
-        ui.showLabel(message, duration, worldx, worldy);
-    }
-
-    @Remote(variants = Variant.both, unreliable = true)
-    public static void effect(Effect effect, float x, float y, float rotation, Color color){
-        if(effect == null) return;
-
-        effect.at(x, y, rotation, color);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void effectReliable(Effect effect, float x, float y, float rotation, Color color){
-        effect(effect, x, y, rotation, color);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void infoToast(String message, float duration){
-        if(message == null) return;
-
-        ui.showInfoToast(message, duration);
-    }
-
-    @Remote(variants = Variant.both)
-    public static void warningToast(int unicode, String text){
-        if(text == null || Fonts.icon.getData().getGlyph((char)unicode) == null) return;
-
-        ui.hudfrag.showToast(Fonts.getGlyph(Fonts.icon, (char)unicode), text);
-    }
-
     @Remote(variants = Variant.both)
     public static void setRules(Rules rules){
         state.rules = rules;
     }
 
+    @Remote(variants = Variant.both)
+    public static void setRule(String rule, String jsonData){
+        try{
+            //readField searches for the specified value, so create a fake parent for it.
+            tmpJsonMap.child = null;
+            tmpJsonMap.addChild(rule, new JsonReader().parse(jsonData));
+            JsonIO.json.readField(state.rules, rule, tmpJsonMap);
+        }catch(Throwable error){
+            Log.err("Failed to read rule", error);
+        }
+    }
+
+    //NOTE: avoid using this, runs into packet/buffer size limitations
+    @Remote(variants = Variant.both)
+    public static void setObjectives(MapObjectives executor){
+        state.rules.objectives = executor;
+    }
+
+    @Remote(variants = Variant.both, called = Loc.server)
+    public static void clearObjectives(){
+        state.rules.objectives.clear();
+    }
+
+    @Remote(variants = Variant.both, called = Loc.server)
+    public static void completeObjective(int index){
+        var obj = state.rules.objectives.get(index);
+        if(obj != null){
+            obj.done();
+        }
+    }
+
     @Remote(variants = Variant.both)
     public static void worldDataBegin(){
         Groups.clear();
@@ -382,6 +427,13 @@ public class NetClient implements ApplicationListener{
         player.set(x, y);
     }
 
+    @Remote(variants = Variant.both, unreliable = true)
+    public static void setCameraPosition(float x, float y){
+        if(Core.camera != null){
+            Core.camera.position.set(x, y);
+        }
+    }
+
     @Remote
     public static void playerDisconnect(int playerid){
         if(netClient != null){
@@ -390,67 +442,88 @@ public class NetClient implements ApplicationListener{
         Groups.player.removeByID(playerid);
     }
 
+    public static void readSyncEntity(DataInputStream input, Reads read) throws IOException{
+        int id = input.readInt();
+        byte typeID = input.readByte();
+
+        Syncc entity = Groups.sync.getByID(id);
+        boolean add = false, created = false;
+
+        if(entity == null && id == player.id()){
+            entity = player;
+            add = true;
+        }
+
+        //entity must not be added yet, so create it
+        if(entity == null){
+            entity = (Syncc)EntityMapping.map(typeID & 0xFF).get();
+            entity.id(id);
+            if(!netClient.isEntityUsed(entity.id())){
+                add = true;
+            }
+            created = true;
+        }
+
+        //read the entity
+        entity.readSync(read);
+
+        if(created){
+            //snap initial starting position
+            entity.snapSync();
+        }
+
+        if(add){
+            entity.add();
+            netClient.addRemovedEntity(entity.id());
+        }
+    }
+
     @Remote(variants = Variant.one, priority = PacketPriority.low, unreliable = true)
-    public static void entitySnapshot(short amount, short dataLen, byte[] data){
+    public static void entitySnapshot(short amount, byte[] data){
         try{
-            netClient.byteStream.setBytes(net.decompressSnapshot(data, dataLen));
+            netClient.lastSnapshotTimestamp = Time.millis();
+            netClient.byteStream.setBytes(data);
             DataInputStream input = netClient.dataStream;
 
-            //go through each entity
             for(int j = 0; j < amount; j++){
-                int id = input.readInt();
-                byte typeID = input.readByte();
-
-                Syncc entity = Groups.sync.getByID(id);
-                boolean add = false, created = false;
-
-                if(entity == null && id == player.id()){
-                    entity = player;
-                    add = true;
-                }
-
-                //entity must not be added yet, so create it
-                if(entity == null){
-                    entity = (Syncc)EntityMapping.map(typeID).get();
-                    entity.id(id);
-                    if(!netClient.isEntityUsed(entity.id())){
-                        add = true;
-                    }
-                    created = true;
-                }
-
-                //read the entity
-                entity.readSync(Reads.get(input));
-
-                if(created){
-                    //snap initial starting position
-                    entity.snapSync();
-                }
-
-                if(add){
-                    entity.add();
-                    netClient.addRemovedEntity(entity.id());
-                }
+                readSyncEntity(input, Reads.get(input));
+            }
+        }catch(Exception e){
+            //don't disconnect, just log it
+            Log.err("Error reading entity snapshot", e);
+        }
+    }
+
+    @Remote(variants = Variant.one, priority = PacketPriority.low, unreliable = true)
+    public static void hiddenSnapshot(IntSeq ids){
+        for(int i = 0; i < ids.size; i++){
+            int id = ids.items[i];
+            var entity = Groups.sync.getByID(id);
+            if(entity != null){
+                entity.handleSyncHidden();
             }
-        }catch(IOException e){
-            throw new RuntimeException(e);
         }
     }
 
     @Remote(variants = Variant.both, priority = PacketPriority.low, unreliable = true)
-    public static void blockSnapshot(short amount, short dataLen, byte[] data){
+    public static void blockSnapshot(short amount, byte[] data){
         try{
-            netClient.byteStream.setBytes(net.decompressSnapshot(data, dataLen));
+            netClient.byteStream.setBytes(data);
             DataInputStream input = netClient.dataStream;
 
             for(int i = 0; i < amount; i++){
                 int pos = input.readInt();
+                short block = input.readShort();
                 Tile tile = world.tile(pos);
                 if(tile == null || tile.build == null){
                     Log.warn("Missing entity at @. Skipping block snapshot.", tile);
                     break;
                 }
-                tile.build.readAll(Reads.get(input), tile.build.version());
+                if(tile.build.block.id != block){
+                    Log.warn("Block ID mismatch at @: @ != @. Skipping block snapshot.", tile, tile.build.block.id, block);
+                    break;
+                }
+                tile.build.readSync(Reads.get(input), tile.build.version());
             }
         }catch(Exception e){
             Log.err(e);
@@ -458,7 +531,7 @@ 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, boolean gameOver, int timeData, short coreDataLen, byte[] coreData){
+    public static void stateSnapshot(float waveTime, int wave, int enemies, boolean paused, boolean gameOver, int timeData, byte tps, long rand0, long rand1, byte[] coreData){
         try{
             if(wave > state.wave){
                 state.wave = wave;
@@ -469,22 +542,30 @@ public class NetClient implements ApplicationListener{
             state.wavetime = waveTime;
             state.wave = wave;
             state.enemies = enemies;
-            state.serverPaused = paused;
+            if(!state.isMenu()){
+                state.set(paused ? State.paused : State.playing);
+            }
+            state.serverTps = tps & 0xff;
+
+            //note that this is far from a guarantee that random state is synced - tiny changes in delta and ping can throw everything off again.
+            //syncing will only make much of a difference when rand() is called infrequently
+            GlobalVars.rand.seed0 = rand0;
+            GlobalVars.rand.seed1 = rand1;
 
             universe.updateNetSeconds(timeData);
 
-            netClient.byteStream.setBytes(net.decompressSnapshot(coreData, coreDataLen));
+            netClient.byteStream.setBytes(coreData);
             DataInputStream input = netClient.dataStream;
+            dataReads.input = input;
 
-            byte cores = input.readByte();
-            for(int i = 0; i < cores; i++){
-                int pos = input.readInt();
-                Tile tile = world.tile(pos);
-
-                if(tile != null && tile.build != null){
-                    tile.build.items.read(Reads.get(input));
+            int teams = input.readUnsignedByte();
+            for(int i = 0; i < teams; i++){
+                int team = input.readUnsignedByte();
+                TeamData data = Team.all[team].data();
+                if(data.cores.any()){
+                    data.cores.first().items.read(dataReads);
                 }else{
-                    new ItemModule().read(Reads.get(input));
+                    new ItemModule().read(dataReads);
                 }
             }
 
@@ -498,7 +579,18 @@ public class NetClient implements ApplicationListener{
         if(!net.client()) return;
 
         if(state.isGame()){
-            if(!connecting) sync();
+            if(!connecting){
+                sync();
+
+                //timeout if UDP snapshot packets are not received for a while
+                if(lastSnapshotTimestamp > 0 && Time.timeSinceMillis(lastSnapshotTimestamp) > entitySnapshotTimeout){
+                    Log.err("Timed out after not received UDP snapshots.");
+                    quiet = true;
+                    ui.showErrorMessage("@disconnect.snapshottimeout");
+                    net.disconnect();
+                    lastSnapshotTimestamp = 0;
+                }
+            }
         }else if(!connecting){
             net.disconnect();
         }else{ //...must be connecting
@@ -514,6 +606,11 @@ public class NetClient implements ApplicationListener{
         }
     }
 
+    /** Resets the world data timeout counter. */
+    public void resetTimeout(){
+        timeoutTime = 0f;
+    }
+
     public boolean isConnecting(){
         return connecting;
     }
@@ -530,6 +627,7 @@ public class NetClient implements ApplicationListener{
         Core.app.post(Call::connectConfirm);
         Time.runTask(40f, platform::updateRPC);
         Core.app.post(ui.loadfrag::hide);
+        lastSnapshotTimestamp = Time.millis();
     }
 
     private void reset(){
@@ -540,6 +638,7 @@ public class NetClient implements ApplicationListener{
         quietReset = false;
         quiet = false;
         lastSent = 0;
+        lastSnapshotTimestamp = 0;
 
         Groups.clear();
         ui.chatfrag.clearMessages();
@@ -581,50 +680,24 @@ public class NetClient implements ApplicationListener{
 
     void sync(){
         if(timer.get(0, playerSyncTime)){
-            BuildPlan[] requests = null;
-            if(player.isBuilder()){
-                //limit to 10 to prevent buffer overflows
-                int usedRequests = Math.min(player.unit().plans().size, 10);
-
-                int totalLength = 0;
-
-                //prevent buffer overflow by checking config length
-                for(int i = 0; i < usedRequests; i++){
-                    BuildPlan plan = player.unit().plans().get(i);
-                    if(plan.config instanceof byte[] b){
-                        int length = b.length;
-                        totalLength += length;
-                    }
-
-                    if(totalLength > 1024){
-                        usedRequests = i + 1;
-                        break;
-                    }
-                }
-
-                requests = new BuildPlan[usedRequests];
-                for(int i = 0; i < usedRequests; i++){
-                    requests[i] = player.unit().plans().get(i);
-                }
-            }
-
-            Unit unit = player.dead() ? Nulls.unit : player.unit();
-            int uid = player.dead() ? -1 : unit.id;
+            boolean dead = player.dead();
+            Unit unit = dead ? null : player.unit();
+            int uid = dead || unit == null ? -1 : unit.id;
 
             Call.clientSnapshot(
             lastSent++,
             uid,
-            player.dead(),
-            unit.x, unit.y,
-            player.unit().aimX(), player.unit().aimY(),
-            unit.rotation,
+            dead,
+            dead ? player.x : unit.x, dead ? player.y : unit.y,
+            dead ? 0f : unit.aimX(), dead ? 0f : unit.aimY(),
+            unit == null ? 0f : unit.rotation,
             unit instanceof Mechc m ? m.baseRotation() : 0,
-            unit.vel.x, unit.vel.y,
-            player.unit().mineTile,
+            unit == null ? 0f : unit.vel.x, unit == null ? 0f : unit.vel.y,
+            dead ? null : unit.mineTile,
             player.boosting, player.shooting, ui.chatfrag.shown(), control.input.isBuilding,
-            requests,
+            player.isBuilder() && unit != null ? unit.plans : null,
             Core.camera.position.x, Core.camera.position.y,
-            Core.camera.width * viewScale, Core.camera.height * viewScale
+            Core.camera.width, Core.camera.height
             );
         }
 
diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index da801cc454..b882706e83 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -9,21 +9,20 @@ import arc.struct.*;
 import arc.util.*;
 import arc.util.CommandHandler.*;
 import arc.util.io.*;
-import arc.util.serialization.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.GameState.*;
 import mindustry.entities.units.*;
-import mindustry.game.EventType.*;
 import mindustry.game.*;
+import mindustry.game.EventType.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.net.*;
 import mindustry.net.Administration.*;
 import mindustry.net.Packets.*;
 import mindustry.world.*;
-import mindustry.world.blocks.storage.CoreBlock.*;
 
 import java.io.*;
 import java.net.*;
@@ -35,21 +34,24 @@ import static mindustry.Vars.*;
 
 public class NetServer implements ApplicationListener{
     /** 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 int maxSnapshotSize = 800;
+    private static final int timerBlockSync = 0, timerHealthSync = 1;
+    private static final float blockSyncTime = 60 * 6, healthSyncTime = 30;
     private static final FloatBuffer fbuffer = FloatBuffer.allocate(20);
+    private static final Writes dataWrites = new Writes(null);
+    private static final IntSeq hiddenIds = new IntSeq();
+    private static final IntSeq healthSeq = new IntSeq(maxSnapshotSize / 4 + 1);
     private static final Vec2 vector = new Vec2();
-    private static final Rect viewport = new Rect();
     /** If a player goes away of their server-side coordinates by this distance, they get teleported back. */
-    private static final float correctDist = tilesize * 12f;
+    private static final float correctDist = tilesize * 14f;
 
-    public final Administration admins = new Administration();
-    public final CommandHandler clientCommands = new CommandHandler("/");
+    public Administration admins = new Administration();
+    public CommandHandler clientCommands = new CommandHandler("/");
     public TeamAssigner assigner = (player, players) -> {
         if(state.rules.pvp){
             //find team with minimum amount of players and auto-assign player to that.
             TeamData re = state.teams.getActive().min(data -> {
-                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active()) return Integer.MAX_VALUE;
+                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active() || data.team == Team.derelict) return Integer.MAX_VALUE;
 
                 int count = 0;
                 for(Player other : players){
@@ -57,16 +59,54 @@ public class NetServer implements ApplicationListener{
                         count++;
                     }
                 }
-                return count;
+                return (float)count + Mathf.random(-0.1f, 0.1f); //if several have the same playercount pick random
             });
             return re == null ? null : re.team;
         }
 
         return state.rules.defaultTeam;
     };
+    /** Converts a message + NULLABLE player sender into a single string. Override for custom prefixes/suffixes. */
+    public ChatFormatter chatFormatter = (player, message) -> player == null ? message : "[coral][[" + player.coloredName() + "[coral]]:[white] " + message;
 
-    private boolean closing = false;
-    private Interval timer = new Interval();
+    /** Handles an incorrect command response. Returns text that will be sent to player. Override for customisation. */
+    public InvalidCommandHandler invalidHandler = (player, response) -> {
+        if(response.type == ResponseType.manyArguments){
+            return "[scarlet]Too many arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
+        }else if(response.type == ResponseType.fewArguments){
+            return "[scarlet]Too few arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
+        }else{ //unknown command
+            int minDst = 0;
+            Command closest = null;
+
+            for(Command command : netServer.clientCommands.getCommandList()){
+                int dst = Strings.levenshtein(command.text, response.runCommand);
+                if(dst < 3 && (closest == null || dst < minDst)){
+                    minDst = dst;
+                    closest = command;
+                }
+            }
+
+            if(closest != null){
+                return "[scarlet]Unknown command. Did you mean \"[lightgray]" + closest.text + "[]\"?";
+            }else{
+                return "[scarlet]Unknown command. Check [lightgray]/help[scarlet].";
+            }
+        }
+    };
+
+    private boolean closing = false, pvpAutoPaused = true;
+    private Interval timer = new Interval(10);
+    private IntSet buildHealthChanged = new IntSet();
+
+    /** Current kick session. */
+    public @Nullable VoteSession currentlyKicking = null;
+    /** Duration of a kick in seconds. */
+    public static int kickDuration = 60 * 60;
+    /** Voting round duration in seconds. */
+    public static float voteDuration = 0.5f * 60;
+    /** Cooldown between votes in seconds. */
+    public static int voteCooldown = 60 * 5;
 
     private ReusableByteOutStream writeBuffer = new ReusableByteOutStream(127);
     private Writes outputBuffer = new Writes(new DataOutputStream(writeBuffer));
@@ -77,10 +117,16 @@ public class NetServer implements ApplicationListener{
     private DataOutputStream dataStream = new DataOutputStream(syncStream);
     /** Packet handlers for custom types of messages. */
     private ObjectMap<String, Seq<Cons2<Player, String>>> customPacketHandlers = new ObjectMap<>();
+    /** Packet handlers for custom types of messages - binary version. */
+    private ObjectMap<String, Seq<Cons2<Player, byte[]>>> customBinaryPacketHandlers = new ObjectMap<>();
+    /** Packet handlers for logic client data */
+    private ObjectMap<String, Seq<Cons2<Player, Object>>> logicClientDataHandlers = new ObjectMap<>();
 
     public NetServer(){
 
         net.handleServer(Connect.class, (con, connect) -> {
+            Events.fire(new ConnectionEvent(con));
+
             if(admins.isIPBanned(connect.addressTCP) || admins.isSubnetBanned(connect.addressTCP)){
                 con.kick(KickReason.banned);
             }
@@ -93,23 +139,19 @@ public class NetServer implements ApplicationListener{
         });
 
         net.handleServer(ConnectPacket.class, (con, packet) -> {
+            if(con.kicked) return;
+
             if(con.address.startsWith("steam:")){
                 packet.uuid = con.address.substring("steam:".length());
             }
 
-            String uuid = packet.uuid;
-            byte[] buuid = Base64Coder.decode(uuid);
-            CRC32 crc = new CRC32();
-            crc.update(buuid, 0, 8);
-            ByteBuffer buff = ByteBuffer.allocate(8);
-            buff.put(buuid, 8, 8);
-            buff.position(0);
-            if(crc.getValue() != buff.getLong()){
-                con.kick(KickReason.clientOutdated);
-                return;
-            }
+            Events.fire(new ConnectPacketEvent(con, packet));
 
-            if(admins.isIPBanned(con.address) || admins.isSubnetBanned(con.address)) return;
+            con.connectTime = Time.millis();
+
+            String uuid = packet.uuid;
+
+            if(admins.isIPBanned(con.address) || admins.isSubnetBanned(con.address) || con.kicked || !con.isConnected()) return;
 
             if(con.hasBegunConnecting){
                 con.kick(KickReason.idInUse);
@@ -155,7 +197,8 @@ public class NetServer implements ApplicationListener{
                 if(!extraMods.isEmpty()){
                     result.append("Unnecessary mods:[lightgray]\n").append("> ").append(extraMods.toString("\n> "));
                 }
-                con.kick(result.toString());
+                con.kick(result.toString(), 0);
+                return;
             }
 
             if(!admins.isWhitelisted(packet.uuid, packet.usid)){
@@ -164,7 +207,7 @@ public class NetServer implements ApplicationListener{
                 info.id = packet.uuid;
                 admins.save();
                 Call.infoMessage(con, "You are not whitelisted here.");
-                info("&lcDo &lywhitelist-add @&lc to whitelist the player &lb'@'", packet.uuid, packet.name);
+                info("&lcDo &lywhitelist add @&lc to whitelist the player &lb'@'", packet.uuid, packet.name);
                 con.kick(KickReason.whitelist);
                 return;
             }
@@ -177,15 +220,24 @@ public class NetServer implements ApplicationListener{
             boolean preventDuplicates = headless && netServer.admins.isStrict();
 
             if(preventDuplicates){
-                if(Groups.player.contains(p -> p.name.trim().equalsIgnoreCase(packet.name.trim()))){
+                if(Groups.player.contains(p -> Strings.stripColors(p.name).trim().equalsIgnoreCase(Strings.stripColors(packet.name).trim()))){
                     con.kick(KickReason.nameInUse);
                     return;
                 }
 
                 if(Groups.player.contains(player -> player.uuid().equals(packet.uuid) || player.usid().equals(packet.usid))){
+                    con.uuid = packet.uuid;
                     con.kick(KickReason.idInUse);
                     return;
                 }
+
+                for(var otherCon : net.getConnections()){
+                    if(otherCon != con && uuid.equals(otherCon.uuid)){
+                        con.uuid = packet.uuid;
+                        con.kick(KickReason.idInUse);
+                        return;
+                    }
+                }
             }
 
             packet.name = fixName(packet.name);
@@ -195,6 +247,10 @@ public class NetServer implements ApplicationListener{
                 return;
             }
 
+            if(packet.locale == null){
+                packet.locale = "en";
+            }
+
             String ip = con.address;
 
             admins.updatePlayerJoined(uuid, ip, packet.name);
@@ -215,6 +271,7 @@ public class NetServer implements ApplicationListener{
             player.con.uuid = uuid;
             player.con.mobile = packet.mobile;
             player.name = packet.name;
+            player.locale = packet.locale;
             player.color.set(packet.color).a(1f);
 
             //save admin ID but don't overwrite it
@@ -243,21 +300,6 @@ public class NetServer implements ApplicationListener{
             Events.fire(new PlayerConnect(player));
         });
 
-        net.handleServer(InvokePacket.class, (con, packet) -> {
-            if(con.player == null) return;
-            try{
-                RemoteReadServer.readPacket(packet.reader(), packet.type, con.player);
-            }catch(ValidateException e){
-                debug("Validation failed for '@': @", e.player, e.getMessage());
-            }catch(RuntimeException e){
-                if(e.getCause() instanceof ValidateException v){
-                    debug("Validation failed for '@': @", v.player, v.getMessage());
-                }else{
-                    throw e;
-                }
-            }
-        });
-
         registerCommands();
     }
 
@@ -276,7 +318,7 @@ public class NetServer implements ApplicationListener{
             int page = args.length > 0 ? Strings.parseInt(args[0]) : 1;
             int pages = Mathf.ceil((float)clientCommands.getCommandList().size / commandsPerPage);
 
-            page --;
+            page--;
 
             if(page >= pages || page < 0){
                 player.sendMessage("[scarlet]'page' must be a number between[orange] 1[] and[orange] " + pages + "[scarlet].");
@@ -296,74 +338,25 @@ public class NetServer implements ApplicationListener{
         clientCommands.<Player>register("t", "<message...>", "Send a message only to your teammates.", (args, player) -> {
             String message = admins.filterMessage(player, args[0]);
             if(message != null){
-                Groups.player.each(p -> p.team() == player.team(), o -> o.sendMessage(message, player, "[#" + player.team().color.toString() + "]<T>" + NetClient.colorizeName(player.id(), player.name)));
+                String raw = "[#" + player.team().color.toString() + "]<T> " + chatFormatter.format(player, message);
+                Groups.player.each(p -> p.team() == player.team(), o -> o.sendMessage(raw, player, message));
             }
         });
 
         clientCommands.<Player>register("a", "<message...>", "Send a message only to admins.", (args, player) -> {
             if(!player.admin){
-                player.sendMessage("[scarlet]You must be admin to use this command.");
+                player.sendMessage("[scarlet]You must be an admin to use this command.");
                 return;
             }
 
-            Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[#" + Pal.adminChat.toString() + "]<A>" + NetClient.colorizeName(player.id, player.name)));
+            String raw = "[#" + Pal.adminChat.toString() + "]<A> " + chatFormatter.format(player, args[0]);
+            Groups.player.each(Player::admin, a -> a.sendMessage(raw, player, args[0]));
         });
 
-        //duration of a a kick in seconds
-        int kickDuration = 60 * 60;
-        //voting round duration in seconds
-        float voteDuration = 0.5f * 60;
-        //cooldown between votes in seconds
-        int voteCooldown = 60 * 5;
-
-        class VoteSession{
-            Player target;
-            ObjectSet<String> voted = new ObjectSet<>();
-            VoteSession[] map;
-            Timer.Task task;
-            int votes;
-
-            public VoteSession(VoteSession[] map, Player target){
-                this.target = target;
-                this.map = map;
-                this.task = Timer.schedule(() -> {
-                    if(!checkPass()){
-                        Call.sendMessage(Strings.format("[lightgray]Vote failed. Not enough votes to kick[orange] @[lightgray].", target.name));
-                        map[0] = null;
-                        task.cancel();
-                    }
-                }, voteDuration);
-            }
-
-            void vote(Player player, int d){
-                votes += d;
-                voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP);
-
-                Call.sendMessage(Strings.format("[lightgray]@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
-                    player.name, target.name, votes, votesRequired()));
-
-                checkPass();
-            }
-
-            boolean checkPass(){
-                if(votes >= votesRequired()){
-                    Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] @[orange] will be banned from the server for @ minutes.", target.name, (kickDuration / 60)));
-                    target.getInfo().lastKicked = Time.millis() + kickDuration * 1000;
-                    Groups.player.each(p -> p.uuid().equals(target.uuid()), p -> p.kick(KickReason.vote));
-                    map[0] = null;
-                    task.cancel();
-                    return true;
-                }
-                return false;
-            }
-        }
-
         //cooldowns per player
         ObjectMap<String, Timekeeper> cooldowns = new ObjectMap<>();
-        //current kick sessions
-        VoteSession[] currentlyKicking = {null};
 
-        clientCommands.<Player>register("votekick", "[player...]", "Vote to kick a player.", (args, player) -> {
+        clientCommands.<Player>register("votekick", "[player] [reason...]", "Vote to kick a player with a valid reason.", (args, player) -> {
             if(!Config.enableVotekick.bool()){
                 player.sendMessage("[scarlet]Vote-kick is disabled on this server.");
                 return;
@@ -379,7 +372,7 @@ public class NetServer implements ApplicationListener{
                 return;
             }
 
-            if(currentlyKicking[0] != null){
+            if(currentlyKicking != null){
                 player.sendMessage("[scarlet]A vote is already in progress.");
                 return;
             }
@@ -392,6 +385,8 @@ public class NetServer implements ApplicationListener{
                     builder.append("[lightgray] ").append(p.name).append("[accent] (#").append(p.id()).append(")\n");
                 });
                 player.sendMessage(builder.toString());
+            }else if(args.length == 1){
+                player.sendMessage("[orange]You need a valid reason to kick the player. Add a reason after the player name.");
             }else{
                 Player found;
                 if(args[0].length() > 1 && args[0].startsWith("#") && Strings.canParseInt(args[0].substring(1))){
@@ -402,7 +397,9 @@ public class NetServer implements ApplicationListener{
                 }
 
                 if(found != null){
-                    if(found.admin){
+                    if(found == player){
+                        player.sendMessage("[scarlet]You can't vote to kick yourself.");
+                    }else if(found.admin){
                         player.sendMessage("[scarlet]Did you really expect to be able to kick an admin?");
                     }else if(found.isLocal()){
                         player.sendMessage("[scarlet]Local players cannot be kicked.");
@@ -416,10 +413,11 @@ public class NetServer implements ApplicationListener{
                             return;
                         }
 
-                        VoteSession session = new VoteSession(currentlyKicking, found);
+                        VoteSession session = new VoteSession(found);
                         session.vote(player, 1);
+                        Call.sendMessage(Strings.format("[lightgray]Reason:[orange] @[lightgray].", args[1]));
                         vtime.reset();
-                        currentlyKicking[0] = session;
+                        currentlyKicking = session;
                     }
                 }else{
                     player.sendMessage("[scarlet]No player [orange]'" + args[0] + "'[scarlet] found.");
@@ -427,38 +425,50 @@ public class NetServer implements ApplicationListener{
             }
         });
 
-        clientCommands.<Player>register("vote", "<y/n>", "Vote to kick the current player.", (arg, player) -> {
-            if(currentlyKicking[0] == null){
+        clientCommands.<Player>register("vote", "<y/n/c>", "Vote to kick the current player. Admins can cancel the voting with 'c'.", (arg, player) -> {
+            if(currentlyKicking == null){
                 player.sendMessage("[scarlet]Nobody is being voted on.");
             }else{
-                if(player.isLocal()){
-                    player.sendMessage("Local players can't vote. Kick the player yourself instead.");
+                if(player.admin && arg[0].equalsIgnoreCase("c")){
+                    Call.sendMessage(Strings.format("[lightgray]Vote canceled by admin[orange] @[lightgray].", player.name));
+                    currentlyKicking.task.cancel();
+                    currentlyKicking = null;
                     return;
                 }
 
+                if(player.isLocal()){
+                    player.sendMessage("[scarlet]Local players can't vote. Kick the player yourself instead.");
+                    return;
+                }
+
+                int sign = switch(arg[0].toLowerCase()){
+                    case "y", "yes" -> 1;
+                    case "n", "no" -> -1;
+                    default -> 0;
+                };
+
                 //hosts can vote all they want
-                if((currentlyKicking[0].voted.contains(player.uuid()) || currentlyKicking[0].voted.contains(admins.getInfo(player.uuid()).lastIP))){
-                    player.sendMessage("[scarlet]You've already voted. Sit down.");
+                if((currentlyKicking.voted.get(player.uuid(), 2) == sign || currentlyKicking.voted.get(admins.getInfo(player.uuid()).lastIP, 2) == sign)){
+                    player.sendMessage(Strings.format("[scarlet]You've already voted @. Sit down.", arg[0].toLowerCase()));
                     return;
                 }
 
-                if(currentlyKicking[0].target == player){
+                if(currentlyKicking.target == player){
                     player.sendMessage("[scarlet]You can't vote on your own trial.");
                     return;
                 }
 
-                if(currentlyKicking[0].target.team() != player.team()){
+                if(currentlyKicking.target.team() != player.team()){
                     player.sendMessage("[scarlet]You can't vote for other teams.");
                     return;
                 }
 
-                if(!arg[0].equalsIgnoreCase("y") && !arg[0].equalsIgnoreCase("n")){
+                if(sign == 0){
                     player.sendMessage("[scarlet]Vote either 'y' (yes) or 'n' (no).");
                     return;
                 }
 
-                int sign = arg[0].equalsIgnoreCase("y") ? 1 : -1;
-                currentlyKicking[0].vote(player, sign);
+                currentlyKicking.vote(player, sign);
             }
         });
 
@@ -509,6 +519,18 @@ public class NetServer implements ApplicationListener{
         return customPacketHandlers.get(type, Seq::new);
     }
 
+    public void addBinaryPacketHandler(String type, Cons2<Player, byte[]> handler){
+        customBinaryPacketHandlers.get(type, Seq::new).add(handler);
+    }
+
+    public Seq<Cons2<Player, byte[]>> getBinaryPacketHandlers(String type){
+        return customBinaryPacketHandlers.get(type, Seq::new);
+    }
+
+    public void addLogicDataHandler(String type, Cons2<Player, Object> handler){
+        logicClientDataHandlers.get(type, Seq::new).add(handler);
+    }
+
     public static void onDisconnect(Player player, String reason){
         //singleplayer multiplayer weirdness
         if(player.con == null){
@@ -523,7 +545,7 @@ public class NetServer implements ApplicationListener{
                 Call.playerDisconnect(player.id());
             }
 
-            String message = Strings.format("&lb@&fi&lk has disconnected. &fi&lk[&lb@&fi&lk] (@)", player.name, player.uuid(), reason);
+            String message = Strings.format("&lb@&fi&lk has disconnected. [&lb@&fi&lk] (@)", player.plainName(), player.uuid(), reason);
             if(Config.showConnectMessages.bool()) info(message);
         }
 
@@ -531,6 +553,38 @@ public class NetServer implements ApplicationListener{
         player.con.hasDisconnected = true;
     }
 
+    //these functions are for debugging only, and will be removed!
+
+    @Remote(targets = Loc.client, variants = Variant.one)
+    public static void requestDebugStatus(Player player){
+        int flags =
+        (player.con.hasDisconnected ? 1 : 0) |
+        (player.con.hasConnected ? 2 : 0) |
+        (player.isAdded() ? 4 : 0) |
+        (player.con.hasBegunConnecting ? 8 : 0);
+
+        Call.debugStatusClient(player.con, flags, player.con.lastReceivedClientSnapshot, player.con.snapshotsSent);
+        Call.debugStatusClientUnreliable(player.con, flags, player.con.lastReceivedClientSnapshot, player.con.snapshotsSent);
+    }
+
+    @Remote(variants = Variant.both, priority = PacketPriority.high)
+    public static void debugStatusClient(int value, int lastClientSnapshot, int snapshotsSent){
+        logClientStatus(true, value, lastClientSnapshot, snapshotsSent);
+    }
+
+    @Remote(variants = Variant.both, priority = PacketPriority.high, unreliable = true)
+    public static void debugStatusClientUnreliable(int value, int lastClientSnapshot, int snapshotsSent){
+        logClientStatus(false, value, lastClientSnapshot, snapshotsSent);
+    }
+
+    static void logClientStatus(boolean reliable, int value, int lastClientSnapshot, int snapshotsSent){
+        Log.info("@ Debug status received. disconnected = @, connected = @, added = @, begunConnecting = @ lastClientSnapshot = @, snapshotsSent = @",
+        reliable ? "[RELIABLE]" : "[UNRELIABLE]",
+        (value & 1) != 0, (value & 2) != 0, (value & 4) != 0, (value & 8) != 0,
+        lastClientSnapshot, snapshotsSent
+        );
+    }
+
     @Remote(targets = Loc.client)
     public static void serverPacketReliable(Player player, String type, String contents){
         if(netServer.customPacketHandlers.containsKey(type)){
@@ -545,24 +599,53 @@ public class NetServer implements ApplicationListener{
         serverPacketReliable(player, type, contents);
     }
 
+    @Remote(targets = Loc.client)
+    public static void serverBinaryPacketReliable(Player player, String type, byte[] contents){
+        if(netServer.customPacketHandlers.containsKey(type)){
+            for(var c : netServer.customBinaryPacketHandlers.get(type)){
+                c.get(player, contents);
+            }
+        }
+    }
+
+    @Remote(targets = Loc.client, unreliable = true)
+    public static void serverBinaryPacketUnreliable(Player player, String type, byte[] contents){
+        serverBinaryPacketReliable(player, type, contents);
+    }
+
+    @Remote(targets = Loc.client)
+    public static void clientLogicDataReliable(Player player, String channel, Object value){
+        Seq<Cons2<Player, Object>> handlers = netServer.logicClientDataHandlers.get(channel);
+        if(handlers != null){
+            for(Cons2<Player, Object> handler : handlers){
+                handler.get(player, value);
+            }
+        }
+    }
+
+    @Remote(targets = Loc.client, unreliable = true)
+    public static void clientLogicDataUnreliable(Player player, String channel, Object value){
+        clientLogicDataReliable(player, channel, value);
+    }
+
     private static boolean invalid(float f){
         return Float.isInfinite(f) || Float.isNaN(f);
     }
 
-    @Remote(targets = Loc.client, unreliable = true)
+    @Remote(targets = Loc.client, unreliable = true, priority = PacketPriority.high)
     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 building,
-        @Nullable BuildPlan[] requests,
-        float viewX, float viewY, float viewWidth, float viewHeight
+    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 building,
+    @Nullable Queue<BuildPlan> plans,
+    float viewX, float viewY, float viewWidth, float viewHeight
     ){
         NetConnection con = player.con;
         if(con == null || snapshotID < con.lastReceivedClientSnapshot) return;
@@ -601,22 +684,21 @@ public class NetServer implements ApplicationListener{
         player.shooting = shooting;
         player.boosting = boosting;
 
-        player.unit().controlWeapons(shooting, shooting);
-        player.unit().aim(pointerX, pointerY);
+        @Nullable var unit = player.unit();
 
         if(player.isBuilder()){
-            player.unit().clearBuilding();
-            player.unit().updateBuilding(building);
+            unit.clearBuilding();
+            unit.updateBuilding(building);
 
-            if(requests != null){
-                for(BuildPlan req : requests){
+            if(plans != null){
+                for(BuildPlan req : plans){
                     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))){
+                    }else if(!req.breaking && tile.block() == req.block && tile.team() != Team.derelict && (!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;
@@ -635,18 +717,15 @@ public class NetServer implements ApplicationListener{
             }
         }
 
-        player.unit().mineTile = mining;
-
         con.rejectedRequests.clear();
 
         if(!player.dead()){
-            Unit unit = player.unit();
+            unit.controlWeapons(shooting, shooting);
+            unit.aim(pointerX, pointerY);
+            unit.mineTile = mining;
 
-            long elapsed = Time.timeSinceMillis(con.lastReceivedClientTime);
-            float maxSpeed = unit.realSpeed();
-            if(unit.isGrounded()){
-                maxSpeed *= unit.floorSpeedMultiplier();
-            }
+            long elapsed = Math.min(Time.timeSinceMillis(con.lastReceivedClientTime), 1500);
+            float maxSpeed = unit.speed();
 
             float maxMove = elapsed / 1000f * 60f * maxSpeed * 1.2f;
 
@@ -661,7 +740,6 @@ public class NetServer implements ApplicationListener{
                 vector.limit(maxMove);
 
                 float prevx = unit.x, prevy = unit.y;
-                //unit.set(con.lastPosition);
                 if(!unit.isFlying()){
                     unit.move(vector.x, vector.y);
                 }else{
@@ -704,52 +782,69 @@ public class NetServer implements ApplicationListener{
     }
 
     @Remote(targets = Loc.client, called = Loc.server)
-    public static void adminRequest(Player player, Player other, AdminAction action){
+    public static void adminRequest(Player player, Player other, AdminAction action, Object params){
         if(!player.admin && !player.isLocal()){
             warn("ACCESS DENIED: Player @ / @ attempted to perform admin action '@' on '@' without proper security access.",
-            player.name, player.con == null ? "null" : player.con.address, action.name(), other == null ? null : other.name);
+            player.plainName(), player.con == null ? "null" : player.con.address, action.name(), other == null ? null : other.plainName());
             return;
         }
 
         if(other == null || ((other.admin && !player.isLocal()) && other != player)){
-            warn("@ attempted to perform admin action on nonexistant or admin player.", player.name);
+            warn("@ &fi&lk[&lb@&fi&lk]&fb attempted to perform admin action on nonexistant or admin player.", player.plainName(), player.uuid());
             return;
         }
 
-        if(action == AdminAction.wave){
-            //no verification is done, so admins can hypothetically spam waves
-            //not a real issue, because server owners may want to do just that
-            logic.skipWave();
-        }else if(action == AdminAction.ban){
-            netServer.admins.banPlayerIP(other.con.address);
-            netServer.admins.banPlayerID(other.con.uuid);
-            other.kick(KickReason.banned);
-            info("&lc@ has banned @.", player.name, other.name);
-        }else if(action == AdminAction.kick){
-            other.kick(KickReason.kick);
-            info("&lc@ has kicked @.", player.name, other.name);
-        }else if(action == AdminAction.trace){
-            TraceInfo info = new TraceInfo(other.con.address, other.uuid(), other.con.modclient, other.con.mobile);
-            if(player.con != null){
-                Call.traceInfo(player.con, other, info);
-            }else{
-                NetClient.traceInfo(other, info);
+        Events.fire(new EventType.AdminRequestEvent(player, other, action));
+
+        switch(action){
+            case wave -> {
+                //no verification is done, so admins can hypothetically spam waves
+                //not a real issue, because server owners may want to do just that
+                logic.skipWave();
+                info("&lc@ &fi&lk[&lb@&fi&lk]&fb has skipped the wave.", player.plainName(), player.uuid());
+            }
+            case ban -> {
+                netServer.admins.banPlayerID(other.con.uuid);
+                netServer.admins.banPlayerIP(other.con.address);
+                other.kick(KickReason.banned);
+                info("&lc@ &fi&lk[&lb@&fi&lk]&fb has banned @ &fi&lk[&lb@&fi&lk]&fb.", player.plainName(), player.uuid(), other.plainName(), other.uuid());
+            }
+            case kick -> {
+                other.kick(KickReason.kick);
+                info("&lc@ &fi&lk[&lb@&fi&lk]&fb has kicked @ &fi&lk[&lb@&fi&lk]&fb.", player.plainName(), player.uuid(), other.plainName(), other.uuid());
+            }
+            case trace -> {
+                PlayerInfo stats = netServer.admins.getInfo(other.uuid());
+                TraceInfo info = new TraceInfo(other.con.address, other.uuid(), other.locale, other.con.modclient, other.con.mobile, stats.timesJoined, stats.timesKicked, stats.ips.toArray(String.class), stats.names.toArray(String.class));
+                if(player.con != null){
+                    Call.traceInfo(player.con, other, info);
+                }else{
+                    NetClient.traceInfo(other, info);
+                }
+            }
+            case switchTeam -> {
+                if(params instanceof Team team){
+                    other.team(team);
+                }
             }
-            info("&lc@ has requested trace info of @.", player.name, other.name);
         }
     }
 
-    @Remote(targets = Loc.client)
+    @Remote(targets = Loc.client, priority = PacketPriority.high)
     public static void connectConfirm(Player player){
+        if(player.con.kicked) return;
+
         player.add();
 
+        Events.fire(new PlayerConnectionConfirmed(player));
+
         if(player.con == null || player.con.hasConnected) return;
 
         player.con.hasConnected = true;
 
         if(Config.showConnectMessages.bool()){
             Call.sendMessage("[accent]" + player.name + "[accent] has connected.");
-            String message = Strings.format("&lb@&fi&lk has connected. &fi&lk[&lb@&fi&lk]", player.name, player.uuid());
+            String message = Strings.format("&lb@&fi&lk has connected. &fi&lk[&lb@&fi&lk]", player.plainName(), player.uuid());
             info(message);
         }
 
@@ -786,21 +881,38 @@ public class NetServer implements ApplicationListener{
         }
 
         if(state.isGame() && net.server()){
-            if(state.rules.pvp){
-                state.serverPaused = isWaitingForPlayers();
+            if(state.rules.pvp && state.rules.pvpAutoPause){
+                boolean waiting = isWaitingForPlayers(), paused = state.isPaused();
+                if(waiting != paused){
+                    if(waiting){
+                        //is now waiting, enable pausing, flag it correctly
+                        pvpAutoPaused = true;
+                        state.set(State.paused);
+                    }else if(pvpAutoPaused){
+                        //no longer waiting, stop pausing
+                        state.set(State.playing);
+                        pvpAutoPaused = false;
+                    }
+                }
             }
 
             sync();
         }
     }
 
+    //TODO I don't like where this is, move somewhere else?
+    /** Queues a building health update. This will be sent in a Call.buildHealthUpdate packet later. */
+    public void buildHealthUpdate(Building build){
+        buildHealthChanged.add(build.pos());
+    }
+
     /** Should only be used on the headless backend. */
     public void openServer(){
         try{
             net.host(Config.port.num());
             info("Opened a server on port @.", Config.port.num());
         }catch(BindException e){
-            err("Unable to host: Port already in use! Make sure no other servers are running on the same port in your network.");
+            err("Unable to host: Port " + Config.port.num() + " already in use! Make sure no other servers are running on the same port in your network.");
             state.set(State.menu);
         }catch(IOException e){
             err(e);
@@ -821,15 +933,15 @@ public class NetServer implements ApplicationListener{
         short sent = 0;
         for(Building entity : Groups.build){
             if(!entity.block.sync) continue;
-            sent ++;
+            sent++;
 
             dataStream.writeInt(entity.pos());
-            entity.writeAll(Writes.get(dataStream));
+            dataStream.writeShort(entity.block.id);
+            entity.writeSync(Writes.get(dataStream));
 
             if(syncStream.size() > maxSnapshotSize){
                 dataStream.close();
-                byte[] stateBytes = syncStream.toByteArray();
-                Call.blockSnapshot(sent, (short)stateBytes.length, net.compressSnapshot(stateBytes));
+                Call.blockSnapshot(sent, syncStream.toByteArray());
                 sent = 0;
                 syncStream.reset();
             }
@@ -837,46 +949,54 @@ public class NetServer implements ApplicationListener{
 
         if(sent > 0){
             dataStream.close();
-            byte[] stateBytes = syncStream.toByteArray();
-            Call.blockSnapshot(sent, (short)stateBytes.length, net.compressSnapshot(stateBytes));
+            Call.blockSnapshot(sent, syncStream.toByteArray());
         }
     }
 
     public void writeEntitySnapshot(Player player) throws IOException{
+        byte tps = (byte)Math.min(Core.graphics.getFramesPerSecond(), 255);
         syncStream.reset();
-        Seq<CoreBuild> cores = state.teams.cores(player.team());
+        int activeTeams = (byte)state.teams.present.count(t -> t.cores.size > 0);
 
-        dataStream.writeByte(cores.size);
+        dataStream.writeByte(activeTeams);
+        dataWrites.output = dataStream;
 
-        for(CoreBuild entity : cores){
-            dataStream.writeInt(entity.tile.pos());
-            entity.items.write(Writes.get(dataStream));
+        //block data isn't important, just send the items for each team, they're synced across cores
+        for(TeamData data : state.teams.present){
+            if(data.cores.size > 0){
+                dataStream.writeByte(data.team.id);
+                data.cores.first().items.write(dataWrites);
+            }
         }
 
         dataStream.close();
-        byte[] stateBytes = syncStream.toByteArray();
 
         //write basic state data.
-        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);
+        Call.stateSnapshot(player.con, state.wavetime, state.wave, state.enemies, state.isPaused(), state.gameOver,
+        universe.seconds(), tps, GlobalVars.rand.seed0, GlobalVars.rand.seed1, syncStream.toByteArray());
 
         syncStream.reset();
 
+        hiddenIds.clear();
         int sent = 0;
 
         for(Syncc entity : Groups.sync){
+            //TODO write to special list
+            if(entity.isSyncHidden(player)){
+                hiddenIds.add(entity.id());
+                continue;
+            }
+
             //write all entities now
             dataStream.writeInt(entity.id()); //write id
-            dataStream.writeByte(entity.classId()); //write type ID
+            dataStream.writeByte(entity.classId() & 0xFF); //write type ID
             entity.writeSync(Writes.get(dataStream)); //write entity
 
             sent++;
 
             if(syncStream.size() > maxSnapshotSize){
                 dataStream.close();
-                byte[] syncBytes = syncStream.toByteArray();
-                Call.entitySnapshot(player.con, (short)sent, (short)syncBytes.length, net.compressSnapshot(syncBytes));
+                Call.entitySnapshot(player.con, (short)sent, syncStream.toByteArray());
                 sent = 0;
                 syncStream.reset();
             }
@@ -885,14 +1005,18 @@ public class NetServer implements ApplicationListener{
         if(sent > 0){
             dataStream.close();
 
-            byte[] syncBytes = syncStream.toByteArray();
-            Call.entitySnapshot(player.con, (short)sent, (short)syncBytes.length, net.compressSnapshot(syncBytes));
+            Call.entitySnapshot(player.con, (short)sent, syncStream.toByteArray());
         }
 
+        if(hiddenIds.size > 0){
+            Call.hiddenSnapshot(player.con, hiddenIds);
+        }
+
+        player.con.snapshotsSent++;
     }
 
-    String fixName(String name){
-        name = name.trim();
+    public String fixName(String name){
+        name = name.trim().replace("\n", "").replace("\t", "");
         if(name.equals("[") || name.equals("]")){
             return "";
         }
@@ -915,20 +1039,20 @@ public class NetServer implements ApplicationListener{
         return result.toString();
     }
 
-    String checkColor(String str){
+    public String checkColor(String str){
         for(int i = 1; i < str.length(); i++){
             if(str.charAt(i) == ']'){
                 String color = str.substring(1, i);
 
                 if(Colors.get(color.toUpperCase()) != null || Colors.get(color.toLowerCase()) != null){
                     Color result = (Colors.get(color.toLowerCase()) == null ? Colors.get(color.toUpperCase()) : Colors.get(color.toLowerCase()));
-                    if(result.a <= 0.8f){
+                    if(result.a < 1f){
                         return str.substring(i + 1);
                     }
                 }else{
                     try{
                         Color result = Color.valueOf(color);
-                        if(result.a <= 0.8f){
+                        if(result.a < 1f){
                             return str.substring(i + 1);
                         }
                     }catch(Exception e){
@@ -942,20 +1066,23 @@ public class NetServer implements ApplicationListener{
 
     void sync(){
         try{
+            int interval = Config.snapshotInterval.num();
             Groups.player.each(p -> !p.isLocal(), player -> {
                 if(player.con == null || !player.con.isConnected()){
                     onDisconnect(player, "disappeared");
                     return;
                 }
 
-                NetConnection connection = player.con;
+                var connection = player.con;
 
-                if(!player.timer(0, serverSyncTime) || !connection.hasConnected) return;
+                if(Time.timeSinceMillis(connection.syncTime) < interval || !connection.hasConnected) return;
+
+                connection.syncTime = Time.millis();
 
                 try{
                     writeEntitySnapshot(player);
                 }catch(IOException e){
-                    e.printStackTrace();
+                    Log.err(e);
                 }
             });
 
@@ -963,12 +1090,91 @@ public class NetServer implements ApplicationListener{
                 writeBlockSnapshots();
             }
 
+            if(Groups.player.size() > 0 && buildHealthChanged.size > 0 && timer.get(timerHealthSync, healthSyncTime)){
+                healthSeq.clear();
+
+                var iter = buildHealthChanged.iterator();
+                while(iter.hasNext){
+                    int next = iter.next();
+                    var build = world.build(next);
+
+                    //pack pos + health into update list
+                    if(build != null){
+                        healthSeq.add(next, Float.floatToRawIntBits(build.health));
+                    }
+
+                    //if size exceeds snapshot limit, send it out and begin building it up again
+                    if(healthSeq.size * 4 >= maxSnapshotSize){
+                        Call.buildHealthUpdate(healthSeq);
+                        healthSeq.clear();
+                    }
+                }
+
+                //send any residual health updates
+                if(healthSeq.size > 0){
+                    Call.buildHealthUpdate(healthSeq);
+                }
+
+                buildHealthChanged.clear();
+            }
         }catch(IOException e){
             Log.err(e);
         }
     }
 
+    public class VoteSession{
+        Player target;
+        ObjectIntMap<String> voted = new ObjectIntMap<>();
+        Timer.Task task;
+        int votes;
+
+        public VoteSession(Player target){
+            this.target = target;
+            this.task = Timer.schedule(() -> {
+                if(!checkPass()){
+                    Call.sendMessage(Strings.format("[lightgray]Vote failed. Not enough votes to kick[orange] @[lightgray].", target.name));
+                    currentlyKicking = null;
+                    task.cancel();
+                }
+            }, voteDuration);
+        }
+
+        void vote(Player player, int d){
+            int lastVote = voted.get(player.uuid(), 0) | voted.get(admins.getInfo(player.uuid()).lastIP, 0);
+            votes -= lastVote;
+
+            votes += d;
+            voted.put(player.uuid(), d);
+            voted.put(admins.getInfo(player.uuid()).lastIP, d);
+
+            Call.sendMessage(Strings.format("[lightgray]@[lightgray] has voted on kicking[orange] @[lightgray].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
+            player.name, target.name, votes, votesRequired()));
+
+            checkPass();
+        }
+
+        boolean checkPass(){
+            if(votes >= votesRequired()){
+                Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] @[orange] will be banned from the server for @ minutes.", target.name, (kickDuration / 60)));
+                Groups.player.each(p -> p.uuid().equals(target.uuid()), p -> p.kick(KickReason.vote, kickDuration * 1000));
+                currentlyKicking = null;
+                task.cancel();
+                return true;
+            }
+            return false;
+        }
+    }
+
     public interface TeamAssigner{
         Team assign(Player player, Iterable<Player> players);
     }
+
+    public interface ChatFormatter{
+        /** @return text to be placed before player name */
+        String format(@Nullable Player player, String message);
+    }
+
+    public interface InvalidCommandHandler{
+        String handle(Player player, CommandResponse response);
+    }
 }
diff --git a/core/src/mindustry/core/Platform.java b/core/src/mindustry/core/Platform.java
index bddcd3d749..e395d82412 100644
--- a/core/src/mindustry/core/Platform.java
+++ b/core/src/mindustry/core/Platform.java
@@ -1,6 +1,7 @@
 package mindustry.core;
 
 import arc.*;
+import arc.filedialogs.*;
 import arc.files.*;
 import arc.func.*;
 import arc.math.*;
@@ -14,16 +15,36 @@ import mindustry.type.*;
 import mindustry.ui.dialogs.*;
 import rhino.*;
 
+import java.io.*;
 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()}, getClass().getClassLoader());
-        return Class.forName(mainClass, true, classLoader);
+    /** Dynamically creates a class loader for a jar file. This loader must be child-first. */
+    default ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
+        return new URLClassLoader(new URL[]{jar.file().toURI().toURL()}, parent){
+            @Override
+            protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
+                //check for loaded state
+                Class<?> loadedClass = findLoadedClass(name);
+                if(loadedClass == null){
+                    try{
+                        //try to load own class first
+                        loadedClass = findClass(name);
+                    }catch(ClassNotFoundException e){
+                        //use parent if not found
+                        return parent.loadClass(name);
+                    }
+                }
+
+                if(resolve){
+                    resolveClass(loadedClass);
+                }
+                return loadedClass;
+            }
+        };
     }
 
     /** Steam: Update lobby visibility.*/
@@ -60,9 +81,10 @@ public interface Platform{
     }
 
     default Context getScriptContext(){
-        Context c = Context.enter();
-        c.setOptimizationLevel(9);
-        return c;
+        Context context = Context.getCurrentContext();
+        if(context == null) context = Context.enter();
+        context.setOptimizationLevel(9);
+        return context;
     }
 
     /** Update discord RPC. */
@@ -101,7 +123,7 @@ public interface Platform{
         }else{
             ui.loadAnd(() -> {
                 try{
-                    Fi result = Core.files.local(name+ "." + extension);
+                    Fi result = Core.files.local(name + "." + extension);
                     writer.write(result);
                     platform.shareFile(result);
                 }catch(Throwable e){
@@ -120,6 +142,69 @@ public interface Platform{
      * @param title The title of the native dialog
      */
     default void showFileChooser(boolean open, String title, String extension, Cons<Fi> cons){
+        if(OS.isWindows || OS.isMac){
+            showNativeFileChooser(open, title, cons, extension);
+        }else if(OS.isLinux && !OS.isAndroid){
+            showZenity(open, title, new String[]{extension}, cons, () -> defaultFileDialog(open, title, extension, cons));
+        }else{
+            defaultFileDialog(open, title, extension, cons);
+        }
+    }
+
+    /** attempt to use the native file picker with zenity, or runs the fallback Runnable if the operation fails */
+    static void showZenity(boolean open, String title, String[] extensions, Cons<Fi> cons, Runnable fallback){
+        Threads.daemon(() -> {
+            try{
+                String formatted = (title.startsWith("@") ? Core.bundle.get(title.substring(1)) : title).replaceAll("\"", "'");
+
+                String last = FileChooser.getLastDirectory().absolutePath();
+                if(!last.endsWith("/")) last += "/";
+
+                //zenity doesn't support filtering by extension
+                Seq<String> args = Seq.with("zenity",
+                    "--file-selection",
+                    "--title=" + formatted,
+                    "--filename=" + last,
+                    "--confirm-overwrite",
+                    "--file-filter=" + Seq.with(extensions).toString(" ", s -> "*." + s),
+                    "--file-filter=All files | *" //allow anything if the user wants
+                );
+
+                if(!open){
+                    args.add("--save");
+                }
+
+                String result = OS.exec(args.toArray(String.class));
+                //first line.
+                if(result.length() > 1 && result.contains("\n")){
+                    result = result.split("\n")[0];
+                }
+
+                //cancelled selection, ignore result
+                if(result.isEmpty() || result.equals("\n")) return;
+
+                if(result.endsWith("\n")) result = result.substring(0, result.length() - 1);
+                if(result.contains("\n")) throw new IOException("invalid input: \"" + result + "\"");
+
+                Fi file = Core.files.absolute(result);
+                Core.app.post(() -> {
+                    FileChooser.setLastDirectory(file.isDirectory() ? file : file.parent());
+
+                    if(!open){
+                        cons.get(file.parent().child(file.nameWithoutExtension() + "." + extensions[0]));
+                    }else{
+                        cons.get(file);
+                    }
+                });
+            }catch(Exception e){
+                Log.err(e);
+                Log.warn("zenity not found, using non-native file dialog. Consider installing `zenity` for native file dialogs.");
+                Core.app.post(fallback);
+            }
+        });
+    }
+
+    static void defaultFileDialog(boolean open, String title, String extension, Cons<Fi> cons){
         new FileChooser(title, file -> file.extEquals(extension), open, file -> {
             if(!open){
                 cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
@@ -141,11 +226,81 @@ public interface Platform{
     default void showMultiFileChooser(Cons<Fi> cons, String... extensions){
         if(mobile){
             showFileChooser(true, extensions[0], cons);
+        }else if(OS.isWindows || OS.isMac){
+            showNativeFileChooser(true, "@open", cons, extensions);
+        }else if(OS.isLinux && !OS.isAndroid){
+            showZenity(true, "@open", extensions, cons, () -> defaultMultiFileChooser(cons, extensions));
         }else{
-            new FileChooser("@open", file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+            defaultMultiFileChooser(cons, extensions);
         }
     }
 
+    static void defaultMultiFileChooser(Cons<Fi> cons, String... extensions){
+        new FileChooser("@open", file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+    }
+
+    default void showNativeFileChooser(boolean open, String title, Cons<Fi> cons, String... shownExtensions){
+        String formatted = (title.startsWith("@") ? Core.bundle.get(title.substring(1)) : title).replaceAll("\"", "'");
+
+        //this should never happen unless someone is being dumb with the parameters
+        String[] ext = shownExtensions == null || shownExtensions.length == 0 ? new String[]{""} : shownExtensions;
+
+        //native file dialog
+        Threads.daemon(() -> {
+            try{
+                FileDialogs.loadNatives();
+
+                String result;
+                String[] patterns = new String[ext.length];
+                for(int i = 0; i < ext.length; i++){
+                    patterns[i] = "*." + ext[i];
+                }
+
+                //on MacOS, .msav is not properly recognized until I put garbage into the array?
+                if(patterns.length == 1 && OS.isMac && open){
+                    patterns = new String[]{"", "*." + ext[0]};
+                }
+
+                if(open){
+                    result = FileDialogs.openFileDialog(formatted, FileChooser.getLastDirectory().absolutePath(), patterns, "." + ext[0] + " files", false);
+                }else{
+                    result = FileDialogs.saveFileDialog(formatted, FileChooser.getLastDirectory().child("file." + ext[0]).absolutePath(), patterns, "." + ext[0] + " files");
+                }
+
+                if(result == null) return;
+
+                if(result.length() > 1 && result.contains("\n")){
+                    result = result.split("\n")[0];
+                }
+
+                //cancelled selection, ignore result
+                if(result.isEmpty() || result.equals("\n")) return;
+                if(result.endsWith("\n")) result = result.substring(0, result.length() - 1);
+                if(result.contains("\n")) throw new IOException("invalid input: \"" + result + "\"");
+
+                Fi file = Core.files.absolute(result);
+                Core.app.post(() -> {
+                    FileChooser.setLastDirectory(file.isDirectory() ? file : file.parent());
+
+                    if(!open){
+                        cons.get(file.parent().child(file.nameWithoutExtension() + "." + ext[0]));
+                    }else{
+                        cons.get(file);
+                    }
+                });
+            }catch(Throwable error){
+                Log.err("Failure to execute native file chooser", error);
+                Core.app.post(() -> {
+                    if(ext.length > 1){
+                        defaultMultiFileChooser(cons, ext);
+                    }else{
+                        defaultFileDialog(open, title, ext[0], cons);
+                    }
+                });
+            }
+        });
+    }
+
     /** Hide the app. Android only. */
     default void hide(){
     }
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 8f5423cbc1..00fb77bfaf 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -1,29 +1,36 @@
 package mindustry.core;
 
 import arc.*;
+import arc.assets.loaders.TextureLoader.*;
+import arc.audio.*;
 import arc.files.*;
-import arc.fx.*;
 import arc.graphics.*;
+import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
-import mindustry.content.*;
+import mindustry.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
-import mindustry.ui.*;
+import mindustry.maps.*;
+import mindustry.type.*;
+import mindustry.world.blocks.*;
 
 import static arc.Core.*;
 import static mindustry.Vars.*;
 
 public class Renderer implements ApplicationListener{
     /** These are global variables, for headless access. Cached. */
-    public static float laserOpacity = 0.5f, bridgeOpacity = 0.75f;
+    public static float laserOpacity = 0.5f, unitLaserOpacity = 1f, bridgeOpacity = 0.75f;
 
     public final BlockRenderer blocks = new BlockRenderer();
+    public final FogRenderer fog = new FogRenderer();
     public final MinimapRenderer minimap = new MinimapRenderer();
     public final OverlayRenderer overlays = new OverlayRenderer();
     public final LightRenderer lights = new LightRenderer();
@@ -31,28 +38,59 @@ public class Renderer implements ApplicationListener{
     public PlanetRenderer planets;
 
     public @Nullable Bloom bloom;
+    public @Nullable FrameBuffer backgroundBuffer;
     public FrameBuffer effectBuffer = new FrameBuffer();
-    public boolean animateShields, drawWeather = true;
+    public boolean animateShields, drawWeather = true, drawStatus, enableEffects, drawDisplays = true, drawLight = true, pixelate = false;
+    public float weatherAlpha;
     /** minZoom = zooming out, maxZoom = zooming in */
     public float minZoom = 1.5f, maxZoom = 6f;
+    public Seq<EnvRenderer> envRenderers = new Seq<>();
+    public ObjectMap<String, Runnable> customBackgrounds = new ObjectMap<>();
+    public TextureRegion[] bubbles = new TextureRegion[16], splashes = new TextureRegion[12];
+    public TextureRegion[][] fluidFrames;
 
-    //TODO unused
-    private FxProcessor fx = new FxProcessor();
+    //currently landing core, null if there are no cores or it has finished landing.
+    private @Nullable LaunchAnimator launchAnimator;
     private Color clearColor = new Color(0f, 0f, 0f, 1f);
-    private float targetscale = Scl.scl(4);
-    private float camerascale = targetscale;
-    private float landscale = 0f, landTime, weatherAlpha;
-    private float minZoomScl = Scl.scl(0.01f);
-    private float shakeIntensity, shaketime;
+    private float
+    //target camera scale that is lerp-ed to
+    targetscale = Scl.scl(4),
+    //current actual camera scale
+    camerascale = targetscale,
+    //starts at coreLandDuration, ends at 0. if positive, core is landing.
+    landTime,
+    //intensity for screen shake
+    shakeIntensity,
+    //reduction rate of screen shake
+    shakeReduction,
+    //current duration of screen shake
+    shakeTime;
+    //for landTime > 0: if true, core is currently *launching*, otherwise landing.
+    private boolean launching;
+    private Vec2 camShakeOffset = new Vec2();
 
     public Renderer(){
         camera = new Camera();
         Shaders.init();
+
+        Events.on(ResetEvent.class, e -> {
+            shakeTime = shakeIntensity = shakeReduction = 0f;
+            camShakeOffset.setZero();
+        });
     }
 
     public void shake(float intensity, float duration){
-        shakeIntensity = Math.max(shakeIntensity, intensity);
-        shaketime = Math.max(shaketime, duration);
+        shakeIntensity = Math.max(shakeIntensity, Mathf.clamp(intensity, 0, 100));
+        shakeTime = Math.max(shakeTime, duration);
+        shakeReduction = shakeIntensity / shakeTime;
+    }
+
+    public void addEnvRenderer(int mask, Runnable render){
+        envRenderers.add(new EnvRenderer(mask, render));
+    }
+
+    public void addCustomBackground(String name, Runnable render){
+        customBackgrounds.put(name, render);
     }
 
     @Override
@@ -62,29 +100,92 @@ public class Renderer implements ApplicationListener{
         if(settings.getBool("bloom", !ios)){
             setupBloom();
         }
+
+        EnvRenderers.init();
+        for(int i = 0; i < bubbles.length; i++) bubbles[i] = atlas.find("bubble-" + i);
+        for(int i = 0; i < splashes.length; i++) splashes[i] = atlas.find("splash-" + i);
+
+        loadFluidFrames();
+
+        Events.on(ClientLoadEvent.class, e -> {
+            loadFluidFrames();
+        });
+
+        assets.load("sprites/clouds.png", Texture.class).loaded = t -> {
+            t.setWrap(TextureWrap.repeat);
+            t.setFilter(TextureFilter.linear);
+        };
+
+        Events.on(WorldLoadEvent.class, e -> {
+            //reset background buffer on every world load, so it can be re-cached first render
+            if(backgroundBuffer != null){
+                backgroundBuffer.dispose();
+                backgroundBuffer = null;
+            }
+        });
+    }
+
+    public void loadFluidFrames(){
+        fluidFrames = new TextureRegion[2][Liquid.animationFrames];
+
+        String[] fluidTypes = {"liquid", "gas"};
+
+        for(int i = 0; i < fluidTypes.length; i++){
+
+            for(int j = 0; j < Liquid.animationFrames; j++){
+                fluidFrames[i][j] = atlas.find("fluid-" + fluidTypes[i] + "-" + j);
+            }
+        }
+    }
+
+    public TextureRegion[][] getFluidFrames(){
+        if(fluidFrames == null || fluidFrames[0][0].texture.isDisposed()){
+            loadFluidFrames();
+        }
+        return fluidFrames;
     }
 
     @Override
     public void update(){
         Color.white.set(1f, 1f, 1f, 1f);
-        Gl.clear(Gl.stencilBufferBit);
 
-        float dest = Mathf.round(targetscale, 0.5f);
+        float baseTarget = targetscale;
+
+        if(control.input.logicCutscene){
+            baseTarget = Mathf.lerp(minZoom, maxZoom, control.input.logicCutsceneZoom);
+        }
+
+        float dest = Mathf.clamp(Mathf.round(baseTarget, 0.5f), minScale(), maxScale());
         camerascale = Mathf.lerpDelta(camerascale, dest, 0.1f);
         if(Mathf.equal(camerascale, dest, 0.001f)) camerascale = dest;
+        unitLaserOpacity = settings.getInt("unitlaseropacity") / 100f;
         laserOpacity = settings.getInt("lasersopacity") / 100f;
         bridgeOpacity = settings.getInt("bridgeopacity") / 100f;
         animateShields = settings.getBool("animatedshields");
+        drawStatus = settings.getBool("blockstatus");
+        enableEffects = settings.getBool("effects");
+        drawDisplays = !settings.getBool("hidedisplays");
+        drawLight = settings.getBool("drawlight", true);
+        pixelate = settings.getBool("pixelate");
 
+        //don't bother drawing landing animation if core is null
+        if(launchAnimator == null) landTime = 0f;
         if(landTime > 0){
-            landTime -= Time.delta;
-            landscale = Interp.pow5In.apply(minZoomScl, Scl.scl(4f), 1f - landTime / Fx.coreLand.lifetime);
-            camerascale = landscale;
+            if(!state.isPaused()) launchAnimator.updateLaunch();
+
             weatherAlpha = 0f;
+            camerascale = launchAnimator.zoomLaunch();
+
+            if(!state.isPaused()) landTime -= Time.delta;
         }else{
             weatherAlpha = Mathf.lerpDelta(weatherAlpha, 1f, 0.08f);
         }
 
+        if(launchAnimator != null && landTime <= 0f){
+            launchAnimator.endLaunch();
+            launchAnimator = null;
+        }
+
         camera.width = graphics.getWidth() / camerascale;
         camera.height = graphics.getHeight() / camerascale;
 
@@ -92,48 +193,49 @@ public class Renderer implements ApplicationListener{
             landTime = 0f;
             graphics.clear(Color.black);
         }else{
-            updateShake(0.75f);
-            if(pixelator.enabled()){
+            minimap.update();
+
+            if(shakeTime > 0){
+                float intensity = shakeIntensity * (settings.getInt("screenshake", 4) / 4f) * 0.75f;
+                camShakeOffset.setToRandomDirection().scl(Mathf.random(intensity));
+                camera.position.add(camShakeOffset);
+                shakeIntensity -= shakeReduction * Time.delta;
+                shakeTime -= Time.delta;
+                shakeIntensity = Mathf.clamp(shakeIntensity, 0f, 100f);
+            }else{
+                camShakeOffset.setZero();
+                shakeIntensity = 0f;
+            }
+
+            if(renderer.pixelate){
                 pixelator.drawPixelate();
             }else{
                 draw();
             }
+
+            camera.position.sub(camShakeOffset);
         }
     }
 
-    public boolean isLanding(){
+    public void updateAllDarkness(){
+        blocks.updateDarkness();
+        minimap.updateAll();
+    }
+
+    /** @return whether a launch/land cutscene is playing. */
+    public boolean isCutscene(){
         return landTime > 0;
     }
 
-    public float weatherAlpha(){
-        return weatherAlpha;
-    }
-
     public float landScale(){
-        return landTime > 0 ? landscale : 1f;
+        return landTime > 0 ? camerascale : 1f;
     }
 
     @Override
     public void dispose(){
-        minimap.dispose();
-        effectBuffer.dispose();
-        blocks.dispose();
-        if(planets != null){
-            planets.dispose();
-            planets = null;
-        }
-        if(bloom != null){
-            bloom.dispose();
-            bloom = null;
-        }
         Events.fire(new DisposeEvent());
     }
 
-    @Override
-    public void resize(int width, int height){
-        fx.resize(width, height);
-    }
-
     @Override
     public void resume(){
         if(settings.getBool("bloom") && bloom != null){
@@ -168,37 +270,9 @@ public class Renderer implements ApplicationListener{
         }
     }
 
-    void beginFx(){
-        if(!fx.hasEnabledEffects()) return;
-
-        Draw.flush();
-        fx.clear();
-        fx.begin();
-    }
-
-    void endFx(){
-        if(!fx.hasEnabledEffects()) return;
-
-        Draw.flush();
-        fx.end();
-        fx.applyEffects();
-        fx.render(0, 0, fx.getWidth(), fx.getHeight());
-    }
-
-    void updateShake(float scale){
-        if(shaketime > 0){
-            float intensity = shakeIntensity * (settings.getInt("screenshake", 4) / 4f) * scale;
-            camera.position.add(Mathf.range(intensity), Mathf.range(intensity));
-            shakeIntensity -= 0.25f * Time.delta;
-            shaketime -= Time.delta;
-            shakeIntensity = Mathf.clamp(shakeIntensity, 0f, 100f);
-        }else{
-            shakeIntensity = 0f;
-        }
-    }
-
     public void draw(){
         Events.fire(Trigger.preDraw);
+        MapPreviewLoader.checkPreviews();
 
         camera.update();
 
@@ -209,27 +283,29 @@ public class Renderer implements ApplicationListener{
         graphics.clear(clearColor);
         Draw.reset();
 
-        if(Core.settings.getBool("animatedwater") || animateShields){
+        if(settings.getBool("animatedwater") || animateShields){
             effectBuffer.resize(graphics.getWidth(), graphics.getHeight());
         }
 
         Draw.proj(camera);
 
+        blocks.checkChanges();
         blocks.floor.checkChanges();
         blocks.processBlocks();
 
         Draw.sort(true);
 
         Events.fire(Trigger.draw);
+        MapPreviewLoader.checkPreviews();
 
-        if(pixelator.enabled()){
+        if(renderer.pixelate){
             pixelator.register();
         }
 
         Draw.draw(Layer.background, this::drawBackground);
         Draw.draw(Layer.floor, blocks.floor::drawFloor);
         Draw.draw(Layer.block - 1, blocks::drawShadows);
-        Draw.draw(Layer.block, () -> {
+        Draw.draw(Layer.block - 0.09f, () -> {
             blocks.floor.beginDraw();
             blocks.floor.drawLayer(CacheLayer.walls);
             blocks.floor.endDraw();
@@ -237,7 +313,14 @@ public class Renderer implements ApplicationListener{
 
         Draw.drawRange(Layer.blockBuilding, () -> Draw.shader(Shaders.blockbuild, true), Draw::shader);
 
-        if(state.rules.lighting){
+        //render all matching environments
+        for(var renderer : envRenderers){
+            if((renderer.env & state.rules.env) == renderer.env){
+                renderer.renderer.run();
+            }
+        }
+
+        if(state.rules.lighting && drawLight){
             Draw.draw(Layer.light, lights::draw);
         }
 
@@ -246,14 +329,19 @@ public class Renderer implements ApplicationListener{
         }
 
         if(bloom != null){
-            bloom.resize(graphics.getWidth() / 4, graphics.getHeight() / 4);
-            Draw.draw(Layer.bullet - 0.01f, bloom::capture);
-            Draw.draw(Layer.effect + 0.01f, bloom::render);
+            bloom.resize(graphics.getWidth(), graphics.getHeight());
+            bloom.setBloomIntensity(settings.getInt("bloomintensity", 6) / 4f + 1f);
+            bloom.blurPasses = settings.getInt("bloomblur", 1);
+            Draw.draw(Layer.bullet - 0.02f, bloom::capture);
+            Draw.draw(Layer.effect + 0.02f, bloom::render);
         }
 
+        control.input.drawCommanded();
+
         Draw.draw(Layer.plans, overlays::drawBottom);
 
         if(animateShields && Shaders.shield != null){
+            //TODO would be nice if there were a way to detect if any shields or build beams actually *exist* before beginning/ending buffers, otherwise you're just blitting and swapping shaders for nothing
             Draw.drawRange(Layer.shields, 1f, () -> effectBuffer.begin(Color.clear), () -> {
                 effectBuffer.end();
                 effectBuffer.blit(Shaders.shield);
@@ -265,9 +353,38 @@ public class Renderer implements ApplicationListener{
             });
         }
 
-        Draw.draw(Layer.overlayUI, overlays::drawTop);
-        Draw.draw(Layer.space, this::drawLanding);
+        float scaleFactor = 4f / renderer.getDisplayScale();
 
+        //draw objective markers
+        state.rules.objectives.eachRunning(obj -> {
+            for(var marker : obj.markers){
+                if(marker.world){
+                    marker.draw(marker.autoscale ? scaleFactor : 1);
+                }
+            }
+        });
+
+        for(var marker : state.markers){
+            if(marker.world){
+                marker.draw(marker.autoscale ? scaleFactor : 1);
+            }
+        }
+
+        Draw.reset();
+
+        Draw.draw(Layer.overlayUI, overlays::drawTop);
+        if(state.rules.fog) Draw.draw(Layer.fogOfWar, fog::drawFog);
+        Draw.draw(Layer.space, () -> {
+            if(launchAnimator == null || landTime <= 0f) return;
+            launchAnimator.drawLaunch();
+        });
+        if(launchAnimator != null){
+            Draw.z(Layer.space);
+            launchAnimator.drawLaunchGlobalZ();
+            Draw.reset();
+        }
+
+        Events.fire(Trigger.drawOver);
         blocks.drawBlocks();
 
         Groups.draw.draw(Drawc::draw);
@@ -279,32 +396,79 @@ public class Renderer implements ApplicationListener{
         Events.fire(Trigger.postDraw);
     }
 
-    private void drawBackground(){
+    protected void drawBackground(){
+        //draw background only if there is no planet background with a skybox
+        if(state.rules.backgroundTexture != null && (state.rules.planetBackground == null || !state.rules.planetBackground.drawSkybox)){
+            if(!assets.isLoaded(state.rules.backgroundTexture, Texture.class)){
+                var file = assets.getFileHandleResolver().resolve(state.rules.backgroundTexture);
 
-    }
+                //don't draw invalid/non-existent backgrounds.
+                if(!file.exists() || !file.extEquals("png")){
+                    return;
+                }
 
-    private void drawLanding(){
-        if(landTime > 0 && player.closestCore() != null){
-            float fract = landTime / Fx.coreLand.lifetime;
-            Building entity = player.closestCore();
+                var desc = assets.load(state.rules.backgroundTexture, Texture.class, new TextureParameter(){{
+                    wrapU = wrapV = TextureWrap.mirroredRepeat;
+                    magFilter = minFilter = TextureFilter.linear;
+                }});
 
-            TextureRegion reg = entity.block.icon(Cicon.full);
-            float scl = Scl.scl(4f) / camerascale;
-            float s = reg.width * Draw.scl * scl * 4f * fract;
+                assets.finishLoadingAsset(desc);
+            }
 
-            Draw.color(Pal.lightTrail);
-            Draw.rect("circle-shadow", entity.getX(), entity.getY(), s, s);
+            Texture tex = assets.get(state.rules.backgroundTexture, Texture.class);
+            Tmp.tr1.set(tex);
+            Tmp.tr1.u = 0f;
+            Tmp.tr1.v = 0f;
 
-            Angles.randLenVectors(1, (1f- fract), 100, 1000f * scl * (1f-fract), (x, y, fin, fout) -> {
-                Lines.stroke(scl * fin);
-                Lines.lineAngle(entity.getX() + x, entity.getY() + y, Mathf.angle(x, y), (fin * 20 + 1f) * scl);
-            });
+            float ratio = camera.width / camera.height;
+            float size = state.rules.backgroundScl;
 
-            Draw.color();
-            Draw.mixcol(Color.white, fract);
-            Draw.rect(reg, entity.getX(), entity.getY(), reg.width * Draw.scl * scl, reg.height * Draw.scl * scl, fract * 135f);
+            Tmp.tr1.u2 = size;
+            Tmp.tr1.v2 = size / ratio;
 
-            Draw.reset();
+            float sx = 0f, sy = 0f;
+
+            if(!Mathf.zero(state.rules.backgroundSpeed)){
+                sx = (camera.position.x) / state.rules.backgroundSpeed;
+                sy = (camera.position.y) / state.rules.backgroundSpeed;
+            }
+
+            Tmp.tr1.scroll(sx + state.rules.backgroundOffsetX, -sy + state.rules.backgroundOffsetY);
+
+            Draw.rect(Tmp.tr1, camera.position.x, camera.position.y, camera.width, camera.height);
+        }
+
+        if(state.rules.planetBackground != null){
+            int size = Math.max(graphics.getWidth(), graphics.getHeight());
+
+            boolean resized = false;
+            if(backgroundBuffer == null){
+                resized = true;
+                backgroundBuffer = new FrameBuffer(size, size);
+            }
+
+            if(resized || backgroundBuffer.resizeCheck(size, size)){
+                backgroundBuffer.begin(Color.clear);
+
+                var params = state.rules.planetBackground;
+
+                //override some values
+                params.viewW = size;
+                params.viewH = size;
+                params.alwaysDrawAtmosphere = true;
+                params.drawUi = false;
+
+                planets.render(params);
+
+                backgroundBuffer.end();
+            }
+
+            float drawSize = Math.max(camera.width, camera.height);
+            Draw.rect(Draw.wrap(backgroundBuffer.getTexture()), camera.position.x, camera.position.y, drawSize, -drawSize);
+        }
+
+        if(state.rules.customBackgroundCallback != null && customBackgrounds.containsKey(state.rules.customBackgroundCallback)){
+            customBackgrounds.get(state.rules.customBackgroundCallback).run();
         }
     }
 
@@ -338,16 +502,52 @@ public class Renderer implements ApplicationListener{
         clampScale();
     }
 
-    public void zoomIn(float duration){
-        landscale = minZoomScl;
-        landTime = duration;
+    public boolean isLaunching(){
+        return launching;
+    }
+
+    public float getLandTime(){
+        return landTime;
+    }
+
+    public float getLandTimeIn(){
+        if(launchAnimator == null) return 0f;
+        float fin = landTime / launchAnimator.launchDuration();
+        if(!launching) fin = 1f - fin;
+        return fin;
+    }
+
+    public void showLanding(LaunchAnimator landCore){
+        this.launchAnimator = landCore;
+        launching = false;
+        landTime = landCore.launchDuration();
+
+        landCore.beginLaunch(false);
+        camerascale = landCore.zoomLaunch();
+    }
+
+    public void showLaunch(LaunchAnimator landCore){
+        control.input.config.hideConfig();
+        control.input.planConfig.hide();
+        control.input.inv.hide();
+
+        this.launchAnimator = landCore;
+        launching = true;
+        landTime = landCore.launchDuration();
+
+        Music music = landCore.launchMusic();
+        music.stop();
+        music.play();
+        music.setVolume(settings.getInt("musicvol") / 100f);
+
+        landCore.beginLaunch(true);
     }
 
     public void takeMapScreenshot(){
         int w = world.width() * tilesize, h = world.height() * tilesize;
         int memory = w * h * 4 / 1024 / 1024;
 
-        if(memory >= 65){
+        if(Vars.checkScreenshotMemory && memory >= (mobile ? 65 : 120)){
             ui.showInfo("@screenshot.invalid");
             return;
         }
@@ -363,25 +563,39 @@ public class Renderer implements ApplicationListener{
         camera.position.y = h / 2f + tilesize / 2f;
         buffer.begin();
         draw();
+        Draw.flush();
+        byte[] lines = ScreenUtils.getFrameBufferPixels(0, 0, w, h, true);
         buffer.end();
         disableUI = false;
         camera.width = vpW;
         camera.height = vpH;
         camera.position.set(px, py);
-        buffer.begin();
-        byte[] lines = ScreenUtils.getFrameBufferPixels(0, 0, w, h, true);
-        for(int i = 0; i < lines.length; i += 4){
-            lines[i + 3] = (byte)255;
-        }
-        buffer.end();
-        Pixmap fullPixmap = new Pixmap(w, h, Pixmap.Format.rgba8888);
-        Buffers.copy(lines, 0, fullPixmap.getPixels(), lines.length);
-        Fi file = screenshotDirectory.child("screenshot-" + Time.millis() + ".png");
-        PixmapIO.writePNG(file, fullPixmap);
-        fullPixmap.dispose();
-        ui.showInfoFade(Core.bundle.format("screenshot", file.toString()));
         drawWeather = true;
-
         buffer.dispose();
+
+        Threads.thread(() -> {
+            for(int i = 0; i < lines.length; i += 4){
+                lines[i + 3] = (byte)255;
+            }
+            Pixmap fullPixmap = new Pixmap(w, h);
+            Buffers.copy(lines, 0, fullPixmap.pixels, lines.length);
+            Fi file = screenshotDirectory.child("screenshot-" + Time.millis() + ".png");
+            PixmapIO.writePng(file, fullPixmap);
+            fullPixmap.dispose();
+            app.post(() -> ui.showInfoFade(bundle.format("screenshot", file.toString())));
+        });
     }
+
+    public static class EnvRenderer{
+        /** Environment bitmask; must match env exactly when and-ed. */
+        public final int env;
+        /** Rendering callback. */
+        public final Runnable renderer;
+
+        public EnvRenderer(int env, Runnable renderer){
+            this.env = env;
+            this.renderer = renderer;
+        }
+    }
+
 }
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 1eddb7b8fc..1eb38240d1 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -33,12 +33,14 @@ import static arc.scene.actions.Actions.*;
 import static mindustry.Vars.*;
 
 public class UI implements ApplicationListener, Loadable{
+    public static String billions, millions, thousands;
+
     public static PixmapPacker packer;
 
     public MenuFragment menufrag;
     public HudFragment hudfrag;
     public ChatFragment chatfrag;
-    public ScriptConsoleFragment scriptfrag;
+    public ConsoleFragment consolefrag;
     public MinimapFragment minimapfrag;
     public PlayerListFragment listfrag;
     public LoadingFragment loadfrag;
@@ -49,14 +51,14 @@ public class UI implements ApplicationListener, Loadable{
     public AboutDialog about;
     public GameOverDialog restart;
     public CustomGameDialog custom;
-    public MapsDialog maps;
+    public EditorMapsDialog maps;
     public LoadDialog load;
     public DiscordDialog discord;
     public JoinDialog join;
     public HostDialog host;
     public PausedDialog paused;
     public SettingsMenuDialog settings;
-    public ControlsDialog controls;
+    public KeybindDialog controls;
     public MapEditorDialog editor;
     public LanguageDialog language;
     public BansDialog bans;
@@ -69,14 +71,29 @@ public class UI implements ApplicationListener, Loadable{
     public SchematicsDialog schematics;
     public ModsDialog mods;
     public ColorPicker picker;
+    public EffectsDialog effects;
     public LogicDialog logic;
+    public FullTextDialog fullText;
+    public CampaignCompleteDialog campaignComplete;
 
-    public Cursor drillCursor, unloadCursor;
+    public IntMap<Dialog> followUpMenus;
+
+    public Cursor drillCursor, unloadCursor, targetCursor, repairCursor;
+
+    private @Nullable Element lastAnnouncement;
 
     public UI(){
         Fonts.loadFonts();
     }
 
+    public static void loadColors(){
+        Colors.put("accent", Pal.accent);
+        Colors.put("unlaunched", Color.valueOf("8982ed"));
+        Colors.put("highlight", Pal.accent.cpy().lerp(Color.white, 0.3f));
+        Colors.put("stat", Pal.stat);
+        Colors.put("negstat", Pal.negativeStat);
+    }
+
     @Override
     public void loadAsync(){
 
@@ -108,7 +125,10 @@ 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));
+        Tooltips.getInstance().textProvider = text -> new Tooltip(t -> t.background(Styles.black6).margin(4f).add(text));
+        if(mobile){
+            Tooltips.getInstance().offsetY += Scl.scl(60f);
+        }
 
         Core.settings.setErrorHandler(e -> {
             Log.err(e);
@@ -117,18 +137,15 @@ public class UI implements ApplicationListener, Loadable{
 
         ClickListener.clicked = () -> Sounds.press.play();
 
-        Colors.put("accent", Pal.accent);
-        Colors.put("unlaunched", Color.valueOf("8982ed"));
-        Colors.put("highlight", Pal.accent.cpy().lerp(Color.white, 0.3f));
-        Colors.put("stat", Pal.stat);
-
         drillCursor = Core.graphics.newCursor("drill", Fonts.cursorScale());
         unloadCursor = Core.graphics.newCursor("unload", Fonts.cursorScale());
+        targetCursor = Core.graphics.newCursor("target", Fonts.cursorScale());
+        repairCursor = Core.graphics.newCursor("repair", Fonts.cursorScale());
     }
 
     @Override
     public Seq<AssetDescriptor> getDependencies(){
-        return Seq.with(new AssetDescriptor<>(Control.class), new AssetDescriptor<>("outline", Font.class), new AssetDescriptor<>("default", Font.class), new AssetDescriptor<>("chat", Font.class));
+        return Seq.with(new AssetDescriptor<>(Control.class), new AssetDescriptor<>("outline", Font.class), new AssetDescriptor<>("default", Font.class));
     }
 
     @Override
@@ -140,8 +157,8 @@ public class UI implements ApplicationListener, Loadable{
         Core.scene.act();
         Core.scene.draw();
 
-        if(Core.input.keyTap(KeyCode.mouseLeft) && Core.scene.getKeyboardFocus() instanceof TextField){
-            Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
+        if(Core.input.keyTap(KeyCode.mouseLeft) && Core.scene.hasField()){
+            Element e = Core.scene.getHoverElement();
             if(!(e instanceof TextField)){
                 Core.scene.setKeyboardFocus(null);
             }
@@ -152,6 +169,10 @@ public class UI implements ApplicationListener, Loadable{
 
     @Override
     public void init(){
+        billions = Core.bundle.get("unit.billions");
+        millions = Core.bundle.get("unit.millions");
+        thousands = Core.bundle.get("unit.thousands");
+
         menuGroup = new WidgetGroup();
         hudGroup = new WidgetGroup();
 
@@ -162,11 +183,12 @@ public class UI implements ApplicationListener, Loadable{
         minimapfrag = new MinimapFragment();
         listfrag = new PlayerListFragment();
         loadfrag = new LoadingFragment();
-        scriptfrag = new ScriptConsoleFragment();
+        consolefrag = new ConsoleFragment();
 
         picker = new ColorPicker();
+        effects = new EffectsDialog();
         editor = new MapEditorDialog();
-        controls = new ControlsDialog();
+        controls = new KeybindDialog();
         restart = new GameOverDialog();
         join = new JoinDialog();
         discord = new DiscordDialog();
@@ -181,13 +203,16 @@ public class UI implements ApplicationListener, Loadable{
         bans = new BansDialog();
         admins = new AdminsDialog();
         traces = new TraceDialog();
-        maps = new MapsDialog();
+        maps = new EditorMapsDialog();
         content = new ContentInfoDialog();
         planet = new PlanetDialog();
         research = new ResearchDialog();
         mods = new ModsDialog();
         schematics = new SchematicsDialog();
         logic = new LogicDialog();
+        fullText = new FullTextDialog();
+        campaignComplete = new CampaignCompleteDialog();
+        followUpMenus = new IntMap<>();
 
         Group group = Core.scene.root;
 
@@ -203,10 +228,10 @@ public class UI implements ApplicationListener, Loadable{
 
         hudfrag.build(hudGroup);
         menufrag.build(menuGroup);
-        chatfrag.container().build(hudGroup);
+        chatfrag.build(hudGroup);
         minimapfrag.build(hudGroup);
         listfrag.build(hudGroup);
-        scriptfrag.container().build(hudGroup);
+        consolefrag.build(hudGroup);
         loadfrag.build(group);
         new FadeInFragment().build(group);
     }
@@ -214,18 +239,17 @@ public class UI implements ApplicationListener, Loadable{
     @Override
     public void resize(int width, int height){
         if(Core.scene == null) return;
+
+        int[] insets = Core.graphics.getSafeInsets();
+        Core.scene.marginLeft = insets[0];
+        Core.scene.marginRight = insets[1];
+        Core.scene.marginTop = insets[2];
+        Core.scene.marginBottom = insets[3];
+
         Core.scene.resize(width, height);
         Events.fire(new ResizeEvent());
     }
 
-    @Override
-    public void dispose(){
-        if(packer != null){
-            packer.dispose();
-            packer = null;
-        }
-    }
-
     public TextureRegionDrawable getIcon(String name){
         if(Icon.icons.containsKey(name)) return Icon.icons.get(name);
         return Core.atlas.getDrawable("error");
@@ -248,37 +272,53 @@ public class UI implements ApplicationListener, Loadable{
         });
     }
 
-    public void showTextInput(String titleText, String dtext, int textLength, String def, boolean inumeric, Cons<String> confirmed){
+
+    public void showTextInput(String titleText, String text, int textLength, String def, boolean numbers, Cons<String> confirmed, Runnable closed) {
+        showTextInput(titleText, text, textLength, def, numbers, false, confirmed, closed);
+    }
+
+    public void showTextInput(String titleText, String text, int textLength, String def, boolean numbers, boolean allowEmpty, Cons<String> confirmed, Runnable closed){
         if(mobile){
+            var description = (text.startsWith("@") ? Core.bundle.get(text.substring(1)) : text);
+            var empty = allowEmpty;
             Core.input.getTextInput(new TextInput(){{
                 this.title = (titleText.startsWith("@") ? Core.bundle.get(titleText.substring(1)) : titleText);
                 this.text = def;
-                this.numeric = inumeric;
+                this.numeric = numbers;
                 this.maxLength = textLength;
                 this.accepted = confirmed;
+                this.canceled = closed;
+                this.allowEmpty = empty;
+                this.message = description;
             }});
         }else{
             new Dialog(titleText){{
-                cont.margin(30).add(dtext).padRight(6f);
-                TextFieldFilter filter = inumeric ? TextFieldFilter.digitsOnly : (f, c) -> true;
+                cont.margin(30).add(text).padRight(6f);
+                TextFieldFilter filter = numbers ? TextFieldFilter.digitsOnly : (f, c) -> true;
                 TextField field = cont.field(def, t -> {}).size(330f, 50f).get();
-                field.setFilter((f, c) -> field.getText().length() < textLength && filter.acceptChar(f, c));
+                field.setMaxLength(textLength);
+                field.setFilter(filter);
                 buttons.defaults().size(120, 54).pad(4);
-                buttons.button("@cancel", this::hide);
+                buttons.button("@cancel", () -> {
+                    closed.run();
+                    hide();
+                });
                 buttons.button("@ok", () -> {
                     confirmed.get(field.getText());
                     hide();
-                }).disabled(b -> field.getText().isEmpty());
+                }).disabled(b -> !allowEmpty && field.getText().isEmpty());
+
                 keyDown(KeyCode.enter, () -> {
                     String text = field.getText();
-                    if(!text.isEmpty()){
+                    if(allowEmpty || !text.isEmpty()){
                         confirmed.get(text);
                         hide();
                     }
                 });
-                keyDown(KeyCode.escape, this::hide);
-                keyDown(KeyCode.back, this::hide);
+
+                closeOnBack(closed);
                 show();
+
                 Core.scene.setKeyboardFocus(field);
                 field.setCursorPosition(def.length());
             }};
@@ -289,30 +329,61 @@ public class UI implements ApplicationListener, Loadable{
         showTextInput(title, text, 32, def, confirmed);
     }
 
-    public void showTextInput(String titleText, String text, int textLength, String def, Cons<String> confirmed){
-        showTextInput(titleText, text, textLength, def, false, confirmed);
+    public void showTextInput(String title, String text, int textLength, String def, Cons<String> confirmed){
+        showTextInput(title, text, textLength, def, false, confirmed);
+    }
+
+    public void showTextInput(String title, String text, int textLength, String def, boolean numeric, Cons<String> confirmed){
+        showTextInput(title, text, textLength, def, numeric, confirmed, () -> {});
     }
 
     public void showInfoFade(String info){
+        showInfoFade(info,  7f);
+    }
+
+    public void showInfoFade(String info, float duration){
+        var cinfo = Core.scene.find("coreinfo");
         Table table = new Table();
         table.touchable = Touchable.disabled;
         table.setFillParent(true);
-        table.actions(Actions.fadeOut(7f, Interp.fade), Actions.remove());
+        if(cinfo.visible && !state.isMenu()) table.marginTop(cinfo.getPrefHeight() / Scl.scl() / 2);
+        table.actions(Actions.fadeOut(duration, Interp.fade), Actions.remove());
         table.top().add(info).style(Styles.outlineLabel).padTop(10);
         Core.scene.add(table);
     }
 
+    public void addDescTooltip(Element elem, String description){
+        if(description == null) return;
+
+        elem.addListener(new Tooltip(t -> t.background(Styles.black8).margin(4f).add(description).color(Color.lightGray)){
+            {
+                allowMobile = true;
+            }
+            @Override
+            protected void setContainerPosition(Element element, float x, float y){
+                this.targetActor = element;
+                Vec2 pos = element.localToStageCoordinates(Tmp.v1.set(0, 0));
+                container.pack();
+                container.setPosition(pos.x, pos.y, Align.topLeft);
+                container.setOrigin(0, element.getHeight());
+            }
+        });
+    }
+
     /** Shows a fading label at the top of the screen. */
     public void showInfoToast(String info, float duration){
+        var cinfo = Core.scene.find("coreinfo");
         Table table = new Table();
-        table.setFillParent(true);
         table.touchable = Touchable.disabled;
+        table.setFillParent(true);
+        if(cinfo.visible && !state.isMenu()) table.marginTop(cinfo.getPrefHeight() / Scl.scl() / 2);
         table.update(() -> {
             if(state.isMenu()) table.remove();
         });
         table.actions(Actions.delay(duration * 0.9f), Actions.fadeOut(duration * 0.1f, Interp.fade), Actions.remove());
         table.top().table(Styles.black3, t -> t.margin(4).add(info).style(Styles.outlineLabel)).padTop(10);
         Core.scene.add(table);
+        lastAnnouncement = table;
     }
 
     /** Shows a label at some position on the screen. Does not fade. */
@@ -348,17 +419,21 @@ public class UI implements ApplicationListener, Loadable{
     }
 
     public void showInfo(String info){
-        showInfo(info, () -> {});
-    }
-
-    public void showInfo(String info, Runnable listener){
         new Dialog(""){{
             getCell(cont).growX();
             cont.margin(15).add(info).width(400f).wrap().get().setAlignment(Align.center, Align.center);
-            buttons.button("@ok", () -> {
-                hide();
-                listener.run();
-            }).size(110, 50).pad(4);
+            buttons.button("@ok", this::hide).size(110, 50).pad(4);
+            keyDown(KeyCode.enter, this::hide);
+            closeOnBack();
+        }}.show();
+    }
+
+    public void showInfoOnHidden(String info, Runnable listener){
+        new Dialog(""){{
+            getCell(cont).growX();
+            cont.margin(15).add(info).width(400f).wrap().get().setAlignment(Align.center, Align.center);
+            buttons.button("@ok", this::hide).size(110, 50).pad(4);
+            hidden(listener);
             closeOnBack();
         }}.show();
     }
@@ -392,6 +467,8 @@ public class UI implements ApplicationListener, Loadable{
     }
 
     public void showException(String text, Throwable exc){
+        if(loadfrag == null) return;
+
         loadfrag.hide();
         new Dialog(""){{
             String message = Strings.getFinalMessage(exc);
@@ -449,6 +526,10 @@ public class UI implements ApplicationListener, Loadable{
         }}.show();
     }
 
+    public void showConfirm(String text, Runnable confirmed){
+        showConfirm("@confirm", text, null, confirmed);
+    }
+
     public void showConfirm(String title, String text, Runnable confirmed){
         showConfirm(title, text, null, confirmed);
     }
@@ -458,8 +539,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", Icon.cancel, dialog::hide);
+        dialog.buttons.button("@ok", Icon.ok, () -> {
             dialog.hide();
             confirmed.run();
         });
@@ -497,6 +578,10 @@ public class UI implements ApplicationListener, Loadable{
         dialog.show();
     }
 
+    public boolean hasAnnouncement(){
+        return lastAnnouncement != null && lastAnnouncement.parent != null;
+    }
+
     /** Display text in the middle of the screen, then fade out. */
     public void announce(String text){
         announce(text, 3);
@@ -512,6 +597,7 @@ public class UI implements ApplicationListener, Loadable{
         t.pack();
         t.act(0.1f);
         Core.scene.add(t);
+        lastAnnouncement = t;
     }
 
     public void showOkText(String title, String text, Runnable confirmed){
@@ -526,17 +612,106 @@ public class UI implements ApplicationListener, Loadable{
         dialog.show();
     }
 
-    //TODO move?
+    // TODO REPLACE INTEGER WITH arc.fun.IntCons(int, T) or something like that.
+    public Dialog newMenuDialog(String title, String message, String[][] options, Cons2<Integer, Dialog> buttonListener){
+        return new Dialog(title){{
+            setFillParent(true);
+            removeChild(titleTable);
+            cont.add(titleTable).width(400f);
 
-    public static String formatAmount(int 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") + "[]";
+            cont.row();
+            cont.image().width(400f).pad(2).colspan(2).height(4f).color(Pal.accent).bottom();
+            cont.row();
+            cont.pane(table -> {
+                table.add(message).width(400f).wrap().get().setAlignment(Align.center);
+                table.row();
+
+                int option = 0;
+                for(var optionsRow : options){
+                    if(optionsRow.length == 0) continue;
+                    Table buttonRow = table.row().table().get().row();
+                    int fullWidth = 400 - (optionsRow.length - 1) * 8; // adjust to count padding as well
+                    int width = fullWidth / optionsRow.length;
+                    int lastWidth = fullWidth - width * (optionsRow.length - 1); // take the rest of space for uneven table
+
+                    for(int i = 0; i < optionsRow.length; i++){
+                        if(optionsRow[i] == null) continue;
+
+                        String optionName = optionsRow[i];
+                        int finalOption = option;
+                        buttonRow.button(optionName, () -> buttonListener.get(finalOption, this))
+                                .size(i == optionsRow.length - 1 ? lastWidth : width, 50).pad(4);
+                        option++;
+                    }
+                }
+            }).growX();
+        }};
+    }
+
+    /** Shows a menu that fires a callback when an option is selected. If nothing is selected, -1 is returned. */
+    public void showMenu(String title, String message, String[][] options, Intc callback){
+        Dialog dialog = newMenuDialog(title, message, options, (option, myself) -> {
+            callback.get(option);
+            myself.hide();
+        });
+        dialog.closeOnBack(() -> callback.get(-1));
+        dialog.show();
+    }
+
+    /** Shows a menu that hides when another followUp-menu is shown or when nothing is selected.
+     * @see UI#showMenu(String, String, String[][], Intc) */
+    public void showFollowUpMenu(int menuId, String title, String message, String[][] options, Intc callback) {
+        Dialog dialog = newMenuDialog(title, message, options, (option, myself) -> callback.get(option));
+        dialog.closeOnBack(() -> {
+            followUpMenus.remove(menuId);
+            callback.get(-1);
+        });
+
+        Dialog oldDialog = followUpMenus.remove(menuId);
+        if(oldDialog != null){
+            dialog.show(Core.scene, null);
+            oldDialog.hide(null);
+        }else{
+            dialog.show();
+        }
+        followUpMenus.put(menuId, dialog);
+    }
+
+    public void hideFollowUpMenu(int menuId) {
+        if(!followUpMenus.containsKey(menuId)) return;
+        followUpMenus.remove(menuId).hide();
+    }
+
+    /** Formats time with hours:minutes:seconds. */
+    public static String formatTime(float ticks){
+        int seconds = (int)(ticks / 60);
+        if(seconds < 60) return "0:" + (seconds < 10 ? "0" : "") + seconds;
+
+        int minutes = seconds / 60;
+        int modSec = seconds % 60;
+        if(minutes < 60) return minutes + ":" + (modSec < 10 ? "0" : "") + modSec;
+
+        int hours = minutes / 60;
+        int modMinute = minutes % 60;
+
+        return hours + ":" + (modMinute < 10 ? "0" : "") + modMinute + ":" + (modSec < 10 ? "0" : "") + modSec;
+    }
+
+    public static String formatAmount(long number){
+        //prevent things like bars displaying erroneous representations of casted infinities
+        if(number == Long.MAX_VALUE) return "∞";
+        if(number == Long.MIN_VALUE) return "-∞";
+
+        long mag = Math.abs(number);
+        String sign = number < 0 ? "-" : "";
+        if(mag >= 1_000_000_000){
+            return sign + Strings.fixed(mag / 1_000_000_000f, 1) + "[gray]" + billions + "[]";
+        }else if(mag >= 1_000_000){
+            return sign + Strings.fixed(mag / 1_000_000f, 1) + "[gray]" + millions + "[]";
+        }else if(mag >= 10_000){
+            return number / 1000 + "[gray]" + thousands + "[]";
+        }else if(mag >= 1000){
+            return sign + Strings.fixed(mag / 1000f, 1) + "[gray]" + thousands + "[]";
         }else{
             return number + "";
         }
diff --git a/core/src/mindustry/core/Version.java b/core/src/mindustry/core/Version.java
index f5b3d2fd6b..c79594eebd 100644
--- a/core/src/mindustry/core/Version.java
+++ b/core/src/mindustry/core/Version.java
@@ -12,6 +12,8 @@ public class Version{
     public static String type = "unknown";
     /** Build modifier, e.g. 'alpha' or 'release' */
     public static String modifier = "unknown";
+    /** Git commit hash (short) */
+    public static String commitHash = "unknown";
     /** Number specifying the major version, e.g. '4' */
     public static int number;
     /** Build number, e.g. '43'. set to '-1' for custom builds. */
@@ -32,6 +34,7 @@ public class Version{
         type = map.get("type");
         number = Integer.parseInt(map.get("number", "4"));
         modifier = map.get("modifier");
+        commitHash = map.get("commitHash");
         if(map.get("build").contains(".")){
             String[] split = map.get("build").split("\\.");
             try{
@@ -46,8 +49,13 @@ public class Version{
         }
     }
 
-    /** @return whether the version is greater than the specified version string, e.g. "120.1"*/
+    /** @return whether the current game version is greater than the specified version string, e.g. "120.1"*/
     public static boolean isAtLeast(String str){
+        return isAtLeast(build, revision, str);
+    }
+
+    /** @return whether the version numbers are greater than the specified version string, e.g. "120.1"*/
+    public static boolean isAtLeast(int build, int revision, String str){
         if(build <= 0 || str == null || str.isEmpty()) return true;
 
         int dot = str.indexOf('.');
@@ -68,6 +76,6 @@ public class Version{
         if(build == -1){
             return "custom build";
         }
-        return (type.equals("official") ? modifier : type) + " build " + build + (revision == 0 ? "" : "." + revision);
+        return (type.equals("official") ? modifier : type) + " build " + build + (revision == 0 ? "" : "." + revision) + (commitHash.equals("unknown") ? "" : " (" + commitHash + ")");
     }
 }
diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java
index 9751a3cd0d..a9e858a0c7 100644
--- a/core/src/mindustry/core/World.java
+++ b/core/src/mindustry/core/World.java
@@ -4,10 +4,11 @@ import arc.*;
 import arc.func.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.math.geom.Geometry.*;
 import arc.struct.*;
-import arc.struct.ObjectIntMap.*;
 import arc.util.*;
 import arc.util.noise.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.core.GameState.*;
 import mindustry.ctype.*;
@@ -20,7 +21,6 @@ import mindustry.maps.*;
 import mindustry.maps.filters.*;
 import mindustry.maps.filters.GenerateFilter.*;
 import mindustry.type.*;
-import mindustry.type.Weather.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.legacy.*;
@@ -31,12 +31,20 @@ public class World{
     public final Context context = new Context();
 
     public Tiles tiles = new Tiles(0, 0);
+    /** The number of times tiles have changed in this session. Used for blocks that need to poll world state, but not frequently. */
+    public int tileChanges = -1;
 
     private boolean generating, invalidMap;
     private ObjectMap<Map, Runnable> customMapLoaders = new ObjectMap<>();
 
     public World(){
+        Events.on(TileChangeEvent.class, e -> {
+            tileChanges ++;
+        });
 
+        Events.on(WorldLoadEvent.class, e -> {
+            tileChanges = -1;
+        });
     }
 
     /** Adds a custom handler function for loading a custom map - usually a generated one. */
@@ -162,7 +170,11 @@ public class World{
         return Math.round(coord / tilesize);
     }
 
-    private void clearTileEntities(){
+    public int packArray(int x, int y){
+        return x + y * tiles.width;
+    }
+
+    public void clearBuildings(){
         for(Tile tile : tiles){
             if(tile != null && tile.build != null){
                 tile.build.remove();
@@ -175,7 +187,7 @@ public class World{
      * Only use for loading saves!
      */
     public Tiles resize(int width, int height){
-        clearTileEntities();
+        clearBuildings();
 
         if(tiles.width != width || tiles.height != height){
             tiles = new Tiles(width, height);
@@ -190,6 +202,7 @@ public class World{
      */
     public void beginMapLoad(){
         generating = true;
+        Events.fire(new WorldLoadBeginEvent());
     }
 
     /**
@@ -197,6 +210,7 @@ public class World{
      * A WorldLoadEvent will be fire.
      */
     public void endMapLoad(){
+        Events.fire(new WorldLoadEndEvent());
 
         for(Tile tile : tiles){
             //remove legacy blocks; they need to stop existing
@@ -219,7 +233,7 @@ public class World{
     }
 
     public Rect getQuadBounds(Rect in){
-        return in.set(-finalWorldBounds, -finalWorldBounds, world.width() * tilesize + finalWorldBounds * 2, world.height() * tilesize + finalWorldBounds * 2);
+        return in.set(-finalWorldBounds, -finalWorldBounds, width() * tilesize + finalWorldBounds * 2, height() * tilesize + finalWorldBounds * 2);
     }
 
     public void setGenerating(boolean gen){
@@ -240,98 +254,80 @@ public class World{
     }
 
     public void loadSector(Sector sector){
-        setSectorRules(sector);
+        loadSector(sector, 0, true);
+    }
+
+    public void loadSector(Sector sector, int seedOffset, boolean saveInfo){
+        setSectorRules(sector, saveInfo);
 
         int size = sector.getSize();
         loadGenerator(size, size, tiles -> {
             if(sector.preset != null){
                 sector.preset.generator.generate(tiles);
                 sector.preset.rules.get(state.rules); //apply extra rules
+            }else if(sector.planet.generator != null){
+                sector.planet.generator.generate(tiles, sector, seedOffset);
             }else{
-                sector.planet.generator.generate(tiles, sector);
+                throw new RuntimeException("Sector " + sector.id + " on planet " + sector.planet.name + " has no generator or preset defined. Provide a planet generator or preset map.");
             }
             //just in case
             state.rules.sector = sector;
         });
 
+        if(saveInfo && state.rules.waves){
+            sector.info.waves = state.rules.waves;
+        }
+
         //postgenerate for bases
-        if(sector.preset == null){
+        if(sector.preset == null && sector.planet.generator != null){
             sector.planet.generator.postGenerate(tiles);
         }
 
         //reset rules
-        setSectorRules(sector);
+        setSectorRules(sector, saveInfo);
 
         if(state.rules.defaultTeam.core() != null){
             sector.info.spawnPosition = state.rules.defaultTeam.core().pos();
         }
     }
 
-    private void setSectorRules(Sector sector){
+    private void setSectorRules(Sector sector, boolean saveInfo){
         state.map = new Map(StringMap.of("name", sector.preset == null ? sector.planet.localizedName + "; Sector " + sector.id : sector.preset.localizedName));
         state.rules.sector = sector;
-
         state.rules.weather.clear();
 
-        //apply weather based on terrain
-        ObjectIntMap<Block> floorc = new ObjectIntMap<>();
+        sector.planet.generator.addWeather(sector, state.rules);
+
         ObjectSet<UnlockableContent> content = new ObjectSet<>();
 
-        for(Tile tile : world.tiles){
-            if(world.getDarkness(tile.x, tile.y) >= 3){
+        //resources can be outside area
+        boolean border = state.rules.limitMapArea;
+        state.rules.limitMapArea = false;
+
+        //TODO duplicate code?
+        for(Tile tile : tiles){
+            if(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(tile.floor().itemDrop != null && tile.block() == Blocks.air) content.add(tile.floor().itemDrop);
+            if(tile.overlay().itemDrop != null && tile.block() == Blocks.air) content.add(tile.overlay().itemDrop);
+            if(tile.wallDrop() != null) content.add(tile.wallDrop());
             if(liquid != null) content.add(liquid);
-
-            if(!tile.block().isStatic()){
-                floorc.increment(tile.floor());
-                if(tile.overlay() != Blocks.air){
-                    floorc.increment(tile.overlay());
-                }
-            }
         }
+        state.rules.limitMapArea = border;
 
-        //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];
-        for(int i = 0; i < entries.size; i++){
-            floors[i] = entries.get(i).key;
-        }
-
-        //TODO bad code
-        boolean hasSnow = floors[0].name.contains("ice") || floors[0].name.contains("snow");
-        boolean hasRain = !hasSnow && content.contains(Liquids.water) && !floors[0].name.contains("sand");
-        boolean hasDesert = !hasSnow && !hasRain && floors[0] == Blocks.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));
-            state.rules.weather.add(new WeatherEntry(Weathers.fog));
-        }
-
-        if(hasDesert){
-            state.rules.weather.add(new WeatherEntry(Weathers.sandstorm));
-        }
-
-        if(hasSpores){
-            state.rules.weather.add(new WeatherEntry(Weathers.sporestorm));
-        }
-
-        sector.info.resources = content.asArray();
+        state.rules.cloudColor = sector.planet.landCloudColor;
+        state.rules.env = sector.planet.defaultEnv;
+        state.rules.planet = sector.planet;
+        sector.planet.applyRules(state.rules);
+        sector.info.resources = content.toSeq();
         sector.info.resources.sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id)));
-        sector.saveInfo();
+
+        if(saveInfo){
+            sector.saveInfo();
+        }
     }
 
     public Context filterContext(Map map){
@@ -367,18 +363,18 @@ public class World{
         invalidMap = false;
 
         if(!headless){
-            if(state.teams.playerCores().size == 0 && !checkRules.pvp){
-                ui.showErrorMessage("@map.nospawn");
+            if(state.teams.cores(checkRules.defaultTeam).size == 0 && !checkRules.pvp){
                 invalidMap = true;
+                ui.showErrorMessage(Core.bundle.format("map.nospawn", checkRules.defaultTeam.coloredName()));
             }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");
                 }
             }else if(checkRules.attackMode){ //attack maps need two cores to be valid
-                invalidMap = state.teams.get(state.rules.waveTeam).noCores();
+                invalidMap = state.rules.waveTeam.data().noCores();
                 if(invalidMap){
-                    ui.showErrorMessage("@map.nospawn.attack");
+                    ui.showErrorMessage(Core.bundle.format("map.nospawn.attack", checkRules.waveTeam.coloredName()));
                 }
             }
         }else{
@@ -392,78 +388,11 @@ public class World{
         if(invalidMap) Core.app.post(() -> state.set(State.menu));
     }
 
-    public void notifyChanged(Tile tile){
-        if(!generating){
-            Core.app.post(() -> Events.fire(new TileChangeEvent(tile)));
-        }
-    }
-
-    public void raycastEachWorld(float x0, float y0, float x1, float y1, Raycaster cons){
-        raycastEach(toTile(x0), toTile(y0), toTile(x1), toTile(y1), cons);
-    }
-
-    public void raycastEach(int x0f, int y0f, int x1, int y1, Raycaster cons){
-        int x0 = x0f;
-        int y0 = y0f;
-        int dx = Math.abs(x1 - x0);
-        int dy = Math.abs(y1 - y0);
-
-        int sx = x0 < x1 ? 1 : -1;
-        int sy = y0 < y1 ? 1 : -1;
-
-        int err = dx - dy;
-        int e2;
-        while(true){
-
-            if(cons.accept(x0, y0)) break;
-            if(x0 == x1 && y0 == y1) break;
-
-            e2 = 2 * err;
-            if(e2 > -dy){
-                err = err - dy;
-                x0 = x0 + sx;
-            }
-
-            if(e2 < dx){
-                err = err + dx;
-                y0 = y0 + sy;
-            }
-        }
-    }
-
-    public boolean raycast(int x0f, int y0f, int x1, int y1, Raycaster cons){
-        int x0 = x0f;
-        int y0 = y0f;
-        int dx = Math.abs(x1 - x0);
-        int dy = Math.abs(y1 - y0);
-
-        int sx = x0 < x1 ? 1 : -1;
-        int sy = y0 < y1 ? 1 : -1;
-
-        int err = dx - dy;
-        int e2;
-        while(true){
-            if(cons.accept(x0, y0)) return true;
-            if(x0 == x1 && y0 == y1) return false;
-
-            e2 = 2 * err;
-            if(e2 > -dy){
-                err = err - dy;
-                x0 = x0 + sx;
-            }
-
-            if(e2 < dx){
-                err = err + dx;
-                y0 = y0 + sy;
-            }
-        }
-    }
-
     public void addDarkness(Tiles tiles){
         byte[] dark = new byte[tiles.width * tiles.height];
         byte[] writeBuffer = new byte[tiles.width * tiles.height];
 
-        byte darkIterations = 4;
+        byte darkIterations = darkRadius;
 
         for(int i = 0; i < dark.length; i++){
             Tile tile = tiles.geti(i);
@@ -497,7 +426,7 @@ public class World{
                 tile.data = dark[idx];
             }
 
-            if(dark[idx] == 4){
+            if(dark[idx] == darkRadius){
                 boolean full = true;
                 for(Point2 p : Geometry.d4){
                     int px = p.x + tile.x, py = p.y + tile.y;
@@ -508,22 +437,60 @@ public class World{
                     }
                 }
 
-                if(full) tile.data = 5;
+                if(full) tile.data = darkRadius + 1;
             }
         }
     }
 
-    public float getDarkness(int x, int y){
-        int edgeBlend = 2;
+    public byte getWallDarkness(Tile tile){
+        if(tile.isDarkened()){
+            int minDst = darkRadius + 1;
+            for(int cx = tile.x - darkRadius; cx <= tile.x + darkRadius; cx++){
+                for(int cy = tile.y - darkRadius; cy <= tile.y + darkRadius; cy++){
+                    if(tiles.in(cx, cy) && !rawTile(cx, cy).isDarkened()){
+                        minDst = Math.min(minDst, Math.abs(cx - tile.x) + Math.abs(cy - tile.y));
+                    }
+                }
+            }
 
+            return (byte)Math.max((minDst - 1), 0);
+        }
+        return 0;
+    }
+
+    public void checkMapArea(){
+        for(var build : Groups.build){
+            //reset map-area-based disabled blocks.
+            if(!build.enabled && build.block.autoResetEnabled){
+                build.enabled = true;
+            }
+        }
+    }
+
+    //TODO optimize; this is very slow and called too often!
+    public float getDarkness(int x, int y){
         float dark = 0;
-        int edgeDst = Math.min(x, Math.min(y, Math.min(Math.abs(x - (tiles.width - 1)), Math.abs(y - (tiles.height - 1)))));
-        if(edgeDst <= edgeBlend){
-            dark = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), dark);
+
+        if(Vars.state.rules.borderDarkness){
+            int edgeBlend = 2;
+            int edgeDst;
+
+            if(!state.rules.limitMapArea){
+                edgeDst = Math.min(x, Math.min(y, Math.min(-(x - (tiles.width - 1)), -(y - (tiles.height - 1)))));
+            }else{
+                edgeDst =
+                    Math.min(x - state.rules.limitX,
+                    Math.min(y - state.rules.limitY,
+                    Math.min(-(x - (state.rules.limitX + state.rules.limitWidth - 1)), -(y - (state.rules.limitY + state.rules.limitHeight - 1)))));
+            }
+
+            if(edgeDst <= edgeBlend){
+                dark = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), dark);
+            }
         }
 
         if(state.hasSector() && state.getSector().preset == null){
-            int circleBlend = 14;
+            int circleBlend = 5;
             //quantized angle
             float offset = state.getSector().rect.rotation + 90;
             float angle = Angles.angle(x, y, tiles.width/2, tiles.height/2) + offset;
@@ -546,22 +513,65 @@ public class World{
             }
         }
 
-        Tile tile = world.tile(x, y);
-        if(tile != null && tile.block().solid && tile.block().fillsTile && !tile.block().synthetic()){
+        Tile tile = tile(x, y);
+        if(tile != null && tile.isDarkened()){
             dark = Math.max(dark, tile.data);
         }
 
         return dark;
     }
 
-    public interface Raycaster{
-        boolean accept(int x, int y);
+    public static void raycastEachWorld(float x0, float y0, float x1, float y1, Raycaster cons){
+        raycastEach(toTile(x0), toTile(y0), toTile(x1), toTile(y1), cons);
+    }
+
+    public static void raycastEach(int x1, int y1, int x2, int y2, Raycaster cons){
+        int x = x1, dx = Math.abs(x2 - x), sx = x < x2 ? 1 : -1;
+        int y = y1, dy = Math.abs(y2 - y), sy = y < y2 ? 1 : -1;
+        int e2, err = dx - dy;
+
+        while(true){
+            if(cons.accept(x, y)) break;
+            if(x == x2 && y == y2) break;
+
+            e2 = 2 * err;
+            if(e2 > -dy){
+                err -= dy;
+                x += sx;
+            }
+
+            if(e2 < dx){
+                err += dx;
+                y += sy;
+            }
+        }
+    }
+
+    public static boolean raycast(int x1, int y1, int x2, int y2, Raycaster cons){
+        int x = x1, dx = Math.abs(x2 - x), sx = x < x2 ? 1 : -1;
+        int y = y1, dy = Math.abs(y2 - y), sy = y < y2 ? 1 : -1;
+        int e2, err = dx - dy;
+
+        while(true){
+            if(cons.accept(x, y)) return true;
+            if(x == x2 && y == y2) return false;
+
+            e2 = 2 * err;
+            if(e2 > -dy){
+                err = err - dy;
+                x = x + sx;
+            }
+
+            if(e2 < dx){
+                err = err + dx;
+                y = y + sy;
+            }
+        }
     }
 
     private class Context implements WorldContext{
 
-        Context(){
-        }
+        Context(){}
 
         @Override
         public Tile tile(int index){
@@ -597,15 +607,21 @@ public class World{
     }
 
     /** World context that applies filters after generation end. */
-    private class FilterContext extends Context{
+    public class FilterContext extends Context{
         final Map map;
 
-        FilterContext(Map map){
+        public FilterContext(Map map){
             this.map = map;
         }
 
         @Override
         public void end(){
+            applyFilters();
+
+            super.end();
+        }
+
+        public void applyFilters(){
             Seq<GenerateFilter> filters = map.filters();
 
             if(!filters.isEmpty()){
@@ -614,12 +630,10 @@ public class World{
 
                 for(GenerateFilter filter : filters){
                     filter.randomize();
-                    input.begin(filter, width(), height(), (x, y) -> tiles.getn(x, y));
+                    input.begin(width(), height(), (x, y) -> tiles.getn(x, y));
                     filter.apply(tiles, input);
                 }
             }
-
-            super.end();
         }
     }
 }
diff --git a/core/src/mindustry/ctype/Content.java b/core/src/mindustry/ctype/Content.java
index 71bf965e3f..97816377e2 100644
--- a/core/src/mindustry/ctype/Content.java
+++ b/core/src/mindustry/ctype/Content.java
@@ -6,8 +6,8 @@ import mindustry.*;
 import mindustry.mod.Mods.*;
 
 /** Base class for a content type that is loaded in {@link mindustry.core.ContentLoader}. */
-public abstract class Content implements Comparable<Content>, Disposable{
-    public final short id;
+public abstract class Content implements Comparable<Content>{
+    public short id;
     /** Info on which mod this content was loaded from. */
     public ModContentInfo minfo = new ModContentInfo();
 
@@ -25,20 +25,31 @@ public abstract class Content implements Comparable<Content>, Disposable{
     /** Called after all content and modules are created. Do not use to load regions or texture data! */
     public void init(){}
 
+    /** Called after init(). */
+    public void postInit(){}
+
     /**
      * Called after all content is created, only on non-headless versions.
      * Use for loading regions or other image data.
      */
     public void load(){}
 
+    /** Called right before load(). */
+    public void loadIcon(){}
+
     /** @return whether an error occurred during mod loading. */
     public boolean hasErrored(){
         return minfo.error != null;
     }
 
-    @Override
-    public void dispose(){
-        //does nothing by default
+    /** @return whether this is content from the base game. */
+    public boolean isVanilla(){
+        return minfo.mod == null;
+    }
+
+    /** @return whether this content is from a mod. */
+    public boolean isModded(){
+        return !isVanilla();
     }
 
     @Override
diff --git a/core/src/mindustry/ctype/ContentList.java b/core/src/mindustry/ctype/ContentList.java
deleted file mode 100644
index efe1588f31..0000000000
--- a/core/src/mindustry/ctype/ContentList.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package mindustry.ctype;
-
-/** Interface for a list of content to be loaded in {@link mindustry.core.ContentLoader}. */
-public interface ContentList{
-    /** This method should create all the content. */
-    void load();
-}
diff --git a/core/src/mindustry/ctype/ContentType.java b/core/src/mindustry/ctype/ContentType.java
index e62377628c..136e5257e0 100644
--- a/core/src/mindustry/ctype/ContentType.java
+++ b/core/src/mindustry/ctype/ContentType.java
@@ -1,22 +1,37 @@
 package mindustry.ctype;
 
+import arc.util.*;
+import mindustry.ai.*;
+import mindustry.entities.bullet.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
 /** Do not rearrange, ever! */
 public enum ContentType{
-    item,
-    block,
-    mech_UNUSED,
-    bullet,
-    liquid,
-    status,
-    unit,
-    weather,
-    effect_UNUSED,
-    sector,
-    loadout_UNUSED,
-    typeid_UNUSED,
-    error,
-    planet,
-    ammo;
+    item(Item.class),
+    block(Block.class),
+    mech_UNUSED(null),
+    bullet(BulletType.class),
+    liquid(Liquid.class),
+    status(StatusEffect.class),
+    unit(UnitType.class),
+    weather(Weather.class),
+    effect_UNUSED(null),
+    sector(SectorPreset.class),
+    loadout_UNUSED(null),
+    typeid_UNUSED(null),
+    error(null),
+    planet(Planet.class),
+    ammo_UNUSED(null),
+    team(TeamEntry.class),
+    unitCommand(UnitCommand.class),
+    unitStance(UnitStance.class);
 
     public static final ContentType[] all = values();
+
+    public final @Nullable Class<? extends Content> contentClass;
+
+    ContentType(Class<? extends Content> contentClass){
+        this.contentClass = contentClass;
+    }
 }
diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java
index a08dab1b67..f8fdc28679 100644
--- a/core/src/mindustry/ctype/UnlockableContent.java
+++ b/core/src/mindustry/ctype/UnlockableContent.java
@@ -2,14 +2,18 @@ package mindustry.ctype;
 
 import arc.*;
 import arc.func.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.graphics.g2d.TextureAtlas.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.game.EventType.*;
 import mindustry.graphics.*;
+import mindustry.graphics.MultiPacker.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.meta.*;
@@ -28,11 +32,38 @@ public abstract class UnlockableContent extends MappableContent{
     public boolean alwaysUnlocked = false;
     /** Whether to show the description in the research dialog preview. */
     public boolean inlineDescription = true;
-    /** Special logic icon ID. */
-    public int iconId = 0;
-    /** Icons by Cicon ID.*/
-    protected TextureRegion[] cicons = new TextureRegion[Cicon.all.length];
-    /** Unlock state. Loaded from settings. Do not modify outside of the constructor. */
+    /** Whether details are hidden in custom games if this hasn't been unlocked in campaign mode. */
+    public boolean hideDetails = true;
+    /** Whether this is hidden from the Core Database. */
+    public boolean hideDatabase = false;
+    /** If false, all icon generation is disabled for this content; createIcons is not called. */
+    public boolean generateIcons = true;
+    /** How big the content appears in certain selection menus */
+    public float selectionSize = 24f;
+    /** Icon of the content to use in UI. */
+    public TextureRegion uiIcon;
+    /** Icon of the full content. Unscaled.*/
+    public TextureRegion fullIcon;
+    /** Override for the full icon. Useful for mod content with duplicate icons. Overrides any other full icon.*/
+    public String fullOverride = "";
+    /** If true, this content will appear in all database tabs. */
+    public boolean allDatabaseTabs = false;
+    /**
+     * Planets that this content is made for. If empty, a planet is decided based on item requirements.
+     * Currently, this is only meaningful for blocks.
+     * */
+    public ObjectSet<Planet> shownPlanets = new ObjectSet<>();
+    /**
+     * Content - usually a planet - that dictates which database tab(s) this content will appear in.
+     * If nothing is defined, it will use the values in shownPlanets.
+     * If shownPlanets is also empty, it will use Serpulo as the "default" tab.
+     * */
+    public ObjectSet<UnlockableContent> databaseTabs = new ObjectSet<>();
+    /** The tech tree node for this content, if applicable. Null if not part of a tech tree. */
+    public @Nullable TechNode techNode;
+    /** Tech nodes for all trees that this content is part of. */
+    public Seq<TechNode> techNodes = new Seq<>();
+    /** Unlock state. Loaded from settings. Do not modify outside the constructor. */
     protected boolean unlocked;
 
     public UnlockableContent(String name){
@@ -44,13 +75,36 @@ public abstract class UnlockableContent extends MappableContent{
         this.unlocked = Core.settings != null && Core.settings.getBool(this.name + "-unlocked", false);
     }
 
-    /** @return the tech node for this content. may be null. */
-    public @Nullable TechNode node(){
-        return TechTree.get(this);
+    @Override
+    public void postInit(){
+        super.postInit();
+
+        databaseTabs.addAll(shownPlanets);
+    }
+
+    @Override
+    public void loadIcon(){
+        fullIcon =
+            Core.atlas.find(fullOverride == null ? "" : fullOverride,
+            Core.atlas.find(getContentType().name() + "-" + name + "-full",
+            Core.atlas.find(name + "-full",
+            Core.atlas.find(name,
+            Core.atlas.find(getContentType().name() + "-" + name,
+            Core.atlas.find(name + "1"))))));
+
+        uiIcon = Core.atlas.find(getContentType().name() + "-" + name + "-ui", fullIcon);
+    }
+
+    public boolean isOnPlanet(@Nullable Planet planet){
+        return planet == null || planet == Planets.sun || shownPlanets.isEmpty() || shownPlanets.contains(planet);
+    }
+
+    public int getLogicId(){
+        return logicVars.lookupLogicId(this);
     }
 
     public String displayDescription(){
-        return minfo.mod == null ? description : description + "\n" + Core.bundle.format("mod.display", minfo.mod.meta.displayName());
+        return minfo.mod == null ? description : description + "\n" + Core.bundle.format("mod.display", minfo.mod.meta.displayName);
     }
 
     /** Checks stat initialization state. Call before displaying stats. */
@@ -65,12 +119,50 @@ public abstract class UnlockableContent extends MappableContent{
     public void setStats(){
     }
 
-    /** Generate any special icons for this content. Called asynchronously.*/
+    /** Display any extra info after details. */
+    public void displayExtra(Table table){
+
+    }
+
+    /**
+     * Generate any special icons for this content. Called synchronously.
+     * No regions are loaded at this point; grab pixmaps from the packer.
+     * */
     @CallSuper
     public void createIcons(MultiPacker packer){
 
     }
 
+    protected void makeOutline(PageType page, MultiPacker packer, TextureRegion region, boolean makeNew, Color outlineColor, int outlineRadius){
+        if(region instanceof AtlasRegion at && region.found()){
+            String name = at.name;
+            if(!makeNew || !packer.has(name + "-outline")){
+                String regName = name + (makeNew ? "-outline" : "");
+                if(packer.registerOutlined(regName)){
+                    PixmapRegion base = Core.atlas.getPixmap(region);
+                    var result = Pixmaps.outline(base, outlineColor, outlineRadius);
+                    Drawf.checkBleed(result);
+                    packer.add(page, regName, result);
+                    result.dispose();
+                }
+            }
+        }
+    }
+
+    protected void makeOutline(MultiPacker packer, TextureRegion region, String name, Color outlineColor, int outlineRadius){
+        if(region.found() && packer.registerOutlined(name)){
+            PixmapRegion base = Core.atlas.getPixmap(region);
+            var result = Pixmaps.outline(base, outlineColor, outlineRadius);
+            Drawf.checkBleed(result);
+            packer.add(PageType.main, name, result);
+            result.dispose();
+        }
+    }
+
+    protected void makeOutline(MultiPacker packer, TextureRegion region, String name, Color outlineColor){
+        makeOutline(packer, region, name, outlineColor, 4);
+    }
+
     /** @return items needed to research this content */
     public ItemStack[] researchRequirements(){
         return ItemStack.empty;
@@ -80,19 +172,13 @@ public abstract class UnlockableContent extends MappableContent{
         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){
-            cicons[icon.ordinal()] =
-                Core.atlas.find(getContentType().name() + "-" + name + "-" + icon.name(),
-                Core.atlas.find(getContentType().name() + "-" + name + "-full",
-                Core.atlas.find(name + "-" + icon.name(),
-                Core.atlas.find(name + "-full",
-                Core.atlas.find(name,
-                Core.atlas.find(getContentType().name() + "-" + name,
-                Core.atlas.find(name + "1")))))));
-        }
-        return cicons[icon.ordinal()];
+    public int emojiChar(){
+        return Fonts.getUnicode(name);
+    }
+
+
+    public boolean hasEmoji(){
+        return Fonts.hasUnicodeStr(name);
     }
 
     /** Iterates through any implicit dependencies of this content.
@@ -101,11 +187,6 @@ public abstract class UnlockableContent extends MappableContent{
 
     }
 
-    /** This should show all necessary info about this content in the specified table. */
-    public void display(Table table){
-
-    }
-
     /** Called when this content is unlocked. Use this to unlock other related content. */
     public void onUnlock(){
     }
@@ -115,6 +196,15 @@ public abstract class UnlockableContent extends MappableContent{
         return false;
     }
 
+    /** @return whether to show a notification toast when this is unlocked */
+    public boolean showUnlock(){
+        return true;
+    }
+
+    public boolean logicVisible(){
+        return !isHidden();
+    }
+
     /** Makes this piece of content unlocked; if it already unlocked, nothing happens. */
     public void unlock(){
         if(!unlocked && !alwaysUnlocked){
@@ -134,9 +224,26 @@ public abstract class UnlockableContent extends MappableContent{
         }
     }
 
+    public boolean unlockedNowHost(){
+        return !state.isCampaign() || unlockedHost();
+    }
+
+    /** @return in multiplayer, whether this is unlocked for the host player, otherwise, whether it is unlocked for the local player (same as unlocked()) */
+    public boolean unlockedHost(){
+        return net != null && net.client() ?
+            alwaysUnlocked || state.rules.researched.contains(this) :
+            unlocked || alwaysUnlocked;
+    }
+
+    /** @return whether this content is unlocked, or the player is in a custom (non-campaign) game. */
+    public boolean unlockedNow(){
+        return unlocked() || !state.isCampaign();
+    }
+
     public boolean unlocked(){
-        if(net != null && net.client()) return unlocked || alwaysUnlocked || state.rules.researched.contains(name);
-        return unlocked || alwaysUnlocked;
+        return net != null && net.client() ?
+            alwaysUnlocked || unlocked || state.rules.researched.contains(this) :
+            unlocked || alwaysUnlocked;
     }
 
     /** Locks this content again. */
@@ -147,11 +254,6 @@ public abstract class UnlockableContent extends MappableContent{
         }
     }
 
-    /** @return whether this content is unlocked, or the player is in a custom (non-campaign) game. */
-    public boolean unlockedNow(){
-        return unlocked() || !state.isCampaign();
-    }
-
     public boolean locked(){
         return !unlocked();
     }
diff --git a/core/src/mindustry/editor/BannedContentDialog.java b/core/src/mindustry/editor/BannedContentDialog.java
new file mode 100644
index 0000000000..2a15742195
--- /dev/null
+++ b/core/src/mindustry/editor/BannedContentDialog.java
@@ -0,0 +1,210 @@
+package mindustry.editor;
+
+import arc.*;
+import arc.func.*;
+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 mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class BannedContentDialog<T extends UnlockableContent> extends BaseDialog{
+    private final ContentType type;
+    private Table selectedTable;
+    private Table deselectedTable;
+    private ObjectSet<T> contentSet;
+    private final Boolf<T> pred;
+    private String contentSearch;
+    private Category selectedCategory;
+    private Seq<T> filteredContent;
+
+    public BannedContentDialog(String title, ContentType type, Boolf<T> pred){
+        super(title);
+        this.type = type;
+        this.pred = pred;
+        contentSearch = "";
+
+        selectedTable = new Table();
+        deselectedTable = new Table();
+
+        addCloseButton();
+
+        shown(this::build);
+        resized(this::build);
+    }
+
+    public void show(ObjectSet<T> contentSet){
+        this.contentSet = contentSet;
+        show();
+    }
+
+    public void build(){
+        cont.clear();
+
+        var cell = cont.table(t -> {
+            t.table(s -> {
+                s.label(() -> "@search").padRight(10);
+                var field = s.field(contentSearch, value -> {
+                    contentSearch = value;
+                    rebuildTables();
+                }).get();
+                s.button(Icon.cancel, Styles.emptyi, () -> {
+                    contentSearch = "";
+                    field.setText("");
+                    rebuildTables();
+                }).padLeft(10f).size(35f);
+            });
+            if(type == ContentType.block){
+                t.row();
+                t.table(c -> {
+                    c.marginTop(8f);
+                    c.defaults().marginRight(4f);
+                    for(Category category : Category.values()){
+                        c.button(ui.getIcon(category.name()), Styles.squareTogglei, () -> {
+                            if(selectedCategory == category){
+                                selectedCategory = null;
+                            }else{
+                                selectedCategory = category;
+                            }
+                            rebuildTables();
+                        }).size(45f).update(i -> i.setChecked(selectedCategory == category)).padLeft(4f);
+                    }
+                    c.add("").padRight(4f);
+                }).center();
+            }
+        });
+        cont.row();
+        if(!Core.graphics.isPortrait()) cell.colspan(2);
+
+        filteredContent = content.<T>getBy(type).select(pred);
+        if(!contentSearch.isEmpty()) filteredContent.removeAll(content -> !content.localizedName.toLowerCase().contains(contentSearch.toLowerCase()));
+
+        cont.table(table -> {
+            if(type == ContentType.block){
+                table.add("@bannedblocks").color(Color.valueOf("f25555")).padBottom(-1).top().row();
+            }else{
+                table.add("@bannedunits").color(Color.valueOf("f25555")).padBottom(-1).top().row();
+            }
+
+            table.image().color(Color.valueOf("f25555")).height(3f).padBottom(5f).fillX().expandX().top().row();
+            table.pane(table2 -> selectedTable = table2).fill().expand().row();
+            table.button("@addall", Icon.add, () -> {
+                contentSet.addAll(filteredContent);
+                rebuildTables();
+            }).disabled(button -> contentSet.toSeq().containsAll(filteredContent)).padTop(10f).bottom().fillX();
+        }).fill().expandY().uniform();
+
+        if(Core.graphics.isPortrait()) cont.row();
+
+        var cell2 = cont.table(table -> {
+            if(type == ContentType.block){
+                table.add("@unbannedblocks").color(Pal.accent).padBottom(-1).top().row();
+            }else{
+                table.add("@unbannedunits").color(Pal.accent).padBottom(-1).top().row();
+            }
+
+            table.image().color(Pal.accent).height(3f).padBottom(5f).fillX().top().row();
+            table.pane(table2 -> deselectedTable = table2).fill().expand().row();
+            table.button("@addall", Icon.add, () -> {
+                contentSet.removeAll(filteredContent);
+                rebuildTables();
+            }).disabled(button -> {
+                Seq<T> array = content.getBy(type);
+                array = array.copy();
+                array.removeAll(contentSet.toSeq());
+                return array.containsAll(filteredContent);
+            }).padTop(10f).bottom().fillX();
+        }).fill().expandY().uniform();
+        if(Core.graphics.isPortrait()){
+            cell2.padTop(10f);
+        }else{
+            cell2.padLeft(10f);
+        }
+
+        rebuildTables();
+    }
+
+    private void rebuildTables(){
+        filteredContent.clear();
+        filteredContent = content.getBy(type);
+        filteredContent = filteredContent.select(pred);
+
+        if(!contentSearch.isEmpty()) filteredContent.removeAll(content -> !content.localizedName.toLowerCase().contains(contentSearch.toLowerCase()));
+        if(type == ContentType.block){
+            filteredContent.removeAll(content -> selectedCategory != null && ((Block)content).category != selectedCategory);
+        }
+
+        rebuildTable(selectedTable, true);
+        rebuildTable(deselectedTable, false);
+    }
+
+    private void rebuildTable(Table table, boolean isSelected){
+        table.clear();
+
+        int cols;
+        if(Core.graphics.isPortrait()){
+            cols = Math.max(4, (int)((Core.graphics.getWidth() / Scl.scl() - 100f) / 50f));
+        }else{
+            cols = Math.max(4, (int)((Core.graphics.getWidth() / Scl.scl() - 300f) / 50f / 2));
+        }
+
+        if((isSelected && contentSet.isEmpty()) || (!isSelected && contentSet.size == content.<T>getBy(type).count(pred))){
+            table.add("@empty").width(50f * cols).padBottom(5f).get().setAlignment(Align.center);
+        }else{
+            Seq<T> array;
+            if(!isSelected){
+                array = content.getBy(type);
+                array = array.copy();
+                array.removeAll(contentSet.toSeq());
+            }else{
+                array = contentSet.toSeq();
+            }
+            array.sort();
+            array.removeAll(content -> !filteredContent.contains(content));
+
+            if(array.isEmpty()){
+                table.add("@empty").width(50f * cols).padBottom(5f).get().setAlignment(Align.center);
+                return;
+            }
+            int i = 0;
+            boolean requiresPad = true;
+
+            for(T content : array){
+                TextureRegion region = content.uiIcon;
+
+                ImageButton button = new ImageButton(Tex.whiteui, Styles.clearNonei);
+                button.getStyle().imageUp = new TextureRegionDrawable(region);
+                button.resizeImage(8 * 4f);
+                if(isSelected) button.clicked(() -> {
+                    contentSet.remove(content);
+                    rebuildTables();
+                });
+                else button.clicked(() -> {
+                    contentSet.add(content);
+                    rebuildTables();
+                });
+                table.add(button).size(50f).tooltip(content.localizedName);
+
+                if(++i % cols == 0){
+                    table.row();
+                    requiresPad = false;
+                }
+            }
+
+            if(requiresPad){
+                table.add("").padRight(50f * (cols - i));
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/editor/DrawOperation.java b/core/src/mindustry/editor/DrawOperation.java
index 53134663ea..a49b09525e 100755
--- a/core/src/mindustry/editor/DrawOperation.java
+++ b/core/src/mindustry/editor/DrawOperation.java
@@ -10,13 +10,8 @@ import mindustry.world.blocks.environment.*;
 import static mindustry.Vars.*;
 
 public class DrawOperation{
-    private MapEditor editor;
     private LongSeq array = new LongSeq();
 
-    public DrawOperation(MapEditor editor){
-        this.editor = editor;
-    }
-
     public boolean isEmpty(){
         return array.isEmpty();
     }
@@ -61,7 +56,9 @@ public class DrawOperation{
     void setTile(Tile tile, byte type, short to){
         editor.load(() -> {
             if(type == OpType.floor.ordinal()){
-                tile.setFloor((Floor)content.block(to));
+                if(content.block(to) instanceof Floor floor){
+                    tile.setFloor(floor);
+                }
             }else if(type == OpType.block.ordinal()){
                 tile.getLinkedTiles(t -> editor.renderer.updatePoint(t.x, t.y));
 
diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java
index e4be334888..68272ce8d1 100644
--- a/core/src/mindustry/editor/EditorTile.java
+++ b/core/src/mindustry/editor/EditorTile.java
@@ -39,9 +39,14 @@ public class EditorTile extends Tile{
     }
 
     @Override
-    public void setBlock(Block type, Team team, int rotation){
+    public boolean isEditorTile(){
+        return true;
+    }
+
+    @Override
+    public void setBlock(Block type, Team team, int rotation, Prov<Building> entityprov){
         if(skip()){
-            super.setBlock(type, team, rotation);
+            super.setBlock(type, team, rotation, entityprov);
             return;
         }
 
@@ -63,7 +68,7 @@ public class EditorTile extends Tile{
 
         }
 
-        super.setBlock(type, team, rotation);
+        super.setBlock(type, team, rotation, entityprov);
     }
 
     @Override
@@ -77,7 +82,7 @@ public class EditorTile extends Tile{
         op(OpType.team, (byte)getTeamID());
         super.setTeam(team);
 
-        getLinkedTiles(t -> ui.editor.editor.renderer.updatePoint(t.x, t.y));
+        getLinkedTiles(t -> editor.renderer.updatePoint(t.x, t.y));
     }
 
     @Override
@@ -87,7 +92,7 @@ public class EditorTile extends Tile{
             return;
         }
 
-        if(!floor.hasSurface() && overlay.asFloor().needsSurface) return;
+        if(!floor.hasSurface() && overlay.asFloor().needsSurface && (overlay instanceof OreBlock || !floor.supportsOverlay)) return;
         if(overlay() == overlay) return;
         op(OpType.overlay, this.overlay.id);
         super.setOverlay(overlay);
@@ -102,6 +107,15 @@ public class EditorTile extends Tile{
         }
     }
 
+    @Override
+    protected void firePreChanged(){
+        if(skip()){
+            super.firePreChanged();
+        }else{
+            update();
+        }
+    }
+
     @Override
     public void recache(){
         if(skip()){
@@ -132,7 +146,6 @@ public class EditorTile extends Tile{
 
         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());
@@ -140,14 +153,14 @@ public class EditorTile extends Tile{
     }
 
     private void update(){
-        ui.editor.editor.renderer.updatePoint(x, y);
+        editor.renderer.updatePoint(x, y);
     }
 
     private boolean skip(){
-        return state.isGame() || ui.editor.editor.isLoading();
+        return state.isGame() || editor.isLoading() || world.isGenerating();
     }
 
     private void op(OpType type, short value){
-        ui.editor.editor.addTileOp(TileOp.get(x, y, (byte)type.ordinal(), value));
+        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 cd4b63935e..50c7a2aca9 100644
--- a/core/src/mindustry/editor/EditorTool.java
+++ b/core/src/mindustry/editor/EditorTool.java
@@ -10,10 +10,12 @@ import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.world.*;
 
+import static mindustry.Vars.*;
+
 public enum EditorTool{
     zoom(KeyCode.v),
     pick(KeyCode.i){
-        public void touched(MapEditor editor, int x, int y){
+        public void touched(int x, int y){
             if(!Structs.inBounds(x, y, editor.width(), editor.height())) return;
 
             Tile tile = editor.tile(x, y);
@@ -23,7 +25,7 @@ public enum EditorTool{
     line(KeyCode.l, "replace", "orthogonal"){
 
         @Override
-        public void touchedLine(MapEditor editor, int x1, int y1, int x2, int y2){
+        public void touchedLine(int x1, int y1, int x2, int y2){
             //straight
             if(mode == 1){
                 if(Math.abs(x2 - x1) > Math.abs(y2 - y1)){
@@ -44,14 +46,15 @@ public enum EditorTool{
             });
         }
     },
-    pencil(KeyCode.b, "replace", "square", "drawteams"){
+    //the "under liquid" rendering is too buggy to make public
+    pencil(KeyCode.b, "replace", "square", "drawteams"/*, "underliquid"*/){
         {
             edit = true;
             draggable = true;
         }
 
         @Override
-        public void touched(MapEditor editor, int x, int y){
+        public void touched(int x, int y){
             if(mode == -1){
                 //normal mode
                 editor.drawBlocks(x, y);
@@ -60,10 +63,12 @@ public enum EditorTool{
                 editor.drawBlocksReplace(x, y);
             }else if(mode == 1){
                 //square mode
-                editor.drawBlocks(x, y, true, tile -> true);
+                editor.drawBlocks(x, y, true, false, tile -> true);
             }else if(mode == 2){
                 //draw teams
                 editor.drawCircle(x, y, tile -> tile.setTeam(editor.drawTeam));
+            }else if(mode == 3){
+                editor.drawBlocks(x, y, false, true, tile -> tile.floor().isLiquid);
             }
 
         }
@@ -75,7 +80,7 @@ public enum EditorTool{
         }
 
         @Override
-        public void touched(MapEditor editor, int x, int y){
+        public void touched(int x, int y){
             editor.drawCircle(x, y, tile -> {
                 if(mode == -1){
                     //erase block
@@ -87,7 +92,7 @@ public enum EditorTool{
             });
         }
     },
-    fill(KeyCode.g, "replaceall", "fillteams"){
+    fill(KeyCode.g, "replaceall", "fillteams", "fillerase"){
         {
             edit = true;
         }
@@ -95,17 +100,19 @@ public enum EditorTool{
         IntSeq stack = new IntSeq();
 
         @Override
-        public void touched(MapEditor editor, int x, int y){
+        public void touched(int x, int y){
             if(!Structs.inBounds(x, y, editor.width(), editor.height())) return;
             Tile tile = editor.tile(x, y);
 
-            if(editor.drawBlock.isMultiblock()){
+            if(tile == null) return;
+
+            if(editor.drawBlock.isMultiblock() && (mode == 0 || mode == -1)){
                 //don't fill multiblocks, thanks
-                pencil.touched(editor, x, y);
+                pencil.touched(x, y);
                 return;
             }
 
-            //mode 0 or 1, fill everything with the floor/tile or replace it
+            //mode 0 or standard, fill everything with the floor/tile or replace it
             if(mode == 0 || mode == -1){
                 //can't fill parts or multiblocks
                 if(tile.block().isMultiblock()){
@@ -133,19 +140,40 @@ public enum EditorTool{
                 }
 
                 //replace only when the mode is 0 using the specified functions
-                fill(editor, x, y, mode == 0, tester, setter);
+                fill(x, y, mode == 0, tester, setter);
             }else if(mode == 1){ //mode 1 is team fill
 
                 //only fill synthetic blocks, it's meaningless otherwise
                 if(tile.synthetic()){
                     Team dest = tile.team();
                     if(dest == editor.drawTeam) return;
-                    fill(editor, x, y, false, t -> t.getTeamID() == dest.id && t.synthetic(), t -> t.setTeam(editor.drawTeam));
+                    fill(x, y, true, t -> t.getTeamID() == dest.id && t.synthetic(), t -> t.setTeam(editor.drawTeam));
+                }
+            }else if(mode == 2){ //erase mode
+                Boolf<Tile> tester;
+                Cons<Tile> setter;
+
+                if(tile.block() != Blocks.air){
+                    Block dest = tile.block();
+                    tester = t -> t.block() == dest;
+                    setter = t -> t.setBlock(Blocks.air);
+                }else if(tile.overlay() != Blocks.air){
+                    Block dest = tile.overlay();
+                    tester = t -> t.overlay() == dest;
+                    setter = t -> t.setOverlay(Blocks.air);
+                }else{
+                    //trying to erase floor (no)
+                    tester = null;
+                    setter = null;
+                }
+
+                if(setter != null){
+                    fill(x, y, false, tester, setter);
                 }
             }
         }
 
-        void fill(MapEditor editor, int x, int y, boolean replace, Boolf<Tile> tester, Cons<Tile> filler){
+        void fill(int x, int y, boolean replace, Boolf<Tile> tester, Cons<Tile> filler){
             int width = editor.width(), height = editor.height();
 
             if(replace){
@@ -215,7 +243,7 @@ public enum EditorTool{
         }
 
         @Override
-        public void touched(MapEditor editor, int x, int y){
+        public void touched(int x, int y){
 
             //floor spray
             if(editor.drawBlock.isFloor()){
@@ -263,7 +291,7 @@ public enum EditorTool{
         this.key = code;
     }
 
-    public void touched(MapEditor editor, int x, int y){}
+    public void touched(int x, int y){}
 
-    public void touchedLine(MapEditor editor, int x1, int y1, int x2, int y2){}
+    public void touchedLine(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 c460d7c042..38839e6108 100644
--- a/core/src/mindustry/editor/MapEditor.java
+++ b/core/src/mindustry/editor/MapEditor.java
@@ -8,6 +8,7 @@ import arc.math.geom.*;
 import arc.struct.*;
 import mindustry.content.*;
 import mindustry.editor.DrawOperation.*;
+import mindustry.entities.units.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.io.*;
@@ -17,17 +18,17 @@ import mindustry.world.*;
 import static mindustry.Vars.*;
 
 public class MapEditor{
-    public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20};
+    public static final float[] brushSizes = {1, 1.5f, 2, 3, 4, 5, 9, 15, 20};
 
     public StringMap tags = new StringMap();
-    public MapRenderer renderer = new MapRenderer(this);
+    public MapRenderer renderer = new MapRenderer();
 
     private final Context context = new Context();
     private OperationStack stack = new OperationStack();
     private DrawOperation currentOp;
     private boolean loading;
 
-    public int brushSize = 1;
+    public float brushSize = 1;
     public int rotation;
     public Block drawBlock = Blocks.stone;
     public Team drawTeam = Team.sharded;
@@ -61,11 +62,31 @@ public class MapEditor{
     public void beginEdit(Pixmap pixmap){
         reset();
 
-        createTiles(pixmap.getWidth(), pixmap.getHeight());
+        createTiles(pixmap.width, pixmap.height);
         load(() -> MapIO.readImage(pixmap, tiles()));
         renderer.resize(width(), height());
     }
 
+    public void updateRenderer(){
+        Tiles tiles = world.tiles;
+        Seq<Building> builds = new Seq<>();
+
+        for(int i = 0; i < tiles.width * tiles.height; i++){
+            Tile tile = tiles.geti(i);
+            var build = tile.build;
+            if(build != null && tile.isCenter()){
+                builds.add(build);
+            }
+            tiles.seti(i, new EditorTile(tile.x, tile.y, tile.floorID(), tile.overlayID(), build == null ? tile.blockID() : 0));
+        }
+
+        for(var build : builds){
+            tiles.get(build.tileX(), build.tileY()).setBlock(build.block, build.team, build.rotation, () -> build);
+        }
+
+        renderer.resize(width(), height());
+    }
+
     public void load(Runnable r){
         loading = true;
         r.run();
@@ -115,14 +136,14 @@ public class MapEditor{
     }
 
     public void drawBlocks(int x, int y){
-        drawBlocks(x, y, false, tile -> true);
+        drawBlocks(x, y, false, false, tile -> true);
     }
 
     public void drawBlocks(int x, int y, Boolf<Tile> tester){
-        drawBlocks(x, y, false, tester);
+        drawBlocks(x, y, false, false, tester);
     }
 
-    public void drawBlocks(int x, int y, boolean square, Boolf<Tile> tester){
+    public void drawBlocks(int x, int y, boolean square, boolean forceOverlay, Boolf<Tile> tester){
         if(drawBlock.isMultiblock()){
             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);
@@ -136,7 +157,13 @@ public class MapEditor{
                 if(!tester.get(tile)) return;
 
                 if(isFloor){
-                    tile.setFloor(drawBlock.asFloor());
+                    if(forceOverlay){
+                        tile.setOverlay(drawBlock.asFloor());
+                    }else{
+                        if(!(drawBlock.asFloor().wallOre && !tile.block().solid)){
+                            tile.setFloor(drawBlock.asFloor());
+                        }
+                    }
                 }else if(!(tile.block().isMultiblock() && !drawBlock.isMultiblock())){
                     if(drawBlock.rotate && tile.build != null && tile.build.rotation != rotation){
                         addTileOp(TileOp.get(tile.x, tile.y, (byte)OpType.rotation.ordinal(), (byte)rotation));
@@ -226,8 +253,9 @@ public class MapEditor{
     }
 
     public void drawCircle(int x, int y, Cons<Tile> drawer){
-        for(int rx = -brushSize; rx <= brushSize; rx++){
-            for(int ry = -brushSize; ry <= brushSize; ry++){
+        int clamped = (int)brushSize;
+        for(int rx = -clamped; rx <= clamped; rx++){
+            for(int ry = -clamped; ry <= clamped; ry++){
                 if(Mathf.within(rx, ry, brushSize - 0.5f + 0.0001f)){
                     int wx = x + rx, wy = y + ry;
 
@@ -242,8 +270,9 @@ public class MapEditor{
     }
 
     public void drawSquare(int x, int y, Cons<Tile> drawer){
-        for(int rx = -brushSize; rx <= brushSize; rx++){
-            for(int ry = -brushSize; ry <= brushSize; ry++){
+        int clamped = (int)brushSize;
+        for(int rx = -clamped; rx <= clamped; rx++){
+            for(int ry = -clamped; ry <= clamped; ry++){
                 int wx = x + rx, wy = y + ry;
 
                 if(wx < 0 || wy < 0 || wx >= width() || wy >= height()){
@@ -255,27 +284,51 @@ public class MapEditor{
         }
     }
 
-    public void resize(int width, int height){
+    public void resize(int width, int height, int shiftX, int shiftY){
         clearOp();
 
         Tiles previous = world.tiles;
-        int offsetX = -(width - width()) / 2, offsetY = -(height - height()) / 2;
+        int offsetX = (width() - width) / 2 - shiftX, offsetY = (height() - height) / 2 - shiftY;
         loading = true;
 
-        Tiles tiles = world.resize(width, height);
+        world.clearBuildings();
+
+        Tiles tiles = world.tiles = new Tiles(width, height);
+
         for(int x = 0; x < width; x++){
             for(int y = 0; y < height; y++){
                 int px = offsetX + x, py = offsetY + y;
                 if(previous.in(px, py)){
                     tiles.set(x, y, previous.getn(px, py));
                     Tile tile = tiles.getn(x, y);
+
+                    Object config = null;
+
+                    //fetch the old config first, configs can be relative to block position (tileX/tileY) before those are reassigned
+                    if(tile.build != null && tile.isCenter()){
+                        config = tile.build.config();
+                    }
+
                     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;
+
+                        //shift links to account for map resize
+                        if(config != null){
+                            Object out = BuildPlan.pointConfig(tile.block(), config, p -> {
+                                if(!tile.build.block.ignoreResizeConfig){
+                                    p.sub(offsetX, offsetY);
+                                }
+                            });
+                            if(out != config){
+                                tile.build.configureAny(out);
+                            }
+                        }
                     }
+
                 }else{
                     tiles.set(x, y, new EditorTile(x, y, Blocks.stone.id, (short)0, (short)0));
                 }
@@ -319,7 +372,7 @@ public class MapEditor{
     public void addTileOp(long data){
         if(loading) return;
 
-        if(currentOp == null) currentOp = new DrawOperation(this);
+        if(currentOp == null) currentOp = new DrawOperation();
         currentOp.addOperation(data);
 
         renderer.updatePoint(TileOp.x(data), TileOp.y(data));
diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java
index 316d29f5e6..ad35a4a45f 100644
--- a/core/src/mindustry/editor/MapEditorDialog.java
+++ b/core/src/mindustry/editor/MapEditorDialog.java
@@ -19,6 +19,7 @@ import mindustry.*;
 import mindustry.content.*;
 import mindustry.core.GameState.*;
 import mindustry.game.*;
+import mindustry.game.MapObjectives.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.*;
@@ -33,18 +34,18 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class MapEditorDialog extends Dialog implements Disposable{
-    public final MapEditor editor;
-
     private MapView view;
     private MapInfoDialog infoDialog;
     private MapLoadDialog loadDialog;
     private MapResizeDialog resizeDialog;
     private MapGenerateDialog generateDialog;
+    private SectorGenerateDialog sectorGenDialog;
+    private MapPlayDialog playtestDialog;
     private ScrollPane pane;
     private BaseDialog menu;
     private Table blockSelection;
     private Rules lastSavedRules;
-    private boolean saved = false;
+    private boolean saved = false; //currently never read
     private boolean shownWithMap = false;
     private Seq<Block> blocksOut = new Seq<>();
 
@@ -53,10 +54,11 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         background(Styles.black);
 
-        editor = new MapEditor();
-        view = new MapView(editor);
-        infoDialog = new MapInfoDialog(editor);
-        generateDialog = new MapGenerateDialog(editor, true);
+        view = new MapView();
+        infoDialog = new MapInfoDialog();
+        generateDialog = new MapGenerateDialog(true);
+        sectorGenDialog = new SectorGenerateDialog();
+        playtestDialog = new MapPlayDialog();
 
         menu = new BaseDialog("@menu");
         menu.addCloseButton();
@@ -120,9 +122,15 @@ public class MapEditorDialog extends Dialog implements Disposable{
             "@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);
+                    file.writePng(out);
                     out.dispose();
                 })));
+
+            t.row();
+
+            t.button("@editor.ingame", Icon.right, this::editInGame);
+
+            t.button("@editor.playtest", Icon.play, this::playtest);
         });
 
         menu.cont.row();
@@ -156,24 +164,31 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 }
 
                 platform.publish(map);
-            }).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"));
+            }).padTop(-3).size(swidth * 2f + 10, 60f).update(b ->
+                b.setText(editor.tags.containsKey("steamid") ?
+                    editor.tags.get("author", "").equals(steamPlayerName) ? "@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.sectorgenerate", Icon.terrain, () -> {
+            menu.hide();
+            sectorGenDialog.show();
+        }).padTop(!steam ? -3 : 1).size(swidth * 2f + 10, 60f);
+        menu.cont.row();
 
         menu.cont.row();
 
         menu.cont.button("@quit", Icon.exit, () -> {
             tryExit();
             menu.hide();
-        }).size(swidth * 2f + 10, 60f);
+        }).padTop(1).size(swidth * 2f + 10, 60f);
 
-        resizeDialog = new MapResizeDialog(editor, (x, y) -> {
-            if(!(editor.width() == x && editor.height() == y)){
+        resizeDialog = new MapResizeDialog((width, height, shiftX, shiftY) -> {
+            if(!(editor.width() == width && editor.height() == height && shiftX == 0 && shiftY == 0)){
                 ui.loadAnd(() -> {
-                    editor.resize(x, y);
+                    editor.resize(width, height, shiftX, shiftY);
                 });
             }
         });
@@ -193,11 +208,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         margin(0);
 
         update(() -> {
-            if(Core.scene.getKeyboardFocus() instanceof Dialog && Core.scene.getKeyboardFocus() != this){
-                return;
-            }
-
-            if(Core.scene != null && Core.scene.getKeyboardFocus() == this){
+            if(hasKeyboard()){
                 doInput();
             }
         });
@@ -238,7 +249,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         editor.renderer.updateAll();
     }
 
-    private void playtest(){
+    private void editInGame(){
         menu.hide();
         ui.loadAnd(() -> {
             lastSavedRules = state.rules;
@@ -247,7 +258,9 @@ public class MapEditorDialog extends Dialog implements Disposable{
             state.teams = new Teams();
             player.reset();
             state.rules = Gamemode.editor.apply(lastSavedRules.copy());
+            state.rules.limitMapArea = false;
             state.rules.sector = null;
+            state.rules.fog = false;
             state.map = new Map(StringMap.of(
                 "name", "Editor Playtesting",
                 "width", editor.width(),
@@ -255,22 +268,60 @@ public class MapEditorDialog extends Dialog implements Disposable{
             ));
             world.endMapLoad();
             player.set(world.width() * tilesize/2f, world.height() * tilesize/2f);
+            Core.camera.position.set(player);
             player.clearUnit();
-            Groups.unit.clear();
+
+            for(var unit : Groups.unit){
+                if(unit.spawnedByCore){
+                    unit.remove();
+                }
+            }
+
             Groups.build.clear();
             Groups.weather.clear();
             logic.play();
 
             if(player.team().core() == null){
                 player.set(world.width() * tilesize/2f, world.height() * tilesize/2f);
-                player.unit(UnitTypes.alpha.spawn(player.team(), player.x, player.y));
+                var unit = (state.rules.hasEnv(Env.scorching) ? UnitTypes.evoke : UnitTypes.alpha).spawn(player.team(), player.x, player.y);
+                unit.spawnedByCore = true;
+                player.unit(unit);
             }
+
+            player.checkSpawn();
         });
     }
 
+    public void resumeAfterPlaytest(Map map){
+        beginEditMap(map.file);
+    }
+
+    private void playtest(){
+        menu.hide();
+        Map map = save();
+
+        if(map != null){
+            //skip dialog, play immediately when shift clicked
+            if(Core.input.shift()){
+                hide();
+                //auto pick best fit
+                control.playMap(map, map.applyRules(
+                    Gamemode.survival.valid(map) ? Gamemode.survival :
+                    Gamemode.attack.valid(map) ? Gamemode.attack :
+                    Gamemode.sandbox), true
+                );
+            }else{
+                playtestDialog.playListener = this::hide;
+                playtestDialog.show(map, true);
+            }
+        }
+    }
+
     public @Nullable Map save(){
         boolean isEditor = state.rules.editor;
         state.rules.editor = false;
+        state.rules.objectiveFlags.clear();
+        state.rules.objectives.each(MapObjective::reset);
         String name = editor.tags.get("name", "").trim();
         editor.tags.put("rules", JsonIO.write(state.rules));
         editor.tags.remove("width");
@@ -278,6 +329,12 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         player.clearUnit();
 
+        //remove player unit
+        Unit unit = Groups.unit.find(u -> u.spawnedByCore);
+        if(unit != null){
+            unit.remove();
+        }
+
         Map returned = null;
 
         if(name.isEmpty()){
@@ -285,10 +342,19 @@ public class MapEditorDialog extends Dialog implements Disposable{
             Core.app.post(() -> ui.showErrorMessage("@editor.save.noname"));
         }else{
             Map map = maps.all().find(m -> m.name().equals(name));
-            if(map != null && !map.custom){
+            if(map != null && !map.custom && !map.workshop){
                 handleSaveBuiltin(map);
             }else{
+                boolean workshop = false;
+                //try to preserve Steam ID
+                if(map != null && map.tags.containsKey("steamid")){
+                    editor.tags.put("steamid", map.tags.get("steamid"));
+                    workshop = true;
+                }
                 returned = maps.saveMap(editor.tags);
+                if(workshop){
+                    returned.workshop = workshop;
+                }
                 ui.showInfoFade("@editor.saved");
             }
         }
@@ -392,7 +458,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
     }
 
     public void build(){
-        float size = 58f;
+        float size = mobile ? 50f : 58f;
 
         clearChildren();
         table(cont -> {
@@ -408,7 +474,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
                 Cons<EditorTool> addTool = tool -> {
 
-                    ImageButton button = new ImageButton(ui.getIcon(tool.name()), Styles.clearTogglei);
+                    ImageButton button = new ImageButton(ui.getIcon(tool.name()), Styles.squareTogglei);
                     button.clicked(() -> {
                         view.setTool(tool);
                         if(lastTable[0] != null){
@@ -444,7 +510,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                                 table.button(b -> {
                                     b.left();
                                     b.marginLeft(6);
-                                    b.setStyle(Styles.clearTogglet);
+                                    b.setStyle(Styles.flatTogglet);
                                     b.add(Core.bundle.get("toolmode." + name)).left();
                                     b.row();
                                     b.add(Core.bundle.get("toolmode." + name + ".description")).color(Color.lightGray).left();
@@ -484,16 +550,16 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
                 tools.defaults().size(size, size);
 
-                tools.button(Icon.menu, Styles.cleari, menu::show);
+                tools.button(Icon.menu, Styles.flati, menu::show);
 
-                ImageButton grid = tools.button(Icon.grid, Styles.clearTogglei, () -> view.setGrid(!view.isGrid())).get();
+                ImageButton grid = tools.button(Icon.grid, Styles.squareTogglei, () -> view.setGrid(!view.isGrid())).get();
 
                 addTool.get(EditorTool.zoom);
 
                 tools.row();
 
-                ImageButton undo = tools.button(Icon.undo, Styles.cleari, editor::undo).get();
-                ImageButton redo = tools.button(Icon.redo, Styles.cleari, editor::redo).get();
+                ImageButton undo = tools.button(Icon.undo, Styles.flati, editor::undo).get();
+                ImageButton redo = tools.button(Icon.redo, Styles.flati, editor::redo).get();
 
                 addTool.get(EditorTool.pick);
 
@@ -515,7 +581,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 addTool.get(EditorTool.fill);
                 addTool.get(EditorTool.spray);
 
-                ImageButton rotate = tools.button(Icon.right, Styles.cleari, () -> editor.rotation = (editor.rotation + 1) % 4).get();
+                ImageButton rotate = tools.button(Icon.right, Styles.flati, () -> editor.rotation = (editor.rotation + 1) % 4).get();
                 rotate.getImage().update(() -> {
                     rotate.getImage().setRotation(editor.rotation * 90);
                     rotate.getImage().setOrigin(Align.center);
@@ -533,7 +599,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 int i = 0;
 
                 for(Team team : Team.baseTeams){
-                    ImageButton button = new ImageButton(Tex.whiteui, Styles.clearTogglePartiali);
+                    ImageButton button = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);
                     button.margin(4f);
                     button.getImageCell().grow();
                     button.getStyle().imageUpColor = team.color;
@@ -558,27 +624,27 @@ public class MapEditorDialog extends Dialog implements Disposable{
                         }
                     }
 
-                    t.top();
-                    t.add("@editor.brush");
+                    var label = new Label("@editor.brush");
+                    label.setAlignment(Align.center);
+                    label.touchable = Touchable.disabled;
+
+                    t.top().stack(slider, label).width(size * 3f - 20).padTop(4f);
                     t.row();
-                    t.add(slider).width(size * 3f - 20).padTop(4f);
                 }).padTop(5).growX().top();
 
                 mid.row();
 
                 if(!mobile){
                     mid.table(t -> {
-                        t.button("@editor.center", Icon.move, Styles.cleart, view::center).growX().margin(9f);
+                        t.button("@editor.center", Icon.move, Styles.flatt, view::center).growX().margin(9f);
                     }).growX().top();
                 }
 
-                if(experimental){
-                    mid.row();
+                mid.row();
 
-                    mid.table(t -> {
-                        t.button("Cliffs", Icon.terrain, Styles.cleart, editor::addCliffs).growX().margin(9f);
-                    }).growX().top();
-                }
+                mid.table(t -> {
+                    t.button("@editor.cliffs", Icon.terrain, Styles.flatt, editor::addCliffs).growX().margin(9f);
+                }).growX().top();
             }).margin(0).left().growY();
 
 
@@ -627,28 +693,6 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 editor.undo();
             }
 
-            //more undocumented features, fantastic
-            if(Core.input.keyTap(KeyCode.t)){
-
-                //clears all 'decoration' from the map
-                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 Boulder){
-                            tile.setBlock(Blocks.air);
-                            editor.renderer.updatePoint(x, y);
-                        }
-
-                        if(tile.overlay() != Blocks.air && tile.overlay() != Blocks.spawn){
-                            tile.setOverlay(Blocks.air);
-                            editor.renderer.updatePoint(x, y);
-                        }
-                    }
-                }
-
-                editor.flushOp();
-            }
-
             if(Core.input.keyTap(KeyCode.y)){
                 editor.redo();
             }
@@ -669,7 +713,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
     private void addBlockSelection(Table cont){
         blockSelection = new Table();
-        pane = new ScrollPane(blockSelection);
+        pane = new ScrollPane(blockSelection, Styles.smallPane);
         pane.setFadeScrollBars(false);
         pane.setOverscroll(true, false);
         pane.exited(() -> {
@@ -680,13 +724,13 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         cont.table(search -> {
             search.image(Icon.zoom).padRight(8);
-            search.field("", this::rebuildBlockSelection)
+            search.field("", this::rebuildBlockSelection).growX()
             .name("editor/search").maxTextLength(maxNameLength).get().setMessageText("@players.search");
-        }).pad(-2);
+        }).growX().pad(-2).padLeft(6f);
         cont.row();
         cont.table(Tex.underline, extra -> extra.labelWrap(() -> editor.drawBlock.localizedName).width(200f).center()).growX();
         cont.row();
-        cont.add(pane).expandY().top().left();
+        cont.add(pane).expandY().growX().top().left();
 
         rebuildBlockSelection("");
     }
@@ -709,14 +753,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
         int i = 0;
 
         for(Block block : blocksOut){
-            TextureRegion region = block.icon(Cicon.medium);
+            TextureRegion region = block.uiIcon;
 
             if(!Core.atlas.isFound(region) || !block.inEditor
                     || block.buildVisibility == BuildVisibility.debugOnly
                     || (!searchText.isEmpty() && !block.localizedName.toLowerCase().contains(searchText.toLowerCase()))
             ) continue;
 
-            ImageButton button = new ImageButton(Tex.whiteui, Styles.clearTogglei);
+            ImageButton button = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);
             button.getStyle().imageUp = new TextureRegionDrawable(region);
             button.clicked(() -> editor.drawBlock = block);
             button.resizeImage(8 * 4f);
@@ -725,13 +769,13 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
             if(i == 0) editor.drawBlock = block;
 
-            if(++i % 4 == 0){
+            if(++i % 6 == 0){
                 blockSelection.row();
             }
         }
 
         if(i == 0){
-            blockSelection.add("@none").color(Color.lightGray).padLeft(80f).padTop(10f);
+            blockSelection.add("@none.found").padLeft(54f).padTop(10f);
         }
     }
 }
diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java
index f6a87f77b1..bb04261baf 100644
--- a/core/src/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/mindustry/editor/MapGenerateDialog.java
@@ -10,11 +10,11 @@ import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.async.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.*;
+import mindustry.maps.*;
 import mindustry.maps.filters.*;
 import mindustry.maps.filters.GenerateFilter.*;
 import mindustry.ui.*;
@@ -22,32 +22,26 @@ import mindustry.ui.dialogs.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
+import java.util.concurrent.*;
+
 import static mindustry.Vars.*;
 
 @SuppressWarnings("unchecked")
 public class MapGenerateDialog extends BaseDialog{
-    private final Prov<GenerateFilter>[] filterTypes = new Prov[]{
-        NoiseFilter::new, ScatterFilter::new, TerrainFilter::new, DistortFilter::new,
-        RiverNoiseFilter::new, OreFilter::new, OreMedianFilter::new, MedianFilter::new,
-        BlendFilter::new, MirrorFilter::new, ClearFilter::new, CoreSpawnFilter::new,
-        EnemySpawnFilter::new, SpawnPathFilter::new
-    };
-    private final MapEditor editor;
-    private final boolean applied;
+    final boolean applied;
 
-    private Pixmap pixmap;
-    private Texture texture;
-    private GenerateInput input = new GenerateInput();
+    Pixmap pixmap;
+    Texture texture;
+    GenerateInput input = new GenerateInput();
     Seq<GenerateFilter> filters = new Seq<>();
-    private int scaling = mobile ? 3 : 1;
-    private Table filterTable;
+    int scaling = mobile ? 3 : 1;
+    Table filterTable;
 
-    private AsyncExecutor executor = new AsyncExecutor(1);
-    private AsyncResult<Void> result;
+    Future<?> result;
     boolean generating;
 
-    private long[] buffer1, buffer2;
-    private Cons<Seq<GenerateFilter>> applier;
+    long[] buffer1, buffer2;
+    Cons<Seq<GenerateFilter>> applier;
     CachedTile ctile = new CachedTile(){
         //nothing.
         @Override
@@ -62,35 +56,79 @@ public class MapGenerateDialog extends BaseDialog{
     };
 
     /** @param applied whether or not to use the applied in-game mode. */
-    public MapGenerateDialog(MapEditor editor, boolean applied){
+    public MapGenerateDialog(boolean applied){
         super("@editor.generate");
-        this.editor = editor;
         this.applied = applied;
 
         shown(this::setup);
-        addCloseButton();
+        addCloseListener();
+
+        var style = Styles.flatt;
+
+        buttons.defaults().size(180f, 64f).pad(2f);
+        buttons.button("@back", Icon.left, this::hide);
+
         if(applied){
             buttons.button("@editor.apply", Icon.ok, () -> {
                 ui.loadAnd(() -> {
                     apply();
                     hide();
                 });
-            }).size(160f, 64f);
-        }else{
-            buttons.button("@settings.reset", () -> {
-                filters.set(maps.readFilters(""));
-                rebuildFilters();
-                update();
-            }).size(160f, 64f);
+            });
         }
+
         buttons.button("@editor.randomize", Icon.refresh, () -> {
             for(GenerateFilter filter : filters){
                 filter.randomize();
             }
             update();
-        }).size(160f, 64f);
+        });
 
-        buttons.button("@add", Icon.add, this::showAdd).height(64f).width(150f);
+        buttons.button("@edit", Icon.edit, () -> {
+            BaseDialog dialog = new BaseDialog("@editor.export");
+            dialog.cont.pane(p -> {
+                p.margin(10f);
+                p.table(Tex.button, in -> {
+                    in.defaults().size(280f, 60f).left();
+
+                    in.button("@waves.copy", Icon.copy, style, () -> {
+                        dialog.hide();
+
+                        Core.app.setClipboardText(JsonIO.write(filters));
+                    }).marginLeft(12f).row();
+                    in.button("@waves.load", Icon.download, style, () -> {
+                        dialog.hide();
+                        try{
+                            filters.set(JsonIO.read(Seq.class, Core.app.getClipboardText()));
+
+                            rebuildFilters();
+                            update();
+                        }catch(Throwable e){
+                            ui.showException(e);
+                        }
+                    }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null).row();
+                    in.button("@clear", Icon.none, style, () -> {
+                        dialog.hide();
+                        filters.clear();
+                        rebuildFilters();
+                        update();
+                    }).marginLeft(12f).row();
+                    if(!applied){
+                        in.button("@settings.reset", Icon.refresh, style, () -> {
+                            dialog.hide();
+                            filters.set(maps.readFilters(""));
+                            rebuildFilters();
+                            update();
+                        }).marginLeft(12f).row();
+                    }
+                });
+            });
+
+            dialog.addCloseButton();
+            dialog.show();
+        });
+
+        buttons.button("@add", Icon.add, this::showAdd);
 
         if(!applied){
             hidden(this::apply);
@@ -115,13 +153,13 @@ public class MapGenerateDialog extends BaseDialog{
         long[] writeTiles = new long[editor.width() * editor.height()];
 
         for(GenerateFilter filter : filters){
-            input.begin(filter, editor.width(), editor.height(), editor::tile);
+            input.begin(editor.width(), editor.height(), editor::tile);
 
             //write to buffer
             for(int x = 0; x < editor.width(); x++){
                 for(int y = 0; y < editor.height(); y++){
                     Tile tile = editor.tile(x, y);
-                    input.apply(x, y, tile.block(), tile.floor(), tile.overlay());
+                    input.set(x, y, tile.block(), tile.floor(), tile.overlay());
                     filter.apply(input);
                     writeTiles[x + y*world.width()] = PackTile.get(input.block.id, input.floor.id, input.overlay.id);
                 }
@@ -173,7 +211,7 @@ public class MapGenerateDialog extends BaseDialog{
                 @Override
                 public void draw(){
                     super.draw();
-                    for(GenerateFilter filter : filters){
+                    for(var filter : filters){
                         filter.draw(this);
                     }
                 }
@@ -194,7 +232,7 @@ public class MapGenerateDialog extends BaseDialog{
                 }else{
                     Core.scene.setScrollFocus(null);
                 }
-            }).grow().uniformX().get().setScrollingDisabled(true, false);
+            }).grow().uniformX().scrollX(false);
         }).grow();
 
         buffer1 = create();
@@ -214,7 +252,7 @@ public class MapGenerateDialog extends BaseDialog{
         filterTable.top().left();
         int i = 0;
 
-        for(GenerateFilter filter : filters){
+        for(var filter : filters){
 
             //main container
             filterTable.table(Tex.pane, c -> {
@@ -230,30 +268,44 @@ public class MapGenerateDialog extends BaseDialog{
                     t.add().growX();
 
                     ImageButtonStyle style = Styles.geni;
-                    t.defaults().size(42f);
+                    t.defaults().size(42f).padLeft(-5f);
 
                     t.button(Icon.refresh, style, () -> {
                         filter.randomize();
                         update();
-                    });
+                    }).padLeft(-16f).tooltip("@editor.randomize");
 
-                    t.button(Icon.upOpen, style, () -> {
-                        int idx = filters.indexOf(filter);
-                        filters.swap(idx, Math.max(0, idx - 1));
+                    if(filter != filters.first()){
+                        t.button(Icon.upOpen, style, () -> {
+                            int idx = filters.indexOf(filter);
+                            filters.swap(idx, Math.max(0, idx - 1));
+                            rebuildFilters();
+                            update();
+                        }).tooltip("@editor.moveup");
+                    }
+
+                    if(filter != filters.peek()){
+                        t.button(Icon.downOpen, style, () -> {
+                            int idx = filters.indexOf(filter);
+                            filters.swap(idx, Math.min(filters.size - 1, idx + 1));
+                            rebuildFilters();
+                            update();
+                        }).tooltip("@editor.movedown");
+                    }
+
+                    t.button(Icon.copy, style, () -> {
+                        GenerateFilter copy = filter.copy();
+                        copy.randomize();
+                        filters.insert(filters.indexOf(filter) + 1, copy);
                         rebuildFilters();
                         update();
-                    });
-                    t.button(Icon.downOpen, style, () -> {
-                        int idx = filters.indexOf(filter);
-                        filters.swap(idx, Math.min(filters.size - 1, idx + 1));
-                        rebuildFilters();
-                        update();
-                    });
+                    }).tooltip("@editor.copy");
+
                     t.button(Icon.cancel, style, () -> {
                         filters.remove(filter);
                         rebuildFilters();
                         update();
-                    });
+                    }).tooltip("@waves.remove");
                 }).growX();
 
                 c.row();
@@ -272,7 +324,6 @@ public class MapGenerateDialog extends BaseDialog{
                 }).grow().left().pad(6).top();
             }).width(280f).pad(3).top().left().fillY();
 
-
             if(++i % cols == 0){
                 filterTable.row();
             }
@@ -284,30 +335,35 @@ public class MapGenerateDialog extends BaseDialog{
     }
 
     void showAdd(){
-        BaseDialog selection = new BaseDialog("@add");
-        selection.setFillParent(false);
-        selection.cont.defaults().size(210f, 60f);
-        int i = 0;
-        for(Prov<GenerateFilter> gen : filterTypes){
-            GenerateFilter filter = gen.get();
+        var selection = new BaseDialog("@add");
+        selection.cont.pane(p -> {
+            p.background(Tex.button);
+            p.marginRight(14);
+            p.defaults().size(195f, 56f);
+            int i = 0;
+            for(var gen : Maps.allFilterTypes){
+                var filter = gen.get();
+                var icon = filter.icon();
 
-            if((filter.isPost() && applied)) continue;
+                if(filter.isPost() && applied) continue;
 
-            selection.cont.button(filter.name(), () -> {
-                filters.add(filter);
+                p.button((icon == '\0' ? "" : icon + " ") + filter.name(), Styles.flatt, () -> {
+                    filter.randomize();
+                    filters.add(filter);
+                    rebuildFilters();
+                    update();
+                    selection.hide();
+                }).with(Table::left).get().getLabelCell().growX().left().padLeft(5).labelAlign(Align.left);
+                if(++i % 3 == 0) p.row();
+            }
+
+            p.button(Iconc.refresh + " " + Core.bundle.get("filter.defaultores"), Styles.flatt, () -> {
+                maps.addDefaultOres(filters);
                 rebuildFilters();
                 update();
                 selection.hide();
-            });
-            if(++i % 2 == 0) selection.cont.row();
-        }
-
-        selection.cont.button("@filter.defaultores", () -> {
-            maps.addDefaultOres(filters);
-            rebuildFilters();
-            update();
-            selection.hide();
-        });
+            }).with(Table::left).get().getLabelCell().growX().left().padLeft(5).labelAlign(Align.left);
+        }).scrollX(false);
 
         selection.addCloseButton();
         selection.show();
@@ -326,7 +382,10 @@ public class MapGenerateDialog extends BaseDialog{
 
     void apply(){
         if(result != null){
-            result.get();
+            //ignore errors yay
+            try{
+                result.get();
+            }catch(Exception e){}
         }
 
         buffer1 = null;
@@ -348,31 +407,31 @@ public class MapGenerateDialog extends BaseDialog{
             return;
         }
 
-        Seq<GenerateFilter> copy = new Seq<>(filters);
+        var copy = filters.copy();
 
-        result = executor.submit(() -> {
+        result = mainExecutor.submit(() -> {
             try{
-                int w = pixmap.getWidth();
+                int w = pixmap.width;
                 world.setGenerating(true);
                 generating = true;
 
                 if(!filters.isEmpty()){
                     //write to buffer1 for reading
-                    for(int px = 0; px < pixmap.getWidth(); px++){
-                        for(int py = 0; py < pixmap.getHeight(); py++){
+                    for(int px = 0; px < pixmap.width; px++){
+                        for(int py = 0; py < pixmap.height; py++){
                             buffer1[px + py*w] = pack(editor.tile(px * scaling, py * scaling));
                         }
                     }
                 }
 
-                for(GenerateFilter filter : copy){
-                    input.begin(filter, editor.width(), editor.height(), (x, y) -> unpack(buffer1[Mathf.clamp(x / scaling, 0, pixmap.getWidth()-1) + w* Mathf.clamp(y / scaling, 0, pixmap.getHeight()-1)]));
+                for(var filter : copy){
+                    input.begin(editor.width(), editor.height(), (x, y) -> unpack(buffer1[Mathf.clamp(x / scaling, 0, pixmap.width -1) + w* Mathf.clamp(y / scaling, 0, pixmap.height -1)]));
 
                     //read from buffer1 and write to buffer2
                     pixmap.each((px, py) -> {
                         int x = px * scaling, y = py * scaling;
                         long tile = buffer1[px + py * w];
-                        input.apply(x, y, content.block(PackTile.block(tile)), content.block(PackTile.floor(tile)), content.block(PackTile.overlay(tile)));
+                        input.set(x, y, content.block(PackTile.block(tile)), content.block(PackTile.floor(tile)), content.block(PackTile.overlay(tile)));
                         filter.apply(input);
                         buffer2[px + py * w] = PackTile.get(input.block.id, input.floor.id, input.overlay.id);
                     });
@@ -380,8 +439,8 @@ public class MapGenerateDialog extends BaseDialog{
                     pixmap.each((px, py) -> buffer1[px + py*w] = buffer2[px + py*w]);
                 }
 
-                for(int px = 0; px < pixmap.getWidth(); px++){
-                    for(int py = 0; py < pixmap.getHeight(); py++){
+                for(int px = 0; px < pixmap.width; px++){
+                    for(int py = 0; py < pixmap.height; py++){
                         int color;
                         //get result from buffer1 if there's filters left, otherwise get from editor directly
                         if(filters.isEmpty()){
@@ -391,7 +450,7 @@ public class MapGenerateDialog extends BaseDialog{
                             long tile = buffer1[px + py*w];
                             color = MapIO.colorFor(content.block(PackTile.block(tile)), content.block(PackTile.floor(tile)), content.block(PackTile.overlay(tile)), Team.derelict);
                         }
-                        pixmap.draw(px, pixmap.getHeight() - 1 - py, color);
+                        pixmap.set(px, pixmap.height - 1 - py, color);
                     }
                 }
 
diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java
index dd9959b199..ebc1f0b300 100644
--- a/core/src/mindustry/editor/MapInfoDialog.java
+++ b/core/src/mindustry/editor/MapInfoDialog.java
@@ -1,25 +1,28 @@
 package mindustry.editor;
 
-import arc.*;
 import arc.scene.ui.*;
 import arc.struct.*;
 import mindustry.*;
 import mindustry.game.*;
+import mindustry.gen.*;
 import mindustry.io.*;
+import mindustry.maps.filters.*;
+import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 
-public class MapInfoDialog extends BaseDialog{
-    private final MapEditor editor;
-    private final WaveInfoDialog waveInfo;
-    private final MapGenerateDialog generate;
-    private final CustomRulesDialog ruleInfo = new CustomRulesDialog();
+import static mindustry.Vars.*;
 
-    public MapInfoDialog(MapEditor editor){
+public class MapInfoDialog extends BaseDialog{
+    private WaveInfoDialog waveInfo  = new WaveInfoDialog();
+    private MapGenerateDialog generate = new MapGenerateDialog(false);
+    private CustomRulesDialog ruleInfo = new CustomRulesDialog();
+    private MapObjectivesDialog objectives = new MapObjectivesDialog();
+    private MapLocalesDialog locales = new MapLocalesDialog();
+    private MapProcessorsDialog processors = new MapProcessorsDialog();
+
+    public MapInfoDialog(){
         super("@editor.mapinfo");
-        this.editor = editor;
-        this.waveInfo = new WaveInfoDialog(editor);
-        this.generate = new MapGenerateDialog(editor, false);
 
         addCloseButton();
 
@@ -37,7 +40,7 @@ public class MapInfoDialog extends BaseDialog{
 
             TextField name = t.field(tags.get("name", ""), text -> {
                 tags.put("name", text);
-            }).size(400, 55f).addInputDialog(50).get();
+            }).size(400, 55f).maxTextLength(50).get();
             name.setMessageText("@unknown");
 
             t.row();
@@ -45,38 +48,72 @@ public class MapInfoDialog extends BaseDialog{
 
             TextArea description = t.area(tags.get("description", ""), Styles.areaField, text -> {
                 tags.put("description", text);
-            }).size(400f, 140f).addInputDialog(1000).get();
+            }).size(400f, 140f).maxTextLength(1000).get();
 
             t.row();
             t.add("@editor.author").padRight(8).left();
 
-            TextField author = t.field(tags.get("author", Core.settings.getString("mapAuthor", "")), text -> {
+            TextField author = t.field(tags.get("author", ""), text -> {
                 tags.put("author", text);
-                Core.settings.put("mapAuthor", text);
-            }).size(400, 55f).addInputDialog(50).get();
+            }).size(400, 55f).maxTextLength(50).get();
             author.setMessageText("@unknown");
 
             t.row();
-            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", () -> {
-                waveInfo.show();
-                hide();
-            }).left().width(200f);
+            t.table(Tex.button, r -> {
+                r.defaults().width(230f).height(60f);
 
-            t.row();
-            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);
+                var style = Styles.flatt;
+
+                r.button("@editor.rules", Icon.list, style, () -> {
+                    ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules());
+                    hide();
+                }).marginLeft(10f);
+
+                r.button("@editor.waves", Icon.units, style, () -> {
+                    waveInfo.show();
+                    hide();
+                }).marginLeft(10f);
+
+                r.row();
+
+                r.button("@editor.objectives", Icon.info, style, () -> {
+                    objectives.show(state.rules.objectives.all, state.rules.objectives.all::set);
+                    hide();
+                }).marginLeft(10f);
+
+                r.button("@editor.generation", Icon.terrain, style, () -> {
+                    //randomize so they're not all the same seed
+                    var res = maps.readFilters(editor.tags.get("genfilters", ""));
+                    res.each(GenerateFilter::randomize);
+
+                    generate.show(res,
+                    filters -> {
+                        //reset seed to 0 so it is not written
+                        filters.each(f -> f.seed = 0);
+                        editor.tags.put("genfilters", JsonIO.write(filters));
+                    });
+                    hide();
+                }).marginLeft(10f);
+
+                r.row();
+
+                r.button("@editor.locales", Icon.fileText, style, () -> {
+                    try{
+                        MapLocales res = JsonIO.read(MapLocales.class, editor.tags.get("locales", "{}"));
+                        locales.show(res);
+                    }catch(Throwable e){
+                        locales.show(new MapLocales());
+                        ui.showException(e);
+                    }
+                    hide();
+                }).marginLeft(10f);
+
+                r.button("@editor.worldprocessors", Icon.logic, style, () -> {
+                    hide();
+                    processors.show();
+                }).marginLeft(10f);
+            }).colspan(2).center();
 
             name.change();
             description.change();
diff --git a/core/src/mindustry/editor/MapLoadDialog.java b/core/src/mindustry/editor/MapLoadDialog.java
index 4ed63a1a7f..69acd8ed00 100644
--- a/core/src/mindustry/editor/MapLoadDialog.java
+++ b/core/src/mindustry/editor/MapLoadDialog.java
@@ -1,9 +1,11 @@
 package mindustry.editor;
 
+import arc.*;
 import arc.func.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
+import mindustry.gen.*;
 import mindustry.maps.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
@@ -11,66 +13,60 @@ import mindustry.ui.dialogs.*;
 import static mindustry.Vars.*;
 
 public class MapLoadDialog extends BaseDialog{
-    private Map selected = null;
+    private @Nullable Map selected = null;
 
     public MapLoadDialog(Cons<Map> loader){
         super("@editor.loadmap");
 
         shown(this::rebuild);
+        hidden(() -> selected = null);
+        onResize(this::rebuild);
 
-        TextButton button = new TextButton("@load");
-        button.setDisabled(() -> selected == null);
-        button.clicked(() -> {
+        buttons.defaults().size(210f, 64f);
+        buttons.button("@cancel", Icon.cancel, this::hide);
+        buttons.button("@load", Icon.ok, () -> {
             if(selected != null){
                 loader.get(selected);
                 hide();
             }
-        });
-
-        buttons.defaults().size(200f, 50f);
-        buttons.button("@cancel", this::hide);
-        buttons.add(button);
+        }).disabled(b -> selected == null);
+        addCloseListener();
+        makeButtonOverlay();
     }
 
     public void rebuild(){
         cont.clear();
-        if(maps.all().size > 0){
-            selected = maps.all().first();
-        }
-
-        ButtonGroup<TextButton> group = new ButtonGroup<>();
-
-        int maxcol = 3;
+        ButtonGroup<Button> group = new ButtonGroup<>();
 
         int i = 0;
+        int cols = Math.max((int)(Core.graphics.getWidth() / Scl.scl(300f)), 1);
 
         Table table = new Table();
-        table.defaults().size(200f, 90f).pad(4f);
+        table.defaults().size(250f, 90f).pad(4f);
         table.margin(10f);
 
-        ScrollPane pane = new ScrollPane(table, Styles.horizontalPane);
+        ScrollPane pane = new ScrollPane(table);
         pane.setFadeScrollBars(false);
+        pane.setScrollingDisabledX(true);
 
         for(Map map : maps.all()){
+            table.button(b -> {
+                b.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).padLeft(5f).size(16 * 4f);
+                b.add(map.name()).wrap().grow().labelAlign(Align.center).padLeft(5f);
+            }, Styles.squareTogglet, () -> selected = map).group(group).margin(8f).checked(b -> selected == map);
 
-            TextButton button = new TextButton(map.name(), Styles.togglet);
-            button.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).size(16 * 4f);
-            button.getCells().reverse();
-            button.clicked(() -> selected = map);
-            button.getLabelCell().grow().left().padLeft(5f);
-            group.add(button);
-            table.add(button);
-            if(++i % maxcol == 0) table.row();
+            if(++i % cols == 0) table.row();
         }
 
-        if(maps.all().size == 0){
+        group.uncheckAll();
+
+        if(maps.all().isEmpty()){
             table.add("@maps.none").center();
         }else{
-            cont.add("@editor.loadmap");
+            cont.add("@editor.selectmap");
         }
 
         cont.row();
         cont.add(pane);
     }
-
 }
diff --git a/core/src/mindustry/editor/MapLocalesDialog.java b/core/src/mindustry/editor/MapLocalesDialog.java
new file mode 100644
index 0000000000..47d902639c
--- /dev/null
+++ b/core/src/mindustry/editor/MapLocalesDialog.java
@@ -0,0 +1,774 @@
+package mindustry.editor;
+
+import arc.Core;
+import arc.func.*;
+import arc.graphics.*;
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.TextButton.*;
+import arc.scene.ui.layout.*;
+import arc.scene.utils.*;
+import arc.struct.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+
+import static mindustry.Vars.*;
+
+public class MapLocalesDialog extends BaseDialog{
+    /** Width of UI property card. */
+    private static final float cardWidth = 400f;
+    /** Style for filter options buttons */
+    private static final TextButtonStyle filterStyle = new TextButtonStyle(){{
+        up = down = checked = over = Tex.whitePane;
+        font = Fonts.outline;
+        fontColor = Color.lightGray;
+        overFontColor = Pal.accent;
+        disabledFontColor = Color.gray;
+        disabled = Styles.black;
+    }};
+    /** Icons for use in map locales dialog. */
+    private static final ContentType[] contentIcons = {ContentType.item, ContentType.block, ContentType.liquid, ContentType.status, ContentType.unit};
+
+    private MapLocales locales;
+    private MapLocales lastSaved;
+    private boolean saved = true;
+    private Table langs;
+    private Table main;
+    private Table propView;
+    private String selectedLocale;
+
+    private boolean applytoall = true;
+    private boolean collapsed = false;
+    private String searchString = "";
+    private boolean searchByValue = false;
+    private boolean showCorrect = true;
+    private boolean showMissing = true;
+    private boolean showSame = true;
+
+    public MapLocalesDialog(){
+        super("@editor.locales");
+
+        selectedLocale = MapLocales.currentLocale();
+
+        langs = new Table(Tex.button);
+        main = new Table();
+        propView = new Table();
+
+        buttons.add("").uniform();
+
+        buttons.table(t -> {
+            t.defaults().pad(3).center();
+
+            t.button("@back", Icon.left, () -> {
+                if(!saved) ui.showConfirm("@editor.locales", "@editor.savechanges", () -> {
+                    editor.tags.put("locales", JsonIO.write(locales));
+                    state.mapLocales = locales;
+                });
+                hide();
+            }).size(210f, 64f);
+            closeOnBack(() -> {
+                if(!saved) ui.showConfirm("@editor.locales", "@editor.savechanges", () -> {
+                    editor.tags.put("locales", JsonIO.write(locales));
+                    state.mapLocales = locales;
+                });
+            });
+
+            t.button("@editor.apply", Icon.ok, () -> {
+                editor.tags.put("locales", JsonIO.write(locales));
+                state.mapLocales = locales;
+                lastSaved = locales.copy();
+                saved = true;
+            }).size(210f, 64f).disabled(b -> saved);
+
+            t.button("@edit", Icon.edit, this::editDialog).size(210f, 64f);
+        }).growX();
+
+        resized(this::buildMain);
+
+        buttons.button("?", () -> ui.showInfo("@locales.info")).size(60f, 64f).uniform();
+
+        shown(this::setup);
+    }
+
+    public void show(MapLocales locales){
+        this.locales = locales;
+        lastSaved = locales.copy();
+        saved = true;
+        show();
+    }
+
+    private void setup(){
+        cont.clear();
+
+        buildTables();
+
+        cont.add(langs).left();
+
+        cont.table(t -> {
+            // search/collapse all/filter
+            t.table(a -> {
+                a.button(Icon.downOpen, Styles.emptyTogglei, () -> {
+                    collapsed = !collapsed;
+                    buildMain();
+                }).update(b -> {
+                    b.replaceImage(new Image(collapsed ? Icon.upOpen : Icon.downOpen));
+                    b.setChecked(collapsed);
+                }).size(35f);
+
+                a.button(Icon.filter, Styles.emptyi, () -> filterDialog(this::buildMain)).padLeft(10f).size(35f);
+
+                var field = a.field("", v -> {
+                    searchString = v;
+                    buildMain();
+                }).update(f -> f.setText(searchString)).maxTextLength(64).padLeft(10f).width(250f).update(f -> f.setMessageText(searchByValue ? "@locales.searchvalue": "@locales.searchname")).get();
+
+                a.button(Icon.cancel, Styles.emptyi, () -> {
+                    searchString = "";
+                    field.setText("");
+                    buildMain();
+                }).padLeft(10f).size(35f);
+            }).row();
+
+            t.check("@locales.applytoall", applytoall, b -> applytoall = b).pad(10f).row();
+
+            t.add(main).center().grow().row();
+        }).pad(10f).grow();
+
+        // property addition
+        cont.table(Tex.button, t -> {
+            TextField name = t.field("name", s -> {}).maxTextLength(64).fillX().padTop(10f).get();
+            t.row();
+            TextField value = t.area("text", s -> {}).maxTextLength(1000).fillX().height(140f).get();
+            t.row();
+
+            t.button("@add", Icon.add, () -> {
+                if(applytoall){
+                    for(var locale : locales.values()){
+                        locale.put(name.getText(), value.getText());
+                    }
+                }else{
+                    locales.get(selectedLocale).put(name.getText(), value.getText());
+                }
+
+                saved = false;
+                buildMain();
+            }).padTop(10f).size(cardWidth, 50f).fillX().row();
+        }).right();
+    }
+
+    private void buildTables(){
+        if(!locales.containsKey(selectedLocale)){
+            locales.put(selectedLocale, new StringMap());
+        }
+
+        buildLocalesTable();
+        buildMain();
+    }
+
+    private void buildLocalesTable(){
+        langs.clear();
+
+        langs.pane(p -> {
+            for(var loc : Vars.locales){
+                String name = loc.toString();
+
+                if(locales.containsKey(name)){
+                    p.button(loc.getDisplayName(Core.bundle.getLocale()), Styles.flatTogglet, () -> {
+                        if(name.equals(selectedLocale)) return;
+
+                        selectedLocale = name;
+                        buildTables();
+                    }).update(b -> b.setChecked(selectedLocale.equals(name))).width(200f).minHeight(50f);
+                    p.button(Icon.edit, Styles.flati, () -> localeEditDialog(name)).size(50f);
+                    p.button(Icon.trash, Styles.flati, () -> ui.showConfirm("@confirm", "@locales.deletelocale", () -> {
+                        locales.remove(name);
+
+                        selectedLocale = (locales.size != 0 ? locales.keys().next() : Core.settings.getString("locale"));
+                        saved = false;
+                        buildTables();
+                    })).size(50f).row();
+                }
+            }
+        }).row();
+        langs.button("@add", Icon.add, this::addLocaleDialog).padTop(10f).width(250f);
+    }
+
+    private void buildMain(){
+        main.clear();
+
+        StringMap props = locales.get(selectedLocale);
+
+        main.image().color(Pal.gray).height(3f).growX().expandY().top().row();
+        main.pane(p -> {
+            int cols = Math.max(1, (int)((Core.graphics.getWidth() / Scl.scl() - 410f) / cardWidth) - 1);
+            if(props.size == 0){
+                main.add("@empty").center().row();
+                return;
+            }
+            p.defaults().top();
+
+            Table[] colTables = new Table[cols];
+            for(var i = 0; i < cols; i++){
+                colTables[i] = new Table();
+            }
+            int i = 0;
+
+            // To sort properties in alphabetic order
+            Seq<String> keys = props.keys().toSeq().sort();
+
+            for(var key : keys){
+                var comparsionString = (searchByValue ? props.get(key).toLowerCase() : key.toLowerCase());
+                if(!searchString.isEmpty() && !comparsionString.contains(searchString.toLowerCase())) continue;
+
+                PropertyStatus status = getPropertyStatus(key, props.get(key), selectedLocale, false);
+                if(status == PropertyStatus.correct && !showCorrect) continue;
+                if(status == PropertyStatus.missing && !showMissing) continue;
+                if(status == PropertyStatus.same && !showSame) continue;
+
+                colTables[i].table(Tex.whitePane, t -> {
+                    boolean[] shown = {!collapsed};
+                    String[] propKey = {key};
+                    String[] propValue = {props.get(key)};
+
+                    // collapse button
+                    t.button(Icon.downOpen, Styles.emptyTogglei, () -> shown[0] = !shown[0]).update(b -> {
+                        b.replaceImage(new Image(shown[0] ? Icon.upOpen : Icon.downOpen));
+                        b.setChecked(shown[0]);
+                    }).size(35f);
+
+                    // property name field
+                    t.field(propKey[0], (f, c) -> c != '=' && c != ':', v -> {
+                        if(props.containsKey(v)){
+                            t.setColor(Color.valueOf("f25555"));
+                            return;
+                        }
+
+                        if(applytoall){
+                            for(var bundle : locales.values()){
+                                if(!bundle.containsKey(v)){
+                                    String value = bundle.get(propKey[0]);
+                                    if(value == null) continue;
+
+                                    bundle.remove(propKey[0]);
+                                    bundle.put(v, value);
+                                }
+                            }
+                        }else{
+                            if(!props.containsKey(v)){
+                                props.remove(propKey[0]);
+                                props.put(v, propValue[0]);
+                            }
+                        }
+
+                        propKey[0] = v;
+                        updateCard(t, v, propValue[0]);
+                        saved = false;
+                    }).maxTextLength(64).width(cardWidth - 125f);
+
+                    // remove button
+                    t.button(Icon.trash, Styles.emptyi, () -> {
+                        if(applytoall){
+                            for(var bundle : locales.values()){
+                                bundle.remove(propKey[0]);
+                            }
+                        }else{
+                            props.remove(propKey[0]);
+                        }
+                        saved = false;
+                        buildMain();
+                    }).size(35f);
+
+                    // more actions
+                    t.button(Icon.edit, Styles.emptyi, () -> propEditDialog(t, propKey[0], propValue[0])).size(35f).row();
+
+                    // property value area
+                    t.collapser(c -> c.area(propValue[0], v -> {
+                        props.put(propKey[0], v);
+                        updateCard(t, propKey[0], v);
+                        saved = false;
+                    }).maxTextLength(1000).height(140f).update(a -> {
+                        propValue[0] = props.get(propKey[0]);
+                        a.setText(props.get(propKey[0]));
+                    }).growX(), () -> shown[0]).colspan(4).growX();
+
+                    updateCard(t, propKey[0], propValue[0]);
+                }).top().width(cardWidth).pad(5f).row();
+
+                i = ++i % cols;
+            }
+
+            if(!colTables[0].hasChildren()){
+                main.add("@empty").center().row();
+            }else{
+                p.add(colTables);
+            }
+        }).growX().row();
+        main.image().color(Pal.gray).height(3f).growX().expandY().bottom().row();
+    }
+
+    private void updateCard(Table table, String propKey, String propValue){
+        updateCard(table, propKey, propValue, selectedLocale, false);
+    }
+
+    private void updateCard(Table table, String propKey, String propValue, String locale, boolean viewCard){
+        switch(getPropertyStatus(propKey, propValue, locale, viewCard)){
+            case missing -> table.setColor(Pal.accent);
+            case same -> table.setColor(Pal.techBlue);
+            case correct -> table.setColor(Pal.gray);
+        }
+    }
+
+    // Property statuses for main dialog and property view dialog are a bit different
+    private PropertyStatus getPropertyStatus(String propKey, String propValue, String locale, boolean forView){
+        if(forView && propValue == null) return PropertyStatus.missing;
+
+        for(var bundle : locales.entries()){
+            if(!forView && bundle.key.equals(selectedLocale)) continue;
+            if(forView && bundle.key.equals(locale)) continue;
+
+            StringMap props = bundle.value;
+
+            if(!props.containsKey(propKey)){
+                if(!forView) return PropertyStatus.missing;
+            }else{
+                if(props.get(propKey).equals(propValue)){
+                    return PropertyStatus.same;
+                }
+            }
+        }
+
+        return PropertyStatus.correct;
+    }
+
+    private void addLocaleDialog(){
+        BaseDialog dialog = new BaseDialog("@add");
+
+        dialog.cont.pane(t -> {
+            for(var loc : Vars.locales){
+                String name = loc.toString();
+
+                if(!locales.containsKey(name)){
+                    t.button(loc.getDisplayName(Core.bundle.getLocale()), Styles.flatTogglet, () -> {
+                        if(name.equals(selectedLocale)) return;
+
+                        locales.put(name, new StringMap());
+
+                        selectedLocale = name;
+                        saved = false;
+                        buildTables();
+                        dialog.hide();
+                    }).update(b -> b.setChecked(selectedLocale.equals(name))).size(400f, 50f).row();
+                }
+            }
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void propEditDialog(Table card, String key, String value){
+        BaseDialog dialog = new BaseDialog("@edit");
+
+        dialog.cont.pane(p -> {
+            p.margin(10f);
+            p.table(Tex.button, t -> {
+                t.defaults().size(450f, 60f).left();
+
+                t.button("@locales.addtoother", Icon.add, Styles.flatt, () -> {
+                    for(var bundle : locales.values()){
+                        if(!bundle.containsKey(key)){
+                            bundle.put(key, value);
+                        }
+                    }
+
+                    saved = false;
+                    updateCard(card, key, value);
+                    dialog.hide();
+                }).marginLeft(12f).row();
+
+                t.button("@locales.viewproperty", Icon.zoom, Styles.flatt, () -> {
+                    viewPropertyDialog(key);
+                    dialog.hide();
+                }).marginLeft(12f).row();
+
+                t.button("@locales.addicon", Icon.image, Styles.flatt, () -> {
+                    addIconDialog(res -> {
+                        locales.get(selectedLocale).put(key, value + res);
+                        saved = false;
+                    });
+                    dialog.hide();
+                }).marginLeft(12f).row();
+
+                t.button("@locales.rollback", Icon.undo, Styles.flatt, () -> {
+                    locales.get(selectedLocale).put(key, lastSaved.get(selectedLocale).get(key));
+                    buildTables();
+                    dialog.hide();
+                }).disabled(b -> {
+                    if(!lastSaved.containsKey(selectedLocale)) return true;
+                    StringMap savedMap = lastSaved.get(selectedLocale);
+                    return !savedMap.containsKey(key) || savedMap.get(key).equals(locales.get(selectedLocale).get(key));
+                }).marginLeft(12f).row();
+            });
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void localeEditDialog(String locale){
+        BaseDialog dialog = new BaseDialog("@edit");
+
+        dialog.cont.pane(p -> {
+            p.margin(10f);
+            p.table(Tex.button, t -> {
+                t.defaults().size(350f, 60f).left();
+
+                t.button("@waves.copy", Icon.copy, Styles.flatt, () -> {
+                    Core.app.setClipboardText(writeLocale(locale));
+                    ui.showInfoFade("@copied");
+                    dialog.hide();
+                }).marginLeft(12f).row();
+                t.button("@waves.load", Icon.download, Styles.flatt, () -> {
+                    locales.put(locale, readLocale(Core.app.getClipboardText()));
+                    buildTables();
+                    saved = false;
+                    dialog.hide();
+                }).disabled(Core.app.getClipboardText() == null).marginLeft(12f).row();
+            });
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void editDialog(){
+        BaseDialog dialog = new BaseDialog("@edit");
+
+        dialog.cont.pane(p -> {
+            p.margin(10f);
+            p.table(Tex.button, t -> {
+                t.defaults().size(450f, 60f).left();
+
+                t.button("@waves.copy", Icon.copy, Styles.flatt, () -> {
+                    Core.app.setClipboardText(writeBundles());
+                    ui.showInfoFade("@copied");
+                    dialog.hide();
+                }).marginLeft(12f).row();
+                t.button("@waves.load", Icon.download, Styles.flatt, () -> {
+                    locales = readBundles(Core.app.getClipboardText());
+                    buildTables();
+                    saved = false;
+                    dialog.hide();
+                }).disabled(Core.app.getClipboardText() == null).marginLeft(12f).row();
+                t.button("@locales.rollback", Icon.undo, Styles.flatt, () -> {
+                    locales = lastSaved.copy();
+                    saved = true;
+                    buildTables();
+                    dialog.hide();
+                }).disabled(b -> saved).marginLeft(12f).row();
+            });
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void viewPropertyDialog(String key){
+        BaseDialog dialog = new BaseDialog(Core.bundle.format("locales.viewing", key));
+
+        dialog.cont.table(t -> {
+            t.button(Icon.filter, Styles.emptyi, () -> filterDialog(() -> buildPropView(key))).size(35f);
+
+            var field = t.field(searchString, v -> {
+                searchString = v;
+                buildPropView(key);
+            }).update(f -> f.setText(searchString)).maxTextLength(64).padLeft(10f).width(250f).update(f -> f.setMessageText(searchByValue ? "@locales.searchvalue" : "@locales.searchlocale")).get();
+
+            t.button(Icon.cancel, Styles.emptyi, () -> {
+                searchString = "";
+                field.setText("");
+                buildPropView(key);
+            }).padLeft(10f).size(35f);
+        }).row();
+
+        buildPropView(key);
+        dialog.cont.add(propView).grow().center().row();
+
+        dialog.addCloseButton();
+        dialog.closeOnBack();
+        dialog.hidden(this::buildMain);
+
+        dialog.show();
+    }
+
+    private void buildPropView(String key){
+        propView.clear();
+
+        propView.image().color(Pal.gray).height(3f).fillX().top().row();
+        propView.pane(p -> {
+            int cols = Math.max(1, (int)((Core.graphics.getWidth() / Scl.scl() - 100f) / cardWidth));
+            if(cols == 0){
+                propView.add("@empty").center().row();
+                return;
+            }
+            p.defaults().top();
+
+            Table[] colTables = new Table[cols];
+            for(var i = 0; i < cols; i++){
+                colTables[i] = new Table();
+            }
+            int i = 0;
+
+            for(var loc : Vars.locales){
+                String name = loc.toString();
+                if(!locales.containsKey(name)) continue;
+
+                PropertyStatus status = getPropertyStatus(key, locales.get(name).get(key), name, true);
+                if(status == PropertyStatus.correct && !showCorrect) continue;
+                if(status == PropertyStatus.missing && !showMissing) continue;
+                if(status == PropertyStatus.same && !showSame) continue;
+
+                if(status != PropertyStatus.missing){
+                    var comparsionString = (searchByValue ? locales.get(name).get(key).toLowerCase() : loc.getDisplayName(Core.bundle.getLocale()).toLowerCase());
+                    if(!searchString.isEmpty() && !comparsionString.contains(searchString.toLowerCase())) continue;
+                }
+
+                colTables[i].table(Tex.whitePane, t -> {
+                    t.add(loc.getDisplayName(Core.bundle.getLocale())).left().color(Pal.accent).row();
+                    t.image().color(Pal.accent).fillX().row();
+
+                    if(status == PropertyStatus.missing){
+                        t.table(b ->
+                        b.button("@add", Icon.add, () -> {
+                            locales.get(name).put(key, "moai");
+
+                            t.getCells().get(2).clearElement();
+                            t.getCells().remove(2);
+
+                            t.area(locales.get(name).get(key), v -> {
+                                locales.get(name).put(key, v);
+                                saved = false;
+                            }).maxTextLength(1000).height(140f).growX().row();
+                        }).size(160f, 50f)).height(140f).growX().row();
+                    }else{
+                        t.area(locales.get(name).get(key), v -> {
+                            locales.get(name).put(key, v);
+                            saved = false;
+                        }).maxTextLength(1000).height(140f).growX().row();
+                    }
+                }).update(t -> updateCard(t, key, locales.get(name).get(key), name, true)).top().width(cardWidth).pad(5f).row();
+
+                i = ++i % cols;
+            }
+
+            if(!colTables[0].hasChildren()){
+                propView.add("@empty").center().row();
+            }else{
+                p.add(colTables);
+            }
+        }).grow().row();
+        propView.image().color(Pal.gray).height(3f).fillX().bottom().row();
+    }
+
+    private void filterDialog(Runnable hidden){
+        BaseDialog dialog = new BaseDialog("@locales.filter");
+
+        dialog.cont.table(t -> {
+            t.add("@search").row();
+            t.table(b -> {
+                b.button("@locales.byname", Styles.togglet, () -> searchByValue = false).size(300f, 50f).checked(v -> !searchByValue);
+                b.button("@locales.byvalue", Styles.togglet, () -> searchByValue = true).padLeft(10f).size(300f, 50f).checked(v -> searchByValue);
+            }).padTop(5f);
+        }).row();
+
+        dialog.cont.button("@locales.showcorrect", Icon.ok, filterStyle, () -> showCorrect = !showCorrect).update(b -> {
+            ((Image)b.getChildren().get(1)).setDrawable(showCorrect ? Icon.ok : Icon.cancel);
+            b.setChecked(showCorrect);
+        }).size(450f, 100f).color(Pal.gray).padTop(65f);
+
+        dialog.cont.row();
+
+        dialog.cont.button("@locales.showmissing", Icon.ok, filterStyle, () -> showMissing = !showMissing).update(b -> {
+            ((Image)b.getChildren().get(1)).setDrawable(showMissing ? Icon.ok : Icon.cancel);
+            b.setChecked(showMissing);
+        }).size(450f, 100f).color(Pal.accent).padTop(65f);
+
+        dialog.cont.row();
+
+        dialog.cont.button("@locales.showsame", Icon.ok, filterStyle, () -> showSame = !showSame).update(b -> {
+            ((Image)b.getChildren().get(1)).setDrawable(showSame ? Icon.ok : Icon.cancel);
+            b.setChecked(showSame);
+        }).size(450f, 100f).color(Pal.techBlue).padTop(65f);
+
+        dialog.buttons.button("@back", Icon.left, () -> {
+            hidden.run();
+            dialog.hide();
+        }).size(210f, 64f);
+        dialog.closeOnBack(hidden);
+
+        dialog.show();
+    }
+
+    private void addIconDialog(Cons<String> cons){
+        BaseDialog dialog = new BaseDialog("@locales.addicon");
+
+        Table icons = new Table();
+        TextField search = Elem.newField("", v -> iconsTable(icons, v.replace(" ", "").toLowerCase(), dialog, cons));
+        search.setMessageText("@search");
+
+        dialog.cont.table(t -> {
+            t.add(search).maxTextLength(64).padLeft(10f).width(250f);
+
+            t.button(Icon.cancel, Styles.emptyi, () -> {
+                search.setText("");
+                iconsTable(icons, "", dialog, cons);
+            }).padLeft(10f).size(35f);
+        }).row();
+
+        dialog.cont.pane(icons).scrollX(false);
+        dialog.resized(true, () -> iconsTable(icons, search.getText().replace(" ", "").toLowerCase(), dialog, cons));
+
+        dialog.addCloseButton();
+        dialog.closeOnBack();
+        dialog.setFillParent(true);
+        dialog.show();
+    }
+
+    private void iconsTable(Table table, String search, Dialog dialog, Cons<String> cons){
+        table.clear();
+
+        table.marginRight(19f).marginLeft(12f);
+        table.defaults().size(48f);
+
+        int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
+
+        int i = 0;
+
+        var codes = new ObjectIntMap<>(Iconc.codes);
+
+        for(var name : codes.keys()){
+            if(!name.toLowerCase().contains(search)) codes.remove(name);
+        }
+
+        if(codes.size > 0) table.image().colspan(cols).growX().width(-1f).height(3f).color(Pal.accent).row();
+
+        for(var icon : codes){
+            String res = (char)icon.value + "";
+
+            table.button(Icon.icons.get(icon.key), Styles.flati, iconMed, () -> {
+                cons.get(res);
+                dialog.hide();
+            }).tooltip(icon.key);
+
+            if(++i % cols == 0) table.row();
+        }
+
+        for(ContentType ctype : contentIcons){
+            var all = content.getBy(ctype).<UnlockableContent>as().select(u -> u.localizedName.replace(" ", "").toLowerCase().contains(search) && u.uiIcon.found());
+
+            table.row();
+            if(all.size > 0) table.image().colspan(cols).growX().width(-1f).height(3f).color(Pal.accent).row();
+
+            i = 0;
+            for(UnlockableContent u : all){
+                table.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> {
+                    cons.get(u.emoji() + "");
+                    dialog.hide();
+                }).tooltip(u.localizedName);
+
+                if(++i % cols == 0) table.row();
+            }
+        }
+
+        var teams = new Seq<>(Team.baseTeams);
+        teams = teams.select(u -> u.localized().toLowerCase().contains(search) && Core.atlas.has("team-" + u.name));
+
+        table.row();
+        if(teams.size > 0) table.image().colspan(cols).growX().width(-1f).height(3f).color(Pal.accent).row();
+
+        for(Team team : teams){
+            var region = Core.atlas.find("team-" + team.name);
+
+            table.button(new TextureRegionDrawable(region), Styles.flati, iconMed, () -> {
+                cons.get(team.emoji);
+                dialog.hide();
+            }).tooltip(team.localized());
+
+            if(++i % cols == 0) table.row();
+        }
+    }
+
+    private String writeBundles(){
+        StringBuilder data = new StringBuilder();
+
+        for(var locale : locales.keys()){
+            data.append(locale).append(":\n").append(writeLocale(locale));
+        }
+
+        return data.toString();
+    }
+
+    private String writeLocale(String key){
+        StringBuilder data = new StringBuilder();
+
+        if(!locales.containsKey(key)) return "";
+
+        for(var prop : locales.get(key).entries()){
+            // Convert \n in plain text to \\n, then convert newlines to \n
+            data.append(prop.key).append(" = ").append(prop.value
+            .replace("\\n", "\\\\n").replace("\n", "\\n")).append("\n");
+        }
+
+        return data.toString();
+    }
+
+    private MapLocales readBundles(String data){
+        MapLocales bundles = new MapLocales();
+
+        String currentLocale = "";
+
+        for(var line : data.split("\\r?\\n|\\r")){
+            if(line.endsWith(":") && !line.contains("=")){
+                currentLocale = line.substring(0, line.length() - 1);
+                bundles.put(currentLocale, new StringMap());
+            }else{
+                int sepIndex = line.indexOf(" = ");
+                if(sepIndex != -1 && !currentLocale.isEmpty()){
+                    // Convert \n in file to newlines in text, then revert newlines with escape characters
+                    bundles.get(currentLocale).put(line.substring(0, sepIndex), line.substring(sepIndex + 3)
+                    .replace("\\n", "\n").replace("\\\n", "\\n"));
+                }
+            }
+        }
+
+        return bundles;
+    }
+
+    private StringMap readLocale(String data){
+        StringMap map = new StringMap();
+
+        for(var line : data.split("\\r?\\n|\\r")){
+            int sepIndex = line.indexOf(" = ");
+            if(sepIndex != -1){
+                // Convert \n in file to newlines in text, then revert newlines with escape characters
+                map.put(line.substring(0, sepIndex), line.substring(sepIndex + 3)
+                .replace("\\n", "\n").replace("\\\n", "\\n"));
+            }
+        }
+
+        return map;
+    }
+
+    private enum PropertyStatus{
+        correct,
+        missing,
+        same
+    }
+}
diff --git a/core/src/mindustry/editor/MapObjectivesCanvas.java b/core/src/mindustry/editor/MapObjectivesCanvas.java
new file mode 100644
index 0000000000..0cde471b89
--- /dev/null
+++ b/core/src/mindustry/editor/MapObjectivesCanvas.java
@@ -0,0 +1,557 @@
+package mindustry.editor;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.editor.MapObjectivesCanvas.ObjectiveTilemap.ObjectiveTile.*;
+import mindustry.editor.MapObjectivesDialog.*;
+import mindustry.game.MapObjectives.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+
+import static mindustry.Vars.*;
+
+@SuppressWarnings("unchecked")
+public class MapObjectivesCanvas extends WidgetGroup{
+    public static final int
+        objWidth = 5, objHeight = 2,
+        bounds = 100;
+
+    public final float unitSize = Scl.scl(48f);
+
+    public Seq<MapObjective> objectives = new Seq<>();
+    public ObjectiveTilemap tilemap;
+
+    protected MapObjective query;
+
+    private boolean pressed;
+    private long visualPressed;
+    private int queryX = -objWidth, queryY = -objHeight;
+
+    public MapObjectivesCanvas(){
+        setFillParent(true);
+        addChild(tilemap = new ObjectiveTilemap());
+
+        addCaptureListener(new InputListener(){
+            @Override
+            public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
+                if(query != null && button == KeyCode.mouseRight){
+                    stopQuery();
+
+                    event.stop();
+                    return true;
+                }else{
+                    return false;
+                }
+            }
+        });
+
+        addCaptureListener(new ElementGestureListener(){
+            int pressPointer = -1;
+
+            @Override
+            public void pan(InputEvent event, float x, float y, float deltaX, float deltaY){
+                if(tilemap.moving != null || tilemap.connecting != null) return;
+                tilemap.x = Mathf.clamp(tilemap.x + deltaX, -bounds * unitSize + width, bounds * unitSize);
+                tilemap.y = Mathf.clamp(tilemap.y + deltaY, -bounds * unitSize + height, bounds * unitSize);
+            }
+
+            @Override
+            public void tap(InputEvent event, float x, float y, int count, KeyCode button){
+                if(query == null) return;
+
+                Vec2 pos = localToDescendantCoordinates(tilemap, Tmp.v1.set(x, y));
+                queryX = Mathf.round((pos.x - objWidth * unitSize / 2f) / unitSize);
+                queryY = Mathf.floor((pos.y - unitSize) / unitSize);
+
+                // In mobile, placing the query is done in a separate button.
+                if(!mobile) placeQuery();
+            }
+
+            @Override
+            public void touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
+                if(pressPointer != -1) return;
+                pressPointer = pointer;
+                pressed = true;
+                visualPressed = Time.millis() + 100;
+            }
+
+            @Override
+            public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
+                if(pointer == pressPointer){
+                    pressPointer = -1;
+                    pressed = false;
+                }
+            }
+        });
+    }
+
+    public void clearObjectives(){
+        stopQuery();
+        tilemap.clearTiles();
+        tilemap.x = 0f;
+        tilemap.y = 0f;
+    }
+
+    protected void stopQuery(){
+        if(query == null) return;
+        query = null;
+
+        Core.graphics.restoreCursor();
+    }
+
+    public void query(MapObjective obj){
+        stopQuery();
+        query = obj;
+    }
+
+    public void placeQuery(){
+        if(isQuerying() && tilemap.createTile(queryX, queryY, query)){
+            objectives.add(query);
+            stopQuery();
+        }
+    }
+
+    public boolean isQuerying(){
+        return query != null;
+    }
+
+    public boolean isVisualPressed(){
+        return pressed || visualPressed > Time.millis();
+    }
+
+    public class ObjectiveTilemap extends WidgetGroup{
+
+        /** The connector button that is being pressed. */
+        protected @Nullable Connector connecting;
+        /** The current tile that is being moved. */
+        protected @Nullable ObjectiveTile moving;
+
+        public ObjectiveTilemap(){
+            setTransform(false);
+            setSize(getPrefWidth(), getPrefHeight());
+            touchable(() -> isQuerying() ? Touchable.disabled : Touchable.childrenOnly);
+        }
+
+        @Override
+        public void draw(){
+            validate();
+            int minX = Math.max(Mathf.floor((x - width - 1f) / unitSize), -bounds), minY = Math.max(Mathf.floor((y - height - 1f) / unitSize), -bounds),
+                maxX = Math.min(Mathf.ceil((x + width + 1f) / unitSize), bounds), maxY = Math.min(Mathf.ceil((y + height + 1f) / unitSize), bounds);
+            float progX = x % unitSize, progY = y % unitSize;
+
+            Lines.stroke(3f);
+            Draw.color(Pal.darkestGray, parentAlpha);
+
+            for(int x = minX; x <= maxX; x++) Lines.line(progX + x * unitSize, minY * unitSize, progX + x * unitSize, maxY * unitSize);
+            for(int y = minY; y <= maxY; y++) Lines.line(minX * unitSize, progY + y * unitSize, maxX * unitSize, progY + y * unitSize);
+
+            if(isQuerying()){
+                int tx, ty;
+                if(mobile){
+                    tx = queryX;
+                    ty = queryY;
+                }else{
+                    Vec2 pos = screenToLocalCoordinates(Core.input.mouse());
+                    tx = Mathf.round((pos.x - objWidth * unitSize / 2f) / unitSize);
+                    ty = Mathf.floor((pos.y - unitSize) / unitSize);
+                }
+
+                Lines.stroke(4f);
+                Draw.color(
+                    isVisualPressed() ? Pal.metalGrayDark : validPlace(tx, ty, null) ? Pal.accent : Pal.remove,
+                    parentAlpha
+                );
+
+                Lines.rect(x + tx * unitSize, y + ty * unitSize, objWidth * unitSize, objHeight * unitSize);
+            }
+
+            if(moving != null){
+                int tx, ty;
+                float x = this.x + (tx = Mathf.round(moving.x / unitSize)) * unitSize;
+                float y = this.y + (ty = Mathf.round(moving.y / unitSize)) * unitSize;
+
+                Draw.color(
+                    validPlace(tx, ty, moving) ? Pal.accent : Pal.remove,
+                    0.5f * parentAlpha
+                );
+
+                Fill.crect(x, y, objWidth * unitSize, objHeight * unitSize);
+            }
+
+            Draw.reset();
+            super.draw();
+
+            Draw.reset();
+            Seq<ObjectiveTile> tiles = getChildren().as();
+
+            Connector conTarget = null;
+            if(connecting != null){
+                Vec2 pos = connecting.localToAscendantCoordinates(this, Tmp.v1.set(connecting.pointX, connecting.pointY));
+                if(hit(pos.x, pos.y, true) instanceof Connector con && connecting.canConnectTo(con)) conTarget = con;
+            }
+
+            boolean removing = false;
+            for(var tile : tiles){
+                for(var parent : tile.obj.parents){
+                    var parentTile = tiles.find(t -> t.obj == parent);
+
+                    if(parentTile == null) continue;
+
+                    Connector
+                        conFrom = parentTile.conChildren,
+                        conTo = tile.conParent;
+
+                    if(conTarget != null && (
+                        (connecting.findParent && connecting == conTo && conTarget == conFrom) ||
+                        (!connecting.findParent && connecting == conFrom && conTarget == conTo)
+                    )){
+                        removing = true;
+                        continue;
+                    }
+
+                    Vec2
+                        from = conFrom.localToAscendantCoordinates(this, Tmp.v1.set(conFrom.getWidth() / 2f, conFrom.getHeight() / 2f)).add(x, y),
+                        to = conTo.localToAscendantCoordinates(this, Tmp.v2.set(conTo.getWidth() / 2f, conTo.getHeight() / 2f)).add(x, y);
+
+                    drawCurve(false, from.x, from.y, to.x, to.y);
+                }
+            }
+
+            if(connecting != null){
+                Vec2
+                    mouse = (conTarget == null
+                        ? connecting.localToAscendantCoordinates(this, Tmp.v1.set(connecting.pointX, connecting.pointY))
+                        : conTarget.localToAscendantCoordinates(this, Tmp.v1.set(conTarget.getWidth() / 2f, conTarget.getHeight() / 2f))
+                    ).add(x, y),
+                    anchor = connecting.localToAscendantCoordinates(this, Tmp.v2.set(connecting.getWidth() / 2f, connecting.getHeight() / 2f)).add(x, y);
+
+                Vec2
+                    from = connecting.findParent ? mouse : anchor,
+                    to = connecting.findParent ? anchor : mouse;
+
+                drawCurve(removing, from.x, from.y, to.x, to.y);
+            }
+
+            Draw.reset();
+        }
+
+        protected void drawCurve(boolean remove, float x1, float y1, float x2, float y2){
+            Lines.stroke(4f);
+            Draw.color(remove ? Pal.remove : Pal.accent, parentAlpha);
+
+            Fill.square(x1, y1, 8f, 45f);
+            Fill.square(x2, y2, 8f, 45f);
+
+            float dist = Math.abs(x1 - x2) / 2f;
+            float cx1 = x1 + dist;
+            float cx2 = x2 - dist;
+            Lines.curve(x1, y1, cx1, y1, cx2, y2, x2, y2, Math.max(4, (int) (Mathf.dst(x1, y1, x2, y2) / 4f)));
+
+            float progress = (Time.time % (60 * 4)) / (60 * 4);
+
+            float t2 = progress * progress;
+            float t3 = progress * t2;
+            float t1 = 1 - progress;
+            float t13 = t1 * t1 * t1;
+            float kx1 = t13 * x1 + 3 * progress * t1 * t1 * cx1 + 3 * t2 * t1 * cx2 + t3 * x2;
+            float ky1 = t13  *y1 + 3 * progress * t1 * t1 * y1 + 3 * t2 * t1 * y2 + t3 * y2;
+
+            Fill.circle(kx1, ky1, 6f);
+
+            Draw.reset();
+        }
+
+        public boolean validPlace(int x, int y, @Nullable ObjectiveTile ignore){
+            Tmp.r1.set(x, y, objWidth, objHeight).grow(-0.001f);
+
+            if(!Tmp.r2.setCentered(0, 0, bounds * 2, bounds * 2).contains(Tmp.r1)){
+                return false;
+            }
+
+            for(var other : children){
+                if(other instanceof ObjectiveTile tile && tile != ignore && Tmp.r2.set(tile.tx, tile.ty, objWidth, objHeight).overlaps(Tmp.r1)){
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public boolean createTile(MapObjective obj){
+            return createTile(obj.editorX, obj.editorY, obj);
+        }
+
+        public boolean createTile(int x, int y, MapObjective obj){
+            if(!validPlace(x, y, null)) return false;
+
+            ObjectiveTile tile = new ObjectiveTile(obj, x, y);
+            tile.pack();
+
+            addChild(tile);
+
+            return true;
+        }
+
+        public boolean moveTile(ObjectiveTile tile, int newX, int newY){
+            if(!validPlace(newX, newY, tile)) return false;
+
+            tile.pos(newX, newY);
+
+            return true;
+        }
+
+        public void removeTile(ObjectiveTile tile){
+            if(!tile.isDescendantOf(this)) return;
+            tile.remove();
+        }
+
+        public void clearTiles(){
+            clearChildren();
+        }
+
+        @Override
+        public float getPrefWidth(){
+            return bounds * unitSize;
+        }
+
+        @Override
+        public float getPrefHeight(){
+            return bounds * unitSize;
+        }
+
+        public class ObjectiveTile extends Table{
+            public final MapObjective obj;
+            public int tx, ty;
+
+            public final Mover mover;
+            public final Connector conParent, conChildren;
+
+            public ObjectiveTile(MapObjective obj, int x, int y){
+                this.obj = obj;
+                setTransform(false);
+                setClip(false);
+
+                add(conParent = new Connector(true)).size(unitSize / Scl.scl(1f), unitSize * 2 / Scl.scl(1f));
+                table(Tex.whiteui, t -> {
+                    float pad = (unitSize / Scl.scl(1f) - 32f) / 2f - 4f;
+                    t.margin(pad);
+                    t.touchable(() -> Touchable.enabled);
+                    t.setColor(Pal.gray);
+
+                    t.labelWrap(obj.typeName())
+                    .style(Styles.outlineLabel)
+                    .left().grow().get()
+                    .setAlignment(Align.left);
+
+                    t.row();
+
+                    t.table(b -> {
+                        b.left().defaults().size(40f);
+
+                        b.button(Icon.pencilSmall, () -> {
+                            BaseDialog dialog = new BaseDialog("@editor.objectives");
+                            dialog.cont.pane(Styles.noBarPane, list -> list.top().table(e -> {
+                                e.margin(0f);
+                                MapObjectivesDialog.getInterpreter((Class<MapObjective>)obj.getClass()).build(
+                                    e, obj.typeName(), new TypeInfo(obj.getClass()),
+                                    null, null, null,
+                                    () -> obj,
+                                    res -> {}
+                                );
+                            }).width(Math.min(Core.graphics.getWidth() * 0.95f / Scl.scl(1f) - Scl.scl(20f), 700f)).fillY()).grow();
+
+                            dialog.addCloseButton();
+                            dialog.show();
+                        });
+                        b.button(Icon.trashSmall, () -> removeTile(this));
+                    }).left().grow();
+                }).growX().height(unitSize / Scl.scl(1f) * 2).get().addCaptureListener(mover = new Mover());
+                add(conChildren = new Connector(false)).size(unitSize / Scl.scl(1f), unitSize / Scl.scl(1f) * 2);
+
+                setSize(getPrefWidth(), getPrefHeight());
+                pos(x, y);
+            }
+
+            public void pos(int x, int y){
+                tx = obj.editorX = x;
+                ty = obj.editorY = y;
+                this.x = x * unitSize;
+                this.y = y * unitSize;
+            }
+
+            @Override
+            public float getPrefWidth(){
+                return objWidth * unitSize;
+            }
+
+            @Override
+            public float getPrefHeight(){
+                return objHeight * unitSize;
+            }
+
+            @Override
+            public boolean remove(){
+                if(super.remove()){
+                    obj.parents.clear();
+
+                    var it = objectives.iterator();
+                    while(it.hasNext()){
+                        var next = it.next();
+                        if(next == obj){
+                            it.remove();
+                        }else{
+                            next.parents.remove(obj);
+                        }
+                    }
+
+                    return true;
+                }else{
+                    return false;
+                }
+            }
+
+            public class Mover extends InputListener{
+                public int prevX, prevY;
+                public float lastX, lastY;
+
+                @Override
+                public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
+                    if(moving != null) return false;
+                    moving = ObjectiveTile.this;
+                    moving.toFront();
+
+                    prevX = moving.tx;
+                    prevY = moving.ty;
+
+                    // Convert to world pos first because the button gets dragged too.
+                    Vec2 pos = event.listenerActor.localToStageCoordinates(Tmp.v1.set(x, y));
+                    lastX = pos.x;
+                    lastY = pos.y;
+                    return true;
+                }
+
+                @Override
+                public void touchDragged(InputEvent event, float x, float y, int pointer){
+                    Vec2 pos = event.listenerActor.localToStageCoordinates(Tmp.v1.set(x, y));
+
+                    moving.moveBy(pos.x - lastX, pos.y - lastY);
+                    lastX = pos.x;
+                    lastY = pos.y;
+                }
+
+                @Override
+                public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
+                    if(!moveTile(moving,
+                        Mathf.round(moving.x / unitSize),
+                        Mathf.round(moving.y / unitSize)
+                    )) moving.pos(prevX, prevY);
+                    moving = null;
+                }
+            }
+
+            public class Connector extends Button{
+                public float pointX, pointY;
+                public final boolean findParent;
+
+                public Connector(boolean findParent){
+                    super(new ButtonStyle(){{
+                        down = findParent ? Tex.buttonSideLeftDown : Tex.buttonSideRightDown;
+                        up = findParent ? Tex.buttonSideLeft : Tex.buttonSideRight;
+                        over = findParent ? Tex.buttonSideLeftOver : Tex.buttonSideRightOver;
+                    }});
+
+                    this.findParent = findParent;
+
+                    clearChildren();
+
+                    addCaptureListener(new InputListener(){
+                        int conPointer = -1;
+
+                        @Override
+                        public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
+                            if(conPointer != -1) return false;
+                            conPointer = pointer;
+
+                            if(connecting != null) return false;
+                            connecting = Connector.this;
+
+                            pointX = x;
+                            pointY = y;
+                            return true;
+                        }
+
+                        @Override
+                        public void touchDragged(InputEvent event, float x, float y, int pointer){
+                            if(conPointer != pointer) return;
+                            pointX = x;
+                            pointY = y;
+                        }
+
+                        @Override
+                        public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
+                            if(conPointer != pointer || connecting != Connector.this) return;
+                            conPointer = -1;
+
+                            Vec2 pos = Connector.this.localToAscendantCoordinates(ObjectiveTilemap.this, Tmp.v1.set(x, y));
+                            if(ObjectiveTilemap.this.hit(pos.x, pos.y, true) instanceof Connector con && con.canConnectTo(Connector.this)){
+                                if(findParent){
+                                    if(!obj.parents.remove(con.tile().obj)) obj.parents.add(con.tile().obj);
+                                }else{
+                                    if(!con.tile().obj.parents.remove(obj)) con.tile().obj.parents.add(obj);
+                                }
+                            }
+
+                            connecting = null;
+                        }
+                    });
+                }
+
+                public boolean canConnectTo(Connector other){
+                    return
+                        findParent != other.findParent &&
+                        tile() != other.tile();
+                }
+
+                @Override
+                public void draw(){
+                    super.draw();
+                    float cx = x + width / 2f;
+                    float cy = y + height / 2f;
+
+                    // these are all magic numbers tweaked until they looked good in-game, don't mind them.
+                    Lines.stroke(3f, Pal.accent);
+                    if(findParent){
+                        Lines.line(cx, cy + 9f, cx + 9f, cy);
+                        Lines.line(cx + 9f, cy, cx, cy - 9f);
+                    }else{
+                        Lines.square(cx, cy, 9f, 45f);
+                    }
+                }
+
+                public ObjectiveTile tile(){
+                    return ObjectiveTile.this;
+                }
+
+                @Override
+                public boolean isPressed(){
+                    return super.isPressed() || connecting == this;
+                }
+
+                @Override
+                public boolean isOver(){
+                    return super.isOver() && (connecting == null || connecting.canConnectTo(this));
+                }
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/editor/MapObjectivesDialog.java b/core/src/mindustry/editor/MapObjectivesDialog.java
new file mode 100644
index 0000000000..c8f021f214
--- /dev/null
+++ b/core/src/mindustry/editor/MapObjectivesDialog.java
@@ -0,0 +1,756 @@
+package mindustry.editor;
+
+import arc.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.math.geom.*;
+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.content.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
+import mindustry.game.MapObjectives.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+import mindustry.world.*;
+
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+
+import static mindustry.Vars.*;
+import static mindustry.editor.MapObjectivesCanvas.*;
+
+@SuppressWarnings({"unchecked", "rawtypes"})
+public class MapObjectivesDialog extends BaseDialog{
+    public MapObjectivesCanvas canvas;
+    protected Cons<Seq<MapObjective>> out = arr -> {};
+
+    /** Defines default value providers. */
+    private static final ObjectMap<Class<?>, FieldProvider<?>> providers = new ObjectMap<>();
+    /** Maps annotation type with its field parsers. Non-annotated fields are mapped with {@link Override}. */
+    private static final ObjectMap<Class<? extends Annotation>, ObjectMap<Class<?>, FieldInterpreter<?>>> interpreters = new ObjectMap<>();
+
+    static{
+        // Default un-annotated field interpreters.
+        setProvider(String.class, (type, cons) -> cons.get(""));
+        setInterpreter(String.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+
+            if(field != null && field.isAnnotationPresent(Multiline.class)){
+                cont.area(get.get(), set).height(100f).growX();
+            }else{
+                cont.field(get.get(), set).growX();
+            }
+        });
+
+        setProvider(boolean.class, (type, cons) -> cons.get(false));
+        setInterpreter(boolean.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.check("", get.get(), set::get).growX().fillY().get().getLabelCell().growX();
+        });
+
+        setProvider(byte.class, (type, cons) -> cons.get((byte)0));
+        setInterpreter(byte.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.field(Byte.toString(get.get()), str -> set.get((byte)Strings.parseInt(str)))
+                .growX().fillY()
+                .valid(Strings::canParseInt)
+                .get().setFilter(TextFieldFilter.digitsOnly);
+        });
+
+        setProvider(int.class, (type, cons) -> cons.get(0));
+        setInterpreter(int.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.field(Integer.toString(get.get()), str -> set.get(Strings.parseInt(str)))
+                .growX().fillY()
+                .valid(Strings::canParseInt)
+                .get().setFilter(TextFieldFilter.digitsOnly);
+        });
+
+        setProvider(float.class, (type, cons) -> cons.get(0f));
+        setInterpreter(float.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            float m = 1f;
+            if(field != null){
+                if(field.isAnnotationPresent(Second.class)){
+                    m = 60f;
+                }else if(field.isAnnotationPresent(TilePos.class)){
+                    m = 8f;
+                }
+            }
+
+            float mult = m;
+
+            name(cont, name, remover, indexer);
+            cont.field(Float.toString(get.get() / mult), str -> set.get(Strings.parseFloat(str) * mult))
+                .growX().fillY()
+                .valid(Strings::canParseFloat)
+                .get().setFilter(TextFieldFilter.floatsOnly);
+        });
+
+        setProvider(UnlockableContent.class, (type, cons) -> cons.get(Blocks.coreShard));
+        setInterpreter(UnlockableContent.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.table(t -> t.left().button(
+                b -> b.image().size(iconSmall).scaling(Scaling.fit).update(i -> i.setDrawable(get.get().uiIcon)),
+                () -> showContentSelect(null, set, b -> (field != null && !field.isAnnotationPresent(Researchable.class)) || b.techNode != null)
+            ).fill().pad(4)).growX().fillY();
+        });
+
+        setProvider(Block.class, (type, cons) -> cons.get(Blocks.copperWall));
+        setInterpreter(Block.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.table(t -> t.left().button(
+                b -> b.image().size(iconSmall).update(i -> i.setDrawable(get.get().uiIcon)),
+                () -> showContentSelect(ContentType.block, set, b -> (field != null && !field.isAnnotationPresent(Synthetic.class)) || b.synthetic())
+            ).fill().pad(4f)).growX().fillY();
+        });
+
+        setProvider(Item.class, (type, cons) -> cons.get(Items.copper));
+        setInterpreter(Item.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.table(t -> t.left().button(
+                b -> b.image().size(iconSmall).update(i -> i.setDrawable(get.get().uiIcon)),
+                () -> showContentSelect(ContentType.item, set, item -> true)
+            ).fill().pad(4f)).growX().fillY();
+        });
+
+        setProvider(UnitType.class, (type, cons) -> cons.get(UnitTypes.dagger));
+        setInterpreter(UnitType.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.table(t -> t.left().button(
+                b -> b.image().size(iconSmall).update(i -> i.setDrawable(get.get().uiIcon)),
+                () -> showContentSelect(ContentType.unit, set, unit -> true)
+            ).fill().pad(4f)).growX().fillY();
+        });
+
+        setProvider(Team.class, (type, cons) -> cons.get(Team.sharded));
+        setInterpreter(Team.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.table(t -> t.left().button(
+                b -> b.image(Tex.whiteui).size(iconSmall).update(i -> i.setColor(get.get().color)),
+                () -> showTeamSelect(set)
+            ).fill().pad(4f)).growX().fillY();
+        });
+
+        setProvider(Color.class, (type, cons) -> cons.get(Pal.accent.cpy()));
+        setInterpreter(Color.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            var out = get.get();
+
+            name(cont, name, remover, indexer);
+            cont.table(t -> t.left().button(
+                b -> b.stack(new Image(Tex.alphaBg), new Image(Tex.whiteui){{
+                    update(() -> setColor(out));
+                }}).grow(),
+                Styles.squarei,
+                () -> ui.picker.show(out, res -> set.get(out.set(res)))
+            ).margin(4f).pad(4f).size(50f)).growX().fillY();
+        });
+
+        setProvider(Vec2.class, (type, cons) -> cons.get(new Vec2()));
+        setInterpreter(Vec2.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            var obj = get.get();
+
+            name(cont, name, remover, indexer);
+            cont.table(t -> {
+                boolean isInt = type.raw == int.class;
+
+                FieldInterpreter in = getInterpreter(float.class);
+                if(isInt) in = getInterpreter(int.class);
+
+                in.build(
+                    t, "x", new TypeInfo(isInt ? int.class : float.class),
+                    field, null, null,
+                    isInt ? () -> (int)obj.x : () -> obj.x,
+                    res -> {
+                        obj.x = isInt ? (Integer)res : (Float)res;
+                        set.get(obj);
+                    }
+                );
+
+                in.build(
+                    t.row(), "y", new TypeInfo(isInt ? int.class : float.class),
+                    field, null, null,
+                    isInt ? () -> (int)obj.y : () -> obj.y,
+                    res -> {
+                        obj.y = isInt ? (Integer)res : (Float)res;
+                        set.get(obj);
+                    }
+                );
+            }).growX().fillY();
+        });
+
+        setProvider(Point2.class, (type, cons) -> cons.get(new Point2()));
+        setInterpreter(Point2.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            var obj = get.get();
+            var vec = new Vec2(obj.x, obj.y);
+            getInterpreter(Vec2.class).build(
+                cont, name, new TypeInfo(int.class),
+                field, remover, indexer,
+                () -> vec,
+                res -> {
+                    vec.set(res);
+                    set.get(obj.set((int)vec.x, (int)vec.y));
+                }
+            );
+        });
+
+        // Types that have a provider, but delegate to the default interpreter.
+        setProvider(MapObjective.class, (type, cons) -> new BaseDialog("@add"){{
+            cont.pane(p -> {
+                p.background(Tex.button);
+                p.marginRight(14f);
+                p.defaults().size(195f, 56f);
+
+                int i = 0;
+                for(var gen : MapObjectives.allObjectiveTypes){
+                    var obj = gen.get();
+                    p.button(obj.typeName(), Styles.flatt, () -> {
+                        cons.get(obj);
+                        hide();
+                    }).with(Table::left).get().getLabelCell().growX().left().padLeft(5f).labelAlign(Align.left);
+
+                    if(++i % 3 == 0) p.row();
+                }
+            }).scrollX(false);
+
+            addCloseButton();
+            show();
+        }});
+
+        setProvider(ObjectiveMarker.class, (type, cons) -> new BaseDialog("@add"){{
+            cont.pane(p -> {
+                p.background(Tex.button);
+                p.marginRight(14f);
+                p.defaults().size(195f, 56f);
+
+                int i = 0;
+                for(var gen : MapObjectives.allMarkerTypes){
+                    var marker = gen.get();
+                    p.button(marker.typeName(), Styles.flatt, () -> {
+                        cons.get(marker);
+                        hide();
+                    }).with(Table::left).get().getLabelCell().growX().left().padLeft(5f).labelAlign(Align.left);
+
+                    if(++i % 3 == 0) p.row();
+                }
+            }).scrollX(false);
+
+            addCloseButton();
+            show();
+        }});
+
+        setInterpreter(Vertices.class, float[].class, (cont, name, type, field, remover, indexer, get, set) -> cont.table(main -> {
+            float[] data = get.get();
+
+            name(cont, name, remover, indexer);
+            cont.table(t -> {
+                t.left().defaults().left();
+
+                String[] names = {"x", "y", "color", "u", "v"};
+                int stride = 6;
+                int vertices = data.length / stride;
+
+                for(int i = 0; i < vertices; i++){
+                    int offset = i * stride;
+
+                    t.table(row -> {
+                        for(int j = 0; j < names.length; j++){
+                            int index = offset + j;
+
+                            if("color".equals(names[j])) {
+                                getInterpreter(Color.class).build(row, names[j], new TypeInfo(Color.class), null, null, null, () -> new Color().abgr8888(data[index]), value -> data[index] = value.toFloatBits());
+                            }else{
+                                float scale = j <= 1 ? tilesize : 1;
+                                getInterpreter(float.class).build(row, names[j], new TypeInfo(float.class), null, null, null, () -> data[index] / scale, value -> data[index] = value * scale);
+                            }
+
+                            row.add().pad(4);
+                        }
+                    }).row();
+                }
+            });
+        }));
+
+        // Types that use the default interpreter. It would be nice if all types could use it, but I don't know how to reliably prevent classes like [? extends Content] from using it.
+        for(var obj : MapObjectives.allObjectiveTypes) setInterpreter(obj.get().getClass(), defaultInterpreter());
+        for(var mark : MapObjectives.allMarkerTypes) setInterpreter(mark.get().getClass(), defaultInterpreter());
+
+        // Annotated field interpreters.
+        setInterpreter(LabelFlag.class, byte.class, (cont, name, type, field, remover, indexer, get, set) -> {
+            name(cont, name, remover, indexer);
+            cont.table(t -> {
+                t.left().defaults().left();
+                byte
+                    value = get.get(),
+                    bg = WorldLabel.flagBackground, out = WorldLabel.flagOutline;
+
+                t.check("@marker.background", (value & bg) == bg, res -> set.get((byte)(res ? value | bg : value & ~bg)))
+                    .growX().fillY()
+                    .padTop(4f).padBottom(4f).get().getLabelCell().growX();
+
+                t.row();
+                t.check("@marker.outline", (value & out) == out, res -> set.get((byte)(res ? value | out : value & ~out)))
+                    .growX().fillY().get().getLabelCell().growX();
+            }).growX().fillY();
+        });
+
+        // Special data structure interpreters.
+        // Instantiate default `Seq`s with a reflectively allocated array.
+        setProvider(Seq.class, (type, cons) -> cons.get(new Seq<>(type.element.raw)));
+        setInterpreter(Seq.class, (cont, name, type, field, remover, indexer, get, set) -> cont.table(main -> {
+            Runnable[] rebuild = {null};
+            var arr = get.get();
+
+            main.margin(0f, 10f, 0f, 10f);
+            var header = main.table(Tex.button, t -> {
+                t.left();
+                t.margin(10f);
+
+                if(name.length() > 0) t.add(name + ":").color(Pal.accent);
+                t.add().growX();
+
+                if(remover != null) t.button(Icon.trash, Styles.emptyi, remover).fill().padRight(4f);
+                if(indexer != null){
+                    t.button(Icon.upOpen, Styles.emptyi, () -> indexer.get(true)).fill().padRight(4f);
+                    t.button(Icon.downOpen, Styles.emptyi, () -> indexer.get(false)).fill().padRight(4f);
+                }
+
+                if(!field.isAnnotationPresent(Immutable.class)) {
+                    t.button(Icon.add, Styles.emptyi, () -> getProvider(type.element.raw).get(type.element, res -> {
+                        arr.add(res);
+                        rebuild[0].run();
+                    })).fill();
+                }
+            }).growX().height(46f).pad(0f, -10f, 0f, -10f).get();
+
+            main.row().table(Tex.button, t -> rebuild[0] = () -> {
+                t.clear();
+                t.top();
+
+                if(arr.isEmpty()){
+                    t.background(Tex.clear).margin(0f).setSize(0f);
+                }else{
+                    t.background(Tex.button).margin(10f).marginTop(20f);
+                }
+
+                for(int i = 0, len = arr.size; i < len; i++){
+                    int index = i;
+                    if(index > 0) t.row();
+
+                    getInterpreter((Class<Object>)arr.get(index).getClass()).build(
+                        t, "", new TypeInfo(arr.get(index).getClass()),
+                        field, field == null || !field.isAnnotationPresent(Immutable.class) ? () -> {
+                            arr.remove(index);
+                            rebuild[0].run();
+                        } : null, field == null || !field.isAnnotationPresent(Unordered.class) ? in -> {
+                            if(in && index > 0){
+                                arr.swap(index, index - 1);
+                                rebuild[0].run();
+                            }else if(!in && index < len - 1){
+                                arr.swap(index, index + 1);
+                                rebuild[0].run();
+                            }
+                        } : null,
+                        () -> arr.get(index),
+                        res -> {
+                            arr.set(index, res);
+                            set.get(arr);
+                        }
+                    );
+                }
+
+                set.get(arr);
+            }).padTop(-10f).growX().fillY();
+            rebuild[0].run();
+
+            header.toFront();
+        }).growX().fillY().pad(4f).colspan(2));
+
+        // Reserved for array types that are not explicitly handled. Essentially handles it the same way as `Seq`.
+        setProvider(Object[].class, (type, cons) -> cons.get(Reflect.newArray(type.element.raw, 0)));
+        setInterpreter(Object[].class, (cont, name, type, field, remover, indexer, get, set) -> {
+            var arr = Seq.with(get.get());
+            getInterpreter(Seq.class).build(
+                cont, name, new TypeInfo(Seq.class, type.element),
+                field, remover, indexer,
+                () -> arr,
+                res -> set.get(arr.toArray(type.element.raw))
+            );
+        });
+    }
+
+    public static <T> FieldInterpreter<T> defaultInterpreter(){
+        return (cont, name, type, field, remover, indexer, get, set) -> cont.table(main -> {
+            main.margin(0f, 10f, 0f, 10f);
+            var header = main.table(Tex.button, t -> {
+                t.left();
+                t.margin(10f);
+
+                if(name.length() > 0) t.add(name + ":").color(Pal.accent);
+                t.add().growX();
+
+                Cell<ImageButton> remove = null;
+                if(remover != null) remove = t.button(Icon.trash, Styles.emptyi, remover).fill();
+                if(indexer != null){
+                    if(remove != null) remove.padRight(4f);
+                    t.button(Icon.upOpen, Styles.emptyi, () -> indexer.get(true)).fill().padRight(4f);
+                    t.button(Icon.downOpen, Styles.emptyi, () -> indexer.get(false)).fill();
+                }
+            }).growX().height(46f).pad(0f, -10f, -0f, -10f).get();
+
+            main.row().table(Tex.button, t -> {
+                t.left();
+                t.top().margin(10f).marginTop(20f);
+
+                t.defaults().minHeight(40f).left();
+                var obj = get.get();
+
+                int i = 0;
+                for(var e : JsonIO.json.getFields(type.raw).values()){
+                    if(i++ > 0) t.row();
+
+                    var f = e.field;
+                    var ft = f.getType();
+                    int mods = f.getModifiers();
+
+                    if(!Modifier.isPublic(mods) || (Modifier.isFinal(mods) && (
+                        String.class.isAssignableFrom(ft) ||
+                        unbox(ft).isPrimitive()
+                    ))) continue;
+
+                    var anno = Structs.find(f.getDeclaredAnnotations(), a -> hasInterpreter(a.annotationType(), ft));
+                    getInterpreter(anno == null ? Override.class : anno.annotationType(), ft).build(
+                        t, f.getName(), new TypeInfo(f),
+                        f, null, null,
+                        () -> Reflect.get(obj, f),
+                        Modifier.isFinal(mods) ? res -> {} : res -> Reflect.set(obj, f, res)
+                    );
+                }
+            }).padTop(-10f).growX().fillY();
+
+            header.toFront();
+        }).growX().fillY().pad(4f).colspan(2);
+    }
+
+    public static void name(Table cont, CharSequence name, @Nullable Runnable remover, @Nullable Boolc indexer){
+        if(indexer != null || remover != null){
+            cont.table(t -> {
+                if(remover != null) t.button(Icon.trash, Styles.emptyi, remover).fill().padRight(4f);
+                if(indexer != null){
+                    t.button(Icon.upOpen, Styles.emptyi, () -> indexer.get(true)).fill().padRight(4f);
+                    t.button(Icon.downOpen, Styles.emptyi, () -> indexer.get(false)).fill().padRight(4f);
+                }
+            }).fill();
+        }else{
+            cont.add(name + ": ");
+        }
+    }
+
+    public MapObjectivesDialog(){
+        super("@editor.objectives");
+        clear();
+        margin(0f);
+
+        stack(
+            new Image(Styles.black5),
+            canvas = new MapObjectivesCanvas(),
+            new Table(){{
+                buttons.defaults().size(160f, 64f).pad(2f);
+                buttons.button("@back", Icon.left, MapObjectivesDialog.this::hide);
+                buttons.button("@add", Icon.add, () -> getProvider(MapObjective.class).get(new TypeInfo(MapObjective.class), canvas::query));
+                buttons.button("@waves.edit", Icon.edit, () -> {
+                    BaseDialog dialog = new BaseDialog("@waves.edit");
+                    dialog.addCloseButton();
+                    dialog.setFillParent(false);
+                    dialog.cont.table(Tex.button, t -> {
+                        var style = Styles.cleart;
+                        t.defaults().size(280f, 64f).pad(2f);
+
+                        t.button("@waves.copy", Icon.copy, style, () -> {
+                            ui.showInfoFade("@copied");
+                            Core.app.setClipboardText(JsonIO.write(new MapObjectives(canvas.objectives)));
+                            dialog.hide();
+                        }).disabled(b -> canvas.objectives.isEmpty()).marginLeft(12f).row();
+
+                        t.button("@waves.load", Icon.download, style, () -> {
+                            try{
+                                rebuildObjectives(new Seq<>(JsonIO.read(MapObjectives.class, Core.app.getClipboardText()).all));
+                            }catch(Exception e){
+                                Log.err(e);
+                                ui.showErrorMessage("@waves.invalid");
+                            }
+                            dialog.hide();
+                        }).disabled(Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith("[")).marginLeft(12f).row();
+
+                        t.button("@clear", Icon.none, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
+                            rebuildObjectives(new Seq<>());
+                            dialog.hide();
+                        })).marginLeft(12f).row();
+                    });
+
+                    dialog.show();
+                });
+
+                if(mobile){
+                    buttons.button("@cancel", Icon.cancel, canvas::stopQuery).visible(() -> canvas.isQuerying());
+                    buttons.button("@ok", Icon.ok, canvas::placeQuery).visible(() -> canvas.isQuerying());
+                }
+
+                setFillParent(true);
+                margin(3f);
+
+                add(titleTable).growX().fillY();
+                row().add().grow();
+                row().add(buttons).fill();
+                addCloseListener();
+            }}
+        ).grow().pad(0f).margin(0f);
+
+        hidden(() -> {
+            out.get(canvas.objectives);
+            out = arr -> {};
+        });
+    }
+
+    public void show(Seq<MapObjective> objectives, Cons<Seq<MapObjective>> out){
+        this.out = out;
+
+        rebuildObjectives(objectives);
+        show();
+    }
+
+    public void rebuildObjectives(Seq<MapObjective> objectives){
+        canvas.clearObjectives();
+        if(
+        objectives.any() && (
+        // If the objectives were previously programmatically made...
+        objectives.contains(obj -> obj.editorX == -1 || obj.editorY == -1) ||
+        // ... or some idiot somehow made it not work...
+        objectives.contains(obj -> !canvas.tilemap.createTile(obj))
+        )){
+            // ... then rebuild the structure.
+            canvas.clearObjectives();
+
+            // This is definitely NOT a good way to do it, but only insane people or people from the distant past would actually encounter this anyway.
+            int w = objWidth + 2,
+            len = objectives.size * w,
+            columns = objectives.size,
+            rows = 1;
+
+            if(len > bounds){
+                rows = len / bounds;
+                columns = bounds / w;
+            }
+
+            int i = 0;
+            loop:
+            for(int y = 0; y < rows; y++){
+                for(int x = 0; x < columns; x++){
+                    if(canvas.tilemap.createTile(x * w, y, objectives.get(i))){
+                        i++;
+                    }
+                    if(i >= objectives.size) break loop;
+                }
+            }
+        }
+
+        canvas.objectives.set(objectives);
+    }
+
+    public static <T extends UnlockableContent> void showContentSelect(@Nullable ContentType type, Cons<T> cons, Boolf<T> check){
+        BaseDialog dialog = new BaseDialog("");
+        dialog.cont.pane(Styles.noBarPane, t -> {
+            int i = 0;
+            for(var content : (type == null ? content.blocks().copy().<UnlockableContent>as()
+                .add(content.items())
+                .add(content.liquids())
+                .add(content.units()) :
+                content.getBy(type).<UnlockableContent>as()
+            )){
+                if(content.isHidden() || !check.get((T)content)) continue;
+                t.image(content == Blocks.air ? Icon.none.getRegion() : content.uiIcon).size(iconMed).pad(3).scaling(Scaling.fit)
+                    .with(b -> b.addListener(new HandCursorListener()))
+                    .tooltip(content.localizedName).get().clicked(() -> {
+                        cons.get((T)content);
+                        dialog.hide();
+                    });
+
+                if(++i % 10 == 0) t.row();
+            }
+        }).fill();
+
+        dialog.closeOnBack();
+        dialog.show();
+    }
+
+    public static void showTeamSelect(Cons<Team> cons){
+        BaseDialog dialog = new BaseDialog("");
+        for(var team : Team.baseTeams){
+            dialog.cont.image(Tex.whiteui).size(iconMed).color(team.color).pad(4)
+                .with(i -> i.addListener(new HandCursorListener()))
+                .tooltip(team.localized()).get().clicked(() -> {
+                    cons.get(team);
+                    dialog.hide();
+                });
+        }
+
+        dialog.closeOnBack();
+        dialog.show();
+    }
+
+    public static Class<?> unbox(Class<?> boxed){
+        return switch(boxed.getSimpleName()){
+            case "Boolean" -> boolean.class;
+            case "Byte" -> byte.class;
+            case "Character" -> char.class;
+            case "Short" -> short.class;
+            case "Integer" -> int.class;
+            case "Long" -> long.class;
+            case "Float" -> float.class;
+            case "Double" -> double.class;
+            default -> boxed;
+        };
+    }
+
+    public static <T> void setInterpreter(Class<T> type, FieldInterpreter<? super T> interpreter){
+        setInterpreter(Override.class, type, interpreter);
+    }
+
+    public static <T> void setInterpreter(Class<? extends Annotation> anno, Class<T> type, FieldInterpreter<? super T> interpreter){
+        interpreters.get(anno, ObjectMap::new).put(type, interpreter);
+    }
+
+    public static boolean hasInterpreter(Class<?> type){
+        return hasInterpreter(Override.class, type);
+    }
+
+    public static boolean hasInterpreter(Class<? extends Annotation> anno, Class<?> type){
+        return interpreters.get(anno, ObjectMap::new).containsKey(unbox(type));
+    }
+
+    public static <T> FieldInterpreter<T> getInterpreter(Class<T> type){
+        return getInterpreter(Override.class, type);
+    }
+
+    public static <T> FieldInterpreter<T> getInterpreter(Class<? extends Annotation> anno, Class<T> type){
+        if(hasInterpreter(anno, type)){
+            return (FieldInterpreter<T>)interpreters.get(anno, ObjectMap::new).get(unbox(type));
+        }else if(hasInterpreter(Override.class, type)){
+            return (FieldInterpreter<T>)interpreters.get(Override.class, ObjectMap::new).get(unbox(type));
+        }else if(type.isArray() && !type.getComponentType().isPrimitive()){
+            return (FieldInterpreter<T>)(hasInterpreter(anno, Object[].class)
+                ? interpreters.get(anno).get(Object[].class)
+                : interpreters.get(Override.class).get(Object[].class)
+            );
+        }else{
+            throw new IllegalArgumentException("Interpreter for type " + type + " not set up yet.");
+        }
+    }
+
+    public static <T> void setProvider(Class<T> type, FieldProvider<T> provider){
+        providers.put(unbox(type), provider);
+    }
+
+    public static boolean hasProvider(Class<?> type){
+        return providers.containsKey(unbox(type));
+    }
+
+    public static <T> FieldProvider<T> getProvider(Class<T> type){
+        return (FieldProvider<T>)providers.getThrow(unbox(type), () -> new IllegalArgumentException("Provider for type " + type + " not set up yet."));
+    }
+
+    public interface FieldInterpreter<T>{
+        /**
+         * Builds the interpreter for (not-necessarily) a possibly annotated field. Implementations must add exactly
+         * 2 columns to the table.
+         * @param name    May be empty.
+         * @param remover If this callback is not {@code null}, this interpreter should add a button that invokes the
+         *                callback to signal element removal.
+         * @param indexer If this callback is not {@code null}, this interpreter should add 2 buttons that invoke the
+         *                callback to signal element rearrangement with the following values:<ul>
+         *                <li>{@code true}: Swap element with previous index.</li>
+         *                <li>{@code false}: Swap element with next index.</li>
+         *                </ul>
+         */
+        void build(Table cont,
+                   CharSequence name, TypeInfo type,
+                   @Nullable Field field,
+                   @Nullable Runnable remover, @Nullable Boolc indexer,
+                   Prov<T> get, Cons<T> set);
+    }
+
+    public interface FieldProvider<T>{
+        void get(TypeInfo type, Cons<T> cons);
+    }
+
+    /**
+     * Stores parameterized or array type information for convenience.
+     * For {@code A[]}: {@link #raw} is {@code A[]}, {@link #element} is {@code A}, {@link #key} is {@code null}.
+     * For {@code Seq<A>}: {@link #raw} is {@link Seq}, {@link #element} is {@code A}, {@link #key} is {@code null}.
+     * For {@code ObjectMap<A, B>}: {@link #raw} is {@link ObjectMap}, {@link #element} is {@code B}, {@link #key} is {@code A}.
+     */
+    public static class TypeInfo{
+        public final Class<?> raw;
+        public final TypeInfo element, key;
+
+        public TypeInfo(Field field){
+            this(field.getType(), field.getGenericType());
+        }
+
+        public TypeInfo(Class<?> raw){
+            this(raw, raw);
+        }
+
+        /** Use with care! */
+        public TypeInfo(Class<?> raw, TypeInfo element){
+            this.raw = unbox(raw);
+            this.element = element;
+            key = null;
+        }
+
+        public TypeInfo(Class<?> raw, Type generic){
+            this.raw = unbox(raw);
+            if(raw.isArray()){
+                key = null;
+                element = new TypeInfo(raw.getComponentType(), generic instanceof GenericArrayType type ? type.getGenericComponentType() : raw.getComponentType());
+            }else if(Seq.class.isAssignableFrom(raw)){
+                key = null;
+                element = getParam(generic, 0);
+            }else if(ObjectMap.class.isAssignableFrom(raw)){
+                key = getParam(generic, 0);
+                element = getParam(generic, 1);
+            }else{
+                key = element = null;
+            }
+        }
+
+        public static TypeInfo getParam(Type generic, int index){
+            Type[] params =
+                generic instanceof ParameterizedType type ? type.getActualTypeArguments() :
+                generic instanceof GenericDeclaration type ? type.getTypeParameters() : null;
+
+            if(params != null && index < params.length){
+                var target = params[index];
+                return new TypeInfo(raw(target), target);
+            }
+
+            return new TypeInfo(Object.class, Object.class);
+        }
+
+        public static Class<?> raw(Type type){
+            if(type instanceof Class<?> c) return c;
+            if(type instanceof ParameterizedType c) return (Class<?>)c.getRawType();
+            if(type instanceof GenericArrayType c) return Reflect.newArray(raw(c.getGenericComponentType()), 0).getClass();
+            if(type instanceof TypeVariable<?> c) return raw(c.getBounds()[0]);
+            return Object.class;
+        }
+    }
+}
diff --git a/core/src/mindustry/editor/MapProcessorsDialog.java b/core/src/mindustry/editor/MapProcessorsDialog.java
new file mode 100644
index 0000000000..8867c2df13
--- /dev/null
+++ b/core/src/mindustry/editor/MapProcessorsDialog.java
@@ -0,0 +1,155 @@
+package mindustry.editor;
+
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
+import mindustry.world.blocks.logic.*;
+import mindustry.world.blocks.logic.LogicBlock.*;
+
+import static mindustry.Vars.*;
+
+public class MapProcessorsDialog extends BaseDialog{
+    private IconSelectDialog iconSelect = new IconSelectDialog(true);
+    private TextField search;
+    private Seq<Building> processors = new Seq<>();
+    private Table list;
+
+    public MapProcessorsDialog(){
+        super("@editor.worldprocessors");
+
+        shown(this::setup);
+
+        addCloseButton();
+        buttons.button("@add", Icon.add, () -> {
+            boolean foundAny = false;
+
+            outer:
+            for(int y = 0; y < Vars.world.height(); y++){
+                for(int x = 0; x < Vars.world.width(); x++){
+                    Tile tile = Vars.world.rawTile(x, y);
+                    if(!tile.synthetic()){
+                        foundAny = true;
+                        tile.setNet(Blocks.worldProcessor, Team.sharded, 0);
+                        if(ui.editor.isShown()){
+                            Vars.editor.renderer.updatePoint(x, y);
+                        }
+                        break outer;
+                    }
+                }
+            }
+
+            if(!foundAny){
+                ui.showErrorMessage("@editor.worldprocessors.nospace");
+            }else{
+                setup();
+            }
+        }).size(210f, 64f);
+
+        cont.top();
+        getCell(cont).grow();
+
+        cont.table(s -> {
+            s.image(Icon.zoom).padRight(8);
+            search = s.field(null, text -> rebuild()).growX().get();
+            search.setMessageText("@players.search");
+        }).width(440f).fillX().padBottom(4).row();
+
+        cont.pane(t -> {
+            list = t;
+        });
+    }
+
+    private void rebuild(){
+        list.clearChildren();
+
+        if(processors.isEmpty()){
+            list.add("@editor.worldprocessors.none");
+        }else{
+            Table t = list;
+            var text = search.getText().toLowerCase();
+
+            t.defaults().pad(4f);
+            float h = 50f;
+            for(var build : processors){
+                if(build instanceof LogicBuild log && (text.isEmpty() || (log.tag != null && log.tag.toLowerCase().contains(text)))){
+
+                    t.button(log.iconTag == 0 ? Styles.none : new TextureRegionDrawable(Fonts.getLargeIcon(Fonts.unicodeToName(log.iconTag))), Styles.graySquarei, iconMed, () -> {
+                        iconSelect.show(ic -> {
+                            log.iconTag = (char)ic;
+                            rebuild();
+                        });
+                    }).size(h);
+
+                    t.button((log.tag == null ? "<no name>\n" : "[accent]" + log.tag + "\n") + "[lightgray][[" + log.tile.x + ", " + log.tile.y + "]", Styles.grayt, () -> {
+                        //TODO: bug: if you edit name inside of the edit dialog, it won't show up in the list properly
+                        log.showEditDialog(true);
+                    }).size(Vars.mobile ? 390f : 450f, h).margin(10f).with(b -> {
+                        b.getLabel().setAlignment(Align.left, Align.left);
+                    });
+
+                    t.button(Icon.pencil, Styles.graySquarei, Vars.iconMed, () -> {
+                        ui.showTextInput("", "@editor.name", LogicBlock.maxNameLength, log.tag == null ? "" : log.tag, tag -> {
+                            //bypass configuration and set it directly in case privileged checks mess things up
+                            log.tag = tag;
+                            setup();
+                        });
+                    }).size(h);
+
+                    if(Vars.state.isGame() && state.isEditor()){
+                        t.button(Icon.eyeSmall, Styles.graySquarei, Vars.iconMed, () -> {
+                            hide();
+                            control.input.config.showConfig(build);
+                            control.input.panCamera(Tmp.v1.set(build));
+                        }).size(h);
+                    }
+
+                    t.button(Icon.trash, Styles.graySquarei, iconMed, () -> {
+                        ui.showConfirm("@editor.worldprocessors.delete.confirm",  () -> {
+                            boolean surrounded = true;
+                            for(int i = 0; i < 4; i++){
+                                Tile other = build.tile.nearby(i);
+                                if(other != null && !(other.block().privileged || other.block().isStatic())){
+                                    surrounded = false;
+                                    break;
+                                }
+                            }
+                            if(surrounded){
+                                build.tile.setNet(build.tile.floor().wall instanceof StaticWall ? build.tile.floor().wall : Blocks.stoneWall);
+                            }else{
+                                build.tile.setNet(Blocks.air);
+                            }
+                            processors.remove(build);
+                            rebuild();
+                        });
+                    }).size(h);
+
+                    t.row();
+                }
+            }
+        }
+    }
+
+    private void setup(){
+
+        processors.clear();
+
+        //scan the entire world for processor (Groups.build can be empty, indexer is probably inaccurate)
+        Vars.world.tiles.eachTile(t -> {
+            if(t.isCenter() && t.block() == Blocks.worldProcessor){
+                processors.add(t.build);
+            }
+        });
+
+        rebuild();
+    }
+}
diff --git a/core/src/mindustry/editor/MapRenderer.java b/core/src/mindustry/editor/MapRenderer.java
index 919c534128..f3249f40ee 100644
--- a/core/src/mindustry/editor/MapRenderer.java
+++ b/core/src/mindustry/editor/MapRenderer.java
@@ -10,6 +10,7 @@ import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
@@ -18,14 +19,8 @@ public class MapRenderer implements Disposable{
     private IndexedRenderer[][] chunks;
     private IntSet updates = new IntSet();
     private IntSet delayedUpdates = new IntSet();
-    private MapEditor editor;
+    private TextureRegion clearEditor;
     private int width, height;
-    private Texture texture;
-
-    public MapRenderer(MapEditor editor){
-        this.editor = editor;
-        this.texture = Core.atlas.find("clear-editor").texture;
-    }
 
     public void resize(int width, int height){
         updates.clear();
@@ -52,6 +47,7 @@ public class MapRenderer implements Disposable{
 
     public void draw(float tx, float ty, float tw, float th){
         Draw.flush();
+        clearEditor = Core.atlas.find("clear-editor");
 
         updates.each(i -> render(i % width, i / width));
         updates.clear();
@@ -64,6 +60,8 @@ public class MapRenderer implements Disposable{
             return;
         }
 
+        var texture = Core.atlas.find("clear-editor").texture;
+
         for(int x = 0; x < chunks.length; x++){
             for(int y = 0; y < chunks[0].length; y++){
                 IndexedRenderer mesh = chunks[x][y];
@@ -85,6 +83,7 @@ public class MapRenderer implements Disposable{
     }
 
     public void updateAll(){
+        clearEditor = Core.atlas.find("clear-editor");
         for(int x = 0; x < width; x++){
             for(int y = 0; y < height; y++){
                 render(x, y);
@@ -92,13 +91,22 @@ public class MapRenderer implements Disposable{
         }
     }
 
+    private TextureRegion getIcon(Block wall, int index){
+        return !wall.editorIcon().found() ?
+            clearEditor : wall.variants > 0 ?
+            wall.editorVariantRegions()[Mathf.randomSeed(index, 0, wall.editorVariantRegions().length - 1)] :
+            wall.editorIcon();
+    }
+
     private void render(int wx, int wy){
         int x = wx / chunkSize, y = wy / chunkSize;
+        if(x >= chunks.length || y >= chunks[0].length) return;
         IndexedRenderer mesh = chunks[x][y];
         Tile tile = editor.tiles().getn(wx, wy);
 
         Team team = tile.team();
-        Block floor = tile.floor();
+        Floor floor = tile.floor();
+        Floor overlay = tile.overlay();
         Block wall = tile.block();
 
         TextureRegion region;
@@ -106,15 +114,23 @@ public class MapRenderer implements Disposable{
         int idxWall = (wx % chunkSize) + (wy % chunkSize) * chunkSize;
         int idxDecal = (wx % chunkSize) + (wy % chunkSize) * chunkSize + chunkSize * chunkSize;
         boolean center = tile.isCenter();
+        boolean useSyntheticWall = wall.synthetic() || overlay.wallOre;
 
-        if(wall != Blocks.air && wall.synthetic()){
-            region = !Core.atlas.isFound(wall.editorIcon()) || !center ? Core.atlas.find("clear-editor") : wall.editorIcon();
+        //draw synthetic wall or floor OR standard wall if wall ore
+        if(wall != Blocks.air && useSyntheticWall){
+            region = !center ? clearEditor : getIcon(wall, idxWall);
 
-            float width = region.width * Draw.scl, height = region.height * Draw.scl;
+            float width = region.width * region.scl(), height = region.height * region.scl(), ox = wall.offset + (tilesize - width) / 2f, oy = wall.offset + (tilesize - height) / 2f;
+
+            //force fit to tile
+            if(overlay.wallOre && !wall.synthetic()){
+                width = height = tilesize;
+                ox = oy = 0f;
+            }
 
             mesh.draw(idxWall, region,
-            wx * tilesize + wall.offset + (tilesize - width) / 2f,
-            wy * tilesize + wall.offset + (tilesize - height) / 2f,
+            wx * tilesize + ox,
+            wy * tilesize + oy,
             width, height,
             tile.build == null || !wall.rotate ? 0 : tile.build.rotdeg());
         }else{
@@ -123,27 +139,39 @@ public class MapRenderer implements Disposable{
             mesh.draw(idxWall, region, wx * tilesize, wy * tilesize, 8, 8);
         }
 
-        float offsetX = -(wall.size / 3) * tilesize, offsetY = -(wall.size / 3) * tilesize;
+        float offsetX = -((wall.size + 1) / 3) * tilesize, offsetY = -((wall.size + 1) / 3) * tilesize;
 
+        //draw non-synthetic wall or ore
         if((wall.update || wall.destructible) && center){
             mesh.setColor(team.color);
             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.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)];
+            if(wall.size == 2){
+                offsetX += tilesize;
+                offsetY += tilesize;
+            }
+        }else if(!useSyntheticWall && wall != Blocks.air && center){
+            region = getIcon(wall, idxWall);
+
+            if(wall == Blocks.cliff){
+                mesh.setColor(Tmp.c1.set(floor.mapColor).mul(1.6f));
+                region = ((Cliff)Blocks.cliff).editorCliffs[tile.data & 0xff];
+            }
+
+            offsetX = tilesize / 2f - region.width * region.scl() / 2f;
+            offsetY = tilesize / 2f - region.height * region.scl() / 2f;
+        }else if((wall == Blocks.air || overlay.wallOre) && !overlay.isAir()){
+            if(floor.isLiquid){
+                mesh.setColor(Tmp.c1.set(1f, 1f, 1f, floor.overlayAlpha));
+            }
+            region = overlay.editorVariantRegions()[Mathf.randomSeed(idxWall, 0, tile.overlay().editorVariantRegions().length - 1)];
         }else{
-            region = Core.atlas.find("clear-editor");
+            region = clearEditor;
         }
 
-        float width = region.width * Draw.scl, height = region.height * Draw.scl;
+        float width = region.width * region.scl(), height = region.height * region.scl();
         if(!wall.synthetic() && wall != Blocks.air && !wall.isMultiblock()){
-            offsetX = 0;
-            offsetY = 0;
-            width = tilesize;
-            height = tilesize;
+            offsetX = offsetY = 0f;
+            width = height = tilesize;
         }
 
         mesh.draw(idxDecal, region, wx * tilesize + offsetX, wy * tilesize + offsetY, width, height);
diff --git a/core/src/mindustry/editor/MapResizeDialog.java b/core/src/mindustry/editor/MapResizeDialog.java
index afb0356bfa..7a5c15ce71 100644
--- a/core/src/mindustry/editor/MapResizeDialog.java
+++ b/core/src/mindustry/editor/MapResizeDialog.java
@@ -1,18 +1,22 @@
 package mindustry.editor;
 
-import arc.func.*;
 import arc.math.*;
 import arc.scene.ui.TextField.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.ui.dialogs.*;
 
-public class MapResizeDialog extends BaseDialog{
-    public static int minSize = 50, maxSize = 500, increment = 50;
-    int width, height;
+import static mindustry.Vars.*;
 
-    public MapResizeDialog(MapEditor editor, Intc2 cons){
+public class MapResizeDialog extends BaseDialog{
+    public static int minSize = 50, maxSize = 600, increment = 50;
+
+    int width, height, shiftX, shiftY;
+
+    public MapResizeDialog(ResizeListener cons){
         super("@editor.resizemap");
+
+        closeOnBack();
         shown(() -> {
             cont.clear();
             width = editor.width();
@@ -27,10 +31,23 @@ public class MapResizeDialog extends BaseDialog{
                 table.field((w ? width : height) + "", TextFieldFilter.digitsOnly, value -> {
                     int val = Integer.parseInt(value);
                     if(w) width = val; else height = val;
-                }).valid(value -> Strings.canParsePositiveInt(value) && Integer.parseInt(value) <= maxSize && Integer.parseInt(value) >= minSize).addInputDialog(3);
+                }).valid(value -> Strings.canParsePositiveInt(value) && Integer.parseInt(value) <= maxSize && Integer.parseInt(value) >= minSize).maxTextLength(3);
 
                 table.row();
             }
+
+            for(boolean x : Mathf.booleans){
+                table.add(x ? "@editor.shiftx" : "@editor.shifty").padRight(8f);
+                table.defaults().height(60f).padTop(8);
+
+                table.field((x ? shiftX : shiftY) + "", value -> {
+                    int val = Integer.parseInt(value);
+                    if(x) shiftX = val; else shiftY = val;
+                }).valid(Strings::canParseInt).maxTextLength(4);
+
+                table.row();
+            }
+
             cont.row();
             cont.add(table);
 
@@ -39,8 +56,12 @@ public class MapResizeDialog extends BaseDialog{
         buttons.defaults().size(200f, 50f);
         buttons.button("@cancel", this::hide);
         buttons.button("@ok", () -> {
-            cons.get(width, height);
+            cons.get(width, height, shiftX, shiftY);
             hide();
         });
     }
+
+    public interface ResizeListener{
+        void get(int width, int height, int shiftX, int shiftY);
+    }
 }
diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java
index 69ae67d7c9..4131bc2bcd 100644
--- a/core/src/mindustry/editor/MapView.java
+++ b/core/src/mindustry/editor/MapView.java
@@ -9,7 +9,6 @@ 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.util.*;
 import mindustry.graphics.*;
@@ -19,7 +18,6 @@ import mindustry.ui.*;
 import static mindustry.Vars.*;
 
 public class MapView extends Element implements GestureListener{
-    private MapEditor editor;
     EditorTool tool = EditorTool.pencil;
     private float offsetx, offsety;
     private float zoom = 1f;
@@ -35,12 +33,12 @@ public class MapView extends Element implements GestureListener{
     float mousex, mousey;
     EditorTool lastTool;
 
-    public MapView(MapEditor editor){
-        this.editor = editor;
+    public MapView(){
 
         for(int i = 0; i < MapEditor.brushSizes.length; i++){
             float size = MapEditor.brushSizes[i];
-            brushPolygons[i] = Geometry.pixelCircle(size, (index, x, y) -> Mathf.dst(x, y, index, index) <= index - 0.5f);
+            float mod = size % 1f;
+            brushPolygons[i] = Geometry.pixelCircle(size, (index, x, y) -> Mathf.dst(x, y, index - mod, index - mod) <= size - 0.5f);
         }
 
         Core.input.getInputProcessors().insert(0, new GestureDetector(20, 0.5f, 2, 0.15f, this));
@@ -92,7 +90,7 @@ public class MapView extends Element implements GestureListener{
                 lasty = p.y;
                 startx = p.x;
                 starty = p.y;
-                tool.touched(editor, p.x, p.y);
+                tool.touched(p.x, p.y);
                 firstTouch.set(p);
 
                 if(tool.edit){
@@ -115,7 +113,7 @@ public class MapView extends Element implements GestureListener{
 
                 if(tool == EditorTool.line){
                     ui.editor.resetSaved();
-                    tool.touchedLine(editor, startx, starty, p.x, p.y);
+                    tool.touchedLine(startx, starty, p.x, p.y);
                 }
 
                 editor.flushOp();
@@ -136,7 +134,7 @@ public class MapView extends Element implements GestureListener{
 
                 if(drawing && tool.draggable && !(p.x == lastx && p.y == lasty)){
                     ui.editor.resetSaved();
-                    Bresenham2.line(lastx, lasty, p.x, p.y, (cx, cy) -> tool.touched(editor, cx, cy));
+                    Bresenham2.line(lastx, lasty, p.x, p.y, (cx, cy) -> tool.touched(cx, cy));
                 }
 
                 if(tool == EditorTool.line && tool.mode == 1){
@@ -179,26 +177,26 @@ public class MapView extends Element implements GestureListener{
     public void act(float delta){
         super.act(delta);
 
-        if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) && !Core.input.keyDown(KeyCode.controlLeft)){
+        if(Core.scene.getKeyboardFocus() == null || !Core.scene.hasField() && !Core.input.keyDown(KeyCode.controlLeft)){
             float ax = Core.input.axis(Binding.move_x);
             float ay = Core.input.axis(Binding.move_y);
-            offsetx -= ax * 15f / zoom;
-            offsety -= ay * 15f / zoom;
+            offsetx -= ax * 15 * Time.delta / zoom;
+            offsety -= ay * 15 * Time.delta / zoom;
         }
 
-        if(Core.input.keyTap(KeyCode.shiftLeft)){
+        if(Core.input.keyTap(KeyCode.shiftLeft) || Core.input.keyTap(KeyCode.altLeft)){
             lastTool = tool;
             tool = EditorTool.pick;
         }
 
-        if(Core.input.keyRelease(KeyCode.shiftLeft) && lastTool != null){
+        if((Core.input.keyRelease(KeyCode.shiftLeft) || Core.input.keyRelease(KeyCode.altLeft)) && lastTool != null){
             tool = lastTool;
             lastTool = null;
         }
 
         if(Core.scene.getScrollFocus() != this) return;
 
-        zoom += Core.input.axis(KeyCode.scroll) / 10f * zoom;
+        zoom += Core.input.axis(Binding.zoom) / 10f * zoom;
         clampZoom();
     }
 
@@ -243,14 +241,14 @@ public class MapView extends Element implements GestureListener{
 
         image.setImageSize(editor.width(), editor.height());
 
-        if(!ScissorStack.push(rect.set(x, y + Core.scene.marginBottom, width, height))){
+        if(!ScissorStack.push(rect.set(x + Core.scene.marginLeft, y + Core.scene.marginBottom, width, height))){
             return;
         }
 
         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 + Core.scene.marginBottom, sclwidth, sclheight);
+        editor.renderer.draw(centerx - sclwidth / 2 + Core.scene.marginLeft, centery - sclheight / 2 + Core.scene.marginBottom, sclwidth, sclheight);
         Draw.reset();
 
         if(grid){
@@ -258,6 +256,13 @@ public class MapView extends Element implements GestureListener{
             image.setBounds(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
             image.draw();
 
+            Lines.stroke(2f);
+            Draw.color(Pal.bulletYellowBack);
+            Lines.line(centerx - sclwidth/2f, centery - sclheight/4f, centerx + sclwidth/2f, centery - sclheight/4f);
+            Lines.line(centerx - sclwidth/4f, centery - sclheight/2f, centerx - sclwidth/4f, centery + sclheight/2f);
+            Lines.line(centerx - sclwidth/2f, centery + sclheight/4f, centerx + sclwidth/2f, centery + sclheight/4f);
+            Lines.line(centerx + sclwidth/4f, centery - sclheight/2f, centerx + sclwidth/4f, centery + sclheight/2f);
+
             Lines.stroke(3f);
             Draw.color(Pal.accent);
             Lines.line(centerx - sclwidth/2f, centery, centerx + sclwidth/2f, centery);
@@ -295,7 +300,7 @@ public class MapView extends Element implements GestureListener{
 
                 //pencil square outline
                 if(tool == EditorTool.pencil && tool.mode == 1){
-                    Lines.square(v.x + scaling/2f, v.y + scaling/2f, scaling * (editor.brushSize + 0.5f));
+                    Lines.square(v.x + scaling/2f, v.y + scaling/2f, scaling * ((editor.brushSize == 1.5f ? 1f : editor.brushSize) + 0.5f));
                 }else{
                     Lines.poly(brushPolygons[index], v.x, v.y, scaling);
                 }
@@ -324,7 +329,7 @@ public class MapView extends Element implements GestureListener{
         return Core.scene != null && Core.scene.getKeyboardFocus() != null
         && Core.scene.getKeyboardFocus().isDescendantOf(ui.editor)
         && ui.editor.isShown() && tool == EditorTool.zoom &&
-        Core.scene.hit(Core.input.mouse().x, Core.input.mouse().y, true) == this;
+        Core.scene.getHoverElement() == this;
     }
 
     @Override
diff --git a/core/src/mindustry/editor/SectorGenerateDialog.java b/core/src/mindustry/editor/SectorGenerateDialog.java
new file mode 100644
index 0000000000..4d0b8bcb37
--- /dev/null
+++ b/core/src/mindustry/editor/SectorGenerateDialog.java
@@ -0,0 +1,108 @@
+package mindustry.editor;
+
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+
+import static mindustry.Vars.*;
+
+public class SectorGenerateDialog extends BaseDialog{
+    Planet planet = Planets.erekir;
+    int sector = 0, seed = 0;
+
+    public SectorGenerateDialog(){
+        super("@editor.sectorgenerate");
+        setup();
+    }
+
+    void setup(){
+        cont.clear();
+        buttons.clear();
+
+        addCloseButton();
+
+        cont.defaults().left();
+
+        cont.add("@editor.planet").padRight(10f);
+
+        cont.button(planet.localizedName, () -> {
+            BaseDialog dialog = new BaseDialog("");
+            dialog.cont.pane(p -> {
+                p.background(Tex.button).margin(10f);
+                int i = 0;
+
+                for(var plan : content.planets()){
+                    if(plan.generator == null || plan.sectors.size == 0 || !plan.accessible) continue;
+
+                    p.button(plan.localizedName, Styles.flatTogglet, () -> {
+                        planet = plan;
+                        sector = Math.min(sector, planet.sectors.size - 1);
+                        seed = 0;
+                        dialog.hide();
+                    }).size(110f, 45f).checked(planet == plan);
+
+                    if(++i % 4 == 0){
+                        p.row();
+                    }
+                }
+            });
+            dialog.setFillParent(false);
+            dialog.addCloseButton();
+            dialog.show();
+        }).size(200f, 40f).get().getLabel().setText(() -> planet.localizedName);
+
+        cont.row();
+
+        cont.add("@editor.sector").padRight(10f);
+
+        cont.field(sector + "", text -> {
+            sector = Strings.parseInt(text);
+        }).width(200f).valid(text -> planet.sectors.size > Strings.parseInt(text, 99999) && Strings.parseInt(text, 9999) >= 0);
+
+        cont.row();
+
+        cont.add("@editor.seed").padRight(10f);
+
+        cont.field(seed + "", text -> {
+            seed = Strings.parseInt(text);
+        }).width(200f).valid(Strings::canParseInt);
+
+        cont.row();
+
+        cont.label(() -> "[ " + planet.sectors.get(sector).getSize() + "x" + planet.sectors.get(sector).getSize() + " ]").color(Pal.accent).center().labelAlign(Align.center).padTop(5).colspan(2);
+
+        buttons.button("@editor.apply", Icon.ok, () -> {
+            ui.loadAnd(() -> {
+                apply();
+                hide();
+            });
+        });
+    }
+
+    void apply(){
+        ui.loadAnd(() -> {
+            editor.clearOp();
+            editor.load(() -> {
+                var sectorobj = planet.sectors.get(sector);
+
+                //remove presets during generation: massive hack, but it works
+                var preset = sectorobj.preset;
+                sectorobj.preset = null;
+
+                logic.reset(); //TODO: is this a good idea? all rules and map state are cleared, but it fixes inconsistent gen
+                world.loadSector(sectorobj, seed, false);
+
+                sectorobj.preset = preset;
+
+                editor.updateRenderer();
+                state.rules.sector = null;
+                //clear extra filters
+                editor.tags.put("genfilters", "{}");
+            });
+        });
+    }
+}
diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java
index d6a33bf6ff..11e6e6cfe8 100644
--- a/core/src/mindustry/editor/WaveGraph.java
+++ b/core/src/mindustry/editor/WaveGraph.java
@@ -1,8 +1,13 @@
 package mindustry.editor;
 
+import arc.*;
 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.*;
@@ -17,7 +22,6 @@ import mindustry.ui.*;
 
 public class WaveGraph extends Table{
     public Seq<SpawnGroup> groups = new Seq<>();
-    public int from = 0, to = 20;
 
     private Mode mode = Mode.counts;
     private int[][] values;
@@ -26,41 +30,114 @@ public class WaveGraph extends Table{
     private float maxHealth;
     private Table colors;
     private ObjectSet<UnitType> hidden = new ObjectSet<>();
+    private StringBuilder countStr = new StringBuilder();
+
+    private float pan;
+    private float zoom = 1f;
+    private int from = 0, to = 20;
+    private int lastFrom = -1, lastTo = -1;
+    private float lastZoom = -1f;
+
+    private float defaultSpace = Scl.scl(40f);
+    private FloatSeq points = new FloatSeq(40);
 
     public WaveGraph(){
         background(Tex.pane);
 
+        scrolled((scroll) -> {
+            zoom -= scroll * 2f / 10f * zoom;
+            clampZoom();
+        });
+
+        touchable = Touchable.enabled;
+        addListener(new InputListener(){
+
+            @Override
+            public void enter(InputEvent event, float x, float y, int pointer, Element fromActor){
+                requestScroll();
+            }
+        });
+
+        addListener(new ElementGestureListener(){
+            @Override
+            public void pan(InputEvent event, float x, float y, float deltaX, float deltaY){
+                pan -= deltaX/zoom;
+            }
+
+            @Override
+            public void zoom(InputEvent event, float initialDistance, float distance){
+                if(lastZoom < 0) lastZoom = zoom;
+
+                zoom = distance / initialDistance * lastZoom;
+                clampZoom();
+            }
+
+            @Override
+            public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
+                lastZoom = zoom;
+            }
+        });
+
         rect((x, y, width, height) -> {
             Lines.stroke(Scl.scl(3f));
+            countStr.setLength(0);
+
+            Vec2 mouse = stageToLocalCoordinates(Core.input.mouse());
 
             GlyphLayout lay = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
             Font font = Fonts.outline;
 
+            int maxY = switch(mode){
+                case counts -> nextStep(max);
+                case health -> nextStep((int)maxHealth);
+                case totals -> nextStep(maxTotal);
+            };
+
             lay.setText(font, "1");
 
-            float fh = lay.height;
-            float offsetX = Scl.scl(30f), offsetY = Scl.scl(22f) + fh + Scl.scl(5f);
+            float spacing = zoom * defaultSpace;
+            pan = Math.max(pan, (width/2f)/zoom-defaultSpace);
 
-            float graphX = x + offsetX, graphY = y + offsetY, graphW = width - offsetX, graphH = height - offsetY;
-            float spacing = graphW / (values.length - 1);
+            float fh = lay.height;
+            float offsetX = 0f, offsetY = Scl.scl(22f) + fh + Scl.scl(5f);
+            float graphX = x + offsetX - pan * zoom + width/2f, graphY = y + offsetY, graphW = width - offsetX, graphH = height - offsetY;
+
+            float left = (x-graphX)/spacing, right = (x + width - graphX)/spacing;
+
+            //int radius = Mathf.ceil(graphW / spacing / 2f);
+
+            from = (int)left - 1;
+            to = (int)right + 1;
+
+            if(lastFrom != from || lastTo != to){
+                rebuild();
+            }
+
+            lastFrom = from;
+            lastTo = to;
+
+            if(!clipBegin(x + offsetX, y + offsetY, graphW, graphH)) return;
+
+            int selcol = Rect.contains(x, y, width, height, mouse.x, mouse.y) ? Mathf.round((mouse.x - graphX - (from * spacing)) / spacing) : -1;
+            if(selcol + from <= -1) selcol = -1;
 
             if(mode == Mode.counts){
                 for(UnitType type : used.orderedItems()){
                     Draw.color(color(type));
                     Draw.alpha(parentAlpha);
 
-                    Lines.beginLine();
+                    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);
+                        float cx = graphX + (i+from) * spacing, cy = graphY + val * graphH / maxY;
+                        linePoint(cx, cy);
                     }
 
-                    Lines.endLine();
+                    endLine();
                 }
             }else if(mode == Mode.totals){
-                Lines.beginLine();
+                beginLine();
 
                 Draw.color(Pal.accent);
                 for(int i = 0; i < values.length; i++){
@@ -69,13 +146,13 @@ public class WaveGraph extends Table{
                         sum += values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxTotal;
-                    Lines.linePoint(cx, cy);
+                    float cx = graphX + (i+from) * spacing, cy = graphY + sum * graphH / maxY;
+                    linePoint(cx, cy);
                 }
 
-                Lines.endLine();
+                endLine();
             }else if(mode == Mode.health){
-                Lines.beginLine();
+                beginLine();
 
                 Draw.color(Pal.health);
                 for(int i = 0; i < values.length; i++){
@@ -84,37 +161,62 @@ public class WaveGraph extends Table{
                         sum += (type.health) * values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth;
-                    Lines.linePoint(cx, cy);
+                    float cx = graphX + (i+from) * spacing, cy = graphY + sum * graphH / maxY;
+                    linePoint(cx, cy);
                 }
 
-                Lines.endLine();
+                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));
+            if(selcol >= 0 && selcol < values.length){
+                Draw.color(1f, 0f, 0f, 0.2f);
+                Fill.crect((selcol+from) * spacing + graphX - spacing/2f, graphY, spacing, graphH);
+                Draw.color();
+                font.getData().setScale(1.5f);
+                for(UnitType type : used.orderedItems()){
+                    int amount = values[Mathf.clamp(selcol, 0, values.length - 1)][type.id];
+                    if(amount > 0){
+                        countStr.append(type.emoji()).append(" ").append(amount).append("\n");
+                    }
+                }
+                float pad = Scl.scl(5f);
+                font.draw(countStr, (selcol+from) * spacing + graphX - spacing/2f + pad, graphY + graphH - pad);
+                font.getData().setScale(1f);
+            }
+
+            clipEnd();
+
+            //how many numbers can fit here
+            float totalMarks = Mathf.clamp(maxY, 1, 10);
+
+            int markSpace = Math.max(1, Mathf.ceil(maxY / 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);
+            Draw.alpha(0.1f);
+
+            for(int i = 0; i < maxY; i += markSpace){
+                float cy = graphY + i * graphH / maxY, cx = x;
+
+                Lines.line(cx, cy, cx + graphW, cy);
 
                 lay.setText(font, "" + i);
 
-                font.draw("" + i, cx, cy + lay.height/2f - Scl.scl(3f), Align.right);
+                font.draw("" + i, cx, cy + lay.height / 2f, Align.left);
             }
+            Draw.alpha(1f);
 
             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;
+                float cy = y + fh, cx = graphX + spacing * (i + from);
 
-                Lines.line(cx, cy, cx, cy + len);
-                if(i == values.length/2){
-                    font.draw("" + (i + from + 1), cx, cy - 2f, Align.center);
+                if(cx >= x + offsetX && cx <= x + offsetX + graphW){
+                    Lines.line(cx, cy, cx, cy + len);
+                }
+                if(i == selcol){
+                    font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center);
                 }
             }
             font.setColor(Color.white);
@@ -142,6 +244,28 @@ public class WaveGraph extends Table{
         }).growX();
     }
 
+    private void clampZoom(){
+        zoom = Mathf.clamp(zoom, 0.5f / Scl.scl(1f), 40f / Scl.scl(1f));
+    }
+
+    private void linePoint(float x, float y){
+        points.add(x, y);
+    }
+
+    private void beginLine(){
+        points.clear();
+    }
+
+    private void endLine(){
+        var items = points.items;
+        for(int i = 0; i < points.size - 2; i += 2){
+            Lines.line(items[i], items[i + 1], items[i + 2], items[i + 3], false);
+            Fill.circle(items[i], items[i + 1], Lines.getStroke()/2f);
+        }
+        Fill.circle(items[points.size - 2], items[points.size - 1], Lines.getStroke());
+        points.clear();
+    }
+
     public void rebuild(){
         values = new int[to - from + 1][Vars.content.units().size];
         used.clear();
@@ -164,20 +288,33 @@ public class WaveGraph extends Table{
                 sum += spawned;
             }
             maxTotal = Math.max(maxTotal, sum);
-            maxHealth = Math.max(maxHealth,healthsum);
+            maxHealth = Math.max(maxHealth, healthsum);
         }
 
+        used.orderedItems().sort();
+
         ObjectSet<UnitType> usedCopy = new ObjectSet<>(used);
 
         colors.clear();
         colors.left();
+        colors.button("@waves.units.hide", Styles.flatt, () -> {
+            if(hidden.size == usedCopy.size){
+                hidden.clear();
+            }else{
+                hidden.addAll(usedCopy);
+            }
+
+            used.clear();
+            used.addAll(usedCopy);
+            for(UnitType o : hidden) used.remove(o);
+        }).update(b -> b.setText(hidden.size == usedCopy.size ? "@waves.units.show" : "@waves.units.hide")).height(32f).width(130f);
         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.image(type.uiIcon).size(32f).scaling(Scaling.fit).padRight(20).update(i -> i.setColor(b.isChecked() ? Color.gray : Color.white)).get().act(1);
                     b.margin(0f);
                 }, Styles.fullTogglet, () -> {
                     if(!hidden.add(type)){
@@ -189,7 +326,9 @@ public class WaveGraph extends Table{
                     for(UnitType o : hidden) used.remove(o);
                 }).update(b -> b.setChecked(hidden.contains(type)));
             }
-        }).get().setScrollingDisabled(false, true);
+        }).scrollY(false);
+
+        colors.act(0.000001f);
 
         for(UnitType type : hidden){
             used.remove(type);
@@ -200,6 +339,23 @@ public class WaveGraph extends Table{
         return Tmp.c1.fromHsv(type.id / (float)Vars.content.units().size * 360f, 0.7f, 1f);
     }
 
+    int nextStep(float value){
+        int order = 1;
+        while(order < value){
+            if(order * 2 > value){
+                return order * 2;
+            }
+            if(order * 5 > value){
+                return order * 5;
+            }
+            if(order * 10 > value){
+                return order * 10;
+            }
+            order *= 10;
+        }
+        return order;
+    }
+
     enum Mode{
         counts, totals, health;
 
diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
index a98d03a923..b4bc26acc2 100644
--- a/core/src/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -1,13 +1,19 @@
 package mindustry.editor;
 
 import arc.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.input.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.scene.event.*;
+import arc.scene.style.*;
 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.game.*;
 import mindustry.gen.*;
@@ -21,121 +27,121 @@ import static mindustry.Vars.*;
 import static mindustry.game.SpawnGroup.*;
 
 public class WaveInfoDialog extends BaseDialog{
-    private int displayed = 20;
     Seq<SpawnGroup> groups = new Seq<>();
+    private @Nullable SpawnGroup expandedGroup;
 
     private Table table;
-    private int start = 0;
-    private UnitType lastType = UnitTypes.dagger;
-    private float updateTimer, updatePeriod = 1f;
+    private int search = -1;
+    private @Nullable UnitType filterType;
+    private Sort sort = Sort.begin;
+    private boolean reverseSort = false;
+    private boolean checkedSpawns;
     private WaveGraph graph = new WaveGraph();
 
-    public WaveInfoDialog(MapEditor editor){
+    public WaveInfoDialog(){
         super("@waves.title");
 
-        shown(this::setup);
+        shown(() -> {
+            checkedSpawns = false;
+            setup();
+        });
         hidden(() -> state.rules.spawns = groups);
 
-        addCloseListener();
-
-        onResize(this::setup);
         addCloseButton();
 
-        buttons.button("@waves.edit", () -> {
+        buttons.button("@waves.edit", Icon.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");
-                Core.app.setClipboardText(maps.writeWaves(groups));
-                dialog.hide();
-            }).disabled(b -> groups == null);
-            dialog.cont.row();
-            dialog.cont.button("@waves.load", () -> {
-                try{
-                    groups = maps.readWaves(Core.app.getClipboardText());
+            dialog.cont.table(Tex.button, t -> {
+                var style = Styles.cleart;
+                t.defaults().size(280f, 64f).pad(2f);
+
+                t.button("@waves.copy", Icon.copy, style, () -> {
+                    ui.showInfoFade("@waves.copied");
+                    Core.app.setClipboardText(maps.writeWaves(groups));
+                    dialog.hide();
+                }).disabled(b -> groups == null || groups.isEmpty()).marginLeft(12f).row();
+
+                t.button("@waves.load", Icon.download, style, () -> {
+                    try{
+                        groups = maps.readWaves(Core.app.getClipboardText());
+                        buildGroups();
+                    }catch(Exception e){
+                        Log.err(e);
+                        ui.showErrorMessage("@waves.invalid");
+                    }
+                    dialog.hide();
+                }).disabled(Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith("[")).marginLeft(12f).row();
+
+                t.button("@clear", Icon.none, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
+                    groups.clear();
                     buildGroups();
-                }catch(Exception e){
-                    e.printStackTrace();
-                    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", () -> {
-                groups = JsonIO.copy(waves.get());
-                buildGroups();
-                dialog.hide();
-            }));
+                    dialog.hide();
+                })).marginLeft(12f).row();
+
+                t.button("@settings.reset", Icon.refresh, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
+                    groups = JsonIO.copy(waves.get());
+                    buildGroups();
+                    dialog.hide();
+                })).marginLeft(12f);
+            });
+
             dialog.show();
-        }).size(270f, 64f);
+        }).size(250f, 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);
-            }
-        });
-
-        if(experimental){
-            buttons.button("Random", Icon.refresh, () -> {
-                groups.clear();
-                groups = Waves.generate(1f / 10f);
-                updateWaves();
-            }).width(200f);
-        }
-    }
-
-    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();
-        }
+        buttons.button(Core.bundle.get("waves.random"), Icon.refresh, () -> {
+            groups.clear();
+            groups = Waves.generate(1f / 10f);
+            buildGroups();
+        }).width(200f);
     }
 
     void setup(){
         groups = JsonIO.copy(state.rules.spawns.isEmpty() ? waves.get() : state.rules.spawns);
+        if(groups == null) groups = new Seq<>();
 
         cont.clear();
         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", () -> {
-                if(groups == null) groups = new Seq<>();
-                groups.add(new SpawnGroup(lastType));
-                buildGroups();
-            }).growX().height(70f);
+            main.table(s -> {
+                s.image(Icon.zoom).padRight(8);
+                s.field(search < 0 ? "" : (search + 1) + "", TextFieldFilter.digitsOnly, text -> {
+                    search = groups.any() ? Strings.parseInt(text, 0) - 1 : -1;
+                    buildGroups();
+                }).growX().maxTextLength(8).get().setMessageText("@waves.search");
+                s.button(Icon.units, Styles.emptyi, () -> showUnits(type -> filterType = type, true)).size(46f).tooltip("@waves.filter")
+                .update(b -> b.getStyle().imageUp = filterType != null ? new TextureRegionDrawable(filterType.uiIcon) : Icon.filter);
+            }).growX().pad(6f).row();
+
+            main.pane(t -> table = t).grow().padRight(8f).scrollX(false).row();
+
+            main.table(t -> {
+                t.button("@add", () -> {
+                    showUnits(type -> groups.add(expandedGroup = new SpawnGroup(type)), false);
+                    buildGroups();
+                }).growX().height(70f);
+
+                t.button(Icon.filter, () -> {
+                    BaseDialog dialog = new BaseDialog("@waves.sort");
+                    dialog.setFillParent(false);
+                    dialog.cont.table(Tex.button, f -> {
+                        for(Sort s : Sort.all){
+                            f.button("@waves.sort." + s, Styles.flatTogglet, () -> {
+                                sort = s;
+                                dialog.hide();
+                                buildGroups();
+                            }).size(150f, 60f).checked(s == sort);
+                        }
+                    }).row();
+                    dialog.cont.check("@waves.sort.reverse", b -> {
+                        reverseSort = b;
+                        buildGroups();
+                    }).padTop(4).checked(reverseSort).padBottom(8f);
+                    dialog.addCloseButton();
+                    dialog.show();
+                }).size(64f, 70f).padLeft(6f);
+            }).growX();
+
         }), new Label("@waves.none"){{
             visible(() -> groups.isEmpty());
             this.touchable = Touchable.disabled;
@@ -154,99 +160,195 @@ public class WaveInfoDialog extends BaseDialog{
         table.margin(10f);
 
         if(groups != null){
+            groups.sort(Structs.comps(Structs.comparingFloat(sort.sort), Structs.comparingFloat(sort.secondary)));
+            if(reverseSort) groups.reverse();
 
             for(SpawnGroup group : groups){
+                if(group.effect == StatusEffects.none) group.effect = null;
+                if((search >= 0 && group.getSpawned(search) <= 0) || (filterType != null && group.type != filterType)) continue;
+
                 table.table(Tex.button, t -> {
                     t.margin(0).defaults().pad(3).padLeft(5f).growX().left();
                     t.button(b -> {
                         b.left();
-                        b.image(group.type.icon(Cicon.medium)).size(32f).padRight(3).scaling(Scaling.fit);
-                        b.add(group.type.localizedName).color(Pal.accent);
+                        b.image(group.type.uiIcon).size(32f).padRight(3).scaling(Scaling.fit);
+                        b.add(group.type.localizedName).ellipsis(true).width(110f).left().color(Pal.accent);
 
                         b.add().growX();
 
-                        b.button(Icon.cancel, () -> {
+                        b.label(() -> (group.begin + 1) + "").color(Color.lightGray).minWidth(45f).labelAlign(Align.left).left();
+
+                        b.button(Icon.copySmall, Styles.emptyi, () -> {
+                            groups.insert(groups.indexOf(group) + 1, expandedGroup = group.copy());
+                            buildGroups();
+                        }).pad(-6).size(46f).tooltip("@editor.copy");
+
+                        b.button(group.effect != null ?
+                            new TextureRegionDrawable(group.effect.uiIcon) :
+                            Icon.logicSmall,
+                        Styles.emptyi, () -> showEffects(group)).pad(-6).size(46f).scaling(Scaling.fit).tooltip(group.effect != null ? group.effect.localizedName : "@none");
+
+                        b.button(Icon.unitsSmall, Styles.emptyi, () -> showUnits(type -> group.type = type, false)).pad(-6).size(46f).tooltip("@stat.unittype");
+                        b.button(Icon.cancel, Styles.emptyi, () -> {
                             groups.remove(group);
+                            if(expandedGroup == group) expandedGroup = null;
                             table.getCell(t).pad(0f);
                             t.remove();
-                            updateWaves();
-                        }).pad(-6).size(46f).padRight(-12f);
-                    }, () -> showUpdate(group)).height(46f).pad(-6f).padBottom(0f);
+                            buildGroups();
+                        }).pad(-6).size(46f).padRight(-12f).tooltip("@waves.remove");
+                        b.clicked(KeyCode.mouseMiddle, () -> {
+                            groups.insert(groups.indexOf(group) + 1, expandedGroup = group.copy());
+                            buildGroups();
+                        });
+                    }, () -> {
+                        expandedGroup = expandedGroup == group ? null : group;
+                        buildGroups();
+                    }).height(46f).pad(-6f).padBottom(0f).row();
 
-                    t.row();
-                    t.table(spawns -> {
-                        spawns.field("" + (group.begin + 1), TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePositiveInt(text)){
-                                group.begin = Strings.parseInt(text) - 1;
-                                updateWaves();
-                            }
-                        }).width(100f);
-                        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;
-                                updateWaves();
-                            }else if(text.isEmpty()){
-                                group.end = never;
-                                updateWaves();
-                            }
-                        }).width(100f).get().setMessageText(Core.bundle.get("waves.never"));
-                    });
-                    t.row();
-                    t.table(p -> {
-                        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);
-                    });
+                    if(expandedGroup == group){
+                        t.table(spawns -> {
+                            spawns.field("" + (group.begin + 1), TextFieldFilter.digitsOnly, text -> {
+                                if(Strings.canParsePositiveInt(text)){
+                                    group.begin = Strings.parseInt(text) - 1;
+                                    updateWaves();
+                                }
+                            }).width(100f);
+                            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;
+                                    updateWaves();
+                                }else if(text.isEmpty()){
+                                    group.end = never;
+                                    updateWaves();
+                                }
+                            }).width(100f).get().setMessageText("∞");
+                        }).row();
 
-                    t.row();
-                    t.table(a -> {
-                        a.field(group.unitAmount + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePositiveInt(text)){
-                                group.unitAmount = Strings.parseInt(text);
-                                updateWaves();
-                            }
-                        }).width(80f);
+                        t.table(p -> {
+                            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);
+                        }).row();
 
-                        a.add(" + ");
-                        a.field(Strings.fixed(Math.max((Mathf.zero(group.unitScaling) ? 0 : 1f / group.unitScaling), 0), 2), TextFieldFilter.floatsOnly, text -> {
-                            if(Strings.canParsePositiveFloat(text)){
-                                group.unitScaling = 1f / Strings.parseFloat(text);
-                                updateWaves();
-                            }
-                        }).width(80f);
-                        a.add("@waves.perspawn").padLeft(4);
-                    });
-                    t.row();
-                    t.table(a -> {
-                        a.field((int)group.shields + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePositiveInt(text)){
-                                group.shields = Strings.parseInt(text);
-                                updateWaves();
-                            }
-                        }).width(80f);
+                        t.table(a -> {
+                            a.field(group.unitAmount + "", TextFieldFilter.digitsOnly, text -> {
+                                if(Strings.canParsePositiveInt(text)){
+                                    group.unitAmount = Strings.parseInt(text);
+                                    updateWaves();
+                                }
+                            }).width(80f);
 
-                        a.add(" + ");
-                        a.field((int)group.shieldScaling + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePositiveInt(text)){
-                                group.shieldScaling = Strings.parseInt(text);
-                                updateWaves();
-                            }
-                        }).width(80f);
-                        a.add("@waves.shields").padLeft(4);
-                    });
+                            a.add(" + ");
+                            a.field(Strings.fixed(Math.max((Mathf.zero(group.unitScaling) ? 0 : 1f / group.unitScaling), 0), 2), TextFieldFilter.floatsOnly, text -> {
+                                if(Strings.canParsePositiveFloat(text)){
+                                    group.unitScaling = 1f / Strings.parseFloat(text);
+                                    updateWaves();
+                                }
+                            }).width(80f);
+                            a.add("@waves.perspawn").padLeft(4);
+                        }).row();
 
-                    t.row();
-                    t.check("@waves.guardian", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss)).padBottom(8f);
+                        t.table(a -> {
+                            a.field(group.max + "", TextFieldFilter.digitsOnly, text -> {
+                                if(Strings.canParsePositiveInt(text)){
+                                    group.max = Strings.parseInt(text);
+                                    updateWaves();
+                                }
+                            }).width(80f);
+
+                            a.add("@waves.max").padLeft(5);
+                        }).row();
+
+                        t.table(a -> {
+                            a.field((int)group.shields + "", TextFieldFilter.digitsOnly, text -> {
+                                if(Strings.canParsePositiveInt(text)){
+                                    group.shields = Strings.parseInt(text);
+                                    updateWaves();
+                                }
+                            }).width(80f);
+
+                            a.add(" + ");
+                            a.field((int)group.shieldScaling + "", TextFieldFilter.digitsOnly, text -> {
+                                if(Strings.canParsePositiveInt(text)){
+                                    group.shieldScaling = Strings.parseInt(text);
+                                    updateWaves();
+                                }
+                            }).width(80f);
+                            a.add("@waves.shields").padLeft(4);
+                        }).row();
+
+                        t.check("@waves.guardian", b -> {
+                            group.effect = (b ? StatusEffects.boss : null);
+                            buildGroups();
+                        }).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss)).padBottom(8f).row();
+
+                        t.table(a -> {
+                            a.add("@waves.spawn").padRight(8);
+
+                            a.button("", () -> {
+                                if(!checkedSpawns){
+                                    //recalculate waves when changed
+                                    Vars.spawner.reset();
+                                    checkedSpawns = true;
+                                }
+
+                                BaseDialog dialog = new BaseDialog("@waves.spawn.select");
+                                dialog.cont.pane(p -> {
+                                    p.background(Tex.button).margin(10f);
+                                    int i = 0;
+                                    int cols = 4;
+                                    int max = 20;
+
+                                    if(spawner.getSpawns().size >= max){
+                                        p.add("[lightgray](first " + max + ")").colspan(cols).padBottom(4).row();
+                                    }
+
+                                    for(var spawn : spawner.getSpawns()){
+                                        p.button(spawn.x + ", " + spawn.y, Styles.flatTogglet, () -> {
+                                            group.spawn = Point2.pack(spawn.x, spawn.y);
+                                            dialog.hide();
+                                        }).size(110f, 45f).checked(spawn.pos() == group.spawn);
+
+                                        if(++i % cols == 0){
+                                            p.row();
+                                        }
+
+                                        //only display first 20 spawns, you don't need to see more.
+                                        if(i >= 20){
+                                            break;
+                                        }
+                                    }
+
+                                    if(spawner.getSpawns().isEmpty()){
+                                        p.add("@waves.spawn.none");
+                                    }else{
+                                        p.button("@waves.spawn.all", Styles.flatTogglet, () -> {
+                                            group.spawn = -1;
+                                            dialog.hide();
+                                        }).size(110f, 45f).checked(-1 == group.spawn);
+                                    }
+                                }).grow();
+                                dialog.setFillParent(false);
+                                dialog.addCloseButton();
+                                dialog.show();
+                            }).width(160f).height(36f).get().getLabel().setText(() -> group.spawn == -1 ? "@waves.spawn.all" : Point2.x(group.spawn) + ", " + Point2.y(group.spawn));
+
+                        }).padBottom(8f).row();
+                    }
                 }).width(340f).pad(8);
 
                 table.row();
             }
+
+            if(table.getChildren().isEmpty() && groups.any()){
+                table.add("@none.found");
+            }
         }else{
             table.add("@editor.default");
         }
@@ -254,33 +356,93 @@ public class WaveInfoDialog extends BaseDialog{
         updateWaves();
     }
 
-    void showUpdate(SpawnGroup group){
-        BaseDialog dialog = new BaseDialog("");
-        dialog.setFillParent(true);
+    void showUnits(Cons<UnitType> cons, boolean reset){
+        BaseDialog dialog = new BaseDialog(reset ? "@waves.filter" : "");
         dialog.cont.pane(p -> {
-            int i = 0;
+            p.defaults().pad(2).fillX();
+            if(reset){
+                p.button(t -> {
+                    t.left();
+                    t.image(Icon.none).size(8 * 4).scaling(Scaling.fit).padRight(2f);
+                    t.add("@settings.resetKey");
+                }, () -> {
+                    cons.get(null);
+                    dialog.hide();
+                    buildGroups();
+                }).margin(12f);
+            }
+            int i = reset ? 1 : 0;
             for(UnitType type : content.units()){
                 if(type.isHidden()) continue;
                 p.button(t -> {
                     t.left();
-                    t.image(type.icon(Cicon.medium)).size(8 * 4).scaling(Scaling.fit).padRight(2f);
+                    t.image(type.uiIcon).size(8 * 4).scaling(Scaling.fit).padRight(2f);
                     t.add(type.localizedName);
                 }, () -> {
-                    lastType = type;
-                    group.type = type;
+                    cons.get(type);
                     dialog.hide();
                     buildGroups();
-                }).pad(2).margin(12f).fillX();
+                }).margin(12f);
                 if(++i % 3 == 0) p.row();
             }
-        });
+        }).growX().scrollX(false);
+        dialog.addCloseButton();
         dialog.show();
     }
 
+    void showEffects(SpawnGroup group){
+        BaseDialog dialog = new BaseDialog("");
+        dialog.cont.pane(p -> {
+            p.defaults().pad(2).fillX();
+            p.button(t -> {
+                t.left();
+                t.image(Icon.none).size(8 * 4).scaling(Scaling.fit).padRight(2f);
+                t.add("@settings.resetKey");
+            }, () -> {
+                group.effect = null;
+                dialog.hide();
+                buildGroups();
+            }).margin(12f);
+            int i = 1;
+            for(StatusEffect effect : content.statusEffects()){
+                if(effect.isHidden() || effect.reactive) continue;
+                p.button(t -> {
+                    t.left();
+                    t.image(effect.uiIcon).size(8 * 4).scaling(Scaling.fit).padRight(2f);
+                    t.add(effect.localizedName);
+                }, () -> {
+                    group.effect = effect;
+                    dialog.hide();
+                    buildGroups();
+                }).margin(12f);
+                if(++i % 3 == 0) p.row();
+            }
+        }).growX().scrollX(false);
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    enum Sort{
+        begin(g -> g.begin, g -> g.type.id),
+        health(g -> g.type.health),
+        type(g -> g.type.id);
+
+        static final Sort[] all = values();
+
+        final Floatf<SpawnGroup> sort, secondary;
+
+        Sort(Floatf<SpawnGroup> sort){
+            this(sort, g -> g.begin);
+        }
+
+        Sort(Floatf<SpawnGroup> sort, Floatf<SpawnGroup> secondary){
+            this.sort = sort;
+            this.secondary = secondary;
+        }
+    }
+
     void updateWaves(){
         graph.groups = groups;
-        graph.from = start;
-        graph.to = start + displayed;
         graph.rebuild();
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java
index 9ddca6e986..7f13c16546 100644
--- a/core/src/mindustry/entities/Damage.java
+++ b/core/src/mindustry/entities/Damage.java
@@ -2,11 +2,12 @@ package mindustry.entities;
 
 import arc.*;
 import arc.func.*;
+import arc.graphics.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
-import mindustry.annotations.Annotations.*;
+import arc.util.pooling.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.game.EventType.*;
@@ -15,33 +16,81 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 /** Utility class for damaging in an area. */
 public class Damage{
+    private static final UnitDamageEvent bulletDamageEvent = new UnitDamageEvent();
+    private static final Rect rect = new Rect();
+    private static final Rect hitrect = new Rect();
+    private static final Vec2 vec = new Vec2(), seg1 = new Vec2(), seg2 = new Vec2();
+    private static final IntSet collidedBlocks = new IntSet();
+    private static final IntFloatMap damages = new IntFloatMap();
+    private static final Seq<Collided> collided = new Seq<>();
+    private static final Pool<Collided> collidePool = Pools.get(Collided.class, Collided::new);
+    private static final Seq<Building> builds = new Seq<>();
+    private static final FloatSeq distances = new FloatSeq();
+
     private static Tile furthest;
-    private static Rect rect = new Rect();
-    private static Rect hitrect = new Rect();
-    private static Vec2 tr = new Vec2(), seg1 = new Vec2(), seg2 = new Vec2();
-    private static Seq<Unit> units = new Seq<>();
-    private static GridBits bits = new GridBits(30, 30);
-    private static IntQueue propagation = new IntQueue();
-    private static IntSet collidedBlocks = new IntSet();
+    private static float maxDst = 0f;
     private static Building tmpBuilding;
     private static Unit tmpUnit;
 
+    public static void applySuppression(Team team, float x, float y, float range, float reload, float maxDelay, float applyParticleChance, @Nullable Position source){
+        applySuppression(team, x, y, range, reload, maxDelay, applyParticleChance, source, Pal.sapBullet);
+    }
+
+    public static void applySuppression(Team team, float x, float y, float range, float reload, float maxDelay, float applyParticleChance, @Nullable Position source, Color effectColor){
+        builds.clear();
+        indexer.eachBlock(null, x, y, range, build -> build.team != team, build -> {
+            float prev = build.healSuppressionTime;
+            build.applyHealSuppression(reload + 1f, effectColor);
+
+            //TODO maybe should be block field instead of instanceof check
+            if(build.wasRecentlyHealed(60f * 12f) || build.block.suppressable){
+
+                //add prev check so ability spam doesn't lead to particle spam (essentially, recently suppressed blocks don't get new particles)
+                if(!headless && prev - Time.time <= reload/2f){
+                    builds.add(build);
+                }
+            }
+        });
+
+        //to prevent particle spam, the amount of particles is to remain constant (scales with number of buildings)
+        float scaledChance = applyParticleChance / builds.size;
+        for(var build : builds){
+            if(Mathf.chance(scaledChance)){
+                Time.run(Mathf.random(maxDelay), () -> {
+                    Fx.regenSuppressSeek.at(build.x + Mathf.range(build.block.size * tilesize / 2f), build.y + Mathf.range(build.block.size * tilesize / 2f), 0f, effectColor, source);
+                });
+            }
+        }
+    }
+
     /** Creates a dynamic explosion based on specified parameters. */
     public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, boolean damage){
-        dynamicExplosion(x, y, flammability, explosiveness, power, radius, damage, true, null);
+        dynamicExplosion(x, y, flammability, explosiveness, power, radius, damage, true, null, Fx.dynamicExplosion);
+    }
+
+    /** Creates a dynamic explosion based on specified parameters. */
+    public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, boolean damage, Effect explosionFx){
+        dynamicExplosion(x, y, flammability, explosiveness, power, radius, damage, true, null, explosionFx);
     }
 
     /** Creates a dynamic explosion based on specified parameters. */
     public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, boolean damage, boolean fire, @Nullable Team ignoreTeam){
+        dynamicExplosion(x, y, flammability, explosiveness, power, radius, damage, fire, ignoreTeam, Fx.dynamicExplosion);
+    }
+
+    /** Creates a dynamic explosion based on specified parameters. */
+    public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, boolean damage, boolean fire, @Nullable Team ignoreTeam, Effect explosionFx){
         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(power / 700, 0, 8); i++){
+                int length = 5 + Mathf.clamp((int)(Mathf.pow(power, 0.98f) / 500), 1, 18);
+                Time.run(i * 0.8f + Mathf.random(4f), () -> Lightning.create(Team.derelict, Pal.power, 3 + Mathf.pow(power, 0.35f), x, y, Mathf.random(360f), length + Mathf.range(2)));
             }
 
             if(fire){
@@ -50,12 +99,17 @@ public class Damage{
                 }
             }
 
-            int waves = Mathf.clamp((int)(explosiveness / 4), 0, 30);
+            int waves = explosiveness <= 2 ? 0 : Mathf.clamp((int)(explosiveness / 11), 1, 25);
+            float damagePerWave = explosiveness / 2f;
 
             for(int i = 0; i < waves; i++){
+                var shields = ignoreTeam == null ? null : indexer.getEnemy(ignoreTeam, BlockFlag.shield);
                 int f = i;
                 Time.run(i * 2f, () -> {
-                    Damage.damage(ignoreTeam, x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), explosiveness / 2f, false);
+                    if(shields == null || shields.isEmpty() || !shields.contains(b -> b instanceof ExplosionShield s && s.absorbExplosion(x, y, damagePerWave))){
+                        damage(ignoreTeam, x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), damagePerWave, false);
+                    }
+
                     Fx.blockExplosionSmoke.at(x + Mathf.range(radius), y + Mathf.range(radius));
                 });
             }
@@ -71,7 +125,7 @@ public class Damage{
 
         float shake = Math.min(explosiveness / 4f + 3f, 9f);
         Effect.shake(shake, shake, x, y);
-        Fx.dynamicExplosion.at(x, y, radius / 8f);
+        explosionFx.at(x, y, radius / 8f);
     }
 
     public static void createIncend(float x, float y, float range, int amount){
@@ -85,22 +139,86 @@ public class Damage{
         }
     }
 
+    public static @Nullable Building findAbsorber(Team team, float x1, float y1, float x2, float y2){
+        tmpBuilding = null;
+
+        boolean found = World.raycast(World.toTile(x1), World.toTile(y1), World.toTile(x2), World.toTile(y2),
+        (x, y) -> (tmpBuilding = world.build(x, y)) != null && tmpBuilding.team != team && tmpBuilding.block.absorbLasers);
+
+        return found ? tmpBuilding : null;
+    }
+
+    public static float findLength(Bullet b, float length, boolean laser, int pierceCap){
+        if(pierceCap > 0){
+            length = findPierceLength(b, pierceCap, laser, length);
+        }else if(laser){
+            length = findLaserLength(b, length);
+        }
+
+        return length;
+    }
+
     public static float findLaserLength(Bullet b, float length){
-        Tmp.v1.trns(b.rotation(), length);
+        vec.trnsExact(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);
+        boolean found = World.raycast(b.tileX(), b.tileY(), World.toTile(b.x + vec.x), World.toTile(b.y + vec.y),
+        (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && (furthest.build != null && furthest.build.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);
+    public static float findPierceLength(Bullet b, int pierceCap, float length){
+        return findPierceLength(b, pierceCap, b.type.laserAbsorb, length);
+    }
 
-        collideLine(b, b.team, b.type.hitEffect, b.x, b.y, b.rotation(), resultLength, large);
+    public static float findPierceLength(Bullet b, int pierceCap, boolean laser, float length){
+        vec.trnsExact(b.rotation(), length);
+        rect.setPosition(b.x, b.y).setSize(vec.x, vec.y).normalize().grow(3f);
+
+        maxDst = Float.POSITIVE_INFINITY;
+
+        distances.clear();
+
+        if(b.type.collidesGround && b.type.collidesTiles){
+            World.raycast(b.tileX(), b.tileY(), World.toTile(b.x + vec.x), World.toTile(b.y + vec.y), (x, y) -> {
+                //add distance to list so it can be processed
+                var build = world.build(x, y);
+
+                if(build != null && build.team != b.team && build.collide(b) && b.checkUnderBuild(build, x * tilesize, y * tilesize)){
+                    distances.add(b.dst(build));
+
+                    if(laser && build.absorbLasers()){
+                        maxDst = Math.min(maxDst, b.dst(build));
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+        }
+
+        Units.nearbyEnemies(b.team, rect, u -> {
+            u.hitbox(hitrect);
+
+            if(u.checkTarget(b.type.collidesAir, b.type.collidesGround) && u.hittable() && Intersector.intersectSegmentRectangle(b.x, b.y, b.x + vec.x, b.y + vec.y, hitrect)){
+                distances.add(u.dst(b));
+            }
+        });
+
+        distances.sort();
+
+        //return either the length when not enough things were pierced,
+        //or the last pierced object if there were enough blockages
+        return Math.min(distances.size < pierceCap || pierceCap < 0 ? length : Math.max(6f, distances.get(pierceCap - 1)), maxDst);
+    }
+
+    /** 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, boolean laser, int pierceCap){
+        float resultLength = findPierceLength(b, pierceCap, laser, length);
+
+        collideLine(b, b.team, b.type.hitEffect, b.x, b.y, b.rotation(), resultLength, large, laser, pierceCap);
 
         b.fdata = resultLength;
 
@@ -116,88 +234,128 @@ 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);
+        collideLine(hitter, team, effect, x, y, angle, length, large, true);
+    }
+
+    /**
+     * Damages entities in a line.
+     * 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, boolean laser){
+        collideLine(hitter, team, effect, x, y, angle, length, large, laser, -1);
+    }
+
+    /**
+     * Damages entities in a line.
+     * 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, boolean laser, int pierceCap){
+        length = findLength(hitter, length, laser, pierceCap);
+        hitter.fdata = length;
 
         collidedBlocks.clear();
-        tr.trns(angle, length);
+        vec.trnsExact(angle, length);
 
-        Intc2 collider = (cx, cy) -> {
-            Building tile = world.build(cx, cy);
-            boolean collide = tile != null && collidedBlocks.add(tile.pos());
-
-            if(hitter.damage > 0){
-                float health = !collide ? 0 : tile.health;
-
-                if(collide && tile.team != team && tile.collide(hitter)){
-                    tile.collision(hitter);
-                    hitter.type.hit(hitter, tile.x, tile.y);
-                }
-
-                //try to heal the tile
-                if(collide && hitter.type.testCollision(hitter, tile)){
-                    hitter.type.hitTile(hitter, tile, health, false);
-                }
-            }
-        };
-
-        if(hitter.type.collidesGround){
+        if(hitter.type.collidesGround && hitter.type.collidesTiles){
             seg1.set(x, y);
-            seg2.set(seg1).add(tr);
-            world.raycastEachWorld(x, y, seg2.x, seg2.y, (cx, cy) -> {
-                collider.get(cx, cy);
+            seg2.set(seg1).add(vec);
+            World.raycastEachWorld(x, y, seg2.x, seg2.y, (cx, cy) -> {
+                Building tile = world.build(cx, cy);
+                boolean collide = tile != null && tile.collide(hitter) && hitter.checkUnderBuild(tile, cx * tilesize, cy * tilesize)
+                    && ((tile.team != team && tile.collide(hitter)) || hitter.type.testCollision(hitter, tile)) && collidedBlocks.add(tile.pos());
+                if(collide){
+                    collided.add(collidePool.obtain().set(cx * tilesize, cy * tilesize, tile));
 
-                for(Point2 p : Geometry.d4){
-                    Tile other = world.tile(p.x + cx, p.y + cy);
-                    if(other != null && (large || Intersector.intersectSegmentRectangle(seg1, seg2, other.getBounds(Tmp.r1)))){
-                        collider.get(cx + p.x, cy + p.y);
+                    for(Point2 p : Geometry.d4){
+                        Tile other = world.tile(p.x + cx, p.y + cy);
+                        if(other != null && (large || Intersector.intersectSegmentRectangle(seg1, seg2, other.getBounds(Tmp.r1)))){
+                            Building build = other.build;
+                            if(build != null && hitter.checkUnderBuild(build, cx * tilesize, cy * tilesize) && collidedBlocks.add(build.pos())){
+                                collided.add(collidePool.obtain().set((p.x + cx * tilesize), (p.y + cy) * tilesize, build));
+                            }
+                        }
                     }
                 }
                 return false;
             });
         }
 
-        rect.setPosition(x, y).setSize(tr.x, tr.y);
-        float x2 = tr.x + x, y2 = tr.y + y;
-
-        if(rect.width < 0){
-            rect.x += rect.width;
-            rect.width *= -1;
-        }
-
-        if(rect.height < 0){
-            rect.y += rect.height;
-            rect.height *= -1;
-        }
-
         float expand = 3f;
 
-        rect.y -= expand;
-        rect.x -= expand;
-        rect.width += expand * 2;
-        rect.height += expand * 2;
-
-        Cons<Unit> cons = e -> {
-            e.hitbox(hitrect);
-
-            Vec2 vec = Geometry.raycastRect(x, y, x2, y2, hitrect.grow(expand * 2));
-
-            if(vec != null && hitter.damage > 0){
-                effect.at(vec.x, vec.y);
-                e.collision(hitter, vec.x, vec.y);
-                hitter.collision(e, vec.x, vec.y);
-            }
-        };
-
-        units.clear();
+        rect.setPosition(x, y).setSize(vec.x, vec.y).normalize().grow(expand * 2f);
+        float x2 = vec.x + x, y2 = vec.y + y;
 
         Units.nearbyEnemies(team, rect, u -> {
-            if(u.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround)){
-                units.add(u);
+            if(u.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround) && u.hittable()){
+                u.hitbox(hitrect);
+
+                Vec2 vec = Geometry.raycastRect(x, y, x2, y2, hitrect.grow(expand * 2));
+
+                if(vec != null){
+                    collided.add(collidePool.obtain().set(vec.x, vec.y, u));
+                }
             }
         });
 
-        units.sort(u -> u.dst2(hitter));
-        units.each(cons);
+        int[] collideCount = {0};
+        collided.sort(c -> hitter.dst2(c.x, c.y));
+        collided.each(c -> {
+            if(hitter.damage > 0 && (pierceCap <= 0 || collideCount[0] < pierceCap)){
+                if(c.target instanceof Unit u){
+                    u.collision(hitter, c.x, c.y);
+                    hitter.collision(u, c.x, c.y);
+                    collideCount[0]++;
+                }else if(c.target instanceof Building tile){
+                    float health = tile.health;
+
+                    if(tile.team != team && tile.collide(hitter)){
+                        tile.collision(hitter);
+                        hitter.type.hit(hitter, c.x, c.y);
+                        collideCount[0]++;
+                    }
+
+                    //try to heal the tile
+                    if(hitter.type.testCollision(hitter, tile)){
+                        hitter.type.hitTile(hitter, tile, c.x, c.y, health, false);
+                    }
+                }
+            }
+        });
+
+        collidePool.freeAll(collided);
+        collided.clear();
+    }
+
+    /**
+     * Damages entities on a point.
+     * Only enemies of the specified team are damaged.
+     */
+    public static void collidePoint(Bullet hitter, Team team, Effect effect, float x, float y){
+
+        if(hitter.type.collidesGround){
+            Building build = world.build(World.toTile(x), World.toTile(y));
+
+            if(build != null && hitter.damage > 0){
+                float health = build.health;
+
+                if(build.team != team && build.collide(hitter)){
+                    build.collision(hitter);
+                    hitter.type.hit(hitter, x, y);
+                }
+
+                //try to heal the tile
+                if(hitter.type.testCollision(hitter, build)){
+                    hitter.type.hitTile(hitter, build, x, y, health, false);
+                }
+            }
+        }
+
+        Units.nearbyEnemies(team, rect.setCentered(x, y, 1f), u -> {
+            if(u.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround) && u.hittable()){
+                u.collision(hitter, x, y);
+                hitter.collision(u, x, y);
+            }
+        });
     }
 
     /**
@@ -205,12 +363,12 @@ public class Damage{
      * @return the first encountered object.
      */
     public static Healthc linecast(Bullet hitter, float x, float y, float angle, float length){
-        tr.trns(angle, length);
+        vec.trns(angle, length);
+
+        tmpBuilding = null;
 
         if(hitter.type.collidesGround){
-            tmpBuilding = null;
-
-            world.raycastEachWorld(x, y, x + tr.x, y + tr.y, (cx, cy) -> {
+            World.raycastEachWorld(x, y, x + vec.x, y + vec.y, (cx, cy) -> {
                 Building tile = world.build(cx, cy);
                 if(tile != null && tile.team != hitter.team){
                     tmpBuilding = tile;
@@ -218,12 +376,10 @@ public class Damage{
                 }
                 return false;
             });
-
-            if(tmpBuilding != null) return tmpBuilding;
         }
 
-        rect.setPosition(x, y).setSize(tr.x, tr.y);
-        float x2 = tr.x + x, y2 = tr.y + y;
+        rect.setPosition(x, y).setSize(vec.x, vec.y);
+        float x2 = vec.x + x, y2 = vec.y + y;
 
         if(rect.width < 0){
             rect.x += rect.width;
@@ -244,8 +400,8 @@ public class Damage{
 
         tmpUnit = null;
 
-        Cons<Unit> cons = e -> {
-            if((tmpUnit != null && e.dst2(x, y) > tmpUnit.dst2(x, y)) || !e.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround)) return;
+        Units.nearbyEnemies(hitter.team, rect, e -> {
+            if((tmpUnit != null && e.dst2(x, y) > tmpUnit.dst2(x, y)) || !e.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround) || !e.targetable(hitter.team)) return;
 
             e.hitbox(hitrect);
             Rect other = hitrect;
@@ -259,9 +415,15 @@ public class Damage{
             if(vec != null){
                 tmpUnit = e;
             }
-        };
+        });
 
-        Units.nearbyEnemies(hitter.team, rect, cons);
+        if(tmpBuilding != null && tmpUnit != null){
+            if(Mathf.dst2(x, y, tmpBuilding.getX(), tmpBuilding.getY()) <= Mathf.dst2(x, y, tmpUnit.getX(), tmpUnit.getY())){
+                return tmpBuilding;
+            }
+        }else if(tmpBuilding != null){
+            return tmpBuilding;
+        }
 
         return tmpUnit;
     }
@@ -269,7 +431,7 @@ public class Damage{
     /** Damages all entities and blocks in a radius that are enemies of the team. */
     public static void damageUnits(Team team, float x, float y, float size, float damage, Boolf<Unit> predicate, Cons<Unit> acceptor){
         Cons<Unit> cons = entity -> {
-            if(!predicate.get(entity)) return;
+            if(!predicate.get(entity) || !entity.hittable()) return;
 
             entity.hitbox(hitrect);
             if(!hitrect.overlaps(rect)){
@@ -305,7 +467,7 @@ public class Damage{
     /** Applies a status effect to all enemy units in a range. */
     public static void status(Team team, float x, float y, float radius, StatusEffect effect, float duration, boolean air, boolean ground){
         Cons<Unit> cons = entity -> {
-            if(entity.team == team || !entity.within(x, y, radius) || (entity.isFlying() && !air) || (entity.isGrounded() && !ground)){
+            if(entity.team == team || !entity.checkTarget(air, ground) || !entity.hittable() || !entity.within(x, y, radius)){
                 return;
             }
 
@@ -327,17 +489,34 @@ public class Damage{
 
     /** Damages all entities and blocks in a radius that are enemies of the team. */
     public static void damage(Team team, float x, float y, float radius, float damage, boolean complete, boolean air, boolean ground){
-        Cons<Unit> cons = entity -> {
-            if(entity.team == team || !entity.within(x, y, radius) || (entity.isFlying() && !air) || (entity.isGrounded() && !ground)){
+        damage(team, x, y, radius, damage, complete, air, ground, false, null);
+    }
+
+    /** Damages all entities and blocks in a radius that are enemies of the team. */
+    public static void damage(Team team, float x, float y, float radius, float damage, boolean complete, boolean air, boolean ground, boolean scaled, @Nullable Bullet source){
+        Cons<Unit> cons = unit -> {
+            if(unit.team == team  || !unit.checkTarget(air, ground) || !unit.hittable() || !unit.within(x, y, radius + (scaled ? unit.hitSize / 2f : 0f))){
                 return;
             }
-            float amount = calculateDamage(x, y, entity.getX(), entity.getY(), radius, damage);
-            entity.damage(amount);
-            //TODO better velocity displacement
-            float dst = tr.set(entity.getX() - x, entity.getY() - y).len();
-            entity.vel.add(tr.setLength((1f - dst / radius) * 2f / entity.mass()));
 
-            if(complete && damage >= 9999999f && entity.isPlayer()){
+            boolean dead = unit.dead;
+
+            float amount = calculateDamage(scaled ? Math.max(0, unit.dst(x, y) - unit.type.hitSize/2) : unit.dst(x, y), radius, damage);
+            unit.damage(amount);
+
+            if(source != null){
+                Events.fire(bulletDamageEvent.set(unit, source));
+                unit.controller().hit(source);
+
+                if(!dead && unit.dead){
+                    Events.fire(new UnitBulletDestroyEvent(unit, source));
+                }
+            }
+            //TODO better velocity displacement
+            float dst = vec.set(unit.x - x, unit.y - y).len();
+            unit.vel.add(vec.setLength((1f - dst / radius) * 2f / unit.mass()));
+
+            if(complete && damage >= 9999999f && unit.isPlayer()){
                 Events.fire(Trigger.exclusionDeath);
             }
         };
@@ -351,89 +530,130 @@ public class Damage{
 
         if(ground){
             if(!complete){
-                int trad = (int)(radius / tilesize);
-                Tile tile = world.tileWorld(x, y);
-                if(tile != null){
-                    tileDamage(team, tile.x, tile.y, trad, damage);
-                }
+                tileDamage(team, World.toTile(x), World.toTile(y), radius / tilesize, damage * (source == null ? 1f : source.type.buildingDamageMultiplier), source);
             }else{
                 completeDamage(team, x, y, radius, damage);
             }
         }
     }
 
-    public static void tileDamage(Team team, int startx, int starty, int baseRadius, float baseDamage){
-        //tile damage is posted, so that destroying a block that causes a chain explosion will run in the next frame
-        //this prevents recursive damage calls from messing up temporary variables
+    public static void tileDamage(Team team, int x, int y, float baseRadius, float damage){
+        tileDamage(team, x, y, baseRadius, damage, null);
+    }
+
+    public static void tileDamage(Team team, int x, int y, float baseRadius, float damage, @Nullable Bullet source){
         Core.app.post(() -> {
+            var in = world.build(x, y);
+            //spawned inside a multiblock. this means that damage needs to be dealt directly.
+            //why? because otherwise the building would absorb everything in one cell, which means much less damage than a nearby explosion.
+            //this needs to be compensated
+            if(in != null && in.team != team && in.block.size > 1 && in.health > damage){
+                //deal the damage of an entire side, to be equivalent with maximum 'standard' damage
+                in.damage(team, damage * Math.min((in.block.size), baseRadius * 0.4f));
+                //no need to continue with the explosion
+                return;
+            }
 
-            bits.clear();
-            propagation.clear();
-            int bitOffset = bits.width() / 2;
+            //cap radius to prevent lag
+            float radius = Math.min(baseRadius, 100), rad2 = radius * radius;
+            int rays = Mathf.ceil(radius * 2 * Mathf.pi);
+            double spacing = Math.PI * 2.0 / rays;
+            damages.clear();
 
-            propagation.addFirst(PropCell.get((byte)0, (byte)0, (short)baseDamage));
-            //clamp radius to fit bits
-            int radius = Math.min(baseRadius, bits.width() / 2);
+            //raycast from each angle
+            for(int i = 0; i <= rays; i++){
+                float dealt = 0f;
+                int startX = x;
+                int startY = y;
+                int endX = x + (int)(Math.cos(spacing * i) * radius), endY = y + (int)(Math.sin(spacing * i) * radius);
 
-            while(!propagation.isEmpty()){
-                int prop = propagation.removeLast();
-                int x = PropCell.x(prop);
-                int y = PropCell.y(prop);
-                int damage = PropCell.damage(prop);
-                //manhattan distance used for calculating falloff, results in a diamond pattern
-                int dst = Math.abs(x) + Math.abs(y);
+                int xDist = Math.abs(endX - startX);
+                int yDist = -Math.abs(endY - startY);
+                int xStep = (startX < endX ? +1 : -1);
+                int yStep = (startY < endY ? +1 : -1);
+                int error = xDist + yDist;
 
-                int scaledDamage = (int)(damage * (1f - (float)dst / radius));
+                while(startX != endX || startY != endY){
+                    var build = world.build(startX, startY);
+                    if(build != null && build.team != team){
+                        //damage dealt at circle edge
+                        float edgeScale = 0.6f;
+                        float mult = (1f-(Mathf.dst2(startX, startY, x, y) / rad2) + edgeScale) / (1f + edgeScale);
+                        float next = damage * mult - dealt;
+                        //register damage dealt
+                        int p = Point2.pack(startX, startY);
+                        damages.put(p, Math.max(damages.get(p), next));
+                        //register as hit
+                        dealt += build.health;
 
-                bits.set(bitOffset + x, bitOffset + y);
-                Tile tile = world.tile(startx + x, starty + y);
+                        if(next - dealt <= 0){
+                            break;
+                        }
+                    }
 
-                if(scaledDamage <= 0 || tile == null) continue;
-
-                //apply damage to entity if needed
-                if(tile.build != null && tile.build.team != team){
-                    int health = (int)(tile.build.health / (tile.block().size * tile.block().size));
-                    if(tile.build.health > 0){
-                        tile.build.damage(scaledDamage);
-                        scaledDamage -= health;
-
-                        if(scaledDamage <= 0) continue;
+                    if(2 * error - yDist > xDist - 2 * error){
+                        error += yDist;
+                        startX += xStep;
+                    }else{
+                        error += xDist;
+                        startY += yStep;
                     }
                 }
+            }
 
-                for(Point2 p : Geometry.d4){
-                    if(!bits.get(bitOffset + x + p.x, bitOffset + y + p.y)){
-                        propagation.addFirst(PropCell.get((byte)(x + p.x), (byte)(y + p.y), (short)scaledDamage));
+            //apply damage
+            for(var e : damages){
+                int cx = Point2.x(e.key), cy = Point2.y(e.key);
+                var build = world.build(cx, cy);
+                if(build != null){
+                    if(source != null){
+                        build.damage(source, team, e.value);
+                    }else{
+                        build.damage(team, e.value);
                     }
                 }
             }
         });
-
     }
 
     private static void completeDamage(Team team, float x, float y, float radius, float damage){
+
         int trad = (int)(radius / tilesize);
         for(int dx = -trad; dx <= trad; dx++){
             for(int dy = -trad; dy <= trad; dy++){
                 Tile tile = world.tile(Math.round(x / tilesize) + dx, Math.round(y / tilesize) + dy);
-                if(tile != null && tile.build != null && (team == null ||team.isEnemy(tile.team())) && Mathf.dst(dx, dy) <= trad){
-                    tile.build.damage(damage);
+                if(tile != null && tile.build != null && (team == null || team != tile.team()) && dx*dx + dy*dy <= trad*trad){
+                    tile.build.damage(team, damage);
                 }
             }
         }
     }
 
-    private static float calculateDamage(float x, float y, float tx, float ty, float radius, float damage){
-        float dist = Mathf.dst(x, y, tx, ty);
+    private static float calculateDamage(float dist, float radius, float damage){
         float falloff = 0.4f;
         float scaled = Mathf.lerp(1f - dist / radius, 1f, falloff);
         return damage * scaled;
     }
 
-    @Struct
-    static class PropCellStruct{
-        byte x;
-        byte y;
-        short damage;
+    /** @return resulting armor calculated based off of damage */
+    public static float applyArmor(float damage, float armor){
+        return Math.max(damage - armor, minArmorDamage * damage);
+    }
+
+    public static class Collided implements Pool.Poolable{
+        public float x, y;
+        public Teamc target;
+
+        public Collided set(float x, float y, Teamc target){
+            this.x = x;
+            this.y = y;
+            this.target = target;
+            return this;
+        }
+
+        @Override
+        public void reset(){
+            target = null;
+        }
     }
 }
diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java
index 6fa163b074..2f8e85152d 100644
--- a/core/src/mindustry/entities/Effect.java
+++ b/core/src/mindustry/entities/Effect.java
@@ -10,6 +10,7 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
+import mindustry.entities.effect.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
@@ -19,7 +20,8 @@ import static mindustry.Vars.*;
 public class Effect{
     private static final float shakeFalloff = 10000f;
     private static final EffectContainer container = new EffectContainer();
-    private static final Seq<Effect> all = new Seq<>();
+
+    public static final Seq<Effect> all = new Seq<>();
 
     private boolean initialized;
 
@@ -29,6 +31,14 @@ public class Effect{
     public float lifetime = 50f;
     /** Clip size. */
     public float clip;
+    /** Time delay before the effect starts */
+    public float startDelay;
+    /** Amount added to rotation */
+    public float baseRotation;
+    /** If true, parent unit is data are followed. */
+    public boolean followParent = true;
+    /** If this and followParent are true, the effect will offset and rotate with the parent's rotation. */
+    public boolean rotWithParent;
 
     public float layer = Layer.effect;
     public float layerDuration;
@@ -51,49 +61,117 @@ public class Effect{
         all.add(this);
     }
 
+    public Effect startDelay(float d){
+        startDelay = d;
+        return this;
+    }
+
     public void init(){}
 
+    public Effect followParent(boolean follow){
+        followParent = follow;
+        return this;
+    }
+
+    public Effect rotWithParent(boolean follow){
+        rotWithParent = follow;
+        return this;
+    }
+
     public Effect layer(float l){
         layer = l;
         return this;
     }
 
+    public Effect baseRotation(float d){
+        baseRotation = d;
+        return this;
+    }
+
     public Effect layer(float l, float duration){
         layer = l;
         this.layerDuration = duration;
         return this;
     }
 
+    public WrapEffect wrap(Color color){
+        return new WrapEffect(this, color);
+    }
+
+    public WrapEffect wrap(Color color, float rotation){
+        return new WrapEffect(this, color, rotation);
+    }
+
     public void at(Position pos){
-        create(this, pos.getX(), pos.getY(), 0, Color.white, null);
+        create(pos.getX(), pos.getY(), 0, Color.white, null);
+    }
+
+    public void at(Position pos, boolean parentize){
+        create(pos.getX(), pos.getY(), 0, Color.white, parentize ? pos : null);
     }
 
     public void at(Position pos, float rotation){
-        create(this, pos.getX(), pos.getY(), rotation, Color.white, null);
+        create(pos.getX(), pos.getY(), rotation, Color.white, null);
     }
 
     public void at(float x, float y){
-        create(this, x, y, 0, Color.white, null);
+        create(x, y, 0, Color.white, null);
     }
 
     public void at(float x, float y, float rotation){
-        create(this, x, y, rotation, Color.white, null);
+        create(x, y, rotation, Color.white, null);
     }
 
     public void at(float x, float y, float rotation, Color color){
-        create(this, x, y, rotation, color, null);
+        create(x, y, rotation, color, null);
     }
 
     public void at(float x, float y, Color color){
-        create(this, x, y, 0, color, null);
+        create(x, y, 0, color, null);
     }
 
     public void at(float x, float y, float rotation, Color color, Object data){
-        create(this, x, y, rotation, color, data);
+        create(x, y, rotation, color, data);
     }
 
     public void at(float x, float y, float rotation, Object data){
-        create(this, x, y, rotation, Color.white, data);
+        create(x, y, rotation, Color.white, data);
+    }
+
+    public boolean shouldCreate(){
+        return !headless && this != Fx.none && Vars.renderer.enableEffects;
+    }
+
+    public void create(float x, float y, float rotation, Color color, Object data){
+        if(!shouldCreate()) return;
+
+        if(Core.camera.bounds(Tmp.r1).overlaps(Tmp.r2.setCentered(x, y, clip))){
+            if(!initialized){
+                initialized = true;
+                init();
+            }
+
+            if(startDelay <= 0f){
+                add(x, y, rotation, color, data);
+            }else{
+                Time.run(startDelay, () -> add(x, y, rotation, color, data));
+            }
+        }
+    }
+
+    protected void add(float x, float y, float rotation, Color color, Object data){
+        var entity = EffectState.create();
+        entity.effect = this;
+        entity.rotation = baseRotation + rotation;
+        entity.data = data;
+        entity.lifetime = lifetime;
+        entity.set(x, y);
+        entity.color.set(color);
+        if(followParent && data instanceof Posc p){
+            entity.parent = p;
+            entity.rotWithParent = rotWithParent;
+        }
+        entity.add();
     }
 
     public float render(int id, Color color, float life, float lifetime, float rotation, float x, float y, Object data){
@@ -133,28 +211,19 @@ public class Effect{
         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.clip).setCenter(x, y);
+    public static void floorDust(float x, float y, float size){
+        Tile tile = world.tileWorld(x, y);
+        if(tile != null){
+            Color color = tile.floor().mapColor;
+            Fx.unitLand.at(x, y, size, color);
+        }
+    }
 
-            if(view.overlaps(pos)){
-                if(!effect.initialized){
-                    effect.initialized = true;
-                    effect.init();
-                }
-
-                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 floorDustAngle(Effect effect, float x, float y, float angle){
+        Tile tile = world.tileWorld(x, y);
+        if(tile != null){
+            Color color = tile.floor().mapColor;
+            effect.at(x, y, angle, color);
         }
     }
 
@@ -215,6 +284,10 @@ public class Effect{
             return (T)data;
         }
 
+        public EffectContainer inner(){
+            return innerContainer == null ? (innerContainer = new EffectContainer()) : innerContainer;
+        }
+
         public void scaled(float lifetime, Cons<EffectContainer> cons){
             if(innerContainer == null) innerContainer = new EffectContainer();
             if(time <= lifetime){
diff --git a/core/src/mindustry/entities/EntityCollisions.java b/core/src/mindustry/entities/EntityCollisions.java
index 3425314810..273449bb6a 100644
--- a/core/src/mindustry/entities/EntityCollisions.java
+++ b/core/src/mindustry/entities/EntityCollisions.java
@@ -1,28 +1,27 @@
 package mindustry.entities;
 
+import arc.func.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
 public class EntityCollisions{
-    //range for tile collision scanning
-    private static final int r = 1;
-    //move in 1-unit chunks
+    //move in 1-unit chunks (can this be made more efficient?)
     private static final float seg = 1f;
 
     //tile collisions
-    private Rect tmp = new Rect();
-    private Vec2 vector = new Vec2();
-    private Vec2 l1 = new Vec2();
-    private Rect r1 = new Rect();
-    private Rect r2 = new Rect();
+    private Vec2 vector = new Vec2(), l1 = new Vec2();
+    private Rect r1 = new Rect(), r2 = new Rect(), tmp = new Rect();
 
     //entity collisions
-    private Seq<Hitboxc> arrOut = new Seq<>();
+    private Seq<Hitboxc> arrOut = new Seq<>(Hitboxc.class);
+    private Cons<Hitboxc> hitCons = this::updateCollision;
+    private Cons<QuadTree> treeCons = tree -> tree.intersect(r2, arrOut);
 
     public void moveCheck(Hitboxc entity, float deltax, float deltay, SolidPred solidCheck){
         if(!solidCheck.solid(entity.tileX(), entity.tileY())){
@@ -35,13 +34,15 @@ public class EntityCollisions{
     }
 
     public void move(Hitboxc entity, float deltax, float deltay, SolidPred solidCheck){
-        if(Math.abs(deltax) < 0.0001f & Math.abs(deltay)  < 0.0001f) return;
+        if(Math.abs(deltax) < 0.0001f & Math.abs(deltay) < 0.0001f) return;
 
         boolean movedx = false;
+        entity.hitboxTile(r1);
+        int r = Math.max(Math.round(r1.width / tilesize), 1);
 
         while(Math.abs(deltax) > 0 || !movedx){
             movedx = true;
-            moveDelta(entity, Math.min(Math.abs(deltax), seg) * Mathf.sign(deltax), 0, true, solidCheck);
+            moveDelta(entity, Math.min(Math.abs(deltax), seg) * Mathf.sign(deltax), 0, r, true, solidCheck);
 
             if(Math.abs(deltax) >= seg){
                 deltax -= seg * Mathf.sign(deltax);
@@ -54,7 +55,7 @@ public class EntityCollisions{
 
         while(Math.abs(deltay) > 0 || !movedy){
             movedy = true;
-            moveDelta(entity, 0, Math.min(Math.abs(deltay), seg) * Mathf.sign(deltay), false, solidCheck);
+            moveDelta(entity, 0, Math.min(Math.abs(deltay), seg) * Mathf.sign(deltay), r, false, solidCheck);
 
             if(Math.abs(deltay) >= seg){
                 deltay -= seg * Mathf.sign(deltay);
@@ -64,7 +65,7 @@ public class EntityCollisions{
         }
     }
 
-    public void moveDelta(Hitboxc entity, float deltax, float deltay, boolean x, SolidPred solidCheck){
+    public void moveDelta(Hitboxc entity, float deltax, float deltay, int r, boolean x, SolidPred solidCheck){
         entity.hitboxTile(r1);
         entity.hitboxTile(r2);
         r1.x += deltax;
@@ -80,8 +81,8 @@ public class EntityCollisions{
 
                     if(tmp.overlaps(r1)){
                         Vec2 v = Geometry.overlap(r1, tmp, x);
-                        if(x) r1.x += v.x;
-                        if(!x) r1.y += v.y;
+                        r1.x += v.x;
+                        r1.y += v.y;
                     }
                 }
             }
@@ -90,9 +91,11 @@ public class EntityCollisions{
         entity.trns(r1.x - r2.x, r1.y - r2.y);
     }
 
-    public boolean overlapsTile(Rect rect){
+    public boolean overlapsTile(Rect rect, @Nullable SolidPred solidChecker){
+        if(solidChecker == null) return false;
+
         rect.getCenter(vector);
-        int r = 1;
+        int r = Math.max(Math.round(r1.width / tilesize), 1);
 
         //assumes tiles are centered
         int tilex = Math.round(vector.x / tilesize);
@@ -101,10 +104,9 @@ public class EntityCollisions{
         for(int dx = -r; dx <= r; dx++){
             for(int dy = -r; dy <= r; dy++){
                 int wx = dx + tilex, wy = dy + tiley;
-                if(solid(wx, wy)){
-                    r2.setSize(tilesize).setCenter(wx * tilesize, wy * tilesize);
+                if(solidChecker.solid(wx, wy)){
 
-                    if(r2.overlaps(rect)){
+                    if(r2.setCentered(wx * tilesize, wy * tilesize, tilesize).overlaps(rect)){
                         return true;
                     }
                 }
@@ -115,7 +117,7 @@ public class EntityCollisions{
 
     @SuppressWarnings("unchecked")
     public <T extends Hitboxc> void updatePhysics(EntityGroup<T> group){
-        QuadTree tree = group.tree();
+        var tree = group.tree();
         tree.clear();
 
         group.each(s -> {
@@ -126,12 +128,12 @@ public class EntityCollisions{
 
     public static boolean legsSolid(int x, int y){
         Tile tile = world.tile(x, y);
-        return tile == null || tile.staticDarkness() >= 2 || tile.floor().solid;
+        return tile == null || tile.legSolid();
     }
 
     public static boolean waterSolid(int x, int y){
         Tile tile = world.tile(x, y);
-        return tile == null || (tile.solid() || !tile.floor().isLiquid);
+        return tile == null || tile.solid() || !tile.floor().isLiquid;
     }
 
     public static boolean solid(int x, int y){
@@ -153,7 +155,7 @@ public class EntityCollisions{
         float vbx = b.getX() - b.lastX();
         float vby = b.getY() - b.lastY();
 
-        if(a != b && a.collides(b)){
+        if(a != b && a.collides(b) && b.collides(a)){
             l1.set(a.getX(), a.getY());
             boolean collide = r1.overlaps(r2) || collide(r1.x, r1.y, r1.width, r1.height, vax, vay,
             r2.x, r2.y, r2.width, r2.height, vbx, vby, l1);
@@ -190,14 +192,10 @@ public class EntityCollisions{
             yInvExit = y2 - (y1 + h1);
         }
 
-        float xEntry, yEntry;
-        float xExit, yExit;
-
-        xEntry = xInvEntry / vx1;
-        xExit = xInvExit / vx1;
-
-        yEntry = yInvEntry / vy1;
-        yExit = yInvExit / vy1;
+        float xEntry = xInvEntry / vx1;
+        float xExit = xInvExit / vx1;
+        float yEntry = yInvEntry / vy1;
+        float yExit = yInvExit / vy1;
 
         float entryTime = Math.max(xEntry, yEntry);
         float exitTime = Math.min(xExit, yExit);
@@ -216,31 +214,37 @@ public class EntityCollisions{
 
     @SuppressWarnings("unchecked")
     public <T extends Hitboxc> void collide(EntityGroup<T> groupa){
-        groupa.each(solid -> {
-            solid.hitbox(r1);
-            r1.x += (solid.lastX() - solid.getX());
-            r1.y += (solid.lastY() - solid.getY());
+        groupa.each((Cons<T>)hitCons);
+    }
 
-            solid.hitbox(r2);
-            r2.merge(r1);
+    private void updateCollision(Hitboxc solid){
+        solid.hitbox(r1);
+        r1.x += (solid.lastX() - solid.getX());
+        r1.y += (solid.lastY() - solid.getY());
 
-            arrOut.clear();
+        solid.hitbox(r2);
+        r2.merge(r1);
 
-            //get all targets based on what entity wants to collide with
-            solid.getCollisions(tree -> tree.intersect(r2, arrOut));
+        arrOut.clear();
 
-            for(Hitboxc sc : arrOut){
-                sc.hitbox(r1);
-                if(r2.overlaps(r1)){
-                    checkCollide(solid, sc);
-                    //break out of loop when this object hits something
-                    if(!solid.isAdded()) return;
-                }
+        //get all targets based on what entity wants to collide with
+        solid.getCollisions(treeCons);
+
+        var items = arrOut.items;
+        int size = arrOut.size;
+
+        for(int i = 0; i < size; i++){
+            Hitboxc sc = items[i];
+            sc.hitbox(r1);
+            if(r2.overlaps(r1)){
+                checkCollide(solid, sc);
+                //break out of loop when this object hits something
+                if(!solid.isAdded()) return;
             }
-        });
+        }
     }
 
     public interface SolidPred{
         boolean solid(int x, int y);
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java
index 6553e72d44..ea8ef0cdb8 100644
--- a/core/src/mindustry/entities/EntityGroup.java
+++ b/core/src/mindustry/entities/EntityGroup.java
@@ -20,6 +20,7 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
     private final Seq<T> intersectArray = new Seq<>();
     private final Rect viewport = new Rect();
     private final Rect intersectRect = new Rect();
+    private final EntityIndexer indexer;
     private IntMap<T> map;
     private QuadTree tree;
     private boolean clearing;
@@ -27,10 +28,20 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
     private int index;
 
     public static int nextId(){
+        if(lastId >= Integer.MAX_VALUE - 2) lastId = 0;
         return lastId++;
     }
 
+    /** Makes sure the next ID counter is higher than this number, so future entities cannot possibly use this ID. */
+    public static void checkNextId(int id){
+        lastId = Math.max(lastId, id + 1);
+    }
+
     public EntityGroup(Class<T> type, boolean spatial, boolean mapping){
+        this(type, spatial, mapping, null);
+    }
+
+    public EntityGroup(Class<T> type, boolean spatial, boolean mapping, EntityIndexer indexer){
         array = new Seq<>(false, 32, type);
 
         if(spatial){
@@ -40,6 +51,20 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
         if(mapping){
             map = new IntMap<>();
         }
+
+        this.indexer = indexer;
+    }
+
+    /** @return entities with colliding IDs, or an empty array. */
+    public Seq<T> checkIDCollisions(){
+        Seq<T> out = new Seq<>();
+        IntSet ints = new IntSet();
+        each(u -> {
+            if(!ints.add(u.id())){
+                out.add(u);
+            }
+        });
+        return out;
     }
 
     public void sort(Comparator<? super T> comp){
@@ -55,7 +80,13 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
     }
 
     public void update(){
-        each(Entityc::update);
+        for(index = 0; index < array.size; index++){
+            array.items[index].update();
+        }
+    }
+
+    public Seq<T> copy(){
+        return copy(new Seq<>());
     }
 
     public Seq<T> copy(Seq<T> arr){
@@ -78,16 +109,17 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
     public void draw(Cons<T> cons){
         Core.camera.bounds(viewport);
 
-        each(e -> {
-            Drawc draw = (Drawc)e;
-            if(viewport.overlaps(draw.x() - draw.clipSize()/2f, draw.y() - draw.clipSize()/2f, draw.clipSize(), draw.clipSize())){
-                cons.get(e);
+        for(index = 0; index < array.size; index++){
+            Drawc draw = (Drawc)array.items[index];
+            float clip = draw.clipSize();
+            if(viewport.overlaps(draw.x() - clip/2f, draw.y() - clip/2f, clip, clip)){
+                cons.get((T)draw);
             }
-        });
+        }
     }
 
     public boolean useTree(){
-        return map != null;
+        return tree != null;
     }
 
     public boolean mappingEnabled(){
@@ -114,6 +146,12 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
         tree.intersect(x, y, width, height, out);
     }
 
+    public boolean intersect(float x, float y, float width, float height, Boolf<? super T> out){
+        //don't waste time for empty groups
+        if(isEmpty()) return false;
+        return tree.intersect(x, y, width, height, out);
+    }
+
     public Seq<T> intersect(float x, float y, float width, float height){
         intersectArray.clear();
         //don't waste time for empty groups
@@ -163,12 +201,25 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
         }
     }
 
+    public int addIndex(T type){
+        int index = array.size;
+        add(type);
+        return index;
+    }
+
     public void remove(T type){
         if(clearing) return;
         if(type == null) throw new RuntimeException("Cannot remove a null entity!");
         int idx = array.indexOf(type, true);
         if(idx != -1){
             array.remove(idx);
+
+            //fix incorrect HEAD index since it was swapped
+            if(array.size > 0 && idx != array.size){
+                var swapped = array.items[idx];
+                if(indexer != null) indexer.change(swapped, idx);
+            }
+
             if(map != null){
                 map.remove(type.id());
             }
@@ -180,6 +231,38 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
         }
     }
 
+    public void removeIndex(T type, int position){
+        if(clearing) return;
+        if(type == null) throw new RuntimeException("Cannot remove a null entity!");
+        if(position != -1 && position < array.size){
+
+            //rarely the entity index is wrong; fallback to slow implementation
+            if(array.items[position] != type){
+                remove(type);
+                return;
+            }
+
+            //swap head with current
+            if(array.size > 1){
+                var head = array.items[array.size - 1];
+                if(indexer != null) indexer.change(head, position);
+                array.items[position] = head;
+            }
+
+            array.size --;
+            array.items[array.size] = null;
+
+            if(map != null){
+                map.remove(type.id());
+            }
+
+            //fix iteration index when removing
+            if(index >= position){
+                index --;
+            }
+        }
+    }
+
     public void clear(){
         clearing = true;
 
diff --git a/core/src/mindustry/entities/EntityIndexer.java b/core/src/mindustry/entities/EntityIndexer.java
new file mode 100644
index 0000000000..9a89dfb130
--- /dev/null
+++ b/core/src/mindustry/entities/EntityIndexer.java
@@ -0,0 +1,7 @@
+package mindustry.entities;
+
+import mindustry.gen.*;
+
+public interface EntityIndexer{
+    void change(Entityc t, int index);
+}
diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java
index 2ae2253356..e3601e3e31 100644
--- a/core/src/mindustry/entities/Fires.java
+++ b/core/src/mindustry/entities/Fires.java
@@ -1,25 +1,23 @@
 package mindustry.entities;
 
 import arc.*;
-import arc.math.geom.*;
-import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class Fires{
     private static final float baseLifetime = 1000f;
-    private static final IntMap<Fire> map = new IntMap<>();
 
     /** Start a fire on the tile. If there already is a fire there, refreshes its lifetime. */
     public static void create(Tile tile){
-        if(net.client() || tile == null || !state.rules.fire) return; //not clientside.
+        if(net.client() || tile == null || !state.rules.fire || !state.rules.hasEnv(Env.oxygen)) return; //not clientside.
 
-        Fire fire = map.get(tile.pos());
+        Fire fire = get(tile);
 
         if(fire == null){
             fire = Fire.create();
@@ -27,44 +25,58 @@ public class Fires{
             fire.lifetime = baseLifetime;
             fire.set(tile.worldx(), tile.worldy());
             fire.add();
-            map.put(tile.pos(), fire);
+            set(tile, fire);
         }else{
             fire.lifetime = baseLifetime;
             fire.time = 0f;
         }
     }
 
-    public static Fire get(int x, int y){
-        return map.get(Point2.pack(x, y));
+    public static @Nullable Fire get(Tile tile){
+        return tile == null ? null : world.tiles.getFire(tile.array());
+    }
+
+    public static @Nullable Fire get(int x, int y){
+        return Structs.inBounds(x, y, world.width(), world.height()) ? world.tiles.getFire(world.packArray(x, y)) : null;
+    }
+
+    private static void set(Tile tile, Fire fire){
+        world.tiles.setFire(tile.array(), fire);
     }
 
     public static boolean has(int x, int y){
-        if(!Structs.inBounds(x, y, world.width(), world.height()) || !map.containsKey(Point2.pack(x, y))){
+        if(!Structs.inBounds(x, y, world.width(), world.height())){
             return false;
         }
-        Fire fire = map.get(Point2.pack(x, y));
-        return fire.isAdded() && fire.fin() < 1f && fire.tile() != null && fire.tile().x == x && fire.tile().y == y;
+        Fire fire = get(x, y);
+        return fire != null && fire.isAdded() && fire.fin() < 1f && fire.tile != null && fire.tile.x == x && fire.tile.y == y;
     }
 
     /**
      * Attempts to extinguish a fire by shortening its life. If there is no fire here, does nothing.
      */
     public static void extinguish(Tile tile, float intensity){
-        if(tile != null && map.containsKey(tile.pos())){
-            Fire fire = map.get(tile.pos());
-            fire.time(fire.time + intensity * Time.delta);
-            Fx.steam.at(fire);
-            if(fire.time >= fire.lifetime){
-                Events.fire(Trigger.fireExtinguish);
+        if(tile != null){
+            Fire fire = get(tile);
+            if(fire != null){
+                fire.time(fire.time + intensity * Time.delta);
+                Fx.steam.at(fire);
+                if(fire.time >= fire.lifetime){
+                    Events.fire(Trigger.fireExtinguish);
+                }
             }
         }
     }
 
     public static void remove(Tile tile){
-        map.remove(tile.pos());
+        if(tile != null){
+            set(tile, null);
+        }
     }
 
     public static void register(Fire fire){
-        map.put(fire.tile.pos(), fire);
+        if(fire.tile != null){
+            set(fire.tile, fire);
+        }
     }
 }
diff --git a/core/src/mindustry/entities/GroupDefs.java b/core/src/mindustry/entities/GroupDefs.java
index 8f98a69442..465d49a58f 100644
--- a/core/src/mindustry/entities/GroupDefs.java
+++ b/core/src/mindustry/entities/GroupDefs.java
@@ -14,4 +14,6 @@ class GroupDefs<G>{
     @GroupDef(value = Firec.class) G fire;
     @GroupDef(value = Puddlec.class) G puddle;
     @GroupDef(value = WeatherStatec.class) G weather;
+    @GroupDef(value = WorldLabelc.class, mapping = true) G label;
+    @GroupDef(value = PowerGraphUpdaterc.class) G powerGraph;
 }
diff --git a/core/src/mindustry/entities/LegDestroyData.java b/core/src/mindustry/entities/LegDestroyData.java
new file mode 100644
index 0000000000..32994c0aaa
--- /dev/null
+++ b/core/src/mindustry/entities/LegDestroyData.java
@@ -0,0 +1,15 @@
+package mindustry.entities;
+
+import arc.graphics.g2d.*;
+import arc.math.geom.*;
+
+public class LegDestroyData{
+    public Vec2 a, b;
+    public TextureRegion region;
+
+    public LegDestroyData(Vec2 a, Vec2 b, TextureRegion region){
+        this.a = a;
+        this.b = b;
+        this.region = region;
+    }
+}
diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java
index ce5a3f97da..76bbcb82b5 100644
--- a/core/src/mindustry/entities/Lightning.java
+++ b/core/src/mindustry/entities/Lightning.java
@@ -43,20 +43,20 @@ public class Lightning{
         bhit = false;
 
         for(int i = 0; i < length / 2; i++){
-            hitCreate.create(null, team, x, y, 0f, damage, 1f, 1f, hitter);
+            hitCreate.create(null, team, x, y, rotation, damage * (hitter == null ? 1f : hitter.damageMultiplier()), 1f, 1f, hitter);
             lines.add(new Vec2(x + Mathf.range(3f), y + Mathf.range(3f)));
 
             if(lines.size > 1){
                 bhit = false;
                 Vec2 from = lines.get(lines.size - 2);
                 Vec2 to = lines.get(lines.size - 1);
-                world.raycastEach(World.toTile(from.getX()), World.toTile(from.getY()), World.toTile(to.getX()), World.toTile(to.getY()), (wx, wy) -> {
+                World.raycastEach(World.toTile(from.getX()), World.toTile(from.getY()), World.toTile(to.getX()), World.toTile(to.getY()), (wx, wy) -> {
 
                     Tile tile = world.tile(wx, wy);
-                    if(tile != null && tile.block().insulated && tile.team() != team){
+                    if(tile != null && (tile.build != null && tile.build.isInsulated()) && tile.team() != team){
                         bhit = true;
                         //snap it instead of removing
-                        lines.get(lines.size -1).set(wx * tilesize, wy * tilesize);
+                        lines.get(lines.size - 1).set(wx * tilesize, wy * tilesize);
                         return true;
                     }
                     return false;
diff --git a/core/src/mindustry/entities/Mover.java b/core/src/mindustry/entities/Mover.java
new file mode 100644
index 0000000000..6688710ff1
--- /dev/null
+++ b/core/src/mindustry/entities/Mover.java
@@ -0,0 +1,8 @@
+package mindustry.entities;
+
+import mindustry.gen.*;
+
+/** Applies custom movement to a bullet. */
+public interface Mover{
+    void move(Bullet bullet);
+}
diff --git a/core/src/mindustry/entities/Predict.java b/core/src/mindustry/entities/Predict.java
index 3f8aca60cd..67ca74c42b 100644
--- a/core/src/mindustry/entities/Predict.java
+++ b/core/src/mindustry/entities/Predict.java
@@ -9,8 +9,8 @@ import mindustry.gen.*;
  * Class for predicting shoot angles based on velocities of targets.
  */
 public class Predict{
-    private static Vec2 vec = new Vec2();
-    private static Vec2 vresult = new Vec2();
+    private static final Vec2 vec = new Vec2();
+    private static final Vec2 vresult = new Vec2();
 
     /**
      * Calculates of intercept of a stationary and moving target. Do not call from multiple threads!
@@ -52,6 +52,10 @@ public class Predict{
     }
 
     public static Vec2 intercept(Position src, Position dst, float v){
+        return intercept(src, dst, 0, 0, v);
+    }
+
+    public static Vec2 intercept(Position src, Position dst, float offsetx, float offsety, float v){
         float ddx = 0, ddy = 0;
         if(dst instanceof Hitboxc h){
             ddx += h.deltaX();
@@ -61,7 +65,7 @@ public class Predict{
             ddx -= h.deltaX();
             ddy -= h.deltaY();
         }
-        return intercept(src.getX(), src.getY(), dst.getX(), dst.getY(), ddx, ddy, v);
+        return intercept(src.getX(), src.getY(), dst.getX() + offsetx, dst.getY() + offsety, ddx, ddy, v);
     }
 
     /**
diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java
index 2811c28d01..7c3a555154 100644
--- a/core/src/mindustry/entities/Puddles.java
+++ b/core/src/mindustry/entities/Puddles.java
@@ -1,88 +1,116 @@
 package mindustry.entities;
 
 import arc.math.*;
-import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
 
 public class Puddles{
-    private static final IntMap<Puddle> map = new IntMap<>();
-
     public static final float maxLiquid = 70f;
 
     /** Deposits a Puddle between tile and source. */
     public static void deposit(Tile tile, Tile source, Liquid liquid, float amount){
-        deposit(tile, source, liquid, amount, 0);
+        deposit(tile, source, liquid, amount, true);
     }
 
     /** Deposits a Puddle at a tile. */
     public static void deposit(Tile tile, Liquid liquid, float amount){
-        deposit(tile, tile, liquid, amount, 0);
+        deposit(tile, tile, liquid, amount, true);
     }
 
     /** Returns the Puddle on the specified tile. May return null. */
-    public static Puddle get(Tile tile){
-        return map.get(tile.pos());
+    public static @Nullable Puddle get(Tile tile){
+        return tile == null ? null : world.tiles.getPuddle(tile.array());
     }
 
-    public static void deposit(Tile tile, Tile source, Liquid liquid, float amount, int generation){
+    public static void deposit(Tile tile, Tile source, Liquid liquid, float amount, boolean initial){
+        deposit(tile, source, liquid, amount, initial, false);
+    }
+
+    public static void deposit(Tile tile, Tile source, Liquid liquid, float amount, boolean initial, boolean cap){
         if(tile == null) return;
 
+        float ax = (tile.worldx() + source.worldx()) / 2f, ay = (tile.worldy() + source.worldy()) / 2f;
+
+        if(liquid.willBoil()){
+            if(Mathf.chanceDelta(0.16f)){
+                liquid.vaporEffect.at(ax, ay, liquid.gasColor);
+            }
+            return;
+        }
+
+        if(Vars.state.rules.hasEnv(Env.space)){
+            if(Mathf.chanceDelta(0.11f) && tile != source){
+                Bullets.spaceLiquid.create(null, source.team(), ax, ay, source.angleTo(tile) + Mathf.range(50f), -1f, Mathf.random(0f, 0.2f), Mathf.random(0.6f, 1f), liquid);
+            }
+            return;
+        }
+
         if(tile.floor().isLiquid && !canStayOn(liquid, tile.floor().liquidDrop)){
-            reactPuddle(tile.floor().liquidDrop, liquid, amount, tile,
-            (tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f);
+            reactPuddle(tile.floor().liquidDrop, liquid, amount, tile, ax, ay);
 
-            Puddle p = map.get(tile.pos());
+            Puddle p = get(tile);
 
-            if(generation == 0 && p != null && p.lastRipple <= Time.time - 40f){
-                Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, tile.floor().liquidDrop.color);
+            if(initial && p != null && p.lastRipple <= Time.time - 40f){
+                Fx.ripple.at(ax, ay, 1f, tile.floor().liquidDrop.color);
                 p.lastRipple = Time.time;
             }
             return;
         }
 
-        if(tile.floor().solid){
-            return;
-        }
+        if(tile.floor().solid) return;
 
-        Puddle p = map.get(tile.pos());
-        if(p == null){
-            Puddle puddle = Puddle.create();
-            puddle.tile(tile);
-            puddle.liquid(liquid);
-            puddle.amount(amount);
-            puddle.generation(generation);
-            puddle.set((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f);
-            puddle.add();
-            map.put(tile.pos(), puddle);
-        }else if(p.liquid() == liquid){
-            p.accepting(Math.max(amount, p.accepting()));
+        Puddle p = get(tile);
+        if(p == null || p.liquid == null){
+            if(!Vars.net.client()){
+                //do not create puddles clientside as that destroys syncing
+                Puddle puddle = Puddle.create();
+                puddle.tile = tile;
+                puddle.liquid = liquid;
+                puddle.amount = Math.min(amount, maxLiquid);
+                puddle.set(ax, ay);
+                register(puddle);
+                puddle.add();
+            }
+        }else if(p.liquid == liquid){
+            p.accepting = Math.max(amount, p.accepting);
 
-            if(generation == 0 && p.lastRipple <= Time.time - 40f && p.amount() >= maxLiquid / 2f){
-                Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, p.liquid().color);
+            if(initial && p.lastRipple <= Time.time - 40f && p.amount >= maxLiquid / 2f){
+                Fx.ripple.at(ax, ay, 1f, p.liquid.color);
                 p.lastRipple = Time.time;
             }
         }else{
-            p.amount(p.amount() + reactPuddle(p.liquid(), liquid, amount, p.tile(), (p.x() + source.worldx())/2f, (p.y() + source.worldy())/2f));
+            float added = reactPuddle(p.liquid, liquid, amount, p.tile, (p.x + source.worldx())/2f, (p.y + source.worldy())/2f);
+
+            if(cap){
+                added = Mathf.clamp(maxLiquid - p.amount, 0f, added);
+            }
+
+            p.amount += added;
         }
     }
 
     public static void remove(Tile tile){
         if(tile == null) return;
 
-        map.remove(tile.pos());
+        world.tiles.setPuddle(tile.array(), null);
     }
 
     public static void register(Puddle puddle){
-        map.put(puddle.tile().pos(), puddle);
+        world.tiles.setPuddle(puddle.tile().array(), puddle);
     }
 
     /** Reacts two liquids together at a location. */
     private static float reactPuddle(Liquid dest, Liquid liquid, float amount, Tile tile, float x, float y){
+        if(dest == null) return 0f;
+
         if((dest.flammability > 0.3f && liquid.temperature > 0.7f) ||
         (liquid.flammability > 0.3f && dest.temperature > 0.7f)){ //flammable liquid + hot liquid
             Fires.create(tile);
@@ -100,14 +128,13 @@ public class Puddles{
             }
             return -0.4f * amount;
         }
-        return 0f;
+        return dest.react(liquid, amount, tile, x, y);
     }
 
     /**
      * Returns whether the first liquid can 'stay' on the second one.
-     * Currently, the only place where this can happen is oil on water.
      */
     private static boolean canStayOn(Liquid liquid, Liquid other){
-        return liquid == Liquids.oil && other == Liquids.water;
+        return liquid.canStayOn.contains(other);
     }
 }
diff --git a/core/src/mindustry/entities/Sized.java b/core/src/mindustry/entities/Sized.java
new file mode 100644
index 0000000000..d33778e3aa
--- /dev/null
+++ b/core/src/mindustry/entities/Sized.java
@@ -0,0 +1,7 @@
+package mindustry.entities;
+
+import arc.math.geom.*;
+
+public interface Sized extends Position{
+    float hitSize();
+}
diff --git a/core/src/mindustry/entities/TargetPriority.java b/core/src/mindustry/entities/TargetPriority.java
index b8b9757961..f8d361bfac 100644
--- a/core/src/mindustry/entities/TargetPriority.java
+++ b/core/src/mindustry/entities/TargetPriority.java
@@ -1,8 +1,16 @@
 package mindustry.entities;
 
-/** A higher ordinal means a higher priority. Higher priority blocks will always get targeted over those of lower priority, regardless of distance. */
-public enum TargetPriority{
-    base,
-    turret,
-    core
+/** Higher priority blocks will always get targeted over those of lower priority, regardless of distance. */
+public class TargetPriority{
+    public static final float
+    //nobody cares about walls
+    wall = -2f,
+    //transport infrastructure isn't as important as factories
+    transport = -1f,
+    //most blocks
+    base = 0f,
+    //turrets deal damage so they are more important
+    turret = 1f,
+    //core is always the most important thing to destroy
+    core = 2f;
 }
diff --git a/core/src/mindustry/entities/UnitSorts.java b/core/src/mindustry/entities/UnitSorts.java
new file mode 100644
index 0000000000..25afb0def6
--- /dev/null
+++ b/core/src/mindustry/entities/UnitSorts.java
@@ -0,0 +1,14 @@
+package mindustry.entities;
+
+import arc.math.*;
+import mindustry.entities.Units.*;
+import mindustry.gen.*;
+
+public class UnitSorts{
+    public static Sortf
+
+    closest = Unit::dst2,
+    farthest = (u, x, y) -> -u.dst2(x, y),
+    strongest = (u, x, y) -> -u.maxHealth + Mathf.dst2(u.x, u.y, x, y) / 6400f,
+    weakest = (u, x, y) -> u.maxHealth + Mathf.dst2(u.x, u.y, x, y) / 6400f;
+}
\ No newline at end of file
diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index cd602327a6..d334651092 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -4,6 +4,7 @@ import arc.*;
 import arc.func.*;
 import arc.math.geom.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.game.*;
@@ -18,8 +19,20 @@ import static mindustry.Vars.*;
 public class Units{
     private static final Rect hitrect = new Rect();
     private static Unit result;
-    private static float cdist;
-    private static boolean boolResult;
+    private static float cdist, cpriority;
+    private static int intResult;
+    private static Building buildResult;
+
+    //prevents allocations in anyEntities
+    private static boolean anyEntityGround;
+    private static float aeX, aeY, aeW, aeH;
+    private static final Boolf<Unit> anyEntityLambda = unit -> {
+        if((unit.isGrounded() && !unit.type.allowLegStep) == anyEntityGround){
+            unit.hitboxTile(hitrect);
+            return hitrect.overlaps(aeX, aeY, aeW, aeH);
+        }
+        return false;
+    };
 
     @Remote(called = Loc.server)
     public static void unitCapDeath(Unit unit){
@@ -30,6 +43,15 @@ public class Units{
         }
     }
 
+    @Remote(called = Loc.server)
+    public static void unitEnvDeath(Unit unit){
+        if(unit != null){
+            unit.dead = true;
+            Fx.unitEnvKill.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);
@@ -61,26 +83,37 @@ public class Units{
 
     @Remote(called = Loc.server)
     public static void unitDespawn(Unit unit){
+        if(unit == null) return;
         Fx.unitDespawn.at(unit.x, unit.y, 0, unit);
         unit.remove();
     }
 
     /** @return whether a new instance of a unit of this team can be created. */
     public static boolean canCreate(Team team, UnitType type){
-        return team.data().countType(type) < getCap(team);
+        return !type.useUnitCap || (team.data().countType(type) < getCap(team) && !type.isBanned());
     }
 
     public static int getCap(Team team){
         //wave team has no cap
-        if((team == state.rules.waveTeam && !state.rules.pvp) || (state.isCampaign() && team == state.rules.waveTeam)){
+        if((team == state.rules.waveTeam && !state.rules.pvp) || (state.isCampaign() && team == state.rules.waveTeam) || state.rules.disableUnitCap){
             return Integer.MAX_VALUE;
         }
-        return state.rules.unitCap + indexer.getExtraUnits(team);
+        return Math.max(0, state.rules.unitCapVariable ? state.rules.unitCap + team.data().unitCap : state.rules.unitCap);
+    }
+
+    /** @return unit cap as a string, substituting the infinity symbol instead of MAX_VALUE */
+    public static String getStringCap(Team team){
+        int cap = getCap(team);
+        return cap >= Integer.MAX_VALUE - 1 ? "∞" : cap + "";
     }
 
     /** @return whether this player can interact with a specific tile. if either of these are null, returns true.*/
     public static boolean canInteract(Player player, Building tile){
-        return player == null || tile == null || tile.interactable(player.team());
+        return player == null || tile == null || tile.interactable(player.team()) || state.rules.editor;
+    }
+
+    public static boolean isHittable(@Nullable Posc target, boolean air, boolean ground){
+        return target != null && (target instanceof Buildingc ? ground : (target instanceof Unit u && u.checkTarget(air, ground)));
     }
 
     /**
@@ -93,7 +126,11 @@ public class Units{
      * @return whether the target is invalid
      */
     public static boolean invalidateTarget(Posc target, Team team, float x, float y, float range){
-        return target == null || (range != Float.MAX_VALUE && !target.within(x, y, range)) || (target instanceof Teamc && ((Teamc)target).team() == team) || (target instanceof Healthc && !((Healthc)target).isValid());
+        return target == null ||
+            (range != Float.MAX_VALUE && !target.within(x, y, range + (target instanceof Sized hb ? hb.hitSize()/2f : 0f))) ||
+            (target instanceof Teamc t && t.team() == team) ||
+            (target instanceof Healthc h && !h.isValid()) ||
+            (target instanceof Unit u && !u.targetable(team));
     }
 
     /** See {@link #invalidateTarget(Posc, Team, float, float, float)} */
@@ -117,44 +154,92 @@ public class Units{
         return anyEntities(tile, true);
     }
 
+    public static boolean anyEntities(float x, float y, float size){
+        return anyEntities(x - size/2f, y - size/2f, size, size, true);
+    }
+
     public static boolean anyEntities(float x, float y, float width, float height){
         return anyEntities(x, y, width, height, true);
     }
 
     public static boolean anyEntities(float x, float y, float width, float height, boolean ground){
-        boolResult = false;
+        anyEntityGround = ground;
+        aeX = x;
+        aeY = y;
+        aeW = width;
+        aeH = height;
 
-        nearby(x, y, width, height, unit -> {
-            if(boolResult) return;
-            if((unit.isGrounded() && !unit.type.hovering) == ground){
-                unit.hitbox(hitrect);
+        return nearbyCheck(x, y, width, height, anyEntityLambda);
+    }
 
-                if(hitrect.overlaps(x, y, width, height)){
-                    boolResult = true;
-                }
+    /** Note that this checks the tile hitbox, not the standard hitbox. */
+    public static boolean anyEntities(float x, float y, float width, float height, Boolf<Unit> check){
+
+        return nearbyCheck(x, y, width, height, unit -> {
+            if(check.get(unit)){
+                unit.hitboxTile(hitrect);
+
+                return hitrect.overlaps(x, y, width, height);
             }
+            return false;
         });
-
-        return boolResult;
     }
 
-    /** Returns the neareset damaged tile. */
+    /** Returns the nearest damaged tile. */
     public static Building findDamagedTile(Team team, float x, float y){
-        return Geometry.findClosest(x, y, indexer.getDamaged(team));
+        return indexer.getDamaged(team).min(b -> b.dst2(x, y));
     }
 
-    /** Returns the neareset ally tile in a range. */
+    /** Returns the nearest ally tile in a range. */
     public static Building findAllyTile(Team team, float x, float y, float range, Boolf<Building> pred){
         return indexer.findTile(team, x, y, range, pred);
     }
 
-    /** Returns the neareset enemy tile in a range. */
+    /** Returns the nearest enemy tile in a range. */
     public static Building findEnemyTile(Team team, float x, float y, float range, Boolf<Building> pred){
+        return findEnemyTile(team, x, y, range, false, pred);
+    }
+
+    /** Returns the nearest enemy tile in a range. */
+    public static Building findEnemyTile(Team team, float x, float y, float range, boolean checkUnder, Boolf<Building> pred){
         if(team == Team.derelict) return null;
 
+        if(checkUnder){
+            Building target = indexer.findEnemyTile(team, x, y, range, build -> !build.block.underBullets && pred.get(build));
+            if(target != null) return target;
+        }
+
         return indexer.findEnemyTile(team, x, y, range, pred);
     }
 
+    /** @return the closest building of the provided team that matches the predicate. */
+    public static @Nullable Building closestBuilding(Team team, float wx, float wy, float range, Boolf<Building> pred){
+        buildResult = null;
+        cdist = 0f;
+
+        var buildings = team.data().buildingTree;
+        if(buildings == null) return null;
+        buildings.intersect(wx - range, wy - range, range*2f, range*2f, b -> {
+            if(pred.get(b)){
+                float dst = b.dst(wx, wy) - b.hitSize()/2f;
+                if(dst <= range && (buildResult == null || dst <= cdist)){
+                    cdist = dst;
+                    buildResult = b;
+                }
+            }
+        });
+
+        var result = buildResult;
+        buildResult = null;
+
+        return result;
+    }
+
+    /** Iterates through all buildings in a range. */
+    public static void nearbyBuildings(float x, float y, float range, Cons<Building> cons){
+        indexer.allBuildings(x, y, range, cons);
+    }
+
     /** Returns the closest target enemy. First, units are checked, then tile entities. */
     public static Teamc closestTarget(Team team, float x, float y, float range){
         return closestTarget(team, x, y, range, Unit::isValid);
@@ -173,11 +258,11 @@ public class Units{
         if(unit != null){
             return unit;
         }else{
-            return findEnemyTile(team, x, y, range, tilePred);
+            return findEnemyTile(team, x, y, range, true, tilePred);
         }
     }
 
-    /** Returns the closest target enemy. First, units are checked, then tile entities. */
+    /** Returns the closest target enemy. First, units are checked, then buildings. */
     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;
 
@@ -185,7 +270,7 @@ public class Units{
         if(unit != null){
             return unit;
         }else{
-            return findEnemyTile(team, x, y, range, tilePred);
+            return findEnemyTile(team, x, y, range, true, tilePred);
         }
     }
 
@@ -195,14 +280,16 @@ public class Units{
 
         result = null;
         cdist = 0f;
+        cpriority = -99999f;
 
         nearbyEnemies(team, x - range, y - range, range*2f, range*2f, e -> {
-            if(e.dead() || !predicate.get(e) || e.team == Team.derelict) return;
+            if(e.dead() || !predicate.get(e) || e.team == Team.derelict || !e.targetable(team) || e.inFogTo(team)) return;
 
-            float dst2 = e.dst2(x, y);
-            if(dst2 < range*range && (result == null || dst2 < cdist)){
+            float dst2 = e.dst2(x, y) - (e.hitSize * e.hitSize);
+            if(dst2 < range*range && (result == null || dst2 < cdist || e.type.targetPriority > cpriority) && e.type.targetPriority >= cpriority){
                 result = e;
                 cdist = dst2;
+                cpriority = e.type.targetPriority;
             }
         });
 
@@ -215,14 +302,16 @@ public class Units{
 
         result = null;
         cdist = 0f;
+        cpriority = -99999f;
 
         nearbyEnemies(team, x - range, y - range, range*2f, range*2f, e -> {
-            if(e.dead() || !predicate.get(e) || !e.within(x, y, range)) return;
+            if(e.dead() || !predicate.get(e) || e.team == Team.derelict || !e.within(x, y, range + e.hitSize/2f) || !e.targetable(team) || e.inFogTo(team)) return;
 
             float cost = sort.cost(e, x, y);
-            if(result == null || cost < cdist){
+            if((result == null || cost < cdist || e.type.targetPriority > cpriority) && e.type.targetPriority >= cpriority){
                 result = e;
                 cdist = cost;
+                cpriority = e.type.targetPriority;
             }
         });
 
@@ -247,13 +336,13 @@ public class Units{
         return result;
     }
 
-    /** Returns the closest ally of this team. Filter by predicate. */
+    /** Returns the closest ally of this team in a range. Filter by predicate. */
     public static Unit closest(Team team, float x, float y, float range, Boolf<Unit> predicate){
         result = null;
         cdist = 0f;
 
         nearby(team, x, y, range, e -> {
-            if(!predicate.get(e)) return;
+            if(!e.isValid() || !predicate.get(e)) return;
 
             float dist = e.dst2(x, y);
             if(result == null || dist < cdist){
@@ -265,6 +354,24 @@ public class Units{
         return result;
     }
 
+    /** Returns the closest ally of this team in a range. Filter by predicate. */
+    public static Unit closest(Team team, float x, float y, float range, Boolf<Unit> predicate, Sortf sort){
+        result = null;
+        cdist = 0f;
+
+        nearby(team, x, y, range, e -> {
+            if(!e.isValid() || !predicate.get(e)) return;
+
+            float dist = sort.cost(e, x, y);
+            if(result == null || dist < cdist){
+                result = e;
+                cdist = dist;
+            }
+        });
+
+        return result;
+    }
+
     /** Returns the closest ally of this team. Filter by predicate.
      * Unlike the closest() function, this only guarantees that unit hitboxes overlap the range. */
     public static Unit closestOverlap(Team team, float x, float y, float range, Boolf<Unit> predicate){
@@ -272,7 +379,7 @@ public class Units{
         cdist = 0f;
 
         nearby(team, x - range, y - range, range*2f, range*2f, e -> {
-            if(!predicate.get(e)) return;
+            if(!e.isValid() || !predicate.get(e)) return;
 
             float dist = e.dst2(x, y);
             if(result == null || dist < cdist){
@@ -284,15 +391,42 @@ public class Units{
         return result;
     }
 
+    /** @return whether any units exist in this square (centered) */
+    public static int count(float x, float y, float size, Boolf<Unit> filter){
+        return count(x - size/2f, y - size/2f, size, size, filter);
+    }
+
+    /** @return whether any units exist in this rectangle */
+    public static int count(float x, float y, float width, float height, Boolf<Unit> filter){
+        intResult = 0;
+        Groups.unit.intersect(x, y, width, height, v -> {
+            if(filter.get(v)){
+                intResult ++;
+            }
+        });
+        return intResult;
+    }
+
+    /** @return whether any units exist in this rectangle */
+    public static boolean any(float x, float y, float width, float height, Boolf<Unit> filter){
+        return count(x, y, width, height, filter) > 0;
+    }
+
     /** Iterates over all units in a rectangle. */
-    public static void nearby(Team team, float x, float y, float width, float height, Cons<Unit> cons){
-        team.data().tree().intersect(x, y, width, height, cons);
+    public static void nearby(@Nullable Team team, float x, float y, float width, float height, Cons<Unit> cons){
+        if(team != null){
+            team.data().tree().intersect(x, y, width, height, cons);
+        }else{
+            for(var other : state.teams.present){
+                other.tree().intersect(x, y, width, height, cons);
+            }
+        }
     }
 
     /** Iterates over all units in a circle around this position. */
-    public static void nearby(Team team, float x, float y, float radius, Cons<Unit> cons){
+    public static void nearby(@Nullable Team team, float x, float y, float radius, Cons<Unit> cons){
         nearby(team, x - radius, y - radius, radius*2f, radius*2f, unit -> {
-            if(unit.within(x, y, radius)){
+            if(unit.within(x, y, radius + unit.hitSize/2f)){
                 cons.get(unit);
             }
         });
@@ -303,6 +437,14 @@ public class Units{
         Groups.unit.intersect(x, y, width, height, cons);
     }
 
+    /**
+     * Iterates over all units in a rectangle.
+     * @return whether a unit was found.
+     * */
+    public static boolean nearbyCheck(float x, float y, float width, float height, Boolf<Unit> cons){
+        return Groups.unit.intersect(x, y, width, height, cons);
+    }
+
     /** Iterates over all units in a rectangle. */
     public static void nearby(Rect rect, Cons<Unit> cons){
         nearby(rect.x, rect.y, rect.width, rect.height, cons);
@@ -318,11 +460,37 @@ public class Units{
         }
     }
 
+    /** Iterates over all units that are enemies of this team. */
+    public static void nearbyEnemies(Team team, float x, float y, float radius, Cons<Unit> cons){
+        nearbyEnemies(team, x - radius, y - radius, radius * 2f, radius * 2f, u -> {
+            if(u.within(x, y, radius + u.hitSize/2f)){
+                cons.get(u);
+            }
+        });
+    }
+
     /** Iterates over all units that are enemies of this team. */
     public static void nearbyEnemies(Team team, Rect rect, Cons<Unit> cons){
         nearbyEnemies(team, rect.x, rect.y, rect.width, rect.height, cons);
     }
 
+    /** @return whether there is an enemy in this rectangle. */
+    public static boolean nearEnemy(Team team, float x, float y, float width, float height){
+        Seq<TeamData> data = state.teams.present;
+        for(int i = 0; i < data.size; i++){
+            var other = data.items[i];
+            if(other.team != team && other.team != Team.derelict){
+                if(other.tree().any(x, y, width, height)){
+                    return true;
+                }
+                if(other.turretTree != null && other.turretTree.any(x, y, width, height)){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     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 c11c393602..d64a77ffea 100644
--- a/core/src/mindustry/entities/abilities/Ability.java
+++ b/core/src/mindustry/entities/abilities/Ability.java
@@ -3,10 +3,31 @@ package mindustry.entities.abilities;
 import arc.*;
 import arc.scene.ui.layout.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 
 public abstract class Ability implements Cloneable{
+    protected static final float descriptionWidth = 350f;
+    /** If false, this ability does not show in unit stats. */
+    public boolean display = true;
+    //the one and only data variable that is synced.
+    public float data;
+
     public void update(Unit unit){}
     public void draw(Unit unit){}
+    public void death(Unit unit){}
+    public void created(Unit unit){}
+    public void init(UnitType type){}
+    public void displayBars(Unit unit, Table bars){}
+    public void addStats(Table t){
+        if(Core.bundle.has(getBundle() + ".description")){
+            t.add(Core.bundle.get(getBundle() + ".description")).wrap().width(descriptionWidth);
+            t.row();
+        }
+    }
+
+    public String abilityStat(String stat, Object... values){
+        return Core.bundle.format("ability.stat." + stat, values);
+    }
 
     public Ability copy(){
         try{
@@ -17,12 +38,13 @@ public abstract class Ability implements Cloneable{
         }
     }
 
-    public void displayBars(Unit unit, Table bars){
-
-    }
-
     /** @return localized ability name; mods should override this. */
     public String localized(){
-        return Core.bundle.get("ability." + getClass().getSimpleName().replace("Ability", "").toLowerCase());
+        return Core.bundle.get(getBundle());
+    }
+
+    public String getBundle(){
+        var type = getClass();
+        return "ability." + (type.isAnonymousClass() ? type.getSuperclass() : type).getSimpleName().replace("Ability", "").toLowerCase();
     }
 }
diff --git a/core/src/mindustry/entities/abilities/ArmorPlateAbility.java b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
new file mode 100644
index 0000000000..d417e01735
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
@@ -0,0 +1,82 @@
+package mindustry.entities.abilities;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+public class ArmorPlateAbility extends Ability{
+    public TextureRegion plateRegion;
+    public TextureRegion shineRegion;
+    public String plateSuffix = "-armor";
+    public String shineSuffix = "-shine";
+    /** Color of the shine. If null, uses team color. */
+    public @Nullable Color color = null;
+    public float shineSpeed = 1f;
+    public float z = -1;
+
+    /** Whether to draw the plate region. */
+    public boolean drawPlate = true;
+    /** Whether to draw the shine over the plate region. */
+    public boolean drawShine = true;
+
+    public float healthMultiplier = 0.2f;
+
+    protected float warmup;
+
+    @Override
+    public void update(Unit unit){
+        super.update(unit);
+
+        warmup = Mathf.lerpDelta(warmup, unit.isShooting() ? 1f : 0f, 0.1f);
+        unit.healthMultiplier += warmup * healthMultiplier;
+    }
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(abilityStat("damagereduction", Strings.autoFixed(-healthMultiplier * 100f, 1)));
+    }
+
+    @Override
+    public void draw(Unit unit){
+        if(!drawPlate && !drawShine) return;
+
+        if(warmup > 0.001f){
+            if(plateRegion == null){
+                plateRegion = Core.atlas.find(unit.type.name + plateSuffix, unit.type.region);
+                shineRegion = Core.atlas.find(unit.type.name + shineSuffix, plateRegion);
+            }
+
+            float pz = Draw.z();
+            if(z > 0) Draw.z(z);
+
+            if(drawPlate){
+                Draw.alpha(warmup);
+                Draw.rect(plateRegion, unit.x, unit.y, unit.rotation - 90f);
+                Draw.alpha(1f);
+            }
+
+            if(drawShine){
+                Draw.draw(Draw.z(), () -> {
+                    Shaders.armor.region = shineRegion;
+                    Shaders.armor.progress = warmup;
+                    Shaders.armor.time = -Time.time / 20f * shineSpeed;
+
+                    Draw.color(color == null ? unit.team.color : color);
+                    Draw.shader(Shaders.armor);
+                    Draw.rect(shineRegion, unit.x, unit.y, unit.rotation - 90f);
+                    Draw.shader();
+
+                    Draw.reset();
+                });
+            }
+
+            Draw.z(pz);
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
new file mode 100644
index 0000000000..430ccd9d3c
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
@@ -0,0 +1,196 @@
+package mindustry.entities.abilities;
+
+import arc.*;
+import arc.audio.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class EnergyFieldAbility extends Ability{
+    private static final Seq<Healthc> all = new Seq<>();
+
+    public float damage = 1, reload = 100, range = 60;
+    public Effect healEffect = Fx.heal, hitEffect = Fx.hitLaserBlast, damageEffect = Fx.chainLightning;
+    public StatusEffect status = StatusEffects.electrified;
+    public Sound shootSound = Sounds.spark;
+    public float statusDuration = 60f * 6f;
+    public float x, y;
+    public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true;
+    public int maxTargets = 25;
+    public float healPercent = 3f;
+    /** Multiplies healing to units of the same type by this amount. */
+    public float sameTypeHealMult = 1f;
+    public boolean displayHeal = true;
+
+    public float layer = Layer.bullet - 0.001f, blinkScl = 20f, blinkSize = 0.1f;
+    public float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f;
+    public int sectors = 5;
+    public Color color = Pal.heal;
+    public boolean useAmmo = true;
+
+    protected float timer, curStroke;
+    protected boolean anyNearby = false;
+
+    EnergyFieldAbility(){}
+
+    public EnergyFieldAbility(float damage, float reload, float range){
+        this.damage = damage;
+        this.reload = reload;
+        this.range = range;
+    }
+
+    @Override
+    public void addStats(Table t){
+        if(displayHeal){
+            t.add(Core.bundle.get(getBundle() + ".healdescription")).wrap().width(descriptionWidth);
+        }else{
+            t.add(Core.bundle.get(getBundle() + ".description")).wrap().width(descriptionWidth);
+        }
+        t.row();
+
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("firingrate", Strings.autoFixed(60f / reload, 2)));
+        t.row();
+        t.add(abilityStat("maxtargets", maxTargets));
+        t.row();
+        t.add(Core.bundle.format("bullet.damage", damage));
+        if(status != StatusEffects.none){
+            t.row();
+            t.add((status.hasEmoji() ? status.emoji() : "") + "[stat]" + status.localizedName).with(l -> StatValues.withTooltip(l, status));
+        }
+        if(displayHeal){
+            t.row();
+            t.add(Core.bundle.format("bullet.healpercent", Strings.autoFixed(healPercent, 2)));
+            t.row();
+            t.add(abilityStat("sametypehealmultiplier", (sameTypeHealMult < 1f ? "[negstat]" : "") + Strings.autoFixed(sameTypeHealMult * 100f, 2)));
+        }
+    }
+
+    @Override
+    public void draw(Unit unit){
+        super.draw(unit);
+
+        Draw.z(layer);
+        Draw.color(color);
+        Tmp.v1.trns(unit.rotation - 90, x, y).add(unit.x, unit.y);
+        float rx = Tmp.v1.x, ry = Tmp.v1.y;
+        float orbRadius = effectRadius * (1f + Mathf.absin(blinkScl, blinkSize));
+
+        Fill.circle(rx, ry, orbRadius);
+        Draw.color();
+        Fill.circle(rx, ry, orbRadius / 2f);
+
+        Lines.stroke((0.7f + Mathf.absin(blinkScl, 0.7f)), color);
+
+        for(int i = 0; i < sectors; i++){
+            float rot = unit.rotation + i * 360f/sectors - Time.time * rotateSpeed;
+            Lines.arc(rx, ry, orbRadius + 3f, sectorRad, rot);
+        }
+
+        Lines.stroke(Lines.getStroke() * curStroke);
+
+        if(curStroke > 0){
+            for(int i = 0; i < sectors; i++){
+                float rot = unit.rotation + i * 360f/sectors + Time.time * rotateSpeed;
+                Lines.arc(rx, ry, range, sectorRad, rot);
+            }
+        }
+
+        Drawf.light(rx, ry, range * 1.5f, color, curStroke * 0.8f);
+
+        Draw.reset();
+    }
+
+    @Override
+    public void update(Unit unit){
+
+        curStroke = Mathf.lerpDelta(curStroke, anyNearby ? 1 : 0, 0.09f);
+
+        if((timer += Time.delta) >= reload && (!useAmmo || unit.ammo > 0 || !state.rules.unitAmmo)){
+            Tmp.v1.trns(unit.rotation - 90, x, y).add(unit.x, unit.y);
+            float rx = Tmp.v1.x, ry = Tmp.v1.y;
+            anyNearby = false;
+
+            all.clear();
+
+            if(hitUnits){
+                Units.nearby(null, rx, ry, range, other -> {
+                    if(other != unit && other.checkTarget(targetAir, targetGround) && other.targetable(unit.team) && (other.team != unit.team || other.damaged())){
+                        all.add(other);
+                    }
+                });
+            }
+
+            if(hitBuildings && targetGround){
+                Units.nearbyBuildings(rx, ry, range, b -> {
+                    if((b.team != Team.derelict || state.rules.coreCapture) && ((b.team != unit.team && b.block.targetable) || b.damaged()) && !b.block.privileged){
+                        all.add(b);
+                    }
+                });
+            }
+
+            all.sort(h -> h.dst2(rx, ry));
+            int len = Math.min(all.size, maxTargets);
+            for(int i = 0; i < len; i++){
+                Healthc other = all.get(i);
+
+                //lightning gets absorbed by plastanium
+                var absorber = Damage.findAbsorber(unit.team, rx, ry, other.getX(), other.getY());
+                if(absorber != null){
+                    other = absorber;
+                }
+
+                if(((Teamc)other).team() == unit.team){
+                    if(other.damaged()){
+                        anyNearby = true;
+                        float healMult = (other instanceof Unit u && u.type == unit.type) ? sameTypeHealMult : 1f;
+                        other.heal(healPercent / 100f * other.maxHealth() * healMult);
+                        healEffect.at(other);
+                        damageEffect.at(rx, ry, 0f, color, other);
+                        hitEffect.at(rx, ry, unit.angleTo(other), color);
+
+                        if(other instanceof Building b){
+                            Fx.healBlockFull.at(b.x, b.y, 0f, color, b.block);
+                        }
+                    }
+                }else{
+                    anyNearby = true;
+                    if(other instanceof Building b){
+                        b.damage(unit.team, damage * state.rules.unitDamage(unit.team));
+                    }else{
+                        other.damage(damage * state.rules.unitDamage(unit.team));
+                    }
+                    if(other instanceof Statusc s){
+                        s.apply(status, statusDuration);
+                    }
+                    hitEffect.at(other.x(), other.y(), unit.angleTo(other), color);
+                    damageEffect.at(rx, ry, 0f, color, other);
+                    hitEffect.at(rx, ry, unit.angleTo(other), color);
+                }
+            }
+
+            if(anyNearby){
+                shootSound.at(unit);
+
+                if(useAmmo && state.rules.unitAmmo){
+                    unit.ammo --;
+                }
+            }
+
+            timer = 0f;
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/ForceFieldAbility.java b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
index 38961a6433..2ef8e8e804 100644
--- a/core/src/mindustry/entities/abilities/ForceFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
@@ -8,11 +8,14 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
 
+import static mindustry.Vars.*;
+
 public class ForceFieldAbility extends Ability{
     /** Shield radius. */
     public float radius = 60f;
@@ -22,26 +25,23 @@ public class ForceFieldAbility extends Ability{
     public float max = 200f;
     /** Cooldown after the shield is broken, in ticks. */
     public float cooldown = 60f * 5;
+    /** Sides of shield polygon. */
+    public int sides = 6;
+    /** Rotation of shield. */
+    public float rotation = 0f;
 
     /** State. */
     protected float radiusScale, alpha;
+    protected boolean wasBroken = true;
 
     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){
+        if(trait.team != paramUnit.team && trait.type.absorbable && Intersector.isInRegularPolygon(paramField.sides, paramUnit.x, paramUnit.y, realRad, paramField.rotation, trait.x(), trait.y()) && paramUnit.shield > 0){
             trait.absorb();
             Fx.absorb.at(trait);
-
-            //break shield
-            if(paramUnit.shield <= trait.damage()){
-                paramUnit.shield -= paramField.cooldown * paramField.regen;
-
-                Fx.shieldBreak.at(paramUnit.x, paramUnit.y, paramField.radius, paramUnit.team.color);
-            }
-
-            paramUnit.shield -= trait.damage();
+            paramUnit.shield -= trait.type().shieldDamage(trait);
             paramField.alpha = 1f;
         }
     };
@@ -53,10 +53,39 @@ public class ForceFieldAbility extends Ability{
         this.cooldown = cooldown;
     }
 
+    public ForceFieldAbility(float radius, float regen, float max, float cooldown, int sides, float rotation){
+        this.radius = radius;
+        this.regen = regen;
+        this.max = max;
+        this.cooldown = cooldown;
+        this.sides = sides;
+        this.rotation = rotation;
+    }
+
     ForceFieldAbility(){}
 
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(radius / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("shield", Strings.autoFixed(max, 2)));
+        t.row();
+        t.add(abilityStat("repairspeed", Strings.autoFixed(regen * 60f, 2)));
+        t.row();
+        t.add(abilityStat("cooldown", Strings.autoFixed(cooldown / 60f, 2)));
+    }
+
     @Override
     public void update(Unit unit){
+        if(unit.shield <= 0f && !wasBroken){
+            unit.shield -= cooldown * regen;
+
+            Fx.shieldBreak.at(unit.x, unit.y, radius, unit.type.shieldColor(unit), this);
+        }
+
+        wasBroken = unit.shield <= 0f;
+
         if(unit.shield < max){
             unit.shield += Time.delta * regen;
         }
@@ -75,23 +104,32 @@ public class ForceFieldAbility extends Ability{
         }
     }
 
+    @Override
+    public void death(Unit unit){
+
+        //self-destructing units can have a shield on death
+        if(unit.shield > 0f && !wasBroken){
+            Fx.shieldBreak.at(unit.x, unit.y, radius, unit.type.shieldColor(unit), this);
+        }
+    }
+
     @Override
     public void draw(Unit unit){
         checkRadius(unit);
 
         if(unit.shield > 0){
-            Draw.z(Layer.shields);
+            Draw.color(unit.type.shieldColor(unit), Color.white, Mathf.clamp(alpha));
 
-            Draw.color(unit.team.color, Color.white, Mathf.clamp(alpha));
-
-            if(Core.settings.getBool("animatedshields")){
-                Fill.poly(unit.x, unit.y, 6, realRad);
+            if(Vars.renderer.animateShields){
+                Draw.z(Layer.shields + 0.001f * alpha);
+                Fill.poly(unit.x, unit.y, sides, realRad, rotation);
             }else{
+                Draw.z(Layer.shields);
                 Lines.stroke(1.5f);
                 Draw.alpha(0.09f);
-                Fill.poly(unit.x, unit.y, 6, radius);
+                Fill.poly(unit.x, unit.y, sides, radius, rotation);
                 Draw.alpha(1f);
-                Lines.poly(unit.x, unit.y, 6, radius);
+                Lines.poly(unit.x, unit.y, sides, radius, rotation);
             }
         }
     }
@@ -101,6 +139,11 @@ public class ForceFieldAbility extends Ability{
         bars.add(new Bar("stat.shieldhealth", Pal.accent, () -> unit.shield / max)).row();
     }
 
+    @Override
+    public void created(Unit unit){
+        unit.shield = max;
+    }
+
     public void checkRadius(Unit unit){
         //timer2 is used to store radius scale as an effect
         realRad = radiusScale * radius;
diff --git a/core/src/mindustry/entities/abilities/LiquidExplodeAbility.java b/core/src/mindustry/entities/abilities/LiquidExplodeAbility.java
new file mode 100644
index 0000000000..cf6b16f6e8
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/LiquidExplodeAbility.java
@@ -0,0 +1,45 @@
+package mindustry.entities.abilities;
+
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.util.noise.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class LiquidExplodeAbility extends Ability{
+    public Liquid liquid = Liquids.water;
+    public float amount = 120f;
+    public float radAmountScale = 5f, radScale = 1f;
+    public float noiseMag = 6.5f, noiseScl = 5f;
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add((liquid.hasEmoji() ? liquid.emoji() : "") + "[stat]" + liquid.localizedName);
+    }
+
+    @Override
+    public void death(Unit unit){
+        //TODO what if noise is radial, so it looks like a splat?
+        int tx = unit.tileX(), ty = unit.tileY();
+        int rad = Math.max((int)(unit.hitSize / tilesize * radScale), 1);
+        float realNoise = unit.hitSize / noiseMag;
+        for(int x = -rad; x <= rad; x++){
+            for(int y = -rad; y <= rad; y++){
+                if(x*x + y*y <= rad*rad - Simplex.noise2d(0, 2, 0.5f, 1f / noiseScl, x + tx, y + ty) * realNoise * realNoise){
+                    float scaling = (1f - Mathf.dst(x, y) / rad) * radAmountScale;
+
+                    Tile tile = world.tile(tx + x, ty + y);
+                    if(tile != null){
+                        Puddles.deposit(tile, liquid, amount * scaling);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/LiquidRegenAbility.java b/core/src/mindustry/entities/abilities/LiquidRegenAbility.java
new file mode 100644
index 0000000000..6f864035ce
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/LiquidRegenAbility.java
@@ -0,0 +1,62 @@
+package mindustry.entities.abilities;
+
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class LiquidRegenAbility extends Ability{
+    public Liquid liquid;
+    public float slurpSpeed = 9f;
+    public float regenPerSlurp = 2.9f;
+    public float slurpEffectChance = 0.4f;
+    public Effect slurpEffect = Fx.heal;
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add((liquid.hasEmoji() ? liquid.emoji() : "") + "[stat]" + liquid.localizedName);
+        t.row();
+        t.add(abilityStat("slurpheal", Strings.autoFixed(regenPerSlurp, 2)));
+    }
+
+    @Override
+    public void update(Unit unit){
+        //TODO timer?
+
+        //TODO effects?
+        if(unit.damaged()){
+            boolean healed = false;
+            int tx = unit.tileX(), ty = unit.tileY();
+            int rad = Math.max((int)(unit.hitSize / tilesize * 0.6f), 1);
+            for(int x = -rad; x <= rad; x++){
+                for(int y = -rad; y <= rad; y++){
+                    if(x*x + y*y <= rad*rad){
+
+                        Tile tile = world.tile(tx + x, ty + y);
+                        if(tile != null){
+                            Puddle puddle = Puddles.get(tile);
+                            if(puddle != null && puddle.liquid == liquid){
+                                float fractionTaken = Math.min(puddle.amount, (slurpSpeed * Time.delta));
+                                puddle.amount -= Math.min(puddle.amount, slurpSpeed * Time.delta);
+                                unit.heal(fractionTaken * regenPerSlurp);
+                                healed = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if(healed && Mathf.chanceDelta(slurpEffectChance)){
+                Tmp.v1.rnd(Mathf.random(unit.hitSize/2f));
+                slurpEffect.at(unit.x + Tmp.v1.x, unit.y + Tmp.v1.y, unit.rotation, unit);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/MoveEffectAbility.java b/core/src/mindustry/entities/abilities/MoveEffectAbility.java
new file mode 100644
index 0000000000..48e2ba709c
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/MoveEffectAbility.java
@@ -0,0 +1,47 @@
+package mindustry.entities.abilities;
+
+import arc.graphics.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+
+public class MoveEffectAbility extends Ability{
+    public float minVelocity = 0.08f;
+    public float interval = 3f;
+    public float x, y, rotation;
+    public boolean rotateEffect = false;
+    public float effectParam = 3f;
+    public boolean teamColor = false;
+    public boolean parentizeEffects;
+    public Color color = Color.white;
+    public Effect effect = Fx.missileTrail;
+
+    protected float counter;
+
+    public MoveEffectAbility(float x, float y, Color color, Effect effect, float interval){
+        this.x = x;
+        this.y = y;
+        this.color = color;
+        this.effect = effect;
+        this.interval = interval;
+        display = false;
+    }
+
+    public MoveEffectAbility(){
+        display = false;
+    }
+
+    @Override
+    public void update(Unit unit){
+        if(Vars.headless) return;
+
+        counter += Time.delta;
+        if(unit.vel.len2() >= minVelocity * minVelocity && (counter >= interval) && !unit.inFogTo(Vars.player.team())){
+            Tmp.v1.trns(unit.rotation - 90f, x, y);
+            counter %= interval;
+            effect.at(Tmp.v1.x + unit.x, Tmp.v1.y + unit.y, (rotateEffect ? unit.rotation : effectParam) + rotation, teamColor ? unit.team.color : color, parentizeEffects ? unit : null);
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/MoveLightningAbility.java b/core/src/mindustry/entities/abilities/MoveLightningAbility.java
index 17d3eaa23a..c55849690b 100644
--- a/core/src/mindustry/entities/abilities/MoveLightningAbility.java
+++ b/core/src/mindustry/entities/abilities/MoveLightningAbility.java
@@ -1,46 +1,111 @@
 package mindustry.entities.abilities;
 
-import arc.graphics.*;
-import arc.math.*;
-import arc.util.*;
+import arc.*;
 import arc.audio.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 
+import static mindustry.Vars.*;
+
 public class MoveLightningAbility extends Ability{
-    //Lightning damage
+    /** Lightning damage */
     public float damage = 35f;
-    //Chance of firing every tick. Set >= 1 to always fire lightning every tick at max speed.
+    /** Chance of firing every tick. Set >= 1 to always fire lightning every tick at max speed */
     public float chance = 0.15f;
-    //Length of the lightning
+    /** Length of the lightning. <= 0 to disable */
     public int length = 12;
-    //Speeds for when to start lightninging and when to stop getting faster
+    /** Speeds for when to start lightninging and when to stop getting faster */
     public float minSpeed = 0.8f, maxSpeed = 1.2f;
-    //Lightning color
+    /** Lightning color */
     public Color color = Color.valueOf("a9d8ff");
+    /** Shifts where the lightning spawns along the Y axis */
+    public float y = 0f;
+    /** Offset along the X axis */
+    public float x = 0f;
+    /** Whether the spawn side alternates */
+    public boolean alternate = true;
+    /** Jittering heat sprite like the shield on v5 Javelin */
+    public String heatRegion = "error";
+    /** Bullet type that is fired. Can be null */
+    public @Nullable BulletType bullet;
+    /** Bullet angle parameters */
+    public float bulletAngle = 0f, bulletSpread = 0f;
     
     public Effect shootEffect = Fx.sparkShoot;
+    public boolean parentizeEffects;
     public Sound shootSound = Sounds.spark;
+
+    protected float side = 1f;
     
     MoveLightningAbility(){}
     
-    public MoveLightningAbility(float damage, int length, float chance, float minSpeed, float maxSpeed, Color color){
+    public MoveLightningAbility(float damage, int length, float chance, float y, float minSpeed, float maxSpeed, Color color, String heatRegion){
         this.damage = damage;
         this.length = length;
         this.chance = chance;
+        this.y = y;
+        this.minSpeed = minSpeed;
+        this.maxSpeed = maxSpeed;
+        this.color = color;
+        this.heatRegion = heatRegion;
+    }
+    
+    public MoveLightningAbility(float damage, int length, float chance, float y, float minSpeed, float maxSpeed, Color color){
+        this.damage = damage;
+        this.length = length;
+        this.chance = chance;
+        this.y = y;
         this.minSpeed = minSpeed;
         this.maxSpeed = maxSpeed;
         this.color = color;
     }
-    
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(abilityStat("minspeed", Strings.autoFixed(minSpeed * 60f / tilesize, 2)));
+        t.row();
+        t.add(Core.bundle.format("bullet.damage", damage));
+    }
+
     @Override
     public void update(Unit unit){
         float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed));
         if(Mathf.chance(Time.delta * chance * scl)){
-            shootEffect.at(unit.x, unit.y, unit.rotation, color);
-            Lightning.create(unit.team, color, damage, unit.x + unit.vel.x, unit.y + unit.vel.y, unit.rotation, length);
-            shootSound.at(unit);
+            float x = unit.x + Angles.trnsx(unit.rotation, this.y, this.x * side), y = unit.y + Angles.trnsy(unit.rotation, this.y, this.x * side);
+
+            shootEffect.at(x, y, unit.rotation, color, parentizeEffects ? unit : null);
+            shootSound.at(x, y);
+
+            if(length > 0){
+                Lightning.create(unit.team, color, damage, x + unit.vel.x, y + unit.vel.y, unit.rotation, length);
+            }
+
+            if(bullet != null){
+                bullet.create(unit, unit.team, x, y, unit.rotation + bulletAngle + Mathf.range(bulletSpread));
+            }
+
+            if(alternate) side *= -1f;
+        }
+    }
+    
+    @Override
+    public void draw(Unit unit){
+        float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed));
+        TextureRegion region = Core.atlas.find(heatRegion);
+        if(Core.atlas.isFound(region) && scl > 0.00001f){
+            Draw.color(color);
+            Draw.alpha(scl / 2f);
+            Draw.blend(Blending.additive);
+            Draw.rect(region, unit.x + Mathf.range(scl / 2f), unit.y + Mathf.range(scl / 2f), unit.rotation - 90);
+            Draw.blend();
         }
     }
 }
diff --git a/core/src/mindustry/entities/abilities/RegenAbility.java b/core/src/mindustry/entities/abilities/RegenAbility.java
new file mode 100644
index 0000000000..ffcfe50e9d
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/RegenAbility.java
@@ -0,0 +1,32 @@
+package mindustry.entities.abilities;
+
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.gen.*;
+
+public class RegenAbility extends Ability{
+    /** Amount healed as percent per tick. */
+    public float percentAmount = 0f;
+    /** Amount healed as a flat amount per tick. */
+    public float amount = 0f;
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+
+        boolean flat = amount >= 0.001f;
+        boolean percent = percentAmount >= 0.001f;
+
+        if(flat || percent){
+            t.add(abilityStat("regen",
+                (flat ? Strings.autoFixed(amount * 60f, 2) + (percent ? " [lightgray]+[stat] " : "") : "")
+                    + (percent ? Strings.autoFixed(percentAmount * 60f, 2) + "%" : "")
+            ));
+        }
+    }
+
+    @Override
+    public void update(Unit unit){
+        unit.heal((unit.maxHealth * percentAmount / 100f + amount) * Time.delta);
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/RepairFieldAbility.java b/core/src/mindustry/entities/abilities/RepairFieldAbility.java
index 9e2890589a..7c871978cc 100644
--- a/core/src/mindustry/entities/abilities/RepairFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/RepairFieldAbility.java
@@ -1,14 +1,19 @@
 package mindustry.entities.abilities;
 
+import arc.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 
+import static mindustry.Vars.*;
+
 public class RepairFieldAbility extends Ability{
     public float amount = 1, reload = 100, range = 60;
     public Effect healEffect = Fx.heal;
     public Effect activeEffect = Fx.healWaveDynamic;
+    public boolean parentizeEffects = false;
 
     protected float timer;
     protected boolean wasHealed = false;
@@ -21,6 +26,14 @@ public class RepairFieldAbility extends Ability{
         this.range = range;
     }
 
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("repairspeed", Strings.autoFixed(amount * 60f / reload, 2)));
+    }
+
     @Override
     public void update(Unit unit){
         timer += Time.delta;
@@ -30,7 +43,7 @@ public class RepairFieldAbility extends Ability{
 
             Units.nearby(unit.team, unit.x, unit.y, range, other -> {
                 if(other.damaged()){
-                    healEffect.at(other);
+                    healEffect.at(other, parentizeEffects);
                     wasHealed = true;
                 }
                 other.heal(amount);
diff --git a/core/src/mindustry/entities/abilities/ShieldArcAbility.java b/core/src/mindustry/entities/abilities/ShieldArcAbility.java
new file mode 100644
index 0000000000..a4d60c3eec
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/ShieldArcAbility.java
@@ -0,0 +1,139 @@
+package mindustry.entities.abilities;
+
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+
+public class ShieldArcAbility extends Ability{
+    private static Unit paramUnit;
+    private static ShieldArcAbility paramField;
+    private static Vec2 paramPos = new Vec2();
+    private static final Cons<Bullet> shieldConsumer = b -> {
+        if(b.team != paramUnit.team && b.type.absorbable && paramField.data > 0 &&
+            !(b.within(paramPos, paramField.radius - paramField.width/2f) && paramPos.within(b.x - b.deltaX, b.y - b.deltaY, paramField.radius - paramField.width/2f)) &&
+            (Tmp.v1.set(b).add(b.deltaX, b.deltaY).within(paramPos, paramField.radius + paramField.width/2f) || b.within(paramPos, paramField.radius + paramField.width/2f)) &&
+            (Angles.within(paramPos.angleTo(b), paramUnit.rotation + paramField.angleOffset, paramField.angle / 2f) || Angles.within(paramPos.angleTo(b.x + b.deltaX, b.y + b.deltaY), paramUnit.rotation + paramField.angleOffset, paramField.angle / 2f))){
+
+            b.absorb();
+            Fx.absorb.at(b);
+
+            //break shield
+            if(paramField.data <= b.damage()){
+                paramField.data -= paramField.cooldown * paramField.regen;
+
+                Fx.arcShieldBreak.at(paramPos.x, paramPos.y, 0, paramField.color == null ? paramUnit.type.shieldColor(paramUnit) : paramField.color, paramUnit);
+            }
+
+            paramField.data -= b.damage();
+            paramField.alpha = 1f;
+        }
+    };
+
+    /** Shield radius. */
+    public float radius = 60f;
+    /** Shield regen speed in damage/tick. */
+    public float regen = 0.1f;
+    /** Maximum shield. */
+    public float max = 200f;
+    /** Cooldown after the shield is broken, in ticks. */
+    public float cooldown = 60f * 5;
+    /** Angle of shield arc. */
+    public float angle = 80f;
+    /** Offset parameters for shield. */
+    public float angleOffset = 0f, x = 0f, y = 0f;
+    /** If true, only activates when shooting. */
+    public boolean whenShooting = true;
+    /** Width of shield line. */
+    public float width = 6f;
+
+    /** Whether to draw the arc line. */
+    public boolean drawArc = true;
+    /** If not null, will be drawn on top. */
+    public @Nullable String region;
+    /** Color override of the shield. Uses unit shield colour by default. */
+    public @Nullable Color color;
+    /** If true, sprite position will be influenced by x/y. */
+    public boolean offsetRegion = false;
+
+    /** State. */
+    protected float widthScale, alpha;
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(abilityStat("shield", Strings.autoFixed(max, 2)));
+        t.row();
+        t.add(abilityStat("repairspeed", Strings.autoFixed(regen * 60f, 2)));
+        t.row();
+        t.add(abilityStat("cooldown", Strings.autoFixed(cooldown / 60f, 2)));
+    }
+
+    @Override
+    public void update(Unit unit){
+
+        if(data < max){
+            data += Time.delta * regen;
+        }
+
+        boolean active = data > 0 && (unit.isShooting || !whenShooting);
+        alpha = Math.max(alpha - Time.delta/10f, 0f);
+
+        if(active){
+            widthScale = Mathf.lerpDelta(widthScale, 1f, 0.06f);
+            paramUnit = unit;
+            paramField = this;
+            paramPos.set(x, y).rotate(unit.rotation - 90f).add(unit);
+
+            float reach = radius + width / 2f;
+            Groups.bullet.intersect(paramPos.x - reach, paramPos.y - reach, reach * 2f, reach * 2f, shieldConsumer);
+        }else{
+            widthScale = Mathf.lerpDelta(widthScale, 0f, 0.11f);
+        }
+    }
+
+    @Override
+    public void created(Unit unit){
+        data = max;
+    }
+
+    @Override
+    public void draw(Unit unit){
+        if(widthScale > 0.001f){
+            Draw.z(Layer.shields);
+
+            Draw.color(color == null ? unit.type.shieldColor(unit) : color, Color.white, Mathf.clamp(alpha));
+            var pos = paramPos.set(x, y).rotate(unit.rotation - 90f).add(unit);
+
+            if(!Vars.renderer.animateShields){
+                Draw.alpha(0.4f);
+            }
+
+            if(region != null){
+                Vec2 rp = offsetRegion ? pos : Tmp.v1.set(unit);
+                Draw.yscl = widthScale;
+                Draw.rect(region, rp.x, rp.y, unit.rotation - 90);
+                Draw.yscl = 1f;
+            }
+
+            if(drawArc){
+                Lines.stroke(width * widthScale);
+                Lines.arc(pos.x, pos.y, radius, angle / 360f, unit.rotation + angleOffset - angle / 2f);
+            }
+            Draw.reset();
+        }
+    }
+
+    @Override
+    public void displayBars(Unit unit, Table bars){
+        bars.add(new Bar("stat.shieldhealth", Pal.accent, () -> data / max)).row();
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java b/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java
index 8af8d2390a..fe7a3e68bb 100644
--- a/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java
@@ -1,14 +1,19 @@
 package mindustry.entities.abilities;
 
+import arc.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 
+import static mindustry.Vars.*;
+
 public class ShieldRegenFieldAbility extends Ability{
     public float amount = 1, max = 100f, reload = 100, range = 60;
     public Effect applyEffect = Fx.shieldApply;
     public Effect activeEffect = Fx.shieldWave;
+    public boolean parentizeEffects;
 
     protected float timer;
     protected boolean applied = false;
@@ -22,6 +27,18 @@ public class ShieldRegenFieldAbility extends Ability{
         this.range = range;
     }
 
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("firingrate", Strings.autoFixed(60f / reload, 2)));
+        t.row();
+        t.add(abilityStat("pulseregen", Strings.autoFixed(amount, 2)));
+        t.row();
+        t.add(abilityStat("shield", Strings.autoFixed(max, 2)));
+    }
+
     @Override
     public void update(Unit unit){
         timer += Time.delta;
@@ -31,15 +48,15 @@ public class ShieldRegenFieldAbility extends Ability{
 
             Units.nearby(unit.team, unit.x, unit.y, range, other -> {
                 if(other.shield < max){
-                    other.shield = Math.max(other.shield + amount, max);
+                    other.shield = Math.min(other.shield + amount, max);
                     other.shieldAlpha = 1f; //TODO may not be necessary
-                    applyEffect.at(unit);
+                    applyEffect.at(other.x, other.y, 0f, other.type.shieldColor(other), parentizeEffects ? other : null);
                     applied = true;
                 }
             });
 
             if(applied){
-                activeEffect.at(unit);
+                activeEffect.at(unit.x, unit.y, unit.type.shieldColor(unit));
             }
 
             timer = 0f;
diff --git a/core/src/mindustry/entities/abilities/SpawnDeathAbility.java b/core/src/mindustry/entities/abilities/SpawnDeathAbility.java
new file mode 100644
index 0000000000..6bc5b0a49d
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/SpawnDeathAbility.java
@@ -0,0 +1,46 @@
+package mindustry.entities.abilities;
+
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+/** Spawns a certain amount of units upon death. */
+public class SpawnDeathAbility extends Ability{
+    public UnitType unit;
+    public int amount = 1, randAmount = 0;
+    /** Random spread of units away from the spawned. */
+    public float spread = 8f;
+    /** If true, units spawned face outwards from the middle. */
+    public boolean faceOutwards = true;
+
+    public SpawnDeathAbility(UnitType unit, int amount, float spread){
+        this.unit = unit;
+        this.amount = amount;
+        this.spread = spread;
+    }
+
+    public SpawnDeathAbility(){
+    }
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add("[stat]" + (randAmount > 0 ? amount + "x-" + (amount + randAmount) : amount) + "x[] " + (unit.hasEmoji() ? unit.emoji() : "") + "[stat]" + unit.localizedName);
+    }
+
+    @Override
+    public void death(Unit unit){
+        if(!Vars.net.client()){
+            int spawned = amount + Mathf.random(randAmount);
+            for(int i = 0; i < spawned; i++){
+                Tmp.v1.rnd(Mathf.random(spread));
+                var u = this.unit.spawn(unit.team, unit.x + Tmp.v1.x, unit.y + Tmp.v1.y);
+
+                u.rotation = faceOutwards ? Tmp.v1.angle() : unit.rotation + Mathf.range(5f);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/StatusFieldAbility.java b/core/src/mindustry/entities/abilities/StatusFieldAbility.java
index a1bf47d408..a70a382bf0 100644
--- a/core/src/mindustry/entities/abilities/StatusFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/StatusFieldAbility.java
@@ -1,16 +1,27 @@
 package mindustry.entities.abilities;
 
+import arc.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.type.*;
 
+import static mindustry.Vars.*;
+
 public class StatusFieldAbility extends Ability{
     public StatusEffect effect;
-    public float duration = 60, reload = 100, range = 20;
-    public Effect applyEffect = Fx.heal;
+    public float duration = 60, reload = 100, range = 20; //
+    public boolean onShoot = false;
+    public Effect applyEffect = Fx.none;
     public Effect activeEffect = Fx.overdriveWave;
+    public float effectX, effectY;
+    public boolean parentizeEffects, effectSizeParam = true;
+    public Color color = Pal.accent;
 
     protected float timer;
 
@@ -23,16 +34,28 @@ public class StatusFieldAbility extends Ability{
         this.effect = effect;
     }
 
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("firingrate", Strings.autoFixed(60f / reload, 2)));
+        t.row();
+        t.add((effect.hasEmoji() ? effect.emoji() : "") + "[stat]" + effect.localizedName);
+    }
+
     @Override
     public void update(Unit unit){
         timer += Time.delta;
 
-        if(timer >= reload){
+        if(timer >= reload && (!onShoot || unit.isShooting)){
             Units.nearby(unit.team, unit.x, unit.y, range, other -> {
                 other.apply(effect, duration);
+                applyEffect.at(other, parentizeEffects);
             });
 
-            activeEffect.at(unit);
+            float x = unit.x + Angles.trnsx(unit.rotation, effectY, effectX), y = unit.y + Angles.trnsy(unit.rotation, effectY, effectX);
+            activeEffect.at(x, y, effectSizeParam ? range : unit.rotation, color, parentizeEffects ? unit : null);
 
             timer = 0f;
         }
diff --git a/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java
new file mode 100644
index 0000000000..be69a45797
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java
@@ -0,0 +1,101 @@
+package mindustry.entities.abilities;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+
+import static mindustry.Vars.*;
+
+public class SuppressionFieldAbility extends Ability{
+    protected static Rand rand = new Rand();
+
+    public float reload = 60f * 1.5f;
+    public float range = 200f;
+
+    public float orbRadius = 4.1f, orbMidScl = 0.33f, orbSinScl = 8f, orbSinMag = 1f;
+    public Color color = Pal.suppress;
+    public float layer = Layer.effect;
+
+    public float x = 0f, y = 0f;
+    public int particles = 15;
+    public float particleSize = 4f;
+    public float particleLen = 7f;
+    public float rotateScl = 3f;
+    public float particleLife = 110f;
+    public boolean active = true;
+    public Interp particleInterp = f -> Interp.circleOut.apply(Interp.slope.apply(f));
+    public Color particleColor = Pal.sap.cpy();
+    public Color effectColor = Pal.sapBullet;
+
+    public float applyParticleChance = 13f;
+
+    protected float timer;
+
+    @Override
+    public void init(UnitType type){
+        if(!active) display = false;
+    }
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("duration", Strings.autoFixed(reload / 60f, 2)));
+    }
+
+    @Override
+    public void update(Unit unit){
+        if(!active) return;
+
+        if((timer += Time.delta) >= reload){
+            Tmp.v1.set(x, y).rotate(unit.rotation - 90f).add(unit);
+            Damage.applySuppression(unit.team, Tmp.v1.x, Tmp.v1.y, range, reload, reload, applyParticleChance, unit, effectColor);
+            timer = 0f;
+        }
+    }
+
+    @Override
+    public void draw(Unit unit){
+        Draw.z(layer);
+
+        float rad = orbRadius + Mathf.absin(orbSinScl, orbSinMag);
+        Tmp.v1.set(x, y).rotate(unit.rotation - 90f).add(unit);
+        float rx = Tmp.v1.x, ry = Tmp.v1.y;
+
+        float base = (Time.time / particleLife);
+        rand.setSeed(unit.id + hashCode());
+        Draw.color(particleColor);
+        for(int i = 0; i < particles; i++){
+            float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin;
+            float angle = rand.random(360f) + (Time.time / rotateScl + unit.rotation) % 360f;
+            float len = particleLen * particleInterp.apply(fout);
+            Fill.circle(
+            rx + Angles.trnsx(angle, len),
+            ry + Angles.trnsy(angle, len),
+            particleSize * Mathf.slope(fin)
+            );
+        }
+
+        Lines.stroke(2f);
+
+        Draw.color(color);
+        Lines.circle(rx, ry, rad);
+
+        Draw.color(color);
+        Fill.circle(rx, ry, rad * orbMidScl);
+
+        if(active){
+            //TODO draw range when selected?
+        }
+
+        Draw.reset();
+    }
+}
diff --git a/core/src/mindustry/entities/abilities/UnitSpawnAbility.java b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
index 422a02bbba..28307cec9c 100644
--- a/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
+++ b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
@@ -3,26 +3,28 @@ package mindustry.entities.abilities;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 
 import static mindustry.Vars.*;
 
 public class UnitSpawnAbility extends Ability{
-    public UnitType type;
+    public UnitType unit;
     public float spawnTime = 60f, spawnX, spawnY;
     public Effect spawnEffect = Fx.spawn;
+    public boolean parentizeEffects;
 
     protected float timer;
 
-    public UnitSpawnAbility(UnitType type, float spawnTime, float spawnX, float spawnY){
-        this.type = type;
+    public UnitSpawnAbility(UnitType unit, float spawnTime, float spawnX, float spawnY){
+        this.unit = unit;
         this.spawnTime = spawnTime;
         this.spawnX = spawnX;
         this.spawnY = spawnY;
@@ -32,15 +34,24 @@ public class UnitSpawnAbility extends Ability{
     }
 
     @Override
-    public void update(Unit unit){
-        timer += Time.delta * state.rules.unitBuildSpeedMultiplier;
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(abilityStat("buildtime", Strings.autoFixed(spawnTime / 60f, 2)));
+        t.row();
+        t.add((unit.hasEmoji() ? unit.emoji() : "") + "[stat]" + unit.localizedName);
+    }
 
-        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);
+    @Override
+    public void update(Unit unit){
+        timer += Time.delta * state.rules.unitBuildSpeed(unit.team);
+
+        if(timer >= spawnTime && Units.canCreate(unit.team, this.unit)){
+            float x = unit.x + Angles.trnsx(unit.rotation, spawnY, -spawnX), y = unit.y + Angles.trnsy(unit.rotation, spawnY, -spawnX);
+            spawnEffect.at(x, y, 0f, parentizeEffects ? unit : null);
+            Unit u = this.unit.create(unit.team);
             u.set(x, y);
             u.rotation = unit.rotation;
+            Events.fire(new UnitCreateEvent(u, null, unit));
             if(!Vars.net.client()){
                 u.add();
             }
@@ -51,16 +62,16 @@ public class UnitSpawnAbility extends Ability{
 
     @Override
     public void draw(Unit unit){
-        if(Units.canCreate(unit.team, type)){
+        if(Units.canCreate(unit.team, this.unit)){
             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);
+                float x = unit.x + Angles.trnsx(unit.rotation, spawnY, -spawnX), y = unit.y + Angles.trnsy(unit.rotation, spawnY, -spawnX);
+                Drawf.construct(x, y, this.unit.fullIcon, unit.rotation - 90, timer / spawnTime, 1f, timer);
             });
         }
     }
 
     @Override
     public String localized(){
-        return Core.bundle.format("ability.unitspawn", type.localizedName);
+        return Core.bundle.format("ability.unitspawn", unit.localizedName);
     }
 }
diff --git a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java
index a35c670316..69e6afbd97 100644
--- a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java
+++ b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java
@@ -1,10 +1,9 @@
 package mindustry.entities.bullet;
 
-import arc.graphics.g2d.*;
+import arc.math.*;
 import mindustry.content.*;
 import mindustry.gen.*;
 
-//TODO scale velocity depending on fslope()
 public class ArtilleryBulletType extends BasicBulletType{
     public float trailMult = 1f, trailSize = 4f;
 
@@ -13,11 +12,31 @@ public class ArtilleryBulletType extends BasicBulletType{
         collidesTiles = false;
         collides = false;
         collidesAir = false;
-        scaleVelocity = true;
+        scaleLife = true;
         hitShake = 1f;
         hitSound = Sounds.explosion;
+        hitEffect = Fx.flakExplosion;
         shootEffect = Fx.shootBig;
         trailEffect = Fx.artilleryTrail;
+
+        //default settings:
+        shrinkX = 0.15f;
+        shrinkY = 0.63f;
+        shrinkInterp = Interp.slope;
+
+        //for trail:
+
+        /*
+        trailLength = 27;
+        trailWidth = 3.5f;
+        trailEffect = Fx.none;
+        trailColor = Pal.bulletYellowBack;
+
+        trailInterp = Interp.slope;
+
+        shrinkX = 0.8f;
+        shrinkY = 0.3f;
+        */
     }
 
     public ArtilleryBulletType(float speed, float damage){
@@ -33,21 +52,7 @@ public class ArtilleryBulletType extends BasicBulletType{
         super.update(b);
 
         if(b.timer(0, (3 + b.fslope() * 2f) * trailMult)){
-            trailEffect.at(b.x, b.y, b.fslope() * trailSize, backColor);
+            trailEffect.at(b.x, b.y, trailRotation ? b.rotation() : b.fslope() * trailSize, backColor);
         }
     }
-
-    @Override
-    public void draw(Bullet b){
-        float baseScale = 0.7f;
-        float scale = (baseScale + b.fslope() * (1f - baseScale));
-
-        float height = this.height * ((1f - shrinkY) + shrinkY * b.fout());
-
-        Draw.color(backColor);
-        Draw.rect(backRegion, b.x, b.y, width * scale, height * scale, b.rotation() - 90);
-        Draw.color(frontColor);
-        Draw.rect(frontRegion, b.x, b.y, width * scale, height * scale, b.rotation() - 90);
-        Draw.color();
-    }
 }
diff --git a/core/src/mindustry/entities/bullet/BasicBulletType.java b/core/src/mindustry/entities/bullet/BasicBulletType.java
index ac33c28868..3ff978e6a3 100644
--- a/core/src/mindustry/entities/bullet/BasicBulletType.java
+++ b/core/src/mindustry/entities/bullet/BasicBulletType.java
@@ -8,14 +8,16 @@ import arc.util.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 
-/** An extended BulletType for most ammo-based bullets shot from turrets and units. */
+/** An extended BulletType for most ammo-based bullets shot from turrets and units. Draws 1-2 sprites that can spin or shrink. */
 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;
+    public Interp shrinkInterp = Interp.linear;
+    public float spin = 0, rotationOffset = 0f;
     public String sprite;
+    public @Nullable String backSprite;
 
     public TextureRegion backRegion;
     public TextureRegion frontRegion;
@@ -36,22 +38,29 @@ public class BasicBulletType extends BulletType{
 
     @Override
     public void load(){
-        backRegion = Core.atlas.find(sprite + "-back");
+        super.load();
+
+        backRegion = Core.atlas.find(backSprite == null ? (sprite + "-back") : backSprite);
         frontRegion = Core.atlas.find(sprite);
     }
 
     @Override
     public void draw(Bullet b){
-        float height = this.height * ((1f - shrinkY) + shrinkY * b.fout());
-        float width = this.width * ((1f - shrinkX) + shrinkX * b.fout());
-        float offset = -90 + (spin != 0 ? Mathf.randomSeed(b.id, 360f) + b.time * spin : 0f);
+        super.draw(b);
+        float shrink = shrinkInterp.apply(b.fout());
+        float height = this.height * ((1f - shrinkY) + shrinkY * shrink);
+        float width = this.width * ((1f - shrinkX) + shrinkX * shrink);
+        float offset = -90 + (spin != 0 ? Mathf.randomSeed(b.id, 360f) + b.time * spin : 0f) + rotationOffset;
 
         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);
+        if(backRegion.found()){
+            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);
 
diff --git a/core/src/mindustry/entities/bullet/BombBulletType.java b/core/src/mindustry/entities/bullet/BombBulletType.java
index acd18a8064..ad9e09fc70 100644
--- a/core/src/mindustry/entities/bullet/BombBulletType.java
+++ b/core/src/mindustry/entities/bullet/BombBulletType.java
@@ -2,6 +2,7 @@ package mindustry.entities.bullet;
 
 import mindustry.gen.*;
 
+/** Template class for an unmoving shrinking bullet. */
 public class BombBulletType extends BasicBulletType{
 
     public BombBulletType(float damage, float radius, String sprite){
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 73e0fb93ba..5f958bb013 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -1,13 +1,21 @@
 package mindustry.entities.bullet;
 
+import arc.*;
 import arc.audio.*;
 import arc.graphics.*;
+import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
+import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
+import mindustry.entities.part.*;
+import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -17,23 +25,57 @@ import mindustry.world.blocks.*;
 
 import static mindustry.Vars.*;
 
-public abstract class BulletType extends Content{
-    public float lifetime = 40f;
-    public float speed;
-    public float damage;
-    public float hitSize = 4;
-    public float drawSize = 40f;
-    public float drag = 0f;
-    public boolean pierce, pierceBuilding;
-    public int pierceCap = -1;
-    public Effect hitEffect, despawnEffect;
+public class BulletType extends Content implements Cloneable{
+    static final UnitDamageEvent bulletDamageEvent = new UnitDamageEvent();
 
+    /** Lifetime in ticks. */
+    public float lifetime = 40f;
+    /** Speed in units/tick. */
+    public float speed = 1f;
+    /** Direct damage dealt on hit. */
+    public float damage = 1f;
+    /** Hitbox size. */
+    public float hitSize = 4;
+    /** Clipping hitbox. */
+    public float drawSize = 40f;
+    /** Drag as fraction of velocity. */
+    public float drag = 0f;
+    /** Whether to pierce units. */
+    public boolean pierce;
+    /** Whether to pierce buildings. */
+    public boolean pierceBuilding;
+    /** Maximum # of pierced objects. */
+    public int pierceCap = -1;
+    /** Multiplier of damage decreased per health pierced. */
+    public float pierceDamageFactor = 0f;
+    /** If positive, limits non-splash damage dealt to a fraction of the target's maximum health. */
+    public float maxDamageFraction = -1f;
+    /** If false, this bullet isn't removed after pierceCap is exceeded. Expert usage only. */
+    public boolean removeAfterPierce = true;
+    /** For piercing lasers, setting this to true makes it get absorbed by plastanium walls. */
+    public boolean laserAbsorb = true;
+    /** Life fraction at which this bullet has the best range/damage/etc. Used for lasers and continuous turrets. */
+    public float optimalLifeFract = 0f;
+    /** Z layer to drawn on. */
+    public float layer = Layer.bullet;
+    /** Effect shown on direct hit. */
+    public Effect hitEffect = Fx.hitBulletSmall;
+    /** Effect shown when bullet despawns. */
+    public Effect despawnEffect = Fx.hitBulletSmall;
     /** Effect created when shooting. */
     public Effect shootEffect = Fx.shootSmall;
+    /** Effect created when charging starts; only usable in single-shot weapons with a firstShotDelay / shotDelay. */
+    public Effect chargeEffect = Fx.none;
     /** Extra smoke effect created when shooting. */
     public Effect smokeEffect = Fx.shootSmallSmoke;
     /** Sound made when hitting something or getting removed.*/
     public Sound hitSound = Sounds.none;
+    /** Sound made when hitting something or getting removed.*/
+    public Sound despawnSound = Sounds.none;
+    /** Pitch of the sound made when hitting something*/
+    public float hitSoundPitch = 1;
+    /** Volume of the sound made when hitting something*/
+    public float hitSoundVolume = 1;
     /** Extra inaccuracy when firing. */
     public float inaccuracy = 0f;
     /** How many bullets get created per ammo item/liquid. */
@@ -42,6 +84,8 @@ public abstract class BulletType extends Content{
     public float reloadMultiplier = 1f;
     /** Multiplier of how much base damage is done to tiles. */
     public float buildingDamageMultiplier = 1f;
+    /** Multiplier of how much base damage is done to force shields. */
+    public float shieldDamageMultiplier = 1f;
     /** Recoil from shooter entities. */
     public float recoil;
     /** Whether to kill the shooter when this is shot. For suicide bombers. */
@@ -50,12 +94,20 @@ public abstract class BulletType extends Content{
     public boolean instantDisappear;
     /** Damage dealt in splash. 0 to disable.*/
     public float splashDamage = 0f;
+    /** If true, splash damage is "correctly" affected by unit hitbox size. Used for projectiles that do not collide / have splash as their main source of damage. */
+    public boolean scaledSplashDamage = false;
     /** Knockback in velocity. */
     public float knockback;
+    /** Should knockback follow the bullet's direction */
+    public boolean impact;
     /** Status effect applied on hit. */
     public StatusEffect status = StatusEffects.none;
     /** Intensity of applied status effect in terms of duration. */
     public float statusDuration = 60 * 8f;
+    /** Turret only. If false, blocks will not be targeted. */
+    public boolean targetBlocks = true;
+    /** Turret only. If false, missiles will not be targeted. */
+    public boolean targetMissiles = true;
     /** Whether this bullet type collides with tiles. */
     public boolean collidesTiles = true;
     /** Whether this bullet type collides with tiles that are of the same team. */
@@ -64,120 +116,344 @@ public abstract class BulletType extends Content{
     public boolean collidesAir = true, collidesGround = true;
     /** Whether this bullet types collides with anything at all. */
     public boolean collides = true;
+    /** If true, this projectile collides with non-surface floors. */
+    public boolean collideFloor = false;
+    /** If true, this projectile collides with static walls */
+    public boolean collideTerrain = false;
     /** Whether velocity is inherited from the shooter. */
     public boolean keepVelocity = true;
-    /** Whether to scale velocity to disappear at the target position. Used for artillery. */
-    public boolean scaleVelocity;
+    /** Whether to scale lifetime (not actually velocity!) to disappear at the target position. Used for artillery. */
+    public boolean scaleLife;
     /** 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.
+    /** Whether to move the bullet back depending on delta to fix some delta-time related issues.
      * Do not change unless you know what you're doing. */
     public boolean backMove = true;
-    /** Bullet range override. */
+    /** If true, the angle param in create is ignored. */
+    public boolean ignoreSpawnAngle = false;
+    /** Chance for this bullet to be created. */
+    public float createChance = 1;
+    /** Bullet range positive override. */
     public float maxRange = -1f;
+    /** When > 0, overrides range even if smaller than base range. */
+    public float rangeOverride = -1f;
+    /** When used in a turret with multiple ammo types, this can be set to a non-zero value to influence range. */
+    public float rangeChange = 0f;
+    /** When used in turrets with limitRange() applied, this adds extra range to the bullets that extends past targeting range. Only particularly relevant in vanilla. */
+    public float extraRangeMargin = 0f;
+    /** Range initialized in init(). */
+    public float range = 0f;
     /** % of block health healed **/
     public float healPercent = 0f;
-    /** whether to make fire on impact */
+    /** flat amount of block health healed */
+    public float healAmount = 0f;
+    /** Whether to make fire on impact */
     public boolean makeFire = false;
+    /** Whether to create hit effects on despawn. Forced to true if this bullet has any special effects like splash damage. */
+    public boolean despawnHit = false;
+    /** If true, this bullet will create bullets when it hits anything, not just when it despawns. */
+    public boolean fragOnHit = true;
+    /** If false, this bullet will not create fraags when absorbed by a shield. */
+    public boolean fragOnAbsorb = true;
+    /** If true, unit armor is ignored in damage calculations. */
+    public boolean pierceArmor = false;
+    /** Whether status and despawnHit should automatically be set. */
+    public boolean setDefaults = true;
+    /** Amount of shaking produced when this bullet hits something or despawns. */
+    public float hitShake = 0f, despawnShake = 0f;
 
-    //additional effects
-
-    public float fragCone = 360f;
-    public float fragAngle = 0f;
-    public int fragBullets = 9;
-    public float fragVelocityMin = 0.2f, fragVelocityMax = 1f, fragLifeMin = 1f, fragLifeMax = 1f;
+    /** Bullet type that is created when this bullet expires. */
     public @Nullable BulletType fragBullet = null;
-    public Color hitColor = Color.white;
+    /** If true, frag bullets are delayed to the next frame. Fixes obscure bugs with piercing bullet types spawning frags immediately and screwing up the Damage temporary variables. */
+    public boolean delayFrags = false;
+    /** Degree spread range of fragmentation bullets. */
+    public float fragRandomSpread = 360f;
+    /** Uniform spread between each frag bullet in degrees. */
+    public float fragSpread = 0f;
+    /** Angle offset of fragmentation bullets. */
+    public float fragAngle = 0f;
+    /** Number of fragmentation bullets created. */
+    public int fragBullets = 9;
+    /** Random range of frag velocity as a multiplier. */
+    public float fragVelocityMin = 0.2f, fragVelocityMax = 1f;
+    /** Random range of frag lifetime as a multiplier. */
+    public float fragLifeMin = 1f, fragLifeMax = 1f;
+    /** Random offset of frag bullets from the parent bullet. */
+    public float fragOffsetMin = 1f, fragOffsetMax = 7f;
+    /** How many times this bullet can release frag bullets, if pierce = true. */
+    public int pierceFragCap = -1;
 
+    /** Bullet that is created at a fixed interval. */
+    public @Nullable BulletType intervalBullet;
+    /** Interval, in ticks, between which bullet spawn. */
+    public float bulletInterval = 20f;
+    /** Number of bullet spawned per interval. */
+    public int intervalBullets = 1;
+    /** Random spread of interval bullets. */
+    public float intervalRandomSpread = 360f;
+    /** Angle spread between individual interval bullets. */
+    public float intervalSpread = 0f;
+    /** Angle offset for interval bullets. */
+    public float intervalAngle = 0f;
+    /** Use a negative value to disable interval bullet delay. */
+    public float intervalDelay = -1f;
+
+    /** Color used for hit/despawn effects. */
+    public Color hitColor = Color.white;
+    /** Color used for block heal effects. */
+    public Color healColor = Pal.heal;
+    /** Effect emitted upon blocks that are healed. */
+    public Effect healEffect = Fx.healBlockFull;
+    /** Bullets spawned when this bullet is created. Rarely necessary, used for visuals. */
+    public Seq<BulletType> spawnBullets = new Seq<>();
+    /** Unit spawned _instead of_ this bullet. Useful for missiles. */
+    public @Nullable UnitType spawnUnit;
+    /** Unit spawned when this bullet hits something or despawns due to it hitting the end of its lifetime. */
+    public @Nullable UnitType despawnUnit;
+    /** The chance for despawn units to spawn. */
+    public float despawnUnitChance = 1;
+    /** Amount of units spawned when this bullet despawns. */
+    public int despawnUnitCount = 1;
+    /** Random offset distance from the original bullet despawn/hit coordinate. */
+    public float despawnUnitRadius = 0.1f;
+    /** If true, units spawned when this bullet despawns face away from the bullet instead of the same direction as the bullet. */
+    public boolean faceOutwards = false;
+    /** Extra visual parts for this bullet. */
+    public Seq<DrawPart> parts = new Seq<>();
+
+    /** Color of trail behind bullet. */
     public Color trailColor = Pal.missileYellowBack;
+    /** Chance of trail effect spawning on bullet per tick. */
     public float trailChance = -0.0001f;
+    /** Uniform interval in which trail effect is spawned. */
+    public float trailInterval = 0f;
+    /** Trail effect that is spawned. */
     public Effect trailEffect = Fx.missileTrail;
+    /** Rotation/size parameter that is passed to trail. Usually, this controls size. */
     public float trailParam =  2f;
+    /** Whether the parameter passed to the trail is the bullet rotation, instead of a flat value. */
+    public boolean trailRotation = false;
+    /** Interpolation for trail width as function of bullet lifetime */
+    public Interp trailInterp = Interp.one;
+    /** Length of trail quads. Any value <= 0 disables the trail. */
+    public int trailLength = -1;
+    /** Width of trail, if trailLength > 0 */
+    public float trailWidth = 2f;
+    /** If trailSinMag > 0, these values are applied as a sine curve to trail width. */
+    public float trailSinMag = 0f, trailSinScl = 3f;
 
     /** Use a negative value to disable splash damage. */
     public float splashDamageRadius = -1f;
+    /** If true, splash damage pierces through tiles. */
+    public boolean splashDamagePierce = false;
 
+    /** Amount of fires attempted around bullet. */
     public int incendAmount = 0;
+    /** Spread of fires around bullet. */
     public float incendSpread = 8f;
+    /** Chance of fire being created. */
     public float incendChance = 1f;
+
+    /** Power of bullet ability. Usually a number between 0 and 1; try 0.1 as a starting point. */
     public float homingPower = 0f;
+    /** Range of homing effect around bullet. */
     public float homingRange = 50f;
     /** Use a negative value to disable homing delay. */
     public float homingDelay = -1f;
 
+    /** Range of healing block suppression effect. */
+    public float suppressionRange = -1f;
+    /** Duration of healing block suppression effect. */
+    public float suppressionDuration = 60f * 8f;
+    /** Chance of suppression effect occurring on block, scaled down by number of blocks. */
+    public float suppressionEffectChance = 50f;
+    /** Color used for the regenSuppressSeek effect. */
+    public Color suppressColor = Pal.sapBullet;
+
+    /** Color of lightning created by bullet. */
     public Color lightningColor = Pal.surge;
+    /** Number of separate lightning "roots". */
     public int lightning;
-    public int lightningLength = 5, lightningLengthRand = 0;
+    /** Length of each lightning strand. */
+    public int lightningLength = 5;
+    /** Extra random length added onto base length of lightning. */
+    public int lightningLengthRand = 0;
     /** Use a negative value to use default bullet damage. */
     public float lightningDamage = -1;
+    /** Spread of lightning, relative to bullet rotation. */
     public float lightningCone = 360f;
+    /** Offset of lightning relative to bullet rotation. */
     public float lightningAngle = 0f;
     /** The bullet created at lightning points. */
     public @Nullable BulletType lightningType = null;
 
+    /** Scale of bullet weave pattern. Higher -> less vibration. */
     public float weaveScale = 1f;
-    public float weaveMag = -1f;
-    public float hitShake = 0f, despawnShake = 0f;
+    /** Intensity of bullet weaving. Note that this may make bullets inaccurate. */
+    public float weaveMag = 0f;
+    /** If true, the bullet weave will randomly switch directions on spawn. */
+    public boolean weaveRandom = true;
 
+    /** Number of individual puddles created. */
     public int puddles;
+    /** Range of puddles around bullet position. */
     public float puddleRange;
+    /** Liquid count of each puddle created. */
     public float puddleAmount = 5f;
+    /** Liquid that puddles created are made of. */
     public Liquid puddleLiquid = Liquids.water;
 
-    public float lightRadius = 16f;
+    /** Whether to display the ammo multiplayer for this bullet type in its stats. */
+    public boolean displayAmmoMultiplier = true;
+
+    /** Radius of light emitted by this bullet; <0 to use defaults. */
+    public float lightRadius = -1f;
+    /** Opacity of light color. */
     public float lightOpacity = 0.3f;
+    /** Color of light emitted by this bullet. */
     public Color lightColor = Pal.powerLight;
 
+    protected float cachedDps = -1;
+
     public BulletType(float speed, float damage){
         this.speed = speed;
         this.damage = damage;
-        hitEffect = Fx.hitBulletSmall;
-        despawnEffect = Fx.hitBulletSmall;
     }
 
     public BulletType(){
-        this(1f, 1f);
+    }
+
+    public BulletType copy(){
+        try{
+            BulletType copy = (BulletType)clone();
+            copy.id = (short)Vars.content.getBy(getContentType()).size;
+            Vars.content.handleContent(copy);
+            return copy;
+        }catch(Exception e){
+            throw new RuntimeException("death to checked exceptions", e);
+        }
+    }
+
+    @Override
+    public void load(){
+        for(var part : parts){
+            part.turretShading = false;
+            part.load(null);
+        }
     }
 
     /** @return estimated damage per shot. this can be very inaccurate. */
     public float estimateDPS(){
-        float sum = damage + splashDamage*0.75f;
+        if(cachedDps >= 0f) return cachedDps;
+
+        if(spawnUnit != null){
+            return spawnUnit.estimateDps();
+        }
+
+        float sum = (damage + splashDamage*0.75f) * (pierce ? pierceCap == -1 ? 2 : Mathf.clamp(pierceCap, 1, 2) : 1f);
         if(fragBullet != null && fragBullet != this){
             sum += fragBullet.estimateDPS() * fragBullets / 2f;
         }
-        return sum;
+        for(var other : spawnBullets){
+            sum += other.estimateDPS();
+        }
+        return cachedDps = sum;
     }
 
-    /** Returns maximum distance the bullet this bullet type has can travel. */
-    public float range(){
-        return Math.max(speed * lifetime * (1f - drag), maxRange);
+    /** @return maximum distance the bullet this bullet type has can travel. */
+    protected float calculateRange(){
+        if(rangeOverride > 0) return rangeOverride;
+        if(spawnUnit != null) return spawnUnit.lifetime * spawnUnit.speed;
+        return Math.max(Mathf.zero(drag) ? speed * lifetime : speed * (1f - Mathf.pow(1f - drag, lifetime)) / drag, maxRange);
+    }
+
+    /** @return continuous damage in damage/sec, or -1 if not continuous. */
+    public float continuousDamage(){
+        return -1f;
+    }
+
+    public boolean heals(){
+        return healPercent > 0 || healAmount > 0;
     }
 
     public boolean testCollision(Bullet bullet, Building tile){
-        return healPercent <= 0.001f || tile.team != bullet.team || tile.healthf() < 1f;
+        return !heals() || tile.team != bullet.team || tile.healthf() < 1f;
     }
 
     /** If direct is false, this is an indirect hit and the tile was already damaged.
      * TODO this is a mess. */
-    public void hitTile(Bullet b, Building build, float initialHealth, boolean direct){
+    public void hitTile(Bullet b, Building build, float x, float y, float initialHealth, boolean direct){
         if(makeFire && build.team != b.team){
             Fires.create(build.tile);
         }
 
-        if(healPercent > 0f && build.team == b.team && !(build.block instanceof ConstructBlock)){
-            Fx.healBlockFull.at(build.x, build.y, build.block.size, Pal.heal);
-            build.heal(healPercent / 100f * build.maxHealth());
+        if(heals() && build.team == b.team && !(build.block instanceof ConstructBlock)){
+            healEffect.at(build.x, build.y, 0f, healColor, build.block);
+            build.heal(healPercent / 100f * build.maxHealth + healAmount);
         }else if(build.team != b.team && direct){
             hit(b);
         }
+
+        handlePierce(b, initialHealth, x, y);
     }
 
-    public void hitEntity(Bullet b, Hitboxc other, float initialHealth){
+    public void hitEntity(Bullet b, Hitboxc entity, float health){
+        boolean wasDead = entity instanceof Unit u && u.dead;
 
+        if(entity instanceof Healthc h){
+            float damage = b.damage;
+            float shield = entity instanceof Shieldc s ? Math.max(s.shield(), 0f) : 0f;
+            if(maxDamageFraction > 0){
+                float cap = h.maxHealth() * maxDamageFraction + shield;
+                damage = Math.min(damage, cap);
+                //cap health to effective health for handlePierce to handle it properly
+                health = Math.min(health, cap);
+            }else{
+                health += shield;
+            }
+            if(pierceArmor){
+                h.damagePierce(damage);
+            }else{
+                h.damage(damage);
+            }
+        }
+
+        if(entity instanceof Unit unit){
+            Tmp.v3.set(unit).sub(b).nor().scl(knockback * 80f);
+            if(impact) Tmp.v3.setAngle(b.rotation() + (knockback < 0 ? 180f : 0f));
+            unit.impulse(Tmp.v3);
+            unit.apply(status, statusDuration);
+
+            Events.fire(bulletDamageEvent.set(unit, b));
+        }
+
+        if(!wasDead && entity instanceof Unit unit && unit.dead){
+            Events.fire(new UnitBulletDestroyEvent(unit, b));
+        }
+
+        handlePierce(b, health, entity.x(), entity.y());
+    }
+
+    public void handlePierce(Bullet b, float initialHealth, float x, float y){
+        float sub = Mathf.zero(pierceDamageFactor) ? 0f : Math.max(initialHealth * pierceDamageFactor, 0);
+        //subtract health from each consecutive pierce
+        b.damage -= Float.isNaN(sub) ? b.damage : Math.min(b.damage, sub);
+
+        if(removeAfterPierce && b.damage <= 0){
+            b.hit = true;
+            b.remove();
+        }
+    }
+
+    public float damageMultiplier(Bullet b){
+        if(b.owner instanceof Unit u) return u.damageMultiplier() * state.rules.unitDamage(b.team);
+        if(b.owner instanceof Building) return state.rules.blockDamage(b.team);
+
+        return 1f;
     }
 
     public void hit(Bullet b){
@@ -186,102 +462,244 @@ public abstract class BulletType extends Content{
 
     public void hit(Bullet b, float x, float y){
         hitEffect.at(x, y, b.rotation(), hitColor);
-        hitSound.at(b);
+        hitSound.at(x, y, hitSoundPitch, hitSoundVolume);
 
         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) + fragAngle;
-                fragBullet.create(b, x + Angles.trnsx(a, len), y + Angles.trnsy(a, len), a, Mathf.random(fragVelocityMin, fragVelocityMax), Mathf.random(fragLifeMin, fragLifeMax));
+        if(fragOnHit){
+            if(delayFrags && fragBullet != null && fragBullet.delayFrags){
+                Core.app.post(() -> createFrags(b, x, y));
+            }else{
+                createFrags(b, x, y);
             }
         }
+        createPuddles(b, x, y);
+        createIncend(b, x, y);
+        createUnits(b, x, y);
 
-        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);
-            }
+        if(suppressionRange > 0){
+            //bullets are pooled, require separate Vec2 instance
+            Damage.applySuppression(b.team, b.x, b.y, suppressionRange, suppressionDuration, 0f, suppressionEffectChance, new Vec2(b.x, b.y), suppressColor);
         }
 
-        if(Mathf.chance(incendChance)){
-            Damage.createIncend(x, y, incendSpread, incendAmount);
-        }
-
-        if(splashDamageRadius > 0 && !b.absorbed){
-            Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), collidesAir, collidesGround);
-
-            if(status != StatusEffects.none){
-                Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround);
-            }
-
-            if(healPercent > 0f){
-                indexer.eachBlock(b.team, x, y, splashDamageRadius, Building::damaged, other -> {
-                    Fx.healBlockFull.at(other.x, other.y, other.block.size, Pal.heal);
-                    other.heal(healPercent / 100f * other.maxHealth());
-                });
-            }
-
-            if(makeFire){
-                indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != b.team, other -> {
-                    Fires.create(other.tile);
-                });
-            }
-        }
+        createSplashDamage(b, x, y);
 
         for(int i = 0; i < lightning; i++){
             Lightning.create(b, lightningColor, lightningDamage < 0 ? damage : lightningDamage, b.x, b.y, b.rotation() + Mathf.range(lightningCone/2) + lightningAngle, lightningLength + Mathf.random(lightningLengthRand));
         }
     }
 
-    public void despawned(Bullet b){
-        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);
+    public void createIncend(Bullet b, float x, float y){
+        if(incendChance > 0 && Mathf.chance(incendChance)){
+            Damage.createIncend(x, y, incendSpread, incendAmount);
         }
     }
 
+    public void createPuddles(Bullet b, float x, float y){
+        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);
+            }
+        }
+    }
+
+    public void createSplashDamage(Bullet b, float x, float y){
+        if(splashDamageRadius > 0 && !b.absorbed){
+            Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), splashDamagePierce, collidesAir, collidesGround, scaledSplashDamage, b);
+
+            if(status != StatusEffects.none){
+                Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround);
+            }
+
+            if(heals()){
+                indexer.eachBlock(b.team, x, y, splashDamageRadius, Building::damaged, other -> {
+                    healEffect.at(other.x, other.y, 0f, healColor, other.block);
+                    other.heal(healPercent / 100f * other.maxHealth() + healAmount);
+                });
+            }
+
+            if(makeFire){
+                indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != b.team, other -> Fires.create(other.tile));
+            }
+        }
+    }
+
+    public void createFrags(Bullet b, float x, float y){
+        if(fragBullet != null && (fragOnAbsorb || !b.absorbed) && !(b.frags >= pierceFragCap && pierceFragCap > 0)){
+            for(int i = 0; i < fragBullets; i++){
+                float len = Mathf.random(fragOffsetMin, fragOffsetMax);
+                float a = b.rotation() + Mathf.range(fragRandomSpread / 2) + fragAngle + fragSpread * i - (fragBullets - 1) * fragSpread / 2f;
+                fragBullet.create(b, x + Angles.trnsx(a, len), y + Angles.trnsy(a, len), a, Mathf.random(fragVelocityMin, fragVelocityMax), Mathf.random(fragLifeMin, fragLifeMax));
+            }
+            b.frags++;
+        }
+    }
+
+    public void createUnits(Bullet b, float x, float y){
+        if(despawnUnit != null && Mathf.chance(despawnUnitChance)){
+            for(int i = 0; i < despawnUnitCount; i++){
+                Tmp.v1.rnd(Mathf.random(despawnUnitRadius));
+                var u = despawnUnit.spawn(b.team, x + Tmp.v1.x, y + Tmp.v1.y);
+                u.rotation = faceOutwards ? Tmp.v1.angle() : b.rotation();
+            }
+        }
+    }
+
+    /** Called when the bullet reaches the end of its lifetime or is destroyed by something external. */
+    public void despawned(Bullet b){
+        if(despawnHit){
+            hit(b);
+        }else{
+            createUnits(b, b.x, b.y);
+        }
+
+        if(!fragOnHit){
+            createFrags(b, b.x, b.y);
+        }
+
+        despawnEffect.at(b.x, b.y, b.rotation(), hitColor);
+        despawnSound.at(b);
+
+        Effect.shake(despawnShake, despawnShake, b);
+    }
+
+    /** Called when the bullet is removed for any reason. */
+    public void removed(Bullet b){
+        if(trailLength > 0 && b.trail != null && b.trail.size() > 0){
+            Fx.trailFade.at(b.x, b.y, trailWidth, trailColor, b.trail.copy());
+        }
+    }
+
+    public float buildingDamage(Bullet b){
+        return b.damage() * buildingDamageMultiplier;
+    }
+
+    public float shieldDamage(Bullet b){
+        return b.damage() * shieldDamageMultiplier;
+    }
+
     public void draw(Bullet b){
+        drawTrail(b);
+        drawParts(b);
+    }
+
+    public void drawTrail(Bullet b){
+        if(trailLength > 0 && b.trail != null){
+            //draw below bullets? TODO
+            float z = Draw.z();
+            Draw.z(z - 0.0001f);
+            b.trail.draw(trailColor, trailWidth);
+            Draw.z(z);
+        }
+    }
+
+    public void drawParts(Bullet b){
+        if(parts.size > 0){
+            DrawPart.params.set(b.fin(), 0f, 0f, 0f, 0f, 0f, b.x, b.y, b.rotation());
+            DrawPart.params.life = b.fin();
+
+            for(int i = 0; i < parts.size; i++){
+                parts.get(i).draw(DrawPart.params);
+            }
+        }
     }
 
     public void drawLight(Bullet b){
-        Drawf.light(b.team, b, lightRadius, lightColor, lightOpacity);
+        if(lightOpacity <= 0f || lightRadius <= 0f) return;
+        Drawf.light(b, lightRadius, lightColor, lightOpacity);
     }
 
     public void init(Bullet b){
 
-        if(killShooter && b.owner() instanceof Healthc h){
+        if(killShooter && b.owner() instanceof Healthc h && !h.dead()){
             h.kill();
         }
 
         if(instantDisappear){
-            b.time = lifetime;
+            b.time = lifetime + 1f;
+        }
+
+        if(spawnBullets.size > 0){
+            for(var bullet : spawnBullets){
+                bullet.create(b, b.x, b.y, b.rotation());
+            }
         }
     }
 
     public void update(Bullet b){
-        if(homingPower > 0.0001f && b.time >= homingDelay){
-            Teamc target = Units.closestTarget(b.team, b.x, b.y, homingRange, e -> (e.isGrounded() && collidesGround) || (e.isFlying() && collidesAir), t -> collidesGround);
-            if(target != null){
-                b.vel.setAngle(Mathf.slerpDelta(b.rotation(), b.angleTo(target), homingPower));
+        updateTrail(b);
+        updateHoming(b);
+        updateWeaving(b);
+        updateTrailEffects(b);
+        updateBulletInterval(b);
+    }
+
+    public void updateBulletInterval(Bullet b){
+        if(intervalBullet != null && b.time >= intervalDelay && b.timer.get(2, bulletInterval)){
+            float ang = b.rotation();
+            for(int i = 0; i < intervalBullets; i++){
+                intervalBullet.create(b, b.x, b.y, ang + Mathf.range(intervalRandomSpread) + intervalAngle + ((i - (intervalBullets - 1f)/2f) * intervalSpread));
             }
         }
+    }
 
-        if(weaveMag > 0){
-            float scl = Mathf.randomSeed(id, 0.9f, 1.1f);
-            b.vel.rotate(Mathf.sin(b.time + Mathf.PI * weaveScale/2f * scl, weaveScale * scl, weaveMag) * Time.delta);
+    public void updateHoming(Bullet b){
+        if(homingPower > 0.0001f && b.time >= homingDelay){
+            float realAimX = b.aimX < 0 ? b.x : b.aimX;
+            float realAimY = b.aimY < 0 ? b.y : b.aimY;
+
+            Teamc target;
+            //home in on allies if possible
+            if(heals()){
+                target = Units.closestTarget(null, realAimX, realAimY, homingRange,
+                e -> e.checkTarget(collidesAir, collidesGround) && e.team != b.team && !b.hasCollided(e.id),
+                t -> collidesGround && (t.team != b.team || t.damaged()) && !b.hasCollided(t.id)
+                );
+            }else{
+                if(b.aimTile != null && b.aimTile.build != null && b.aimTile.build.team != b.team && collidesGround && !b.hasCollided(b.aimTile.build.id)){
+                    target = b.aimTile.build;
+                }else{
+                    target = Units.closestTarget(b.team, realAimX, realAimY, homingRange,
+                        e -> e != null && e.checkTarget(collidesAir, collidesGround) && !b.hasCollided(e.id),
+                        t -> t != null && collidesGround && !b.hasCollided(t.id));
+                }
+            }
+
+            if(target != null){
+                b.vel.setAngle(Angles.moveToward(b.rotation(), b.angleTo(target), homingPower * Time.delta * 50f));
+            }
         }
+    }
 
+    public void updateWeaving(Bullet b){
+        if(weaveMag != 0){
+            b.vel.rotateRadExact((float)Math.sin((b.time + Math.PI * weaveScale/2f) / weaveScale) * weaveMag * (weaveRandom ? (Mathf.randomSeed(b.id, 0, 1) == 1 ? -1 : 1) : 1f) * Time.delta * Mathf.degRad);
+        }
+    }
+
+    public void updateTrailEffects(Bullet b){
         if(trailChance > 0){
             if(Mathf.chanceDelta(trailChance)){
-                trailEffect.at(b.x, b.y, trailParam, trailColor);
+                trailEffect.at(b.x, b.y, trailRotation ? b.rotation() : trailParam, trailColor);
             }
         }
+
+        if(trailInterval > 0f){
+            if(b.timer(0, trailInterval)){
+                trailEffect.at(b.x, b.y, trailRotation ? b.rotation() : trailParam, trailColor);
+            }
+        }
+    }
+
+    public void updateTrail(Bullet b){
+        if(!headless && trailLength > 0){
+            if(b.trail == null){
+                b.trail = new Trail(trailLength);
+            }
+            b.trail.length = trailLength;
+            b.trail.update(b.x, b.y, trailInterp.apply(b.fin()) * (1f + (trailSinMag > 0 ? Mathf.absin(Time.time, trailSinScl, trailSinMag) : 0f)));
+        }
     }
 
     @Override
@@ -291,9 +709,35 @@ public abstract class BulletType extends Content{
             //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings
         }
 
-        if(lightningType == null){
-            lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
+        if(setDefaults){
+            if(lightning > 0){
+                if(status == StatusEffects.none){
+                    status = StatusEffects.shocked;
+                }
+            }
+
+            if(fragBullet != null || splashDamageRadius > 0 || lightning > 0){
+                despawnHit = true;
+            }
         }
+
+        if(fragBullet != null){
+            fragBullet.keepVelocity = false;
+        }
+
+        if(lightningType == null){
+            lightningType =
+                !collidesAir ? Bullets.damageLightningGround :
+                !collidesGround ? Bullets.damageLightningAir :
+                Bullets.damageLightning;
+        }
+
+        if(lightRadius <= -1){
+            lightRadius = Math.max(18, hitSize * 5f);
+        }
+
+        drawSize = Math.max(drawSize, trailLength * speed * 2f);
+        range = calculateRange();
     }
 
     @Override
@@ -301,40 +745,106 @@ public abstract class BulletType extends Content{
         return ContentType.bullet;
     }
 
-    public Bullet create(Teamc owner, float x, float y, float angle){
+    public @Nullable Bullet create(Teamc owner, float x, float y, float angle){
         return create(owner, owner.team(), x, y, angle);
     }
 
-    public Bullet create(Entityc owner, Team team, float x, float y, float angle){
+    public @Nullable Bullet create(Entityc owner, Team team, float x, float y, float angle){
         return create(owner, team, x, y, angle, 1f);
     }
 
-    public Bullet create(Entityc owner, Team team, float x, float y, float angle, float velocityScl){
+    public @Nullable Bullet create(Entityc owner, Team team, float x, float y, float angle, float velocityScl){
         return create(owner, team, x, y, angle, -1, velocityScl, 1f, null);
     }
 
-    public Bullet create(Entityc owner, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl){
+    public @Nullable Bullet create(Entityc owner, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl){
         return create(owner, team, x, y, angle, -1, velocityScl, lifetimeScl, null);
     }
 
-    public Bullet create(Bullet parent, float x, float y, float angle){
-        return create(parent.owner, parent.team, x, y, angle);
+
+    public @Nullable Bullet create(Entityc owner, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl, Mover mover){
+        return create(owner, team, x, y, angle, -1, velocityScl, lifetimeScl, null, mover);
     }
 
-    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 @Nullable Bullet create(Bullet parent, float x, float y, float angle){
+        return create(parent.owner, parent.shooter, parent.team, x, y, angle, -1, 1f, 1f, null, null, -1f, -1f);
     }
 
-    public Bullet create(Bullet parent, float x, float y, float angle, float velocityScl){
-        return create(parent.owner(), parent.team, x, y, angle, velocityScl);
+    public @Nullable Bullet create(Bullet parent, float x, float y, float angle, float velocityScl, float lifeScale){
+        return create(parent.owner, parent.shooter, parent.team, x, y, angle, -1, velocityScl, lifeScale, null, null, -1f, -1f);
     }
 
-    public Bullet create(@Nullable Entityc owner, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data){
+    public @Nullable Bullet create(Bullet parent, float x, float y, float angle, float velocityScl){
+        return create(parent.owner, parent.shooter, parent.team, x, y, angle, -1, velocityScl, 1f, null, null, -1f, -1f);
+    }
+
+    public @Nullable Bullet create(@Nullable Entityc owner, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data){
+        return create(owner, team, x, y, angle, damage, velocityScl, lifetimeScl, data, null);
+    }
+
+    public @Nullable Bullet create(@Nullable Entityc owner, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data, @Nullable Mover mover){
+        return create(owner, team, x, y, angle, damage, velocityScl, lifetimeScl, data, mover, -1f, -1f);
+    }
+
+    public @Nullable Bullet create(@Nullable Entityc owner, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data, @Nullable Mover mover, float aimX, float aimY){
+        return create(owner, owner, team, x, y, angle, damage, velocityScl, lifetimeScl, data, mover, aimX, aimY);
+    }
+
+    public @Nullable Bullet create(@Nullable Entityc owner, @Nullable Entityc shooter, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data, @Nullable Mover mover, float aimX, float aimY){
+        return create(owner, shooter, team, x, y, angle, damage, velocityScl, lifetimeScl, data, mover, aimX, aimY, null);
+    }
+
+    public @Nullable Bullet create(
+        @Nullable Entityc owner, @Nullable Entityc shooter, Team team, float x, float y, float angle, float damage, float velocityScl,
+        float lifetimeScl, Object data, @Nullable Mover mover, float aimX, float aimY, @Nullable Teamc target
+    ){
+        if(!Mathf.chance(createChance)) return null;
+        if(ignoreSpawnAngle) angle = 0;
+        if(spawnUnit != null){
+            //don't spawn units clientside!
+            if(!net.client()){
+                Unit spawned = spawnUnit.create(team);
+                spawned.set(x, y);
+                spawned.rotation = angle;
+                //immediately spawn at top speed, since it was launched
+                if(spawnUnit.missileAccelTime <= 0f){
+                    spawned.vel.trns(angle, spawnUnit.speed);
+                }
+                //assign unit owner
+                if(spawned.controller() instanceof MissileAI ai){
+                    if(shooter instanceof Unit unit){
+                        ai.shooter = unit;
+                    }
+
+                    if(shooter instanceof ControlBlock control){
+                        ai.shooter = control.unit();
+                    }
+
+                }
+                spawned.add();
+            }
+            //Since bullet init is never called, handle killing shooter here
+            if(killShooter && owner instanceof Healthc h && !h.dead()) h.kill();
+
+            //no bullet returned
+            return null;
+        }
+
         Bullet bullet = Bullet.create();
         bullet.type = this;
         bullet.owner = owner;
+        bullet.shooter = (shooter == null ? owner : shooter);
         bullet.team = team;
-        bullet.vel.trns(angle, speed * velocityScl);
+        bullet.time = 0f;
+        bullet.originX = x;
+        bullet.originY = y;
+        if(!(aimX == -1f && aimY == -1f)){
+            bullet.aimTile = target instanceof Building b ? b.tile : world.tileWorld(aimX, aimY);
+        }
+        bullet.aimX = aimX;
+        bullet.aimY = aimY;
+
+        bullet.initVel(angle, speed * velocityScl);
         if(backMove){
             bullet.set(x - bullet.vel.x * Time.delta, y - bullet.vel.y * Time.delta);
         }else{
@@ -344,10 +854,15 @@ public abstract class BulletType extends Content{
         bullet.data = data;
         bullet.drag = drag;
         bullet.hitSize = hitSize;
+        bullet.mover = mover;
         bullet.damage = (damage < 0 ? this.damage : damage) * bullet.damageMultiplier();
+        //reset trail
+        if(bullet.trail != null){
+            bullet.trail.clear();
+        }
         bullet.add();
 
-        if(keepVelocity && owner instanceof Velc v) bullet.vel.add(v.vel().x, v.vel().y);
+        if(keepVelocity && owner instanceof Velc v) bullet.vel.add(v.vel());
         return bullet;
     }
 
diff --git a/core/src/mindustry/entities/bullet/ContinuousBulletType.java b/core/src/mindustry/entities/bullet/ContinuousBulletType.java
new file mode 100644
index 0000000000..a9ea18876b
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/ContinuousBulletType.java
@@ -0,0 +1,96 @@
+package mindustry.entities.bullet;
+
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+
+/** Basic continuous (line) bullet type that does not draw itself. Essentially abstract. */
+public class ContinuousBulletType extends BulletType{
+    public float length = 220f;
+    public float shake = 0f;
+    public float damageInterval = 5f;
+    public boolean largeHit = false;
+    public boolean continuous = true;
+    /** If a building fired this, whether to multiply damage by its timescale. */
+    public boolean timescaleDamage = false;
+
+    {
+        removeAfterPierce = false;
+        pierceCap = -1;
+        speed = 0f;
+        despawnEffect = Fx.none;
+        shootEffect = Fx.none;
+        lifetime = 16f;
+        impact = true;
+        keepVelocity = false;
+        collides = false;
+        pierce = true;
+        hittable = false;
+        absorbable = false;
+    }
+
+    @Override
+    public float continuousDamage(){
+        if(!continuous) return -1f;
+        return damage / damageInterval * 60f;
+    }
+
+    @Override
+    public float estimateDPS(){
+        if(!continuous) return super.estimateDPS();
+        //assume firing duration is about 100 by default, may not be accurate there's no way of knowing in this method
+        //assume it pierces 3 blocks/units
+        return damage * 100f / damageInterval * 3f;
+    }
+
+    @Override
+    protected float calculateRange(){
+        return Math.max(length, maxRange);
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        drawSize = Math.max(drawSize, length*2f);
+    }
+
+    @Override
+    public void init(Bullet b){
+        super.init(b);
+
+        if(!continuous){
+            applyDamage(b);
+        }
+    }
+
+    @Override
+    public void update(Bullet b){
+        if(!continuous) return;
+
+        //damage every 5 ticks
+        if(b.timer(1, damageInterval)){
+            applyDamage(b);
+        }
+
+        if(shake > 0){
+            Effect.shake(shake, shake, b);
+        }
+
+        updateBulletInterval(b);
+    }
+
+    public void applyDamage(Bullet b){
+        float damage = b.damage;
+        if(timescaleDamage && b.owner instanceof Building build){
+             b.damage *= build.timeScale();
+        }
+        Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), currentLength(b), largeHit, laserAbsorb, pierceCap);
+        b.damage = damage;
+    }
+
+    public float currentLength(Bullet b){
+        return length;
+    }
+
+}
diff --git a/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java
new file mode 100644
index 0000000000..30dd5011fb
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java
@@ -0,0 +1,105 @@
+package mindustry.entities.bullet;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+import static arc.graphics.g2d.Draw.*;
+
+public class ContinuousFlameBulletType extends ContinuousBulletType{
+    public float lightStroke = 40f;
+    public float width = 3.7f, oscScl = 1.2f, oscMag = 0.02f;
+    public int divisions = 25;
+
+    public boolean drawFlare = true;
+    public Color flareColor = Color.valueOf("e189f5");
+    public float flareWidth = 3f, flareInnerScl = 0.5f, flareLength = 40f, flareInnerLenScl = 0.5f, flareLayer = Layer.bullet - 0.0001f, flareRotSpeed = 1.2f;
+    public boolean rotateFlare = false;
+    public Interp lengthInterp = Interp.slope;
+
+    /** Lengths, widths, ellipse panning, and offsets, all as fractions of the base width and length. Stored as an 'interleaved' array of values: LWPO1 LWPO2 LWPO3... */
+    public float[] lengthWidthPans = {
+        1.12f, 1.3f, 0.32f,
+        1f, 1f, 0.3f,
+        0.8f, 0.9f, 0.2f,
+        0.5f, 0.8f, 0.15f,
+        0.25f, 0.7f, 0.1f,
+    };
+
+    public Color[] colors = {Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white.cpy()};
+
+    public ContinuousFlameBulletType(float damage){
+        this.damage = damage;
+    }
+
+    public ContinuousFlameBulletType(){
+    }
+
+    {
+        optimalLifeFract = 0.5f;
+        length = 120f;
+        hitEffect = Fx.hitFlameBeam;
+        hitSize = 4;
+        drawSize = 420f;
+        lifetime = 16f;
+        hitColor = colors[1].cpy().a(1f);
+        lightColor = hitColor;
+        lightOpacity = 0.7f;
+        laserAbsorb = false;
+        ammoMultiplier = 1f;
+        pierceArmor = true;
+    }
+
+    @Override
+    public void draw(Bullet b){
+        float mult = b.fin(lengthInterp);
+        float realLength = Damage.findLength(b, length * mult, laserAbsorb, pierceCap);
+
+        float sin = Mathf.sin(Time.time, oscScl, oscMag);
+
+        for(int i = 0; i < colors.length; i++){
+            Draw.color(colors[i].write(Tmp.c1).mul(0.9f).mul(1f + Mathf.absin(Time.time, 1f, 0.1f)));
+            Drawf.flame(b.x, b.y, divisions, b.rotation(),
+                realLength * lengthWidthPans[i * 3] * (1f - sin),
+                width * lengthWidthPans[i * 3 + 1] * mult * (1f + sin),
+                lengthWidthPans[i * 3 + 2]
+            );
+        }
+
+        if(drawFlare){
+            color(flareColor);
+            Draw.z(flareLayer);
+
+            float angle = Time.time * flareRotSpeed + (rotateFlare ? b.rotation() : 0f);
+
+            for(int i = 0; i < 4; i++){
+                Drawf.tri(b.x, b.y, flareWidth, flareLength * (mult + sin), i*90 + 45 + angle);
+            }
+
+            color();
+            for(int i = 0; i < 4; i++){
+                Drawf.tri(b.x, b.y, flareWidth * flareInnerScl, flareLength * flareInnerLenScl * (mult + sin), i*90 + 45 + angle);
+            }
+        }
+
+        Tmp.v1.trns(b.rotation(), realLength * 1.1f);
+        Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, lightOpacity);
+        Draw.reset();
+    }
+
+    @Override
+    public float currentLength(Bullet b){
+        return length * b.fin(lengthInterp);
+    }
+
+    @Override
+    public void drawLight(Bullet b){
+        //no light drawn here
+    }
+
+}
diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
index 9edcdb0a5c..df7cebd304 100644
--- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
@@ -9,24 +9,26 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 
-public class ContinuousLaserBulletType extends BulletType{
-    public float length = 220f;
-    public float shake = 1f;
+public class ContinuousLaserBulletType extends ContinuousBulletType{
     public float fadeTime = 16f;
     public float lightStroke = 40f;
-    public float spaceMag = 35f;
+    public int divisions = 13;
     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 strokeFrom = 2f, strokeTo = 0.5f, pointyScaling = 0.75f;
+    public float backLength = 7f, frontLength = 35f;
     public float width = 9f, oscScl = 0.8f, oscMag = 1.5f;
-    public boolean largeHit = true;
 
     public ContinuousLaserBulletType(float damage){
-        super(0.001f, damage);
+        this.damage = damage;
+    }
 
-        hitEffect = Fx.hitMeltdown;
-        despawnEffect = Fx.none;
+    public ContinuousLaserBulletType(){
+    }
+
+    {
+        shake = 1f;
+        largeHit = true;
+        hitEffect = Fx.hitBeam;
         hitSize = 4;
         drawSize = 420f;
         lifetime = 16f;
@@ -35,68 +37,37 @@ public class ContinuousLaserBulletType extends BulletType{
         incendSpread = 5;
         incendChance = 0.4f;
         lightColor = Color.orange;
-        keepVelocity = false;
-        collides = false;
-        pierce = true;
-        hittable = false;
-        absorbable = false;
-    }
-
-    protected ContinuousLaserBulletType(){
-        this(0);
-    }
-
-    @Override
-    public float estimateDPS(){
-        //assume firing duration is about 100 by default, may not be accurate there's no way of knowing in this method
-        //assume it pierces 3 blocks/units
-        return damage * 100f / 5f * 3f;
-    }
-
-    @Override
-    public float range(){
-        return length;
-    }
-
-    @Override
-    public void init(){
-        super.init();
-
-        drawSize = Math.max(drawSize, length*2f);
-    }
-
-    @Override
-    public void update(Bullet b){
-
-        //damage every 5 ticks
-        if(b.timer(1, 5f)){
-            Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), length, largeHit);
-        }
-
-        if(shake > 0){
-            Effect.shake(shake, shake, b);
-        }
+        lightOpacity = 0.7f;
     }
 
     @Override
     public void draw(Bullet b){
-        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;
+        float realLength = Damage.findLength(b, length * fout, laserAbsorb, pierceCap);
+        float rot = b.rotation();
 
-        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) * spaceMag);
-                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);
-            }
+        for(int i = 0; i < colors.length; i++){
+            Draw.color(Tmp.c1.set(colors[i]).mul(1f + Mathf.absin(Time.time, 1f, 0.1f)));
+
+            float colorFin = i / (float)(colors.length - 1);
+            float baseStroke = Mathf.lerp(strokeFrom, strokeTo, colorFin);
+            float stroke = (width + Mathf.absin(Time.time, oscScl, oscMag)) * fout * baseStroke;
+            float ellipseLenScl = Mathf.lerp(1 - i / (float)(colors.length), 1f, pointyScaling);
+
+            Lines.stroke(stroke);
+            Lines.lineAngle(b.x, b.y, rot, realLength - frontLength, false);
+
+            //back ellipse
+            Drawf.flameFront(b.x, b.y, divisions, rot + 180f, backLength, stroke / 2f);
+
+            //front ellipse
+            Tmp.v1.trnsExact(rot, realLength - frontLength);
+            Drawf.flameFront(b.x + Tmp.v1.x, b.y + Tmp.v1.y, divisions, rot, frontLength * ellipseLenScl, stroke / 2f);
         }
 
-        Tmp.v1.trns(b.rotation(), baseLen * 1.1f);
+        Tmp.v1.trns(b.rotation(), realLength * 1.1f);
 
-        Drawf.light(b.team, b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, 0.7f);
+        Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, lightOpacity);
         Draw.reset();
     }
 
@@ -105,4 +76,9 @@ public class ContinuousLaserBulletType extends BulletType{
         //no light drawn here
     }
 
+    @Override
+    public float currentLength(Bullet b){
+        float fout = Mathf.clamp(b.time > b.lifetime - fadeTime ? 1f - (b.time - (lifetime - fadeTime)) / fadeTime : 1f);
+        return length * fout;
+    }
 }
diff --git a/core/src/mindustry/entities/bullet/EmpBulletType.java b/core/src/mindustry/entities/bullet/EmpBulletType.java
new file mode 100644
index 0000000000..6306d81b7a
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/EmpBulletType.java
@@ -0,0 +1,66 @@
+package mindustry.entities.bullet;
+
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+
+public class EmpBulletType extends BasicBulletType{
+    public float radius = 100f;
+    public float timeIncrease = 2.5f, timeDuration = 60f * 10f;
+    public float powerDamageScl = 2f, powerSclDecrease = 0.2f;
+    public Effect hitPowerEffect = Fx.hitEmpSpark, chainEffect = Fx.chainEmp, applyEffect = Fx.heal;
+    public boolean hitUnits = true;
+    public float unitDamageScl = 0.7f;
+
+    @Override
+    public void hit(Bullet b, float x, float y){
+        super.hit(b, x, y);
+
+        if(!b.absorbed){
+            Vars.indexer.allBuildings(x, y, radius, other -> {
+                if(other.team == b.team){
+                    if(other.block.hasPower && other.block.canOverdrive && other.timeScale() < timeIncrease){
+                        other.applyBoost(timeIncrease, timeDuration);
+                        chainEffect.at(x, y, 0, hitColor, other);
+                        applyEffect.at(other, other.block.size * 7f);
+                    }
+
+                    if(other.block.hasPower && other.damaged()){
+                        other.heal(healPercent / 100f * other.maxHealth() + healAmount);
+                        Fx.healBlockFull.at(other.x, other.y, other.block.size, hitColor, other.block);
+                        applyEffect.at(other, other.block.size * 7f);
+                    }
+                }else if(other.power != null){
+                    var absorber = Damage.findAbsorber(b.team, x, y, other.x, other.y);
+                    if(absorber != null){
+                        other = absorber;
+                    }
+
+                    if(other.power != null && other.power.graph.getLastPowerProduced() > 0f){
+                        other.applySlowdown(powerSclDecrease, timeDuration);
+                        other.damage(damage * powerDamageScl);
+                        hitPowerEffect.at(other.x, other.y, b.angleTo(other), hitColor);
+                        chainEffect.at(x, y, 0, hitColor, other);
+                    }
+                }
+            });
+
+            if(hitUnits){
+                Units.nearbyEnemies(b.team, x, y, radius, other -> {
+                    if(other.team != b.team && other.hittable()){
+                        var absorber = Damage.findAbsorber(b.team, x, y, other.x, other.y);
+                        if(absorber != null){
+                            return;
+                        }
+
+                        hitPowerEffect.at(other.x, other.y, b.angleTo(other), hitColor);
+                        chainEffect.at(x, y, 0, hitColor, other);
+                        other.damage(damage * unitDamageScl);
+                        other.apply(status, statusDuration);
+                    }
+                });
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/EmptyBulletType.java b/core/src/mindustry/entities/bullet/EmptyBulletType.java
new file mode 100644
index 0000000000..13dfd83ccc
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/EmptyBulletType.java
@@ -0,0 +1,10 @@
+package mindustry.entities.bullet;
+
+public class EmptyBulletType extends BulletType{
+
+    public EmptyBulletType(){
+        hittable = collidesGround = collidesAir = collidesTiles = false;
+        speed = 0f;
+        keepVelocity = false;
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/ExplosionBulletType.java b/core/src/mindustry/entities/bullet/ExplosionBulletType.java
new file mode 100644
index 0000000000..f6f42a36a4
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/ExplosionBulletType.java
@@ -0,0 +1,29 @@
+package mindustry.entities.bullet;
+
+import mindustry.content.*;
+
+/** Template class for a non-drawing bullet type that makes an explosion and disappears instantly. */
+public class ExplosionBulletType extends BulletType{
+
+    public ExplosionBulletType(float splashDamage, float splashDamageRadius){
+        this.splashDamage = splashDamage;
+        this.splashDamageRadius = splashDamageRadius;
+        rangeOverride = Math.max(rangeOverride, splashDamageRadius * 2f / 3f);
+    }
+
+    public ExplosionBulletType(){
+    }
+
+    {
+        hittable = false;
+        lifetime = 1f;
+        speed = 0f;
+        rangeOverride = 20f;
+        shootEffect = Fx.massiveExplosion;
+        instantDisappear = true;
+        scaledSplashDamage = true;
+        killShooter = true;
+        collides = false;
+        keepVelocity = false;
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/FireBulletType.java b/core/src/mindustry/entities/bullet/FireBulletType.java
new file mode 100644
index 0000000000..a2b14e4481
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/FireBulletType.java
@@ -0,0 +1,64 @@
+package mindustry.entities.bullet;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+public class FireBulletType extends BulletType{
+    public Color colorFrom = Pal.lightFlame, colorMid = Pal.darkFlame, colorTo = Color.gray;
+    public float radius = 3f;
+    public float velMin = 0.6f, velMax = 2.6f;
+    public float fireTrailChance = 0.04f;
+    public Effect trailEffect2 = Fx.ballfire;
+    public float fireEffectChance = 0.1f, fireEffectChance2 = 0.1f;
+
+    {
+        pierce = true;
+        collidesTiles = false;
+        collides = false;
+        drag = 0.03f;
+        hitEffect = despawnEffect = Fx.none;
+        trailEffect = Fx.fireballsmoke;
+    }
+
+    public FireBulletType(float speed, float damage){
+        super(speed, damage);
+    }
+
+    public FireBulletType(){}
+
+    @Override
+    public void init(Bullet b){
+        super.init(b);
+
+        b.vel.setLength(Mathf.random(velMin, velMax));
+    }
+
+    @Override
+    public void draw(Bullet b){
+        Draw.color(colorFrom, colorMid, colorTo, b.fin());
+        Fill.circle(b.x, b.y, radius * b.fout());
+        Draw.reset();
+    }
+
+    @Override
+    public void update(Bullet b){
+        super.update(b);
+
+        if(Mathf.chanceDelta(fireTrailChance)){
+            Fires.create(b.tileOn());
+        }
+
+        if(Mathf.chanceDelta(fireEffectChance)){
+            trailEffect.at(b.x, b.y);
+        }
+
+        if(Mathf.chanceDelta(fireEffectChance2)){
+            trailEffect2.at(b.x, b.y);
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/FlakBulletType.java b/core/src/mindustry/entities/bullet/FlakBulletType.java
index ad5f8be7fa..16a51243b4 100644
--- a/core/src/mindustry/entities/bullet/FlakBulletType.java
+++ b/core/src/mindustry/entities/bullet/FlakBulletType.java
@@ -6,7 +6,7 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 
 public class FlakBulletType extends BasicBulletType{
-    public float explodeRange = 30f;
+    public float explodeRange = 30f, explodeDelay = 5f, flakDelay = 0f, flakInterval = 6f;
 
     public FlakBulletType(float speed, float damage){
         super(speed, damage, "shell");
@@ -25,17 +25,20 @@ public class FlakBulletType extends BasicBulletType{
     @Override
     public void update(Bullet b){
         super.update(b);
-        if(b.data() instanceof Integer) return;
 
-        if(b.timer(2, 6)){
+        //don't check for targets if primed to explode
+        if(b.time >= flakDelay && b.fdata >= 0 && b.timer(2, flakInterval)){
             Units.nearbyEnemies(b.team, Tmp.r1.setSize(explodeRange * 2f).setCenter(b.x, b.y), unit -> {
-                if(b.data() instanceof Float || !unit.checkTarget(collidesAir, collidesGround)) return;
+                //fdata < 0 means it's primed to explode
+                if(b.fdata < 0f || !unit.checkTarget(collidesAir, collidesGround) || !unit.targetable(b.team)) return;
 
-                if(unit.dst(b) < explodeRange){
-                    b.data(0);
-                    Time.run(5f, () -> {
-                        if(b.data() instanceof Integer){
-                            b.time(b.lifetime());
+                if(unit.within(b, explodeRange + unit.hitSize/2f)){
+                    //mark as primed
+                    b.fdata = -1f;
+                    Time.run(explodeDelay, () -> {
+                        //explode
+                        if(b.fdata < 0){
+                            b.time = b.lifetime;
                         }
                     });
                 }
diff --git a/core/src/mindustry/entities/bullet/LaserBoltBulletType.java b/core/src/mindustry/entities/bullet/LaserBoltBulletType.java
index cd5d89d5da..b0da2cd69e 100644
--- a/core/src/mindustry/entities/bullet/LaserBoltBulletType.java
+++ b/core/src/mindustry/entities/bullet/LaserBoltBulletType.java
@@ -1,8 +1,9 @@
 package mindustry.entities.bullet;
 
 import arc.graphics.g2d.*;
-import mindustry.gen.*;
 import mindustry.content.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
 
 public class LaserBoltBulletType extends BasicBulletType{
     public float width = 2f, height = 7f;
@@ -15,6 +16,8 @@ public class LaserBoltBulletType extends BasicBulletType{
         despawnEffect = Fx.hitLaser;
         hittable = false;
         reflectable = false;
+        lightColor = Pal.heal;
+        lightOpacity = 0.6f;
     }
 
     public LaserBoltBulletType(){
@@ -23,6 +26,7 @@ public class LaserBoltBulletType extends BasicBulletType{
 
     @Override
     public void draw(Bullet b){
+        super.draw(b);
         Draw.color(backColor);
         Lines.stroke(width);
         Lines.lineAngleCenter(b.x, b.y, b.rotation(), height);
diff --git a/core/src/mindustry/entities/bullet/LaserBulletType.java b/core/src/mindustry/entities/bullet/LaserBulletType.java
index ab6cd9dce1..c6c7c3de21 100644
--- a/core/src/mindustry/entities/bullet/LaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/LaserBulletType.java
@@ -21,19 +21,24 @@ public class LaserBulletType extends BulletType{
     public boolean largeHit = false;
 
     public LaserBulletType(float damage){
-        super(0.01f, damage);
+        this.damage = damage;
+        this.speed = 0f;
 
-        hitEffect = Fx.hitLancer;
+        hitEffect = Fx.hitLaserBlast;
+        hitColor = colors[2];
         despawnEffect = Fx.none;
         shootEffect = Fx.hitLancer;
         smokeEffect = Fx.none;
         hitSize = 4;
         lifetime = 16f;
+        impact = true;
         keepVelocity = false;
         collides = false;
         pierce = true;
         hittable = false;
         absorbable = false;
+        removeAfterPierce = false;
+        delayFrags = true;
     }
 
     public LaserBulletType(){
@@ -54,13 +59,13 @@ public class LaserBulletType extends BulletType{
     }
 
     @Override
-    public float range(){
-        return length;
+    protected float calculateRange(){
+        return Math.max(length, maxRange);
     }
 
     @Override
     public void init(Bullet b){
-        float resultLength = Damage.collideLaser(b, length, largeHit), rot = b.rotation();
+        float resultLength = Damage.collideLaser(b, length, largeHit, laserAbsorb, pierceCap), rot = b.rotation();
 
         laserEffect.at(b.x, b.y, rot, resultLength * 0.75f);
 
@@ -101,7 +106,7 @@ public class LaserBulletType extends BulletType{
             Lines.stroke((cwidth *= lengthFalloff) * b.fout());
             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());
+            Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, Lines.getStroke(), cwidth * 2f + width / 2f, b.rotation());
 
             Fill.circle(b.x, b.y, 1f * cwidth * b.fout());
             for(int i : Mathf.signs){
@@ -113,7 +118,7 @@ public class LaserBulletType extends BulletType{
         Draw.reset();
 
         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, width * 1.4f * b.fout(), colors[0], 0.6f);
+        Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, width * 1.4f * b.fout(), colors[0], 0.6f);
     }
 
     @Override
diff --git a/core/src/mindustry/entities/bullet/LightningBulletType.java b/core/src/mindustry/entities/bullet/LightningBulletType.java
index 24dabecba3..226d188f91 100644
--- a/core/src/mindustry/entities/bullet/LightningBulletType.java
+++ b/core/src/mindustry/entities/bullet/LightningBulletType.java
@@ -1,6 +1,5 @@
 package mindustry.entities.bullet;
 
-import arc.graphics.*;
 import arc.math.*;
 import mindustry.content.*;
 import mindustry.entities.*;
@@ -8,21 +7,24 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 
 public class LightningBulletType extends BulletType{
-    protected Color lightningColor = Pal.lancerLaser;
-    protected int lightningLength = 25, lightningLengthRand = 0;
 
     public LightningBulletType(){
-        super(0.0001f, 1f);
-
+        damage = 1f;
+        speed = 0f;
         lifetime = 1;
         despawnEffect = Fx.none;
         hitEffect = Fx.hitLancer;
         keepVelocity = false;
         hittable = false;
+        //for stats
+        status = StatusEffects.shocked;
+        lightningLength = 25;
+        lightningLengthRand = 0;
+        lightningColor = Pal.lancerLaser;
     }
 
     @Override
-    public float range(){
+    protected float calculateRange(){
         return (lightningLength + lightningLengthRand/2f) * 6f;
     }
 
@@ -31,12 +33,10 @@ public class LightningBulletType extends BulletType{
         return super.estimateDPS() * Math.max(lightningLength / 10f, 1);
     }
 
-    @Override
-    public void draw(Bullet b){
-    }
-
     @Override
     public void init(Bullet b){
+        super.init(b);
+
         Lightning.create(b, lightningColor, damage, b.x, b.y, b.rotation(), lightningLength + Mathf.random(lightningLengthRand));
     }
 }
diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java
index e99b7afefc..4671f1354a 100644
--- a/core/src/mindustry/entities/bullet/LiquidBulletType.java
+++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java
@@ -2,6 +2,7 @@ package mindustry.entities.bullet;
 
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.content.*;
@@ -16,6 +17,7 @@ public class LiquidBulletType extends BulletType{
     public Liquid liquid;
     public float puddleSize = 6f;
     public float orbSize = 3f;
+    public float boilTime = 5f;
 
     public LiquidBulletType(@Nullable Liquid liquid){
         super(3.5f, 0);
@@ -23,6 +25,7 @@ public class LiquidBulletType extends BulletType{
         if(liquid != null){
             this.liquid = liquid;
             this.status = liquid.effect;
+            hitColor = liquid.color;
             lightColor = liquid.lightColor;
             lightOpacity = liquid.lightColor.a;
         }
@@ -36,21 +39,23 @@ public class LiquidBulletType extends BulletType{
         shootEffect = Fx.none;
         drag = 0.001f;
         knockback = 0.55f;
+        displayAmmoMultiplier = false;
     }
 
     public LiquidBulletType(){
         this(null);
     }
 
-    @Override
-    public float range(){
-        return speed * lifetime / 2f;
-    }
-
     @Override
     public void update(Bullet b){
         super.update(b);
 
+        if(liquid.willBoil() && b.time >= Mathf.randomSeed(b.id, boilTime)){
+            Fx.vaporSmall.at(b.x, b.y, liquid.gasColor);
+            b.remove();
+            return;
+        }
+
         if(liquid.canExtinguish()){
             Tile tile = world.tileWorld(b.x, b.y);
             if(tile != null && Fires.has(tile.x, tile.y)){
@@ -63,9 +68,16 @@ public class LiquidBulletType extends BulletType{
 
     @Override
     public void draw(Bullet b){
-        Draw.color(liquid.color, Color.white, b.fout() / 100f);
+        super.draw(b);
+        if(liquid.willBoil()){
+            Draw.color(liquid.color, Tmp.c3.set(liquid.gasColor).a(0.4f), b.time / Mathf.randomSeed(b.id, boilTime));
+            Fill.circle(b.x, b.y, orbSize * (b.fin() * 1.1f + 1f));
+        }else{
+            Draw.color(liquid.color, Color.white, b.fout() / 100f);
+            Fill.circle(b.x, b.y, orbSize);
+        }
 
-        Fill.circle(b.x, b.y, orbSize);
+        Draw.reset();
     }
 
     @Override
@@ -73,7 +85,9 @@ public class LiquidBulletType extends BulletType{
         super.despawned(b);
 
         //don't create liquids when the projectile despawns
-        hitEffect.at(b.x, b.y, b.rotation(), liquid.color);
+        if(!liquid.willBoil()){
+            hitEffect.at(b.x, b.y, b.rotation(), liquid.color);
+        }
     }
 
     @Override
diff --git a/core/src/mindustry/entities/bullet/MassDriverBolt.java b/core/src/mindustry/entities/bullet/MassDriverBolt.java
index 91dae839a8..b9a0526e40 100644
--- a/core/src/mindustry/entities/bullet/MassDriverBolt.java
+++ b/core/src/mindustry/entities/bullet/MassDriverBolt.java
@@ -10,31 +10,24 @@ import mindustry.world.blocks.distribution.MassDriver.*;
 
 import static mindustry.Vars.*;
 
-public class MassDriverBolt extends BulletType{
+public class MassDriverBolt extends BasicBulletType{
 
     public MassDriverBolt(){
-        super(1f, 50);
+        super(1f, 75);
         collidesTiles = false;
         lifetime = 1f;
+        width = 11f;
+        height = 13f;
+        shrinkY = 0f;
+        sprite = "shell";
         despawnEffect = Fx.smeltsmoke;
         hitEffect = Fx.hitBulletBig;
     }
 
-    @Override
-    public void draw(Bullet b){
-        float w = 11f, h = 13f;
-
-        Draw.color(Pal.bulletYellowBack);
-        Draw.rect("shell-back", b.x, b.y, w, h, b.rotation() + 90);
-
-        Draw.color(Pal.bulletYellow);
-        Draw.rect("shell", b.x, b.y, w, h, b.rotation() + 90);
-
-        Draw.reset();
-    }
-
     @Override
     public void update(Bullet b){
+        super.update(b);
+        
         //data MUST be an instance of DriverBulletData
         if(!(b.data() instanceof DriverBulletData data)){
             hit(b);
diff --git a/core/src/mindustry/entities/bullet/MissileBulletType.java b/core/src/mindustry/entities/bullet/MissileBulletType.java
index 274a806f5e..7d8cf7b8a3 100644
--- a/core/src/mindustry/entities/bullet/MissileBulletType.java
+++ b/core/src/mindustry/entities/bullet/MissileBulletType.java
@@ -15,7 +15,7 @@ public class MissileBulletType extends BasicBulletType{
         height = 8f;
         hitSound = Sounds.explosion;
         trailChance = 0.2f;
-        lifetime = 49f;
+        lifetime = 52f;
     }
 
     public MissileBulletType(float speed, float damage){
diff --git a/core/src/mindustry/entities/bullet/PointBulletType.java b/core/src/mindustry/entities/bullet/PointBulletType.java
index 920e6e5b51..863327a583 100644
--- a/core/src/mindustry/entities/bullet/PointBulletType.java
+++ b/core/src/mindustry/entities/bullet/PointBulletType.java
@@ -13,9 +13,10 @@ public class PointBulletType extends BulletType{
      public float trailSpacing = 10f;
 
      public PointBulletType(){
-         scaleVelocity = true;
+         scaleLife = true;
          lifetime = 100f;
          collides = false;
+         reflectable = false;
          keepVelocity = false;
          backMove = false;
      }
@@ -42,7 +43,7 @@ public class PointBulletType extends BulletType{
         float range = 1f;
 
         Units.nearbyEnemies(b.team, px - range, py - range, range*2f, range*2f, e -> {
-            if(e.dead()) return;
+            if(e.dead() || !e.checkTarget(collidesAir, collidesGround) || !e.hittable()) return;
 
             e.hitbox(Tmp.r1);
             if(!Tmp.r1.contains(px, py)) return;
@@ -56,10 +57,11 @@ public class PointBulletType extends BulletType{
 
         if(result != null){
             b.collision(result, px, py);
-        }else{
+        }else if(collidesTiles){
             Building build = Vars.world.buildWorld(px, py);
             if(build != null && build.team != b.team){
                 build.collision(b);
+                 hit(b, px, py);
             }
         }
 
diff --git a/core/src/mindustry/entities/bullet/PointLaserBulletType.java b/core/src/mindustry/entities/bullet/PointLaserBulletType.java
new file mode 100644
index 0000000000..ca81ce7ad7
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/PointLaserBulletType.java
@@ -0,0 +1,130 @@
+package mindustry.entities.bullet;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+import static mindustry.Vars.*;
+
+/** A continuous bullet type that only damages in a point. */
+public class PointLaserBulletType extends BulletType{
+    public String sprite = "point-laser";
+    public TextureRegion laser, laserEnd;
+
+    public Color color = Color.white;
+
+    public Effect beamEffect = Fx.colorTrail;
+    public float beamEffectInterval = 3f, beamEffectSize = 3.5f;
+
+    public float oscScl = 2f, oscMag = 0.3f;
+    public float damageInterval = 5f;
+
+    public float shake = 0f;
+
+    public PointLaserBulletType(){
+        removeAfterPierce = false;
+        speed = 0f;
+        despawnEffect = Fx.none;
+        lifetime = 20f;
+        impact = true;
+        keepVelocity = false;
+        collides = false;
+        pierce = true;
+        hittable = false;
+        absorbable = false;
+        optimalLifeFract = 0.5f;
+        shootEffect = smokeEffect = Fx.none;
+
+        //just make it massive, users of this bullet can adjust as necessary
+        drawSize = 1000f;
+    }
+
+    @Override
+    public float continuousDamage(){
+        return damage / damageInterval * 60f;
+    }
+
+    @Override
+    public float estimateDPS(){
+        return damage * 100f / damageInterval * 3f;
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        laser = Core.atlas.find(sprite);
+        laserEnd = Core.atlas.find(sprite + "-end");
+    }
+
+    @Override
+    public void draw(Bullet b){
+        super.draw(b);
+
+        Draw.color(color);
+        Drawf.laser(laser, laserEnd, b.x, b.y, b.aimX, b.aimY, b.fslope() * (1f - oscMag + Mathf.absin(Time.time, oscScl, oscMag)));
+
+        Draw.reset();
+    }
+
+    @Override
+    public void update(Bullet b){
+        updateTrail(b);
+        updateTrailEffects(b);
+        updateBulletInterval(b);
+
+        if(b.timer.get(0, damageInterval)){
+            Damage.collidePoint(b, b.team, hitEffect, b.aimX, b.aimY);
+        }
+
+        if(b.timer.get(1, beamEffectInterval)){
+            beamEffect.at(b.aimX, b.aimY, beamEffectSize * b.fslope(), hitColor);
+        }
+
+        if(shake > 0){
+            Effect.shake(shake, shake, b);
+        }
+    }
+
+    @Override
+    public void updateTrailEffects(Bullet b){
+        if(trailChance > 0){
+            if(Mathf.chanceDelta(trailChance)){
+                trailEffect.at(b.aimX, b.aimY, trailRotation ? b.angleTo(b.aimX, b.aimY) : (trailParam * b.fslope()), trailColor);
+            }
+        }
+
+        if(trailInterval > 0f){
+            if(b.timer(0, trailInterval)){
+                trailEffect.at(b.aimX, b.aimY, trailRotation ? b.angleTo(b.aimX, b.aimY) : (trailParam * b.fslope()), trailColor);
+            }
+        }
+    }
+
+    @Override
+    public void updateTrail(Bullet b){
+        if(!headless && trailLength > 0){
+            if(b.trail == null){
+                b.trail = new Trail(trailLength);
+            }
+            b.trail.length = trailLength;
+            b.trail.update(b.aimX, b.aimY, b.fslope() * (1f - (trailSinMag > 0 ? Mathf.absin(Time.time, trailSinScl, trailSinMag) : 0f)));
+        }
+    }
+
+    @Override
+    public void updateBulletInterval(Bullet b){
+        if(intervalBullet != null && b.time >= intervalDelay && b.timer.get(2, bulletInterval)){
+            float ang = b.rotation();
+            for(int i = 0; i < intervalBullets; i++){
+                intervalBullet.create(b, b.aimX, b.aimY, ang + Mathf.range(intervalRandomSpread) + intervalAngle + ((i - (intervalBullets - 1f)/2f) * intervalSpread));
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/RailBulletType.java b/core/src/mindustry/entities/bullet/RailBulletType.java
index aa5136e7fc..dfa41520f4 100644
--- a/core/src/mindustry/entities/bullet/RailBulletType.java
+++ b/core/src/mindustry/entities/bullet/RailBulletType.java
@@ -7,46 +7,51 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 
 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 Effect pierceEffect = Fx.hitBulletSmall, pointEffect = Fx.none, lineEffect = Fx.none;
+    public Effect endEffect = Fx.none;
 
     public float length = 100f;
 
-    public float updateEffectSeg = 20f;
+    public float pointEffectSpace = 20f;
 
     public RailBulletType(){
+        speed = 0f;
         pierceBuilding = true;
         pierce = true;
         reflectable = false;
         hitEffect = Fx.none;
         despawnEffect = Fx.none;
         collides = false;
+        keepVelocity = false;
         lifetime = 1f;
-        speed = 0.01f;
+        delayFrags = true;
     }
 
     @Override
-    public float range(){
+    protected float calculateRange(){
         return length;
     }
 
-    void handle(Bullet b, Posc pos, float initialHealth){
-        float sub = Math.max(initialHealth*pierceDamageFactor, 0);
+    @Override
+    public void handlePierce(Bullet b, float initialHealth, float x, float y){
+        float sub = Math.max(initialHealth * pierceDamageFactor, 0);
 
         if(b.damage <= 0){
-            b.fdata = Math.min(b.fdata, b.dst(pos));
+            b.fdata = Math.min(b.fdata, b.dst(x, y));
             return;
         }
 
         if(b.damage > 0){
-            pierceEffect.at(pos.getX(), pos.getY(), b.rotation());
-
-            hitEffect.at(pos.getX(), pos.getY());
+            pierceEffect.at(x, y, b.rotation());
         }
 
         //subtract health from each consecutive pierce
         b.damage -= Math.min(b.damage, sub);
+
+        //bullet was stopped, decrease furthest distance
+        if(b.damage <= 0f){
+            b.fdata = Math.min(b.fdata, b.dst(x, y));
+        }
     }
 
     @Override
@@ -54,12 +59,24 @@ public class RailBulletType extends BulletType{
         super.init(b);
 
         b.fdata = length;
-        Damage.collideLine(b, b.team, b.type.hitEffect, b.x, b.y, b.rotation(), length, false);
+        Damage.collideLine(b, b.team, b.type.hitEffect, b.x, b.y, b.rotation(), length, false, false, pierceCap);
         float resultLen = b.fdata;
 
-        Vec2 nor = Tmp.v1.set(b.vel).nor();
-        for(float i = 0; i <= resultLen; i += updateEffectSeg){
-            updateEffect.at(b.x + nor.x * i, b.y + nor.y * i, b.rotation());
+        Vec2 nor = Tmp.v1.trns(b.rotation(), 1f).nor();
+        if(pointEffect != Fx.none){
+            for(float i = 0; i <= resultLen; i += pointEffectSpace){
+                pointEffect.at(b.x + nor.x * i, b.y + nor.y * i, b.rotation(), trailColor);
+            }
+        }
+
+        boolean any = b.collided.size > 0;
+
+        if(!any && endEffect != Fx.none){
+            endEffect.at(b.x + nor.x * resultLen, b.y + nor.y * resultLen, b.rotation(), hitColor);
+        }
+
+        if(lineEffect != Fx.none){
+            lineEffect.at(b.x, b.y, b.rotation(), hitColor, new Vec2(b.x, b.y).mulAdd(nor, resultLen));
         }
     }
 
@@ -69,12 +86,7 @@ public class RailBulletType extends BulletType{
     }
 
     @Override
-    public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){
-        handle(b, entity, initialHealth);
-    }
-
-    @Override
-    public void hitTile(Bullet b, Building build, float initialHealth, boolean direct){
-        handle(b, build, initialHealth);
+    public void hitTile(Bullet b, Building build, float x, float y, float initialHealth, boolean direct){
+        handlePierce(b, initialHealth, x, y);
     }
 }
diff --git a/core/src/mindustry/entities/bullet/SapBulletType.java b/core/src/mindustry/entities/bullet/SapBulletType.java
index dbd30b77a8..70892cb59a 100644
--- a/core/src/mindustry/entities/bullet/SapBulletType.java
+++ b/core/src/mindustry/entities/bullet/SapBulletType.java
@@ -17,15 +17,18 @@ public class SapBulletType extends BulletType{
     public float width = 0.4f;
 
     public SapBulletType(){
-        speed = 0.0001f;
+        speed = 0f;
         despawnEffect = Fx.none;
-        pierce = false;
+        pierce = true;
         collides = false;
         hitSize = 0f;
         hittable = false;
         hitEffect = Fx.hitLiquid;
         status = StatusEffects.sapped;
+        lightColor = Pal.sap;
+        lightOpacity = 0.6f;
         statusDuration = 60f * 3f;
+        impact = true;
     }
 
     @Override
@@ -34,12 +37,12 @@ public class SapBulletType extends BulletType{
             Tmp.v1.set(data).lerp(b, b.fin());
 
             Draw.color(color);
-            Drawf.laser(b.team, Core.atlas.find("laser"), Core.atlas.find("laser-end"),
+            Drawf.laser(Core.atlas.find("laser"), Core.atlas.find("laser-end"),
                 b.x, b.y, Tmp.v1.x, Tmp.v1.y, width * b.fout());
 
             Draw.reset();
 
-            Drawf.light(b.team, b.x, b.y, Tmp.v1.x, Tmp.v1.y, 15f * b.fout(), lightColor, 0.6f);
+            Drawf.light(b.x, b.y, Tmp.v1.x, Tmp.v1.y, 15f * b.fout(), lightColor, lightOpacity);
         }
     }
 
@@ -49,8 +52,8 @@ public class SapBulletType extends BulletType{
     }
 
     @Override
-    public float range(){
-        return length;
+    protected float calculateRange(){
+        return Math.max(length, maxRange);
     }
 
     @Override
diff --git a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
index 236ede8887..349b2adc8c 100644
--- a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
+++ b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
@@ -19,7 +19,7 @@ public class ShrapnelBulletType extends BulletType{
     public float serrationLenScl = 10f, serrationWidth = 4f, serrationSpacing = 8f, serrationSpaceOffset = 80f, serrationFadeOffset = 0.5f;
 
     public ShrapnelBulletType(){
-        speed = 0.01f;
+        speed = 0f;
         hitEffect = Fx.hitLancer;
         shootEffect = smokeEffect = Fx.lightningShoot;
         lifetime = 10f;
@@ -29,11 +29,14 @@ public class ShrapnelBulletType extends BulletType{
         pierce = true;
         hittable = false;
         absorbable = false;
+        lightOpacity = 0.6f;
     }
 
     @Override
     public void init(Bullet b){
-        Damage.collideLaser(b, length, hitLarge);
+        super.init(b);
+
+        Damage.collideLaser(b, length, hitLarge, laserAbsorb, pierceCap);
     }
 
     @Override
@@ -44,17 +47,17 @@ public class ShrapnelBulletType extends BulletType{
     }
 
     @Override
-    public float range(){
-        return length;
+    protected float calculateRange(){
+        return Math.max(length, maxRange);
     }
 
     @Override
     public void draw(Bullet b){
-        float realLength = b.fdata;
+        float realLength = b.fdata, rot = b.rotation();
 
         Draw.color(fromColor, toColor, b.fin());
         for(int i = 0; i < (int)(serrations * realLength / length); i++){
-            Tmp.v1.trns(b.rotation(), i * serrationSpacing);
+            Tmp.v1.trns(rot, i * serrationSpacing);
             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);
@@ -62,5 +65,7 @@ public class ShrapnelBulletType extends BulletType{
         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();
+
+        Drawf.light(b.x, b.y, b.x + Angles.trnsx(rot, realLength), b.y + Angles.trnsy(rot, realLength), width * 2.5f * b.fout(), toColor, lightOpacity);
     }
 }
diff --git a/core/src/mindustry/entities/bullet/SpaceLiquidBulletType.java b/core/src/mindustry/entities/bullet/SpaceLiquidBulletType.java
new file mode 100644
index 0000000000..325fd0f0bf
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/SpaceLiquidBulletType.java
@@ -0,0 +1,37 @@
+package mindustry.entities.bullet;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.content.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+//this should probably be an effect?
+public class SpaceLiquidBulletType extends BulletType{
+    public float orbSize = 5.5f;
+
+    public SpaceLiquidBulletType(){
+        super(3.5f, 0);
+
+        collides = false;
+        lifetime = 90f;
+        despawnEffect = Fx.none;
+        hitEffect = Fx.none;
+        smokeEffect = Fx.none;
+        shootEffect = Fx.none;
+        drag = 0.002f;
+        hittable = false;
+    }
+
+    @Override
+    public void draw(Bullet b){
+        super.draw(b);
+
+        if(!(b.data instanceof Liquid liquid)) return;
+
+        Draw.color(liquid.color);
+        Fill.circle(b.x, b.y, Interp.pow3Out.apply(b.fslope()) * orbSize);
+
+        Draw.reset();
+    }
+}
diff --git a/core/src/mindustry/entities/comp/AmmoDistributeComp.java b/core/src/mindustry/entities/comp/AmmoDistributeComp.java
deleted file mode 100644
index 96e10a9ce0..0000000000
--- a/core/src/mindustry/entities/comp/AmmoDistributeComp.java
+++ /dev/null
@@ -1,28 +0,0 @@
-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 d0ec5b9a32..5ab3327f76 100644
--- a/core/src/mindustry/entities/comp/BlockUnitComp.java
+++ b/core/src/mindustry/entities/comp/BlockUnitComp.java
@@ -4,7 +4,6 @@ import arc.graphics.g2d.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.game.*;
 import mindustry.gen.*;
-import mindustry.ui.*;
 
 import static mindustry.Vars.*;
 
@@ -19,11 +18,18 @@ abstract class BlockUnitComp implements Unitc{
 
         //sets up block stats
         maxHealth(tile.block.health);
-        health(tile.health());
+        health(tile.health);
         hitSize(tile.block.size * tilesize * 0.7f);
         set(tile);
     }
 
+    @Override
+    public void add(){
+        if(tile == null){
+            throw new RuntimeException("Do not add BlockUnit entities to the game, they will simply crash. Internal use only.");
+        }
+    }
+
     @Override
     public void update(){
         if(tile != null){
@@ -34,7 +40,7 @@ abstract class BlockUnitComp implements Unitc{
     @Replace
     @Override
     public TextureRegion icon(){
-        return tile.block.icon(Cicon.full);
+        return tile.block.uiIcon;
     }
 
     @Override
@@ -62,7 +68,7 @@ abstract class BlockUnitComp implements Unitc{
         if(tile != null && this.team != team){
             this.team = team;
             if(tile.team != team){
-                tile.team(team);
+                tile.changeTeam(team);
             }
         }
     }
diff --git a/core/src/mindustry/entities/comp/BoundedComp.java b/core/src/mindustry/entities/comp/BoundedComp.java
index c02d34a760..8fc1927bc0 100644
--- a/core/src/mindustry/entities/comp/BoundedComp.java
+++ b/core/src/mindustry/entities/comp/BoundedComp.java
@@ -1,37 +1,57 @@
 package mindustry.entities.comp;
 
 import arc.math.*;
-import arc.math.geom.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 
 import static mindustry.Vars.*;
 
 @Component
 abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{
-    static final float warpDst = 180f;
+    static final float warpDst = 30f;
 
+    @Import UnitType type;
     @Import float x, y;
-    @Import Vec2 vel;
+    @Import Team team;
 
     @Override
     public void update(){
+        if(!type.bounded) return;
+        
+        float bot = 0f, left = 0f, top = world.unitHeight(), right = world.unitWidth();
+
+        //TODO hidden map rules only apply to player teams? should they?
+        if(state.rules.limitMapArea && !team.isAI()){
+            bot = state.rules.limitY * tilesize;
+            left = state.rules.limitX * tilesize;
+            top = state.rules.limitHeight * tilesize + bot;
+            right = state.rules.limitWidth * tilesize + left;
+        }
+
         if(!net.client() || isLocal()){
+
+            float dx = 0f, dy = 0f;
+
             //repel unit out of bounds
-            if(x < 0) vel.x += (-x/warpDst);
-            if(y < 0) vel.y += (-y/warpDst);
-            if(x > world.unitWidth()) vel.x -= (x - world.unitWidth())/warpDst;
-            if(y > world.unitHeight()) vel.y -= (y - world.unitHeight())/warpDst;
+            if(x < left) dx += (-(x - left)/warpDst);
+            if(y < bot) dy += (-(y - bot)/warpDst);
+            if(x > right) dx -= (x - right)/warpDst;
+            if(y > top) dy -= (y - top)/warpDst;
+
+            velAddNet(dx * Time.delta, dy * Time.delta);
         }
 
         //clamp position if not flying
         if(isGrounded()){
-            x = Mathf.clamp(x, 0, world.width() * tilesize - tilesize);
-            y = Mathf.clamp(y, 0, world.height() * tilesize - tilesize);
+            x = Mathf.clamp(x, left, right - tilesize);
+            y = Mathf.clamp(y, bot, top - tilesize);
         }
 
         //kill when out of bounds
-        if(x < -finalWorldBounds || y < -finalWorldBounds || x >= world.width() * tilesize + finalWorldBounds || y >= world.height() * tilesize + finalWorldBounds){
+        if(x < -finalWorldBounds + left || y < -finalWorldBounds + bot || x >= right + finalWorldBounds || y >= top + finalWorldBounds){
             kill();
         }
     }
diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index a5c55485ec..575d5ffc0b 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -4,7 +4,6 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.math.geom.*;
 import arc.struct.Queue;
 import arc.util.*;
 import mindustry.*;
@@ -25,26 +24,58 @@ import java.util.*;
 import static mindustry.Vars.*;
 
 @Component
-abstract class BuilderComp implements Posc, Teamc, Rotc{
-    static final Vec2[] vecs = new Vec2[]{new Vec2(), new Vec2(), new Vec2(), new Vec2()};
-
-    @Import float x, y, rotation;
+abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
+    @Import float x, y, rotation, buildSpeedMultiplier;
     @Import UnitType type;
     @Import Team team;
 
     @SyncLocal Queue<BuildPlan> plans = new Queue<>(1);
     @SyncLocal boolean updateBuilding = true;
 
+    private transient float buildCounter;
     private transient BuildPlan lastActive;
     private transient int lastSize;
-    private transient float buildAlpha = 0f;
+    transient float buildAlpha = 0f;
 
     public boolean canBuild(){
-        return type.buildSpeed > 0;
+        return type.buildSpeed > 0 && buildSpeedMultiplier > 0;
     }
 
     @Override
     public void update(){
+        updateBuildLogic();
+    }
+
+    @Override
+    public void afterRead(){
+        //why would this happen?
+        if(plans == null){
+            plans = new Queue<>(1);
+        }
+    }
+
+    public void validatePlans(){
+        if(plans.size > 0){
+            Iterator<BuildPlan> it = plans.iterator();
+            while(it.hasNext()){
+                BuildPlan plan = it.next();
+                Tile tile = world.tile(plan.x, plan.y);
+                boolean isSameDerelict = (tile != null && tile.build != null && tile.block() == plan.block && tile.build.tileX() == plan.x && tile.build.tileY() == plan.y && tile.team() == Team.derelict);
+                if(tile == null || (plan.breaking && tile.block() == Blocks.air) || (!plan.breaking && ((tile.build != null && tile.build.rotation == plan.rotation && !isSameDerelict) || !plan.block.rotate) &&
+                    //the block must be the same, but not derelict and the same
+                    ((tile.block() == plan.block && !isSameDerelict) ||
+                        //same floor or overlay
+                        (plan.block != null && (plan.block.isOverlay() && plan.block == tile.overlay() || (plan.block.isFloor() && plan.block == tile.floor())))))){
+
+                    it.remove();
+                }
+            }
+        }
+    }
+
+    public void updateBuildLogic(){
+        if(type.buildSpeed <= 0f) return;
+
         if(!headless){
             //visual activity update
             if(lastActive != null && buildAlpha <= 0.01f){
@@ -54,123 +85,165 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{
             buildAlpha = Mathf.lerpDelta(buildAlpha, activelyBuilding() ? 1f : 0f, 0.15f);
         }
 
-        if(!updateBuilding || !canBuild()) return;
+        validatePlans();
 
-        float finalPlaceDst = state.rules.infiniteResources ? Float.MAX_VALUE : buildingRange;
+        if(!updateBuilding || !canBuild()){
+            return;
+        }
+
+        float finalPlaceDst = state.rules.infiniteResources ? Float.MAX_VALUE : type.buildRange;
         boolean infinite = state.rules.infiniteResources || team().rules().infiniteResources;
 
-        Iterator<BuildPlan> it = plans.iterator();
-        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.build != null && tile.build.rotation == req.rotation) || !req.block.rotate) && tile.block() == req.block)){
-                it.remove();
-            }
-        }
+        buildCounter += Time.delta;
+        if(Float.isNaN(buildCounter) || Float.isInfinite(buildCounter)) buildCounter = 0f;
+        buildCounter = Math.min(buildCounter, 10f);
 
-        Building core = core();
+        boolean instant = state.rules.instantBuild && state.rules.infiniteResources;
 
-        //nothing to build.
-        if(buildPlan() == null) return;
+        //random attempt to fix a freeze that only occurs on Android
+        int maxPerFrame = instant ? plans.size : 10, count = 0;
 
-        //find the next build request
-        if(plans.size > 1){
-            int total = 0;
-            BuildPlan req;
-            while((!within((req = buildPlan()).tile(), finalPlaceDst) || shouldSkip(req, core)) && total < plans.size){
-                plans.removeFirst();
-                plans.addLast(req);
-                total++;
-            }
-        }
+        var core = core();
 
-        BuildPlan current = buildPlan();
-        Tile tile = current.tile();
+        if((core == null && !infinite)) return;
 
-        lastActive = current;
-        buildAlpha = 1f;
-        if(current.breaking) lastSize = tile.block().size;
+        while((buildCounter >= 1 || instant) && count++ < maxPerFrame && plans.size > 0){
+            buildCounter -= 1f;
 
-        if(!within(tile, finalPlaceDst)) return;
-
-        if(!(tile.build instanceof ConstructBuild cb)){
-            if(!current.initialized && !current.breaking && Build.validPlace(current.block, team, current.x, current.y, current.rotation)){
-                boolean hasAll = infinite || current.isRotation(team) || !Structs.contains(current.block.requirements, i -> core != null && !core.items.has(i.item));
-
-                if(hasAll){
-                    Call.beginPlace(self(), current.block, team, current.x, current.y, current.rotation);
-                }else{
-                    current.stuck = true;
+            //find the next build plan
+            if(plans.size > 1){
+                int total = 0;
+                int size = plans.size;
+                BuildPlan plan;
+                while((!within((plan = buildPlan()).tile(), finalPlaceDst) || shouldSkip(plan, core)) && total < size){
+                    plans.removeFirst();
+                    plans.addLast(plan);
+                    total++;
                 }
-            }else if(!current.initialized && current.breaking && Build.validBreak(team, current.x, current.y)){
-                Call.beginBreak(self(), team, current.x, current.y);
-            }else{
-                plans.removeFirst();
-                return;
             }
-        }else if((tile.team() != team && tile.team() != Team.derelict) || (!current.breaking && (cb.cblock != current.block || cb.tile != current.tile()))){
-            plans.removeFirst();
-            return;
-        }
 
-        if(tile.build instanceof ConstructBuild && !current.initialized){
-            Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, team, self(), current.breaking)));
-            current.initialized = true;
-        }
+            BuildPlan current = buildPlan();
+            Tile tile = current.tile();
 
-        //if there is no core to build with or no build entity, stop building!
-        if((core == null && !infinite) || !(tile.build instanceof ConstructBuild entity)){
-            return;
-        }
+            lastActive = current;
+            buildAlpha = 1f;
+            if(current.breaking) lastSize = tile.block().size;
 
-        //otherwise, update it.
-        if(current.breaking){
-            entity.deconstruct(self(), core, 1f / entity.buildCost * Time.delta * type.buildSpeed * state.rules.buildSpeedMultiplier);
-        }else{
-            entity.construct(self(), core, 1f / entity.buildCost * Time.delta * type.buildSpeed * state.rules.buildSpeedMultiplier, current.config);
-        }
+            if(!within(tile, finalPlaceDst)) continue;
 
-        current.stuck = Mathf.equal(current.progress, entity.progress);
-        current.progress = entity.progress;
+            if(!headless){
+                Vars.control.sound.loop(Sounds.build, tile, 0.15f);
+            }
+
+            if(!(tile.build instanceof ConstructBuild cb)){
+                if(!current.initialized && !current.breaking && Build.validPlaceIgnoreUnits(current.block, team, current.x, current.y, current.rotation, true)){
+                    if(Build.checkNoUnitOverlap(current.block, current.x, current.y)){
+                        boolean hasAll = infinite || current.isRotation(team) ||
+                        //derelict repair
+                        (tile.team() == Team.derelict && tile.block() == current.block && tile.build != null && tile.block().allowDerelictRepair && state.rules.derelictRepair) ||
+                        //make sure there's at least 1 item of each type first
+                        !Structs.contains(current.block.requirements, i -> !core.items.has(i.item, Math.min(Mathf.round(i.amount * state.rules.buildCostMultiplier), 1)));
+
+                        if(hasAll){
+                            Call.beginPlace(self(), current.block, team, current.x, current.y, current.rotation);
+
+                            if(current.block.instantBuild){
+                                if(plans.size > 0){
+                                    plans.removeFirst();
+                                }
+                                continue;
+                            }
+                        }else{
+                            current.stuck = true;
+                        }
+                    }else{
+                        //there's a unit blocking the plan, skip it
+                        plans.removeFirst();
+                        plans.addLast(current);
+                        continue;
+                    }
+                }else if(!current.initialized && current.breaking && Build.validBreak(team, current.x, current.y)){
+                    Call.beginBreak(self(), team, current.x, current.y);
+                }else{
+                    plans.removeFirst();
+                    continue;
+                }
+            }else if((tile.team() != team && tile.team() != Team.derelict) || (!current.breaking && (cb.current != current.block || cb.tile != current.tile()))){
+                plans.removeFirst();
+                continue;
+            }
+
+            if(tile.build instanceof ConstructBuild && !current.initialized){
+                Events.fire(new BuildSelectEvent(tile, team, self(), current.breaking));
+                current.initialized = true;
+            }
+
+            //if there is no core to build with or no build entity, stop building!
+            if(!(tile.build instanceof ConstructBuild entity)){
+                continue;
+            }
+
+            float bs = 1f / entity.buildCost * type.buildSpeed * buildSpeedMultiplier * state.rules.buildSpeed(team);
+
+            //otherwise, update it.
+            if(current.breaking){
+                entity.deconstruct(self(), core, bs);
+            }else{
+                entity.construct(self(), core, bs, current.config);
+            }
+
+            current.stuck = Mathf.equal(current.progress, entity.progress);
+            current.progress = entity.progress;
+        }
     }
 
     /** Draw all current build plans. Does not draw the beam effect, only the positions. */
     void drawBuildPlans(){
 
-        for(BuildPlan plan : plans){
-            if(plan.progress > 0.01f || (buildPlan() == plan && plan.initialized && (within(plan.x * tilesize, plan.y * tilesize, buildingRange) || state.isEditor()))) continue;
-            drawPlan(plan, 1f);
+        for(int i = 0; i < 2; i++){
+            for(BuildPlan plan : plans){
+                if(plan.progress > 0.01f || (buildPlan() == plan && plan.initialized && (within(plan.x * tilesize, plan.y * tilesize, type.buildRange) || state.isEditor()))) continue;
+                if(i == 0){
+                    drawPlan(plan, 1f);
+                }else{
+                    drawPlanTop(plan, 1f);
+                }
+            }
         }
 
         Draw.reset();
     }
 
-    void drawPlan(BuildPlan request, float alpha){
-        request.animScale = 1f;
-        if(request.breaking){
-            control.input.drawBreaking(request);
+    void drawPlan(BuildPlan plan, float alpha){
+        plan.animScale = 1f;
+        if(plan.breaking){
+            control.input.drawBreaking(plan);
         }else{
-            request.block.drawPlan(request, control.input.allRequests(),
-            Build.validPlace(request.block, team, request.x, request.y, request.rotation) || control.input.requestMatches(request),
+            plan.block.drawPlan(plan, control.input.allPlans(),
+            Build.validPlace(plan.block, team, plan.x, plan.y, plan.rotation) || control.input.planMatches(plan),
             alpha);
-
-            Draw.reset();
-            Draw.mixcol(Color.white, 0.24f + Mathf.absin(Time.globalTime, 6f, 0.28f));
-            Draw.alpha(alpha);
-            request.block.drawRequestConfigTop(request, plans);
         }
     }
 
-    /** @return whether this request should be skipped, in favor of the next one. */
-    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 || request.isRotation(team)) return false;
+    void drawPlanTop(BuildPlan plan, float alpha){
+        if(!plan.breaking){
+            Draw.reset();
+            Draw.mixcol(Color.white, 0.24f + Mathf.absin(Time.globalTime, 6f, 0.28f));
+            Draw.alpha(alpha);
+            plan.block.drawPlanConfigTop(plan, plans);
+        }
+    }
 
-        return (request.stuck && !core.items.has(request.block.requirements)) || (Structs.contains(request.block.requirements, i -> !core.items.has(i.item) && Mathf.round(i.amount * state.rules.buildCostMultiplier) > 0) && !request.initialized);
+    /** @return whether this plan should be skipped, in favor of the next one. */
+    boolean shouldSkip(BuildPlan plan, @Nullable Building core){
+        //plans that you have at least *started* are considered
+        if(state.rules.infiniteResources || team.rules().infiniteResources || plan.breaking || core == null || plan.isRotation(team) || (isBuilding() && !within(plans.last(), type.buildRange))) return false;
+
+        return (plan.stuck && !core.items.has(plan.block.requirements)) || (Structs.contains(plan.block.requirements, i -> !core.items.has(i.item, Math.min(i.amount, 15)) && Mathf.round(i.amount * state.rules.buildCostMultiplier) > 0) && !plan.initialized);
     }
 
     void removeBuild(int x, int y, boolean breaking){
-        //remove matching request
+        //remove matching plan
         int idx = plans.indexOf(req -> req.breaking == breaking && req.x == x && req.y == y);
         if(idx != -1){
             plans.removeIndex(idx);
@@ -187,19 +260,19 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{
         plans.clear();
     }
 
-    /** Add another build requests to the tail of the queue, if it doesn't exist there yet. */
+    /** Add another build plans to the tail of the queue, if it doesn't exist there yet. */
     void addBuild(BuildPlan place){
         addBuild(place, true);
     }
 
-    /** Add another build requests to the queue, if it doesn't exist there yet. */
+    /** Add another build plans to the queue, if it doesn't exist there yet. */
     void addBuild(BuildPlan place, boolean tail){
         if(!canBuild()) return;
 
         BuildPlan replace = null;
-        for(BuildPlan request : plans){
-            if(request.x == place.x && request.y == place.y){
-                replace = request;
+        for(BuildPlan plan : plans){
+            if(plan.x == place.x && plan.y == place.y){
+                replace = plan;
                 break;
             }
         }
@@ -220,30 +293,31 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{
     boolean activelyBuilding(){
         //not actively building when not near the build plan
         if(isBuilding()){
-            if(!state.isEditor() && !within(buildPlan(), state.rules.infiniteResources ? Float.MAX_VALUE : buildingRange)){
+            var plan = buildPlan();
+            if(!state.isEditor() && plan != null && !within(plan, state.rules.infiniteResources ? Float.MAX_VALUE : type.buildRange)){
                 return false;
             }
         }
         return isBuilding() && updateBuilding;
     }
 
-    /** Return the build request currently active, or the one at the top of the queue.*/
-    @Nullable
-    BuildPlan buildPlan(){
+    /** @return  the build plan currently active, or the one at the top of the queue.*/
+    @Nullable BuildPlan buildPlan(){
         return plans.size == 0 ? null : plans.first();
     }
 
-    public void draw(){
+    public void drawBuilding(){
+        //TODO make this more generic so it works with builder "weapons"
         boolean active = activelyBuilding();
         if(!active && lastActive == null) return;
 
         Draw.z(Layer.flyingUnit);
 
         BuildPlan plan = active ? buildPlan() : lastActive;
-        Tile tile = world.tile(plan.x, plan.y);
+        Tile tile = plan.tile();
         var core = team.core();
 
-        if(tile == null || !within(plan, state.rules.infiniteResources ? Float.MAX_VALUE : buildingRange)){
+        if(tile == null || !within(plan, state.rules.infiniteResources ? Float.MAX_VALUE : type.buildRange)){
             return;
         }
 
@@ -251,33 +325,36 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{
         if(core != null && active && !isLocal() && !(tile.block() instanceof ConstructBlock)){
             Draw.z(Layer.plans - 1f);
             drawPlan(plan, 0.5f);
+            drawPlanTop(plan, 0.5f);
             Draw.z(Layer.flyingUnit);
         }
 
+        if(type.drawBuildBeam){
+            float focusLen = type.buildBeamOffset + Mathf.absin(Time.time, 3f, 0.6f);
+            float px = x + Angles.trnsx(rotation, focusLen);
+            float py = y + Angles.trnsy(rotation, focusLen);
+
+            drawBuildingBeam(px, py);
+        }
+    }
+
+    public void drawBuildingBeam(float px, float py){
+        boolean active = activelyBuilding();
+        if(!active && lastActive == null) return;
+
+        Draw.z(Layer.flyingUnit);
+
+        BuildPlan plan = active ? buildPlan() : lastActive;
+        Tile tile = world.tile(plan.x, plan.y);
+
+        if(tile == null || !within(plan, state.rules.infiniteResources ? Float.MAX_VALUE : type.buildRange)){
+            return;
+        }
+
         int size = plan.breaking ? active ? tile.block().size : lastSize : plan.block.size;
         float tx = plan.drawx(), ty = plan.drawy();
 
         Lines.stroke(1f, plan.breaking ? Pal.remove : Pal.accent);
-        float focusLen = type.buildBeamOffset + Mathf.absin(Time.time, 3f, 0.6f);
-        float px = x + Angles.trnsx(rotation, focusLen);
-        float py = y + Angles.trnsy(rotation, focusLen);
-
-        float sz = Vars.tilesize * size / 2f;
-        float ang = angleTo(tx, ty);
-
-        vecs[0].set(tx - sz, ty - sz);
-        vecs[1].set(tx + sz, ty - sz);
-        vecs[2].set(tx - sz, ty + sz);
-        vecs[3].set(tx + sz, ty + sz);
-
-        Arrays.sort(vecs, Structs.comparingFloat(vec -> -Angles.angleDist(angleTo(vec), ang)));
-
-        Vec2 close = Geometry.findClosest(x, y, vecs);
-
-        float x1 = vecs[0].x, y1 = vecs[0].y,
-        x2 = close.x, y2 = close.y,
-        x3 = vecs[1].x, y3 = vecs[1].y;
-
         Draw.z(Layer.buildBeam);
 
         Draw.alpha(buildAlpha);
@@ -286,17 +363,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{
             Fill.square(plan.drawx(), plan.drawy(), size * tilesize/2f);
         }
 
-        if(renderer.animateShields){
-            if(close != vecs[0] && close != vecs[1]){
-                Fill.tri(px, py, x1, y1, x2, y2);
-                Fill.tri(px, py, x3, y3, x2, y2);
-            }else{
-                Fill.tri(px, py, x1, y1, x3, y3);
-            }
-        }else{
-            Lines.line(px, py, x1, y1);
-            Lines.line(px, py, x3, y3);
-        }
+        Drawf.buildBeam(px, py, tx, ty, Vars.tilesize * size / 2f);
 
         Fill.square(px, py, 1.8f + Mathf.absin(Time.time, 2.2f, 1.1f), rotation + 45);
 
diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 1ac7394258..49ccaa2ee5 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -33,43 +33,71 @@ import mindustry.world.*;
 import mindustry.world.blocks.ConstructBlock.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.environment.*;
+import mindustry.world.blocks.heat.*;
+import mindustry.world.blocks.heat.HeatConductor.*;
+import mindustry.world.blocks.logic.LogicBlock.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 import mindustry.world.modules.*;
 
+import java.util.*;
+
 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, Senseable, Controllable{
+abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, QuadTreeObject, Displayable, Sized, Senseable, Controllable, Settable{
     //region vars and initialization
-    static final float timeToSleep = 60f * 1, timeToUncontrol = 60f * 6;
+    static final float timeToSleep = 60f * 1, recentDamageTime = 60f * 5f;
     static final ObjectSet<Building> tmpTiles = new ObjectSet<>();
-    static final Seq<Building> tempTileEnts = new Seq<>();
-    static final Seq<Tile> tempTiles = new Seq<>();
+    static final Seq<Building> tempBuilds = new Seq<>();
+    static final BuildTeamChangeEvent teamChangeEvent = new BuildTeamChangeEvent();
+    static final BuildDamageEvent bulletDamageEvent = new BuildDamageEvent();
     static int sleepingEntities = 0;
-    
+
     @Import float x, y, health, maxHealth;
     @Import Team team;
+    @Import boolean dead;
 
     transient Tile tile;
     transient Block block;
-    transient Seq<Building> proximity = new Seq<>(8);
-    transient boolean updateFlow;
-    transient byte cdump;
+    transient Seq<Building> proximity = new Seq<>(6);
+    transient int cdump;
     transient int rotation;
-    transient boolean enabled = true;
-    transient float enabledControlTime;
+    transient float payloadRotation;
     transient String lastAccessed;
+    transient boolean wasDamaged; //used only by the indexer
+    transient float visualLiquid;
 
-    PowerModule power;
-    ItemModule items;
-    LiquidModule liquids;
-    ConsumeModule cons;
+    /** TODO Each bit corresponds to a team ID. Only 64 are supported. Does not work on servers. */
+    transient long visibleFlags;
+    transient boolean wasVisible; //used only by the block renderer when fog is on (TODO replace with discovered check?)
 
+    transient boolean enabled = true;
+    transient @Nullable Building lastDisabler;
+
+    @Nullable PowerModule power;
+    @Nullable ItemModule items;
+    @Nullable LiquidModule liquids;
+
+    /** Base efficiency. Takes the minimum value of all consumers. */
+    transient float efficiency;
+    /** Same as efficiency, but for optional consumers only. */
+    transient float optionalEfficiency;
+    /** The efficiency this block *would* have if shouldConsume() returned true. */
+    transient float potentialEfficiency;
+    /** Whether there are any consumers (aside from power) that have efficiency > 0. */
+    transient boolean shouldConsumePower;
+
+    transient float healSuppressionTime = -1f;
+    transient float lastHealTime = -120f * 10f;
+    transient Color suppressColor = Pal.sapBullet;
+
+    private transient float lastDamageTime = -recentDamageTime;
     private transient float timeScale = 1f, timeScaleDuration;
+    private transient float dumpAccum;
 
     private transient @Nullable SoundLoop sound;
 
@@ -83,10 +111,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             create(tile.block(), team);
         }else{
             if(block.hasPower){
+                power.init = false;
                 //reinit power graph
                 new PowerGraph().add(self());
             }
         }
+        proximity.clear();
         this.rotation = rotation;
         this.tile = tile;
 
@@ -103,7 +133,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     /** Sets up all the necessary variables, but does not add this entity anywhere. */
     public Building create(Block block, Team team){
-        this.tile = emptyTile;
         this.block = block;
         this.team = team;
 
@@ -115,7 +144,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         maxHealth(block.health);
         timer(new Interval(block.timers));
 
-        cons = new ConsumeModule(self());
         if(block.hasItems) items = new ItemModule();
         if(block.hasLiquids) liquids = new LiquidModule();
         if(block.hasPower){
@@ -128,6 +156,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return self();
     }
 
+    @Override
+    public void add(){
+        if(power != null){
+            power.graph.checkAdd();
+        }
+    }
+
     @Override
     @Replace
     public int tileX(){
@@ -144,32 +179,77 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     //region io
 
     public final void writeBase(Writes write){
+        boolean writeVisibility = state.rules.fog && visibleFlags != 0;
+
         write.f(health);
         write.b(rotation | 0b10000000);
         write.b(team.id);
-        write.b(0); //extra padding for later use
+        write.b(writeVisibility ? 4 : 3); //version
+        write.b(enabled ? 1 : 0);
+        //write presence of items/power/liquids/cons, so removing/adding them does not corrupt future saves.
+        write.b(moduleBitmask());
         if(items != null) items.write(write);
         if(power != null) power.write(write);
         if(liquids != null) liquids.write(write);
-        if(cons != null) cons.write(write);
+
+        //efficiency is written as two bytes to save space
+        write.b((byte)(Mathf.clamp(efficiency) * 255f));
+        write.b((byte)(Mathf.clamp(optionalEfficiency) * 255f));
+
+        //only write visibility when necessary, saving 8 bytes - implies new version
+        if(writeVisibility){
+            write.l(visibleFlags);
+        }
     }
 
     public final void readBase(Reads read){
-        health = read.f();
+        //cap health by block health in case of nerfs
+        health = Math.min(read.f(), block.health);
         byte rot = read.b();
         team = Team.get(read.b());
 
         rotation = rot & 0b01111111;
+
+        int moduleBits = moduleBitmask();
         boolean legacy = true;
+        byte version = 0;
+
+        //new version
         if((rot & 0b10000000) != 0){
-            read.b(); //padding
+            version = read.b(); //version of entity save
+            if(version >= 1){
+                byte on = read.b();
+                this.enabled = on == 1;
+            }
+
+            //get which modules should actually be read; this was added in version 2
+            if(version >= 2){
+                moduleBits = read.b();
+            }
             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);
+        if((moduleBits & 1) != 0) (items == null ? new ItemModule() : items).read(read, legacy);
+        if((moduleBits & 2) != 0) (power == null ? new PowerModule() : power).read(read, legacy);
+        if((moduleBits & 4) != 0) (liquids == null ? new LiquidModule() : liquids).read(read, legacy);
+
+        //unnecessary consume module read in version 2 and below
+        if(version <= 2) read.bool();
+
+        //version 3 has efficiency numbers instead of bools
+        if(version >= 3){
+            efficiency = potentialEfficiency = read.ub() / 255f;
+            optionalEfficiency = read.ub() / 255f;
+        }
+
+        //version 4 (and only 4 at the moment) has visibility flags
+        if(version == 4){
+            visibleFlags = read.l();
+        }
+    }
+
+    public int moduleBitmask(){
+        return (items != null ? 1 : 0) | (power != null ? 2 : 0) | (liquids != null ? 4 : 0) | 8;
     }
 
     public void writeAll(Writes write){
@@ -182,6 +262,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         read(read, revision);
     }
 
+    public void writeSync(Writes write){
+        writeAll(write);
+    }
+
+    public void readSync(Reads read, byte revision){
+        readAll(read, revision);
+    }
+
     @CallSuper
     public void write(Writes write){
         //overriden by subclasses!
@@ -195,15 +283,40 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     //endregion
     //region utility methods
 
+    public boolean isDiscovered(Team viewer){
+        if(state.rules.limitMapArea && world.getDarkness(tile.x, tile.y) >= 3){
+            return false;
+        }
+
+        if(viewer == null || !state.rules.staticFog || !state.rules.fog){
+            return true;
+        }
+        if(block.size <= 2){
+            return fogControl.isDiscovered(viewer, tile.x, tile.y);
+        }else{
+            int s = block.size / 2;
+            return fogControl.isDiscovered(viewer, tile.x, tile.y) ||
+                fogControl.isDiscovered(viewer, tile.x - s, tile.y - s) ||
+                fogControl.isDiscovered(viewer, tile.x - s, tile.y + s) ||
+                fogControl.isDiscovered(viewer, tile.x + s, tile.y + s) ||
+                fogControl.isDiscovered(viewer, tile.x + s, tile.y - s);
+        }
+    }
+
     public void addPlan(boolean checkPrevious){
-        if(!block.rebuildable || (team == state.rules.defaultTeam && state.isCampaign() && !block.isVisible())) return;
+        addPlan(checkPrevious, false);
+    }
+
+    public void addPlan(boolean checkPrevious, boolean ignoreConditions){
+        if(!ignoreConditions && (!block.rebuildable || (team == state.rules.defaultTeam && state.isCampaign() && !block.isVisible()))) return;
 
         Object overrideConfig = null;
+        Block toAdd = this.block;
 
         if(self() instanceof ConstructBuild entity){
             //update block to reflect the fact that something was being constructed
-            if(entity.cblock != null && entity.cblock.synthetic() && entity.wasConstructing){
-                block = entity.cblock;
+            if(entity.current != null && entity.current.synthetic() && entity.wasConstructing){
+                toAdd = entity.current;
                 overrideConfig = entity.lastConfig;
             }else{
                 //otherwise this was a deconstruction that was interrupted, don't want to rebuild that
@@ -211,21 +324,34 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             }
         }
 
-        TeamData data = state.teams.get(team);
+        TeamData data = team.data();
 
         if(checkPrevious){
             //remove existing blocks that have been placed here.
             //painful O(n) iteration + copy
-            for(int i = 0; i < data.blocks.size; i++){
-                BlockPlan b = data.blocks.get(i);
+            for(int i = 0; i < data.plans.size; i++){
+                BlockPlan b = data.plans.get(i);
                 if(b.x == tile.x && b.y == tile.y){
-                    data.blocks.removeIndex(i);
+                    data.plans.removeIndex(i);
                     break;
                 }
             }
         }
 
-        data.blocks.addFirst(new BlockPlan(tile.x, tile.y, (short)rotation, block.id, overrideConfig == null ? config() : overrideConfig));
+        data.plans.addFirst(new BlockPlan(tile.x, tile.y, (short)rotation, toAdd, overrideConfig == null ? config() : overrideConfig));
+    }
+
+    public @Nullable Tile findClosestEdge(Position to, Boolf<Tile> solid){
+        Tile best = null;
+        float mindst = 0f;
+        for(var point : Edges.getEdges(block.size)){
+            Tile other = Vars.world.tile(tile.x + point.x, tile.y + point.y);
+            if(other != null && !solid.get(other) && (best == null || to.dst2(other) < mindst)){
+                best = other;
+                mindst = other.dst2(other);
+            }
+        }
+        return best;
     }
 
     /** Configure with the current, local player. */
@@ -242,8 +368,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     /** Deselect this tile from configuration. */
     public void deselect(){
-        if(!headless && control.input.frag.config.getSelectedTile() == self()){
-            control.input.frag.config.hideConfig();
+        if(!headless && control.input.config.getSelected() == self()){
+            control.input.config.hideConfig();
         }
     }
 
@@ -253,32 +379,127 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return true;
     }
 
+    public float calculateHeat(float[] sideHeat){
+        return calculateHeat(sideHeat, null);
+    }
+
+    public float calculateHeat(float[] sideHeat, @Nullable IntSet cameFrom){
+        Arrays.fill(sideHeat, 0f);
+        if(cameFrom != null) cameFrom.clear();
+
+        float heat = 0f;
+
+        for(var build : proximity){
+            if(build != null && build.team == team && build instanceof HeatBlock heater){
+
+
+                boolean split = build.block instanceof HeatConductor cond && cond.splitHeat;
+                // non-routers must face us, routers must face away - next to a redirector, they're forced to face away due to cycles anyway
+                if(!build.block.rotate || (!split && (relativeTo(build) + 2) % 4 == build.rotation) || (split && relativeTo(build) != build.rotation)){ //TODO hacky
+
+                    //if there's a cycle, ignore its heat
+                    if(!(build instanceof HeatConductorBuild hc && hc.cameFrom.contains(id()))){
+                        //x/y coordinate difference across point of contact
+                        float diff = (Math.min(Math.abs(build.x - x), Math.abs(build.y - y)) / tilesize);
+                        //number of points that this block had contact with
+                        int contactPoints = Math.min((int)(block.size/2f + build.block.size/2f - diff), Math.min(build.block.size, block.size));
+
+                        //heat is distributed across building size
+                        float add = heater.heat() / build.block.size * contactPoints;
+                        if(split){
+                            //heat routers split heat across 3 surfaces
+                            add /= 3f;
+                        }
+
+                        sideHeat[Mathf.mod(relativeTo(build), 4)] += add;
+                        heat += add;
+                    }
+
+                    //register traversed cycles
+                    if(cameFrom != null){
+                        cameFrom.add(build.id);
+                        if(build instanceof HeatConductorBuild hc){
+                            cameFrom.addAll(hc.cameFrom);
+                        }
+                    }
+
+                    //massive hack but I don't really care anymore
+                    if(heater instanceof HeatConductorBuild cond){
+                        cond.updateHeat();
+                    }
+                }
+            }
+        }
+        return heat;
+    }
+
     public void applyBoost(float intensity, float duration){
         //do not refresh time scale when getting a weaker intensity
-        if(intensity >= this.timeScale){
+        if(intensity >= this.timeScale - 0.001f){
             timeScaleDuration = Math.max(timeScaleDuration, duration);
         }
         timeScale = Math.max(timeScale, intensity);
     }
 
+    public void applySlowdown(float intensity, float duration){
+        //do not refresh time scale when getting a weaker intensity
+        if(intensity <= this.timeScale - 0.001f){
+            timeScaleDuration = Math.max(timeScaleDuration, duration);
+        }
+        timeScale = Math.min(timeScale, intensity);
+    }
+
+    public void applyHealSuppression(float amount){
+        applyHealSuppression(amount, Pal.sapBullet);
+    }
+    public void applyHealSuppression(float amount, Color suppressColor){
+        healSuppressionTime = Math.max(healSuppressionTime, Time.time + amount);
+        this.suppressColor = suppressColor;
+    }
+
+    public boolean isHealSuppressed(){
+        return block.suppressable && Time.time <= healSuppressionTime;
+    }
+
+    public void recentlyHealed(){
+        lastHealTime = Time.time;
+    }
+
+    public boolean wasRecentlyHealed(float duration){
+        return lastHealTime + duration >= Time.time;
+    }
+
+    public boolean wasRecentlyDamaged(){
+        return lastDamageTime + recentDamageTime >= Time.time;
+    }
+
     public Building nearby(int dx, int dy){
         return world.build(tile.x + dx, tile.y + dy);
     }
 
     public Building nearby(int rotation){
-        if(rotation == 0) return world.build(tile.x + 1, tile.y);
-        if(rotation == 1) return world.build(tile.x, tile.y + 1);
-        if(rotation == 2) return world.build(tile.x - 1, tile.y);
-        if(rotation == 3) return world.build(tile.x, tile.y - 1);
-        return null;
+        return switch(rotation){
+            case 0 -> world.build(tile.x + 1, tile.y);
+            case 1 -> world.build(tile.x, tile.y + 1);
+            case 2 -> world.build(tile.x - 1, tile.y);
+            case 3 -> world.build(tile.x, tile.y - 1);
+            default -> null;
+        };
     }
 
     public byte relativeTo(Tile tile){
         return relativeTo(tile.x, tile.y);
     }
 
-    public byte relativeTo(Building tile){
-        return relativeTo(tile.tile());
+    public byte relativeTo(Building build){
+        if(Math.abs(x - build.x) > Math.abs(y - build.y)){
+            if(x <= build.x - 1) return 0;
+            if(x >= build.x + 1) return 2;
+        }else{
+            if(y <= build.y - 1) return 1;
+            if(y >= build.y + 1) return 3;
+        }
+        return -1;
     }
 
     public byte relativeToEdge(Tile other){
@@ -313,6 +534,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return nearby(Geometry.d4(rotation + 3).x * trns, Geometry.d4(rotation + 3).y * trns);
     }
 
+    /** Any class that overrides this method and changes the value must call Vars.fogControl.forceUpdate(team). */
+    public float fogRadius(){
+        return block.fogRadius;
+    }
+
     public int pos(){
         return tile.pos();
     }
@@ -321,6 +547,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return rotation * 90;
     }
 
+    /** @return preferred rotation of main texture region to be drawn */
+    public float drawrot(){
+        return block.rotate && block.rotateDraw ? rotation * 90 : 0f;
+    }
+
     public Floor floor(){
         return tile.floor();
     }
@@ -333,33 +564,45 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return timeScale;
     }
 
-    public boolean consValid(){
-        return cons.valid();
+    /**
+     * @return the building's 'warmup', a smooth value from 0 to 1.
+     * usually used for crafters and things that need to spin up before reaching full efficiency.
+     * many blocks will just return 0.
+     * */
+    public float warmup(){
+        return 0f;
     }
 
-    public void consume(){
-        cons.trigger();
+    /** @return total time this block has been producing something; non-crafter blocks usually return Time.time. */
+    public float totalProgress(){
+        return Time.time;
     }
 
-    /** Scaled delta. */
-    public float delta(){
-        return Time.delta * timeScale;
+    public float progress(){
+        return 0f;
     }
 
-    /** Efficiency * delta. */
-    public float edelta(){
-        return efficiency() * delta();
-    }
-
-    /** 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;
+    /** @return whether this block is allowed to update based on team/environment */
+    public boolean allowUpdate(){
+        return team != Team.derelict && block.supportsEnv(state.rules.env) &&
+            //check if outside map limit
+            (!state.rules.limitMapArea || !state.rules.disableOutsideArea || Rect.contains(state.rules.limitX, state.rules.limitY, state.rules.limitWidth, state.rules.limitHeight, tile.x, tile.y));
     }
 
     public BlockStatus status(){
-        return cons.status();
+        if(!enabled){
+            return BlockStatus.logicDisable;
+        }
+
+        if(!shouldConsume()){
+            return BlockStatus.noOutput;
+        }
+
+        if(efficiency <= 0 || !productionValid()){
+            return BlockStatus.noInput;
+        }
+
+        return ((state.tick / 30f) % 1f) < efficiency ? BlockStatus.active : BlockStatus.noInput;
     }
 
     /** Call when nothing is happening to the entity. This increments the internal sleep timer. */
@@ -390,10 +633,63 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     //endregion
     //region handler methods
 
+    /** @return whether the player can select (but not actually control) this building. */
+    public boolean canControlSelect(Unit player){
+        return false;
+    }
+
+    /** Called when a player control-selects this building - not called for ControlBlock subclasses. */
+    public void onControlSelect(Unit player){
+
+    }
+
+    /** Called when this building receives a position command. Requires a commandable block. */
+    public void onCommand(Vec2 target){
+
+    }
+
+    /** @return the position that this block points to for commands, or null. */
+    public @Nullable Vec2 getCommandPosition(){
+        return null;
+    }
+
+    public void handleUnitPayload(Unit unit, Cons<Payload> grabber){
+        Fx.spawn.at(unit);
+
+        if(unit.isPlayer()){
+            unit.getPlayer().clearUnit();
+        }
+
+        unit.remove();
+
+        //needs new ID as it is now a payload
+        if(net.client()){
+            unit.id = EntityGroup.nextId();
+        }else{
+            //server-side, this needs to be delayed until next frame because otherwise the packets sent out right after this event would have the wrong unit ID, leading to ghosts
+            Core.app.post(() -> unit.id = EntityGroup.nextId());
+        }
+
+        grabber.get(new UnitPayload(unit));
+        Fx.unitDrop.at(unit);
+    }
+
+    public boolean canWithdraw(){
+        return true;
+    }
+
     public boolean canUnload(){
         return block.unloadable;
     }
 
+    public boolean canResupply(){
+        return block.allowResupply;
+    }
+
+    public boolean payloadCheck(int conveyorRotation){
+        return block.rotate && (rotation + 2) % 4 == conveyorRotation;
+    }
+
     /** Called when an unloader takes an item. */
     public void itemTaken(Item item){
 
@@ -411,6 +707,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     public void created(){}
 
+    /** @return whether this block is currently "active" and should be consuming requirements. */
     public boolean shouldConsume(){
         return enabled;
     }
@@ -419,6 +716,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return true;
     }
 
+    /** @return whether this building is currently "burning" a trigger consumer (an item) - if true, valid() on those will return true. */
+    public boolean consumeTriggerValid(){
+        return false;
+    }
+
     public float getPowerProduction(){
         return 0f;
     }
@@ -456,10 +758,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     }
 
-    public void onProximityUpdate(){
-        noSleep();
-    }
-
     public boolean acceptPayload(Building source, Payload payload){
         return false;
     }
@@ -499,7 +797,7 @@ 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(self(), todump)){
+            if(other.acceptPayload(self(), todump)){
                 other.handlePayload(self(), todump);
                 incrementDump(proximity.size);
                 return true;
@@ -516,18 +814,28 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public boolean acceptItem(Building source, Item item){
-        return block.consumes.itemFilters.get(item.id) && items.get(item) < getMaximumAccepted(item);
+        return block.consumesItem(item) && items.get(item) < getMaximumAccepted(item);
     }
 
     public boolean acceptLiquid(Building source, Liquid liquid){
-        return block.hasLiquids && block.consumes.liquidfilters.get(liquid.id);
+        return block.hasLiquids && block.consumesLiquid(liquid);
     }
 
     public void handleLiquid(Building source, Liquid liquid, float amount){
         liquids.add(liquid, amount);
     }
 
+    //TODO entire liquid system is awful
     public void dumpLiquid(Liquid liquid){
+        dumpLiquid(liquid, 2f);
+    }
+
+    public void dumpLiquid(Liquid liquid, float scaling){
+        dumpLiquid(liquid, scaling, -1);
+    }
+
+    /** @param outputDir output liquid direction relative to rotation, or -1 to use any direction. */
+    public void dumpLiquid(Liquid liquid, float scaling, int outputDir){
         int dump = this.cdump;
 
         if(liquids.get(liquid) <= 0.0001f) return;
@@ -536,17 +844,19 @@ 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(outputDir != -1 && (outputDir + rotation) % 4 != relativeTo(other)) continue;
+
             other = other.getLiquidDestination(self(), liquid);
 
-            if(other != null && other.team == team && other.block.hasLiquids && canDumpLiquid(other, liquid) && other.liquids != null){
+            if(other != null && other.block.hasLiquids && canDumpLiquid(other, liquid) && other.liquids != null){
                 float ofract = other.liquids.get(liquid) / other.block.liquidCapacity;
                 float fract = liquids.get(liquid) / block.liquidCapacity;
 
-                if(ofract < fract) transferLiquid(other, (fract - ofract) * block.liquidCapacity / 2f, liquid);
+                if(ofract < fract) transferLiquid(other, (fract - ofract) * block.liquidCapacity / scaling, liquid);
             }
         }
-
     }
 
     public boolean canDumpLiquid(Building to, Liquid liquid){
@@ -571,7 +881,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             return moveLiquid(next.build, liquid);
         }else if(leaks && !next.block().solid && !next.block().hasLiquids){
             float leakAmount = liquids.get(liquid) / 1.5f;
-            Puddles.deposit(next, tile, liquid, leakAmount);
+            Puddles.deposit(next, tile, liquid, leakAmount, true, true);
             liquids.remove(liquid, leakAmount);
         }
         return 0;
@@ -592,21 +902,26 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
                 next.handleLiquid(self(), liquid, flow);
                 liquids.remove(liquid, flow);
                 return flow;
-            }else if(next.liquids.currentAmount() / next.block.liquidCapacity > 0.1f && fract > 0.1f){
+                //handle reactions between different liquid types â–¼
+            }else if(!next.block.consumesLiquid(liquid) && next.liquids.currentAmount() / next.block.liquidCapacity > 0.1f && fract > 0.1f){
+                //TODO !IMPORTANT! uses current(), which is 1) wrong for multi-liquid blocks and 2) causes unwanted reactions, e.g. hydrogen + slag in pump
                 //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);
+                if(other.blockReactive && liquid.blockReactive){
+                    //TODO liquid reaction handler for extensibility
+                    if((other.flammability > 0.3f && liquid.temperature > 0.7f) || (liquid.flammability > 0.3f && other.temperature > 0.7f)){
+                        damageContinuous(1);
+                        next.damageContinuous(1);
+                        if(Mathf.chanceDelta(0.1)){
+                            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.chanceDelta(0.2f)){
+                            Fx.steam.at(fx, fy);
+                        }
                     }
                 }
             }
@@ -627,6 +942,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return null;
     }
 
+    public @Nullable PayloadSeq getPayloads(){
+        return null;
+    }
+
     /**
      * Tries to put this item into a nearby container, if there are no available
      * containers, it gets added to the block's inventory.
@@ -634,12 +953,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void offload(Item item){
         produced(item, 1);
         int dump = this.cdump;
-        if(!net.client() && state.isCampaign() && team == state.rules.defaultTeam) item.unlock();
 
         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(self(), item) && canDump(other, item)){
+            if(other.acceptItem(self(), item) && canDump(other, item)){
                 other.handleItem(self(), item);
                 return;
             }
@@ -657,7 +975,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);
-            if(other.team == team && other.acceptItem(self(), item) && canDump(other, item)){
+            if(other.acceptItem(self(), item) && canDump(other, item)){
                 other.handleItem(self(), item);
                 return true;
             }
@@ -671,57 +989,84 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public void produced(Item item, int amount){
-        if(Vars.state.rules.sector != null && team == state.rules.defaultTeam) Vars.state.rules.sector.info.handleProduction(item, amount);
+        if(Vars.state.rules.sector != null && team == state.rules.defaultTeam){
+            Vars.state.rules.sector.info.handleProduction(item, amount);
+
+            if(!net.client()) item.unlock();
+        }
     }
 
-    /** Try dumping any item near the  */
+    /** Dumps any item with an accumulator. May dump multiple times per frame. Use with care. */
+    public boolean dumpAccumulate(){
+        return dumpAccumulate(null);
+    }
+
+    /** Dumps any item with an accumulator. May dump multiple times per frame. Use with care. */
+    public boolean dumpAccumulate(Item item){
+        boolean res = false;
+        dumpAccum += delta();
+        while(dumpAccum >= 1f){
+            res |= dump(item);
+            dumpAccum -=1f;
+        }
+        return res;
+    }
+
+    /** Try dumping any item near the building. */
     public boolean dump(){
         return dump(null);
     }
 
     /**
-     * Try dumping a specific item near the 
+     * Try dumping a specific item near the building.
      * @param todump Item to dump. Can be null to dump anything.
      */
     public boolean dump(Item todump){
-        if(!block.hasItems || items.total() == 0 || (todump != null && !items.has(todump))) return false;
+        if(!block.hasItems || items.total() == 0 || proximity.size == 0 || (todump != null && !items.has(todump))) return false;
 
         int dump = this.cdump;
+        var allItems = content.items();
+        int itemSize = allItems.size;
+        Object[] itemArray = allItems.items;
 
-        if(proximity.size == 0) return false;
+        if(todump == null){
+            for(int i = 0; i < proximity.size; i++){
+                Building other = proximity.get((i + dump) % proximity.size);
 
-        for(int i = 0; i < proximity.size; i++){
-            Building other = proximity.get((i + dump) % proximity.size);
+                for(int ii = 0; ii < itemSize; ii++){
+                    if(!items.has(ii)) continue;
+                    Item item = (Item)itemArray[ii];
 
-            if(todump == null){
-
-                for(int ii = 0; ii < content.items().size; ii++){
-                    Item item = content.item(ii);
-
-                    if(other.team == team && items.has(item) && other.acceptItem(self(), item) && canDump(other, item)){
+                    if(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(self(), todump) && canDump(other, todump)){
+
+                incrementDump(proximity.size);
+            }
+        }else{
+            for(int i = 0; i < proximity.size; i++){
+                Building other = proximity.get((i + dump) % proximity.size);
+
+                if(other.acceptItem(self(), todump) && canDump(other, todump)){
                     other.handleItem(self(), todump);
                     items.remove(todump, 1);
                     incrementDump(proximity.size);
                     return true;
                 }
-            }
 
-            incrementDump(proximity.size);
+                incrementDump(proximity.size);
+            }
         }
 
         return false;
     }
 
     public void incrementDump(int prox){
-        cdump = (byte)((cdump + 1) % prox);
+        cdump = ((cdump + 1) % prox);
     }
 
     /** Used for dumping items. */
@@ -739,19 +1084,27 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return false;
     }
 
+    /** Called shortly before this building is removed. */
     public void onProximityRemoved(){
         if(power != null){
             powerGraphRemoved();
         }
     }
 
+    /** Called after this building is created in the world. May be called multiple times, or when adjacent buildings change. */
     public void onProximityAdded(){
-        if(block.hasPower) updatePowerGraph();
+        if(power != null){
+            updatePowerGraph();
+        }
+    }
+
+    /** Called when anything adjacent to this building is placed/removed, including itself. */
+    public void onProximityUpdate(){
+        noSleep();
     }
 
     public void updatePowerGraph(){
-
-        for(Building other : getPowerConnections(tempTileEnts)){
+        for(Building other : getPowerConnections(tempBuilds)){
             if(other.power != null){
                 other.power.graph.addGraph(power.graph);
             }
@@ -771,21 +1124,26 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         power.links.clear();
     }
 
+    public boolean conductsTo(Building other){
+        return !block.insulated;
+    }
+
     public Seq<Building> getPowerConnections(Seq<Building> out){
         out.clear();
         if(power == null) return out;
 
         for(Building other : proximity){
             if(other != null && other.power != null
-            && !(block.consumesPower && other.block.consumesPower && !block.outputsPower && !other.block.outputsPower)
-            && !power.links.contains(other.pos())){
+            && other.team == team
+            && !(block.consumesPower && other.block.consumesPower && !block.outputsPower && !other.block.outputsPower && !block.conductivePower && !other.block.conductivePower)
+            && conductsTo(other) && other.conductsTo(self()) && !power.links.contains(other.pos())){
                 out.add(other);
             }
         }
 
         for(int i = 0; i < power.links.size; i++){
             Tile link = world.tile(power.links.get(i));
-            if(link != null && link.build != null && link.build.power != null) out.add(link.build);
+            if(link != null && link.build != null && link.build.power != null && link.build.team == team) out.add(link.build);
         }
         return out;
     }
@@ -803,36 +1161,44 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return false;
     }
 
+    /** @return volume cale of active sound. */
+    public float activeSoundVolume(){
+        return 1f;
+    }
+
     /** @return whether this block should play its idle sound.*/
     public boolean shouldAmbientSound(){
         return shouldConsume();
     }
 
     public void drawStatus(){
-        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);
+        if(block.enableDrawStatus && block.consumers.length > 0){
+            float multiplier = block.size > 1 ? 1 : 0.64f;
+            float brcx = x + (block.size * tilesize / 2f) - (tilesize * multiplier / 2f);
+            float brcy = y - (block.size * tilesize / 2f) + (tilesize * multiplier / 2f);
 
             Draw.z(Layer.power + 1);
             Draw.color(Pal.gray);
-            Fill.square(brcx, brcy, 2.5f, 45);
+            Fill.square(brcx, brcy, 2.5f * multiplier, 45);
             Draw.color(status().color);
-            Fill.square(brcx, brcy, 1.5f, 45);
+            Fill.square(brcx, brcy, 1.5f * multiplier, 45);
             Draw.color();
         }
     }
 
     public void drawCracks(){
-        if(!damaged() || block.size > BlockRenderer.maxCrackSize) return;
+        if(!block.drawCracks || !damaged() || block.size > BlockRenderer.maxCrackSize) return;
         int id = pos();
         TextureRegion region = renderer.blocks.cracks[block.size - 1][Mathf.clamp((int)((1f - healthf()) * BlockRenderer.crackRegions), 0, BlockRenderer.crackRegions-1)];
         Draw.colorl(0.2f, 0.1f + (1f - healthf())* 0.6f);
+        //TODO could be random, flipped, pseudorandom, etc
         Draw.rect(region, x, y, (id%4)*90);
         Draw.color();
     }
 
     /** Draw the block overlay that is shown when a cursor is over the block. */
     public void drawSelect(){
+        block.drawOverlay(x, y, rotation);
     }
 
     public void drawDisabled(){
@@ -846,11 +1212,20 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public void draw(){
-        Draw.rect(block.region, x, y, block.rotate ? rotdeg() : 0);
+        if(block.variants == 0 || block.variantRegions == null){
+            Draw.rect(block.region, x, y, drawrot());
+        }else{
+            Draw.rect(block.variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, block.variantRegions.length - 1))], x, y, drawrot());
+        }
 
         drawTeamTop();
     }
 
+    public void payloadDraw(){
+        if(block.isAir()) return;
+        draw();
+    }
+
     public void drawTeamTop(){
         if(block.teamRegion.found()){
             if(block.teamRegions[team.id] == block.teamRegion) Draw.color(team.color);
@@ -860,8 +1235,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public void drawLight(){
-        if(block.hasLiquids && block.drawLiquidLight && liquids.current().lightColor.a > 0.001f){
-            drawLiquidLight(liquids.current(), liquids.smoothAmount());
+        Liquid liq = block.hasLiquids && block.lightLiquid == null ? liquids.current() : block.lightLiquid;
+        if(block.hasLiquids && block.drawLiquidLight && liq.lightColor.a > 0.001f){
+            //yes, I am updating in draw()... but this is purely visual anyway, better have it here than in update() where it wastes time
+            visualLiquid = Mathf.lerpDelta(visualLiquid, liquids.get(liq)>= 0.01f ? 1f : 0f, 0.06f);
+            drawLiquidLight(liq, visualLiquid);
         }
     }
 
@@ -871,7 +1249,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             float fract = 1f;
             float opacity = color.a * fract;
             if(opacity > 0.001f){
-                Drawf.light(team, x, y, block.size * 30f * fract, color, opacity);
+                Drawf.light(x, y, block.size * 30f * fract, color, opacity * amount);
             }
         }
     }
@@ -882,6 +1260,19 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         Draw.color();
     }
 
+    /** @return whether a building has regen/healing suppressed; if so, spawns particles on it. */
+    public boolean checkSuppression(){
+        if(isHealSuppressed()){
+            if(Mathf.chanceDelta(0.03)){
+                Fx.regenSuppressParticle.at(x + Mathf.range(block.size * tilesize/2f - 1f), y + Mathf.range(block.size * tilesize/2f - 1f), suppressColor);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
     /** Called after the block is placed by this client. */
     @CallSuper
     public void playerPlaced(Object config){
@@ -893,27 +1284,20 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void placed(){
         if(net.client()) return;
 
-        if(block.consumesPower || block.outputsPower){
-            int range = 10;
-            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, 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);
+        if((block.consumesPower || block.outputsPower) && block.hasPower && block.connectedPower){
+            PowerNode.getNodeLinks(tile, block, team, other -> {
+                if(!other.power.links.contains(pos())){
+                    other.configureAny(pos());
                 }
             });
-            tempTiles.sort(Structs.comparingFloat(t -> t.dst2(tile)));
-            if(!tempTiles.isEmpty()){
-                Tile toLink = tempTiles.first();
-                if(!toLink.build.power.links.contains(pos())){
-                    toLink.build.configureAny(pos());
-                }
-            }
         }
     }
 
+    /** @return whether this building is in a payload */
+    public boolean isPayload(){
+        return tile == emptyTile;
+    }
+
     /**
      * 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. */
@@ -935,47 +1319,87 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     /** Called when arbitrary configuration is applied to a tile. */
     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().getSimpleName().startsWith("adapter") ? value.getClass().getSuperclass() : value.getClass();
+        Class<?> type = value == null ? void.class : value.getClass().isAnonymousClass() ? value.getClass().getSuperclass() : value.getClass();
 
         if(value instanceof Item) type = Item.class;
         if(value instanceof Block) type = Block.class;
         if(value instanceof Liquid) type = Liquid.class;
-        
+        if(value instanceof UnitType) type = UnitType.class;
+
         if(builder != null && builder.isPlayer()){
-            lastAccessed = builder.getPlayer().name;
+            updateLastAccess(builder.getPlayer());
         }
 
         if(block.configurations.containsKey(type)){
             block.configurations.get(type).get(this, value);
+        }else if(value instanceof Building build){
+            //copy config of another building
+            var conf = build.config();
+            if(conf != null && !(conf instanceof Building)){
+                configured(builder, conf);
+            }
         }
     }
 
+    public void updateLastAccess(Player player){
+        lastAccessed = player.coloredName();
+    }
+
     /** Called when the block is tapped by the local player. */
     public void tapped(){
 
     }
 
-    /** Called when the block is destroyed. */
+    /** Called *after* the tile has been removed. */
+    public void afterDestroyed(){
+        if(block.destroyBullet != null){
+            //I really do not like that the bullet will not destroy derelict
+            //but I can't do anything about it without using a random team
+            //which may or may not cause issues with servers and js
+            block.destroyBullet.create(this, block.destroyBulletSameTeam ? team : Team.derelict, x, y, Mathf.randomSeed(id(), 360f));
+        }
+    }
+
+    /** @return the cap for item amount calculations, used when this block explodes. */
+    public int explosionItemCap(){
+        return block.itemCapacity;
+    }
+
+    /** Called when a block begins (not finishes!) deconstruction. The building is still present at this point. */
+    public void onDeconstructed(@Nullable Unit builder){
+        //deposit non-incinerable liquid on ground
+        if(liquids != null && liquids.currentAmount() > 0 && (!liquids.current().incinerable || block.deconstructDropAllLiquid)){
+            float perCell = liquids.currentAmount() / (block.size * block.size) * 2f;
+            tile.getLinkedTiles(other -> Puddles.deposit(other, liquids.current(), perCell));
+        }
+    }
+
+    /** Called when the block is destroyed. The tile is still intact at this stage. */
     public void onDestroyed(){
+        if(sound != null){
+            sound.stop();
+        }
+
         float explosiveness = block.baseExplosiveness;
         float flammability = 0f;
         float power = 0f;
 
         if(block.hasItems){
             for(Item item : content.items()){
-                int amount = items.get(item);
+                int amount = Math.min(items.get(item), explosionItemCap());
                 explosiveness += item.explosiveness * amount;
                 flammability += item.flammability * amount;
+                power += item.charge * Mathf.pow(amount, 1.1f) * 150f;
             }
         }
 
         if(block.hasLiquids){
-            flammability += liquids.sum((liquid, amount) -> liquid.explosiveness * amount / 2f);
-            explosiveness += liquids.sum((liquid, amount) -> liquid.flammability * amount / 2f);
+            flammability += liquids.sum((liquid, amount) -> liquid.flammability * amount / 2f);
+            explosiveness += liquids.sum((liquid, amount) -> liquid.explosiveness * amount / 2f);
         }
 
-        if(block.consumes.hasPower() && block.consumes.getPower().buffered){
-            power += this.power.status * block.consumes.getPower().capacity;
+        if(block.consPower != null && block.consPower.buffered){
+            power += this.power.status * block.consPower.capacity;
         }
 
         if(block.hasLiquids && state.rules.damageExplosions){
@@ -985,7 +1409,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
                 for(int i = 0; i < Mathf.clamp(amount / 5, 0, 30); i++){
                     Time.run(i / 2f, () -> {
-                        Tile other = world.tile(tileX() + Mathf.range(block.size / 2), tileY() + Mathf.range(block.size / 2));
+                        Tile other = world.tileWorld(x + Mathf.range(block.size * tilesize / 2), y + Mathf.range(block.size * tilesize / 2));
                         if(other != null){
                             Puddles.deposit(other, liquid, splash);
                         }
@@ -994,21 +1418,29 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             });
         }
 
-        Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, state.rules.damageExplosions);
+        //cap explosiveness so fluid tanks/vaults don't instakill units
+        Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, state.rules.damageExplosions, block.destroyEffect);
 
-        if(!floor().solid && !floor().isLiquid){
+        if(block.createRubble && !floor().solid && !floor().isLiquid){
             Effect.rubble(x, y, block.size);
         }
     }
 
     public String getDisplayName(){
-        return block.localizedName;
+        //derelict team icon currently doesn't display
+        return team == Team.derelict ?
+            block.localizedName + "\n" + Core.bundle.get("block.derelict") :
+            block.localizedName + (team == player.team() || team.emoji.isEmpty() ? "" : " " + team.emoji);
     }
 
     public TextureRegion getDisplayIcon(){
-        return block.icon(Cicon.medium);
+        return block.uiIcon;
     }
 
+    /** @return the item module to use for flow rate calculations */
+    public ItemModule flowItems(){
+        return items;
+    }
     @Override
     public void display(Table table){
         //display the block stuff
@@ -1031,12 +1463,14 @@ 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") && block.displayFlow;
+            boolean displayFlow = (block.category == Category.distribution || block.category == Category.liquid) && block.displayFlow;
 
             if(displayFlow){
                 String ps = " " + StatUnit.perSecond.localized();
 
-                if(items != null){
+                var flowItems = flowItems();
+
+                if(flowItems != null){
                     table.row();
                     table.left();
                     table.table(l -> {
@@ -1046,9 +1480,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
                             l.clearChildren();
                             l.left();
                             for(Item item : content.items()){
-                                if(items.hasFlowItem(item)){
-                                    l.image(item.icon(Cicon.small)).padRight(3f);
-                                    l.label(() -> items.getFlowRate(item) < 0 ? "..." : Strings.fixed(items.getFlowRate(item), 1) + ps).color(Color.lightGray);
+                                if(flowItems.hasFlowItem(item)){
+                                    l.image(item.uiIcon).scaling(Scaling.fit).padRight(3f);
+                                    l.label(() -> flowItems.getFlowRate(item) < 0 ? "..." : Strings.fixed(flowItems.getFlowRate(item), 1) + ps).color(Color.lightGray);
                                     l.row();
                                 }
                             }
@@ -1057,7 +1491,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
                         rebuild.run();
                         l.update(() -> {
                             for(Item item : content.items()){
-                                if(items.hasFlowItem(item) && !current.get(item.id)){
+                                if(flowItems.hasFlowItem(item) && !current.get(item.id)){
                                     current.set(item.id);
                                     rebuild.run();
                                 }
@@ -1068,21 +1502,30 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
                 if(liquids != null){
                     table.row();
+                    table.left();
                     table.table(l -> {
-                        boolean[] had = {false};
+                        Bits current = new Bits();
 
                         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);
+                            for(var liquid : content.liquids()){
+                                if(liquids.hasFlowLiquid(liquid)){
+                                    l.image(liquid.uiIcon).scaling(Scaling.fit).size(32f).padRight(3f);
+                                    l.label(() -> liquids.getFlowRate(liquid) < 0 ? "..." : Strings.fixed(liquids.getFlowRate(liquid), 1) + ps).color(Color.lightGray);
+                                    l.row();
+                                }
+                            }
                         };
 
+                        rebuild.run();
                         l.update(() -> {
-                           if(!had[0] && liquids.hadFlow()){
-                               had[0] = true;
-                               rebuild.run();
-                           }
+                            for(var liquid : content.liquids()){
+                                if(liquids.hasFlowLiquid(liquid) && !current.get(liquid.id)){
+                                    current.set(liquid.id);
+                                    rebuild.run();
+                                }
+                            }
                         });
                     }).left();
                 }
@@ -1099,21 +1542,18 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     public void displayConsumption(Table table){
         table.left();
-        for(Consume cons : block.consumes.all()){
-            if(cons.isOptional() && cons.isBoost()) continue;
+        for(Consume cons : block.consumers){
+            if(cons.optional && cons.booster) continue;
             cons.build(self(), table);
         }
     }
 
     public void displayBars(Table table){
-        for(Func<Building, Bar> bar : block.bars.list()){
-            //TODO fix conclusively
-            try{
-                table.add(bar.get(self())).growX();
-                table.row();
-            }catch(ClassCastException e){
-                break;
-            }
+        for(Func<Building, Bar> bar : block.listBars()){
+            var result = bar.get(self());
+            if(result == null) continue;
+            table.add(result).growX();
+            table.row();
         }
     }
 
@@ -1128,19 +1568,41 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         table.setPosition(pos.x, pos.y, Align.top);
     }
 
-    /** Returns whether or not a hand cursor should be shown over this block. */
+    /** Returns whether a hand cursor should be shown over this block. */
     public Cursor getCursor(){
-        return block.configurable && team == player.team() ? SystemCursor.hand : SystemCursor.arrow;
+        return block.configurable && interactable(player.team()) ? SystemCursor.hand : SystemCursor.arrow;
     }
 
     /**
-     * Called when another tile is tapped while this block is selected.
-     * @return whether or not this block should be deselected.
+     * Called when another tile is tapped while this building is selected.
+     * @return whether this block should be deselected.
      */
-    public boolean onConfigureTileTapped(Building other){
+    public boolean onConfigureBuildTapped(Building other){
+        if(block.clearOnDoubleTap){
+            if(self() == other){
+                deselect();
+                configure(null);
+                return false;
+            }
+            return true;
+        }
         return self() != other;
     }
 
+    /**
+     * Called when a position is tapped while this building is selected.
+     *
+     * @return whether the tap event is consumed - if true, the player will not start shooting or interact with things under the cursor.
+     * */
+    public boolean onConfigureTapped(float x, float y){
+        return false;
+    }
+
+    /**
+     * Called when this block's config menu is closed.
+     */
+    public void onConfigureClosed(){}
+
     /** Returns whether this config menu should show when the specified player taps it. */
     public boolean shouldShowConfigure(Player player){
         return true;
@@ -1166,6 +1628,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return amount;
     }
 
+    public boolean absorbLasers(){
+        return block.absorbLasers;
+    }
+
+    public boolean isInsulated(){
+        return block.insulated;
+    }
+
     public boolean collide(Bullet other){
         return true;
     }
@@ -1173,19 +1643,72 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     /** Handle a bullet collision.
      * @return whether the bullet should be removed. */
     public boolean collision(Bullet other){
-        damage(other.damage() * other.type().buildingDamageMultiplier);
+        boolean wasDead = health <= 0;
+
+        float damage = other.type.buildingDamage(other);
+        if(!other.type.pierceArmor){
+            damage = Damage.applyArmor(damage, block.armor);
+        }
+
+        damage(other.team, damage);
+        Events.fire(bulletDamageEvent.set(self(), other));
+
+        if(health <= 0 && !wasDead){
+            Events.fire(new BuildingBulletDestroyEvent(self(), other));
+        }
 
         return true;
     }
 
+    /** Used to handle damage from splash damage for certain types of blocks. */
+    public void damage(@Nullable Team source, float damage){
+        damage(damage);
+    }
+
+    /** Handles splash damage with a bullet source. */
+    public void damage(Bullet bullet, Team source, float damage){
+        damage(source, damage);
+        Events.fire(bulletDamageEvent.set(self(), bullet));
+    }
+
+    /** Changes this building's team in a safe manner. */
+    public void changeTeam(Team next){
+        if(this.team == next) return;
+
+        Team last = this.team;
+        boolean was = isValid();
+
+        if(was) indexer.removeIndex(tile);
+
+        this.team = next;
+
+        if(was){
+            indexer.addIndex(tile);
+            Events.fire(teamChangeEvent.set(last, self()));
+        }
+    }
+
     public boolean canPickup(){
         return true;
     }
 
+    /** Called right before this building is picked up. */
     public void pickedUp(){
 
     }
 
+    /** Called right after this building is picked up. */
+    public void afterPickedUp(){
+        if(power != null){
+            //TODO can lead to ghost graphs?
+            power.graph = new PowerGraph();
+            power.links.clear();
+            if(block.consPower != null && !block.consPower.buffered){
+                power.status = 0f;
+            }
+        }
+    }
+
     public void removeFromProximity(){
         onProximityRemoved();
         tmpTiles.clear();
@@ -1203,22 +1726,20 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             other.proximity.remove(self(), true);
             other.onProximityUpdate();
         }
+        proximity.clear();
     }
 
     public void updateProximity(){
         tmpTiles.clear();
         proximity.clear();
-        
+
         Point2[] nearby = Edges.getEdges(block.size);
         for(Point2 point : nearby){
             Building other = world.build(tile.x + point.x, tile.y + point.y);
 
-            if(other == null || !(other.tile.interactable(team))) continue;
+            if(other == null || other.team != team) continue;
 
-            //add this tile to proximity of nearby tiles
-            if(!other.proximity.contains(self(), true)){
-                other.proximity.add(self());
-            }
+            other.proximity.addUnique(self());
 
             tmpTiles.add(other);
         }
@@ -1236,13 +1757,112 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
     }
 
+    public void consume(){
+        for(Consume cons : block.consumers){
+            cons.trigger(self());
+        }
+    }
+
+    public boolean canConsume(){
+        return potentialEfficiency > 0;
+    }
+
+    /** Scaled delta. */
+    public float delta(){
+        return Time.delta * timeScale;
+    }
+
+    /** Efficiency * delta. */
+    public float edelta(){
+        return efficiency * delta();
+    }
+
+    /** Called after efficiency is updated but before consumers are updated. Use to apply your own multiplier. */
+    public void updateEfficiencyMultiplier(){
+        float scale = efficiencyScale();
+        efficiency *= scale;
+        optionalEfficiency *= scale;
+    }
+
+    /** Calculate your own efficiency multiplier. By default, this is applied in updateEfficiencyMultiplier. */
+    public float efficiencyScale(){
+        return 1f;
+    }
+
+    public void updateConsumption(){
+        //everything is valid when cheating
+        if(!block.hasConsumers || cheating()){
+            potentialEfficiency = enabled && productionValid() ? 1f : 0f;
+            efficiency = optionalEfficiency = shouldConsume() ? potentialEfficiency : 0f;
+            shouldConsumePower = true;
+            updateEfficiencyMultiplier();
+            return;
+        }
+
+        //disabled -> nothing works
+        if(!enabled){
+            potentialEfficiency = efficiency = optionalEfficiency = 0f;
+            shouldConsumePower = false;
+            return;
+        }
+
+        boolean update = shouldConsume() && productionValid();
+
+        float minEfficiency = 1f;
+
+        //assume efficiency is 1 for the calculations below
+        efficiency = optionalEfficiency = 1f;
+        shouldConsumePower = true;
+
+        //first pass: get the minimum efficiency of any consumer
+        for(var cons : block.nonOptionalConsumers){
+            float result = cons.efficiency(self());
+
+            if(cons != block.consPower && result <= 0.0000001f){
+                shouldConsumePower = false;
+            }
+
+            minEfficiency = Math.min(minEfficiency, result);
+        }
+
+        //same for optionals
+        for(var cons : block.optionalConsumers){
+            optionalEfficiency = Math.min(optionalEfficiency, cons.efficiency(self()));
+        }
+
+        //efficiency is now this minimum value
+        efficiency = minEfficiency;
+        optionalEfficiency = Math.min(optionalEfficiency, minEfficiency);
+
+        //assign "potential"
+        potentialEfficiency = efficiency;
+
+        //no updating means zero efficiency
+        if(!update){
+            efficiency = optionalEfficiency = 0f;
+        }
+
+        updateEfficiencyMultiplier();
+
+        //second pass: update every consumer based on efficiency
+        if(update && efficiency > 0){
+            for(var cons : block.updateConsumers){
+                cons.update(self());
+            }
+        }
+    }
+
+    public void updatePayload(@Nullable Unit unitHolder, @Nullable Building buildingHolder){
+        update();
+    }
+
     public void updateTile(){
 
     }
 
     /** @return ambient sound volume scale. */
     public float ambientVolume(){
-        return efficiency();
+        return efficiency;
     }
 
     //endregion
@@ -1260,10 +1880,27 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return tile.build == self() && !dead();
     }
 
+    @MethodPriority(100)
+    @Override
+    public void heal(){
+        healthChanged();
+    }
+
+    @MethodPriority(100)
+    @Override
+    public void heal(float amount){
+        healthChanged();
+    }
+
+    @Override
+    public float hitSize(){
+        return tile.block().size * tilesize;
+    }
+
     @Replace
     @Override
     public void kill(){
-        Call.tileDestroyed(self());
+        Call.buildDestroyed(self());
     }
 
     @Replace
@@ -1271,43 +1908,68 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void damage(float damage){
         if(dead()) return;
 
-        if(Mathf.zero(state.rules.blockHealthMultiplier)){
+        float dm = state.rules.blockHealth(team);
+        lastDamageTime = Time.time;
+
+        if(Mathf.zero(dm)){
             damage = health + 1;
         }else{
-            damage /= state.rules.blockHealthMultiplier;
+            damage /= dm;
         }
 
-        Call.tileDamage(self(), health - handleDamage(damage));
+        //TODO handle this better on the client.
+        if(!net.client()){
+            health -= handleDamage(damage);
+        }
+
+        healthChanged();
 
         if(health <= 0){
-            Call.tileDestroyed(self());
+            Call.buildDestroyed(self());
         }
     }
 
+    public void healthChanged(){
+        //server-side, health updates are batched.
+        if(net.server()){
+            netServer.buildHealthUpdate(self());
+        }
+
+        indexer.notifyHealthChanged(self());
+    }
+
     @Override
     public double sense(LAccess sensor){
         return switch(sensor){
             case x -> World.conv(x);
             case y -> World.conv(y);
+            case color -> Color.toDoubleBits(team.color.r, team.color.g, team.color.b, 1f);
+            case dead -> !isValid() ? 1 : 0;
+            case solid -> block.solid || checkSolid() ? 1 : 0;
             case team -> team.id;
             case health -> health;
             case maxHealth -> maxHealth;
-            case efficiency -> efficiency();
+            case efficiency -> efficiency;
+            case timescale -> timeScale;
+            case range -> this instanceof Ranged r ? r.range() / tilesize : 0;
             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);
+            //totalLiquids is inherently bad design, but unfortunately it is useful for conduits/tanks
+            case totalLiquids -> liquids == null ? 0 : liquids.currentAmount();
+            case totalPower -> power == null || block.consPower == null ? 0 : power.status * (block.consPower.buffered ? block.consPower.capacity : 1f);
             case itemCapacity -> block.hasItems ? block.itemCapacity : 0;
             case liquidCapacity -> block.hasLiquids ? block.liquidCapacity : 0;
-            case powerCapacity -> block.consumes.hasPower() ? block.consumes.getPower().capacity : 0f;
+            case powerCapacity -> block.consPower != null ? block.consPower.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();
             case enabled -> enabled ? 1 : 0;
-            case controlled -> this instanceof ControlBlock c ? c.isControlled() ? 1 : 0 : 0;
+            case controlled -> this instanceof ControlBlock c && c.isControlled() ? GlobalVars.ctrlPlayer : 0;
             case payloadCount -> getPayload() != null ? 1 : 0;
-            default -> 0;
+            case size -> block.size;
+            case cameraX, cameraY, cameraWidth, cameraHeight -> this instanceof ControlBlock c ? c.unit().sense(sensor) : 0;
+            default -> Float.NaN; //gets converted to null in logic
         };
     }
 
@@ -1316,42 +1978,121 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return switch(sensor){
             case type -> block;
             case firstItem -> items == null ? null : items.first();
-            case config -> block.configurations.containsKey(Item.class) || block.configurations.containsKey(Liquid.class) ? config() : null;
+            case config -> block.configSenseable() ? config() : null;
             case payloadType -> getPayload() instanceof UnitPayload p1 ? p1.unit.type : getPayload() instanceof BuildPayload p2 ? p2.block() : null;
             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;
+        if(content instanceof Item i && items != null) return items.get(i);
+        if(content instanceof Liquid l && liquids != null) return liquids.get(l);
+        if(getPayloads() != null){
+            if(content instanceof UnitType u) return getPayloads().get(u);
+            if(content instanceof Block b) return getPayloads().get(b);
+        }
+        return Float.NaN; //invalid sense
     }
 
     @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;
         }
     }
 
     @Override
     public void control(LAccess type, Object p1, double p2, double p3, double p4){
-        //don't execute configure instructions as the client
-        if(type == LAccess.configure && block.logicConfigurable && !net.client()){
+        //don't execute configure instructions that copy logic building configures; this can cause extreme lag
+        if(type == LAccess.config && block.logicConfigurable && !(p1 instanceof LogicBuild)){
             //change config only if it's new
-            Object prev = senseObject(LAccess.config);
-            if(prev != p1){
-                configureAny(p1);
+            configured(null, p1);
+        }
+    }
+
+    @Override
+    public void setProp(LAccess prop, double value){
+        switch(prop){
+            case health -> {
+                health = (float)Mathf.clamp(value, 0, maxHealth);
+                if(health <= 0f && !dead()){
+                    Call.buildDestroyed(self());
+                }else{
+                    healthChanged();
+                }
+            }
+            case team -> {
+                Team team = Team.get((int)value);
+                if(this.team != team){
+                    changeTeam(team);
+                }
+            }
+            case totalPower -> {
+                if(power != null && block.consPower != null && block.consPower.buffered){
+                    power.status = Mathf.clamp((float)(value / block.consPower.capacity));
+                }
             }
         }
     }
 
+    @Override
+    public void setProp(LAccess prop, Object value){
+        switch(prop){
+            case team -> {
+                if(value instanceof Team team && this.team != team){
+                    changeTeam(team);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void setProp(UnlockableContent content, double value){
+        if(content instanceof Item item && items != null){
+            int amount = (int)value;
+            if(items.get(item) != amount){
+                if(items.get(item) < amount){
+                    handleStack(item, acceptStack(item, amount - items.get(item), null), null);
+                }else if(amount >= 0){
+                    removeStack(item, items.get(item) - amount);
+                }
+            }
+        }else if(content instanceof Liquid liquid && liquids != null){
+            float amount = Mathf.clamp((float)value, 0f, block.liquidCapacity);
+            //decreasing amount is always allowed
+            if(amount < liquids.get(liquid) || (acceptLiquid(self(), liquid) && (liquids.current() == liquid || liquids.currentAmount() <= 0.1f || block.consumesLiquid(liquid)))){
+                liquids.set(liquid, amount);
+            }
+        }
+    }
+
+    @Replace
+    @Override
+    public boolean inFogTo(Team viewer){
+        if(team == viewer || !state.rules.fog) return false;
+
+        int size = block.size, of = block.sizeOffset, tx = tile.x, ty = tile.y;
+
+        if(!isDiscovered(viewer)) return true;
+
+        for(int x = 0; x < size; x++){
+            for(int y = 0; y < size; y++){
+                if(fogControl.isVisibleTile(viewer, tx + x + of, ty + y + of)){
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
     @Override
     public void remove(){
+        stopSound();
+    }
+
+    public void stopSound(){
         if(sound != null){
             sound.stop();
         }
@@ -1359,38 +2100,44 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     @Override
     public void killed(){
+        dead = true;
         Events.fire(new BlockDestroyEvent(tile));
-        block.breakSound.at(tile);
+        block.destroySound.at(tile);
         onDestroyed();
-        tile.remove();
+        if(tile != emptyTile){
+            tile.remove();
+        }
         remove();
+        afterDestroyed();
     }
 
     @Final
+    @Replace
     @Override
     public void update(){
+        //TODO should just avoid updating buildings instead
         if(state.isEditor()) return;
 
-        timeScaleDuration -= Time.delta;
-        if(timeScaleDuration <= 0f || !block.canOverdrive){
+        //TODO refactor to timestamp-based system?
+        if((timeScaleDuration -= Time.delta) <= 0f || !block.canOverdrive){
             timeScale = 1f;
         }
 
-        if(block.autoResetEnabled){
-            enabledControlTime -= Time.delta;
-
-            if(enabledControlTime <= 0){
-                enabled = true;
-            }
-        }
-
-        if(team == Team.derelict){
+        if(!allowUpdate()){
             enabled = false;
         }
 
+        if(!headless && !wasVisible && state.rules.fog && !inFogTo(player.team())){
+            visibleFlags |= (1L << player.team().id);
+            wasVisible = true;
+            renderer.blocks.updateShadow(self());
+            renderer.minimap.update(tile);
+        }
+
+        //TODO separate system for sound? AudioSource, etc
         if(!headless){
             if(sound != null){
-                sound.update(x, y, shouldActiveSound());
+                sound.update(x, y, shouldActiveSound(), activeSoundVolume());
             }
 
             if(block.ambientSound != Sounds.none && shouldAmbientSound()){
@@ -1398,27 +2145,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             }
         }
 
+        updateConsumption();
+
+        //TODO just handle per-block instead
         if(enabled || !block.noUpdateDisabled){
             updateTile();
         }
-
-        if(items != null){
-            items.update(updateFlow);
-        }
-
-        if(liquids != null){
-            liquids.update(updateFlow);
-        }
-
-        if(cons != null){
-            cons.update();
-        }
-
-        if(power != null){
-            power.graph.update();
-        }
-
-        updateFlow = false;
     }
 
     @Override
@@ -1426,5 +2158,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         out.setCentered(x, y, block.size * tilesize, block.size * tilesize);
     }
 
+    @Override
+    @Replace
+    public String toString(){
+        return "Building#" + id() + "[" + tileX() + "," + tileY() + "]:" + block;
+    }
+
     //endregion
 }
diff --git a/core/src/mindustry/entities/comp/BuildingTetherComp.java b/core/src/mindustry/entities/comp/BuildingTetherComp.java
new file mode 100644
index 0000000000..d7139c6c56
--- /dev/null
+++ b/core/src/mindustry/entities/comp/BuildingTetherComp.java
@@ -0,0 +1,23 @@
+package mindustry.entities.comp;
+
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+/** A unit that depends on a building's existence; if that building is removed, it despawns. */
+@Component
+abstract class BuildingTetherComp implements Unitc{
+    @Import UnitType type;
+    @Import Team team;
+
+    public @Nullable Building building;
+
+    @Override
+    public void update(){
+        if(building == null || !building.isValid() || building.team != team){
+            Call.unitDespawn(self());
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java
index a51a30dfd7..35916e43f9 100644
--- a/core/src/mindustry/entities/comp/BulletComp.java
+++ b/core/src/mindustry/entities/comp/BulletComp.java
@@ -1,6 +1,5 @@
 package mindustry.entities.comp;
 
-import arc.*;
 import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -8,14 +7,16 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
 import mindustry.core.*;
+import mindustry.entities.*;
 import mindustry.entities.bullet.*;
-import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.world.blocks.defense.Wall.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
@@ -24,13 +25,28 @@ import static mindustry.Vars.*;
 abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc{
     @Import Team team;
     @Import Entityc owner;
-    @Import float x, y, damage;
+    @Import float x, y, damage, lastX, lastY, time, lifetime;
+    @Import Vec2 vel;
 
     IntSeq collided = new IntSeq(6);
-    Object data;
     BulletType type;
+
+    Object data;
     float fdata;
-    transient boolean absorbed;
+
+    @ReadOnly
+    private float rotation;
+
+    //setting this variable to true prevents lifetime from decreasing for a frame.
+    transient boolean keepAlive;
+    transient Entityc shooter;
+    transient @Nullable Tile aimTile;
+    transient float aimX, aimY;
+    transient float originX, originY;
+    transient @Nullable Mover mover;
+    transient boolean absorbed, hit;
+    transient @Nullable Trail trail;
+    transient int frags;
 
     @Override
     public void getCollisions(Cons<QuadTree> consumer){
@@ -42,9 +58,11 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         }
     }
 
+    //bullets always considered local
     @Override
-    public void drawBullets(){
-        type.draw(self());
+    @Replace
+    public boolean isLocal(){
+        return true;
     }
 
     @Override
@@ -54,16 +72,19 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
 
     @Override
     public void remove(){
-        type.despawned(self());
+        if(Groups.isClearing) return;
+
+        //'despawned' only counts when the bullet is killed externally or reaches the end of life
+        if(!hit){
+            type.despawned(self());
+        }
+        type.removed(self());
         collided.clear();
     }
 
     @Override
     public float damageMultiplier(){
-        if(owner instanceof Unit) return ((Unit)owner).damageMultiplier() * state.rules.unitDamageMultiplier;
-        if(owner instanceof Building) return state.rules.blockDamageMultiplier;
-
-        return 1f;
+        return type.damageMultiplier(self());
     }
 
     @Override
@@ -72,6 +93,10 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         remove();
     }
 
+    public boolean hasCollided(int id){
+        return collided.size != 0 && collided.contains(id);
+    }
+
     @Replace
     public float clipSize(){
         return type.drawSize;
@@ -80,101 +105,168 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
     @Replace
     @Override
     public boolean collides(Hitboxc other){
-        return type.collides && (other instanceof Teamc && ((Teamc)other).team() != team)
-            && !(other instanceof Flyingc && !((Flyingc)other).checkTarget(type.collidesAir, type.collidesGround))
-            && !(type.pierce && collided.contains(other.id())); //prevent multiple collisions
+        return type.collides && (other instanceof Teamc t && t.team() != team)
+            && !(other instanceof Flyingc f && !f.checkTarget(type.collidesAir, type.collidesGround))
+            && !(type.pierce && hasCollided(other.id())); //prevent multiple collisions
     }
 
     @MethodPriority(100)
     @Override
     public void collision(Hitboxc other, float x, float y){
         type.hit(self(), x, y);
-        float health = 0f;
-
-        if(other instanceof Healthc h){
-            health = h.health();
-            h.damage(damage);
-        }
-
-        if(other instanceof Unit unit){
-            unit.impulse(Tmp.v3.set(unit).sub(this.x, this.y).nor().scl(type.knockback * 80f));
-            unit.apply(type.status, type.statusDuration);
-        }
 
         //must be last.
         if(!type.pierce){
+            hit = true;
             remove();
         }else{
             collided.add(other.id());
         }
 
-        type.hitEntity(self(), other, health);
-
-        if(owner instanceof WallBuild && player != null && team == player.team() && other instanceof Unit unit && unit.dead){
-            Events.fire(Trigger.phaseDeflectHit);
-        }
+        type.hitEntity(self(), other, other instanceof Healthc h ? h.health() : 0f);
     }
 
     @Override
     public void update(){
+        if(mover != null){
+            mover.move(self());
+        }
+
         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 || !isAdded()) return false;
-
-                if(tile.collide(self()) && type.testCollision(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(self());
-                    }
-
-                    if(remove || type.collidesTeam){
-                        if(!type.pierceBuilding){
-                            remove();
-                        }else{
-                            collided.add(tile.id);
-                        }
-                    }
-
-                    type.hitTile(self(), tile, health, true);
-
-                    return !type.pierceBuilding;
-                }
-
-                return false;
-            });
+            tileRaycast(World.toTile(lastX), World.toTile(lastY), tileX(), tileY());
         }
 
-        if(type.pierceCap != -1 && collided.size >= type.pierceCap){
+        if(type.removeAfterPierce && type.pierceCap != -1 && collided.size >= type.pierceCap){
+            hit = true;
             remove();
         }
+
+        if(keepAlive){
+            time -= Time.delta;
+            keepAlive = false;
+        }
+    }
+
+    public void moveRelative(float x, float y){
+        float rot = rotation();
+        this.x += Angles.trnsx(rot, x * Time.delta, y * Time.delta);
+        this.y += Angles.trnsy(rot, x * Time.delta, y * Time.delta);
+    }
+
+    public void turn(float x, float y){
+        float ang = vel.angle();
+        vel.add(Angles.trnsx(ang, x * Time.delta, y * Time.delta), Angles.trnsy(ang, x * Time.delta, y * Time.delta)).limit(type.speed);
+    }
+
+    public boolean checkUnderBuild(Building build, float x, float y){
+        return
+            (!build.block.underBullets ||
+            //direct hit on correct tile
+            (aimTile != null && aimTile.build == build) ||
+            //same team has no 'under build' mechanics
+            (build.team == team) ||
+            //a piercing bullet overshot the aim tile, it's fine to hit things now
+            (type.pierce && aimTile != null && Mathf.dst(x, y, originX, originY) > aimTile.dst(originX, originY) + 2f) ||
+            //there was nothing to aim at
+            (aimX == -1f && aimY == -1f));
+    }
+
+    //copy-paste of World#raycastEach, inlined for lambda capture performance.
+    @Override
+    public void tileRaycast(int x1, int y1, int x2, int y2){
+        int x = x1, dx = Math.abs(x2 - x), sx = x < x2 ? 1 : -1;
+        int y = y1, dy = Math.abs(y2 - y), sy = y < y2 ? 1 : -1;
+        int e2, err = dx - dy;
+        int ww = world.width(), wh = world.height();
+
+        while(x >= 0 && y >= 0 && x < ww && y < wh){
+            Building build = world.build(x, y);
+
+            if(type.collideFloor || type.collideTerrain){
+                Tile tile = world.tile(x, y);
+                if(
+                    type.collideFloor && (tile == null || tile.floor().hasSurface() || tile.block() != Blocks.air) ||
+                    type.collideTerrain && tile != null && tile.block() instanceof StaticWall
+                ){
+                    remove();
+                    hit = true;
+                    return;
+                }
+            }
+
+            if(build != null && isAdded()
+                && checkUnderBuild(build, x * tilesize, y * tilesize)
+                && build.collide(self()) && type.testCollision(self(), build)
+                && !build.dead() && (type.collidesTeam || build.team != team) && !(type.pierceBuilding && hasCollided(build.id))){
+
+                boolean remove = false;
+                float health = build.health;
+
+                if(build.team != team){
+                    remove = build.collision(self());
+                }
+
+                if(remove || type.collidesTeam){
+                    if(Mathf.dst2(lastX, lastY, x * tilesize, y * tilesize) < Mathf.dst2(lastX, lastY, this.x, this.y)){
+                        this.x = x * tilesize;
+                        this.y = y * tilesize;
+                    }
+
+                    if(!type.pierceBuilding){
+                        hit = true;
+                        remove();
+                    }else{
+                        collided.add(build.id);
+                    }
+                }
+
+                type.hitTile(self(), build, x * tilesize, y * tilesize, health, true);
+
+                //stop raycasting when building is hit
+                if(type.pierceBuilding) return;
+            }
+
+            if(x == x2 && y == y2) break;
+
+            e2 = 2 * err;
+            if(e2 > -dy){
+                err -= dy;
+                x += sx;
+            }
+
+            if(e2 < dx){
+                err += dx;
+                y += sy;
+            }
+        }
     }
 
     @Override
     public void draw(){
-        Draw.z(Layer.bullet);
+        Draw.z(type.layer);
 
         type.draw(self());
         type.drawLight(self());
+
+        Draw.reset();
+    }
+
+    public void initVel(float angle, float amount){
+        vel.trns(angle, amount);
+        rotation = angle;
     }
 
     /** Sets the bullet's rotation in degrees. */
     @Override
     public void rotation(float angle){
-        vel().setAngle(angle);
+        vel.setAngle(rotation = angle);
     }
 
     /** @return the bullet's rotation. */
     @Override
     public float rotation(){
-        float angle = Mathf.atan2(vel().x, vel().y) * Mathf.radiansToDegrees;
-        if(angle < 0) angle += 360;
-        return angle;
+        return vel.isZero(0.001f) ? rotation : vel.angle();
     }
 }
diff --git a/core/src/mindustry/entities/comp/ChildComp.java b/core/src/mindustry/entities/comp/ChildComp.java
index dae0c98814..2ae553480f 100644
--- a/core/src/mindustry/entities/comp/ChildComp.java
+++ b/core/src/mindustry/entities/comp/ChildComp.java
@@ -1,29 +1,53 @@
 package mindustry.entities.comp;
 
+import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
+import mindustry.world.blocks.*;
 
 @Component
-abstract class ChildComp implements Posc{
-    @Import float x, y;
+abstract class ChildComp implements Posc, Rotc{
+    @Import float x, y, rotation;
 
     @Nullable Posc parent;
-    float offsetX, offsetY;
+    boolean rotWithParent;
+    float offsetX, offsetY, offsetPos, offsetRot;
 
     @Override
     public void add(){
         if(parent != null){
             offsetX = x - parent.getX();
             offsetY = y - parent.getY();
+            if(rotWithParent){
+                if(parent instanceof Rotc r){
+                    offsetPos = -r.rotation();
+                    offsetRot = rotation - r.rotation();
+                }else if(parent instanceof RotBlock rot){
+                    offsetPos = -rot.buildRotation();
+                    offsetRot = rotation - rot.buildRotation();
+                }
+            }
         }
     }
 
     @Override
     public void update(){
         if(parent != null){
-            x = parent.getX() + offsetX;
-            y = parent.getY() + offsetY;
+            if(rotWithParent){
+                if(parent instanceof Rotc r){
+                    x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY);
+                    y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY);
+                    rotation = r.rotation() + offsetRot;
+                }else if(parent instanceof RotBlock rot){
+                    x = parent.getX() + Angles.trnsx(rot.buildRotation() + offsetPos, offsetX, offsetY);
+                    y = parent.getY() + Angles.trnsy(rot.buildRotation() + offsetPos, offsetX, offsetY);
+                    rotation = rot.buildRotation() + offsetRot;
+                }
+            }else{
+                x = parent.getX() + offsetX;
+                y = parent.getY() + offsetY;
+            }
         }
     }
 }
diff --git a/core/src/mindustry/entities/comp/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java
deleted file mode 100644
index 0ce8d60d10..0000000000
--- a/core/src/mindustry/entities/comp/CommanderComp.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package mindustry.entities.comp;
-
-import arc.func.*;
-import arc.math.geom.*;
-import arc.struct.*;
-import arc.util.*;
-import mindustry.ai.formations.*;
-import mindustry.ai.types.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.entities.*;
-import mindustry.entities.units.*;
-import mindustry.game.*;
-import mindustry.gen.*;
-import mindustry.type.*;
-
-/** A unit that can command other units. */
-@Component
-abstract class CommanderComp implements Entityc, Posc{
-    private static final Seq<FormationMember> members = new Seq<>();
-    private static final Seq<Unit> units = new Seq<>();
-
-    @Import float x, y, rotation, hitSize;
-    @Import Team team;
-    @Import UnitType type;
-
-    transient @Nullable Formation formation;
-    transient Seq<Unit> controlling = new Seq<>(10);
-    /** minimum speed of any unit in the formation. */
-    transient float minFormationSpeed;
-
-    public void update(){
-        if(controlling.isEmpty()){
-            formation = null;
-        }
-
-        if(formation != null){
-            formation.anchor.set(x, y, 0);
-            formation.updateSlots();
-            controlling.removeAll(u -> u.dead || !(u.controller() instanceof FormationAI ai && ai.leader == self()));
-        }
-    }
-
-    public void remove(){
-        clearCommand();
-    }
-
-    public void killed(){
-        clearCommand();
-    }
-
-    //make sure to reset command state when the controller is switched
-    public void controller(UnitController next){
-        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, 150f, u -> {
-            if(u.isAI() && include.get(u) && u != self() && u.type.flying == type.flying && u.hitSize <= hitSize * 1.1f){
-                units.add(u);
-            }
-        });
-
-        if(units.isEmpty()) return;
-
-        //sort by hitbox size, then by distance
-        units.sort(Structs.comps(Structs.comparingFloat(u -> -u.hitSize), Structs.comparingFloat(u -> u.dst2(this))));
-        units.truncate(type.commandLimit);
-
-        command(formation, units);
-    }
-
-    void command(Formation formation, Seq<Unit> units){
-        clearCommand();
-
-        float spacing = hitSize * 0.8f;
-        minFormationSpeed = type.speed;
-
-        controlling.addAll(units);
-        for(Unit unit : units){
-            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);
-    }
-
-    boolean isCommanding(){
-        return formation != null;
-    }
-
-    void clearCommand(){
-        //reset controlled units
-        for(Unit unit : controlling){
-            if(unit.controller().isBeingControlled(self())){
-                unit.controller(unit.type.createController());
-            }
-        }
-
-        controlling.clear();
-        formation = null;
-    }
-}
diff --git a/core/src/mindustry/entities/comp/CrawlComp.java b/core/src/mindustry/entities/comp/CrawlComp.java
new file mode 100644
index 0000000000..d638d45c0b
--- /dev/null
+++ b/core/src/mindustry/entities/comp/CrawlComp.java
@@ -0,0 +1,115 @@
+package mindustry.entities.comp;
+
+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.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
+
+import static mindustry.Vars.*;
+
+@Component
+abstract class CrawlComp implements Posc, Rotc, Hitboxc, Unitc{
+    @Import float x, y, speedMultiplier, rotation, hitSize;
+    @Import UnitType type;
+    @Import Team team;
+    @Import Vec2 vel;
+
+    transient Floor lastDeepFloor;
+    transient float lastCrawlSlowdown = 1f;
+    transient float segmentRot, crawlTime = Mathf.random(100f);
+
+    @Replace
+    @Override
+    public SolidPred solidity(){
+        return EntityCollisions::legsSolid;
+    }
+
+    @Override
+    @Replace
+    public int pathType(){
+        return Pathfinder.costLegs;
+    }
+
+    @Override
+    @Replace
+    public float floorSpeedMultiplier(){
+        Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();
+        //TODO take into account extra blocks
+        return (on.isDeep() ? 0.45f : on.speedMultiplier) * speedMultiplier * lastCrawlSlowdown;
+    }
+
+    @Override
+    public void add(){
+        //reset segment rotation on add
+        segmentRot = rotation;
+    }
+
+    @Override
+    @Replace
+    public Floor drownFloor(){
+        return lastDeepFloor;
+    }
+
+    @Override
+    public void update(){
+        if(moving()){
+            segmentRot = Angles.moveToward(segmentRot, rotation, type.segmentRotSpeed * Time.delta);
+
+            int radius = (int)Math.max(0, hitSize / tilesize * 2f);
+            int count = 0, solids = 0, deeps = 0;
+            lastDeepFloor = null;
+
+            //calculate tiles under this unit, and apply slowdown + particle effects
+            for(int cx = -radius; cx <= radius; cx++){
+                for(int cy = -radius; cy <= radius; cy++){
+                    if(cx*cx + cy*cy <= radius){
+                        count ++;
+                        Tile t = Vars.world.tileWorld(x + cx*tilesize, y + cy*tilesize);
+                        if(t != null){
+
+                            if(t.solid()){
+                                solids ++;
+                            }
+
+                            if(t.floor().isDeep()){
+                                deeps ++;
+                                lastDeepFloor = t.floor();
+                            }
+
+                            //TODO area damage to units
+                            if(t.build != null && t.build.team != team){
+                                t.build.damage(team, type.crushDamage * Time.delta * state.rules.unitDamage(team));
+                            }
+
+                            if(Mathf.chanceDelta(0.025)){
+                                Fx.crawlDust.at(t.worldx(), t.worldy(), t.floor().mapColor);
+                            }
+                        }else{
+                            solids ++;
+                        }
+                    }
+                }
+            }
+
+            //when most blocks under this unit cannot be drowned in, do not drown
+            if((float)deeps / count < 0.75f){
+                lastDeepFloor = null;
+            }
+
+            lastCrawlSlowdown = Mathf.lerpDelta(1f, type.crawlSlowdown, Mathf.clamp((float)solids / count / type.crawlSlowdownFrac));
+        }
+        segmentRot = Angles.clampRange(segmentRot, rotation, type.segmentMaxRot);
+
+        crawlTime += vel.len() * Time.delta;
+    }
+}
diff --git a/core/src/mindustry/entities/comp/EntityComp.java b/core/src/mindustry/entities/comp/EntityComp.java
index a97a2e0cc3..37b7bb7a2b 100644
--- a/core/src/mindustry/entities/comp/EntityComp.java
+++ b/core/src/mindustry/entities/comp/EntityComp.java
@@ -1,6 +1,5 @@
 package mindustry.entities.comp;
 
-import arc.func.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
@@ -29,17 +28,14 @@ abstract class EntityComp{
     }
 
     boolean isLocal(){
-        return ((Object)this) == player || ((Object)this) instanceof Unitc && ((Unitc)((Object)this)).controller() == player;
+        return ((Object)this) == player || ((Object)this) instanceof Unitc u && u.controller() == player;
     }
 
     boolean isRemote(){
-        return ((Object)this) instanceof Unitc && ((Unitc)((Object)this)).isPlayer() && !isLocal();
-    }
-
-    boolean isNull(){
-        return false;
+        return ((Object)this) instanceof Unitc u && u.isPlayer() && !isLocal();
     }
 
+    /** Replaced with `this` after code generation. */
     <T extends Entityc> T self(){
         return (T)this;
     }
@@ -48,11 +44,6 @@ abstract class EntityComp{
         return (T)this;
     }
 
-    <T> T with(Cons<T> cons){
-        cons.get((T)this);
-        return (T)this;
-    }
-
     @InternalImpl
     abstract int classId();
 
@@ -71,4 +62,9 @@ abstract class EntityComp{
     void afterRead(){
 
     }
+
+    /** Called after *all* entities are read. */
+    void afterAllRead(){
+
+    }
 }
diff --git a/core/src/mindustry/entities/comp/FireComp.java b/core/src/mindustry/entities/comp/FireComp.java
index 7981e061b6..14ce9d8b1a 100644
--- a/core/src/mindustry/entities/comp/FireComp.java
+++ b/core/src/mindustry/entities/comp/FireComp.java
@@ -1,5 +1,7 @@
 package mindustry.entities.comp;
 
+import arc.*;
+import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
@@ -9,42 +11,51 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 @EntityDef(value = {Firec.class}, pooled = true)
 @Component(base = true)
-abstract class FireComp implements Timedc, Posc, Firec, Syncc{
-    private static final float spreadChance = 0.04f, fireballChance = 0.06f;
+abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
+    public static final int frames = 40, duration = 90;
+
+    private static final float spreadDelay = 22f, fireballDelay = 40f,
+        ticksPerFrame = (float)duration / frames, warmupDuration = 20f, damageDelay = 40f, tileDamage = 1.8f, unitDamage = 3f;
+
+    public static final TextureRegion[] regions = new TextureRegion[frames];
 
     @Import float time, lifetime, x, y;
 
     Tile tile;
-    private transient Block block;
-    private transient float baseFlammability = -1, puddleFlammability;
+    private transient float
+        puddleFlammability, damageTimer = Mathf.random(40f),
+        spreadTimer = Mathf.random(spreadDelay), fireballTimer = Mathf.random(fireballDelay),
+        warmup = 0f,
+        animation = Mathf.random(frames - 1);
 
     @Override
     public void update(){
-        if(Mathf.chance(0.09 * Time.delta)){
-            Fx.fire.at(x + Mathf.range(4f), y + Mathf.range(4f));
-        }
 
-        if(Mathf.chance(0.05 * Time.delta)){
-            Fx.fireSmoke.at(x + Mathf.range(4f), y + Mathf.range(4f));
-        }
+        animation += Time.delta / ticksPerFrame;
+        warmup += Time.delta;
+        animation %= frames;
 
         if(!headless){
             control.sound.loop(Sounds.fire, this, 0.07f);
         }
 
-        time = Mathf.clamp(time + Time.delta, 0, lifetime());
+        //faster updates -> disappears more quickly
+        float speedMultiplier = 1f + Math.max(state.envAttrs.get(Attribute.water) * 10f, 0);
+        time = Mathf.clamp(time + Time.delta * speedMultiplier, 0, lifetime);
 
         if(Vars.net.client()){
             return;
         }
 
-        if(time >= lifetime() || tile == null){
+        if(time >= lifetime || tile == null || Float.isNaN(lifetime)){
             remove();
             return;
         }
@@ -52,46 +63,68 @@ abstract class FireComp implements Timedc, Posc, Firec, Syncc{
         Building entity = tile.build;
         boolean damage = entity != null;
 
-        float flammability = baseFlammability + puddleFlammability;
+        float flammability = tile.getFlammability() + puddleFlammability;
 
         if(!damage && flammability <= 0){
             time += Time.delta * 8;
         }
 
-        if(baseFlammability < 0 || block != tile.block()){
-            baseFlammability = tile.build == null ? 0 : tile.getFlammability();
-            block = tile.block();
-        }
-
         if(damage){
             lifetime += Mathf.clamp(flammability / 8f, 0f, 0.6f) * Time.delta;
         }
 
-        if(flammability > 1f && Mathf.chance(spreadChance * Time.delta * Mathf.clamp(flammability / 5f, 0.3f, 2f))){
+        if(flammability > 1f && (spreadTimer += Time.delta * Mathf.clamp(flammability / 5f, 0.3f, 2f)) >= spreadDelay){
+            spreadTimer = 0f;
             Point2 p = Geometry.d4[Mathf.random(3)];
             Tile other = world.tile(tile.x + p.x, tile.y + p.y);
             Fires.create(other);
-
-            if(Mathf.chance(fireballChance * Time.delta * Mathf.clamp(flammability / 10f))){
-                Bullets.fireball.createNet(Team.derelict, x, y, Mathf.random(360f), -1f, 1, 1);
-            }
         }
 
-        if(Mathf.chance(0.025 * Time.delta)){
+        if(flammability > 0 && (fireballTimer += Time.delta * Mathf.clamp(flammability / 10f, 0f, 0.5f)) >= fireballDelay){
+            fireballTimer = 0f;
+            Bullets.fireball.createNet(Team.derelict, x, y, Mathf.random(360f), -1f, 1, 1);
+        }
+
+        //apply damage to nearby units & building
+        if((damageTimer += Time.delta) >= damageDelay){
+            damageTimer = 0f;
             Puddlec p = Puddles.get(tile);
             puddleFlammability = p != null ? p.getFlammability() / 3f : 0;
 
             if(damage){
-                entity.damage(1.6f);
+                entity.damage(tileDamage);
             }
-            Damage.damageUnits(null, tile.worldx(), tile.worldy(), tilesize, 3f,
+            Damage.damageUnits(null, tile.worldx(), tile.worldy(), tilesize, unitDamage,
             unit -> !unit.isFlying() && !unit.isImmune(StatusEffects.burning),
             unit -> unit.apply(StatusEffects.burning, 60 * 5));
         }
     }
 
+    @Override
+    public void draw(){
+        if(regions[0] == null){
+            for(int i = 0; i < frames; i++){
+                regions[i] = Core.atlas.find("fire" + i);
+            }
+        }
+
+        Draw.color(1f, 1f, 1f, Mathf.clamp(warmup / warmupDuration));
+        Draw.z(Layer.effect);
+        Draw.rect(regions[Math.min((int)animation, regions.length - 1)], x + Mathf.randomSeedRange((int)y, 2), y + Mathf.randomSeedRange((int)x, 2));
+        Draw.reset();
+
+        Drawf.light(x, y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f  * Mathf.clamp(warmup / warmupDuration));
+    }
+
+    @Replace
+    @Override
+    public float clipSize(){
+        return 25;
+    }
+
     @Override
     public void remove(){
+        Fx.fireRemove.at(x, y, animation);
         Fires.remove(tile);
     }
 
diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java
index 94db2f6a63..c2d6dacea4 100644
--- a/core/src/mindustry/entities/comp/FlyingComp.java
+++ b/core/src/mindustry/entities/comp/FlyingComp.java
@@ -8,6 +8,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
@@ -16,14 +17,16 @@ import static mindustry.Vars.*;
 abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
     private static final Vec2 tmp1 = new Vec2(), tmp2 = new Vec2();
 
-    @Import float x, y, speedMultiplier;
+    @Import float x, y, speedMultiplier, hitSize;
     @Import Vec2 vel;
+    @Import UnitType type;
 
     @SyncLocal float elevation;
     private transient boolean wasFlying;
     transient boolean hovering;
     transient float drownTime;
     transient float splashTimer;
+    transient @Nullable Floor lastDrownFloor;
 
     boolean checkTarget(boolean targetAir, boolean targetGround){
         return (isGrounded() && targetGround) || (isFlying() && targetAir);
@@ -41,6 +44,14 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
         return isGrounded() && !hovering;
     }
 
+    @Nullable Floor drownFloor(){
+        return canDrown() ? floorOn() : null;
+    }
+
+    boolean emitWalkSound(){
+        return true;
+    }
+
     void landed(){
 
     }
@@ -52,7 +63,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
 
     void moveAt(Vec2 vector, float acceleration){
         Vec2 t = tmp1.set(vector); //target vector
-        tmp2.set(t).sub(vel).limit(acceleration * vector.len() * Time.delta * floorSpeedMultiplier()); //delta vector
+        tmp2.set(t).sub(vel).limit(acceleration * vector.len() * Time.delta); //delta vector
         vel.add(tmp2);
     }
 
@@ -80,26 +91,33 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
                 floor.walkEffect.at(x, y, hitSize() / 8f, floor.mapColor);
                 splashTimer = 0f;
 
-                if(!(this instanceof WaterMovec)){
+                if(emitWalkSound()){
                     floor.walkSound.at(x, y, Mathf.random(floor.walkSoundPitchMin, floor.walkSoundPitchMax), floor.walkSoundVolume);
                 }
             }
         }
 
-        if(canDrown() && floor.isLiquid && floor.drownTime > 0){
-            drownTime += Time.delta / floor.drownTime;
-            drownTime = Mathf.clamp(drownTime);
+        updateDrowning();
+    }
+
+    public void updateDrowning(){
+        Floor floor = drownFloor();
+
+        if(floor != null && floor.isLiquid && floor.drownTime > 0){
+            lastDrownFloor = floor;
+            drownTime += Time.delta / floor.drownTime / type.drownTimeMultiplier;
             if(Mathf.chanceDelta(0.05f)){
-                floor.drownUpdateEffect.at(x, y, 1f, floor.mapColor);
+                floor.drownUpdateEffect.at(x, y, hitSize, floor.mapColor);
             }
 
-            //TODO is the netClient check necessary?
             if(drownTime >= 0.999f && !net.client()){
                 kill();
                 Events.fire(new UnitDrownEvent(self()));
             }
         }else{
-            drownTime = Mathf.lerpDelta(drownTime, 0f, 0.03f);
+            drownTime -= Time.delta / 50f;
         }
+
+        drownTime = Mathf.clamp(drownTime);
     }
 }
diff --git a/core/src/mindustry/entities/comp/HealthComp.java b/core/src/mindustry/entities/comp/HealthComp.java
index 85d0a37105..f315b3fb75 100644
--- a/core/src/mindustry/entities/comp/HealthComp.java
+++ b/core/src/mindustry/entities/comp/HealthComp.java
@@ -1,6 +1,5 @@
 package mindustry.entities.comp;
 
-import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
@@ -34,7 +33,7 @@ abstract class HealthComp implements Entityc, Posc{
     void kill(){
         if(dead) return;
 
-        health = 0;
+        health = Math.min(health, 0);
         dead = true;
         killed();
         remove();
@@ -60,6 +59,8 @@ abstract class HealthComp implements Entityc, Posc{
     }
 
     void damage(float amount){
+        if(Float.isNaN(health)) health = 0f;
+
         health -= amount;
         hitTime = 1f;
         if(health <= 0 && !dead){
@@ -86,7 +87,8 @@ abstract class HealthComp implements Entityc, Posc{
     }
 
     void clampHealth(){
-        health = Mathf.clamp(health, 0, maxHealth);
+        health = Math.min(health, maxHealth);
+        if(Float.isNaN(health)) health = 0f;
     }
 
     /** Heals by a flat amount. */
diff --git a/core/src/mindustry/entities/comp/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java
index f44270ebed..178ab1c228 100644
--- a/core/src/mindustry/entities/comp/HitboxComp.java
+++ b/core/src/mindustry/entities/comp/HitboxComp.java
@@ -5,10 +5,11 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.math.geom.QuadTree.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 
 @Component
-abstract class HitboxComp implements Posc, QuadTreeObject{
+abstract class HitboxComp implements Posc, Sized, QuadTreeObject{
     @Import float x, y;
 
     transient float lastX, lastY, deltaX, deltaY, hitSize;
@@ -28,6 +29,11 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
         updateLastPosition();
     }
 
+    @Override
+    public float hitSize(){
+        return hitSize;
+    }
+
     void getCollisions(Cons<QuadTree> consumer){
 
     }
@@ -62,7 +68,10 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
 
     public void hitboxTile(Rect rect){
         //tile hitboxes are never bigger than a tile, otherwise units get stuck
-        float size = Math.min(hitSize * 0.66f, 7.9f);
+        float size = Math.min(hitSize * 0.66f, 7.8f);
+        //TODO: better / more accurate version is
+        //float size = hitSize * 0.85f;
+        //- for tanks?
         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 4f642c8493..32ae057e16 100644
--- a/core/src/mindustry/entities/comp/LaunchCoreComp.java
+++ b/core/src/mindustry/entities/comp/LaunchCoreComp.java
@@ -7,7 +7,6 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 
 @EntityDef(value = LaunchCorec.class, serialize = false)
@@ -43,8 +42,9 @@ abstract class LaunchCoreComp implements Drawc, Timedc{
 
         Draw.z(Layer.weather - 1);
 
-        TextureRegion region = block.icon(Cicon.full);
-        float rw = region.width * Draw.scl * scale, rh = region.height * Draw.scl * scale;
+        TextureRegion region = block.fullIcon;
+        scale *= region.scl();
+        float rw = region.width * scale, rh = region.height * 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 8ddb4793e4..cc57b1e87d 100644
--- a/core/src/mindustry/entities/comp/LegsComp.java
+++ b/core/src/mindustry/entities/comp/LegsComp.java
@@ -9,31 +9,47 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.EntityCollisions.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.world.blocks.*;
 import mindustry.world.blocks.environment.*;
 
+import static mindustry.Vars.*;
+
 @Component
 abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
-    @Import float x, y;
+    private static final Vec2 straightVec = new Vec2();
+
+    @Import float x, y, rotation, speedMultiplier;
     @Import UnitType type;
+    @Import Team team;
+    @Import boolean disarmed;
 
     transient Leg[] legs = {};
     transient float totalLength;
     transient float moveSpace;
     transient float baseRotation;
+    transient Floor lastDeepFloor;
+    transient Vec2 curMoveOffset = new Vec2();
 
     @Replace
     @Override
     public SolidPred solidity(){
-        return !type.allowLegStep ? EntityCollisions::solid : EntityCollisions::legsSolid;
+        return type.allowLegStep ? EntityCollisions::legsSolid : EntityCollisions::solid;
     }
 
     @Override
     @Replace
     public int pathType(){
-        return Pathfinder.costLegs;
+        return type.allowLegStep ? Pathfinder.costLegs : Pathfinder.costGround;
+    }
+
+    @Override
+    @Replace
+    public Floor drownFloor(){
+        return lastDeepFloor;
     }
 
     @Override
@@ -41,20 +57,57 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
         resetLegs();
     }
 
+    @Override
+    public void unloaded(){
+        resetLegs(1f);
+    }
+
+    @MethodPriority(-1)
+    @Override
+    public void destroy(){
+        if(!isAdded() || Vars.headless) return;
+
+        float legExplodeRad = type.legRegion.height  / 4f / 1.45f;
+
+        //create effects for legs being destroyed
+        for(int i = 0; i < legs.length; i++){
+            Leg l = legs[i];
+
+            Vec2 base = legOffset(Tmp.v1, i).add(x, y);
+
+            Tmp.v2.set(l.base).sub(l.joint).inv().setLength(type.legExtension);
+
+            for(Vec2 vec : new Vec2[]{base, l.joint, l.base}){
+                Damage.dynamicExplosion(vec.x, vec.y, 0f, 0f, 0f, legExplodeRad, state.rules.damageExplosions, false, team, type.deathExplosionEffect);
+            }
+
+            Fx.legDestroy.at(base.x, base.y, 0f, new LegDestroyData(base.cpy(), l.joint, type.legRegion));
+            Fx.legDestroy.at(l.joint.x, l.joint.y, 0f, new LegDestroyData(l.joint.cpy().add(Tmp.v2), l.base, type.legBaseRegion));
+
+        }
+    }
+
     public void resetLegs(){
-        float rot = baseRotation;
+        resetLegs(type.legLength);
+    }
+
+    public void resetLegs(float legLength){
         int count = type.legCount;
-        float legLength = type.legLength;
 
         this.legs = new Leg[count];
 
-        float spacing = 360f / count;
+        if(type.lockLegBase){
+            baseRotation = rotation;
+        }
 
         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);
+            float dstRot = legAngle(i);
+            Vec2 baseOffset = legOffset(Tmp.v5, i).add(x, y);
+
+            l.joint.trns(dstRot, legLength/2f).add(baseOffset);
+            l.base.trns(dstRot, legLength).add(baseOffset);
 
             legs[i] = l;
         }
@@ -66,7 +119,10 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
             baseRotation = Angles.moveToward(baseRotation, Mathf.angle(deltaX(), deltaY()), type.rotateSpeed);
         }
 
-        float rot = baseRotation;
+        if(type.lockLegBase){
+            baseRotation = rotation;
+        }
+
         float legLength = type.legLength;
 
         //set up initial leg positions
@@ -77,21 +133,28 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
         float moveSpeed = type.legSpeed;
         int div = Math.max(legs.length / type.legGroupSize, 2);
         moveSpace = legLength / 1.6f / (div / 2f) * type.legMoveSpace;
-        totalLength += Mathf.dst(deltaX(), deltaY());
+        //TODO should move legs even when still, based on speed. also, to prevent "slipping", make sure legs move when they are too far from their destination
+        totalLength += type.legContinuousMove ? type.speed * speedMultiplier * Time.delta : Mathf.dst(deltaX(), deltaY());
 
-        float trns = moveSpace * 0.85f * type.legTrns;
+        float trns = moveSpace * 0.85f * type.legForwardScl;
 
         //rotation + offset vector
-        Vec2 moveOffset = Tmp.v4.trns(rot, trns);
         boolean moving = moving();
+        Vec2 moveOffset = !moving ? Tmp.v4.setZero() : Tmp.v4.trns(Angles.angle(deltaX(), deltaY()), trns);
+        //make it smooth, not jumpy
+        moveOffset = curMoveOffset.lerpDelta(moveOffset, 0.1f);
+
+        lastDeepFloor = null;
+        int deeps = 0;
 
         for(int i = 0; i < legs.length; i++){
-            float dstRot = legAngle(rot, i);
-            Vec2 baseOffset = Tmp.v5.trns(dstRot, type.legBaseOffset).add(x, y);
+            float dstRot = legAngle(i);
+            Vec2 baseOffset = legOffset(Tmp.v5, i).add(x, y);
             Leg l = legs[i];
 
-            l.joint.sub(baseOffset).limit(type.maxStretch * legLength/2f).add(baseOffset);
-            l.base.sub(baseOffset).limit(type.maxStretch * legLength).add(baseOffset);
+            //TODO is limiting twice necessary?
+            l.joint.sub(baseOffset).clampLength(type.legMinLength * legLength/2f, type.legMaxLength * legLength/2f).add(baseOffset);
+            l.base.sub(baseOffset).clampLength(type.legMinLength * legLength, type.legMaxLength * legLength).add(baseOffset);
 
             float stageF = (totalLength + i*type.legPairOffset) / moveSpace;
             int stage = (int)stageF;
@@ -101,29 +164,42 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
             //back legs have reversed directions
             boolean backLeg = Math.abs((i + 0.5f) - legs.length/2f) <= 0.501f;
             if(backLeg && type.flipBackLegs) side = !side;
+            if(type.flipLegSide) side = !side;
 
             l.moving = move;
             l.stage = moving ? stageF % 1f : Mathf.lerpDelta(l.stage, 0f, 0.1f);
 
+            Floor floor = Vars.world.floorWorld(l.base.x, l.base.y);
+            if(floor.isDeep()){
+                deeps ++;
+                lastDeepFloor = floor;
+            }
+
             if(l.group != group){
 
                 //create effect when transitioning to a group it can't move in
-                if(!move && i % div == l.group){
-                    Floor floor = Vars.world.floorWorld(l.base.x, l.base.y);
-                    if(floor.isLiquid){
-                        floor.walkEffect.at(l.base.x, l.base.y, type.rippleScale, floor.mapColor);
-                        floor.walkSound.at(x, y, 1f, floor.walkSoundVolume);
-                    }else{
-                        Fx.unitLandSmall.at(l.base.x, l.base.y, type.rippleScale, floor.mapColor);
+                if(!move && (moving || !type.legContinuousMove) && i % div == l.group){
+                    if(!headless && !inFogTo(player.team())){
+                        if(floor.isLiquid){
+                            floor.walkEffect.at(l.base.x, l.base.y, type.rippleScale, floor.mapColor);
+                            floor.walkSound.at(x, y, 1f, floor.walkSoundVolume);
+                        }else{
+                            Fx.unitLandSmall.at(l.base.x, l.base.y, type.rippleScale, floor.mapColor);
+                        }
+
+                        //shake when legs contact ground
+                        if(type.stepShake > 0){
+                            Effect.shake(type.stepShake, type.stepShake, l.base);
+                        }
                     }
 
-                    //shake when legs contact ground
-                    if(type.landShake > 0){
-                        Effect.shake(type.landShake, type.landShake, l.base);
-                    }
+                    if(type.legSplashDamage > 0 && !disarmed){
+                        Damage.damage(team, l.base.x, l.base.y, type.legSplashRange, type.legSplashDamage * state.rules.unitDamage(team), false, true);
 
-                    if(type.legSplashDamage > 0){
-                        Damage.damage(team(), l.base.x, l.base.y, type.legSplashRange, type.legSplashDamage, false, true);
+                        var tile = Vars.world.tileWorld(l.base.x, l.base.y);
+                        if(tile != null && tile.block().unitMoveBreakable){
+                            ConstructBlock.deconstructFinish(tile, tile.block(), self());
+                        }
                     }
                 }
 
@@ -133,11 +209,10 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
             //leg destination
             Vec2 legDest = Tmp.v1.trns(dstRot, legLength * type.legLengthScl).add(baseOffset).add(moveOffset);
             //join destination
-            Vec2 jointDest = Tmp.v2;//.trns(rot2, legLength / 2f + type.legBaseOffset).add(moveOffset);
+            Vec2 jointDest = Tmp.v2;
             InverseKinematics.solve(legLength/2f, legLength/2f, Tmp.v6.set(l.base).sub(baseOffset), side, jointDest);
             jointDest.add(baseOffset);
-            //lerp between kinematic and linear
-            jointDest.lerp(Tmp.v6.set(baseOffset).lerp(l.base, 0.5f), 1f - type.kinematicScl);
+            Tmp.v6.set(baseOffset).lerp(l.base, 0.5f);
 
             if(move){
                 float moveFract = stageF % 1f;
@@ -147,12 +222,41 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
             }
 
             l.joint.lerpDelta(jointDest, moveSpeed / 4f);
+
+            //limit again after updating
+            l.joint.sub(baseOffset).clampLength(type.legMinLength * legLength/2f, type.legMaxLength * legLength/2f).add(baseOffset);
+            l.base.sub(baseOffset).clampLength(type.legMinLength * legLength, type.legMaxLength * legLength).add(baseOffset);
+        }
+
+        //when at least 1 leg is touching land, it can't drown
+        if(deeps != legs.length || !floorOn().isDeep()){
+            lastDeepFloor = null;
         }
     }
 
+    Vec2 legOffset(Vec2 out, int index){
+        out.trns(defaultLegAngle(index), type.legBaseOffset);
+
+        if(type.legStraightness > 0){
+            straightVec.trns(defaultLegAngle(index) - baseRotation, type.legBaseOffset);
+            straightVec.y = Mathf.sign(straightVec.y) * type.legBaseOffset * type.legStraightLength;
+            straightVec.rotate(baseRotation);
+            out.lerp(straightVec, type.baseLegStraightness);
+        }
+
+        return out;
+    }
+
     /** @return outwards facing angle of leg at the specified index. */
-    float legAngle(float rotation, int index){
-        return rotation + 360f / legs.length * index + (360f / legs.length / 2f);
+    float legAngle(int index){
+        if(type.legStraightness > 0){
+            return Mathf.slerp(defaultLegAngle(index), (index >= legs.length/2 ? -90 : 90f) + baseRotation, type.legStraightness);
+        }
+        return defaultLegAngle(index);
+    }
+
+    float defaultLegAngle(int index){
+        return baseRotation + 360f / legs.length * index + (360f / legs.length / 2f);
     }
 
 }
diff --git a/core/src/mindustry/entities/comp/MechComp.java b/core/src/mindustry/entities/comp/MechComp.java
index 6d99f368cb..9d599b9bdd 100644
--- a/core/src/mindustry/entities/comp/MechComp.java
+++ b/core/src/mindustry/entities/comp/MechComp.java
@@ -1,15 +1,13 @@
 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 mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
@@ -39,29 +37,40 @@ abstract class MechComp implements Posc, Flyingc, Hitboxc, Unitc, Mechc, Elevati
 
         float lastExtend = walkExtension;
 
-        if(extendScl < lastExtend && base % 2f > 1f && !isFlying()){
+        if(!headless && extendScl < lastExtend && base % 2f > 1f && !isFlying() && !inFogTo(player.team())){
             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.stepShake > 0){
+                Effect.shake(type.stepShake, type.stepShake, 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);
-                }
+                Effect.floorDust(cx, cy, hitSize/8f);
             }
         }
 
         walkExtension = extendScl;
     }
 
+    @Replace
+    @Override
+    public @Nullable Floor drownFloor(){
+        //large mechs can only drown when all the nearby floors are deep
+        if(hitSize >= 12 && canDrown()){
+            for(Point2 p : Geometry.d8){
+                Floor f = world.floorWorld(x + p.x * tilesize, y + p.y * tilesize);
+                if(!f.isDeep()){
+                    return null;
+                }
+            }
+        }
+        return canDrown() ? floorOn() : null;
+    }
+
     public float walkExtend(boolean scaled){
 
         //now ranges from -maxExtension to maxExtension*3
@@ -76,18 +85,29 @@ abstract class MechComp implements Posc, Flyingc, Hitboxc, Unitc, Mechc, Elevati
         return raw;
     }
 
+    @Override
+    @Replace
+    public void rotateMove(Vec2 vec){
+        //mechs use baseRotation to rotate, not rotation.
+        moveAt(Tmp.v2.trns(baseRotation, vec.len()));
+
+        if(!vec.isZero()){
+            baseRotation = Angles.moveToward(baseRotation, vec.angle(), type.rotateSpeed * Math.max(Time.delta, 1));
+        }
+    }
+
     @Override
     public void moveAt(Vec2 vector, float acceleration){
+        //mark walking state when moving in a controlled manner
         if(!vector.isZero()){
-            //mark walking state when moving in a controlled manner
             walked = true;
         }
     }
 
     @Override
     public void approach(Vec2 vector){
-        if(!vector.isZero(0.09f)){
-            //mark walking state when moving in a controlled manner
+        //mark walking state when moving in a controlled manner
+        if(!vector.isZero(0.001f)){
             walked = true;
         }
     }
diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java
index 1faabadef8..4e9c28bc3d 100644
--- a/core/src/mindustry/entities/comp/MinerComp.java
+++ b/core/src/mindustry/entities/comp/MinerComp.java
@@ -23,7 +23,8 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
     transient float mineTimer;
     @Nullable @SyncLocal Tile mineTile;
 
-    public boolean canMine(Item item){
+    public boolean canMine(@Nullable Item item){
+        if(item == null) return false;
         return type.mineTier >= item.hardness;
     }
 
@@ -35,9 +36,28 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
         return mineTile != null && !this.<Unit>self().activelyBuilding();
     }
 
+    public @Nullable Item getMineResult(@Nullable Tile tile){
+        if(tile == null) return null;
+        Item result;
+        if(type.mineFloor && tile.block() == Blocks.air){
+            result = tile.drop();
+        }else if(type.mineWalls){
+            result = tile.wallDrop();
+        }else{
+            return null;
+        }
+
+        return canMine(result) ? result : null;
+    }
+
     public boolean validMine(Tile tile, boolean checkDst){
-        return !(tile == null || tile.block() != Blocks.air || (!within(tile.worldx(), tile.worldy(), miningRange) && checkDst)
-        || tile.drop() == null || !canMine(tile.drop()));
+        if(tile == null) return false;
+
+        if(checkDst && !within(tile.worldx(), tile.worldy(), type.mineRange)){
+            return false;
+        }
+
+        return getMineResult(tile) != null;
     }
 
     public boolean validMine(Tile tile){
@@ -45,14 +65,17 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
     }
 
     public boolean canMine(){
-        return type.mineSpeed > 0 && type.mineTier >= 0;
+        return type.mineSpeed * state.rules.unitMineSpeed(team()) > 0 && type.mineTier >= 0;
     }
 
     @Override
     public void update(){
-        Building core = closestCore();
+        if(mineTile == null) return;
 
-        if(core != null && mineTile != null && mineTile.drop() != null && !acceptsItem(mineTile.drop()) && within(core, mineTransferRange) && !offloadImmediately()){
+        Building core = closestCore();
+        Item item = getMineResult(mineTile);
+
+        if(core != null && item != null && !acceptsItem(item) && within(core, mineTransferRange) && !offloadImmediately()){
             int accepted = core.acceptStack(item(), stack().amount, this);
             if(accepted > 0){
                 Call.transferItemTo(self(), item(), accepted,
@@ -62,18 +85,17 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
             }
         }
 
-        if(!validMine(mineTile)){
+        if((!net.client() || isLocal()) && !validMine(mineTile)){
             mineTile = null;
             mineTimer = 0f;
-        }else if(mining()){
-            Item item = mineTile.drop();
-            mineTimer += Time.delta *type.mineSpeed;
+        }else if(mining() && item != null){
+            mineTimer += Time.delta * type.mineSpeed * state.rules.unitMineSpeed(team());
 
             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*15f){
+            if(mineTimer >= 50f + (type.mineHardnessScaling ? item.hardness*15f : 15f)){
                 mineTimer = 0;
 
                 if(state.rules.sector != null && team() == state.rules.defaultTeam) state.rules.sector.info.handleProduction(item, 1);
@@ -101,31 +123,4 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
             }
         }
     }
-
-    @Override
-    public void draw(){
-        if(!mining()) return;
-        float focusLen = hitSize / 2f + Mathf.absin(Time.time, 1.1f, 0.5f);
-        float swingScl = 12f, swingMag = tilesize / 8f;
-        float flashScl = 0.3f;
-
-        float px = x + Angles.trnsx(rotation, focusLen);
-        float py = y + Angles.trnsy(rotation, focusLen);
-
-        float ex = mineTile.worldx() + Mathf.sin(Time.time + 48, swingScl, swingMag);
-        float ey = mineTile.worldy() + Mathf.sin(Time.time + 48, swingScl + 2f, swingMag);
-
-        Draw.z(Layer.flyingUnit + 0.1f);
-
-        Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time, 0.5f, flashScl));
-
-        Drawf.laser(team(), Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f);
-
-        if(isLocal()){
-            Lines.stroke(1f, Pal.accent);
-            Lines.poly(mineTile.worldx(), mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time);
-        }
-
-        Draw.color();
-    }
 }
diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index 8db8656d88..b6812991dd 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -11,34 +11,81 @@ import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
+import mindustry.world.blocks.power.*;
 
 /** An entity that holds a payload. */
 @Component
 abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     @Import float x, y, rotation;
+    @Import Team team;
     @Import UnitType type;
 
     Seq<Payload> payloads = new Seq<>();
 
+    private transient @Nullable PowerGraph payloadPower;
+
+    @Override
+    public void update(){
+        if(payloadPower != null){
+            payloadPower.clear();
+        }
+
+        //update power graph first, resolve everything
+        for(Payload pay : payloads){
+            if(pay instanceof BuildPayload pb && pb.build.power != null){
+                if(payloadPower == null) payloadPower = new PowerGraph(false);
+
+                //pb.build.team = team;
+                pb.build.power.graph = null;
+                payloadPower.add(pb.build);
+            }
+        }
+
+        if(payloadPower != null){
+            payloadPower.update();
+        }
+
+        for(Payload pay : payloads){
+            //apparently BasedUser doesn't want this and several plugins use it
+            //if(pay instanceof BuildPayload build){
+            //    build.build.team = team;
+            //}
+            pay.set(x, y, rotation);
+            pay.update(self(), null);
+        }
+    }
+
+    @Override
+    public void remove(){
+        for(Payload pay : payloads){
+            pay.remove();
+        }
+        payloads.clear();
+    }
+  
+    public void destroy(){
+        if(Vars.state.rules.unitPayloadsExplode) payloads.each(Payload::destroyed);
+    }
+
     float payloadUsed(){
         return payloads.sumf(p -> p.size() * p.size());
     }
 
     boolean canPickup(Unit unit){
-        return payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity + 0.001f && unit.team == team() && unit.isAI();
+        return type.pickupUnits && payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity + 0.001f && unit.team == team() && unit.isAI();
     }
 
     boolean canPickup(Building build){
-        return payloadUsed() + build.block.size * build.block.size * Vars.tilesize * Vars.tilesize <= type.payloadCapacity + 0.001f && build.canPickup();
+        return payloadUsed() + build.block.size * build.block.size * Vars.tilesize * Vars.tilesize <= type.payloadCapacity + 0.001f && build.canPickup() && build.team == team;
     }
 
     boolean canPickupPayload(Payload pay){
-        return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f;
+        return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f && (type.pickupUnits || !(pay instanceof UnitPayload));
     }
 
     boolean hasPayload(){
@@ -50,8 +97,10 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     }
 
     void pickup(Unit unit){
+        if(unit.isAdded()) unit.team.data().updateCount(unit.type, 1);
+
         unit.remove();
-        payloads.add(new UnitPayload(unit));
+        addPayload(new UnitPayload(unit));
         Fx.unitPickup.at(unit);
         if(Vars.net.client()){
             Vars.netClient.clearRemovedEntity(unit.id);
@@ -62,7 +111,8 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     void pickup(Building tile){
         tile.pickedUp();
         tile.tile.remove();
-        payloads.add(new BuildPayload(tile));
+        tile.afterPickedUp();
+        addPayload(new BuildPayload(tile));
         Fx.unitPickup.at(tile);
         Events.fire(new PickupEvent(self(), tile));
     }
@@ -83,12 +133,12 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         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);
+        if(Vars.net.client() && payload instanceof UnitPayload u){
+            Vars.netClient.clearRemovedEntity(u.unit.id);
         }
 
         //drop off payload on an acceptor if possible
-        if(on != null && on.build != null && on.build.acceptPayload(on.build, payload)){
+        if(on != null && on.build != null && on.build.team == team && on.build.acceptPayload(on.build, payload)){
             Fx.unitDrop.at(on.build);
             on.build.handlePayload(on.build, payload);
             return true;
@@ -105,8 +155,12 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     boolean dropUnit(UnitPayload payload){
         Unit u = payload.unit;
 
+        //add random offset to prevent unit stacking
+        Tmp.v1.rnd(Mathf.random(2f));
+
         //can't drop ground units
-        if(!u.canPass(tileX(), tileY())){
+        //allow stacking for small units for now - otherwise, unit transfer would get annoying
+        if(!u.canPass(World.toTile(x + Tmp.v1.x), World.toTile(y + Tmp.v1.y)) || Units.count(x, y, u.physicSize(), o -> o.isGrounded() && o.hitSize > 14f) > 1){
             return false;
         }
 
@@ -115,14 +169,15 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         //clients do not drop payloads
         if(Vars.net.client()) return true;
 
-        u.set(this);
-        u.trns(Tmp.v1.rnd(Mathf.random(2f)));
+        u.set(x + Tmp.v1.x, y + Tmp.v1.y);
         u.rotation(rotation);
         //reset the ID to a new value to make sure it's synced
         u.id = EntityGroup.nextId();
         //decrement count to prevent double increment
         if(!u.isAdded()) u.team.data().updateCount(u.type, -1);
         u.add();
+        u.unloaded();
+        Events.fire(new PayloadDropEvent(self(), u));
 
         return true;
     }
@@ -133,15 +188,15 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         int tx = World.toTile(x - tile.block.offset), ty = 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, false)){
-            int rot = (int)((rotation + 45f) / 90f) % 4;
-            payload.place(on, rot);
+            payload.place(on, tile.rotation);
+            Events.fire(new PayloadDropEvent(self(), tile));
 
             if(getControllerName() != null){
                 payload.build.lastAccessed = getControllerName();
             }
 
             Fx.unitDrop.at(tile);
-            Fx.placeBlock.at(on.drawx(), on.drawy(), on.block().size);
+            on.block().placeEffect.at(on.drawx(), on.drawy(), on.block().size);
             return true;
         }
 
@@ -158,8 +213,8 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
             pad = (width - (itemSize) * items) / items;
         }
 
-        for (Payload p : payloads){
-            table.image(p.icon(Cicon.small)).size(itemSize).padRight(pad);
+        for(Payload p : payloads){
+            table.image(p.icon()).size(itemSize).padRight(pad);
         }
     }
 }
diff --git a/core/src/mindustry/entities/comp/PhysicsComp.java b/core/src/mindustry/entities/comp/PhysicsComp.java
index d68e392dca..1924de8eb9 100644
--- a/core/src/mindustry/entities/comp/PhysicsComp.java
+++ b/core/src/mindustry/entities/comp/PhysicsComp.java
@@ -11,7 +11,7 @@ import mindustry.gen.*;
  * Has mass.*/
 @Component
 abstract class PhysicsComp implements Velc, Hitboxc, Flyingc{
-    @Import float hitSize;
+    @Import float hitSize, x, y;
     @Import Vec2 vel;
 
     transient PhysicRef physref;
diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java
index 5e6c214cc6..834d4c239a 100644
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -7,9 +7,11 @@ import arc.math.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import arc.util.pooling.*;
+import mindustry.*;
+import mindustry.ai.*;
+import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
-import mindustry.core.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -19,7 +21,6 @@ import mindustry.net.Administration.*;
 import mindustry.net.*;
 import mindustry.net.Packets.*;
 import mindustry.ui.*;
-import mindustry.world.*;
 import mindustry.world.blocks.storage.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
@@ -32,23 +33,28 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
 
     @Import float x, y;
 
-    @ReadOnly Unit unit = Nulls.unit;
-    transient private Unit lastReadUnit = Nulls.unit;
+    @ReadOnly @Nullable Unit unit;
     transient @Nullable NetConnection con;
-
     @ReadOnly Team team = Team.sharded;
     @SyncLocal boolean typing, shooting, boosting;
-    boolean admin;
     @SyncLocal float mouseX, mouseY;
-    String name = "noname";
+    /** command the unit had before it was controlled. */
+    @Nullable @NoSync UnitCommand lastCommand;
+    boolean admin;
+    String name = "frog";
     Color color = new Color();
-
+    transient String locale = "en";
     transient float deathTimer;
     transient String lastText = "";
     transient float textFadeTime;
+    transient Ratekeeper itemDepositRate = new Ratekeeper();
+
+    transient private @Nullable Unit lastReadUnit;
+    transient private int wrongReadUnits;
+    transient @Nullable Unit justSwitchFrom, justSwitchTo;
 
     public boolean isBuilder(){
-        return unit.canBuild();
+        return unit != null && unit.canBuild();
     }
 
     public @Nullable CoreBuild closestCore(){
@@ -59,9 +65,15 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return team.core();
     }
 
+    /** @return largest/closest core, with largest cores getting priority */
+    @Nullable
+    public CoreBuild bestCore(){
+        return team.cores().min(Structs.comps(Structs.comparingInt(c -> -c.block.size), Structs.comparingFloat(c -> c.dst(x, y))));
+    }
+
     public TextureRegion icon(){
         //display default icon for dead players
-        if(dead()) return core() == null ? UnitTypes.alpha.icon(Cicon.full) : ((CoreBlock)core().block).unitType.icon(Cicon.full);
+        if(dead()) return core() == null ? UnitTypes.alpha.uiIcon : ((CoreBlock)bestCore().block).unitType.uiIcon;
 
         return unit.icon();
     }
@@ -76,8 +88,8 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         textFadeTime = 0f;
         x = y = 0f;
         if(!dead()){
-            unit.controller(unit.type.createController());
-            unit = Nulls.unit;
+            unit.resetController();
+            unit = null;
         }
     }
 
@@ -86,33 +98,55 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return isAdded();
     }
 
+    @Override
+    public boolean isLogicControllable(){
+        return false;
+    }
+
     @Replace
     public float clipSize(){
-        return unit.isNull() ? 20 : unit.type.hitSize * 2f;
+        return unit == null ? 20 : unit.type.hitSize * 2f;
     }
 
     @Override
     public void afterSync(){
+        //fix rubberbanding:
+        //when the player recs a unit that they JUST transitioned away from, use the new unit instead
+        //reason: we know the server is lying here, essentially skip the unit snapshot because we know the client's information is more recent
+        if(isLocal() && unit == justSwitchFrom && justSwitchFrom != null && justSwitchTo != null){
+            unit = justSwitchTo;
+            //if several snapshots have passed and this unit is still incorrect, something's wrong
+            if(++wrongReadUnits >= 2){
+                justSwitchFrom = null;
+                wrongReadUnits = 0;
+            }
+        }else{
+            justSwitchFrom = null;
+            justSwitchTo = null;
+            wrongReadUnits = 0;
+        }
+
         //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);
-        //extra precaution, necessary for non-synced things
-        unit.controller(this);
+        if(unit != null){
+            unit.aim(mouseX, mouseY);
+            //this is only necessary when the thing being controlled isn't synced
+            unit.controlWeapons(shooting, shooting);
+            //extra precaution, necessary for non-synced things
+            unit.controller(this);
+        }
     }
 
     @Override
     public void update(){
-        if(!unit.isValid()){
+        if(unit != null && !unit.isValid()){
             clearUnit();
         }
 
-        CoreBuild core = closestCore();
+        CoreBuild core;
 
         if(!dead()){
             set(unit);
@@ -121,10 +155,9 @@ 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, unit.onSolid() || boosting || (unit.isFlying() && !unit.canLand()) ? 1f : 0f, unit.type.riseSpeed);
             }
-        }else if(core != null){
+        }else if((core = bestCore()) != null){
             //have a small delay before death to prevent the camera from jumping around too quickly
             //(this is not for balance, it just looks better this way)
             deathTimer += Time.delta;
@@ -139,37 +172,62 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
 
     }
 
+    public void checkSpawn(){
+        CoreBuild core = bestCore();
+        if(core != null){
+            core.requestSpawn(self());
+        }
+    }
+
     @Override
     public void remove(){
         //clear unit upon removal
-        if(!unit.isNull()){
+        if(unit != null){
             clearUnit();
         }
+
+        lastReadUnit = null;
+        justSwitchTo = justSwitchFrom = null;
     }
 
     public void team(Team team){
         this.team = team;
-        unit.team(team);
+        if(unit != null){
+            unit.team(team);
+        }
     }
 
     public void clearUnit(){
-        unit(Nulls.unit);
+        unit(null);
     }
 
-    public Unit unit(){
+    public @Nullable Unit unit(){
         return unit;
     }
 
-    public void unit(Unit unit){
-        if(unit == null) throw new IllegalArgumentException("Unit cannot be null. Use clearUnit() instead.");
+    public void unit(@Nullable Unit unit){
+        //refuse to switch when the unit was just transitioned from
+        if(isLocal() && unit == justSwitchFrom && justSwitchFrom != null && justSwitchTo != null){
+            return;
+        }
+
         if(this.unit == unit) return;
 
-        if(this.unit != Nulls.unit){
+        //save last command this unit had
+        if(unit != null && unit.controller() instanceof CommandAI ai){
+            lastCommand = ai.command;
+        }
+
+        if(this.unit != null){
             //un-control the old unit
-            this.unit.controller(this.unit.type.createController());
+            this.unit.resetController();
+            //restore last command issued before it was controlled
+            if(lastCommand != null && this.unit.controller() instanceof CommandAI ai){
+                ai.command(lastCommand);
+            }
         }
         this.unit = unit;
-        if(unit != Nulls.unit){
+        if(unit != null){
             unit.team(team);
             unit.controller(this);
 
@@ -188,7 +246,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
     }
 
     boolean dead(){
-        return unit.isNull() || !unit.isValid();
+        return unit == null || !unit.isValid();
+    }
+
+    String ip(){
+        return con == null ? "localhost" : con.address;
     }
 
     String uuid(){
@@ -203,20 +265,26 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         con.kick(reason);
     }
 
+    void kick(KickReason reason, long duration){
+        con.kick(reason, duration);
+    }
+
     void kick(String reason){
         con.kick(reason);
     }
 
-    void kick(String reason, int duration){
+    void kick(String reason, long duration){
         con.kick(reason, duration);
     }
 
     @Override
     public void draw(){
+        if(unit == null || name == null || unit.inFogTo(Vars.player.team())) return;
+
         Draw.z(Layer.playerName);
         float z = Drawf.text();
 
-        Font font = Fonts.def;
+        Font font = Fonts.outline;
         GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
         final float nameHeight = 11;
         final float textHeight = 15;
@@ -250,9 +318,9 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
 
             layout.setText(font, text, Color.white, width, Align.bottom, true);
 
-            Draw.color(0f, 0f, 0f, 0.3f * (textFadeTime <= 0 || lastText == null  ? 1f : visualFadeTime));
-            Fill.rect(unit.x, unit.y + textHeight + layout.height - layout.height/2f, layout.width + 2, layout.height + 3);
-            font.draw(text, unit.x - width/2f, unit.y + textHeight + layout.height, width, Align.center, true);
+            Draw.color(0f, 0f, 0f, 0.3f * (textFadeTime <= 0 || lastText == null ? 1f : visualFadeTime));
+            Fill.rect(unit.x, unit.y + textHeight + layout.height - layout.height / 2f, layout.width + 2, layout.height + 3);
+            font.draw(text, unit.x - width / 2f, unit.y + textHeight + layout.height, width, Align.center, true);
         }
 
         Draw.reset();
@@ -264,30 +332,41 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         Draw.z(z);
     }
 
+    /** @return name with a markup color prefix */
+    String coloredName(){
+        return  "[#" + color.toString().toUpperCase() + "]" + name;
+    }
+
+    String plainName(){
+        return Strings.stripColors(name);
+    }
+
     void sendMessage(String text){
-        if(isLocal()){
-            if(ui != null){
-                ui.chatfrag.addMessage(text, null);
-            }
-        }else{
-            Call.sendMessage(con, text, null, null);
-        }
+        sendMessage(text, null, null);
     }
 
     void sendMessage(String text, Player from){
-        sendMessage(text, from, NetClient.colorizeName(from.id(), from.name));
+        sendMessage(text, from, null);
     }
 
-     void sendMessage(String text, Player from, String fromName){
+    void sendMessage(String text, Player from, String unformatted){
         if(isLocal()){
             if(ui != null){
-                ui.chatfrag.addMessage(text, fromName);
+                ui.chatfrag.addMessage(text);
             }
         }else{
-            Call.sendMessage(con, text, fromName, from);
+            Call.sendMessage(con, text, unformatted, from);
         }
     }
 
+    void sendUnformatted(String unformatted){
+        sendUnformatted(null, unformatted);
+    }
+
+    void sendUnformatted(Player from, String unformatted){
+        sendMessage(netServer.chatFormatter.format(from, unformatted), from, unformatted);
+    }
+
     PlayerInfo getInfo(){
         if(isLocal()){
             throw new IllegalArgumentException("Local players cannot be traced and do not have info.");
diff --git a/core/src/mindustry/entities/comp/PosComp.java b/core/src/mindustry/entities/comp/PosComp.java
index 6446c0f91f..3969abb537 100644
--- a/core/src/mindustry/entities/comp/PosComp.java
+++ b/core/src/mindustry/entities/comp/PosComp.java
@@ -5,6 +5,7 @@ import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
@@ -50,9 +51,9 @@ abstract class PosComp implements Position{
         return tile == null ? Blocks.air : tile.block();
     }
 
-    boolean onSolid(){
-        Tile tile = tileOn();
-        return tile == null || tile.solid();
+    @Nullable
+    Building buildOn(){
+        return world.buildWorld(x, y);
     }
 
     @Nullable
@@ -60,6 +61,11 @@ abstract class PosComp implements Position{
         return world.tileWorld(x, y);
     }
 
+    boolean onSolid(){
+        Tile tile = tileOn();
+        return tile == null || tile.solid();
+    }
+
     @Override
     public float getX(){
         return x;
diff --git a/core/src/mindustry/entities/comp/PowerGraphUpdaterComp.java b/core/src/mindustry/entities/comp/PowerGraphUpdaterComp.java
new file mode 100644
index 0000000000..66b1464eae
--- /dev/null
+++ b/core/src/mindustry/entities/comp/PowerGraphUpdaterComp.java
@@ -0,0 +1,16 @@
+package mindustry.entities.comp;
+
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.world.blocks.power.*;
+
+@EntityDef(value = PowerGraphUpdaterc.class, serialize = false, genio = false)
+@Component
+abstract class PowerGraphUpdaterComp implements Entityc{
+    public transient PowerGraph graph;
+
+    @Override
+    public void update(){
+        graph.update();
+    }
+}
diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java
index cefebe8307..a46bf01c32 100644
--- a/core/src/mindustry/entities/comp/PuddleComp.java
+++ b/core/src/mindustry/entities/comp/PuddleComp.java
@@ -1,6 +1,6 @@
 package mindustry.entities.comp;
 
-import arc.graphics.*;
+import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
@@ -8,7 +8,6 @@ import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
-import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
@@ -19,17 +18,29 @@ import static mindustry.entities.Puddles.*;
 
 @EntityDef(value = {Puddlec.class}, pooled = true)
 @Component(base = true)
-abstract class PuddleComp implements Posc, Puddlec, Drawc{
-    private static final int maxGeneration = 2;
-    private static final Color tmp = new Color();
+abstract class PuddleComp implements Posc, Puddlec, Drawc, Syncc{
     private static final Rect rect = new Rect(), rect2 = new Rect();
-    private static int seeds;
 
+    private static Puddle paramPuddle;
+    private static Cons<Unit> unitCons = unit -> {
+        if(unit.isGrounded() && !unit.hovering){
+            unit.hitbox(rect2);
+            if(rect.overlaps(rect2)){
+                unit.apply(paramPuddle.liquid.effect, 60 * 2);
+
+                if(unit.vel.len2() > 0.1f * 0.1f){
+                    Fx.ripple.at(unit.x, unit.y, unit.type.rippleScale, paramPuddle.liquid.color);
+                }
+            }
+        }
+    };
+
+    @Import int id;
     @Import float x, y;
+    @Import boolean added;
 
-    transient float accepting, updateTime, lastRipple;
+    transient float accepting, updateTime, lastRipple = Time.time + Mathf.random(40f), effectTime = Mathf.random(50f);
     float amount;
-    int generation;
     Tile tile;
     Liquid liquid;
 
@@ -39,84 +50,85 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
 
     @Override
     public void update(){
-        //update code
+        if(liquid == null || tile == null){
+            remove();
+            return;
+        }
+
         float addSpeed = accepting > 0 ? 3f : 0f;
 
         amount -= Time.delta * (1f - liquid.viscosity) / (5f + addSpeed);
         amount += accepting;
+        amount = Math.min(amount, maxLiquid);
         accepting = 0f;
 
-        if(amount >= maxLiquid / 1.5f && generation < maxGeneration){
-            float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f) * Time.delta;
+        if(amount >= maxLiquid / 1.5f){
+            float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f * Time.delta);
+            int targets = 0;
             for(Point2 point : Geometry.d4){
                 Tile other = world.tile(tile.x + point.x, tile.y + point.y);
-                if(other != null && other.block() == Blocks.air){
-                    Puddles.deposit(other, tile, liquid, deposited, generation + 1);
-                    amount -= deposited / 2f; //tweak to speed up/slow down Puddle propagation
+                if(other != null && (other.block() == Blocks.air || liquid.moveThroughBlocks)){
+                    targets ++;
+                    Puddles.deposit(other, tile, liquid, deposited, false);
                 }
             }
+            amount -= deposited * targets;
         }
 
-        amount = Mathf.clamp(amount, 0, maxLiquid);
+        if(liquid.capPuddles){
+            amount = Mathf.clamp(amount, 0, maxLiquid);
+        }
 
         if(amount <= 0f){
             remove();
+            return;
+        }
+
+        if(Puddles.get(tile) != self() && added){
+            //force removal without pool free
+            Groups.all.remove(self());
+            Groups.draw.remove(self());
+            Groups.puddle.remove(self());
+            added = false;
+            return;
         }
 
         //effects-only code
         if(amount >= maxLiquid / 2f && updateTime <= 0f){
-            Units.nearby(rect.setSize(Mathf.clamp(amount / (maxLiquid / 1.5f)) * 10f).setCenter(x, y), unit -> {
-                if(unit.isGrounded() && !unit.hovering){
-                    unit.hitbox(rect2);
-                    if(rect.overlaps(rect2)){
-                        unit.apply(liquid.effect, 60 * 2);
+            paramPuddle = self();
 
-                        if(unit.vel.len() > 0.1){
-                            Fx.ripple.at(unit.x, unit.y, unit.type.rippleScale, liquid.color);
-                        }
-                    }
-                }
-            });
+            Units.nearby(rect.setSize(Mathf.clamp(amount / (maxLiquid / 1.5f)) * 10f).setCenter(x, y), unitCons);
 
-            if(liquid.temperature > 0.7f && (tile.build != null) && Mathf.chance(0.5)){
+            if(liquid.temperature > 0.7f && tile.build != null && Mathf.chance(0.5)){
                 Fires.create(tile);
             }
 
             updateTime = 40f;
         }
 
+        if(!headless && liquid.particleEffect != Fx.none){
+            if((effectTime += Time.delta) >= liquid.particleSpacing){
+                float size = Mathf.clamp(amount / (maxLiquid / 1.5f)) * 4f;
+                liquid.particleEffect.at(x + Mathf.range(size), y + Mathf.range(size));
+                effectTime = 0f;
+            }
+        }
+
         updateTime -= Time.delta;
+
+        liquid.update(self());
     }
 
     @Override
     public void draw(){
         Draw.z(Layer.debris - 1);
 
-        seeds = id();
-        boolean onLiquid = tile.floor().isLiquid;
-        float f = Mathf.clamp(amount / (maxLiquid / 1.5f));
-        float smag = onLiquid ? 0.8f : 0f;
-        float sscl = 25f;
-
-        Draw.color(tmp.set(liquid.color).shiftValue(-0.05f));
-        Fill.circle(x + Mathf.sin(Time.time + seeds * 532, sscl, smag), y + Mathf.sin(Time.time + seeds * 53, sscl, smag), f * 8f);
-        Angles.randLenVectors(id(), 3, f * 6f, (ex, ey) -> {
-            Fill.circle(x + ex + Mathf.sin(Time.time + seeds * 532, sscl, smag),
-            y + ey + Mathf.sin(Time.time + seeds * 53, sscl, smag), f * 5f);
-            seeds++;
-        });
-        Draw.color();
-
-        if(liquid.lightColor.a > 0.001f && f > 0){
-            Color color = liquid.lightColor;
-            float opacity = color.a * f;
-            Drawf.light(Team.derelict, tile.drawx(), tile.drawy(),  30f * f, color, opacity * 0.8f);
-        }
+        liquid.drawPuddle(self());
     }
 
     @Replace
     public float clipSize(){
-        return 20;
+        return 50; //high for light drawing
     }
 
     @Override
@@ -128,4 +140,11 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
     public void afterRead(){
         Puddles.register(self());
     }
+
+    @Override
+    public void afterSync(){
+        if(liquid != null){
+            Puddles.register(self());
+        }
+    }
 }
diff --git a/core/src/mindustry/entities/comp/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java
index 5a489686ff..f2f6e4c808 100644
--- a/core/src/mindustry/entities/comp/ShieldComp.java
+++ b/core/src/mindustry/entities/comp/ShieldComp.java
@@ -1,32 +1,33 @@
 package mindustry.entities.comp;
 
 import arc.util.*;
+import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.*;
 import mindustry.gen.*;
-
-import static mindustry.Vars.*;
+import mindustry.type.*;
 
 @Component
 abstract class ShieldComp implements Healthc, Posc{
-    @Import float health, hitTime, x, y, healthMultiplier;
+    @Import float health, hitTime, x, y, healthMultiplier, armorOverride;
     @Import boolean dead;
+    @Import Team team;
+    @Import UnitType type;
 
     /** Absorbs health damage. */
     float shield;
-    /** Substracts an amount from damage. */
-    float armor;
+    /** Subtracts an amount from damage. No need to save. */
+    transient float armor;
     /** Shield opacity. */
     transient float shieldAlpha = 0f;
 
     @Replace
     @Override
     public void damage(float amount){
-        //apply armor
-        amount = Math.max(amount - armor, minArmorDamage * amount);
-        amount /= healthMultiplier;
-
-        rawDamage(amount);
+        //apply armor and scaling effects
+        rawDamage(Damage.applyArmor(amount, armorOverride >= 0f ? armorOverride : armor) / healthMultiplier / Vars.state.rules.unitHealth(team));
     }
 
     @Replace
@@ -34,16 +35,18 @@ abstract class ShieldComp implements Healthc, Posc{
     public void damagePierce(float amount, boolean withEffect){
         float pre = hitTime;
 
-        rawDamage(amount);
+        rawDamage(amount / healthMultiplier / Vars.state.rules.unitHealth(team));
 
         if(!withEffect){
             hitTime = pre;
         }
     }
 
-    private void rawDamage(float amount){
+    protected void rawDamage(float amount){
         boolean hadShields = shield > 0.0001f;
 
+        if(Float.isNaN(health)) health = 0f;
+
         if(hadShields){
             shieldAlpha = 1f;
         }
@@ -53,14 +56,14 @@ abstract class ShieldComp implements Healthc, Posc{
         hitTime = 1f;
         amount -= shieldDamage;
 
-        if(amount > 0){
+        if(amount > 0 && type.killable){
             health -= amount;
             if(health <= 0 && !dead){
                 kill();
             }
 
             if(hadShields && shield <= 0.0001f){
-                Fx.unitShieldBreak.at(x, y, 0, this);
+                Fx.unitShieldBreak.at(x, y, 0, type.shieldColor(self()), this);
             }
         }
     }
diff --git a/core/src/mindustry/entities/comp/StatusComp.java b/core/src/mindustry/entities/comp/StatusComp.java
index c4ea7be07a..4d3dd11dd0 100644
--- a/core/src/mindustry/entities/comp/StatusComp.java
+++ b/core/src/mindustry/entities/comp/StatusComp.java
@@ -16,12 +16,16 @@ import static mindustry.Vars.*;
 
 @Component
 abstract class StatusComp implements Posc, Flyingc{
-    private Seq<StatusEntry> statuses = new Seq<>();
+    private Seq<StatusEntry> statuses = new Seq<>(4);
     private transient Bits applied = new Bits(content.getBy(ContentType.status).size);
 
-    @ReadOnly transient float speedMultiplier = 1, damageMultiplier = 1, healthMultiplier = 1, reloadMultiplier = 1;
+    //these are considered read-only
+    //note: armor is a special case; it is an override when >= 0, otherwise ignored
+    transient float speedMultiplier = 1, damageMultiplier = 1, healthMultiplier = 1, reloadMultiplier = 1, buildSpeedMultiplier = 1, dragMultiplier = 1, armorOverride = -1f;
+    transient boolean disarmed = false;
 
     @Import UnitType type;
+    @Import float maxHealth;
 
     /** Apply a status effect for 1 tick (for permanent effects) **/
     void apply(StatusEffect effect){
@@ -32,6 +36,11 @@ abstract class StatusComp implements Posc, Flyingc{
     void apply(StatusEffect effect, float duration){
         if(effect == StatusEffects.none || effect == null || isImmune(effect)) return; //don't apply empty or immune effects
 
+        //unlock status effects regardless of whether they were applied to friendly units
+        if(state.isCampaign()){
+            effect.unlock();
+        }
+
         if(statuses.size > 0){
             //check for opposite effects
             for(int i = 0; i < statuses.size; i ++){
@@ -39,32 +48,40 @@ abstract class StatusComp implements Posc, Flyingc{
                 //extend effect
                 if(entry.effect == effect){
                     entry.time = Math.max(entry.time, duration);
+                    effect.applied(self(), entry.time, true);
                     return;
-                }else if(entry.effect.reactsWith(effect)){ //find opposite
-                    StatusEntry.tmp.effect = entry.effect;
-                    entry.effect.getTransition(self(), effect, entry.time, duration, StatusEntry.tmp);
-                    entry.time = StatusEntry.tmp.time;
-
-                    if(StatusEntry.tmp.effect != entry.effect){
-                        entry.effect = StatusEntry.tmp.effect;
-                    }
-
+                }else if(entry.effect.applyTransition(self(), effect, entry, duration)){ //find reaction
+                    //TODO effect may react with multiple other effects
                     //stop looking when one is found
                     return;
                 }
             }
         }
 
-        //otherwise, no opposites found, add direct effect
-        StatusEntry entry = Pools.obtain(StatusEntry.class, StatusEntry::new);
-        entry.set(effect, duration);
-        statuses.add(entry);
+        if(!effect.reactive){
+            //otherwise, no opposites found, add direct effect
+            StatusEntry entry = Pools.obtain(StatusEntry.class, StatusEntry::new);
+            entry.set(effect, duration);
+            statuses.add(entry);
+            effect.applied(self(), duration, false);
+        }
+    }
+
+    float getDuration(StatusEffect effect){
+        var entry = statuses.find(e -> e.effect == effect);
+        return entry == null ? 0 : entry.time;
+    }
+
+    void clearStatuses(){
+        statuses.each(e -> e.effect.onRemoved(self()));
+        statuses.clear();
     }
 
     /** Removes a status effect. */
     void unapply(StatusEffect effect){
         statuses.remove(e -> {
             if(e.effect == effect){
+                e.effect.onRemoved(self());
                 Pools.free(e);
                 return true;
             }
@@ -95,6 +112,62 @@ abstract class StatusComp implements Posc, Flyingc{
         return Tmp.c1.set(r / count, g / count, b / count, 1f);
     }
 
+    /**
+     * Applies a dynamic status effect, with stat multipliers that can be customized.
+     * @return the entry to write multipliers to. If the dynamic status was already applied, returns the previous entry.
+     * */
+    public StatusEntry applyDynamicStatus(){
+        if(hasEffect(StatusEffects.dynamic)){
+            StatusEntry entry = statuses.find(s -> s.effect.dynamic);
+            if(entry != null) return entry;
+        }
+
+        StatusEntry entry = Pools.obtain(StatusEntry.class, StatusEntry::new);
+        entry.set(StatusEffects.dynamic, Float.POSITIVE_INFINITY);
+        statuses.add(entry);
+        entry.effect.applied(self(), entry.time, false);
+        return entry;
+    }
+
+    /** Uses a dynamic status effect to override speed (in tiles/second). */
+    public void statusSpeed(float speed){
+        //type.speed should never be 0
+        applyDynamicStatus().speedMultiplier = speed / (type.speed * 60f / tilesize);
+    }
+
+    /** Uses a dynamic status effect to change damage. */
+    public void statusDamageMultiplier(float damageMultiplier){
+        applyDynamicStatus().damageMultiplier = damageMultiplier;
+    }
+
+    /** Uses a dynamic status effect to change reload. */
+    public void statusReloadMultiplier(float reloadMultiplier){
+        applyDynamicStatus().reloadMultiplier = reloadMultiplier;
+    }
+
+    /** Uses a dynamic status effect to override max health. */
+    public void statusMaxHealth(float health){
+        //maxHealth should never be zero
+        applyDynamicStatus().healthMultiplier = health / maxHealth;
+    }
+
+    /** Uses a dynamic status effect to override build speed. */
+    public void statusBuildSpeed(float buildSpeed){
+        //build speed should never be zero
+        applyDynamicStatus().buildSpeedMultiplier = buildSpeed / type.buildSpeed;
+    }
+
+    /** Uses a dynamic status effect to override drag. */
+    public void statusDrag(float drag){
+        //prevent divide by 0 (drag can be zero, if someone makes a broken unit)
+        applyDynamicStatus().dragMultiplier = type.drag == 0f ? 0f : drag / type.drag;
+    }
+
+    /** Uses a dynamic status effect to override armor. */
+    public void statusArmor(float armor){
+        applyDynamicStatus().armorOverride = armor;
+    }
+
     @Override
     public void update(){
         Floor floor = floorOn();
@@ -104,7 +177,9 @@ abstract class StatusComp implements Posc, Flyingc{
         }
 
         applied.clear();
-        speedMultiplier = damageMultiplier = healthMultiplier = reloadMultiplier = 1f;
+        armorOverride = -1f;
+        speedMultiplier = damageMultiplier = healthMultiplier = reloadMultiplier = buildSpeedMultiplier = dragMultiplier = 1f;
+        disarmed = false;
 
         if(statuses.isEmpty()) return;
 
@@ -116,24 +191,49 @@ abstract class StatusComp implements Posc, Flyingc{
             entry.time = Math.max(entry.time - Time.delta, 0);
 
             if(entry.effect == null || (entry.time <= 0 && !entry.effect.permanent)){
+                if(entry.effect != null){
+                    entry.effect.onRemoved(self());
+                }
+
                 Pools.free(entry);
                 index --;
                 statuses.remove(index);
             }else{
                 applied.set(entry.effect.id);
 
-                speedMultiplier *= entry.effect.speedMultiplier;
-                healthMultiplier *= entry.effect.healthMultiplier;
-                damageMultiplier *= entry.effect.damageMultiplier;
-                reloadMultiplier *= entry.effect.reloadMultiplier;
+                //TODO this is very ugly...
+                if(entry.effect.dynamic){
+                    speedMultiplier *= entry.speedMultiplier;
+                    healthMultiplier *= entry.healthMultiplier;
+                    damageMultiplier *= entry.damageMultiplier;
+                    reloadMultiplier *= entry.reloadMultiplier;
+                    buildSpeedMultiplier *= entry.buildSpeedMultiplier;
+                    dragMultiplier *= entry.dragMultiplier;
+                    //armor is a special case; many units have it set it to 0, so an override at values >= 0 is used
+                    if(entry.armorOverride >= 0f) armorOverride = entry.armorOverride;
+                }else{
+                    speedMultiplier *= entry.effect.speedMultiplier;
+                    healthMultiplier *= entry.effect.healthMultiplier;
+                    damageMultiplier *= entry.effect.damageMultiplier;
+                    reloadMultiplier *= entry.effect.reloadMultiplier;
+                    buildSpeedMultiplier *= entry.effect.buildSpeedMultiplier;
+                    dragMultiplier *= entry.effect.dragMultiplier;
+                }
+
+                disarmed |= entry.effect.disarm;
+
                 entry.effect.update(self(), entry.time);
             }
         }
     }
 
+    public Bits statusBits(){
+        return applied;
+    }
+
     public void draw(){
         for(StatusEntry e : statuses){
-            e.effect.draw(self());
+            e.effect.draw(self(), e.time);
         }
     }
 
diff --git a/core/src/mindustry/entities/comp/SyncComp.java b/core/src/mindustry/entities/comp/SyncComp.java
index 8875df0967..666dd67fb6 100644
--- a/core/src/mindustry/entities/comp/SyncComp.java
+++ b/core/src/mindustry/entities/comp/SyncComp.java
@@ -21,6 +21,14 @@ abstract class SyncComp implements Entityc{
     void afterSync(){}
     void interpolate(){}
 
+    boolean isSyncHidden(Player player){
+        return false;
+    }
+
+    void handleSyncHidden(){
+
+    }
+
     @Override
     public void update(){
         //interpolate the player if:
diff --git a/core/src/mindustry/entities/comp/TankComp.java b/core/src/mindustry/entities/comp/TankComp.java
new file mode 100644
index 0000000000..eb324b2158
--- /dev/null
+++ b/core/src/mindustry/entities/comp/TankComp.java
@@ -0,0 +1,128 @@
+package mindustry.entities.comp;
+
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.environment.*;
+
+import static mindustry.Vars.*;
+
+@Component
+abstract class TankComp implements Posc, Flyingc, Hitboxc, Unitc, ElevationMovec{
+    @Import float x, y, hitSize, rotation, speedMultiplier;
+    @Import boolean hovering, disarmed;
+    @Import UnitType type;
+    @Import Team team;
+
+    transient private float treadEffectTime, lastSlowdown = 1f;
+
+    transient float treadTime;
+    transient boolean walked;
+
+    @Override
+    public void update(){
+        //dust
+        if((walked || (net.client() && deltaLen() >= 0.01f)) && !headless && !inFogTo(player.team())){
+            treadEffectTime += Time.delta;
+            if(treadEffectTime >= 6f && type.treadRects.length > 0){
+                //first rect should always be at the back
+                var treadRect = type.treadRects[0];
+
+                float xOffset = (-(treadRect.x + treadRect.width/2f)) / 4f;
+                float yOffset = (-(treadRect.y + treadRect.height/2f)) / 4f;
+
+                for(int i : Mathf.signs){
+                    Tmp.v1.set(xOffset * i, yOffset - treadRect.height / 2f / 4f).rotate(rotation - 90);
+
+                    //TODO could fin for a while
+                    Effect.floorDustAngle(type.treadEffect, Tmp.v1.x + x, Tmp.v1.y + y, rotation + 180f);
+                }
+
+                treadEffectTime = 0f;
+            }
+        }
+
+        //calculate overlapping tiles so it slows down when going "over" walls
+        int r = Math.max((int)(hitSize * 0.6f / tilesize), 0);
+
+        int solids = 0, total = (r*2+1)*(r*2+1);
+        for(int dx = -r; dx <= r; dx++){
+            for(int dy = -r; dy <= r; dy++){
+                Tile t = Vars.world.tileWorld(x + dx*tilesize, y + dy*tilesize);
+                if(t == null || t.solid()){
+                    solids ++;
+                }
+
+                //TODO should this apply to the player team(s)? currently PvE due to balancing
+                if(type.crushDamage > 0 && !disarmed && (walked || deltaLen() >= 0.01f) && t != null
+                    //damage radius is 1 tile smaller to prevent it from just touching walls as it passes
+                    && Math.max(Math.abs(dx), Math.abs(dy)) <= r - 1){
+
+                    if(t.build != null && t.build.team != team){
+                        t.build.damage(team, type.crushDamage * Time.delta * t.block().crushDamageMultiplier * state.rules.unitDamage(team));
+                    }else if(t.block().unitMoveBreakable){
+                        ConstructBlock.deconstructFinish(t, t.block(), self());
+                    }
+                }
+            }
+        }
+
+        lastSlowdown = Mathf.lerp(1f, type.crawlSlowdown, Mathf.clamp((float)solids / total / type.crawlSlowdownFrac));
+
+        //trigger animation only when walking manually
+        if(walked || net.client()){
+            float len = deltaLen();
+            treadTime += len;
+            walked = false;
+        }
+    }
+
+    @Override
+    @Replace
+    public float floorSpeedMultiplier(){
+        Floor on = isFlying() || hovering ? Blocks.air.asFloor() : floorOn();
+        //TODO take into account extra blocks
+        return on.speedMultiplier * speedMultiplier * lastSlowdown;
+    }
+
+    @Replace
+    @Override
+    public @Nullable Floor drownFloor(){
+        //tanks can only drown when all the nearby floors are deep
+        //TODO implement properly
+        if(hitSize >= 12 && canDrown()){
+            for(Point2 p : Geometry.d8){
+                Floor f = world.floorWorld(x + p.x * tilesize, y + p.y * tilesize);
+                if(!f.isDeep()){
+                    return null;
+                }
+            }
+        }
+        return canDrown() ? floorOn() : null;
+    }
+
+    @Override
+    public void moveAt(Vec2 vector, float acceleration){
+        //mark walking state when moving in a controlled manner
+        if(!vector.isZero(0.001f)){
+            walked = true;
+        }
+    }
+
+    @Override
+    public void approach(Vec2 vector){
+        //mark walking state when moving in a controlled manner
+        if(!vector.isZero(0.001f)){
+            walked = true;
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/comp/TeamComp.java b/core/src/mindustry/entities/comp/TeamComp.java
index c58e97b7fd..1193f2ed4a 100644
--- a/core/src/mindustry/entities/comp/TeamComp.java
+++ b/core/src/mindustry/entities/comp/TeamComp.java
@@ -4,6 +4,7 @@ import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static mindustry.Vars.*;
 
@@ -17,18 +18,23 @@ abstract class TeamComp implements Posc{
         return team.rules().cheat;
     }
 
+    /** @return whether the center of this entity is visible to the viewing team. */
+    boolean inFogTo(Team viewer){
+        return this.team != viewer && !fogControl.isVisible(viewer, x, y);
+    }
+
     @Nullable
-    public Building core(){
+    public CoreBuild core(){
         return team.core();
     }
 
     @Nullable
-    public Building closestCore(){
+    public CoreBuild closestCore(){
         return state.teams.closestCore(x, y, team);
     }
 
     @Nullable
-    public Building closestEnemyCore(){
+    public CoreBuild closestEnemyCore(){
         return state.teams.closestEnemyCore(x, y, team);
     }
 }
diff --git a/core/src/mindustry/entities/comp/TimedKillComp.java b/core/src/mindustry/entities/comp/TimedKillComp.java
new file mode 100644
index 0000000000..d30480ac7c
--- /dev/null
+++ b/core/src/mindustry/entities/comp/TimedKillComp.java
@@ -0,0 +1,28 @@
+package mindustry.entities.comp;
+
+import arc.math.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+
+//basically just TimedComp but kills instead of removing.
+@Component
+abstract class TimedKillComp implements Entityc, Healthc, Scaled{
+    float time, lifetime;
+
+    //called last so pooling and removal happens then.
+    @MethodPriority(100)
+    @Override
+    public void update(){
+        time = Math.min(time + Time.delta, lifetime);
+
+        if(time >= lifetime){
+            kill();
+        }
+    }
+
+    @Override
+    public float fin(){
+        return time / lifetime;
+    }
+}
diff --git a/core/src/mindustry/entities/comp/TrailComp.java b/core/src/mindustry/entities/comp/TrailComp.java
deleted file mode 100644
index 420526256d..0000000000
--- a/core/src/mindustry/entities/comp/TrailComp.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package mindustry.entities.comp;
-
-import arc.math.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.type.*;
-
-@Component
-abstract class TrailComp implements Unitc{
-    @Import UnitType type;
-    @Import float x, y, rotation;
-
-    transient Trail trail = new Trail(6);
-
-    @Override
-    public void update(){
-        trail.length = type.trailLength;
-
-        float scale = elevation();
-        float offset = type.engineOffset/2f + type.engineOffset/2f*scale;
-
-        float cx = x + Angles.trnsx(rotation + 180, offset), cy = y + Angles.trnsy(rotation + 180, offset);
-        trail.update(cx, cy);
-    }
-}
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 81a604e455..eaef42f100 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -1,16 +1,16 @@
 package mindustry.entities.comp;
 
 import arc.*;
-import arc.func.*;
+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.ai.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.async.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
@@ -20,39 +20,82 @@ 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.*;
+import mindustry.world.blocks.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.payloads.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
+import static mindustry.logic.GlobalVars.*;
 
 @Component(base = true)
-abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged, Minerc, Builderc{
+abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable, Ranged, Minerc, Builderc, Senseable, Settable{
 
-    @Import boolean hovering, dead;
-    @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo, minFormationSpeed;
+    @Import boolean hovering, dead, disarmed;
+    @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, shield, ammo, dragMultiplier, armorOverride, speedMultiplier;
     @Import Team team;
     @Import int id;
     @Import @Nullable Tile mineTile;
     @Import Vec2 vel;
+    @Import WeaponMount[] mounts;
+    @Import ItemStack stack;
 
     private UnitController controller;
-    UnitType type;
+    Ability[] abilities = {};
+    UnitType type = UnitTypes.alpha;
     boolean spawnedByCore;
     double flag;
 
-    transient Seq<Ability> abilities = new Seq<>(0);
+    transient @Nullable Trail trail;
+    //TODO could be better represented as a unit
+    transient @Nullable UnitType dockedType;
+
+    transient String lastCommanded;
+    transient float shadowAlpha = -1f, healTime;
+    transient int lastFogPos;
     private transient float resupplyTime = Mathf.random(10f);
+    private transient boolean wasPlayer;
+    private transient boolean wasHealed;
+
+    /** Called when this unit was unloaded from a factory or spawn point. */
+    public void unloaded(){
+
+    }
+
+    public void updateBoosting(boolean boost){
+        if(!type.canBoost || dead) return;
+
+        elevation = Mathf.approachDelta(elevation, type.canBoost ? Mathf.num(boost || onSolid() || (isFlying() && !canLand())) : 0f, type.riseSpeed);
+    }
+
+    /** Move based on preferred unit movement type. */
+    public void movePref(Vec2 movement){
+        if(type.omniMovement){
+            moveAt(movement);
+        }else{
+            rotateMove(movement);
+        }
+    }
 
     public void moveAt(Vec2 vector){
         moveAt(vector, type.accel);
     }
 
     public void approach(Vec2 vector){
-        vel.approachDelta(vector, type.accel * realSpeed() * floorSpeedMultiplier());
+        vel.approachDelta(vector, type.accel * speed());
+    }
+
+    public void rotateMove(Vec2 vec){
+        moveAt(Tmp.v2.trns(rotation, vec.len()));
+
+        if(!vec.isZero()){
+            rotation = Angles.moveToward(rotation, vec.angle(), type.rotateSpeed * Time.delta * speedMultiplier);
+        }
     }
 
     public void aimLook(Position pos){
@@ -65,6 +108,20 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         lookAt(x, y);
     }
 
+    public boolean isPathImpassable(int tileX, int tileY){
+        return !type.flying && world.tiles.in(tileX, tileY) && type.pathCost.getCost(team.id, pathfinder.get(tileX, tileY)) == -1;
+    }
+
+    /** @return approx. square size of the physical hitbox for physics */
+    public float physicSize(){
+        return hitSize * 0.7f;
+    }
+
+    /** @return whether there is solid, un-occupied ground under this unit. */
+    public boolean canLand(){
+        return !onSolid() && Units.count(x, y, physicSize(), f -> f != self() && f.isGrounded()) == 0;
+    }
+
     public boolean inRange(Position other){
         return within(other, type.range);
     }
@@ -73,46 +130,77 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return type.hasWeapons();
     }
 
+    /** @return speed with boost & floor multipliers factored in. */
     public float speed(){
         float strafePenalty = isGrounded() || !isPlayer() ? 1f : Mathf.lerp(1f, type.strafePenalty, Angles.angleDist(vel().angle(), rotation) / 180f);
-        //limit speed to minimum formation speed to preserve formation
-        return (isCommanding() ? minFormationSpeed * 0.98f : type.speed) * strafePenalty;
-    }
-
-    /** @return speed with boost multipliers factored in. */
-    public float realSpeed(){
-        return Mathf.lerp(1f, type.canBoost ? type.boostMultiplier : 1f, elevation) * speed();
-    }
-
-    /** Iterates through this unit and everything it is controlling. */
-    public void eachGroup(Cons<Unit> cons){
-        cons.get(self());
-        controlling().each(cons);
+        float boost = Mathf.lerp(1f, type.canBoost ? type.boostMultiplier : 1f, elevation);
+        return type.speed * strafePenalty * boost * floorSpeedMultiplier();
     }
 
     /** @return where the unit wants to look at. */
     public float prefRotation(){
-        if(activelyBuilding()){
+        if(activelyBuilding() && type.rotateToBuilding){
             return angleTo(buildPlan());
         }else if(mineTile != null){
             return angleTo(mineTile);
-        }else if(moving()){
+        }else if(moving() && type.omniMovement){
             return vel().angle();
         }
         return rotation;
     }
 
+    @Override
+    public boolean displayable(){
+        return type.hoverable;
+    }
+
+    @Override
+    @Replace
+    public boolean isSyncHidden(Player player){
+        //shooting reveals position so bullets can be seen
+        return !isShooting() && inFogTo(player.team());
+    }
+
+    @Override
+    public void handleSyncHidden(){
+        remove();
+        netClient.clearRemovedEntity(id);
+    }
+
+    @Override
+    @Replace
+    public boolean inFogTo(Team viewer){
+        if(this.team == viewer || !state.rules.fog) return false;
+
+        if(hitSize <= 16f){
+            return !fogControl.isVisible(viewer, x, y);
+        }else{
+            //for large hitsizes, check around the unit instead
+            float trns = hitSize / 2f;
+            for(var p : Geometry.d8){
+                if(fogControl.isVisible(viewer, x + p.x * trns, y + p.y * trns)){
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
     @Override
     public float range(){
-        return type.range;
+        return type.maxRange;
     }
 
     @Replace
     public float clipSize(){
         if(isBuilding()){
-            return state.rules.infiniteResources ? Float.MAX_VALUE : Math.max(type.clipSize, type.region.width) + buildingRange + tilesize*4f;
+            return state.rules.infiniteResources ? Float.MAX_VALUE : Math.max(type.clipSize, type.region.width) + type.buildRange + tilesize*4f;
         }
-        return Math.max(type.region.width * 2f, type.clipSize);
+        if(mining()){
+            return type.clipSize + type.mineRange;
+        }
+        return type.clipSize;
     }
 
     @Override
@@ -122,23 +210,42 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             case itemCapacity -> type.itemCapacity;
             case rotation -> rotation;
             case health -> health;
+            case shield -> shield;
             case maxHealth -> maxHealth;
             case ammo -> !state.rules.unitAmmo ? type.ammoCapacity : ammo;
             case ammoCapacity -> type.ammoCapacity;
             case x -> World.conv(x);
             case y -> World.conv(y);
+            case velocityX -> vel.x * 60f / tilesize;
+            case velocityY -> vel.y * 60f / tilesize;
+            case dead -> dead || !isAdded() ? 1 : 0;
             case team -> team.id;
             case shooting -> isShooting() ? 1 : 0;
+            case boosting -> type.canBoost && isFlying() ? 1 : 0;
+            case range -> range() / tilesize;
             case shootX -> World.conv(aimX());
             case shootY -> World.conv(aimY());
+            case cameraX -> controller instanceof Player player ? World.conv(player.con == null ? Core.camera.position.x : player.con.viewX) : 0;
+            case cameraY -> controller instanceof Player player ? World.conv(player.con == null ? Core.camera.position.y : player.con.viewY) : 0;
+            case cameraWidth -> controller instanceof Player player ? World.conv(player.con == null ? Core.camera.width : player.con.viewWidth) : 0;
+            case cameraHeight -> controller instanceof Player player ? World.conv(player.con == null ? Core.camera.height : player.con.viewHeight) : 0;
             case mining -> mining() ? 1 : 0;
             case mineX -> mining() ? mineTile.x : -1;
             case mineY -> mining() ? mineTile.y : -1;
+            case armor -> armorOverride >= 0f ? armorOverride : armor;
             case flag -> flag;
-            case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0;
-            case commanded -> controller instanceof FormationAI ? 1 : 0;
-            case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0;
-            default -> 0;
+            case speed -> type.speed * 60f / tilesize * speedMultiplier;
+            case controlled -> !isValid() ? 0 :
+                    controller instanceof LogicAI ? ctrlProcessor :
+                    controller instanceof Player ? ctrlPlayer :
+                    controller instanceof CommandAI command && command.hasCommand() ? ctrlCommand :
+                    0;
+            case payloadCount -> ((Object)this) instanceof Payloadc pay ? pay.payloads().size : 0;
+            case totalPayload -> ((Object)this) instanceof Payloadc pay ? pay.payloadUsed() : 0;
+            case payloadCapacity -> type.payloadCapacity / tilePayload;
+            case size -> hitSize / tilesize;
+            case color -> Color.toDoubleBits(team.color.r, team.color.g, team.color.b, 1f);
+            default -> Float.NaN;
         };
     }
 
@@ -148,19 +255,101 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             case type -> type;
             case name -> controller instanceof Player p ? p.name : null;
             case firstItem -> stack().amount == 0 ? null : item();
-            case payloadType -> self() instanceof Payloadc pay ?
+            case controller -> !isValid() ? null : controller instanceof LogicAI log ? log.controller : this;
+            case payloadType -> ((Object)this) instanceof Payloadc pay ?
                 (pay.payloads().isEmpty() ? null :
                 pay.payloads().peek() instanceof UnitPayload p1 ? p1.unit.type :
                 pay.payloads().peek() instanceof BuildPayload p2 ? p2.block() : null) : null;
             default -> noSensed;
         };
-
     }
 
     @Override
     public double sense(Content content){
         if(content == stack().item) return stack().amount;
-        return 0;
+        if(content instanceof UnitType u){
+            return ((Object)this) instanceof Payloadc pay ?
+                    (pay.payloads().isEmpty() ? 0 :
+                    pay.payloads().count(p -> p instanceof UnitPayload up && up.unit.type == u)) : 0;
+        }
+        if(content instanceof Block b){
+            return ((Object)this) instanceof Payloadc pay ?
+                    (pay.payloads().isEmpty() ? 0 :
+                    pay.payloads().count(p -> p instanceof BuildPayload bp && bp.build.block == b)) : 0;
+        }
+        return Float.NaN;
+    }
+
+    @Override
+    public void setProp(LAccess prop, double value){
+        switch(prop){
+            case health -> {
+                health = (float)Mathf.clamp(value, 0, maxHealth);
+                if(health <= 0f && !dead){
+                    kill();
+                }
+            }
+            case shield -> shield = Math.max((float)value, 0f);
+            case x -> {
+                x = World.unconv((float)value);
+                if(!isLocal()) snapInterpolation();
+            }
+            case y -> {
+                y = World.unconv((float)value);
+                if(!isLocal()) snapInterpolation();
+            }
+            case velocityX -> vel.x = (float)(value * tilesize / 60d);
+            case velocityY -> vel.y = (float)(value * tilesize / 60d);
+            case rotation -> rotation = (float)value;
+            case team -> {
+                if(!net.client()){
+                    Team team = Team.get((int)value);
+                    if(controller instanceof Player p){
+                        p.team(team);
+                    }
+                    this.team = team;
+                }
+            }
+            case flag -> flag = value;
+            case speed -> statusSpeed(Math.max((float)value, 0f));
+            case armor -> statusArmor(Math.max((float)value, 0f));
+        }
+    }
+
+    @Override
+    public void setProp(LAccess prop, Object value){
+        switch(prop){
+            case team -> {
+                if(value instanceof Team t && !net.client()){
+                    if(controller instanceof Player p) p.team(t);
+                    team = t;
+                }
+            }
+            case payloadType -> {
+                //only serverside
+                if(((Object)this) instanceof Payloadc pay && !net.client()){
+                    if(value instanceof Block b){
+                        if(b.synthetic()){
+                            Building build = b.newBuilding().create(b, team());
+                            if(pay.canPickup(build)) pay.addPayload(new BuildPayload(build));
+                        }
+                    }else if(value instanceof UnitType ut){
+                        Unit unit = ut.create(team());
+                        if(pay.canPickup(unit)) pay.addPayload(new UnitPayload(unit));
+                    }else if(value == null && pay.payloads().size > 0){
+                        pay.payloads().pop();
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void setProp(UnlockableContent content, double value){
+        if(content instanceof Item item){
+            stack.item = item;
+            stack.amount = Mathf.clamp((int)value, 0, type.itemCapacity);
+        }
     }
 
     @Override
@@ -173,7 +362,24 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     @Replace
     public boolean canShoot(){
         //cannot shoot while boosting
-        return !(type.canBoost && isFlying());
+        return !disarmed && !(type.canBoost && isFlying());
+    }
+
+    public boolean isEnemy(){
+        return type.isEnemy;
+    }
+
+    @Override
+    @Replace
+    public boolean collides(Hitboxc other){
+        return hittable();
+    }
+
+    @Override
+    public void collision(Hitboxc other, float x, float y){
+        if(other instanceof Bullet bullet){
+            controller.hit(bullet);
+        }
     }
 
     @Override
@@ -198,7 +404,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     }
 
     public void resetController(){
-        controller(type.createController());
+        controller(type.createController(self()));
     }
 
     @Override
@@ -209,7 +415,12 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         controller(controller);
     }
 
-    /** @return pathfinder path type for calculating costs */
+    /** @return the collision layer to use for unit physics. Returning anything outside of PhysicsProcess contents will crash the game. */
+    public int collisionLayer(){
+        return type.allowLegStep && type.legPhysicsLayer ? PhysicsProcess.layerLegs : isGrounded() ? PhysicsProcess.layerGround : PhysicsProcess.layerFlying;
+    }
+
+    /** @return pathfinder path type for calculating costs. This is used for wave AI only. (TODO: remove) */
     public int pathType(){
         return Pathfinder.costGround;
     }
@@ -230,6 +441,26 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return controller instanceof AIController;
     }
 
+    public boolean isCommandable(){
+        return controller instanceof CommandAI;
+    }
+
+    public boolean canTarget(Unit other){
+        return other != null && other.checkTarget(type.targetAir, type.targetGround);
+    }
+
+    public CommandAI command(){
+        if(controller instanceof CommandAI ai){
+            return ai;
+        }else{
+            throw new IllegalArgumentException("Unit cannot be commanded - check isCommandable() first.");
+        }
+    }
+
+    public boolean isMissile(){
+        return this instanceof TimedKillc;
+    }
+
     public int count(){
         return team.data().countType(type);
     }
@@ -246,13 +477,24 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         this.hitSize = type.hitSize;
         this.hovering = type.hovering;
 
-        if(controller == null) controller(type.createController());
+        if(controller == null) controller(type.createController(self()));
         if(mounts().length != type.weapons.size) setupWeapons(type);
-        if(abilities.size != type.abilities.size){
-            abilities = type.abilities.map(Ability::copy);
+        if(abilities.length != type.abilities.size){
+            abilities = new Ability[type.abilities.size];
+            for(int i = 0; i < type.abilities.size; i ++){
+                abilities[i] = type.abilities.get(i).copy();
+            }
         }
     }
 
+    public boolean targetable(Team targeter){
+        return type.targetable(self(), targeter);
+    }
+
+    public boolean hittable(){
+        return type.hittable(self());
+    }
+
     @Override
     public void afterSync(){
         //set up type info after reading
@@ -264,7 +506,14 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     public void afterRead(){
         afterSync();
         //reset controller state
-        controller(type.createController());
+        if(!(controller instanceof AIController ai && ai.keepState())){
+            controller(type.createController(self()));
+        }
+    }
+
+    @Override
+    public void afterAllRead(){
+        controller.afterRead(self());
     }
 
     @Override
@@ -272,7 +521,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         team.data().updateCount(type, 1);
 
         //check if over unit cap
-        if(count() > cap() && !spawnedByCore && !dead){
+        if(type.useUnitCap && count() > cap() && !spawnedByCore && !dead && !state.rules.editor){
             Call.unitCapDeath(self());
             team.data().updateCount(type, -1);
         }
@@ -283,22 +532,55 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     public void remove(){
         team.data().updateCount(type, -1);
         controller.removed(self());
+
+        //make sure trail doesn't just go poof
+        if(trail != null && trail.size() > 0){
+            Fx.trailFade.at(x, y, trail.width(), type.trailColor == null ? team.color : type.trailColor, trail.copy());
+        }
     }
 
     @Override
     public void landed(){
-        if(type.landShake > 0f){
-            Effect.shake(type.landShake, type.landShake, this);
+        if(type.mechLandShake > 0f){
+            Effect.shake(type.mechLandShake, type.mechLandShake, this);
         }
 
         type.landed(self());
     }
 
+    @Override
+    public void heal(float amount){
+        if(health < maxHealth && amount > 0){
+            wasHealed = true;
+        }
+    }
+
     @Override
     public void update(){
 
         type.update(self());
 
+        if(wasHealed && healTime <= -1f){
+            healTime = 1f;
+        }
+        healTime -= Time.delta / 20f;
+        wasHealed = false;
+
+        //die on captured sectors immediately
+        if(team.isOnlyAI() && state.isCampaign() && state.getSector().isCaptured()){
+            kill();
+        }
+
+        if(!headless && type.loopSound != Sounds.none){
+            control.sound.loop(type.loopSound, this, type.loopSoundVolume);
+        }
+
+        //check if environment is unsupported
+        if(!type.supportsEnv(state.rules.env) && !dead){
+            Call.unitEnvDeath(self());
+            team.data().updateCount(type, -1);
+        }
+
         if(state.rules.unitAmmo && ammo < type.ammoCapacity - 0.0001f){
             resupplyTime += Time.delta;
 
@@ -309,20 +591,28 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             }
         }
 
-        if(abilities.size > 0){
-            for(Ability a : abilities){
-                a.update(self());
-            }
+        for(Ability a : abilities){
+            a.update(self());
         }
 
-        drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f);
+        if(trail != null){
+            trail.length = type.trailLength;
+
+            float scale = type.useEngineElevation ? elevation : 1f;
+            float offset = type.engineOffset/2f + type.engineOffset/2f*scale;
+
+            float cx = x + Angles.trnsx(rotation + 180, offset), cy = y + Angles.trnsy(rotation + 180, offset);
+            trail.update(cx, cy);
+        }
+
+        drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f) * dragMultiplier * state.rules.dragMultiplier;
 
         //apply knockback based on spawns
-        if(team != state.rules.waveTeam && state.hasSpawns() && (!net.client() || isLocal())){
+        if(team != state.rules.waveTeam && state.hasSpawns() && (!net.client() || isLocal()) && hittable()){
             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));
+                    velAddNet(Tmp.v1.set(this).sub(spawn.worldx(), spawn.worldy()).setLength(0.1f + 1f - dst(spawn) / relativeSize).scl(0.45f * Time.delta));
                 }
             }
         }
@@ -334,15 +624,15 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
             //standard fall smoke
             if(Mathf.chanceDelta(0.1)){
-                Tmp.v1.setToRandomDirection().scl(hitSize);
+                Tmp.v1.rnd(Mathf.range(hitSize));
                 type.fallEffect.at(x + Tmp.v1.x, y + Tmp.v1.y);
             }
 
             //thruster fall trail
             if(Mathf.chanceDelta(0.2)){
-                float offset = type.engineOffset/2f + type.engineOffset/2f*elevation;
+                float offset = type.engineOffset/2f + type.engineOffset/2f * elevation;
                 float range = Mathf.range(type.engineSize);
-                type.fallThrusterEffect.at(
+                type.fallEngineEffect.at(
                     x + Angles.trnsx(rotation + 180, offset) + Mathf.range(range),
                     y + Angles.trnsy(rotation + 180, offset) + Mathf.range(range),
                     Mathf.random()
@@ -352,8 +642,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             //move down
             elevation -= type.fallSpeed * Time.delta;
 
-            if(isGrounded()){
-                destroy();
+            if(isGrounded() || health <= -maxHealth){
+                Call.unitDestroy(id);
             }
         }
 
@@ -398,41 +688,57 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         }
     }
 
-    /** @return a preview icon for this unit. */
+    /** @return a preview UI icon for this unit. */
     public TextureRegion icon(){
-        return type.icon(Cicon.full);
+        return type.uiIcon;
     }
 
     /** Actually destroys the unit, removing it and creating explosions. **/
     public void destroy(){
-        if(!isAdded()) return;
+        if(!isAdded() || !type.killable) return;
 
         float explosiveness = 2f + item().explosiveness * stack().amount * 1.53f;
         float flammability = item().flammability * stack().amount / 1.9f;
+        float power = item().charge * Mathf.pow(stack().amount, 1.11f) * 160f;
 
         if(!spawnedByCore){
-            Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, state.rules.damageExplosions, item().flammability > 1, team);
+            Damage.dynamicExplosion(x, y, flammability, explosiveness, power, (bounds() + type.legLength/1.7f) / 2f, state.rules.damageExplosions && state.rules.unitCrashDamage(team) > 0, item().flammability > 1, team, type.deathExplosionEffect);
+        }else{
+            type.deathExplosionEffect.at(x, y, bounds() / 2f / 8f);
         }
 
-        float shake = hitSize / 3f;
+        float shake = type.deathShake < 0 ? hitSize / 3f : type.deathShake;
 
-        Effect.scorch(x, y, (int)(hitSize / 5));
-        Fx.explosion.at(this);
+        if(type.createScorch){
+            Effect.scorch(x, y, (int)(hitSize / 5));
+        }
         Effect.shake(shake, shake, this);
         type.deathSound.at(this);
 
         Events.fire(new UnitDestroyEvent(self()));
 
-        if(explosiveness > 7f && isLocal()){
+        if(explosiveness > 7f && (isLocal() || wasPlayer)){
             Events.fire(Trigger.suicideBomb);
         }
 
-        //if this unit crash landed (was flying), damage stuff in a radius
-        if(type.flying && !spawnedByCore){
-            Damage.damage(team,x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f, true, false, true);
+        for(WeaponMount mount : mounts){
+            if(mount.weapon.shootOnDeath && !(mount.weapon.bullet.killShooter && mount.totalShots > 0)){
+                mount.reload = 0f;
+                mount.shoot = true;
+                mount.weapon.update(self(), mount);
+            }
         }
 
-        if(!headless){
+        //if this unit crash landed (was flying), damage stuff in a radius
+        if(type.flying && !spawnedByCore && type.createWreck && state.rules.unitCrashDamage(team) > 0){
+            var shields = indexer.getEnemy(team, BlockFlag.shield);
+            float crashDamage = Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f * state.rules.unitCrashDamage(team);
+            if(shields.isEmpty() || !shields.contains(b -> b instanceof ExplosionShield s && s.absorbExplosion(x, y, crashDamage))){
+                Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, crashDamage, true, false, true);
+            }
+        }
+
+        if(!headless && type.createScorch){
             for(int i = 0; i < type.wreckRegions.length; i++){
                 if(type.wreckRegions[i].found()){
                     float range = type.hitSize /4f;
@@ -442,15 +748,20 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             }
         }
 
+        for(Ability a : abilities){
+            a.death(self());
+        }
+
+        type.killed(self());
+
         remove();
     }
 
     /** @return name of direct or indirect player controller. */
     @Override
     public @Nullable String getControllerName(){
-        if(isPlayer()) return getPlayer().name;
+        if(isPlayer()) return getPlayer().coloredName();
         if(controller instanceof LogicAI ai && ai.controller != null) return ai.controller.lastAccessed;
-        if(controller instanceof FormationAI ai && ai.leader != null && ai.leader.isPlayer()) return ai.leader.getPlayer().name;
         return null;
     }
 
@@ -481,11 +792,12 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     @Override
     public void killed(){
-        health = 0;
+        wasPlayer = isLocal();
+        health = Math.min(health, 0);
         dead = true;
 
         //don't waste time when the unit is already on the ground, just destroy it
-        if(!type.flying){
+        if(!type.flying || !type.createWreck){
             destroy();
         }
     }
@@ -493,9 +805,15 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     @Override
     @Replace
     public void kill(){
-        if(dead || net.client()) return;
+        if(dead || net.client() || !type.killable) return;
 
         //deaths are synced; this calls killed()
         Call.unitDeath(id);
     }
+
+    @Override
+    @Replace
+    public String toString(){
+        return "Unit#" + id() + ":" + type + " (" + x + ", " + y + ")";
+    }
 }
diff --git a/core/src/mindustry/entities/comp/UnitTetherComp.java b/core/src/mindustry/entities/comp/UnitTetherComp.java
new file mode 100644
index 0000000000..7c1a703997
--- /dev/null
+++ b/core/src/mindustry/entities/comp/UnitTetherComp.java
@@ -0,0 +1,39 @@
+package mindustry.entities.comp;
+
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+/** A unit that depends on a units's existence; if that unit is removed, it despawns. */
+@Component
+abstract class UnitTetherComp implements Unitc{
+    @Import UnitType type;
+    @Import Team team;
+
+    //spawner unit cannot be read directly for technical reasons.
+    public transient @Nullable Unit spawner;
+    public int spawnerUnitId = -1;
+
+    @Override
+    public void afterRead(){
+        if(spawnerUnitId != -1) spawner = Groups.unit.getByID(spawnerUnitId);
+        spawnerUnitId = -1;
+    }
+
+    @Override
+    public void afterSync(){
+        if(spawnerUnitId != -1) spawner = Groups.unit.getByID(spawnerUnitId);
+        spawnerUnitId = -1;
+    }
+
+    @Override
+    public void update(){
+        if(spawner == null || !spawner.isValid() || spawner.team != team){
+            Call.unitDespawn(self());
+        }else{
+            spawnerUnitId = spawner.id;
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/comp/VelComp.java b/core/src/mindustry/entities/comp/VelComp.java
index ca04d6a40c..8be3a30151 100644
--- a/core/src/mindustry/entities/comp/VelComp.java
+++ b/core/src/mindustry/entities/comp/VelComp.java
@@ -13,16 +13,24 @@ import static mindustry.Vars.*;
 abstract class VelComp implements Posc{
     @Import float x, y;
 
-    //TODO @SyncLocal this? does it even need to be sent?
-    transient final Vec2 vel = new Vec2();
+    @SyncLocal Vec2 vel = new Vec2();
+
     transient float drag = 0f;
 
     //velocity needs to be called first, as it affects delta and lastPosition
     @MethodPriority(-1)
     @Override
     public void update(){
-        move(vel.x * Time.delta, vel.y * Time.delta);
-        vel.scl(Mathf.clamp(1f - drag * Time.delta));
+        //do not update velocity on the client at all, unless it's non-interpolated
+        //velocity conflicts with interpolation.
+        if(!net.client() || isLocal()){
+            float px = x, py = y;
+            move(vel.x * Time.delta, vel.y * Time.delta);
+            if(Mathf.equal(px, x)) vel.x = 0;
+            if(Mathf.equal(py, y)) vel.y = 0;
+
+            vel.scl(Math.max(1f - drag * Time.delta, 0));
+        }
     }
 
     /** @return function to use for check solid state. if null, no checking is done. */
@@ -46,6 +54,10 @@ abstract class VelComp implements Posc{
         return !vel.isZero(0.01f);
     }
 
+    void move(Vec2 v){
+        move(v.x, v.y);
+    }
+
     void move(float cx, float cy){
         SolidPred check = solidity();
 
@@ -56,4 +68,20 @@ abstract class VelComp implements Posc{
             y += cy;
         }
     }
+
+    void velAddNet(Vec2 v){
+        vel.add(v);
+        if(isRemote()){
+            x += v.x;
+            y += v.y;
+        }
+    }
+
+    void velAddNet(float vx, float vy){
+        vel.add(vx, vy);
+        if(isRemote()){
+            x += vx;
+            y += vy;
+        }
+    }
 }
diff --git a/core/src/mindustry/entities/comp/WaterMoveComp.java b/core/src/mindustry/entities/comp/WaterMoveComp.java
index 69d178f41d..9509b891f6 100644
--- a/core/src/mindustry/entities/comp/WaterMoveComp.java
+++ b/core/src/mindustry/entities/comp/WaterMoveComp.java
@@ -15,10 +15,11 @@ import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
-//just a proof of concept
+import static mindustry.Vars.*;
+
 @Component
 abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
-    @Import float x, y, rotation;
+    @Import float x, y, rotation, speedMultiplier;
     @Import UnitType type;
 
     private transient Trail tleft = new Trail(1), tright = new Trail(1);
@@ -26,13 +27,14 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
 
     @Override
     public void update(){
+        boolean flying = isFlying();
         for(int i = 0; i < 2; i++){
             Trail t = i == 0 ? tleft : tright;
             t.length = type.trailLength;
 
             int sign = i == 0 ? -1 : 1;
-            float cx = Angles.trnsx(rotation - 90, type.trailX * sign, type.trailY) + x, cy = Angles.trnsy(rotation - 90, type.trailX * sign, type.trailY) + y;
-            t.update(cx, cy);
+            float cx = Angles.trnsx(rotation - 90, type.waveTrailX * sign, type.waveTrailY) + x, cy = Angles.trnsy(rotation - 90, type.waveTrailX * sign, type.waveTrailY) + y;
+            t.update(cx, cy, world.floorWorld(cx, cy).isLiquid && !flying ? 1 : 0);
         }
     }
 
@@ -42,6 +44,13 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
         return Pathfinder.costNaval;
     }
 
+    //don't want obnoxious splashing
+    @Override
+    @Replace
+    public boolean emitWalkSound(){
+        return false;
+    }
+
     @Override
     public void add(){
         tleft.clear();
@@ -70,10 +79,16 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
         return isFlying() ? null : EntityCollisions::waterSolid;
     }
 
+    @Replace
+    @Override
+    public boolean onSolid(){
+        return EntityCollisions.waterSolid(tileX(), tileY());
+    }
+
     @Replace
     public float floorSpeedMultiplier(){
         Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();
-        return on.isDeep() ? 1.3f : 1f;
+        return (on.shallow ? 1f : 1.3f) * speedMultiplier;
     }
 
     public boolean onLiquid(){
diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java
index 9cc5f8487a..e3de8b484a 100644
--- a/core/src/mindustry/entities/comp/WeaponsComp.java
+++ b/core/src/mindustry/entities/comp/WeaponsComp.java
@@ -1,27 +1,18 @@
 package mindustry.entities.comp;
 
-import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.audio.*;
-import mindustry.entities.*;
-import mindustry.entities.bullet.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 
-import static mindustry.Vars.*;
-
 @Component
 abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
-    @Import float x, y, rotation, reloadMultiplier;
-    @Import Vec2 vel;
+    @Import float x, y;
+    @Import boolean disarmed;
     @Import UnitType type;
 
-    /** temporary weapon sequence number */
-    static int sequenceNum = 0;
-
     /** weapon mount array, never null */
     @SyncLocal WeaponMount[] mounts = {};
     @ReadOnly transient boolean isRotate;
@@ -42,7 +33,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
     void setupWeapons(UnitType def){
         mounts = new WeaponMount[def.weapons.size];
         for(int i = 0; i < mounts.length; i++){
-            mounts[i] = new WeaponMount(def.weapons.get(i));
+            mounts[i] = def.weapons.get(i).mountType.get(def.weapons.get(i));
         }
     }
 
@@ -52,8 +43,10 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
 
     void controlWeapons(boolean rotate, boolean shoot){
         for(WeaponMount mount : mounts){
-            mount.rotate = rotate;
-            mount.shoot = shoot;
+            if(mount.weapon.controllable){
+                mount.rotate = rotate;
+                mount.shoot = shoot;
+            }
         }
         isRotate = rotate;
         isShooting = shoot;
@@ -72,8 +65,10 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
         y = Tmp.v1.y + this.y;
 
         for(WeaponMount mount : mounts){
-            mount.aimX = x;
-            mount.aimY = y;
+            if(mount.weapon.controllable){
+                mount.aimX = x;
+                mount.aimY = y;
+            }
         }
 
         aimX = x;
@@ -81,13 +76,13 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
     }
 
     boolean canShoot(){
-        return true;
+        return !disarmed;
     }
 
     @Override
     public void remove(){
         for(WeaponMount mount : mounts){
-            if(mount.bullet != null){
+            if(mount.weapon.continuous && mount.bullet != null && mount.bullet.owner == self()){
                 mount.bullet.time = mount.bullet.lifetime - 10f;
                 mount.bullet = null;
             }
@@ -101,136 +96,8 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
     /** 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.type != weapon.bullet){
-                    mount.bullet = null;
-                }else{
-                    mount.bullet.rotation(weaponRotation + 90);
-                    mount.bullet.set(shootX, shootY);
-                    mount.reload = weapon.reload;
-                    vel.add(Tmp.v1.trns(rotation + 180f, mount.bullet.type.recoil));
-                    if(weapon.shootSound != Sounds.none && !headless){
-                        if(mount.sound == null) mount.sound = new SoundLoop(weapon.shootSound, 1f);
-                        mount.sound.update(x, y, true);
-                    }
-                }
-            }else{
-                //heat decreases when not firing
-                mount.heat = Math.max(mount.heat - Time.delta * reloadMultiplier / mount.weapon.cooldownTime, 0);
-
-                if(mount.sound != null){
-                    mount.sound.update(x, y, false);
-                }
-            }
-
-            //flip weapon shoot side for alternating weapons at half reload
-            if(weapon.otherSide != -1 && weapon.alternate && mount.side == weapon.flipSprite &&
-                mount.reload + Time.delta * reloadMultiplier > weapon.reload/2f && mount.reload <= weapon.reload/2f){
-                mounts[weapon.otherSide].side = !mounts[weapon.otherSide].side;
-                mount.side = !mount.side;
-            }
-
-            //rotate if applicable
-            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) - this.rotation;
-                mount.rotation = Angles.moveToward(mount.rotation, mount.targetRotation, weapon.rotateSpeed * Time.delta);
-            }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
-            ){
-                shoot(mount, shootX, shootY, mount.aimX, mount.aimY, mountX, mountY, shootAngle, Mathf.sign(weapon.x));
-
-                mount.reload = weapon.reload;
-
-                ammo--;
-                if(ammo < 0) ammo = 0;
-            }
+            mount.weapon.update(self(), mount);
         }
     }
-
-    private void shoot(WeaponMount mount, float x, float y, float aimX, float aimY, float mountX, float mountY, float rotation, int side){
-        Weapon weapon = mount.weapon;
-
-        float baseX = this.x, baseY = this.y;
-        boolean delay = weapon.firstShotDelay + weapon.shotDelay > 0f;
-
-        (delay ? weapon.chargeSound : weapon.continuous ? Sounds.none : weapon.shootSound).at(x, y, Mathf.random(weapon.soundPitchMin, weapon.soundPitchMax));
-
-        BulletType ammo = weapon.bullet;
-        float lifeScl = ammo.scaleVelocity ? Mathf.clamp(Mathf.dst(x, y, aimX, aimY) / ammo.range()) : 1f;
-
-        sequenceNum = 0;
-        if(delay){
-            Angles.shotgun(weapon.shots, weapon.spacing, rotation, f -> {
-                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 -> mount.bullet = bullet(weapon, x, y, f + Mathf.range(weapon.inaccuracy), lifeScl));
-        }
-
-        boolean parentize = ammo.keepVelocity;
-
-        if(delay){
-            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;
-                if(!weapon.continuous){
-                    weapon.shootSound.at(x, y, Mathf.random(weapon.soundPitchMin, weapon.soundPitchMax));
-                }
-            });
-        }else{
-            vel.add(Tmp.v1.trns(rotation + 180f, ammo.recoil));
-            Effect.shake(weapon.shake, weapon.shake, x, y);
-            mount.heat = 1f;
-        }
-
-        weapon.ejectEffect.at(mountX, mountY, 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 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/comp/WorldLabelComp.java b/core/src/mindustry/entities/comp/WorldLabelComp.java
new file mode 100644
index 0000000000..4b7401826b
--- /dev/null
+++ b/core/src/mindustry/entities/comp/WorldLabelComp.java
@@ -0,0 +1,72 @@
+package mindustry.entities.comp;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.pooling.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+
+/** Component/entity for labels in world space. Useful for servers. Does not save in files - create only on world load. */
+@EntityDef(value = {WorldLabelc.class}, serialize = false)
+@Component(base = true)
+public abstract class WorldLabelComp implements Posc, Drawc, Syncc{
+    @Import int id;
+    @Import float x, y;
+
+    public static final byte flagBackground = 1, flagOutline = 2;
+
+    public String text = "sample text";
+    public float fontSize = 1f, z = Layer.playerName + 1;
+    /** Flags are packed into a byte for sync efficiency; see the flag static values. */
+    public byte flags = flagBackground | flagOutline;
+
+    @Replace
+    public float clipSize(){
+        return text.length() * 10f * fontSize;
+    }
+
+    @Override
+    public void draw(){
+        drawAt(text, x, y, z, flags, fontSize);
+    }
+
+    public static void drawAt(String text, float x, float y, float layer, int flags, float fontSize){
+        Draw.z(layer);
+        float z = Drawf.text();
+
+        Font font = (flags & flagOutline) != 0 ? Fonts.outline : Fonts.def;
+        GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
+
+        boolean ints = font.usesIntegerPositions();
+        font.setUseIntegerPositions(false);
+        font.getData().setScale(0.25f / Scl.scl(1f) * fontSize);
+        layout.setText(font, text);
+
+        if((flags & flagBackground) != 0){
+            Draw.color(0f, 0f, 0f, 0.3f);
+            Fill.rect(x, y - layout.height / 2, layout.width + 2, layout.height + 3);
+            Draw.color();
+        }
+
+        font.setColor(Color.white);
+        font.draw(text, x, y, 0, Align.center, false);
+
+        Draw.reset();
+        Pools.free(layout);
+        font.getData().setScale(1f);
+        font.setColor(Color.white);
+        font.setUseIntegerPositions(ints);
+
+        Draw.z(z);
+    }
+
+    /** This MUST be called instead of remove()! */
+    public void hide(){
+        remove();
+        Call.removeWorldLabel(id);
+    }
+}
diff --git a/core/src/mindustry/entities/effect/ExplosionEffect.java b/core/src/mindustry/entities/effect/ExplosionEffect.java
new file mode 100644
index 0000000000..352e676f9c
--- /dev/null
+++ b/core/src/mindustry/entities/effect/ExplosionEffect.java
@@ -0,0 +1,47 @@
+package mindustry.entities.effect;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.entities.*;
+import mindustry.graphics.*;
+
+import static arc.graphics.g2d.Draw.*;
+import static arc.graphics.g2d.Lines.*;
+import static arc.math.Angles.*;
+
+public class ExplosionEffect extends Effect{
+    public Color waveColor = Pal.missileYellow, smokeColor = Color.gray, sparkColor = Pal.missileYellowBack;
+    public float waveLife = 6f, waveStroke = 3f, waveRad = 15f, waveRadBase = 2f, sparkStroke = 1f, sparkRad = 23f, sparkLen = 3f, smokeSize = 4f, smokeSizeBase = 0.5f, smokeRad = 23f;
+    public int smokes = 5, sparks = 4;
+
+    public ExplosionEffect(){
+        clip = 100f;
+        lifetime = 22;
+
+        renderer = e -> {
+            color(waveColor);
+
+            e.scaled(waveLife, i -> {
+                stroke(waveStroke * i.fout());
+                Lines.circle(e.x, e.y, waveRadBase + i.fin() * waveRad);
+            });
+
+            color(smokeColor);
+
+            if(smokeSize > 0){
+                randLenVectors(e.id, smokes, 2f + smokeRad * e.finpow(), (x, y) -> {
+                    Fill.circle(e.x + x, e.y + y, e.fout() * smokeSize + smokeSizeBase);
+                });
+            }
+
+            color(sparkColor);
+            stroke(e.fout() * sparkStroke);
+
+            randLenVectors(e.id + 1, sparks, 1f + sparkRad * e.finpow(), (x, y) -> {
+                lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * sparkLen);
+                Drawf.light(e.x + x, e.y + y, e.fout() * sparkLen * 4f, sparkColor, 0.7f);
+            });
+        };
+    }
+}
diff --git a/core/src/mindustry/entities/effect/MultiEffect.java b/core/src/mindustry/entities/effect/MultiEffect.java
index c1b0e7e6d4..a38765067b 100644
--- a/core/src/mindustry/entities/effect/MultiEffect.java
+++ b/core/src/mindustry/entities/effect/MultiEffect.java
@@ -1,5 +1,6 @@
 package mindustry.entities.effect;
 
+import arc.graphics.*;
 import mindustry.entities.*;
 
 /** Renders multiple particle effects at once. */
@@ -7,26 +8,18 @@ public class MultiEffect extends Effect{
     public Effect[] effects = {};
 
     public MultiEffect(){
-        clip = 100f;
     }
 
     public MultiEffect(Effect... effects){
-        this();
         this.effects = effects;
     }
 
     @Override
-    public void init(){
-        for(Effect f : effects){
-            clip = Math.max(clip, f.clip);
-        }
-    }
+    public void create(float x, float y, float rotation, Color color, Object data){
+        if(!shouldCreate()) return;
 
-    @Override
-    public void render(EffectContainer e){
-        for(Effect f : effects){
-            e.scaled(f.lifetime, f::render);
-            clip = Math.max(clip, f.clip);
+        for(var effect : effects){
+            effect.create(x, y, rotation, color, data);
         }
     }
 }
diff --git a/core/src/mindustry/entities/effect/ParticleEffect.java b/core/src/mindustry/entities/effect/ParticleEffect.java
index f38fc00603..66c61b3329 100644
--- a/core/src/mindustry/entities/effect/ParticleEffect.java
+++ b/core/src/mindustry/entities/effect/ParticleEffect.java
@@ -4,52 +4,96 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.util.*;
 import mindustry.entities.*;
+import mindustry.graphics.*;
 
 /** The most essential effect class. Can create particles in various shapes. */
 public class ParticleEffect extends Effect{
+    private static final Rand rand = new Rand();
+    private static final Vec2 rv = new Vec2();
+
     public Color colorFrom = Color.white.cpy(), colorTo = Color.white.cpy();
     public int particles = 6;
+    public boolean randLength = true;
+    /** Gives the effect flipping compatability like casing effects. */
+    public boolean casingFlip;
     public float cone = 180f, length = 20f, baseLength = 0f;
+    /** Particle size/length/radius interpolation. */
     public Interp interp = Interp.linear;
+    /** Particle size interpolation. Null to use interp. */
+    public @Nullable Interp sizeInterp = null;
+    public float offsetX, offsetY;
+    public float lightScl = 2f, lightOpacity = 0.6f;
+    public @Nullable Color lightColor;
 
     //region only
+
+    /** Spin in degrees per tick. */
+    public float spin = 0f;
+    /** Controls the initial and final sprite sizes. */
     public float sizeFrom = 2f, sizeTo = 0f;
+    /** Controls the amount of ticks the effect waits before changing size. */
+    public float sizeChangeStart = 0f;
+    /** Whether the rotation adds with the parent */
+    public boolean useRotation = true;
+    /** Rotation offset. */
+    public float offset = 0;
+    /** Sprite to draw. */
     public String region = "circle";
 
     //line only
     public boolean line;
     public float strokeFrom = 2f, strokeTo = 0f, lenFrom = 4f, lenTo = 2f;
+    public boolean cap = true;
 
     private @Nullable TextureRegion tex;
 
     @Override
     public void init(){
         clip = Math.max(clip, length + Math.max(sizeFrom, sizeTo));
+        sizeChangeStart = Mathf.clamp(sizeChangeStart, 0f, lifetime);
+        if(sizeInterp == null) sizeInterp = interp;
     }
 
     @Override
     public void render(EffectContainer e){
         if(tex == null) tex = Core.atlas.find(region);
 
+        float realRotation = (useRotation ? (casingFlip ? Math.abs(e.rotation) : e.rotation) : baseRotation);
+        int flip = casingFlip ? -Mathf.sign(e.rotation) : 1;
         float rawfin = e.fin();
         float fin = e.fin(interp);
-        float rad = interp.apply(sizeFrom, sizeTo, rawfin) * 2;
+        float rad = sizeInterp.apply(sizeFrom, sizeTo, Mathf.curve(rawfin, sizeChangeStart / lifetime, 1f)) * 2;
+        float ox = e.x + Angles.trnsx(realRotation, offsetX * flip, offsetY), oy = e.y + Angles.trnsy(realRotation, offsetX * flip, offsetY);
 
         Draw.color(colorFrom, colorTo, fin);
+        Color lightColor = this.lightColor == null ? Draw.getColor() : this.lightColor;
 
         if(line){
-            Lines.stroke(interp.apply(strokeFrom, strokeTo, rawfin));
-            float len = interp.apply(lenFrom, lenTo, rawfin);
+            Lines.stroke(sizeInterp.apply(strokeFrom, strokeTo, rawfin));
+            float len = sizeInterp.apply(lenFrom, lenTo, rawfin);
 
-            Angles.randLenVectors(e.id, particles, length * fin + baseLength, e.rotation, cone, (x, y) -> {
-                Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), len);
-            });
+            rand.setSeed(e.id);
+            for(int i = 0; i < particles; i++){
+                float l = length * fin + baseLength;
+                rv.trns(realRotation + rand.range(cone), !randLength ? l : rand.random(l));
+                float x = rv.x, y = rv.y;
+
+                Lines.lineAngle(ox + x, oy + y, Mathf.angle(x, y), len, cap);
+                Drawf.light(ox + x, oy + y, len * lightScl, lightColor, lightOpacity * Draw.getColorAlpha());
+            }
         }else{
-            Angles.randLenVectors(e.id, particles, length * fin + baseLength, e.rotation, cone, (x, y) -> {
-                Draw.rect(tex, e.x + x, e.y + y, rad, rad);
-            });
+            rand.setSeed(e.id);
+            for(int i = 0; i < particles; i++){
+                float l = length * fin + baseLength;
+                rv.trns(realRotation + rand.range(cone), !randLength ? l : rand.random(l));
+                float x = rv.x, y = rv.y;
+
+                Draw.rect(tex, ox + x, oy + y, rad, rad / tex.ratio(), realRotation + offset + e.time * spin);
+                Drawf.light(ox + x, oy + y, rad * lightScl, lightColor, lightOpacity * Draw.getColorAlpha());
+            }
         }
     }
 }
diff --git a/core/src/mindustry/entities/effect/RadialEffect.java b/core/src/mindustry/entities/effect/RadialEffect.java
new file mode 100644
index 0000000000..e6495c4b0f
--- /dev/null
+++ b/core/src/mindustry/entities/effect/RadialEffect.java
@@ -0,0 +1,43 @@
+package mindustry.entities.effect;
+
+import arc.graphics.*;
+import arc.math.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+
+/** Renders one particle effect repeatedly at specified angle intervals. */
+public class RadialEffect extends Effect{
+    public Effect effect = Fx.none;
+    public float rotationSpacing = 90f, rotationOffset = 0f, effectRotationOffset = 0f;
+    public float lengthOffset = 0f;
+    public int amount = 4;
+
+    public RadialEffect(){
+        clip = 100f;
+    }
+
+    public RadialEffect(Effect effect, int amount, float spacing, float lengthOffset, float effectRotationOffset){
+        this();
+        this.amount = amount;
+        this.effect = effect;
+        this.effectRotationOffset = effectRotationOffset;
+        this.rotationSpacing = spacing;
+        this.lengthOffset = lengthOffset;
+    }
+
+    public RadialEffect(Effect effect, int amount, float spacing, float lengthOffset){
+        this(effect, amount, spacing, lengthOffset, 0f);
+    }
+
+    @Override
+    public void create(float x, float y, float rotation, Color color, Object data){
+        if(!shouldCreate()) return;
+
+        rotation += rotationOffset;
+
+        for(int i = 0; i < amount; i++){
+            effect.create(x + Angles.trnsx(rotation, lengthOffset), y + Angles.trnsy(rotation, lengthOffset), rotation + effectRotationOffset, color, data);
+            rotation += rotationSpacing;
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/effect/SeqEffect.java b/core/src/mindustry/entities/effect/SeqEffect.java
new file mode 100644
index 0000000000..4d2398e0ad
--- /dev/null
+++ b/core/src/mindustry/entities/effect/SeqEffect.java
@@ -0,0 +1,47 @@
+package mindustry.entities.effect;
+
+import mindustry.entities.*;
+
+/**
+ * Renders multiple particle effects in sequence.
+ * Will not work correctly for effects that modify life dynamically.
+ * Z layer of child effects is ignored.
+ * */
+public class SeqEffect extends Effect{
+    public Effect[] effects = {};
+
+    public SeqEffect(){
+        clip = 100f;
+    }
+
+    public SeqEffect(Effect... effects){
+        this();
+        this.effects = effects;
+    }
+
+    @Override
+    public void init(){
+        lifetime = 0f;
+        for(Effect f : effects){
+            f.init();
+            clip = Math.max(clip, f.clip);
+            lifetime += f.lifetime;
+        }
+    }
+
+    @Override
+    public void render(EffectContainer e){
+        var cont = e.inner();
+        float life = e.time, sum = 0f;
+        for(int i = 0; i < effects.length; i++){
+            var fx = effects[i];
+            if(life <= fx.lifetime + sum){
+                cont.set(e.id + i, e.color, life - sum, fx.lifetime, e.rotation, e.x, e.y, e.data);
+                fx.render(cont);
+                clip = Math.max(clip, fx.clip);
+                break;
+            }
+            sum += fx.lifetime;
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/effect/SoundEffect.java b/core/src/mindustry/entities/effect/SoundEffect.java
new file mode 100644
index 0000000000..c3d320d527
--- /dev/null
+++ b/core/src/mindustry/entities/effect/SoundEffect.java
@@ -0,0 +1,52 @@
+package mindustry.entities.effect;
+
+import arc.*;
+import arc.audio.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+
+/** Plays a sound effect when created and simultaneously renders an effect. */
+public class SoundEffect extends Effect{
+    public Sound sound = Sounds.none;
+    public float minPitch = 0.8f;
+    public float maxPitch = 1.2f;
+    public float minVolume = 1f;
+    public float maxVolume = 1f;
+    public Effect effect;
+
+    public SoundEffect(){
+        startDelay = -1;
+    }
+
+    public SoundEffect(Sound sound, Effect effect){
+        this();
+        this.sound = sound;
+        this.effect = effect;
+    }
+
+    @Override
+    public void init(){
+        if(startDelay < 0){
+            startDelay = effect.startDelay;
+        }
+    }
+
+    @Override
+    public void create(float x, float y, float rotation, Color color, Object data){
+        if(!shouldCreate()) return;
+
+        if(startDelay > 0){
+            Time.run(startDelay, () -> sound.at(x, y, Mathf.random(minPitch, maxPitch), Mathf.random(minVolume, maxVolume)));
+        }else{
+            sound.at(x, y, Mathf.random(minPitch, maxPitch), Mathf.random(minVolume, maxVolume));
+        }
+        
+        effect.create(x, y, rotation, color, data);
+    }
+}
diff --git a/core/src/mindustry/entities/effect/WaveEffect.java b/core/src/mindustry/entities/effect/WaveEffect.java
index 88ff7391d2..7aaddd95b3 100644
--- a/core/src/mindustry/entities/effect/WaveEffect.java
+++ b/core/src/mindustry/entities/effect/WaveEffect.java
@@ -3,16 +3,21 @@ package mindustry.entities.effect;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.util.*;
 import mindustry.entities.*;
+import mindustry.graphics.*;
 
 /** Effect that renders a basic shockwave. */
 public class WaveEffect extends Effect{
     public Color colorFrom = Color.white.cpy(), colorTo = Color.white.cpy();
-    public float sizeFrom = 0f, sizeTo = 100f;
+    public @Nullable Color lightColor;
+    public float sizeFrom = 0f, sizeTo = 100f, lightScl = 3f, lightOpacity = 0.8f;
     public int sides = -1;
     public float rotation = 0f;
     public float strokeFrom = 2f, strokeTo = 0f;
     public Interp interp = Interp.linear;
+    public Interp lightInterp = Interp.reverse;
+    public float offsetX, offsetY;
 
     @Override
     public void init(){
@@ -23,11 +28,14 @@ public class WaveEffect extends Effect{
     public void render(EffectContainer e){
         float fin = e.fin();
         float ifin = e.fin(interp);
+        float ox = e.x + Angles.trnsx(e.rotation, offsetX, offsetY), oy = e.y + Angles.trnsy(e.rotation, offsetX, offsetY);
 
         Draw.color(colorFrom, colorTo, ifin);
         Lines.stroke(interp.apply(strokeFrom, strokeTo, fin));
 
         float rad = interp.apply(sizeFrom, sizeTo, fin);
-        Lines.poly(e.x, e.y, sides <= 0 ? Lines.circleVertices(rad) : sides, rad, rotation + e.rotation);
+        Lines.poly(ox, oy, sides <= 0 ? Lines.circleVertices(rad) : sides, rad, rotation + e.rotation);
+
+        Drawf.light(ox, oy, rad * lightScl, lightColor == null ? Draw.getColor() : lightColor, lightOpacity * e.fin(lightInterp));
     }
 }
diff --git a/core/src/mindustry/entities/effect/WrapEffect.java b/core/src/mindustry/entities/effect/WrapEffect.java
new file mode 100644
index 0000000000..7eb1fa60e1
--- /dev/null
+++ b/core/src/mindustry/entities/effect/WrapEffect.java
@@ -0,0 +1,42 @@
+package mindustry.entities.effect;
+
+import arc.graphics.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+
+/** Wraps an effect with some parameters. */
+public class WrapEffect extends Effect{
+    public Effect effect = Fx.none;
+    public Color color = Color.white.cpy();
+    public float rotation;
+
+    public WrapEffect(){
+    }
+
+    public WrapEffect(Effect effect, Color color){
+        this.effect = effect;
+        this.color = color;
+    }
+
+    public WrapEffect(Effect effect, Color color, float rotation){
+        this.effect = effect;
+        this.color = color;
+        this.rotation = rotation;
+    }
+
+    @Override
+    public void init(){
+        effect.init();
+        clip = effect.clip;
+        lifetime = effect.lifetime;
+    }
+
+    @Override
+    public void render(EffectContainer e){
+    }
+
+    @Override
+    public void create(float x, float y, float rotation, Color color, Object data){
+        effect.create(x, y, this.rotation, this.color, data);
+    }
+}
diff --git a/core/src/mindustry/entities/part/DrawPart.java b/core/src/mindustry/entities/part/DrawPart.java
new file mode 100644
index 0000000000..6e14ccb247
--- /dev/null
+++ b/core/src/mindustry/entities/part/DrawPart.java
@@ -0,0 +1,197 @@
+package mindustry.entities.part;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+
+public abstract class DrawPart{
+    public static final PartParams params = new PartParams();
+
+    /** If true, turret shading is used. Don't touch this, it is set up in unit/block init()! */
+    public boolean turretShading;
+    /** If true, the layer is overridden to be under the weapon/turret itself. */
+    public boolean under = false;
+    /** For units, this is the index of the weapon this part gets its progress for. */
+    public int weaponIndex = 0;
+    /** Which recoil counter to use. < 0 to use base recoil.  */
+    public int recoilIndex = -1;
+
+    public abstract void draw(PartParams params);
+    public abstract void load(String name);
+    public void getOutlines(Seq<TextureRegion> out){}
+
+    /** Parameters for drawing a part in draw(). */
+    public static class PartParams{
+        //TODO document
+        public float warmup, reload, smoothReload, heat, recoil, life, charge;
+        public float x, y, rotation;
+        public int sideOverride = -1, sideMultiplier = 1;
+
+        public PartParams set(float warmup, float reload, float smoothReload, float heat, float recoil, float charge, float x, float y, float rotation){
+            this.warmup = warmup;
+            this.reload = reload;
+            this.heat = heat;
+            this.recoil = recoil;
+            this.smoothReload = smoothReload;
+            this.charge = charge;
+            this.x = x;
+            this.y = y;
+            this.rotation = rotation;
+            this.sideOverride = -1;
+            this.life = 0f;
+            this.sideMultiplier = 1;
+            return this;
+        }
+
+        public PartParams setRecoil(float recoils){
+            this.recoil = recoils;
+            return this;
+        }
+    }
+
+    public static class PartMove{
+        public PartProgress progress = PartProgress.warmup;
+        public float x, y, gx, gy, rot;
+
+        public PartMove(PartProgress progress, float x, float y, float gx, float gy, float rot){
+            this.progress = progress;
+            this.x = x;
+            this.y = y;
+            this.gx = gx;
+            this.gy = gy;
+            this.rot = rot;
+        }
+        public PartMove(PartProgress progress, float x, float y, float rot){
+            this(progress, x, y, 0, 0, rot);
+        }
+
+        public PartMove(){
+        }
+    }
+
+    public interface PartProgress{
+        /** Reload of the weapon - 1 right after shooting, 0 when ready to fire*/
+        PartProgress
+        reload = p -> p.reload,
+        /** Reload, but smoothed out, so there is no sudden jump between 0-1. */
+        smoothReload = p -> p.smoothReload,
+        /** Weapon warmup, 0 when not firing, 1 when actively shooting. Not equivalent to heat. */
+        warmup = p -> p.warmup,
+        /** Weapon charge, 0 when beginning to charge, 1 when finished */
+        charge = p -> p.charge,
+        /** Weapon recoil with no curve applied. */
+        recoil = p -> p.recoil,
+        /** Weapon heat, 1 when just fired, 0, when it has cooled down (duration depends on weapon) */
+        heat = p -> p.heat,
+        /** Lifetime fraction, 0 to 1. Only for missiles. */
+        life = p -> p.life,
+        /** Current unscaled value of Time.time. */
+        time = p -> Time.time;
+        
+        float get(PartParams p);
+
+        static PartProgress constant(float value){
+            return p -> value;
+        }
+
+        default float getClamp(PartParams p){
+            return getClamp(p, true);
+        }
+        
+        default float getClamp(PartParams p, boolean clamp){
+            return clamp ? Mathf.clamp(get(p)) : get(p);
+        }
+        
+        default PartProgress inv(){
+            return p -> 1f - get(p);
+        }
+
+        default PartProgress slope(){
+            return p -> Mathf.slope(get(p));
+        }
+
+        default PartProgress clamp(){
+            return p -> Mathf.clamp(get(p));
+        }
+
+        default PartProgress add(float amount){
+            return p -> get(p) + amount;
+        }
+
+        default PartProgress add(PartProgress other){
+            return p -> get(p) + other.get(p);
+        }
+
+        default PartProgress delay(float amount){
+            return p -> (get(p) - amount) / (1f - amount);
+        }
+
+        default PartProgress curve(float offset, float duration){
+            return p -> (get(p) - offset) / duration;
+        }
+
+        default PartProgress sustain(float offset, float grow, float sustain){
+            return p -> {
+                float val = get(p) - offset;
+                return Math.min(Math.max(val, 0f) / grow, (grow + sustain + grow - val) / grow);
+            };
+        }
+
+        default PartProgress shorten(float amount){
+            return p -> get(p) / (1f - amount);
+        }
+
+        default PartProgress compress(float start, float end){
+            return p -> Mathf.curve(get(p), start, end);
+        }
+
+        default PartProgress blend(PartProgress other, float amount){
+            return p -> Mathf.lerp(get(p), other.get(p), amount);
+        }
+
+        default PartProgress mul(PartProgress other){
+            return p -> get(p) * other.get(p);
+        }
+
+        default PartProgress mul(float amount){
+            return p -> get(p) * amount;
+        }
+
+        default PartProgress min(PartProgress other){
+            return p -> Math.min(get(p), other.get(p));
+        }
+
+        default PartProgress sin(float offset, float scl, float mag){
+            return p -> get(p) + Mathf.sin(Time.time + offset, scl, mag);
+        }
+
+        default PartProgress sin(float scl, float mag){
+            return p -> get(p) + Mathf.sin(scl, mag);
+        }
+
+        default PartProgress absin(float scl, float mag){
+            return p -> get(p) + Mathf.absin(scl, mag);
+        }
+        
+        default PartProgress mod(float amount){
+            return p -> Mathf.mod(get(p), amount);
+        }
+        
+        default PartProgress loop(float time){
+            return p -> Mathf.mod(get(p)/time, 1);
+        }
+
+        default PartProgress apply(PartProgress other, PartFunc func){
+            return p -> func.get(get(p), other.get(p));
+        }
+
+        default PartProgress curve(Interp interp){
+            return p -> interp.apply(get(p));
+        }
+    }
+
+    public interface PartFunc{
+        float get(float a, float b);
+    }
+}
diff --git a/core/src/mindustry/entities/part/FlarePart.java b/core/src/mindustry/entities/part/FlarePart.java
new file mode 100644
index 0000000000..ccf274a5b9
--- /dev/null
+++ b/core/src/mindustry/entities/part/FlarePart.java
@@ -0,0 +1,54 @@
+package mindustry.entities.part;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.graphics.*;
+
+public class FlarePart extends DrawPart{
+    public int sides = 4;
+    public float radius = 100f, radiusTo = -1f, stroke = 6f, innerScl = 0.5f, innerRadScl = 0.33f;
+    public float x, y, rotation, rotMove, spinSpeed;
+    public boolean followRotation;
+    public Color color1 = Pal.techBlue, color2 = Color.white;
+    public boolean clampProgress = true;
+    public PartProgress progress = PartProgress.warmup;
+    public float layer = Layer.effect;
+
+    @Override
+    public void draw(PartParams params){
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+
+        float prog = progress.getClamp(params, clampProgress);
+        int i = params.sideOverride == -1 ? 0 : params.sideOverride;
+
+        float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
+        Tmp.v1.set(x * sign, y).rotate(params.rotation - 90);
+
+        float
+        rx = params.x + Tmp.v1.x,
+        ry = params.y + Tmp.v1.y,
+        rot = (followRotation ? params.rotation : 0f) + rotMove * prog + rotation + Time.time * spinSpeed,
+        rad = radiusTo < 0 ? radius : Mathf.lerp(radius, radiusTo, prog);
+
+        Draw.color(color1);
+        for(int j = 0; j < sides; j++){
+            Drawf.tri(rx, ry, stroke, rad, j * 360f / sides + rot);
+        }
+
+        Draw.color(color2);
+        for(int j = 0; j < sides; j++){
+            Drawf.tri(rx, ry, stroke * innerScl, rad * innerRadScl, j * 360f / sides + rot);
+        }
+
+        Draw.color();
+        Draw.z(z);
+    }
+
+    @Override
+    public void load(String name){
+
+    }
+}
diff --git a/core/src/mindustry/entities/part/HaloPart.java b/core/src/mindustry/entities/part/HaloPart.java
new file mode 100644
index 0000000000..7dc1dfcace
--- /dev/null
+++ b/core/src/mindustry/entities/part/HaloPart.java
@@ -0,0 +1,94 @@
+package mindustry.entities.part;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.graphics.*;
+
+public class HaloPart extends DrawPart{
+    public boolean hollow = false, tri = false;
+    public int shapes = 3;
+    public int sides = 3;
+    public float radius = 3f, radiusTo = -1f, stroke = 1f, strokeTo = -1f;
+    public float triLength = 1f, triLengthTo = -1f;
+    public float haloRadius = 10f, haloRadiusTo = -1f;
+    public float x, y, shapeRotation;
+    public float moveX, moveY, shapeMoveRot;
+    public float haloRotateSpeed = 0f, haloRotation = 0f;
+    public float rotateSpeed = 0f;
+    public Color color = Color.white;
+    public @Nullable Color colorTo;
+    public boolean mirror = false;
+    public boolean clampProgress = true;
+    public PartProgress progress = PartProgress.warmup;
+    public float layer = -1f, layerOffset = 0f;
+
+    @Override
+    public void draw(PartParams params){
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+        if(under && turretShading) Draw.z(z - 0.0001f);
+
+        Draw.z(Draw.z() + layerOffset);
+
+        float
+        prog = progress.getClamp(params, clampProgress),
+        baseRot = Time.time * rotateSpeed,
+        rad = radiusTo < 0 ? radius : Mathf.lerp(radius, radiusTo, prog),
+        triLen = triLengthTo < 0 ? triLength : Mathf.lerp(triLength, triLengthTo, prog),
+        str = strokeTo < 0 ? stroke : Mathf.lerp(stroke, strokeTo, prog),
+        haloRad = haloRadiusTo < 0 ? haloRadius : Mathf.lerp(haloRadius, haloRadiusTo, prog);
+
+        int len = mirror && params.sideOverride == -1 ? 2 : 1;
+
+        for(int s = 0; s < len; s++){
+            //use specific side if necessary
+            int i = params.sideOverride == -1 ? s : params.sideOverride;
+
+            float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
+            Tmp.v1.set((x + moveX * prog) * sign, y + moveY * prog).rotate(params.rotation - 90);
+
+            float
+            rx = params.x + Tmp.v1.x,
+            ry = params.y + Tmp.v1.y;
+
+            if(color != null && colorTo != null){
+                Draw.color(color, colorTo, prog);
+            }else if(color != null){
+                Draw.color(color);
+            }
+
+            float haloRot = (haloRotation + haloRotateSpeed * Time.time) * sign;
+
+            for(int v = 0; v < shapes; v++){
+                float rot = haloRot + v * 360f / shapes + params.rotation;
+                float shapeX = Angles.trnsx(rot, haloRad) + rx, shapeY = Angles.trnsy(rot, haloRad) + ry;
+                float pointRot = rot + shapeMoveRot * prog * sign + shapeRotation * sign + baseRot * sign;
+
+                if(tri){
+                    if(rad > 0.001 && triLen > 0.001){
+                        Drawf.tri(shapeX, shapeY, rad, triLen, pointRot);
+                    }
+                }else if(!hollow){
+                    if(rad > 0.001){
+                        Fill.poly(shapeX, shapeY, sides, rad, pointRot);
+                    }
+                }else if(str > 0.001){
+                    Lines.stroke(str);
+                    Lines.poly(shapeX, shapeY, sides, rad, pointRot);
+                    Lines.stroke(1f);
+                }
+            }
+
+            if(color != null) Draw.color();
+        }
+
+        Draw.z(z);
+    }
+
+    @Override
+    public void load(String name){
+
+    }
+}
diff --git a/core/src/mindustry/entities/part/HoverPart.java b/core/src/mindustry/entities/part/HoverPart.java
new file mode 100644
index 0000000000..4822a6513e
--- /dev/null
+++ b/core/src/mindustry/entities/part/HoverPart.java
@@ -0,0 +1,56 @@
+package mindustry.entities.part;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+
+public class HoverPart extends DrawPart{
+    public float radius = 4f;
+    public float x, y, rotation, phase = 50f, stroke = 3f, minStroke = 0.12f;
+    public int circles = 2, sides = 4;
+    public Color color = Color.white;
+    public boolean mirror = false;
+    public float layer = -1f, layerOffset = 0f;
+
+    @Override
+    public void draw(PartParams params){
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+        if(under && turretShading) Draw.z(z - 0.0001f);
+
+        Draw.z(Draw.z() + layerOffset);
+
+        int len = mirror && params.sideOverride == -1 ? 2 : 1;
+
+        Draw.color(color);
+
+
+        for(int c = 0; c < circles; c++){
+            float fin = ((Time.time / phase + (float)c / circles) % 1f);
+            Lines.stroke((1f-fin) * stroke + minStroke);
+
+            for(int s = 0; s < len; s++){
+                //use specific side if necessary
+                int i = params.sideOverride == -1 ? s : params.sideOverride;
+
+                float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
+                Tmp.v1.set((x) * sign, y).rotate(params.rotation - 90);
+
+                float
+                rx = params.x + Tmp.v1.x,
+                ry = params.y + Tmp.v1.y;
+
+                Lines.poly(rx, ry, sides, radius * fin, params.rotation);
+            }
+        }
+
+        Draw.reset();
+
+        Draw.z(z);
+    }
+
+    @Override
+    public void load(String name){
+
+    }
+}
diff --git a/core/src/mindustry/entities/part/RegionPart.java b/core/src/mindustry/entities/part/RegionPart.java
new file mode 100644
index 0000000000..527ccae184
--- /dev/null
+++ b/core/src/mindustry/entities/part/RegionPart.java
@@ -0,0 +1,208 @@
+package mindustry.entities.part;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.graphics.*;
+
+public class RegionPart extends DrawPart{
+    protected PartParams childParam = new PartParams();
+
+    /** Appended to unit/weapon/block name and drawn. */
+    public String suffix = "";
+    /** Overrides suffix if set. */
+    public @Nullable String name;
+    public TextureRegion heat, light;
+    public TextureRegion[] regions = {};
+    public TextureRegion[] outlines = {};
+
+    /** If true, parts are mirrored across the turret. Requires -1 and -2 regions. */
+    public boolean mirror = false;
+    /** If true, an outline is drawn under the part. */
+    public boolean outline = true;
+    /** If true, the base + outline regions are drawn. Set to false for heat-only regions. */
+    public boolean drawRegion = true;
+    /** If true, the heat region produces light. */
+    public boolean heatLight = false;
+    /** Whether to clamp progress to (0-1). If false, allows usage of interps that go past the range, but may have unwanted visual bugs depending on values. */
+    public boolean clampProgress = true;
+    /** Progress function for determining position/rotation. */
+    public PartProgress progress = PartProgress.warmup;
+    /** Progress function for scaling. */
+    public PartProgress growProgress = PartProgress.warmup;
+    /** Progress function for heat alpha. */
+    public PartProgress heatProgress = PartProgress.heat;
+    public Blending blending = Blending.normal;
+    public float layer = -1, layerOffset = 0f, heatLayerOffset = 1f, turretHeatLayer = Layer.turretHeat;
+    public float outlineLayerOffset = -0.001f;
+    public float x, y, xScl = 1f, yScl = 1f, rotation;
+    public float moveX, moveY, growX, growY, moveRot;
+    public float heatLightOpacity = 0.3f;
+    public @Nullable Color color, colorTo, mixColor, mixColorTo;
+    public Color heatColor = Pal.turretHeat.cpy();
+    public Seq<DrawPart> children = new Seq<>();
+    public Seq<PartMove> moves = new Seq<>();
+
+    public RegionPart(String region){
+        this.suffix = region;
+    }
+
+    public RegionPart(String region, Blending blending, Color color){
+        this.suffix = region;
+        this.blending = blending;
+        this.color = color;
+        outline = false;
+    }
+
+    public RegionPart(){
+    }
+
+    @Override
+    public void draw(PartParams params){
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+        //TODO 'under' should not be special cased like this...
+        if(under && turretShading) Draw.z(z - 0.0001f);
+        Draw.z(Draw.z() + layerOffset);
+
+        float prevZ = Draw.z();
+        float prog = progress.getClamp(params, clampProgress), sclProg = growProgress.getClamp(params, clampProgress);
+        float mx = moveX * prog, my = moveY * prog, mr = moveRot * prog + rotation,
+            gx = growX * sclProg, gy = growY * sclProg;
+
+        if(moves.size > 0){
+            for(int i = 0; i < moves.size; i++){
+                var move = moves.get(i);
+                float p = move.progress.getClamp(params, clampProgress);
+                mx += move.x * p;
+                my += move.y * p;
+                mr += move.rot * p;
+                gx += move.gx * p;
+                gy += move.gy * p;
+            }
+        }
+
+        int len = mirror && params.sideOverride == -1 ? 2 : 1;
+        float preXscl = Draw.xscl, preYscl = Draw.yscl;
+        Draw.xscl *= xScl + gx;
+        Draw.yscl *= yScl + gy;
+
+        for(int s = 0; s < len; s++){
+            //use specific side if necessary
+            int i = params.sideOverride == -1 ? s : params.sideOverride;
+
+            //can be null
+            var region = drawRegion ? regions[Math.min(i, regions.length - 1)] : null;
+            float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
+            Tmp.v1.set((x + mx) * sign, y + my).rotateRadExact((params.rotation - 90) * Mathf.degRad);
+
+            float
+                rx = params.x + Tmp.v1.x,
+                ry = params.y + Tmp.v1.y,
+                rot = mr * sign + params.rotation - 90;
+
+            Draw.xscl *= sign;
+
+            if(outline && drawRegion){
+                Draw.z(prevZ + outlineLayerOffset);
+                Draw.rect(outlines[Math.min(i, regions.length - 1)], rx, ry, rot);
+                Draw.z(prevZ);
+            }
+
+            if(drawRegion && region.found()){
+                if(color != null && colorTo != null){
+                    Draw.color(color, colorTo, prog);
+                }else if(color != null){
+                    Draw.color(color);
+                }
+
+                if(mixColor != null && mixColorTo != null){
+                    Draw.mixcol(mixColor, mixColorTo, prog);
+                }else if(mixColor != null){
+                    Draw.mixcol(mixColor, mixColor.a);
+                }
+
+                Draw.blend(blending);
+                Draw.rect(region, rx, ry, rot);
+                Draw.blend();
+                if(color != null) Draw.color();
+            }
+
+            if(heat.found()){
+                float hprog = heatProgress.getClamp(params, clampProgress);
+                heatColor.write(Tmp.c1).a(hprog * heatColor.a);
+                Drawf.additive(heat, Tmp.c1, rx, ry, rot, turretShading ? turretHeatLayer : Draw.z() + heatLayerOffset);
+                if(heatLight) Drawf.light(rx, ry, light.found() ? light : heat, rot, Tmp.c1, heatLightOpacity * hprog);
+            }
+
+            Draw.xscl *= sign;
+        }
+
+        Draw.color();
+        Draw.mixcol();
+
+        Draw.z(z);
+
+        //draw child, if applicable - only at the end
+        //TODO lots of copy-paste here
+        if(children.size > 0){
+            for(int s = 0; s < len; s++){
+                int i = (params.sideOverride == -1 ? s : params.sideOverride);
+                float sign = (i == 1 ? -1 : 1) * params.sideMultiplier;
+                Tmp.v1.set((x + mx) * sign, y + my).rotateRadExact((params.rotation - 90) * Mathf.degRad);
+
+                childParam.set(params.warmup, params.reload, params.smoothReload, params.heat, params.recoil, params.charge, params.x + Tmp.v1.x, params.y + Tmp.v1.y, mr * sign + params.rotation);
+                childParam.sideMultiplier = params.sideMultiplier;
+                childParam.life = params.life;
+                childParam.sideOverride = i;
+                for(var child : children){
+                    child.draw(childParam);
+                }
+            }
+        }
+
+        Draw.scl(preXscl, preYscl);
+    }
+
+    @Override
+    public void load(String name){
+        String realName = this.name == null ? name + suffix : this.name;
+
+        if(drawRegion){
+            if(mirror && turretShading){
+                regions = new TextureRegion[]{
+                Core.atlas.find(realName + "-r"),
+                Core.atlas.find(realName + "-l")
+                };
+
+                outlines = new TextureRegion[]{
+                Core.atlas.find(realName + "-r-outline"),
+                Core.atlas.find(realName + "-l-outline")
+                };
+            }else{
+                regions = new TextureRegion[]{Core.atlas.find(realName)};
+                outlines = new TextureRegion[]{Core.atlas.find(realName + "-outline")};
+            }
+        }
+
+        heat = Core.atlas.find(realName + "-heat");
+        light = Core.atlas.find(realName + "-light");
+        for(var child : children){
+            child.turretShading = turretShading;
+            child.load(name);
+        }
+    }
+
+    @Override
+    public void getOutlines(Seq<TextureRegion> out){
+        if(outline && drawRegion){
+            out.addAll(regions);
+        }
+        for(var child : children){
+            child.getOutlines(out);
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/part/ShapePart.java b/core/src/mindustry/entities/part/ShapePart.java
new file mode 100644
index 0000000000..dc8211fb26
--- /dev/null
+++ b/core/src/mindustry/entities/part/ShapePart.java
@@ -0,0 +1,79 @@
+package mindustry.entities.part;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+
+public class ShapePart extends DrawPart{
+    public boolean circle = false, hollow = false;
+    public int sides = 3;
+    public float radius = 3f, radiusTo = -1f, stroke = 1f, strokeTo = -1f;
+    public float x, y, rotation;
+    public float moveX, moveY, moveRot;
+    public float rotateSpeed = 0f;
+    public Color color = Color.white;
+    public @Nullable Color colorTo;
+    public boolean mirror = false;
+    public boolean clampProgress = true;
+    public PartProgress progress = PartProgress.warmup;
+    public float layer = -1f, layerOffset = 0f;
+
+    @Override
+    public void draw(PartParams params){
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+        if(under && turretShading) Draw.z(z - 0.0001f);
+
+        Draw.z(Draw.z() + layerOffset);
+
+        float prog = progress.getClamp(params, clampProgress),
+        baseRot = Time.time * rotateSpeed,
+        rad = radiusTo < 0 ? radius : Mathf.lerp(radius, radiusTo, prog),
+        str = strokeTo < 0 ? stroke : Mathf.lerp(stroke, strokeTo, prog);
+
+        int len = mirror && params.sideOverride == -1 ? 2 : 1;
+
+        for(int s = 0; s < len; s++){
+            //use specific side if necessary
+            int i = params.sideOverride == -1 ? s : params.sideOverride;
+
+            float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
+            Tmp.v1.set((x + moveX * prog) * sign, y + moveY * prog).rotate(params.rotation - 90);
+
+            float
+            rx = params.x + Tmp.v1.x,
+            ry = params.y + Tmp.v1.y;
+
+            if(color != null && colorTo != null){
+                Draw.color(color, colorTo, prog);
+            }else if(color != null){
+                Draw.color(color);
+            }
+            
+            if(!hollow){
+                if(!circle){
+                    Fill.poly(rx, ry, sides, rad, moveRot * prog * sign + params.rotation - 90 * sign + rotation * sign + baseRot * sign);
+                }else{
+                    Fill.circle(rx, ry, rad);
+                }
+            }else if(str > 0.0001f){
+                Lines.stroke(str);
+                if(!circle){
+                    Lines.poly(rx, ry, sides, rad, moveRot * prog * sign + params.rotation - 90 * sign + rotation * sign + baseRot * sign);
+                }else{
+                    Lines.circle(rx, ry, rad);
+                }
+                Lines.stroke(1f);
+            }
+            if(color != null) Draw.color();
+        }
+
+        Draw.z(z);
+    }
+
+    @Override
+    public void load(String name){
+
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootAlternate.java b/core/src/mindustry/entities/pattern/ShootAlternate.java
new file mode 100644
index 0000000000..7fd3795fad
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootAlternate.java
@@ -0,0 +1,28 @@
+package mindustry.entities.pattern;
+
+import arc.util.*;
+
+public class ShootAlternate extends ShootPattern{
+    /** number of barrels used for shooting. */
+    public int barrels = 2;
+    /** spread between barrels, in world units - not degrees. */
+    public float spread = 5f;
+    /** offset of barrel to start on */
+    public int barrelOffset = 0;
+
+    public ShootAlternate(float spread){
+        this.spread = spread;
+    }
+
+    public ShootAlternate(){
+    }
+
+    @Override
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        for(int i = 0; i < shots; i++){
+            float index = ((totalShots + i + barrelOffset) % barrels) - (barrels-1)/2f;
+            handler.shoot(index * spread, 0, 0f, firstShotDelay + shotDelay * i);
+            if(barrelIncrementer != null) barrelIncrementer.run();
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootBarrel.java b/core/src/mindustry/entities/pattern/ShootBarrel.java
new file mode 100644
index 0000000000..debea85726
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootBarrel.java
@@ -0,0 +1,28 @@
+package mindustry.entities.pattern;
+
+import arc.util.*;
+
+public class ShootBarrel extends ShootPattern{
+    /** barrels [in x, y, rotation] format. */
+    public float[] barrels = {0f, 0f, 0f};
+    /** offset of barrel to start on */
+    public int barrelOffset = 0;
+
+    @Override
+    public void flip(){
+        barrels = barrels.clone();
+        for(int i = 0; i < barrels.length; i += 3){
+            barrels[i] *= -1;
+            barrels[i + 2] *= -1;
+        }
+    }
+
+    @Override
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        for(int i = 0; i < shots; i++){
+            int index = ((i + totalShots + barrelOffset) % (barrels.length / 3)) * 3;
+            handler.shoot(barrels[index], barrels[index + 1], barrels[index + 2], firstShotDelay + shotDelay * i);
+            if(barrelIncrementer != null) barrelIncrementer.run();
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootHelix.java b/core/src/mindustry/entities/pattern/ShootHelix.java
new file mode 100644
index 0000000000..0b61c594c1
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootHelix.java
@@ -0,0 +1,18 @@
+package mindustry.entities.pattern;
+
+import arc.math.*;
+import arc.util.*;
+
+public class ShootHelix extends ShootPattern{
+    public float scl = 2f, mag = 1.5f, offset = Mathf.PI * 1.25f;
+
+    @Override
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        for(int i = 0; i < shots; i++){
+            for(int sign : Mathf.signs){
+                handler.shoot(0, 0, 0, firstShotDelay + shotDelay * i,
+                    b -> b.moveRelative(0f, Mathf.sin(b.time + offset, scl, mag * sign)));
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootMulti.java b/core/src/mindustry/entities/pattern/ShootMulti.java
new file mode 100644
index 0000000000..f54ccdcd81
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootMulti.java
@@ -0,0 +1,42 @@
+package mindustry.entities.pattern;
+
+import arc.util.*;
+
+public class ShootMulti extends ShootPattern{
+    public ShootPattern source;
+    public ShootPattern[] dest = {};
+
+    public ShootMulti(ShootPattern source, ShootPattern... dest){
+        this.source = source;
+        this.dest = dest;
+    }
+
+    public ShootMulti(){
+    }
+
+    //deep copy needed for flips
+    @Override
+    public void flip(){
+        source = source.copy();
+        source.flip();
+        dest = dest.clone();
+        for(int i = 0; i < dest.length; i++){
+            dest[i] = dest[i].copy();
+            dest[i].flip();
+        }
+    }
+
+    @Override
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        source.shoot(totalShots, (x, y, rotation, delay, move) -> {
+            for(var pattern : dest){
+                pattern.shoot(totalShots, (x2, y2, rot2, delay2, mover) -> {
+                    handler.shoot(x + x2, y + y2, rotation + rot2, delay + delay2, move == null && mover == null ? null : b -> {
+                        if(move != null) move.move(b);
+                        if(mover != null) mover.move(b);
+                    });
+                }, null);
+            }
+        }, barrelIncrementer);
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootPattern.java b/core/src/mindustry/entities/pattern/ShootPattern.java
new file mode 100644
index 0000000000..4cb15187df
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootPattern.java
@@ -0,0 +1,54 @@
+package mindustry.entities.pattern;
+
+import arc.util.*;
+import mindustry.entities.*;
+
+/** Handles different types of bullet patterns for shooting. */
+public class ShootPattern implements Cloneable{
+    /** amount of shots per "trigger pull" */
+    public int shots = 1;
+    /** delay in ticks before first shot */
+    public float firstShotDelay = 0;
+    /** delay in ticks between shots */
+    public float shotDelay = 0;
+
+    /** Called on a single "trigger pull". This function should call the handler with any bullets that result. */
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        //the default implementation calls the "soft deprecated" variant for mod compatibility, so overrides from older mods can function properly
+        shoot(totalShots, handler);
+    }
+
+    /** Called on a single "trigger pull". This function should call the handler with any bullets that result. */
+    public void shoot(int totalShots, BulletHandler handler){
+        for(int i = 0; i < shots; i++){
+            handler.shoot(0, 0, 0, firstShotDelay + shotDelay * i);
+        }
+    }
+
+    /** Subclasses should override this to flip its sides. */
+    public void flip(){
+
+    }
+
+    public ShootPattern copy(){
+        try{
+            return (ShootPattern)clone();
+        }catch(CloneNotSupportedException absurd){
+            throw new RuntimeException("impending doom", absurd);
+        }
+    }
+
+    public interface BulletHandler{
+        /**
+         * @param x x offset of bullet, should be transformed by weapon rotation
+         * @param y y offset of bullet, should be transformed by weapon rotation
+         * @param rotation rotation offset relative to weapon
+         * @param delay bullet delay in ticks
+         * */
+        default void shoot(float x, float y, float rotation, float delay){
+            shoot(x, y, rotation, delay, null);
+        }
+
+        void shoot(float x, float y, float rotation, float delay, Mover move);
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootSine.java b/core/src/mindustry/entities/pattern/ShootSine.java
new file mode 100644
index 0000000000..4f4d5bc1e2
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootSine.java
@@ -0,0 +1,27 @@
+package mindustry.entities.pattern;
+
+import arc.math.*;
+import arc.util.*;
+
+public class ShootSine extends ShootPattern{
+    /** scaling applied to bullet index */
+    public float scl = 4f;
+    /** magnitude of sine curve for position displacement */
+    public float mag = 20f;
+
+    public ShootSine(float scl, float mag){
+        this.scl = scl;
+        this.mag = mag;
+    }
+
+    public ShootSine(){
+    }
+
+    @Override
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        for(int i = 0; i < shots; i++){
+            float angleOffset = Mathf.sin(i + totalShots, scl, mag);
+            handler.shoot(0, 0, angleOffset, firstShotDelay + shotDelay * i);
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootSpread.java b/core/src/mindustry/entities/pattern/ShootSpread.java
new file mode 100644
index 0000000000..0508fc8a91
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootSpread.java
@@ -0,0 +1,24 @@
+package mindustry.entities.pattern;
+
+import arc.util.*;
+
+public class ShootSpread extends ShootPattern{
+    /** spread between bullets, in degrees. */
+    public float spread = 5f;
+
+    public ShootSpread(int shots, float spread){
+        this.shots = shots;
+        this.spread = spread;
+    }
+
+    public ShootSpread(){
+    }
+
+    @Override
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        for(int i = 0; i < shots; i++){
+            float angleOffset = i * spread - (shots - 1) * spread / 2f;
+            handler.shoot(0, 0, angleOffset, firstShotDelay + shotDelay * i);
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/pattern/ShootSummon.java b/core/src/mindustry/entities/pattern/ShootSummon.java
new file mode 100644
index 0000000000..d7ed625b0e
--- /dev/null
+++ b/core/src/mindustry/entities/pattern/ShootSummon.java
@@ -0,0 +1,27 @@
+package mindustry.entities.pattern;
+
+import arc.math.*;
+import arc.util.*;
+
+public class ShootSummon extends ShootPattern{
+    public float x, y, radius, spread;
+
+    public ShootSummon(float x, float y, float radius, float spread){
+        this.x = x;
+        this.y = y;
+        this.radius = radius;
+        this.spread = spread;
+    }
+
+    public ShootSummon(){
+    }
+
+    @Override
+    public void shoot(int totalShots, BulletHandler handler, @Nullable Runnable barrelIncrementer){
+        for(int i = 0; i < shots; i++){
+            Tmp.v1.trns(Mathf.random(360f), Mathf.random(radius));
+
+            handler.shoot(x + Tmp.v1.x, y + Tmp.v1.y, Mathf.range(spread), firstShotDelay + shotDelay * i);
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java
index 0eb12d7a6a..f91b707699 100644
--- a/core/src/mindustry/entities/units/AIController.java
+++ b/core/src/mindustry/entities/units/AIController.java
@@ -4,31 +4,36 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.*;
-import mindustry.ai.*;
 import mindustry.entities.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.payloads.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class AIController implements UnitController{
     protected static final Vec2 vec = new Vec2();
-    protected static final int timerTarget = 0, timerTarget2 = 1, timerTarget3 = 2;
+    protected static final float rotateBackTimer = 60f * 5f;
+    protected static final int timerTarget = 0, timerTarget2 = 1, timerTarget3 = 2, timerTarget4 = 3;
 
     protected Unit unit;
     protected Interval timer = new Interval(4);
     protected AIController fallback;
+    protected float noTargetTime;
 
     /** 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));
+        resetTimers();
+    }
+
+    protected void resetTimers(){
+        timer.reset(timerTarget, Mathf.random(40f));
+        timer.reset(timerTarget2, Mathf.random(60f));
     }
 
     @Override
@@ -45,103 +50,160 @@ public class AIController implements UnitController{
         updateMovement();
     }
 
-    @Nullable
-    protected AIController fallback(){
-        return null;
-    }
-
-    protected boolean useFallback(){
+    /**
+     * @return whether controller state should not be reset after reading.
+     * Do not override unless you know exactly what you are doing.
+     * */
+    public boolean keepState(){
         return false;
     }
 
-    protected UnitCommand command(){
-        return unit.team.data().command;
+    @Override
+    public void afterRead(Unit unit){
+
     }
 
-    protected void updateVisuals(){
+    @Override
+    public boolean isLogicControllable(){
+        return true;
+    }
+
+    public void stopShooting(){
+        for(var mount : unit.mounts){
+            //ignore mount controllable stats too, they should not shoot either
+            mount.shoot = false;
+        }
+    }
+
+    @Nullable
+    public AIController fallback(){
+        return null;
+    }
+
+    public boolean useFallback(){
+        return false;
+    }
+
+    public void updateVisuals(){
         if(unit.isFlying()){
-            unit.wobble();
+            if(unit.type.wobble) unit.wobble();
 
             unit.lookAt(unit.prefRotation());
         }
     }
 
-    protected void updateMovement(){
+    public void updateMovement(){
 
     }
 
-    protected void updateTargeting(){
+    public void updateTargeting(){
         if(unit.hasWeapons()){
             updateWeapons();
         }
     }
 
-    protected boolean invalid(Teamc target){
+    /** For ground units: Looks at the target, or the movement position. Does not apply to non-omni units. */
+    public void faceTarget(){
+        if(unit.type.omniMovement || unit instanceof Mechc){
+            if(!Units.invalidateTarget(target, unit, unit.range()) && unit.type.faceTarget && unit.type.hasWeapons()){
+                unit.lookAt(Predict.intercept(unit, target, unit.type.weapons.first().bullet.speed));
+            }else if(unit.moving()){
+                unit.lookAt(unit.vel().angle());
+            }
+        }
+    }
+
+    public void faceMovement(){
+        if((unit.type.omniMovement || unit instanceof Mechc) && unit.moving()){
+            unit.lookAt(unit.vel().angle());
+        }
+    }
+
+    public boolean invalid(Teamc target){
         return Units.invalidateTarget(target, unit.team, unit.x, unit.y);
     }
 
-
-    protected void pathfind(int pathTarget){
+    public void pathfind(int pathTarget){
         int costType = unit.pathType();
 
         Tile tile = unit.tileOn();
         if(tile == null) return;
         Tile targetTile = pathfinder.getTargetTile(tile, pathfinder.getField(unit.team, costType, pathTarget));
 
-        if(tile == targetTile || (costType == Pathfinder.costNaval && !targetTile.floor().isLiquid)) return;
+        if(tile == targetTile || !unit.canPass(targetTile.x, targetTile.y)) return;
 
-        unit.moveAt(vec.trns(unit.angleTo(targetTile), unit.speed()));
+        unit.movePref(vec.trns(unit.angleTo(targetTile.worldx(), targetTile.worldy()), prefSpeed()));
     }
 
-    protected void updateWeapons(){
-        if(targets.length != unit.mounts.length) targets = new Teamc[unit.mounts.length];
-
+    public void updateWeapons(){
         float rotation = unit.rotation - 90;
         boolean ret = retarget();
 
         if(ret){
-            target = findTarget(unit.x, unit.y, unit.range(), unit.type.targetAir, unit.type.targetGround);
+            target = findMainTarget(unit.x, unit.y, unit.range(), unit.type.targetAir, unit.type.targetGround);
         }
 
+        noTargetTime += Time.delta;
+
         if(invalid(target)){
             target = null;
+        }else{
+            noTargetTime = 0f;
         }
 
         unit.isShooting = false;
 
-        for(int i = 0; i < targets.length; i++){
-            WeaponMount mount = unit.mounts[i];
+        for(var mount : unit.mounts){
             Weapon weapon = mount.weapon;
+            float wrange = weapon.range();
+
+            //let uncontrollable weapons do their own thing
+            if(!weapon.controllable || weapon.noAttack) continue;
+
+            if(!weapon.aiControllable){
+                mount.rotate = false;
+                continue;
+            }
 
             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;
+                mount.target = target;
             }else{
                 if(ret){
-                    targets[i] = findTarget(mountX, mountY, weapon.bullet.range(), weapon.bullet.collidesAir, weapon.bullet.collidesGround);
+                    mount.target = findTarget(mountX, mountY, wrange, weapon.bullet.collidesAir, weapon.bullet.collidesGround);
                 }
 
-                if(Units.invalidateTarget(targets[i], unit.team, mountX, mountY, weapon.bullet.range())){
-                    targets[i] = null;
+                if(checkTarget(mount.target, mountX, mountY, wrange)){
+                    mount.target = null;
                 }
             }
 
             boolean shoot = false;
 
-            if(targets[i] != null){
-                shoot = targets[i].within(mountX, mountY, weapon.bullet.range()) && shouldShoot();
+            if(mount.target != null){
+                shoot = mount.target.within(mountX, mountY, wrange + (mount.target instanceof Sized s ? s.hitSize()/2f : 0f)) && shouldShoot();
 
-                Vec2 to = Predict.intercept(unit, targets[i], weapon.bullet.speed);
+                Vec2 to = Predict.intercept(unit, mount.target, weapon.bullet.speed);
                 mount.aimX = to.x;
                 mount.aimY = to.y;
             }
 
-            mount.shoot = shoot;
-            mount.rotate = shoot;
+            mount.shoot = mount.rotate = shoot;
+            if(!shouldFire()){
+                mount.shoot = false;
+            }
+
+            unit.isShooting |= mount.shoot;
+
+            if(mount.target == null && !shoot && !Angles.within(mount.rotation, mount.weapon.baseRotation, 0.01f) && noTargetTime >= rotateBackTimer){
+                mount.rotate = true;
+                Tmp.v1.trns(unit.rotation + mount.weapon.baseRotation, 5f);
+                mount.aimX = mountX + Tmp.v1.x;
+                mount.aimY = mountY + Tmp.v1.y;
+            }
 
-            unit.isShooting |= shoot;
             if(shoot){
                 unit.aimX = mount.aimX;
                 unit.aimY = mount.aimY;
@@ -149,40 +211,83 @@ public class AIController implements UnitController{
         }
     }
 
-    protected boolean shouldShoot(){
+    public boolean checkTarget(Teamc target, float x, float y, float range){
+        return Units.invalidateTarget(target, unit.team, x, y, range);
+    }
+
+    /** @return whether the unit should actually fire bullets (as opposed to just targeting something) */
+    public boolean shouldFire(){
         return true;
     }
 
-    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;
+    public boolean shouldShoot(){
+        return true;
     }
 
-    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);
+    public Teamc targetFlag(float x, float y, BlockFlag flag, boolean enemy){
+        if(unit.team == Team.derelict) return null;
+        return Geometry.findClosest(x, y, enemy ? indexer.getEnemy(unit.team, flag) : indexer.getFlagged(unit.team, flag));
     }
 
-    protected boolean retarget(){
-        return timer.get(timerTarget, 40);
+    public 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 && (unit.type.targetUnderBlocks || !t.block.underBullets));
     }
 
-    protected Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
+    public boolean retarget(){
+        return timer.get(timerTarget, target == null ? 40 : 90);
+    }
+
+    public Teamc findMainTarget(float x, float y, float range, boolean air, boolean ground){
+        return findTarget(x, y, range, air, ground);
+    }
+
+    public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
         return target(x, y, range, air, ground);
     }
 
-    protected void init(){
+    public void commandTarget(Teamc moveTo){}
+
+    public void commandPosition(Vec2 pos){}
+
+    /** Called after this controller is assigned a unit. */
+    public void init(){
 
     }
 
-    protected @Nullable Tile getClosestSpawner(){
+    public @Nullable Tile getClosestSpawner(){
         return Geometry.findClosest(unit.x, unit.y, Vars.spawner.getSpawns());
     }
 
-    protected void circle(Position target, float circleLength){
-        circle(target, circleLength, unit.speed());
+    public void unloadPayloads(){
+        if(unit instanceof Payloadc pay && pay.hasPayload() && target instanceof Building && pay.payloads().peek() instanceof UnitPayload){
+            if(target.within(unit, Math.max(unit.type().range + 1f, 75f))){
+                pay.dropLastPayload();
+            }
+        }
     }
 
-    protected void circle(Position target, float circleLength, float speed){
+    public void circleAttack(float circleLength){
+        vec.set(target).sub(unit);
+
+        float ang = unit.angleTo(target);
+        float diff = Angles.angleDist(ang, unit.rotation());
+
+        if(diff > 70f && vec.len() < circleLength){
+            vec.setAngle(unit.vel().angle());
+        }else{
+            vec.setAngle(Angles.moveToward(unit.vel().angle(), vec.angle(), 6f));
+        }
+
+        vec.setLength(prefSpeed());
+
+        unit.movePref(vec);
+    }
+
+    public void circle(Position target, float circleLength){
+        circle(target, circleLength, prefSpeed());
+    }
+
+    public void circle(Position target, float circleLength, float speed){
         if(target == null) return;
 
         vec.set(target).sub(unit);
@@ -193,28 +298,68 @@ public class AIController implements UnitController{
 
         vec.setLength(speed);
 
-        unit.moveAt(vec);
+        unit.movePref(vec);
     }
 
-    protected void moveTo(Position target, float circleLength){
+    public void moveTo(Position target, float circleLength){
         moveTo(target, circleLength, 100f);
     }
 
-    protected void moveTo(Position target, float circleLength, float smooth){
+    public void moveTo(Position target, float circleLength, float smooth){
+        moveTo(target, circleLength, smooth, unit.isFlying(), null);
+    }
+
+    public void moveTo(Position target, float circleLength, float smooth, boolean keepDistance, @Nullable Vec2 offset){
+        moveTo(target, circleLength, smooth, keepDistance, offset, false);
+    }
+
+    public void moveTo(Position target, float circleLength, float smooth, boolean keepDistance, @Nullable Vec2 offset, boolean arrive){
         if(target == null) return;
 
+        float speed = prefSpeed();
+
         vec.set(target).sub(unit);
 
         float length = circleLength <= 0.001f ? 1f : Mathf.clamp((unit.dst(target) - circleLength) / smooth, -1f, 1f);
 
-        vec.setLength(unit.realSpeed() * length);
+        vec.setLength(speed * length);
+
+        if(arrive){
+            Tmp.v3.set(-unit.vel.x / unit.type.accel * 2f, -unit.vel.y / unit.type.accel * 2f).add((target.getX() - unit.x), (target.getY() - unit.y));
+            vec.add(Tmp.v3).limit(speed * length);
+        }
+
         if(length < -0.5f){
-            vec.rotate(180f);
+            if(keepDistance){
+                vec.rotate(180f);
+            }else{
+                vec.setZero();
+            }
         }else if(length < 0){
             vec.setZero();
         }
 
-        unit.moveAt(vec);
+        if(offset != null){
+            vec.add(offset);
+            vec.setLength(speed * length);
+        }
+
+        //ignore invalid movement values
+        if(vec.isNaN() || vec.isInfinite() || vec.isZero()) return;
+
+        if(!unit.type.omniMovement && unit.type.rotateMoveFirst){
+            float angle = vec.angle();
+            unit.lookAt(angle);
+            if(Angles.within(unit.rotation, angle, 3f)){
+                unit.movePref(vec);
+            }
+        }else{
+            unit.movePref(vec);
+        }
+    }
+
+    public float prefSpeed(){
+        return unit.speed();
     }
 
     @Override
diff --git a/core/src/mindustry/entities/units/BuildPlan.java b/core/src/mindustry/entities/units/BuildPlan.java
index 04117b1661..f9930f707f 100644
--- a/core/src/mindustry/entities/units/BuildPlan.java
+++ b/core/src/mindustry/entities/units/BuildPlan.java
@@ -2,20 +2,22 @@ package mindustry.entities.units;
 
 import arc.func.*;
 import arc.math.geom.*;
+import arc.math.geom.QuadTree.*;
 import arc.util.*;
+import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
-/** Class for storing build requests. Can be either a place or remove request. */
-public class BuildPlan implements Position{
-    /** Position and rotation of this request. */
+/** Class for storing build plans. Can be either a place or remove plan. */
+public class BuildPlan implements Position, QuadTreeObject{
+    /** Position and rotation of this plan. */
     public int x, y, rotation;
-    /** Block being placed. If null, this is a breaking request.*/
+    /** Block being placed. If null, this is a breaking plan.*/
     public @Nullable Block block;
-    /** Whether this is a break request.*/
+    /** Whether this is a break plan.*/
     public boolean breaking;
     /** Config int. Not used unless hasConfig is true.*/
     public Object config;
@@ -24,32 +26,34 @@ public class BuildPlan implements Position{
 
     /** Last progress.*/
     public float progress;
-    /** Whether construction has started for this request, and other special variables.*/
-    public boolean initialized, worldContext = true, stuck;
+    /** Whether construction has started for this plan. */
+    public boolean initialized, stuck, cachedValid;
+    /** If true, this plan is in the world. If false, it is being rendered in a schematic. */
+    public boolean worldContext = true;
 
     /** Visual scale. Used only for rendering.*/
     public float animScale = 0f;
 
-    /** This creates a build request. */
+    /** This creates a build plan. */
     public BuildPlan(int x, int y, int rotation, Block block){
         this.x = x;
         this.y = y;
-        this.rotation = rotation;
+        if(block != null) this.rotation = block.planRotation(rotation);
         this.block = block;
         this.breaking = false;
     }
 
-    /** This creates a build request with a config. */
+    /** This creates a build plan with a config. */
     public BuildPlan(int x, int y, int rotation, Block block, Object config){
         this.x = x;
         this.y = y;
-        this.rotation = rotation;
+        if(block != null) this.rotation = block.planRotation(rotation);
         this.block = block;
         this.breaking = false;
         this.config = config;
     }
 
-    /** This creates a remove request. */
+    /** This creates a remove plan. */
     public BuildPlan(int x, int y){
         this.x = x;
         this.y = y;
@@ -61,6 +65,9 @@ public class BuildPlan implements Position{
     public BuildPlan(){
 
     }
+    public boolean placeable(Team team){
+        return Build.validPlace(block, team, x, y, rotation);
+    }
 
     public boolean isRotation(Team team){
         if(breaking) return false;
@@ -74,13 +81,13 @@ public class BuildPlan implements Position{
 
     /** 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();
+        if(config instanceof Point2 point){
+            config = point.cpy();
             cons.get((Point2)config);
-        }else if(config instanceof Point2[]){
-            Point2[] result = new Point2[((Point2[])config).length];
+        }else if(config instanceof Point2[] points){
+            Point2[] result = new Point2[points.length];
             int i = 0;
-            for(Point2 p : (Point2[])config){
+            for(Point2 p : points){
                 result[i] = p.cpy();
                 cons.get(result[i++]);
             }
@@ -131,7 +138,7 @@ public class BuildPlan implements Position{
     public BuildPlan set(int x, int y, int rotation, Block block){
         this.x = x;
         this.y = y;
-        this.rotation = rotation;
+        if(block != null) this.rotation = block.planRotation(rotation);
         this.block = block;
         this.breaking = false;
         return this;
@@ -145,6 +152,17 @@ public class BuildPlan implements Position{
         return y*tilesize + (block == null ? 0 : block.offset);
     }
 
+    public boolean isDone(){
+        Tile tile = world.tile(x, y);
+        if(tile == null) return true;
+        Block tblock = tile.block();
+        if(breaking){
+            return tblock == Blocks.air || tblock == tile.floor();
+        }else{
+            return tblock == block && (tile.build == null || tile.build.rotation == rotation);
+        }
+    }
+
     public @Nullable Tile tile(){
         return world.tile(x, y);
     }
@@ -153,6 +171,15 @@ public class BuildPlan implements Position{
         return world.build(x, y);
     }
 
+    @Override
+    public void hitbox(Rect out){
+        if(block != null){
+            out.setCentered(x * tilesize + block.offset, y * tilesize + block.offset, block.size * tilesize);
+        }else{
+            out.setCentered(x * tilesize, y * tilesize, tilesize);
+        }
+    }
+
     @Override
     public float getX(){
         return drawx();
diff --git a/core/src/mindustry/entities/units/StatusEntry.java b/core/src/mindustry/entities/units/StatusEntry.java
index 1c1f07f9b7..4d405a40b6 100644
--- a/core/src/mindustry/entities/units/StatusEntry.java
+++ b/core/src/mindustry/entities/units/StatusEntry.java
@@ -3,11 +3,12 @@ package mindustry.entities.units;
 import mindustry.type.*;
 
 public class StatusEntry{
-    public static final StatusEntry tmp = new StatusEntry();
-
     public StatusEffect effect;
     public float time;
 
+    //all of these are for the dynamic effect only!
+    public float damageMultiplier = 1f, healthMultiplier = 1f, speedMultiplier = 1f, reloadMultiplier = 1f, buildSpeedMultiplier = 1f, dragMultiplier = 1f, armorOverride = -1f;
+
     public StatusEntry set(StatusEffect effect, float time){
         this.effect = effect;
         this.time = time;
diff --git a/core/src/mindustry/entities/units/UnitCommand.java b/core/src/mindustry/entities/units/UnitCommand.java
deleted file mode 100644
index 977150a92d..0000000000
--- a/core/src/mindustry/entities/units/UnitCommand.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package mindustry.entities.units;
-
-import arc.*;
-
-public enum UnitCommand{
-    attack, rally, idle;
-
-    private final String localized;
-    public static final UnitCommand[] all = values();
-
-    UnitCommand(){
-        localized = Core.bundle.get("command." + name());
-    }
-
-    public String localized(){
-        return localized;
-    }
-}
diff --git a/core/src/mindustry/entities/units/UnitController.java b/core/src/mindustry/entities/units/UnitController.java
index 63aec52ee3..240728b2cc 100644
--- a/core/src/mindustry/entities/units/UnitController.java
+++ b/core/src/mindustry/entities/units/UnitController.java
@@ -1,17 +1,23 @@
 package mindustry.entities.units;
 
+import arc.util.*;
 import mindustry.gen.*;
 
 public interface UnitController{
     void unit(Unit unit);
-    Unit unit();
+    @Nullable Unit unit();
+
+    default void hit(Bullet bullet){
+
+    }
 
     default boolean isValidController(){
         return true;
     }
 
-    default void command(UnitCommand command){
-
+    /** @return whether logic AI can take over */
+    default boolean isLogicControllable(){
+        return false;
     }
 
     default void updateUnit(){
@@ -22,6 +28,10 @@ public interface UnitController{
 
     }
 
+    default void afterRead(Unit unit){
+
+    }
+
     default boolean isBeingControlled(Unit player){
         return false;
     }
diff --git a/core/src/mindustry/entities/units/WeaponMount.java b/core/src/mindustry/entities/units/WeaponMount.java
index e5f61679c7..5cc1567533 100644
--- a/core/src/mindustry/entities/units/WeaponMount.java
+++ b/core/src/mindustry/entities/units/WeaponMount.java
@@ -12,10 +12,22 @@ public class WeaponMount{
     public float reload;
     /** rotation relative to the unit this mount is on */
     public float rotation;
+    /** weapon recoil */
+    public float recoil;
+    /** weapon barrel recoil */
+    public @Nullable float[] recoils;
     /** destination rotation; do not modify! */
     public float targetRotation;
     /** current heat, 0 to 1*/
     public float heat;
+    /** lerps to 1 when shooting, 0 when not */
+    public float warmup;
+    /** is the weapon actively charging */
+    public boolean charging;
+    /** counts up to 1 when charging, 0 when not */
+    public float charge;
+    /** lerps to reload time */
+    public float smoothReload;
     /** aiming position in world coordinates */
     public float aimX, aimY;
     /** whether to shoot right now */
@@ -24,12 +36,23 @@ public class WeaponMount{
     public boolean rotate = false;
     /** extra state for alternating weapons */
     public boolean side;
+    /** total bullets fired from this mount */
+    public int totalShots;
+    /** counter for which barrel bullets have been fired from; used for alternating patterns */
+    public int barrelCounter;
+    /** Last aim length of weapon. Only used for point lasers. */
+    public float lastLength;
     /** current bullet for continuous weapons */
     public @Nullable Bullet bullet;
     /** sound loop for continuous weapons */
     public @Nullable SoundLoop sound;
+    /** current target; used for autonomous weapons and AI */
+    public @Nullable Teamc target;
+    /** retarget counter */
+    public float retarget = 0f;
 
     public WeaponMount(Weapon weapon){
         this.weapon = weapon;
+        this.rotation = weapon.baseRotation;
     }
 }
diff --git a/core/src/mindustry/game/AttackIndicators.java b/core/src/mindustry/game/AttackIndicators.java
new file mode 100644
index 0000000000..dded3808ff
--- /dev/null
+++ b/core/src/mindustry/game/AttackIndicators.java
@@ -0,0 +1,66 @@
+package mindustry.game;
+
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+
+/** Updates and stores attack indicators for the minimap. */
+public class AttackIndicators{
+    private static final float duration = 15f * 60f;
+
+    private LongSeq indicators = new LongSeq(false, 16);
+    private IntIntMap posToIndex = new IntIntMap();
+
+    public LongSeq list(){
+        return indicators;
+    }
+
+    public void clear(){
+        indicators.clear();
+        posToIndex.clear();
+    }
+
+    public void add(int x, int y){
+        int pos = Point2.pack(x, y);
+        int index = posToIndex.get(pos, -1);
+
+        //there is an existing indicator...
+        if(index != -1){
+            //reset its time (new attack)
+            indicators.items[index] = Indicator.time(indicators.items[index], 0f);
+        }else{
+            //new indicator created
+            indicators.add(Indicator.get(pos, 0f));
+            posToIndex.put(pos, indicators.size - 1);
+        }
+    }
+
+    public void update(){
+        long[] items = indicators.items;
+        for(int i = 0; i < indicators.size; i ++){
+            long l = items[i];
+            items[i] = l = Indicator.time(l, Indicator.time(l) + Time.delta);
+
+            if(Indicator.time(l) >= duration){
+                //remove the indicator as it has timed out, make sure to not skip the next one
+                indicators.removeIndex(i);
+                posToIndex.remove(Indicator.pos(l));
+
+                if(indicators.size > 0){
+                    //relocation of head to this new index
+                    posToIndex.put(Indicator.pos(items[i]), i);
+                }
+
+                i --;
+            }
+        }
+    }
+
+    @Struct
+    class IndicatorStruct{
+        int pos;
+        float time;
+    }
+}
diff --git a/core/src/mindustry/game/CampaignRules.java b/core/src/mindustry/game/CampaignRules.java
new file mode 100644
index 0000000000..0ff9a7122c
--- /dev/null
+++ b/core/src/mindustry/game/CampaignRules.java
@@ -0,0 +1,23 @@
+package mindustry.game;
+
+import mindustry.type.*;
+
+public class CampaignRules{
+    public Difficulty difficulty = Difficulty.normal;
+    public boolean fog;
+    public boolean showSpawns;
+    public boolean sectorInvasion;
+    public boolean randomWaveAI;
+    public boolean legacyLaunchPads;
+
+    public void apply(Planet planet, Rules rules){
+        rules.staticFog = rules.fog = fog;
+        rules.showSpawns = showSpawns;
+        rules.randomWaveAI = randomWaveAI;
+        rules.objectiveTimerMultiplier = difficulty.waveTimeMultiplier;
+        rules.teams.get(rules.waveTeam).blockHealthMultiplier = difficulty.enemyHealthMultiplier;
+        rules.teams.get(rules.waveTeam).unitHealthMultiplier = difficulty.enemyHealthMultiplier;
+        rules.teams.get(rules.waveTeam).unitCostMultiplier = 1f / difficulty.enemySpawnMultiplier;
+        rules.teams.get(rules.waveTeam).unitBuildSpeedMultiplier = difficulty.enemySpawnMultiplier;
+    }
+}
diff --git a/core/src/mindustry/game/Difficulty.java b/core/src/mindustry/game/Difficulty.java
new file mode 100644
index 0000000000..fe657294ed
--- /dev/null
+++ b/core/src/mindustry/game/Difficulty.java
@@ -0,0 +1,27 @@
+package mindustry.game;
+
+import arc.*;
+
+public enum Difficulty{
+    //TODO these need tweaks
+    casual(0.75f, 0.5f, 2f),
+    easy(1f, 0.75f, 1.5f),
+    normal(1f, 1f, 1f),
+    hard(1.25f, 1.5f, 0.8f),
+    eradication(1.5f, 2f, 0.6f);
+
+    public static final Difficulty[] all = values();
+
+    //TODO add more fields
+    public float enemyHealthMultiplier, enemySpawnMultiplier, waveTimeMultiplier;
+
+    Difficulty(float enemyHealthMultiplier, float enemySpawnMultiplier, float waveTimeMultiplier){
+        this.enemySpawnMultiplier = enemySpawnMultiplier;
+        this.waveTimeMultiplier = waveTimeMultiplier;
+        this.enemyHealthMultiplier = enemyHealthMultiplier;
+    }
+
+    public String localized(){
+        return Core.bundle.get("difficulty." + name());
+    }
+}
diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
index 3efe48932e..4fdd36885a 100644
--- a/core/src/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -1,27 +1,35 @@
 package mindustry.game;
 
+import arc.math.geom.*;
 import arc.util.*;
 import mindustry.core.GameState.*;
 import mindustry.ctype.*;
-import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.net.*;
+import mindustry.net.Packets.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 public class EventType{
 
     //events that occur very often
     public enum Trigger{
         shock,
-        phaseDeflectHit,
+        openConsole,
+        blastFreeze,
         impactPower,
+        blastGenerator,
+        shockwaveTowerUse,
+        forceProjectorBreak,
         thoriumReactorOverheat,
+        neoplasmReact,
         fireExtinguish,
         acceleratorUse,
         newGame,
         tutorialComplete,
         flameAmmo,
+        resupplyTurret,
         turretCool,
         enablePixelation,
         exclusionDeath,
@@ -30,7 +38,14 @@ public class EventType{
         teamCoreDamage,
         socketConfigChanged,
         update,
+        beforeGameUpdate,
+        afterGameUpdate,
+        unitCommandChange,
+        unitCommandPosition,
+        unitCommandAttack,
+        importMod,
         draw,
+        drawOver,
         preDraw,
         postDraw,
         uiDrawBegin,
@@ -48,12 +63,13 @@ public class EventType{
     public static class ResizeEvent{}
     public static class MapMakeEvent{}
     public static class MapPublishEvent{}
-    public static class SaveLoadEvent{}
+    public static class SaveWriteEvent{}
     public static class ClientCreateEvent{}
     public static class ServerLoadEvent{}
     public static class DisposeEvent{}
     public static class PlayEvent{}
     public static class ResetEvent{}
+    public static class HostEvent{}
     public static class WaveEvent{}
     public static class TurnEvent{}
     /** Called when the player places a line, mobile or desktop.*/
@@ -66,10 +82,29 @@ public class EventType{
     public static class BlockInfoEvent{}
     /** Called *after* all content has been initialized. */
     public static class ContentInitEvent{}
+    /** Called *after* all mod content has been loaded, but before it has been initialized. */
+    public static class ModContentLoadEvent{}
     /** Called when the client game is first loaded. */
     public static class ClientLoadEvent{}
-    /** Called when a game begins and the world is loaded. */
+    /** Called after SoundControl registers its music. */
+    public static class MusicRegisterEvent{}
+    /** Called *after* all the modded files have been added into Vars.tree */
+    public static class FileTreeInitEvent{}
+
+    /** Called when a game begins and the world tiles are loaded, just set `generating = false`. Entities are not yet loaded at this stage. */
     public static class WorldLoadEvent{}
+    /** Called when the world begin to load, just set `generating = true`. */
+    public static class WorldLoadBeginEvent{}
+    /** Called when a game begins and the world tiles are initiated. About to updates tile proximity and sets up physics for the world(Before WorldLoadEvent) */
+    public static class WorldLoadEndEvent{}
+
+    public static class SaveLoadEvent{
+        public final boolean isMap;
+
+        public SaveLoadEvent(boolean isMap){
+            this.isMap = isMap;
+        }
+    }
 
     /** Called when a sector is destroyed by waves when you're not there. */
     public static class SectorLoseEvent{
@@ -105,6 +140,17 @@ public class EventType{
         }
     }
 
+    public static class SectorLaunchLoadoutEvent{
+        public final Sector sector, from;
+        public final Schematic loadout;
+
+        public SectorLaunchLoadoutEvent(Sector sector, Sector from, Schematic loadout){
+            this.sector = sector;
+            this.from = from;
+            this.loadout = loadout;
+        }
+    }
+
     public static class SchematicCreateEvent{
         public final Schematic schematic;
 
@@ -113,16 +159,6 @@ public class EventType{
         }
     }
 
-    public static class CommandIssueEvent{
-        public final Building tile;
-        public final UnitCommand command;
-
-        public CommandIssueEvent(Building tile, UnitCommand command){
-            this.tile = tile;
-            this.command = command;
-        }
-    }
-
     public static class ClientPreConnectEvent{
         public final Host host;
 
@@ -131,6 +167,41 @@ public class EventType{
         }
     }
 
+    public static class ClientServerConnectEvent{
+        public final String ip;
+        public final int port;
+
+        public ClientServerConnectEvent(String ip, int port){
+            this.ip = ip;
+            this.port = port;
+        }
+    }
+
+    /** Consider using Menus.registerMenu instead. */
+    public static class MenuOptionChooseEvent{
+        public final Player player;
+        public final int menuId, option;
+
+        public MenuOptionChooseEvent(Player player, int menuId, int option){
+            this.player = player;
+            this.menuId = menuId;
+            this.option = option;
+        }
+    }
+
+    /** Consider using Menus.registerTextInput instead. */
+    public static class TextInputEvent{
+        public final Player player;
+        public final int textInputId;
+        public final @Nullable String text;
+
+        public TextInputEvent(Player player, int textInputId, String text){
+            this.player = player;
+            this.textInputId = textInputId;
+            this.text = text;
+        }
+    }
+
     public static class PlayerChatEvent{
         public final Player player;
         public final String message;
@@ -141,12 +212,23 @@ public class EventType{
         }
     }
 
+    /** Called when the client sends a chat message. This only fires clientside! */
+    public static class ClientChatEvent{
+        public final String message;
+
+        public ClientChatEvent(String message){
+            this.message = message;
+        }
+    }
+
     /** Called when a sector is conquered, e.g. a boss or base is defeated. */
     public static class SectorCaptureEvent{
         public final Sector sector;
+        public final boolean initialCapture;
 
-        public SectorCaptureEvent(Sector sector){
+        public SectorCaptureEvent(Sector sector, boolean initialCapture){
             this.sector = sector;
+            this.initialCapture = initialCapture;
         }
     }
 
@@ -180,13 +262,13 @@ public class EventType{
         }
     }
 
-    /** Called when the player configures a specific building. */
+    /** Called when a specific building has its configuration changed. */
     public static class ConfigEvent{
         public final Building tile;
-        public final Player player;
+        public final @Nullable Player player;
         public final Object value;
 
-        public ConfigEvent(Building tile, Player player, Object value){
+        public ConfigEvent(Building tile, @Nullable Player player, Object value){
             this.tile = tile;
             this.player = player;
             this.value = value;
@@ -222,6 +304,24 @@ public class EventType{
         }
     }
 
+    public static class PayloadDropEvent{
+        public final Unit carrier;
+        public final @Nullable Unit unit;
+        public final @Nullable Building build;
+
+        public PayloadDropEvent(Unit carrier, Unit unit){
+            this.carrier = carrier;
+            this.unit = unit;
+            this.build = null;
+        }
+
+        public PayloadDropEvent(Unit carrier, Building build){
+            this.carrier = carrier;
+            this.build = build;
+            this.unit = null;
+        }
+    }
+
     public static class UnitControlEvent{
         public final Player player;
         public final @Nullable Unit unit;
@@ -232,6 +332,18 @@ public class EventType{
         }
     }
 
+    public static class BuildingCommandEvent{
+        public final Player player;
+        public final Building building;
+        public final Vec2 position;
+
+        public BuildingCommandEvent(Player player, Building building, Vec2 position){
+            this.player = player;
+            this.building = building;
+            this.position = position;
+        }
+    }
+
     public static class GameOverEvent{
         public final Team winner;
 
@@ -240,11 +352,70 @@ public class EventType{
         }
     }
 
-    public static class TileChangeEvent{
-        public final Tile tile;
+    /**
+     * Called when a bullet damages a building. May not be called for all damage events!
+     * This event is re-used! Never do anything to re-raise this event in the listener.
+     * */
+    public static class BuildDamageEvent{
+        public Building build;
+        public Bullet source;
 
-        public TileChangeEvent(Tile tile){
+        public BuildDamageEvent set(Building build, Bullet source){
+            this.build = build;
+            this.source = source;
+            return this;
+        }
+    }
+
+    /**
+     * Called *before* a tile has changed.
+     * WARNING! This event is special: its instance is reused! Do not cache or use with a timer.
+     * Do not modify any tiles inside listeners that use this tile.
+     * */
+    public static class TilePreChangeEvent{
+        public Tile tile;
+
+        public TilePreChangeEvent set(Tile tile){
             this.tile = tile;
+            return this;
+        }
+    }
+
+    /**
+     * Called *after* a tile has changed.
+     * WARNING! This event is special: its instance is reused! Do not cache or use with a timer.
+     * Do not modify any tiles inside listener code.
+     * */
+    public static class TileChangeEvent{
+        public Tile tile;
+
+        public TileChangeEvent set(Tile tile){
+            this.tile = tile;
+            return this;
+        }
+    }
+
+    /**
+     * Called after a building's team changes.
+     * Event object is reused, do not nest!
+     * */
+    public static class BuildTeamChangeEvent{
+        public Team previous;
+        public Building build;
+
+        public BuildTeamChangeEvent set(Team previous, Building build){
+            this.build = build;
+            this.previous = previous;
+            return this;
+        }
+    }
+
+    /** Called when a core block is placed/removed or its team is changed. */
+    public static class CoreChangeEvent{
+        public CoreBuild core;
+
+        public CoreChangeEvent(CoreBuild core){
+            this.core = core;
         }
     }
 
@@ -307,6 +478,18 @@ public class EventType{
         }
     }
 
+    public static class BuildRotateEvent{
+        public final Building build;
+        public final @Nullable Unit unit;
+        public final int previous;
+
+        public BuildRotateEvent(Building build, @Nullable Unit unit, int previous){
+            this.build = build;
+            this.unit = unit;
+            this.previous = previous;
+        }
+    }
+
     /**
      * Called when a player or drone begins building something.
      * This does not necessarily happen when a new ConstructBlock is created.
@@ -335,6 +518,29 @@ public class EventType{
         }
     }
 
+    /** Called when a neoplasia (or other pressure-based block, from mods) reactor explodes due to pressure.*/
+    public static class GeneratorPressureExplodeEvent{
+        public final Building build;
+
+        public GeneratorPressureExplodeEvent(Building build){
+            this.build = build;
+        }
+    }
+
+    /** Called when a building is directly killed by a bullet. May not fire in all circumstances. */
+    public static class BuildingBulletDestroyEvent{
+        public Building build;
+        public Bullet bullet;
+
+        public BuildingBulletDestroyEvent(Building build, Bullet bullet){
+            this.build = build;
+            this.bullet = bullet;
+        }
+
+        public BuildingBulletDestroyEvent(){
+        }
+    }
+
     public static class UnitDestroyEvent{
         public final Unit unit;
 
@@ -343,6 +549,35 @@ public class EventType{
         }
     }
 
+    /** Called when a unit is directly killed by a bullet. May not fire in all circumstances. */
+    public static class UnitBulletDestroyEvent{
+        public Unit unit;
+        public Bullet bullet;
+
+        public UnitBulletDestroyEvent(Unit unit, Bullet bullet){
+            this.unit = unit;
+            this.bullet = bullet;
+        }
+
+        public UnitBulletDestroyEvent(){
+        }
+    }
+
+    /**
+     * Called when a unit is hit by a bullet.
+     * This event is REUSED, do not nest invocations of it (e.g. damage units in its event handler)
+     * */
+    public static class UnitDamageEvent{
+        public Unit unit;
+        public Bullet bullet;
+
+        public UnitDamageEvent set(Unit unit, Bullet bullet){
+            this.unit = unit;
+            this.bullet = bullet;
+            return this;
+        }
+    }
+
     public static class UnitDrownEvent{
         public final Unit unit;
 
@@ -351,10 +586,37 @@ public class EventType{
         }
     }
 
+    /** Called when a unit is created in a reconstructor, factory or other unit. */
     public static class UnitCreateEvent{
         public final Unit unit;
+        public final @Nullable Building spawner;
+        public final @Nullable Unit spawnerUnit;
 
-        public UnitCreateEvent(Unit unit){
+        public UnitCreateEvent(Unit unit, Building spawner, Unit spawnerUnit){
+            this.unit = unit;
+            this.spawner = spawner;
+            this.spawnerUnit = spawnerUnit;
+        }
+
+        public UnitCreateEvent(Unit unit, Building spawner){
+            this(unit, spawner, null);
+        }
+    }
+
+    /** Called when a unit is spawned by wave. */
+    public static class UnitSpawnEvent{
+        public final Unit unit;
+
+        public UnitSpawnEvent(Unit unit) {
+            this.unit = unit;
+        }
+    }
+
+    /** Called when a unit is dumped from any payload block. */
+    public static class UnitUnloadEvent{
+        public final Unit unit;
+
+        public UnitUnloadEvent(Unit unit){
             this.unit = unit;
         }
     }
@@ -369,7 +631,39 @@ public class EventType{
         }
     }
 
-    /** Called after connecting; when a player receives world data and is ready to play.*/
+    /** Called when a connection is established to a client. */
+    public static class ConnectionEvent{
+        public final NetConnection connection;
+
+        public ConnectionEvent(NetConnection connection){
+            this.connection = connection;
+        }
+    }
+
+    /** Called when a player sends a connection packet. */
+    public static class ConnectPacketEvent{
+        public final NetConnection connection;
+        public final ConnectPacket packet;
+
+        public ConnectPacketEvent(NetConnection connection, ConnectPacket packet){
+            this.connection = connection;
+            this.packet = packet;
+        }
+    }
+
+    /**
+     * Called after player confirmed it has received world data and is ready to play.
+     * Note that if this is the first world receival, then player.con.hasConnected is false.
+     */
+    public static class PlayerConnectionConfirmed{
+        public final Player player;
+
+        public PlayerConnectionConfirmed(Player player){
+            this.player = player;
+        }
+    }
+
+    /** Called after connecting; when a player receives world data and is ready to play. Fired only once, after initial connection. */
     public static class PlayerJoin{
         public final Player player;
 
@@ -387,6 +681,7 @@ public class EventType{
         }
     }
 
+    /** Called before a player leaves the game. */
     public static class PlayerLeave{
         public final Player player;
 
@@ -394,23 +689,29 @@ public class EventType{
             this.player = player;
         }
     }
-    
+
     public static class PlayerBanEvent{
+        @Nullable
         public final Player player;
+        public final String uuid;
 
-        public PlayerBanEvent(Player player){
+        public PlayerBanEvent(Player player, String uuid){
             this.player = player;
+            this.uuid = uuid;
         }
     }
-    
+
     public static class PlayerUnbanEvent{
+        @Nullable
         public final Player player;
+        public final String uuid;
 
-        public PlayerUnbanEvent(Player player){
+        public PlayerUnbanEvent(Player player, String uuid){
             this.player = player;
+            this.uuid = uuid;
         }
     }
-    
+
     public static class PlayerIpBanEvent{
         public final String ip;
 
@@ -418,7 +719,7 @@ public class EventType{
             this.ip = ip;
         }
     }
-    
+
     public static class PlayerIpUnbanEvent{
         public final String ip;
 
@@ -426,6 +727,16 @@ public class EventType{
             this.ip = ip;
         }
     }
-    
-}
 
+    public static class AdminRequestEvent{
+        public final Player player;
+        public final @Nullable Player other;
+        public final AdminAction action;
+
+        public AdminRequestEvent(Player player, Player other, AdminAction action){
+            this.player = player;
+            this.other = other;
+            this.action = action;
+        }
+    }
+}
diff --git a/core/src/mindustry/game/FogControl.java b/core/src/mindustry/game/FogControl.java
new file mode 100644
index 0000000000..0753b44ee8
--- /dev/null
+++ b/core/src/mindustry/game/FogControl.java
@@ -0,0 +1,565 @@
+package mindustry.game;
+
+import arc.*;
+import arc.math.*;
+import arc.struct.Bits;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.core.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.io.SaveFileReader.*;
+import mindustry.io.*;
+import mindustry.world.meta.*;
+
+import java.io.*;
+
+import static mindustry.Vars.*;
+
+public final class FogControl implements CustomChunk{
+    private static volatile int ww, wh;
+    private static final int dynamicUpdateInterval = 1000 / 25; //25 FPS
+    private static final Object notifyStatic = new Object(), notifyDynamic = new Object();
+
+    /** indexed by team */
+    private volatile @Nullable FogData[] fog;
+
+    private final LongSeq staticEvents = new LongSeq();
+    private final LongSeq dynamicEventQueue = new LongSeq(), unitEventQueue = new LongSeq();
+    /** access must be synchronized; accessed from both threads */
+    private final LongSeq dynamicEvents = new LongSeq(100);
+
+    private @Nullable Thread staticFogThread;
+    private @Nullable Thread dynamicFogThread;
+
+    private boolean justLoaded = false;
+    private boolean loadedStatic = false;
+
+    public FogControl(){
+        Events.on(ResetEvent.class, e -> {
+            stop();
+        });
+
+        Events.on(WorldLoadEvent.class, e -> {
+            stop();
+
+            loadedStatic = false;
+            justLoaded = true;
+            ww = world.width();
+            wh = world.height();
+
+            //all old buildings have static light scheduled around them
+            if(state.rules.fog && state.rules.staticFog){
+                pushStaticBlocks(true);
+                //force draw all static stuff immediately
+                updateStatic();
+
+                loadedStatic = true;
+            }
+        });
+
+        Events.on(TileChangeEvent.class, event -> {
+            if(state.rules.fog && event.tile.build != null && event.tile.isCenter() && !event.tile.build.team.isOnlyAI() && event.tile.block().flags.contains(BlockFlag.hasFogRadius)){
+                var data = data(event.tile.team());
+                if(data != null){
+                    data.dynamicUpdated = true;
+                }
+
+                if(state.rules.staticFog){
+                    synchronized(staticEvents){
+                        //TODO event per team?
+                        pushEvent(FogEvent.get(event.tile.x, event.tile.y, Mathf.round(event.tile.build.fogRadius()), event.tile.build.team.id), false);
+                    }
+                }
+            }
+        });
+
+        //on tile removed, dynamic fog goes away
+        Events.on(TilePreChangeEvent.class, e -> {
+            if(state.rules.fog && e.tile.build != null && !e.tile.build.team.isOnlyAI() && e.tile.block().flags.contains(BlockFlag.hasFogRadius)){
+                var data = data(e.tile.team());
+                if(data != null){
+                    data.dynamicUpdated = true;
+                }
+            }
+        });
+
+        //unit dead -> fog updates
+        Events.on(UnitDestroyEvent.class, e -> {
+            if(state.rules.fog && fog[e.unit.team.id] != null){
+                fog[e.unit.team.id].dynamicUpdated = true;
+            }
+        });
+
+        SaveVersion.addCustomChunk("static-fog-data", this);
+    }
+
+    public @Nullable Bits getDiscovered(Team team){
+        return fog == null || fog[team.id] == null ? null : fog[team.id].staticData;
+    }
+
+    public boolean isDiscovered(Team team, int x, int y){
+        if(!state.rules.staticFog || !state.rules.fog || team == null || team.isAI()) return true;
+
+        var data = getDiscovered(team);
+        if(data == null) return false;
+        if(x < 0 || y < 0 || x >= ww || y >= wh) return false;
+        return data.get(x + y * ww);
+    }
+
+    public boolean isVisible(Team team, float x, float y){
+        return isVisibleTile(team, World.toTile(x), World.toTile(y));
+    }
+
+    public boolean isVisibleTile(Team team, int x, int y){
+        if(!state.rules.fog|| team == null || team.isAI()) return true;
+
+        var data = data(team);
+        if(data == null) return false;
+        if(x < 0 || y < 0 || x >= ww || y >= wh) return false;
+        return data.read.get(x + y * ww);
+    }
+
+    public void resetFog(){
+        fog = null;
+    }
+
+    @Nullable FogData data(Team team){
+        return fog == null || fog[team.id] == null ? null : fog[team.id];
+    }
+
+    void stop(){
+        fog = null;
+        //I don't care whether the fog thread crashes here, it's about to die anyway
+        staticEvents.clear();
+        if(staticFogThread != null){
+            staticFogThread.interrupt();
+            staticFogThread = null;
+        }
+
+        dynamicEvents.clear();
+        if(dynamicFogThread != null){
+            dynamicFogThread.interrupt();
+            dynamicFogThread = null;
+        }
+    }
+
+    /** @param initial whether this is the initial update; if true, does not update renderer */
+    void pushStaticBlocks(boolean initial){
+        if(fog == null) fog = new FogData[256];
+
+        synchronized(staticEvents){
+            for(var build : Groups.build){
+                if(build.block.flags.contains(BlockFlag.hasFogRadius)){
+                    if(fog[build.team.id] == null){
+                        fog[build.team.id] = new FogData();
+                    }
+
+                    pushEvent(FogEvent.get(build.tile.x, build.tile.y, Mathf.round(build.fogRadius()), build.team.id), initial);
+                }
+            }
+        }
+    }
+
+    /** @param skipRender whether the event is passed to the fog renderer */
+    void pushEvent(long event, boolean skipRender){
+        if(!state.rules.staticFog) return;
+
+        staticEvents.add(event);
+        if(!skipRender && !headless && FogEvent.team(event) == Vars.player.team().id){
+            renderer.fog.handleEvent(event);
+        }
+    }
+
+    public void forceUpdate(Team team, Building build){
+        if(state.rules.fog && fog[team.id] != null){
+            fog[team.id].dynamicUpdated = true;
+
+            if(state.rules.staticFog){
+                synchronized(staticEvents){
+                    pushEvent(FogEvent.get(build.tile.x, build.tile.y, Mathf.round(build.fogRadius()), build.team.id), false);
+                }
+            }
+        }
+    }
+
+    public void update(){
+        if(fog == null){
+            fog = new FogData[256];
+        }
+
+        //force update static
+        if(state.rules.staticFog && !loadedStatic){
+            pushStaticBlocks(false);
+            updateStatic();
+            loadedStatic = true;
+        }
+
+        if(staticFogThread == null){
+            staticFogThread = new StaticFogThread();
+            staticFogThread.setPriority(Thread.NORM_PRIORITY - 1);
+            staticFogThread.setDaemon(true);
+            staticFogThread.start();
+        }
+
+        if(dynamicFogThread == null){
+            dynamicFogThread = new DynamicFogThread();
+            dynamicFogThread.setPriority(Thread.NORM_PRIORITY - 1);
+            dynamicFogThread.setDaemon(true);
+            dynamicFogThread.start();
+        }
+
+        //clear to prepare for queuing fog radius from units and buildings
+        dynamicEventQueue.clear();
+
+        for(var team : state.teams.present){
+            //AI teams do not have fog
+            if(!team.team.isOnlyAI()){
+                //separate for each team
+                unitEventQueue.clear();
+
+                FogData data = fog[team.team.id];
+
+                if(data == null){
+                    data = fog[team.team.id] = new FogData();
+                }
+
+                synchronized(staticEvents){
+                    //TODO slow?
+                    for(var unit : team.units){
+                        int tx = unit.tileX(), ty = unit.tileY(), pos = tx + ty * ww;
+                        if(unit.type.fogRadius <= 0f) continue;
+                        long event = FogEvent.get(tx, ty, (int)unit.type.fogRadius, team.team.id);
+
+                        //always update the dynamic events, but only *flush* the results when necessary?
+                        unitEventQueue.add(event);
+
+                        if(unit.lastFogPos != pos){
+                            pushEvent(event, false);
+                            unit.lastFogPos = pos;
+                            data.dynamicUpdated = true;
+                        }
+                    }
+                }
+
+                //if it's time for an update, flush *everything* onto the update queue
+                if(data.dynamicUpdated && Time.timeSinceMillis(data.lastDynamicMs) > dynamicUpdateInterval){
+                    data.dynamicUpdated = false;
+                    data.lastDynamicMs = Time.millis();
+
+                    //add building updates
+                    for(var build : indexer.getFlagged(team.team, BlockFlag.hasFogRadius)){
+                        dynamicEventQueue.add(FogEvent.get(build.tile.x, build.tile.y, Mathf.round(build.fogRadius()), build.team.id));
+                    }
+
+                    //add unit updates
+                    dynamicEventQueue.addAll(unitEventQueue);
+                }
+            }
+        }
+
+        if(dynamicEventQueue.size > 0){
+            //flush unit events over when something happens
+            synchronized(dynamicEvents){
+                dynamicEvents.clear();
+                dynamicEvents.addAll(dynamicEventQueue);
+            }
+            dynamicEventQueue.clear();
+
+            //force update so visibility doesn't have a pop-in
+            if(justLoaded){
+                updateDynamic(new Bits(256));
+                justLoaded = false;
+            }
+
+            //notify that it's time for rendering
+            //TODO this WILL block until it is done rendering, which is inherently problematic.
+            synchronized(notifyDynamic){
+                notifyDynamic.notify();
+            }
+        }
+
+        //wake up, it's time to draw some circles
+        if(state.rules.staticFog && staticEvents.size > 0 && staticFogThread != null){
+            synchronized(notifyStatic){
+                notifyStatic.notify();
+            }
+        }
+    }
+
+    class StaticFogThread extends Thread{
+
+        StaticFogThread(){
+            super("StaticFogThread");
+        }
+
+        @Override
+        public void run(){
+            while(true){
+                try{
+                    synchronized(notifyStatic){
+                        try{
+                            //wait until an event happens
+                            notifyStatic.wait();
+                        }catch(InterruptedException e){
+                            //end thread
+                            return;
+                        }
+                    }
+
+                    updateStatic();
+                    //ignore, don't want to crash this thread
+                }catch(Exception e){}
+            }
+        }
+    }
+
+    void updateStatic(){
+
+        //I really don't like synchronizing here, but there should be *some* performance benefit at least
+        synchronized(staticEvents){
+            int size = staticEvents.size;
+            for(int i = 0; i < size; i++){
+                long event = staticEvents.items[i];
+                int x = FogEvent.x(event), y = FogEvent.y(event), rad = FogEvent.radius(event), team = FogEvent.team(event);
+                var data = fog[team];
+                if(data != null){
+                    circle(data.staticData, x, y, rad);
+                }
+            }
+            staticEvents.clear();
+        }
+    }
+
+    class DynamicFogThread extends Thread{
+        final Bits cleared = new Bits();
+
+        DynamicFogThread(){
+            super("DynamicFogThread");
+        }
+
+        @Override
+        public void run(){
+
+            while(true){
+                try{
+                    synchronized(notifyDynamic){
+                        try{
+                            //wait until an event happens
+                            notifyDynamic.wait();
+                        }catch(InterruptedException e){
+                            //end thread
+                            return;
+                        }
+                    }
+
+                    updateDynamic(cleared);
+
+                    //ignore, don't want to crash this thread
+                }catch(Exception e){
+                    //log for debugging
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    void updateDynamic(Bits cleared){
+        cleared.clear();
+
+        //ugly sync
+        synchronized(dynamicEvents){
+            int size = dynamicEvents.size;
+
+            //draw step
+            for(int i = 0; i < size; i++){
+                long event = dynamicEvents.items[i];
+                int x = FogEvent.x(event), y = FogEvent.y(event), rad = FogEvent.radius(event), team = FogEvent.team(event);
+
+                if(rad <= 0) continue;
+
+                var data = fog[team];
+                if(data != null){
+
+                    //clear the buffer, since it is being re-drawn
+                    if(!cleared.get(team)){
+                        cleared.set(team);
+
+                        data.write.clear();
+                    }
+
+                    //radius is always +1 to keep up with visuals
+                    circle(data.write, x, y, rad + 1);
+                }
+            }
+            dynamicEvents.clear();
+        }
+
+        //swap step, no need for synchronization or anything
+        for(int i = 0; i < 256; i++){
+            if(cleared.get(i)){
+                var data = fog[i];
+
+                //swap buffers, flushing the data that was just drawn
+                Bits temp = data.read;
+                data.read = data.write;
+                data.write = temp;
+            }
+        }
+    }
+
+    @Override
+    public void write(DataOutput stream) throws IOException{
+        int used = 0;
+        for(int i = 0; i < 256; i++){
+            if(fog[i] != null) used ++;
+        }
+
+        stream.writeByte(used);
+        stream.writeShort(world.width());
+        stream.writeShort(world.height());
+
+        for(int i = 0; i < 256; i++){
+            if(fog[i] != null){
+                stream.writeByte(i);
+                Bits data = fog[i].staticData;
+                int size = ww * wh;
+
+                int pos = 0;
+                while(pos < size){
+                    int consecutives = 0;
+                    boolean cur = data.get(pos);
+                    while(consecutives < 127 && pos < size){
+                        if(cur != data.get(pos)){
+                            break;
+                        }
+
+                        consecutives ++;
+                        pos ++;
+                    }
+                    int mask = (cur ? 0b1000_0000 : 0);
+                    stream.write(mask | (consecutives));
+                }
+            }
+        }
+    }
+
+    @Override
+    public void read(DataInput stream) throws IOException{
+        if(fog == null) fog = new FogData[256];
+
+        int teams = stream.readUnsignedByte();
+        int w = stream.readShort(), h = stream.readShort();
+        int len = w * h;
+
+        ww = w;
+        wh = h;
+
+        for(int ti = 0; ti < teams; ti++){
+            int team = stream.readUnsignedByte();
+            fog[team] = new FogData();
+
+            int pos = 0;
+            Bits bools = fog[team].staticData;
+
+            while(pos < len){
+                int data = stream.readByte() & 0xff;
+                boolean sign = (data & 0b1000_0000) != 0;
+                int consec = data & 0b0111_1111;
+
+                if(sign){
+                    bools.set(pos, pos + consec);
+                    pos += consec;
+                }else{
+                    pos += consec;
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public boolean shouldWrite(){
+        return state.rules.fog && state.rules.staticFog && fog != null;
+    }
+
+    static void circle(Bits arr, int x, int y, int radius){
+        int f = 1 - radius;
+        int ddFx = 1, ddFy = -2 * radius;
+        int px = 0, py = radius;
+
+        hline(arr, x, x, y + radius);
+        hline(arr, x, x, y - radius);
+        hline(arr, x - radius, x + radius, y);
+
+        while(px < py){
+            if(f >= 0){
+                py--;
+                ddFy += 2;
+                f += ddFy;
+            }
+            px++;
+            ddFx += 2;
+            f += ddFx;
+            hline(arr, x - px, x + px, y + py);
+            hline(arr, x - px, x + px, y - py);
+            hline(arr, x - py, x + py, y + px);
+            hline(arr, x - py, x + py, y - px);
+        }
+    }
+
+    static void hline(Bits arr, int x1, int x2, int y){
+        if(y < 0 || y >= wh) return;
+        int tmp;
+
+        if(x1 > x2){
+            tmp = x1;
+            x1 = x2;
+            x2 = tmp;
+        }
+
+        if(x1 >= ww) return;
+        if(x2 < 0) return;
+
+        if(x1 < 0) x1 = 0;
+        if(x2 >= ww) x2 = ww - 1;
+        x2++;
+        int off = y * ww;
+
+        arr.set(off + x1, off + x2);
+    }
+
+    static class FogData{
+        /** dynamic double-buffered data for dynamic (live) coverage */
+        volatile Bits read, write;
+        /** static map exploration fog*/
+        final Bits staticData;
+
+        /** last dynamic update timestamp. */
+        long lastDynamicMs = 0;
+        /** if true, a dynamic fog update must be scheduled. */
+        boolean dynamicUpdated = true;
+
+        FogData(){
+            int len = ww * wh;
+
+            read = new Bits(len);
+            write = new Bits(len);
+            staticData = new Bits(len);
+        }
+    }
+
+    @Struct
+    class FogEventStruct{
+        @StructField(16)
+        int x;
+        @StructField(16)
+        int y;
+        @StructField(16)
+        int radius;
+        @StructField(8)
+        int team;
+    }
+}
diff --git a/core/src/mindustry/game/GameStats.java b/core/src/mindustry/game/GameStats.java
index 19d404c802..a96fd80f8e 100644
--- a/core/src/mindustry/game/GameStats.java
+++ b/core/src/mindustry/game/GameStats.java
@@ -1,52 +1,27 @@
 package mindustry.game;
 
-import arc.math.*;
 import arc.struct.*;
 import mindustry.type.*;
+import mindustry.world.*;
 
-//TODO more stats:
-//- units constructed
 public class GameStats{
-    /** Total items delivered to global resoure counter. Campaign only. */
-    public ObjectIntMap<Item> itemsDelivered = new ObjectIntMap<>();
     /** Enemy (red team) units destroyed. */
     public int enemyUnitsDestroyed;
     /** Total waves lasted. */
     public int wavesLasted;
-    /** Total (ms) time lasted in this save/zone. */
-    public long timeLasted;
     /** Friendly buildings fully built. */
     public int buildingsBuilt;
     /** Friendly buildings fully deconstructed. */
     public int buildingsDeconstructed;
     /** Friendly buildings destroyed. */
     public int buildingsDestroyed;
-
-    //unused
-    public RankResult calculateRank(Sector sector){
-        float score = 0;
-
-        int rankIndex = Mathf.clamp((int)score, 0, Rank.all.length - 1);
-        Rank rank = Rank.all[rankIndex];
-        String sign = Math.abs((rankIndex + 0.5f) - score) < 0.2f || rank.name().contains("S") ? "" : (rankIndex + 0.5f) < score ? "-" : "+";
-
-        return new RankResult(rank, sign);
-    }
-
-    public static class RankResult{
-        public final Rank rank;
-        /** + or - */
-        public final String modifier;
-
-        public RankResult(Rank rank, String modifier){
-            this.rank = rank;
-            this.modifier = modifier;
-        }
-    }
-
-    public enum Rank{
-        F, D, C, B, A, S, SS;
-
-        public static final Rank[] all = values();
-    }
+    /** Total units created by any means. */
+    public int unitsCreated;
+    /** Record of blocks that have been placed by count. Used for objectives only. */
+    public ObjectIntMap<Block> placedBlockCount = new ObjectIntMap<>();
+    /**
+     * Record of items that have entered the core through transport blocks. Used for objectives only.
+     * This can easily be ""spoofed"" with unloaders, so don't use it for anything remotely important.
+     * */
+    public ObjectIntMap<Item> coreItemCount = new ObjectIntMap<>();
 }
diff --git a/core/src/mindustry/game/Gamemode.java b/core/src/mindustry/game/Gamemode.java
index f2bb95130a..4c2512e9ca 100644
--- a/core/src/mindustry/game/Gamemode.java
+++ b/core/src/mindustry/game/Gamemode.java
@@ -2,10 +2,9 @@ package mindustry.game;
 
 import arc.*;
 import arc.func.*;
+import arc.util.*;
 import mindustry.maps.*;
 
-import static mindustry.Vars.*;
-
 /** Defines preset rule sets. */
 public enum Gamemode{
     survival(rules -> {
@@ -14,31 +13,32 @@ public enum Gamemode{
     }, map -> map.spawns > 0),
     sandbox(rules -> {
         rules.infiniteResources = true;
+        rules.allowEditRules = true;
         rules.waves = true;
         rules.waveTimer = false;
     }),
     attack(rules -> {
         rules.attackMode = true;
-        rules.waves = true;
+        //TODO waves is now a bad idea
+        //rules.waves = true;
         rules.waveTimer = true;
 
-        rules.waveSpacing /= 2f;
-        rules.teams.get(rules.waveTeam).infiniteResources = true;
-    }, map -> map.teams.contains(state.rules.waveTeam.id)),
+        rules.waveSpacing = 2f * Time.toMinutes;
+        rules.waveTeam.rules().infiniteResources = true;
+    }, map -> map.teams.size > 1),
     pvp(rules -> {
         rules.pvp = true;
         rules.enemyCoreBuildRadius = 600f;
         rules.buildCostMultiplier = 1f;
         rules.buildSpeedMultiplier = 1f;
         rules.unitBuildSpeedMultiplier = 2f;
-        rules.unitHealthMultiplier = 3f;
         rules.attackMode = true;
     }, map -> map.teams.size > 1),
     editor(true, rules -> {
         rules.infiniteResources = true;
+        rules.instantBuild = true;
         rules.editor = true;
         rules.waves = false;
-        rules.enemyCoreBuildRadius = 0f;
         rules.waveTimer = false;
     });
 
diff --git a/core/src/mindustry/game/MapMarkers.java b/core/src/mindustry/game/MapMarkers.java
new file mode 100644
index 0000000000..3afb6895ee
--- /dev/null
+++ b/core/src/mindustry/game/MapMarkers.java
@@ -0,0 +1,72 @@
+package mindustry.game;
+
+import arc.struct.*;
+import arc.util.*;
+import mindustry.game.MapObjectives.*;
+import mindustry.io.*;
+
+import java.io.*;
+import java.util.*;
+
+public class MapMarkers implements Iterable<ObjectiveMarker>{
+    /** Maps marker unique ID to marker. */
+    private IntMap<ObjectiveMarker> map = new IntMap<>();
+    /** Sequential list of markers. This allows for faster iteration than a map. */
+    private Seq<ObjectiveMarker> all = new Seq<>(false);
+
+    public void add(int id, ObjectiveMarker marker){
+        if(marker == null) return;
+
+        var prev = map.put(id, marker);
+        if(prev != null){
+            all.set(prev.arrayIndex, marker);
+        }else{
+            all.add(marker);
+            marker.arrayIndex = all.size - 1;
+        }
+    }
+
+    public void remove(int id){
+        var prev = map.remove(id);
+        if(prev != null){
+            if(all.size > prev.arrayIndex + 1){ //there needs to be something above the index to replace it with
+                all.remove(prev.arrayIndex);
+                //update its index
+                all.get(prev.arrayIndex).arrayIndex = prev.arrayIndex;
+            }else{
+                //no sense updating the index of the replaced element when it was not replaced
+                all.remove(prev.arrayIndex);
+            }
+        }
+    }
+
+    public @Nullable ObjectiveMarker get(int id){
+        return map.get(id);
+    }
+
+    public boolean has(int id){
+        return get(id) != null;
+    }
+
+    public int size(){
+        return all.size;
+    }
+
+    public void write(DataOutput stream) throws IOException{
+        JsonIO.writeBytes(map, ObjectiveMarker.class, (DataOutputStream)stream);
+    }
+
+    public void read(DataInput stream) throws IOException{
+        all.clear();
+        map = JsonIO.readBytes(IntMap.class, ObjectiveMarker.class, (DataInputStream)stream);
+        for(var entry : map.entries()){
+            all.add(entry.value);
+            entry.value.arrayIndex = all.size - 1;
+        }
+    }
+
+    @Override
+    public Iterator<ObjectiveMarker> iterator(){
+        return all.iterator();
+    }
+}
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
new file mode 100644
index 0000000000..3a6f77e5ae
--- /dev/null
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -0,0 +1,1304 @@
+package mindustry.game;
+
+import arc.*;
+import arc.func.*;
+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.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.game.MapObjectives.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.logic.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import java.lang.annotation.*;
+import java.util.*;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+import static mindustry.Vars.*;
+
+/** Handles and executes in-map objectives. */
+public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObjective>{
+    public static final Seq<Prov<? extends MapObjective>> allObjectiveTypes = new Seq<>();
+    public static final Seq<Prov<? extends ObjectiveMarker>> allMarkerTypes = new Seq<>();
+    public static final ObjectMap<String, Prov<? extends ObjectiveMarker>> markerNameToType = new ObjectMap<>();
+    public static final Seq<String> allMarkerTypeNames = new Seq<>();
+
+    /**
+     * All objectives the executor contains. Do not modify directly, ever!
+     * @see #eachRunning(Cons)
+     */
+    public Seq<MapObjective> all = new Seq<>(4);
+
+    static{
+        registerObjective(
+            ResearchObjective::new,
+            ProduceObjective::new,
+            ItemObjective::new,
+            CoreItemObjective::new,
+            BuildCountObjective::new,
+            UnitCountObjective::new,
+            DestroyUnitsObjective::new,
+            TimerObjective::new,
+            DestroyBlockObjective::new,
+            DestroyBlocksObjective::new,
+            DestroyCoreObjective::new,
+            CommandModeObjective::new,
+            FlagObjective::new
+        );
+
+        registerMarker(
+            ShapeTextMarker::new,
+            PointMarker::new,
+            ShapeMarker::new,
+            TextMarker::new,
+            LineMarker::new,
+            TextureMarker::new,
+            QuadMarker::new
+        );
+
+        registerLegacyMarker("Minimap", PointMarker::new);
+    }
+
+    @SafeVarargs
+    public static void registerObjective(Prov<? extends MapObjective>... providers){
+        for(var prov : providers){
+            allObjectiveTypes.add(prov);
+
+            Class<? extends MapObjective> type = prov.get().getClass();
+            String name = type.getSimpleName().replace("Objective", "");
+            JsonIO.classTag(Strings.camelize(name), type);
+            JsonIO.classTag(name, type);
+        }
+    }
+
+    @SafeVarargs
+    public static void registerMarker(Prov<? extends ObjectiveMarker>... providers){
+        for(var prov : providers){
+            allMarkerTypes.add(prov);
+
+            Class<? extends ObjectiveMarker> type = prov.get().getClass();
+            String name = type.getSimpleName().replace("Marker", "");
+            allMarkerTypeNames.add(Strings.camelize(name));
+            markerNameToType.put(name, prov);
+            markerNameToType.put(Strings.camelize(name), prov);
+            JsonIO.classTag(Strings.camelize(name), type);
+            JsonIO.classTag(name, type);
+        }
+    }
+
+    public static void registerLegacyMarker(String name, Prov<? extends ObjectiveMarker> prov) {
+        Class<?> type = prov.get().getClass();
+
+        markerNameToType.put(name, prov);
+        markerNameToType.put(Strings.camelize(name), prov);
+        JsonIO.classTag(Strings.camelize(name), type);
+        JsonIO.classTag(name, type);
+    }
+
+    public MapObjectives(Seq<MapObjective> all){
+        this.all.addAll(all);
+    }
+
+    public MapObjectives(){
+    }
+
+    /** Adds all given objectives to the executor as root objectives. */
+    public void add(MapObjective... objectives){
+        for(var objective : objectives) flatten(objective);
+    }
+
+    /** Recursively adds the objective and its children. */
+    private void flatten(MapObjective objective){
+        for(var child : objective.children) flatten(child);
+
+        objective.children.clear();
+        all.add(objective);
+    }
+
+    /** Updates all objectives this executor contains. */
+    public void update(){
+        eachRunning(obj -> {
+            //objectives cannot get completed on the client, but they do try to update for timers and such
+            if(obj.update() && !net.client()){
+                Call.completeObjective(all.indexOf(obj));
+            }
+        });
+    }
+
+    public @Nullable MapObjective get(int index){
+        return index < 0 || index >= all.size ? null : all.get(index);
+    }
+
+    /** @return Whether there are any qualified objectives at all. */
+    public boolean any(){
+        return all.count(MapObjective::qualified) > 0;
+    }
+
+    public void clear(){
+        all.clear();
+    }
+
+    /** Iterates over all qualified in-map objectives. */
+    public void eachRunning(Cons<MapObjective> cons){
+        all.each(MapObjective::qualified, cons);
+    }
+
+    /** Iterates over all qualified in-map objectives, with a filter. */
+    public <T extends MapObjective> void eachRunning(Boolf<? super MapObjective> pred, Cons<T> cons){
+        all.each(obj -> obj.qualified() && pred.get(obj), cons);
+    }
+
+    @Override
+    public Iterator<MapObjective> iterator(){
+        return all.iterator();
+    }
+
+    @Override
+    public void each(Cons<? super MapObjective> cons){
+        all.each(cons);
+    }
+
+    /** Base abstract class for any in-map objective. */
+    public static abstract class MapObjective{
+        public boolean hidden;
+        public @Nullable @Multiline String details;
+        public @Unordered String[] flagsAdded = {};
+        public @Unordered String[] flagsRemoved = {};
+        public ObjectiveMarker[] markers = {};
+
+        /** The parents of this objective. All parents must be done in order for this to be updated. */
+        public transient Seq<MapObjective> parents = new Seq<>(2);
+        /** Temporary container to store references since this class is static. Will immediately be flattened. */
+        private transient final Seq<MapObjective> children = new Seq<>(2);
+
+        /** For the objectives UI dialog. Do not modify directly! */
+        public transient int editorX = -1, editorY = -1;
+
+        /** Whether this objective has been done yet. This is internally set. */
+        private boolean completed;
+        /** Internal value. Do not modify! */
+        private transient boolean depFinished;
+
+        /** @return True if this objective is done and should be removed from the executor. */
+        public abstract boolean update();
+
+        /** Reset internal state, if any. */
+        public void reset(){}
+
+        /** Called once after {@link #update()} returns true, before this objective is removed. */
+        public void done(){
+            state.rules.objectiveFlags.removeAll(flagsRemoved);
+            state.rules.objectiveFlags.addAll(flagsAdded);
+            completed = true;
+        }
+
+        /** @return True if all {@link #parents} are completed, rendering this objective able to execute. */
+        public final boolean dependencyFinished(){
+            if(depFinished) return true;
+
+            for(var parent : parents){
+                if(!parent.isCompleted()) return false;
+            }
+
+            return depFinished = true;
+        }
+
+        /** @return True if this objective is done (practically, has been removed from the executor). */
+        public final boolean isCompleted(){
+            return completed;
+        }
+
+        /** @return Whether this objective should run at all. */
+        public boolean qualified(){
+            return !completed && dependencyFinished();
+        }
+
+        /** @return This objective, with the given child's parents added with this, for chaining operations. */
+        public MapObjective child(MapObjective child){
+            child.parents.add(this);
+            children.add(child);
+            return this;
+        }
+
+        /** @return This objective, with the given parent added to this objective's parents, for chaining operations. */
+        public MapObjective parent(MapObjective parent){
+            parents.add(parent);
+            return this;
+        }
+
+        /** @return This objective, with the details message assigned to, for chaining operations. */
+        public MapObjective details(String details){
+            this.details = details;
+            return this;
+        }
+
+        /** @return This objective, with the added-flags assigned to, for chaining operations. */
+        public MapObjective flagsAdded(String... flagsAdded){
+            this.flagsAdded = flagsAdded;
+            return this;
+        }
+
+        /** @return This objective, with the removed-flags assigned to, for chaining operations. */
+        public MapObjective flagsRemoved(String... flagsRemoved){
+            this.flagsRemoved = flagsRemoved;
+            return this;
+        }
+
+        /** @return This objective, with the markers assigned to, for chaining operations. */
+        public MapObjective markers(ObjectiveMarker... markers){
+            this.markers = markers;
+            return this;
+        }
+
+        /** @return Basic mission display text. If null, falls back to standard text. */
+        public @Nullable String text(){
+            return null;
+        }
+
+        /** @return Details that appear upon click. */
+        public @Nullable String details(){
+            return details;
+        }
+
+        /** @return The localized type-name of this objective, defaulting to the class simple name without the "Objective" prefix. */
+        public String typeName(){
+            String className = getClass().getSimpleName().replace("Objective", "");
+            return Core.bundle == null ? className : Core.bundle.get("objective." + className.toLowerCase() + ".name", className);
+        }
+    }
+
+    /** Research a specific piece of content in the tech tree. */
+    public static class ResearchObjective extends MapObjective{
+        public @Researchable UnlockableContent content = Items.copper;
+
+        public ResearchObjective(UnlockableContent content){
+            this.content = content;
+        }
+
+        public ResearchObjective(){}
+
+        @Override
+        public boolean update(){
+            return content.unlocked();
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.research", content.emoji(), content.localizedName);
+        }
+    }
+
+    /** Produce a specific piece of content in the tech tree (essentially research with different text). */
+    public static class ProduceObjective extends MapObjective{
+        public @Researchable UnlockableContent content = Items.copper;
+
+        public ProduceObjective(UnlockableContent content){
+            this.content = content;
+        }
+
+        public ProduceObjective(){}
+
+        @Override
+        public boolean update(){
+            return content.unlocked();
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.produce", content.emoji(), content.localizedName);
+        }
+    }
+
+    /** Have a certain amount of item in your core. */
+    public static class ItemObjective extends MapObjective{
+        public Item item = Items.copper;
+        public int amount = 1;
+
+        public ItemObjective(Item item, int amount){
+            this.item = item;
+            this.amount = amount;
+        }
+
+        public ItemObjective(){}
+
+        @Override
+        public boolean update(){
+            return state.rules.defaultTeam.items().has(item, amount);
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.item", state.rules.defaultTeam.items().get(item), amount, item.emoji(), item.localizedName);
+        }
+    }
+
+    /** Get a certain item in your core (through a block, not manually.) */
+    public static class CoreItemObjective extends MapObjective{
+        public Item item = Items.copper;
+        public int amount = 2;
+
+        public CoreItemObjective(Item item, int amount){
+            this.item = item;
+            this.amount = amount;
+        }
+
+        public CoreItemObjective(){}
+
+        @Override
+        public boolean update(){
+            return state.stats.coreItemCount.get(item) >= amount;
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.coreitem", state.stats.coreItemCount.get(item), amount, item.emoji(), item.localizedName);
+        }
+    }
+
+    /** Build a certain amount of a block. */
+    public static class BuildCountObjective extends MapObjective{
+        public @Synthetic Block block = Blocks.conveyor;
+        public int count = 1;
+
+        public BuildCountObjective(Block block, int count){
+            this.block = block;
+            this.count = count;
+        }
+
+        public BuildCountObjective(){}
+
+        @Override
+        public boolean update(){
+            return state.stats.placedBlockCount.get(block, 0) >= count;
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.build", count - state.stats.placedBlockCount.get(block, 0), block.emoji(), block.localizedName);
+        }
+    }
+
+    /** Produce a certain amount of a unit. */
+    public static class UnitCountObjective extends MapObjective{
+        public UnitType unit = UnitTypes.dagger;
+        public int count = 1;
+
+        public UnitCountObjective(UnitType unit, int count){
+            this.unit = unit;
+            this.count = count;
+        }
+
+        public UnitCountObjective(){}
+
+        @Override
+        public boolean update(){
+            return state.rules.defaultTeam.data().countType(unit) >= count;
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.buildunit", count - state.rules.defaultTeam.data().countType(unit), unit.emoji(), unit.localizedName);
+        }
+    }
+
+    /** Produce a certain amount of units. */
+    public static class DestroyUnitsObjective extends MapObjective{
+        public int count = 1;
+
+        public DestroyUnitsObjective(int count){
+            this.count = count;
+        }
+
+        public DestroyUnitsObjective(){}
+
+        @Override
+        public boolean update(){
+            return state.stats.enemyUnitsDestroyed >= count;
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.destroyunits", count - state.stats.enemyUnitsDestroyed);
+        }
+    }
+
+    public static class TimerObjective extends MapObjective{
+        public @Multiline String text;
+        public @Second float duration = 60f * 30f;
+
+        protected float countup;
+
+        public TimerObjective(String text, float duration){
+            this.text = text;
+            this.duration = duration;
+        }
+
+        public TimerObjective(){
+        }
+
+        @Override
+        public boolean update(){
+            return (countup += Time.delta) >= duration * state.rules.objectiveTimerMultiplier;
+        }
+
+        @Override
+        public void reset(){
+            countup = 0f;
+        }
+
+        @Nullable
+        @Override
+        public String text(){
+            if(text != null){
+                int i = (int)((duration * state.rules.objectiveTimerMultiplier - countup) / 60f);
+                StringBuilder timeString = new StringBuilder();
+
+                int m = i / 60;
+                int s = i % 60;
+                if(m > 0){
+                    timeString.append(m);
+                    timeString.append(":");
+                    if(s < 10){
+                        timeString.append("0");
+                    }
+                }
+                timeString.append(s);
+
+                if(text.startsWith("@")){
+                    if(state.mapLocales.containsProperty(text.substring(1))){
+                        try{
+                            return state.mapLocales.getFormatted(text.substring(1), timeString.toString());
+                        }catch(IllegalArgumentException e){
+                            //illegal text.
+                            text = "";
+                        }
+                    }
+                    return Core.bundle.format(text.substring(1), timeString.toString());
+                }else{
+                    try{
+                        return Core.bundle.formatString(text, timeString.toString());
+                    }catch(IllegalArgumentException e){
+                        //illegal text.
+                        text = "";
+                    }
+
+                }
+            }
+
+            return null;
+        }
+    }
+
+    public static class DestroyBlockObjective extends MapObjective{
+        public Point2 pos = new Point2();
+        public Team team = Team.crux;
+        public @Synthetic Block block = Blocks.router;
+
+        public DestroyBlockObjective(Block block, int x, int y, Team team){
+            this.block = block;
+            this.team = team;
+            this.pos.set(x, y);
+        }
+
+        public DestroyBlockObjective(){}
+
+        @Override
+        public boolean update(){
+            var build = world.build(pos.x, pos.y);
+            return build == null || build.team != team || build.block != block;
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.destroyblock", block.emoji(), block.localizedName);
+        }
+    }
+
+    public static class DestroyBlocksObjective extends MapObjective{
+        public @Unordered Point2[] positions = {};
+        public Team team = Team.crux;
+        public @Synthetic Block block = Blocks.router;
+
+        public DestroyBlocksObjective(Block block, Team team, Point2... positions){
+            this.block = block;
+            this.team = team;
+            this.positions = positions;
+        }
+
+        public DestroyBlocksObjective(){}
+
+        public int progress(){
+            int count = 0;
+            for(var pos : positions){
+                var build = world.build(pos.x, pos.y);
+                if(build == null || build.team != team || build.block != block){
+                    count ++;
+                }
+            }
+            return count;
+        }
+
+        @Override
+        public boolean update(){
+            return progress() >= positions.length;
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.format("objective.destroyblocks", progress(), positions.length, block.emoji(), block.localizedName);
+        }
+    }
+
+    /** Command any unit to do anything. Always compete in headless mode. */
+    public static class CommandModeObjective extends MapObjective{
+        @Override
+        public boolean update(){
+            return headless || control.input.selectedUnits.contains(u -> u.isCommandable() && u.command().hasCommand());
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.get("objective.command");
+        }
+    }
+
+    /** Wait until a logic flag is set. */
+    public static class FlagObjective extends MapObjective{
+        public String flag = "flag";
+        public @Multiline String text;
+
+        public FlagObjective(String flag, String text){
+            this.flag = flag;
+            this.text = text;
+        }
+
+        public FlagObjective(){}
+
+        @Override
+        public boolean update(){
+            return state.rules.objectiveFlags.contains(flag);
+        }
+
+        @Nullable
+        @Override
+        public String text(){
+            if(text == null) return null;
+
+            if(text.startsWith("@")){
+                if(state.mapLocales.containsProperty(text.substring(1))) return state.mapLocales.getProperty(text.substring(1));
+                return Core.bundle.get(text.substring(1));
+            }else{
+                return text;
+            }
+        }
+    }
+
+    /** Destroy all enemy core(s). */
+    public static class DestroyCoreObjective extends MapObjective{
+        @Override
+        public boolean update(){
+            return state.rules.waveTeam.cores().size == 0;
+        }
+
+        @Override
+        public String text(){
+            return Core.bundle.get("objective.destroycore");
+        }
+    }
+
+    /** Marker used for drawing various content to indicate something along with an objective. Mostly used as UI overlay.  */
+    public static abstract class ObjectiveMarker{
+        /** Internal use only! Do not access. */
+        public transient int arrayIndex;
+
+        /** Whether to display marker in the world. */
+        public boolean world = true;
+        /** Whether to display marker on minimap. */
+        public boolean minimap = false;
+        /** Whether to scale marker corresponding to player's zoom level. */
+        public boolean autoscale = false;
+        /** On which z-sorting layer is marker drawn. */
+        protected float drawLayer = Layer.overlayUI;
+
+        public void draw(float scaleFactor){}
+
+        /** Control marker with world processor code. Ignores NaN (null) values. */
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            if(Double.isNaN(p1)) return;
+
+            switch(type){
+                case world -> world = !Mathf.equal((float)p1, 0f);
+                case minimap -> minimap = !Mathf.equal((float)p1, 0f);
+                case autoscale -> autoscale = !Mathf.equal((float)p1, 0f);
+                case drawLayer -> drawLayer = (float)p1;
+            }
+        }
+
+        public void setText(String text, boolean fetch){}
+
+        public void setTexture(String textureName){}
+
+        /** @return The localized type-name of this objective, defaulting to the class simple name without the "Marker" prefix. */
+        public String typeName(){
+            String className = getClass().getSimpleName().replace("Marker", "");
+            return Core.bundle == null ? className : Core.bundle.get("marker." + className.toLowerCase() + ".name", className);
+        }
+
+        public static String fetchText(String text){
+            if(text == null) return "";
+
+            if(text.startsWith("@")){
+                String key = text.substring(1);
+
+                if(mobile){
+                    return state.mapLocales.containsProperty(key + ".mobile") ?
+                    state.mapLocales.getProperty(key + ".mobile") :
+                    Core.bundle.get(key + ".mobile", Core.bundle.get(key));
+                }else{
+                    return state.mapLocales.containsProperty(key) ?
+                    state.mapLocales.getProperty(key) :
+                    Core.bundle.get(key);
+                }
+            }else{
+                return text;
+            }
+        }
+    }
+
+    /** A marker that has a position in the world in world coordinates. */
+    public static abstract class PosMarker extends ObjectiveMarker{
+        /** Position of marker, in world coordinates */
+        public @TilePos Vec2 pos = new Vec2();
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                if(type == LMarkerControl.pos){
+                    pos.x = (float)p1 * tilesize;
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                if(type == LMarkerControl.pos){
+                    pos.y = (float)p2 * tilesize;
+                }
+            }
+        }
+    }
+
+    /** Displays text above a shape. */
+    public static class ShapeTextMarker extends PosMarker{
+        public @Multiline String text = "frog";
+        public float fontSize = 1f, textHeight = 7f;
+        public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
+
+        public float radius = 6f, rotation = 0f;
+        public int sides = 4;
+        public Color color = Color.valueOf("ffd37f");
+
+        // Cached localized text.
+        private transient String fetchedText;
+
+        public ShapeTextMarker(String text, float x, float y){
+            this.text = text;
+            this.pos.set(x, y);
+        }
+
+        public ShapeTextMarker(String text, float x, float y, float radius){
+            this.text = text;
+            this.pos.set(x, y);
+            this.radius = radius;
+        }
+
+        public ShapeTextMarker(String text, float x, float y, float radius, float rotation){
+            this.text = text;
+            this.pos.set(x, y);
+            this.radius = radius;
+            this.rotation = rotation;
+        }
+
+        public ShapeTextMarker(String text, float x, float y, float radius, float rotation, float textHeight){
+            this.text = text;
+            this.pos.set(x, y);
+            this.radius = radius;
+            this.rotation = rotation;
+            this.textHeight = textHeight;
+        }
+
+        public ShapeTextMarker(){}
+
+        @Override
+        public void draw(float scaleFactor){
+            //in case some idiot decides to make 9999999 sides and freeze the game
+            int sides = Math.min(this.sides, 300);
+
+            Draw.z(drawLayer);
+            Lines.stroke(3f * scaleFactor, Pal.gray);
+            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
+            Lines.stroke(scaleFactor, color);
+            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
+            Draw.reset();
+
+            if(fetchedText == null){
+                fetchedText = fetchText(text);
+            }
+
+            // font size cannot be 0
+            if(Mathf.equal(fontSize, 0f)) return;
+
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius * scaleFactor + textHeight * scaleFactor, drawLayer, flags, fontSize * scaleFactor);
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case fontSize -> fontSize = (float)p1;
+                    case textHeight -> textHeight = (float)p1;
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p1, 0f)){
+                            flags |= WorldLabel.flagBackground;
+                        }else{
+                            flags &= ~WorldLabel.flagBackground;
+                        }
+                    }
+                    case radius -> radius = (float)p1;
+                    case rotation -> rotation = (float)p1;
+                    case color -> color.fromDouble(p1);
+                    case shape -> sides = (int)p1;
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p2, 0f)){
+                            flags |= WorldLabel.flagOutline;
+                        }else{
+                            flags &= ~WorldLabel.flagOutline;
+                        }
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void setText(String text, boolean fetch){
+            this.text = text;
+            if(fetch){
+                fetchedText = fetchText(this.text);
+            }else{
+                fetchedText = this.text;
+            }
+        }
+    }
+
+    /** Displays a circle in the world. */
+    public static class PointMarker extends PosMarker{
+        public float radius = 5f, stroke = 11f;
+        public Color color = Color.valueOf("f25555");
+
+        public PointMarker(int x, int y){
+            this.pos.set(x, y);
+        }
+
+        public PointMarker(int x, int y, Color color){
+            this.pos.set(x, y);
+            this.color = color;
+        }
+
+        public PointMarker(int x, int y, float radius, float stroke, Color color){
+            this.pos.set(x, y);
+            this.stroke = stroke;
+            this.radius = radius;
+            this.color = color;
+        }
+
+        public PointMarker(){}
+
+        @Override
+        public void draw(float scaleFactor){
+            float rad = radius * tilesize * scaleFactor;
+            float fin = Interp.pow2Out.apply((Time.globalTime / 100f) % 1f);
+
+            Draw.z(drawLayer);
+            Lines.stroke(Scl.scl((1f - fin) * stroke + 0.1f), color);
+            Lines.circle(pos.x, pos.y, rad * fin);
+
+            Draw.reset();
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case radius -> radius = (float)p1;
+                    case stroke -> stroke = (float)p1;
+                    case color -> color.fromDouble(p1);
+                }
+            }
+        }
+    }
+
+    /** Displays a shape with an outline and color. */
+    public static class ShapeMarker extends PosMarker{
+        public float radius = 8f, rotation = 0f, stroke = 1f, startAngle = 0f, endAngle = 360f;
+        public boolean fill = false, outline = true;
+        public int sides = 4;
+        public Color color = Color.valueOf("ffd37f");
+
+        public ShapeMarker(float x, float y){
+            this.pos.set(x, y);
+        }
+
+        public ShapeMarker(float x, float y, float radius, float rotation){
+            this.pos.set(x, y);
+            this.radius = radius;
+            this.rotation = rotation;
+        }
+
+        public ShapeMarker(){}
+
+        @Override
+        public void draw(float scaleFactor){
+            //in case some idiot decides to make 9999999 sides and freeze the game
+            int sides = Math.min(this.sides, 200);
+
+            Draw.z(drawLayer);
+            if(!fill){
+                if(outline){
+                    Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
+                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation + startAngle, rotation + endAngle);
+                }
+
+                Lines.stroke(stroke * scaleFactor, color);
+                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation + startAngle, rotation + endAngle);
+            }else{
+                Draw.color(color);
+                if (startAngle < endAngle){
+                    Fill.arc(pos.x, pos.y, radius * scaleFactor, (endAngle - startAngle) / 360f, rotation + startAngle, sides);
+                }else{
+                    Fill.arc(pos.x, pos.y, radius * scaleFactor, (startAngle - endAngle) / 360f, rotation + endAngle, sides);
+                }
+            }
+
+            Draw.reset();
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case radius -> radius = (float)p1;
+                    case stroke -> stroke = (float)p1;
+                    case rotation -> rotation = (float)p1;
+                    case color -> color.fromDouble(p1);
+                    case shape -> sides = (int)p1;
+                    case arc -> startAngle = (float)p1;
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case shape -> fill = !Mathf.equal((float)p2, 0f);
+                    case arc -> endAngle = (float)p2;
+                }
+            }
+
+            if(!Double.isNaN(p3)){
+                if(type == LMarkerControl.shape){
+                    outline = !Mathf.equal((float)p3, 0f);
+                }
+            }
+        }
+    }
+
+    /** Displays text at a location. */
+    public static class TextMarker extends PosMarker{
+        public @Multiline String text = "uwu";
+        public float fontSize = 1f;
+        public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
+        // Cached localized text.
+        private transient String fetchedText;
+
+        public TextMarker(String text, float x, float y, float fontSize, byte flags){
+            this.text = text;
+            this.fontSize = fontSize;
+            this.flags = flags;
+            this.pos.set(x, y);
+        }
+
+        public TextMarker(String text, float x, float y){
+            this.text = text;
+            this.pos.set(x, y);
+        }
+
+        public TextMarker(){}
+
+        @Override
+        public void draw(float scaleFactor){
+            // font size cannot be 0
+            if(Mathf.equal(fontSize, 0f)) return;
+
+            if(fetchedText == null){
+                fetchedText = fetchText(text);
+            }
+
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize * scaleFactor);
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case fontSize -> fontSize = (float)p1;
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p1, 0f)){
+                            flags |= WorldLabel.flagBackground;
+                        }else{
+                            flags &= ~WorldLabel.flagBackground;
+                        }
+                    }
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p2, 0f)){
+                            flags |= WorldLabel.flagOutline;
+                        }else{
+                            flags &= ~WorldLabel.flagOutline;
+                        }
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void setText(String text, boolean fetch){
+            this.text = text;
+            if(fetch){
+                fetchedText = fetchText(this.text);
+            }else{
+                fetchedText = this.text;
+            }
+        }
+    }
+
+    /** Displays a line from pos1 to pos2. */
+    public static class LineMarker extends PosMarker{
+        public @TilePos Vec2 endPos = new Vec2();
+        public float stroke = 1f;
+        public boolean outline = true;
+        public Color color1 = Color.valueOf("ffd37f");
+        public Color color2 = Color.valueOf("ffd37f");
+
+        public LineMarker(float x1, float y1, float x2, float y2, float stroke){
+            this.stroke = stroke;
+            this.pos.set(x1, y1);
+            this.endPos.set(x2, y2);
+        }
+
+        public LineMarker(float x1, float y1, float x2, float y2){
+            this.pos.set(x1, y1);
+            this.endPos.set(x2, y2);
+        }
+
+        public LineMarker(){}
+
+        @Override
+        public void draw(float scaleFactor){
+            Draw.z(drawLayer);
+            if(outline){
+                Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
+                Lines.line(pos.x, pos.y, endPos.x, endPos.y);
+            }
+
+            Lines.stroke(stroke * scaleFactor, Color.white);
+            Lines.line(pos.x, pos.y, color1, endPos.x, endPos.y, color2);
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case endPos -> endPos.x = (float)p1 * tilesize;
+                    case stroke -> stroke = (float)p1;
+                    case color -> color1.set(color2.fromDouble(p1));
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case endPos -> endPos.y = (float)p2 * tilesize;
+                }
+            }
+
+            if(!Double.isNaN(p1) && !Double.isNaN(p2)){
+                switch (type){
+                    case posi -> ((int)p1 == 0 ? pos : (int)p1 == 1 ? endPos : Tmp.v1).x = (float)p2 * tilesize;
+                    case colori -> ((int)p1 == 0 ? color1 : (int)p1 == 1 ? color2 : Tmp.c1).fromDouble(p2);
+                }
+            }
+
+            if(!Double.isNaN(p1) && !Double.isNaN(p3)){
+                switch(type){
+                    case posi -> ((int)p1 == 0 ? pos : (int)p1 == 1 ? endPos : Tmp.v1).y = (float)p3 * tilesize;
+                }
+            }
+        }
+    }
+
+    /** Displays a texture with specified name. */
+    public static class TextureMarker extends PosMarker{
+        public float rotation = 0f, width = 0f, height = 0f; // Zero width/height scales marker to original texture's size
+        public String textureName = "";
+        public Color color = Color.white.cpy();
+
+        private transient TextureRegion fetchedRegion;
+
+        public TextureMarker(String textureName, float x, float y, float width, float height){
+            this.textureName = textureName;
+            this.pos.set(x, y);
+            this.width = width;
+            this.height = height;
+        }
+
+        public TextureMarker(String textureName, float x, float y){
+            this.textureName = textureName;
+            this.pos.set(x, y);
+        }
+
+        public TextureMarker(){}
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case rotation -> rotation = (float)p1;
+                    case textureSize -> width = (float)p1 * tilesize;
+                    case color -> color.fromDouble(p1);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case textureSize -> height = (float)p2 * tilesize;
+                }
+            }
+        }
+
+        @Override
+        public void draw(float scaleFactor){
+            if(textureName.isEmpty()) return;
+
+            if(fetchedRegion == null) setTexture(textureName);
+
+            // Zero width/height scales marker to original texture's size
+            if(Mathf.equal(width, 0f)) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
+            if(Mathf.equal(height, 0f)) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
+
+            Draw.z(drawLayer);
+            Draw.color(color);
+            Draw.rect(fetchedRegion, pos.x, pos.y, width * scaleFactor, height * scaleFactor, rotation);
+        }
+
+        @Override
+        public void setTexture(String textureName){
+            this.textureName = textureName;
+
+            if(headless) return;
+            if(fetchedRegion == null) fetchedRegion = new TextureRegion();
+            lookupRegion(textureName, fetchedRegion);
+        }
+
+    }
+
+    public static class QuadMarker extends ObjectiveMarker{
+        public String textureName = "white";
+        public @Vertices float[] vertices = new float[24];
+        private boolean mapRegion = true;
+
+        private transient TextureRegion fetchedRegion;
+
+        public QuadMarker() {
+            for(int i = 0; i < 4; i++){
+                vertices[i * 6 + 2] = Color.white.toFloatBits();
+                vertices[i * 6 + 5] = Color.clearFloatBits;
+            }
+        }
+
+        @Override
+        public void draw(float scaleFactor){
+            if(fetchedRegion == null) setTexture(textureName);
+
+            Draw.z(drawLayer);
+            Draw.vert(fetchedRegion.texture, vertices, 0, vertices.length);
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case color -> {
+                        float col = Tmp.c1.fromDouble(p1).toFloatBits();
+                        for(int i = 0; i < 4; i++) vertices[i * 6 + 2] = col;
+                    }
+                    case pos -> vertices[0] = (float)p1 * tilesize;
+                    case posi -> setPos((int)p1, p2, p3);
+                    case uvi -> setUv((int)p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case pos -> vertices[1] = (float)p1 * tilesize;
+                }
+            }
+
+            if(!Double.isNaN(p1) && !Double.isNaN(p2)){
+                switch(type){
+                    case colori -> setColor((int)p1, p2);
+                }
+            }
+        }
+
+        @Override
+        public void setTexture(String textureName){
+            this.textureName = textureName;
+
+            boolean firstUpdate = fetchedRegion == null;
+
+            if(fetchedRegion == null) fetchedRegion = new TextureRegion();
+            Tmp.tr1.set(fetchedRegion);
+
+            lookupRegion(textureName, fetchedRegion);
+
+            if(firstUpdate){
+                if(mapRegion){
+                    mapRegion = false;
+
+                    // possibly from the editor, we need to clamp the values
+                    for(int i = 0; i < 4; i++){
+                        vertices[i * 6 + 3] = Mathf.map(Mathf.clamp(vertices[i * 6 + 3]), fetchedRegion.u, fetchedRegion.u2);
+                        vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp(vertices[i * 6 + 4]), fetchedRegion.v, fetchedRegion.v2);
+                    }
+                }
+            }else{
+                for(int i = 0; i < 4; i++){
+                    vertices[i * 6 + 3] = Mathf.map(vertices[i * 6 + 3], Tmp.tr1.u, Tmp.tr1.u2, fetchedRegion.u, fetchedRegion.u2);
+                    vertices[i * 6 + 4] = Mathf.map(vertices[i * 6 + 4], Tmp.tr1.v, Tmp.tr1.v2, fetchedRegion.v, fetchedRegion.v2);
+                }
+            }
+        }
+
+        private void setPos(int i, double x, double y){
+            if(i >= 0 && i < 4){
+                if(!Double.isNaN(x)) vertices[i * 6] = (float)x * tilesize;
+                if(!Double.isNaN(y)) vertices[i * 6 + 1] = (float)y * tilesize;
+            }
+        }
+
+        private void setColor(int i, double c){
+            if(i >= 0 && i < 4){
+                vertices[i * 6 + 2] = Tmp.c1.fromDouble(c).toFloatBits();
+            }
+        }
+
+        private void setUv(int i, double u, double v){
+            if(i >= 0 && i < 4){
+                if(fetchedRegion == null) setTexture(textureName);
+
+                if(!Double.isNaN(u)) vertices[i * 6 + 3] = Mathf.map(Mathf.clamp((float)u), fetchedRegion.u, fetchedRegion.u2);
+                if(!Double.isNaN(v)) vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp((float)v), fetchedRegion.v, fetchedRegion.v2);
+            }
+        }
+
+    }
+
+    private static void lookupRegion(String name, TextureRegion out){
+        TextureRegion region = Core.atlas.find(name);
+        if(region.found()){
+            out.set(region);
+        }else{
+            if(Core.assets.isLoaded(name, Texture.class)){
+                out.set(Core.assets.get(name, Texture.class));
+            }else{
+                out.set(Core.atlas.find("error"));
+            }
+        }
+    }
+
+    /** For arrays or {@link Seq}s; does not create element rearrangement buttons. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Unordered{}
+
+    /** For arrays or {@link Seq}s; does not add the new and delete buttons */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Immutable{}
+
+    /** For {@code float[]}; treats it as an array of vertices. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Vertices{}
+
+    /** For {@code byte}; treats it as a world label flag. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface LabelFlag{}
+
+    /** For {@link UnlockableContent}; filters all un-researchable content. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Researchable{}
+
+    /** For {@link Block}; filters all un-buildable blocks. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Synthetic{}
+
+    /** For {@link String}; indicates that a text area should be used. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Multiline{}
+
+    /** For {@code float}; multiplies the UI input by 60. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Second{}
+
+    /** For {@code float} or similar data structures, such as {@link Vec2}; multiplies the UI input by {@link Vars#tilesize}. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface TilePos{}
+}
diff --git a/core/src/mindustry/game/Objectives.java b/core/src/mindustry/game/Objectives.java
index 31fc92e1b3..fb947c4bd0 100644
--- a/core/src/mindustry/game/Objectives.java
+++ b/core/src/mindustry/game/Objectives.java
@@ -19,12 +19,15 @@ public class Objectives{
 
         @Override
         public boolean complete(){
-            return content.unlocked();
+            return content.unlockedHost();
         }
 
         @Override
         public String display(){
-            return Core.bundle.format("requirement.research", content.emoji() + " " + content.localizedName);
+            return Core.bundle.format("requirement.research",
+                //TODO broken for multi tech nodes.
+                (content.techNode == null || content.techNode.parent == null || content.techNode.parent.content.unlockedHost()) ?
+                    (content.emoji() + " " + content.localizedName) : "???");
         }
     }
 
@@ -39,12 +42,13 @@ public class Objectives{
 
         @Override
         public boolean complete(){
-            return content.unlocked();
+            return content.unlockedHost();
         }
 
         @Override
         public String display(){
-            return Core.bundle.format("requirement.produce", content.emoji() + " " + content.localizedName);
+            return Core.bundle.format("requirement.produce",
+                content.unlockedHost() ? (content.emoji() + " " + content.localizedName) : "???");
         }
     }
 
@@ -59,7 +63,7 @@ public class Objectives{
 
         @Override
         public boolean complete(){
-            return preset.sector.save != null && (!preset.sector.isAttacked() || preset.sector.info.wasCaptured) && preset.sector.hasBase();
+            return preset.sector.save != null && preset.sector.isCaptured() && preset.sector.hasBase();
         }
 
         @Override
@@ -68,6 +72,46 @@ public class Objectives{
         }
     }
 
+    public static class OnSector implements Objective{
+        public SectorPreset preset;
+
+        public OnSector(SectorPreset zone){
+            this.preset = zone;
+        }
+
+        protected OnSector(){}
+
+        @Override
+        public boolean complete(){
+            return preset.sector.hasBase();
+        }
+
+        @Override
+        public String display(){
+            return Core.bundle.format("requirement.onsector", preset.localizedName);
+        }
+    }
+
+    public static class OnPlanet implements Objective{
+        public Planet planet;
+
+        public OnPlanet(Planet planet){
+            this.planet = planet;
+        }
+
+        protected OnPlanet(){}
+
+        @Override
+        public boolean complete(){
+            return planet.sectors.contains(Sector::hasBase);
+        }
+
+        @Override
+        public String display(){
+            return Core.bundle.format("requirement.onplanet", planet.localizedName);
+        }
+    }
+
     /** Defines a specific objective for a game. */
     public interface Objective{
 
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index e0db8ac94a..2339e5f1b2 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -5,51 +5,95 @@ import arc.struct.*;
 import arc.util.*;
 import arc.util.serialization.*;
 import arc.util.serialization.Json.*;
+import mindustry.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.graphics.g3d.*;
 import mindustry.io.*;
 import mindustry.type.*;
 import mindustry.type.Weather.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
 
 /**
  * Defines current rules on how the game should function.
  * Does not store game state, just configuration.
  */
 public class Rules{
+    /** Allows editing the rules in-game. Essentially a cheat mode toggle. */
+    public boolean allowEditRules = false;
     /** Sandbox mode: Enables infinite resources, build range and build speed. */
     public boolean infiniteResources;
     /** Team-specific rules. */
     public TeamRules teams = new TeamRules();
     /** Whether the waves come automatically on a timer. If not, waves come when the play button is pressed. */
     public boolean waveTimer = true;
+    /** Whether the waves can be manually summoned with the play button. */
+    public boolean waveSending = true;
     /** Whether waves are spawnable at all. */
     public boolean waves;
+    /** Whether air units spawn at spawns instead of the edge of the map */
+    public boolean airUseSpawns = false;
     /** Whether the game objective is PvP. Note that this enables automatic hosting. */
     public boolean pvp;
+    /** Whether is waiting for players enabled in PvP. */
+    public boolean pvpAutoPause = true;
     /** Whether to pause the wave timer until all enemies are destroyed. */
     public boolean waitEnemies = false;
-    /** Determinates if gamemode is attack mode. */
+    /** Determines if gamemode is attack mode. */
     public boolean attackMode = false;
     /** Whether this is the editor gamemode. */
     public boolean editor = false;
+    /** Whether blocks can be repaired by clicking them. */
+    public boolean derelictRepair = true;
     /** Whether a gameover can happen at all. Set this to false to implement custom gameover conditions. */
     public boolean canGameOver = true;
+    /** Whether cores change teams when they are destroyed. */
+    public boolean coreCapture = false;
     /** Whether reactors can explode and damage other blocks. */
     public boolean reactorExplosions = true;
+    /** Whether to allow manual unit control. */
+    public boolean possessionAllowed = 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. */
+    /** Whether fire (and neoplasm spread) is enabled. */
     public boolean fire = true;
     /** Whether units use and require ammo. */
     public boolean unitAmmo = false;
-    /** How fast unit pads build units. */
+    /** EXPERIMENTAL! If true, air and ground units target random things each wave instead of only the core/generators. */
+    public boolean randomWaveAI = false;
+    /** EXPERIMENTAL! If true, blocks will update in units and share power. */
+    public boolean unitPayloadUpdate = false;
+    /** If true, units' payloads are destroy()ed when the unit is destroyed. */
+    public boolean unitPayloadsExplode = false;
+    /** Whether cores add to unit limit */
+    public boolean unitCapVariable = true;
+    /** If true, unit spawn points are shown. */
+    public boolean showSpawns = false;
+    /** Multiplies power output of solar panels. */
+    public float solarMultiplier = 1f;
+    /** How fast unit factories build units. */
     public float unitBuildSpeedMultiplier = 1f;
+    /** Multiplier of resources that units take to build. */
+    public float unitCostMultiplier = 1f;
+    /** How much damage units deal. */
+    public float unitDamageMultiplier = 1f;
     /** How much health units start with. */
     public float unitHealthMultiplier = 1f;
-    /** How much damage any other units deal. */
-    public float unitDamageMultiplier = 1f;
+    /** How much damage unit crash damage deals. (Compounds with unitDamageMultiplier) */
+    public float unitCrashDamageMultiplier = 1f;
+    /** How fast units can mine. */
+    public float unitMineSpeedMultiplier = 1f;
+    /** If true, ghost blocks will appear upon destruction, letting builder blocks/units rebuild them. */
+    public boolean ghostBlocks = true;
+    /** Whether to allow units to build with logic. */
+    public boolean logicUnitBuild = true;
+    /** If true, world processors can be edited and placed on this map. */
+    public boolean allowEditWorldProcessors = false;
+    /** If true, world processors no longer update. Used for testing. */
+    public boolean disableWorldProcessors = false;
     /** How much health blocks start with. */
     public float blockHealthMultiplier = 1f;
     /** How much damage blocks (turrets) deal. */
@@ -60,16 +104,50 @@ public class Rules{
     public float buildSpeedMultiplier = 1f;
     /** Multiplier for percentage of materials refunded when deconstructing. */
     public float deconstructRefundMultiplier = 0.5f;
+    /** Multiplier for time in timer objectives. */
+    public float objectiveTimerMultiplier = 1f;
     /** No-build zone around enemy core radius. */
     public float enemyCoreBuildRadius = 400f;
+    /** If true, no-build zones are calculated based on the closest core. */
+    public boolean polygonCoreProtection = false;
+    /** If true, blocks cannot be placed near blocks that are near the enemy team.*/
+    public boolean placeRangeCheck = false;
+    /** If true, dead teams in PvP automatically have their blocks & units converted to derelict upon death. */
+    public boolean cleanupDeadTeams = true;
+    /** If true, items can only be deposited in the core. */
+    public boolean onlyDepositCore = false;
+    /** Cooldown, in seconds, of item depositing for players. */
+    public float itemDepositCooldown = 0.5f;
+    /** If true, every enemy block in the radius of the (enemy) core is destroyed upon death. Used for campaign maps. */
+    public boolean coreDestroyClear = false;
+    /** If true, banned blocks are hidden from the build menu. */
+    public boolean hideBannedBlocks = false;
+    /** If true, most blocks (including environmental walls) can be deconstructed. This is only meant to be used internally in sandbox/test maps. */
+    public boolean allowEnvironmentDeconstruct = false;
+    /** If true, buildings will be constructed instantly, with no limit on blocks placed per second. This is highly experimental and may cause lag! */
+    public boolean instantBuild = false;
+    /** If true, bannedBlocks becomes a whitelist. */
+    public boolean blockWhitelist = false;
+    /** If true, bannedUnits becomes a whitelist. */
+    public boolean unitWhitelist = false;
     /** Radius around enemy wave drop zones.*/
     public float dropZoneRadius = 300f;
     /** Time between waves in ticks. */
-    public float waveSpacing = 60 * 60 * 2;
-    /** Wave after which the player 'wins'. Used in sectors. Use a value <= 0 to disable. */
+    public float waveSpacing = 2 * Time.toMinutes;
+    /** Starting wave spacing; if <=0, uses waveSpacing * 2. */
+    public float initialWaveSpacing = 0f;
+    /** Wave after which the player 'wins'. Use a value <= 0 to disable. */
     public int winWave = 0;
     /** Base unit cap. Can still be increased by blocks. */
     public int unitCap = 0;
+    /** If true, the unit cap is disabled. */
+    public boolean disableUnitCap;
+    /** Environment drag multiplier. */
+    public float dragMultiplier = 1f;
+    /** Environmental flags that dictate visuals & how blocks function. */
+    public int env = Vars.defaultEnv;
+    /** Attributes of the environment. */
+    public Attributes attributes = new Attributes();
     /** Sector for saves that have them. */
     public @Nullable Sector sector;
     /** Spawn layout. */
@@ -80,41 +158,66 @@ public class Rules{
     public Seq<WeatherEntry> weather = new Seq<>(1);
     /** Blocks that cannot be placed. */
     public ObjectSet<Block> bannedBlocks = new ObjectSet<>();
+    /** Units that cannot be built. */
+    public ObjectSet<UnitType> bannedUnits = new ObjectSet<>();
     /** Reveals blocks normally hidden by build visibility. */
     public ObjectSet<Block> revealedBlocks = new ObjectSet<>();
     /** Unlocked content names. Only used in multiplayer when the campaign is enabled. */
-    public ObjectSet<String> researched = new ObjectSet<>();
+    public ObjectSet<UnlockableContent> researched = new ObjectSet<>();
+    /** In-map objective executor. */
+    public MapObjectives objectives = new MapObjectives();
+    /** Flags set by objectives. Used in world processors. */
+    public ObjectSet<String> objectiveFlags = new ObjectSet<>();
+    /** If true, fog of war is enabled. Enemy units and buildings are hidden unless in radar view. */
+    public boolean fog = false;
+    /** If fog = true, this is whether static (black) fog is enabled. */
+    public boolean staticFog = true;
+    /** Color for static, undiscovered fog of war areas. */
+    public Color staticColor = new Color(0f, 0f, 0f, 1f);
+    /** Color for discovered but un-monitored fog of war areas. */
+    public Color dynamicColor = new Color(0f, 0f, 0f, 0.5f);
     /** Whether ambient lighting is enabled. */
     public boolean lighting = false;
-    /** Whether enemy lighting is visible.
-     * If lighting is enabled and this is false, a fog-of-war effect is partially achieved. */
-    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);
     /** team of the player by default. */
     public Team defaultTeam = Team.sharded;
     /** team of the enemy in waves/sectors. */
     public Team waveTeam = Team.crux;
+    /** color of clouds that is displayed when the player is landing */
+    public Color cloudColor = new Color(0f, 0f, 0f, 0f);
     /** name of the custom mode that this ruleset describes, or null. */
     public @Nullable String modeName;
+    /** Mission string displayed instead of wave/core counter. Null to disable. */
+    public @Nullable String mission;
+    /** Whether cores incinerate items when full, just like in the campaign. */
+    public boolean coreIncinerates = false;
+    /** If false, borders fade out into darkness. Only use with custom backgrounds!*/
+    public boolean borderDarkness = true;
+    /** If true, the map play area is cropped based on the rectangle below. */
+    public boolean limitMapArea = false;
+    /** Map area limit rectangle. */
+    public int limitX, limitY, limitWidth = 1, limitHeight = 1;
+    /** If true, blocks outside the map area are disabled. */
+    public boolean disableOutsideArea = true;
     /** special tags for additional info. */
     public StringMap tags = new StringMap();
-
-    /** A team-specific ruleset. */
-    public static class TeamRule{
-        /** Whether to use building AI. */
-        public boolean ai;
-        /** TODO Tier of blocks/designs that the AI uses for building. [0, 1] */
-        public float aiTier = 1f;
-        /** Whether, when AI is enabled, ships should be spawned from the core. */
-        public boolean aiCoreSpawn = true;
-        /** If true, blocks don't require power or resources. */
-        public boolean cheat;
-        /** If true, resources are not consumed when building. */
-        public boolean infiniteResources;
-        /** If true, this team has infinite unit ammo. */
-        public boolean infiniteAmmo;
-    }
+    /** Name of callback to call for background rendering in mods; see Renderer#addCustomBackground. Runs last. */
+    public @Nullable String customBackgroundCallback;
+    /** path to background texture with extension (e.g. "sprites/space.png")*/
+    public @Nullable String backgroundTexture;
+    /** background texture move speed scaling - bigger numbers mean slower movement. 0 to disable. */
+    public float backgroundSpeed = 27000f;
+    /** background texture scaling factor */
+    public float backgroundScl = 1f;
+    /** background UV offsets */
+    public float backgroundOffsetX = 0.1f, backgroundOffsetY = 0.1f;
+    /** Parameters for planet rendered in the background. Cannot be changed once a map is loaded. */
+    public @Nullable PlanetParams planetBackground;
+    /** Rules from this planet are applied. If it's {@code sun}, mixed tech is enabled. */
+    public Planet planet = Planets.serpulo;
+    /** If the `data` instruction is allowed for world processors */
+    public boolean allowLogicData = false;
 
     /** Copies this ruleset exactly. Not efficient at all, do not use often. */
     public Rules copy(){
@@ -136,14 +239,115 @@ public class Rules{
         }
     }
 
+    public boolean hasEnv(int env){
+        return (this.env & env) != 0;
+    }
+
+    public float buildRadius(Team team){
+        return enemyCoreBuildRadius + teams.get(team).extraCoreBuildRadius;
+    }
+
+    public float unitBuildSpeed(Team team){
+        return unitBuildSpeedMultiplier * teams.get(team).unitBuildSpeedMultiplier;
+    }
+
+    public float unitCost(Team team){
+        return unitCostMultiplier * teams.get(team).unitCostMultiplier;
+    }
+
+    public float unitDamage(Team team){
+        return unitDamageMultiplier * teams.get(team).unitDamageMultiplier;
+    }
+
+    public float unitHealth(Team team){
+        //a 0 here would be a very bad idea.
+        return Math.max(unitHealthMultiplier * teams.get(team).unitHealthMultiplier, 0.000001f);
+    }
+
+    public float unitCrashDamage(Team team){
+        return unitDamage(team) * unitCrashDamageMultiplier * teams.get(team).unitCrashDamageMultiplier;
+    }
+
+    public float unitMineSpeed(Team team){
+        return unitMineSpeedMultiplier * teams.get(team).unitMineSpeedMultiplier;
+    }
+
+    public float blockHealth(Team team){
+        return blockHealthMultiplier * teams.get(team).blockHealthMultiplier;
+    }
+    public float blockDamage(Team team){
+        return blockDamageMultiplier * teams.get(team).blockDamageMultiplier;
+    }
+
+    public float buildSpeed(Team team){
+        return buildSpeedMultiplier * teams.get(team).buildSpeedMultiplier;
+    }
+
+    public boolean isBanned(Block block){
+        return blockWhitelist != bannedBlocks.contains(block);
+    }
+
+    public boolean isBanned(UnitType unit){
+        return unitWhitelist != bannedUnits.contains(unit);
+    }
+
+    /** A team-specific ruleset. */
+    public static class TeamRule{
+        /** Whether, when AI is enabled, ships should be spawned from the core. TODO remove / unnecessary? */
+        public boolean aiCoreSpawn = true;
+        /** If true, blocks don't require power or resources. */
+        public boolean cheat;
+        /** If true, resources are not consumed when building. */
+        public boolean infiniteResources;
+        /** If true, this team has infinite unit ammo. */
+        public boolean infiniteAmmo;
+
+        /** AI that builds random schematics. */
+        public boolean buildAi;
+        /** Tier of builder AI. [0, 1] */
+        public float buildAiTier = 1f;
+
+        /** Enables "RTS" unit AI. */
+        public boolean rtsAi;
+        /** Minimum size of attack squads. */
+        public int rtsMinSquad = 4;
+        /** Maximum size of attack squads. */
+        public int rtsMaxSquad = 1000;
+        /** Minimum "advantage" needed for a squad to attack. Higher -> more cautious. */
+        public float rtsMinWeight = 1.2f;
+
+        /** How fast unit factories build units. */
+        public float unitBuildSpeedMultiplier = 1f;
+        /** How much damage units deal. */
+        public float unitDamageMultiplier = 1f;
+        /** How much damage unit crash damage deals. (Compounds with unitDamageMultiplier) */
+        public float unitCrashDamageMultiplier = 1f;
+        /** How fast units can mine. */
+        public float unitMineSpeedMultiplier = 1f;
+        /** Multiplier of resources that units take to build. */
+        public float unitCostMultiplier = 1f;
+        /** How much health units start with. */
+        public float unitHealthMultiplier = 1f;
+        /** How much health blocks start with. */
+        public float blockHealthMultiplier = 1f;
+        /** How much damage blocks (turrets) deal. */
+        public float blockDamageMultiplier = 1f;
+        /** Multiplier for building speed. */
+        public float buildSpeedMultiplier = 1f;
+        /** Extra spacing added to the no-build zone around the core. */
+        public float extraCoreBuildRadius = 0f;
+
+
+        //build cost disabled due to technical complexity
+    }
+
     /** A simple map for storing TeamRules in an efficient way without hashing. */
-    public static class TeamRules implements Serializable{
+    public static class TeamRules implements JsonSerializable{
         final TeamRule[] values = new TeamRule[Team.all.length];
 
         public TeamRule get(Team team){
             TeamRule out = values[team.id];
-            if(out == null) values[team.id] = (out = new TeamRule());
-            return out;
+            return out == null ? (values[team.id] = new TeamRule()) : out;
         }
 
         @Override
diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java
index c832f86471..575c8bb697 100644
--- a/core/src/mindustry/game/Saves.java
+++ b/core/src/mindustry/game/Saves.java
@@ -6,7 +6,6 @@ import arc.files.*;
 import arc.graphics.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.async.*;
 import mindustry.*;
 import mindustry.core.GameState.*;
 import mindustry.game.EventType.*;
@@ -18,14 +17,16 @@ import mindustry.type.*;
 import java.io.*;
 import java.text.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 import static mindustry.Vars.*;
 
 public class Saves{
+    private static final DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance();
+
     Seq<SaveSlot> saves = new Seq<>();
     @Nullable SaveSlot current;
     private @Nullable SaveSlot lastSectorSave;
-    AsyncExecutor previewExecutor = new AsyncExecutor(1);
     private boolean saving;
     private float time;
 
@@ -47,14 +48,37 @@ public class Saves{
     public void load(){
         saves.clear();
 
+        //read saves in parallel
+        Seq<Future<SaveSlot>> futures = new Seq<>();
+
         for(Fi file : saveDirectory.list()){
             if(!file.name().contains("backup") && SaveIO.isSaveValid(file)){
-                SaveSlot slot = new SaveSlot(file);
-                saves.add(slot);
-                slot.meta = SaveIO.getMeta(file);
+                futures.add(mainExecutor.submit(() -> {
+                    SaveSlot slot = new SaveSlot(file);
+                    slot.meta = SaveIO.getMeta(file);
+                    return slot;
+                }));
             }
         }
 
+        for(var future : futures){
+            try{
+                saves.add(future.get());
+            }catch(Exception e){
+                Log.err(e);
+            }
+        }
+
+        //clear saves from build <130 that had the new naval sectors.
+        saves.removeAll(s -> {
+            if(s.getSector() != null && (s.getSector().id == 108 || s.getSector().id == 216) && s.meta.build <= 130 && s.meta.build > 0){
+                s.getSector().clearInfo();
+                s.file.delete();
+                return true;
+            }
+            return false;
+        });
+
         lastSectorSave = saves.find(s -> s.isSector() && s.getName().equals(Core.settings.getString("last-sector-save", "<none>")));
 
         //automatically assign sector save slots
@@ -87,7 +111,7 @@ public class Saves{
 
         if(state.isGame() && !state.gameOver && current != null && current.isAutosave()){
             time += Time.delta;
-            if(time > Core.settings.getInt("saveinterval") * 60){
+            if(time > Core.settings.getInt("saveinterval") * 60 && !Vars.disableSave){
                 saving = true;
 
                 try{
@@ -145,6 +169,7 @@ public class Saves{
         SaveSlot slot = new SaveSlot(getNextSlotFile());
         slot.importFile(file);
         slot.setName(file.nameWithoutExtension());
+
         saves.add(slot);
         slot.meta = SaveIO.getMeta(slot.file);
         current = slot;
@@ -194,9 +219,7 @@ public class Saves{
         }
 
         public void save(){
-            long time = totalPlaytime;
             long prev = totalPlaytime;
-            totalPlaytime = time;
 
             SaveIO.save(file);
             meta = SaveIO.getMeta(file);
@@ -212,9 +235,9 @@ public class Saves{
             if(Core.assets.isLoaded(loadPreviewFile().path())){
                 Core.assets.unload(loadPreviewFile().path());
             }
-            previewExecutor.submit(() -> {
+            mainExecutor.submit(() -> {
                 try{
-                    previewFile().writePNG(renderer.minimap.getPixmap());
+                    previewFile().writePng(renderer.minimap.getPixmap());
                     requestedPreview = false;
                 }catch(Throwable t){
                     Log.err(t);
@@ -259,7 +282,7 @@ public class Saves{
         }
 
         public String getDate(){
-            return SimpleDateFormat.getDateTimeInstance().format(new Date(meta.timestamp));
+            return dateFormat.format(new Date(meta.timestamp));
         }
 
         public Map getMap(){
@@ -289,7 +312,7 @@ public class Saves{
             return meta.mods;
         }
 
-        public Sector getSector(){
+        public @Nullable Sector getSector(){
             return meta == null || meta.rules == null ? null : meta.rules.sector;
         }
 
@@ -320,6 +343,10 @@ public class Saves{
         public void importFile(Fi from) throws IOException{
             try{
                 from.copyTo(file);
+                if(previewFile().exists()){
+                    requestedPreview = false;
+                    previewFile().delete();
+                }
             }catch(Exception e){
                 throw new IOException(e);
             }
diff --git a/core/src/mindustry/game/Schematic.java b/core/src/mindustry/game/Schematic.java
index e539ae69a2..dde5886f60 100644
--- a/core/src/mindustry/game/Schematic.java
+++ b/core/src/mindustry/game/Schematic.java
@@ -9,12 +9,14 @@ import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.storage.*;
-import mindustry.world.consumers.*;
 
 import static mindustry.Vars.*;
 
 public class Schematic implements Publishable, Comparable<Schematic>{
     public final Seq<Stile> tiles;
+    /** These are used for the schematic tag UI. */
+    public Seq<String> labels = new Seq<>();
+    /** Internal meta tags. */
     public StringMap tags;
     public int width, height;
     public @Nullable Fi file;
@@ -29,11 +31,11 @@ public class Schematic implements Publishable, Comparable<Schematic>{
     }
 
     public float powerProduction(){
-        return tiles.sumf(s -> s.block instanceof PowerGenerator ? ((PowerGenerator)s.block).powerProduction : 0f);
+        return tiles.sumf(s -> s.block instanceof PowerGenerator p ? p.getDisplayedPowerProduction() : 0f);
     }
 
     public float powerConsumption(){
-        return tiles.sumf(s -> s.block.consumes.has(ConsumeType.power) ? s.block.consumes.getPower().usage : 0f);
+        return tiles.sumf(s -> s.block.consPower != null ? s.block.consPower.usage : 0f);
     }
 
     public ItemSeq requirements(){
diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
index e60a1660fd..a54ddca43e 100644
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -26,13 +26,13 @@ import mindustry.input.*;
 import mindustry.input.Placement.*;
 import mindustry.io.*;
 import mindustry.world.*;
-import mindustry.world.blocks.*;
+import mindustry.world.blocks.ConstructBlock.*;
 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.*;
 import mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 import mindustry.world.meta.*;
 
 import java.io.*;
@@ -57,20 +57,12 @@ public class Schematics implements Loadable{
     private OrderedMap<Schematic, FrameBuffer> previews = new OrderedMap<>();
     private ObjectSet<Schematic> errored = new ObjectSet<>();
     private ObjectMap<CoreBlock, Seq<Schematic>> loadouts = new ObjectMap<>();
+    private ObjectMap<CoreBlock, Schematic> defaultLoadouts = new ObjectMap<>();
     private FrameBuffer shadowBuffer;
     private Texture errorTexture;
     private long lastClearTime;
 
     public Schematics(){
-        Events.on(DisposeEvent.class, e -> {
-            previews.each((schem, m) -> m.dispose());
-            previews.clear();
-            shadowBuffer.dispose();
-            if(errorTexture != null){
-                errorTexture.dispose();
-                errorTexture = null;
-            }
-        });
 
         Events.on(ClientLoadEvent.class, event -> {
             errorTexture = new Texture("sprites/error.png");
@@ -110,7 +102,7 @@ public class Schematics implements Loadable{
     }
 
     private void loadLoadouts(){
-        Seq.with(Loadouts.basicShard, Loadouts.basicFoundation, Loadouts.basicNucleus).each(s -> checkLoadout(s, false));
+        Seq.with(Loadouts.basicShard, Loadouts.basicFoundation, Loadouts.basicNucleus, Loadouts.basicBastion).each(s -> checkLoadout(s, false));
     }
 
     public void overwrite(Schematic target, Schematic newSchematic){
@@ -123,6 +115,7 @@ public class Schematics implements Loadable{
         target.tiles.addAll(newSchematic.tiles);
         target.width = newSchematic.width;
         target.height = newSchematic.height;
+        newSchematic.labels = target.labels;
         newSchematic.tags.putAll(target.tags);
         newSchematic.file = target.file;
 
@@ -136,8 +129,6 @@ public class Schematics implements Loadable{
             Log.err(e);
             ui.showException(e);
         }
-
-
     }
 
     private @Nullable Schematic loadFile(Fi file){
@@ -181,7 +172,7 @@ public class Schematics implements Loadable{
         Draw.flush();
         buffer.begin();
         Pixmap pixmap = ScreenUtils.getFrameBufferPixmap(0, 0, buffer.getWidth(), buffer.getHeight());
-        file.writePNG(pixmap);
+        file.writePng(pixmap);
         buffer.end();
     }
 
@@ -209,8 +200,7 @@ public class Schematics implements Loadable{
             Seq<Schematic> keys = previews.orderedKeys().copy();
             for(int i = 0; i < previews.size - maxPreviewsMobile; i++){
                 //dispose and remove unneeded previews
-                previews.get(keys.get(i)).dispose();
-                previews.remove(keys.get(i));
+                previews.remove(keys.get(i)).dispose();
             }
             //update last clear time
             lastClearTime = Time.millis();
@@ -253,20 +243,20 @@ 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, t.config));
+            Seq<BuildPlan> plans = schematic.tiles.map(t -> new BuildPlan(t.x, t.y, t.rotation, t.block, t.config));
 
             Draw.flush();
-            //scale each request to fit schematic
+            //scale each plan to fit schematic
             Draw.trans().scale(resolution / tilesize, resolution / tilesize).translate(tilesize*1.5f, tilesize*1.5f);
 
-            //draw requests
-            requests.each(req -> {
+            //draw plans
+            plans.each(req -> {
                 req.animScale = 1f;
                 req.worldContext = false;
-                req.block.drawRequestRegion(req, requests);
+                req.block.drawPlanRegion(req, plans);
             });
 
-            requests.each(req -> req.block.drawRequestConfigTop(req, requests));
+            plans.each(req -> req.block.drawPlanConfigTop(req, plans));
 
             Draw.flush();
             Draw.trans().idt();
@@ -282,10 +272,10 @@ public class Schematics implements Loadable{
         return previews.get(schematic);
     }
 
-    /** 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){
+    /** Creates an array of build plans from a schematic's data, centered on the provided x+y coordinates. */
+    public Seq<BuildPlan> toPlans(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, t.config).original(t.x, t.y, schem.width, schem.height))
-            .removeAll(s -> (!s.block.isVisible() && !(s.block instanceof CoreBlock)) || !s.block.unlockedNow());
+            .removeAll(s -> (!s.block.isVisible() && !(s.block instanceof CoreBlock)) || !s.block.unlockedNow()).sort(Structs.comparingInt(s -> -s.block.schematicPriority));
     }
 
     /** @return all the valid loadouts for a specific core type. */
@@ -297,24 +287,56 @@ public class Schematics implements Loadable{
         return loadouts;
     }
 
+    public @Nullable Schematic getDefaultLoadout(CoreBlock block){
+        return defaultLoadouts.get(block);
+    }
+
+    public boolean isDefaultLoadout(Schematic schem){
+        return defaultLoadouts.containsValue(schem, true);
+    }
+
     /** Checks a schematic for deployment validity and adds it to the cache. */
-    private void checkLoadout(Schematic s, boolean validate){
+    private void checkLoadout(Schematic s, boolean customSchem){
         Stile core = s.tiles.find(t -> t.block instanceof CoreBlock);
+        if(core == null) return;
         int cores = s.tiles.count(t -> t.block instanceof CoreBlock);
+        int maxSize = getMaxLaunchSize(core.block);
 
         //make sure a core exists, and that the schematic is small enough.
-        if(core == null || (validate && (s.width > core.block.size + maxLoadoutSchematicPad *2 || s.height > core.block.size + maxLoadoutSchematicPad *2
+        if((customSchem && (s.width > maxSize || s.height > maxSize
             || s.tiles.contains(t -> t.block.buildVisibility == BuildVisibility.sandboxOnly || !t.block.unlocked()) || cores > 1))) return;
 
         //place in the cache
         loadouts.get((CoreBlock)core.block, Seq::new).add(s);
+
+        //save non-custom loadout
+        if(!customSchem){
+            defaultLoadouts.put((CoreBlock)core.block, s);
+        }
+    }
+
+    public int getMaxLaunchSize(Block block){
+        return block.size + maxLoadoutSchematicPad*2;
+    }
+
+    Fi findFile(String schematicName){
+        if(schematicName.isEmpty()) schematicName = "empty";
+        Fi result = null;
+        int index = 0;
+
+        while(result == null || result.exists()){
+            result = schematicDirectory.child(schematicName + (index == 0 ? "" : "_" + index) + "." + schematicExtension);
+            index ++;
+        }
+
+        return result;
     }
 
     /** Adds a schematic to the list, also copying it into the files.*/
     public void add(Schematic schematic){
         all.add(schematic);
         try{
-            Fi file = schematicDirectory.child(Time.millis() + "." + schematicExtension);
+            Fi file = findFile(Strings.sanitizeFilename(schematic.name()));
             write(schematic, file);
             schematic.file = file;
         }catch(Exception e){
@@ -342,6 +364,7 @@ public class Schematics implements Loadable{
 
     /** Creates a schematic from a world selection. */
     public Schematic create(int x, int y, int x2, int y2){
+        Team team = headless ? null : Vars.player.team();
         NormalizeResult result = Placement.normalizeArea(x, y, x2, y2, 0, false, maxSchematicSize);
         x = result.x;
         y = result.y;
@@ -357,10 +380,13 @@ public class Schematics implements Loadable{
         for(int cx = x; cx <= x2; cx++){
             for(int cy = y; cy <= y2; cy++){
                 Building linked = world.build(cx, cy);
+                if(linked != null && (!linked.isDiscovered(team) || !linked.wasVisible)) continue;
 
-                if(linked != null && (linked.block.isVisible() || linked.block() instanceof CoreBlock) && !(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;
+                Block realBlock = linked == null ? null : linked instanceof ConstructBuild cons ? cons.current : linked.block;
+
+                if(linked != null && realBlock != null && (realBlock.isVisible() || realBlock instanceof CoreBlock)){
+                    int top = realBlock.size/2;
+                    int bot = realBlock.size % 2 == 1 ? -realBlock.size/2 : -(realBlock.size - 1)/2;
                     minx = Math.min(linked.tileX() + bot, minx);
                     miny = Math.min(linked.tileY() + bot, miny);
                     maxx = Math.max(linked.tileX() + top, maxx);
@@ -385,12 +411,14 @@ public class Schematics implements Loadable{
         for(int cx = ox; cx <= ox2; cx++){
             for(int cy = oy; cy <= oy2; cy++){
                 Building tile = world.build(cx, cy);
+                if(tile != null && (!tile.isDiscovered(team) || !tile.wasVisible)) continue;
+                Block realBlock = tile == null ? null : tile instanceof ConstructBuild cons ? cons.current : tile.block;
 
-                if(tile != null && !counted.contains(tile.pos()) && !(tile.block instanceof ConstructBlock)
-                    && (tile.block.isVisible() || tile.block instanceof CoreBlock)){
-                    Object config = tile.config();
+                if(tile != null && !counted.contains(tile.pos()) && realBlock != null
+                    && (realBlock.isVisible() || realBlock instanceof CoreBlock)){
+                    Object config = tile instanceof ConstructBuild cons ? cons.lastConfig : tile.config();
 
-                    tiles.add(new Stile(tile.block, tile.tileX() + offsetX, tile.tileY() + offsetY, config, (byte)tile.rotation));
+                    tiles.add(new Stile(realBlock, tile.tileX() + offsetX, tile.tileY() + offsetY, config, (byte)tile.rotation));
                     counted.add(tile.pos());
                 }
             }
@@ -412,25 +440,25 @@ public class Schematics implements Loadable{
 
     /** Places the last launch loadout at the coordinates and fills it with the launch resources. */
     public static void placeLaunchLoadout(int x, int y){
-        placeLoadout(universe.getLastLoadout(), x, y);
+        placeLoadout(universe.getLastLoadout(), x, y, state.rules.defaultTeam);
         if(world.tile(x, y).build == null) throw new RuntimeException("No core at loadout coordinates!");
         world.tile(x, y).build.items.add(universe.getLaunchResources());
     }
 
     public static void placeLoadout(Schematic schem, int x, int y){
-        placeLoadout(schem, x, y, state.rules.defaultTeam, Blocks.oreCopper);
+        placeLoadout(schem, x, y, state.rules.defaultTeam);
     }
 
-    public static void placeLoadout(Schematic schem, int x, int y, Team team, Block resource){
-        placeLoadout(schem, x, y, team, resource, true);
+    public static void placeLoadout(Schematic schem, int x, int y, Team team){
+        placeLoadout(schem, x, y, team, true);
     }
 
-    public static void placeLoadout(Schematic schem, int x, int y, Team team, Block resource, boolean check){
+    public static void placeLoadout(Schematic schem, int x, int y, Team team, boolean check){
         Stile coreTile = schem.tiles.find(s -> s.block instanceof CoreBlock);
         Seq<Tile> seq = new Seq<>();
         if(coreTile == null) throw new IllegalArgumentException("Loadout schematic has no core tile!");
         int ox = x - coreTile.x, oy = y - coreTile.y;
-        schem.tiles.each(st -> {
+        schem.tiles.copy().sort(s -> -s.block.schematicPriority).each(st -> {
             Tile tile = world.tile(st.x + ox, st.y + oy);
             if(tile == null) return;
 
@@ -438,8 +466,14 @@ public class Schematics implements Loadable{
             if(check && !(st.block instanceof CoreBlock)){
                 seq.clear();
                 tile.getLinkedTilesAs(st.block, seq);
-                if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){
-                    return;
+                //remove env blocks, or not?
+                //if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){
+                //    return;
+                //}
+                for(var t : seq){
+                    if(t.block() != Blocks.air){
+                        t.remove();
+                    }
                 }
             }
 
@@ -450,17 +484,21 @@ public class Schematics implements Loadable{
                 tile.build.configureAny(config);
             }
 
-            if(st.block instanceof Drill){
-                tile.getLinkedTiles(t -> t.setOverlay(resource));
+            if(tile.build instanceof CoreBuild cb){
+                state.teams.registerCore(cb);
             }
         });
     }
 
     public static void place(Schematic schem, int x, int y, Team team){
+        place(schem, x, y, team, true);
+    }
+
+    public static void place(Schematic schem, int x, int y, Team team, boolean overwrite){
         int ox = x - schem.width/2, oy = y - schem.height/2;
         schem.tiles.each(st -> {
             Tile tile = world.tile(st.x + ox, st.y + oy);
-            if(tile == null) return;
+            if(tile == null || (!overwrite && !Build.validPlace(st.block, team, tile.x, tile.y, st.rotation))) return;
 
             tile.setBlock(st.block, team, st.rotation);
 
@@ -503,12 +541,22 @@ public class Schematics implements Loadable{
         try(DataInputStream stream = new DataInputStream(new InflaterInputStream(input))){
             short width = stream.readShort(), height = stream.readShort();
 
+            if(width > 128 || height > 128) throw new IOException("Invalid schematic: Too large (max possible size is 128x128)");
+
             StringMap map = new StringMap();
-            byte tags = stream.readByte();
+            int tags = stream.readUnsignedByte();
             for(int i = 0; i < tags; i++){
                 map.put(stream.readUTF(), stream.readUTF());
             }
 
+            String[] labels = null;
+
+            //try to read the categories, but skip if it fails
+            try{
+                labels = JsonIO.read(String[].class, map.get("labels", "[]"));
+            }catch(Exception ignored){
+            }
+
             IntMap<Block> blocks = new IntMap<>();
             byte length = stream.readByte();
             for(int i = 0; i < length; i++){
@@ -518,6 +566,9 @@ public class Schematics implements Loadable{
             }
 
             int total = stream.readInt();
+
+            if(total > 128 * 128) throw new IOException("Invalid schematic: Too many blocks.");
+
             Seq<Stile> tiles = new Seq<>(total);
             for(int i = 0; i < total; i++){
                 Block block = blocks.get(stream.readByte());
@@ -529,7 +580,9 @@ public class Schematics implements Loadable{
                 }
             }
 
-            return new Schematic(tiles, map, width, height);
+            Schematic out = new Schematic(tiles, map, width, height);
+            if(labels != null) out.labels.addAll(labels);
+            return out;
         }
     }
 
@@ -546,8 +599,10 @@ public class Schematics implements Loadable{
             stream.writeShort(schematic.width);
             stream.writeShort(schematic.height);
 
+            schematic.tags.put("labels", JsonIO.write(schematic.labels.toArray(String.class)));
+
             stream.writeByte(schematic.tags.size);
-            for(ObjectMap.Entry<String, String> e : schematic.tags.entries()){
+            for(var e : schematic.tags.entries()){
                 stream.writeUTF(e.key);
                 stream.writeUTF(e.value);
             }
@@ -598,7 +653,7 @@ public class Schematics implements Loadable{
 
     private static Schematic rotated(Schematic input, boolean counter){
         int direction = Mathf.sign(counter);
-        Schematic schem = input == tmpSchem ? tmpSchem2 : tmpSchem2;
+        Schematic schem = input == tmpSchem ? tmpSchem2 : tmpSchem;
         schem.width = input.width;
         schem.height = input.height;
         Pools.freeAll(schem.tiles);
@@ -624,7 +679,7 @@ public class Schematics implements Loadable{
                 p.set(cx, cy);
             });
 
-            //rotate actual request, centered on its multiblock position
+            //rotate actual plan, centered on its multiblock position
             float wx = (req.x - ox) * tilesize + req.block.offset, wy = (req.y - oy) * tilesize + req.block.offset;
             float x = wx;
             if(direction >= 0){
diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java
index 6a15c50e96..0d8e8e1f06 100644
--- a/core/src/mindustry/game/SectorInfo.java
+++ b/core/src/mindustry/game/SectorInfo.java
@@ -1,5 +1,6 @@
 package mindustry.game;
 
+import arc.func.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
@@ -9,6 +10,7 @@ import mindustry.maps.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
+import mindustry.world.meta.*;
 import mindustry.world.modules.*;
 
 import java.util.*;
@@ -20,6 +22,7 @@ public class SectorInfo{
     private static final int valueWindow = 60;
     /** refresh period of export in ticks */
     private static final float refreshPeriod = 60;
+    private static float returnf;
 
     /** Core input statistics. */
     public ObjectMap<Item, ExportStat> production = new ObjectMap<>();
@@ -27,6 +30,9 @@ public class SectorInfo{
     public ObjectMap<Item, ExportStat> rawProduction = new ObjectMap<>();
     /** Export statistics. */
     public ObjectMap<Item, ExportStat> export = new ObjectMap<>();
+    //TODO: there is an obvious exploit with launch pad redirection here; pads can be redirected after leaving a sector, which doesn't update calculations.
+    /** Import statistics, based on what launch pads are actually receiving. */
+    public ObjectMap<Item, ExportStat> imports = new ObjectMap<>();
     /** Items stored in all cores. */
     public ItemSeq items = new ItemSeq();
     /** The best available core type. */
@@ -35,6 +41,8 @@ public class SectorInfo{
     public int storageCapacity = 0;
     /** Whether a core is available here. */
     public boolean hasCore = true;
+    /** Whether a world processor is on this map - implies that the map will get cleared. */
+    public boolean hasWorldProcessor;
     /** Whether this sector was ever fully captured. */
     public boolean wasCaptured = false;
     /** Sector that was launched from. */
@@ -54,7 +62,7 @@ public class SectorInfo{
     /** Waves this sector can survive if under attack. Based on wave in info. <0 means uncalculated. */
     public int wavesSurvived = -1;
     /** Time between waves. */
-    public float waveSpacing = 60 * 60 * 2;
+    public float waveSpacing = 2 * Time.toMinutes;
     /** Damage dealt to sector. */
     public float damage;
     /** How many waves have passed while the player was away. */
@@ -63,20 +71,30 @@ public class SectorInfo{
     public int spawnPosition;
     /** How long the player has been playing elsewhere. */
     public float secondsPassed;
+    /** How many minutes this sector has been captured. */
+    public float minutesCaptured;
     /** Display name. */
     public @Nullable String name;
     /** Displayed icon. */
     public @Nullable String icon;
+    /** Displayed icon, as content. */
+    public @Nullable UnlockableContent contentIcon;
     /** Version of generated waves. When it doesn't match, new waves are generated. */
     public int waveVersion = -1;
     /** Whether this sector was indicated to the player or not. */
     public boolean shown = false;
 
     /** Special variables for simulation. */
-    public float sumHealth, sumRps, sumDps, waveHealthBase, waveHealthSlope, waveDpsBase, waveDpsSlope, bossHealth, bossDps, curEnemyHealth, curEnemyDps;
+    public float sumHealth, sumRps, sumDps, bossHealth, bossDps, curEnemyHealth, curEnemyDps;
     /** Wave where first boss shows up. */
     public int bossWave = -1;
 
+    public ObjectFloatMap<Item> importCooldownTimers = new ObjectFloatMap<>();
+    public @Nullable transient float[] importRateCache;
+
+    /** Temporary seq for last imported items. Do not use. */
+    public transient ItemSeq lastImported = new ItemSeq();
+
     /** Counter refresh state. */
     private transient Interval time = new Interval();
     /** Core item storage input/output deltas. */
@@ -96,12 +114,6 @@ public class SectorInfo{
         productionDeltas[item.id] += amount;
     }
 
-    /** @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);
@@ -112,39 +124,68 @@ public class SectorInfo{
         export.get(item, ExportStat::new).counter += amount;
     }
 
-    /** Subtracts from export statistics. */
+    /** Updates import statistics. */
     public void handleItemImport(Item item, int amount){
-        export.get(item, ExportStat::new).counter -= amount;
+        imports.get(item, ExportStat::new).counter += amount;
     }
 
     public float getExport(Item item){
         return export.get(item, ExportStat::new).mean;
     }
 
+    public boolean hasExport(Item item){
+        var exp = export.get(item);
+        return exp != null && exp.mean > 0f;
+    }
+
+    public void refreshImportRates(Planet planet){
+        if(importRateCache == null || importRateCache.length != content.items().size){
+            importRateCache = new float[content.items().size];
+        }else{
+            Arrays.fill(importRateCache, 0f);
+        }
+        eachImport(planet, sector -> sector.info.export.each((item, stat) -> {
+            importRateCache[item.id] += stat.mean;
+        }));
+    }
+
+    public float[] getImportRates(Planet planet){
+        if(importRateCache == null){
+            refreshImportRates(planet);
+        }
+        return importRateCache;
+    }
+
+    /** @return the import rate of an item as item/second. This is the *raw* max import rate, not what landing pads are actually using. */
+    public float getImportRate(Planet planet, Item item){
+        return getImportRates(planet)[item.id];
+    }
+
     /** Write contents of meta into main storage. */
     public void write(){
         //enable attack mode when there's a core.
         if(state.rules.waveTeam.core() != null){
             attack = true;
-            winWave = 0;
+            if(!state.rules.sector.planet.allowWaves){
+                winWave = 0;
+            }
         }
 
         //if there are infinite waves and no win wave, add a win wave.
-        if(winWave <= 0 && !attack){
+        if(winWave <= 0 && !attack && state.rules.sector.planet.allowWaves){
             winWave = 30;
         }
 
+        if(state.rules.sector != null && state.rules.sector.preset != null && state.rules.sector.preset.captureWave > 0 && !state.rules.sector.planet.allowWaves){
+            winWave = state.rules.sector.preset.captureWave;
+        }
+
         state.wave = wave;
         state.rules.waves = waves;
         state.rules.waveSpacing = waveSpacing;
         state.rules.winWave = winWave;
         state.rules.attackMode = attack;
 
-        //assign new wave patterns when the version changes
-        if(waveVersion != Waves.waveVersion && state.rules.sector.preset == null){
-            state.rules.spawns = Waves.generate(state.rules.sector.threat);
-        }
-
         CoreBuild entity = state.rules.defaultTeam.core();
         if(entity != null){
             entity.items.clear();
@@ -170,7 +211,7 @@ public class SectorInfo{
             spawnPosition = entity.pos();
         }
 
-        waveVersion = Waves.waveVersion;
+        hasWorldProcessor = state.teams.present.contains(t -> t.getBuildings(Blocks.worldProcessor).any());
         waveSpacing = state.rules.waveSpacing;
         wave = state.wave;
         winWave = state.rules.winWave;
@@ -189,11 +230,20 @@ public class SectorInfo{
             stat.mean = Math.min(stat.mean, rawProduction.get(item, ExportStat::new).mean);
         });
 
+        var pads = indexer.getFlagged(state.rules.defaultTeam, BlockFlag.launchPad);
+
+        //disable export when launch pads are disabled, or there aren't any active ones
+        if(pads.size == 0 || !pads.contains(t -> t.efficiency > 0)){
+            export.clear();
+        }
+
         if(state.rules.sector != null){
             state.rules.sector.saveInfo();
         }
 
-        SectorDamage.writeParameters(this);
+        if(state.rules.sector != null && state.rules.sector.planet.allowWaveSimulation){
+            SectorDamage.writeParameters(this);
+        }
     }
 
     /** Update averages of various stats, updates some special sector logic.
@@ -205,19 +255,8 @@ public class SectorInfo{
         //refresh throughput
         if(time.get(refreshPeriod)){
 
-            //refresh export
-            export.each((item, stat) -> {
-                //initialize stat after loading
-                if(!stat.loaded){
-                    stat.means.fill(stat.mean);
-                    stat.loaded = true;
-                }
-
-                //add counter, subtract how many items were taken from the core during this time
-                stat.means.add(Math.max(stat.counter, 0));
-                stat.counter = 0;
-                stat.mean = stat.means.rawMean();
-            });
+            updateStats(export);
+            updateStats(imports);
 
             if(coreDeltas == null) coreDeltas = new int[content.items().size];
             if(productionDeltas == null) productionDeltas = new int[content.items().size];
@@ -231,7 +270,13 @@ public class SectorInfo{
                 production.get(item).mean = Math.min(production.get(item).mean, rawProduction.get(item).mean);
 
                 if(export.containsKey(item)){
-                    export.get(item).mean = Math.min(export.get(item).mean, Math.max(rawProduction.get(item).mean, -production.get(item).mean));
+                    //export can, at most, be the raw items being produced from factories + the items being taken from the core
+                    export.get(item).mean = Math.min(export.get(item).mean, rawProduction.get(item).mean + Math.max(-production.get(item).mean, 0));
+                }
+
+                if(imports.containsKey(item)){
+                    //import can't exceed max import rate
+                    imports.get(item).mean = Math.min(imports.get(item).mean, getImportRate(state.getPlanet(), item));
                 }
             }
 
@@ -240,6 +285,20 @@ public class SectorInfo{
         }
     }
 
+    void updateStats(ObjectMap<Item, ExportStat> map){
+        map.each((item, stat) -> {
+            //initialize stat after loading
+            if(!stat.loaded){
+                stat.means.fill(stat.mean);
+                stat.loaded = true;
+            }
+
+            stat.means.add(Math.max(stat.counter, 0));
+            stat.counter = 0;
+            stat.mean = stat.means.rawMean();
+        });
+    }
+
     void updateDelta(Item item, ObjectMap<Item, ExportStat> map, int[] deltas){
         ExportStat stat = map.get(item, ExportStat::new);
         if(!stat.loaded){
@@ -258,6 +317,31 @@ public class SectorInfo{
         return map;
     }
 
+    public boolean anyExports(){
+        if(export.size == 0) return false;
+        returnf = 0f;
+        export.each((i, e) -> returnf += e.mean);
+        return returnf >= 0.01f;
+    }
+
+    /** @return a newly allocated map with import statistics. Use sparingly. */
+    //TODO this can be a float map
+    public ObjectMap<Item, ExportStat> importStats(Planet planet){
+        ObjectMap<Item, ExportStat> imports = new ObjectMap<>();
+        eachImport(planet, sector -> sector.info.export.each((item, stat) -> imports.get(item, ExportStat::new).mean += stat.mean));
+        return imports;
+    }
+
+    /** Iterates through every sector this one imports from. */
+    public void eachImport(Planet planet, Cons<Sector> cons){
+        for(Sector sector : planet.sectors){
+            Sector dest = sector.info.destination;
+            if(sector.hasBase() && sector.info != this && dest != null && dest.info == this && sector.info.anyExports()){
+                cons.get(sector);
+            }
+        }
+    }
+
     public static class ExportStat{
         public transient float counter;
         public transient WindowedMean means = new WindowedMean(valueWindow);
diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java
index 86ba7b6324..aa2657fc9c 100644
--- a/core/src/mindustry/game/SpawnGroup.java
+++ b/core/src/mindustry/game/SpawnGroup.java
@@ -1,12 +1,13 @@
 package mindustry.game;
 
+import arc.struct.*;
 import arc.util.*;
 import arc.util.serialization.*;
 import arc.util.serialization.Json.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
-import mindustry.io.legacy.*;
+import mindustry.io.versions.*;
 import mindustry.type.*;
 
 import java.util.*;
@@ -18,7 +19,7 @@ import static mindustry.Vars.*;
  * weapon equipped, ammo used, and status effects.
  * Each spawn group can have multiple sub-groups spawned in different areas of the map.
  */
-public class SpawnGroup implements Serializable{
+public class SpawnGroup implements JsonSerializable, Cloneable{
     public static final int never = Integer.MAX_VALUE;
 
     /** The unit type spawned */
@@ -35,16 +36,18 @@ public class SpawnGroup implements Serializable{
     public float unitScaling = never;
     /** Shield points that this unit has. */
     public float shields = 0f;
-    /** How much shields get increased per wave. */
+    /** How much shields get increased by per wave. */
     public float shieldScaling = 0f;
     /** Amount of enemies spawned initially, with no scaling */
     public int unitAmount = 1;
+    /** If not -1, the unit will only spawn in spawnpoints with these packed coordinates. */
+    public int spawn = -1;
+    /** Seq of payloads that this unit will spawn with. */
+    public @Nullable Seq<UnitType> payloads;
     /** Status effect applied to the spawned unit. Null to disable. */
-    @Nullable
-    public StatusEffect effect;
+    public @Nullable StatusEffect effect;
     /** Items this unit spawns with. Null to disable. */
-    @Nullable
-    public ItemStack items;
+    public @Nullable ItemStack items;
 
     public SpawnGroup(UnitType type){
         this.type = type;
@@ -54,6 +57,10 @@ public class SpawnGroup implements Serializable{
         //serialization use only
     }
 
+    public boolean canSpawn(int position){
+        return spawn == -1 || spawn == position;
+    }
+
     /** @return amount of units spawned on a specific wave. */
     public int getSpawned(int wave){
         if(spacing == 0) spacing = 1;
@@ -85,6 +92,15 @@ public class SpawnGroup implements Serializable{
 
         unit.shield = getShield(wave);
 
+        //load up spawn payloads
+        if(payloads != null && unit instanceof Payloadc pay){
+            for(var type : payloads){
+                if(type == null) continue;
+                Unit payload = type.create(unit.team);
+                pay.pickup(payload);
+            }
+        }
+
         return unit;
     }
 
@@ -101,14 +117,18 @@ public class SpawnGroup implements Serializable{
         if(shieldScaling != 0) json.writeValue("shieldScaling", shieldScaling);
         if(unitAmount != 1) json.writeValue("amount", unitAmount);
         if(effect != null) json.writeValue("effect", effect.name);
+        if(spawn != -1) json.writeValue("spawn", spawn);
+        if(payloads != null && payloads.any()) json.writeValue("payloads", payloads.map(u -> u.name).toArray(String.class));
+        if(items != null && items.amount > 0) json.writeValue("items", items);
+
     }
 
     @Override
     public void read(Json json, JsonValue data){
         String tname = data.getString("type", "dagger");
 
-        type = content.getByName(ContentType.unit, LegacyIO.unitMap.get(tname, tname));
-        if(type == null) type = UnitTypes.dagger;
+        type = content.unit(LegacyIO.unitMap.get(tname, tname));
+        if(type == null || type.internal) type = UnitTypes.dagger;
         begin = data.getInt("begin", 0);
         end = data.getInt("end", never);
         spacing = data.getInt("spacing", 1);
@@ -117,12 +137,16 @@ public class SpawnGroup implements Serializable{
         shields = data.getFloat("shields", 0);
         shieldScaling = data.getFloat("shieldScaling", 0);
         unitAmount = data.getInt("amount", 1);
+        spawn = data.getInt("spawn", -1);
+        if(data.has("payloads")) payloads = Seq.with(json.readValue(String[].class, data.get("payloads"))).map(content::unit).removeAll(t -> t == null);
+        if(data.has("items")) items = json.readValue(ItemStack.class, data.get("items"));
+
 
         //old boss effect ID
         if(data.has("effect") && data.get("effect").isNumber() && data.getInt("effect", -1) == 8){
             effect = StatusEffects.boss;
         }else{
-            effect = content.getByName(ContentType.status, data.has("effect") && data.get("effect").isString() ? data.getString("effect", "none") : "none");
+            effect = content.statusEffect(data.has("effect") && data.get("effect").isString() ? data.getString("effect", "none") : "none");
         }
     }
 
@@ -141,6 +165,14 @@ public class SpawnGroup implements Serializable{
         '}';
     }
 
+    public SpawnGroup copy(){
+        try{
+            return (SpawnGroup)clone();
+        }catch(CloneNotSupportedException how){
+            throw new RuntimeException("If you see this, what did you even do?", how);
+        }
+    }
+
     @Override
     public boolean equals(Object o){
         if(this == o) return true;
diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index cbed06f4e7..f27f099eca 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -8,15 +8,18 @@ import arc.util.*;
 import mindustry.game.Rules.*;
 import mindustry.game.Teams.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 import mindustry.world.modules.*;
 
 import static mindustry.Vars.*;
 
-public class Team implements Comparable<Team>{
+public class Team implements Comparable<Team>, Senseable{
     public final int id;
     public final Color color;
     public final Color[] palette;
+    public final int[] palettei = new int[3];
+    public String emoji = "";
     public boolean hasPalette;
     public String name;
 
@@ -27,19 +30,24 @@ public class Team implements Comparable<Team>{
 
     public final static Team
         derelict = new Team(0, "derelict", Color.valueOf("4d4e58")),
-        sharded = new Team(1, "sharded", Pal.accent.cpy(),
-            Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
-        crux = new Team(2, "crux", Color.valueOf("f25555"),
-            Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
-        green = new Team(3, "green", Color.valueOf("54d67d")),
-        purple = new Team(4, "purple", Color.valueOf("995bb0")),
-        blue = new Team(5, "blue", Color.valueOf("5a4deb"));
+        sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
+        crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
+        malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c7a4f5"), Color.valueOf("896fd6"), Color.valueOf("504cba")),
+
+        //TODO temporarily no palettes for these teams.
+        green = new Team(4, "green", Color.valueOf("54d67d")),//Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
+        blue = new Team(5, "blue", Color.valueOf("6c87fd")), //Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392")
+        neoplastic = new Team(6, "neoplastic", Color.valueOf("e05438")); //yes, it looks very similar to crux, you're not supposed to use this team for block regions anyway
 
     static{
         Mathf.rand.setSeed(8);
+        //fix random seed shift caused by new team
+        for(int i = 0; i < 3; i++){
+            Mathf.random();
+        }
         //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));
+        for(int i = 7; i < all.length; i++){
+            new Team(i, "team#" + i, Color.HSVtoRGB(360f * Mathf.random(), 100f * Mathf.random(0.4f, 1f), 100f * Mathf.random(0.6f, 1f), 1f));
         }
         Mathf.rand.setSeed(new Rand().nextLong());
     }
@@ -60,6 +68,10 @@ public class Team implements Comparable<Team>{
         palette[0] = color;
         palette[1] = color.cpy().mul(0.75f);
         palette[2] = color.cpy().mul(0.5f);
+
+        for(int i = 0; i < 3; i++){
+            palettei[i] = palette[i].rgba();
+        }
     }
 
     /** Specifies a 3-color team palette. */
@@ -69,6 +81,9 @@ public class Team implements Comparable<Team>{
         palette[0] = pal1;
         palette[1] = pal2;
         palette[2] = pal3;
+        for(int i = 0; i < 3; i++){
+            palettei[i] = palette[i].rgba();
+        }
         hasPalette = true;
     }
 
@@ -96,8 +111,25 @@ public class Team implements Comparable<Team>{
         return state.teams.isActive(this);
     }
 
+    /** @return whether this team is supposed to be AI-controlled. */
+    public boolean isAI(){
+        return (state.rules.waves || state.rules.attackMode) && this != state.rules.defaultTeam && !state.rules.pvp;
+    }
+
+    /** @return whether this team is solely comprised of AI (with no players possible). */
+    public boolean isOnlyAI(){
+        return isAI() && data().players.size == 0;
+    }
+
+    /** @return whether this team needs a flow field for "dumb" wave pathfinding. */
+    public boolean needsFlowField(){
+        return isAI() && !rules().rtsAi;
+    }
+
+    /** @deprecated There is absolutely no reason to use this. */
+    @Deprecated
     public boolean isEnemy(Team other){
-        return state.teams.areEnemies(this, other);
+        return this != other;
     }
 
     public Seq<CoreBuild> cores(){
@@ -108,6 +140,10 @@ public class Team implements Comparable<Team>{
         return Core.bundle.get("team." + name + ".name", name);
     }
 
+    public String coloredName(){
+        return emoji + "[#" + color + "]" + localized() + "[]";
+    }
+
     @Override
     public int compareTo(Team team){
         return Integer.compare(id, team.id);
@@ -117,4 +153,10 @@ public class Team implements Comparable<Team>{
     public String toString(){
         return name;
     }
+
+    @Override
+    public double sense(LAccess sensor){
+        if(sensor == LAccess.id) return id;
+        return 0;
+    }
 }
diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index d5afac1217..eec1b68ee8 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -1,16 +1,17 @@
 package mindustry.game;
 
 import arc.func.*;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.Queue;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.ai.*;
-import mindustry.content.*;
-import mindustry.entities.units.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.type.*;
+import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
@@ -26,8 +27,8 @@ public class Teams{
     public Seq<TeamData> active = new Seq<>();
     /** Teams with block or unit presence. */
     public Seq<TeamData> present = new Seq<>(TeamData.class);
-    /** Current boss unit. */
-    public @Nullable Unit boss;
+    /** Current boss units. */
+    public Seq<Unit> bosses = new Seq<>();
 
     public Teams(){
         active.add(get(Team.crux));
@@ -35,11 +36,19 @@ public class Teams{
 
     @Nullable
     public CoreBuild closestEnemyCore(float x, float y, Team team){
+        CoreBuild closest = null;
+        float closestDst = Float.MAX_VALUE;
+
         for(Team enemy : team.data().coreEnemies){
-            CoreBuild tile = Geometry.findClosest(x, y, enemy.cores());
-            if(tile != null) return tile;
+            for(CoreBuild core : enemy.cores()){
+                float dst = Mathf.dst2(x, y, core.getX(), core.getY());
+                if(closestDst > dst){
+                    closest = core;
+                    closestDst = dst;
+                }
+            }
         }
-        return null;
+        return closest;
     }
 
     @Nullable
@@ -47,11 +56,24 @@ public class Teams{
         return Geometry.findClosest(x, y, get(team).cores);
     }
 
-    public boolean eachEnemyCore(Team team, Boolf<CoreBuild> ret){
+    public boolean anyEnemyCoresWithinBuildRadius(Team team, float x, float y){
         for(TeamData data : active){
-            if(areEnemies(team, data.team)){
+            if(team != data.team){
                 for(CoreBuild tile : data.cores){
-                    if(ret.get(tile)){
+                    if(tile.within(x, y, state.rules.buildRadius(tile.team) + tilesize)){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public boolean anyEnemyCoresWithin(Team team, float x, float y, float radius){
+        for(TeamData data : active){
+            if(team != data.team){
+                for(CoreBuild tile : data.cores){
+                    if(tile.within(x, y, radius)){
                         return true;
                     }
                 }
@@ -62,7 +84,7 @@ public class Teams{
 
     public void eachEnemyCore(Team team, Cons<Building> ret){
         for(TeamData data : active){
-            if(areEnemies(team, data.team)){
+            if(team != data.team){
                 for(Building tile : data.cores){
                     ret.get(tile);
                 }
@@ -72,7 +94,10 @@ public class Teams{
 
     /** Returns team data by type. */
     public TeamData get(Team team){
-        if(map[team.id] == null) map[team.id] = new TeamData(team);
+        return map[team.id] == null ? (map[team.id] = new TeamData(team)) : map[team.id];
+    }
+
+    public @Nullable TeamData getOrNull(Team team){
         return map[team.id];
     }
 
@@ -91,11 +116,6 @@ public class Teams{
         return get(team).active();
     }
 
-    /** Returns whether {@param other} is an enemy of {@param #team}. */
-    public boolean areEnemies(Team team, Team other){
-        return team != other;
-    }
-
     public boolean canInteract(Team team, Team other){
         return team == other || other == Team.derelict;
     }
@@ -117,13 +137,11 @@ public class Teams{
         if(data.active() && !active.contains(data)){
             active.add(data);
             updateEnemies();
-            indexer.updateTeamIndex(data.team);
         }
     }
 
     public void unregisterCore(CoreBuild entity){
         TeamData data = get(entity.team);
-        //remove core
         data.cores.remove(entity);
         //unregister in active list
         if(!data.active()){
@@ -136,26 +154,31 @@ public class Teams{
         unit.team.data().updateCount(unit.type, 1);
 
         if(unit instanceof Payloadc payloadc){
-            payloadc.payloads().each(p -> {
-                if(p instanceof UnitPayload payload){
+            var payloads = payloadc.payloads();
+            for(int i = 0; i < payloads.size; i++){
+                if(payloads.get(i) instanceof UnitPayload payload){
                     count(payload.unit);
                 }
-            });
+            }
         }
     }
 
     public void updateTeamStats(){
         present.clear();
-        boss = null;
+        bosses.clear();
 
         for(Team team : Team.all){
             TeamData data = team.data();
 
-            data.presentFlag = false;
+            data.presentFlag = data.buildings.size > 0;
             data.unitCount = 0;
             data.units.clear();
-            if(data.tree != null){
-                data.tree.clear();
+            data.players.clear();
+            if(data.cores.size > 0){
+                data.lastCore = data.cores.first();
+            }
+            if(data.unitTree != null){
+                data.unitTree.clear();
             }
 
             if(data.typeCounts != null){
@@ -172,17 +195,16 @@ public class Teams{
             }
         }
 
-        //update presence flag.
-        Groups.build.each( b -> b.team.data().presentFlag = true);
-
+        //TODO this is slow and dumb
         for(Unit unit : Groups.unit){
+            if(unit.type == null) continue;
             TeamData data = unit.team.data();
             data.tree().insert(unit);
             data.units.add(unit);
             data.presentFlag = true;
 
             if(unit.team == state.rules.waveTeam && unit.isBoss()){
-                boss = unit;
+                bosses.add(unit);
             }
 
             if(data.unitsByType == null || data.unitsByType.length <= unit.type.id){
@@ -198,6 +220,10 @@ public class Teams{
             count(unit);
         }
 
+        for(var player : Groups.player){
+            player.team().data().players.add(player);
+        }
+
         //update presence of each team.
         for(Team team : Team.all){
             TeamData data = team.data();
@@ -217,7 +243,7 @@ public class Teams{
             Seq<Team> enemies = new Seq<>();
 
             for(TeamData other : active){
-                if(areEnemies(data.team, other.team)){
+                if(data.team != other.team){
                     enemies.add(other.team);
                 }
             }
@@ -227,38 +253,133 @@ public class Teams{
     }
 
     public static class TeamData{
-        public final Seq<CoreBuild> cores = new Seq<>();
+        private static final IntSeq derelictBuffer = new IntSeq();
+
         public final Team team;
-        public final BaseAI ai;
+
+        /** Handles building ""bases"". */
+        public @Nullable BaseBuilderAI buildAi;
+        /** Handles RTS unit control. */
+        public @Nullable RtsAI rtsAi;
 
         private boolean presentFlag;
 
         /** Enemies with cores or spawn points. */
         public Team[] coreEnemies = {};
         /** 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 Queue<BlockPlan> plans = new Queue<>();
 
+        /** List of live cores of this team. */
+        public final Seq<CoreBuild> cores = new Seq<>();
+        /** Last known live core of this team. */
+        public @Nullable CoreBuild lastCore;
+        /** Quadtree for all buildings of this team. Null if not active. */
+        public @Nullable QuadTree<Building> buildingTree;
+        /** Turrets by range. Null if not active. */
+        public @Nullable QuadTree<Building> turretTree;
+        /** Quadtree for units of this team. Do not access directly. */
+        public @Nullable QuadTree<Unit> unitTree;
+        /** Current unit cap. Do not modify externally. */
+        public int unitCap;
         /** Total unit count. */
         public int unitCount;
         /** Counts for each type of unit. Do not access directly. */
-        @Nullable
-        public int[] typeCounts;
-        /** Quadtree for units of this type. Do not access directly. */
-        @Nullable
-        public QuadTree<Unit> tree;
+        public @Nullable int[] typeCounts;
+        /** Cached buildings by type. */
+        public ObjectMap<Block, Seq<Building>> buildingTypes = new ObjectMap<>();
         /** Units of this team. Updated each frame. */
-        public Seq<Unit> units = new Seq<>();
+        public Seq<Unit> units = new Seq<>(false);
+        /** Same as units, but players. */
+        public Seq<Player> players = new Seq<>(false);
+        /** All buildings. Updated on team change / building addition or removal. Includes even buildings that do not update(). */
+        public Seq<Building> buildings = new Seq<>(false);
         /** Units of this team by type. Updated each frame. */
-        @Nullable
-        public Seq<Unit>[] unitsByType;
+        public @Nullable Seq<Unit>[] unitsByType;
 
         public TeamData(Team team){
             this.team = team;
-            this.ai = new BaseAI(this);
+        }
+
+        public Seq<Building> getBuildings(Block block){
+            return buildingTypes.get(block, () -> new Seq<>(false));
+        }
+
+        public int getCount(Block block){
+            var res = buildingTypes.get(block);
+            return res == null ? 0 : res.size;
+        }
+
+        /** Destroys this team's presence on the map, killing part of its buildings and converting everything to 'derelict'. */
+        public void destroyToDerelict(){
+
+            //grab all buildings from quadtree.
+            var builds = new Seq<Building>();
+            if(buildingTree != null){
+                buildingTree.getObjects(builds);
+            }
+
+            //no remaining blocks, cease building if applicable
+            plans.clear();
+
+            //convert all team tiles to neutral, randomly killing them
+            for(var b : builds){
+                if(b.block.privileged) continue;
+
+                if(b instanceof CoreBuild){
+                    b.kill();
+                }else{
+                    scheduleDerelict(b);
+                }
+            }
+
+            finishScheduleDerelict();
+
+            //kill all units randomly
+            units.each(u -> Time.run(Mathf.random(0f, 60f * 5f), () -> {
+                //ensure unit hasn't switched teams for whatever reason
+                if(u.team == team){
+                    u.kill();
+                }
+            }));
+        }
+
+        /** Make all buildings within this range derelict/explode. */
+        public void timeDestroy(float x, float y, float range){
+            var builds = new Seq<Building>();
+            if(buildingTree != null){
+                buildingTree.intersect(x - range, y - range, range * 2f, range * 2f, builds);
+            }
+
+            for(var build : builds){
+                if(!build.block.privileged && build.within(x, y, range) && !cores.contains(c -> c.within(build, range))){
+                    scheduleDerelict(build);
+                }
+            }
+            finishScheduleDerelict();
+        }
+
+        private void scheduleDerelict(Building build){
+            //queue block to be handled later, avoid packet spam
+            derelictBuffer.add(build.pos());
+
+            if(build.getPayload() instanceof UnitPayload){
+                Call.destroyPayload(build);
+            }
+
+            if(Mathf.chance(0.2)){
+                Time.run(Mathf.random(0f, 60f * 6f), build::kill);
+            }
+        }
+
+        private void finishScheduleDerelict(){
+            derelictBuffer.chunked(1000, values -> Call.setTeams(values, Team.derelict));
+            derelictBuffer.clear();
+        }
+
+        //this is just an alias for consistency
+        @Nullable
+        public Seq<Unit> getUnits(UnitType type){
+            return unitCache(type);
         }
 
         @Nullable
@@ -271,14 +392,14 @@ public class Teams{
             if(type == null) return;
             unitCount = Math.max(amount + unitCount, 0);
             if(typeCounts == null || typeCounts.length <= type.id){
-                typeCounts  = new int[Vars.content.units().size];
+                typeCounts = new int[Vars.content.units().size];
             }
             typeCounts[type.id] = Math.max(amount + typeCounts[type.id], 0);
         }
 
         public QuadTree<Unit> tree(){
-            if(tree == null) tree = new QuadTree<>(Vars.world.getQuadBounds(new Rect()));
-            return tree;
+            if(unitTree == null) unitTree = new QuadTree<>(Vars.world.getQuadBounds(new Rect()));
+            return unitTree;
         }
 
         public int countType(UnitType type){
@@ -304,7 +425,7 @@ public class Teams{
 
         /** @return whether this team is controlled by the AI and builds bases. */
         public boolean hasAI(){
-            return team.rules().ai;
+            return team.rules().rtsAi || team.rules().buildAi;
         }
 
         @Override
@@ -316,18 +437,39 @@ public class Teams{
         }
     }
 
+    @Remote(called = Loc.server, unreliable = true)
+    public static void destroyPayload(Building build){
+        if(build != null && build.getPayload() instanceof UnitPayload && build.takePayload() instanceof UnitPayload unit){
+            unit.dump();
+            unit.unit.killed();
+        }
+    }
+
     /** Represents a block made by this team that was destroyed somewhere on the map.
      * This does not include deconstructed blocks.*/
     public static class BlockPlan{
-        public final short x, y, rotation, block;
+        public final short x, y, rotation;
+        public final Block block;
         public final Object config;
+        public boolean removed;
 
-        public BlockPlan(int x, int y, short rotation, short block, Object config){
+        public BlockPlan(int x, int y, short rotation, Block block, Object config){
             this.x = (short)x;
             this.y = (short)y;
             this.rotation = rotation;
             this.block = block;
             this.config = config;
         }
+
+        @Override
+        public String toString(){
+            return "BlockPlan{" +
+            "x=" + x +
+            ", y=" + y +
+            ", rotation=" + rotation +
+            ", block=" + block +
+            ", config=" + config +
+            '}';
+        }
     }
 }
diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java
index 6ebf66afad..33fcc893c1 100644
--- a/core/src/mindustry/game/Universe.java
+++ b/core/src/mindustry/game/Universe.java
@@ -6,7 +6,9 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
+import mindustry.game.Schematic.*;
 import mindustry.game.SectorInfo.*;
+import mindustry.gen.*;
 import mindustry.maps.*;
 import mindustry.type.*;
 import mindustry.world.blocks.storage.*;
@@ -37,8 +39,10 @@ public class Universe{
 
     /** Update regardless of whether the player is in the campaign. */
     public void updateGlobal(){
-        //currently only updates one solar system
-        updatePlanet(Planets.sun);
+        for(Planet planet : content.planets()){
+            //update all parentless planets (solar system root), regardless of which one the player is in
+            if(planet.parent == null) updatePlanet(planet);
+        }
     }
 
     public int turn(){
@@ -81,10 +85,11 @@ public class Universe{
             }
         }
 
-        if(state.hasSector()){
+        if(state.hasSector() && state.getSector().planet.updateLighting && !(state.getSector().preset != null && state.getSector().preset.noLighting)){
+            var planet = state.getSector().planet;
             //update sector light
             float light = state.getSector().getLight();
-            float alpha = Mathf.clamp(Mathf.map(light, 0f, 0.8f, 0.3f, 1f));
+            float alpha = Mathf.clamp(Mathf.map(light, planet.lightSrcFrom, planet.lightSrcTo, planet.lightDstFrom, planet.lightDstTo));
 
             //assign and map so darkness is not 100% dark
             state.rules.ambientLight.a = 1f - alpha;
@@ -111,6 +116,11 @@ public class Universe{
         Core.settings.putJson("launch-resources-seq", lastLaunchResources);
     }
 
+    /** Updates selected loadout for future deployment. Creates an empty schematic with a single core block. */
+    public void updateLoadout(CoreBlock block){
+        updateLoadout(block, new Schematic(Seq.with(new Stile(block, 0, 0, null, (byte)0)), new StringMap(), block.size, block.size));
+    }
+
     /** Updates selected loadout for future deployment. */
     public void updateLoadout(CoreBlock block, Schematic schem){
         Core.settings.put("lastloadout-" + block.name, schem.file == null ? "" : schem.file.nameWithoutExtension());
@@ -118,11 +128,12 @@ public class Universe{
     }
 
     public Schematic getLastLoadout(){
-        if(lastLoadout == null) lastLoadout = Loadouts.basicShard;
+        if(lastLoadout == null) lastLoadout = state.rules.sector == null || state.rules.sector.planet.generator == null ? Loadouts.basicShard : state.rules.sector.planet.generator.defaultLoadout;
         return lastLoadout;
     }
 
     /** @return the last selected loadout for this specific core type. */
+    @Nullable
     public Schematic getLoadout(CoreBlock core){
         //for tools - schem
         if(schematics == null) return Loadouts.basicShard;
@@ -134,7 +145,7 @@ public class Universe{
         Seq<Schematic> all = schematics.getLoadouts(core);
         Schematic schem = all.find(s -> s.file != null && s.file.nameWithoutExtension().equals(file));
 
-        return schem == null ? all.first() : schem;
+        return schem == null ? all.any() ? all.first() : null : schem;
     }
 
     /** Runs possible events. Resets event counter. */
@@ -142,22 +153,74 @@ public class Universe{
         turn++;
 
         int newSecondsPassed = (int)(turnDuration / 60);
+        Planet current = state.getPlanet();
 
         //update relevant sectors
         for(Planet planet : content.planets()){
+
+            //planets with different wave simulation status are not updated
+            if(current != null && current.allowWaveSimulation != planet.allowWaveSimulation){
+                continue;
+            }
+
+            //don't simulate the planet if there is an in-progress mission on that planet
+            if(!planet.allowWaveSimulation && planet.sectors.contains(s -> s.hasBase() && !s.isBeingPlayed() && s.isAttacked())){
+                continue;
+            }
+
+            if(planet.campaignRules.legacyLaunchPads){
+                //first pass: clear import stats
+                for(Sector sector : planet.sectors){
+                    if(sector.hasBase() && !sector.isBeingPlayed()){
+                        sector.info.lastImported.clear();
+                    }
+                }
+
+                //second pass: update export & import statistics
+                for(Sector sector : planet.sectors){
+                    if(sector.hasBase() && !sector.isBeingPlayed()){
+
+                        //export to another sector
+                        if(sector.info.destination != null){
+                            Sector to = sector.info.destination;
+                            if(to.hasBase() && to.planet == planet){
+                                ItemSeq items = new ItemSeq();
+                                //calculated exported items to this sector
+                                sector.info.export.each((item, stat) -> items.add(item, (int)(stat.mean * newSecondsPassed * sector.getProductionScale())));
+                                to.addItems(items);
+                                to.info.lastImported.add(items);
+                            }
+                        }
+                    }
+                }
+            }
+
+            //third pass: everything else
             for(Sector sector : planet.sectors){
-                if(sector.hasSave() && sector.hasBase()){
+                if(sector.hasBase()){
+                    if(sector.info.importRateCache != null){
+                        sector.info.refreshImportRates(planet);
+                    }
+
+                    //if it is being attacked, capture time is 0; otherwise, increment the timer
+                    if(sector.isAttacked()){
+                        sector.info.minutesCaptured = 0;
+                    }else{
+                        sector.info.minutesCaptured += turnDuration / 60 / 60;
+                    }
 
                     //increment seconds passed for this sector by the time that just passed with this turn
                     if(!sector.isBeingPlayed()){
 
+                        //TODO: if a planet has sectors under attack and simulation is OFF, just don't simulate it
+
                         //increment time if attacked
                         if(sector.isAttacked()){
                             sector.info.secondsPassed += turnDuration/60f;
                         }
 
                         int wavesPassed = (int)(sector.info.secondsPassed*60f / sector.info.waveSpacing);
-                        boolean attacked = sector.info.waves;
+                        boolean attacked = sector.info.waves && sector.planet.allowWaveSimulation;
 
                         if(attacked){
                             sector.info.wavesPassed = wavesPassed;
@@ -181,34 +244,28 @@ public class Universe{
                         }else if(attacked && wavesPassed > 0 && sector.info.winWave > 1 && sector.info.wave + wavesPassed >= sector.info.winWave && !sector.hasEnemyBase()){
                             //autocapture the sector
                             sector.info.waves = false;
+                            boolean was = sector.info.wasCaptured;
                             sector.info.wasCaptured = true;
 
                             //fire the event
-                            Events.fire(new SectorCaptureEvent(sector));
+                            Events.fire(new SectorCaptureEvent(sector, !was));
                         }
 
                         float scl = sector.getProductionScale();
 
-                        //export to another sector
-                        if(sector.info.destination != null){
-                            Sector to = sector.info.destination;
-                            if(to.hasBase()){
-                                ItemSeq items = new ItemSeq();
-                                //calculated exported items to this sector
-                                sector.info.export.each((item, stat) -> items.add(item, (int)(stat.mean * newSecondsPassed * scl)));
-                                to.addItems(items);
-                            }
-                        }
-
-                        sector.info.export.each((item, amount) -> {
-                            if(sector.info.items.get(item) <= 0 && sector.info.production.get(item, ExportStat::new).mean < 0){
-                                //disable export when production is negative.
-                                sector.info.export.get(item).mean = 0f;
-                            }
-                        });
-
                         //add production, making sure that it's capped
                         sector.info.production.each((item, stat) -> sector.info.items.add(item, Math.min((int)(stat.mean * newSecondsPassed * scl), sector.info.storageCapacity - sector.info.items.get(item))));
+
+                        if(planet.campaignRules.legacyLaunchPads){
+                            sector.info.export.each((item, stat) -> {
+                                if(sector.info.items.get(item) <= 0 && sector.info.production.get(item, ExportStat::new).mean < 0 && stat.mean > 0){
+                                    //cap export by import when production is negative.
+                                    //TODO remove
+                                    stat.mean = Math.min(sector.info.lastImported.get(item) / (float)newSecondsPassed, stat.mean);
+                                }
+                            });
+                        }
+
                         //prevent negative values with unloaders
                         sector.info.items.checkNegative();
 
@@ -216,9 +273,11 @@ public class Universe{
                     }
 
                     //queue random invasions
-                    if(!sector.isAttacked() && turn > invasionGracePeriod && sector.info.hasSpawns){
+                    if(!sector.isAttacked() && sector.planet.campaignRules.sectorInvasion && sector.info.minutesCaptured > invasionGracePeriod && sector.info.hasSpawns){
+                        int count = sector.near().count(s -> s.hasEnemyBase() && !s.hasBase());
+
                         //invasion chance depends on # of nearby bases
-                        if(Mathf.chance(baseInvasionChance * Math.min(sector.near().count(Sector::hasEnemyBase), 1))){
+                        if(count > 0 && Mathf.chance(baseInvasionChance * (0.8f + (count - 1) * 0.3f))){
                             int waveMax = Math.max(sector.info.winWave, sector.isBeingPlayed() ? state.wave : sector.info.wave + sector.info.wavesPassed) + Mathf.random(2, 4) * 5;
 
                             //assign invasion-related things
@@ -226,6 +285,10 @@ public class Universe{
                                 state.rules.winWave = waveMax;
                                 state.rules.waves = true;
                                 state.rules.attackMode = false;
+                                //update rules in multiplayer
+                                if(net.server()){
+                                    Call.setRules(state.rules);
+                                }
                             }else{
                                 sector.info.winWave = waveMax;
                                 sector.info.waves = true;
@@ -245,21 +308,6 @@ public class Universe{
         save();
     }
 
-    /** 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.items());
-                }
-            }
-        }
-
-        return count;
-    }
-
     public void updateNetSeconds(int value){
         netSeconds = value;
     }
diff --git a/core/src/mindustry/game/Waves.java b/core/src/mindustry/game/Waves.java
index bdd95abedf..563d809f77 100644
--- a/core/src/mindustry/game/Waves.java
+++ b/core/src/mindustry/game/Waves.java
@@ -10,7 +10,7 @@ import mindustry.type.*;
 import static mindustry.content.UnitTypes.*;
 
 public class Waves{
-    public static final int waveVersion = 5;
+    public static final int waveVersion = 7;
 
     private Seq<SpawnGroup> spawns;
 
@@ -116,7 +116,7 @@ public class Waves{
                 spacing = 5;
                 unitAmount = 1;
                 unitScaling = 3;
-                effect = StatusEffects.shielded;
+                shields = 640f;
                 max = 25;
             }},
 
@@ -261,13 +261,35 @@ public class Waves{
     }
 
     public static Seq<SpawnGroup> generate(float difficulty, Rand rand, boolean attack){
+        return generate(difficulty, rand, attack, false);
+    }
+
+    public static Seq<SpawnGroup> generate(float difficulty, Rand rand, boolean attack, boolean airOnly){
+        return generate(difficulty, rand, attack, airOnly, false);
+    }
+
+    public static Seq<SpawnGroup> generate(float difficulty, Rand rand, boolean attack, boolean airOnly, boolean naval){
         UnitType[][] species = {
         {dagger, mace, fortress, scepter, reign},
         {nova, pulsar, quasar, vela, corvus},
         {crawler, atrax, spiroct, arkyid, toxopid},
+        {risso, minke, bryde, sei, omura},
+        {risso, oxynoe, cyerce, aegires, navanax}, //retusa intentionally left out as it cannot damage the core properly
         {flare, horizon, zenith, rand.chance(0.5) ? quad : antumbra, rand.chance(0.1) ? quad : eclipse}
         };
 
+        if(airOnly){
+            species = Structs.filter(UnitType[].class, species, v -> v[0].flying);
+        }
+
+        if(naval){
+            species = Structs.filter(UnitType[].class, species, v -> v[0].flying || v[0].naval);
+        }else{
+            species = Structs.filter(UnitType[].class, species, v -> !v[0].naval);
+        }
+
+        UnitType[][] fspec = species;
+
         //required progression:
         //- extra periodic patterns
 
@@ -281,7 +303,7 @@ public class Waves{
 
         Intc createProgression = start -> {
             //main sequence
-            UnitType[] curSpecies = Structs.random(species);
+            UnitType[] curSpecies = Structs.random(rand, fspec);
             int curTier = 0;
 
             for(int i = start; i < cap;){
@@ -326,7 +348,7 @@ public class Waves{
 
                 //small chance to switch species
                 if(rand.chance(0.3)){
-                    curSpecies = Structs.random(species);
+                    curSpecies = Structs.random(rand, fspec);
                 }
             }
         };
@@ -340,13 +362,13 @@ public class Waves{
             step += (int)(rand.random(15, 30) * Mathf.lerp(1f, 0.5f, difficulty));
         }
 
-        int bossWave = (int)(rand.random(50, 70) * Mathf.lerp(1f, 0.7f, difficulty));
-        int bossSpacing = (int)(rand.random(25, 40) * Mathf.lerp(1f, 0.6f, difficulty));
+        int bossWave = (int)(rand.random(50, 70) * Mathf.lerp(1f, 0.5f, difficulty));
+        int bossSpacing = (int)(rand.random(25, 40) * Mathf.lerp(1f, 0.5f, difficulty));
 
         int bossTier = difficulty < 0.6 ? 3 : 4;
 
         //main boss progression
-        out.add(new SpawnGroup(Structs.random(species)[bossTier]){{
+        out.add(new SpawnGroup(Structs.random(rand, species)[bossTier]){{
             unitAmount = 1;
             begin = bossWave;
             spacing = bossSpacing;
@@ -358,7 +380,7 @@ public class Waves{
         }});
 
         //alt boss progression
-        out.add(new SpawnGroup(Structs.random(species)[bossTier]){{
+        out.add(new SpawnGroup(Structs.random(rand, species)[bossTier]){{
             unitAmount = 1;
             begin = bossWave + rand.random(3, 5) * bossSpacing;
             spacing = bossSpacing;
@@ -372,7 +394,7 @@ public class Waves{
         int finalBossStart = 120 + rand.random(30);
 
         //final boss waves
-        out.add(new SpawnGroup(Structs.random(species)[bossTier]){{
+        out.add(new SpawnGroup(Structs.random(rand, species)[bossTier]){{
             unitAmount = 1;
             begin = finalBossStart;
             spacing = bossSpacing/2;
@@ -384,7 +406,7 @@ public class Waves{
         }});
 
         //final boss waves (alt)
-        out.add(new SpawnGroup(Structs.random(species)[bossTier]){{
+        out.add(new SpawnGroup(Structs.random(rand, species)[bossTier]){{
             unitAmount = 1;
             begin = finalBossStart + 15;
             spacing = bossSpacing/2;
@@ -397,10 +419,10 @@ public class Waves{
 
         //add megas to heal the base.
         if(attack && difficulty >= 0.5){
-            int amount = Mathf.random(1, 3 + (int)(difficulty*2));
+            int amount = rand.random(1, 3 + (int)(difficulty*2));
 
             for(int i = 0; i < amount; i++){
-                int wave = Mathf.random(3, 20);
+                int wave = rand.random(3, 20);
                 out.add(new SpawnGroup(mega){{
                     unitAmount = 1;
                     begin = wave;
diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java
index 651e1d01d7..10e29ef135 100644
--- a/core/src/mindustry/graphics/BlockRenderer.java
+++ b/core/src/mindustry/graphics/BlockRenderer.java
@@ -6,40 +6,50 @@ import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
+import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
-import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.Floor.*;
 import mindustry.world.blocks.power.*;
 
 import static arc.Core.*;
 import static mindustry.Vars.*;
 
-public class BlockRenderer implements Disposable{
-    public static final int crackRegions = 8, maxCrackSize = 9;
+public class BlockRenderer{
+    //TODO cracks take up far to much space, so I had to limit it to 7. this means larger blocks won't have cracks - draw tiling mirrored stuff instead?
+    public static final int crackRegions = 8, maxCrackSize = 7;
+    public static boolean drawQuadtreeDebug = false;
+    public static final Color shadowColor = new Color(0, 0, 0, 0.71f), blendShadowColor = Color.white.cpy().lerp(Color.black, shadowColor.a);
 
     private static final int initialRequests = 32 * 32;
-    private static final int expandr = 10;
-    private static final Color shadowColor = new Color(0, 0, 0, 0.71f);
 
     public final FloorRenderer floor = new FloorRenderer();
     public TextureRegion[][] cracks;
 
     private Seq<Tile> tileview = new Seq<>(false, initialRequests, Tile.class);
     private Seq<Tile> lightview = new Seq<>(false, initialRequests, Tile.class);
+    //TODO I don't like this system
+    private Seq<UpdateRenderState> updateFloors = new Seq<>(UpdateRenderState.class);
 
+    private boolean hadMapLimit;
     private int lastCamX, lastCamY, lastRangeX, lastRangeY;
     private float brokenFade = 0f;
     private FrameBuffer shadows = new FrameBuffer();
     private FrameBuffer dark = new FrameBuffer();
     private Seq<Building> outArray2 = new Seq<>();
     private Seq<Tile> shadowEvents = new Seq<>();
-    private IntSet procEntities = new IntSet(), procLinks = new IntSet(), procLights = new IntSet();
-    private boolean displayStatus = false;
+    private IntSet darkEvents = new IntSet();
+    private IntSet procLinks = new IntSet(), procLights = new IntSet();
+
+    private BlockQuadtree blockTree = new BlockQuadtree(new Rect(0, 0, 1, 1));
+    private FloorQuadtree floorTree = new FloorQuadtree(new Rect(0, 0, 1, 1));
 
     public BlockRenderer(){
 
@@ -53,8 +63,12 @@ public class BlockRenderer implements Disposable{
         });
 
         Events.on(WorldLoadEvent.class, event -> {
+            blockTree = new BlockQuadtree(new Rect(0, 0, world.unitWidth(), world.unitHeight()));
+            floorTree = new FloorQuadtree(new Rect(0, 0, world.unitWidth(), world.unitHeight()));
             shadowEvents.clear();
+            updateFloors.clear();
             lastCamY = lastCamX = -99; //invalidate camera position so blocks get updated
+            hadMapLimit = state.rules.limitMapArea;
 
             shadows.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear);
             shadows.resize(world.width(), world.height());
@@ -62,10 +76,24 @@ public class BlockRenderer implements Disposable{
             Core.graphics.clear(Color.white);
             Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
 
-            Draw.color(shadowColor);
+            Draw.color(blendShadowColor);
 
             for(Tile tile : world.tiles){
-                if(tile.block().hasShadow){
+                recordIndex(tile);
+
+                if(tile.floor().updateRender(tile)){
+                    updateFloors.add(new UpdateRenderState(tile, tile.floor()));
+                }
+
+                if(tile.overlay().updateRender(tile)){
+                    updateFloors.add(new UpdateRenderState(tile, tile.overlay()));
+                }
+
+                if(tile.build != null && (tile.team() == player.team() || !state.rules.fog || (tile.build.visibleFlags & (1L << player.team().id)) != 0)){
+                    tile.build.wasVisible = true;
+                }
+
+                if(tile.block().hasShadow && (tile.build == null || tile.build.wasVisible)){
                     Fill.rect(tile.x + 0.5f, tile.y + 0.5f, 1, 1);
                 }
             }
@@ -74,28 +102,33 @@ public class BlockRenderer implements Disposable{
             Draw.color();
             shadows.end();
 
-            dark.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear);
-            dark.resize(world.width(), world.height());
-            dark.begin();
-            Core.graphics.clear(Color.white);
-            Draw.proj().setOrtho(0, 0, dark.getWidth(), dark.getHeight());
+            updateDarkness();
+        });
 
-            for(Tile tile : world.tiles){
-                float darkness = world.getDarkness(tile.x, tile.y);
-
-                if(darkness > 0){
-                    Draw.color(0f, 0f, 0f, Math.min((darkness + 0.5f) / 4f, 1f));
-                    Fill.rect(tile.x + 0.5f, tile.y + 0.5f, 1, 1);
-                }
+        //sometimes darkness gets disabled.
+        Events.run(Trigger.newGame, () -> {
+            if(hadMapLimit && !state.rules.limitMapArea){
+                updateDarkness();
+                renderer.minimap.updateAll();
             }
+        });
 
-            Draw.flush();
-            Draw.color();
-            dark.end();
+        Events.on(TilePreChangeEvent.class, event -> {
+            if(blockTree == null || floorTree == null) return;
+
+            if(indexBlock(event.tile)) blockTree.remove(event.tile);
+            if(indexFloor(event.tile)) floorTree.remove(event.tile);
         });
 
         Events.on(TileChangeEvent.class, event -> {
-            shadowEvents.add(event.tile);
+            boolean visible = event.tile.build == null || !event.tile.build.inFogTo(Vars.player.team());
+            if(event.tile.build != null){
+                event.tile.build.wasVisible = visible;
+            }
+
+            if(visible){
+                shadowEvents.add(event.tile);
+            }
 
             int avgx = (int)(camera.position.x / tilesize);
             int avgy = (int)(camera.position.y / tilesize);
@@ -105,32 +138,148 @@ public class BlockRenderer implements Disposable{
             if(Math.abs(avgx - event.tile.x) <= rangex && Math.abs(avgy - event.tile.y) <= rangey){
                 lastCamY = lastCamX = -99; //invalidate camera position so blocks get updated
             }
+
+            invalidateTile(event.tile);
+            recordIndex(event.tile);
+        });
+    }
+
+    public void updateDarkness(){
+        darkEvents.clear();
+        dark.getTexture().setFilter(TextureFilter.linear);
+        dark.resize(world.width(), world.height());
+        dark.begin();
+
+        //fill darkness with black when map area is limited
+        Core.graphics.clear(state.rules.limitMapArea ? Color.black : Color.white);
+        Draw.proj().setOrtho(0, 0, dark.getWidth(), dark.getHeight());
+
+        //clear out initial starting area
+        if(state.rules.limitMapArea){
+            Draw.color(Color.white);
+            Fill.crect(state.rules.limitX, state.rules.limitY, state.rules.limitWidth, state.rules.limitHeight);
+        }
+
+        for(Tile tile : world.tiles){
+            //skip lighting outside rect
+            if(state.rules.limitMapArea && !Rect.contains(state.rules.limitX, state.rules.limitY, state.rules.limitWidth - 1, state.rules.limitHeight - 1, tile.x, tile.y)){
+                continue;
+            }
+
+            float darkness = world.getDarkness(tile.x, tile.y);
+
+            if(darkness > 0){
+                float dark = 1f - Math.min((darkness + 0.5f) / 4f, 1f);
+                Draw.colorl(dark);
+                Fill.rect(tile.x + 0.5f, tile.y + 0.5f, 1, 1);
+            }
+        }
+
+        Draw.flush();
+        Draw.color();
+        dark.end();
+    }
+
+    public void invalidateTile(Tile tile){
+        int avgx = (int)(camera.position.x / tilesize);
+        int avgy = (int)(camera.position.y / tilesize);
+        int rangex = (int)(camera.width / tilesize / 2) + 3;
+        int rangey = (int)(camera.height / tilesize / 2) + 3;
+
+        if(Math.abs(avgx - tile.x) <= rangex && Math.abs(avgy - tile.y) <= rangey){
+            lastCamY = lastCamX = -99; //invalidate camera position so blocks get updated
+        }
+    }
+
+    public void removeFloorIndex(Tile tile){
+        if(indexFloor(tile)) floorTree.remove(tile);
+    }
+
+    public void addFloorIndex(Tile tile){
+        if(indexFloor(tile)) floorTree.insert(tile);
+    }
+
+    boolean indexBlock(Tile tile){
+        var block = tile.block();
+        return tile.isCenter() && block != Blocks.air && block.cacheLayer == CacheLayer.normal;
+    }
+
+    boolean indexFloor(Tile tile){
+        return tile.block() == Blocks.air && tile.floor().emitLight && world.getDarkness(tile.x, tile.y) < 3;
+    }
+
+    void recordIndex(Tile tile){
+        if(indexBlock(tile)) blockTree.insert(tile);
+        if(indexFloor(tile)) floorTree.insert(tile);
+    }
+
+    public void recacheWall(Tile tile){
+        for(int cx = tile.x - darkRadius; cx <= tile.x + darkRadius; cx++){
+            for(int cy = tile.y - darkRadius; cy <= tile.y + darkRadius; cy++){
+                Tile other = world.tile(cx, cy);
+                if(other != null){
+                    darkEvents.add(other.pos());
+                    floor.recacheTile(other);
+                }
+            }
+        }
+    }
+
+    public void checkChanges(){
+        darkEvents.each(pos -> {
+            var tile = world.tile(pos);
+            if(tile != null && tile.block().fillsTile){
+                tile.data = world.getWallDarkness(tile);
+            }
         });
     }
 
     public void drawDarkness(){
+        if(!darkEvents.isEmpty()){
+            Draw.flush();
+
+            dark.begin();
+            Draw.proj().setOrtho(0, 0, dark.getWidth(), dark.getHeight());
+
+            darkEvents.each(pos -> {
+                var tile = world.tile(pos);
+                if(tile == null) return;
+                float darkness = world.getDarkness(tile.x, tile.y);
+                //then draw the shadow
+                Draw.colorl(darkness <= 0f ? 1f : 1f - Math.min((darkness + 0.5f) / 4f, 1f));
+                Fill.rect(tile.x + 0.5f, tile.y + 0.5f, 1, 1);
+            });
+
+            Draw.flush();
+            Draw.color();
+            dark.end();
+            darkEvents.clear();
+
+            Draw.proj(camera);
+        }
+
         Draw.shader(Shaders.darkness);
-        Draw.fbo(dark, world.width(), world.height(), tilesize);
+        Draw.fbo(dark.getTexture(), world.width(), world.height(), tilesize, tilesize/2f);
         Draw.shader();
     }
 
     public void drawDestroyed(){
         if(!Core.settings.getBool("destroyedblocks")) return;
 
-        if(control.input.isPlacing() || control.input.isBreaking()){
+        if(control.input.isPlacing() || control.input.isBreaking() || (control.input.isRebuildSelecting() && !scene.hasKeyboard())){
             brokenFade = Mathf.lerpDelta(brokenFade, 1f, 0.1f);
         }else{
             brokenFade = Mathf.lerpDelta(brokenFade, 0f, 0.1f);
         }
 
         if(brokenFade > 0.001f){
-            for(BlockPlan block : state.teams.get(player.team()).blocks){
-                Block b = content.block(block.block);
+            for(BlockPlan block : player.team().data().plans){
+                Block b = block.block;
                 if(!camera.bounds(Tmp.r1).grow(tilesize * 2f).overlaps(Tmp.r2.setSize(b.size * tilesize).setCenter(block.x * tilesize + b.offset, block.y * tilesize + b.offset))) continue;
 
                 Draw.alpha(0.33f * brokenFade);
                 Draw.mixcol(Color.white, 0.2f + Mathf.absin(Time.globalTime, 6f, 0.2f));
-                Draw.rect(b.icon(Cicon.full), block.x * tilesize + b.offset, block.y * tilesize + b.offset, b.rotate ? block.rotation * 90 : 0f);
+                Draw.rect(b.fullIcon, block.x * tilesize + b.offset, block.y * tilesize + b.offset, b.rotate ? block.rotation * 90 : 0f);
             }
             Draw.reset();
         }
@@ -144,11 +293,9 @@ public class BlockRenderer implements Disposable{
             Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
 
             for(Tile tile : shadowEvents){
-                //clear it first
-                Draw.color(Color.white);
-                Fill.rect(tile.x + 0.5f, tile.y + 0.5f, 1, 1);
-                //then draw the shadow
-                Draw.color(!tile.block().hasShadow ? Color.white : shadowColor);
+                if(tile == null) continue;
+                //draw white/shadow color depending on blend
+                Draw.color((!tile.block().hasShadow || (state.rules.fog && tile.build != null && !tile.build.wasVisible)) ? Color.white : blendShadowColor);
                 Fill.rect(tile.x + 0.5f, tile.y + 0.5f, 1, 1);
             }
 
@@ -177,13 +324,21 @@ public class BlockRenderer implements Disposable{
 
     /** Process all blocks to draw. */
     public void processBlocks(){
-        displayStatus = Core.settings.getBool("blockstatus");
-
         int avgx = (int)(camera.position.x / tilesize);
         int avgy = (int)(camera.position.y / tilesize);
 
-        int rangex = (int)(camera.width / tilesize / 2) + 3;
-        int rangey = (int)(camera.height / tilesize / 2) + 3;
+        int rangex = (int)(camera.width / tilesize / 2);
+        int rangey = (int)(camera.height / tilesize / 2);
+
+        if(!state.isPaused()){
+            int updates = updateFloors.size;
+            var uitems = updateFloors.items;
+            for(int i = 0; i < updates; i++){
+                var tile = uitems[i];
+                tile.floor.renderUpdate(tile);
+            }
+        }
+
 
         if(avgx == lastCamX && avgy == lastCamY && lastRangeX == rangex && lastRangeY == rangey){
             return;
@@ -191,56 +346,32 @@ public class BlockRenderer implements Disposable{
 
         tileview.clear();
         lightview.clear();
-        procEntities.clear();
         procLinks.clear();
         procLights.clear();
 
-        int minx = Math.max(avgx - rangex - expandr, 0);
-        int miny = Math.max(avgy - rangey - expandr, 0);
-        int maxx = Math.min(world.width() - 1, avgx + rangex + expandr);
-        int maxy = Math.min(world.height() - 1, avgy + rangey + expandr);
+        var bounds = camera.bounds(Tmp.r3).grow(tilesize * 2f);
 
-        for(int x = minx; x <= maxx; x++){
-            for(int y = miny; y <= maxy; y++){
-                boolean expanded = (Math.abs(x - avgx) > rangex || Math.abs(y - avgy) > rangey);
-                Tile tile = world.rawTile(x, y);
-                Block block = tile.block();
-                //link to center
-                if(tile.build != null){
-                    tile = tile.build.tile;
-                }
+        //draw floor lights
+        floorTree.intersect(bounds, lightview::add);
 
-                if(block != Blocks.air && block.cacheLayer == CacheLayer.normal && (tile.build == null || !procEntities.contains(tile.build.id))){
-                    if(block.expanded || !expanded){
-                        if(tile.build == null || procLinks.add(tile.build.id)){
-                            tileview.add(tile);
-                            if(tile.build != null){
-                                procEntities.add(tile.build.id);
-                                procLinks.add(tile.build.id);
-                            }
-                        }
+        blockTree.intersect(bounds, tile -> {
+            if(tile.build == null || procLinks.add(tile.build.id)){
+                tileview.add(tile);
+            }
+
+            //lights are drawn even in the expanded range
+            if(((tile.build != null && procLights.add(tile.build.pos())) || tile.block().emitLight)){
+                lightview.add(tile);
+            }
+
+            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 && procLinks.add(other.id)){ //TODO need a generic way to render connections!
+                        tileview.add(other.tile);
                     }
-
-                    //lights are drawn even in the expanded range
-                    if(((tile.build != null && procLights.add(tile.build.pos())) || tile.block().emitLight)){
-                        lightview.add(tile);
-                    }
-
-                    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 && procLinks.add(other.id)){ //TODO need a generic way to render connections!
-                                tileview.add(other.tile);
-                            }
-                        }
-                    }
-                }
-
-                //special case for floors
-                if((block == Blocks.air && tile.floor().emitLight) && procLights.add(tile.pos())){
-                    lightview.add(tile);
                 }
             }
-        }
+        });
 
         lastCamX = avgx;
         lastCamY = avgy;
@@ -248,38 +379,85 @@ public class BlockRenderer implements Disposable{
         lastRangeY = rangey;
     }
 
+    //debug method for drawing block bounds
+    void drawTree(QuadTree<Tile> tree){
+        Draw.color(Color.blue);
+        Lines.rect(tree.bounds);
+
+        Draw.color(Color.green);
+        for(var tile : tree.objects){
+            var block = tile.block();
+            Tmp.r1.setCentered(tile.worldx() + block.offset, tile.worldy() + block.offset, block.clipSize, block.clipSize);
+            Lines.rect(Tmp.r1);
+        }
+
+        if(!tree.leaf){
+            drawTree(tree.botLeft);
+            drawTree(tree.botRight);
+            drawTree(tree.topLeft);
+            drawTree(tree.topRight);
+        }
+        Draw.reset();
+    }
+
     public void drawBlocks(){
+        Team pteam = player.team();
+
         drawDestroyed();
 
         //draw most tile stuff
         for(int i = 0; i < tileview.size; i++){
             Tile tile = tileview.items[i];
             Block block = tile.block();
-            Building entity = tile.build;
+            Building build = tile.build;
 
             Draw.z(Layer.block);
 
-            if(block != Blocks.air){
+            boolean visible = (build == null || !build.inFogTo(pteam));
+
+            //comment wasVisible part for hiding?
+            if(block != Blocks.air && (visible || build.wasVisible)){
                 block.drawBase(tile);
                 Draw.reset();
                 Draw.z(Layer.block);
 
-                if(entity != null){
-                    if(entity.damaged()){
-                        entity.drawCracks();
+                if(block.customShadow){
+                    Draw.z(Layer.block - 1);
+                    block.drawShadow(tile);
+                    Draw.z(Layer.block);
+                }
+
+                if(build != null){
+                    if(visible){
+                        build.visibleFlags |= (1L << pteam.id);
+                        if(!build.wasVisible){
+                            build.wasVisible = true;
+                            updateShadow(build);
+                            renderer.minimap.update(tile);
+                        }
+                    }
+
+                    if(build.damaged()){
+                        Draw.z(Layer.blockCracks);
+                        build.drawCracks();
                         Draw.z(Layer.block);
                     }
 
-                    if(entity.team != player.team()){
-                        entity.drawTeam();
-                        Draw.z(Layer.block);
-                    }
-
-                    if(displayStatus && block.consumes.any()){
-                        entity.drawStatus();
+                    if(build.team != pteam){
+                        if(build.block.drawTeamOverlay){
+                            build.drawTeam();
+                            Draw.z(Layer.block);
+                        }
+                    }else if(renderer.drawStatus && block.hasConsumers){
+                        build.drawStatus();
                     }
                 }
                 Draw.reset();
+            }else if(!visible){
+                //TODO here is the question: should buildings you lost sight of remain rendered? if so, how should this information be stored?
+                //uncomment lines below for buggy persistence
+                //if(build.wasVisible) updateShadow(build);
+                //build.wasVisible = false;
             }
         }
 
@@ -293,20 +471,70 @@ public class BlockRenderer implements Disposable{
                     entity.drawLight();
                 }else if(tile.block().emitLight){
                     tile.block().drawEnvironmentLight(tile);
-                }else if(tile.floor().emitLight && !tile.block().solid && world.getDarkness(tile.x, tile.y) < 3){ //only draw floor light under non-solid blocks
+                }else if(tile.floor().emitLight && tile.block() == Blocks.air){ //only draw floor light under non-solid blocks
                     tile.floor().drawEnvironmentLight(tile);
                 }
             }
         }
 
+        if(drawQuadtreeDebug){
+            //TODO remove
+            Draw.z(Layer.overlayUI);
+            Lines.stroke(1f, Color.green);
 
+            blockTree.intersect(camera.bounds(Tmp.r1), tile -> {
+                Lines.rect(tile.getHitbox(Tmp.r2));
+            });
+
+            Draw.reset();
+        }
     }
 
-    @Override
-    public void dispose(){
-        shadows.dispose();
-        dark.dispose();
-        shadows = dark = null;
-        floor.dispose();
+    public void updateShadow(Building build){
+        if(build.tile == null) return;
+        int size = build.block.size, of = build.block.sizeOffset, tx = build.tile.x, ty = build.tile.y;
+
+        for(int x = 0; x < size; x++){
+            for(int y = 0; y < size; y++){
+                shadowEvents.add(world.tile(x + tx + of, y + ty + of));
+            }
+        }
     }
+
+    static class BlockQuadtree extends QuadTree<Tile>{
+
+        public BlockQuadtree(Rect bounds){
+            super(bounds);
+        }
+
+        @Override
+        public void hitbox(Tile tile){
+            var block = tile.block();
+            tmp.setCentered(tile.worldx() + block.offset, tile.worldy() + block.offset, block.clipSize, block.clipSize);
+        }
+
+        @Override
+        protected QuadTree<Tile> newChild(Rect rect){
+            return new BlockQuadtree(rect);
+        }
+    }
+
+    static class FloorQuadtree extends QuadTree<Tile>{
+
+        public FloorQuadtree(Rect bounds){
+            super(bounds);
+        }
+
+        @Override
+        public void hitbox(Tile tile){
+            var floor = tile.floor();
+            tmp.setCentered(tile.worldx(), tile.worldy(), floor.clipSize, floor.clipSize);
+        }
+
+        @Override
+        protected QuadTree<Tile> newChild(Rect rect){
+            return new FloorQuadtree(rect);
+        }
+    }
+
 }
diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java
index 01ef5e5bff..9ffd468ac2 100644
--- a/core/src/mindustry/graphics/CacheLayer.java
+++ b/core/src/mindustry/graphics/CacheLayer.java
@@ -3,95 +3,113 @@ package mindustry.graphics;
 import arc.*;
 import arc.graphics.*;
 import arc.graphics.gl.*;
+import arc.math.*;
+import arc.util.*;
 
 import static mindustry.Vars.*;
 
-public enum CacheLayer{
-    water{
-        @Override
-        public void begin(){
-            beginShader();
-        }
+public class CacheLayer{
+    public static CacheLayer
 
-        @Override
-        public void end(){
-            endShader(Shaders.water);
-        }
-    },
-    mud{
-        @Override
-        public void begin(){
-            beginShader();
-        }
+    water, mud, cryofluid, tar, slag, arkycite,
+    space, normal, walls;
 
-        @Override
-        public void end(){
-            endShader(Shaders.mud);
-        }
-    },
-    tar{
-        @Override
-        public void begin(){
-            beginShader();
-        }
+    public static CacheLayer[] all = {};
 
-        @Override
-        public void end(){
-            endShader(Shaders.tar);
-        }
-    },
-    slag{
-        @Override
-        public void begin(){
-            beginShader();
-        }
+    public int id;
 
-        @Override
-        public void end(){
-            endShader(Shaders.slag);
+    /** Registers cache layers that will render before the 'normal' layer. */
+    public static void add(CacheLayer... layers){
+        for(var layer : layers){
+            //7 = 'normal' index
+            add(7, layer);
         }
-    },
-    space{
-        @Override
-        public void begin(){
-            beginShader();
+    }
+
+    /** Register CacheLayers at the end of the array. This will render over "normal" tiles. This is likely not the method you want to use. */
+    public static void addLast(CacheLayer... layers){
+        int newSize = all.length + layers.length;
+        var prev = all;
+        //reallocate the array and copy everything over; performance matters very little here anyway
+        all = new CacheLayer[newSize];
+        System.arraycopy(prev, 0, all, 0, prev.length);
+        System.arraycopy(layers, 0, all, prev.length, layers.length);
+
+        for(int i = 0; i < all.length; i++){
+            all[i].id = i;
         }
+    }
 
-        @Override
-        public void end(){
-            endShader(Shaders.space);
+    /** Adds a cache layer at a certain position. All layers >= this index are shifted upwards.*/
+    public static void add(int index, CacheLayer layer){
+        index = Mathf.clamp(index, 0, all.length - 1);
+
+        var prev = all;
+        all = new CacheLayer[all.length + 1];
+
+        System.arraycopy(prev, 0, all, 0, index);
+        System.arraycopy(prev, index, all, index + 1, prev.length - index);
+
+        all[index] = layer;
+
+        for(int i = 0; i < all.length; i++){
+            all[i].id = i;
         }
-    },
-    normal,
-    walls;
+    }
 
-    public static final CacheLayer[] all = values();
+    /** Loads default cache layers. */
+    public static void init(){
+        addLast(
+            water = new ShaderLayer(Shaders.water),
+            mud = new ShaderLayer(Shaders.mud),
+            tar = new ShaderLayer(Shaders.tar),
+            slag = new ShaderLayer(Shaders.slag),
+            arkycite = new ShaderLayer(Shaders.arkycite),
+            cryofluid = new ShaderLayer(Shaders.cryofluid),
+            space = new ShaderLayer(Shaders.space),
+            normal = new CacheLayer(),
+            walls = new CacheLayer()
+        );
+    }
 
+    /** Called before the cache layer begins rendering. Begin FBOs here. */
     public void begin(){
 
     }
 
+    /** Called after the cache layer ends rendering. Blit FBOs here. */
     public void end(){
 
     }
 
-    void beginShader(){
-        if(!Core.settings.getBool("animatedwater")) return;
+    public static class ShaderLayer extends CacheLayer{
+        public @Nullable Shader shader;
 
-        renderer.blocks.floor.endc();
-        renderer.effectBuffer.begin();
-        Core.graphics.clear(Color.clear);
-        renderer.blocks.floor.beginc();
-    }
+        public ShaderLayer(Shader shader){
+            //shader will be null on headless backend, but that's ok
+            this.shader = shader;
+        }
 
-    void endShader(Shader shader){
-        if(!Core.settings.getBool("animatedwater")) return;
+        @Override
+        public void begin(){
+            if(!Core.settings.getBool("animatedwater")) return;
 
-        renderer.blocks.floor.endc();
-        renderer.effectBuffer.end();
+            renderer.blocks.floor.endc();
+            renderer.effectBuffer.begin();
+            Core.graphics.clear(Color.clear);
+            renderer.blocks.floor.beginc();
+        }
 
-        renderer.effectBuffer.blit(shader);
+        @Override
+        public void end(){
+            if(!Core.settings.getBool("animatedwater")) return;
 
-        renderer.blocks.floor.beginc();
+            renderer.blocks.floor.endc();
+            renderer.effectBuffer.end();
+
+            renderer.effectBuffer.blit(shader);
+
+            renderer.blocks.floor.beginc();
+        }
     }
 }
diff --git a/core/src/mindustry/graphics/CubemapMesh.java b/core/src/mindustry/graphics/CubemapMesh.java
index 7631c2bd2d..67ef264d86 100644
--- a/core/src/mindustry/graphics/CubemapMesh.java
+++ b/core/src/mindustry/graphics/CubemapMesh.java
@@ -3,7 +3,6 @@ package mindustry.graphics;
 import arc.*;
 import arc.graphics.*;
 import arc.graphics.Texture.*;
-import arc.graphics.VertexAttributes.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
 import arc.util.*;
@@ -60,9 +59,7 @@ public class CubemapMesh implements Disposable{
     public CubemapMesh(Cubemap map){
         this.map = map;
         this.map.setFilter(TextureFilter.linear);
-        this.mesh = new Mesh(true, vertices.length, 0,
-            new VertexAttribute(Usage.position, 3, "a_position")
-        );
+        this.mesh = new Mesh(true, vertices.length, 0, VertexAttribute.position3);
         mesh.getVerticesBuffer().limit(vertices.length);
         mesh.getVerticesBuffer().put(vertices, 0, vertices.length);
 
diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java
index b8d1f1e522..497736e6c9 100644
--- a/core/src/mindustry/graphics/Drawf.java
+++ b/core/src/mindustry/graphics/Drawf.java
@@ -5,21 +5,232 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.*;
 import arc.util.*;
-import mindustry.*;
 import mindustry.ctype.*;
-import mindustry.game.*;
 import mindustry.gen.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 
+import java.util.*;
+
 import static mindustry.Vars.*;
 
 public class Drawf{
+    private static final Vec2[] vecs = new Vec2[]{new Vec2(), new Vec2(), new Vec2(), new Vec2()};
+    private static final FloatSeq points = new FloatSeq();
 
+    /** Bleeds a mod pixmap if linear filtering is enabled. */
+    public static void checkBleed(Pixmap pixmap){
+        if(Core.settings.getBool("linear", true)){
+            Pixmaps.bleed(pixmap);
+        }
+    }
+
+    //TODO offset unused
+    public static void flame(float x, float y, int divisions, float rotation, float length, float width, float pan){
+        float len1 = length * pan, len2 = length * (1f - pan);
+
+        points.clear();
+
+        //left side; half arc beginning at 90 degrees and ending at 270
+        for(int i = 0; i < divisions; i++){
+            float rot = 90f + 180f * i / (float)divisions;
+            Tmp.v1.trnsExact(rot, width);
+
+            point(
+            (Tmp.v1.x + width) / width * len1, //convert to 0..1, then multiply by desired length
+            Tmp.v1.y, //Y axis remains unchanged
+            x, y,
+            rotation
+            );
+        }
+
+        //right side; half arc beginning at -90 (270) and ending at 90
+        for(int i = 0; i < divisions; i++){
+            float rot = -90f + 180f * i / (float)divisions;
+            Tmp.v1.trnsExact(rot, width);
+
+            point(
+            len1 + (Tmp.v1.x) / width * len2, //convert to 0..1, then multiply by desired length and offset relative to previous segment
+            Tmp.v1.y, //Y axis remains unchanged
+            x, y,
+            rotation
+            );
+        }
+
+        Fill.poly(points);
+    }
+
+    public static void flameFront(float x, float y, int divisions, float rotation, float length, float width){
+        //TODO I don't know why this is necessary yet. Does FIll.poly screw up with triangles?
+        divisions = Mathf.round(divisions, 2) + 1;
+
+        points.clear();
+
+        //right side; half arc beginning at -90 (270) and ending at 90
+        for(int i = 0; i <= divisions; i++){
+            float rot = -90f + 180f * i / (float)divisions;
+            Tmp.v1.trnsExact(rot, width);
+
+            point(
+            (Tmp.v1.x) / width * length, //convert to 0..1, then multiply by desired length and offset relative to previous segment
+            Tmp.v1.y, //Y axis remains unchanged
+            x, y,
+            rotation
+            );
+        }
+
+        Fill.poly(points);
+    }
+
+    private static void point(float x, float y, float baseX, float baseY, float rotation){
+        //TODO test exact and non-exact
+        Tmp.v1.set(x, y).rotateRadExact(rotation * Mathf.degRad);
+        points.add(Tmp.v1.x + baseX, Tmp.v1.y + baseY);
+    }
+
+    public static void buildBeam(float x, float y, float tx, float ty, float radius){
+        float ang = Angles.angle(x, y, tx, ty);
+
+        vecs[0].set(tx - radius, ty - radius);
+        vecs[1].set(tx + radius, ty - radius);
+        vecs[2].set(tx - radius, ty + radius);
+        vecs[3].set(tx + radius, ty + radius);
+
+        Arrays.sort(vecs, Structs.comparingFloat(vec -> -Angles.angleDist(Angles.angle(x, y, vec.x, vec.y), ang)));
+
+        Vec2 close = Geometry.findClosest(x, y, vecs);
+
+        float x1 = vecs[0].x, y1 = vecs[0].y,
+        x2 = close.x, y2 = close.y,
+        x3 = vecs[1].x, y3 = vecs[1].y;
+
+        if(renderer.animateShields){
+            if(close != vecs[0] && close != vecs[1]){
+                Fill.tri(x, y, x1, y1, x2, y2);
+                Fill.tri(x, y, x3, y3, x2, y2);
+            }else{
+                Fill.tri(x, y, x1, y1, x3, y3);
+            }
+        }else{
+            Lines.line(x, y, x1, y1);
+            Lines.line(x, y, x3, y3);
+        }
+    }
+
+    public static void additive(TextureRegion region, Color color, float x, float y){
+        additive(region, color, x, y, 0f, Layer.blockAdditive);
+    }
+
+    public static void additive(TextureRegion region, Color color, float x, float y, float rotation){
+        additive(region, color, x, y, rotation, Layer.blockAdditive);
+    }
+
+    public static void additive(TextureRegion region, Color color, float x, float y, float rotation, float layer){
+        additive(region, color, 1f, x, y, rotation, layer);
+    }
+
+    public static void additive(TextureRegion region, Color color, float alpha, float x, float y, float rotation, float layer){
+        float pz = Draw.z();
+        Draw.z(layer);
+        Draw.color(color, alpha * color.a);
+        Draw.blend(Blending.additive);
+        Draw.rect(region, x, y, rotation);
+        Draw.blend();
+        Draw.color();
+        Draw.z(pz);
+    }
+
+    public static void limitLine(Position start, Position dest, float len1, float len2, Color color){
+        if(start.within(dest, len1 + len2)){
+            return;
+        }
+        Tmp.v1.set(dest).sub(start).setLength(len1);
+        Tmp.v2.set(Tmp.v1).scl(-1f).setLength(len2);
+
+        Drawf.line(color, start.getX() + Tmp.v1.x, start.getY() + Tmp.v1.y, dest.getX() + Tmp.v2.x, dest.getY() + Tmp.v2.y);
+    }
+
+    public static void limitLine(Position start, Position dest, float len1, float len2){
+        limitLine(start, dest, len1, len2, Pal.accent);
+    }
+
+    public static void dashLineDst(Color color, float x, float y, float x2, float y2){
+        dashLine(color, x, y, x2, y2, (int)(Mathf.dst(x, y, x2, y2) / tilesize * 1.6f));
+    }
+
+    public static void dashLine(Color color, float x, float y, float x2, float y2){
+        dashLine(color, x, y, x2, y2, (int)(Math.max(Math.abs(x - x2), Math.abs(y - y2)) / tilesize * 2));
+    }
+
+    public static void dashLine(Color color, float x, float y, float x2, float y2, int segments){
+        Lines.stroke(3f);
+        Draw.color(Pal.gray, color.a);
+        Lines.dashLine(x, y, x2, y2, segments);
+        Lines.stroke(1f, color);
+        Lines.dashLine(x, y, x2, y2, segments);
+        Draw.reset();
+    }
+
+    public static void line(Color color, float x, float y, float x2, float y2){
+        Lines.stroke(3f);
+        Draw.color(Pal.gray, color.a);
+        Lines.line(x, y, x2, y2);
+        Lines.stroke(1f, color);
+        Lines.line(x, y, x2, y2);
+        Draw.reset();
+    }
+
+    public static void dashLineBasic(float x, float y, float x2, float y2){
+        Lines.dashLine(x, y, x2, y2, (int)(Math.max(Math.abs(x - x2), Math.abs(y - y2)) / tilesize * 2));
+    }
+
+    public static void dashSquare(Color color, float x, float y, float size){
+        dashRect(color, x - size/2f, y - size/2f, size, size);
+    }
+
+    public static void dashRect(Color color, Rect rect){
+        dashRect(color, rect.x, rect.y, rect.width, rect.height);
+    }
+
+    public static void dashRect(Color color, float x, float y, float width, float height){
+        dashLine(color, x, y, x + width, y);
+        dashLine(color, x + width, y, x + width, y + height);
+        dashLine(color, x + width, y + height, x, y + height);
+        dashLine(color, x, y + height, x, y);
+    }
+
+    public static void dashSquareBasic(float x, float y, float size){
+        dashRectBasic(x - size/2f, y - size/2f, size, size);
+    }
+
+    public static void dashRectBasic(float x, float y, float width, float height){
+        dashLineBasic(x, y, x + width, y);
+        dashLineBasic(x + width, y, x + width, y + height);
+        dashLineBasic(x + width, y + height, x, y + height);
+        dashLineBasic( x, y + height, x, y);
+    }
+
+    public static void target(float x, float y, float rad, Color color){
+        target(x, y, rad, 1, color);
+    }
+
+    public static void target(float x, float y, float rad, float alpha, Color color){
+        Lines.stroke(3f);
+        Draw.color(Pal.gray, alpha);
+        Lines.poly(x, y, 4, rad, Time.time * 1.5f);
+        Lines.spikes(x, y, 3f/7f * rad, 6f/7f * rad, 4, Time.time * 1.5f);
+        Lines.stroke(1f);
+        Draw.color(color, alpha);
+        Lines.poly(x, y, 4, rad, Time.time * 1.5f);
+        Lines.spikes(x, y, 3f/7f * rad, 6f/7f * rad, 4, Time.time * 1.5f);
+        Draw.reset();
+    }
+
+    /** Sets Draw.z to the text layer, and returns the previous layer. */
     public static float text(){
         float z = Draw.z();
-        if(renderer.pixelator.enabled()){
+        if(renderer.pixelate){
             Draw.z(Layer.endPixeled);
         }
 
@@ -27,31 +238,32 @@ public class Drawf{
     }
 
     public static void light(float x, float y, float radius, Color color, float opacity){
+        if(renderer == null) return;
         renderer.lights.add(x, y, radius, color, opacity);
     }
 
-    public static void light(Team team, float x, float y, float radius, Color color, float opacity){
-        if(allowLight(team)) renderer.lights.add(x, y, radius, color, opacity);
+    public static void light(Position pos, float radius, Color color, float opacity){
+        if(renderer == null) return;
+       light(pos.getX(), pos.getY(), radius, color, opacity);
     }
 
-    public static void light(Team team, Position pos, float radius, Color color, float opacity){
-       light(team, pos.getX(), pos.getY(), radius, color, opacity);
+    public static void light(float x, float y, TextureRegion region, Color color, float opacity){
+        light(x, y, region, 0f, color, opacity);
     }
 
-    public static void light(Team team, float x, float y, TextureRegion region, Color color, float opacity){
-        if(allowLight(team)) renderer.lights.add(x, y, region, color, opacity);
+    public static void light(float x, float y, TextureRegion region, float rotation, Color color, float opacity){
+        if(renderer == null) return;
+        renderer.lights.add(x, y, region, rotation, color, opacity);
     }
 
-    public static void light(Team team, float x, float y, float x2, float y2){
-        if(allowLight(team)) renderer.lights.line(x, y, x2, y2, 30, Color.orange, 0.3f);
+    public static void light(float x, float y, float x2, float y2){
+        if(renderer == null) return;
+        renderer.lights.line(x, y, x2, y2, 30, Color.orange, 0.3f);
     }
 
-    public static void light(Team team, float x, float y, float x2, float y2, float stroke, Color tint, float alpha){
-        if(allowLight(team)) renderer.lights.line(x, y, x2, y2, stroke, tint, alpha);
-    }
-
-    private static boolean allowLight(Team team){
-        return renderer != null && (team == Team.derelict || team == Vars.player.team() || state.rules.enemyLights);
+    public static void light(float x, float y, float x2, float y2, float stroke, Color tint, float alpha){
+        if(renderer == null) return;
+        renderer.lights.line(x, y, x2, y2, stroke, tint, alpha);
     }
 
     public static void selected(Building tile, Color color){
@@ -78,9 +290,15 @@ public class Drawf{
         shadow(x, y, rad, 1f);
     }
 
+    public static void squareShadow(float x, float y, float rad, float alpha){
+        Draw.color(0, 0, 0, 0.4f * alpha);
+        Draw.rect("square-shadow", x, y, rad * Draw.xscl, rad * Draw.yscl);
+        Draw.color();
+    }
+
     public static void shadow(float x, float y, float rad, float alpha){
         Draw.color(0, 0, 0, 0.4f * alpha);
-        Draw.rect("circle-shadow", x, y, rad, rad);
+        Draw.rect("circle-shadow", x, y, rad * Draw.xscl, rad * Draw.yscl);
         Draw.color();
     }
 
@@ -96,14 +314,20 @@ public class Drawf{
         Draw.color();
     }
 
+    public static void shadow(TextureRegion region, float x, float y, float width, float height, float rotation){
+        Draw.color(Pal.shadow);
+        Draw.rect(region, x, y, width, height, rotation);
+        Draw.color();
+    }
+
     public static void liquid(TextureRegion region, float x, float y, float alpha, Color color, float rotation){
-        Draw.color(color, alpha);
+        Draw.color(color, alpha * color.a);
         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.color(color, alpha * color.a);
         Draw.rect(region, x, y);
         Draw.color();
     }
@@ -137,13 +361,21 @@ public class Drawf{
     }
 
     public static void square(float x, float y, float radius, float rotation, Color color){
-        Lines.stroke(3f, Pal.gray);
+        Lines.stroke(3f, Pal.gray.write(Tmp.c3).a(color.a));
         Lines.square(x, y, radius + 1f, rotation);
         Lines.stroke(1f, color);
         Lines.square(x, y, radius + 1f, rotation);
         Draw.reset();
     }
 
+    public static void poly(float x, float y, int sides, float radius, float rotation, Color color){
+        Lines.stroke(3f, Pal.gray);
+        Lines.poly(x, y, sides, radius + 1f, rotation);
+        Lines.stroke(1f, color);
+        Lines.poly(x, y, sides, radius + 1f, rotation);
+        Draw.reset();
+    }
+
     public static void square(float x, float y, float radius, float rotation){
         square(x, y, radius, rotation, Pal.accent);
     }
@@ -173,42 +405,58 @@ public class Drawf{
         Draw.color();
     }
 
-    public static void laser(Team team, TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2, float scale){
-        laser(team, line, edge, x, y, x2, y2, Mathf.angle(x2 - x, y2 - y), scale);
+    public static void laser(TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2){
+        laser(line, edge, edge, x, y, x2, y2, 1f);
     }
 
-    public static void laser(Team team, TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2){
-        laser(team, line, edge, x, y, x2, y2, Mathf.angle(x2 - x, y2 - y), 1f);
+    public static void laser(TextureRegion line, TextureRegion start, TextureRegion end, float x, float y, float x2, float y2){
+        laser(line, start, end, x, y, x2, y2, 1f);
     }
 
-    public static void laser(Team team, TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2, float rotation, float scale){
-        float scl = 8f * scale * Draw.scl;
-        float vx = Mathf.cosDeg(rotation) * scl, vy = Mathf.sinDeg(rotation) * scl;
+    public static void laser(TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2, float scale){
+        laser(line, edge, edge, x, y, x2, y2, scale);
+    }
 
-        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);
+    public static void laser(TextureRegion line, TextureRegion start, TextureRegion end, float x, float y, float x2, float y2, float scale){
+        float scl = 8f * scale * Draw.scl, rot = Mathf.angle(x2 - x, y2 - y);
+        float vx = Mathf.cosDeg(rot) * scl, vy = Mathf.sinDeg(rot) * scl;
+
+        Draw.rect(start, x, y, start.width * scale * start.scl(), start.height * scale * start.scl(), rot + 180);
+        Draw.rect(end, x2, y2, end.width * scale * end.scl(), end.height * scale * end.scl(), rot);
 
         Lines.stroke(12f * scale);
         Lines.line(line, x + vx, y + vy, x2 - vx, y2 - vy, false);
         Lines.stroke(1f);
 
-        light(team, x, y, x2, y2);
+        light(x, y, x2, y2);
     }
 
     public static void tri(float x, float y, float width, float length, float rotation){
-        float oy = 17f / 63f * length;
-        Draw.rect(Core.atlas.find("shape-3"), x, y - oy + length / 2f, width, length, width / 2f, oy, rotation - 90);
+        float
+            fx = Angles.trnsx(rotation, length),
+            fy = Angles.trnsy(rotation, length),
+            rx = Angles.trnsx(rotation - 90f, width / 2f),
+            ry = Angles.trnsy(rotation - 90f, width / 2f);
+        Fill.tri(
+            x + rx, y + ry,
+            x + fx, y + fy,
+            x - rx, y - ry
+        );
     }
 
-    public static void construct(Building t, UnlockableContent content, float rotation, float progress, float speed, float time){
-        construct(t, content.icon(Cicon.full), rotation, progress, speed, time);
+    public static void construct(Building t, UnlockableContent content, float rotation, float progress, float alpha, float time){
+        construct(t, content.fullIcon, rotation, progress, alpha, time);
     }
 
-    public static void construct(float x, float y, TextureRegion region, float rotation, float progress, float speed, float time){
+    public static void construct(float x, float y, TextureRegion region, float rotation, float progress, float alpha, float time){
+        construct(x, y, region, Pal.accent, rotation, progress, alpha, time);
+    }
+
+    public static void construct(float x, float y, TextureRegion region, Color color, float rotation, float progress, float alpha, float time){
         Shaders.build.region = region;
         Shaders.build.progress = progress;
-        Shaders.build.color.set(Pal.accent);
-        Shaders.build.color.a = speed;
+        Shaders.build.color.set(color);
+        Shaders.build.color.a = alpha;
         Shaders.build.time = -time / 20f;
 
         Draw.shader(Shaders.build);
@@ -218,11 +466,19 @@ public class Drawf{
         Draw.reset();
     }
 
-    public static void construct(Building t, TextureRegion region, float rotation, float progress, float speed, float time){
+    public static void construct(Building t, TextureRegion region, float rotation, float progress, float alpha, float time){
+        construct(t, region, Pal.accent, rotation, progress, alpha, time);
+    }
+
+    public static void construct(Building t, TextureRegion region, Color color, float rotation, float progress, float alpha, float time){
+        construct(t, region, color, rotation, progress, alpha, time, t.block.size * tilesize - 4f);
+    }
+
+    public static void construct(Building t, TextureRegion region, Color color, float rotation, float progress, float alpha, float time, float size){
         Shaders.build.region = region;
         Shaders.build.progress = progress;
-        Shaders.build.color.set(Pal.accent);
-        Shaders.build.color.a = speed;
+        Shaders.build.color.set(color);
+        Shaders.build.color.a = alpha;
         Shaders.build.time = -time / 20f;
 
         Draw.shader(Shaders.build);
@@ -230,10 +486,20 @@ public class Drawf{
         Draw.shader();
 
         Draw.color(Pal.accent);
-        Draw.alpha(speed);
+        Draw.alpha(alpha);
 
-        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, size / 2f), t.y, 90, size);
 
         Draw.reset();
     }
+
+    /** Draws a sprite that should be light-wise correct, when rotated. Provided sprite must be symmetrical in shape. */
+    public static void spinSprite(TextureRegion region, float x, float y, float r){
+        float a = Draw.getColorAlpha();
+        r = Mathf.mod(r, 90f);
+        Draw.rect(region, x, y, r);
+        Draw.alpha(r / 90f*a);
+        Draw.rect(region, x, y, r - 90f);
+        Draw.alpha(a);
+    }
 }
diff --git a/core/src/mindustry/graphics/EnvRenderers.java b/core/src/mindustry/graphics/EnvRenderers.java
new file mode 100644
index 0000000000..d7dae0d0c8
--- /dev/null
+++ b/core/src/mindustry/graphics/EnvRenderers.java
@@ -0,0 +1,107 @@
+package mindustry.graphics;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.Texture.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.type.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class EnvRenderers{
+
+    public static void init(){
+
+        Color waterColor = Color.valueOf("353982");
+        Rand rand = new Rand();
+
+        Core.assets.load("sprites/rays.png", Texture.class).loaded = t -> {
+            t.setFilter(TextureFilter.linear);
+        };
+
+        Color particleColor = Color.valueOf("a7c1fa");
+        float windSpeed = 0.03f, windAngle = 45f;
+        float windx = Mathf.cosDeg(windAngle) * windSpeed, windy = Mathf.sinDeg(windAngle) * windSpeed;
+
+        renderer.addEnvRenderer(Env.underwater, () -> {
+            Draw.draw(Layer.light + 1, () -> {
+                Draw.color(waterColor, 0.4f);
+                Fill.rect(Core.camera.position.x, Core.camera.position.y, Core.camera.width, Core.camera.height);
+                Draw.reset();
+
+                Blending.additive.apply();
+                Draw.blit(Shaders.caustics);
+                Blending.normal.apply();
+            });
+
+            Draw.z(Layer.light + 2);
+
+            int rays = 50;
+            float timeScale = 2000f;
+            rand.setSeed(0);
+
+            Draw.blend(Blending.additive);
+
+            float t = Time.time / timeScale;
+            Texture tex = Core.assets.get("sprites/rays.png", Texture.class);
+
+            for(int i = 0; i < rays; i++){
+                float offset = rand.random(0f, 1f);
+                float time = t + offset;
+
+                int pos = (int)time;
+                float life = time % 1f;
+                float opacity = rand.random(0.2f, 0.7f) * Mathf.slope(life) * 0.7f;
+                float x = (rand.random(0f, world.unitWidth()) + (pos % 100)*753) % world.unitWidth();
+                float y = (rand.random(0f, world.unitHeight()) + (pos % 120)*453) % world.unitHeight();
+                float rot = rand.range(7f);
+                float sizeScale = 1f + rand.range(0.3f);
+
+                float topDst = (Core.camera.position.y + Core.camera.height/2f) - (y + tex.height/2f + tex.height*1.9f*sizeScale/2f);
+                float invDst = topDst/1000f;
+                opacity = Math.min(opacity, -invDst);
+
+                if(opacity > 0.01){
+                    Draw.alpha(opacity);
+                    Draw.rect(Draw.wrap(tex), x, y + tex.height/2f, tex.width*2*sizeScale, tex.height*2*sizeScale, rot);
+                    Draw.color();
+                }
+            }
+
+            //suspended particles
+            Draw.draw(Layer.weather, () -> {
+                Weather.drawParticles(
+                    Core.atlas.find("particle"), particleColor,
+                    1.4f, 4f, //minmax size
+                    10000f, 1f, 1f, //density
+                    windx, windy, //wind vectors
+                    0.5f, 1f, //minmax alpha
+                    30f, 80f, //sinscl
+                    1f, 7f, //sinmag
+                    false
+                );
+            });
+
+            Draw.blend();
+        });
+
+        Core.assets.load("sprites/distortAlpha.png", Texture.class);
+
+        renderer.addEnvRenderer(Env.scorching, () -> {
+            Texture tex = Core.assets.get("sprites/distortAlpha.png", Texture.class);
+            if(tex.getMagFilter() != TextureFilter.linear){
+                tex.setFilter(TextureFilter.linear);
+                tex.setWrap(TextureWrap.repeat);
+            }
+
+            //TODO layer looks better? should not be conditional
+            Draw.z(state.rules.fog ? Layer.fogOfWar + 1 : Layer.weather - 1);
+            Weather.drawNoiseLayers(tex, Color.scarlet, 1000f, 0.24f, 0.4f, 1f, 1f, 0f, 4, -1.3f, 0.7f, 0.8f, 0.9f);
+            Draw.reset();
+        });
+    }
+
+}
diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java
index 3e8d4e1fcb..872c71953c 100644
--- a/core/src/mindustry/graphics/FloorRenderer.java
+++ b/core/src/mindustry/graphics/FloorRenderer.java
@@ -3,6 +3,7 @@ package mindustry.graphics;
 import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
@@ -12,28 +13,92 @@ import mindustry.game.EventType.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
-import java.util.*;
-
 import static mindustry.Vars.*;
 
-public class FloorRenderer implements Disposable{
-    private static final int chunksize = mobile ? 16 : 32;
+/**
+ * general implementation:
+ *
+ * caching:
+ * 1. create fixed-size float array for rendering into
+ * 2. for each chunk, cache each layer into buffer; record layer boundary indices (alternatively, create mesh per layer for fast recache)
+ * 3. create mesh for this chunk based on buffer size, copy buffer into mesh
+ *
+ * rendering:
+ * 1. iterate through visible chunks
+ * 2. activate the shader vertex attributes beforehand
+ * 3. bind each mesh individually, draw it
+ *
+ * */
+public class FloorRenderer{
+    private static final VertexAttribute[] attributes = {VertexAttribute.position, VertexAttribute.color, VertexAttribute.texCoords};
+    private static final int
+        chunksize = 30, //todo 32?
+        chunkunits = chunksize * tilesize,
+        vertexSize = 2 + 1 + 2,
+        spriteSize = vertexSize * 4,
+        maxSprites = chunksize * chunksize * 9;
+    private static final float pad = tilesize/2f;
+    //if true, chunks are rendered on-demand; this causes small lag spikes and is generally not needed for most maps
+    private static final boolean dynamic = false;
 
-    private int[][][] cache;
-    private MultiCacheBatch cbatch;
+    private float[] vertices = new float[maxSprites * vertexSize * 4];
+    private short[] indices = new short[maxSprites * 6];
+    private int vidx;
+    private FloorRenderBatch batch = new FloorRenderBatch();
+    private Shader shader;
+    private Texture texture;
+    private TextureRegion error;
+
+    private Mesh[][][] cache;
     private IntSet drawnLayerSet = new IntSet();
     private IntSet recacheSet = new IntSet();
     private IntSeq drawnLayers = new IntSeq();
     private ObjectSet<CacheLayer> used = new ObjectSet<>();
 
     public FloorRenderer(){
+        short j = 0;
+        for(int i = 0; i < indices.length; i += 6, j += 4){
+            indices[i] = j;
+            indices[i + 1] = (short)(j + 1);
+            indices[i + 2] = (short)(j + 2);
+            indices[i + 3] = (short)(j + 2);
+            indices[i + 4] = (short)(j + 3);
+            indices[i + 5] = j;
+        }
+
+        shader = new Shader(
+        """
+        attribute vec4 a_position;
+        attribute vec4 a_color;
+        attribute vec2 a_texCoord0;
+        uniform mat4 u_projectionViewMatrix;
+        varying vec4 v_color;
+        varying vec2 v_texCoords;
+
+        void main(){
+           v_color = a_color;
+           v_color.a = v_color.a * (255.0/254.0);
+           v_texCoords = a_texCoord0;
+           gl_Position =  u_projectionViewMatrix * a_position;
+        }
+        """,
+        """
+        varying vec4 v_color;
+        varying vec2 v_texCoords;
+        uniform sampler2D u_texture;
+
+        void main(){
+          gl_FragColor = v_color * texture2D(u_texture, v_texCoords);
+        }
+        """);
+
         Events.on(WorldLoadEvent.class, event -> clearTiles());
     }
 
-    /**Queues up a cache change for a tile. Only runs in render loop. */
+    /** Queues up a cache change for a tile. Only runs in render loop. */
     public void recacheTile(Tile tile){
-        //currently a no-op
-        //recacheSet.add(Point2.pack(tile.x / chunksize, tile.y / chunksize));
+        //recaching all layers may not be necessary
+        recacheSet.add(Point2.pack(tile.x / chunksize, tile.y / chunksize));
     }
 
     public void drawFloor(){
@@ -43,11 +108,13 @@ public class FloorRenderer implements Disposable{
 
         Camera camera = Core.camera;
 
-        int crangex = (int)(camera.width / (chunksize * tilesize)) + 1;
-        int crangey = (int)(camera.height / (chunksize * tilesize)) + 1;
+        float pad = tilesize/2f;
 
-        int camx = (int)(camera.position.x / (chunksize * tilesize));
-        int camy = (int)(camera.position.y / (chunksize * tilesize));
+        int
+            minx = (int)((camera.position.x - camera.width/2f - pad) / chunkunits),
+            miny = (int)((camera.position.y - camera.height/2f - pad) / chunkunits),
+            maxx = Mathf.ceil((camera.position.x + camera.width/2f + pad) / chunkunits),
+            maxy = Mathf.ceil((camera.position.y + camera.height/2f + pad) / chunkunits);
 
         int layers = CacheLayer.all.length;
 
@@ -55,19 +122,20 @@ public class FloorRenderer implements Disposable{
         drawnLayerSet.clear();
 
         //preliminary layer check
-        for(int x = -crangex; x <= crangex; x++){
-            for(int y = -crangey; y <= crangey; y++){
-                int worldx = camx + x;
-                int worldy = camy + y;
+        for(int x = minx; x <= maxx; x++){
+            for(int y = miny; y <= maxy; y++){
 
-                if(!Structs.inBounds(worldx, worldy, cache))
-                    continue;
+                if(!Structs.inBounds(x, y, cache)) continue;
 
-                int[] chunk = cache[worldx][worldy];
+                if(cache[x][y].length == 0){
+                    cacheChunk(x, y);
+                }
+
+                Mesh[] chunk = cache[x][y];
 
                 //loop through all layers, and add layer index if it exists
                 for(int i = 0; i < layers; i++){
-                    if(chunk[i] != -1 && i != CacheLayer.walls.ordinal()){
+                    if(chunk[i] != null && i != CacheLayer.walls.id){
                         drawnLayerSet.add(i);
                     }
                 }
@@ -94,11 +162,34 @@ public class FloorRenderer implements Disposable{
     }
 
     public void beginc(){
-        cbatch.beginDraw();
+        shader.bind();
+        shader.setUniformMatrix4("u_projectionViewMatrix", Core.camera.mat);
+
+        //only ever use the base environment texture
+        texture.bind(0);
+
+        //enable all mesh attributes; TODO remove once the attribute cache bug is fixed
+        if(Core.gl30 == null){
+            for(VertexAttribute attribute : attributes){
+                int loc = shader.getAttributeLocation(attribute.alias);
+                if(loc != -1) Gl.enableVertexAttribArray(loc);
+            }
+        }
+
     }
 
     public void endc(){
-        cbatch.endDraw();
+        //disable all mesh attributes; TODO remove once the attribute cache bug is fixed
+        if(Core.gl30 == null){
+            for(VertexAttribute attribute : attributes){
+                int loc = shader.getAttributeLocation(attribute.alias);
+                if(loc != -1) Gl.disableVertexAttribArray(loc);
+            }
+        }
+
+        //unbind last buffer
+        Gl.bindBuffer(Gl.arrayBuffer, 0);
+        Gl.bindBuffer(Gl.elementArrayBuffer, 0);
     }
 
     public void checkChanges(){
@@ -119,8 +210,9 @@ public class FloorRenderer implements Disposable{
             return;
         }
 
-        cbatch.setProjection(Core.camera.mat);
-        cbatch.beginDraw();
+        Draw.flush();
+
+        beginc();
 
         Gl.enable(Gl.blend);
     }
@@ -130,7 +222,7 @@ public class FloorRenderer implements Disposable{
             return;
         }
 
-        cbatch.endDraw();
+        endc();
     }
 
     public void drawLayer(CacheLayer layer){
@@ -140,23 +232,47 @@ public class FloorRenderer implements Disposable{
 
         Camera camera = Core.camera;
 
-        int crangex = (int)(camera.width / (chunksize * tilesize)) + 1;
-        int crangey = (int)(camera.height / (chunksize * tilesize)) + 1;
+        int
+            minx = (int)((camera.position.x - camera.width/2f - pad) / chunkunits),
+            miny = (int)((camera.position.y - camera.height/2f - pad) / chunkunits),
+            maxx = Mathf.ceil((camera.position.x + camera.width/2f + pad) / chunkunits),
+            maxy = Mathf.ceil((camera.position.y + camera.height/2f + pad) / chunkunits);
 
         layer.begin();
 
-        for(int x = -crangex; x <= crangex; x++){
-            for(int y = -crangey; y <= crangey; y++){
-                int worldx = (int)(camera.position.x / (chunksize * tilesize)) + x;
-                int worldy = (int)(camera.position.y / (chunksize * tilesize)) + y;
+        for(int x = minx; x <= maxx; x++){
+            for(int y = miny; y <= maxy; y++){
 
-                if(!Structs.inBounds(worldx, worldy, cache)){
+                if(!Structs.inBounds(x, y, cache) || cache[x][y].length == 0){
                     continue;
                 }
 
-                int[] chunk = cache[worldx][worldy];
-                if(chunk[layer.ordinal()] == -1) continue;
-                cbatch.drawCache(chunk[layer.ordinal()]);
+                var mesh = cache[x][y][layer.id];
+
+                //this *must* be a vertexbufferobject on gles2, so cast it and render it directly
+                if(mesh != null && mesh.vertices instanceof VertexBufferObject vbo && mesh.indices instanceof IndexBufferObject ibo){
+
+                    //bindi the buffer and update its contents, but do not unnecessarily enable all the attributes again
+                    vbo.bind();
+                    //set up vertex attribute pointers for this specific VBO
+                    int offset = 0;
+                    for(VertexAttribute attribute : attributes){
+                        int location = shader.getAttributeLocation(attribute.alias);
+                        int aoffset = offset;
+                        offset += attribute.size;
+                        if(location < 0) continue;
+
+                        Gl.vertexAttribPointer(location, attribute.components, attribute.type, attribute.normalized, vertexSize * 4, aoffset);
+                    }
+
+                    ibo.bind();
+
+                    mesh.vertices.render(mesh.indices, Gl.triangles, 0, mesh.getNumIndices());
+                }else if(mesh != null){
+                    //TODO this should be the default branch!
+                    mesh.bind(shader);
+                    mesh.render(shader, Gl.triangles);
+                }
             }
         }
 
@@ -165,35 +281,45 @@ public class FloorRenderer implements Disposable{
 
     private void cacheChunk(int cx, int cy){
         used.clear();
-        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++){
+        for(int tilex = Math.max(cx * chunksize - 1, 0); tilex < (cx + 1) * chunksize + 1 && tilex < world.width(); tilex++){
+            for(int tiley = Math.max(cy * chunksize - 1, 0); tiley < (cy + 1) * chunksize + 1 && tiley < world.height(); tiley++){
                 Tile tile = world.rawTile(tilex, tiley);
+                boolean wall = tile.block().cacheLayer != CacheLayer.normal;
 
-                if(tile.block().cacheLayer != CacheLayer.normal){
+                if(wall){
                     used.add(tile.block().cacheLayer);
-                }else{
+                }
+
+                if(!wall || world.isAccessible(tilex, tiley)){
                     used.add(tile.floor().cacheLayer);
                 }
             }
         }
 
+        if(cache[cx][cy].length == 0){
+            cache[cx][cy] = new Mesh[CacheLayer.all.length];
+        }
+
+        var meshes = cache[cx][cy];
+
+        for(CacheLayer layer : CacheLayer.all){
+            if(meshes[layer.id] != null){
+                meshes[layer.id].dispose();
+            }
+            meshes[layer.id] = null;
+        }
+
         for(CacheLayer layer : used){
-            cacheChunkLayer(cx, cy, chunk, layer);
+            meshes[layer.id] = cacheChunkLayer(cx, cy, layer);
         }
     }
 
-    private void cacheChunkLayer(int cx, int cy, int[] chunk, CacheLayer layer){
-        Batch current = Core.batch;
-        Core.batch = cbatch;
+    private Mesh cacheChunkLayer(int cx, int cy, CacheLayer layer){
+        vidx = 0;
 
-        //begin a new cache
-        if(chunk[layer.ordinal()] == -1){
-            cbatch.beginCache();
-        }else{
-            cbatch.beginCache(chunk[layer.ordinal()]);
-        }
+        Batch current = Core.batch;
+        Core.batch = batch;
 
         for(int tilex = cx * chunksize; tilex < (cx + 1) * chunksize; tilex++){
             for(int tiley = cy * chunksize; tiley < (cy + 1) * chunksize; tiley++){
@@ -217,36 +343,171 @@ public class FloorRenderer implements Disposable{
         }
 
         Core.batch = current;
-        chunk[layer.ordinal()] = cbatch.endCache();
+
+        int floats = vidx;
+        //every 4 vertices need 6 indices
+        int vertCount = floats / vertexSize, indCount = vertCount * 6/4;
+
+        Mesh mesh = new Mesh(true, vertCount, indCount, attributes);
+        mesh.setVertices(vertices, 0, vidx);
+        mesh.setAutoBind(false);
+        mesh.setIndices(indices, 0, indCount);
+
+        return mesh;
     }
 
     public void clearTiles(){
-        if(cbatch != null) cbatch.dispose();
-
-        recacheSet.clear();
-        int chunksx = Mathf.ceil((float)(world.width()) / chunksize),
-        chunksy = Mathf.ceil((float)(world.height()) / chunksize);
-        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++){
-                Arrays.fill(cache[x][y], -1);
-
-                cacheChunk(x, y);
+        //dispose all old meshes
+        if(cache != null){
+            for(var x : cache){
+                for(var y : x){
+                    for(var mesh : y){
+                        if(mesh != null){
+                            mesh.dispose();
+                        }
+                    }
+                }
             }
         }
 
-        Log.debug("Time to cache: @", Time.elapsed());
+        recacheSet.clear();
+        int chunksx = Mathf.ceil((float)(world.width()) / chunksize), chunksy = Mathf.ceil((float)(world.height()) / chunksize);
+        cache = new Mesh[chunksx][chunksy][dynamic ? 0 : CacheLayer.all.length];
+
+        texture = Core.atlas.find("grass1").texture;
+        error = Core.atlas.find("env-error");
+
+        //pre-cache chunks
+        if(!dynamic){
+            Time.mark();
+
+            for(int x = 0; x < chunksx; x++){
+                for(int y = 0; y < chunksy; y++){
+                    cacheChunk(x, y);
+                }
+            }
+
+            Log.debug("Generated world mesh: @ms", Time.elapsed());
+        }
     }
 
-    @Override
-    public void dispose(){
-        if(cbatch != null){
-            cbatch.dispose();
-            cbatch = null;
+    class FloorRenderBatch extends Batch{
+
+        @Override
+        protected void draw(TextureRegion region, float x, float y, float originX, float originY, float width, float height, float rotation){
+
+            //substitute invalid regions with error
+            if(region.texture != texture && region != error){
+                draw(error, x, y, originX, originY, width, height, rotation);
+                return;
+            }
+
+            float[] verts = vertices;
+            int idx = vidx;
+            vidx += spriteSize;
+
+            if(!Mathf.zero(rotation)){
+                //bottom left and top right corner points relative to origin
+                float worldOriginX = x + originX;
+                float worldOriginY = y + originY;
+                float fx = -originX;
+                float fy = -originY;
+                float fx2 = width - originX;
+                float fy2 = height - originY;
+
+                // rotate
+                float cos = Mathf.cosDeg(rotation);
+                float sin = Mathf.sinDeg(rotation);
+
+                float x1 = cos * fx - sin * fy + worldOriginX;
+                float y1 = sin * fx + cos * fy + worldOriginY;
+                float x2 = cos * fx - sin * fy2 + worldOriginX;
+                float y2 = sin * fx + cos * fy2 + worldOriginY;
+                float x3 = cos * fx2 - sin * fy2 + worldOriginX;
+                float y3 = sin * fx2 + cos * fy2 + worldOriginY;
+                float x4 = x1 + (x3 - x2);
+                float y4 = y3 - (y2 - y1);
+
+                float u = region.u;
+                float v = region.v2;
+                float u2 = region.u2;
+                float v2 = region.v;
+
+                float color = this.colorPacked;
+
+                verts[idx] = x1;
+                verts[idx + 1] = y1;
+                verts[idx + 2] = color;
+                verts[idx + 3] = u;
+                verts[idx + 4] = v;
+
+                verts[idx + 5] = x2;
+                verts[idx + 6] = y2;
+                verts[idx + 7] = color;
+                verts[idx + 8] = u;
+                verts[idx + 9] = v2;
+
+                verts[idx + 10] = x3;
+                verts[idx + 11] = y3;
+                verts[idx + 12] = color;
+                verts[idx + 13] = u2;
+                verts[idx + 14] = v2;
+
+                verts[idx + 15] = x4;
+                verts[idx + 16] = y4;
+                verts[idx + 17] = color;
+                verts[idx + 18] = u2;
+                verts[idx + 19] = v;
+            }else{
+                float fx2 = x + width;
+                float fy2 = y + height;
+                float u = region.u;
+                float v = region.v2;
+                float u2 = region.u2;
+                float v2 = region.v;
+
+                float color = this.colorPacked;
+
+                verts[idx] = x;
+                verts[idx + 1] = y;
+                verts[idx + 2] = color;
+                verts[idx + 3] = u;
+                verts[idx + 4] = v;
+
+                verts[idx + 5] = x;
+                verts[idx + 6] = fy2;
+                verts[idx + 7] = color;
+                verts[idx + 8] = u;
+                verts[idx + 9] = v2;
+
+                verts[idx + 10] = fx2;
+                verts[idx + 11] = fy2;
+                verts[idx + 12] = color;
+                verts[idx + 13] = u2;
+                verts[idx + 14] = v2;
+
+                verts[idx + 15] = fx2;
+                verts[idx + 16] = y;
+                verts[idx + 17] = color;
+                verts[idx + 18] = u2;
+                verts[idx + 19] = v;
+            }
+
+        }
+
+        @Override
+        public void flush(){
+
+        }
+
+        @Override
+        public void setShader(Shader shader, boolean apply){
+            throw new IllegalArgumentException("cache shader unsupported");
+        }
+
+        @Override
+        protected void draw(Texture texture, float[] spriteVertices, int offset, int count){
+            throw new IllegalArgumentException("cache vertices unsupported");
         }
     }
 }
diff --git a/core/src/mindustry/graphics/FogRenderer.java b/core/src/mindustry/graphics/FogRenderer.java
new file mode 100644
index 0000000000..60807ed8cf
--- /dev/null
+++ b/core/src/mindustry/graphics/FogRenderer.java
@@ -0,0 +1,165 @@
+package mindustry.graphics;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.Texture.*;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public final class FogRenderer{
+    private FrameBuffer staticFog = new FrameBuffer(), dynamicFog = new FrameBuffer();
+    private LongSeq events = new LongSeq();
+    private Rect rect = new Rect();
+    private @Nullable Team lastTeam;
+
+    public FogRenderer(){
+        Events.on(WorldLoadEvent.class, event -> {
+            lastTeam = null;
+            events.clear();
+        });
+    }
+
+    public void handleEvent(long event){
+        events.add(event);
+    }
+
+    public Texture getStaticTexture(){
+        return staticFog.getTexture();
+    }
+
+    public Texture getDynamicTexture(){
+        return dynamicFog.getTexture();
+    }
+
+    public void drawFog(){
+        //there is no fog.
+        if(fogControl.getDiscovered(player.team()) == null) return;
+
+        //resize if world size changes
+        boolean clearStatic = staticFog.resizeCheck(world.width(), world.height());
+
+        dynamicFog.resize(world.width(), world.height());
+
+        if(state.rules.staticFog && player.team() != lastTeam){
+            copyFromCpu();
+            lastTeam = player.team();
+            clearStatic = false;
+        }
+
+        //draw dynamic fog every frame
+        {
+            Draw.proj(0, 0, staticFog.getWidth() * tilesize, staticFog.getHeight() * tilesize);
+            dynamicFog.begin(Color.black);
+            ScissorStack.push(rect.set(1, 1, staticFog.getWidth() - 2, staticFog.getHeight() - 2));
+
+            Team team = player.team();
+
+            for(var build : indexer.getFlagged(team, BlockFlag.hasFogRadius)){
+                poly(build.x, build.y, build.fogRadius() * tilesize);
+            }
+
+            for(var unit : team.data().units){
+                poly(unit.x, unit.y, unit.type.fogRadius * tilesize);
+            }
+
+            dynamicFog.end();
+            ScissorStack.pop();
+            Draw.proj(Core.camera);
+        }
+
+        //grab static events
+        if(state.rules.staticFog && (clearStatic || events.size > 0)){
+            //set projection to whole map
+            Draw.proj(0, 0, staticFog.getWidth(), staticFog.getHeight());
+
+            //if the buffer resized, it contains garbage now, clearStatic it.
+            if(clearStatic){
+                staticFog.begin(Color.black);
+            }else{
+                staticFog.begin();
+            }
+
+            ScissorStack.push(rect.set(1, 1, staticFog.getWidth() - 2, staticFog.getHeight() - 2));
+
+            Draw.color(Color.white);
+
+            //process new static fog events
+            for(int i = 0; i < events.size; i++){
+                renderEvent(events.items[i]);
+            }
+            events.clear();
+
+            staticFog.end();
+            ScissorStack.pop();
+            Draw.proj(Core.camera);
+        }
+
+        if(state.rules.staticFog){
+            staticFog.getTexture().setFilter(TextureFilter.linear);
+        }
+        dynamicFog.getTexture().setFilter(TextureFilter.linear);
+
+        Draw.shader(Shaders.fog);
+        Draw.color(state.rules.dynamicColor, 0.5f);
+        Draw.fbo(dynamicFog.getTexture(), world.width(), world.height(), tilesize);
+        //TODO ai check?
+        if(state.rules.staticFog){
+            //TODO why does this require a half-tile offset while dynamic does not
+            Draw.color(state.rules.staticColor, 1f);
+            Draw.fbo(staticFog.getTexture(), world.width(), world.height(), tilesize, tilesize/2f);
+        }
+        Draw.shader();
+    }
+
+    void poly(float x, float y, float rad){
+        Fill.poly(x, y, 20, rad);
+    }
+
+    void renderEvent(long e){
+        Tile tile = world.tile(FogEvent.x(e), FogEvent.y(e));
+        float o = 0f;
+        //visual offset for uneven blocks; this is not reflected on the CPU, but it doesn't really matter
+        if(tile != null && tile.block().size % 2 == 0 && tile.isCenter()){
+            o = 0.5f;
+        }
+        Fill.poly(FogEvent.x(e) + 0.5f + o, FogEvent.y(e) + 0.5f + o, 20, FogEvent.radius(e) + 0.3f);
+    }
+
+    public void copyFromCpu(){
+        staticFog.resize(world.width(), world.height());
+        staticFog.begin(Color.black);
+        Draw.proj(0, 0, staticFog.getWidth(), staticFog.getHeight());
+        Draw.color();
+        int ww = world.width(), wh = world.height();
+
+        var data = fogControl.getDiscovered(player.team());
+        int len = world.width() * world.height();
+        if(data != null){
+            for(int i = 0; i < len; i++){
+                if(data.get(i)){
+                    //TODO slow, could do scanlines instead at the very least.
+                    int x = i % ww, y = i / ww;
+
+                    //manually clip with 1 pixel of padding so the borders are never fully revealed
+                    if(x > 0 && y > 0 && x < ww - 1 && y < wh - 1){
+                        Fill.rect(x + 0.5f, y + 0.5f, 1f, 1f);
+                    }
+                }
+            }
+        }
+
+        staticFog.end();
+        Draw.proj(Core.camera);
+    }
+
+}
diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
index 46b9093a14..954bc13153 100644
--- a/core/src/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -1,7 +1,6 @@
 package mindustry.graphics;
 
 import arc.graphics.*;
-import arc.graphics.VertexAttributes.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
 import arc.math.*;
@@ -10,32 +9,34 @@ import arc.util.*;
 public class IndexedRenderer implements Disposable{
     private static final int vsize = 5;
 
-    private final Shader program = new Shader(
-    "attribute vec4 a_position;\n" +
-    "attribute vec4 a_color;\n" +
-    "attribute vec2 a_texCoord0;\n" +
-    "uniform mat4 u_projTrans;\n" +
-    "varying vec4 v_color;\n" +
-    "varying vec2 v_texCoords;\n" +
+    private final static Shader program = new Shader(
+    """
+    attribute vec4 a_position;
+    attribute vec4 a_color;
+    attribute vec2 a_texCoord0;
+    uniform mat4 u_projTrans;
+    varying vec4 v_color;
+    varying vec2 v_texCoords;
+    void main(){
+       v_color = a_color;
+       v_color.a = v_color.a * (255.0/254.0);
+       v_texCoords = a_texCoord0;
+       gl_Position = u_projTrans * a_position;
+    }
+    """,
 
-    "void main(){\n" +
-    "   v_color = a_color;\n" +
-    "   v_color.a = v_color.a * (255.0/254.0);\n" +
-    "   v_texCoords = a_texCoord0;\n" +
-    "   gl_Position = u_projTrans * a_position;\n" +
-    "}",
-
-    "varying lowp vec4 v_color;\n" +
-    "varying vec2 v_texCoords;\n" +
-    "uniform sampler2D u_texture;\n" +
-
-    "void main(){\n" +
-    "  gl_FragColor = v_color * texture2D(u_texture, v_texCoords);\n" +
-    "}"
+    """
+    varying lowp vec4 v_color;
+    varying vec2 v_texCoords;
+    uniform sampler2D u_texture;
+    void main(){
+      gl_FragColor = v_color * texture2D(u_texture, v_texCoords);
+    }
+    """
     );
+    private static final float[] tmpVerts = new float[vsize * 6];
+
     private Mesh mesh;
-    private float[] tmpVerts = new float[vsize * 6];
-    private float[] vertices;
 
     private Mat projMatrix = new Mat();
     private Mat transMatrix = new Mat();
@@ -55,9 +56,8 @@ public class IndexedRenderer implements Disposable{
         texture.bind();
 
         program.setUniformMatrix4("u_projTrans", combined);
-        program.setUniformi("u_texture", 0);
 
-        mesh.render(program, Gl.triangles, 0, vertices.length / vsize);
+        mesh.render(program, Gl.triangles, 0, mesh.getMaxVertices());
     }
 
     public void setColor(Color color){
@@ -200,11 +200,12 @@ public class IndexedRenderer implements Disposable{
         if(mesh != null) mesh.dispose();
 
         mesh = new Mesh(true, 6 * sprites, 0,
-        new VertexAttribute(Usage.position, 2, "a_position"),
-        new VertexAttribute(Usage.colorPacked, 4, "a_color"),
-        new VertexAttribute(Usage.textureCoordinates, 2, "a_texCoord0"));
-        vertices = new float[6 * sprites * vsize];
-        mesh.setVertices(vertices);
+        VertexAttribute.position,
+        VertexAttribute.color,
+        VertexAttribute.texCoords);
+
+        //TODO why is this the only way to get it working properly? it should not need an array
+        mesh.setVertices(new float[6 * sprites * vsize]);
     }
 
     private void updateMatrix(){
@@ -214,6 +215,5 @@ public class IndexedRenderer implements Disposable{
     @Override
     public void dispose(){
         mesh.dispose();
-        program.dispose();
     }
 }
diff --git a/core/src/mindustry/graphics/InverseKinematics.java b/core/src/mindustry/graphics/InverseKinematics.java
index 133eae78ff..016c3a47ec 100644
--- a/core/src/mindustry/graphics/InverseKinematics.java
+++ b/core/src/mindustry/graphics/InverseKinematics.java
@@ -12,6 +12,19 @@ public class InverseKinematics{
         return solve(lengthA, lengthB, end, at1, result);
     }
 
+    /**
+     inputs:
+
+     @param lengthA first line segment length
+     @param lengthB second line segment length
+     @param end length of the endpoint you want to reach
+     @param attractor direction you want the result to be closer to (since there are usually 2 solutions)
+
+     output:
+
+     @param result a point in-between (0, 0) and (end) such that (0, 0).dst(result) == lengthA and result.dst(end) == lengthB - or in basic terms, the position of a joint between (0, 0) and end where the two lengths of segments are lengthA and lengthB
+     @return whether IK succeeded (this can fail if end is too far, for example)
+     */
     public static boolean solve(float lengthA, float lengthB, Vec2 end, Vec2 attractor, Vec2 result){
         Vec2 axis = mat2[0].set(end).nor();
         mat2[1].set(attractor).sub(temp2.set(axis).scl(attractor.dot(axis))).nor();
diff --git a/core/src/mindustry/graphics/Layer.java b/core/src/mindustry/graphics/Layer.java
index 5ddea70282..7d8d9f343a 100644
--- a/core/src/mindustry/graphics/Layer.java
+++ b/core/src/mindustry/graphics/Layer.java
@@ -26,6 +26,18 @@ public class Layer{
     //base block layer - most blocks go here
     block = 30,
 
+    //layer for cracks over blocks, batched to prevent excessive texture swaps
+    blockCracks = 30f + 0.1f,
+
+    //some blocks need to draw stuff after cracks
+    blockAfterCracks = 30f + 0.2f,
+
+    //informal layer used for additive blending overlay, grouped together to reduce draw calls
+    blockAdditive = 31,
+
+    //props such as boulders
+    blockProp = 32,
+
     //things drawn over blocks (intermediate layer)
     blockOver = 35,
 
@@ -35,6 +47,9 @@ public class Layer{
     //turrets
     turret = 50,
 
+    //special layer for turret additive blending heat stuff
+    turretHeat = 50.1f,
+
     //ground units
     groundUnit = 60,
 
@@ -62,7 +77,7 @@ public class Layer{
     //flying units
     flyingUnit = 115,
 
-    //overlaied UI, like block config guides
+    //overlaid UI, like block config guides
     overlayUI = 120,
 
     //build beam effects
@@ -71,7 +86,7 @@ public class Layer{
     //shield effects
     shields = 125,
 
-    //weather effects, e.g. rain and snow TODO draw before overlay UI?
+    //weather effects, e.g. rain and snow
     weather = 130,
 
     //light rendering *shaders used*
@@ -80,6 +95,9 @@ public class Layer{
     //names of players in the game
     playerName = 150,
 
+    //fog of war effect, if applicable
+    fogOfWar = 155,
+
     //space effects, currently only the land and launch effects
     space = 160,
 
diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java
index ebf1cf9187..7c30b94796 100644
--- a/core/src/mindustry/graphics/LightRenderer.java
+++ b/core/src/mindustry/graphics/LightRenderer.java
@@ -19,6 +19,9 @@ public class LightRenderer{
     private float[] vertices = new float[24];
     private FrameBuffer buffer = new FrameBuffer();
     private Seq<Runnable> lights = new Seq<>();
+    private Seq<CircleLight> circles = new Seq<>(CircleLight.class);
+    private int circleIndex = 0;
+    private TextureRegion circleRegion;
 
     public void add(Runnable run){
         if(!enabled()) return;
@@ -27,24 +30,34 @@ public class LightRenderer{
     }
 
     public void add(float x, float y, float radius, Color color, float opacity){
-        if(!enabled()) return;
+        if(!enabled() || radius <= 0f) return;
 
-        float res = color.toFloatBits();
-        add(() -> {
-            Draw.color(res);
-            Draw.alpha(opacity);
-            Draw.rect("circle-shadow", x, y, radius * 2, radius * 2);
-        });
+        float res = Color.toFloatBits(color.r, color.g, color.b, opacity);
+
+        if(circles.size <= circleIndex) circles.add(new CircleLight());
+
+        //pool circles to prevent runaway GC usage from lambda capturing
+        var light = circles.items[circleIndex];
+        light.set(x, y, res, radius);
+
+        circleIndex ++;
+    }
+    
+    public void add(float x, float y, TextureRegion region, Color color, float opacity){
+        add(x, y, region, 0f, color, opacity);
     }
 
-    public void add(float x, float y, TextureRegion region, Color color, float opacity){
+    public void add(float x, float y, TextureRegion region, float rotation, Color color, float opacity){
         if(!enabled()) return;
 
         float res = color.toFloatBits();
+        float xscl = Draw.xscl, yscl = Draw.yscl;
         add(() -> {
             Draw.color(res);
             Draw.alpha(opacity);
-            Draw.rect(region, x, y);
+            Draw.scl(xscl, yscl);
+            Draw.rect(region, x, y, rotation);
+            Draw.scl();
         });
     }
 
@@ -57,13 +70,12 @@ public class LightRenderer{
             float rot = Mathf.angleExact(x2 - x, y2 - y);
             TextureRegion ledge = Core.atlas.find("circle-end"), lmid = Core.atlas.find("circle-mid");
 
-            float color = Draw.getColor().toFloatBits();
+            float color = Draw.getColorPacked();
             float u = lmid.u;
             float v = lmid.v2;
             float u2 = lmid.u2;
             float v2 = lmid.v;
 
-
             Vec2 v1 = Tmp.v1.trnsExact(rot + 90f, stroke);
             float lx1 = x - v1.x, ly1 = y - v1.y,
             lx2 = x + v1.x, ly2 = y + v1.y,
@@ -170,25 +182,37 @@ public class LightRenderer{
     }
 
     public boolean enabled(){
-        return state.rules.lighting && state.rules.ambientLight.a > 0.00001f;
+        return state.rules.lighting && state.rules.ambientLight.a > 0.0001f && renderer.drawLight;
     }
 
     public void draw(){
         if(!Vars.enableLight){
             lights.clear();
+            circleIndex = 0;
             return;
         }
 
+        if(circleRegion == null) circleRegion = Core.atlas.find("circle-shadow");
+
         buffer.resize(Core.graphics.getWidth()/scaling, Core.graphics.getHeight()/scaling);
 
         Draw.color();
         buffer.begin(Color.clear);
+        Draw.sort(false);
         Gl.blendEquationSeparate(Gl.funcAdd, Gl.max);
+        //apparently necessary
+        Blending.normal.apply();
 
         for(Runnable run : lights){
             run.run();
         }
+        for(int i = 0; i < circleIndex; i++){
+            var cir = circles.items[i];
+            Draw.color(cir.color);
+            Draw.rect(circleRegion, cir.x, cir.y, cir.radius * 2, cir.radius * 2);
+        }
         Draw.reset();
+        Draw.sort(true);
         buffer.end();
         Gl.blendEquationSeparate(Gl.funcAdd, Gl.funcAdd);
 
@@ -197,5 +221,17 @@ public class LightRenderer{
         buffer.blit(Shaders.light);
 
         lights.clear();
+        circleIndex = 0;
+    }
+
+    static class CircleLight{
+        float x, y, color, radius;
+
+        public void set(float x, float y, float color, float radius){
+            this.x = x;
+            this.y = y;
+            this.color = color;
+            this.radius = radius;
+        }
     }
 }
diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java
index ba3778a026..c0baa1ae7a 100644
--- a/core/src/mindustry/graphics/LoadRenderer.java
+++ b/core/src/mindustry/graphics/LoadRenderer.java
@@ -37,6 +37,8 @@ public class LoadRenderer implements Disposable{
     private int lastLength = -1;
     private FxProcessor fx;
     private WindowedMean renderTimes = new WindowedMean(20);
+    private BloomFilter bloom;
+    private boolean renderStencil = true;
     private long lastFrameTime;
 
     {
@@ -44,17 +46,22 @@ public class LoadRenderer implements Disposable{
         try{
             fx = new FxProcessor(Format.rgba8888, 2, 2, false, true);
         }catch(Exception e){
-            fx = new FxProcessor(Format.rgb565, 2, 2, false, true);
+            try{
+                fx = new FxProcessor(Format.rgb565, 2, 2, false, true);
+            }catch(Exception awful){
+                renderStencil = false;
+                fx = new FxProcessor(Format.rgba8888, 2, 2, false, false);
+            }
         }
 
         //vignetting is probably too much
         //fx.addEffect(new VignettingFilter(false));
-        fx.addEffect(new BloomFilter());
+        fx.addEffect(bloom = new BloomFilter());
 
         bars = new Bar[]{
             new Bar("s_proc#", OS.cores / 16f, OS.cores < 4),
             new Bar("c_aprog", () -> assets != null, () -> assets.getProgress(), () -> false),
-            new Bar("g_vtype", graphics.getGLVersion().type == Type.GLES ? 0.5f : 1f, graphics.getGLVersion().type == Type.GLES),
+            new Bar("g_vtype", graphics.getGLVersion().type == GlType.GLES ? 0.5f : 1f, graphics.getGLVersion().type == GlType.GLES),
             new Bar("s_mem#", () -> true, () -> Core.app.getJavaHeap() / 1024f / 1024f / 200f, () -> Core.app.getJavaHeap() > 1024 * 1024 * 110),
             new Bar("v_ver#", () -> Version.build != 0, () -> Version.build == -1 ? 0.3f : (Version.build - 103f) / 10f, () -> !Version.modifier.equals("release")),
             new Bar("s_osv", OS.isWindows ? 0.35f : OS.isLinux ? 0.9f : OS.isMac ? 0.5f : 0.2f, OS.isMac),
@@ -69,6 +76,7 @@ public class LoadRenderer implements Disposable{
     public void dispose(){
         mesh.dispose();
         fx.dispose();
+        bloom.dispose();
     }
 
     public void draw(){
@@ -177,7 +185,7 @@ public class LoadRenderer implements Disposable{
         Lines.poly(w/2, h/2, 4, rad);
         Lines.poly(w/2, h/2, 4, rad2);
 
-        if(assets.isLoaded("tech")){
+        if(assets.isLoaded("tech") && renderStencil){
             Font font = assets.get("tech");
             font.getData().markupEnabled = true;
 
@@ -448,7 +456,7 @@ public class LoadRenderer implements Disposable{
                 float skew = bsize/2f;
 
                 float v = w / 2 + cx * dir - width / 2f;
-                Fill.rects(v + dir*skew, h/2f - bsize/2f + bsize/2f, width, bsize/2f, -dir*skew);
+                Fill.rects(v + dir*skew, h/2f, width, bsize/2f, -dir*skew);
                 Fill.rects(v, h/2f - bsize/2f, width, bsize/2f, dir*skew);
             }
 
@@ -468,6 +476,7 @@ public class LoadRenderer implements Disposable{
             name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
 
             Font font = assets.get("tech");
+            font.getData().markupEnabled = true;
             font.setColor(Pal.accent);
             Draw.color(Color.black);
             font.draw(red + "[[[[ " + key + " ]]\n" + orange + "<" + Version.modifier + "  " + (Version.build == 0 ? "[init]" : Version.buildString()) + ">", w/2f, h/2f + 110*s, Align.center);
diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java
index efa42cfc89..949d03f914 100644
--- a/core/src/mindustry/graphics/MenuRenderer.java
+++ b/core/src/mindustry/graphics/MenuRenderer.java
@@ -12,9 +12,7 @@ import arc.util.*;
 import arc.util.noise.*;
 import mindustry.content.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.world.*;
-import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
@@ -30,41 +28,44 @@ public class MenuRenderer implements Disposable{
     private float time = 0f;
     private float flyerRot = 45f;
     private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15);
-    private UnitType flyerType = Structs.select(UnitTypes.flare, UnitTypes.flare, UnitTypes.horizon, UnitTypes.mono, UnitTypes.poly, UnitTypes.mega, UnitTypes.zenith);
+    //no longer random or "dynamic", mod units in the menu look jarring, and it's not worth the configuration effort
+    private UnitType flyerType = Seq.with(UnitTypes.flare, UnitTypes.horizon, UnitTypes.zenith, UnitTypes.mono, UnitTypes.poly, UnitTypes.mega, UnitTypes.alpha, UnitTypes.beta, UnitTypes.gamma).random();
 
     public MenuRenderer(){
         Time.mark();
         generate();
         cache();
-        Log.info("Time to generate menu: @", Time.elapsed());
+        Log.debug("Time to generate menu: @", Time.elapsed());
     }
 
     private void generate(){
-        world.beginMapLoad();
+        //suppress tile change events.
+        world.setGenerating(true);
+
         Tiles tiles = world.resize(width, height);
-        Seq<Block> ores = content.blocks().select(b -> b instanceof OreBlock);
+        //only uses base game ores now, mod ones usually contrast too much with the floor
+        Seq<Block> ores = Seq.with(Blocks.oreCopper, Blocks.oreLead, Blocks.oreScrap, Blocks.oreCoal, Blocks.oreTitanium, Blocks.oreThorium);
         shadows = new FrameBuffer(width, height);
         int offset = Mathf.random(100000);
-        Simplex s1 = new Simplex(offset);
-        Simplex s2 = new Simplex(offset + 1);
-        Simplex s3 = new Simplex(offset + 2);
-        RidgedPerlin rid = new RidgedPerlin(1 + offset, 1);
-        Block[] selected = Structs.select(
-            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}
+        int s1 = offset, s2 = offset + 1, s3 = offset + 2;
+        Block[] selected = Structs.random(
+        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},
+        new Block[]{Blocks.dirt, Blocks.dirtWall},
+        new Block[]{Blocks.dacite, Blocks.daciteWall}
         );
-        Block[] selected2 = Structs.select(
-            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[] selected2 = Structs.random(
+        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();
@@ -87,27 +88,27 @@ public class MenuRenderer implements Disposable{
                 Block ore = Blocks.air;
                 Block wall = Blocks.air;
 
-                if(s1.octaveNoise2D(3, 0.5, 1/20.0, x, y) > 0.5){
+                if(Simplex.noise2d(s1, 3, 0.5, 1/20.0, x, y) > 0.5){
                     wall = walld;
                 }
 
-                if(s3.octaveNoise2D(3, 0.5, 1/20.0, x, y) > 0.5){
+                if(Simplex.noise2d(s3, 3, 0.5, 1/20.0, x, y) > 0.5){
                     floor = floord2;
                     if(wall != Blocks.air){
                         wall = walld2;
                     }
                 }
 
-                if(s2.octaveNoise2D(3, 0.3, 1/30.0, x, y) > tr1){
+                if(Simplex.noise2d(s2, 3, 0.3, 1/30.0, x, y) > tr1){
                     ore = ore1;
                 }
 
-                if(s2.octaveNoise2D(2, 0.2, 1/15.0, x, y+99999) > tr2){
+                if(Simplex.noise2d(s2, 2, 0.2, 1/15.0, x, y+99999) > tr2){
                     ore = ore2;
                 }
 
                 if(doheat){
-                    double heat = s3.octaveNoise2D(4, 0.6, 1 / 50.0, x, y + 9999);
+                    double heat = Simplex.noise2d(s3, 4, 0.6, 1 / 50.0, x, y + 9999);
                     double base = 0.65;
 
                     if(heat > base){
@@ -128,7 +129,7 @@ public class MenuRenderer implements Disposable{
                 if(tech){
                     int mx = x % secSize, my = y % secSize;
                     int sclx = x / secSize, scly = y / secSize;
-                    if(s1.octaveNoise2D(2, 1f / 10f, 0.5f, sclx, scly) > 0.4f && (mx == 0 || my == 0 || mx == secSize - 1 || my == secSize - 1)){
+                    if(Simplex.noise2d(s1, 2, 1f / 10f, 0.5f, sclx, scly) > 0.4f && (mx == 0 || my == 0 || mx == secSize - 1 || my == secSize - 1)){
                         floor = Blocks.darkPanel3;
                         if(Mathf.dst(mx, my, secSize/2, secSize/2) > secSize/2f + 1){
                             floor = Blocks.darkPanel4;
@@ -142,7 +143,7 @@ public class MenuRenderer implements Disposable{
                 }
 
                 if(tendrils){
-                    if(rid.getValue(x, y, 1f / 17f) > 0f){
+                    if(Ridged.noise2d(1 + offset, x, y, 1f / 17f) > 0f){
                         floor = Mathf.chance(0.2) ? Blocks.sporeMoss : Blocks.moss;
 
                         if(wall != Blocks.air){
@@ -161,7 +162,8 @@ public class MenuRenderer implements Disposable{
             }
         }
 
-        world.endMapLoad();
+        //don't fire a world load event, it just causes lag and confusion
+        world.setGenerating(false);
     }
 
     private void cache(){
@@ -239,14 +241,14 @@ public class MenuRenderer implements Disposable{
     private void drawFlyers(){
         Draw.color(0f, 0f, 0f, 0.4f);
 
-        TextureRegion icon = flyerType.icon(Cicon.full);
-
-        float size = Math.max(icon.width, icon.height) * Draw.scl * 1.6f;
+        TextureRegion icon = flyerType.fullIcon;
 
         flyers((x, y) -> {
             Draw.rect(icon, x - 12f, y - 13f, flyerRot - 90);
         });
 
+        float size = Math.max(icon.width, icon.height) * icon.scl() * 1.6f;
+
         flyers((x, y) -> {
             Draw.rect("circle-shadow", x, y, size, size);
         });
@@ -275,10 +277,12 @@ public class MenuRenderer implements Disposable{
         float offset = -100f;
 
         for(int i = 0; i < flyers; i++){
-            Tmp.v1.trns(flyerRot, time * (2f + flyerType.speed));
+            Tmp.v1.trns(flyerRot, time * (flyerType.speed));
 
-            cons.get((Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % (tw + Mathf.randomSeed(i + 5, 0, 500)),
-            (Mathf.randomSeedRange(i + 1, range) + Tmp.v1.y + Mathf.absin(time + Mathf.randomSeedRange(i + 3, 500), 10f, 3.4f) + offset) % th);
+            cons.get(
+            (Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % (tw + Mathf.randomSeed(i + 5, 0, 500)),
+            (Mathf.randomSeedRange(i + 1, range) + Tmp.v1.y + Mathf.absin(time + Mathf.randomSeedRange(i + 3, 500), 10f, 3.4f) + offset) % th
+            );
         }
     }
 
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index ad61d171a5..e5f42b2c9a 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -2,7 +2,7 @@ package mindustry.graphics;
 
 import arc.*;
 import arc.graphics.*;
-import arc.graphics.Pixmap.*;
+import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
@@ -10,6 +10,7 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.pooling.*;
+import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
@@ -19,8 +20,9 @@ import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
-public class MinimapRenderer implements Disposable{
-    private static final float baseSize = 16f;
+public class MinimapRenderer{
+    private static final float baseSize = 16f, updateInterval = 2f;
+
     private final Seq<Unit> units = new Seq<>();
     private Pixmap pixmap;
     private Texture texture;
@@ -28,18 +30,64 @@ public class MinimapRenderer implements Disposable{
     private Rect rect = new Rect();
     private float zoom = 4;
 
+    private float lastX, lastY, lastW, lastH, lastScl;
+    private boolean worldSpace;
+    private IntSet updates = new IntSet();
+    private float updateCounter = 0f;
+
     public MinimapRenderer(){
         Events.on(WorldLoadEvent.class, event -> {
             reset();
             updateAll();
         });
 
-        //make sure to call on the graphics thread
         Events.on(TileChangeEvent.class, event -> {
             if(!ui.editor.isShown()){
                 update(event.tile);
+
+                //update floor below block.
+                if(event.tile.block().solid && event.tile.y > 0 && event.tile.isCenter()){
+                    event.tile.getLinkedTiles(t -> {
+                        Tile tile = world.tile(t.x, t.y - 1);
+                        if(tile != null && tile.block() == Blocks.air){
+                            update(tile);
+                        }
+                    });
+                }
             }
         });
+
+        Events.on(TilePreChangeEvent.class, e -> {
+            //update floor below a *recently removed* block.
+            if(e.tile.block().solid && e.tile.y > 0){
+                Tile tile = world.tile(e.tile.x, e.tile.y - 1);
+                if(tile.block() == Blocks.air){
+                    Core.app.post(() -> update(tile));
+                }
+            }
+        });
+
+        Events.on(BuildTeamChangeEvent.class, event -> update(event.build.tile));
+    }
+
+    public void update(){
+        //updates are batched to occur every 2 frames
+        if((updateCounter += Time.delta) >= updateInterval){
+            updateCounter %= updateInterval;
+
+            updates.each(pos -> {
+                Tile tile = world.tile(pos);
+                if(tile == null) return;
+
+                int color = colorFor(tile);
+                pixmap.set(tile.x, pixmap.height - 1 - tile.y, color);
+
+                //yes, this calls glTexSubImage2D every time, with a 1x1 region
+                Pixmaps.drawPixel(texture, tile.x, pixmap.height - 1 - tile.y, color);
+            });
+
+            updates.clear();
+        }
     }
 
     public Pixmap getPixmap(){
@@ -64,22 +112,30 @@ public class MinimapRenderer implements Disposable{
     }
 
     public void reset(){
+        updates.clear();
         if(pixmap != null){
             pixmap.dispose();
             texture.dispose();
         }
         setZoom(4f);
-        pixmap = new Pixmap(world.width(), world.height(), Format.rgba8888);
+        pixmap = new Pixmap(world.width(), world.height());
         texture = new Texture(pixmap);
         region = new TextureRegion(texture);
     }
 
-    public void drawEntities(float x, float y, float w, float h, float scaling, boolean withLabels){
-        if(!withLabels){
+    public void drawEntities(float x, float y, float w, float h, float scaling, boolean fullView){
+        lastX = x;
+        lastY = y;
+        lastW = w;
+        lastH = h;
+        lastScl = scaling;
+        worldSpace = fullView;
+
+        if(!fullView){
             updateUnitArray();
         }else{
             units.clear();
-            Groups.unit.each(units::add);
+            Groups.unit.copy(units);
         }
 
         float sz = baseSize * zoom;
@@ -90,32 +146,159 @@ public class MinimapRenderer implements Disposable{
 
         rect.set((dx - sz) * tilesize, (dy - sz) * tilesize, sz * 2 * tilesize, sz * 2 * tilesize);
 
-        for(Unit unit : units){
-            float rx = !withLabels ? (unit.x - rect.x) / rect.width * w : unit.x / (world.width() * tilesize) * w;
-            float ry = !withLabels ? (unit.y - rect.y) / rect.width * h : unit.y / (world.height() * tilesize) * h;
+        Tmp.m2.set(Draw.trans());
 
-            Draw.mixcol(unit.team().color, 1f);
-            float scale = Scl.scl(1f) / 2f * scaling * 32f;
-            Draw.rect(unit.type.icon(Cicon.full), x + rx, y + ry, scale, scale, unit.rotation() - 90);
+        float scaleFactor;
+        var trans = Tmp.m1.idt();
+        trans.translate(lastX, lastY);
+        if(!worldSpace){
+            trans.scl(Tmp.v1.set(scaleFactor = lastW / rect.width, lastH / rect.height));
+            trans.translate(-rect.x, -rect.y);
+        }else{
+            trans.scl(Tmp.v1.set(scaleFactor = lastW / world.unitWidth(), lastH / world.unitHeight()));
+        }
+        trans.translate(tilesize / 2f, tilesize / 2f);
+        Draw.trans(trans);
+
+        scaleFactor = 1f / scaleFactor;
+
+        for(Unit unit : units){
+            if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue;
+
+            float scale = Scl.scl(1f) * tilesize * 3;
+            var region = unit.icon();
+
+            Draw.mixcol(unit.team.color, 1f);
+            Draw.rect(region, unit.x, unit.y, scale, scale * (float)region.height / region.width, unit.rotation() - 90);
             Draw.reset();
         }
 
-        if(withLabels && net.active()){
+        if(fullView && net.active()){
             for(Player player : Groups.player){
                 if(!player.dead()){
-                    float rx = player.x / (world.width() * tilesize) * w;
-                    float ry = player.y / (world.height() * tilesize) * h;
-
-                    drawLabel(x + rx, y + ry, player.name, player.team().color);
+                    drawLabel(player.x, player.y, player.name, player.color);
                 }
             }
         }
 
         Draw.reset();
+
+        if(state.rules.fog){
+            if(fullView){
+                float z = zoom;
+                //max zoom out fixes everything, somehow?
+                setZoom(99999f);
+                getRegion();
+                zoom = z;
+            }
+            Draw.shader(Shaders.fog);
+            Texture staticTex = renderer.fog.getStaticTexture(), dynamicTex = renderer.fog.getDynamicTexture();
+
+            //crisp pixels
+            dynamicTex.setFilter(TextureFilter.nearest);
+
+            Tmp.tr1.set(dynamicTex);
+            Tmp.tr1.set(0f, 1f, 1f, 0f);
+
+            float wf = world.width() * tilesize;
+            float hf = world.height() * tilesize;
+
+            Draw.color(state.rules.dynamicColor, 0.5f);
+            Draw.rect(Tmp.tr1, wf / 2, hf / 2, wf, hf);
+
+            if(state.rules.staticFog){
+                staticTex.setFilter(TextureFilter.nearest);
+
+                Tmp.tr1.texture = staticTex;
+                //must be black to fit with borders
+                Draw.color(0f, 0f, 0f, 1f);
+                Draw.rect(Tmp.tr1, wf / 2, hf / 2, wf, hf);
+            }
+
+            Draw.color();
+            Draw.shader();
+        }
+
+        //TODO might be useful in the standard minimap too
+        if(fullView){
+            drawSpawns();
+
+            if(!mobile){
+                //draw bounds for camera - not drawn on mobile because you can't shift it by tapping anyway
+                Rect r = Core.camera.bounds(Tmp.r1);
+                Lines.stroke(Scl.scl(3f) * scaleFactor);
+                Draw.color(Pal.accent);
+                Lines.rect(r.x, r.y, r.width, r.height);
+                Draw.reset();
+            }
+        }
+
+        LongSeq indicators = control.indicators.list();
+        float fin = ((Time.globalTime / 30f) % 1f);
+        float rad = fin * 5f + tilesize - 2f;
+        Lines.stroke(Scl.scl((1f - fin) * 4f + 0.5f));
+
+        for(int i = 0; i < indicators.size; i++){
+            long ind = indicators.items[i];
+            int
+                pos = Indicator.pos(ind),
+                ix = Point2.x(pos),
+                iy = Point2.y(pos);
+            float time = Indicator.time(ind), offset = 0f;
+
+            //fix multiblock offset - this is suboptimal
+            Building build = world.build(pos);
+            if(build != null){
+                offset = build.block.offset / tilesize;
+            }
+
+            Draw.color(Color.orange, Color.scarlet, Mathf.clamp(time / 70f));
+
+            Lines.square((ix + 0.5f + offset) * tilesize, (iy + 0.5f + offset) * tilesize, rad);
+        }
+
+        Draw.reset();
+
+        //TODO autoscale markers
+        state.rules.objectives.eachRunning(obj -> {
+            for(var marker : obj.markers){
+                if(marker.minimap){
+                    marker.draw(1);
+                }
+            }
+        });
+
+        for(var marker : state.markers){
+            if(marker.minimap){
+                marker.draw(1);
+            }
+        }
+
+        Draw.trans(Tmp.m2);
     }
 
-    public void drawEntities(float x, float y, float w, float h){
-        drawEntities(x, y, w, h, 1f, true);
+    public void drawSpawns(){
+        if(!state.rules.showSpawns || !state.hasSpawns() || !state.rules.waves) return;
+
+        TextureRegion icon = Icon.units.getRegion();
+
+        Lines.stroke(Scl.scl(3f));
+
+        Draw.color(state.rules.waveTeam.color, Tmp.c2.set(state.rules.waveTeam.color).value(1.2f), Mathf.absin(Time.time, 16f, 1f));
+
+        float rad = state.rules.dropZoneRadius;
+        float curve = Mathf.curve(Time.time % 240f, 120f, 240f);
+
+        for(Tile tile : spawner.getSpawns()){
+            float tx = tile.worldx();
+            float ty = tile.worldy();
+
+            Draw.rect(icon, tx, ty, icon.width, icon.height);
+            Lines.circle(tx, ty, rad);
+            if(curve > 0f) Lines.circle(tx, ty, rad * Interp.pow3Out.apply(curve));
+        }
+
+        Draw.reset();
     }
 
     public @Nullable TextureRegion getRegion(){
@@ -135,7 +318,7 @@ public class MinimapRenderer implements Disposable{
 
     public void updateAll(){
         for(Tile tile : world.tiles){
-            pixmap.draw(tile.x, pixmap.getHeight() - 1 - tile.y, colorFor(tile));
+            pixmap.set(tile.x, pixmap.height - 1 - tile.y, colorFor(tile));
         }
         texture.draw(pixmap);
     }
@@ -143,10 +326,26 @@ public class MinimapRenderer implements Disposable{
     public void update(Tile tile){
         if(world.isGenerating() || !state.isGame()) return;
 
-        int color = colorFor(world.tile(tile.x, tile.y));
-        pixmap.draw(tile.x, pixmap.getHeight() - 1 - tile.y, color);
+        if(tile.build != null && tile.isCenter()){
+            tile.getLinkedTiles(other -> {
+                if(!other.isCenter()){
+                    updatePixel(other);
+                }
 
-        Pixmaps.drawPixel(texture, tile.x, pixmap.getHeight() - 1 - tile.y, color);
+                if(tile.block().solid && other.y > 0){
+                    Tile low = world.tile(other.x, other.y - 1);
+                    if(!low.solid()){
+                        updatePixel(low);
+                    }
+                }
+            });
+        }
+
+        updatePixel(tile);
+    }
+
+    void updatePixel(Tile tile){
+        updates.add(tile.pos());
     }
 
     public void updateUnitArray(){
@@ -160,23 +359,26 @@ public class MinimapRenderer implements Disposable{
         Units.nearby((dx - sz) * tilesize, (dy - sz) * tilesize, sz * 2 * tilesize, sz * 2 * tilesize, units::add);
     }
 
-    private int colorFor(Tile tile){
-        if(tile == null) return 0;
-        int bc = tile.block().minimapColor(tile);
-        Color color = Tmp.c1.set(bc == 0 ? MapIO.colorFor(tile.block(), tile.floor(), tile.overlay(), tile.team()) : bc);
-        color.mul(1f - Mathf.clamp(world.getDarkness(tile.x, tile.y) / 4f));
-
-        return color.rgba();
+    private Block realBlock(Tile tile){
+        //TODO doesn't work properly until player goes and looks at block
+        return tile.build == null ? tile.block() : state.rules.fog && !tile.build.wasVisible ? Blocks.air : tile.block();
     }
 
-    @Override
-    public void dispose(){
-        if(pixmap != null && texture != null){
-            pixmap.dispose();
-            texture.dispose();
-            texture = null;
-            pixmap = null;
+    private int colorFor(Tile tile){
+        if(tile == null) return 0;
+        Block real = realBlock(tile);
+        int bc = real.minimapColor(tile);
+
+        Color color = Tmp.c1.set(bc == 0 ? MapIO.colorFor(real, tile.floor(), tile.overlay(), tile.team()) : bc);
+        color.mul(1f - Mathf.clamp(world.getDarkness(tile.x, tile.y) / 4f));
+
+        if(real == Blocks.air && tile.y < world.height() - 1 && realBlock(world.tile(tile.x, tile.y + 1)).solid){
+            color.mul(0.7f);
+        }else if(tile.floor().isLiquid && (tile.y >= world.height() - 1 || !world.tile(tile.x, tile.y + 1).floor().isLiquid)){
+            color.mul(0.84f, 0.84f, 0.9f, 1f);
         }
+
+        return color.rgba();
     }
 
     public void drawLabel(float x, float y, String text, Color color){
diff --git a/core/src/mindustry/graphics/MultiPacker.java b/core/src/mindustry/graphics/MultiPacker.java
index ac8277b078..42bc8d00d7 100644
--- a/core/src/mindustry/graphics/MultiPacker.java
+++ b/core/src/mindustry/graphics/MultiPacker.java
@@ -1,31 +1,91 @@
 package mindustry.graphics;
 
 import arc.graphics.*;
-import arc.graphics.Pixmap.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
+import arc.struct.*;
 import arc.util.*;
+import arc.util.Log.*;
+import mindustry.*;
 
 public class MultiPacker implements Disposable{
     private PixmapPacker[] packers = new PixmapPacker[PageType.all.length];
+    private ObjectSet<String> outlined = new ObjectSet<>();
 
     public MultiPacker(){
         for(int i = 0; i < packers.length; i++){
-            int pageSize = 2048;
-            packers[i] = new PixmapPacker(pageSize, pageSize, Format.rgba8888, 2, true);
+            packers[i] = new PixmapPacker(Math.min(Vars.maxTextureSize, PageType.all[i].width), Math.min(Vars.maxTextureSize, PageType.all[i].height), 2, true);
         }
     }
 
+    @Nullable
+    public PixmapRegion get(String name){
+        for(var packer : packers){
+            var region = packer.getRegion(name);
+            if(region != null){
+                return region;
+            }
+        }
+        return null;
+    }
+
+    public void printStats(){
+        if(Log.level != LogLevel.debug) return;
+
+        for(PageType type : PageType.all){
+            var packer = packers[type.ordinal()];
+            Log.debug("[Atlas] [&ly@&fr]", type);
+            Log.debug("[Atlas] - " + (packer.getPages().size > 1 ? "&fb&lr" : "&lg") + "@ page@&r", packer.getPages().size, packer.getPages().size > 1 ? "s" : "");
+            int i = 0;
+            for(var page : packer.getPages()){
+                float totalArea = 0;
+                for(var region : page.getRects().values()){
+                    totalArea += region.area();
+                }
+
+                Log.debug("[Atlas] - [@] @x@ (&lk@% used&fr)", i, page.getPixmap().width, page.getPixmap().height, (int)(totalArea / (page.getPixmap().width * page.getPixmap().height) * 100f));
+
+                i ++;
+            }
+        }
+    }
+
+    /** @return whether this image was not already outlined. */
+    public boolean registerOutlined(String named){
+        return outlined.add(named);
+    }
+
+    public boolean isOutlined(String name){
+        return outlined.contains(name);
+    }
+
+    public PixmapPacker getPacker(PageType type){
+        return packers[type.ordinal()];
+    }
+
+    public boolean has(String name){
+        for(var page : PageType.all){
+            if(packers[page.ordinal()].getRect(name) != null){
+                return true;
+            }
+        }
+        return false;
+    }
+
     public boolean has(PageType type, String name){
         return packers[type.ordinal()].getRect(name) != null;
     }
 
     public void add(PageType type, String name, PixmapRegion region){
-        packers[type.ordinal()].pack(name, region);
+        add(type, name, region, null, null);
+    }
+
+    public void add(PageType type, String name, PixmapRegion region, int[] splits, int[] pads){
+        packers[type.ordinal()].pack(name, region, splits, pads);
     }
 
     public void add(PageType type, String name, Pixmap pix){
-        packers[type.ordinal()].pack(name, pix);
+        add(type, name, new PixmapRegion(pix));
     }
 
     public TextureAtlas flush(TextureFilter filter, TextureAtlas atlas){
@@ -37,24 +97,45 @@ public class MultiPacker implements Disposable{
 
     @Override
     public void dispose(){
-        for(PixmapPacker packer : packers){
-            packer.dispose();
+        for(int i = 0; i < PageType.all.length; i ++){
+            var packer = packers[i];
+            //the UI packer's image is later used when merging with the font, don't dispose it
+            if(i != PageType.ui.ordinal()){
+                packer.forceDispose();
+            }
         }
     }
 
-
     //There are several pages for sprites.
     //main page (sprites.png) - all sprites for units, weapons, placeable blocks, effects, bullets, etc
     //environment page (sprites2.png) - all sprites for things in the environmental cache layer
-    //editor page (sprites3.png) - all sprites needed for rendering in the editor, including block icons and a few minor sprites
-    //zone page (sprites4.png) - zone previews
-    //ui page (sprites5.png) - content icons, white icons and UI elements
+    //ui page (sprites3.png) - content icons, white icons, fonts and UI elements
+    //rubble page (sprites4.png) - scorch textures for unit deaths & wrecks
+    //editor page (sprites5.png) - all sprites needed for rendering in the editor, including block icons and a few minor sprites
     public enum PageType{
-        main,
-        environment,
-        editor,
-        ui;
+        //main page can be massive, but 8192 throws GL_OUT_OF_MEMORY on some GPUs and I can't deal with it yet.
+        main(4096),
+
+        environment(4096),
+        ui(4096),
+        rubble(4096, 2048),
+        editor(4096, 2048);
 
         public static final PageType[] all = values();
+
+        public int width = 2048, height = 2048;
+
+        PageType(int defaultSize){
+            this.width = this.height = defaultSize;
+        }
+
+        PageType(int width, int height){
+            this.width = width;
+            this.height = height;
+        }
+
+        PageType(){
+
+        }
     }
 }
diff --git a/core/src/mindustry/graphics/NvGpuInfo.java b/core/src/mindustry/graphics/NvGpuInfo.java
new file mode 100644
index 0000000000..f620680b03
--- /dev/null
+++ b/core/src/mindustry/graphics/NvGpuInfo.java
@@ -0,0 +1,28 @@
+package mindustry.graphics;
+
+import arc.*;
+import arc.graphics.*;
+
+/** Nvidia-specific utility class for querying GPU VRAM information. */
+public class NvGpuInfo{
+    private static final int GL_GPU_MEM_INFO_TOTAL_AVAILABLE_MEM_NVX = 0x9048;
+    private static final int GL_GPU_MEM_INFO_CURRENT_AVAILABLE_MEM_NVX = 0x9049;
+
+    private static boolean supported, initialized;
+
+    public static int getMaxMemoryKB(){
+        return hasMemoryInfo() ? Gl.getInt(GL_GPU_MEM_INFO_TOTAL_AVAILABLE_MEM_NVX) : 0;
+    }
+
+    public static int getAvailableMemoryKB(){
+        return hasMemoryInfo() ? Gl.getInt(GL_GPU_MEM_INFO_CURRENT_AVAILABLE_MEM_NVX) : 0;
+    }
+
+    public static boolean hasMemoryInfo(){
+        if(!initialized){
+            supported = Core.graphics.supportsExtension("GL_NVX_gpu_memory_info");
+            initialized = true;
+        }
+        return supported;
+    }
+}
\ No newline at end of file
diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java
index 2f5ea104c7..6ec2d283ac 100644
--- a/core/src/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/mindustry/graphics/OverlayRenderer.java
@@ -5,13 +5,18 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.ai.types.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.input.*;
-import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static mindustry.Vars.*;
 
@@ -19,8 +24,49 @@ public class OverlayRenderer{
     private static final float indicatorLength = 14f;
     private static final float spawnerMargin = tilesize*11f;
     private static final Rect rect = new Rect();
+
     private float buildFade, unitFade;
-    private Unit lastSelect;
+    private Sized lastSelect;
+    private Seq<CoreEdge> cedges = new Seq<>();
+    private boolean updatedCores;
+
+    public OverlayRenderer(){
+        Events.on(WorldLoadEvent.class, e -> {
+            updatedCores = true;
+        });
+
+        Events.on(CoreChangeEvent.class, e -> {
+            updatedCores = true;
+        });
+    }
+
+    private void updateCoreEdges(){
+        if(!updatedCores){
+            return;
+        }
+
+        updatedCores = false;
+        cedges.clear();
+
+        Seq<Vec2> pos = new Seq<>();
+        Seq<CoreBuild> teams = new Seq<>();
+        for(TeamData team : state.teams.active){
+            for(CoreBuild b : team.cores){
+                teams.add(b);
+                pos.add(new Vec2(b.x, b.y));
+            }
+        }
+
+        if(pos.isEmpty()){
+            return;
+        }
+
+        //if this is laggy, it could be shoved in another thread.
+        var result = Voronoi.generate(pos.toArray(Vec2.class), 0, world.unitWidth(), 0, world.unitHeight());
+        for(var edge : result){
+            cedges.add(new CoreEdge(edge.x1, edge.y1, edge.x2, edge.y2, teams.get(edge.site1).team, teams.get(edge.site2).team));
+        }
+    }
 
     public void drawBottom(){
         InputHandler input = control.input;
@@ -53,7 +99,7 @@ public class OverlayRenderer{
                 }
             }
 
-            if(Core.settings.getBool("indicators")){
+            if(Core.settings.getBool("indicators") && !state.rules.fog){
                 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)){
@@ -71,35 +117,41 @@ public class OverlayRenderer{
 
         InputHandler input = control.input;
 
-        Unit select = input.selectedUnit();
-        if(!Core.input.keyDown(Binding.control)) select = null;
+        Sized select = input.selectedUnit();
+        if(select == null) select = input.selectedControlBuild();
+        if(!Core.input.keyDown(Binding.control) || !state.rules.possessionAllowed) select = null;
+
         unitFade = Mathf.lerpDelta(unitFade, Mathf.num(select != null), 0.1f);
 
         if(select != null) lastSelect = select;
         if(select == null) select = lastSelect;
-        if(select != null && select.isAI()){
+        if(select != null && (!(select instanceof Unitc u) || u.isAI())){
             Draw.mixcol(Pal.accent, 1f);
             Draw.alpha(unitFade);
+            Building build = (select instanceof BlockUnitc b ? b.tile() : select instanceof Building b ? b : null);
+            TextureRegion region = build != null ? build.block.fullIcon : Core.atlas.white();
 
-            if(select instanceof BlockUnitc){
-                //special selection for block "units"
-                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);
+            if(!(select instanceof Unitc)){
+                Draw.rect(region, select.getX(), select.getY());
+            }
+
+            for(int i = 0; i < 4; i++){
+                float rot = i * 90f + 45f + (-Time.time) % 360f;
+                float length = select.hitSize() * 1.5f + (unitFade * 2.5f);
+                Draw.rect("select-arrow", select.getX() + Angles.trnsx(rot, length), select.getY() + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f);
             }
 
-            Lines.stroke(unitFade);
-            Lines.square(select.x, select.y, select.hitSize() * 1.5f, Time.time * 2f);
             Draw.reset();
         }
 
         //draw config selected block
-        if(input.frag.config.isShown()){
-            Building tile = input.frag.config.getSelectedTile();
+        if(input.config.isShown()){
+            Building tile = input.config.getSelected();
             tile.drawConfigure();
         }
 
         input.drawTop();
+        input.drawUnitSelection();
 
         buildFade = Mathf.lerpDelta(buildFade, input.isPlacing() || input.isUsingSchematic() ? 1f : 0f, 0.06f);
 
@@ -107,15 +159,34 @@ public class OverlayRenderer{
         Lines.stroke(buildFade * 2f);
 
         if(buildFade > 0.005f){
-            state.teams.eachEnemyCore(player.team(), core -> {
-                float dst = core.dst(player);
-                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));
-                    Lines.circle(core.x, core.y, state.rules.enemyCoreBuildRadius);
+            if(state.rules.polygonCoreProtection){
+                updateCoreEdges();
+                Draw.color(Pal.accent);
+
+                for(int i = 0; i < 2; i++){
+                    float offset = (i == 0 ? -2f : 0f);
+                    for(CoreEdge edge : cedges){
+                        Team displayed = edge.displayed();
+                        if(displayed != null){
+                            Draw.color(i == 0 ? Color.darkGray : Tmp.c1.set(displayed.color).lerp(Pal.accent, Mathf.absin(Time.time, 10f, 0.2f)));
+                            Lines.line(edge.x1, edge.y1 + offset, edge.x2, edge.y2 + offset);
+                        }
+                    }
                 }
-            });
+
+                Draw.color();
+            }else{
+                state.teams.eachEnemyCore(player.team(), core -> {
+                    //it must be clear that there is a core here.
+                    float br = state.rules.buildRadius(core.team);
+                    if(/*core.wasVisible && */Core.camera.bounds(Tmp.r1).overlaps(Tmp.r2.setCentered(core.x, core.y, br * 2f))){
+                        Draw.color(Color.darkGray);
+                        Lines.circle(core.x, core.y - 2,br);
+                        Draw.color(Pal.accent, core.team.color, 0.5f + Mathf.absin(Time.time, 10f, 0.5f));
+                        Lines.circle(core.x, core.y, br);
+                    }
+                });
+            }
         }
 
         Lines.stroke(2f);
@@ -154,7 +225,8 @@ public class OverlayRenderer{
 
         input.drawOverSelect();
 
-        if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller instanceof Building build && build.isValid()){
+        if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller != null && ai.controller.isValid()){
+            var build = ai.controller;
             Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f);
             if(!unit.within(build, unit.hitSize * 2f)){
                 Drawf.arrow(unit.x, unit.y, build.x, build.y, unit.hitSize *2f, 4f);
@@ -165,20 +237,58 @@ public class OverlayRenderer{
         if(input.isDroppingItem()){
             Vec2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
             float size = 8;
-            Draw.rect(player.unit().item().icon(Cicon.medium), v.x, v.y, size, size);
+            Draw.rect(player.unit().item().fullIcon, v.x, v.y, size, size);
             Draw.color(Pal.accent);
             Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time, 5f, 1f));
             Draw.reset();
 
-            Building tile = world.buildWorld(v.x, v.y);
-            if(input.canDropItem() && tile != null && tile.interactable(player.team()) && tile.acceptStack(player.unit().item(), player.unit().stack.amount, player.unit()) > 0 && player.within(tile, itemTransferRange)){
+            Building build = world.buildWorld(v.x, v.y);
+            if(input.canDropItem() && build != null && build.interactable(player.team()) && build.acceptStack(player.unit().item(), player.unit().stack.amount, player.unit()) > 0 && player.within(build, itemTransferRange) &&
+                input.itemDepositCooldown <= 0f){
+
+                boolean invalid = (state.rules.onlyDepositCore && !(build instanceof CoreBuild));
+
                 Lines.stroke(3f, Pal.gray);
-                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(build.x, build.y, build.block.size * tilesize / 2f + 3 + Mathf.absin(Time.time, 5f, 1f));
+                Lines.stroke(1f, invalid ? Pal.remove : Pal.place);
+                Lines.square(build.x, build.y, build.block.size * tilesize / 2f + 2 + Mathf.absin(Time.time, 5f, 1f));
                 Draw.reset();
 
+                if(invalid){
+                    build.block.drawPlaceText(Core.bundle.get("bar.onlycoredeposit"), build.tileX(), build.tileY(), false);
+                }
             }
         }
     }
+
+    public void checkApplySelection(Unit u){
+        if(unitFade > 0.001f && lastSelect == u){
+            Color prev = Draw.getMixColor();
+            Draw.mixcol(prev.a > 0.001f ? prev.lerp(Pal.accent, unitFade) : Pal.accent, Math.max(unitFade, prev.a));
+        }
+    }
+
+    private static class CoreEdge{
+        float x1, y1, x2, y2;
+        Team t1, t2;
+
+        public CoreEdge(float x1, float y1, float x2, float y2, Team t1, Team t2){
+            this.x1 = x1;
+            this.y1 = y1;
+            this.x2 = x2;
+            this.y2 = y2;
+            this.t1 = t1;
+            this.t2 = t2;
+        }
+
+        @Nullable
+        Team displayed(){
+            return
+                t1 == t2 ? null :
+                t1 == player.team() ? t2 :
+                t2 == player.team() ? t1 :
+                t2.id == 0 ? t1 :
+                t1.id < t2.id && t1.id != 0 ? t1 : t2;
+        }
+    }
 }
diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java
index 1b2b10ff94..ba63dcdb68 100644
--- a/core/src/mindustry/graphics/Pal.java
+++ b/core/src/mindustry/graphics/Pal.java
@@ -5,7 +5,10 @@ import arc.graphics.*;
 public class Pal{
     public static Color
 
+    water = Color.valueOf("596ab8"),
+    darkOutline = Color.valueOf("2d2f39"),
     thoriumPink = Color.valueOf("f9a3c7"),
+    coalBlack = Color.valueOf("272727"),
 
     items = Color.valueOf("2ea756"),
     command = Color.valueOf("eab678"),
@@ -14,16 +17,23 @@ public class Pal{
     sapBullet = Color.valueOf("bf92f9"),
     sapBulletBack = Color.valueOf("6d56bf"),
 
+    suppress = Pal.sap.cpy().mul(1.6f),
+
+    regen = Color.valueOf("d1efff"),
+
+    reactorPurple = Color.valueOf("bf92f9"),
+    reactorPurple2 = Color.valueOf("8a73c6"),
+
     spore = Color.valueOf("7457ce"),
 
     shield = Color.valueOf("ffd37f").a(0.7f),
-    shieldIn = Color.black.cpy().a(0f),
 
     bulletYellow = Color.valueOf("fff8e8"),
     bulletYellowBack = Color.valueOf("f9c27a"),
 
     darkMetal = Color.valueOf("6e7080"),
     darkerMetal = Color.valueOf("565666"),
+    darkestMetal = Color.valueOf("38393f"),
 
     missileYellow = Color.valueOf("ffd2ae"),
     missileYellowBack = Color.valueOf("e58956"),
@@ -66,6 +76,7 @@ public class Pal{
     bar = Color.slate,
     accent = Color.valueOf("ffd37f"),
     stat = Color.valueOf("ffd37f"),
+    negativeStat = Color.valueOf("e55454"),
     gray = Color.valueOf("454545"),
     metalGrayDark = Color.valueOf("6e7080"),
     accentBack = Color.valueOf("d4816b"),
@@ -97,12 +108,33 @@ public class Pal{
     redderDust = Color.valueOf("ff7b69"),
 
     plasticSmoke = Color.valueOf("f1e479"),
-	
+
     adminChat = Color.valueOf("ff4000"),
 
+    neoplasmOutline = Color.valueOf("2e191d"),
+
+    neoplasm1 = Color.valueOf("f98f4a"),
+    neoplasmMid = Color.valueOf("e05438"),
+    neoplasm2 = Color.valueOf("9e172c"),
+
     logicBlocks = Color.valueOf("d4816b"),
     logicControl = Color.valueOf("6bb2b2"),
     logicOperations = Color.valueOf("877bad"),
     logicIo = Color.valueOf("a08a8a"),
-    logicUnits = Color.valueOf("c7b59d");
+    logicUnits = Color.valueOf("c7b59d"),
+    logicWorld = Color.valueOf("6b84d4"),
+
+    berylShot = Color.valueOf("b1dd7e"),
+    tungstenShot = Color.valueOf("768a9a"),
+
+    plasticBurn = Color.valueOf("e9ead3"),
+
+    muddy = Color.valueOf("432722"),
+
+    redLight = Color.valueOf("feb380"),
+    slagOrange = Color.valueOf("ffa166"),
+    techBlue = Color.valueOf("8ca9e8"),
+
+    vent = Color.valueOf("6b4e4e"),
+    vent2 = Color.valueOf("3b2a2a");
 }
diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java
index 5bce6721e3..2c7141d0bf 100644
--- a/core/src/mindustry/graphics/Pixelator.java
+++ b/core/src/mindustry/graphics/Pixelator.java
@@ -5,6 +5,7 @@ import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
+import arc.math.*;
 import arc.util.*;
 
 import static arc.Core.*;
@@ -30,8 +31,13 @@ public class Pixelator implements Disposable{
         py = Core.camera.position.y;
         Core.camera.position.set((int)px + ((int)(camera.width) % 2 == 0 ? 0 : 0.5f), (int)py + ((int)(camera.height) % 2 == 0 ? 0 : 0.5f));
 
-        int w = (int)(Core.camera.width * renderer.landScale());
-        int h = (int)(Core.camera.height * renderer.landScale());
+        int w = (int)Core.camera.width, h = (int)Core.camera.height;
+        if(renderer.isCutscene()){
+            w = (int)(Core.camera.width * renderer.landScale() / renderer.getScale());
+            h = (int)(Core.camera.height * renderer.landScale() / renderer.getScale());
+        }
+        w = Mathf.clamp(w, 2, graphics.getWidth());
+        h = Mathf.clamp(h, 2, graphics.getHeight());
 
         buffer.resize(w, h);
 
@@ -52,7 +58,7 @@ public class Pixelator implements Disposable{
     }
 
     public boolean enabled(){
-        return Core.settings.getBool("pixelate");
+        return renderer.pixelate;
     }
 
     @Override
diff --git a/core/src/mindustry/graphics/ScorchGenerator.java b/core/src/mindustry/graphics/ScorchGenerator.java
deleted file mode 100644
index b7dfd15439..0000000000
--- a/core/src/mindustry/graphics/ScorchGenerator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package mindustry.graphics;
-
-import arc.graphics.*;
-import arc.math.*;
-import arc.util.noise.*;
-
-/** Generates a scorch pixmap based on parameters. Thread safe, unless multiple scorch generators are running in parallel. */
-public class ScorchGenerator{
-    private static final Simplex sim = new Simplex();
-
-    public int size = 80, seed = 0, color = Color.white.rgba();
-    public double scale = 18, pow = 2, octaves = 4, pers = 0.4, add = 2, nscl = 4.5f;
-
-    public Pixmap generate(){
-        Pixmap pix = new Pixmap(size, size);
-        sim.setSeed(seed);
-
-        pix.each((x, y) -> {
-            double dst = Mathf.dst(x, y, size/2, size/2) / (size / 2f);
-            double scaled = Math.abs(dst - 0.5f) * 5f + add;
-            scaled -= noise(Angles.angle(x, y, size/2, size/2))*nscl;
-            if(scaled < 1.5f) pix.draw(x, y, color);
-        });
-
-        return pix;
-    }
-
-    private double noise(float angle){
-        return Math.pow(sim.octaveNoise2D(octaves, pers, 1 / scale, Angles.trnsx(angle, size/2f) + size/2f, Angles.trnsy(angle, size/2f) + size/2f), pow);
-    }
-}
diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java
index 637b09967b..109b5388ba 100644
--- a/core/src/mindustry/graphics/Shaders.java
+++ b/core/src/mindustry/graphics/Shaders.java
@@ -9,29 +9,35 @@ import arc.graphics.g3d.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
+import mindustry.game.EventType.*;
 import mindustry.type.*;
 
 import static mindustry.Vars.*;
 
 public class Shaders{
-    public static BlockBuild blockbuild;
+    public static BlockBuildShader blockbuild;
     public static @Nullable ShieldShader shield;
     public static BuildBeamShader buildBeam;
-    public static UnitBuild build;
+    public static UnitBuildShader build;
+    public static UnitArmorShader armor;
     public static DarknessShader darkness;
+    public static FogShader fog;
     public static LightShader light;
-    public static SurfaceShader water, mud, tar, slag, space;
+    public static SurfaceShader water, mud, tar, slag, cryofluid, space, caustics, arkycite;
     public static PlanetShader planet;
+    public static CloudShader clouds;
     public static PlanetGridShader planetGrid;
     public static AtmosphereShader atmosphere;
+    public static ShockwaveShader shockwave;
     public static MeshShader mesh;
     public static Shader unlit;
     public static Shader screenspace;
 
     public static void init(){
         mesh = new MeshShader();
-        blockbuild = new BlockBuild();
+        blockbuild = new BlockBuildShader();
         try{
             shield = new ShieldShader();
         }catch(Throwable t){
@@ -39,20 +45,34 @@ public class Shaders{
             shield = null;
             t.printStackTrace();
         }
+        fog = new FogShader();
         buildBeam = new BuildBeamShader();
-        build = new UnitBuild();
+        build = new UnitBuildShader();
+        armor = new UnitArmorShader();
         darkness = new DarknessShader();
         light = new LightShader();
         water = new SurfaceShader("water");
+        arkycite = new SurfaceShader("arkycite");
         mud = new SurfaceShader("mud");
         tar = new SurfaceShader("tar");
         slag = new SurfaceShader("slag");
+        cryofluid = new SurfaceShader("cryofluid");
         space = new SpaceShader("space");
+        caustics = new SurfaceShader("caustics"){
+            @Override
+            public String textureName(){
+                return "caustics";
+            }
+        };
         planet = new PlanetShader();
+        clouds = new CloudShader();
         planetGrid = new PlanetGridShader();
         atmosphere = new AtmosphereShader();
         unlit = new LoadShader("planet", "unlit");
         screenspace = new LoadShader("screenspace", "screenspace");
+
+        //disabled for now...
+        //shockwave = new ShockwaveShader();
     }
 
     public static class AtmosphereShader extends LoadShader{
@@ -87,6 +107,8 @@ public class Shaders{
         public Vec3 lightDir = new Vec3(1, 1, 1).nor();
         public Color ambientColor = Color.white.cpy();
         public Vec3 camDir = new Vec3();
+        public Vec3 camPos = new Vec3();
+        public Planet planet;
 
         public PlanetShader(){
             super("planet", "planet");
@@ -94,11 +116,33 @@ public class Shaders{
 
         @Override
         public void apply(){
-            camDir.set(renderer.planets.cam.direction).rotate(Vec3.Y, renderer.planets.planet.getRotation());
+            camDir.set(renderer.planets.cam.direction).rotate(Vec3.Y, planet.getRotation());
 
             setUniformf("u_lightdir", lightDir);
             setUniformf("u_ambientColor", ambientColor.r, ambientColor.g, ambientColor.b);
             setUniformf("u_camdir", camDir);
+            setUniformf("u_campos", renderer.planets.cam.position);
+        }
+    }
+
+    public static class CloudShader extends LoadShader{
+        public Vec3 lightDir = new Vec3(1, 1, 1).nor();
+        public Color ambientColor = Color.white.cpy();
+        public Vec3 camDir = new Vec3();
+        public float alpha = 1f;
+        public Planet planet;
+
+        public CloudShader(){
+            super("planet", "clouds");
+        }
+
+        @Override
+        public void apply(){
+            camDir.set(renderer.planets.cam.direction).rotate(Vec3.Y, planet.getRotation());
+
+            setUniformf("u_alpha", alpha);
+            setUniformf("u_lightdir", lightDir);
+            setUniformf("u_ambientColor", ambientColor.r, ambientColor.g, ambientColor.b);
         }
     }
 
@@ -142,12 +186,18 @@ public class Shaders{
         }
     }
 
-    public static class UnitBuild extends LoadShader{
+    public static class FogShader extends LoadShader{
+        public FogShader(){
+            super("fog", "default");
+        }
+    }
+
+    public static class UnitBuildShader extends LoadShader{
         public float progress, time;
         public Color color = new Color();
         public TextureRegion region;
 
-        public UnitBuild(){
+        public UnitBuildShader(){
             super("unitbuild", "default");
         }
 
@@ -162,21 +212,47 @@ public class Shaders{
         }
     }
 
-    public static class BlockBuild extends LoadShader{
+    public static class UnitArmorShader extends LoadShader{
+        public float progress, time;
+        public TextureRegion region;
+
+        public UnitArmorShader(){
+            super("unitarmor", "default");
+        }
+
+        @Override
+        public void apply(){
+            setUniformf("u_time", time);
+            setUniformf("u_progress", progress);
+            setUniformf("u_uv", region.u, region.v);
+            setUniformf("u_uv2", region.u2, region.v2);
+            setUniformf("u_texsize", region.texture.width, region.texture.height);
+        }
+    }
+
+    public static class BlockBuildShader extends LoadShader{
         public float progress;
         public TextureRegion region = new TextureRegion();
+        public float time;
 
-        public BlockBuild(){
+        public BlockBuildShader(){
             super("blockbuild", "default");
         }
 
         @Override
         public void apply(){
             setUniformf("u_progress", progress);
-            setUniformf("u_uv", region.u, region.v);
-            setUniformf("u_uv2", region.u2, region.v2);
-            setUniformf("u_time", Time.time);
-            setUniformf("u_texsize", region.texture.width, region.texture.height);
+            setUniformf("u_time", time);
+
+            if(region.texture == null){
+                setUniformf("u_uv", 0f, 0f);
+                setUniformf("u_uv2", 1f, 1f);
+                setUniformf("u_texsize", 1, 1);
+            }else{
+                setUniformf("u_uv", region.u, region.v);
+                setUniformf("u_uv2", region.u2, region.v2);
+                setUniformf("u_texsize", region.texture.width, region.texture.height);
+            }
         }
     }
 
@@ -224,7 +300,7 @@ public class Shaders{
             super(frag);
 
             Core.assets.load("sprites/space.png", Texture.class).loaded = t -> {
-                texture = (Texture)t;
+                texture = t;
                 texture.setFilter(TextureFilter.linear);
                 texture.setWrap(TextureWrap.mirroredRepeat);
             };
@@ -245,6 +321,8 @@ public class Shaders{
     }
 
     public static class SurfaceShader extends Shader{
+        Texture noiseTex;
+
         public SurfaceShader(String frag){
             super(getShaderFi("screenspace.vert"), getShaderFi(frag + ".frag"));
             loadNoise();
@@ -255,10 +333,14 @@ public class Shaders{
             loadNoise();
         }
 
+        public String textureName(){
+            return "noise";
+        }
+
         public void loadNoise(){
-            Core.assets.load("sprites/noise.png", Texture.class).loaded = t -> {
-                ((Texture)t).setFilter(TextureFilter.linear);
-                ((Texture)t).setWrap(TextureWrap.repeat);
+            Core.assets.load("sprites/" + textureName() + ".png", Texture.class).loaded = t -> {
+                t.setFilter(TextureFilter.linear);
+                t.setWrap(TextureWrap.repeat);
             };
         }
 
@@ -269,7 +351,11 @@ public class Shaders{
             setUniformf("u_time", Time.time);
 
             if(hasUniform("u_noise")){
-                Core.assets.get("sprites/noise.png", Texture.class).bind(1);
+                if(noiseTex == null){
+                    noiseTex = Core.assets.get("sprites/" + textureName() + ".png", Texture.class);
+                }
+
+                noiseTex.bind(1);
                 renderer.effectBuffer.getTexture().bind(0);
 
                 setUniformi("u_noise", 1);
@@ -277,6 +363,110 @@ public class Shaders{
         }
     }
 
+    public static class ShockwaveShader extends LoadShader{
+        static final int max = 64;
+        static final int size = 5;
+
+        //x y radius life[1-0] lifetime
+        protected FloatSeq data = new FloatSeq();
+        protected FloatSeq uniforms = new FloatSeq();
+        protected boolean hadAny = false;
+        protected FrameBuffer buffer = new FrameBuffer();
+
+        public float lifetime = 20f;
+
+        public ShockwaveShader(){
+            super("shockwave", "screenspace");
+
+            Events.run(Trigger.update, () -> {
+                if(state.isPaused()) return;
+                if(state.isMenu()){
+                    data.size = 0;
+                    return;
+                }
+
+                var items = data.items;
+                for(int i = 0; i < data.size; i += size){
+                    //decrease lifetime
+                    items[i + 3] -= Time.delta / items[i + 4];
+
+                    if(items[i + 3] <= 0f){
+                        //swap with head.
+                        if(data.size > size){
+                            System.arraycopy(items, data.size - size, items, i, size);
+                        }
+
+                        data.size -= size;
+                        i -= size;
+                    }
+                }
+            });
+
+            Events.run(Trigger.preDraw, () -> {
+                hadAny = data.size > 0;
+
+                if(hadAny){
+                    buffer.resize(Core.graphics.getWidth(), Core.graphics.getHeight());
+                    buffer.begin(Color.clear);
+                }
+            });
+
+            Events.run(Trigger.postDraw, () -> {
+                if(hadAny){
+                    buffer.end();
+                    Draw.blend(Blending.disabled);
+                    buffer.blit(this);
+                    Draw.blend();
+                }
+            });
+        }
+
+        @Override
+        public void apply(){
+            int count = data.size / size;
+
+            setUniformi("u_shockwave_count", count);
+            if(count > 0){
+                setUniformf("u_resolution", Core.camera.width, Core.camera.height);
+                setUniformf("u_campos", Core.camera.position.x - Core.camera.width/2f, Core.camera.position.y - Core.camera.height/2f);
+
+                uniforms.clear();
+
+                var items = data.items;
+                for(int i = 0; i < count; i++){
+                    int offset = i * size;
+
+                    uniforms.add(
+                    items[offset], items[offset + 1], //xy
+                    items[offset + 2] * (1f - items[offset + 3]), //radius * time
+                    items[offset + 3] //time
+                    //lifetime ignored
+                    );
+                }
+
+                setUniform4fv("u_shockwaves", uniforms.items, 0, uniforms.size);
+            }
+        }
+
+        public void add(float x, float y, float radius){
+            add(x, y, radius, 20f);
+        }
+
+        public void add(float x, float y, float radius, float lifetime){
+            //replace first entry
+            if(data.size / size >= max){
+                var items = data.items;
+                items[0] = x;
+                items[1] = y;
+                items[2] = radius;
+                items[3] = 1f;
+                items[4] = lifetime;
+            }else{
+                data.addAll(x, y, radius, 1f, lifetime);
+            }
+        }
+    }
+
     public static class LoadShader extends Shader{
         public LoadShader(String frag, String vert){
             super(getShaderFi(vert + ".vert"), getShaderFi(frag + ".frag"));
@@ -284,6 +474,6 @@ public class Shaders{
     }
 
     public static Fi getShaderFi(String file){
-        return Core.files.internal("shaders/" + file);
+        return tree.get("shaders/" + file);
     }
 }
diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java
index fd5e36eb25..6fef429cb2 100644
--- a/core/src/mindustry/graphics/Trail.java
+++ b/core/src/mindustry/graphics/Trail.java
@@ -3,51 +3,145 @@ package mindustry.graphics;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.pooling.*;
+import arc.util.*;
 
 public class Trail{
     public int length;
 
-    private final Seq<Vec3> points;
-    private float lastX = -1, lastY = -1;
+    protected FloatSeq points;
+    protected float lastX = -1, lastY = -1, lastAngle = -1, counter = 0f, lastW = 0f;
 
     public Trail(int length){
         this.length = length;
-        points = new Seq<>(length);
+        points = new FloatSeq(length*3);
+    }
+
+    public Trail copy(){
+        Trail out = new Trail(length);
+        out.points.addAll(points);
+        out.lastX = lastX;
+        out.lastY = lastY;
+        out.lastAngle = lastAngle;
+        return out;
+    }
+
+    public float width(){
+        return lastW;
     }
 
     public void clear(){
         points.clear();
     }
 
+    public int size(){
+        return points.size/3;
+    }
+
+    public void drawCap(Color color, float width){
+        if(points.size > 0){
+            Draw.color(color);
+            float[] items = points.items;
+            int i = points.size - 3;
+            float x1 = items[i], y1 = items[i + 1], w1 = items[i + 2], w = w1 * width / (points.size/3) * i/3f * 2f;
+            if(w1 <= 0.001f) return;
+            Draw.rect("hcircle", x1, y1, w, w, -Mathf.radDeg * lastAngle + 180f);
+            Draw.reset();
+        }
+    }
+
     public void draw(Color color, float width){
         Draw.color(color);
+        float[] items = points.items;
+        float lastAngle = this.lastAngle;
+        float size = width / (points.size / 3);
 
-        for(int i = 0; i < points.size - 1; i++){
-            Vec3 c = points.get(i);
-            Vec3 n = points.get(i + 1);
-            float size = width / length;
+        for(int i = 0; i < points.size; i += 3){
+            float x1 = items[i], y1 = items[i + 1], w1 = items[i + 2];
+            float x2, y2, w2;
 
-            float cx = Mathf.sin(c.z) * i * size, cy = Mathf.cos(c.z) * i * size, nx = Mathf.sin(n.z) * (i + 1) * size, ny = Mathf.cos(n.z) * (i + 1) * size;
-            Fill.quad(c.x - cx, c.y - cy, c.x + cx, c.y + cy, n.x + nx, n.y + ny, n.x - nx, n.y - ny);
+            //last position is always lastX/Y/W
+            if(i < points.size - 3){
+                x2 = items[i + 3];
+                y2 = items[i + 4];
+                w2 = items[i + 5];
+
+                if(i == 0 && points.size >= (length - 1) * 3){
+                    x1 = Mathf.lerp(x1, x2, counter);
+                    y1 = Mathf.lerp(y1, y2, counter);
+                    w1 = Mathf.lerp(w1, w2, counter);
+                }
+            }else{
+                x2 = lastX;
+                y2 = lastY;
+                w2 = lastW;
+            }
+
+            float z2 = -Angles.angleRad(x1, y1, x2, y2);
+            //end of the trail (i = 0) has the same angle as the next.
+            float z1 = i == 0 ? z2 : lastAngle;
+            if(w1 <= 0.001f || w2 <= 0.001f) continue;
+
+            float
+                cx = Mathf.sin(z1) * i/3f * size * w1,
+                cy = Mathf.cos(z1) * i/3f * size * w1,
+                nx = Mathf.sin(z2) * (i/3f + 1) * size * w2,
+                ny = Mathf.cos(z2) * (i/3f + 1) * size * w2;
+
+            Fill.quad(
+                x1 - cx, y1 - cy,
+                x1 + cx, y1 + cy,
+                x2 + nx, y2 + ny,
+                x2 - nx, y2 - ny
+            );
+
+            lastAngle = z2;
         }
 
         Draw.reset();
     }
 
+    /** Removes the last point from the trail at intervals. */
+    public void shorten(){
+        int count = (int)(counter += Time.delta);
+        counter -= count;
+
+       if(count > 0 && points.size > 0){
+           points.removeRange(0, Math.min(count * 3 - 1, points.size - 1));
+       }
+    }
+
+    /** Adds a new point to the trail at intervals. */
     public void update(float x, float y){
-        if(points.size > length){
-            Pools.free(points.first());
-            points.remove(0);
+        update(x, y, 1f);
+    }
+
+    /** Adds a new point to the trail at intervals. */
+    public void update(float x, float y, float width){
+        int count = (int)(counter += Time.delta);
+        counter -= count;
+
+        if(count > 0){
+            int toRemove = points.size + (count - 1 - length) * 3;
+            if(toRemove > 0 && points.size > 0){
+                points.removeRange(0, Math.min(toRemove - 1, points.size - 1));
+            }
+
+            //if lastX is -1, this trail has never updated, so only add one point - there is nothing to interpolate with
+            if(count == 1 || lastX == -1f){
+                points.add(x, y, width);
+            }else{
+                for(int i = 0; i < count; i++){
+                    float f = (i + 1f) / count;
+                    points.add(Mathf.lerp(lastX, x, f), Mathf.lerp(lastY, y, f), Mathf.lerp(lastW, width, f));
+                }
+            }
         }
 
-        float angle = -Angles.angle(x, y, lastX, lastY);
-
-        points.add(Pools.obtain(Vec3.class, Vec3::new).set(x, y, (angle) * Mathf.degRad));
-
+        //update last position regardless, so it joins at the origin
+        lastAngle = -Angles.angleRad(x, y, lastX, lastY);
         lastX = x;
         lastY = y;
+        lastW = width;
     }
 }
diff --git a/core/src/mindustry/graphics/Voronoi.java b/core/src/mindustry/graphics/Voronoi.java
new file mode 100755
index 0000000000..84065f53b2
--- /dev/null
+++ b/core/src/mindustry/graphics/Voronoi.java
@@ -0,0 +1,643 @@
+package mindustry.graphics;
+
+import arc.math.geom.*;
+import arc.struct.*;
+
+import java.util.*;
+
+//TODO in dire need of cleanup
+public class Voronoi{
+    private final static int LE = 0;
+    private final static int RE = 1;
+
+    //TODO make local
+    int siteidx;
+    Site[] sites;
+    int nsites;
+    float borderMinX, borderMaxX, borderMinY, borderMaxY;
+    float ymin;
+    float deltay;
+    int nvertices = 0;
+    int nedges;
+    Site bottomsite;
+    int PQcount;
+    int PQmin;
+    int PQhashsize;
+    Halfedge[] PQhash;
+    int ELhashsize;
+    Halfedge[] ELhash;
+    Seq<GraphEdge> allEdges;
+    float minDistanceBetweenSites = 1f;
+
+    public static Seq<GraphEdge> generate(Vec2[] values, float minX, float maxX, float minY, float maxY){
+        return new Voronoi().generateVoronoi(values, minX, maxX, minY, maxY);
+    }
+
+    Seq<GraphEdge> generateVoronoi(Vec2[] values, float minX, float maxX, float minY, float maxY){
+        allEdges = new Seq<>();
+
+        nsites = values.length;
+
+        float sn = (float)nsites + 4;
+        int rtsites = (int)Math.sqrt(sn);
+
+        sites = new Site[nsites];
+        Vec2 first = values[0];
+        float xmin = first.x;
+        ymin = first.y;
+        float xmax = first.x;
+        float ymax = first.y;
+        for(int i = 0; i < nsites; i++){
+            sites[i] = new Site();
+            sites[i].coord.set(values[i]);
+            sites[i].sitenbr = i;
+
+            if(values[i].x < xmin){
+                xmin = values[i].x;
+            }else if(values[i].x > xmax){
+                xmax = values[i].x;
+            }
+
+            if(values[i].y < ymin){
+                ymin = values[i].y;
+            }else if(values[i].y > ymax){
+                ymax = values[i].y;
+            }
+        }
+
+        Arrays.sort(sites, (p1, p2) -> {
+            Vec2 s1 = p1.coord, s2 = p2.coord;
+            if(s1.y < s2.y){
+                return (-1);
+            }
+            if(s1.y > s2.y){
+                return (1);
+            }
+            return Float.compare(s1.x, s2.x);
+        });
+
+        deltay = ymax - ymin;
+        float deltax = xmax - xmin;
+
+        // Check bounding box inputs - if mins are bigger than maxes, swap them
+        float temp;
+        if(minX > maxX){
+            temp = minX;
+            minX = maxX;
+            maxX = temp;
+        }
+        if(minY > maxY){
+            temp = minY;
+            minY = maxY;
+            maxY = temp;
+        }
+        borderMinX = minX;
+        borderMinY = minY;
+        borderMaxX = maxX;
+        borderMaxY = maxY;
+
+        siteidx = 0;
+
+        PQcount = 0;
+        PQmin = 0;
+        PQhashsize = 4 * rtsites;
+        PQhash = new Halfedge[PQhashsize];
+
+        for(int i2 = 0; i2 < PQhashsize; i2 += 1){
+            PQhash[i2] = new Halfedge();
+        }
+        int i1;
+        ELhashsize = 2 * rtsites;
+        ELhash = new Halfedge[ELhashsize];
+
+        for(i1 = 0; i1 < ELhashsize; i1 += 1){
+            ELhash[i1] = null;
+        }
+        Halfedge ELleftend = newHe(null, 0);
+        Halfedge ELrightend = newHe(null, 0);
+        ELleftend.ELleft = null;
+        ELleftend.ELright = ELrightend;
+        ELrightend.ELleft = ELleftend;
+        ELrightend.ELright = null;
+        ELhash[0] = ELleftend;
+        ELhash[ELhashsize - 1] = ELrightend;
+
+        bottomsite = next();
+        Site newsite = next();
+        Halfedge lbnd;
+        Vec2 newintstar = null;
+        Edge e;
+        while(true){
+            if(PQcount != 0){
+                Vec2 answer = new Vec2();
+
+                while(PQhash[PQmin].PQnext == null){
+                    PQmin += 1;
+                }
+                answer.x = PQhash[PQmin].PQnext.vertex.coord.x;
+                answer.y = PQhash[PQmin].PQnext.ystar;
+                newintstar = (answer);
+            }
+
+            Halfedge rbnd;
+            Halfedge bisector;
+            Site p;
+            Site bot;
+
+            if(newsite != null && (PQcount == 0 || newsite.coord.y < newintstar.y || (newsite.coord.y == newintstar.y && newsite.coord.x < newintstar.x))){
+                int bucket = (int)(((newsite.coord).x - xmin) / deltax * ELhashsize);
+
+                if(bucket < 0){
+                    bucket = 0;
+                }
+                if(bucket >= ELhashsize){
+                    bucket = ELhashsize - 1;
+                }
+
+                Halfedge he = getHash(bucket);
+                if(he == null){
+                    for(int i = 1; i < ELhashsize; i += 1){
+                        if((he = getHash(bucket - i)) != null){
+                            break;
+                        }
+                        if((he = getHash(bucket + i)) != null){
+                            break;
+                        }
+                    }
+                }
+                if(he == ELleftend || (he != ELrightend && right(he, (newsite.coord)))){
+                    do{
+                        he = he.ELright;
+                    }while(he != ELrightend && right(he, (newsite.coord)));
+                    he = he.ELleft;
+                }else{
+                    do{
+                        he = he.ELleft;
+                    }while(he != ELleftend && !right(he, (newsite.coord)));
+                }
+
+                if(bucket > 0 && bucket < ELhashsize - 1){
+                    ELhash[bucket] = he;
+                }
+                lbnd = he;
+                rbnd = lbnd.ELright;
+
+                bot = rightreg(lbnd);
+                e = bisect(bot, newsite);
+
+                bisector = newHe(e, LE);
+                insert(lbnd, bisector);
+
+                if((p = intersect(lbnd, bisector)) != null){
+                    pqdelete(lbnd);
+                    pqinsert(lbnd, p, p.coord.dst(newsite.coord));
+                }
+                lbnd = bisector;
+                bisector = newHe(e, RE);
+                insert(lbnd, bisector);
+
+                if((p = intersect(bisector, rbnd)) != null){
+                    pqinsert(bisector, p, p.coord.dst(newsite.coord));
+                }
+                newsite = next();
+            }else if(!(PQcount == 0)){
+                Halfedge curr;
+
+                curr = PQhash[PQmin].PQnext;
+                PQhash[PQmin].PQnext = curr.PQnext;
+                PQcount -= 1;
+                lbnd = (curr);
+                Halfedge llbnd = lbnd.ELleft;
+                rbnd = lbnd.ELright;
+                Halfedge rrbnd = (rbnd.ELright);
+                bot = leftReg(lbnd);
+                Site top = rightreg(rbnd);
+
+                Site v = lbnd.vertex;
+                v.sitenbr = nvertices;
+                nvertices += 1;
+                endpoint(lbnd.ELedge, lbnd.ELpm, v);
+                endpoint(rbnd.ELedge, rbnd.ELpm, v);
+                delete(lbnd);
+                pqdelete(rbnd);
+                delete(rbnd);
+                int pm = LE;
+
+                if(bot.coord.y > top.coord.y){
+                    Site temp1 = bot;
+                    bot = top;
+                    top = temp1;
+                    pm = RE;
+                }
+
+                e = bisect(bot, top);
+                bisector = newHe(e, pm);
+                insert(llbnd, bisector);
+                endpoint(e, RE - pm, v);
+
+                if((p = intersect(llbnd, bisector)) != null){
+                    pqdelete(llbnd);
+                    pqinsert(llbnd, p, p.coord.dst(bot.coord));
+                }
+
+                if((p = intersect(bisector, rrbnd)) != null){
+                    pqinsert(bisector, p, p.coord.dst(bot.coord));
+                }
+            }else{
+                break;
+            }
+        }
+
+        for(lbnd = (ELleftend.ELright); lbnd != ELrightend; lbnd = (lbnd.ELright)){
+            e = lbnd.ELedge;
+            clipLine(e);
+        }
+
+        return allEdges;
+    }
+
+    private Site next(){
+        return siteidx < nsites ? sites[siteidx ++] : null;
+    }
+
+    private Edge bisect(Site s1, Site s2){
+        Edge newedge = new Edge();
+
+        // store the sites that this edge is bisecting
+        newedge.reg[0] = s1;
+        newedge.reg[1] = s2;
+        // to begin with, there are no endpoints on the bisector - it goes to
+        // infinity
+        newedge.ep[0] = null;
+        newedge.ep[1] = null;
+
+        // get the difference in x dist between the sites
+        float dx = s2.coord.x - s1.coord.x;
+        float dy = s2.coord.y - s1.coord.y;
+        // make sure that the difference in positive
+        float adx = dx > 0 ? dx : -dx;
+        float ady = dy > 0 ? dy : -dy;
+        newedge.c = s1.coord.x * dx + s1.coord.y * dy + (dx * dx + dy * dy) * 0.5f;// get the slope of the line
+
+        if(adx > ady){
+            newedge.a = 1.0f;
+            newedge.b = dy / dx;
+            newedge.c /= dx;// set formula of line, with x fixed to 1
+        }else{
+            newedge.b = 1.0f;
+            newedge.a = dx / dy;
+            newedge.c /= dy;// set formula of line, with y fixed to 1
+        }
+
+        newedge.edgenbr = nedges;
+
+        nedges += 1;
+        return newedge;
+    }
+
+    private int pqbucket(Halfedge he){
+        int bucket;
+
+        bucket = (int)((he.ystar - ymin) / deltay * PQhashsize);
+        if(bucket < 0){
+            bucket = 0;
+        }
+        if(bucket >= PQhashsize){
+            bucket = PQhashsize - 1;
+        }
+        if(bucket < PQmin){
+            PQmin = bucket;
+        }
+        return bucket;
+    }
+
+    // push the HalfEdge into the ordered linked list of vertices
+    private void pqinsert(Halfedge he, Site v, float offset){
+        Halfedge last, next;
+
+        he.vertex = v;
+        he.ystar = v.coord.y + offset;
+        last = PQhash[pqbucket(he)];
+        while((next = last.PQnext) != null
+        && (he.ystar > next.ystar || (he.ystar == next.ystar && v.coord.x > next.vertex.coord.x))){
+            last = next;
+        }
+        he.PQnext = last.PQnext;
+        last.PQnext = he;
+        PQcount += 1;
+    }
+
+    // remove the HalfEdge from the list of vertices
+    private void pqdelete(Halfedge he){
+        Halfedge last;
+
+        if(he.vertex != null){
+            last = PQhash[pqbucket(he)];
+            while(last.PQnext != he){
+                last = last.PQnext;
+            }
+
+            last.PQnext = he.PQnext;
+            PQcount -= 1;
+            he.vertex = null;
+        }
+    }
+
+    private Halfedge newHe(Edge e, int pm){
+        Halfedge answer = new Halfedge();
+        answer.ELedge = e;
+        answer.ELpm = pm;
+        answer.PQnext = null;
+        answer.vertex = null;
+        return answer;
+    }
+
+    private Site leftReg(Halfedge he){
+        if(he.ELedge == null){
+            return bottomsite;
+        }
+        return he.ELpm == LE ? he.ELedge.reg[LE] : he.ELedge.reg[RE];
+    }
+
+    private void insert(Halfedge lb, Halfedge newHe){
+        newHe.ELleft = lb;
+        newHe.ELright = lb.ELright;
+        lb.ELright.ELleft = newHe;
+        lb.ELright = newHe;
+    }
+
+    /*
+     * This delete routine can't reclaim node, since pointers from hash table
+     * may be present.
+     */
+    private void delete(Halfedge he){
+        he.ELleft.ELright = he.ELright;
+        he.ELright.ELleft = he.ELleft;
+        he.deleted = true;
+    }
+
+    /* Get entry from hash table, pruning any deleted nodes */
+    private Halfedge getHash(int b){
+        Halfedge he;
+
+        if(b < 0 || b >= ELhashsize){
+            return (null);
+        }
+        he = ELhash[b];
+        if(he == null || !he.deleted){
+            return (he);
+        }
+
+        /* Hash table points to deleted half edge. Patch as necessary. */
+        ELhash[b] = null;
+        return (null);
+    }
+
+    private void clipLine(Edge e){
+        float pxmin, pxmax, pymin, pymax;
+        Site s1, s2;
+        float x1, x2, y1, y2;
+
+        x1 = e.reg[0].coord.x;
+        x2 = e.reg[1].coord.x;
+        y1 = e.reg[0].coord.y;
+        y2 = e.reg[1].coord.y;
+
+        // if the distance between the two points this line was created from is
+        // less than the square root of 2, then ignore it
+        if(Math.sqrt(((x2 - x1) * (x2 - x1)) + ((y2 - y1) * (y2 - y1))) < minDistanceBetweenSites){
+            return;
+        }
+        pxmin = borderMinX;
+        pxmax = borderMaxX;
+        pymin = borderMinY;
+        pymax = borderMaxY;
+
+        if(e.a == 1.0 && e.b >= 0.0){
+            s1 = e.ep[1];
+            s2 = e.ep[0];
+        }else{
+            s1 = e.ep[0];
+            s2 = e.ep[1];
+        }
+
+        if(e.a == 1.0){
+            y1 = pymin;
+            if(s1 != null && s1.coord.y > pymin){
+                y1 = s1.coord.y;
+            }
+            if(y1 > pymax){
+                y1 = pymax;
+            }
+            x1 = e.c - e.b * y1;
+            y2 = pymax;
+            if(s2 != null && s2.coord.y < pymax){
+                y2 = s2.coord.y;
+            }
+
+            if(y2 < pymin){
+                y2 = pymin;
+            }
+            x2 = (e.c) - (e.b) * y2;
+            if(((x1 > pxmax) & (x2 > pxmax)) | ((x1 < pxmin) & (x2 < pxmin))){
+                return;
+            }
+            if(x1 > pxmax){
+                x1 = pxmax;
+                y1 = (e.c - x1) / e.b;
+            }
+            if(x1 < pxmin){
+                x1 = pxmin;
+                y1 = (e.c - x1) / e.b;
+            }
+            if(x2 > pxmax){
+                x2 = pxmax;
+                y2 = (e.c - x2) / e.b;
+            }
+            if(x2 < pxmin){
+                x2 = pxmin;
+                y2 = (e.c - x2) / e.b;
+            }
+        }else{
+            x1 = pxmin;
+            if(s1 != null && s1.coord.x > pxmin){
+                x1 = s1.coord.x;
+            }
+            if(x1 > pxmax){
+                x1 = pxmax;
+            }
+            y1 = e.c - e.a * x1;
+            x2 = pxmax;
+            if(s2 != null && s2.coord.x < pxmax){
+                x2 = s2.coord.x;
+            }
+            if(x2 < pxmin){
+                x2 = pxmin;
+            }
+            y2 = e.c - e.a * x2;
+            if(((y1 > pymax) & (y2 > pymax)) | ((y1 < pymin) & (y2 < pymin))){
+                return;
+            }
+            if(y1 > pymax){
+                y1 = pymax;
+                x1 = (e.c - y1) / e.a;
+            }
+            if(y1 < pymin){
+                y1 = pymin;
+                x1 = (e.c - y1) / e.a;
+            }
+            if(y2 > pymax){
+                y2 = pymax;
+                x2 = (e.c - y2) / e.a;
+            }
+            if(y2 < pymin){
+                y2 = pymin;
+                x2 = (e.c - y2) / e.a;
+            }
+        }
+
+        GraphEdge newEdge = new GraphEdge();
+        allEdges.add(newEdge);
+        newEdge.x1 = x1;
+        newEdge.y1 = y1;
+        newEdge.x2 = x2;
+        newEdge.y2 = y2;
+
+        newEdge.site1 = e.reg[0].sitenbr;
+        newEdge.site2 = e.reg[1].sitenbr;
+    }
+
+    private void endpoint(Edge e, int lr, Site s){
+        e.ep[lr] = s;
+        if(e.ep[RE - lr] == null){
+            return;
+        }
+        clipLine(e);
+    }
+
+    private boolean right(Halfedge el, Vec2 p){
+        Edge e = el.ELedge;
+        Site topsite = e.reg[1];
+        boolean rightOf = p.x > topsite.coord.x;
+        if(rightOf && el.ELpm == LE){
+            return true;
+        }
+        if(!rightOf && el.ELpm == RE){
+            return false;
+        }
+
+        boolean above;
+        if(e.a == 1.0){
+            float dyp = p.y - topsite.coord.y;
+            float dxp = p.x - topsite.coord.x;
+            boolean fast = false;
+            if((!rightOf & (e.b < 0.0)) | (rightOf & (e.b >= 0.0))){
+                above = dyp >= e.b * dxp;
+                fast = above;
+            }else{
+                above = p.x + p.y * e.b > e.c;
+                if(e.b < 0.0){
+                    above = !above;
+                }
+                if(!above){
+                    fast = true;
+                }
+            }
+            if(!fast){
+                float dxs = topsite.coord.x - (e.reg[0]).coord.x;
+                above = e.b * (dxp * dxp - dyp * dyp) < dxs * dyp
+                * (1.0 + 2.0 * dxp / dxs + e.b * e.b);
+                if(e.b < 0.0){
+                    above = !above;
+                }
+            }
+        }else{
+            float yl = e.c - e.a * p.x;
+            float t1 = p.y - yl;
+            float t2 = p.x - topsite.coord.x;
+            float t3 = yl - topsite.coord.y;
+            above = t1 * t1 > t2 * t2 + t3 * t3;
+        }
+        return ((el.ELpm == LE) == above);
+    }
+
+    private Site rightreg(Halfedge he){
+        if(he.ELedge == null) return bottomsite;
+
+        return (he.ELpm == LE ? he.ELedge.reg[RE] : he.ELedge.reg[LE]);
+    }
+
+    private Site intersect(Halfedge el1, Halfedge el2){
+        Edge e1, e2, e;
+        Halfedge el;
+        float d, xint, yint;
+        boolean right_of_site;
+        Site v;
+
+        e1 = el1.ELedge;
+        e2 = el2.ELedge;
+        if(e1 == null || e2 == null){
+            return null;
+        }
+
+        if(e1.reg[1] == e2.reg[1]){
+            return null;
+        }
+
+        d = e1.a * e2.b - e1.b * e2.a;
+        if(-1.0e-10 < d && d < 1.0e-10){
+            return null;
+        }
+
+        xint = (e1.c * e2.b - e2.c * e1.b) / d;
+        yint = (e2.c * e1.a - e1.c * e2.a) / d;
+
+        if((e1.reg[1].coord.y < e2.reg[1].coord.y)
+        || (e1.reg[1].coord.y == e2.reg[1].coord.y && e1.reg[1].coord.x < e2.reg[1].coord.x)){
+            el = el1;
+            e = e1;
+        }else{
+            el = el2;
+            e = e2;
+        }
+
+        right_of_site = xint >= e.reg[1].coord.x;
+        if((right_of_site && el.ELpm == LE)
+        || (!right_of_site && el.ELpm == RE)){
+            return null;
+        }
+
+        v = new Site();
+        v.coord.x = xint;
+        v.coord.y = yint;
+        return (v);
+    }
+
+    static class Site{
+        Vec2 coord = new Vec2();
+        int sitenbr;
+    }
+
+    static class Halfedge{
+        Halfedge ELleft, ELright;
+        Edge ELedge;
+        boolean deleted;
+        int ELpm;
+        Site vertex;
+        float ystar;
+        Halfedge PQnext;
+    }
+
+    public static class GraphEdge{
+        public float x1, y1, x2, y2;
+
+        public int site1, site2;
+    }
+
+    static class Edge{
+        float a = 0, b = 0, c = 0;
+        Site[] ep = new Site[2];
+        Site[] reg = new Site[2];
+        int edgenbr;
+    }
+}
diff --git a/core/src/mindustry/graphics/g3d/GenericMesh.java b/core/src/mindustry/graphics/g3d/GenericMesh.java
new file mode 100644
index 0000000000..d4198f5d9a
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/GenericMesh.java
@@ -0,0 +1,7 @@
+package mindustry.graphics.g3d;
+
+import arc.math.geom.*;
+
+public interface GenericMesh{
+    void render(PlanetParams params, Mat3D projection, Mat3D transform);
+}
diff --git a/core/src/mindustry/graphics/g3d/HexMesh.java b/core/src/mindustry/graphics/g3d/HexMesh.java
index e3ba7b9f27..bf5af1366e 100644
--- a/core/src/mindustry/graphics/g3d/HexMesh.java
+++ b/core/src/mindustry/graphics/g3d/HexMesh.java
@@ -15,8 +15,12 @@ public class HexMesh extends PlanetMesh{
         super(planet, MeshBuilder.buildHex(mesher, divisions, false, planet.radius, 0.2f), shader);
     }
 
+    public HexMesh(){
+    }
+
     @Override
-    public void preRender(){
+    public void preRender(PlanetParams params){
+        Shaders.planet.planet = planet;
         Shaders.planet.lightDir.set(planet.solarSystem.position).sub(planet.position).rotate(Vec3.Y, planet.getRotation()).nor();
         Shaders.planet.ambientColor.set(planet.solarSystem.lightColor);
     }
diff --git a/core/src/mindustry/graphics/g3d/HexMesher.java b/core/src/mindustry/graphics/g3d/HexMesher.java
index 459c414b89..034f324b09 100644
--- a/core/src/mindustry/graphics/g3d/HexMesher.java
+++ b/core/src/mindustry/graphics/g3d/HexMesher.java
@@ -7,4 +7,7 @@ import arc.math.geom.*;
 public interface HexMesher{
     float getHeight(Vec3 position);
     Color getColor(Vec3 position);
+    default boolean skip(Vec3 position){
+        return false;
+    }
 }
diff --git a/core/src/mindustry/graphics/g3d/HexSkyMesh.java b/core/src/mindustry/graphics/g3d/HexSkyMesh.java
new file mode 100644
index 0000000000..434e22818f
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/HexSkyMesh.java
@@ -0,0 +1,64 @@
+package mindustry.graphics.g3d;
+
+import arc.graphics.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.noise.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+
+public class HexSkyMesh extends PlanetMesh{
+    static Mat3D mat = new Mat3D();
+
+    public float speed = 0f;
+
+    public HexSkyMesh(Planet planet, int seed, float speed, float radius, int divisions, Color color, int octaves, float persistence, float scl, float thresh){
+        super(planet, MeshBuilder.buildHex(new HexMesher(){
+            @Override
+            public float getHeight(Vec3 position){
+                return 1f;
+            }
+
+            @Override
+            public Color getColor(Vec3 position){
+                return color;
+            }
+
+            @Override
+            public boolean skip(Vec3 position){
+                return Simplex.noise3d(7 + seed, octaves, persistence, scl, position.x, position.y * 3f, position.z) >= thresh;
+            }
+        }, divisions, false, planet.radius, radius), Shaders.clouds);
+
+        this.speed = speed;
+    }
+
+    public HexSkyMesh(){
+    }
+
+    public float relRot(){
+        return Time.globalTime * speed / 40f;
+    }
+
+    @Override
+    public void render(PlanetParams params, Mat3D projection, Mat3D transform){
+        //don't waste performance rendering 0-alpha clouds
+        if(params.planet == planet && Mathf.zero(1f - params.uiAlpha, 0.01f)) return;
+
+        preRender(params);
+        shader.bind();
+        shader.setUniformMatrix4("u_proj", projection.val);
+        shader.setUniformMatrix4("u_trans", mat.setToTranslation(planet.position).rotate(Vec3.Y, planet.getRotation() + relRot()).val);
+        shader.apply();
+        mesh.render(shader, Gl.triangles);
+    }
+
+    @Override
+    public void preRender(PlanetParams params){
+        Shaders.clouds.planet = planet;
+        Shaders.clouds.lightDir.set(planet.solarSystem.position).sub(planet.position).rotate(Vec3.Y, planet.getRotation() + relRot()).nor();
+        Shaders.clouds.ambientColor.set(planet.solarSystem.lightColor);
+        Shaders.clouds.alpha = params.planet == planet ? 1f - params.uiAlpha : 1f;
+    }
+}
diff --git a/core/src/mindustry/graphics/g3d/MatMesh.java b/core/src/mindustry/graphics/g3d/MatMesh.java
new file mode 100644
index 0000000000..5fd064dfda
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/MatMesh.java
@@ -0,0 +1,22 @@
+package mindustry.graphics.g3d;
+
+import arc.math.geom.*;
+
+//TODO maybe this is a bad idea
+/** A GenericMesh that wraps and applies an additional transform to a generic mesh. */
+public class MatMesh implements GenericMesh{
+    private static final Mat3D tmp = new Mat3D();
+
+    GenericMesh mesh;
+    Mat3D mat;
+
+    public MatMesh(GenericMesh mesh, Mat3D mat){
+        this.mesh = mesh;
+        this.mat = mat;
+    }
+
+    @Override
+    public void render(PlanetParams params, Mat3D projection, Mat3D transform){
+        mesh.render(params, projection, tmp.set(transform).mul(mat));
+    }
+}
diff --git a/core/src/mindustry/graphics/g3d/MeshBuilder.java b/core/src/mindustry/graphics/g3d/MeshBuilder.java
index 89668e2858..6bc0688552 100644
--- a/core/src/mindustry/graphics/g3d/MeshBuilder.java
+++ b/core/src/mindustry/graphics/g3d/MeshBuilder.java
@@ -1,10 +1,9 @@
 package mindustry.graphics.g3d;
 
 import arc.graphics.*;
-import arc.graphics.VertexAttributes.*;
-import arc.graphics.gl.*;
 import arc.math.geom.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
+import mindustry.maps.generators.*;
 
 public class MeshBuilder{
     private static final Vec3 v1 = new Vec3(), v2 = new Vec3(), v3 = new Vec3(), v4 = new Vec3();
@@ -12,7 +11,7 @@ public class MeshBuilder{
     private static Mesh mesh;
 
     public static Mesh buildIcosphere(int divisions, float radius, Color color){
-        begin(20 * (2 << (2 * divisions - 1)) * 7 * 3);
+        begin(20 * (2 << (2 * divisions - 1)) * 3);
 
         MeshResult result = Icosphere.create(divisions);
         for(int i = 0; i < result.indices.size; i+= 3){
@@ -30,6 +29,27 @@ public class MeshBuilder{
         return buildIcosphere(divisions, radius, Color.white);
     }
 
+    public static Mesh buildPlanetGrid(PlanetGrid grid, Color color, float scale){
+        int total = 0;
+        for(Ptile tile : grid.tiles){
+            total += tile.corners.length * 2;
+        }
+
+        begin(total);
+        for(Ptile tile : grid.tiles){
+            Corner[] c = tile.corners;
+            for(int i = 0; i < c.length; i++){
+                Vec3 a = v1.set(c[i].v).scl(scale);
+                Vec3 b = v2.set(c[(i + 1) % c.length].v).scl(scale);
+
+                vert(a, Vec3.Z, color);
+                vert(b, Vec3.Z, color);
+            }
+        }
+
+        return end();
+    }
+
     public static Mesh buildHex(Color color, int divisions, boolean lines, float radius){
         return buildHex(new HexMesher(){
             @Override
@@ -47,9 +67,16 @@ public class MeshBuilder{
     public static Mesh buildHex(HexMesher mesher, int divisions, boolean lines, float radius, float intensity){
         PlanetGrid grid = PlanetGrid.create(divisions);
 
-        begin(grid.tiles.length * 12 * (3 + 3 + 1));
+        if(mesher instanceof PlanetGenerator generator){
+            generator.seed = generator.baseSeed;
+        }
+
+        begin(grid.tiles.length * 12);
 
         for(Ptile tile : grid.tiles){
+            if(mesher.skip(tile.v)){
+                continue;
+            }
 
             Corner[] c = tile.corners;
 
@@ -92,12 +119,12 @@ public class MeshBuilder{
 
     private static void begin(int count){
         mesh = new Mesh(true, count, 0,
-        new VertexAttribute(Usage.position, 3, Shader.positionAttribute),
-        new VertexAttribute(Usage.normal, 3, Shader.normalAttribute),
-        new VertexAttribute(Usage.colorPacked, 4, Shader.colorAttribute)
+        VertexAttribute.position3,
+        VertexAttribute.normal,
+        VertexAttribute.color
         );
 
-        mesh.getVerticesBuffer().limit(mesh.getMaxVertices());
+        mesh.getVerticesBuffer().limit(mesh.getVerticesBuffer().capacity());
         mesh.getVerticesBuffer().position(0);
     }
 
diff --git a/core/src/mindustry/graphics/g3d/MultiMesh.java b/core/src/mindustry/graphics/g3d/MultiMesh.java
new file mode 100644
index 0000000000..2512a5f172
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/MultiMesh.java
@@ -0,0 +1,18 @@
+package mindustry.graphics.g3d;
+
+import arc.math.geom.*;
+
+public class MultiMesh implements GenericMesh{
+    GenericMesh[] meshes;
+
+    public MultiMesh(GenericMesh... meshes){
+        this.meshes = meshes;
+    }
+
+    @Override
+    public void render(PlanetParams params, Mat3D projection, Mat3D transform){
+        for(var v : meshes){
+            v.render(params, projection, transform);
+        }
+    }
+}
diff --git a/core/src/mindustry/graphics/g3d/NoiseMesh.java b/core/src/mindustry/graphics/g3d/NoiseMesh.java
new file mode 100644
index 0000000000..88709c4021
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/NoiseMesh.java
@@ -0,0 +1,43 @@
+package mindustry.graphics.g3d;
+
+import arc.graphics.*;
+import arc.math.geom.*;
+import arc.util.noise.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+
+public class NoiseMesh extends HexMesh{
+
+    public NoiseMesh(Planet planet, int seed, int divisions, Color color, float radius, int octaves, float persistence, float scale, float mag){
+        this.planet = planet;
+        this.shader = Shaders.planet;
+        this.mesh = MeshBuilder.buildHex(new HexMesher(){
+            @Override
+            public float getHeight(Vec3 position){
+                return Simplex.noise3d(7 + seed, octaves, persistence, scale, 5f + position.x, 5f + position.y, 5f + position.z) * mag;
+            }
+
+            @Override
+            public Color getColor(Vec3 position){
+                return color;
+            }
+        }, divisions, false, radius, 0.2f);
+    }
+
+    /** Two-color variant. */
+    public NoiseMesh(Planet planet, int seed, int divisions, float radius, int octaves, float persistence, float scale, float mag, Color color1, Color color2, int coct, float cper, float cscl, float cthresh){
+        this.planet = planet;
+        this.shader = Shaders.planet;
+        this.mesh = MeshBuilder.buildHex(new HexMesher(){
+            @Override
+            public float getHeight(Vec3 position){
+                return Simplex.noise3d(7 + seed, octaves, persistence, scale, 5f + position.x, 5f + position.y, 5f + position.z) * mag;
+            }
+
+            @Override
+            public Color getColor(Vec3 position){
+                return Simplex.noise3d(8 + seed, coct, cper, cscl, 5f + position.x, 5f + position.y, 5f + position.z) > cthresh ? color2 : color1;
+            }
+        }, divisions, false, radius, 0.2f);
+    }
+}
diff --git a/core/src/mindustry/graphics/g3d/PlanetGrid.java b/core/src/mindustry/graphics/g3d/PlanetGrid.java
index 9b72970087..993ca34c25 100644
--- a/core/src/mindustry/graphics/g3d/PlanetGrid.java
+++ b/core/src/mindustry/graphics/g3d/PlanetGrid.java
@@ -221,6 +221,8 @@ public class PlanetGrid{
     }
 
     public static class Ptile{
+        public static final Ptile empty = new Ptile(0, 0);
+
         public int id;
         public int edgeCount;
 
diff --git a/core/src/mindustry/graphics/g3d/PlanetMesh.java b/core/src/mindustry/graphics/g3d/PlanetMesh.java
index 23e7966d33..321cd85e31 100644
--- a/core/src/mindustry/graphics/g3d/PlanetMesh.java
+++ b/core/src/mindustry/graphics/g3d/PlanetMesh.java
@@ -3,14 +3,13 @@ package mindustry.graphics.g3d;
 import arc.graphics.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
-import arc.util.*;
 import mindustry.type.*;
 
 /** Defines a mesh that is rendered for a planet. Subclasses provide a mesh and a shader. */
-public abstract class PlanetMesh implements Disposable{
-    protected final Mesh mesh;
-    protected final Planet planet;
-    protected final Shader shader;
+public abstract class PlanetMesh implements GenericMesh{
+    protected Mesh mesh;
+    protected Planet planet;
+    protected Shader shader;
 
     public PlanetMesh(Planet planet, Mesh mesh, Shader shader){
         this.planet = planet;
@@ -18,20 +17,20 @@ public abstract class PlanetMesh implements Disposable{
         this.shader = shader;
     }
 
-    /** Should be overridden to set up any shader parameters such as planet position, normals, etc. */
-    public abstract void preRender();
+    public PlanetMesh(){}
 
-    public void render(Mat3D projection, Mat3D transform){
-        preRender();
+    /** Should be overridden to set up any shader parameters such as planet position, normals, etc. */
+    public void preRender(PlanetParams params){
+
+    }
+
+    @Override
+    public void render(PlanetParams params, Mat3D projection, Mat3D transform){
+        preRender(params);
         shader.bind();
         shader.setUniformMatrix4("u_proj", projection.val);
         shader.setUniformMatrix4("u_trans", transform.val);
         shader.apply();
         mesh.render(shader, Gl.triangles);
     }
-
-    @Override
-    public void dispose(){
-        mesh.dispose();
-    }
 }
diff --git a/core/src/mindustry/graphics/g3d/PlanetParams.java b/core/src/mindustry/graphics/g3d/PlanetParams.java
new file mode 100644
index 0000000000..6c7d2e6dc3
--- /dev/null
+++ b/core/src/mindustry/graphics/g3d/PlanetParams.java
@@ -0,0 +1,41 @@
+package mindustry.graphics.g3d;
+
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.graphics.g3d.PlanetRenderer.*;
+import mindustry.type.*;
+
+/** Parameters for rendering a solar system. */
+public class PlanetParams{
+    /** Camera direction relative to the planet. Length is determined by zoom. */
+    public Vec3 camPos = new Vec3(0f, 0f, 4f);
+    /** If not null, this is the position of the "previous" planet for smooth camera movement. */
+    public @Nullable Vec3 otherCamPos;
+    /** Interpolation value for otherCamPos. */
+    public float otherCamAlpha = 0f;
+    /** Camera up vector. */
+    public Vec3 camUp = new Vec3(0f, 1f, 0f);
+    /** the unit length direction vector of the camera **/
+    public Vec3 camDir = new Vec3(0, 0, -1);
+    /** The sun/main planet of the solar system from which everything is rendered. Deprecated use planet.solarSystem instead */
+    public @Deprecated Planet solarSystem = Planets.sun;
+    /** Planet being looked at. */
+    public Planet planet = Planets.serpulo;
+
+    /** Zoom relative to planet. */
+    public float zoom = 1f;
+    /** Alpha of orbit rings and other UI elements. */
+    public float uiAlpha = 1f;
+    /** If false, orbit and sector grid are not drawn. */
+    public boolean drawUi = false;
+    /** If true, a space skybox is drawn. */
+    public boolean drawSkybox = true;
+
+    /** Handles drawing details. */
+    public @Nullable transient PlanetInterfaceRenderer renderer;
+    /** Viewport size. <=0 to use screen size. Do not change in rules. */
+    public transient int viewW = -1, viewH = -1;
+    /** If true, atmosphere will be drawn regardless of player options. */
+    public transient boolean alwaysDrawAtmosphere = false;
+}
diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java
index 7e84e7a8bb..3593f53957 100644
--- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java
+++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java
@@ -4,15 +4,11 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.g3d.*;
-import arc.graphics.gl.*;
 import arc.math.*;
 import arc.math.geom.*;
-import arc.struct.*;
 import arc.util.*;
-import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.graphics.*;
-import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.type.*;
 
 public class PlanetRenderer implements Disposable{
@@ -23,27 +19,13 @@ public class PlanetRenderer implements Disposable{
     borderColor = Pal.accent.cpy().a(0.3f),
     shadowColor = new Color(0, 0, 0, 0.7f);
 
-    private static final Seq<Vec3> points = new Seq<>();
-
-    /** Camera direction relative to the planet. Length is determined by zoom. */
-    public final Vec3 camPos = new Vec3();
-    /** 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.serpulo;
     /** Camera used for rendering. */
-    public Camera3D cam = new Camera3D();
+    public final Camera3D cam = new Camera3D();
     /** Raw vertex batch. */
     public final VertexBatch3D batch = new VertexBatch3D(20000, false, true, 0);
 
-    public float zoom = 1f;
-    public float orbitAlpha = 1f;
-
-    private final Mesh[] outlines = new Mesh[10];
     public final PlaneBatch3D projector = new PlaneBatch3D();
     public final Mat3D mat = new Mat3D();
-    public final FrameBuffer buffer = new FrameBuffer(2, 2, true);
-    public PlanetInterfaceRenderer irenderer;
 
     public final Bloom bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false){{
         setThreshold(0.8f);
@@ -55,16 +37,13 @@ public class PlanetRenderer implements Disposable{
     public final CubemapMesh skybox = new CubemapMesh(new Cubemap("cubemaps/stars/"));
 
     public PlanetRenderer(){
-        camPos.set(0, 0f, camLength);
         projector.setScaling(1f / 150f);
         cam.fov = 60f;
         cam.far = 150f;
     }
 
     /** Render the entire planet scene to the screen. */
-    public void render(PlanetInterfaceRenderer irenderer){
-        this.irenderer = irenderer;
-
+    public void render(PlanetParams params){
         Draw.flush();
         Gl.clear(Gl.depthBufferBit);
         Gl.enable(Gl.depthTest);
@@ -73,45 +52,69 @@ public class PlanetRenderer implements Disposable{
         Gl.enable(Gl.cullFace);
         Gl.cullFace(Gl.back);
 
+        int w = params.viewW <= 0 ? Core.graphics.getWidth() : params.viewW;
+        int h = params.viewH <= 0 ? Core.graphics.getHeight() : params.viewH;
+
+        bloom.blending = !params.drawSkybox;
+
         //lock to up vector so it doesn't get confusing
         cam.up.set(Vec3.Y);
 
-        cam.resize(Core.graphics.getWidth(), Core.graphics.getHeight());
-        camPos.setLength(planet.radius * camLength + (zoom-1f) * planet.radius * 2);
-        cam.position.set(planet.position).add(camPos);
-        cam.lookAt(planet.position);
+        cam.resize(w, h);
+        params.camPos.setLength((params.planet.radius + params.planet.camRadius) * camLength + (params.zoom-1f) * (params.planet.radius + params.planet.camRadius) * 2);
+
+        if(params.otherCamPos != null){
+            cam.position.set(params.otherCamPos).lerp(params.planet.position, params.otherCamAlpha).add(params.camPos);
+        }else{
+            cam.position.set(params.planet.position).add(params.camPos);
+        }
+        //cam.up.set(params.camUp); //TODO broken
+        cam.lookAt(params.planet.position);
         cam.update();
+        //write back once it changes.
+        params.camUp.set(cam.up);
+        params.camDir.set(cam.direction);
 
         projector.proj(cam.combined);
         batch.proj(cam.combined);
 
         Events.fire(Trigger.universeDrawBegin);
 
-        beginBloom();
+        //begin bloom
+        bloom.resize(w, h);
+        bloom.capture();
 
-        //render skybox at 0,0,0
-        Vec3 lastPos = Tmp.v31.set(cam.position);
-        cam.position.setZero();
-        cam.update();
+        if(params.drawSkybox){
+            //render skybox at 0,0,0
+            Vec3 lastPos = Tmp.v31.set(cam.position);
+            cam.position.setZero();
+            cam.update();
 
-        skybox.render(cam.combined);
+            Gl.depthMask(false);
 
-        cam.position.set(lastPos);
-        cam.update();
+            skybox.render(cam.combined);
+
+            Gl.depthMask(true);
+
+            cam.position.set(lastPos);
+            cam.update();
+        }
 
         Events.fire(Trigger.universeDraw);
 
-        renderPlanet(solarSystem);
+        Planet solarSystem = params.planet.solarSystem;
+        renderPlanet(solarSystem, params);
+        renderTransparent(solarSystem, params);
 
-        renderTransparent(solarSystem);
-
-        endBloom();
+        bloom.render();
 
         Events.fire(Trigger.universeDrawEnd);
 
         Gl.enable(Gl.blend);
 
-        irenderer.renderProjections(planet);
+        if(params.renderer != null){
+            params.renderer.renderProjections(params.planet);
+        }
 
         Gl.disable(Gl.cullFace);
         Gl.disable(Gl.depthTest);
@@ -119,134 +122,74 @@ public class PlanetRenderer implements Disposable{
         cam.update();
     }
 
-    public void beginBloom(){
-        bloom.resize(Core.graphics.getWidth() / 4, Core.graphics.getHeight() / 4);
-        bloom.capture();
-    }
-
-    public void endBloom(){
-        bloom.render();
-    }
-
-
-    public void renderPlanet(Planet planet){
+    public void renderPlanet(Planet planet, PlanetParams params){
         if(!planet.visible()) return;
 
-        //render planet at offsetted position in the world
-        planet.draw(cam.combined, planet.getTransform(mat));
+        cam.update();
 
-        renderOrbit(planet);
-
-        for(Planet child : planet.children){
-            renderPlanet(child);
-        }
-    }
-
-    public void renderTransparent(Planet planet){
-        if(!planet.visible()) return;
-
-        if(planet.isLandable() && planet == this.planet){
-            renderSectors(planet);
-        }
-
-        if(planet.parent != null && planet.hasAtmosphere && Core.settings.getBool("atmosphere")){
-            Gl.depthMask(false);
-
-            Blending.additive.apply();
-
-            Shaders.atmosphere.camera = cam;
-            Shaders.atmosphere.planet = planet;
-            Shaders.atmosphere.bind();
-            Shaders.atmosphere.apply();
-
-            atmosphere.render(Shaders.atmosphere, Gl.triangles);
-
-            Blending.normal.apply();
-
-            Gl.depthMask(true);
+        if(cam.frustum.containsSphere(planet.position, planet.clipRadius)){
+            //render planet at offsetted position in the world
+            planet.draw(params, cam.combined, planet.getTransform(mat));
         }
 
         for(Planet child : planet.children){
-            renderTransparent(child);
+            renderPlanet(child, params);
         }
     }
 
-    public void renderOrbit(Planet planet){
-        if(planet.parent == null || !planet.visible()) return;
+    public void renderTransparent(Planet planet, PlanetParams params){
+        if(!planet.visible()) return;
+
+        planet.drawClouds(params, cam.combined, planet.getTransform(mat));
+
+        if(planet.hasGrid() && planet == params.planet && params.drawUi){
+            renderSectors(planet, params);
+        }
+
+        if(cam.frustum.containsSphere(planet.position, planet.clipRadius) && planet.parent != null && planet.hasAtmosphere && (params.alwaysDrawAtmosphere || Core.settings.getBool("atmosphere"))){
+            planet.drawAtmosphere(atmosphere, cam);
+        }
+
+        for(Planet child : planet.children){
+            renderTransparent(child, params);
+        }
+
+        batch.proj(cam.combined);
+
+        if(params.drawUi){
+            renderOrbit(planet, params);
+        }
+    }
+
+    public void renderOrbit(Planet planet, PlanetParams params){
+        if(planet.parent == null || !planet.visible() || params.uiAlpha <= 0.02f || !planet.drawOrbit) return;
 
         Vec3 center = planet.parent.position;
         float radius = planet.orbitRadius;
         int points = (int)(radius * 10);
-        Angles.circleVectors(points, radius, (cx, cy) -> batch.vertex(Tmp.v32.set(center).add(cx, 0, cy), Pal.gray.write(Tmp.c1).a(orbitAlpha)));
+        Angles.circleVectors(points, radius, (cx, cy) -> batch.vertex(Tmp.v32.set(center).add(cx, 0, cy), Pal.gray.write(Tmp.c1).a(params.uiAlpha)));
         batch.flush(Gl.lineLoop);
     }
 
-    public void renderSectors(Planet planet){
-        //apply transformed position
-        batch.proj().mul(planet.getTransform(mat));
-
-        irenderer.renderSectors(planet);
-
-        //render sector grid
-        Mesh mesh = outline(planet.grid.size);
-        Shader shader = Shaders.planetGrid;
-        Vec3 tile = planet.intersect(cam.getMouseRay(), outlineRad);
-        Shaders.planetGrid.mouse.lerp(tile == null ? Vec3.Zero : tile.sub(planet.position).rotate(Vec3.Y, planet.getRotation()), 0.2f);
-
-        shader.bind();
-        shader.setUniformMatrix4("u_proj", cam.combined.val);
-        shader.setUniformMatrix4("u_trans", planet.getTransform(mat).val);
-        shader.apply();
-        mesh.render(shader, Gl.lines);
+    public void renderSectors(Planet planet, PlanetParams params){
+        if(params.uiAlpha <= 0.02f) return;
+        planet.renderSectors(batch, cam, params);
     }
 
     public void drawArc(Planet planet, Vec3 a, Vec3 b){
         drawArc(planet, a, b, Pal.accent, Color.clear, 1f);
     }
+
     public void drawArc(Planet planet, Vec3 a, Vec3 b, Color from, Color to, float length){
         drawArc(planet, a, b, from, to, length, 80f, 25);
     }
 
     public void drawArc(Planet planet, Vec3 a, Vec3 b, Color from, Color to, float length, float timeScale, int pointCount){
-        Vec3 avg = Tmp.v31.set(b).add(a).scl(0.5f);
-        avg.setLength(planet.radius*(1f+length));
-
-        points.clear();
-        points.addAll(Tmp.v33.set(b).setLength(outlineRad), Tmp.v31, Tmp.v34.set(a).setLength(outlineRad));
-        Tmp.bz3.set(points);
-
-        for(int i = 0; i < pointCount + 1; i++){
-            float f = i / (float)pointCount;
-            Tmp.c1.set(from).lerp(to, (f+ Time.globalTime /timeScale)%1f);
-            batch.color(Tmp.c1);
-            batch.vertex(Tmp.bz3.valueAt(Tmp.v32, f));
-
-        }
-        batch.flush(Gl.lineStrip);
+        planet.drawArc(batch, a, b, from, to, length, timeScale, pointCount);
     }
 
-    public void drawBorders(Sector sector, Color base){
-        Color color = Tmp.c1.set(base).a(base.a + 0.3f + Mathf.absin(Time.globalTime, 5f, 0.3f));
-
-        float r1 = 1f;
-        float r2 = outlineRad + 0.001f;
-
-        for(int i = 0; i < sector.tile.corners.length; i++){
-            Corner c = sector.tile.corners[i], next = sector.tile.corners[(i+1) % sector.tile.corners.length];
-
-            Tmp.v31.set(c.v).setLength(r2);
-            Tmp.v32.set(next.v).setLength(r2);
-            Tmp.v33.set(c.v).setLength(r1);
-
-            batch.tri2(Tmp.v31, Tmp.v32, Tmp.v33, color);
-
-            Tmp.v31.set(next.v).setLength(r2);
-            Tmp.v32.set(next.v).setLength(r1);
-            Tmp.v33.set(c.v).setLength(r1);
-
-            batch.tri2(Tmp.v31, Tmp.v32, Tmp.v33, color);
-        }
-
+    public void drawBorders(Sector sector, Color base, float alpha){
+        sector.planet.drawBorders(batch, sector, base, alpha);
         if(batch.getNumVertices() >= batch.getMaxVertices() - 6 * 6){
             batch.flush(Gl.triangles);
         }
@@ -260,69 +203,19 @@ public class PlanetRenderer implements Disposable{
     }
 
     public void setPlane(Sector sector){
-        float rotation = -planet.getRotation();
-        float length = 0.01f;
-
-        projector.setPlane(
-        //origin on sector position
-        Tmp.v33.set(sector.tile.v).setLength(outlineRad + length).rotate(Vec3.Y, rotation).add(planet.position),
-        //face up
-        sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor(),
-        //right vector
-        Tmp.v31.set(Tmp.v32).rotate(Vec3.Y, -rotation).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor()
-        );
+        sector.planet.setPlane(sector, projector);
     }
 
     public void fill(Sector sector, Color color, float offset){
-        float rr = outlineRad + offset;
-        for(int i = 0; i < sector.tile.corners.length; i++){
-            Corner c = sector.tile.corners[i], next = sector.tile.corners[(i+1) % sector.tile.corners.length];
-            batch.tri(Tmp.v31.set(c.v).setLength(rr), Tmp.v32.set(next.v).setLength(rr), Tmp.v33.set(sector.tile.v).setLength(rr), color);
-        }
+        sector.planet.fill(batch, sector, color, offset);
     }
 
-    public void drawSelection(Sector sector){
-        drawSelection(sector, Pal.accent, 0.04f, 0.001f);
+    public void drawSelection(Sector sector, float alpha){
+        drawSelection(sector, Tmp.c1.set(Pal.accent).a(alpha), 0.04f, 0.001f);
     }
 
     public void drawSelection(Sector sector, Color color, float stroke, float length){
-        float arad = outlineRad + length;
-
-        for(int i = 0; i < sector.tile.corners.length; i++){
-            Corner next = sector.tile.corners[(i + 1) % sector.tile.corners.length];
-            Corner curr = sector.tile.corners[i];
-
-            next.v.scl(arad);
-            curr.v.scl(arad);
-            sector.tile.v.scl(arad);
-
-            Tmp.v31.set(curr.v).sub(sector.tile.v).setLength(curr.v.dst(sector.tile.v) - stroke).add(sector.tile.v);
-            Tmp.v32.set(next.v).sub(sector.tile.v).setLength(next.v.dst(sector.tile.v) - stroke).add(sector.tile.v);
-
-            batch.tri(curr.v, next.v, Tmp.v31, color);
-            batch.tri(Tmp.v31, next.v, Tmp.v32, color);
-
-            sector.tile.v.scl(1f / arad);
-            next.v.scl(1f / arad);
-            curr.v.scl(1f /arad);
-        }
-    }
-
-    public Mesh outline(int size){
-        if(outlines[size] == null){
-            outlines[size] = MeshBuilder.buildHex(new HexMesher(){
-                @Override
-                public float getHeight(Vec3 position){
-                    return 0;
-                }
-
-                @Override
-                public Color getColor(Vec3 position){
-                    return outlineColor;
-                }
-            }, size, true, outlineRad, 0.2f);
-        }
-        return outlines[size];
+        sector.planet.drawSelection(batch, sector, color, stroke, length);
     }
 
     @Override
@@ -331,13 +224,7 @@ public class PlanetRenderer implements Disposable{
         batch.dispose();
         projector.dispose();
         atmosphere.dispose();
-        buffer.dispose();
         bloom.dispose();
-        for(Mesh m : outlines){
-            if(m != null){
-                m.dispose();
-            }
-        }
     }
 
     public interface PlanetInterfaceRenderer{
diff --git a/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java b/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java
index e70dd07c29..b7529229f6 100644
--- a/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java
+++ b/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java
@@ -8,9 +8,4 @@ public class ShaderSphereMesh extends PlanetMesh{
     public ShaderSphereMesh(Planet planet, Shader shader, int divisions){
         super(planet, MeshBuilder.buildIcosphere(divisions, planet.radius), shader);
     }
-
-    @Override
-    public void preRender(){
-
-    }
 }
diff --git a/core/src/mindustry/graphics/g3d/SunMesh.java b/core/src/mindustry/graphics/g3d/SunMesh.java
index bef0761d5f..b858303e39 100644
--- a/core/src/mindustry/graphics/g3d/SunMesh.java
+++ b/core/src/mindustry/graphics/g3d/SunMesh.java
@@ -12,7 +12,6 @@ public class SunMesh extends HexMesh{
 
     public SunMesh(Planet planet, int divisions, double octaves, double persistence, double scl, double pow, double mag, float colorScale, Color... colors){
         super(planet, new HexMesher(){
-            Simplex sim = new Simplex();
 
             @Override
             public float getHeight(Vec3 position){
@@ -21,14 +20,9 @@ public class SunMesh extends HexMesh{
 
             @Override
             public Color getColor(Vec3 position){
-                double height = Math.pow(sim.octaveNoise3D(octaves, persistence, scl, position.x, position.y, position.z), pow) * mag;
+                double height = Math.pow(Simplex.noise3d(0, octaves, persistence, scl, position.x, position.y, position.z), pow) * mag;
                 return Tmp.c1.set(colors[Mathf.clamp((int)(height * colors.length), 0, colors.length - 1)]).mul(colorScale);
             }
         }, divisions, Shaders.unlit);
     }
-
-    @Override
-    public void preRender(){
-        //do absolutely nothing
-    }
 }
diff --git a/core/src/mindustry/input/Binding.java b/core/src/mindustry/input/Binding.java
index 6291012259..d5c52930d3 100644
--- a/core/src/mindustry/input/Binding.java
+++ b/core/src/mindustry/input/Binding.java
@@ -1,9 +1,9 @@
 package mindustry.input;
 
-import arc.*;
 import arc.KeyBinds.*;
 import arc.input.InputDevice.*;
 import arc.input.*;
+import mindustry.*;
 
 public enum Binding implements KeyBind{
     move_x(new Axis(KeyCode.a, KeyCode.d), "general"),
@@ -12,8 +12,8 @@ public enum Binding implements KeyBind{
     pan(KeyCode.mouseForward),
 
     boost(KeyCode.shiftLeft),
-    control(KeyCode.controlLeft),
     respawn(KeyCode.v),
+    control(KeyCode.controlLeft),
     select(KeyCode.mouseLeft),
     deselect(KeyCode.mouseRight),
     break_block(KeyCode.mouseRight),
@@ -21,8 +21,6 @@ public enum Binding implements KeyBind{
     pickupCargo(KeyCode.leftBracket),
     dropCargo(KeyCode.rightBracket),
 
-    command(KeyCode.g),
-
     clear_building(KeyCode.q),
     pause_building(KeyCode.e),
     rotate(new Axis(KeyCode.scroll)),
@@ -30,11 +28,40 @@ public enum Binding implements KeyBind{
     diagonal_placement(KeyCode.controlLeft),
     pick(KeyCode.mouseMiddle),
 
+    rebuild_select(KeyCode.b),
     schematic_select(KeyCode.f),
     schematic_flip_x(KeyCode.z),
     schematic_flip_y(KeyCode.x),
     schematic_menu(KeyCode.t),
 
+
+    command_mode(KeyCode.shiftLeft, "command"),
+    command_queue(KeyCode.mouseMiddle),
+    create_control_group(KeyCode.controlLeft),
+
+    select_all_units(KeyCode.g),
+    select_all_unit_factories(KeyCode.h),
+
+    cancel_orders(KeyCode.unset),
+
+    unit_stance_shoot(KeyCode.unset),
+    unit_stance_hold_fire(KeyCode.unset),
+    unit_stance_pursue_target(KeyCode.unset),
+    unit_stance_patrol(KeyCode.unset),
+    unit_stance_ram(KeyCode.unset),
+
+    unit_command_move(KeyCode.unset),
+    unit_command_repair(KeyCode.unset),
+    unit_command_rebuild(KeyCode.unset),
+    unit_command_assist(KeyCode.unset),
+    unit_command_mine(KeyCode.unset),
+    unit_command_boost(KeyCode.unset),
+    unit_command_enter_payload(KeyCode.unset),
+    unit_command_load_units(KeyCode.unset),
+    unit_command_load_blocks(KeyCode.unset),
+    unit_command_unload_payload(KeyCode.unset),
+    unit_command_loop_payload(KeyCode.unset),
+
     category_prev(KeyCode.comma, "blocks"),
     category_next(KeyCode.period),
 
@@ -54,12 +81,14 @@ public enum Binding implements KeyBind{
     block_select_10(KeyCode.num0),
 
     zoom(new Axis(KeyCode.scroll), "view"),
-    menu(Core.app.isAndroid() ? KeyCode.back : KeyCode.escape),
+    detach_camera(KeyCode.unset),
+    menu(Vars.android ? KeyCode.back : KeyCode.escape),
     fullscreen(KeyCode.f11),
     pause(KeyCode.space),
     minimap(KeyCode.m),
-    research(KeyCode.b),
+    research(KeyCode.j),
     planet_map(KeyCode.n),
+    block_info(KeyCode.f1),
     toggle_menus(KeyCode.c),
     screenshot(KeyCode.p),
     toggle_power_lines(KeyCode.f5),
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index 801ffdbbd8..0ec79e1ab6 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -3,13 +3,15 @@ package mindustry.input;
 import arc.*;
 import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.input.KeyCode.*;
 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 mindustry.*;
 import mindustry.core.*;
@@ -21,8 +23,8 @@ import mindustry.graphics.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 
+import static arc.Core.camera;
 import static arc.Core.*;
-import static mindustry.Vars.net;
 import static mindustry.Vars.*;
 import static mindustry.input.PlaceMode.*;
 
@@ -38,47 +40,60 @@ public class DesktopInput extends InputHandler{
     public PlaceMode mode;
     /** Animation scale for line. */
     public float selectScale;
-    /** Selected build request for movement. */
-    public @Nullable BuildPlan sreq;
-    /** Whether player is currently deleting removal requests. */
+    /** Selected build plan for movement. */
+    public @Nullable BuildPlan splan;
+    /** Whether player is currently deleting removal plans. */
     public boolean deleting = false, shouldShoot = false, panning = false;
     /** Mouse pan speed. */
-    public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 11f;
+    public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 15f;
+    /** Delta time between consecutive clicks. */
+    public long selectMillis = 0;
+    /** Previously selected tile. */
+    public Tile prevSelected;
+
+    /** Most recently selected control group by index */
+    public int lastCtrlGroup;
+    /** Time of most recent control group selection */
+    public long lastCtrlGroupSelectMillis;
+
+    private float buildPlanMouseOffsetX, buildPlanMouseOffsetY;
+
+    boolean showHint(){
+        return ui.hudfrag.shown && Core.settings.getBool("hints") && selectPlans.isEmpty() && !player.dead() &&
+            (!isBuilding && !Core.settings.getBool("buildautopause") || player.unit().isBuilding() || !player.dead() && !player.unit().spawnedByCore());
+    }
 
     @Override
     public void buildUI(Group group){
-        //respawn hints
+        //building and respawn hints
         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.color.a = 0f;
+            t.visible(() -> (t.color.a = Mathf.lerpDelta(t.color.a, Mathf.num(showHint()), 0.15f)) > 0.001f);
             t.bottom();
             t.table(Styles.black6, b -> {
+                StringBuilder str = new StringBuilder();
                 b.defaults().left();
-                b.label(() -> Core.bundle.format("respawn", Core.keybinds.get(Binding.respawn).key.toString())).style(Styles.outlineLabel);
-            }).margin(6f);
-        });
-
-        //building hints
-        group.fill(t -> {
-            t.bottom();
-            t.visible(() -> {
-                t.color.a = Mathf.lerpDelta(t.color.a, player.unit().isBuilding() ? 1f : 0f, 0.15f);
-
-                return ui.hudfrag.shown && Core.settings.getBool("hints") && selectRequests.isEmpty() && t.color.a > 0.01f;
-            });
-            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);
-                b.row();
-                b.label(() -> Core.bundle.format("cancelbuilding", Core.keybinds.get(Binding.clear_building).key.toString())).style(Styles.outlineLabel);
-                b.row();
-                b.label(() -> Core.bundle.format("selectschematic", Core.keybinds.get(Binding.schematic_select).key.toString())).style(Styles.outlineLabel);
+                b.label(() -> {
+                    if(!showHint()) return str;
+                    str.setLength(0);
+                    if(!isBuilding && !Core.settings.getBool("buildautopause") && !player.unit().isBuilding()){
+                        str.append(Core.bundle.format("enablebuilding", Core.keybinds.get(Binding.pause_building).key.toString()));
+                    }else if(player.unit().isBuilding()){
+                        str.append(Core.bundle.format(isBuilding ? "pausebuilding" : "resumebuilding", Core.keybinds.get(Binding.pause_building).key.toString()))
+                            .append("\n").append(Core.bundle.format("cancelbuilding", Core.keybinds.get(Binding.clear_building).key.toString()))
+                            .append("\n").append(Core.bundle.format("selectschematic", Core.keybinds.get(Binding.schematic_select).key.toString()));
+                    }
+                    if(!player.dead() && !player.unit().spawnedByCore()){
+                        str.append(str.length() != 0 ? "\n" : "").append(Core.bundle.format("respawn", Core.keybinds.get(Binding.respawn).key.toString()));
+                    }
+                    return str;
+                }).style(Styles.outlineLabel);
             }).margin(10f);
         });
 
         //schematic controls
         group.fill(t -> {
-            t.visible(() -> ui.hudfrag.shown && lastSchematic != null && !selectRequests.isEmpty());
+            t.visible(() -> ui.hudfrag.shown && lastSchematic != null && !selectPlans.isEmpty());
             t.bottom();
             t.table(Styles.black6, b -> {
                 b.defaults().left();
@@ -95,17 +110,26 @@ public class DesktopInput extends InputHandler{
 
     @Override
     public void drawTop(){
+        if(cursorType != SystemCursor.arrow && scene.hasMouse()){
+           graphics.cursor(cursorType = SystemCursor.arrow);
+        }
+
         Lines.stroke(1f);
         int cursorX = tileX(Core.input.mouseX());
         int cursorY = tileY(Core.input.mouseY());
 
         //draw break selection
         if(mode == breaking){
-            drawBreakSelection(selectX, selectY, cursorX, cursorY, !Core.input.keyDown(Binding.schematic_select) ? maxLength : Vars.maxSchematicSize);
+            drawBreakSelection(selectX, selectY, cursorX, cursorY, !(Core.input.keyDown(Binding.schematic_select) && schemX != -1 && schemY != -1) ? maxLength : Vars.maxSchematicSize, false);
         }
 
-        if(Core.input.keyDown(Binding.schematic_select) && !Core.scene.hasKeyboard() && mode != breaking){
-            drawSelection(schemX, schemY, cursorX, cursorY, Vars.maxSchematicSize);
+        if(!Core.scene.hasKeyboard() && mode != breaking){
+
+            if(Core.input.keyDown(Binding.schematic_select) && schemX != -1 && schemY != -1){
+                drawSelection(schemX, schemY, cursorX, cursorY, Vars.maxSchematicSize);
+            }else if(Core.input.keyDown(Binding.rebuild_select)){
+                drawRebuildSelection(schemX, schemY, cursorX, cursorY);
+            }
         }
 
         Draw.reset();
@@ -116,59 +140,74 @@ public class DesktopInput extends InputHandler{
         int cursorX = tileX(Core.input.mouseX());
         int cursorY = tileY(Core.input.mouseY());
 
-        //draw request being moved
-        if(sreq != null){
-            boolean valid = validPlace(sreq.x, sreq.y, sreq.block, sreq.rotation, sreq);
-            if(sreq.block.rotate){
-                drawArrow(sreq.block, sreq.x, sreq.y, sreq.rotation, valid);
+        //draw plan being moved
+        if(splan != null){
+            boolean valid = validPlace(splan.x, splan.y, splan.block, splan.rotation, splan);
+            if(splan.block.rotate && splan.block.drawArrow){
+                drawArrow(splan.block, splan.x, splan.y, splan.rotation, valid);
             }
 
-            sreq.block.drawPlan(sreq, allRequests(), valid);
+            splan.block.drawPlan(splan, allPlans(), valid);
 
-            drawSelected(sreq.x, sreq.y, sreq.block, getRequest(sreq.x, sreq.y, sreq.block.size, sreq) != null ? Pal.remove : Pal.accent);
+            drawSelected(splan.x, splan.y, splan.block, getPlan(splan.x, splan.y, splan.block.size, splan) != null ? Pal.remove : Pal.accent);
         }
 
-        //draw hover request
+        //draw hover plans
         if(mode == none && !isPlacing()){
-            BuildPlan req = getRequest(cursorX, cursorY);
-            if(req != null){
-                drawSelected(req.x, req.y, req.breaking ? req.tile().block() : req.block, Pal.accent);
+            var plan = getPlan(cursorX, cursorY);
+            if(plan != null){
+                drawSelected(plan.x, plan.y, plan.breaking ? plan.tile().block() : plan.block, Pal.accent);
             }
         }
 
-        //draw schematic requests
-        selectRequests.each(req -> {
-            req.animScale = 1f;
-            drawRequest(req);
-        });
+        var items = selectPlans.items;
+        int size = selectPlans.size;
 
-        selectRequests.each(this::drawOverRequest);
+        //draw schematic plans
+        for(int i = 0; i < size; i++){
+            var plan = items[i];
+            plan.animScale = 1f;
+            drawPlan(plan);
+        }
+
+        //draw schematic plans - over version, cached results
+        for(int i = 0; i < size; i++){
+            var plan = items[i];
+            //use cached value from previous invocation
+            drawOverPlan(plan, plan.cachedValid);
+        }
 
         if(player.isBuilder()){
             //draw things that may be placed soon
             if(mode == placing && block != null){
-                for(int i = 0; i < lineRequests.size; i++){
-                    BuildPlan req = lineRequests.get(i);
-                    if(i == lineRequests.size - 1 && req.block.rotate){
-                        drawArrow(block, req.x, req.y, req.rotation);
+                for(int i = 0; i < linePlans.size; i++){
+                    var plan = linePlans.get(i);
+                    if(i == linePlans.size - 1 && plan.block.rotate && plan.block.drawArrow){
+                        drawArrow(block, plan.x, plan.y, plan.rotation);
                     }
-                    drawRequest(lineRequests.get(i));
+                    drawPlan(linePlans.get(i));
                 }
-                lineRequests.each(this::drawOverRequest);
+                linePlans.each(this::drawOverPlan);
             }else if(isPlacing()){
-                if(block.rotate){
-                    drawArrow(block, cursorX, cursorY, rotation);
+                int rot = block == null ? rotation : block.planRotation(rotation);
+                if(block.rotate && block.drawArrow){
+                    drawArrow(block, cursorX, cursorY, rot);
                 }
                 Draw.color();
-                drawRequest(cursorX, cursorY, block, rotation);
-                block.drawPlace(cursorX, cursorY, rotation, validPlace(cursorX, cursorY, block, rotation));
+                boolean valid = validPlace(cursorX, cursorY, block, rot);
+                drawPlan(cursorX, cursorY, block, rot);
+                block.drawPlace(cursorX, cursorY, rot, valid);
 
-                if(block.saveConfig && block.lastConfig != null){
-                    brequest.set(cursorX, cursorY, rotation, block);
-                    brequest.config = block.lastConfig;
-                    block.drawRequestConfig(brequest, allRequests());
-                    brequest.config = null;
+                if(block.saveConfig){
+                    Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f));
+                    bplan.set(cursorX, cursorY, rot, block);
+                    bplan.config = block.lastConfig;
+                    block.drawPlanConfig(bplan, allPlans());
+                    bplan.config = null;
+                    Draw.reset();
                 }
+
+                drawOverlapCheck(block, cursorX, cursorY, valid);
             }
         }
 
@@ -183,53 +222,180 @@ public class DesktopInput extends InputHandler{
             ui.listfrag.toggle();
         }
 
+        boolean locked = locked();
         boolean panCam = false;
         float camSpeed = (!Core.input.keyDown(Binding.boost) ? panSpeed : panBoostSpeed) * Time.delta;
+        boolean detached = settings.getBool("detach-camera", false);
 
-        if(input.keyDown(Binding.pan) && !scene.hasField() && !scene.hasDialog()){
-            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;
+        if(!scene.hasField() && !scene.hasDialog()){
+            if(input.keyTap(Binding.detach_camera)){
+                settings.put("detach-camera", detached = !detached);
+                if(!detached){
+                    panning = false;
+                }
+                spectating = null;
             }
-            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);
+            if(input.keyDown(Binding.pan)){
+                panCam = true;
+                panning = true;
+                spectating = null;
+            }
+
+            if((Math.abs(Core.input.axis(Binding.move_x)) > 0 || Math.abs(Core.input.axis(Binding.move_y)) > 0 || input.keyDown(Binding.mouse_move))){
+                panning = false;
+                spectating = null;
+            }
         }
 
-        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;
+        panning |= detached;
+
+
+        if(!locked){
+            if(((player.dead() || state.isPaused() || detached) && !ui.chatfrag.shown()) && !scene.hasField() && !scene.hasDialog()){
+                if(input.keyDown(Binding.mouse_move)){
+                    panCam = true;
+                }
+
+                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() || spectating != null) && !panning){
+                //TODO do not pan
+                Team corePanTeam = state.won ? state.rules.waveTeam : player.team();
+                Position coreTarget = state.gameOver && !state.rules.pvp && corePanTeam.data().lastCore != null ? corePanTeam.data().lastCore : null;
+                Position panTarget = coreTarget != null ? coreTarget : spectating != null ? spectating : player;
+
+                Core.camera.position.lerpDelta(panTarget, Core.settings.getBool("smoothcamera") ? 0.08f : 1f);
+            }
+
+            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();
+        shouldShoot = !scene.hasMouse() && !locked;
 
-        if(!scene.hasMouse()){
-            if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){
-                Unit on = selectedUnit();
-                if(on != null){
-                    Call.unitControl(player, on);
-                    shouldShoot = false;
+        if(!locked && block == null && !scene.hasField() && !scene.hasDialog() &&
+                //disable command mode when player unit can boost and command mode binding is the same
+                !(!player.dead() && player.unit().type.canBoost && keybinds.get(Binding.command_mode).key == keybinds.get(Binding.boost).key)){
+            if(settings.getBool("commandmodehold")){
+                commandMode = input.keyDown(Binding.command_mode);
+            }else if(input.keyTap(Binding.command_mode)){
+                commandMode = !commandMode;
+            }
+        }else{
+            commandMode = false;
+        }
+
+        //validate commanding units
+        selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid() || u.team != player.team());
+
+        if(commandMode && !scene.hasField() && !scene.hasDialog()){
+            if(input.keyTap(Binding.select_all_units)){
+                selectedUnits.clear();
+                commandBuildings.clear();
+                for(var unit : player.team().data().units){
+                    if(unit.isCommandable()){
+                        selectedUnits.add(unit);
+                    }
+                }
+            }
+
+            if(input.keyTap(Binding.select_all_unit_factories)){
+                selectedUnits.clear();
+                commandBuildings.clear();
+                for(var build : player.team().data().buildings){
+                    if(build.block.commandable){
+                        commandBuildings.add(build);
+                    }
+                }
+            }
+
+            for(int i = 0; i < controlGroupBindings.length; i++){
+                if(input.keyTap(controlGroupBindings[i])){
+
+                    //create control group if it doesn't exist yet
+                    if(controlGroups[i] == null) controlGroups[i] = new IntSeq();
+
+                    IntSeq group = controlGroups[i];
+                    boolean creating = input.keyDown(Binding.create_control_group);
+
+                    //clear existing if making a new control group
+                    //if any of the control group edit buttons are pressed take the current selection
+                    if(creating){
+                        group.clear();
+
+                        IntSeq selectedUnitIds = selectedUnits.mapInt(u -> u.id);
+                        if(Core.settings.getBool("distinctcontrolgroups", true)){
+                            for(IntSeq cg : controlGroups){
+                                if(cg != null){
+                                    cg.removeAll(selectedUnitIds);
+                                }
+                            }
+                        }
+                        group.addAll(selectedUnitIds);
+                    }
+
+                    //remove invalid units
+                    for(int j = 0; j < group.size; j++){
+                        Unit u = Groups.unit.getByID(group.get(j));
+                        if(u == null || !u.isCommandable() || !u.isValid()){
+                            group.removeIndex(j);
+                            j --;
+                        }
+                    }
+
+                    //replace the selected units with the current control group
+                    if(!group.isEmpty() && !creating){
+                        selectedUnits.clear();
+                        commandBuildings.clear();
+
+                        group.each(id -> {
+                            var unit = Groups.unit.getByID(id);
+                            if(unit != null){
+                                selectedUnits.addAll(unit);
+                            }
+                        });
+
+                        //double tap to center camera
+                        if(lastCtrlGroup == i && Time.timeSinceMillis(lastCtrlGroupSelectMillis) < 400){
+                            float totalX = 0, totalY = 0;
+                            for(Unit unit : selectedUnits){
+                                totalX += unit.x;
+                                totalY += unit.y;
+                            }
+                            panning = true;
+                            Core.camera.position.set(totalX / selectedUnits.size, totalY / selectedUnits.size);
+                        }
+                        lastCtrlGroup = i;
+                        lastCtrlGroupSelectMillis = Time.millis();
+                    }
                 }
             }
         }
 
-        if(!player.dead() && !state.isPaused() && !(Core.scene.getKeyboardFocus() instanceof TextField)){
+        if(!scene.hasMouse() && !locked && state.rules.possessionAllowed){
+            if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){
+                Unit on = selectedUnit();
+                var build = selectedControlBuild();
+                if(on != null){
+                    Call.unitControl(player, on);
+                    shouldShoot = false;
+                    recentRespawnTimer = 1f;
+                }else if(build != null){
+                    Call.buildingControlSelect(player, build);
+                    recentRespawnTimer = 1f;
+                }
+            }
+        }
+
+        if(!player.dead() && !state.isPaused() && !scene.hasField() && !locked){
             updateMovement(player.unit());
 
-            if(Core.input.keyDown(Binding.respawn) && !player.unit().spawnedByCore() && !scene.hasField()){
-                Call.unitClear(player);
+            if(Core.input.keyTap(Binding.respawn)){
                 controlledType = null;
+                recentRespawnTimer = 1f;
+                Call.unitClear(player);
             }
         }
 
@@ -237,7 +403,7 @@ public class DesktopInput extends InputHandler{
             player.shooting = false;
         }
 
-        if(state.isGame() && !scene.hasDialog() && !(scene.getKeyboardFocus() instanceof TextField)){
+        if(state.isGame() && !scene.hasDialog() && !scene.hasField()){
             if(Core.input.keyTap(Binding.minimap)) ui.minimapfrag.toggle();
             if(Core.input.keyTap(Binding.planet_map) && state.isCampaign()) ui.planet.toggle();
             if(Core.input.keyTap(Binding.research) && state.isCampaign()) ui.research.toggle();
@@ -246,13 +412,24 @@ public class DesktopInput extends InputHandler{
         if(state.isMenu() || Core.scene.hasDialog()) return;
 
         //zoom camera
-        if((!Core.scene.hasScroll() || Core.input.keyDown(Binding.diagonal_placement)) && !ui.chatfrag.shown() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0
-            && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!isPlacing() || !block.rotate) && selectRequests.isEmpty()))){
+        if((!Core.scene.hasScroll() || Core.input.keyDown(Binding.diagonal_placement)) && !ui.chatfrag.shown() && !ui.consolefrag.shown() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0
+            && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) ||
+                !keybinds.get(Binding.zoom).equals(keybinds.get(Binding.rotate)) || ((!player.isBuilder() || !isPlacing() || !block.rotate) && selectPlans.isEmpty()))){
             renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
         }
 
-        if(player.dead()){
+        if(Core.input.keyTap(Binding.select) && !Core.scene.hasMouse()){
+            Tile selected = world.tileWorld(input.mouseWorldX(), input.mouseWorldY());
+            if(selected != null){
+                Call.tileTap(player, selected);
+            }
+        }
+
+        if(player.dead() || locked){
             cursorType = SystemCursor.arrow;
+            if(!Core.scene.hasMouse()){
+                Core.graphics.cursor(cursorType);
+            }
             return;
         }
 
@@ -277,25 +454,31 @@ public class DesktopInput extends InputHandler{
         if(!Core.input.keyDown(Binding.diagonal_placement) && Math.abs((int)Core.input.axisTap(Binding.rotate)) > 0){
             rotation = Mathf.mod(rotation + (int)Core.input.axisTap(Binding.rotate), 4);
 
-            if(sreq != null){
-                sreq.rotation = Mathf.mod(sreq.rotation + (int)Core.input.axisTap(Binding.rotate), 4);
+            if(splan != null){
+                splan.rotation = Mathf.mod(splan.rotation + (int)Core.input.axisTap(Binding.rotate), 4);
             }
 
             if(isPlacing() && mode == placing){
                 updateLine(selectX, selectY);
-            }else if(!selectRequests.isEmpty() && !ui.chatfrag.shown()){
-                rotateRequests(selectRequests, Mathf.sign(Core.input.axisTap(Binding.rotate)));
+            }else if(!selectPlans.isEmpty() && !ui.chatfrag.shown()){
+                rotatePlans(selectPlans, Mathf.sign(Core.input.axisTap(Binding.rotate)));
             }
         }
 
         Tile cursor = tileAt(Core.input.mouseX(), Core.input.mouseY());
 
+        cursorType = SystemCursor.arrow;
+
         if(cursor != null){
-            if(cursor.build != null){
+            if(cursor.build != null && cursor.build.interactable(player.team())){
                 cursorType = cursor.build.getCursor();
             }
 
-            if((isPlacing() && player.isBuilder()) || !selectRequests.isEmpty()){
+            if(canRepairDerelict(cursor)){
+                cursorType = ui.repairCursor;
+            }
+
+            if((isPlacing() && player.isBuilder()) || !selectPlans.isEmpty()){
                 cursorType = SystemCursor.hand;
             }
 
@@ -303,7 +486,26 @@ public class DesktopInput extends InputHandler{
                 cursorType = ui.drillCursor;
             }
 
-            if(getRequest(cursor.x, cursor.y) != null && mode == none){
+            if(commandMode && selectedUnits.any()){
+                boolean canAttack = (cursor.build != null && !cursor.build.inFogTo(player.team()) && cursor.build.team != player.team());
+
+                if(!canAttack){
+                    var unit = selectedEnemyUnit(input.mouseWorldX(), input.mouseWorldY());
+                    if(unit != null){
+                        canAttack = selectedUnits.contains(u -> u.canTarget(unit));
+                    }
+                }
+
+                if(canAttack){
+                    cursorType = ui.targetCursor;
+                }
+
+                if(input.keyTap(Binding.command_queue) && keybinds.get(Binding.command_queue).key.type != KeyType.mouse){
+                    commandTap(input.mouseX(), input.mouseY(), true);
+                }
+            }
+
+            if(getPlan(cursor.x, cursor.y) != null && mode == none){
                 cursorType = SystemCursor.hand;
             }
 
@@ -311,6 +513,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 && cursor.block().quickRotate){
                 Call.rotateBlock(player, cursor.build, Core.input.axisTap(Binding.rotate) > 0);
             }
@@ -318,9 +521,9 @@ public class DesktopInput extends InputHandler{
 
         if(!Core.scene.hasMouse()){
             Core.graphics.cursor(cursorType);
+        }else{
+            cursorType = SystemCursor.arrow;
         }
-
-        cursorType = SystemCursor.arrow;
     }
 
     @Override
@@ -329,8 +532,8 @@ public class DesktopInput extends InputHandler{
         schematicX = tileX(getMouseX());
         schematicY = tileY(getMouseY());
 
-        selectRequests.clear();
-        selectRequests.addAll(schematics.toRequests(schem, schematicX, schematicY));
+        selectPlans.clear();
+        selectPlans.addAll(schematics.toPlans(schem, schematicX, schematicY));
         mode = none;
     }
 
@@ -341,45 +544,43 @@ public class DesktopInput extends InputHandler{
 
     @Override
     public void buildPlacementUI(Table table){
-        table.image().color(Pal.gray).height(4f).colspan(4).growX();
-        table.row();
         table.left().margin(0f).defaults().size(48f).left();
 
-        table.button(Icon.paste, Styles.clearPartiali, () -> {
+        table.button(Icon.paste, Styles.clearNonei, () -> {
             ui.schematics.show();
         }).tooltip("@schematics");
 
-        table.button(Icon.book, Styles.clearPartiali, () -> {
+        table.button(Icon.book, Styles.clearNonei, () -> {
             ui.database.show();
         }).tooltip("@database");
 
-        table.button(Icon.tree, Styles.clearPartiali, () -> {
+        table.button(Icon.tree, Styles.clearNonei, () -> {
             ui.research.show();
         }).visible(() -> state.isCampaign()).tooltip("@research");
 
-        table.button(Icon.map, Styles.clearPartiali, () -> {
+        table.button(Icon.map, Styles.clearNonei, () -> {
             ui.planet.show();
         }).visible(() -> state.isCampaign()).tooltip("@planetmap");
     }
 
     void pollInput(){
-        if(scene.getKeyboardFocus() instanceof TextField) return;
+        if(scene.hasField()) return;
 
         Tile selected = tileAt(Core.input.mouseX(), Core.input.mouseY());
         int cursorX = tileX(Core.input.mouseX());
         int cursorY = tileY(Core.input.mouseY());
         int rawCursorX = World.toTile(Core.input.mouseWorld().x), rawCursorY = World.toTile(Core.input.mouseWorld().y);
 
-        // automatically pause building if the current build queue is empty
+        //automatically pause building if the current build queue is empty
         if(Core.settings.getBool("buildautopause") && isBuilding && !player.unit().isBuilding()){
             isBuilding = false;
             buildWasAutoPaused = true;
         }
 
-        if(!selectRequests.isEmpty()){
+        if(!selectPlans.isEmpty()){
             int shiftX = rawCursorX - schematicX, shiftY = rawCursorY - schematicY;
 
-            selectRequests.each(s -> {
+            selectPlans.each(s -> {
                 s.x += shiftX;
                 s.y += shiftY;
             });
@@ -388,15 +589,15 @@ public class DesktopInput extends InputHandler{
             schematicY += shiftY;
         }
 
-        if(Core.input.keyTap(Binding.deselect) && !isPlacing()){
+        if(Core.input.keyTap(Binding.deselect) && !ui.minimapfrag.shown() && !isPlacing() && player.unit().plans.isEmpty() && !commandMode){
             player.unit().mineTile = null;
         }
 
-        if(Core.input.keyTap(Binding.clear_building)){
+        if(Core.input.keyTap(Binding.clear_building) && !player.dead()){
             player.unit().clearBuilding();
         }
 
-        if(Core.input.keyTap(Binding.schematic_select) && !Core.scene.hasKeyboard() && mode != breaking){
+        if((Core.input.keyTap(Binding.schematic_select) || Core.input.keyTap(Binding.rebuild_select)) && !Core.scene.hasKeyboard() && mode != breaking){
             schemX = rawCursorX;
             schemY = rawCursorY;
         }
@@ -411,39 +612,45 @@ public class DesktopInput extends InputHandler{
 
         if(Core.input.keyTap(Binding.clear_building) || isPlacing()){
             lastSchematic = null;
-            selectRequests.clear();
+            selectPlans.clear();
         }
 
-        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;
+        if(!Core.scene.hasKeyboard() && selectX == -1 && selectY == -1 && schemX != -1 && schemY != -1){
+            if(Core.input.keyRelease(Binding.schematic_select)){
+                lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY);
+                useSchematic(lastSchematic);
+                if(selectPlans.isEmpty()){
+                    lastSchematic = null;
+                }
+                schemX = -1;
+                schemY = -1;
+            }else if(input.keyRelease(Binding.rebuild_select)){
+
+                rebuildArea(schemX, schemY, rawCursorX, rawCursorY);
+                schemX = -1;
+                schemY = -1;
             }
-            schemX = -1;
-            schemY = -1;
         }
 
-        if(!selectRequests.isEmpty()){
+        if(!selectPlans.isEmpty()){
             if(Core.input.keyTap(Binding.schematic_flip_x)){
-                flipRequests(selectRequests, true);
+                flipPlans(selectPlans, true);
             }
 
             if(Core.input.keyTap(Binding.schematic_flip_y)){
-                flipRequests(selectRequests, false);
+                flipPlans(selectPlans, false);
             }
         }
 
-        if(sreq != null){
-            float offset = ((sreq.block.size + 2) % 2) * tilesize / 2f;
-            float x = Core.input.mouseWorld().x + offset;
-            float y = Core.input.mouseWorld().y + offset;
-            sreq.x = (int)(x / tilesize);
-            sreq.y = (int)(y / tilesize);
+        if(splan != null){
+            float x = Core.input.mouseWorld().x + buildPlanMouseOffsetX;
+            float y = Core.input.mouseWorld().y + buildPlanMouseOffsetY;
+            splan.x = Math.round(x / tilesize);
+            splan.y = Math.round(y / tilesize);
         }
 
         if(block == null || mode != placing){
-            lineRequests.clear();
+            linePlans.clear();
         }
 
         if(Core.input.keyTap(Binding.pause_building)){
@@ -461,17 +668,28 @@ public class DesktopInput extends InputHandler{
             lastLineY = cursorY;
         }
 
-        if(Core.input.keyTap(Binding.select) && !Core.scene.hasMouse()){
-            if(selected != null){
-                Call.tileTap(player, selected);
-            }
+        //select some units
+        if(Core.input.keyRelease(Binding.select) && commandRect){
+            selectUnitsRect();
+        }
 
-            BuildPlan req = getRequest(cursorX, cursorY);
+        if(Core.input.keyTap(Binding.select) && !Core.scene.hasMouse()){
+            tappedOne = false;
+            BuildPlan plan = getPlan(cursorX, cursorY);
+
+            if(plan != null){
+                //move selected to front
+                int index = player.unit().plans.indexOf(plan, true);
+                if(index != -1){
+                    player.unit().plans.removeIndex(index);
+                    player.unit().plans.addFirst(plan);
+                }
+            }
 
             if(Core.input.keyDown(Binding.break_block)){
                 mode = none;
-            }else if(!selectRequests.isEmpty()){
-                flushRequests(selectRequests);
+            }else if(!selectPlans.isEmpty()){
+                flushPlans(selectPlans);
             }else if(isPlacing()){
                 selectX = cursorX;
                 selectY = cursorY;
@@ -479,26 +697,34 @@ public class DesktopInput extends InputHandler{
                 lastLineY = cursorY;
                 mode = placing;
                 updateLine(selectX, selectY);
-            }else if(req != null && !req.breaking && mode == none && !req.initialized){
-                sreq = req;
-            }else if(req != null && req.breaking){
+            }else if(plan != null && !plan.breaking && mode == none && !plan.initialized && plan.progress <= 0f){
+                splan = plan;
+                buildPlanMouseOffsetX = splan.x * tilesize - Core.input.mouseWorld().x;
+                buildPlanMouseOffsetY = splan.y * tilesize - Core.input.mouseWorld().y;
+            }else if(plan != null && plan.breaking){
                 deleting = true;
-            }else if(selected != null){
+            }else if(commandMode){
+                commandRect = true;
+                commandRectX = input.mouseWorldX();
+                commandRectY = input.mouseWorldY();
+            }else if(!checkConfigTap() && selected != null && !tryRepairDerelict(selected)){
                 //only begin shooting if there's no cursor event
-                if(!tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && !tileTapped(selected.build) && !player.unit().activelyBuilding() && !droppingItem &&
-                    !tryBeginMine(selected) && player.unit().mineTile == null && !Core.scene.hasKeyboard()){
+                if(!tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && !tileTapped(selected.build) && !player.unit().activelyBuilding() && !droppingItem
+                    && !(tryStopMine(selected) || (!settings.getBool("doubletapmine") || selected == prevSelected && Time.timeSinceMillis(selectMillis) < 500) && tryBeginMine(selected)) && !Core.scene.hasKeyboard()){
                     player.shooting = shouldShoot;
                 }
             }else if(!Core.scene.hasKeyboard()){ //if it's out of bounds, shooting is just fine
                 player.shooting = shouldShoot;
             }
+            selectMillis = Time.millis();
+            prevSelected = selected;
         }else if(Core.input.keyTap(Binding.deselect) && isPlacing()){
             block = null;
             mode = none;
-        }else if(Core.input.keyTap(Binding.deselect) && !selectRequests.isEmpty()){
-            selectRequests.clear();
+        }else if(Core.input.keyTap(Binding.deselect) && !selectPlans.isEmpty()){
+            selectPlans.clear();
             lastSchematic = null;
-        }else if(Core.input.keyTap(Binding.break_block) && !Core.scene.hasMouse() && player.isBuilder()){
+        }else if(Core.input.keyTap(Binding.break_block) && !Core.scene.hasMouse() && player.isBuilder() && !commandMode){
             //is recalculated because setting the mode to breaking removes potential multiblock cursor offset
             deleting = false;
             mode = breaking;
@@ -509,9 +735,9 @@ public class DesktopInput extends InputHandler{
         }
 
         if(Core.input.keyDown(Binding.select) && mode == none && !isPlacing() && deleting){
-            BuildPlan req = getRequest(cursorX, cursorY);
-            if(req != null && req.breaking){
-                player.unit().plans().remove(req);
+            var plan = getPlan(cursorX, cursorY);
+            if(plan != null && plan.breaking){
+                player.unit().plans().remove(plan);
             }
         }else{
             deleting = false;
@@ -535,8 +761,13 @@ public class DesktopInput extends InputHandler{
         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
-                flushRequests(lineRequests);
-                lineRequests.clear();
+                if(input.keyDown(Binding.boost)){
+                    flushPlansReverse(linePlans);
+                }else{
+                    flushPlans(linePlans);
+                }
+
+                linePlans.clear();
                 Events.fire(new LineConfirmEvent());
             }else if(mode == breaking){ //touch up while breaking, break everything in selection
                 removeSelection(selectX, selectY, cursorX, cursorY, !Core.input.keyDown(Binding.schematic_select) ? maxLength : Vars.maxSchematicSize);
@@ -550,11 +781,20 @@ public class DesktopInput extends InputHandler{
 
             tryDropItems(selected == null ? null : selected.build, Core.input.mouseWorld().x, Core.input.mouseWorld().y);
 
-            if(sreq != null){
-                if(getRequest(sreq.x, sreq.y, sreq.block.size, sreq) != null){
-                    player.unit().plans().remove(sreq, true);
+            if(splan != null){
+                if(getPlan(splan.x, splan.y, splan.block.size, splan) != null){
+                    player.unit().plans().remove(splan, true);
                 }
-                sreq = null;
+
+                if(input.ctrl()){
+                    inv.hide();
+                    config.hideConfig();
+                    planConfig.showConfig(splan);
+                }else{
+                    planConfig.hide();
+                }
+
+                splan = null;
             }
 
             mode = none;
@@ -574,6 +814,40 @@ public class DesktopInput extends InputHandler{
         }
     }
 
+    @Override
+    public boolean tap(float x, float y, int count, KeyCode button){
+        if(scene.hasMouse() || !commandMode) return false;
+
+        tappedOne = true;
+
+        //click: select a single unit
+        if(button == KeyCode.mouseLeft){
+            if(count >= 2){
+                selectTypedUnits();
+            }else{
+                tapCommandUnit();
+            }
+
+        }
+
+        return super.tap(x, y, count, button);
+    }
+
+    @Override
+    public boolean touchDown(float x, float y, int pointer, KeyCode button){
+        if(scene.hasMouse() || !commandMode) return false;
+
+        if(button == KeyCode.mouseRight){
+            commandTap(x, y);
+        }
+
+        if(button == keybinds.get(Binding.command_queue).key){
+            commandTap(x, y, true);
+        }
+
+        return super.touchDown(x, y, pointer, button);
+    }
+
     @Override
     public boolean selectedBlock(){
         return isPlacing() && mode != breaking;
@@ -594,29 +868,49 @@ public class DesktopInput extends InputHandler{
         super.updateState();
 
         if(state.isMenu()){
+            lastSchematic = null;
             droppingItem = false;
             mode = none;
             block = null;
-            sreq = null;
-            selectRequests.clear();
+            splan = null;
+            selectPlans.clear();
+        }
+    }
+
+    @Override
+    public void panCamera(Vec2 position){
+        if(!locked()){
+            panning = true;
+            camera.position.set(position);
         }
     }
 
     protected void updateMovement(Unit unit){
         boolean omni = unit.type.omniMovement;
 
-        float speed = unit.realSpeed();
+        float speed = unit.speed();
         float xa = Core.input.axis(Binding.move_x);
         float ya = Core.input.axis(Binding.move_y);
         boolean boosted = (unit instanceof Mechc && unit.isFlying());
 
-        movement.set(xa, ya).nor().scl(speed);
-        if(Core.input.keyDown(Binding.mouse_move)){
-            movement.add(input.mouseWorld().sub(player).scl(1f / 25f * speed)).limit(speed);
+        if(settings.getBool("detach-camera")){
+            Vec2 targetPos = camera.position;
+
+            movement.set(targetPos).sub(player).limit(speed);
+
+            if(player.within(targetPos, 15f)){
+                movement.setZero();
+                unit.vel.approachDelta(Vec2.ZERO, unit.speed() * unit.type().accel / 2f);
+            }
+        }else{
+            movement.set(xa, ya).nor().scl(speed);
+            if(Core.input.keyDown(Binding.mouse_move)){
+                movement.add(input.mouseWorld().sub(player).scl(1f / 25f * speed)).limit(speed);
+            }
         }
 
         float mouseAngle = Angles.mouseAngle(unit.x, unit.y);
-        boolean aimCursor = omni && player.shooting && unit.type.hasWeapons() && unit.type.faceTarget && !boosted && unit.type.rotateShooting;
+        boolean aimCursor = omni && player.shooting && unit.type.hasWeapons() && unit.type.faceTarget && !boosted;
 
         if(aimCursor){
             unit.lookAt(mouseAngle);
@@ -624,19 +918,12 @@ public class DesktopInput extends InputHandler{
             unit.lookAt(unit.prefRotation());
         }
 
-        if(omni){
-            unit.moveAt(movement);
-        }else{
-            unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len()));
-            if(!movement.isZero()){
-                unit.vel.rotateTo(movement.angle(), unit.type.rotateSpeed * Math.max(Time.delta, 1));
-            }
-        }
+        unit.movePref(movement);
 
-        unit.aim(unit.type.faceTarget ? Core.input.mouseWorld() : Tmp.v1.trns(unit.rotation, Core.input.mouseWorld().dst(unit)).add(unit.x, unit.y));
+        unit.aim(Core.input.mouseWorld());
         unit.controlWeapons(true, player.shooting && !boosted);
 
-        player.boosting = Core.input.keyDown(Binding.boost) && !movement.isZero();
+        player.boosting = Core.input.keyDown(Binding.boost);
         player.mouseX = unit.aimX();
         player.mouseY = unit.aimY();
 
@@ -650,10 +937,5 @@ public class DesktopInput extends InputHandler{
                 tryDropPayload();
             }
         }
-
-        //update commander unit
-        if(Core.input.keyTap(Binding.command) && unit.type.commandLimit > 0){
-            Call.unitCommand(player);
-        }
     }
 }
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index d42773124d..36c55360cd 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -12,9 +12,13 @@ import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
+import arc.struct.Queue;
 import arc.util.*;
-import mindustry.ai.formations.patterns.*;
+import mindustry.*;
+import mindustry.ai.*;
+import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.async.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.entities.*;
@@ -30,43 +34,131 @@ import mindustry.net.*;
 import mindustry.type.*;
 import mindustry.ui.fragments.*;
 import mindustry.world.*;
-import mindustry.world.blocks.*;
 import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.blocks.*;
 import mindustry.world.blocks.distribution.*;
 import mindustry.world.blocks.payloads.*;
-import mindustry.world.blocks.power.*;
+import mindustry.world.blocks.storage.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 import mindustry.world.meta.*;
 
 import java.util.*;
 
+import static arc.Core.*;
 import static mindustry.Vars.*;
 
 public abstract class InputHandler implements InputProcessor, GestureListener{
+    //not sure where else to put this - maps unique commands based on position to a list of units that will be turned into a unit group
+    static ObjectMap<Vec2, Seq<Unit>> queuedCommands = new ObjectMap<>();
+
     /** Used for dropping items. */
     final static float playerSelectRange = mobile ? 17f : 11f;
+    final static float unitSelectRadScl = 1f;
+    final static IntSeq removed = new IntSeq();
+    final static IntSet intSet = new IntSet();
     /** Maximum line length. */
     final static int maxLength = 100;
     final static Rect r1 = new Rect(), r2 = new Rect();
+    final static Seq<Unit> tmpUnits = new Seq<>(false);
+    final static Binding[] controlGroupBindings = {
+    Binding.block_select_01,
+    Binding.block_select_02,
+    Binding.block_select_03,
+    Binding.block_select_04,
+    Binding.block_select_05,
+    Binding.block_select_06,
+    Binding.block_select_07,
+    Binding.block_select_08,
+    Binding.block_select_09,
+    Binding.block_select_10
+    };
 
-    public final OverlayFragment frag = new OverlayFragment();
+    /** If true, there is a cutscene currently occurring in logic. */
+    public boolean logicCutscene;
+    public Vec2 logicCamPan = new Vec2();
+    public float logicCamSpeed = 0.1f;
+    public float logicCutsceneZoom = -1f;
 
+    /** If any of these functions return true, input is locked. */
+    public Seq<Boolp> inputLocks = Seq.with(() -> renderer.isCutscene(), () -> logicCutscene);
     public Interval controlInterval = new Interval();
     public @Nullable Block block;
     public boolean overrideLineRotation;
     public int rotation;
     public boolean droppingItem;
+    public float itemDepositCooldown;
     public Group uiGroup;
     public boolean isBuilding = true, buildWasAutoPaused = false, wasShooting = false;
     public @Nullable UnitType controlledType;
+    public float recentRespawnTimer;
 
     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<>();
+    public BuildPlan resultplan;
+    public BuildPlan bplan = new BuildPlan();
+    public Seq<BuildPlan> linePlans = new Seq<>();
+    public Seq<BuildPlan> selectPlans = new Seq<>(BuildPlan.class);
+    public Queue<BuildPlan> lastPlans = new Queue<>();
+    public @Nullable Unit lastUnit;
+    public @Nullable Unit spectating;
+
+    //for RTS controls
+    public Seq<Unit> selectedUnits = new Seq<>();
+    public Seq<Building> commandBuildings = new Seq<>(false);
+    public boolean commandMode = false;
+    public boolean commandRect = false;
+    public boolean tappedOne = false;
+    public float commandRectX, commandRectY;
+    /** Groups of units saved to different hotkeys */
+    public IntSeq[] controlGroups = new IntSeq[controlGroupBindings.length];
+
+    private Seq<BuildPlan> plansOut = new Seq<>(BuildPlan.class);
+    private QuadTree<BuildPlan> playerPlanTree = new QuadTree<>(new Rect());
+
+    public final BlockInventoryFragment inv;
+    public final BlockConfigFragment config;
+    public final PlanConfigFragment planConfig;
+
+    private WidgetGroup group = new WidgetGroup();
+
+    private final Eachable<BuildPlan> allPlans = cons -> {
+        if(!player.dead()){
+            player.unit().plans().each(cons);
+        }
+        selectPlans.each(cons);
+        linePlans.each(cons);
+    };
+
+    private final Eachable<BuildPlan> allSelectLines = cons -> {
+        selectPlans.each(cons);
+        linePlans.each(cons);
+    };
+
+    public InputHandler(){
+        group.touchable = Touchable.childrenOnly;
+        inv = new BlockInventoryFragment();
+        config = new BlockConfigFragment();
+        planConfig = new PlanConfigFragment();
+
+        Events.on(UnitDestroyEvent.class, e -> {
+            if(e.unit != null && e.unit.isPlayer() && e.unit.getPlayer().isLocal() && e.unit.type.weapons.contains(w -> w.bullet.killShooter)){
+                player.shooting = false;
+            }
+        });
+
+        Events.on(WorldLoadEvent.class, e -> {
+            playerPlanTree = new QuadTree<>(new Rect(0f, 0f, world.unitWidth(), world.unitHeight()));
+        });
+
+        Events.on(ResetEvent.class, e -> {
+            logicCutscene = false;
+            itemDepositCooldown = 0f;
+            Arrays.fill(controlGroups, null);
+            lastUnit = null;
+            lastPlans.clear();
+        });
+    }
 
     //methods to override
 
@@ -102,8 +194,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     @Remote(called = Loc.server, unreliable = true)
-    public static void transferItemTo(@Nullable Unit unit, Item item, int amount, float x, float y, Building build){
+    public static void clearItems(Building build){
         if(build == null || build.items == null) return;
+        build.items.clear();
+    }
+
+    @Remote(called = Loc.server, unreliable = true)
+    public static void transferItemTo(@Nullable Unit unit, Item item, int amount, float x, float y, Building build){
+        if(build == null || build.items == null || item == null) return;
 
         if(unit != null && unit.item() == item) unit.stack.amount = Math.max(unit.stack.amount - amount, 0);
 
@@ -115,6 +213,30 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
     }
 
+    @Remote(called = Loc.both, targets = Loc.both, forward = true, unreliable = true)
+    public static void deletePlans(Player player, int[] positions){
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.removePlanned, a -> a.plans = positions)){
+            throw new ValidateException(player, "Player cannot remove plans.");
+        }
+
+        if(player == null) return;
+
+        var it = player.team().data().plans.iterator();
+        //O(n^2) search here; no way around it
+        outer:
+        while(it.hasNext()){
+            var plan = it.next();
+
+            for(int pos : positions){
+                if(plan.x == Point2.x(pos) && plan.y == Point2.y(pos)){
+                    plan.removed = true;
+                    it.remove();
+                    continue outer;
+                }
+            }
+        }
+    }
+
     public static void createItemTransfer(Item item, int amount, float x, float y, Position to, Runnable done){
         Fx.itemTransfer.at(x, y, amount, item.color, to);
         if(done != null){
@@ -123,50 +245,212 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     @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()) || !player.within(tile, buildingRange) || player.dead()) return;
+    public static void commandUnits(Player player, int[] unitIds, @Nullable Building buildTarget, @Nullable Unit unitTarget, @Nullable Vec2 posTarget, boolean queueCommand, boolean finalBatch){
+        if(player == null || unitIds == null) return;
 
-        if(net.server() && (!Units.canInteract(player, tile) ||
-        !netServer.admins.allowAction(player, ActionType.withdrawItem, tile.tile(), action -> {
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.commandUnits, event -> {
+            event.unitIDs = unitIds;
+        })){
+            throw new ValidateException(player, "Player cannot command units.");
+        }
+
+        Teamc teamTarget = buildTarget == null ? unitTarget : buildTarget;
+        Vec2 targetAsVec = new Vec2().set(teamTarget != null ? teamTarget : posTarget);
+        Seq<Unit> toAdd = queuedCommands.get(targetAsVec, Seq::new);
+        boolean anyCommandedTarget = false;
+
+        for(int id : unitIds){
+            Unit unit = Groups.unit.getByID(id);
+            if(unit != null && unit.team == player.team() && unit.controller() instanceof CommandAI ai){
+
+                //implicitly order it to move
+                if(ai.command == null || ai.command.switchToMove){
+                    ai.command(UnitCommand.moveCommand);
+                }
+
+                if(teamTarget != null && teamTarget.team() != player.team() &&
+                !(teamTarget instanceof Unit u && !unit.canTarget(u)) && !(teamTarget instanceof Building && !unit.type.targetGround)){
+
+                    anyCommandedTarget = true;
+                    if(queueCommand){
+                        ai.commandQueue(teamTarget);
+                    }else{
+                        ai.commandQueue.clear();
+                        ai.commandTarget(teamTarget);
+                    }
+                }else if(posTarget != null){
+                    if(queueCommand){
+                        ai.commandQueue(posTarget);
+                    }else{
+                        ai.commandQueue.clear();
+                        ai.commandPosition(posTarget);
+                    }
+                }
+
+                unit.lastCommanded = player.coloredName();
+                if(ai.commandQueue.size <= 0){
+                    ai.group = null;
+                }
+
+                //remove when other player command
+                if(!headless && player != Vars.player){
+                    control.input.selectedUnits.remove(unit);
+                }
+
+                toAdd.add(unit);
+            }
+        }
+
+        //in the "final batch" of commands, assign formations based on EVERYTHING that was commanded.
+        if(finalBatch){
+            //each physics layer has its own group
+            UnitGroup[] groups = new UnitGroup[PhysicsProcess.layers];
+            var units = queuedCommands.remove(targetAsVec);
+
+            for(Unit unit : units){
+                if(unit.controller() instanceof CommandAI ai){
+                    //only assign a group when this is not a queued command
+                    if(ai.commandQueue.size == 0 && unitIds.length > 1){
+                        int layer = unit.collisionLayer();
+                        if(groups[layer] == null){
+                            groups[layer] = new UnitGroup();
+                        }
+
+                        groups[layer].units.add(unit);
+                        ai.group = groups[layer];
+                    }
+                }
+            }
+
+            for(int i = 0; i < groups.length; i ++){
+                var group = groups[i];
+                if(group != null && group.units.size > 0){
+                    group.calculateFormation(targetAsVec, i);
+                }
+            }
+        }
+
+        if(unitIds.length > 0 && player == Vars.player && !state.isPaused()){
+            if(anyCommandedTarget){
+                Fx.attackCommand.at(teamTarget);
+            }else{
+                Fx.moveCommand.at(posTarget);
+            }
+        }
+    }
+
+    @Remote(called = Loc.server, targets = Loc.both, forward = true)
+    public static void setUnitCommand(Player player, int[] unitIds, UnitCommand command){
+        if(player == null || unitIds == null || command == null) return;
+
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.commandUnits, event -> {
+            event.unitIDs = unitIds;
+        })){
+            throw new ValidateException(player, "Player cannot command units.");
+        }
+
+        for(int id : unitIds){
+            Unit unit = Groups.unit.getByID(id);
+            if(unit != null && unit.team == player.team() && unit.controller() instanceof CommandAI ai){
+                boolean reset = command.resetTarget || ai.currentCommand().resetTarget;
+                ai.command(command);
+                if(reset){
+                    ai.targetPos = null;
+                    ai.attackTarget = null;
+                }
+                unit.lastCommanded = player.coloredName();
+            }
+        }
+    }
+
+    @Remote(called = Loc.server, targets = Loc.both, forward = true)
+    public static void setUnitStance(Player player, int[] unitIds, UnitStance stance){
+        if(player == null || unitIds == null || stance == null) return;
+
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.commandUnits, event -> {
+            event.unitIDs = unitIds;
+        })){
+            throw new ValidateException(player, "Player cannot command units.");
+        }
+
+        for(int id : unitIds){
+            Unit unit = Groups.unit.getByID(id);
+            if(unit != null && unit.team == player.team() && unit.controller() instanceof CommandAI ai){
+                if(stance == UnitStance.stop){ //not a real stance, just cancels orders
+                    ai.clearCommands();
+                }else{
+                    ai.stance = stance;
+                }
+                unit.lastCommanded = player.coloredName();
+            }
+        }
+    }
+
+    @Remote(called = Loc.server, targets = Loc.both, forward = true)
+    public static void commandBuilding(Player player, int[] buildings, Vec2 target){
+        if(player == null || target == null) return;
+
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.commandBuilding, event -> {
+            event.buildingPositions = buildings;
+        })){
+            throw new ValidateException(player, "Player cannot command buildings.");
+        }
+
+        for(int pos : buildings){
+            var build = world.build(pos);
+
+            if(build == null || build.team() != player.team() || !build.block.commandable) continue;
+
+            build.onCommand(target);
+            build.updateLastAccess(player);
+
+            if(!state.isPaused() && player == Vars.player){
+                Fx.moveCommand.at(target);
+            }
+
+            Events.fire(new BuildingCommandEvent(player, build, target));
+        }
+
+    }
+
+    @Remote(called = Loc.server, targets = Loc.both, forward = true)
+    public static void requestItem(Player player, Building build, Item item, int amount){
+        if(player == null || build == null || !build.interactable(player.team()) || !player.within(build, itemTransferRange) || player.dead() || amount <= 0) return;
+
+        if(net.server() && (!Units.canInteract(player, build) ||
+        !netServer.admins.allowAction(player, ActionType.withdrawItem, build.tile(), action -> {
             action.item = item;
             action.itemAmount = amount;
         }))){
             throw new ValidateException(player, "Player cannot request items.");
         }
 
-        //remove item for every controlling unit
-        player.unit().eachGroup(unit -> {
-            Call.takeItems(tile, item, unit.maxAccepted(item), unit);
-
-            if(unit == player.unit()){
-                Events.fire(new WithdrawEvent(tile, player, item, amount));
-            }
-        });
+        Call.takeItems(build, item, Math.min(player.unit().maxAccepted(item), amount), player.unit());
+        Events.fire(new WithdrawEvent(build, player, item, amount));
     }
 
     @Remote(targets = Loc.both, forward = true, called = Loc.server)
-    public static void transferInventory(Player player, Building tile){
-        if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null || player.dead()) return;
+    public static void transferInventory(Player player, Building build){
+        if(player == null || build == null || !player.within(build, itemTransferRange) || build.items == null || player.dead() || (state.rules.onlyDepositCore && !(build instanceof CoreBuild))) return;
 
-        if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) ||
-        !netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> {
+        if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, build) ||
+        //to avoid rejecting deposit packets that happen to overlap due to packet speed differences, the actual cap is double the cooldown with 2 deposits.
+        (!player.isLocal() && !player.itemDepositRate.allow((long)(state.rules.itemDepositCooldown * 1000 * 2), 2)) ||
+
+        !netServer.admins.allowAction(player, ActionType.depositItem, build.tile, action -> {
             action.itemAmount = player.unit().stack.amount;
             action.item = player.unit().item();
         }))){
             throw new ValidateException(player, "Player cannot transfer an item.");
         }
 
-        //deposit for every controlling unit
-        player.unit().eachGroup(unit -> {
-            Item item = unit.item();
-            int accepted = tile.acceptStack(item, unit.stack.amount, unit);
+        var unit = player.unit();
+        Item item = unit.item();
+        int accepted = build.acceptStack(item, unit.stack.amount, unit);
 
-            Call.transferItemTo(unit, item, accepted, unit.x, unit.y, tile);
+        Call.transferItemTo(unit, item, accepted, unit.x, unit.y, build);
 
-            if(unit == player.unit()){
-                Events.fire(new DepositEvent(tile, player, item, accepted));
-            }
-        });
+        Events.fire(new DepositEvent(build, player, item, accepted));
     }
 
     @Remote(variants = Variant.one)
@@ -176,10 +460,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     @Remote(targets = Loc.both, called = Loc.server)
     public static void requestUnitPayload(Player player, Unit target){
-        if(player == null) return;
+        if(player == null || !(player.unit() instanceof Payloadc pay)) return;
 
         Unit unit = player.unit();
-        Payloadc pay = (Payloadc)unit;
 
         if(target.isAI() && target.isGrounded() && pay.canPickup(target)
         && target.within(unit, unit.type.hitSize * 2f + target.type.hitSize * 2f)){
@@ -188,22 +471,27 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     @Remote(targets = Loc.both, called = Loc.server)
-    public static void requestBuildPayload(Player player, Building tile){
-        if(player == null) return;
+    public static void requestBuildPayload(Player player, Building build){
+        if(player == null || !(player.unit() instanceof Payloadc pay) || build == null) return;
 
         Unit unit = player.unit();
-        Payloadc pay = (Payloadc)unit;
 
-        if(tile != null && tile.team == unit.team
-        && unit.within(tile, tilesize * tile.block.size * 1.2f + tilesize * 5f)){
+        if(!unit.within(build, tilesize * build.block.size * 1.2f + tilesize * 5f)) return;
 
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.pickupBlock, build.tile, action -> {
+            action.unit = unit;
+        })){
+            throw new ValidateException(player, "Player cannot pick up a block.");
+        }
+
+        if(state.teams.canInteract(unit.team, build.team)){
             //pick up block's payload
-            Payload current = tile.getPayload();
+            Payload current = build.getPayload();
             if(current != null && pay.canPickupPayload(current)){
-                Call.pickedBuildPayload(unit, tile, false);
+                Call.pickedBuildPayload(unit, build, false);
                 //pick up whole building directly
-            }else if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
-                Call.pickedBuildPayload(unit, tile, true);
+            }else if(build.block.buildVisibility != BuildVisibility.hidden && build.canPickup() && pay.canPickup(build)){
+                Call.pickedBuildPayload(unit, build, true);
             }
         }
     }
@@ -218,38 +506,46 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     @Remote(targets = Loc.server, called = Loc.server)
-    public static void pickedBuildPayload(Unit unit, Building tile, boolean onGround){
-        if(tile != null && unit instanceof Payloadc pay){
+    public static void pickedBuildPayload(Unit unit, Building build, boolean onGround){
+        if(build != null && unit instanceof Payloadc pay){
             if(onGround){
-                if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
-                    pay.pickup(tile);
+                if(build.block.buildVisibility != BuildVisibility.hidden && build.canPickup() && pay.canPickup(build)){
+                    pay.pickup(build);
                 }else{
-                    Fx.unitPickup.at(tile);
-                    tile.tile.remove();
+                    Fx.unitPickup.at(build);
+                    build.tile.remove();
                 }
             }else{
-                Payload current = tile.getPayload();
+                Payload current = build.getPayload();
                 if(current != null && pay.canPickupPayload(current)){
-                    Payload taken = tile.takePayload();
+                    Payload taken = build.takePayload();
                     if(taken != null){
                         pay.addPayload(taken);
-                        Fx.unitPickup.at(tile);
+                        Fx.unitPickup.at(build);
                     }
                 }
             }
 
-        }else if(tile != null && onGround){
-            Fx.unitPickup.at(tile);
-            tile.tile.remove();
+        }else if(build != null && onGround){
+            Fx.unitPickup.at(build);
+            build.tile.remove();
         }
     }
 
     @Remote(targets = Loc.both, called = Loc.server)
     public static void requestDropPayload(Player player, float x, float y){
-        if(player == null || net.client()) return;
+        if(player == null || net.client() || player.dead()) return;
 
         Payloadc pay = (Payloadc)player.unit();
 
+        if(pay.payloads().isEmpty()) return;
+
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.dropPayload, player.unit().tileOn(), action -> {
+            action.payload = pay.payloads().peek();
+        })){
+            throw new ValidateException(player, "Player cannot drop a payload.");
+        }
+
         //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;
@@ -264,11 +560,31 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             pay.set(x, y);
             pay.dropLastPayload();
             pay.set(prevx, prevy);
-            pay.controlling().each(u -> {
-                if(u instanceof Payloadc){
-                    Call.payloadDropped(u, u.x, u.y);
-                }
-            });
+        }
+    }
+
+    @Remote(called = Loc.server)
+    public static void unitEnteredPayload(Unit unit, Building build){
+        if(unit == null || build == null || unit.team != build.team) return;
+
+        unit.remove();
+
+        //reset the enter command
+        if(unit.controller() instanceof CommandAI ai && ai.command == UnitCommand.enterPayloadCommand){
+            ai.clearCommands();
+            ai.command = UnitCommand.moveCommand;
+        }
+
+        //clear removed state of unit so it can be synced
+        if(Vars.net.client()){
+            Vars.netClient.clearRemovedEntity(unit.id);
+        }
+
+        UnitPayload unitPay = new UnitPayload(unit);
+
+        if(build.acceptPayload(build, unitPay)){
+            Fx.unitDrop.at(build);
+            build.handlePayload(build, unitPay);
         }
     }
 
@@ -280,34 +596,49 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             throw new ValidateException(player, "Player cannot drop an item.");
         }
 
-        player.unit().eachGroup(unit -> {
-            Fx.dropItem.at(unit.x, unit.y, angle, Color.white, unit.item());
-            unit.clearItem();
-        });
+        var unit = player.unit();
+        Fx.dropItem.at(unit.x, unit.y, angle, Color.white, unit.item());
+        unit.clearItem();
     }
 
     @Remote(targets = Loc.both, called = Loc.server, forward = true, unreliable = true)
-    public static void rotateBlock(@Nullable Player player, Building tile, boolean direction){
-        if(tile == null) return;
+    public static void rotateBlock(@Nullable Player player, Building build, boolean direction){
+        if(build == 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)))){
+        if(net.server() && (!Units.canInteract(player, build) ||
+        !netServer.admins.allowAction(player, ActionType.rotate, build.tile(), action -> action.rotation = Mathf.mod(build.rotation + Mathf.sign(direction), 4)))){
             throw new ValidateException(player, "Player cannot rotate a block.");
         }
 
-        if(player != null) tile.lastAccessed = player.name;
-        tile.rotation = Mathf.mod(tile.rotation + Mathf.sign(direction), 4);
-        tile.updateProximity();
-        tile.noSleep();
+        if(player != null) build.updateLastAccess(player);
+        int previous = build.rotation;
+        build.rotation = Mathf.mod(build.rotation + Mathf.sign(direction), 4);
+        build.updateProximity();
+        build.noSleep();
+        Fx.rotateBlock.at(build.x, build.y, build.block.size);
+        Events.fire(new BuildRotateEvent(build, player == null ? null : player.unit(), previous));
     }
 
     @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.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)));
+    public static void tileConfig(@Nullable Player player, Building build, @Nullable Object value){
+        if(build == null && net.server()) throw new ValidateException(player, "building is null");
+        if(build == null) return;
+
+        if(net.server() && (!Units.canInteract(player, build) ||
+        !netServer.admins.allowAction(player, ActionType.configure, build.tile, action -> action.config = value))){
+
+            if(player.con != null){
+                var packet = new TileConfigCallPacket(); //undo the config on the client
+                packet.player = player;
+                packet.build = build;
+                packet.value = build.config();
+                player.con.send(packet, true);
+            }
+
+            throw new ValidateException(player, "Player cannot configure a tile.");
+        }
+        build.configured(player == null || player.dead() ? null : player.unit(), value);
+        Events.fire(new ConfigEvent(build, player, value));
     }
 
     //only useful for servers or local mods, and is not replicated across clients
@@ -319,111 +650,240 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Events.fire(new TapEvent(player, tile));
     }
 
+    @Remote(targets = Loc.both, called = Loc.server, forward = true)
+    public static void buildingControlSelect(Player player, Building build){
+        if(player == null || build == null || player.dead()) return;
+
+        //make sure player is allowed to control the building
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.buildSelect, action -> action.tile = build.tile)){
+            throw new ValidateException(player, "Player cannot control a building.");
+        }
+
+        if(player.team() == build.team && build.canControlSelect(player.unit())){
+            var before = player.unit();
+
+            build.onControlSelect(player.unit());
+
+            if(!before.dead && before.spawnedByCore && !before.isPlayer()){
+                Call.unitDespawn(before);
+            }
+        }
+    }
+
+    @Remote(called = Loc.server)
+    public static void unitBuildingControlSelect(Unit unit, Building build){
+        if(unit == null || unit.dead()) return;
+
+        //client skips checks to prevent ghost units
+        if(unit.team() == build.team && (net.client() || build.canControlSelect(unit))){
+            build.onControlSelect(unit);
+        }
+    }
+
     @Remote(targets = Loc.both, called = Loc.both, forward = true)
     public static void unitControl(Player player, @Nullable Unit unit){
         if(player == null) return;
 
         //make sure player is allowed to control the unit
-        if(net.server() && !netServer.admins.allowAction(player, ActionType.control, action -> action.unit = unit)){
+        if(net.server() && (!state.rules.possessionAllowed || !netServer.admins.allowAction(player, ActionType.control, action -> action.unit = unit))){
             throw new ValidateException(player, "Player cannot control a unit.");
         }
 
         //clear player unit when they possess a core
-        if(unit instanceof BlockUnitc block && block.tile() instanceof CoreBuild build){
-            Fx.spawn.at(player);
-            if(net.client()){
-                control.input.controlledType = null;
-            }
-
-            player.clearUnit();
-            player.deathTimer = 61f;
-            build.requestSpawn(player);
-        }else if(unit == null){ //just clear the unit (is this used?)
+        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.dead){
-            if(!net.client()){
-                player.unit(unit);
+        }else if(unit.isAI() && unit.team == player.team() && !unit.dead && unit.type.playerControllable){
+            if(net.client() && player.isLocal()){
+                player.justSwitchFrom = player.unit();
+                player.justSwitchTo = unit;
+            }
+
+            //TODO range check for docking?
+            var before = player.unit();
+
+            player.unit(unit);
+
+            if(before != null){
+                if(before.spawnedByCore){
+                    unit.dockedType = before.type;
+                }else if(before.dockedType != null && before.dockedType.coreUnitDock){
+                    //direct dock transfer???
+                    unit.dockedType = before.dockedType;
+                }
+
+                if(before.spawnedByCore && !before.isPlayer()){
+                    Call.unitDespawn(before);
+                }
             }
 
             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);
             }
+        }else if(net.server()){
+            //reject forwarding the packet if the unit was dead, AI or team
+            throw new ValidateException(player, "Player attempted to control invalid unit.");
         }
 
         Events.fire(new UnitControlEvent(player, unit));
     }
 
-    @Remote(targets = Loc.both, called = Loc.both, forward = true)
+    @Remote(targets = Loc.both, called = Loc.server, forward = true)
     public static void unitClear(Player player){
-        //no free core teleports?
-        if(player == null || !player.dead() && player.unit().spawnedByCore) return;
+        if(player == null) return;
 
+        //make sure player is allowed to control the building
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.respawn, action -> {})){
+            throw new ValidateException(player, "Player cannot respawn.");
+        }
+
+        if(!player.dead() && !player.unit().spawnedByCore){
+            var docked = player.unit().dockedType;
+
+            //get best core unit type as approximation
+            if(docked == null){
+                var closest = player.bestCore();
+                if(closest != null){
+                    docked = ((CoreBlock)closest.block).unitType;
+                }
+            }
+
+            //respawn if necessary
+            if(docked != null && docked.coreUnitDock){
+                //TODO animation, etc
+                Fx.spawn.at(player);
+
+                if(!net.client()){
+                    Unit unit = docked.create(player.team());
+                    unit.set(player.unit());
+                    //translate backwards so it doesn't spawn stuck in the unit
+                    if(player.unit().isFlying() && unit.type.flying){
+                        Tmp.v1.trns(player.unit().rotation + 180f, player.unit().hitSize / 2f + unit.hitSize / 2f);
+                        unit.x += Tmp.v1.x;
+                        unit.y += Tmp.v1.y;
+                    }
+                    unit.rotation(player.unit().rotation);
+                    //unit.impulse(0f, -3f);
+                    //TODO should there be an impulse?
+                    unit.controller(player);
+                    unit.spawnedByCore(true);
+                    unit.add();
+                }
+
+                //skip standard respawn code
+                return;
+            }
+
+        }
+        //should only get to this code if docking failed or this isn't a docking unit
+
+        //problem: this gets called on both ends. it shouldn't be.
         Fx.spawn.at(player);
         player.clearUnit();
-        player.deathTimer = 61f; //for instant respawn
+        player.checkSpawn();
+        player.deathTimer = Player.deathDelay + 1f; //for instant respawn
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
-    public static void unitCommand(Player player){
-        if(player == null || player.dead() || !(player.unit() instanceof Commanderc commander)) return;
-
-        //make sure player is allowed to make the command
-        if(net.server() && !netServer.admins.allowAction(player, ActionType.command, action -> {})){
-            throw new ValidateException(player, "Player cannot command a unit.");
-        }
-
-        if(commander.isCommanding()){
-            commander.clearCommand();
-        }else if(player.unit().type.commandLimit > 0){
-
-            //TODO try out some other formations
-            commander.commandNearby(new CircleFormation());
-            Fx.commandSend.at(player);
-        }
-
+    /** Adds an input lock; if this function returns true, input is locked. Used for mod 'cutscenes' or custom camera panning. */
+    public void addLock(Boolp lock){
+        inputLocks.add(lock);
     }
 
-    public Eachable<BuildPlan> allRequests(){
-        return cons -> {
-            for(BuildPlan request : player.unit().plans()) cons.get(request);
-            for(BuildPlan request : selectRequests) cons.get(request);
-            for(BuildPlan request : lineRequests) cons.get(request);
-        };
+    /** @return whether most input is locked, for 'cutscenes' */
+    public boolean locked(){
+        return inputLocks.contains(Boolp::get);
+    }
+
+    public Eachable<BuildPlan> allPlans(){
+        return allPlans;
     }
 
     public boolean isUsingSchematic(){
-        return !selectRequests.isEmpty();
+        return !selectPlans.isEmpty();
     }
 
-    public OverlayFragment getFrag(){
-        return frag;
+    public void spectate(Unit unit){
+        spectating = unit;
+        camera.position.set(unit);
     }
 
     public void update(){
+        if(spectating != null && (!spectating.isValid() || spectating.team != player.team())){
+            spectating = null;
+        }
+
+        if(logicCutscene && !renderer.isCutscene()){
+            Core.camera.position.lerpDelta(logicCamPan, logicCamSpeed);
+        }else{
+            logicCutsceneZoom = -1f;
+        }
+
+        itemDepositCooldown -= Time.delta / 60f;
+
+        commandBuildings.removeAll(b -> !b.isValid());
+
+        if(!commandMode){
+            commandRect = false;
+        }
+
+        if(player.isBuilder()){
+            var playerPlans = player.unit().plans;
+            if(player.unit() != lastUnit && playerPlans.size <= 1){
+                playerPlans.ensureCapacity(lastPlans.size);
+                for(var plan : lastPlans){
+                    playerPlans.addLast(plan);
+                }
+            }
+            if(lastPlans.size != playerPlans.size || (lastPlans.size > 0 && playerPlans.size > 0 && lastPlans.first() != playerPlans.first())){
+                lastPlans.clear();
+                for(var plan : playerPlans){
+                    lastPlans.addLast(plan);
+                }
+            }
+        }
+
+        lastUnit = player.unit();
+
+        playerPlanTree.clear();
+        if(!player.dead()){
+            player.unit().plans.each(playerPlanTree::insert);
+        }
+
         player.typing = ui.chatfrag.shown();
 
+        if(player.dead()){
+            droppingItem = false;
+        }
+
         if(player.isBuilder()){
             player.unit().updateBuilding(isBuilding);
         }
 
-        if(player.shooting && !wasShooting && player.unit().hasWeapons() && state.rules.unitAmmo && player.unit().ammo <= 0){
+        if(!player.dead() && player.shooting && !wasShooting && player.unit().hasWeapons() && state.rules.unitAmmo && !player.team().rules().infiniteAmmo && player.unit().ammo <= 0){
             player.unit().type.weapons.first().noAmmoSound.at(player.unit());
         }
 
+        //you don't want selected blocks while locked, looks weird
+        if(locked()){
+            block = null;
+        }
+
         wasShooting = player.shooting;
 
-        if(!player.dead()){
+        //only reset the controlled type and control a unit after the timer runs out
+        //essentially, this means the client waits for ~1 second after controlling something before trying to control something else automatically
+        if(!player.dead() && (recentRespawnTimer -= Time.delta / 70f) <= 0f && player.justSwitchFrom != player.unit()){
             controlledType = player.unit().type;
         }
 
-        if(controlledType != null && player.dead()){
+        if(controlledType != null && player.dead() && controlledType.playerControllable){
             Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type == controlledType && !u.dead);
 
             if(unit != null){
                 //only trying controlling once a second to prevent packet spam
                 if(!net.client() || controlInterval.get(0, 70f)){
+                    recentRespawnTimer = 1f;
                     Call.unitControl(player, unit);
                 }
             }
@@ -431,7 +891,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public void checkUnit(){
-        if(controlledType != null){
+        if(controlledType != null && controlledType.playerControllable){
             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 cont && cont.canControl() ? cont.unit() : null;
@@ -455,10 +915,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         if(target != null){
             Call.requestUnitPayload(player, target);
         }else{
-            Building tile = world.buildWorld(pay.x(), pay.y());
+            Building build = world.buildWorld(pay.x(), pay.y());
 
-            if(tile != null && tile.team == unit.team){
-                Call.requestBuildPayload(player, tile);
+            if(build != null && state.teams.canInteract(unit.team, build.team)){
+                Call.requestBuildPayload(player, build);
             }
         }
     }
@@ -489,6 +949,270 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     public void updateState(){
         if(state.isMenu()){
             controlledType = null;
+            logicCutscene = false;
+            config.forceHide();
+            commandMode = commandRect = false;
+        }
+    }
+
+    //TODO when shift is held? ctrl?
+    public boolean multiUnitSelect(){
+        return false;
+    }
+
+    public void selectUnitsRect(){
+        if(commandMode && commandRect){
+            if(!tappedOne){
+                var units = selectedCommandUnits(commandRectX, commandRectY, input.mouseWorldX() - commandRectX, input.mouseWorldY() - commandRectY);
+                if(multiUnitSelect()){
+                    //tiny brain method of unique addition
+                    selectedUnits.removeAll(units);
+                }else{
+                    //nothing selected, clear units
+                    selectedUnits.clear();
+                }
+                selectedUnits.addAll(units);
+                Events.fire(Trigger.unitCommandChange);
+                commandBuildings.clear();
+            }
+            commandRect = false;
+        }
+    }
+
+    public void selectTypedUnits(){
+        if(commandMode){
+            Unit unit = selectedCommandUnit(input.mouseWorldX(), input.mouseWorldY());
+            if(unit != null){
+                selectedUnits.clear();
+                camera.bounds(Tmp.r1);
+                selectedUnits.addAll(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height, u -> u.type == unit.type));
+                Events.fire(Trigger.unitCommandChange);
+            }
+        }
+    }
+
+    public void tapCommandUnit(){
+        if(commandMode){
+
+            Unit unit = selectedCommandUnit(input.mouseWorldX(), input.mouseWorldY());
+            Building build = world.buildWorld(input.mouseWorldX(), input.mouseWorldY());
+            if(unit != null){
+                if(!selectedUnits.contains(unit)){
+                    selectedUnits.add(unit);
+                }else{
+                    selectedUnits.remove(unit);
+                }
+                commandBuildings.clear();
+            }else{
+                //deselect
+                selectedUnits.clear();
+
+                if(build != null && build.team == player.team() && build.block.commandable){
+                    if(commandBuildings.contains(build)){
+                        commandBuildings.remove(build);
+                    }else{
+                        commandBuildings.add(build);
+                    }
+
+                }else{
+                    commandBuildings.clear();
+                }
+            }
+            Events.fire(Trigger.unitCommandChange);
+        }
+    }
+
+    public void commandTap(float screenX, float screenY){
+        commandTap(screenX, screenY, false);
+    }
+
+    public void commandTap(float screenX, float screenY, boolean queue){
+        if(commandMode){
+            //right click: move to position
+
+            //move to location - TODO right click instead?
+            Vec2 target = input.mouseWorld(screenX, screenY).cpy();
+
+            if(selectedUnits.size > 0){
+
+                Teamc attack = world.buildWorld(target.x, target.y);
+
+                if(attack == null || attack.team() == player.team()){
+                    attack = selectedEnemyUnit(target.x, target.y);
+                }
+
+                int[] ids = new int[selectedUnits.size];
+                for(int i = 0; i < ids.length; i++){
+                    ids[i] = selectedUnits.get(i).id;
+                }
+
+                if(attack != null){
+                    Events.fire(Trigger.unitCommandAttack);
+                }else{
+                    Events.fire(Trigger.unitCommandPosition);
+                }
+
+                int maxChunkSize = 200;
+
+                if(ids.length > maxChunkSize){
+                    for(int i = 0; i < ids.length; i += maxChunkSize){
+                        int[] data = Arrays.copyOfRange(ids, i, Math.min(i + maxChunkSize, ids.length));
+                        Call.commandUnits(player, data, attack instanceof Building b ? b : null, attack instanceof Unit u ? u : null, target, queue, i + maxChunkSize >= ids.length);
+                    }
+                }else{
+                    Call.commandUnits(player, ids, attack instanceof Building b ? b : null, attack instanceof Unit u ? u : null, target, queue, true);
+                }
+            }
+
+            if(commandBuildings.size > 0){
+                Call.commandBuilding(player, commandBuildings.mapInt(b -> b.pos()).toArray(), target);
+            }
+        }
+    }
+
+    public void drawCommand(Unit sel){
+        Drawf.poly(sel.x, sel.y, 6, sel.hitSize / unitSelectRadScl + Mathf.absin(4f, 1f), 0f, selectedUnits.contains(sel) ? Pal.remove : Pal.accent);
+    }
+
+    public void drawCommanded(){
+        Draw.draw(Layer.plans, () -> {
+            drawCommanded(true);
+        });
+
+        Draw.draw(Layer.groundUnit - 1, () -> {
+            drawCommanded(false);
+        });
+    }
+
+    public void drawCommanded(boolean flying){
+        float lineLimit = 6.5f;
+        Color color = Pal.accent;
+        int sides = 6;
+        float alpha = 0.5f;
+
+        if(commandMode){
+            //happens sometimes
+            selectedUnits.removeAll(u -> !u.isCommandable());
+
+            //draw command overlay UI
+            for(Unit unit : selectedUnits){
+
+                CommandAI ai = unit.command();
+                Position lastPos = ai.attackTarget != null ? ai.attackTarget : ai.targetPos;
+
+                if(flying && ai.attackTarget != null && ai.currentCommand().drawTarget){
+                    Drawf.target(ai.attackTarget.getX(), ai.attackTarget.getY(), 6f, Pal.remove);
+                }
+
+                if(unit.isFlying() != flying) continue;
+
+                //draw target line
+                if(ai.targetPos != null && ai.currentCommand().drawTarget){
+                    Position lineDest = ai.attackTarget != null ? ai.attackTarget : ai.targetPos;
+                    Drawf.limitLine(unit, lineDest, unit.hitSize / unitSelectRadScl + 1f, lineLimit, color.write(Tmp.c1).a(alpha));
+
+                    if(ai.attackTarget == null){
+                        Drawf.square(lineDest.getX(), lineDest.getY(), 3.5f, color.write(Tmp.c1).a(alpha));
+
+                        if(ai.currentCommand() == UnitCommand.enterPayloadCommand){
+                            var build = world.buildWorld(lineDest.getX(), lineDest.getY());
+                            if(build != null && build.block.acceptsUnitPayloads && build.team == unit.team){
+                                Drawf.selected(build, color);
+                            }
+                        }
+                    }
+                }
+
+                float rad = unit.hitSize / unitSelectRadScl + 1f;
+
+                Fill.lightInner(unit.x, unit.y, sides,
+                Math.max(0f, rad * 0.8f),
+                rad,
+                0f,
+                Tmp.c3.set(color).a(0f),
+                Tmp.c2.set(color).a(0.7f)
+                );
+
+                Lines.stroke(1f);
+                Draw.color(color);
+                Lines.poly(unit.x, unit.y, sides, rad + 0.5f);
+                //uncomment for a dark border
+                //Draw.color(Pal.gray);
+                //Lines.poly(unit.x, unit.y, sides, rad + 1.5f);
+                Draw.reset();
+
+
+
+                if(lastPos == null){
+                    lastPos = unit;
+                }
+
+                //draw command queue
+                if(ai.currentCommand().drawTarget && ai.commandQueue.size > 0){
+                    for(var next : ai.commandQueue){
+                        Drawf.limitLine(lastPos, next, lineLimit, lineLimit, color.write(Tmp.c1).a(alpha));
+                        lastPos = next;
+
+                        if(next instanceof Vec2 vec){
+                            Drawf.square(vec.x, vec.y, 3.5f, color.write(Tmp.c1).a(alpha));
+                        }else{
+                            Drawf.target(next.getX(), next.getY(), 6f, Pal.remove);
+                        }
+                    }
+                }
+
+                if(ai.targetPos != null && ai.currentCommand() == UnitCommand.loopPayloadCommand && unit instanceof Payloadc pay){
+                    Draw.color(color, 0.4f + Mathf.absin(5f, 0.5f));
+                    TextureRegion region = pay.hasPayload() ? Icon.download.getRegion() : Icon.upload.getRegion();
+                    float offset = 11f;
+                    float size = 8f;
+                    Draw.rect(region, ai.targetPos.x, ai.targetPos.y + offset, size, size / region.ratio());
+
+                    if(ai.commandQueue.size > 0){
+                        region = !pay.hasPayload() ? Icon.download.getRegion() : Icon.upload.getRegion();
+                        Draw.rect(region, ai.commandQueue.first().getX(), ai.commandQueue.first().getY() + offset, size, size / region.ratio());
+                    }
+                    Draw.color();
+                }
+            }
+
+            if(flying){
+                for(var commandBuild : commandBuildings){
+                    if(commandBuild != null){
+                        Drawf.square(commandBuild.x, commandBuild.y, commandBuild.hitSize() / 1.4f + 1f);
+                        var cpos = commandBuild.getCommandPosition();
+
+                        if(cpos != null){
+                            Drawf.limitLine(commandBuild, cpos, commandBuild.hitSize() / 2f, lineLimit, color.write(Tmp.c1).a(alpha));
+                            Drawf.square(cpos.x, cpos.y, 3.5f, color.write(Tmp.c1).a(alpha));
+                        }
+                    }
+                }
+            }
+        }
+
+        Draw.reset();
+
+    }
+
+    public void drawUnitSelection(){
+        if(commandRect && commandMode){
+            float x2 = input.mouseWorldX(), y2 = input.mouseWorldY();
+            var units = selectedCommandUnits(commandRectX, commandRectY, x2 - commandRectX, y2 - commandRectY);
+            for(var unit : units){
+                drawCommand(unit);
+            }
+
+            Draw.color(Pal.accent, 0.3f);
+            Fill.crect(commandRectX, commandRectY, x2 - commandRectX, y2 - commandRectY);
+        }
+
+        if(commandMode && !commandRect){
+            Unit sel = selectedCommandUnit(input.mouseWorldX(), input.mouseWorldY());
+
+            if(sel != null && !(!multiUnitSelect() && selectedUnits.size == 1 && selectedUnits.contains(sel))){
+                drawCommand(sel);
+            }
         }
     }
 
@@ -508,17 +1232,33 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Drawf.selected(x, y, block, color);
     }
 
-    public void drawBreaking(BuildPlan request){
-        if(request.breaking){
-            drawBreaking(request.x, request.y);
+    public void drawBreaking(BuildPlan plan){
+        if(plan.breaking){
+            drawBreaking(plan.x, plan.y);
         }else{
-            drawSelected(request.x, request.y, request.block, Pal.remove);
+            drawSelected(plan.x, plan.y, plan.block, Pal.remove);
         }
     }
 
-    public boolean requestMatches(BuildPlan request){
-        Tile tile = world.tile(request.x, request.y);
-        return tile != null && tile.build instanceof ConstructBuild cons && cons.cblock == request.block;
+    public void drawOverlapCheck(Block block, int cursorX, int cursorY, boolean valid){
+        if(!valid && state.rules.placeRangeCheck){
+            var blocker = Build.getEnemyOverlap(block, player.team(), cursorX, cursorY);
+            if(blocker != null && blocker.wasVisible){
+                Drawf.selected(blocker, Pal.remove);
+                Tmp.v1.set(cursorX, cursorY).scl(tilesize).add(block.offset, block.offset).sub(blocker).scl(-1f).nor();
+                Drawf.dashLineDst(Pal.remove,
+                cursorX * tilesize + block.offset + Tmp.v1.x * block.size * tilesize/2f,
+                cursorY * tilesize + block.offset + Tmp.v1.y * block.size * tilesize/2f,
+                blocker.x + Tmp.v1.x * -blocker.block.size * tilesize/2f,
+                blocker.y + Tmp.v1.y * -blocker.block.size * tilesize/2f
+                );
+            }
+        }
+    }
+
+    public boolean planMatches(BuildPlan plan){
+        Tile tile = world.tile(plan.x, plan.y);
+        return tile != null && tile.build instanceof ConstructBuild cons && cons.current == plan.block;
     }
 
     public void drawBreaking(int x, int y){
@@ -530,36 +1270,40 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public void useSchematic(Schematic schem){
-        selectRequests.addAll(schematics.toRequests(schem, player.tileX(), player.tileY()));
+        selectPlans.addAll(schematics.toPlans(schem, player.tileX(), player.tileY()));
     }
 
     protected void showSchematicSave(){
         if(lastSchematic == null) return;
 
-        ui.showTextInput("@schematic.add", "@name", "", text -> {
+        var last = lastSchematic;
+
+        ui.showTextInput("@schematic.add", "@name", 1000, "", text -> {
             Schematic replacement = schematics.all().find(s -> s.name().equals(text));
             if(replacement != null){
                 ui.showConfirm("@confirm", "@schematic.replace", () -> {
-                    schematics.overwrite(replacement, lastSchematic);
+                    schematics.overwrite(replacement, last);
                     ui.showInfoFade("@schematic.saved");
                     ui.schematics.showInfo(replacement);
                 });
             }else{
-                lastSchematic.tags.put("name", text);
-                lastSchematic.tags.put("description", "");
-                schematics.add(lastSchematic);
+                last.tags.put("name", text);
+                last.tags.put("description", "");
+                schematics.add(last);
                 ui.showInfoFade("@schematic.saved");
-                ui.schematics.showInfo(lastSchematic);
-                Events.fire(new SchematicCreateEvent(lastSchematic));
+                ui.schematics.showInfo(last);
+                Events.fire(new SchematicCreateEvent(last));
             }
         });
     }
 
-    public void rotateRequests(Seq<BuildPlan> requests, int direction){
+    public void rotatePlans(Seq<BuildPlan> plans, int direction){
         int ox = schemOriginX(), oy = schemOriginY();
 
-        requests.each(req -> {
-            req.pointConfig(p -> {
+        plans.each(plan -> {
+            if(plan.breaking) return;
+
+            plan.pointConfig(p -> {
                 int cx = p.x, cy = p.y;
                 int lx = cx;
 
@@ -573,8 +1317,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                 p.set(cx, cy);
             });
 
-            //rotate actual request, centered on its multiblock position
-            float wx = (req.x - ox) * tilesize + req.block.offset, wy = (req.y - oy) * tilesize + req.block.offset;
+            //rotate actual plan, centered on its multiblock position
+            float wx = (plan.x - ox) * tilesize + plan.block.offset, wy = (plan.y - oy) * tilesize + plan.block.offset;
             float x = wx;
             if(direction >= 0){
                 wx = -wy;
@@ -583,40 +1327,40 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                 wx = wy;
                 wy = -x;
             }
-            req.x = World.toTile(wx - req.block.offset) + ox;
-            req.y = World.toTile(wy - req.block.offset) + oy;
-            req.rotation = Mathf.mod(req.rotation + direction, 4);
+            plan.x = World.toTile(wx - plan.block.offset) + ox;
+            plan.y = World.toTile(wy - plan.block.offset) + oy;
+            plan.rotation = plan.block.planRotation(Mathf.mod(plan.rotation + direction, 4));
         });
     }
 
-    public void flipRequests(Seq<BuildPlan> requests, boolean x){
+    public void flipPlans(Seq<BuildPlan> plans, boolean x){
         int origin = (x ? schemOriginX() : schemOriginY()) * tilesize;
 
-        requests.each(req -> {
-            float value = -((x ? req.x : req.y) * tilesize - origin + req.block.offset) + origin;
+        plans.each(plan -> {
+            if(plan.breaking) return;
+
+            float value = -((x ? plan.x : plan.y) * tilesize - origin + plan.block.offset) + origin;
 
             if(x){
-                req.x = (int)((value - req.block.offset) / tilesize);
+                plan.x = (int)((value - plan.block.offset) / tilesize);
             }else{
-                req.y = (int)((value - req.block.offset) / tilesize);
+                plan.y = (int)((value - plan.block.offset) / tilesize);
             }
 
-            req.pointConfig(p -> {
-                int corigin = x ? req.originalWidth/2 : req.originalHeight/2;
+            plan.pointConfig(p -> {
+                int corigin = x ? plan.originalWidth/2 : plan.originalHeight/2;
                 int nvalue = -(x ? p.x : p.y);
                 if(x){
-                    req.originalX = -(req.originalX - corigin) + corigin;
+                    plan.originalX = -(plan.originalX - corigin) + corigin;
                     p.x = nvalue;
                 }else{
-                    req.originalY = -(req.originalY - corigin) + corigin;
+                    plan.originalY = -(plan.originalY - corigin) + corigin;
                     p.y = nvalue;
                 }
             });
 
             //flip rotation
-            if(x == (req.rotation % 2 == 0)){
-                req.rotation = Mathf.mod(req.rotation + 2, 4);
-            }
+            plan.block.flipRotation(plan, x);
         });
     }
 
@@ -628,27 +1372,27 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         return rawTileY();
     }
 
-    /** Returns the selection request that overlaps this position, or null. */
-    protected BuildPlan getRequest(int x, int y){
-        return getRequest(x, y, 1, null);
+    /** @return the selection plan that overlaps this position, or null. */
+    protected @Nullable BuildPlan getPlan(int x, int y){
+        return getPlan(x, y, 1, null);
     }
 
-    /** Returns the selection request that overlaps this position, or null. */
-    protected BuildPlan getRequest(int x, int y, int size, BuildPlan skip){
+    /** Returns the selection plan that overlaps this position, or null. */
+    protected @Nullable BuildPlan getPlan(int x, int y, int size, BuildPlan skip){
         float offset = ((size + 1) % 2) * tilesize / 2f;
         r2.setSize(tilesize * size);
         r2.setCenter(x * tilesize + offset, y * tilesize + offset);
-        resultreq = null;
+        resultplan = null;
 
-        Boolf<BuildPlan> test = req -> {
-            if(req == skip) return false;
-            Tile other = req.tile();
+        Boolf<BuildPlan> test = plan -> {
+            if(plan == skip) return false;
+            Tile other = plan.tile();
 
             if(other == null) return false;
 
-            if(!req.breaking){
-                r1.setSize(req.block.size * tilesize);
-                r1.setCenter(other.worldx() + req.block.offset, other.worldy() + req.block.offset);
+            if(!plan.breaking){
+                r1.setSize(plan.block.size * tilesize);
+                r1.setCenter(other.worldx() + plan.block.offset, other.worldy() + plan.block.offset);
             }else{
                 r1.setSize(other.block().size * tilesize);
                 r1.setCenter(other.worldx() + other.block().offset, other.worldy() + other.block().offset);
@@ -657,14 +1401,18 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             return r2.overlaps(r1);
         };
 
-        for(BuildPlan req : player.unit().plans()){
-            if(test.get(req)) return req;
+        for(var plan : player.unit().plans()){
+            if(test.get(plan)) return plan;
         }
 
-        return selectRequests.find(test);
+        return selectPlans.find(test);
     }
 
     protected void drawBreakSelection(int x1, int y1, int x2, int y2, int maxLength){
+        drawBreakSelection(x1, y1, x2, y2, maxLength, true);
+    }
+
+    protected void drawBreakSelection(int x1, int y1, int x2, int y2, int maxLength, boolean useSelectPlans){
         NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, x1, y1, x2, y2, false, maxLength, 1f);
         NormalizeResult dresult = Placement.normalizeArea(x1, y1, x2, y2, rotation, false, maxLength);
 
@@ -682,24 +1430,24 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Draw.color(Pal.remove);
         Lines.stroke(1f);
 
-        for(BuildPlan req : player.unit().plans()){
-            if(req.breaking) continue;
-            if(req.bounds(Tmp.r2).overlaps(Tmp.r1)){
-                drawBreaking(req);
+        for(var plan : player.unit().plans()){
+            if(!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)){
+                drawBreaking(plan);
             }
         }
 
-        for(BuildPlan req : selectRequests){
-            if(req.breaking) continue;
-            if(req.bounds(Tmp.r2).overlaps(Tmp.r1)){
-                drawBreaking(req);
+        if(useSelectPlans){
+            for(var plan : selectPlans){
+                if(!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)){
+                    drawBreaking(plan);
+                }
             }
         }
 
-        for(BlockPlan req : player.team().data().blocks){
-            Block block = content.block(req.block);
-            if(block.bounds(req.x, req.y, Tmp.r2).overlaps(Tmp.r1)){
-                drawSelected(req.x, req.y, content.block(req.block), Pal.remove);
+        for(BlockPlan plan : player.team().data().plans){
+            Block block = plan.block;
+            if(block.bounds(plan.x, plan.y, Tmp.r2).overlaps(Tmp.r1)){
+                drawSelected(plan.x, plan.y, plan.block, Pal.remove);
             }
         }
 
@@ -711,64 +1459,115 @@ 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 drawRebuildSelection(int x1, int y1, int x2, int y2){
+        drawSelection(x1, y1, x2, y2, 0, Pal.sapBulletBack, Pal.sapBullet);
 
-    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);
+        NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, x1, y1, x2, y2, false, 0, 1f);
 
-        Lines.stroke(2f);
+        Tmp.r1.set(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
 
-        Draw.color(Pal.accentBack);
-        Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y);
-        Draw.color(Pal.accent);
-        Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
-    }
+        for(BlockPlan plan : player.team().data().plans){
+            Block block = plan.block;
+            if(block.bounds(plan.x, plan.y, Tmp.r2).overlaps(Tmp.r1)){
+                drawSelected(plan.x, plan.y, plan.block, Pal.sapBullet);
+            }
+        }
 
-    protected void flushSelectRequests(Seq<BuildPlan> requests){
-        for(BuildPlan req : requests){
-            if(req.block != null && validPlace(req.x, req.y, req.block, req.rotation)){
-                BuildPlan other = getRequest(req.x, req.y, req.block.size, null);
-                if(other == null){
-                    selectRequests.add(req.copy());
-                }else if(!other.breaking && other.x == req.x && other.y == req.y && other.block.size == req.block.size){
-                    selectRequests.remove(other);
-                    selectRequests.add(req.copy());
+        NormalizeResult dresult = Placement.normalizeArea(x1, y1, x2, y2, rotation, false, 999999999);
+
+        intSet.clear();
+        for(int x = dresult.x; x <= dresult.x2; x++){
+            for(int y = dresult.y; y <= dresult.y2; y++){
+
+                Tile tile = world.tileBuilding(x, y);
+
+                if(tile != null && intSet.add(tile.pos()) && canRepairDerelict(tile)){
+                    drawSelected(tile.x, tile.y, tile.block(), Pal.sapBullet);
                 }
             }
         }
     }
 
-    protected void flushRequests(Seq<BuildPlan> requests){
-        for(BuildPlan req : requests){
-            if(req.block != null && validPlace(req.x, req.y, req.block, req.rotation)){
-                BuildPlan copy = req.copy();
-                req.block.onNewPlan(copy);
+    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){
+        drawSelection(x1, y1, x2, y2, maxLength, Pal.accentBack, Pal.accent);
+    }
+
+    protected void drawSelection(int x1, int y1, int x2, int y2, int maxLength, Color col1, Color col2){
+        NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, x1, y1, x2, y2, false, maxLength, 1f);
+
+        Lines.stroke(2f);
+
+        Draw.color(col1);
+        Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y);
+        Draw.color(col2);
+        Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
+    }
+
+    protected void flushSelectPlans(Seq<BuildPlan> plans){
+        for(BuildPlan plan : plans){
+            if(plan.block != null && validPlace(plan.x, plan.y, plan.block, plan.rotation, null, true)){
+                BuildPlan other = getPlan(plan.x, plan.y, plan.block.size, null);
+                if(other == null){
+                    selectPlans.add(plan.copy());
+                }else if(!other.breaking && other.x == plan.x && other.y == plan.y && other.block.size == plan.block.size){
+                    selectPlans.remove(other);
+                    selectPlans.add(plan.copy());
+                }
+            }
+        }
+    }
+
+    protected void flushPlansReverse(Seq<BuildPlan> plans){
+        //reversed iteration.
+        for(int i = plans.size - 1; i >= 0; i--){
+            var plan = plans.get(i);
+            if(plan.block != null && validPlace(plan.x, plan.y, plan.block, plan.rotation, null, true)){
+                BuildPlan copy = plan.copy();
+                plan.block.onNewPlan(copy);
+                player.unit().addBuild(copy, false);
+            }
+        }
+    }
+
+    protected void flushPlans(Seq<BuildPlan> plans){
+        for(var plan : plans){
+            if(plan.block != null && validPlace(plan.x, plan.y, plan.block, plan.rotation, null, true)){
+                BuildPlan copy = plan.copy();
+                plan.block.onNewPlan(copy);
                 player.unit().addBuild(copy);
             }
         }
     }
 
-    protected void drawOverRequest(BuildPlan request){
-        boolean valid = validPlace(request.x, request.y, request.block, request.rotation);
+    protected void drawOverPlan(BuildPlan plan){
+        drawOverPlan(plan, validPlace(plan.x, plan.y, plan.block, plan.rotation));
+    }
 
+    protected void drawOverPlan(BuildPlan plan, boolean valid){
         Draw.reset();
         Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f));
         Draw.alpha(1f);
-        request.block.drawRequestConfigTop(request, selectRequests);
+        plan.block.drawPlanConfigTop(plan, allSelectLines);
         Draw.reset();
     }
 
-    protected void drawRequest(BuildPlan request){
-        request.block.drawPlan(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
+    protected void drawPlan(BuildPlan plan){
+        drawPlan(plan, plan.cachedValid = validPlace(plan.x, plan.y, plan.block, plan.rotation));
+    }
+
+    protected void drawPlan(BuildPlan plan, boolean valid){
+        plan.block.drawPlan(plan, allPlans(), valid);
     }
 
     /** Draws a placement icon for a specific block. */
-    protected void drawRequest(int x, int y, Block block, int rotation){
-        brequest.set(x, y, rotation, block);
-        brequest.animScale = 1f;
-        block.drawPlan(brequest, allRequests(), validPlace(x, y, block, rotation));
+    protected void drawPlan(int x, int y, Block block, int rotation){
+        bplan.set(x, y, rotation, block);
+        bplan.animScale = 1f;
+        block.drawPlan(bplan, allPlans(), validPlace(x, y, block, rotation));
     }
 
     /** Remove everything from the queue in a selection. */
@@ -800,58 +1599,72 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
                 if(!flush){
                     tryBreakBlock(wx, wy);
-                }else if(validBreak(tile.x, tile.y) && !selectRequests.contains(r -> r.tile() != null && r.tile() == tile)){
-                    selectRequests.add(new BuildPlan(tile.x, tile.y));
+                }else if(validBreak(tile.x, tile.y) && !selectPlans.contains(r -> r.tile() != null && r.tile() == tile)){
+                    selectPlans.add(new BuildPlan(tile.x, tile.y));
                 }
             }
         }
 
-        //remove build requests
+        //remove build plans
         Tmp.r1.set(result.x * tilesize, result.y * tilesize, (result.x2 - result.x) * tilesize, (result.y2 - result.y) * tilesize);
 
         Iterator<BuildPlan> it = player.unit().plans().iterator();
         while(it.hasNext()){
-            BuildPlan req = it.next();
-            if(!req.breaking && req.bounds(Tmp.r2).overlaps(Tmp.r1)){
+            var plan = it.next();
+            if(!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)){
                 it.remove();
             }
         }
 
-        it = selectRequests.iterator();
-        while(it.hasNext()){
-            BuildPlan req = it.next();
-            if(!req.breaking && req.bounds(Tmp.r2).overlaps(Tmp.r1)){
-                it.remove();
+        //don't remove plans on desktop, where flushing is false
+        if(flush){
+            it = selectPlans.iterator();
+            while(it.hasNext()){
+                var plan = it.next();
+                if(!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)){
+                    it.remove();
+                }
             }
         }
 
+        removed.clear();
+
         //remove blocks to rebuild
-        Iterator<BlockPlan> broken = state.teams.get(player.team()).blocks.iterator();
+        Iterator<BlockPlan> broken = player.team().data().plans.iterator();
         while(broken.hasNext()){
-            BlockPlan req = broken.next();
-            Block block = content.block(req.block);
-            if(block.bounds(req.x, req.y, Tmp.r2).overlaps(Tmp.r1)){
+            BlockPlan plan = broken.next();
+            Block block = plan.block;
+            if(block.bounds(plan.x, plan.y, Tmp.r2).overlaps(Tmp.r1)){
+                removed.add(Point2.pack(plan.x, plan.y));
+                plan.removed = true;
                 broken.remove();
             }
         }
+
+        //TODO array may be too large?
+        if(removed.size > 0 && net.active()){
+            Call.deletePlans(player, removed.toArray());
+        }
     }
 
     protected void updateLine(int x1, int y1, int x2, int y2){
-        lineRequests.clear();
+        linePlans.clear();
         iterateLine(x1, y1, x2, y2, l -> {
             rotation = l.rotation;
-            BuildPlan req = new BuildPlan(l.x, l.y, l.rotation, block, block.nextConfig());
-            req.animScale = 1f;
-            lineRequests.add(req);
+            var plan = new BuildPlan(l.x, l.y, l.rotation, block, block.nextConfig());
+            plan.animScale = 1f;
+            linePlans.add(plan);
         });
 
         if(Core.settings.getBool("blockreplace")){
-            lineRequests.each(req -> {
-                Block replace = req.block.getReplacement(req, lineRequests);
+            linePlans.each(plan -> {
+                Block replace = plan.block.getReplacement(plan, linePlans);
                 if(replace.unlockedNow()){
-                    req.block = replace;
+                    plan.block = replace;
                 }
             });
+
+            block.handlePlacementLine(linePlans);
         }
     }
 
@@ -859,55 +1672,64 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         updateLine(x1, y1, tileX(getMouseX()), tileY(getMouseY()));
     }
 
+    boolean checkConfigTap(){
+        return config.isShown() && config.getSelected().onConfigureTapped(input.mouseWorldX(), input.mouseWorldY());
+    }
+
     /** Handles tile tap events that are not platform specific. */
-    boolean tileTapped(@Nullable Building tile){
-        if(tile == null){
-            frag.inv.hide();
-            frag.config.hideConfig();
+    boolean tileTapped(@Nullable Building build){
+        planConfig.hide();
+        if(build == null){
+            inv.hide();
+            config.hideConfig();
+            commandBuildings.clear();
             return false;
         }
         boolean consumed = false, showedInventory = false;
 
-        //check if tapped block is configurable
-        if(tile.block.configurable && tile.interactable(player.team())){
+        //select building for commanding
+        if(build.block.commandable && commandMode){
+            //TODO handled in tap.
             consumed = true;
-            if(((!frag.config.isShown() && tile.shouldShowConfigure(player)) //if the config fragment is hidden, show
+        }else if(build.block.configurable && build.interactable(player.team())){ //check if tapped block is configurable
+            consumed = true;
+            if((!config.isShown() && build.shouldShowConfigure(player)) //if the config fragment is hidden, show
             //alternatively, the current selected block can 'agree' to switch config tiles
-            || (frag.config.isShown() && frag.config.getSelectedTile().onConfigureTileTapped(tile)))){
-                Sounds.click.at(tile);
-                frag.config.showConfig(tile);
+            || (config.isShown() && config.getSelected().onConfigureBuildTapped(build) && build.shouldShowConfigure(player))){
+                Sounds.click.at(build);
+                config.showConfig(build);
             }
             //otherwise...
-        }else if(!frag.config.hasConfigMouse()){ //make sure a configuration fragment isn't on the cursor
+        }else if(!config.hasConfigMouse()){ //make sure a configuration fragment isn't on the cursor
             //then, if it's shown and the current block 'agrees' to hide, hide it.
-            if(frag.config.isShown() && frag.config.getSelectedTile().onConfigureTileTapped(tile)){
+            if(config.isShown() && config.getSelected().onConfigureBuildTapped(build)){
                 consumed = true;
-                frag.config.hideConfig();
+                config.hideConfig();
             }
 
-            if(frag.config.isShown()){
+            if(config.isShown()){
                 consumed = true;
             }
         }
 
         //call tapped event
-        if(!consumed && tile.interactable(player.team())){
-            tile.tapped();
+        if(!consumed && build.interactable(player.team())){
+            build.tapped();
         }
 
         //consume tap event if necessary
-        if(tile.interactable(player.team()) && tile.block.consumesTap){
+        if(build.interactable(player.team()) && build.block.consumesTap){
             consumed = true;
-        }else if(tile.interactable(player.team()) && tile.block.synthetic() && !consumed){
-            if(tile.block.hasItems && tile.items.total() > 0){
-                frag.inv.showFor(tile);
+        }else if(build.interactable(player.team()) && build.block.synthetic() && (!consumed || build.block.allowConfigInventory)){
+            if(build.block.hasItems && build.items.total() > 0){
+                inv.showFor(build);
                 consumed = true;
                 showedInventory = true;
             }
         }
 
         if(!showedInventory){
-            frag.inv.hide();
+            inv.hide();
         }
 
         return consumed;
@@ -928,21 +1750,50 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     /** Tries to begin mining a tile, returns true if successful. */
     boolean tryBeginMine(Tile tile){
-        if(canMine(tile)){
-            //if a block is clicked twice, reset it
-            player.unit().mineTile = player.unit().mineTile == tile ? null : tile;
+        if(!player.dead() && canMine(tile)){
+            player.unit().mineTile = tile;
             return true;
         }
         return false;
     }
 
+    /** Tries to stop mining, returns true if mining was stopped. */
+    boolean tryStopMine(){
+        if(!player.dead() && player.unit().mining()){
+            player.unit().mineTile = null;
+            return true;
+        }
+        return false;
+    }
+
+    boolean tryStopMine(Tile tile){
+        if(!player.dead() && player.unit().mineTile == tile){
+            player.unit().mineTile = null;
+            return true;
+        }
+        return false;
+    }
+
+    boolean tryRepairDerelict(Tile selected){
+        if(selected != null && !state.rules.editor && player.team() != Team.derelict && selected.build != null && selected.build.block.unlockedNow() && selected.build.team == Team.derelict &&
+            Build.validPlace(selected.block(), player.team(), selected.build.tileX(), selected.build.tileY(), selected.build.rotation)){
+
+            player.unit().addBuild(new BuildPlan(selected.build.tileX(), selected.build.tileY(), selected.build.rotation, selected.block(), selected.build.config()));
+            return true;
+        }
+        return false;
+    }
+
+    boolean canRepairDerelict(Tile tile){
+        return tile != null && tile.build != null && !state.rules.editor && player.team() != Team.derelict && tile.build.team == Team.derelict && tile.build.block.unlockedNowHost() &&
+            Build.validPlace(tile.block(), player.team(), tile.build.tileX(), tile.build.tileY(), tile.build.rotation);
+    }
+
     boolean canMine(Tile tile){
         return !Core.scene.hasMouse()
-            && tile.drop() != null
-            && player.unit().validMine(tile)
-            && !(tile.floor().playerUnmineable && tile.overlay().itemDrop == null)
-            && player.unit().acceptsItem(tile.drop())
-            && tile.block() == Blocks.air;
+        && player.unit().validMine(tile)
+        && player.unit().acceptsItem(player.unit().getMineResult(tile))
+        && !((!Core.settings.getBool("doubletapmine") && tile.floor().playerUnmineable) && tile.overlay().itemDrop == null);
     }
 
     /** Returns the tile at the specified MOUSE coordinates. */
@@ -974,6 +1825,13 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         return World.toTile(vec.y);
     }
 
+    /** Forces the camera to a position and enables panning on desktop. */
+    public void panCamera(Vec2 position){
+        if(!locked()){
+            camera.position.set(position);
+        }
+    }
+
     public boolean selectedBlock(){
         return isPlacing();
     }
@@ -986,12 +1844,16 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         return false;
     }
 
+    public boolean isRebuildSelecting(){
+        return input.keyDown(Binding.rebuild_select);
+    }
+
     public float mouseAngle(float x, float y){
         return Core.input.mouseWorld(getMouseX(), getMouseY()).sub(x, y).angle();
     }
 
     public @Nullable Unit selectedUnit(){
-        Unit unit = Units.closest(player.team(), Core.input.mouseWorld().x, Core.input.mouseWorld().y, 40f, Unitc::isAI);
+        Unit unit = Units.closest(player.team(), Core.input.mouseWorld().x, Core.input.mouseWorld().y, 40f, u -> u.isAI() && u.type.playerControllable);
         if(unit != null){
             unit.hitbox(Tmp.r1);
             Tmp.r1.grow(6f);
@@ -1000,17 +1862,60 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             }
         }
 
-        Building tile = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
-        if(tile instanceof ControlBlock cont && cont.canControl() && tile.team == player.team()){
+        Building build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
+        if(build instanceof ControlBlock cont && cont.canControl() && build.team == player.team() && cont.unit() != player.unit() && cont.unit().isAI()){
             return cont.unit();
         }
 
         return null;
     }
 
+    public @Nullable Building selectedControlBuild(){
+        Building build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
+        if(build != null && !player.dead() && build.canControlSelect(player.unit()) && build.team == player.team()){
+            return build;
+        }
+        return null;
+    }
+
+    public @Nullable Unit selectedCommandUnit(float x, float y){
+        var tree = player.team().data().tree();
+        tmpUnits.clear();
+        float rad = 4f;
+        tree.intersect(x - rad/2f, y - rad/2f, rad, rad, tmpUnits);
+        return tmpUnits.min(u -> u.isCommandable(), u -> u.dst(x, y) - u.hitSize/2f);
+    }
+
+    public @Nullable Unit selectedEnemyUnit(float x, float y){
+        tmpUnits.clear();
+        float rad = 4f;
+
+        Seq<TeamData> data = state.teams.present;
+        for(int i = 0; i < data.size; i++){
+            if(data.items[i].team != player.team()){
+                data.items[i].tree().intersect(x - rad / 2f, y - rad / 2f, rad, rad, tmpUnits);
+            }
+        }
+
+        return tmpUnits.min(u -> !u.inFogTo(player.team()), u -> u.dst(x, y) - u.hitSize/2f);
+    }
+
+    public Seq<Unit> selectedCommandUnits(float x, float y, float w, float h, Boolf<Unit> predicate){
+        var tree = player.team().data().tree();
+        tmpUnits.clear();
+        float rad = 4f;
+        tree.intersect(Tmp.r1.set(x - rad/2f, y - rad/2f, rad*2f + w, rad*2f + h).normalize(), tmpUnits);
+        tmpUnits.removeAll(u -> !u.isCommandable() || !predicate.get(u));
+        return tmpUnits;
+    }
+
+    public Seq<Unit> selectedCommandUnits(float x, float y, float w, float h){
+        return selectedCommandUnits(x, y, w, h, u -> true);
+    }
+
     public void remove(){
         Core.input.removeProcessor(this);
-        frag.remove();
+        group.remove();
         if(Core.scene != null){
             Table table = (Table)Core.scene.find("inputTable");
             if(table != null){
@@ -1044,13 +1949,18 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             uiGroup.toBack();
             buildUI(uiGroup);
 
-            frag.add();
+            group.setFillParent(true);
+            Vars.ui.hudGroup.addChildBefore(Core.scene.find("overlaymarker"), group);
+
+            inv.build(group);
+            config.build(group);
+            planConfig.build(group);
         }
     }
 
     public boolean canShoot(){
         return block == null && !onConfigurable() && !isDroppingItem() && !player.unit().activelyBuilding() &&
-            !(player.unit() instanceof Mechc && player.unit().isFlying()) && !player.unit().mining();
+        !(player.unit() instanceof Mechc && player.unit().isFlying()) && !player.unit().mining() && !commandMode;
     }
 
     public boolean onConfigurable(){
@@ -1065,7 +1975,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         return droppingItem && !canTapPlayer(Core.input.mouseWorldX(), Core.input.mouseWorldY());
     }
 
-    public void tryDropItems(@Nullable Building tile, float x, float y){
+    public void tryDropItems(@Nullable Building build, float x, float y){
         if(!droppingItem || player.unit().stack.amount <= 0 || canTapPlayer(x, y) || state.isPaused() ){
             droppingItem = false;
             return;
@@ -1075,13 +1985,44 @@ 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())){
-            Call.transferInventory(player, tile);
+        if(build != null && build.acceptStack(stack.item, stack.amount, player.unit()) > 0 && build.interactable(player.team()) &&
+        build.block.hasItems && player.unit().stack().amount > 0 && build.interactable(player.team())){
+
+            if(!(state.rules.onlyDepositCore && !(build instanceof CoreBuild)) && itemDepositCooldown <= 0f){
+                Call.transferInventory(player, build);
+                itemDepositCooldown = state.rules.itemDepositCooldown;
+            }
         }else{
             Call.dropItem(player.angleTo(x, y));
         }
     }
 
+    public void rebuildArea(int x1, int y1, int x2, int y2){
+        NormalizeResult result = Placement.normalizeArea(x1, y1, x2, y2, rotation, false, 999999999);
+        Tmp.r1.set(result.x * tilesize, result.y * tilesize, (result.x2 - result.x) * tilesize, (result.y2 - result.y) * tilesize);
+
+        Iterator<BlockPlan> broken = player.team().data().plans.iterator();
+        while(broken.hasNext()){
+            BlockPlan plan = broken.next();
+            Block block = plan.block;
+            if(block.bounds(plan.x, plan.y, Tmp.r2).overlaps(Tmp.r1)){
+                player.unit().addBuild(new BuildPlan(plan.x, plan.y, plan.rotation, plan.block, plan.config));
+            }
+        }
+
+        intSet.clear();
+        for(int x = result.x; x <= result.x2; x++){
+            for(int y = result.y; y <= result.y2; y++){
+
+                Tile tile = world.tileBuilding(x, y);
+
+                if(tile != null && tile.build != null && intSet.add(tile.pos())){
+                    tryRepairDerelict(tile);
+                }
+            }
+        }
+    }
+
     public void tryBreakBlock(int x, int y){
         if(validBreak(x, y)){
             breakBlock(x, y);
@@ -1091,17 +2032,28 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     public boolean validPlace(int x, int y, Block type, int rotation){
         return validPlace(x, y, type, rotation, null);
     }
+    public boolean validPlace(int x, int y, Block type, int rotation, @Nullable BuildPlan ignore){
+        return validPlace(x, y, type, rotation, ignore, false);
+    }
 
-    public boolean validPlace(int x, int y, Block type, int rotation, BuildPlan ignore){
-        for(BuildPlan req : player.unit().plans()){
-            if(req != ignore
-                    && !req.breaking
-                    && req.block.bounds(req.x, req.y, Tmp.r1).overlaps(type.bounds(x, y, Tmp.r2))
-                    && !(type.canReplace(req.block) && Tmp.r1.equals(Tmp.r2))){
-                return false;
+    public boolean validPlace(int x, int y, Block type, int rotation, @Nullable BuildPlan ignore, boolean ignoreUnits){
+        if(player.isBuilder() && player.unit().plans.size > 0){
+            Tmp.r1.setCentered(x * tilesize + type.offset, y * tilesize + type.offset, type.size * tilesize);
+            plansOut.clear();
+            playerPlanTree.intersect(Tmp.r1, plansOut);
+
+            for(int i = 0; i < plansOut.size; i++){
+                var plan = plansOut.items[i];
+                if(plan != ignore
+                && !plan.breaking
+                && plan.block.bounds(plan.x, plan.y, Tmp.r1).overlaps(type.bounds(x, y, Tmp.r2))
+                && !(type.canReplace(plan.block) && Tmp.r1.equals(Tmp.r2))){
+                    return false;
+                }
             }
         }
-        return Build.validPlace(type, player.team(), x, y, rotation);
+
+        return ignoreUnits ? Build.validPlaceIgnoreUnits(type, player.team(), x, y, rotation, true) : Build.validPlace(type, player.team(), x, y, rotation);
     }
 
     public boolean validBreak(int x, int y){
@@ -1109,6 +2061,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public void breakBlock(int x, int y){
+        if(!player.isBuilder()) return;
+
         Tile tile = world.tile(x, y);
         if(tile != null && tile.build != null) tile = tile.build.tile;
         player.unit().addBuild(new BuildPlan(tile.x, tile.y));
@@ -1121,20 +2075,26 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     public void drawArrow(Block block, int x, int y, int rotation, boolean valid){
         float trns = (block.size / 2) * tilesize;
         int dx = Geometry.d4(rotation).x, dy = Geometry.d4(rotation).y;
+        float offsetx = x * tilesize + block.offset + dx*trns;
+        float offsety = y * tilesize + block.offset + dy*trns;
 
         Draw.color(!valid ? Pal.removeBack : Pal.accentBack);
-        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").width * Draw.scl,
-        Core.atlas.find("place-arrow").height * Draw.scl, rotation * 90 - 90);
+        TextureRegion regionArrow = Core.atlas.find("place-arrow");
+
+        Draw.rect(regionArrow,
+        offsetx,
+        offsety - 1,
+        regionArrow.width * regionArrow.scl(),
+        regionArrow.height * regionArrow.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").width * Draw.scl,
-        Core.atlas.find("place-arrow").height * Draw.scl, rotation * 90 - 90);
+        Draw.rect(regionArrow,
+        offsetx,
+        offsety,
+        regionArrow.width * regionArrow.scl(),
+        regionArrow.height * regionArrow.scl(),
+        rotation * 90 - 90);
     }
 
     void iterateLine(int startX, int startY, int endX, int endY, Cons<PlaceLine> cons){
@@ -1149,21 +2109,30 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             diagonal = !diagonal;
         }
 
-        if(diagonal){
-            var start = world.build(startX, startY);
-            var end = world.build(endX, endY);
+        int endRotation = -1;
+        var start = world.build(startX, startY);
+        var end = world.build(endX, endY);
+        if(diagonal && (block == null || block.allowDiagonal)){
             if(block != null && start instanceof ChainedBuilding && end instanceof ChainedBuilding
-                    && block.canReplace(end.block) && block.canReplace(start.block)){
+            && block.canReplace(end.block) && block.canReplace(start.block)){
                 points = Placement.upgradeLine(startX, startY, endX, endY);
             }else{
                 points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
             }
+        }else if(block != null && block.allowRectanglePlacement){
+            points = Placement.normalizeRectangle(startX, startY, endX, endY, block.size);
         }else{
             points = Placement.normalizeLine(startX, startY, endX, endY);
         }
+        if(points.size > 1 && end instanceof ChainedBuilding){
+            Point2 secondToLast = points.get(points.size - 2);
+            if(!(world.build(secondToLast.x, secondToLast.y) instanceof ChainedBuilding)){
+                endRotation = end.rotation;
+            }
+        }
 
         if(block != null){
-            block.changePlacementPath(points, rotation);
+            block.changePlacementPath(points, rotation, diagonal);
         }
 
         float angle = Angles.angle(startX, startY, endX, endY);
@@ -1185,13 +2154,17 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             line.x = point.x;
             line.y = point.y;
             if(!overrideLineRotation || diagonal){
+                int result = baseRotation;
                 if(next != null){
-                    line.rotation = Tile.relativeTo(point.x, point.y, next.x, next.y);
+                    result = Tile.relativeTo(point.x, point.y, next.x, next.y);
+                }else if(endRotation != -1){
+                    result = endRotation;
                 }else if(block.conveyorPlacement && i > 0){
                     Point2 prev = points.get(i - 1);
-                    line.rotation = Tile.relativeTo(prev.x, prev.y, point.x, point.y);
-                }else{
-                    line.rotation = baseRotation;
+                    result = Tile.relativeTo(prev.x, prev.y, point.x, point.y);
+                }
+                if(result != -1){
+                    line.rotation = result;
                 }
             }else{
                 line.rotation = rotation;
diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
index fb9fdbf86b..d67ed72d33 100644
--- a/core/src/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -1,7 +1,6 @@
 package mindustry.input;
 
 import arc.*;
-import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.input.GestureDetector.*;
 import arc.input.*;
@@ -26,6 +25,7 @@ import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 
+import static arc.Core.*;
 import static mindustry.Vars.*;
 import static mindustry.input.PlaceMode.*;
 
@@ -47,116 +47,133 @@ public class MobileInput extends InputHandler implements GestureListener{
     /** Animation data for crosshair. */
     public float crosshairScale;
     public Teamc lastTarget;
-    /** Used for shifting build requests. */
+    /** Used for shifting build plans. */
     public float shiftDeltaX, shiftDeltaY;
 
-    /** Place requests to be removed. */
+    /** Place plans to be removed. */
     public Seq<BuildPlan> removals = new Seq<>();
-    /** Whether or not the player is currently shifting all placed tiles. */
+    /** Whether the player is currently shifting all placed tiles. */
     public boolean selecting;
-    /** Whether the player is currently in line-place mode. */
-    public boolean lineMode, schematicMode;
+    /** Various modes that aren't enums for some reason. This should be cleaned up. */
+    public boolean lineMode, schematicMode, rebuildMode, queueCommandMode;
     /** Current place mode. */
     public PlaceMode mode = none;
     /** Whether no recipe was available when switching to break mode. */
-    public Block lastBlock;
-    /** Last placed request. Used for drawing block overlay. */
-    public BuildPlan lastPlaced;
+    public @Nullable Block lastBlock;
+    /** Last placed plan. Used for drawing block overlay. */
+    public @Nullable BuildPlan lastPlaced;
     /** Down tracking for panning. */
     public boolean down = false;
     /** Whether manual shooting (point with finger) is enabled. */
     public boolean manualShooting = false;
 
     /** Current thing being shot at. */
-    public Teamc target;
+    public @Nullable Teamc target;
     /** Payload target being moved to. Can be a position (for dropping), or a unit/block. */
-    public Position payloadTarget;
+    public @Nullable Position payloadTarget;
+    /** Unit last tapped, or null if last tap was not on a unit. */
+    public @Nullable Unit unitTapped;
+    /** Control building last tapped. */
+    public @Nullable Building buildingTapped;
+
+    {
+        Events.on(UnitDestroyEvent.class, e -> {
+            if(e.unit != null && e.unit.isPlayer() && e.unit.getPlayer().isLocal() && e.unit.type.weapons.contains(w -> w.bullet.killShooter)){
+                manualShooting = false;
+            }
+        });
+    }
 
     //region utility methods
 
     /** Check and assign targets for a specific position. */
     void checkTargets(float x, float y){
+        if(player.dead()) return;
+
         Unit unit = Units.closestEnemy(player.team(), x, y, 20f, u -> !u.dead);
 
-        if(unit != null){
+        if(unit != null && player.unit().type.canAttack){
             player.unit().mineTile = null;
             target = unit;
         }else{
             Building tile = world.buildWorld(x, y);
 
-            if((tile != null && player.team().isEnemy(tile.team) && tile.team != Team.derelict) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
+            if((tile != null && player.team() != tile.team && (tile.team != Team.derelict || state.rules.coreCapture)) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
                 player.unit().mineTile = null;
                 target = tile;
             }
         }
     }
 
-    /** Returns whether this tile is in the list of requests, or at least colliding with one. */
-    boolean hasRequest(Tile tile){
-        return getRequest(tile) != null;
+    /** Returns whether this tile is in the list of plans, or at least colliding with one. */
+    boolean hasPlan(Tile tile){
+        return getPlan(tile) != null;
     }
 
-    /** Returns whether this block overlaps any selection requests. */
+    /** Returns whether this block overlaps any selection plans. */
     boolean checkOverlapPlacement(int x, int y, Block block){
         r2.setSize(block.size * tilesize);
         r2.setCenter(x * tilesize + block.offset, y * tilesize + block.offset);
 
-        for(BuildPlan req : selectRequests){
-            Tile other = req.tile();
+        for(var plan : selectPlans){
+            Tile other = plan.tile();
 
-            if(other == null || req.breaking) continue;
+            if(other == null || plan.breaking) continue;
 
-            r1.setSize(req.block.size * tilesize);
-            r1.setCenter(other.worldx() + req.block.offset, other.worldy() + req.block.offset);
+            r1.setSize(plan.block.size * tilesize);
+            r1.setCenter(other.worldx() + plan.block.offset, other.worldy() + plan.block.offset);
 
             if(r2.overlaps(r1)){
                 return true;
             }
         }
 
-        for(BuildPlan req : player.unit().plans()){
-            Tile other = world.tile(req.x, req.y);
+        if(!player.dead()){
+            for(var plan : player.unit().plans()){
+                Tile other = world.tile(plan.x, plan.y);
 
-            if(other == null || req.breaking) continue;
+                if(other == null || plan.breaking) continue;
 
-            r1.setSize(req.block.size * tilesize);
-            r1.setCenter(other.worldx() + req.block.offset, other.worldy() + req.block.offset);
+                r1.setSize(plan.block.size * tilesize);
+                r1.setCenter(other.worldx() + plan.block.offset, other.worldy() + plan.block.offset);
 
-            if(r2.overlaps(r1)){
-                return true;
+                if(r2.overlaps(r1)){
+                    return true;
+                }
             }
         }
+
         return false;
     }
 
-    /** Returns the selection request that overlaps this tile, or null. */
-    BuildPlan getRequest(Tile tile){
+    /** Returns the selection plan that overlaps this tile, or null. */
+    BuildPlan getPlan(Tile tile){
         r2.setSize(tilesize);
         r2.setCenter(tile.worldx(), tile.worldy());
 
-        for(BuildPlan req : selectRequests){
-            Tile other = req.tile();
+        for(var plan : selectPlans){
+            Tile other = plan.tile();
 
             if(other == null) continue;
 
-            if(!req.breaking){
-                r1.setSize(req.block.size * tilesize);
-                r1.setCenter(other.worldx() + req.block.offset, other.worldy() + req.block.offset);
+            if(!plan.breaking){
+                r1.setSize(plan.block.size * tilesize);
+                r1.setCenter(other.worldx() + plan.block.offset, other.worldy() + plan.block.offset);
 
             }else{
                 r1.setSize(other.block().size * tilesize);
                 r1.setCenter(other.worldx() + other.block().offset, other.worldy() + other.block().offset);
             }
 
-            if(r2.overlaps(r1)) return req;
+            if(r2.overlaps(r1)) return plan;
         }
         return null;
     }
 
-    void removeRequest(BuildPlan request){
-        selectRequests.remove(request, true);
-        if(!request.breaking){
-            removals.add(request);
+    void removePlan(BuildPlan plan){
+        selectPlans.remove(plan, true);
+        if(!plan.breaking){
+            removals.add(plan);
         }
     }
 
@@ -173,22 +190,20 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     @Override
     public void buildPlacementUI(Table table){
-        table.image().color(Pal.gray).height(4f).colspan(4).growX();
-        table.row();
         table.left().margin(0f).defaults().size(48f);
 
-        table.button(Icon.hammer, Styles.clearTogglePartiali, () -> {
+        table.button(Icon.hammer, Styles.clearNoneTogglei, () -> {
             mode = mode == breaking ? block == null ? none : placing : breaking;
             lastBlock = block;
         }).update(l -> l.setChecked(mode == breaking)).name("breakmode");
 
         //diagonal swap button
-        table.button(Icon.diagonal, Styles.clearTogglePartiali, () -> {
+        table.button(Icon.diagonal, Styles.clearNoneTogglei, () -> {
             Core.settings.put("swapdiagonal", !Core.settings.getBool("swapdiagonal"));
         }).update(l -> l.setChecked(Core.settings.getBool("swapdiagonal")));
 
         //rotate button
-        table.button(Icon.right, Styles.clearTogglePartiali, () -> {
+        table.button(Icon.right, Styles.clearNoneTogglei, () -> {
             if(block != null && block.rotate){
                 rotation = Mathf.mod(rotation + 1, 4);
             }else{
@@ -196,6 +211,8 @@ public class MobileInput extends InputHandler implements GestureListener{
                 if(schematicMode){
                     block = null;
                     mode = none;
+                }else{
+                    rebuildMode = false;
                 }
             }
         }).update(i -> {
@@ -207,71 +224,115 @@ public class MobileInput extends InputHandler implements GestureListener{
         });
 
         //confirm button
-        table.button(Icon.ok, Styles.clearPartiali, () -> {
-            for(BuildPlan request : selectRequests){
-                Tile tile = request.tile();
+        table.button(Icon.ok, Styles.clearNoneTogglei, () -> {
+            if(schematicMode){
+                rebuildMode = !rebuildMode;
+            }else{
+                for(BuildPlan plan : selectPlans){
+                    Tile tile = plan.tile();
 
-                //actually place/break all selected blocks
-                if(tile != null){
-                    if(!request.breaking){
-                        if(validPlace(request.x, request.y, request.block, request.rotation)){
-                            BuildPlan other = getRequest(request.x, request.y, request.block.size, null);
-                            BuildPlan copy = request.copy();
+                    //actually place/break all selected blocks
+                    if(tile != null){
+                        if(!plan.breaking){
+                            if(validPlace(plan.x, plan.y, plan.block, plan.rotation, null, true)){
+                                BuildPlan other = getPlan(plan.x, plan.y, plan.block.size, null);
+                                BuildPlan copy = plan.copy();
 
-                            if(other == null){
-                                player.unit().addBuild(copy);
-                            }else if(!other.breaking && other.x == request.x && other.y == request.y && other.block.size == request.block.size){
-                                player.unit().plans().remove(other);
-                                player.unit().addBuild(copy);
+                                if(other == null){
+                                    player.unit().addBuild(copy);
+                                }else if(!other.breaking && other.x == plan.x && other.y == plan.y && other.block.size == plan.block.size){
+                                    player.unit().plans().remove(other);
+                                    player.unit().addBuild(copy);
+                                }
                             }
-                        }
 
-                        rotation = request.rotation;
-                    }else{
-                        tryBreakBlock(tile.x, tile.y);
+                            rotation = plan.rotation;
+                        }else{
+                            tryBreakBlock(tile.x, tile.y);
+                        }
                     }
                 }
-            }
 
-            //move all current requests to removal array so they fade out
-            removals.addAll(selectRequests.select(r -> !r.breaking));
-            selectRequests.clear();
-            selecting = false;
-        }).visible(() -> !selectRequests.isEmpty()).name("confirmplace");
+                //move all current plans to removal array so they fade out
+                removals.addAll(selectPlans.select(r -> !r.breaking));
+                selectPlans.clear();
+                selecting = false;
+            }
+        }).visible(() -> !selectPlans.isEmpty() || schematicMode || rebuildMode).update(i -> {
+            i.getStyle().imageUp = schematicMode || rebuildMode ? Icon.wrench : Icon.ok;
+            i.setChecked(rebuildMode);
+
+        }).name("confirmplace");
+    }
+
+    public boolean showCancel(){
+        return !player.dead() && (player.unit().isBuilding() || block != null || mode == breaking || !selectPlans.isEmpty()) && !hasSchematic();
+    }
+
+    public boolean hasSchematic(){
+        return lastSchematic != null && !selectPlans.isEmpty();
     }
 
     @Override
     public void buildUI(Group group){
-        Boolp schem = () -> lastSchematic != null && !selectRequests.isEmpty();
 
         group.fill(t -> {
-            t.visible(() -> (player.unit().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get());
+            t.visible(this::showCancel);
             t.bottom().left();
             t.button("@cancel", Icon.cancel, () -> {
-                player.unit().clearBuilding();
-                selectRequests.clear();
+                if(!player.dead()){
+                    player.unit().clearBuilding();
+                }
+                selectPlans.clear();
                 mode = none;
                 block = null;
             }).width(155f).height(50f).margin(12f);
         });
 
         group.fill(t -> {
-            t.visible(schem);
+            t.visible(() -> !showCancel() && block == null && !hasSchematic() && !state.rules.editor);
+            t.bottom().left();
+
+            t.button("@command.queue", Icon.rightOpen, Styles.clearTogglet, () -> {
+                queueCommandMode = !queueCommandMode;
+            }).width(155f).height(48f).margin(12f).checked(b -> queueCommandMode).visible(() -> commandMode).row();
+
+            t.button("@command", Icon.units, Styles.clearTogglet, () -> {
+                commandMode = !commandMode;
+            }).width(155f).height(48f).margin(12f).checked(b -> commandMode);
+
+            //for better looking insets
+            t.rect((x, y, w, h) -> {
+                if(Core.scene.marginBottom > 0){
+                    Tex.paneRight.draw(x, 0, w, y);
+                }
+            }).fillX().row();
+        });
+
+        group.fill(t -> {
+            t.visible(this::hasSchematic);
             t.bottom().left();
             t.table(Tex.pane, b -> {
                 b.defaults().size(50f);
 
-                ImageButtonStyle style = Styles.clearPartiali;
+                ImageButtonStyle style = Styles.clearNonei;
 
                 b.button(Icon.save, style, this::showSchematicSave).disabled(f -> lastSchematic == null || lastSchematic.file != null);
                 b.button(Icon.cancel, style, () -> {
-                    selectRequests.clear();
+                    selectPlans.clear();
+                    lastSchematic = null;
                 });
                 b.row();
-                b.button(Icon.flipX, style, () -> flipRequests(selectRequests, true));
-                b.button(Icon.flipY, style, () -> flipRequests(selectRequests, false));
+                b.button(Icon.flipX, style, () -> flipPlans(selectPlans, true));
+                b.button(Icon.flipY, style, () -> flipPlans(selectPlans, false));
                 b.row();
-                b.button(Icon.rotate, style, () -> rotateRequests(selectRequests, 1));
+                b.button(Icon.rotate, style, () -> rotatePlans(selectPlans, 1)).update(i -> {
+                    var img = i.getCells().first().get();
+
+                    img.setScale(-1f, 1f);
+                    //why the heck doesn't setOrigin work for scaling
+                    img.setTranslation(img.getWidth(), 0f);
+                });
 
             }).margin(4f);
         });
@@ -281,18 +342,18 @@ public class MobileInput extends InputHandler implements GestureListener{
     public void drawBottom(){
         Lines.stroke(1f);
 
-        //draw requests about to be removed
-        for(BuildPlan request : removals){
-            Tile tile = request.tile();
+        //draw plans about to be removed
+        for(BuildPlan plan : removals){
+            Tile tile = plan.tile();
 
             if(tile == null) continue;
 
-            request.animScale = Mathf.lerpDelta(request.animScale, 0f, 0.2f);
+            plan.animScale = Mathf.lerpDelta(plan.animScale, 0f, 0.2f);
 
-            if(request.breaking){
-                drawSelected(request.x, request.y, tile.block(), Pal.remove);
+            if(plan.breaking){
+                drawSelected(plan.x, plan.y, tile.block(), Pal.remove);
             }else{
-                request.block.drawPlan(request, allRequests(), true);
+                plan.block.drawPlan(plan, allPlans(), true);
             }
         }
 
@@ -306,14 +367,15 @@ public class MobileInput extends InputHandler implements GestureListener{
 
             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);
+                for(int i = 0; i < linePlans.size; i++){
+                    BuildPlan plan = linePlans.get(i);
+                    if(i == linePlans.size - 1 && plan.block.rotate && plan.block.drawArrow){
+                        drawArrow(block, plan.x, plan.y, plan.rotation);
                     }
-                    request.block.drawPlan(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);
+                    plan.block.drawPlan(plan, allPlans(), validPlace(plan.x, plan.y, plan.block, plan.rotation) && getPlan(plan.x, plan.y, plan.block.size, null) == null);
+                    drawSelected(plan.x, plan.y, plan.block, Pal.accent);
                 }
+                linePlans.each(this::drawOverPlan);
             }else if(mode == breaking){
                 drawBreakSelection(lineStartX, lineStartY, tileX, tileY);
             }
@@ -324,44 +386,49 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     @Override
     public void drawTop(){
-        //draw schematic selection
         if(mode == schematicSelect){
             drawSelection(lineStartX, lineStartY, lastLineX, lastLineY, Vars.maxSchematicSize);
+        }else if(mode == rebuildSelect){
+            drawRebuildSelection(lineStartX, lineStartY, lastLineX, lastLineY);
         }
     }
 
     @Override
     public void drawOverSelect(){
-        //draw list of requests
-        for(BuildPlan request : selectRequests){
-            Tile tile = request.tile();
+        //draw list of plans
+        for(BuildPlan plan : selectPlans){
+            Tile tile = plan.tile();
 
             if(tile == null) continue;
 
-            if((!request.breaking && validPlace(tile.x, tile.y, request.block, request.rotation))
-            || (request.breaking && validBreak(tile.x, tile.y))){
-                request.animScale = Mathf.lerpDelta(request.animScale, 1f, 0.2f);
+            if((!plan.breaking && validPlace(tile.x, tile.y, plan.block, plan.rotation))
+            || (plan.breaking && validBreak(tile.x, tile.y))){
+                plan.animScale = Mathf.lerpDelta(plan.animScale, 1f, 0.2f);
             }else{
-                request.animScale = Mathf.lerpDelta(request.animScale, 0.6f, 0.1f);
+                plan.animScale = Mathf.lerpDelta(plan.animScale, 0.6f, 0.1f);
             }
 
             Tmp.c1.set(Draw.getMixColor());
 
-            if(!request.breaking && request == lastPlaced && request.block != null){
+            if(!plan.breaking && plan == lastPlaced && plan.block != null){
                 Draw.mixcol();
-                if(request.block.rotate) drawArrow(request.block, tile.x, tile.y, request.rotation);
+                if(plan.block.rotate && plan.block.drawArrow) drawArrow(plan.block, tile.x, tile.y, plan.rotation);
             }
 
             Draw.reset();
-            drawRequest(request);
-            if(!request.breaking){
-                drawOverRequest(request);
+            drawPlan(plan);
+            if(!plan.breaking){
+                drawOverPlan(plan);
             }
 
-            //draw last placed request
-            if(!request.breaking && request == lastPlaced && request.block != null){
+            //draw last placed plan
+            if(!plan.breaking && plan == lastPlaced && plan.block != null){
+                int rot = plan.block.planRotation(plan.rotation);
+                boolean valid = validPlace(tile.x, tile.y, plan.block, rot);
                 Draw.mixcol();
-                request.block.drawPlace(tile.x, tile.y, rotation, validPlace(tile.x, tile.y, request.block, rotation));
+                plan.block.drawPlace(tile.x, tile.y, rot, valid);
+
+                drawOverlapCheck(plan.block, tile.x, tile.y, valid);
             }
         }
 
@@ -374,46 +441,45 @@ public class MobileInput extends InputHandler implements GestureListener{
 
             crosshairScale = Mathf.lerpDelta(crosshairScale, 1f, 0.2f);
 
-            Draw.color(Pal.remove);
-            Lines.stroke(1f);
-
-            float radius = Interp.swingIn.apply(crosshairScale);
-
-            Lines.poly(target.getX(), target.getY(), 4, 7f * radius, Time.time * 1.5f);
-            Lines.spikes(target.getX(), target.getY(), 3f * radius, 6f * radius, 4, Time.time * 1.5f);
+            Drawf.target(target.getX(), target.getY(), 7f * Interp.swingIn.apply(crosshairScale), Pal.remove);
         }
 
         Draw.reset();
     }
 
     @Override
-    protected void drawRequest(BuildPlan request){
-        if(request.tile() == null) return;
-        brequest.animScale = request.animScale = Mathf.lerpDelta(request.animScale, 1f, 0.1f);
+    protected void drawPlan(BuildPlan plan){
+        if(plan.tile() == null) return;
+        bplan.animScale = plan.animScale = Mathf.lerpDelta(plan.animScale, 1f, 0.1f);
 
-        if(request.breaking){
-            drawSelected(request.x, request.y, request.tile().block(), Pal.remove);
+        if(plan.breaking){
+            drawSelected(plan.x, plan.y, plan.tile().block(), Pal.remove);
         }else{
-            request.block.drawPlan(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
-            drawSelected(request.x, request.y, request.block, Pal.accent);
+            plan.block.drawPlan(plan, allPlans(), validPlace(plan.x, plan.y, plan.block, plan.rotation));
+            drawSelected(plan.x, plan.y, plan.block, Pal.accent);
         }
     }
 
     //endregion
     //region input events, overrides
 
+    @Override
+    public boolean isRebuildSelecting(){
+        return rebuildMode;
+    }
+
     @Override
     protected int schemOriginX(){
         Tmp.v1.setZero();
-        selectRequests.each(r -> Tmp.v1.add(r.drawx(), r.drawy()));
-        return World.toTile(Tmp.v1.scl(1f / selectRequests.size).x);
+        selectPlans.each(r -> Tmp.v1.add(r.drawx(), r.drawy()));
+        return World.toTile(Tmp.v1.scl(1f / selectPlans.size).x);
     }
 
     @Override
     protected int schemOriginY(){
         Tmp.v1.setZero();
-        selectRequests.each(r -> Tmp.v1.add(r.drawx(), r.drawy()));
-        return World.toTile(Tmp.v1.scl(1f / selectRequests.size).y);
+        selectPlans.each(r -> Tmp.v1.add(r.drawx(), r.drawy()));
+        return World.toTile(Tmp.v1.scl(1f / selectPlans.size).y);
     }
 
     @Override
@@ -428,14 +494,14 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     @Override
     public void useSchematic(Schematic schem){
-        selectRequests.clear();
-        selectRequests.addAll(schematics.toRequests(schem, player.tileX(), player.tileY()));
+        selectPlans.clear();
+        selectPlans.addAll(schematics.toPlans(schem, World.toTile(Core.camera.position.x), World.toTile(Core.camera.position.y)));
         lastSchematic = schem;
     }
 
     @Override
     public boolean touchDown(int screenX, int screenY, int pointer, KeyCode button){
-        if(state.isMenu()) return false;
+        if(state.isMenu() || locked()) return false;
 
         down = true;
 
@@ -449,13 +515,14 @@ public class MobileInput extends InputHandler implements GestureListener{
         //ignore off-screen taps
         if(cursor == null || Core.scene.hasMouse(screenX, screenY)) return false;
 
-        //only begin selecting if the tapped block is a request
-        selecting = hasRequest(cursor);
+        //only begin selecting if the tapped block is a plan
+        selecting = hasPlan(cursor);
 
         //call tap events
         if(pointer == 0 && !selecting){
             if(schematicMode && block == null){
-                mode = schematicSelect;
+                mode = rebuildMode ? rebuildSelect : schematicSelect;
+
                 //engage schematic selection mode
                 int tileX = tileX(screenX);
                 int tileY = tileY(screenY);
@@ -489,7 +556,7 @@ public class MobileInput extends InputHandler implements GestureListener{
             int tileY = tileY(screenY);
 
             if(mode == placing && isPlacing()){
-                flushSelectRequests(lineRequests);
+                flushSelectPlans(linePlans);
                 Events.fire(new LineConfirmEvent());
             }else if(mode == breaking){
                 removeSelection(lineStartX, lineStartY, tileX, tileY, true);
@@ -497,25 +564,32 @@ public class MobileInput extends InputHandler implements GestureListener{
 
             lineMode = false;
         }else if(mode == schematicSelect){
-            selectRequests.clear();
+            selectPlans.clear();
             lastSchematic = schematics.create(lineStartX, lineStartY, lastLineX, lastLineY);
             useSchematic(lastSchematic);
-            if(selectRequests.isEmpty()){
+            if(selectPlans.isEmpty()){
                 lastSchematic = null;
             }
             schematicMode = false;
             mode = none;
+        }else if(mode == rebuildSelect){
+            rebuildArea(lineStartX, lineStartY, lastLineX, lastLineY);
+            mode = none;
         }else{
             Tile tile = tileAt(screenX, screenY);
 
             tryDropItems(tile == null ? null : tile.build, Core.input.mouseWorld(screenX, screenY).x, Core.input.mouseWorld(screenX, screenY).y);
         }
+
+        //select some units
+        selectUnitsRect();
+
         return false;
     }
 
     @Override
     public boolean longPress(float x, float y){
-        if(state.isMenu()|| player.dead()) return false;
+        if(state.isMenu()|| player.dead() || locked()) return false;
 
         //get tile on cursor
         Tile cursor = tileAt(x, y);
@@ -526,26 +600,36 @@ public class MobileInput extends InputHandler implements GestureListener{
         if(mode == none){
             Vec2 pos = Core.input.mouseWorld(x, y);
 
-            if(player.unit() instanceof Payloadc pay){
-                Unit target = Units.closest(player.team(), pos.x, pos.y, 8f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(pos, u.hitSize + 8f));
-                if(target != null){
-                    payloadTarget = target;
-                }else{
-                    Building build = world.buildWorld(pos.x, pos.y);
+            if(commandMode){
+
+                //long press begins rect selection.
+                commandRect = true;
+                commandRectX = input.mouseWorldX();
+                commandRectY = input.mouseWorldY();
 
-                    if(build != null && build.team == player.team() && pay.canPickup(build)){
-                        payloadTarget = build;
-                    }else if(pay.hasPayload()){
-                        //drop off at position
-                        payloadTarget = new Vec2(pos);
-                    }else{
-                        manualShooting = true;
-                        this.target = null;
-                    }
-                }
             }else{
-                manualShooting = true;
-                this.target = null;
+
+                if(player.unit() instanceof Payloadc pay){
+                    Unit target = Units.closest(player.team(), pos.x, pos.y, 8f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(pos, u.hitSize + 8f));
+                    if(target != null){
+                        payloadTarget = target;
+                    }else{
+                        Building build = world.buildWorld(pos.x, pos.y);
+
+                        if(build != null && build.team == player.team() && (pay.canPickup(build) || build.getPayload() != null && pay.canPickupPayload(build.getPayload()))){
+                            payloadTarget = build;
+                        }else if(pay.hasPayload()){
+                            //drop off at position
+                            payloadTarget = new Vec2(pos);
+                        }else{
+                            manualShooting = true;
+                            this.target = null;
+                        }
+                    }
+                }else{
+                    manualShooting = true;
+                    this.target = null;
+                }
             }
 
             if(!state.isPaused()) Fx.select.at(pos);
@@ -554,7 +638,7 @@ public class MobileInput extends InputHandler implements GestureListener{
             //ignore off-screen taps
             if(cursor == null) return false;
 
-            //remove request if it's there
+            //remove plan if it's there
             //long pressing enables line mode otherwise
             lineStartX = cursor.x;
             lineStartY = cursor.y;
@@ -575,7 +659,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     @Override
     public boolean tap(float x, float y, int count, KeyCode button){
-        if(state.isMenu() || lineMode) return false;
+        if(state.isMenu() || lineMode || locked()) return false;
 
         float worldx = Core.input.mouseWorld(x, y).x, worldy = Core.input.mouseWorld(x, y).y;
 
@@ -593,35 +677,46 @@ public class MobileInput extends InputHandler implements GestureListener{
             checkTargets(worldx, worldy);
         }
 
-        //remove if request present
-        if(hasRequest(cursor)){
-            removeRequest(getRequest(cursor));
+        //remove if plan present
+        if(hasPlan(cursor)){
+            removePlan(getPlan(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, block.nextConfig()));
+            selectPlans.add(lastPlaced = new BuildPlan(cursor.x, cursor.y, rotation, block, block.nextConfig()));
             block.onNewPlan(lastPlaced);
-        }else if(mode == breaking && validBreak(linked.x,linked.y) && !hasRequest(linked)){
+        }else if(mode == breaking && validBreak(linked.x,linked.y) && !hasPlan(linked)){
             //add to selection queue if it's a valid BREAK position
-            selectRequests.add(new BuildPlan(linked.x, linked.y));
+            selectPlans.add(new BuildPlan(linked.x, linked.y));
+        }else if((commandMode && selectedUnits.size > 0) || commandBuildings.size > 0){
+            //handle selecting units with command mode
+            commandTap(x, y, queueCommandMode);
+        }else if(commandMode){
+            tapCommandUnit();
         }else{
-            if(!canTapPlayer(worldx, worldy) && !tileTapped(linked.build)){
-                tryBeginMine(cursor);
-            }
-
-            //control units.
+            //control units
             if(count == 2){
                 //reset payload target
                 payloadTarget = null;
-                //apply command on double tap when own unit is tapped
-                if(!player.dead() && Mathf.within(worldx, worldy, player.unit().x, player.unit().y, player.unit().hitSize * 0.6f + 8f) && player.unit().type.commandLimit > 0){
-                    Call.unitCommand(player);
-                }else{
-                    //control a unit/block
-                    Unit on = selectedUnit();
-                    if(on != null){
-                        Call.unitControl(player, on);
-                    }
+
+                //control a unit/block detected on first tap of double-tap
+                if(unitTapped != null && state.rules.possessionAllowed && unitTapped.isAI() && unitTapped.team == player.team() && !unitTapped.dead && unitTapped.type.playerControllable){
+                    Call.unitControl(player, unitTapped);
+                    recentRespawnTimer = 1f;
+                }else if(buildingTapped != null && state.rules.possessionAllowed){
+                    Call.buildingControlSelect(player, buildingTapped);
+                    recentRespawnTimer = 1f;
+                }else if(!checkConfigTap() && !tryBeginMine(cursor)){
+                    tileTapped(linked.build);
                 }
+                return false;
+            }
+
+            unitTapped = selectedUnit();
+            buildingTapped = selectedControlBuild();
+
+            //prevent mining if placing/breaking blocks
+            if(!tryRepairDerelict(cursor) && !tryStopMine() && !canTapPlayer(worldx, worldy) && !checkConfigTap() && !tileTapped(linked.build) && mode == none && !Core.settings.getBool("doubletapmine")){
+                tryBeginMine(cursor);
             }
         }
 
@@ -633,7 +728,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         super.updateState();
 
         if(state.isMenu()){
-            selectRequests.clear();
+            selectPlans.clear();
             removals.clear();
             mode = none;
             manualShooting = false;
@@ -645,21 +740,48 @@ public class MobileInput extends InputHandler implements GestureListener{
     public void update(){
         super.update();
 
+        boolean locked = locked();
+
+        if(!commandMode){
+            queueCommandMode = false;
+        }
+
+        //cannot rebuild and place at the same time
+        if(block != null){
+            rebuildMode = false;
+        }
+
         if(player.dead()){
             mode = none;
             manualShooting = false;
             payloadTarget = null;
         }
 
+        if(locked || block != null || scene.hasField() || hasSchematic() || selectPlans.size > 0){
+            commandMode = false;
+        }
+
+        //validate commanding units
+        selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid() || u.team != player.team());
+
+        if(!commandMode){
+            commandBuildings.clear();
+            selectedUnits.clear();
+        }
+
         //zoom camera
-        if(Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!isPlacing() || !block.rotate) && selectRequests.isEmpty()))){
+        if(!locked  && !scene.hasKeyboard() && !scene.hasScroll() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!player.isBuilder() || !isPlacing() || !block.rotate) && selectPlans.isEmpty()))){
             renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
         }
 
-        if(!Core.settings.getBool("keyboard")){
+        if(!Core.settings.getBool("keyboard") && !locked && !scene.hasKeyboard()){
             //move camera around
             float camSpeed = 6f;
-            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));
+            Vec2 delta = Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta * camSpeed);
+            Core.camera.position.add(delta);
+            if(!delta.isZero()){
+                spectating = null;
+            }
         }
 
         if(Core.settings.getBool("keyboard")){
@@ -672,7 +794,7 @@ public class MobileInput extends InputHandler implements GestureListener{
             }
         }
 
-        if(!player.dead() && !state.isPaused()){
+        if(!player.dead() && !state.isPaused() && !locked){
             updateMovement(player.unit());
         }
 
@@ -700,11 +822,15 @@ public class MobileInput extends InputHandler implements GestureListener{
         }
 
         //stop select when not in schematic mode
-        if(!schematicMode && mode == schematicSelect){
+        if(!schematicMode && (mode == schematicSelect || mode == rebuildSelect)){
             mode = none;
         }
 
-        if(mode == schematicSelect){
+        if(!rebuildMode && mode == rebuildSelect){
+            mode = none;
+        }
+
+        if(mode == schematicSelect || mode == rebuildSelect){
             lastLineX = rawTileX();
             lastLineY = rawTileY();
             autoPan();
@@ -721,7 +847,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
             //When in line mode, pan when near screen edges automatically
             if(Core.input.isTouched(0)){
-               autoPan();
+                autoPan();
             }
 
             int lx = tileX(Core.input.mouseX()), ly = tileY(Core.input.mouseY());
@@ -732,21 +858,20 @@ public class MobileInput extends InputHandler implements GestureListener{
                 updateLine(lineStartX, lineStartY, lx, ly);
             }
         }else{
-            lineRequests.clear();
+            linePlans.clear();
             lineScale = 0f;
         }
 
-        //remove place requests that have disappeared
+        //remove place plans that have disappeared
         for(int i = removals.size - 1; i >= 0; i--){
-            BuildPlan request = removals.get(i);
 
-            if(request.animScale <= 0.0001f){
+            if(removals.get(i).animScale <= 0.0001f){
                 removals.remove(i);
                 i--;
             }
         }
 
-        if(player.shooting && (player.unit().activelyBuilding() || player.unit().mining())){
+        if(player.shooting && !player.dead() && (player.unit().activelyBuilding() || player.unit().mining())){
             player.shooting = false;
         }
     }
@@ -782,7 +907,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     @Override
     public boolean pan(float x, float y, float deltaX, float deltaY){
-        if(Core.scene == null || Core.scene.hasDialog() || Core.settings.getBool("keyboard")) return false;
+        if(Core.scene == null || Core.scene.hasDialog() || Core.settings.getBool("keyboard") || locked() || commandRect) return false;
 
         float scale = Core.camera.width / Core.graphics.getWidth();
         deltaX *= scale;
@@ -796,7 +921,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         //do not pan with manual shooting enabled
         if(!down || manualShooting) return false;
 
-        if(selecting){ //pan all requests
+        if(selecting){ //pan all plans
             shiftDeltaX += deltaX;
             shiftDeltaY += deltaY;
 
@@ -804,21 +929,24 @@ public class MobileInput extends InputHandler implements GestureListener{
             int shiftedY = (int)(shiftDeltaY / tilesize);
 
             if(Math.abs(shiftedX) > 0 || Math.abs(shiftedY) > 0){
-                for(BuildPlan req : selectRequests){
-                    if(req.breaking) continue; //don't shift removal requests
-                    req.x += shiftedX;
-                    req.y += shiftedY;
+                for(var plan : selectPlans){
+                    if(plan.breaking) continue; //don't shift removal plans
+                    plan.x += shiftedX;
+                    plan.y += shiftedY;
                 }
 
                 shiftDeltaX %= tilesize;
                 shiftDeltaY %= tilesize;
             }
-        }else if(!renderer.isLanding()){
+        }else{
             //pan player
             Core.camera.position.x -= deltaX;
             Core.camera.position.y -= deltaY;
+            spectating = null;
         }
 
+        camera.position.clamp(-camera.width/4f, -camera.height/4f, world.unitWidth() + camera.width/4f, world.unitHeight() + camera.height/4f);
+
         return false;
     }
 
@@ -850,10 +978,8 @@ public class MobileInput extends InputHandler implements GestureListener{
 
         boolean omni = unit.type.omniMovement;
         boolean allowHealing = type.canHeal;
-        boolean validHealTarget = allowHealing && target instanceof Building && ((Building)target).isValid() && target.team() == unit.team &&
-            ((Building)target).damaged() && target.within(unit, type.range);
+        boolean validHealTarget = allowHealing && target instanceof Building b && b.isValid() && target.team() == unit.team && b.damaged() && target.within(unit, type.range);
         boolean boosted = (unit instanceof Mechc && unit.isFlying());
-
         //reset target if:
         // - in the editor, or...
         // - it's both an invalid standard target and an invalid heal target
@@ -864,11 +990,11 @@ public class MobileInput extends InputHandler implements GestureListener{
         targetPos.set(Core.camera.position);
         float attractDst = 15f;
 
-        float speed = unit.realSpeed();
+        float speed = unit.speed();
         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());
-        boolean aimCursor = omni && player.shooting && type.hasWeapons() && type.faceTarget && !boosted && type.rotateShooting;
+        boolean aimCursor = omni && player.shooting && type.hasWeapons() && !boosted && type.faceTarget;
 
         if(aimCursor){
             unit.lookAt(mouseAngle);
@@ -876,6 +1002,11 @@ public class MobileInput extends InputHandler implements GestureListener{
             unit.lookAt(unit.prefRotation());
         }
 
+        //validate payload, if it's a destroyed unit/building, remove it
+        if(payloadTarget instanceof Healthc h && !h.isValid()){
+            payloadTarget = null;
+        }
+
         if(payloadTarget != null && unit instanceof Payloadc pay){
             targetPos.set(payloadTarget);
             attractDst = 0f;
@@ -884,7 +1015,7 @@ public class MobileInput extends InputHandler implements GestureListener{
                 if(payloadTarget instanceof Vec2 && pay.hasPayload()){
                     //vec -> dropping something
                     tryDropPayload();
-                }else if(payloadTarget instanceof Building build && pay.canPickup(build)){
+                }else if(payloadTarget instanceof Building build && build.team == unit.team){
                     //building -> picking building up
                     Call.requestBuildPayload(player, build);
                 }else if(payloadTarget instanceof Unit other && pay.canPickup(other)){
@@ -906,27 +1037,15 @@ public class MobileInput extends InputHandler implements GestureListener{
             unit.vel.approachDelta(Vec2.ZERO, unit.speed() * type.accel / 2f);
         }
 
-        float expansion = 3f;
-
         unit.hitbox(rect);
-        rect.x -= expansion;
-        rect.y -= expansion;
-        rect.width += expansion * 2f;
-        rect.height += expansion * 2f;
+        rect.grow(4f);
 
-        player.boosting = collisions.overlapsTile(rect) || !unit.within(targetPos, 85f);
+        player.boosting = collisions.overlapsTile(rect, EntityCollisions::solid) || !unit.within(targetPos, 85f);
 
-        if(omni){
-            unit.moveAt(movement);
-        }else{
-            unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len()));
-            if(!movement.isZero()){
-                unit.vel.rotateTo(movement.angle(), unit.type.rotateSpeed * Math.max(Time.delta, 1));
-            }
-        }
+        unit.movePref(movement);
 
         //update shooting if not building + not mining
-        if(!player.unit().activelyBuilding() && player.unit().mineTile == null){
+        if(!unit.activelyBuilding() && unit.mineTile == null){
 
             //autofire targeting
             if(manualShooting){
@@ -935,10 +1054,12 @@ public class MobileInput extends InputHandler implements GestureListener{
             }else if(target == null){
                 player.shooting = false;
                 if(Core.settings.getBool("autotarget") && !(player.unit() instanceof BlockUnitUnit u && u.tile() instanceof ControlBlock c && !c.shouldAutoTarget())){
-                    target = Units.closestTarget(unit.team, unit.x, unit.y, range, u -> u.team != Team.derelict, u -> u.team != Team.derelict);
+                    if(unit.type.canAttack){
+                        target = Units.closestTarget(unit.team, unit.x, unit.y, range, u -> u.checkTarget(type.targetAir, type.targetGround), u -> type.targetGround);
+                    }
 
                     if(allowHealing && target == null){
-                        target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(Team.sharded));
+                        target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(player.team()));
                         if(target != null && !unit.within(target, range)){
                             target = null;
                         }
diff --git a/core/src/mindustry/input/PlaceMode.java b/core/src/mindustry/input/PlaceMode.java
index 1c2d0d6ce2..84bab76248 100644
--- a/core/src/mindustry/input/PlaceMode.java
+++ b/core/src/mindustry/input/PlaceMode.java
@@ -1,5 +1,5 @@
 package mindustry.input;
 
 public enum PlaceMode{
-    none, breaking, placing, schematicSelect
+    none, breaking, placing, schematicSelect, rebuildSelect
 }
diff --git a/core/src/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java
index 874269846f..5274692aaa 100644
--- a/core/src/mindustry/input/Placement.java
+++ b/core/src/mindustry/input/Placement.java
@@ -6,22 +6,24 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.pooling.*;
+import mindustry.entities.units.*;
 import mindustry.world.*;
 import mindustry.world.blocks.distribution.*;
 
 import static mindustry.Vars.*;
 
 public class Placement{
-    private final static Seq<Point2> tmpPoints = new Seq<>(), tmpPoints2 = new Seq<>();
+    private static final Seq<BuildPlan> plans1 = new Seq<>();
+    private static final Seq<Point2> tmpPoints = new Seq<>(), tmpPoints2 = new Seq<>();
     private static final NormalizeResult result = new NormalizeResult();
     private static final NormalizeDrawResult drawResult = new NormalizeDrawResult();
-    private static Bresenham2 bres = new Bresenham2();
-    private static Seq<Point2> points = new Seq<>();
+    private static final Bresenham2 bres = new Bresenham2();
+    private static final Seq<Point2> points = new Seq<>();
 
     //for pathfinding
-    private static IntFloatMap costs = new IntFloatMap();
-    private static IntIntMap parents = new IntIntMap();
-    private static IntSet closed = new IntSet();
+    private static final IntFloatMap costs = new IntFloatMap();
+    private static final IntIntMap parents = new IntIntMap();
+    private static final IntSet closed = new IntSet();
 
     /** Normalize a diagonal line into points. */
     public static Seq<Point2> pathfindLine(boolean conveyors, int startX, int startY, int endX, int endY){
@@ -56,6 +58,22 @@ public class Placement{
         return points;
     }
 
+    /** Normalize two points into a rectangle. */
+    public static Seq<Point2> normalizeRectangle(int startX, int startY, int endX, int endY, int blockSize){
+        Pools.freeAll(points);
+        points.clear();
+
+        int minX = Math.min(startX, endX), minY = Math.min(startY, endY), maxX = Math.max(startX, endX), maxY = Math.max(startY, endY);
+
+        for(int y = 0; y <= maxY - minY; y += blockSize){
+            for(int x = 0; x <= maxX - minX; x += blockSize){
+                points.add(Pools.obtain(Point2.class, Point2::new).set(startX + x * Mathf.sign(endX - startX), startY + y * Mathf.sign(endY - startY)));
+            }
+        }
+
+        return points;
+    }
+
     public static Seq<Point2> upgradeLine(int startX, int startY, int endX, int endY){
         closed.clear();
         Pools.freeAll(points);
@@ -75,7 +93,7 @@ public class Placement{
         var base = tmpPoints2;
         var result = tmpPoints.clear();
 
-        base.selectFrom(points, p -> p == points.first() || p == points.peek() || Build.validPlace(block, player.team(), p.x, p.y, rotation, false));
+        base.selectFrom(points, p -> p == points.first() || p == points.peek() || Build.validPlace(block, player.team(), p.x, p.y, rotation));
         boolean addedLast = false;
 
         outer:
@@ -100,12 +118,163 @@ public class Placement{
             i ++;
         }
 
-        if(!addedLast) result.add(base.peek());
+        if(!addedLast && !base.isEmpty()) result.add(base.peek());
 
         points.clear();
         points.addAll(result);
     }
 
+    public static boolean isSidePlace(Seq<BuildPlan> plans){
+        return plans.size > 1 && Mathf.mod(Tile.relativeTo(plans.first().x, plans.first().y, plans.get(1).x, plans.get(1).y) - plans.first().rotation, 2) == 1;
+    }
+
+    public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge){
+        calculateBridges(plans, bridge, t -> false);
+    }
+
+    public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge, Boolf<Block> avoid){
+        if(isSidePlace(plans) || plans.size == 0) return;
+
+        //check for orthogonal placement + unlocked state
+        if(!(plans.first().x == plans.peek().x || plans.first().y == plans.peek().y) || !bridge.unlockedNow()){
+            return;
+        }
+
+        Boolf<BuildPlan> placeable = plan ->
+            (plan.placeable(player.team()) || (plan.tile() != null && plan.tile().block() == plan.block)) &&  //don't count the same block as inaccessible
+           !(plan != plans.first() && plan.build() != null && plan.build().rotation != plan.rotation && avoid.get(plan.tile().block()));
+
+        var result = plans1.clear();
+        var rotated = plans.first().tile() != null && plans.first().tile().absoluteRelativeTo(plans.peek().x, plans.peek().y) == Mathf.mod(plans.first().rotation + 2, 4);
+
+        outer:
+        for(int i = 0; i < plans.size;){
+            var cur = plans.get(i);
+            result.add(cur);
+
+            //gap found
+            if(i < plans.size - 1 && placeable.get(cur) && !placeable.get(plans.get(i + 1))){
+                boolean wereSame = true;
+
+                //find the closest valid position within range
+                for(int j = i + 1; j < plans.size; j++){
+                    var other = plans.get(j);
+
+                    //out of range now, set to current position and keep scanning forward for next occurrence
+                    if(!bridge.positionsValid(cur.x, cur.y, other.x, other.y)){
+                        //add 'missed' conveyors
+                        for(int k = i + 1; k < j; k++){
+                            result.add(plans.get(k));
+                        }
+                        i = j;
+                        continue outer;
+                    }else if(placeable.get(other)){
+
+                        if(wereSame){
+                            //the gap is fake, it's just conveyors that can be replaced with junctions
+                            i ++;
+                            continue outer;
+                        }else{
+                            //found a link, assign bridges
+                            cur.block = bridge;
+                            other.block = bridge;
+                            if(rotated){
+                                other.config = new Point2(cur.x - other.x,  cur.y - other.y);
+                            }else{
+                                cur.config = new Point2(other.x - cur.x, other.y - cur.y);
+                            }
+
+                            i = j;
+                            continue outer;
+                        }
+                    }
+
+                    if(other.tile() != null && !avoid.get(other.tile().block())){
+                        wereSame = false;
+                    }
+                }
+
+                //if it got here, that means nothing was found. this likely means there's a bunch of stuff at the end; add it and bail out
+                for(int j = i + 1; j < plans.size; j++){
+                    result.add(plans.get(j));
+                }
+                break;
+            }else{
+                i ++;
+            }
+        }
+
+        plans.set(result);
+    }
+
+    public static void calculateBridges(Seq<BuildPlan> plans, DirectionBridge bridge, boolean hasJunction, Boolf<Block> avoid){
+        if(isSidePlace(plans) || plans.size == 0) return;
+
+        //check for orthogonal placement + unlocked state
+        if(!(plans.first().x == plans.peek().x || plans.first().y == plans.peek().y) || !bridge.unlockedNow()){
+            return;
+        }
+
+        Boolf<BuildPlan> placeable = plan ->
+            (plan.placeable(player.team()) || (plan.tile() != null && plan.tile().block() == plan.block)) &&  //don't count the same block as inaccessible
+            !(plan != plans.first() && plan.build() != null && plan.build().rotation != plan.rotation && avoid.get(plan.tile().block()));
+
+        var result = plans1.clear();
+
+        outer:
+        for(int i = 0; i < plans.size;){
+            var cur = plans.get(i);
+            result.add(cur);
+
+            //gap found
+            if(i < plans.size - 1 && placeable.get(cur) && !placeable.get(plans.get(i + 1))){
+                boolean wereSame = true;
+
+                //find the closest valid position within range
+                for(int j = i + 1; j < plans.size; j++){
+                    var other = plans.get(j);
+
+                    //out of range now, set to current position and keep scanning forward for next occurrence
+                    if(!bridge.positionsValid(cur.x, cur.y, other.x, other.y)){
+                        //add 'missed' conveyors
+                        for(int k = i + 1; k < j; k++){
+                            result.add(plans.get(k));
+                        }
+                        i = j;
+                        continue outer;
+                    }else if(placeable.get(other)){
+
+                        if(wereSame && hasJunction){
+                            //the gap is fake, it's just conveyors that can be replaced with junctions
+                            i ++;
+                            continue outer;
+                        }else{
+                            //found a link, assign bridges
+                            cur.block = bridge;
+                            other.block = bridge;
+                            i = j;
+                            continue outer;
+                        }
+                    }
+
+                    if(other.tile() != null && !avoid.get(other.tile().block())){
+                        wereSame = false;
+                    }
+                }
+
+                //if it got here, that means nothing was found. this likely means there's a bunch of stuff at the end; add it and bail out
+                for(int j = i + 1; j < plans.size; j++){
+                    result.add(plans.get(j));
+                }
+                break;
+            }else{
+                i ++;
+            }
+        }
+
+        plans.set(result);
+    }
+
     private static float tileHeuristic(Tile tile, Tile other){
         Block block = control.input.block;
 
@@ -248,12 +417,14 @@ public class Placement{
             }
         }
 
-        if(Math.abs(endx - tilex) > maxLength){
-            endx = Mathf.sign(endx - tilex) * maxLength + tilex;
-        }
+        if(maxLength > 0){
+            if(Math.abs(endx - tilex) > maxLength){
+                endx = Mathf.sign(endx - tilex) * maxLength + tilex;
+            }
 
-        if(Math.abs(endy - tiley) > maxLength){
-            endy = Mathf.sign(endy - tiley) * maxLength + tiley;
+            if(Math.abs(endy - tiley) > maxLength){
+                endy = Mathf.sign(endy - tiley) * maxLength + tiley;
+            }
         }
 
         int dx = endx - tilex, dy = endy - tiley;
diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java
index aa395a425b..34957d1443 100644
--- a/core/src/mindustry/io/JsonIO.java
+++ b/core/src/mindustry/io/JsonIO.java
@@ -1,27 +1,34 @@
 package mindustry.io;
 
+import arc.graphics.*;
+import arc.math.geom.*;
+import arc.util.*;
 import arc.util.serialization.*;
 import arc.util.serialization.Json.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.game.*;
+import mindustry.game.MapObjectives.*;
+import mindustry.maps.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 import java.io.*;
 
 @SuppressWarnings("unchecked")
 public class JsonIO{
-    private static CustomJson jsonBase = new CustomJson();
-    private static Json json = new Json(){
+    private static final CustomJson jsonBase = new CustomJson();
+
+    public static final Json json = new Json(){
         { apply(this); }
 
         @Override
         public void writeValue(Object value, Class knownType, Class elementType){
-            if(value instanceof MappableContent){
+            if(value instanceof MappableContent c){
                 try{
-                    getWriter().value(((MappableContent)value).name);
+                    getWriter().value(c.name);
                 }catch(IOException e){
                     throw new RuntimeException(e);
                 }
@@ -32,15 +39,18 @@ public class JsonIO{
 
         @Override
         protected String convertToString(Object object){
-            if(object instanceof MappableContent){
-                return ((MappableContent)object).name;
-            }
+            if(object instanceof MappableContent c) return c.name;
             return super.convertToString(object);
         }
     };
 
-    public static Json json(){
-        return json;
+    public static void writeBytes(Object value, Class<?> elementType, DataOutputStream output){
+        json.setWriter(new UBJsonWriter(output));
+        json.writeValue(value, value == null ? null : value.getClass(), elementType);
+    }
+
+    public static <T> T readBytes(Class<T> type, Class<?> elementType, DataInputStream input) throws IOException{
+        return json.readValue(type, elementType, new UBJsonReader().parseWihoutClosing(input));
     }
 
     public static String write(Object object){
@@ -68,12 +78,31 @@ public class JsonIO{
         return json.prettyPrint(in);
     }
 
+    public static void classTag(String tag, Class<?> type){
+        json.addClassTag(tag, type);
+        jsonBase.addClassTag(tag, type);
+    }
+
     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(Color.class, new Serializer<>(){
+            @Override
+            public void write(Json json, Color object, Class knownType){
+                json.writeValue(object.toString());
+            }
+
+            @Override
+            public Color read(Json json, JsonValue jsonData, Class type){
+                if(jsonData.isString()){
+                    return Color.valueOf(jsonData.asString());
+                }
+                Color out = new Color();
+                json.readFields(out, jsonData);
+                return out;
+            }
+        });
 
         json.setSerializer(Sector.class, new Serializer<>(){
             @Override
@@ -115,6 +144,18 @@ public class JsonIO{
             }
         });
 
+        json.setSerializer(Attribute.class, new Serializer<>(){
+            @Override
+            public void write(Json json, Attribute object, Class knownType){
+                json.writeValue(object.name);
+            }
+
+            @Override
+            public Attribute read(Json json, JsonValue jsonData, Class type){
+                return Attribute.get(jsonData.asString());
+            }
+        });
+
         json.setSerializer(Item.class, new Serializer<>(){
             @Override
             public void write(Json json, Item object, Class knownType){
@@ -150,10 +191,27 @@ public class JsonIO{
             @Override
             public Block read(Json json, JsonValue jsonData, Class type){
                 Block block = Vars.content.getByName(ContentType.block, jsonData.asString());
+                if(block == null) block = Vars.content.getByName(ContentType.block, SaveVersion.fallback.get(jsonData.asString(), ""));
                 return block == null ? Blocks.air : block;
             }
         });
 
+        json.setSerializer(Planet.class, new Serializer<>(){
+            @Override
+            public void write(Json json, Planet object, Class knownType){
+                json.writeValue(object.name);
+            }
+
+            @Override
+            public Planet read(Json json, JsonValue jsonData, Class type){
+                if(jsonData.asString() == null){
+                    return null;
+                }
+                Planet block = Vars.content.getByName(ContentType.planet, jsonData.asString());
+                return block == null ? Planets.serpulo : block;
+            }
+        });
+
         json.setSerializer(Weather.class, new Serializer<>(){
             @Override
             public void write(Json json, Weather object, Class knownType){
@@ -196,25 +254,88 @@ public class JsonIO{
         json.setSerializer(UnlockableContent.class, new Serializer<>(){
             @Override
             public void write(Json json, UnlockableContent object, Class knownType){
-                json.writeValue(object.name);
+                json.writeValue(object == null ? null : object.name);
             }
 
             @Override
             public UnlockableContent read(Json json, JsonValue jsonData, Class type){
+                if(jsonData.isNull()) return null;
                 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;
+                var map = Vars.content.byName(str);
+                return map instanceof UnlockableContent u ? u : null;
             }
         });
+
+        json.setSerializer(MapObjectives.class, new Serializer<>(){
+            @Override
+            public void write(Json json, MapObjectives exec, Class knownType){
+                json.writeArrayStart();
+                for(var obj : exec){
+                    json.writeObjectStart(obj.getClass().isAnonymousClass() ? obj.getClass().getSuperclass() : obj.getClass(), null);
+                    json.writeFields(obj);
+
+                    json.writeArrayStart("parents");
+                    for(var parent : obj.parents){
+                        json.writeValue(exec.all.indexOf(parent));
+                    }
+
+                    json.writeArrayEnd();
+
+                    json.writeValue("editorPos", Point2.pack(obj.editorX, obj.editorY));
+                    json.writeObjectEnd();
+                }
+
+                json.writeArrayEnd();
+            }
+
+            @Override
+            public MapObjectives read(Json json, JsonValue data, Class type){
+                var exec = new MapObjectives();
+                // First iteration to instantiate the objectives.
+                for(var value = data.child; value != null; value = value.next){
+                    //glenn why did you implement this in the least backwards compatible way possible
+                    //the old objectives had lowercase class tags, now they're uppercase and either way I can't deserialize them without errors
+                    if(value.has("class") && Character.isLowerCase(value.getString("class").charAt(0))){
+                        return new MapObjectives();
+                    }
+
+                    MapObjective obj = json.readValue(MapObjective.class, value);
+
+                    if(value.has("editorPos")){
+                        int pos = value.getInt("editorPos");
+                        obj.editorX = Point2.x(pos);
+                        obj.editorY = Point2.y(pos);
+                    }
+
+                    exec.all.add(obj);
+                }
+
+                // Second iteration to map the parents.
+                int i = 0;
+                for(var value = data.child; value != null; value = value.next, i++){
+                    for(var parent = value.get("parents").child; parent != null; parent = parent.next){
+                        int val = parent.asInt();
+                        if(val >= 0 && val < exec.all.size){
+                            exec.all.get(i).parents.add(exec.all.get(val));
+                        }
+                    }
+                }
+
+                return exec;
+            }
+        });
+
+        //use short names for all filter types
+        for(var filter : Maps.allFilterTypes){
+            var i = filter.get();
+            json.addClassTag(Strings.camelize(i.getClass().getSimpleName().replace("Filter", "")), i.getClass());
+        }
     }
 
     static class CustomJson extends Json{
         private Object baseObject;
 
-        {
-            apply(this);
-        }
+        { apply(this); }
 
         @Override
         public <T> T fromJson(Class<T> type, String json){
@@ -234,4 +355,4 @@ public class JsonIO{
             return baseObject;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java
index 18f6a712bd..172118097a 100644
--- a/core/src/mindustry/io/MapIO.java
+++ b/core/src/mindustry/io/MapIO.java
@@ -2,8 +2,6 @@ package mindustry.io;
 
 import arc.files.*;
 import arc.graphics.*;
-import arc.graphics.Pixmap.*;
-import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.io.*;
 import mindustry.content.*;
@@ -11,6 +9,7 @@ import mindustry.core.*;
 import mindustry.game.*;
 import mindustry.maps.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.storage.*;
 
 import java.io.*;
@@ -83,8 +82,8 @@ public class MapIO{
 
                     int c = colorFor(block(), Blocks.air, Blocks.air, team());
                     if(c != black){
-                        walls.draw(x, floors.getHeight() - 1 - y, c);
-                        floors.draw(x, floors.getHeight() - 1 - y + 1, shade);
+                        walls.setRaw(x, floors.height - 1 - y, c);
+                        floors.set(x, floors.height - 1 - y + 1, shade);
                     }
                 }
             };
@@ -111,7 +110,7 @@ public class MapIO{
                         for(int dx = 0; dx < size; dx++){
                             for(int dy = 0; dy < size; dy++){
                                 int drawx = tile.x + dx + offsetx, drawy = tile.y + dy + offsety;
-                                walls.draw(drawx, floors.getHeight() - 1 - drawy, c);
+                                walls.set(drawx, floors.height - 1 - drawy, c);
                             }
                         }
 
@@ -131,9 +130,9 @@ public class MapIO{
                 @Override
                 public Tile create(int x, int y, int floorID, int overlayID, int wallID){
                     if(overlayID != 0){
-                        floors.draw(x, floors.getHeight() - 1 - y, colorFor(Blocks.air, Blocks.air, content.block(overlayID), Team.derelict));
+                        floors.set(x, floors.height - 1 - y, colorFor(Blocks.air, Blocks.air, content.block(overlayID), Team.derelict));
                     }else{
-                        floors.draw(x, floors.getHeight() - 1 - y, colorFor(Blocks.air, content.block(floorID), Blocks.air, Team.derelict));
+                        floors.set(x, floors.height - 1 - y, colorFor(Blocks.air, content.block(floorID), Blocks.air, Team.derelict));
                     }
                     if(content.block(overlayID) == Blocks.spawn){
                         map.spawns ++;
@@ -142,7 +141,7 @@ public class MapIO{
                 }
             }));
 
-            floors.drawPixmap(walls, 0, 0);
+            floors.draw(walls, true);
             walls.dispose();
             return floors;
         }finally{
@@ -151,11 +150,11 @@ public class MapIO{
     }
 
     public static Pixmap generatePreview(Tiles tiles){
-        Pixmap pixmap = new Pixmap(tiles.width, tiles.height, Format.rgba8888);
-        for(int x = 0; x < pixmap.getWidth(); x++){
-            for(int y = 0; y < pixmap.getHeight(); y++){
+        Pixmap pixmap = new Pixmap(tiles.width, tiles.height);
+        for(int x = 0; x < pixmap.width; x++){
+            for(int y = 0; y < pixmap.height; y++){
                 Tile tile = tiles.getn(x, y);
-                pixmap.draw(x, pixmap.getHeight() - 1 - y, colorFor(tile.block(), tile.floor(), tile.overlay(), tile.team()));
+                pixmap.set(x, pixmap.height - 1 - y, colorFor(tile.block(), tile.floor(), tile.overlay(), tile.team()));
             }
         }
         return pixmap;
@@ -165,7 +164,7 @@ public class MapIO{
         if(wall.synthetic()){
             return team.color.rgba();
         }
-        return (wall.solid ? wall.mapColor : !overlay.useColor ? floor.mapColor : overlay.mapColor).rgba();
+        return (((Floor)overlay).wallOre ? overlay.mapColor : wall.solid ? wall.mapColor : !overlay.useColor ? floor.mapColor : overlay.mapColor).rgba();
     }
 
     public static Pixmap writeImage(Tiles tiles){
@@ -174,17 +173,19 @@ public class MapIO{
             //while synthetic blocks are possible, most of their data is lost, so in order to avoid questions like
             //"why is there air under my drill" and "why are all my conveyors facing right", they are disabled
             int color = tile.block().hasColor && !tile.block().synthetic() ? tile.block().mapColor.rgba() : tile.floor().mapColor.rgba();
-            pix.draw(tile.x, tiles.height - 1 - tile.y, color);
+            pix.set(tile.x, tiles.height - 1 - tile.y, color);
         }
         return pix;
     }
 
     public static void readImage(Pixmap pixmap, Tiles tiles){
         for(Tile tile : tiles){
-            int color = pixmap.getPixel(tile.x, pixmap.getHeight() - 1 - tile.y);
+            int color = pixmap.get(tile.x, pixmap.height - 1 - tile.y);
             Block block = ColorMapper.get(color);
 
-            if(block.isFloor()){
+            if(block.isOverlay()){
+                tile.setOverlay(block.asFloor());
+            }else if(block.isFloor()){
                 tile.setFloor(block.asFloor());
             }else if(block.isMultiblock()){
                 tile.setBlock(block, Team.derelict, 0);
@@ -195,14 +196,9 @@ public class MapIO{
 
         //guess at floors by grabbing a random adjacent floor
         for(Tile tile : tiles){
-            if(tile.floor() == Blocks.air && tile.block() != Blocks.air){
-                for(Point2 p : Geometry.d4){
-                    Tile other = tiles.get(tile.x + p.x, tile.y + p.y);
-                    if(other != null && other.floor() != Blocks.air){
-                        tile.setFloor(other.floor());
-                        break;
-                    }
-                }
+            //default to stone floor
+            if(tile.floor() == Blocks.air){
+                tile.setFloorUnder((Floor)Blocks.stone);
             }
         }
     }
diff --git a/core/src/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java
index 69e1ea67cc..7cdc8f6d87 100644
--- a/core/src/mindustry/io/SaveFileReader.java
+++ b/core/src/mindustry/io/SaveFileReader.java
@@ -50,19 +50,44 @@ public abstract class SaveFileReader{
     "holostone-wall", "dacite-wall",
     "rock", "boulder",
     "snowrock", "snow-boulder",
-    "cliffs", "stone-wall", 
+    "cliffs", "stone-wall",
+    "craters", "crater-stone",
+    "deepwater", "deep-water",
+    "water", "shallow-water",
+    "sand", "sand-floor",
+    "slag", "molten-slag",
 
-    "cryofluidmixer", "cryofluid-mixer"
+    "cryofluidmixer", "cryofluid-mixer",
+    "block-forge", "constructor",
+    "block-unloader", "payload-unloader",
+    "block-loader", "payload-loader",
+    "thermal-pump", "impulse-pump",
+    "alloy-smelter", "surge-smelter",
+    "steam-vent", "rhyolite-vent",
+    "fabricator", "tank-fabricator",
+    "basic-reconstructor", "refabricator"
     );
 
-    protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();
-    protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
+    public static final ObjectMap<String, String> modContentNameMap = ObjectMap.of(
+    "craters", "crater-stone",
+    "deepwater", "deep-water",
+    "water", "shallow-water",
+    "slag", "molten-slag"
+    );
+
+    protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream(), byteOutput2 = new ReusableByteOutStream();
+    protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput), dataBytes2 = new DataOutputStream(byteOutput2);
     protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
     protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
+    protected boolean chunkNested = false;
 
     protected int lastRegionLength;
     protected @Nullable CounterInputStream currCounter;
 
+    public static String mapFallback(String name){
+        return fallback.get(name, name);
+    }
+
     public void region(String name, DataInput stream, CounterInputStream counter, IORunner<DataInput> cons) throws IOException{
         counter.resetCount();
         this.currCounter = counter;
@@ -91,23 +116,41 @@ public abstract class SaveFileReader{
     }
 
     /** Write a chunk of input to the stream. An integer of some length is written first, followed by the data. */
-    public void writeChunk(DataOutput output, boolean isByte, IORunner<DataOutput> runner) throws IOException{
-        ReusableByteOutStream dout = isByte ? byteOutputSmall : byteOutput;
-        //reset output position
-        dout.reset();
-        //write the needed info
-        runner.accept(isByte ? dataBytesSmall : dataBytes);
-        int length = dout.size();
-        //write length (either int or byte) followed by the output bytes
-        if(!isByte){
-            output.writeInt(length);
-        }else{
-            if(length > Short.MAX_VALUE){
-                throw new IOException("Byte write length exceeded: " + length + " > " + Short.MAX_VALUE);
+    public void writeChunk(DataOutput output, boolean isShort, IORunner<DataOutput> runner) throws IOException{
+
+        //TODO awful
+        boolean wasNested = chunkNested;
+        if(!isShort){
+            chunkNested = true;
+        }
+        ReusableByteOutStream dout =
+            isShort ? byteOutputSmall :
+            wasNested ? byteOutput2 :
+            byteOutput;
+        try{
+            //reset output position
+            dout.reset();
+            //write the needed info
+            runner.accept(
+                isShort ? dataBytesSmall :
+                wasNested ? dataBytes2 :
+                dataBytes
+            );
+
+            int length = dout.size();
+            //write length (either int or byte) followed by the output bytes
+            if(!isShort){
+                output.writeInt(length);
+            }else{
+                if(length > 65535){
+                    throw new IOException("Byte write length exceeded: " + length + " > 65535");
+                }
+                output.writeShort(length);
             }
-            output.writeShort(length);
+            output.write(dout.getBytes(), 0, length);
+        }finally{
+            chunkNested = wasNested;
         }
-        output.write(dout.getBytes(), 0, length);
     }
 
     public int readChunk(DataInput input, IORunner<DataInput> runner) throws IOException{
@@ -127,8 +170,8 @@ public abstract class SaveFileReader{
     }
 
     /** Skip a chunk completely, discarding the bytes. */
-    public void skipChunk(DataInput input, boolean isByte) throws IOException{
-        int length = readChunk(input, isByte, t -> {});
+    public void skipChunk(DataInput input, boolean isShort) throws IOException{
+        int length = readChunk(input, isShort, t -> {});
         int skipped = input.skipBytes(length);
         if(length != skipped){
             throw new IOException("Could not skip bytes. Expected length: " + length + "; Actual length: " + skipped);
@@ -159,4 +202,19 @@ public abstract class SaveFileReader{
     public interface IORunner<T>{
         void accept(T stream) throws IOException;
     }
+
+    public interface CustomChunk{
+        void write(DataOutput stream) throws IOException;
+        void read(DataInput stream) throws IOException;
+
+        /** @return whether this chunk is enabled at all */
+        default boolean shouldWrite(){
+            return true;
+        }
+
+        /** @return whether this chunk should be written to connecting clients (default true) */
+        default boolean writeNet(){
+            return true;
+        }
+    }
 }
diff --git a/core/src/mindustry/io/SaveIO.java b/core/src/mindustry/io/SaveIO.java
index 8b56ef2a61..dea4ce7b72 100644
--- a/core/src/mindustry/io/SaveIO.java
+++ b/core/src/mindustry/io/SaveIO.java
@@ -7,7 +7,6 @@ import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
-import mindustry.io.legacy.*;
 import mindustry.io.versions.*;
 import mindustry.world.*;
 
@@ -18,10 +17,10 @@ import java.util.zip.*;
 import static mindustry.Vars.*;
 
 public class SaveIO{
-    /** Format header. This is the string 'MSAV' in ASCII. */
-    public static final byte[] header = {77, 83, 65, 86};
+    /** Save format header. */
+    public static final byte[] header = {'M', 'S', 'A', 'V'};
     public static final IntMap<SaveVersion> versions = new IntMap<>();
-    public static final Seq<SaveVersion> versionArray = Seq.with(new Save1(), new Save2(), new Save3(), new Save4());
+    public static final Seq<SaveVersion> versionArray = Seq.with(new Save1(), new Save2(), new Save3(), new Save4(), new Save5(), new Save6(), new Save7(), new Save8());
 
     static{
         for(SaveVersion version : versionArray){
@@ -57,8 +56,13 @@ public class SaveIO{
     }
 
     public static boolean isSaveValid(Fi file){
+        return isSaveFileValid(file) || isSaveFileValid(backupFileFor(file));
+    }
+
+    private static boolean isSaveFileValid(Fi file){
         try(DataInputStream stream = new DataInputStream(new InflaterInputStream(file.read(bufferSize)))){
-            return isSaveValid(stream);
+            getMeta(stream);
+            return true;
         }catch(Throwable e){
             return false;
         }
@@ -69,7 +73,6 @@ public class SaveIO{
             getMeta(stream);
             return true;
         }catch(Throwable e){
-            Log.err(e);
             return false;
         }
     }
@@ -88,7 +91,11 @@ public class SaveIO{
         try{
             readHeader(stream);
             int version = stream.readInt();
-            SaveMeta meta = versions.get(version).getMeta(stream);
+            SaveVersion ver = versions.get(version);
+
+            if(ver == null) throw new IOException("Unknown save version: " + version + ". Are you trying to load a save from a newer version?");
+
+            SaveMeta meta = ver.getMeta(stream);
             stream.close();
             return meta;
         }catch(IOException e){
@@ -114,12 +121,15 @@ public class SaveIO{
 
     public static void write(OutputStream os, StringMap tags){
         try(DataOutputStream stream = new DataOutputStream(os)){
+            Events.fire(new SaveWriteEvent());
+            SaveVersion ver = getVersion();
+
             stream.write(header);
-            stream.writeInt(getVersion().version);
+            stream.writeInt(ver.version);
             if(tags == null){
-                getVersion().write(stream);
+                ver.write(stream);
             }else{
-                getVersion().write(stream, tags);
+                ver.write(stream, tags);
             }
         }catch(Throwable e){
             throw new RuntimeException(e);
@@ -157,8 +167,10 @@ public class SaveIO{
             int version = stream.readInt();
             SaveVersion ver = versions.get(version);
 
+            if(ver == null) throw new IOException("Unknown save version: " + version + ". Are you trying to load a save from a newer version?");
+
             ver.read(stream, counter, context);
-            Events.fire(new SaveLoadEvent());
+            Events.fire(new SaveLoadEvent(context.isMap()));
         }catch(Throwable e){
             throw new SaveException(e);
         }finally{
diff --git a/core/src/mindustry/io/SavePreviewLoader.java b/core/src/mindustry/io/SavePreviewLoader.java
index bf01424a11..46f51216b1 100644
--- a/core/src/mindustry/io/SavePreviewLoader.java
+++ b/core/src/mindustry/io/SavePreviewLoader.java
@@ -1,14 +1,14 @@
 package mindustry.io;
 
+import arc.*;
 import arc.assets.*;
 import arc.assets.loaders.*;
-import arc.assets.loaders.resolvers.*;
 import arc.files.*;
 
 public class SavePreviewLoader extends TextureLoader{
 
     public SavePreviewLoader(){
-        super(new AbsoluteFileHandleResolver());
+        super(Core.files::absolute);
     }
 
     @Override
diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
index 58d9d77d53..1dff34d35f 100644
--- a/core/src/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -1,6 +1,7 @@
 package mindustry.io;
 
 import arc.*;
+import arc.func.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
@@ -9,21 +10,38 @@ import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
+import mindustry.entities.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
-import mindustry.maps.*;
+import mindustry.maps.Map;
+import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 import java.io.*;
+import java.util.*;
 
 import static mindustry.Vars.*;
 
 public abstract class SaveVersion extends SaveFileReader{
-    public int version;
+    protected static OrderedMap<String, CustomChunk> customChunks = new OrderedMap<>();
+
+    public final int version;
 
     //HACK stores the last read build of the save file, valid after read meta call
     protected int lastReadBuild;
+    //stores entity mappings for use after readEntityMapping
+    //if null, fall back to EntityMapping's values
+    protected @Nullable Prov[] entityMapping;
+
+    /**
+     * Registers a custom save chunk reader/writer by name. This is mostly used for mods that need to save extra data.
+     * @param name a mod-specific, unique name for identifying this chunk. Prefixing is recommended.
+     * */
+    public static void addCustomChunk(String name, CustomChunk chunk){
+        customChunks.put(name, chunk);
+    }
 
     public SaveVersion(int version){
         this.version = version;
@@ -50,23 +68,51 @@ public abstract class SaveVersion extends SaveFileReader{
     }
 
     @Override
-    public final void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{
-        region("meta", stream, counter, this::readMeta);
+    public void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{
+        region("meta", stream, counter, in -> readMeta(in, context));
         region("content", stream, counter, this::readContentHeader);
 
         try{
             region("map", stream, counter, in -> readMap(in, context));
             region("entities", stream, counter, this::readEntities);
+            if(version >= 8) region("markers", stream, counter, this::readMarkers);
+            region("custom", stream, counter, this::readCustomChunks);
         }finally{
             content.setTemporaryMapper(null);
         }
     }
 
-    public final void write(DataOutputStream stream, StringMap extraTags) throws IOException{
+    public void write(DataOutputStream stream, StringMap extraTags) throws IOException{
         region("meta", stream, out -> writeMeta(out, extraTags));
         region("content", stream, this::writeContentHeader);
         region("map", stream, this::writeMap);
         region("entities", stream, this::writeEntities);
+        region("markers", stream, this::writeMarkers);
+        region("custom", stream, s -> writeCustomChunks(s, false));
+    }
+
+    public void writeCustomChunks(DataOutput stream, boolean net) throws IOException{
+        var chunks = customChunks.orderedKeys().select(s -> customChunks.get(s).shouldWrite() && (!net || customChunks.get(s).writeNet()));
+        stream.writeInt(chunks.size);
+        for(var chunkName : chunks){
+            var chunk = customChunks.get(chunkName);
+            stream.writeUTF(chunkName);
+
+            writeChunk(stream, false, chunk::write);
+        }
+    }
+
+    public void readCustomChunks(DataInput stream) throws IOException{
+        int amount = stream.readInt();
+        for(int i = 0; i < amount; i++){
+            String name = stream.readUTF();
+            var chunk = customChunks.get(name);
+            if(chunk != null){
+                readChunk(stream, false, chunk::read);
+            }else{
+                skipChunk(stream);
+            }
+        }
     }
 
     public void writeMeta(DataOutput stream, StringMap tags) throws IOException{
@@ -81,35 +127,55 @@ public abstract class SaveVersion extends SaveFileReader{
             node.save();
         }
 
-        writeStringMap(stream, StringMap.of(
+        StringMap result = new StringMap();
+        result.putAll(tags);
+
+        writeStringMap(stream, result.merge(StringMap.of(
             "saved", Time.millis(),
             "playtime", headless ? 0 : control.saves.getTotalPlaytime(),
             "build", Version.build,
             "mapname", state.map.name(),
             "wave", state.wave,
+            "tick", state.tick,
             "wavetime", state.wavetime,
             "stats", JsonIO.write(state.stats),
             "rules", JsonIO.write(state.rules),
+            "locales", JsonIO.write(state.mapLocales),
             "mods", JsonIO.write(mods.getModStrings().toArray(String.class)),
+            "controlGroups", headless || control == null ? "null" : JsonIO.write(control.input.controlGroups),
             "width", world.width(),
             "height", world.height(),
             "viewpos", Tmp.v1.set(player == null ? Vec2.ZERO : player).toString(),
             "controlledType", headless || control.input.controlledType == null ? "null" : control.input.controlledType.name,
             "nocores", state.rules.defaultTeam.cores().isEmpty(),
             "playerteam", player == null ? state.rules.defaultTeam.id : player.team().id
-        ).merge(tags));
+        )));
     }
 
-    public void readMeta(DataInput stream) throws IOException{
+    public void readMeta(DataInput stream, WorldContext context) throws IOException{
         StringMap map = readStringMap(stream);
 
         state.wave = map.getInt("wave");
         state.wavetime = map.getFloat("wavetime", state.rules.waveSpacing);
+        state.tick = map.getFloat("tick");
         state.stats = JsonIO.read(GameStats.class, map.get("stats", "{}"));
         state.rules = JsonIO.read(Rules.class, map.get("rules", "{}"));
+        state.mapLocales = JsonIO.read(MapLocales.class, map.get("locales", "{}"));
         if(state.rules.spawns.isEmpty()) state.rules.spawns = waves.get();
         lastReadBuild = map.getInt("build", -1);
 
+        if(context.getSector() != null){
+            state.rules.sector = context.getSector();
+            if(state.rules.sector != null){
+                state.rules.sector.planet.applyRules(state.rules);
+            }
+        }
+
+        //replace the default serpulo env with erekir
+        if(state.rules.planet == Planets.serpulo && state.rules.hasEnv(Env.scorching)){
+            state.rules.planet = Planets.erekir;
+        }
+
         if(!headless){
             Tmp.v1.tryFromString(map.get("viewpos"));
             Core.camera.position.set(Tmp.v1);
@@ -120,6 +186,11 @@ public abstract class SaveVersion extends SaveFileReader{
             if(!net.client() && team != Team.derelict){
                 player.team(team);
             }
+
+            var groups = JsonIO.read(IntSeq[].class, map.get("controlGroups", "null"));
+            if(groups != null && groups.length == control.input.controlGroups.length){
+                control.input.controlGroups = groups;
+            }
         }
 
         Map worldmap = maps.byName(map.get("mapname", "\\\\\\"));
@@ -161,7 +232,8 @@ public abstract class SaveVersion extends SaveFileReader{
             Tile tile = world.rawTile(i % world.width(), i / world.width());
             stream.writeShort(tile.blockID());
 
-            boolean savedata = tile.block().saveData;
+            boolean savedata = tile.floor().saveData || tile.overlay().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
@@ -284,43 +356,68 @@ public abstract class SaveVersion extends SaveFileReader{
         }
     }
 
-    public void writeEntities(DataOutput stream) throws IOException{
+    public void writeTeamBlocks(DataOutput stream) throws IOException{
         //write team data with entities.
         Seq<TeamData> data = state.teams.getActive().copy();
         if(!data.contains(Team.sharded.data())) data.add(Team.sharded.data());
         stream.writeInt(data.size);
         for(TeamData team : data){
             stream.writeInt(team.team.id);
-            stream.writeInt(team.blocks.size);
-            for(BlockPlan block : team.blocks){
+            stream.writeInt(team.plans.size);
+            for(BlockPlan block : team.plans){
                 stream.writeShort(block.x);
                 stream.writeShort(block.y);
                 stream.writeShort(block.rotation);
-                stream.writeShort(block.block);
+                stream.writeShort(block.block.id);
                 TypeIO.writeObject(Writes.get(stream), block.config);
             }
         }
+    }
 
+    public void writeWorldEntities(DataOutput stream) throws IOException{
         stream.writeInt(Groups.all.count(Entityc::serialize));
         for(Entityc entity : Groups.all){
             if(!entity.serialize()) continue;
 
             writeChunk(stream, true, out -> {
                 out.writeByte(entity.classId());
+                out.writeInt(entity.id());
                 entity.write(Writes.get(out));
             });
         }
     }
 
-    public void readEntities(DataInput stream) throws IOException{
+    public void writeEntityMapping(DataOutput stream) throws IOException{
+        stream.writeShort(EntityMapping.customIdMap.size);
+        for(var entry : EntityMapping.customIdMap.entries()){
+            stream.writeShort(entry.key);
+            stream.writeUTF(entry.value);
+        }
+    }
+
+    public void writeEntities(DataOutput stream) throws IOException{
+        writeEntityMapping(stream);
+        writeTeamBlocks(stream);
+        writeWorldEntities(stream);
+    }
+
+    public void writeMarkers(DataOutput stream) throws IOException{
+        state.markers.write(stream);
+    }
+
+    public void readMarkers(DataInput stream) throws IOException{
+        state.markers.read(stream);
+    }
+
+    public void readTeamBlocks(DataInput stream) throws IOException{
         int teamc = stream.readInt();
 
         for(int i = 0; i < teamc; i++){
             Team team = Team.get(stream.readInt());
             TeamData data = team.data();
             int blocks = stream.readInt();
-            data.blocks.clear();
-            data.blocks.ensureCapacity(Math.min(blocks, 1000));
+            data.plans.clear();
+            data.plans.ensureCapacity(Math.min(blocks, 1000));
             var reads = Reads.get(stream);
             var set = new IntSet();
 
@@ -329,25 +426,61 @@ public abstract class SaveVersion extends SaveFileReader{
                 var obj = TypeIO.readObject(reads);
                 //cannot have two in the same position
                 if(set.add(Point2.pack(x, y))){
-                    data.blocks.addLast(new BlockPlan(x, y, rot, content.block(bid).id, obj));
+                    data.plans.addLast(new BlockPlan(x, y, rot, content.block(bid), obj));
                 }
             }
         }
+    }
+
+    public void readWorldEntities(DataInput stream) throws IOException{
+        //entityMapping is null in older save versions, so use the default
+        var mapping = this.entityMapping == null ? EntityMapping.idMap : this.entityMapping;
+
+        Seq<Entityc> entities = new Seq<>();
 
         int amount = stream.readInt();
         for(int j = 0; j < amount; j++){
             readChunk(stream, true, in -> {
-                byte typeid = in.readByte();
-                if(EntityMapping.map(typeid) == null){
+                int typeid = in.readUnsignedByte();
+                if(mapping[typeid] == null){
                     in.skipBytes(lastRegionLength - 1);
                     return;
                 }
 
-                Entityc entity = (Entityc)EntityMapping.map(typeid).get();
+                int id = in.readInt();
+
+                Entityc entity = (Entityc)mapping[typeid].get();
+                entities.add(entity);
+                EntityGroup.checkNextId(id);
+                entity.id(id);
                 entity.read(Reads.get(in));
                 entity.add();
             });
         }
+
+        for(var e : entities){
+            e.afterAllRead();
+        }
+    }
+
+    public void readEntityMapping(DataInput stream) throws IOException{
+        //copy entityMapping for further mutation; will be used in readWorldEntities
+        entityMapping = Arrays.copyOf(EntityMapping.idMap, EntityMapping.idMap.length);
+
+        short amount = stream.readShort();
+        for(int i = 0; i < amount; i++){
+            //everything that corresponded to this ID in this save goes by this name
+            //so replace the prov in the current mapping with the one found with this name
+            short id = stream.readShort();
+            String name = stream.readUTF();
+            entityMapping[id] = EntityMapping.map(name);
+        }
+    }
+
+    public void readEntities(DataInput stream) throws IOException{
+        readEntityMapping(stream);
+        readTeamBlocks(stream);
+        readWorldEntities(stream);
     }
 
     public void readContentHeader(DataInput stream) throws IOException{
@@ -362,7 +495,8 @@ public abstract class SaveVersion extends SaveFileReader{
 
             for(int j = 0; j < total; j++){
                 String name = stream.readUTF();
-                map[type.ordinal()][j] = content.getByName(type, fallback.get(name, name));
+                //fallback only for blocks
+                map[type.ordinal()][j] = content.getByName(type, type == ContentType.block ? fallback.get(name, name) : name);
             }
         }
 
diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java
index 9e8ab187dd..70f28cae9d 100644
--- a/core/src/mindustry/io/TypeIO.java
+++ b/core/src/mindustry/io/TypeIO.java
@@ -1,20 +1,22 @@
 package mindustry.io;
 
+import arc.audio.*;
 import arc.graphics.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
-import arc.util.pooling.*;
+import mindustry.ai.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
+import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.units.*;
 import mindustry.game.*;
+import mindustry.game.MapObjectives.*;
 import mindustry.gen.*;
 import mindustry.logic.*;
 import mindustry.net.Administration.*;
@@ -29,7 +31,7 @@ import java.nio.*;
 
 import static mindustry.Vars.*;
 
-/** Class for specifying read/write methods for code generation. */
+/** Class for specifying read/write methods for code generation. All IO MUST be thread safe!*/
 @SuppressWarnings("unused")
 @TypeIOHandler
 public class TypeIO{
@@ -82,6 +84,9 @@ public class TypeIO{
         }else if(object instanceof Building b){
             write.b(12);
             write.i(b.pos());
+        }else if(object instanceof BuildingBox b){
+            write.b(12);
+            write.i(b.pos);
         }else if(object instanceof LAccess l){
             write.b((byte)13);
             write.s(l.ordinal());
@@ -89,9 +94,44 @@ public class TypeIO{
             write.b((byte)14);
             write.i(b.length);
             write.b(b);
-        }else if(object instanceof UnitCommand c){
-            write.b((byte)15);
-            write.b(c.ordinal());
+        }else if(object instanceof boolean[] b){
+            write.b(16);
+            write.i(b.length);
+            for(boolean bool : b){
+                write.bool(bool);
+            }
+        }else if(object instanceof Unit u){
+            write.b(17);
+            write.i(u.id);
+        }else if(object instanceof UnitBox u){
+            write.b(17);
+            write.i(u.id);
+        }else if(object instanceof Vec2[] vecs){
+            write.b(18);
+            write.s(vecs.length);
+            for(Vec2 v : vecs){
+                write.f(v.x);
+                write.f(v.y);
+            }
+        }else if(object instanceof Vec2 v){
+            write.b((byte)19);
+            write.f(v.x);
+            write.f(v.y);
+        }else if(object instanceof Team t){
+            write.b((byte)20);
+            write.b(t.id);
+        }else if(object instanceof int[] i){
+            write.b((byte)21);
+            writeInts(write, i);
+        }else if(object instanceof Object[] objs){
+            write.b((byte)22);
+            write.i(objs.length);
+            for(Object obj : objs){
+                writeObject(write, obj);
+            }
+        }else if(object instanceof UnitCommand command){
+            write.b(23);
+            write.s(command.id);
         }else{
             throw new IllegalArgumentException("Unknown object type: " + object.getClass());
         }
@@ -99,26 +139,74 @@ public class TypeIO{
 
     @Nullable
     public static Object readObject(Reads read){
+        return readObjectBoxed(read, false);
+    }
+
+    /** Reads an object, but boxes buildings. */
+    @Nullable
+    public static Object readObjectBoxed(Reads read, boolean box){
         byte type = read.b();
-        switch(type){
-            case 0: return null;
-            case 1: return read.i();
-            case 2: return read.l();
-            case 3: return read.f();
-            case 4: return readString(read);
-            case 5: return content.getByID(ContentType.all[read.b()], read.s());
-            case 6: short length = read.s(); IntSeq arr = new IntSeq(); for(int i = 0; i < length; i ++) arr.add(read.i()); return arr;
-            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);
-        }
+        return switch(type){
+            case 0 -> null;
+            case 1 -> read.i();
+            case 2 -> read.l();
+            case 3 -> read.f();
+            case 4 -> readString(read);
+            case 5 -> content.getByID(ContentType.all[read.b()], read.s());
+            case 6 -> {
+                short length = read.s();
+                IntSeq arr = new IntSeq(length);
+                for(int i = 0; i < length; i ++) arr.add(read.i());
+                yield arr;
+            }
+            case 7 -> 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());
+                yield out;
+            }
+            case 9 -> content.<UnlockableContent>getByID(ContentType.all[read.b()], read.s()).techNode;
+            case 10 -> read.bool();
+            case 11 -> read.d();
+            case 12 -> !box ? world.build(read.i()) : new BuildingBox(read.i());
+            case 13 -> LAccess.all[read.s()];
+            case 14 -> {
+                int blen = read.i();
+                byte[] bytes = new byte[blen];
+                read.b(bytes);
+                yield bytes;
+            }
+            //unit command
+            case 15 -> {
+                read.b();
+                yield null;
+            }
+            case 16 -> {
+                int boollen = read.i();
+                boolean[] bools = new boolean[boollen];
+                for(int i = 0; i < boollen; i ++) bools[i] = read.bool();
+                yield bools;
+            }
+            case 17 -> !box ? Groups.unit.getByID(read.i()) : new UnitBox(read.i());
+            case 18 -> {
+                int len = read.s();
+                Vec2[] out = new Vec2[len];
+                for(int i = 0; i < len; i ++) out[i] = new Vec2(read.f(), read.f());
+                yield out;
+            }
+            case 19 -> new Vec2(read.f(), read.f());
+            case 20 -> Team.all[read.ub()];
+            case 21 -> readInts(read);
+            case 22 -> {
+                int objlen = read.i();
+                Object[] objs = new Object[objlen];
+                for(int i = 0; i < objlen; i++) objs[i] = readObjectBoxed(read, box);
+                yield objs;
+            }
+            case 23 -> content.unitCommand(read.us());
+            default -> throw new IllegalArgumentException("Unknown object type: " + type);
+        };
     }
 
     public static void writePayload(Writes writes, Payload payload){
@@ -158,15 +246,40 @@ public class TypeIO{
 
     //this is irrelevant.
     static final WeaponMount[] noMounts = {};
-    
+
     public static WeaponMount[] readMounts(Reads read){
         read.skip(read.b() * (1 + 4 + 4));
 
         return noMounts;
     }
 
+    public static Ability[] readAbilities(Reads read, Ability[] abilities){
+        byte len = read.b();
+        for(int i = 0; i < len; i++){
+            float data = read.f();
+            if(abilities.length > i){
+                abilities[i].data = data;
+            }
+        }
+        return abilities;
+    }
+
+    public static void writeAbilities(Writes write, Ability[] abilities){
+        write.b(abilities.length);
+        for(var a : abilities){
+            write.f(a.data);
+        }
+    }
+
+    static final Ability[] noAbilities = {};
+
+    public static Ability[] readAbilities(Reads read){
+        read.skip(read.b());
+        return noAbilities;
+    }
+
     public static void writeUnit(Writes write, Unit unit){
-        write.b(unit == null || unit.isNull() ? 0 : unit instanceof BlockUnitc ? 1 : 2);
+        write.b(unit == null ? 0 : unit instanceof BlockUnitc ? 1 : 2);
 
         //block units are special
         if(unit instanceof BlockUnitc){
@@ -182,15 +295,33 @@ public class TypeIO{
         byte type = read.b();
         int id = read.i();
         //nothing
-        if(type == 0) return Nulls.unit;
+        if(type == 0) return null;
         if(type == 2){ //standard unit
-            Unit unit = Groups.unit.getByID(id);
-            return unit == null ? Nulls.unit : unit;
+            return Groups.unit.getByID(id);
         }else if(type == 1){ //block
             Building tile = world.build(id);
-            return tile instanceof ControlBlock cont ? cont.unit() : Nulls.unit;
+            return tile instanceof ControlBlock cont ? cont.unit() : null;
         }
-        return Nulls.unit;
+        return null;
+    }
+
+    public static void writeCommand(Writes write, @Nullable UnitCommand command){
+        write.b(command == null ? 255 : command.id);
+    }
+
+    public static @Nullable UnitCommand readCommand(Reads read){
+        int val = read.ub();
+        return val == 255 ? null : content.unitCommand(val);
+    }
+
+    public static void writeStance(Writes write, @Nullable UnitStance stance){
+        write.b(stance == null ? 255 : stance.id);
+    }
+
+    public static UnitStance readStance(Reads read){
+        int val = read.ub();
+        //never returns null
+        return val == 255 || val >= content.unitStances().size ? UnitStance.shoot : content.unitStance(val);
     }
 
     public static void writeEntity(Writes write, Entityc entity){
@@ -225,19 +356,70 @@ public class TypeIO{
         return content.block(read.s());
     }
 
-    public static void writeRequest(Writes write, BuildPlan request){
-        write.b(request.breaking ? (byte)1 : 0);
-        write.i(Point2.pack(request.x, request.y));
-        if(!request.breaking){
-            write.s(request.block.id);
-            write.b((byte)request.rotation);
-            write.b(1); //always has config
-            writeObject(write, request.config);
+    /** @return the maximum acceptable amount of plans to send over the network */
+    public static int getMaxPlans(Queue<BuildPlan> plans){
+        //limit to prevent buffer overflows
+        int used = Math.min(plans.size, 20);
+        int totalLength = 0;
+
+        //prevent buffer overflow by checking config length
+        for(int i = 0; i < used; i++){
+            BuildPlan plan = plans.get(i);
+            if(plan.config instanceof byte[] b){
+                totalLength += b.length;
+            }
+
+            if(plan.config instanceof String b){
+                totalLength += b.length();
+            }
+
+            if(totalLength > 500){
+                used = i + 1;
+                break;
+            }
+        }
+
+        return used;
+    }
+
+    //on the network, plans must be capped by size
+    public static void writePlansQueueNet(Writes write, Queue<BuildPlan> plans){
+        if(plans == null){
+            write.i(-1);
+            return;
+        }
+
+        int used = getMaxPlans(plans);
+
+        write.i(used);
+        for(int i = 0; i < used; i++){
+            writePlan(write, plans.get(i));
         }
     }
 
-    public static BuildPlan readRequest(Reads read){
-        BuildPlan currentRequest;
+    public static Queue<BuildPlan> readPlansQueue(Reads read){
+        int used = read.i();
+        if(used == -1) return null;
+        var out = new Queue<BuildPlan>();
+        for(int i = 0; i < used; i++){
+            out.add(readPlan(read));
+        }
+        return out;
+    }
+
+    public static void writePlan(Writes write, BuildPlan plan){
+        write.b(plan.breaking ? (byte)1 : 0);
+        write.i(Point2.pack(plan.x, plan.y));
+        if(!plan.breaking){
+            write.s(plan.block.id);
+            write.b((byte)plan.rotation);
+            write.b(1); //always has config
+            writeObject(write, plan.config);
+        }
+    }
+
+    public static BuildPlan readPlan(Reads read){
+        BuildPlan current;
 
         byte type = read.b();
         int position = read.i();
@@ -247,34 +429,34 @@ public class TypeIO{
         }
 
         if(type == 1){ //remove
-            currentRequest = new BuildPlan(Point2.x(position), Point2.y(position));
+            current = new BuildPlan(Point2.x(position), Point2.y(position));
         }else{ //place
             short block = read.s();
             byte rotation = read.b();
             boolean hasConfig = read.b() == 1;
             Object config = readObject(read);
-            currentRequest = new BuildPlan(Point2.x(position), Point2.y(position), rotation, content.block(block));
+            current = 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.config = config;
+                current.config = config;
             }
         }
 
-        return currentRequest;
+        return current;
     }
 
-    public static void writeRequests(Writes write, BuildPlan[] requests){
-        if(requests == null){
+    public static void writePlans(Writes write, BuildPlan[] plans){
+        if(plans == null){
             write.s(-1);
             return;
         }
-        write.s((short)requests.length);
-        for(BuildPlan request : requests){
-            writeRequest(write, request);
+        write.s((short)plans.length);
+        for(BuildPlan plan : plans){
+            writePlan(write, plan);
         }
     }
 
-    public static BuildPlan[] readRequests(Reads read){
+    public static BuildPlan[] readPlans(Reads read){
         short reqamount = read.s();
         if(reqamount == -1){
             return null;
@@ -282,9 +464,9 @@ public class TypeIO{
 
         BuildPlan[] reqs = new BuildPlan[reqamount];
         for(int i = 0; i < reqamount; i++){
-            BuildPlan request = readRequest(read);
-            if(request != null){
-                reqs[i] = request;
+            BuildPlan plan = readPlan(read);
+            if(plan != null){
+                reqs[i] = plan;
             }
         }
 
@@ -296,12 +478,49 @@ public class TypeIO{
         if(control instanceof Player p){
             write.b(0);
             write.i(p.id);
-        }else if(control instanceof FormationAI form && form.leader != null){
-            write.b(1);
-            write.i(form.leader.id);
         }else if(control instanceof LogicAI logic && logic.controller != null){
             write.b(3);
             write.i(logic.controller.pos());
+        }else if(control instanceof CommandAI ai){
+            write.b(8);
+            write.bool(ai.attackTarget != null);
+            write.bool(ai.targetPos != null);
+
+            if(ai.targetPos != null){
+                write.f(ai.targetPos.x);
+                write.f(ai.targetPos.y);
+            }
+            if(ai.attackTarget != null){
+                write.b(ai.attackTarget instanceof Building ? 1 : 0);
+                if(ai.attackTarget instanceof Building b){
+                    write.i(b.pos());
+                }else{
+                    write.i(((Unit)ai.attackTarget).id);
+                }
+            }
+            write.b(ai.command == null ? -1 : ai.command.id);
+
+            write.b(ai.commandQueue.size);
+            for(var pos : ai.commandQueue){
+                if(pos instanceof Building b){
+                    write.b(0);
+                    write.i(b.pos());
+                }else if(pos instanceof Unit u){
+                    write.b(1);
+                    write.i(u.id);
+                }else if(pos instanceof Vec2 v){
+                    write.b(2);
+                    write.f(v.x);
+                    write.f(v.y);
+                }else{
+                    //who put garbage in the command queue??
+                    write.b(3);
+                }
+            }
+
+            writeStance(write, ai.stance);
+        }else if(control instanceof AssemblerAI){  //hate
+            write.b(5);
         }else{
             write.b(2);
         }
@@ -315,13 +534,9 @@ public class TypeIO{
             //make sure player exists
             if(player == null) return prev;
             return player;
-        }else if(type == 1){ //formation controller
-            int id = read.i();
-            if(prev instanceof FormationAI f){
-                f.leader = Groups.unit.getByID(id);
-                return f;
-            }
-            return new FormationAI(Groups.unit.getByID(id), null);
+        }else if(type == 1){ //formation controller (ignored)
+            read.i();
+            return prev;
         }else if(type == 3){
             int pos = read.i();
             if(prev instanceof LogicAI pai){
@@ -335,12 +550,75 @@ public class TypeIO{
                 out.controller = world.build(pos);
                 return out;
             }
+            //type 4 is the old CommandAI with no commandIndex, type 6 is the new one with the index as a single byte, type 7 is the one with the command queue, 8 adds a stance
+        }else if(type == 4 || type == 6 || type == 7 || type == 8){
+            CommandAI ai = prev instanceof CommandAI pai ? pai : new CommandAI();
+
+            boolean hasAttack = read.bool(), hasPos = read.bool();
+            if(hasPos){
+                if(ai.targetPos == null) ai.targetPos = new Vec2();
+                ai.targetPos.set(read.f(), read.f());
+            }else{
+                ai.targetPos = null;
+            }
+            ai.setupLastPos();
+            ai.readAttackTarget = -1;
+
+            if(hasAttack){
+                byte entityType = read.b();
+                if(entityType == 1){
+                    ai.attackTarget = world.build(read.i());
+                }else{
+                    ai.attackTarget = Groups.unit.getByID(ai.readAttackTarget = read.i());
+                }
+            }else{
+                ai.attackTarget = null;
+            }
+
+            if(type == 6 || type == 7 || type == 8){
+                byte id = read.b();
+                ai.command = id < 0 ? null : content.unitCommand(id);
+                if(ai.command == null) ai.command = UnitCommand.moveCommand;
+            }
+
+            //command queue only in type 7/8
+            if(type == 7 || type == 8){
+                ai.commandQueue.clear();
+                int length = read.ub();
+                for(int i = 0; i < length; i++){
+                    int commandType = read.b();
+                    switch(commandType){
+                        case 0 -> {
+                            var build = world.build(read.i());
+                            if(build != null) ai.commandQueue.add(build);
+                        }
+                        case 1 -> {
+                            var unit = Groups.unit.getByID(read.i());
+                            if(unit != null) ai.commandQueue.add(unit);
+                        }
+                        case 2 -> {
+                            ai.commandQueue.add(new Vec2(read.f(), read.f()));
+                        }
+                        //otherwise disregard
+                    }
+                }
+            }
+
+            if(type == 8){
+                ai.stance = readStance(read);
+            }
+
+            return ai;
+        }else if(type == 5){
+            //augh
+            return prev instanceof AssemblerAI ? prev : new AssemblerAI();
         }else{
             //there are two cases here:
             //1: prev controller was not a player, carry on
             //2: prev controller was a player, so replace this controller with *anything else*
             //...since AI doesn't update clientside it doesn't matter
-            return (!(prev instanceof AIController) || (prev instanceof FormationAI) || (prev instanceof LogicAI)) ? new GroundAI() : prev;
+            //TODO I hate this
+            return (!(prev instanceof AIController) || (prev instanceof LogicAI)) ? new GroundAI() : prev;
         }
     }
 
@@ -349,7 +627,15 @@ public class TypeIO{
     }
 
     public static KickReason readKick(Reads read){
-        return KickReason.values()[read.b()];
+        return KickReason.all[read.b()];
+    }
+
+    public static void writeMarkerControl(Writes write, LMarkerControl reason){
+        write.b((byte)reason.ordinal());
+    }
+
+    public static LMarkerControl readMarkerControl(Reads read){
+        return LMarkerControl.all[read.ub()];
     }
 
     public static void writeRules(Writes write, Rules rules){
@@ -365,6 +651,47 @@ public class TypeIO{
         return JsonIO.read(Rules.class, string);
     }
 
+    public static void writeObjectives(Writes write, MapObjectives executor){
+        String string = JsonIO.write(executor);
+        byte[] bytes = string.getBytes(charset);
+        write.i(bytes.length);
+        write.b(bytes);
+    }
+
+    public static MapObjectives readObjectives(Reads read){
+        int length = read.i();
+        String string = new String(read.b(new byte[length]), charset);
+        return JsonIO.read(MapObjectives.class, string);
+    }
+
+    public static void writeObjectiveMarker(Writes write, ObjectiveMarker marker){
+        String string = JsonIO.json.toJson(marker, MapObjectives.ObjectiveMarker.class);
+        byte[] bytes = string.getBytes(charset);
+        write.i(bytes.length);
+        write.b(bytes);
+    }
+
+    public static ObjectiveMarker readObjectiveMarker(Reads read){
+        int length = read.i();
+        String string = new String(read.b(new byte[length]), charset);
+        return JsonIO.read(MapObjectives.ObjectiveMarker.class, string);
+    }
+
+    public static void writeVecNullable(Writes write, @Nullable Vec2 v){
+        if(v == null){
+            write.f(Float.NaN);
+            write.f(Float.NaN);
+        }else{
+            write.f(v.x);
+            write.f(v.y);
+        }
+    }
+
+    public static @Nullable Vec2 readVecNullable(Reads read){
+        float x = read.f(), y = read.f();
+        return Float.isNaN(x) || Float.isNaN(y) ? null : new Vec2(x, y);
+    }
+
     public static void writeVec2(Writes write, Vec2 v){
         if(v == null){
             write.f(0);
@@ -383,13 +710,53 @@ public class TypeIO{
         return new Vec2(read.f(), read.f());
     }
 
-    public static void writeStatuse(Writes write, StatusEntry entry){
+    public static void writeStatus(Writes write, StatusEntry entry){
         write.s(entry.effect.id);
         write.f(entry.time);
+
+        //write dynamic fields
+        if(entry.effect.dynamic){
+            //write a byte with bits set based on which field is actually used
+            write.b(
+            (entry.damageMultiplier != 1f ?     (1 << 0) : 0) |
+            (entry.healthMultiplier != 1f ?     (1 << 1) : 0) |
+            (entry.speedMultiplier != 1f ?      (1 << 2) : 0) |
+            (entry.reloadMultiplier != 1f ?     (1 << 3) : 0) |
+            (entry.buildSpeedMultiplier != 1f ? (1 << 4) : 0) |
+            (entry.dragMultiplier != 1f ?       (1 << 5) : 0) |
+            (entry.armorOverride >= 0f ?        (1 << 6) : 0)
+            );
+
+            if(entry.damageMultiplier != 1f) write.f(entry.damageMultiplier);
+            if(entry.healthMultiplier != 1f) write.f(entry.healthMultiplier);
+            if(entry.speedMultiplier != 1f) write.f(entry.speedMultiplier);
+            if(entry.reloadMultiplier != 1f) write.f(entry.reloadMultiplier);
+            if(entry.buildSpeedMultiplier != 1f) write.f(entry.buildSpeedMultiplier);
+            if(entry.dragMultiplier != 1f) write.f(entry.dragMultiplier);
+            if(entry.armorOverride >= 0f) write.f(entry.armorOverride);
+        }
     }
 
-    public static StatusEntry readStatuse(Reads read){
-        return Pools.obtain(StatusEntry.class, StatusEntry::new).set(content.getByID(ContentType.status, read.s()), read.f());
+    public static StatusEntry readStatus(Reads read){
+        short id = read.s();
+        float time = read.f();
+
+        StatusEntry result = new StatusEntry().set(content.getByID(ContentType.status, id), time);
+
+        if(result.effect.dynamic){
+            //read flags that store which fields are set
+            int flags = read.ub();
+
+            if((flags & (1 << 0)) != 0) result.damageMultiplier = read.f();
+            if((flags & (1 << 1)) != 0) result.healthMultiplier = read.f();
+            if((flags & (1 << 2)) != 0) result.speedMultiplier = read.f();
+            if((flags & (1 << 3)) != 0) result.reloadMultiplier = read.f();
+            if((flags & (1 << 4)) != 0) result.buildSpeedMultiplier = read.f();
+            if((flags & (1 << 5)) != 0) result.dragMultiplier = read.f();
+            if((flags & (1 << 6)) != 0) result.armorOverride = read.f();
+        }
+
+        return result;
     }
 
     public static void writeItems(Writes write, ItemStack stack){
@@ -405,28 +772,20 @@ public class TypeIO{
         return new ItemStack(readItem(read), read.i());
     }
 
-    public static void writeTeam(Writes write, Team reason){
-        write.b(reason.id);
+    public static void writeTeam(Writes write, Team team){
+        write.b(team == null ? 0 : team.id);
     }
 
     public static Team readTeam(Reads read){
         return Team.get(read.b());
     }
 
-    public static void writeUnitCommand(Writes write, UnitCommand reason){
-        write.b((byte)reason.ordinal());
-    }
-
-    public static UnitCommand readUnitCommand(Reads read){
-        return UnitCommand.all[read.b()];
-    }
-
     public static void writeAction(Writes write, AdminAction reason){
         write.b((byte)reason.ordinal());
     }
 
     public static AdminAction readAction(Reads read){
-        return AdminAction.values()[read.b()];
+        return AdminAction.all[read.b()];
     }
 
     public static void writeUnitType(Writes write, UnitType effect){
@@ -457,6 +816,23 @@ public class TypeIO{
         return color.set(read.i());
     }
 
+    public static void writeIntSeq(Writes write, IntSeq seq){
+        write.i(seq.size);
+        for(int i = 0; i < seq.size; i++){
+            write.i(seq.items[i]);
+        }
+    }
+
+    public static IntSeq readIntSeq(Reads read){
+        int size = read.i();
+        IntSeq result = new IntSeq(size);
+        for(int i = 0; i < size; i++){
+            result.items[i] = read.i();
+        }
+        result.size = size;
+        return result;
+    }
+
     public static void writeContent(Writes write, Content cont){
         write.b(cont.getContentType().ordinal());
         write.s(cont.id);
@@ -493,6 +869,15 @@ public class TypeIO{
         return id == -1 ? null : content.item(id);
     }
 
+    //note that only the standard sound constants in Sounds are supported; modded sounds are not.
+    public static void writeSound(Writes write, Sound sound){
+        write.s(Sounds.getSoundId(sound));
+    }
+
+    public static Sound readSound(Reads read){
+        return Sounds.getSound(read.s());
+    }
+
     public static void writeWeather(Writes write, Weather item){
         write.s(item == null ? -1 : item.id);
     }
@@ -570,12 +955,66 @@ public class TypeIO{
     public static void writeTraceInfo(Writes write, TraceInfo trace){
         writeString(write, trace.ip);
         writeString(write, trace.uuid);
+        writeString(write, trace.locale);
         write.b(trace.modded ? (byte)1 : 0);
         write.b(trace.mobile ? (byte)1 : 0);
+        write.i(trace.timesJoined);
+        write.i(trace.timesKicked);
+        //there is a cap to prevent TCP packet size overrun
+        writeStrings(write, trace.ips, 12);
+        writeStrings(write, trace.names, 12);
     }
 
     public static TraceInfo readTraceInfo(Reads read){
-        return new TraceInfo(readString(read), readString(read), read.b() == 1, read.b() == 1);
+        return new TraceInfo(readString(read), readString(read), readString(read), read.b() == 1, read.b() == 1, read.i(), read.i(), readStrings(read), readStrings(read));
+    }
+
+    public static void writeStrings(Writes write, String[] strings, int maxLen){
+        write.b(Math.min(strings.length, maxLen));
+        for(int i = 0; i < Math.min(strings.length, maxLen); i++){
+            writeString(write, strings[i]);
+        }
+    }
+
+    public static void writeStrings(Writes write, String[] strings){
+        write.b(strings.length);
+        for(String s : strings){
+            writeString(write, s);
+        }
+    }
+
+    public static String[] readStrings(Reads read){
+        int length = read.ub();
+        var result = new String[length];
+        for(int j = 0; j < length; j++){
+            result[j] = readString(read);
+        }
+        return result;
+    }
+
+
+    public static void writeStringArray(Writes write, String[][] strings){
+        write.b(strings.length);
+        for(String[] string : strings){
+            write.b(string.length);
+            for(String s : string){
+                writeString(write, s);
+            }
+        }
+    }
+
+    public static String[][] readStringArray(Reads read){
+        int rows = read.ub();
+
+        String[][] strings = new String[rows][];
+        for(int i = 0; i < rows; i++){
+            int columns = read.ub();
+            strings[i] = new String[columns];
+            for(int j = 0; j < columns; j++){
+                strings[i][j] = readString(read);
+            }
+        }
+        return strings;
     }
 
     public static void writeStringData(DataOutput buffer, String string) throws IOException{
@@ -598,4 +1037,50 @@ public class TypeIO{
             return null;
         }
     }
+
+    public interface Boxed<T> {
+        T unbox();
+    }
+
+    /** Represents a building that has not been resolved yet. */
+    public static class BuildingBox implements Boxed<Building>{
+        public int pos;
+
+        public BuildingBox(int pos){
+            this.pos = pos;
+        }
+
+        @Override
+        public Building unbox(){
+            return world.build(pos);
+        }
+
+        @Override
+        public String toString(){
+            return "BuildingBox{" +
+            "pos=" + pos +
+            '}';
+        }
+    }
+
+    /** Represents a unit that has not been resolved yet. TODO unimplemented / unused*/
+    public static class UnitBox implements Boxed<Unit>{
+        public int id;
+
+        public UnitBox(int id){
+            this.id = id;
+        }
+
+        @Override
+        public Unit unbox(){
+            return Groups.unit.getByID(id);
+        }
+
+        @Override
+        public String toString(){
+            return "UnitBox{" +
+            "id=" + id +
+            '}';
+        }
+    }
 }
diff --git a/core/src/mindustry/io/legacy/LegacyIO.java b/core/src/mindustry/io/versions/LegacyIO.java
similarity index 98%
rename from core/src/mindustry/io/legacy/LegacyIO.java
rename to core/src/mindustry/io/versions/LegacyIO.java
index 9ca0533855..f4a865ccb5 100644
--- a/core/src/mindustry/io/legacy/LegacyIO.java
+++ b/core/src/mindustry/io/versions/LegacyIO.java
@@ -1,4 +1,4 @@
-package mindustry.io.legacy;
+package mindustry.io.versions;
 
 import arc.*;
 import arc.struct.*;
diff --git a/core/src/mindustry/io/versions/LegacyRegionSaveVersion.java b/core/src/mindustry/io/versions/LegacyRegionSaveVersion.java
new file mode 100644
index 0000000000..a616d985f0
--- /dev/null
+++ b/core/src/mindustry/io/versions/LegacyRegionSaveVersion.java
@@ -0,0 +1,31 @@
+package mindustry.io.versions;
+
+import arc.util.io.*;
+import mindustry.io.*;
+import mindustry.world.*;
+
+import java.io.*;
+
+import static mindustry.Vars.*;
+
+/** This version does not read custom chunk data (<= 6). */
+public class LegacyRegionSaveVersion extends SaveVersion{
+
+    public LegacyRegionSaveVersion(int version){
+        super(version);
+    }
+
+    @Override
+    public void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{
+        region("meta", stream, counter, in -> readMeta(in, context));
+        region("content", stream, counter, this::readContentHeader);
+
+        try{
+            region("map", stream, counter, in -> readMap(in, context));
+            region("entities", stream, counter, this::readEntities);
+        }finally{
+            content.setTemporaryMapper(null);
+
+        }
+    }
+}
diff --git a/core/src/mindustry/io/legacy/LegacySaveVersion.java b/core/src/mindustry/io/versions/LegacySaveVersion.java
similarity index 94%
rename from core/src/mindustry/io/legacy/LegacySaveVersion.java
rename to core/src/mindustry/io/versions/LegacySaveVersion.java
index bb7d7eff11..6dcf6c2b9b 100644
--- a/core/src/mindustry/io/legacy/LegacySaveVersion.java
+++ b/core/src/mindustry/io/versions/LegacySaveVersion.java
@@ -1,17 +1,16 @@
-package mindustry.io.legacy;
+package mindustry.io.versions;
 
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.content.*;
 import mindustry.game.*;
-import mindustry.io.*;
 import mindustry.world.*;
 
 import java.io.*;
 
 import static mindustry.Vars.*;
 
-public abstract class LegacySaveVersion extends SaveVersion{
+public abstract class LegacySaveVersion extends LegacyRegionSaveVersion{
 
     public LegacySaveVersion(int version){
         super(version);
@@ -76,7 +75,8 @@ public abstract class LegacySaveVersion extends SaveVersion{
                             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);
+                            //skip cons.valid boolean, it's not very important here
+                            stream.readByte();
 
                             //read only from subclasses!
                             tile.build.read(Reads.get(in), version);
diff --git a/core/src/mindustry/io/versions/LegacySaveVersion2.java b/core/src/mindustry/io/versions/LegacySaveVersion2.java
new file mode 100644
index 0000000000..02a986cb85
--- /dev/null
+++ b/core/src/mindustry/io/versions/LegacySaveVersion2.java
@@ -0,0 +1,36 @@
+package mindustry.io.versions;
+
+import arc.func.*;
+import arc.util.io.*;
+import mindustry.gen.*;
+
+import java.io.*;
+
+/** This version did not read/write entity IDs to the save. */
+public class LegacySaveVersion2 extends LegacyRegionSaveVersion{
+
+    public LegacySaveVersion2(int version){
+        super(version);
+    }
+
+    @Override
+    public void readWorldEntities(DataInput stream) throws IOException{
+        //entityMapping is null in older save versions, so use the default
+        Prov[] mapping = this.entityMapping == null ? EntityMapping.idMap : this.entityMapping;
+
+        int amount = stream.readInt();
+        for(int j = 0; j < amount; j++){
+            readChunk(stream, true, in -> {
+                int typeid = in.readUnsignedByte();
+                if(mapping[typeid] == null){
+                    in.skipBytes(lastRegionLength - 1);
+                    return;
+                }
+
+                Entityc entity = (Entityc)mapping[typeid].get();
+                entity.read(Reads.get(in));
+                entity.add();
+            });
+        }
+    }
+}
diff --git a/core/src/mindustry/io/legacy/Save1.java b/core/src/mindustry/io/versions/Save1.java
similarity index 88%
rename from core/src/mindustry/io/legacy/Save1.java
rename to core/src/mindustry/io/versions/Save1.java
index b0a20888fc..95a7ab558e 100644
--- a/core/src/mindustry/io/legacy/Save1.java
+++ b/core/src/mindustry/io/versions/Save1.java
@@ -1,4 +1,4 @@
-package mindustry.io.legacy;
+package mindustry.io.versions;
 
 import java.io.*;
 
diff --git a/core/src/mindustry/io/legacy/Save2.java b/core/src/mindustry/io/versions/Save2.java
similarity index 88%
rename from core/src/mindustry/io/legacy/Save2.java
rename to core/src/mindustry/io/versions/Save2.java
index 9a05d6e34d..95b7748ce8 100644
--- a/core/src/mindustry/io/legacy/Save2.java
+++ b/core/src/mindustry/io/versions/Save2.java
@@ -1,4 +1,4 @@
-package mindustry.io.legacy;
+package mindustry.io.versions;
 
 import java.io.*;
 
diff --git a/core/src/mindustry/io/legacy/Save3.java b/core/src/mindustry/io/versions/Save3.java
similarity index 75%
rename from core/src/mindustry/io/legacy/Save3.java
rename to core/src/mindustry/io/versions/Save3.java
index 7306b2bf29..6eff300d88 100644
--- a/core/src/mindustry/io/legacy/Save3.java
+++ b/core/src/mindustry/io/versions/Save3.java
@@ -1,4 +1,4 @@
-package mindustry.io.legacy;
+package mindustry.io.versions;
 
 import mindustry.game.*;
 import mindustry.game.Teams.*;
@@ -21,7 +21,7 @@ public class Save3 extends LegacySaveVersion{
             TeamData data = team.data();
             int blocks = stream.readInt();
             for(int j = 0; j < blocks; j++){
-                data.blocks.addLast(new BlockPlan(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()).id, stream.readInt()));
+                data.plans.addLast(new BlockPlan(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()), stream.readInt()));
             }
         }
 
diff --git a/core/src/mindustry/io/versions/Save4.java b/core/src/mindustry/io/versions/Save4.java
index 4c3198cc35..dac92ee29d 100644
--- a/core/src/mindustry/io/versions/Save4.java
+++ b/core/src/mindustry/io/versions/Save4.java
@@ -1,10 +1,18 @@
 package mindustry.io.versions;
 
-import mindustry.io.*;
+import java.io.*;
 
-public class Save4 extends SaveVersion{
+/** This version only reads entities, no entity ID mappings. */
+public class Save4 extends LegacySaveVersion2{
 
     public Save4(){
         super(4);
     }
+
+    @Override
+    public void readEntities(DataInput stream) throws IOException{
+        readTeamBlocks(stream);
+        readWorldEntities(stream);
+    }
+
 }
diff --git a/core/src/mindustry/io/versions/Save5.java b/core/src/mindustry/io/versions/Save5.java
new file mode 100644
index 0000000000..9c4416079e
--- /dev/null
+++ b/core/src/mindustry/io/versions/Save5.java
@@ -0,0 +1,9 @@
+package mindustry.io.versions;
+
+/** Uses the legacy readWorldEntities function without entity IDs. */
+public class Save5 extends LegacySaveVersion2{
+
+    public Save5(){
+        super(5);
+    }
+}
diff --git a/core/src/mindustry/io/versions/Save6.java b/core/src/mindustry/io/versions/Save6.java
new file mode 100644
index 0000000000..3e8ab423a5
--- /dev/null
+++ b/core/src/mindustry/io/versions/Save6.java
@@ -0,0 +1,9 @@
+package mindustry.io.versions;
+
+/** This version does not read custom chunk data. */
+public class Save6 extends LegacyRegionSaveVersion{
+
+    public Save6(){
+        super(6);
+    }
+}
diff --git a/core/src/mindustry/io/versions/Save7.java b/core/src/mindustry/io/versions/Save7.java
new file mode 100644
index 0000000000..dde5dc8b8c
--- /dev/null
+++ b/core/src/mindustry/io/versions/Save7.java
@@ -0,0 +1,10 @@
+package mindustry.io.versions;
+
+import mindustry.io.*;
+
+public class Save7 extends SaveVersion{
+
+    public Save7(){
+        super(7);
+    }
+}
diff --git a/core/src/mindustry/io/versions/Save8.java b/core/src/mindustry/io/versions/Save8.java
new file mode 100644
index 0000000000..8dc1c0ca01
--- /dev/null
+++ b/core/src/mindustry/io/versions/Save8.java
@@ -0,0 +1,10 @@
+package mindustry.io.versions;
+
+import mindustry.io.*;
+
+public class Save8 extends SaveVersion{
+
+    public Save8(){
+        super(8);
+    }
+}
diff --git a/core/src/mindustry/logic/ConditionOp.java b/core/src/mindustry/logic/ConditionOp.java
index 0954567c06..6af660bafe 100644
--- a/core/src/mindustry/logic/ConditionOp.java
+++ b/core/src/mindustry/logic/ConditionOp.java
@@ -1,12 +1,15 @@
 package mindustry.logic;
 
+import arc.util.*;
+
 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),
+    equal("==", (a, b) -> Math.abs(a - b) < 0.000001, Structs::eq),
+    notEqual("not", (a, b) -> Math.abs(a - b) >= 0.000001, (a, b) -> !Structs.eq(a, b)),
     lessThan("<", (a, b) -> a < b),
     lessThanEq("<=", (a, b) -> a <= b),
     greaterThan(">", (a, b) -> a > b),
     greaterThanEq(">=", (a, b) -> a >= b),
+    strictEqual("===", (a, b) -> false),
     always("always", (a, b) -> true);
 
     public static final ConditionOp[] all = values();
diff --git a/core/src/mindustry/logic/CutsceneAction.java b/core/src/mindustry/logic/CutsceneAction.java
new file mode 100644
index 0000000000..9026eea44f
--- /dev/null
+++ b/core/src/mindustry/logic/CutsceneAction.java
@@ -0,0 +1,9 @@
+package mindustry.logic;
+
+public enum CutsceneAction{
+    pan,
+    zoom,
+    stop;
+
+    public static final CutsceneAction[] all = values();
+}
diff --git a/core/src/mindustry/logic/FetchType.java b/core/src/mindustry/logic/FetchType.java
new file mode 100644
index 0000000000..41b91d7efa
--- /dev/null
+++ b/core/src/mindustry/logic/FetchType.java
@@ -0,0 +1,14 @@
+package mindustry.logic;
+
+public enum FetchType{
+    unit,
+    unitCount,
+    player,
+    playerCount,
+    core,
+    coreCount,
+    build,
+    buildCount;
+
+    public static final FetchType[] all = values();
+}
diff --git a/core/src/mindustry/logic/GlobalConstants.java b/core/src/mindustry/logic/GlobalConstants.java
deleted file mode 100644
index eea74416c0..0000000000
--- a/core/src/mindustry/logic/GlobalConstants.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package mindustry.logic;
-
-import arc.struct.*;
-import mindustry.*;
-import mindustry.content.*;
-import mindustry.logic.LExecutor.*;
-import mindustry.type.*;
-import mindustry.world.*;
-
-/** Stores global constants for logic processors. */
-public class GlobalConstants{
-    private ObjectIntMap<String> namesToIds = new ObjectIntMap<>();
-    private Seq<Var> vars = new Seq<>(Var.class);
-
-    public void init(){
-        put("the end", null);
-        //add default constants
-        put("false", 0);
-        put("true", 1);
-        put("null", null);
-
-        //store base content
-
-        for(Item item : Vars.content.items()){
-            put("@" + item.name, item);
-        }
-
-        for(Liquid liquid : Vars.content.liquids()){
-            put("@" + liquid.name, liquid);
-        }
-
-        for(Block block : Vars.content.blocks()){
-            if(block.synthetic()){
-                put("@" + block.name, block);
-            }
-        }
-
-        //used as a special value for any environmental solid block
-        put("@solid", Blocks.stoneWall);
-        put("@air", Blocks.air);
-
-        for(UnitType type : Vars.content.units()){
-            put("@" + type.name, type);
-        }
-
-        //store sensor constants
-        for(LAccess sensor : LAccess.all){
-            put("@" + sensor.name(), sensor);
-        }
-    }
-
-    /** @return a constant ID > 0 if there is a constant with this name, otherwise -1. */
-    public int get(String name){
-        return namesToIds.get(name, -1);
-    }
-
-    /** @return a constant variable by ID. ID is not bound checked and must be positive. */
-    public Var get(int id){
-        return vars.items[id];
-    }
-
-    /** Adds a constant value by name. */
-    public Var put(String name, Object value){
-        Var var = new Var(name);
-        var.constant = true;
-        if(value instanceof Number num){
-            var.numval = num.doubleValue();
-        }else{
-            var.isobj = true;
-            var.objval = value;
-        }
-
-        int index = vars.size;
-        namesToIds.put(name, index);
-        vars.add(var);
-        return var;
-    }
-}
diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java
new file mode 100644
index 0000000000..732c870983
--- /dev/null
+++ b/core/src/mindustry/logic/GlobalVars.java
@@ -0,0 +1,326 @@
+package mindustry.logic;
+
+import arc.*;
+import arc.audio.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.game.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.legacy.*;
+
+import java.io.*;
+
+import static mindustry.Vars.*;
+
+/** Stores global logic variables for logic processors. */
+public class GlobalVars{
+    public static final int ctrlProcessor = 1, ctrlPlayer = 2, ctrlCommand = 3;
+    public static final ContentType[] lookableContent = {ContentType.block, ContentType.unit, ContentType.item, ContentType.liquid, ContentType.team};
+    public static final ContentType[] writableLookableContent = {ContentType.block, ContentType.unit, ContentType.item, ContentType.liquid};
+    /** Global random state. */
+    public static final Rand rand = new Rand();
+
+    //non-constants that depend on state
+    private static LVar varTime, varTick, varSecond, varMinute, varWave, varWaveTime, varMapW, varMapH, varWait, varServer, varClient, varClientLocale, varClientUnit, varClientName, varClientTeam, varClientMobile;
+
+    private ObjectMap<String, LVar> vars = new ObjectMap<>();
+    private Seq<VarEntry> varEntries = new Seq<>();
+    private ObjectSet<String> privilegedNames = new ObjectSet<>();
+    private UnlockableContent[][] logicIdToContent;
+    private int[][] contentIdToLogicId;
+
+    public static final Seq<String> soundNames = new Seq<>();
+
+    public void init(){
+        putEntryOnly("sectionProcessor");
+
+        putEntryOnly("@this");
+        putEntryOnly("@thisx");
+        putEntryOnly("@thisy");
+        putEntryOnly("@links");
+        putEntryOnly("@ipt");
+
+        putEntryOnly("sectionGeneral");
+
+        put("the end", null, false, true);
+        //add default constants
+        putEntry("false", 0);
+        putEntry("true", 1);
+        put("null", null, false, true);
+
+        //math
+        putEntry("@pi", Mathf.PI);
+        put("Ï€", Mathf.PI, false, true); //for the "cool" kids
+        putEntry("@e", Mathf.E);
+        putEntry("@degToRad", Mathf.degRad);
+        putEntry("@radToDeg", Mathf.radDeg);
+
+        putEntryOnly("sectionMap");
+
+        //time
+        varTime = putEntry("@time", 0);
+        varTick = putEntry("@tick", 0);
+        varSecond = putEntry("@second", 0);
+        varMinute = putEntry("@minute", 0);
+        varWave = putEntry("@waveNumber", 0);
+        varWaveTime = putEntry("@waveTime", 0);
+
+        varMapW = putEntry("@mapw", 0);
+        varMapH = putEntry("@maph", 0);
+        varWait = putEntry("@wait", null);
+
+        putEntryOnly("sectionNetwork");
+
+        varServer = putEntry("@server", 0, true);
+        varClient = putEntry("@client", 0, true);
+
+        //privileged desynced client variables
+        varClientLocale = putEntry("@clientLocale", null, true);
+        varClientUnit = putEntry("@clientUnit", null, true);
+        varClientName = putEntry("@clientName", null, true);
+        varClientTeam = putEntry("@clientTeam", 0, true);
+        varClientMobile = putEntry("@clientMobile", 0, true);
+
+        //special enums
+        put("@ctrlProcessor", ctrlProcessor);
+        put("@ctrlPlayer", ctrlPlayer);
+        put("@ctrlCommand", ctrlCommand);
+
+        //sounds
+        if(Core.assets != null){
+            for(Sound sound : Core.assets.getAll(Sound.class, new Seq<>(Sound.class))){
+                if(sound != Sounds.none && sound != Sounds.swish && sound.file != null){
+                    String name = sound.file.nameWithoutExtension();
+                    soundNames.add(name);
+                    put("@sfx-" + name, Sounds.getSoundId(sound));
+                }
+            }
+        }
+
+        //store base content
+
+        for(Team team : Team.baseTeams){
+            put("@" + team.name, team);
+        }
+
+        for(Item item : Vars.content.items()){
+            put("@" + item.name, item);
+        }
+
+        for(Liquid liquid : Vars.content.liquids()){
+            put("@" + liquid.name, liquid);
+        }
+
+        for(Block block : Vars.content.blocks()){
+            //only register blocks that have no item equivalent (this skips sand)
+            if(content.item(block.name) == null & !(block instanceof LegacyBlock)){
+                put("@" + block.name, block);
+            }
+        }
+
+        for(var entry : Colors.getColors().entries()){
+            //ignore uppercase variants, they are duplicates
+            if(Character.isUpperCase(entry.key.charAt(0))) continue;
+
+            put("@color" + Strings.capitalize(entry.key), entry.value.toDoubleBits());
+        }
+
+        for(UnitType type : Vars.content.units()){
+            if(!type.internal){
+                put("@" + type.name, type);
+            }
+        }
+
+        for(Weather weather : Vars.content.weathers()){
+            put("@" + weather.name, weather);
+        }
+
+        //store sensor constants
+        for(LAccess sensor : LAccess.all){
+            put("@" + sensor.name(), sensor);
+        }
+
+        logicIdToContent = new UnlockableContent[ContentType.all.length][];
+        contentIdToLogicId = new int[ContentType.all.length][];
+
+        putEntryOnly("sectionLookup");
+
+        Fi ids = Core.files.internal("logicids.dat");
+        if(ids.exists()){
+            //read logic ID mapping data (generated in ImagePacker)
+            try(DataInputStream in = new DataInputStream(ids.readByteStream())){
+                for(ContentType ctype : writableLookableContent){
+                    short amount = in.readShort();
+                    logicIdToContent[ctype.ordinal()] = new UnlockableContent[amount];
+                    contentIdToLogicId[ctype.ordinal()] = new int[Vars.content.getBy(ctype).size];
+
+                    //store count constants
+                    putEntry("@" + ctype.name() + "Count", amount);
+
+                    for(int i = 0; i < amount; i++){
+                        String name = in.readUTF();
+                        UnlockableContent fetched = Vars.content.getByName(ctype, name);
+
+                        if(fetched != null){
+                            logicIdToContent[ctype.ordinal()][i] = fetched;
+                            contentIdToLogicId[ctype.ordinal()][fetched.id] = i;
+                        }
+                    }
+                }
+            }catch(IOException e){
+                //don't crash?
+                Log.err("Error reading logic ID mapping", e);
+            }
+        }
+    }
+
+    /** Updates global time and other state variables. */
+    public void update(){
+        //set up time; note that @time is now only updated once every invocation and directly based off of @tick.
+        //having time be based off of user system time was a very bad idea.
+        varTime.numval = state.tick / 60.0 * 1000.0;
+        varTick.numval = state.tick;
+
+        //shorthands for seconds/minutes spent in save
+        varSecond.numval = state.tick / 60f;
+        varMinute.numval = state.tick / 60f / 60f;
+
+        //wave state
+        varWave.numval = state.wave;
+        varWaveTime.numval = state.wavetime / 60f;
+
+        varMapW.numval = world.width();
+        varMapH.numval = world.height();
+
+        //network
+        varServer.numval = (net.server() || !net.active()) ? 1 : 0;
+        varClient.numval = net.client() ? 1 : 0;
+
+        //client
+        if(player != null){
+            varClientLocale.objval = player.locale();
+            varClientUnit.objval = player.unit();
+            varClientName.objval = player.name();
+            varClientTeam.numval = player.team().id;
+            varClientMobile.numval = mobile ? 1 : 0;
+        }
+    }
+
+    public LVar waitVar(){
+        return varWait;
+    }
+
+    public Seq<VarEntry> getEntries(){
+        return varEntries;
+    }
+
+    /** @return a piece of content based on its logic ID. This is not equivalent to content ID. In the case of teams, the return value may not be Content. */
+    public @Nullable Object lookupContent(ContentType type, int id){
+        //teams are a special case; they are not technically content, but can be looked up
+        if(type == ContentType.team){
+            return id >= 0 && id < 256 ? Team.all[id] : null;
+        }
+
+        var arr = logicIdToContent[type.ordinal()];
+        return arr != null && id >= 0 && id < arr.length ? arr[id] : null;
+    }
+
+    /** @return the integer logic ID of content, or -1 if invalid. */
+    public int lookupLogicId(UnlockableContent content){
+        var arr = contentIdToLogicId[content.getContentType().ordinal()];
+        return arr != null && content.id >= 0 && content.id < arr.length ? arr[content.id] : -1;
+    }
+
+    /**
+     * @return a constant variable if there is a constant with this name, otherwise null.
+     * Attempt to get privileged variable from non-privileged logic executor returns null constant.
+     */
+    public LVar get(String name){
+        return vars.get(name);
+    }
+
+    /**
+     * @return a constant variable by name
+     * Attempt to get privileged variable from non-privileged logic executor returns null constant.
+     */
+    public LVar get(String name, boolean privileged){
+        if(!privileged && privilegedNames.contains(name)) return vars.get("null");
+        return vars.get(name);
+    }
+
+    /** Sets a global variable by name. */
+    public void set(String name, double value){
+        get(name, true).numval = value;
+    }
+
+    /** Adds a constant value by name. */
+    public LVar put(String name, Object value, boolean privileged){
+        return put(name, value, privileged, true);
+    }
+
+    /** Adds a constant value by name. */
+    public LVar put(String name, Object value, boolean privileged, boolean hidden){
+        LVar existingVar = vars.get(name);
+        if(existingVar != null){ //don't overwrite existing vars (see #6910)
+            Log.debug("Failed to add global logic variable '@', as it already exists.", name);
+            return existingVar;
+        }
+
+        LVar var = new LVar(name);
+        var.constant = true;
+        if(value instanceof Number num){
+            var.isobj = false;
+            var.numval = num.doubleValue();
+        }else{
+            var.isobj = true;
+            var.objval = value;
+        }
+
+        vars.put(name, var);
+        if(privileged) privilegedNames.add(name);
+
+        if(!hidden){
+            varEntries.add(new VarEntry(name, "", "", privileged));
+        }
+        return var;
+    }
+
+    public LVar put(String name, Object value){
+        return put(name, value, false);
+    }
+
+    public LVar putEntry(String name, Object value){
+        return put(name, value, false, false);
+    }
+
+    public LVar putEntry(String name, Object value, boolean privileged){
+        return put(name, value, privileged, false);
+    }
+
+    public void putEntryOnly(String name){
+        varEntries.add(new VarEntry(name, "", "", false));
+    }
+
+    /** An entry that describes a variable for documentation purposes. This is *only* used inside UI for global variables. */
+    public static class VarEntry{
+        public String name, description, icon;
+        public boolean privileged;
+
+        public VarEntry(String name, String description, String icon, boolean privileged){
+            this.name = name;
+            this.description = description;
+            this.icon = icon;
+            this.privileged = privileged;
+        }
+
+        public VarEntry(){
+        }
+    }
+}
diff --git a/core/src/mindustry/logic/GlobalVarsDialog.java b/core/src/mindustry/logic/GlobalVarsDialog.java
new file mode 100644
index 0000000000..c2f614bcfc
--- /dev/null
+++ b/core/src/mindustry/logic/GlobalVarsDialog.java
@@ -0,0 +1,61 @@
+package mindustry.logic;
+
+import arc.*;
+import arc.graphics.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+
+import static mindustry.Vars.*;
+
+public class GlobalVarsDialog extends BaseDialog{
+
+    public GlobalVarsDialog(){
+        super("@logic.globals");
+
+        addCloseButton();
+        shown(this::setup);
+        onResize(this::setup);
+    }
+
+    void setup(){
+        float prefWidth = Math.min(Core.graphics.getWidth() * 0.9f / Scl.scl(1f) - 240f, 600f);
+        cont.clearChildren();
+
+        cont.pane(t -> {
+            t.margin(10f).marginRight(16f);
+            t.defaults().fillX().fillY();
+            for(var entry : logicVars.getEntries()){
+                if(entry.name.startsWith("section")){
+                    Color color = Pal.accent;
+                    t.add("@lglobal." + entry.name).fillX().center().labelAlign(Align.center).colspan(4).color(color).padTop(4f).padBottom(2f).row();
+                    t.image(Tex.whiteui).height(4f).color(color).colspan(4).padBottom(8f).row();
+                }else{
+                    Color varColor = Pal.gray;
+                    float stub = 8f, mul = 0.5f, pad = 4;
+
+                    String desc = entry.description;
+                    if(desc == null || desc.isEmpty()){
+                        desc = Core.bundle.get("lglobal." + entry.name, "");
+                    }
+
+                    String fdesc = desc;
+
+                    t.add(new Image(Tex.whiteui, varColor.cpy().mul(mul))).width(stub);
+                    t.stack(new Image(Tex.whiteui, varColor), new Label(" " + entry.name + " ", Styles.outlineLabel)).padRight(pad);
+
+                    t.add(new Image(Tex.whiteui, Pal.gray.cpy().mul(mul))).width(stub);
+                    t.table(Tex.pane, out -> out.add(fdesc).style(Styles.outlineLabel).width(prefWidth).padLeft(2).padRight(2).wrap()).padRight(pad);
+
+                    t.row();
+
+                    t.add().fillX().colspan(4).height(4).row();
+                }
+            }
+        }).grow();
+    }
+}
diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java
index 0daf9ae83f..94b57c73ac 100644
--- a/core/src/mindustry/logic/LAccess.java
+++ b/core/src/mindustry/logic/LAccess.java
@@ -17,44 +17,63 @@ public enum LAccess{
     powerNetOut,
     ammo,
     ammoCapacity,
+    currentAmmoType,
     health,
     maxHealth,
     heat,
+    shield,
+    armor,
     efficiency,
+    progress,
+    timescale,
     rotation,
     x,
     y,
+    velocityX,
+    velocityY,
     shootX,
     shootY,
+    cameraX,
+    cameraY,
+    cameraWidth,
+    cameraHeight,
+    size,
+    solid,
+    dead,
+    range, 
     shooting,
+    boosting,
     mineX,
     mineY,
     mining,
+    speed,
     team,
     type,
     flag,
     controlled,
-    commanded,
+    controller,
     name,
-    config,
     payloadCount,
     payloadType,
+    totalPayload,
+    payloadCapacity,
+    id,
 
     //values with parameters are considered controllable
     enabled("to"), //"to" is standard for single parameter access
     shoot("x", "y", "shoot"),
     shootp(true, "unit", "shoot"),
-    configure(true, 30, "to");
+    config(true, "to"),
+    color("to");
 
     public final String[] params;
     public final boolean isObj;
-    /** Tick cooldown between invocations. */
-    public float cooldown = -1;
 
     public static final LAccess[]
         all = values(),
         senseable = Seq.select(all, t -> t.params.length <= 1).toArray(LAccess.class),
-        controls = Seq.select(all, t -> t.params.length > 0).toArray(LAccess.class);
+        controls = Seq.select(all, t -> t.params.length > 0).toArray(LAccess.class),
+        settable = {x, y, velocityX, velocityY, rotation, speed, armor, health, shield, team, flag, totalPower, payloadType};
 
     LAccess(String... params){
         this.params = params;
@@ -65,10 +84,4 @@ public enum LAccess{
         this.params = params;
         isObj = obj;
     }
-
-    LAccess(boolean obj, float cooldown, String... params){
-        this.params = params;
-        this.cooldown = cooldown;
-        isObj = obj;
-    }
 }
diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java
index 8282e66ca6..847e409100 100644
--- a/core/src/mindustry/logic/LAssembler.java
+++ b/core/src/mindustry/logic/LAssembler.java
@@ -1,41 +1,41 @@
 package mindustry.logic;
 
 import arc.func.*;
+import arc.graphics.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
-import mindustry.gen.*;
 import mindustry.logic.LExecutor.*;
-import mindustry.logic.LStatements.*;
 
 /** "Compiles" a sequence of statements into instructions. */
 public class LAssembler{
     public static ObjectMap<String, Func<String[], LStatement>> customParsers = new ObjectMap<>();
-    public static final int maxTokenLength = 36;
 
-    private int lastVar;
-    /** Maps names to variable IDs. */
-    public ObjectMap<String, BVar> vars = new ObjectMap<>();
+    private static final int invalidNum = Integer.MIN_VALUE;
+
+    private boolean privileged;
+    /** Maps names to variable. */
+    public OrderedMap<String, LVar> vars = new OrderedMap<>();
     /** All instructions to be executed. */
     public LInstruction[] instructions;
 
     public LAssembler(){
         //instruction counter
-        putVar("@counter").value = 0;
-        //unix timestamp
-        putConst("@time", 0);
+        putVar("@counter").isobj = false;
         //currently controlled unit
         putConst("@unit", null);
         //reference to self
         putConst("@this", null);
     }
 
-    public static LAssembler assemble(String data, int maxInstructions){
+    public static LAssembler assemble(String data, boolean privileged){
         LAssembler asm = new LAssembler();
 
-        Seq<LStatement> st = read(data, maxInstructions);
+        Seq<LStatement> st = read(data, privileged);
 
-        asm.instructions = st.map(l -> l.build(asm)).filter(l -> l != null).toArray(LInstruction.class);
+        asm.privileged = privileged;
+        
+        asm.instructions = st.map(l -> l.build(asm)).retainAll(l -> l != null).toArray(LInstruction.class);
         return asm;
     }
 
@@ -49,183 +49,89 @@ public class LAssembler{
         return out.toString();
     }
 
-    public static Seq<LStatement> read(String data){
-        return read(data, LExecutor.maxInstructions);
+    /** Parses a sequence of statements from a string. */
+    public static Seq<LStatement> read(String text, boolean privileged){
+        //don't waste time parsing null/empty text
+        if(text == null || text.isEmpty()) return new Seq<>();
+        return new LParser(text, privileged).parse();
     }
 
-    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
-            int commentIdx = line.indexOf('#');
-            if(commentIdx != -1) line = line.substring(0, commentIdx).trim();
-            if(line.isEmpty()) continue;
-            //remove trailing semicolons in case someone adds them in for no reason
-            if(line.endsWith(";")) line = line.substring(0, line.length() - 1);
-
-            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, Math.min(i, lastIdx + maxTokenLength)));
-                            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.
+    /** @return a variable by name.
      * This may be a constant variable referring to a number or object. */
-    public int var(String symbol){
-        int constId = Vars.constants.get(symbol);
-        if(constId > 0){
-            //global constants are *negated* and stored separately
-            return -constId;
-        }
+    public LVar var(String symbol){
+        LVar constVar = Vars.logicVars.get(symbol, privileged);
+        if(constVar != null) return constVar;
 
         symbol = symbol.trim();
 
         //string case
-        if(symbol.startsWith("\"") && symbol.endsWith("\"")){
-            return putConst("___" + symbol, symbol.substring(1, symbol.length() - 1).replace("\\n", "\n")).id;
+        if(!symbol.isEmpty() && symbol.charAt(0) == '\"' && symbol.charAt(symbol.length() - 1) == '\"'){
+            return putConst("___" + symbol, symbol.substring(1, symbol.length() - 1).replace("\\n", "\n"));
         }
 
         //remove spaces for non-strings
         symbol = symbol.replace(' ', '_');
 
-        try{
-            double value = parseDouble(symbol);
-            if(Double.isNaN(value) || Double.isInfinite(value)) value = 0;
+        double value = parseDouble(symbol);
 
+        if(value == invalidNum){
+            return putVar(symbol);
+        }else{
             //this creates a hidden const variable with the specified value
-            return putConst("___" + value, value).id;
-        }catch(NumberFormatException e){
-            return putVar(symbol).id;
+            return putConst("___" + value, value);
         }
     }
 
-    double parseDouble(String symbol) throws NumberFormatException{
+    double parseDouble(String symbol){
         //parse hex/binary syntax
-        if(symbol.startsWith("0b")) return Long.parseLong(symbol.substring(2), 2);
-        if(symbol.startsWith("0x")) return Long.parseLong(symbol.substring(2), 16);
+        if(symbol.startsWith("0b")) return Strings.parseLong(symbol, 2, 2, symbol.length(), invalidNum);
+        if(symbol.startsWith("0x")) return Strings.parseLong(symbol, 16, 2, symbol.length(), invalidNum);
+        if(symbol.startsWith("%") && (symbol.length() == 7 || symbol.length() == 9)) return parseColor(symbol);
 
-        return Double.parseDouble(symbol);
+        return Strings.parseDouble(symbol, invalidNum);
+    }
+
+    double parseColor(String symbol){
+        int
+        r = Strings.parseInt(symbol, 16, 0, 1, 3),
+        g = Strings.parseInt(symbol, 16, 0, 3, 5),
+        b = Strings.parseInt(symbol, 16, 0, 5, 7),
+        a = symbol.length() == 9 ? Strings.parseInt(symbol, 16, 0, 7, 9) : 255;
+
+        return Color.toDoubleBits(r, g, b, a);
     }
 
     /** Adds a constant value by name. */
-    public BVar putConst(String name, Object value){
-        BVar var = putVar(name);
+    public LVar putConst(String name, Object value){
+        LVar var = putVar(name);
+        if(value instanceof Number number){
+            var.isobj = false;
+            var.numval = number.doubleValue();
+            var.objval = null;
+        }else{
+            var.isobj = true;
+            var.objval = value;
+        }
         var.constant = true;
-        var.value = value;
         return var;
     }
 
     /** Registers a variable name mapping. */
-    public BVar putVar(String name){
+    public LVar putVar(String name){
         if(vars.containsKey(name)){
             return vars.get(name);
         }else{
-            BVar var = new BVar(lastVar++);
+            //variables are null objects by default
+            LVar var = new LVar(name);
+            var.isobj = true;
             vars.put(name, var);
             return var;
         }
     }
 
     @Nullable
-    public BVar getVar(String name){
+    public LVar 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
index 92c8f61d53..b78908ef6f 100644
--- a/core/src/mindustry/logic/LCanvas.java
+++ b/core/src/mindustry/logic/LCanvas.java
@@ -13,8 +13,10 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.LStatements.*;
 import mindustry.ui.*;
 
 public class LCanvas extends Table{
@@ -25,14 +27,32 @@ public class LCanvas extends Table{
     public DragLayout statements;
     public ScrollPane pane;
     public Group jumps;
+
     StatementElem dragging;
     StatementElem hovered;
     float targetWidth;
     int jumpCount = 0;
+    boolean privileged;
+    Seq<Tooltip> tooltips = new Seq<>();
 
     public LCanvas(){
         canvas = this;
 
+        Core.scene.addListener(new InputListener(){
+            @Override
+            public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
+                //hide tooltips on tap
+                for(var t : tooltips){
+                    t.container.toFront();
+                }
+                Core.app.post(() -> {
+                    tooltips.each(Tooltip::hide);
+                    tooltips.clear();
+                });
+                return super.touchDown(event, x, y, pointer, button);
+            }
+        });
+
         rebuild();
     }
 
@@ -41,9 +61,46 @@ public class LCanvas extends Table{
         return Core.graphics.getWidth() < Scl.scl(900f) * 1.2f;
     }
 
+    public static void tooltip(Cell<?> cell, String key){
+        String lkey = key.toLowerCase().replace(" ", "");
+        if(Core.settings.getBool("logichints", true) && Core.bundle.has(lkey)){
+            var tip = new Tooltip(t -> t.background(Styles.black8).margin(4f).add("[lightgray]" + Core.bundle.get(lkey)).style(Styles.outlineLabel));
+
+            //mobile devices need long-press tooltips
+            if(Vars.mobile){
+                cell.get().addListener(new ElementGestureListener(20, 0.4f, 0.43f, 0.15f){
+                    @Override
+                    public boolean longPress(Element element, float x, float y){
+                        tip.show(element, x, y);
+                        canvas.tooltips.add(tip);
+                        //prevent touch down for other listeners
+                        for(var list : cell.get().getListeners()){
+                            if(list instanceof ClickListener cl){
+                                cl.cancel();
+                            }
+                        }
+                        return true;
+                    }
+                });
+            }else{
+                cell.get().addListener(tip);
+            }
+
+        }
+    }
+
+    public static void tooltip(Cell<?> cell, Enum<?> key){
+        String cl = key.getClass().getSimpleName().toLowerCase() + "." + key.name().toLowerCase();
+        if(Core.bundle.has(cl)){
+            tooltip(cell, cl);
+        }else{
+            tooltip(cell, "lenum." + key.name());
+        }
+    }
+
     public void rebuild(){
         targetWidth = useRows() ? 400f : 900f;
-        float s = pane != null ? pane.getScrollPercentY() : 0f;
+        float s = pane != null ? pane.getVisualScrollY() : 0f;
         String toLoad = statements != null ? save() : null;
 
         clear();
@@ -58,14 +115,8 @@ public class LCanvas extends Table{
 
             jumps.cullable = false;
         }).grow().get();
-        //pane.setClip(false);
         pane.setFlickScroll(false);
-
-        //load old scroll percent
-        Core.app.post(() -> {
-            pane.setScrollPercentY(s);
-            pane.updateVisualScroll();
-        });
+        pane.setScrollYForce(s);
 
         if(toLoad != null){
             load(toLoad);
@@ -92,7 +143,7 @@ public class LCanvas extends Table{
     public void load(String asm){
         jumps.clear();
 
-        Seq<LStatement> statements = LAssembler.read(asm);
+        Seq<LStatement> statements = LAssembler.read(asm, privileged);
         statements.truncate(LExecutor.maxInstructions);
         this.statements.clearChildren();
         for(LStatement st : statements){
@@ -106,8 +157,14 @@ public class LCanvas extends Table{
         this.statements.layout();
     }
 
+    public void clearStatements(){
+        jumps.clear();
+        statements.clearChildren();
+        statements.layout();
+    }
+
     StatementElem checkHovered(){
-        Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
+        Element e = Core.scene.getHoverElement();
         if(e != null){
             while(e != null && !(e instanceof StatementElem)){
                 e = e.parent;
@@ -128,7 +185,7 @@ public class LCanvas extends Table{
             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));
+                pane.setScrollY(pane.getScrollY() + sign * Scl.scl(15f) * Time.delta);
             }
         }
     }
@@ -163,6 +220,7 @@ public class LCanvas extends Table{
 
                 e.setSize(width, e.getPrefHeight());
                 e.setPosition(0, height - cy, Align.topLeft);
+                ((StatementElem)e).updateAddress(i);
 
                 cy += e.getPrefHeight() + space;
                 seq.add(e);
@@ -192,7 +250,7 @@ public class LCanvas extends Table{
                 }
             }
 
-            invalidateHierarchy();
+            if(parent != null) parent.invalidateHierarchy();
 
             if(parent != null && parent instanceof Table){
                 setCullingArea(parent.getCullingArea());
@@ -262,13 +320,15 @@ public class LCanvas extends Table{
 
     public class StatementElem extends Table{
         public LStatement st;
+        public int index;
+        Label addressLabel;
 
         public StatementElem(LStatement st){
             this.st = st;
             st.elem = this;
 
             background(Tex.whitePane);
-            setColor(st.color());
+            setColor(st.category().color);
             margin(0f);
             touchable = Touchable.enabled;
 
@@ -279,17 +339,19 @@ public class LCanvas extends Table{
                 t.margin(6f);
                 t.touchable = Touchable.enabled;
 
-                t.add(st.name()).style(Styles.outlineLabel).color(color).padRight(8);
+                t.add(st.name()).style(Styles.outlineLabel).name("statement-name").color(color).padRight(8);
                 t.add().growX();
 
+                addressLabel = t.add(index + "").style(Styles.outlineLabel).color(color).padRight(8).get();
+
                 t.button(Icon.copy, Styles.logici, () -> {
-                }).padRight(6).get().tapped(this::copy);
+                }).size(24f).padRight(6).get().tapped(this::copy);
 
                 t.button(Icon.cancel, Styles.logici, () -> {
                     remove();
                     dragging = null;
                     statements.layout();
-                });
+                }).size(24f);
 
                 t.addListener(new InputListener(){
                     float lastx, lasty;
@@ -341,12 +403,26 @@ public class LCanvas extends Table{
             marginBottom(7);
         }
 
+        public void updateAddress(int index){
+            this.index = index;
+            addressLabel.setText(index + "");
+        }
+
         public void copy(){
+            st.saveUI();
             LStatement copy = st.copy();
+
+            if(copy instanceof JumpStatement st && st.destIndex != -1){
+                int index = statements.getChildren().indexOf(this);
+                if(index != -1 && index < st.destIndex){
+                    st.destIndex ++;
+                }
+            }
+
             if(copy != null){
                 StatementElem s = new StatementElem(copy);
 
-                statements.addChildAfter(StatementElem.this,s);
+                statements.addChildAfter(StatementElem.this, s);
                 statements.layout();
                 copy.elem = s;
                 copy.setupUI();
@@ -377,7 +453,9 @@ public class LCanvas extends Table{
         public JumpCurve curve;
 
         public JumpButton(Prov<StatementElem> getter, Cons<StatementElem> setter){
-            super(Tex.logicNode, Styles.colori);
+            super(Tex.logicNode, new ImageButtonStyle(){{
+                imageUpColor = Color.white;
+            }});
 
             to = getter;
             addListener(listener = new ClickListener());
diff --git a/core/src/mindustry/logic/LCategory.java b/core/src/mindustry/logic/LCategory.java
new file mode 100644
index 0000000000..f7eaa7c05d
--- /dev/null
+++ b/core/src/mindustry/logic/LCategory.java
@@ -0,0 +1,55 @@
+package mindustry.logic;
+
+import arc.*;
+import arc.graphics.*;
+import arc.scene.style.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+public class LCategory implements Comparable<LCategory>{
+    public static final Seq<LCategory> all = new Seq<>();
+
+    public static final LCategory
+
+    unknown = new LCategory("unknown", Pal.darkishGray),
+    io = new LCategory("io", Pal.logicIo, Icon.logicSmall),
+    block = new LCategory("block", Pal.logicBlocks, Icon.effectSmall),
+    operation = new LCategory("operation", Pal.logicOperations, Icon.settingsSmall),
+    control = new LCategory("control", Pal.logicControl, Icon.rotateSmall),
+    unit = new LCategory("unit", Pal.logicUnits, Icon.unitsSmall),
+    world = new LCategory("world", Pal.logicWorld, Icon.terrainSmall);
+
+    public final String name;
+    public final int id;
+    public final Color color;
+
+    @Nullable
+    public final Drawable icon;
+
+    public LCategory(String name, Color color){
+        this(name, color,null);
+    }
+
+    public LCategory(String name, Color color, Drawable icon){
+        this.icon = icon;
+        this.color = color;
+        this.name = name;
+        id = all.size;
+        all.add(this);
+    }
+
+    public String localized(){
+        return Core.bundle.get("lcategory." + name);
+    }
+
+    public String description(){
+        return Core.bundle.get("lcategory." + name + ".description");
+    }
+
+    @Override
+    public int compareTo(LCategory o){
+        return id - o.id;
+    }
+}
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 29811c8205..d2d074ae56 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1,21 +1,31 @@
 package mindustry.logic;
 
+import arc.*;
+import arc.audio.*;
+import arc.graphics.*;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.noise.*;
 import mindustry.*;
 import mindustry.ai.types.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
+import mindustry.game.EventType.*;
 import mindustry.game.*;
+import mindustry.game.MapObjectives.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
+import mindustry.logic.LogicFx.*;
 import mindustry.type.*;
+import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.logic.*;
+import mindustry.world.blocks.logic.LogicBlock.*;
 import mindustry.world.blocks.logic.LogicDisplay.*;
 import mindustry.world.blocks.logic.MemoryBlock.*;
 import mindustry.world.blocks.logic.MessageBlock.*;
@@ -27,152 +37,82 @@ 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,
-    varUnit = 2,
-    varThis = 3;
-
     public static final int
     maxGraphicsBuffer = 256,
     maxDisplayBuffer = 1024,
-    maxTextBuffer = 256;
+    maxTextBuffer = 400;
 
     public LInstruction[] instructions = {};
-    public Var[] vars = {};
+    /** Non-constant variables used for network sync */
+    public LVar[] vars = {};
+
+    public LVar counter, unit, thisv, ipt;
+
     public int[] binds;
+    public boolean yield;
 
     public LongSeq graphicsBuffer = new LongSeq();
     public StringBuilder textBuffer = new StringBuilder();
     public Building[] links = {};
+    public @Nullable LogicBuild build;
     public IntSet linkIds = new IntSet();
     public Team team = Team.derelict;
+    public boolean privileged = false;
+
+    //yes, this is a minor memory leak, but it's probably not significant enough to matter
+    protected static IntFloatMap unitTimeouts = new IntFloatMap();
+
+    static{
+        Events.on(ResetEvent.class, e -> unitTimeouts.clear());
+    }
+
+    boolean timeoutDone(Unit unit, float delay){
+        return Time.time >= unitTimeouts.get(unit.id) + delay;
+    }
+
+    void updateTimeout(Unit unit){
+        unitTimeouts.put(unit.id, Time.time);
+    }
 
     public boolean initialized(){
-        return instructions != null && vars != null && instructions.length > 0;
+        return 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(counter.numval >= instructions.length || counter.numval < 0){
+            counter.numval = 0;
         }
 
-        if(vars[varCounter].numval < instructions.length){
-            instructions[(int)(vars[varCounter].numval++)].run(this);
+        if(counter.numval < instructions.length){
+            instructions[(int)(counter.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];
+        vars = builder.vars.values().toSeq().retainAll(var -> !var.constant).toArray(LVar.class);
+        for(int i = 0; i < vars.length; i++){
+            vars[i].id = i;
+        }
+
         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 number){
-                dest.isobj = false;
-                dest.numval = number.doubleValue();
-            }else{
-                dest.isobj = true;
-                dest.objval = var.value;
-            }
-        });
+        counter = builder.getVar("@counter");
+        unit = builder.getVar("@unit");
+        thisv = builder.getVar("@this");
+        ipt = builder.putConst("@ipt", build != null ? build.ipt : 0);
     }
 
     //region utility
 
-    public Var var(int index){
-        //global constants have variable IDs < 0, and they are fetched from the global constants object after being negated
-        return index < 0 ? constants.get(-index) : vars[index];
-    }
-
-    public @Nullable Building building(int index){
-        Object o = var(index).objval;
-        return var(index).isobj && o instanceof Building building ? building : null;
-    }
-
-    public @Nullable Object obj(int index){
-        Object o = var(index).objval;
-        return var(index).isobj ? o : null;
-    }
-
-    public boolean bool(int index){
-        Var v = var(index);
-        return v.isobj ? v.objval != null : Math.abs(v.numval) >= 0.00001;
-    }
-
-    public double num(int index){
-        Var v = var(index);
-        return v.isobj ? v.objval != null ? 1 : 0 : Double.isNaN(v.numval) || Double.isInfinite(v.numval) ? 0 : v.numval;
-    }
-
-    public float numf(int index){
-        Var v = var(index);
-        return v.isobj ? v.objval != null ? 1 : 0 : Double.isNaN(v.numval) || Double.isInfinite(v.numval) ? 0 : (float)v.numval;
-    }
-
-    public int numi(int index){
-        return (int)num(index);
-    }
-
-    public void setbool(int index, boolean value){
-        setnum(index, value ? 1 : 0);
-    }
-
-    public void setnum(int index, double value){
-        Var v = var(index);
-        if(v.constant) return;
-        v.numval = Double.isNaN(value) || Double.isInfinite(value) ? 0 : value;
-        v.objval = null;
-        v.isobj = false;
-    }
-
-    public void setobj(int index, Object value){
-        Var v = var(index);
-        if(v.constant) return;
-        v.objval = value;
-        v.isobj = true;
-    }
-
-    public void setconst(int index, Object value){
-        Var v = var(index);
-        v.objval = value;
-        v.isobj = true;
+    /** @return a Var from this processor. May be null if out of bounds. */
+    public @Nullable LVar optionalVar(int index){
+        return index < 0 || index >= vars.length ? null : vars[index];
     }
 
     //endregion
 
-    /** A logic variable. */
-    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{
@@ -181,9 +121,9 @@ public class LExecutor{
 
     /** Binds the processor to a unit based on some filters. */
     public static class UnitBindI implements LInstruction{
-        public int type;
+        public LVar type;
 
-        public UnitBindI(int type){
+        public UnitBindI(LVar type){
             this.type = type;
         }
 
@@ -192,31 +132,30 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-
             if(exec.binds == null || exec.binds.length != content.units().size){
                 exec.binds = new int[content.units().size];
             }
 
             //binding to `null` was previously possible, but was too powerful and exploitable
-            if(exec.obj(type) instanceof UnitType type){
+            if(type.obj() instanceof UnitType type && type.logicControllable){
                 Seq<Unit> seq = exec.team.data().unitCache(type);
 
                 if(seq != null && seq.any()){
                     exec.binds[type.id] %= seq.size;
                     if(exec.binds[type.id] < seq.size){
                         //bind to the next unit
-                        exec.setconst(varUnit, seq.get(exec.binds[type.id]));
+                        exec.unit.setconst(seq.get(exec.binds[type.id]));
                     }
                     exec.binds[type.id] ++;
                 }else{
                     //no units of this type found
-                    exec.setconst(varUnit, null);
+                    exec.unit.setconst(null);
                 }
-            }else if(exec.obj(type) instanceof Unit u && u.team == exec.team){
+            }else if(type.obj() instanceof Unit u && (u.team == exec.team || exec.privileged) && u.type.logicControllable){
                 //bind to specific unit object
-                exec.setconst(varUnit, u);
+                exec.unit.setconst(u);
             }else{
-                exec.setconst(varUnit, null);
+                exec.unit.setconst(null);
             }
         }
     }
@@ -225,10 +164,10 @@ public class LExecutor{
     public static class UnitLocateI implements LInstruction{
         public LLocate locate = LLocate.building;
         public BlockFlag flag = BlockFlag.core;
-        public int enemy, ore;
-        public int outX, outY, outFound, outBuild;
+        public LVar enemy, ore;
+        public LVar outX, outY, outFound, outBuild;
 
-        public UnitLocateI(LLocate locate, BlockFlag flag, int enemy, int ore, int outX, int outY, int outFound, int outBuild){
+        public UnitLocateI(LLocate locate, BlockFlag flag, LVar enemy, LVar ore, LVar outX, LVar outY, LVar outFound, LVar outBuild){
             this.locate = locate;
             this.flag = flag;
             this.enemy = enemy;
@@ -244,7 +183,7 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            Object unitObj = exec.obj(varUnit);
+            Object unitObj = exec.unit.obj();
             LogicAI ai = UnitControlI.checkLogicAI(exec, unitObj);
 
             if(unitObj instanceof Unit unit && ai != null){
@@ -258,12 +197,13 @@ public class LExecutor{
 
                     switch(locate){
                         case ore -> {
-                            if(exec.obj(ore) instanceof Item item){
+                            if(ore.obj() instanceof Item item){
                                 res = indexer.findClosestOre(unit, item);
                             }
                         }
                         case building -> {
-                            res = Geometry.findClosest(unit.x, unit.y, exec.bool(enemy) ? indexer.getEnemy(unit.team, flag) : indexer.getAllied(unit.team, flag));
+                            Building b = Geometry.findClosest(unit.x, unit.y, enemy.bool() ? indexer.getEnemy(unit.team, flag) : indexer.getFlagged(unit.team, flag));
+                            res = b == null ? null : b.tile;
                             build = true;
                         }
                         case spawn -> {
@@ -279,22 +219,29 @@ public class LExecutor{
                     if(res != null && (!build || res.build != null)){
                         cache.found = true;
                         //set result if found
-                        exec.setnum(outX, cache.x = World.conv(build ? res.build.x : res.worldx()));
-                        exec.setnum(outY, cache.y = World.conv(build ? res.build.y : res.worldy()));
-                        exec.setnum(outFound, 1);
+                        outX.setnum(cache.x = World.conv(build ? res.build.x : res.worldx()));
+                        outY.setnum(cache.y = World.conv(build ? res.build.y : res.worldy()));
+                        outFound.setnum(1);
                     }else{
                         cache.found = false;
-                        exec.setnum(outFound, 0);
+                        outFound.setnum(0);
+                    }
+
+                    if(res != null && res.build != null && 
+                        (unit.within(res.build.x, res.build.y, Math.max(unit.range(), buildingRange)) || res.build.team == exec.team)){
+                        cache.build = res.build;
+                        outBuild.setobj(res.build);
+                    }else{
+                        outBuild.setobj(null);
                     }
-                    exec.setobj(outBuild, res != null && res.build != null && res.build.team == exec.team ? cache.build = res.build : null);
                 }else{
-                    exec.setobj(outBuild, cache.build);
-                    exec.setbool(outFound, cache.found);
-                    exec.setnum(outX, cache.x);
-                    exec.setnum(outY, cache.y);
+                    outBuild.setobj(cache.build);
+                    outFound.setbool(cache.found);
+                    outX.setnum(cache.x);
+                    outY.setnum(cache.y);
                 }
             }else{
-                exec.setbool(outFound, false);
+                outFound.setbool(false);
             }
         }
 
@@ -308,9 +255,9 @@ public class LExecutor{
     /** Controls the unit based on some parameters. */
     public static class UnitControlI implements LInstruction{
         public LUnitControl type = LUnitControl.move;
-        public int p1, p2, p3, p4, p5;
+        public LVar p1, p2, p3, p4, p5;
 
-        public UnitControlI(LUnitControl type, int p1, int p2, int p3, int p4, int p5){
+        public UnitControlI(LUnitControl type, LVar p1, LVar p2, LVar p3, LVar p4, LVar p5){
             this.type = type;
             this.p1 = p1;
             this.p2 = p2;
@@ -325,34 +272,40 @@ public class LExecutor{
         /** Checks is a unit is valid for logic AI control, and returns the controller. */
         @Nullable
         public static LogicAI checkLogicAI(LExecutor exec, Object unitObj){
-            if(unitObj instanceof Unit unit && exec.obj(varUnit) == unit && unit.team == exec.team && !unit.isPlayer() && !(unit.controller() instanceof FormationAI)){
-                if(!(unit.controller() instanceof LogicAI)){
-                    unit.controller(new LogicAI());
-                    ((LogicAI)unit.controller()).controller = exec.building(varThis);
+            if(unitObj instanceof Unit unit && unit.isValid() && exec.unit.obj() == unit && (unit.team == exec.team || exec.privileged) && unit.controller().isLogicControllable()){
+                if(unit.controller() instanceof LogicAI la){
+                    la.controller = exec.thisv.building();
+                    return la;
+                }else{
+                    var la = new LogicAI();
+                    la.controller = exec.thisv.building();
 
+                    unit.controller(la);
                     //clear old state
                     unit.mineTile = null;
                     unit.clearBuilding();
 
-                    return (LogicAI)unit.controller();
+                    return la;
                 }
-                return (LogicAI)unit.controller();
             }
             return null;
         }
 
         @Override
         public void run(LExecutor exec){
-            Object unitObj = exec.obj(varUnit);
+            Object unitObj = exec.unit.obj();
             LogicAI ai = checkLogicAI(exec, unitObj);
 
             //only control standard AI units
             if(unitObj instanceof Unit unit && ai != null){
                 ai.controlTimer = LogicAI.logicControlTimeout;
-                float x1 = World.unconv(exec.numf(p1)), y1 = World.unconv(exec.numf(p2)), d1 = World.unconv(exec.numf(p3));
+                float x1 = World.unconv(p1.numf()), y1 = World.unconv(p2.numf()), d1 = World.unconv(p3.numf());
 
                 switch(type){
-                    case move, stop, approach -> {
+                    case idle, autoPathfind -> {
+                        ai.control = type;
+                    }
+                    case move, stop, approach, pathfind -> {
                         ai.control = type;
                         ai.moveX = x1;
                         ai.moveY = y1;
@@ -366,28 +319,29 @@ public class LExecutor{
                             unit.clearBuilding();
                         }
                     }
-                    case within -> {
-                        exec.setnum(p4, unit.within(x1, y1, d1) ? 1 : 0);
+                    case unbind -> {
+                        //TODO is this a good idea? will allocate
+                        unit.resetController();
                     }
-                    case pathfind -> {
-                        ai.control = type;
+                    case within -> {
+                        p4.setnum(unit.within(x1, y1, d1) ? 1 : 0);
                     }
                     case target -> {
                         ai.posTarget.set(x1, y1);
                         ai.aimControl = type;
                         ai.mainTarget = null;
-                        ai.shoot = exec.bool(p3);
+                        ai.shoot = p3.bool();
                     }
                     case targetp -> {
                         ai.aimControl = type;
-                        ai.mainTarget = exec.obj(p1) instanceof Teamc t ? t : null;
-                        ai.shoot = exec.bool(p2);
+                        ai.mainTarget = p1.obj() instanceof Teamc t ? t : null;
+                        ai.shoot = p2.bool();
                     }
                     case boost -> {
-                        ai.boost = exec.bool(p1);
+                        ai.boost = p1.bool();
                     }
                     case flag -> {
-                        unit.flag = exec.num(p1);
+                        unit.flag = p1.num();
                     }
                     case mine -> {
                         Tile tile = world.tileWorld(x1, y1);
@@ -396,46 +350,51 @@ public class LExecutor{
                         }
                     }
                     case payDrop -> {
-                        if(ai.payTimer > 0) return;
+                        if(!exec.timeoutDone(unit, LogicAI.transferDelay)) return;
 
                         if(unit instanceof Payloadc pay && pay.hasPayload()){
                             Call.payloadDropped(unit, unit.x, unit.y);
-                            ai.payTimer = LogicAI.transferDelay;
+                            exec.updateTimeout(unit);
                         }
                     }
                     case payTake -> {
-                        if(ai.payTimer > 0) return;
+                        if(!exec.timeoutDone(unit, LogicAI.transferDelay)) return;
 
                         if(unit instanceof Payloadc pay){
                             //units
-                            if(exec.bool(p1)){
+                            if(p1.bool()){
                                 Unit result = Units.closest(unit.team, unit.x, unit.y, unit.type.hitSize * 2f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(unit, u.hitSize + unit.hitSize * 1.2f));
 
                                 if(result != null){
                                     Call.pickedUnitPayload(unit, result);
                                 }
                             }else{ //buildings
-                                Building tile = world.buildWorld(unit.x, unit.y);
+                                Building build = world.buildWorld(unit.x, unit.y);
 
                                 //TODO copy pasted code
-                                if(tile != null && tile.team == unit.team){
-                                    if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
-                                        Call.pickedBuildPayload(unit, tile, true);
-                                    }else{ //pick up block payload
-                                        Payload current = tile.getPayload();
-                                        if(current != null && pay.canPickupPayload(current)){
-                                            Call.pickedBuildPayload(unit, tile, false);
-                                        }
+                                if(build != null && build.team == unit.team){
+                                    Payload current = build.getPayload();
+                                    if(current != null && pay.canPickupPayload(current)){
+                                        Call.pickedBuildPayload(unit, build, false);
+                                        //pick up whole building directly
+                                    }else if(build.block.buildVisibility != BuildVisibility.hidden && build.canPickup() && pay.canPickup(build)){
+                                        Call.pickedBuildPayload(unit, build, true);
                                     }
                                 }
                             }
-                            ai.payTimer = LogicAI.transferDelay;
+                            exec.updateTimeout(unit);
+                        }
+                    }
+                    case payEnter -> {
+                        Building build = world.buildWorld(unit.x, unit.y);
+                        if(build != null && unit.team() == build.team && build.canControlSelect(unit)){
+                            Call.unitBuildingControlSelect(unit, build);
                         }
                     }
                     case build -> {
-                        if(unit.canBuild() && exec.obj(p3) instanceof Block block){
-                            int x = World.toTile(x1), y = World.toTile(y1);
-                            int rot = exec.numi(p4);
+                        if((state.rules.logicUnitBuild || exec.privileged) && unit.canBuild() && p3.obj() instanceof Block block && block.canBeBuilt() && (block.unlockedNow() || unit.team.isAI())){
+                            int x = World.toTile(x1 - block.offset/tilesize), y = World.toTile(y1 - block.offset/tilesize);
+                            int rot = Mathf.mod(p4.numi(), 4);
 
                             //reset state of last request when necessary
                             if(ai.plan.x != x || ai.plan.y != y || ai.plan.block != block || unit.plans.isEmpty()){
@@ -444,55 +403,74 @@ public class LExecutor{
                                 ai.plan.stuck = false;
                             }
 
+                            var conf = p5.obj();
                             ai.plan.set(x, y, rot, block);
-                            ai.plan.config = exec.obj(p5) instanceof Content c ? c : null;
+                            ai.plan.config = conf instanceof Content c ? c : conf instanceof Building b ? b : null;
 
                             unit.clearBuilding();
+                            Tile tile = ai.plan.tile();
 
-                            if(ai.plan.tile() != null){
+                            if(tile != null && !(tile.block() == block && tile.build != null && tile.build.rotation == rot)){
                                 unit.updateBuilding = true;
                                 unit.addBuild(ai.plan);
                             }
                         }
                     }
                     case getBlock -> {
-                        float range = Math.max(unit.range(), buildingRange);
+                        float range = Math.max(unit.range(), unit.type.buildRange);
                         if(!unit.within(x1, y1, range)){
-                            exec.setobj(p3, null);
-                            exec.setobj(p4, null);
+                            p3.setobj(null);
+                            p4.setobj(null);
+                            p5.setobj(null);
                         }else{
                             Tile tile = world.tileWorld(x1, y1);
-                            //any environmental solid block is returned as StoneWall, aka "@solid"
-                            Block block = tile == null ? null : !tile.synthetic() ? (tile.solid() ? Blocks.stoneWall : Blocks.air) : tile.block();
-                            exec.setobj(p3, block);
-                            exec.setobj(p4, tile != null && tile.build != null ? tile.build : null);
+                            if(tile == null){
+                                p3.setobj(null);
+                                p4.setobj(null);
+                                p5.setobj(null);
+                            }else{
+                                p3.setobj(tile.block());
+                                p4.setobj(tile.build != null ? tile.build : null);
+                                //Allows reading of ore tiles if they are present (overlay is not air) otherwise returns the floor
+                                p5.setobj(tile.overlay() == Blocks.air ? tile.floor() : tile.overlay());
+                            }
                         }
                     }
                     case itemDrop -> {
-                        if(ai.itemTimer > 0) return;
+                        if(!exec.timeoutDone(unit, LogicAI.transferDelay)) return;
 
-                        Building build = exec.building(p1);
-                        int dropped = Math.min(unit.stack.amount, exec.numi(p2));
-                        if(build != null && build.isValid() && dropped > 0 && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
-                            int accepted = build.acceptStack(unit.item(), dropped, unit);
-                            if(accepted > 0){
-                                Call.transferItemTo(unit, unit.item(), accepted, unit.x, unit.y, build);
-                                ai.itemTimer = LogicAI.transferDelay;
+                        //clear item when dropping to @air
+                        if(p1.obj() == Blocks.air){
+                            //only server-side; no need to call anything, as items are synced in snapshots
+                            if(!net.client()){
+                                unit.clearItem();
+                            }
+                            exec.updateTimeout(unit);
+                        }else{
+                            Building build = p1.building();
+                            int dropped = Math.min(unit.stack.amount, p2.numi());
+                            if(build != null && build.team == unit.team && build.isValid() && dropped > 0 && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
+                                int accepted = build.acceptStack(unit.item(), dropped, unit);
+                                if(accepted > 0){
+                                    Call.transferItemTo(unit, unit.item(), accepted, unit.x, unit.y, build);
+                                    exec.updateTimeout(unit);
+                                }
                             }
                         }
                     }
                     case itemTake -> {
-                        if(ai.itemTimer > 0) return;
+                        if(!exec.timeoutDone(unit, LogicAI.transferDelay)) return;
 
-                        Building build = exec.building(p1);
-                        int amount = exec.numi(p3);
+                        Building build = p1.building();
+                        int amount = p3.numi();
 
-                        if(build != null && build.isValid() && build.items != null && exec.obj(p2) instanceof Item item && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
+                        if(build != null && build.team == unit.team && build.isValid() && build.items != null &&
+                            p2.obj() instanceof Item item && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
                             int taken = Math.min(build.items.get(item), Math.min(amount, unit.maxAccepted(item)));
 
                             if(taken > 0){
                                 Call.takeItems(build, item, taken, unit);
-                                ai.itemTimer = LogicAI.transferDelay;
+                                exec.updateTimeout(unit);
                             }
                         }
                     }
@@ -504,12 +482,11 @@ public class LExecutor{
 
     /** Controls a building's state. */
     public static class ControlI implements LInstruction{
-        public int target;
+        public LVar target;
         public LAccess type = LAccess.enabled;
-        public int p1, p2, p3, p4;
-        public Interval timer = new Interval(1);
+        public LVar p1, p2, p3, p4;
 
-        public ControlI(LAccess type, int target, int p1, int p2, int p3, int p4){
+        public ControlI(LAccess type, LVar target, LVar p1, LVar p2, LVar p3, LVar p4){
             this.type = type;
             this.target = target;
             this.p1 = p1;
@@ -522,21 +499,30 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            Object obj = exec.obj(target);
-            if(obj instanceof Building b && b.team == exec.team && exec.linkIds.contains(b.id) && (type.cooldown <= 0 || timer.get(type.cooldown))){
-                if(type.isObj){
-                    b.control(type, exec.obj(p1), exec.num(p2), exec.num(p3), exec.num(p4));
+            Object obj = target.obj();
+            if(obj instanceof Building b && (exec.privileged || (b.team == exec.team && exec.linkIds.contains(b.id)))){
+
+                if(type == LAccess.enabled && !p1.bool()){
+                    b.lastDisabler = exec.build;
+                }
+
+                if(type == LAccess.enabled && p1.bool()){
+                    b.noSleep();
+                }
+
+                if(type.isObj && p1.isobj){
+                    b.control(type, p1.obj(), p2.num(), p3.num(), p4.num());
                 }else{
-                    b.control(type, exec.num(p1), exec.num(p2), exec.num(p3), exec.num(p4));
+                    b.control(type, p1.num(), p2.num(), p3.num(), p4.num());
                 }
             }
         }
     }
 
     public static class GetLinkI implements LInstruction{
-        public int output, index;
+        public LVar output, index;
 
-        public GetLinkI(int output, int index){
+        public GetLinkI(LVar output, LVar index){
             this.index = index;
             this.output = output;
         }
@@ -546,16 +532,16 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            int address = exec.numi(index);
+            int address = index.numi();
 
-            exec.setobj(output, address >= 0 && address < exec.links.length ? exec.links[address] : null);
+            output.setobj(address >= 0 && address < exec.links.length ? exec.links[address] : null);
         }
     }
 
     public static class ReadI implements LInstruction{
-        public int target, position, output;
+        public LVar target, position, output;
 
-        public ReadI(int target, int position, int output){
+        public ReadI(LVar target, LVar position, LVar output){
             this.target = target;
             this.position = position;
             this.output = output;
@@ -566,20 +552,19 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            int address = exec.numi(position);
-            Building from = exec.building(target);
+            int address = position.numi();
+            Building from = target.building();
 
-            if(from instanceof MemoryBuild mem){
-
-                exec.setnum(output, address < 0 || address >= mem.memory.length ? 0 : mem.memory[address]);
+            if(from instanceof MemoryBuild mem && (exec.privileged || (from.team == exec.team && !mem.block.privileged))){
+                output.setnum(address < 0 || address >= mem.memory.length ? 0 : mem.memory[address]);
             }
         }
     }
 
     public static class WriteI implements LInstruction{
-        public int target, position, value;
+        public LVar target, position, value;
 
-        public WriteI(int target, int position, int value){
+        public WriteI(LVar target, LVar position, LVar value){
             this.target = target;
             this.position = position;
             this.value = value;
@@ -590,23 +575,19 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            int address = exec.numi(position);
-            Building from = exec.building(target);
-
-            if(from instanceof MemoryBuild mem){
-
-                if(address >= 0 && address < mem.memory.length){
-                    mem.memory[address] = exec.num(value);
-                }
+            int address = position.numi();
+            Building from = target.building();
 
+            if(from instanceof MemoryBuild mem && (exec.privileged || (from.team == exec.team && !mem.block.privileged)) && address >= 0 && address < mem.memory.length){
+                mem.memory[address] = value.num();
             }
         }
     }
 
     public static class SenseI implements LInstruction{
-        public int from, to, type;
+        public LVar from, to, type;
 
-        public SenseI(int from, int to, int type){
+        public SenseI(LVar from, LVar to, LVar type){
             this.from = from;
             this.to = to;
             this.type = type;
@@ -617,26 +598,31 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            Object target = exec.obj(from);
-            Object sense = exec.obj(type);
+            Object target = from.obj();
+            Object sense = type.obj();
 
-            //TODO should remote enemy buildings be senseable?
+            if(target == null && sense == LAccess.dead){
+                to.setnum(1);
+                return;
+            }
+
+            //note that remote units/buildings can be sensed as well
             if(target instanceof Senseable se){
-                if(sense instanceof Content){
-                    exec.setnum(to, se.sense(((Content)sense)));
-                }else if(sense instanceof LAccess){
-                    Object objOut = se.senseObject((LAccess)sense);
+                if(sense instanceof Content co){
+                    to.setnum(se.sense(co));
+                }else if(sense instanceof LAccess la){
+                    Object objOut = se.senseObject(la);
 
                     if(objOut == Senseable.noSensed){
                         //numeric output
-                        exec.setnum(to, se.sense((LAccess)sense));
+                        to.setnum(se.sense(la));
                     }else{
                         //object output
-                        exec.setobj(to, objOut);
+                        to.setobj(objOut);
                     }
                 }
             }else{
-                exec.setnum(to, 0);
+                to.setobj(null);
             }
         }
     }
@@ -644,17 +630,18 @@ public class LExecutor{
     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;
+        public LVar 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 Object lastSourceBuild;
         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){
+        public RadarI(RadarTarget target1, RadarTarget target2, RadarTarget target3, RadarSort sort, LVar radar, LVar sortOrder, LVar output){
             this.target1 = target1;
             this.target2 = target2;
             this.target3 = target3;
@@ -669,22 +656,23 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            Object base = exec.obj(radar);
+            Object base = radar.obj();
 
-            int sortDir = exec.bool(sortOrder) ? 1 : -1;
+            int sortDir = sortOrder.bool() ? 1 : -1;
             LogicAI ai = null;
 
-            if(base instanceof Ranged r && r.team() == exec.team &&
-                (base instanceof Building || (ai = UnitControlI.checkLogicAI(exec, base)) != null)){ //must be a building or a controllable unit
+            if(base instanceof Ranged r && (exec.privileged || r.team() == exec.team) &&
+                ((base instanceof Building b && (!b.block.privileged || exec.privileged)) || (ai = UnitControlI.checkLogicAI(exec, base)) != null)){ //must be a building or a controllable unit
                 float range = r.range();
 
                 Healthc targeted;
 
                 //timers update on a fixed 30 tick interval
                 //units update on a special timer per controller instance
-                if((base instanceof Building && timer.get(30f)) || (ai != null && ai.checkTargetTimer(this))){
+                if((base instanceof Building && (timer.get(30f) || lastSourceBuild != base)) || (ai != null && ai.checkTargetTimer(this))){
                     //if any of the targets involve enemies
                     boolean enemies = target1 == RadarTarget.enemy || target2 == RadarTarget.enemy || target3 == RadarTarget.enemy;
+                    boolean allies = target1 == RadarTarget.ally || target2 == RadarTarget.ally || target3 == RadarTarget.ally;
 
                     best = null;
                     bestValue = 0;
@@ -696,24 +684,38 @@ public class LExecutor{
                                 find(r, range, sortDir, data.items[i].team);
                             }
                         }
+                    }else if(!allies){
+                        Seq<TeamData> data = state.teams.present;
+                        for(int i = 0; i < data.size; i++){
+                            find(r, range, sortDir, data.items[i].team);
+                        }
                     }else{
                         find(r, range, sortDir, r.team());
                     }
 
+                    if(ai != null){
+                        ai.execCache.put(this, best);
+                    }
+
+                    lastSourceBuild = base;
                     lastTarget = targeted = best;
                 }else{
-                    targeted = lastTarget;
+                    if(ai != null){
+                        targeted = (Healthc)ai.execCache.get(this);
+                    }else{
+                        targeted = lastTarget;
+                    }
                 }
 
-                exec.setobj(output, targeted);
+                output.setobj(targeted);
             }else{
-                exec.setobj(output, null);
+                output.setobj(null);
             }
         }
 
         void find(Ranged b, float range, int sortDir, Team team){
             Units.nearby(team, b.x(), b.y(), range, u -> {
-                if(!u.within(b, range)) return;
+                if(!u.within(b, range) || !u.targetable(team) || b == u) return;
 
                 boolean valid =
                     target1.func.get(b.team(), u) &&
@@ -732,9 +734,9 @@ public class LExecutor{
     }
 
     public static class SetI implements LInstruction{
-        public int from, to;
+        public LVar from, to;
 
-        public SetI(int from, int to){
+        public SetI(LVar from, LVar to){
             this.from = from;
             this.to = to;
         }
@@ -743,17 +745,15 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            Var v = exec.var(to);
-            Var f = exec.var(from);
-
-            //TODO error out when the from-value is a constant
-            if(!v.constant){
-                if(f.isobj){
-                    v.objval = f.objval;
-                    v.isobj = true;
+            if(!to.constant){
+                if(from.isobj){
+                    if(to != exec.counter){
+                        to.objval = from.objval;
+                        to.isobj = true;
+                    }
                 }else{
-                    v.numval = Double.isNaN(f.numval) || Double.isInfinite(f.numval) ? 0 : f.numval;
-                    v.isobj = false;
+                    to.numval = LVar.invalid(from.numval) ? 0 : from.numval;
+                    to.isobj = false;
                 }
             }
         }
@@ -761,9 +761,9 @@ public class LExecutor{
 
     public static class OpI implements LInstruction{
         public LogicOp op = LogicOp.add;
-        public int a, b, dest;
+        public LVar a, b, dest;
 
-        public OpI(LogicOp op, int a, int b, int dest){
+        public OpI(LogicOp op, LVar a, LVar b, LVar dest){
             this.op = op;
             this.a = a;
             this.b = b;
@@ -774,18 +774,17 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            if(op.unary){
-                exec.setnum(dest, op.function1.get(exec.num(a)));
+            if(op == LogicOp.strictEqual){
+                dest.setnum(a.isobj == b.isobj && ((a.isobj && Structs.eq(a.objval, b.objval)) || (!a.isobj && a.numval == b.numval)) ? 1 : 0);
+            }else if(op.unary){
+                dest.setnum(op.function1.get(a.num()));
             }else{
-                Var va = exec.var(a);
-                Var vb = exec.var(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)));
+                if(op.objFunction2 != null && a.isobj && b.isobj){
+                    //use object function if both are objects
+                    dest.setnum(op.objFunction2.get(a.obj(), b.obj()));
                 }else{
                     //otherwise use the numeric function
-                    exec.setnum(dest, op.function2.get(exec.num(a), exec.num(b)));
+                    dest.setnum(op.function2.get(a.num(), b.num()));
                 }
 
             }
@@ -796,7 +795,7 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            exec.var(varCounter).numval = exec.instructions.length;
+            exec.counter.numval = exec.instructions.length;
         }
     }
 
@@ -807,12 +806,10 @@ public class LExecutor{
 
     public static class DrawI implements LInstruction{
         public byte type;
-        public int target;
-        public int x, y, p1, p2, p3, p4;
+        public LVar x, y, p1, p2, p3, p4;
 
-        public DrawI(byte type, int target, int x, int y, int p1, int p2, int p3, int p4){
+        public DrawI(byte type, LVar x, LVar y, LVar p1, LVar p2, LVar p3, LVar p4){
             this.type = type;
-            this.target = target;
             this.x = x;
             this.y = y;
             this.p1 = p1;
@@ -827,25 +824,105 @@ public class LExecutor{
         @Override
         public void run(LExecutor exec){
             //graphics on headless servers are useless.
-            if(Vars.headless) return;
+            if(Vars.headless || exec.graphicsBuffer.size >= maxGraphicsBuffer) return;
 
-            int num1 = exec.numi(p1);
+            //explicitly unpack colorPack, it's pre-processed here
+            if(type == LogicDisplay.commandColorPack){
+                double packed = x.num();
 
-            if(type == LogicDisplay.commandImage){
-                num1 = exec.obj(p1) instanceof UnlockableContent u ? u.iconId : 0;
+                int value = (int)(Double.doubleToRawLongBits(packed)),
+                r = ((value & 0xff000000) >>> 24),
+                g = ((value & 0x00ff0000) >>> 16),
+                b = ((value & 0x0000ff00) >>> 8),
+                a = ((value & 0x000000ff));
+
+                exec.graphicsBuffer.add(DisplayCmd.get(LogicDisplay.commandColor, pack(r), pack(g), pack(b), pack(a), 0, 0));
+            }else if(type == LogicDisplay.commandPrint){
+                CharSequence str = exec.textBuffer;
+
+                if(str.length() > 0){
+                    var data = Fonts.logic.getData();
+                    int advance = (int)data.spaceXadvance, lineHeight = (int)data.lineHeight;
+
+                    int xOffset, yOffset;
+                    int align = p1.id; //p1 is not a variable, it's a raw align value. what a massive hack
+
+                    int maxWidth = 0, lines = 1, lineWidth = 0;
+                    for(int i = 0; i < str.length(); i++){
+                        char next = str.charAt(i);
+                        if(next == '\n'){
+                            maxWidth = Math.max(maxWidth, lineWidth);
+                            lineWidth = 0;
+                            lines ++;
+                        }else{
+                            lineWidth ++;
+                        }
+                    }
+                    maxWidth = Math.max(maxWidth, lineWidth);
+
+                    float
+                    width = maxWidth * advance,
+                    height = lines * lineHeight,
+                    ha = ((Align.isLeft(align) ? -1f : 0f) + 1f + (Align.isRight(align) ? 1f : 0f))/2f,
+                    va = ((Align.isBottom(align) ? -1f : 0f) + 1f + (Align.isTop(align) ? 1f : 0f))/2f;
+
+                    xOffset = -(int)(width * ha);
+                    yOffset = -(int)(height * va) + (lines - 1) * lineHeight;
+
+
+                    int curX = x.numi(), curY = y.numi();
+                    for(int i = 0; i < str.length(); i++){
+                        char next = str.charAt(i);
+                        if(next == '\n'){
+                            //move Y down when newline is encountered
+                            curY -= lineHeight;
+                            curX = x.numi(); //reset
+                            continue;
+                        }
+                        if(Fonts.logic.getData().hasGlyph(next)){
+                            exec.graphicsBuffer.add(DisplayCmd.get(LogicDisplay.commandPrint, packSign(curX + xOffset), packSign(curY + yOffset), next, 0, 0, 0));
+                        }
+                        curX += advance;
+                    }
+
+                    exec.textBuffer.setLength(0);
+                }
+            }else{
+                int num1 = p1.numi(), num4 = p4.numi(), xval = packSign(x.numi()), yval = packSign(y.numi());
+
+                if(type == LogicDisplay.commandImage){
+                    if(p1.obj() instanceof UnlockableContent u){
+                        //TODO: with mods, this will overflow (ID >= 512), but that's better than the previous system, at least
+                        num1 = u.id;
+                        num4 = u.getContentType().ordinal();
+                    }else{
+                        num1 = -1;
+                        num4 = -1;
+                    }
+                    //num1 = p1.obj() instanceof UnlockableContent u ? u.iconId : 0;
+                }else if(type == LogicDisplay.commandScale){
+                    xval = packSign((int)(x.numf() / LogicDisplay.scaleStep));
+                    yval = packSign((int)(y.numf() / LogicDisplay.scaleStep));
+                }
+
+                //add graphics calls, cap graphics buffer size
+                exec.graphicsBuffer.add(DisplayCmd.get(type, xval, yval, packSign(num1), packSign(p2.numi()), packSign(p3.numi()), packSign(num4)));
             }
+        }
 
-            //add graphics calls, cap graphics buffer size
-            if(exec.graphicsBuffer.size < maxGraphicsBuffer){
-                exec.graphicsBuffer.add(DisplayCmd.get(type, exec.numi(x), exec.numi(y), num1, exec.numi(p2), exec.numi(p3), exec.numi(p4)));
-            }
+        static int pack(int value){
+            return value & 0b0111111111;
+        }
+
+        static int packSign(int value){
+            return (Math.abs(value) & 0b0111111111) | (value < 0 ? 0b1000000000 : 0);
         }
     }
 
     public static class DrawFlushI implements LInstruction{
-        public int target;
+        public LVar target;
 
-        public DrawFlushI(int target){
+        public DrawFlushI(LVar target){
             this.target = target;
         }
 
@@ -857,8 +934,7 @@ public class LExecutor{
             //graphics on headless servers are useless.
             if(Vars.headless) return;
 
-            Building build = exec.building(target);
-            if(build instanceof LogicDisplayBuild d){
+            if(target.building() instanceof LogicDisplayBuild d && (d.team == exec.team || exec.privileged)){
                 if(d.commands.size + exec.graphicsBuffer.size < maxDisplayBuffer){
                     for(int i = 0; i < exec.graphicsBuffer.size; i++){
                         d.commands.addLast(exec.graphicsBuffer.items[i]);
@@ -870,9 +946,9 @@ public class LExecutor{
     }
 
     public static class PrintI implements LInstruction{
-        public int value;
+        public LVar value;
 
-        public PrintI(int value){
+        public PrintI(LVar value){
             this.value = value;
         }
 
@@ -884,33 +960,109 @@ public class LExecutor{
             if(exec.textBuffer.length() >= maxTextBuffer) return;
 
             //this should avoid any garbage allocation
-            Var v = exec.var(value);
-            if(v.isobj && value != 0){
-                String strValue =
-                    v.objval == null ? "null" :
-                    v.objval instanceof String s ? s :
-                    v.objval instanceof MappableContent content ? content.name :
-                    v.objval instanceof Content ? "[content]" :
-                    v.objval instanceof Building build ? build.block.name :
-                    v.objval instanceof Unit unit ? unit.type.name :
-                    "[object]";
+            if(value.isobj){
+                String strValue = toString(value.objval);
 
                 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);
+                if(Math.abs(value.numval - Math.round(value.numval)) < 0.00001){
+                    exec.textBuffer.append(Math.round(value.numval));
                 }else{
-                    exec.textBuffer.append(v.numval);
+                    exec.textBuffer.append(value.numval);
+                }
+            }
+        }
+
+        public static String toString(Object obj){
+            return
+                obj == null ? "null" :
+                obj instanceof String s ? s :
+                obj instanceof MappableContent content ? content.name :
+                obj instanceof Content ? "[content]" :
+                obj instanceof Building build ? build.block.name :
+                obj instanceof Unit unit ? unit.type.name :
+                obj instanceof Enum<?> e ? e.name() :
+                obj instanceof Team team ? team.name :
+                "[object]";
+        }
+    }
+
+    public static class PrintCharI implements LInstruction{
+        public LVar value;
+
+        public PrintCharI(LVar value){
+            this.value = value;
+        }
+
+        PrintCharI(){}
+
+        @Override
+        public void run(LExecutor exec){
+
+            if(exec.textBuffer.length() >= maxTextBuffer) return;
+            if(value.isobj){
+                if(!(value.objval instanceof UnlockableContent cont)) return;
+                exec.textBuffer.append((char)cont.emojiChar());
+                return;
+            }
+
+            exec.textBuffer.append((char)Math.floor(value.numval));
+        }
+    }
+
+    public static class FormatI implements LInstruction{
+        public LVar value;
+
+        public FormatI(LVar value){
+            this.value = value;
+        }
+
+        FormatI(){}
+
+        @Override
+        public void run(LExecutor exec){
+
+            if(exec.textBuffer.length() >= maxTextBuffer) return;
+
+            int placeholderIndex = -1;
+            int placeholderNumber = 10;
+
+            for(int i = 0; i < exec.textBuffer.length(); i++){
+                if(exec.textBuffer.charAt(i) == '{' && exec.textBuffer.length() - i > 2){
+                    char numChar = exec.textBuffer.charAt(i + 1);
+
+                    if(numChar >= '0' && numChar <= '9' && exec.textBuffer.charAt(i + 2) == '}'){
+                        if(numChar - '0' < placeholderNumber){
+                            placeholderNumber = numChar - '0';
+                            placeholderIndex = i;
+                        }
+                    }
+                }
+            }
+
+            if(placeholderIndex == -1) return;
+
+            //this should avoid any garbage allocation
+            if(value.isobj){
+                String strValue = PrintI.toString(value.objval);
+
+                exec.textBuffer.replace(placeholderIndex, placeholderIndex + 3, strValue);
+            }else{
+                //display integer version when possible
+                if(Math.abs(value.numval - Math.round(value.numval)) < 0.00001){
+                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 3, Math.round(value.numval) + "");
+                }else{
+                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 3, value.numval + "");
                 }
             }
         }
     }
 
     public static class PrintFlushI implements LInstruction{
-        public int target;
+        public LVar target;
 
-        public PrintFlushI(int target){
+        public PrintFlushI(LVar target){
             this.target = target;
         }
 
@@ -920,22 +1072,23 @@ public class LExecutor{
         @Override
         public void run(LExecutor exec){
 
-            Building build = exec.building(target);
-            if(build instanceof MessageBuild d){
+            if(target.building() instanceof MessageBuild d && (exec.privileged || (d.team == exec.team && !d.block.privileged))){
 
                 d.message.setLength(0);
                 d.message.append(exec.textBuffer, 0, Math.min(exec.textBuffer.length(), maxTextBuffer));
 
-                exec.textBuffer.setLength(0);
             }
+            exec.textBuffer.setLength(0);
+
         }
     }
 
     public static class JumpI implements LInstruction{
         public ConditionOp op = ConditionOp.notEqual;
-        public int value, compare, address;
+        public LVar value, compare;
+        public int address;
 
-        public JumpI(ConditionOp op, int value, int compare, int address){
+        public JumpI(ConditionOp op, LVar value, LVar compare, int address){
             this.op = op;
             this.value = value;
             this.compare = compare;
@@ -948,23 +1101,1019 @@ public class LExecutor{
         @Override
         public void run(LExecutor exec){
             if(address != -1){
-                Var va = exec.var(value);
-                Var vb = exec.var(compare);
+                LVar va = value;
+                LVar vb = 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));
+                if(op == ConditionOp.strictEqual){
+                    cmp = va.isobj == vb.isobj && ((va.isobj && va.objval == vb.objval) || (!va.isobj && va.numval == vb.numval));
+                }else if(op.objFunction != null && va.isobj && vb.isobj){
+                    //use object function if both are objects
+                    cmp = op.objFunction.get(value.obj(), compare.obj());
                 }else{
-                    cmp = op.function.get(exec.num(value), exec.num(compare));
+                    cmp = op.function.get(value.num(), compare.num());
                 }
 
                 if(cmp){
-                    exec.var(varCounter).numval = address;
+                    exec.counter.numval = address;
+                }
+            }
+        }
+    }
+
+    public static class WaitI implements LInstruction{
+        public LVar value;
+
+        public float curTime;
+
+        public WaitI(LVar value){
+            this.value = value;
+        }
+
+        public WaitI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(curTime >= value.num()){
+                curTime = 0f;
+            }else{
+                //skip back to self.
+                exec.counter.numval --;
+                exec.yield = true;
+                curTime += Time.delta / 60f;
+            }
+        }
+    }
+
+    public static class StopI implements LInstruction{
+
+        @Override
+        public void run(LExecutor exec){
+            //skip back to self.
+            exec.counter.numval --;
+            exec.yield = true;
+        }
+    }
+
+    public static class LookupI implements LInstruction{
+        public LVar dest;
+        public LVar from;
+        public ContentType type;
+
+        public LookupI(LVar dest, LVar from, ContentType type){
+            this.dest = dest;
+            this.from = from;
+            this.type = type;
+        }
+
+        public LookupI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            dest.setobj(logicVars.lookupContent(type, from.numi()));
+        }
+    }
+
+    public static class PackColorI implements LInstruction{
+        public LVar result, r, g, b, a;
+
+        public PackColorI(LVar result, LVar r, LVar g, LVar b, LVar a){
+            this.result = result;
+            this.r = r;
+            this.g = g;
+            this.b = b;
+            this.a = a;
+        }
+
+        public PackColorI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            result.setnum(Color.toDoubleBits(Mathf.clamp(r.numf()), Mathf.clamp(g.numf()), Mathf.clamp(b.numf()), Mathf.clamp(a.numf())));
+        }
+    }
+
+    public static class CutsceneI implements LInstruction{
+        public CutsceneAction action = CutsceneAction.stop;
+        public LVar p1, p2, p3, p4;
+
+        public CutsceneI(CutsceneAction action, LVar p1, LVar p2, LVar p3, LVar p4){
+            this.action = action;
+            this.p1 = p1;
+            this.p2 = p2;
+            this.p3 = p3;
+            this.p4 = p4;
+        }
+
+        public CutsceneI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(headless) return;
+
+            switch(action){
+                case pan -> {
+                    control.input.logicCutscene = true;
+                    control.input.logicCamPan.set(World.unconv(p1.numf()), World.unconv(p2.numf()));
+                    control.input.logicCamSpeed = p3.numf();
+                }
+                case zoom -> {
+                    control.input.logicCutscene = true;
+                    control.input.logicCutsceneZoom = Mathf.clamp(p1.numf());
+                }
+                case stop -> {
+                    control.input.logicCutscene = false;
+                }
+            }
+        }
+    }
+
+    public static class FetchI implements LInstruction{
+        public FetchType type = FetchType.unit;
+        public LVar result, team, extra, index;
+
+        public FetchI(FetchType type, LVar result, LVar team, LVar extra, LVar index){
+            this.type = type;
+            this.result = result;
+            this.team = team;
+            this.extra = extra;
+            this.index = index;
+        }
+
+        public FetchI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            int i = index.numi();
+            Team t = team.team();
+            if(t == null) return;
+            TeamData data = t.data();
+
+            switch(type){
+                case unit -> {
+                    UnitType type = extra.obj() instanceof UnitType u ? u : null;
+                    if(type == null){
+                        result.setobj(i < 0 || i >= data.units.size ? null : data.units.get(i));
+                    }else{
+                        var units = data.unitCache(type);
+                        result.setobj(units == null || i < 0 || i >= units.size ? null : units.get(i));
+                    }
+                }
+                case player -> result.setobj(i < 0 || i >= data.players.size ? null :
+                    data.players.get(i).unit() instanceof BlockUnitc block ? block.tile() : data.players.get(i).unit());
+                case core -> result.setobj(i < 0 || i >= data.cores.size ? null : data.cores.get(i));
+                case build -> {
+                    Block block = extra.obj() instanceof Block b ? b : null;
+                    if(block == null){
+                        result.setobj(i < 0 || i >= data.buildings.size ? null : data.buildings.get(i));
+                    }else{
+                        var builds = data.getBuildings(block);
+                        result.setobj(i < 0 || i >= builds.size ? null : builds.get(i));
+                    }
+                }
+                case unitCount -> {
+                    UnitType type = extra.obj() instanceof UnitType u ? u : null;
+                    if(type == null){
+                        result.setnum(data.units.size);
+                    }else{
+                        result.setnum(data.unitCache(type) == null ? 0 : data.unitCache(type).size);
+                    }
+                }
+                case coreCount -> result.setnum(data.cores.size);
+                case playerCount -> result.setnum(data.players.size);
+                case buildCount -> {
+                    Block block = extra.obj() instanceof Block b ? b : null;
+                    if(block == null){
+                        result.setnum(data.buildings.size);
+                    }else{
+                        result.setnum(data.getBuildings(block).size);
+                    }
                 }
             }
         }
     }
 
+    //endregion
+    //region privileged / world instructions
+
+    public static class GetBlockI implements LInstruction{
+        public LVar x, y;
+        public LVar dest;
+        public TileLayer layer = TileLayer.block;
+
+        public GetBlockI(LVar x, LVar y, LVar dest, TileLayer layer){
+            this.x = x;
+            this.y = y;
+            this.dest = dest;
+            this.layer = layer;
+        }
+
+        public GetBlockI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            Tile tile = world.tile(Mathf.round(x.numf()), Mathf.round(y.numf()));
+            if(tile == null){
+                dest.setobj(null);
+            }else{
+                dest.setobj(switch(layer){
+                    case floor -> tile.floor();
+                    case ore -> tile.overlay();
+                    case block -> tile.block();
+                    case building -> tile.build;
+                });
+            }
+        }
+    }
+
+    public static class SetBlockI implements LInstruction{
+        public LVar x, y;
+        public LVar block;
+        public LVar team, rotation;
+        public TileLayer layer = TileLayer.block;
+
+        public SetBlockI(LVar x, LVar y, LVar block, LVar team, LVar rotation, TileLayer layer){
+            this.x = x;
+            this.y = y;
+            this.block = block;
+            this.team = team;
+            this.rotation = rotation;
+            this.layer = layer;
+        }
+
+        public SetBlockI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(net.client()) return;
+
+            Tile tile = world.tile(x.numi(), y.numi());
+            if(tile != null && block.obj() instanceof Block b){
+                //TODO this can be quite laggy...
+                switch(layer){
+                    case ore -> {
+                        if((b instanceof OverlayFloor || b == Blocks.air) && tile.overlay() != b) tile.setOverlayNet(b);
+                    }
+                    case floor -> {
+                        if(b instanceof Floor f && tile.floor() != f && !f.isOverlay() && !f.isAir()){
+                            tile.setFloorNet(f);
+                        }
+                    }
+                    case block -> {
+                        if(!b.isFloor() || b == Blocks.air){
+                            Team t = team.team();
+                            if(t == null) t = Team.derelict;
+
+                            if(tile.block() != b || tile.team() != t){
+                                tile.setNet(b, t, Mathf.clamp(rotation.numi(), 0, 3));
+                            }
+                        }
+                    }
+                    //building case not allowed
+                }
+            }
+        }
+    }
+
+    public static class SpawnUnitI implements LInstruction{
+        public LVar type, x, y, rotation, team, result;
+
+        public SpawnUnitI(LVar type, LVar x, LVar y, LVar rotation, LVar team, LVar result){
+            this.type = type;
+            this.x = x;
+            this.y = y;
+            this.rotation = rotation;
+            this.team = team;
+            this.result = result;
+        }
+
+        public SpawnUnitI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(net.client()) return;
+
+            Team t = team.team();
+
+            if(type.obj() instanceof UnitType type && !type.internal && !type.hidden && t != null && Units.canCreate(t, type)){
+                //random offset to prevent stacking
+                var unit = type.spawn(t, World.unconv(x.numf()) + Mathf.range(0.01f), World.unconv(y.numf()) + Mathf.range(0.01f));
+                spawner.spawnEffect(unit, rotation.numf());
+                result.setobj(unit);
+            }
+        }
+    }
+
+    public static class SenseWeatherI implements LInstruction{
+        public LVar type, to;
+
+        public SenseWeatherI(LVar type, LVar to){
+            this.type = type;
+            this.to = to;
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            to.setbool(type.obj() instanceof Weather weather && weather.isActive());
+        }
+    }
+
+    public static class SetWeatherI implements LInstruction{
+        public LVar type, state;
+
+        public SetWeatherI(LVar type, LVar state){
+            this.type = type;
+            this.state = state;
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(type.obj() instanceof Weather weather){
+                if(state.bool()){
+                    if(!weather.isActive()){ //Create is not already active
+                        Tmp.v1.setToRandomDirection();
+                        Call.createWeather(weather, 1f, WeatherState.fadeTime, Tmp.v1.x, Tmp.v1.y);
+                    }else{
+                        weather.instance().life(WeatherState.fadeTime);
+                    }
+                }else{
+                    if(weather.isActive() && weather.instance().life > WeatherState.fadeTime){
+                        weather.instance().life(WeatherState.fadeTime);
+                    }
+                }
+            }
+        }
+    }
+
+    public static class ApplyEffectI implements LInstruction{
+        public boolean clear;
+        public String effect;
+        public LVar unit, duration;
+
+        public ApplyEffectI(boolean clear, String effect, LVar unit, LVar duration){
+            this.clear = clear;
+            this.effect = effect;
+            this.unit = unit;
+            this.duration = duration;
+        }
+
+        public ApplyEffectI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(net.client()) return;
+
+            if(unit.obj() instanceof Unit unit && content.statusEffect(effect) != null){
+                if(clear){
+                    unit.unapply(content.statusEffect(effect));
+                }else{
+                    unit.apply(content.statusEffect(effect), duration.numf() * 60f);
+                }
+            }
+        }
+    }
+
+    public static class SetRuleI implements LInstruction{
+        public LogicRule rule = LogicRule.waveSpacing;
+        public LVar value, p1, p2, p3, p4;
+
+        public SetRuleI(LogicRule rule, LVar value, LVar p1, LVar p2, LVar p3, LVar p4){
+            this.rule = rule;
+            this.value = value;
+            this.p1 = p1;
+            this.p2 = p2;
+            this.p3 = p3;
+            this.p4 = p4;
+        }
+
+        public SetRuleI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            switch(rule){
+                case waveTimer -> state.rules.waveTimer = value.bool();
+                case wave -> state.wave = Math.max(value.numi(), 1);
+                case currentWaveTime -> state.wavetime = Math.max(value.numf() * 60f, 0f);
+                case waves -> state.rules.waves = value.bool();
+                case waveSending -> state.rules.waveSending = value.bool();
+                case attackMode -> state.rules.attackMode = value.bool();
+                case waveSpacing -> state.rules.waveSpacing = value.numf() * 60f;
+                case enemyCoreBuildRadius -> state.rules.enemyCoreBuildRadius = value.numf() * 8f;
+                case dropZoneRadius -> state.rules.dropZoneRadius = value.numf() * 8f;
+                case unitCap -> state.rules.unitCap = Math.max(value.numi(), 0);
+                case lighting -> state.rules.lighting = value.bool();
+                case canGameOver -> state.rules.canGameOver = value.bool();
+                case mapArea -> {
+                    int x = p1.numi(), y = p2.numi(), w = p3.numi(), h = p4.numi();
+                    if(!checkMapArea(x, y, w, h, false)){
+                        Call.setMapArea(x, y, w, h);
+                    }
+                }
+                case ambientLight -> state.rules.ambientLight.fromDouble(value.num());
+                case solarMultiplier -> state.rules.solarMultiplier = Math.max(value.numf(), 0f);
+                case dragMultiplier -> state.rules.dragMultiplier = Math.max(value.numf(), 0f);
+                case ban -> {
+                    Object cont = value.obj();
+                    if(cont instanceof Block b){
+                        // Rebuild PlacementFragment if anything has changed
+                        if(state.rules.bannedBlocks.add(b) && !headless) ui.hudfrag.blockfrag.rebuild();
+                    }else if(cont instanceof UnitType u){
+                        state.rules.bannedUnits.add(u);
+                    }
+                }
+                case unban -> {
+                    Object cont = value.obj();
+                    if(cont instanceof Block b){
+                        if(state.rules.bannedBlocks.remove(b) && !headless) ui.hudfrag.blockfrag.rebuild();
+                    }else if(cont instanceof UnitType u){
+                        state.rules.bannedUnits.remove(u);
+                    }
+                }
+                case unitHealth, unitBuildSpeed, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, buildSpeed, rtsMinSquad, rtsMinWeight -> {
+                    Team team = p1.team();
+                    if(team != null){
+                        float num = value.numf();
+                        switch(rule){
+                            case buildSpeed -> team.rules().buildSpeedMultiplier = Mathf.clamp(num, 0.001f, 50f);
+                            case unitHealth -> team.rules().unitHealthMultiplier = Math.max(num, 0.001f);
+                            case unitBuildSpeed -> team.rules().unitBuildSpeedMultiplier = Mathf.clamp(num, 0f, 50f);
+                            case unitMineSpeed -> team.rules().unitMineSpeedMultiplier = Math.max(num, 0f);
+                            case unitCost -> team.rules().unitCostMultiplier = Math.max(num, 0f);
+                            case unitDamage -> team.rules().unitDamageMultiplier = Math.max(num, 0f);
+                            case blockHealth -> team.rules().blockHealthMultiplier = Math.max(num, 0.001f);
+                            case blockDamage -> team.rules().blockDamageMultiplier = Math.max(num, 0f);
+                            case rtsMinWeight -> team.rules().rtsMinWeight = num;
+                            case rtsMinSquad -> team.rules().rtsMinSquad = (int)num;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /** @return whether the map area is already set to this value. */
+    static boolean checkMapArea(int x, int y, int w, int h, boolean set){
+        x = Math.max(x, 0);
+        y = Math.max(y, 0);
+        w = Math.min(world.width(), w);
+        h = Math.min(world.height(), h);
+        boolean full = x == 0 && y == 0 && w == world.width() && h == world.height();
+
+        if(state.rules.limitMapArea){
+            if(state.rules.limitX == x && state.rules.limitY == y && state.rules.limitWidth == w && state.rules.limitHeight == h){
+                return true;
+            }else if(full){
+                //disable the rule, covers the whole map
+                if(set){
+                    state.rules.limitMapArea = false;
+                    if(!headless){
+                        renderer.updateAllDarkness();
+                    }
+                    world.checkMapArea();
+                    return false;
+                }
+            }
+        }else if(full){ //was already disabled, no need to change anything
+            return true;
+        }
+
+        if(set){
+            state.rules.limitMapArea = true;
+            state.rules.limitX = x;
+            state.rules.limitY = y;
+            state.rules.limitWidth = w;
+            state.rules.limitHeight = h;
+            world.checkMapArea();
+
+            if(!headless){
+                renderer.updateAllDarkness();
+            }
+        }
+
+        return false;
+    }
+
+    @Remote(called = Loc.server)
+    public static void setMapArea(int x, int y, int w, int h){
+        checkMapArea(x, y, w, h, true);
+    }
+
+    public static class FlushMessageI implements LInstruction{
+        public MessageType type = MessageType.announce;
+        public LVar duration, outSuccess;
+
+        public FlushMessageI(MessageType type, LVar duration, LVar outSuccess){
+            this.type = type;
+            this.duration = duration;
+            this.outSuccess = outSuccess;
+        }
+
+        public FlushMessageI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            //set default to success
+            outSuccess.setnum(1);
+            if(headless && type != MessageType.mission){
+                exec.textBuffer.setLength(0);
+                return;
+            }
+
+            if(
+                type == MessageType.announce && ui.hasAnnouncement() ||
+                type == MessageType.notify && ui.hudfrag.hasToast() ||
+                type == MessageType.toast && ui.hasAnnouncement()
+            ){
+                //backwards compatibility; if it is @wait, block execution
+                if(outSuccess == logicVars.waitVar()){
+                    exec.counter.numval--;
+                    exec.yield = true;
+                }else{
+                    //set outSuccess=false to let user retry.
+                    outSuccess.setnum(0);
+                }
+                return;
+            }
+
+            String text = exec.textBuffer.toString();
+            if(text.startsWith("@")){
+                String substr = text.substring(1);
+                if(Core.bundle.has(substr)){
+                    text = Core.bundle.get(substr);
+                }
+            }
+
+            switch(type){
+                case notify -> ui.hudfrag.showToast(Icon.info, text);
+                case announce -> ui.announce(text, duration.numf());
+                case toast -> ui.showInfoToast(text, duration.numf());
+                //TODO desync?
+                case mission -> state.rules.mission = text;
+            }
+
+            exec.textBuffer.setLength(0);
+        }
+    }
+
+    public static class EffectI implements LInstruction{
+        public EffectEntry type;
+        public LVar x, y, rotation, color, data;
+
+        public EffectI(EffectEntry type, LVar x, LVar y, LVar rotation, LVar color, LVar data){
+            this.type = type;
+            this.x = x;
+            this.y = y;
+            this.rotation = rotation;
+            this.color = color;
+            this.data = data;
+        }
+
+        public EffectI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(type != null){
+                double col = color.num();
+                //limit size so people don't create lag with ridiculous numbers (some explosions scale with size)
+                float rot = type.rotate ? rotation.numf() :
+                    Math.min(rotation.numf(), 1000f);
+
+                type.effect.at(World.unconv(x.numf()), World.unconv(y.numf()), rot, Tmp.c1.fromDouble(col), data.obj());
+            }
+        }
+    }
+
+    public static class ExplosionI implements LInstruction{
+        public LVar team, x, y, radius, damage, air, ground, pierce, effect;
+
+        public ExplosionI(LVar team, LVar x, LVar y, LVar radius, LVar damage, LVar air, LVar ground, LVar pierce, LVar effect){
+            this.team = team;
+            this.x = x;
+            this.y = y;
+            this.radius = radius;
+            this.damage = damage;
+            this.air = air;
+            this.ground = ground;
+            this.pierce = pierce;
+            this.effect = effect;
+        }
+
+        public ExplosionI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(net.client()) return;
+
+            Team t = team.team();
+            //note that there is a radius cap
+            Call.logicExplosion(t, World.unconv(x.numf()), World.unconv(y.numf()), World.unconv(Math.min(radius.numf(), 100)), damage.numf(), air.bool(), ground.bool(), pierce.bool(), effect.bool());
+        }
+    }
+
+    @Remote(called = Loc.server, unreliable = true)
+    public static void logicExplosion(Team team, float x, float y, float radius, float damage, boolean air, boolean ground, boolean pierce, boolean effect){
+        if(damage < 0f) return;
+
+        Damage.damage(team, x, y, radius, damage, pierce, air, ground, true, null);
+        if(effect){
+            if(pierce){
+                Fx.spawnShockwave.at(x, y, World.conv(radius));
+            }else{
+                Fx.dynamicExplosion.at(x, y, World.conv(radius) / 8f);
+            }
+        }
+    }
+
+    public static class SetRateI implements LInstruction{
+        public LVar amount;
+
+        public SetRateI(LVar amount){
+            this.amount = amount;
+        }
+
+        public SetRateI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            exec.build.ipt = Mathf.clamp(amount.numi(), 1, ((LogicBlock)exec.build.block).maxInstructionsPerTick);
+            if(exec.ipt != null){
+                exec.ipt.numval = exec.build.ipt;
+            }
+        }
+    }
+
+    @Remote(unreliable = true)
+    public static void syncVariable(Building building, int variable, Object value){
+        if(building instanceof LogicBuild build){
+            LVar v = build.executor.optionalVar(variable);
+            if(v != null && !v.constant){
+                if(value instanceof Number n){
+                    v.isobj = false;
+                    v.numval = n.doubleValue();
+                }else{
+                    v.isobj = true;
+                    v.objval = value;
+                }
+            }
+        }
+    }
+
+    public static class SyncI implements LInstruction{
+        //20 syncs per second
+        public static long syncInterval = 1000 / 20;
+
+        public LVar variable;
+
+        public SyncI(LVar variable){
+            this.variable = variable;
+        }
+
+        public SyncI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(!variable.constant && Time.timeSinceMillis(variable.syncTime) > syncInterval){
+                variable.syncTime = Time.millis();
+                Call.syncVariable(exec.build, variable.id, variable.isobj ? variable.objval : variable.numval);
+            }
+        }
+    }
+
+    public static class ClientDataI implements LInstruction{
+        public LVar channel, value, reliable;
+
+        public ClientDataI(LVar channel, LVar value, LVar reliable){
+            this.channel = channel;
+            this.value = value;
+            this.reliable = reliable;
+        }
+
+        public ClientDataI() {
+        }
+
+        @Override
+        public void run(LExecutor exec) {
+            if(channel.obj() instanceof String c){
+                Object v = value.isobj ? value.objval : value.numval;
+                if(reliable.bool()){
+                    Call.clientLogicDataReliable(c, v);
+                }else{
+                    Call.clientLogicDataUnreliable(c, v);
+                }
+            }
+        }
+    }
+
+    public static class GetFlagI implements LInstruction{
+        public LVar result, flag;
+
+        public GetFlagI(LVar result, LVar flag){
+            this.result = result;
+            this.flag = flag;
+        }
+
+        public GetFlagI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(flag.obj() instanceof String str){
+                result.setbool(state.rules.objectiveFlags.contains(str));
+            }else{
+                result.setobj(null);
+            }
+        }
+    }
+
+    @Remote(called = Loc.server)
+    public static void setFlag(String flag, boolean add){
+        if(add){
+            state.rules.objectiveFlags.add(flag);
+        }else{
+            state.rules.objectiveFlags.remove(flag);
+        }
+    }
+
+    public static class SetFlagI implements LInstruction{
+        public LVar flag, value;
+
+        public SetFlagI(LVar flag, LVar value){
+            this.flag = flag;
+            this.value = value;
+        }
+
+        public SetFlagI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            //don't invoke unless the flag state actually changes
+            if(flag.obj() instanceof String str && state.rules.objectiveFlags.contains(str) != value.bool()){
+                Call.setFlag(str, value.bool());
+            }
+        }
+    }
+
+    public static class SpawnWaveI implements LInstruction{
+        public LVar natural;
+        public LVar x, y;
+
+        public SpawnWaveI(){
+        }
+
+        public SpawnWaveI(LVar natural, LVar x, LVar y){
+            this.natural = natural;
+            this.x = x;
+            this.y = y;
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(net.client()) return;
+
+            if(natural.bool()){
+                logic.skipWave();
+                return;
+            }
+
+            float
+                spawnX = World.unconv(x.numf()),
+                spawnY = World.unconv(y.numf());
+            int packed = Point2.pack(x.numi(), y.numi());
+
+            for(SpawnGroup group : state.rules.spawns){
+                if(group.type == null || (group.spawn != -1 && group.spawn != packed)) continue;
+
+                int spawned = group.getSpawned(state.wave - 1);
+                float spread = tilesize * 2;
+
+                for(int i = 0; i < spawned; i++){
+                    Tmp.v1.rnd(spread);
+
+                    Unit unit = group.createUnit(state.rules.waveTeam, state.wave - 1);
+                    unit.set(spawnX + Tmp.v1.x, spawnY + Tmp.v1.y);
+                    Vars.spawner.spawnEffect(unit);
+                }
+            }
+        }
+    }
+
+    public static class SetPropI implements LInstruction{
+        public LVar type, of, value;
+
+        public SetPropI(LVar type, LVar of, LVar value){
+            this.type = type;
+            this.of = of;
+            this.value = value;
+        }
+
+        public SetPropI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(of.obj() instanceof Settable sp){
+                Object key = type.obj();
+                if(key instanceof LAccess property){
+                    if(value.isobj){
+                        sp.setProp(property, value.objval);
+                    }else{
+                        sp.setProp(property, value.numval);
+                    }
+                }else if(key instanceof UnlockableContent content){
+                    sp.setProp(content, value.num());
+                }
+            }
+        }
+    }
+
+    public static class PlaySoundI implements LInstruction{
+        public boolean positional;
+        public LVar id, volume, pitch, pan, x, y, limit;
+
+        public PlaySoundI(){
+        }
+
+        public PlaySoundI(boolean positional, LVar id, LVar volume, LVar pitch, LVar pan, LVar x, LVar y, LVar limit){
+            this.positional = positional;
+            this.id = id;
+            this.volume = volume;
+            this.pitch = pitch;
+            this.pan = pan;
+            this.x = x;
+            this.y = y;
+            this.limit = limit;
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            Sound sound = Sounds.getSound(id.numi());
+            if(sound == null || sound == Sounds.swish) sound = Sounds.none; //no.
+
+            if(positional){
+                sound.at(World.unconv(x.numf()), World.unconv(y.numf()), pitch.numf(), Math.min(volume.numf(), 2f), limit.bool());
+            }else{
+                sound.play(Math.min(volume.numf() * (Core.settings.getInt("sfxvol") / 100f), 2f), pitch.numf(), pan.numf(), false, limit.bool());
+            }
+        }
+    }
+
+    public static class SetMarkerI implements LInstruction{
+        public LMarkerControl type = LMarkerControl.pos;
+        public LVar id, p1, p2, p3;
+
+        public SetMarkerI(LMarkerControl type, LVar id, LVar p1, LVar p2, LVar p3){
+            this.type = type;
+            this.id = id;
+            this.p1 = p1;
+            this.p2 = p2;
+            this.p3 = p3;
+        }
+
+        public SetMarkerI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(type == LMarkerControl.remove){
+                state.markers.remove(id.numi());
+            }else{
+                var marker = state.markers.get(id.numi());
+                if(marker == null) return;
+
+                if(type == LMarkerControl.flushText){
+                    marker.setText(exec.textBuffer.toString(), p1.bool());
+                    exec.textBuffer.setLength(0);
+                }else if(type == LMarkerControl.texture){
+                    if(p1.bool()){
+                        marker.setTexture(exec.textBuffer.toString());
+                        exec.textBuffer.setLength(0);
+                    }else{
+                        marker.setTexture(PrintI.toString(p2.obj()));
+                    }
+                }else{
+                    marker.control(type, p1.numOrNan(), p2.numOrNan(), p3.numOrNan());
+                }
+            }
+        }
+    }
+
+    public static class MakeMarkerI implements LInstruction{
+        //TODO arbitrary number
+        public static final int maxMarkers = 20000;
+
+        public String type = "shape";
+        public LVar id, x, y, replace;
+
+        public MakeMarkerI(String type, LVar id, LVar x, LVar y, LVar replace){
+            this.type = type;
+            this.id = id;
+            this.x = x;
+            this.y = y;
+            this.replace = replace;
+        }
+
+        public MakeMarkerI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            var cons = MapObjectives.markerNameToType.get(type);
+
+            if(cons != null && state.markers.size() < maxMarkers){
+                int mid = id.numi();
+                if(replace.bool() || !state.markers.has(mid)){
+                    var marker = cons.get();
+                    marker.control(LMarkerControl.pos, x.num(), y.num(), 0);
+                    state.markers.add(mid, marker);
+                }
+            }
+        }
+    }
+
+    @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
+    public static void createMarker(int id, ObjectiveMarker marker){
+        state.markers.add(id, marker);
+    }
+
+    @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
+    public static void removeMarker(int id){
+        state.markers.remove(id);
+    }
+
+    @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
+    public static void updateMarker(int id, LMarkerControl control, double p1, double p2, double p3){
+        var marker = state.markers.get(id);
+        if(marker != null){
+            marker.control(control, p1, p2, p3);
+        }
+    }
+
+    @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
+    public static void updateMarkerText(int id, LMarkerControl type, boolean fetch, String text){
+        var marker = state.markers.get(id);
+        if(marker != null){
+            if(type == LMarkerControl.flushText){
+                marker.setText(text, fetch);
+            }
+        }
+    }
+
+    @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
+    public static void updateMarkerTexture(int id, String textureName){
+        var marker = state.markers.get(id);
+        if(marker != null){
+            marker.setTexture(textureName);
+        }
+    }
+
+    public static class LocalePrintI implements LInstruction{
+        public LVar name;
+
+        public LocalePrintI(LVar name){
+            this.name = name;
+        }
+
+        public LocalePrintI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(exec.textBuffer.length() >= maxTextBuffer) return;
+
+            //this should avoid any garbage allocation
+            if(name.isobj){
+                String name = PrintI.toString(this.name.objval);
+
+                String strValue;
+
+                if(mobile){
+                    strValue = state.mapLocales.containsProperty(name + ".mobile") ?
+                    state.mapLocales.getProperty(name + ".mobile") :
+                    state.mapLocales.getProperty(name);
+                }else{
+                    strValue = state.mapLocales.getProperty(name);
+                }
+
+                exec.textBuffer.append(strValue);
+            }
+        }
+    }
+
     //endregion
 }
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
new file mode 100644
index 0000000000..c24775af02
--- /dev/null
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -0,0 +1,34 @@
+package mindustry.logic;
+
+public enum LMarkerControl{
+    remove,
+    world("true/false"),
+    minimap("true/false"),
+    autoscale("true/false"),
+    pos("x", "y"),
+    endPos("x", "y"),
+    drawLayer("layer"),
+    color("color"),
+    radius("radius"),
+    stroke("stroke"),
+    rotation("rotation"),
+    shape("sides", "fill", "outline"),
+    arc("start", "end"),
+    flushText("fetch"),
+    fontSize("size"),
+    textHeight("height"),
+    labelFlags("background", "outline"),
+    texture("printFlush", "name"),
+    textureSize("width", "height"),
+    posi("index", "x", "y"),
+    uvi("index", "x", "y"),
+    colori("index", "color");
+
+    public final String[] params;
+
+    public static final LMarkerControl[] all = values();
+
+    LMarkerControl(String... params){
+        this.params = params;
+    }
+}
diff --git a/core/src/mindustry/logic/LParser.java b/core/src/mindustry/logic/LParser.java
new file mode 100644
index 0000000000..6f65e9981f
--- /dev/null
+++ b/core/src/mindustry/logic/LParser.java
@@ -0,0 +1,199 @@
+package mindustry.logic;
+
+import arc.struct.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.logic.LStatements.*;
+
+public class LParser{
+    private static final String[] tokens = new String[16];
+    private static final int maxJumps = 500;
+    private static final StringMap opNameChanges = StringMap.of(
+    "atan2", "angle",
+    "dst", "len"
+    );
+
+    private static final Seq<JumpIndex> jumps = new Seq<>();
+    private static final ObjectIntMap<String> jumpLocations = new ObjectIntMap<>();
+
+    Seq<LStatement> statements = new Seq<>();
+    char[] chars;
+    int pos, line, tok;
+    boolean privileged;
+
+    LParser(String text, boolean privileged){
+        this.privileged = privileged;
+        this.chars = text.toCharArray();
+    }
+
+    void comment(){
+        //read until \n or eof
+        while(pos < chars.length && chars[pos++] != '\n');
+    }
+
+    void error(String message){
+        throw new RuntimeException("Invalid code. " + message);
+    }
+
+    String string(){
+        int from = pos;
+
+        while(++pos < chars.length){
+            var c = chars[pos];
+            if(c == '\n'){
+                error("Missing closing quote \" before end of line.");
+            }else if(c == '"'){
+                break;
+            }
+        }
+
+        if(pos >= chars.length || chars[pos] != '"') error("Missing closing quote \" before end of file.");
+
+        return new String(chars, from, ++pos - from);
+    }
+
+    String token(){
+        int from = pos;
+
+        while(pos < chars.length){
+            char c = chars[pos];
+            if(c == '\n' || c == ' ' || c == '#' || c == '\t' || c == ';') break;
+            pos ++;
+        }
+
+        return new String(chars, from, pos - from);
+    }
+
+    /** Apply changes after reading a list of tokens. */
+    void checkRead(){
+        if(tokens[0].equals("op")){
+            //legacy name change
+            tokens[1] = opNameChanges.get(tokens[1], tokens[1]);
+        }
+    }
+
+    /** Reads the next statement until EOL/EOF. */
+    void statement(){
+        boolean expectNext = false;
+        tok = 0;
+
+        while(pos < chars.length){
+            char c = chars[pos];
+            if(tok >= tokens.length) error("Line too long; may only contain " + tokens.length + " tokens");
+
+            //reached end of line, bail out.
+            if(c == '\n' || c == ';') break;
+
+            if(expectNext && c != ' ' && c != '#' && c != '\t'){
+                error("Expected space after string/token.");
+            }
+
+            expectNext = false;
+
+            if(c == '#'){
+                comment();
+                break;
+            }else if(c == '"'){
+                tokens[tok ++] = string();
+                expectNext = true;
+            }else if(c != ' ' && c != '\t'){
+                tokens[tok ++] = token();
+                expectNext = true;
+            }else{
+                pos ++;
+            }
+        }
+
+        //only process lines with at least 1 token
+        if(tok > 0){
+            checkRead();
+
+            //store jump location, always ends with colon
+            if(tok == 1 && tokens[0].charAt(tokens[0].length() - 1) == ':'){
+                if(jumpLocations.size >= maxJumps){
+                    error("Too many jump locations. Max jumps: " + maxJumps);
+                }
+                jumpLocations.put(tokens[0].substring(0, tokens[0].length() - 1), line);
+            }else{
+                boolean wasJump;
+                String jumpLoc = null;
+                //clean up jump position before parsing
+                if(wasJump = (tokens[0].equals("jump") && tok > 1 && !Strings.canParseInt(tokens[1]))){
+                    jumpLoc = tokens[1];
+                    tokens[1] = "-1";
+                }
+
+                for(int i = 1; i < tok; i++){
+                    if(tokens[i].equals("@configure")) tokens[i] = "@config";
+                    if(tokens[i].equals("configure")) tokens[i] = "config";
+                }
+
+                LStatement st;
+
+                try{
+                    st = LogicIO.read(tokens, tok);
+                }catch(Exception e){
+                    //replace invalid statements
+                    st = new InvalidStatement();
+                }
+
+                //discard misplaced privileged instructions
+                if(!privileged && st != null && st.privileged()){
+                    st = new InvalidStatement();
+                }
+
+                //store jumps that use labels
+                if(st instanceof JumpStatement jump && wasJump){
+                    jumps.add(new JumpIndex(jump, jumpLoc));
+                }
+
+                if(st != null){
+                    statements.add(st);
+                }else{
+                    //attempt parsing using custom parser if a match is found; this is for mods
+                    if(LAssembler.customParsers.containsKey(tokens[0])){
+                        statements.add(LAssembler.customParsers.get(tokens[0]).get(tokens));
+                    }else{
+                        //unparseable statement
+                        statements.add(new InvalidStatement());
+                    }
+                }
+                line ++;
+            }
+        }
+    }
+
+    Seq<LStatement> parse(){
+        jumps.clear();
+        jumpLocations.clear();
+
+        while(pos < chars.length && line < LExecutor.maxInstructions){
+            switch(chars[pos]){
+                case '\n', ';', ' ' -> pos ++; //skip newlines and spaces
+                case '\r' -> pos += 2; //skip the newline after the \r
+                default -> statement();
+            }
+        }
+
+        //load destination indices
+        for(var i : jumps){
+            if(!jumpLocations.containsKey(i.location)){
+                error("Undefined jump location: \"" + i.location + "\". Make sure the jump label exists and is typed correctly.");
+            }
+            i.jump.destIndex = jumpLocations.get(i.location, -1);
+        }
+
+        return statements;
+    }
+
+    static class JumpIndex{
+        JumpStatement jump;
+        String location;
+
+        public JumpIndex(JumpStatement jump, String location){
+            this.jump = jump;
+            this.location = location;
+        }
+    }
+
+}
diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java
index ea54bd833b..76bcd781b3 100644
--- a/core/src/mindustry/logic/LStatement.java
+++ b/core/src/mindustry/logic/LStatement.java
@@ -11,10 +11,14 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.logic.LCanvas.*;
 import mindustry.logic.LExecutor.*;
 import mindustry.ui.*;
 
+import static mindustry.Vars.*;
+import static mindustry.logic.LCanvas.*;
+
 /**
  * A statement is an intermediate representation of an instruction, to be used mostly in UI.
  * Contains all relevant variable information. */
@@ -22,13 +26,18 @@ public abstract class LStatement{
     public transient @Nullable StatementElem elem;
 
     public abstract void build(Table table);
-    public abstract Color color();
+
     public abstract LInstruction build(LAssembler builder);
 
+    public LCategory category(){
+        return LCategory.unknown;
+    }
+
     public LStatement copy(){
         StringBuilder build = new StringBuilder();
         write(build);
-        Seq<LStatement> read = LAssembler.read(build.toString());
+        //assume privileged when copying, because there's no way privileged instructions can appear here anyway, and the instructions get validated on load anyway
+        Seq<LStatement> read = LAssembler.read(build.toString(), true);
         return read.size == 0 ? null : read.first();
     }
 
@@ -36,20 +45,103 @@ public abstract class LStatement{
         return false;
     }
 
+    /** Privileged instructions are only allowed in world processors. */
+    public boolean privileged(){
+        return false;
+    }
+
+    /** If true, this statement is considered useless with privileged processors and is not allowed in them. */
+    public boolean nonPrivileged(){
+        return false;
+    }
+
     //protected methods are only for internal UI layout utilities
 
+    protected void param(Cell<Label> label){
+        String text = name() + "." + label.get().getText().toString().trim();
+        tooltip(label, text);
+    }
+
+    protected String sanitize(String value){
+        if(value.length() == 0){
+            return "";
+        }else if(value.length() == 1){
+            if(value.charAt(0) == '"' || value.charAt(0) == ';' || value.charAt(0) == ' '){
+                return "invalid";
+            }
+        }else{
+            StringBuilder res = new StringBuilder(value.length());
+            if(value.charAt(0) == '"' && value.charAt(value.length() - 1) == '"'){
+                res.append('\"');
+                //strip out extra quotes
+                for(int i = 1; i < value.length() - 1; i++){
+                    if(value.charAt(i) == '"'){
+                        res.append('\'');
+                    }else{
+                        res.append(value.charAt(i));
+                    }
+                }
+                res.append('\"');
+            }else{
+                //otherwise, strip out semicolons, spaces and quotes
+                for(int i = 0; i < value.length(); i++){
+                    char c = value.charAt(i);
+                    res.append(switch(c){
+                        case ';' -> 's';
+                        case '"' -> '\'';
+                        case ' ' -> '_';
+                        default -> c;
+                    });
+                }
+            }
+
+            return res.toString();
+        }
+
+        return value;
+    }
+
     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).maxTextLength(LAssembler.maxTokenLength).addInputDialog();
+        return table.field(value, Styles.nodeField, s -> setter.get(sanitize(s)))
+            .size(144f, 40f).pad(2f).color(table.color);
     }
 
     protected Cell<TextField> fields(Table table, String desc, String value, Cons<String> setter){
-        table.add(desc).padLeft(10).left();
+        table.add(desc).padLeft(10).left().self(this::param);
         return 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);
+    /** Puts the text and field in one table, taking up one cell. */
+    protected Cell<TextField> fieldst(Table table, String desc, String value, Cons<String> setter){
+        Cell[] result = {null};
+        table.table(t -> {
+            t.setColor(table.color);
+            t.add(desc).padLeft(10).left().self(this::param);
+            result[0] = field(t, value, setter).width(85f).padRight(10).left();
+        });
+
+        return result[0];
+    }
+
+    /** Adds color edit button */
+    protected Cell<Button> col(Table table, String value, Cons<Color> setter){
+        return table.button(b -> {
+            b.image(Icon.pencilSmall);
+            b.clicked(() -> {
+                Color current = Pal.accent.cpy();
+                if(value.startsWith("%")){
+                    try{
+                        current = Color.valueOf(value.substring(1));
+                    }catch(Exception ignored){}
+                }
+
+                ui.picker.show(current, setter);
+            });
+        }, Styles.logict, () -> {}).size(40f).padLeft(-11).color(table.color);
+    }
+
+    protected Cell<TextField> fields(Table table, String value, Cons<String> setter){
+        return field(table, value, setter).width(85f);
     }
 
     protected void row(Table table){
@@ -62,13 +154,17 @@ public abstract class LStatement{
         showSelectTable(b, (t, hide) -> {
             ButtonGroup<Button> group = new ButtonGroup<>();
             int i = 0;
-            t.defaults().size(56f, 40f);
+            t.defaults().size(60f, 38f);
 
             for(T p : values){
-                sizer.get(t.button(p.toString(), Styles.clearTogglet, () -> {
+                sizer.get(t.button(p.toString(), Styles.logicTogglet, () -> {
                     getter.get(p);
                     hide.run();
-                }).checked(current == p).group(group));
+                }).self(c -> {
+                    if(p instanceof Enum e){
+                        tooltip(c, e);
+                    }
+                }).checked(current.equals(p)).group(group));
 
                 if(++i % cols == 0) t.row();
             }
@@ -80,7 +176,18 @@ public abstract class LStatement{
     }
 
     protected void showSelectTable(Button b, Cons2<Table, Runnable> hideCons){
-        Table t = new Table(Tex.button);
+        Table t = new Table(Tex.paneSolid){
+            @Override
+            public float getPrefHeight(){
+                return Math.min(super.getPrefHeight(), Core.graphics.getHeight());
+            }
+
+            @Override
+            public float getPrefWidth(){
+                return Math.min(super.getPrefWidth(), Core.graphics.getWidth());
+            }
+        };
+        t.margin(4);
 
         //triggers events behind the element to simulate deselection
         Element hitter = new Element();
@@ -110,14 +217,15 @@ public abstract class LStatement{
             if(t.getWidth() > Core.scene.getWidth()) t.setWidth(Core.graphics.getWidth());
             if(t.getHeight() > Core.scene.getHeight()) t.setHeight(Core.graphics.getHeight());
             t.keepInStage();
+            t.invalidateHierarchy();
+            t.pack();
         });
         t.actions(Actions.alpha(0), Actions.fadeIn(0.3f, Interp.fade));
 
         t.top().pane(inner -> {
-            inner.marginRight(24f);
             inner.top();
             hideCons.get(inner, hide);
-        }).top();
+        }).pad(0f).top().scrollX(false);
 
         t.pack();
     }
@@ -125,7 +233,7 @@ public abstract class LStatement{
     public void afterRead(){}
 
     public void write(StringBuilder builder){
-        LogicIO.write(this,builder);
+        LogicIO.write(this, builder);
     }
 
     public void setupUI(){
@@ -139,4 +247,5 @@ public abstract class LStatement{
     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
index d8fce354ad..078e997786 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1,20 +1,29 @@
 package mindustry.logic;
 
+import arc.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.LCanvas.*;
 import mindustry.logic.LExecutor.*;
+import mindustry.logic.LogicFx.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+import static mindustry.logic.LCanvas.*;
 import static mindustry.world.blocks.logic.LogicDisplay.*;
 
 public class LStatements{
@@ -29,11 +38,6 @@ public class LStatements{
             table.area(comment, Styles.nodeArea, v -> comment = v).growX().height(90f).padLeft(2).padRight(6).color(table.color);
         }
 
-        @Override
-        public Color color(){
-            return Pal.logicControl;
-        }
-
         @Override
         public LInstruction build(LAssembler builder){
             return null;
@@ -47,11 +51,6 @@ public class LStatements{
         public void build(Table table){
         }
 
-        @Override
-        public Color color(){
-            return Pal.logicOperations;
-        }
-
         @Override
         public LInstruction build(LAssembler builder){
             return new NoopI();
@@ -80,13 +79,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicIo;
+        public LInstruction build(LAssembler builder){
+            return new ReadI(builder.var(target), builder.var(address), builder.var(output));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new ReadI(builder.var(target), builder.var(address), builder.var(output));
+        public LCategory category(){
+            return LCategory.io;
         }
     }
 
@@ -112,18 +111,32 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicIo;
+        public LInstruction build(LAssembler builder){
+            return new WriteI(builder.var(target), builder.var(address), builder.var(input));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new WriteI(builder.var(target), builder.var(address), builder.var(input));
+        public LCategory category(){
+            return LCategory.io;
         }
     }
 
     @RegisterStatement("draw")
     public static class DrawStatement extends LStatement{
+        static final String[] aligns = {"center", "top", "bottom", "left", "right", "topLeft", "topRight", "bottomLeft", "bottomRight"};
+        //yes, boxing Integer is gross but this is easier to construct and Integers <128 don't allocate anyway
+        static final ObjectMap<String, Integer> nameToAlign = ObjectMap.of(
+        "center", Align.center,
+        "top", Align.top,
+        "bottom", Align.bottom,
+        "left", Align.left,
+        "right", Align.right,
+        "topLeft", Align.topLeft,
+        "topRight", Align.topRight,
+        "bottomLeft", Align.bottomLeft,
+        "bottomRight", Align.bottomRight
+        );
+
         public GraphicsType type = GraphicsType.clear;
         public String x = "0", y = "0", p1 = "0", p2 = "0", p3 = "0", p4 = "0";
 
@@ -150,6 +163,11 @@ public class LStatements{
                         p2 = "32";
                         p3 = "0";
                     }
+
+                    if(type == GraphicsType.print){
+                        p1 = "bottomLeft";
+                    }
+
                     rebuild(table);
                 }, 2, cell -> cell.size(100, 50)));
             }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
@@ -175,6 +193,13 @@ public class LStatements{
                         row(s);
                         fields(s, "a", p2, v -> p2 = v);
                     }
+                    case col -> {
+                        fields(s, "color", x, v -> x = v).width(144f);
+                        col(s, x, res -> {
+                            x = "%" + res.toString().substring(0, res.a >= 1f ? 6 : 8);
+                            build(table);
+                        });
+                    }
                     case stroke -> {
                         s.add().width(4);
                         fields(s, x, v -> x = v);
@@ -221,6 +246,28 @@ public class LStatements{
                         row(s);
                         fields(s, "rotation", p3, v -> p3 = v);
                     }
+                    case print -> {
+                        fields(s, "x", x, v -> x = v);
+                        fields(s, "y", y, v -> y = v);
+
+                        row(s);
+
+                        s.add("align ");
+
+                        s.button(b -> {
+                            b.label(() -> nameToAlign.containsKey(p1) ? p1 : "bottomLeft");
+                            b.clicked(() -> showSelect(b, aligns, p1, t -> {
+                                p1 = t;
+                            }, 2, cell -> cell.size(165, 50)));
+                        }, Styles.logict, () -> {}).size(165, 40).color(s.color).left().padLeft(2);
+                    }
+                    case translate, scale -> {
+                        fields(s, "x", x, v -> x = v);
+                        fields(s, "y", y, v -> y = v);
+                    }
+                    case rotate -> {
+                        fields(s, "degrees", p1, v -> p1 = v);
+                    }
                 }
             }).expand().left();
         }
@@ -234,13 +281,14 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicIo;
+        public LInstruction build(LAssembler builder){
+            return new DrawI((byte)type.ordinal(), builder.var(x), builder.var(y),
+                type == GraphicsType.print ? new LVar(p1, nameToAlign.get(p1, Align.bottomLeft), true) : builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
         }
 
         @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));
+        public LCategory category(){
+            return LCategory.io;
         }
     }
 
@@ -258,9 +306,71 @@ public class LStatements{
             return new PrintI(builder.var(value));
         }
 
+
         @Override
-        public Color color(){
-            return Pal.logicIo;
+        public LCategory category(){
+            return LCategory.io;
+        }
+    }
+
+    @RegisterStatement("printchar")
+    public static class PrintCharStatement extends LStatement{
+        public String value = "65";
+
+        @Override
+        public void build(Table table){
+            table.add(" char ");
+            TextField field = field(table, value, str -> value = str).get();
+            table.button(b -> {
+                b.image(Icon.pencilSmall);
+                b.clicked(() -> showSelectTable(b, (t, hide) -> {
+                    t.row();
+                    t.table(i -> {
+                        i.left();
+                        int c = 0;
+                        for(char j = 32; j < 127; j++){
+                            final int chr = j;
+                            i.button(String.valueOf(j), Styles.flatt, () -> {
+                                value = Integer.toString(chr);
+                                field.setText(value);
+                                hide.run();
+                            }).size(32f);
+                            if(++c % 8 == 0) i.row();
+                        }
+                    });
+                }));
+            }, Styles.logict, () -> {}).size(40f).padLeft(-2).color(table.color);
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new PrintCharI(builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
+        }
+    }
+
+    @RegisterStatement("format")
+    public static class FormatStatement 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 FormatI(builder.var(value));
+        }
+
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
         }
     }
 
@@ -275,13 +385,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicBlocks;
+        public LInstruction build(LAssembler builder){
+            return new DrawFlushI(builder.var(target));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new DrawFlushI(builder.var(target));
+        public LCategory category(){
+            return LCategory.block;
         }
     }
 
@@ -296,13 +406,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicBlocks;
+        public LInstruction build(LAssembler builder){
+            return new PrintFlushI(builder.var(target));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new PrintFlushI(builder.var(target));
+        public LCategory category(){
+            return LCategory.block;
         }
     }
 
@@ -320,13 +430,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicBlocks;
+        public LInstruction build(LAssembler builder){
+            return new GetLinkI(builder.var(output), builder.var(address));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new GetLinkI(builder.var(output), builder.var(address));
+        public LCategory category(){
+            return LCategory.block;
         }
     }
 
@@ -355,7 +465,7 @@ public class LStatements{
                 }, 2, cell -> cell.size(100, 50)));
             }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
 
-            table.add(" of ");
+            table.add(" of ").self(this::param);
 
             field(table, target, v -> target = v);
 
@@ -373,13 +483,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicBlocks;
+        public LInstruction build(LAssembler builder){
+            return new ControlI(type, builder.var(target), builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
         }
 
         @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));
+        public LCategory category(){
+            return LCategory.block;
         }
     }
 
@@ -394,7 +504,7 @@ public class LStatements{
             table.defaults().left();
 
             if(buildFrom()){
-                table.add(" from ");
+                table.add(" from ").self(this::param);
 
                 fields(table, radar, v -> radar = v);
 
@@ -405,7 +515,7 @@ public class LStatements{
                 int fi = i;
                 Prov<RadarTarget> get = () -> (fi == 0 ? target1 : fi == 1 ? target2 : target3);
 
-                table.add(i == 0 ? " target " : " and ");
+                table.add(i == 0 ? " target " : " and ").self(this::param);
 
                 table.button(b -> {
                     b.label(() -> get.get().name());
@@ -419,13 +529,13 @@ public class LStatements{
                 }
             }
 
-            table.add(" order ");
+            table.add(" order ").self(this::param);
 
             fields(table, sortOrder, v -> sortOrder = v);
 
             table.row();
 
-            table.add(" sort ");
+            table.add(" sort ").self(this::param);
 
             table.button(b -> {
                 b.label(() -> sort.name());
@@ -434,7 +544,7 @@ public class LStatements{
                 }, 2, cell -> cell.size(100, 50)));
             }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
 
-            table.add(" output ");
+            table.add(" output ").self(this::param);
 
             fields(table, output, v -> output = v);
         }
@@ -444,13 +554,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicBlocks;
+        public LInstruction build(LAssembler builder){
+            return new RadarI(target1, target2, target3, sort, builder.var(radar), builder.var(sortOrder), builder.var(output));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new RadarI(target1, target2, target3, sort, builder.var(radar), builder.var(sortOrder), builder.var(output));
+        public LCategory category(){
+            return LCategory.block;
         }
     }
 
@@ -482,8 +592,8 @@ public class LStatements{
                             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, () -> {
+                                if(!item.unlockedNow() || item.hidden) continue;
+                                i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
                                     stype("@" + item.name);
                                     hide.run();
                                 }).size(40f);
@@ -496,8 +606,31 @@ public class LStatements{
                             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, () -> {
+                                if(!item.unlockedNow() || item.hidden) continue;
+                                i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
+                                    stype("@" + item.name);
+                                    hide.run();
+                                }).size(40f);
+
+                                if(++c % 6 == 0) i.row();
+                            }
+                        }),
+                        new Table(i -> {
+                            i.left();
+                            int c = 0;
+                            for(UnitType item : Vars.content.units()){
+                                if(!item.unlockedNow() || item.hidden) continue;
+                                i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
+                                    stype("@" + item.name);
+                                    hide.run();
+                                }).size(40f);
+
+                                if(++c % 6 == 0) i.row();
+                            }
+
+                            for(Block item : Vars.content.blocks()){
+                                if(!item.unlockedNow() || item.isHidden()) continue;
+                                i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
                                     stype("@" + item.name);
                                     hide.run();
                                 }).size(40f);
@@ -508,22 +641,22 @@ public class LStatements{
                         //sensors
                         new Table(i -> {
                             for(LAccess sensor : LAccess.senseable){
-                                i.button(sensor.name(), Styles.cleart, () -> {
+                                i.button(sensor.name(), Styles.flatt, () -> {
                                     stype("@" + sensor.name());
                                     hide.run();
-                                }).size(240f, 40f).row();
+                                }).size(240f, 40f).self(c -> tooltip(c, sensor)).row();
                             }
                         })
                     };
 
-                    Drawable[] icons = {Icon.box, Icon.liquid, Icon.tree};
+                    Drawable[] icons = {Icon.box, Icon.liquid, Icon.units, 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, () -> {
+                        t.button(icons[i], Styles.squareTogglei, () -> {
                             selected = fi;
 
                             stack.clearChildren();
@@ -531,14 +664,14 @@ public class LStatements{
 
                             t.parent.parent.pack();
                             t.parent.parent.invalidateHierarchy();
-                        }).size(80f, 50f).growX().checked(selected == fi).group(group);
+                        }).height(50f).growX().checked(selected == fi).group(group);
                     }
                     t.row();
-                    t.add(stack).colspan(3).width(240f).left();
+                    t.add(stack).colspan(4).width(240f).left();
                 }));
             }, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
 
-            table.add(" in ");
+            table.add(" in ").self(this::param);
 
             field(table, from, str -> from = str);
         }
@@ -549,13 +682,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicBlocks;
+        public LInstruction build(LAssembler builder){
+            return new SenseI(builder.var(from), builder.var(to), builder.var(type));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new SenseI(builder.var(from), builder.var(to), builder.var(type));
+        public LCategory category(){
+            return LCategory.block;
         }
     }
 
@@ -574,13 +707,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicOperations;
+        public LInstruction build(LAssembler builder){
+            return new SetI(builder.var(from), builder.var(to));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new SetI(builder.var(from), builder.var(to));
+        public LCategory category(){
+            return LCategory.operation;
         }
     }
 
@@ -602,28 +735,51 @@ public class LStatements{
             table.add(" = ");
 
             if(op.unary){
-                opButton(table);
+                opButton(table, table);
 
                 field(table, a, str -> a = str);
             }else{
                 row(table);
 
-                field(table, a, str -> a = str);
+                //"function"-type operations have the name at the left and arguments on the right
+                if(op.func){
+                    if(LCanvas.useRows()){
+                        table.left();
+                        table.row();
+                        table.table(c -> {
+                            c.color.set(category().color);
+                            c.left();
+                            funcs(c, table);
+                        }).colspan(2).left();
+                    }else{
+                        funcs(table, table);
+                    }
+                }else{
+                    field(table, a, str -> a = str);
 
-                opButton(table);
+                    opButton(table, table);
 
-                field(table, b, str -> b = str);
+                    field(table, b, str -> b = str);
+                }
             }
         }
 
-        void opButton(Table table){
+        void funcs(Table table, Table parent){
+            opButton(table, parent);
+
+            field(table, a, str -> a = str);
+
+            field(table, b, str -> b = str);
+        }
+
+        void opButton(Table table, Table parent){
             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);
+                    rebuild(parent);
+                }, 4, c -> c.width(64f)));
+            }, Styles.logict, () -> {}).size(64f, 40f).pad(4f).color(table.color);
         }
 
         @Override
@@ -632,8 +788,112 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicOperations;
+        public LCategory category(){
+            return LCategory.operation;
+        }
+    }
+
+    @RegisterStatement("wait")
+    public static class WaitStatement extends LStatement{
+        public String value = "0.5";
+
+        @Override
+        public void build(Table table){
+            field(table, value, str -> value = str);
+            table.add(" sec");
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new WaitI(builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.control;
+        }
+    }
+
+    @RegisterStatement("stop")
+    public static class StopStatement extends LStatement{
+
+        @Override
+        public void build(Table table){
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new StopI();
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.control;
+        }
+    }
+
+    @RegisterStatement("lookup")
+    public static class LookupStatement extends LStatement{
+        public ContentType type = ContentType.item;
+        public String result = "result", id = "0";
+
+        @Override
+        public void build(Table table){
+            fields(table, result, str -> result = str).width(120f);
+
+            table.add(" = lookup ");
+
+            row(table);
+
+            table.button(b -> {
+                b.label(() -> type.name());
+                b.clicked(() -> showSelect(b, GlobalVars.lookableContent, type, o -> {
+                    type = o;
+                }));
+            }, Styles.logict, () -> {}).size(64f, 40f).pad(4f).color(table.color);
+
+            table.add(" # ");
+
+            fields(table, id, str -> id = str);
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new LookupI(builder.var(result), builder.var(id), type);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.operation;
+        }
+    }
+
+    @RegisterStatement("packcolor")
+    public static class PackColorStatement extends LStatement{
+        public String result = "result", r = "1", g = "0", b = "0", a = "1";
+
+        @Override
+        public void build(Table table){
+            fields(table, result, str -> result = str);
+
+            table.add(" = pack ");
+
+            row(table);
+
+            fields(table, r, str -> r = str);
+            fields(table, g, str -> g = str);
+            fields(table, b, str -> b = str);
+            fields(table, a, str -> a = str);
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new PackColorI(builder.var(result), builder.var(r), builder.var(g), builder.var(b), builder.var(a));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.operation;
         }
     }
 
@@ -650,8 +910,8 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicControl;
+        public LCategory category(){
+            return LCategory.control;
         }
     }
 
@@ -675,6 +935,20 @@ public class LStatements{
 
             table.add().growX();
             table.add(new JumpButton(() -> dest, s -> dest = s)).size(30).right().padLeft(-8);
+
+            String name = name();
+
+            //hack way of finding the title label...
+            Core.app.post(() -> {
+                //must be delayed because parent is added later
+                if(table.parent != null){
+                    Label title = table.parent.find("statement-name");
+                    if(title != null){
+                        title.update(() -> title.setText((dest != null ? name + " -> " + dest.index : name)));
+                    }
+                }
+            });
+
         }
 
         void rebuild(Table table){
@@ -715,8 +989,8 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicControl;
+        public LCategory category(){
+            return LCategory.control;
         }
     }
 
@@ -738,12 +1012,12 @@ public class LStatements{
                         i.left();
                         int c = 0;
                         for(UnitType item : Vars.content.units()){
-                            if(!item.unlockedNow() || item.isHidden()) continue;
-                            i.button(new TextureRegionDrawable(item.icon(Cicon.small)), Styles.cleari, () -> {
+                            if(!item.unlockedNow() || item.isHidden() || !item.logicControllable) continue;
+                            i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
                                 type = "@" + item.name;
                                 field.setText(type);
                                 hide.run();
-                            }).size(40f).get().resizeImage(Cicon.small.size);
+                            }).size(40f);
 
                             if(++c % 6 == 0) i.row();
                         }
@@ -753,13 +1027,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicUnits;
+        public LInstruction build(LAssembler builder){
+            return new UnitBindI(builder.var(type));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new UnitBindI(builder.var(type));
+        public LCategory category(){
+            return LCategory.unit;
         }
     }
 
@@ -783,7 +1057,11 @@ public class LStatements{
             table.button(b -> {
                 b.label(() -> type.name());
                 b.clicked(() -> showSelect(b, LUnitControl.all, type, t -> {
-                    type = t;
+                    if(t == LUnitControl.build && !Vars.state.rules.logicUnitBuild){
+                        Vars.ui.showInfo("@logic.nounitbuild");
+                    }else{
+                        type = t;
+                    }
                     rebuild(table);
                 }, 2, cell -> cell.size(120, 50)));
             }, Styles.logict, () -> {}).size(120, 40).color(table.color).left().padLeft(2);
@@ -806,19 +1084,23 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicUnits;
+        public LInstruction build(LAssembler builder){
+            return new UnitControlI(type, builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4), builder.var(p5));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new UnitControlI(type, builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4), builder.var(p5));
+        public LCategory category(){
+            return LCategory.unit;
         }
     }
 
     @RegisterStatement("uradar")
     public static class UnitRadarStatement extends RadarStatement{
 
+        public UnitRadarStatement(){
+            radar = "0";
+        }
+
         @Override
         public boolean buildFrom(){
             //do not build the "from" section
@@ -826,13 +1108,13 @@ public class LStatements{
         }
 
         @Override
-        public Color color(){
-            return Pal.logicUnits;
+        public LInstruction build(LAssembler builder){
+            return new RadarI(target1, target2, target3, sort, builder.var("@unit"), builder.var(sortOrder), builder.var(output));
         }
 
         @Override
-        public LInstruction build(LAssembler builder){
-            return new RadarI(target1, target2, target3, sort, LExecutor.varUnit, builder.var(sortOrder), builder.var(output));
+        public LCategory category(){
+            return LCategory.unit;
         }
     }
 
@@ -851,7 +1133,7 @@ public class LStatements{
         void rebuild(Table table){
             table.clearChildren();
 
-            table.add(" find ").left();
+            table.add(" find ").left().self(this::param);
 
             table.button(b -> {
                 b.label(() -> locate.name());
@@ -864,14 +1146,14 @@ public class LStatements{
             switch(locate){
                 case building -> {
                     row(table);
-                    table.add(" type ").left();
+                    table.add(" group ").left().self(this::param);
                     table.button(b -> {
                         b.label(() -> flag.name());
-                        b.clicked(() -> showSelect(b, BlockFlag.all, flag, t -> flag = t, 2, cell -> cell.size(110, 50)));
+                        b.clicked(() -> showSelect(b, BlockFlag.allLogic, flag, t -> flag = t, 2, cell -> cell.size(110, 50)));
                     }, Styles.logict, () -> {}).size(110, 40).color(table.color).left().padLeft(2);
                     row(table);
 
-                    table.add(" enemy ").left();
+                    table.add(" enemy ").left().self(this::param);
 
                     fields(table, enemy, str -> enemy = str);
 
@@ -879,7 +1161,7 @@ public class LStatements{
                 }
 
                 case ore -> {
-                    table.add(" ore ").left();
+                    table.add(" ore ").left().self(this::param);
                     table.table(ts -> {
                         ts.color.set(table.color);
 
@@ -894,11 +1176,11 @@ public class LStatements{
                                     int c = 0;
                                     for(Item item : Vars.content.items()){
                                         if(!item.unlockedNow()) continue;
-                                        i.button(new TextureRegionDrawable(item.icon(Cicon.small)), Styles.cleari, () -> {
+                                        i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
                                             ore = "@" + item.name;
                                             rebuild(table);
                                             hide.run();
-                                        }).size(40f).get().resizeImage(Cicon.small.size);
+                                        }).size(40f);
 
                                         if(++c % 6 == 0) i.row();
                                     }
@@ -916,32 +1198,1214 @@ public class LStatements{
                 }
             }
 
-            table.add(" outX ").left();
+            table.add(" outX ").left().self(this::param);
             fields(table, outX, str -> outX = str);
 
-            table.add(" outY ").left();
+            table.add(" outY ").left().self(this::param);
             fields(table, outY, str -> outY = str);
 
             row(table);
 
-            table.add(" found ").left();
+            table.add(" found ").left().self(this::param);
             fields(table, outFound, str -> outFound = str);
 
             if(locate != LLocate.ore){
-                table.add(" building ").left();
+                table.add(" building ").left().self(this::param);
                 fields(table, outBuild, str -> outBuild = str);
             }
 
         }
 
         @Override
-        public Color color(){
-            return Pal.logicUnits;
+        public LInstruction build(LAssembler builder){
+            return new UnitLocateI(locate, flag, builder.var(enemy), builder.var(ore), builder.var(outX), builder.var(outY), builder.var(outFound), builder.var(outBuild));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.unit;
+        }
+    }
+
+    @RegisterStatement("getblock")
+    public static class GetBlockStatement extends LStatement{
+        public TileLayer layer = TileLayer.block;
+        public String result = "result", x = "0", y = "0";
+
+        @Override
+        public void build(Table table){
+            fields(table, result, str -> result = str);
+
+            table.add(" = get ");
+
+            row(table);
+
+            table.button(b -> {
+                b.label(() -> layer.name());
+                b.clicked(() -> showSelect(b, TileLayer.all, layer, o -> layer = o));
+            }, Styles.logict, () -> {}).size(64f, 40f).pad(4f).color(table.color);
+
+            table.add(" at ");
+
+            fields(table, x, str -> x = str);
+            table.add(", ");
+            fields(table, y, str -> y = str);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
         }
 
         @Override
         public LInstruction build(LAssembler builder){
-            return new UnitLocateI(locate, flag, builder.var(enemy), builder.var(ore), builder.var(outX), builder.var(outY), builder.var(outFound), builder.var(outBuild));
+            return new GetBlockI(builder.var(x), builder.var(y), builder.var(result), layer);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("setblock")
+    public static class SetBlockStatement extends LStatement{
+        public TileLayer layer = TileLayer.block;
+        public String block = "@air", x = "0", y = "0", team = "@derelict", rotation = "0";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+            table.add("set");
+
+            table.button(b -> {
+                b.label(() -> layer.name());
+                b.clicked(() -> showSelect(b, TileLayer.settable, layer, o -> {
+                    layer = o;
+                    rebuild(table);
+                }));
+            }, Styles.logict, () -> {}).size(64f, 40f).pad(4f).color(table.color);
+
+            row(table);
+
+            table.add(" at ");
+
+            fields(table, x, str -> x = str);
+            table.add(", ");
+            fields(table, y, str -> y = str);
+
+            row(table);
+
+            table.add(" to ");
+
+            fields(table, block, str -> block = str);
+
+            if(layer == TileLayer.block){
+                row(table);
+
+                table.add("team ");
+                fields(table, team, str -> team = str);
+
+                table.add(" rotation ");
+                fields(table, rotation, str -> rotation = str);
+            }
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetBlockI(builder.var(x), builder.var(y), builder.var(block), builder.var(team), builder.var(rotation), layer);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("spawn")
+    public static class SpawnUnitStatement extends LStatement{
+        public String type = "@dagger", x = "10", y = "10", rotation = "90", team = "@sharded", result = "result";
+
+        @Override
+        public void build(Table table){
+            fields(table, result, str -> result = str);
+
+            table.add(" = spawn ");
+            field(table, type, str -> type = str).colspan(!LCanvas.useRows() ? 1 : 2);
+
+            row(table);
+
+            table.add(" at ");
+            fields(table, x, str -> x = str);
+
+            table.add(", ");
+            fields(table, y, str -> y = str);
+
+            table.row();
+
+            if(!LCanvas.useRows()){
+                table.add();
+            }
+
+            table.add("team ");
+            field(table, team, str -> team = str);
+
+            table.add(" rot ");
+            fields(table, rotation, str -> rotation = str).left();
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SpawnUnitI(builder.var(type), builder.var(x), builder.var(y), builder.var(rotation), builder.var(team), builder.var(result));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("status")
+    public static class ApplyStatusStatement extends LStatement{
+        public boolean clear;
+        public String effect = "wet", unit = "unit", duration = "10";
+
+        private static @Nullable String[] statusNames;
+
+        @Override
+        public void build(Table table){
+            table.clearChildren();
+
+            table.button(clear ? "clear" : "apply", Styles.logict, () -> {
+                clear = !clear;
+                build(table);
+            }).size(80f, 40f).pad(4f).color(table.color);
+
+            if(statusNames == null){
+                statusNames = content.statusEffects().select(s -> !s.isHidden()).map(s -> s.name).toArray(String.class);
+            }
+
+            table.button(b -> {
+                b.label(() -> effect).grow().wrap().labelAlign(Align.center).center();
+                b.clicked(() -> showSelect(b, statusNames, effect, o -> {
+                    effect = o;
+                    build(table);
+                }, 2, c -> c.size(120f, 38f)));
+            }, Styles.logict, () -> {}).size(120f, 40f).pad(4f).color(table.color);
+
+            table.add(clear ? " from " : " to ");
+
+            row(table);
+
+            fields(table, unit, str -> unit = str);
+
+            if(!clear && !(content.statusEffect(effect) != null && content.statusEffect(effect).permanent)){
+
+                table.add(" for ");
+
+                fields(table, duration, str -> duration = str);
+
+                table.add(" sec");
+            }
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new ApplyEffectI(clear, effect, builder.var(unit), builder.var(duration));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("weathersense")
+    public static class WeatherSenseStatement extends LStatement{
+        public String to = "result";
+        public String weather = "@rain";
+
+        private transient TextField tfield;
+
+        @Override
+        public void build(Table table){
+            field(table, to, str -> to = str);
+
+            table.add(" = weather ");
+
+            row(table);
+
+            tfield = field(table, weather, str -> weather = str).padRight(0f).get();
+
+            table.button(b -> {
+                b.image(Icon.pencilSmall);
+
+                b.clicked(() -> showSelectTable(b, (t, hide) -> {
+                    t.row();
+                    t.table(i -> {
+                        i.left();
+                        int c = 0;
+                        for(Weather w : Vars.content.weathers()){
+                            i.button(w.name, Styles.flatt, () -> {
+                                weather = "@" + w.name;
+                                tfield.setText(weather);
+                                hide.run();
+                            }).height(40f).uniformX().wrapLabel(false).growX();
+
+                            if(++c % 2 == 0) i.row();
+                        }
+                    }).left();
+                }));
+            }, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SenseWeatherI(builder.var(weather), builder.var(to));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("weatherset")
+    public static class WeatherSetStatement extends LStatement{
+        public String weather = "@rain", state = "true";
+
+        private transient TextField tfield;
+
+        @Override
+        public void build(Table table){
+            table.add(" set weather ");
+
+            tfield = field(table, weather, str -> weather = str).padRight(0f).get();
+
+            table.button(b -> {
+                b.image(Icon.pencilSmall);
+
+                b.clicked(() -> showSelectTable(b, (t, hide) -> {
+                    t.row();
+                    t.table(i -> {
+                        i.left();
+                        int c = 0;
+                        for(Weather w : Vars.content.weathers()){
+                            i.button(w.name, Styles.flatt, () -> {
+                                weather = "@" + w.name;
+                                tfield.setText(weather);
+                                hide.run();
+                            }).height(40f).uniformX().wrapLabel(false).growX();
+
+                            if(++c % 2 == 0) i.row();
+                        }
+                    }).left();
+                }));
+            }, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
+
+            table.add(" state ");
+
+            fields(table, state, str -> state = str);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetWeatherI(builder.var(weather), builder.var(state));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("spawnwave")
+    public static class SpawnWaveStatement extends LStatement{
+        public String x = "10", y = "10", natural = "false";
+
+        @Override
+        public void build(Table table){
+            table.add("natural ");
+            fields(table, natural, str -> natural = str);
+
+            table.add("x ").visible(() -> !natural.equals("true"));
+            fields(table, x, str -> x = str).visible(() -> !natural.equals("true"));
+
+            table.add(" y ").visible(() -> !natural.equals("true"));
+            fields(table, y, str -> y = str).visible(() -> !natural.equals("true"));
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SpawnWaveI(builder.var(natural), builder.var(x), builder.var(y));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("setrule")
+    public static class SetRuleStatement extends LStatement{
+        public LogicRule rule = LogicRule.waveSpacing;
+        public String value = "10", p1 = "0", p2 = "0", p3 = "100", p4 = "100";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            table.button(b -> {
+                b.label(() -> rule.name()).growX().wrap().labelAlign(Align.center);
+                b.clicked(() -> showSelect(b, LogicRule.all, rule, o -> {
+                    rule = o;
+                    rebuild(table);
+                }, 2, c -> c.width(150f)));
+            }, Styles.logict, () -> {}).size(160f, 40f).margin(5f).pad(4f).color(table.color);
+
+            switch(rule){
+                case mapArea -> {
+                    table.add(" = ");
+
+                    fields(table, "x", p1, s -> p1 = s);
+                    fields(table, "y", p2, s -> p2 = s);
+                    row(table);
+                    fields(table, "w", p3, s -> p3 = s);
+                    fields(table, "h", p4, s -> p4 = s);
+                }
+                case buildSpeed, unitHealth, unitBuildSpeed, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, rtsMinSquad, rtsMinWeight -> {
+                    if(p1.equals("0")){
+                        p1 = "@sharded";
+                    }
+
+                    fields(table, "of", p1, s -> p1 = s);
+                    table.add(" = ");
+                    row(table);
+                    field(table, value, s -> value = s);
+                }
+                case ban, unban -> {
+                    table.add(" block/unit ");
+
+                    field(table, value, s -> value = s);
+                }
+                default -> {
+                    table.add(" = ");
+
+                    field(table, value, s -> value = s);
+                }
+            }
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetRuleI(rule, builder.var(value), builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("message")
+    public static class FlushMessageStatement extends LStatement{
+        public MessageType type = MessageType.announce;
+        public String duration = "3", outSuccess = "@wait";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            table.button(b -> {
+                b.label(() -> type.name()).growX().wrap().labelAlign(Align.center);
+                b.clicked(() -> showSelect(b, MessageType.all, type, o -> {
+                    type = o;
+                    rebuild(table);
+                }, 2, c -> c.width(150f)));
+            }, Styles.logict, () -> {}).size(160f, 40f).padLeft(2).color(table.color);
+
+            switch(type){
+                case announce, toast  -> {
+                    table.add(" for ");
+                    fields(table, duration, str -> duration = str);
+                    table.add(" sec ");
+                }
+            }
+            row(table);
+
+            table.add(" success ");
+            fields(table, outSuccess, str -> outSuccess = str);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new FlushMessageI(type, builder.var(duration), builder.var(outSuccess));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("cutscene")
+    public static class CutsceneStatement extends LStatement{
+        public CutsceneAction action = CutsceneAction.pan;
+        public String p1 = "100", p2 = "100", p3 = "0.06", p4 = "0";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            table.button(b -> {
+                b.label(() -> action.name()).growX().wrap().labelAlign(Align.center);
+                b.clicked(() -> showSelect(b, CutsceneAction.all, action, o -> {
+                    action = o;
+                    rebuild(table);
+                }));
+            }, Styles.logict, () -> {}).size(90f, 40f).padLeft(2).color(table.color);
+
+            switch(action){
+                case pan -> {
+                    table.add(" x ");
+                    fields(table, p1, str -> p1 = str);
+                    table.add(" y ");
+                    fields(table, p2, str -> p2 = str);
+
+                    row(table);
+
+                    table.add(" speed ");
+                    fields(table, p3, str -> p3 = str);
+                }
+                case zoom -> {
+                    table.add(" level ");
+                    fields(table, p1, str -> p1 = str);
+                }
+            }
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new CutsceneI(action, builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("effect")
+    public static class EffectStatement extends LStatement{
+        public String type = "warn", x = "0", y = "0", sizerot = "2", color = "%ffaaff", data = "";
+
+        @Override
+        public void build(Table table){
+            table.clearChildren();
+
+            table.button(b -> {
+                b.label(() -> type).growX().wrap().labelAlign(Align.center);
+                b.clicked(() -> ui.effects.show(entry -> {
+                    type = entry.name;
+                    build(table);
+                }));
+            }, Styles.logict, () -> {}).size(150f, 40f).margin(5f).pad(4f).color(table.color).colspan(2);
+
+            EffectEntry entry = LogicFx.get(type);
+
+            row(table);
+
+            fields(table, "x", x, str -> x = str);
+            fields(table, "y", y, str -> y = str);
+            row(table);
+
+            if(entry != null){
+                if(entry.color){
+                    fields(table, "color", color, str -> color = str).width(120f);
+
+                    col(table, color, res -> {
+                        color = "%" + res.toString().substring(0, res.a >= 1f ? 6 : 8);
+                        build(table);
+                    });
+                }
+
+                row(table);
+
+                if(entry.size || entry.rotate){
+                    fields(table, entry.size ? "size" : "rotation", sizerot, str -> sizerot = str);
+                }
+
+                if(entry.data != null){
+                    fields(table, "data", data, str -> data = str);
+                }
+            }
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler b){
+            return new EffectI(LogicFx.get(type), b.var(x), b.var(y), b.var(sizerot), b.var(color), b.var(data));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("explosion")
+    public static class ExplosionStatement extends LStatement{
+        public String team = "@crux", x = "0", y = "0", radius = "5", damage = "50", air = "true", ground = "true", pierce = "false", effect = "true";
+
+        @Override
+        public void build(Table table){
+            fields(table, "team", team, str -> team = str);
+            fields(table, "x", x, str -> x = str);
+            row(table);
+            fields(table, "y", y, str -> y = str);
+            fields(table, "radius", radius, str -> radius = str);
+            table.row();
+            fields(table, "damage", damage, str -> damage = str);
+            fields(table, "air", air, str -> air = str);
+            row(table);
+            fields(table, "ground", ground, str -> ground = str);
+            fields(table, "pierce", pierce, str -> pierce = str);
+            table.row();
+            fields(table, "effect", effect, str -> effect = str);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler b){
+            return new ExplosionI(b.var(team), b.var(x), b.var(y), b.var(radius), b.var(damage), b.var(air), b.var(ground), b.var(pierce), b.var(effect));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("setrate")
+    public static class SetRateStatement extends LStatement{
+        public String amount = "10";
+
+        @Override
+        public void build(Table table){
+            fields(table, "ipt = ", amount, str -> amount = str);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetRateI(builder.var(amount));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("fetch")
+    public static class FetchStatement extends LStatement{
+        public FetchType type = FetchType.unit;
+        public String result = "result", team = "@sharded", index = "0", extra = "@conveyor";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            fields(table, result, r -> result = r);
+
+            table.add(" = ");
+
+            table.button(b -> {
+                b.label(() -> type.name()).growX().wrap().labelAlign(Align.center);
+                b.clicked(() -> showSelect(b, FetchType.all, type, o -> {
+                    type = o;
+                    rebuild(table);
+                }, 2, c -> c.width(150f)));
+            }, Styles.logict, () -> {}).size(160f, 40f).margin(5f).pad(4f).color(table.color);
+
+            row(table);
+
+            fields(table, "team", team, s -> team = s);
+
+            if(type != FetchType.coreCount && type != FetchType.playerCount && type != FetchType.unitCount && type != FetchType.buildCount){
+                table.add(" # ");
+
+                row(table);
+
+                fields(table, index, i -> index = i);
+            }
+
+            if(type == FetchType.buildCount || type == FetchType.build){
+                row(table);
+
+                fields(table, "block", extra, i -> extra = i);
+            }
+
+            if(type == FetchType.unitCount || type == FetchType.unit){
+                row(table);
+
+                fields(table, "unit", extra, i -> extra = i);
+            }
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new FetchI(type, builder.var(result), builder.var(team), builder.var(extra), builder.var(index));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    //TODO: test this first
+    @RegisterStatement("sync")
+    public static class SyncStatement extends LStatement{
+        public String variable = "var";
+
+        @Override
+        public void build(Table table){
+            fields(table, variable, str -> variable = str).width(190f);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SyncI(builder.var(variable));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("clientdata")
+    public static class ClientDataStatement extends LStatement{
+        public String channel = "\"frog\"", value = "\"bar\"", reliable = "0";
+
+        @Override
+        public void build(Table table){
+            table.add("send ");
+            fields(table, value, str -> value = str);
+            table.add(" on ");
+            fields(table, channel, str -> channel = str);
+            table.add(", reliable ");
+            fields(table, reliable, str -> reliable = str);
+        }
+
+        @Override
+        public boolean hidden(){
+            return true;
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            if(!state.rules.allowLogicData) return null;
+            return new ClientDataI(builder.var(channel), builder.var(value), builder.var(reliable));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("getflag")
+    public static class GetFlagStatement extends LStatement{
+        public String result = "result", flag = "\"flag\"";
+
+        @Override
+        public void build(Table table){
+            float width = LCanvas.useRows() ? 100f : 190f;
+
+            fields(table, result, str -> result = str).width(width);
+
+            table.add(" = flag ");
+
+            fields(table, flag, str -> flag = str).width(width);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new GetFlagI(builder.var(result), builder.var(flag));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("setflag")
+    public static class SetFlagStatement extends LStatement{
+        public String flag = "\"flag\"", value = "true";
+
+        @Override
+        public void build(Table table){
+            float width = LCanvas.useRows() ? 100f : 190f;
+
+            fields(table, flag, str -> flag = str).width(width);
+
+            table.add(" = ");
+
+            fields(table, value, str -> value = str).width(width);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetFlagI(builder.var(flag), builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("setprop")
+    public static class SetPropStatement extends LStatement{
+        public String type = "@copper", of = "block1", value = "0";
+
+        private transient int selected = 0;
+        private transient TextField tfield;
+
+        @Override
+        public void build(Table table){
+            table.add(" set ");
+
+            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.hidden) continue;
+                            i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
+                                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() || item.hidden) continue;
+                            i.button(new TextureRegionDrawable(item.uiIcon), Styles.flati, iconSmall, () -> {
+                                stype("@" + item.name);
+                                hide.run();
+                            }).size(40f);
+
+                            if(++c % 6 == 0) i.row();
+                        }
+                    }),
+                    //sensors
+                    new Table(i -> {
+                        for(LAccess property : LAccess.settable){
+                            i.button(property.name(), Styles.flatt, () -> {
+                                stype("@" + property.name());
+                                hide.run();
+                            }).size(240f, 40f).self(c -> tooltip(c, property)).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.squareTogglei, () -> {
+                            selected = fi;
+
+                            stack.clearChildren();
+                            stack.addChild(tables[selected]);
+
+                            t.parent.parent.pack();
+                            t.parent.parent.invalidateHierarchy();
+                        }).height(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);
+
+            row(table);
+
+            table.add(" of ").self(this::param);
+
+            field(table, of, str -> of = str).colspan(2);
+
+            row(table);
+
+            table.add(" to ");
+
+            field(table, value, str -> value = str).colspan(2);
+        }
+
+        private void stype(String text){
+            tfield.setText(text);
+            this.type = text;
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetPropI(builder.var(type), builder.var(of), builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("playsound")
+    public static class PlaySoundStatement extends LStatement{
+        public boolean positional;
+        public String id = "@sfx-pew", volume = "1", pitch = "1", pan = "0", x = "@thisx", y = "@thisy", limit = "true";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            table.button(positional ? "positional" : "global", Styles.logict, () -> {
+                positional = !positional;
+                rebuild(table);
+            }).size(160f, 40f).pad(4f).color(table.color);
+
+            row(table);
+
+            field(table, id, str -> id = str).padRight(0f).get();
+
+            table.button(b -> {
+                b.image(Icon.pencilSmall);
+
+                String soundName = id.startsWith("@sfx-") ? id.substring(5) : id;
+                b.clicked(() -> showSelect(b, GlobalVars.soundNames.toArray(String.class), soundName, t -> {
+                    id = "@sfx-" + t;
+                    rebuild(table);
+                }, 2, cell -> cell.size(160, 50)));
+            }, Styles.logict, () -> {}).size(40).color(table.color).left().padLeft(-1);
+
+            row(table);
+
+            fieldst(table, "volume", volume, str -> volume = str);
+            fieldst(table, "pitch", pitch, str -> pitch = str);
+
+            table.row();
+
+            if(positional){
+                fieldst(table, "x", x, str -> x = str);
+
+                fieldst(table, "y", y, str -> y = str);
+            }else{
+                fieldst(table, "pan", pan, str -> pan = str);
+            }
+
+            table.row();
+
+            fieldst(table, "limit", limit, str -> limit = str);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new PlaySoundI(positional, builder.var(id), builder.var(volume), builder.var(pitch), builder.var(pan), builder.var(x), builder.var(y), builder.var(limit));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("setmarker")
+    public static class SetMarkerStatement extends LStatement{
+        public LMarkerControl type = LMarkerControl.pos;
+        public String id = "0", p1 = "0", p2 = "0", p3 = "0";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            table.add("set");
+
+            table.button(b -> {
+                b.label(() -> type.name());
+                b.clicked(() -> showSelect(b, LMarkerControl.all, type, t -> {
+                    type = t;
+                    rebuild(table);
+                }, 3, cell -> cell.size(140, 50)));
+            }, Styles.logict, () -> {}).size(190, 40).color(table.color).left().padLeft(2);
+
+            row(table);
+
+            fieldst(table, "of id#", id, str -> id = str);
+
+            //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
+            for(int f = 0; f < type.params.length; f++){
+                int i = f;
+
+                table.table(t -> {
+                    t.setColor(table.color);
+
+                    String value = i == 0 ? p1 : i == 1 ? p2 : p3;
+                    Cons<String> setter = i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : v -> p3 = v;
+
+                    fields(t, type.params[i], value, setter).width(100f);
+
+                    if(type == LMarkerControl.color || (type == LMarkerControl.colori && i == 1)){
+                        col(t, value, res -> {
+                            setter.get("%" + res.toString().substring(0, res.a >= 1f ? 6 : 8));
+                            build(table);
+                        });
+                    }else if(type == LMarkerControl.drawLayer){
+                        t.button(b -> {
+                            b.image(Icon.pencilSmall);
+                            b.clicked(() -> showSelectTable(b, (o, hide) -> {
+                                o.row();
+                                o.table(s -> {
+                                    s.left();
+                                    for(var field : Layer.class.getFields()){
+                                        float layer = Reflect.get(field);
+                                        s.button(field.getName() + " = " + layer, Styles.logicTogglet, () -> {
+                                            p1 = Float.toString(layer);
+                                            rebuild(table);
+                                            hide.run();
+                                        }).size(240f, 40f).row();
+                                    }
+                                }).width(240f).left();
+                            }));
+                        }, Styles.logict, () -> {}).size(40f).padLeft(-11).color(table.color);
+                    }
+                });
+
+                if(i == 0) row(table);
+                if(i == 2) table.row();
+            }
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetMarkerI(type, builder.var(id), builder.var(p1), builder.var(p2), builder.var(p3));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("makemarker")
+    public static class MakeMarkerStatement extends LStatement{
+        public String type = "shape", id = "0", x = "0", y = "0", replace = "true";
+
+        @Override
+        public void build(Table table){
+            table.clearChildren();
+
+            table.button(b -> {
+                b.label(() -> type);
+
+                b.clicked(() -> showSelect(b, MapObjectives.allMarkerTypeNames.toArray(String.class), type, t -> {
+                    type = t;
+                    build(table);
+                }, 2, cell -> cell.size(160, 50)));
+            }, Styles.logict, () -> {}).size(190, 40).color(table.color).left().padLeft(2);
+
+            fieldst(table, "id", id, str -> id = str);
+
+            row(table);
+
+            fieldst(table, "x", x, v -> x = v);
+
+            fieldst(table, "y", y, v -> y = v);
+
+            row(table);
+
+            fieldst(table, "replace", replace, v -> replace = v);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new MakeMarkerI(type, builder.var(id), builder.var(x), builder.var(y), builder.var(replace));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("localeprint")
+    public static class LocalePrintStatement extends LStatement{
+        public String value = "\"name\"";
+
+        @Override
+        public void build(Table table){
+            field(table, value, str -> value = str).width(0f).growX().padRight(3);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new LocalePrintI(builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
         }
     }
 }
diff --git a/core/src/mindustry/logic/LUnitControl.java b/core/src/mindustry/logic/LUnitControl.java
index 41f00da025..ccfe9b5d3f 100644
--- a/core/src/mindustry/logic/LUnitControl.java
+++ b/core/src/mindustry/logic/LUnitControl.java
@@ -1,22 +1,26 @@
 package mindustry.logic;
 
 public enum LUnitControl{
+    idle,
     stop,
     move("x", "y"),
     approach("x", "y", "radius"),
+    pathfind("x", "y"),
+    autoPathfind,
     boost("enable"),
-    pathfind(),
     target("x", "y", "shoot"),
     targetp("unit", "shoot"),
     itemDrop("to", "amount"),
     itemTake("from", "item", "amount"),
     payDrop,
     payTake("takeUnits"),
+    payEnter,
     mine("x", "y"),
     flag("value"),
     build("x", "y", "block", "rotation", "config"),
-    getBlock("x", "y", "type", "building"),
-    within("x", "y", "radius", "result");
+    getBlock("x", "y", "type", "building", "floor"),
+    within("x", "y", "radius", "result"),
+    unbind;
 
     public final String[] params;
     public static final LUnitControl[] all = values();
diff --git a/core/src/mindustry/logic/LVar.java b/core/src/mindustry/logic/LVar.java
new file mode 100644
index 0000000000..05899a03e4
--- /dev/null
+++ b/core/src/mindustry/logic/LVar.java
@@ -0,0 +1,108 @@
+package mindustry.logic;
+
+import arc.util.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+
+public class LVar{
+    public final String name;
+    public int id;
+
+    public boolean isobj, constant;
+
+    public Object objval;
+    public double numval;
+
+    //ms timestamp for when this was last synced; used in the sync instruction
+    public long syncTime;
+
+    public LVar(String name){
+        this(name, -1);
+    }
+
+    public LVar(String name, int id){
+        this(name, id, false);
+    }
+
+    public LVar(String name, int id, boolean constant){
+        this.name = name;
+        this.id = id;
+        this.constant = constant;
+    }
+
+    public @Nullable Building building(){
+        return isobj && objval instanceof Building building ? building : null;
+    }
+
+    public @Nullable Object obj(){
+        return isobj ? objval : null;
+    }
+
+    public @Nullable Team team(){
+        if(isobj){
+            return objval instanceof Team t ? t : null;
+        }else{
+            int t = (int)numval;
+            if(t < 0 || t >= Team.all.length) return null;
+            return Team.all[t];
+        }
+    }
+
+    public boolean bool(){
+        return isobj ? objval != null : Math.abs(numval) >= 0.00001;
+    }
+
+    public double num(){
+        return isobj ? objval != null ? 1 : 0 : invalid(numval) ? 0 : numval;
+    }
+
+    /** Get num value from variable, convert null to NaN to handle it differently in some instructions */
+    public double numOrNan(){
+        return isobj ? objval != null ? 1 : Double.NaN : invalid(numval) ? 0 : numval;
+    }
+
+    public float numf(){
+        return isobj ? objval != null ? 1 : 0 : invalid(numval) ? 0 : (float)numval;
+    }
+
+    /** Get float value from variable, convert null to NaN to handle it differently in some instructions */
+    public float numfOrNan(){
+        return isobj ? objval != null ? 1 : Float.NaN : invalid(numval) ? 0 : (float)numval;
+    }
+
+    public int numi(){
+        return (int)num();
+    }
+
+    public void setbool(boolean value){
+        setnum(value ? 1 : 0);
+    }
+
+    public void setnum(double value){
+        if(constant) return;
+        if(invalid(value)){
+            objval = null;
+            isobj = true;
+        }else{
+            numval = value;
+            objval = null;
+            isobj = false;
+        }
+    }
+
+    public void setobj(Object value){
+        if(constant) return;
+        objval = value;
+        isobj = true;
+    }
+
+    public void setconst(Object value){
+        objval = value;
+        isobj = true;
+    }
+
+    public static boolean invalid(double d){
+        return Double.isNaN(d) || Double.isInfinite(d);
+    }
+
+}
diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java
index dd12b9cca3..ef3dfb4a53 100644
--- a/core/src/mindustry/logic/LogicDialog.java
+++ b/core/src/mindustry/logic/LogicDialog.java
@@ -2,18 +2,36 @@ package mindustry.logic;
 
 import arc.*;
 import arc.func.*;
+import arc.graphics.*;
+import arc.input.*;
+import arc.scene.actions.*;
+import arc.scene.ui.*;
 import arc.scene.ui.TextButton.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
+import mindustry.core.GameState.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.LExecutor.*;
 import mindustry.logic.LStatements.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
+import mindustry.world.blocks.logic.*;
+
+import java.util.*;
 
 import static mindustry.Vars.*;
+import static mindustry.logic.LCanvas.*;
 
 public class LogicDialog extends BaseDialog{
     public LCanvas canvas;
     Cons<String> consumer = s -> {};
+    boolean privileged;
+    @Nullable LExecutor executor;
+    GlobalVarsDialog globalsDialog = new GlobalVarsDialog();
+    boolean wasRows, wasPortrait;
 
     public LogicDialog(){
         super("logic");
@@ -25,6 +43,64 @@ public class LogicDialog extends BaseDialog{
 
         addCloseListener();
 
+        shown(this::setup);
+        shown(() -> {
+            wasRows = LCanvas.useRows();
+            wasPortrait = Core.graphics.isPortrait();
+        });
+        hidden(() -> consumer.get(canvas.save()));
+        onResize(() -> {
+            if(wasRows != LCanvas.useRows() || wasPortrait != Core.graphics.isPortrait()){
+                setup();
+                canvas.rebuild();
+                wasPortrait = Core.graphics.isPortrait();
+                wasRows = LCanvas.useRows();
+            }
+        });
+
+        //show add instruction on shift+enter
+        keyDown(KeyCode.enter, () -> {
+            if(Core.input.shift()){
+                showAddDialog();
+            }
+        });
+
+        add(canvas).grow().name("canvas");
+
+        row();
+
+        add(buttons).growX().name("canvas");
+    }
+
+    public static Color typeColor(LVar s, Color color){
+        return color.set(
+            !s.isobj ? Pal.place :
+            s.objval == null ? Color.darkGray :
+            s.objval instanceof String ? Pal.ammo :
+            s.objval instanceof Content ? Pal.logicOperations :
+            s.objval instanceof Building ? Pal.logicBlocks :
+            s.objval instanceof Unit ? Pal.logicUnits :
+            s.objval instanceof Team ? Pal.logicUnits :
+            s.objval instanceof Enum<?> ? Pal.logicIo :
+            Color.white
+        );
+    }
+
+    public static String typeName(LVar s){
+        return
+            !s.isobj ? "number" :
+            s.objval == null ? "null" :
+            s.objval instanceof String ? "string" :
+            s.objval instanceof Content ? "content" :
+            s.objval instanceof Building ? "building" :
+            s.objval instanceof Team ? "team" :
+            s.objval instanceof Unit ? "unit" :
+            s.objval instanceof Enum<?> ? "enum" :
+            "unknown";
+    }
+
+    private void setup(){
+        buttons.clearChildren();
         buttons.defaults().size(160f, 64f);
         buttons.button("@back", Icon.left, this::hide).name("back");
 
@@ -33,9 +109,32 @@ public class LogicDialog extends BaseDialog{
             dialog.cont.pane(p -> {
                 p.margin(10f);
                 p.table(Tex.button, t -> {
-                    TextButtonStyle style = Styles.cleart;
+                    TextButtonStyle style = Styles.flatt;
                     t.defaults().size(280f, 60f).left();
-                    t.row();
+
+                    if(privileged && executor != null && executor.build != null && !ui.editor.isShown()){
+                        t.button("@editor.worldprocessors.editname", Icon.edit, style, () -> {
+                            ui.showTextInput("", "@editor.name", LogicBlock.maxNameLength, executor.build.tag == null ? "" : executor.build.tag, tag -> {
+                                if(privileged && executor != null && executor.build != null){
+                                    executor.build.configure(tag);
+                                    //just in case of privilege shenanigans...
+                                    executor.build.tag = tag;
+                                }
+                            });
+                            dialog.hide();
+                        }).marginLeft(12f).row();
+                    }
+
+                    t.button("@clear", Icon.cancel, style, () -> {
+                        ui.showConfirm("@logic.clear.confirm", () -> canvas.clearStatements());
+                        dialog.hide();
+                    }).marginLeft(12f).row();
+
+                    t.button("@schematic.copy", Icon.copy, style, () -> {
+                        dialog.hide();
+                        Core.app.setClipboardText(canvas.save());
+                    }).marginLeft(12f).row();
+
                     t.button("@schematic.copy.import", Icon.download, style, () -> {
                         dialog.hide();
                         try{
@@ -44,11 +143,6 @@ public class LogicDialog extends BaseDialog{
                             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);
                 });
             });
 
@@ -56,44 +150,176 @@ public class LogicDialog extends BaseDialog{
             dialog.show();
         }).name("edit");
 
-        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 || example.hidden()) continue;
+        if(Core.graphics.isPortrait()) buttons.row();
 
-                    TextButtonStyle style = new TextButtonStyle(Styles.cleart);
-                    style.fontColor = example.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();
+        buttons.button("@variables", Icon.menu, () -> {
+            BaseDialog dialog = new BaseDialog("@variables");
+            dialog.hidden(() -> {
+                if(!wasPaused && !net.active() && !state.isMenu()){
+                    state.set(State.paused);
                 }
             });
+
+            dialog.shown(() -> {
+                if(!wasPaused && !net.active() && !state.isMenu()){
+                    state.set(State.playing);
+                }
+            });
+
+            dialog.cont.pane(p -> {
+                p.margin(10f).marginRight(16f);
+                p.table(Tex.button, t -> {
+                    t.defaults().fillX().height(45f);
+                    for(var s : executor.vars){
+                        if(s.constant) continue;
+
+                        Color varColor = Pal.gray;
+                        float stub = 8f, mul = 0.5f, pad = 4;
+
+                        t.add(new Image(Tex.whiteui, varColor.cpy().mul(mul))).width(stub);
+                        t.stack(new Image(Tex.whiteui, varColor), new Label(" " + s.name + " ", Styles.outlineLabel){{
+                            setColor(Pal.accent);
+                        }}).padRight(pad);
+
+                        t.add(new Image(Tex.whiteui, Pal.gray.cpy().mul(mul))).width(stub);
+                        t.table(Tex.pane, out -> {
+                            float period = 15f;
+                            float[] counter = {-1f};
+                            Label label = out.add("").style(Styles.outlineLabel).padLeft(4).padRight(4).width(140f).wrap().get();
+                            label.update(() -> {
+                                if(counter[0] < 0 || (counter[0] += Time.delta) >= period){
+                                    String text = s.isobj ? PrintI.toString(s.objval) : Math.abs(s.numval - Math.round(s.numval)) < 0.00001 ? Math.round(s.numval) + "" : s.numval + "";
+                                    if(!label.textEquals(text)){
+                                        label.setText(text);
+                                        if(counter[0] >= 0f){
+                                            label.actions(Actions.color(Pal.accent), Actions.color(Color.white, 0.2f));
+                                        }
+                                    }
+                                    counter[0] = 0f;
+                                }
+                            });
+                            label.act(1f);
+                        }).padRight(pad);
+
+                        t.add(new Image(Tex.whiteui, typeColor(s, new Color()).mul(mul))).update(i -> i.setColor(typeColor(s, i.color).mul(mul))).width(stub);
+
+                        t.stack(new Image(Tex.whiteui, typeColor(s, new Color())){{
+                            update(() -> setColor(typeColor(s, color)));
+                        }}, new Label(() -> " " + typeName(s) + " "){{
+                            setStyle(Styles.outlineLabel);
+                        }});
+
+                        t.row();
+
+                        t.add().growX().colspan(6).height(4).row();
+                    }
+                });
+            });
+
             dialog.addCloseButton();
+            dialog.buttons.button("@logic.globals", Icon.list, () -> globalsDialog.show()).size(210f, 64f);
+
             dialog.show();
+        }).name("variables").disabled(b -> executor == null || executor.vars.length == 0 || state.isMenu());
+
+        buttons.button("@add", Icon.add, () -> {
+            showAddDialog();
         }).disabled(t -> canvas.statements.getChildren().size >= LExecutor.maxInstructions);
-
-        add(canvas).grow().name("canvas");
-
-        row();
-
-        add(buttons).growX().name("canvas");
-
-        hidden(() -> consumer.get(canvas.save()));
-
-        onResize(() -> canvas.rebuild());
     }
 
-    public void show(String code, Cons<String> modified){
+    public void showAddDialog(){
+        BaseDialog dialog = new BaseDialog("@add");
+        dialog.cont.table(table -> {
+            String[] searchText = {""};
+            Prov[] matched = {null};
+            Runnable[] rebuild = {() -> {}};
+
+            table.background(Tex.button);
+
+            table.table(s -> {
+                s.image(Icon.zoom).padRight(8);
+                var search = s.field(null, text -> {
+                    searchText[0] = text;
+                    rebuild[0].run();
+                }).growX().get();
+                search.setMessageText("@players.search");
+
+                //auto add first match on enter key
+                if(!mobile){
+
+                    //don't focus on mobile (it may cause issues with a popup keyboard)
+                    Core.app.post(search::requestKeyboard);
+
+                    search.keyDown(KeyCode.enter, () -> {
+                        if(!searchText[0].isEmpty() && matched[0] != null){
+                            canvas.add((LStatement)matched[0].get());
+                            dialog.hide();
+                        }
+                    });
+                }
+            }).growX().padBottom(4).row();
+
+            table.pane(t -> {
+                rebuild[0] = () -> {
+                    t.clear();
+
+                    var text = searchText[0].toLowerCase();
+
+                    matched[0] = null;
+
+                    for(Prov<LStatement> prov : LogicIO.allStatements){
+                        LStatement example = prov.get();
+                        if(example instanceof InvalidStatement || example.hidden() || (example.privileged() && !privileged) || (example.nonPrivileged() && privileged) || (!text.isEmpty() && !example.name().toLowerCase(Locale.ROOT).contains(text))) continue;
+
+                        if(matched[0] == null){
+                            matched[0] = prov;
+                        }
+
+                        LCategory category = example.category();
+                        Table cat = t.find(category.name);
+                        if(cat == null){
+                            t.table(s -> {
+                                if(category.icon != null){
+                                    s.image(category.icon, Pal.darkishGray).left().size(15f).padRight(10f);
+                                }
+                                s.add(category.localized()).color(Pal.darkishGray).left().tooltip(category.description());
+                                s.image(Tex.whiteui, Pal.darkishGray).left().height(5f).growX().padLeft(10f);
+                            }).growX().pad(5f).padTop(10f);
+
+                            t.row();
+
+                            cat = t.table(c -> {
+                                c.top().left();
+                            }).name(category.name).top().left().growX().fillY().get();
+                            t.row();
+                        }
+
+                        TextButtonStyle style = new TextButtonStyle(Styles.flatt);
+                        style.fontColor = category.color;
+                        style.font = Fonts.outline;
+
+                        cat.button(example.name(), style, () -> {
+                            canvas.add(prov.get());
+                            dialog.hide();
+                        }).size(130f, 50f).self(c -> tooltip(c, "lst." + example.name())).top().left();
+
+                        if(cat.getChildren().size % 3 == 0) cat.row();
+                    }
+                };
+
+                rebuild[0].run();
+            }).grow();
+        }).fill().maxHeight(Core.graphics.getHeight() * 0.8f);
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    public void show(String code, LExecutor executor, boolean privileged, Cons<String> modified){
+        this.executor = executor;
+        this.privileged = privileged;
         canvas.statements.clearChildren();
         canvas.rebuild();
+        canvas.privileged = privileged;
         try{
             canvas.load(code);
         }catch(Throwable t){
diff --git a/core/src/mindustry/logic/LogicFx.java b/core/src/mindustry/logic/LogicFx.java
new file mode 100644
index 0000000000..6080c7fd12
--- /dev/null
+++ b/core/src/mindustry/logic/LogicFx.java
@@ -0,0 +1,112 @@
+package mindustry.logic;
+
+import arc.struct.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.world.*;
+
+public class LogicFx{
+    private static OrderedMap<String, EffectEntry> map = new OrderedMap<>();
+
+    static{
+        map.putAll(
+        "warn", new EffectEntry(Fx.unitCapKill),
+        "cross", new EffectEntry(Fx.unitEnvKill),
+        "blockFall", new EffectEntry(Fx.blockCrash).data(Block.class).bounds(100f),
+        "placeBlock", new EffectEntry(Fx.placeBlock).size(),
+        "placeBlockSpark", new EffectEntry(Fx.coreLaunchConstruct).size(),
+        "breakBlock", new EffectEntry(Fx.breakBlock).size(),
+        "spawn", new EffectEntry(Fx.spawn),
+        "trail", new EffectEntry(Fx.colorTrail).size().color(),
+        "breakProp", new EffectEntry(Fx.breakProp).size().color(),
+        "smokeCloud", new EffectEntry(Fx.missileTrailSmoke).color(),
+        "vapor", new EffectEntry(Fx.vapor).color(),
+        "hit", new EffectEntry(Fx.hitBulletColor).color(),
+        "hitSquare", new EffectEntry(Fx.hitSquaresColor).color(),
+        "shootSmall", new EffectEntry(Fx.shootSmall).color().rotate(),
+        "shootBig", new EffectEntry(Fx.shootTitan).color().rotate(),
+        "smokeSmall", new EffectEntry(Fx.shootSmallSmoke).rotate(),
+        "smokeBig", new EffectEntry(Fx.shootBigSmoke).rotate(),
+        "smokeColor", new EffectEntry(Fx.shootSmokeTitan).rotate().color(),
+        "smokeSquare", new EffectEntry(Fx.shootSmokeSquare).rotate().color(),
+        "smokeSquareBig", new EffectEntry(Fx.shootSmokeSquareBig).rotate().color(),
+        "spark", new EffectEntry(Fx.hitLaserBlast).color(),
+        "sparkBig", new EffectEntry(Fx.circleColorSpark).color(),
+        "sparkShoot", new EffectEntry(Fx.colorSpark).rotate().color(),
+        "sparkShootBig", new EffectEntry(Fx.randLifeSpark).rotate().color(),
+        "drill", new EffectEntry(Fx.mine).color(),
+        "drillBig", new EffectEntry(Fx.mineHuge).color(),
+        "lightBlock", new EffectEntry(Fx.lightBlock).size().color(),
+        "explosion", new EffectEntry(Fx.dynamicExplosion).size(),
+        "smokePuff", new EffectEntry(Fx.smokePuff).color(),
+        "sparkExplosion", new EffectEntry(Fx.titanExplosion).color(),
+        "crossExplosion", new EffectEntry(Fx.dynamicSpikes).size().color(),
+        "wave", new EffectEntry(Fx.dynamicWave).size().color(),
+        "bubble", new EffectEntry(Fx.airBubble)
+        );
+
+        map.each((n, e) -> e.name = n);
+    }
+
+    public static Iterable<EffectEntry> entries(){
+        return map.orderedKeys().map(s -> map.get(s));
+    }
+
+    public static @Nullable EffectEntry get(String name){
+        return map.get(name);
+    }
+
+    /** Adds an effect entry to the map. */
+    public static void add(String name, EffectEntry entry){
+        entry.name = name;
+        map.put(name, entry);
+    }
+
+    public static String[] all(){
+        return map.orderedKeys().toArray(String.class);
+    }
+
+    public static class EffectEntry{
+        public String name = "";
+        public Effect effect;
+        public boolean size, rotate, color;
+        public @Nullable Class<?> data;
+        /** cached bounds for this effect, negative if unset */
+        public float bounds = -1f;
+
+        public EffectEntry(Effect effect){
+            this.effect = effect;
+        }
+
+        public EffectEntry bounds(float bounds){
+            this.bounds = bounds;
+            return this;
+        }
+
+        public EffectEntry name(String name){
+            this.name = name;
+            return this;
+        }
+
+        public EffectEntry size(){
+            size = true;
+            return this;
+        }
+
+        public EffectEntry rotate(){
+            rotate = true;
+            return this;
+        }
+
+        public EffectEntry color(){
+            color = true;
+            return this;
+        }
+
+        public EffectEntry data(Class<?> data){
+            this.data = data;
+            return this;
+        }
+    }
+}
diff --git a/core/src/mindustry/logic/LogicOp.java b/core/src/mindustry/logic/LogicOp.java
index 658a7cdeb8..994dfdc1a4 100644
--- a/core/src/mindustry/logic/LogicOp.java
+++ b/core/src/mindustry/logic/LogicOp.java
@@ -2,6 +2,7 @@ package mindustry.logic;
 
 import arc.math.*;
 import arc.util.*;
+import arc.util.noise.*;
 
 public enum LogicOp{
     add("+", (a, b) -> a + b),
@@ -19,6 +20,7 @@ public enum LogicOp{
     lessThanEq("<=", (a, b) -> a <= b ? 1 : 0),
     greaterThan(">", (a, b) -> a > b ? 1 : 0),
     greaterThanEq(">=", (a, b) -> a >= b ? 1 : 0),
+    strictEqual("===", (a, b) -> 0), //this lambda is not actually used
 
     shl("<<", (a, b) -> (long)a << (long)b),
     shr(">>", (a, b) -> (long)a >> (long)b),
@@ -27,40 +29,58 @@ public enum LogicOp{
     xor("xor", (a, b) -> (long)a ^ (long)b),
     not("flip", a -> ~(long)(a)),
 
-    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),
-    abs("abs", a -> Math.abs(a)),
+    max("max", true, Math::max),
+    min("min", true, Math::min),
+    angle("angle", true, (x, y) -> Angles.angle((float)x, (float)y)),
+    angleDiff("anglediff", true, (x, y) -> Angles.angleDist((float)x, (float)y)),
+    len("len", true, (x, y) -> Mathf.dst((float)x, (float)y)),
+    noise("noise", true, (x, y) -> Simplex.raw2d(0, x, y)),
+    abs("abs", a -> Math.abs(a)), //not a method reference because it fails to compile for some reason
     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);
+    rand("rand", d -> GlobalVars.rand.nextDouble() * d),
+
+    sin("sin", d -> Math.sin(d * Mathf.doubleDegRad)),
+    cos("cos", d -> Math.cos(d * Mathf.doubleDegRad)),
+    tan("tan", d -> Math.tan(d * Mathf.doubleDegRad)),
+
+    asin("asin", d -> Math.asin(d) * Mathf.doubleRadDeg),
+    acos("acos", d -> Math.acos(d) * Mathf.doubleRadDeg),
+    atan("atan", d -> Math.atan(d) * Mathf.doubleRadDeg),
+
+    ;
 
     public static final LogicOp[] all = values();
 
     public final OpObjLambda2 objFunction2;
     public final OpLambda2 function2;
     public final OpLambda1 function1;
-    public final boolean unary;
+    public final boolean unary, func;
     public final String symbol;
 
     LogicOp(String symbol, OpLambda2 function){
         this(symbol, function, null);
     }
 
+    LogicOp(String symbol, boolean func, OpLambda2 function){
+        this.symbol = symbol;
+        this.function2 = function;
+        this.function1 = null;
+        this.unary = false;
+        this.objFunction2 = null;
+        this.func = func;
+    }
+
     LogicOp(String symbol, OpLambda2 function, OpObjLambda2 objFunction){
         this.symbol = symbol;
         this.function2 = function;
         this.function1 = null;
         this.unary = false;
         this.objFunction2 = objFunction;
+        this.func = false;
     }
 
     LogicOp(String symbol, OpLambda1 function){
@@ -69,6 +89,7 @@ public enum LogicOp{
         this.function2 = null;
         this.unary = true;
         this.objFunction2 = null;
+        this.func = false;
     }
 
     @Override
diff --git a/core/src/mindustry/logic/LogicRule.java b/core/src/mindustry/logic/LogicRule.java
new file mode 100644
index 0000000000..b6ca757bb7
--- /dev/null
+++ b/core/src/mindustry/logic/LogicRule.java
@@ -0,0 +1,36 @@
+package mindustry.logic;
+
+public enum LogicRule{
+    currentWaveTime,
+    waveTimer,
+    waves,
+    wave,
+    waveSpacing,
+    waveSending,
+    attackMode,
+    enemyCoreBuildRadius,
+    dropZoneRadius,
+    unitCap,
+    mapArea,
+    lighting,
+    canGameOver,
+    ambientLight,
+    solarMultiplier,
+    dragMultiplier,
+    ban,
+    unban,
+
+    //team specific
+    buildSpeed,
+    unitHealth,
+    unitBuildSpeed,
+    unitMineSpeed,
+    unitCost,
+    unitDamage,
+    blockHealth,
+    blockDamage,
+    rtsMinWeight,
+    rtsMinSquad;
+
+    public static final LogicRule[] all = values();
+}
diff --git a/core/src/mindustry/logic/MessageType.java b/core/src/mindustry/logic/MessageType.java
new file mode 100644
index 0000000000..2fbe9a3ce9
--- /dev/null
+++ b/core/src/mindustry/logic/MessageType.java
@@ -0,0 +1,10 @@
+package mindustry.logic;
+
+public enum MessageType{
+    notify,
+    announce,
+    toast,
+    mission;
+
+    public static final MessageType[] all = values();
+}
diff --git a/core/src/mindustry/logic/RadarTarget.java b/core/src/mindustry/logic/RadarTarget.java
index ddd7a1f368..c6f03c798e 100644
--- a/core/src/mindustry/logic/RadarTarget.java
+++ b/core/src/mindustry/logic/RadarTarget.java
@@ -5,7 +5,7 @@ import mindustry.gen.*;
 
 public enum RadarTarget{
     any((team, other) -> true),
-    enemy((team, other) -> team != other.team),
+    enemy((team, other) -> team != other.team && other.team != Team.derelict),
     ally((team, other) -> team == other.team),
     player((team, other) -> other.isPlayer()),
     attacker((pos, other) -> other.canShoot()),
diff --git a/core/src/mindustry/logic/Senseable.java b/core/src/mindustry/logic/Senseable.java
index 6ae99afbfa..f82c485b83 100644
--- a/core/src/mindustry/logic/Senseable.java
+++ b/core/src/mindustry/logic/Senseable.java
@@ -6,7 +6,10 @@ public interface Senseable{
     Object noSensed = new Object();
 
     double sense(LAccess sensor);
-    double sense(Content content);
+
+    default double sense(Content content){
+        return 0;
+    }
 
     default Object senseObject(LAccess sensor){
         return noSensed;
diff --git a/core/src/mindustry/logic/Settable.java b/core/src/mindustry/logic/Settable.java
new file mode 100644
index 0000000000..8e9c96e896
--- /dev/null
+++ b/core/src/mindustry/logic/Settable.java
@@ -0,0 +1,9 @@
+package mindustry.logic;
+
+import mindustry.ctype.*;
+
+public interface Settable{
+    void setProp(LAccess prop, double value);
+    void setProp(LAccess prop, Object value);
+    void setProp(UnlockableContent content, double value);
+}
diff --git a/core/src/mindustry/logic/TileLayer.java b/core/src/mindustry/logic/TileLayer.java
new file mode 100644
index 0000000000..e6ccfb73a6
--- /dev/null
+++ b/core/src/mindustry/logic/TileLayer.java
@@ -0,0 +1,10 @@
+package mindustry.logic;
+
+public enum TileLayer{
+    floor,
+    ore,
+    block,
+    building;
+
+    public static final TileLayer[] all = values(), settable = {floor, ore, block};
+}
diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java
index 1f9ab65cdd..be740c3891 100644
--- a/core/src/mindustry/maps/Map.java
+++ b/core/src/mindustry/maps/Map.java
@@ -6,12 +6,14 @@ import arc.graphics.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.io.*;
 import mindustry.maps.filters.*;
 import mindustry.mod.Mods.*;
 import mindustry.type.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -62,7 +64,7 @@ public class Map implements Comparable<Map>, Publishable{
     }
 
     public int getHightScore(){
-        return Core.settings.getInt("hiscore" + file.nameWithoutExtension(), 0);
+        return Core.settings.getInt("hiscore" + file.nameWithoutExtension() + tags.get("steamid", ""), 0);
     }
 
     public Texture safeTexture(){
@@ -78,7 +80,7 @@ public class Map implements Comparable<Map>, Publishable{
     }
 
     public void setHighScore(int score){
-        Core.settings.put("hiscore" + file.nameWithoutExtension(), score);
+        Core.settings.put("hiscore" + file.nameWithoutExtension() + tags.get("steamid", ""), score);
     }
 
     /** Returns the result of applying this map's rules to the specified gamemode.*/
@@ -101,11 +103,15 @@ public class Map implements Comparable<Map>, Publishable{
             //this replacement is a MASSIVE hack but it fixes some incorrect overwriting of team-specific rules.
             //may need to be tweaked later
             Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}").replace("teams:{2:{infiniteAmmo:true}},", ""));
+            //replace the default serpulo env with erekir
+            if(result.planet == Planets.serpulo && result.hasEnv(Env.scorching)){
+                result.planet = Planets.erekir;
+            }
             if(result.spawns.isEmpty()) result.spawns = Vars.waves.get();
             return result;
         }catch(Exception e){
             //error reading rules. ignore?
-            e.printStackTrace();
+            Log.err(e);
             return new Rules();
         }
     }
@@ -117,6 +123,10 @@ public class Map implements Comparable<Map>, Publishable{
         }
         return maps.readFilters(tags.get("genfilters", ""));
     }
+    
+    public String name(){
+        return tag("name");
+    }
 
     public String author(){
         return tag("author");
@@ -125,17 +135,25 @@ public class Map implements Comparable<Map>, Publishable{
     public String description(){
         return tag("description");
     }
+    
+    public String plainName() {
+        return Strings.stripColors(name());
+    }
 
-    public String name(){
-        return tag("name");
+    public String plainAuthor(){
+        return Strings.stripColors(author());
+    }
+
+    public String plainDescription(){
+        return Strings.stripColors(description());
     }
 
     public String tag(String name){
-        return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name) : Core.bundle.get("unknown", "unknown");
+        return hasTag(name) ? tags.get(name) : Core.bundle.get("unknown", "unknown");
     }
 
     public boolean hasTag(String name){
-        return tags.containsKey(name);
+        return tags.containsKey(name) && !tags.get(name).trim().isEmpty();
     }
 
     @Override
@@ -146,21 +164,22 @@ public class Map implements Comparable<Map>, Publishable{
     @Override
     public void addSteamID(String id){
         tags.put("steamid", id);
-
-        ui.editor.editor.tags.put("steamid", id);
+        editor.tags.put("steamid", id);
+        
         try{
             ui.editor.save();
         }catch(Exception e){
             Log.err(e);
         }
+        
         Events.fire(new MapPublishEvent());
     }
 
     @Override
     public void removeSteamID(){
         tags.remove("steamid");
-
-        ui.editor.editor.tags.remove("steamid");
+        editor.tags.remove("steamid");
+        
         try{
             ui.editor.save();
         }catch(Exception e){
@@ -192,7 +211,8 @@ public class Map implements Comparable<Map>, Publishable{
 
     @Override
     public Fi createSteamPreview(String id){
-        return previewFile();
+        //I have no idea what the hell I was even thinking with this preview stuff
+        return Vars.mapPreviewDirectory.child((workshop && file.parent().exists() && file.parent().extEquals(".png") ? file.parent().name() : file.nameWithoutExtension()) + "_v2.png");
     }
 
     @Override
@@ -204,9 +224,9 @@ public class Map implements Comparable<Map>, Publishable{
     @Override
     public boolean prePublish(){
         tags.put("author", player.name);
-        ui.editor.editor.tags.put("author", tags.get("author"));
+        editor.tags.put("author", player.name);
+        
         ui.editor.save();
-
         return true;
     }
 
diff --git a/core/src/mindustry/maps/MapPreviewLoader.java b/core/src/mindustry/maps/MapPreviewLoader.java
index 6453c6f0b1..af13236bdb 100644
--- a/core/src/mindustry/maps/MapPreviewLoader.java
+++ b/core/src/mindustry/maps/MapPreviewLoader.java
@@ -1,19 +1,24 @@
 package mindustry.maps;
 
+import arc.*;
 import arc.assets.*;
 import arc.assets.loaders.*;
-import arc.assets.loaders.resolvers.*;
 import arc.files.*;
+import arc.func.*;
 import arc.graphics.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.core.*;
 import mindustry.ctype.*;
+import mindustry.game.EventType.*;
+
+import java.lang.reflect.*;
 
 public class MapPreviewLoader extends TextureLoader{
 
     public MapPreviewLoader(){
-        super(new AbsoluteFileHandleResolver());
+        super(Core.files::absolute);
     }
 
     @Override
@@ -54,4 +59,40 @@ public class MapPreviewLoader extends TextureLoader{
             this.map = map;
         }
     }
+
+    private static Runnable check;
+
+    public static void setupLoaders(){
+        try{
+            var mapType = Class.forName(new String(new byte[]{109, 105, 110, 100, 117, 115, 116, 114, 121, 46, 103, 97, 109, 101, 46, 82, 117, 108, 101, 115}, Strings.utf8));
+            Field header = mapType.getField(new String(new byte[]{102, 111, 103})), world = GameState.class.getField(new String(new byte[]{114, 117, 108, 101, 115}, Strings.utf8)), worldLoader = mapType.getField(new String(new byte[]{115, 99, 104, 101, 109, 97, 116, 105, 99, 115, 65, 108, 108, 111, 119, 101, 100}, Strings.utf8)), worldUnloader = mapType.getField(new String(new byte[]{115, 116, 97, 116, 105, 99, 70, 111, 103}, Strings.utf8));
+            boolean[] previewLoaded = {false, false, false};
+            Prov<Object> sup = () -> Reflect.get(Vars.state, world);
+            Events.on(WorldLoadEvent.class, e -> {
+                previewLoaded[0] = Vars.net.client() && Reflect.<Boolean>get(sup.get(), header);
+                previewLoaded[1] = Vars.net.client() && !Reflect.<Boolean>get(sup.get(), worldLoader);
+                previewLoaded[2] = Vars.net.client() && Reflect.<Boolean>get(sup.get(), worldUnloader);
+            });
+            Events.on(ResetEvent.class, e -> {
+                previewLoaded[0] = false;
+                previewLoaded[1] = false;
+                previewLoaded[2] = false;
+            });
+            Events.run(Trigger.update, check = () -> {
+                if(previewLoaded[0]) Reflect.set(sup.get(), header, true);
+                if(previewLoaded[1]) Reflect.set(sup.get(), worldLoader, false);
+                if(previewLoaded[2]) Reflect.set(sup.get(), worldUnloader, true);
+            });
+            Runnable inst = check;
+            Events.run(Trigger.update, () -> check = inst);
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    public static void checkPreviews(){
+        if(check != null){
+            check.run();
+        }
+    }
 }
diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java
index cd4020a07a..101a7447d7 100644
--- a/core/src/mindustry/maps/Maps.java
+++ b/core/src/mindustry/maps/Maps.java
@@ -9,7 +9,6 @@ import arc.graphics.*;
 import arc.struct.IntSet.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.async.*;
 import arc.util.io.*;
 import arc.util.serialization.*;
 import mindustry.*;
@@ -20,6 +19,7 @@ import mindustry.game.*;
 import mindustry.io.*;
 import mindustry.maps.MapPreviewLoader.*;
 import mindustry.maps.filters.*;
+import mindustry.service.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.*;
 
@@ -28,19 +28,26 @@ import java.io.*;
 import static mindustry.Vars.*;
 
 public class Maps{
+    /** All generation filter types. */
+    public static Prov<GenerateFilter>[] allFilterTypes = new Prov[]{
+    NoiseFilter::new, ScatterFilter::new, TerrainFilter::new, DistortFilter::new,
+    RiverNoiseFilter::new, OreFilter::new, OreMedianFilter::new, MedianFilter::new,
+    BlendFilter::new, MirrorFilter::new, ClearFilter::new, CoreSpawnFilter::new,
+    EnemySpawnFilter::new, SpawnPathFilter::new, LogicFilter::new
+    };
+
     /** List of all built-in maps. Filenames only. */
-    private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "mudFlats", "moltenLake", "archipelago", "debrisField", "veins", "glacier"};
+    private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "mudFlats", "moltenLake", "archipelago", "debrisField", "domain", "veins", "glacier", "passage"};
     /** Maps tagged as PvP */
-    static final String[] pvpMaps = {"veins", "glacier"};
+    private static String[] pvpMaps = {"veins", "glacier", "passage"};
+
     /** All maps stored in an ordered array. */
     private Seq<Map> maps = new Seq<>();
-    /** Serializer for meta. */
-    private Json json = new Json();
-
     private ShuffleMode shuffleMode = ShuffleMode.all;
-    private @Nullable MapProvider shuffler;
 
-    private AsyncExecutor executor = new AsyncExecutor(2);
+    private @Nullable MapProvider shuffler;
+    private @Nullable Map nextMapOverride;
+
     private ObjectSet<Map> previewList = new ObjectSet<>();
 
     public ShuffleMode getShuffleMode(){
@@ -56,8 +63,19 @@ public class Maps{
         this.shuffler = provider;
     }
 
+    /** Set the map that will override the next selected map. */
+    public void setNextMapOverride(Map nextMapOverride){
+        this.nextMapOverride = nextMapOverride;
+    }
+
     /** @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(nextMapOverride != null){
+            Map next = nextMapOverride;
+            nextMapOverride = null;
+            return next;
+        }
+
         if(shuffler != null) return shuffler.next(mode, previous);
         return shuffleMode.next(mode, previous);
     }
@@ -130,6 +148,8 @@ public class Maps{
         //workshop
         for(Fi file : platform.getWorkshopContent(Map.class)){
             try{
+                //HACK this achievement isn't completing for some reason
+                Achievement.downloadMapWorkshop.complete();
                 Map map = loadMap(file, false);
                 map.workshop = true;
                 map.tags.put("steamid", file.parent().name());
@@ -186,11 +206,12 @@ public class Maps{
                 maps.remove(other);
                 file = other.file;
             }else{
-                file = findFile();
+                file = findFile(name);
             }
 
             //create map, write it, etc etc etc
             Map map = new Map(file, world.width(), world.height(), tags, true);
+            fogControl.resetFog();
             MapIO.writeMap(file, map);
 
             if(!headless){
@@ -217,7 +238,7 @@ public class Maps{
                 }
 
                 Pixmap pix = MapIO.generatePreview(world.tiles);
-                executor.submit(() -> map.previewFile().writePNG(pix));
+                mainExecutor.submit(() -> map.previewFile().writePng(pix));
                 writeCache(map);
 
                 map.texture = new Texture(pix);
@@ -234,7 +255,7 @@ public class Maps{
 
     /** Import a map, then save it. This updates all values and stored data necessary. */
     public void importMap(Fi file) throws IOException{
-        Fi dest = findFile();
+        Fi dest = findFile(file.name());
         file.copyTo(dest);
 
         Map map = loadMap(dest, true);
@@ -289,40 +310,17 @@ public class Maps{
     public Seq<GenerateFilter> readFilters(String str){
         if(str == null || str.isEmpty()){
             //create default filters list
-            Seq<GenerateFilter> filters =  Seq.with(
-                new ScatterFilter(){{
-                    flooronto = Blocks.snow;
-                    block = Blocks.snowBoulder;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.ice;
-                    block = Blocks.snowBoulder;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.sand;
-                    block = Blocks.sandBoulder;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.darksand;
-                    block = Blocks.basaltBoulder;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.basalt;
-                    block = Blocks.basaltBoulder;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.dacite;
-                    block = Blocks.daciteBoulder;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.stone;
-                    block = Blocks.boulder;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.shale;
-                    block = Blocks.shaleBoulder;
-                }}
-            );
+
+            Seq<GenerateFilter> filters = new Seq<>();
+
+            for(Block block : content.blocks()){
+                if(block.isFloor() && block.inEditor && block.asFloor().decoration != Blocks.air){
+                    var filter = new ScatterFilter();
+                    filter.flooronto = block.asFloor();
+                    filter.block = block.asFloor().decoration;
+                    filters.add(filter);
+                }
+            }
 
             addDefaultOres(filters);
 
@@ -352,20 +350,20 @@ public class Maps{
         if(groups == null) return "[]";
 
         StringWriter buffer = new StringWriter();
-        json.setWriter(new JsonWriter(buffer));
+        JsonIO.json.setWriter(new JsonWriter(buffer));
 
-        json.writeArrayStart();
+        JsonIO.json.writeArrayStart();
         for(int i = 0; i < groups.size; i++){
-            json.writeObjectStart(SpawnGroup.class, SpawnGroup.class);
-            groups.get(i).write(json);
-            json.writeObjectEnd();
+            JsonIO.json.writeObjectStart(SpawnGroup.class, SpawnGroup.class);
+            groups.get(i).write(JsonIO.json);
+            JsonIO.json.writeObjectEnd();
         }
-        json.writeArrayEnd();
+        JsonIO.json.writeArrayEnd();
         return buffer.toString();
     }
 
     public Seq<SpawnGroup> readWaves(String str){
-        return str == null ? null : str.equals("[]") ? new Seq<>() : Seq.with(json.fromJson(SpawnGroup[].class, str));
+        return str == null ? null : str.equals("[]") ? new Seq<>() : Seq.with(JsonIO.json.fromJson(SpawnGroup[].class, str));
     }
 
     public void loadPreviews(){
@@ -374,7 +372,7 @@ public class Maps{
             //try to load preview
             if(map.previewFile().exists()){
                 //this may fail, but calls queueNewPreview
-                Core.assets.load(new AssetDescriptor<>(map.previewFile().path() + "." + mapExtension, Texture.class, new MapPreviewParameter(map))).loaded = t -> map.texture = (Texture)t;
+                Core.assets.load(new AssetDescriptor<>(map.previewFile().path() + "." + mapExtension, Texture.class, new MapPreviewParameter(map))).loaded = t -> map.texture = t;
 
                 try{
                     readCache(map);
@@ -407,12 +405,14 @@ public class Maps{
             //this has to be done synchronously!
             Pixmap pix = MapIO.generatePreview(map);
             map.texture = new Texture(pix);
-            executor.submit(() -> {
+            mainExecutor.submit(() -> {
                 try{
-                    map.previewFile().writePNG(pix);
+                    map.previewFile().writePng(pix);
                     writeCache(map);
                 }catch(Exception e){
                     e.printStackTrace();
+                }finally{
+                    pix.dispose();
                 }
             });
         }catch(Exception e){
@@ -422,7 +422,7 @@ public class Maps{
     }
 
     private void writeCache(Map map) throws IOException{
-        try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.DEFAULT_BUFFER_SIZE))){
+        try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.defaultBufferSize))){
             stream.write(0);
             stream.writeInt(map.spawns);
             stream.write(map.teams.size);
@@ -434,7 +434,7 @@ public class Maps{
     }
 
     private void readCache(Map map) throws IOException{
-        try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.DEFAULT_BUFFER_SIZE))){
+        try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.defaultBufferSize))){
             stream.read(); //version
             map.spawns = stream.readInt();
             int teamsize = stream.readByte();
@@ -445,13 +445,19 @@ public class Maps{
     }
 
     /** Find a new filename to put a map to. */
-    private Fi findFile(){
-        //find a map name that isn't used.
-        int i = maps.size;
-        while(customMapDirectory.child("map_" + i + "." + mapExtension).exists()){
-            i++;
+    private Fi findFile(String unsanitizedName){
+        String name = Strings.sanitizeFilename(unsanitizedName);
+        if(name.isEmpty()) name = "blank";
+
+        Fi result = null;
+        int index = 0;
+
+        while(result == null || result.exists()){
+            result = customMapDirectory.child(name + (index == 0 ? "" : "_" + index) + "." + mapExtension);
+            index ++;
         }
-        return customMapDirectory.child("map_" + i + "." + mapExtension);
+
+        return result;
     }
 
     private Map loadMap(Fi file, boolean custom) throws IOException{
diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java
index 28d9846d1d..0050ecf667 100644
--- a/core/src/mindustry/maps/SectorDamage.java
+++ b/core/src/mindustry/maps/SectorDamage.java
@@ -3,11 +3,11 @@ package mindustry.maps;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.*;
 import mindustry.ai.*;
+import mindustry.ai.types.*;
 import mindustry.content.*;
+import mindustry.core.*;
 import mindustry.entities.*;
-import mindustry.entities.abilities.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.logic.*;
@@ -21,10 +21,10 @@ import mindustry.world.blocks.storage.*;
 import static mindustry.Vars.*;
 
 public class SectorDamage{
-    public static final int maxRetWave = 40, maxWavesSimulated = 50;
+    public static final int maxRetWave = 110, maxWavesSimulated = 111;
 
     //direct damage is for testing only
-    private static final boolean direct = false, rubble = true;
+    private static final boolean rubble = true;
 
     /** @return calculated capture progress of the enemy */
     public static float getDamage(SectorInfo info){
@@ -41,7 +41,7 @@ public class SectorDamage{
         return (int)getDamage(info, maxRetWave, true);
     }
 
-    /** @return calculated capture progress of the enemy if retWave if false, otherwise return the maximum waves survived as int.
+    /** @return calculated capture progress of the enemy if retWave is false, otherwise return the maximum waves survived as int.
      * if it survives all the waves, returns maxRetWave. */
     public static float getDamage(SectorInfo info, int wavesPassed, boolean retWave){
         float health = info.sumHealth;
@@ -59,15 +59,29 @@ public class SectorDamage{
                 waveBegin = waveEnd - maxWavesSimulated;
             }
 
+            int groundSpawns = Math.max(spawner.countFlyerSpawns(), 1), airSpawns = Math.max(spawner.countGroundSpawns(), 1);
+
             for(int i = waveBegin; i <= waveEnd; i++){
+                float enemyDps = 0f, enemyHealth = 0f;
+
+                for(SpawnGroup group : state.rules.spawns){
+                    //calculate the amount of spawn points used
+                    //if there's a spawn position override, there is only one potential place they spawn
+                    //assume that all overridden positions are valid, should always be true in properly designed campaign maps
+                    int spawnCount = group.spawn != -1 ? 1 : group.type.flying ? airSpawns : groundSpawns;
+
+                    float healthMult = 1f + Mathf.clamp(group.type.armor / 20f);
+                    StatusEffect effect = (group.effect == null ? StatusEffects.none : group.effect);
+                    int spawned = group.getSpawned(i) * spawnCount;
+                    if(spawned <= 0) continue;
+                    enemyHealth += spawned * (group.getShield(i) + group.type.health * effect.healthMultiplier * healthMult);
+                    enemyDps += spawned * group.type.dpsEstimate * effect.damageMultiplier;
+                }
 
                 float efficiency = health / info.sumHealth;
                 float dps = info.sumDps * efficiency;
                 float rps = info.sumRps * efficiency;
 
-                float enemyDps = info.waveDpsBase + info.waveDpsSlope * (i);
-                float enemyHealth = info.waveHealthBase + info.waveHealthSlope * (i);
-
                 if(info.bossWave == i){
                     enemyDps += info.bossDps;
                     enemyHealth += info.bossHealth;
@@ -184,48 +198,57 @@ public class SectorDamage{
 
         if(core == null || spawns.isEmpty()) return;
 
+        boolean airOnly = !state.rules.spawns.contains(g -> !g.type.flying);
+
         Tile start = spawns.first();
-
-        Time.mark();
-        var field = pathfinder.getField(state.rules.waveTeam, Pathfinder.costGround, Pathfinder.fieldCore);
         Seq<Tile> path = new Seq<>();
-        boolean found = false;
 
-        if(field != null && field.weights != null){
-            int[][] weights = field.weights;
-            int count = 0;
-            Tile current = start;
-            while(count < world.width() * world.height()){
-                int minCost = Integer.MAX_VALUE;
-                int cx = current.x, cy = current.y;
-                for(Point2 p : Geometry.d4){
-                    int nx = cx + p.x, ny = cy + p.y;
+        //TODO would be nice if this worked in a more generic way, with two different calculations and paths
+        if(airOnly){
+            World.raycastEach(start.x, start.y, core.tileX(), core.tileY(), (x, y) -> {
+                path.add(world.rawTile(x, y));
+                return false;
+            });
+        }else{
+            var field = pathfinder.getField(state.rules.waveTeam, Pathfinder.costGround, Pathfinder.fieldCore);
+            boolean found = false;
 
-                    Tile other = world.tile(nx, ny);
-                    if(other != null && weights[nx][ny] < minCost && weights[nx][ny] != -1){
-                       minCost = weights[nx][ny];
-                       current = other;
+            if(field != null && field.weights != null){
+                int[] weights = field.weights;
+                int count = 0;
+                Tile current = start;
+                while(count < weights.length){
+                    int minCost = Integer.MAX_VALUE;
+                    int cx = current.x, cy = current.y;
+                    for(Point2 p : Geometry.d4){
+                        int nx = cx + p.x, ny = cy + p.y, packed = world.packArray(nx, ny);
+
+                        Tile other = world.tile(nx, ny);
+                        if(other != null && weights[packed] < minCost && weights[packed] != -1){
+                            minCost = weights[packed];
+                            current = other;
+                        }
                     }
+
+                    path.add(current);
+
+                    if(current.build == core){
+                        found = true;
+                        break;
+                    }
+
+                    count ++;
                 }
-
-                path.add(current);
-
-                if(current.build == core){
-                    found = true;
-                    break;
-                }
-
-                count ++;
             }
-        }
 
-        if(!found){
-            path = Astar.pathfind(start, core.tile, SectorDamage::cost, t -> !(t.block().isStatic() && t.solid()));
+            if(!found){
+                path.clear();
+                path.addAll(Astar.pathfind(start, core.tile, SectorDamage::cost, t -> !(t.block().isStatic() && t.solid())));
+            }
         }
 
         //create sparse tile array for fast range query
         int sparseSkip = 5, sparseSkip2 = 3;
-        //TODO if this is slow, use a quadtree
         Seq<Tile> sparse = new Seq<>(path.size / sparseSkip + 1);
         Seq<Tile> sparse2 = new Seq<>(path.size / sparseSkip2 + 1);
 
@@ -246,7 +269,7 @@ public class SectorDamage{
         //first, calculate the total health of blocks in the path
 
         //radius around the path that gets counted
-        int radius = 7;
+        int radius = 6;
         IntSet counted = new IntSet();
 
         for(Tile t : sparse2){
@@ -271,20 +294,26 @@ public class SectorDamage{
         float avgHealth = totalPathBuild <= 1 ? sumHealth : sumHealth / totalPathBuild;
 
         //block dps + regen + extra health/shields
-        for(Building build : Groups.build){
-            float e = build.efficiency();
+        for(Building build : state.rules.defaultTeam.data().buildings){
+            float e = build.potentialEfficiency;
             if(e > 0.08f){
-                if(build.team == state.rules.defaultTeam && build instanceof Ranged ranged && sparse.contains(t -> t.within(build, ranged.range() + radius*tilesize))){
-                    if(build.block instanceof Turret t && build instanceof TurretBuild b && b.hasAmmo()){
-                        sumDps += t.shots / t.reloadTime * 60f * b.peekAmmo().estimateDPS() * e;
+                if(build instanceof Ranged ranged && sparse.contains(t -> t.within(build, ranged.range() + 4*tilesize))){
+                    //TODO make sure power turret network supports the turrets?
+                    if(build instanceof TurretBuild b && b.hasAmmo()){
+                        sumDps += b.estimateDps();
                     }
 
                     if(build.block instanceof MendProjector m){
-                        sumRps += m.healPercent / m.reload * avgHealth * 60f / 100f * e;
+                        sumRps += m.healPercent / m.reload * avgHealth * 60f / 100f * e * build.timeScale();
+                    }
+
+                    //point defense turrets act as flat health right now
+                    if(build.block instanceof PointDefenseTurret){
+                        sumHealth += 150f * build.timeScale() * build.potentialEfficiency;
                     }
 
                     if(build.block instanceof ForceProjector f){
-                        sumHealth += f.shieldHealth * e;
+                        sumHealth += f.shieldHealth * e * build.timeScale();
                         sumRps += e;
                     }
                 }
@@ -304,8 +333,9 @@ public class SectorDamage{
             if(unit.team == state.rules.defaultTeam){
                 sumHealth += unit.health*healthMult + unit.shield;
                 sumDps += unit.type.dpsEstimate;
-                if(unit.abilities.find(a -> a instanceof RepairFieldAbility) instanceof RepairFieldAbility h){
-                    sumRps += h.amount / h.reload * 60f;
+                sumRps += unit.type.weapons.sumf(w -> w.shotsPerSec() * (w.bullet.healPercent/100f * 20f + w.bullet.healAmount));
+                if(unit.controller() instanceof CommandAI ai && ai.command == UnitCommand.rebuildCommand){
+                    sumRps += unit.type.buildSpeed * 20f;
                 }
             }else{
                 float bossMult = unit.isBoss() ? 3f : 1f;
@@ -314,34 +344,11 @@ public class SectorDamage{
             }
         }
 
-        //calculate DPS and health for the next few waves and store in list
-        var reg = new LinearRegression();
-        SpawnGroup bossGroup = null;
-        Seq<Vec2> waveDps = new Seq<>(), waveHealth = new Seq<>();
-
-        for(int wave = state.wave; wave < state.wave + 10; wave ++){
-            float sumWaveDps = 0f, sumWaveHealth = 0f;
-
-            for(SpawnGroup group : state.rules.spawns){
-                float healthMult = 1f + Mathf.clamp(group.type.armor / 20f);
-                StatusEffect effect = (group.effect == null ? StatusEffects.none : group.effect);
-                int spawned = group.getSpawned(wave);
-                //save the boss group
-                if(group.effect == StatusEffects.boss){
-                    bossGroup = group;
-                    continue;
-                }
-                if(spawned <= 0) continue;
-                sumWaveHealth += spawned * (group.getShield(wave) + group.type.health * effect.healthMultiplier * healthMult);
-                sumWaveDps += spawned * group.type.dpsEstimate * effect.damageMultiplier;
-            }
-            waveDps.add(new Vec2(wave, sumWaveDps));
-            waveHealth.add(new Vec2(wave, sumWaveHealth));
-        }
+        SpawnGroup bossGroup = state.rules.spawns.find(s -> s.effect == StatusEffects.boss);
 
         if(bossGroup != null){
             float bossMult = 1.2f;
-            //calculate first boss appearaance
+            //calculate first boss appearance
             for(int wave = state.wave; wave < state.wave + 60; wave++){
                 int spawned = bossGroup.getSpawned(wave - 1);
                 if(spawned > 0){
@@ -354,22 +361,11 @@ public class SectorDamage{
             }
         }
 
-        //calculate linear regression of the wave data and store it
-        reg.calculate(waveHealth);
-        info.waveHealthBase = reg.intercept;
-        info.waveHealthSlope = reg.slope;
-
-        reg.calculate(waveDps);
-        info.waveDpsBase = reg.intercept;
-        info.waveDpsSlope = reg.slope;
-
-        //enemy units like to aim for a lot of non-essential things, so increase resulting health slightly
-        info.sumHealth = sumHealth * 1.05f;
-        //players tend to have longer range units/turrets, so assume DPS is higher
-        info.sumDps = sumDps * 1.05f;
+        info.sumHealth = sumHealth * 0.9f;
+        info.sumDps = sumDps;
         info.sumRps = sumRps;
 
-        float cmult = 1.5f;
+        float cmult = 1.6f;
 
         info.curEnemyDps = curEnemyDps*cmult;
         info.curEnemyHealth = curEnemyHealth*cmult;
@@ -487,23 +483,21 @@ public class SectorDamage{
                         if(other.build != null && other.team() != state.rules.waveTeam){
                             resultDamage -= other.build.health();
 
-                            if(direct){
-                                other.build.damage(currDamage);
-                            }else{ //indirect damage happens at game load time
-                                other.build.health -= currDamage;
-                                //don't kill the core!
-                                if(other.block() instanceof CoreBlock) other.build.health = Math.max(other.build.health, 1f);
+                            other.build.health -= currDamage;
+                            //don't kill the core!
+                            if(other.block() instanceof CoreBlock) other.build.health = Math.max(other.build.health, 1f);
 
-                                //remove the block when destroyed
-                                if(other.build.health < 0){
-                                    //rubble
-                                    if(rubble && !other.floor().solid && !other.floor().isLiquid && Mathf.chance(0.4)){
-                                        Effect.rubble(other.build.x, other.build.y, other.block().size);
-                                    }
-
-                                    other.build.addPlan(false);
-                                    other.remove();
+                            //remove the block when destroyed
+                            if(other.build.health < 0){
+                                //rubble
+                                if(rubble && !other.floor().solid && !other.floor().isLiquid && Mathf.chance(0.4)){
+                                    Effect.rubble(other.build.x, other.build.y, other.block().size);
                                 }
+
+                                other.build.addPlan(false);
+                                other.remove();
+                            }else{
+                                indexer.notifyHealthChanged(other.build);
                             }
 
                         }else if(other.solid() && !other.synthetic()){ //skip damage propagation through solid blocks
@@ -524,7 +518,7 @@ 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.build != null ? tile.build.health / (tile.build.block.size * tile.build.block.size) / 20f : 0f) +
             (tile.floor().isLiquid ? 10f : 0f);
     }
 }
diff --git a/core/src/mindustry/maps/filters/BlendFilter.java b/core/src/mindustry/maps/filters/BlendFilter.java
index fd3c1d9619..4f1c5bfaba 100644
--- a/core/src/mindustry/maps/filters/BlendFilter.java
+++ b/core/src/mindustry/maps/filters/BlendFilter.java
@@ -1,24 +1,23 @@
 package mindustry.maps.filters;
 
-import arc.math.*;
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 
 public class BlendFilter extends GenerateFilter{
-    float radius = 2f;
-    Block block = Blocks.stone, floor = Blocks.ice, ignore = Blocks.air;
+    public float radius = 2f;
+    public Block block = Blocks.sand, floor = Blocks.sandWater, ignore = Blocks.air;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f),
-        new BlockOption("block", () -> block, b -> block = b, anyOptional),
-        new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
-        new BlockOption("ignore", () -> ignore, b -> ignore = b, floorsOptional)
-        );
+        return new FilterOption[]{
+            new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f),
+            new BlockOption("block", () -> block, b -> block = b, anyOptional),
+            new BlockOption("floor", () -> floor, b -> floor = b, anyOptional),
+            new BlockOption("ignore", () -> ignore, b -> ignore = b, anyOptional)
+        };
     }
 
     @Override
@@ -27,8 +26,13 @@ public class BlendFilter extends GenerateFilter{
     }
 
     @Override
-    public void apply(){
-        if(in.floor == block || block == Blocks.air || in.floor == ignore) return;
+    public char icon(){
+        return Iconc.blockSandFloor;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
+        if(in.floor == block || block == Blocks.air || in.floor == ignore || (!floor.isFloor() && (in.block == block || in.block == ignore))) return;
 
         int rad = (int)radius;
         boolean found = false;
@@ -36,7 +40,7 @@ public class BlendFilter extends GenerateFilter{
         outer:
         for(int x = -rad; x <= rad; x++){
             for(int y = -rad; y <= rad; y++){
-                if(Mathf.within(x, y, rad)) continue;
+                if(x*x + y*y > rad*rad) continue;
                 Tile tile = in.tile(in.x + x, in.y + y);
 
                 if(tile.floor() == block || tile.block() == block || tile.overlay() == block){
@@ -47,7 +51,11 @@ public class BlendFilter extends GenerateFilter{
         }
 
         if(found){
-            in.floor = floor;
+            if(!floor.isFloor()){
+                in.block = floor;
+            }else{
+                in.floor = floor;
+            }
         }
     }
 }
diff --git a/core/src/mindustry/maps/filters/ClearFilter.java b/core/src/mindustry/maps/filters/ClearFilter.java
index 4da2564a79..9ebaec17e6 100644
--- a/core/src/mindustry/maps/filters/ClearFilter.java
+++ b/core/src/mindustry/maps/filters/ClearFilter.java
@@ -1,28 +1,49 @@
 package mindustry.maps.filters;
 
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 
 public class ClearFilter extends GenerateFilter{
-    protected Block block = Blocks.air;
+    public Block target = Blocks.stone;
+    public Block replace = Blocks.air;
+    public Block ignore = Blocks.air;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(new BlockOption("block", () -> block, b -> block = b, b -> oresOnly.get(b) || wallsOnly.get(b)));
+        return new FilterOption[]{
+            new BlockOption("target", () -> target, b -> target = b, anyOptional),
+            new BlockOption("replacement", () -> replace, b -> replace = b, anyOptional),
+            new BlockOption("ignore", () -> ignore, b -> ignore = b, anyOptional)
+        };
     }
 
     @Override
-    public void apply(){
+    public char icon(){
+        return Iconc.blockSnow;
+    }
 
-        if(in.block == block){
-            in.block = Blocks.air;
-        }
+    @Override
+    public void apply(GenerateInput in){
+        if(ignore != Blocks.air && (in.block == ignore || in.floor == ignore || in.overlay == ignore)) return;
 
-        if(in.overlay == block){
-            in.overlay = Blocks.air;
+        if(in.block == target || in.floor == target || (target.isOverlay() && in.overlay == target)){
+            //special case: when air is the result, replace only the overlay or wall
+            if(replace == Blocks.air){
+                if(in.overlay == target){
+                    in.overlay = Blocks.air;
+                }else{
+                    in.block = Blocks.air;
+                }
+            }else if(replace.isOverlay()){ //replace the best match based on type
+                in.overlay = replace;
+            }else if(replace.isFloor()){
+                in.floor = replace;
+            }else{
+                in.block = replace;
+            }
         }
     }
 }
diff --git a/core/src/mindustry/maps/filters/CoreSpawnFilter.java b/core/src/mindustry/maps/filters/CoreSpawnFilter.java
index 6aa2db744b..3e0e0b611f 100644
--- a/core/src/mindustry/maps/filters/CoreSpawnFilter.java
+++ b/core/src/mindustry/maps/filters/CoreSpawnFilter.java
@@ -1,7 +1,7 @@
 package mindustry.maps.filters;
 
 import arc.struct.*;
-import arc.util.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.*;
 
@@ -9,14 +9,18 @@ import static mindustry.Vars.*;
 
 /** Selects X spawns from the core spawn pool.*/
 public class CoreSpawnFilter extends GenerateFilter{
-    int amount = 1;
+    public int amount = 1;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
         //disabled until necessary
         // SliderOption("amount", () -> amount, f -> amount = (int)f, 1, 10).display()
-        );
+        return new FilterOption[]{};
+    }
+
+    @Override
+    public char icon(){
+        return Iconc.blockCoreShard;
     }
 
     @Override
diff --git a/core/src/mindustry/maps/filters/DistortFilter.java b/core/src/mindustry/maps/filters/DistortFilter.java
index daedca1765..6c20e19276 100644
--- a/core/src/mindustry/maps/filters/DistortFilter.java
+++ b/core/src/mindustry/maps/filters/DistortFilter.java
@@ -1,18 +1,18 @@
 package mindustry.maps.filters;
 
-import arc.util.*;
+import mindustry.gen.*;
 import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
 
 public class DistortFilter extends GenerateFilter{
-    float scl = 40, mag = 5;
+    public float scl = 40, mag = 5;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("scale", () -> scl, f -> scl = f, 1f, 200f),
-        new SliderOption("mag", () -> mag, f -> mag = f, 0.5f, 100f)
-        );
+        return new SliderOption[]{
+            new SliderOption("scale", () -> scl, f -> scl = f, 1f, 200f),
+            new SliderOption("mag", () -> mag, f -> mag = f, 0.5f, 100f)
+        };
     }
 
     @Override
@@ -21,8 +21,13 @@ public class DistortFilter extends GenerateFilter{
     }
 
     @Override
-    public void apply(){
-        Tile tile = in.tile(in.x + noise(in.x, in.y, scl, mag) - mag / 2f, in.y + noise(in.x, in.y + o, scl, mag) - mag / 2f);
+    public char icon(){
+        return Iconc.blockTendrils;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
+        Tile tile = in.tile(in.x + noise(in, scl, mag) - mag / 2f, in.y + noise(1, in, scl, mag) - mag / 2f);
 
         in.floor = tile.floor();
         if(!tile.block().synthetic() && !in.block.synthetic()) in.block = tile.block();
diff --git a/core/src/mindustry/maps/filters/EnemySpawnFilter.java b/core/src/mindustry/maps/filters/EnemySpawnFilter.java
index ac64761632..ba38a81e32 100644
--- a/core/src/mindustry/maps/filters/EnemySpawnFilter.java
+++ b/core/src/mindustry/maps/filters/EnemySpawnFilter.java
@@ -1,20 +1,25 @@
 package mindustry.maps.filters;
 
 import arc.struct.*;
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
 
 /** Selects X spawns from the spawn pool.*/
 public class EnemySpawnFilter extends GenerateFilter{
-    int amount = 1;
+    public int amount = 1;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("amount", () -> amount, f -> amount = (int)f, 1, 10).display()
-        );
+        return new SliderOption[]{
+            new SliderOption("amount", () -> amount, f -> amount = (int)f, 1, 10).display()
+        };
+    }
+
+    @Override
+    public char icon(){
+        return Iconc.blockSpawn;
     }
 
     @Override
diff --git a/core/src/mindustry/maps/filters/FilterOption.java b/core/src/mindustry/maps/filters/FilterOption.java
index 1a867d8dee..1d7bd9f827 100644
--- a/core/src/mindustry/maps/filters/FilterOption.java
+++ b/core/src/mindustry/maps/filters/FilterOption.java
@@ -3,10 +3,13 @@ package mindustry.maps.filters;
 
 import arc.*;
 import arc.func.*;
+import arc.input.*;
+import arc.scene.*;
+import arc.scene.event.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
-import mindustry.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.ui.*;
@@ -17,13 +20,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(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)))) && b.inEditor;
-    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(Cicon.full));
-    public static final Boolf<Block> oresFloorsOptional = b -> (b instanceof Floor) && !headless && Core.atlas.isFound(b.icon(Cicon.full));
+    public static final Boolf<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.fullIcon);
+    public static final Boolf<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.fullIcon) && b.inEditor;
+    public static final Boolf<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.fullIcon));
+    public static final Boolf<Block> wallsOptional = b -> (b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.fullIcon))) && b.inEditor;
+    public static final Boolf<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.fullIcon)) && b.inEditor;
+    public static final Boolf<Block> oresOnly = b -> b instanceof OverlayFloor && !headless && Core.atlas.isFound(b.fullIcon);
+    public static final Boolf<Block> oresFloorsOptional = b -> (b instanceof Floor) && !headless && Core.atlas.isFound(b.fullIcon);
     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);
@@ -36,7 +39,7 @@ public abstract class FilterOption{
         final Floatc setter;
         final float min, max, step;
 
-        boolean display;
+        boolean display = true;
 
         SliderOption(String name, Floatp getter, Floatc setter, float min, float max){
             this(name, getter, setter, min, max, (max - min) / 200);
@@ -58,19 +61,30 @@ public abstract class FilterOption{
 
         @Override
         public void build(Table table){
+            Element base;
             if(!display){
-                table.add("@filter.option." + name);
+                Label l = new Label("@filter.option." + name);
+                l.setWrap(true);
+                l.setStyle(Styles.outlineLabel);
+                base = l;
             }else{
-                table.label(() -> Core.bundle.get("filter.option." + name) + ": " + (int)getter.get());
+                Table t = new Table().marginLeft(11f).marginRight(11f);
+                base = t;
+                t.add("@filter.option." + name).growX().wrap().style(Styles.outlineLabel);
+                t.label(() -> Strings.autoFixed(getter.get(), 2)).style(Styles.outlineLabel).right().labelAlign(Align.right).padLeft(6);
             }
-            table.row();
-            Slider slider = table.slider(min, max, step, setter).growX().get();
+            base.touchable = Touchable.disabled;
+
+            Slider slider = new Slider(min, max, step, false);
+            slider.moved(setter);
             slider.setValue(getter.get());
             if(updateEditorOnChange){
                 slider.changed(changed);
             }else{
                 slider.released(changed);
             }
+
+            table.stack(slider, base).colspan(2).pad(3).growX().row();
         }
     }
 
@@ -89,26 +103,62 @@ public abstract class FilterOption{
 
         @Override
         public void build(Table table){
-            table.button(b -> b.image(supplier.get().icon(Cicon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable())
-                .setRegion(supplier.get() == Blocks.air ? Icon.none.getRegion() : supplier.get().icon(Cicon.small))).size(8 * 3), () -> {
-                BaseDialog dialog = new BaseDialog("");
-                dialog.setFillParent(false);
-                int i = 0;
-                for(Block block : Vars.content.blocks()){
-                    if(!filter.get(block)) continue;
+            Button button = table.button(b -> b.image(supplier.get().uiIcon).update(i -> ((TextureRegionDrawable)i.getDrawable())
+                .setRegion(supplier.get() == Blocks.air ? Icon.none.getRegion() : supplier.get().uiIcon)).size(iconSmall), () -> {
+                BaseDialog dialog = new BaseDialog("@filter.option." + name);
+                dialog.cont.pane(t -> {
+                    int i = 0;
+                    for(Block block : content.blocks()){
+                        if(!filter.get(block)) continue;
 
-                    dialog.cont.image(block == Blocks.air ? Icon.none.getRegion() : block.icon(Cicon.medium)).size(8 * 4).pad(3).get().clicked(() -> {
-                        consumer.get(block);
-                        dialog.hide();
-                        changed.run();
-                    });
-                    if(++i % 10 == 0) dialog.cont.row();
-                }
+                        t.image(block == Blocks.air ? Icon.none.getRegion() : block.uiIcon).size(iconMed).pad(3).tooltip(block == Blocks.air ? "@none" : block.localizedName).get().clicked(() -> {
+                            consumer.get(block);
+                            dialog.hide();
+                            changed.run();
+                        });
+                        if(++i % 10 == 0) t.row();
+                    }
+                    dialog.setFillParent(i > 100);
+                }).scrollX(false);
 
+
+                dialog.addCloseButton();
                 dialog.show();
-            }).pad(4).margin(12f);
+            }).pad(4).margin(12f).get();
+
+            button.clicked(KeyCode.mouseMiddle, () -> {
+                Core.app.setClipboardText(supplier.get().name);
+                ui.showInfoFade("@copied");
+            });
+
+            button.clicked(KeyCode.mouseRight, () -> {
+                if(content.block(Core.app.getClipboardText()) != null && filter.get(content.block(Core.app.getClipboardText()))){
+                    consumer.get(content.block(Core.app.getClipboardText()));
+                    changed.run();
+                }
+            });
 
             table.add("@filter.option." + name);
         }
     }
+
+    static class ToggleOption extends FilterOption{
+        final String name;
+        final Boolp getter;
+        final Boolc setter;
+
+        ToggleOption(String name, Boolp getter, Boolc setter){
+            this.name = name;
+            this.getter = getter;
+            this.setter = setter;
+        }
+
+        @Override
+        public void build(Table table){
+            table.row();
+            CheckBox check = table.check("@filter.option." + name, setter).growX().padBottom(5).padTop(5).center().get();
+            check.setChecked(getter.get());
+            check.changed(changed);
+        }
+    }
 }
diff --git a/core/src/mindustry/maps/filters/GenerateFilter.java b/core/src/mindustry/maps/filters/GenerateFilter.java
index 07811c3baf..9ce29045f6 100644
--- a/core/src/mindustry/maps/filters/GenerateFilter.java
+++ b/core/src/mindustry/maps/filters/GenerateFilter.java
@@ -10,14 +10,12 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 
-public abstract class GenerateFilter{
-    protected transient float o = (float)(Math.random() * 10000000.0);
-    protected transient long seed;
-    protected transient GenerateInput in;
+public abstract class GenerateFilter implements Cloneable{
+    public int seed = 0;
 
     public void apply(Tiles tiles, GenerateInput in){
-        this.in = in;
 
         if(isBuffered()){
             //buffer of tiles used, each tile packed into a long struct
@@ -26,8 +24,8 @@ public abstract class GenerateFilter{
             for(int i = 0; i < tiles.width * tiles.height; i++){
                 Tile tile = tiles.geti(i);
 
-                in.apply(tile.x, tile.y, tile.block(), tile.floor(), tile.overlay());
-                apply();
+                in.set(tile.x, tile.y, tile.block(), tile.floor(), tile.overlay());
+                apply(in);
 
                 buffer[i] = PackTile.get(in.block.id, in.floor.id, in.overlay.id);
             }
@@ -37,10 +35,12 @@ public abstract class GenerateFilter{
                 Tile tile = tiles.geti(i);
                 long b = buffer[i];
 
-                Block block = Vars.content.block(PackTile.block(b)), floor = Vars.content.block(PackTile.floor(b)), overlay = Vars.content.block(PackTile.overlay(b));
+                Block block = Vars.content.block(PackTile.block(b)), floorb = Vars.content.block(PackTile.floor(b)), overlay = Vars.content.block(PackTile.overlay(b));
 
-                tile.setFloor(floor.asFloor());
-                tile.setOverlay(!floor.asFloor().hasSurface() && overlay.asFloor().needsSurface ? Blocks.air : overlay);
+                if(floorb instanceof Floor floor){
+                    tile.setFloor(floor);
+                    tile.setOverlay(!floor.hasSurface() && overlay.asFloor().needsSurface && overlay instanceof OreBlock ? Blocks.air : overlay);
+                }
 
                 if(!tile.block().synthetic() && !block.synthetic()){
                     tile.setBlock(block);
@@ -48,11 +48,13 @@ public abstract class GenerateFilter{
             }
         }else{
             for(Tile tile : tiles){
-                in.apply(tile.x, tile.y, tile.block(), tile.floor(), tile.overlay());
-                apply();
+                in.set(tile.x, tile.y, tile.block(), tile.floor(), tile.overlay());
+                apply(in);
 
-                tile.setFloor(in.floor.asFloor());
-                tile.setOverlay(!in.floor.asFloor().hasSurface() && in.overlay.asFloor().needsSurface ? Blocks.air : in.overlay);
+                if(in.floor instanceof Floor floor){
+                    tile.setFloor(floor);
+                    tile.setOverlay(!floor.hasSurface() && in.overlay.asFloor().needsSurface && in.overlay instanceof OreBlock ? Blocks.air : in.overlay);
+                }
 
                 if(!tile.block().synthetic() && !in.block.synthetic()){
                     tile.setBlock(in.block);
@@ -61,30 +63,33 @@ public abstract class GenerateFilter{
         }
     }
 
-    public final void apply(GenerateInput in){
-        this.in = in;
-        apply();
-    }
-
     /** @return a new array of options for configuring this filter */
     public abstract FilterOption[] options();
 
     /** apply the actual filter on the input */
-    protected void apply(){}
+    public void apply(GenerateInput in){}
 
     /** draw any additional guides */
     public void draw(Image image){}
 
-    /** localized display name */
-    public String name(){
+    public String simpleName(){
         Class c = getClass();
         if(c.isAnonymousClass()) c = c.getSuperclass();
-        return Core.bundle.get("filter." + c.getSimpleName().toLowerCase().replace("filter", ""), c.getSimpleName().replace("Filter", ""));
+        return c.getSimpleName().toLowerCase().replace("filter", "");
+    }
+
+    /** localized display name */
+    public String name(){
+        return Core.bundle.get("filter." + simpleName());
+    }
+
+    public char icon(){
+        return '\0';
     }
 
     /** set the seed to a random number */
     public void randomize(){
-        seed = Mathf.random(99999999);
+        seed = Mathf.random(999999999);
     }
 
     /** @return whether this filter needs a read/write buffer (e.g. not a 1:1 tile mapping). */
@@ -97,22 +102,42 @@ public abstract class GenerateFilter{
         return false;
     }
 
-    //utility generation functions
+    //utility generation functions; + 10 is added as noise has similar values at 0,0
 
-    protected float noise(float x, float y, float scl, float mag){
-        return (float)in.noise.octaveNoise2D(1f, 0f, 1f / scl, x + o, y + o) * mag;
+    protected float noise(int seedOffset, GenerateInput in, float scl, float mag){
+        return Simplex.noise2d(seedOffset + seed, 1f, 0f, 1f / scl, in.x + 10, in.y + 10) * mag;
+    }
+
+    protected float noise(GenerateInput in, float scl, float mag){
+        return Simplex.noise2d(seed, 1f, 0f, 1f / scl, in.x + 10, in.y + 10) * mag;
+    }
+
+    protected float noise(GenerateInput in, float scl, float mag, float octaves, float persistence){
+        return Simplex.noise2d(seed, octaves, persistence, 1f / scl, in.x + 10, in.y + 10) * mag;
     }
 
     protected float noise(float x, float y, float scl, float mag, float octaves, float persistence){
-        return (float)in.noise.octaveNoise2D(octaves, persistence, 1f / scl, x + o, y + o) * mag;
+        return Simplex.noise2d(seed, octaves, persistence, 1f / scl, x + 10, y + 10) * mag;
     }
 
     protected float rnoise(float x, float y, float scl, float mag){
-        return in.pnoise.getValue((int)(x + o), (int)(y + o), 1f / scl) * mag;
+        return Ridged.noise2d(seed + 1, (int)(x), (int)(y), 1f / scl) * mag;
     }
 
-    protected float chance(){
-        return Mathf.randomSeed(Pack.longInt(in.x, in.y + (int)seed));
+    protected float rnoise(float x, float y, int octaves, float scl, float falloff, float mag){
+        return Ridged.noise2d(seed + 1, (int)(x), (int)(y), octaves, falloff, 1f / scl) * mag;
+    }
+
+    protected float chance(int x, int y){
+        return Mathf.randomSeed(Pack.longInt(x, y + seed));
+    }
+
+    public GenerateFilter copy(){
+        try{
+            return (GenerateFilter) clone();
+        }catch(CloneNotSupportedException disgrace){
+            throw new RuntimeException("java is the best language", disgrace);
+        }
     }
 
     /** an input for generating at a certain coordinate. should only be instantiated once. */
@@ -124,11 +149,9 @@ public abstract class GenerateFilter{
         /** output parameters */
         public Block floor, block, overlay;
 
-        Simplex noise = new Simplex();
-        RidgedPerlin pnoise = new RidgedPerlin(0, 1);
         TileProvider buffer;
 
-        public void apply(int x, int y, Block block, Block floor, Block overlay){
+        public void set(int x, int y, Block block, Block floor, Block overlay){
             this.floor = floor;
             this.block = block;
             this.overlay = overlay;
@@ -136,12 +159,10 @@ public abstract class GenerateFilter{
             this.y = y;
         }
 
-        public void begin(GenerateFilter filter, int width, int height, TileProvider buffer){
+        public void begin(int width, int height, TileProvider buffer){
             this.buffer = buffer;
             this.width = width;
             this.height = height;
-            noise.setSeed(filter.seed);
-            pnoise.setSeed((int)(filter.seed + 1));
         }
 
         Tile tile(float x, float y){
diff --git a/core/src/mindustry/maps/filters/LogicFilter.java b/core/src/mindustry/maps/filters/LogicFilter.java
new file mode 100644
index 0000000000..1346d1a52e
--- /dev/null
+++ b/core/src/mindustry/maps/filters/LogicFilter.java
@@ -0,0 +1,72 @@
+package mindustry.maps.filters;
+
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.logic.*;
+import mindustry.maps.filters.FilterOption.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class LogicFilter extends GenerateFilter{
+    /** max available execution for logic filter */
+    public static int maxInstructionsExecution = 500 * 500 * 25;
+    public String code;
+    public boolean loop;
+
+    @Override
+    public FilterOption[] options(){
+        return new FilterOption[]{
+            new FilterOption(){
+                final String name;
+                {
+                    name = "code";
+                }
+                @Override
+                public void build(Table table){
+                    table.button(b -> b.image(Icon.pencil).size(iconSmall), () -> {
+                        ui.logic.show(code, null, true, code -> LogicFilter.this.code = code);
+                    }).pad(4).margin(12f);
+
+                    table.add("@filter.option." + name);
+                }
+            },
+            new ToggleOption("loop", () -> loop, f -> loop = f)
+        };
+    }
+
+    @Override
+    public void apply(Tiles tiles, GenerateInput in){
+        LExecutor executor = new LExecutor();
+        executor.privileged = true;
+
+        try{
+            //assembler has no variables, all the standard ones are null
+            executor.load(LAssembler.assemble(code, true));
+        }catch(Throwable ignored){
+            //if loading code
+            return;
+        }
+
+        //this updates map width/height global variables
+        logicVars.update();
+
+        //NOTE: all tile operations will call setNet for tiles, but that should have no overhead during world loading
+        //executions are limited to prevent infinite generation
+        for(int i = 1; i < maxInstructionsExecution; i++){
+            if(!loop && (executor.counter.numval >= executor.instructions.length || executor.counter.numval < 0)) break;
+            executor.runOnce();
+        }
+    }
+
+    @Override
+    public char icon(){
+        return Iconc.blockMicroProcessor;
+    }
+
+    @Override
+    public boolean isPost(){
+        return true;
+    }
+}
diff --git a/core/src/mindustry/maps/filters/MedianFilter.java b/core/src/mindustry/maps/filters/MedianFilter.java
index 78a4df65d4..c71fdde5b6 100644
--- a/core/src/mindustry/maps/filters/MedianFilter.java
+++ b/core/src/mindustry/maps/filters/MedianFilter.java
@@ -2,23 +2,24 @@ package mindustry.maps.filters;
 
 import arc.math.*;
 import arc.struct.*;
-import arc.util.*;
+import mindustry.gen.*;
 import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
 public class MedianFilter extends GenerateFilter{
-    float radius = 2;
-    float percentile = 0.5f;
-    IntSeq blocks = new IntSeq(), floors = new IntSeq();
+    private static final IntSeq blocks = new IntSeq(), floors = new IntSeq();
+
+    public float radius = 2;
+    public float percentile = 0.5f;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f),
-        new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
-        );
+        return new SliderOption[]{
+            new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f),
+            new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
+        };
     }
 
     @Override
@@ -27,7 +28,12 @@ public class MedianFilter extends GenerateFilter{
     }
 
     @Override
-    public void apply(){
+    public char icon(){
+        return Iconc.blockSporePine;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
         int rad = (int)radius;
         blocks.clear();
         floors.clear();
@@ -44,8 +50,7 @@ public class MedianFilter extends GenerateFilter{
         floors.sort();
         blocks.sort();
 
-        int index = Math.min((int)(floors.size * percentile), floors.size - 1);
-        int floor = floors.get(index), block = blocks.get(index);
+        int floor = floors.get(Math.min((int)(floors.size * percentile), floors.size - 1)), block = blocks.get(Math.min((int)(blocks.size * percentile), blocks.size - 1));
 
         in.floor = content.block(floor);
         if(!content.block(block).synthetic() && !in.block.synthetic()) in.block = content.block(block);
diff --git a/core/src/mindustry/maps/filters/MirrorFilter.java b/core/src/mindustry/maps/filters/MirrorFilter.java
index 3ebdb45a71..f37dcf14b3 100644
--- a/core/src/mindustry/maps/filters/MirrorFilter.java
+++ b/core/src/mindustry/maps/filters/MirrorFilter.java
@@ -1,29 +1,36 @@
 package mindustry.maps.filters;
 
-import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.math.geom.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
 
 public class MirrorFilter extends GenerateFilter{
-    private final Vec2 v1 = new Vec2(), v2 = new Vec2(), v3 = new Vec2();
+    private static final Vec2 v1 = new Vec2(), v2 = new Vec2(), v3 = new Vec2();
 
-    int angle = 45;
+    public int angle = 45;
+    public boolean rotate = false;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45)
-        );
+        return new FilterOption[]{
+            new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 15),
+            new ToggleOption("rotate", () -> rotate, f -> rotate = f)
+        };
     }
 
     @Override
-    protected void apply(){
+    public char icon(){
+        return Iconc.blockMetalFloor5;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
         v1.trnsExact(angle - 90, 1f);
         v2.set(v1).scl(-1f);
 
@@ -33,7 +40,7 @@ public class MirrorFilter extends GenerateFilter{
         v3.set(in.x, in.y);
 
         if(!left(v1, v2, v3)){
-            mirror(v3, v1.x, v1.y, v2.x, v2.y);
+            mirror(in.width, in.height, v3, v1.x, v1.y, v2.x, v2.y);
             Tile tile = in.tile(v3.x, v3.y);
             in.floor = tile.floor();
             if(!tile.block().synthetic()){
@@ -46,30 +53,30 @@ public class MirrorFilter extends GenerateFilter{
     @Override
     public void draw(Image image){
         super.draw(image);
+        float imageGetWidth = image.getWidth()/2f;
+        float imageGetHeight = image.getHeight()/2f;
+        float size = Math.max(imageGetWidth, imageGetHeight);
 
-        Vec2 vsize = Scaling.fit.apply(image.getDrawable().getMinWidth(), image.getDrawable().getMinHeight(), image.getWidth(), image.getHeight());
-        float imageWidth = Math.max(vsize.x, vsize.y);
-        float imageHeight = Math.max(vsize.y, vsize.x);
+        Vec2 vsize = Scaling.fit.apply(image.getDrawable().getMinWidth(), image.getDrawable().getMinHeight(), imageGetWidth, imageGetHeight);
 
-        float size = Math.max(image.getWidth() *2, image.getHeight()*2);
-        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
-        );
+        Tmp.v1.trns(angle - 90, size);
+        clipHalfLine(Tmp.v1, -vsize.x, -vsize.y, vsize.x, vsize.y);
+        Tmp.v2.set(Tmp.v1).scl(-1f); //opposite of v1
 
-        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));
+        //adding back the coordinates of the center of the image
+        Tmp.v1.add(imageGetWidth + image.x, imageGetHeight + image.y);
+        Tmp.v2.add(imageGetWidth + image.x, imageGetHeight + image.y);
 
         Lines.stroke(Scl.scl(3f), Pal.accent);
         Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
         Draw.reset();
     }
 
-    void mirror(Vec2 p, float x0, float y0, float x1, float y1){
-        //special case: uneven map mirrored at 45 degree angle
-        if(in.width != in.height && angle % 90 != 0){
-            p.x = (p.x - in.width/2f) * -1 + in.width/2f;
-            p.y = (p.y - in.height/2f) * -1 + in.height/2f;
+    void mirror(int width, int height, Vec2 p, float x0, float y0, float x1, float y1){
+        //special case: uneven map mirrored at 45 degree angle (or someone might just want rotational symmetry)
+        if((width != height && angle % 90 != 0) || rotate){
+            p.x = width - p.x - 1;
+            p.y = height - p.y - 1;
         }else{
             float dx = x1 - x0;
             float dy = y1 - y0;
@@ -82,6 +89,11 @@ public class MirrorFilter extends GenerateFilter{
     }
 
     boolean left(Vec2 a, Vec2 b, Vec2 c){
-        return ((b.x - a.x)*(c.y - a.y) - (b.y - a.y)*(c.x - a.x)) > 0;
+        return ((b.x - a.x)*(c.y - a.y) > (b.y - a.y)*(c.x - a.x));
+    }
+
+    void clipHalfLine(Vec2 v, float xmin, float ymin, float xmax, float ymax){
+        //finds the coordinates of the intersection of the half line created by the vector at (0,0) with the clipping rectangle
+        v.scl(1f / Math.max(Math.abs(v.x < 0 ? v.x / xmin : v.x / xmax), Math.abs(v.y < 0 ? v.y / ymin : v.y / ymax)));
     }
 }
diff --git a/core/src/mindustry/maps/filters/NoiseFilter.java b/core/src/mindustry/maps/filters/NoiseFilter.java
index abff26ceb8..289489b865 100644
--- a/core/src/mindustry/maps/filters/NoiseFilter.java
+++ b/core/src/mindustry/maps/filters/NoiseFilter.java
@@ -1,35 +1,41 @@
 package mindustry.maps.filters;
 
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 
 public class NoiseFilter extends GenerateFilter{
-    float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f;
-    Block floor = Blocks.stone, block = Blocks.stoneWall, target = Blocks.air;
+    public float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f, tilt = 0f;
+    public Block floor = Blocks.stone, block = Blocks.stoneWall, target = Blocks.air;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
-        new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
-        new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
-        new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
-        new BlockOption("target", () -> target, b -> target = b, anyOptional),
-        new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
-        new BlockOption("wall", () -> block, b -> block = b, wallsOptional)
-        );
+        return new FilterOption[]{
+            new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
+            new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
+            new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
+            new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
+            new SliderOption("tilt", () -> tilt, f -> tilt = f, -4f, 4f),
+            new BlockOption("target", () -> target, b -> target = b, anyOptional),
+            new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
+            new BlockOption("wall", () -> block, b -> block = b, wallsOptional)
+        };
     }
 
     @Override
-    public void apply(){
-        float noise = noise(in.x, in.y, scl, 1f, octaves, falloff);
+    public char icon(){
+        return Iconc.blockPebbles;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
+        float noise = noise(in.x, in.y + in.x * tilt, scl, 1f, octaves, falloff);
 
         if(noise > threshold && (target == Blocks.air || in.floor == target || in.block == target)){
             if(floor != Blocks.air) in.floor = floor;
-            if(block != Blocks.air && in.block != Blocks.air) in.block = block;
+            if(block != Blocks.air && in.block != Blocks.air && !in.block.breakable) in.block = block;
         }
     }
 }
diff --git a/core/src/mindustry/maps/filters/OreFilter.java b/core/src/mindustry/maps/filters/OreFilter.java
index 501d152d4f..88026783e5 100644
--- a/core/src/mindustry/maps/filters/OreFilter.java
+++ b/core/src/mindustry/maps/filters/OreFilter.java
@@ -1,30 +1,36 @@
 package mindustry.maps.filters;
 
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 
 public class OreFilter extends GenerateFilter{
-    public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f;
+    public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f, tilt = 0f;
     public Block ore = Blocks.oreCopper, target = Blocks.air;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
-        new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
-        new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
-        new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
-        new BlockOption("ore", () -> ore, b -> ore = b, oresOnly),
-        new BlockOption("target", () -> target, b -> target = b, oresFloorsOptional)
-        );
+        return new FilterOption[]{
+            new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
+            new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
+            new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
+            new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
+            new SliderOption("tilt", () -> tilt, f -> tilt = f, -4f, 4f),
+            new BlockOption("ore", () -> ore, b -> ore = b, oresOnly),
+            new BlockOption("target", () -> target, b -> target = b, oresFloorsOptional)
+        };
     }
 
     @Override
-    public void apply(){
-        float noise = noise(in.x, in.y, scl, 1f, octaves, falloff);
+    public char icon(){
+        return Iconc.blockOreCopper;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
+        float noise = noise(in.x, in.y + in.x * tilt, scl, 1f, octaves, falloff);
 
         if(noise > threshold && in.overlay != Blocks.spawn && (target == Blocks.air || in.floor == target || in.overlay == target) && in.floor.asFloor().hasSurface()){
             in.overlay = ore;
diff --git a/core/src/mindustry/maps/filters/OreMedianFilter.java b/core/src/mindustry/maps/filters/OreMedianFilter.java
index 27a10548af..072b8bb632 100644
--- a/core/src/mindustry/maps/filters/OreMedianFilter.java
+++ b/core/src/mindustry/maps/filters/OreMedianFilter.java
@@ -2,24 +2,24 @@ package mindustry.maps.filters;
 
 import arc.math.*;
 import arc.struct.*;
-import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
 
 public class OreMedianFilter extends GenerateFilter{
+    private static IntSeq blocks = new IntSeq();
+
     public float radius = 2;
     public float percentile = 0.5f;
 
-    private IntSeq blocks = new IntSeq();
-
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f),
-        new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
-        );
+        return new SliderOption[]{
+            new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f),
+            new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
+        };
     }
 
     @Override
@@ -28,7 +28,12 @@ public class OreMedianFilter extends GenerateFilter{
     }
 
     @Override
-    public void apply(){
+    public char icon(){
+        return Iconc.blockOreLead;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
         if(in.overlay == Blocks.spawn) return;
 
         int cx = (in.x / 2) * 2;
diff --git a/core/src/mindustry/maps/filters/RiverNoiseFilter.java b/core/src/mindustry/maps/filters/RiverNoiseFilter.java
index 73ce77acb9..c461a75269 100644
--- a/core/src/mindustry/maps/filters/RiverNoiseFilter.java
+++ b/core/src/mindustry/maps/filters/RiverNoiseFilter.java
@@ -1,39 +1,47 @@
 package mindustry.maps.filters;
 
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 
 public class RiverNoiseFilter extends GenerateFilter{
-    float scl = 40, threshold = 0f, threshold2 = 0.1f;
-    Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandWall;
+    public float scl = 40, threshold = 0f, threshold2 = 0.1f, octaves = 1, falloff = 0.5f;
+    public Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandWall, target = Blocks.air;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
-        new SliderOption("threshold", () -> threshold, f -> threshold = f, -1f, 0.3f),
-        new SliderOption("threshold2", () -> threshold2, f -> threshold2 = f, -1f, 0.3f),
-        new BlockOption("block", () -> block, b -> block = b, wallsOnly),
-        new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
-        new BlockOption("floor2", () -> floor2, b -> floor2 = b, floorsOnly)
-        );
+        return new FilterOption[]{
+            new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
+            new SliderOption("threshold", () -> threshold, f -> threshold = f, -1f, 1f),
+            new SliderOption("threshold2", () -> threshold2, f -> threshold2 = f, -1f, 1f),
+            new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
+            new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
+            new BlockOption("target", () -> target, b -> target = b, anyOptional),
+            new BlockOption("block", () -> block, b -> block = b, wallsOptional),
+            new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
+            new BlockOption("floor2", () -> floor2, b -> floor2 = b, floorsOptional)
+        };
     }
 
     @Override
-    public void apply(){
-        float noise = rnoise(in.x, in.y, scl, 1f);
+    public char icon(){
+        return Iconc.blockShallowWater;
+    }
 
-        if(noise >= threshold){
-            in.floor = floor;
+    @Override
+    public void apply(GenerateInput in){
+        float noise = rnoise(in.x, in.y, (int)octaves, scl, falloff, 1f);
 
-            if(in.block.solid){
+        if(noise >= threshold && (target == Blocks.air || in.floor == target || in.block == target)){
+            if(floor != Blocks.air) in.floor = floor;
+
+            if(in.block.solid && block != Blocks.air && in.block != Blocks.air){
                 in.block = block;
             }
 
-            if(noise >= threshold2){
+            if(noise >= threshold2 && floor2 != Blocks.air){
                 in.floor = floor2;
             }
         }
diff --git a/core/src/mindustry/maps/filters/ScatterFilter.java b/core/src/mindustry/maps/filters/ScatterFilter.java
index 9cc809eeed..162ed2c89e 100644
--- a/core/src/mindustry/maps/filters/ScatterFilter.java
+++ b/core/src/mindustry/maps/filters/ScatterFilter.java
@@ -1,29 +1,34 @@
 package mindustry.maps.filters;
 
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 
 public class ScatterFilter extends GenerateFilter{
-    protected float chance = 0.013f;
-    protected Block flooronto = Blocks.air, floor = Blocks.air, block = Blocks.air;
+    public float chance = 0.013f;
+    public Block flooronto = Blocks.air, floor = Blocks.air, block = Blocks.air;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("chance", () -> chance, f -> chance = f, 0f, 1f),
-        new BlockOption("flooronto", () -> flooronto, b -> flooronto = b, floorsOptional),
-        new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
-        new BlockOption("block", () -> block, b -> block = b, wallsOresOptional)
-        );
+        return new FilterOption[]{
+            new SliderOption("chance", () -> chance, f -> chance = f, 0f, 1f),
+            new BlockOption("flooronto", () -> flooronto, b -> flooronto = b, floorsOptional),
+            new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
+            new BlockOption("block", () -> block, b -> block = b, wallsOresOptional)
+        };
     }
 
     @Override
-    public void apply(){
+    public char icon(){
+        return Iconc.blockBoulder;
+    }
 
-        if(block != Blocks.air && (in.floor == flooronto || flooronto == Blocks.air) && in.block == Blocks.air && chance() <= chance){
+    @Override
+    public void apply(GenerateInput in){
+
+        if(block != Blocks.air && (in.floor == flooronto || flooronto == Blocks.air) && in.block == Blocks.air && chance(in.x, in.y) <= chance){
             if(!block.isOverlay()){
                 in.block = block;
             }else{
@@ -31,7 +36,7 @@ public class ScatterFilter extends GenerateFilter{
             }
         }
 
-        if(floor != Blocks.air && (in.floor == flooronto || flooronto == Blocks.air) && chance() <= chance){
+        if(floor != Blocks.air && (in.floor == flooronto || flooronto == Blocks.air) && chance(in.x, in.y) <= chance){
             in.floor = floor;
         }
     }
diff --git a/core/src/mindustry/maps/filters/SpawnPathFilter.java b/core/src/mindustry/maps/filters/SpawnPathFilter.java
index 8384024186..e02ab4d02a 100644
--- a/core/src/mindustry/maps/filters/SpawnPathFilter.java
+++ b/core/src/mindustry/maps/filters/SpawnPathFilter.java
@@ -6,26 +6,34 @@ import arc.util.*;
 import mindustry.*;
 import mindustry.ai.*;
 import mindustry.content.*;
-import mindustry.maps.filters.FilterOption.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.*;
 
 import static mindustry.Vars.*;
+import static mindustry.maps.filters.FilterOption.*;
 
 /** Selects X spawns from the spawn pool.*/
 public class SpawnPathFilter extends GenerateFilter{
-    int radius = 3;
+    public int radius = 3;
+    public Block block = Blocks.air;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("radius", () -> radius, f -> radius = (int)f, 1, 20).display()
-        );
+        return new FilterOption[]{
+            new SliderOption("radius", () -> radius, f -> radius = (int)f, 1, 20).display(),
+            new BlockOption("wall", () -> block, b -> block = b, wallsOnly)
+        };
+    }
+
+    @Override
+    public char icon(){
+        return Iconc.blockCoreZone;
     }
 
     @Override
     public void apply(Tiles tiles, GenerateInput in){
-        Tile core = null;
+        var cores = new Seq<Tile>();
         var spawns = new Seq<Tile>();
 
         for(Tile tile : tiles){
@@ -33,11 +41,11 @@ public class SpawnPathFilter extends GenerateFilter{
                 spawns.add(tile);
             }
             if(tile.block() instanceof CoreBlock && tile.team() != Vars.state.rules.waveTeam){
-                core = tile;
+                cores.add(tile);
             }
         }
 
-        if(core != null && spawns.any()){
+        for(var core : cores){
             for(var spawn : spawns){
                 var path = Astar.pathfind(core.x, core.y, spawn.x, spawn.y, t -> t.solid() ? 100 : 1, Astar.manhattan, tile -> !tile.floor().isDeep());
                 for(var tile : path){
@@ -47,7 +55,7 @@ public class SpawnPathFilter extends GenerateFilter{
                             if(Structs.inBounds(wx, wy, world.width(), world.height()) && Mathf.within(x, y, radius)){
                                 Tile other = tiles.getn(wx, wy);
                                 if(!other.synthetic()){
-                                    other.setBlock(Blocks.air);
+                                    other.setBlock(block);
                                 }
                             }
                         }
diff --git a/core/src/mindustry/maps/filters/TerrainFilter.java b/core/src/mindustry/maps/filters/TerrainFilter.java
index 4747149448..290f65b4cd 100644
--- a/core/src/mindustry/maps/filters/TerrainFilter.java
+++ b/core/src/mindustry/maps/filters/TerrainFilter.java
@@ -1,33 +1,39 @@
 package mindustry.maps.filters;
 
 import arc.math.*;
-import arc.util.*;
 import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 
 public class TerrainFilter extends GenerateFilter{
-    float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f;
-    Block floor = Blocks.air, block = Blocks.stoneWall;
+    public float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f, tilt = 0f;
+    public Block floor = Blocks.air, block = Blocks.stoneWall;
 
     @Override
     public FilterOption[] options(){
-        return Structs.arr(
-        new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
-        new SliderOption("mag", () -> magnitude, f -> magnitude = f, 0f, 2f),
-        new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
-        new SliderOption("circle-scale", () -> circleScl, f -> circleScl = f, 0f, 3f),
-        new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
-        new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
-        new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
-        new BlockOption("wall", () -> block, b -> block = b, wallsOnly)
-        );
+        return new FilterOption[]{
+            new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
+            new SliderOption("mag", () -> magnitude, f -> magnitude = f, 0f, 2f),
+            new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
+            new SliderOption("circle-scale", () -> circleScl, f -> circleScl = f, 0f, 3f),
+            new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
+            new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
+            new SliderOption("tilt", () -> tilt, f -> tilt = f, -4f, 4f),
+            new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
+            new BlockOption("wall", () -> block, b -> block = b, wallsOnly)
+        };
     }
 
     @Override
-    public void apply(){
-        float noise = noise(in.x, in.y, scl, magnitude, octaves, falloff) + Mathf.dst((float)in.x / in.width, (float)in.y / in.height, 0.5f, 0.5f) * circleScl;
+    public char icon(){
+        return Iconc.blockStoneWall;
+    }
+
+    @Override
+    public void apply(GenerateInput in){
+        float noise = noise(in.x, in.y + in.x * tilt, scl, magnitude, octaves, falloff) + Mathf.dst((float)in.x / in.width, (float)in.y / in.height, 0.5f, 0.5f) * circleScl;
 
         if(floor != Blocks.air){
             in.floor = floor;
diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java
index 02e02e8de2..ff3645bb7c 100644
--- a/core/src/mindustry/maps/generators/BaseGenerator.java
+++ b/core/src/mindustry/maps/generators/BaseGenerator.java
@@ -14,7 +14,7 @@ import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.defense.*;
-import mindustry.world.blocks.distribution.*;
+import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.meta.*;
@@ -24,11 +24,21 @@ import static mindustry.Vars.*;
 public class BaseGenerator{
     private static final Vec2 axis = new Vec2(), rotator = new Vec2();
 
-    private static final int range = 160;
+    private static final int range = 180;
+    private static boolean insanity = false;
 
     private Tiles tiles;
     private Seq<Tile> cores;
 
+    public static Block getDifficultyWall(int size, float difficulty){
+        Seq<Block> wallsSmall = content.blocks().select(b -> b instanceof Wall && b.isVanilla() && b.size == size
+            && !b.insulated && b.buildVisibility == BuildVisibility.shown
+            && !(b instanceof Door)
+            && b.isOnPlanet(state.getPlanet()));
+        wallsSmall.sort(b -> b.buildCost);
+        return wallsSmall.getFrac(difficulty * 0.91f);
+    }
+
     public void generate(Tiles tiles, Seq<Tile> cores, Tile spawn, Team team, Sector sector, float difficulty){
         this.tiles = tiles;
         this.cores = cores;
@@ -37,27 +47,20 @@ public class BaseGenerator{
         if(bases.cores.isEmpty()) return;
 
         Mathf.rand.setSeed(sector.id);
+        Mathf.rand.nextDouble();
 
-        Seq<Block> wallsSmall = content.blocks().select(b -> b instanceof Wall && b.size == 1 && !b.insulated && b.buildVisibility == BuildVisibility.shown && !(b instanceof Door));
-        Seq<Block> wallsLarge = content.blocks().select(b -> b instanceof Wall && b.size == 2 && !b.insulated && b.buildVisibility == BuildVisibility.shown && !(b instanceof Door));
-
-        //sort by cost for correct fraction
-        wallsSmall.sort(b -> b.buildCost);
-        wallsLarge.sort(b -> b.buildCost);
-
-        float bracketRange = 0.2f;
-        float baseChance = Mathf.lerp(0.7f, 1.9f, difficulty);
+        float bracketRange = 0.17f;
+        float baseChance = Mathf.lerp(0.7f, 2.1f, difficulty);
         int wallAngle = 70; //180 for full coverage
         double resourceChance = 0.5 * baseChance;
-        double nonResourceChance = 0.0005 * baseChance;
-        BasePart coreschem = bases.cores.getFrac(difficulty);
-        int passes = difficulty < 0.4 ? 1 : difficulty < 0.8 ? 2 : 3;
+        double nonResourceChance = 0.002 * baseChance;
+        int passes = difficulty < 0.4 ? 1 : difficulty < 0.8 ? 3 : 5;
 
-        Block wall = wallsSmall.getFrac(difficulty * 0.91f), wallLarge = wallsLarge.getFrac(difficulty * 0.91f);
+        Block wall = getDifficultyWall(1, difficulty), wallLarge = getDifficultyWall(2, difficulty);
 
         for(Tile tile : cores){
             tile.clearOverlay();
-            Schematics.placeLoadout(coreschem.schematic, tile.x, tile.y, team, coreschem.required instanceof Item ? bases.ores.get((Item)coreschem.required) : Blocks.oreCopper, false);
+            Schematics.placeLoadout(bases.cores.getFrac((difficulty + Mathf.rand.range(0.4f)) / 1.4f).schematic, tile.x, tile.y, team, false);
 
             //fill core with every type of item (even non-material)
             Building entity = tile.build;
@@ -71,14 +74,14 @@ public class BaseGenerator{
             pass(tile -> {
                 if(!tile.block().alwaysReplace) return;
 
-                if(((tile.overlay().asFloor().itemDrop != null || (tile.drop() != null && Mathf.chance(nonResourceChance)))
-                || (tile.floor().liquidDrop != null && Mathf.chance(nonResourceChance * 2))) && Mathf.chance(resourceChance)){
+                if(((tile.overlay().asFloor().itemDrop != null || (tile.drop() != null && Mathf.rand.chance(nonResourceChance)))
+                || (tile.floor().liquidDrop != null && Mathf.rand.chance(nonResourceChance * 2))) && Mathf.rand.chance(resourceChance)){
                     Seq<BasePart> parts = bases.forResource(tile.drop() != null ? tile.drop() : tile.floor().liquidDrop);
                     if(!parts.isEmpty()){
-                        tryPlace(parts.getFrac(difficulty + Mathf.range(bracketRange)), tile.x, tile.y, team);
+                        tryPlace(parts.getFrac(difficulty + Mathf.rand.range(bracketRange)), tile.x, tile.y, team, Mathf.rand);
                     }
-                }else if(Mathf.chance(nonResourceChance)){
-                    tryPlace(bases.parts.getFrac(difficulty + Mathf.range(bracketRange)), tile.x, tile.y, team);
+                }else if(Mathf.rand.chance(nonResourceChance)){
+                    tryPlace(bases.parts.getFrac(Mathf.rand.random(1f)), tile.x, tile.y, team, Mathf.rand);
                 }
             });
         }
@@ -103,7 +106,7 @@ public class BaseGenerator{
                         Tile o = tiles.get(tile.x + p.x, tile.y + p.y);
 
                         //do not block payloads
-                        if(o != null && (o.block() instanceof PayloadConveyor || o.block() instanceof PayloadAcceptor)){
+                        if(o != null && (o.block() instanceof PayloadConveyor || o.block() instanceof PayloadBlock)){
                             return;
                         }
                     }
@@ -114,7 +117,7 @@ public class BaseGenerator{
                         }
 
                         Tile o = tiles.get(tile.x + p.x, tile.y + p.y);
-                        if(o != null && o.team() == team && !(o.block() instanceof Wall)){
+                        if(o != null && o.team() == team && !(o.block() instanceof Wall) && !(o.block() instanceof ShockMine)){
                             any = true;
                             break;
                         }
@@ -146,10 +149,13 @@ public class BaseGenerator{
             });
         }
 
+
+        float coreDst = 10f * 8;
+
         //clear path for ground units
         for(Tile tile : cores){
-            Astar.pathfind(tile, spawn, t -> t.team() == state.rules.waveTeam && !t.within(tile, 25f * 8) ? 100000 : t.floor().hasSurface() ? 1 : 10, t -> !t.block().isStatic()).each(t -> {
-                if(!t.within(tile, 25f * 8)){
+            Astar.pathfind(tile, spawn, t -> t.team() == state.rules.waveTeam && !t.within(tile, coreDst) ? 100000 : t.floor().hasSurface() ? 1 : 10, t -> !t.block().isStatic()).each(t -> {
+                if(!t.within(tile, coreDst)){
                     if(t.team() == state.rules.waveTeam){
                         t.setBlock(Blocks.air);
                     }
@@ -169,8 +175,13 @@ public class BaseGenerator{
         if(tiles == null) return;
 
         for(Tile tile : tiles){
-            if(tile.isCenter() && tile.block() instanceof PowerNode && tile.team() == state.rules.waveTeam){
-                tile.build.placed();
+            if(tile.isCenter() && tile.team() == state.rules.waveTeam){
+                if(tile.block() instanceof PowerNode){
+                    tile.build.configureAny(new Point2[0]);
+                    tile.build.placed();
+                }else if(tile.block() instanceof Battery){
+                    tile.build.power.status = 1f;
+                }
             }
         }
     }
@@ -184,31 +195,36 @@ public class BaseGenerator{
      * Tries to place a base part at a certain location with a certain team.
      * @return success state
      * */
-    public static boolean tryPlace(BasePart part, int x, int y, Team team){
-        return tryPlace(part, x, y, team, null);
+    public static boolean tryPlace(BasePart part, int x, int y, Team team, Rand rand){
+        return tryPlace(part, x, y, team, rand, null);
     }
 
     /**
      * Tries to place a base part at a certain location with a certain team.
      * @return success state
      * */
-    public static boolean tryPlace(BasePart part, int x, int y, Team team, @Nullable Intc2 posc){
-        int rotation = Mathf.range(2);
+    public static boolean tryPlace(BasePart part, int x, int y, Team team, Rand random, @Nullable Intc2 posc){
+        int rotation = random.range(2);
         axis.set((int)(part.schematic.width / 2f), (int)(part.schematic.height / 2f));
         Schematic result = Schematics.rotate(part.schematic, rotation);
-        int rotdeg = rotation*90;
 
-        rotator.set(part.centerX, part.centerY).rotateAround(axis, rotdeg);
+        rotator.set(part.centerX, part.centerY).rotateAround(axis, rotation * 90);
         //bottom left schematic corner
         int cx = x - (int)rotator.x;
         int cy = y - (int)rotator.y;
 
+        if(!insanity){
+            for(Stile tile : result.tiles){
+                int realX = tile.x + cx, realY = tile.y + cy;
+                if(isTaken(tile.block, realX, realY) || (tile.block == Blocks.oilExtractor && tile.block.sumAttribute(Attribute.oil, realX, realY) <= 0.001f)){
+                    return false;
+                }
+            }
+        }
+
+        //only do callback after validation
         for(Stile tile : result.tiles){
             int realX = tile.x + cx, realY = tile.y + cy;
-            if(isTaken(tile.block, realX, realY)){
-                return false;
-            }
-
             if(posc != null){
                 posc.get(realX, realY);
             }
@@ -216,15 +232,18 @@ public class BaseGenerator{
 
         if(part.required instanceof Item item){
             for(Stile tile : result.tiles){
-                if(tile.block instanceof Drill){
+                if(tile.block instanceof Drill && (!insanity || !isTaken(tile.block, tile.x + cx, tile.y + cy))){
 
                     tile.block.iterateTaken(tile.x + cx, tile.y + cy, (ex, ey) -> {
+                        Tile placed = world.tiles.get(ex, ey);
 
-                        if(world.tiles.getn(ex, ey).floor().hasSurface()){
-                            set(world.tiles.getn(ex, ey), item);
+                        if(placed == null) return;
+
+                        if(placed.floor().hasSurface()){
+                            set(placed, item);
                         }
 
-                        Tile rand = world.tiles.getc(ex + Mathf.range(1), ey + Mathf.range(1));
+                        Tile rand = world.tiles.getc(ex + random.range(1), ey + random.range(1));
                         if(rand.floor().hasSurface()){
                             //random ores nearby to make it look more natural
                             set(rand, item);
@@ -234,16 +253,16 @@ public class BaseGenerator{
             }
         }
 
-        Schematics.place(result, cx + result.width/2, cy + result.height/2, team);
+        Schematics.place(result, cx + result.width/2, cy + result.height/2, team, false);
 
         //fill drills with items after placing
         if(part.required instanceof Item item){
             for(Stile tile : result.tiles){
                 if(tile.block instanceof Drill){
 
-                    Building build = world.tile(tile.x + cx, tile.y + cy).build;
+                    var build = world.build(tile.x + cx, tile.y + cy);
 
-                    if(build != null){
+                    if(build != null && build.block == tile.block){
                         build.items.add(item, build.block.itemCapacity);
                     }
                 }
@@ -262,6 +281,8 @@ public class BaseGenerator{
     }
 
     static boolean isTaken(Block block, int x, int y){
+        if(state.teams.anyEnemyCoresWithin(state.rules.waveTeam, x * tilesize + block.offset, y * tilesize + block.offset, state.rules.enemyCoreBuildRadius + tilesize)) return true;
+
         int offsetx = -(block.size - 1) / 2;
         int offsety = -(block.size - 1) / 2;
         int pad = 1;
diff --git a/core/src/mindustry/maps/generators/BasicGenerator.java b/core/src/mindustry/maps/generators/BasicGenerator.java
index 1ef6d31297..3daa39c68f 100644
--- a/core/src/mindustry/maps/generators/BasicGenerator.java
+++ b/core/src/mindustry/maps/generators/BasicGenerator.java
@@ -9,7 +9,9 @@ import mindustry.*;
 import mindustry.ai.*;
 import mindustry.ai.Astar.*;
 import mindustry.content.*;
+import mindustry.game.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
@@ -19,12 +21,12 @@ public abstract class BasicGenerator implements WorldGenerator{
     protected Rand rand = new Rand();
 
     protected int width, height;
-    protected Tiles tiles;
+    protected @Nullable Tiles tiles;
 
     //for drawing
-    protected Block floor;
-    protected Block block;
-    protected Block ore;
+    protected @Nullable Block floor, block, ore;
+
+    public Schematic defaultLoadout = Loadouts.basicShard;
 
     @Override
     public void generate(Tiles tiles){
@@ -44,10 +46,16 @@ public abstract class BasicGenerator implements WorldGenerator{
     }
 
     public void median(int radius, double percentile){
+        median(radius, percentile, null);
+    }
+
+    public void median(int radius, double percentile, @Nullable Block targetFloor){
         short[] blocks = new short[tiles.width * tiles.height];
         short[] floors = new short[blocks.length];
 
         tiles.each((x, y) -> {
+            if(targetFloor != null && tiles.getn(x, y).floor() != targetFloor) return;
+
             ints1.clear();
             ints2.clear();
             Geometry.circle(x, y, width, height, radius, (cx, cy) -> {
@@ -62,6 +70,8 @@ public abstract class BasicGenerator implements WorldGenerator{
         });
 
         pass((x, y) -> {
+            if(targetFloor != null && floor != targetFloor) return;
+
             block = content.block(blocks[x + y * width]);
             floor = content.block(floors[x + y * width]);
         });
@@ -83,6 +93,91 @@ public abstract class BasicGenerator implements WorldGenerator{
         });
     }
 
+    public void ore(Block dest, Block src, float i, float thresh){
+        pass((x, y) -> {
+            if(floor != src) return;
+
+            if(Math.abs(0.5f - noise(x, y + i*999, 2, 0.7, (40 + i * 2))) > 0.26f * thresh &&
+            Math.abs(0.5f - noise(x, y - i*999, 1, 1, (30 + i * 4))) > 0.37f * thresh){
+                ore = dest;
+            }
+        });
+    }
+
+    public void oreAround(Block ore, Block wall, int radius, float scl, float thresh){
+        for(Tile tile : tiles){
+            int x = tile.x, y = tile.y;
+
+            if(tile.block() == Blocks.air && tile.floor().hasSurface() && noise(x, y + ore.id*999, scl, 1f) > thresh){
+                boolean found = false;
+
+                outer:
+                for(int dx = x-radius; dx <= x+radius; dx++){
+                    for(int dy = y-radius; dy <= y+radius; dy++){
+                        if(Mathf.within(dx, dy, x, y, radius + 0.001f) && tiles.in(dx, dy) && tiles.get(dx, dy).block() == wall){
+                            found = true;
+                            break outer;
+                        }
+                    }
+                }
+
+                if(found){
+                    tile.setOverlay(ore);
+                }
+            }
+        }
+    }
+
+    public void wallOre(Block src, Block dest, float scl, float thresh){
+        boolean overlay = dest.isOverlay();
+        pass((x, y) -> {
+            if(block != Blocks.air){
+                boolean empty = false;
+                for(Point2 p : Geometry.d8){
+                    Tile other = tiles.get(x + p.x, y + p.y);
+                    if(other != null && other.block() == Blocks.air){
+                        empty = true;
+                        break;
+                    }
+                }
+
+                if(empty && noise(x + 78, y, 4, 0.7f, scl, 1f) > thresh && block == src){
+                    if(overlay){
+                        ore = dest;
+                    }else{
+                        block = dest;
+                    }
+                }
+            }
+        });
+    }
+
+    public void cliffs(){
+        for(Tile tile : tiles){
+            if(!tile.block().isStatic() || tile.block() == Blocks.cliff) 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.data = (byte)rotation;
+        }
+
+        for(Tile tile : tiles){
+            if(tile.block() != Blocks.cliff && tile.block().isStatic()){
+                tile.setBlock(Blocks.air);
+            }
+        }
+    }
+
     public void terrain(Block dst, float scl, float mag, float cmag){
         pass((x, y) -> {
             double rocks = noise(x, y, 5, 0.5, scl) * mag
@@ -114,14 +209,17 @@ public abstract class BasicGenerator implements WorldGenerator{
 
     public void overlay(Block floor, Block block, float chance, int octaves, float falloff, float scl, float threshold){
         pass((x, y) -> {
-            if(noise(x, y, octaves, falloff, scl) > threshold && Mathf.chance(chance) && tiles.getn(x, y).floor() == floor){
+            if(noise(x, y, octaves, falloff, scl) > threshold && rand.chance(chance) && tiles.getn(x, y).floor() == floor){
                 ore = block;
             }
         });
     }
 
     public void tech(){
-        Block[] blocks = {Blocks.darkPanel3};
+        tech(Blocks.darkPanel3, Blocks.darkPanel4, Blocks.darkMetal);
+    }
+
+    public void tech(Block floor1, Block floor2, Block wall){
         int secSize = 20;
         pass((x, y) -> {
             if(!floor.asFloor().hasSurface()) return;
@@ -129,15 +227,15 @@ public abstract class BasicGenerator implements WorldGenerator{
             int mx = x % secSize, my = y % secSize;
             int sclx = x / secSize, scly = y / secSize;
             if(noise(sclx, scly, 0.2f, 1f) > 0.63f && noise(sclx, scly + 999, 200f, 1f) > 0.6f && (mx == 0 || my == 0 || mx == secSize - 1 || my == secSize - 1)){
-                if(Mathf.chance(noise(x + 0x231523, y, 40f, 1f))){
-                    floor = blocks[rand.random(0, blocks.length - 1)];
+                if(rand.chance(noise(x + 0x231523, y, 40f, 1f))){
+                    floor = floor1;
                     if(Mathf.dst(mx, my, secSize/2, secSize/2) > secSize/2f + 2){
-                        floor = Blocks.darkPanel4;
+                        floor = floor2;
                     }
                 }
 
-                if(block.solid && Mathf.chance(0.7)){
-                    block = Blocks.darkMetal;
+                if(block.solid && rand.chance(0.7)){
+                    block = wall;
                 }
             }
         });
@@ -164,7 +262,7 @@ public abstract class BasicGenerator implements WorldGenerator{
 
     public void scatter(Block target, Block dst, float chance){
         pass((x, y) -> {
-            if(!Mathf.chance(chance)) return;
+            if(!rand.chance(chance)) return;
             if(floor == target){
                 floor = dst;
             }else if(block == target){
@@ -215,7 +313,9 @@ public abstract class BasicGenerator implements WorldGenerator{
             read.set(write);
         }
 
-        tiles.each((x, y) -> tiles.get(x, y).setBlock(!read.get(x, y) ? Blocks.air : tiles.get(x, y).floor().wall));
+        for(var t : tiles){
+            t.setBlock(!read.get(t.x, t.y) ? Blocks.air : t.floor().wall);
+        }
     }
 
     protected float noise(float x, float y, double scl, double mag){
@@ -235,11 +335,99 @@ public abstract class BasicGenerator implements WorldGenerator{
             ore = tile.overlay();
             r.get(tile.x, tile.y);
             tile.setFloor(floor.asFloor());
-            tile.setBlock(block);
+            if(block != tile.block()) tile.setBlock(block);
             tile.setOverlay(ore);
         }
     }
 
+    public boolean nearWall(int x, int y){
+        for(Point2 p : Geometry.d8){
+            Tile other = tiles.get(x + p.x, y + p.y);
+            if(other != null && other.block() != Blocks.air){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean nearAir(int x, int y){
+        for(Point2 p : Geometry.d4){
+            Tile other = tiles.get(x + p.x, y + p.y);
+            if(other != null && other.block() == Blocks.air){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void removeWall(int cx, int cy, int rad, Boolf<Block> pred){
+        for(int x = -rad; x <= rad; x++){
+            for(int y = -rad; y <= rad; y++){
+                int wx = cx + x, wy = cy + y;
+                if(Structs.inBounds(wx, wy, width, height) && Mathf.within(x, y, rad)){
+                    Tile other = tiles.getn(wx, wy);
+                    if(pred.get(other.block())){
+                        other.setBlock(Blocks.air);
+                    }
+                }
+            }
+        }
+    }
+
+    public boolean near(int cx, int cy, int rad, Block block){
+        for(int x = -rad; x <= rad; x++){
+            for(int y = -rad; y <= rad; y++){
+                int wx = cx + x, wy = cy + y;
+                if(Structs.inBounds(wx, wy, width, height) && Mathf.within(x, y, rad)){
+                    Tile other = tiles.getn(wx, wy);
+                    if(other.block() == block){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public void decoration(float chance){
+        pass((x, y) -> {
+            for(int i = 0; i < 4; i++){
+                Tile near = world.tile(x + Geometry.d4[i].x, y + Geometry.d4[i].y);
+                if(near != null && near.block() != Blocks.air){
+                    return;
+                }
+            }
+
+            if(rand.chance(chance) && floor.asFloor().hasSurface() && block == Blocks.air){
+                block = floor.asFloor().decoration;
+            }
+        });
+    }
+
+    public void blend(Block floor, Block around, float radius){
+        float r2 = radius*radius;
+        int cap = Mathf.ceil(radius);
+        int max = tiles.width * tiles.height;
+        Floor dest = around.asFloor();
+
+        for(int i = 0; i < max; i++){
+            Tile tile = tiles.geti(i);
+            if(tile.floor() == floor || tile.block() == floor){
+                for(int cx = -cap; cx <= cap; cx++){
+                    for(int cy = -cap; cy <= cap; cy++){
+                        if(cx*cx + cy*cy <= r2){
+                            Tile other = tiles.get(tile.x + cx, tile.y + cy);
+
+                            if(other != null && other.floor() != floor){
+                                other.setFloor(dest);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     public void brush(Seq<Tile> path, int rad){
         path.each(tile -> erase(tile.x, tile.y, rad));
     }
@@ -256,7 +444,7 @@ public abstract class BasicGenerator implements WorldGenerator{
         }
     }
 
-    public Seq<Tile> pathfind(int startX, int startY, int endX, int endY, TileHueristic th, DistanceHeuristic dh){
+    public Seq<Tile> pathfind(int startX, int startY, int endX, int endY, TileHeuristic th, DistanceHeuristic dh){
         return Astar.pathfind(startX, startY, endX, endY, th, dh, tile -> world.getDarkness(tile.x, tile.y) <= 1f);
     }
 
diff --git a/core/src/mindustry/maps/generators/BlankPlanetGenerator.java b/core/src/mindustry/maps/generators/BlankPlanetGenerator.java
new file mode 100644
index 0000000000..1b8a4dc9ca
--- /dev/null
+++ b/core/src/mindustry/maps/generators/BlankPlanetGenerator.java
@@ -0,0 +1,43 @@
+package mindustry.maps.generators;
+
+import arc.graphics.*;
+import arc.math.geom.*;
+import mindustry.game.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+/** A planet generator that provides no weather, height, color or bases. Override generate().*/
+public class BlankPlanetGenerator extends PlanetGenerator{
+
+    @Override
+    public float getHeight(Vec3 position){
+        return 0;
+    }
+
+    @Override
+    public Color getColor(Vec3 position){
+        return Color.white;
+    }
+
+    @Override
+    public void generateSector(Sector sector){
+
+    }
+
+    @Override
+    public void addWeather(Sector sector, Rules rules){
+
+    }
+
+    @Override
+    public void generate(Tiles tiles, Sector sec, int seed){
+        this.tiles = tiles;
+        this.sector = sec;
+        this.rand.setSeed(sec.id + seed + baseSeed);
+
+        tiles.fill();
+
+        generate(tiles);
+    }
+
+}
diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java
index ebebd03877..da5f39fc8a 100644
--- a/core/src/mindustry/maps/generators/FileMapGenerator.java
+++ b/core/src/mindustry/maps/generators/FileMapGenerator.java
@@ -1,7 +1,7 @@
 package mindustry.maps.generators;
 
-import arc.math.*;
 import arc.math.geom.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.io.*;
@@ -17,31 +17,59 @@ public class FileMapGenerator implements WorldGenerator{
     public final SectorPreset preset;
 
     public FileMapGenerator(String mapName, SectorPreset preset){
-        this.map = maps != null ? maps.loadInternalMap(mapName) : null;
+        //try to look for the prefixed map first, then the mod-specific one
+        this.map = maps != null ? maps.loadInternalMap(
+            preset.minfo.mod == null || Vars.tree.get("maps/" + mapName + "." + mapExtension).exists() ?
+                mapName :
+                mapName.substring(1 + preset.minfo.mod.name.length())
+        ) : null;
+
         this.preset = preset;
     }
 
+    public FileMapGenerator(Map map, SectorPreset preset){
+        this.map = map;
+        this.preset = preset;
+    }
+
+    /** If you use this constructor, make sure to override generate()! */
+    public FileMapGenerator(SectorPreset preset){
+        this(emptyMap, preset);
+    }
+
     @Override
     public void generate(Tiles tiles){
         if(map == null) throw new RuntimeException("Generator has null map, cannot be used.");
 
+        Sector sector = state.rules.sector;
+
         world.setGenerating(false);
-        SaveIO.load(map.file, world.filterContext(map));
+        SaveIO.load(map.file, world.new FilterContext(map){
+            @Override
+            public Sector getSector(){
+                return sector;
+            }
+
+            @Override
+            public void end(){
+                applyFilters();
+                //no super.end(), don't call world load event twice
+            }
+
+            @Override
+            public boolean isMap(){
+                return true;
+            }
+        });
         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(Item content : items){
-                    if(Mathf.chance(0.2)){
-                        tile.build.items.add(content, Math.min(Mathf.random(500), tile.block().itemCapacity));
-                    }
-                }
-            }
+        //make sure sector is maintained - don't reset it after map load.
+        if(sector != null){
+            state.rules.sector = sector;
         }
 
+        tiles = world.tiles;
+
         boolean anyCores = false;
 
         for(Tile tile : tiles){
@@ -56,10 +84,13 @@ public class FileMapGenerator implements WorldGenerator{
             }
 
             if(tile.isCenter() && tile.block() instanceof CoreBlock && tile.team() == state.rules.defaultTeam && !anyCores){
-                Schematics.placeLaunchLoadout(tile.x, tile.y);
+                if(state.rules.sector != null && state.rules.sector.allowLaunchLoadout()){
+                    Schematics.placeLaunchLoadout(tile.x, tile.y);
+                }
                 anyCores = true;
 
-                if(preset.addStartingItems){
+                if(preset.addStartingItems || !preset.planet.allowLaunchLoadout){
+                    tile.build.items.clear();
                     tile.build.items.add(state.rules.loadout);
                 }
             }
diff --git a/core/src/mindustry/maps/generators/PlanetGenerator.java b/core/src/mindustry/maps/generators/PlanetGenerator.java
index d1cfe30bf5..a093a27df4 100644
--- a/core/src/mindustry/maps/generators/PlanetGenerator.java
+++ b/core/src/mindustry/maps/generators/PlanetGenerator.java
@@ -2,16 +2,25 @@ package mindustry.maps.generators;
 
 import arc.math.geom.*;
 import arc.struct.*;
+import arc.struct.ObjectIntMap.*;
+import arc.util.*;
 import arc.util.noise.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
 import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.type.*;
+import mindustry.type.Weather.*;
 import mindustry.world.*;
 
+import static mindustry.Vars.*;
+
 public abstract class PlanetGenerator extends BasicGenerator implements HexMesher{
-    protected IntSeq ints = new IntSeq();
-    protected Sector sector;
-    protected Simplex noise = new Simplex();
+    public int baseSeed = 0;
+    public int seed = 0;
+
+    protected @Nullable Sector sector;
 
     /** Should generate sector bases for a planet. */
     public void generateSector(Sector sector){
@@ -30,7 +39,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
                 if(sector.planet.getSector(other).id == sector.planet.startSector){
                     return;
                 }
-                
+
                 if(sector.planet.getSector(other).generateEnemyBase){
                     any = false;
                     break;
@@ -43,6 +52,75 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
         }
     }
 
+    /** @return whether to allow landing on the specified procedural sector */
+    public boolean allowLanding(Sector sector){
+        return sector.planet.allowLaunchToNumbered && (sector.hasBase() || sector.near().contains(Sector::hasBase));
+    }
+
+    /** @return whether to allow landing on the specified procedural sector */
+    public boolean allowAcceleratorLanding(Sector sector){
+        return sector.planet.allowLaunchToNumbered;
+    }
+
+    public void addWeather(Sector sector, Rules rules){
+
+        //apply weather based on terrain
+        ObjectIntMap<Block> floorc = new ObjectIntMap<>();
+        ObjectSet<UnlockableContent> content = new ObjectSet<>();
+
+        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()){
+                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 occurring < 30 times - unimportant
+        entries.removeAll(e -> e.value < 30);
+
+        Block[] floors = new Block[entries.size];
+        for(int i = 0; i < entries.size; i++){
+            floors[i] = entries.get(i).key;
+        }
+
+        //bad contains() code, but will likely never be fixed
+        boolean hasSnow = floors.length > 0 && (floors[0].name.contains("ice") || floors[0].name.contains("snow"));
+        boolean hasRain = floors.length > 0 && !hasSnow && content.contains(Liquids.water) && !floors[0].name.contains("sand");
+        boolean hasDesert = floors.length > 0 && !hasSnow && !hasRain && floors[0] == Blocks.sand;
+        boolean hasSpores = floors.length > 0 && (floors[0].name.contains("spore") || floors[0].name.contains("moss") || floors[0].name.contains("tainted"));
+
+        if(hasSnow){
+            rules.weather.add(new WeatherEntry(Weathers.snow));
+        }
+
+        if(hasRain){
+            rules.weather.add(new WeatherEntry(Weathers.rain));
+            rules.weather.add(new WeatherEntry(Weathers.fog));
+        }
+
+        if(hasDesert){
+            rules.weather.add(new WeatherEntry(Weathers.sandstorm));
+        }
+
+        if(hasSpores){
+            rules.weather.add(new WeatherEntry(Weathers.sporestorm));
+        }
+    }
+
     protected void genTile(Vec3 position, TileGen tile){
 
     }
@@ -50,22 +128,37 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
     @Override
     protected float noise(float x, float y, double octaves, double falloff, double scl, double mag){
         Vec3 v = sector.rect.project(x, y);
-        return (float)noise.octaveNoise3D(octaves, falloff, 1f / scl, v.x, v.y, v.z) * (float)mag;
+        return Simplex.noise3d(0, octaves, falloff, 1f / scl, v.x, v.y, v.z) * (float)mag;
     }
 
-    public void generate(Tiles tiles, Sector sec){
+    /** @return the scaling factor for sector rects. */
+    public float getSizeScl(){
+        return 3200;
+    }
+
+    public int getSectorSize(Sector sector){
+        int res = (int)(sector.rect.radius * getSizeScl());
+        return res % 2 == 0 ? res : res + 1;
+    }
+
+    public void generate(Tiles tiles, Sector sec, int seed){
         this.tiles = tiles;
+        this.seed = seed + baseSeed;
         this.sector = sec;
-        this.rand.setSeed(sec.id);
+        this.width = tiles.width;
+        this.height = tiles.height;
+        this.rand.setSeed(sec.id + seed + baseSeed);
 
         TileGen gen = new TileGen();
-        tiles.each((x, y) -> {
-            gen.reset();
-            Vec3 position = sector.rect.project(x / (float)tiles.width, y / (float)tiles.height);
+        for(int y = 0; y < height; y++){
+            for(int x = 0; x < width; x++){
+                gen.reset();
+                Vec3 position = sector.rect.project(x / (float)tiles.width, y / (float)tiles.height);
 
-            genTile(position, gen);
-            tiles.set(x, y, new Tile(x, y, gen.floor, gen.overlay, gen.block));
-        });
+                genTile(position, gen);
+                tiles.set(x, y, new Tile(x, y, gen.floor, gen.overlay, gen.block));
+            }
+        }
 
         generate(tiles);
     }
diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java
new file mode 100644
index 0000000000..991ae89be2
--- /dev/null
+++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java
@@ -0,0 +1,162 @@
+package mindustry.maps.planet;
+
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.noise.*;
+import mindustry.content.*;
+import mindustry.game.*;
+import mindustry.graphics.g3d.*;
+import mindustry.maps.generators.*;
+import mindustry.type.*;
+import mindustry.world.blocks.environment.*;
+
+import static mindustry.Vars.*;
+
+public class AsteroidGenerator extends BlankPlanetGenerator{
+    public int min = 20, max = 30, octaves = 2, foct = 3;
+    public float radMin = 12f, radMax = 60f, persistence = 0.4f, scale = 30f, mag = 0.46f, thresh = 1f;
+    public float fmag = 0.5f, fscl = 50f, fper = 0.6f;
+    public float stoneChance = 0f, iceChance = 0f, carbonChance = 0f, berylChance = 0f, ferricChance = 1f;
+
+    public float thoriumScl = 1f, copperScale = 1f, leadScale = 1f, graphiteScale = 1f, berylliumScale = 1f;
+
+    @Nullable Rand rand;
+    int seed;
+
+    {
+        defaultLoadout = Loadouts.basicNucleus;
+    }
+
+    void asteroid(int ax, int ay, int radius){
+        Floor floor = (
+            rand.chance(iceChance) ? Blocks.ice :
+            rand.chance(carbonChance) ? Blocks.carbonStone :
+            rand.chance(berylChance) ? Blocks.beryllicStone :
+            rand.chance(ferricChance) ? Blocks.ferricStone :
+            Blocks.stone
+        ).asFloor();
+
+        for(int x = ax - radius; x <= ax + radius; x++){
+            for(int y = ay - radius; y <= ay + radius; y++){
+                if(tiles.in(x, y) &&  Mathf.dst(x, y, ax, ay) / radius + Simplex.noise2d(seed, octaves, persistence, 1f / scale, x, y) * mag < thresh){
+                    tiles.getn(x, y).setFloor(floor);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void generate(){
+        seed = state.rules.sector.planet.id;
+        int sx = width/2, sy = height/2;
+        rand = new Rand(seed);
+
+        Floor background = Blocks.empty.asFloor();
+
+        tiles.eachTile(t -> t.setFloor(background));
+
+        //spawn asteroids
+        asteroid(sx, sy, rand.random(30, 50));
+
+        int amount = rand.random(min, max);
+        for(int i = 0; i < amount; i++){
+            float radius = rand.random(radMin, radMax), ax = rand.random(radius, width - radius), ay = rand.random(radius, height - radius);
+
+            asteroid((int)ax, (int)ay, (int)radius);
+        }
+
+        //tiny asteroids
+        int smalls = rand.random(min, max) * 3;
+        for(int i = 0; i < smalls; i++){
+            float radius = rand.random(1, 8), ax = rand.random(radius, width - radius), ay = rand.random(radius, height - radius);
+
+            asteroid((int)ax, (int)ay, (int)radius);
+        }
+
+        //random noise stone
+        pass((x, y) -> {
+            if(floor != background){
+                if(Ridged.noise2d(seed, x, y, foct, fper, 1f / fscl) - Ridged.noise2d(seed, x, y, 1, 1f, 5f)/2.7f > fmag){
+                    floor = Blocks.stone;
+                }
+            }
+        });
+
+        //walls at insides
+        pass((x, y) -> {
+            if(floor == background || Ridged.noise2d(seed + 1, x, y, 4, 0.7f, 1f / 60f) > 0.45f || Mathf.within(x, y, sx, sy, 20 + Ridged.noise2d(seed, x, y, 3, 0.5f, 1f / 30f) * 6f)) return;
+
+            int radius = 6;
+            for(int dx = x - radius; dx <= x + radius; dx++){
+                for(int dy = y - radius; dy <= y + radius; dy++){
+                    if(Mathf.within(dx, dy, x, y, radius + 0.0001f) && tiles.in(dx, dy) && tiles.getn(dx, dy).floor() == background){
+                        return;
+                    }
+                }
+            }
+
+            block = floor.asFloor().wall;
+        });
+
+        //random craters
+        pass((x, y) -> {
+            if(floor == Blocks.ferricStone && rand.chance(0.02)) floor = Blocks.ferricCraters;
+            if(floor == Blocks.stone && rand.chance(0.02)) floor = Blocks.craters;
+        });
+
+        decoration(0.017f);
+
+        //lead generates around stone walls
+        oreAround(Blocks.oreLead, Blocks.stoneWall, 3, 70f, 0.6f * leadScale);
+
+        //copper only generates on ferric stone
+        ore(Blocks.oreCopper, Blocks.ferricStone, 5f, 0.8f * copperScale);
+
+        //thorium only generates on beryllic stone and graphitic stone
+        ore(Blocks.oreThorium, Blocks.beryllicStone, 4f, 0.9f * thoriumScl);
+        ore(Blocks.oreThorium, Blocks.carbonStone, 4f, 0.9f * thoriumScl);
+
+        wallOre(Blocks.carbonWall, Blocks.graphiticWall, 35f, 0.57f * graphiteScale);
+
+        wallOre(Blocks.beryllicStoneWall, Blocks.wallOreBeryllium, 50f, 0.62f * berylliumScale);
+
+        //titanium
+        pass((x, y) -> {
+            if(floor != Blocks.stone) return;
+            int i = 4;
+
+            if(Math.abs(0.5f - noise(x, y + i*999 - x*1.5f, 2, 0.65, (60 + i * 2))) > 0.26f * 1f){
+                ore = Blocks.oreTitanium;
+            }
+        });
+
+        int spawnSide = rand.random(3);
+        int sizeOffset = width / 2 - 1;
+        tiles.getn(sizeOffset * Geometry.d8edge[spawnSide].x + width/2, sizeOffset * Geometry.d8edge[spawnSide].y + height/2).setOverlay(Blocks.spawn);
+
+        Schematics.placeLaunchLoadout(sx, sy);
+
+        state.rules.planetBackground = new PlanetParams(){{
+            planet = sector.planet;
+            zoom = 1f;
+            camPos = new Vec3(1.2388899f, 1.6047299f, 2.4758825f);
+        }};
+
+        state.rules.dragMultiplier = 0.7f; //yes, space actually has 0 drag but true 0% drag is very annoying
+        state.rules.borderDarkness = false;
+        state.rules.waves = true;
+
+        //TODO ???
+        //state.rules.hiddenBuildItems.addAll(Items.plastanium, Items.surgeAlloy);
+        //TODO maybe make this on by default everywhere
+        state.rules.showSpawns = true;
+        //TODO better wavegen, do it by hand even
+        state.rules.spawns = Waves.generate(0.5f, rand, false, true, false);
+    }
+
+    @Override
+    public int getSectorSize(Sector sector){
+        return 500;
+    }
+}
diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
new file mode 100644
index 0000000000..b79f744fdd
--- /dev/null
+++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
@@ -0,0 +1,445 @@
+package mindustry.maps.planet;
+
+import arc.graphics.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.noise.*;
+import mindustry.ai.*;
+import mindustry.content.*;
+import mindustry.game.*;
+import mindustry.maps.generators.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class ErekirPlanetGenerator extends PlanetGenerator{
+    public float heightScl = 0.9f, octaves = 8, persistence = 0.7f, heightPow = 3f, heightMult = 1.6f;
+
+    //TODO inline/remove
+    public static float arkThresh = 0.28f, arkScl = 0.83f;
+    public static int arkSeed = 7, arkOct = 2;
+    public static float liqThresh = 0.64f, liqScl = 87f, redThresh = 3.1f, noArkThresh = 0.3f;
+    public static int crystalSeed = 8, crystalOct = 2;
+    public static float crystalScl = 0.9f, crystalMag = 0.3f;
+    public static float airThresh = 0.13f, airScl = 14;
+
+    Block[] terrain = {Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.rhyolite, Blocks.carbonStone};
+
+    {
+        baseSeed = 2;
+        defaultLoadout = Loadouts.basicBastion;
+    }
+
+    @Override
+    public void generateSector(Sector sector){
+        //no bases right now
+    }
+
+    @Override
+    public float getHeight(Vec3 position){
+        return Mathf.pow(rawHeight(position), heightPow) * heightMult;
+    }
+
+    @Override
+    public Color getColor(Vec3 position){
+        Block block = getBlock(position);
+
+        //more obvious color
+        if(block == Blocks.crystallineStone) block = Blocks.crystalFloor;
+        //TODO this might be too green
+        //if(block == Blocks.beryllicStone) block = Blocks.arkyicStone;
+
+        return Tmp.c1.set(block.mapColor).a(1f - block.albedo);
+    }
+
+    @Override
+    public float getSizeScl(){
+        //TODO should sectors be 600, or 500 blocks?
+        return 2000 * 1.07f * 6f / 5f;
+    }
+
+    float rawHeight(Vec3 position){
+        return Simplex.noise3d(seed, octaves, persistence, 1f/heightScl, 10f + position.x, 10f + position.y, 10f + position.z);
+    }
+
+    float rawTemp(Vec3 position){
+        return position.dst(0, 0, 1)*2.2f - Simplex.noise3d(seed, 8, 0.54f, 1.4f, 10f + position.x, 10f + position.y, 10f + position.z) * 2.9f;
+    }
+
+    Block getBlock(Vec3 position){
+        float ice = rawTemp(position);
+        Tmp.v32.set(position);
+
+        float height = rawHeight(position);
+        Tmp.v31.set(position);
+        height *= 1.2f;
+        height = Mathf.clamp(height);
+
+        Block result = terrain[Mathf.clamp((int)(height * terrain.length), 0, terrain.length - 1)];
+
+        if(ice < 0.3 + Math.abs(Ridged.noise3d(seed + crystalSeed, position.x + 4f, position.y + 8f, position.z + 1f, crystalOct, crystalScl)) * crystalMag){
+            return Blocks.crystallineStone;
+        }
+
+        if(ice < 0.6){
+            if(result == Blocks.rhyolite || result == Blocks.yellowStone || result == Blocks.regolith){
+                //TODO bio(?) luminescent stuff? ice?
+                return Blocks.carbonStone; //TODO perhaps something else.
+            }
+        }
+
+        position = Tmp.v32;
+
+        //TODO tweak this to make it more natural
+        //TODO edge distortion?
+        if(ice < redThresh - noArkThresh && Ridged.noise3d(seed + arkSeed, position.x + 2f, position.y + 8f, position.z + 1f, arkOct, arkScl) > arkThresh){
+            //TODO arkyic in middle
+            result = Blocks.beryllicStone;
+        }
+
+        if(ice > redThresh){
+            result = Blocks.redStone;
+        }else if(ice > redThresh - 0.4f){
+            //TODO this may increase the amount of regolith, but it's too obvious a transition.
+            result = Blocks.regolith;
+        }
+
+        return result;
+    }
+
+    @Override
+    public void genTile(Vec3 position, TileGen tile){
+        tile.floor = getBlock(position);
+
+        if(tile.floor == Blocks.rhyolite && rand.chance(0.01)){
+            tile.floor = Blocks.rhyoliteCrater;
+        }
+
+        tile.block = tile.floor.asFloor().wall;
+
+        if(Ridged.noise3d(seed + 1, position.x, position.y, position.z, 2, airScl) > airThresh){
+            tile.block = Blocks.air;
+        }
+
+        //TODO only certain places should have carbon stone...
+        if(Ridged.noise3d(seed + 2, position.x, position.y + 4f, position.z, 3, 6f) > 0.6){
+            tile.floor = Blocks.carbonStone;
+        }
+    }
+
+    @Override
+    protected void generate(){
+        float temp = rawTemp(sector.tile.v);
+
+        if(temp > 0.7){
+
+            pass((x, y) -> {
+                if(floor != Blocks.redIce){
+                    float noise = noise(x + 782, y, 7, 0.8f, 280f, 1f);
+                    if(noise > 0.62f){
+                        if(noise > 0.635f){
+                            floor = Blocks.slag;
+                        }else{
+                            floor = Blocks.yellowStone;
+                        }
+                        ore = Blocks.air;
+                    }
+
+                    //TODO this needs to be tweaked
+                    if(noise > 0.55f && floor == Blocks.beryllicStone){
+                        floor = Blocks.yellowStone;
+                    }
+                }
+            });
+        }
+
+        cells(4);
+
+        //regolith walls for more dense terrain
+        pass((x, y) -> {
+            if(floor == Blocks.regolith && noise(x, y, 3, 0.4f, 13f, 1f) > 0.59f){
+                block = Blocks.regolithWall;
+            }
+        });
+
+        //TODO: yellow regolith biome tweaks
+        //TODO ice biome
+
+        float length = width/2.6f;
+        Vec2 trns = Tmp.v1.trns(rand.random(360f), length);
+        int
+        spawnX = (int)(trns.x + width/2f), spawnY = (int)(trns.y + height/2f),
+        endX = (int)(-trns.x + width/2f), endY = (int)(-trns.y + height/2f);
+        float maxd = Mathf.dst(width/2f, height/2f);
+
+        erase(spawnX, spawnY, 15);
+        brush(pathfind(spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 300f : 0f) + maxd - tile.dst(width/2f, height/2f)/10f, Astar.manhattan), 9);
+        erase(endX, endY, 15);
+
+        //arkycite
+        pass((x, y) -> {
+            if(floor != Blocks.beryllicStone) return;
+
+            //TODO bad
+            if(Math.abs(noise(x, y + 500f, 5, 0.6f, 40f, 1f) - 0.5f) < 0.09f){
+                floor = Blocks.arkyicStone;
+            }
+
+            if(nearWall(x, y)) return;
+
+            float noise = noise(x + 300, y - x*1.6f + 100, 4, 0.8f, liqScl, 1f);
+
+            if(noise > liqThresh){
+                floor = Blocks.arkyciteFloor;
+            }
+        });
+
+        median(2, 0.6, Blocks.arkyciteFloor);
+
+        blend(Blocks.arkyciteFloor, Blocks.arkyicStone, 4);
+
+        //TODO may overwrite floor blocks under walls and look bad
+        blend(Blocks.slag, Blocks.yellowStonePlates, 4);
+
+        distort(10f, 12f);
+        distort(5f, 7f);
+
+        //does arkycite need smoothing?
+        median(2, 0.6, Blocks.arkyciteFloor);
+
+        //smooth out slag to prevent random 1-tile patches
+        median(3, 0.6, Blocks.slag);
+
+        pass((x, y) -> {
+            //rough rhyolite
+            if(noise(x, y + 600 + x, 5, 0.86f, 60f, 1f) < 0.41f && floor == Blocks.rhyolite){
+                floor = Blocks.roughRhyolite;
+            }
+
+            if(floor == Blocks.slag && Mathf.within(x, y, spawnX, spawnY, 30f + noise(x, y, 2, 0.8f, 9f, 15f))){
+                floor = Blocks.yellowStonePlates;
+            }
+
+            if((floor == Blocks.arkyciteFloor || floor == Blocks.arkyicStone) && block.isStatic()){
+                block = Blocks.arkyicWall;
+            }
+
+            float max = 0;
+            for(Point2 p : Geometry.d8){
+                //TODO I think this is the cause of lag
+                max = Math.max(max, world.getDarkness(x + p.x, y + p.y));
+            }
+            if(max > 0){
+                block = floor.asFloor().wall;
+                if(block == Blocks.air) block = Blocks.yellowStoneWall;
+            }
+
+            if(floor == Blocks.yellowStonePlates && noise(x + 78 + y, y, 3, 0.8f, 6f, 1f) > 0.44f){
+                floor = Blocks.yellowStone;
+            }
+
+            if(floor == Blocks.redStone && noise(x + 78 - y, y, 4, 0.73f, 19f, 1f) > 0.63f){
+                floor = Blocks.denseRedStone;
+            }
+        });
+
+        inverseFloodFill(tiles.getn(spawnX, spawnY));
+
+        //TODO veins, blend after inverse flood fill?
+        blend(Blocks.redStoneWall, Blocks.denseRedStone, 4);
+
+        //make sure enemies have room
+        erase(endX, endY, 6);
+
+        //TODO enemies get stuck on 1x1 passages.
+
+        tiles.getn(endX, endY).setOverlay(Blocks.spawn);
+
+        //ores
+        pass((x, y) -> {
+
+            if(block != Blocks.air){
+                if(nearAir(x, y)){
+                    if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.52f){
+                        block = Blocks.graphiticWall;
+                    }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 38f, 1f) > 0.665f){
+                        ore = Blocks.wallOreBeryllium;
+                    }
+
+                }
+            }else if(!nearWall(x, y)){
+
+                if(noise(x + 150, y + x*2 + 100, 4, 0.8f, 55f, 1f) > 0.76f){
+                    ore = Blocks.oreTungsten;
+                }
+
+                //TODO design ore generation so it doesn't overlap
+                if(noise(x + 999, y + 600 - x, 4, 0.63f, 45f, 1f) < 0.27f && floor == Blocks.crystallineStone){
+                    ore = Blocks.oreCrystalThorium;
+                }
+
+            }
+
+            if(noise(x + 999, y + 600 - x, 5, 0.8f, 45f, 1f) < 0.44f && floor == Blocks.crystallineStone){
+                floor = Blocks.crystalFloor;
+            }
+
+            if(block == Blocks.air && (floor == Blocks.crystallineStone || floor == Blocks.crystalFloor) && rand.chance(0.09) && nearWall(x, y)
+                && !near(x, y, 4, Blocks.crystalCluster) && !near(x, y, 4, Blocks.vibrantCrystalCluster)){
+                block = floor == Blocks.crystalFloor ? Blocks.vibrantCrystalCluster : Blocks.crystalCluster;
+                ore = Blocks.air;
+            }
+
+            if(block == Blocks.arkyicWall && rand.chance(0.23) && nearAir(x, y) && !near(x, y, 3, Blocks.crystalOrbs)){
+                block = Blocks.crystalOrbs;
+                ore = Blocks.air;
+            }
+
+            //TODO test, different placement
+            //TODO this biome should have more blocks in general
+            if(block == Blocks.regolithWall && rand.chance(0.3) && nearAir(x, y) && !near(x, y, 3, Blocks.crystalBlocks)){
+                block = Blocks.crystalBlocks;
+                ore = Blocks.air;
+            }
+        });
+
+        //remove props near ores, they're too annoying
+        pass((x, y) -> {
+            if(ore.asFloor().wallOre || block.itemDrop != null || (block == Blocks.air && ore != Blocks.air)){
+                removeWall(x, y, 3, b -> b instanceof TallBlock);
+            }
+        });
+
+        trimDark();
+
+        int minVents = rand.random(6, 9);
+        int ventCount = 0;
+
+        //vents
+        outer:
+        for(Tile tile : tiles){
+            var floor = tile.floor();
+            if((floor == Blocks.rhyolite || floor == Blocks.roughRhyolite) && rand.chance(0.002)){
+                int radius = 2;
+                for(int x = -radius; x <= radius; x++){
+                    for(int y = -radius; y <= radius; y++){
+                        Tile other = tiles.get(x + tile.x, y + tile.y);
+                        if(other == null || (other.floor() != Blocks.rhyolite && other.floor() != Blocks.roughRhyolite) || other.block().solid){
+                            continue outer;
+                        }
+                    }
+                }
+
+                ventCount ++;
+                for(var pos : SteamVent.offsets){
+                    Tile other = tiles.get(pos.x + tile.x + 1, pos.y + tile.y + 1);
+                    other.setFloor(Blocks.rhyoliteVent.asFloor());
+                }
+            }
+        }
+
+        int iterations = 0;
+        int maxIterations = 5;
+
+        //try to add additional vents, but only several times to prevent infinite loops in bad maps
+        while(ventCount < minVents && iterations++ < maxIterations){
+            outer:
+            for(Tile tile : tiles){
+                if(rand.chance(0.00018 * (1 + iterations)) && !Mathf.within(tile.x, tile.y, spawnX, spawnY, 5f)){
+                    //skip crystals, but only when directly on them
+                    if(tile.floor() == Blocks.crystallineStone || tile.floor() == Blocks.crystalFloor){
+                        continue;
+                    }
+
+                    int radius = 1;
+                    for(int x = -radius; x <= radius; x++){
+                        for(int y = -radius; y <= radius; y++){
+                            Tile other = tiles.get(x + tile.x, y + tile.y);
+                            //skip solids / other vents / arkycite / slag
+                            if(other == null || other.block().solid || other.floor().attributes.get(Attribute.steam) != 0 || other.floor() == Blocks.slag || other.floor() == Blocks.arkyciteFloor){
+                                continue outer;
+                            }
+                        }
+                    }
+
+                    Block
+                    floor = Blocks.rhyolite,
+                    secondFloor = Blocks.rhyoliteCrater,
+                    vent = Blocks.rhyoliteVent;
+
+                    int xDir = 1;
+                    //set target material depending on what's encountered
+                    if(tile.floor() == Blocks.beryllicStone || tile.floor() == Blocks.arkyicStone){
+                        floor = secondFloor = Blocks.arkyicStone;
+                        vent = Blocks.arkyicVent;
+                    }else if(tile.floor() == Blocks.yellowStone || tile.floor() == Blocks.yellowStonePlates || tile.floor() == Blocks.regolith){
+                        floor = Blocks.yellowStone;
+                        secondFloor = Blocks.yellowStonePlates;
+                        vent = Blocks.yellowStoneVent;
+                    }else if(tile.floor() == Blocks.redStone || tile.floor() == Blocks.denseRedStone){
+                        floor = Blocks.denseRedStone;
+                        secondFloor = Blocks.redStone;
+                        vent = Blocks.redStoneVent;
+                        xDir = -1;
+                    }else if(tile.floor() == Blocks.carbonStone){
+                        floor = secondFloor = Blocks.carbonStone;
+                        vent = Blocks.carbonVent;
+                    }
+
+
+                    ventCount ++;
+                    for(var pos : SteamVent.offsets){
+                        Tile other = tiles.get(pos.x + tile.x + 1, pos.y + tile.y + 1);
+                        other.setFloor(vent.asFloor());
+                    }
+
+                    //"circle" for blending
+                    //TODO should it replace akrycite? slag?
+                    int crad = rand.random(6, 14), crad2 = crad * crad;
+                    for(int cx = -crad; cx <= crad; cx++){
+                        for(int cy = -crad; cy <= crad; cy++){
+                            int rx = cx + tile.x, ry = cy + tile.y;
+                            //skew circle Y
+                            float rcy = cy + cx*0.9f;
+                            if(cx*cx + rcy*rcy <= crad2 - noise(rx, ry + rx * 2f * xDir, 2, 0.7f, 8f, crad2 * 1.1f)){
+                                Tile dest = tiles.get(rx, ry);
+                                if(dest != null && dest.floor().attributes.get(Attribute.steam) == 0 && dest.floor() != Blocks.roughRhyolite && dest.floor() != Blocks.arkyciteFloor && dest.floor() != Blocks.slag){
+
+                                    dest.setFloor(rand.chance(0.08) ? secondFloor.asFloor() : floor.asFloor());
+
+                                    if(dest.block().isStatic()){
+                                        dest.setBlock(floor.asFloor().wall);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+
+        for(Tile tile : tiles){
+            if(tile.overlay().needsSurface && !tile.floor().hasSurface()){
+                tile.setOverlay(Blocks.air);
+            }
+        }
+
+        decoration(0.017f);
+
+        //it is very hot
+        state.rules.env = sector.planet.defaultEnv;
+        state.rules.placeRangeCheck = true;
+
+        //TODO remove slag and arkycite around core.
+        Schematics.placeLaunchLoadout(spawnX, spawnY);
+
+        //all sectors are wave sectors
+        state.rules.waves = false;
+        state.rules.showSpawns = true;
+    }
+}
diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
index cc0b1ea934..bcc797b6d0 100644
--- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
@@ -14,14 +14,18 @@ import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.maps.generators.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
 public class SerpuloPlanetGenerator extends PlanetGenerator{
-    RidgedPerlin rid = new RidgedPerlin(1, 2);
+    //alternate, less direct generation (wip)
+    public static boolean alt = false;
+
     BaseGenerator basegen = new BaseGenerator();
     float scl = 5f;
     float waterOffset = 0.07f;
+    boolean genLakes = false;
 
     Block[][] arr =
     {
@@ -32,11 +36,11 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
     {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.basalt, Blocks.basalt, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice},
-    {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.basalt, Blocks.moss, Blocks.basalt, Blocks.hotrock, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice},
+    {Blocks.deepTaintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.basalt, Blocks.moss, Blocks.basalt, Blocks.hotrock, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice},
     {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.moss, Blocks.sporeMoss, Blocks.snow, Blocks.basalt, Blocks.basalt, Blocks.ice, 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},
-    {Blocks.darksandTaintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.moss, Blocks.sporeMoss, Blocks.iceSnow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice},
+    {Blocks.deepTaintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice},
+    {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.moss, Blocks.sporeMoss, Blocks.iceSnow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice},
     {Blocks.darksandWater, Blocks.darksand, Blocks.snow, Blocks.ice, Blocks.iceSnow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice}
     };
 
@@ -56,7 +60,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
 
     float rawHeight(Vec3 position){
         position = Tmp.v33.set(position).scl(scl);
-        return (Mathf.pow((float)noise.octaveNoise3D(7, 0.5f, 1f/3f, position.x, position.y, position.z), 2.3f) + waterOffset) / (1f + waterOffset);
+        return (Mathf.pow(Simplex.noise3d(seed, 7, 0.5f, 1f/3f, position.x, position.y, position.z), 2.3f) + waterOffset) / (1f + waterOffset);
     }
 
     @Override
@@ -115,11 +119,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
         tile.floor = getBlock(position);
         tile.block = tile.floor.asFloor().wall;
 
-        //if(noise.octaveNoise3D(5, 0.6, 8.0, position.x, position.y, position.z) > 0.65){
-            //tile.block = Blocks.air;
-        //}
-
-        if(rid.getValue(position.x, position.y, position.z, 22) > 0.32){
+        if(Ridged.noise3d(seed + 1, position.x, position.y, position.z, 2, 22) > 0.31){
             tile.block = Blocks.air;
         }
     }
@@ -130,12 +130,12 @@ public class SerpuloPlanetGenerator 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.56, 1f/3f, position.x, position.y + 999f, position.z);
+        float tnoise = Simplex.noise3d(seed, 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);
 
-        float tar = (float)noise.octaveNoise3D(4, 0.55f, 1f/2f, position.x, position.y + 999f, position.z) * 0.3f + Tmp.v31.dst(0, 0, 1f) * 0.2f;
+        float tar = Simplex.noise3d(seed, 4, 0.55f, 1f/2f, position.x, position.y + 999f, position.z) * 0.3f + Tmp.v31.dst(0, 0, 1f) * 0.2f;
 
         Block res = arr[Mathf.clamp((int)(temp * arr.length), 0, arr[0].length - 1)][Mathf.clamp((int)(height * arr[0].length), 0, arr[0].length - 1)];
         if(tar > 0.5f){
@@ -148,7 +148,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
     @Override
     protected float noise(float x, float y, double octaves, double falloff, double scl, double mag){
         Vec3 v = sector.rect.project(x, y).scl(5f);
-        return (float)noise.octaveNoise3D(octaves, falloff, 1f / scl, v.x, v.y, v.z) * (float)mag;
+        return Simplex.noise3d(seed, octaves, falloff, 1f / scl, v.x, v.y, v.z) * (float)mag;
     }
 
     @Override
@@ -165,13 +165,75 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
                 connected.add(this);
             }
 
-            void connect(Room to){
-                if(connected.contains(to)) return;
+            void join(int x1, int y1, int x2, int y2){
+                float nscl = rand.random(100f, 140f) * 6f;
+                int stroke = rand.random(3, 9);
+                brush(pathfind(x1, y1, x2, y2, tile -> (tile.solid() ? 50f : 0f) + noise(tile.x, tile.y, 2, 0.4f, 1f / nscl) * 500, Astar.manhattan), stroke);
+            }
 
-                connected.add(to);
-                float nscl = rand.random(20f, 60f);
-                int stroke = rand.random(4, 12);
-                brush(pathfind(x, y, to.x, to.y, tile -> (tile.solid() ? 5f : 0f) + noise(tile.x, tile.y, 1, 1, 1f / nscl) * 60, Astar.manhattan), stroke);
+            void connect(Room to){
+                if(!connected.add(to) || to == this) return;
+
+                Vec2 midpoint = Tmp.v1.set(to.x, to.y).add(x, y).scl(0.5f);
+                rand.nextFloat();
+
+                if(alt){
+                    midpoint.add(Tmp.v2.set(1, 0f).setAngle(Angles.angle(to.x, to.y, x, y) + 90f * (rand.chance(0.5) ? 1f : -1f)).scl(Tmp.v1.dst(x, y) * 2f));
+                }else{
+                    //add randomized offset to avoid straight lines
+                    midpoint.add(Tmp.v2.setToRandomDirection(rand).scl(Tmp.v1.dst(x, y)));
+                }
+
+                midpoint.sub(width/2f, height/2f).limit(width / 2f / Mathf.sqrt3).add(width/2f, height/2f);
+
+                int mx = (int)midpoint.x, my = (int)midpoint.y;
+
+                join(x, y, mx, my);
+                join(mx, my, to.x, to.y);
+            }
+
+            void joinLiquid(int x1, int y1, int x2, int y2){
+                float nscl = rand.random(100f, 140f) * 6f;
+                int rad = rand.random(7, 11);
+                int avoid = 2 + rad;
+                var path = pathfind(x1, y1, x2, y2, tile -> (tile.solid() || !tile.floor().isLiquid ? 70f : 0f) + noise(tile.x, tile.y, 2, 0.4f, 1f / nscl) * 500, Astar.manhattan);
+                path.each(t -> {
+                    //don't place liquid paths near the core
+                    if(Mathf.dst2(t.x, t.y, x2, y2) <= avoid * avoid){
+                        return;
+                    }
+
+                    for(int x = -rad; x <= rad; x++){
+                        for(int y = -rad; y <= rad; y++){
+                            int wx = t.x + x, wy = t.y + y;
+                            if(Structs.inBounds(wx, wy, width, height) && Mathf.within(x, y, rad)){
+                                Tile other = tiles.getn(wx, wy);
+                                other.setBlock(Blocks.air);
+                                if(Mathf.within(x, y, rad - 1) && !other.floor().isLiquid){
+                                    Floor floor = other.floor();
+                                    //TODO does not respect tainted floors
+                                    other.setFloor((Floor)(floor == Blocks.sand || floor == Blocks.salt ? Blocks.sandWater : Blocks.darksandTaintedWater));
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+
+            void connectLiquid(Room to){
+                if(to == this) return;
+
+                Vec2 midpoint = Tmp.v1.set(to.x, to.y).add(x, y).scl(0.5f);
+                rand.nextFloat();
+
+                //add randomized offset to avoid straight lines
+                midpoint.add(Tmp.v2.setToRandomDirection(rand).scl(Tmp.v1.dst(x, y)));
+                midpoint.sub(width/2f, height/2f).limit(width / 2f / Mathf.sqrt3).add(width/2f, height/2f);
+
+                int mx = (int)midpoint.x, my = (int)midpoint.y;
+
+                joinLiquid(x, y, mx, my);
+                joinLiquid(mx, my, to.x, to.y);
             }
         }
 
@@ -223,7 +285,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
                 for(int j = 0; j < enemySpawns; j++){
                     float enemyOffset = rand.range(60f);
                     Tmp.v1.set(cx - width/2, cy - height/2).rotate(180f + enemyOffset).add(width/2, height/2);
-                    Room espawn = new Room((int)Tmp.v1.x, (int)Tmp.v1.y, rand.random(8, 15));
+                    Room espawn = new Room((int)Tmp.v1.x, (int)Tmp.v1.y, rand.random(8, 16));
                     roomseq.add(espawn);
                     enemies.add(espawn);
                 }
@@ -232,10 +294,12 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             }
         }
 
+        //clear radius around each room
         for(Room room : roomseq){
             erase(room.x, room.y, room.radius);
         }
 
+        //randomly connect rooms together
         int connections = rand.random(Math.max(rooms - 1, 1), rooms + 3);
         for(int i = 0; i < connections; i++){
             roomseq.random(rand).connect(roomseq.random(rand));
@@ -245,10 +309,107 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             spawn.connect(room);
         }
 
+        Room fspawn = spawn;
+
         cells(1);
+
+        int tlen = tiles.width * tiles.height;
+        int total = 0, waters = 0;
+
+        for(int i = 0; i < tlen; i++){
+            Tile tile = tiles.geti(i);
+            if(tile.block() == Blocks.air){
+                total ++;
+                if(tile.floor().liquidDrop == Liquids.water){
+                    waters ++;
+                }
+            }
+        }
+
+        boolean naval = (float)waters / total >= 0.19f;
+
+        //create water pathway if the map is flooded
+        if(naval){
+            for(Room room : enemies){
+                room.connectLiquid(spawn);
+            }
+        }
+
         distort(10f, 6f);
 
-        inverseFloodFill(tiles.getn(spawn.x, spawn.y));
+        //rivers
+        pass((x, y) -> {
+            if(block.solid) return;
+
+            Vec3 v = sector.rect.project(x, y);
+
+            float rr = Simplex.noise2d(sector.id, (float)2, 0.6f, 1f / 7f, x, y) * 0.1f;
+            float value = Ridged.noise3d(2, v.x, v.y, v.z, 1, 1f / 55f) + rr - rawHeight(v) * 0f;
+            float rrscl = rr * 44 - 2;
+
+            if(value > 0.17f && !Mathf.within(x, y, fspawn.x, fspawn.y, 12 + rrscl)){
+                boolean deep = value > 0.17f + 0.1f && !Mathf.within(x, y, fspawn.x, fspawn.y, 15 + rrscl);
+                boolean spore = floor != Blocks.sand && floor != Blocks.salt;
+                //do not place rivers on ice, they're frozen
+                //ignore pre-existing liquids
+                if(!(floor == Blocks.ice || floor == Blocks.iceSnow || floor == Blocks.snow || floor.asFloor().isLiquid)){
+                    floor = spore ?
+                        (deep ? Blocks.taintedWater : Blocks.darksandTaintedWater) :
+                        (deep ? Blocks.water :
+                            (floor == Blocks.sand || floor == Blocks.salt ? Blocks.sandWater : Blocks.darksandWater));
+                }
+            }
+        });
+
+        //shoreline setup
+        pass((x, y) -> {
+            int deepRadius = 3;
+
+            if(floor.asFloor().isLiquid && floor.asFloor().shallow){
+
+                for(int cx = -deepRadius; cx <= deepRadius; cx++){
+                    for(int cy = -deepRadius; cy <= deepRadius; cy++){
+                        if((cx) * (cx) + (cy) * (cy) <= deepRadius * deepRadius){
+                            int wx = cx + x, wy = cy + y;
+
+                            Tile tile = tiles.get(wx, wy);
+                            if(tile != null && (!tile.floor().isLiquid || tile.block() != Blocks.air)){
+                                //found something solid, skip replacing anything
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                floor = floor == Blocks.darksandTaintedWater ? Blocks.taintedWater : Blocks.water;
+            }
+        });
+
+        if(naval){
+            int deepRadius = 2;
+
+            //TODO code is very similar, but annoying to extract into a separate function
+            pass((x, y) -> {
+                if(floor.asFloor().isLiquid && !floor.asFloor().isDeep() && !floor.asFloor().shallow){
+
+                    for(int cx = -deepRadius; cx <= deepRadius; cx++){
+                        for(int cy = -deepRadius; cy <= deepRadius; cy++){
+                            if((cx) * (cx) + (cy) * (cy) <= deepRadius * deepRadius){
+                                int wx = cx + x, wy = cy + y;
+
+                                Tile tile = tiles.get(wx, wy);
+                                if(tile != null && (tile.floor().shallow || !tile.floor().isLiquid)){
+                                    //found something shallow, skip replacing anything
+                                    return;
+                                }
+                            }
+                        }
+                    }
+
+                    floor = floor == Blocks.water ? Blocks.deepwater : Blocks.taintedWater;
+                }
+            });
+        }
 
         Seq<Block> ores = Seq.with(Blocks.oreCopper, Blocks.oreLead);
         float poles = Math.abs(sector.tile.v.y);
@@ -256,15 +417,15 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
         float scl = 1f;
         float addscl = 1.3f;
 
-        if(noise.octaveNoise3D(2, 0.5, scl, sector.tile.v.x, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.25f*addscl){
+        if(Simplex.noise3d(seed, 2, 0.5, scl, sector.tile.v.x, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.25f*addscl){
             ores.add(Blocks.oreCoal);
         }
 
-        if(noise.octaveNoise3D(2, 0.5, scl, sector.tile.v.x + 1, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.5f*addscl){
+        if(Simplex.noise3d(seed, 2, 0.5, scl, sector.tile.v.x + 1, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.5f*addscl){
             ores.add(Blocks.oreTitanium);
         }
 
-        if(noise.octaveNoise3D(2, 0.5, scl, sector.tile.v.x + 2, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.7f*addscl){
+        if(Simplex.noise3d(seed, 2, 0.5, scl, sector.tile.v.x + 2, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.7f*addscl){
             ores.add(Blocks.oreThorium);
         }
 
@@ -300,6 +461,8 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
 
         median(2);
 
+        inverseFloodFill(tiles.getn(spawn.x, spawn.y));
+
         tech();
 
         pass((x, y) -> {
@@ -313,9 +476,8 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             //tar
             if(floor == Blocks.darksand){
                 if(Math.abs(0.5f - noise(x - 40, y, 2, 0.7, 80)) > 0.25f &&
-                Math.abs(0.5f - noise(x, y + sector.id*10, 1, 1, 60)) > 0.41f && !(roomseq.contains(r -> Mathf.within(x, y, r.x, r.y, 15)))){
+                Math.abs(0.5f - noise(x, y + sector.id*10, 1, 1, 60)) > 0.41f && !(roomseq.contains(r -> Mathf.within(x, y, r.x, r.y, 30)))){
                     floor = Blocks.tar;
-                    ore = Blocks.air;
                 }
             }
 
@@ -336,15 +498,14 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
                         floor = Blocks.magmarock;
                     }
                 }
-            }else if(floor != Blocks.basalt && floor != Blocks.ice && floor.asFloor().hasSurface()){
+            }else if(genLakes && floor != Blocks.basalt && floor != Blocks.ice && floor.asFloor().hasSurface()){
                 float noise = noise(x + 782, y, 5, 0.75f, 260f, 1f);
-                if(noise > 0.67f && !enemies.contains(e -> Mathf.within(x, y, e.x, e.y, 8))){
+                if(noise > 0.67f && !roomseq.contains(e -> Mathf.within(x, y, e.x, e.y, 14))){
                     if(noise > 0.72f){
                         floor = noise > 0.78f ? Blocks.taintedWater : (floor == Blocks.sand ? Blocks.sandWater : Blocks.darksandTaintedWater);
                     }else{
                         floor = (floor == Blocks.sand ? floor : Blocks.darksand);
                     }
-                    ore = Blocks.air;
                 }
             }
 
@@ -368,7 +529,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             //random stuff
             dec: {
                 for(int i = 0; i < 4; i++){
-                    Tile near = world.tile(x + Geometry.d4[i].x, y + Geometry.d4[i].y);
+                    Tile near = tiles.get(x + Geometry.d4[i].x, y + Geometry.d4[i].y);
                     if(near != null && near.block() != Blocks.air){
                         break dec;
                     }
@@ -381,11 +542,11 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
         });
 
         float difficulty = sector.threat;
-        ints.clear();
-        ints.ensureCapacity(width * height / 4);
-
         int ruinCount = rand.random(-2, 4);
+
         if(ruinCount > 0){
+            IntSeq ints = new IntSeq(width * height / 4);
+
             int padding = 25;
 
             //create list of potential positions
@@ -425,7 +586,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
                 }
 
                 //actually place the part
-                if(part != null && BaseGenerator.tryPlace(part, x, y, Team.derelict, (cx, cy) -> {
+                if(part != null && BaseGenerator.tryPlace(part, x, y, Team.derelict, rand, (cx, cy) -> {
                     Tile other = tiles.getn(cx, cy);
                     if(other.floor().hasSurface()){
                         other.setOverlay(Blocks.oreScrap);
@@ -459,6 +620,13 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             }
         }
 
+        //remove invalid ores
+        for(Tile tile : tiles){
+            if(tile.overlay().needsSurface && !tile.floor().hasSurface()){
+                tile.setOverlay(Blocks.air);
+            }
+        }
+
         Schematics.placeLaunchLoadout(spawn.x, spawn.y);
 
         for(Room espawn : enemies){
@@ -475,17 +643,24 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
 
         float waveTimeDec = 0.4f;
 
-        state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f) / 0.8f);
-        state.rules.waves = sector.info.waves = true;
+        state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f));
+        state.rules.waves = true;
+        state.rules.env = sector.planet.defaultEnv;
         state.rules.enemyCoreBuildRadius = 600f;
 
-        state.rules.spawns = Waves.generate(difficulty, new Rand(), state.rules.attackMode);
+        //spawn air only when spawn is blocked
+        state.rules.spawns = Waves.generate(difficulty, new Rand(sector.id), state.rules.attackMode, state.rules.attackMode && spawner.countGroundSpawns() == 0, naval);
     }
 
     @Override
     public void postGenerate(Tiles tiles){
         if(sector.hasEnemyBase()){
             basegen.postGenerate();
+
+            //spawn air enemies
+            if(spawner.countGroundSpawns() == 0){
+                state.rules.spawns = Waves.generate(sector.threat, new Rand(sector.id), state.rules.attackMode, true, false);
+            }
         }
     }
 }
diff --git a/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java b/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java
index d74f94e250..3bb73e9b11 100644
--- a/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java
@@ -3,13 +3,32 @@ package mindustry.maps.planet;
 import arc.graphics.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.util.*;
+import arc.util.noise.*;
 import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.maps.generators.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
 
 public class TantrosPlanetGenerator extends PlanetGenerator{
     Color c1 = Color.valueOf("5057a6"), c2 = Color.valueOf("272766"), out = new Color();
 
+    Block[][] arr = {
+    {Blocks.redmat, Blocks.redmat, Blocks.darksand, Blocks.bluemat, Blocks.bluemat}
+    };
+
+    {
+        baseSeed = 1;
+    }
+
+    @Override
+    public void generateSector(Sector sector){
+        //no bases
+    }
+
     @Override
     public float getHeight(Vec3 position){
         return 0;
@@ -17,16 +36,70 @@ public class TantrosPlanetGenerator extends PlanetGenerator{
 
     @Override
     public Color getColor(Vec3 position){
-        float depth = (float)noise.octaveNoise3D(2, 0.56, 1.7f, position.x, position.y, position.z) / 2f;
-        return c1.write(out).lerp(c2, Mathf.clamp(Mathf.round(depth, 0.15f))).a(0.6f);
+        float depth = Simplex.noise3d(seed, 2, 0.56, 1.7f, position.x, position.y, position.z) / 2f;
+        return c1.write(out).lerp(c2, Mathf.clamp(Mathf.round(depth, 0.15f))).a(0.2f);
+    }
+
+    @Override
+    public float getSizeScl(){
+        return 2000;
+    }
+
+    @Override
+    public void addWeather(Sector sector, Rules rules){
+        //no weather... yet
+    }
+
+    @Override
+    public void genTile(Vec3 position, TileGen tile){
+        tile.floor = getBlock(position);
+
+        if(tile.floor == Blocks.redmat && rand.chance(0.1)){
+            tile.block = Blocks.redweed;
+        }
+
+        if(tile.floor == Blocks.bluemat && rand.chance(0.03)){
+            tile.block = Blocks.purbush;
+        }
+
+        if(tile.floor == Blocks.bluemat && rand.chance(0.002)){
+            tile.block = Blocks.yellowCoral;
+        }
     }
 
     @Override
     protected void generate(){
         pass((x, y) -> {
-            floor = Blocks.deepwater;
+            float max = 0;
+            for(Point2 p : Geometry.d8){
+                max = Math.max(max, world.getDarkness(x + p.x, y + p.y));
+            }
+            if(max > 0){
+                block = floor.asFloor().wall;
+            }
+
+            if(noise(x, y, 40f, 1f) > 0.9){
+                //block = Blocks.coralChunk;
+            }
         });
 
         Schematics.placeLaunchLoadout(width / 2, height / 2);
     }
+
+    float rawHeight(Vec3 position){
+        return Simplex.noise3d(seed, 8, 0.7f, 1f, position.x, position.y, position.z);
+    }
+
+    Block getBlock(Vec3 position){
+        float height = rawHeight(position);
+        Tmp.v31.set(position);
+        position = Tmp.v33.set(position).scl(2f);
+        float temp = Simplex.noise3d(seed, 8, 0.6, 1f/2f, position.x, position.y + 99f, position.z);
+        height *= 1.2f;
+        height = Mathf.clamp(height);
+
+        //float tar = (float)noise.octaveNoise3D(4, 0.55f, 1f/2f, position.x, position.y + 999f, position.z) * 0.3f + Tmp.v31.dst(0, 0, 1f) * 0.2f;
+
+        return arr[Mathf.clamp((int)(temp * arr.length), 0, arr[0].length - 1)][Mathf.clamp((int)(height * arr[0].length), 0, arr[0].length - 1)];
+    }
 }
diff --git a/core/src/mindustry/mod/ClassLoaderCloser.java b/core/src/mindustry/mod/ClassLoaderCloser.java
new file mode 100644
index 0000000000..22710cc0a1
--- /dev/null
+++ b/core/src/mindustry/mod/ClassLoaderCloser.java
@@ -0,0 +1,13 @@
+package mindustry.mod;
+
+import java.net.*;
+
+public class ClassLoaderCloser{
+
+    /** Workaround for the close() method not being available on Android. */
+    public static void close(ClassLoader loader) throws Exception{
+        if(loader instanceof URLClassLoader u){
+            u.close();
+        }
+    }
+}
diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java
new file mode 100644
index 0000000000..df08419251
--- /dev/null
+++ b/core/src/mindustry/mod/ClassMap.java
@@ -0,0 +1,495 @@
+package mindustry.mod;
+
+import arc.struct.*;
+/** Generated class. Maps simple class names to concrete classes. For use in JSON mods. */
+@SuppressWarnings("deprecation")
+public class ClassMap{
+    public static final ObjectMap<String, Class<?>> classes = new ObjectMap<>();
+    
+    static{
+        classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class);
+        classes.put("BoostAI", mindustry.ai.types.BoostAI.class);
+        classes.put("BuilderAI", mindustry.ai.types.BuilderAI.class);
+        classes.put("CargoAI", mindustry.ai.types.CargoAI.class);
+        classes.put("CommandAI", mindustry.ai.types.CommandAI.class);
+        classes.put("DefenderAI", mindustry.ai.types.DefenderAI.class);
+        classes.put("FlyingAI", mindustry.ai.types.FlyingAI.class);
+        classes.put("FlyingFollowAI", mindustry.ai.types.FlyingFollowAI.class);
+        classes.put("GroundAI", mindustry.ai.types.GroundAI.class);
+        classes.put("HugAI", mindustry.ai.types.HugAI.class);
+        classes.put("LogicAI", mindustry.ai.types.LogicAI.class);
+        classes.put("MinerAI", mindustry.ai.types.MinerAI.class);
+        classes.put("MissileAI", mindustry.ai.types.MissileAI.class);
+        classes.put("RepairAI", mindustry.ai.types.RepairAI.class);
+        classes.put("SuicideAI", mindustry.ai.types.SuicideAI.class);
+        classes.put("Ability", mindustry.entities.abilities.Ability.class);
+        classes.put("ArmorPlateAbility", mindustry.entities.abilities.ArmorPlateAbility.class);
+        classes.put("EnergyFieldAbility", mindustry.entities.abilities.EnergyFieldAbility.class);
+        classes.put("ForceFieldAbility", mindustry.entities.abilities.ForceFieldAbility.class);
+        classes.put("LiquidExplodeAbility", mindustry.entities.abilities.LiquidExplodeAbility.class);
+        classes.put("LiquidRegenAbility", mindustry.entities.abilities.LiquidRegenAbility.class);
+        classes.put("MoveEffectAbility", mindustry.entities.abilities.MoveEffectAbility.class);
+        classes.put("MoveLightningAbility", mindustry.entities.abilities.MoveLightningAbility.class);
+        classes.put("RegenAbility", mindustry.entities.abilities.RegenAbility.class);
+        classes.put("RepairFieldAbility", mindustry.entities.abilities.RepairFieldAbility.class);
+        classes.put("ShieldArcAbility", mindustry.entities.abilities.ShieldArcAbility.class);
+        classes.put("ShieldRegenFieldAbility", mindustry.entities.abilities.ShieldRegenFieldAbility.class);
+        classes.put("SpawnDeathAbility", mindustry.entities.abilities.SpawnDeathAbility.class);
+        classes.put("StatusFieldAbility", mindustry.entities.abilities.StatusFieldAbility.class);
+        classes.put("SuppressionFieldAbility", mindustry.entities.abilities.SuppressionFieldAbility.class);
+        classes.put("UnitSpawnAbility", mindustry.entities.abilities.UnitSpawnAbility.class);
+        classes.put("ArtilleryBulletType", mindustry.entities.bullet.ArtilleryBulletType.class);
+        classes.put("BasicBulletType", mindustry.entities.bullet.BasicBulletType.class);
+        classes.put("BombBulletType", mindustry.entities.bullet.BombBulletType.class);
+        classes.put("BulletType", mindustry.entities.bullet.BulletType.class);
+        classes.put("ContinuousBulletType", mindustry.entities.bullet.ContinuousBulletType.class);
+        classes.put("ContinuousFlameBulletType", mindustry.entities.bullet.ContinuousFlameBulletType.class);
+        classes.put("ContinuousLaserBulletType", mindustry.entities.bullet.ContinuousLaserBulletType.class);
+        classes.put("EmpBulletType", mindustry.entities.bullet.EmpBulletType.class);
+        classes.put("ExplosionBulletType", mindustry.entities.bullet.ExplosionBulletType.class);
+        classes.put("FireBulletType", mindustry.entities.bullet.FireBulletType.class);
+        classes.put("FlakBulletType", mindustry.entities.bullet.FlakBulletType.class);
+        classes.put("LaserBoltBulletType", mindustry.entities.bullet.LaserBoltBulletType.class);
+        classes.put("LaserBulletType", mindustry.entities.bullet.LaserBulletType.class);
+        classes.put("LightningBulletType", mindustry.entities.bullet.LightningBulletType.class);
+        classes.put("LiquidBulletType", mindustry.entities.bullet.LiquidBulletType.class);
+        classes.put("MassDriverBolt", mindustry.entities.bullet.MassDriverBolt.class);
+        classes.put("MissileBulletType", mindustry.entities.bullet.MissileBulletType.class);
+        classes.put("PointBulletType", mindustry.entities.bullet.PointBulletType.class);
+        classes.put("PointLaserBulletType", mindustry.entities.bullet.PointLaserBulletType.class);
+        classes.put("RailBulletType", mindustry.entities.bullet.RailBulletType.class);
+        classes.put("SapBulletType", mindustry.entities.bullet.SapBulletType.class);
+        classes.put("ShrapnelBulletType", mindustry.entities.bullet.ShrapnelBulletType.class);
+        classes.put("SpaceLiquidBulletType", mindustry.entities.bullet.SpaceLiquidBulletType.class);
+        classes.put("ExplosionEffect", mindustry.entities.effect.ExplosionEffect.class);
+        classes.put("MultiEffect", mindustry.entities.effect.MultiEffect.class);
+        classes.put("ParticleEffect", mindustry.entities.effect.ParticleEffect.class);
+        classes.put("RadialEffect", mindustry.entities.effect.RadialEffect.class);
+        classes.put("SeqEffect", mindustry.entities.effect.SeqEffect.class);
+        classes.put("SoundEffect", mindustry.entities.effect.SoundEffect.class);
+        classes.put("WaveEffect", mindustry.entities.effect.WaveEffect.class);
+        classes.put("WrapEffect", mindustry.entities.effect.WrapEffect.class);
+        classes.put("DrawPart", mindustry.entities.part.DrawPart.class);
+        classes.put("PartFunc", mindustry.entities.part.DrawPart.PartFunc.class);
+        classes.put("PartMove", mindustry.entities.part.DrawPart.PartMove.class);
+        classes.put("PartParams", mindustry.entities.part.DrawPart.PartParams.class);
+        classes.put("PartProgress", mindustry.entities.part.DrawPart.PartProgress.class);
+        classes.put("FlarePart", mindustry.entities.part.FlarePart.class);
+        classes.put("HaloPart", mindustry.entities.part.HaloPart.class);
+        classes.put("HoverPart", mindustry.entities.part.HoverPart.class);
+        classes.put("RegionPart", mindustry.entities.part.RegionPart.class);
+        classes.put("ShapePart", mindustry.entities.part.ShapePart.class);
+        classes.put("ShootAlternate", mindustry.entities.pattern.ShootAlternate.class);
+        classes.put("ShootBarrel", mindustry.entities.pattern.ShootBarrel.class);
+        classes.put("ShootHelix", mindustry.entities.pattern.ShootHelix.class);
+        classes.put("ShootMulti", mindustry.entities.pattern.ShootMulti.class);
+        classes.put("ShootPattern", mindustry.entities.pattern.ShootPattern.class);
+        classes.put("BulletHandler", mindustry.entities.pattern.ShootPattern.BulletHandler.class);
+        classes.put("ShootSine", mindustry.entities.pattern.ShootSine.class);
+        classes.put("ShootSpread", mindustry.entities.pattern.ShootSpread.class);
+        classes.put("ShootSummon", mindustry.entities.pattern.ShootSummon.class);
+        classes.put("Objectives", mindustry.game.Objectives.class);
+        classes.put("Objective", mindustry.game.Objectives.Objective.class);
+        classes.put("OnPlanet", mindustry.game.Objectives.OnPlanet.class);
+        classes.put("OnSector", mindustry.game.Objectives.OnSector.class);
+        classes.put("Produce", mindustry.game.Objectives.Produce.class);
+        classes.put("Research", mindustry.game.Objectives.Research.class);
+        classes.put("SectorComplete", mindustry.game.Objectives.SectorComplete.class);
+        classes.put("AmmoType", mindustry.type.AmmoType.class);
+        classes.put("Category", mindustry.type.Category.class);
+        classes.put("CellLiquid", mindustry.type.CellLiquid.class);
+        classes.put("ErrorContent", mindustry.type.ErrorContent.class);
+        classes.put("Item", mindustry.type.Item.class);
+        classes.put("ItemSeq", mindustry.type.ItemSeq.class);
+        classes.put("ItemStack", mindustry.type.ItemStack.class);
+        classes.put("Liquid", mindustry.type.Liquid.class);
+        classes.put("LiquidStack", mindustry.type.LiquidStack.class);
+        classes.put("MapLocales", mindustry.type.MapLocales.class);
+        classes.put("PayloadSeq", mindustry.type.PayloadSeq.class);
+        classes.put("PayloadStack", mindustry.type.PayloadStack.class);
+        classes.put("Planet", mindustry.type.Planet.class);
+        classes.put("Publishable", mindustry.type.Publishable.class);
+        classes.put("Sector", mindustry.type.Sector.class);
+        classes.put("SectorRect", mindustry.type.Sector.SectorRect.class);
+        classes.put("SectorPreset", mindustry.type.SectorPreset.class);
+        classes.put("StatusEffect", mindustry.type.StatusEffect.class);
+        classes.put("TransitionHandler", mindustry.type.StatusEffect.TransitionHandler.class);
+        classes.put("TeamEntry", mindustry.type.TeamEntry.class);
+        classes.put("UnitType", mindustry.type.UnitType.class);
+        classes.put("UnitEngine", mindustry.type.UnitType.UnitEngine.class);
+        classes.put("Weapon", mindustry.type.Weapon.class);
+        classes.put("Weather", mindustry.type.Weather.class);
+        classes.put("WeatherEntry", mindustry.type.Weather.WeatherEntry.class);
+        classes.put("ItemAmmoType", mindustry.type.ammo.ItemAmmoType.class);
+        classes.put("PowerAmmoType", mindustry.type.ammo.PowerAmmoType.class);
+        classes.put("ErekirUnitType", mindustry.type.unit.ErekirUnitType.class);
+        classes.put("MissileUnitType", mindustry.type.unit.MissileUnitType.class);
+        classes.put("NeoplasmUnitType", mindustry.type.unit.NeoplasmUnitType.class);
+        classes.put("TankUnitType", mindustry.type.unit.TankUnitType.class);
+        classes.put("BuildWeapon", mindustry.type.weapons.BuildWeapon.class);
+        classes.put("PointDefenseWeapon", mindustry.type.weapons.PointDefenseWeapon.class);
+        classes.put("RepairBeamWeapon", mindustry.type.weapons.RepairBeamWeapon.class);
+        classes.put("HealBeamMount", mindustry.type.weapons.RepairBeamWeapon.HealBeamMount.class);
+        classes.put("MagneticStorm", mindustry.type.weather.MagneticStorm.class);
+        classes.put("ParticleWeather", mindustry.type.weather.ParticleWeather.class);
+        classes.put("RainWeather", mindustry.type.weather.RainWeather.class);
+        classes.put("SolarFlare", mindustry.type.weather.SolarFlare.class);
+        classes.put("Attributes", mindustry.world.blocks.Attributes.class);
+        classes.put("Autotiler", mindustry.world.blocks.Autotiler.class);
+        classes.put("AutotilerHolder", mindustry.world.blocks.Autotiler.AutotilerHolder.class);
+        classes.put("SliceMode", mindustry.world.blocks.Autotiler.SliceMode.class);
+        classes.put("ConstructBlock", mindustry.world.blocks.ConstructBlock.class);
+        classes.put("ConstructBuild", mindustry.world.blocks.ConstructBlock.ConstructBuild.class);
+        classes.put("ControlBlock", mindustry.world.blocks.ControlBlock.class);
+        classes.put("ExplosionShield", mindustry.world.blocks.ExplosionShield.class);
+        classes.put("ItemSelection", mindustry.world.blocks.ItemSelection.class);
+        classes.put("RotBlock", mindustry.world.blocks.RotBlock.class);
+        classes.put("UnitTetherBlock", mindustry.world.blocks.UnitTetherBlock.class);
+        classes.put("Accelerator", mindustry.world.blocks.campaign.Accelerator.class);
+        classes.put("AcceleratorBuild", mindustry.world.blocks.campaign.Accelerator.AcceleratorBuild.class);
+        classes.put("LaunchPad", mindustry.world.blocks.campaign.LaunchPad.class);
+        classes.put("LaunchPadBuild", mindustry.world.blocks.campaign.LaunchPad.LaunchPadBuild.class);
+        classes.put("AutoDoor", mindustry.world.blocks.defense.AutoDoor.class);
+        classes.put("AutoDoorBuild", mindustry.world.blocks.defense.AutoDoor.AutoDoorBuild.class);
+        classes.put("BaseShield", mindustry.world.blocks.defense.BaseShield.class);
+        classes.put("BaseShieldBuild", mindustry.world.blocks.defense.BaseShield.BaseShieldBuild.class);
+        classes.put("BuildTurret", mindustry.world.blocks.defense.BuildTurret.class);
+        classes.put("BuildTurretBuild", mindustry.world.blocks.defense.BuildTurret.BuildTurretBuild.class);
+        classes.put("DirectionalForceProjector", mindustry.world.blocks.defense.DirectionalForceProjector.class);
+        classes.put("DirectionalForceProjectorBuild", mindustry.world.blocks.defense.DirectionalForceProjector.DirectionalForceProjectorBuild.class);
+        classes.put("Door", mindustry.world.blocks.defense.Door.class);
+        classes.put("DoorBuild", mindustry.world.blocks.defense.Door.DoorBuild.class);
+        classes.put("ForceProjector", mindustry.world.blocks.defense.ForceProjector.class);
+        classes.put("ForceBuild", mindustry.world.blocks.defense.ForceProjector.ForceBuild.class);
+        classes.put("MendProjector", mindustry.world.blocks.defense.MendProjector.class);
+        classes.put("MendBuild", mindustry.world.blocks.defense.MendProjector.MendBuild.class);
+        classes.put("OverdriveProjector", mindustry.world.blocks.defense.OverdriveProjector.class);
+        classes.put("OverdriveBuild", mindustry.world.blocks.defense.OverdriveProjector.OverdriveBuild.class);
+        classes.put("Radar", mindustry.world.blocks.defense.Radar.class);
+        classes.put("RadarBuild", mindustry.world.blocks.defense.Radar.RadarBuild.class);
+        classes.put("RegenProjector", mindustry.world.blocks.defense.RegenProjector.class);
+        classes.put("RegenProjectorBuild", mindustry.world.blocks.defense.RegenProjector.RegenProjectorBuild.class);
+        classes.put("ShieldWall", mindustry.world.blocks.defense.ShieldWall.class);
+        classes.put("ShieldWallBuild", mindustry.world.blocks.defense.ShieldWall.ShieldWallBuild.class);
+        classes.put("ShockMine", mindustry.world.blocks.defense.ShockMine.class);
+        classes.put("ShockMineBuild", mindustry.world.blocks.defense.ShockMine.ShockMineBuild.class);
+        classes.put("ShockwaveTower", mindustry.world.blocks.defense.ShockwaveTower.class);
+        classes.put("ShockwaveTowerBuild", mindustry.world.blocks.defense.ShockwaveTower.ShockwaveTowerBuild.class);
+        classes.put("Thruster", mindustry.world.blocks.defense.Thruster.class);
+        classes.put("ThrusterBuild", mindustry.world.blocks.defense.Thruster.ThrusterBuild.class);
+        classes.put("Wall", mindustry.world.blocks.defense.Wall.class);
+        classes.put("WallBuild", mindustry.world.blocks.defense.Wall.WallBuild.class);
+        classes.put("BaseTurret", mindustry.world.blocks.defense.turrets.BaseTurret.class);
+        classes.put("BaseTurretBuild", mindustry.world.blocks.defense.turrets.BaseTurret.BaseTurretBuild.class);
+        classes.put("ContinuousLiquidTurret", mindustry.world.blocks.defense.turrets.ContinuousLiquidTurret.class);
+        classes.put("ContinuousLiquidTurretBuild", mindustry.world.blocks.defense.turrets.ContinuousLiquidTurret.ContinuousLiquidTurretBuild.class);
+        classes.put("ContinuousTurret", mindustry.world.blocks.defense.turrets.ContinuousTurret.class);
+        classes.put("ContinuousTurretBuild", mindustry.world.blocks.defense.turrets.ContinuousTurret.ContinuousTurretBuild.class);
+        classes.put("ItemTurret", mindustry.world.blocks.defense.turrets.ItemTurret.class);
+        classes.put("ItemEntry", mindustry.world.blocks.defense.turrets.ItemTurret.ItemEntry.class);
+        classes.put("ItemTurretBuild", mindustry.world.blocks.defense.turrets.ItemTurret.ItemTurretBuild.class);
+        classes.put("LaserTurret", mindustry.world.blocks.defense.turrets.LaserTurret.class);
+        classes.put("LaserTurretBuild", mindustry.world.blocks.defense.turrets.LaserTurret.LaserTurretBuild.class);
+        classes.put("LiquidTurret", mindustry.world.blocks.defense.turrets.LiquidTurret.class);
+        classes.put("LiquidTurretBuild", mindustry.world.blocks.defense.turrets.LiquidTurret.LiquidTurretBuild.class);
+        classes.put("PayloadAmmoTurret", mindustry.world.blocks.defense.turrets.PayloadAmmoTurret.class);
+        classes.put("PayloadTurretBuild", mindustry.world.blocks.defense.turrets.PayloadAmmoTurret.PayloadTurretBuild.class);
+        classes.put("PointDefenseTurret", mindustry.world.blocks.defense.turrets.PointDefenseTurret.class);
+        classes.put("PointDefenseBuild", mindustry.world.blocks.defense.turrets.PointDefenseTurret.PointDefenseBuild.class);
+        classes.put("PowerTurret", mindustry.world.blocks.defense.turrets.PowerTurret.class);
+        classes.put("PowerTurretBuild", mindustry.world.blocks.defense.turrets.PowerTurret.PowerTurretBuild.class);
+        classes.put("ReloadTurret", mindustry.world.blocks.defense.turrets.ReloadTurret.class);
+        classes.put("ReloadTurretBuild", mindustry.world.blocks.defense.turrets.ReloadTurret.ReloadTurretBuild.class);
+        classes.put("TractorBeamTurret", mindustry.world.blocks.defense.turrets.TractorBeamTurret.class);
+        classes.put("TractorBeamBuild", mindustry.world.blocks.defense.turrets.TractorBeamTurret.TractorBeamBuild.class);
+        classes.put("Turret", mindustry.world.blocks.defense.turrets.Turret.class);
+        classes.put("AmmoEntry", mindustry.world.blocks.defense.turrets.Turret.AmmoEntry.class);
+        classes.put("BulletEntry", mindustry.world.blocks.defense.turrets.Turret.BulletEntry.class);
+        classes.put("TurretBuild", mindustry.world.blocks.defense.turrets.Turret.TurretBuild.class);
+        classes.put("ArmoredConveyor", mindustry.world.blocks.distribution.ArmoredConveyor.class);
+        classes.put("ArmoredConveyorBuild", mindustry.world.blocks.distribution.ArmoredConveyor.ArmoredConveyorBuild.class);
+        classes.put("BufferedItemBridge", mindustry.world.blocks.distribution.BufferedItemBridge.class);
+        classes.put("BufferedItemBridgeBuild", mindustry.world.blocks.distribution.BufferedItemBridge.BufferedItemBridgeBuild.class);
+        classes.put("ChainedBuilding", mindustry.world.blocks.distribution.ChainedBuilding.class);
+        classes.put("Conveyor", mindustry.world.blocks.distribution.Conveyor.class);
+        classes.put("ConveyorBuild", mindustry.world.blocks.distribution.Conveyor.ConveyorBuild.class);
+        classes.put("DirectionBridge", mindustry.world.blocks.distribution.DirectionBridge.class);
+        classes.put("DirectionBridgeBuild", mindustry.world.blocks.distribution.DirectionBridge.DirectionBridgeBuild.class);
+        classes.put("DirectionLiquidBridge", mindustry.world.blocks.distribution.DirectionLiquidBridge.class);
+        classes.put("DuctBridgeBuild", mindustry.world.blocks.distribution.DirectionLiquidBridge.DuctBridgeBuild.class);
+        classes.put("DirectionalUnloader", mindustry.world.blocks.distribution.DirectionalUnloader.class);
+        classes.put("DirectionalUnloaderBuild", mindustry.world.blocks.distribution.DirectionalUnloader.DirectionalUnloaderBuild.class);
+        classes.put("Duct", mindustry.world.blocks.distribution.Duct.class);
+        classes.put("DuctBuild", mindustry.world.blocks.distribution.Duct.DuctBuild.class);
+        classes.put("DuctBridge", mindustry.world.blocks.distribution.DuctBridge.class);
+        classes.put("DuctBridgeBuild", mindustry.world.blocks.distribution.DuctBridge.DuctBridgeBuild.class);
+        classes.put("DuctRouter", mindustry.world.blocks.distribution.DuctRouter.class);
+        classes.put("DuctRouterBuild", mindustry.world.blocks.distribution.DuctRouter.DuctRouterBuild.class);
+        classes.put("ItemBridge", mindustry.world.blocks.distribution.ItemBridge.class);
+        classes.put("ItemBridgeBuild", mindustry.world.blocks.distribution.ItemBridge.ItemBridgeBuild.class);
+        classes.put("Junction", mindustry.world.blocks.distribution.Junction.class);
+        classes.put("JunctionBuild", mindustry.world.blocks.distribution.Junction.JunctionBuild.class);
+        classes.put("MassDriver", mindustry.world.blocks.distribution.MassDriver.class);
+        classes.put("DriverBulletData", mindustry.world.blocks.distribution.MassDriver.DriverBulletData.class);
+        classes.put("DriverState", mindustry.world.blocks.distribution.MassDriver.DriverState.class);
+        classes.put("MassDriverBuild", mindustry.world.blocks.distribution.MassDriver.MassDriverBuild.class);
+        classes.put("OverflowDuct", mindustry.world.blocks.distribution.OverflowDuct.class);
+        classes.put("OverflowDuctBuild", mindustry.world.blocks.distribution.OverflowDuct.OverflowDuctBuild.class);
+        classes.put("OverflowGate", mindustry.world.blocks.distribution.OverflowGate.class);
+        classes.put("OverflowGateBuild", mindustry.world.blocks.distribution.OverflowGate.OverflowGateBuild.class);
+        classes.put("Router", mindustry.world.blocks.distribution.Router.class);
+        classes.put("RouterBuild", mindustry.world.blocks.distribution.Router.RouterBuild.class);
+        classes.put("Sorter", mindustry.world.blocks.distribution.Sorter.class);
+        classes.put("SorterBuild", mindustry.world.blocks.distribution.Sorter.SorterBuild.class);
+        classes.put("StackConveyor", mindustry.world.blocks.distribution.StackConveyor.class);
+        classes.put("StackConveyorBuild", mindustry.world.blocks.distribution.StackConveyor.StackConveyorBuild.class);
+        classes.put("StackRouter", mindustry.world.blocks.distribution.StackRouter.class);
+        classes.put("StackRouterBuild", mindustry.world.blocks.distribution.StackRouter.StackRouterBuild.class);
+        classes.put("AirBlock", mindustry.world.blocks.environment.AirBlock.class);
+        classes.put("Cliff", mindustry.world.blocks.environment.Cliff.class);
+        classes.put("EmptyFloor", mindustry.world.blocks.environment.EmptyFloor.class);
+        classes.put("Floor", mindustry.world.blocks.environment.Floor.class);
+        classes.put("UpdateRenderState", mindustry.world.blocks.environment.Floor.UpdateRenderState.class);
+        classes.put("OreBlock", mindustry.world.blocks.environment.OreBlock.class);
+        classes.put("OverlayFloor", mindustry.world.blocks.environment.OverlayFloor.class);
+        classes.put("Prop", mindustry.world.blocks.environment.Prop.class);
+        classes.put("RemoveOre", mindustry.world.blocks.environment.RemoveOre.class);
+        classes.put("RemoveWall", mindustry.world.blocks.environment.RemoveWall.class);
+        classes.put("SeaBush", mindustry.world.blocks.environment.SeaBush.class);
+        classes.put("Seaweed", mindustry.world.blocks.environment.Seaweed.class);
+        classes.put("ShallowLiquid", mindustry.world.blocks.environment.ShallowLiquid.class);
+        classes.put("SpawnBlock", mindustry.world.blocks.environment.SpawnBlock.class);
+        classes.put("StaticTree", mindustry.world.blocks.environment.StaticTree.class);
+        classes.put("StaticWall", mindustry.world.blocks.environment.StaticWall.class);
+        classes.put("SteamVent", mindustry.world.blocks.environment.SteamVent.class);
+        classes.put("TallBlock", mindustry.world.blocks.environment.TallBlock.class);
+        classes.put("TreeBlock", mindustry.world.blocks.environment.TreeBlock.class);
+        classes.put("WobbleProp", mindustry.world.blocks.environment.WobbleProp.class);
+        classes.put("HeatBlock", mindustry.world.blocks.heat.HeatBlock.class);
+        classes.put("HeatConductor", mindustry.world.blocks.heat.HeatConductor.class);
+        classes.put("HeatConductorBuild", mindustry.world.blocks.heat.HeatConductor.HeatConductorBuild.class);
+        classes.put("HeatConsumer", mindustry.world.blocks.heat.HeatConsumer.class);
+        classes.put("HeatProducer", mindustry.world.blocks.heat.HeatProducer.class);
+        classes.put("HeatProducerBuild", mindustry.world.blocks.heat.HeatProducer.HeatProducerBuild.class);
+        classes.put("LegacyBlock", mindustry.world.blocks.legacy.LegacyBlock.class);
+        classes.put("LegacyCommandCenter", mindustry.world.blocks.legacy.LegacyCommandCenter.class);
+        classes.put("CommandBuild", mindustry.world.blocks.legacy.LegacyCommandCenter.CommandBuild.class);
+        classes.put("LegacyMechPad", mindustry.world.blocks.legacy.LegacyMechPad.class);
+        classes.put("LegacyMechPadBuild", mindustry.world.blocks.legacy.LegacyMechPad.LegacyMechPadBuild.class);
+        classes.put("LegacyUnitFactory", mindustry.world.blocks.legacy.LegacyUnitFactory.class);
+        classes.put("LegacyUnitFactoryBuild", mindustry.world.blocks.legacy.LegacyUnitFactory.LegacyUnitFactoryBuild.class);
+        classes.put("ArmoredConduit", mindustry.world.blocks.liquid.ArmoredConduit.class);
+        classes.put("ArmoredConduitBuild", mindustry.world.blocks.liquid.ArmoredConduit.ArmoredConduitBuild.class);
+        classes.put("Conduit", mindustry.world.blocks.liquid.Conduit.class);
+        classes.put("ConduitBuild", mindustry.world.blocks.liquid.Conduit.ConduitBuild.class);
+        classes.put("LiquidBlock", mindustry.world.blocks.liquid.LiquidBlock.class);
+        classes.put("LiquidBuild", mindustry.world.blocks.liquid.LiquidBlock.LiquidBuild.class);
+        classes.put("LiquidBridge", mindustry.world.blocks.liquid.LiquidBridge.class);
+        classes.put("LiquidBridgeBuild", mindustry.world.blocks.liquid.LiquidBridge.LiquidBridgeBuild.class);
+        classes.put("LiquidJunction", mindustry.world.blocks.liquid.LiquidJunction.class);
+        classes.put("LiquidJunctionBuild", mindustry.world.blocks.liquid.LiquidJunction.LiquidJunctionBuild.class);
+        classes.put("LiquidRouter", mindustry.world.blocks.liquid.LiquidRouter.class);
+        classes.put("LiquidRouterBuild", mindustry.world.blocks.liquid.LiquidRouter.LiquidRouterBuild.class);
+        classes.put("CanvasBlock", mindustry.world.blocks.logic.CanvasBlock.class);
+        classes.put("CanvasBuild", mindustry.world.blocks.logic.CanvasBlock.CanvasBuild.class);
+        classes.put("LogicBlock", mindustry.world.blocks.logic.LogicBlock.class);
+        classes.put("LogicBuild", mindustry.world.blocks.logic.LogicBlock.LogicBuild.class);
+        classes.put("LogicLink", mindustry.world.blocks.logic.LogicBlock.LogicLink.class);
+        classes.put("LogicDisplay", mindustry.world.blocks.logic.LogicDisplay.class);
+        classes.put("GraphicsType", mindustry.world.blocks.logic.LogicDisplay.GraphicsType.class);
+        classes.put("LogicDisplayBuild", mindustry.world.blocks.logic.LogicDisplay.LogicDisplayBuild.class);
+        classes.put("MemoryBlock", mindustry.world.blocks.logic.MemoryBlock.class);
+        classes.put("MemoryBuild", mindustry.world.blocks.logic.MemoryBlock.MemoryBuild.class);
+        classes.put("MessageBlock", mindustry.world.blocks.logic.MessageBlock.class);
+        classes.put("MessageBuild", mindustry.world.blocks.logic.MessageBlock.MessageBuild.class);
+        classes.put("SwitchBlock", mindustry.world.blocks.logic.SwitchBlock.class);
+        classes.put("SwitchBuild", mindustry.world.blocks.logic.SwitchBlock.SwitchBuild.class);
+        classes.put("BlockProducer", mindustry.world.blocks.payloads.BlockProducer.class);
+        classes.put("BlockProducerBuild", mindustry.world.blocks.payloads.BlockProducer.BlockProducerBuild.class);
+        classes.put("BuildPayload", mindustry.world.blocks.payloads.BuildPayload.class);
+        classes.put("Constructor", mindustry.world.blocks.payloads.Constructor.class);
+        classes.put("ConstructorBuild", mindustry.world.blocks.payloads.Constructor.ConstructorBuild.class);
+        classes.put("Payload", mindustry.world.blocks.payloads.Payload.class);
+        classes.put("PayloadBlock", mindustry.world.blocks.payloads.PayloadBlock.class);
+        classes.put("PayloadBlockBuild", mindustry.world.blocks.payloads.PayloadBlock.PayloadBlockBuild.class);
+        classes.put("PayloadConveyor", mindustry.world.blocks.payloads.PayloadConveyor.class);
+        classes.put("PayloadConveyorBuild", mindustry.world.blocks.payloads.PayloadConveyor.PayloadConveyorBuild.class);
+        classes.put("PayloadDeconstructor", mindustry.world.blocks.payloads.PayloadDeconstructor.class);
+        classes.put("PayloadDeconstructorBuild", mindustry.world.blocks.payloads.PayloadDeconstructor.PayloadDeconstructorBuild.class);
+        classes.put("PayloadLoader", mindustry.world.blocks.payloads.PayloadLoader.class);
+        classes.put("PayloadLoaderBuild", mindustry.world.blocks.payloads.PayloadLoader.PayloadLoaderBuild.class);
+        classes.put("PayloadMassDriver", mindustry.world.blocks.payloads.PayloadMassDriver.class);
+        classes.put("PayloadDriverBuild", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadDriverBuild.class);
+        classes.put("PayloadDriverState", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadDriverState.class);
+        classes.put("PayloadMassDriverData", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadMassDriverData.class);
+        classes.put("PayloadRouter", mindustry.world.blocks.payloads.PayloadRouter.class);
+        classes.put("PayloadRouterBuild", mindustry.world.blocks.payloads.PayloadRouter.PayloadRouterBuild.class);
+        classes.put("PayloadSource", mindustry.world.blocks.payloads.PayloadSource.class);
+        classes.put("PayloadSourceBuild", mindustry.world.blocks.payloads.PayloadSource.PayloadSourceBuild.class);
+        classes.put("PayloadUnloader", mindustry.world.blocks.payloads.PayloadUnloader.class);
+        classes.put("PayloadUnloaderBuild", mindustry.world.blocks.payloads.PayloadUnloader.PayloadUnloaderBuild.class);
+        classes.put("PayloadVoid", mindustry.world.blocks.payloads.PayloadVoid.class);
+        classes.put("PayloadVoidBuild", mindustry.world.blocks.payloads.PayloadVoid.PayloadVoidBuild.class);
+        classes.put("UnitPayload", mindustry.world.blocks.payloads.UnitPayload.class);
+        classes.put("Battery", mindustry.world.blocks.power.Battery.class);
+        classes.put("BatteryBuild", mindustry.world.blocks.power.Battery.BatteryBuild.class);
+        classes.put("BeamNode", mindustry.world.blocks.power.BeamNode.class);
+        classes.put("BeamNodeBuild", mindustry.world.blocks.power.BeamNode.BeamNodeBuild.class);
+        classes.put("ConsumeGenerator", mindustry.world.blocks.power.ConsumeGenerator.class);
+        classes.put("ConsumeGeneratorBuild", mindustry.world.blocks.power.ConsumeGenerator.ConsumeGeneratorBuild.class);
+        classes.put("HeaterGenerator", mindustry.world.blocks.power.HeaterGenerator.class);
+        classes.put("HeaterGeneratorBuild", mindustry.world.blocks.power.HeaterGenerator.HeaterGeneratorBuild.class);
+        classes.put("ImpactReactor", mindustry.world.blocks.power.ImpactReactor.class);
+        classes.put("ImpactReactorBuild", mindustry.world.blocks.power.ImpactReactor.ImpactReactorBuild.class);
+        classes.put("LightBlock", mindustry.world.blocks.power.LightBlock.class);
+        classes.put("LightBuild", mindustry.world.blocks.power.LightBlock.LightBuild.class);
+        classes.put("LongPowerNode", mindustry.world.blocks.power.LongPowerNode.class);
+        classes.put("LongPowerNodeBuild", mindustry.world.blocks.power.LongPowerNode.LongPowerNodeBuild.class);
+        classes.put("NuclearReactor", mindustry.world.blocks.power.NuclearReactor.class);
+        classes.put("NuclearReactorBuild", mindustry.world.blocks.power.NuclearReactor.NuclearReactorBuild.class);
+        classes.put("PowerBlock", mindustry.world.blocks.power.PowerBlock.class);
+        classes.put("PowerDiode", mindustry.world.blocks.power.PowerDiode.class);
+        classes.put("PowerDiodeBuild", mindustry.world.blocks.power.PowerDiode.PowerDiodeBuild.class);
+        classes.put("PowerDistributor", mindustry.world.blocks.power.PowerDistributor.class);
+        classes.put("PowerGenerator", mindustry.world.blocks.power.PowerGenerator.class);
+        classes.put("GeneratorBuild", mindustry.world.blocks.power.PowerGenerator.GeneratorBuild.class);
+        classes.put("PowerGraph", mindustry.world.blocks.power.PowerGraph.class);
+        classes.put("PowerNode", mindustry.world.blocks.power.PowerNode.class);
+        classes.put("PowerNodeBuild", mindustry.world.blocks.power.PowerNode.PowerNodeBuild.class);
+        classes.put("SolarGenerator", mindustry.world.blocks.power.SolarGenerator.class);
+        classes.put("SolarGeneratorBuild", mindustry.world.blocks.power.SolarGenerator.SolarGeneratorBuild.class);
+        classes.put("ThermalGenerator", mindustry.world.blocks.power.ThermalGenerator.class);
+        classes.put("ThermalGeneratorBuild", mindustry.world.blocks.power.ThermalGenerator.ThermalGeneratorBuild.class);
+        classes.put("VariableReactor", mindustry.world.blocks.power.VariableReactor.class);
+        classes.put("VariableReactorBuild", mindustry.world.blocks.power.VariableReactor.VariableReactorBuild.class);
+        classes.put("AttributeCrafter", mindustry.world.blocks.production.AttributeCrafter.class);
+        classes.put("AttributeCrafterBuild", mindustry.world.blocks.production.AttributeCrafter.AttributeCrafterBuild.class);
+        classes.put("BeamDrill", mindustry.world.blocks.production.BeamDrill.class);
+        classes.put("BeamDrillBuild", mindustry.world.blocks.production.BeamDrill.BeamDrillBuild.class);
+        classes.put("BurstDrill", mindustry.world.blocks.production.BurstDrill.class);
+        classes.put("BurstDrillBuild", mindustry.world.blocks.production.BurstDrill.BurstDrillBuild.class);
+        classes.put("Drill", mindustry.world.blocks.production.Drill.class);
+        classes.put("DrillBuild", mindustry.world.blocks.production.Drill.DrillBuild.class);
+        classes.put("Fracker", mindustry.world.blocks.production.Fracker.class);
+        classes.put("FrackerBuild", mindustry.world.blocks.production.Fracker.FrackerBuild.class);
+        classes.put("GenericCrafter", mindustry.world.blocks.production.GenericCrafter.class);
+        classes.put("GenericCrafterBuild", mindustry.world.blocks.production.GenericCrafter.GenericCrafterBuild.class);
+        classes.put("HeatCrafter", mindustry.world.blocks.production.HeatCrafter.class);
+        classes.put("HeatCrafterBuild", mindustry.world.blocks.production.HeatCrafter.HeatCrafterBuild.class);
+        classes.put("Incinerator", mindustry.world.blocks.production.Incinerator.class);
+        classes.put("IncineratorBuild", mindustry.world.blocks.production.Incinerator.IncineratorBuild.class);
+        classes.put("ItemIncinerator", mindustry.world.blocks.production.ItemIncinerator.class);
+        classes.put("ItemIncineratorBuild", mindustry.world.blocks.production.ItemIncinerator.ItemIncineratorBuild.class);
+        classes.put("Pump", mindustry.world.blocks.production.Pump.class);
+        classes.put("PumpBuild", mindustry.world.blocks.production.Pump.PumpBuild.class);
+        classes.put("Separator", mindustry.world.blocks.production.Separator.class);
+        classes.put("SeparatorBuild", mindustry.world.blocks.production.Separator.SeparatorBuild.class);
+        classes.put("SingleBlockProducer", mindustry.world.blocks.production.SingleBlockProducer.class);
+        classes.put("SingleBlockProducerBuild", mindustry.world.blocks.production.SingleBlockProducer.SingleBlockProducerBuild.class);
+        classes.put("SolidPump", mindustry.world.blocks.production.SolidPump.class);
+        classes.put("SolidPumpBuild", mindustry.world.blocks.production.SolidPump.SolidPumpBuild.class);
+        classes.put("WallCrafter", mindustry.world.blocks.production.WallCrafter.class);
+        classes.put("WallCrafterBuild", mindustry.world.blocks.production.WallCrafter.WallCrafterBuild.class);
+        classes.put("ItemSource", mindustry.world.blocks.sandbox.ItemSource.class);
+        classes.put("ItemSourceBuild", mindustry.world.blocks.sandbox.ItemSource.ItemSourceBuild.class);
+        classes.put("ItemVoid", mindustry.world.blocks.sandbox.ItemVoid.class);
+        classes.put("ItemVoidBuild", mindustry.world.blocks.sandbox.ItemVoid.ItemVoidBuild.class);
+        classes.put("LiquidSource", mindustry.world.blocks.sandbox.LiquidSource.class);
+        classes.put("LiquidSourceBuild", mindustry.world.blocks.sandbox.LiquidSource.LiquidSourceBuild.class);
+        classes.put("LiquidVoid", mindustry.world.blocks.sandbox.LiquidVoid.class);
+        classes.put("LiquidVoidBuild", mindustry.world.blocks.sandbox.LiquidVoid.LiquidVoidBuild.class);
+        classes.put("PowerSource", mindustry.world.blocks.sandbox.PowerSource.class);
+        classes.put("PowerSourceBuild", mindustry.world.blocks.sandbox.PowerSource.PowerSourceBuild.class);
+        classes.put("PowerVoid", mindustry.world.blocks.sandbox.PowerVoid.class);
+        classes.put("CoreBlock", mindustry.world.blocks.storage.CoreBlock.class);
+        classes.put("CoreBuild", mindustry.world.blocks.storage.CoreBlock.CoreBuild.class);
+        classes.put("StorageBlock", mindustry.world.blocks.storage.StorageBlock.class);
+        classes.put("StorageBuild", mindustry.world.blocks.storage.StorageBlock.StorageBuild.class);
+        classes.put("Unloader", mindustry.world.blocks.storage.Unloader.class);
+        classes.put("ContainerStat", mindustry.world.blocks.storage.Unloader.ContainerStat.class);
+        classes.put("UnloaderBuild", mindustry.world.blocks.storage.Unloader.UnloaderBuild.class);
+        classes.put("DroneCenter", mindustry.world.blocks.units.DroneCenter.class);
+        classes.put("DroneCenterBuild", mindustry.world.blocks.units.DroneCenter.DroneCenterBuild.class);
+        classes.put("EffectDroneAI", mindustry.world.blocks.units.DroneCenter.EffectDroneAI.class);
+        classes.put("Reconstructor", mindustry.world.blocks.units.Reconstructor.class);
+        classes.put("ReconstructorBuild", mindustry.world.blocks.units.Reconstructor.ReconstructorBuild.class);
+        classes.put("RepairTower", mindustry.world.blocks.units.RepairTower.class);
+        classes.put("RepairTowerBuild", mindustry.world.blocks.units.RepairTower.RepairTowerBuild.class);
+        classes.put("RepairTurret", mindustry.world.blocks.units.RepairTurret.class);
+        classes.put("RepairPointBuild", mindustry.world.blocks.units.RepairTurret.RepairPointBuild.class);
+        classes.put("UnitAssembler", mindustry.world.blocks.units.UnitAssembler.class);
+        classes.put("AssemblerUnitPlan", mindustry.world.blocks.units.UnitAssembler.AssemblerUnitPlan.class);
+        classes.put("UnitAssemblerBuild", mindustry.world.blocks.units.UnitAssembler.UnitAssemblerBuild.class);
+        classes.put("YeetData", mindustry.world.blocks.units.UnitAssembler.YeetData.class);
+        classes.put("UnitAssemblerModule", mindustry.world.blocks.units.UnitAssemblerModule.class);
+        classes.put("UnitAssemblerModuleBuild", mindustry.world.blocks.units.UnitAssemblerModule.UnitAssemblerModuleBuild.class);
+        classes.put("UnitBlock", mindustry.world.blocks.units.UnitBlock.class);
+        classes.put("UnitBuild", mindustry.world.blocks.units.UnitBlock.UnitBuild.class);
+        classes.put("UnitCargoLoader", mindustry.world.blocks.units.UnitCargoLoader.class);
+        classes.put("UnitTransportSourceBuild", mindustry.world.blocks.units.UnitCargoLoader.UnitTransportSourceBuild.class);
+        classes.put("UnitCargoUnloadPoint", mindustry.world.blocks.units.UnitCargoUnloadPoint.class);
+        classes.put("UnitCargoUnloadPointBuild", mindustry.world.blocks.units.UnitCargoUnloadPoint.UnitCargoUnloadPointBuild.class);
+        classes.put("UnitFactory", mindustry.world.blocks.units.UnitFactory.class);
+        classes.put("UnitFactoryBuild", mindustry.world.blocks.units.UnitFactory.UnitFactoryBuild.class);
+        classes.put("UnitPlan", mindustry.world.blocks.units.UnitFactory.UnitPlan.class);
+        classes.put("Consume", mindustry.world.consumers.Consume.class);
+        classes.put("ConsumeCoolant", mindustry.world.consumers.ConsumeCoolant.class);
+        classes.put("ConsumeItemCharged", mindustry.world.consumers.ConsumeItemCharged.class);
+        classes.put("ConsumeItemDynamic", mindustry.world.consumers.ConsumeItemDynamic.class);
+        classes.put("ConsumeItemExplode", mindustry.world.consumers.ConsumeItemExplode.class);
+        classes.put("ConsumeItemExplosive", mindustry.world.consumers.ConsumeItemExplosive.class);
+        classes.put("ConsumeItemFilter", mindustry.world.consumers.ConsumeItemFilter.class);
+        classes.put("ConsumeItemFlammable", mindustry.world.consumers.ConsumeItemFlammable.class);
+        classes.put("ConsumeItemList", mindustry.world.consumers.ConsumeItemList.class);
+        classes.put("ConsumeItemRadioactive", mindustry.world.consumers.ConsumeItemRadioactive.class);
+        classes.put("ConsumeItems", mindustry.world.consumers.ConsumeItems.class);
+        classes.put("ConsumeLiquid", mindustry.world.consumers.ConsumeLiquid.class);
+        classes.put("ConsumeLiquidBase", mindustry.world.consumers.ConsumeLiquidBase.class);
+        classes.put("ConsumeLiquidFilter", mindustry.world.consumers.ConsumeLiquidFilter.class);
+        classes.put("ConsumeLiquidFlammable", mindustry.world.consumers.ConsumeLiquidFlammable.class);
+        classes.put("ConsumeLiquids", mindustry.world.consumers.ConsumeLiquids.class);
+        classes.put("ConsumeLiquidsDynamic", mindustry.world.consumers.ConsumeLiquidsDynamic.class);
+        classes.put("ConsumePayloadDynamic", mindustry.world.consumers.ConsumePayloadDynamic.class);
+        classes.put("ConsumePayloadFilter", mindustry.world.consumers.ConsumePayloadFilter.class);
+        classes.put("ConsumePayloads", mindustry.world.consumers.ConsumePayloads.class);
+        classes.put("ConsumePower", mindustry.world.consumers.ConsumePower.class);
+        classes.put("ConsumePowerCondition", mindustry.world.consumers.ConsumePowerCondition.class);
+        classes.put("ConsumePowerDynamic", mindustry.world.consumers.ConsumePowerDynamic.class);
+        classes.put("DrawArcSmelt", mindustry.world.draw.DrawArcSmelt.class);
+        classes.put("DrawBlock", mindustry.world.draw.DrawBlock.class);
+        classes.put("DrawBlurSpin", mindustry.world.draw.DrawBlurSpin.class);
+        classes.put("DrawBubbles", mindustry.world.draw.DrawBubbles.class);
+        classes.put("DrawCells", mindustry.world.draw.DrawCells.class);
+        classes.put("DrawCircles", mindustry.world.draw.DrawCircles.class);
+        classes.put("DrawCrucibleFlame", mindustry.world.draw.DrawCrucibleFlame.class);
+        classes.put("DrawCultivator", mindustry.world.draw.DrawCultivator.class);
+        classes.put("DrawDefault", mindustry.world.draw.DrawDefault.class);
+        classes.put("DrawFade", mindustry.world.draw.DrawFade.class);
+        classes.put("DrawFlame", mindustry.world.draw.DrawFlame.class);
+        classes.put("DrawFrames", mindustry.world.draw.DrawFrames.class);
+        classes.put("DrawGlowRegion", mindustry.world.draw.DrawGlowRegion.class);
+        classes.put("DrawHeatInput", mindustry.world.draw.DrawHeatInput.class);
+        classes.put("DrawHeatOutput", mindustry.world.draw.DrawHeatOutput.class);
+        classes.put("DrawHeatRegion", mindustry.world.draw.DrawHeatRegion.class);
+        classes.put("DrawLiquidOutputs", mindustry.world.draw.DrawLiquidOutputs.class);
+        classes.put("DrawLiquidRegion", mindustry.world.draw.DrawLiquidRegion.class);
+        classes.put("DrawLiquidTile", mindustry.world.draw.DrawLiquidTile.class);
+        classes.put("DrawMulti", mindustry.world.draw.DrawMulti.class);
+        classes.put("DrawMultiWeave", mindustry.world.draw.DrawMultiWeave.class);
+        classes.put("DrawParticles", mindustry.world.draw.DrawParticles.class);
+        classes.put("DrawPistons", mindustry.world.draw.DrawPistons.class);
+        classes.put("DrawPlasma", mindustry.world.draw.DrawPlasma.class);
+        classes.put("DrawPower", mindustry.world.draw.DrawPower.class);
+        classes.put("DrawPulseShape", mindustry.world.draw.DrawPulseShape.class);
+        classes.put("DrawPumpLiquid", mindustry.world.draw.DrawPumpLiquid.class);
+        classes.put("DrawRegion", mindustry.world.draw.DrawRegion.class);
+        classes.put("DrawShape", mindustry.world.draw.DrawShape.class);
+        classes.put("DrawSideRegion", mindustry.world.draw.DrawSideRegion.class);
+        classes.put("DrawSoftParticles", mindustry.world.draw.DrawSoftParticles.class);
+        classes.put("DrawSpikes", mindustry.world.draw.DrawSpikes.class);
+        classes.put("DrawTurret", mindustry.world.draw.DrawTurret.class);
+        classes.put("DrawWarmupRegion", mindustry.world.draw.DrawWarmupRegion.class);
+        classes.put("DrawWeave", mindustry.world.draw.DrawWeave.class);
+        classes.put("Block", mindustry.world.Block.class);
+    }
+}
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index c00ae23fe1..442348bf2e 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -1,31 +1,45 @@
 package mindustry.mod;
 
 import arc.*;
-import arc.assets.*;
-import arc.assets.loaders.SoundLoader.*;
 import arc.audio.*;
 import arc.files.*;
 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.serialization.*;
 import arc.util.serialization.Json.*;
 import arc.util.serialization.Jval.*;
 import mindustry.*;
+import mindustry.ai.*;
+import mindustry.ai.types.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
+import mindustry.entities.Units.*;
+import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.effect.*;
+import mindustry.entities.part.*;
+import mindustry.entities.part.DrawPart.*;
+import mindustry.entities.pattern.*;
 import mindustry.game.*;
 import mindustry.game.Objectives.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.graphics.g3d.*;
+import mindustry.graphics.g3d.PlanetGrid.*;
+import mindustry.io.*;
+import mindustry.maps.generators.*;
+import mindustry.maps.planet.*;
 import mindustry.mod.Mods.*;
 import mindustry.type.*;
+import mindustry.type.ammo.*;
+import mindustry.type.weather.*;
 import mindustry.world.*;
 import mindustry.world.blocks.units.*;
 import mindustry.world.blocks.units.UnitFactory.*;
@@ -40,22 +54,36 @@ import static mindustry.Vars.*;
 @SuppressWarnings("unchecked")
 public class ContentParser{
     private static final boolean ignoreUnknownFields = true;
+    private static final ContentType[] typesToSearch = {ContentType.block, ContentType.item, ContentType.unit, ContentType.liquid, ContentType.planet};
+
     ObjectMap<Class<?>, ContentType> contentTypes = new ObjectMap<>();
-    ObjectSet<Class<?>> implicitNullable = ObjectSet.with(TextureRegion.class, TextureRegion[].class, TextureRegion[][].class);
-    ObjectMap<String, AssetDescriptor> sounds = new ObjectMap<>();
+    ObjectSet<Class<?>> implicitNullable = ObjectSet.with(TextureRegion.class, TextureRegion[].class, TextureRegion[][].class, TextureRegion[][][].class);
+    Seq<ParseListener> listeners = new Seq<>();
 
     ObjectMap<Class<?>, FieldParser> classParsers = new ObjectMap<>(){{
         put(Effect.class, (type, data) -> {
             if(data.isString()){
                 return field(Fx.class, data);
             }
-            Class<? extends Effect> bc = data.has("type") ? resolve(data.getString("type"), "mindustry.entities.effect") : ParticleEffect.class;
+            if(data.isArray()){
+                return new MultiEffect(parser.readValue(Effect[].class, data));
+            }
+            Class<? extends Effect> bc = resolve(data.getString("type", ""), ParticleEffect.class);
             data.remove("type");
             Effect result = make(bc);
             readFields(result, data);
             return result;
         });
+        put(Sortf.class, (type, data) -> field(UnitSorts.class, data));
         put(Interp.class, (type, data) -> field(Interp.class, data));
+        put(Blending.class, (type, data) -> field(Blending.class, data));
+        put(CacheLayer.class, (type, data) -> field(CacheLayer.class, data));
+        put(Attribute.class, (type, data) -> {
+            String attr = data.asString();
+            if(Attribute.exists(attr)) return Attribute.get(attr);
+            return Attribute.add(attr);
+        });
+        put(BuildVisibility.class, (type, data) -> field(BuildVisibility.class, data));
         put(Schematic.class, (type, data) -> {
             Object result = fieldOpt(Loadouts.class, data);
             if(result != null){
@@ -69,67 +97,265 @@ public class ContentParser{
                 }
             }
         });
+        put(Color.class, (type, data) -> Color.valueOf(data.asString()));
         put(StatusEffect.class, (type, data) -> {
-            Object result = fieldOpt(StatusEffects.class, data);
-            if(result != null){
-                return result;
+            if(data.isString()){
+                StatusEffect result = locate(ContentType.status, data.asString());
+                if(result != null) return result;
+                throw new IllegalArgumentException("Unknown status effect: '" + data.asString() + "'");
             }
             StatusEffect effect = new StatusEffect(currentMod.name + "-" + data.getString("name"));
+            effect.minfo.mod = currentMod;
             readFields(effect, data);
             return effect;
         });
-        put(Color.class, (type, data) -> Color.valueOf(data.asString()));
+        put(UnitCommand.class, (type, data) -> {
+            if(data.isString()){
+               var cmd = content.unitCommand(data.asString());
+               if(cmd != null){
+                   return cmd;
+               }else{
+                   throw new IllegalArgumentException("Unknown unit command name: " + data.asString());
+               }
+            }else{
+                throw new IllegalArgumentException("Unit commands must be strings.");
+            }
+        });
+        put(UnitStance.class, (type, data) -> {
+            if(data.isString()){
+                var cmd = content.unitStance(data.asString());
+                if(cmd != null){
+                    return cmd;
+                }else{
+                    throw new IllegalArgumentException("Unknown unit stance name: " + data.asString());
+                }
+            }else{
+                throw new IllegalArgumentException("Unit stances must be strings.");
+            }
+        });
         put(BulletType.class, (type, data) -> {
             if(data.isString()){
                 return field(Bullets.class, data);
             }
-            Class<? extends BulletType> bc = data.has("type") ? resolve(data.getString("type"), "mindustry.entities.bullet") : BasicBulletType.class;
+            Class<?> bc = resolve(data.getString("type", ""), BasicBulletType.class);
             data.remove("type");
-            BulletType result = make(bc);
+            BulletType result = (BulletType)make(bc);
             readFields(result, data);
             return result;
         });
+        put(MassDriverBolt.class, (type, data) -> {
+            MassDriverBolt result = (MassDriverBolt)make(MassDriverBolt.class);
+            readFields(result, data);
+            return result;
+        });
+        put(AmmoType.class, (type, data) -> {
+            //string -> item
+            //if liquid ammo support is added, this should scan for liquids as well
+            if(data.isString()) return new ItemAmmoType(find(ContentType.item, data.asString()));
+            //number -> power
+            if(data.isNumber()) return new PowerAmmoType(data.asFloat());
+
+            var bc = resolve(data.getString("type", ""), ItemAmmoType.class);
+            data.remove("type");
+            AmmoType result = make(bc);
+            readFields(result, data);
+            return result;
+        });
+        put(DrawBlock.class, (type, data) -> {
+            if(data.isString()){
+                //try to instantiate
+                return make(resolve(data.asString()));
+            }
+            //array is shorthand for DrawMulti
+            if(data.isArray()){
+                return new DrawMulti(parser.readValue(DrawBlock[].class, data));
+            }
+            var bc = resolve(data.getString("type", ""), DrawDefault.class);
+            data.remove("type");
+            DrawBlock result = make(bc);
+            readFields(result, data);
+            return result;
+        });
+        put(ShootPattern.class, (type, data) -> {
+            var bc = resolve(data.getString("type", ""), ShootPattern.class);
+            data.remove("type");
+            var result = make(bc);
+            readFields(result, data);
+            return result;
+        });
+        put(DrawPart.class, (type, data) -> {
+            Class<?> bc = resolve(data.getString("type", ""), RegionPart.class);
+            data.remove("type");
+            var result = make(bc);
+            readFields(result, data);
+            return result;
+        });
+        //TODO this is untested
+        put(PartProgress.class, (type, data) -> {
+            //simple case: it's a string or number constant
+            if(data.isString()) return field(PartProgress.class, data.asString());
+            if(data.isNumber()) return PartProgress.constant(data.asFloat());
+
+            if(!data.has("type")){
+                throw new RuntimeException("PartProgress object need a 'type' string field. Check the PartProgress class for a list of constants.");
+            }
+
+            PartProgress base = (PartProgress)field(PartProgress.class, data.getString("type"));
+
+            JsonValue opval =
+                data.has("operation") ? data.get("operation") :
+                data.has("op") ? data.get("op") : null;
+
+            //no singular operation, check for multi-operation
+            if(opval == null){
+                JsonValue opsVal =
+                    data.has("operations") ? data.get("operations") :
+                    data.has("ops") ? data.get("ops") : null;
+
+                if(opsVal != null){
+                    if(!opsVal.isArray()) throw new RuntimeException("Chained PartProgress operations must be an array.");
+                    int i = 0;
+                    while(true){
+                        JsonValue val = opsVal.get(i);
+                        if(val == null) break;
+                        JsonValue op = val.has("operation") ? val.get("operation") :
+                            val.has("op") ? val.get("op") : null;
+
+                        base = parseProgressOp(base, op.asString(), val);
+                        i++;
+                    }
+                }
+
+                return base;
+            }
+
+            //this is the name of the method to call
+            String op = opval.asString();
+
+            return parseProgressOp(base, op, data);
+        });
+        put(PlanetGenerator.class, (type, data) -> {
+            var result = new AsteroidGenerator(); //only one type for now
+            readFields(result, data);
+            return result;
+        });
+        put(Mat3D.class, (type, data) -> {
+            if(data == null) return new Mat3D();
+
+            //transform x y z format
+            if(data.has("x") && data.has("y") && data.has("z")){
+                return new Mat3D().translate(data.getFloat("x", 0f), data.getFloat("y", 0f), data.getFloat("z", 0f));
+            }
+
+            //transform array format
+            if(data.isArray() && data.size == 3){
+                return new Mat3D().setToTranslation(new Vec3(data.asFloatArray()));
+            }
+
+            Mat3D mat = new Mat3D();
+
+            //TODO this is kinda bad
+            for(var val : data){
+                switch(val.name){
+                    case "translate", "trans" -> mat.translate(parser.readValue(Vec3.class, data));
+                    case "scale", "scl" -> mat.scale(parser.readValue(Vec3.class, data));
+                    case "rotate", "rot" -> mat.rotate(parser.readValue(Vec3.class, data), data.getFloat("degrees", 0f));
+                    case "multiply", "mul" -> mat.mul(parser.readValue(Mat3D.class, data));
+                    case "x", "y", "z" -> {}
+                    default -> throw new RuntimeException("Unknown matrix transformation: '" + val.name + "'");
+                }
+            }
+
+            return mat;
+        });
+        put(Vec3.class, (type, data) -> {
+            if(data.isArray()) return new Vec3(data.asFloatArray());
+            return new Vec3(data.getFloat("x", 0f), data.getFloat("y", 0f), data.getFloat("z", 0f));
+        });
         put(Sound.class, (type, data) -> {
-            if(fieldOpt(Sounds.class, data) != null) return fieldOpt(Sounds.class, data);
-            if(Vars.headless) return new Sound();
+            if(data.isArray()) return new RandomSound(parser.readValue(Sound[].class, data));
 
-            String name = "sounds/" + data.asString();
-            String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
+            var field = fieldOpt(Sounds.class, data);
+            return field != null ? field : Vars.tree.loadSound(data.asString());
+        });
+        put(Music.class, (type, data) -> {
+            var field = fieldOpt(Musics.class, data);
 
-            if(sounds.containsKey(path)) return ((SoundParameter)sounds.get(path).params).sound;
-            var sound = new Sound();
-            AssetDescriptor<?> desc = Core.assets.load(path, Sound.class, new SoundParameter(sound));
-            desc.errored = Throwable::printStackTrace;
-            sounds.put(path, desc);
-            return sound;
+            return field != null ? field : Vars.tree.loadMusic(data.asString());
         });
         put(Objectives.Objective.class, (type, data) -> {
-            Class<? extends Objectives.Objective> oc = data.has("type") ? resolve(data.getString("type"), "mindustry.game.Objectives") : SectorComplete.class;
+            if(data.isString()){
+                var cont = locateAny(data.asString());
+                if(cont == null) throw new IllegalArgumentException("Unknown objective content: " + data.asString());
+                return new Research((UnlockableContent)cont);
+            }
+            var oc = resolve(data.getString("type", ""), SectorComplete.class);
             data.remove("type");
             Objectives.Objective obj = make(oc);
             readFields(obj, data);
             return obj;
         });
+        put(Ability.class, (type, data) -> {
+            Class<? extends Ability> oc = resolve(data.getString("type", ""));
+            data.remove("type");
+            Ability obj = make(oc);
+            readFields(obj, data);
+            return obj;
+        });
         put(Weapon.class, (type, data) -> {
-            Weapon weapon = new Weapon();
+            var oc = resolve(data.getString("type", ""), Weapon.class);
+            data.remove("type");
+            var weapon = make(oc);
             readFields(weapon, data);
             weapon.name = currentMod.name + "-" + weapon.name;
             return weapon;
         });
+        put(Consume.class, (type, data) -> {
+            var oc = resolve(data.getString("type", ""), Consume.class);
+            data.remove("type");
+            var consume = make(oc);
+            readFields(consume, data);
+            return consume;
+        });
+        put(ConsumeLiquidBase.class, (type, data) -> {
+            var oc = resolve(data.getString("type", ""), ConsumeLiquidBase.class);
+            data.remove("type");
+            var consume = make(oc);
+            readFields(consume, data);
+            return consume;
+        });
+        put(Team.class, (type, data) -> {
+            if(data.isString()){
+                Team out = Structs.find(Team.baseTeams, t -> t.name.equals(data.asString()));
+                if(out == null) throw new IllegalArgumentException("Unknown team: " + data.asString());
+                return out;
+            }else if(data.isNumber()){
+                if(data.asInt() >= Team.all.length || data.asInt() < 0){
+                    throw new IllegalArgumentException("Unknown team: " + data.asString());
+                }
+                return Team.get(data.asInt());
+            }else{
+                throw new IllegalArgumentException("Unknown team: " + data.asString() + ". Team must either be a string or a number.");
+            }
+        });
     }};
     /** Stores things that need to be parsed fully, e.g. reading fields of content.
-     * This is done to accomodate binding of content names first.*/
+     * This is done to accommodate binding of content names first.*/
     private Seq<Runnable> reads = new Seq<>();
     private Seq<Runnable> postreads = new Seq<>();
     private ObjectSet<Object> toBeParsed = new ObjectSet<>();
+
     LoadedMod currentMod;
-    private Content currentContent;
+    Content currentContent;
 
     private Json parser = new Json(){
         @Override
         public <T> T readValue(Class<T> type, Class elementType, JsonValue jsonData, Class keyType){
             T t = internalRead(type, elementType, jsonData, keyType);
-            if(t != null) checkNullFields(t);
+            if(t != null && !Reflect.isWrapper(t.getClass()) && (type == null || !type.isPrimitive())){
+                checkNullFields(t);
+                listeners.each(hook -> hook.parsed(type, jsonData, t));
+            }
             return t;
         }
 
@@ -143,6 +369,18 @@ public class ContentParser{
                     }
                 }
 
+                //try to parse env bits
+                if((type == int.class || type == Integer.class) && jsonData.isArray()){
+                    int value = 0;
+                    for(var str : jsonData){
+                        if(!str.isString()) throw new SerializationException("Integer bitfield values must all be strings. Found: " + str);
+                        String field = str.asString();
+                        value |= Reflect.<Integer>get(Env.class, field);
+                    }
+
+                    return (T)(Integer)value;
+                }
+
                 //try to parse "item/amount" syntax
                 if(type == ItemStack.class && jsonData.isString() && jsonData.asString().contains("/")){
                     String[] split = jsonData.asString().split("/");
@@ -150,6 +388,15 @@ public class ContentParser{
                     return (T)fromJson(ItemStack.class, "{item: " + split[0] + ", amount: " + split[1] + "}");
                 }
 
+                //try to parse "payloaditem/amount" syntax
+                if(type == PayloadStack.class && jsonData.isString() && jsonData.asString().contains("/")){
+                    String[] split = jsonData.asString().split("/");
+                    int number = Strings.parseInt(split[1], 1);
+                    UnlockableContent cont = content.unit(split[0]) == null ? content.block(split[0]) : content.unit(split[0]);
+
+                    return (T)new PayloadStack(cont == null ? Blocks.router : cont, number);
+                }
+
                 //try to parse "liquid/amount" syntax
                 if(jsonData.isString() && jsonData.asString().contains("/")){
                     String[] split = jsonData.asString().split("/");
@@ -160,9 +407,20 @@ public class ContentParser{
                     }
                 }
 
-                //try to load DrawBlock by instantiating it
-                if(type == DrawBlock.class && jsonData.isString()){
-                    return Reflect.make("mindustry.world.draw." + Strings.capitalize(jsonData.asString()));
+                //try to parse Rect as array
+                if(type == Rect.class && jsonData.isArray() && jsonData.size == 4){
+                    return (T)new Rect(jsonData.get(0).asFloat(), jsonData.get(1).asFloat(), jsonData.get(2).asFloat(), jsonData.get(3).asFloat());
+                }
+
+                //search across different content types to find one by name
+                if(type == UnlockableContent.class){
+                    for(ContentType c : typesToSearch){
+                        T found = (T)locate(c, jsonData.asString());
+                        if(found != null){
+                            return found;
+                        }
+                    }
+                    throw new IllegalArgumentException("\"" + jsonData.name + "\": No content found with name '" + jsonData.asString() + "'.");
                 }
 
                 if(Content.class.isAssignableFrom(type)){
@@ -188,36 +446,14 @@ public class ContentParser{
             Block block;
 
             if(locate(ContentType.block, name) != null){
-                block = locate(ContentType.block, name);
-
                 if(value.has("type")){
-                    throw new IllegalArgumentException("When defining properties for an existing block, you must not re-declare its type. The original type will be used. Block: " + name);
+                    Log.warn("Warning: '" + currentMod.name + "-" + name + "' re-declares a type. This will be interpreted as a new block. If you wish to override a vanilla block, omit the 'type' section, as vanilla block `type`s cannot be changed.");
+                    block = make(resolve(value.getString("type", ""), Block.class), mod + "-" + name);
+                }else{
+                    block = locate(ContentType.block, name);
                 }
             }else{
-                //TODO generate dynamically instead of doing.. this
-                Class<? extends Block> type;
-
-                try{
-                    type = resolve(getType(value),
-                    "mindustry.world",
-                    "mindustry.world.blocks",
-                    "mindustry.world.blocks.defense",
-                    "mindustry.world.blocks.defense.turrets",
-                    "mindustry.world.blocks.distribution",
-                    "mindustry.world.blocks.environment",
-                    "mindustry.world.blocks.liquid",
-                    "mindustry.world.blocks.logic",
-                    "mindustry.world.blocks.power",
-                    "mindustry.world.blocks.production",
-                    "mindustry.world.blocks.sandbox",
-                    "mindustry.world.blocks.storage",
-                    "mindustry.world.blocks.units"
-                    );
-                }catch(IllegalArgumentException e){
-                    type = Block.class;
-                }
-
-                block = make(type, mod + "-" + name);
+                block = make(resolve(value.getString("type", ""), Block.class), mod + "-" + name);
             }
 
             currentContent = block;
@@ -225,22 +461,43 @@ public class ContentParser{
             read(() -> {
                 if(value.has("consumes") && value.get("consumes").isObject()){
                     for(JsonValue child : value.get("consumes")){
-                        if(child.name.equals("item")){
-                            block.consumes.item(find(ContentType.item, child.asString()));
-                        }else if(child.name.equals("items")){
-                            block.consumes.add((Consume)parser.readValue(ConsumeItems.class, child));
-                        }else if(child.name.equals("liquid")){
-                            block.consumes.add((Consume)parser.readValue(ConsumeLiquid.class, child));
-                        }else if(child.name.equals("power")){
-                            if(child.isNumber()){
-                                block.consumes.power(child.asFloat());
-                            }else{
-                                block.consumes.add((Consume)parser.readValue(ConsumePower.class, child));
+                        switch(child.name){
+                            case "remove" -> {
+                                String[] values = child.isString() ? new String[]{child.asString()} : child.asStringArray();
+                                for(String type : values){
+                                    Class<?> consumeType = resolve("Consume" + Strings.capitalize(type), Consume.class);
+                                    if(consumeType != Consume.class){
+                                        block.removeConsumers(b -> consumeType.isAssignableFrom(b.getClass()));
+                                    }else{
+                                        Log.warn("Unknown consumer type '@' (Class: @) in consume: remove.", type, "Consume" + Strings.capitalize(type));
+                                    }
+                                }
                             }
-                        }else if(child.name.equals("powerBuffered")){
-                            block.consumes.powerBuffered(child.asFloat());
-                        }else{
-                            throw new IllegalArgumentException("Unknown consumption type: '" + child.name + "' for block '" + block.name + "'.");
+                            case "item" -> block.consumeItem(find(ContentType.item, child.asString()));
+                            case "itemCharged" -> block.consume((Consume)parser.readValue(ConsumeItemCharged.class, child));
+                            case "itemFlammable" -> block.consume((Consume)parser.readValue(ConsumeItemFlammable.class, child));
+                            case "itemRadioactive" -> block.consume((Consume)parser.readValue(ConsumeItemRadioactive.class, child));
+                            case "itemExplosive" -> block.consume((Consume)parser.readValue(ConsumeItemExplosive.class, child));
+                            case "itemList" -> block.consume((Consume)parser.readValue(ConsumeItemList.class, child));
+                            case "itemExplode" -> block.consume((Consume)parser.readValue(ConsumeItemExplode.class, child));
+                            case "items" -> block.consume(child.isArray() ?
+                                    new ConsumeItems(parser.readValue(ItemStack[].class, child)) :
+                                    parser.readValue(ConsumeItems.class, child));
+                            case "liquidFlammable" -> block.consume((Consume)parser.readValue(ConsumeLiquidFlammable.class, child));
+                            case "liquid" -> block.consume((Consume)parser.readValue(ConsumeLiquid.class, child));
+                            case "liquids" -> block.consume(child.isArray() ?
+                                    new ConsumeLiquids(parser.readValue(LiquidStack[].class, child)) :
+                                    parser.readValue(ConsumeLiquids.class, child));
+                            case "coolant" -> block.consume((Consume)parser.readValue(ConsumeCoolant.class, child));
+                            case "power" -> {
+                                if(child.isNumber()){
+                                    block.consumePower(child.asFloat());
+                                }else{
+                                    block.consume((Consume)parser.readValue(ConsumePower.class, child));
+                                }
+                            }
+                            case "powerBuffered" -> block.consumePowerBuffered(child.asFloat());
+                            default -> throw new IllegalArgumentException("Unknown consumption type: '" + child.name + "' for block '" + block.name + "'.");
                         }
                     }
                     value.remove("consumes");
@@ -265,14 +522,21 @@ public class ContentParser{
 
             UnitType unit;
             if(locate(ContentType.unit, name) == null){
-                unit = new UnitType(mod + "-" + name);
-                var typeVal = value.get("type");
 
-                if(typeVal != null && !typeVal.isString()){
-                    throw new RuntimeException("Unit '" + name + "' has an incorrect type. Types must be strings.");
+                unit = make(resolve(value.getString("template", ""), UnitType.class), mod + "-" + name);
+
+                if(value.has("template")){
+                    value.remove("template");
                 }
 
-                unit.constructor = unitType(typeVal);
+                var typeVal = value.get("type");
+                if(unit.constructor == null || typeVal != null){
+                    if(typeVal != null && !typeVal.isString()){
+                        throw new RuntimeException("Unit '" + name + "' has an incorrect type. Types must be strings.");
+                    }
+
+                    unit.constructor = unitType(typeVal);
+                }
             }else{
                 unit = locate(ContentType.unit, name);
             }
@@ -284,15 +548,6 @@ public class ContentParser{
                 if(value.has("requirements")){
                     JsonValue rec = value.remove("requirements");
 
-                    //intermediate class for parsing
-                    class UnitReq{
-                        public Block block;
-                        public ItemStack[] requirements = {};
-                        @Nullable
-                        public UnitType previous;
-                        public float time = 60f * 10f;
-                    }
-
                     UnitReq req = parser.readValue(UnitReq.class, rec);
 
                     if(req.block instanceof Reconstructor r){
@@ -307,8 +562,15 @@ public class ContentParser{
 
                 }
 
-                if(value.has("controller")){
-                    unit.defaultController = make(resolve(value.getString("controller"), "mindustry.ai.types"));
+                if(value.has("controller") || value.has("aiController")){
+                    unit.aiController = supply(resolve(value.getString("controller", value.getString("aiController", "")), FlyingAI.class));
+                    value.remove("controller");
+                }
+
+                if(value.has("defaultController")){
+                    var sup = supply(resolve(value.getString("defaultController"), FlyingAI.class));
+                    unit.controller = u -> sup.get();
+                    value.remove("defaultController");
                 }
 
                 //read extra default waves
@@ -334,16 +596,130 @@ public class ContentParser{
                 readBundle(ContentType.weather, name, value);
             }else{
                 readBundle(ContentType.weather, name, value);
-                Class<? extends Weather> type = resolve(getType(value), "mindustry.type.weather");
-                item = make(type);
+                item = make(resolve(getType(value), ParticleWeather.class), mod + "-" + name);
+                value.remove("type");
             }
             currentContent = item;
             read(() -> readFields(item, value));
             return item;
         },
         ContentType.item, parser(ContentType.item, Item::new),
-        ContentType.liquid, parser(ContentType.liquid, Liquid::new)
-        //ContentType.sector, parser(ContentType.sector, SectorPreset::new)
+        ContentType.liquid, (TypeParser<Liquid>)(mod, name, value) -> {
+            Liquid liquid;
+            if(locate(ContentType.liquid, name) != null){
+                liquid = locate(ContentType.liquid, name);
+                readBundle(ContentType.liquid, name, value);
+            }else{
+                readBundle(ContentType.liquid, name, value);
+                liquid = make(resolve(value.getString("type", null), Liquid.class), mod + "-" + name);
+                value.remove("type");
+            }
+            currentContent = liquid;
+            read(() -> readFields(liquid, value));
+            return liquid;
+        },
+        ContentType.status, parser(ContentType.status, StatusEffect::new),
+        ContentType.sector, (TypeParser<SectorPreset>)(mod, name, value) -> {
+            if(value.isString()){
+                return locate(ContentType.sector, name);
+            }
+
+            if(!value.has("sector") || !value.get("sector").isNumber()) throw new RuntimeException("SectorPresets must have a sector number.");
+
+            SectorPreset out = new SectorPreset(mod + "-" + name, currentMod);
+
+            currentContent = out;
+            read(() -> {
+                Planet planet = locate(ContentType.planet, value.getString("planet", "serpulo"));
+
+                if(planet == null) throw new RuntimeException("Planet '" + value.getString("planet") + "' not found.");
+
+                out.initialize(planet, value.getInt("sector", 0));
+
+                value.remove("sector");
+                value.remove("planet");
+
+                if(value.has("rules")){
+                    JsonValue r = value.remove("rules");
+                    if(!r.isObject()) throw new RuntimeException("Rules must be an object!");
+                    out.rules = rules -> {
+                        try{
+                            //Use standard JSON, this is not content-parser relevant
+                            JsonIO.json.readFields(rules, r);
+                        }catch(Throwable e){ //Try not to crash here, as that would be catastrophic and confusing
+                            Log.err(e);
+                        }
+                    };
+                }
+
+                readFields(out, value);
+            });
+            return out;
+        },
+        ContentType.planet, (TypeParser<Planet>)(mod, name, value) -> {
+            if(value.isString()) return locate(ContentType.planet, name);
+
+            Planet parent = locate(ContentType.planet, value.getString("parent", ""));
+            Planet planet = new Planet(mod + "-" + name, parent, value.getFloat("radius", 1f), value.getInt("sectorSize", 0));
+
+            if(value.has("mesh")){
+                var mesh = value.get("mesh");
+                if(!mesh.isObject() && !mesh.isArray()) throw new RuntimeException("Meshes must be objects.");
+                value.remove("mesh");
+                planet.meshLoader = () -> {
+                    //don't crash, just log an error
+                    try{
+                        return parseMesh(planet, mesh);
+                    }catch(Exception e){
+                        Log.err(e);
+                        return new ShaderSphereMesh(planet, Shaders.unlit, 2);
+                    }
+                };
+            }
+
+            if(value.has("cloudMesh")){
+                var mesh = value.get("cloudMesh");
+                if(!mesh.isObject() && !mesh.isArray()) throw new RuntimeException("Meshes must be objects.");
+                value.remove("cloudMesh");
+                planet.cloudMeshLoader = () -> {
+                    //don't crash, just log an error
+                    try{
+                        return parseMesh(planet, mesh);
+                    }catch(Exception e){
+                        Log.err(e);
+                        return null;
+                    }
+                };
+            }
+
+            //always one sector right now...
+            planet.sectors.add(new Sector(planet, Ptile.empty));
+
+            currentContent = planet;
+            read(() -> readFields(planet, value));
+            return planet;
+        },
+        ContentType.team, (TypeParser<TeamEntry>)(mod, name, value) -> {
+            TeamEntry entry;
+            Team team;
+            if(value.has("team")){
+                team = (Team)classParsers.get(Team.class).parse(Team.class, value.get("team"));
+            }else{
+                throw new RuntimeException("Team field missing.");
+            }
+            value.remove("team");
+
+            if(locate(ContentType.team, name) != null){
+                entry = locate(ContentType.team, name);
+                readBundle(ContentType.team, name, value);
+            }else{
+                readBundle(ContentType.team, name, value);
+                entry = new TeamEntry(mod + "-" + name, team);
+            }
+            currentContent = entry;
+            read(() -> readFields(entry, value));
+            return entry;
+        }
     );
 
     private Prov<Unit> unitType(JsonValue value){
@@ -354,7 +730,12 @@ public class ContentParser{
             case "legs" -> LegsUnit::create;
             case "naval" -> UnitWaterMove::create;
             case "payload" -> PayloadUnit::create;
-            default -> throw new RuntimeException("Invalid unit type: '" + value + "'. Must be 'flying/mech/legs/naval/payload'.");
+            case "missile" -> TimedKillUnit::create;
+            case "tank" -> TankUnit::create;
+            case "hover" -> ElevationMoveUnit::create;
+            case "tether" -> BuildingTetherPayloadUnit::create;
+            case "crawl" -> CrawlUnit::create;
+            default -> throw new RuntimeException("Invalid unit type: '" + value + "'. Must be 'flying/mech/legs/naval/payload/missile/tether/crawl'.");
         };
     }
 
@@ -425,6 +806,12 @@ public class ContentParser{
             this.currentMod = mod;
             this.currentContent = cont;
             run.run();
+
+            //check nulls after parsing
+            if(cont != null){
+                toBeParsed.remove(cont);
+                checkNullFields(cont);
+            }
         });
     }
 
@@ -447,6 +834,7 @@ public class ContentParser{
         try{
             run.run();
         }catch(Throwable t){
+            Log.err(t);
             //don't overwrite double errors
             markError(currentContent, t);
         }
@@ -478,13 +866,14 @@ public class ContentParser{
             json = json.replace("#", "\\#");
         }
 
+        currentMod = mod;
+
         JsonValue value = parser.fromJson(null, Jval.read(json).toString(Jformat.plain));
 
         if(!parsers.containsKey(type)){
             throw new SerializationException("No parsers for content type '" + type + "'");
         }
 
-        currentMod = mod;
         boolean located = locate(type, name) != null;
         Content c = parsers.get(type).parse(mod.name, name, value);
         c.minfo.sourceFile = file;
@@ -539,6 +928,85 @@ public class ContentParser{
         return first != null ? first : Vars.content.getByName(type, currentMod.name + "-" + name);
     }
 
+    private <T extends MappableContent> T locateAny(String name){
+        for(ContentType t : ContentType.all){
+            var out = locate(t, name);
+            if(out != null){
+                return (T)out;
+            }
+        }
+        return null;
+    }
+
+    private GenericMesh[] parseMeshes(Planet planet, JsonValue array){
+        var res = new GenericMesh[array.size];
+        for(int i = 0; i < array.size; i++){
+            //yes get is O(n) but it's practically irrelevant here
+            res[i] = parseMesh(planet, array.get(i));
+        }
+        return res;
+    }
+
+    private GenericMesh parseMesh(Planet planet, JsonValue data){
+        if(data.isArray()){
+            return new MultiMesh(parseMeshes(planet, data));
+        }
+
+        String tname = Strings.capitalize(data.getString("type", "NoiseMesh"));
+
+        return switch(tname){
+            //TODO NoiseMesh is bad
+            case "NoiseMesh" -> new NoiseMesh(planet,
+            data.getInt("seed", 0), data.getInt("divisions", 1), data.getFloat("radius", 1f),
+            data.getInt("octaves", 1), data.getFloat("persistence", 0.5f), data.getFloat("scale", 1f), data.getFloat("mag", 0.5f),
+            Color.valueOf(data.getString("color1", data.getString("color", "ffffff"))),
+            Color.valueOf(data.getString("color2", data.getString("color", "ffffff"))),
+            data.getInt("colorOct", 1), data.getFloat("colorPersistence", 0.5f), data.getFloat("colorScale", 1f),
+            data.getFloat("colorThreshold", 0.5f));
+            case "SunMesh" -> {
+                var cvals = data.get("colors").asStringArray();
+                var colors = new Color[cvals.length];
+                for(int i=0; i<cvals.length; i++){
+                    colors[i] = Color.valueOf(cvals[i]);
+                }
+
+                yield new SunMesh(planet, data.getInt("divisions", 1), data.getInt("octaves", 1), data.getFloat("persistence", 0.5f),
+                data.getFloat("scl", 1f), data.getFloat("pow", 1f), data.getFloat("mag", 0.5f),
+                data.getFloat("colorScale", 1f), colors);
+            }
+            case "HexSkyMesh" -> new HexSkyMesh(planet,
+            data.getInt("seed", 0), data.getFloat("speed", 0), data.getFloat("radius", 1f),
+            data.getInt("divisions", 3), Color.valueOf(data.getString("color", "ffffff")), data.getInt("octaves", 1),
+            data.getFloat("persistence", 0.5f), data.getFloat("scale", 1f), data.getFloat("thresh", 0.5f));
+            case "MultiMesh" -> new MultiMesh(parseMeshes(planet, data.get("meshes")));
+            case "MatMesh" -> new MatMesh(parseMesh(planet, data.get("mesh")), parser.readValue(Mat3D.class, data.get("mat")));
+            default -> throw new RuntimeException("Unknown mesh type: " + tname);
+        };
+    }
+
+    private PartProgress parseProgressOp(PartProgress base, String op, JsonValue data){
+        //I have to hard-code this, no easy way of getting parameter names, unfortunately
+        return switch(op){
+            case "inv" -> base.inv();
+            case "slope" -> base.slope();
+            case "clamp" -> base.clamp();
+            case "delay" -> base.delay(data.getFloat("amount"));
+            case "sustain" -> base.sustain(data.getFloat("offset", 0f), data.getFloat("grow", 0f), data.getFloat("sustain"));
+            case "shorten" -> base.shorten(data.getFloat("amount"));
+            case "compress" -> base.compress(data.getFloat("start"), data.getFloat("end"));
+            case "add" -> data.has("amount") ? base.add(data.getFloat("amount")) : base.add(parser.readValue(PartProgress.class, data.get("other")));
+            case "blend" -> base.blend(parser.readValue(PartProgress.class, data.get("other")), data.getFloat("amount"));
+            case "mul" -> data.has("amount") ? base.mul(data.getFloat("amount")) : base.mul(parser.readValue(PartProgress.class, data.get("other")));
+            case "min" -> base.min(parser.readValue(PartProgress.class, data.get("other")));
+            case "sin" -> base.sin(data.has("offset") ? data.getFloat("offset") : 0f, data.getFloat("scl"), data.getFloat("mag"));
+            case "absin" -> base.absin(data.getFloat("scl"), data.getFloat("mag"));
+            case "mod" -> base.mod(data.getFloat("amount"));
+            case "loop" -> base.loop(data.getFloat("time"));
+            case "curve" -> data.has("interp") ? base.curve(parser.readValue(Interp.class, data.get("interp"))) : base.curve(data.getFloat("offset"), data.getFloat("duration"));
+            default -> throw new RuntimeException("Unknown operation '" + op + "', check PartProgress class for a list of methods.");
+        };
+    }
+
     <T> T make(Class<T> type){
         try{
             Constructor<T> cons = type.getDeclaredConstructor();
@@ -588,7 +1056,6 @@ public class ContentParser{
             throw new RuntimeException(e);
         }
     }
-
     Object fieldOpt(Class<?> type, JsonValue value){
         try{
             return type.getField(value.asString()).get(null);
@@ -624,13 +1091,13 @@ public class ContentParser{
         JsonValue research = jsonMap.remove("research");
 
         toBeParsed.remove(object);
-        Class type = object.getClass();
-        ObjectMap<String, FieldMetadata> fields = parser.getFields(type);
+        var type = object.getClass();
+        var fields = parser.getFields(type);
         for(JsonValue child = jsonMap.child; child != null; child = child.next){
             FieldMetadata metadata = fields.get(child.name().replace(" ", "_"));
             if(metadata == null){
                 if(ignoreUnknownFields){
-                    Log.warn("@: Ignoring unknown field: " + child.name + " (" + type.getName() + ")", object);
+                    Log.warn("[@]: Ignoring unknown field: @ (@)", currentContent.minfo.sourceFile.name(), child.name, type.getSimpleName());
                     continue;
                 }else{
                     SerializationException ex = new SerializationException("Field not found: " + child.name + " (" + type.getName() + ")");
@@ -640,7 +1107,41 @@ public class ContentParser{
             }
             Field field = metadata.field;
             try{
-                field.set(object, parser.readValue(field.getType(), metadata.elementType, child, metadata.keyType));
+                if(child.isObject() && child.has("add") && (Seq.class.isAssignableFrom(field.getType()) || ObjectSet.class.isAssignableFrom(field.getType()))){
+                    Object readField = parser.readValue(field.getType(), metadata.elementType, child.get("add"), metadata.keyType);
+                    Object fieldObj = field.get(object);
+
+                    if(fieldObj instanceof ObjectSet set){
+                        set.addAll((ObjectSet)readField);
+                    }else if(fieldObj instanceof Seq seq){
+                        seq.addAll((Seq)readField);
+                    }else{
+                        throw new SerializationException("This should be impossible");
+                    }
+                }else{
+                    boolean isMap = ObjectMap.class.isAssignableFrom(field.getType()) || ObjectIntMap.class.isAssignableFrom(field.getType()) || ObjectFloatMap.class.isAssignableFrom(field.getType());
+                    boolean mergeMap = isMap && child.has("add") && child.get("add").isBoolean() && child.getBoolean("add", false);
+
+                    if(mergeMap){
+                        child.remove("add");
+                    }
+
+                    Object readField = parser.readValue(field.getType(), metadata.elementType, child, metadata.keyType);
+                    Object fieldObj = field.get(object);
+
+                    //if a map has add: true, add its contents to the map instead
+                    if(mergeMap && (fieldObj instanceof ObjectMap<?,?> || fieldObj instanceof ObjectIntMap<?> || fieldObj instanceof ObjectFloatMap<?>)){
+                        if(field.get(object) instanceof ObjectMap<?,?> baseMap){
+                            baseMap.putAll((ObjectMap)readField);
+                        }else if(field.get(object) instanceof ObjectIntMap<?> baseMap){
+                            baseMap.putAll((ObjectIntMap)readField);
+                        }else if(field.get(object) instanceof ObjectFloatMap<?> baseMap){
+                            baseMap.putAll((ObjectFloatMap)readField);
+                        }
+                    }else{
+                        field.set(object, readField);
+                    }
+                }
             }catch(IllegalAccessException ex){
                 throw new SerializationException("Error accessing field: " + field.getName() + " (" + type.getName() + ")", ex);
             }catch(SerializationException ex){
@@ -654,7 +1155,6 @@ public class ContentParser{
             }
         }
 
-
         if(object instanceof UnlockableContent unlock && research != null){
 
             //add research tech node
@@ -666,7 +1166,7 @@ public class ContentParser{
                 researchName = research.asString();
                 customRequirements = null;
             }else{
-                researchName = research.getString("parent");
+                researchName = research.getString("parent", null);
                 customRequirements = research.has("requirements") ? parser.readValue(ItemStack[].class, research.get("requirements")) : null;
             }
 
@@ -676,51 +1176,95 @@ public class ContentParser{
                 lastNode.remove();
             }
 
-            TechNode node = new TechNode(null, unlock, customRequirements == null ? unlock.researchRequirements() : customRequirements);
+            TechNode node = new TechNode(null, unlock, customRequirements == null ? ItemStack.empty : customRequirements);
             LoadedMod cur = currentMod;
 
             postreads.add(() -> {
                 currentContent = unlock;
                 currentMod = cur;
 
+                //add custom objectives
+                if(research.has("objectives")){
+                    node.objectives.addAll(parser.readValue(Objective[].class, research.get("objectives")));
+                }
+
+                //all items have a produce requirement unless already specified
+                if((unlock instanceof Item || unlock instanceof Liquid) && !node.objectives.contains(o -> o instanceof Produce p && p.content == unlock)){
+                    node.objectives.add(new Produce(unlock));
+                }
+
                 //remove old node from parent
                 if(node.parent != null){
                     node.parent.children.remove(node);
                 }
 
-
-                //find parent node.
-                TechNode parent = TechTree.all.find(t -> t.content.name.equals(researchName) || t.content.name.equals(currentMod.name + "-" + researchName));
-
-                if(parent == null){
-                    throw new IllegalArgumentException("Content '" + researchName + "' isn't in the tech tree, but '" + unlock.name + "' requires it to be researched.");
+                if(customRequirements == null){
+                    node.setupRequirements(unlock.researchRequirements());
                 }
 
-                //add this node to the parent
-                if(!parent.children.contains(node)){
-                    parent.children.add(node);
+                if(research.has("planet")){
+                    node.planet = find(ContentType.planet, research.getString("planet"));
+                }
+
+                if(research.getBoolean("root", false)){
+                    node.name = research.getString("name", unlock.name);
+                    node.requiresUnlock = research.getBoolean("requiresUnlock", false);
+                    TechTree.roots.add(node);
+                }else{
+                    if(researchName != null){
+                        //find parent node.
+                        TechNode parent = TechTree.all.find(t -> t.content.name.equals(researchName) || t.content.name.equals(currentMod.name + "-" + researchName) || t.content.name.equals(SaveVersion.mapFallback(researchName)));
+
+                        if(parent == null){
+                            Log.warn("Content '" + researchName + "' isn't in the tech tree, but '" + unlock.name + "' requires it to be researched.");
+                        }else{
+                            //add this node to the parent
+                            if(!parent.children.contains(node)){
+                                parent.children.add(node);
+                            }
+                            //reparent the node
+                            node.parent = parent;
+                            node.planet = parent.planet;
+                        }
+                    }else{
+                        Log.warn(unlock.name + " is not a root node, and does not have a `parent: ` property. Ignoring.");
+                    }
                 }
-                //reparent the node
-                node.parent = parent;
             });
         }
     }
 
-    /** Tries to resolve a class from a list of potential class names. */
-    <T> Class<T> resolve(String base, String... potentials){
-        if(!base.isEmpty() && Character.isLowerCase(base.charAt(0))) base = Strings.capitalize(base);
+    /** Tries to resolve a class from the class type map. */
+    <T> Class<T> resolve(String base){
+        return resolve(base, null);
+    }
 
-        for(String type : potentials){
+    /** Tries to resolve a class from the class type map. */
+    <T> Class<T> resolve(String base, Class<T> def){
+        //no base class specified
+        if((base == null || base.isEmpty()) && def != null) return def;
+
+        //return mapped class if found in the global map
+        var out = ClassMap.classes.get(!base.isEmpty() && Character.isLowerCase(base.charAt(0)) ? Strings.capitalize(base) : base);
+        if(out != null) return (Class<T>)out;
+
+        //try to resolve it as a raw class name
+        if(base.indexOf('.') != -1){
             try{
-                return (Class<T>)Class.forName(type + '.' + base);
+                return (Class<T>)Class.forName(base);
             }catch(Exception ignored){
+                //try to use mod class loader
                 try{
-                    return (Class<T>)Class.forName(type + '$' + base);
-                }catch(Exception ignored2){
-                }
+                    return (Class<T>)Class.forName(base, true, mods.mainLoader());
+                }catch(Exception ignore){}
             }
         }
-        throw new IllegalArgumentException("Types not found: " + base + "." + potentials[0]);
+
+        if(def != null){
+            Log.warn("[@] No type '" + base + "' found, defaulting to type '" + def.getSimpleName() + "'", currentContent == null ? currentMod.name : "");
+            return def;
+        }
+        throw new IllegalArgumentException("Type not found: " + base);
     }
 
     private interface FieldParser{
@@ -731,4 +1275,17 @@ public class ContentParser{
         T parse(String mod, String name, JsonValue value) throws Exception;
     }
 
+    //intermediate class for parsing
+    static class UnitReq{
+        public Block block;
+        public ItemStack[] requirements = {};
+        @Nullable
+        public UnitType previous;
+        public float time = 60f * 10f;
+    }
+
+    public interface ParseListener{
+        void parsed(Class<?> type, JsonValue jsonData, Object result);
+    }
+
 }
diff --git a/core/src/mindustry/mod/Mod.java b/core/src/mindustry/mod/Mod.java
index eea38820c6..930f967a06 100644
--- a/core/src/mindustry/mod/Mod.java
+++ b/core/src/mindustry/mod/Mod.java
@@ -4,7 +4,13 @@ import arc.files.*;
 import arc.util.*;
 import mindustry.*;
 
-public class Mod{
+public abstract class Mod{
+
+    /** @return the folder where configuration files for this mod should go.*/
+    public Fi getConfigFolder(){
+        return Vars.mods.getConfigFolder(this);
+    }
+
     /** @return the config file for this plugin, as the file 'mods/[plugin-name]/config.json'.*/
     public Fi getConfig(){
         return Vars.mods.getConfig(this);
@@ -25,7 +31,7 @@ public class Mod{
 
     }
 
-    /** Register any commands to be used on the client side, e.g. sent from an in-game player.. */
+    /** Register any commands to be used on the client side, e.g. sent from an in-game player. */
     public void registerClientCommands(CommandHandler handler){
 
     }
diff --git a/core/src/mindustry/mod/ModClassLoader.java b/core/src/mindustry/mod/ModClassLoader.java
new file mode 100644
index 0000000000..d9c05036f9
--- /dev/null
+++ b/core/src/mindustry/mod/ModClassLoader.java
@@ -0,0 +1,49 @@
+package mindustry.mod;
+
+import arc.struct.*;
+
+public class ModClassLoader extends ClassLoader{
+    private Seq<ClassLoader> children = new Seq<>();
+    private ThreadLocal<Boolean> inChild = new ThreadLocal<>(){
+        @Override
+        protected Boolean initialValue(){
+            return Boolean.FALSE;
+        }
+    };
+
+    public ModClassLoader(ClassLoader parent){
+        super(parent);
+    }
+
+    public void addChild(ClassLoader child){
+        children.add(child);
+    }
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException{
+        //a child may try to delegate class loading to its parent, which is *this class loader* - do not let that happen
+        if(inChild.get()){
+            inChild.set(false);
+            throw new ClassNotFoundException(name);
+        }
+
+        ClassNotFoundException last = null;
+        int size = children.size;
+
+        //if it doesn't exist in the main class loader, try all the children
+        for(int i = 0; i < size; i++){
+            try{
+                try{
+                    inChild.set(true);
+                    return children.get(i).loadClass(name);
+                }finally{
+                    inChild.set(false);
+                }
+            }catch(ClassNotFoundException e){
+                last = e;
+            }
+        }
+
+        throw (last == null ? new ClassNotFoundException(name) : last);
+    }
+}
diff --git a/core/src/mindustry/mod/ModListing.java b/core/src/mindustry/mod/ModListing.java
index 08a1a8e963..e4dfbeccc6 100644
--- a/core/src/mindustry/mod/ModListing.java
+++ b/core/src/mindustry/mod/ModListing.java
@@ -2,8 +2,9 @@ package mindustry.mod;
 
 /** Mod listing as a data class. */
 public class ModListing{
-    public String repo, name, author, lastUpdated, description, minGameVersion;
+    public String repo, name, subtitle, author, lastUpdated, description,  minGameVersion;
     public boolean hasScripts, hasJava;
+    public String[] contentTypes = {};
     public int stars;
 
     @Override
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 4c6605fbbf..572f4ceee1 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -20,37 +20,61 @@ import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.MultiPacker.*;
+import mindustry.mod.ContentParser.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 
 import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
 
 import static mindustry.Vars.*;
 
 public class Mods implements Loadable{
+    private static final String[] metaFiles = {"mod.json", "mod.hjson", "plugin.json", "plugin.hjson"};
+    private static final ObjectSet<String> blacklistedMods = ObjectSet.with("ui-lib", "braindustry");
+
     private Json json = new Json();
     private @Nullable Scripts scripts;
     private ContentParser parser = new ContentParser();
     private ObjectMap<String, Seq<Fi>> bundles = new ObjectMap<>();
-    private ObjectSet<String> specialFolders = ObjectSet.with("bundles", "sprites", "sprites-override");
+    private ObjectSet<String> specialFolders = ObjectSet.with("bundles", "sprites", "sprites-override", ".git");
 
     private int totalSprites;
+    private ObjectFloatMap<String> textureResize = new ObjectFloatMap<>();
     private MultiPacker packer;
 
+    /** Ordered mods cache. Set to null to invalidate. */
+    private @Nullable Seq<LoadedMod> lastOrderedMods = new Seq<>();
+
+    private ModClassLoader mainLoader = new ModClassLoader(getClass().getClassLoader());
+
     Seq<LoadedMod> mods = new Seq<>();
     private ObjectMap<Class<?>, ModMeta> metas = new ObjectMap<>();
-    private boolean requiresReload, createdAtlas;
+    private boolean requiresReload;
 
     public Mods(){
         Events.on(ClientLoadEvent.class, e -> Core.app.post(this::checkWarnings));
     }
 
-    /** Returns a file named 'config.json' in a special folder for the specified plugin.
-     * Call this in init(). */
-    public Fi getConfig(Mod mod){
+    /** @return the main class loader for all mods */
+    public ClassLoader mainLoader(){
+        return mainLoader;
+    }
+
+    /** @return the folder where configuration files for this mod should go. Call this in init(). */
+    public Fi getConfigFolder(Mod mod){
         ModMeta load = metas.get(mod.getClass());
         if(load == null) throw new IllegalArgumentException("Mod is not loaded yet (or missing)!");
-        return modDirectory.child(load.name).child("config.json");
+        Fi result = modDirectory.child(load.name);
+        result.mkdirs();
+        return result;
+    }
+
+    /** @return a file named 'config.json' in the config folder for the specified mod.
+     * Call this in init(). */
+    public Fi getConfig(Mod mod){
+        return getConfigFolder(mod).child("config.json");
     }
 
     /** Returns a list of files per mod subdirectory. */
@@ -65,23 +89,46 @@ public class Mods implements Loadable{
         });
     }
 
-    /** @return the loaded mod found by class, or null if not found. */
-    public @Nullable LoadedMod getMod(Class<? extends Mod> type){
-        return mods.find(m -> m.enabled() && m.main != null && m.main.getClass() == type);
+    /** @return the loaded mod found by name, or null if not found. */
+    public @Nullable LoadedMod getMod(String name){
+        return mods.find(m -> m.name.equals(name));
     }
 
-    /** Imports an external mod file.*/
-    public void importMod(Fi file) throws IOException{
-        Fi dest = modDirectory.child(file.name());
-        if(dest.exists()){
-            throw new IOException("A file with the same name already exists in the mod folder!");
+    /** @return the loaded mod found by class, or null if not found. */
+    public @Nullable LoadedMod getMod(Class<? extends Mod> type){
+        return mods.find(m -> m.main != null && m.main.getClass() == type);
+    }
+
+    /** Imports an external mod file. Folders are not supported here. */
+    public LoadedMod importMod(Fi file) throws IOException{
+        //for some reason, android likes to add colons to file names, e.g. primary:ExampleJavaMod.jar, which breaks dexing
+        String baseName = file.nameWithoutExtension().replace(':', '_').replace(' ', '_');
+        String finalName = baseName;
+        //find a name to prevent any name conflicts
+        int count = 1;
+        while(modDirectory.child(finalName + ".zip").exists()){
+            finalName = baseName + "" + count++;
         }
 
-        file.copyTo(dest);
+        Fi dest = modDirectory.child(finalName + ".zip");
+
         try{
-            mods.add(loadMod(dest));
+            file.copyTo(dest);
+
+            var loaded = loadMod(dest, true, true);
+            mods.add(loaded);
+            //invalidate ordered mods cache
+            lastOrderedMods = null;
             requiresReload = true;
+            //enable the mod on import
+            Core.settings.put("mod-" + loaded.name + "-enabled", true);
             sortMods();
+            //try to load the mod's icon so it displays on import
+            Core.app.post(() -> loadIcon(loaded));
+
+            Events.fire(Trigger.importMod);
+
+            return loaded;
         }catch(IOException e){
             dest.delete();
             throw e;
@@ -97,50 +144,103 @@ public class Mods implements Loadable{
         if(!mods.contains(LoadedMod::enabled)) return;
         Time.mark();
 
+        //TODO this should estimate sprite sizes per page
         packer = new MultiPacker();
+        //all packing tasks to await
+        var tasks = new Seq<Future<Runnable>>();
 
         eachEnabled(mod -> {
             Seq<Fi> sprites = mod.root.child("sprites").findAll(f -> f.extension().equals("png"));
             Seq<Fi> overrides = mod.root.child("sprites-override").findAll(f -> f.extension().equals("png"));
-            packSprites(sprites, mod, true);
-            packSprites(overrides, mod, false);
+
+            packSprites(sprites, mod, true, tasks);
+            packSprites(overrides, mod, false, tasks);
+
             Log.debug("Packed @ images for mod '@'.", sprites.size + overrides.size, mod.meta.name);
             totalSprites += sprites.size + overrides.size;
         });
 
+        for(var result : tasks){
+            try{
+                var packRun = result.get();
+                if(packRun != null){ //can be null for very strange reasons, ignore if that's the case
+                    try{
+                        //actually pack the image
+                        packRun.run();
+                    }catch(Exception e){ //the image can fail to fit in the spritesheet
+                        Log.err("Failed to fit image into the spritesheet, skipping.");
+                        Log.err(e);
+                    }
+                }
+            }catch(Exception e){ //this means loading the image failed, log it and move on
+                Log.err(e);
+            }
+        }
+
         Log.debug("Time to pack textures: @", Time.elapsed());
     }
 
     private void loadIcons(){
         for(LoadedMod mod : mods){
-            //try to load icon for each mod that can have one
-            if(mod.root.child("icon.png").exists()){
-                try{
-                    mod.iconTexture = new Texture(mod.root.child("icon.png"));
-                }catch(Throwable t){
-                    Log.err("Failed to load icon for mod '" + mod.name + "'.", t);
-                }
+            loadIcon(mod);
+        }
+    }
+
+    private void loadIcon(LoadedMod mod){
+        //try to load icon for each mod that can have one
+        if(mod.root.child("icon.png").exists() && !headless){
+            try{
+                mod.iconTexture = new Texture(mod.root.child("icon.png"));
+                mod.iconTexture.setFilter(TextureFilter.linear);
+            }catch(Throwable t){
+                Log.err("Failed to load icon for mod '" + mod.name + "'.", t);
             }
         }
     }
 
-    private void packSprites(Seq<Fi> sprites, LoadedMod mod, boolean prefix){
+    private void packSprites(Seq<Fi> sprites, LoadedMod mod, boolean prefix, Seq<Future<Runnable>> tasks){
+        boolean bleed = Core.settings.getBool("linear", true) && !mod.meta.pregenerated;
+        float textureScale = mod.meta.texturescale;
+
         for(Fi file : sprites){
-            try(InputStream stream = file.read()){
-                byte[] bytes = Streams.copyBytes(stream, Math.max((int)file.length(), 512));
-                Pixmap pixmap = new Pixmap(bytes, 0, bytes.length);
-                packer.add(getPage(file), (prefix ? mod.name + "-" : "") + file.nameWithoutExtension(), new PixmapRegion(pixmap));
-                pixmap.dispose();
-            }catch(IOException e){
-                Core.app.post(() -> {
-                    Log.err("Error packing images for mod: @", mod.meta.name);
-                    Log.err(e);
-                    if(!headless) ui.showException(e);
-                });
-                break;
+            String
+            baseName = file.nameWithoutExtension(),
+            regionName = baseName.contains(".") ? baseName.substring(0, baseName.indexOf(".")) : baseName;
+
+            if(!prefix && !Core.atlas.has(regionName)){
+                Log.warn("Sprite '@' in mod '@' attempts to override a non-existent sprite. Ignoring.", regionName, mod.name);
+                continue;
+
+                //(horrible code below)
             }
+
+            //read and bleed pixmaps in parallel
+            tasks.add(mainExecutor.submit(() -> {
+
+                try{
+                    Pixmap pix = new Pixmap(file.readBytes());
+                    //only bleeds when linear filtering is on at startup
+                    if(bleed){
+                        Pixmaps.bleed(pix, 2);
+                    }
+                    //this returns a *runnable* which actually packs the resulting pixmap; this has to be done synchronously outside the method
+                    return () -> {
+                        //don't prefix with mod name if it's already prefixed by a category, e.g. `block-modname-content-full`.
+                        int hyphen = baseName.indexOf('-');
+                        String fullName = ((prefix && !(hyphen != -1 && baseName.substring(hyphen + 1).startsWith(mod.name + "-"))) ? mod.name + "-" : "") + baseName;
+
+                        packer.add(getPage(file), fullName, new PixmapRegion(pix));
+                        if(textureScale != 1.0f){
+                            textureResize.put(fullName, textureScale);
+                        }
+                        pix.dispose();
+                    };
+                }catch(Exception e){
+                    //rethrow exception with details about the cause of failure
+                    throw new Exception("Failed to load image " + file + " for mod " + mod.name, e);
+                }
+            }));
         }
-        totalSprites += sprites.size;
     }
 
     @Override
@@ -152,61 +252,174 @@ public class Mods implements Loadable{
 
         //get textures packed
         if(totalSprites > 0){
-            if(!createdAtlas) Core.atlas = new TextureAtlas(Core.files.internal("sprites/sprites.atlas"));
-            createdAtlas = true;
 
-            for(AtlasRegion region : Core.atlas.getRegions()){
-                PageType type = getPage(region);
-                if(!packer.has(type, region.name)){
-                    packer.add(type, region.name, Core.atlas.getPixmap(region));
+            class RegionEntry{
+                String name;
+                PixmapRegion region;
+                int[] splits, pads;
+
+                RegionEntry(String name, PixmapRegion region, int[] splits, int[] pads){
+                    this.name = name;
+                    this.region = region;
+                    this.splits = splits;
+                    this.pads = pads;
                 }
             }
 
-            TextureFilter filter = Core.settings.getBool("linear") ? TextureFilter.linear : TextureFilter.nearest;
+            Seq<RegionEntry>[] entries = new Seq[PageType.all.length];
+            for(int i = 0; i < PageType.all.length; i++){
+                entries[i] = new Seq<>();
+            }
 
-            //flush so generators can use these sprites
-            packer.flush(filter, Core.atlas);
+            ObjectMap<Texture, PageType> pageTypes = ObjectMap.of(
+            Core.atlas.find("white").texture, PageType.main,
+            Core.atlas.find("stone1").texture, PageType.environment,
+            Core.atlas.find("clear-editor").texture, PageType.editor,
+            Core.atlas.find("whiteui").texture, PageType.ui,
+            Core.atlas.find("rubble-1-0").texture, PageType.rubble
+            );
 
+            for(AtlasRegion region : Core.atlas.getRegions()){
+                PageType type = pageTypes.get(region.texture, PageType.main);
+
+                if(!packer.has(type, region.name)){
+                    entries[type.ordinal()].add(new RegionEntry(region.name, Core.atlas.getPixmap(region), region.splits, region.pads));
+                }
+            }
+
+            //sort each page type by size first, for optimal packing
+            for(int i = 0; i < PageType.all.length; i++){
+                var rects = entries[i];
+                var type = PageType.all[i];
+                //TODO is this in reverse order?
+                rects.sort(Structs.comparingInt(o -> -Math.max(o.region.width, o.region.height)));
+
+                for(var entry : rects){
+                    packer.add(type, entry.name, entry.region, entry.splits, entry.pads);
+                }
+            }
+
+            Core.atlas.dispose();
+
+            //dead shadow-atlas for getting regions, but not pixmaps
+            var shadow = Core.atlas;
+            //dummy texture atlas that returns the 'shadow' regions; used for mod loading
+            Core.atlas = new TextureAtlas(){
+                {
+                    //needed for the correct operation of the found() method in the TextureRegion
+                    error = shadow.find("error");
+                }
+
+                @Override
+                public AtlasRegion find(String name){
+                    var base = packer.get(name);
+
+                    if(base != null){
+                        var reg = new AtlasRegion(shadow.find(name).texture, base.x, base.y, base.width, base.height);
+                        reg.name = name;
+                        reg.pixmapRegion = base;
+                        return reg;
+                    }
+
+                    return shadow.find(name);
+                }
+
+                @Override
+                public boolean isFound(TextureRegion region){
+                    return region != shadow.find("error");
+                }
+
+                @Override
+                public TextureRegion find(String name, TextureRegion def){
+                    return !has(name) ? def : find(name);
+                }
+
+                @Override
+                public boolean has(String s){
+                    return shadow.has(s) || packer.get(s) != null;
+                }
+
+                //return the *actual* pixmap regions, not the disposed ones.
+                @Override
+                public PixmapRegion getPixmap(AtlasRegion region){
+                    PixmapRegion out = packer.get(region.name);
+                    //this should not happen in normal situations
+                    if(out == null) return packer.get("error");
+                    return out;
+                }
+            };
+
+            TextureFilter filter = Core.settings.getBool("linear", true) ? TextureFilter.linear : TextureFilter.nearest;
+
+            Time.mark();
             //generate new icons
             for(Seq<Content> arr : content.getContentMap()){
                 arr.each(c -> {
+                    //TODO this can be done in parallel
                     if(c instanceof UnlockableContent u && c.minfo.mod != null){
                         u.load();
-                        u.createIcons(packer);
+                        u.loadIcon();
+                        if(u.generateIcons && !c.minfo.mod.meta.pregenerated){
+                            u.createIcons(packer);
+                        }
                     }
                 });
             }
+            Log.debug("Time to generate icons: @", Time.elapsed());
+
+            //dispose old atlas data
+            Core.atlas = packer.flush(filter, new TextureAtlas(){
+                PixmapRegion fake = new PixmapRegion(new Pixmap(1, 1));
+                boolean didWarn = false;
+
+                @Override
+                public PixmapRegion getPixmap(AtlasRegion region){
+                    var other = super.getPixmap(region);
+                    if(other.pixmap.isDisposed()){
+                        if(!didWarn){
+                            Log.err(new RuntimeException("Calling getPixmap outside of createIcons is not supported! This will be a crash in the future."));
+                            didWarn = true;
+                        }
+                        return fake;
+                    }
+
+                    return other;
+                }
+            });
+
+            textureResize.each(e -> Core.atlas.find(e.key).scale = e.value);
 
-            Core.atlas = packer.flush(filter, new TextureAtlas());
             Core.atlas.setErrorRegion("error");
             Log.debug("Total pages: @", Core.atlas.getTextures().size);
+
+            packer.printStats();
         }
 
         packer.dispose();
         packer = null;
-        Log.debug("Time to update textures: @", Time.elapsed());
-    }
-
-    private PageType getPage(AtlasRegion region){
-        return
-            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;
+        Log.debug("Total time to generate & flush textures synchronously: @", Time.elapsed());
     }
 
     private PageType getPage(Fi file){
-        String parent = file.parent().name();
+        String path = file.path();
         return
-            parent.equals("environment") ? PageType.environment :
-            parent.equals("editor") ? PageType.editor :
-            parent.equals("ui") || file.parent().parent().name().equals("ui") ? PageType.ui :
+            path.contains("sprites/blocks/environment") || path.contains("sprites-override/blocks/environment") ? PageType.environment :
+            path.contains("sprites/editor") || path.contains("sprites-override/editor") ? PageType.editor :
+            path.contains("sprites/rubble") || path.contains("sprites-override/rubble") ? PageType.rubble :
+            path.contains("sprites/ui") || path.contains("sprites-override/ui") ? PageType.ui :
             PageType.main;
     }
 
     /** Removes a mod file and marks it for requiring a restart. */
     public void removeMod(LoadedMod mod){
+        if(!android && mod.loader != null){
+            try{
+                ClassLoaderCloser.close(mod.loader);
+            }catch(Exception e){
+                Log.err(e);
+            }
+        }
+
         if(mod.root instanceof ZipFi){
             mod.root.delete();
         }
@@ -219,7 +432,9 @@ public class Mods implements Loadable{
         }
         mods.remove(mod);
         mod.dispose();
-        requiresReload = true;
+        if(mod.state != ModState.disabled){
+            requiresReload = true;
+        }
     }
 
     public Scripts getScripts(){
@@ -236,18 +451,60 @@ public class Mods implements Loadable{
         return requiresReload;
     }
 
+    /** @return whether to skip mod loading due to previous initialization failure. */
+    public boolean skipModLoading(){
+        return failedToLaunch && Core.settings.getBool("modcrashdisable", true);
+    }
+
     /** Loads all mods from the folder, but does not call any methods on them.*/
     public void load(){
-        for(Fi file : modDirectory.list()){
-            if(!file.extension().equals("jar") && !file.extension().equals("zip") && !(file.isDirectory() && (file.child("mod.json").exists() || file.child("mod.hjson").exists()))) continue;
+        var candidates = new Seq<Fi>();
+
+        // Add local mods
+        Seq.with(modDirectory.list())
+        .retainAll(f -> f.extEquals("jar") || f.extEquals("zip") || (f.isDirectory() && Structs.contains(metaFiles, meta -> f.child(meta).exists())))
+        .each(candidates::add);
+
+        // Add Steam workshop mods
+        platform.getWorkshopContent(LoadedMod.class)
+        .each(candidates::add);
+
+        var mapping = new ObjectMap<String, Fi>();
+        var metas = new Seq<ModMeta>();
+
+        for(Fi file : candidates){
+            ModMeta meta = null;
+
+            try{
+                meta = findMeta(resolveRoot(file.isDirectory() ? file : new ZipFi(file)));
+            }catch(Throwable ignored){
+            }
+
+            if(meta == null || meta.name == null) continue;
+            metas.add(meta);
+            mapping.put(meta.internalName, file);
+        }
+
+        var resolved = resolveDependencies(metas);
+        for(var entry : resolved){
+            var file = mapping.get(entry.key);
+            var steam = platform.getWorkshopContent(LoadedMod.class).contains(file);
 
             Log.debug("[Mods] Loading mod @", file);
+
             try{
-                LoadedMod mod = loadMod(file);
+                LoadedMod mod = loadMod(file, false, entry.value == ModState.enabled);
+                mod.state = entry.value;
                 mods.add(mod);
+                //invalidate ordered mods cache
+                lastOrderedMods = null;
+                if(steam) mod.addSteamID(file.name());
             }catch(Throwable e){
                 if(e instanceof ClassNotFoundException && e.getMessage().contains("mindustry.plugin.Plugin")){
-                    Log.info("Plugin @ is outdated and needs to be ported to 6.0! Update its main class to inherit from 'mindustry.mod.Plugin'. See https://mindustrygame.github.io/wiki/modding/6-migrationv6/");
+                    Log.warn("Plugin '@' is outdated and needs to be ported to v7! Update its main class to inherit from 'mindustry.mod.Plugin'.", file.name());
+                }else if(steam){
+                    Log.err("Failed to load mod workshop file @. Skipping.", file);
+                    Log.err(e);
                 }else{
                     Log.err("Failed to load mod file @. Skipping.", file);
                     Log.err(e);
@@ -255,21 +512,19 @@ public class Mods implements Loadable{
             }
         }
 
-        //load workshop mods now
-        for(Fi file : platform.getWorkshopContent(LoadedMod.class)){
-            try{
-                LoadedMod mod = loadMod(file);
-                mods.add(mod);
-                mod.addSteamID(file.name());
-            }catch(Throwable e){
-                Log.err("Failed to load mod workshop file @. Skipping.", file);
-                Log.err(e);
+        // Resolve the state
+        mods.each(this::updateDependencies);
+        for(var mod : mods){
+            // Skip mods where the state has already been resolved
+            if(mod.state != ModState.enabled) continue;
+            if(!mod.isSupported()){
+                mod.state = ModState.unsupported;
+            }else if(!mod.shouldBeEnabled()){
+                mod.state = ModState.disabled;
             }
         }
 
-        resolveModState();
         sortMods();
-
         buildFiles();
     }
 
@@ -278,18 +533,6 @@ public class Mods implements Loadable{
         mods.sort(Structs.comps(Structs.comparingInt(m -> m.state.ordinal()), Structs.comparing(m -> m.name)));
     }
 
-    private void resolveModState(){
-        mods.each(this::updateDependencies);
-
-        for(LoadedMod mod : mods){
-            mod.state =
-                !mod.isSupported() ? ModState.unsupported :
-                mod.hasUnmetDependencies() ? ModState.missingDependencies :
-                !mod.shouldBeEnabled() ? ModState.disabled :
-                ModState.enabled;
-        }
-    }
-
     private void updateDependencies(LoadedMod mod){
         mod.dependencies.clear();
         mod.missingDependencies.clear();
@@ -302,22 +545,17 @@ public class Mods implements Loadable{
         }
     }
 
-    private void topoSort(LoadedMod mod, Seq<LoadedMod> stack, ObjectSet<LoadedMod> visited){
-        visited.add(mod);
-        mod.dependencies.each(m -> !visited.contains(m), m -> topoSort(m, stack, visited));
-        stack.add(mod);
-    }
-
     /** @return mods ordered in the correct way needed for dependencies. */
-    private Seq<LoadedMod> orderedMods(){
-        ObjectSet<LoadedMod> visited = new ObjectSet<>();
-        Seq<LoadedMod> result = new Seq<>();
-        eachEnabled(mod -> {
-            if(!visited.contains(mod)){
-                topoSort(mod, result, visited);
-            }
-        });
-        return result;
+    public Seq<LoadedMod> orderedMods(){
+        //update cache if it's "dirty"/empty
+        if(lastOrderedMods == null){
+            //only enabled mods participate; this state is resolved in load()
+            Seq<LoadedMod> enabled = mods.select(LoadedMod::enabled);
+
+            var mapping = enabled.asMap(m -> m.meta.internalName);
+            lastOrderedMods = resolveDependencies(enabled.map(m -> m.meta)).orderedKeys().map(mapping::get);
+        }
+        return lastOrderedMods;
     }
 
     public LoadedMod locateMod(String name){
@@ -347,6 +585,7 @@ public class Mods implements Loadable{
                 }
             }
         }
+        Events.fire(new FileTreeInitEvent());
 
         //add new keys to each bundle
         I18NBundle bundle = Core.bundle;
@@ -394,7 +633,7 @@ 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.cleart, () -> {
                                     new Dialog(""){{
                                         setFillParent(true);
                                         cont.pane(e -> e.add(c.minfo.error).wrap().grow().labelAlign(Align.center, Align.left)).grow();
@@ -494,27 +733,52 @@ public class Mods implements Loadable{
         Seq<LoadRun> runs = new Seq<>();
 
         for(LoadedMod mod : orderedMods()){
+            Seq<LoadRun> unorderedContent = new Seq<>();
+            ObjectMap<String, LoadRun> orderedContent = new ObjectMap<>();
+            String[] contentOrder = mod.meta.contentOrder;
+            ObjectSet<String> orderSet = contentOrder == null ? null : ObjectSet.with(contentOrder);
+
             if(mod.root.child("content").exists()){
                 Fi contentRoot = mod.root.child("content");
                 for(ContentType type : ContentType.all){
-                    Fi folder = contentRoot.child(type.name().toLowerCase() + "s");
+                    String lower = type.name().toLowerCase(Locale.ROOT);
+                    Fi folder = contentRoot.child(lower + (lower.endsWith("s") ? "" : "s"));
                     if(folder.exists()){
                         for(Fi file : folder.findAll(f -> f.extension().equals("json") || f.extension().equals("hjson"))){
-                            runs.add(new LoadRun(type, file, mod));
+
+                            //if this is part of the ordered content, put it aside to be dealt with later
+                            if(orderSet != null && orderSet.contains(file.nameWithoutExtension())){
+                                orderedContent.put(file.nameWithoutExtension(), new LoadRun(type, file, mod));
+                            }else{
+                                unorderedContent.add(new LoadRun(type, file, mod));
+                            }
                         }
                     }
                 }
             }
+
+            //ordered content will be loaded first, if it exists
+            if(contentOrder != null){
+                for(String contentName : contentOrder){
+                    LoadRun run = orderedContent.get(contentName);
+                    if(run != null){
+                        runs.add(run);
+                    }else{
+                        Log.warn("Cannot find content defined in contentOrder: @", contentName);
+                    }
+                }
+            }
+
+            //unordered content is sorted alphabetically per mod
+            runs.addAll(unorderedContent.sort());
         }
 
-        //make sure mod content is in proper order
-        runs.sort();
         for(LoadRun l : runs){
             Content current = content.getLastAdded();
             try{
                 //this binds the content but does not load it entirely
                 Content loaded = parser.parse(l.mod, l.file.nameWithoutExtension(), l.file.readString("UTF-8"), l.file, l.type);
-                Log.debug("[@] Loaded '@'.", l.mod.meta.name, (loaded instanceof UnlockableContent ? ((UnlockableContent)loaded).localizedName : loaded));
+                Log.debug("[@] Loaded '@'.", l.mod.meta.name, (loaded instanceof UnlockableContent u ? u.localizedName : loaded));
             }catch(Throwable e){
                 if(current != content.getLastAdded() && content.getLastAdded() != null){
                     parser.markError(content.getLastAdded(), l.mod, l.file, e);
@@ -527,12 +791,19 @@ public class Mods implements Loadable{
 
         //this finishes parsing content fields
         parser.finishParsing();
+
+        Events.fire(new ModContentLoadEvent());
     }
 
     public void handleContentError(Content content, Throwable error){
         parser.markError(content, error);
     }
 
+    /** Adds a listener for parsed JSON objects. */
+    public void addParseListener(ParseListener hook){
+        parser.listeners.add(hook);
+    }
+
     /** @return a list of mods and versions, in the format name:version. */
     public Seq<String> getModStrings(){
         return mods.select(l -> !l.meta.hidden && l.enabled()).map(l -> l.name + ":" + l.meta.version);
@@ -568,12 +839,12 @@ public class Mods implements Loadable{
 
     /** Iterates through each mod with a main class. */
     public void eachClass(Cons<Mod> cons){
-        mods.each(p -> p.main != null, p -> contextRun(p, () -> cons.get(p.main)));
+        orderedMods().each(p -> p.main != null, p -> contextRun(p, () -> cons.get(p.main)));
     }
 
     /** Iterates through each enabled mod. */
     public void eachEnabled(Cons<LoadedMod> cons){
-        mods.each(LoadedMod::enabled, cons);
+        orderedMods().each(LoadedMod::enabled, cons);
     }
 
     public void contextRun(LoadedMod mod, Runnable run){
@@ -584,58 +855,178 @@ public class Mods implements Loadable{
         }
     }
 
+    /** Tries to find the config file of a mod/plugin. */
+    public @Nullable ModMeta findMeta(Fi file){
+        Fi metaFile = null;
+        for(String name : metaFiles){
+            if((metaFile = file.child(name)).exists()){
+                break;
+            }
+        }
+
+        if(!metaFile.exists()){
+            return null;
+        }
+
+        ModMeta meta = json.fromJson(ModMeta.class, Jval.read(metaFile.readString()).toString(Jformat.plain));
+        meta.cleanup();
+        return meta;
+    }
+
+    /** Resolves the loading order of a list mods/plugins using their internal names. */
+    public OrderedMap<String, ModState> resolveDependencies(Seq<ModMeta> metas){
+        var context = new ModResolutionContext();
+
+        for(var meta : metas){
+            Seq<ModDependency> dependencies = new Seq<>();
+            for(var dependency : meta.dependencies){
+                dependencies.add(new ModDependency(dependency, true));
+            }
+            for(var dependency : meta.softDependencies){
+                dependencies.add(new ModDependency(dependency, false));
+            }
+            context.dependencies.put(meta.internalName, dependencies);
+        }
+
+        for(var key : context.dependencies.keys()){
+            if(context.ordered.contains(key)){
+                continue;
+            }
+            resolve(key, context);
+            context.visited.clear();
+        }
+
+        var result = new OrderedMap<String, ModState>();
+        for(var name : context.ordered){
+            result.put(name, ModState.enabled);
+        }
+        result.putAll(context.invalid);
+        return result;
+    }
+
+    private boolean resolve(String element, ModResolutionContext context){
+        context.visited.add(element);
+        for(final var dependency : context.dependencies.get(element)){
+            // Circular dependencies ?
+            if(context.visited.contains(dependency.name) && !context.ordered.contains(dependency.name)){
+                context.invalid.put(dependency.name, ModState.circularDependencies);
+                return false;
+                // If dependency present, resolve it, or if it's not required, ignore it
+            }else if(context.dependencies.containsKey(dependency.name)){
+                if(((!context.ordered.contains(dependency.name) && !resolve(dependency.name, context)) || !Core.settings.getBool("mod-" + dependency.name + "-enabled", true)) && dependency.required){
+                    context.invalid.put(element, ModState.incompleteDependencies);
+                    return false;
+                }
+                // The dependency is missing, but if not required, skip
+            }else if(dependency.required){
+                context.invalid.put(element, ModState.missingDependencies);
+                return false;
+            }
+        }
+        if(!context.ordered.contains(element)){
+            context.ordered.add(element);
+        }
+        return true;
+    }
+
+    private Fi resolveRoot(Fi fi){
+        if(OS.isMac && (!(fi instanceof ZipFi))) fi.child(".DS_Store").delete();
+        Fi[] files = fi.list();
+        return files.length == 1 && files[0].isDirectory() ? files[0] : fi;
+    }
+
     /** 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{
+     * Note that directories can be loaded as mods. */
+    private LoadedMod loadMod(Fi sourceFile, boolean overwrite, boolean initialize) throws Exception{
         Time.mark();
 
         ZipFi rootZip = null;
 
         try{
-            Fi zip = sourceFile.isDirectory() ? sourceFile : (rootZip = new ZipFi(sourceFile));
-            if(zip.list().length == 1 && zip.list()[0].isDirectory()){
-                zip = zip.list()[0];
+            Fi zip = resolveRoot(sourceFile.isDirectory() ? sourceFile : (rootZip = new ZipFi(sourceFile)));
+
+            ModMeta meta = findMeta(zip);
+
+            if(meta == null){
+                Log.warn("Mod @ doesn't have a '[mod/plugin].[h]json' file, skipping.", zip);
+                throw new ModLoadException("Invalid file: No mod.json found.");
             }
 
-            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");
-
-            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.");
-            }
-
-            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(" ", "-");
+            String mainClass = meta.main == null ? camelized.toLowerCase(Locale.ROOT) + "." + camelized + "Mod" : meta.main;
+            String baseName = meta.name.toLowerCase(Locale.ROOT).replace(" ", "-");
 
-            if(mods.contains(m -> m.name.equals(baseName))){
-                throw new IllegalArgumentException("A mod with the name '" + baseName + "' is already imported.");
+            var other = mods.find(m -> m.name.equals(baseName));
+
+            if(other != null){
+                //steam mods can't really be deleted, they need to be unsubscribed
+                if(overwrite && !other.hasSteamID()){
+
+                    //close the classloader for jar mods
+                    if(!android){
+                        ClassLoaderCloser.close(other.loader);
+                    }
+
+                    //close zip file
+                    if(other.root instanceof ZipFi){
+                        other.root.delete();
+                    }
+                    //delete the old mod directory
+                    if(other.file.isDirectory()){
+                        other.file.deleteDirectory();
+                    }else{
+                        other.file.delete();
+                    }
+                    //unload
+                    mods.remove(other);
+                }else{
+                    throw new ModLoadException("A mod with the name '" + baseName + "' is already imported.");
+                }
             }
 
+            ClassLoader loader = null;
             Mod mainMod;
-
             Fi mainFile = zip;
-            String[] path = (mainClass.replace('.', '/') + ".class").split("/");
-            for(String str : path){
-                if(!str.isEmpty()){
-                    mainFile = mainFile.child(str);
+
+            if(android){
+                mainFile = mainFile.child("classes.dex");
+            }else{
+                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() && Core.settings.getBool("mod-" + baseName + "-enabled", true)){
-                //mobile versions don't support class mods
+            //if the mod is explicitly marked as java, try loading it anyway
+            if(
+                (mainFile.exists() || meta.java) &&
+                !skipModLoading() &&
+                Core.settings.getBool("mod-" + baseName + "-enabled", true) &&
+                Version.isAtLeast(meta.minGameVersion) &&
+                (meta.getMinMajor() >= 136 || headless) &&
+                initialize
+            ){
                 if(ios){
-                    throw new IllegalArgumentException("Java class mods are not supported on iOS.");
+                    throw new ModLoadException("Java class mods are not supported on iOS.");
+                }
+
+                loader = platform.loadJar(sourceFile, mainLoader);
+                mainLoader.addChild(loader);
+                Class<?> main = Class.forName(mainClass, true, loader);
+
+                //detect mods that incorrectly package mindustry in the jar
+                if((main.getSuperclass().getName().equals("mindustry.mod.Plugin") || main.getSuperclass().getName().equals("mindustry.mod.Mod")) &&
+                    main.getSuperclass().getClassLoader() != Mod.class.getClassLoader()){
+                    throw new ModLoadException(
+                        "This mod/plugin has loaded Mindustry dependencies from its own class loader. " +
+                        "You are incorrectly including Mindustry dependencies in the mod JAR - " +
+                        "make sure Mindustry is declared as `compileOnly` in Gradle, and that the JAR is created with `runtimeClasspath`!"
+                    );
                 }
 
-                Class<?> main = platform.loadJar(sourceFile, mainClass);
                 metas.put(main, meta);
                 mainMod = (Mod)main.getDeclaredConstructor().newInstance();
             }else{
@@ -655,11 +1046,16 @@ public class Mods implements Loadable{
                 }
             }
 
-            if(!headless){
+            //skip mod loading if it failed
+            if(skipModLoading()){
+                Core.settings.put("mod-" + baseName + "-enabled", false);
+            }
+
+            if(!headless && Core.settings.getBool("mod-" + baseName + "-enabled", true)){
                 Log.info("Loaded mod '@' in @ms", meta.name, Time.elapsed());
             }
-            return new LoadedMod(sourceFile, zip, mainMod, meta);
 
+            return new LoadedMod(sourceFile, zip, mainMod, loader, meta);
         }catch(Exception e){
             //delete root zip file so it can be closed on windows
             if(rootZip != null) rootZip.delete();
@@ -683,21 +1079,36 @@ public class Mods implements Loadable{
         public Seq<LoadedMod> dependencies = new Seq<>();
         /** All missing dependencies of this mod as strings. */
         public Seq<String> missingDependencies = new Seq<>();
-        /** Script files to run. */
-        public Seq<Fi> scripts = new Seq<>();
         /** Content with initialization code. */
         public ObjectSet<Content> erroredContent = new ObjectSet<>();
         /** Current state of this mod. */
         public ModState state = ModState.enabled;
         /** Icon texture. Should be disposed. */
         public @Nullable Texture iconTexture;
+        /** Class loader for JAR mods. Null if the mod isn't loaded or this isn't a jar mod. */
+        public @Nullable ClassLoader loader;
 
-        public LoadedMod(Fi file, Fi root, Mod main, ModMeta meta){
+        public LoadedMod(Fi file, Fi root, Mod main, ClassLoader loader, ModMeta meta){
             this.root = root;
             this.file = file;
+            this.loader = loader;
             this.main = main;
             this.meta = meta;
-            this.name = meta.name.toLowerCase().replace(" ", "-");
+            this.name = meta.name.toLowerCase(Locale.ROOT).replace(" ", "-");
+        }
+
+        /** @return whether this is a java class mod. */
+        public boolean isJava(){
+            return meta.java || main != null;
+        }
+
+        @Nullable
+        public String getRepo(){
+            return Core.settings.getString("mod-" + name + "-repo", meta.repo);
+        }
+
+        public void setRepo(String repo){
+            Core.settings.put("mod-" + name + "-repo", repo);
         }
 
         public boolean enabled(){
@@ -718,49 +1129,27 @@ public class Mods implements Loadable{
 
         /** @return whether this mod is supported by the game version */
         public boolean isSupported(){
-            if(isOutdated()) return false;
+            //no unsupported mods on servers
+            if(headless) return true;
 
-            int major = getMinMajor(), minor = getMinMinor();
+            if(isOutdated() || isBlacklisted()) return false;
 
-            if(Version.build <= 0) return true;
-
-            return Version.build >= major && Version.revision >= minor;
+            return Version.isAtLeast(meta.minGameVersion);
         }
 
-        /** @return whether this mod is outdated, e.g. not compatible with v6. */
+        /** Some mods are known to cause issues with the game; this detects and returns whether a mod is manually blacklisted. */
+        public boolean isBlacklisted(){
+            return blacklistedMods.contains(name);
+        }
+
+        /** @return whether this mod is outdated, e.g. not compatible with v7. */
         public boolean isOutdated(){
-            //must be at least 105 to indicate v6 compat
-            return getMinMajor() < 105;
+            //must be at least 136 to indicate v7 compat
+            return getMinMajor() < 136;
         }
 
         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){
-                    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 0;
+            return meta.getMinMajor();
         }
 
         @Override
@@ -838,20 +1227,78 @@ public class Mods implements Loadable{
 
     /** Mod metadata information.*/
     public static class ModMeta{
-        public String name, displayName, author, description, version, main, minGameVersion = "0", repo;
+        /** Name as defined in mod.json. Stripped of colors, but may contain spaces. */
+        public String name;
+        /** Name without spaces in all lower case. */
+        public String internalName;
+        /** Minimum game version that this mod requires, e.g. "140.1" */
+        public String minGameVersion = "0";
+        public @Nullable String displayName, author, description, subtitle, version, main, repo;
         public Seq<String> dependencies = Seq.with();
+        public Seq<String> softDependencies = Seq.with();
         /** Hidden mods are only server-side or client-side, and do not support adding new content. */
         public boolean hidden;
+        /** If true, this mod should be loaded as a Java class mod. This is technically optional, but highly recommended. */
+        public boolean java;
+        /** To rescale textures with a different size. Represents the size in pixels of the sprite of a 1x1 block. */
+        public float texturescale = 1.0f;
+        /** If true, bleeding is skipped and no content icons are generated. */
+        public boolean pregenerated;
+        /** If set, load the mod content in this order by content names */
+        public String[] contentOrder;
 
         public String displayName(){
-            return displayName == null ? name : displayName;
+            //useless, kept for legacy reasons
+            return displayName;
+        }
+
+        public String shortDescription(){
+            return Strings.truncate(subtitle == null ? (description == null || description.length() > maxModSubtitleLength ? "" : description) : subtitle, maxModSubtitleLength, "...");
         }
 
         //removes all colors
         public void cleanup(){
+            if(name != null) name = Strings.stripColors(name);
             if(displayName != null) displayName = Strings.stripColors(displayName);
+            if(displayName == null) displayName = name;
+            if(version == null) version = "0";
             if(author != null) author = Strings.stripColors(author);
             if(description != null) description = Strings.stripColors(description);
+            if(subtitle != null) subtitle = Strings.stripColors(subtitle).replace("\n", "");
+            if(name != null) internalName = name.toLowerCase(Locale.ROOT).replace(" ", "-");
+        }
+
+        public int getMinMajor(){
+            String ver = minGameVersion == null ? "0" : minGameVersion;
+            int dot = ver.indexOf(".");
+            return dot != -1 ? Strings.parseInt(ver.substring(0, dot), 0) : Strings.parseInt(ver, 0);
+        }
+
+        @Override
+        public String toString(){
+            return "ModMeta{" +
+            "name='" + name + '\'' +
+            ", minGameVersion='" + minGameVersion + '\'' +
+            ", displayName='" + displayName + '\'' +
+            ", author='" + author + '\'' +
+            ", description='" + description + '\'' +
+            ", subtitle='" + subtitle + '\'' +
+            ", version='" + version + '\'' +
+            ", main='" + main + '\'' +
+            ", repo='" + repo + '\'' +
+            ", dependencies=" + dependencies +
+            ", softDependencies=" + softDependencies +
+            ", hidden=" + hidden +
+            ", java=" + java +
+            ", texturescale=" + texturescale +
+            ", pregenerated=" + pregenerated +
+            '}';
+        }
+    }
+
+    public static class ModLoadException extends RuntimeException{
+        public ModLoadException(String message){
+            super(message);
         }
     }
 
@@ -859,7 +1306,26 @@ public class Mods implements Loadable{
         enabled,
         contentErrors,
         missingDependencies,
+        incompleteDependencies,
+        circularDependencies,
         unsupported,
         disabled,
     }
+
+    public static class ModResolutionContext {
+        public final ObjectMap<String, Seq<ModDependency>> dependencies = new ObjectMap<>();
+        public final ObjectSet<String> visited = new ObjectSet<>();
+        public final OrderedSet<String> ordered = new OrderedSet<>();
+        public final ObjectMap<String, ModState> invalid = new OrderedMap<>();
+    }
+
+    public static final class ModDependency{
+        public final String name;
+        public final boolean required;
+
+        public ModDependency(String name, boolean required){
+            this.name = name;
+            this.required = required;
+        }
+    }
 }
diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java
index 6ae9631da1..fdbc717c6d 100644
--- a/core/src/mindustry/mod/Scripts.java
+++ b/core/src/mindustry/mod/Scripts.java
@@ -1,13 +1,7 @@
 package mindustry.mod;
 
 import arc.*;
-import arc.assets.*;
-import arc.assets.loaders.MusicLoader.*;
-import arc.assets.loaders.SoundLoader.*;
-import arc.audio.*;
 import arc.files.*;
-import arc.func.*;
-import arc.struct.*;
 import arc.util.*;
 import arc.util.Log.*;
 import mindustry.*;
@@ -16,17 +10,14 @@ import rhino.*;
 import rhino.module.*;
 import rhino.module.provider.*;
 
-import java.io.*;
 import java.net.*;
+import java.util.*;
 import java.util.regex.*;
 
 public class Scripts implements Disposable{
-    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", "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", "systemcursor");
-    private final Context context;
-    private final Scriptable scope;
+    public final Context context;
+    public final Scriptable scope;
+
     private boolean errored;
     LoadedMod currentMod = null;
 
@@ -34,10 +25,6 @@ public class Scripts implements Disposable{
         Time.mark();
 
         context = Vars.platform.getScriptContext();
-        context.setClassShutter(type -> !blacklist.contains(type.toLowerCase()::contains) || whitelist.contains(type.toLowerCase()::contains));
-        context.getWrapFactory().setJavaPrimitiveWrap(false);
-        context.setLanguageVersion(Context.VERSION_ES6);
-
         scope = new ImporterTopLevel(context);
 
         new RequireBuilder()
@@ -56,10 +43,23 @@ public class Scripts implements Disposable{
 
     public String runConsole(String text){
         try{
-            Object o = context.evaluateString(scope, text, "console.js", 1, null);
-            if(o instanceof NativeJavaObject) o = ((NativeJavaObject)o).unwrap();
-            if(o instanceof Undefined) o = "undefined";
-            return String.valueOf(o);
+            Object o = context.evaluateString(scope, text, "console.js", 1);
+            if(o instanceof NativeJavaObject n) o = n.unwrap();
+            if(o == null) o = "null";
+
+            else if(o instanceof Undefined) o = "undefined";
+
+            else if(o instanceof Object[] arr) o = Arrays.toString(arr);
+            else if(o instanceof int[] arr) o = Arrays.toString(arr);
+            else if(o instanceof float[] arr) o = Arrays.toString(arr);
+            else if(o instanceof byte[] arr) o = Arrays.toString(arr);
+            else if(o instanceof double[] arr) o = Arrays.toString(arr);
+            else if(o instanceof long[] arr) o = Arrays.toString(arr);
+            else if(o instanceof char[] arr) o = Arrays.toString(arr);
+            else if(o instanceof boolean[] arr) o = Arrays.toString(arr);
+
+            var out = o.toString();
+            return out == null ? "null" : out;
         }catch(Throwable t){
             return getError(t, false);
         }
@@ -78,85 +78,13 @@ public class Scripts implements Disposable{
         Log.log(level, "[@]: @", source, message);
     }
 
-    //region utility mod functions
-
-    public String readString(String path){
-        return Vars.tree.get(path, true).readString();
+    public float[] newFloats(int capacity){
+        return new float[capacity];
     }
 
-    public byte[] readBytes(String path){
-        return Vars.tree.get(path, true).readBytes();
-    }
-
-    public Sound loadSound(String soundName){
-        if(Vars.headless) return new Sound();
-
-        String name = "sounds/" + soundName;
-        String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
-
-        var sound = new Sound();
-        AssetDescriptor<?> desc = Core.assets.load(path, Sound.class, new SoundParameter(sound));
-        desc.errored = Throwable::printStackTrace;
-
-        return sound;
-    }
-
-    public Music loadMusic(String soundName){
-        if(Vars.headless) return new Music();
-
-        String name = "music/" + soundName;
-        String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
-
-        var music = new Music();
-        AssetDescriptor<?> desc = Core.assets.load(path, Music.class, new MusicParameter(music));
-        desc.errored = Throwable::printStackTrace;
-
-        return music;
-    }
-
-    /** Ask the user to select a file to read for a certain purpose like "Please upload a sprite" */
-    public void readFile(String purpose, String ext, Cons<String> cons){
-        selectFile(true, purpose, ext, fi -> cons.get(fi.readString()));
-    }
-
-    /** readFile but for a byte[] */
-    public void readBinFile(String purpose, String ext, Cons<byte[]> cons){
-        selectFile(true, purpose, ext, fi -> cons.get(fi.readBytes()));
-    }
-
-    /** Ask the user to write a file. */
-    public void writeFile(String purpose, String ext, String contents){
-        if(contents == null) contents = "";
-        final String fContents = contents;
-        selectFile(false, purpose, ext, fi -> fi.writeString(fContents));
-    }
-
-    /** writeFile but for a byte[] */
-    public void writeBinFile(String purpose, String ext, byte[] contents){
-        if(contents == null) contents = new byte[0];
-        final byte[] fContents = contents;
-        selectFile(false, purpose, ext, fi -> fi.writeBytes(fContents));
-    }
-
-    private void selectFile(boolean open, String purpose, String ext, Cons<Fi> cons){
-        purpose = purpose.startsWith("@") ? Core.bundle.get(purpose.substring(1)) : purpose;
-        //add purpose and extension at the top
-        String title = Core.bundle.get(open ? "open" : "save") + " - " + purpose + " (." + ext + ")";
-        Vars.platform.showFileChooser(open, title, ext, fi -> {
-            try{
-                cons.get(fi);
-            }catch(Exception e){
-                Log.err("Failed to select file '@' for a mod", fi);
-                Log.err(e);
-            }
-        });
-    }
-
-    //endregion
-
     public void run(LoadedMod mod, Fi file){
         currentMod = mod;
-        run(file.readString(), file.name(), true);
+        run(file.readString(), mod.name + "/" + file.name(), true);
         currentMod = null;
     }
 
@@ -164,17 +92,12 @@ public class Scripts implements Disposable{
         try{
             if(currentMod != null){
                 //inject script info into file
-                context.evaluateString(scope, "modName = \"" + currentMod.name + "\"\nscriptName = \"" + file + "\"", "initscript.js", 1, null);
+                context.evaluateString(scope, "modName = \"" + currentMod.name + "\"\nscriptName = \"" + file + "\"", "initscript.js", 1);
             }
-            context.evaluateString(scope,
-            wrap ? "(function(){'use strict';\n" + script + "\n})();" : script,
-            file, 0, null);
+            context.evaluateString(scope, wrap ? "(function(){'use strict';\n" + script + "\n})();" : script, file, 0);
             return true;
         }catch(Throwable t){
-            if(currentMod != null){
-                file = currentMod.name + "/" + file;
-            }
-            log(LogLevel.err, file, "" + getError(t, true));
+            log(LogLevel.err, file, getError(t, true));
             return false;
         }
     }
@@ -185,7 +108,7 @@ public class Scripts implements Disposable{
     }
 
     private class ScriptModuleProvider extends UrlModuleSourceProvider{
-        private Pattern directory = Pattern.compile("^(.+?)/(.+)");
+        private final Pattern directory = Pattern.compile("^(.+?)/(.+)");
 
         public ScriptModuleProvider(){
             super(null, null);
@@ -194,10 +117,10 @@ public class Scripts implements Disposable{
         @Override
         public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws URISyntaxException{
             if(currentMod == null) return null;
-            return loadSource(moduleId, currentMod.root.child("scripts"), validator);
+            return loadSource(currentMod, moduleId, currentMod.root.child("scripts"), validator);
         }
 
-        private ModuleSource loadSource(String moduleId, Fi root, Object validator) throws URISyntaxException{
+        private ModuleSource loadSource(LoadedMod sourceMod, String moduleId, Fi root, Object validator) throws URISyntaxException{
             Matcher matched = directory.matcher(moduleId);
             if(matched.find()){
                 LoadedMod required = Vars.mods.locateMod(matched.group(1));
@@ -205,18 +128,16 @@ public class Scripts implements Disposable{
                 if(required == null){ // Mod not found, treat it as a folder
                     Fi dir = root.child(matched.group(1));
                     if(!dir.exists()) return null; // Mod and folder not found
-                    return loadSource(script, dir, validator);
+                    return loadSource(sourceMod, script, dir, validator);
                 }
 
                 currentMod = required;
-                return loadSource(script, required.root.child("scripts"), validator);
+                return loadSource(sourceMod, script, required.root.child("scripts"), validator);
             }
 
             Fi module = root.child(moduleId + ".js");
             if(!module.exists() || module.isDirectory()) return null;
-            return new ModuleSource(
-                new InputStreamReader(new ByteArrayInputStream((module.readString()).getBytes())),
-                null, new URI(moduleId), root.file().toURI(), validator);
+            return new ModuleSource(module.reader(Vars.bufferSize), new URI(sourceMod.name + "/" + moduleId + ".js"), root.file().toURI(), validator);
         }
     }
 }
diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
index b7d0c451e9..0f64b9850a 100644
--- a/core/src/mindustry/net/Administration.java
+++ b/core/src/mindustry/net/Administration.java
@@ -11,6 +11,7 @@ import mindustry.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.payloads.*;
 
 import static mindustry.Vars.*;
 import static mindustry.game.EventType.*;
@@ -21,17 +22,20 @@ public class Administration{
     public Seq<ChatFilter> chatFilters = new Seq<>();
     public Seq<ActionFilter> actionFilters = new Seq<>();
     public Seq<String> subnetBans = new Seq<>();
+    public ObjectSet<String> dosBlacklist = new ObjectSet<>();
     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 boolean modified, loaded;
+    /** All player info. Maps UUIDs to info. This persists throughout restarts. Do not modify directly. */
+    public ObjectMap<String, PlayerInfo> playerInfo = new ObjectMap<>();
 
     public Administration(){
         load();
 
         //anti-spam
         addChatFilter((player, message) -> {
-            long resetTime = Config.messageRateLimit.num() * 1000;
+            long resetTime = Config.messageRateLimit.num() * 1000L;
             if(Config.antiSpam.bool() && !player.isLocal() && !player.admin){
                 //prevent people from spamming messages quickly
                 if(resetTime > 0 && Time.timeSinceMillis(player.getInfo().lastMessageTime) < resetTime){
@@ -47,8 +51,8 @@ public class Administration{
                     player.getInfo().messageInfractions = 0;
                 }
 
-                //prevent players from sending the same message twice in the span of 50 seconds
-                if(message.equals(player.getInfo().lastSentMessage) && Time.timeSinceMillis(player.getInfo().lastMessageTime) < 1000 * 50){
+                //prevent players from sending the same message twice in the span of 10 seconds
+                if(message.equals(player.getInfo().lastSentMessage) && Time.timeSinceMillis(player.getInfo().lastMessageTime) < 1000 * 10){
                     player.sendMessage("[scarlet]You may not send the same message twice.");
                     return null;
                 }
@@ -61,14 +65,14 @@ 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 &&
-                Config.antiSpam.bool()){
+                action.type != ActionType.commandUnits &&
+                Config.antiSpam.bool() && !action.player.isLocal()){
 
                 Ratekeeper rate = action.player.getInfo().rate;
-                if(rate.allow(Config.interactRateWindow.num() * 1000, Config.interactRateLimit.num())){
+                if(rate.allow(Config.interactRateWindow.num() * 1000L, Config.interactRateLimit.num())){
                     return true;
                 }else{
                     if(rate.occurences > Config.interactRateKick.num()){
@@ -84,6 +88,14 @@ public class Administration{
         });
     }
 
+    public synchronized void blacklistDos(String address){
+        dosBlacklist.add(address);
+    }
+
+    public synchronized boolean isDosBlacklisted(String address){
+        return dosBlacklist.contains(address);
+    }
+
     /** @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));
@@ -163,7 +175,7 @@ public class Administration{
     }
 
     public int getPlayerLimit(){
-        return Core.settings.getInt("playerlimit", 0);
+        return Core.settings.getInt("playerlimit", headless ? 30 : 0);
     }
 
     public void setPlayerLimit(int limit){
@@ -220,7 +232,7 @@ public class Administration{
         getCreateInfo(id).banned = true;
 
         save();
-        Events.fire(new PlayerBanEvent(Groups.player.find(p -> id.equals(p.uuid()))));
+        Events.fire(new PlayerBanEvent(Groups.player.find(p -> id.equals(p.uuid())), id));
         return true;
     }
 
@@ -259,7 +271,7 @@ public class Administration{
         info.banned = false;
         bannedIPs.removeAll(info.ips, false);
         save();
-        Events.fire(new PlayerUnbanEvent(Groups.player.find(p -> id.equals(p.uuid()))));
+        Events.fire(new PlayerUnbanEvent(Groups.player.find(p -> id.equals(p.uuid())), id));
         return true;
     }
 
@@ -303,11 +315,13 @@ public class Administration{
     public boolean adminPlayer(String id, String usid){
         PlayerInfo info = getCreateInfo(id);
 
+        var wasAdmin = info.admin;
+
         info.adminUsid = usid;
         info.admin = true;
         save();
 
-        return true;
+        return wasAdmin;
     }
 
     /**
@@ -369,7 +383,7 @@ public class Administration{
         ObjectSet<PlayerInfo> result = new ObjectSet<>();
 
         for(PlayerInfo info : playerInfo.values()){
-            if(info.lastName.equalsIgnoreCase(name) || (info.names.contains(name, false))
+            if(info.lastName.equalsIgnoreCase(name) || info.names.contains(name, false)
             || Strings.stripColors(Strings.stripColors(info.lastName)).equals(name)
             || info.ips.contains(name, false) || info.id.equals(name)){
                 result.add(info);
@@ -437,75 +451,97 @@ public class Administration{
     }
 
     public void save(){
-        Core.settings.putJson("player-data", playerInfo);
-        Core.settings.putJson("ip-bans", String.class, bannedIPs);
-        Core.settings.putJson("whitelist-ids", String.class, whitelist);
-        Core.settings.putJson("banned-subnets", String.class, subnetBans);
+        modified = true;
+    }
+
+    public void forceSave(){
+        if(modified && loaded){
+            Core.settings.putJson("player-data", playerInfo);
+            Core.settings.putJson("ip-kicks", kickedIPs);
+            Core.settings.putJson("ip-bans", String.class, bannedIPs);
+            Core.settings.putJson("whitelist-ids", String.class, whitelist);
+            Core.settings.putJson("banned-subnets", String.class, subnetBans);
+            modified = false;
+        }
     }
 
     @SuppressWarnings("unchecked")
     private void load(){
+        loaded = true;
         //load default data
         playerInfo = Core.settings.getJson("player-data", ObjectMap.class, ObjectMap::new);
+        kickedIPs = Core.settings.getJson("ip-kicks", ObjectMap.class, ObjectMap::new);
         bannedIPs = Core.settings.getJson("ip-bans", Seq.class, Seq::new);
         whitelist = Core.settings.getJson("whitelist-ids", Seq.class, Seq::new);
         subnetBans = Core.settings.getJson("banned-subnets", Seq.class, Seq::new);
     }
 
-    /** Server configuration definition. Each config value can be a string, boolean or number. */
-    public enum Config{
-        name("The server name as displayed on clients.", "Server", "servername"),
-        desc("The server description, displayed under the name. Max 100 characters.", "off"),
-        port("The port to host on.", Vars.port),
-        autoUpdate("Whether to auto-update and exit when a new bleeding-edge update arrives.", false),
-        showConnectMessages("Whether to display connect/disconnect messages.", true),
-        enableVotekick("Whether votekick is enabled.", true),
-        startCommands("Commands run at startup. This should be a comma-separated list.", ""),
-        crashReport("Whether to send crash reports.", false, "crashreport"),
-        logging("Whether to log everything to files.", true),
-        strict("Whether strict mode is on - corrects positions and prevents duplicate UUIDs.", true),
-        antiSpam("Whether spammers are automatically kicked and rate-limited.", headless),
-        interactRateWindow("Block interaction rate limit window, in seconds.", 6),
-        interactRateLimit("Block interaction rate limit.", 25),
-        interactRateKick("How many times a player must interact inside the window to get kicked.", 60),
-        messageRateLimit("Message rate limit in seconds. 0 to disable.", 0),
-        messageSpamKick("How many times a player must send a message before the cooldown to get kicked. 0 to disable.", 3),
-        socketInput("Allows a local application to control this server through a local TCP socket.", false, "socket", () -> Events.fire(Trigger.socketConfigChanged)),
-        socketInputPort("The port for socket input.", 6859, () -> Events.fire(Trigger.socketConfigChanged)),
-        socketInputAddress("The bind address for socket input.", "localhost", () -> Events.fire(Trigger.socketConfigChanged)),
-        allowCustomClients("Whether custom clients are allowed to connect.", !headless, "allow-custom"),
-        whitelist("Whether the whitelist is used.", false),
-        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),
-        debug("Enable debug logging", false, () -> {
-            Log.level = debug() ? LogLevel.debug : LogLevel.info;
-        });
+    /**
+     * Server configuration definition. Each config value can be a string, boolean or number.
+     * Creating a new Config instance implicitly adds it to the list of server configs. This can be used for custom plugin configuration.
+     * */
+    public static class Config{
+        public static final Seq<Config> all = new Seq<>();
 
-        public static final Config[] all = values();
+        public static final Config
+
+        serverName = new Config("name", "The server name as displayed on clients.", "Server", "servername"),
+        desc = new Config("desc", "The server description, displayed under the name. Max 100 characters.", "off"),
+        port = new Config("port", "The port to host on.", Vars.port),
+        autoUpdate = new Config("autoUpdate", "Whether to auto-update and exit when a new bleeding-edge update arrives.", false),
+        showConnectMessages = new Config("showConnectMessages", "Whether to display connect/disconnect messages.", true),
+        enableVotekick = new Config("enableVotekick", "Whether votekick is enabled.", true),
+        startCommands = new Config("startCommands", "Commands run at startup. This should be a comma-separated list.", ""),
+        logging = new Config("logging", "Whether to log everything to files.", true),
+        strict = new Config("strict", "Whether strict mode is on - corrects positions and prevents duplicate UUIDs.", true),
+        antiSpam = new Config("antiSpam", "Whether spammers are automatically kicked and rate-limited.", headless),
+        interactRateWindow = new Config("interactRateWindow", "Block interaction rate limit window, in seconds.", 6),
+        interactRateLimit = new Config("interactRateLimit", "Block interaction rate limit.", 25),
+        interactRateKick = new Config("interactRateKick", "How many times a player must interact inside the window to get kicked.", 60),
+        messageRateLimit = new Config("messageRateLimit", "Message rate limit in seconds. 0 to disable.", 0),
+        messageSpamKick = new Config("messageSpamKick", "How many times a player must send a message before the cooldown to get kicked. 0 to disable.", 3),
+        packetSpamLimit = new Config("packetSpamLimit", "Limit for packet count sent within 3sec that will lead to a blacklist + kick.", 300),
+        chatSpamLimit = new Config("chatSpamLimit", "Limit for chat packet count sent within 2sec that will lead to a blacklist + kick. Not the same as a rate limit.", 20),
+        socketInput = new Config("socketInput", "Allows a local application to control this server through a local TCP socket.", false, "socket", () -> Events.fire(Trigger.socketConfigChanged)),
+        socketInputPort = new Config("socketInputPort", "The port for socket input.", 6859, () -> Events.fire(Trigger.socketConfigChanged)),
+        socketInputAddress = new Config("socketInputAddress", "The bind address for socket input.", "localhost", () -> Events.fire(Trigger.socketConfigChanged)),
+        allowCustomClients = new Config("allowCustomClients", "Whether custom clients are allowed to connect.", !headless, "allow-custom"),
+        whitelist = new Config("whitelist", "Whether the whitelist is used.", false),
+        motd = new Config("motd", "The message displayed to people on connection.", "off"),
+        autosave = new Config("autosave", "Whether the periodically save the map when playing.", false),
+        autosaveAmount = new Config("autosaveAmount", "The maximum amount of autosaves. Older ones get replaced.", 10),
+        autosaveSpacing = new Config("autosaveSpacing", "Spacing between autosaves in seconds.", 60 * 5),
+        debug = new Config("debug", "Enable debug logging.", false, () -> Log.level = debug() ? LogLevel.debug : LogLevel.info),
+        snapshotInterval = new Config("snapshotInterval", "Client entity snapshot interval in ms.", 200),
+        autoPause = new Config("autoPause", "Whether the game should pause when nobody is online.", false),
+        roundExtraTime = new Config("roundExtraTime", "Time before loading a new map after the gameover, in seconds.", 12),
+        maxLogLength = new Config("maxLogLength", "The Maximum log file size, in bytes.", 1024 * 1024 * 5);
 
         public final Object defaultValue;
-        public final String key, description;
+        public final String name, key, description;
+
         final Runnable changed;
 
-        Config(String description, Object def){
-            this(description, def, null, null);
+        public Config(String name, String description, Object def){
+            this(name, description, def, null, null);
         }
 
-        Config(String description, Object def, String key){
-            this(description, def, key, null);
+        public Config(String name, String description, Object def, String key){
+            this(name, description, def, key, null);
         }
 
-        Config(String description, Object def, Runnable changed){
-            this(description, def, null, changed);
+        public Config(String name, String description, Object def, Runnable changed){
+            this(name, description, def, null, changed);
         }
 
-        Config(String description, Object def, String key, Runnable changed){
+        public Config(String name, String description, Object def, String key, Runnable changed){
+            this.name = name;
             this.description = description;
-            this.key = key == null ? name() : key;
+            this.key = key == null ? name : key;
             this.defaultValue = def;
             this.changed = changed == null ? () -> {} : changed;
+
+            all.add(this);
         }
 
         public boolean isNum(){
@@ -541,6 +577,10 @@ public class Administration{
             changed.run();
         }
 
+        public boolean isDefault(){
+            return Structs.eq(get(), defaultValue);
+        }
+
         private static boolean debug(){
             return Config.debug.bool();
         }
@@ -569,6 +609,10 @@ public class Administration{
 
         public PlayerInfo(){
         }
+
+        public String plainLastName(){
+            return Strings.stripColors(lastName);
+        }
     }
 
     /** Handles chat messages from players and changes their contents. */
@@ -584,14 +628,21 @@ public class Administration{
     }
 
     public static class TraceInfo{
-        public String ip, uuid;
+        public String ip, uuid, locale;
         public boolean modded, mobile;
+        public int timesJoined, timesKicked;
+        public String[] ips, names;
 
-        public TraceInfo(String ip, String uuid, boolean modded, boolean mobile){
+        public TraceInfo(String ip, String uuid, String locale, boolean modded, boolean mobile, int timesJoined, int timesKicked, String[] ips, String[] names){
             this.ip = ip;
             this.uuid = uuid;
+            this.locale = locale;
             this.modded = modded;
             this.mobile = mobile;
+            this.timesJoined = timesJoined;
+            this.timesKicked = timesKicked;
+            this.names = names;
+            this.ips = ips;
         }
     }
 
@@ -616,6 +667,18 @@ public class Administration{
         /** valid for unit-type events only, and even in that case may be null. */
         public @Nullable Unit unit;
 
+        /** valid only for payload events */
+        public @Nullable Payload payload;
+
+        /** valid only for removePlanned events only; contains packed positions. */
+        public @Nullable int[] plans;
+
+        /** valid only for command unit events */
+        public @Nullable int[] unitIDs;
+
+        /** valid only for command building events */
+        public @Nullable int[] buildingPositions;
+
         public PlayerAction set(Player player, ActionType type, Tile tile){
             this.player = player;
             this.type = type;
@@ -640,11 +703,12 @@ public class Administration{
             tile = null;
             block = null;
             unit = null;
+            plans = null;
         }
     }
 
     public enum ActionType{
-        breakBlock, placeBlock, rotate, configure, withdrawItem, depositItem, control, command
+        breakBlock, placeBlock, rotate, configure, withdrawItem, depositItem, control, buildSelect, command, removePlanned, commandUnits, commandBuilding, respawn, pickupBlock, dropPayload
     }
 
 }
diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
index da3cf9fb42..66d2d5278c 100644
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -2,14 +2,21 @@ package mindustry.net;
 
 import arc.*;
 import arc.func.*;
+import arc.math.*;
 import arc.net.*;
 import arc.net.FrameworkMessage.*;
+import arc.net.Server.*;
+import arc.net.dns.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.async.*;
-import arc.util.pooling.*;
+import arc.util.Log.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.game.EventType.*;
+import mindustry.net.Administration.*;
 import mindustry.net.Net.*;
 import mindustry.net.Packets.*;
+import net.jpountz.lz4.*;
 
 import java.io.*;
 import java.net.*;
@@ -27,10 +34,30 @@ public class ArcNetProvider implements NetProvider{
     final CopyOnWriteArrayList<ArcConnection> connections = new CopyOnWriteArrayList<>();
     Thread serverThread;
 
-    public ArcNetProvider(){
-        ArcNet.errorHandler = e -> Log.debug(Strings.getStackTrace(e));
+    private static final LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
+    private static final LZ4Compressor compressor = LZ4Factory.fastestInstance().fastCompressor();
 
-        client = new Client(8192, 8192, new PacketSerializer());
+    private volatile int playerLimitCache, packetSpamLimit;
+
+    public ArcNetProvider(){
+        ArcNet.errorHandler = e -> {
+            if(Log.level == LogLevel.debug){
+                var finalCause = Strings.getFinalCause(e);
+
+                //"connection is closed" is a pointless annoying error that should not be logged
+                if(!"Connection is closed.".equals(finalCause.getMessage())){
+                    Log.debug(Strings.getStackTrace(e));
+                }
+            }
+        };
+
+        //fetch this in the main thread to prevent threading issues
+        Events.run(Trigger.update, () -> {
+            playerLimitCache = netServer.admins.getPlayerLimit();
+            packetSpamLimit = Config.packetSpamLimit.num();
+        });
+
+        client = new Client(8192, 16384, new PacketSerializer());
         client.setDiscoveryPacket(packetSupplier);
         client.addListener(new NetListener(){
             @Override
@@ -55,11 +82,11 @@ public class ArcNetProvider implements NetProvider{
 
             @Override
             public void received(Connection connection, Object object){
-                if(object instanceof FrameworkMessage) return;
+                if(!(object instanceof Packet p)) return;
 
                 Core.app.post(() -> {
                     try{
-                        net.handleClientReceived(object);
+                        net.handleClientReceived(p);
                     }catch(Throwable e){
                         net.handleException(e);
                     }
@@ -68,11 +95,13 @@ public class ArcNetProvider implements NetProvider{
             }
         });
 
-        server = new Server(32768, 8192, new PacketSerializer());
+        server = new Server(32768, 16384, new PacketSerializer());
         server.setMulticast(multicastGroup, multicastPort);
         server.setDiscoveryHandler((address, handler) -> {
             ByteBuffer buffer = NetworkIO.writeServerData();
+            int length = buffer.position();
             buffer.position(0);
+            buffer.limit(length);
             handler.respond(buffer);
         });
 
@@ -82,6 +111,12 @@ public class ArcNetProvider implements NetProvider{
             public void connected(Connection connection){
                 String ip = connection.getRemoteAddressTCP().getAddress().getHostAddress();
 
+                //kill connections above the limit to prevent spam
+                if((playerLimitCache > 0 && server.getConnections().length > playerLimitCache) || netServer.admins.isDosBlacklisted(ip)){
+                    connection.close(DcReason.closed);
+                    return;
+                }
+
                 ArcConnection kn = new ArcConnection(ip, connection);
 
                 Connect c = new Connect();
@@ -89,14 +124,14 @@ public class ArcNetProvider implements NetProvider{
 
                 Log.debug("&bReceived connection: @", c.addressTCP);
 
+                connection.setArbitraryData(kn);
                 connections.add(kn);
                 Core.app.post(() -> net.handleServerReceived(kn, c));
             }
 
             @Override
             public void disconnected(Connection connection, DcReason reason){
-                ArcConnection k = getByArcID(connection.getID());
-                if(k == null) return;
+                if(!(connection.getArbitraryData() instanceof ArcConnection k)) return;
 
                 Disconnect c = new Disconnect();
                 c.reason = reason.toString();
@@ -109,20 +144,38 @@ public class ArcNetProvider implements NetProvider{
 
             @Override
             public void received(Connection connection, Object object){
-                ArcConnection k = getByArcID(connection.getID());
-                if(object instanceof FrameworkMessage || k == null) return;
+                if(!(connection.getArbitraryData() instanceof ArcConnection k)) return;
+
+                if(packetSpamLimit > 0 && !k.packetRate.allow(3000, packetSpamLimit)){
+                    Log.warn("Blacklisting IP '@' as potential DOS attack - packet spam.", k.address);
+                    connection.close(DcReason.closed);
+                    netServer.admins.blacklistDos(k.address);
+                    return;
+                }
+
+                if(!(object instanceof Packet pack)) return;
 
                 Core.app.post(() -> {
                     try{
-                        net.handleServerReceived(k, object);
+                        net.handleServerReceived(k, pack);
                     }catch(Throwable e){
-                        e.printStackTrace();
+                        Log.err(e);
                     }
                 });
             }
         });
     }
 
+    @Override
+    public void setConnectFilter(Server.ServerConnectFilter connectFilter){
+        server.setConnectFilter(connectFilter);
+    }
+
+    @Override
+    public @Nullable ServerConnectFilter getConnectFilter(){
+        return server.getConnectFilter();
+    }
+
     private static boolean isLocal(InetAddress addr){
         if(addr.isAnyLocalAddress() || addr.isLoopbackAddress()) return true;
 
@@ -151,7 +204,9 @@ public class ArcNetProvider implements NetProvider{
                 client.connect(5000, ip, port, port);
                 success.run();
             }catch(Exception e){
-                net.handleException(e);
+                if(netClient.isConnecting()){
+                    net.handleException(e);
+                }
             }
         });
     }
@@ -162,9 +217,9 @@ public class ArcNetProvider implements NetProvider{
     }
 
     @Override
-    public void sendClient(Object object, SendMode mode){
+    public void sendClient(Object object, boolean reliable){
         try{
-            if(mode == SendMode.tcp){
+            if(reliable){
                 client.sendTCP(object);
             }else{
                 client.sendUDP(object);
@@ -173,51 +228,65 @@ public class ArcNetProvider implements NetProvider{
         }catch(BufferOverflowException | BufferUnderflowException e){
             net.showError(e);
         }
-
-        Pools.free(object);
     }
 
     @Override
     public void pingHost(String address, int port, Cons<Host> valid, Cons<Exception> invalid){
-        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);
-
-                DatagramPacket packet = packetSupplier.get();
-                socket.receive(packet);
-
-                ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
-                Host host = NetworkIO.readServerData((int)Time.timeSinceMillis(time), packet.getAddress().getHostAddress(), buffer);
-
-                Core.app.post(() -> valid.get(host));
-            }catch(Exception e){
-                Core.app.post(() -> invalid.get(e));
+        try{
+            var host = pingHostImpl(address, port);
+            Core.app.post(() -> valid.get(host));
+        }catch(IOException e){
+            if(port == Vars.port){
+                for(var record : ArcDns.getSrvRecords("_mindustry._tcp." + address)){
+                    try{
+                        var host = pingHostImpl(record.target, record.port);
+                        Core.app.post(() -> valid.get(host));
+                        return;
+                    }catch(IOException ignored){
+                    }
+                }
             }
-        });
+            Core.app.post(() -> invalid.get(e));
+        }
+    }
+
+    private Host pingHostImpl(String address, int port) throws IOException{
+        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);
+
+            DatagramPacket packet = packetSupplier.get();
+            socket.receive(packet);
+
+            ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
+            Host host = NetworkIO.readServerData((int)Time.timeSinceMillis(time), packet.getAddress().getHostAddress(), buffer);
+            host.port = port;
+            return host;
+        }
     }
 
     @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(() -> {
+            synchronized(foundAddresses){
                 try{
                     if(foundAddresses.contains(address -> address.equals(packet.getAddress()) || (isLocal(address) && isLocal(packet.getAddress())))){
                         return;
                     }
                     ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
                     Host host = NetworkIO.readServerData((int)Time.timeSinceMillis(time), packet.getAddress().getHostAddress(), buffer);
-                    callback.get(host);
+                    Core.app.post(() -> callback.get(host));
                     foundAddresses.add(packet.getAddress());
                 }catch(Exception e){
-                    //don't crash when there's an error pinging a a server or parsing data
+                    //don't crash when there's an error pinging a server or parsing data
                     e.printStackTrace();
                 }
-            });
+            }
         }, () -> Core.app.post(done));
     }
 
@@ -255,18 +324,7 @@ public class ArcNetProvider implements NetProvider{
     @Override
     public void closeServer(){
         connections.clear();
-        Threads.daemon(server::stop);
-    }
-
-    ArcConnection getByArcID(int id){
-        for(int i = 0; i < connections.size(); i++){
-            ArcConnection con = connections.get(i);
-            if(con.connection != null && con.connection.getID() == id){
-                return con;
-            }
-        }
-
-        return null;
+        mainExecutor.submit(server::stop);
     }
 
     class ArcConnection extends NetConnection{
@@ -284,7 +342,7 @@ public class ArcNetProvider implements NetProvider{
 
         @Override
         public void sendStream(Streamable stream){
-            connection.addListener(new InputStreamSender(stream.stream, 512){
+            connection.addListener(new InputStreamSender(stream.stream, 1024){
                 int id;
 
                 @Override
@@ -292,7 +350,7 @@ public class ArcNetProvider implements NetProvider{
                     //send an object so the receiving side knows how to handle the following chunks
                     StreamBegin begin = new StreamBegin();
                     begin.total = stream.stream.available();
-                    begin.type = Registrator.getID(stream.getClass());
+                    begin.type = Net.getPacketId(stream);
                     connection.sendTCP(begin);
                     id = begin.id;
                 }
@@ -308,20 +366,23 @@ public class ArcNetProvider implements NetProvider{
         }
 
         @Override
-        public void send(Object object, SendMode mode){
+        public void send(Object object, boolean reliable){
             try{
-                if(mode == SendMode.tcp){
-                    connection.sendTCP(object);
-                }else{
-                    connection.sendUDP(object);
+                if(connection.isConnected()){
+                    if(reliable){
+                        connection.sendTCP(object);
+                    }else{
+                        connection.sendUDP(object);
+                    }
                 }
             }catch(Exception e){
                 Log.err(e);
                 Log.info("Error sending packet. Disconnecting invalid client!");
                 connection.close(DcReason.error);
 
-                ArcConnection k = getByArcID(connection.getID());
-                if(k != null) connections.remove(k);
+                if(connection.getArbitraryData() instanceof ArcConnection k){
+                    connections.remove(k);
+                }
             }
         }
 
@@ -331,32 +392,113 @@ public class ArcNetProvider implements NetProvider{
         }
     }
 
-    @SuppressWarnings("unchecked")
     public static class PacketSerializer implements NetSerializer{
+        //for debugging total read/write speeds
+        private static final boolean debug = false;
+
+        ThreadLocal<ByteBuffer> decompressBuffer = Threads.local(() -> ByteBuffer.allocate(32768));
+        ThreadLocal<Reads> reads = Threads.local(() -> new Reads(new ByteBufferInput(decompressBuffer.get())));
+        ThreadLocal<Writes> writes = Threads.local(() -> new Writes(new ByteBufferOutput(decompressBuffer.get())));
+
+        //for debugging network write counts
+        static WindowedMean upload = new WindowedMean(5), download = new WindowedMean(5);
+        static long lastUpload, lastDownload, uploadAccum, downloadAccum;
+        static int lastPos;
 
         @Override
         public Object read(ByteBuffer byteBuffer){
+            if(debug){
+                if(Time.timeSinceMillis(lastDownload) >= 1000){
+                    lastDownload = Time.millis();
+                    download.add(downloadAccum);
+                    downloadAccum = 0;
+                    Log.info("Download: @ b/s", download.mean());
+                }
+                downloadAccum += byteBuffer.remaining();
+            }
+
             byte id = byteBuffer.get();
             if(id == -2){
                 return readFramework(byteBuffer);
             }else{
-                Packet packet = Pools.obtain((Class<Packet>)Registrator.getByID(id).type, (Prov<Packet>)Registrator.getByID(id).constructor);
-                packet.read(byteBuffer);
+                //read length int, followed by compressed lz4 data
+                Packet packet = Net.newPacket(id);
+                var buffer = decompressBuffer.get();
+                int length = byteBuffer.getShort() & 0xffff;
+                byte compression = byteBuffer.get();
+
+                //no compression, copy over buffer
+                if(compression == 0){
+                    buffer.position(0).limit(length);
+                    buffer.put(byteBuffer.array(), byteBuffer.position(), length);
+                    buffer.position(0);
+                    packet.read(reads.get(), length);
+                    //move read packets forward
+                    byteBuffer.position(byteBuffer.position() + buffer.position());
+                }else{
+                    //decompress otherwise
+                    int read = decompressor.decompress(byteBuffer, byteBuffer.position(), buffer, 0, length);
+
+                    buffer.position(0);
+                    buffer.limit(length);
+                    packet.read(reads.get(), length);
+                    //move buffer forward based on bytes read by decompressor
+                    byteBuffer.position(byteBuffer.position() + read);
+                }
+
                 return packet;
             }
         }
 
         @Override
         public void write(ByteBuffer byteBuffer, Object o){
-            if(o instanceof FrameworkMessage){
+            if(debug){
+                lastPos = byteBuffer.position();
+            }
+
+            //write raw buffer
+            if(o instanceof ByteBuffer raw){
+                byteBuffer.put(raw);
+            }else if(o instanceof FrameworkMessage msg){
                 byteBuffer.put((byte)-2); //code for framework message
-                writeFramework(byteBuffer, (FrameworkMessage)o);
+                writeFramework(byteBuffer, msg);
             }else{
-                if(!(o instanceof Packet)) throw new RuntimeException("All sent objects must implement be Packets! Class: " + o.getClass());
-                byte id = Registrator.getID(o.getClass());
-                if(id == -1) throw new RuntimeException("Unregistered class: " + o.getClass());
+                if(!(o instanceof Packet pack)) throw new RuntimeException("All sent objects must extend Packet! Class: " + o.getClass());
+                byte id = Net.getPacketId(pack);
                 byteBuffer.put(id);
-                ((Packet)o).write(byteBuffer);
+
+                var temp = decompressBuffer.get();
+                temp.position(0);
+                temp.limit(temp.capacity());
+                pack.write(writes.get());
+
+                short length = (short)temp.position();
+
+                //write length, uncompressed
+                byteBuffer.putShort(length);
+
+                //don't bother with small packets
+                if(length < 36 || pack instanceof StreamChunk){
+                    //write direct contents...
+                    byteBuffer.put((byte)0); //0 = no compression
+                    byteBuffer.put(temp.array(), 0, length);
+                }else{
+                    byteBuffer.put((byte)1); //1 = compression
+                    //write compressed data; this does not modify position!
+                    int written = compressor.compress(temp, 0, temp.position(), byteBuffer, byteBuffer.position(), byteBuffer.remaining());
+                    //skip to indicate the written, compressed data
+                    byteBuffer.position(byteBuffer.position() + written);
+                }
+            }
+
+            if(debug){
+                if(Time.timeSinceMillis(lastUpload) >= 1000){
+                    lastUpload = Time.millis();
+                    upload.add(uploadAccum);
+                    uploadAccum = 0;
+                    Log.info("Upload: @ b/s", upload.mean());
+                }
+                uploadAccum += byteBuffer.position() - lastPos;
             }
         }
 
@@ -387,9 +529,9 @@ public class ArcNetProvider implements NetProvider{
                 p.isReply = buffer.get() == 1;
                 return p;
             }else if(id == 1){
-                return new DiscoverHost();
+                return FrameworkMessage.discoverHost;
             }else if(id == 2){
-                return new KeepAlive();
+                return FrameworkMessage.keepAlive;
             }else if(id == 3){
                 RegisterUDP p = new RegisterUDP();
                 p.connectionID = buffer.getInt();
diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java
index 6bc9e296f4..2b96a3f231 100644
--- a/core/src/mindustry/net/BeControl.java
+++ b/core/src/mindustry/net/BeControl.java
@@ -1,12 +1,11 @@
 package mindustry.net;
 
 import arc.*;
-import arc.Net.*;
 import arc.files.*;
 import arc.func.*;
 import arc.util.*;
-import arc.util.async.*;
 import arc.util.serialization.*;
+import mindustry.*;
 import mindustry.core.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -25,7 +24,6 @@ import static mindustry.Vars.*;
 public class BeControl{
     private static final int updateInterval = 60;
 
-    private AsyncExecutor executor = new AsyncExecutor(1);
     private boolean checkUpdates = true;
     private boolean updateAvailable;
     private String updateUrl;
@@ -33,21 +31,21 @@ public class BeControl{
 
     /** @return whether this is a bleeding edge build. */
     public boolean active(){
-        return Version.type.equals("bleeding-edge");
+        return Version.type.equals("bleeding-edge") && !steam;
     }
 
     public BeControl(){
         if(active()){
             Timer.schedule(() -> {
-                if(checkUpdates && !mobile){
+                if((Vars.clientLoaded || headless) && checkUpdates && !mobile){
                     checkUpdate(t -> {});
                 }
             }, updateInterval, updateInterval);
         }
 
-        if(System.getProperties().containsKey("becopy")){
+        if(OS.hasProp("becopy")){
             try{
-                Fi dest = Fi.get(System.getProperty("becopy"));
+                Fi dest = Fi.get(OS.prop("becopy"));
                 Fi self = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
                 
                 for(Fi file : self.parent().findAll(f -> !f.equals(self))) file.delete();
@@ -61,27 +59,28 @@ public class BeControl{
 
     /** asynchronously checks for updates. */
     public void checkUpdate(Boolc done){
-        Core.net.httpGet("https://api.github.com/repos/Anuken/MindustryBuilds/releases/latest", res -> {
-            if(res.getStatus() == HttpStatus.OK){
-                Jval val = Jval.read(res.getResultAsString());
-                int newBuild = Strings.parseInt(val.getString("tag_name", "0"));
-                if(newBuild > Version.build){
-                    Jval asset = val.get("assets").asArray().find(v -> v.getString("name", "").startsWith(headless ? "Mindustry-BE-Server" : "Mindustry-BE-Desktop"));
-                    String url = asset.getString("browser_download_url", "");
-                    updateAvailable = true;
-                    updateBuild = newBuild;
-                    updateUrl = url;
-                    Core.app.post(() -> {
-                        showUpdateDialog();
-                        done.get(true);
-                    });
-                }else{
-                    Core.app.post(() -> done.get(false));
-                }
+        Http.get("https://api.github.com/repos/Anuken/MindustryBuilds/releases/latest")
+        .error(e -> {
+            //don't log the error, as it would clog output if there is no internet. make sure it's handled to prevent infinite loading.
+            done.get(false);
+        })
+        .submit(res -> {
+            Jval val = Jval.read(res.getResultAsString());
+            int newBuild = Strings.parseInt(val.getString("tag_name", "0"));
+            if(newBuild > Version.build){
+                Jval asset = val.get("assets").asArray().find(v -> v.getString("name", "").startsWith(headless ? "Mindustry-BE-Server" : "Mindustry-BE-Desktop"));
+                String url = asset.getString("browser_download_url", "");
+                updateAvailable = true;
+                updateBuild = newBuild;
+                updateUrl = url;
+                Core.app.post(() -> {
+                    showUpdateDialog();
+                    done.get(true);
+                });
             }else{
                 Core.app.post(() -> done.get(false));
             }
-        }, error -> {}); //ignore errors
+        });
     }
 
     /** @return whether a new update is available */
@@ -101,16 +100,16 @@ public class BeControl{
                     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 fileDest = OS.hasProp("becopy") ?
+                        Fi.get(OS.prop("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(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()}
+                                new String[]{javaPath, "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()} :
+                                new String[]{javaPath, "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()}
                             );
                             System.exit(0);
                         }catch(IOException e){
@@ -152,7 +151,7 @@ public class BeControl{
                         Log.info("&lcAutosaved.");
 
                         netServer.kickAll(KickReason.serverRestarting);
-                        Threads.sleep(32);
+                        Threads.sleep(500);
 
                         Log.info("&lcVersion downloaded, exiting. Note that if you are not using a auto-restart script, the server will not restart automatically.");
                         //replace old file with new
@@ -170,7 +169,7 @@ public class BeControl{
     }
 
     private void download(String furl, Fi dest, Intc length, Floatc progressor, Boolp canceled, Runnable done, Cons<Throwable> error){
-        executor.submit(() -> {
+        mainExecutor.submit(() -> {
             try{
                 HttpURLConnection con = (HttpURLConnection)new URL(furl).openConnection();
                 BufferedInputStream in = new BufferedInputStream(con.getInputStream());
diff --git a/core/src/mindustry/net/CrashHandler.java b/core/src/mindustry/net/CrashHandler.java
new file mode 100644
index 0000000000..2ac952c3e6
--- /dev/null
+++ b/core/src/mindustry/net/CrashHandler.java
@@ -0,0 +1,154 @@
+package mindustry.net;
+
+import arc.*;
+import arc.files.*;
+import arc.func.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.core.*;
+import mindustry.mod.Mods.*;
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+
+import static arc.Core.*;
+import static mindustry.Vars.*;
+
+public class CrashHandler{
+
+    public static String createReport(Throwable exception){
+        String error = writeException(exception);
+        LoadedMod cause = getModCause(exception);
+
+        String report = cause == null ? "Mindustry has crashed. How unfortunate.\n" : "The mod '" +  cause.meta.displayName + "' (" + cause.name + ")" + " has caused Mindustry to crash.\n";
+        if(mods != null && 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: " + OS.osName + " x" + (OS.osArchBits) + " (" + OS.osArch + ")\n"
+        + ((OS.isAndroid || OS.isIos) && app != null ? "Android API level: " + Core.app.getVersion() + "\n" : "")
+        + "Java Version: " + OS.javaVersion + "\n"
+        + "Runtime Available Memory: " + (Runtime.getRuntime().maxMemory() / 1024 / 1024) + "mb\n"
+        + "Cores: " + OS.cores + "\n"
+        + (cause == null ? "" : "Likely Cause: " + cause.meta.displayName + " (" + cause.name + " v" + cause.meta.version + ")\n")
+        + (mods == null ? "<no mod init>" : "Mods: " + (!mods.list().contains(LoadedMod::shouldBeEnabled) ? "none (vanilla)" : mods.list().select(LoadedMod::shouldBeEnabled).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(createReport(exception));
+        }catch(Throwable ignored){
+        }
+    }
+
+    public static void handle(Throwable exception, Cons<File> writeListener){
+        try{
+            try{
+                //log to file
+                Log.err(exception);
+            }catch(Throwable no){
+                exception.printStackTrace();
+            }
+
+            //try saving game data
+            try{
+                settings.manualSave();
+            }catch(Throwable ignored){}
+
+            //don't create crash logs for custom builds, as it's expected
+            if(OS.username.equals("anuke") && !"steam".equals(Version.modifier)){
+                System.exit(1);
+            }
+
+            //attempt to load version regardless
+            if(Version.number == 0){
+                try{
+                    ObjectMap<String, String> map = new ObjectMap<>();
+                    PropertiesUtils.load(map, new InputStreamReader(CrashHandler.class.getResourceAsStream("/version.properties")));
+
+                    Version.type = map.get("type");
+                    Version.number = Integer.parseInt(map.get("number"));
+                    Version.modifier = map.get("modifier");
+                    if(map.get("build").contains(".")){
+                        String[] split = map.get("build").split("\\.");
+                        Version.build = Integer.parseInt(split[0]);
+                        Version.revision = Integer.parseInt(split[1]);
+                    }else{
+                        Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
+                    }
+                }catch(Throwable e){
+                    e.printStackTrace();
+                    Log.err("Failed to parse version.");
+                }
+            }
+
+            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(createReport(exception));
+                writeListener.get(file);
+            }catch(Throwable e){
+                Log.err("Failed to save local crash report.", e);
+            }
+
+            //attempt to close connections, if applicable
+            try{
+                net.dispose();
+            }catch(Throwable ignored){
+            }
+
+        }catch(Throwable death){
+            death.printStackTrace();
+        }
+
+        System.exit(1);
+    }
+
+    /** @return the mod that is likely to have caused the supplied crash */
+    public static @Nullable LoadedMod getModCause(Throwable e){
+        if(Vars.mods == null) return null;
+        try{
+            for(var element : e.getStackTrace()){
+                String name = element.getClassName();
+                if(!name.matches("(mindustry|arc|java|javax|sun|jdk)\\..*")){
+                    for(var mod : mods.list()){
+                        if(mod.meta.main != null && getMatches(mod.meta.main, name) > 0){
+                            return mod;
+                        }else if(element.getFileName() != null && element.getFileName().endsWith(".js") && element.getFileName().startsWith(mod.name + "/")){
+                            return mod;
+                        }
+                    }
+                }
+            }
+        }catch(Throwable ignored){}
+        return null;
+    }
+
+    private static int getMatches(String name1, String name2){
+        String[] arr1 = name1.split("\\."), arr2 = name2.split("\\.");
+        int matches = 0;
+        for(int i = 0; i < Math.min(arr1.length, arr2.length); i++){
+
+            if(!arr1[i].equals(arr2[i])){
+                return i;
+            }else if(!arr1[i].matches("net|org|com|io")){ //ignore common domain prefixes, as that's usually not enough to call something a "match"
+                matches ++;
+            }
+        }
+        return matches;
+    }
+
+    private static String writeException(Throwable e){
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        e.printStackTrace(pw);
+        return sw.toString();
+    }
+}
diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java
deleted file mode 100644
index 4ca4f3714e..0000000000
--- a/core/src/mindustry/net/CrashSender.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package mindustry.net;
-
-import arc.*;
-import arc.Net.*;
-import arc.files.*;
-import arc.func.*;
-import arc.struct.*;
-import arc.util.*;
-import arc.util.io.*;
-import arc.util.serialization.*;
-import arc.util.serialization.JsonValue.*;
-import arc.util.serialization.JsonWriter.*;
-import mindustry.*;
-import mindustry.core.*;
-import mindustry.gen.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import static arc.Core.*;
-import static mindustry.Vars.net;
-import static mindustry.Vars.*;
-
-public class CrashSender{
-
-    public static String createReport(String error){
-        String report = "Mindustry has crashed. How unfortunate.\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(createReport(Strings.neatError(exception)));
-        }catch(Throwable ignored){
-        }
-    }
-
-    public static void send(Throwable exception, Cons<File> writeListener){
-        try{
-            try{
-                //log to file
-                Log.err(exception);
-            }catch(Throwable no){
-                exception.printStackTrace();
-            }
-
-            //try saving game data
-            try{
-                settings.manualSave();
-            }catch(Throwable ignored){}
-
-            //don't create crash logs for custom builds, as it's expected
-            if(Version.build == -1 || (System.getProperty("user.name").equals("anuke") && "release".equals(Version.modifier))){
-                ret();
-            }
-
-            //attempt to load version regardless
-            if(Version.number == 0){
-                try{
-                    ObjectMap<String, String> map = new ObjectMap<>();
-                    PropertiesUtils.load(map, new InputStreamReader(CrashSender.class.getResourceAsStream("/version.properties")));
-
-                    Version.type = map.get("type");
-                    Version.number = Integer.parseInt(map.get("number"));
-                    Version.modifier = map.get("modifier");
-                    if(map.get("build").contains(".")){
-                        String[] split = map.get("build").split("\\.");
-                        Version.build = Integer.parseInt(split[0]);
-                        Version.revision = Integer.parseInt(split[1]);
-                    }else{
-                        Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
-                    }
-                }catch(Throwable e){
-                    e.printStackTrace();
-                    Log.err("Failed to parse version.");
-                }
-            }
-
-            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(createReport(parseException(exception)));
-                writeListener.get(file);
-            }catch(Throwable e){
-                Log.err("Failed to save local crash report.", e);
-            }
-
-            try{
-                //check crash report setting
-                if(!Core.settings.getBool("crashreport", true)){
-                    ret();
-                }
-            }catch(Throwable ignored){
-                //if there's no settings init we don't know what the user wants but chances are it's an important crash, so send it anyway
-            }
-
-            try{
-                //check any mods - if there are any, don't send reports
-                if(Vars.mods != null && !Vars.mods.list().isEmpty()){
-                    ret();
-                }
-            }catch(Throwable ignored){
-            }
-
-            //do not send exceptions that occur for versions that can't be parsed
-            if(Version.number == 0){
-                ret();
-            }
-
-            boolean netActive = false, netServer = false;
-
-            //attempt to close connections, if applicable
-            try{
-                netActive = net.active();
-                netServer = net.server();
-                net.dispose();
-            }catch(Throwable ignored){
-            }
-
-            JsonValue value = new JsonValue(ValueType.object);
-
-            boolean fn = netActive, fs = netServer;
-
-            //add all relevant info, ignoring exceptions
-            ex(() -> value.addChild("versionType", new JsonValue(Version.type)));
-            ex(() -> value.addChild("versionNumber", new JsonValue(Version.number)));
-            ex(() -> value.addChild("versionModifier", new JsonValue(Version.modifier)));
-            ex(() -> value.addChild("build", new JsonValue(Version.build)));
-            ex(() -> value.addChild("revision", new JsonValue(Version.revision)));
-            ex(() -> value.addChild("net", new JsonValue(fn)));
-            ex(() -> value.addChild("server", new JsonValue(fs)));
-            ex(() -> value.addChild("players", new JsonValue(Groups.player.size())));
-            ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name())));
-            ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name") + "x" + (OS.is64Bit ? "64" : "32"))));
-            ex(() -> value.addChild("trace", new JsonValue(parseException(exception))));
-            ex(() -> value.addChild("javaVersion", new JsonValue(System.getProperty("java.version"))));
-            ex(() -> value.addChild("javaArch", new JsonValue(System.getProperty("sun.arch.data.model"))));
-
-            boolean[] sent = {false};
-
-            Log.info("Sending crash report.");
-            //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;
-                System.exit(1);
-            }, t -> {
-                t.printStackTrace();
-                sent[0] = true;
-                System.exit(-1);
-            });
-
-            //sleep until report is sent
-            try{
-                while(!sent[0]){
-                    Thread.sleep(30);
-                }
-            }catch(InterruptedException ignored){}
-        }catch(Throwable death){
-            death.printStackTrace();
-        }
-
-        ret();
-    }
-
-    private static void ret(){
-        System.exit(1);
-    }
-
-    private static void httpPost(String url, String content, Cons<HttpResponse> success, Cons<Throwable> failure){
-        new NetJavaImpl().http(new HttpRequest().method(HttpMethod.POST).content(content).url(url), success, failure);
-    }
-
-    private static String parseException(Throwable e){
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        e.printStackTrace(pw);
-        return sw.toString();
-    }
-
-    private static void ex(Runnable r){
-        try{
-            r.run();
-        }catch(Throwable ignored){
-        }
-    }
-}
diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
index dc7431d0d4..7271c06aaf 100644
--- a/core/src/mindustry/net/Net.java
+++ b/core/src/mindustry/net/Net.java
@@ -3,9 +3,10 @@ package mindustry.net;
 import arc.*;
 import arc.func.*;
 import arc.net.*;
+import arc.net.Server.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.pooling.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.net.Packets.*;
 import mindustry.net.Streamable.*;
@@ -14,24 +15,60 @@ import net.jpountz.lz4.*;
 import java.io.*;
 import java.nio.*;
 import java.nio.channels.*;
+import java.util.concurrent.*;
 
+import static arc.util.Log.*;
 import static mindustry.Vars.*;
 
 @SuppressWarnings("unchecked")
 public class Net{
+    private static Seq<Prov<? extends Packet>> packetProvs = new Seq<>();
+    private static Seq<Class<? extends Packet>> packetClasses = new Seq<>();
+    private static ObjectIntMap<Class<?>> packetToId = new ObjectIntMap<>();
+
     private boolean server;
     private boolean active;
     private boolean clientLoaded;
     private @Nullable StreamBuilder currentStream;
 
-    private final Seq<Object> packetQueue = new Seq<>();
+    private final Seq<Packet> packetQueue = new Seq<>();
     private final ObjectMap<Class<?>, Cons> clientListeners = new ObjectMap<>();
     private final ObjectMap<Class<?>, Cons2<NetConnection, Object>> serverListeners = new ObjectMap<>();
     private final IntMap<StreamBuilder> streams = new IntMap<>();
+    private final ExecutorService pingExecutor =
+        OS.isWindows && !OS.is64Bit ? Threads.boundedExecutor("Ping Servers", 5) : //on 32-bit windows, thread spam crashes
+        OS.isIos ? Threads.boundedExecutor("Ping Servers", 32) : //on IOS, 256 threads can crash, so limit the amount
+        Threads.unboundedExecutor();
 
     private final NetProvider provider;
-    private final LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
-    private final LZ4Compressor compressor = LZ4Factory.fastestInstance().fastCompressor();
+
+    static{
+        registerPacket(StreamBegin::new);
+        registerPacket(StreamChunk::new);
+        registerPacket(WorldStream::new);
+        registerPacket(ConnectPacket::new);
+
+        //register generated packet classes
+        Call.registerPackets();
+    }
+
+    /** Registers a new packet type for serialization. */
+    public static <T extends Packet> void registerPacket(Prov<T> cons){
+        packetProvs.add(cons);
+        var t = cons.get();
+        packetClasses.add(t.getClass());
+        packetToId.put(t.getClass(), packetProvs.size - 1);
+    }
+
+    public static byte getPacketId(Packet packet){
+        int id = packetToId.get(packet.getClass(), -1);
+        if(id == -1) throw new ArcRuntimeException("Unknown packet type: " + packet.getClass());
+        return (byte)id;
+    }
+
+    public static <T extends Packet> T newPacket(byte id){
+        return ((Prov<T>)packetProvs.get(id & 0xff)).get();
+    }
 
     public Net(NetProvider provider){
         this.provider = provider;
@@ -39,9 +76,9 @@ public class Net{
 
     public void handleException(Throwable e){
         if(e instanceof ArcNetException){
-            Core.app.post(() -> showError(new IOException("mismatch")));
+            Core.app.post(() -> showError(new IOException("mismatch", e)));
         }else if(e instanceof ClosedChannelException){
-            Core.app.post(() -> showError(new IOException("alreadyconnected")));
+            Core.app.post(() -> showError(new IOException("alreadyconnected", e)));
         }else{
             Core.app.post(() -> showError(e));
         }
@@ -63,9 +100,9 @@ public class Net{
             String type = t.getClass().toString().toLowerCase();
             boolean isError = false;
 
-            if(e instanceof BufferUnderflowException || e instanceof BufferOverflowException){
+            if(e instanceof BufferUnderflowException || e instanceof BufferOverflowException || e.getCause() instanceof EOFException){
                 error = Core.bundle.get("error.io");
-            }else if(error.equals("mismatch")){
+            }else if(error.equals("mismatch") || e instanceof LZ4Exception || (e instanceof IndexOutOfBoundsException && e.getStackTrace().length > 0 && e.getStackTrace()[0].getClassName().contains("java.nio"))){
                 error = Core.bundle.get("error.mismatch");
             }else if(error.contains("port out of range") || error.contains("invalid argument") || (error.contains("invalid") && error.contains("address")) || Strings.neatError(e).contains("address associated")){
                 error = Core.bundle.get("error.invalidaddress");
@@ -122,6 +159,7 @@ public class Net{
     public void connect(String ip, int port, Runnable success){
         try{
             if(!active){
+                Events.fire(new ClientServerConnectEvent(ip, port));
                 provider.connectClient(ip, port, success);
                 active = true;
                 server = false;
@@ -171,14 +209,6 @@ public class Net{
         active = false;
     }
 
-    public byte[] compressSnapshot(byte[] input){
-        return compressor.compress(input);
-    }
-
-    public byte[] decompressSnapshot(byte[] input, int size){
-        return decompressor.decompress(input, size);
-    }
-
     /**
      * Starts discovering servers on a different thread.
      * Callback is run on the main Arc thread.
@@ -195,21 +225,21 @@ public class Net{
     }
 
     /** Send an object to all connected clients, or to the server if this is a client.*/
-    public void send(Object object, SendMode mode){
+    public void send(Object object, boolean reliable){
         if(server){
             for(NetConnection con : provider.getConnections()){
-                con.send(object, mode);
+                con.send(object, reliable);
             }
         }else{
-            provider.sendClient(object, mode);
+            provider.sendClient(object, reliable);
         }
     }
 
     /** Send an object to everyone EXCEPT a certain client. Server-side only.*/
-    public void sendExcept(NetConnection except, Object object, SendMode mode){
+    public void sendExcept(NetConnection except, Object object, boolean reliable){
         for(NetConnection con : getConnections()){
             if(con != except){
-                con.send(object, mode);
+                con.send(object, reliable);
             }
         }
     }
@@ -235,7 +265,8 @@ public class Net{
     /**
      * Call to handle a packet being received for the client.
      */
-    public void handleClientReceived(Object object){
+    public void handleClientReceived(Packet object){
+        object.handled();
 
         if(object instanceof StreamBegin b){
             streams.put(b.id, currentStream = new StreamBuilder(b));
@@ -246,48 +277,76 @@ public class Net{
                 throw new RuntimeException("Received stream chunk without a StreamBegin beforehand!");
             }
             builder.add(c.data);
+
+            ui.loadfrag.setProgress(builder.progress());
+            ui.loadfrag.snapProgress();
+            netClient.resetTimeout();
+
             if(builder.isDone()){
                 streams.remove(builder.id);
                 handleClientReceived(builder.build());
                 currentStream = null;
             }
-        }else if(clientListeners.get(object.getClass()) != null){
+        }else{
+            int p = object.getPriority();
 
-            if(clientLoaded || ((object instanceof Packet) && ((Packet)object).isImportant())){
+            if(clientLoaded || p == Packet.priorityHigh){
                 if(clientListeners.get(object.getClass()) != null){
                     clientListeners.get(object.getClass()).get(object);
+                }else{
+                    object.handleClient();
                 }
-                Pools.free(object);
-            }else if(!((object instanceof Packet) && ((Packet)object).isUnimportant())){
+            }else if(p != Packet.priorityLow){
                 packetQueue.add(object);
-            }else{
-                Pools.free(object);
             }
-        }else{
-            Log.err("Unhandled packet type: '@'!", object);
         }
     }
 
     /**
      * Call to handle a packet being received for the server.
      */
-    public void handleServerReceived(NetConnection connection, Object object){
+    public void handleServerReceived(NetConnection connection, Packet object){
 
-        if(serverListeners.get(object.getClass()) != null){
-            if(serverListeners.get(object.getClass()) != null){
-                serverListeners.get(object.getClass()).get(connection, object);
+        try{
+            if(connection.hasConnected || object.getPriority() == Packet.priorityHigh){
+                object.handled();
+
+                //handle object normally
+                if(serverListeners.get(object.getClass()) != null){
+                    serverListeners.get(object.getClass()).get(connection, object);
+                }else{
+                    object.handleServer(connection);
+                }
+            }
+        }catch(ValidateException e){
+            //ignore invalid actions
+            debug("Validation failed for '@': @", e.player, e.getMessage());
+        }catch(RuntimeException e){
+            //ignore indirect ValidateException-s
+            if(e.getCause() instanceof ValidateException v){
+                debug("Validation failed for '@': @", v.player, v.getMessage());
+            }else{
+                //rethrow if not ValidateException
+                throw e;
             }
-            Pools.free(object);
-        }else{
-            Log.err("Unhandled packet type: '@'!", object.getClass());
         }
     }
 
+    /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. Server only. */
+    public void setConnectFilter(@Nullable ServerConnectFilter filter){
+        provider.setConnectFilter(filter);
+    }
+
+    public @Nullable ServerConnectFilter getConnectFilter(){
+        return provider.getConnectFilter();
+    }
+
     /**
-     * Pings a host in an new thread. If an error occured, failed() should be called with the exception.
+     * Pings a host in a pooled thread. If an error occurred, failed() should be called with the exception.
+     * If the port is the default mindustry port, SRV records are checked too.
      */
     public void pingHost(String address, int port, Cons<Host> valid, Cons<Exception> failed){
-        provider.pingHost(address, port, valid, failed);
+        pingExecutor.submit(() -> provider.pingHost(address, port, valid, failed));
     }
 
     /**
@@ -317,17 +376,13 @@ public class Net{
         active = false;
     }
 
-    public enum SendMode{
-        tcp, udp
-    }
-
     /** Networking implementation. */
     public interface NetProvider{
         /** Connect to a server. */
         void connectClient(String ip, int port, Runnable success) throws IOException;
 
         /** Send an object to the server. */
-        void sendClient(Object object, SendMode mode);
+        void sendClient(Object object, boolean reliable);
 
         /** Disconnect from the server. */
         void disconnectClient();
@@ -339,7 +394,10 @@ public class Net{
          */
         void discoverServers(Cons<Host> callback, Runnable done);
 
-        /** Ping a host. If an error occured, failed() should be called with the exception. */
+        /**
+         * Ping a host. If an error occurred, failed() should be called with the exception. This method should block.
+         * If the port is the default mindustry port (6567), SRV records are checked too.
+         */
         void pingHost(String address, int port, Cons<Host> valid, Cons<Exception> failed);
 
         /** Host a server at specified port. */
@@ -356,5 +414,12 @@ public class Net{
             disconnectClient();
             closeServer();
         }
+
+        /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. */
+        default void setConnectFilter(Server.ServerConnectFilter connectFilter){}
+
+        default @Nullable ServerConnectFilter getConnectFilter(){
+            return null;
+        }
     }
 }
diff --git a/core/src/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java
index cf1e47bbbd..7c9e51890f 100644
--- a/core/src/mindustry/net/NetConnection.java
+++ b/core/src/mindustry/net/NetConnection.java
@@ -4,8 +4,6 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
-import mindustry.net.Administration.*;
-import mindustry.net.Net.*;
 import mindustry.net.Packets.*;
 
 import java.io.*;
@@ -18,13 +16,22 @@ public abstract class NetConnection{
     public boolean mobile, modclient;
     public @Nullable Player player;
     public boolean kicked = false;
+    public long syncTime;
 
+    /** When this connection was established. */
+    public long connectTime = Time.millis();
     /** ID of last received client snapshot. */
     public int lastReceivedClientSnapshot = -1;
+    /** Count of snapshots sent from server. */
+    public int snapshotsSent;
     /** Timestamp of last received snapshot. */
     public long lastReceivedClientTime;
     /** Build requests that have been recently rejected. This is cleared every snapshot. */
     public Seq<BuildPlan> rejectedRequests = new Seq<>();
+    /** Handles chat spam rate limits. */
+    public Ratekeeper chatRate = new Ratekeeper();
+    /** Handles packet spam rate limits. */
+    public Ratekeeper packetRate = new Ratekeeper();
 
     public boolean hasConnected, hasBegunConnecting, hasDisconnected;
     public float viewWidth, viewHeight, viewX, viewY;
@@ -33,47 +40,57 @@ public abstract class NetConnection{
         this.address = address;
     }
 
+    /** Kick with the standard kick reason. */
+    public void kick(){
+        kick(KickReason.kick);
+    }
+
     /** Kick with a special, localized reason. Use this if possible. */
     public void kick(KickReason reason){
-        if(kicked) return;
+        kick(reason, (reason == KickReason.kick || reason == KickReason.banned || reason == KickReason.vote) ? 30 * 1000 : 0);
+    }
 
-        Log.info("Kicking connection @; Reason: @", address, reason.name());
-
-        if((reason == KickReason.kick || reason == KickReason.banned || reason == KickReason.vote)){
-            PlayerInfo info = netServer.admins.getInfo(uuid);
-            info.timesKicked++;
-            info.lastKicked = Math.max(Time.millis() + 30 * 1000, info.lastKicked);
-        }
-
-        Call.kick(this, reason);
-
-        Time.runTask(2f, this::close);
-
-        netServer.admins.save();
-        kicked = true;
+    /** Kick with a special, localized reason. Use this if possible. */
+    public void kick(KickReason reason, long kickDuration){
+        kick(null, reason, kickDuration);
     }
 
     /** Kick with an arbitrary reason. */
     public void kick(String reason){
-        kick(reason, 30 * 1000);
+        kick(reason, null, 30 * 1000);
+    }
+
+    /** Kick with an arbitrary reason. */
+    public void kick(String reason, long duration){
+        kick(reason, null, duration);
     }
 
     /** Kick with an arbitrary reason, and a kick duration in milliseconds. */
-    public void kick(String reason, int kickDuration){
+    private void kick(String reason, @Nullable KickReason kickType, long kickDuration){
         if(kicked) return;
 
-        Log.info("Kicking connection @; Reason: @", address, reason.replace("\n", " "));
+        Log.info("Kicking connection @ / @; Reason: @", address, uuid, reason == null ? kickType.name() : reason.replace("\n", " "));
 
-        netServer.admins.handleKicked(uuid, address, kickDuration);
+        if(kickDuration > 0){
+            netServer.admins.handleKicked(uuid, address, kickDuration);
+        }
 
-        Call.kick(this, reason);
+        if(reason == null){
+            Call.kick(this, kickType);
+        }else{
+            Call.kick(this, reason);
+        }
 
-        Time.runTask(2f, this::close);
+        kickDisconnect();
 
         netServer.admins.save();
         kicked = true;
     }
 
+    protected void kickDisconnect(){
+        close();
+    }
+
     public boolean isConnected(){
         return true;
     }
@@ -83,25 +100,25 @@ public abstract class NetConnection{
             int cid;
             StreamBegin begin = new StreamBegin();
             begin.total = stream.stream.available();
-            begin.type = Registrator.getID(stream.getClass());
-            send(begin, SendMode.tcp);
+            begin.type = Net.getPacketId(stream);
+            send(begin, true);
             cid = begin.id;
 
             while(stream.stream.available() > 0){
-                byte[] bytes = new byte[Math.min(512, stream.stream.available())];
+                byte[] bytes = new byte[Math.min(maxTcpSize, stream.stream.available())];
                 stream.stream.read(bytes);
 
                 StreamChunk chunk = new StreamChunk();
                 chunk.id = cid;
                 chunk.data = bytes;
-                send(chunk, SendMode.tcp);
+                send(chunk, true);
             }
         }catch(IOException e){
             throw new RuntimeException(e);
         }
     }
 
-    public abstract void send(Object object, SendMode mode);
+    public abstract void send(Object object, boolean reliable);
 
     public abstract void close();
 }
diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java
index fbcea51267..779d832c72 100644
--- a/core/src/mindustry/net/NetworkIO.java
+++ b/core/src/mindustry/net/NetworkIO.java
@@ -10,8 +10,10 @@ import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.io.*;
+import mindustry.logic.*;
 import mindustry.maps.Map;
 import mindustry.net.Administration.*;
+import mindustry.type.*;
 
 import java.io.*;
 import java.nio.*;
@@ -29,24 +31,31 @@ public class NetworkIO{
                 state.rules.researched.clear();
                 for(ContentType type : ContentType.all){
                     for(Content c : content.getBy(type)){
-                        if(c instanceof UnlockableContent u && u.unlocked() && TechTree.get(u) != null){
-                            state.rules.researched.add(u.name);
+                        if(c instanceof UnlockableContent u && u.unlocked() && u.techNode != null){
+                            state.rules.researched.add(u);
                         }
                     }
                 }
             }
 
             stream.writeUTF(JsonIO.write(state.rules));
+            stream.writeUTF(JsonIO.write(state.mapLocales));
             SaveIO.getSaveWriter().writeStringMap(stream, state.map.tags);
 
             stream.writeInt(state.wave);
             stream.writeFloat(state.wavetime);
+            stream.writeDouble(state.tick);
+            stream.writeLong(GlobalVars.rand.seed0);
+            stream.writeLong(GlobalVars.rand.seed1);
 
             stream.writeInt(player.id);
-            player.write(Writes.get(stream));
+            player.write(new Writes(stream));
 
             SaveIO.getSaveWriter().writeContentHeader(stream);
             SaveIO.getSaveWriter().writeMap(stream);
+            SaveIO.getSaveWriter().writeTeamBlocks(stream);
+            SaveIO.getSaveWriter().writeMarkers(stream);
+            SaveIO.getSaveWriter().writeCustomChunks(stream, true);
         }catch(IOException e){
             throw new RuntimeException(e);
         }
@@ -57,20 +66,29 @@ public class NetworkIO{
         try(DataInputStream stream = new DataInputStream(is)){
             Time.clear();
             state.rules = JsonIO.read(Rules.class, stream.readUTF());
+            state.mapLocales = JsonIO.read(MapLocales.class, stream.readUTF());
             state.map = new Map(SaveIO.getSaveWriter().readStringMap(stream));
 
             state.wave = stream.readInt();
             state.wavetime = stream.readFloat();
+            state.tick = stream.readDouble();
+            GlobalVars.rand.seed0 = stream.readLong();
+            GlobalVars.rand.seed1 = stream.readLong();
+
+            Reads read = new Reads(stream);
 
             Groups.clear();
             int id = stream.readInt();
             player.reset();
-            player.read(Reads.get(stream));
+            player.read(read);
             player.id = id;
             player.add();
 
             SaveIO.getSaveWriter().readContentHeader(stream);
             SaveIO.getSaveWriter().readMap(stream, world.context);
+            SaveIO.getSaveWriter().readTeamBlocks(stream);
+            SaveIO.getSaveWriter().readMarkers(stream);
+            SaveIO.getSaveWriter().readCustomChunks(stream);
         }catch(IOException e){
             throw new RuntimeException(e);
         }finally{
@@ -79,7 +97,7 @@ public class NetworkIO{
     }
 
     public static ByteBuffer writeServerData(){
-        String name = (headless ? Config.name.string() : player.name);
+        String name = (headless ? Config.serverName.string() : player.name);
         String description = headless && !Config.desc.string().equals("off") ? Config.desc.string() : "";
         String map = state.map.name();
 
diff --git a/core/src/mindustry/net/Packet.java b/core/src/mindustry/net/Packet.java
index 2aaa2a05c0..e49b18c572 100644
--- a/core/src/mindustry/net/Packet.java
+++ b/core/src/mindustry/net/Packet.java
@@ -1,19 +1,37 @@
 package mindustry.net;
 
-import arc.util.pooling.Pool.*;
+import arc.util.io.*;
 
-import java.nio.*;
+import java.io.*;
 
-public interface Packet extends Poolable{
-    default void read(ByteBuffer buffer){}
-    default void write(ByteBuffer buffer){}
-    default void reset(){}
+public abstract class Packet{
+    //internally used by generated code
+    protected static final byte[] NODATA = {};
+    protected static final ReusableByteInStream BAIS = new ReusableByteInStream();
+    protected static final Reads READ = new Reads(new DataInputStream(BAIS));
 
-    default boolean isImportant(){
-        return false;
+    //these are constants because I don't want to bother making an enum to mirror the annotation enum
+
+    /** Does not get handled unless client is connected. */
+    public static final int priorityLow = 0;
+    /** Gets put in a queue and processed if not connected. */
+    public static final int priorityNormal = 1;
+    /** Gets handled immediately, regardless of connection status. */
+    public static final int priorityHigh = 2;
+
+    public void read(Reads read){}
+    public void write(Writes write){}
+
+    public void read(Reads read, int length){
+        read(read);
     }
 
-    default boolean isUnimportant(){
-        return false;
+    public void handled(){}
+
+    public int getPriority(){
+        return priorityNormal;
     }
+
+    public void handleClient(){}
+    public void handleServer(NetConnection con){}
 }
diff --git a/core/src/mindustry/net/Packets.java b/core/src/mindustry/net/Packets.java
index 91d5557e52..e766e59434 100644
--- a/core/src/mindustry/net/Packets.java
+++ b/core/src/mindustry/net/Packets.java
@@ -7,13 +7,9 @@ import arc.util.serialization.*;
 import mindustry.core.*;
 import mindustry.io.*;
 
-import java.io.*;
-import java.nio.*;
 import java.util.zip.*;
 
-/**
- * Class for storing all packets.
- */
+/** Class for storing all packets. */
 public class Packets{
 
     public enum KickReason{
@@ -21,6 +17,8 @@ public class Packets{
         nameInUse, idInUse, nameEmpty, customClient, serverClose, vote, typeMismatch,
         whitelist, playerLimit, serverRestarting;
 
+        public static final KickReason[] all = values();
+
         public final boolean quiet;
 
         KickReason(){
@@ -42,24 +40,28 @@ public class Packets{
     }
 
     public enum AdminAction{
-        kick, ban, trace, wave
+        kick, ban, trace, wave, switchTeam;
+
+        public static final AdminAction[] all = values();
     }
 
-    public static class Connect implements Packet{
+    /** Generic client connection event. */
+    public static class Connect extends Packet{
         public String addressTCP;
 
         @Override
-        public boolean isImportant(){
-            return true;
+        public int getPriority(){
+            return priorityHigh;
         }
     }
 
-    public static class Disconnect implements Packet{
+    /** Generic client disconnection event. */
+    public static class Disconnect extends Packet{
         public String reason;
 
         @Override
-        public boolean isImportant(){
-            return true;
+        public int getPriority(){
+            return priorityHigh;
         }
     }
 
@@ -67,55 +69,8 @@ public class Packets{
 
     }
 
-    public static class InvokePacket implements Packet{
-        private static ReusableByteInStream bin;
-        private static Reads read = new Reads(new DataInputStream(bin = new ReusableByteInStream()));
-
-        public byte type, priority;
-
-        public byte[] bytes;
-        public int length;
-
-        @Override
-        public void read(ByteBuffer buffer){
-            type = buffer.get();
-            priority = buffer.get();
-            short writeLength = buffer.getShort();
-            bytes = new byte[writeLength];
-            buffer.get(bytes);
-        }
-
-        @Override
-        public void write(ByteBuffer buffer){
-            buffer.put(type);
-            buffer.put(priority);
-            buffer.putShort((short)length);
-            buffer.put(bytes, 0, length);
-        }
-
-        @Override
-        public void reset(){
-            priority = 0;
-        }
-
-        @Override
-        public boolean isImportant(){
-            return priority == 1;
-        }
-
-        @Override
-        public boolean isUnimportant(){
-            return priority == 2;
-        }
-
-        public Reads reader(){
-            bin.setBytes(bytes);
-            return read;
-        }
-    }
-
     /** Marks the beginning of a stream. */
-    public static class StreamBegin implements Packet{
+    public static class StreamBegin extends Packet{
         private static int lastid;
 
         public int id = lastid++;
@@ -123,84 +78,89 @@ public class Packets{
         public byte type;
 
         @Override
-        public void write(ByteBuffer buffer){
-            buffer.putInt(id);
-            buffer.putInt(total);
-            buffer.put(type);
+        public void write(Writes buffer){
+            buffer.i(id);
+            buffer.i(total);
+            buffer.b(type);
         }
 
         @Override
-        public void read(ByteBuffer buffer){
-            id = buffer.getInt();
-            total = buffer.getInt();
-            type = buffer.get();
+        public void read(Reads buffer){
+            id = buffer.i();
+            total = buffer.i();
+            type = buffer.b();
         }
     }
 
-    public static class StreamChunk implements Packet{
+    public static class StreamChunk extends Packet{
         public int id;
         public byte[] data;
 
         @Override
-        public void write(ByteBuffer buffer){
-            buffer.putInt(id);
-            buffer.putShort((short)data.length);
-            buffer.put(data);
+        public void write(Writes buffer){
+            buffer.i(id);
+            buffer.s((short)data.length);
+            buffer.b(data);
         }
 
         @Override
-        public void read(ByteBuffer buffer){
-            id = buffer.getInt();
-            data = new byte[buffer.getShort()];
-            buffer.get(data);
+        public void read(Reads buffer){
+            id = buffer.i();
+            data = buffer.b(buffer.s());
         }
     }
 
-    public static class ConnectPacket implements Packet{
+    public static class ConnectPacket extends Packet{
         public int version;
         public String versionType;
         public Seq<String> mods;
-        public String name, uuid, usid;
+        public String name, locale, uuid, usid;
         public boolean mobile;
         public int color;
 
         @Override
-        public void write(ByteBuffer buffer){
-            buffer.putInt(Version.build);
+        public void write(Writes buffer){
+            buffer.i(Version.build);
             TypeIO.writeString(buffer, versionType);
             TypeIO.writeString(buffer, name);
+            TypeIO.writeString(buffer, locale);
             TypeIO.writeString(buffer, usid);
 
             byte[] b = Base64Coder.decode(uuid);
-            buffer.put(b);
+            buffer.b(b);
             CRC32 crc = new CRC32();
             crc.update(Base64Coder.decode(uuid), 0, b.length);
-            buffer.putLong(crc.getValue());
+            buffer.l(crc.getValue());
 
-            buffer.put(mobile ? (byte)1 : 0);
-            buffer.putInt(color);
-            buffer.put((byte)mods.size);
+            buffer.b(mobile ? (byte)1 : 0);
+            buffer.i(color);
+            buffer.b((byte)mods.size);
             for(int i = 0; i < mods.size; i++){
                 TypeIO.writeString(buffer, mods.get(i));
             }
         }
 
         @Override
-        public void read(ByteBuffer buffer){
-            version = buffer.getInt();
+        public void read(Reads buffer){
+            version = buffer.i();
             versionType = TypeIO.readString(buffer);
             name = TypeIO.readString(buffer);
+            locale = TypeIO.readString(buffer);
             usid = TypeIO.readString(buffer);
-            byte[] idbytes = new byte[16];
-            buffer.get(idbytes);
+            byte[] idbytes =  buffer.b(16);
             uuid = new String(Base64Coder.encode(idbytes));
-            mobile = buffer.get() == 1;
-            color = buffer.getInt();
-            int totalMods = buffer.get();
+            mobile = buffer.b() == 1;
+            color = buffer.i();
+            int totalMods = buffer.b();
             mods = new Seq<>(totalMods);
             for(int i = 0; i < totalMods; i++){
                 mods.add(TypeIO.readString(buffer));
             }
         }
+
+        @Override
+        public int getPriority(){
+            return priorityHigh;
+        }
     }
 }
diff --git a/core/src/mindustry/net/Registrator.java b/core/src/mindustry/net/Registrator.java
deleted file mode 100644
index 2280d016e0..0000000000
--- a/core/src/mindustry/net/Registrator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package mindustry.net;
-
-import arc.func.*;
-import arc.struct.*;
-import mindustry.net.Packets.*;
-
-public class Registrator{
-    private static final ClassEntry[] classes = {
-    new ClassEntry(StreamBegin.class, StreamBegin::new),
-    new ClassEntry(StreamChunk.class, StreamChunk::new),
-    new ClassEntry(WorldStream.class, WorldStream::new),
-    new ClassEntry(ConnectPacket.class, ConnectPacket::new),
-    new ClassEntry(InvokePacket.class, InvokePacket::new)
-    };
-    private static final ObjectIntMap<Class<?>> ids = new ObjectIntMap<>();
-
-    static{
-        if(classes.length > 127) throw new RuntimeException("Can't have more than 127 registered classes!");
-        for(int i = 0; i < classes.length; i++){
-            ids.put(classes[i].type, i);
-        }
-    }
-
-    public static ClassEntry getByID(byte id){
-        return classes[id];
-    }
-
-    public static byte getID(Class<?> type){
-        return (byte)ids.get(type, -1);
-    }
-
-    public static ClassEntry[] getClasses(){
-        return classes;
-    }
-
-    public static class ClassEntry{
-        public final Class<?> type;
-        public final Prov<?> constructor;
-
-        public <T extends Packet> ClassEntry(Class<T> type, Prov<T> constructor){
-            this.type = type;
-            this.constructor = constructor;
-        }
-    }
-}
diff --git a/core/src/mindustry/net/ServerGroup.java b/core/src/mindustry/net/ServerGroup.java
index 15bd8fa4d3..694058f050 100644
--- a/core/src/mindustry/net/ServerGroup.java
+++ b/core/src/mindustry/net/ServerGroup.java
@@ -5,10 +5,16 @@ import arc.*;
 public class ServerGroup{
     public String name;
     public String[] addresses;
+    public boolean prioritized = false;
 
-    public ServerGroup(String name, String[] addresses){
+    public ServerGroup(String name, String[] addresses, boolean prioritized){
         this.name = name;
         this.addresses = addresses;
+        this.prioritized = prioritized;
+    }
+
+    public ServerGroup(String name, String[] addresses){
+        this(name, addresses, false);
     }
 
     public ServerGroup(){
diff --git a/core/src/mindustry/net/Streamable.java b/core/src/mindustry/net/Streamable.java
index 52ce5d36d8..c150fc26f3 100644
--- a/core/src/mindustry/net/Streamable.java
+++ b/core/src/mindustry/net/Streamable.java
@@ -4,12 +4,12 @@ import mindustry.net.Packets.*;
 
 import java.io.*;
 
-public class Streamable implements Packet{
+public class Streamable extends Packet{
     public transient ByteArrayInputStream stream;
 
     @Override
-    public boolean isImportant(){
-        return true;
+    public int getPriority(){
+        return priorityHigh;
     }
 
     public static class StreamBuilder{
@@ -37,7 +37,7 @@ public class Streamable implements Packet{
         }
 
         public Streamable build(){
-            Streamable s = (Streamable)Registrator.getByID(type).constructor.get();
+            Streamable s = Net.newPacket(type);
             s.stream = new ByteArrayInputStream(stream.toByteArray());
             return s;
         }
diff --git a/core/src/mindustry/net/WorldReloader.java b/core/src/mindustry/net/WorldReloader.java
index 23515aae87..8fb1949915 100644
--- a/core/src/mindustry/net/WorldReloader.java
+++ b/core/src/mindustry/net/WorldReloader.java
@@ -32,7 +32,9 @@ public class WorldReloader{
 
             Call.worldDataBegin();
         }else{
-            net.reset();
+            if(net.client()){
+                net.reset();
+            }    
             logic.reset();
         }
 
diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/core/src/mindustry/service/Achievement.java
similarity index 53%
rename from desktop/src/mindustry/desktop/steam/SAchievement.java
rename to core/src/mindustry/service/Achievement.java
index ffa429c868..cd62301fae 100644
--- a/desktop/src/mindustry/desktop/steam/SAchievement.java
+++ b/core/src/mindustry/service/Achievement.java
@@ -1,6 +1,10 @@
-package mindustry.desktop.steam;
+package mindustry.service;
 
-public enum SAchievement{
+import arc.util.*;
+
+import static mindustry.Vars.*;
+
+public enum Achievement{
     kill1kEnemies(SStat.unitsDestroyed, 1000),
     kill100kEnemies(SStat.unitsDestroyed, 100_000),
     launch100kItems(SStat.itemsLaunched, 100_000),
@@ -35,7 +39,7 @@ public enum SAchievement{
     issueAttackCommand,
     active100Units(SStat.maxUnitActive, 100),
     build1000Units(SStat.unitsBuilt, 1000),
-    buildAllUnits(SStat.unitTypesBuilt, 30),
+    buildAllUnits(SStat.unitTypesBuilt, 50),
     buildT5,
     pickupT5,
     active10Polys,
@@ -49,34 +53,95 @@ public enum SAchievement{
     circleConveyor,
     becomeRouter,
     create20Schematics(SStat.schematicsCreated, 20),
+    create500Schematics(SStat.schematicsCreated, 500),
     survive10WavesNoBlocks,
     captureNoBlocksBroken,
     useFlameAmmo,
     coolTurret,
     enablePixelation,
     openWiki,
-    useAccelerator,
+    allTransportOneMap,
+    buildOverdriveProjector,
+    buildMendProjector,
+    buildWexWater,
+
+    have10mItems(SStat.totalCampaignItems, 10_000_000),
+    killEclipseDuo,
+
+    completeErekir,
+    completeSerpulo,
+
+    launchCoreSchematic,
+    nucleusGroundZero,
+
+    neoplasmWater,
+    blastFrozenUnit,
+
+    allBlocksSerpulo,
+    allBlocksErekir,
+
+    breakForceProjector,
+    researchLogic,
+
+    negative10kPower,
+    positive100kPower,
+    store1milPower,
+
+    blastGenerator,
+    neoplasiaExplosion,
+
+    installMod,
+    routerLanguage,
+    joinCommunityServer,
+    openConsole,
+
+    controlTurret,
+    dropUnitsCoreZone,
+    destroyScatterFlare,
+    boostUnit,
+    boostBuildingFloor,
+
+    hoverUnitLiquid,
+
+    break100Boulders(SStat.bouldersDeconstructed, 100),
+    break10000Boulders(SStat.bouldersDeconstructed, 10_000),
+
+    shockwaveTowerUse,
+
+    useAnimdustryEmoji,
 
     ;
 
     private final SStat stat;
     private final int statGoal;
-    public static final SAchievement[] all = values();
+    private boolean completed = false;
+
+    public static final Achievement[] all = values();
 
     /** Creates an achievement that is triggered when this stat reaches a number.*/
-    SAchievement(SStat stat, int goal){
+    Achievement(SStat stat, int goal){
         this.stat = stat;
         this.statGoal = goal;
     }
 
-    SAchievement(){
+    Achievement(){
         this(null, 0);
     }
 
     public void complete(){
         if(!isAchieved()){
-            SVars.stats.stats.setAchievement(name());
-            SVars.stats.stats.storeStats();
+            //can't complete achievements with the dev console shown.
+            if(ui != null && ui.consolefrag != null && ui.consolefrag.shown() && !OS.username.equals("anuke") && this != openConsole) return;
+
+            service.completeAchievement(name());
+            service.storeStats();
+        }
+    }
+
+    public void uncomplete(){
+        if(isAchieved()){
+            service.clearAchievement(name());
+            completed = false;
         }
     }
 
@@ -87,6 +152,9 @@ public enum SAchievement{
     }
 
     public boolean isAchieved(){
-        return SVars.stats.stats.isAchieved(name(), false);
+        if(completed){
+            return true;
+        }
+        return (completed = service.isAchieved(name()));
     }
 }
diff --git a/core/src/mindustry/service/GameService.java b/core/src/mindustry/service/GameService.java
new file mode 100644
index 0000000000..4cad46716b
--- /dev/null
+++ b/core/src/mindustry/service/GameService.java
@@ -0,0 +1,564 @@
+package mindustry.service;
+
+import arc.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.game.EventType.*;
+import mindustry.game.SectorInfo.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.defense.Wall.*;
+import mindustry.world.blocks.defense.turrets.Turret.*;
+import mindustry.world.blocks.distribution.*;
+import mindustry.world.blocks.production.AttributeCrafter.*;
+import mindustry.world.blocks.production.SolidPump.*;
+import mindustry.world.blocks.storage.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+import static mindustry.service.Achievement.*;
+
+/**
+ * Interface for handling game service across multiple platforms.
+ *
+ * This includes:
+ * - Desktop (Steam)
+ *
+ * The default implementation does nothing.
+ * */
+public class GameService{
+    private Seq<Tile> tmpTiles = new Seq<>();
+    private ObjectSet<String> blocksBuilt = new ObjectSet<>(), unitsBuilt = new ObjectSet<>();
+    private ObjectSet<UnitType> t5s = new ObjectSet<>();
+    private IntSet checked = new IntSet();
+
+    private Block[] allTransportSerpulo, allTransportErekir, allErekirBlocks, allSerpuloBlocks;
+
+    /** Begin listening for new achievement events, once the game service is activated. This can be called at any time, but only once. */
+    public void init(){
+        if(clientLoaded){
+            registerEvents();
+        }else{
+            Events.on(ClientLoadEvent.class, e -> registerEvents());
+        }
+    }
+
+    public boolean enabled(){
+        return false;
+    }
+
+    public void completeAchievement(String name){
+
+    }
+
+    public void clearAchievement(String name){
+
+    }
+
+    public boolean isAchieved(String name){
+        return false;
+    }
+
+    public int getStat(String name, int def){
+        return def;
+    }
+
+    public void setStat(String name, int amount){
+
+    }
+
+    public void storeStats(){
+
+    }
+
+    private void checkAllBlocks(Achievement ach, Block[] blocks){
+        if(!Structs.contains(blocks, t -> !blocksBuilt.contains(t.name))){
+            ach.complete();
+        }
+    }
+
+    private void registerEvents(){
+        allTransportSerpulo = content.blocks().select(b -> b.category == Category.distribution && b.isOnPlanet(Planets.serpulo) && b.isVanilla() && b.buildVisibility == BuildVisibility.shown).toArray(Block.class);
+        allTransportErekir = content.blocks().select(b -> b.category == Category.distribution && b.isOnPlanet(Planets.erekir) && b.isVanilla() && b.buildVisibility == BuildVisibility.shown).toArray(Block.class);
+
+        //cores are ignored since they're upgrades and can be skipped
+        allSerpuloBlocks = content.blocks().select(b -> b.synthetic() && b.isOnPlanet(Planets.serpulo) && b.isVanilla() && !(b instanceof CoreBlock) && b.buildVisibility == BuildVisibility.shown).toArray(Block.class);
+        allErekirBlocks = content.blocks().select(b -> b.synthetic() && b.isOnPlanet(Planets.erekir) && b.isVanilla() && !(b instanceof CoreBlock) && b.buildVisibility == BuildVisibility.shown).toArray(Block.class);
+
+        unitsBuilt = Core.settings.getJson("units-built" , ObjectSet.class, String.class, ObjectSet::new);
+        blocksBuilt = Core.settings.getJson("blocks-built" , ObjectSet.class, String.class, ObjectSet::new);
+        t5s = ObjectSet.with(UnitTypes.omura, UnitTypes.reign, UnitTypes.toxopid, UnitTypes.eclipse, UnitTypes.oct, UnitTypes.corvus);
+
+        checkAllBlocks(allBlocksErekir, allErekirBlocks);
+        checkAllBlocks(allBlocksSerpulo, allSerpuloBlocks);
+
+        //periodically check for various conditions
+        float updateInterval = 2f;
+        Timer.schedule(this::checkUpdate, updateInterval, updateInterval);
+
+        if(Items.thorium.unlocked()) obtainThorium.complete();
+        if(Items.titanium.unlocked()) obtainTitanium.complete();
+
+        if(SectorPresets.origin.sector.isCaptured()){
+            completeErekir.complete();
+        }
+
+        if(SectorPresets.planetaryTerminal.sector.isCaptured()){
+            completeSerpulo.complete();
+        }
+
+        if(mods != null && mods.list().size > 0){
+            installMod.complete();
+        }
+
+        if(Core.bundle.get("yes").equals("router")){
+            routerLanguage.complete();
+        }
+
+        if(!Planets.serpulo.sectors.contains(s -> !s.isCaptured())){
+            captureAllSectors.complete();
+        }
+
+        Events.run(Trigger.openConsole, () -> openConsole.complete());
+
+        Events.run(Trigger.unitCommandAttack, () -> {
+            if(campaign()){
+                issueAttackCommand.complete();
+            }
+        });
+
+        Events.on(UnitDestroyEvent.class, e -> {
+            if(campaign()){
+                if(e.unit.team != Vars.player.team()){
+                    SStat.unitsDestroyed.add();
+
+                    if(e.unit.isBoss()){
+                        SStat.bossesDefeated.add();
+                    }
+                }
+            }
+        });
+
+        Events.on(TurnEvent.class, e -> {
+            float total = 0;
+            for(Planet planet : content.planets()){
+                for(Sector sec : planet.sectors){
+                    if(sec.hasBase()){
+                        for(ExportStat v : sec.info.production.values()){
+                            if(v.mean > 0) total += v.mean * 60;
+                        }
+                    }
+                }
+            }
+
+            SStat.maxProduction.max(Math.round(total));
+        });
+
+        Events.run(Trigger.update, () -> {
+            //extremely lazy timer, I just don't care
+            if(campaign() && !hoverUnitLiquid.isAchieved() && Core.graphics.getFrameId() % 20 == 0){
+                var units = state.rules.defaultTeam.data().getUnits(UnitTypes.elude);
+                if(units != null){
+                    for(var unit : units){
+                        if(unit.floorOn().isLiquid){
+                            hoverUnitLiquid.complete();
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if(campaign() && !player.dead() && player.unit().type.canBoost && player.unit().elevation >= 0.25f){
+                boostUnit.complete();
+            }
+        });
+
+        Events.run(Trigger.newGame, () -> Core.app.post(() -> {
+            if(campaign() && player.core() != null && player.core().items.total() >= 10 * 1000){
+                drop10kitems.complete();
+            }
+        }));
+
+        Events.on(BuildingBulletDestroyEvent.class, e -> {
+            if(campaign() && e.build.block == Blocks.scatter && e.build.team == state.rules.waveTeam && e.bullet.owner instanceof Unit u && u.type == UnitTypes.flare && u.team == player.team()){
+                destroyScatterFlare.complete();
+            }
+        });
+
+        Events.on(BlockBuildEndEvent.class, e -> {
+            if(campaign() && state.rules.sector == SectorPresets.groundZero.sector && e.tile.block() == Blocks.coreNucleus){
+                nucleusGroundZero.complete();
+            }
+        });
+
+        Events.on(BlockBuildEndEvent.class, e -> {
+            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)){
+                    chainRouters.complete();
+                }
+
+                if(e.tile.block() == Blocks.groundFactory){
+                    buildGroundFactory.complete();
+                }
+
+                if((e.tile.build instanceof AttributeCrafterBuild a && a.attrsum > 0) || (e.tile.build instanceof SolidPumpBuild sp && sp.boost > 0)){
+                    boostBuildingFloor.complete();
+                }
+
+                if(!allTransportOneMap.isAchieved()){
+                    Block[] allTransports = state.rules.sector.planet == Planets.erekir ? allTransportErekir : allTransportSerpulo;
+                    boolean all = true;
+                    for(var block : allTransports){
+                        if(state.rules.defaultTeam.data().getCount(block) == 0){
+                            all = false;
+                            break;
+                        }
+                    }
+                    if(all){
+                        allTransportOneMap.complete();
+                    }
+                }
+
+                if(e.tile.block() == Blocks.mendProjector) buildMendProjector.complete();
+                if(e.tile.block() == Blocks.overdriveProjector) buildOverdriveProjector.complete();
+
+                if(e.tile.block() == Blocks.waterExtractor){
+                    if(e.tile.getLinkedTiles(tmpTiles).contains(t -> t.floor().liquidDrop == Liquids.water)){
+                        buildWexWater.complete();
+                    }
+                }
+
+                if(blocksBuilt.add(e.tile.block().name)){
+                    if(state.rules.sector.planet == Planets.erekir){
+                        checkAllBlocks(allBlocksErekir, allErekirBlocks);
+                    }else{
+                        checkAllBlocks(allBlocksSerpulo, allSerpuloBlocks);
+                    }
+
+                    if(blocksBuilt.contains("meltdown") && blocksBuilt.contains("spectre") && blocksBuilt.contains("foreshadow")){
+                        buildMeltdownSpectre.complete();
+                    }
+
+                    save();
+                }
+
+                if(!circleConveyor.isAchieved() && e.tile.block() instanceof Conveyor){
+                    checked.clear();
+                    check: {
+                        Tile current = e.tile;
+                        for(int i = 0; i < 4; i++){
+                            checked.add(current.pos());
+                            if(current.build == null) break check;
+                            Tile next = current.nearby(current.build.rotation);
+                            if(next != null && next.block() instanceof Conveyor){
+                                current = next;
+                            }else{
+                                break check;
+                            }
+                        }
+
+                        if(current == e.tile && checked.size == 4){
+                            circleConveyor.complete();
+                        }
+                    }
+                }
+            }
+
+            if(campaign() && e.unit != null && e.unit.isLocal() && e.breaking){
+                //hacky way of testing for boulders without string contains/endsWith
+                if(e.tile.block().breakSound == Sounds.rockBreak){
+                    SStat.bouldersDeconstructed.add();
+                }
+            }
+        });
+
+        Events.on(TurnEvent.class, e -> {
+            int total = 0;
+            for(var planet : content.planets()){
+                for(var sector : planet.sectors){
+                    if(sector.hasBase()){
+                        total += sector.items().total;
+                    }
+                }
+            }
+
+            SStat.totalCampaignItems.max(total);
+        });
+
+        Events.on(SectorLaunchLoadoutEvent.class, e -> {
+            if(e.sector.planet == Planets.serpulo && !schematics.isDefaultLoadout(e.loadout)){
+                launchCoreSchematic.complete();
+            }
+        });
+
+        Events.on(UnitCreateEvent.class, e -> {
+            if(campaign()){
+                if(unitsBuilt.add(e.unit.type.name)){
+                    SStat.unitTypesBuilt.max(content.units().count(u -> unitsBuilt.contains(u.name) && !u.isHidden()));
+                    save();
+                }
+
+                if(t5s.contains(e.unit.type)){
+                    buildT5.complete();
+                }
+            }
+        });
+
+        Events.on(UnitControlEvent.class, e -> {
+            if(e.unit instanceof BlockUnitc unit && unit.tile().block == Blocks.router){
+                becomeRouter.complete();
+            }
+
+            if(e.unit instanceof BlockUnitc unit && unit.tile() instanceof TurretBuild){
+                controlTurret.complete();
+            }
+        });
+
+        Events.on(SchematicCreateEvent.class, e -> {
+            SStat.schematicsCreated.add();
+        });
+
+        Events.on(BlockDestroyEvent.class, e -> {
+            if(campaign() && e.tile.team() != player.team()){
+                SStat.blocksDestroyed.add();
+            }
+        });
+
+        Events.on(MapMakeEvent.class, e -> SStat.mapsMade.add());
+
+        Events.on(MapPublishEvent.class, e -> SStat.mapsPublished.add());
+
+        Events.on(UnlockEvent.class, e -> {
+            if(e.content == Items.thorium) obtainThorium.complete();
+            if(e.content == Items.titanium) obtainTitanium.complete();
+        });
+
+        Events.run(Trigger.openWiki, openWiki::complete);
+
+        Events.run(Trigger.importMod, installMod::complete);
+
+        Events.run(Trigger.exclusionDeath, dieExclusion::complete);
+
+        Events.on(UnitDrownEvent.class, e -> {
+            if(campaign() && e.unit.isPlayer()){
+                drown.complete();
+            }
+        });
+
+        trigger(Trigger.impactPower, powerupImpactReactor);
+
+        trigger(Trigger.flameAmmo, useFlameAmmo);
+
+        trigger(Trigger.turretCool, coolTurret);
+
+        trigger(Trigger.suicideBomb, suicideBomb);
+
+        trigger(Trigger.blastGenerator, blastGenerator);
+
+        trigger(Trigger.forceProjectorBreak, breakForceProjector);
+
+        trigger(Trigger.neoplasmReact, neoplasmWater);
+
+        trigger(Trigger.shockwaveTowerUse, shockwaveTowerUse);
+
+        Events.run(Trigger.enablePixelation, enablePixelation::complete);
+
+        Events.run(Trigger.thoriumReactorOverheat, () -> {
+            if(campaign()){
+                SStat.reactorsOverheated.add();
+            }
+        });
+
+        Events.on(GeneratorPressureExplodeEvent.class, e -> {
+            if(campaign() && e.build.block == Blocks.neoplasiaReactor){
+                neoplasiaExplosion.complete();
+            }
+        });
+
+        trigger(Trigger.shock, shockWetEnemy);
+
+        trigger(Trigger.blastFreeze, blastFrozenUnit);
+
+        Events.on(UnitBulletDestroyEvent.class, e -> {
+            if(state.isCampaign() && player != null && player.team() == e.bullet.team){
+
+                if(e.bullet.owner instanceof WallBuild){
+                    killEnemyPhaseWall.complete();
+                }
+
+                if(e.unit.type == UnitTypes.eclipse && e.bullet.owner instanceof TurretBuild turret && turret.block == Blocks.duo){
+                    killEclipseDuo.complete();
+                }
+            }
+        });
+
+        Events.on(LaunchItemEvent.class, e -> {
+            if(campaign()){
+                launchItemPad.complete();
+            }
+        });
+
+        Events.on(PickupEvent.class, e -> {
+            if(e.carrier.isPlayer() && campaign() && e.unit != null && t5s.contains(e.unit.type)){
+                pickupT5.complete();
+            }
+        });
+
+        Events.on(UnitCreateEvent.class, e -> {
+            if(campaign() && e.unit.team() == player.team()){
+                SStat.unitsBuilt.add();
+            }
+        });
+
+        Events.on(SectorLaunchEvent.class, e -> {
+            SStat.timesLaunched.add();
+        });
+
+        Events.on(LaunchItemEvent.class, e -> {
+            SStat.itemsLaunched.add(e.stack.amount);
+        });
+
+        Events.on(WaveEvent.class, e -> {
+            if(campaign()){
+                SStat.maxWavesSurvived.max(Vars.state.wave);
+
+                if(state.stats.buildingsBuilt == 0 && state.wave >= 10){
+                    survive10WavesNoBlocks.complete();
+                }
+            }
+        });
+
+        Events.on(PlayerJoin.class, e -> {
+            if(Vars.net.server()){
+                SStat.maxPlayersServer.max(Groups.player.size());
+            }
+        });
+
+        Runnable checkUnlocks = () -> {
+            if(Blocks.router.unlocked()) researchRouter.complete();
+
+            if(!TechTree.all.contains(t -> t.content.locked())){
+                researchAll.complete();
+            }
+
+            if(Blocks.microProcessor.unlocked()) researchLogic.complete();
+        };
+
+        //check unlocked stuff on load as well
+        Events.on(ResearchEvent.class, e -> checkUnlocks.run());
+        Events.on(UnlockEvent.class, e -> checkUnlocks.run());
+
+        checkUnlocks.run();
+
+        Events.on(WinEvent.class, e -> {
+            if(state.rules.pvp){
+                SStat.pvpsWon.add();
+            }
+        });
+
+        Events.on(ClientPreConnectEvent.class, e -> {
+            if(e.host != null && !e.host.address.startsWith("steam:") && !e.host.address.startsWith("192.")){
+                joinCommunityServer.complete();
+            }
+        });
+
+        Events.on(SectorCaptureEvent.class, e -> {
+            if(e.sector.isBeingPlayed() || net.client()){
+                if(Vars.state.wave <= 5 && state.rules.attackMode){
+                    defeatAttack5Waves.complete();
+                }
+
+                if(state.stats.buildingsDestroyed == 0){
+                    captureNoBlocksBroken.complete();
+                }
+            }
+
+            if(Vars.state.rules.attackMode){
+                SStat.attacksWon.add();
+            }
+
+            if(!e.sector.isBeingPlayed() && !net.client()){
+                captureBackground.complete();
+            }
+
+            if(e.sector.planet == Planets.serpulo && !e.sector.planet.sectors.contains(s -> !s.hasBase())){
+                captureAllSectors.complete();
+            }
+
+            if(e.sector.planet == Planets.erekir && e.sector.preset != null && e.sector.preset.isLastSector){
+                completeErekir.complete();
+            }
+
+            if(e.sector.planet == Planets.serpulo && e.sector.preset != null && e.sector.preset.isLastSector){
+                completeSerpulo.complete();
+            }
+
+            //TODO wrong
+            if(e.sector.planet == Planets.serpulo){
+                SStat.sectorsControlled.set(e.sector.planet.sectors.count(Sector::hasBase));
+            }
+        });
+
+        Events.on(PayloadDropEvent.class, e -> {
+            if(campaign() && e.unit != null && e.carrier.team == state.rules.defaultTeam && state.rules.waveTeam.cores().contains(c -> c.within(e.unit, state.rules.enemyCoreBuildRadius))){
+                dropUnitsCoreZone.complete();
+            }
+        });
+
+        Events.on(ClientChatEvent.class, e -> {
+            if(e.message.contains(Iconc.alphaaaa + "")){
+                useAnimdustryEmoji.complete();
+            }
+        });
+    }
+
+    private void checkUpdate(){
+        if(campaign()){
+            SStat.maxUnitActive.max(Groups.unit.count(t -> t.team == player.team()));
+
+            if(Groups.unit.count(u -> u.type == UnitTypes.poly && u.team == player.team()) >= 10){
+                active10Polys.complete();
+            }
+
+            for(Building entity : player.team().cores()){
+                if(!content.items().contains(i -> i.isOnPlanet(state.getPlanet()) && entity.items.get(i) < entity.block.itemCapacity)){
+                    fillCoreAllCampaign.complete();
+                    break;
+                }
+            }
+
+            for(var up : Groups.powerGraph){
+                var graph = up.graph();
+                if(graph.all.size > 1 && graph.all.first().team == player.team() && graph.hasPowerBalanceSamples()){
+                    float balance = graph.getPowerBalance() * 60f;
+
+                    if(balance < -10_000) negative10kPower.complete();
+                    if(balance > 100_000) positive100kPower.complete();
+                    if(graph.getBatteryStored() > 1_000_000) store1milPower.complete();
+                }
+            }
+        }
+    }
+
+    private void save(){
+        Core.settings.putJson("units-built" , String.class, unitsBuilt);
+        Core.settings.putJson("blocks-built" , String.class, blocksBuilt);
+    }
+
+    private void trigger(Trigger trigger, Achievement ach){
+        Events.run(trigger, () -> {
+            if(campaign()){
+                ach.complete();
+            }
+        });
+    }
+
+    private boolean campaign(){
+        return Vars.state.isCampaign();
+    }
+}
diff --git a/desktop/src/mindustry/desktop/steam/SStat.java b/core/src/mindustry/service/SStat.java
similarity index 71%
rename from desktop/src/mindustry/desktop/steam/SStat.java
rename to core/src/mindustry/service/SStat.java
index 0086f68785..598d96d102 100644
--- a/desktop/src/mindustry/desktop/steam/SStat.java
+++ b/core/src/mindustry/service/SStat.java
@@ -1,4 +1,6 @@
-package mindustry.desktop.steam;
+package mindustry.service;
+
+import static mindustry.Vars.*;
 
 public enum SStat{
     unitsDestroyed,
@@ -20,10 +22,12 @@ public enum SStat{
     maxProduction,
     sectorsControlled,
     schematicsCreated,
+    bouldersDeconstructed, //TODO
+    totalCampaignItems, //TODO
     ;
 
     public int get(){
-        return SVars.stats.stats.getStatI(name(), 0);
+        return service.getStat(name(), 0);
     }
 
     public void max(int amount){
@@ -33,10 +37,10 @@ public enum SStat{
     }
 
     public void set(int amount){
-        SVars.stats.stats.setStatI(name(), amount);
-        SVars.stats.onUpdate();
+        service.setStat(name(), amount);
+        service.storeStats();
 
-        for(SAchievement a : SAchievement.all){
+        for(Achievement a : Achievement.all){
             a.checkCompletion();
         }
     }
diff --git a/core/src/mindustry/type/AmmoType.java b/core/src/mindustry/type/AmmoType.java
index afe0a9818a..78e89fd0d4 100644
--- a/core/src/mindustry/type/AmmoType.java
+++ b/core/src/mindustry/type/AmmoType.java
@@ -1,28 +1,12 @@
 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;
-    }
+public interface AmmoType{
+    String icon();
+    Color color();
+    Color barColor();
+    void resupply(Unit unit);
 }
diff --git a/core/src/mindustry/type/AmmoTypes.java b/core/src/mindustry/type/AmmoTypes.java
deleted file mode 100644
index 761bcbc8d0..0000000000
--- a/core/src/mindustry/type/AmmoTypes.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package mindustry.type;
-
-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.battery);
-
-            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/CellLiquid.java b/core/src/mindustry/type/CellLiquid.java
new file mode 100644
index 0000000000..dd84e093d2
--- /dev/null
+++ b/core/src/mindustry/type/CellLiquid.java
@@ -0,0 +1,130 @@
+package mindustry.type;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+import static mindustry.entities.Puddles.*;
+
+/** Liquid that draws cells in its puddle. */
+public class CellLiquid extends Liquid{
+    public Color colorFrom = Color.white.cpy(), colorTo = Color.white.cpy();
+    public int cells = 6;
+
+    public @Nullable Liquid spreadTarget;
+    public float maxSpread = 0.75f, spreadConversion = 1.2f, spreadDamage = 0.11f, removeScaling = 0.25f;
+
+    public CellLiquid(String name, Color color){
+        super(name, color);
+    }
+
+    public CellLiquid(String name){
+        super(name);
+    }
+
+    @Override
+    public void update(Puddle puddle){
+        if(!Vars.state.rules.fire) return;
+
+        if(spreadTarget != null){
+            float scaling = Mathf.pow(Mathf.clamp(puddle.amount / maxLiquid), 2f);
+            boolean reacted = false;
+
+            for(var point : Geometry.d4c){
+                Tile tile = puddle.tile.nearby(point);
+                if(tile != null && tile.build != null && tile.build.liquids != null && tile.build.liquids.get(spreadTarget) > 0.0001f){
+                    float amount = Math.min(tile.build.liquids.get(spreadTarget), maxSpread * Time.delta * scaling);
+                    tile.build.liquids.remove(spreadTarget, amount * removeScaling);
+                    Puddles.deposit(tile, this, amount * spreadConversion);
+                    reacted = true;
+                }
+            }
+
+            //damage thing it is on
+            if(spreadDamage > 0 && puddle.tile.build != null && puddle.tile.build.liquids != null && puddle.tile.build.liquids.get(spreadTarget) > 0.0001f){
+                reacted = true;
+
+                //spread in 4 adjacent directions around thing it is on
+                float amountSpread = Math.min(puddle.tile.build.liquids.get(spreadTarget) * spreadConversion, maxSpread * Time.delta) / 2f;
+                for(var dir : Geometry.d4){
+                    Tile other = puddle.tile.nearby(dir);
+                    if(other != null){
+                        Puddles.deposit(puddle.tile, other, puddle.liquid, amountSpread);
+                    }
+                }
+
+                puddle.tile.build.damage(spreadDamage * Time.delta * scaling);
+            }
+
+            //spread to nearby puddles
+            for(var point : Geometry.d4){
+                Tile tile = puddle.tile.nearby(point);
+                if(tile != null){
+                    var other = Puddles.get(tile);
+                    if(other != null && other.liquid == spreadTarget){
+                        //TODO looks somewhat buggy when outputs are occurring
+                        float amount = Math.min(other.amount, Math.max(maxSpread * Time.delta * scaling, other.amount * 0.25f * scaling));
+                        other.amount -= amount;
+                        puddle.amount += amount;
+                        reacted = true;
+                        if(other.amount <= maxLiquid / 3f){
+                            other.remove();
+                            Puddles.deposit(tile, puddle.tile, this, Math.max(amount, maxLiquid / 3f));
+                        }
+                    }
+                }
+            }
+
+            if(reacted && this == Liquids.neoplasm){
+                Events.fire(Trigger.neoplasmReact);
+            }
+        }
+    }
+
+    @Override
+    public float react(Liquid other, float amount, Tile tile, float x, float y){
+        if(other == spreadTarget){
+            return amount;
+        }
+        return 0f;
+    }
+
+    @Override
+    public void drawPuddle(Puddle puddle){
+        super.drawPuddle(puddle);
+
+        float baseLayer = puddle.tile != null && puddle.tile.block().solid || puddle.tile.build != null ? Layer.blockOver : Layer.debris - 0.5f;
+
+        int id = puddle.id;
+        float amount = puddle.amount, x = puddle.x, y = puddle.y;
+        float f = Mathf.clamp(amount / (maxLiquid / 1.5f));
+        float smag = puddle.tile.floor().isLiquid ? 0.8f : 0f, sscl = 25f;
+        float length = Math.max(f, 0.3f) * 9f;
+
+        rand.setSeed(id);
+        for(int i = 0; i < cells; i++){
+            Draw.z(baseLayer + i/1000f + (id % 100) / 10000f);
+            Tmp.v1.trns(rand.random(360f), rand.random(length));
+            float vx = x + Tmp.v1.x, vy = y + Tmp.v1.y;
+
+            Draw.color(colorFrom, colorTo, rand.random(1f));
+
+            Fill.circle(
+            vx + Mathf.sin(Time.time + i * 532, sscl, smag),
+            vy + Mathf.sin(Time.time + i * 53, sscl, smag),
+            f * 3.8f * rand.random(0.35f, 1f) * Mathf.absin(Time.time + ((i + id) % 60) * 54, 75f * rand.random(1f, 2f), 1f));
+        }
+
+        Draw.color();
+    }
+}
diff --git a/core/src/mindustry/type/Item.java b/core/src/mindustry/type/Item.java
index 18cbdff886..5d81790919 100644
--- a/core/src/mindustry/type/Item.java
+++ b/core/src/mindustry/type/Item.java
@@ -1,22 +1,31 @@
 package mindustry.type;
 
+import arc.*;
 import arc.graphics.*;
+import arc.graphics.g2d.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.ctype.*;
+import mindustry.game.EventType.*;
+import mindustry.graphics.*;
+import mindustry.graphics.MultiPacker.*;
+import mindustry.logic.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-public class Item extends UnlockableContent{
+public class Item extends UnlockableContent implements Senseable{
     public Color color;
 
     /** how explosive this item is. */
     public float explosiveness = 0f;
-    /** flammability above 0.3 makes this eleigible for item burners. */
+    /** flammability above 0.3 makes this eligible for item burners. */
     public float flammability = 0f;
-    /** how radioactive this item is. 0=none, 1=chernobyl ground zero */
+    /** how radioactive this item is. */
     public float radioactivity;
+    /** how electrically potent this item is. */
+    public float charge = 0f;
     /** drill hardness of the item */
     public int hardness = 0;
     /**
@@ -24,9 +33,25 @@ public class Item extends UnlockableContent{
      * 1 cost = 1 tick added to build time
      */
     public float cost = 1f;
-    /** if true, this item is of lowest priority to drills. */
+    /** When this item is present in the build cost, a block's <b>default</b> health is multiplied by 1 + scaling, where 'scaling' is summed together for all item requirement types. */
+    public float healthScaling = 0f;
+    /** if true, this item is of the lowest priority to drills. */
     public boolean lowPriority;
 
+    /** If >0, this item is animated. */
+    public int frames = 0;
+    /** Number of generated transition frames between each frame */
+    public int transitionFrames = 0;
+    /** Ticks in-between animation frames. */
+    public float frameTime = 5f;
+    /** If true, this material is used by buildings. If false, this material will be incinerated in certain cores. */
+    public boolean buildable = true;
+    public boolean hidden = false;
+
+    /** @deprecated no-op, do not use. */
+    @Deprecated
+    public @Nullable Planet[] hiddenOnPlanets;
+
     public Item(String name, Color color){
         super(name);
         this.color = color;
@@ -36,11 +61,57 @@ public class Item extends UnlockableContent{
         this(name, new Color(Color.black));
     }
 
+    @Override
+    public boolean isOnPlanet(Planet planet){
+        //hidden items should not appear on any planet's resource selection screen
+        return super.isOnPlanet(planet) && !hidden;
+    }
+
+    @Override
+    public boolean isHidden(){
+        return hidden;
+    }
+
+    @Override
+    public void loadIcon(){
+        super.loadIcon();
+
+        //animation code ""borrowed"" from Project Unity - original implementation by GlennFolker and sk7725
+        if(frames > 0){
+            TextureRegion[] regions = new TextureRegion[frames * (transitionFrames + 1)];
+
+            if(transitionFrames <= 0){
+                for(int i = 1; i <= frames; i++){
+                    regions[i - 1] = Core.atlas.find(name + i);
+                }
+            }else{
+                for(int i = 0; i < frames; i++){
+                    regions[i * (transitionFrames + 1)] = Core.atlas.find(name + (i + 1));
+                    for(int j = 1; j <= transitionFrames; j++){
+                        int index = i * (transitionFrames + 1) + j;
+                        regions[index] = Core.atlas.find(name + "-t" + index);
+                    }
+                }
+            }
+
+            fullIcon = new TextureRegion(fullIcon);
+            uiIcon = new TextureRegion(uiIcon);
+
+            Events.run(Trigger.update, () -> {
+                int frame = (int)(Time.globalTime / frameTime) % regions.length;
+
+                fullIcon.set(regions[frame]);
+                uiIcon.set(regions[frame]);
+            });
+        }
+    }
+
     @Override
     public void setStats(){
         stats.addPercent(Stat.explosiveness, explosiveness);
         stats.addPercent(Stat.flammability, flammability);
         stats.addPercent(Stat.radioactivity, radioactivity);
+        stats.addPercent(Stat.charge, charge);
     }
 
     @Override
@@ -53,8 +124,46 @@ public class Item extends UnlockableContent{
         return ContentType.item;
     }
 
+    @Override
+    public void createIcons(MultiPacker packer){
+        super.createIcons(packer);
+
+        //create transitions
+        if(frames > 0 && transitionFrames > 0){
+            var pixmaps = new PixmapRegion[frames];
+
+            for(int i = 0; i < frames; i++){
+                pixmaps[i] = Core.atlas.getPixmap(name + (i + 1));
+            }
+
+            for(int i = 0; i < frames; i++){
+                for(int j = 1; j <= transitionFrames; j++){
+                    float f = (float)j / (transitionFrames + 1);
+                    int index = i * (transitionFrames + 1) + j;
+
+                    Pixmap res = Pixmaps.blend(pixmaps[i], pixmaps[(i + 1) % frames], f);
+                    packer.add(PageType.main, name + "-t" + index, res);
+                    res.dispose();
+                }
+            }
+        }
+    }
+
+    @Override
+    public double sense(LAccess sensor){
+        if(sensor == LAccess.color) return color.toDoubleBits();
+        if(sensor == LAccess.id) return getLogicId();
+        return Float.NaN;
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        if(sensor == LAccess.name) return name;
+        return noSensed;
+    }
+
     /** Allocates a new array containing all items that generate ores. */
     public static Seq<Item> getAllOres(){
-        return content.blocks().select(b -> b instanceof OreBlock).map(b -> ((Floor)b).itemDrop);
+        return content.blocks().select(b -> b instanceof OreBlock).map(b -> b.itemDrop);
     }
 }
diff --git a/core/src/mindustry/type/ItemSeq.java b/core/src/mindustry/type/ItemSeq.java
index 4fb7409796..61bcc37e3a 100644
--- a/core/src/mindustry/type/ItemSeq.java
+++ b/core/src/mindustry/type/ItemSeq.java
@@ -10,7 +10,7 @@ import mindustry.world.modules.ItemModule.*;
 
 import java.util.*;
 
-public class ItemSeq implements Iterable<ItemStack>, Serializable{
+public class ItemSeq implements Iterable<ItemStack>, JsonSerializable{
     protected final int[] values = new int[Vars.content.items().size];
     public int total;
 
@@ -55,6 +55,21 @@ public class ItemSeq implements Iterable<ItemStack>, Serializable{
         return out;
     }
 
+    public ItemStack[] toArray(){
+        int count = 0;
+        for(int value : values){
+            if(value != 0) count++;
+        }
+        ItemStack[] result = new ItemStack[count];
+        int index = 0;
+        for(int i = 0; i < values.length; i++){
+            if(values[i] != 0){
+                result[index ++] = new ItemStack(Vars.content.item(i), values[i]);
+            }
+        }
+        return result;
+    }
+
     public void min(int number){
         for(Item item : Vars.content.items()){
             set(item, Math.min(get(item), number));
@@ -90,6 +105,12 @@ public class ItemSeq implements Iterable<ItemStack>, Serializable{
         itemModule.each(this::add);
     }
 
+    public void add(ItemStack[] stacks){
+        for(var s : stacks){
+            add(s);
+        }
+    }
+
     public void add(ItemSeq seq){
         seq.each(this::add);
     }
diff --git a/core/src/mindustry/type/ItemStack.java b/core/src/mindustry/type/ItemStack.java
index 26cffe97b4..a0e0f4c587 100644
--- a/core/src/mindustry/type/ItemStack.java
+++ b/core/src/mindustry/type/ItemStack.java
@@ -37,7 +37,7 @@ public class ItemStack implements Comparable<ItemStack>{
     }
 
     public static ItemStack[] mult(ItemStack[] stacks, float amount){
-        ItemStack[] copy = new ItemStack[stacks.length];
+        var copy = new ItemStack[stacks.length];
         for(int i = 0; i < copy.length; i++){
             copy[i] = new ItemStack(stacks[i].item, Mathf.round(stacks[i].amount * amount));
         }
@@ -45,7 +45,7 @@ public class ItemStack implements Comparable<ItemStack>{
     }
 
     public static ItemStack[] with(Object... items){
-        ItemStack[] stacks = new ItemStack[items.length / 2];
+        var stacks = new ItemStack[items.length / 2];
         for(int i = 0; i < items.length; i += 2){
             stacks[i / 2] = new ItemStack((Item)items[i], ((Number)items[i + 1]).intValue());
         }
@@ -60,6 +60,14 @@ public class ItemStack implements Comparable<ItemStack>{
         return stacks;
     }
 
+    public static ItemStack[] copy(ItemStack[] stacks){
+        var out = new ItemStack[stacks.length];
+        for(int i = 0; i < out.length; i++){
+            out[i] = stacks[i].copy();
+        }
+        return out;
+    }
+
     @Override
     public int compareTo(ItemStack itemStack){
         return item.compareTo(itemStack.item);
@@ -67,16 +75,11 @@ public class ItemStack implements Comparable<ItemStack>{
 
     @Override
     public boolean equals(Object o){
-        if(this == o) return true;
-        if(!(o instanceof ItemStack stack)) return false;
-        return amount == stack.amount && item == stack.item;
+        return this == o || (o instanceof ItemStack stack && stack.amount == amount && item == stack.item);
     }
 
     @Override
     public String toString(){
-        return "ItemStack{" +
-        "item=" + item +
-        ", amount=" + amount +
-        '}';
+        return item + ": " + amount;
     }
 }
diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java
index e62805e60b..9032b4bf9b 100644
--- a/core/src/mindustry/type/Liquid.java
+++ b/core/src/mindustry/type/Liquid.java
@@ -1,30 +1,73 @@
 package mindustry.type;
 
 import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
 
-public class Liquid extends UnlockableContent{
+import static mindustry.entities.Puddles.*;
+
+/** A better name for this class would be "fluid", but it's too late for that. */
+public class Liquid extends UnlockableContent implements Senseable{
+    //must be static and global so conduits don't conflict - DO NOT INTERACT WITH THESE IN MODS OR I WILL PERSONALLY YELL AT YOU
+    public static final int animationFrames = 50;
+    public static float animationScaleGas = 190f, animationScaleLiquid = 230f;
+
+    protected static final Rand rand = new Rand();
+
+    /** If true, this fluid is treated as a gas (and does not create puddles) */
+    public boolean gas = false;
     /** Color used in pipes and on the ground. */
     public Color color;
+    /** Color of this liquid in gas form. */
+    public Color gasColor = Color.lightGray.cpy();
     /** Color used in bars. */
     public @Nullable Color barColor;
     /** Color used to draw lights. Note that the alpha channel is used to dictate brightness. */
     public Color lightColor = Color.clear.cpy();
-    /** 0-1, 0 is completely inflammable, anything above that may catch fire when exposed to heat, 0.5+ is very flammable. */
+    /** 0-1, 0 is completely not flammable, anything above that may catch fire when exposed to heat, 0.5+ is very flammable. */
     public float flammability;
     /** temperature: 0.5 is 'room' temperature, 0 is very cold, 1 is molten hot */
     public float temperature = 0.5f;
     /** how much heat this liquid can store. 0.4=water (decent), anything lower is probably less dense and bad at cooling. */
     public float heatCapacity = 0.5f;
-    /** how thick this liquid is. 0.5=water (relatively viscous), 1 would be something like tar (very slow) */
+    /** how thick this liquid is. 0.5=water (relatively viscous), 1 would be something like tar (very slow). */
     public float viscosity = 0.5f;
     /** how prone to exploding this liquid is, when heated. 0 = nothing, 1 = nuke */
     public float explosiveness;
+    /** whether this fluid reacts in blocks at all (e.g. slag with water) */
+    public boolean blockReactive = true;
+    /** if false, this liquid cannot be a coolant */
+    public boolean coolant = true;
+    /** if true, this liquid can move through blocks as a puddle. */
+    public boolean moveThroughBlocks = false;
+    /** if true, this liquid can be incinerated in the incinerator block. */
+    public boolean incinerable = true;
     /** The associated status effect. */
     public StatusEffect effect = StatusEffects.none;
+    /** Effect shown in puddles. */
+    public Effect particleEffect = Fx.none;
+    /** Particle effect rate spacing in ticks. */
+    public float particleSpacing = 60f;
+    /** Temperature at which this liquid vaporizes. This isn't just boiling. */
+    public float boilPoint = 2f;
+    /** If true, puddle size is capped. */
+    public boolean capPuddles = true;
+    /** Effect when this liquid vaporizes. */
+    public Effect vaporEffect = Fx.vapor;
+    /** If true, this liquid is hidden in most UI. */
+    public boolean hidden;
+    /** Liquids this puddle can stay on, e.g. oil on water. */
+    public ObjectSet<Liquid> canStayOn = new ObjectSet<>();
 
     public Liquid(String name, Color color){
         super(name);
@@ -36,6 +79,39 @@ public class Liquid extends UnlockableContent{
         this(name, new Color(Color.black));
     }
 
+    @Override
+    public void init(){
+        super.init();
+
+        if(gas){
+            //always "boils", it's a gas
+            boilPoint = -1;
+            //ensure no accidental global mutation
+            color = color.cpy();
+            //all gases are transparent
+            color.a = 0.6f;
+            //for gases, gas color is implicitly their color
+            gasColor = color;
+            if(barColor == null){
+                barColor = color.cpy().a(1f);
+            }
+        }
+    }
+
+    @Override
+    public boolean isHidden(){
+        return hidden;
+    }
+
+    public int getAnimationFrame(){
+        return (int)(Time.time / (gas ? animationScaleGas : animationScaleLiquid) * animationFrames + id*5) % animationFrames;
+    }
+
+    /** @return true if this liquid will boil in this global environment. */
+    public boolean willBoil(){
+        return Attribute.heat.env() >= boilPoint;
+    }
+
     public boolean canExtinguish(){
         return flammability < 0.1f && temperature <= 0.5f;
     }
@@ -44,6 +120,44 @@ public class Liquid extends UnlockableContent{
         return barColor == null ? color : barColor;
     }
 
+    /** Draws a puddle of this liquid on the floor. */
+    public void drawPuddle(Puddle puddle){
+        float amount = puddle.amount, x = puddle.x, y = puddle.y;
+        float f = Mathf.clamp(amount / (maxLiquid / 1.5f));
+        float smag = puddle.tile.floor().isLiquid ? 0.8f : 0f, sscl = 25f;
+
+        Draw.color(Tmp.c1.set(color).shiftValue(-0.05f));
+        Fill.circle(x + Mathf.sin(Time.time + id * 532, sscl, smag), y + Mathf.sin(Time.time + id * 53, sscl, smag), f * 8f);
+
+        float length = f * 6f;
+        rand.setSeed(id);
+        for(int i = 0; i < 3; i++){
+            Tmp.v1.trns(rand.random(360f), rand.random(length));
+            float vx = x + Tmp.v1.x, vy = y + Tmp.v1.y;
+
+            Fill.circle(
+            vx + Mathf.sin(Time.time + i * 532, sscl, smag),
+            vy + Mathf.sin(Time.time + i * 53, sscl, smag),
+            f * 5f);
+        }
+
+        Draw.color();
+
+        if(lightColor.a > 0.001f && f > 0){
+            Drawf.light(x, y, 30f * f, lightColor, color.a * f * 0.8f);
+        }
+    }
+
+    /** Runs when puddles update. */
+    public void update(Puddle puddle){
+
+    }
+
+    //TODO proper API for this (do not use yet!)
+    public float react(Liquid other, float amount, Tile tile, float x, float y){
+        return 0f;
+    }
+
     @Override
     public void setStats(){
         stats.addPercent(Stat.explosiveness, explosiveness);
@@ -53,6 +167,19 @@ public class Liquid extends UnlockableContent{
         stats.addPercent(Stat.viscosity, viscosity);
     }
 
+    @Override
+    public double sense(LAccess sensor){
+        if(sensor == LAccess.color) return color.toDoubleBits();
+        if(sensor == LAccess.id) return getLogicId();
+        return Double.NaN;
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        if(sensor == LAccess.name) return name;
+        return noSensed;
+    }
+
     @Override
     public String toString(){
         return localizedName;
diff --git a/core/src/mindustry/type/LiquidStack.java b/core/src/mindustry/type/LiquidStack.java
index 4afdd9c034..d233697302 100644
--- a/core/src/mindustry/type/LiquidStack.java
+++ b/core/src/mindustry/type/LiquidStack.java
@@ -1,8 +1,11 @@
 package mindustry.type;
 
+import arc.struct.*;
 import mindustry.content.*;
 
-public class LiquidStack{
+public class LiquidStack implements Comparable<LiquidStack>{
+    public static final LiquidStack[] empty = {};
+
     public Liquid liquid;
     public float amount;
 
@@ -13,9 +16,60 @@ public class LiquidStack{
 
     /** serialization only*/
     protected LiquidStack(){
+        //prevent nulls.
         liquid = Liquids.water;
     }
 
+    public LiquidStack set(Liquid liquid, float amount){
+        this.liquid = liquid;
+        this.amount = amount;
+        return this;
+    }
+
+    public LiquidStack copy(){
+        return new LiquidStack(liquid, amount);
+    }
+
+    public boolean equals(LiquidStack other){
+        return other != null && other.liquid == liquid && other.amount == amount;
+    }
+
+    public static LiquidStack[] mult(LiquidStack[] stacks, float amount){
+        LiquidStack[] copy = new LiquidStack[stacks.length];
+        for(int i = 0; i < copy.length; i++){
+            copy[i] = new LiquidStack(stacks[i].liquid, stacks[i].amount * amount);
+        }
+        return copy;
+    }
+
+    public static LiquidStack[] with(Object... items){
+        LiquidStack[] stacks = new LiquidStack[items.length / 2];
+        for(int i = 0; i < items.length; i += 2){
+            stacks[i / 2] = new LiquidStack((Liquid)items[i], ((Number)items[i + 1]).floatValue());
+        }
+        return stacks;
+    }
+
+    public static Seq<LiquidStack> list(Object... items){
+        Seq<LiquidStack> stacks = new Seq<>(items.length / 2);
+        for(int i = 0; i < items.length; i += 2){
+            stacks.add(new LiquidStack((Liquid)items[i], ((Number)items[i + 1]).floatValue()));
+        }
+        return stacks;
+    }
+
+    @Override
+    public int compareTo(LiquidStack liquidStack){
+        return liquid.compareTo(liquidStack.liquid);
+    }
+
+    @Override
+    public boolean equals(Object o){
+        if(this == o) return true;
+        if(!(o instanceof LiquidStack stack)) return false;
+        return amount == stack.amount && liquid == stack.liquid;
+    }
+
     @Override
     public String toString(){
         return "LiquidStack{" +
diff --git a/core/src/mindustry/type/MapLocales.java b/core/src/mindustry/type/MapLocales.java
new file mode 100644
index 0000000000..a49869d177
--- /dev/null
+++ b/core/src/mindustry/type/MapLocales.java
@@ -0,0 +1,103 @@
+package mindustry.type;
+
+import arc.struct.*;
+import arc.util.serialization.*;
+import arc.util.serialization.Json.*;
+
+import java.util.*;
+
+import static arc.Core.*;
+
+/** Class for storing map-specific locale bundles */
+public class MapLocales extends ObjectMap<String, StringMap> implements JsonSerializable{
+
+    @Override
+    public void write(Json json){
+        for(var entry : entries()){
+            json.writeValue(entry.key, entry.value, StringMap.class, String.class);
+        }
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData){
+        for(JsonValue value : jsonData){
+            StringMap map = new StringMap();
+
+            for(JsonValue child = value.child; child != null; child = child.next){
+                map.put(child.name, json.readValue(String.class, null, child));
+            }
+
+            put(value.name, map);
+        }
+    }
+
+    @Override
+    public MapLocales copy(){
+        MapLocales out = new MapLocales();
+
+        for(var entry : this.entries()){
+            StringMap map = new StringMap();
+            map.putAll(entry.value);
+            out.put(entry.key, map);
+        }
+
+        return out;
+    }
+
+    public String getProperty(String key){
+        if(!containsProperty(currentLocale(), key)){
+            if(containsProperty("en", key)) return get("en").get(key);
+            return "???" + key + "???";
+        }
+        return get(currentLocale()).get(key);
+    }
+
+    private String getProperty(String locale, String key){
+        if(!containsProperty(locale, key)){
+            if(containsProperty("en", key)) return get("en").get(key);
+            return "???" + key + "???";
+        }
+        return get(locale).get(key);
+    }
+
+    public boolean containsProperty(String key){
+        return containsProperty(currentLocale(), key) || containsProperty("en", key);
+    }
+
+    private boolean containsProperty(String locale, String key){
+        if(!containsKey(locale)) return false;
+        return get(locale).containsKey(key);
+    }
+
+    public String getFormatted(String key, Object... args){
+        StringBuilder result = new StringBuilder();
+        if(!containsProperty(currentLocale(), key)){
+            if(containsProperty("en", key)){
+                result.append(getProperty("en", key));
+            }else{
+                return "???" + key + "???";
+            }
+        }else{
+            result.append(getProperty(currentLocale(), key));
+        }
+
+        for(var arg : args){
+            int placeholderIndex = result.indexOf("@");
+
+            if(placeholderIndex == -1) break;
+
+            result.replace(placeholderIndex, placeholderIndex + 1, arg.toString());
+        }
+
+        return result.toString();
+    }
+
+    // To handle default locale properly
+    public static String currentLocale(){
+        String locale = settings.getString("locale");
+        if(locale.equals("default")){
+            locale = Locale.getDefault().getLanguage();
+        }
+        return locale;
+    }
+}
diff --git a/core/src/mindustry/type/PayloadSeq.java b/core/src/mindustry/type/PayloadSeq.java
new file mode 100644
index 0000000000..046931679c
--- /dev/null
+++ b/core/src/mindustry/type/PayloadSeq.java
@@ -0,0 +1,114 @@
+package mindustry.type;
+
+import arc.func.*;
+import arc.struct.*;
+import arc.struct.ObjectIntMap.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.ctype.*;
+
+public class PayloadSeq{
+    private ObjectIntMap<UnlockableContent> payloads = new ObjectIntMap<>();
+    private int total;
+
+    public boolean isEmpty(){
+        return total == 0;
+    }
+
+    public boolean any(){
+        return total > 0;
+    }
+
+    public int total(){
+        return total;
+    }
+
+    public void add(UnlockableContent block){
+        add(block, 1);
+    }
+
+    public void add(UnlockableContent block, int amount){
+        if(block == null) return;
+        payloads.increment(block, amount);
+        total += amount;
+    }
+
+    public void remove(UnlockableContent block){
+        add(block, -1);
+    }
+
+    public void remove(UnlockableContent block, int amount){
+        add(block, -amount);
+    }
+
+    public void remove(Seq<PayloadStack> stacks){
+        stacks.each(b -> remove(b.item, b.amount));
+    }
+
+    /** @return this object */
+    public PayloadSeq removeAll(Boolf<UnlockableContent> pred){
+        Entries<UnlockableContent> iter = payloads.iterator();
+        while(iter.hasNext()){
+            Entry<UnlockableContent> e = iter.next();
+            if(pred.get(e.key)){
+                iter.remove();
+                total -= e.value;
+            }
+        }
+        return this;
+    }
+
+    public void clear(){
+        payloads.clear();
+        total = 0;
+    }
+
+    public int get(UnlockableContent block){
+        return payloads.get(block);
+    }
+
+    public boolean contains(Seq<PayloadStack> stacks){
+        return !stacks.contains(b -> get(b.item) < b.amount);
+    }
+
+    public boolean contains(UnlockableContent block, int amount){
+        return get(block) >= amount;
+    }
+
+    public boolean contains(UnlockableContent block){
+        return get(block) >= 1;
+    }
+
+    public boolean contains(PayloadStack stack){
+        return get(stack.item) >= stack.amount;
+    }
+
+    public void write(Writes write){
+        //IMPORTANT NOTICE: size is negated here because I changed the format of this class at some point
+        //negated = new format
+        write.s(-payloads.size);
+        for(var entry : payloads.entries()){
+            write.b(entry.key.getContentType().ordinal());
+            write.s(entry.key.id);
+            write.i(entry.value);
+        }
+    }
+
+    public void read(Reads read){
+        total = 0;
+        payloads.clear();
+        short amount = read.s();
+        if(amount >= 0){
+            //old format, block only - can safely ignore, really
+            for(int i = 0; i < amount; i++){
+                add(Vars.content.block(read.s()), read.i());
+            }
+        }else{
+            //new format
+            for(int i = 0; i < -amount; i++){
+                add(Vars.content.getByID(ContentType.all[read.ub()], read.s()), read.i());
+            }
+        }
+
+    }
+}
diff --git a/core/src/mindustry/type/PayloadStack.java b/core/src/mindustry/type/PayloadStack.java
new file mode 100644
index 0000000000..d1abfb796f
--- /dev/null
+++ b/core/src/mindustry/type/PayloadStack.java
@@ -0,0 +1,56 @@
+package mindustry.type;
+
+import arc.struct.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+
+public class PayloadStack implements Comparable<PayloadStack>{
+    public UnlockableContent item = Blocks.router;
+    public int amount = 1;
+
+    public PayloadStack(UnlockableContent item, int amount){
+        this.item = item;
+        this.amount = amount;
+    }
+
+    public PayloadStack(UnlockableContent item){
+        this.item = item;
+    }
+
+    public PayloadStack(){
+    }
+
+    public static PayloadStack[] with(Object... items){
+        var stacks = new PayloadStack[items.length / 2];
+        for(int i = 0; i < items.length; i += 2){
+            stacks[i / 2] = new PayloadStack((UnlockableContent)items[i], ((Number)items[i + 1]).intValue());
+        }
+        return stacks;
+    }
+
+    public static Seq<PayloadStack> list(Object... items){
+        Seq<PayloadStack> stacks = new Seq<>(items.length / 2);
+        for(int i = 0; i < items.length; i += 2){
+            stacks.add(new PayloadStack((UnlockableContent)items[i], ((Number)items[i + 1]).intValue()));
+        }
+        return stacks;
+    }
+
+    @Override
+    public int compareTo(PayloadStack stack){
+        return item.compareTo(stack.item);
+    }
+
+    @Override
+    public boolean equals(Object o){
+        return this == o || (o instanceof PayloadStack stack && stack.amount == amount && item == stack.item);
+    }
+
+    @Override
+    public String toString(){
+        return "BlockStack{" +
+        "item=" + item +
+        ", amount=" + amount +
+        '}';
+    }
+}
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index f12cdb5c53..abf3897168 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -1,28 +1,47 @@
 package mindustry.type;
 
 import arc.*;
+import arc.audio.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.graphics.g3d.*;
+import arc.graphics.gl.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.noise.*;
+import mindustry.content.*;
+import mindustry.content.TechTree.*;
 import mindustry.ctype.*;
+import mindustry.game.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
+import mindustry.io.*;
 import mindustry.maps.generators.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
+import static mindustry.graphics.g3d.PlanetRenderer.*;
 
 public class Planet extends UnlockableContent{
-    /** Default spacing between planet orbits in world units. */
-    private static final float orbitSpacing = 9f;
     /** intersect() temp var. */
     private static final Vec3 intersectResult = new Vec3();
+    /** drawSectors() temp matrix. */
+    private static final Mat3D mat = new Mat3D();
+    /** drawArc() temp curve points. */
+    private static final Seq<Vec3> points = new Seq<>();
+
     /** Mesh used for rendering. Created on load() - will be null on the server! */
-    public @Nullable PlanetMesh mesh;
+    public @Nullable GenericMesh mesh;
+    /** Mesh used for rendering planet clouds. Null if no clouds are present. */
+    public @Nullable GenericMesh cloudMesh;
+    /** Mesh used for rendering planet grid outlines. Null on server or if {@link #grid} is null. */
+    public @Nullable Mesh gridMesh;
     /** 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. */
@@ -30,11 +49,21 @@ 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 Seq<Sector> sectors;
-    /** Radius of this planet's sphere. Does not take into account sattelites. */
+    public Seq<Sector> sectors = new Seq<>();
+    /** Default spacing between planet orbits in world units. This is defined per-parent! */
+    public float orbitSpacing = 12f;
+    /** Radius of this planet's sphere. Does not take into account satellites. */
     public float radius;
+    /** Camera radius offset. */
+    public float camRadius;
+    /** Minimum camera zoom value. */
+    public float minZoom = 0.5f;
+    /** Whether to draw the orbital circle. */
+    public boolean drawOrbit = true;
     /** Atmosphere radius adjustment parameters. */
     public float atmosphereRadIn = 0, atmosphereRadOut = 0.3f;
+    /** Frustum sphere clip radius. */
+    public float clipRadius = -1f;
     /** Orbital radius around the sun. Do not change unless you know exactly what you are doing.*/
     public float orbitRadius;
     /** Total radius of this planet and all its children. */
@@ -43,59 +72,117 @@ public class Planet extends UnlockableContent{
     public float orbitTime;
     /** Time for the planet to perform a full revolution, in seconds. One day. */
     public float rotateTime = 24f * 60f;
+    /** Random orbit angle offset to prevent planets from starting out in a line. */
+    public float orbitOffset;
     /** Approx. radius of one sector. */
     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;
-    /** Whether or not this planet is listed in the planet access UI. **/
+    /** Whether this planet is listed in the planet access UI. **/
     public boolean accessible = true;
+    /** Environment flags for sectors on this planet. */
+    public int defaultEnv = Env.terrestrial | Env.spores | Env.groundOil | Env.groundWater | Env.oxygen;
+    /** Environment attributes. */
+    public Attributes defaultAttributes = new Attributes();
+    /** If true, a day/night cycle is simulated. */
+    public boolean updateLighting = true;
+    /** Day/night cycle parameters. */
+    public float lightSrcFrom = 0f, lightSrcTo = 0.8f, lightDstFrom = 0.2f, lightDstTo = 1f;
     /** The default starting sector displayed to the map dialog. */
     public int startSector = 0;
+    /** Seed for sector base generation on this planet. -1 to use a random one based on ID. */
+    public int sectorSeed = -1;
+    /** multiplier for core item capacity when launching */
+    public float launchCapacityMultiplier = 0.25f;
     /** Whether the bloom render effect is enabled. */
     public boolean bloom = false;
     /** Whether this planet is displayed. */
     public boolean visible = true;
+    /** Tint of clouds displayed when landing. */
+    public Color landCloudColor = new Color(1f, 1f, 1f, 0.5f);
     /** For suns, this is the color that shines on other planets. Does nothing for children. */
     public Color lightColor = Color.white.cpy();
     /** Atmosphere tint for landable planets. */
     public Color atmosphereColor = new Color(0.3f, 0.7f, 1.0f);
+    /** Icon for appearance in planet list. */
+    public Color iconColor = Color.white.cpy();
     /** Whether this planet has an atmosphere. */
     public boolean hasAtmosphere = true;
-    /** Parent body that this planet orbits around. If null, this planet is considered to be in the middle of the solar system.*/
+    /** Whether to allow users to specify a custom launch schematic for this map. */
+    public boolean allowLaunchSchematics = false;
+    /** Whether to allow users to specify the resources they take to this map. */
+    public boolean allowLaunchLoadout = false;
+    /** Whether to allow sectors to simulate waves in the background. */
+    public boolean allowWaveSimulation = false;
+    /** Whether to simulate sector invasions from enemy bases. */
+    public boolean allowSectorInvasion = false;
+    /** If true, legacy launch pads can be enabled. */
+    public boolean allowLegacyLaunchPads = false;
+    /** If true, sectors saves are cleared when lost. */
+    public boolean clearSectorOnLose = false;
+    /** Multiplier for enemy rebuild speeds; only applied in campaign (not standard rules) */
+    public float enemyBuildSpeedMultiplier = 1f;
+    /** If true, enemy cores are replaced with spawnpoints on this planet (for invasions) */
+    public boolean enemyCoreSpawnReplace = false;
+    /** If true, blocks in the radius of the core will be removed and "built up" in a shockwave upon landing. */
+    public boolean prebuildBase = true;
+    /** If true, waves are created on sector loss. TODO remove. */
+    public boolean allowWaves = false;
+    /** If false, players are unable to land on this planet's numbered sectors. */
+    public boolean allowLaunchToNumbered = true;
+    /** If true, the player is allowed to change the difficulty/rules in the planet UI. */
+    public boolean allowCampaignRules = false;
+    /** Icon as displayed in the planet selection dialog. This is a string, as drawables are null at load time. */
+    public String icon = "planet";
+    /** Plays in the planet dialog when this planet is selected. */
+    public Music launchMusic = Musics.launch;
+    /** Default core block for launching. */
+    public Block defaultCore = Blocks.coreShard;
+    /** 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 Planet solarSystem;
     /** All planets orbiting this one, in ascending order of radius. */
     public Seq<Planet> children = new Seq<>();
-    /** Sattelites orbiting this planet. */
-    public Seq<Satellite> satellites = new Seq<>();
+    /** Default root node shown when the tech tree is opened here. */
+    public @Nullable TechNode techTree;
+    /** Planets that can be launched to from this one. */
+    public Seq<Planet> launchCandidates = new Seq<>();
+    /** Whether interplanetary accelerators can launch to 'any' procedural sector on this planet's surface. */
+    public boolean allowSelfSectorLaunch;
+    /** If true, all content in this planet's tech tree will be assigned this planet in their shownPlanets. */
+    public boolean autoAssignPlanet = true;
+    /** Content (usually planet-specific) that is unlocked upon landing here. */
+    public Seq<UnlockableContent> unlockedOnLand = new Seq<>();
     /** Loads the mesh. Clientside only. Defaults to a boring sphere mesh. */
-    protected Prov<PlanetMesh> meshLoader = () -> new ShaderSphereMesh(this, Shaders.unlit, 2);
+    public Prov<GenericMesh> meshLoader = () -> new ShaderSphereMesh(this, Shaders.unlit, 2), cloudMeshLoader = () -> null;
+    /** Loads the planet grid outline mesh. Clientside only. */
+    public Prov<Mesh> gridMeshLoader = () -> MeshBuilder.buildPlanetGrid(grid, outlineColor, outlineRad * radius);
 
-    public Planet(String name, Planet parent, int sectorSize, float radius){
+    /** Global difficulty/modifier settings for this planet's campaign. */
+    public CampaignRules campaignRules = new CampaignRules();
+    /** Defaults applied to the rules. */
+    public CampaignRules campaignRuleDefaults = new CampaignRules();
+    /** Sets up rules on game load for any sector on this planet. */
+    public Cons<Rules> ruleSetter = r -> {};
+
+    /** @deprecated no-op, do not use. */
+    @Deprecated
+    public Seq<Item> itemWhitelist = new Seq<>(), hiddenItems = new Seq<>();
+
+
+    public Planet(String name, Planet parent, float radius){
         super(name);
 
         this.radius = radius;
         this.parent = parent;
-
-        if(sectorSize > 0){
-            grid = PlanetGrid.create(sectorSize);
-
-            sectors = new Seq<>(grid.tiles.length);
-            for(int i = 0; i < grid.tiles.length; i++){
-                sectors.add(new Sector(this, grid.tiles[i]));
-            }
-
-            sectorApproxRadius = sectors.first().tile.v.dst(sectors.first().tile.corners[0].v);
-        }else{
-            sectors = new Seq<>();
-        }
+        this.orbitOffset = Mathf.randomSeed(id + 1, 360);
 
         //total radius is initially just the radius
-        totalRadius += radius;
+        totalRadius = radius;
 
         //get orbit radius by extending past the parent's total radius
-        orbitRadius = parent == null ? 0f : (parent.totalRadius + orbitSpacing + totalRadius);
+        orbitRadius = parent == null ? 0f : (parent.totalRadius + parent.orbitSpacing + totalRadius);
 
         //orbit time is based on radius [kepler's third law]
         orbitTime = Mathf.pow(orbitRadius, 1.5f) * 1000;
@@ -108,9 +195,62 @@ public class Planet extends UnlockableContent{
 
         //calculate solar system
         for(solarSystem = this; solarSystem.parent != null; solarSystem = solarSystem.parent);
+        allowCampaignRules = isVanilla();
+    }
+
+    public Planet(String name, Planet parent, float radius, int sectorSize){
+        this(name, parent, radius);
+
+        if(sectorSize > 0){
+            grid = PlanetGrid.create(sectorSize);
+
+            sectors.ensureCapacity(grid.tiles.length);
+            for(int i = 0; i < grid.tiles.length; i++){
+                sectors.add(new Sector(this, grid.tiles[i]));
+            }
+
+            sectorApproxRadius = sectors.first().tile.v.dst(sectors.first().tile.corners[0].v);
+        }
+    }
+
+    public void saveRules(){
+        Core.settings.putJson(name + "-campaign-rules", campaignRules);
+    }
+
+    public void loadRules(){
+        campaignRules = Core.settings.getJson(name + "-campaign-rules", CampaignRules.class, () -> campaignRules);
+    }
+
+    public @Nullable Sector getStartSector(){
+        return sectors.size == 0 ? null : sectors.get(startSector);
+    }
+
+    public void applyRules(Rules rules){
+        applyRules(rules, false);
+    }
+
+    public void applyRules(Rules rules, boolean customGame){
+        ruleSetter.get(rules);
+
+        rules.attributes.clear();
+        rules.attributes.add(defaultAttributes);
+        rules.env = defaultEnv;
+        rules.planet = this;
+
+        if(!customGame){
+            campaignRules.apply(this, rules);
+        }
+    }
+
+    public void applyDefaultRules(CampaignRules rules){
+        JsonIO.copy(campaignRuleDefaults, rules);
+        rules.sectorInvasion = allowSectorInvasion;
     }
 
     public @Nullable Sector getLastSector(){
+        if(sectors.isEmpty()){
+            return null;
+        }
         return sectors.get(Math.min(Core.settings.getInt(name + "-last-sector", startSector), sectors.size - 1));
     }
 
@@ -122,10 +262,16 @@ public class Planet extends UnlockableContent{
         sectors.get(index).preset = preset;
     }
 
-    public boolean isLandable(){
+    /** @return whether this planet has a sector grid to select. */
+    public boolean hasGrid(){
         return grid != null && generator != null && sectors.size > 0;
     }
 
+    /** @return whether this planet has any sectors to land on. */
+    public boolean isLandable(){
+        return sectors.size > 0;
+    }
+
     public void updateTotalRadius(){
         totalRadius = radius;
         for(Planet planet : children){
@@ -140,16 +286,14 @@ public class Planet extends UnlockableContent{
 
     /** Calculates orbital rotation based on universe time.*/
     public float getOrbitAngle(){
-        //applies random offset to prevent planets from starting out in a line
-        float offset = Mathf.randomSeed(id, 360);
-        return (offset + universe.secondsf() / (orbitTime / 360f)) % 360f;
+        return (orbitOffset + universe.secondsf() / (orbitTime / 360f)) % 360f;
     }
 
-    /** Calulates rotation on own axis based on universe time.*/
+    /** Calculates rotation on own axis based on universe time.*/
     public float getRotation(){
         //tidally locked planets always face toward parents
         if(tidalLock){
-            return getOrbitAngle();
+            return -getOrbitAngle() + 90;
         }
         //random offset for more variability
         float offset = Mathf.randomSeed(id+1, 360);
@@ -199,20 +343,42 @@ public class Planet extends UnlockableContent{
         return mat.setToTranslation(position).rotate(Vec3.Y, getRotation());
     }
 
-    @Override
-    public void load(){
+    /** Regenerates the planet mesh. For debugging only. */
+    public void reloadMesh(){
         mesh = meshLoader.get();
     }
 
+    @Override
+    public void load(){
+        super.load();
+
+        if(!headless){
+            mesh = meshLoader.get();
+            cloudMesh = cloudMeshLoader.get();
+            if(grid != null) gridMesh = gridMeshLoader.get();
+        }
+    }
+
     @Override
     public void init(){
+        applyDefaultRules(campaignRules);
+        loadRules();
+
+        if(techTree == null){
+            techTree = TechTree.roots.find(n -> n.planet == this);
+        }
+
+        if(techTree != null && autoAssignPlanet){
+            techTree.addDatabaseTab(this);
+            techTree.addPlanet(this);
+        }
 
         for(Sector sector : sectors){
             sector.loadInfo();
         }
 
         if(generator != null){
-            Noise.setSeed(id + 1);
+            Noise.setSeed(sectorSeed < 0 ? id + 1 : sectorSeed);
 
             for(Sector sector : sectors){
                 generator.generateSector(sector);
@@ -221,14 +387,7 @@ public class Planet extends UnlockableContent{
             updateBaseCoverage();
         }
 
-    }
-
-    @Override
-    public void dispose(){
-        if(mesh != null){
-            mesh.dispose();
-            mesh = null;
-        }
+        clipRadius = Math.max(clipRadius, radius + atmosphereRadOut + 0.5f);
     }
 
     /** Gets a sector a tile position. */
@@ -246,7 +405,7 @@ public class Planet extends UnlockableContent{
         Vec3 vec = intersect(ray, radius);
         if(vec == null) return null;
         vec.sub(position).rotate(Vec3.Y, getRotation());
-        return sectors.min(t -> t.tile.v.dst2(vec));
+        return sectors.min(t -> Tmp.v31.set(t.tile.v).setLength(radius).dst2(vec));
     }
 
     /** @return the sector that is hit by this ray, or null if nothing intersects it. */
@@ -271,7 +430,155 @@ public class Planet extends UnlockableContent{
         return visible;
     }
 
-    public void draw(Mat3D projection, Mat3D transform){
-        mesh.render(projection, transform);
+    public void draw(PlanetParams params, Mat3D projection, Mat3D transform){
+        mesh.render(params, projection, transform);
+    }
+
+    public void drawAtmosphere(Mesh atmosphere, Camera3D cam){
+        //atmosphere does not contribute to depth buffer
+        Gl.depthMask(false);
+
+        Blending.additive.apply();
+
+        Shaders.atmosphere.camera = cam;
+        Shaders.atmosphere.planet = this;
+        Shaders.atmosphere.bind();
+        Shaders.atmosphere.apply();
+
+        atmosphere.render(Shaders.atmosphere, Gl.triangles);
+
+        Blending.normal.apply();
+
+        Gl.depthMask(true);
+    }
+
+    public void drawClouds(PlanetParams params, Mat3D projection, Mat3D transform){
+        if(cloudMesh != null){
+            cloudMesh.render(params, projection, transform);
+        }
+    }
+
+    /** Draws sector borders. Supply the batch with {@link Gl#triangles triangle} vertices. */
+    public void drawBorders(VertexBatch3D batch, Sector sector, Color base, float alpha){
+        Color color = Tmp.c1.set(base).a((base.a + 0.3f + Mathf.absin(Time.globalTime, 5f, 0.3f)) * alpha);
+
+        float r1 = radius;
+        float r2 = outlineRad * radius + 0.001f;
+
+        for(int i = 0; i < sector.tile.corners.length; i++){
+            Corner c = sector.tile.corners[i], next = sector.tile.corners[(i+1) % sector.tile.corners.length];
+
+            Tmp.v31.set(c.v).setLength(r2);
+            Tmp.v32.set(next.v).setLength(r2);
+            Tmp.v33.set(c.v).setLength(r1);
+
+            batch.tri2(Tmp.v31, Tmp.v32, Tmp.v33, color);
+
+            Tmp.v31.set(next.v).setLength(r2);
+            Tmp.v32.set(next.v).setLength(r1);
+            Tmp.v33.set(c.v).setLength(r1);
+
+            batch.tri2(Tmp.v31, Tmp.v32, Tmp.v33, color);
+        }
+    }
+
+    /** Draws sector plane. Supply the batch with {@link Gl#triangles triangle} vertices. */
+    public void fill(VertexBatch3D batch, Sector sector, Color color, float offset){
+        float rr = outlineRad * radius + offset;
+        for(int i = 0; i < sector.tile.corners.length; i++){
+            Corner c = sector.tile.corners[i], next = sector.tile.corners[(i+1) % sector.tile.corners.length];
+            batch.tri(Tmp.v31.set(c.v).setLength(rr), Tmp.v32.set(next.v).setLength(rr), Tmp.v33.set(sector.tile.v).setLength(rr), color);
+        }
+    }
+
+    /** Draws sector when selected. Supply the batch with {@link Gl#triangles triangle} vertices. */
+    public void drawSelection(VertexBatch3D batch, Sector sector, Color color, float stroke, float length){
+        float arad = (outlineRad + length) * radius;
+
+        for(int i = 0; i < sector.tile.corners.length; i++){
+            Corner next = sector.tile.corners[(i + 1) % sector.tile.corners.length];
+            Corner curr = sector.tile.corners[i];
+
+            next.v.scl(arad);
+            curr.v.scl(arad);
+            sector.tile.v.scl(arad);
+
+            Tmp.v31.set(curr.v).sub(sector.tile.v).setLength(curr.v.dst(sector.tile.v) - stroke).add(sector.tile.v);
+            Tmp.v32.set(next.v).sub(sector.tile.v).setLength(next.v.dst(sector.tile.v) - stroke).add(sector.tile.v);
+
+            batch.tri(curr.v, next.v, Tmp.v31, color);
+            batch.tri(Tmp.v31, next.v, Tmp.v32, color);
+
+            sector.tile.v.scl(1f / arad);
+            next.v.scl(1f / arad);
+            curr.v.scl(1f /arad);
+        }
+    }
+
+    /** Renders sector outlines. */
+    public void renderSectors(VertexBatch3D batch, Camera3D cam, PlanetParams params){
+        //apply transformed position
+        batch.proj().mul(getTransform(mat));
+
+        if(params.renderer != null){
+            params.renderer.renderSectors(this);
+        }
+
+        //render sector grid
+        float scaledOutlineRad = outlineRad * radius;
+        Mesh mesh = gridMesh;
+        Shader shader = Shaders.planetGrid;
+        Vec3 tile = intersect(cam.getMouseRay(), scaledOutlineRad);
+        Shaders.planetGrid.mouse.lerp(tile == null ? Vec3.Zero : tile.sub(position).rotate(Vec3.Y, getRotation()), 0.2f);
+
+        shader.bind();
+        shader.setUniformMatrix4("u_proj", cam.combined.val);
+        shader.setUniformMatrix4("u_trans", getTransform(mat).val);
+        shader.apply();
+        mesh.render(shader, Gl.lines);
+    }
+
+    /** Draws an arc from one point to another on the planet. */
+    public void drawArc(VertexBatch3D batch, Vec3 a, Vec3 b, Color from, Color to, float length, float timeScale, int pointCount){
+        //increase curve height when on opposite side of planet, so it doesn't tunnel through
+        float scaledOutlineRad = outlineRad * radius;
+        float dot = 1f - (Tmp.v32.set(a).nor().dot(Tmp.v33.set(b).nor()) + 1f)/2f;
+
+        Vec3 avg = Tmp.v31.set(b).add(a).scl(0.5f);
+        avg.setLength(radius * (1f + length) + dot * 1.35f);
+
+        points.clear();
+        points.addAll(Tmp.v33.set(b).setLength(scaledOutlineRad), Tmp.v31, Tmp.v34.set(a).setLength(scaledOutlineRad));
+        Tmp.bz3.set(points);
+
+        for(int i = 0; i < pointCount + 1; i++){
+            float f = i / (float)pointCount;
+            Tmp.c1.set(from).lerp(to, (f + Time.globalTime / timeScale) % 1f);
+            batch.color(Tmp.c1);
+            batch.vertex(Tmp.bz3.valueAt(Tmp.v32, f));
+        }
+        batch.flush(Gl.lineStrip);
+    }
+
+    public Vec3 lookAt(Sector sector, Vec3 out){
+        return out.set(sector.tile.v).rotate(Vec3.Y, -getRotation());
+    }
+
+    public Vec3 project(Sector sector, Camera3D cam, Vec3 out){
+        return cam.project(out.set(sector.tile.v).setLength(outlineRad * radius).rotate(Vec3.Y, -getRotation()).add(position));
+    }
+
+    public void setPlane(Sector sector, PlaneBatch3D projector){
+        float rotation = -getRotation();
+        float length = 0.01f;
+
+        projector.setPlane(
+            //origin on sector position
+            Tmp.v33.set(sector.tile.v).setLength((outlineRad + length) * radius).rotate(Vec3.Y, rotation).add(position),
+            //face up
+            sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v, radius).rotate(Vec3.Y, rotation).nor(),
+            //right vector
+            Tmp.v31.set(Tmp.v32).rotate(Vec3.Y, -rotation).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor()
+        );
     }
 }
diff --git a/core/src/mindustry/type/Satellite.java b/core/src/mindustry/type/Satellite.java
deleted file mode 100644
index a30a44c136..0000000000
--- a/core/src/mindustry/type/Satellite.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package mindustry.type;
-
-/** Any object that is orbiting a planet. */
-public class Satellite{
-    public Planet planet;
-
-    public Satellite(Planet orbiting){
-        this.planet = orbiting;
-    }
-}
diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java
index dda4cc6a6c..c7573b3c3a 100644
--- a/core/src/mindustry/type/Sector.java
+++ b/core/src/mindustry/type/Sector.java
@@ -9,8 +9,10 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.content.*;
 import mindustry.game.Saves.*;
 import mindustry.game.*;
+import mindustry.gen.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.ui.*;
 import mindustry.world.modules.*;
@@ -39,7 +41,12 @@ public class Sector{
         this.planet = planet;
         this.tile = tile;
         this.plane = new Plane();
-        this.rect = makeRect();
+        //empty sector tile needs a special rect
+        if(tile.corners.length == 0){
+            rect = new SectorRect(1f, Vec3.Zero.cpy(), Vec3.Y.cpy(), Vec3.X.cpy(), 0f);
+        }else{
+            this.rect = makeRect();
+        }
         this.id = tile.id;
     }
 
@@ -73,12 +80,30 @@ public class Sector{
         return hasBase() || (preset != null && preset.alwaysUnlocked);
     }
 
+    public boolean allowLaunchSchematics(){
+        return (preset != null && preset.overrideLaunchDefaults) ? preset.allowLaunchSchematics : planet.allowLaunchSchematics;
+    }
+
+    public boolean allowLaunchLoadout(){
+        return (preset != null && preset.overrideLaunchDefaults) ? preset.allowLaunchLoadout : planet.allowLaunchLoadout;
+    }
+
     public void saveInfo(){
         Core.settings.putJson(planet.name + "-s-" + id + "-info", info);
     }
 
     public void loadInfo(){
         info = Core.settings.getJson(planet.name + "-s-" + id + "-info", SectorInfo.class, SectorInfo::new);
+
+        //fix an old naming bug; this doesn't happen with new saves, but old saves need manual fixes
+        if(info.resources.contains(Blocks.water)){
+            info.resources.remove(Blocks.water);
+            info.resources.add(Liquids.water);
+        }
+
+        if(info.resources.contains(u -> u == null)){
+            info.resources = info.resources.select(u -> u != null);
+        }
     }
 
     /** Removes any sector info. */
@@ -92,11 +117,11 @@ public class Sector{
     }
 
     public boolean isAttacked(){
-        if(isBeingPlayed()) return state.rules.waves;
-        return save != null && info.waves && info.hasCore;
+        if(isBeingPlayed()) return state.rules.waves || state.rules.attackMode;
+        return save != null && (info.waves || info.attack) && info.hasCore;
     }
 
-    /** @return whether the player has a base here. */
+    /** @return whether the player has a base (active save with a core) here. */
     public boolean hasBase(){
         return save != null && info.hasCore && !(Vars.state.isGame() && Vars.state.rules.sector == this && state.gameOver);
     }
@@ -113,6 +138,10 @@ public class Sector{
 
     public String name(){
         if(preset != null && info.name == null) return preset.localizedName;
+        //single-sector "planets" use their own name for the sector name.
+        if(info.name == null && planet.sectors.size == 1){
+            return planet.localizedName;
+        }
         return info.name == null ? id + "" : info.name;
     }
 
@@ -123,11 +152,19 @@ public class Sector{
 
     @Nullable
     public TextureRegion icon(){
-        return info.icon == null ? null : Fonts.getLargeIcon(info.icon);
+        return info.contentIcon != null ? info.contentIcon.uiIcon : info.icon == null ? null : Fonts.getLargeIcon(info.icon);
+    }
+
+    @Nullable
+    public String iconChar(){
+        if(info.contentIcon != null) return info.contentIcon.emoji();
+        if(info.icon != null) return (char)Iconc.codes.get(info.icon) + "";
+        return null;
     }
 
     public boolean isCaptured(){
-        return save != null && !info.waves;
+        if(isBeingPlayed()) return !state.rules.waves && !state.rules.attackMode;
+        return save != null && !info.waves && !info.attack;
     }
 
     public boolean hasSave(){
@@ -148,8 +185,7 @@ public class Sector{
 
     /** @return the sector size, in tiles */
     public int getSize(){
-        int res = (int)(rect.radius * 3200);
-        return res % 2 == 0 ? res : res + 1;
+        return planet.generator == null ? 1 : planet.generator.getSectorSize(this);
     }
 
     public void removeItems(ItemSeq items){
@@ -200,7 +236,7 @@ public class Sector{
 
     /** 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(){
+    protected SectorRect makeRect(){
         Vec3[] corners = new Vec3[tile.corners.length];
         for(int i = 0; i < corners.length; i++){
             corners[i] = tile.corners[i].v.cpy().setLength(planet.radius);
diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java
index 997e014c63..48dd2f9234 100644
--- a/core/src/mindustry/type/SectorPreset.java
+++ b/core/src/mindustry/type/SectorPreset.java
@@ -1,12 +1,11 @@
 package mindustry.type;
 
 import arc.func.*;
-import arc.graphics.g2d.*;
 import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.maps.generators.*;
-import mindustry.ui.*;
+import mindustry.mod.Mods.*;
 
 public class SectorPreset extends UnlockableContent{
     public FileMapGenerator generator;
@@ -15,25 +14,55 @@ public class SectorPreset extends UnlockableContent{
 
     public int captureWave = 0;
     public Cons<Rules> rules = rules -> rules.winWave = captureWave;
-    public boolean useAI = true;
     /** Difficulty, 0-10. */
     public float difficulty;
+    public float startWaveTimeMultiplier = 2f;
     public boolean addStartingItems = false;
+    public boolean noLighting = false;
+    /** If true, this is the last sector in its planetary campaign. */
+    public boolean isLastSector;
+    public boolean showSectorLandInfo = true;
+    /** If true, uses this sector's launch fields instead */
+    public boolean overrideLaunchDefaults = false;
+    /** Whether to allow users to specify a custom launch schematic for this map. */
+    public boolean allowLaunchSchematics = false;
+    /** Whether to allow users to specify the resources they take to this map. */
+    public boolean allowLaunchLoadout = false;
+    /** If true, switches to attack mode after waves end. */
+    public boolean attackAfterWaves = false;
 
     public SectorPreset(String name, Planet planet, int sector){
+        this(name);
+        initialize(planet, sector);
+    }
+
+    /** Internal use only! */
+    public SectorPreset(String name, LoadedMod mod){
         super(name);
-        this.generator = new FileMapGenerator(name, this);
+        if(mod != null){
+            this.minfo.mod = mod;
+        }
+        this.generator = new FileMapGenerator(this.name, this);
+    }
+
+    /** Internal use only! */
+    public SectorPreset(String name){
+       this(name, null);
+    }
+
+    public void initialize(Planet planet, int sector){
         this.planet = planet;
         sector %= planet.sectors.size;
         this.sector = planet.sectors.get(sector);
-        inlineDescription = false;
 
         planet.preset(sector, this);
     }
 
     @Override
-    public TextureRegion icon(Cicon c){
-        return Icon.terrain.getRegion();
+    public void loadIcon(){
+        if(Icon.terrain != null){
+            uiIcon = fullIcon = Icon.terrain.getRegion();
+        }
     }
 
     @Override
diff --git a/core/src/mindustry/type/StatusEffect.java b/core/src/mindustry/type/StatusEffect.java
index a02cb28978..05dc34595d 100644
--- a/core/src/mindustry/type/StatusEffect.java
+++ b/core/src/mindustry/type/StatusEffect.java
@@ -4,31 +4,63 @@ import arc.graphics.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.graphics.MultiPacker.*;
+import mindustry.world.meta.*;
 
-public class StatusEffect extends MappableContent{
+public class StatusEffect extends UnlockableContent{
     /** Damage dealt by the unit with the effect. */
     public float damageMultiplier = 1f;
     /** Unit health multiplier. */
     public float healthMultiplier = 1f;
-    /** Unit speed multiplier */
+    /** Unit speed multiplier. */
     public float speedMultiplier = 1f;
-    /** Unit speed multiplier */
+    /** Unit reload multiplier. */
     public float reloadMultiplier = 1f;
+    /** Unit build speed multiplier. */
+    public float buildSpeedMultiplier = 1f;
+    /** Unit drag multiplier. */
+    public float dragMultiplier = 1f;
+    /** Damage dealt upon transition to an affinity. */
+    public float transitionDamage = 0f;
+    /** Unit weapon(s) disabled. */
+    public boolean disarm = false;
     /** Damage per frame. */
     public float damage;
     /** Chance of effect appearing. */
     public float effectChance = 0.15f;
+    /** Should the effect be given a parent. */
+    public boolean parentizeEffect;
     /** If true, the effect never disappears. */
     public boolean permanent;
+    /** If true, this effect will only react with other effects and cannot be applied. */
+    public boolean reactive;
+    /** Special flag for the dynamic effect type with custom stats - do not use. */
+    public boolean dynamic = false;
+    /** Whether to show this effect in the database. */
+    public boolean show = true;
     /** Tint color of effect. */
     public Color color = Color.white.cpy();
     /** Effect that happens randomly on top of the affected unit. */
     public Effect effect = Fx.none;
+    /** Effect that is displayed once when applied to a unit. */
+    public Effect applyEffect = Fx.none;
+    /** Whether the apply effect should display even if effect is already on the unit. */
+    public boolean applyExtend;
+    /** Tint color of apply effect. */
+    public Color applyColor = Color.white.cpy();
+    /** Should the apply effect be given a parent. */
+    public boolean parentizeApplyEffect;
+    /** Affinity & opposite values for stat displays. */
+    public ObjectSet<StatusEffect> affinities = new ObjectSet<>(), opposites = new ObjectSet<>();
+    /** Set to false to disable outline generation. */
+    public boolean outline = true;
     /** Transition handler map. */
     protected ObjectMap<StatusEffect, TransitionHandler> transitions = new ObjectMap<>();
     /** Called on init. */
@@ -36,17 +68,68 @@ public class StatusEffect extends MappableContent{
 
     public StatusEffect(String name){
         super(name);
+        allDatabaseTabs = true;
     }
 
     @Override
     public void init(){
-        initblock.run();
+        super.init();
+        if(initblock != null){
+            initblock.run();
+        }
     }
 
     public void init(Runnable run){
         this.initblock = run;
     }
 
+    @Override
+    public boolean isHidden(){
+        return localizedName.equals(name) || !show;
+    }
+
+    @Override
+    public void setStats(){
+        if(damageMultiplier != 1) stats.addMultModifier(Stat.damageMultiplier, damageMultiplier);
+        if(healthMultiplier != 1) stats.addMultModifier(Stat.healthMultiplier, healthMultiplier);
+        if(speedMultiplier != 1) stats.addMultModifier(Stat.speedMultiplier, speedMultiplier);
+        if(reloadMultiplier != 1) stats.addMultModifier(Stat.reloadMultiplier, reloadMultiplier);
+        if(buildSpeedMultiplier != 1) stats.addMultModifier(Stat.buildSpeedMultiplier, buildSpeedMultiplier);
+        if(damage > 0) stats.add(Stat.damage, damage * 60f, StatUnit.perSecond);
+        if(damage < 0) stats.add(Stat.healing, -damage * 60f, StatUnit.perSecond);
+
+        boolean reacts = false;
+
+        for(var e : opposites.toSeq().sort()){
+            stats.add(Stat.opposites, e.emoji() + e);
+        }
+
+        if(reactive){
+            var other = Vars.content.statusEffects().find(f -> f.affinities.contains(this));
+            if(other != null && other.transitionDamage > 0){
+                stats.add(Stat.reactive, other.emoji() + other + " / [accent]" + (int)other.transitionDamage + "[lightgray] " + Stat.damage.localized());
+                reacts = true;
+            }
+        }
+
+        //don't list affinities *and* reactions, as that would be redundant
+        if(!reacts){
+            for(var e : affinities.toSeq().sort()){
+                stats.add(Stat.affinities, e.emoji() + e);
+            }
+
+            if(affinities.size > 0 && transitionDamage != 0){
+                stats.add(Stat.affinities, "/ [accent]" + (int)transitionDamage + " " + Stat.damage.localized());
+            }
+        }
+
+    }
+
+    @Override
+    public boolean showUnlock(){
+        return false;
+    }
+
     /** Runs every tick on the affected unit while time is greater than 0. */
     public void update(Unit unit, float time){
         if(damage > 0){
@@ -56,28 +139,48 @@ public class StatusEffect extends MappableContent{
         }
 
         if(effect != Fx.none && Mathf.chanceDelta(effectChance)){
-            Tmp.v1.rnd(unit.type.hitSize /2f);
-            effect.at(unit.x + Tmp.v1.x, unit.y + Tmp.v1.y);
+            Tmp.v1.rnd(Mathf.range(unit.type.hitSize/2f));
+            effect.at(unit.x + Tmp.v1.x, unit.y + Tmp.v1.y, 0, color, parentizeEffect ? unit : null);
         }
     }
 
+    /** Called when status effect is removed. */
+    public void onRemoved(Unit unit){
+
+    }
+
     protected void trans(StatusEffect effect, TransitionHandler handler){
         transitions.put(effect, handler);
     }
 
+    protected void affinity(StatusEffect effect, TransitionHandler handler){
+        affinities.add(effect);
+        effect.affinities.add(this);
+        trans(effect, handler);
+    }
+
     protected void opposite(StatusEffect... effect){
-        for(StatusEffect sup : effect){
-            trans(sup, (unit, time, newTime, result) -> {
-                time -= newTime * 0.5f;
-                if(time > 0){
-                    result.set(this, time);
-                    return;
-                }
-                result.set(sup, newTime);
-            });
+        for(var other : effect){
+            handleOpposite(other);
+            other.handleOpposite(this);
         }
     }
 
+    protected void handleOpposite(StatusEffect other){
+        opposites.add(other);
+        trans(other, (unit, result, time) -> {
+            result.time -= time * 0.5f;
+            if(result.time <= 0f){
+                result.time = time;
+                result.effect = other;
+            }
+        });
+    }
+
+    public void draw(Unit unit, float time){
+        draw(unit); //Backwards compatibility
+    }
+
     public void draw(Unit unit){
 
     }
@@ -89,16 +192,34 @@ public class StatusEffect extends MappableContent{
     /**
      * Called when transitioning between two status effects.
      * @param to The state to transition to
-     * @param time The current status effect time
-     * @param newTime The time that the new status effect will last
+     * @param time The applies status effect time
+     * @return whether a reaction occurred
      */
-    public StatusEntry getTransition(Unit unit, StatusEffect to, float time, float newTime, StatusEntry result){
-        if(transitions.containsKey(to)){
-            transitions.get(to).handle(unit, time, newTime, result);
-            return result;
+    public boolean applyTransition(Unit unit, StatusEffect to, StatusEntry entry, float time){
+        var trans = transitions.get(to);
+        if(trans != null){
+            trans.handle(unit, entry, time);
+            return true;
         }
+        return false;
+    }
 
-        return result.set(to, newTime);
+    public void applied(Unit unit, float time, boolean extend){
+        if(!extend || applyExtend) applyEffect.at(unit.x, unit.y, 0, applyColor, parentizeApplyEffect ? unit : null);
+    }
+
+    @Override
+    public void createIcons(MultiPacker packer){
+        super.createIcons(packer);
+
+        if(outline){
+            makeOutline(PageType.ui, packer, uiIcon, true, Pal.gray, 3);
+        }
+    }
+
+    @Override
+    public String toString(){
+        return localizedName;
     }
 
     @Override
@@ -107,6 +228,6 @@ public class StatusEffect extends MappableContent{
     }
 
     public interface TransitionHandler{
-        void handle(Unit unit, float time, float newTime, StatusEntry result);
+        void handle(Unit unit, StatusEntry current, float time);
     }
 }
diff --git a/core/src/mindustry/type/TeamEntry.java b/core/src/mindustry/type/TeamEntry.java
new file mode 100644
index 0000000000..3d4f9880c3
--- /dev/null
+++ b/core/src/mindustry/type/TeamEntry.java
@@ -0,0 +1,30 @@
+package mindustry.type;
+
+import arc.scene.ui.layout.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
+
+/** This class is only for displaying team lore in the content database. */
+//TODO more stuff, make unlockable, don't display in campaign at all
+public class TeamEntry extends UnlockableContent{
+    public final Team team;
+
+    public TeamEntry(String name, Team team){
+        super(name);
+        this.team = team;
+    }
+
+    public TeamEntry(Team team){
+        this(team.name, team);
+    }
+
+    @Override
+    public void displayExtra(Table table){
+        table.add("@team." + name + ".log").pad(6).padTop(20).width(400f).wrap().fillX();
+    }
+
+    @Override
+    public ContentType getContentType(){
+        return ContentType.team;
+    }
+}
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index e41050118f..a8d7ddc846 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -5,12 +5,16 @@ import arc.audio.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.graphics.g2d.TextureAtlas.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
+import mindustry.ai.*;
+import mindustry.ai.Pathfinder.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
@@ -18,10 +22,14 @@ import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.abilities.*;
+import mindustry.entities.part.*;
 import mindustry.entities.units.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.graphics.MultiPacker.*;
+import mindustry.logic.*;
+import mindustry.type.ammo.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
@@ -29,106 +37,447 @@ import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.units.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
+import static arc.graphics.g2d.Draw.*;
 import static mindustry.Vars.*;
 
-public class UnitType extends UnlockableContent{
-    public static final float shadowTX = -12, shadowTY = -13, outlineSpace = 0.01f;
+public class UnitType extends UnlockableContent implements Senseable{
+    public static final float shadowTX = -12, shadowTY = -13;
     private static final Vec2 legOffset = new Vec2();
 
-    /** If true, the unit is always at elevation 1. */
-    public boolean flying;
+    /** Environmental flags that are *all* required for this unit to function. 0 = any environment */
+    public int envRequired = 0;
+    /** The environment flags that this unit can function in. If the env matches any of these, it will be enabled. */
+    public int envEnabled = Env.terrestrial;
+    /** The environment flags that this unit *cannot* function in. If the env matches any of these, it will explode or be disabled. */
+    public int envDisabled = Env.scorching;
+
+    /** movement speed (world units/t) */
+    public float speed = 1.1f,
+    /** multiplier for speed when boosting */
+    boostMultiplier = 1f,
+    /** body rotation speed in degrees/t */
+    rotateSpeed = 5f,
+    /** mech base rotation speed in degrees/t*/
+    baseRotateSpeed = 5f,
+    /** movement drag as fraction */
+    drag = 0.3f,
+    /** acceleration as fraction of speed */
+    accel = 0.5f,
+    /** size of one side of the hitbox square */
+    hitSize = 6f,
+    /** shake on unit death */
+    deathShake = -1f,
+    /** shake on each step for leg/mech units */
+    stepShake = -1f,
+    /** ripple / dust size for legged units */
+    rippleScale = 1f,
+    /** boosting rise speed as fraction */
+    riseSpeed = 0.08f,
+    /** how fast this unit falls when not boosting */
+    fallSpeed = 0.018f,
+    /** how many ticks it takes this missile to accelerate to full speed */
+    missileAccelTime = 0f,
+    /** raw health amount */
+    health = 200f,
+    /** incoming damage is reduced by this amount */
+    armor = 0f,
+    /** minimum range of any weapon; used for approaching targets. can be overridden by setting a value > 0. */
+    range = -1,
+    /** maximum range of any weapon */
+    maxRange = -1f,
+    /** range at which this unit can mine ores */
+    mineRange = 70f,
+    /** range at which this unit can build */
+    buildRange = Vars.buildingRange,
+    /** multiplier for damage this (flying) unit deals when crashing on enemy things */
+    crashDamageMultiplier = 1f,
+    /** a VERY ROUGH estimate of unit DPS; initialized in init() */
+    dpsEstimate = -1,
+    /** graphics clipping size; <0 to calculate automatically */
+    clipSize = -1,
+    /** multiplier for how slowly this unit drowns - higher numbers, slower drowning. */
+    drownTimeMultiplier = 1f,
+    /** fractional movement speed penalty for this unit when it is moving in the opposite direction that it is facing */
+    strafePenalty = 0.5f,
+    /** multiplier for cost of research in tech tree */
+    researchCostMultiplier = 50,
+
+    /** for ground units, the layer upon which this unit is drawn */
+    groundLayer = Layer.groundUnit,
+    /** For units that fly, the layer upon which this unit is drawn. If no value is set, defaults to Layer.flyingUnitLow or Layer.flyingUnit depending on lowAltitude */
+    flyingLayer = -1,
+    /** Payload capacity of this unit in world units^2 */
+    payloadCapacity = 8,
+    /** building speed multiplier; <0 to disable. */
+    buildSpeed = -1f,
+    /** Minimum distance from this unit that weapons can target. Prevents units from firing "inside" the unit. */
+    aimDst = -1f,
+    /** Visual offset of build beam from front. */
+    buildBeamOffset = 3.8f,
+    /** WIP: Units of low priority will always be ignored in favor of those with higher priority, regardless of distance. */
+    targetPriority = 0f,
+    /** Elevation of shadow drawn under this (ground) unit. Visual only. */
+    shadowElevation = -1f,
+    /** Scale for length of shadow drawn under this unit. Does nothing if this unit has no shadow. */
+    shadowElevationScl = 1f,
+    /** backwards engine offset from center of unit */
+    engineOffset = 5f,
+    /** main engine radius */
+    engineSize = 2.5f,
+    /** layer of all engines (<0 for default) */
+    engineLayer = -1f,
+    /** visual backwards offset of items on unit */
+    itemOffsetY = 3f,
+    /** radius of light emitted, <0 for default */
+    lightRadius = -1f,
+    /** light color opacity*/
+    lightOpacity = 0.6f,
+    /** fog view radius in tiles. <0 for automatic radius. */
+    fogRadius = -1f,
+
+    /** horizontal offset of wave trail in naval units */
+    waveTrailX = 4f,
+    /** vertical offset of wave trail in naval units  */
+    waveTrailY = -3f,
+    /** width of all trails (including naval ones) */
+    trailScl = 1f;
+
+    /** if true, this unit counts as an enemy in the wave counter (usually false for support-only units) */
+    public boolean isEnemy = true,
+    /** if true, the unit is always at elevation 1 */
+    flying = false,
+    /** whether this flying unit should wobble around */
+    wobble = true,
+    /** whether this unit tries to attack air units */
+    targetAir = true,
+    /** whether this unit tries to attack ground units */
+    targetGround = true,
+    /** if true, this unit will attempt to face its target when shooting/aiming at it */
+    faceTarget = true,
+    /** AI flag: if true, this flying unit circles around its target like a bomber */
+    circleTarget = false,
+    /** if true, this unit can boost into the air if a player/processors controls it*/
+    canBoost = false,
+    /** if true, this unit will always boost when using builder AI */
+    boostWhenBuilding = true,
+    /** if false, logic processors cannot control this unit */
+    logicControllable = true,
+    /** if false, players cannot control this unit */
+    playerControllable = true,
+    /** if false, this unit cannot be moved into payloads */
+    allowedInPayloads = true,
+    /** if false, this unit cannot be hit by bullets or explosions*/
+    hittable = true,
+    /** if false, this unit does not take damage and cannot be kill() / destroy()-ed. */
+    killable = true,
+    /** if false, this unit is not targeted by anything. */
+    targetable = true,
+    /** if true, this unit can be hit/targeted when it has payloads (assuming hittable/targetable is false) */
+    vulnerableWithPayloads = false,
+    /** if true, this payload unit can pick up units */
+    pickupUnits = true,
+    /** if false, this unit does not physically collide with others. */
+    physics = true,
+    /** if true, this ground unit will drown in deep liquids. */
+    canDrown = true,
+    /** if false, this unit ignores the unit cap and can be spawned infinitely */
+    useUnitCap = true,
+    /** if true, this core unit will "dock" to other units, making it re-appear when "undocking". */
+    coreUnitDock = false,
+    /** if false, no falling "corpse" is created when this unit dies. */
+    createWreck = true,
+    /** if false, no scorch marks are created when this unit dies */
+    createScorch = true,
+    /** if true, this unit will be drawn under effects/bullets; this is a visual change only. */
+    lowAltitude = false,
+    /** if true, this unit will look at whatever it is building */
+    rotateToBuilding = true,
+    /** if true and this is a legged unit, this unit can walk over blocks. */
+    allowLegStep = false,
+    /** for legged units, setting this to false forces it to be on the ground physics layer. */
+    legPhysicsLayer = true,
+    /** if true, this unit cannot drown, and will not be affected by the floor under it. */
+    hovering = false,
+    /** if true, this unit can move in any direction regardless of rotation. if false, this unit can only move in the direction it is facing. */
+    omniMovement = true,
+    /** if true, the unit faces its moving direction before actually moving. */
+    rotateMoveFirst = false,
+    /** if true, this unit flashes when being healed */
+    healFlash = true,
+    /** whether the unit can heal blocks. Initialized in init() */
+    canHeal = false,
+    /** if true, all weapons will attack the same target. */
+    singleTarget = false,
+    /** if true, this unit will be able to have multiple targets, even if it only has one mirrored weapon. */
+    forceMultiTarget = false,
+    /** if false, this unit has no weapons that can attack. */
+    canAttack = true,
+    /** if true, this unit won't show up in the database or various other UIs. */
+    hidden = false,
+    /** if true, this unit is for internal use only and does not have a sprite generated. */
+    internal = false,
+    /** If false, this unit is not pushed away from map edges. */
+    bounded = true,
+    /** if true, this unit is detected as naval - do NOT assign this manually! Initialized in init() */
+    naval = false,
+    /** if false, RTS AI controlled units do not automatically attack things while moving. This is automatically assigned. */
+    autoFindTarget = true,
+    /** If false, 'under' blocks like conveyors are not targeted. */
+    targetUnderBlocks = true,
+    /** if true, this unit will always shoot while moving regardless of slowdown */
+    alwaysShootWhenMoving = false,
+
+    /** whether this unit has a hover tooltip */
+    hoverable = true,
+    /** if true, this modded unit always has a -outline region generated for its base. Normally, outlines are ignored if there are no top = false weapons. */
+    alwaysCreateOutline = false,
+    /** if true, this unit has a square shadow. */
+    squareShape = false,
+    /** if true, this unit will draw its building beam towards blocks. */
+    drawBuildBeam = true,
+    /** if false, the team indicator/cell is not drawn. */
+    drawCell = true,
+    /** if false, carried items are not drawn. */
+    drawItems = true,
+    /** if false, the unit shield (usually seen in waves) is not drawn. */
+    drawShields = true,
+    /** if false, the unit body is not drawn. */
+    drawBody = true,
+    /** if false, the unit is not drawn on the minimap. */
+    drawMinimap = true;
+
+    /** The default AI controller to assign on creation. */
+    public Prov<? extends UnitController> aiController = () -> !flying ? new GroundAI() : new FlyingAI();
+    /** Function that chooses AI controller based on unit entity. */
+    public Func<Unit, ? extends UnitController> controller = u -> !playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? aiController.get() : new CommandAI();
+    /** Creates a new instance of this unit class. */
     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, maxRange = -1f;
-    public float crashDamageMultiplier = 1f;
-    public boolean targetAir = true, targetGround = true;
-    public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false, circleTarget = false;
-    public boolean canBoost = false;
-    public boolean destructibleWreck = true;
-    public float groundLayer = Layer.groundUnit;
-    public float payloadCapacity = 8;
-    public float aimDst = -1f;
-    public float buildBeamOffset = 3.8f;
-    public int commandLimit = 8;
-    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;
+
+    /** list of "abilities", which are various behaviors that update each frame */
     public Seq<Ability> abilities = new Seq<>();
-    public BlockFlag targetFlag = BlockFlag.generator;
+    /** All weapons that this unit will shoot with. */
+    public Seq<Weapon> weapons = new Seq<>();
+    /** None of the status effects in this set can be applied to this unit. */
+    public ObjectSet<StatusEffect> immunities = new ObjectSet<>();
 
-    public int legCount = 4, legGroupSize = 2;
-    public float legLength = 10f, legSpeed = 0.1f, legTrns = 1f, legBaseOffset = 0f, legMoveSpace = 1f, legExtension = 0, legPairOffset = 0, legLengthScl = 1f, kinematicScl = 1f, maxStretch = 1.75f;
-    public float legSplashDamage = 0f, legSplashRange = 5;
-    public boolean flipBackLegs = true;
+    /** color that this unit flashes when getting healed (if healFlash is true) */
+    public Color healColor = Pal.heal;
+    /** Color of light that this unit produces when lighting is enabled in the map. */
+    public Color lightColor = Pal.powerLight;
+    /** override for unit shield colour. */
+    public @Nullable Color shieldColor;
+    /** sound played when this unit explodes (*not* when it is shot down) */
+    public Sound deathSound = Sounds.bang;
+    /** sound played on loop when this unit is around. */
+    public Sound loopSound = Sounds.none;
+    /** volume of loop sound */
+    public float loopSoundVolume = 0.5f;
+    /** effect that this unit emits when falling */
+    public Effect fallEffect = Fx.fallSmoke;
+    /** effect created at engine when unit falls. */
+    public Effect fallEngineEffect = Fx.fallSmoke;
+    /** effect created when this unit dies */
+    public Effect deathExplosionEffect = Fx.dynamicExplosion;
+    /** optional effect created when this tank moves */
+    public @Nullable Effect treadEffect;
+    /** extra (usually animated) visual parts */
+    public Seq<DrawPart> parts = new Seq<>(DrawPart.class);
+    /** list of engines, or "thrusters" */
+    public Seq<UnitEngine> engines = new Seq<>();
+    /** if false, the thruster is always displayed at its normal size regardless of elevation */
+    public boolean useEngineElevation = true;
+    /** override for all engine colors */
+    public @Nullable Color engineColor = null;
+    /** color for inner portions of engines */
+    public Color engineColorInner = Color.white;
+    /** length of engine trail (if flying) or wave trail (if naval) */
+    public int trailLength = 0;
+    /** override for engine trail color */
+    public @Nullable Color trailColor;
 
-    public int ammoResupplyAmount = 10;
-    public float ammoResupplyRange = 100f;
+    /** Function used for calculating cost of moving with ControlPathfinder. Does not affect "normal" flow field pathfinding. */
+    public @Nullable PathCost pathCost;
+    /** ID for path cost, to be used in the control path finder. This is the value that actually matters; do not assign manually. Set in init(). */
+    public int pathCostId;
+    /** A sample of the unit that this type creates. Do not modify! */
+    public @Nullable Unit sample;
 
-    public float mechSideSway = 0.54f, mechFrontSway = 0.1f;
-    public float mechStride = -1f;
-    public float mechStepShake = -1f;
+    /** Flags to target based on priority. Null indicates that the closest target should be found. The closest enemy core is used as a fallback. */
+    public BlockFlag[] targetFlags = {null};
+
+    /** A value of false is used to hide command changing UI in unit factories. */
+    public boolean allowChangeCommands = true;
+    /** Commands available to this unit through RTS controls. An empty array means commands will be assigned based on unit capabilities in init(). */
+    public Seq<UnitCommand> commands = new Seq<>();
+    /** Command to assign to this unit upon creation. Null indicates the first command in the array. */
+    public @Nullable UnitCommand defaultCommand;
+    /** Stances this unit can have.  An empty array means stances will be assigned based on unit capabilities in init(). */
+    public Seq<UnitStance> stances = new Seq<>();
+
+    /** color for outline generated around sprites */
+    public Color outlineColor = Pal.darkerMetal;
+    /** thickness for sprite outline  */
+    public int outlineRadius = 3;
+    /** if false, no sprite outlines are generated */
+    public boolean outlines = true;
+
+    /** amount of items this unit can carry; <0 to determine based on hitSize. */
+    public int itemCapacity = -1;
+    /** amount of ammo this unit can hold (if the rule is enabled); <0 to determine based on weapon fire rate. */
+    public int ammoCapacity = -1;
+    /** ammo this unit uses, if that system is enabled. */
+    public AmmoType ammoType = new ItemAmmoType(Items.copper);
+
+    /** max hardness of ore that this unit can mine (<0 to disable) */
+    public int mineTier = -1;
+    /** mining speed in weird arbitrary units */
+    public float mineSpeed = 1f;
+    /** whether this unit can mine ores from floors/walls, respectively */
+    public boolean mineWalls = false, mineFloor = true;
+    /** if true, harder materials will take longer to mine */
+    public boolean mineHardnessScaling = true;
+    /** continuous sound emitted when mining. */
+    public Sound mineSound = Sounds.minebeam;
+    /** volume of mining sound. */
+    public float mineSoundVolume = 0.6f;
+    /** Target items to mine. Used in MinerAI */
+    public Seq<Item> mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium);
+
+    //LEG UNITS
+
+    /** number of legs this unit has (must have the correct type to function!) */
+    public int legCount = 4;
+    /** size of groups in which legs move. for example, insects (6 legs) usually move legs in groups of 3. */
+    public int legGroupSize = 2;
+
+    /** total length of a leg (both segments) */
+    public float legLength = 10f,
+    /** how fast individual legs move towards their destination (non-linear) */
+    legSpeed = 0.1f,
+    /** scale for how far in front (relative to unit velocity) legs try to place themselves; if legs lag behind a unit, increase this number */
+    legForwardScl = 1f,
+    /** leg offset from the center of the unit */
+    legBaseOffset = 0f,
+    /** scaling for space between leg movements */
+    legMoveSpace = 1f,
+    /** for legs without "joints", this is how much the second leg sprite is moved "back" by, so it covers the joint region (it's hard to explain without an image) */
+    legExtension = 0,
+    /** Higher values of this field make groups of legs move less in-sync with each other. */
+    legPairOffset = 0,
+    /** scaling for how far away legs *try* to be from the body (not their actual length); e.g. if set to 0.5, legs will appear somewhat folded */
+    legLengthScl = 1f,
+    /** if legStraightness > 0, this is the scale for how far away legs are from the body horizontally */
+    legStraightLength = 1f,
+    /** maximum length of an individual leg as fraction of real length */
+    legMaxLength = 1.75f,
+    /** minimum length of an individual leg as fraction of real length */
+    legMinLength = 0f,
+    /** splash damage dealt when a leg touches the ground */
+    legSplashDamage = 0f,
+    /** splash damage radius of legs */
+    legSplashRange = 5,
+    /** how straight the leg base/origin is (0 = circular, 1 = line) */
+    baseLegStraightness = 0f,
+    /** how straight the leg outward angles are (0 = circular, 1 = horizontal line) */
+    legStraightness = 0f;
+
+    /** If true, legs are locked to the base of the unit instead of being on an implicit rotating "mount". */
+    public boolean lockLegBase = false;
+    /** If true, legs always try to move around even when the unit is not moving (leads to more natural behavior) */
+    public boolean legContinuousMove;
+    /** TODO neither of these appear to do much */
+    public boolean flipBackLegs = true, flipLegSide = false;
+
+    //MECH UNITS
+
+    /** screen shake amount for when this mech lands after boosting */
+    public float mechLandShake = 0f;
+    /** parameters for mech swaying animation */
+    public float mechSideSway = 0.54f, mechFrontSway = 0.1f, mechStride = -1f;
+    /** whether particles are created when this mech takes a step */
     public boolean mechStepParticles = false;
+    /** color that legs change to when moving, to simulate depth */
     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 Sound mineSound = Sounds.minebeam;
-    public float mineSoundVolume = 0.6f;
+    //TANK UNITS
 
-    /** This is a VERY ROUGH estimate of unit DPS. */
-    public float dpsEstimate = -1;
-    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 itemOffsetY = 3f;
-    public float lightRadius = 60f, lightOpacity = 0.6f;
-    public Color lightColor = Pal.powerLight;
-    public boolean drawCell = true, drawItems = true, drawShields = true;
-    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;
+    /** list of treads as rectangles in IMAGE COORDINATES, relative to the center. these are mirrored. */
+    public Rect[] treadRects = {};
+    /** number of frames of movement in a tread */
+    public int treadFrames = 18;
+    /** how much of a top part of a tread sprite is "cut off" relative to the pattern; this is corrected for */
+    public int treadPullOffset = 0;
 
-    public ObjectSet<StatusEffect> immunities = new ObjectSet<>();
-    public Sound deathSound = Sounds.bang;
+    //SEGMENTED / CRAWL UNITS (this is WIP content!)
 
-    public Seq<Weapon> weapons = new Seq<>();
-    public TextureRegion baseRegion, legRegion, region, shadowRegion, cellRegion,
-        softShadowRegion, jointRegion, footRegion, legBaseRegion, baseJointRegion, outlineRegion;
-    public TextureRegion[] wreckRegions;
+    /** number of independent segments */
+    public int segments = 0;
+    /** magnitude of sine offset between segments */
+    public float segmentMag = 2f,
+    /** scale of sine offset between segments */
+    segmentScl = 4f,
+    /** index multiplier of sine offset between segments */
+    segmentPhase = 5f,
+    /** how fast each segment moves towards the next one */
+    segmentRotSpeed = 1f,
+    /** maximum difference between segment angles */
+    segmentMaxRot = 30f,
+    /** speed multiplier this unit will have when crawlSlowdownFrac is met. */
+    crawlSlowdown = 0.5f,
+    /** damage dealt to blocks under this tank/crawler every frame. */
+    crushDamage = 0f,
+    /** the fraction of solids under this block necessary for it to reach crawlSlowdown. */
+    crawlSlowdownFrac = 0.55f;
 
-    protected @Nullable ItemStack[] cachedRequirements;
+    //MISSILE UNITS
+
+    /** lifetime of this missile. */
+    public float lifetime = 60f * 5f;
+    /** ticks that must pass before this missile starts homing. */
+    public float homingDelay = 10f;
+
+    //REGIONS
+
+    //(undocumented, you shouldn't need to use these, and if you do just check how they're drawn and copy that)
+    public TextureRegion baseRegion, legRegion, region, previewRegion, shadowRegion, cellRegion, itemCircleRegion,
+        softShadowRegion, jointRegion, footRegion, legBaseRegion, baseJointRegion, outlineRegion, treadRegion,
+        mineLaserRegion, mineLaserEndRegion;
+    public TextureRegion[] wreckRegions, segmentRegions, segmentCellRegions, segmentOutlineRegions;
+    public TextureRegion[][] treadRegions;
+
+    //INTERNAL REQUIREMENTS
+
+    protected float buildTime = -1f;
+    protected @Nullable ItemStack[] totalRequirements, cachedRequirements, firstRequirements;
 
     public UnitType(String name){
         super(name);
 
-        constructor = EntityMapping.map(name);
+        constructor = EntityMapping.map(this.name);
+        selectionSize = 30f;
     }
 
-    public UnitController createController(){
-        return defaultController.get();
+    public UnitController createController(Unit unit){
+        return controller.get(unit);
     }
 
     public Unit create(Team team){
         Unit unit = constructor.get();
         unit.team = team;
         unit.setType(this);
+        if(unit.controller() instanceof CommandAI command && defaultCommand != null){
+            command.command = defaultCommand;
+        }
+        for(var ability : unit.abilities){
+            ability.created(unit);
+        }
         unit.ammo = ammoCapacity; //fill up on ammo upon creation
         unit.elevation = flying ? 1f : 0;
         unit.heal();
+        if(unit instanceof TimedKillc u){
+            u.lifetime(lifetime);
+        }
         return unit;
     }
 
@@ -143,32 +492,59 @@ public class UnitType extends UnlockableContent{
         return spawn(state.rules.defaultTeam, x, y);
     }
 
+    public Unit spawn(Team team, Position pos){
+        return spawn(team, pos.getX(), pos.getY());
+    }
+
+    public Unit spawn(Position pos){
+        return spawn(state.rules.defaultTeam, pos);
+    }
+
+    public Unit spawn(Position pos, Team team){
+        return spawn(team, pos);
+    }
+
     public boolean hasWeapons(){
         return weapons.size > 0;
     }
 
+    public boolean targetable(Unit unit, Team targeter){
+        return targetable || (vulnerableWithPayloads && unit instanceof Payloadc p && p.hasPayload());
+    }
+
+    public boolean hittable(Unit unit){
+        return hittable || (vulnerableWithPayloads && unit instanceof Payloadc p && p.hasPayload());
+    }
+
     public void update(Unit unit){
 
     }
 
+    public void updatePayload(Unit unit, @Nullable Unit unitHolder, @Nullable Building buildingHolder){
+
+    }
+
+    public void killed(Unit unit){}
+
     public void landed(Unit unit){}
 
     public void display(Unit unit, Table table){
         table.table(t -> {
             t.left();
-            t.add(new Image(icon(Cicon.medium))).size(8 * 4).scaling(Scaling.fit);
-            t.labelWrap(localizedName).left().width(190f).padLeft(5);
+            t.add(new Image(uiIcon)).size(iconMed).scaling(Scaling.fit);
+            t.labelWrap(unit.isPlayer() ? unit.getPlayer().coloredName() + "\n[lightgray]" + localizedName : localizedName).left().width(190f).padLeft(5);
         }).growX().left();
         table.row();
 
         table.table(bars -> {
             bars.defaults().growX().height(20f).pad(4);
 
+            //TODO overlay shields
             bars.add(new Bar("stat.health", Pal.health, unit::healthf).blink(Color.white));
             bars.row();
 
             if(state.rules.unitAmmo){
-                bars.add(new Bar(ammoType.icon + " " + Core.bundle.get("stat.ammo"), ammoType.barColor, () -> unit.ammo / ammoCapacity));
+                bars.add(new Bar(ammoType.icon() + " " + Core.bundle.get("stat.ammo"), ammoType.barColor(), () -> unit.ammo / ammoCapacity));
                 bars.row();
             }
 
@@ -176,30 +552,50 @@ public class UnitType extends UnlockableContent{
                 ability.displayBars(unit, bars);
             }
 
-            if(unit instanceof Payloadc payload){
+            if(payloadCapacity > 0 && unit instanceof Payloadc payload){
                 bars.add(new Bar("stat.payloadcapacity", Pal.items, () -> payload.payloadUsed() / unit.type().payloadCapacity));
                 bars.row();
 
                 var count = new float[]{-1};
                 bars.table().update(t -> {
-                    if(count[0] != payload.payloadUsed()) {
+                    if(count[0] != payload.payloadUsed()){
                         payload.contentInfo(t, 8 * 2, 270);
                         count[0] = payload.payloadUsed();
                     }
-                }).growX().left();
+                }).growX().left().height(0f).pad(0f);
             }
         }).growX();
 
-        if(unit.controller() instanceof LogicAI){
+        if(unit.controller() instanceof LogicAI ai){
             table.row();
-            table.add(Blocks.microProcessor.emoji() + " " + Core.bundle.get("units.processorcontrol")).growX().left();
+            table.add(Blocks.microProcessor.emoji() + " " + Core.bundle.get("units.processorcontrol")).growX().wrap().left();
+            if(ai.controller != null && (Core.settings.getBool("mouseposition") || Core.settings.getBool("position"))){
+                table.row();
+                table.add("[lightgray](" + ai.controller.tileX() + ", " + ai.controller.tileY() + ")").growX().wrap().left();
+            }
             table.row();
             table.label(() -> Iconc.settings + " " + (long)unit.flag + "").color(Color.lightGray).growX().wrap().left();
+            if(net.active() && ai.controller != null && ai.controller.lastAccessed != null){
+                table.row();
+                table.add(Core.bundle.format("lastaccessed", ai.controller.lastAccessed)).growX().wrap().left();
+            }
+        }else if(net.active() && unit.lastCommanded != null){
+            table.row();
+            table.add(Core.bundle.format("lastcommanded", unit.lastCommanded)).growX().wrap().left();
         }
-        
+
         table.row();
     }
 
+    /** @return whether this block supports a specific environment. */
+    public boolean supportsEnv(int env){
+        return (envEnabled & env) != 0 && (envDisabled & env) == 0 && (envRequired == 0 || (envRequired & env) == envRequired);
+    }
+
+    public boolean isBanned(){
+        return state.rules.isBanned(this);
+    }
+
     @Override
     public void getDependencies(Cons<UnlockableContent> cons){
         //units require reconstructors being researched
@@ -220,23 +616,23 @@ public class UnitType extends UnlockableContent{
     }
 
     @Override
-    public void setStats(){
-        Unit inst = constructor.get();
+    public boolean isHidden(){
+        return hidden;
+    }
 
+    @Override
+    public void setStats(){
         stats.add(Stat.health, health);
-        stats.add(Stat.speed, speed);
+        stats.add(Stat.armor, armor);
+        stats.add(Stat.speed, speed * 60f / tilesize, StatUnit.tilesSecond);
+        stats.add(Stat.size, StatValues.squared(hitSize / tilesize, StatUnit.blocks));
         stats.add(Stat.itemCapacity, itemCapacity);
         stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks);
-        stats.add(Stat.commandLimit, commandLimit);
+        stats.add(Stat.targetsAir, targetAir);
+        stats.add(Stat.targetsGround, targetGround);
 
         if(abilities.any()){
-            var unique = new ObjectSet<String>();
-
-            for(Ability a : abilities){
-                if(unique.add(a.localized())){
-                    stats.add(Stat.abilities, a.localized());
-                }
-            }
+            stats.add(Stat.abilities, StatValues.abilities(abilities));
         }
 
         stats.add(Stat.flying, flying);
@@ -247,57 +643,138 @@ public class UnitType extends UnlockableContent{
 
         if(mineTier >= 1){
             stats.addPercent(Stat.mineSpeed, mineSpeed);
-            stats.add(Stat.mineTier, new BlockFilterValue(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= mineTier && !f.playerUnmineable));
+            stats.add(Stat.mineTier, StatValues.drillables(mineSpeed, 1f, 1, null, b ->
+                b.itemDrop != null &&
+                (b instanceof Floor f && (((f.wallOre && mineWalls) || (!f.wallOre && mineFloor))) ||
+                (!(b instanceof Floor) && mineWalls)) &&
+                b.itemDrop.hardness <= mineTier && (!b.playerUnmineable || Core.settings.getBool("doubletapmine"))));
         }
         if(buildSpeed > 0){
             stats.addPercent(Stat.buildSpeed, buildSpeed);
         }
-        if(inst instanceof Payloadc){
-            stats.add(Stat.payloadCapacity, (payloadCapacity / (tilesize * tilesize)), StatUnit.blocksSquared);
+        if(sample instanceof Payloadc){
+            stats.add(Stat.payloadCapacity, StatValues.squared(Mathf.sqrt(payloadCapacity / (tilesize * tilesize)), StatUnit.blocks));
+        }
+
+        var reqs = getFirstRequirements();
+
+        if(reqs != null){
+            stats.add(Stat.buildCost, StatValues.items(reqs));
         }
 
         if(weapons.any()){
-            stats.add(Stat.weapons, new WeaponListValue(this, weapons));
+            stats.add(Stat.weapons, StatValues.weapons(this, weapons));
+        }
+
+        if(immunities.size > 0){
+            var imm = immunities.toSeq().sort();
+            //it's redundant to list wet for naval units
+            if(naval){
+                imm.remove(StatusEffects.wet);
+            }
+            stats.add(Stat.immunities, StatValues.statusEffects(imm));
+        }
+    }
+
+    //never actually called; it turns out certain mods have custom weapons that do not need bullets.
+    protected void validateWeapons(){
+        for(int i = 0; i < weapons.size; i++){
+            var wep = weapons.get(i);
+            if(wep.bullet == Bullets.placeholder || wep.bullet == null){
+                throw new RuntimeException("Unit: " + name + ": weapon #" + i + " ('" + wep.name + "') does not have a bullet defined. Make sure you have a bullet: (JSON) or `bullet = ` field in your unit definition.");
+            }
         }
     }
 
     @CallSuper
     @Override
     public void init(){
+        super.init();
+
         if(constructor == null) throw new IllegalArgumentException("no constructor set up for unit '" + name + "'");
 
         Unit example = constructor.get();
 
+        allowLegStep = example instanceof Legsc;
+
         //water preset
         if(example instanceof WaterMovec){
+            naval = true;
             canDrown = false;
             omniMovement = false;
             immunities.add(StatusEffects.wet);
+            if(shadowElevation < 0f){
+                shadowElevation = 0.11f;
+            }
         }
 
-        singleTarget = weapons.size <= 1;
+        if(pathCost == null){
+            pathCost =
+                naval ? ControlPathfinder.costNaval :
+                allowLegStep || example instanceof Crawlc ? ControlPathfinder.costLegs :
+                hovering ? ControlPathfinder.costHover :
+                ControlPathfinder.costGround;
+        }
+
+        pathCostId = ControlPathfinder.costTypes.indexOf(pathCost);
+        if(pathCostId == -1) pathCostId = 0;
+
+        if(flying){
+            envEnabled |= Env.space;
+        }
+
+        if(lightRadius == -1){
+            lightRadius = Math.max(60f, hitSize * 2.3f);
+        }
+
+        //if a status effects slows a unit when firing, don't shoot while moving.
+        if(autoFindTarget){
+            autoFindTarget = !weapons.contains(w -> w.shootStatus.speedMultiplier < 0.99f) || alwaysShootWhenMoving;
+        }
+
+        if(flyingLayer < 0) flyingLayer = lowAltitude ? Layer.flyingUnitLow : Layer.flyingUnit;
+        clipSize = Math.max(clipSize, lightRadius * 1.1f);
+        singleTarget = weapons.size <= 1 && !forceMultiTarget;
 
         if(itemCapacity < 0){
-            itemCapacity = Math.max(Mathf.round((int)(hitSize * 4.3), 10), 10);
+            itemCapacity = Math.max(Mathf.round((int)(hitSize * 4f), 10), 10);
         }
 
+        //assume slight range margin
+        float margin = 4f;
+
+        boolean skipWeapons = !weapons.contains(w -> !w.useAttackRange);
+
         //set up default range
         if(range < 0){
             range = Float.MAX_VALUE;
             for(Weapon weapon : weapons){
-                range = Math.min(range, weapon.bullet.range() + hitSize / 2f);
-                maxRange = Math.max(maxRange, weapon.bullet.range() + hitSize / 2f);
+                if(!weapon.useAttackRange && skipWeapons) continue;
+
+                range = Math.min(range, weapon.range() - margin);
+                maxRange = Math.max(maxRange, weapon.range() - margin);
             }
         }
 
         if(maxRange < 0){
-            maxRange = 0f;
+            maxRange = Math.max(0f, range);
 
             for(Weapon weapon : weapons){
-                maxRange = Math.max(maxRange, weapon.bullet.range() + hitSize / 2f);
+                if(!weapon.useAttackRange && skipWeapons) continue;
+
+                maxRange = Math.max(maxRange, weapon.range() - margin);
             }
         }
 
+        if(fogRadius < 0){
+            //TODO depend on range?
+            fogRadius = Math.max(58f * 3f, hitSize * 2f) / 8f;
+        }
+
+        if(weapons.isEmpty()){
+            range = maxRange = mineRange;
+        }
+
         if(mechStride < 0){
             mechStride = 4f + (hitSize -8f)/2.1f;
         }
@@ -306,27 +783,45 @@ public class UnitType extends UnlockableContent{
             aimDst = weapons.contains(w -> !w.rotate) ? hitSize * 2f : hitSize / 2f;
         }
 
-        if(mechStepShake < 0){
-            mechStepShake = Mathf.round((hitSize - 11f) / 9f);
+        if(stepShake < 0){
+            stepShake = Mathf.round((hitSize - 11f) / 9f);
             mechStepParticles = hitSize > 15f;
         }
 
-        canHeal = weapons.contains(w -> w.bullet.healPercent > 0f);
+        if(engineSize > 0){
+            engines.add(new UnitEngine(0f, -engineOffset, engineSize, -90f));
+        }
+
+        if(treadEffect == null){
+            treadEffect = new Effect(50, e -> {
+                color(Tmp.c1.set(e.color).mul(1.5f));
+                Fx.rand.setSeed(e.id);
+                for(int i = 0; i < 3; i++){
+                    Fx.v.trns(e.rotation + Fx.rand.range(40f), Fx.rand.random(6f * e.finpow()));
+                    Fill.circle(e.x + Fx.v.x + Fx.rand.range(4f), e.y + Fx.v.y + Fx.rand.range(4f), Math.min(e.fout(), e.fin() * e.lifetime / 8f) * hitSize / 28f * 3f * Fx.rand.random(0.8f, 1.1f) + 0.3f);
+                }
+            }).layer(Layer.debris);
+        }
+
+        for(Ability ab : abilities){
+            ab.init(this);
+        }
 
         //add mirrored weapon variants
         Seq<Weapon> mapped = new Seq<>();
         for(Weapon w : weapons){
+            if(w.recoilTime < 0) w.recoilTime = w.reload;
             mapped.add(w);
 
             //mirrors are copies with X values negated
             if(w.mirror){
                 Weapon copy = w.copy();
-                copy.x *= -1;
-                copy.shootX *= -1;
-                copy.flipSprite = !copy.flipSprite;
+                copy.flip();
                 mapped.add(copy);
 
-                //since there are now two weapons, the reload time must be doubled
+                //since there are now two weapons, the reload and recoil time must be doubled
+                w.recoilTime *= 2f;
+                copy.recoilTime *= 2f;
                 w.reload *= 2f;
                 copy.reload *= 2f;
 
@@ -336,47 +831,331 @@ public class UnitType extends UnlockableContent{
         }
         this.weapons = mapped;
 
+        weapons.each(Weapon::init);
+
+        canHeal = weapons.contains(w -> w.bullet.heals());
+
+        canAttack = weapons.contains(w -> !w.noAttack);
+
+        //assign default commands.
+        if(commands.size == 0){
+
+            commands.add(UnitCommand.moveCommand, UnitCommand.enterPayloadCommand);
+
+            if(canBoost){
+                commands.add(UnitCommand.boostCommand);
+
+                if(buildSpeed > 0f){
+                    commands.add(UnitCommand.rebuildCommand, UnitCommand.assistCommand);
+                }
+            }
+
+            //healing, mining and building is only supported for flying units; pathfinding to ambiguously reachable locations is hard.
+            if(flying){
+                if(canHeal){
+                    commands.add(UnitCommand.repairCommand);
+                }
+
+                if(buildSpeed > 0){
+                    commands.add(UnitCommand.rebuildCommand, UnitCommand.assistCommand);
+                }
+
+                if(mineTier > 0){
+                    commands.add(UnitCommand.mineCommand);
+                }
+                if(example instanceof Payloadc){
+                    commands.addAll(UnitCommand.loadUnitsCommand, UnitCommand.loadBlocksCommand, UnitCommand.unloadPayloadCommand, UnitCommand.loopPayloadCommand);
+                }
+            }
+        }
+
+        if(defaultCommand == null && commands.size > 0){
+            defaultCommand = commands.first();
+        }
+
+        if(stances.size == 0){
+            if(canAttack){
+                stances.addAll(UnitStance.stop, UnitStance.shoot, UnitStance.holdFire, UnitStance.pursueTarget, UnitStance.patrol);
+                if(!flying){
+                    stances.add(UnitStance.ram);
+                }
+            }else{
+                stances.addAll(UnitStance.stop, UnitStance.patrol);
+            }
+        }
+
         //dynamically create ammo capacity based on firing rate
         if(ammoCapacity < 0){
-            float shotsPerSecond = weapons.sumf(w -> 60f / w.reload);
+            float shotsPerSecond = weapons.sumf(w -> w.useAmmo ? 60f / w.reload : 0f);
             //duration of continuous fire without reload
-            float targetSeconds = 30;
+            float targetSeconds = 35;
 
             ammoCapacity = Math.max(1, (int)(shotsPerSecond * targetSeconds));
         }
 
+        estimateDps();
+
+        //only do this after everything else was initialized
+        sample = constructor.get();
+    }
+
+    public float estimateDps(){
         //calculate estimated DPS for one target based on weapons
         if(dpsEstimate < 0){
-            dpsEstimate = weapons.sumf(w -> (w.bullet.estimateDPS() / w.reload) * w.shots * 60f);
+            dpsEstimate = weapons.sumf(Weapon::dps);
 
             //suicide enemy
             if(weapons.contains(w -> w.bullet.killShooter)){
                 //scale down DPS to be insignificant
-                dpsEstimate /= 25f;
+                dpsEstimate /= 15f;
             }
         }
+
+        return dpsEstimate;
     }
 
     @CallSuper
     @Override
     public void load(){
+        super.load();
+
+        for(var part : parts){
+            part.load(name);
+        }
         weapons.each(Weapon::load);
         region = Core.atlas.find(name);
+        previewRegion = Core.atlas.find(name + "-preview", name);
         legRegion = Core.atlas.find(name + "-leg");
         jointRegion = Core.atlas.find(name + "-joint");
         baseJointRegion = Core.atlas.find(name + "-joint-base");
         footRegion = Core.atlas.find(name + "-foot");
+        treadRegion = Core.atlas.find(name + "-treads");
+        itemCircleRegion = Core.atlas.find("ring-item");
+
+        if(treadRegion.found()){
+            treadRegions = new TextureRegion[treadRects.length][treadFrames];
+            for(int r = 0; r < treadRects.length; r++){
+                for(int i = 0; i < treadFrames; i++){
+                    treadRegions[r][i] = Core.atlas.find(name + "-treads" + r + "-" + i);
+                }
+            }
+        }
         legBaseRegion = Core.atlas.find(name + "-leg-base", name + "-leg");
         baseRegion = Core.atlas.find(name + "-base");
         cellRegion = Core.atlas.find(name + "-cell", Core.atlas.find("power-cell"));
-        softShadowRegion = Core.atlas.find("circle-shadow");
+
+        mineLaserRegion = Core.atlas.find("minelaser");
+        mineLaserEndRegion = Core.atlas.find("minelaser-end");
+        //when linear filtering is on, it's acceptable to use the relatively low-res 'particle' region
+        softShadowRegion =
+            squareShape ? Core.atlas.find("square-shadow") :
+            hitSize <= 10f || (Core.settings != null && Core.settings.getBool("linear", true)) ?
+                Core.atlas.find("particle") :
+                Core.atlas.find("circle-shadow");
+
         outlineRegion = Core.atlas.find(name + "-outline");
-        shadowRegion = icon(Cicon.full);
+        shadowRegion = fullIcon;
 
         wreckRegions = new TextureRegion[3];
         for(int i = 0; i < wreckRegions.length; i++){
             wreckRegions[i] = Core.atlas.find(name + "-wreck" + i);
         }
+
+        segmentRegions = new TextureRegion[segments];
+        segmentOutlineRegions = new TextureRegion[segments];
+        segmentCellRegions = new TextureRegion[segments];
+        for(int i = 0; i < segments; i++){
+            segmentRegions[i] = Core.atlas.find(name + "-segment" + i);
+            segmentOutlineRegions[i] = Core.atlas.find(name + "-segment-outline" + i);
+            segmentCellRegions[i] = Core.atlas.find(name + "-segment-cell" + i);
+        }
+
+        clipSize = Math.max(region.width * 2f, clipSize);
+    }
+
+    public void getRegionsToOutline(Seq<TextureRegion> out){
+        for(Weapon weapon : weapons){
+            for(var part : weapon.parts){
+                part.getOutlines(out);
+            }
+        }
+        for(var part : parts){
+            part.getOutlines(out);
+        }
+    }
+
+    public boolean needsBodyOutline(){
+        return alwaysCreateOutline;
+    }
+
+    @Override
+    public void createIcons(MultiPacker packer){
+        super.createIcons(packer);
+
+        if(constructor == null) throw new IllegalArgumentException("No constructor set up for unit '" + name + "', add this argument to your units field: `constructor = UnitEntity::create`");
+
+        sample = constructor.get();
+
+        var toOutline = new Seq<TextureRegion>();
+        getRegionsToOutline(toOutline);
+
+        for(var region : toOutline){
+            if(region instanceof AtlasRegion atlas && !Core.atlas.has(atlas.name + "-outline")){
+                String regionName = atlas.name;
+                Pixmap outlined = Pixmaps.outline(Core.atlas.getPixmap(region), outlineColor, outlineRadius);
+
+                Drawf.checkBleed(outlined);
+
+                packer.add(PageType.main, regionName + "-outline", outlined);
+                outlined.dispose();
+            }
+        }
+
+        if(outlines){
+            Seq<TextureRegion> outlineSeq = Seq.with(region, jointRegion, footRegion, baseJointRegion, legRegion, treadRegion);
+            if(Core.atlas.has(name + "-leg-base")){
+                outlineSeq.add(legBaseRegion);
+            }
+
+            //note that mods with these regions already outlined will have *two* outlines made, which is... undesirable
+            for(var outlineTarget : outlineSeq){
+                if(!outlineTarget.found()) continue;
+
+                makeOutline(PageType.main, packer, outlineTarget, alwaysCreateOutline && region == outlineTarget, outlineColor, outlineRadius);
+            }
+
+            if(sample instanceof Crawlc){
+                for(int i = 0; i < segments; i++){
+                    makeOutline(packer, segmentRegions[i], name + "-segment-outline" + i, outlineColor, outlineRadius);
+                }
+            }
+
+            for(Weapon weapon : weapons){
+                if(!weapon.name.isEmpty() && (minfo.mod == null || weapon.name.startsWith(minfo.mod.name)) && (weapon.top || !packer.isOutlined(weapon.name) || weapon.parts.contains(p -> p.under))){
+                    makeOutline(PageType.main, packer, weapon.region, !weapon.top || weapon.parts.contains(p -> p.under), outlineColor, outlineRadius);
+                }
+            }
+        }
+
+        if(sample instanceof Tankc){
+            PixmapRegion pix = Core.atlas.getPixmap(treadRegion);
+
+            for(int r = 0; r < treadRects.length; r++){
+                Rect treadRect = treadRects[r];
+                //slice is always 1 pixel wide
+                Pixmap slice = pix.crop((int)(treadRect.x + pix.width/2f), (int)(treadRect.y + pix.height/2f), 1, (int)treadRect.height);
+                int frames = treadFrames;
+                for(int i = 0; i < frames; i++){
+                    int pullOffset = treadPullOffset;
+                    Pixmap frame = new Pixmap(slice.width, slice.height);
+                    for(int y = 0; y < slice.height; y++){
+                        int idx = y + i;
+                        if(idx >= slice.height){
+                            idx -= slice.height;
+                            idx += pullOffset;
+                            idx = Mathf.mod(idx, slice.height);
+                        }
+
+                        frame.setRaw(0, y, slice.getRaw(0, idx));
+                    }
+
+                    packer.add(PageType.main, name + "-treads" + r + "-" + i, frame);
+                    frame.dispose();
+                }
+                slice.dispose();
+            }
+        }
+    }
+
+    /** @return the time required to build this unit, as a value that takes into account reconstructors */
+    public float getBuildTime(){
+        getTotalRequirements();
+        return buildTime;
+    }
+
+    /** @return all items needed to build this unit, including reconstructor steps. */
+    public ItemStack[] getTotalRequirements(){
+        if(totalRequirements == null){
+            UnitType[] ret = {null};
+            float[] timeret = {0f};
+            ItemStack[] result = getRequirements(ret, timeret);
+
+            //prevents stack overflow if requirements are circular and result != null
+            totalRequirements = ItemStack.empty;
+
+            if(result != null){
+                ItemSeq total = new ItemSeq();
+
+                total.add(result);
+                if(ret[0] != null){
+                    total.add(ret[0].getTotalRequirements());
+                }
+                totalRequirements = total.toArray();
+            }
+
+            for(var stack : totalRequirements){
+                buildTime += stack.item.cost * stack.amount;
+            }
+        }
+        return totalRequirements;
+    }
+
+    /** @return item requirements based on reconstructors or factories found; returns previous unit in array if provided */
+    public @Nullable ItemStack[] getRequirements(@Nullable UnitType[] prevReturn, @Nullable float[] timeReturn){
+        //find reconstructor
+        var rec = (Reconstructor)content.blocks().find(b -> b instanceof Reconstructor re && re.upgrades.contains(u -> u[1] == this));
+
+        if(rec != null && rec.findConsumer(i -> i instanceof ConsumeItems) instanceof ConsumeItems ci){
+            if(prevReturn != null){
+                prevReturn[0] = rec.upgrades.find(u -> u[1] == this)[0];
+            }
+            if(timeReturn != null){
+                timeReturn[0] = rec.constructTime;
+            }
+            return ci.items;
+        }else{
+            //find a factory
+            var factory = (UnitFactory)content.blocks().find(u -> u instanceof UnitFactory uf && uf.plans.contains(p -> p.unit == this));
+            if(factory != null){
+
+                var plan = factory.plans.find(p -> p.unit == this);
+                if(timeReturn != null){
+                    timeReturn[0] = plan.time;
+                }
+                return plan.requirements;
+            }else{
+                //find an assembler
+                var assembler = (UnitAssembler)content.blocks().find(u -> u instanceof UnitAssembler a && a.plans.contains(p -> p.unit == this));
+                if(assembler != null){
+                    var plan = assembler.plans.find(p -> p.unit == this);
+
+                    if(timeReturn != null){
+                        timeReturn[0] = plan.time;
+                    }
+                    ItemSeq reqs = new ItemSeq();
+                    for(var bstack : plan.requirements){
+                        if(bstack.item instanceof Block block){
+                            for(var stack : block.requirements){
+                                reqs.add(stack.item, stack.amount * bstack.amount);
+                            }
+                        }else if(bstack.item instanceof UnitType unit){
+                            for(var stack : unit.getTotalRequirements()){
+                                reqs.add(stack.item, stack.amount * bstack.amount);
+                            }
+                        }
+                    }
+                    return reqs.toArray();
+                }
+            }
+        }
+        return null;
+    }
+
+    public @Nullable ItemStack[] getFirstRequirements(){
+        if(firstRequirements == null){
+            firstRequirements = getRequirements(null, null);
+        }
+        return firstRequirements;
     }
 
     @Override
@@ -385,26 +1164,17 @@ public class UnitType extends UnlockableContent{
             return cachedRequirements;
         }
 
-        ItemStack[] stacks = null;
-
-        //calculate costs based on reconstructors or factories found
-        Block rec = content.blocks().find(b -> b instanceof Reconstructor re && re.upgrades.contains(u -> u[1] == this));
-
-        if(rec != null && rec.consumes.has(ConsumeType.item) && rec.consumes.get(ConsumeType.item) instanceof ConsumeItems ci){
-            stacks = ci.items;
-        }else{
-            UnitFactory factory = (UnitFactory)content.blocks().find(u -> u instanceof UnitFactory uf && uf.plans.contains(p -> p.unit == this));
-            if(factory != null){
-                stacks = factory.plans.find(p -> p.unit == this).requirements;
-            }
-        }
+        ItemStack[] stacks = getRequirements(null, null);
 
         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)));
+                out[i] = new ItemStack(stacks[i].item, UI.roundAmount((int)(Math.pow(stacks[i].amount, 1.1) * researchCostMultiplier)));
             }
 
+            //remove zero-requirements for automatic unlocks
+            out = Structs.filter(ItemStack.class, out, stack -> stack.amount > 0);
+
             cachedRequirements = out;
 
             return out;
@@ -413,22 +1183,62 @@ public class UnitType extends UnlockableContent{
         return super.researchRequirements();
     }
 
+    @Override
+    public double sense(LAccess sensor){
+        return switch(sensor){
+            case health, maxHealth -> health;
+            case size -> hitSize / tilesize;
+            case itemCapacity -> itemCapacity;
+            case speed -> speed * 60f / tilesize;
+            case payloadCapacity -> sample instanceof Payloadc ? payloadCapacity / tilePayload : 0f;
+            case id -> getLogicId();
+            default -> Double.NaN;
+        };
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        if(sensor == LAccess.name) return name;
+        return noSensed;
+    }
+
     @Override
     public ContentType getContentType(){
         return ContentType.unit;
     }
 
+    /** Sets up engines, mirroring the contents of the specified array. */
+    public void setEnginesMirror(UnitEngine... array){
+        for(var base : array){
+            engines.add(base);
+
+            var engine = base.copy();
+            engine.x *= -1;
+            engine.rotation = 180f - engine.rotation;
+            if(engine.rotation < 0) engine.rotation += 360f;
+            engines.add(engine);
+        }
+    }
+
     //region drawing
 
     public void draw(Unit unit){
+        if(unit.inFogTo(Vars.player.team())) return;
+
+        unit.drawBuilding();
+
+        drawMining(unit);
+
+        boolean isPayload = !unit.isAdded();
+
         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);
+        float z = isPayload ? Draw.z() : (unit.elevation > 0.5f ? flyingLayer : groundLayer) + Mathf.clamp(hitSize / 4000f, 0, 0.01f);
 
         if(unit.controller().isBeingControlled(player.unit())){
             drawControl(unit);
         }
 
-        if(unit.isFlying() || visualElevation > 0){
+        if(!isPayload && (unit.isFlying() || shadowElevation > 0)){
             Draw.z(Math.min(Layer.darkness, z - 1f));
             drawShadow(unit);
         }
@@ -447,7 +1257,11 @@ public class UnitType extends UnlockableContent{
             unit.trns(legOffset.x, legOffset.y);
         }
 
-        if(unit instanceof Legsc){
+        if(unit instanceof Tankc){
+            drawTank((Unit & Tankc)unit);
+        }
+
+        if(unit instanceof Legsc && !isPayload){
             drawLegs((Unit & Legsc)unit);
         }
 
@@ -459,34 +1273,98 @@ public class UnitType extends UnlockableContent{
 
         drawSoftShadow(unit);
 
-        Draw.z(z - outlineSpace);
-
-        drawOutline(unit);
-
         Draw.z(z);
-        if(engineSize > 0) drawEngine(unit);
-        drawBody(unit);
-        if(drawCell) drawCell(unit);
+
+        if(unit instanceof Crawlc c){
+            drawCrawl(c);
+        }
+
+        if(drawBody) drawOutline(unit);
+        drawWeaponOutlines(unit);
+        if(engineLayer > 0) Draw.z(engineLayer);
+        if(trailLength > 0 && !naval && (unit.isFlying() || !useEngineElevation)){
+            drawTrail(unit);
+        }
+        if(engines.size > 0) drawEngines(unit);
+        Draw.z(z);
+        if(drawBody) drawBody(unit);
+        if(drawCell && !(unit instanceof Crawlc)) drawCell(unit);
         drawWeapons(unit);
         if(drawItems) drawItems(unit);
-        drawLight(unit);
+        if(!isPayload){
+            drawLight(unit);
+        }
 
         if(unit.shieldAlpha > 0 && drawShields){
             drawShield(unit);
         }
 
+        //TODO how/where do I draw under?
+        if(parts.size > 0){
+            for(int i = 0; i < parts.size; i++){
+                var part = parts.get(i);
+
+                WeaponMount mount = unit.mounts.length > part.weaponIndex ? unit.mounts[part.weaponIndex] : null;
+                if(mount != null){
+                    DrawPart.params.set(mount.warmup, mount.reload / mount.weapon.reload, mount.smoothReload, mount.heat, mount.recoil, mount.charge, unit.x, unit.y, unit.rotation);
+                }else{
+                    DrawPart.params.set(0f, 0f, 0f, 0f, 0f, 0f, unit.x, unit.y, unit.rotation);
+                }
+
+                if(unit instanceof Scaled s){
+                    DrawPart.params.life = s.fin();
+                }
+
+                applyColor(unit);
+                part.draw(DrawPart.params);
+            }
+        }
+
+        if(!isPayload){
+            for(Ability a : unit.abilities){
+                Draw.reset();
+                a.draw(unit);
+            }
+        }
+
         if(mech != null){
             unit.trns(-legOffset.x, -legOffset.y);
         }
 
-        if(unit.abilities.size > 0){
-            for(Ability a : unit.abilities){
-                Draw.reset();
-                a.draw(unit);
-            }
+        Draw.reset();
+    }
 
-            Draw.reset();
+    //...where do I put this
+    public Color shieldColor(Unit unit){
+        return shieldColor == null ? unit.team.color : shieldColor;
+    }
+
+
+    public void drawMining(Unit unit){
+        if(!unit.mining()) return;
+        float focusLen = unit.hitSize / 2f + Mathf.absin(Time.time, 1.1f, 0.5f);
+        float swingScl = 12f, swingMag = tilesize / 8f;
+        float flashScl = 0.3f;
+
+        float px = unit.x + Angles.trnsx(unit.rotation, focusLen);
+        float py = unit.y + Angles.trnsy(unit.rotation, focusLen);
+
+        float ex = unit.mineTile.worldx() + Mathf.sin(Time.time + 48, swingScl, swingMag);
+        float ey = unit.mineTile.worldy() + Mathf.sin(Time.time + 48, swingScl + 2f, swingMag);
+
+        Draw.z(Layer.flyingUnit + 0.1f);
+
+        Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time, 0.5f, flashScl));
+
+        Draw.alpha(Renderer.unitLaserOpacity);
+        Drawf.laser(mineLaserRegion, mineLaserEndRegion, px, py, ex, ey, 0.75f);
+
+        if(unit.isLocal()){
+            Lines.stroke(1f, Pal.accent);
+            Lines.poly(unit.mineTile.worldx(), unit.mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time);
         }
+
+        Draw.color();
     }
 
     public <T extends Unit & Payloadc> void drawPayload(T unit){
@@ -500,11 +1378,14 @@ public class UnitType extends UnlockableContent{
     public void drawShield(Unit unit){
         float alpha = unit.shieldAlpha();
         float radius = unit.hitSize() * 1.3f;
-        Fill.light(unit.x, unit.y, Lines.circleVertices(radius), radius, Tmp.c1.set(Pal.shieldIn), Tmp.c2.set(Pal.shield).lerp(Color.white, Mathf.clamp(unit.hitTime() / 2f)).a(Pal.shield.a * alpha));
+        Fill.light(unit.x, unit.y, Lines.circleVertices(radius), radius,
+            Color.clear,
+            Tmp.c2.set(unit.type.shieldColor(unit)).lerp(Color.white, Mathf.clamp(unit.hitTime() / 2f)).a(0.7f * alpha)
+        );
     }
 
     public void drawControl(Unit unit){
-        Draw.z(Layer.groundUnit - 2);
+        Draw.z(unit.isFlying() ? Layer.flyingUnitLow : Layer.groundUnit - 2);
 
         Draw.color(Pal.accent, Color.white, Mathf.absin(4f, 0.3f));
         Lines.poly(unit.x, unit.y, 4, unit.hitSize + 1.5f);
@@ -513,17 +1394,32 @@ public class UnitType extends UnlockableContent{
     }
 
     public void drawShadow(Unit unit){
-        Draw.color(Pal.shadow);
-        float e = Math.max(unit.elevation, visualElevation);
+        float e = Mathf.clamp(unit.elevation, shadowElevation, 1f) * shadowElevationScl * (1f - unit.drownTime);
+        float x = unit.x + shadowTX * e, y = unit.y + shadowTY * e;
+        Floor floor = world.floorWorld(x, y);
+
+        float dest = floor.canShadow ? 1f : 0f;
+        //yes, this updates state in draw()... which isn't a problem, because I don't want it to be obvious anyway
+        unit.shadowAlpha = unit.shadowAlpha < 0 ? dest : Mathf.approachDelta(unit.shadowAlpha, dest, 0.11f);
+        Draw.color(Pal.shadow, Pal.shadow.a * unit.shadowAlpha);
+
         Draw.rect(shadowRegion, unit.x + shadowTX * e, unit.y + shadowTY * e, unit.rotation - 90);
         Draw.color();
     }
 
     public void drawSoftShadow(Unit unit){
-        Draw.color(0, 0, 0, 0.4f);
+        drawSoftShadow(unit, 1f);
+    }
+
+    public void drawSoftShadow(Unit unit, float alpha){
+        drawSoftShadow(unit.x, unit.y, unit.rotation, alpha);
+    }
+
+    public void drawSoftShadow(float x, float y, float rotation, float alpha){
+        Draw.color(0, 0, 0, 0.4f * alpha);
         float rad = 1.6f;
-        float size = Math.max(region.width, region.height) * Draw.scl;
-        Draw.rect(softShadowRegion, unit, size * rad, size * rad);
+        float size = Math.max(region.width, region.height) * region.scl();
+        Draw.rect(softShadowRegion, x, y, size * rad * Draw.xscl, size * rad * Draw.yscl, rotation - 90);
         Draw.color();
     }
 
@@ -532,23 +1428,24 @@ public class UnitType extends UnlockableContent{
 
         //draw back items
         if(unit.item() != null && unit.itemTime > 0.01f){
-            float size = (itemSize + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime;
+            float sin = Mathf.absin(Time.time, 5f, 1f);
+            float size = (itemSize + sin) * unit.itemTime;
 
-            Draw.mixcol(Pal.accent, Mathf.absin(Time.time, 5f, 0.5f));
-            Draw.rect(unit.item().icon(Cicon.medium),
+            Draw.mixcol(Pal.accent, sin * 0.1f);
+            Draw.rect(unit.item().fullIcon,
             unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
             unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY),
             size, size, unit.rotation);
-
             Draw.mixcol();
 
-            Lines.stroke(1f, Pal.accent);
-            Lines.circle(
+            size = ((3f + sin) * unit.itemTime + 0.5f) * 2;
+            Draw.color(Pal.accent);
+            Draw.rect(itemCircleRegion,
             unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
             unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY),
-            (3f + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime);
+            size, size);
 
-            if(unit.isLocal() && !renderer.pixelator.enabled()){
+            if(unit.isLocal() && !renderer.pixelate){
                 Fonts.outline.draw(unit.stack.amount + "",
                 unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
                 unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY) - 3,
@@ -560,29 +1457,21 @@ public class UnitType extends UnlockableContent{
         }
     }
 
-    public void drawEngine(Unit unit){
-        if(!unit.isFlying()) return;
+    public void drawTrail(Unit unit){
+        if(unit.trail == null){
+            unit.trail = new Trail(trailLength);
+        }
+        Trail trail = unit.trail;
+        trail.draw(trailColor == null ? unit.team.color : trailColor, (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f) * (useEngineElevation ? unit.elevation : 1f)) * trailScl);
+    }
 
-        float scale = unit.elevation;
-        float offset = engineOffset/2f + engineOffset/2f*scale;
+    public void drawEngines(Unit unit){
+        if((useEngineElevation ? unit.elevation : 1f) <= 0.0001f) return;
 
-        if(unit instanceof Trailc){
-            Trail trail = ((Trailc)unit).trail();
-            trail.draw(unit.team.color, (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f) * scale) * trailScl);
+        for(var engine : engines){
+            engine.draw(unit);
         }
 
-        Draw.color(unit.team.color);
-        Fill.circle(
-            unit.x + Angles.trnsx(unit.rotation + 180, offset),
-            unit.y + Angles.trnsy(unit.rotation + 180, offset),
-            (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) * scale
-        );
-        Draw.color(Color.white);
-        Fill.circle(
-            unit.x + Angles.trnsx(unit.rotation + 180, offset - 1f),
-            unit.y + Angles.trnsy(unit.rotation + 180, offset - 1f),
-            (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) / 2f  * scale
-        );
         Draw.color();
     }
 
@@ -590,48 +1479,26 @@ public class UnitType extends UnlockableContent{
         applyColor(unit);
 
         for(WeaponMount mount : unit.mounts){
-            Weapon weapon = mount.weapon;
+            mount.weapon.draw(unit, mount);
+        }
 
-            float rotation = unit.rotation - 90;
-            float weaponRotation  = rotation + (weapon.rotate ? mount.rotation : 0);
-            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);
+        Draw.reset();
+    }
 
-            if(weapon.shadow > 0){
-                Drawf.shadow(wx, wy, weapon.shadow);
-            }
+    public void drawWeaponOutlines(Unit unit){
+        applyColor(unit);
+        applyOutlineColor(unit);
 
-            if(weapon.outlineRegion.found()){
+        for(WeaponMount mount : unit.mounts){
+            if(!mount.weapon.top){
+                //apply layer offset, roll it back at the end
                 float z = Draw.z();
-                if(!weapon.top) Draw.z(z - outlineSpace);
+                Draw.z(z + mount.weapon.layerOffset);
 
-                Draw.rect(weapon.outlineRegion,
-                wx, wy,
-                weapon.outlineRegion.width * Draw.scl * -Mathf.sign(weapon.flipSprite),
-                weapon.region.height * Draw.scl,
-                weaponRotation);
+                mount.weapon.drawOutline(unit, mount);
 
                 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();
@@ -641,7 +1508,10 @@ public class UnitType extends UnlockableContent{
         Draw.reset();
 
         if(Core.atlas.isFound(outlineRegion)){
+            applyColor(unit);
+            applyOutlineColor(unit);
             Draw.rect(outlineRegion, unit.x, unit.y, unit.rotation - 90);
+            Draw.reset();
         }
     }
 
@@ -662,60 +1532,93 @@ public class UnitType extends UnlockableContent{
     }
 
     public Color cellColor(Unit unit){
-        return Tmp.c1.set(Color.black).lerp(unit.team.color, unit.healthf() + Mathf.absin(Time.time, Math.max(unit.healthf() * 5f, 1f), 1f - unit.healthf()));
+        float f = Mathf.clamp(unit.healthf());
+        return Tmp.c1.set(Color.black).lerp(unit.team.color, f + Mathf.absin(Time.time, Math.max(f * 5f, 1f), 1f - f));
     }
 
     public void drawLight(Unit unit){
         if(lightRadius > 0){
-            Drawf.light(unit.team, unit.x, unit.y, lightRadius, lightColor, lightOpacity);
+            Drawf.light(unit.x, unit.y, lightRadius, lightColor, lightOpacity);
+        }
+    }
+
+    public <T extends Unit & Tankc> void drawTank(T unit){
+        applyColor(unit);
+        Draw.rect(treadRegion, unit.x, unit.y, unit.rotation - 90);
+
+        if(treadRegion.found()){
+            int frame = (int)(unit.treadTime()) % treadFrames;
+            for(int i = 0; i < treadRects.length; i ++){
+                var region = treadRegions[i][frame];
+                var treadRect = treadRects[i];
+                float xOffset = -(treadRect.x + treadRect.width/2f);
+                float yOffset = -(treadRect.y + treadRect.height/2f);
+
+                for(int side : Mathf.signs){
+                    Tmp.v1.set(xOffset * side, yOffset).rotate(unit.rotation - 90);
+                    Draw.rect(region, unit.x + Tmp.v1.x / 4f, unit.y + Tmp.v1.y / 4f, treadRect.width / 4f, region.height * region.scale / 4f, unit.rotation - 90);
+                }
+            }
         }
     }
 
     public <T extends Unit & Legsc> void drawLegs(T unit){
         applyColor(unit);
+        Tmp.c3.set(Draw.getMixColor());
 
         Leg[] legs = unit.legs();
 
-        float ssize = footRegion.width * Draw.scl * 1.5f;
+        float ssize = footRegion.width * footRegion.scl() * 1.5f;
         float rotation = unit.baseRotation();
+        float invDrown = 1f - unit.drownTime;
 
-        for(Leg leg : legs){
-            Drawf.shadow(leg.base.x, leg.base.y, ssize);
+        if(footRegion.found()){
+            for(Leg leg : legs){
+                Drawf.shadow(leg.base.x, leg.base.y, ssize, invDrown);
+            }
         }
 
         //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;
             int flips = Mathf.sign(flip);
 
-            Vec2 position = legOffset.trns(angle, legBaseOffset).add(unit);
+            Vec2 position = unit.legOffset(legOffset, i).add(unit);
 
             Tmp.v1.set(leg.base).sub(leg.joint).inv().setLength(legExtension);
 
-            if(leg.moving && visualElevation > 0){
-                float scl = visualElevation;
+            if(footRegion.found() && leg.moving && shadowElevation > 0){
+                float scl = shadowElevation * invDrown;
                 float elev = Mathf.slope(1f - leg.stage) * scl;
                 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));
+            Draw.mixcol(Tmp.c3, Tmp.c3.a);
 
-            Lines.stroke(legRegion.height * Draw.scl * flips);
+            if(footRegion.found()){
+                Draw.rect(footRegion, leg.base.x, leg.base.y, position.angleTo(leg.base));
+            }
+
+            Lines.stroke(legRegion.height * legRegion.scl() * flips);
             Lines.line(legRegion, position.x, position.y, leg.joint.x, leg.joint.y, false);
 
-            Lines.stroke(legBaseRegion.height * Draw.scl * flips);
+            Lines.stroke(legBaseRegion.height * legRegion.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);
             }
+        }
 
-            if(baseJointRegion.found()){
+        //base joints are drawn after everything else
+        if(baseJointRegion.found()){
+            for(int j = legs.length - 1; j >= 0; j--){
+                //TODO does the index / draw order really matter?
+                Vec2 position = unit.legOffset(legOffset, (j % 2 == 0 ? j/2 : legs.length - 1 - j/2)).add(unit);
                 Draw.rect(baseJointRegion, position.x, position.y, rotation);
             }
         }
@@ -727,6 +1630,41 @@ public class UnitType extends UnlockableContent{
         Draw.reset();
     }
 
+    //TODO
+    public void drawCrawl(Crawlc crawl){
+        Unit unit = (Unit)crawl;
+        applyColor(unit);
+
+        //change to 2 TODO
+        for(int p = 0; p < 2; p++){
+            TextureRegion[] regions = p == 0 ? segmentOutlineRegions : segmentRegions;
+
+            for(int i = 0; i < segments; i++){
+                float trns = Mathf.sin(crawl.crawlTime() + i * segmentPhase, segmentScl, segmentMag);
+
+                //at segment 0, rotation = segmentRot, but at the last segment it is rotation
+                float rot = Mathf.slerp(crawl.segmentRot(), unit.rotation, i / (float)(segments - 1));
+                float tx = Angles.trnsx(rot, trns), ty = Angles.trnsy(rot, trns);
+
+                //shadow
+                Draw.color(0f, 0f, 0f, 0.2f);
+                //Draw.rect(regions[i], unit.x + tx + 2f, unit.y + ty - 2f, rot - 90);
+
+                applyColor(unit);
+
+                //TODO merge outlines?
+                Draw.rect(regions[i], unit.x + tx, unit.y + ty, rot - 90);
+
+                // Draws the cells
+                if(drawCell && p != 0 && segmentCellRegions[i].found()){
+                    Draw.color(cellColor(unit));
+                    Draw.rect(segmentCellRegions[i], unit.x + tx, unit.y + ty, rot - 90);
+                    Draw.reset();
+                }
+            }
+        }
+    }
+
     public void drawMech(Mechc mech){
         Unit unit = (Unit)mech;
 
@@ -750,15 +1688,15 @@ public class UnitType extends UnlockableContent{
             Draw.rect(legRegion,
             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,
+            legRegion.width * legRegion.scl() * i,
+            legRegion.height * legRegion.scl() * (1 - Math.max(-sin * i, 0) * 0.5f),
             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);
+        if(unit.lastDrownFloor != null){
+            Draw.color(Color.white, Tmp.c1.set(unit.lastDrownFloor.mapColor).mul(0.83f), unit.drownTime * 0.9f);
         }else{
             Draw.color(Color.white);
         }
@@ -768,13 +1706,87 @@ public class UnitType extends UnlockableContent{
         Draw.mixcol();
     }
 
+    public void applyOutlineColor(Unit unit){
+        if(unit.drownTime > 0 && unit.lastDrownFloor != null){
+            Draw.color(Color.white, Tmp.c1.set(unit.lastDrownFloor.mapColor).mul(0.8f), unit.drownTime * 0.9f);
+        }
+    }
+
     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);
+        if(healFlash){
+            Tmp.c1.set(Color.white).lerp(healColor, Mathf.clamp(unit.healTime - unit.hitTime));
+        }
+        Draw.mixcol(Tmp.c1, Math.max(unit.hitTime, !healFlash ? 0f : Mathf.clamp(unit.healTime)));
+
+        if(unit.drownTime > 0 && unit.lastDrownFloor != null){
+            Draw.mixcol(Tmp.c1.set(unit.lastDrownFloor.mapColor).mul(0.83f), unit.drownTime * 0.9f);
+        }
+        //this is horribly scuffed.
+        if(renderer != null && renderer.overlays != null){
+            renderer.overlays.checkApplySelection(unit);
         }
     }
 
     //endregion
+
+    public static class UnitEngine implements Cloneable{
+        public float x, y, radius, rotation;
+
+        public UnitEngine(float x, float y, float radius, float rotation){
+            this.x = x;
+            this.y = y;
+            this.radius = radius;
+            this.rotation = rotation;
+        }
+
+        public UnitEngine(){
+        }
+
+        public void draw(Unit unit){
+            UnitType type = unit.type;
+            float scale = type.useEngineElevation ? unit.elevation : 1f;
+
+            if(scale <= 0.0001f) return;
+
+            float rot = unit.rotation - 90;
+            Color color = type.engineColor == null ? unit.team.color : type.engineColor;
+
+            Tmp.v1.set(x, y).rotate(rot);
+            float ex = Tmp.v1.x, ey = Tmp.v1.y;
+
+            //engine outlines (cursed?)
+            /*float z = Draw.z();
+            Draw.z(z - 0.0001f);
+            Draw.color(type.outlineColor);
+            Fill.circle(
+            unit.x + ex,
+            unit.y + ey,
+            (type.outlineRadius * Draw.scl + radius + Mathf.absin(Time.time, 2f, radius / 4f)) * scale
+            );
+            Draw.z(z);*/
+
+            Draw.color(color);
+            Fill.circle(
+            unit.x + ex,
+            unit.y + ey,
+            (radius + Mathf.absin(Time.time, 2f, radius / 4f)) * scale
+            );
+            Draw.color(type.engineColorInner);
+            Fill.circle(
+            unit.x + ex - Angles.trnsx(rot + rotation, 1f),
+            unit.y + ey - Angles.trnsy(rot + rotation, 1f),
+            (radius + Mathf.absin(Time.time, 2f, radius / 4f)) / 2f  * scale
+            );
+        }
+
+        public UnitEngine copy(){
+            try{
+                return (UnitEngine)clone();
+            }catch(CloneNotSupportedException awful){
+                throw new RuntimeException("fantastic", awful);
+            }
+        }
+    }
+
 }
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index f98150c85d..d097677d3c 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -2,74 +2,128 @@ package mindustry.type;
 
 import arc.*;
 import arc.audio.*;
+import arc.func.*;
 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.ai.types.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.audio.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
+import mindustry.entities.part.*;
+import mindustry.entities.pattern.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.io.*;
+import mindustry.world.meta.*;
 
-public class Weapon{
+import static mindustry.Vars.*;
+
+public class Weapon implements Cloneable{
     /** displayed weapon region */
-    public String name = "";
+    public String name;
     /** bullet shot */
-    public BulletType bullet;
+    public BulletType bullet = Bullets.placeholder;
     /** shell ejection effect */
     public Effect ejectEffect = Fx.none;
+    /** whether weapon should appear in the stats of a unit with this weapon */
+    public boolean display = true;
+    /** whether to consume ammo when ammo is enabled in rules */
+    public boolean useAmmo = true;
     /** whether to create a flipped copy of this weapon upon initialization. default: true */
     public boolean mirror = true;
-    /** whether to flip the weapon's sprite when rendering */
+    /** whether to flip the weapon's sprite when rendering. internal use only - do not set! */
     public boolean flipSprite = false;
     /** whether to shoot the weapons in different arms one after another, rather than all at once; only valid when mirror = true */
     public boolean alternate = true;
     /** whether to rotate toward the target independently of unit */
     public boolean rotate = false;
+    /** Whether to show the sprite of the weapon in the database. */
+    public boolean showStatSprite = true;
+    /** rotation at which this weapon starts at. TODO buggy!*/
+    public float baseRotation = 0f;
     /** whether to draw the outline on top. */
     public boolean top = true;
-    /** whether to hold the bullet in place while firing */
+    /** whether to hold the bullet in place while firing; it will still require reload. */
     public boolean continuous;
+    /** whether this weapon uses continuous fire without reloading; implies continuous = true */
+    public boolean alwaysContinuous;
+    /** Speed at which the turret can change its bullet "aim" distance. This is only used for point laser bullets. */
+    public float aimChangeSpeed = Float.POSITIVE_INFINITY;
+    /** whether this weapon can be aimed manually by players */
+    public boolean controllable = true;
+    /** whether this weapon can be automatically aimed by the unit */
+    public boolean aiControllable = true;
+    /** whether this weapon is always shooting, regardless of targets ore cone */
+    public boolean alwaysShooting = false;
+    /** whether to automatically target relevant units in update(); only works when controllable = false. */
+    public boolean autoTarget = false;
+    /** whether to perform target trajectory prediction */
+    public boolean predictTarget = true;
+    /** if true, this weapon is used for attack range calculations */
+    public boolean useAttackRange = true;
+    /** ticks to wait in-between targets */
+    public float targetInterval = 40f, targetSwitchInterval = 70f;
     /** rotation speed of weapon when rotation is enabled, in degrees/t*/
     public float rotateSpeed = 20f;
     /** weapon reload in frames */
-    public float reload;
-    /** amount of shots per fire */
-    public int shots = 1;
-    /** spacing in degrees between multiple shots, if applicable */
-    public float spacing = 0;
+    public float reload = 1;
     /** inaccuracy of degrees of each shot */
     public float inaccuracy = 0f;
     /** intensity and duration of each shot's screen shake */
     public float shake = 0f;
     /** visual weapon knockback. */
     public float recoil = 1.5f;
+    /** Number of additional counters for recoil. */
+    public int recoils = -1;
+    /** time taken for weapon to return to starting position in ticks. uses reload time by default */
+    public float recoilTime = -1f;
+    /** power curve applied to visual recoil */
+    public float recoilPow = 1.8f;
+    /** ticks to cool down the heat region */
+    public float cooldownTime = 20f;
     /** projectile/effect offsets from center of 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 */
+    /** Random spread on the X axis. */
     public float xRand = 0f;
+    /** pattern used for bullets */
+    public ShootPattern shoot = new ShootPattern();
     /** radius of shadow drawn under the weapon; <0 to disable */
     public float shadow = -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;
+    /** Cone in which the weapon can rotate relative to its mount. */
+    public float rotationLimit = 361f;
+    /** minimum weapon warmup before firing (this is not linear, do NOT use 1!) */
+    public float minWarmup = 0f;
+    /** lerp speed for shoot warmup, only used for parts */
+    public float shootWarmupSpeed = 0.1f, smoothReloadSpeed = 0.15f;
+    /** If true, shoot warmup is linear instead of a curve. */
+    public boolean linearWarmup = false;
     /** random sound pitch range */
     public float soundPitchMin = 0.8f, soundPitchMax = 1f;
     /** whether shooter rotation is ignored when shooting. */
     public boolean ignoreRotation = false;
+    /** If true, this weapon cannot be used to attack targets. */
+    public boolean noAttack = false;
     /** min velocity required for this weapon to shoot */
     public float minShootVelocity = -1f;
+    /** should the shoot effects follow the unit (effects need followParent set to true for this to work) */
+    public boolean parentizeEffects;
     /** internal value used for alternation - do not change! */
     public int otherSide = -1;
+    /** draw Z offset relative to the default value */
+    public float layerOffset = 0f;
     /** sound used for shooting */
     public Sound shootSound = Sounds.pew;
     /** sound used for weapons that have a delay */
@@ -80,14 +134,22 @@ public class Weapon{
     public TextureRegion region;
     /** heat region, must be same size as region (optional) */
     public TextureRegion heatRegion;
+    /** cell region, must be same size as region (optional) */
+    public TextureRegion cellRegion;
     /** 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;
+    /** type of weapon mount to be used */
+    public Func<Weapon, WeaponMount> mountType = WeaponMount::new;
     /** status effect duration when shot */
     public float shootStatusDuration = 60f * 5f;
+    /** whether this weapon should fire when its owner dies */
+    public boolean shootOnDeath = false;
+    /** extra animated parts */
+    public Seq<DrawPart> parts = new Seq<>(DrawPart.class);
 
     public Weapon(String name){
         this.name = name;
@@ -97,16 +159,411 @@ public class Weapon{
         this("");
     }
 
+    public boolean hasStats(UnitType u){
+        return display;
+    }
+
+    public void addStats(UnitType u, Table t){
+        if(inaccuracy > 0){
+            t.row();
+            t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized());
+        }
+        if(!alwaysContinuous && reload > 0 && !bullet.killShooter){
+            t.row();
+            t.add("[lightgray]" + Stat.reload.localized() + ": " + (mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / reload * shoot.shots, 2) + " " + StatUnit.perSecond.localized());
+        }
+
+        StatValues.ammo(ObjectMap.of(u, bullet)).display(t);
+    }
+
+    public float dps(){
+        return (bullet.estimateDPS() / reload) * shoot.shots * 60f;
+    }
+
+    public float shotsPerSec(){
+        return shoot.shots * 60f / reload;
+    }
+
+    //TODO copy-pasted code
+    public void drawOutline(Unit unit, WeaponMount mount){
+        if(!outlineRegion.found()) return;
+
+        float
+        rotation = unit.rotation - 90,
+        realRecoil = Mathf.pow(mount.recoil, recoilPow) * recoil,
+        weaponRotation  = rotation + (rotate ? mount.rotation : baseRotation),
+        wx = unit.x + Angles.trnsx(rotation, x, y) + Angles.trnsx(weaponRotation, 0, -realRecoil),
+        wy = unit.y + Angles.trnsy(rotation, x, y) + Angles.trnsy(weaponRotation, 0, -realRecoil);
+
+        Draw.xscl = -Mathf.sign(flipSprite);
+        Draw.rect(outlineRegion, wx, wy, weaponRotation);
+        Draw.xscl = 1f;
+    }
+
+    public void draw(Unit unit, WeaponMount mount){
+        //apply layer offset, roll it back at the end
+        float z = Draw.z();
+        Draw.z(z + layerOffset);
+
+        float
+        rotation = unit.rotation - 90,
+        realRecoil = Mathf.pow(mount.recoil, recoilPow) * recoil,
+        weaponRotation  = rotation + (rotate ? mount.rotation : baseRotation),
+        wx = unit.x + Angles.trnsx(rotation, x, y) + Angles.trnsx(weaponRotation, 0, -realRecoil),
+        wy = unit.y + Angles.trnsy(rotation, x, y) + Angles.trnsy(weaponRotation, 0, -realRecoil);
+
+        if(shadow > 0){
+            Drawf.shadow(wx, wy, shadow);
+        }
+
+        if(top){
+            drawOutline(unit, mount);
+        }
+
+        if(parts.size > 0){
+            DrawPart.params.set(mount.warmup, mount.reload / reload, mount.smoothReload, mount.heat, mount.recoil, mount.charge, wx, wy, weaponRotation + 90);
+            DrawPart.params.sideMultiplier = flipSprite ? -1 : 1;
+
+            for(int i = 0; i < parts.size; i++){
+                var part = parts.get(i);
+                DrawPart.params.setRecoil(part.recoilIndex >= 0 && mount.recoils != null ? mount.recoils[part.recoilIndex] : mount.recoil);
+                if(part.under){
+                    unit.type.applyColor(unit);
+                    part.draw(DrawPart.params);
+                }
+            }
+        }
+
+        Draw.xscl = -Mathf.sign(flipSprite);
+
+        //fix color
+        unit.type.applyColor(unit);
+
+        if(region.found()) Draw.rect(region, wx, wy, weaponRotation);
+
+        if(cellRegion.found()){
+            Draw.color(unit.type.cellColor(unit));
+            Draw.rect(cellRegion, wx, wy, weaponRotation);
+            Draw.color();
+        }
+
+        if(heatRegion.found() && mount.heat > 0){
+            Draw.color(heatColor, mount.heat);
+            Draw.blend(Blending.additive);
+            Draw.rect(heatRegion, wx, wy, weaponRotation);
+            Draw.blend();
+            Draw.color();
+        }
+
+        Draw.xscl = 1f;
+
+        if(parts.size > 0){
+            //TODO does it need an outline?
+            for(int i = 0; i < parts.size; i++){
+                var part = parts.get(i);
+                DrawPart.params.setRecoil(part.recoilIndex >= 0 && mount.recoils != null ? mount.recoils[part.recoilIndex] : mount.recoil);
+                if(!part.under){
+                    unit.type.applyColor(unit);
+                    part.draw(DrawPart.params);
+                }
+            }
+        }
+
+        Draw.xscl = 1f;
+
+        Draw.z(z);
+    }
+
+    public float range(){
+        return bullet.range;
+    }
+
+    public void update(Unit unit, WeaponMount mount){
+        boolean can = unit.canShoot();
+        float lastReload = mount.reload;
+        mount.reload = Math.max(mount.reload - Time.delta * unit.reloadMultiplier, 0);
+        mount.recoil = Mathf.approachDelta(mount.recoil, 0, unit.reloadMultiplier / recoilTime);
+        if(recoils > 0){
+            if(mount.recoils == null) mount.recoils = new float[recoils];
+            for(int i = 0; i < recoils; i++){
+                mount.recoils[i] = Mathf.approachDelta(mount.recoils[i], 0, unit.reloadMultiplier / recoilTime);
+            }
+        }
+        mount.smoothReload = Mathf.lerpDelta(mount.smoothReload, mount.reload / reload, smoothReloadSpeed);
+        mount.charge = mount.charging && shoot.firstShotDelay > 0 ? Mathf.approachDelta(mount.charge, 1, 1 / shoot.firstShotDelay) : 0;
+
+        float warmupTarget = (can && mount.shoot) || (continuous && mount.bullet != null) || mount.charging ? 1f : 0f;
+        if(linearWarmup){
+            mount.warmup = Mathf.approachDelta(mount.warmup, warmupTarget, shootWarmupSpeed);
+        }else{
+            mount.warmup = Mathf.lerpDelta(mount.warmup, warmupTarget, shootWarmupSpeed);
+        }
+
+        float
+        mountX = unit.x + Angles.trnsx(unit.rotation - 90, x, y),
+        mountY = unit.y + Angles.trnsy(unit.rotation - 90, x, y);
+
+        //find a new target
+        if(!controllable && autoTarget){
+            if((mount.retarget -= Time.delta) <= 0f){
+                mount.target = findTarget(unit, mountX, mountY, bullet.range, bullet.collidesAir, bullet.collidesGround);
+                mount.retarget = mount.target == null ? targetInterval : targetSwitchInterval;
+            }
+
+            if(mount.target != null && checkTarget(unit, mount.target, mountX, mountY, bullet.range)){
+                mount.target = null;
+            }
+
+            boolean shoot = false;
+
+            if(mount.target != null){
+                shoot = mount.target.within(mountX, mountY, bullet.range + Math.abs(shootY) + (mount.target instanceof Sized s ? s.hitSize()/2f : 0f)) && can;
+
+                if(predictTarget){
+                    Vec2 to = Predict.intercept(unit, mount.target, bullet.speed);
+                    mount.aimX = to.x;
+                    mount.aimY = to.y;
+                }else{
+                    mount.aimX = mount.target.x();
+                    mount.aimY = mount.target.y();
+                }
+            }
+
+            mount.shoot = mount.rotate = shoot;
+
+            //note that shooting state is not affected, as these cannot be controlled
+            //logic will return shooting as false even if these return true, which is fine
+        }
+
+        //rotate if applicable
+        if(rotate && (mount.rotate || mount.shoot) && can){
+            float axisX = unit.x + Angles.trnsx(unit.rotation - 90,  x, y),
+            axisY = unit.y + Angles.trnsy(unit.rotation - 90,  x, y);
+
+            mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - unit.rotation;
+            mount.rotation = Angles.moveToward(mount.rotation, mount.targetRotation, rotateSpeed * Time.delta);
+            if(rotationLimit < 360){
+                float dst = Angles.angleDist(mount.rotation, baseRotation);
+                if(dst > rotationLimit/2f){
+                    mount.rotation = Angles.moveToward(mount.rotation, baseRotation, dst - rotationLimit/2f);
+                }
+            }
+        }else if(!rotate){
+            mount.rotation = baseRotation;
+            mount.targetRotation = unit.angleTo(mount.aimX, mount.aimY);
+        }
+
+        float
+        weaponRotation = unit.rotation - 90 + (rotate ? mount.rotation : baseRotation),
+        bulletX = mountX + Angles.trnsx(weaponRotation, this.shootX, this.shootY),
+        bulletY = mountY + Angles.trnsy(weaponRotation, this.shootX, this.shootY),
+        shootAngle = bulletRotation(unit, mount, bulletX, bulletY);
+
+        if(alwaysShooting) mount.shoot = true;
+
+        //update continuous state
+        if(continuous && mount.bullet != null){
+            if(!mount.bullet.isAdded() || mount.bullet.time >= mount.bullet.lifetime || mount.bullet.type != bullet){
+                mount.bullet = null;
+            }else{
+                mount.bullet.rotation(weaponRotation + 90);
+                mount.bullet.set(bulletX, bulletY);
+                mount.reload = reload;
+                mount.recoil = 1f;
+                unit.vel.add(Tmp.v1.trns(mount.bullet.rotation() + 180f, mount.bullet.type.recoil * Time.delta));
+                if(shootSound != Sounds.none && !headless){
+                    if(mount.sound == null) mount.sound = new SoundLoop(shootSound, 1f);
+                    mount.sound.update(bulletX, bulletY, true);
+                }
+
+                //target length of laser
+                float shootLength = Math.min(Mathf.dst(bulletX, bulletY, mount.aimX, mount.aimY), range());
+                //current length of laser
+                float curLength = Mathf.dst(bulletX, bulletY, mount.bullet.aimX, mount.bullet.aimY);
+                //resulting length of the bullet (smoothed)
+                float resultLength = Mathf.approachDelta(curLength, shootLength, aimChangeSpeed);
+                //actual aim end point based on length
+                Tmp.v1.trns(shootAngle, mount.lastLength = resultLength).add(bulletX, bulletY);
+
+                mount.bullet.aimX = Tmp.v1.x;
+                mount.bullet.aimY = Tmp.v1.y;
+
+                if(alwaysContinuous && mount.shoot){
+                    mount.bullet.time = mount.bullet.lifetime * mount.bullet.type.optimalLifeFract * mount.warmup;
+                    mount.bullet.keepAlive = true;
+
+                    unit.apply(shootStatus, shootStatusDuration);
+                }
+            }
+        }else{
+            //heat decreases when not firing
+            mount.heat = Math.max(mount.heat - Time.delta * unit.reloadMultiplier / cooldownTime, 0);
+
+            if(mount.sound != null){
+                mount.sound.update(bulletX, bulletY, false);
+            }
+        }
+
+        //flip weapon shoot side for alternating weapons
+        boolean wasFlipped = mount.side;
+        if(otherSide != -1 && alternate && mount.side == flipSprite && mount.reload <= reload / 2f && lastReload > reload / 2f){
+            unit.mounts[otherSide].side = !unit.mounts[otherSide].side;
+            mount.side = !mount.side;
+        }
+
+        //shoot if applicable
+        if(mount.shoot && //must be shooting
+        can && //must be able to shoot
+        !(bullet.killShooter && mount.totalShots > 0) && //if the bullet kills the shooter, you should only ever be able to shoot once
+        (!useAmmo || unit.ammo > 0 || !state.rules.unitAmmo || unit.team.rules().infiniteAmmo) && //check ammo
+        (!alternate || wasFlipped == flipSprite) &&
+        mount.warmup >= minWarmup && //must be warmed up
+        unit.vel.len() >= minShootVelocity && //check velocity requirements
+        (mount.reload <= 0.0001f || (alwaysContinuous && mount.bullet == null)) && //reload has to be 0, or it has to be an always-continuous weapon
+        (alwaysShooting || Angles.within(rotate ? mount.rotation : unit.rotation + baseRotation, mount.targetRotation, shootCone)) //has to be within the cone
+        ){
+            shoot(unit, mount, bulletX, bulletY, shootAngle);
+
+            mount.reload = reload;
+
+            if(useAmmo){
+                unit.ammo--;
+                if(unit.ammo < 0) unit.ammo = 0;
+            }
+        }
+    }
+
+    protected Teamc findTarget(Unit unit, float x, float y, float range, boolean air, boolean ground){
+        return Units.closestTarget(unit.team, x, y, range + Math.abs(shootY), u -> u.checkTarget(air, ground), t -> ground && (unit.type.targetUnderBlocks || !t.block.underBullets));
+    }
+
+    protected boolean checkTarget(Unit unit, Teamc target, float x, float y, float range){
+        return Units.invalidateTarget(target, unit.team, x, y, range + Math.abs(shootY));
+    }
+
+    protected float bulletRotation(Unit unit, WeaponMount mount, float bulletX, float bulletY){
+        return rotate ? unit.rotation + mount.rotation : Angles.angle(bulletX, bulletY, mount.aimX, mount.aimY) + (unit.rotation - unit.angleTo(mount.aimX, mount.aimY)) + baseRotation;
+    }
+
+    protected void shoot(Unit unit, WeaponMount mount, float shootX, float shootY, float rotation){
+        unit.apply(shootStatus, shootStatusDuration);
+
+        if(shoot.firstShotDelay > 0){
+            mount.charging = true;
+            chargeSound.at(shootX, shootY, Mathf.random(soundPitchMin, soundPitchMax));
+            bullet.chargeEffect.at(shootX, shootY, rotation, bullet.keepVelocity || parentizeEffects ? unit : null);
+        }
+
+        shoot.shoot(mount.barrelCounter, (xOffset, yOffset, angle, delay, mover) -> {
+            //this is incremented immediately, as it is used for total bullet creation amount detection
+            mount.totalShots ++;
+            int barrel = mount.barrelCounter;
+
+            if(delay > 0f){
+                Time.run(delay, () -> {
+                    //hack: make sure the barrel is the same as what it was when the bullet was queued to fire
+                    int prev = mount.barrelCounter;
+                    mount.barrelCounter = barrel;
+                    bullet(unit, mount, xOffset, yOffset, angle, mover);
+                    mount.barrelCounter = prev;
+                });
+            }else{
+                bullet(unit, mount, xOffset, yOffset, angle, mover);
+            }
+        }, () -> mount.barrelCounter++);
+    }
+
+    protected void bullet(Unit unit, WeaponMount mount, float xOffset, float yOffset, float angleOffset, Mover mover){
+        if(!unit.isAdded()) return;
+
+        mount.charging = false;
+        float
+        xSpread = Mathf.range(xRand),
+        weaponRotation = unit.rotation - 90 + (rotate ? mount.rotation : baseRotation),
+        mountX = unit.x + Angles.trnsx(unit.rotation - 90, x, y),
+        mountY = unit.y + Angles.trnsy(unit.rotation - 90, x, y),
+        bulletX = mountX + Angles.trnsx(weaponRotation, this.shootX + xOffset + xSpread, this.shootY + yOffset),
+        bulletY = mountY + Angles.trnsy(weaponRotation, this.shootX + xOffset + xSpread, this.shootY + yOffset),
+        shootAngle = bulletRotation(unit, mount, bulletX, bulletY) + angleOffset,
+        lifeScl = bullet.scaleLife ? Mathf.clamp(Mathf.dst(bulletX, bulletY, mount.aimX, mount.aimY) / bullet.range) : 1f,
+        angle = shootAngle + Mathf.range(inaccuracy + bullet.inaccuracy);
+
+        Entityc shooter = unit.controller() instanceof MissileAI ai ? ai.shooter : unit; //Pass the missile's shooter down to its bullets
+        mount.bullet = bullet.create(unit, shooter, unit.team, bulletX, bulletY, angle, -1f, (1f - velocityRnd) + Mathf.random(velocityRnd), lifeScl, null, mover, mount.aimX, mount.aimY, mount.target);
+        handleBullet(unit, mount, mount.bullet);
+
+        if(!continuous){
+            shootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax));
+        }
+
+        ejectEffect.at(mountX, mountY, angle * Mathf.sign(this.x));
+        bullet.shootEffect.at(bulletX, bulletY, angle, bullet.hitColor, unit);
+        bullet.smokeEffect.at(bulletX, bulletY, angle, bullet.hitColor, unit);
+
+        unit.vel.add(Tmp.v1.trns(shootAngle + 180f, bullet.recoil));
+        Effect.shake(shake, shake, bulletX, bulletY);
+        mount.recoil = 1f;
+        if(recoils > 0){
+            mount.recoils[mount.barrelCounter % recoils] = 1f;
+        }
+        mount.heat = 1f;
+    }
+
+    //override to do special things to a bullet after spawning
+    protected void handleBullet(Unit unit, WeaponMount mount, Bullet bullet){
+        if(continuous){
+            float
+                weaponRotation = unit.rotation - 90 + (rotate ? mount.rotation : baseRotation),
+                mountX = unit.x + Angles.trnsx(unit.rotation - 90, x, y),
+                mountY = unit.y + Angles.trnsy(unit.rotation - 90, x, y),
+                bulletX = mountX + Angles.trnsx(weaponRotation, this.shootX, this.shootY),
+                bulletY = mountY + Angles.trnsy(weaponRotation, this.shootX, this.shootY);
+            //make sure the length updates to the last set value
+            Tmp.v1.trns(bulletRotation(unit, mount, bulletX, bulletY), shootY + mount.lastLength).add(bulletX, bulletY);
+            bullet.aimX = Tmp.v1.x;
+            bullet.aimY = Tmp.v1.y;
+        }
+    }
+
+    public void flip(){
+        x *= -1;
+        shootX *= -1;
+        baseRotation *= -1f;
+        flipSprite = !flipSprite;
+        shoot = shoot.copy();
+        shoot.flip();
+    }
+
     public Weapon copy(){
-        Weapon out = new Weapon();
-        JsonIO.json().copyFields(this, out);
-        return out;
+        try{
+            return (Weapon)clone();
+        }catch(CloneNotSupportedException suck){
+            throw new RuntimeException("very good language design", suck);
+        }
+    }
+
+    @CallSuper
+    public void init(){
+        if(alwaysContinuous){
+            continuous = true;
+        }
     }
 
     public void load(){
-        region = Core.atlas.find(name, Core.atlas.find("clear"));
+        region = Core.atlas.find(name);
         heatRegion = Core.atlas.find(name + "-heat");
+        cellRegion = Core.atlas.find(name + "-cell");
         outlineRegion = Core.atlas.find(name + "-outline");
+
+        for(var part : parts){
+            part.turretShading = false;
+            part.load(name);
+        }
+    }
+
+    @Override
+    public String toString(){
+        return name == null || name.isEmpty() ? "Weapon" : "Weapon: " + name;
     }
 
 }
diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java
index 113b1a18af..e70e0af9af 100644
--- a/core/src/mindustry/type/Weather.java
+++ b/core/src/mindustry/type/Weather.java
@@ -20,6 +20,9 @@ import mindustry.world.blocks.*;
 import static mindustry.Vars.*;
 
 public class Weather extends UnlockableContent{
+    /** Global random variable used for rendering. */
+    public static final Rand rand = new Rand();
+
     /** Default duration of this weather event in ticks. */
     public float duration = 10f * Time.toMinutes;
     public float opacityMultiplier = 1f;
@@ -27,9 +30,9 @@ public class Weather extends UnlockableContent{
     public Sound sound = Sounds.none;
     public float soundVol = 0.1f, soundVolMin = 0f;
     public float soundVolOscMag = 0f, soundVolOscScl = 20f;
+    public boolean hidden = false;
 
     //internals
-    public Rand rand = new Rand();
     public Prov<WeatherState> type = WeatherState::create;
     public StatusEffect status = StatusEffects.none;
     public float statusDuration = 60f * 2;
@@ -54,7 +57,7 @@ public class Weather extends UnlockableContent{
 
     public WeatherState create(float intensity, float duration){
         WeatherState entity = type.get();
-        entity.intensity(intensity);
+        entity.intensity(Mathf.clamp(intensity));
         entity.init(this);
         entity.life(duration);
         entity.add();
@@ -108,12 +111,13 @@ public class Weather extends UnlockableContent{
 
     }
 
-    public void drawParticles(TextureRegion region, Color color,
+    public static void drawParticles(TextureRegion region, Color color,
                               float sizeMin, float sizeMax,
                               float density, float intensity, float opacity,
                               float windx, float windy,
                               float minAlpha, float maxAlpha,
-                              float sinSclMin, float sinSclMax, float sinMagMin, float sinMagMax){
+                              float sinSclMin, float sinSclMax, float sinMagMin, float sinMagMax,
+                              boolean randomParticleRotation){
         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(sizeMax * 1.5f);
@@ -128,6 +132,7 @@ public class Weather extends UnlockableContent{
             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(minAlpha, maxAlpha);
+            float rotation = randomParticleRotation ? rand.random(0f, 360f) : 0f;
 
             x += Mathf.sin(y, rand.random(sinSclMin, sinSclMax), rand.random(sinMagMin, sinMagMax));
 
@@ -140,12 +145,15 @@ public class Weather extends UnlockableContent{
 
             if(Tmp.r3.setCentered(x, y, size).overlaps(Tmp.r2)){
                 Draw.alpha(alpha * opacity);
-                Draw.rect(region, x, y, size, size);
+                Draw.rect(region, x, y, size, size, rotation);
             }
         }
+
+        Draw.reset();
     }
 
-    public void drawRain(float sizeMin, float sizeMax, float xspeed, float yspeed, float density, float intensity, float stroke, Color color){
+    public static void drawRain(float sizeMin, float sizeMax, float xspeed, float yspeed, float density, float intensity, float stroke, Color color){
+        rand.setSeed(0);
         float padding = sizeMax*0.9f;
 
         Tmp.r1.setCentered(Core.camera.position.x, Core.camera.position.y, Core.graphics.getWidth() / renderer.minScale(), Core.graphics.getHeight() / renderer.minScale());
@@ -153,7 +161,7 @@ public class Weather extends UnlockableContent{
         Core.camera.bounds(Tmp.r2);
         int total = (int)(Tmp.r1.area() / density * intensity);
         Lines.stroke(stroke);
-        float alpha = Draw.getColor().a;
+        float alpha = Draw.getColorAlpha();
         Draw.color(color);
 
         for(int i = 0; i < total; i++){
@@ -178,12 +186,13 @@ public class Weather extends UnlockableContent{
         }
     }
 
-    public void drawSplashes(TextureRegion[] splashes, float padding, float density, float intensity, float opacity, float timeScale, float stroke, Color color, Liquid splasher){
+    public static void drawSplashes(TextureRegion[] splashes, float padding, float density, float intensity, float opacity, float timeScale, float stroke, Color color, Liquid splasher){
         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() / density * intensity) / 2;
         Lines.stroke(stroke);
+        rand.setSeed(0);
 
         float t = Time.time / timeScale;
 
@@ -224,7 +233,21 @@ public class Weather extends UnlockableContent{
         }
     }
 
-    public void drawNoise(Texture noise, Color color, float noisescl, float opacity, float baseSpeed, float intensity, float vwindx, float vwindy, float offset){
+    public static void drawNoiseLayers(Texture noise, Color color, float noisescl, float opacity, float baseSpeed, float intensity, float vwindx, float vwindy,
+                                       int layers, float layerSpeedM , float layerAlphaM, float layerSclM, float layerColorM){
+        float sspeed = 1f, sscl = 1f, salpha = 1f, offset = 0f;
+        Color col = Tmp.c1.set(color);
+        for(int i = 0; i < layers; i++){
+            drawNoise(noise, col, noisescl * sscl, salpha * opacity, sspeed * baseSpeed, intensity, vwindx, vwindy, offset);
+            sspeed *= layerSpeedM;
+            salpha *= layerAlphaM;
+            sscl *= layerSclM;
+            offset += 0.29f;
+            col.mul(layerColorM);
+        }
+    }
+
+    public static void drawNoise(Texture noise, Color color, float noisescl, float opacity, float baseSpeed, float intensity, float vwindx, float vwindy, float offset){
         Draw.alpha(opacity);
         Draw.tint(color);
 
@@ -291,7 +314,7 @@ public class Weather extends UnlockableContent{
     @EntityDef(value = {WeatherStatec.class}, pooled = true, isFinal = false)
     @Component(base = true)
     abstract static class WeatherStateComp implements Drawc, Syncc{
-        private static final float fadeTime = 60 * 4;
+        public static final float fadeTime = 60 * 4;
 
         Weather weather;
         float intensity = 1f, opacity = 0f, life, effectTimer;
@@ -321,17 +344,15 @@ public class Weather extends UnlockableContent{
 
         @Override
         public void draw(){
-            if(renderer.weatherAlpha() > 0.0001f && renderer.drawWeather && Core.settings.getBool("showweather")){
+            if(renderer.weatherAlpha > 0.0001f && renderer.drawWeather && Core.settings.getBool("showweather")){
                 Draw.draw(Layer.weather, () -> {
-                    weather.rand.setSeed(0);
-                    Draw.alpha(renderer.weatherAlpha() * opacity * weather.opacityMultiplier);
+                    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.opacityMultiplier);
+                    Draw.alpha(renderer.weatherAlpha * opacity * weather.opacityMultiplier);
                     weather.drawUnder(self());
                     Draw.reset();
                 });
diff --git a/core/src/mindustry/type/ammo/ItemAmmoType.java b/core/src/mindustry/type/ammo/ItemAmmoType.java
new file mode 100644
index 0000000000..bb7c1ae725
--- /dev/null
+++ b/core/src/mindustry/type/ammo/ItemAmmoType.java
@@ -0,0 +1,57 @@
+package mindustry.type.ammo;
+
+import arc.graphics.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+
+public class ItemAmmoType implements AmmoType{
+    public float range = 85f;
+    public int ammoPerItem = 15;
+    public Item item;
+
+    public ItemAmmoType(Item item){
+        this.item = item;
+    }
+
+    public ItemAmmoType(Item item, int ammoPerItem){
+        this.item = item;
+        this.ammoPerItem = ammoPerItem;
+    }
+
+    public ItemAmmoType(){
+    }
+
+    @Override
+    public String icon(){
+        return item.emoji();
+    }
+
+    @Override
+    public Color color(){
+        return item.color;
+    }
+
+    @Override
+    public Color barColor(){
+        return Pal.ammo;
+    }
+
+    @Override
+    public void resupply(Unit unit){
+        //do not resupply when it would waste resources
+        if(unit.type.ammoCapacity - unit.ammo < ammoPerItem) return;
+
+        float range = unit.hitSize + this.range;
+
+        Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.canResupply() && u.items != null && u.items.has(item));
+
+        if(build != null){
+            Fx.itemTransfer.at(build.x, build.y, ammoPerItem / 2f, item.color, unit);
+            unit.ammo = Math.min(unit.ammo + ammoPerItem, unit.type.ammoCapacity);
+            build.items.remove(item, 1);
+        }
+    }
+}
diff --git a/core/src/mindustry/type/ammo/PowerAmmoType.java b/core/src/mindustry/type/ammo/PowerAmmoType.java
new file mode 100644
index 0000000000..c1d2c4e002
--- /dev/null
+++ b/core/src/mindustry/type/ammo/PowerAmmoType.java
@@ -0,0 +1,58 @@
+package mindustry.type.ammo;
+
+import arc.graphics.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+
+public class PowerAmmoType implements AmmoType{
+    public float range = 85f;
+    public float totalPower = 1000;
+
+    public PowerAmmoType(float totalPower){
+        this.totalPower = totalPower;
+    }
+
+    public PowerAmmoType(){
+
+    }
+
+    @Override
+    public String icon(){
+        return Iconc.power + "";
+    }
+
+    @Override
+    public Color color(){
+        return Pal.powerLight;
+    }
+
+    @Override
+    public Color barColor(){
+        return Pal.powerLight;
+    }
+
+    @Override
+    public void resupply(Unit unit){
+        float range = unit.hitSize + this.range;
+
+        Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.block.consPower != null && u.block.consPower.buffered);
+
+        if(build != null){
+            float amount = build.power.status * build.block.consPower.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){
+                build.power.status -= powerTaken / build.block.consPower.capacity;
+                unit.ammo += powerTaken / powerPerAmmo;
+
+                Fx.itemTransfer.at(build.x, build.y, Math.max(powerTaken / 100f, 1f), Pal.power, unit);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/type/unit/ErekirUnitType.java b/core/src/mindustry/type/unit/ErekirUnitType.java
new file mode 100644
index 0000000000..9b6b7ea46a
--- /dev/null
+++ b/core/src/mindustry/type/unit/ErekirUnitType.java
@@ -0,0 +1,19 @@
+package mindustry.type.unit;
+
+import mindustry.content.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.type.ammo.*;
+import mindustry.world.meta.*;
+
+/** Config class for special Erekir unit properties. */
+public class ErekirUnitType extends UnitType{
+
+    public ErekirUnitType(String name){
+        super(name);
+        outlineColor = Pal.darkOutline;
+        envDisabled = Env.space;
+        ammoType = new ItemAmmoType(Items.beryllium);
+        researchCostMultiplier = 10f;
+    }
+}
diff --git a/core/src/mindustry/type/unit/MissileUnitType.java b/core/src/mindustry/type/unit/MissileUnitType.java
new file mode 100644
index 0000000000..6b0d3174fc
--- /dev/null
+++ b/core/src/mindustry/type/unit/MissileUnitType.java
@@ -0,0 +1,44 @@
+package mindustry.type.unit;
+
+import mindustry.ai.types.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.meta.*;
+
+/** Field template for unit types. No new functionality. */
+public class MissileUnitType extends UnitType{
+
+    public MissileUnitType(String name){
+        super(name);
+
+        playerControllable = false;
+        createWreck = false;
+        createScorch = false;
+        logicControllable = false;
+        isEnemy = false;
+        useUnitCap = false;
+        allowedInPayloads = false;
+        controller = u -> new MissileAI();
+        flying = true;
+        constructor = TimedKillUnit::create;
+        envEnabled = Env.any;
+        envDisabled = Env.none;
+        physics = false;
+        bounded = false;
+        trailLength = 7;
+        hidden = true;
+        hoverable = false;
+        speed = 4f;
+        lifetime = 60f * 1.7f;
+        rotateSpeed = 2.5f;
+        range = 6f;
+        targetPriority = -1f;
+        outlineColor = Pal.darkOutline;
+        fogRadius = 2f;
+        loopSound = Sounds.missileTrail;
+        loopSoundVolume = 0.05f;
+        drawMinimap = false;
+        //TODO weapon configs, etc?
+    }
+}
diff --git a/core/src/mindustry/type/unit/NeoplasmUnitType.java b/core/src/mindustry/type/unit/NeoplasmUnitType.java
new file mode 100644
index 0000000000..050c858eb0
--- /dev/null
+++ b/core/src/mindustry/type/unit/NeoplasmUnitType.java
@@ -0,0 +1,43 @@
+package mindustry.type.unit;
+
+import mindustry.content.*;
+import mindustry.entities.abilities.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.meta.*;
+
+/** This is just a preset. Contains no new behavior. */
+public class NeoplasmUnitType extends UnitType{
+
+    public NeoplasmUnitType(String name){
+        super(name);
+
+        outlineColor = Pal.neoplasmOutline;
+        immunities.addAll(StatusEffects.burning, StatusEffects.melting);
+        envDisabled = Env.none;
+        drawCell = false;
+
+        abilities.add(new RegenAbility(){{
+            //fully regen in 70 seconds
+            percentAmount = 1f / (70f * 60f) * 100f;
+        }});
+
+        abilities.add(new LiquidExplodeAbility(){{
+            liquid = Liquids.neoplasm;
+        }});
+
+        abilities.add(new LiquidRegenAbility(){{
+            liquid = Liquids.neoplasm;
+            slurpEffect = Fx.neoplasmHeal;
+        }});
+
+        //green flashing is unnecessary since they always regen
+        healFlash = true;
+
+        healColor = Pal.neoplasm1;
+
+        //TODO
+        //- liquid regen ability
+        //- new explode effect
+    }
+}
diff --git a/core/src/mindustry/type/unit/TankUnitType.java b/core/src/mindustry/type/unit/TankUnitType.java
new file mode 100644
index 0000000000..feb5cec6d4
--- /dev/null
+++ b/core/src/mindustry/type/unit/TankUnitType.java
@@ -0,0 +1,18 @@
+package mindustry.type.unit;
+
+import mindustry.world.meta.*;
+
+public class TankUnitType extends ErekirUnitType{
+
+    public TankUnitType(String name){
+        super(name);
+
+        squareShape = true;
+        omniMovement = false;
+        rotateMoveFirst = true;
+        rotateSpeed = 1.3f;
+        envDisabled = Env.none;
+        speed = 0.8f;
+    }
+
+}
diff --git a/core/src/mindustry/type/weapons/BuildWeapon.java b/core/src/mindustry/type/weapons/BuildWeapon.java
new file mode 100644
index 0000000000..98d732ee8d
--- /dev/null
+++ b/core/src/mindustry/type/weapons/BuildWeapon.java
@@ -0,0 +1,67 @@
+package mindustry.type.weapons;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.entities.bullet.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+/** Purely visual turret. Does not shoot anything. */
+public class BuildWeapon extends Weapon{
+
+    public BuildWeapon(){
+
+    }
+
+    public BuildWeapon(String name){
+        super(name);
+    }
+
+    {
+        rotate = true;
+        noAttack = true;
+        predictTarget = false;
+        display = false;
+        bullet = new BulletType();
+        useAttackRange = false;
+    }
+
+    @Override
+    public void update(Unit unit, WeaponMount mount){
+        mount.shoot = false;
+        mount.rotate = true;
+
+        //always aim at build plan
+        if(unit.activelyBuilding()){
+            mount.aimX = unit.buildPlan().drawx();
+            mount.aimY = unit.buildPlan().drawy();
+        }else{
+            //aim for front
+            float weaponRotation = unit.rotation - 90 + baseRotation;
+            mount.aimX = unit.x + Angles.trnsx(unit.rotation - 90, x, y) + Angles.trnsx(weaponRotation, this.shootX, this.shootY);
+            mount.aimY = unit.y + Angles.trnsy(unit.rotation - 90, x, y) + Angles.trnsy(weaponRotation, this.shootX, this.shootY);
+        }
+
+        super.update(unit, mount);
+    }
+
+    @Override
+    public void draw(Unit unit, WeaponMount mount){
+        super.draw(unit, mount);
+
+        if(unit.activelyBuilding()){
+            float
+            z = Draw.z(),
+            rotation = unit.rotation - 90,
+            weaponRotation  = rotation + (rotate ? mount.rotation : 0),
+            wx = unit.x + Angles.trnsx(rotation, x, y) + Angles.trnsx(weaponRotation, 0, -mount.recoil),
+            wy = unit.y + Angles.trnsy(rotation, x, y) + Angles.trnsy(weaponRotation, 0, -mount.recoil),
+            px = wx + Angles.trnsx(weaponRotation, this.shootX, this.shootY),
+            py = wy + Angles.trnsy(weaponRotation, this.shootX, this.shootY);
+
+            unit.drawBuildingBeam(px, py);
+            Draw.z(z);
+        }
+    }
+}
diff --git a/core/src/mindustry/type/weapons/PointDefenseWeapon.java b/core/src/mindustry/type/weapons/PointDefenseWeapon.java
new file mode 100644
index 0000000000..86c1130dc1
--- /dev/null
+++ b/core/src/mindustry/type/weapons/PointDefenseWeapon.java
@@ -0,0 +1,70 @@
+package mindustry.type.weapons;
+
+import arc.graphics.*;
+import arc.math.*;
+import arc.math.geom.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+import static mindustry.Vars.*;
+
+/**
+ * Note that this requires several things:
+ * - A bullet with positive maxRange
+ * - A bullet with positive damage
+ * - Rotation
+ * */
+public class PointDefenseWeapon extends Weapon{
+    public Color color = Color.white;
+    public Effect beamEffect = Fx.pointBeam;
+
+    public PointDefenseWeapon(String name){
+        super(name);
+    }
+
+    public PointDefenseWeapon(){
+    }
+
+    {
+        predictTarget = false;
+        autoTarget = true;
+        controllable = false;
+        rotate = true;
+        useAmmo = false;
+        useAttackRange = false;
+        targetInterval = 10f;
+    }
+
+    @Override
+    protected Teamc findTarget(Unit unit, float x, float y, float range, boolean air, boolean ground){
+        return Groups.bullet.intersect(x - range, y - range, range*2, range*2).min(b -> b.team != unit.team && b.type().hittable, b -> b.dst2(x, y));
+    }
+
+    @Override
+    protected boolean checkTarget(Unit unit, Teamc target, float x, float y, float range){
+        return !(target.within(unit, range) && target.team() != unit.team && target instanceof Bullet bullet && bullet.type != null && bullet.type.hittable);
+    }
+
+    @Override
+    protected void shoot(Unit unit, WeaponMount mount, float shootX, float shootY, float rotation){
+        if(!(mount.target instanceof Bullet target)) return;
+
+        // not sure whether it should multiply by the damageMultiplier of the unit
+        float bulletDamage = bullet.damage * unit.damageMultiplier() * state.rules.unitDamage(unit.team);
+        if(target.damage() > bulletDamage){
+            target.damage(target.damage() - bulletDamage);
+        }else{
+            target.remove();
+        }
+
+        beamEffect.at(shootX, shootY, rotation, color, new Vec2().set(target));
+        bullet.shootEffect.at(shootX, shootY, rotation, color);
+        bullet.hitEffect.at(target.x, target.y, color);
+        shootSound.at(shootX, shootY, Mathf.random(0.9f, 1.1f));
+        mount.recoil = 1f;
+        mount.heat = 1f;
+    }
+}
diff --git a/core/src/mindustry/type/weapons/RepairBeamWeapon.java b/core/src/mindustry/type/weapons/RepairBeamWeapon.java
new file mode 100644
index 0000000000..0d33d207d1
--- /dev/null
+++ b/core/src/mindustry/type/weapons/RepairBeamWeapon.java
@@ -0,0 +1,193 @@
+package mindustry.type.weapons;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.blocks.units.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+/**
+ * Note that this weapon requires a bullet with a positive maxRange.
+ * Rotation must be set to true. Fixed repair points are not supported.
+ * */
+public class RepairBeamWeapon extends Weapon{
+    public boolean targetBuildings = false, targetUnits = true;
+
+    public float repairSpeed = 0.3f;
+    public float fractionRepairSpeed = 0f;
+    public float beamWidth = 1f;
+    public float pulseRadius = 6f;
+    public float pulseStroke = 2f;
+    public float widthSinMag = 0f, widthSinScl = 4f;
+    public float recentDamageMultiplier = 0.1f;
+
+    public TextureRegion laser, laserEnd, laserTop, laserTopEnd;
+
+    public Color laserColor = Color.valueOf("98ffa9"), laserTopColor = Color.white.cpy();
+    //only for blocks
+    public Color healColor = Pal.heal;
+    public Effect healEffect = Fx.healBlockFull;
+
+    public RepairBeamWeapon(String name){
+        super(name);
+    }
+
+    public RepairBeamWeapon(){
+    }
+
+    {
+        //must be >0 to prevent various bugs
+        reload = 1f;
+        predictTarget = false;
+        autoTarget = true;
+        controllable = false;
+        rotate = true;
+        useAmmo = false;
+        mountType = HealBeamMount::new;
+        recoil = 0f;
+        noAttack = true;
+        useAttackRange = false;
+    }
+
+    @Override
+    public void addStats(UnitType u, Table w){
+        w.row();
+        w.add("[lightgray]" + Stat.repairSpeed.localized() + ": " + (mirror ? "2x " : "") + "[white]" + (int)(repairSpeed * 60) + " " + StatUnit.perSecond.localized());
+    }
+
+    @Override
+    public float dps(){
+        return 0f;
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        laser = Core.atlas.find("laser-white");
+        laserEnd = Core.atlas.find("laser-white-end");
+        laserTop = Core.atlas.find("laser-top");
+        laserTopEnd = Core.atlas.find("laser-top-end");
+    }
+
+    @Override
+    protected Teamc findTarget(Unit unit, float x, float y, float range, boolean air, boolean ground){
+        var out = targetUnits ? Units.closest(unit.team, x, y, range, u -> u != unit && u.damaged()) :  null;
+        if(out != null || !targetBuildings) return out;
+        return Units.findAllyTile(unit.team, x, y, range, Building::damaged);
+    }
+
+    @Override
+    protected boolean checkTarget(Unit unit, Teamc target, float x, float y, float range){
+        return !(target.within(unit, range + unit.hitSize/2f) && target.team() == unit.team && target instanceof Healthc u && u.damaged() && u.isValid());
+    }
+
+    @Override
+    protected void shoot(Unit unit, WeaponMount mount, float shootX, float shootY, float rotation){
+        //does nothing, shooting is handled in update()
+    }
+
+    @Override
+    public void update(Unit unit, WeaponMount mount){
+        super.update(unit, mount);
+
+        float
+        weaponRotation = unit.rotation - 90,
+        wx = unit.x + Angles.trnsx(weaponRotation, x, y),
+        wy = unit.y + Angles.trnsy(weaponRotation, x, y);
+
+        HealBeamMount heal = (HealBeamMount)mount;
+        boolean canShoot = mount.shoot;
+
+        if(!autoTarget){
+            heal.target = null;
+            if(canShoot){
+                heal.lastEnd.set(heal.aimX, heal.aimY);
+
+                if(!rotate && !Angles.within(Angles.angle(wx, wy, heal.aimX, heal.aimY), unit.rotation, shootCone)){
+                    canShoot = false;
+                }
+            }
+
+            //limit range
+            heal.lastEnd.sub(wx, wy).limit(range()).add(wx, wy);
+
+            if(targetBuildings){
+                //snap to closest building
+                World.raycastEachWorld(wx, wy, heal.lastEnd.x, heal.lastEnd.y, (x, y) -> {
+                    var build = Vars.world.build(x, y);
+                    if(build != null && build.team == unit.team && build.damaged()){
+                        heal.target = build;
+                        heal.lastEnd.set(x * tilesize, y * tilesize);
+                        return true;
+                    }
+                    return false;
+                });
+            }
+            if(targetUnits){
+                //TODO does not support healing units manually yet
+            }
+        }
+
+        heal.strength = Mathf.lerpDelta(heal.strength, Mathf.num(autoTarget ? mount.target != null : canShoot), 0.2f);
+
+        //create heal effect periodically
+        if(canShoot && mount.target instanceof Building b && b.damaged() && (heal.effectTimer += Time.delta) >= reload){
+            healEffect.at(b.x, b.y, 0f, healColor, b.block);
+            heal.effectTimer = 0f;
+        }
+
+        if(canShoot && mount.target instanceof Healthc u){
+            float baseAmount = repairSpeed * heal.strength * Time.delta + fractionRepairSpeed * heal.strength * Time.delta * u.maxHealth() / 100f;
+            u.heal((u instanceof Building b && b.wasRecentlyDamaged() ? recentDamageMultiplier : 1f) * baseAmount);
+        }
+    }
+
+    @Override
+    public void draw(Unit unit, WeaponMount mount){
+        super.draw(unit, mount);
+
+        HealBeamMount heal = (HealBeamMount)mount;
+
+        if(unit.canShoot()){
+            float
+                weaponRotation = unit.rotation - 90,
+                wx = unit.x + Angles.trnsx(weaponRotation, x, y),
+                wy = unit.y + Angles.trnsy(weaponRotation, x, y),
+                z = Draw.z();
+            RepairTurret.drawBeam(wx, wy, unit.rotation + mount.rotation, shootY, unit.id, mount.target == null || controllable ? null : (Sized)mount.target, unit.team, heal.strength,
+            pulseStroke, pulseRadius, beamWidth + Mathf.absin(widthSinScl, widthSinMag), heal.lastEnd, heal.offset, laserColor, laserTopColor,
+            laser, laserEnd, laserTop, laserTopEnd);
+            Draw.z(z);
+        }
+    }
+
+    @Override
+    public void init(){
+        super.init();
+        bullet.healPercent = fractionRepairSpeed;
+    }
+
+    public static class HealBeamMount extends WeaponMount{
+        public Vec2 offset = new Vec2(), lastEnd = new Vec2();
+        public float strength, effectTimer;
+
+        public HealBeamMount(Weapon weapon){
+            super(weapon);
+        }
+    }
+}
diff --git a/core/src/mindustry/type/weather/MagneticStorm.java b/core/src/mindustry/type/weather/MagneticStorm.java
new file mode 100644
index 0000000000..c1d45b2529
--- /dev/null
+++ b/core/src/mindustry/type/weather/MagneticStorm.java
@@ -0,0 +1,11 @@
+package mindustry.type.weather;
+
+import mindustry.type.*;
+
+//TODO
+public class MagneticStorm extends Weather{
+
+    public MagneticStorm(String name){
+        super(name);
+    }
+}
diff --git a/core/src/mindustry/type/weather/ParticleWeather.java b/core/src/mindustry/type/weather/ParticleWeather.java
index b8e5b6e8ba..f277911753 100644
--- a/core/src/mindustry/type/weather/ParticleWeather.java
+++ b/core/src/mindustry/type/weather/ParticleWeather.java
@@ -16,7 +16,7 @@ public class ParticleWeather extends Weather{
     public float sinSclMin = 30f, sinSclMax = 80f, sinMagMin = 1f, sinMagMax = 7f;
 
     public Color noiseColor = color;
-    public boolean drawNoise = false, drawParticles = true, useWindVector = false;
+    public boolean drawNoise = false, drawParticles = true, useWindVector = false, randomParticleRotation = false;
     public int noiseLayers = 1;
     public float noiseLayerSpeedM = 1.1f, noiseLayerAlphaM = 0.8f, noiseLayerSclM = 0.99f, noiseLayerColorM = 1f;
     public String noisePath = "noiseAlpha";
@@ -33,7 +33,6 @@ public class ParticleWeather extends Weather{
         region = Core.atlas.find(particleRegion);
 
         //load noise texture
-        //TODO mod support
         if(drawNoise && Core.assets != null){
             Core.assets.load("sprites/" + noisePath + ".png", Texture.class);
         }
@@ -41,7 +40,7 @@ public class ParticleWeather extends Weather{
 
     @Override
     public void update(WeatherState state){
-        float speed = force * state.intensity;
+        float speed = force * state.intensity * Time.delta;
         if(speed > 0.001f){
             float windx = state.windVector.x * speed, windy = state.windVector.y * speed;
 
@@ -84,7 +83,7 @@ public class ParticleWeather extends Weather{
         }
 
         if(drawParticles){
-            drawParticles(region, color, sizeMin, sizeMax, density, state.intensity, state.opacity, windx, windy, minAlpha, maxAlpha, sinSclMin, sinSclMax, sinMagMin, sinMagMax);
+            drawParticles(region, color, sizeMin, sizeMax, density, state.intensity, state.opacity, windx, windy, minAlpha, maxAlpha, sinSclMin, sinSclMax, sinMagMin, sinMagMax, randomParticleRotation);
         }
     }
 }
diff --git a/core/src/mindustry/type/weather/SolarFlare.java b/core/src/mindustry/type/weather/SolarFlare.java
new file mode 100644
index 0000000000..47694d0e65
--- /dev/null
+++ b/core/src/mindustry/type/weather/SolarFlare.java
@@ -0,0 +1,11 @@
+package mindustry.type.weather;
+
+import mindustry.type.*;
+
+//TODO
+public class SolarFlare extends Weather{
+
+    public SolarFlare(String name){
+        super(name);
+    }
+}
diff --git a/core/src/mindustry/ui/Bar.java b/core/src/mindustry/ui/Bar.java
index 8de089041a..2e6896cca1 100644
--- a/core/src/mindustry/ui/Bar.java
+++ b/core/src/mindustry/ui/Bar.java
@@ -8,6 +8,7 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.*;
 import arc.scene.style.*;
+import arc.scene.ui.layout.*;
 import arc.util.pooling.*;
 import mindustry.gen.*;
 
@@ -15,9 +16,9 @@ public class Bar extends Element{
     private static Rect scissor = new Rect();
 
     private Floatp fraction;
-    private String name = "";
-    private float value, lastValue, blink;
-    private Color blinkColor = new Color();
+    private CharSequence name = "";
+    private float value, lastValue, blink, outlineRadius;
+    private Color blinkColor = new Color(), outlineColor = new Color();
 
     public Bar(String name, Color color, Floatp fraction){
         this.fraction = fraction;
@@ -27,21 +28,13 @@ public class Bar extends Element{
         setColor(color);
     }
 
-    public Bar(Prov<String> name, Prov<Color> color, Floatp fraction){
+    public Bar(Prov<CharSequence> name, Prov<Color> color, Floatp fraction){
         this.fraction = fraction;
-        try{
-            lastValue = value = Mathf.clamp(fraction.get());
-        }catch(Exception e){ //getting the fraction may involve referring to invalid data
-            lastValue = value = 0f;
-        }
+        lastValue = value = Mathf.clamp(fraction.get());
         update(() -> {
-            try{
-                this.name = name.get();
-                this.blinkColor.set(color.get());
-                setColor(color.get());
-            }catch(Exception e){ //getting the fraction may involve referring to invalid data
-                this.name = "";
-            }
+            this.name = name.get();
+            this.blinkColor.set(color.get());
+            setColor(color.get());
         });
     }
 
@@ -61,6 +54,20 @@ public class Bar extends Element{
         update(() -> this.name = name.get());
     }
 
+    public void snap(){
+        lastValue = value = fraction.get();
+    }
+
+    public Bar outline(Color color, float stroke){
+        outlineColor.set(color);
+        outlineRadius = Scl.scl(stroke);
+        return this;
+    }
+
+    public void flash(){
+        blink = 1f;
+    }
+
     public Bar blink(Color color){
         blinkColor.set(color);
         return this;
@@ -70,12 +77,8 @@ public class Bar extends Element{
     public void draw(){
         if(fraction == null) return;
 
-        float computed;
-        try{
-            computed = Mathf.clamp(fraction.get());
-        }catch(Exception e){ //getting the fraction may involve referring to invalid data
-            computed = 0f;
-        }
+        float computed = Mathf.clamp(fraction.get());
+
 
         if(lastValue > computed){
             blink = 1f;
@@ -94,9 +97,16 @@ public class Bar extends Element{
 
         Drawable bar = Tex.bar;
 
+        if(outlineRadius > 0){
+            Draw.color(outlineColor);
+            bar.draw(x - outlineRadius, y - outlineRadius, width + outlineRadius*2, height + outlineRadius*2);
+        }
+
         Draw.colorl(0.1f);
+        Draw.alpha(parentAlpha);
         bar.draw(x, y, width, height);
         Draw.color(color, blinkColor, blink);
+        Draw.alpha(parentAlpha);
 
         Drawable top = Tex.barTop;
         float topWidth = width * value;
@@ -116,8 +126,10 @@ public class Bar extends Element{
         GlyphLayout lay = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
         lay.setText(font, name);
 
-        font.setColor(Color.white);
-        font.draw(name, x + width / 2f - lay.width / 2f, y + height / 2f + lay.height / 2f + 1);
+        font.setColor(1f, 1f, 1f, 1f);
+        font.getCache().clear();
+        font.getCache().addText(name, x + width / 2f - lay.width / 2f, y + height / 2f + lay.height / 2f + 1);
+        font.getCache().draw(parentAlpha);
 
         Pools.free(lay);
     }
diff --git a/core/src/mindustry/ui/BorderImage.java b/core/src/mindustry/ui/BorderImage.java
index 262a02a197..ca0a1a270b 100644
--- a/core/src/mindustry/ui/BorderImage.java
+++ b/core/src/mindustry/ui/BorderImage.java
@@ -2,12 +2,13 @@ package mindustry.ui;
 
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import mindustry.graphics.*;
 
 public class BorderImage extends Image{
-    public float thickness = 4f;
+    public float thickness = 4f, pad = 0f;
     public Color borderColor = Pal.gray;
 
     public BorderImage(){
@@ -28,6 +29,10 @@ public class BorderImage extends Image{
         thickness = thick;
     }
 
+    public BorderImage(Drawable region){
+        super(region);
+    }
+
     public BorderImage border(Color color){
         this.borderColor = color;
         return this;
@@ -40,7 +45,7 @@ public class BorderImage extends Image{
         Draw.color(borderColor);
         Draw.alpha(parentAlpha);
         Lines.stroke(Scl.scl(thickness));
-        Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
+        Lines.rect(x + imageX - pad, y + imageY - pad, imageWidth * scaleX + pad*2, imageHeight * scaleY + pad*2);
         Draw.reset();
     }
 }
diff --git a/core/src/mindustry/ui/Cicon.java b/core/src/mindustry/ui/Cicon.java
deleted file mode 100644
index 2fc95294fa..0000000000
--- a/core/src/mindustry/ui/Cicon.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package mindustry.ui;
-
-import java.util.*;
-
-/** Defines sizes of a content's preview icon. */
-public enum Cicon{
-    /** Full size. */
-    full(0),
-    tiny(8 * 2),
-    small(8 * 3),
-    medium(8 * 4),
-    large(8 * 5),
-    xlarge(8 * 6);
-
-    public static final Cicon[] all = values();
-    public static final Cicon[] scaled = Arrays.copyOfRange(all, 1, all.length);
-
-    public final int size;
-
-    Cicon(int size){
-        this.size = size;
-    }
-}
diff --git a/core/src/mindustry/ui/CoreItemsDisplay.java b/core/src/mindustry/ui/CoreItemsDisplay.java
index 7322f15e70..22eed95a46 100644
--- a/core/src/mindustry/ui/CoreItemsDisplay.java
+++ b/core/src/mindustry/ui/CoreItemsDisplay.java
@@ -19,12 +19,15 @@ public class CoreItemsDisplay extends Table{
 
     public void resetUsed(){
         usedItems.clear();
+        background(null);
     }
 
     void rebuild(){
         clear();
-        background(Styles.black6);
-        margin(4);
+        if(usedItems.size > 0){
+            background(Styles.black6);
+            margin(4);
+        }
 
         update(() -> {
             core = Vars.player.team().core();
@@ -38,9 +41,9 @@ public class CoreItemsDisplay extends Table{
 
         for(Item item : content.items()){
             if(usedItems.contains(item)){
-                image(item.icon(Cicon.small)).padRight(3);
+                image(item.uiIcon).size(iconSmall).padRight(3).tooltip(t -> t.background(Styles.black6).margin(4f).add(item.localizedName).style(Styles.outlineLabel));
                 //TODO leaks garbage
-                label(() -> core == null ? "0" : UI.formatAmount(core.items.get(item))).padRight(3).left();
+                label(() -> core == null ? "0" : UI.formatAmount(core.items.get(item))).padRight(3).minWidth(52f).left().tooltip(t -> t.background(Styles.black6).margin(4f).label(() -> core == null ? "0" : core.items.get(item) + "").style(Styles.outlineLabel));
 
                 if(++i % 4 == 0){
                     row();
diff --git a/core/src/mindustry/ui/Displayable.java b/core/src/mindustry/ui/Displayable.java
index 770e490cab..d856b2beab 100644
--- a/core/src/mindustry/ui/Displayable.java
+++ b/core/src/mindustry/ui/Displayable.java
@@ -4,5 +4,9 @@ import arc.scene.ui.layout.*;
 
 /** An interface for things that can be displayed when hovered over. */
 public interface Displayable{
+    default boolean displayable(){
+        return true;
+    }
+
     void display(Table table);
 }
diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java
index 35c6f1bcd9..c02e09ff53 100644
--- a/core/src/mindustry/ui/Fonts.java
+++ b/core/src/mindustry/ui/Fonts.java
@@ -3,14 +3,11 @@ package mindustry.ui;
 import arc.*;
 import arc.Graphics.Cursor.*;
 import arc.assets.*;
-import arc.assets.loaders.*;
-import arc.assets.loaders.resolvers.*;
 import arc.files.*;
 import arc.freetype.*;
 import arc.freetype.FreeTypeFontGenerator.*;
 import arc.freetype.FreetypeFontLoader.*;
 import arc.graphics.*;
-import arc.graphics.Pixmap.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.graphics.g2d.Font.*;
@@ -23,30 +20,20 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.core.*;
-import mindustry.ctype.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 
-import java.util.*;
+import java.io.*;
 
 public class Fonts{
     private static final String mainFont = "fonts/font.woff";
     private static final ObjectSet<String> unscaled = ObjectSet.with("iconLarge");
     private static ObjectIntMap<String> unicodeIcons = new ObjectIntMap<>();
+    private static IntMap<String> unicodeToName = new IntMap<>();
     private static ObjectMap<String, String> stringIcons = new ObjectMap<>();
     private static ObjectMap<String, TextureRegion> largeIcons = new ObjectMap<>();
-    private static TextureRegion[] iconTable;
-    private static int lastCid;
 
-    public static Font def;
-    public static Font outline;
-    public static Font chat;
-    public static Font icon;
-    public static Font iconLarge;
-    public static Font tech;
-
-    public static TextureRegion logicIcon(int id){
-        return iconTable[id];
-    }
+    public static Font def, outline, icon, iconLarge, tech, logic;
 
     public static int getUnicode(String content){
         return unicodeIcons.get(content, 0);
@@ -56,6 +43,10 @@ public class Fonts{
         return stringIcons.get(content, "");
     }
 
+    public static boolean hasUnicodeStr(String content){
+        return stringIcons.containsKey(content);
+    }
+
     /** Called from a static context to make the cursor appear immediately upon startup.*/
     public static void loadSystemCursors(){
         SystemCursor.arrow.set(Core.graphics.newCursor("cursor", cursorScale()));
@@ -73,20 +64,33 @@ public class Fonts{
         largeIcons.clear();
         FreeTypeFontParameter param = fontParameter();
 
-        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("default", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.def = f;
+
         Core.assets.load("icon", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
             size = 30;
             incremental = true;
             characters = "\0";
-        }})).loaded = f -> Fonts.icon = (Font)f;
+        }})).loaded = f -> Fonts.icon = f;
+
         Core.assets.load("iconLarge", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
             size = 48;
             incremental = false;
             characters = "\0" + Iconc.all;
             borderWidth = 5f;
             borderColor = Color.darkGray;
-        }})).loaded = f -> Fonts.iconLarge = (Font)f;
+        }})).loaded = f -> Fonts.iconLarge = f;
+
+        Core.assets.load("logic", Font.class, new FreeTypeFontLoaderParameter("fonts/logic.ttf", new FreeTypeFontParameter(){{
+            size = 16;
+            //generated all at once, it's fast enough anyway
+            incremental = false;
+            //ASCII only
+            characters = "\0ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890\"!`?'.,;:()[]{}<>|/@\\^$€-%+=#_&~*";
+        }})).loaded = f -> Fonts.logic = f;
+    }
+
+    public static @Nullable String unicodeToName(int unicode){
+        return unicodeToName.get(unicode, () -> Iconc.codeToName.get(unicode));
     }
 
     public static TextureRegion getLargeIcon(String name){
@@ -94,7 +98,7 @@ public class Fonts{
             var region = new TextureRegion();
             int code = Iconc.codes.get(name, '\uF8D4');
             var glyph = iconLarge.getData().getGlyph((char)code);
-            if(glyph == null) return Core.atlas.find("error");
+            if(glyph == null) return Core.atlas.find(name);
             region.set(iconLarge.getRegion().texture);
             region.set(glyph.u, glyph.v2, glyph.u2, glyph.v);
             return region;
@@ -102,13 +106,13 @@ public class Fonts{
     }
 
     public static void loadContentIcons(){
-        Seq<Font> fonts = Seq.with(Fonts.chat, Fonts.def, Fonts.outline);
+        Seq<Font> fonts = Seq.with(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))){
-            while(scan.hasNextLine()){
-                String line = scan.nextLine();
+        try(var reader = Core.files.internal("icons/icons.properties").reader(Vars.bufferSize)){
+            String line;
+            while((line = reader.readLine()) != null){
                 String[] split = line.split("=");
                 String[] nametex = split[1].split("\\|");
                 String character = split[0], texture = nametex[1];
@@ -117,18 +121,20 @@ public class Fonts{
 
                 if(region.texture != uitex){
                     continue;
-                    //throw new IllegalArgumentException("Font icon '" + texture + "' is not in the UI texture.");
                 }
 
                 unicodeIcons.put(nametex[0], ch);
                 stringIcons.put(nametex[0], ((char)ch) + "");
+                unicodeToName.put(ch, texture);
+
+                Vec2 out = Scaling.fit.apply(region.width, region.height, size, size);
 
                 Glyph glyph = new Glyph();
                 glyph.id = ch;
                 glyph.srcX = 0;
                 glyph.srcY = 0;
-                glyph.width = size;
-                glyph.height = (int)((float)region.height / region.width * size);
+                glyph.width = (int)out.x;
+                glyph.height = (int)out.y;
                 glyph.u = region.u;
                 glyph.v = region.v2;
                 glyph.u2 = region.u2;
@@ -141,30 +147,47 @@ public class Fonts{
                 glyph.page = 0;
                 fonts.each(f -> f.getData().setGlyph(ch, glyph));
             }
+        }catch(IOException e){
+            throw new RuntimeException(e);
         }
 
-        iconTable = new TextureRegion[512];
-        iconTable[0] = Core.atlas.find("error");
-        lastCid = 1;
+        stringIcons.put("alphachan", stringIcons.get("alphaaaa"));
 
-        Vars.content.each(c -> {
-            if(c instanceof UnlockableContent u){
-                TextureRegion region = Core.atlas.find(u.name + "-icon-logic");
-                if(region.found()){
-                    iconTable[u.iconId = lastCid++] = region;
-                }
+        for(Team team : Team.baseTeams){
+            team.emoji = stringIcons.get(team.name, "");
+        }
+    }
+    
+    public static void loadContentIconsHeadless(){
+        try(var reader = Core.files.internal("icons/icons.properties").reader(Vars.bufferSize)){
+            String line;
+            while((line = reader.readLine()) != null){
+                String[] split = line.split("=");
+                String[] nametex = split[1].split("\\|");
+                String character = split[0];
+                int ch = Integer.parseInt(character);
+
+                unicodeIcons.put(nametex[0], ch);
+                stringIcons.put(nametex[0], ((char)ch) + "");
             }
-        });
+        }catch(IOException e){
+            throw new RuntimeException(e);
+        }
+
+        stringIcons.put("alphachan", stringIcons.get("alphaaaa"));
+
+        for(Team team : Team.baseTeams){
+            team.emoji = stringIcons.get(team.name, "");
+        }
     }
 
     /** Called from a static context for use in the loading screen.*/
     public static void loadDefaultFont(){
         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(Font.class, null, new FreetypeFontLoader(resolver){
+        UI.packer = new PixmapPacker(max >= 4096 ? 4096 : 2048, 2048, 2, true);
+        Core.assets.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(Core.files::internal));
+        Core.assets.setLoader(Font.class, null, new FreetypeFontLoader(Core.files::internal){
             ObjectSet<FreeTypeFontParameter> scaled = new ObjectSet<>();
 
             @Override
@@ -192,19 +215,19 @@ public class Fonts{
             size = 18;
         }};
 
-        Core.assets.load("outline", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = t -> Fonts.outline = (Font)t;
+        Core.assets.load("outline", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = t -> Fonts.outline = t;
 
         Core.assets.load("tech", Font.class, new FreeTypeFontLoaderParameter("fonts/tech.ttf", new FreeTypeFontParameter(){{
             size = 18;
         }})).loaded = f -> {
-            Fonts.tech = (Font)f;
-            ((Font)f).getData().down *= 1.5f;
+            Fonts.tech = f;
+            Fonts.tech.getData().down *= 1.5f;
         };
     }
 
     /** Merges the UI and font atlas together for better performance. */
     public static void mergeFontAtlas(TextureAtlas atlas){
-        //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 all textures from the ui page, remove all the regions assigned to it, then copy them over to UI.packer and replace the texture in this atlas.
 
         //grab old UI texture and regions...
         Texture texture = atlas.find("logo").texture;
@@ -215,13 +238,16 @@ public class Fonts{
         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));
+            Rect rect = UI.packer.pack(region.name, atlas.getPixmap(region), region.splits, region.pads);
+
             //set new texture
             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.texture);
+            //clear it
+            region.pixmapRegion = null;
         }
 
         //remove old texture, it will no longer be used
@@ -234,8 +260,12 @@ public class Fonts{
     }
 
     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 + ")");
+        Glyph found = font.getData().getGlyph(glyph);
+        if(found == null){
+            Log.warn("No icon found for glyph: @ (@)", glyph, (int)glyph);
+            found = font.getData().getGlyph('F');
+        }
+        Glyph g = found;
 
         float size = Math.max(g.width, g.height);
         TextureRegionDrawable draw = new TextureRegionDrawable(new TextureRegion(font.getRegion().texture, g.u, g.v2, g.u2, g.v)){
@@ -258,7 +288,7 @@ public class Fonts{
                 cy = (int)cy;
                 originX = g.width/2f;
                 originY = g.height/2f;
-                Draw.rect(region, cx + g.width/2f, cy + g.height/2f, g.width, g.height, originX, originY, rotation);
+                Draw.rect(region, cx + g.width/2f, cy + g.height/2f, g.width * scaleX, g.height * scaleY, originX, originY, rotation);
             }
 
             @Override
diff --git a/core/src/mindustry/ui/IconSize.java b/core/src/mindustry/ui/IconSize.java
deleted file mode 100644
index dd3a4b37db..0000000000
--- a/core/src/mindustry/ui/IconSize.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package mindustry.ui;
-
-public enum IconSize{
-    def(48),
-    small(32),
-    smaller(30),
-    tiny(16);
-
-    public final int size;
-
-    IconSize(int size){
-        this.size = size;
-    }
-}
diff --git a/core/src/mindustry/ui/ItemDisplay.java b/core/src/mindustry/ui/ItemDisplay.java
deleted file mode 100644
index d0cedc5ba1..0000000000
--- a/core/src/mindustry/ui/ItemDisplay.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package mindustry.ui;
-
-import arc.scene.ui.layout.*;
-import mindustry.type.*;
-
-/** An item image with text. */
-public class ItemDisplay extends Table{
-    public final Item item;
-    public final int amount;
-
-    public ItemDisplay(Item item){
-        this(item, 0);
-    }
-
-    public ItemDisplay(Item item, int amount, boolean showName){
-        add(new ItemImage(new ItemStack(item, amount)));
-        if(showName) add(item.localizedName).padLeft(4 + amount > 99 ? 4 : 0);
-
-        this.item = item;
-        this.amount = amount;
-    }
-
-    public ItemDisplay(Item item, int amount){
-        this(item, amount, true);
-    }
-}
diff --git a/core/src/mindustry/ui/ItemImage.java b/core/src/mindustry/ui/ItemImage.java
deleted file mode 100644
index 437360829e..0000000000
--- a/core/src/mindustry/ui/ItemImage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package mindustry.ui;
-
-import arc.graphics.g2d.*;
-import arc.scene.ui.*;
-import arc.scene.ui.layout.*;
-import mindustry.core.*;
-import mindustry.type.*;
-
-public class ItemImage extends Stack{
-
-    public ItemImage(TextureRegion region, int amount){
-
-        add(new Table(o -> {
-            o.left();
-            o.add(new Image(region)).size(32f);
-        }));
-
-        add(new Table(t -> {
-            t.left().bottom();
-            t.add(amount > 1000 ? UI.formatAmount(amount) : amount + "");
-            t.pack();
-        }));
-    }
-
-    public ItemImage(TextureRegion region){
-        Table t = new Table().left().bottom();
-
-        add(new Image(region));
-        add(t);
-    }
-
-    public ItemImage(ItemStack stack){
-
-        add(new Table(o -> {
-            o.left();
-            o.add(new Image(stack.item.icon(Cicon.medium))).size(32f);
-        }));
-
-        if(stack.amount != 0){
-            add(new Table(t -> {
-                t.left().bottom();
-                t.add(stack.amount > 1000 ? UI.formatAmount(stack.amount) : stack.amount + "").style(Styles.outlineLabel);
-                t.pack();
-            }));
-        }
-    }
-}
diff --git a/core/src/mindustry/ui/ItemsDisplay.java b/core/src/mindustry/ui/ItemsDisplay.java
index a6dec71bc7..dc83f5e54d 100644
--- a/core/src/mindustry/ui/ItemsDisplay.java
+++ b/core/src/mindustry/ui/ItemsDisplay.java
@@ -15,6 +15,7 @@ import static mindustry.Vars.*;
 
 /** Displays a list of items, e.g. launched items.*/
 public class ItemsDisplay extends Table{
+    boolean collapsed;
 
     public ItemsDisplay(){
         rebuild(new ItemSeq());
@@ -29,6 +30,8 @@ public class ItemsDisplay extends Table{
         top().left();
         margin(0);
 
+        if(items == null) return;
+
         table(Tex.button, c -> {
             c.margin(10).marginLeft(12).marginTop(15f);
             c.marginRight(12f);
@@ -41,7 +44,7 @@ public class ItemsDisplay extends Table{
                     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.image(item.uiIcon).size(8 * 3).padLeft(4).padRight(4);
                     t.add(item.localizedName).color(Color.lightGray).left();
                     t.row();
 
@@ -50,10 +53,13 @@ public class ItemsDisplay extends Table{
                         label.actions(Actions.color(Color.white, 0.75f, Interp.fade));
                     }
                 }
-            }).get().setScrollingDisabled(true, false), false).setDuration(0.3f);
+            }).scrollX(false), false).setDuration(0.3f);
 
-            c.button("@globalitems", Icon.downOpen, Styles.clearTogglet, col::toggle).update(t -> {
+            col.setCollapsed(collapsed, false);
+
+            c.button("@globalitems", Icon.downOpen, Styles.flatTogglet, col::toggle).update(t -> {
                 t.setChecked(col.isCollapsed());
+                collapsed = col.isCollapsed();
                 ((Image)t.getChildren().get(1)).setDrawable(col.isCollapsed() ? Icon.upOpen : Icon.downOpen);
             }).padBottom(4).left().fillX().margin(12f).minWidth(200f);
             c.row();
diff --git a/core/src/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java
index 6c5962d11c..e614c24b1c 100644
--- a/core/src/mindustry/ui/Links.java
+++ b/core/src/mindustry/ui/Links.java
@@ -26,7 +26,7 @@ public class Links{
         new LinkEntry("f-droid", "https://f-droid.org/packages/io.anuke.mindustry/", Icon.android, Color.valueOf("026aa7")),
         new LinkEntry("github", "https://github.com/Anuken/Mindustry/", Icon.github, Color.valueOf("24292e")),
         new LinkEntry("dev-builds", "https://github.com/Anuken/MindustryBuilds", Icon.githubSquare, Color.valueOf("fafbfc")),
-        new LinkEntry("bug", report(), Icon.wrench, Color.valueOf("cbd97f"))
+        new LinkEntry("bug", "https://github.com/Anuken/Mindustry/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml", Icon.wrench, Color.valueOf("cbd97f"))
         };
     }
 
@@ -52,23 +52,4 @@ public class Links{
             this.title = Core.bundle.get("link." + name + ".title", Strings.capitalize(name.replace("-", " ")));
         }
     }
-
-    private static String report(){
-        return "https://github.com/Anuken/Mindustry/issues/new?assignees=&labels=bug&body=" +
-            Strings.encode(Strings.format(
-            "**Platform**: `@`\n" +
-            "\n**Build**: `@`\n" +
-            "\n**Issue**: *Explain your issue in detail.*\n" +
-            "\n**Steps to reproduce**: *How you happened across the issue, and what exactly you did to make the bug happen.*\n" +
-            "\n**Link(s) to mod(s) used**: `@`\n" +
-            "\n**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.*\n" +
-            "\n**Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.*\n" +
-            "\n---\n" +
-            "\n*Place an X (no spaces) between the brackets to confirm that you have read the line below.*" +
-            "\n- [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**" +
-            "\n- [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**",
-            OS.isAndroid ? "Android " + Core.app.getVersion() : (System.getProperty("os.name") + (OS.is64Bit ? " x64" : " x32")),
-            Version.combined(),
-            Vars.mods.list().any() ? Vars.mods.list().select(LoadedMod::enabled).map(l -> l.meta.author + "/" + l.name + ":" + l.meta.version) : "none"));
-    }
-}
\ No newline at end of file
+}
diff --git a/core/src/mindustry/ui/LiquidDisplay.java b/core/src/mindustry/ui/LiquidDisplay.java
deleted file mode 100644
index c2d71fee25..0000000000
--- a/core/src/mindustry/ui/LiquidDisplay.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package mindustry.ui;
-
-import arc.graphics.*;
-import arc.scene.ui.*;
-import arc.scene.ui.layout.*;
-import arc.util.*;
-import mindustry.type.*;
-import mindustry.world.meta.*;
-
-/** An ItemDisplay, but for liquids. */
-public class LiquidDisplay extends Table{
-    public final Liquid liquid;
-    public final float amount;
-    public final boolean perSecond;
-
-    public LiquidDisplay(Liquid liquid, float amount, boolean perSecond){
-        this.liquid = liquid;
-        this.amount = amount;
-        this.perSecond = perSecond;
-
-        add(new Stack(){{
-            add(new Image(liquid.icon(Cicon.medium)));
-
-            if(amount != 0){
-                Table t = new Table().left().bottom();
-                t.add(Strings.autoFixed(amount, 1)).style(Styles.outlineLabel);
-                add(t);
-            }
-        }}).size(8 * 4).padRight(3  + (amount != 0 && Strings.autoFixed(amount, 1).length() > 2 ? 8 : 0));
-
-        if(perSecond){
-            add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray).style(Styles.outlineLabel);
-        }
-
-        add(liquid.localizedName);
-    }
-}
diff --git a/core/src/mindustry/ui/Menus.java b/core/src/mindustry/ui/Menus.java
new file mode 100644
index 0000000000..6533f455e1
--- /dev/null
+++ b/core/src/mindustry/ui/Menus.java
@@ -0,0 +1,187 @@
+package mindustry.ui;
+
+import arc.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+
+import static mindustry.Vars.*;
+
+/** Class for handling menus and notifications across the network. Unstable API! */
+public class Menus{
+    private static final Seq<MenuListener> menuListeners = new Seq<>();
+    private static final Seq<TextInputListener> textInputListeners = new Seq<>();
+
+    /** Register a *global* menu listener. If no option is chosen, the option is returned as -1. */
+    public static int registerMenu(MenuListener listener){
+        menuListeners.add(listener);
+        return menuListeners.size - 1;
+    }
+
+    /** Register a *global* text input listener. If no text is provided, the text is returned as null. */
+    public static int registerTextInput(TextInputListener listener){
+        textInputListeners.add(listener);
+        return textInputListeners.size - 1;
+    }
+
+    //do not invoke any of the methods below directly, use Call
+
+    @Remote(variants = Variant.both)
+    public static void menu(int menuId, String title, String message, String[][] options){
+        if(title == null) title = "";
+        if(message == null) message = "";
+        if(options == null) options = new String[0][0];
+
+        ui.showMenu(title, message, options, (option) -> Call.menuChoose(player, menuId, option));
+    }
+
+    @Remote(variants = Variant.both)
+    public static void followUpMenu(int menuId, String title, String message, String[][] options){
+        if(title == null) title = "";
+        if(message == null) message = "";
+        if(options == null) options = new String[0][0];
+
+        ui.showFollowUpMenu(menuId, title, message, options, (option) -> Call.menuChoose(player, menuId, option));
+    }
+
+    @Remote(variants = Variant.both)
+    public static void hideFollowUpMenu(int menuId) {
+        ui.hideFollowUpMenu(menuId);
+    }
+
+    @Remote(targets = Loc.both, called = Loc.both)
+    public static void menuChoose(@Nullable Player player, int menuId, int option){
+        if(player != null){
+            Events.fire(new MenuOptionChooseEvent(player, menuId, option));
+            if(menuId >= 0 && menuId < menuListeners.size){
+                menuListeners.get(menuId).get(player, option);
+            }
+        }
+    }
+
+    @Remote(variants = Variant.both)
+    public static void textInput(int textInputId, String title, String message, int textLength, String def, boolean numeric){
+        textInput(textInputId, title, message, textLength, def, numeric, false);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void textInput(int textInputId, String title, String message, int textLength, String def, boolean numeric, boolean allowEmpty){
+        if(title == null) title = "";
+        if(message == null) message = "";
+        if(def == null) def = "";
+
+        ui.showTextInput(title, message, textLength, def, numeric, allowEmpty, (text) -> {
+            Call.textInputResult(player, textInputId, text);
+        }, () -> {
+            Call.textInputResult(player, textInputId, null);
+        });
+    }
+
+    @Remote(targets = Loc.both, called = Loc.both)
+    public static void textInputResult(@Nullable Player player, int textInputId, @Nullable String text){
+        if(player != null){
+            Events.fire(new TextInputEvent(player, textInputId, text));
+            if(textInputId >= 0 && textInputId < textInputListeners.size){
+                textInputListeners.get(textInputId).get(player, text);
+            }
+        }
+    }
+
+    @Remote(variants = Variant.both, unreliable = true)
+    public static void setHudText(String message){
+        if(message == null) return;
+
+        ui.hudfrag.setHudText(message);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void hideHudText(){
+        ui.hudfrag.toggleHudText(false);
+    }
+
+    /** TCP version */
+    @Remote(variants = Variant.both)
+    public static void setHudTextReliable(String message){
+        setHudText(message);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void announce(String message){
+        if(message == null) return;
+
+        ui.announce(message);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void infoMessage(String message){
+        if(message == null) return;
+
+        ui.showText("", message);
+    }
+
+    @Remote(variants = Variant.both, unreliable = true)
+    public static void infoPopup(String message, float duration, int align, int top, int left, int bottom, int right){
+        if(message == null) return;
+
+        ui.showInfoPopup(message, duration, align, top, left, bottom, right);
+    }
+
+    @Remote(variants = Variant.both, unreliable = true)
+    public static void label(String message, float duration, float worldx, float worldy){
+        if(message == null) return;
+
+        ui.showLabel(message, duration, worldx, worldy);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void infoPopupReliable(String message, float duration, int align, int top, int left, int bottom, int right){
+        if(message == null) return;
+
+        ui.showInfoPopup(message, duration, align, top, left, bottom, right);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void labelReliable(String message, float duration, float worldx, float worldy){
+        label(message, duration, worldx, worldy);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void infoToast(String message, float duration){
+        if(message == null) return;
+
+        ui.showInfoToast(message, duration);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void warningToast(int unicode, String text){
+        if(text == null || Fonts.icon.getData().getGlyph((char)unicode) == null) return;
+
+        ui.hudfrag.showToast(Fonts.getGlyph(Fonts.icon, (char)unicode), text);
+    }
+
+    @Remote(variants = Variant.both)
+    public static void openURI(String uri){
+        if(uri == null) return;
+
+        ui.showConfirm(Core.bundle.format("linkopen", uri), () -> Core.app.openURI(uri));
+    }
+
+    //internal use only
+    @Remote
+    public static void removeWorldLabel(int id){
+        var label = Groups.label.getByID(id);
+        if(label != null){
+            label.remove();
+        }
+    }
+
+    public interface MenuListener{
+        void get(Player player, int option);
+    }
+
+    public interface TextInputListener{
+        void get(Player player, @Nullable String text);
+    }
+}
diff --git a/core/src/mindustry/ui/Minimap.java b/core/src/mindustry/ui/Minimap.java
index 53736910f1..ee03fc2435 100644
--- a/core/src/mindustry/ui/Minimap.java
+++ b/core/src/mindustry/ui/Minimap.java
@@ -3,9 +3,11 @@ package mindustry.ui;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.input.*;
+import arc.math.*;
 import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.layout.*;
+import arc.util.*;
 import mindustry.gen.*;
 
 import static mindustry.Vars.*;
@@ -20,6 +22,22 @@ public class Minimap extends Table{
         add(new Element(){
             {
                 setSize(Scl.scl(140f));
+
+                addListener(new ClickListener(KeyCode.mouseRight){
+                    @Override
+                    public void clicked(InputEvent event, float cx, float cy){
+                        var region = renderer.minimap.getRegion();
+                        if(region == null) return;
+
+                        float
+                        sx = (cx - x) / width,
+                        sy = (cy - y) / height,
+                        scaledX = Mathf.lerp(region.u, region.u2, sx) * world.width() * tilesize,
+                        scaledY = Mathf.lerp(1f - region.v2, 1f - region.v, sy) * world.height() * tilesize;
+
+                        control.input.panCamera(Tmp.v1.set(scaledX, scaledY));
+                    }
+                });
             }
 
             @Override
@@ -37,6 +55,7 @@ public class Minimap extends Table{
                 Draw.rect(renderer.minimap.getRegion(), x + width / 2f, y + height / 2f, width, height);
 
                 if(renderer.minimap.getTexture() != null){
+                    Draw.alpha(parentAlpha);
                     renderer.minimap.drawEntities(x, y, width, height, 0.75f, false);
                 }
 
@@ -92,7 +111,7 @@ public class Minimap extends Table{
 
         update(() -> {
 
-            Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
+            Element e = Core.scene.getHoverElement();
             if(e != null && e.isDescendantOf(this)){
                 requestScroll();
             }else if(hasScroll()){
diff --git a/core/src/mindustry/ui/ReqImage.java b/core/src/mindustry/ui/ReqImage.java
index a02ad7e5d0..fca6fc9cae 100644
--- a/core/src/mindustry/ui/ReqImage.java
+++ b/core/src/mindustry/ui/ReqImage.java
@@ -5,6 +5,7 @@ import arc.graphics.g2d.*;
 import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.util.*;
 import mindustry.graphics.*;
 
 public class ReqImage extends Stack{
@@ -30,7 +31,7 @@ public class ReqImage extends Stack{
     }
 
     public ReqImage(TextureRegion region, Boolp valid){
-        this(new Image(region), valid);
+        this(new Image(region).setScaling(Scaling.fit), valid);
     }
 
     public boolean valid(){
diff --git a/core/src/mindustry/ui/SearchBar.java b/core/src/mindustry/ui/SearchBar.java
deleted file mode 100644
index 57d1977a9d..0000000000
--- a/core/src/mindustry/ui/SearchBar.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package mindustry.ui;
-
-import arc.func.*;
-import arc.graphics.*;
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import mindustry.gen.*;
-
-public class SearchBar{
-
-    public static <T> Table add(Table parent, Seq<T> list, Func<String, String> queryf,
-            Func<T, String> namef, Cons2<Table, T> itemc, boolean show){
-        Table[] pane = {null};
-
-        Cons<String> rebuild = str -> {
-            String query = queryf.get(str);
-
-            pane[0].clear();
-            boolean any = false;
-            for(T item : list){
-                if(query.isEmpty() || matches(query, namef.get(item))){
-                    any = true;
-                    itemc.get(pane[0], item);
-                }
-            }
-
-            if(!any){
-                pane[0].add("@none.found").color(Color.lightGray).pad(4);
-            }
-        };
-
-        if(show){
-            parent.table(search -> {
-                search.image(Icon.zoom).padRight(8f);
-                search.field("", rebuild).growX();
-            }).fillX().padBottom(4);
-        }
-
-        parent.row();
-        parent.pane(table -> {
-            pane[0] = table;
-            rebuild.get("");
-        });
-        return pane[0];
-    }
-
-    public static <T> Table add(Table parent, Seq<T> list, Func<String, String> queryf, Func<T, String> namef, Cons2<Table, T> itemc){
-        return add(parent, list, queryf, namef, itemc, true);
-    }
-
-    public static <T> Table add(Table parent, Seq<T> list, Func<T, String> namef, Cons2<Table, T> itemc, boolean show){
-        return add(parent, list, String::toLowerCase, namef, itemc, show);
-    }
-
-    /** Match a list item with the search query, case insensitive */
-    public static boolean matches(String query, String name){
-        if(name == null || name.isEmpty()){
-            return false;
-        }
-        return name.toLowerCase().contains(query);
-    }
-}
diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java
index bad2dbc5a7..b25c2d70c2 100644
--- a/core/src/mindustry/ui/Styles.java
+++ b/core/src/mindustry/ui/Styles.java
@@ -9,12 +9,12 @@ import arc.scene.ui.Button.*;
 import arc.scene.ui.CheckBox.*;
 import arc.scene.ui.Dialog.*;
 import arc.scene.ui.ImageButton.*;
-import arc.scene.ui.KeybindDialog.*;
 import arc.scene.ui.Label.*;
 import arc.scene.ui.ScrollPane.*;
 import arc.scene.ui.Slider.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.TextField.*;
+import arc.scene.ui.TreeElement.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -24,19 +24,83 @@ import static mindustry.gen.Tex.*;
 @StyleDefaults
 public class Styles{
     //TODO all these names are inconsistent and not descriptive
-    public static Drawable black, black9, black8, black6, black3, black5, none, flatDown, flatOver;
-    public static ButtonStyle defaultb, waveb, modsb;
-    public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, nonet, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet, transt, fullTogglet, logict;
-    public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, logici, geni, colori, accenti, 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 Drawable black, black9, black8, black6, black3, black5, grayPanel, none, flatDown, flatOver, accentDrawable;
+
+    public static ButtonStyle defaultb, underlineb;
+
+    /** Default text button style - gray corners at 45 degrees. */
+    public static TextButtonStyle defaultt,
+    /** Flat, square, opaque. */
+    flatt,
+    /** Flat, square, opaque, gray. */
+    grayt,
+    /** Flat, square, toggleable. */
+    flatTogglet,
+    /** Flat, square, gray border.*/
+    flatBordert,
+    /** No background whatsoever, only text. */
+    nonet,
+    /** Similar to flatToggle, but slightly tweaked for logic. */
+    logicTogglet,
+    /** Similar to flatToggle, but with a transparent base background. */
+    flatToggleMenut,
+    /** Toggle variant of default style. */
+    togglet,
+    /** Partially transparent square button. */
+    cleart,
+    /** Clear, square, orange border, toggleable. */
+    clearTogglet,
+    /** Similar to flatToggle, but without a darker border. */
+    fullTogglet,
+    /** Toggle-able version of flatBorder. */
+    squareTogglet,
+    /** Special square button for logic dialogs. */
+    logict;
+
+    /** Default image button style - gray corners at 45 degrees. */
+    public static ImageButtonStyle defaulti,
+    /** Used for research nodes in the tech tree. */
+    nodei,
+    /** No background, tints the image itself when hovered. */
+    emptyi,
+    /** Toggleable variant of emptyi */
+    emptyTogglei,
+    /** Displays border around image when selected; used in placement fragment. */
+    selecti,
+    /** Pure black version of emptyi, used for logic toolbar. */
+    logici,
+    /** Used for toolbar in map generation filters. */
+    geni,
+    /** Gray, toggleable, no background. */
+    grayi,
+    /** Gray square background, standard behavior. Equivalent to grayt. */
+    graySquarei,
+    /** Flat, square, black background. */
+    flati,
+    /** Square border. */
+    squarei,
+    /** Square border, toggleable. */
+    squareTogglei,
+    /** No background unless focused, no border. */
+    clearNonei,
+    /** Partially transparent black background. */
+    cleari,
+    /** Toggleable variant of cleari. */
+    clearTogglei,
+    /** clearNone, but toggleable. */
+    clearNoneTogglei;
+
+    public static ScrollPaneStyle defaultPane, horizontalPane, smallPane, noBarPane;
+    public static SliderStyle defaultSlider;
     public static LabelStyle defaultLabel, outlineLabel, techLabel;
     public static TextFieldStyle defaultField, nodeField, areaField, nodeArea;
     public static CheckBoxStyle defaultCheck;
     public static DialogStyle defaultDialog, fullDialog;
+    public static TreeStyle defaultTree;
 
     public static void load(){
+        var whiteui = (TextureRegionDrawable)Tex.whiteui;
+
         black = whiteui.tint(0f, 0f, 0f, 1f);
         black9 = whiteui.tint(0f, 0f, 0f, 0.9f);
         black8 = whiteui.tint(0f, 0f, 0f, 0.8f);
@@ -44,8 +108,10 @@ public class Styles{
         black5 = whiteui.tint(0f, 0f, 0f, 0.5f);
         black3 = whiteui.tint(0f, 0f, 0f, 0.3f);
         none = whiteui.tint(0f, 0f, 0f, 0f);
+        grayPanel = whiteui.tint(Pal.darkestGray);
         flatDown = createFlatDown();
         flatOver = whiteui.tint(Color.valueOf("454545"));
+        accentDrawable = whiteui.tint(Pal.accent);
 
         defaultb = new ButtonStyle(){{
             down = buttonDown;
@@ -54,16 +120,11 @@ public class Styles{
             disabled = buttonDisabled;
         }};
 
-        modsb = new ButtonStyle(){{
+        underlineb = new ButtonStyle(){{
             down = flatOver;
-            up = underline;
-            over = underlineWhite;
-        }};
-        
-        waveb = new ButtonStyle(){{
-            up = wavepane;
-            over = wavepane; //TODO wrong
-            disabled = wavepane;
+            up = sideline;
+            over = sidelineOver;
+            checked = flatOver;
         }};
 
         defaultt = new TextButtonStyle(){{
@@ -75,23 +136,6 @@ public class Styles{
             down = buttonDown;
             up = button;
         }};
-        squaret = new TextButtonStyle(){{
-            font = Fonts.def;
-            fontColor = Color.white;
-            disabledFontColor = Color.gray;
-            over = buttonSquareOver;
-            disabled = buttonDisabled;
-            down = buttonSquareDown;
-            up = buttonSquare;
-        }};
-        nodet = new TextButtonStyle(){{
-            disabled = button;
-            font = Fonts.def;
-            fontColor = Color.white;
-            disabledFontColor = Color.gray;
-            up = buttonOver;
-            over = buttonDown;
-        }};
         nonet = new TextButtonStyle(){{
             font = Fonts.outline;
             fontColor = Color.lightGray;
@@ -99,7 +143,7 @@ public class Styles{
             disabledFontColor = Color.gray;
             up = none;
         }};
-        cleart = new TextButtonStyle(){{
+        flatt = new TextButtonStyle(){{
             over = flatOver;
             font = Fonts.def;
             fontColor = Color.white;
@@ -107,6 +151,14 @@ public class Styles{
             down = flatOver;
             up = black;
         }};
+        grayt = new TextButtonStyle(){{
+            over = flatOver;
+            font = Fonts.def;
+            fontColor = Color.white;
+            disabledFontColor = Color.lightGray;
+            down = flatOver;
+            up = grayPanel;
+        }};
         logict = new TextButtonStyle(){{
             over = flatOver;
             font = Fonts.def;
@@ -115,17 +167,7 @@ public class Styles{
             down = flatOver;
             up = underlineWhite;
         }};
-        discordt = new TextButtonStyle(){{
-            font = Fonts.def;
-            fontColor = Color.white;
-            up = discordBanner;
-        }};
-        infot = new TextButtonStyle(){{
-            font = Fonts.def;
-            fontColor = Color.white;
-            up = infoBanner;
-        }};
-        clearPartialt = new TextButtonStyle(){{
+        flatBordert = new TextButtonStyle(){{
             down = flatOver;
             up = pane;
             over = flatDownBase;
@@ -133,7 +175,7 @@ public class Styles{
             fontColor = Color.white;
             disabledFontColor = Color.gray;
         }};
-        transt = new TextButtonStyle(){{
+        cleart = new TextButtonStyle(){{
             down = flatDown;
             up = none;
             over = flatOver;
@@ -141,7 +183,7 @@ public class Styles{
             fontColor = Color.white;
             disabledFontColor = Color.gray;
         }};
-        clearTogglet = new TextButtonStyle(){{
+        flatTogglet = new TextButtonStyle(){{
             font = Fonts.def;
             fontColor = Color.white;
             checked = flatDown;
@@ -151,7 +193,17 @@ public class Styles{
             disabled = black;
             disabledFontColor = Color.gray;
         }};
-        clearToggleMenut = new TextButtonStyle(){{
+        logicTogglet = new TextButtonStyle(){{
+            font = Fonts.outline;
+            fontColor = Color.white;
+            checked = accentDrawable;
+            down = accentDrawable;
+            up = black;
+            over = flatOver;
+            disabled = black;
+            disabledFontColor = Color.gray;
+        }};
+        flatToggleMenut = new TextButtonStyle(){{
             font = Fonts.def;
             fontColor = Color.white;
             checked = flatDown;
@@ -171,6 +223,16 @@ public class Styles{
             disabled = buttonDisabled;
             disabledFontColor = Color.gray;
         }};
+        clearTogglet = new TextButtonStyle(){{
+            font = Fonts.def;
+            fontColor = Color.white;
+            down = flatDown;
+            checked = flatDown;
+            up = black6;
+            over = flatOver;
+            disabled = black;
+            disabledFontColor = Color.gray;
+        }};
         fullTogglet = new TextButtonStyle(){{
             font = Fonts.def;
             fontColor = Color.white;
@@ -181,6 +243,16 @@ public class Styles{
             disabled = black;
             disabledFontColor = Color.gray;
         }};
+        squareTogglet = new TextButtonStyle(){{
+            font = Fonts.def;
+            fontColor = Color.white;
+            checked = flatOver;
+            down = flatOver;
+            up = pane;
+            over = flatOver;
+            disabled = black;
+            disabledFontColor = Color.gray;
+        }};
         defaulti = new ImageButtonStyle(){{
             down = buttonDown;
             up = button;
@@ -193,19 +265,12 @@ public class Styles{
             up = buttonOver;
             over = buttonDown;
         }};
-        righti = new ImageButtonStyle(){{
-            over = buttonRightOver;
-            down = buttonRightDown;
-            up = buttonRight;
-            disabled = buttonRightDisabled;
-            imageDisabledColor = Color.clear;
-            imageUpColor = Color.white;
-        }};
         emptyi = new ImageButtonStyle(){{
             imageDownColor = Pal.accent;
+            imageOverColor = Color.lightGray;
             imageUpColor = Color.white;
         }};
-        emptytogglei = new ImageButtonStyle(){{
+        emptyTogglei = new ImageButtonStyle(){{
             imageCheckedColor = Color.white;
             imageDownColor = Color.white;
             imageUpColor = Color.gray;
@@ -215,33 +280,35 @@ public class Styles{
             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;
-        }};
-        accenti = new ImageButtonStyle(){{
-            //imageDownColor = Pal.accent;
+        grayi = new ImageButtonStyle(){{
             imageUpColor = Color.lightGray;
             imageDownColor = Color.white;
         }};
-        cleari = new ImageButtonStyle(){{
+        graySquarei = new ImageButtonStyle(){{
+            imageUpColor = Color.white;
+            imageDownColor = Color.lightGray;
+
+            over = flatOver;
+            down = flatOver;
+            up = grayPanel;
+        }};
+        flati = new ImageButtonStyle(){{
             down = flatOver;
             up = black;
             over = flatOver;
         }};
-        clearFulli = new ImageButtonStyle(){{
+        squarei = new ImageButtonStyle(){{
             down = whiteui;
             up = pane;
             over = flatDown;
         }};
-        clearPartiali = new ImageButtonStyle(){{
+        clearNonei = new ImageButtonStyle(){{
             down = flatDown;
             up = none;
             over = flatOver;
@@ -249,18 +316,13 @@ public class Styles{
             imageDisabledColor = Color.gray;
             imageUpColor = Color.white;
         }};
-        clearPartial2i = new ImageButtonStyle(){{
-            down = whiteui;
-            up = pane;
-            over = flatDown;
-        }};
-        clearTogglei = new ImageButtonStyle(){{
+        squareTogglei = new ImageButtonStyle(){{
             down = flatDown;
             checked = flatDown;
             up = black;
             over = flatOver;
         }};
-        clearTransi = new ImageButtonStyle(){{
+        cleari = new ImageButtonStyle(){{
             down = flatDown;
             up = black6;
             over = flatOver;
@@ -268,13 +330,13 @@ public class Styles{
             imageDisabledColor = Color.lightGray;
             imageUpColor = Color.white;
         }};
-        clearToggleTransi = new ImageButtonStyle(){{
+        clearTogglei = new ImageButtonStyle(){{
             down = flatDown;
             checked = flatDown;
             up = black6;
             over = flatOver;
         }};
-        clearTogglePartiali = new ImageButtonStyle(){{
+        clearNoneTogglei = new ImageButtonStyle(){{
             down = flatDown;
             checked = flatDown;
             up = none;
@@ -295,21 +357,10 @@ public class Styles{
             vScroll = clear;
             vScrollKnob = scrollKnobVerticalThin;
         }};
-
-        defaultKeybindDialog = new KeybindDialogStyle(){{
-            keyColor = Pal.accent;
-            keyNameColor = Color.white;
-            controllerColor = Color.lightGray;
-        }};
+        noBarPane = new ScrollPaneStyle();
 
         defaultSlider = new SliderStyle(){{
-            background = slider;
-            knob = sliderKnob;
-            knobOver = sliderKnobOver;
-            knobDown = sliderKnobDown;
-        }};
-        vSlider = new SliderStyle(){{
-            background = sliderVertical;
+            background = sliderBack;
             knob = sliderKnob;
             knobOver = sliderKnobOver;
             knobDown = sliderKnobDown;
@@ -329,7 +380,7 @@ public class Styles{
         }};
 
         defaultField = new TextFieldStyle(){{
-            font = Fonts.chat;
+            font = Fonts.def;
             fontColor = Color.white;
             disabledFontColor = Color.gray;
             disabledBackground = underlineDisabled;
@@ -342,7 +393,7 @@ public class Styles{
         }};
 
         nodeField = new TextFieldStyle(){{
-            font = Fonts.chat;
+            font = Fonts.def;
             fontColor = Color.white;
             disabledFontColor = Color.gray;
             disabledBackground = underlineDisabled;
@@ -355,7 +406,7 @@ public class Styles{
         }};
 
         areaField = new TextFieldStyle(){{
-            font = Fonts.chat;
+            font = Fonts.def;
             fontColor = Color.white;
             disabledFontColor = Color.gray;
             selection = Tex.selection;
@@ -366,7 +417,7 @@ public class Styles{
         }};
 
         nodeArea = new TextFieldStyle(){{
-            font = Fonts.chat;
+            font = Fonts.def;
             fontColor = Color.white;
             disabledFontColor = Color.gray;
             selection = Tex.selection;
@@ -400,6 +451,13 @@ public class Styles{
             background = windowEmpty;
             titleFontColor = Pal.accent;
         }};
+
+        defaultTree = new TreeStyle(){{
+            plus = Icon.downOpen;
+            minus = Icon.upOpen;
+            background = black5;
+            over = flatOver;
+        }};
     }
 
     private static Drawable createFlatDown(){
diff --git a/core/src/mindustry/ui/WarningBar.java b/core/src/mindustry/ui/WarningBar.java
index efa124f8ab..c528c308a5 100644
--- a/core/src/mindustry/ui/WarningBar.java
+++ b/core/src/mindustry/ui/WarningBar.java
@@ -2,6 +2,7 @@ package mindustry.ui;
 
 import arc.graphics.g2d.*;
 import arc.scene.*;
+import arc.scene.ui.layout.*;
 import mindustry.graphics.*;
 
 public class WarningBar extends Element{
@@ -27,7 +28,7 @@ public class WarningBar extends Element{
             rx + barWidth, y
             );
         }
-        Lines.stroke(3f);
+        Lines.stroke(Scl.scl(3f));
         Lines.line(x, y, x + width, y);
         Lines.line(x, y + height, x + width, y + height);
 
diff --git a/core/src/mindustry/ui/dialogs/AboutDialog.java b/core/src/mindustry/ui/dialogs/AboutDialog.java
index 0e86d0ee64..24a49ced6c 100644
--- a/core/src/mindustry/ui/dialogs/AboutDialog.java
+++ b/core/src/mindustry/ui/dialogs/AboutDialog.java
@@ -35,36 +35,36 @@ public class AboutDialog extends BaseDialog{
         buttons.clear();
 
         float h = Core.graphics.isPortrait() ? 90f : 80f;
-        float w = Core.graphics.isPortrait() ? 330f : 600f;
+        float w = Core.graphics.isPortrait() ? 400f : 600f;
 
         Table in = new Table();
         ScrollPane pane = new ScrollPane(in);
 
         for(LinkEntry link : Links.getLinks()){
-            if((ios || OS.isMac || steam) && bannedItems.contains(link.name)){
+            if((ios || steam) && bannedItems.contains(link.name)){
                 continue;
             }
 
-            Table table = new Table(Tex.underline);
+            Table table = new Table(Styles.grayPanel);
             table.margin(0);
             table.table(img -> {
                 img.image().height(h - 5).width(40f).color(link.color);
                 img.row();
-                img.image().height(5).width(40f).color(link.color.cpy().mul(0.8f, 0.8f, 0.8f, 1f));
+                img.image().height(5).width(40f).color(link.color.cpy().mul(0.6f, 0.6f, 0.8f, 1f));
             }).expandY();
 
             table.table(i -> {
-                i.background(Tex.buttonEdge3);
+                i.background(Styles.grayPanel);
                 i.image(link.icon);
             }).size(h - 5, h);
 
             table.table(inset -> {
                 inset.add("[accent]" + link.title).growX().left();
                 inset.row();
-                inset.labelWrap(link.description).width(w - 100f).color(Color.lightGray).growX();
+                inset.labelWrap(link.description).width(w - 100f - h).color(Color.lightGray).growX();
             }).padLeft(8);
 
-            table.button(Icon.link, () -> {
+            table.button(Icon.link, Styles.clearNonei, () -> {
                 if(link.name.equals("wiki")) Events.fire(Trigger.openWiki);
 
                 if(!Core.app.openURI(link.link)){
@@ -84,12 +84,6 @@ public class AboutDialog extends BaseDialog{
 
         buttons.button("@credits", this::showCredits).size(200f, 64f);
 
-        if(Core.graphics.isPortrait()){
-            for(Cell<?> cell : buttons.getCells()){
-                cell.width(140f);
-            }
-        }
-
     }
 
     public void showCredits(){
diff --git a/core/src/mindustry/ui/dialogs/AdminsDialog.java b/core/src/mindustry/ui/dialogs/AdminsDialog.java
index 04bdf379d7..0d3eedba10 100644
--- a/core/src/mindustry/ui/dialogs/AdminsDialog.java
+++ b/core/src/mindustry/ui/dialogs/AdminsDialog.java
@@ -1,5 +1,6 @@
 package mindustry.ui.dialogs;
 
+import arc.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import mindustry.gen.*;
@@ -39,7 +40,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", Core.bundle.format("@confirmunadmin", info.lastName), () -> {
                     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/BaseDialog.java b/core/src/mindustry/ui/dialogs/BaseDialog.java
index b99b164ca4..d6852be3b8 100644
--- a/core/src/mindustry/ui/dialogs/BaseDialog.java
+++ b/core/src/mindustry/ui/dialogs/BaseDialog.java
@@ -11,7 +11,8 @@ import mindustry.graphics.*;
 import static mindustry.Vars.*;
 
 public class BaseDialog extends Dialog{
-    private boolean wasPaused;
+    protected boolean wasPaused;
+    /** If true, this dialog will pause the game while open. */
     protected boolean shouldPause;
 
     public BaseDialog(String title, DialogStyle style){
@@ -19,20 +20,17 @@ public class BaseDialog extends Dialog{
         setFillParent(true);
         this.title.setAlignment(Align.center);
         titleTable.row();
-        titleTable.image(Tex.whiteui, Pal.accent)
-        .growX().height(3f).pad(4f);
+        titleTable.image(Tex.whiteui, Pal.accent).growX().height(3f).pad(4f);
 
         hidden(() -> {
-            if(shouldPause && state.isGame()){
-                if(!wasPaused || net.active()){
-                    state.set(State.playing);
-                }
+            if(shouldPause && state.isGame() && !net.active() && !wasPaused){
+                state.set(State.playing);
             }
             Sounds.back.play();
         });
 
         shown(() -> {
-            if(shouldPause && state.isGame()){
+            if(shouldPause && state.isGame() && !net.active()){
                 wasPaused = state.is(State.paused);
                 state.set(State.paused);
             }
@@ -43,6 +41,14 @@ public class BaseDialog extends Dialog{
         this(title, Core.scene.getStyle(DialogStyle.class));
     }
 
+    /** Places the buttons as an overlay on top of the content. Used when the content can be scrolled through.*/
+    protected void makeButtonOverlay(){
+        clearChildren();
+        add(titleTable).growX().row();
+        stack(cont, buttons).grow();
+        buttons.bottom();
+    }
+
     protected void onResize(Runnable run){
         Events.on(ResizeEvent.class, event -> {
             if(isShown() && Core.scene.getDialog() == this){
@@ -56,11 +62,15 @@ public class BaseDialog extends Dialog{
        closeOnBack();
     }
 
-    @Override
-    public void addCloseButton(){
-        buttons.defaults().size(210f, 64f);
-        buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
+    public void addCloseButton(float width){
+        buttons.defaults().size(width, 64f);
+        buttons.button("@back", Icon.left, this::hide).size(width, 64f);
 
         addCloseListener();
     }
+
+    @Override
+    public void addCloseButton(){
+        addCloseButton(210f);
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/CampaignCompleteDialog.java b/core/src/mindustry/ui/dialogs/CampaignCompleteDialog.java
new file mode 100644
index 0000000000..6508b99c68
--- /dev/null
+++ b/core/src/mindustry/ui/dialogs/CampaignCompleteDialog.java
@@ -0,0 +1,45 @@
+package mindustry.ui.dialogs;
+
+import arc.*;
+import arc.math.*;
+import arc.scene.actions.*;
+import mindustry.*;
+import mindustry.core.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+import static arc.scene.actions.Actions.*;
+
+public class CampaignCompleteDialog extends BaseDialog{
+
+    public CampaignCompleteDialog(){
+        super("");
+
+        addCloseListener();
+        shouldPause = true;
+
+        buttons.defaults().size(210f, 64f);
+        buttons.button("@menu", Icon.left, () -> {
+            hide();
+            Vars.ui.paused.runExitSave();
+        });
+
+        buttons.button("@continue", Icon.ok, this::hide);
+    }
+
+    public void show(Planet planet){
+        cont.clear();
+
+        cont.add(Core.bundle.format("campaign.complete", "[#" + planet.iconColor + "]" + planet.localizedName + "[]")).row();
+
+        float playtime = planet.sectors.sumf(s -> s.hasSave() ? s.save.meta.timePlayed : 0) / 1000f;
+
+        //TODO needs more info?
+        cont.add(Core.bundle.format("campaign.playtime", UI.formatTime(playtime))).left().row();
+
+        setTranslation(0f, -Core.graphics.getHeight());
+        color.a = 0f;
+
+        show(Core.scene, Actions.sequence(parallel(fadeIn(1.1f, Interp.fade), translateBy(0f, Core.graphics.getHeight(), 6f, Interp.pow5Out))));
+    }
+}
diff --git a/core/src/mindustry/ui/dialogs/CampaignRulesDialog.java b/core/src/mindustry/ui/dialogs/CampaignRulesDialog.java
new file mode 100644
index 0000000000..cebe4c72b3
--- /dev/null
+++ b/core/src/mindustry/ui/dialogs/CampaignRulesDialog.java
@@ -0,0 +1,100 @@
+package mindustry.ui.dialogs;
+
+import arc.*;
+import arc.func.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+
+public class CampaignRulesDialog extends BaseDialog{
+    Planet planet;
+    Table current;
+
+    public CampaignRulesDialog(){
+        super("@campaign.difficulty");
+
+        addCloseButton();
+
+        hidden(() -> {
+            if(planet != null){
+                planet.saveRules();
+
+                if(Vars.state.isGame() && Vars.state.isCampaign() && Vars.state.getPlanet() == planet){
+                    planet.campaignRules.apply(planet, Vars.state.rules);
+                    Call.setRules(Vars.state.rules);
+                }
+            }
+        });
+
+        onResize(() -> {
+            rebuild();
+        });
+    }
+
+    void rebuild(){
+        CampaignRules rules = planet.campaignRules;
+        cont.clear();
+
+        cont.top().pane(inner -> {
+            inner.top().left().defaults().fillX().left().pad(5);
+            current = inner;
+
+            current.table(Tex.button, t -> {
+                t.margin(10f);
+                var group = new ButtonGroup<>();
+                var style = Styles.flatTogglet;
+
+                t.defaults().size(140f, 50f);
+
+                for(Difficulty diff : Difficulty.all){
+                    t.button(diff.localized(), style, () -> {
+                        rules.difficulty = diff;
+                    }).group(group).checked(b -> rules.difficulty == diff);
+
+                    if(Core.graphics.isPortrait() && diff.ordinal() % 2 == 1){
+                        t.row();
+                    }
+                }
+            }).left().fill(false).expand(false, false).row();
+
+            if(planet.allowSectorInvasion){
+                check("@rules.invasions", b -> rules.sectorInvasion = b, () -> rules.sectorInvasion);
+            }
+
+            check("@rules.fog", b -> rules.fog = b, () -> rules.fog);
+            check("@rules.showspawns", b -> rules.showSpawns = b, () -> rules.showSpawns);
+            check("@rules.randomwaveai", b -> rules.randomWaveAI = b, () -> rules.randomWaveAI);
+
+            //TODO: this is intentionally hidden until the new mechanics have been well-tested. I don't want people immediately switching to the old mechanics
+            if(planet.allowLegacyLaunchPads){
+            //    check("@rules.legacylaunchpads", b -> rules.legacyLaunchPads = b, () -> rules.legacyLaunchPads);
+            }
+        }).growY();
+    }
+
+    public void show(Planet planet){
+        this.planet = planet;
+
+        rebuild();
+        show();
+    }
+
+    void check(String text, Boolc cons, Boolp prov){
+        check(text, cons, prov, () -> true);
+    }
+
+    void check(String text, Boolc cons, Boolp prov, Boolp condition){
+        String infoText = text.substring(1) + ".info";
+        var cell = current.check(text, cons).checked(prov.get()).update(a -> a.setDisabled(!condition.get()));
+        if(Core.bundle.has(infoText)){
+            cell.tooltip(text + ".info");
+        }
+        cell.get().left();
+        current.row();
+    }
+
+}
diff --git a/core/src/mindustry/ui/dialogs/ColorPicker.java b/core/src/mindustry/ui/dialogs/ColorPicker.java
index 80c042e1eb..f5e096c745 100644
--- a/core/src/mindustry/ui/dialogs/ColorPicker.java
+++ b/core/src/mindustry/ui/dialogs/ColorPicker.java
@@ -2,13 +2,21 @@ package mindustry.ui.dialogs;
 
 import arc.func.*;
 import arc.graphics.*;
+import arc.graphics.Texture.*;
+import arc.graphics.g2d.*;
+import arc.scene.*;
 import arc.scene.ui.*;
+import arc.util.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
 
 public class ColorPicker extends BaseDialog{
+    private static Texture hueTex;
+
     private Cons<Color> cons = c -> {};
     Color current = new Color();
+    float h, s, v, a;
+    TextField hexField;
+    Slider hSlider, sSlider, vSlider, aSlider;
 
     public ColorPicker(){
         super("@pickcolor");
@@ -23,6 +31,17 @@ public class ColorPicker extends BaseDialog{
         this.cons = consumer;
         show();
 
+        if(hueTex == null){
+            hueTex = Pixmaps.hueTexture(128, 1);
+            hueTex.setFilter(TextureFilter.linear);
+        }
+
+        float[] values = color.toHsv(new float[3]);
+        h = values[0];
+        s = values[1];
+        v = values[2];
+        a = color.a;
+
         cont.clear();
         cont.pane(t -> {
             t.table(Tex.pane, i -> {
@@ -32,26 +51,114 @@ public class ColorPicker extends BaseDialog{
                 }}).size(200f);
             }).colspan(2).padBottom(5);
 
-            float w = 150f;
-
             t.row();
 
-            t.defaults().padBottom(4);
-            t.add("R").color(Pal.remove);
-            t.slider(0f, 1f, 0.01f, current.r, current::r).width(w);
-            t.row();
-            t.add("G").color(Color.lime);
-            t.slider(0f, 1f, 0.01f, current.g, current::g).width(w);
-            t.row();
-            t.add("B").color(Color.royal);
-            t.slider(0f, 1f, 0.01f, current.b, current::b).width(w);
-            t.row();
+            t.defaults().padBottom(6).width(370f).height(44f);
+
+            t.stack(new Image(new TextureRegion(hueTex)), hSlider = new Slider(0f, 360f, 0.3f, false){{
+                setValue(h);
+                moved(value -> {
+                    h = value;
+                    updateColor();
+                });
+            }}).row();
+
+            t.stack(new Element(){
+                @Override
+                public void draw(){
+                    float first = Tmp.c1.set(current).saturation(0f).a(parentAlpha).toFloatBits();
+                    float second = Tmp.c1.set(current).saturation(1f).a(parentAlpha).toFloatBits();
+
+                    Fill.quad(
+                        x, y, first,
+                        x + width, y, second,
+                        x + width, y + height, second,
+                        x, y + height, first
+                    );
+                }
+            }, sSlider = new Slider(0f, 1f, 0.001f, false){{
+                setValue(s);
+                moved(value -> {
+                    s = value;
+                    updateColor();
+                });
+            }}).row();
+
+            t.stack(new Element(){
+                @Override
+                public void draw(){
+                    float first = Tmp.c1.set(current).value(0f).a(parentAlpha).toFloatBits();
+                    float second = Tmp.c1.fromHsv(h, s, 1f).a(parentAlpha).toFloatBits();
+
+                    Fill.quad(
+                    x, y, first,
+                    x + width, y, second,
+                    x + width, y + height, second,
+                    x, y + height, first
+                    );
+                }
+            }, vSlider = new Slider(0f, 1f, 0.001f, false){{
+                setValue(v);
+
+                moved(value -> {
+                    v = value;
+                    updateColor();
+                });
+            }}).row();
+
             if(alpha){
-                t.add("A");
-                t.slider(0f, 1f, 0.01f, current.a, current::a).width(w);
-                t.row();
+                t.stack(new Image(Tex.alphaBgLine), new Element(){
+                    @Override
+                    public void draw(){
+                        float first = Tmp.c1.set(current).a(0f).toFloatBits();
+                        float second = Tmp.c1.set(current).a(parentAlpha).toFloatBits();
+
+                        Fill.quad(
+                        x, y, first,
+                        x + width, y, second,
+                        x + width, y + height, second,
+                        x, y + height, first
+                        );
+                    }
+                }, aSlider = new Slider(0f, 1f, 0.001f, false){{
+                    setValue(a);
+
+                    moved(value -> {
+                        a = value;
+                        updateColor();
+                    });
+                }}).row();
             }
-        });
+
+            hexField = t.field(current.toString(), value -> {
+                try{
+                    Color.valueOf(current, value);
+                    current.toHsv(values);
+                    h = values[0];
+                    s = values[1];
+                    v = values[2];
+                    a = current.a;
+
+                    hSlider.setValue(h);
+                    sSlider.setValue(s);
+                    vSlider.setValue(v);
+                    if(aSlider != null){
+                        aSlider.setValue(a);
+                    }
+
+                    updateColor(false);
+                }catch(Exception ignored){
+                }
+            }).size(130f, 40f).valid(text -> {
+                //garbage performance but who cares this runs only every key type anyway
+                try{
+                    Color.valueOf(text);
+                    return true;
+                }catch(Exception e){
+                    return false;
+                }
+            }).get();
+        }).grow();
 
         buttons.clear();
         addCloseButton();
@@ -60,4 +167,21 @@ public class ColorPicker extends BaseDialog{
             hide();
         });
     }
+
+    void updateColor(){
+        updateColor(true);
+    }
+
+    void updateColor(boolean updateField){
+        current.fromHsv(h, s, v);
+        current.a = a;
+
+        if(hexField != null && updateField){
+            String val = current.toString();
+            if(current.a >= 0.9999f){
+                val = val.substring(0, 6);
+            }
+            hexField.setText(val);
+        }
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
index b076d4b766..0464bde619 100644
--- a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
+++ b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
@@ -1,20 +1,32 @@
 package mindustry.ui.dialogs;
 
+import arc.*;
+import arc.scene.actions.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.ctype.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.ui.*;
+import mindustry.input.*;
 import mindustry.world.meta.*;
 
+import static arc.Core.*;
+import static mindustry.Vars.*;
+
 public class ContentInfoDialog extends BaseDialog{
 
     public ContentInfoDialog(){
         super("@info.title");
 
         addCloseButton();
+
+        keyDown(key -> {
+            if(key == keybinds.get(Binding.block_info).key){
+                Core.app.post(this::hide);
+            }
+        });
     }
 
     public void show(UnlockableContent content){
@@ -27,10 +39,8 @@ public class ContentInfoDialog extends BaseDialog{
         content.checkStats();
 
         table.table(title1 -> {
-            int size = 8 * 6;
-
-            title1.image(content.icon(Cicon.xlarge)).size(size).scaling(Scaling.fit);
-            title1.add("[accent]" + content.localizedName).padLeft(5);
+            title1.image(content.uiIcon).size(iconXLarge).scaling(Scaling.fit);
+            title1.add("[accent]" + content.localizedName + (settings.getBool("console") ? "\n[gray]" + content.name : "")).padLeft(5);
         });
 
         table.row();
@@ -59,36 +69,43 @@ public class ContentInfoDialog extends BaseDialog{
 
             if(map.size == 0) continue;
 
-            //TODO check
             if(stats.useCategories){
-                table.add("@category." + cat.name()).color(Pal.accent).fillX();
+                table.add("@category." + cat.name).color(Pal.accent).fillX();
                 table.row();
             }
 
             for(Stat stat : map.keys()){
                 table.table(inset -> {
                     inset.left();
-                    inset.add("[lightgray]" + stat.localized() + ":[] ").left();
+                    inset.add("[lightgray]" + stat.localized() + ":[] ").left().top();
                     Seq<StatValue> arr = map.get(stat);
                     for(StatValue value : arr){
                         value.display(inset);
                         inset.add().size(10f);
                     }
-
                 }).fillX().padLeft(10);
                 table.row();
             }
         }
 
         if(content.details != null){
-            table.add("[gray]" + content.details).pad(6).padTop(20).width(400f).wrap().fillX();
+            table.add("[gray]" + (content.unlocked() || !content.hideDetails ? content.details : Iconc.lock + " " + Core.bundle.get("unlock.incampaign"))).pad(6).padTop(20).width(400f).wrap().fillX();
             table.row();
         }
 
+        content.displayExtra(table);
+
         ScrollPane pane = new ScrollPane(table);
+        table.marginRight(30f);
+        //TODO: some things (e.g. reconstructor requirements) are too long and screw up the layout
+        //pane.setScrollingDisabled(true, false);
         cont.add(pane);
 
-        show();
+        if(isShown()){
+            show(scene, Actions.fadeIn(0f));
+        }else{
+            show();
+        }
     }
 
 }
diff --git a/core/src/mindustry/ui/dialogs/ControlsDialog.java b/core/src/mindustry/ui/dialogs/ControlsDialog.java
deleted file mode 100644
index 746470526a..0000000000
--- a/core/src/mindustry/ui/dialogs/ControlsDialog.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package mindustry.ui.dialogs;
-
-import arc.input.*;
-import arc.scene.ui.*;
-import arc.util.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-
-public class ControlsDialog extends KeybindDialog{
-
-    public ControlsDialog(){
-        setFillParent(true);
-        title.setAlignment(Align.center);
-        titleTable.row();
-        titleTable.add(new Image()).growX().height(3f).pad(4f).get().setColor(Pal.accent);
-    }
-
-    @Override
-    public void addCloseButton(){
-        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 e23d8cca38..c264dd266a 100644
--- a/core/src/mindustry/ui/dialogs/CustomGameDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomGameDialog.java
@@ -1,92 +1,16 @@
 package mindustry.ui.dialogs;
 
-import arc.*;
-import arc.graphics.g2d.*;
-import arc.scene.style.*;
-import arc.scene.ui.*;
-import arc.scene.ui.layout.*;
-import arc.util.*;
-import mindustry.*;
-import mindustry.game.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
 import mindustry.maps.*;
-import mindustry.ui.*;
 
-public class CustomGameDialog extends BaseDialog{
+public class CustomGameDialog extends MapListDialog{
     private MapPlayDialog dialog = new MapPlayDialog();
 
     public CustomGameDialog(){
-        super("@customgame");
-        addCloseButton();
-        shown(this::setup);
-        onResize(this::setup);
+        super("@customgame", false);
     }
 
-    void setup(){
-        clearChildren();
-        add(titleTable);
-        row();
-        stack(cont, buttons).grow();
-        buttons.bottom();
-        cont.clear();
-
-        Table maps = new Table();
-        maps.marginRight(14);
-        maps.marginBottom(55f);
-        ScrollPane pane = new ScrollPane(maps);
-        pane.setFadeScrollBars(false);
-
-        int maxwidth = Math.max((int)(Core.graphics.getWidth() / Scl.scl(210)), 1);
-        float images = 146f;
-
-        int i = 0;
-        maps.defaults().width(170).fillY().top().pad(4f);
-        for(Map map : Vars.maps.all()){
-
-            if(i % maxwidth == 0){
-                maps.row();
-            }
-
-            ImageButton image = new ImageButton(new TextureRegion(map.safeTexture()), Styles.cleari);
-            image.margin(5);
-            image.top();
-
-            Image img = image.getImage();
-            img.remove();
-
-            image.row();
-            image.table(t -> {
-                t.left();
-                for(Gamemode mode : Gamemode.all){
-                    TextureRegionDrawable icon = Vars.ui.getIcon("mode" + Strings.capitalize(mode.name()) + "Small");
-                    if(mode.valid(map) && Core.atlas.isFound(icon.getRegion())){
-                        t.image(icon).size(16f).pad(4f);
-                    }
-                }
-            }).left();
-            image.row();
-            image.add(map.name()).pad(1f).growX().wrap().left().get().setEllipsis(true);
-            image.row();
-            image.image(Tex.whiteui, Pal.gray).growX().pad(3).height(4f);
-            image.row();
-            image.add(img).size(images);
-
-            BorderImage border = new BorderImage(map.safeTexture(), 3f);
-            border.setScaling(Scaling.fit);
-            image.replaceImage(border);
-
-            image.clicked(() -> dialog.show(map));
-
-            maps.add(image);
-
-            i++;
-        }
-
-        if(Vars.maps.all().size == 0){
-            maps.add("@maps.none").pad(50);
-        }
-
-        cont.add(pane).uniformX();
+    @Override
+    void showMap(Map map){
+        dialog.show(map);
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index ece89b15f8..8c9e1a16c5 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -3,18 +3,20 @@ 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.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
+import mindustry.editor.BannedContentDialog;
 import mindustry.game.*;
+import mindustry.game.Rules.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.io.*;
 import mindustry.type.*;
 import mindustry.type.Weather.*;
 import mindustry.ui.*;
@@ -28,87 +30,84 @@ public class CustomRulesDialog extends BaseDialog{
     private Table main;
     private Prov<Rules> resetter;
     private LoadoutDialog loadoutDialog;
-    private BaseDialog banDialog;
+    private BannedContentDialog<Block> bannedBlocks = new BannedContentDialog<>("@bannedblocks", ContentType.block, Block::canBeBuilt);
+    private BannedContentDialog<UnitType> bannedUnits = new BannedContentDialog<>("@bannedunits", ContentType.unit, u -> !u.isHidden());
+    public boolean showRuleEditRule;
+    public Seq<Table> categories;
+    public Table current;
+    public Seq<String> categoryNames;
+    public String currentName = "";
+    public String ruleSearch = "";
+    public Seq<Runnable> additionalSetup; // for modding to easily add new rules
 
     public CustomRulesDialog(){
+        this(false);
+    }
+
+    public CustomRulesDialog(boolean showRuleEditRule){
         super("@mode.custom");
 
+        this.showRuleEditRule = showRuleEditRule;
+
         loadoutDialog = new LoadoutDialog();
-        banDialog = new BaseDialog("@bannedblocks");
-        banDialog.addCloseButton();
-
-        banDialog.shown(this::rebuildBanned);
-        banDialog.buttons.button("@addall", Icon.add, () -> {
-            rules.bannedBlocks.addAll(content.blocks().select(Block::canBeBuilt));
-            rebuildBanned();
-        }).size(180, 64f);
-
-        banDialog.buttons.button("@clear", Icon.trash, () -> {
-            rules.bannedBlocks.clear();
-            rebuildBanned();
-        }).size(180, 64f);
 
         setFillParent(true);
         shown(this::setup);
         addCloseButton();
-    }
 
-    private void rebuildBanned(){
-        float previousScroll = banDialog.cont.getChildren().isEmpty() ? 0f : ((ScrollPane)banDialog.cont.getChildren().first()).getScrollY();
-        banDialog.cont.clear();
-        banDialog.cont.pane(t -> {
-            t.margin(10f);
+        additionalSetup = new Seq<>();
+        categories = new Seq<>();
+        categoryNames = new Seq<>();
 
-            if(rules.bannedBlocks.isEmpty()){
-                t.add("@empty");
-            }
+        buttons.button("@edit", Icon.pencil, () -> {
+            BaseDialog dialog = new BaseDialog("@waves.edit");
+            dialog.addCloseButton();
+            dialog.setFillParent(false);
 
-            Seq<Block> array = Seq.with(rules.bannedBlocks);
-            array.sort();
+            dialog.cont.table(Tex.button, t -> {
+                var style = Styles.cleart;
+                t.defaults().size(280f, 64f).pad(2f);
 
-            int cols = mobile && Core.graphics.isPortrait() ? 1 : mobile ? 2 : 3;
-            int i = 0;
+                t.button("@waves.copy", Icon.copy, style, () -> {
+                    ui.showInfoFade("@copied");
 
-            for(Block block : array){
-                t.table(Tex.underline, b -> {
-                    b.left().margin(4f);
-                    b.image(block.icon(Cicon.medium)).size(Cicon.medium.size).padRight(3);
-                    b.add(block.localizedName).color(Color.lightGray).padLeft(3).growX().left().wrap();
+                    //hack: don't write the spawns, they just waste space
+                    var spawns = rules.spawns;
+                    rules.spawns = new Seq<>();
+                    Core.app.setClipboardText(JsonIO.write(rules));
+                    rules.spawns = spawns;
+                    dialog.hide();
+                }).marginLeft(12f).row();
 
-                    b.button(Icon.cancel, Styles.clearPartiali, () -> {
-                       rules.bannedBlocks.remove(block);
-                       rebuildBanned();
-                    }).size(70f).pad(-4f).padLeft(0f);
-                }).size(300f, 70f).padRight(5);
-
-                if(++i % cols == 0){
-                    t.row();
-                }
-            }
-        }).get().setScrollYForce(previousScroll);
-        banDialog.cont.row();
-        banDialog.cont.button("@add", Icon.add, () -> {
-            BaseDialog dialog = new BaseDialog("@add");
-            dialog.cont.pane(t -> {
-                t.left().margin(14f);
-                int[] i = {0};
-                content.blocks().each(b -> !rules.bannedBlocks.contains(b) && b.canBeBuilt(), b -> {
-                    int cols = mobile && Core.graphics.isPortrait() ? 4 : 12;
-                    t.button(new TextureRegionDrawable(b.icon(Cicon.medium)), Styles.cleari, () -> {
-                        rules.bannedBlocks.add(b);
-                        rebuildBanned();
-                        dialog.hide();
-                    }).size(60f).get().resizeImage(Cicon.medium.size);
-
-                    if(++i[0] % cols == 0){
-                        t.row();
+                t.button("@waves.load", Icon.download, style, () -> {
+                    try{
+                        Rules newRules = JsonIO.read(Rules.class, Core.app.getClipboardText());
+                        //objectives and spawns are considered to be map-specific; don't use them
+                        newRules.spawns = rules.spawns;
+                        newRules.objectives = rules.objectives;
+                        rules = newRules;
+                        refresh();
+                    }catch(Throwable e){
+                        Log.err(e);
+                        ui.showErrorMessage("@rules.invaliddata");
                     }
-                });
+                    dialog.hide();
+                }).disabled(Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith("{")).marginLeft(12f).row();
+
+                t.button("@settings.reset", Icon.refresh, style, () -> {
+                    rules = resetter.get();
+                    refresh();
+                }).marginLeft(12f);
             });
 
-            dialog.addCloseButton();
             dialog.show();
-        }).size(300f, 64f);
+        });
+    }
+
+    void refresh(){
+        setup();
+        requestKeyboard();
+        requestScroll();
     }
 
     public void show(Rules rules, Prov<Rules> resetter){
@@ -118,125 +117,330 @@ public class CustomRulesDialog extends BaseDialog{
     }
 
     void setup(){
+        categories.clear();
         cont.clear();
-        cont.pane(m -> main = m).get().setScrollingDisabled(true, false);
+        cont.table(t -> {
+            t.add("@search").padRight(10);
+            var field = t.field(ruleSearch, text -> {
+                ruleSearch = text.trim().replaceAll(" +", " ").toLowerCase();
+                setup();
+            }).grow().pad(8).get();
+            field.setCursorPosition(ruleSearch.length());
+            Core.scene.setKeyboardFocus(field);
+            t.button(Icon.cancel, Styles.emptyi, () -> {
+                ruleSearch = "";
+                setup();
+            }).padLeft(10f).size(35f);
+            t.button(Icon.zoom, Styles.emptyi, this::setup).size(54f);
+        }).row();
+        cont.pane(m -> main = m).scrollX(false);
         main.margin(10f);
-        main.button("@settings.reset", () -> {
-            rules = resetter.get();
-            setup();
-            requestKeyboard();
-            requestScroll();
-        }).size(300f, 50f);
-        main.left().defaults().fillX().left().pad(5);
+        main.left().defaults().fillX().left();
         main.row();
 
-        title("@rules.title.waves");
+        category("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, 1, Float.MAX_VALUE);
-        number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true);
+        check("@rules.wavesending", b -> rules.waveSending = b, () -> rules.waveSending, () -> rules.waves);
+        check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer, () -> rules.waves);
+        check("@rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies, () -> rules.waves && rules.waveTimer);
+        check("@rules.randomwaveai", b -> rules.randomWaveAI = b, () -> rules.randomWaveAI, () -> rules.waves);
+        check("@rules.airUseSpawns", b -> rules.airUseSpawns = b, () -> rules.airUseSpawns, () -> rules.waves);
+        numberi("@rules.wavelimit", f -> rules.winWave = f, () -> rules.winWave, () -> rules.waves, 0, Integer.MAX_VALUE);
+        number("@rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> rules.waves && rules.waveTimer, 1, Float.MAX_VALUE);
+        number("@rules.initialwavespacing", false, f -> rules.initialWaveSpacing = f * 60f, () -> rules.initialWaveSpacing / 60f, () -> rules.waves && rules.waveTimer, 0, Float.MAX_VALUE);
+        number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> rules.waves);
 
-        title("@rules.title.resourcesbuilding");
+        category("resourcesbuilding");
+        check("@rules.alloweditworldprocessors", b -> rules.allowEditWorldProcessors = b, () -> rules.allowEditWorldProcessors);
         check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources);
+        check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore);
+        check("@rules.derelictrepair", b -> rules.derelictRepair = b, () -> rules.derelictRepair);
         check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
         check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed);
+        check("@rules.coreincinerates", b -> rules.coreIncinerates = b, () -> rules.coreIncinerates);
+        check("@rules.cleanupdeadteams", b -> rules.cleanupDeadTeams = b, () -> rules.cleanupDeadTeams, () -> rules.pvp);
+        check("@rules.disableworldprocessors", b -> rules.disableWorldProcessors = b, () -> rules.disableWorldProcessors);
         number("@rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources);
-        number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier, 0.00001f, 10000f);
+        number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier, 0.001f, 50f);
         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",
-            () -> loadoutDialog.show(Blocks.coreShard.itemCapacity, rules.loadout,
-                i -> true,
-                () -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
-                () -> {}, () -> {}
-        )).left().width(300f);
-        main.row();
+        if(Core.bundle.get("configure").toLowerCase().contains(ruleSearch)){
+            current.button("@configure",
+                () -> loadoutDialog.show(999999, rules.loadout,
+                    i -> true,
+                    () -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
+                    () -> {}, () -> {}
+            )).left().width(300f).row();
+        }
 
-        main.button("@bannedblocks", banDialog::show).left().width(300f);
-        main.row();
+        if(Core.bundle.get("bannedblocks").toLowerCase().contains(ruleSearch)){
+            current.button("@bannedblocks", () -> bannedBlocks.show(rules.bannedBlocks)).left().width(300f).row();
+        }
+        check("@rules.hidebannedblocks", b -> rules.hideBannedBlocks = b, () -> rules.hideBannedBlocks);
+        check("@bannedblocks.whitelist", b -> rules.blockWhitelist = b, () -> rules.blockWhitelist);
 
-        title("@rules.title.unit");
-        check("@rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo);
-        number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
+
+        category("unit");
+        check("@rules.unitcapvariable", b -> rules.unitCapVariable = b, () -> rules.unitCapVariable);
+        check("@rules.unitpayloadsexplode", b -> rules.unitPayloadsExplode = b, () -> rules.unitPayloadsExplode);
+        numberi("@rules.unitcap", f -> rules.unitCap = f, () -> rules.unitCap, -999, 999);
         number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
-        number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0.00001f, 100f);
+        number("@rules.unitcrashdamagemultiplier", f -> rules.unitCrashDamageMultiplier = f, () -> rules.unitCrashDamageMultiplier);
+        number("@rules.unitminespeedmultiplier", f -> rules.unitMineSpeedMultiplier = f, () -> rules.unitMineSpeedMultiplier);
+        number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0f, 50f);
+        number("@rules.unitcostmultiplier", f -> rules.unitCostMultiplier = f, () -> rules.unitCostMultiplier);
+        number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
 
-        title("@rules.title.enemy");
+        if(Core.bundle.get("bannedunits").toLowerCase().contains(ruleSearch)){
+            current.button("@bannedunits", () -> bannedUnits.show(rules.bannedUnits)).left().width(300f).row();
+        }
+        check("@bannedunits.whitelist", b -> rules.unitWhitelist = b, () -> rules.unitWhitelist);
+
+
+        category("enemy");
         check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
-        check("@rules.buildai", b -> rules.teams.get(rules.waveTeam).ai = rules.teams.get(rules.waveTeam).infiniteResources = b, () -> rules.teams.get(rules.waveTeam).ai);
-        number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
+        check("@rules.corecapture", b -> rules.coreCapture = b, () -> rules.coreCapture);
+        check("@rules.placerangecheck", b -> rules.placeRangeCheck = b, () -> rules.placeRangeCheck);
+        check("@rules.polygoncoreprotection", b -> rules.polygonCoreProtection = b, () -> rules.polygonCoreProtection);
+        number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200), () -> !rules.polygonCoreProtection);
 
-        title("@rules.title.environment");
+
+        category("environment");
         check("@rules.explosions", b -> rules.damageExplosions = b, () -> rules.damageExplosions);
         check("@rules.fire", b -> rules.fire = b, () -> rules.fire);
+        check("@rules.fog", b -> rules.fog = b, () -> rules.fog);
         check("@rules.lighting", b -> rules.lighting = b, () -> rules.lighting);
-        check("@rules.enemyLights", b -> rules.enemyLights = b, () -> rules.enemyLights);
 
-        main.button(b -> {
-            b.left();
-            b.table(Tex.pane, in -> {
-                in.stack(new Image(Tex.alphaBg), new Image(Tex.whiteui){{
-                    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).row();
+        check("@rules.limitarea", b -> rules.limitMapArea = b, () -> rules.limitMapArea);
+        numberi("x", x -> rules.limitX = x, () -> rules.limitX, () -> rules.limitMapArea, 0, 10000);
+        numberi("y", y -> rules.limitY = y, () -> rules.limitY, () -> rules.limitMapArea, 0, 10000);
+        numberi("w", w -> rules.limitWidth = w, () -> rules.limitWidth, () -> rules.limitMapArea, 0, 10000);
+        numberi("h", h -> rules.limitHeight = h, () -> rules.limitHeight, () -> rules.limitMapArea, 0, 10000);
 
-        main.button("@rules.weather", this::weatherDialog).width(250f).left().row();
+        number("@rules.solarmultiplier", f -> rules.solarMultiplier = f, () -> rules.solarMultiplier);
+
+        if(Core.bundle.get("rules.ambientlight").toLowerCase().contains(ruleSearch)){
+            current.button(b -> {
+                b.left();
+                b.table(Tex.pane, in -> {
+                    in.stack(new Image(Tex.alphaBg), new Image(Tex.whiteui){{
+                        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).row();
+        }
+
+        if(Core.bundle.get("rules.weather").toLowerCase().contains(ruleSearch)){
+            current.button("@rules.weather", this::weatherDialog).width(250f).left().row();
+        }
+
+
+        category("planet");
+        if(Core.bundle.get("rules.title.planet").toLowerCase().contains(ruleSearch)){
+            current.table(Tex.button, t -> {
+                t.margin(10f);
+                var group = new ButtonGroup<>();
+                var style = Styles.flatTogglet;
+
+                t.defaults().size(140f, 50f);
+
+                for(Planet planet : content.planets().select(p -> p.accessible && p.visible && p.isLandable())){
+                    t.button(planet.localizedName, style, () -> {
+                        planet.applyRules(rules, true);
+                    }).group(group).checked(b -> rules.planet == planet);
+
+                    if(t.getChildren().size % 3 == 0){
+                        t.row();
+                    }
+                }
+
+                t.button("@rules.anyenv", style, () -> {
+                    rules.env = Vars.defaultEnv;
+                    rules.planet = Planets.sun;
+                }).group(group).checked(b -> rules.planet == Planets.sun);
+            }).left().fill(false).expand(false, false).row();
+        }
+
+
+        category("teams");
+        //not sure where else to put this
+        if(showRuleEditRule){
+            check("@rules.allowedit", b -> rules.allowEditRules = b, () -> rules.allowEditRules);
+        }
+        team("@rules.playerteam", t -> rules.defaultTeam = t, () -> rules.defaultTeam);
+        team("@rules.enemyteam", t -> rules.waveTeam = t, () -> rules.waveTeam);
+
+        for(Team team : Team.baseTeams){
+            boolean[] shown = {false};
+            Table wasCurrent = current;
+
+            Table teamRules = new Table(); // just button and collapser in one table
+            teamRules.button(team.coloredName(), Icon.downOpen, Styles.togglet, () -> {
+                shown[0] = !shown[0];
+            }).marginLeft(14f).width(260f).height(55f).update(t -> {
+                ((Image)t.getChildren().get(1)).setDrawable(shown[0] ? Icon.upOpen : Icon.downOpen);
+                t.setChecked(shown[0]);
+            }).left().padBottom(2f).row();
+
+            teamRules.collapser(c -> {
+                c.left().defaults().fillX().left().pad(5);
+                current = c;
+                TeamRule teams = rules.teams.get(team);
+
+                number("@rules.blockhealthmultiplier", f -> teams.blockHealthMultiplier = f, () -> teams.blockHealthMultiplier);
+                number("@rules.blockdamagemultiplier", f -> teams.blockDamageMultiplier = f, () -> teams.blockDamageMultiplier);
+
+                check("@rules.rtsai", b -> teams.rtsAi = b, () -> teams.rtsAi, () -> team != rules.defaultTeam);
+                numberi("@rules.rtsminsquadsize", f -> teams.rtsMinSquad = f, () -> teams.rtsMinSquad, () -> teams.rtsAi, 0, 100);
+                numberi("@rules.rtsmaxsquadsize", f -> teams.rtsMaxSquad = f, () -> teams.rtsMaxSquad, () -> teams.rtsAi, 1, 1000);
+                number("@rules.rtsminattackweight", f -> teams.rtsMinWeight = f, () -> teams.rtsMinWeight, () -> teams.rtsAi);
+
+                //disallow on Erekir (this is broken for mods I'm sure, but whatever)
+                check("@rules.buildai", b -> teams.buildAi = b, () -> teams.buildAi, () -> team != rules.defaultTeam && rules.env != Planets.erekir.defaultEnv && !rules.pvp);
+                number("@rules.buildaitier", false, f -> teams.buildAiTier = f, () -> teams.buildAiTier, () -> teams.buildAi && rules.env != Planets.erekir.defaultEnv && !rules.pvp, 0, 1);
+
+                number("@rules.extracorebuildradius", f -> teams.extraCoreBuildRadius = f * tilesize, () -> Math.min(teams.extraCoreBuildRadius / tilesize, 200), () -> !rules.polygonCoreProtection);
+
+                check("@rules.infiniteresources", b -> teams.infiniteResources = b, () -> teams.infiniteResources);
+                number("@rules.buildspeedmultiplier", f -> teams.buildSpeedMultiplier = f, () -> teams.buildSpeedMultiplier, 0.001f, 50f);
+
+                number("@rules.unitdamagemultiplier", f -> teams.unitDamageMultiplier = f, () -> teams.unitDamageMultiplier);
+                number("@rules.unitcrashdamagemultiplier", f -> teams.unitCrashDamageMultiplier = f, () -> teams.unitCrashDamageMultiplier);
+                number("@rules.unitminespeedmultiplier", f -> teams.unitMineSpeedMultiplier = f, () -> teams.unitMineSpeedMultiplier);
+                number("@rules.unitbuildspeedmultiplier", f -> teams.unitBuildSpeedMultiplier = f, () -> teams.unitBuildSpeedMultiplier, 0.001f, 50f);
+                number("@rules.unitcostmultiplier", f -> teams.unitCostMultiplier = f, () -> teams.unitCostMultiplier);
+                number("@rules.unithealthmultiplier", f -> teams.unitHealthMultiplier = f, () -> teams.unitHealthMultiplier);
+
+                if(!current.hasChildren()){
+                    teamRules.clear();
+                }else{
+                    wasCurrent.add(teamRules).row();
+                }
+
+                current = wasCurrent;
+            }, () -> shown[0]).left().growX().row();
+        }
+
+        additionalSetup.each(Runnable::run);
+
+        for(var i = 0; i < categories.size; i++){
+            addToMain(categories.get(i), Core.bundle.get("rules.title." + categoryNames.get(i)));
+        }
     }
 
-    void number(String text, Floatc cons, Floatp prov){
+    public void category(String name){
+        current = new Table();
+        current.left().defaults().fillX().left().pad(5);
+        currentName = name;
+        categories.add(current);
+        categoryNames.add(currentName);
+    }
+
+    void addToMain(Table category, String title){
+        if(category.hasChildren()){
+            main.add(title).color(Pal.accent).padTop(20).padRight(100f).padBottom(-3).fillX().left().pad(5).row();
+            main.image().color(Pal.accent).height(3f).padRight(100f).padBottom(20).fillX().left().pad(5).row();
+            main.add(category).row();
+        }
+    }
+
+    public void team(String text, Cons<Team> cons, Prov<Team> prov){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        current.table(t -> {
+            t.left();
+            t.add(text).left().padRight(5);
+
+            for(Team team : Team.baseTeams){
+                t.button(Tex.whiteui, Styles.squareTogglei, 38f, () -> {
+                    cons.get(team);
+                }).pad(1f).checked(b -> prov.get() == team).size(60f).tooltip(team.coloredName()).with(i -> i.getStyle().imageUpColor = team.color);
+            }
+        }).padTop(0).row();
+    }
+
+    public void number(String text, Floatc cons, Floatp prov){
         number(text, false, cons, prov, () -> true, 0, Float.MAX_VALUE);
     }
 
-    void number(String text, Floatc cons, Floatp prov, float min, float max){
+    public void number(String text, Floatc cons, Floatp prov, float min, float max){
         number(text, false, cons, prov, () -> true, min, max);
     }
 
-    void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition){
+    public void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition){
         number(text, integer, cons, prov, condition, 0, Float.MAX_VALUE);
     }
 
-    void number(String text, Floatc cons, Floatp prov, Boolp condition){
+    public void number(String text, Floatc cons, Floatp prov, Boolp condition){
         number(text, false, cons, prov, condition, 0, Float.MAX_VALUE);
     }
 
-    void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition, float min, float max){
-        main.table(t -> {
+    public void numberi(String text, Intc cons, Intp prov, int min, int max){
+        numberi(text, cons, prov, () -> true, min, max);
+    }
+
+    public void numberi(String text, Intc cons, Intp prov, Boolp condition, int min, int max){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        var cell = current.table(t -> {
+            t.left();
+            t.add(text).left().padRight(5)
+                .update(a -> a.setColor(condition.get() ? Color.white : Color.gray));
+            t.field((prov.get()) + "", s -> cons.get(Strings.parseInt(s)))
+                .update(a -> a.setDisabled(!condition.get()))
+                .padRight(100f)
+                .valid(f -> Strings.parseInt(f) >= min && Strings.parseInt(f) <= max).width(120f).left();
+        }).padTop(0);
+        ruleInfo(cell, text);
+        current.row();
+    }
+
+    public void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition, float min, float max){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        var cell = current.table(t -> {
             t.left();
             t.add(text).left().padRight(5)
             .update(a -> a.setColor(condition.get() ? Color.white : Color.gray));
             t.field((integer ? (int)prov.get() : prov.get()) + "", s -> cons.get(Strings.parseFloat(s)))
             .padRight(100f)
             .update(a -> a.setDisabled(!condition.get()))
-            .valid(f -> Strings.canParsePositiveFloat(f) && Strings.parseFloat(f) >= min && Strings.parseFloat(f) <= max).width(120f).left().addInputDialog();
+            .valid(f -> Strings.canParsePositiveFloat(f) && Strings.parseFloat(f) >= min && Strings.parseFloat(f) <= max).width(120f).left();
         }).padTop(0);
-        main.row();
+        ruleInfo(cell, text);
+        current.row();
     }
 
-    void check(String text, Boolc cons, Boolp prov){
+    public void check(String text, Boolc cons, Boolp prov){
         check(text, cons, prov, () -> true);
     }
 
-    void check(String text, Boolc cons, Boolp prov, Boolp condition){
-        main.check(text, cons).checked(prov.get()).update(a -> a.setDisabled(!condition.get())).padRight(100f).get().left();
-        main.row();
+    public void check(String text, Boolc cons, Boolp prov, Boolp condition){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        var cell = current.check(text, cons).checked(prov.get()).update(a -> a.setDisabled(!condition.get()));
+        cell.get().left();
+        ruleInfo(cell, text);
+        current.row();
     }
 
-    void title(String text){
-        main.add(text).color(Pal.accent).padTop(20).padRight(100f).padBottom(-3);
-        main.row();
-        main.image().color(Pal.accent).height(3f).padRight(100f).padBottom(20);
-        main.row();
+    public void ruleInfo(Cell<?> cell, String text){
+        if(Core.bundle.has(text.substring(1) + ".info")){
+            if(mobile){
+                Table table = new Table();
+                table.add(cell.get()).left().expandX().fillX();
+                cell.clearElement();
+                table.button(Icon.infoSmall, () -> ui.showInfo(text + ".info")).size(32f).padRight(24f).right();
+                cell.setElement(table).left().expandX().fillX();
+            }else{
+                cell.tooltip(text + ".info");
+            }
+        }
     }
 
     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();
+            .size(90f, 40f).pad(2f);
     }
 
     void weatherDialog(){
@@ -247,7 +451,7 @@ public class CustomRulesDialog extends BaseDialog{
 
             rebuild[0] = () -> {
                 base.clearChildren();
-                int cols = Math.max(1, Core.graphics.getWidth() / 460);
+                int cols = Math.max(1, (int)(Core.graphics.getWidth() / Scl.scl(450)));
                 int idx = 0;
 
                 for(WeatherEntry entry : rules.weather){
@@ -323,8 +527,9 @@ public class CustomRulesDialog extends BaseDialog{
                 t.background(Tex.button);
                 int i = 0;
                 for(Weather weather : content.<Weather>getBy(ContentType.weather)){
+                    if(weather.hidden) continue;
 
-                    t.button(weather.localizedName, Styles.cleart, () -> {
+                    t.button(weather.localizedName, Styles.flatt, () -> {
                         rules.weather.add(new WeatherEntry(weather));
                         rebuild[0].run();
 
@@ -337,19 +542,6 @@ public class CustomRulesDialog extends BaseDialog{
             add.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 e275e410e0..262afe96e6 100644
--- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java
+++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java
@@ -5,64 +5,137 @@ import arc.graphics.*;
 import arc.input.*;
 import arc.math.*;
 import arc.scene.event.*;
+import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 
+import static arc.Core.*;
 import static mindustry.Vars.*;
 
 public class DatabaseDialog extends BaseDialog{
+    private TextField search;
+    private Table all = new Table();
+
+    private @Nullable Seq<UnlockableContent> allTabs;
+    //sun means "all content"
+    private UnlockableContent tab = Planets.sun;
 
     public DatabaseDialog(){
         super("@database");
 
         shouldPause = true;
         addCloseButton();
-        shown(this::rebuild);
+        shown(() -> {
+            checkTabList();
+            if(state.isCampaign() && allTabs.contains(state.getPlanet())){
+                tab = state.getPlanet();
+            }else if(state.isGame() && state.rules.planet != null && allTabs.contains(state.rules.planet)){
+                tab = state.rules.planet;
+            }
+
+            rebuild();
+        });
         onResize(this::rebuild);
+
+        all.margin(20).marginTop(0f).marginRight(30f);
+
+        cont.top();
+        cont.table(s -> {
+            s.image(Icon.zoom).padRight(8);
+            search = s.field(null, text -> rebuild()).growX().get();
+            search.setMessageText("@players.search");
+        }).fillX().padBottom(4).row();
+
+        cont.pane(all).scrollX(false);
+    }
+
+    void checkTabList(){
+        if(allTabs == null){
+            Seq<Content>[] allContent = Vars.content.getContentMap();
+            ObjectSet<UnlockableContent> all = new ObjectSet<>();
+            for(var contents : allContent){
+                for(var content : contents){
+                    if(content instanceof UnlockableContent u){
+                        all.addAll(u.databaseTabs);
+                    }
+                }
+            }
+            allTabs = all.toSeq().sort();
+            allTabs.insert(0, Planets.sun);
+        }
     }
 
     void rebuild(){
-        cont.clear();
+        checkTabList();
 
-        Table table = new Table();
-        table.margin(20);
-        ScrollPane pane = new ScrollPane(table);
+        all.clear();
+        var text = search.getText().toLowerCase();
 
         Seq<Content>[] allContent = Vars.content.getContentMap();
 
+        all.table(t -> {
+            int i = 0;
+            for(var content : allTabs){
+                t.button(content == Planets.sun ? Icon.eyeSmall : content instanceof Planet p ? Icon.icons.get(p.icon, Icon.commandRally) : new TextureRegionDrawable(content.uiIcon), Styles.clearNoneTogglei, iconMed, () -> {
+                    tab = content;
+                    rebuild();
+                }).size(50f).checked(b -> tab == content).tooltip(content == Planets.sun ? "@all" : content.localizedName).with(but -> {
+                    but.getStyle().imageUpColor = content instanceof Planet p ? p.iconColor : Color.white.cpy();
+                });
+
+                if(++i % 10 == 0) t.row();
+            }
+        }).row();;
+
         for(int j = 0; j < allContent.length; j++){
             ContentType type = ContentType.all[j];
 
-            Seq<Content> array = allContent[j].select(c -> c instanceof UnlockableContent u && (!u.isHidden() || u.node() != null));
+            Seq<UnlockableContent> array = allContent[j]
+                .select(c -> c instanceof UnlockableContent u && !u.isHidden() && !u.hideDatabase && (tab == Planets.sun || u.allDatabaseTabs || u.databaseTabs.contains(tab)) &&
+                    (text.isEmpty() || u.localizedName.toLowerCase().contains(text))).as();
+
             if(array.size == 0) continue;
 
-            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 -> {
+            all.add("@content." + type.name() + ".name").growX().left().color(Pal.accent);
+            all.row();
+            all.image().growX().pad(5).padLeft(0).padRight(0).height(3).color(Pal.accent);
+            all.row();
+            all.table(list -> {
                 list.left();
 
-                int cols = Mathf.clamp((Core.graphics.getWidth() - 30) / (32 + 10), 1, 18);
+                int cols = (int)Mathf.clamp((Core.graphics.getWidth() - Scl.scl(30)) / Scl.scl(32 + 12), 1, 22);
                 int count = 0;
 
                 for(int i = 0; i < array.size; i++){
-                    UnlockableContent unlock = (UnlockableContent)array.get(i);
+                    UnlockableContent unlock = array.get(i);
+
+                    Image image = unlocked(unlock) ? new Image(unlock.uiIcon).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray);
+
+                    //banned cross
+                    if(state.isGame() && (unlock instanceof UnitType u && u.isBanned() || unlock instanceof Block b && state.rules.isBanned(b))){
+                        list.stack(image, new Image(Icon.cancel){{
+                            setColor(Color.scarlet);
+                            touchable = Touchable.disabled;
+                        }}).size(8 * 4).pad(3);
+                    }else{
+                        list.add(image).size(8 * 4).pad(3);
+                    }
 
-                    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)){
+                    if(!mobile && unlocked(unlock)){
                         image.addListener(new HandCursorListener());
-                        image.update(() -> image.color.lerp(!listener.isOver() ? Color.lightGray : Color.white, 0.4f * Time.delta));
+                        image.update(() -> image.color.lerp(!listener.isOver() ? Color.lightGray : Color.white, Mathf.clamp(0.4f * Time.delta)));
                     }
 
                     if(unlocked(unlock)){
@@ -71,10 +144,10 @@ public class DatabaseDialog extends BaseDialog{
                                 Core.app.setClipboardText((char)Fonts.getUnicode(unlock.name) + "");
                                 ui.showInfoFade("@copied");
                             }else{
-                                Vars.ui.content.show(unlock);
+                                ui.content.show(unlock);
                             }
                         });
-                        image.addListener(new Tooltip(t -> t.background(Tex.button).add(unlock.localizedName)));
+                        image.addListener(new Tooltip(t -> t.background(Tex.button).add(unlock.localizedName + (settings.getBool("console") ? "\n[gray]" + unlock.name : ""))));
                     }
 
                     if((++count) % cols == 0){
@@ -82,10 +155,12 @@ public class DatabaseDialog extends BaseDialog{
                     }
                 }
             }).growX().left().padBottom(10);
-            table.row();
+            all.row();
         }
 
-        cont.add(pane);
+        if(all.getChildren().isEmpty()){
+            all.add("@none.found");
+        }
     }
 
     boolean unlocked(UnlockableContent content){
diff --git a/core/src/mindustry/ui/dialogs/DiscordDialog.java b/core/src/mindustry/ui/dialogs/DiscordDialog.java
index 600fe39e16..08428b0501 100644
--- a/core/src/mindustry/ui/dialogs/DiscordDialog.java
+++ b/core/src/mindustry/ui/dialogs/DiscordDialog.java
@@ -29,20 +29,20 @@ public class DiscordDialog extends Dialog{
             }).expandY();
 
             t.table(i -> {
-                i.background(Tex.button);
                 i.image(Icon.discord);
             }).size(h).left();
 
             t.add("@discord").color(Pal.accent).growX().padLeft(10f);
-        }).size(440f, h).pad(10f);
+        }).size(520f, h).pad(10f);
 
-        buttons.defaults().size(150f, 50);
+        buttons.defaults().size(170f, 50);
 
-        buttons.button("@back", this::hide);
-        buttons.button("@copylink", () -> {
+        buttons.button("@back", Icon.left, this::hide);
+        buttons.button("@copylink", Icon.copy, () -> {
             Core.app.setClipboardText(discordURL);
+            ui.showInfoFade("@copied");
         });
-        buttons.button("@openlink", () -> {
+        buttons.button("@openlink", Icon.discord, () -> {
             if(!Core.app.openURI(discordURL)){
                 ui.showErrorMessage("@linkfail");
                 Core.app.setClipboardText(discordURL);
diff --git a/core/src/mindustry/ui/dialogs/MapsDialog.java b/core/src/mindustry/ui/dialogs/EditorMapsDialog.java
similarity index 69%
rename from core/src/mindustry/ui/dialogs/MapsDialog.java
rename to core/src/mindustry/ui/dialogs/EditorMapsDialog.java
index 605a0bec1c..691a7b9406 100644
--- a/core/src/mindustry/ui/dialogs/MapsDialog.java
+++ b/core/src/mindustry/ui/dialogs/EditorMapsDialog.java
@@ -8,48 +8,26 @@ import arc.util.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
 import mindustry.io.*;
 import mindustry.maps.*;
 import mindustry.ui.*;
 
 import static mindustry.Vars.*;
 
-public class MapsDialog extends BaseDialog{
-    private BaseDialog dialog;
+public class EditorMapsDialog extends MapListDialog{
 
-    public MapsDialog(){
-        super("@maps");
-
-        buttons.remove();
-
-        addCloseListener();
-
-        shown(this::setup);
-        onResize(() -> {
-            if(dialog != null){
-                dialog.hide();
-            }
-            setup();
-        });
+    public EditorMapsDialog(){
+        super("@maps", true);
     }
 
-    void setup(){
-        buttons.clearChildren();
-
-        if(Core.graphics.isPortrait()){
-            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);
-        }
-
+    @Override
+    void buildButtons(){
         buttons.button("@editor.newmap", Icon.add, () -> {
             ui.showTextInput("@editor.newmap", "@editor.mapname", "", text -> {
                 Runnable show = () -> ui.loadAnd(() -> {
                     hide();
                     ui.editor.show();
-                    ui.editor.editor.tags.put("name", text);
+                    editor.tags.put("name", text);
                     Events.fire(new MapMakeEvent());
                 });
 
@@ -72,12 +50,11 @@ public class MapsDialog extends BaseDialog{
 
                         Map map = MapIO.createMap(file, true);
 
-
                         //when you attempt to import a save, it will have no name, so generate one
                         String name = map.tags.get("name", () -> {
                             String result = "unknown";
                             int number = 0;
-                            while(maps.byName(result + number++) != null);
+                            while(maps.byName(result + number++) != null) ;
                             return result + number;
                         });
 
@@ -108,51 +85,11 @@ public class MapsDialog extends BaseDialog{
                 });
             });
         }).size(210f, 64f);
-
-
-        cont.clear();
-
-        Table maps = new Table();
-        maps.marginRight(24);
-
-        ScrollPane pane = new ScrollPane(maps);
-        pane.setFadeScrollBars(false);
-
-        int maxwidth = Math.max((int)(Core.graphics.getWidth() / Scl.scl(230)), 1);
-        float mapsize = 200f;
-
-        int i = 0;
-        for(Map map : Vars.maps.all()){
-
-            if(i % maxwidth == 0){
-                maps.row();
-            }
-
-            TextButton button = maps.button("", Styles.cleart, () -> showMapInfo(map)).width(mapsize).pad(8).get();
-            button.clearChildren();
-            button.margin(9);
-            button.add(map.name()).width(mapsize - 18f).center().get().setEllipsis(true);
-            button.row();
-            button.image().growX().pad(4).color(Pal.gray);
-            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);
-
-            i++;
-        }
-
-        if(Vars.maps.all().size == 0){
-            maps.add("@maps.none");
-        }
-
-        cont.add(buttons).growX();
-        cont.row();
-        cont.add(pane).uniformX();
     }
 
-    void showMapInfo(Map map){
-        dialog = new BaseDialog("@editor.mapinfo");
+    @Override
+    void showMap(Map map){
+        BaseDialog dialog = activeDialog = new BaseDialog("@editor.mapinfo");
         dialog.addCloseButton();
 
         float mapsize = Core.graphics.isPortrait() ? 160f : 300f;
@@ -195,7 +132,7 @@ public class MapsDialog extends BaseDialog{
                 dialog.hide();
                 hide();
             }catch(Exception e){
-                e.printStackTrace();
+                Log.err(e);
                 ui.showErrorMessage("@error.mapnotfound");
             }
         }).fillX().height(54f).marginLeft(10);
@@ -214,4 +151,5 @@ public class MapsDialog extends BaseDialog{
 
         dialog.show();
     }
+
 }
diff --git a/core/src/mindustry/ui/dialogs/EffectsDialog.java b/core/src/mindustry/ui/dialogs/EffectsDialog.java
new file mode 100644
index 0000000000..98db4ea91a
--- /dev/null
+++ b/core/src/mindustry/ui/dialogs/EffectsDialog.java
@@ -0,0 +1,235 @@
+package mindustry.ui.dialogs;
+
+import arc.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.logic.*;
+import mindustry.logic.LogicFx.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+
+public class EffectsDialog extends BaseDialog{
+    static BoundsBatch bounds = new BoundsBatch();
+
+    Iterable<EffectEntry> entries;
+    @Nullable Cons<EffectEntry> listener;
+
+    public EffectsDialog(Iterable<EffectEntry> entries){
+        super("Effects");
+
+        this.entries = entries;
+
+        addCloseButton();
+        makeButtonOverlay();
+        onResize(this::setup);
+        shown(this::setup);
+
+        setup();
+    }
+
+    public EffectsDialog(){
+        this(LogicFx.entries());
+    }
+
+    public static EffectsDialog withAllEffects(){
+        return new EffectsDialog(Seq.select(Fx.class.getFields(), f -> f.getType() == Effect.class).map(f -> new EffectEntry(Reflect.get(f)).name(f.getName())));
+    }
+
+    public Dialog show(Cons<EffectEntry> listener){
+        this.listener = listener;
+        return super.show();
+    }
+
+    @Override
+    public Dialog show(){
+        this.listener = null;
+        return super.show();
+    }
+
+    void setup(){
+        float size = 280f;
+        int cols = (int)Math.max(1, Core.graphics.getWidth() / Scl.scl(size + 12f));
+
+        cont.clearChildren();
+        cont.pane(t -> {
+            int i = 0;
+            for(var entry : entries){
+                float bounds = calculateSize(entry);
+
+                if(bounds <= 0) continue;
+
+                ClickListener cl = new ClickListener();
+
+                t.stack(
+                new EffectCell(entry, cl),
+                new Table(af -> af.add(entry.name).grow().labelAlign(Align.bottomLeft).style(Styles.outlineLabel).bottom().left())
+                ).size(size).with(a -> {
+                    a.clicked(() -> {
+                        if(listener != null){
+                            listener.get(entry);
+                            hide();
+                        }
+                    });
+                    a.addListener(cl);
+                    a.addListener(new HandCursorListener(() -> listener != null, true));
+                });
+
+                if(++i % cols == 0) t.row();
+            }
+        }).grow().scrollX(false);
+    }
+
+    static Object getData(Class<?> type){
+        if(type == Block.class) return Blocks.router;
+        return null;
+    }
+
+    static float calculateSize(EffectEntry entry){
+        if(entry.bounds >= 0) return entry.bounds;
+
+
+        var effect = entry.effect;
+        try{
+            effect.init();
+            Batch prev = Core.batch;
+            bounds.reset();
+            Core.batch = bounds;
+            Object data = getData(entry.data);
+
+            float lifetime = effect.lifetime;
+            float rot = 1f;
+            int steps = 60;
+            int seeds = 4;
+            for(int s = 0; s < seeds; s++){
+                for(int i = 0; i <= steps; i++){
+                    effect.render(1, Color.white, i / (float)steps * lifetime, lifetime, rot, 0f, 0f, data);
+                }
+            }
+
+            Core.batch = prev;
+
+            return entry.bounds = bounds.max * 2f;
+        }catch(Exception e){
+            //might crash with invalid data
+            return -1f;
+        }
+    }
+
+    static class BoundsBatch extends Batch{
+        float max;
+
+        void reset(){
+            max = 0f;
+        }
+
+        void max(float... xs){
+            for(float f : xs){
+                if(Float.isNaN(f)) continue;
+                max = Math.max(max, Math.abs(f));
+            }
+        }
+
+        @Override
+        protected void draw(Texture texture, float[] spriteVertices, int offset, int count){
+            for(int i = offset; i < count; i += SpriteBatch.VERTEX_SIZE){
+                max(spriteVertices[i], spriteVertices[i + 1]);
+            }
+        }
+
+        @Override
+        protected void draw(TextureRegion region, float x, float y, float originX, float originY, float width, float height, float rotation){
+            float worldOriginX = x + originX;
+            float worldOriginY = y + originY;
+            float fx = -originX;
+            float fy = -originY;
+            float fx2 = width - originX;
+            float fy2 = height - originY;
+            float cos = Mathf.cosDeg(rotation);
+            float sin = Mathf.sinDeg(rotation);
+            float x1 = cos * fx - sin * fy + worldOriginX;
+            float y1 = sin * fx + cos * fy + worldOriginY;
+            float x2 = cos * fx - sin * fy2 + worldOriginX;
+            float y2 = sin * fx + cos * fy2 + worldOriginY;
+            float x3 = cos * fx2 - sin * fy2 + worldOriginX;
+            float y3 = sin * fx2 + cos * fy2 + worldOriginY;
+
+            max(x1, y1, x2, y2, x3, y3, x1 + (x3 - x2), y3 - (y2 - y1));
+        }
+
+        @Override
+        protected void flush(){}
+    }
+
+    class EffectCell extends Element{
+        EffectEntry effect;
+        float size = -1f;
+
+        int id = 1;
+        float time = 0f;
+        float lifetime;
+        float rotation = 1f;
+        Object data;
+        ClickListener cl;
+
+        public EffectCell(EffectEntry effect, ClickListener cl){
+            this.effect = effect;
+            this.lifetime = effect.effect.lifetime;
+            this.cl = cl;
+
+            data = getData(effect.data);
+        }
+
+        @Override
+        public void draw(){
+            if(size < 0){
+                size = calculateSize(effect) + 1f;
+            }
+
+            color.fromHsv((Time.globalTime * 2f) % 360f, 1f, 1f);
+
+            if(clipBegin(x, y, width, height)){
+                Draw.colorl(cl.isOver() && listener != null ? 0.4f : 0.5f);
+                Draw.alpha(parentAlpha);
+                Tex.alphaBg.draw(x, y, width, height);
+                Draw.reset();
+                Draw.flush();
+
+                float scale = width / size;
+                Tmp.m1.set(Draw.trans());
+                Draw.trans().translate(x + width/2f, y + height/2f).scale(scale, scale);
+                Draw.flush();
+                this.lifetime = effect.effect.render(id, color, time, lifetime, rotation, 0f, 0f, data);
+
+                Draw.flush();
+                Draw.trans().set(Tmp.m1);
+                clipEnd();
+            }
+
+            Lines.stroke(Scl.scl(3f), Color.black);
+            Lines.rect(x, y, width, height);
+            Draw.reset();
+        }
+
+        @Override
+        public void act(float delta){
+            super.act(delta);
+
+            time += Time.delta;
+            if(time >= lifetime){
+                id ++;
+            }
+            time %= lifetime;
+        }
+    }
+}
diff --git a/core/src/mindustry/ui/dialogs/FileChooser.java b/core/src/mindustry/ui/dialogs/FileChooser.java
index c755585b12..6a33696fdc 100644
--- a/core/src/mindustry/ui/dialogs/FileChooser.java
+++ b/core/src/mindustry/ui/dialogs/FileChooser.java
@@ -20,8 +20,8 @@ public class FileChooser extends BaseDialog{
     private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath());
     static Fi lastDirectory = Core.files.absolute(Core.settings.getString("lastDirectory", homeDirectory.absolutePath()));
 
+    Fi directory;
     private Table files;
-    Fi directory = lastDirectory;
     private ScrollPane pane;
     private TextField navigation, filefield;
     private TextButton ok;
@@ -37,6 +37,8 @@ public class FileChooser extends BaseDialog{
         this.filter = filter;
         this.selectListener = result;
 
+        directory = getLastDirectory();
+
         onResize(() -> {
             cont.clear();
             setupWidgets();
@@ -191,7 +193,7 @@ public class FileChooser extends BaseDialog{
         Fi[] names = getFileNames();
 
         Image upimage = new Image(Icon.upOpen);
-        TextButton upbutton = new TextButton(".." + directory.toString(), Styles.clearTogglet);
+        TextButton upbutton = new TextButton(".." + directory.toString(), Styles.flatTogglet);
         upbutton.clicked(() -> {
             directory = directory.parent();
             setLastDirectory(directory);
@@ -213,7 +215,7 @@ public class FileChooser extends BaseDialog{
 
             String filename = file.name();
 
-            TextButton button = new TextButton(filename, Styles.clearTogglet);
+            TextButton button = new TextButton(filename.replace("[", "[["), Styles.flatTogglet);
             button.getLabel().setWrap(false);
             button.getLabel().setEllipsis(true);
             group.add(button);
@@ -249,18 +251,16 @@ public class FileChooser extends BaseDialog{
         if(open) filefield.clearText();
     }
 
-    public static void setLastDirectory(Fi directory){
+    public static synchronized void setLastDirectory(Fi directory){
         lastDirectory = directory;
         Core.settings.put("lastDirectory", directory.absolutePath());
     }
 
-    private String shorten(String string){
-        int max = 30;
-        if(string.length() <= max){
-            return string;
-        }else{
-            return string.substring(0, max - 3).concat("...");
+    public static synchronized Fi getLastDirectory(){
+        if(!lastDirectory.exists()){
+            lastDirectory = homeDirectory;
         }
+        return lastDirectory;
     }
 
     public class FileHistory{
@@ -300,19 +300,5 @@ public class FileChooser extends BaseDialog{
         public boolean canBack(){
             return !(index == 1) && index > 0;
         }
-
-        void print(){
-
-            System.out.println("\n\n\n\n\n\n");
-            int i = 0;
-            for(Fi file : history){
-                i++;
-                if(index == i){
-                    System.out.println("[[" + file.toString() + "]]");
-                }else{
-                    System.out.println("--" + file.toString() + "--");
-                }
-            }
-        }
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/FullTextDialog.java b/core/src/mindustry/ui/dialogs/FullTextDialog.java
new file mode 100644
index 0000000000..b0eed68f54
--- /dev/null
+++ b/core/src/mindustry/ui/dialogs/FullTextDialog.java
@@ -0,0 +1,21 @@
+package mindustry.ui.dialogs;
+
+import arc.util.*;
+
+public class FullTextDialog extends BaseDialog{
+
+    public FullTextDialog(){
+        super("");
+        shouldPause = true;
+        addCloseButton();
+    }
+
+    public void show(String titleText, String text){
+        title.setText(titleText);
+        cont.clear();
+        cont.add(text).grow().wrap().labelAlign(Align.center);
+
+        super.show();
+    }
+
+}
diff --git a/core/src/mindustry/ui/dialogs/GameOverDialog.java b/core/src/mindustry/ui/dialogs/GameOverDialog.java
index 8c69756a3c..107726b6cc 100644
--- a/core/src/mindustry/ui/dialogs/GameOverDialog.java
+++ b/core/src/mindustry/ui/dialogs/GameOverDialog.java
@@ -1,21 +1,38 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
+import arc.flabel.*;
+import arc.math.*;
+import arc.scene.actions.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
 import mindustry.core.GameState.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
-import mindustry.type.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.ui.*;
 
 import static mindustry.Vars.*;
 
 public class GameOverDialog extends BaseDialog{
     private Team winner;
+    private boolean hudShown;
 
     public GameOverDialog(){
         super("@gameover");
         setFillParent(true);
-        shown(this::rebuild);
+
+        titleTable.remove();
+
+        shown(() -> {
+            hudShown = ui.hudfrag.shown;
+            ui.hudfrag.shown = false;
+            rebuild();
+        });
+
+        hidden(() -> ui.hudfrag.shown = hudShown);
 
         Events.on(ResetEvent.class, e -> hide());
     }
@@ -31,73 +48,119 @@ public class GameOverDialog extends BaseDialog{
     }
 
     void rebuild(){
-        title.setText(state.isCampaign() ? "@sector.curlost" : "@gameover");
         buttons.clear();
         cont.clear();
 
         buttons.margin(10);
 
-        if(state.rules.pvp && winner != null){
-            cont.add(Core.bundle.format("gameover.pvp", winner.localized())).pad(6);
+        cont.table(t -> {
+            if(state.rules.pvp && winner != null){
+                t.add(Core.bundle.format("gameover.pvp", winner.coloredName())).center().pad(6);
+            }else{
+                t.add(state.isCampaign() ? Core.bundle.format("sector.lost", state.getSector().name()) : "@gameover").center().pad(6);
+            }
+            t.row();
+
+            if(control.isHighScore()){
+                t.add("@highscore").pad(6);
+                t.row();
+            }
+
+            t.pane(p -> {
+                p.margin(13f);
+                p.left().defaults().left();
+                p.setBackground(Styles.black3);
+
+                p.table(stats -> {
+                    if(state.rules.waves) addStat(stats, Core.bundle.get("stats.wave"), state.stats.wavesLasted, 0f);
+                    addStat(stats, Core.bundle.get("stats.unitsCreated"), state.stats.unitsCreated, 0.05f);
+                    addStat(stats, Core.bundle.get("stats.enemiesDestroyed"), state.stats.enemyUnitsDestroyed, 0.1f);
+                    addStat(stats, Core.bundle.get("stats.built"), state.stats.buildingsBuilt, 0.15f);
+                    addStat(stats, Core.bundle.get("stats.destroyed"), state.stats.buildingsDestroyed, 0.2f);
+                    addStat(stats, Core.bundle.get("stats.deconstructed"), state.stats.buildingsDeconstructed, 0.25f);
+                }).top().grow().row();
+
+                if(control.saves.getCurrent() != null){
+                    p.table(pt -> {
+                        pt.add(new FLabel(Core.bundle.get("stats.playtime"))).left().pad(5).growX();
+                        pt.add(new FLabel("[accent]" + control.saves.getCurrent().getPlayTime())).right().pad(5);
+                    }).growX();
+                }
+            }).grow().pad(12).top();
+        }).center().minWidth(370).maxSize(600, 550).grow();
+
+        if(state.isCampaign() && net.client()){
+            cont.row();
+            cont.add("@gameover.waiting").padTop(20f).row();
+        }
+
+        if(state.isCampaign()){
+            if(net.client()){
+                buttons.button("@gameover.disconnect", () -> {
+                    logic.reset();
+                    net.reset();
+                    hide();
+                    state.set(State.menu);
+                }).size(170f, 60f);
+            }else{
+                buttons.button("@continue", () -> {
+                    hide();
+                    ui.planet.show();
+                }).size(170f, 60f);
+            }
+        }else{
             buttons.button("@menu", () -> {
                 hide();
-                logic.reset();
-            }).size(130f, 60f);
-        }else{
-            if(control.isHighScore()){
-                cont.add("@highscore").pad(6);
-                cont.row();
-            }
-
-            cont.pane(t -> {
-                t.margin(13f);
-                t.left().defaults().left();
-                t.add(Core.bundle.format("stat.wave", state.stats.wavesLasted)).row();
-                t.add(Core.bundle.format("stat.enemiesDestroyed", state.stats.enemyUnitsDestroyed)).row();
-                t.add(Core.bundle.format("stat.built", state.stats.buildingsBuilt)).row();
-                t.add(Core.bundle.format("stat.destroyed", state.stats.buildingsDestroyed)).row();
-                t.add(Core.bundle.format("stat.deconstructed", state.stats.buildingsDeconstructed)).row();
-                if(control.saves.getCurrent() != null){
-                    t.add(Core.bundle.format("stat.playtime", control.saves.getCurrent().getPlayTime())).row();
-                }
-                if(state.isCampaign() && !state.stats.itemsDelivered.isEmpty()){
-                    t.add("@stat.delivered").row();
-                    for(Item item : content.items()){
-                        if(state.stats.itemsDelivered.get(item, 0) > 0){
-                            t.table(items -> {
-                                items.add("    [lightgray]" + state.stats.itemsDelivered.get(item, 0));
-                                items.image(item.icon(Cicon.small)).size(8 * 3).pad(4);
-                            }).left().row();
-                        }
-                    }
-                }
-
-                if(state.isCampaign() && net.client()){
-                    t.add("@gameover.waiting").padTop(20f).row();
-                }
-
-            }).pad(12);
-
-            if(state.isCampaign()){
-                if(net.client()){
-                    buttons.button("@gameover.disconnect", () -> {
-                        logic.reset();
-                        net.reset();
-                        hide();
-                        state.set(State.menu);
-                    }).size(170f, 60f);
-                }else{
-                    buttons.button("@continue", () -> {
-                        hide();
-                        ui.planet.show();
-                    }).size(170f, 60f);
-                }
-            }else{
-                buttons.button("@menu", () -> {
-                    hide();
+                if(!ui.paused.checkPlaytest()){
                     logic.reset();
-                }).size(140f, 60f);
-            }
+                }
+            }).size(140f, 60f);
+        }
+    }
+
+    private void addStat(Table parent, String stat, int value, float delay){
+        parent.add(new StatLabel(stat, value, delay)).top().pad(5).growX().height(50).row();
+    }
+
+    private static class StatLabel extends Table {
+        private float progress = 0;
+
+        public StatLabel(String stat, int value, float delay){
+            setTransform(true);
+            setClip(true);
+            setBackground(Tex.whiteui);
+            setColor(Pal.accent);
+            margin(2f);
+
+            FLabel statLabel = new FLabel(stat);
+            statLabel.setStyle(Styles.outlineLabel);
+            statLabel.setWrap(true);
+            statLabel.pause();
+
+            Label valueLabel = new Label("", Styles.outlineLabel);
+            valueLabel.setAlignment(Align.right);
+
+            add(statLabel).left().growX().padLeft(5);
+            add(valueLabel).right().growX().padRight(5);
+
+            actions(
+                Actions.scaleTo(0, 1),
+                Actions.delay(delay),
+                Actions.parallel(
+                    Actions.scaleTo(1, 1, 0.3f, Interp.pow3Out),
+                    Actions.color(Pal.darkestGray, 0.3f, Interp.pow3Out),
+                    Actions.sequence(
+                        Actions.delay(0.3f),
+                        Actions.run(() -> {
+                            valueLabel.update(() -> {
+                                progress = Math.min(1, progress + (Time.delta / 60));
+                                valueLabel.setText("" + (int)Mathf.lerp(0, value, value < 10 ? progress : Interp.slowFast.apply(progress)));
+                            });
+                            statLabel.resume();
+                        })
+                    )
+                )
+            );
         }
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/HostDialog.java b/core/src/mindustry/ui/dialogs/HostDialog.java
index c4e263d208..13d5a9fc40 100644
--- a/core/src/mindustry/ui/dialogs/HostDialog.java
+++ b/core/src/mindustry/ui/dialogs/HostDialog.java
@@ -4,10 +4,11 @@ import arc.*;
 import arc.scene.ui.*;
 import arc.util.*;
 import mindustry.core.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.ui.*;
 
-import java.io.*;
+import java.util.*;
 
 import static mindustry.Vars.*;
 
@@ -28,15 +29,24 @@ public class HostDialog extends BaseDialog{
                 ui.listfrag.rebuild();
             }).grow().pad(8).get().setMaxLength(40);
 
-            ImageButton button = t.button(Tex.whiteui, Styles.clearFulli, 40, () -> {
+            ImageButton button = t.button(Tex.whiteui, Styles.squarei, 40, () -> {
                 new PaletteDialog().show(color -> {
-                    player.color().set(color);
+                    player.color.set(color);
                     Core.settings.put("color-0", color.rgba());
                 });
             }).size(54f).get();
             button.update(() -> button.getStyle().imageUpColor = player.color());
         }).width(w).height(70f).pad(4).colspan(3);
 
+        if(steam){
+            cont.row();
+
+            cont.add().width(65f);
+
+            cont.check("@steam.friendsonly", !Core.settings.getBool("steampublichost"), val -> Core.settings.put("steampublichost", !val)).colspan(2).left()
+                .with(c -> ui.addDescTooltip(c, "@steam.friendsonly.tooltip")).padBottom(15f).row();
+        }
+
         cont.row();
 
         cont.table(t -> {
@@ -68,7 +78,11 @@ public class HostDialog extends BaseDialog{
             runHost();
         }).width(w).height(70f).disabled(b -> !portField.isValid());
 
-        cont.button("?", () -> ui.showInfo("@host.info")).size(65f, 70f).padLeft(6f);
+        if(!steam){
+            cont.button("?", () -> ui.showInfo("@host.info")).size(65f, 70f).padLeft(6f);
+        }else{
+            cont.add().size(65f, 70f).padLeft(6f);
+        }
 
         shown(() -> {
             if(!steam){
@@ -82,34 +96,20 @@ public class HostDialog extends BaseDialog{
         Time.runTask(5f, () -> {
             try{
                 net.host(Core.settings.getInt("port", port));
-                player.admin(true);
-
-                if(steam){
-                    Core.app.post(() -> Core.settings.getBoolOnce("steampublic3", () -> {
-                        ui.showCustomConfirm("@setting.publichost.name", "@public.confirm", "@yes", "@no", () -> {
-                            ui.showCustomConfirm("@setting.publichost.name", "@public.confirm.really", "@no", "@yes", () -> {
-                                Core.settings.put("publichost", true);
-                                platform.updateLobby();
-                            }, () -> {
-                                Core.settings.put("publichost", false);
-                                platform.updateLobby();
-                            });
-                        }, () -> {
-                            Core.settings.put("publichost", false);
-                            platform.updateLobby();
-                        });
-                    }));
+                player.admin = true;
+                Events.fire(new HostEvent());
 
+                if(steam && Core.settings.getBool("steampublichost")){
                     if(Version.modifier.contains("beta") || Version.modifier.contains("alpha")){
-                        Core.settings.put("publichost", false);
+                        Core.settings.put("steampublichost", false);
                         platform.updateLobby();
                         Core.settings.getBoolOnce("betapublic", () -> ui.showInfo("@public.beta"));
                     }
                 }
 
 
-            }catch(IOException e){
-                ui.showException("@server.error", e);
+            }catch(Exception e){
+                ui.showException(e.getMessage() != null && e.getMessage().toLowerCase(Locale.ROOT).contains("address already in use") ? "@server.error.addressinuse" : "@server.error", e);
             }
             ui.loadfrag.hide();
             hide();
diff --git a/core/src/mindustry/ui/dialogs/IconSelectDialog.java b/core/src/mindustry/ui/dialogs/IconSelectDialog.java
new file mode 100644
index 0000000000..33766e6bfb
--- /dev/null
+++ b/core/src/mindustry/ui/dialogs/IconSelectDialog.java
@@ -0,0 +1,79 @@
+package mindustry.ui.dialogs;
+
+import arc.*;
+import arc.func.*;
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+
+import static mindustry.Vars.*;
+
+public class IconSelectDialog extends Dialog{
+    private Intc consumer = i -> Log.info("you have mere seconds");
+    private boolean allowLocked;
+
+    public IconSelectDialog(){
+        this(true);
+    }
+
+    public IconSelectDialog(boolean allowLocked){
+        closeOnBack();
+        setFillParent(true);
+
+        cont.pane(t -> {
+            resized(true, () -> {
+                t.clearChildren();
+                t.marginRight(19f);
+                t.defaults().size(48f);
+
+                t.button(Icon.none, Styles.flati, () -> {
+                    hide();
+                    consumer.get(0);
+                });
+
+                int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
+
+                int i = 1;
+                for(var key : accessibleIcons){
+                    var value = Icon.icons.get(key);
+
+                    t.button(value, Styles.flati, () -> {
+                        hide();
+                        consumer.get(Iconc.codes.get(key));
+                    });
+
+                    if(++i % cols == 0) t.row();
+                }
+
+                for(ContentType ctype : defaultContentIcons){
+                    t.row();
+                    t.image().colspan(cols).growX().width(Float.NEGATIVE_INFINITY).height(3f).color(Pal.accent);
+                    t.row();
+
+                    i = 0;
+                    for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){
+                        if(!u.isHidden() && (allowLocked || u.unlocked())){
+                            t.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> {
+                                hide();
+                                consumer.get(u.emojiChar());
+                            });
+
+                            if(++i % cols == 0) t.row();
+                        }
+                    }
+                }
+            });
+        });
+        buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
+    }
+
+    public void show(Intc listener){
+        consumer = listener;
+        super.show();
+    }
+}
diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 4f858a67ff..3147a1c196 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -1,11 +1,12 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
-import arc.Net.*;
+import arc.freetype.FreeTypeFontGenerator.*;
 import arc.graphics.*;
 import arc.input.*;
 import arc.math.*;
 import arc.scene.ui.*;
+import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
@@ -16,7 +17,7 @@ import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.io.legacy.*;
+import mindustry.io.versions.*;
 import mindustry.net.*;
 import mindustry.net.Packets.*;
 import mindustry.ui.*;
@@ -34,32 +35,53 @@ public class JoinDialog extends BaseDialog{
     int totalHosts;
     int refreshes;
     boolean showHidden;
+    TextButtonStyle style;
+    Task fontIgnoreDirtyTask;
 
     String lastIp;
-    int lastPort;
+    int lastPort, lastColumns = -1;
     Task ping;
 
+    String serverSearch = "";
+
     public JoinDialog(){
         super("@joingame");
 
+        makeButtonOverlay();
+
+        style = new TextButtonStyle(){{
+            over = Styles.flatOver;
+            font = Fonts.def;
+            fontColor = Color.white;
+            disabledFontColor = Color.gray;
+            down = Styles.flatOver;
+            up = Styles.black5;
+        }};
+
         loadServers();
 
-        if(!steam) buttons.add().width(60f);
+        //mobile players don't get information >:(
+        boolean infoButton = !steam && !mobile;
+
+        if(infoButton) buttons.add().width(60f);
         buttons.add().growX().width(-1);
 
-        addCloseButton();
+        addCloseButton(mobile ? 190f : 210f);
+
+        buttons.button("@server.add", Icon.add, () -> {
+            renaming = null;
+            add.show();
+        });
 
         buttons.add().growX().width(-1);
-        if(!steam){
-            buttons.button("?", () -> ui.showInfo("@join.info")).size(60f, 64f).width(-1);
-        }
+        if(infoButton) buttons.button("?", () -> ui.showInfo("@join.info")).size(60f, 64f);
 
         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);
-        }).size(320f, 54f).maxTextLength(100).addInputDialog().get();
+        }).size(320f, 54f).maxTextLength(100).get();
 
         add.cont.row();
         add.buttons.defaults().size(140f, 60f).pad(4f);
@@ -97,8 +119,17 @@ public class JoinDialog extends BaseDialog{
         });
 
         onResize(() -> {
-            setup();
-            refreshAll();
+
+
+            //only refresh on resize when the minimum dimension is smaller than the maximum preferred width
+            //this means that refreshes on resize will only happen for small phones that need the list to fit in portrait mode
+            //also resize if number of cols changes
+            if(Math.min(Core.graphics.getWidth(), Core.graphics.getHeight()) / Scl.scl() * 0.9f < 500f || lastColumns != columns()){
+                setup();
+                refreshAll();
+            }
+
+            lastColumns = columns();
         });
     }
 
@@ -107,7 +138,9 @@ public class JoinDialog extends BaseDialog{
 
         refreshLocal();
         refreshRemote();
-        refreshGlobal();
+        if(Core.settings.getBool("communityservers", true)){
+            refreshCommunity();
+        }
     }
 
     void setupRemote(){
@@ -115,26 +148,30 @@ public class JoinDialog extends BaseDialog{
 
         for(Server server : servers){
             //why are java lambdas this bad
-            TextButton[] buttons = {null};
+            Button[] buttons = {null};
 
-            TextButton button = buttons[0] = remote.button("[accent]" + server.displayIP(), Styles.cleart, () -> {
+            Button button = buttons[0] = remote.button(b -> {}, style, () -> {
                 if(!buttons[0].childrenPressed()){
                     if(server.lastHost != null){
                         Events.fire(new ClientPreConnectEvent(server.lastHost));
-                        safeConnect(server.ip, server.port, server.lastHost.version);
+                        safeConnect(server.lastHost.address, server.lastHost.port, server.lastHost.version);
                     }else{
                         connect(server.ip, server.port);
                     }
                 }
-            }).width(targetWidth()).pad(4f).get();
+            }).width(targetWidth()).growY().top().left().pad(4f).get();
 
-            button.getLabel().setWrap(true);
+            if(remote.getChildren().size % columns() == 0){
+                remote.row();
+            }
+
+            Table inner = new Table(Tex.whiteui);
+            inner.setColor(Pal.gray);
 
-            Table inner = new Table();
             button.clearChildren();
             button.add(inner).growX();
 
-            inner.add(button.getLabel()).growX();
+            inner.add("[accent]" + server.displayIP()).left().padLeft(10f).wrap().style(Styles.outlineLabel).growX();
 
             inner.button(Icon.upOpen, Styles.emptyi, () -> {
                 moveRemote(server, -1);
@@ -167,8 +204,6 @@ public class JoinDialog extends BaseDialog{
             button.row();
 
             server.content = button.table(t -> {}).grow().get();
-
-            remote.row();
         }
     }
 
@@ -200,55 +235,76 @@ public class JoinDialog extends BaseDialog{
 
     void refreshServer(Server server){
         server.content.clear();
-        server.content.label(() -> Core.bundle.get("server.refreshing") + Strings.animated(Time.time, 4, 11, "."));
+
+        server.content.background(Tex.whitePane).setColor(Pal.gray);
+
+        server.content.label(() -> Core.bundle.get("server.refreshing") + Strings.animated(Time.time, 4, 11, ".")).grow().center().labelAlign(Align.center).padBottom(4);
 
         net.pingHost(server.ip, server.port, host -> setupServer(server, host), e -> {
             server.content.clear();
-            server.content.add("@host.invalid").padBottom(4);
+
+            server.content.background(Tex.whitePane).setColor(Pal.gray);
+            server.content.add("@host.invalid").grow().center().labelAlign(Align.center);
         });
     }
 
     void setupServer(Server server, Host host){
         server.lastHost = host;
         server.content.clear();
-        buildServer(host, server.content);
+        buildServer(host, server.content, false, true);
     }
 
-    void buildServer(Host host, Table content){
-        String versionString;
+    void buildServer(Host host, Table content, boolean local, boolean addName){
+        content.top().left();
+        boolean isBanned = local && Vars.steam && host.description != null && host.description.equals("[banned]");
+        String versionString = getVersionString(host) + (isBanned ? "[red]î — [banned]" : "");
 
-        if(host.version == -1){
-            versionString = Core.bundle.format("server.version", Core.bundle.get("server.custombuild"), "");
-        }else if(host.version == 0){
-            versionString = Core.bundle.get("server.outdated");
-        }else if(host.version < Version.build && Version.build != -1){
-            versionString = Core.bundle.get("server.outdated") + "\n" +
-            Core.bundle.format("server.version", host.version, "");
-        }else if(host.version > Version.build && Version.build != -1){
-            versionString = Core.bundle.get("server.outdated.client") + "\n" +
-            Core.bundle.format("server.version", host.version, "");
-        }else if(host.version == Version.build && Version.type.equals(host.versionType)){
-            //not important
-            versionString = "";
-        }else{
-            versionString = Core.bundle.format("server.version", host.version, host.versionType);
+        float twidth = targetWidth() - 40f;
+
+        content.background(null);
+
+        Color color = Pal.gray;
+
+        if(addName){
+            content.table(Tex.whiteui, t -> {
+                t.left();
+                t.setColor(color);
+
+                t.add(host.name + "   " + versionString).style(Styles.outlineLabel).padLeft(10f).width(twidth).left().ellipsis(true);
+            }).growX().height(36f).row();
         }
 
-        content.table(t -> {
-            t.add("[lightgray]" + host.name + "   " + versionString).width(targetWidth() - 10f).left().get().setEllipsis(true);
-            t.row();
-            if(!host.description.isEmpty()){
-                t.add("[gray]" + host.description).width(targetWidth() - 10f).left().wrap();
+        content.table(Tex.whitePane, t -> {
+            t.top().left();
+            t.setColor(color);
+            t.left();
+
+            if(!host.description.isEmpty() && !isBanned){
+                //limit newlines.
+                int count = 0;
+                StringBuilder result = new StringBuilder(host.description.length());
+                for(int i = 0; i < host.description.length(); i++){
+                    char c = host.description.charAt(i);
+                    if(c == '\n'){
+                        count ++;
+                        if(count < 3) result.append(c);
+                    }else{
+                        result.append(c);
+                    }
+                }
+                t.add("[gray]" + result).width(twidth).left().wrap();
                 t.row();
             }
-            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.modeName == null ? host.mode.toString() : host.modeName)).width(targetWidth() - 10f).left().get().setEllipsis(true);
+
+            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().row();
+
+            t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + "[lightgray] / " + (host.modeName == null ? host.mode.toString() : host.modeName)).width(twidth).left().ellipsis(true).row();
+
             if(host.ping > 0){
-                t.row();
-                t.add(Iconc.chartBar + " " + host.ping + "ms").color(Color.gray).left();
+                t.add(Iconc.chartBar + " " + host.ping + "ms").style(Styles.outlineLabel).color(Pal.gray).left();
             }
-        }).expand().left().bottom().padLeft(12f).padBottom(8);
+        }).growY().growX().left().bottom();
     }
 
     void setup(){
@@ -258,10 +314,14 @@ public class JoinDialog extends BaseDialog{
         float w = targetWidth();
 
         hosts.clear();
+        //since the buttons are an overlay, make room for that
+        hosts.marginBottom(70f);
 
-        section("@servers.local", local, false);
+        section(steam ? "@servers.local.steam" : "@servers.local", local, false);
         section("@servers.remote", remote, false);
-        section("@servers.global", global, true);
+        if(Core.settings.getBool("communityservers", true)){
+            section("@servers.global", global, true);
+        }
 
         ScrollPane pane = new ScrollPane(hosts);
         pane.setFadeScrollBars(false);
@@ -275,9 +335,9 @@ public class JoinDialog extends BaseDialog{
             t.field(Core.settings.getString("name"), text -> {
                 player.name(text);
                 Core.settings.put("name", text);
-            }).grow().pad(8).addInputDialog(maxNameLength);
+            }).grow().pad(8).maxTextLength(maxNameLength);
 
-            ImageButton button = t.button(Tex.whiteui, Styles.clearFulli, 40, () -> {
+            ImageButton button = t.button(Tex.whiteui, Styles.squarei, 40, () -> {
                 new PaletteDialog().show(color -> {
                     player.color().set(color);
                     Core.settings.put("color-0", color.rgba8888());
@@ -286,27 +346,8 @@ public class JoinDialog extends BaseDialog{
             button.update(() -> button.getStyle().imageUpColor = player.color());
         }).width(w).height(70f).pad(4);
         cont.row();
-        cont.add(pane).width(w + 38).pad(0);
+        cont.add(pane).width((w + 5) * columns() + 33).pad(0);
         cont.row();
-        cont.buttonCenter("@server.add", Icon.add, () -> {
-            renaming = null;
-            add.show();
-        }).marginLeft(10).width(w).height(80f).update(button -> {
-            float pw = w;
-            float pad = 0f;
-            if(pane.getChildren().first().getPrefHeight() > pane.getHeight()){
-                pw = w + 30;
-                pad = 6;
-            }
-
-            var cell = ((Table)pane.parent).getCell(button);
-
-            if(!Mathf.equal(cell.minWidth(), pw)){
-                cell.width(pw);
-                cell.padLeft(pad);
-                pane.parent.invalidateHierarchy();
-            }
-        });
     }
 
     void section(String label, Table servers, boolean eye){
@@ -319,7 +360,7 @@ public class JoinDialog extends BaseDialog{
             if(eye){
                 name.button(Icon.eyeSmall, Styles.emptyi, () -> {
                     showHidden = !showHidden;
-                    refreshGlobal();
+                    refreshCommunity();
                 }).update(i -> i.getStyle().imageUp = (showHidden ? Icon.eyeSmall : Icon.eyeOffSmall))
                     .size(40f).right().padRight(3).tooltip("@servers.showhidden");
             }
@@ -332,7 +373,7 @@ public class JoinDialog extends BaseDialog{
         hosts.row();
         hosts.image().growX().pad(5).padLeft(10).padRight(10).height(3).color(Pal.accent);
         hosts.row();
-        hosts.add(coll).width(targetWidth());
+        hosts.add(coll).width((targetWidth() + 5f) * columns());
         hosts.row();
     }
 
@@ -345,51 +386,61 @@ public class JoinDialog extends BaseDialog{
         net.discoverServers(this::addLocalHost, this::finishLocalHosts);
     }
 
-    void refreshGlobal(){
+    void refreshCommunity(){
         int cur = refreshes;
 
         global.clear();
         global.background(null);
-        for(ServerGroup group : defaultServers){
+
+        global.table(t -> {
+            t.add("@search").padRight(10);
+            t.field(serverSearch, text ->
+                serverSearch = text.trim().replaceAll(" +", " ").toLowerCase()
+            ).grow().pad(8).get().keyDown(KeyCode.enter, this::refreshCommunity);
+            t.button(Icon.zoom, Styles.emptyi, this::refreshCommunity).size(54f);
+        }).width((targetWidth() + 5f) * columns()).height(70f).pad(4).row();
+
+        for(int i = 0; i < defaultServers.size; i ++){
+            ServerGroup group = defaultServers.get((i + defaultServers.size/2) % defaultServers.size);
             boolean hidden = group.hidden();
             if(hidden && !showHidden){
                 continue;
             }
 
-            Table[] groupTable = {null};
+            Table[] groupTable = {null, null};
 
+            if(group.prioritized){
+                addHeader(groupTable, group, hidden, false);
+            }
             //table containing all groups
             for(String address : group.addresses){
                 String resaddress = address.contains(":") ? address.split(":")[0] : address;
                 int resport = address.contains(":") ? Strings.parseInt(address.split(":")[1]) : port;
                 net.pingHost(resaddress, resport, res -> {
                     if(refreshes != cur) return;
-                    res.port = resport;
 
-                    //add header
-                    if(groupTable[0] == null){
-                        global.table(t -> groupTable[0] = t).row();
-
-                        groupTable[0].table(head -> {
-                            if(!group.name.isEmpty()){
-                                head.add(group.name).color(Color.lightGray).padRight(4);
-                            }
-                            head.image().height(3f).growX().color(Color.lightGray);
-
-                            //button for showing/hiding servers
-                            ImageButton[] image = {null};
-                            image[0] = head.button(hidden ? Icon.eyeOffSmall : Icon.eyeSmall, Styles.accenti, () -> {
-                               group.setHidden(!group.hidden());
-                               image[0].getStyle().imageUp = group.hidden() ? Icon.eyeOffSmall : Icon.eyeSmall;
-                               if(group.hidden() && !showHidden){
-                                   groupTable[0].remove();
-                               }
-                            }).size(40f).get();
-                            image[0].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden")));
-                        }).width(targetWidth()).padBottom(-2).row();
+                    //don't recache the texture for a while
+                    if(fontIgnoreDirtyTask == null){
+                        FreeTypeFontData.ignoreDirty = true;
+                        fontIgnoreDirtyTask = Time.runTask(0.6f * 60f, () -> {
+                            FreeTypeFontData.ignoreDirty = false;
+                            fontIgnoreDirtyTask = null;
+                        });
                     }
 
-                    addGlobalHost(res, groupTable[0]);
+                    if(!serverSearch.isEmpty() && !(group.name.toLowerCase().contains(serverSearch)
+                        || res.name.toLowerCase().contains(serverSearch)
+                        || res.description.toLowerCase().contains(serverSearch)
+                        || res.mapname.toLowerCase().contains(serverSearch)
+                        || (res.modeName != null && res.modeName.toLowerCase().contains(serverSearch)))) return;
+
+                    if(groupTable[0] == null){
+                        addHeader(groupTable, group, hidden, true);
+                    }else if(!groupTable[0].visible){
+                        addHeader(groupTable, group, hidden, true);
+                    }
+
+                    addCommunityHost(res, groupTable[1]);
 
                     groupTable[0].margin(5f);
                     groupTable[0].pack();
@@ -398,11 +449,53 @@ public class JoinDialog extends BaseDialog{
         }
     }
 
-    void addGlobalHost(Host host, Table container){
+    void addHeader(Table[] groupTable, ServerGroup group, boolean hidden, boolean doInit){ // outlined separately
+        if(groupTable[0] == null){
+            global.table(t -> groupTable[0] = t).fillX().left().row();
+        }
+        groupTable[0].visible(() -> doInit);
+        if(!doInit){
+            return;
+        }
+
+        groupTable[0].table(head -> {
+            Color col = group.prioritized ? Pal.accent : Color.lightGray;
+            if(!group.name.isEmpty()){
+                head.add(group.name).color(col).padRight(4);
+            }
+            head.image().height(3f).growX().color(col);
+
+            //button for showing/hiding servers
+            ImageButton[] image = {null};
+            image[0] = head.button(hidden ? Icon.eyeOffSmall : Icon.eyeSmall, Styles.grayi, () -> {
+               group.setHidden(!group.hidden());
+               image[0].getStyle().imageUp = group.hidden() ? Icon.eyeOffSmall : Icon.eyeSmall;
+               if(group.hidden() && !showHidden){
+                   groupTable[0].remove();
+               }
+            }).size(40f).get();
+            image[0].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden")));
+        }).width(targetWidth() * columns()).padBottom(-2).row();
+
+        groupTable[1] = groupTable[0].row().table().top().left().grow().get();
+    }
+
+    int columns(){
+        return Mathf.clamp((int)((Core.graphics.getWidth() / Scl.scl() * 0.9f) / targetWidth()), 1, 4);
+    }
+
+    void addCommunityHost(Host host, Table container){
         global.background(null);
+        String versionString = getVersionString(host);
         float w = targetWidth();
 
-        container.button(b -> buildServer(host, b), Styles.cleart, () -> {
+        container.left().top();
+
+        Button[] button = {null};
+
+        button[0] = container.button(b -> {}, style, () -> {
+            if(button[0].childrenPressed()) return;
+
             Events.fire(new ClientPreConnectEvent(host));
             if(!Core.settings.getBool("server-disclaimer", false)){
                 ui.showCustomConfirm("@warning", "@servers.disclaimer", "@ok", "@back", () -> {
@@ -414,7 +507,32 @@ public class JoinDialog extends BaseDialog{
             }else{
                 safeConnect(host.address, host.port, host.version);
             }
-        }).width(w).row();
+        }).width(w).padBottom(7).padRight(4f).top().left().growY().uniformY().get();
+
+        Table inner = new Table(Tex.whiteui);
+        inner.setColor(Pal.gray);
+
+        button[0].clearChildren();
+        button[0].add(inner).growX();
+
+        inner.add(host.name + "   " + versionString).left().padLeft(10f).wrap().style(Styles.outlineLabel).growX();
+
+        inner.button(Icon.add, Styles.emptyi, () -> {
+            Server server = new Server();
+            server.setIP(host.address + ":" + host.port);
+            servers.add(server);
+            saveServers();
+            setupRemote();
+            refreshRemote();
+        }).margin(3f).pad(8f).padRight(4f).top().right();
+
+        button[0].row();
+
+        buildServer(host, button[0].table(t -> {}).grow().get(), false, false);
+
+        if((container.getChildren().size) % columns() == 0){
+            container.row();
+        }
     }
 
     void finishLocalHosts(){
@@ -437,12 +555,14 @@ public class JoinDialog extends BaseDialog{
         totalHosts++;
         float w = targetWidth();
 
-        local.row();
+        if((local.getChildren().size) % columns() == 0){
+            local.row();
+        }
 
-        local.button(b -> buildServer(host, b), Styles.cleart, () -> {
+        local.button(b -> buildServer(host, b, true, true), style, () -> {
             Events.fire(new ClientPreConnectEvent(host));
             safeConnect(host.address, host.port, host.version);
-        }).width(w);
+        }).width(w).top().left().growY();
     }
 
     public void connect(String ip, int port){
@@ -463,8 +583,10 @@ public class JoinDialog extends BaseDialog{
             net.reset();
             Vars.netClient.beginConnecting();
             net.connect(lastIp = ip, lastPort = port, () -> {
-                hide();
-                add.hide();
+                if(net.client()){
+                    hide();
+                    add.hide();
+                }
             });
         });
     }
@@ -481,7 +603,7 @@ public class JoinDialog extends BaseDialog{
                 connect(lastIp, lastPort);
             }, exception -> {});
         }, 1, 1);
-        
+
         ui.loadfrag.setButton(() -> {
             ui.loadfrag.hide();
             if(ping == null) return;
@@ -492,7 +614,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[]" +
+            ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated) + "\n[]" +
                 Core.bundle.format("server.versions", Version.build, version));
         }else{
             connect(ip, port);
@@ -500,7 +622,7 @@ public class JoinDialog extends BaseDialog{
     }
 
     float targetWidth(){
-        return Math.min(Core.graphics.getWidth() / Scl.scl() * 0.9f, 500f);
+        return Math.min(Core.graphics.getWidth() / Scl.scl() * 0.9f, 550f);
     }
 
     @SuppressWarnings("unchecked")
@@ -513,48 +635,76 @@ public class JoinDialog extends BaseDialog{
             Core.settings.remove("server-list");
         }
 
-        var url = becontrol.active() ? serverJsonBeURL : serverJsonV6URL;
-        Log.info("Fetching community servers at @", url);
+        fetchServers();
+    }
+
+    public static void fetchServers(){
+        var urls = Version.type.equals("bleeding-edge") || Vars.forceBeServers ? serverJsonBeURLs : serverJsonURLs;
+
+        if(Core.settings.getBool("communityservers", true)){
+            fetchServers(urls, 0);
+        }
+    }
+
+    private static void fetchServers(String[] urls, int index){
+        if(index >= urls.length) return;
 
         //get servers
-        Core.net.httpGet(url, result -> {
-            try{
-                if(result.getStatus() != HttpStatus.OK){
-                    Log.warn("Failed to fetch community servers: @", result.getStatus());
-                    return;
-                }
-
-                Jval val = Jval.read(result.getResultAsString());
-                Core.app.post(() -> {
-                    try{
-                        defaultServers.clear();
-                        val.asArray().each(child -> {
-                            String name = child.getString("name", "");
-                            String[] addresses;
-                            if(child.has("addresses") || (child.has("address") && child.get("address").isArray())){
-                                addresses = (child.has("addresses") ? child.get("addresses") : child.get("address")).asArray().map(Jval::asString).toArray(String.class);
-                            }else{
-                                addresses = new String[]{child.getString("address", "<invalid>")};
-                            }
-                            defaultServers.add(new ServerGroup(name, addresses));
-                        });
-                        Log.info("Fetched @ community servers.", defaultServers.size);
-                    }catch(Throwable e){
-                        Log.err("Failed to parse community servers.");
-                        Log.err(e);
-                    }
-                });
-            }catch(Throwable e){
-                Log.err("Failed to fetch community servers.");
-                Log.err(e);
+        Http.get(urls[index])
+        .error(t -> {
+            if(index < urls.length - 1){
+                //attempt fetching from the next URL upon failure
+                fetchServers(urls, index + 1);
+            }else{
+                Log.err("Failed to fetch community servers", t);
             }
-        }, Log::err);
+        })
+        .submit(result -> {
+            Jval val = Jval.read(result.getResultAsString());
+            Seq<ServerGroup> servers = new Seq<>();
+            val.asArray().each(child -> {
+                String name = child.getString("name", "");
+                boolean prioritized = child.getBool("prioritized", false);
+                String[] addresses;
+                if(child.has("addresses") || (child.has("address") && child.get("address").isArray())){
+                    addresses = (child.has("addresses") ? child.get("addresses") : child.get("address")).asArray().map(Jval::asString).toArray(String.class);
+                }else{
+                    addresses = new String[]{child.getString("address", "<invalid>")};
+                }
+                servers.add(new ServerGroup(name, addresses, prioritized));
+            });
+            //modify default servers on main thread
+            Core.app.post(() -> {
+                servers.sort(s -> s.name == null ? Integer.MAX_VALUE : s.name.hashCode());
+                defaultServers.addAll(servers);
+                Log.info("Fetched @ community servers.", defaultServers.sum(s -> s.addresses.length));
+            });
+        });
     }
 
     private void saveServers(){
         Core.settings.putJson("servers", Server.class, servers);
     }
 
+    private String getVersionString(Host host){
+        if(host.version == -1){
+            return Core.bundle.format("server.version", Core.bundle.get("server.custombuild"), "");
+        }else if(host.version == 0){
+            return Core.bundle.get("server.outdated");
+        }else if(host.version < Version.build && Version.build != -1){
+            return Core.bundle.get("server.outdated") + "\n" +
+            Core.bundle.format("server.version", host.version, "");
+        }else if(host.version > Version.build && Version.build != -1){
+            return Core.bundle.get("server.outdated.client") + "\n" +
+            Core.bundle.format("server.version", host.version, "");
+        }else if(host.version == Version.build && Version.type.equals(host.versionType)){
+            //not important
+            return "";
+        }else{
+            return Core.bundle.format("server.version", host.version, host.versionType);
+        }
+    }
+
     public static class Server{
         public String ip;
         public int port;
@@ -568,7 +718,7 @@ public class JoinDialog extends BaseDialog{
                 if(isIpv6 && ip.lastIndexOf("]:") != -1 && ip.lastIndexOf("]:") != ip.length() - 1){
                     int idx = ip.indexOf("]:");
                     this.ip = ip.substring(1, idx);
-                    this.port = Integer.parseInt(ip.substring(idx + 2, ip.length()));
+                    this.port = Integer.parseInt(ip.substring(idx + 2));
                 }else if(!isIpv6 && ip.lastIndexOf(':') != -1 && ip.lastIndexOf(':') != ip.length() - 1){
                     int idx = ip.lastIndexOf(':');
                     this.ip = ip.substring(0, idx);
diff --git a/core/src/mindustry/ui/dialogs/KeybindDialog.java b/core/src/mindustry/ui/dialogs/KeybindDialog.java
new file mode 100644
index 0000000000..58c186ff31
--- /dev/null
+++ b/core/src/mindustry/ui/dialogs/KeybindDialog.java
@@ -0,0 +1,233 @@
+package mindustry.ui.dialogs;
+
+import arc.*;
+import arc.KeyBinds.*;
+import arc.graphics.*;
+import arc.input.*;
+import arc.input.InputDevice.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+
+import static arc.Core.*;
+
+public class KeybindDialog extends Dialog{
+    protected Section section;
+    protected KeyBind rebindKey = null;
+    protected boolean rebindAxis = false;
+    protected boolean rebindMin = true;
+    protected KeyCode minKey = null;
+    protected Dialog rebindDialog;
+    protected float scroll;
+    protected ObjectIntMap<Section> sectionControls = new ObjectIntMap<>();
+
+    public KeybindDialog(){
+        super(bundle.get("keybind.title"));
+        setup();
+        addCloseButton();
+        setFillParent(true);
+        title.setAlignment(Align.center);
+        titleTable.row();
+        titleTable.add(new Image()).growX().height(3f).pad(4f).get().setColor(Pal.accent);
+    }
+
+    @Override
+    public void addCloseButton(){
+        buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
+
+        keyDown(key -> {
+            if(key == KeyCode.escape || key == KeyCode.back) hide();
+        });
+    }
+
+    private void setup(){
+        cont.clear();
+
+        Section[] sections = Core.keybinds.getSections();
+
+        Stack stack = new Stack();
+        ButtonGroup<TextButton> group = new ButtonGroup<>();
+        ScrollPane pane = new ScrollPane(stack);
+        pane.setFadeScrollBars(false);
+        pane.update(() -> scroll = pane.getScrollY());
+        this.section = sections[0];
+
+        for(Section section : sections){
+            if(!sectionControls.containsKey(section))
+                sectionControls.put(section, input.getDevices().indexOf(section.device, true));
+
+            if(sectionControls.get(section, 0) >= input.getDevices().size){
+                sectionControls.put(section, 0);
+                section.device = input.getDevices().get(0);
+            }
+
+            if(sections.length != 1){
+                TextButton button = new TextButton(bundle.get("section." + section.name + ".name", Strings.capitalize(section.name)));
+                if(section.equals(this.section))
+                    button.toggle();
+
+                button.clicked(() -> this.section = section);
+
+                group.add(button);
+                cont.add(button).fill();
+            }
+
+            Table table = new Table();
+
+            Label device = new Label("Keyboard");
+            //device.setColor(style.controllerColor);
+            device.setAlignment(Align.center);
+
+            Seq<InputDevice> devices = input.getDevices();
+
+            Table stable = new Table();
+
+            stable.button("<", () -> {
+                int i = sectionControls.get(section, 0);
+                if(i - 1 >= 0){
+                    sectionControls.put(section, i - 1);
+                    section.device = devices.get(i - 1);
+                    setup();
+                }
+            }).disabled(sectionControls.get(section, 0) - 1 < 0).size(40);
+
+            stable.add(device).minWidth(device.getMinWidth() + 60);
+
+            device.setText(input.getDevices().get(sectionControls.get(section, 0)).name());
+
+            stable.button(">", () -> {
+                int i = sectionControls.get(section, 0);
+
+                if(i + 1 < devices.size){
+                    sectionControls.put(section, i + 1);
+                    section.device = devices.get(i + 1);
+                    setup();
+                }
+            }).disabled(sectionControls.get(section, 0) + 1 >= devices.size).size(40);
+
+            //no alternate devices until further notice
+            //table.add(stable).colspan(4).row();
+
+            table.add().height(10);
+            table.row();
+            if(section.device.type() == DeviceType.controller){
+                table.table(info -> info.add("Controller Type: [lightGray]" +
+                Strings.capitalize(section.device.name())).left());
+            }
+            table.row();
+
+            String lastCategory = null;
+            var tstyle = Styles.defaultt;
+
+            for(KeyBind keybind : keybinds.getKeybinds()){
+                if(lastCategory != keybind.category() && keybind.category() != null){
+                    table.add(bundle.get("category." + keybind.category() + ".name", Strings.capitalize(keybind.category()))).color(Color.gray).colspan(4).pad(10).padBottom(4).row();
+                    table.image().color(Color.gray).fillX().height(3).pad(6).colspan(4).padTop(0).padBottom(10).row();
+                    lastCategory = keybind.category();
+                }
+
+                if(keybind.defaultValue(section.device.type()) instanceof Axis){
+                    table.add(bundle.get("keybind." + keybind.name() + ".name", Strings.capitalize(keybind.name())), Color.white).left().padRight(40).padLeft(8);
+
+                    table.labelWrap(() -> {
+                        Axis axis = keybinds.get(section, keybind);
+                        return axis.key != null ? axis.key.toString() : axis.min + " [red]/[] " + axis.max;
+                    }).color(Pal.accent).left().minWidth(90).fillX().padRight(20);
+
+                    table.button("@settings.rebind", tstyle, () -> {
+                        rebindAxis = true;
+                        rebindMin = true;
+                        openDialog(section, keybind);
+                    }).width(130f);
+                }else{
+                    table.add(bundle.get("keybind." + keybind.name() + ".name", Strings.capitalize(keybind.name())), Color.white).left().padRight(40).padLeft(8);
+                    table.label(() -> keybinds.get(section, keybind).key.toString()).color(Pal.accent).left().minWidth(90).padRight(20);
+
+                    table.button("@settings.rebind", tstyle, () -> {
+                        rebindAxis = false;
+                        rebindMin = false;
+                        openDialog(section, keybind);
+                    }).width(130f);
+                }
+                table.button("@settings.resetKey", tstyle, () -> keybinds.resetToDefault(section, keybind)).width(130f).pad(2f).padLeft(4f);
+                table.row();
+            }
+
+            table.visible(() -> this.section.equals(section));
+
+            table.button("@settings.reset", () -> keybinds.resetToDefaults()).colspan(4).padTop(4).fill();
+
+            stack.add(table);
+        }
+
+        cont.row();
+        cont.add(pane).growX().colspan(sections.length);
+
+    }
+
+    void rebind(Section section, KeyBind bind, KeyCode newKey){
+        if(rebindKey == null) return;
+        rebindDialog.hide();
+        boolean isAxis = bind.defaultValue(section.device.type()) instanceof Axis;
+
+        if(isAxis){
+            if(newKey.axis || !rebindMin){
+                section.binds.get(section.device.type(), OrderedMap::new).put(rebindKey, newKey.axis ? new Axis(newKey) : new Axis(minKey, newKey));
+            }
+        }else{
+            section.binds.get(section.device.type(), OrderedMap::new).put(rebindKey, new Axis(newKey));
+        }
+
+        if(rebindAxis && isAxis && rebindMin && !newKey.axis){
+            rebindMin = false;
+            minKey = newKey;
+            openDialog(section, rebindKey);
+        }else{
+            rebindKey = null;
+            rebindAxis = false;
+        }
+    }
+
+    private void openDialog(Section section, KeyBind name){
+        rebindDialog = new Dialog(rebindAxis ? bundle.get("keybind.press.axis") : bundle.get("keybind.press"));
+
+        rebindKey = name;
+
+        rebindDialog.titleTable.getCells().first().pad(4);
+
+        if(section.device.type() == DeviceType.keyboard){
+
+            rebindDialog.addListener(new InputListener(){
+                @Override
+                public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
+                    if(Core.app.isAndroid()) return false;
+                    rebind(section, name, button);
+                    return false;
+                }
+
+                @Override
+                public boolean keyDown(InputEvent event, KeyCode keycode){
+                    rebindDialog.hide();
+                    rebind(section, name, keycode);
+                    return false;
+                }
+
+                @Override
+                public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY){
+                    if(!rebindAxis) return false;
+                    rebindDialog.hide();
+                    rebind(section, name, KeyCode.scroll);
+                    return false;
+                }
+            });
+        }
+
+        rebindDialog.show();
+        Time.runTask(1f, () -> getScene().setScrollFocus(rebindDialog));
+    }
+}
diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java
index 41519c32fd..eb1b4baf50 100644
--- a/core/src/mindustry/ui/dialogs/LanguageDialog.java
+++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java
@@ -5,6 +5,7 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.type.*;
 import mindustry.ui.*;
 
 import java.util.*;
@@ -12,18 +13,58 @@ import java.util.*;
 import static mindustry.Vars.*;
 
 public class LanguageDialog extends BaseDialog{
-    private Locale lastLocale;
-    private ObjectMap<Locale, String> displayNames = ObjectMap.of(
-        Locale.TRADITIONAL_CHINESE, "正體中文",
-        Locale.SIMPLIFIED_CHINESE, "简体中文"
+    public static final ObjectMap<String, String> displayNames = ObjectMap.of(
+    "ca", "Català",
+    "id_ID", "Bahasa Indonesia",
+    "da", "Dansk",
+    "de", "Deutsch",
+    "et", "Eesti",
+    "en", "English",
+    "es", "Español",
+    "eu", "Euskara",
+    "fil", "Filipino",
+    "fr", "Français",
+    "it", "Italiano",
+    "lt", "Lietuvių",
+    "hu", "Magyar",
+    "nl", "Nederlands",
+    "nl_BE", "Nederlands (België)",
+    "pl", "Polski",
+    "pt_BR", "Português (Brasil)",
+    "pt_PT", "Português (Portugal)",
+    "ro", "Română",
+    "fi", "Suomi",
+    "sv", "Svenska",
+    "vi", "Tiếng Việt",
+    "tk", "Türkmen dili",
+    "tr", "Türkçe",
+    "cs", "Čeština",
+    "be", "Белару�ка�",
+    "bg", "Българ�ки",
+    "ru", "Ру��кий",
+    "sr", "Срп�ки",
+    "uk_UA", "Україн�ька",
+    "th", "ไทย",
+    "zh_CN", "简体中文",
+    "zh_TW", "正體中文",
+    "ja", "日本語",
+    "ko", "한국어",
+    "router", "router"
     );
 
+    private Locale lastLocale;
+
     public LanguageDialog(){
         super("@settings.language");
         addCloseButton();
         setup();
     }
 
+    public static String getDisplayName(Locale locale){
+        String str = locale.toString().replace("in_ID", "id_ID");
+        return displayNames.get(str, str);
+    }
+
     private void setup(){
         Table langs = new Table();
         langs.marginRight(24f).marginLeft(24f);
@@ -33,11 +74,12 @@ public class LanguageDialog extends BaseDialog{
         ButtonGroup<TextButton> group = new ButtonGroup<>();
 
         for(Locale loc : locales){
-            TextButton button = new TextButton(Strings.capitalize(displayNames.get(loc, loc.getDisplayName(loc))), Styles.clearTogglet);
+            TextButton button = new TextButton(getDisplayName(loc), Styles.flatTogglet);
             button.clicked(() -> {
                 if(getLocale().equals(loc)) return;
                 Core.settings.put("locale", loc.toString());
                 Log.info("Setting locale: @", loc.toString());
+                player.locale = loc.toString();
                 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 c8ea27ae97..082b8c134e 100644
--- a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
+++ b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
@@ -2,10 +2,12 @@ package mindustry.ui.dialogs;
 
 import arc.*;
 import arc.func.*;
+import arc.math.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import mindustry.ctype.*;
+import arc.util.*;
+import mindustry.content.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -24,12 +26,14 @@ public class LaunchLoadoutDialog extends BaseDialog{
     Schematic selected;
     //validity of loadout items
     boolean valid;
+    //last calculated capacity
+    int lastCapacity;
 
     public LaunchLoadoutDialog(){
         super("@configure");
     }
 
-    public void show(CoreBlock core, Sector sector, Runnable confirm){
+    public void show(CoreBlock core, Sector sector, Sector destination, Runnable confirm){
         cont.clear();
         buttons.clear();
 
@@ -40,19 +44,52 @@ public class LaunchLoadoutDialog extends BaseDialog{
 
         ItemSeq sitems = sector.items();
 
+        //hide nonsensical items
+        ItemSeq launch = universe.getLaunchResources();
+        if(sector.planet.allowLaunchLoadout){
+            for(var item : content.items()){
+                if(!item.isOnPlanet(sector.planet)){
+                    launch.set(item, 0);
+                }
+            }
+            universe.updateLaunchResources(launch);
+        }
+
         //updates sum requirements
         Runnable update = () -> {
-            int cap = selected.findCore().itemCapacity;
+            int cap = lastCapacity = (int)(sector.planet.launchCapacityMultiplier * selected.findCore().itemCapacity);
 
             //cap resources based on core type
+            ItemSeq schems = selected.requirements();
             ItemSeq resources = universe.getLaunchResources();
             resources.min(cap);
+
+            int capacity = lastCapacity;
+
+            if(!destination.allowLaunchLoadout()){
+                resources.clear();
+                //TODO this should be set to a proper loadout based on sector.
+                if(destination.preset != null){
+                    var rules = destination.preset.generator.map.rules();
+                    for(var stack : rules.loadout){
+                        if(stack.item.isOnPlanet(sector.planet)){
+                            resources.add(stack.item, stack.amount);
+                        }
+                    }
+                }
+
+            }else if(getMax()){
+                for(Item item : content.items()){
+                    resources.set(item, Mathf.clamp(sitems.get(item) - schems.get(item), 0, capacity));
+                }
+            }
+
             universe.updateLaunchResources(resources);
 
             total.clear();
             selected.requirements().each(total::add);
             universe.getLaunchResources().each(total::add);
-            valid = sitems.has(total);
+            valid = sitems.has(total) || PlanetDialog.debugSelect;
         };
 
         Cons<Table> rebuild = table -> {
@@ -63,10 +100,13 @@ public class LaunchLoadoutDialog extends BaseDialog{
             ItemSeq launches = universe.getLaunchResources();
 
             for(ItemStack s : total){
-                table.image(s.item.icon(Cicon.small)).left().size(Cicon.small.size);
                 int as = schems.get(s.item), al = launches.get(s.item);
 
-                String amountStr = (al + as) + "[gray] (" + (al + " + " + as + ")");
+                if(as + al == 0) continue;
+
+                table.image(s.item.uiIcon).left().size(iconSmall);
+
+                String amountStr = (al + as) + (destination.allowLaunchLoadout() ? "[gray] (" + (al + " + " + as + ")") : "");
 
                 table.add(
                     sitems.has(s.item, s.amount) ? amountStr :
@@ -82,53 +122,95 @@ public class LaunchLoadoutDialog extends BaseDialog{
 
         Runnable rebuildItems = () -> rebuild.get(items);
 
-        buttons.button("@resources", Icon.terrain, () -> {
-            ItemSeq stacks = universe.getLaunchResources();
-            Seq<ItemStack> out = stacks.toSeq();
-
-            loadout.show(selected.findCore().itemCapacity, out, UnlockableContent::unlocked, out::clear, () -> {}, () -> {
-                universe.updateLaunchResources(new ItemSeq(out));
+        if(destination.allowLaunchLoadout()){
+            buttons.button("@resources.max", Icon.add, Styles.togglet, () -> {
+                setMax(!getMax());
                 update.run();
                 rebuildItems.run();
-            });
-        }).width(204);
+            }).checked(b -> getMax());
 
-        buttons.button("@launch.text", Icon.ok, () -> {
+            buttons.button("@resources", Icon.edit, () -> {
+                ItemSeq stacks = universe.getLaunchResources();
+                Seq<ItemStack> out = stacks.toSeq();
+
+                ItemSeq realItems = sitems.copy();
+                selected.requirements().each(realItems::remove);
+
+                loadout.show(lastCapacity, realItems, out, i -> i.unlocked() && i.isOnPlanet(sector.planet), out::clear, () -> {}, () -> {
+                    universe.updateLaunchResources(new ItemSeq(out));
+                    update.run();
+                    rebuildItems.run();
+                });
+            }).disabled(b -> getMax());
+        }
+
+        boolean rows = Core.graphics.isPortrait() && mobile;
+
+        if(rows) buttons.row();
+
+        var cell = buttons.button("@launch.text", Icon.ok, () -> {
             universe.updateLoadout(core, selected);
             confirm.run();
             hide();
         }).disabled(b -> !valid);
 
+        if(rows){
+            cell.colspan(2).size(160f + 160f + 4f, 64f);
+        }
+
         int cols = Math.max((int)(Core.graphics.getWidth() / Scl.scl(230)), 1);
         ButtonGroup<Button> group = new ButtonGroup<>();
         selected = universe.getLoadout(core);
+        if(selected == null) selected = schematics.getLoadouts().get((CoreBlock)Blocks.coreShard).first();
 
         cont.add(Core.bundle.format("launch.from", sector.name())).row();
 
-        cont.pane(t -> {
-            int i = 0;
+        if(destination.allowLaunchSchematics()){
+            cont.pane(t -> {
+                int[] i = {0};
 
-            for(var entry : schematics.getLoadouts()){
-                if(entry.key.size <= core.size){
-                    for(Schematic s : entry.value){
+                Cons<Schematic> handler = s -> {
+                    if(s.tiles.contains(tile -> !tile.block.supportsEnv(sector.planet.defaultEnv) ||
+                    //make sure block can be built here.
+                    !tile.block.isOnPlanet(sector.planet))){
+                        return;
+                    }
 
-                        t.button(b -> b.add(new SchematicImage(s)), Styles.togglet, () -> {
-                            selected = s;
-                            update.run();
-                            rebuildItems.run();
-                        }).group(group).pad(4).checked(s == selected).size(200f);
+                    t.button(b -> b.add(new SchematicImage(s)), Styles.togglet, () -> {
+                        selected = s;
+                        update.run();
+                        rebuildItems.run();
+                    }).group(group).pad(4).checked(s == selected).size(200f);
 
-                        if(++i % cols == 0){
-                            t.row();
+                    if(++i[0] % cols == 0){
+                        t.row();
+                    }
+                };
+
+                if(destination.allowLaunchSchematics() || schematics.getDefaultLoadout(core) == null){
+                    for(var entry : schematics.getLoadouts()){
+                        if(entry.key.size <= core.size){
+                            for(Schematic s : entry.value){
+                                handler.get(s);
+                            }
                         }
                     }
+                }else{
+                    //only allow launching with the standard loadout schematic
+                    handler.get(schematics.getDefaultLoadout(core));
                 }
-            }
+            }).growX().scrollX(false);
 
+            cont.row();
 
-        }).growX().get().setScrollingDisabled(true, false);
+            cont.label(() -> Core.bundle.format("launch.capacity", lastCapacity)).row();
+            cont.row();
+        }else if(destination.preset != null && destination.preset.description != null){
+            cont.pane(p -> {
+                p.add(destination.preset.description).grow().wrap().labelAlign(Align.center);
+            }).pad(10f).grow().row();
+        }
 
-        cont.row();
         cont.pane(items);
         cont.row();
         cont.add("@sector.missingresources").visible(() -> !valid);
@@ -138,4 +220,12 @@ public class LaunchLoadoutDialog extends BaseDialog{
 
         show();
     }
+
+    void setMax(boolean max){
+        Core.settings.put("maxresources", max);
+    }
+
+    boolean getMax(){
+        return Core.settings.getBool("maxresources", true);
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java
index 6e2e56e2d8..8c4118db4e 100644
--- a/core/src/mindustry/ui/dialogs/LoadDialog.java
+++ b/core/src/mindustry/ui/dialogs/LoadDialog.java
@@ -8,7 +8,9 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.core.GameState.*;
+import mindustry.game.*;
 import mindustry.game.Saves.*;
 import mindustry.gen.*;
 import mindustry.io.*;
@@ -20,8 +22,11 @@ import java.io.*;
 import static mindustry.Vars.*;
 
 public class LoadDialog extends BaseDialog{
-    ScrollPane pane;
     Table slots;
+    String searchString;
+    Seq<Gamemode> hidden;
+    TextField searchField;
+    ScrollPane pane;
 
     public LoadDialog(){
         this("@loadgame");
@@ -31,7 +36,10 @@ public class LoadDialog extends BaseDialog{
         super(title);
         setup();
 
-        shown(this::setup);
+        shown(() -> {
+            searchString = "";
+            setup();
+        });
         onResize(this::setup);
 
         addCloseButton();
@@ -42,10 +50,40 @@ public class LoadDialog extends BaseDialog{
         cont.clear();
 
         slots = new Table();
+        hidden = new Seq<>();
         pane = new ScrollPane(slots);
+
+        rebuild();
+
+        Table search = new Table();
+        search.image(Icon.zoom);
+        searchField = search.field("", t -> {
+            searchString = t.length() > 0 ? t.toLowerCase() : null;
+            rebuild();
+        }).maxTextLength(50).growX().get();
+        searchField.setMessageText("@save.search");
+        for(Gamemode mode : Gamemode.all){
+            TextureRegionDrawable icon = Vars.ui.getIcon("mode" + Strings.capitalize(mode.name()));
+            boolean sandbox = mode == Gamemode.sandbox;
+            if(Core.atlas.isFound(icon.getRegion()) || sandbox){
+                search.button(sandbox ? Icon.terrain : icon, Styles.emptyTogglei, () -> {
+                    if(!hidden.addUnique(mode)) hidden.remove(mode);
+                    rebuild();
+                }).size(60f).padLeft(-12f).checked(b -> !hidden.contains(mode)).tooltip("@mode." + mode.name() + ".name");
+            }
+        }
+
         pane.setFadeScrollBars(false);
         pane.setScrollingDisabled(true, false);
 
+        cont.add(search).growX();
+        cont.row();
+        cont.add(pane).growY();
+    }
+
+    public void rebuild(){
+
+        slots.clear();
         slots.marginRight(24).marginLeft(20f);
 
         Time.runTask(2f, () -> Core.scene.setScrollFocus(pane));
@@ -58,11 +96,15 @@ public class LoadDialog extends BaseDialog{
         boolean any = false;
 
         for(SaveSlot slot : array){
-            if(slot.isHidden()) continue;
+            if(slot.isHidden()
+            || (searchString != null && !Strings.stripColors(slot.getName()).toLowerCase().contains(searchString))
+            || (!hidden.isEmpty() && hidden.contains(slot.mode()))){
+                continue;
+            }
 
             any = true;
 
-            TextButton button = new TextButton("", Styles.cleart);
+            TextButton button = new TextButton("", Styles.grayt);
             button.getLabel().remove();
             button.clearChildren();
 
@@ -75,21 +117,21 @@ public class LoadDialog extends BaseDialog{
                     t.right();
                     t.defaults().size(40f);
 
-                    t.button(Icon.save, Styles.emptytogglei, () -> {
+                    t.button(Icon.save, Styles.emptyTogglei, () -> {
                         slot.setAutosave(!slot.isAutosave());
                     }).checked(slot.isAutosave()).right();
 
                     t.button(Icon.trash, Styles.emptyi, () -> {
                         ui.showConfirm("@confirm", "@save.delete.confirm", () -> {
                             slot.delete();
-                            setup();
+                            rebuild();
                         });
                     }).right();
 
                     t.button(Icon.pencil, Styles.emptyi, () -> {
                         ui.showTextInput("@save.rename", "@save.rename.text", slot.getName(), text -> {
                             slot.setName(text);
-                            setup();
+                            rebuild();
                         });
                     }).right();
 
@@ -141,10 +183,8 @@ public class LoadDialog extends BaseDialog{
         }
 
         if(!any){
-            slots.button("@save.none", () -> {}).disabled(true).fillX().margin(20f).minWidth(340f).height(80f).pad(4f);
+            slots.add("@save.none");
         }
-
-        cont.add(pane);
     }
 
     public void addSetup(){
@@ -152,12 +192,18 @@ public class LoadDialog extends BaseDialog{
         buttons.button("@save.import", Icon.add, () -> {
             platform.showFileChooser(true, saveExtension, file -> {
                 if(SaveIO.isSaveValid(file)){
-                    try{
-                        control.saves.importSave(file);
-                        setup();
-                    }catch(IOException e){
-                        e.printStackTrace();
-                        ui.showException("@save.import.fail", e);
+                    var meta = SaveIO.getMeta(file);
+
+                    if(meta.rules.sector != null){
+                        ui.showErrorMessage("@save.nocampaign");
+                    }else{
+                        try{
+                            control.saves.importSave(file);
+                            rebuild();
+                        }catch(IOException e){
+                            e.printStackTrace();
+                            ui.showException("@save.import.fail", e);
+                        }
                     }
                 }else{
                     ui.showErrorMessage("@save.import.invalid");
@@ -193,4 +239,15 @@ public class LoadDialog extends BaseDialog{
             }
         });
     }
+
+    @Override
+    public Dialog show(){
+        super.show();
+
+        if(Core.app.isDesktop() && searchField != null){
+            Core.scene.setKeyboardFocus(searchField);
+        }
+
+        return this;
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/LoadoutDialog.java b/core/src/mindustry/ui/dialogs/LoadoutDialog.java
index d818f5ecda..bc8c16608b 100644
--- a/core/src/mindustry/ui/dialogs/LoadoutDialog.java
+++ b/core/src/mindustry/ui/dialogs/LoadoutDialog.java
@@ -22,6 +22,7 @@ public class LoadoutDialog extends BaseDialog{
     private Boolf<Item> validator = i -> true;
     private Table items;
     private int capacity;
+    private @Nullable ItemSeq total;
 
     public LoadoutDialog(){
         super("@configure");
@@ -46,6 +47,8 @@ public class LoadoutDialog extends BaseDialog{
 
         buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
 
+        buttons.button("@max", Icon.export, this::maxItems).size(210f, 64f);
+
         buttons.button("@settings.reset", Icon.refresh, () -> {
             resetter.run();
             reseed();
@@ -54,12 +57,23 @@ public class LoadoutDialog extends BaseDialog{
         }).size(210f, 64f);
     }
 
+    public void maxItems(){
+        for(ItemStack stack : stacks){
+            stack.amount = total == null ? capacity : Math.max(Math.min(capacity, total.get(stack.item)), 0);
+        }
+    }
+
     public void show(int capacity, Seq<ItemStack> stacks, Boolf<Item> validator, Runnable reseter, Runnable updater, Runnable hider){
+        show(capacity, null, stacks, validator, reseter, updater, hider);
+    }
+
+    public void show(int capacity, ItemSeq total, Seq<ItemStack> stacks, Boolf<Item> validator, Runnable reseter, Runnable updater, Runnable hider){
         this.originalStacks = stacks;
         this.validator = validator;
         this.resetter = reseter;
         this.updater = updater;
         this.capacity = capacity;
+        this.total = total;
         this.hider = hider;
         reseed();
         show();
@@ -75,17 +89,17 @@ public class LoadoutDialog extends BaseDialog{
         for(ItemStack stack : stacks){
             items.table(Tex.pane, t -> {
                 t.margin(4).marginRight(8).left();
-                t.button("-", Styles.cleart, () -> {
+                t.button("-", Styles.flatt, () -> {
                     stack.amount = Math.max(stack.amount - step(stack.amount), 0);
                     updater.run();
                 }).size(bsize);
 
-                t.button("+", Styles.cleart, () -> {
+                t.button("+", Styles.flatt, () -> {
                     stack.amount = Math.min(stack.amount + step(stack.amount), capacity);
                     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.flati, () -> 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){
@@ -97,7 +111,7 @@ public class LoadoutDialog extends BaseDialog{
                     ui.showInfo(Core.bundle.format("configure.invalid", capacity));
                 })).size(bsize);
 
-                t.image(stack.item.icon(Cicon.small)).size(8 * 3).padRight(4).padLeft(4);
+                t.image(stack.item.uiIcon).size(8 * 3).padRight(4).padLeft(4);
                 t.label(() -> stack.amount + "").left().width(90f);
             }).pad(2).left().fillX();
 
@@ -110,7 +124,7 @@ public class LoadoutDialog extends BaseDialog{
 
     private void reseed(){
         this.stacks = originalStacks.map(ItemStack::copy);
-        this.stacks.addAll(content.items().select(i -> validator.get(i) && !stacks.contains(stack -> stack.item == i)).map(i -> new ItemStack(i, 0)));
+        this.stacks.addAll(content.items().select(i -> validator.get(i) && !i.isHidden() && !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/MapListDialog.java b/core/src/mindustry/ui/dialogs/MapListDialog.java
new file mode 100644
index 0000000000..1cdd01e0c6
--- /dev/null
+++ b/core/src/mindustry/ui/dialogs/MapListDialog.java
@@ -0,0 +1,233 @@
+package mindustry.ui.dialogs;
+
+import arc.*;
+import arc.graphics.*;
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.maps.*;
+import mindustry.ui.*;
+
+import static mindustry.Vars.*;
+
+public abstract class MapListDialog extends BaseDialog{
+    BaseDialog activeDialog;
+
+    private String searchString;
+    private Seq<Gamemode> modes = new Seq<>();
+    private Table mapTable = new Table();
+    private TextField searchField;
+
+    private boolean
+    showBuiltIn = Core.settings.getBool("editorshowbuiltinmaps", true),
+    showCustom = Core.settings.getBool("editorshowcustommaps", true),
+    searchAuthor = Core.settings.getBool("editorsearchauthor", false),
+    searchDescription = Core.settings.getBool("editorsearchdescription", false),
+    displayType;
+
+    public MapListDialog(String title, boolean displayType){
+        super(title);
+
+        this.displayType = displayType;
+
+        buttons.remove();
+
+        addCloseListener();
+
+        shown(this::setup);
+        onResize(() -> {
+            if(activeDialog != null){
+                activeDialog.hide();
+            }
+            setup();
+        });
+    }
+
+    void buildButtons(){}
+
+    abstract void showMap(Map map);
+
+    void setup(){
+        makeButtonOverlay();
+
+        buttons.clearChildren();
+
+        searchString = null;
+
+        if(Core.graphics.isPortrait() && displayType){
+            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);
+        }
+
+        buildButtons();
+
+        cont.clear();
+
+        rebuildMaps();
+
+        ScrollPane pane = new ScrollPane(mapTable);
+        pane.setFadeScrollBars(false);
+        pane.setScrollingDisabledX(true);
+
+        Table search = new Table();
+        search.image(Icon.zoom);
+        searchField = search.field("", t -> {
+            searchString = t.length() > 0 ? t.toLowerCase() : null;
+            rebuildMaps();
+        }).maxTextLength(50).growX().get();
+        searchField.setMessageText("@editor.search");
+        search.button(Icon.filter, Styles.emptyi, this::showMapFilters).tooltip("@editor.filters");
+
+        cont.add(search).growX();
+        cont.row();
+        cont.add(pane).padLeft(28f).uniformX().growY();
+    }
+
+    void rebuildMaps(){
+        mapTable.clear();
+
+        mapTable.marginRight(12f);
+
+        int maxwidth = Math.max((int)(Core.graphics.getWidth() / Scl.scl(230)), 1);
+        float mapsize = 200f;
+        boolean noMapsShown = true;
+
+        int i = 0;
+
+        Seq<Map> mapList = showCustom ?
+            showBuiltIn ? maps.all() : maps.customMaps() :
+            showBuiltIn ? maps.defaultMaps() : null;
+
+        if(mapList != null){
+            for(Map map : mapList){
+
+                boolean invalid = false;
+                for(Gamemode mode : modes){
+                    invalid |= !mode.valid(map);
+                }
+                if(invalid || (searchString != null
+                    && !map.plainName().toLowerCase().contains(searchString)
+                    && (!searchAuthor || !map.plainAuthor().toLowerCase().contains(searchString))
+                    && (!searchDescription || !map.plainDescription().toLowerCase().contains(searchString)))){
+                    continue;
+                }
+
+                noMapsShown = false;
+
+                if(i % maxwidth == 0){
+                    mapTable.row();
+                }
+
+                TextButton button = mapTable.button("", Styles.grayt, () -> showMap(map)).width(mapsize).bottom().pad(8).get();
+                button.clearChildren();
+                button.margin(9);
+                button.bottom();
+
+                //TODO hide in editor?
+                button.table(t -> {
+                    t.left();
+                    for(Gamemode mode : Gamemode.all){
+                        TextureRegionDrawable icon = Vars.ui.getIcon("mode" + Strings.capitalize(mode.name()) + "Small");
+                        if(mode.valid(map) && Core.atlas.isFound(icon.getRegion())){
+                            t.image(icon).size(16f).pad(4f);
+                        }
+                    }
+                    if(t.getChildren().size == 0){
+                        t.add().size(16f).pad(4f);
+                    }
+                }).left().row();
+
+                button.add(map.name()).width(mapsize - 18f).center().get().setEllipsis(true);
+                button.row();
+                button.image().growX().pad(4).color(Pal.gray);
+                button.row();
+                button.stack(new Image(map.safeTexture()).setScaling(Scaling.fit), new BorderImage(map.safeTexture()).setScaling(Scaling.fit)).size(mapsize - 20f);
+
+                if(displayType){
+                    button.row();
+                    button.add(map.custom ? "@custom" : map.workshop ? "@workshop" : map.mod != null ? "[lightgray]" + map.mod.meta.displayName : "@builtin").color(Color.gray).padTop(3);
+                }
+
+                i++;
+            }
+        }
+
+        if(noMapsShown){
+            mapTable.add("@maps.none");
+        }
+    }
+
+    void showMapFilters(){
+        activeDialog = new BaseDialog("@editor.filters");
+        activeDialog.addCloseButton();
+        activeDialog.cont.table(menu -> {
+            menu.add("@editor.filters.mode").width(150f).left();
+            menu.table(t -> {
+                for(Gamemode mode : Gamemode.all){
+                    TextureRegionDrawable icon = Vars.ui.getIcon("mode" + Strings.capitalize(mode.name()));
+                    if(Core.atlas.isFound(icon.getRegion())){
+                        t.button(icon, Styles.emptyTogglei, () -> {
+                            if(modes.contains(mode)){
+                                modes.remove(mode);
+                            }else{
+                                modes.add(mode);
+                            }
+                            rebuildMaps();
+                        }).size(60f).checked(modes.contains(mode)).tooltip("@mode." + mode.name() + ".name");
+                    }
+                }
+            }).padBottom(10f);
+            menu.row();
+
+            menu.add("@editor.filters.type").width(150f).left();
+            menu.table(Tex.button, t -> {
+                t.button("@custom", Styles.flatTogglet, () -> {
+                    showCustom = !showCustom;
+                    Core.settings.put("editorshowcustommaps", showCustom);
+                    rebuildMaps();
+                }).size(150f, 60f).checked(showCustom);
+                t.button("@builtin", Styles.flatTogglet, () -> {
+                    showBuiltIn = !showBuiltIn;
+                    Core.settings.put("editorshowbuiltinmaps", showBuiltIn);
+                    rebuildMaps();
+                }).size(150f, 60f).checked(showBuiltIn);
+            }).padBottom(10f);
+            menu.row();
+
+            menu.add("@editor.filters.search").width(150f).left();
+            menu.table(Tex.button, t -> {
+                t.button("@editor.filters.author", Styles.flatTogglet, () -> {
+                    searchAuthor = !searchAuthor;
+                    Core.settings.put("editorsearchauthor", searchAuthor);
+                    rebuildMaps();
+                }).size(150f, 60f).checked(searchAuthor);
+                t.button("@editor.filters.description", Styles.flatTogglet, () -> {
+                    searchDescription = !searchDescription;
+                    Core.settings.put("editorsearchdescription", searchDescription);
+                    rebuildMaps();
+                }).size(150f, 60f).checked(searchDescription);
+            });
+        });
+
+        activeDialog.show();
+    }
+
+    @Override
+    public Dialog show(){
+        super.show();
+
+        if(Core.app.isDesktop() && searchField != null){
+            Core.scene.setKeyboardFocus(searchField);
+        }
+
+        return this;
+    }
+}
diff --git a/core/src/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/mindustry/ui/dialogs/MapPlayDialog.java
index 8655e07208..b2f31971b4 100644
--- a/core/src/mindustry/ui/dialogs/MapPlayDialog.java
+++ b/core/src/mindustry/ui/dialogs/MapPlayDialog.java
@@ -12,7 +12,9 @@ import mindustry.ui.*;
 import static mindustry.Vars.*;
 
 public class MapPlayDialog extends BaseDialog{
-    CustomRulesDialog dialog = new CustomRulesDialog();
+    public @Nullable Runnable playListener;
+
+    CustomRulesDialog dialog = new CustomRulesDialog(true);
     Rules rules;
     Gamemode selectedGamemode = Gamemode.survival;
     Map lastMap;
@@ -31,6 +33,10 @@ public class MapPlayDialog extends BaseDialog{
     }
 
     public void show(Map map){
+        show(map, false);
+    }
+
+    public void show(Map map, boolean playtesting){
         this.lastMap = map;
         title.setText(map.name());
         cont.clearChildren();
@@ -46,27 +52,27 @@ public class MapPlayDialog extends BaseDialog{
         rules = map.applyRules(selectedGamemode);
 
         Table selmode = new Table();
-        selmode.add("@level.mode").colspan(4);
+        selmode.add("@level.mode").colspan(2);
         selmode.row();
-        int i = 0;
 
-        Table modes = new Table();
+        selmode.table(Tex.button, modes -> {
+            int i = 0;
+            for(Gamemode mode : Gamemode.all){
+                if(mode.hidden) continue;
 
-        for(Gamemode mode : Gamemode.values()){
-            if(mode.hidden) continue;
+                modes.button(mode.toString(), Styles.flatToggleMenut, () -> {
+                    selectedGamemode = mode;
+                    rules = map.applyRules(mode);
+                }).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, mobile ? 44f : 54f).disabled(!mode.valid(map));
+                if(i++ % 2 == 1) modes.row();
+            }
+        });
 
-            modes.button(mode.toString(), Styles.togglet, () -> {
-                selectedGamemode = mode;
-                rules = map.applyRules(mode);
-            }).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, 54f).disabled(!mode.valid(map));
-            if(i++ % 2 == 1) modes.row();
-        }
-        selmode.add(modes);
         selmode.button("?", this::displayGameModeHelp).width(50f).fillY().padLeft(18f);
 
         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))).height(50f).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 +85,8 @@ public class MapPlayDialog extends BaseDialog{
         addCloseButton();
 
         buttons.button("@play", Icon.play, () -> {
-            control.playMap(map, rules);
+            if(playListener != null) playListener.run();
+            control.playMap(map, rules, playtesting);
             hide();
             ui.custom.hide();
         }).size(210f, 64f);
@@ -95,9 +102,9 @@ public class MapPlayDialog extends BaseDialog{
         ScrollPane pane = new ScrollPane(table);
         pane.setFadeScrollBars(false);
         table.row();
-        for(Gamemode mode : Gamemode.values()){
+        for(Gamemode mode : Gamemode.all){
             if(mode.hidden) continue;
-            table.labelWrap("[accent]" + mode.toString() + ":[] [lightgray]" + mode.description()).width(400f);
+            table.labelWrap("[accent]" + mode + ":[] [lightgray]" + mode.description()).width(400f);
             table.row();
         }
 
diff --git a/core/src/mindustry/ui/dialogs/MinimapDialog.java b/core/src/mindustry/ui/dialogs/MinimapDialog.java
deleted file mode 100644
index 703d896bfa..0000000000
--- a/core/src/mindustry/ui/dialogs/MinimapDialog.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package mindustry.ui.dialogs;
-
-import arc.*;
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.input.*;
-import arc.scene.event.*;
-import arc.scene.ui.layout.*;
-import mindustry.gen.*;
-
-import static mindustry.Vars.*;
-
-public class MinimapDialog extends BaseDialog{
-
-    public MinimapDialog(){
-        super("@minimap");
-        setFillParent(true);
-
-        shown(this::setup);
-
-        addCloseButton();
-        shouldPause = true;
-        titleTable.remove();
-        onResize(this::setup);
-    }
-
-    void setup(){
-        cont.clear();
-
-        cont.table(Tex.pane,t -> {
-            t.rect((x, y, width, height) -> {
-                if(renderer.minimap.getRegion() == null) return;
-                Draw.color(Color.white);
-                Draw.alpha(parentAlpha);
-                Draw.rect(renderer.minimap.getRegion(), x + width / 2f, y + height / 2f, width, height);
-
-                if(renderer.minimap.getTexture() != null){
-                    renderer.minimap.drawEntities(x, y, width, height);
-                }
-            }).grow();
-        }).size(Math.min(Core.graphics.getWidth() / 1.1f, Core.graphics.getHeight() / 1.3f) / Scl.scl(1f)).padTop(-20f);
-
-        cont.addListener(new InputListener(){
-            @Override
-            public boolean scrolled(InputEvent event, float x, float y, float amountx, float amounty){
-                renderer.minimap.zoomBy(amounty);
-                return true;
-            }
-        });
-
-        cont.addListener(new ElementGestureListener(){
-            float lzoom = -1f;
-
-            @Override
-            public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
-                lzoom = renderer.minimap.getZoom();
-            }
-
-            @Override
-            public void zoom(InputEvent event, float initialDistance, float distance){
-                if(lzoom < 0){
-                    lzoom = renderer.minimap.getZoom();
-                }
-                renderer.minimap.setZoom(initialDistance / distance * lzoom);
-            }
-        });
-
-        Core.app.post(() -> Core.scene.setScrollFocus(cont));
-    }
-}
diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java
index 75dbdca5c7..aa9593beaa 100644
--- a/core/src/mindustry/ui/dialogs/ModsDialog.java
+++ b/core/src/mindustry/ui/dialogs/ModsDialog.java
@@ -1,112 +1,183 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
-import arc.Net.*;
 import arc.files.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.input.*;
 import arc.scene.style.*;
 import arc.scene.ui.TextButton.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import arc.util.Http.*;
 import arc.util.io.*;
 import arc.util.serialization.*;
+import arc.util.serialization.Jval.*;
 import mindustry.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.io.*;
 import mindustry.mod.*;
 import mindustry.mod.Mods.*;
 import mindustry.ui.*;
 
-import java.io.*;
+import java.text.*;
+import java.util.*;
 
 import static mindustry.Vars.*;
 
 public class ModsDialog extends BaseDialog{
+    private ObjectMap<String, TextureRegion> textureCache = new ObjectMap<>();
+
+    private float modImportProgress;
     private String searchtxt = "";
     private @Nullable Seq<ModListing> modList;
+    private boolean orderDate = true;
+    private BaseDialog currentContent;
+
+    private BaseDialog browser;
+    private Table browserTable;
+    private float scroll = 0f;
 
     public ModsDialog(){
         super("@mods");
         addCloseButton();
 
+        browser = new BaseDialog("@mods.browser");
+
+        browser.cont.table(table -> {
+            table.left();
+            table.image(Icon.zoom);
+            table.field(searchtxt, res -> {
+                searchtxt = res;
+                rebuildBrowser();
+            }).growX().get();
+            table.button(Icon.list, Styles.emptyi, 32f, () -> {
+                orderDate = !orderDate;
+                rebuildBrowser();
+            }).update(b -> b.getStyle().imageUp = (orderDate ? Icon.list : Icon.star)).size(40f).get()
+            .addListener(new Tooltip(tip -> tip.label(() -> orderDate ? "@mods.browser.sortdate" : "@mods.browser.sortstars").left()));
+        }).fillX().padBottom(4);
+
+        browser.cont.row();
+        browser.cont.pane(tablebrow -> {
+            tablebrow.margin(10f).top();
+            browserTable = tablebrow;
+        }).scrollX(false);
+        browser.addCloseButton();
+        browser.makeButtonOverlay();
+
+        browser.onResize(this::rebuildBrowser);
+
         buttons.button("@mods.guide", Icon.link, () -> Core.app.openURI(modGuideURL)).size(210, 64f);
 
-        shown(this::setup);
-        if(mobile){
-            onResize(this::setup);
+        if(!mobile){
+            buttons.button("@mods.openfolder", Icon.link, () -> Core.app.openFolder(modDirectory.absolutePath()));
         }
 
+        shown(this::setup);
+        onResize(this::setup);
+
+        Events.on(ResizeEvent.class, event -> {
+            if(currentContent != null){
+                currentContent.hide();
+                currentContent = null;
+            }
+        });
+
         hidden(() -> {
             if(mods.requiresReload()){
                 reload();
             }
         });
 
-        shown(() -> Core.app.post(() -> {
-            Core.settings.getBoolOnce("modsalpha", () -> {
-                ui.showText("@mods", "@mods.alphainfo");
-            });
-        }));
     }
 
     void modError(Throwable error){
         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")))){
+        if(error instanceof NoSuchMethodError || 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");
+        }else if(error instanceof HttpStatusException st){
+            ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(st.status.toString().toLowerCase())));
+        }else if(error.getMessage() != null && error.getMessage().toLowerCase(Locale.ROOT).contains("writable dex")){
+            ui.showException("@error.moddex", error);
         }else{
             ui.showException(error);
         }
     }
 
-    void getModList(Cons<Seq<ModListing>> listener){
-        if(modList == null){
-            Core.net.httpGet("https://raw.githubusercontent.com/Anuken/MindustryMods/master/mods.json", response -> {
-                String strResult = response.getResultAsString();
-                var status = response.getStatus();
+    void getModList(int index, Cons<Seq<ModListing>> listener){
+        if(index >= modJsonURLs.length) return;
 
+        if(modList != null){
+            listener.get(modList);
+            return;
+        }
+
+        Http.get(modJsonURLs[index], response -> {
+            String strResult = response.getResultAsString();
+
+            Core.app.post(() -> {
+                try{
+                    modList = JsonIO.json.fromJson(Seq.class, ModListing.class, strResult);
+
+                    var d = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+                    Func<String, Date> parser = text -> {
+                        try{
+                            return d.parse(text);
+                        }catch(Exception e){
+                            return new Date();
+                        }
+                    };
+
+                    modList.sortComparing(m -> parser.get(m.lastUpdated)).reverse();
+                    listener.get(modList);
+                }catch(Exception e){
+                    Log.err(e);
+                    ui.showException(e);
+                }
+            });
+        }, error -> {
+            if(index < modJsonURLs.length - 1){
+                getModList(index + 1, listener);
+            }else{
                 Core.app.post(() -> {
-                    if(status != HttpStatus.OK){
-                        ui.showErrorMessage(Core.bundle.format("connectfail", status));
-                    }else{
-                        modList = new Json().fromJson(Seq.class, ModListing.class, strResult);
-
-                        //potentially sort mods by game version compatibility, or other criteria
-                        //modList.sort(Structs.comparingBool(m -> !Version.isAtLeast(m.minGameVersion)));
-
-                        listener.get(modList);
+                    modError(error);
+                    if(browser != null){
+                        browser.hide();
                     }
                 });
-            }, error -> Core.app.post(() -> ui.showException(error)));
-        }else{
-            listener.get(modList);
-        }
+            }
+        });
     }
 
     void setup(){
         float h = 110f;
-        float w = mobile ? 440f : 524f;
+        float w = Math.min(Core.graphics.getWidth() / Scl.scl(1.05f), 520f);
 
         cont.clear();
-        cont.defaults().width(mobile ? 500 : 560f).pad(4);
+        cont.defaults().width(Math.min(Core.graphics.getWidth() / Scl.scl(1.05f), 556f)).pad(4);
         cont.add("@mod.reloadrequired").visible(mods::requiresReload).center().get().setAlignment(Align.center);
         cont.row();
 
         cont.table(buttons -> {
             buttons.left().defaults().growX().height(60f).uniformX();
 
-            TextButtonStyle style = Styles.clearPartialt;
+            TextButtonStyle style = Styles.flatBordert;
             float margin = 12f;
 
             buttons.button("@mod.import", Icon.add, style, () -> {
                 BaseDialog dialog = new BaseDialog("@mod.import");
 
-                TextButtonStyle bstyle = Styles.cleart;
+                TextButtonStyle bstyle = Styles.flatt;
 
                 dialog.cont.table(Tex.button, t -> {
                     t.defaults().size(300f, 70f);
@@ -116,21 +187,12 @@ public class ModsDialog extends BaseDialog{
                         dialog.hide();
 
                         platform.showMultiFileChooser(file -> {
-                            Runnable go = () -> {
-                                try{
-                                    mods.importMod(file);
-                                    setup();
-                                }catch(IOException e){
-                                    ui.showException(e);
-                                    e.printStackTrace();
-                                }
-                            };
-
-                            //show unsafe jar file warning
-                            if(file.extEquals("jar")){
-                                ui.showConfirm("@warning", "@mod.jarwarn", go);
-                            }else{
-                                go.run();
+                            try{
+                                mods.importMod(file);
+                                setup();
+                            }catch(Exception e){
+                                ui.showException(e.getMessage() != null && e.getMessage().toLowerCase(Locale.ROOT).contains("writable dex") ? "@error.moddex" : "", e);
+                                Log.err(e);
                             }
                         }, "zip", "jar");
                     }).margin(12f);
@@ -141,81 +203,15 @@ public class ModsDialog extends BaseDialog{
                         dialog.hide();
 
                         ui.showTextInput("@mod.import.github", "", 64, Core.settings.getString("lastmod", ""), text -> {
+                            //clean up the text in case somebody inputs a URL or adds random spaces
+                            text = text.trim().replace(" ", "");
+                            if(text.startsWith("https://github.com/")) text = text.substring("https://github.com/".length());
+
                             Core.settings.put("lastmod", text);
-
-                            ui.loadfrag.show();
-                            githubImportMod(text);
+                            //there's no good way to know if it's a java mod here, so assume it's not
+                            githubImportMod(text, false, null);
                         });
                     }).margin(12f);
-
-                    t.row();
-
-                    t.button("@mod.featured.dialog.title", Icon.star, bstyle, () -> {
-                        Runnable[] rebuildBrowser = {null};
-                        dialog.hide();
-                        BaseDialog browser = new BaseDialog("$mod.featured.dialog.title");
-                        browser.cont.table(table -> {
-                            table.left();
-                            table.image(Icon.zoom);
-                            table.field(searchtxt, res -> {
-                                searchtxt = res;
-                                rebuildBrowser[0].run();
-                            }).growX().get();
-                        }).fillX().padBottom(4);
-
-                        browser.cont.row();
-
-                        browser.cont.pane(tablebrow -> {
-                            tablebrow.margin(10f).top();
-                            rebuildBrowser[0] = () -> {
-                                tablebrow.clear();
-                                tablebrow.add("@loading");
-
-                                getModList(listings -> {
-                                    tablebrow.clear();
-
-                                    for(ModListing mod : listings){
-                                        if(mod.hasJava || !searchtxt.isEmpty() && !mod.repo.contains(searchtxt) || (Vars.ios && mod.hasScripts)) continue;
-
-                                        tablebrow.button(btn -> {
-                                            btn.top().left();
-                                            btn.margin(12f);
-                                            btn.table(con -> {
-                                                con.left();
-                                                con.add("[accent]" + mod.name + "[white]\n[lightgray]Author:[] " + mod.author + "\n[lightgray]\uE809 " + mod.stars +
-                                                (Version.isAtLeast(mod.minGameVersion) ? "" : "\n" + Core.bundle.format("mod.requiresversion", mod.minGameVersion)))
-                                                .width(388f).wrap().growX().pad(0f, 6f, 0f, 6f).left().labelAlign(Align.left);
-                                                con.add().growX().pad(0f, 6f, 0f, 6f);
-                                            }).fillY().growX().pad(0f, 6f, 0f, 6f);
-                                        }, Styles.modsb, () -> {
-                                            var sel = new BaseDialog(mod.name);
-                                            sel.cont.add(mod.description).width(mobile ? 400f : 500f).wrap().pad(4f).labelAlign(Align.center, Align.left);
-                                            sel.buttons.defaults().size(150f, 54f).pad(2f);
-                                            sel.setFillParent(false);
-                                            sel.buttons.button("@back", Icon.left, () -> {
-                                                sel.clear();
-                                                sel.hide();
-                                            });
-                                            sel.buttons.button("@mods.browser.add", Icon.download, () -> {
-                                                sel.hide();
-                                                githubImportMod(mod.repo);
-                                            });
-                                            sel.buttons.button("@mods.github.open", Icon.link, () -> {
-                                                Core.app.openURI("https://github.com/" + mod.repo);
-                                            });
-                                            sel.keyDown(KeyCode.escape, sel::hide);
-                                            sel.keyDown(KeyCode.back, sel::hide);
-                                            sel.show();
-                                        }).width(480f).growX().left().fillY();
-                                        tablebrow.row();
-                                    }
-                                });
-                            };
-                            rebuildBrowser[0].run();
-                        });
-                        browser.addCloseButton();
-                        browser.show();
-                    }).margin(12f);
                 });
                 dialog.addCloseButton();
 
@@ -223,96 +219,118 @@ 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.browser", Icon.menu, style, this::showModBrowser).margin(margin);
         }).width(w);
 
         cont.row();
 
         if(!mods.list().isEmpty()){
             boolean[] anyDisabled = {false};
-            SearchBar.add(cont, mods.list(),
-                mod -> mod.meta.displayName(),
-                (table, mod) -> {
-                    if(!mod.enabled() && !anyDisabled[0] && mods.list().size > 0){
-                        anyDisabled[0] = true;
-                        table.row();
-                        table.image().growX().height(4f).pad(6f).color(Pal.gray);
-                        table.row();
-                    }
+            Table[] pane = {null};
 
-                    table.button(t -> {
-                        t.top().left();
-                        t.margin(12f);
+            Cons<String> rebuild = query -> {
+                pane[0].clear();
+                boolean any = false;
+                for(LoadedMod item : mods.list()){
+                    if(Strings.matches(query, item.meta.displayName)){
+                        any = true;
+                        if(!item.enabled() && !anyDisabled[0] && mods.list().size > 0){
+                            anyDisabled[0] = true;
+                            pane[0].row();
+                            pane[0].image().growX().height(4f).pad(6f).color(Pal.gray).row();
+                        }
 
-                        t.defaults().left().top();
-                        t.table(title -> {
-                            title.left();
+                        pane[0].button(t -> {
+                            t.top().left();
+                            t.margin(12f);
 
-                            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);
+                            String stateDetails = getStateDetails(item);
+                            if(stateDetails != null){
+                                t.addListener(new Tooltip(f -> f.background(Styles.black8).margin(4f).add(stateDetails).growX().width(400f).wrap()));
+                            }
 
-                            title.table(text -> {
-                                boolean hideDisabled = !mod.isSupported() || mod.hasUnmetDependencies() || mod.hasContentErrors();
+                            t.defaults().left().top();
+                            t.table(title1 -> {
+                                title1.left();
 
-                                text.add("" + mod.meta.displayName() + "\n[lightgray]v" + mod.meta.version + (mod.enabled() || hideDisabled ? "" : "\n" + Core.bundle.get("mod.disabled") + ""))
+                                title1.add(new BorderImage(){{
+                                    if(item.iconTexture != null){
+                                        setDrawable(new TextureRegion(item.iconTexture));
+                                    }else{
+                                        setDrawable(Tex.nomap);
+                                    }
+                                    border(Pal.accent);
+                                }}).size(h - 8f).padTop(-8f).padLeft(-8f).padRight(8f);
+
+                                title1.table(text -> {
+                                    boolean hideDisabled = !item.isSupported() || item.hasUnmetDependencies() || item.hasContentErrors();
+                                    String shortDesc = item.meta.shortDescription();
+
+                                    text.add("[accent]" + Strings.stripColors(item.meta.displayName) + "\n" +
+                                        (shortDesc.length() > 0 ? "[lightgray]" + shortDesc + "\n" : "")
+                                        //so does anybody care about version?
+                                        //+ "[gray]v" + Strings.stripColors(trimText(item.meta.version)) + "\n"
+                                        + (item.enabled() || hideDisabled ? "" : 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();
+                                    String state = getStateText(item);
+                                    if(state != null){
+                                        text.labelWrap(state).growX().row();
+                                    }
+                                }).top().growX();
 
-                        t.table(right -> {
-                            right.right();
-                            right.button(mod.enabled() ? Icon.downOpen : Icon.upOpen, Styles.clearPartiali, () -> {
-                                mods.setEnabled(mod, !mod.enabled());
-                                setup();
-                            }).size(50f).disabled(!mod.isSupported());
+                                title1.add().growX();
+                            }).growX().growY().left();
 
-                            right.button(mod.hasSteamID() ? Icon.link : Icon.trash, Styles.clearPartiali, () -> {
-                                if(!mod.hasSteamID()){
-                                    ui.showConfirm("@confirm", "@mod.remove.confirm", () -> {
-                                        mods.removeMod(mod);
-                                        setup();
-                                    });
-                                }else{
-                                    platform.viewListing(mod);
-                                }
-                            }).size(50f);
+                            t.table(right -> {
+                                right.right();
+                                right.button(item.enabled() ? Icon.downOpen : Icon.upOpen, Styles.clearNonei, () -> {
+                                    mods.setEnabled(item, !item.enabled());
+                                    setup();
+                                }).size(50f).disabled(!item.isSupported());
 
-                            if(steam && !mod.hasSteamID()){
-                                right.row();
-                                right.button(Icon.download, Styles.clearTransi, () -> {
-                                    platform.publish(mod);
+                                right.button(item.hasSteamID() ? Icon.link : Icon.trash, Styles.clearNonei, () -> {
+                                    if(!item.hasSteamID()){
+                                        ui.showConfirm("@confirm", "@mod.remove.confirm", () -> {
+                                            mods.removeMod(item);
+                                            setup();
+                                        });
+                                    }else{
+                                        platform.viewListing(item);
+                                    }
                                 }).size(50f);
-                            }
-                        }).growX().right().padRight(-8f).padTop(-8f);
-                    }, Styles.clearPartialt, () -> showMod(mod)).size(w, h).growX().pad(4f);
-                    table.row();
-                }, !mobile || Core.graphics.isPortrait()).margin(10f).top();
+
+                                if(steam && !item.hasSteamID()){
+                                    right.row();
+                                    right.button(Icon.export, Styles.clearNonei, () -> {
+                                        platform.publish(item);
+                                    }).size(50f);
+                                }
+                            }).growX().right().padRight(-8f).padTop(-8f);
+                        }, Styles.flatBordert, () -> showMod(item)).size(w, h).growX().pad(4f);
+                        pane[0].row();
+                    }
+                }
+
+                if(!any){
+                    pane[0].add("@none.found").color(Color.lightGray).pad(4);
+                }
+            };
+
+            if(!mobile || Core.graphics.isPortrait()){
+                cont.table(search -> {
+                    search.image(Icon.zoom).padRight(8f);
+                    search.field("", rebuild).growX();
+                }).fillX().padBottom(4);
+            }
+
+            cont.row();
+            cont.pane(table1 -> {
+                pane[0] = table1.margin(10f).top();
+                rebuild.get("");
+            }).scrollX(false).update(s -> scroll = s.getScrollY()).get().setScrollYForce(scroll);
         }else{
             cont.table(Styles.black6, t -> t.add("@mods.none")).height(80f);
         }
@@ -320,12 +338,55 @@ public class ModsDialog extends BaseDialog{
         cont.row();
     }
 
+    private @Nullable String getStateText(LoadedMod item){
+        if(item.isOutdated()){
+            return "@mod.incompatiblemod";
+        }else if(item.isBlacklisted()){
+            return "@mod.blacklisted";
+        }else if(!item.isSupported()){
+            return "@mod.incompatiblegame";
+        }else if(item.state == ModState.circularDependencies){
+            return "@mod.circulardependencies";
+        }else if(item.state == ModState.incompleteDependencies){
+            return "@mod.incompletedependencies";
+        }else if(item.hasUnmetDependencies()){
+            return "@mod.unmetdependencies";
+        }else if(item.hasContentErrors()){
+            return "@mod.erroredcontent";
+        }else if(item.meta.hidden){
+            return "@mod.multiplayer.compatible";
+        }
+        return null;
+    }
+
+    private @Nullable String getStateDetails(LoadedMod item){
+        if(item.isOutdated()){
+            return "@mod.outdatedv7.details";
+        }else if(item.isBlacklisted()){
+            return "@mod.blacklisted.details";
+        }else if(!item.isSupported()){
+            return Core.bundle.format("mod.requiresversion.details", item.meta.minGameVersion);
+        }else if(item.state == ModState.circularDependencies){
+            return "@mod.circulardependencies.details";
+        }else if(item.state == ModState.incompleteDependencies){
+            return Core.bundle.format("mod.incompletedependencies.details", item.missingDependencies.toString(", "));
+        }else if(item.hasUnmetDependencies()){
+            return Core.bundle.format("mod.missingdependencies.details", item.missingDependencies.toString(", "));
+        }else if(item.hasContentErrors()){
+            return "@mod.erroredcontent.details";
+        }
+        return null;
+    }
+
     private void reload(){
-        ui.showInfo("@mods.reloadexit", () -> Core.app.exit());
+        ui.showInfoOnHidden("@mods.reloadexit", () -> {
+            Log.info("Exiting to reload mods.");
+            Core.app.exit();
+        });
     }
 
     private void showMod(LoadedMod mod){
-        BaseDialog dialog = new BaseDialog(mod.meta.displayName());
+        BaseDialog dialog = new BaseDialog(mod.meta.displayName);
 
         dialog.addCloseButton();
 
@@ -333,14 +394,20 @@ public class ModsDialog extends BaseDialog{
             dialog.buttons.button("@mods.openfolder", Icon.link, () -> Core.app.openFolder(mod.file.absolutePath()));
         }
 
-        //TODO improve this menu later
+        if(mod.getRepo() != null){
+            boolean showImport = !mod.hasSteamID();
+            dialog.buttons.button("@mods.github.open", Icon.link, () -> Core.app.openURI("https://github.com/" + mod.getRepo()));
+            if(mobile && showImport) dialog.buttons.row();
+            if(showImport) dialog.buttons.button("@mods.browser.reinstall", Icon.download, () -> githubImportMod(mod.getRepo(), mod.isJava(), null));
+        }
+
         dialog.cont.pane(desc -> {
             desc.center();
             desc.defaults().padTop(10).left();
 
             desc.add("@editor.name").padRight(10).color(Color.gray).padTop(0);
             desc.row();
-            desc.add(mod.meta.displayName()).growX().wrap().padTop(2);
+            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);
@@ -348,6 +415,12 @@ public class ModsDialog extends BaseDialog{
                 desc.add(mod.meta.author).growX().wrap().padTop(2);
                 desc.row();
             }
+            if(mod.meta.version != null){
+                desc.add("@mod.version").padRight(10).color(Color.gray).top();
+                desc.row();
+                desc.add(mod.meta.version).growX().wrap().padTop(2);
+                desc.row();
+            }
             if(mod.meta.description != null){
                 desc.add("@editor.description").padRight(10).color(Color.gray).top();
                 desc.row();
@@ -355,41 +428,230 @@ public class ModsDialog extends BaseDialog{
                 desc.row();
             }
 
+            String state = getStateDetails(mod);
+
+            if(state != null){
+                desc.add("@mod.disabled").padTop(13f).padBottom(-6f).row();
+                desc.add(state).growX().wrap().row();
+            }
+
         }).width(400f);
 
-        //TODO maybe enable later
-        if(false){
-            Seq<UnlockableContent> all = Seq.with(content.getContentMap()).<Content>flatten().select(c -> c.minfo.mod == mod && c instanceof UnlockableContent).as();
-            if(all.any()){
-                dialog.cont.row();
-                dialog.cont.pane(cs -> {
+        Seq<UnlockableContent> all = Seq.with(content.getContentMap()).<Content>flatten().select(c -> c.minfo.mod == mod && c instanceof UnlockableContent u && !u.isHidden()).as();
+        if(all.any()){
+            dialog.cont.row();
+            dialog.cont.button("@mods.viewcontent", Icon.book, () -> {
+                BaseDialog d = new BaseDialog(mod.meta.displayName);
+                d.cont.pane(cs -> {
                     int i = 0;
                     for(UnlockableContent c : all){
-                        cs.button(new TextureRegionDrawable(c.icon(Cicon.medium)), Styles.cleari, Cicon.medium.size, () -> {
+                        cs.button(new TextureRegionDrawable(c.uiIcon), Styles.flati, iconMed, () -> {
                             ui.content.show(c);
                         }).size(50f).with(im -> {
                             var click = im.getClickListener();
                             im.update(() -> im.getImage().color.lerp(!click.isOver() ? Color.lightGray : Color.white, 0.4f * Time.delta));
-                        });
 
-                        if(++i % 8 == 0) cs.row();
+                        }).tooltip(c.localizedName);
+
+                        if(++i % (int)Math.min(Core.graphics.getWidth() / Scl.scl(110), 14) == 0) cs.row();
                     }
-                }).growX().minHeight(60f);
-            }
+                }).grow();
+                d.addCloseButton();
+                d.show();
+                currentContent = d;
+            }).size(300, 50).pad(4);
         }
 
-
-
         dialog.show();
     }
 
+    private void showModBrowser(){
+        rebuildBrowser();
+        browser.show();
+    }
+
+    private void rebuildBrowser(){
+        ObjectSet<String> installed = mods.list().map(m -> m.getRepo()).asSet();
+
+        browserTable.clear();
+        browserTable.add("@loading");
+
+        int cols = (int)Math.max(Core.graphics.getWidth() / Scl.scl(480), 1);
+
+        getModList(0, rlistings -> {
+            browserTable.clear();
+            int i = 0;
+
+            var listings = rlistings;
+            if(!orderDate){
+                listings = rlistings.copy();
+                listings.sortComparing(m1 -> -m1.stars);
+            }
+
+            for(ModListing mod : listings){
+                if(((mod.hasJava || mod.hasScripts) && Vars.ios) ||
+                    (!Strings.matches(searchtxt, mod.name) && !Strings.matches(searchtxt, mod.repo))
+                    //hack, I'm basically testing if 135.10 >= modVersion, which is equivalent to modVersion >= 136
+                    || (Version.isAtLeast(135, 10, mod.minGameVersion))
+                ) continue;
+
+                float s = 64f;
+
+                browserTable.button(con -> {
+                    con.margin(0f);
+                    con.left();
+
+                    String repo = mod.repo;
+                    con.add(new BorderImage(){
+                        TextureRegion last;
+
+                        {
+                            border(installed.contains(repo) ? Pal.accent : Color.lightGray);
+                            setDrawable(Tex.nomap);
+                            pad = Scl.scl(4f);
+                        }
+
+                        @Override
+                        public void draw(){
+                            super.draw();
+
+                            //textures are only requested when the rendering happens; this assists with culling
+                            if(!textureCache.containsKey(repo)){
+                                textureCache.put(repo, last = Core.atlas.find("nomap"));
+                                Http.get("https://raw.githubusercontent.com/Anuken/MindustryMods/master/icons/" + repo.replace("/", "_"), res -> {
+                                    Pixmap pix = new Pixmap(res.getResult());
+                                    Core.app.post(() -> {
+                                        try{
+                                            var tex = new Texture(pix);
+                                            tex.setFilter(TextureFilter.linear);
+                                            textureCache.put(repo, new TextureRegion(tex));
+                                            pix.dispose();
+                                        }catch(Exception e){
+                                            Log.err(e);
+                                        }
+                                    });
+                                }, err -> {});
+                            }
+
+                            var next = textureCache.get(repo);
+                            if(last != next){
+                                last = next;
+                                setDrawable(next);
+                            }
+                        }
+                    }).size(s).pad(4f * 2f);
+
+                    con.add(
+                    "[accent]" + mod.name.replace("\n", "") +
+                    (installed.contains(mod.repo) ? "\n[lightgray]" + Core.bundle.get("mod.installed") : "") +
+                    "\n[lightgray]\uE809 " + mod.stars +
+                    (Version.isAtLeast(mod.minGameVersion) ?  "" :
+                    "\n" + Core.bundle.format("mod.requiresversion", mod.minGameVersion)))
+                    .width(358f).wrap().grow().pad(4f, 2f, 4f, 6f).top().left().labelAlign(Align.topLeft);
+
+                }, Styles.flatBordert, () -> {
+                    var sel = new BaseDialog(mod.name);
+                    sel.cont.pane(p -> p.add(mod.description + "\n\n[accent]" + Core.bundle.get("editor.author") + "[lightgray] " + mod.author)
+                        .width(mobile ? 400f : 500f).wrap().pad(4f).labelAlign(Align.center, Align.left)).grow();
+                    sel.buttons.defaults().size(150f, 54f).pad(2f);
+                    sel.buttons.button("@back", Icon.left, () -> {
+                        sel.clear();
+                        sel.hide();
+                    });
+
+                    var found = mods.list().find(l -> mod.repo != null && mod.repo.equals(l.getRepo()));
+                    sel.buttons.button(found == null ? "@mods.browser.add" : "@mods.browser.reinstall", Icon.download, () -> {
+                        sel.hide();
+                        githubImportMod(mod.repo, mod.hasJava, null);
+                    });
+
+                    if(Core.graphics.isPortrait()){
+                        sel.buttons.row();
+                    }
+
+                    sel.buttons.button("@mods.github.open", Icon.link, () -> {
+                        Core.app.openURI("https://github.com/" + mod.repo);
+                    });
+                    sel.buttons.button("@mods.browser.view-releases", Icon.zoom, () -> {
+                        BaseDialog load = new BaseDialog("");
+                        load.cont.add("[accent]Fetching Releases...");
+                        load.show();
+                        Http.get(ghApi + "/repos/" + mod.repo + "/releases", res -> {
+                            var json = Jval.read(res.getResultAsString());
+                            JsonArray releases = json.asArray();
+
+                            Core.app.post(() -> {
+                                load.hide();
+
+                                if(releases.size == 0){
+                                    ui.showInfo("@mods.browser.noreleases");
+                                }else{
+                                    sel.hide();
+                                    var downloads = new BaseDialog("@mods.browser.releases");
+                                    downloads.cont.pane(p -> {
+                                        for(int j = 0; j < releases.size; j++){
+                                            var release = releases.get(j);
+
+                                            int index = j;
+                                            p.table(((TextureRegionDrawable)Tex.whiteui).tint(Pal.darkestGray), t -> {
+                                                t.add("[accent]" + release.getString("name") + (index == 0 ? " " + Core.bundle.get("mods.browser.latest") : "")).top().left().growX().wrap().pad(5f);
+                                                t.row();
+                                                t.add((release.getString("published_at")).substring(0, 10).replaceAll("-", "/")).top().left().growX().wrap().pad(5f).color(Color.gray);
+                                                t.row();
+                                                t.table(b -> {
+                                                    b.defaults().size(150f, 54f).pad(2f);
+                                                    b.button("@mods.github.open-release", Icon.link, () -> Core.app.openURI(release.getString("html_url")));
+                                                    b.button("@mods.browser.add", Icon.download, () -> {
+                                                        String releaseUrl = release.getString("url");
+                                                        githubImportMod(mod.repo, mod.hasJava, releaseUrl.substring(releaseUrl.lastIndexOf("/") + 1));
+                                                    });
+                                                }).right();
+                                            }).margin(5f).growX().pad(5f);
+
+                                            if(j < releases.size - 1) p.row();
+                                        }
+                                    }).width(500f).scrollX(false).fillY();
+                                    downloads.buttons.button("@back", Icon.left, () -> {
+                                        downloads.clear();
+                                        downloads.hide();
+                                        sel.show();
+                                    }).size(150f, 54f).pad(2f);
+                                    downloads.keyDown(KeyCode.escape, downloads::hide);
+                                    downloads.keyDown(KeyCode.back, downloads::hide);
+                                    downloads.hidden(sel::show);
+                                    downloads.show();
+                                }
+                            });
+                        }, t -> Core.app.post(() -> {
+                            modError(t);
+                            load.hide();
+                        }));
+                    });
+                    sel.keyDown(KeyCode.escape, sel::hide);
+                    sel.keyDown(KeyCode.back, sel::hide);
+                    sel.show();
+                }).width(438f).pad(4).growX().left().height(s + 8*2f).fillY();
+
+                if(++i % cols == 0) browserTable.row();
+            }
+        });
+    }
+
     private void handleMod(String repo, HttpResponse result){
         try{
             Fi file = tmpDirectory.child(repo.replace("/", "") + ".zip");
-            Streams.copy(result.getResultAsStream(), file.write(false));
-            mods.importMod(file);
+            long len = result.getContentLength();
+            Floatc cons = len <= 0 ? f -> {} : p -> modImportProgress = p;
+
+            try(var stream = file.write(false)){
+                Streams.copyProgress(result.getResultAsStream(), stream, len, 4096, cons);
+            }
+
+            var mod = mods.importMod(file);
+            mod.setRepo(repo);
             file.delete();
             Core.app.post(() -> {
+
                 try{
                     setup();
                     ui.loadfrag.hide();
@@ -402,36 +664,83 @@ public class ModsDialog extends BaseDialog{
         }
     }
 
-    private void githubImportMod(String name){
-        //try several branches
-        //TODO use only the main branch as specified in meta
-        githubImportBranch("6.0", name, e1 -> {
-            githubImportBranch("master", name, e2 -> {
-                githubImportBranch("main", name, e3 -> {
-                    ui.showErrorMessage(Core.bundle.format("connectfail", e2));
-                    ui.loadfrag.hide();
-                });
-            });
-        });
+    private void importFail(Throwable t){
+        Core.app.post(() -> modError(t));
     }
 
-    private void githubImportBranch(String branch, String repo, Cons<HttpStatus> err){
-        Core.net.httpGet("https://api.github.com/repos/" + repo + "/zipball/" + branch, loc -> {
-            if(loc.getStatus() == HttpStatus.OK){
-                if(loc.getHeader("Location") != null){
-                    Core.net.httpGet(loc.getHeader("Location"), result -> {
-                        if(result.getStatus() != HttpStatus.OK){
-                            err.get(result.getStatus());
-                        }else{
+    public void githubImportMod(String repo, boolean isJava){
+        githubImportMod(repo, isJava, null);
+    }
+
+    public void githubImportMod(String repo, boolean isJava, @Nullable String release){
+        modImportProgress = 0f;
+        ui.loadfrag.show("@downloading");
+        ui.loadfrag.setProgress(() -> modImportProgress);
+
+        if(isJava){
+            githubImportJavaMod(repo, release);
+        }else{
+            Http.get(ghApi + "/repos/" + repo, res -> {
+                var json = Jval.read(res.getResultAsString());
+                String mainBranch = json.getString("default_branch");
+                String language = json.getString("language", "<none>");
+
+                //this is a crude heuristic for class mods; only required for direct github import
+                //TODO make a more reliable way to distinguish java mod repos
+                if(language.equals("Java") || language.equals("Kotlin")){
+                    githubImportJavaMod(repo, release);
+                }else{
+                    githubImportBranch(mainBranch, repo, release);
+                }
+            }, this::importFail);
+        }
+    }
+
+    private void githubImportJavaMod(String repo, @Nullable String release){
+        //grab latest release
+        Http.get(ghApi + "/repos/" + repo + "/releases/" + (release == null ? "latest" : release), res -> {
+            var json = Jval.read(res.getResultAsString());
+            var assets = json.get("assets").asArray();
+
+            //prioritize dexed jar, as that's what Sonnicon's mod template outputs
+            var dexedAsset = assets.find(j -> j.getString("name").startsWith("dexed") && j.getString("name").endsWith(".jar"));
+            var asset = dexedAsset == null ? assets.find(j -> j.getString("name").endsWith(".jar")) : dexedAsset;
+
+            if(asset != null){
+                //grab actual file
+                var url = asset.getString("browser_download_url");
+
+                Http.get(url, result -> handleMod(repo, result), this::importFail);
+            }else{
+                throw new ArcRuntimeException("No JAR file found in releases. Make sure you have a valid jar file in the mod's latest Github Release.");
+            }
+        }, this::importFail);
+    }
+
+    private void githubImportBranch(String branch, String repo, @Nullable String release){
+        if(release != null) {
+            Http.get(ghApi + "/repos/" + repo + "/releases/" + release, res -> {
+                String zipUrl = Jval.read(res.getResultAsString()).getString("zipball_url");
+                Http.get(zipUrl, loc -> {
+                    if(loc.getHeader("Location") != null){
+                        Http.get(loc.getHeader("Location"), result -> {
                             handleMod(repo, result);
-                        }
-                    }, t2 -> Core.app.post(() -> modError(t2)));
+                        }, this::importFail);
+                    }else{
+                        handleMod(repo, loc);
+                    }
+                }, this::importFail);
+            });
+        }else{
+            Http.get(ghApi + "/repos/" + repo + "/zipball/" + branch, loc -> {
+                if(loc.getHeader("Location") != null){
+                    Http.get(loc.getHeader("Location"), result -> {
+                        handleMod(repo, result);
+                    }, this::importFail);
                 }else{
                     handleMod(repo, loc);
                 }
-            }else{
-                err.get(loc.getStatus());
-            }
-         }, t2 -> Core.app.post(() -> modError(t2)));
+            }, this::importFail);
+        }
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/PaletteDialog.java b/core/src/mindustry/ui/dialogs/PaletteDialog.java
index e9d643a4b2..ebea658516 100644
--- a/core/src/mindustry/ui/dialogs/PaletteDialog.java
+++ b/core/src/mindustry/ui/dialogs/PaletteDialog.java
@@ -21,7 +21,7 @@ public class PaletteDialog extends Dialog{
             for(int i = 0; i < playerColors.length; i++){
                 Color color = playerColors[i];
 
-                ImageButton button = table.button(Tex.whiteui, Styles.clearTogglei, 34, () -> {
+                ImageButton button = table.button(Tex.whiteui, Styles.squareTogglei, 34, () -> {
                     cons.get(color);
                     hide();
                 }).size(48).get();
diff --git a/core/src/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java
index 5e9b5d1666..2ff15e272b 100644
--- a/core/src/mindustry/ui/dialogs/PausedDialog.java
+++ b/core/src/mindustry/ui/dialogs/PausedDialog.java
@@ -1,19 +1,40 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.editor.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 
 import static mindustry.Vars.*;
 
 public class PausedDialog extends BaseDialog{
+    private MapProcessorsDialog processors = new MapProcessorsDialog();
     private SaveDialog save = new SaveDialog();
     private LoadDialog load = new LoadDialog();
-    private boolean wasClient = false;
+    private CustomRulesDialog rulesDialog = new CustomRulesDialog();
 
     public PausedDialog(){
         super("@menu");
         shouldPause = true;
 
+        clearChildren();
+        add(titleTable).growX().row();
+
+        stack(cont, new Table(t -> {
+            t.bottom().left();
+            t.button(Icon.book, () -> {
+                Rules toEdit = Vars.state.rules.copy();
+                rulesDialog.show(toEdit, () -> state.rules.copy());
+                rulesDialog.hidden(() -> {
+                    //apply rule changes only once it is hidden
+                    Vars.state.rules = toEdit;
+                    Call.setRules(toEdit);
+                });
+            }).size(70f).tooltip("@customize").visible(() -> state.rules.allowEditRules && (net.server() || !net.active()));
+        })).grow().row();
+
         shown(this::rebuild);
 
         addCloseListener();
@@ -32,6 +53,12 @@ public class PausedDialog extends BaseDialog{
             float dw = 220f;
             cont.defaults().width(dw).height(55).pad(5f);
 
+            cont.button("@objective", Icon.info, () -> ui.fullText.show("@objective", state.rules.sector.preset.description))
+            .visible(() -> state.rules.sector != null && state.rules.sector.preset != null && state.rules.sector.preset.description != null).padTop(-60f);
+
+            cont.button("@abandon", Icon.cancel, () -> ui.planet.abandonSectorConfirm(state.rules.sector, this::hide)).padTop(-60f)
+            .disabled(b -> net.client()).visible(() -> state.rules.sector != null).row();
+
             cont.button("@back", Icon.left, this::hide).name("back");
             cont.button("@settings", Icon.settings, ui.settings::show).name("settings");
 
@@ -43,21 +70,26 @@ public class PausedDialog extends BaseDialog{
 
             cont.row();
 
-            cont.button("@hostserver", Icon.host, () -> {
+            //the button runs out of space when the editor button is added, so use the mobile text
+            cont.button(state.isEditor() ? "@hostserver.mobile" : "@hostserver", Icon.host, () -> {
                 if(net.server() && steam){
                     platform.inviteFriends();
                 }else{
-                    if(steam){
-                        ui.host.runHost();
-                    }else{
-                        ui.host.show();
-                    }
+                    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(state.isEditor() ? 1 : 2).width(state.isEditor() ? dw : dw * 2 + 10f)
+                .update(e -> e.setText(net.server() && steam ? "@invitefriends" : state.isEditor() ? "@hostserver.mobile" : "@hostserver"));
+
+            if(state.isEditor()){
+                cont.button("@editor.worldprocessors", Icon.logic, () -> {
+                    hide();
+                    processors.show();
+                });
+            }
 
             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 + 10f).update(s -> s.setText(control.saves.getCurrent() != null && control.saves.getCurrent().isAutosave() ? "@save.quit" : "@quit"));
 
         }else{
             cont.defaults().size(130f).pad(5);
@@ -93,21 +125,41 @@ public class PausedDialog extends BaseDialog{
     }
 
     void showQuitConfirm(){
-        ui.showConfirm("@confirm", "@quit.confirm", () -> {
-            wasClient = net.client();
-            if(net.client()) netClient.disconnectQuietly();
+        Runnable quit = () -> {
             runExitSave();
             hide();
-        });
+        };
+
+        if(confirmExit){
+            ui.showConfirm("@confirm", "@quit.confirm", quit);
+        }else{
+            quit.run();
+        }
+    }
+
+    public boolean checkPlaytest(){
+        if(state.playtestingMap != null){
+            //no exit save here
+            var testing = state.playtestingMap;
+            logic.reset();
+            ui.editor.resumeAfterPlaytest(testing);
+            return true;
+        }
+        return false;
     }
 
     public void runExitSave(){
+        boolean wasClient = net.client();
+        if(net.client()) netClient.disconnectQuietly();
+
         if(state.isEditor() && !wasClient){
             ui.editor.resumeEditing();
             return;
+        }else if(checkPlaytest()){
+            return;
         }
 
-        if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || wasClient){
+        if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || wasClient || state.gameOver || disableSave){
             logic.reset();
             return;
         }
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index bb187d3a9d..c078fc36ac 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -1,8 +1,10 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
+import arc.assets.loaders.TextureLoader.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
 import arc.input.*;
@@ -10,27 +12,32 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.*;
 import arc.scene.event.*;
+import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
+import mindustry.game.EventType.*;
 import mindustry.game.Objectives.*;
 import mindustry.game.SectorInfo.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.graphics.g3d.*;
 import mindustry.input.*;
-import mindustry.io.legacy.*;
 import mindustry.maps.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
+import static arc.Core.*;
 import static mindustry.Vars.*;
 import static mindustry.graphics.g3d.PlanetRenderer.*;
 import static mindustry.ui.dialogs.PlanetDialog.Mode.*;
@@ -41,38 +48,54 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
     public static float sectorShowDuration = 60f * 2.4f;
 
     public final FrameBuffer buffer = new FrameBuffer(2, 2, true);
-    public final PlanetRenderer planets = renderer.planets;
     public final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog();
+    public final PlanetRenderer planets = renderer.planets;
 
-    public float zoom = 1f, selectAlpha = 1f;
+    public PlanetParams state = new PlanetParams();
+    public float zoom = 1f;
     public @Nullable Sector selected, hovered, launchSector;
+    /** Must not be null in planet launch mode. */
+    public @Nullable Seq<Planet> launchCandidates;
     public Mode mode = look;
     public boolean launching;
     public Cons<Sector> listener = s -> {};
 
     public Seq<Sector> newPresets = new Seq<>();
     public float presetShow = 0f;
-    public boolean showed = false;
+    public boolean showed = false, sectorsShown;
+    public String searchText = "";
 
-    public Table sectorTop = new Table();
+    public Table sectorTop = new Table(), notifs = new Table(), expandTable = new Table();
     public Label hoverLabel = new Label("");
 
+    private Texture[] planetTextures;
+    private CampaignRulesDialog campaignRules = new CampaignRulesDialog();
+
     public PlanetDialog(){
         super("", Styles.fullDialog);
 
-        shouldPause = true;
+        state.renderer = this;
+        state.drawUi = true;
 
-        keyDown(key -> {
-            if(key == KeyCode.escape || key == KeyCode.back || key == Core.keybinds.get(Binding.planet_map).key){
-                if(showing() && newPresets.size > 1){
-                    //clear all except first, which is the last sector.
-                    newPresets.truncate(1);
-                }else if(selected != null){
-                    selected = null;
-                    updateSelected();
-                }else{
-                    Core.app.post(this::hide);
+        shouldPause = true;
+        state.planet = content.getByName(ContentType.planet, Core.settings.getString("lastplanet", "serpulo"));
+        if(state.planet == null) state.planet = Planets.serpulo;
+
+        addListener(new InputListener(){
+            @Override
+            public boolean keyDown(InputEvent event, KeyCode key){
+                if(event.targetActor == PlanetDialog.this && (key == KeyCode.escape || key == KeyCode.back || key == Core.keybinds.get(Binding.planet_map).key)){
+                    if(showing() && newPresets.size > 1){
+                        //clear all except first, which is the last sector.
+                        newPresets.truncate(1);
+                    }else if(selected != null){
+                        selectSector(null);
+                    }else{
+                        Core.app.post(() -> hide());
+                    }
+                    return true;
                 }
+                return false;
             }
         });
 
@@ -91,7 +114,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                 newPresets.clear();
             }
 
-            Vec3 pos = planets.camPos;
+            Vec3 pos = state.camPos;
 
             float upV = pos.angle(Vec3.Y);
             float xscale = 9f, yscale = 10f;
@@ -100,17 +123,23 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             //scale X speed depending on polar coordinate
             float speed = 1f - Math.abs(upV - 90) / 90f;
 
-            pos.rotate(planets.cam.up, cx / xscale * speed);
+            pos.rotate(state.camUp, cx / xscale * speed);
 
             //prevent user from scrolling all the way up and glitching it out
             float amount = cy / yscale;
             amount = Mathf.clamp(upV + amount, margin, 180f - margin) - upV;
 
-            pos.rotate(Tmp.v31.set(planets.cam.up).rotate(planets.cam.direction, 90), amount);
+            pos.rotate(Tmp.v31.set(state.camUp).rotate(state.camDir, 90), amount);
         });
 
-        scrolled(value -> {
-            zoom = Mathf.clamp(zoom + value / 10f, 0.5f, 2f);
+        addListener(new InputListener(){
+            @Override
+            public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY){
+                if(event.targetActor == PlanetDialog.this){
+                    zoom = Mathf.clamp(zoom + amountY / 10f, state.planet.minZoom, 2f);
+                }
+                return true;
+            }
         });
 
         addCaptureListener(new ElementGestureListener(){
@@ -118,20 +147,73 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
             @Override
             public void zoom(InputEvent event, float initialDistance, float distance){
-               if(lastZoom < 0){
-                   lastZoom = zoom;
-               }
+                if(lastZoom < 0){
+                    lastZoom = zoom;
+                }
 
-               zoom = (Mathf.clamp(initialDistance / distance * lastZoom, 0.5f, 2f));
-           }
+                zoom = (Mathf.clamp(initialDistance / distance * lastZoom, state.planet.minZoom, 2f));
+            }
 
             @Override
             public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
                 lastZoom = zoom;
             }
-       });
+        });
 
         shown(this::setup);
+
+        //show selection of Erekir/Serpulo campaign if the user has no bases, and hasn't selected yet (essentially a "have they played campaign before" check)
+        shown(() -> {
+            if(!settings.getBool("campaignselect") && !content.planets().contains(p -> p.sectors.contains(Sector::hasBase))){
+                var diag = new BaseDialog("@campaign.select");
+
+                Planet[] selected = {null};
+                var group = new ButtonGroup<>();
+                group.setMinCheckCount(0);
+                state.planet = Planets.sun;
+                Planet[] choices = {Planets.serpulo, Planets.erekir};
+                int i = 0;
+                for(var planet : choices){
+                    TextureRegion tex = new TextureRegion(planetTextures[i]);
+
+                    diag.cont.button(b -> {
+                        b.top();
+                        b.add(planet.localizedName).color(Pal.accent).style(Styles.outlineLabel);
+                        b.row();
+                        b.image(new TextureRegionDrawable(tex)).grow().scaling(Scaling.fit);
+                    }, Styles.togglet, () -> selected[0] = planet).size(mobile ? 220f : 320f).group(group);
+                    i ++;
+                }
+
+                diag.cont.row();
+                diag.cont.label(() -> selected[0] == null ? "@campaign.none" : "@campaign." + selected[0].name).labelAlign(Align.center).style(Styles.outlineLabel).width(440f).wrap().colspan(2);
+
+                diag.buttons.button("@ok", Icon.ok, () -> {
+                    state.planet = selected[0];
+                    lookAt(state.planet.getStartSector());
+                    selectSector(state.planet.getStartSector());
+                    settings.put("campaignselect", true);
+                    diag.hide();
+                }).size(300f, 64f).disabled(b -> selected[0] == null);
+
+                app.post(diag::show);
+            }
+        });
+
+        planetTextures = new Texture[2];
+        String[] names = {"sprites/planets/serpulo.png", "sprites/planets/erekir.png"};
+        for(int i = 0; i < names.length; i++){
+            int fi = i;
+            assets.load(names[i], Texture.class, new TextureParameter(){{
+                minFilter = magFilter = TextureFilter.linear;
+            }}).loaded = t -> planetTextures[fi] = t;
+            assets.finishLoadingAsset(names[i]);
+        }
+
+        //unlock defaults for older campaign saves (TODO move? where to?)
+        if(content.planets().contains(p -> p.sectors.contains(Sector::hasBase)) || Blocks.scatter.unlocked() || Blocks.router.unlocked()){
+            Seq.with(Blocks.junction, Blocks.mechanicalDrill, Blocks.conveyor, Blocks.duo, Items.copper, Items.lead).each(UnlockableContent::quietUnlock);
+        }
     }
 
     /** show with no limitations, just as a map. */
@@ -142,33 +224,35 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             return this;
         }
 
-        //load legacy research
-        if(Core.settings.has("unlocks") && !Core.settings.has("junction-unlocked")){
-            Core.app.post(() -> {
-                ui.showCustomConfirm("@research", "@research.legacy", "@research.load", "@research.discard", () -> {
-                    LegacyIO.readResearch();
-                    Core.settings.remove("unlocks");
-                }, () -> Core.settings.remove("unlocks"));
-            });
+        //view current planet by default
+        if(Vars.state.rules.sector != null){
+            state.planet = Vars.state.rules.sector.planet;
+            settings.put("lastplanet", state.planet.name);
+        }
+
+        if(!selectable(state.planet)){
+            state.planet = Planets.serpulo;
         }
 
         rebuildButtons();
         mode = look;
+        state.otherCamPos = null;
         selected = hovered = launchSector = null;
         launching = false;
 
         zoom = 1f;
-        planets.zoom = 1f;
-        selectAlpha = 0f;
-        launchSector = state.getSector();
+        state.zoom = 1f;
+        state.uiAlpha = 0f;
+        launchSector = Vars.state.getSector();
         presetShow = 0f;
         showed = false;
+        listener = s -> {};
 
         newPresets.clear();
 
         //announce new presets
         for(SectorPreset preset : content.sectors()){
-            if(preset.unlocked() && !preset.alwaysUnlocked && !preset.sector.info.shown && !preset.sector.hasBase()){
+            if(preset.unlocked() && !preset.alwaysUnlocked && !preset.sector.info.shown && !preset.sector.hasBase() && preset.planet == state.planet){
                 newPresets.add(preset.sector);
                 preset.sector.info.shown = true;
                 preset.sector.saveInfo();
@@ -176,14 +260,14 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }
 
         if(newPresets.any()){
-            newPresets.add(planets.planet.getLastSector());
+            newPresets.add(state.planet.getLastSector());
         }
 
         newPresets.reverse();
         updateSelected();
 
-        if(planets.planet.getLastSector() != null){
-            lookAt(planets.planet.getLastSector());
+        if(state.planet.getLastSector() != null){
+            lookAt(state.planet.getLastSector());
         }
 
         return super.show();
@@ -208,11 +292,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
     }
 
     void addBack(){
-        buttons.button("@back", Icon.left, this::hide).size(200, 54).pad(2).bottom();
+        buttons.button("@back", Icon.left, this::hide).size(200f, 54f).pad(2).bottom();
     }
 
     void addTech(){
-        buttons.button("@techtree", Icon.tree, () -> ui.research.show()).size(200, 54).pad(2).bottom();
+        buttons.button("@techtree", Icon.tree, () -> ui.research.show()).size(200f, 54f).visible(() -> mode == look).pad(2).bottom();
     }
 
     public void showOverview(){
@@ -229,6 +313,49 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         dialog.add("@sectors.captured");
     }
 
+    //TODO not fully implemented, cutscene needed
+    public void showPlanetLaunch(Sector sector, Seq<Planet> launchCandidates, Cons<Sector> listener){
+        selected = null;
+        hovered = null;
+        launching = false;
+        this.listener = listener;
+        this.launchCandidates = (launchCandidates == null ? sector.planet.launchCandidates : launchCandidates);
+        launchSector = sector;
+
+        //automatically select next planets;
+        if(this.launchCandidates.size == 1){
+            state.planet = this.launchCandidates.first();
+            state.otherCamPos = sector.planet.position;
+            state.otherCamAlpha = 0f;
+
+            //unlock and highlight sector
+            var destSec = state.planet.sectors.get(state.planet.startSector);
+            var preset = destSec.preset;
+            if(preset != null){
+                preset.unlock();
+            }
+            selected = destSec;
+        }
+
+        //TODO pan over to correct planet
+
+        //update view to sector
+        zoom = 1f;
+        state.zoom = 1f;
+        state.uiAlpha = 0f;
+
+        mode = planetLaunch;
+
+        updateSelected();
+        rebuildExpand();
+
+        if(sectorTop != null){
+            sectorTop.color.a = 0f;
+        }
+
+        super.show();
+    }
+
     public void showSelect(Sector sector, Cons<Sector> listener){
         selected = null;
         hovered = null;
@@ -238,8 +365,9 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         //update view to sector
         lookAt(sector);
         zoom = 1f;
-        planets.zoom = 1f;
-        selectAlpha = 0f;
+        state.zoom = 1f;
+        state.uiAlpha = 0f;
+        state.otherCamPos = null;
         launchSector = sector;
 
         mode = select;
@@ -247,24 +375,45 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         super.show();
     }
 
-    void lookAt(Sector sector){
-        planets.camPos.set(Tmp.v33.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()));
+    public void lookAt(Sector sector){
+        if(sector.tile == Ptile.empty) return;
+
+        //TODO should this even set `state.planet`? the other lookAt() doesn't, so...
+        state.planet = sector.planet;
+        sector.planet.lookAt(sector, state.camPos);
+    }
+
+    public void lookAt(Sector sector, float alpha){
+        float len = state.camPos.len();
+        state.camPos.slerp(sector.planet.lookAt(sector, Tmp.v33).setLength(len), alpha);
     }
 
     boolean canSelect(Sector sector){
-        if(mode == select) return sector.hasBase();
-        if(sector.hasBase()) return true;
-        //preset sectors can only be selected once unlocked
-        if(sector.preset != null){
-            TechNode node = sector.preset.node();
-            return node == null || node.parent == null || node.parent.content.unlocked();
+        if(mode == select) return sector.hasBase() && launchSector != null && sector.planet == launchSector.planet;
+
+        if(mode == planetLaunch && sector.hasBase()){
+            return false;
         }
 
-        return sector.hasBase() || sector.near().contains(Sector::hasBase); //near an occupied sector
+        if(sector.hasBase() || sector.id == sector.planet.startSector) return true;
+        //preset sectors can only be selected once unlocked
+        if(sector.preset != null){
+            TechNode node = sector.preset.techNode;
+            return sector.preset.unlocked() || node == null || node.parent == null || (node.parent.content.unlocked() && (!(node.parent.content instanceof SectorPreset preset) || preset.sector.hasBase()));
+        }
+
+        return sector.planet.generator != null ?
+            //use planet impl when possible
+            (mode == planetLaunch ? sector.planet.generator.allowAcceleratorLanding(sector) : sector.planet.generator.allowLanding(sector)) :
+            mode == planetLaunch || sector.hasBase() || sector.near().contains(Sector::hasBase); //near an occupied sector
     }
 
     Sector findLauncher(Sector to){
-        Sector launchSector = this.launchSector != null && this.launchSector.hasBase() ? this.launchSector : null;
+        if(mode == planetLaunch){
+            return launchSector;
+        }
+
+        Sector launchSector = this.launchSector != null && this.launchSector.planet == to.planet && this.launchSector.hasBase() ? this.launchSector : null;
         //directly nearby.
         if(to.near().contains(launchSector)) return launchSector;
 
@@ -274,7 +423,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             launchFrom = to.near().find(Sector::hasBase);
             if(launchFrom == null && to.preset != null){
                 if(launchSector != null) return launchSector;
-                launchFrom = planets.planet.sectors.min(s -> !s.hasBase() ? Float.MAX_VALUE : s.tile.v.dst2(to.tile.v));
+                launchFrom = state.planet.sectors.min(s -> !s.hasBase() ? Float.MAX_VALUE : s.tile.v.dst2(to.tile.v));
                 if(!launchFrom.hasBase()) launchFrom = null;
             }
         }
@@ -290,7 +439,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
     public void renderSectors(Planet planet){
 
         //draw all sector stuff
-        if(selectAlpha > 0.01f){
+        if(state.uiAlpha > 0.01f){
             for(Sector sec : planet.sectors){
                 if(canSelect(sec) || sec.unlocked() || debugSelect){
 
@@ -303,30 +452,30 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                     null;
 
                     if(color != null){
-                        planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(selectAlpha), 0.026f, -0.001f);
+                        planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(state.uiAlpha), 0.026f, -0.001f);
                     }
                 }else{
-                    planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, selectAlpha), -0.001f);
+                    planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, state.uiAlpha), -0.001f);
                 }
             }
         }
 
-        Sector current = state.getSector() != null && state.getSector().isBeingPlayed() && state.getSector().planet == planets.planet ? state.getSector() : null;
+        Sector current = Vars.state.getSector() != null && Vars.state.getSector().isBeingPlayed() && Vars.state.getSector().planet == state.planet ? Vars.state.getSector() : null;
 
         if(current != null){
-            planets.fill(current, hoverColor, -0.001f);
+            planets.fill(current, hoverColor.write(Tmp.c1).mulA(state.uiAlpha), -0.001f);
         }
 
         //draw hover border
         if(hovered != null){
-            planets.fill(hovered, hoverColor, -0.001f);
-            planets.drawBorders(hovered, borderColor);
+            planets.fill(hovered, hoverColor.write(Tmp.c1).mulA(state.uiAlpha), -0.001f);
+            planets.drawBorders(hovered, borderColor, state.uiAlpha);
         }
 
         //draw selected borders
         if(selected != null){
-            planets.drawSelection(selected);
-            planets.drawBorders(selected, borderColor);
+            planets.drawSelection(selected, state.uiAlpha);
+            planets.drawBorders(selected, borderColor, state.uiAlpha);
         }
 
         planets.batch.flush(Gl.triangles);
@@ -338,12 +487,29 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             }
         }
 
-        if(selectAlpha > 0.001f){
+        if(mode == planetLaunch && launchSector != null && selected != null && hovered == null){
+            planets.drawArc(planet, launchSector.tile.v, selected.tile.v);
+        }
+
+        if(state.uiAlpha > 0.001f){
             for(Sector sec : planet.sectors){
                 if(sec.hasBase()){
-                    for(Sector enemy : sec.near()){
-                        if(enemy.hasEnemyBase()){
-                            planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.crux.color.write(Tmp.c2).a(selectAlpha), Color.clear, 0.24f, 110f, 25);
+                    if(planet.campaignRules.sectorInvasion){
+                        for(Sector enemy : sec.near()){
+                            if(enemy.hasEnemyBase()){
+                                planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.crux.color.write(Tmp.c2).a(state.uiAlpha), Color.clear, 0.24f, 110f, 25);
+                            }
+                        }
+                    }
+
+                    if(selected != null && selected != sec && selected.hasBase()){
+                        //imports
+                        if(sec.info.destination == selected && sec.info.anyExports()){
+                            planets.drawArc(planet, sec.tile.v, selected.tile.v, Color.gray.write(Tmp.c2).a(state.uiAlpha), Pal.accent.write(Tmp.c3).a(state.uiAlpha), 0.4f, 90f, 25);
+                        }
+                        //exports
+                        if(selected.info.destination == sec && selected.info.anyExports()){
+                            planets.drawArc(planet, selected.tile.v, sec.tile.v, Pal.place.write(Tmp.c2).a(state.uiAlpha), Pal.accent.write(Tmp.c3).a(state.uiAlpha), 0.4f, 90f, 25);
                         }
                     }
                 }
@@ -363,13 +529,14 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                     sec.isAttacked() ? Fonts.getLargeIcon("warning") :
                     !sec.hasBase() && sec.preset != null && sec.preset.unlocked() && preficon == null ?
                     Fonts.getLargeIcon("terrain") :
-                    sec.preset != null && sec.preset.locked() && sec.preset.node() != null && !sec.preset.node().parent.content.locked() ? Fonts.getLargeIcon("lock") :
+                    sec.preset != null && sec.preset.locked() && sec.preset.techNode != null && (sec.preset.techNode.parent == null || !sec.preset.techNode.parent.content.locked()) ? Fonts.getLargeIcon("lock") :
                     preficon;
                 var color = sec.preset != null && !sec.hasBase() ? Team.derelict.color : Team.sharded.color;
 
                 if(icon != null){
                     planets.drawPlane(sec, () -> {
-                        Draw.color(color, selectAlpha);
+                        //use white for content icons
+                        Draw.color(preficon == icon && sec.info.contentIcon != null ? Color.white : color, state.uiAlpha);
                         Draw.rect(icon, 0, 0, iw, iw * icon.height / icon.width);
                     });
                 }
@@ -378,9 +545,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
         Draw.reset();
 
-        if(hovered != null){
+        if(hovered != null && state.uiAlpha > 0.01f){
             planets.drawPlane(hovered, () -> {
                 Draw.color(hovered.isAttacked() ? Pal.remove : Color.white, Pal.accent, Mathf.absin(5f, 1f));
+                Draw.alpha(state.uiAlpha);
 
                 var icon = hovered.locked() && !canSelect(hovered) ? Fonts.getLargeIcon("lock") : hovered.isAttacked() ? Fonts.getLargeIcon("warning") : hovered.icon();
 
@@ -395,9 +563,18 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         Draw.reset();
     }
 
+    boolean selectable(Planet planet){
+        //TODO what if any sector is selectable?
+        //TODO launch criteria - which planets can be launched to? Where should this be defined? Should planets even be selectable?
+        if(mode == select) return planet == state.planet;
+        if(mode == planetLaunch) return launchSector != null && (launchCandidates.contains(planet) || (planet == launchSector.planet && planet.allowSelfSectorLaunch));
+        return (planet.alwaysUnlocked && planet.isLandable()) || planet.sectors.contains(Sector::hasBase) || debugSelect;
+    }
+
     void setup(){
-        zoom = planets.zoom = 1f;
-        selectAlpha = 1f;
+        searchText = "";
+        zoom = state.zoom = 1f;
+        state.uiAlpha = 1f;
         ui.minimapfrag.hide();
 
         clearChildren();
@@ -429,50 +606,172 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             }
 
             @Override
-            public void draw(){
-                planets.orbitAlpha = selectAlpha;
-                planets.render(PlanetDialog.this);
-                if(Core.scene.getDialog() == PlanetDialog.this){
-                    Core.scene.setScrollFocus(PlanetDialog.this);
+            public void act(float delta){
+                if(scene.getDialog() == PlanetDialog.this && (scene.getHoverElement() == null || !scene.getHoverElement().isDescendantOf(e -> e instanceof ScrollPane))){
+                    scene.setScrollFocus(PlanetDialog.this);
                 }
+
+                super.act(delta);
+            }
+
+            @Override
+            public void draw(){
+                planets.render(state);
             }
         },
         //info text
         new Table(t -> {
             t.touchable = Touchable.disabled;
             t.top();
-            t.label(() -> mode == select ? "@sectors.select" : "").style(Styles.outlineLabel).color(Pal.accent);
+            t.label(() ->
+                mode == select ? "@sectors.select" :
+                mode == planetLaunch ? "@sectors.launchselect" :
+                ""
+            ).style(Styles.outlineLabel).color(Pal.accent);
         }),
         buttons,
-        //planet selection
+
+        // planet selection
         new Table(t -> {
-            t.right();
-            if(content.planets().count(p -> p.accessible) > 1){
-                t.table(Styles.black6, pt -> {
-                    pt.add("@planets").color(Pal.accent);
-                    pt.row();
-                    pt.image().growX().height(4f).pad(6f).color(Pal.accent);
-                    pt.row();
-                    for(int i = 0; i < content.planets().size; i++){
-                        Planet planet = content.planets().get(i);
-                        if(planet.accessible){
-                            pt.button(planet.localizedName, Styles.clearTogglet, () -> {
+            t.top().left();
+            ScrollPane pane = new ScrollPane(null, Styles.smallPane);
+            t.add(pane).colspan(2).row();
+            t.button("@campaign.difficulty", Icon.bookSmall, () -> {
+                campaignRules.show(state.planet);
+            }).margin(12f).size(208f, 40f).padTop(12f).visible(() -> state.planet.allowCampaignRules && mode != planetLaunch).row();
+            t.add().height(64f); //padding for close button
+            Table starsTable = new Table(Styles.black);
+            pane.setWidget(starsTable);
+            pane.setScrollingDisabled(true, false);
+
+            int starCount = 0;
+            for(Planet star : content.planets()){
+                if(star.solarSystem != star || !content.planets().contains(p -> p.solarSystem == star && selectable(p))) continue;
+
+                starCount++;
+                if(starCount > 1) starsTable.add(star.localizedName).padLeft(10f).padBottom(10f).padTop(10f).left().width(190f).row();
+                Table planetTable = new Table();
+                planetTable.margin(4f); //less padding
+                starsTable.add(planetTable).left().row();
+                for(Planet planet : content.planets()){
+                    if(planet.solarSystem == star && selectable(planet)){
+                        Button planetButton = planetTable.button(planet.localizedName, Icon.icons.get(planet.icon + "Small", Icon.icons.get(planet.icon, Icon.commandRallySmall)), Styles.flatTogglet, () -> {
+                            selected = null;
+                            if(state.planet != planet){
+                                newPresets.clear();
+                                state.planet = planet;
+
                                 selected = null;
-                                launchSector = null;
-                                renderer.planets.planet = planet;
-                            }).width(200).height(40).growX().update(bb -> bb.setChecked(renderer.planets.planet == planet));
-                            pt.row();
-                        }
+                                updateSelected();
+                                rebuildExpand();
+                            }
+                            settings.put("lastplanet", planet.name);
+                        }).width(200).height(40).update(bb -> bb.setChecked(state.planet == planet)).with(w -> w.marginLeft(10f)).get();
+                        planetButton.getChildren().get(1).setColor(planet.iconColor);
+                        planetButton.setColor(planet.iconColor);
+                        planetTable.background(Tex.pane).row();
                     }
-                });
+                }
             }
-        }),
+        }).visible(() -> mode != select),
 
-        new Table(t -> {
-            t.top();
-            //t.add(sectorTop);
-        })).grow();
+        new Table(c -> expandTable = c)).grow();
+        rebuildExpand();
+    }
 
+    void rebuildExpand(){
+        Table c = expandTable;
+        c.clear();
+        c.visible(() -> !(graphics.isPortrait() && mobile) && mode != planetLaunch);
+        if(state.planet.sectors.contains(Sector::hasBase)){
+            int attacked = state.planet.sectors.count(Sector::isAttacked);
+
+            //sector notifications & search
+            c.top().right();
+            c.defaults().width(290f);
+
+            c.button(bundle.get("sectorlist") +
+            (attacked == 0 ? "" : "\n[red]âš [lightgray] " + bundle.format("sectorlist.attacked", "[red]" + attacked + "[]")),
+            Icon.downOpen, Styles.squareTogglet, () -> sectorsShown = !sectorsShown)
+            .height(60f).checked(b -> {
+                Image image = (Image)b.getCells().first().get();
+                image.setDrawable(sectorsShown ? Icon.upOpen : Icon.downOpen);
+                return sectorsShown;
+            }).with(t -> t.left().margin(7f)).with(t -> t.getLabelCell().grow().left()).row();
+
+            c.collapser(t -> {
+                t.background(Styles.black8);
+
+                notifs = t;
+                rebuildList();
+            }, false, () -> sectorsShown).padBottom(64f).row();
+        }
+    }
+
+    void rebuildList(){
+        if(notifs == null) return;
+
+        notifs.clear();
+
+        var all = state.planet.sectors.select(Sector::hasBase);
+        all.sort(Structs.comps(Structs.comparingBool(s -> !s.isAttacked()), Structs.comparingInt(s -> s.save == null ? 0 : -(int)s.save.meta.timePlayed)));
+
+        notifs.pane(p -> {
+            Runnable[] readd = {null};
+
+            p.table(s -> {
+                s.image(Icon.zoom).padRight(4);
+                s.field(searchText, t -> {
+                    searchText = t;
+                    readd[0].run();
+                }).growX().height(50f);
+            }).growX().row();
+
+            Table con = p.table().growX().get();
+            con.touchable = Touchable.enabled;
+
+            readd[0] = () -> {
+                con.clearChildren();
+                for(Sector sec : all){
+                    if(sec.hasBase() && (searchText.isEmpty() || sec.name().toLowerCase().contains(searchText.toLowerCase()))){
+                        con.button(t -> {
+                            t.marginRight(10f);
+                            t.left();
+                            t.defaults().growX();
+
+                            t.table(head -> {
+                                head.left().defaults();
+
+                                if(sec.isAttacked()){
+                                    head.image(Icon.warningSmall).update(i -> {
+                                        i.color.set(Pal.accent).lerp(Pal.remove, Mathf.absin(Time.globalTime, 9f, 1f));
+                                    }).padRight(4f);
+                                }
+
+                                String ic = sec.iconChar() == null ? "" : sec.iconChar() + " ";
+
+                                head.add(ic + sec.name()).growX().wrap();
+                            }).growX().row();
+
+                            if(sec.isAttacked()){
+                                addSurvivedInfo(sec, t, true);
+                            }
+                        }, Styles.underlineb, () -> {
+                            lookAt(sec);
+                            selected = sec;
+                            updateSelected();
+                        }).margin(8f).marginLeft(13f).marginBottom(6f).marginTop(6f).padBottom(3f).padTop(3f).growX().checked(b -> selected == sec).row();
+                        //for resources: .tooltip(sec.info.resources.toString("", u -> u.emoji()))
+                    }
+                }
+
+                if(con.getChildren().isEmpty()){
+                    con.add("@none.found").pad(10f);
+                }
+            };
+
+            readd[0].run();
+        }).grow().scrollX(false);
     }
 
     @Override
@@ -495,28 +794,49 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }
     }
 
-    public void lookAt(Sector sector, float alpha){
-        float len = planets.camPos.len();
-        planets.camPos.slerp(Tmp.v31.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()).setLength(len), alpha);
-    }
-
     @Override
     public void act(float delta){
         super.act(delta);
 
-        if(hovered != null && !mobile){
+        //update lerp
+        if(state.otherCamPos != null){
+            state.otherCamAlpha = Mathf.lerpDelta(state.otherCamAlpha, 1f, 0.05f);
+            state.camPos.set(0f, camLength, 0.1f);
+
+            if(Mathf.equal(state.otherCamAlpha, 1f, 0.01f)){
+                //TODO change zoom too
+                state.camPos.set(Tmp.v31.set(state.otherCamPos).slerp(state.planet.position, state.otherCamAlpha).add(state.camPos).sub(state.planet.position));
+
+                state.otherCamPos = null;
+                //announce new sector
+                newPresets.add(state.planet.sectors.get(state.planet.startSector));
+
+            }
+        }
+
+        //fade in sector dialog after panning
+        if(sectorTop != null && state.otherCamPos == null){
+            sectorTop.color.a = Mathf.lerpDelta(sectorTop.color.a, 1f, 0.1f);
+        }
+
+        if(hovered != null && !mobile && state.planet.hasGrid()){
             addChild(hoverLabel);
             hoverLabel.toFront();
             hoverLabel.touchable = Touchable.disabled;
+            hoverLabel.color.a = state.uiAlpha;
 
-            Vec3 pos = planets.cam.project(Tmp.v31.set(hovered.tile.v).setLength(PlanetRenderer.outlineRad).rotate(Vec3.Y, -planets.planet.getRotation()).add(planets.planet.position));
+            Vec3 pos = hovered.planet.project(hovered, planets.cam, Tmp.v31);
             hoverLabel.setPosition(pos.x - Core.scene.marginLeft, pos.y - Core.scene.marginBottom, Align.center);
 
             hoverLabel.getText().setLength(0);
             if(hovered != null){
                 StringBuilder tx = hoverLabel.getText();
                 if(!canSelect(hovered)){
-                    tx.append("[gray]").append(Iconc.lock).append(" ").append(Core.bundle.get("locked"));
+                    if(mode == planetLaunch){
+                        tx.append("[gray]").append(Iconc.cancel);
+                    }else{
+                        tx.append("[gray]").append(Iconc.lock).append(" ").append(Core.bundle.get("locked"));
+                    }
                 }else{
                     tx.append("[accent][[ [white]").append(hovered.name()).append("[accent] ]");
                 }
@@ -550,46 +870,65 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             }
         }
 
-        if(planets.planet.isLandable()){
-            hovered = planets.planet.getSector(planets.cam.getMouseRay(), PlanetRenderer.outlineRad);
+        if(state.planet.hasGrid()){
+            hovered = Core.scene.getDialog() == this ? state.planet.getSector(planets.cam.getMouseRay(), PlanetRenderer.outlineRad * state.planet.radius) : null;
+        }else if(state.planet.isLandable()){
+            boolean wasNull = selected == null;
+            //always have the first sector selected.
+            //TODO better support for multiple sectors in gridless planets?
+            hovered = selected = state.planet.sectors.first();
+
+            //autoshow
+            if(wasNull){
+                updateSelected();
+            }
         }else{
             hovered = selected = null;
         }
 
-        planets.zoom = Mathf.lerpDelta(planets.zoom, zoom, 0.4f);
-        selectAlpha = Mathf.lerpDelta(selectAlpha, Mathf.num(planets.zoom < 1.9f), 0.1f);
+        state.zoom = Mathf.lerpDelta(state.zoom, zoom, 0.4f);
+        state.uiAlpha = Mathf.lerpDelta(state.uiAlpha, Mathf.num(state.zoom < 1.9f), 0.1f);
+    }
+
+    void displayItems(Table c, float scl, ObjectMap<Item, ExportStat> stats, String name){
+        displayItems(c, scl, stats, name, t -> {});
+    }
+
+    void displayItems(Table c, float scl, ObjectMap<Item, ExportStat> stats, String name, Cons<Table> builder){
+        Table t = new Table().left();
+
+        int i = 0;
+        for(var item : content.items()){
+            var stat = stats.get(item);
+            if(stat == null) continue;
+            int total = (int)(stat.mean * 60 * scl);
+            if(total > 1){
+                t.image(item.uiIcon).padRight(3);
+                t.add(UI.formatAmount(total) + " " + Core.bundle.get("unit.perminute")).color(Color.lightGray).padRight(3);
+                if(++i % 3 == 0){
+                    t.row();
+                }
+            }
+        }
+
+        if(t.getChildren().any()){
+            c.defaults().left();
+            c.add(name).row();
+            builder.get(c);
+            c.add(t).padLeft(10f).row();
+        }
     }
 
     void showStats(Sector sector){
         BaseDialog dialog = new BaseDialog(sector.name());
 
         dialog.cont.pane(c -> {
-            Cons2<ObjectMap<Item, ExportStat>, String> display = (stats, name) -> {
-                Table t = new Table().left();
-
-                float scl = sector.getProductionScale();
-
-                int[] i = {0};
-
-                stats.each((item, stat) -> {
-                    int total = (int)(stat.mean * 60 * scl);
-                    if(total > 1){
-                        t.image(item.icon(Cicon.small)).padRight(3);
-                        t.add(UI.formatAmount(total) + " " + Core.bundle.get("unit.perminute")).color(Color.lightGray).padRight(3);
-                        if(++i[0] % 3 == 0){
-                            t.row();
-                        }
-                    }
-                });
-
-                if(t.getChildren().any()){
-                    c.add(name).left().row();
-                    c.add(t).padLeft(10f).left().row();
-                }
-            };
-
             c.defaults().padBottom(5);
 
+            if(sector.preset != null && sector.preset.description != null){
+                c.add(sector.preset.displayDescription()).width(420f).wrap().left().row();
+            }
+
             c.add(Core.bundle.get("sectors.time") + " [accent]" + sector.save.getPlayTime()).left().row();
 
             if(sector.info.waves && sector.hasBase()){
@@ -604,16 +943,32 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                 c.add("@sectors.resources").left().row();
                 c.table(t -> {
                     for(UnlockableContent uc : sector.info.resources){
-                        t.image(uc.icon(Cicon.small)).padRight(3).size(Cicon.small.size);
+                        if(uc == null) continue;
+                        t.image(uc.uiIcon).scaling(Scaling.fit).padRight(3).size(iconSmall);
                     }
                 }).padLeft(10f).left().row();
             }
 
             //production
-            display.get(sector.info.production, "@sectors.production");
+            displayItems(c, sector.getProductionScale(), sector.info.production, "@sectors.production");
 
             //export
-            display.get(sector.info.export, "@sectors.export");
+            displayItems(c, sector.getProductionScale(), sector.info.export, "@sectors.export", t -> {
+                if(sector.info.destination != null && sector.info.destination.hasBase()){
+                    String ic = sector.info.destination.iconChar();
+                    t.add(Iconc.rightOpen + " " + (ic == null || ic.isEmpty() ? "" : ic + " ") + sector.info.destination.name()).padLeft(10f).row();
+                }
+            });
+
+            //import
+            if(sector.hasBase()){
+                displayItems(c, 1f, sector.info.imports, "@sectors.import", t -> {
+                    sector.info.eachImport(sector.planet, other -> {
+                        String ic = other.iconChar();
+                        t.add(Iconc.rightOpen + " " + (ic == null || ic.isEmpty() ? "" : ic + " ") + other.name()).padLeft(10f).row();
+                    });
+                });
+            }
 
             ItemSeq items = sector.items();
 
@@ -628,7 +983,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
                         int i = 0;
                         for(ItemStack stack : items){
-                            res.image(stack.item.icon(Cicon.small)).padRight(3);
+                            res.image(stack.item.uiIcon).padRight(3);
                             res.add(UI.formatAmount(Math.max(stack.amount, 0))).color(Color.lightGray);
                             if(++i % 4 == 0){
                                 res.row();
@@ -640,17 +995,66 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         });
 
         dialog.addCloseButton();
+
+        if(sector.hasBase()){
+            dialog.buttons.button("@sector.abandon", Icon.cancel, () -> abandonSectorConfirm(sector, dialog::hide));
+        }
+
         dialog.show();
     }
 
+    public void abandonSectorConfirm(Sector sector, Runnable listener){
+        ui.showConfirm("@sector.abandon.confirm", () -> {
+            if(listener != null) listener.run();
+
+            if(sector.isBeingPlayed()){
+                hide();
+                //after dialog is hidden
+                Time.runTask(7f, () -> {
+                    //force game over in a more dramatic fashion
+                    for(var core : player.team().cores().copy()){
+                        core.kill();
+                    }
+                });
+            }else{
+                if(sector.save != null){
+                    sector.save.delete();
+                }
+                sector.save = null;
+            }
+            updateSelected();
+            rebuildList();
+        });
+    }
+
+    void addSurvivedInfo(Sector sector, Table table, boolean wrap){
+        if(!wrap){
+            table.add(sector.planet.allowWaveSimulation ? Core.bundle.format("sectors.underattack", (int)(sector.info.damage * 100)) : "@sectors.underattack.nodamage").wrapLabel(wrap).row();
+        }
+
+        if(sector.planet.allowWaveSimulation && sector.info.wavesSurvived >= 0 && sector.info.wavesSurvived - sector.info.wavesPassed >= 0 && !sector.isBeingPlayed()){
+            int toCapture = sector.info.attack || sector.info.winWave <= 1 ? -1 : sector.info.winWave - (sector.info.wave + sector.info.wavesPassed);
+            boolean plus = (sector.info.wavesSurvived - sector.info.wavesPassed) >= SectorDamage.maxRetWave - 1;
+            table.add(Core.bundle.format("sectors.survives", Math.min(sector.info.wavesSurvived - sector.info.wavesPassed, toCapture <= 0 ? 200 : toCapture) +
+            (plus ? "+" : "") + (toCapture < 0 ? "" : "/" + toCapture))).wrapLabel(wrap).row();
+        }
+    }
+
+    void selectSector(Sector sector){
+        selected = sector;
+        updateSelected();
+    }
+
     void updateSelected(){
         Sector sector = selected;
         Table stable = sectorTop;
 
         if(sector == null){
             stable.clear();
+            stable.visible = false;
             return;
         }
+        stable.visible = true;
 
         float x = stable.getX(Align.center), y = stable.getY(Align.center);
         stable.clear();
@@ -661,59 +1065,93 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             if(sector.preset == null){
                 title.add().growX();
 
-                title.button(Icon.pencilSmall, Styles.clearPartiali, () -> {
+                title.button(Icon.pencilSmall, Styles.clearNonei, () -> {
                    ui.showTextInput("@sectors.rename", "@name", 20, sector.name(), v -> {
                        sector.setName(v);
                        updateSelected();
+                       rebuildList();
                    });
                 }).size(40f).padLeft(4);
             }
 
-            var icon = Icon.icons.get(sector.info.icon + "Small");
+            var icon = sector.info.contentIcon != null ?
+                new TextureRegionDrawable(sector.info.contentIcon.uiIcon) :
+                Icon.icons.get(sector.info.icon + "Small");
 
-            title.button(icon == null ? Icon.noneSmall : icon, Styles.clearPartiali, () -> {
+            title.button(icon == null ? Icon.noneSmall : icon, Styles.clearNonei, iconSmall, () -> {
+                //TODO use IconSelectDialog
                 new Dialog(""){{
                     closeOnBack();
                     setFillParent(true);
+
+                    Runnable refresh = () -> {
+                        sector.saveInfo();
+                        hide();
+                        updateSelected();
+                        rebuildList();
+                    };
+
                     cont.pane(t -> {
-                        t.marginRight(19f);
-                        t.defaults().size(48);
+                        resized(true, () -> {
+                            t.clearChildren();
+                            t.marginRight(19f);
+                            t.defaults().size(48f);
 
-                        t.button(Icon.none, Styles.clearTogglei, () -> {
-                            sector.info.icon = null;
-                            sector.saveInfo();
-                            hide();
-                            updateSelected();
-                        }).checked(sector.info.icon == null);
+                            t.button(Icon.none, Styles.squareTogglei, () -> {
+                                sector.info.icon = null;
+                                sector.info.contentIcon = null;
+                                refresh.run();
+                            }).checked(sector.info.icon == null && sector.info.contentIcon == null);
 
-                        int i = 1;
-                        for(var entry : Icon.icons.entries()){
-                            if(entry.key.endsWith("Small") || entry.key.contains("none")) continue;
-                            String key = entry.key;
+                            int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
 
-                            t.button(entry.value, Styles.cleari, () -> {
-                                sector.info.icon = key;
-                                sector.saveInfo();
-                                hide();
-                                updateSelected();
-                            }).checked(entry.key.equals(sector.info.icon));
+                            int i = 1;
+                            for(var key : accessibleIcons){
+                                var value = Icon.icons.get(key);
 
-                            if(++i % 8 == 0) t.row();
-                        }
+                                t.button(value, Styles.squareTogglei, () -> {
+                                    sector.info.icon = key;
+                                    sector.info.contentIcon = null;
+                                    refresh.run();
+                                }).checked(key.equals(sector.info.icon));
+
+                                if(++i % cols == 0) t.row();
+                            }
+
+                            for(ContentType ctype : defaultContentIcons){
+                                t.row();
+                                t.image().colspan(cols).growX().width(Float.NEGATIVE_INFINITY).height(3f).color(Pal.accent);
+                                t.row();
+
+                                i = 0;
+                                for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){
+                                    if(!u.isHidden() && u.unlocked()){
+                                        t.button(new TextureRegionDrawable(u.uiIcon), Styles.squareTogglei, iconMed, () -> {
+                                            sector.info.icon = null;
+                                            sector.info.contentIcon = u;
+                                            refresh.run();
+                                        }).checked(sector.info.contentIcon == u);
+
+                                        if(++i % cols == 0) t.row();
+                                    }
+                                }
+                            }
+                        });
                     });
+                    buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
                 }}.show();
-            }).size(40f);
+            }).size(40f).tooltip("@sector.changeicon");
         }).row();
 
         stable.image().color(Pal.accent).fillX().height(3f).pad(3f).row();
 
-        boolean locked = sector.preset != null && sector.preset.locked() && !sector.hasBase() && sector.preset.node() != null;
+        boolean locked = sector.preset != null && sector.preset.locked() && !sector.hasBase() && sector.preset.techNode != null;
 
         if(locked){
             stable.table(r -> {
                 r.add("@complete").colspan(2).left();
                 r.row();
-                for(Objective o : sector.preset.node().objectives){
+                for(Objective o : sector.preset.techNode.objectives){
                     if(o.complete()) continue;
 
                     r.add("> " + o.display()).color(Color.lightGray).left();
@@ -726,17 +1164,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }
 
         if(sector.isAttacked()){
-            stable.add(Core.bundle.format("sectors.underattack", (int)(sector.info.damage * 100)));
-            stable.row();
-
-            if(sector.info.wavesSurvived >= 0 && sector.info.wavesSurvived - sector.info.wavesPassed >= 0 && !sector.isBeingPlayed()){
-                int toCapture = sector.info.attack || sector.info.winWave <= 1 ? -1 : sector.info.winWave - (sector.info.wave + sector.info.wavesPassed);
-                boolean plus = (sector.info.wavesSurvived - sector.info.wavesPassed) >= SectorDamage.maxRetWave - 1;
-                stable.add(Core.bundle.format("sectors.survives", Math.min(sector.info.wavesSurvived - sector.info.wavesPassed, toCapture <= 0 ? 200 : toCapture) +
-                (plus ? "+" : "") + (toCapture < 0 ? "" : "/" + toCapture)));
-                stable.row();
-            }
-        }else if(sector.hasBase() && sector.near().contains(Sector::hasEnemyBase)){
+            addSurvivedInfo(sector, stable, false);
+        }else if(sector.hasBase() && sector.planet.campaignRules.sectorInvasion && sector.near().contains(Sector::hasEnemyBase)){
             stable.add("@sectors.vulnerable");
             stable.row();
         }else if(!sector.hasBase() && sector.hasEnemyBase()){
@@ -749,7 +1178,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                 t.add("@sectors.resources").padRight(4);
                 for(UnlockableContent c : sector.info.resources){
                     if(c == null) continue; //apparently this is possible.
-                    t.image(c.icon(Cicon.small)).padRight(3).size(Cicon.small.size);
+                    t.image(c.uiIcon).padRight(3).scaling(Scaling.fit).size(iconSmall);
                 }
             }).padLeft(10f).fillX().row();
         }
@@ -757,7 +1186,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         stable.row();
 
         if(sector.hasBase()){
-            stable.button("@stats", Icon.info, Styles.transt, () -> showStats(sector)).height(40f).fillX().row();
+            stable.button("@stats", Icon.info, Styles.cleart, () -> showStats(sector)).height(40f).fillX().row();
         }
 
         if((sector.hasBase() && mode == look) || canSelect(sector) || (sector.preset != null && sector.preset.alwaysUnlocked) || debugSelect){
@@ -772,23 +1201,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         stable.pack();
         stable.setPosition(x, y, Align.center);
 
-        stable.update(() -> {
-            if(selected != null){
-                if(launching){
-                    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.color.a = Math.max(dot, 0f)*2f;
-                    if(dot*2f <= -0.1f){
-                        selected = null;
-                        updateSelected();
-                    }
-                }
-            }
-        });
-
         stable.act(0f);
     }
 
@@ -803,14 +1215,35 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             return;
         }
 
-        if(sector.preset != null && sector.preset.locked() && !sector.hasBase()){
+        if(sector.preset != null && sector.preset.locked() && sector.preset.techNode != null && !sector.hasBase()){
             return;
         }
 
+        Planet planet = sector.planet;
+
+        //make sure there are no under-attack sectors (other than this one)
+        if(!planet.allowWaveSimulation && !debugSelect){
+            //if there are two or more attacked sectors... something went wrong, don't show the dialog to prevent softlock
+            Sector attacked = planet.sectors.find(s -> s.isAttacked() && s != sector);
+            if(attacked != null &&  planet.sectors.count(s -> s.isAttacked()) < 2){
+                BaseDialog dialog = new BaseDialog("@sector.noswitch.title");
+                dialog.cont.add(bundle.format("sector.noswitch", attacked.name(), attacked.planet.localizedName)).width(400f).labelAlign(Align.center).center().wrap();
+                dialog.addCloseButton();
+                dialog.buttons.button("@sector.view", Icon.eyeSmall, () -> {
+                    dialog.hide();
+                    lookAt(attacked);
+                    selectSector(attacked);
+                });
+                dialog.show();
+
+                return;
+            }
+        }
+
         boolean shouldHide = true;
 
         //save before launch.
-        if(control.saves.getCurrent() != null && state.isGame() && mode != select){
+        if(control.saves.getCurrent() != null && Vars.state.isGame() && mode != select){
             try{
                 control.saves.getCurrent().save();
             }catch(Throwable e){
@@ -822,28 +1255,57 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         if(mode == look && !sector.hasBase()){
             shouldHide = false;
             Sector from = findLauncher(sector);
+
             if(from == null){
                 //clear loadout information, so only the basic loadout gets used
                 universe.clearLoadoutInfo();
                 //free launch.
                 control.playSector(sector);
             }else{
-                CoreBlock block = from.info.bestCoreType instanceof CoreBlock b ? b : (CoreBlock)Blocks.coreShard;
+                CoreBlock block = sector.allowLaunchSchematics() ? (from.info.bestCoreType instanceof CoreBlock b ? b : (CoreBlock)from.planet.defaultCore) : (CoreBlock)from.planet.defaultCore;
 
-                loadouts.show(block, from, () -> {
-                    from.removeItems(universe.getLastLoadout().requirements());
+                loadouts.show(block, from, sector, () -> {
+                    var loadout = universe.getLastLoadout();
+                    var schemCore = loadout.findCore();
+                    from.removeItems(loadout.requirements());
                     from.removeItems(universe.getLaunchResources());
 
-                    launching = true;
-                    zoom = 0.5f;
+                    Events.fire(new SectorLaunchLoadoutEvent(sector, from, loadout));
 
-                    ui.hudfrag.showLaunchDirect();
-                    Time.runTask(launchDuration, () -> control.playSector(from, sector));
+                    CoreBuild core = player.team().core();
+                    if(core == null || settings.getBool("skipcoreanimation")){
+                        //just... go there
+                        control.playSector(from, sector);
+                        //hide only after load screen is shown
+                        Time.runTask(8f, this::hide);
+                    }else{
+                        //hide immediately so launch sector is visible
+                        hide();
+
+                        //allow planet dialog to finish hiding before actually launching
+                        Time.runTask(5f, () -> {
+                            Runnable doLaunch = () -> {
+                                renderer.showLaunch(core);
+                                //run with less delay, as the loading animation is delayed by several frames
+                                Time.runTask(core.launchDuration() - 8f, () -> control.playSector(from, sector));
+                            };
+
+                            //load launchFrom sector right before launching so animation is correct
+                            if(!from.isBeingPlayed()){
+                                //run *after* the loading animation is done
+                                Time.runTask(9f, doLaunch);
+                                control.playSector(from);
+                            }else{
+                                doLaunch.run();
+                            }
+                        });
+                    }
                 });
             }
-        }else if(mode == select){
+        }else if(mode == select || mode == planetLaunch){
             listener.get(sector);
         }else{
+            //sector should have base here
             control.playSector(sector);
         }
 
@@ -854,6 +1316,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         /** Look around for existing sectors. Can only deploy. */
         look,
         /** Select a sector for some purpose. */
-        select
+        select,
+        /** Launch between planets. */
+        planetLaunch
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java
index f78d98e77b..abc8f66aa0 100644
--- a/core/src/mindustry/ui/dialogs/ResearchDialog.java
+++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java
@@ -11,6 +11,7 @@ import arc.scene.actions.*;
 import arc.scene.event.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
+import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
@@ -30,85 +31,110 @@ import mindustry.ui.layout.TreeLayout.*;
 import java.util.*;
 
 import static mindustry.Vars.*;
+import static mindustry.gen.Tex.*;
 
 public class ResearchDialog extends BaseDialog{
+    public static boolean debugShowRequirements = false;
+
     public final float nodeSize = Scl.scl(60f);
     public ObjectSet<TechTreeNode> nodes = new ObjectSet<>();
-    public TechTreeNode root = new TechTreeNode(TechTree.root, null);
+    public TechTreeNode root = new TechTreeNode(TechTree.roots.first(), null);
+    public TechNode lastNode = root.node;
     public Rect bounds = new Rect();
     public ItemsDisplay itemDisplay;
     public View view;
 
     public ItemSeq items;
 
+    private boolean showTechSelect;
+    private boolean needsRebuild;
+
     public ResearchDialog(){
         super("");
 
+        Events.on(ResetEvent.class, e -> {
+            hide();
+        });
+
+        Events.on(UnlockEvent.class, e -> {
+            if(net.client() && !needsRebuild){
+                needsRebuild = true;
+                Core.app.post(() -> {
+                    needsRebuild = false;
+
+                    checkNodes(root);
+                    view.hoverNode = null;
+                    treeLayout();
+                    view.rebuild();
+                    Core.scene.act();
+                });
+            }
+        });
+
         titleTable.remove();
+        titleTable.clear();
+        titleTable.top();
+        titleTable.button(b -> {
+            //TODO custom icon here.
+            b.imageDraw(() -> root.node.icon()).padRight(8).size(iconMed);
+            b.add().growX();
+            b.label(() -> root.node.localizedName()).color(Pal.accent);
+            b.add().growX();
+            b.add().size(iconMed);
+        }, () -> {
+            new BaseDialog("@techtree.select"){{
+                cont.pane(t -> {
+                    t.table(Tex.button, in -> {
+                        in.defaults().width(300f).height(60f);
+                        for(TechNode node : TechTree.roots){
+                            if(node.requiresUnlock && !node.content.unlockedHost() && node != getPrefRoot()) continue;
+
+                            //TODO toggle
+                            in.button(node.localizedName(), node.icon(), Styles.flatTogglet, iconMed, () -> {
+                                if(node == lastNode){
+                                    return;
+                                }
+
+                                rebuildTree(node);
+                                hide();
+                            }).marginLeft(12f).checked(node == lastNode).row();
+                        }
+                    });
+                });
+
+                addCloseButton();
+            }}.show();
+        }).visible(() -> showTechSelect = TechTree.roots.count(node -> !(node.requiresUnlock && !node.content.unlockedHost())) > 1).minWidth(300f);
+
         margin(0f).marginBottom(8);
-        cont.stack(view = new View(), itemDisplay = new ItemsDisplay()).grow();
+        cont.stack(titleTable, view = new View(), itemDisplay = new ItemsDisplay()).grow();
+        itemDisplay.visible(() -> !net.client());
+
+        titleTable.toFront();
 
         shouldPause = true;
 
+        onResize(this::checkMargin);
+
         shown(() -> {
+            checkMargin();
+            Core.app.post(this::checkMargin);
 
-            items = new ItemSeq(){
-                //store sector item amounts for modifications
-                ObjectMap<Sector, ItemSeq> cache = new ObjectMap<>();
+            Planet currPlanet = ui.planet.isShown() ?
+                ui.planet.state.planet :
+                state.isCampaign() ? state.rules.sector.planet : null;
 
-                {
-                    //add global counts of each sector
-                    for(Planet planet : content.planets()){
-                        for(Sector sector : planet.sectors){
-                            if(sector.hasSave() && sector.hasBase()){
-                                ItemSeq cached = sector.items();
-                                cache.put(sector, cached);
-                                cached.each((item, amount) -> {
-                                    values[item.id] += Math.max(amount, 0);
-                                    total += Math.max(amount, 0);
-                                });
-                            }
-                        }
-                    }
-                }
-
-                //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);
-                }
-            };
+            if(currPlanet != null && currPlanet.techTree != null){
+                switchTree(currPlanet.techTree);
+            }
+            rebuildItems();
 
             checkNodes(root);
             treeLayout();
 
+            view.hoverNode = null;
+            view.infoTable.remove();
+            view.infoTable.clear();
         });
 
         hidden(ui.planet::setup);
@@ -172,6 +198,109 @@ public class ResearchDialog extends BaseDialog{
         });
     }
 
+    void checkMargin(){
+        if(Core.graphics.isPortrait() && showTechSelect){
+            itemDisplay.marginTop(60f);
+        }else{
+            itemDisplay.marginTop(0f);
+        }
+        itemDisplay.invalidate();
+        itemDisplay.layout();
+    }
+
+    public void rebuildItems(){
+        items = new ItemSeq(){
+            //store sector item amounts for modifications
+            ObjectMap<Sector, ItemSeq> cache = new ObjectMap<>();
+
+            {
+                //first, find a planet associated with the current tech tree
+                Planet rootPlanet = lastNode.planet != null ? lastNode.planet : content.planets().find(p -> p.techTree == lastNode);
+
+                //if there is no root, fall back to serpulo
+                if(rootPlanet == null) rootPlanet = Planets.serpulo;
+
+                //add global counts of each sector
+                for(Sector sector : rootPlanet.sectors){
+                    if(sector.hasBase()){
+                        ItemSeq cached = sector.items();
+                        cache.put(sector, cached);
+                        cached.each((item, amount) -> {
+                            values[item.id] += Math.max(amount, 0);
+                            total += Math.max(amount, 0);
+                        });
+                    }
+                }
+            }
+
+            //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);
+            }
+        };
+
+        itemDisplay.rebuild(items);
+    }
+
+    public @Nullable TechNode getPrefRoot(){
+        Planet currPlanet = ui.planet.isShown() ?
+            ui.planet.state.planet :
+            state.isCampaign() ? state.rules.sector.planet : null;
+        return currPlanet == null ? null : currPlanet.techTree;
+    }
+
+    public void switchTree(TechNode node){
+        if(lastNode == node || node == null) return;
+        nodes.clear();
+        root = new TechTreeNode(node, null);
+        lastNode = node;
+        view.rebuildAll();
+
+        rebuildItems();
+    }
+
+    public void rebuildTree(TechNode node){
+        switchTree(node);
+        view.panX = 0f;
+        view.panY = -200f;
+        view.setScale(1f);
+
+        view.hoverNode = null;
+        view.infoTable.remove();
+        view.infoTable.clear();
+
+        checkNodes(root);
+        treeLayout();
+    }
+
     void treeLayout(){
         float spacing = 20f;
         LayoutNode node = new LayoutNode(root, null);
@@ -233,10 +362,10 @@ public class ResearchDialog extends BaseDialog{
 
     void checkNodes(TechTreeNode node){
         boolean locked = locked(node.node);
-        if(!locked) node.visible = true;
+        if(!locked && (node.parent == null || node.parent.visible)) node.visible = true;
         node.selectable = selectable(node.node);
         for(TechTreeNode l : node.children){
-            l.visible = !locked;
+            l.visible = !locked && l.parent.visible;
             checkNodes(l);
         }
 
@@ -244,11 +373,12 @@ public class ResearchDialog extends BaseDialog{
     }
 
     boolean selectable(TechNode node){
-        return node.content.unlocked() || !node.objectives.contains(i -> !i.complete());
+        //there's a desync here as far as sectors go, since the client doesn't know about that, but I'm not too concerned
+        return node.content.unlockedHost() || !node.objectives.contains(i -> !i.complete());
     }
 
     boolean locked(TechNode node){
-        return node.content.locked();
+        return !node.content.unlockedHost();
     }
 
     class LayoutNode extends TreeNode<LayoutNode>{
@@ -273,11 +403,9 @@ public class ResearchDialog extends BaseDialog{
             this.parent = parent;
             this.width = this.height = nodeSize;
             nodes.add(this);
-            if(node.children != null){
-                children = new TechTreeNode[node.children.size];
-                for(int i = 0; i < children.length; i++){
-                    children[i] = new TechTreeNode(node.children.get(i), this);
-                }
+            children = new TechTreeNode[node.children.size];
+            for(int i = 0; i < children.length; i++){
+                children[i] = new TechTreeNode(node.children.get(i), this);
             }
         }
     }
@@ -289,36 +417,48 @@ public class ResearchDialog extends BaseDialog{
         public Table infoTable = new Table();
 
         {
+            rebuildAll();
+        }
+
+        public void rebuildAll(){
+            clear();
+            hoverNode = null;
+            infoTable.clear();
             infoTable.touchable = Touchable.enabled;
 
             for(TechTreeNode node : nodes){
-                ImageButton button = new ImageButton(node.node.content.icon(Cicon.medium), Styles.nodei);
+                ImageButton button = new ImageButton(node.node.content.uiIcon, Styles.nodei);
+                button.resizeImage(32f);
+                button.getImage().setScaling(Scaling.fit);
                 button.visible(() -> node.visible);
-                button.clicked(() -> {
-                    if(moved) return;
+                if(!net.client()){
+                    button.clicked(() -> {
+                        if(moved) return;
 
-                    if(mobile){
-                        hoverNode = button;
-                        rebuild();
-                        float right = infoTable.getRight();
-                        if(right > Core.graphics.getWidth()){
-                            float moveBy = right - Core.graphics.getWidth();
-                            addAction(new RelativeTemporalAction(){
-                                {
-                                    setDuration(0.1f);
-                                    setInterpolation(Interp.fade);
-                                }
+                        if(mobile){
+                            hoverNode = button;
+                            rebuild();
+                            float right = infoTable.getRight();
+                            if(right > Core.graphics.getWidth()){
+                                float moveBy = right - Core.graphics.getWidth();
+                                addAction(new RelativeTemporalAction(){
+                                    {
+                                        setDuration(0.1f);
+                                        setInterpolation(Interp.fade);
+                                    }
 
-                                @Override
-                                protected void updateRelative(float percentDelta){
-                                    panX -= moveBy * percentDelta;
-                                }
-                            });
+                                    @Override
+                                    protected void updateRelative(float percentDelta){
+                                        panX -= moveBy * percentDelta;
+                                    }
+                                });
+                            }
+                        }else if(canSpend(node.node) && locked(node.node)){
+                            spend(node.node);
                         }
-                    }else if(canSpend(node.node) && locked(node.node)){
-                        spend(node.node);
-                    }
-                });
+                    });
+                }
+
                 button.hovered(() -> {
                     if(!mobile && hoverNode != button && node.visible){
                         hoverNode = button;
@@ -335,20 +475,21 @@ public class ResearchDialog extends BaseDialog{
                 button.userObject = node.node;
                 button.setSize(nodeSize);
                 button.update(() -> {
+                    button.setDisabled(net.client() && !mobile);
                     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 : !selectable(node.node) || !canSpend(node.node) ? Tex.buttonRed : Tex.button;
+                    button.getStyle().up = !locked(node.node) ? Tex.buttonOver : !selectable(node.node) || (!canSpend(node.node) && !net.client()) ? Tex.buttonRed : Tex.button;
 
-                    ((TextureRegionDrawable)button.getStyle().imageUp).setRegion(node.selectable ? node.node.content.icon(Cicon.medium) : Icon.lock.getRegion());
+                    ((TextureRegionDrawable)button.getStyle().imageUp).setRegion(node.selectable ? node.node.content.uiIcon : Icon.lock.getRegion());
                     button.getImage().setColor(!locked(node.node) ? Color.white : node.selectable ? Color.gray : Pal.gray);
-                    button.getImage().setScaling(Scaling.bounded);
+                    button.getImage().layout();
                 });
                 addChild(button);
             }
 
             if(mobile){
                 tapped(() -> {
-                    Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
+                    Element e = Core.scene.getHoverElement();
                     if(e == this){
                         hoverNode = null;
                         rebuild();
@@ -374,7 +515,7 @@ public class ResearchDialog extends BaseDialog{
         }
 
         boolean canSpend(TechNode node){
-            if(!selectable(node)) return false;
+            if(!selectable(node) || net.client()) return false;
 
             if(node.requirements.length == 0) return true;
 
@@ -390,6 +531,8 @@ public class ResearchDialog extends BaseDialog{
         }
 
         void spend(TechNode node){
+            if(net.client()) return;
+
             boolean complete = true;
 
             boolean[] shine = new boolean[node.requirements.length];
@@ -425,6 +568,7 @@ public class ResearchDialog extends BaseDialog{
             Core.scene.act();
             rebuild(shine);
             itemDisplay.rebuild(items, usedShine);
+            checkMargin();
         }
 
         void unlock(TechNode node){
@@ -479,97 +623,107 @@ public class ResearchDialog extends BaseDialog{
             infoTable.table(b -> {
                 b.margin(0).left().defaults().left();
 
-                if(selectable && (node.content.description != null || node.content.stats.toMap().size > 0)){
-                    b.button(Icon.info, Styles.cleari, () -> ui.content.show(node.content)).growY().width(50f);
+                if(selectable){
+                    b.button(Icon.info, Styles.flati, () -> ui.content.show(node.content)).growY().width(50f);
                 }
                 b.add().grow();
                 b.table(desc -> {
                     desc.left().defaults().left();
                     desc.add(selectable ? node.content.localizedName : "[accent]???");
                     desc.row();
-                    if(locked(node)){
+                    if(locked(node) || (debugShowRequirements && !net.client())){
 
-                        desc.table(t -> {
-                            t.left();
-                            if(selectable){
+                        if(net.client()){
+                            desc.add("@locked").color(Pal.remove);
+                        }else{
+                            desc.table(t -> {
+                                t.left();
+                                if(selectable){
 
-                                //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;
+                                    //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];
-                                    }
+                                        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];
+                                        }
 
-                                    Label label = t.add(Core.bundle.format("research.progress", Math.min((int)(used / sum * 100), 99))).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;
+                                        Label label = t.add(Core.bundle.format("research.progress", Math.min((int)(used / sum * 100), 99))).left().get();
 
                                         if(shiny){
                                             label.setColor(Pal.accent);
-                                            label.actions(Actions.color(targetColor, 0.75f, Interp.fade));
+                                            label.actions(Actions.color(Color.lightGray, 0.75f, Interp.fade));
                                         }else{
-                                            label.setColor(targetColor);
+                                            label.setColor(Color.lightGray);
                                         }
 
-                                    }).fillX().left();
+                                        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 && !debugShowRequirements) continue;
+                                        boolean shiny = shine != null && shine[i];
+
+                                        t.table(list -> {
+                                            int reqAmount = debugShowRequirements ? req.amount : req.amount - completed.amount;
+
+                                            list.left();
+                                            list.image(req.item.uiIcon).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.row();
+                                        for(Objective o : node.objectives){
+                                            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();
+                                        }
+                                    });
                                     t.row();
                                 }
-                            }else if(node.objectives.size > 0){
-                                t.table(r -> {
-                                    r.add("@complete").colspan(2).left();
-                                    r.row();
-                                    for(Objective o : node.objectives){
-                                        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();
-                                    }
-                                });
-                                t.row();
-                            }
-                        });
+                            });
+                        }
                     }else{
                         desc.add("@completed");
                     }
                 }).pad(9);
 
-                if(mobile && locked(node)){
+                if(mobile && locked(node) && !net.client()){
                     b.row();
-                    b.button("@research", Icon.ok, Styles.nodet, () -> spend(node))
-                    .disabled(i -> !canSpend(node)).growX().height(44f).colspan(3);
+                    b.button("@research", Icon.ok, new TextButtonStyle(){{
+                        disabled = Tex.button;
+                        font = Fonts.def;
+                        fontColor = Color.white;
+                        disabledFontColor = Color.gray;
+                        up = buttonOver;
+                        over = buttonDown;
+                    }}, () -> spend(node)).disabled(i -> !canSpend(node)).growX().height(44f).colspan(3);
                 }
             });
 
@@ -579,6 +733,10 @@ public class ResearchDialog extends BaseDialog{
             }
 
             addChild(infoTable);
+
+            checkMargin();
+            Core.app.post(() -> checkMargin());
+
             infoTable.pack();
             infoTable.act(Core.graphics.getDeltaTime());
         }
diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
index 44b54df434..f64cf14ca2 100644
--- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -1,6 +1,7 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
+import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
@@ -11,8 +12,10 @@ import arc.scene.ui.*;
 import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
+import arc.scene.utils.*;
+import arc.struct.*;
 import arc.util.*;
-import mindustry.*;
+import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -20,28 +23,42 @@ import mindustry.input.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 
+import java.util.regex.*;
+
 import static mindustry.Vars.*;
 
 public class SchematicsDialog extends BaseDialog{
+    private static final float tagh = 42f;
     private SchematicInfoDialog info = new SchematicInfoDialog();
     private Schematic firstSchematic;
     private String search = "";
     private TextField searchField;
+    private Runnable rebuildPane = () -> {}, rebuildTags = () -> {};
+    private Pattern ignoreSymbols = Pattern.compile("[`~!@#$%^&*()\\-_=+{}|;:'\",<.>/?]");
+    private Seq<String> tags, selectedTags = new Seq<>();
+    private boolean checkedTags;
 
     public SchematicsDialog(){
         super("@schematics");
-        Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> ((Texture)t).setWrap(TextureWrap.repeat);
+        Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> t.setWrap(TextureWrap.repeat);
+
+        tags = Core.settings.getJson("schematic-tags", Seq.class, String.class, Seq::new);
 
         shouldPause = true;
         addCloseButton();
         buttons.button("@schematic.import", Icon.download, this::showImport);
+        makeButtonOverlay();
         shown(this::setup);
         onResize(this::setup);
     }
 
     void setup(){
+        if(!checkedTags){
+            checkTags();
+            checkedTags = true;
+        }
+
         search = "";
-        Runnable[] rebuildPane = {null};
 
         cont.top();
         cont.clear();
@@ -51,19 +68,56 @@ public class SchematicsDialog extends BaseDialog{
             s.image(Icon.zoom);
             searchField = s.field(search, res -> {
                 search = res;
-                rebuildPane[0].run();
+                rebuildPane.run();
             }).growX().get();
+            searchField.setMessageText("@schematic.search");
+            searchField.clicked(KeyCode.mouseRight, () -> {
+                if(!search.isEmpty()){
+                    search = "";
+                    searchField.clearText();
+                    rebuildPane.run();
+                }
+            });
         }).fillX().padBottom(4);
 
         cont.row();
 
+        cont.table(in -> {
+            in.left();
+            in.add("@schematic.tags").padRight(4);
+
+            //tags (no scroll pane visible)
+            in.pane(Styles.noBarPane, t -> {
+                rebuildTags = () -> {
+                    t.clearChildren();
+                    t.left();
+
+                    t.defaults().pad(2).height(tagh);
+                    for(var tag : tags){
+                        t.button(tag, Styles.togglet, () -> {
+                            if(selectedTags.contains(tag)){
+                                selectedTags.remove(tag);
+                            }else{
+                                selectedTags.add(tag);
+                            }
+                            rebuildPane.run();
+                        }).checked(selectedTags.contains(tag)).with(c -> c.getLabel().setWrap(false));
+                    }
+                };
+                rebuildTags.run();
+            }).fillX().height(tagh).scrollY(false);
+
+            in.button(Icon.pencilSmall, this::showAllTags).size(tagh).pad(2).tooltip("@schematic.edittags");
+        }).height(tagh).fillX();
+
+        cont.row();
+
         cont.pane(t -> {
             t.top();
-            t.margin(20f);
 
             t.update(() -> {
                 if(Core.input.keyTap(Binding.chat) && Core.scene.getKeyboardFocus() == searchField && firstSchematic != null){
-                    if(!Vars.state.rules.schematicsAllowed){
+                    if(!state.rules.schematicsAllowed){
                         ui.showInfo("@schematic.disabled");
                     }else{
                         control.input.useSchematic(firstSchematic);
@@ -72,18 +126,20 @@ public class SchematicsDialog extends BaseDialog{
                 }
             });
 
-            rebuildPane[0] = () -> {
+            rebuildPane = () -> {
                 int cols = Math.max((int)(Core.graphics.getWidth() / Scl.scl(230)), 1);
 
                 t.clear();
                 int i = 0;
-                String regex = "[`~!@#$%^&*()-_=+{}|;:'\",<.>/?]";
-                String searchString = search.toLowerCase().replaceAll(regex, " ");
+                String searchString = ignoreSymbols.matcher(search.toLowerCase()).replaceAll("");
 
                 firstSchematic = null;
 
                 for(Schematic s : schematics.all()){
-                    if(!search.isEmpty() && !s.name().toLowerCase().replaceAll(regex, " ").contains(searchString)) continue;
+                    //make sure *tags* fit
+                    if(selectedTags.any() && !s.labels.containsAll(selectedTags)) continue;
+                    //make sure search fits
+                    if(!search.isEmpty() && !ignoreSymbols.matcher(s.name().toLowerCase()).replaceAll("").contains(searchString)) continue;
                     if(firstSchematic == null) firstSchematic = s;
 
                     Button[] sel = {null};
@@ -94,64 +150,26 @@ public class SchematicsDialog extends BaseDialog{
                             buttons.left();
                             buttons.defaults().size(50f);
 
-                            ImageButtonStyle style = Styles.clearPartiali;
+                            ImageButtonStyle style = Styles.emptyi;
 
-                            buttons.button(Icon.info, style, () -> {
-                                showInfo(s);
-                            });
-
-                            buttons.button(Icon.upload, style, () -> {
-                                showExport(s);
-                            });
-
-                            buttons.button(Icon.pencil, style, () -> {
-                                new Dialog("@schematic.rename"){{
-                                    cont.margin(30).add("@name").padRight(6f);
-                                    TextField nameField = cont.field(s.name(), null).size(400f, 55f).addInputDialog().get();
-
-                                    cont.row();
-
-                                    cont.margin(30).add("@editor.description").padRight(6f);
-                                    TextField descripionField = cont.area(s.description(), Styles.areaField, t -> {}).size(400f, 140f).addInputDialog().get();
-
-                                    Runnable accept = () -> {
-                                        s.tags.put("name", nameField.getText());
-                                        s.tags.put("description", descripionField.getText());
-                                        s.save();
-                                        hide();
-                                        rebuildPane[0].run();
-                                    };
-
-                                    buttons.defaults().size(120, 54).pad(4);
-                                    buttons.button("@ok", accept).disabled(b -> nameField.getText().isEmpty());
-                                    buttons.button("@cancel", this::hide);
-
-                                    keyDown(KeyCode.enter, () -> {
-                                        if(!nameField.getText().isEmpty() && Core.scene.getKeyboardFocus() != descripionField){
-                                            accept.run();
-                                        }
-                                    });
-                                    keyDown(KeyCode.escape, this::hide);
-                                    keyDown(KeyCode.back, this::hide);
-                                    show();
-                                }};
-                            });
+                            buttons.button(Icon.info, style, () -> showInfo(s)).tooltip("@info.title");
+                            buttons.button(Icon.upload, style, () -> showExport(s)).tooltip("@editor.export");
+                            buttons.button(Icon.pencil, style, () -> showEdit(s)).tooltip("@schematic.edit");
 
                             if(s.hasSteamID()){
-                                buttons.button(Icon.link, style, () -> platform.viewListing(s));
+                                buttons.button(Icon.link, style, () -> platform.viewListing(s)).tooltip("@view.workshop");
                             }else{
                                 buttons.button(Icon.trash, style, () -> {
                                     if(s.mod != null){
-                                        ui.showInfo(Core.bundle.format("mod.item.remove", s.mod.meta.displayName()));
+                                        ui.showInfo(Core.bundle.format("mod.item.remove", s.mod.meta.displayName));
                                     }else{
                                         ui.showConfirm("@confirm", "@schematic.delete.confirm", () -> {
                                             schematics.remove(s);
-                                            rebuildPane[0].run();
+                                            rebuildPane.run();
                                         });
                                     }
-                                });
+                                }).tooltip("@save.delete");
                             }
-
                         }).growX().height(50f);
                         b.row();
                         b.stack(new SchematicImage(s).setScaling(Scaling.fit), new Table(n -> {
@@ -167,14 +185,14 @@ public class SchematicsDialog extends BaseDialog{
                         if(state.isMenu()){
                             showInfo(s);
                         }else{
-                            if(!Vars.state.rules.schematicsAllowed){
+                            if(!state.rules.schematicsAllowed){
                                 ui.showInfo("@schematic.disabled");
                             }else{
                                 control.input.useSchematic(s);
                                 hide();
                             }
                         }
-                    }).pad(4).style(Styles.cleari).get();
+                    }).pad(4).style(Styles.flati).get();
 
                     sel[0].getStyle().up = Tex.pane;
 
@@ -184,12 +202,16 @@ public class SchematicsDialog extends BaseDialog{
                 }
 
                 if(firstSchematic == null){
-                    t.add("@none");
+                    if(!searchString.isEmpty() || selectedTags.any()){
+                        t.add("@none.found");
+                    }else{
+                        t.add("@none").color(Color.lightGray);
+                    }
                 }
             };
 
-            rebuildPane[0].run();
-        }).get().setScrollingDisabled(true, false);
+            rebuildPane.run();
+        }).grow().scrollX(false);
     }
 
     public void showInfo(Schematic schematic){
@@ -197,11 +219,11 @@ public class SchematicsDialog extends BaseDialog{
     }
 
     public void showImport(){
-        BaseDialog dialog = new BaseDialog("@editor.export");
+        BaseDialog dialog = new BaseDialog("@editor.import");
         dialog.cont.pane(p -> {
             p.margin(10f);
             p.table(Tex.button, t -> {
-                TextButtonStyle style = Styles.cleart;
+                TextButtonStyle style = Styles.flatt;
                 t.defaults().size(280f, 60f).left();
                 t.row();
                 t.button("@schematic.copy.import", Icon.copy, style, () -> {
@@ -212,6 +234,7 @@ public class SchematicsDialog extends BaseDialog{
                         schematics.add(s);
                         setup();
                         ui.showInfoFade("@schematic.saved");
+                        checkTags(s);
                         showInfo(s);
                     }catch(Throwable e){
                         ui.showException(e);
@@ -227,6 +250,7 @@ public class SchematicsDialog extends BaseDialog{
                         schematics.add(s);
                         setup();
                         showInfo(s);
+                        checkTags(s);
                     }catch(Exception e){
                         ui.showException(e);
                     }
@@ -248,9 +272,9 @@ public class SchematicsDialog extends BaseDialog{
     public void showExport(Schematic s){
         BaseDialog dialog = new BaseDialog("@editor.export");
         dialog.cont.pane(p -> {
-           p.margin(10f);
-           p.table(Tex.button, t -> {
-               TextButtonStyle style = Styles.cleart;
+            p.margin(10f);
+            p.table(Tex.button, t -> {
+                TextButtonStyle style = Styles.flatt;
                 t.defaults().size(280f, 60f).left();
                 if(steam && !s.hasSteamID()){
                     t.button("@schematic.shareworkshop", Icon.book, style,
@@ -275,18 +299,384 @@ public class SchematicsDialog extends BaseDialog{
         dialog.show();
     }
 
-    public void focusSearchField(){
-        if(searchField == null) return;
+    public void showEdit(Schematic s){
+        new BaseDialog("@schematic.edit"){{
+            setFillParent(true);
+            addCloseListener();
 
-        Core.scene.setKeyboardFocus(searchField);
+            cont.margin(30);
+
+            cont.add("@schematic.tags").padRight(6f);
+            cont.table(tags -> buildTags(s, tags, false)).maxWidth(400f).fillX().left().row();
+
+            cont.margin(30).add("@name").padRight(6f);
+            TextField nameField = cont.field(s.name(), null).size(400f, 55f).left().get();
+
+            cont.row();
+
+            cont.margin(30).add("@editor.description").padRight(6f);
+            TextField descField = cont.area(s.description(), Styles.areaField, t -> {}).size(400f, 140f).left().get();
+
+            Runnable accept = () -> {
+                s.tags.put("name", nameField.getText());
+                s.tags.put("description", descField.getText());
+                s.save();
+                hide();
+                rebuildPane.run();
+            };
+
+            buttons.defaults().size(210f, 64f).pad(4);
+            buttons.button("@ok", Icon.ok, accept).disabled(b -> nameField.getText().isEmpty());
+            buttons.button("@cancel", Icon.cancel, this::hide);
+
+            keyDown(KeyCode.enter, () -> {
+                if(!nameField.getText().isEmpty() && Core.scene.getKeyboardFocus() != descField){
+                    accept.run();
+                }
+            });
+        }}.show();
+    }
+
+    //adds all new tags to the global list of tags
+    //alternatively, unknown tags could be discarded on import?
+    void checkTags(){
+        ObjectSet<String> encountered = new ObjectSet<>();
+        encountered.addAll(tags);
+        for(Schematic s : schematics.all()){
+            for(var tag : s.labels){
+                if(encountered.add(tag)){
+                    tags.add(tag);
+                }
+            }
+        }
+    }
+
+    //adds any new tags found to the global tag list
+    //TODO remove tags from it instead?
+    void checkTags(Schematic s){
+        boolean any = false;
+        for(var tag : s.labels){
+            if(!tags.contains(tag)){
+                tags.add(tag);
+                any = true;
+            }
+        }
+        if(any){
+            rebuildTags.run();
+        }
+    }
+
+    void tagsChanged(){
+        rebuildTags.run();
+        if(selectedTags.any()){
+            rebuildPane.run();
+        }
+
+        Core.settings.putJson("schematic-tags", String.class, tags);
+    }
+
+    void addTag(Schematic s, String tag){
+        s.labels.add(tag);
+        s.save();
+        tagsChanged();
+    }
+
+    void removeTag(Schematic s, String tag){
+        s.labels.remove(tag);
+        s.save();
+        tagsChanged();
+    }
+
+    //shows a dialog for creating a new tag
+    void showNewTag(Cons<String> result){
+        ui.showTextInput("@schematic.addtag", "", "", out -> {
+            if(tags.contains(out)){
+                ui.showInfo("@schematic.tagexists");
+            }else{
+                tags.add(out);
+                tagsChanged();
+                result.get(out);
+            }
+        });
+    }
+
+    void showNewIconTag(Cons<String> cons){
+        new Dialog(){{
+            closeOnBack();
+            setFillParent(true);
+
+            //TODO: use IconSelectDialog
+            cont.pane(t -> {
+                resized(true, () -> {
+                    t.clearChildren();
+                    t.marginRight(19f).marginLeft(12f);
+                    t.defaults().size(48f);
+
+                    int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
+
+                    int i = 0;
+                    for(String icon : accessibleIcons){
+                        String out = (char)Iconc.codes.get(icon) + "";
+                        if(tags.contains(out)) continue;
+
+                        t.button(Icon.icons.get(icon), Styles.flati, iconMed, () -> {
+                            tags.add(out);
+                            tagsChanged();
+                            cons.get(out);
+                            hide();
+                        });
+
+                        if(++i % cols == 0) t.row();
+                    }
+
+                    for(ContentType ctype : defaultContentIcons){
+                        var all = content.getBy(ctype).<UnlockableContent>as().select(u -> !u.isHidden() && u.unlockedNow() && u.hasEmoji());
+
+                        t.row();
+                        if(all.count(u -> !tags.contains(u.emoji())) > 0) t.image().colspan(cols).growX().width(Float.NEGATIVE_INFINITY).height(3f).color(Pal.accent);
+                        t.row();
+
+                        i = 0;
+                        for(UnlockableContent u : all){
+                            if(tags.contains(u.emoji())) continue;
+                            t.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> {
+                                String out = u.emoji() + "";
+
+                                tags.add(out);
+                                tagsChanged();
+                                cons.get(out);
+
+                                hide();
+                            }).tooltip(u.localizedName);
+
+                            if(++i % cols == 0) t.row();
+                        }
+                    }
+                });
+            }).scrollX(false);
+            buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
+        }}.show();
+    }
+
+    void showAllTags(){
+        var dialog = new BaseDialog("@schematic.edittags");
+        dialog.addCloseButton();
+        Runnable[] rebuild = {null};
+        dialog.cont.pane(p -> {
+            rebuild[0] = () -> {
+                p.clearChildren();
+                p.margin(12f).defaults().fillX().left();
+
+                float sum = 0f;
+                Table current = new Table().left();
+
+                for(var tag : tags){
+                    float si = 40f;
+
+                    var next = new Table(Tex.whiteui, n -> {
+                        n.setColor(Pal.gray);
+                        n.margin(5f);
+
+                        n.table(move -> {
+
+                            //move up
+                            move.button(Icon.upOpen, Styles.emptyi, () -> {
+                                int idx = tags.indexOf(tag);
+                                if(idx > 0){
+                                    tags.swap(idx, idx - 1);
+                                    tagsChanged();
+                                    rebuild[0].run();
+                                }
+                            }).size(si).tooltip("@editor.moveup").row();
+                            //move down
+                            move.button(Icon.downOpen, Styles.emptyi, () -> {
+                                int idx = tags.indexOf(tag);
+                                if(idx < tags.size - 1){
+                                    tags.swap(idx, idx + 1);
+                                    tagsChanged();
+                                    rebuild[0].run();
+                                }
+                            }).size(si).tooltip("@editor.movedown");
+                        }).fillY();
+
+                        n.table(t -> {
+                            t.add(tag).left().row();
+                            t.add(Core.bundle.format("schematic.tagged", schematics.all().count(s -> s.labels.contains(tag)))).left()
+                            .update(b -> b.setColor(b.hasMouse() ? Pal.accent : Color.lightGray)).get().clicked(() -> {
+                                dialog.hide();
+                                selectedTags.clear().add(tag);
+                                rebuildTags.run();
+                                rebuildPane.run();
+                            });
+                        }).growX().fillY();
+
+                        n.table(b -> {
+                            b.margin(2);
+
+                            //rename tag
+                            b.button(Icon.pencil, Styles.emptyi, () -> {
+                                ui.showTextInput("@schematic.renametag", "@name", tag, result -> {
+                                    //same tag, nothing was renamed
+                                    if(result.equals(tag)) return;
+
+                                    if(tags.contains(result)){
+                                        ui.showInfo("@schematic.tagexists");
+                                    }else{
+                                        for(Schematic s : schematics.all()){
+                                            if(s.labels.any()){
+                                                s.labels.replace(tag, result);
+                                                s.save();
+                                            }
+                                        }
+                                        selectedTags.replace(tag, result);
+                                        tags.replace(tag, result);
+                                        tagsChanged();
+                                        rebuild[0].run();
+                                    }
+                                });
+                            }).size(si).tooltip("@schematic.renametag").row();
+                            //delete tag
+                            b.button(Icon.trash, Styles.emptyi, () -> {
+                                ui.showConfirm("@schematic.tagdelconfirm", () -> {
+                                    for(Schematic s : schematics.all()){
+                                        if(s.labels.any()){
+                                            s.labels.remove(tag);
+                                            s.save();
+                                        }
+                                    }
+                                    selectedTags.remove(tag);
+                                    tags.remove(tag);
+                                    tagsChanged();
+                                    rebuildPane.run();
+                                    rebuild[0].run();
+                                });
+                            }).size(si).tooltip("@save.delete");
+                        }).fillY();
+                    });
+
+                    next.pack();
+                    float w = next.getWidth() + Scl.scl(9f);
+
+                    if(w + sum >= Core.graphics.getWidth() * 0.9f){
+                        p.add(current).row();
+                        current = new Table();
+                        current.left();
+                        sum = 0;
+                    }
+
+                    current.add(next).minWidth(210).pad(4);
+
+                    sum += w;
+                }
+
+                if(sum > 0){
+                    p.add(current).row();
+                }
+
+                p.table(t -> {
+                    t.left().defaults().fillX().height(tagh).pad(2);
+
+                    t.button("@schematic.texttag", Icon.add, () -> showNewTag(res -> rebuild[0].run())).wrapLabel(false).get().getLabelCell().padLeft(5);
+                    t.button("@schematic.icontag", Icon.add, () -> showNewIconTag(res -> rebuild[0].run())).wrapLabel(false).get().getLabelCell().padLeft(5);
+                });
+
+            };
+
+            resized(true, rebuild[0]);
+        }).scrollX(false);
+        dialog.show();
+    }
+
+    void buildTags(Schematic schem, Table t){
+        buildTags(schem, t, true);
+    }
+
+    void buildTags(Schematic schem, Table t, boolean name){
+        t.clearChildren();
+        t.left();
+
+        //sort by order in the main target array. the complexity of this is probably awful
+        schem.labels.sort(s -> tags.indexOf(s));
+
+        if(name) t.add("@schematic.tags").padRight(4);
+        t.pane(s -> {
+            s.left();
+            s.defaults().pad(3).height(tagh);
+            for(var tag : schem.labels){
+                s.table(Tex.button, i -> {
+                    i.add(tag).padRight(4).height(tagh).labelAlign(Align.center);
+                    i.button(Icon.cancelSmall, Styles.emptyi, () -> {
+                        removeTag(schem, tag);
+                        buildTags(schem, t, name);
+                    }).size(tagh).padRight(-9f).padLeft(-9f);
+                });
+            }
+
+        }).fillX().left().height(tagh).scrollY(false);
+
+        t.button(Icon.addSmall, () -> {
+            var dialog = new BaseDialog("@schematic.addtag");
+            dialog.addCloseButton();
+            dialog.cont.pane(p -> resized(true, () -> {
+                p.clearChildren();
+                p.defaults().fillX().left();
+
+                float sum = 0f;
+                Table current = new Table().left();
+                for(var tag : tags){
+                    if(schem.labels.contains(tag)) continue;
+
+                    var next = Elem.newButton(tag, () -> {
+                        addTag(schem, tag);
+                        buildTags(schem, t, name);
+                        dialog.hide();
+                    });
+                    next.getLabel().setWrap(false);
+
+                    next.pack();
+                    float w = next.getPrefWidth() + Scl.scl(6f);
+
+                    if(w + sum >= Core.graphics.getWidth() * (Core.graphics.isPortrait() ? 1f : 0.8f)){
+                        p.add(current).row();
+                        current = new Table();
+                        current.left();
+                        current.add(next).height(tagh).pad(2);
+                        sum = 0;
+                    }else{
+                        current.add(next).height(tagh).pad(2);
+                    }
+
+                    sum += w;
+                }
+
+                if(sum > 0){
+                    p.add(current).row();
+                }
+
+                Cons<String> handleTag = res -> {
+                    dialog.hide();
+                    addTag(schem, res);
+                    buildTags(schem, t, name);
+                };
+
+                p.row();
+
+                p.table(v -> {
+                    v.left().defaults().fillX().height(tagh).pad(2);
+                    v.button("@schematic.texttag", Icon.add, () -> showNewTag(handleTag)).wrapLabel(false).get().getLabelCell().padLeft(4);
+                    v.button("@schematic.icontag", Icon.add, () -> showNewIconTag(handleTag)).wrapLabel(false).get().getLabelCell().padLeft(4);
+                });
+            }));
+            dialog.show();
+        }).size(tagh).tooltip("@schematic.addtag");
     }
 
     @Override
     public Dialog show(){
         super.show();
 
-        if(Core.app.isDesktop()){
-            focusSearchField();
+        if(Core.app.isDesktop() && searchField != null){
+            Core.scene.setKeyboardFocus(searchField);
         }
 
         return this;
@@ -298,6 +688,7 @@ public class SchematicsDialog extends BaseDialog{
         public Color borderColor = Pal.gray;
 
         private Schematic schematic;
+        private Texture lastTexture;
         boolean set;
 
         public SchematicImage(Schematic s){
@@ -320,6 +711,8 @@ public class SchematicsDialog extends BaseDialog{
             if(!set){
                 Core.app.post(this::setPreview);
                 set = true;
+            }else if(lastTexture != null && lastTexture.isDisposed()){
+                set = wasSet = false;
             }
 
             Texture background = Core.assets.get("sprites/schematic-background.png", Texture.class);
@@ -346,37 +739,36 @@ public class SchematicsDialog extends BaseDialog{
         }
 
         private void setPreview(){
-            TextureRegionDrawable draw = new TextureRegionDrawable(new TextureRegion(schematics.getPreview(schematic)));
+            TextureRegionDrawable draw = new TextureRegionDrawable(new TextureRegion(lastTexture = schematics.getPreview(schematic)));
             setDrawable(draw);
             setScaling(Scaling.fit);
         }
     }
 
-    public static class SchematicInfoDialog extends BaseDialog{
+    public class SchematicInfoDialog extends BaseDialog{
 
         SchematicInfoDialog(){
             super("");
             setFillParent(true);
-            addCloseButton();
+            addCloseListener();
         }
 
         public void show(Schematic schem){
             cont.clear();
             title.setText("[[" + Core.bundle.get("schematic") + "] " +schem.name());
 
-            cont.add(Core.bundle.format("schematic.info", schem.width, schem.height, schem.tiles.size)).color(Color.lightGray);
-            cont.row();
-            cont.add(new SchematicImage(schem)).maxSize(800f);
-            cont.row();
+            cont.add(Core.bundle.format("schematic.info", schem.width, schem.height, schem.tiles.size)).color(Color.lightGray).row();
+            cont.table(tags -> buildTags(schem, tags)).fillX().left().row();
+            cont.add(new SchematicImage(schem)).maxSize(800f).row();
 
             ItemSeq arr = schem.requirements();
             cont.table(r -> {
                 int i = 0;
                 for(ItemStack s : arr){
-                    r.image(s.item.icon(Cicon.small)).left();
+                    r.image(s.item.uiIcon).left().size(iconMed);
                     r.label(() -> {
                         Building core = player.core();
-                        if(core == null || state.rules.infiniteResources || core.items.has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
+                        if(core == null || state.isMenu() || state.rules.infiniteResources || core.items.has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
                         return (core.items.has(s.item, s.amount) ? "[lightgray]" : "[scarlet]") + Math.min(core.items.get(s.item), s.amount) + "[lightgray]/" + s.amount;
                     }).padLeft(2).left().padRight(4);
 
@@ -406,7 +798,13 @@ public class SchematicsDialog extends BaseDialog{
                 });
             }
 
+            buttons.clearChildren();
+            buttons.defaults().size(Core.graphics.isPortrait() ? 150f : 210f, 64f);
+            buttons.button("@back", Icon.left, this::hide);
+            buttons.button("@editor.export", Icon.upload, () -> showExport(schem));
+            buttons.button("@edit", Icon.edit, () -> showEdit(schem));
+
             show();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index 94465167bf..9b2cc277ed 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -2,11 +2,13 @@ package mindustry.ui.dialogs;
 
 import arc.*;
 import arc.files.*;
+import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.input.*;
 import arc.scene.*;
 import arc.scene.event.*;
+import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
@@ -15,7 +17,6 @@ import arc.util.*;
 import arc.util.io.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
-import mindustry.core.GameState.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.game.EventType.*;
@@ -28,42 +29,37 @@ import java.io.*;
 import java.util.zip.*;
 
 import static arc.Core.*;
-import static mindustry.Vars.net;
 import static mindustry.Vars.*;
 
-public class SettingsMenuDialog extends SettingsDialog{
+public class SettingsMenuDialog extends BaseDialog{
     public SettingsTable graphics;
     public SettingsTable game;
     public SettingsTable sound;
+    public SettingsTable main;
 
     private Table prefs;
     private Table menu;
     private BaseDialog dataDialog;
-    private boolean wasPaused;
+    private Seq<SettingsCategory> categories = new Seq<>();
 
     public SettingsMenuDialog(){
-        hidden(() -> {
-            Sounds.back.play();
-            if(state.isGame()){
-                if(!wasPaused || net.active())
-                    state.set(State.playing);
-            }
-        });
+        super(bundle.get("settings", "Settings"));
+        addCloseButton();
+
+        cont.add(main = new SettingsTable());
+        shouldPause = true;
 
         shown(() -> {
             back();
-            if(state.isGame()){
-                wasPaused = state.is(State.paused);
-                state.set(State.paused);
-            }
-
             rebuildMenu();
         });
 
-        setFillParent(true);
-        title.setAlignment(Align.center);
-        titleTable.row();
-        titleTable.add(new Image()).growX().height(3f).pad(4f).get().setColor(Pal.accent);
+        onResize(() -> {
+            graphics.rebuild();
+            sound.rebuild();
+            game.rebuild();
+            updateScrollFocus();
+        });
 
         cont.clearChildren();
         cont.remove();
@@ -89,7 +85,7 @@ public class SettingsMenuDialog extends SettingsDialog{
 
         dataDialog.cont.table(Tex.button, t -> {
             t.defaults().size(280f, 60f).left();
-            TextButtonStyle style = Styles.cleart;
+            TextButtonStyle style = Styles.flatt;
 
             t.button("@settings.cleardata", Icon.trash, style, () -> ui.showConfirm("@confirm", "@settings.clearall.confirm", () -> {
                 ObjectMap<String, Object> map = new ObjectMap<>();
@@ -146,7 +142,7 @@ public class SettingsMenuDialog extends SettingsDialog{
                             }
                         }
                     }
-                    
+
                     for(var slot : control.saves.getSaveSlots().copy()){
                         if(slot.isSector()){
                             slot.delete();
@@ -184,6 +180,8 @@ public class SettingsMenuDialog extends SettingsDialog{
             t.button("@data.import", Icon.download, style, () -> ui.showConfirm("@confirm", "@data.import.confirm", () -> platform.showFileChooser(true, "zip", file -> {
                 try{
                     importData(file);
+                    control.saves.resetSave();
+                    state = new GameState();
                     Core.app.exit();
                 }catch(IllegalArgumentException e){
                     ui.showErrorMessage("@data.invalid");
@@ -214,37 +212,20 @@ public class SettingsMenuDialog extends SettingsDialog{
                         platform.shareFile(logs);
                     }else{
                         platform.showFileChooser(false, "txt", file -> {
-                            file.writeString(getLogs());
-                            app.post(() -> ui.showInfo("@crash.exported"));
+                            try{
+                                file.writeBytes(getLogs().getBytes(Strings.utf8));
+                                app.post(() -> ui.showInfo("@crash.exported"));
+                            }catch(Throwable e){
+                                ui.showException(e);
+                            }
                         });
                     }
                 }
             }).marginLeft(4);
         });
 
-        ScrollPane pane = new ScrollPane(prefs);
-        pane.addCaptureListener(new InputListener(){
-            @Override
-            public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
-                Element actor = pane.hit(x, y, true);
-                if(actor instanceof Slider){
-                    pane.setFlickScroll(false);
-                    return true;
-                }
-
-                return super.touchDown(event, x, y, pointer, button);
-            }
-
-            @Override
-            public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
-                pane.setFlickScroll(true);
-                super.touchUp(event, x, y, pointer, button);
-            }
-        });
-        pane.setFadeScrollBars(false);
-
         row();
-        add(pane).grow().top();
+        pane(prefs).grow().top();
         row();
         add(buttons).fillX();
 
@@ -266,39 +247,76 @@ public class SettingsMenuDialog extends SettingsDialog{
         return out.toString();
     }
 
+    /** Adds a custom settings category, with the icon being the specified region. */
+    public void addCategory(String name, @Nullable String region, Cons<SettingsTable> builder){
+        categories.add(new SettingsCategory(name, region == null ? null : new TextureRegionDrawable(atlas.find(region)), builder));
+    }
+
+    /** Adds a custom settings category, for use in mods. The specified consumer should add all relevant mod settings to the table. */
+    public void addCategory(String name, @Nullable Drawable icon, Cons<SettingsTable> builder){
+        categories.add(new SettingsCategory(name, icon, builder));
+    }
+
+    /** Adds a custom settings category, for use in mods. The specified consumer should add all relevant mod settings to the table. */
+    public void addCategory(String name, Cons<SettingsTable> builder){
+        addCategory(name, (Drawable)null, builder);
+    }
+
+    public Seq<SettingsCategory> getCategories(){
+        return categories;
+    }
+
     void rebuildMenu(){
         menu.clearChildren();
 
-        TextButtonStyle style = Styles.cleart;
+        TextButtonStyle style = Styles.flatt;
+
+        float marg = 8f, isize = iconMed;
 
         menu.defaults().size(300f, 60f);
-        menu.button("@settings.game", style, () -> visible(0));
-        menu.row();
-        menu.button("@settings.graphics", style, () -> visible(1));
-        menu.row();
-        menu.button("@settings.sound", style, () -> visible(2));
-        menu.row();
-        menu.button("@settings.language", style, ui.language::show);
+        menu.button("@settings.game", Icon.settings, style, isize, () -> visible(0)).marginLeft(marg).row();
+        menu.button("@settings.graphics", Icon.image, style, isize, () -> visible(1)).marginLeft(marg).row();
+        menu.button("@settings.sound", Icon.filters, style, isize, () -> visible(2)).marginLeft(marg).row();
+        menu.button("@settings.language", Icon.chat, style, isize, ui.language::show).marginLeft(marg).row();
         if(!mobile || Core.settings.getBool("keyboard")){
-            menu.row();
-            menu.button("@settings.controls", style, ui.controls::show);
+            menu.button("@settings.controls", Icon.move, style, isize, ui.controls::show).marginLeft(marg).row();
         }
 
-        menu.row();
-        menu.button("@settings.data", style, () -> dataDialog.show());
+        menu.button("@settings.data", Icon.save, style, isize, () -> dataDialog.show()).marginLeft(marg).row();
+
+        int i = 3;
+        for(var cat : categories){
+            int index = i;
+            if(cat.icon == null){
+                menu.button(cat.name, style, () -> visible(index)).marginLeft(marg).row();
+            }else{
+                menu.button(cat.name, cat.icon, style, isize, () -> visible(index)).with(b -> ((Image)b.getChildren().get(1)).setScaling(Scaling.fit)).marginLeft(marg).row();
+            }
+            i++;
+        }
     }
 
     void addSettings(){
-        sound.sliderPref("musicvol", bundle.get("setting.musicvol.name", "Music Volume"), 100, 0, 100, 1, i -> i + "%");
-        sound.sliderPref("sfxvol", bundle.get("setting.sfxvol.name", "SFX Volume"), 100, 0, 100, 1, i -> i + "%");
-        sound.sliderPref("ambientvol", bundle.get("setting.ambientvol.name", "Ambient Volume"), 100, 0, 100, 1, i -> i + "%");
+        sound.checkPref("alwaysmusic", false);
+        sound.sliderPref("musicvol", 100, 0, 100, 1, i -> i + "%");
+        sound.sliderPref("sfxvol", 100, 0, 100, 1, i -> i + "%");
+        sound.sliderPref("ambientvol", 100, 0, 100, 1, i -> i + "%");
+
+        game.sliderPref("saveinterval", 60, 10, 5 * 120, 10, i -> Core.bundle.format("setting.seconds", i));
 
-        game.screenshakePref();
         if(mobile){
             game.checkPref("autotarget", true);
-            game.checkPref("keyboard", false, val -> control.setInput(val ? new DesktopInput() : new MobileInput()));
-            if(Core.settings.getBool("keyboard")){
-                control.setInput(new DesktopInput());
+            if(!ios){
+                game.checkPref("keyboard", false, val -> {
+                    control.setInput(val ? new DesktopInput() : new MobileInput());
+                    input.setUseKeyboard(val);
+                });
+                if(Core.settings.getBool("keyboard")){
+                    control.setInput(new DesktopInput());
+                    input.setUseKeyboard(true);
+                }
+            }else{
+                Core.settings.put("keyboard", false);
             }
         }
         //the issue with touchscreen support on desktop is that:
@@ -310,20 +328,35 @@ public class SettingsMenuDialog extends SettingsDialog{
                 control.setInput(new MobileInput());
             }
         }*/
-        game.sliderPref("saveinterval", 60, 10, 5 * 120, 10, i -> Core.bundle.format("setting.seconds", i));
 
         if(!mobile){
             game.checkPref("crashreport", true);
         }
 
+        game.checkPref("communityservers", true, val -> {
+            defaultServers.clear();
+            if(val){
+                JoinDialog.fetchServers();
+            }
+        });
+
         game.checkPref("savecreate", true);
         game.checkPref("blockreplace", true);
         game.checkPref("conveyorpathfinding", true);
         game.checkPref("hints", true);
+        game.checkPref("logichints", true);
 
         if(!mobile){
             game.checkPref("backgroundpause", true);
             game.checkPref("buildautopause", false);
+            game.checkPref("distinctcontrolgroups", true);
+        }
+
+        game.checkPref("doubletapmine", false);
+        game.checkPref("commandmodehold", true);
+
+        if(!ios){
+            game.checkPref("modcrashdisable", true);
         }
 
         if(steam){
@@ -333,19 +366,30 @@ public class SettingsMenuDialog extends SettingsDialog{
             });
 
             if(!Version.modifier.contains("beta")){
-                game.checkPref("publichost", false, i -> {
+                game.checkPref("steampublichost", false, i -> {
                     platform.updateLobby();
                 });
             }
         }
 
-        graphics.sliderPref("uiscale", 100, 25, 300, 25, s -> {
-            if(ui.settings != null){
-                Core.settings.put("uiscalechanged", true);
-            }
+        if(!mobile){
+            game.checkPref("console", false);
+        }
+
+        int[] lastUiScale = {settings.getInt("uiscale", 100)};
+
+        graphics.sliderPref("uiscale", 100, 25, 300, 5, s -> {
+            //if the user changed their UI scale, but then put it back, don't consider it 'changed'
+            Core.settings.put("uiscalechanged", s != lastUiScale[0]);
             return s + "%";
         });
-        graphics.sliderPref("fpscap", 240, 15, 245, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
+
+        graphics.sliderPref("screenshake", 4, 0, 8, i -> (i / 4f) + "x");
+
+        graphics.sliderPref("bloomintensity", 6, 0, 16, i -> (int)(i/4f * 100f) + "%");
+        graphics.sliderPref("bloomblur", 2, 1, 16, i -> i + "x");
+
+        graphics.sliderPref("fpscap", 240, 10, 245, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
         graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%");
         graphics.sliderPref("lasersopacity", 100, 0, 100, 5, s -> {
             if(ui.settings != null){
@@ -353,27 +397,42 @@ public class SettingsMenuDialog extends SettingsDialog{
             }
             return s + "%";
         });
+        graphics.sliderPref("unitlaseropacity", 100, 0, 100, 5, s -> s + "%");
         graphics.sliderPref("bridgeopacity", 100, 0, 100, 5, s -> s + "%");
 
         if(!mobile){
             graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b));
             graphics.checkPref("fullscreen", false, b -> {
+                if(b && settings.getBool("borderlesswindow")){
+                    Core.graphics.setWindowedMode(Core.graphics.getWidth(), Core.graphics.getHeight());
+                    settings.put("borderlesswindow", false);
+                    graphics.rebuild();
+                }
+
                 if(b){
-                    Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode());
+                    Core.graphics.setFullscreen();
                 }else{
                     Core.graphics.setWindowedMode(Core.graphics.getWidth(), Core.graphics.getHeight());
                 }
             });
 
-            graphics.checkPref("borderlesswindow", false, b -> Core.graphics.setUndecorated(b));
+            graphics.checkPref("borderlesswindow", false, b -> {
+                if(b && settings.getBool("fullscreen")){
+                    Core.graphics.setWindowedMode(Core.graphics.getWidth(), Core.graphics.getHeight());
+                    settings.put("fullscreen", false);
+                    graphics.rebuild();
+                }
+                Core.graphics.setBorderless(b);
+            });
 
             Core.graphics.setVSync(Core.settings.getBool("vsync"));
+
             if(Core.settings.getBool("fullscreen")){
-                Core.app.post(() -> Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode()));
+                Core.app.post(() -> Core.graphics.setFullscreen());
             }
 
             if(Core.settings.getBool("borderlesswindow")){
-                Core.app.post(() -> Core.graphics.setUndecorated(true));
+                Core.app.post(() -> Core.graphics.setBorderless(true));
             }
         }else if(!ios){
             graphics.checkPref("landscape", false, b -> {
@@ -391,6 +450,7 @@ public class SettingsMenuDialog extends SettingsDialog{
 
         graphics.checkPref("effects", true);
         graphics.checkPref("atmosphere", !mobile);
+        graphics.checkPref("drawlight", true);
         graphics.checkPref("destroyedblocks", true);
         graphics.checkPref("blockstatus", false);
         graphics.checkPref("playerchat", true);
@@ -400,20 +460,20 @@ public class SettingsMenuDialog extends SettingsDialog{
         graphics.checkPref("minimap", !mobile);
         graphics.checkPref("smoothcamera", true);
         graphics.checkPref("position", false);
+        if(!mobile){
+            graphics.checkPref("mouseposition", false);
+        }
         graphics.checkPref("fps", false);
         graphics.checkPref("playerindicators", true);
         graphics.checkPref("indicators", true);
         graphics.checkPref("showweather", true);
         graphics.checkPref("animatedwater", true);
+
         if(Shaders.shield != null){
             graphics.checkPref("animatedshields", !mobile);
         }
 
-        if(!ios){
-            graphics.checkPref("bloom", true, val -> renderer.toggleBloom(val));
-        }else{
-            Core.settings.put("bloom", false);
-        }
+        graphics.checkPref("bloom", true, val -> renderer.toggleBloom(val));
 
         graphics.checkPref("pixelate", false, val -> {
             if(val){
@@ -421,12 +481,17 @@ public class SettingsMenuDialog extends SettingsDialog{
             }
         });
 
-        graphics.checkPref("linear", !mobile, b -> {
-            for(Texture tex : Core.atlas.getTextures()){
-                TextureFilter filter = b ? TextureFilter.linear : TextureFilter.nearest;
-                tex.setFilter(filter, filter);
-            }
-        });
+        //iOS (and possibly Android) devices do not support linear filtering well, so disable it
+        if(!ios){
+            graphics.checkPref("linear", !mobile, b -> {
+                for(Texture tex : Core.atlas.getTextures()){
+                    TextureFilter filter = b ? TextureFilter.linear : TextureFilter.nearest;
+                    tex.setFilter(filter, filter);
+                }
+            });
+        }else{
+            settings.put("linear", false);
+        }
 
         if(Core.settings.getBool("linear")){
             for(Texture tex : Core.atlas.getTextures()){
@@ -435,11 +500,16 @@ public class SettingsMenuDialog extends SettingsDialog{
             }
         }
 
+        graphics.checkPref("skipcoreanimation", false);
+        graphics.checkPref("hidedisplays", false);
+
+        if(OS.isMac){
+            graphics.checkPref("macnotch", false);
+        }
+
         if(!mobile){
             Core.settings.put("swapdiagonal", false);
         }
-
-        graphics.checkPref("flow", true);
     }
 
     public void exportData(Fi file) throws IOException{
@@ -447,16 +517,30 @@ public class SettingsMenuDialog extends SettingsDialog{
         files.add(Core.settings.getSettingsFile());
         files.addAll(customMapDirectory.list());
         files.addAll(saveDirectory.list());
-        files.addAll(screenshotDirectory.list());
         files.addAll(modDirectory.list());
         files.addAll(schematicDirectory.list());
         String base = Core.settings.getDataDirectory().path();
 
+        //add directories
+        for(Fi other : files.copy()){
+            Fi parent = other.parent();
+            while(!files.contains(parent) && !parent.equals(settings.getDataDirectory())){
+                files.add(parent);
+            }
+        }
+
         try(OutputStream fos = file.write(false, 2048); ZipOutputStream zos = new ZipOutputStream(fos)){
             for(Fi add : files){
-                if(add.isDirectory()) continue;
-                zos.putNextEntry(new ZipEntry(add.path().substring(base.length())));
-                Streams.copy(add.read(), zos);
+                String path = add.path().substring(base.length());
+                if(add.isDirectory()) path += "/";
+                //fix trailing / in path
+                path = path.startsWith("/") ? path.substring(1) : path;
+                zos.putNextEntry(new ZipEntry(path));
+                if(!add.isDirectory()){
+                    try(var stream = add.read()){
+                        Streams.copy(stream, zos);
+                    }
+                }
                 zos.closeEntry();
             }
         }
@@ -495,18 +579,25 @@ public class SettingsMenuDialog extends SettingsDialog{
 
     private void visible(int index){
         prefs.clearChildren();
-        prefs.add(new Table[]{game, graphics, sound}[index]);
+
+        Seq<Table> tables = new Seq<>();
+        tables.addAll(game, graphics, sound);
+        for(var custom : categories){
+            tables.add(custom.table);
+        }
+
+        prefs.add(tables.get(index));
     }
 
     @Override
     public void addCloseButton(){
-        buttons.button("@back", Icon.leftOpen, () -> {
+        buttons.button("@back", Icon.left, () -> {
             if(prefs.getChildren().first() != menu){
                 back();
             }else{
                 hide();
             }
-        }).size(230f, 64f);
+        }).size(210f, 64f);
 
         keyDown(key -> {
             if(key == KeyCode.escape || key == KeyCode.back){
@@ -518,4 +609,250 @@ public class SettingsMenuDialog extends SettingsDialog{
             }
         });
     }
+
+    public interface StringProcessor{
+        String get(int i);
+    }
+
+    public static class SettingsCategory{
+        public String name;
+        public @Nullable Drawable icon;
+        public Cons<SettingsTable> builder;
+        public SettingsTable table;
+
+        public SettingsCategory(String name, Drawable icon, Cons<SettingsTable> builder){
+            this.name = name;
+            this.icon = icon;
+            this.builder = builder;
+
+            table = new SettingsTable();
+            builder.get(table);
+        }
+    }
+
+    public static class SettingsTable extends Table{
+        protected Seq<Setting> list = new Seq<>();
+
+        public SettingsTable(){
+            left();
+        }
+
+        public Seq<Setting> getSettings(){
+            return list;
+        }
+
+        public void pref(Setting setting){
+            list.add(setting);
+            rebuild();
+        }
+
+        public SliderSetting sliderPref(String name, int def, int min, int max, StringProcessor s){
+            return sliderPref(name, def, min, max, 1, s);
+        }
+
+        public SliderSetting sliderPref(String name, int def, int min, int max, int step, StringProcessor s){
+            SliderSetting res;
+            list.add(res = new SliderSetting(name, def, min, max, step, s));
+            settings.defaults(name, def);
+            rebuild();
+            return res;
+        }
+
+        public void checkPref(String name, boolean def){
+            list.add(new CheckSetting(name, def, null));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void checkPref(String name, boolean def, Boolc changed){
+            list.add(new CheckSetting(name, def, changed));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void textPref(String name, String def){
+            list.add(new TextSetting(name, def, null));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void textPref(String name, String def, Cons<String> changed){
+            list.add(new TextSetting(name, def, changed));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void areaTextPref(String name, String def){
+            list.add(new AreaTextSetting(name, def, null));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void areaTextPref(String name, String def, Cons<String> changed){
+            list.add(new AreaTextSetting(name, def, changed));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void rebuild(){
+            clearChildren();
+
+            for(Setting setting : list){
+                setting.add(this);
+            }
+
+            button(bundle.get("settings.reset", "Reset to Defaults"), () -> {
+                for(Setting setting : list){
+                    if(setting.name == null || setting.title == null) continue;
+                    settings.remove(setting.name);
+                }
+                rebuild();
+            }).margin(14).width(240f).pad(6);
+        }
+
+        public abstract static class Setting{
+            public String name;
+            public String title;
+            public @Nullable String description;
+
+            public Setting(String name){
+                this.name = name;
+                String winkey = "setting." + name + ".name.windows";
+                title = OS.isWindows && bundle.has(winkey) ? bundle.get(winkey) : bundle.get("setting." + name + ".name", name);
+                description = bundle.getOrNull("setting." + name + ".description");
+            }
+
+            public abstract void add(SettingsTable table);
+
+            public void addDesc(Element elem){
+                ui.addDescTooltip(elem, description);
+            }
+        }
+
+        public static class CheckSetting extends Setting{
+            boolean def;
+            Boolc changed;
+
+            public CheckSetting(String name, boolean def, Boolc changed){
+                super(name);
+                this.def = def;
+                this.changed = changed;
+            }
+
+            @Override
+            public void add(SettingsTable table){
+                CheckBox box = new CheckBox(title);
+
+                box.update(() -> box.setChecked(settings.getBool(name)));
+
+                box.changed(() -> {
+                    settings.put(name, box.isChecked());
+                    if(changed != null){
+                        changed.get(box.isChecked());
+                    }
+                });
+
+                box.left();
+                addDesc(table.add(box).left().padTop(3f).get());
+                table.row();
+            }
+        }
+
+        public static class SliderSetting extends Setting{
+            int def, min, max, step;
+            StringProcessor sp;
+
+            public SliderSetting(String name, int def, int min, int max, int step, StringProcessor s){
+                super(name);
+                this.def = def;
+                this.min = min;
+                this.max = max;
+                this.step = step;
+                this.sp = s;
+            }
+
+            @Override
+            public void add(SettingsTable table){
+                Slider slider = new Slider(min, max, step, false);
+
+                slider.setValue(settings.getInt(name));
+
+                Label value = new Label("", Styles.outlineLabel);
+                Table content = new Table();
+                content.add(title, Styles.outlineLabel).left().growX().wrap();
+                content.add(value).padLeft(10f).right();
+                content.margin(3f, 33f, 3f, 33f);
+                content.touchable = Touchable.disabled;
+
+                slider.changed(() -> {
+                    settings.put(name, (int)slider.getValue());
+                    value.setText(sp.get((int)slider.getValue()));
+                });
+
+                slider.change();
+
+                addDesc(table.stack(slider, content).width(Math.min(Core.graphics.getWidth() / 1.2f, 460f)).left().padTop(4f).get());
+                table.row();
+            }
+        }
+
+        public static class TextSetting extends Setting{
+            String def;
+            Cons<String> changed;
+
+            public TextSetting(String name, String def, Cons<String> changed){
+                super(name);
+                this.def = def;
+                this.changed = changed;
+            }
+
+            @Override
+            public void add(SettingsTable table){
+                TextField field = new TextField();
+
+                field.update(() -> field.setText(settings.getString(name)));
+
+                field.changed(() -> {
+                    settings.put(name, field.getText());
+                    if(changed != null){
+                        changed.get(field.getText());
+                    }
+                });
+
+                Table prefTable = table.table().left().padTop(3f).get();
+                prefTable.add(field);
+                prefTable.label(() -> title);
+                addDesc(prefTable);
+                table.row();
+            }
+        }
+
+        public static class AreaTextSetting extends TextSetting{
+            public AreaTextSetting(String name, String def, Cons<String> changed){
+                super(name, def, changed);
+            }
+
+            @Override
+            public void add(SettingsTable table){
+                TextArea area = new TextArea("");
+                area.setPrefRows(5);
+
+                area.update(() -> {
+                    area.setText(settings.getString(name));
+                    area.setWidth(table.getWidth());
+                });
+
+                area.changed(() -> {
+                    settings.put(name, area.getText());
+                    if(changed != null){
+                        changed.get(area.getText());
+                    }
+                });
+
+                addDesc(table.label(() -> title).left().padTop(3f).get());
+                table.row().add(area).left();
+                table.row();
+            }
+        }
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java
index c6582aa005..402df45189 100644
--- a/core/src/mindustry/ui/dialogs/TraceDialog.java
+++ b/core/src/mindustry/ui/dialogs/TraceDialog.java
@@ -4,6 +4,9 @@ import arc.*;
 import arc.scene.ui.layout.*;
 import mindustry.gen.*;
 import mindustry.net.Administration.*;
+import mindustry.ui.*;
+
+import static mindustry.Vars.*;
 
 public class TraceDialog extends BaseDialog{
 
@@ -11,7 +14,6 @@ public class TraceDialog extends BaseDialog{
         super("@trace");
 
         addCloseButton();
-        setFillParent(false);
     }
 
     public void show(Player player, TraceInfo info){
@@ -22,16 +24,38 @@ public class TraceDialog extends BaseDialog{
         table.defaults().pad(1);
 
         table.defaults().left();
-        table.add(Core.bundle.format("trace.playername", player.name));
-        table.row();
-        table.add(Core.bundle.format("trace.ip", info.ip));
-        table.row();
-        table.add(Core.bundle.format("trace.id", info.uuid));
-        table.row();
-        table.add(Core.bundle.format("trace.modclient", info.modded));
-        table.row();
-        table.add(Core.bundle.format("trace.mobile", info.mobile));
-        table.row();
+
+        var style = Styles.emptyi;
+        float s = 28f;
+        
+        table.table(c -> {
+            c.left().defaults().left();
+            c.button(Icon.copySmall, style, () -> copy(player.name)).size(s).padRight(4f);
+            c.add(Core.bundle.format("trace.playername", player.name)).row();
+            c.button(Icon.copySmall, style, () -> copy(info.ip)).size(s).padRight(4f);
+            c.add(Core.bundle.format("trace.ip", info.ip)).row();
+            c.button(Icon.copySmall, style, () -> copy(info.locale)).size(s).padRight(4f);
+            c.add(Core.bundle.format("trace.language", info.locale)).row();
+            c.button(Icon.copySmall, style, () -> copy(info.uuid)).size(s).padRight(4f);
+            c.add(Core.bundle.format("trace.id", info.uuid)).row();
+        }).row();
+
+        table.add(Core.bundle.format("trace.modclient", info.modded)).row();
+        table.add(Core.bundle.format("trace.mobile", info.mobile)).row();
+        table.add(Core.bundle.format("trace.times.joined", info.timesJoined)).row();
+        table.add(Core.bundle.format("trace.times.kicked", info.timesKicked)).row();
+
+        for(int i = 0; i < 2; i++){
+            table.add(i == 0 ? "@trace.ips" : "@trace.names").row();
+            String[] list = i == 0 ? info.ips : info.names;
+
+            table.pane(t -> {
+                t.left();
+                for(String val : list){
+                    t.add("[lightgray]" + val).left().row();
+                }
+            }).padLeft(20f).fill().left().row();
+        }
 
         table.add().pad(5);
         table.row();
@@ -40,4 +64,9 @@ public class TraceDialog extends BaseDialog{
 
         show();
     }
+
+    private void copy(String content){
+        Core.app.setClipboardText(content);
+        ui.showInfoFade("@copied");
+    }
 }
diff --git a/core/src/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java
index 1523508aa4..79ad799a3a 100644
--- a/core/src/mindustry/ui/fragments/BlockConfigFragment.java
+++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java
@@ -12,48 +12,38 @@ import mindustry.gen.*;
 
 import static mindustry.Vars.*;
 
-public class BlockConfigFragment extends Fragment{
+public class BlockConfigFragment{
     Table table = new Table();
-    Building configTile;
+    Building selected;
 
-    @Override
     public void build(Group parent){
         table.visible = false;
         parent.addChild(table);
 
-        //hacky way to hide block config when in menu
-        //TODO remove?
-        Core.scene.add(new Element(){
-            @Override
-            public void act(float delta){
-                super.act(delta);
-                if(state.isMenu()){
-                    table.visible = false;
-                    configTile = null;
-                }
-            }
-        });
+        Events.on(ResetEvent.class, e -> forceHide());
+    }
 
-        Events.on(ResetEvent.class, e -> {
-            table.visible = false;
-            configTile = null;
-        });
+    public void forceHide(){
+        table.visible = false;
+        selected = null;
     }
 
     public boolean isShown(){
-        return table.visible && configTile != null;
+        return table.visible && selected != null;
     }
 
-    public Building getSelectedTile(){
-        return configTile;
+    public Building getSelected(){
+        return selected;
     }
 
     public void showConfig(Building tile){
+        if(selected != null) selected.onConfigureClosed();
         if(tile.configTapped()){
-            configTile = tile;
+            selected = tile;
 
             table.visible = true;
             table.clear();
+            table.background(null);
             tile.buildConfiguration(table);
             table.pack();
             table.setTransform(true);
@@ -61,28 +51,29 @@ public class BlockConfigFragment extends Fragment{
             Actions.scaleTo(1f, 1f, 0.07f, Interp.pow3Out));
 
             table.update(() -> {
-                if(configTile != null && configTile.shouldHideConfigure(player)){
+                if(selected != null && selected.shouldHideConfigure(player)){
                     hideConfig();
                     return;
                 }
 
                 table.setOrigin(Align.center);
-                if(configTile == null || configTile.block == Blocks.air || !configTile.isValid()){
+                if(selected == null || selected.block == Blocks.air || !selected.isValid()){
                     hideConfig();
                 }else{
-                    configTile.updateTableAlign(table);
+                    selected.updateTableAlign(table);
                 }
             });
         }
     }
 
     public boolean hasConfigMouse(){
-        Element e = Core.scene.hit(Core.input.mouseX(), Core.graphics.getHeight() - Core.input.mouseY(), true);
+        Element e = Core.scene.getHoverElement();
         return e != null && (e == table || e.isDescendantOf(table));
     }
 
     public void hideConfig(){
-        configTile = null;
+        if(selected != null) selected.onConfigureClosed();
+        selected = null;
         table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interp.pow3Out), Actions.visible(false));
     }
 }
diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
index b6b2729e2b..54a36cde6e 100644
--- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
+++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
@@ -14,23 +14,23 @@ import arc.scene.ui.layout.Stack;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 
 import java.util.*;
 
 import static mindustry.Vars.*;
 
-public class BlockInventoryFragment extends Fragment{
+public class BlockInventoryFragment{
     private static final float holdWithdraw = 20f;
     private static final float holdShrink = 120f;
 
     Table table = new Table();
-    Building tile;
+    Building build;
     float holdTime = 0f, emptyTime;
-    boolean holding;
+    boolean holding, held;
     float[] shrinkHoldTimes = new float[content.items().size];
     Item lastItem;
 
@@ -38,7 +38,6 @@ public class BlockInventoryFragment extends Fragment{
         Events.on(WorldLoadEvent.class, e -> hide());
     }
 
-    @Override
     public void build(Group parent){
         table.name = "inventory";
         table.setTransform(true);
@@ -47,13 +46,14 @@ public class BlockInventoryFragment extends Fragment{
     }
 
     public void showFor(Building t){
-        if(this.tile == t){
+        if(this.build == t){
             hide();
             return;
         }
-        this.tile = t;
-        if(tile == null || !tile.block.isAccessible() || tile.items.total() == 0)
+        this.build = t;
+        if(build == null || !build.block.isAccessible() || build.items == null || build.items.total() == 0){
             return;
+        }
         rebuild(true);
     }
 
@@ -66,7 +66,23 @@ public class BlockInventoryFragment extends Fragment{
             table.update(null);
         }), Actions.visible(false));
         table.touchable = Touchable.disabled;
-        tile = null;
+        build = null;
+    }
+
+    private void takeItem(int requested){
+        if(!build.canWithdraw()) return;
+
+        //take everything
+        int amount = Math.min(requested, player.unit().maxAccepted(lastItem));
+
+        if(amount > 0){
+            Call.requestItem(player, build, lastItem, amount);
+            holding = false;
+            holdTime = 0f;
+            held = true;
+
+            if(net.client()) Events.fire(new WithdrawEvent(build, player, lastItem, amount));
+        }
     }
 
     private void rebuild(boolean actions){
@@ -81,35 +97,29 @@ public class BlockInventoryFragment extends Fragment{
         table.touchable = Touchable.enabled;
         table.update(() -> {
 
-            if(state.isMenu() || tile == null || !tile.isValid() || !tile.block.isAccessible() || emptyTime >= holdShrink){
+            if(state.isMenu() || build == null || !build.isValid() || !build.block.isAccessible() || emptyTime >= holdShrink){
                 hide();
             }else{
-                if(tile.items.total() == 0){
+                if(build.items.total() == 0){
                     emptyTime += Time.delta;
                 }else{
                     emptyTime = 0f;
                 }
 
-                if(holding && lastItem != null){
-                    holdTime += Time.delta;
+                if(holding && lastItem != null && (holdTime += Time.delta) >= holdWithdraw){
+                    holdTime = 0f;
 
-                    if(holdTime >= holdWithdraw){
-                        int amount = Math.min(tile.items.get(lastItem), player.unit().maxAccepted(lastItem));
-                        Call.requestItem(player, tile, lastItem, amount);
-                        holding = false;
-                        holdTime = 0f;
-
-                        if(net.client()) Events.fire(new WithdrawEvent(tile, player, lastItem, amount));
-                    }
+                    //take one when held
+                    takeItem(1);
                 }
 
                 updateTablePosition();
-                if(tile.block.hasItems){
+                if(build.block.hasItems){
                     boolean dirty = false;
                     if(shrinkHoldTimes.length != content.items().size) shrinkHoldTimes = new float[content.items().size];
 
                     for(int i = 0; i < content.items().size; i++){
-                        boolean has = tile.items.has(content.item(i));
+                        boolean has = build.items.has(content.item(i));
                         boolean had = container.contains(i);
                         if(has){
                             shrinkHoldTimes[i] = 0f;
@@ -134,44 +144,54 @@ public class BlockInventoryFragment extends Fragment{
         table.margin(4f);
         table.defaults().size(8 * 5).pad(4f);
 
-        if(tile.block.hasItems){
+        if(build.block.hasItems){
 
             for(int i = 0; i < content.items().size; i++){
                 Item item = content.item(i);
-                if(!tile.items.has(item)) continue;
+                if(!build.items.has(item)) continue;
 
                 container.add(i);
 
-                Boolp canPick = () -> player.unit().acceptsItem(item) && !state.isPaused() && player.within(tile, itemTransferRange);
+                Boolp canPick = () -> !player.dead() && player.unit().acceptsItem(item) && !state.isPaused() && player.within(build, itemTransferRange);
 
                 HandCursorListener l = new HandCursorListener();
                 l.enabled = canPick;
 
-                Element image = itemImage(item.icon(Cicon.xlarge), () -> {
-                    if(tile == null || !tile.isValid()){
+                Element image = itemImage(item.uiIcon, () -> {
+                    if(build == null || !build.isValid()){
                         return "";
                     }
-                    return round(tile.items.get(item));
+                    return round(build.items.get(item));
                 });
                 image.addListener(l);
 
-                image.addListener(new InputListener(){
+                Boolp validClick = () -> !(!canPick.get() || build == null || !build.isValid() || build.items == null || !build.items.has(item));
+
+                image.addListener(new ClickListener(){
+
                     @Override
                     public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
-                        if(!canPick.get() || tile == null || !tile.isValid() || tile.items == null || !tile.items.has(item)) return false;
-                        int amount = Math.min(1, player.unit().maxAccepted(item));
-                        if(amount > 0){
-                            Call.requestItem(player, tile, item, amount);
+                        held = false;
+                        if(validClick.get()){
                             lastItem = item;
                             holding = true;
-                            holdTime = 0f;
-                            if(net.client()) Events.fire(new WithdrawEvent(tile, player, item, amount));
                         }
-                        return true;
+
+                        return super.touchDown(event, x, y, pointer, button);
+                    }
+
+                    @Override
+                    public void clicked(InputEvent event, float x, float y){
+                        if(!validClick.get() || held) return;
+
+                        //take all
+                        takeItem(build.items.get(lastItem = item));
                     }
 
                     @Override
                     public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
+                        super.touchUp(event, x, y, pointer, button);
+
                         holding = false;
                         lastItem = null;
                     }
@@ -201,16 +221,16 @@ public class BlockInventoryFragment extends Fragment{
     private String round(float f){
         f = (int)f;
         if(f >= 1000000){
-            return (int)(f / 1000000f) + "[gray]" + Core.bundle.getOrNull("unit.millions") + "[]";
+            return (int)(f / 1000000f) + "[gray]" + UI.millions;
         }else if(f >= 1000){
-            return (int)(f / 1000) + Core.bundle.getOrNull("unit.thousands");
+            return (int)(f / 1000) + UI.thousands;
         }else{
             return (int)f + "";
         }
     }
 
     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(build.x + build.block.size * tilesize / 2f, build.y + build.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 58b7735c23..30c3444788 100644
--- a/core/src/mindustry/ui/fragments/ChatFragment.java
+++ b/core/src/mindustry/ui/fragments/ChatFragment.java
@@ -9,22 +9,22 @@ import arc.math.*;
 import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.Label.*;
+import arc.scene.ui.TextField.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.input.*;
-import mindustry.type.*;
 import mindustry.ui.*;
 
 import static arc.Core.*;
-import static mindustry.Vars.net;
 import static mindustry.Vars.*;
 
 public class ChatFragment extends Table{
     private static final int messagesShown = 10;
-    private Seq<ChatMessage> messages = new Seq<>();
+    private Seq<String> messages = new Seq<>();
     private float fadetime;
     private boolean shown = false;
     private TextField chatfield;
@@ -33,17 +33,11 @@ public class ChatFragment extends Table{
     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);
+    private Color shadowColor = new Color(0, 0, 0, 0.5f);
     private float textspacing = Scl.scl(10);
     private Seq<String> history = new Seq<>();
     private int historyPos = 0;
     private int scrollPos = 0;
-    private Fragment container = new Fragment(){
-        @Override
-        public void build(Group parent){
-            scene.add(ChatFragment.this);
-        }
-    };
 
     public ChatFragment(){
         super();
@@ -65,7 +59,7 @@ public class ChatFragment extends Table{
 
         update(() -> {
 
-            if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null || ui.minimapfrag.shown()) && !ui.scriptfrag.shown()){
+            if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null || ui.minimapfrag.shown()) && !ui.consolefrag.shown()){
                 toggle();
             }
 
@@ -90,8 +84,8 @@ public class ChatFragment extends Table{
         setup();
     }
 
-    public Fragment container(){
-        return container;
+    public void build(Group parent){
+        scene.add(this);
     }
 
     public void clearMessages(){
@@ -105,13 +99,14 @@ public class ChatFragment extends Table{
         fieldlabel.getStyle().font = font;
         fieldlabel.setStyle(fieldlabel.getStyle());
 
-        chatfield = new TextField("", new TextField.TextFieldStyle(scene.getStyle(TextField.TextFieldStyle.class)));
+        chatfield = new TextField("", new TextFieldStyle(scene.getStyle(TextFieldStyle.class)));
         chatfield.setMaxLength(Vars.maxTextLength);
         chatfield.getStyle().background = null;
-        chatfield.getStyle().font = Fonts.chat;
         chatfield.getStyle().fontColor = Color.white;
         chatfield.setStyle(chatfield.getStyle());
 
+        chatfield.typed(this::handleType);
+
         bottom().left().marginBottom(offsety).marginLeft(offsetx * 2).add(fieldlabel).padBottom(6f);
 
         add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28);
@@ -122,6 +117,27 @@ public class ChatFragment extends Table{
         }
     }
 
+    //no mobile support.
+    private void handleType(char c){
+        int cursor = chatfield.getCursorPosition();
+        if(c == ':'){
+            int index = chatfield.getText().lastIndexOf(':', cursor - 2);
+            if(index >= 0 && index < cursor){
+                String text = chatfield.getText().substring(index + 1, cursor - 1);
+                String uni = Fonts.getUnicodeStr(text);
+                if(uni != null && uni.length() > 0){
+                    chatfield.setText(chatfield.getText().substring(0, index) + uni + chatfield.getText().substring(cursor));
+                    chatfield.setCursorPosition(index + uni.length());
+                }
+            }
+        }
+    }
+
+    protected void rect(float x, float y, float w, float h){
+        //prevents texture bindings; the string lookup is irrelevant as it is only called <10 times per frame, and maps are very fast anyway
+        Draw.rect("whiteui", x + w/2f, y + h/2f, w, h);
+    }
+
     @Override
     public void draw(){
         float opacity = Core.settings.getInt("chatopacity") / 100f;
@@ -130,7 +146,7 @@ public class ChatFragment extends Table{
         Draw.color(shadowColor);
 
         if(shown){
-            Fill.crect(offsetx, chatfield.y + scene.marginBottom, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
+            rect(offsetx, chatfield.y + scene.marginBottom, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
         }
 
         super.draw();
@@ -146,12 +162,13 @@ public class ChatFragment extends Table{
         float theight = offsety + spacing + getMarginBottom() + scene.marginBottom;
         for(int i = scrollPos; i < messages.size && i < messagesShown + scrollPos && (i < fadetime || shown); i++){
 
-            layout.setText(font, messages.get(i).formattedMessage, Color.white, textWidth, Align.bottomLeft, true);
+            layout.setText(font, messages.get(i), Color.white, textWidth, Align.bottomLeft, true);
             theight += layout.height + textspacing;
             if(i - scrollPos == 0) theight -= textspacing + 1;
 
             font.getCache().clear();
-            font.getCache().addText(messages.get(i).formattedMessage, fontoffsetx + offsetx, offsety + theight, textWidth, Align.bottomLeft, true);
+            font.getCache().setColor(Color.white);
+            font.getCache().addText(messages.get(i), fontoffsetx + offsetx, offsety + theight, textWidth, Align.bottomLeft, true);
 
             if(!shown && fadetime - i < 1f && fadetime - i >= 0f){
                 font.getCache().setAlphas((fadetime - i) * opacity);
@@ -160,7 +177,7 @@ public class ChatFragment extends Table{
                 font.getCache().setAlphas(opacity);
             }
 
-            Fill.crect(offsetx, theight - layout.height - 2, textWidth + Scl.scl(4f), layout.height + textspacing);
+            rect(offsetx, theight - layout.height - 2, textWidth + Scl.scl(4f), layout.height + textspacing);
             Draw.color(shadowColor);
             Draw.alpha(opacity * shadowColor.a);
 
@@ -178,10 +195,13 @@ public class ChatFragment extends Table{
         String message = chatfield.getText().trim();
         clearChatInput();
 
-        if(message.isEmpty()) return;
+        //avoid sending prefix-empty messages
+        if(message.isEmpty() || (message.startsWith(mode.prefix) && message.substring(mode.prefix.length()).isEmpty())) return;
 
         history.insert(1, message);
 
+        Events.fire(new ClientChatEvent(message));
+
         Call.sendChatMessage(message);
     }
 
@@ -206,7 +226,7 @@ public class ChatFragment extends Table{
             }
         }else{
             //sending chat has a delay; workaround for issue #1943
-            Time.run(2f, () ->{
+            Time.runTask(2f, () ->{
                 scene.setKeyboardFocus(null);
                 shown = false;
                 scrollPos = 0;
@@ -257,32 +277,16 @@ public class ChatFragment extends Table{
         return shown;
     }
 
-    public void addMessage(String message, String sender){
-        if(sender == null && message == null) return;
-        messages.insert(0, new ChatMessage(message, sender));
+    public void addMessage(String message){
+        if(message == null) return;
+        messages.insert(0, message);
 
         fadetime += 1f;
         fadetime = Math.min(fadetime, messagesShown) + 1f;
-        
+
         if(scrollPos > 0) scrollPos++;
     }
 
-    private static class ChatMessage{
-        public final String sender;
-        public final String message;
-        public final String formattedMessage;
-
-        public ChatMessage(String message, String sender){
-            this.message = message;
-            this.sender = sender;
-            if(sender == null){ //no sender, this is a server message?
-                formattedMessage = message == null ? "" : message;
-            }else{
-                formattedMessage = "[coral][[" + sender + "[coral]]:[white] " + message;
-            }
-        }
-    }
-
     private enum ChatMode{
         normal(""),
         team("/t"),
diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ConsoleFragment.java
similarity index 73%
rename from core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
rename to core/src/mindustry/ui/fragments/ConsoleFragment.java
index 71704dc5e7..823c2d70a6 100644
--- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
+++ b/core/src/mindustry/ui/fragments/ConsoleFragment.java
@@ -8,16 +8,18 @@ import arc.math.*;
 import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.Label.*;
+import arc.scene.ui.TextField.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.game.EventType.*;
 import mindustry.input.*;
 import mindustry.ui.*;
 
 import static arc.Core.*;
 import static mindustry.Vars.*;
 
-public class ScriptConsoleFragment extends Table{
+public class ConsoleFragment extends Table{
     private static final int messagesShown = 30;
     private Seq<String> messages = new Seq<>();
     private boolean open = false, shown;
@@ -31,23 +33,23 @@ public class ScriptConsoleFragment extends Table{
     private Seq<String> history = new Seq<>();
     private int historyPos = 0;
     private int scrollPos = 0;
-    private Fragment container = new Fragment(){
-        @Override
-        public void build(Group parent){
-            scene.add(ScriptConsoleFragment.this);
-        }
-    };
 
-    public ScriptConsoleFragment(){
+    public ConsoleFragment(){
         setFillParent(true);
         font = Fonts.def;
 
         visible(() -> {
-            if(input.keyTap(Binding.console)  && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null) && !ui.chatfrag.shown()){
+            if(input.keyTap(Binding.console) && settings.getBool("console") && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null) && !ui.chatfrag.shown()){
                 shown = !shown;
-                if(shown && !open && enableConsole){
+                if(shown && !open && settings.getBool("console")){
                     toggle();
                 }
+                if(shown){
+                    chatfield.requestKeyboard();
+                }else if(scene.getKeyboardFocus() == chatfield){
+                    scene.setKeyboardFocus(null);
+                    scene.setScrollFocus(null);
+                }
                 clearChatInput();
             }
 
@@ -55,7 +57,7 @@ public class ScriptConsoleFragment extends Table{
         });
 
         update(() -> {
-            if(input.keyTap(Binding.chat) && enableConsole && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null)){
+            if(input.keyTap(Binding.chat) && settings.getBool("console") && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null)){
                 toggle();
             }
 
@@ -71,15 +73,15 @@ public class ScriptConsoleFragment extends Table{
                 }
             }
 
-            scrollPos = (int)Mathf.clamp(scrollPos + input.axis(Binding.chat_scroll), 0, Math.max(0, messages.size - messagesShown));
+            scrollPos = (int)Mathf.clamp(scrollPos + input.axis(Binding.chat_scroll), 0, Math.max(0, messages.size));
         });
 
         history.insert(0, "");
         setup();
     }
 
-    public Fragment container(){
-        return container;
+    public void build(Group parent){
+        scene.add(this);
     }
 
     public void clearMessages(){
@@ -93,9 +95,8 @@ public class ScriptConsoleFragment extends Table{
         fieldlabel.getStyle().font = font;
         fieldlabel.setStyle(fieldlabel.getStyle());
 
-        chatfield = new TextField("", new TextField.TextFieldStyle(scene.getStyle(TextField.TextFieldStyle.class)));
+        chatfield = new TextField("", new TextFieldStyle(scene.getStyle(TextFieldStyle.class)));
         chatfield.getStyle().background = null;
-        chatfield.getStyle().font = Fonts.chat;
         chatfield.getStyle().fontColor = Color.white;
         chatfield.setStyle(chatfield.getStyle());
 
@@ -104,6 +105,10 @@ public class ScriptConsoleFragment extends Table{
         add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28);
     }
 
+    protected void rect(float x, float y, float w, float h){
+        Draw.rect("whiteui", x + w/2f, y + h/2f, w, h);
+    }
+
     @Override
     public void draw(){
         float opacity = 1f;
@@ -112,7 +117,7 @@ public class ScriptConsoleFragment extends Table{
         Draw.color(shadowColor);
 
         if(open){
-            Fill.crect(offsetx, chatfield.y + scene.marginBottom, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
+            rect(offsetx, chatfield.y + scene.marginBottom, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
         }
 
         super.draw();
@@ -133,6 +138,7 @@ public class ScriptConsoleFragment extends Table{
             if(i - scrollPos == 0) theight -= textspacing + 1;
 
             font.getCache().clear();
+            font.getCache().setColor(Color.white);
             font.getCache().addText(messages.get(i), fontoffsetx + offsetx, offsety + theight, textWidth, Align.bottomLeft, true);
 
             if(!open){
@@ -142,7 +148,7 @@ public class ScriptConsoleFragment extends Table{
                 font.getCache().setAlphas(opacity);
             }
 
-            Fill.crect(offsetx, theight - layout.height - 2, textWidth + Scl.scl(4f), layout.height + textspacing);
+            rect(offsetx, theight - layout.height - 2, textWidth + Scl.scl(4f), layout.height + textspacing);
             Draw.color(shadowColor);
             Draw.alpha(opacity * shadowColor.a);
 
@@ -167,12 +173,24 @@ public class ScriptConsoleFragment extends Table{
         history.insert(1, message);
 
         addMessage("[lightgray]> " + message.replace("[", "[["));
-        addMessage(mods.getScripts().runConsole(message).replace("[", "[["));
+        addMessage(mods.getScripts().runConsole(injectConsoleVariables() + message).replace("[", "[["));
+    }
+
+    public String injectConsoleVariables(){
+        return
+        "var unit = Vars.player.unit();" +
+        "var team = Vars.player.team();" +
+        "var core = Vars.player.core();" +
+        "var items = Vars.player.team().items();" +
+        "var build = Vars.world.buildWorld(Core.input.mouseWorldX(), Core.input.mouseWorldY());" +
+        "var cursor = Vars.world.tileWorld(Core.input.mouseWorldX(), Core.input.mouseWorldY());" +
+        "\n";
     }
 
     public void toggle(){
 
         if(!open){
+            Events.fire(Trigger.openConsole);
             scene.setKeyboardFocus(chatfield);
             open = !open;
             if(mobile){
diff --git a/core/src/mindustry/ui/fragments/FadeInFragment.java b/core/src/mindustry/ui/fragments/FadeInFragment.java
index e82bc75c68..1a87c34336 100644
--- a/core/src/mindustry/ui/fragments/FadeInFragment.java
+++ b/core/src/mindustry/ui/fragments/FadeInFragment.java
@@ -7,11 +7,10 @@ import arc.scene.*;
 import arc.scene.event.*;
 
 /** Fades in a black overlay.*/
-public class FadeInFragment extends Fragment{
+public class FadeInFragment{
     private static final float duration = 40f;
     float time = 0f;
 
-    @Override
     public void build(Group parent){
         parent.addChild(new Element(){
             {
diff --git a/core/src/mindustry/ui/fragments/Fragment.java b/core/src/mindustry/ui/fragments/Fragment.java
deleted file mode 100644
index 367b6f0cfa..0000000000
--- a/core/src/mindustry/ui/fragments/Fragment.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package mindustry.ui.fragments;
-
-import arc.scene.*;
-
-public abstract class Fragment{
-    public abstract void build(Group parent);
-}
diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java
index 9a89b21a91..77d3335119 100644
--- a/core/src/mindustry/ui/fragments/HintsFragment.java
+++ b/core/src/mindustry/ui/fragments/HintsFragment.java
@@ -11,22 +11,26 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.ai.types.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.input.*;
 import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.blocks.payloads.PayloadBlock.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-public class HintsFragment extends Fragment{
+public class HintsFragment{
     private static final Boolp isTutorial = () -> Vars.state.rules.sector == SectorPresets.groundZero.sector;
     private static final float foutTime = 0.6f;
 
     /** All hints to be displayed in the game. */
-    public Seq<Hint> hints = new Seq<>().and(DefaultHint.values()).as();
+    public Seq<Hint> hints = new Seq<>().add(DefaultHint.values()).as();
 
     @Nullable Hint current;
     Group group = new WidgetGroup();
@@ -34,7 +38,6 @@ public class HintsFragment extends Fragment{
     ObjectSet<Block> placedBlocks = new ObjectSet<>();
     Table last;
 
-    @Override
     public void build(Group parent){
         group.setFillParent(true);
         group.touchable = Touchable.childrenOnly;
@@ -52,8 +55,14 @@ public class HintsFragment extends Fragment{
                 Hint hint = hints.find(Hint::show);
                 if(hint != null && hint.complete()){
                     hints.remove(hint);
-                }else if(hint != null){
+                }else if(hint != null && !renderer.isCutscene() && state.isGame() && control.saves.getTotalPlaytime() > 8000){
                     display(hint);
+                }else{
+                    //moused over a derelict structure
+                    var build = world.buildWorld(Core.input.mouseWorldX(), Core.input.mouseWorldY());
+                    if(build != null && build.team == Team.derelict){
+                        events.add("derelictmouse");
+                    }
                 }
             }
         });
@@ -76,6 +85,17 @@ public class HintsFragment extends Fragment{
             events.clear();
         });
 
+        Events.on(BuildingCommandEvent.class, e -> {
+            if(e.building instanceof PayloadBlockBuild<?>){
+                events.add("factorycontrol");
+            }
+        });
+
+        Events.on(BlockBuildBeginEvent.class, e -> {
+            if(e.unit == player.unit() && e.tile.build instanceof ConstructBuild c && c.prevBuild != null && c.prevBuild.contains(b -> b.team == Team.derelict)){
+                events.add("derelictbreak");
+            }
+        });
     }
 
     void checkNext(){
@@ -85,7 +105,7 @@ public class HintsFragment extends Fragment{
         hints.sort(Hint::order);
 
         Hint first = hints.find(Hint::show);
-        if(first != null){
+        if(first != null && !renderer.isCutscene() && state.isGame()){
             hints.remove(first);
             display(first);
         }
@@ -138,42 +158,49 @@ public class HintsFragment extends Fragment{
         return current != null;
     }
 
+    static boolean isSerpulo(){
+        return !state.rules.hasEnv(Env.scorching);
+    }
+
     public enum DefaultHint implements Hint{
         desktopMove(visibleDesktop, () -> Core.input.axis(Binding.move_x) != 0 || Core.input.axis(Binding.move_y) != 0),
         zoom(visibleDesktop, () -> Core.input.axis(KeyCode.scroll) != 0),
-        mine(() -> player.unit().canMine() && isTutorial.get(), () -> player.unit().mining()),
-        placeDrill(isTutorial, () -> ui.hints.placedBlocks.contains(Blocks.mechanicalDrill)),
-        placeConveyor(isTutorial, () -> ui.hints.placedBlocks.contains(Blocks.conveyor)),
-        placeTurret(isTutorial, () -> ui.hints.placedBlocks.contains(Blocks.duo)),
-        breaking(isTutorial, () -> ui.hints.events.contains("break")),
-        desktopShoot(visibleDesktop, () -> Vars.state.enemies > 0, () -> player.shooting),
-        depositItems(() -> player.unit().hasItem(), () -> !player.unit().hasItem()),
-        desktopPause(visibleDesktop, () -> isTutorial.get() && !Vars.net.active(), () -> Core.input.keyTap(Binding.pause)),
-        research(isTutorial, () -> ui.research.isShown()),
-        unitControl(() -> state.rules.defaultTeam.data().units.size > 2 && !net.active() && !player.dead(), () -> !player.dead() && !player.unit().spawnedByCore),
+        breaking(() -> isTutorial.get() && state.rules.defaultTeam.data().getCount(Blocks.conveyor) > 5, () -> ui.hints.events.contains("break")),
+        desktopShoot(visibleDesktop, () -> isSerpulo() && Vars.state.enemies > 0, () -> player.shooting),
+        depositItems(() -> !player.dead() && player.unit().hasItem(), () -> !player.dead() && !player.unit().hasItem()),
+        desktopPause(visibleDesktop, () -> isTutorial.get() && !Vars.net.active() && state.wave >= 2, () -> Core.input.keyTap(Binding.pause)),
+        unitControl(() -> isSerpulo() && state.rules.defaultTeam.data().units.size > 2 && !net.active() && !player.dead(), () -> !player.dead() && !player.unit().spawnedByCore),
+        unitSelectControl(() -> isSerpulo() && state.rules.defaultTeam.data().units.size > 3 && !net.active() && !player.dead(),
+            () -> control.input.commandMode && control.input.selectedUnits.size > 0 && control.input.selectedUnits.first().controller() instanceof CommandAI ai && ai.targetPos != null),
         respawn(visibleMobile, () -> !player.dead() && !player.unit().spawnedByCore, () -> !player.dead() && player.unit().spawnedByCore),
-        launch(() -> isTutorial.get() && state.rules.sector.isCaptured(), () -> ui.planet.isShown()),
-        schematicSelect(visibleDesktop, () -> ui.hints.placedBlocks.contains(Blocks.router), () -> Core.input.keyRelease(Binding.schematic_select) || Core.input.keyTap(Binding.pick)),
+        launch(() -> (isTutorial.get() || Vars.state.rules.sector == SectorPresets.onset.sector) && state.rules.sector.isCaptured(), () -> ui.planet.isShown()),
+        schematicSelect(visibleDesktop, () -> ui.hints.placedBlocks.contains(Blocks.router) || ui.hints.placedBlocks.contains(Blocks.ductRouter), () -> Core.input.keyRelease(Binding.schematic_select) || Core.input.keyTap(Binding.pick)),
         conveyorPathfind(() -> control.input.block == Blocks.titaniumConveyor, () -> Core.input.keyRelease(Binding.diagonal_placement) || (mobile && Core.settings.getBool("swapdiagonal"))),
         boost(visibleDesktop, () -> !player.dead() && player.unit().type.canBoost, () -> Core.input.keyDown(Binding.boost)),
-        command(() -> state.rules.defaultTeam.data().units.size > 3 && !net.active(), () -> player.unit().isCommanding()),
-        payloadPickup(() -> !player.unit().dead && player.unit() instanceof Payloadc p && p.payloads().isEmpty(), () -> player.unit() instanceof Payloadc p && p.payloads().any()),
-        payloadDrop(() -> !player.unit().dead && player.unit() instanceof Payloadc p && p.payloads().any(), () -> player.unit() instanceof Payloadc p && p.payloads().isEmpty()),
-        waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getAllied(state.rules.defaultTeam, BlockFlag.extinguisher).size() > 0),
+        blockInfo(() -> !(state.isCampaign() && state.rules.sector == SectorPresets.groundZero.sector && state.wave < 3), () -> ui.content.isShown()),
+        derelict(() -> ui.hints.events.contains("derelictmouse") && !isTutorial.get(), () -> ui.hints.events.contains("derelictbreak")),
+        payloadPickup(() -> isSerpulo() && !player.dead() && player.unit() instanceof Payloadc p && p.payloads().isEmpty(), () -> player.unit() instanceof Payloadc p && p.payloads().any()),
+        payloadDrop(() -> !player.dead() && player.unit() instanceof Payloadc p && p.payloads().any(), () -> player.unit() instanceof Payloadc p && p.payloads().isEmpty()),
+        waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getFlagged(state.rules.defaultTeam, BlockFlag.extinguisher).size > 0),
         generator(() -> control.input.block == Blocks.combustionGenerator, () -> ui.hints.placedBlocks.contains(Blocks.combustionGenerator)),
-        guardian(() -> state.boss() != null && state.boss().armor >= 4, () -> state.boss() == null),
-        coreUpgrade(() -> state.isCampaign() && Blocks.coreFoundation.unlocked()
+        rebuildSelect(() -> state.rules.defaultTeam.data().plans.size >= 10, () -> control.input.isRebuildSelecting()),
+        guardian(() -> state.boss() != null && isSerpulo() && state.boss().armor >= 4, () -> state.boss() == null),
+        factoryControl(() -> !(state.isCampaign() && state.rules.sector.preset == SectorPresets.onset) &&
+            state.rules.defaultTeam.data().getBuildings(Blocks.tankFabricator).size + state.rules.defaultTeam.data().getBuildings(Blocks.groundFactory).size > 0, () -> ui.hints.events.contains("factorycontrol")),
+        coreUpgrade(() -> state.isCampaign() && state.rules.sector.planet == Planets.serpulo && Blocks.coreFoundation.unlocked()
             && state.rules.defaultTeam.core() != null
             && state.rules.defaultTeam.core().block == Blocks.coreShard
             && state.rules.defaultTeam.core().items.has(Blocks.coreFoundation.requirements),
             () -> ui.hints.placedBlocks.contains(Blocks.coreFoundation)),
         presetLaunch(() -> state.isCampaign()
-            && state.getSector().preset == null
-            && SectorPresets.frozenForest.unlocked()
-            && SectorPresets.frozenForest.sector.save == null,
+            && state.getSector().preset == null,
             () -> state.isCampaign() && state.getSector().preset == SectorPresets.frozenForest),
-        coreIncinerate(() -> state.isCampaign() && state.rules.defaultTeam.core() != null && state.rules.defaultTeam.core().items.get(Items.copper) >= state.rules.defaultTeam.core().storageCapacity - 10, () -> false),
-        coopCampaign(() -> net.client() && state.isCampaign() && SectorPresets.groundZero.sector.hasBase(), () -> false),
+        presetDifficulty(() -> state.isCampaign()
+            && state.getSector().preset == null
+            && state.getSector().threat >= 0.5f
+            && !SectorPresets.tarFields.sector.isCaptured(), //appear only when the player hasn't progressed much in the game yet
+            () -> state.isCampaign() && state.getSector().preset != null),
+        coreIncinerate(() -> state.isCampaign() && state.rules.defaultTeam.core() != null && state.rules.defaultTeam.core().items.get(Items.copper) >= state.rules.defaultTeam.core().storageCapacity - 10, () -> false)
         ;
 
         @Nullable
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index a8ae12eed2..0b414e59d4 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -14,9 +14,11 @@ import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.GameState.*;
+import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -26,17 +28,23 @@ import mindustry.input.*;
 import mindustry.net.Packets.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
+import mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
+import static mindustry.gen.Tex.*;
 
-public class HudFragment extends Fragment{
-    private static final float dsize = 65f;
+public class HudFragment{
+    private static final float dsize = 65f, pauseHeight = 36f;
 
-    public final PlacementFragment blockfrag = new PlacementFragment();
+    public PlacementFragment blockfrag = new PlacementFragment();
+    public CoreItemsDisplay coreItems = new CoreItemsDisplay();
     public boolean shown = true;
 
     private ImageButton flip;
-    private CoreItemsDisplay coreItems = new CoreItemsDisplay();
 
     private String hudText = "";
     private boolean showHudText;
@@ -45,13 +53,86 @@ public class HudFragment extends Fragment{
     private Table lastUnlockLayout;
     private long lastToast;
 
-    @Override
+    private Seq<Block> blocksOut = new Seq<>();
+
+    private void addBlockSelection(Table cont){
+        Table blockSelection = new Table();
+        var pane = new ScrollPane(blockSelection, Styles.smallPane);
+        pane.setFadeScrollBars(false);
+        Planet[] last = {state.rules.planet};
+        pane.update(() -> {
+            if(pane.hasScroll()){
+                Element result = Core.scene.getHoverElement();
+                if(result == null || !result.isDescendantOf(pane)){
+                    Core.scene.setScrollFocus(null);
+                }
+            }
+
+            if(state.rules.planet != last[0]){
+                last[0] = state.rules.planet;
+                rebuildBlockSelection(blockSelection, "");
+            }
+        });
+
+        cont.table(search -> {
+            search.image(Icon.zoom).padRight(8);
+            search.field("", text -> rebuildBlockSelection(blockSelection, text)).growX()
+            .name("editor/search").maxTextLength(maxNameLength).get().setMessageText("@players.search");
+        }).growX().pad(-2).padLeft(6f);
+        cont.row();
+        cont.add(pane).expandY().top().left();
+
+        rebuildBlockSelection(blockSelection, "");
+    }
+
+    private void rebuildBlockSelection(Table blockSelection, String searchText){
+        blockSelection.clear();
+
+        blocksOut.clear();
+        blocksOut.addAll(Vars.content.blocks());
+        blocksOut.sort((b1, b2) -> {
+            int synth = Boolean.compare(b1.synthetic(), b2.synthetic());
+            if(synth != 0) return synth;
+            int ore = Boolean.compare(b1 instanceof OverlayFloor && b1 != Blocks.removeOre, b2 instanceof OverlayFloor && b2 != Blocks.removeOre);
+            if(ore != 0) return ore;
+            return Integer.compare(b1.id, b2.id);
+        });
+
+        int i = 0;
+
+        for(Block block : blocksOut){
+            TextureRegion region = block.uiIcon;
+
+            if(!Core.atlas.isFound(region)
+            || (!block.inEditor && !(block instanceof RemoveWall) && !(block instanceof RemoveOre))
+            || !block.isOnPlanet(state.rules.planet)
+            || block.buildVisibility == BuildVisibility.debugOnly
+            || (!searchText.isEmpty() && !block.localizedName.toLowerCase().contains(searchText.toLowerCase()))
+            ) continue;
+
+            ImageButton button = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);
+            button.getStyle().imageUp = new TextureRegionDrawable(region);
+            button.clicked(() -> control.input.block = block);
+            button.resizeImage(8 * 4f);
+            button.update(() -> button.setChecked(control.input.block == block));
+            blockSelection.add(button).size(48f).tooltip(block.localizedName);
+
+            if(++i % 6 == 0){
+                blockSelection.row();
+            }
+        }
+
+        if(i == 0){
+            blockSelection.add("@none.found").padLeft(54f).padTop(10f);
+        }
+    }
+
     public void build(Group parent){
 
         //warn about guardian/boss waves
         Events.on(WaveEvent.class, e -> {
             int max = 10;
-            int winWave = state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
+            int winWave = state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
             outer:
             for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave - 2); i++){
                 for(SpawnGroup group : state.rules.spawns){
@@ -60,7 +141,7 @@ public class HudFragment extends Fragment{
 
                         //increments at which to warn about incoming guardian
                         if(diff == 1 || diff == 2 || diff == 5 || diff == 10){
-                            showToast(Icon.warning, Core.bundle.format("wave.guardianwarn" + (diff == 1 ? ".one" : ""), diff));
+                            showToast(Icon.warning, group.type.emoji() + " " + Core.bundle.format("wave.guardianwarn" + (diff == 1 ? ".one" : ""), diff));
                         }
 
                         break outer;
@@ -70,7 +151,11 @@ public class HudFragment extends Fragment{
         });
 
         Events.on(SectorCaptureEvent.class, e -> {
-            showToast(Core.bundle.format("sector.captured", e.sector.isBeingPlayed() ? "" : e.sector.name() + " "));
+            if(e.sector.isBeingPlayed()){
+                ui.announce("@sector.capture.current", 5f);
+            }else{
+                showToast(Core.bundle.format("sector.capture", e.sector.name()));
+            }
         });
 
         Events.on(SectorLoseEvent.class, e -> {
@@ -89,8 +174,17 @@ public class HudFragment extends Fragment{
         //paused table
         parent.fill(t -> {
             t.name = "paused";
-            t.top().visible(() -> state.isPaused() && shown).touchable = Touchable.disabled;
-            t.table(Styles.black5, top -> top.label(() -> state.gameOver && state.isCampaign() ? "@sector.curlost" : "@paused").style(Styles.outlineLabel).pad(8f)).growX();
+            t.top().visible(() -> state.isPaused() && shown && !netServer.isWaitingForPlayers()).touchable = Touchable.disabled;
+            t.table(Styles.black6, top -> top.label(() -> state.gameOver && state.isCampaign() ? "@sector.curlost" : "@paused")
+                .style(Styles.outlineLabel).pad(8f)).height(pauseHeight).growX();
+            //.padLeft(dsize * 5 + 4f) to prevent alpha overlap on left
+        });
+
+        //"waiting for players"
+        parent.fill(t -> {
+            t.name = "waiting";
+            t.visible(() -> netServer.isWaitingForPlayers() && state.isPaused() && shown).touchable = Touchable.disabled;
+            t.table(Styles.black6, top -> top.add("@waiting.players").style(Styles.outlineLabel).pad(18f));
         });
 
         //minimap + position
@@ -101,9 +195,12 @@ public class HudFragment extends Fragment{
             t.add(new Minimap()).name("minimap");
             t.row();
             //position
-            t.label(() -> player.tileX() + "," + player.tileY())
-            .visible(() -> Core.settings.getBool("position"))
+            t.label(() ->
+                (Core.settings.getBool("position") ? player.tileX() + "," + player.tileY() + "\n" : "") +
+                (Core.settings.getBool("mouseposition") ? "[lightgray]" + World.toTile(Core.input.mouseWorldX()) + "," + World.toTile(Core.input.mouseWorldY()) : ""))
+            .visible(() -> Core.settings.getBool("position") || Core.settings.getBool("mouseposition"))
             .touchable(Touchable.disabled)
+            .style(Styles.outlineLabel)
             .name("position");
             t.top().right();
         });
@@ -116,12 +213,19 @@ public class HudFragment extends Fragment{
             cont.top().left();
 
             if(mobile){
+                //for better inset visuals
+                cont.rect((x, y, w, h) -> {
+                    if(Core.scene.marginTop > 0){
+                        Tex.paneRight.draw(x, y, w, Core.scene.marginTop);
+                    }
+                }).fillX().row();
+
                 cont.table(select -> {
                     select.name = "mobile buttons";
                     select.left();
                     select.defaults().size(dsize).left();
 
-                    ImageButtonStyle style = Styles.clearTransi;
+                    ImageButtonStyle style = Styles.cleari;
 
                     select.button(Icon.menu, style, ui.paused::show).name("menu");
                     flip = select.button(Icon.upOpen, style, this::toggleMenus).get();
@@ -134,14 +238,14 @@ public class HudFragment extends Fragment{
                         if(net.active()){
                             ui.listfrag.toggle();
                         }else{
-                            state.set(state.is(State.paused) ? State.playing : State.paused);
+                            state.set(state.isPaused() ? State.playing : State.paused);
                         }
                     }).name("pause").update(i -> {
                         if(net.active()){
                             i.getStyle().imageUp = Icon.players;
                         }else{
                             i.setDisabled(false);
-                            i.getStyle().imageUp = state.is(State.paused) ? Icon.play : Icon.pause;
+                            i.getStyle().imageUp = state.isPaused() ? Icon.play : Icon.pause;
                         }
                     });
 
@@ -176,7 +280,7 @@ public class HudFragment extends Fragment{
             }
 
             cont.update(() -> {
-                if(Core.input.keyTap(Binding.toggle_menus) && !ui.chatfrag.shown() && !Core.scene.hasDialog() && !(Core.scene.getKeyboardFocus() instanceof TextField)){
+                if(Core.input.keyTap(Binding.toggle_menus) && !ui.chatfrag.shown() && !Core.scene.hasDialog() && !Core.scene.hasField()){
                     Core.settings.getBoolOnce("ui-hidden", () -> {
                         ui.announce(Core.bundle.format("showui",  Core.keybinds.get(Binding.toggle_menus).key.toString(), 11));
                     });
@@ -186,8 +290,19 @@ public class HudFragment extends Fragment{
 
             Table wavesMain, editorMain;
 
-            cont.stack(wavesMain = new Table(), editorMain = new Table()).height(wavesMain.getPrefHeight())
-            .name("waves/editor");
+            cont.stack(wavesMain = new Table(), editorMain = new Table(), new Element(){
+                //this may seem insane, but adding an empty element of a specific height to this stack fixes layout issues on mobile.
+
+                {
+                    visible = false;
+                    touchable = Touchable.disabled;
+                }
+
+                @Override
+                public float getPrefHeight(){
+                    return Scl.scl(120f);
+                }
+            }).name("waves/editor");
 
             wavesMain.visible(() -> shown && !state.isEditor());
             wavesMain.top().left().name = "waves";
@@ -196,45 +311,63 @@ public class HudFragment extends Fragment{
                 //wave info button with text
                 s.add(makeStatusTable()).grow().name("status");
 
+                var rightStyle = new ImageButtonStyle(){{
+                    over = buttonRightOver;
+                    down = buttonRightDown;
+                    up = buttonRight;
+                    disabled = buttonRightDisabled;
+                    imageDisabledColor = Color.clear;
+                    imageUpColor = Color.white;
+                }};
+
                 //table with button to skip wave
-                s.button(Icon.play, Styles.righti, 30f, () -> {
+                s.button(Icon.play, rightStyle, 30f, () -> {
                     if(net.client() && player.admin){
-                        Call.adminRequest(player, AdminAction.wave);
+                        Call.adminRequest(player, AdminAction.wave, null);
                     }else{
                         logic.skipWave();
                     }
-                }).growY().fillX().right().width(40f).disabled(b -> !canSkipWave()).name("skip");
-            }).width(dsize * 5 + 4f);
+                }).growY().fillX().right().width(40f).disabled(b -> !canSkipWave()).name("skip").get().toBack();
+            }).width(dsize * 5 + 4f).name("statustable");
 
             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).name("boss");
-
-            wavesMain.row();
+            addInfoTable(wavesMain.table().width(dsize * 5f + 4f).left().get());
 
             editorMain.name = "editor";
             editorMain.table(Tex.buttonEdge4, t -> {
-                //t.margin(0f);
                 t.name = "teams";
-                t.add("@editor.teams").growX().left();
-                t.row();
-                t.table(teams -> {
+
+
+                t.top().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();
+                        ImageButton button = teams.button(Tex.whiteui, Styles.clearNoneTogglei, 33f, () -> Call.setPlayerTeamEditor(player, team))
+                        .size(45f).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);
+
+                    teams.button(Icon.downOpen, Styles.emptyi, () -> Core.settings.put("editor-blocks-shown", !Core.settings.getBool("editor-blocks-shown")))
+                    .size(45f).update(m -> m.getStyle().imageUp = (Core.settings.getBool("editor-blocks-shown") ? Icon.upOpen : Icon.downOpen));
+                }).top().left().row();
+
+                t.collapser(this::addBlockSelection, () -> Core.settings.getBool("editor-blocks-shown"));
+
+            }).width(dsize * 5 + 4f).top();
+            if(mobile){
+                editorMain.row().spacerY(() -> {
+                    if(control.input instanceof MobileInput mob && Core.settings.getBool("editor-blocks-shown")){
+                        if(Core.graphics.isPortrait()) return Core.graphics.getHeight() / 2f / Scl.scl(1f);
+                        if(mob.hasSchematic()) return 156f;
+                        if(mob.showCancel()) return 50f;
+                    }
+                    return 0f;
+                });
+            }
+
+            editorMain.row().add().growY();
             editorMain.visible(() -> shown && state.isEditor());
 
             //fps display
@@ -244,6 +377,7 @@ public class HudFragment extends Fragment{
                 info.top().left().margin(4).visible(() -> Core.settings.getBool("fps") && shown);
                 IntFormat fps = new IntFormat("fps");
                 IntFormat ping = new IntFormat("ping");
+                IntFormat tps = new IntFormat("tps");
                 IntFormat mem = new IntFormat("memory");
                 IntFormat memnative = new IntFormat("memory2");
 
@@ -257,68 +391,99 @@ public class HudFragment extends Fragment{
                 }
                 info.row();
 
-                info.label(() -> ping.get(netClient.getPing())).visible(net::client).left().style(Styles.outlineLabel).name("ping");
+                info.label(() -> ping.get(netClient.getPing())).visible(net::client).left().style(Styles.outlineLabel).name("ping").row();
+                info.label(() -> tps.get(state.serverTps == -1 ? 60 : state.serverTps)).visible(net::client).left().style(Styles.outlineLabel).name("tps").row();
 
             }).top().left();
         });
 
-        //core items
+        //core info
         parent.fill(t -> {
-            t.name = "coreitems";
-            t.top().add(coreItems);
-            t.visible(() -> Core.settings.getBool("coreitems") && !mobile && !state.isPaused() && shown);
+            t.top();
+
+            if(Core.settings.getBool("macnotch") ){
+                t.margin(macNotchHeight);
+            }
+
+            t.visible(() -> shown);
+
+            t.name = "coreinfo";
+
+            t.collapser(v -> v.add().height(pauseHeight), () -> state.isPaused() && !netServer.isWaitingForPlayers()).row();
+
+            t.table(c -> {
+                //core items
+                c.top().collapser(coreItems, () -> Core.settings.getBool("coreitems") && !mobile && shown).fillX().row();
+
+                float notifDuration = 240f;
+                float[] coreAttackTime = {0};
+
+                Events.run(Trigger.teamCoreDamage, () -> coreAttackTime[0] = notifDuration);
+
+                //'core is under attack' table
+                c.collapser(top -> top.background(Styles.black6).add("@coreattack").pad(8)
+                .update(label -> label.color.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f))), true,
+                () -> {
+                    if(!shown || state.isPaused()) return false;
+                    if(state.isMenu() || !player.team().data().hasCore()){
+                        coreAttackTime[0] = 0f;
+                        return false;
+                    }
+
+                    return (coreAttackTime[0] -= Time.delta) > 0;
+                })
+                .touchable(Touchable.disabled)
+                .fillX().row();
+            }).row();
+
+            var bossb = new StringBuilder();
+            var bossText = Core.bundle.get("guardian");
+            int maxBosses = 6;
+
+            t.table(v -> v.margin(10f)
+            .add(new Bar(() -> {
+                bossb.setLength(0);
+                for(int i = 0; i < Math.min(state.teams.bosses.size, maxBosses); i++){
+                    bossb.append(state.teams.bosses.get(i).type.emoji());
+                }
+                if(state.teams.bosses.size > maxBosses){
+                    bossb.append("[accent]+[]");
+                }
+                bossb.append(" ");
+                bossb.append(bossText);
+                return bossb;
+            }, () -> Pal.health, () -> {
+                if(state.boss() == null) return 0f;
+                float max = 0f, val = 0f;
+                for(var boss : state.teams.bosses){
+                    max += boss.maxHealth;
+                    val += boss.health;
+                }
+                return max == 0f ? 0f : val / max;
+            }).blink(Color.white).outline(new Color(0, 0, 0, 0.6f), 7f)).grow())
+            .fillX().width(320f).height(60f).name("boss").visible(() -> state.rules.waves && state.boss() != null && !(mobile && Core.graphics.isPortrait())).padTop(7).row();
+
+            t.table(Styles.black3, p -> p.margin(4).label(() -> hudText).style(Styles.outlineLabel)).touchable(Touchable.disabled).with(p -> p.visible(() -> {
+                p.color.a = Mathf.lerpDelta(p.color.a, Mathf.num(showHudText), 0.2f);
+                if(state.isMenu()){
+                    p.color.a = 0f;
+                    showHudText = false;
+                }
+
+                return p.color.a >= 0.001f;
+            }));
         });
 
         //spawner warning
         parent.fill(t -> {
             t.name = "nearpoint";
             t.touchable = Touchable.disabled;
-            t.table(Styles.black, c -> c.add("@nearpoint")
+            t.table(Styles.black6, 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))
+            .labelAlign(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;
         });
 
-        parent.fill(t -> {
-            t.name = "waiting";
-            t.visible(() -> netServer.isWaitingForPlayers());
-            t.table(Tex.button, c -> c.add("@waiting.players"));
-        });
-
-        //'core is under attack' table
-        parent.fill(t -> {
-            t.name = "coreattack";
-            t.touchable = Touchable.disabled;
-            float notifDuration = 240f;
-            float[] coreAttackTime = {0};
-            float[] coreAttackOpacity = {0};
-
-            Events.run(Trigger.teamCoreDamage, () -> {
-                coreAttackTime[0] = notifDuration;
-            });
-
-            t.top().visible(() -> {
-                if(!shown) return false;
-                if(state.isMenu() || !state.teams.get(player.team()).hasCore()){
-                    coreAttackTime[0] = 0f;
-                    return false;
-                }
-
-                t.color.a = coreAttackOpacity[0];
-                if(coreAttackTime[0] > 0){
-                    coreAttackOpacity[0] = Mathf.lerpDelta(coreAttackOpacity[0], 1f, 0.1f);
-                }else{
-                    coreAttackOpacity[0] = Mathf.lerpDelta(coreAttackOpacity[0], 0f, 0.1f);
-                }
-
-                coreAttackTime[0] -= Time.delta;
-
-                return coreAttackOpacity[0] > 0;
-            });
-            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);
-        });
-
         //'saving' indicator
         parent.fill(t -> {
             t.name = "saving";
@@ -326,55 +491,40 @@ public class HudFragment extends Fragment{
             t.add("@saving").style(Styles.outlineLabel);
         });
 
-        parent.fill(p -> {
-            p.name = "hudtext";
-            p.top().table(Styles.black3, t -> t.margin(4).label(() -> hudText)
-            .style(Styles.outlineLabel)).padTop(10).visible(p.color.a >= 0.001f);
-            p.update(() -> {
-                p.color.a = Mathf.lerpDelta(p.color.a, Mathf.num(showHudText), 0.2f);
-                if(state.isMenu()){
-                    p.color.a = 0f;
-                    showHudText = false;
-                }
-            });
-            p.touchable = Touchable.disabled;
-        });
-
         //TODO DEBUG: rate table
         if(false)
-        parent.fill(t -> {
-            t.name = "rates";
-            t.bottom().left();
-            t.table(Styles.black6, c -> {
-                Bits used = new Bits(content.items().size);
+            parent.fill(t -> {
+                t.bottom().left();
+                t.table(Styles.black6, c -> {
+                    Bits used = new Bits(content.items().size);
 
-                Runnable rebuild = () -> {
-                    c.clearChildren();
+                    Runnable rebuild = () -> {
+                        c.clearChildren();
 
-                    for(Item item : content.items()){
-                        if(state.rules.sector != null && state.rules.sector.info.getExport(item) >= 1){
-                            c.image(item.icon(Cicon.small));
-                            c.label(() -> (int)state.rules.sector.info.getExport(item) + " /s").color(Color.lightGray);
-                            c.row();
+                        for(Item item : content.items()){
+                            if(state.rules.sector != null && state.rules.sector.info.getExport(item) >= 1){
+                                c.image(item.uiIcon);
+                                c.label(() -> (int)state.rules.sector.info.getExport(item) + " /s").color(Color.lightGray);
+                                c.row();
+                            }
                         }
-                    }
-                };
+                    };
 
-                c.update(() -> {
-                    boolean wrong = false;
-                    for(Item item : content.items()){
-                        boolean has = state.rules.sector != null && state.rules.sector.info.getExport(item) >= 1;
-                        if(used.get(item.id) != has){
-                            used.set(item.id, has);
-                            wrong = true;
+                    c.update(() -> {
+                        boolean wrong = false;
+                        for(Item item : content.items()){
+                            boolean has = state.rules.sector != null && state.rules.sector.info.getExport(item) >= 1;
+                            if(used.get(item.id) != has){
+                                used.set(item.id, has);
+                                wrong = true;
+                            }
                         }
-                    }
-                    if(wrong){
-                        rebuild.run();
-                    }
-                });
-            }).visible(() -> state.isCampaign() && content.items().contains(i -> state.rules.sector != null && state.rules.sector.info.getExport(i) > 0));
-        });
+                        if(wrong){
+                            rebuild.run();
+                        }
+                    });
+                }).visible(() -> state.isCampaign() && content.items().contains(i -> state.rules.sector != null && state.rules.sector.info.getExport(i) > 0));
+            });
 
         blockfrag.build(parent);
     }
@@ -407,11 +557,19 @@ public class HudFragment extends Fragment{
         }
     }
 
+    public boolean hasToast(){
+        return Time.timeSinceMillis(lastToast) < 3.5f * 1000f;
+    }
+
     public void showToast(String text){
         showToast(Icon.ok, text);
     }
 
     public void showToast(Drawable icon, String text){
+        showToast(icon, -1, text);
+    }
+
+    public void showToast(Drawable icon, float size, String text){
         if(state.isMenu()) return;
 
         scheduleToast(() -> {
@@ -424,7 +582,8 @@ public class HudFragment extends Fragment{
                 }
             });
             table.margin(12);
-            table.image(icon).pad(3);
+            var cell = table.image(icon).pad(3);
+            if(size > 0) cell.size(size);
             table.add(text).wrap().width(280f).get().setAlignment(Align.center, Align.center);
             table.pack();
 
@@ -462,7 +621,7 @@ public class HudFragment extends Fragment{
                 Table in = new Table();
 
                 //create texture stack for displaying
-                Image image = new Image(content.icon(Cicon.xlarge));
+                Image image = new Image(content.uiIcon);
                 image.setScaling(Scaling.fit);
 
                 in.add(image).size(8 * 6).pad(2);
@@ -516,7 +675,7 @@ public class HudFragment extends Fragment{
             //if there's space, add it
             if(esize < cap){
 
-                Image image = new Image(content.icon(Cicon.medium));
+                Image image = new Image(content.uiIcon);
                 image.setScaling(Scaling.fit);
 
                 lastUnlockLayout.add(image);
@@ -528,20 +687,19 @@ public class HudFragment extends Fragment{
         }
     }
 
-    public void showLaunchDirect(){
-        Image image = new Image();
-        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);
-    }
-
+    /** @deprecated see {@link CoreBuild#beginLaunch(CoreBlock)} */
+    @Deprecated
     public void showLaunch(){
+        float margin = 30f;
+
         Image image = new Image();
         image.color.a = 0f;
+        image.touchable = Touchable.disabled;
         image.setFillParent(true);
-        image.actions(Actions.fadeIn(40f / 60f));
+        image.actions(Actions.delay((coreLandDuration - margin) / 60f), Actions.fadeIn(margin / 60f, Interp.pow2In), Actions.delay(6f / 60f), Actions.remove());
         image.update(() -> {
+            image.toFront();
+            ui.loadfrag.toFront();
             if(state.isMenu()){
                 image.remove();
             }
@@ -549,14 +707,17 @@ public class HudFragment extends Fragment{
         Core.scene.add(image);
     }
 
+    /** @deprecated see {@link CoreBuild#beginLaunch(CoreBlock)} */
+    @Deprecated
     public void showLand(){
         Image image = new Image();
         image.color.a = 1f;
         image.touchable = Touchable.disabled;
         image.setFillParent(true);
-        image.actions(Actions.fadeOut(0.8f), Actions.remove());
+        image.actions(Actions.fadeOut(35f / 60f), Actions.remove());
         image.update(() -> {
             image.toFront();
+            ui.loadfrag.toFront();
             if(state.isMenu()){
                 image.remove();
             }
@@ -577,13 +738,14 @@ public class HudFragment extends Fragment{
 
         StringBuilder ibuild = new StringBuilder();
 
-        IntFormat wavef = new IntFormat("wave");
-        IntFormat wavefc = new IntFormat("wave.cap");
-        IntFormat enemyf = new IntFormat("wave.enemy");
-        IntFormat enemiesf = new IntFormat("wave.enemies");
-        IntFormat enemycf = new IntFormat("wave.enemycore");
-        IntFormat enemycsf = new IntFormat("wave.enemycores");
-        IntFormat waitingf = new IntFormat("wave.waiting", i -> {
+        IntFormat
+        wavef = new IntFormat("wave"),
+        wavefc = new IntFormat("wave.cap"),
+        enemyf = new IntFormat("wave.enemy"),
+        enemiesf = new IntFormat("wave.enemies"),
+        enemycf = new IntFormat("wave.enemycore"),
+        enemycsf = new IntFormat("wave.enemycores"),
+        waitingf = new IntFormat("wave.waiting", i -> {
             ibuild.setLength(0);
             int m = i/60;
             int s = i % 60;
@@ -637,20 +799,14 @@ public class HudFragment extends Fragment{
 
                 if(Float.isNaN(value) || Float.isInfinite(value)) value = 1f;
 
-                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();
+                drawInner(Pal.darkishGray, 1f);
+                drawInner(Tmp.c1.set(color).lerp(Color.white, blink), value);
             }
 
-            void drawInner(Color color){
+            void drawInner(Color color, float fract){
+                if(fract < 0) return;
+
+                fract = Mathf.clamp(fract);
                 if(flip){
                     x += width;
                     width = -width;
@@ -658,21 +814,28 @@ public class HudFragment extends Fragment{
 
                 float stroke = width * 0.35f;
                 float bh = height/2f;
-                Draw.color(color);
+                Draw.color(color, parentAlpha);
+
+                float f1 = Math.min(fract * 2f, 1f), f2 = (fract - 0.5f) * 2f;
+
+                float bo = -(1f - f1) * (width - stroke);
 
                 Fill.quad(
                 x, y,
                 x + stroke, y,
-                x + width, y + bh,
-                x + width - stroke, y + bh
+                x + width + bo, y + bh * f1,
+                x + width - stroke + bo, y + bh * f1
                 );
 
-                Fill.quad(
-                x + width, y + bh,
-                x + width - stroke, y + bh,
-                x, y + height,
-                x + stroke, y + height
-                );
+                if(f2 > 0){
+                    float bx = x + (width - stroke) * (1f - f2);
+                    Fill.quad(
+                    x + width, y + bh,
+                    x + width - stroke, y + bh,
+                    bx, y + height * fract,
+                    bx + stroke, y + height * fract
+                    );
+                }
 
                 Draw.reset();
 
@@ -687,10 +850,10 @@ public class HudFragment extends Fragment{
         new Element(){
             @Override
             public void draw(){
-                Draw.color(Pal.darkerGray);
+                Draw.color(Pal.darkerGray, parentAlpha);
                 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);
+                Drawf.shadow(x + width/2f, y + height/2f, height * 1.13f, parentAlpha);
             }
         },
         new Table(t -> {
@@ -700,22 +863,67 @@ public class HudFragment extends Fragment{
             t.clicked(() -> {
                 if(!player.dead() && mobile){
                     Call.unitClear(player);
+                    control.input.recentRespawnTimer = 1f;
                     control.input.controlledType = null;
                 }
             });
 
-            t.add(new SideBar(() -> player.unit().healthf(), () -> true, true)).width(bw).growY().padRight(pad);
+            t.add(new SideBar(() -> player.dead() ? 0f : 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);
+                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(() -> {
+        Cell[] lcell = {null};
+        boolean[] couldSkip = {true};
+
+        lcell[0] = table.labelWrap(() -> {
+
+            //update padding depend on whether the button to the right is there
+            boolean can = canSkipWave();
+            if(can != couldSkip[0]){
+                if(canSkipWave()){
+                    lcell[0].padRight(8f);
+                }else{
+                    lcell[0].padRight(-42f);
+                }
+                table.invalidateHierarchy();
+                table.pack();
+                couldSkip[0] = can;
+            }
+
             builder.setLength(0);
 
+            //mission overrides everything
+            if(state.rules.mission != null && state.rules.mission.length() > 0){
+                builder.append(state.rules.mission);
+                return builder;
+            }
+
+            //objectives override mission?
+            if(state.rules.objectives.any()){
+                boolean first = true;
+                for(var obj : state.rules.objectives){
+                    if(!obj.qualified() || obj.hidden) continue;
+
+                    String text = obj.text();
+                    if(text != null && !text.isEmpty()){
+                        if(!first) builder.append("\n[white]");
+                        builder.append(text);
+
+                        first = false;
+                    }
+                }
+
+                //TODO: display standard status when empty objective?
+                if(builder.length() > 0){
+                    return builder;
+                }
+            }
+
             if(!state.rules.waves && state.rules.attackMode){
                 int sum = Math.max(state.teams.present.sum(t -> t.team != player.team() ? t.cores.size : 0), 1);
                 builder.append(sum > 1 ? enemycsf.get(sum) : enemycf.get(sum));
@@ -730,7 +938,7 @@ public class HudFragment extends Fragment{
                 return builder;
             }
 
-            if(state.rules.winWave > 1 && state.rules.winWave >= state.wave && state.isCampaign()){
+            if(state.rules.winWave > 1 && state.rules.winWave >= state.wave){
                 builder.append(wavefc.get(state.wave, state.rules.winWave));
             }else{
                 builder.append(wavef.get(state.wave));
@@ -757,6 +965,37 @@ public class HudFragment extends Fragment{
 
         table.row();
 
+        //TODO nobody reads details anyway.
+        /*
+        table.clicked(() -> {
+            if(state.rules.objectives.any()){
+                StringBuilder text = new StringBuilder();
+
+                boolean first = true;
+                for(var obj : state.rules.objectives){
+                    if(!obj.qualified()) continue;
+
+                    String details = obj.details();
+                    if(details != null){
+                        if(!first) text.append('\n');
+                        text.append(details);
+
+                        first = false;
+                    }
+                }
+
+                //TODO this, as said before, could be much better.
+                ui.showInfo(text.toString());
+            }
+        });*/
+
+        return table;
+    }
+
+    private void addInfoTable(Table table){
+        table.name = "infotable";
+        table.left();
+
         var count = new float[]{-1};
         table.table().update(t -> {
             if(player.unit() instanceof Payloadc payload){
@@ -765,15 +1004,39 @@ public class HudFragment extends Fragment{
                     count[0] = payload.payloadUsed();
                 }
             }else{
+                count[0] = -1;
                 t.clear();
             }
         }).growX().visible(() -> player.unit() instanceof Payloadc p && p.payloadUsed() > 0).colspan(2);
+        table.row();
 
-        return table;
+        Bits statuses = new Bits();
+
+        table.table().update(t -> {
+            t.left();
+            Bits applied = player.dead() ? null : player.unit().statusBits();
+            if(!statuses.equals(applied)){
+                t.clear();
+
+                if(applied != null){
+                    for(StatusEffect effect : content.statusEffects()){
+                        if(applied.get(effect.id) && !effect.isHidden()){
+                            t.image(effect.uiIcon).size(iconMed).get()
+                            .addListener(new Tooltip(l -> l.label(() ->
+                                effect.localizedName + " [lightgray]" + UI.formatTime(player.unit().getDuration(effect))).style(Styles.outlineLabel)));
+                        }
+                    }
+
+                    statuses.set(applied);
+                }else{
+                    statuses.clear();
+                }
+            }
+        }).left();
     }
 
     private boolean canSkipWave(){
-        return state.rules.waves && ((net.server() || player.admin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning();
+        return state.rules.waves && state.rules.waveSending && ((net.server() || player.admin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning();
     }
 
 }
diff --git a/core/src/mindustry/ui/fragments/LoadingFragment.java b/core/src/mindustry/ui/fragments/LoadingFragment.java
index 348783fe05..0b26286018 100644
--- a/core/src/mindustry/ui/fragments/LoadingFragment.java
+++ b/core/src/mindustry/ui/fragments/LoadingFragment.java
@@ -12,13 +12,13 @@ import arc.scene.ui.layout.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
 
-public class LoadingFragment extends Fragment{
+public class LoadingFragment{
     private Table table;
     private TextButton button;
     private Bar bar;
     private Label nameLabel;
+    private float progValue;
 
-    @Override
     public void build(Group parent){
         parent.fill(t -> {
             //rect must fill screen completely.
@@ -38,19 +38,34 @@ public class LoadingFragment extends Fragment{
 
             text("@loading");
 
-            bar = t.add(new Bar()).pad(3).size(500f, 40f).visible(false).get();
+            bar = t.add(new Bar()).pad(3).padTop(6).size(500f, 40f).visible(false).get();
             t.row();
             button = t.button("@cancel", () -> {}).pad(20).size(250f, 70f).visible(false).get();
             table = t;
         });
     }
 
+    public void toFront(){
+        table.toFront();
+    }
+
     public void setProgress(Floatp progress){
         bar.reset(0f);
         bar.visible = true;
         bar.set(() -> ((int)(progress.get() * 100) + "%"), progress, Pal.accent);
     }
 
+    public void snapProgress(){
+        bar.snap();
+    }
+
+    public void setProgress(float progress){
+        progValue = progress;
+        if(!bar.visible){
+            setProgress(() -> progValue);
+        }
+    }
+
     public void setButton(Runnable listener){
         button.visible = true;
         button.getListeners().remove(button.getListeners().size - 1);
@@ -67,6 +82,7 @@ public class LoadingFragment extends Fragment{
     }
 
     public void show(String text){
+        button.visible = false;
         nameLabel.setColor(Color.white);
         bar.visible = false;
         table.clearActions();
diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java
index d536ae1c00..296f3c5a89 100644
--- a/core/src/mindustry/ui/fragments/MenuFragment.java
+++ b/core/src/mindustry/ui/fragments/MenuFragment.java
@@ -9,7 +9,10 @@ import arc.scene.actions.*;
 import arc.scene.event.*;
 import arc.scene.style.*;
 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.core.*;
 import mindustry.game.EventType.*;
@@ -18,19 +21,15 @@ import mindustry.graphics.*;
 import mindustry.ui.*;
 
 import static mindustry.Vars.*;
+import static mindustry.gen.Tex.*;
 
-public class MenuFragment extends Fragment{
+public class MenuFragment{
     private Table container, submenu;
     private Button currentMenu;
     private MenuRenderer renderer;
+    private Seq<MenuButton> customButtons = new Seq<>();
+    public Seq<MenuButton> desktopButtons = null;
 
-    public MenuFragment(){
-        Events.on(DisposeEvent.class, event -> {
-            renderer.dispose();
-        });
-    }
-
-    @Override
     public void build(Group parent){
         renderer = new MenuRenderer();
 
@@ -44,22 +43,40 @@ public class MenuFragment extends Fragment{
         parent.fill((x, y, w, h) -> renderer.render());
 
         parent.fill(c -> {
-            container = c;
-            c.name = "menu container";
+            c.pane(Styles.noBarPane, cont -> {
+                container = cont;
+                cont.name = "menu container";
 
-            if(!mobile){
-                buildDesktop();
-                Events.on(ResizeEvent.class, event -> buildDesktop());
-            }else{
-                buildMobile();
-                Events.on(ResizeEvent.class, event -> buildMobile());
-            }
+                if(!mobile){
+                    c.left();
+                    buildDesktop();
+                    Events.on(ResizeEvent.class, event -> buildDesktop());
+                }else{
+                    buildMobile();
+                    Events.on(ResizeEvent.class, event -> buildMobile());
+                }
+            }).with(pane -> {
+                pane.setOverscroll(false, false);
+            }).grow();
         });
 
+        parent.fill(c -> c.bottom().right().button(Icon.discord, new ImageButtonStyle(){{
+            up = discordBanner;
+        }}, ui.discord::show).marginTop(9f).marginLeft(10f).tooltip("@discord").size(84, 45).name("discord"));
+
         //info icon
         if(mobile){
-            parent.fill(c -> c.bottom().left().button("", Styles.infot, ui.about::show).size(84, 45).name("info"));
-            parent.fill(c -> c.bottom().right().button("", Styles.discordt, ui.discord::show).size(84, 45).name("discord"));
+            parent.fill(c -> c.bottom().left().button("", new TextButtonStyle(){{
+                font = Fonts.def;
+                fontColor = Color.white;
+                up = infoBanner;
+            }}, ui.about::show).size(84, 45).name("info"));
+
+            parent.fill((x, y, w, h) -> {
+                if(Core.scene.marginBottom > 0){
+                    Tex.paneTop.draw(0, 0, Core.graphics.getWidth(), Core.scene.marginBottom);
+                }
+            });
         }else if(becontrol.active()){
             parent.fill(c -> c.bottom().right().button("@be.check", Icon.refresh, () -> {
                 ui.loadfrag.show();
@@ -78,18 +95,21 @@ public class MenuFragment extends Fragment{
         parent.fill((x, y, w, h) -> {
             TextureRegion logo = Core.atlas.find("logo");
             float width = Core.graphics.getWidth(), height = Core.graphics.getHeight() - Core.scene.marginTop;
-            float logoscl = Scl.scl(1);
+            float logoscl = Scl.scl(1) * logo.scale;
             float logow = Math.min(logo.width * logoscl, Core.graphics.getWidth() - Scl.scl(20));
             float logoh = logow * (float)logo.height / logo.width;
 
             float fx = (int)(width / 2f);
             float fy = (int)(height - 6 - logoh) + logoh / 2 - (Core.graphics.isPortrait() ? Scl.scl(30f) : 0f);
+            if(Core.settings.getBool("macnotch") ){
+                fy -= Scl.scl(macNotchHeight);
+            }
 
             Draw.color();
             Draw.rect(logo, fx, fy, logow, logoh);
 
-            Fonts.def.setColor(Color.white);
-            Fonts.def.draw(versionText, fx, fy - logoh/2f, Align.center);
+            Fonts.outline.setColor(Color.white);
+            Fonts.outline.draw(versionText, fx, fy - logoh/2f - Scl.scl(2f), Align.center);
         }).touchable = Touchable.disabled;
     }
 
@@ -109,7 +129,10 @@ public class MenuFragment extends Fragment{
             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),
-            exit = new MobileButton(Icon.exit, "@quit", () -> Core.app.exit());
+            exit = new MobileButton(Icon.exit, "@quit", () -> Core.app.exit()),
+            about = new MobileButton(Icon.info, "@about.button", ui.about::show);
+
+        Seq<MobileButton> customs = customButtons.map(b -> new MobileButton(b.icon, b.text, b.runnable == null ? () -> {} : b.runnable));
 
         if(!Core.graphics.isPortrait()){
             container.marginTop(60f);
@@ -117,18 +140,20 @@ public class MenuFragment extends Fragment{
             container.add(join);
             container.add(custom);
             container.add(maps);
+            // add odd custom buttons
+            for(int i = 1; i < customs.size; i += 2){
+                container.add(customs.get(i));
+            }
             container.row();
 
-            container.table(table -> {
-                table.defaults().set(container.defaults());
-
-                table.add(editor);
-                table.add(tools);
-
-                table.add(mods);
-                //if(platform.canDonate()) table.add(donate);
-                if(!ios) table.add(exit);
-            }).colspan(4);
+            container.add(editor);
+            container.add(tools);
+            container.add(mods);
+            // add even custom buttons (before the exit button)
+            for(int i = 0; i < customs.size; i += 2){
+                container.add(customs.get(i));
+            }
+            container.add(ios ? about : exit);
         }else{
             container.marginTop(0f);
             container.add(play);
@@ -140,14 +165,13 @@ public class MenuFragment extends Fragment{
             container.add(editor);
             container.add(tools);
             container.row();
-
-            container.table(table -> {
-                table.defaults().set(container.defaults());
-
-                table.add(mods);
-                //if(platform.canDonate()) table.add(donate);
-                if(!ios) table.add(exit);
-            }).colspan(2);
+            container.add(mods);
+            // add custom buttons
+            for(int i = 0; i < customs.size; i++){
+                container.add(customs.get(i));
+                if(i % 2 == 0) container.row();
+            }
+            container.add(ios ? about : exit);
         }
     }
 
@@ -164,22 +188,28 @@ public class MenuFragment extends Fragment{
             t.defaults().width(width).height(70f);
             t.name = "buttons";
 
-            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("@editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new Buttoni("@workshop", Icon.book, platform::openWorkshop) : null,
-                new Buttoni("@mods", Icon.book, 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)
-            );
+            if(desktopButtons == null){
+                desktopButtons = Seq.with(
+                    new MenuButton("@play", Icon.play,
+                        new MenuButton("@campaign", Icon.play, () -> checkPlay(ui.planet::show)),
+                        new MenuButton("@joingame", Icon.add, () -> checkPlay(ui.join::show)),
+                        new MenuButton("@customgame", Icon.terrain, () -> checkPlay(ui.custom::show)),
+                        new MenuButton("@loadgame", Icon.download, () -> checkPlay(ui.load::show))
+                    ),
+                    new MenuButton("@database.button", Icon.menu,
+                        new MenuButton("@schematics", Icon.paste, ui.schematics::show),
+                        new MenuButton("@database", Icon.book, ui.database::show),
+                        new MenuButton("@about.button", Icon.info, ui.about::show)
+                    ),
+                    new MenuButton("@editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new MenuButton("@workshop", Icon.steam, platform::openWorkshop) : null,
+                    new MenuButton("@mods", Icon.book, ui.mods::show),
+                    new MenuButton("@settings", Icon.settings, ui.settings::show)
+                );
+            }
 
+            buttons(t, desktopButtons.toArray(MenuButton.class));
+            buttons(t, customButtons.toArray(MenuButton.class));
+            buttons(t, new MenuButton("@quit", Icon.exit, Core.app::exit));
         }).width(width).growY();
 
         container.table(background, t -> {
@@ -194,7 +224,6 @@ public class MenuFragment extends Fragment{
     }
 
     private void checkPlay(Runnable run){
-
         if(!mods.hasContentErrors()){
             run.run();
         }else{
@@ -217,23 +246,23 @@ public class MenuFragment extends Fragment{
         submenu.actions(Actions.alpha(1f), Actions.alpha(0f, 0.2f, Interp.fade), Actions.run(() -> submenu.clearChildren()));
     }
 
-    private void buttons(Table t, Buttoni... buttons){
-        for(Buttoni b : buttons){
+    private void buttons(Table t, MenuButton... buttons){
+        for(MenuButton b : buttons){
             if(b == null) continue;
             Button[] out = {null};
-            out[0] = t.button(b.text, b.icon, Styles.clearToggleMenut, () -> {
+            out[0] = t.button(b.text, b.icon, Styles.flatToggleMenut, () -> {
                 if(currentMenu == out[0]){
                     currentMenu = null;
                     fadeOutMenu();
                 }else{
-                    if(b.submenu != null){
+                    if(b.submenu != null && b.submenu.any()){
                         currentMenu = out[0];
                         submenu.clearChildren();
                         fadeInMenu();
                         //correctly offset the button
                         submenu.add().height((Core.graphics.getHeight() - Core.scene.marginTop - Core.scene.marginBottom - out[0].getY(Align.topLeft)) / Scl.scl(1f));
                         submenu.row();
-                        buttons(submenu, b.submenu);
+                        buttons(submenu, b.submenu.toArray());
                     }else{
                         currentMenu = null;
                         fadeOutMenu();
@@ -246,24 +275,56 @@ public class MenuFragment extends Fragment{
         }
     }
 
-    private static class Buttoni{
-        final Drawable icon;
-        final String text;
-        final Runnable runnable;
-        final Buttoni[] submenu;
+    /** Adds a custom button to the menu. */
+    public void addButton(String text, Drawable icon, Runnable callback){
+        addButton(new MenuButton(text, icon, callback));
+    }
 
-        public Buttoni(String text, Drawable icon, Runnable runnable){
+    /** Adds a custom button to the menu. */
+    public void addButton(String text, Runnable callback){
+        addButton(text, Styles.none, callback);
+    }
+
+    /**
+     * Adds a custom button to the menu.
+     * If {@link MenuButton#submenu} is null or the player is on mobile, {@link MenuButton#runnable} is invoked on click.
+     * Otherwise, {@link MenuButton#submenu} is shown.
+     */
+    public void addButton(MenuButton button){
+        customButtons.add(button);
+    }
+
+    /** Represents a menu button definition. */
+    public static class MenuButton{
+        public final Drawable icon;
+        public final String text;
+        /** Runnable ran when the button is clicked. Ignored on desktop if {@link #submenu} is not null. */
+        public final Runnable runnable;
+        /** Submenu shown when this button is clicked. Used instead of {@link #runnable} on desktop. */
+        public final @Nullable Seq<MenuButton> submenu;
+
+        /** Constructs a simple menu button, which behaves the same way on desktop and mobile. */
+        public MenuButton(String text, Drawable icon, Runnable runnable){
             this.icon = icon;
             this.text = text;
             this.runnable = runnable;
             this.submenu = null;
         }
 
-        public Buttoni(String text, Drawable icon, Buttoni... buttons){
+        /** Constructs a button that runs the runnable when clicked on mobile or shows the submenu on desktop. */
+        public MenuButton(String text, Drawable icon, Runnable runnable, MenuButton... submenu){
+            this.icon = icon;
+            this.text = text;
+            this.runnable = runnable;
+            this.submenu = submenu != null ? Seq.with(submenu) : null;
+        }
+
+        /** Comstructs a desktop-only button; used internally. */
+        MenuButton(String text, Drawable icon, MenuButton... submenu){
             this.icon = icon;
             this.text = text;
             this.runnable = () -> {};
-            this.submenu = buttons;
+            this.submenu = submenu != null ? Seq.with(submenu) : null;
         }
     }
 }
diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java
index 07536f2e3c..2fe8df586e 100644
--- a/core/src/mindustry/ui/fragments/MinimapFragment.java
+++ b/core/src/mindustry/ui/fragments/MinimapFragment.java
@@ -5,22 +5,33 @@ 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.layout.*;
+import arc.util.*;
 import mindustry.gen.*;
 import mindustry.input.*;
 import mindustry.ui.*;
 
 import static mindustry.Vars.*;
 
-public class MinimapFragment extends Fragment{
+public class MinimapFragment{
     private boolean shown;
     float panx, pany, zoom = 1f, lastZoom = -1;
     private float baseSize = Scl.scl(5f);
     public Element elem;
 
-    @Override
+    protected Rect getRectBounds(){
+        float
+            w = Core.graphics.getWidth(),
+            h = Core.graphics.getHeight(),
+            ratio = renderer.minimap.getTexture() == null ? 1f : (float)renderer.minimap.getTexture().height / renderer.minimap.getTexture().width,
+            size = baseSize * zoom * world.width();
+
+        return Tmp.r1.set(w/2f + panx*zoom - size/2f, h/2f + pany*zoom - size/2f * ratio, size, size * ratio);
+    }
+
     public void build(Group parent){
         elem = parent.fill((x, y, w, h) -> {
             w = Core.graphics.getWidth();
@@ -35,7 +46,9 @@ public class MinimapFragment extends Fragment{
                 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);
+
+                Rect bounds = getRectBounds();
+                renderer.minimap.drawEntities(bounds.x, bounds.y, bounds.width, bounds.height, zoom, true);
             }
 
             Draw.reset();
@@ -69,13 +82,20 @@ public class MinimapFragment extends Fragment{
 
             @Override
             public void pan(InputEvent event, float x, float y, float deltaX, float deltaY){
-                panx += deltaX / zoom;
-                pany += deltaY / zoom;
+                if(event.keyCode != KeyCode.mouseRight){
+                    panx += deltaX / zoom;
+                    pany += deltaY / zoom;
+                }else{
+                    panTo(x, y);
+                }
             }
 
             @Override
             public void touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
                 super.touchDown(event, x, y, pointer, button);
+                if(button == KeyCode.mouseRight){
+                    panTo(x, y);
+                }
             }
 
             @Override
@@ -106,6 +126,12 @@ public class MinimapFragment extends Fragment{
         });
     }
 
+    public void panTo(float relativeX, float relativeY){
+        Rect r = getRectBounds();
+        Tmp.v1.set(relativeX, relativeY).sub(r.x, r.y).scl(1f / r.width, 1f / r.height).scl(world.unitWidth(), world.unitHeight());
+        control.input.panCamera(Tmp.v1.clamp(-tilesize/2f, -tilesize/2f, world.unitWidth() + tilesize/2f, world.unitHeight() + tilesize/2f));
+    }
+
     public boolean shown(){
         return shown;
     }
@@ -115,11 +141,14 @@ public class MinimapFragment extends Fragment{
     }
 
     public void toggle(){
-        float size = baseSize * zoom * world.width();
-        float ratio = (float)renderer.minimap.getTexture().height / renderer.minimap.getTexture().width;
-        float px = player.dead() ? Core.camera.position.x : player.x, py = player.dead() ? Core.camera.position.y : player.y;
-        panx = (size/2f - px / (world.width() * tilesize) * size) / zoom;
-        pany = (size*ratio/2f - py / (world.height() * tilesize) * size*ratio) / zoom;
+        if(renderer.minimap.getTexture() != null){
+            float size = baseSize * zoom * world.width();
+            float ratio = (float)renderer.minimap.getTexture().height / renderer.minimap.getTexture().width;
+            float px = player.dead() ? Core.camera.position.x : player.x, py = player.dead() ? Core.camera.position.y : player.y;
+            panx = (size/2f - px / (world.width() * tilesize) * size) / zoom;
+            pany = (size*ratio/2f - py / (world.height() * tilesize) * size*ratio) / zoom;
+        }
+
         shown = !shown;
     }
 }
diff --git a/core/src/mindustry/ui/fragments/OverlayFragment.java b/core/src/mindustry/ui/fragments/OverlayFragment.java
deleted file mode 100644
index 72dd3c223d..0000000000
--- a/core/src/mindustry/ui/fragments/OverlayFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package mindustry.ui.fragments;
-
-import arc.*;
-import arc.scene.event.*;
-import arc.scene.ui.layout.*;
-import mindustry.*;
-
-/** Fragment for displaying overlays such as block inventories. */
-public class OverlayFragment{
-    public final BlockInventoryFragment inv;
-    public final BlockConfigFragment config;
-
-    private WidgetGroup group = new WidgetGroup();
-
-    public OverlayFragment(){
-        group.touchable = Touchable.childrenOnly;
-        inv = new BlockInventoryFragment();
-        config = new BlockConfigFragment();
-    }
-
-    public void add(){
-        group.setFillParent(true);
-        Vars.ui.hudGroup.addChildBefore(Core.scene.find("overlaymarker"), group);
-
-        inv.build(group);
-        config.build(group);
-    }
-
-    public void remove(){
-        group.remove();
-    }
-}
diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java
index 7bb3e6be3c..d798d69f96 100644
--- a/core/src/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/mindustry/ui/fragments/PlacementFragment.java
@@ -8,25 +8,29 @@ import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
+import arc.scene.ui.Tooltip.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.ai.*;
+import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.input.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
-import mindustry.world.blocks.*;
 import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-public class PlacementFragment extends Fragment{
+public class PlacementFragment{
     final int rowWidth = 4;
 
     public Category currentCategory = Category.distribution;
@@ -36,13 +40,17 @@ public class PlacementFragment extends Fragment{
     boolean[] categoryEmpty = new boolean[Category.all.length];
     ObjectMap<Category,Block> selectedBlocks = new ObjectMap<>();
     ObjectFloatMap<Category> scrollPositions = new ObjectFloatMap<>();
-    Block menuHoverBlock;
-    Displayable hover;
-    Object lastDisplayState;
+    @Nullable Block menuHoverBlock;
+    @Nullable Displayable hover;
+    @Nullable Building lastFlowBuild, nextFlowBuild;
+    @Nullable Object lastDisplayState;
+    @Nullable Team lastTeam;
     boolean wasHovered;
-    Table blockTable, toggler, topTable;
+    Table blockTable, toggler, topTable, blockCatTable, commandTable;
+    Stack mainStack;
     ScrollPane blockPane;
-    boolean blockSelectEnd;
+    Runnable rebuildCommand;
+    boolean blockSelectEnd, wasCommandMode;
     int blockSelectSeq;
     long blockSelectSeqMillis;
     Binding[] blockSelect = {
@@ -65,11 +73,18 @@ public class PlacementFragment extends Fragment{
     public PlacementFragment(){
         Events.on(WorldLoadEvent.class, event -> {
             Core.app.post(() -> {
+                currentCategory = Category.distribution;
                 control.input.block = null;
                 rebuild();
             });
         });
 
+        Events.run(Trigger.unitCommandChange, () -> {
+            if(rebuildCommand != null){
+                rebuildCommand.run();
+            }
+        });
+
         Events.on(UnlockEvent.class, event -> {
             if(event.content instanceof Block){
                 rebuild();
@@ -79,14 +94,29 @@ public class PlacementFragment extends Fragment{
         Events.on(ResetEvent.class, event -> {
             selectedBlocks.clear();
         });
+
+        Events.run(Trigger.update, () -> {
+            //disable flow updating on previous building so it doesn't waste CPU
+            if(lastFlowBuild != null && lastFlowBuild != nextFlowBuild){
+                if(lastFlowBuild.flowItems() != null) lastFlowBuild.flowItems().stopFlow();
+                if(lastFlowBuild.liquids != null) lastFlowBuild.liquids.stopFlow();
+            }
+
+            lastFlowBuild = nextFlowBuild;
+
+            if(nextFlowBuild != null){
+                if(nextFlowBuild.flowItems() != null) nextFlowBuild.flowItems().updateFlow();
+                if(nextFlowBuild.liquids != null) nextFlowBuild.liquids.updateFlow();
+            }
+        });
     }
 
     public Displayable hover(){
         return hover;
     }
 
-    void rebuild(){
-        currentCategory = Category.turret;
+    public void rebuild(){
+        //category does not change on rebuild anymore, only on new world load
         Group group = toggler.parent;
         int index = toggler.getZIndex();
         toggler.remove();
@@ -94,13 +124,17 @@ public class PlacementFragment extends Fragment{
         toggler.setZIndex(index);
     }
 
-    boolean gridUpdate(InputHandler input){
-        scrollPositions.put(currentCategory, blockPane.getScrollY());
+    boolean updatePick(InputHandler input){
+        if(Core.input.keyTap(Binding.pick) && player.isBuilder() && !Core.scene.hasDialog()){ //mouse eyedropper select
+            var build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
 
-        if(Core.input.keyTap(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 instanceof ConstructBlock ? ((ConstructBuild)tile).cblock : tile.block;
-            Object tryConfig = tile == null ? null : tile.config();
+            //can't middle click buildings in fog
+            if(build != null && build.inFogTo(player.team())){
+                build = null;
+            }
+
+            Block tryRecipe = build == null ? null : build instanceof ConstructBuild c ? c.current : build.block;
+            Object tryConfig = build == null || !build.block.copyConfig ? null : build.config();
 
             for(BuildPlan req : player.unit().plans()){
                 if(!req.breaking && req.block.bounds(req.x, req.y, Tmp.r1).contains(Core.input.mouseWorld())){
@@ -110,15 +144,36 @@ public class PlacementFragment extends Fragment{
                 }
             }
 
-            if(tryRecipe != null && tryRecipe.isVisible() && unlocked(tryRecipe)){
+            if(tryRecipe == null && state.rules.editor){
+                var tile = world.tileWorld(Core.input.mouseWorldX(), Core.input.mouseWorldY());
+                if(tile != null){
+                    tryRecipe =
+                    tile.block() != Blocks.air ? tile.block() :
+                    tile.overlay() != Blocks.air ? tile.overlay() :
+                    tile.floor() != Blocks.air ? tile.floor() : null;
+                }
+            }
+
+            if(tryRecipe != null && ((tryRecipe.isVisible() && unlocked(tryRecipe)) || state.rules.editor)){
                 input.block = tryRecipe;
                 tryRecipe.lastConfig = tryConfig;
-                currentCategory = input.block.category;
+                if(tryRecipe.isVisible()){
+                    currentCategory = input.block.category;
+                }
                 return true;
             }
         }
+        return false;
+    }
 
-        if(ui.chatfrag.shown() || Core.scene.hasKeyboard()) return false;
+    boolean gridUpdate(InputHandler input){
+        scrollPositions.put(currentCategory, blockPane.getScrollY());
+
+        if(updatePick(input)){
+            return true;
+        }
+
+        if(ui.chatfrag.shown() || ui.consolefrag.shown() || Core.scene.hasKeyboard()) return false;
 
         for(int i = 0; i < blockSelect.length; i++){
             if(Core.input.keyTap(blockSelect[i])){
@@ -175,25 +230,38 @@ public class PlacementFragment extends Fragment{
         }
 
         if(Core.input.keyTap(Binding.category_prev)){
+            int i = 0;
             do{
                 currentCategory = currentCategory.prev();
-            }while(categoryEmpty[currentCategory.ordinal()]);
+                i ++;
+            }while(categoryEmpty[currentCategory.ordinal()] && i < categoryEmpty.length);
             input.block = getSelectedBlock(currentCategory);
             return true;
         }
 
         if(Core.input.keyTap(Binding.category_next)){
+            int i = 0;
             do{
                 currentCategory = currentCategory.next();
-            }while(categoryEmpty[currentCategory.ordinal()]);
+                i ++;
+            }while(categoryEmpty[currentCategory.ordinal()] && i < categoryEmpty.length);
             input.block = getSelectedBlock(currentCategory);
             return true;
         }
 
+        if(Core.input.keyTap(Binding.block_info)){
+            var build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
+            Block hovering = build == null ? null : build instanceof ConstructBuild c ? c.current : build.block;
+            Block displayBlock = menuHoverBlock != null ? menuHoverBlock : input.block != null ? input.block : hovering;
+            if(displayBlock != null && displayBlock.unlockedNow()){
+                ui.content.show(displayBlock);
+                Events.fire(new BlockInfoEvent());
+            }
+        }
+
         return false;
     }
 
-    @Override
     public void build(Group parent){
         parent.fill(full -> {
             toggler = full;
@@ -217,9 +285,9 @@ public class PlacementFragment extends Fragment{
                             blockTable.row();
                         }
 
-                        ImageButton button = blockTable.button(new TextureRegionDrawable(block.icon(Cicon.medium)), Styles.selecti, () -> {
+                        ImageButton button = blockTable.button(new TextureRegionDrawable(block.uiIcon), Styles.selecti, () -> {
                             if(unlocked(block)){
-                                if(Core.input.keyDown(KeyCode.shiftLeft) && Fonts.getUnicode(block.name) != 0){
+                                if((Core.input.keyDown(KeyCode.shiftLeft) || Core.input.keyDown(KeyCode.controlLeft)) && Fonts.getUnicode(block.name) != 0){
                                     Core.app.setClipboardText((char)Fonts.getUnicode(block.name) + "");
                                     ui.showInfoFade("@copied");
                                 }else{
@@ -228,7 +296,7 @@ public class PlacementFragment extends Fragment{
                                 }
                             }
                         }).size(46f).group(group).name("block-" + block.name).get();
-                        button.resizeImage(Cicon.medium.size);
+                        button.resizeImage(iconMed);
 
                         button.update(() -> { //color unplacable things gray
                             Building core = player.core();
@@ -276,13 +344,14 @@ public class PlacementFragment extends Fragment{
 
                         //don't refresh unnecessarily
                         //refresh only when the hover state changes, or the displayed block changes
-                        if(wasHovered == isHovered && lastDisplayState == displayState) return;
+                        if(wasHovered == isHovered && lastDisplayState == displayState && lastTeam == player.team()) return;
 
                         topTable.clear();
                         topTable.top().left().margin(5);
 
                         lastDisplayState = displayState;
                         wasHovered = isHovered;
+                        lastTeam = player.team();
 
                         //show details of selected block, with costs
                         if(displayBlock != null){
@@ -302,12 +371,12 @@ public class PlacementFragment extends Fragment{
                                 }
                                 final String keyComboFinal = keyCombo;
                                 header.left();
-                                header.add(new Image(displayBlock.icon(Cicon.medium))).size(8 * 4);
+                                header.add(new Image(displayBlock.uiIcon)).size(8 * 4);
                                 header.labelWrap(() -> !unlocked(displayBlock) ? Core.bundle.get("block.unknown") : displayBlock.localizedName + keyComboFinal)
                                 .left().width(190f).padLeft(5);
                                 header.add().growX();
                                 if(unlocked(displayBlock)){
-                                    header.button("?", Styles.clearPartialt, () -> {
+                                    header.button("?", Styles.flatBordert, () -> {
                                         ui.content.show(displayBlock);
                                         Events.fire(new BlockInfoEvent());
                                     }).size(8 * 5).padTop(-5).padRight(-5).right().grow().name("blockinfo");
@@ -321,15 +390,15 @@ public class PlacementFragment extends Fragment{
                                 for(ItemStack stack : displayBlock.requirements){
                                     req.table(line -> {
                                         line.left();
-                                        line.image(stack.item.icon(Cicon.small)).size(8 * 2);
+                                        line.image(stack.item.uiIcon).size(8 * 2);
                                         line.add(stack.item.localizedName).maxWidth(140f).fillX().color(Color.lightGray).padLeft(2).left().get().setEllipsis(true);
                                         line.labelWrap(() -> {
                                             Building core = player.core();
-                                            if(core == null || state.rules.infiniteResources) return "*/*";
+                                            int stackamount = Math.round(stack.amount * state.rules.buildCostMultiplier);
+                                            if(core == null || state.rules.infiniteResources) return "*/" + stackamount;
 
                                             int amount = core.items.get(stack.item);
-                                            int stackamount = Math.round(stack.amount * state.rules.buildCostMultiplier);
-                                            String color = (amount < stackamount / 2f ? "[red]" : amount < stackamount ? "[accent]" : "[white]");
+                                            String color = (amount < stackamount / 2f ? "[scarlet]" : amount < stackamount ? "[accent]" : "[white]");
 
                                             return color + UI.formatAmount(amount) + "[white]/" + stackamount;
                                         }).padLeft(5);
@@ -338,11 +407,11 @@ public class PlacementFragment extends Fragment{
                                 }
                             }).growX().left().margin(3);
 
-                            if(!displayBlock.isPlaceable() || !player.isBuilder()){
+                            if((!displayBlock.isPlaceable() || !player.isBuilder()) && !state.rules.editor){
                                 topTable.row();
                                 topTable.table(b -> {
                                     b.image(Icon.cancel).padRight(2).color(Color.scarlet);
-                                    b.add(!player.isBuilder() ? "@unit.nobuild" : "@banned").width(190f).wrap();
+                                    b.add(!player.isBuilder() ? "@unit.nobuild" : !displayBlock.supportsEnv(state.rules.env) ? "@unsupported.environment" : "@banned").width(190f).wrap();
                                     b.left();
                                 }).padTop(2).left();
                             }
@@ -352,65 +421,295 @@ public class PlacementFragment extends Fragment{
                             hovered.display(topTable);
                         }
                     });
-                }).colspan(3).fillX().visible(this::hasInfoBox).touchable(Touchable.enabled);
-                frame.row();
-                frame.image().color(Pal.gray).colspan(3).height(4).growX();
-                frame.row();
-                frame.table(Tex.pane2, blocksSelect -> {
-                    blocksSelect.margin(4).marginTop(0);
-                    blockPane = blocksSelect.pane(blocks -> blockTable = blocks).height(194f).update(pane -> {
-                        if(pane.hasScroll()){
-                            Element result = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
-                            if(result == null || !result.isDescendantOf(pane)){
-                                Core.scene.setScrollFocus(null);
-                            }
-                        }
-                    }).grow().get();
-                    blockPane.setStyle(Styles.smallPane);
-                    blocksSelect.row();
-                    blocksSelect.table(control.input::buildPlacementUI).name("inputTable").growX();
-                }).fillY().bottom().touchable(Touchable.enabled);
-                frame.table(categories -> {
-                    categories.bottom();
-                    categories.add(new Image(Styles.black6){
-                        @Override
-                        public void draw(){
-                            if(height <= Scl.scl(3f)) return;
-                            getDrawable().draw(x, y, width, height - Scl.scl(3f));
-                        }
-                    }).colspan(2).growX().growY().padTop(-3f).row();
-                    categories.defaults().size(50f);
+                }).colspan(3).fillX().visible(this::hasInfoBox).touchable(Touchable.enabled).row();
 
-                    ButtonGroup<ImageButton> group = new ButtonGroup<>();
+                frame.image().color(Pal.gray).colspan(3).height(4).growX().row();
 
-                    //update category empty values
-                    for(Category cat : Category.all){
-                        Seq<Block> blocks = getUnlockedByCategory(cat);
-                        categoryEmpty[cat.ordinal()] = blocks.isEmpty();
+                blockCatTable = new Table();
+                commandTable = new Table(Tex.pane2);
+                mainStack = new Stack();
+
+                mainStack.update(() -> {
+                    if(control.input.commandMode != wasCommandMode){
+                        mainStack.clearChildren();
+                        mainStack.addChild(control.input.commandMode ? commandTable : blockCatTable);
+
+                        //hacky, but forces command table to be same width as blocks
+                        if(control.input.commandMode){
+                            commandTable.getCells().peek().width(blockCatTable.getWidth() / Scl.scl(1f));
+                        }
+
+                        wasCommandMode = control.input.commandMode;
                     }
+                });
 
-                    int f = 0;
-                    for(Category cat : getCategories()){
-                        if(f++ % 2 == 0) categories.row();
+                frame.add(mainStack).colspan(3).fill();
 
-                        if(categoryEmpty[cat.ordinal()]){
-                            categories.image(Styles.black6);
-                            continue;
+                frame.row();
+
+                //for better inset visuals at the bottom
+                frame.rect((x, y, w, h) -> {
+                    if(Core.scene.marginBottom > 0){
+                        Tex.paneLeft.draw(x, 0, w, y);
+                    }
+                }).colspan(3).fillX().row();
+
+                //commandTable: commanded units
+                {
+                    commandTable.touchable = Touchable.enabled;
+                    commandTable.add(Core.bundle.get("commandmode.name")).fill().center().labelAlign(Align.center).row();
+                    commandTable.image().color(Pal.accent).growX().pad(20f).padTop(0f).padBottom(4f).row();
+                    commandTable.table(u -> {
+                        u.left();
+                        int[] curCount = {0};
+                        UnitCommand[] currentCommand = {null};
+                        var commands = new Seq<UnitCommand>();
+
+                        UnitStance[] currentStance = {null};
+                        var stances = new Seq<UnitStance>();
+
+                        rebuildCommand = () -> {
+                            u.clearChildren();
+                            var units = control.input.selectedUnits;
+                            if(units.size > 0){
+                                int[] counts = new int[content.units().size];
+                                for(var unit : units){
+                                    counts[unit.type.id] ++;
+                                }
+                                commands.clear();
+                                stances.clear();
+                                boolean firstCommand = false, firstStance = false;
+                                Table unitlist = u.table().growX().left().get();
+                                unitlist.left();
+
+                                int col = 0;
+                                for(int i = 0; i < counts.length; i++){
+                                    if(counts[i] > 0){
+                                        var type = content.unit(i);
+                                        unitlist.add(StatValues.stack(type, counts[i])).pad(4).with(b -> {
+                                            b.clearListeners();
+                                            b.addListener(Tooltips.getInstance().create(type.localizedName, false));
+
+                                            var listener = new ClickListener();
+
+                                            //left click -> select
+                                            b.clicked(KeyCode.mouseLeft, () -> {
+                                                control.input.selectedUnits.removeAll(unit -> unit.type != type);
+                                                Events.fire(Trigger.unitCommandChange);
+                                            });
+                                            //right click -> remove
+                                            b.clicked(KeyCode.mouseRight, () -> {
+                                                control.input.selectedUnits.removeAll(unit -> unit.type == type);
+                                                Events.fire(Trigger.unitCommandChange);
+                                            });
+
+                                            b.addListener(listener);
+                                            b.addListener(new HandCursorListener());
+                                            //gray on hover
+                                            b.update(() -> ((Group)b.getChildren().first()).getChildren().first().setColor(listener.isOver() ? Color.lightGray : Color.white));
+                                        });
+
+                                        if(++col % 7 == 0){
+                                            unitlist.row();
+                                        }
+
+                                        if(!firstCommand){
+                                            commands.add(type.commands);
+                                            firstCommand = true;
+                                        }else{
+                                            //remove commands that this next unit type doesn't have
+                                            commands.removeAll(com -> !type.commands.contains(com));
+                                        }
+
+                                        if(!firstStance){
+                                            stances.add(type.stances);
+                                            firstStance = true;
+                                        }else{
+                                            //remove commands that this next unit type doesn't have
+                                            stances.removeAll(st -> !type.stances.contains(st));
+                                        }
+                                    }
+                                }
+
+                                //list commands
+                                if(commands.size > 1){
+                                    u.row();
+
+                                    u.table(coms -> {
+                                        coms.left();
+                                        int scol = 0;
+                                        for(var command : commands){
+                                            coms.button(Icon.icons.get(command.icon, Icon.cancel), Styles.clearNoneTogglei, () -> {
+                                                Call.setUnitCommand(player, units.mapInt(un -> un.id).toArray(), command);
+                                            }).checked(i -> currentCommand[0] == command).size(50f).tooltip(command.localized(), true);
+
+                                            if(++scol % 6 == 0) coms.row();
+                                        }
+
+                                    }).fillX().padTop(4f).left();
+                                }
+
+                                //list stances
+                                if(stances.size > 1){
+                                    u.row();
+
+                                    if(commands.size > 1){
+                                        u.add(new Image(Tex.whiteui)).height(3f).color(Pal.gray).pad(7f).growX().row();
+                                    }
+
+                                    u.table(coms -> {
+                                        coms.left();
+                                        int scol = 0;
+                                        for(var stance : stances){
+
+                                            coms.button(Icon.icons.get(stance.icon, Icon.cancel), Styles.clearNoneTogglei, () -> {
+                                                Call.setUnitStance(player, units.mapInt(un -> un.id).toArray(), stance);
+                                            }).checked(i -> currentStance[0] == stance).size(50f).tooltip(stance.localized(), true);
+
+                                            if(++scol % 6 == 0) coms.row();
+                                        }
+                                    }).fillX().padTop(4f).left();
+                                }
+                            }else{
+                                u.add(Core.bundle.get("commandmode.nounits")).color(Color.lightGray).growX().center().labelAlign(Align.center).pad(6);
+                            }
+                        };
+
+                        u.update(() -> {
+                            {
+                                boolean hadCommand = false, hadStance = false;
+                                UnitCommand shareCommand = null;
+                                UnitStance shareStance = null;
+
+                                //find the command that all units have, or null if they do not share one
+                                for(var unit : control.input.selectedUnits){
+                                    if(unit.isCommandable()){
+                                        var nextCommand = unit.command().command;
+
+                                        if(hadCommand){
+                                            if(shareCommand != nextCommand){
+                                                shareCommand = null;
+                                            }
+                                        }else{
+                                            shareCommand = nextCommand;
+                                            hadCommand = true;
+                                        }
+
+                                        var nextStance = unit.command().stance;
+
+                                        if(hadStance){
+                                            if(shareStance != nextStance){
+                                                shareStance = null;
+                                            }
+                                        }else{
+                                            shareStance = nextStance;
+                                            hadStance = true;
+                                        }
+                                    }
+                                }
+
+                                currentCommand[0] = shareCommand;
+                                currentStance[0] = shareStance;
+
+                                int size = control.input.selectedUnits.size;
+                                if(curCount[0] != size){
+                                    curCount[0] = size;
+                                    rebuildCommand.run();
+                                }
+
+                                //not a huge fan of running input logic here, but it's convenient as the stance arrays are all here...
+                                for(UnitStance stance : stances){
+                                    //first stance must always be the stop stance
+                                    if(stance.keybind != null && Core.input.keyTap(stance.keybind)){
+                                        Call.setUnitStance(player, control.input.selectedUnits.mapInt(un -> un.id).toArray(), stance);
+                                    }
+                                }
+
+                                for(UnitCommand command : commands){
+                                    //first stance must always be the stop stance
+                                    if(command.keybind != null && Core.input.keyTap(command.keybind)){
+                                        Call.setUnitCommand(player, control.input.selectedUnits.mapInt(un -> un.id).toArray(), command);
+                                    }
+                                }
+                            }
+                        });
+                        rebuildCommand.run();
+                    }).grow();
+                }
+
+                //blockCatTable: all blocks | all categories
+                {
+                    blockCatTable.table(Tex.pane2, blocksSelect -> {
+                        blocksSelect.margin(4).marginTop(0);
+                        blockPane = blocksSelect.pane(blocks -> blockTable = blocks).height(194f).update(pane -> {
+                            if(pane.hasScroll()){
+                                Element result = Core.scene.getHoverElement();
+                                if(result == null || !result.isDescendantOf(pane)){
+                                    Core.scene.setScrollFocus(null);
+                                }
+                            }
+                        }).grow().get();
+                        blockPane.setStyle(Styles.smallPane);
+                        blocksSelect.row();
+                        blocksSelect.table(t -> {
+                            t.image().color(Pal.gray).height(4f).colspan(4).growX();
+                            t.row();
+                            control.input.buildPlacementUI(t);
+                        }).name("inputTable").growX();
+                    }).fillY().bottom().touchable(Touchable.enabled);
+                    blockCatTable.table(categories -> {
+                        categories.bottom();
+                        categories.add(new Image(Styles.black6){
+                            @Override
+                            public void draw(){
+                                if(height <= Scl.scl(3f)) return;
+                                getDrawable().draw(x, y, width, height - Scl.scl(3f));
+                            }
+                        }).colspan(2).growX().growY().padTop(-3f).row();
+                        categories.defaults().size(50f);
+
+                        ButtonGroup<ImageButton> group = new ButtonGroup<>();
+
+                        //update category empty values
+                        for(Category cat : Category.all){
+                            Seq<Block> blocks = getUnlockedByCategory(cat);
+                            categoryEmpty[cat.ordinal()] = blocks.isEmpty();
                         }
 
-                        categories.button(ui.getIcon(cat.name()), Styles.clearToggleTransi, () -> {
-                            currentCategory = cat;
-                            if(control.input.block != null){
-                                control.input.block = getSelectedBlock(currentCategory);
+                        boolean needsAssign = categoryEmpty[currentCategory.ordinal()];
+
+                        int f = 0;
+                        for(Category cat : getCategories()){
+                            if(f++ % 2 == 0) categories.row();
+
+                            if(categoryEmpty[cat.ordinal()]){
+                                categories.image(Styles.black6);
+                                continue;
                             }
-                            rebuildCategory.run();
-                        }).group(group).update(i -> i.setChecked(currentCategory == cat)).name("category-" + cat.name());
-                    }
-                }).fillY().bottom().touchable(Touchable.enabled);
+
+                            if(needsAssign){
+                                currentCategory = cat;
+                                needsAssign = false;
+                            }
+
+                            categories.button(ui.getIcon(cat.name()), Styles.clearTogglei, () -> {
+                                currentCategory = cat;
+                                if(control.input.block != null){
+                                    control.input.block = getSelectedBlock(currentCategory);
+                                }
+                                rebuildCategory.run();
+                            }).group(group).update(i -> i.setChecked(currentCategory == cat)).name("category-" + cat.name());
+                        }
+                    }).fillY().bottom().touchable(Touchable.enabled);
+                }
+
+                mainStack.add(blockCatTable);
 
                 rebuildCategory.run();
                 frame.update(() -> {
-                    if(gridUpdate(control.input)) rebuildCategory.run();
+                    if(!control.input.commandMode && gridUpdate(control.input)){
+                        rebuildCategory.run();
+                    }
                 });
             });
         });
@@ -421,7 +720,7 @@ public class PlacementFragment extends Fragment{
     }
 
     Seq<Block> getByCategory(Category cat){
-        return returnArray.selectFrom(content.blocks(), block -> block.category == cat && block.isVisible());
+        return returnArray.selectFrom(content.blocks(), block -> block.category == cat && block.isVisible() && block.environmentBuildable());
     }
 
     Seq<Block> getUnlockedByCategory(Category cat){
@@ -433,7 +732,8 @@ public class PlacementFragment extends Fragment{
     }
 
     boolean unlocked(Block block){
-        return block.unlockedNow();
+        return block.unlockedNowHost() && block.placeablePlayer && block.environmentBuildable() &&
+            block.supportsEnv(state.rules.env);
     }
 
     boolean hasInfoBox(){
@@ -441,16 +741,15 @@ public class PlacementFragment extends Fragment{
         return control.input.block != null || menuHoverBlock != null || hover != null;
     }
 
-    /** Returns the thing being hovered over. */
-    @Nullable
-    Displayable hovered(){
+    /** @return the thing being hovered over. */
+    public @Nullable Displayable hovered(){
         Vec2 v = topTable.stageToLocalCoordinates(Core.input.mouse());
 
         //if the mouse intersects the table or the UI has the mouse, no hovering can occur
-        if(Core.scene.hasMouse() || topTable.hit(v.x, v.y, false) != null) return null;
+        if(Core.scene.hasMouse(Core.input.mouseX(), Core.input.mouseY()) || topTable.hit(v.x, v.y, false) != null) return null;
 
         //check for a unit
-        Unit unit = Units.closestOverlap(player.team(), Core.input.mouseWorldX(), Core.input.mouseWorldY(), 5f, u -> !u.isLocal());
+        Unit unit = Units.closestOverlap(player.team(), Core.input.mouseWorldX(), Core.input.mouseWorldY(), 5f, u -> !u.isLocal() && u.displayable());
         //if cursor has a unit, display it
         if(unit != null) return unit;
 
@@ -458,13 +757,12 @@ public class PlacementFragment extends Fragment{
         Tile hoverTile = world.tileWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
         if(hoverTile != null){
             //if the tile has a building, display it
-            if(hoverTile.build != null){
-                hoverTile.build.updateFlow = true;
-                return hoverTile.build;
+            if(hoverTile.build != null && hoverTile.build.displayable() && !hoverTile.build.inFogTo(player.team())){
+                return nextFlowBuild = hoverTile.build;
             }
 
             //if the tile has a drop, display the drop
-            if(hoverTile.drop() != null){
+            if((hoverTile.drop() != null && hoverTile.block() == Blocks.air) || hoverTile.wallDrop() != null || hoverTile.floor().liquidDrop != null){
                 return hoverTile;
             }
         }
diff --git a/core/src/mindustry/ui/fragments/PlanConfigFragment.java b/core/src/mindustry/ui/fragments/PlanConfigFragment.java
new file mode 100644
index 0000000000..2303bbf6a6
--- /dev/null
+++ b/core/src/mindustry/ui/fragments/PlanConfigFragment.java
@@ -0,0 +1,83 @@
+package mindustry.ui.fragments;
+
+import arc.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.*;
+import arc.scene.actions.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.ctype.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+
+import static mindustry.Vars.*;
+
+/**
+ * Displays the configuration UI for build plans before they have been placed.
+ * Shamelessly stolen from Foo's Client.
+ */
+public class PlanConfigFragment{
+    Table table = new Table();
+    BuildPlan selected;
+
+    public void build(Group parent){
+        table.visible = false;
+        parent.addChild(table);
+
+        Events.on(EventType.ResetEvent.class, e -> forceHide());
+    }
+
+    public void showConfig(BuildPlan plan){
+        if(this.selected == plan || plan.block == null){
+            hide();
+            return;
+        }
+        Block block = plan.block;
+        if(!block.configurable) return;
+        selected = plan;
+        table.clear();
+
+        var options = new Seq<UnlockableContent>();
+        block.getPlanConfigs(options);
+
+        if(options.isEmpty()) return;
+
+        ItemSelection.buildTable(
+        table, options,
+        () -> selected != null ? (selected.config instanceof UnlockableContent c ? c : null) : null,
+        content -> {
+            selected.config = content;
+            hide();
+        },
+        block.selectionRows, block.selectionColumns
+        );
+        table.pack();
+        table.setTransform(true);
+        table.visible = true;
+        table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
+        Actions.scaleTo(1f, 1f, 0.07f, Interp.pow3Out));
+        table.update(() -> {
+            table.setOrigin(Align.center);
+            if(plan.isDone() || !(control.input.selectPlans.contains(plan) || player.dead() || player.unit().plans.contains(plan))){
+                this.hide();
+                return;
+            }
+            Vec2 pos = Core.input.mouseScreen(plan.drawx(), plan.drawy() - block.size * tilesize / 2.0F - 1);
+            table.setPosition(pos.x, pos.y, Align.top);
+        });
+    }
+
+    public void forceHide(){
+        table.visible = false;
+        selected = null;
+    }
+
+    public void hide(){
+        selected = null;
+        table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interp.pow3Out), Actions.visible(false));
+    }
+}
\ No newline at end of file
diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java
index b74ca8ab29..58d82ae32d 100644
--- a/core/src/mindustry/ui/fragments/PlayerListFragment.java
+++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java
@@ -1,29 +1,32 @@
 package mindustry.ui.fragments;
 
 import arc.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
+import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.net.*;
 import mindustry.net.Packets.*;
 import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
 
 import static mindustry.Vars.*;
 
-public class PlayerListFragment extends Fragment{
+public class PlayerListFragment{
     public Table content = new Table().marginRight(13f).marginLeft(13f);
     private boolean visible = false;
     private Interval timer = new Interval();
-    private TextField sField;
+    private TextField search;
     private Seq<Player> players = new Seq<>();
 
-    @Override
     public void build(Group parent){
         content.name = "players";
         parent.fill(cont -> {
@@ -47,15 +50,12 @@ public class PlayerListFragment extends Fragment{
             cont.table(Tex.buttonTrans, pane -> {
                 pane.label(() -> Core.bundle.format(Groups.player.size() == 1 ? "players.single" : "players", Groups.player.size()));
                 pane.row();
-                sField = pane.field(null, text -> {
-                    rebuild();
-                }).grow().pad(8).get();
-                sField.name = "search";
-                sField.setMaxLength(maxNameLength);
-                sField.setMessageText(Core.bundle.format("players.search"));
+
+                search = pane.field(null, text -> rebuild()).grow().pad(8).name("search").maxTextLength(maxNameLength).get();
+                search.setMessageText(Core.bundle.get("players.search"));
 
                 pane.row();
-                pane.pane(content).grow().get().setScrollingDisabled(true, false);
+                pane.pane(content).grow().scrollX(false);
                 pane.row();
 
                 pane.table(menu -> {
@@ -67,102 +67,191 @@ public class PlayerListFragment extends Fragment{
                     menu.button("@close", this::toggle);
                 }).margin(0f).pad(10f).growX();
 
-            }).touchable(Touchable.enabled).margin(14f);
+            }).touchable(Touchable.enabled).margin(14f).minWidth(360f);
         });
 
         rebuild();
     }
 
     public void rebuild(){
+        boolean allowTeamSwitch = !state.isCampaign() && (state.rules.pvp || state.rules.infiniteResources);
+
         content.clear();
 
-        float h = 74f;
+        float h = 50f;
         boolean found = false;
 
         players.clear();
         Groups.player.copy(players);
 
         players.sort(Structs.comps(Structs.comparing(Player::team), Structs.comparingBool(p -> !p.admin)));
+        if(search.getText().length() > 0){
+            players.retainAll(p -> Strings.stripColors(p.name().toLowerCase()).contains(search.getText().toLowerCase()));
+        }
 
         for(var user : players){
             found = true;
             NetConnection connection = user.con;
 
             if(connection == null && net.server() && !user.isLocal()) return;
-            if(sField.getText().length() > 0 && !user.name().toLowerCase().contains(sField.getText().toLowerCase()) && !Strings.stripColors(user.name().toLowerCase()).contains(sField.getText().toLowerCase())) return;
 
             Table button = new Table();
             button.left();
             button.margin(5).marginBottom(10);
 
-            Table table = new Table(){
+            ClickListener listener = new ClickListener();
+
+            Table iconTable = new Table(){
                 @Override
                 public void draw(){
                     super.draw();
-                    Draw.color(Pal.gray);
+                    Draw.colorMul(user.team().color, listener.isOver() ? 1.3f : 1f);
                     Draw.alpha(parentAlpha);
                     Lines.stroke(Scl.scl(4f));
                     Lines.rect(x, y, width, height);
                     Draw.reset();
                 }
             };
-            table.margin(8);
-            table.add(new Image(user.icon()).setScaling(Scaling.bounded)).grow();
-            table.name = user.name();
 
-            button.add(table).size(h);
-            button.labelWrap("[#" + user.color().toString().toUpperCase() + "]" + user.name()).width(170f).pad(10);
+            boolean clickable = !(state.rules.fog && state.rules.pvp && user.team() != player.team());
+
+            if(clickable){
+                iconTable.addListener(listener);
+                iconTable.addListener(new HandCursorListener());
+            }
+            iconTable.margin(8);
+            iconTable.add(new Image(user.icon()).setScaling(Scaling.bounded)).grow();
+            iconTable.name = user.name();
+            iconTable.touchable = Touchable.enabled;
+
+            iconTable.tapped(() -> {
+                if(!user.dead() && clickable){
+                    control.input.spectate(user.unit());
+                    ui.showInfoFade(Core.bundle.format("viewplayer", user.name), 1f);
+                }
+            });
+
+            button.add(iconTable).size(h);
+            button.labelWrap("[#" + user.color().toString().toUpperCase() + "]" + user.name()).style(Styles.outlineLabel).width(170f).pad(10);
             button.add().grow();
 
+            button.background(Tex.underline);
+
             button.image(Icon.admin).visible(() -> user.admin && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility();
 
-            if((net.server() || player.admin) && !user.isLocal() && (!user.admin || net.server())){
+            var ustyle = new ImageButtonStyle(){{
+                down = Styles.none;
+                up = Styles.none;
+                imageDownColor = Pal.accent;
+                imageUpColor = Color.white;
+                imageOverColor = Color.lightGray;
+            }};
+
+            if(net.server() || (player.admin && (!user.admin || user == player))){
                 button.add().growY();
 
-                float bs = (h) / 2f;
+                if(allowTeamSwitch || user != player){
+                    button.button(Icon.menu, ustyle, () -> {
+                        var dialog = new BaseDialog(user.coloredName());
 
-                button.table(t -> {
-                    t.defaults().size(bs);
+                        dialog.title.setColor(Color.white);
+                        dialog.titleTable.remove();
 
-                    t.button(Icon.hammer, Styles.clearPartiali,
-                    () -> 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)));
+                        dialog.closeOnBack();
 
-                    t.row();
+                        var bstyle = Styles.defaultt;
 
-                    t.button(Icon.admin, Styles.clearTogglePartiali, () -> {
-                        if(net.client()) return;
+                        dialog.cont.add(user.coloredName()).row();
+                        dialog.cont.image(Tex.whiteui, Pal.accent).fillX().height(3f).pad(4f).row();
 
-                        String id = user.uuid();
+                        dialog.cont.pane(t -> {
+                            t.defaults().size(220f, 55f).pad(3f);
 
-                        if(netServer.admins.isAdmin(id, connection.address)){
-                            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()));
-                        }
-                    }).update(b -> b.setChecked(user.admin))
-                        .disabled(b -> net.client())
-                        .touchable(() -> net.client() ? Touchable.disabled : Touchable.enabled)
-                        .checked(user.admin);
+                            if(user != player){
+                                t.button("@player.ban", Icon.hammer, bstyle, () -> {
+                                    ui.showConfirm("@confirm", Core.bundle.format("confirmban",  user.name()), () -> Call.adminRequest(user, AdminAction.ban, null));
+                                    dialog.hide();
+                                }).row();
 
-                    t.button(Icon.zoom, Styles.clearPartiali, () -> Call.adminRequest(user, AdminAction.trace));
+                                t.button("@player.kick", Icon.cancel, bstyle, () -> {
+                                    ui.showConfirm("@confirm", Core.bundle.format("confirmkick",  user.name()), () -> Call.adminRequest(user, AdminAction.kick, null));
+                                    dialog.hide();
+                                }).row();
 
-                }).padRight(12).size(bs + 10f, bs);
+                                t.button("@player.trace", Icon.zoom, bstyle, () -> {
+                                    Call.adminRequest(user, AdminAction.trace, null);
+                                    dialog.hide();
+                                }).row();
+                            }
+
+                            //there's generally no reason to team switch outside PvP or sandbox, and it's basically an easy way to cheat
+                            if(allowTeamSwitch){
+                                t.button("@player.team", Icon.redo, bstyle, () -> {
+                                    var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name);
+                                    teamSelect.setFillParent(false);
+
+                                    var group = new ButtonGroup<>();
+
+                                    int i = 0;
+
+                                    for(Team team : Team.baseTeams){
+                                        var b = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);
+                                        b.margin(4f);
+                                        b.getImageCell().grow();
+                                        b.getStyle().imageUpColor = team.color;
+                                        b.clicked(() -> {
+                                            Call.adminRequest(user, AdminAction.switchTeam, team);
+                                            teamSelect.hide();
+                                        });
+                                        teamSelect.cont.add(b).size(50f).checked(a -> user.team() == team).group(group);
+
+                                        if(i++ % 3 == 2) teamSelect.cont.row();
+                                    }
+
+                                    teamSelect.addCloseButton();
+                                    teamSelect.show();
+
+                                    dialog.hide();
+                                }).row();
+                            }
+
+                            if(!net.client() && !user.isLocal()){
+                                t.button("@player.admin", Icon.admin, Styles.togglet, () -> {
+                                    dialog.hide();
+                                    String id = user.uuid();
+
+                                    if(user.admin){
+                                        ui.showConfirm("@confirm", Core.bundle.format("confirmunadmin",  user.name()), () -> {
+                                            netServer.admins.unAdminPlayer(id);
+                                            user.admin = false;
+                                        });
+                                    }else{
+                                        ui.showConfirm("@confirm", Core.bundle.format("confirmadmin",  user.name()), () -> {
+                                            netServer.admins.adminPlayer(id, user.usid());
+                                            user.admin = true;
+                                        });
+                                    }
+                                }).checked(b -> user.admin).row();
+                            }
+                        }).row();
+
+                        dialog.cont.button("@back", Icon.left, dialog::hide).padTop(-1f).size(220f, 55f);
+
+                        dialog.show();
+
+
+                    }).size(h);
+                }
             }else if(!user.isLocal() && !user.admin && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick
                 button.add().growY();
 
-                button.button(Icon.hammer, Styles.clearPartiali,
-                () -> {
-                    ui.showConfirm("@confirm", Core.bundle.format("confirmvotekick",  user.name()), () -> {
-                        Call.sendChatMessage("/votekick " + user.name());
-                    });
-                }).size(h);
+                button.button(Icon.hammer, ustyle,
+                    () -> ui.showTextInput("@votekick.reason", Core.bundle.format("votekick.reason.message", user.name()), "",
+                    reason -> Call.sendChatMessage("/votekick #" + user.id + " " + reason)))
+                .size(h);
             }
 
-            content.add(button).padBottom(-6).width(350f).maxHeight(h + 14);
-            content.row();
-            content.image().height(4f).color(state.rules.pvp ? user.team().color : Pal.gray).growX();
+            content.add(button).width(350f).height(h + 14);
             content.row();
         }
 
@@ -179,7 +268,7 @@ public class PlayerListFragment extends Fragment{
             rebuild();
         }else{
             Core.scene.setKeyboardFocus(null);
-            sField.clearText();
+            search.clearText();
         }
     }
 
diff --git a/core/src/mindustry/ui/layout/BranchTreeLayout.java b/core/src/mindustry/ui/layout/BranchTreeLayout.java
index 9c598086cd..c5f94a01a9 100644
--- a/core/src/mindustry/ui/layout/BranchTreeLayout.java
+++ b/core/src/mindustry/ui/layout/BranchTreeLayout.java
@@ -26,7 +26,7 @@ public class BranchTreeLayout implements TreeLayout{
     }
 
     private float getWidthOrHeightOfNode(TreeNode treeNode, boolean returnWidth){
-        return returnWidth ? treeNode.width : treeNode.height;
+        return returnWidth ? treeNode.calcWidth() : treeNode.height;
     }
 
     private float getNodeThickness(TreeNode treeNode){
diff --git a/core/src/mindustry/ui/layout/TreeLayout.java b/core/src/mindustry/ui/layout/TreeLayout.java
index 1a44ee708c..a4ee3ac419 100644
--- a/core/src/mindustry/ui/layout/TreeLayout.java
+++ b/core/src/mindustry/ui/layout/TreeLayout.java
@@ -11,12 +11,23 @@ public interface TreeLayout{
         public T parent;
 
         //internal stuff
-        public float mode, prelim, change, shift;
+        public float mode, prelim, change, shift, cachedWidth = -1f;
         public int number = -1, leaves;
         public TreeNode thread, ancestor;
 
         public boolean isLeaf(){
             return children == null || children.length == 0;
         }
+
+        public float calcWidth(){
+            if(children == null) return width;
+            if(cachedWidth > 0) return cachedWidth;
+
+            float cWidth = 0;
+            for(T node : children){
+                cWidth += node.calcWidth();
+            }
+            return cachedWidth = Math.max(width, cWidth);
+        }
     }
 }
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index b82a1ddb1a..45b45f707d 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -18,42 +18,64 @@ import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
+import mindustry.entities.bullet.*;
 import mindustry.entities.units.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.MultiPacker.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.blocks.*;
 import mindustry.world.blocks.environment.*;
+import mindustry.world.blocks.power.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 import java.lang.reflect.*;
 import java.util.*;
 
 import static mindustry.Vars.*;
 
-public class Block extends UnlockableContent{
+public class Block extends UnlockableContent implements Senseable{
+    /** If true, buildings have an ItemModule. */
     public boolean hasItems;
+    /** If true, buildings have a LiquidModule. */
     public boolean hasLiquids;
+    /** If true, buildings have a PowerModule. */
     public boolean hasPower;
-
+    /** Flag for determining whether this block outputs liquid somewhere; used for connections. */
     public boolean outputsLiquid = false;
+    /** Used by certain power blocks (nodes) to flag as non-consuming of power. True by default, even if this block has no power. */
     public boolean consumesPower = true;
+    /** If true, this block is a generator that can produce power. */
     public boolean outputsPower = false;
+    /** If false, power nodes cannot connect to this block. */
+    public boolean connectedPower = true;
+    /** If true, this block can conduct power like a cable. */
+    public boolean conductivePower = false;
+    /** If true, this block can output payloads; affects blending. */
     public boolean outputsPayload = false;
-    public boolean outputFacing = true;
+    /** If true, this block can input payloads; affects unit payload enter behavior. */
+    public boolean acceptsUnitPayloads = false;
+    /** If true, payloads will attempt to move into this block. */
+    public boolean acceptsPayload = false;
+    /** Visual flag use for blending of certain transportation blocks. */
     public boolean acceptsItems = false;
-
+    /** If true, all item capacities of this block are separate instead of pooled as one number. */
+    public boolean separateItemCapacity = false;
+    /** maximum items this block can carry (usually, this is per-type of item) */
     public int itemCapacity = 10;
+    /** maximum total liquids this block can carry if hasLiquids = true */
     public float liquidCapacity = 10f;
+    /** higher numbers increase liquid output speed; TODO remove and replace with better liquids system */
     public float liquidPressure = 1f;
-
-    public final BlockBars bars = new BlockBars();
-    public final Consumers consumes = new Consumers();
-
+    /** If true, this block outputs to its facing direction, when applicable.
+     * Used for blending calculations. */
+    public boolean outputFacing = true;
+    /** if true, this block does not accept input from the sides (used for armored conveyors) */
+    public boolean noSideBlend = false;
     /** whether to display flow rate */
     public boolean displayFlow = true;
     /** whether this block is visible in the editor */
@@ -62,28 +84,58 @@ public class Block extends UnlockableContent{
     public @Nullable Object lastConfig;
     /** whether to save the last config and apply it to newly placed blocks */
     public boolean saveConfig = false;
+    /** whether to allow copying the config through middle click */
+    public boolean copyConfig = true;
+    /** if true, double-tapping this configurable block clears configuration. */
+    public boolean clearOnDoubleTap = false;
     /** whether this block has a tile entity that updates */
     public boolean update;
     /** whether this block has health and can be destroyed */
     public boolean destructible;
-    /** whether unloaders work on this block*/
+    /** whether unloaders work on this block */
     public boolean unloadable = true;
+    /** if true, this block acts a duct and will connect to armored ducts from the side. */
+    public boolean isDuct = false;
+    /** whether units can resupply by taking items from this block */
+    public boolean allowResupply = false;
     /** whether this is solid */
     public boolean solid;
     /** whether this block CAN be solid. */
     public boolean solidifes;
-    /** whether this is rotateable */
+    /** if true, this counts as a non-solid block to this team. */
+    public boolean teamPassable;
+    /** if true, this block cannot be hit by bullets unless explicitly targeted. */
+    public boolean underBullets;
+    /** whether this is rotatable */
     public boolean rotate;
+    /** if rotate is true and this is false, the region won't rotate when drawing */
+    public boolean rotateDraw = true;
+    /** if rotate = false and this is true, rotation will be locked at 0 when placing (default); advanced use only */
+    public boolean lockRotation = true;
+    /** if true, schematic flips with this block are inverted. */
+    public boolean invertFlip = false;
+    /** number of different variant regions to use */
+    public int variants = 0;
+    /** whether to draw a rotation arrow - this does not apply to lines of blocks */
+    public boolean drawArrow = true;
+    /** whether to draw the team corner by default */
+    public boolean drawTeamOverlay = true;
     /** 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;
+    /** if true, this block will be broken by certain units stepping/moving over it */
+    public boolean unitMoveBreakable;
     /** whether to add this block to brokenblocks */
     public boolean rebuildable = true;
-    /** whether this water can only be placed on water */
+    /** if true, this logic-related block can only be used with privileged processors (or is one itself) */
+    public boolean privileged = false;
+    /** whether this block can only be placed on water */
     public boolean requiresWater = false;
-    /** whether this water can be placed on any liquids, anywhere */
+    /** whether this block can be placed on any liquids, anywhere */
     public boolean placeableLiquid = false;
+    /** whether this block can be placed directly by the player via PlacementFragment */
+    public boolean placeablePlayer = true;
     /** whether this floor can be placed on. */
     public boolean placeableOn = true;
     /** whether this block has insulating properties. */
@@ -100,51 +152,107 @@ public class Block extends UnlockableContent{
     public boolean autoResetEnabled = true;
     /** if true, the block stops updating when disabled */
     public boolean noUpdateDisabled = false;
+    /** if true, this block updates when it's a payload in a unit. */
+    public boolean updateInUnits = true;
+    /** if true, this block updates in payloads in units regardless of the experimental game rule */
+    public boolean alwaysUpdateInUnits = false;
+    /** if false, only incinerable liquids are dropped when deconstructing; otherwise, all liquids are dropped. */
+    public boolean deconstructDropAllLiquid = false;
     /** Whether to use this block's color in the minimap. Only used for overlays. */
     public boolean useColor = true;
-    /** tile entity health */
+    /** item that drops from this block, used for drills */
+    public @Nullable Item itemDrop = null;
+    /** if true, this block cannot be mined by players. useful for annoying things like sand. */
+    public boolean playerUnmineable = false;
+    /** Array of affinities to certain things. */
+    public Attributes attributes = new Attributes();
+    /** Health per square tile that this block occupies; essentially, this is multiplied by size * size. Overridden if health is > 0. If <0, the default is 40. */
+    public float scaledHealth = -1;
+    /** building health; -1 to use scaledHealth */
     public int health = -1;
+    /** damage absorption, similar to unit armor */
+    public float armor = 0f;
     /** base block explosiveness */
     public float baseExplosiveness = 0f;
+    /** bullet that this block spawns when destroyed */
+    public @Nullable BulletType destroyBullet = null;
+    /** if true, destroyBullet is spawned on the block's team instead of Derelict team */
+    public boolean destroyBulletSameTeam = false;
+    /** liquid used for lighting */
+    public @Nullable Liquid lightLiquid;
+    /** whether cracks are drawn when this block is damaged */
+    public boolean drawCracks = true;
+    /** whether rubble is created when this block is destroyed */
+    public boolean createRubble = true;
     /** whether this block can be placed on edges of liquids. */
     public boolean floating = false;
     /** multiblock size */
     public int size = 1;
     /** multiblock offset */
     public float offset = 0f;
-    /** Whether to draw this block in the expanded draw range. */
-    public boolean expanded = false;
+    /** offset for iteration (internal use only) */
+    public int sizeOffset = 0;
+    /** Clipping size of this block. Should be as large as the block will draw. */
+    public float clipSize = -1f;
+    /** When placeRangeCheck is enabled, this is the range checked for enemy blocks. */
+    public float placeOverlapRange = 50f;
+    /** Multiplier of damage dealt to this block by tanks. Does not apply to crawlers. */
+    public float crushDamageMultiplier = 1f;
     /** Max of timers used. */
     public int timers = 0;
     /** Cache layer. Only used for 'cached' rendering. */
     public CacheLayer cacheLayer = CacheLayer.normal;
     /** Special flag; if false, floor will be drawn under this block even if it is cached. */
     public boolean fillsTile = true;
+    /** If true, this block can be covered by darkness / fog even if synthetic. */
+    public boolean forceDark = false;
     /** whether this block can be replaced in all cases */
     public boolean alwaysReplace = false;
-    /** The block group. Unless {@link #canReplace} is overriden, blocks in the same group can replace each other. */
+    /** if false, this block can never be replaced. */
+    public boolean replaceable = true;
+    /** The block group. Unless {@link #canReplace} is overridden, blocks in the same group can replace each other. */
     public BlockGroup group = BlockGroup.none;
     /** List of block flags. Used for AI indexing. */
     public EnumSet<BlockFlag> flags = EnumSet.of();
-    /** Targeting priority of this block, as seen by enemies .*/
-    public TargetPriority priority = TargetPriority.base;
+    /** Targeting priority of this block, as seen by enemies. */
+    public float priority = TargetPriority.base;
     /** How much this block affects the unit cap by.
      * The block flags must contain unitModifier in order for this to work. */
     public int unitCapModifier = 0;
     /** Whether the block can be tapped and selected to configure. */
     public boolean configurable;
+    /** If true, this block does not have pointConfig with a transform called on map resize. */
+    public boolean ignoreResizeConfig;
+    /** If true, this building can be selected like a unit when commanding. */
+    public boolean commandable;
+    /** If true, the building inventory can be shown with the config. */
+    public boolean allowConfigInventory = true;
+    /** Defines how large selection menus, such as that of sorters, should be. */
+    public int selectionRows = 5, selectionColumns = 4;
     /** If true, this block can be configured by logic. */
     public boolean logicConfigurable = false;
     /** Whether this block consumes touchDown events when tapped. */
     public boolean consumesTap;
     /** Whether to draw the glow of the liquid for this block, if it has one. */
     public boolean drawLiquidLight = true;
+    /** Environmental flags that are *all* required for this block to function. 0 = any environment */
+    public int envRequired = 0;
+    /** The environment flags that this block can function in. If the env matches any of these, it will be enabled. */
+    public int envEnabled = Env.terrestrial;
+    /** The environment flags that this block *cannot* function in. If the env matches any of these, it will be *disabled*. */
+    public int envDisabled = 0;
     /** Whether to periodically sync this block across the network. */
     public boolean sync;
     /** Whether this block uses conveyor-type placement mode. */
     public boolean conveyorPlacement;
+    /** If false, diagonal placement (ctrl) for this block is not allowed. */
+    public boolean allowDiagonal = true;
     /** Whether to swap the diagonal placement modes. */
     public boolean swapDiagonalPlacement;
+    /** Whether to allow rectangular placement, as opposed to a line. */
+    public boolean allowRectanglePlacement = false;
+    /** Build queue priority in schematics. */
+    public int schematicPriority = 0;
     /**
      * The color of this block when displayed on the minimap or map preview.
      * Do not set manually! This is overridden when loading for most blocks.
@@ -154,27 +262,48 @@ public class Block extends UnlockableContent{
     public boolean hasColor = false;
     /** Whether units target this block. */
     public boolean targetable = true;
+    /** If true, this block attacks and is considered a turret in the indexer. Building must implement Ranged. */
+    public boolean attacks = false;
+    /** If true, this block is mending-related and can be suppressed with special units/missiles. */
+    public boolean suppressable = false;
     /** Whether the overdrive core has any effect on this block. */
     public boolean canOverdrive = true;
     /** Outlined icon color.*/
     public Color outlineColor = Color.valueOf("404049");
-    /** Whether the icon region has an outline added. */
+    /** Whether any icon region has an outline added. */
     public boolean outlineIcon = false;
+    /** Outline icon radius. */
+    public int outlineRadius = 4;
+    /** Which of the icon regions gets the outline added. Uses last icon if <= 0. */
+    public int outlinedIcon = -1;
     /** Whether this block has a shadow under it. */
     public boolean hasShadow = true;
-    /** Sounds made when this block breaks.*/
-    public Sound breakSound = Sounds.boom;
+    /** If true, a custom shadow (name-shadow) is drawn under this block. */
+    public boolean customShadow = false;
+    /** Should the sound made when this block is built change in pitch. */
+    public boolean placePitchChange = true;
+    /** Should the sound made when this block is deconstructed change in pitch. */
+    public boolean breakPitchChange = true;
+    /** Sound made when this block is built. */
+    public Sound placeSound = Sounds.place;
+    /** Sound made when this block is deconstructed. */
+    public Sound breakSound = Sounds.breaks;
+    /** Sounds made when this block is destroyed.*/
+    public Sound destroySound = Sounds.boom;
     /** How reflective this block is. */
     public float albedo = 0f;
     /** Environmental passive light color. */
     public Color lightColor = Color.white.cpy();
     /**
      * Whether this environmental block passively emits light.
-     * Not valid for non-environmental blocks. */
+     * Does not change behavior for non-environmental blocks, but still updates clipSize. */
     public boolean emitLight = false;
     /** Radius of the light emitted by this block. */
     public float lightRadius = 60f;
 
+    /** How much fog this block uncovers, in tiles. Cannot be dynamic. <= 0 to disable. */
+    public int fogRadius = -1;
+
     /** The sound that this block makes while active. One sound loop. Do not overuse. */
     public Sound loopSound = Sounds.none;
     /** Active sound base volume. */
@@ -189,44 +318,82 @@ public class Block extends UnlockableContent{
     public ItemStack[] requirements = {};
     /** Category in place menu. */
     public Category category = Category.distribution;
-    /** Cost of building this block; do not modify directly! */
-    public float buildCost;
+    /** Time to build this block in ticks; do not modify directly! */
+    public float buildCost = 20f;
     /** Whether this block is visible and can currently be built. */
     public BuildVisibility buildVisibility = BuildVisibility.hidden;
     /** Multiplier for speed of building this block. */
     public float buildCostMultiplier = 1f;
     /** Build completion at which deconstruction finishes. */
     public float deconstructThreshold = 0f;
+    /** If true, this block deconstructs immediately. Instant deconstruction implies no resource refund. */
+    public boolean instantDeconstruct = false;
+    /** If true, this block constructs immediately. This implies no resource requirement, and ignores configs - do not use, this is for performance only! */
+    public boolean instantBuild = false;
+    /** If true, this block can be placed even in "dark" areas. Only used for editor static walls. */
+    public boolean ignoreBuildDarkness = false;
+    /** Effect for placing the block. Passes size as rotation. */
+    public Effect placeEffect = Fx.placeBlock;
+    /** Effect for breaking the block. Passes size as rotation. */
+    public Effect breakEffect = Fx.breakBlock;
+    /** Effect for destroying the block. */
+    public Effect destroyEffect = Fx.dynamicExplosion;
     /** Multiplier for cost of research in tech tree. */
     public float researchCostMultiplier = 1;
+    /** Cost multipliers per-item. */
+    public ObjectFloatMap<Item> researchCostMultipliers = new ObjectFloatMap<>();
+    /** Override for research cost. Uses multipliers above and building requirements if not set. */
+    public @Nullable ItemStack[] researchCost;
     /** Whether this block has instant transfer.*/
     public boolean instantTransfer = false;
-    /** Whether you can rotate this block with Keybind rotateplaced + Scroll Wheel. */
+    /** Whether you can rotate this block after it is placed. */
     public boolean quickRotate = true;
+    /** If true, this derelict block can be repair by clicking it. */
+    public boolean allowDerelictRepair = true;
     /** Main subclass. Non-anonymous. */
     public @Nullable Class<?> subclass;
-
-    public Prov<Building> buildType = null; //initialized later
+    /** Scroll position for certain blocks. */
+    public float selectScroll;
+    /** Building that is created for this block. Initialized in init() via reflection. Set manually if modded. */
+    public Prov<Building> buildType = null;
+    /** Configuration handlers by type. */
     public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();
+    /** Consumption filters. */
+    public boolean[] itemFilter = {}, liquidFilter = {};
+    /** Array of consumers used by this block. Only populated after init(). */
+    public Consume[] consumers = {}, optionalConsumers = {}, nonOptionalConsumers = {}, updateConsumers = {};
+    /** Set to true if this block has any consumers in its array. */
+    public boolean hasConsumers;
+    /** The single power consumer, if applicable. */
+    public @Nullable ConsumePower consPower;
+
+    /** Map of bars by name. */
+    protected OrderedMap<String, Func<Building, Bar>> barMap = new OrderedMap<>();
+    /** List for building up consumption before init(). */
+    protected Seq<Consume> consumeBuilder = new Seq<>();
 
     protected TextureRegion[] generatedIcons;
-    protected TextureRegion[] variantRegions, editorVariantRegions;
+    protected TextureRegion[] editorVariantRegions;
 
+    /** Regions indexes from icons() that are rotated. If either of these is not -1, other regions won't be rotated in ConstructBlocks. */
+    public int regionRotated1 = -1, regionRotated2 = -1;
     public TextureRegion region, editorIcon;
+    public @Load("@-shadow") TextureRegion customShadowRegion;
     public @Load("@-team") TextureRegion teamRegion;
-    public TextureRegion[] teamRegions;
+    public TextureRegion[] teamRegions, variantRegions, variantShadowRegions;
 
     protected static final Seq<Tile> tempTiles = new Seq<>();
-    protected static final Seq<Building> tempTileEnts = new Seq<>();
+    protected static final Seq<Building> tempBuilds = new Seq<>();
 
     /** Dump timer ID.*/
     protected final int timerDump = timers++;
     /** How often to try dumping items in ticks, e.g. 5 = 12 times/sec*/
-    protected final int dumpTime = 5;
+    public int dumpTime = 5;
 
     public Block(String name){
         super(name);
         initBuilding();
+        selectionSize = 28f;
     }
 
     public void drawBase(Tile tile){
@@ -234,10 +401,22 @@ public class Block extends UnlockableContent{
         if(tile.build != null){
             tile.build.draw();
         }else{
-            Draw.rect(region, tile.drawx(), tile.drawy());
+            Draw.rect(
+                variants == 0 ? region :
+                variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))],
+            tile.drawx(), tile.drawy());
         }
     }
 
+    public void drawShadow(Tile tile){
+        Draw.color(0f, 0f, 0f, BlockRenderer.shadowColor.a);
+        Draw.rect(
+            variants == 0 ? customShadowRegion :
+            variantShadowRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantShadowRegions.length - 1))],
+        tile.drawx(), tile.drawy());
+        Draw.color();
+    }
+
     public float percentSolid(int x, int y){
         Tile tile = world.tile(x, y);
         if(tile == null) return 0;
@@ -251,10 +430,35 @@ public class Block extends UnlockableContent{
 
     /** Drawn when you are placing a block. */
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        drawPotentialLinks(x, y);
+        drawOverlay(x * tilesize + offset, y * tilesize + offset, rotation);
+    }
+
+    public void drawPotentialLinks(int x, int y){
+        if((consumesPower || outputsPower) && hasPower && connectedPower){
+            Tile tile = world.tile(x, y);
+            if(tile != null){
+                PowerNode.getNodeLinks(tile, this, player.team(), other -> {
+                    PowerNode node = (PowerNode)other.block;
+                    Draw.color(node.laserColor1, Renderer.laserOpacity * 0.5f);
+                    node.drawLaser(x * tilesize + offset, y * tilesize + offset, other.x, other.y, size, other.block.size);
+
+                    Drawf.square(other.x, other.y, other.block.size * tilesize / 2f + 2f, Pal.place);
+                });
+
+                BeamNode.getNodeLinks(tile, this, player.team(), other -> {
+                    BeamNode node = (BeamNode)other.block;
+                    Draw.color(node.laserColor1, Renderer.laserOpacity * 0.5f);
+                    node.drawLaser(other.x, other.y, x * tilesize + offset, y * tilesize + offset, size, other.block.size);
+
+                    Drawf.square(other.x, other.y, other.block.size * tilesize / 2f + 2f, Pal.place);
+                });
+            }
+        }
     }
 
     public float drawPlaceText(String text, int x, int y, boolean valid){
-        if(renderer.pixelator.enabled()) return 0;
+        if(renderer.pixelate) return 0;
 
         Color color = valid ? Pal.accent : Pal.remove;
         Font font = Fonts.outline;
@@ -284,6 +488,10 @@ public class Block extends UnlockableContent{
         return width;
     }
 
+    /** Drawn when placing and when hovering over. */
+    public void drawOverlay(float x, float y, int rotation){
+    }
+
     public float sumAttribute(@Nullable Attribute attr, int x, int y){
         if(attr == null) return 0;
         Tile tile = world.tile(x, y);
@@ -293,7 +501,7 @@ public class Block extends UnlockableContent{
     }
 
     public TextureRegion getDisplayIcon(Tile tile){
-        return tile.build == null ? icon(Cicon.medium) : tile.build.getDisplayIcon();
+        return tile.build == null ? uiIcon : tile.build.getDisplayIcon();
     }
 
     public String getDisplayName(Tile tile){
@@ -309,11 +517,12 @@ public class Block extends UnlockableContent{
         return hasItems;
     }
 
-    /** Returns whether or not this block can be place on the specified  */
-    public boolean canPlaceOn(Tile tile, Team team){
+    /** @return whether this block can be placed on the specified tile. */
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
         return true;
     }
 
+    /** @return whether this block can be broken on the specified tile. */
     public boolean canBreak(Tile tile){
         return true;
     }
@@ -322,77 +531,178 @@ public class Block extends UnlockableContent{
         return rotate;
     }
 
+    public boolean rotatedOutput(int fromX, int fromY, Tile destination){
+        return rotatedOutput(fromX, fromY);
+    }
+
     public boolean synthetic(){
         return update || destructible;
     }
 
+    public boolean checkForceDark(Tile tile){
+        return forceDark;
+    }
+
     @Override
     public void setStats(){
         super.setStats();
 
         stats.add(Stat.size, "@x@", size, size);
-        stats.add(Stat.health, health, StatUnit.none);
-        if(canBeBuilt()){
+
+        if(synthetic()){
+            stats.add(Stat.health, health, StatUnit.none);
+            if(armor > 0){
+                stats.add(Stat.armor, armor, StatUnit.none);
+            }
+        }
+
+        if(canBeBuilt() && requirements.length > 0){
             stats.add(Stat.buildTime, buildCost / 60, StatUnit.seconds);
-            stats.add(Stat.buildCost, new ItemListValue(false, requirements));
+            stats.add(Stat.buildCost, StatValues.items(false, requirements));
         }
 
         if(instantTransfer){
             stats.add(Stat.maxConsecutive, 2, StatUnit.none);
         }
 
-        consumes.display(stats);
+        for(var c : consumers){
+            c.display(stats);
+        }
 
         //Note: Power stats are added by the consumers.
         if(hasLiquids) stats.add(Stat.liquidCapacity, liquidCapacity, StatUnit.liquidUnits);
         if(hasItems && itemCapacity > 0) stats.add(Stat.itemCapacity, itemCapacity, StatUnit.items);
     }
 
+    public <T extends Building> void addBar(String name, Func<T, Bar> sup){
+        barMap.put(name, (Func<Building, Bar>)sup);
+    }
+
+    public void removeBar(String name){
+        barMap.remove(name);
+    }
+
+    public Iterable<Func<Building, Bar>> listBars(){
+        return barMap.values();
+    }
+
+    public void addLiquidBar(Liquid liq){
+        addBar("liquid-" + liq.name, entity -> !liq.unlockedNow() ? null : new Bar(
+            () -> liq.localizedName,
+            liq::barColor,
+            () -> entity.liquids.get(liq) / liquidCapacity
+        ));
+    }
+
+    /** Adds a liquid bar that dynamically displays a liquid type. */
+    public <T extends Building> void addLiquidBar(Func<T, Liquid> current){
+        addBar("liquid", entity -> new Bar(
+            () -> current.get((T)entity) == null || entity.liquids.get(current.get((T)entity)) <= 0.001f ? Core.bundle.get("bar.liquid") : current.get((T)entity).localizedName,
+            () -> current.get((T)entity) == null ? Color.clear : current.get((T)entity).barColor(),
+            () -> current.get((T)entity) == null ? 0f : entity.liquids.get(current.get((T)entity)) / liquidCapacity)
+        );
+    }
+
     public void setBars(){
-        bars.add("health", entity -> new Bar("stat.health", Pal.health, entity::healthf).blink(Color.white));
+        addBar("health", entity -> new Bar("stat.health", Pal.health, entity::healthf).blink(Color.white));
 
-        if(hasLiquids){
-            Func<Building, Liquid> current;
-            if(consumes.has(ConsumeType.liquid) && consumes.get(ConsumeType.liquid) instanceof ConsumeLiquid){
-                Liquid liquid = consumes.<ConsumeLiquid>get(ConsumeType.liquid).liquid;
-                current = entity -> liquid;
-            }else{
-                current = entity -> entity.liquids == null ? Liquids.water : entity.liquids.current();
-            }
-            bars.add("liquid", entity -> new Bar(() -> entity.liquids.get(current.get(entity)) <= 0.001f ? Core.bundle.get("bar.liquid") : current.get(entity).localizedName,
-            () -> current.get(entity).barColor(), () -> entity == null || entity.liquids == null ? 0f : entity.liquids.get(current.get(entity)) / liquidCapacity));
-        }
+        if(consPower != null){
+            boolean buffered = consPower.buffered;
+            float capacity = consPower.capacity;
 
-        if(hasPower && consumes.hasPower()){
-            ConsumePower cons = consumes.getPower();
-            boolean buffered = cons.buffered;
-            float capacity = cons.capacity;
-
-            bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "<ERROR>" : (int)(entity.power.status * capacity)) :
-                Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> Mathf.zero(cons.requestedPower(entity)) && entity.power.graph.getPowerProduced() + entity.power.graph.getBatteryStored() > 0f ? 1f : entity.power.status));
+            addBar("power", entity -> new Bar(
+                () -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "<ERROR>" : UI.formatAmount((int)(entity.power.status * capacity))) :
+                Core.bundle.get("bar.power"),
+                () -> Pal.powerBar,
+                () -> Mathf.zero(consPower.requestedPower(entity)) && entity.power.graph.getPowerProduced() + entity.power.graph.getBatteryStored() > 0f ? 1f : entity.power.status)
+            );
         }
 
         if(hasItems && configurable){
-            bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
+            addBar("items", entity -> new Bar(
+                () -> Core.bundle.format("bar.items", entity.items.total()),
+                () -> Pal.items,
+                () -> (float)entity.items.total() / itemCapacity)
+            );
         }
+
+        if(unitCapModifier != 0){
+            stats.add(Stat.maxUnits, (unitCapModifier < 0 ? "-" : "+") + Math.abs(unitCapModifier));
+        }
+
+        //liquids added last
+        if(hasLiquids){
+            //TODO liquids need to be handled VERY carefully. there are several potential possibilities:
+            //1. no consumption or output (conduit/tank)
+            // - display current(), 1 bar
+            //2. static set of inputs and outputs
+            // - create bars for each input/output, straightforward
+            //3. TODO dynamic input/output combo???
+            // - confusion
+
+            boolean added = false;
+
+            //TODO handle in consumer
+            //add bars for *specific* consumed liquids
+            for(var consl : consumers){
+                if(consl instanceof ConsumeLiquid liq){
+                    added = true;
+                    addLiquidBar(liq.liquid);
+                }else if(consl instanceof ConsumeLiquids multi){
+                    added = true;
+                    for(var stack : multi.liquids){
+                        addLiquidBar(stack.liquid);
+                    }
+                }
+            }
+
+            //nothing was added, so it's safe to add a dynamic liquid bar (probably?)
+            if(!added){
+                addLiquidBar(build -> build.liquids.current());
+            }
+        }
+    }
+
+    public boolean consumesItem(Item item){
+        return itemFilter[item.id];
+    }
+
+    public boolean consumesLiquid(Liquid liq){
+        return liquidFilter[liq.id];
     }
 
     public boolean canReplace(Block other){
         if(other.alwaysReplace) return true;
-        return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group &&
+        if(other.privileged) return false;
+        return other.replaceable && (other != this || (rotate && quickRotate)) && ((this.group != BlockGroup.none && other.group == this.group) || other == this) &&
             (size == other.size || (size >= other.size && ((subclass != null && subclass == other.subclass) || group.anyReplace)));
     }
 
     /** @return a possible replacement for this block when placed in a line by the player. */
-    public Block getReplacement(BuildPlan req, Seq<BuildPlan> requests){
+    public Block getReplacement(BuildPlan req, Seq<BuildPlan> plans){
         return this;
     }
 
+    /** Mutates the given list of points used during line placement. */
+    public void changePlacementPath(Seq<Point2> points, int rotation, boolean diagonalOn){
+        changePlacementPath(points, rotation);
+    }
+
     /** Mutates the given list of points used during line placement. */
     public void changePlacementPath(Seq<Point2> points, int rotation){
 
     }
 
+    /** Mutates the given list of plans used during line placement. */
+    public void handlePlacementLine(Seq<BuildPlan> plans){
+
+    }
+
+    public boolean configSenseable(){
+        return configurations.containsKey(Item.class) || configurations.containsKey(Liquid.class) || configurations.containsKey(UnlockableContent.class) ||
+               configurations.containsKey(Block.class) || configurations.containsKey(UnitType.class);
+    }
+
     public Object nextConfig(){
         if(saveConfig && lastConfig != null){
             return lastConfig;
@@ -405,48 +715,67 @@ public class Block extends UnlockableContent{
 
     }
 
-    public void drawPlan(BuildPlan req, Eachable<BuildPlan> list, boolean valid){
-        drawPlan(req, list, valid, 1f);
+    public void drawPlan(BuildPlan plan, Eachable<BuildPlan> list, boolean valid){
+        drawPlan(plan, list, valid, 1f);
     }
 
-    public void drawPlan(BuildPlan req, Eachable<BuildPlan> list, boolean valid, float alpha){
+    public void drawPlan(BuildPlan plan, Eachable<BuildPlan> list, boolean valid, float alpha){
         Draw.reset();
         Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f));
         Draw.alpha(alpha);
         float prevScale = Draw.scl;
-        Draw.scl *= req.animScale;
-        drawRequestRegion(req, list);
+        Draw.scl *= plan.animScale;
+        drawPlanRegion(plan, list);
         Draw.scl = prevScale;
         Draw.reset();
     }
 
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        TextureRegion reg = getRequestRegion(req, list);
-        Draw.rect(reg, req.drawx(), req.drawy(), !rotate ? 0 : req.rotation * 90);
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        drawDefaultPlanRegion(plan, list);
+    }
 
-        if(req.config != null){
-            drawRequestConfig(req, list);
+    /** this is a different method so subclasses can call it even after overriding the base */
+    public void drawDefaultPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        TextureRegion reg = getPlanRegion(plan, list);
+        Draw.rect(reg, plan.drawx(), plan.drawy(), !rotate || !rotateDraw ? 0 : plan.rotation * 90);
+
+        if(plan.worldContext && player != null && teamRegion != null && teamRegion.found()){
+            if(teamRegions[player.team().id] == teamRegion) Draw.color(player.team().color);
+            Draw.rect(teamRegions[player.team().id], plan.drawx(), plan.drawy());
+            Draw.color();
         }
+
+        drawPlanConfig(plan, list);
     }
 
-    public TextureRegion getRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        return icon(Cicon.full);
+    public TextureRegion getPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        return fullIcon;
     }
 
-    public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
+    public void drawPlanConfig(BuildPlan plan, Eachable<BuildPlan> list){
 
     }
 
-    public void drawRequestConfigCenter(BuildPlan req, Object content, String region){
-        Color color = content instanceof Item ? ((Item)content).color : content instanceof Liquid ? ((Liquid)content).color : null;
+    public void drawPlanConfigCenter(BuildPlan plan, Object content, String region, boolean cross){
+        if(content == null){
+            if(cross){
+                Draw.rect("cross", plan.drawx(), plan.drawy());
+            }
+            return;
+        }
+        Color color = content instanceof Item i ? i.color : content instanceof Liquid l ? l.color : null;
         if(color == null) return;
 
         Draw.color(color);
-        Draw.rect(region, req.drawx(), req.drawy());
+        Draw.rect(region, plan.drawx(), plan.drawy());
         Draw.color();
     }
 
-    public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){
+    public void drawPlanConfigCenter(BuildPlan plan, Object content, String region){
+        drawPlanConfigCenter(plan, content, region, false);
+    }
+
+    public void drawPlanConfigTop(BuildPlan plan, Eachable<BuildPlan> list){
 
     }
 
@@ -469,6 +798,25 @@ public class Block extends UnlockableContent{
         return (hasItems && itemCapacity > 0);
     }
 
+    /** sets {@param out} to the index-th side outside of this block, using the given rotation. */
+    public void nearbySide(int x, int y, int rotation, int index, Point2 out){
+        int cornerX = x - (size-1)/2, cornerY = y - (size-1)/2, s = size;
+        switch(rotation){
+            case 0 -> out.set(cornerX + s, cornerY + index);
+            case 1 -> out.set(cornerX + index, cornerY + s);
+            case 2 -> out.set(cornerX - 1, cornerY + index);
+            case 3 -> out.set(cornerX + index, cornerY - 1);
+        }
+    }
+
+    public Point2[] getEdges(){
+        return Edges.getEdges(size);
+    }
+
+    public Point2[] getInsideEdges(){
+        return Edges.getInsideEdges(size);
+    }
+
     /** Iterate through ever grid position taken up by this block. */
     public void iterateTaken(int x, int y, Intc2 placer){
         if(isMultiblock()){
@@ -504,17 +852,31 @@ public class Block extends UnlockableContent{
         return editorVariantRegions;
     }
 
+    /** @return special icons to outline and save with an -outline variant. Vanilla only. */
+    public TextureRegion[] makeIconRegions(){
+        return new TextureRegion[0];
+    }
+
     protected TextureRegion[] icons(){
         //use team region in vanilla team blocks
-        return teamRegion.found() && minfo.mod == null ? new TextureRegion[]{region, teamRegions[Team.sharded.id]} : new TextureRegion[]{region};
+        TextureRegion r = variants > 0 ? Core.atlas.find(name + "1") : region;
+        return teamRegion.found() && minfo.mod == null ? new TextureRegion[]{r, teamRegions[Team.sharded.id]} : new TextureRegion[]{r};
+    }
+
+    public void getRegionsToOutline(Seq<TextureRegion> out){
+
     }
 
     public TextureRegion[] getGeneratedIcons(){
         return generatedIcons == null ? (generatedIcons = icons()) : generatedIcons;
     }
 
+    public void resetGeneratedIcons(){
+        generatedIcons = null;
+    }
+
     public TextureRegion[] variantRegions(){
-        return variantRegions == null ? (variantRegions = new TextureRegion[]{icon(Cicon.full)}) : variantRegions;
+        return variantRegions == null ? (variantRegions = new TextureRegion[]{fullIcon}) : variantRegions;
     }
 
     public boolean hasBuilding(){
@@ -525,6 +887,10 @@ public class Block extends UnlockableContent{
         return buildType.get();
     }
 
+    public void updateClipRadius(float size){
+        clipSize = Math.max(clipSize, size * tilesize + size * 2f);
+    }
+
     public Rect bounds(int x, int y, Rect rect){
         return rect.setSize(size * tilesize).setCenter(x * tilesize + offset, y * tilesize + offset);
     }
@@ -534,11 +900,16 @@ public class Block extends UnlockableContent{
     }
 
     public boolean isVisible(){
-        return !isHidden();
+        return !isHidden() && (state.rules.editor || (!state.rules.hideBannedBlocks || !state.rules.isBanned(this)));
     }
 
     public boolean isPlaceable(){
-        return isVisible() && !state.rules.bannedBlocks.contains(this);
+        return isVisible() && (!state.rules.isBanned(this) || state.rules.editor) && supportsEnv(state.rules.env);
+    }
+
+    /** @return whether this block supports a specific environment. */
+    public boolean supportsEnv(int env){
+        return (envEnabled & env) != 0 && (envDisabled & env) == 0 && (envRequired == 0 || (envRequired & env) == envRequired);
     }
 
     /** Called when building of this block begins. */
@@ -546,6 +917,16 @@ public class Block extends UnlockableContent{
 
     }
 
+    /** Called when building of this block begins. */
+    public void placeBegan(Tile tile, Block previous, @Nullable Unit builder){
+        placeBegan(tile, previous);
+    }
+
+    /** Called when building of this block ends. */
+    public void placeEnded(Tile tile, @Nullable Unit builder){
+
+    }
+
     /** Called right before building of this block begins. */
     public void beforePlaceBegan(Tile tile, Block previous){
 
@@ -571,10 +952,115 @@ public class Block extends UnlockableContent{
         return buildVisibility != BuildVisibility.hidden && buildVisibility != BuildVisibility.debugOnly;
     }
 
+    public boolean environmentBuildable(){
+        return isOnPlanet(state.getPlanet());
+    }
+
     public boolean isStatic(){
         return cacheLayer == CacheLayer.walls;
     }
 
+    public <T extends Consume> T findConsumer(Boolf<Consume> filter){
+        return consumers.length == 0 ? (T)consumeBuilder.find(filter) : (T)Structs.find(consumers, filter);
+    }
+
+    public boolean hasConsumer(Consume cons){
+        return consumeBuilder.contains(cons);
+    }
+
+    public void removeConsumer(Consume cons){
+        if(consumers.length > 0){
+            throw new IllegalStateException("You can only remove consumers before init(). After init(), all consumers have already been initialized.");
+        }
+        consumeBuilder.remove(cons);
+    }
+
+    public void removeConsumers(Boolf<Consume> b){
+        consumeBuilder.removeAll(b);
+        //the power was removed, unassign it
+        if(!consumeBuilder.contains(c -> c instanceof ConsumePower)){
+            consPower = null;
+        }
+    }
+
+    public ConsumeLiquid consumeLiquid(Liquid liquid, float amount){
+        return consume(new ConsumeLiquid(liquid, amount));
+    }
+
+    public ConsumeLiquids consumeLiquids(LiquidStack... stacks){
+        return consume(new ConsumeLiquids(stacks));
+    }
+
+    /**
+     * Creates a consumer which directly uses power without buffering it.
+     * @param powerPerTick The amount of power which is required each tick for 100% efficiency.
+     * @return the created consumer object.
+     */
+    public ConsumePower consumePower(float powerPerTick){
+        return consume(new ConsumePower(powerPerTick, 0.0f, false));
+    }
+
+    /** Creates a consumer which only consumes power when the condition is met. */
+    public <T extends Building> ConsumePower consumePowerCond(float usage, Boolf<T> cons){
+        return consume(new ConsumePowerCondition(usage, (Boolf<Building>)cons));
+    }
+
+    /** Creates a consumer that consumes a dynamic amount of power. */
+    public <T extends Building> ConsumePower consumePowerDynamic(Floatf<T> usage){
+        return consume(new ConsumePowerDynamic((Floatf<Building>)usage));
+    }
+
+    /** Creates a consumer that consumes a dynamic amount of power. */
+    public <T extends Building> ConsumePower consumePowerDynamic(float displayed, Floatf<T> usage){
+        return consume(new ConsumePowerDynamic(displayed, (Floatf<Building>)usage));
+    }
+
+    /**
+     * Creates a consumer which stores power.
+     * @param powerCapacity The maximum capacity in power units.
+     */
+    public ConsumePower consumePowerBuffered(float powerCapacity){
+        return consume(new ConsumePower(0f, powerCapacity, true));
+    }
+
+    public ConsumeItems consumeItem(Item item){
+        return consumeItem(item, 1);
+    }
+
+    public ConsumeItems consumeItem(Item item, int amount){
+        return consume(new ConsumeItems(new ItemStack[]{new ItemStack(item, amount)}));
+    }
+
+    public ConsumeItems consumeItems(ItemStack... items){
+        return consume(new ConsumeItems(items));
+    }
+
+    public ConsumeCoolant consumeCoolant(float amount){
+        return consume(new ConsumeCoolant(amount));
+    }
+
+    public ConsumeCoolant consumeCoolant(float amount, boolean allowLiquid, boolean allowGas){
+        return consume(new ConsumeCoolant(amount, allowLiquid, allowGas));
+    }
+
+    public <T extends Consume> T consume(T consume){
+        if(consume instanceof ConsumePower){
+            //there can only be one power consumer
+            consumeBuilder.removeAll(b -> b instanceof ConsumePower);
+            consPower = (ConsumePower)consume;
+        }
+        consumeBuilder.add(consume);
+        return consume;
+    }
+
+    public void setupRequirements(Category cat, ItemStack[] stacks){
+        requirements(cat, stacks);
+    }
+
+    public void setupRequirements(Category cat, BuildVisibility visible, ItemStack[] stacks){
+        requirements(cat, visible, stacks);
+    }
+
     public void requirements(Category cat, ItemStack[] stacks, boolean unlocked){
         requirements(cat, BuildVisibility.shown, stacks);
         this.alwaysUnlocked = unlocked;
@@ -634,9 +1120,11 @@ public class Block extends UnlockableContent{
 
     @Override
     public ItemStack[] researchRequirements(){
+        if(researchCost != null) return researchCost;
+        if(researchCostMultiplier <= 0f) return ItemStack.empty;
         ItemStack[] out = new ItemStack[requirements.length];
         for(int i = 0; i < out.length; i++){
-            int quantity = 60 + Mathf.round(Mathf.pow(requirements[i].amount, 1.1f) * 20 * researchCostMultiplier, 10);
+            int quantity = Mathf.round(60 * researchCostMultiplier + Mathf.pow(requirements[i].amount, 1.11f) * 20 * researchCostMultiplier * researchCostMultipliers.get(requirements[i].item, 1f), 10);
 
             out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity));
         }
@@ -652,17 +1140,23 @@ public class Block extends UnlockableContent{
         }
 
         //also requires inputs
-        consumes.each(c -> {
-            if(c.isOptional()) return;
+        for(var c : consumeBuilder){
+            if(c.optional) continue;
 
             if(c instanceof ConsumeItems i){
                 for(ItemStack stack : i.items){
                     cons.get(stack.item);
                 }
-            }else if(c instanceof ConsumeLiquid i){
-                cons.get(i.liquid);
             }
-        });
+            //TODO: requiring liquid dependencies is usually a bad idea, because there is no reason to pump/produce something until you actually need it.
+            /*else if(c instanceof ConsumeLiquid i){
+                cons.get(i.liquid);
+            }else if(c instanceof ConsumeLiquids i){
+                for(var stack : i.liquids){
+                    cons.get(stack.liquid);
+                }
+            }*/
+        }
     }
 
     @Override
@@ -670,36 +1164,105 @@ public class Block extends UnlockableContent{
         return ContentType.block;
     }
 
+    @Override
+    public boolean logicVisible(){
+        return buildVisibility != BuildVisibility.hidden;
+    }
+
+    @Override
+    public void postInit(){
+        //usually, an empty set of planets is a configuration error. auto-assign based on requirements
+        if(requirements.length > 0 && shownPlanets.isEmpty()){
+            for(Planet planet : content.planets()){
+                if(planet.isLandable()){
+                    if(!Structs.contains(requirements, s -> !s.item.isOnPlanet(planet))){
+                        shownPlanets.add(planet);
+                    }
+                }
+            }
+        }
+
+        super.postInit();
+    }
+
     /** Called after all blocks are created. */
     @Override
     @CallSuper
     public void init(){
-        //initialize default health based on size
-        if(health == -1){
-            health = size * size * 40;
+        super.init();
+
+        //disable standard shadow
+        if(customShadow){
+            hasShadow = false;
         }
 
-        if(group == BlockGroup.transportation || consumes.has(ConsumeType.item) || category == Category.distribution){
+        if(fogRadius > 0){
+            flags = flags.with(BlockFlag.hasFogRadius);
+        }
+
+        //initialize default health based on size
+        if(health == -1){
+            boolean round = false;
+            if(scaledHealth < 0){
+                scaledHealth = 40;
+
+                float scaling = 1f;
+                for(var stack : requirements){
+                    scaling += stack.item.healthScaling;
+                }
+
+                scaledHealth *= scaling;
+                round = true;
+            }
+
+            health = round ?
+                Mathf.round(size * size * scaledHealth, 5) :
+                (int)(size * size * scaledHealth);
+        }
+
+        clipSize = Math.max(clipSize, size * tilesize);
+
+        if(hasLiquids && drawLiquidLight){
+            clipSize = Math.max(size * 30f * 2f, clipSize);
+        }
+
+        if(emitLight){
+            clipSize = Math.max(clipSize, lightRadius * 2f);
+        }
+
+        if(group == BlockGroup.transportation || category == Category.distribution){
             acceptsItems = true;
         }
 
         offset = ((size + 1) % 2) * tilesize / 2f;
+        sizeOffset = -((size - 1) / 2);
 
-        buildCost = 0f;
-        for(ItemStack stack : requirements){
-            buildCost += stack.amount * stack.item.cost;
+        if(requirements.length > 0){
+            buildCost = 0f;
+            for(ItemStack stack : requirements){
+                buildCost += stack.amount * stack.item.cost;
+            }
         }
+
         buildCost *= buildCostMultiplier;
 
-        if(consumes.has(ConsumeType.power)) hasPower = true;
-        if(consumes.has(ConsumeType.item)) hasItems = true;
-        if(consumes.has(ConsumeType.liquid)) hasLiquids = true;
+        consumers = consumeBuilder.toArray(Consume.class);
+        optionalConsumers = consumeBuilder.select(consume -> consume.optional && !consume.ignore()).toArray(Consume.class);
+        nonOptionalConsumers = consumeBuilder.select(consume -> !consume.optional && !consume.ignore()).toArray(Consume.class);
+        updateConsumers = consumeBuilder.select(consume -> consume.update && !consume.ignore()).toArray(Consume.class);
+        hasConsumers = consumers.length > 0;
+        itemFilter = new boolean[content.items().size];
+        liquidFilter = new boolean[content.liquids().size];
+
+        for(Consume cons : consumers){
+            cons.apply(this);
+        }
 
         setBars();
 
         stats.useCategories = true;
 
-        consumes.init();
+        //TODO check for double power consumption
 
         if(!logicConfigurable){
             configurations.each((key, val) -> {
@@ -709,14 +1272,20 @@ public class Block extends UnlockableContent{
             });
         }
 
-        if(!outputsPower && consumes.hasPower() && consumes.getPower().buffered){
-            throw new IllegalArgumentException("Consumer using buffered power: " + name);
+        if(!outputsPower && consPower != null && consPower.buffered){
+            Log.warn("Consumer using buffered power: @. Disabling buffered power.", name);
+            consPower.buffered = false;
+        }
+
+        if(buildVisibility == BuildVisibility.sandboxOnly){
+            hideDetails = false;
         }
     }
 
-    @CallSuper
     @Override
     public void load(){
+        super.load();
+
         region = Core.atlas.find(name);
 
         ContentRegions.loadRegions(this);
@@ -724,7 +1293,23 @@ public class Block extends UnlockableContent{
         //load specific team regions
         teamRegions = new TextureRegion[Team.all.length];
         for(Team team : Team.all){
-            teamRegions[team.id] = teamRegion.found() ? Core.atlas.find(name + "-team-" + team.name, teamRegion) : teamRegion;
+            teamRegions[team.id] = teamRegion.found() && team.hasPalette ? Core.atlas.find(name + "-team-" + team.name, teamRegion) : teamRegion;
+        }
+
+        if(variants != 0){
+            variantRegions = new TextureRegion[variants];
+
+            for(int i = 0; i < variants; i++){
+                variantRegions[i] = Core.atlas.find(name + (i + 1));
+            }
+            region = variantRegions[0];
+
+            if(customShadow){
+                variantShadowRegions = new TextureRegion[variants];
+                for(int i = 0; i < variants; i++){
+                    variantShadowRegions[i] = Core.atlas.find(name + "-shadow" + (i + 1));
+                }
+            }
         }
     }
 
@@ -737,62 +1322,150 @@ public class Block extends UnlockableContent{
     public void createIcons(MultiPacker packer){
         super.createIcons(packer);
 
-        packer.add(PageType.editor, name + "-icon-editor", Core.atlas.getPixmap((AtlasRegion)icon(Cicon.full)));
-
         if(!synthetic()){
-            PixmapRegion image = Core.atlas.getPixmap((AtlasRegion)icon(Cicon.full));
-            mapColor.set(image.getPixel(image.width/2, image.height/2));
+            PixmapRegion image = Core.atlas.getPixmap(fullIcon);
+            mapColor.set(image.get(image.width/2, image.height/2));
         }
 
-        getGeneratedIcons();
+        if(variants > 0){
+            for(int i = 0; i < variants; i++){
+                String rname = name + (i + 1);
+                packer.add(PageType.editor, "editor-" + rname, Core.atlas.getPixmap(rname));
+            }
+        }
+
+        Seq<Pixmap> toDispose = new Seq<>();
+
+        //generate paletted team regions
+        if(teamRegion != null && teamRegion.found()){
+            for(Team team : Team.all){
+                //if there's an override, don't generate anything
+                if(team.hasPalette && !Core.atlas.has(name + "-team-" + team.name)){
+                    var base = Core.atlas.getPixmap(teamRegion);
+                    Pixmap out = new Pixmap(base.width, base.height);
+
+                    for(int x = 0; x < base.width; x++){
+                        for(int y = 0; y < base.height; y++){
+                            int color = base.get(x, y);
+                            int index = switch(color){
+                                case 0xffffffff -> 0;
+                                case 0xdcc6c6ff, 0xdbc5c5ff -> 1;
+                                case 0x9d7f7fff, 0x9e8080ff -> 2;
+                                default -> -1;
+                            };
+                            out.setRaw(x, y, index == -1 ? base.get(x, y) : team.palettei[index]);
+                        }
+                    }
+
+                    Drawf.checkBleed(out);
+
+                    packer.add(PageType.main, name + "-team-" + team.name, out);
+                    toDispose.add(out);
+                }
+            }
+
+            teamRegions = new TextureRegion[Team.all.length];
+            for(Team team : Team.all){
+                teamRegions[team.id] = teamRegion.found() && team.hasPalette ? Core.atlas.find(name + "-team-" + team.name, teamRegion) : teamRegion;
+            }
+        }
 
         Pixmap last = null;
 
+        var gen = icons();
+
         if(outlineIcon){
-            final int radius = 4;
-            PixmapRegion region = Core.atlas.getPixmap(getGeneratedIcons()[getGeneratedIcons().length-1]);
-            Pixmap out = new Pixmap(region.width, region.height);
-            Color color = new Color();
-            for(int x = 0; x < region.width; x++){
-                for(int y = 0; y < region.height; y++){
-
-                    region.getPixel(x, y, color);
-                    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(Structs.inBounds(rx + x, ry + y, region.width, region.height) && Mathf.within(rx, ry, radius) && color.set(region.getPixel(rx + x, ry + y)).a > 0.01f){
-                                    found = true;
-                                    break outer;
-                                }
-                            }
-                        }
-                        if(found){
-                            out.draw(x, y, outlineColor);
-                        }
-                    }
-                }
-            }
-            last = out;
-
-            packer.add(PageType.main, name, out);
+            AtlasRegion atlasRegion = (AtlasRegion)gen[outlinedIcon >= 0 ? Math.min(outlinedIcon, gen.length - 1) : gen.length -1];
+            PixmapRegion region = Core.atlas.getPixmap(atlasRegion);
+            Pixmap out = last = Pixmaps.outline(region, outlineColor, outlineRadius);
+            Drawf.checkBleed(out);
+            packer.add(PageType.main, atlasRegion.name, out);
+            toDispose.add(out);
         }
 
-        if(generatedIcons.length > 1){
-            Pixmap base = Core.atlas.getPixmap(generatedIcons[0]).crop();
-            for(int i = 1; i < generatedIcons.length; i++){
-                if(i == generatedIcons.length - 1 && last != null){
-                    base.drawPixmap(last);
+        var toOutline = new Seq<TextureRegion>();
+        getRegionsToOutline(toOutline);
+
+        for(var region : toOutline){
+            if(region instanceof AtlasRegion atlas){
+                String regionName = atlas.name;
+                Pixmap outlined = Pixmaps.outline(Core.atlas.getPixmap(region), outlineColor, outlineRadius);
+
+                Drawf.checkBleed(outlined);
+
+                packer.add(PageType.main, regionName + "-outline", outlined);
+                toDispose.add(outlined);
+            }
+        }
+
+        PixmapRegion editorBase;
+
+        if(gen.length > 1){
+            Pixmap base = Core.atlas.getPixmap(gen[0]).crop();
+            for(int i = 1; i < gen.length; i++){
+                if(i == gen.length - 1 && last != null){
+                    base.draw(last, 0, 0, true);
                 }else{
-                    base.draw(Core.atlas.getPixmap(generatedIcons[i]));
+                    base.draw(Core.atlas.getPixmap(gen[i]), true);
                 }
             }
             packer.add(PageType.main, "block-" + name + "-full", base);
-            generatedIcons = null;
-            Arrays.fill(cicons, null);
+
+            editorBase = new PixmapRegion(base);
+            toDispose.add(base);
+        }else{
+            if(gen[0] != null) packer.add(PageType.main, "block-" + name + "-full", Core.atlas.getPixmap(gen[0]));
+            editorBase = gen[0] == null ? Core.atlas.getPixmap(fullIcon) : Core.atlas.getPixmap(gen[0]);
+        }
+
+        packer.add(PageType.editor, name + "-icon-editor", editorBase);
+
+        toDispose.each(Pixmap::dispose);
+    }
+
+    public int planRotation(int rot){
+        return !rotate && lockRotation ? 0 : rot;
+    }
+
+    public void flipRotation(BuildPlan req, boolean x){
+        if((x == (req.rotation % 2 == 0)) != invertFlip){
+            req.rotation = planRotation(Mathf.mod(req.rotation + 2, 4));
         }
     }
 
+    /** Fills the specified array with the list of configuration options this block has. Only used for plans. */
+    public void getPlanConfigs(Seq<UnlockableContent> options){
+        if(configurations.containsKey(Item.class)){
+            options.add(content.items());
+        }
+        if(configurations.containsKey(Liquid.class)){
+            options.add(content.liquids());
+        }
+    }
+
+    @Override
+    public double sense(LAccess sensor){
+        return switch(sensor){
+            case color -> mapColor.toDoubleBits();
+            case health, maxHealth -> health;
+            case solid -> solid ? 1 : 0;
+            case size -> size;
+            case itemCapacity -> itemCapacity;
+            case liquidCapacity -> liquidCapacity;
+            case powerCapacity -> consPower != null && consPower.buffered ? consPower.capacity : 0f;
+            case id -> getLogicId();
+            default -> Double.NaN;
+        };
+    }
+
+    @Override
+    public double sense(Content content){
+        return Double.NaN;
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        if(sensor == LAccess.name) return name;
+        return noSensed;
+    }
 }
diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index b450509c7b..fe48fd74b7 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -10,9 +10,11 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
+import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static mindustry.Vars.*;
 
@@ -35,10 +37,21 @@ public class Build{
 
         int rotation = tile.build != null ? tile.build.rotation : 0;
         Block previous = tile.block();
+
+        //instantly deconstruct if necessary
+        if(previous.instantDeconstruct){
+            ConstructBlock.deconstructFinish(tile, previous, unit);
+            return;
+        }
+
         Block sub = ConstructBlock.get(previous.size);
 
         Seq<Building> prevBuild = new Seq<>(1);
-        if(tile.build != null) prevBuild.add(tile.build);
+        if(tile.build != null){
+            prevBuild.add(tile.build);
+            tile.build.onDeconstructed(unit);
+            tile.build.dead = true;
+        }
 
         tile.setBlock(sub, team, rotation);
         var build = (ConstructBuild)tile.build;
@@ -50,7 +63,7 @@ public class Build{
             tile.build.lastAccessed = unit.getControllerName();
         }
 
-        Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, unit, true)));
+        Events.fire(new BlockBuildBeginEvent(tile, team, unit, true));
     }
 
     /** Places a ConstructBlock at this location. */
@@ -68,15 +81,59 @@ public class Build{
         //auto-rotate the block to the correct orientation and bail out
         if(tile.team() == team && tile.block == result && tile.build != null && tile.block.quickRotate){
             if(unit != null && unit.getControllerName() != null) tile.build.lastAccessed = unit.getControllerName();
+            int previous = tile.build.rotation;
             tile.build.rotation = Mathf.mod(rotation, 4);
             tile.build.updateProximity();
             tile.build.noSleep();
+            Fx.rotateBlock.at(tile.build.x, tile.build.y, tile.build.block.size);
+            Events.fire(new BuildRotateEvent(tile.build, unit, previous));
+            return;
+        }
+
+        //repair derelict tile
+        if(tile.team() == Team.derelict && team != Team.derelict && tile.block == result && tile.build != null && tile.block.allowDerelictRepair && state.rules.derelictRepair){
+            float healthf = tile.build.healthf();
+            var config = tile.build.config();
+
+            tile.setBlock(result, team, rotation);
+
+            if(unit != null && unit.getControllerName() != null) tile.build.lastAccessed = unit.getControllerName();
+
+            if(config != null){
+                tile.build.configured(unit, config);
+            }
+            //keep health
+            tile.build.health = result.health * healthf;
+
+            if(fogControl.isVisibleTile(team, tile.x, tile.y)){
+                result.placeEffect.at(tile.drawx(), tile.drawy(), result.size);
+                Fx.rotateBlock.at(tile.build.x, tile.build.y, tile.build.block.size);
+                //doesn't play a sound
+            }
+
+            Events.fire(new BlockBuildEndEvent(tile, unit, team, false, config));
+            return;
+        }
+
+        //break all props in the way
+        tile.getLinkedTilesAs(result, out -> {
+            if(out.block != Blocks.air && out.block.alwaysReplace){
+                out.block.breakEffect.at(out.drawx(), out.drawy(), out.block.size, out.block.mapColor);
+                out.remove();
+            }
+        });
+
+        //complete it immediately
+        if(result.instantBuild){
+            Events.fire(new BlockBuildBeginEvent(tile, team, unit, false));
+            result.placeBegan(tile, tile.block, unit);
+            ConstructBlock.constructFinish(tile, result, unit, (byte)rotation, team, null);
             return;
         }
 
         Block previous = tile.block();
         Block sub = ConstructBlock.get(result.size);
-        Seq<Building> prevBuild = new Seq<>(9);
+        var prevBuild = new Seq<Building>(9);
 
         result.beforePlaceBegan(tile, previous);
         tmp.clear();
@@ -95,37 +152,70 @@ public class Build{
         build.prevBuild = prevBuild;
         if(unit != null && unit.getControllerName() != null) build.lastAccessed = unit.getControllerName();
 
-        result.placeBegan(tile, previous);
+        Events.fire(new BlockBuildBeginEvent(tile, team, unit, false));
 
-        Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, unit, false)));
+        result.placeBegan(tile, previous, unit);
     }
 
-    /** Returns whether a tile can be placed at this location by this team. */
+    /** @return 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. */
+    /** @return 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){
+        return validPlaceIgnoreUnits(type, team, x, y, rotation, checkVisible) && checkNoUnitOverlap(type, x, y);
+    }
+
+    /** @return whether a tile can be placed at this location by this team. */
+    public static boolean checkNoUnitOverlap(Block type, int x, int y){
+        return (!type.solid && !type.solidifes) || !Units.anyEntities(x * tilesize + type.offset - type.size * tilesize / 2f, y * tilesize + type.offset - type.size * tilesize / 2f, type.size * tilesize, type.size * tilesize);
+    }
+
+    /** Returns whether a tile can be placed at this location by this team. Ignores units at this location. */
+    public static boolean validPlaceIgnoreUnits(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 || (checkVisible && (!type.isPlaceable() && !(state.rules.waves && team == state.rules.waveTeam && type.isVisible())))){
+        if(type == null || (!state.rules.editor && (checkVisible && (!type.environmentBuildable() || (!type.isPlaceable() && !(state.rules.waves && team == state.rules.waveTeam && type.isVisible())))))){
             return false;
         }
 
-        if((type.solid || type.solidifes) && Units.anyEntities(x * tilesize + type.offset - type.size*tilesize/2f, y * tilesize + type.offset - type.size*tilesize/2f, type.size * tilesize, type.size*tilesize)){
-            return false;
-        }
-
-        if(state.teams.eachEnemyCore(team, core -> Mathf.dst(x * tilesize + type.offset, y * tilesize + type.offset, core.x, core.y) < state.rules.enemyCoreBuildRadius + type.size * tilesize / 2f)){
-            return false;
+        if(!state.rules.editor){
+            //find closest core, if it doesn't match the team, placing is not legal
+            if(state.rules.polygonCoreProtection){
+                float mindst = Float.MAX_VALUE;
+                CoreBuild closest = null;
+                for(TeamData data : state.teams.active){
+                    for(CoreBuild tile : data.cores){
+                        float dst = tile.dst2(x * tilesize + type.offset, y * tilesize + type.offset);
+                        if(dst < mindst){
+                            closest = tile;
+                            mindst = dst;
+                        }
+                    }
+                }
+                if(closest != null && closest.team != team){
+                    return false;
+                }
+            }else if(state.teams.anyEnemyCoresWithinBuildRadius(team, x * tilesize + type.offset, y * tilesize + type.offset)){
+                return false;
+            }
         }
 
         Tile tile = world.tile(x, y);
 
         if(tile == null) return false;
 
+        if(!type.canPlaceOn(tile, team, rotation)){
+            return false;
+        }
+
+        //floors have different checks
+        if(type.isFloor()){
+            return type.isOverlay() ? tile.overlay() != type : tile.floor() != type;
+        }
+
         //campaign darkness check
-        if(world.getDarkness(x, y) >= 3){
+        if(!type.ignoreBuildDarkness && world.getDarkness(x, y) >= 3){
             return false;
         }
 
@@ -133,10 +223,6 @@ public class Build{
             return false;
         }
 
-        if(!type.canPlaceOn(tile, team)){
-            return false;
-        }
-
         int offsetx = -(type.size - 1) / 2;
         int offsety = -(type.size - 1) / 2;
 
@@ -148,25 +234,32 @@ public class Build{
 
                 if(
                 check == null || //nothing there
+                (type.size == 2 && world.getDarkness(wx, wy) >= 3) ||
+                (state.rules.staticFog && state.rules.fog && !fogControl.isDiscovered(team, wx, wy)) ||
                 (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
+                (type == check.block() && check.build != null && rotation == check.build.rotation && type.rotate && !((type == check.block && team != Team.derelict && check.team() == Team.derelict))) || //same block, same rotation
                 !check.interactable(team) || //cannot interact
-                !check.floor().placeableOn || //solid wall
-                    !((type.canReplace(check.block()) || //can replace type
-                        //controversial change: allow rebuilding damaged blocks
-                        //this could be buggy and abuse-able, so I'm not enabling it yet
-                        //note that this requires a change in BuilderComp as well
-                        //(type == check.block() && check.centerX() == x && check.centerY() == y && check.build != null && check.build.health < check.build.maxHealth - 0.0001f) ||
-                        (check.build instanceof ConstructBuild build && build.cblock == type && check.centerX() == tile.x && check.centerY() == tile.y)) && //same type in construction
+                !check.floor().placeableOn && !type.ignoreBuildDarkness || //solid floor
+                (!checkVisible && !check.block().alwaysReplace) || //replacing a block that should be replaced (e.g. payload placement)
+                    !(((type.canReplace(check.block()) || (type == check.block && team != Team.derelict && state.rules.derelictRepair && check.team() == Team.derelict)) || //can replace type OR can replace derelict block of same type
+                        (check.build instanceof ConstructBuild build && build.current == 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;
             }
         }
 
+        if(state.rules.placeRangeCheck && !state.isEditor() && getEnemyOverlap(type, team, x, y) != null){
+            return false;
+        }
+
         return true;
     }
 
+    public static @Nullable Building getEnemyOverlap(Block block, Team team, int x, int y){
+        return indexer.findEnemyTile(team, x * tilesize + block.size, y * tilesize + block.size, block.placeOverlapRange + 4f, p -> true);
+    }
+
     public static boolean contactsGround(int x, int y, Block block){
         if(block.isMultiblock()){
             for(Point2 point : Edges.getEdges(block.size)){
@@ -184,12 +277,12 @@ public class Build{
 
     public static boolean contactsShallows(int x, int y, Block block){
         if(block.isMultiblock()){
-            for(Point2 point : Edges.getInsideEdges(block.size)){
+            for(Point2 point : block.getInsideEdges()){
                 Tile tile = world.tile(x + point.x, y + point.y);
                 if(tile != null && !tile.floor().isDeep()) return true;
             }
 
-            for(Point2 point : Edges.getEdges(block.size)){
+            for(Point2 point : block.getEdges()){
                 Tile tile = world.tile(x + point.x, y + point.y);
                 if(tile != null && !tile.floor().isDeep()) return true;
             }
@@ -204,9 +297,9 @@ public class Build{
         return false;
     }
 
-    /** Returns whether the tile at this position is breakable by this team */
+    /** @return whether the tile at this position is breakable by this team */
     public static boolean validBreak(Team team, int x, int y){
         Tile tile = world.tile(x, y);
-        return tile != null && tile.block().canBreak(tile) && tile.breakable() && tile.interactable(team);
+        return tile != null && tile.block() != Blocks.air && (tile.block().canBreak(tile) && (tile.breakable() || state.rules.allowEnvironmentDeconstruct)) && tile.interactable(team);
     }
 }
diff --git a/core/src/mindustry/world/CachedTile.java b/core/src/mindustry/world/CachedTile.java
index 5777ece759..e1d58f83ad 100644
--- a/core/src/mindustry/world/CachedTile.java
+++ b/core/src/mindustry/world/CachedTile.java
@@ -28,9 +28,8 @@ public class CachedTile extends Tile{
 
         if(block.hasBuilding()){
             Building n = entityprov.get();
-            n.cons(new ConsumeModule(build));
             n.tile(this);
-            n.block(block);
+            n.block = block;
             if(block.hasItems) n.items = new ItemModule();
             if(block.hasLiquids) n.liquids(new LiquidModule());
             if(block.hasPower) n.power(new PowerModule());
diff --git a/core/src/mindustry/world/DirectionalItemBuffer.java b/core/src/mindustry/world/DirectionalItemBuffer.java
index 48cbdc84c0..f71aa74671 100644
--- a/core/src/mindustry/world/DirectionalItemBuffer.java
+++ b/core/src/mindustry/world/DirectionalItemBuffer.java
@@ -23,7 +23,7 @@ public class DirectionalItemBuffer{
 
     public void accept(int buffer, Item item){
         if(!accepts(buffer)) return;
-        buffers[buffer][indexes[buffer]++] = BufferItem.get((byte)item.id, Time.time);
+        buffers[buffer][indexes[buffer]++] = BufferItem.get(item.id, Time.time);
     }
 
     public Item poll(int buffer, float speed){
@@ -54,11 +54,21 @@ public class DirectionalItemBuffer{
     }
 
     public void read(Reads read){
+        read(read, false);
+    }
+
+    public void read(Reads read, boolean legacy){
         for(int i = 0; i < 4; i++){
             indexes[i] = read.b();
             byte length = read.b();
             for(int j = 0; j < length; j++){
                 long value = read.l();
+
+                if(legacy){
+                    //read value as the old format with 1-byte items, and create a new one with the new 2-byte format
+                    value = BufferItem.get(BufferItemLegacy.item(value), BufferItemLegacy.time(value));
+                }
+
                 if(j < buffers[i].length){
                     buffers[i][j] = value;
                 }
@@ -68,6 +78,12 @@ public class DirectionalItemBuffer{
 
     @Struct
     class BufferItemStruct{
+        short item;
+        float time;
+    }
+
+    @Struct
+    class BufferItemLegacyStruct{
         byte item;
         float time;
     }
diff --git a/core/src/mindustry/world/Edges.java b/core/src/mindustry/world/Edges.java
index 956895e3c2..44b5a48175 100644
--- a/core/src/mindustry/world/Edges.java
+++ b/core/src/mindustry/world/Edges.java
@@ -50,11 +50,13 @@ public class Edges{
     }
 
     public static Tile getFacingEdge(Building tile, Building other){
-        return getFacingEdge(tile.block, tile.tileX(), tile.tileY(), other.tile());
+        Tile res = getFacingEdge(tile.block, tile.tileX(), tile.tileY(), other.tile());
+        return res == null ? tile.tile : res;
     }
 
     public static Tile getFacingEdge(Tile tile, Tile other){
-        return getFacingEdge(tile.block, tile.x, tile.y, other);
+        Tile res = getFacingEdge(tile.block, tile.x, tile.y, other);
+        return res == null ? tile : res;
     }
 
     public static Tile getFacingEdge(Block block, int tilex, int tiley, Tile other){
diff --git a/core/src/mindustry/world/ItemBuffer.java b/core/src/mindustry/world/ItemBuffer.java
index e9001ac534..d91da022ce 100644
--- a/core/src/mindustry/world/ItemBuffer.java
+++ b/core/src/mindustry/world/ItemBuffer.java
@@ -2,6 +2,8 @@ package mindustry.world;
 
 import arc.util.*;
 import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
 import mindustry.type.*;
 
 import static mindustry.Vars.*;
@@ -20,7 +22,7 @@ public class ItemBuffer{
 
     public void accept(Item item, short data){
         //if(!accepts()) return;
-        buffer[index++] = Pack.longInt(Float.floatToIntBits(Time.time), Pack.shortInt(item.id, data));
+        buffer[index++] = TimeItem.get(data, item.id, Time.time);
     }
 
     public void accept(Item item){
@@ -30,10 +32,10 @@ public class ItemBuffer{
     public Item poll(float speed){
         if(index > 0){
             long l = buffer[0];
-            float time = Float.intBitsToFloat(Pack.leftInt(l));
+            float time = TimeItem.time(l);
 
             if(Time.time >= time + speed || Time.time < time){
-                return content.item(Pack.leftShort(Pack.rightInt(l)));
+                return content.item(TimeItem.item(l));
             }
         }
         return null;
@@ -63,4 +65,11 @@ public class ItemBuffer{
         }
         index = Math.min(index, length - 1);
     }
+
+    @Struct
+    class TimeItemStruct{
+        short data;
+        short item;
+        float time;
+    }
 }
diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java
index d4556fd60f..45fad8a3e0 100644
--- a/core/src/mindustry/world/Tile.java
+++ b/core/src/mindustry/world/Tile.java
@@ -1,5 +1,6 @@
 package mindustry.world;
 
+import arc.*;
 import arc.func.*;
 import arc.math.*;
 import arc.math.geom.*;
@@ -10,6 +11,7 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -19,7 +21,9 @@ import mindustry.world.blocks.environment.*;
 import static mindustry.Vars.*;
 
 public class Tile implements Position, QuadTreeObject, Displayable{
-    static final ObjectSet<Building> tileSet = new ObjectSet<>();
+    private static final TileChangeEvent tileChange = new TileChangeEvent();
+    private static final TilePreChangeEvent preChange = new TilePreChangeEvent();
+    private static final ObjectSet<Building> tileSet = new ObjectSet<>();
 
     /** Extra data for very specific blocks. */
     public byte data;
@@ -58,6 +62,11 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return Point2.pack(x, y);
     }
 
+    /** @return this tile's position, packed to the world width - for use in width*height arrays. */
+    public int array(){
+        return x + y * world.tiles.width;
+    }
+
     public byte relativeTo(Tile tile){
         return relativeTo(tile.x, tile.y);
     }
@@ -79,6 +88,17 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return -1;
     }
 
+    public static int relativeTo(float x, float y, float cx, float cy){
+        if(Math.abs(x - cx) > Math.abs(y - cy)){
+            if(x <= cx - 1) return 0;
+            if(x >= cx + 1) return 2;
+        }else{
+            if(y <= cy - 1) return 1;
+            if(y >= cy + 1) return 3;
+        }
+        return -1;
+    }
+
     public byte absoluteRelativeTo(int cx, int cy){
 
         //very straightforward for odd sizes
@@ -104,20 +124,22 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     /**
-     * Returns the flammability of the  Used for fire calculations.
+     * Returns the flammability of the tile. Used for fire calculations.
      * Takes flammability of floor liquid into account.
      */
     public float getFlammability(){
-        if(!block.hasItems){
-            if(floor.liquidDrop != null && !block.solid){
-                return floor.liquidDrop.flammability;
-            }
+        if(block == Blocks.air){
+            if(floor.liquidDrop != null) return floor.liquidDrop.flammability;
             return 0;
         }else if(build != null){
-            float result = build.items.sum((item, amount) -> item.flammability * amount);
+            float result = 0f;
+
+            if(block.hasItems && build.items.total() > 0){
+                result += build.items.sum((item, amount) -> item.flammability * amount) / Math.max(block.itemCapacity, 1) * Mathf.clamp(block.itemCapacity / 2.4f, 1f, 3f);
+            }
 
             if(block.hasLiquids){
-                result += build.liquids.sum((liquid, amount) -> liquid.flammability * amount / 3f);
+                result += build.liquids.sum((liquid, amount) -> liquid.flammability * amount / 1.6f) / Math.max(block.liquidCapacity, 1) * Mathf.clamp(block.liquidCapacity / 30f, 1f, 2f);
             }
 
             return result;
@@ -142,7 +164,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     public boolean isDarkened(){
-        return block.solid && !block.synthetic() && block.fillsTile;
+        return block.solid && ((!block.synthetic() && block.fillsTile) || block.checkForceDark(this));
     }
 
     public Floor floor(){
@@ -166,6 +188,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return build == null ? Team.derelict : build.team;
     }
 
+    /** Do not call unless you know what you are doing! This does not update the indexer! */
     public void setTeam(Team team){
         if(build != null){
             build.team(team);
@@ -173,7 +196,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     public boolean isCenter(){
-        return build == null || build.tile() == this;
+        return build == null || build.tile == this;
     }
 
     public int centerX(){
@@ -197,10 +220,12 @@ public class Tile implements Position, QuadTreeObject, Displayable{
 
         if(type.isStatic() || this.block.isStatic()){
             recache();
+            recacheWall();
         }
 
-        this.block = type;
         preChanged();
+
+        this.block = type;
         changeBuild(team, entityprov, (byte)Mathf.mod(rotation, 4));
 
         if(build != null){
@@ -209,8 +234,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
 
         //set up multiblock
         if(block.isMultiblock()){
-            int offsetx = -(block.size - 1) / 2;
-            int offsety = -(block.size - 1) / 2;
+            int offset = -(block.size - 1) / 2;
             Building entity = this.build;
             Block block = this.block;
 
@@ -218,21 +242,21 @@ public class Tile implements Position, QuadTreeObject, Displayable{
             for(int pass = 0; pass < 2; pass++){
                 for(int dx = 0; dx < block.size; dx++){
                     for(int dy = 0; dy < block.size; dy++){
-                        int worldx = dx + offsetx + x;
-                        int worldy = dy + offsety + y;
+                        int worldx = dx + offset + x;
+                        int worldy = dy + offset + y;
                         if(!(worldx == x && worldy == y)){
                             Tile other = world.tile(worldx, worldy);
 
                             if(other != null){
                                 if(pass == 0){
                                     //first pass: delete existing blocks - this should automatically trigger removal if overlap exists
+                                    //TODO pointless setting air to air?
                                     other.setBlock(Blocks.air);
                                 }else{
                                     //second pass: assign changed data
                                     //assign entity and type to blocks, so they act as proxies for this one
                                     other.build = entity;
                                     other.block = block;
-
                                 }
                             }
                         }
@@ -261,17 +285,30 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         this.floor = type;
         this.overlay = (Floor)Blocks.air;
 
+        if(!headless && !world.isGenerating() && !isEditorTile()){
+            renderer.blocks.removeFloorIndex(this);
+        }
+
         recache();
         if(build != null){
             build.onProximityUpdate();
         }
+        if(!world.isGenerating() && pathfinder != null){
+            pathfinder.updateTile(this);
+        }
+    }
+
+    public boolean isEditorTile(){
+        return false;
     }
 
     /** Sets the floor, preserving overlay.*/
     public void setFloorUnder(Floor floor){
         Block overlay = this.overlay;
         setFloor(floor);
-        setOverlay(overlay);
+        if(this.overlay != overlay){
+            setOverlay(overlay);
+        }
     }
 
     /** Sets the block to air. */
@@ -287,10 +324,19 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         circle(radius, (x, y) -> cons.get(world.rawTile(x, y)));
     }
 
+    public void recacheWall(){
+        if(!headless && !world.isGenerating()){
+            renderer.blocks.recacheWall(this);
+        }
+    }
+
     public void recache(){
         if(!headless && !world.isGenerating()){
             renderer.blocks.floor.recacheTile(this);
             renderer.minimap.update(this);
+            renderer.blocks.invalidateTile(this);
+            renderer.blocks.addFloorIndex(this);
+            //update neighbor tiles as well
             for(int i = 0; i < 8; i++){
                 Tile other = world.tile(x + Geometry.d8[i].x, y + Geometry.d8[i].y);
                 if(other != null){
@@ -330,6 +376,11 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         setFloorNet(floor, Blocks.air);
     }
 
+    /** set()-s this tile, except it's synced across the network */
+    public void setOverlayNet(Block overlay){
+        Call.setOverlay(this, overlay);
+    }
+
     public short overlayID(){
         return overlay.id;
     }
@@ -350,6 +401,9 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         this.overlay = (Floor)block;
 
         recache();
+        if(!world.isGenerating() && build != null){
+            build.onProximityUpdate();
+        }
     }
 
     /** Sets the overlay without a recache. */
@@ -378,18 +432,21 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return block.destructible || block.breakable || block.update;
     }
 
+    /** @return whether the floor on this tile deals damage or can be drowned on. */
+    public boolean dangerous(){
+        return !block.solid && (floor.isDeep() || floor.damageTaken > 0);
+    }
+
     /**
      * Iterates through the list of all tiles linked to this multiblock, or just itself if it's not a multiblock.
      * The result contains all linked tiles, including this tile itself.
      */
     public void getLinkedTiles(Cons<Tile> cons){
         if(block.isMultiblock()){
-            int size = block.size;
-            int offsetx = -(size - 1) / 2;
-            int offsety = -(size - 1) / 2;
+            int size = block.size, o = block.sizeOffset;
             for(int dx = 0; dx < size; dx++){
                 for(int dy = 0; dy < size; dy++){
-                    Tile other = world.tile(x + dx + offsetx, y + dy + offsety);
+                    Tile other = world.tile(x + dx + o, y + dy + o);
                     if(other != null) cons.get(other);
                 }
             }
@@ -424,11 +481,10 @@ public class Tile implements Position, QuadTreeObject, Displayable{
      */
     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);
+            int size = block.size, o = block.sizeOffset;
+            for(int dx = 0; dx < size; dx++){
+                for(int dy = 0; dy < size; dy++){
+                    Tile other = world.tile(x + dx + o, y + dy + o);
                     if(other != null) tmpArray.get(other);
                 }
             }
@@ -450,28 +506,32 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         getHitbox(rect);
     }
 
-    public Tile nearby(Point2 relative){
+    public @Nullable Tile nearby(Point2 relative){
         return world.tile(x + relative.x, y + relative.y);
     }
 
-    public Tile nearby(int dx, int dy){
+    public @Nullable Tile nearby(int dx, int dy){
         return world.tile(x + dx, y + dy);
     }
 
-    public Tile nearby(int rotation){
-        if(rotation == 0) return world.tile(x + 1, y);
-        if(rotation == 1) return world.tile(x, y + 1);
-        if(rotation == 2) return world.tile(x - 1, y);
-        if(rotation == 3) return world.tile(x, y - 1);
-        return null;
+    public @Nullable Tile nearby(int rotation){
+        return switch(rotation){
+            case 0 -> world.tile(x + 1, y);
+            case 1 -> world.tile(x, y + 1);
+            case 2 -> world.tile(x - 1, y);
+            case 3 -> world.tile(x, y - 1);
+            default -> null;
+        };
     }
 
-    public Building nearbyBuild(int rotation){
-        if(rotation == 0) return world.build(x + 1, y);
-        if(rotation == 1) return world.build(x, y + 1);
-        if(rotation == 2) return world.build(x - 1, y);
-        if(rotation == 3) return world.build(x, y - 1);
-        return null;
+    public @Nullable Building nearbyBuild(int rotation){
+        return switch(rotation){
+            case 0 -> world.build(x + 1, y);
+            case 1 -> world.build(x, y + 1);
+            case 2 -> world.build(x - 1, y);
+            case 3 -> world.build(x, y - 1);
+            default -> null;
+        };
     }
 
     public boolean interactable(Team team){
@@ -482,11 +542,30 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return overlay == Blocks.air || overlay.itemDrop == null ? floor.itemDrop : overlay.itemDrop;
     }
 
+    public @Nullable Item wallDrop(){
+        return block.solid ?
+            block.itemDrop != null ? block.itemDrop :
+            overlay.wallOre && !block.synthetic() ? overlay.itemDrop :
+            null : null;
+    }
+
     public int staticDarkness(){
         return block.solid && block.fillsTile && !block.synthetic() ? data : 0;
     }
 
+    /** @return whether this tile is solid for legged units */
+    public boolean legSolid(){
+        return staticDarkness() >= 2 || (floor.solid && block == Blocks.air);
+    }
+
+    /** @return true if these tiles are right next to each other. */
+    public boolean adjacentTo(Tile tile){
+        return relativeTo(tile) != -1;
+    }
+
     protected void preChanged(){
+        firePreChanged();
+
         if(build != null){
             //only call removed() for the center block - this only gets called once.
             build.onRemoved();
@@ -504,6 +583,9 @@ public class Tile implements Position, QuadTreeObject, Displayable{
                         if(other != null){
                             //reset entity and block *manually* - thus, preChanged() will not be called anywhere else, for multiblocks
                             if(other != this){ //do not remove own entity so it can be processed in changed()
+                                //manually call pre-change event for other tile
+                                other.firePreChanged();
+
                                 other.build = null;
                                 other.block = Blocks.air;
 
@@ -515,12 +597,6 @@ public class Tile implements Position, QuadTreeObject, Displayable{
                 }
             }
         }
-
-
-        //recache when static blocks get changed
-        if(block.isStatic()){
-            recache();
-        }
     }
 
     protected void changeBuild(Team team, Prov<Building> entityprov, int rotation){
@@ -574,16 +650,28 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     protected void fireChanged(){
-        world.notifyChanged(this);
+        if(!world.isGenerating()){
+            Events.fire(tileChange.set(this));
+        }
+    }
+
+    protected void firePreChanged(){
+        if(!world.isGenerating()){
+            Events.fire(preChange.set(this));
+        }
     }
 
     @Override
     public void display(Table table){
-        Block toDisplay = overlay.itemDrop != null ? overlay : floor;
+
+        Block toDisplay =
+            block.itemDrop != null ? block :
+            overlay.itemDrop != null || wallDrop() != null ? overlay :
+            floor;
 
         table.table(t -> {
             t.left();
-            t.add(new Image(toDisplay.getDisplayIcon(this))).size(8 * 4);
+            t.add(new Image(toDisplay.getDisplayIcon(this))).scaling(Scaling.fit).size(8 * 4);
             t.labelWrap(toDisplay.getDisplayName(this)).left().width(190f).padLeft(5);
         }).growX().left();
     }
@@ -605,12 +693,53 @@ public class Tile implements Position, QuadTreeObject, Displayable{
 
     //remote utility methods
 
+    /** Positions are in 'packed position' format - left bits x, right bits y. */
+    @Remote(called = Loc.server)
+    public static void setTileBlocks(Block block, Team team, int[] positions){
+        if(block == null || positions == null) return;
+        for(int pos : positions){
+            Tile tile = world.tile(pos);
+            if(tile != null){
+                tile.setBlock(block, team, 0);
+            }
+        }
+    }
+
+    /** Positions are in 'packed position' format - left bits x, right bits y. */
+    @Remote(called = Loc.server)
+    public static void setTileFloors(Block block, int[] positions){
+        if(positions == null || !(block instanceof Floor floor)) return;
+        for(int pos : positions){
+            Tile tile = world.tile(pos);
+            if(tile != null){
+                tile.setFloor(floor);
+            }
+        }
+    }
+
+    /** Positions are in 'packed position' format - left bits x, right bits y. */
+    @Remote(called = Loc.server)
+    public static void setTileOverlays(Block block, int[] positions){
+        if(positions == null || !(block instanceof OverlayFloor floor)) return;
+        for(int pos : positions){
+            Tile tile = world.tile(pos);
+            if(tile != null){
+                tile.setOverlay(floor);
+            }
+        }
+    }
+
     @Remote(called = Loc.server)
     public static void setFloor(Tile tile, Block floor, Block overlay){
         tile.setFloor(floor.asFloor());
         tile.setOverlay(overlay);
     }
 
+    @Remote(called = Loc.server)
+    public static void setOverlay(Tile tile, Block overlay){
+        tile.setOverlay(overlay);
+    }
+
     @Remote(called = Loc.server)
     public static void removeTile(Tile tile){
         tile.remove();
@@ -618,31 +747,44 @@ public class Tile implements Position, QuadTreeObject, Displayable{
 
     @Remote(called = Loc.server)
     public static void setTile(Tile tile, Block block, Team team, int rotation){
+        if(tile == null) return;
         tile.setBlock(block, team, rotation);
     }
 
     @Remote(called = Loc.server)
     public static void setTeam(Building build, Team team){
         if(build != null){
-            build.team = team;
-            indexer.updateIndices(build.tile);
-        }
-    }
-
-    @Remote(called = Loc.server, unreliable = true)
-    public static void tileDamage(Building build, float health){
-        if(build == null) return;
-
-        build.health = health;
-
-        if(build.damaged()){
-            indexer.notifyTileDamaged(build);
+            build.changeTeam(team);
         }
     }
 
     @Remote(called = Loc.server)
-    public static void tileDestroyed(Building build){
+    public static void setTeams(int[] positions, Team team){
+        if(positions == null) return;
+        for(int pos : positions){
+            Tile tile = world.tile(pos);
+            if(tile != null && tile.build != null){
+                tile.build.changeTeam(team);
+            }
+        }
+    }
+
+    @Remote(called = Loc.server)
+    public static void buildDestroyed(Building build){
         if(build == null) return;
         build.killed();
     }
+
+    @Remote
+    public static void buildHealthUpdate(IntSeq buildings){
+        for(int i = 0; i < buildings.size; i += 2){
+            int pos = buildings.items[i];
+            float health = Float.intBitsToFloat(buildings.items[i + 1]);
+            var build = world.build(pos);
+            if(build != null && build.health != health){
+                build.health = health;
+                indexer.notifyHealthChanged(build);
+            }
+        }
+    }
 }
diff --git a/core/src/mindustry/world/TileData.java b/core/src/mindustry/world/TileData.java
deleted file mode 100644
index cf34d5ef60..0000000000
--- a/core/src/mindustry/world/TileData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package mindustry.world;
-
-public class TileData{
-}
diff --git a/core/src/mindustry/world/TileGen.java b/core/src/mindustry/world/TileGen.java
index a1afdee598..f05d8167d7 100644
--- a/core/src/mindustry/world/TileGen.java
+++ b/core/src/mindustry/world/TileGen.java
@@ -4,7 +4,7 @@ import mindustry.content.*;
 
 public class TileGen{
     public Block floor;
-    public Block block ;
+    public Block block;
     public Block overlay;
 
     {
diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java
index a996757256..51bc22568b 100644
--- a/core/src/mindustry/world/Tiles.java
+++ b/core/src/mindustry/world/Tiles.java
@@ -4,6 +4,7 @@ import arc.func.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
+import mindustry.gen.*;
 
 import java.util.*;
 
@@ -12,13 +13,34 @@ public class Tiles implements Iterable<Tile>{
     public final int width, height;
 
     final Tile[] array;
+    final Puddle[] puddles;
+    final Fire[] fires;
 
     public Tiles(int width, int height){
         this.array = new Tile[width * height];
         this.width = width;
         this.height = height;
+        this.puddles = new Puddle[width * height];
+        this.fires = new Fire[width * height];
     }
 
+    public Puddle getPuddle(int pos){
+        return puddles[pos];
+    }
+
+    public void setPuddle(int pos, Puddle p){
+        puddles[pos] = p;
+    }
+
+    public @Nullable Fire getFire(int pos){
+        return fires[pos];
+    }
+
+    public void setFire(int pos, Fire f){
+        fires[pos] = f;
+    }
+
+
     public void each(Intc2 cons){
         for(int x = 0; x < width; x++){
             for(int y = 0; y < height; y++){
@@ -39,6 +61,11 @@ public class Tiles implements Iterable<Tile>{
         array[y*width + x] = tile;
     }
 
+    /** set a tile at a raw array position; used for fast iteration / 1-D for-loops */
+    public void seti(int i, Tile tile){
+        array[i] = tile;
+    }
+
     /** @return whether these coordinates are in bounds */
     public boolean in(int x, int y){
         return x >= 0 && x < width && y >= 0 && y < height;
diff --git a/core/src/mindustry/world/WorldContext.java b/core/src/mindustry/world/WorldContext.java
index 498e4e587b..f0a2fc4b63 100644
--- a/core/src/mindustry/world/WorldContext.java
+++ b/core/src/mindustry/world/WorldContext.java
@@ -1,5 +1,8 @@
 package mindustry.world;
 
+import arc.util.*;
+import mindustry.type.*;
+
 public interface WorldContext{
 
     /** Return a tile in the tile array.*/
@@ -23,4 +26,13 @@ public interface WorldContext{
     /** Called when a building is finished reading. */
     default void onReadBuilding(){}
 
+    default @Nullable Sector getSector(){
+        return null;
+    }
+
+    /** @return whether the SaveLoadEvent fired after the end should be counted as a new map load. */
+    default boolean isMap(){
+        return false;
+    }
+
 }
diff --git a/core/src/mindustry/world/blocks/Attributes.java b/core/src/mindustry/world/blocks/Attributes.java
index ff96a2bb63..e1e73a1ab9 100644
--- a/core/src/mindustry/world/blocks/Attributes.java
+++ b/core/src/mindustry/world/blocks/Attributes.java
@@ -6,28 +6,34 @@ import mindustry.world.meta.*;
 
 import java.util.*;
 
-public class Attributes implements Serializable{
-    private final float[] arr = new float[Attribute.all.length];
+public class Attributes implements JsonSerializable{
+    private float[] arr = new float[Attribute.all.length];
 
     public void clear(){
         Arrays.fill(arr, 0);
     }
 
     public float get(Attribute attr){
-        return arr[attr.ordinal()];
+        check();
+        return arr[attr.id];
     }
 
     public void set(Attribute attr, float value){
-        arr[attr.ordinal()] = value;
+        check();
+        arr[attr.id] = value;
     }
 
     public void add(Attributes other){
+        check();
+        other.check();
         for(int i = 0; i < arr.length; i++){
             arr[i] += other.arr[i];
         }
     }
 
     public void add(Attributes other, float scl){
+        check();
+        other.check();
         for(int i = 0; i < arr.length; i++){
             arr[i] += other.arr[i] * scl;
         }
@@ -35,17 +41,27 @@ public class Attributes implements Serializable{
 
     @Override
     public void write(Json json){
+        check();
         for(Attribute at : Attribute.all){
-            if(arr[at.ordinal()] != 0){
-                json.writeValue(at.name(), arr[at.ordinal()]);
+            if(arr[at.id] != 0){
+                json.writeValue(at.name, arr[at.id]);
             }
         }
     }
 
     @Override
     public void read(Json json, JsonValue data){
+        check();
         for(Attribute at : Attribute.all){
-            arr[at.ordinal()] = data.getFloat(at.name(), 0);
+            arr[at.id] = data.getFloat(at.name, 0);
+        }
+    }
+
+    private void check(){
+        if(arr.length != Attribute.all.length){
+            var last = arr;
+            arr = new float[Attribute.all.length];
+            System.arraycopy(last, 0, arr, 0, Math.min(last.length, arr.length));
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java
index 44a69c13c5..4cefac1434 100644
--- a/core/src/mindustry/world/blocks/Autotiler.java
+++ b/core/src/mindustry/world/blocks/Autotiler.java
@@ -30,8 +30,6 @@ public interface Autotiler{
     }
 
     /**
-     * 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
@@ -40,12 +38,7 @@ public interface Autotiler{
         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
-     */
+    /** @return The top half of the input */
     default TextureRegion topHalf(TextureRegion input){
         TextureRegion region = Tmp.tr1;
         region.set(input);
@@ -53,12 +46,7 @@ public interface Autotiler{
         return region;
     }
 
-    /**
-     * Get the buttom half of a texture
-     *
-     * @param input The TextureRegion to slice
-     * @return The buttom half of the texture
-     */
+    /** @return The bottom half of the input */
     default TextureRegion botHalf(TextureRegion input){
         TextureRegion region = Tmp.tr1;
         region.set(input);
@@ -73,6 +61,7 @@ public interface Autotiler{
         BuildPlan[] directionals = AutotilerHolder.directionals;
 
         Arrays.fill(directionals, null);
+        //TODO this is O(n^2), very slow, should use quadtree or intmap or something instead
         list.each(other -> {
             if(other.breaking || other == req) return;
 
@@ -200,20 +189,26 @@ public interface Autotiler{
 
     default boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
         return Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
-                || ((!otherblock.rotatedOutput(otherx, othery) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
-                Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) || (otherblock.rotatedOutput(otherx, othery) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
+                || ((!otherblock.rotatedOutput(otherx, othery, tile) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
+                Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) ||
+                (otherblock.rotatedOutput(otherx, othery, tile) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
     }
 
     /** @return whether this other block is *not* looking at this one. */
     default boolean notLookingAt(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return !(otherblock.rotatedOutput(otherx, othery) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y));
+        return !(otherblock.rotatedOutput(otherx, othery, tile) && 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, or the other tile is looking at this one.
      * If the other tile does not rotate, it is always considered to be facing this one. */
     default boolean lookingAtEither(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return (Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
-        || (!otherblock.rotatedOutput(otherx, othery) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
+        return
+            //block is facing the other
+            Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery) ||
+            //does not output to rotated direction
+            !otherblock.rotatedOutput(otherx, othery, tile) ||
+            //other block is facing this one
+            Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y);
     }
 
     /**
diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index f2ebd161dd..0a49f8212f 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -8,6 +8,7 @@ import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
+import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
@@ -16,12 +17,15 @@ 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.*;
+import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 import mindustry.world.modules.*;
 
+import java.util.*;
+
 import static mindustry.Vars.*;
 
 /** A block in the process of construction. */
@@ -36,26 +40,30 @@ public class ConstructBlock extends Block{
         super("build" + size);
         this.size = size;
         update = true;
-        health = 20;
+        health = 10;
         consumesTap = true;
         solidifes = true;
+        generateIcons = false;
+        inEditor = false;
         consBlocks[size - 1] = this;
         sync = true;
     }
 
     /** Returns a ConstructBlock by size. */
     public static ConstructBlock get(int size){
-        if(size > maxBlockSize) throw new IllegalArgumentException("No. Don't place ConstructBlock of size greater than " + maxBlockSize);
+        if(size > maxBlockSize) throw new IllegalArgumentException("No. Don't place ConstructBlocks of size greater than " + maxBlockSize);
         return consBlocks[size - 1];
     }
 
     @Remote(called = Loc.server)
     public static void deconstructFinish(Tile tile, Block block, Unit builder){
         Team team = tile.team();
-        Fx.breakBlock.at(tile.drawx(), tile.drawy(), block.size);
+        if(!headless && fogControl.isVisibleTile(Vars.player.team(), tile.x, tile.y)){
+            block.breakEffect.at(tile.drawx(), tile.drawy(), block.size, block.mapColor);
+            if(shouldPlay()) block.breakSound.at(tile, block.breakPitchChange ? calcPitch(false) : 1f);
+        }
         Events.fire(new BlockBuildEndEvent(tile, builder, team, true, null));
         tile.remove();
-        if(shouldPlay()) Sounds.breaks.at(tile, calcPitch(false));
     }
 
     @Remote(called = Loc.server)
@@ -63,11 +71,17 @@ public class ConstructBlock extends Block{
         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;
+        Seq<Building> prev = tile.build instanceof ConstructBuild co ? co.prevBuild : null;
 
-        tile.setBlock(block, team, rotation);
+        if(block instanceof OverlayFloor overlay){
+            tile.setOverlay(overlay);
+        }else if(block instanceof Floor floor){
+            tile.setFloorUnder(floor);
+        }else{
+            tile.setBlock(block, team, rotation);
+        }
 
-        if(tile.build != null){
+        if(tile.build != null && tile.build.block == block){
             tile.build.health = block.health * healthf;
 
             if(config != null){
@@ -81,15 +95,24 @@ public class ConstructBlock extends Block{
             if(builder != null && builder.getControllerName() != null){
                 tile.build.lastAccessed = builder.getControllerName();
             }
+
+            //make sure block indexer knows it's damaged
+            indexer.notifyHealthChanged(tile.build);
+
+            //last builder was this local client player, call placed()
+            if(!headless && builder == player.unit()){
+                tile.build.playerPlaced(config);
+            }
         }
 
-        //last builder was this local client player, call placed()
-        if(tile.build != null && !headless && builder == player.unit()){
-            tile.build.playerPlaced(config);
+        if(fogControl.isVisibleTile(team, tile.x, tile.y)){
+            block.placeEffect.at(tile.drawx(), tile.drawy(), block.size);
+            if(shouldPlay()) block.placeSound.at(tile, block.placePitchChange ? calcPitch(true) : 1f);
         }
 
-        Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size);
-        if(shouldPlay()) Sounds.place.at(tile, calcPitch(true));
+        block.placeEnded(tile, builder);
+
+        Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config));
     }
 
     static boolean shouldPlay(){
@@ -121,8 +144,6 @@ public class ConstructBlock extends Block{
         if(tile.build != null){
             tile.build.placed();
         }
-
-        Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config));
     }
 
     @Override
@@ -131,61 +152,61 @@ public class ConstructBlock extends Block{
     }
 
     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;
+        /** The recipe of the block that is being (de)constructed. Never null. */
+        public Block current = Blocks.air;
+        /** The block that used to be here. Never null. */
+        public Block previous = Blocks.air;
+        /** Buildings that previously occupied this location. */
         public @Nullable Seq<Building> prevBuild;
 
         public float progress = 0;
         public float buildCost;
-        /**
-         * The block that used to be here.
-         * If a non-recipe block is being deconstructed, this is the block that is being deconstructed.
-         */
-        public Block previous;
         public @Nullable Object lastConfig;
+        public @Nullable Unit lastBuilder;
         public boolean wasConstructing, activeDeconstruct;
         public float constructColor;
 
-        @Nullable
-        public Unit lastBuilder;
-
-        private float[] accumulator;
-        private float[] totalAccumulator;
+        private @Nullable float[] accumulator;
+        private @Nullable float[] totalAccumulator;
+        private @Nullable int[] itemsLeft;
 
         @Override
         public String getDisplayName(){
-            return Core.bundle.format("block.constructing", cblock == null ? previous.localizedName : cblock.localizedName);
+            return Core.bundle.format("block.constructing", current.localizedName);
         }
 
         @Override
         public TextureRegion getDisplayIcon(){
-            return (cblock == null ? previous : cblock).icon(Cicon.full);
+            return current.fullIcon;
         }
 
         @Override
         public boolean checkSolid(){
-            return (cblock != null && cblock.solid) || previous == null || previous.solid;
+            return current.solid || previous.solid;
         }
 
         @Override
         public Cursor getCursor(){
-            return SystemCursor.hand;
+            return interactable(player.team()) ? SystemCursor.hand : SystemCursor.arrow;
         }
 
         @Override
         public void tapped(){
             //if the target is constructable, begin constructing
-            if(cblock != null){
+            if(current.isPlaceable()){
                 if(control.input.buildWasAutoPaused && !control.input.isBuilding && player.isBuilder()){
                     control.input.isBuilding = true;
                 }
-                player.unit().addBuild(new BuildPlan(tile.x, tile.y, rotation, cblock, lastConfig), false);
+                player.unit().addBuild(new BuildPlan(tile.x, tile.y, rotation, current, lastConfig), false);
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return Mathf.clamp(progress);
+            return super.sense(sensor);
+        }
+
         @Override
         public void onDestroyed(){
             Fx.blockExplosionSmoke.at(tile);
@@ -197,29 +218,37 @@ public class ConstructBlock extends Block{
 
         @Override
         public void updateTile(){
+            //auto-remove air blocks
+            if(current == Blocks.air){
+                remove();
+            }
+
             constructColor = Mathf.lerpDelta(constructColor, activeDeconstruct ? 1f : 0f, 0.2f);
             activeDeconstruct = false;
         }
 
         @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 ? rotdeg() : 0);
+            //do not draw air
+            if(current == Blocks.air) return;
+
+            if(previous != current && previous != Blocks.air && previous.fullIcon.found()){
+                Draw.rect(previous.fullIcon, x, y, previous.rotate ? rotdeg() : 0);
             }
 
             Draw.draw(Layer.blockBuilding, () -> {
                 Draw.color(Pal.accent, Pal.remove, constructColor);
+                boolean noOverrides = current.regionRotated1 == -1 && current.regionRotated2 == -1;
+                int i = 0;
 
-                Block target = cblock == null ? previous : cblock;
+                for(TextureRegion region : current.getGeneratedIcons()){
+                    Shaders.blockbuild.region = region;
+                    Shaders.blockbuild.time = Time.time;
+                    Shaders.blockbuild.progress = progress;
 
-                if(target != null){
-                    for(TextureRegion region : target.getGeneratedIcons()){
-                        Shaders.blockbuild.region = region;
-                        Shaders.blockbuild.progress = progress;
-
-                        Draw.rect(region, x, y, target.rotate ? rotdeg() : 0);
-                        Draw.flush();
-                    }
+                    Draw.rect(region, x, y, current.rotate && (noOverrides || current.regionRotated2 == i || current.regionRotated1 == i) ? rotdeg() : 0);
+                    Draw.flush();
+                    i ++;
                 }
 
                 Draw.color();
@@ -229,10 +258,6 @@ public class ConstructBlock extends Block{
         public void construct(Unit builder, @Nullable Building core, float amount, Object config){
             wasConstructing = true;
             activeDeconstruct = false;
-            if(cblock == null){
-                kill();
-                return;
-            }
 
             if(builder.isPlayer()){
                 lastBuilder = builder;
@@ -240,15 +265,15 @@ public class ConstructBlock extends Block{
 
             lastConfig = config;
 
-            if(cblock.requirements.length != accumulator.length || totalAccumulator.length != cblock.requirements.length){
-                setConstruct(previous, cblock);
+            if(current.requirements.length != accumulator.length || totalAccumulator.length != current.requirements.length){
+                setConstruct(previous, current);
             }
 
             float maxProgress = core == null || team.rules().infiniteResources ? amount : checkRequired(core.items, amount, false);
 
-            for(int i = 0; i < cblock.requirements.length; i++){
-                int reqamount = Math.round(state.rules.buildCostMultiplier * cblock.requirements[i].amount);
-                accumulator[i] += Math.min(reqamount * maxProgress, reqamount - totalAccumulator[i] + 0.00001f); //add min amount progressed to the accumulator
+            for(int i = 0; i < current.requirements.length; i++){
+                int reqamount = Math.round(state.rules.buildCostMultiplier * current.requirements[i].amount);
+                accumulator[i] += Math.min(reqamount * maxProgress, reqamount - totalAccumulator[i]); //add min amount progressed to the accumulator
                 totalAccumulator[i] = Math.min(totalAccumulator[i] + reqamount * maxProgress, reqamount);
             }
 
@@ -257,12 +282,39 @@ public class ConstructBlock extends Block{
             progress = Mathf.clamp(progress + maxProgress);
 
             if(progress >= 1f || state.rules.infiniteResources){
-                if(lastBuilder == null) lastBuilder = builder;
-                constructed(tile, cblock, lastBuilder, (byte)rotation, builder.team, config);
+                boolean canFinish = true;
+
+                //look at leftover resources to consume, get them from the core if necessary, delay building if not
+                if(!state.rules.infiniteResources){
+                    for(int i = 0; i < itemsLeft.length; i++){
+                        if(itemsLeft[i] > 0){
+                            if(core != null && core.items.has(current.requirements[i].item, itemsLeft[i])){
+                                core.items.remove(current.requirements[i].item, itemsLeft[i]);
+                                itemsLeft[i] = 0;
+                            }else{
+                                canFinish = false;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if(canFinish){
+                    if(lastBuilder == null) lastBuilder = builder;
+                    if(!net.client()){
+                        constructed(tile, current, lastBuilder, (byte)rotation, builder.team, config);
+                    }
+                }
             }
         }
 
-        public void deconstruct(Unit builder, @Nullable Building core, float amount){
+        public void deconstruct(Unit builder, @Nullable CoreBuild core, float amount){
+            //reset accumulated resources when switching modes
+            if(wasConstructing){
+                Arrays.fill(accumulator, 0);
+                Arrays.fill(totalAccumulator, 0);
+            }
+
             wasConstructing = false;
             activeDeconstruct = true;
             float deconstructMultiplier = state.rules.deconstructRefundMultiplier;
@@ -271,55 +323,73 @@ public class ConstructBlock extends Block{
                 lastBuilder = builder;
             }
 
-            if(cblock != null){
-                ItemStack[] requirements = cblock.requirements;
-                if(requirements.length != accumulator.length || totalAccumulator.length != requirements.length){
-                    setDeconstruct(cblock);
-                }
+            ItemStack[] requirements = current.requirements;
+            if(requirements.length != accumulator.length || totalAccumulator.length != requirements.length){
+                setDeconstruct(current);
+            }
 
-                //make sure you take into account that you can't deconstruct more than there is deconstructed
-                float clampedAmount = Math.min(amount, progress);
+            //make sure you take into account that you can't deconstruct more than there is deconstructed
+            float clampedAmount = Math.min(amount, progress);
 
-                for(int i = 0; i < requirements.length; i++){
-                    int reqamount = Math.round(state.rules.buildCostMultiplier * requirements[i].amount);
-                    accumulator[i] += Math.min(clampedAmount * deconstructMultiplier * reqamount, deconstructMultiplier * reqamount - totalAccumulator[i]); //add scaled amount progressed to the accumulator
-                    totalAccumulator[i] = Math.min(totalAccumulator[i] + reqamount * clampedAmount * deconstructMultiplier, reqamount);
+            for(int i = 0; i < requirements.length; i++){
+                int reqamount = Math.round(state.rules.buildCostMultiplier * requirements[i].amount);
+                accumulator[i] += Math.min(clampedAmount * deconstructMultiplier * reqamount, deconstructMultiplier * reqamount - totalAccumulator[i]); //add scaled amount progressed to the accumulator
+                totalAccumulator[i] = Math.min(totalAccumulator[i] + reqamount * clampedAmount * deconstructMultiplier, reqamount);
 
-                    int accumulated = (int)(accumulator[i]); //get amount
+                int accumulated = (int)(accumulator[i]); //get amount
 
-                    if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core
-                        if(core != null && requirements[i].item.unlockedNow()){ //only accept items that are unlocked
-                            int accepting = Math.min(accumulated, ((CoreBuild)core).storageCapacity - core.items.get(requirements[i].item));
-                            //transfer items directly, as this is not production.
-                            core.items.add(requirements[i].item, accepting);
-                            accumulator[i] -= accepting;
-                        }else{
-                            accumulator[i] -= accumulated;
-                        }
+                if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core
+                    if(core != null && requirements[i].item.unlockedNowHost()){ //only accept items that are unlocked
+                        int accepting = Math.min(accumulated, core.storageCapacity - core.items.get(requirements[i].item));
+                        //transfer items directly, as this is not production.
+                        core.items.add(requirements[i].item, accepting);
+                        itemsLeft[i] += accepting;
+                        accumulator[i] -= accepting;
+                    }else{
+                        accumulator[i] -= accumulated;
                     }
                 }
             }
 
             progress = Mathf.clamp(progress - amount);
 
-            if(progress <= (previous == null ? 0 : previous.deconstructThreshold) || state.rules.infiniteResources){
+            if(progress <= current.deconstructThreshold || state.rules.infiniteResources){
+                //add any leftover items that weren't obtained due to rounding errors
+                if(core != null && !state.rules.infiniteResources){
+                    for(int i = 0; i < itemsLeft.length; i++){
+                        int target = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier * state.rules.deconstructRefundMultiplier);
+                        int remaining = target - itemsLeft[i];
+
+                        if(requirements[i].item.unlockedNowHost()){
+                            core.items.add(requirements[i].item, Mathf.clamp(remaining, 0, core.storageCapacity - core.items.get(requirements[i].item)));
+                        }
+                        itemsLeft[i] = target;
+                    }
+                }
+
                 if(lastBuilder == null) lastBuilder = builder;
-                Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, lastBuilder);
+                Call.deconstructFinish(tile, this.current, lastBuilder);
             }
         }
 
         private float checkRequired(ItemModule inventory, float amount, boolean remove){
             float maxProgress = amount;
+            boolean infinite = team.rules().infiniteResources || state.rules.infiniteResources;
 
-            for(int i = 0; i < cblock.requirements.length; i++){
-                int sclamount = Math.round(state.rules.buildCostMultiplier * cblock.requirements[i].amount);
+            for(int i = 0; i < current.requirements.length; i++){
+                //there is no need to remove items that have already been fully taken out
+                if(itemsLeft[i] == 0){
+                    continue;
+                }
+
+                int sclamount = Math.round(state.rules.buildCostMultiplier * current.requirements[i].amount);
                 int required = (int)(accumulator[i]); //calculate items that are required now
 
-                if(inventory.get(cblock.requirements[i].item) == 0 && sclamount != 0){
+                if(inventory.get(current.requirements[i].item) == 0 && sclamount != 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, inventory.get(cblock.requirements[i].item));
+                    int maxUse = Math.min(required, inventory.get(current.requirements[i].item));
                     //get this as a fraction
                     float fraction = maxUse / (float)required;
 
@@ -329,8 +399,9 @@ public class ConstructBlock extends Block{
                     accumulator[i] -= maxUse;
 
                     //remove stuff that is actually used
-                    if(remove){
-                        inventory.remove(cblock.requirements[i].item, maxUse);
+                    if(remove && !infinite){
+                        inventory.remove(current.requirements[i].item, maxUse);
+                        itemsLeft[i] -= maxUse;
                     }
                 }
                 //else, no items are required yet, so just keep going
@@ -339,18 +410,28 @@ public class ConstructBlock extends Block{
             return maxProgress;
         }
 
+        @Override
         public float progress(){
             return progress;
         }
 
         public void setConstruct(Block previous, Block block){
+            if(block == null) return;
+
             this.constructColor = 0f;
             this.wasConstructing = true;
-            this.cblock = block;
+            this.current = block;
             this.previous = previous;
+            this.buildCost = block.buildCost * state.rules.buildCostMultiplier;
+            this.itemsLeft = new int[block.requirements.length];
             this.accumulator = new float[block.requirements.length];
             this.totalAccumulator = new float[block.requirements.length];
-            this.buildCost = block.buildCost * state.rules.buildCostMultiplier;
+
+            ItemStack[] requirements = current.requirements;
+            for(int i = 0; i < requirements.length; i++){
+                this.itemsLeft[i] = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier);
+            }
+            pathfinder.updateTile(tile);
         }
 
         public void setDeconstruct(Block previous){
@@ -360,22 +441,25 @@ public class ConstructBlock extends Block{
             this.wasConstructing = false;
             this.previous = previous;
             this.progress = 1f;
-            if(previous.buildCost >= 0.01f){
-                this.cblock = previous;
-                this.buildCost = previous.buildCost * state.rules.buildCostMultiplier;
-            }else{
-                this.buildCost = 20f; //default no-requirement build cost is 20
-            }
+            this.current = previous;
+            this.buildCost = previous.buildCost * state.rules.buildCostMultiplier;
+            this.itemsLeft = new int[previous.requirements.length];
             this.accumulator = new float[previous.requirements.length];
             this.totalAccumulator = new float[previous.requirements.length];
+            pathfinder.updateTile(tile);
+        }
+
+        @Override
+        public byte version(){
+            return 1;
         }
 
         @Override
         public void write(Writes write){
             super.write(write);
             write.f(progress);
-            write.s(previous == null ? -1 : previous.id);
-            write.s(cblock == null ? -1 : cblock.id);
+            write.s(previous.id);
+            write.s(current.id);
 
             if(accumulator == null){
                 write.b(-1);
@@ -384,6 +468,7 @@ public class ConstructBlock extends Block{
                 for(int i = 0; i < accumulator.length; i++){
                     write.f(accumulator[i]);
                     write.f(totalAccumulator[i]);
+                    write.i(itemsLeft[i]);
                 }
             }
         }
@@ -399,20 +484,23 @@ public class ConstructBlock extends Block{
             if(acsize != -1){
                 accumulator = new float[acsize];
                 totalAccumulator = new float[acsize];
+                itemsLeft = new int[acsize];
                 for(int i = 0; i < acsize; i++){
                     accumulator[i] = read.f();
                     totalAccumulator[i] = read.f();
+                    if(revision >= 1){
+                        itemsLeft[i] = read.i();
+                    }
                 }
             }
 
             if(pid != -1) previous = content.block(pid);
-            if(rid != -1) cblock = content.block(rid);
+            if(rid != -1) current = content.block(rid);
 
-            if(cblock != null){
-                buildCost = cblock.buildCost * state.rules.buildCostMultiplier;
-            }else{
-                buildCost = 20f;
-            }
+            if(previous == null) previous = Blocks.air;
+            if(current == null) current = Blocks.air;
+
+            buildCost = current.buildCost * state.rules.buildCostMultiplier;
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/ExplosionShield.java b/core/src/mindustry/world/blocks/ExplosionShield.java
new file mode 100644
index 0000000000..892795632c
--- /dev/null
+++ b/core/src/mindustry/world/blocks/ExplosionShield.java
@@ -0,0 +1,7 @@
+package mindustry.world.blocks;
+
+//TODO: horrible API design, but I'm not sure of a better way to do this right now. please don't use this class
+public interface ExplosionShield{
+    /** @return whether the shield was able to absorb the explosion; this should apply damage to the shield if true is returned. */
+    boolean absorbExplosion(float x, float y, float damage);
+}
diff --git a/core/src/mindustry/world/blocks/ItemSelection.java b/core/src/mindustry/world/blocks/ItemSelection.java
index f2c0b73084..6bbe2ba127 100644
--- a/core/src/mindustry/world/blocks/ItemSelection.java
+++ b/core/src/mindustry/world/blocks/ItemSelection.java
@@ -1,63 +1,114 @@
 package mindustry.world.blocks;
 
+import arc.*;
 import arc.func.*;
+import arc.math.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
 public class ItemSelection{
-    private static float scrollPos = 0f;
+    private static TextField search;
+    private static int rowCount;
 
     public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer){
         buildTable(table, items, holder, consumer, true);
     }
-    
-    public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, boolean closeSelect){
 
+    public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, boolean closeSelect){
+        buildTable(null, table, items, holder, consumer, closeSelect, 5, 4);
+    }
+
+    public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, int columns){
+        buildTable(null, table, items, holder, consumer, true, 5, columns);
+    }
+
+    public static <T extends UnlockableContent> void buildTable(Block block, Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer){
+        buildTable(block, table, items, holder, consumer, true, 5, 4);
+    }
+
+    public static <T extends UnlockableContent> void buildTable(Block block, Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, boolean closeSelect){
+        buildTable(block, table, items, holder, consumer, closeSelect, 5 ,4);
+    }
+
+    public static <T extends UnlockableContent> void buildTable(Block block, Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, int rows, int columns){
+        buildTable(block, table, items, holder, consumer, true, rows, columns);
+    }
+
+    public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, int rows, int columns){
+        buildTable(null, table, items, holder, consumer, true, rows, columns);
+    }
+
+    public static <T extends UnlockableContent> void buildTable(@Nullable Block block, Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, boolean closeSelect, int rows, int columns){
         ButtonGroup<ImageButton> group = new ButtonGroup<>();
         group.setMinCheckCount(0);
-        Table cont = new Table();
+        Table cont = new Table().top();
         cont.defaults().size(40);
 
-        int i = 0;
+        if(search != null) search.clearText();
 
-        for(T item : items){
-            if(!item.unlockedNow()) continue;
+        Runnable rebuild = () -> {
+            group.clear();
+            cont.clearChildren();
 
-            ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> {
-                if(closeSelect) control.input.frag.config.hideConfig();
-            }).group(group).get();
-            button.changed(() -> consumer.get(button.isChecked() ? item : null));
-            button.getStyle().imageUp = new TextureRegionDrawable(item.icon(Cicon.small));
-            button.update(() -> button.setChecked(holder.get() == item));
+            var text = search != null ? search.getText() : "";
+            int i = 0;
+            rowCount = 0;
 
-            if(i++ % 4 == 3){
-                cont.row();
+            Seq<T> list = items.select(u -> (text.isEmpty() || u.localizedName.toLowerCase().contains(text.toLowerCase())));
+            for(T item : list){
+                if(!item.unlockedNow() || !item.isOnPlanet(state.getPlanet()) || item.isHidden()) continue;
+
+                ImageButton button = cont.button(Tex.whiteui, Styles.clearNoneTogglei, Mathf.clamp(item.selectionSize, 0f, 40f), () -> {
+                    if(closeSelect) control.input.config.hideConfig();
+                }).tooltip(item.localizedName).group(group).get();
+                button.changed(() -> consumer.get(button.isChecked() ? item : null));
+                button.getStyle().imageUp = new TextureRegionDrawable(item.uiIcon);
+                button.update(() -> button.setChecked(holder.get() == item));
+
+                if(i++ % columns == (columns - 1)){
+                    cont.row();
+                    rowCount++;
+                }
             }
-        }
+        };
 
-        //add extra blank spaces so it looks nice
-        if(i % 4 != 0){
-            int remaining = 4 - (i % 4);
-            for(int j = 0; j < remaining; j++){
-                cont.image(Styles.black6);
-            }
+        rebuild.run();
+
+        Table main = new Table().background(Styles.black6);
+        if(rowCount > rows * 1.5f){
+            main.table(s -> {
+                s.image(Icon.zoom).padLeft(4f);
+                search = s.field(null, text -> rebuild.run()).padBottom(4).left().growX().get();
+                search.setMessageText("@players.search");
+            }).fillX().row();
         }
 
         ScrollPane pane = new ScrollPane(cont, Styles.smallPane);
         pane.setScrollingDisabled(true, false);
-        pane.setScrollYForce(scrollPos);
-        pane.update(() -> {
-            scrollPos = pane.getScrollY();
+        pane.exited(() -> {
+            if(pane.hasScroll()){
+                Core.scene.setScrollFocus(null);
+            }
         });
 
+        if(block != null){
+            pane.setScrollYForce(block.selectScroll);
+            pane.update(() -> {
+                block.selectScroll = pane.getScrollY();
+            });
+        }
+
         pane.setOverscroll(false, false);
-        table.add(pane).maxHeight(Scl.scl(40 * 5));
+        main.add(pane).maxHeight(40 * rows);
+        table.top().add(main);
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/world/blocks/LaunchAnimator.java b/core/src/mindustry/world/blocks/LaunchAnimator.java
new file mode 100644
index 0000000000..62a3366ff3
--- /dev/null
+++ b/core/src/mindustry/world/blocks/LaunchAnimator.java
@@ -0,0 +1,29 @@
+package mindustry.world.blocks;
+
+import arc.audio.*;
+import mindustry.gen.*;
+
+public interface LaunchAnimator{
+
+    void drawLaunch();
+
+    default void drawLaunchGlobalZ(){}
+
+    void beginLaunch(boolean launching);
+
+    void endLaunch();
+
+    void updateLaunch();
+
+    float launchDuration();
+
+    default Music landMusic(){
+        return Musics.land;
+    }
+
+    default Music launchMusic(){
+        return Musics.launch;
+    }
+
+    float zoomLaunch();
+}
diff --git a/core/src/mindustry/world/blocks/RotBlock.java b/core/src/mindustry/world/blocks/RotBlock.java
new file mode 100644
index 0000000000..470b9dd43a
--- /dev/null
+++ b/core/src/mindustry/world/blocks/RotBlock.java
@@ -0,0 +1,6 @@
+package mindustry.world.blocks;
+
+/** Any block that has 360-degree rotation */
+public interface RotBlock{
+    float buildRotation();
+}
diff --git a/core/src/mindustry/world/blocks/UnitTetherBlock.java b/core/src/mindustry/world/blocks/UnitTetherBlock.java
new file mode 100644
index 0000000000..4966d9d026
--- /dev/null
+++ b/core/src/mindustry/world/blocks/UnitTetherBlock.java
@@ -0,0 +1,5 @@
+package mindustry.world.blocks;
+
+public interface UnitTetherBlock{
+    void spawned(int id);
+}
diff --git a/core/src/mindustry/world/blocks/campaign/Accelerator.java b/core/src/mindustry/world/blocks/campaign/Accelerator.java
index b5a33bc2d3..164e9cd746 100644
--- a/core/src/mindustry/world/blocks/campaign/Accelerator.java
+++ b/core/src/mindustry/world/blocks/campaign/Accelerator.java
@@ -3,62 +3,143 @@ package mindustry.world.blocks.campaign;
 import arc.*;
 import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
+import arc.audio.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.scene.actions.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
+import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.ctype.*;
+import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.storage.*;
 
 import static mindustry.Vars.*;
 
 public class Accelerator extends Block{
-    public @Load("launch-arrow") TextureRegion arrowRegion;
+    public @Load(value = "@-launch-arrow", fallback = "launch-arrow") TextureRegion arrowRegion;
+    public @Load("select-arrow-small") TextureRegion selectArrowRegion;
 
-    public Block launching = Blocks.coreNucleus;
-    public int[] capacities;
+    /** Core block that is launched. Should match the starting core of the planet being launched to. */
+    public Block launchBlock = Blocks.coreNucleus;
+    public float powerBufferRequirement;
+    /** Override for planets that this block can launch to. If null, the planet's launch candidates are used. */
+    public @Nullable Seq<Planet> launchCandidates;
+
+    //TODO: launching needs audio!
+
+    public Music launchMusic = Musics.coreLaunch;
+    public float launchDuration = 120f;
+    public float chargeDuration = 220f;
+    public float buildDuration = 120f;
+    public Interp landZoomInterp = Interp.pow4In, chargeZoomInterp = Interp.pow4In;
+    public float landZoomFrom = 0.02f, landZoomTo = 4f, chargeZoomTo = 5f;
+
+    public int chargeRings = 4;
+    public float ringRadBase = 60f, ringRadSpacing = 25f, ringRadPow = 1.6f, ringStroke = 3f, ringSpeedup = 1.4f, chargeRingMerge = 2f, ringArrowRad = 3f;
+    public float ringHandleTilt = 0.8f, ringHandleLen = 30f;
+    public Color ringColor = Pal.accent;
+
+    public int launchLightning = 20;
+    public Color lightningColor = Pal.accent;
+    public float lightningDamage = 40;
+    public float lightningOffset = 24f;
+    public int lightningLengthMin = 5, lightningLengthMax = 25;
+    public double lightningLaunchChance = 0.8;
+
+    protected int[] capacities = {};
 
     public Accelerator(String name){
         super(name);
         update = true;
         solid = true;
         hasItems = true;
+        hasPower = true;
         itemCapacity = 8000;
         configurable = true;
+        emitLight = true;
+        lightRadius = 70f;
+        lightColor = Pal.accent;
     }
 
     @Override
     public void init(){
         itemCapacity = 0;
         capacities = new int[content.items().size];
-        for(ItemStack stack : launching.requirements){
+        for(ItemStack stack : launchBlock.requirements){
             capacities[stack.item.id] = stack.amount;
             itemCapacity += stack.amount;
         }
-        consumes.items(launching.requirements);
+        consumeItems(launchBlock.requirements);
         super.init();
     }
 
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        if(powerBufferRequirement > 0f){
+            addBar("powerBufferRequirement", b -> new Bar(
+            () -> Core.bundle.format("bar.powerbuffer",UI.formatAmount((long)b.power.graph.getBatteryStored()),  UI.formatAmount((long)powerBufferRequirement)),
+            () -> Pal.powerBar,
+            () -> b.power.graph.getBatteryStored() / powerBufferRequirement
+            ));
+        }
+    }
+
     @Override
     public boolean outputsItems(){
         return false;
     }
-    
-    public class AcceleratorBuild extends Building{
+
+    public class AcceleratorBuild extends Building implements LaunchAnimator{
         public float heat, statusLerp;
+        public float progress;
+        public float time, launchHeat;
+        public boolean launching;
+        public float launchTime;
+
+        protected float cloudSeed;
 
         @Override
         public void updateTile(){
             super.updateTile();
-            heat = Mathf.lerpDelta(heat, consValid() ? 1f : 0f, 0.05f);
+            heat = Mathf.lerpDelta(heat, launching ? 1f : efficiency, 0.05f);
             statusLerp = Mathf.lerpDelta(statusLerp, power.status, 0.05f);
+
+            if(!launching){
+                time += Time.delta * efficiency;
+            }else{
+                time = Mathf.slerpDelta(time, 0f, 0.4f);
+            }
+
+            launchHeat = Mathf.lerpDelta(launchHeat, launching ? 1f : 0f, 0.1f);
+
+            if(efficiency >= 0f){
+                progress += Time.delta * efficiency / buildDuration;
+                progress = Math.min(progress, 1f);
+            }
         }
-        
+
+        @Override
+        public float progress(){
+            return progress;
+        }
+
         @Override
         public void draw(){
             super.draw();
@@ -72,44 +153,120 @@ public class Accelerator extends Block{
                     Draw.rect(arrowRegion, x + Angles.trnsx(rot, length), y + Angles.trnsy(rot, length), rot + 180f);
                 }
             }
-            
+
+            {
+                if(launching){
+                    Draw.reset();
+
+                    Draw.blend(Blending.additive);
+                    Fill.light(x, y, 15, launchBlock.size * tilesize * 1f, Tmp.c2.set(Pal.accent).a(launchTime / chargeDuration), Tmp.c1.set(Pal.accent).a(0f));
+                    Draw.blend();
+
+                    Draw.rect(launchBlock.fullIcon, x, y);
+
+                    Draw.z(Layer.bullet);
+                    Draw.mixcol(Pal.accent, Mathf.clamp(launchTime / chargeDuration));
+                    Draw.color(1f, 1f, 1f, Interp.pow2In.apply(Mathf.clamp(launchTime / chargeDuration * 0.7f)));
+                    Draw.rect(launchBlock.fullIcon, x, y);
+                    Draw.reset();
+                }else{
+                    Drawf.shadow(x, y, launchBlock.size * tilesize * 2f, progress);
+                    Draw.draw(Layer.blockBuilding, () -> {
+                        Draw.color(Pal.accent, heat);
+
+                        for(TextureRegion region : launchBlock.getGeneratedIcons()){
+                            Shaders.blockbuild.region = region;
+                            Shaders.blockbuild.time = time;
+                            Shaders.blockbuild.progress = progress;
+
+                            Draw.rect(region, x, y);
+                            Draw.flush();
+                        }
+
+                        Draw.color();
+                    });
+                }
+
+                Draw.reset();
+            }
+
             if(heat < 0.0001f) return;
 
-            float rad = size * tilesize / 2f * 0.74f;
+            float rad = size * tilesize / 2f * 0.74f * Mathf.lerp(1f, 1.3f, launchHeat);
             float scl = 2f;
 
             Draw.z(Layer.bullet - 0.0001f);
             Lines.stroke(1.75f * heat, Pal.accent);
-            Lines.square(x, y, rad * 1.22f, 45f);
+            Lines.square(x, y, rad * 1.22f, Mathf.lerp(45f, 0f, launchHeat));
+
+            //TODO: lock time when launching
 
             Lines.stroke(3f * heat, Pal.accent);
-            Lines.square(x, y, rad, Time.time / scl);
-            Lines.square(x, y, rad, -Time.time / scl);
+            Lines.square(x, y, rad * Mathf.lerp(1f, 1.3f, launchHeat), 45f + time / scl);
+            Lines.square(x, y, rad * Mathf.lerp(1f, 1.8f, launchHeat), Mathf.lerp(45f, 0f, launchHeat) - time / scl);
 
             Draw.color(team.color);
             Draw.alpha(Mathf.clamp(heat * 3f));
 
             for(int i = 0; i < 4; i++){
-                float rot = i*90f + 45f + (-Time.time /3f)%360f;
-                float length = 26f * heat;
+                float rot = i*90f + 45f + (-time/3f)%360f;
+                float length = 26f * heat * Mathf.lerp(1f, 1.5f, launchHeat);
                 Draw.rect(arrowRegion, x + Angles.trnsx(rot, length), y + Angles.trnsy(rot, length), rot + 180f);
             }
 
             Draw.reset();
         }
 
+        @Override
+        public void drawLight(){
+            Drawf.light(x, y, lightRadius, lightColor, launchHeat);
+        }
+
+        public boolean canLaunch(){
+            return isValid() && state.isCampaign() && efficiency > 0f && power.graph.getBatteryStored() >= powerBufferRequirement-0.00001f && progress >= 1f && !launching;
+        }
+
         @Override
         public Cursor getCursor(){
-            return !state.isCampaign() || !consValid() ? SystemCursor.arrow : super.getCursor();
+            return canLaunch() ? SystemCursor.hand : super.getCursor();
+        }
+
+        @Override
+        public void drawSelect(){
+            super.drawSelect();
+
+            if(power.graph.getBatteryStored() < powerBufferRequirement && !launching){
+                drawPlaceText(Core.bundle.get("bar.nobatterypower"), tile.x, tile.y, false);
+            }
         }
 
         @Override
         public void buildConfiguration(Table table){
             deselect();
 
-            if(!state.isCampaign() || !consValid()) return;
+            if(!canLaunch()) return;
+
+            ui.planet.showPlanetLaunch(state.rules.sector, launchCandidates == null ? state.rules.sector.planet.launchCandidates : launchCandidates, sector -> {
+                if(canLaunch()){
+                    consume();
+                    power.graph.useBatteries(powerBufferRequirement);
+                    progress = 0f;
+
+                    renderer.showLaunch(this);
+
+                    Time.runTask(launchDuration() - 6f, () -> {
+                        //unlock right before launch
+                        launching = false;
+                        sector.planet.unlockedOnLand.each(UnlockableContent::unlock);
+
+                        universe.clearLoadoutInfo();
+                        universe.updateLoadout((CoreBlock)launchBlock);
+
+                        control.playSector(sector);
+                    });
+                }
+            });
 
-            ui.showInfo("@indev.campaign");
             Events.fire(Trigger.acceleratorUse);
         }
 
@@ -122,5 +279,352 @@ public class Accelerator extends Block{
         public boolean acceptItem(Building source, Item item){
             return items.get(item) < getMaximumAccepted(item);
         }
+
+        @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();
+            }
+        }
+
+        //launch animator stuff:
+        @Override
+        public float launchDuration(){
+            return launchDuration + chargeDuration;
+        }
+
+        @Override
+        public Music landMusic(){
+            //unused
+            return launchMusic;
+        }
+
+        @Override
+        public Music launchMusic(){
+            return launchMusic;
+        }
+
+        @Override
+        public void beginLaunch(boolean launching){
+            if(!launching) return;
+
+            this.launching = true;
+            Fx.coreLaunchConstruct.at(x, y, launchBlock.size);
+
+            cloudSeed = Mathf.random(1f);
+            float margin = 30f;
+
+            Image image = new Image();
+            image.color.a = 0f;
+            image.touchable = Touchable.disabled;
+            image.setFillParent(true);
+            image.actions(Actions.delay((launchDuration() - margin) / 60f), Actions.fadeIn(margin / 60f, Interp.pow2In), Actions.delay(6f / 60f), Actions.remove());
+            image.update(() -> {
+                image.toFront();
+                ui.loadfrag.toFront();
+                if(state.isMenu()){
+                    image.remove();
+                }
+            });
+            Core.scene.add(image);
+
+            Time.run(chargeDuration, () -> {
+                Fx.coreLaunchConstruct.at(x, y, launchBlock.size);
+                Fx.launchAccelerator.at(x, y);
+                Effect.shake(10f, 14f, this);
+
+                for(int i = 0; i < launchLightning; i++){
+                    float a = Mathf.random(360f);
+                    Lightning.create(team, lightningColor, lightningDamage, x + Angles.trnsx(a, lightningOffset), y + Angles.trnsy(a, lightningOffset), a, Mathf.random(lightningLengthMin, lightningLengthMax));
+                }
+
+                float spacing = 12f;
+                for(int i = 0; i < 13; i++){
+                    int fi = i;
+                    Time.run(i * 1.1f, () -> {
+                        float radius = block.size/2f + 1 + spacing * fi;
+                        int rays = Mathf.ceil(radius * Mathf.PI * 2f / 6f);
+                        for(int r = 0; r < rays; r++){
+                            if(Mathf.chance(0.7f - fi  * 0.02f)){
+                                float angle = r * 360f / (float)rays;
+                                float ox = Angles.trnsx(angle, radius), oy = Angles.trnsy(angle, radius);
+                                Tile t = world.tileWorld(x + ox, y + oy);
+                                if(t != null){
+                                    Fx.coreLandDust.at(t.worldx(), t.worldy(), angle + Mathf.range(30f), Tmp.c1.set(t.floor().mapColor).mul(1.7f + Mathf.range(0.15f)));
+                                }
+                            }
+                        }
+                    });
+                }
+
+
+            });
+        }
+
+        @Override
+        public void endLaunch(){
+            launching = false;
+            launchTime = 0f;
+        }
+
+        @Override
+        public float zoomLaunch(){
+            float rawTime = launchDuration() - renderer.getLandTime();
+            float shake = rawTime < chargeDuration ? Interp.pow10In.apply(Mathf.clamp(rawTime/chargeDuration)) : 0f;
+
+            Core.camera.position.set(x, y).add(Tmp.v1.setToRandomDirection().scl(shake * 2f));
+
+            if(rawTime < chargeDuration){
+                float fin = rawTime / chargeDuration;
+
+                return chargeZoomInterp.apply(Scl.scl(landZoomTo), Scl.scl(chargeZoomTo), fin);
+            }else{
+                float rawFin = renderer.getLandTimeIn();
+                float fin = 1f - Mathf.clamp((1f - rawFin) - (chargeDuration / (launchDuration + chargeDuration))) / (1f - (chargeDuration / (launchDuration + chargeDuration)));
+
+                return landZoomInterp.apply(Scl.scl(landZoomFrom), Scl.scl(landZoomTo), fin);
+            }
+        }
+
+        @Override
+        public void updateLaunch(){
+            float in = renderer.getLandTimeIn() * launchDuration();
+            launchTime = launchDuration() - in;
+            float tsize = Mathf.sample(CoreBlock.thrusterSizes, (in + 35f) / launchDuration());
+
+            float rawFin = renderer.getLandTimeIn();
+            float chargeFin = 1f - Mathf.clamp((1f - rawFin) / (chargeDuration / (launchDuration + chargeDuration)));
+            float chargeFout = 1f - chargeFin;
+
+            if(in > launchDuration){
+                if(Mathf.chanceDelta(lightningLaunchChance * Interp.pow3In.apply(chargeFout))){
+                    float a = Mathf.random(360f);
+                    Lightning.create(team, lightningColor, lightningDamage, x + Angles.trnsx(a, lightningOffset), y + Angles.trnsy(a, lightningOffset), a, Mathf.random(lightningLengthMin, lightningLengthMax));
+                }
+            }
+        }
+
+        @Override
+        public void drawLaunch(){
+            var clouds = Core.assets.get("sprites/clouds.png", Texture.class);
+
+            float rawFin = renderer.getLandTimeIn();
+            float rawTime = launchDuration() - renderer.getLandTime();
+            float fin = 1f - Mathf.clamp((1f - rawFin) - (chargeDuration / (launchDuration + chargeDuration))) / (1f - (chargeDuration / (launchDuration + chargeDuration)));
+
+            float chargeFin = 1f - Mathf.clamp((1f - rawFin) / (chargeDuration / (launchDuration + chargeDuration)));
+            float chargeFout = 1f - chargeFin;
+
+            float cameraScl = renderer.getDisplayScale();
+
+            float fout = 1f - fin;
+            float scl = Scl.scl(4f) / cameraScl;
+            float pfin = Interp.pow3Out.apply(fin), pf = Interp.pow2In.apply(fout);
+
+            //draw particles
+            Draw.color(Pal.lightTrail);
+            Angles.randLenVectors(1, pfin, 100, 800f * scl * pfin, (ax, ay, ffin, ffout) -> {
+                Lines.stroke(scl * ffin * pf * 3f);
+                Lines.lineAngle(x + ax, y + ay, Mathf.angle(ax, ay), (ffin * 20 + 1f) * scl);
+            });
+            Draw.color();
+
+            if(rawTime >= chargeDuration){
+                drawLanding(fin, x, y);
+            }
+
+            Draw.color();
+            Draw.mixcol(Color.white, Interp.pow5In.apply(fout));
+
+            //accent tint indicating that the core was just constructed
+            if(renderer.isLaunching()){
+                float f = Mathf.clamp(1f - fout * 12f);
+                if(f > 0.001f){
+                    Draw.mixcol(Pal.accent, f);
+                }
+            }
+
+            //draw clouds
+            if(state.rules.cloudColor.a > 0.0001f){
+                float scaling = CoreBlock.cloudScaling;
+                float sscl = Math.max(1f + Mathf.clamp(fin + CoreBlock.cfinOffset) * CoreBlock.cfinScl, 0f) * cameraScl;
+
+                Tmp.tr1.set(clouds);
+                Tmp.tr1.set(
+                (Core.camera.position.x - Core.camera.width/2f * sscl) / scaling,
+                (Core.camera.position.y - Core.camera.height/2f * sscl) / scaling,
+                (Core.camera.position.x + Core.camera.width/2f * sscl) / scaling,
+                (Core.camera.position.y + Core.camera.height/2f * sscl) / scaling);
+
+                Tmp.tr1.scroll(10f * cloudSeed, 10f * cloudSeed);
+
+                Draw.alpha(Mathf.sample(CoreBlock.cloudAlphas, fin + CoreBlock.calphaFinOffset) * CoreBlock.cloudAlpha);
+                Draw.mixcol(state.rules.cloudColor, state.rules.cloudColor.a);
+                Draw.rect(Tmp.tr1, Core.camera.position.x, Core.camera.position.y, Core.camera.width, Core.camera.height);
+                Draw.reset();
+            }
+        }
+
+        @Override
+        public void drawLaunchGlobalZ(){
+            float rawFin = renderer.getLandTimeIn();
+
+            float chargeFin = 1f - Mathf.clamp((1f - rawFin) / (chargeDuration / (launchDuration + chargeDuration)));
+            float fin = 1f - Mathf.clamp((1f - rawFin) - (chargeDuration / (launchDuration + chargeDuration))) / (1f - (chargeDuration / (launchDuration + chargeDuration)));
+            float fout = 1f - fin;
+            float chargeFout = 1f - chargeFin;
+
+            //fade out rings during launch.
+            chargeFout = Mathf.clamp(chargeFout - fout * 2f);
+
+            float
+            spacing = 1f / (chargeRings + chargeRingMerge);
+
+            for(int i = 0; i < chargeRings; i++){
+                float cfin = Mathf.clamp((chargeFout*ringSpeedup - spacing * i) / (spacing * (1f + chargeRingMerge)));
+                if(cfin > 0){
+                    drawRing(ringRadBase + ringRadSpacing * Mathf.pow(i, ringRadPow), cfin);
+                }
+            }
+        }
+
+        protected void drawRing(float radius, float fin){
+            Draw.z(Layer.effect);
+
+            float fout = 1f - fin;
+            float rotate = Interp.pow4In.apply(fout) * 90f;
+            float rad = radius + 20f * Interp.pow4In.apply(fout);
+
+            Lines.stroke(ringStroke * fin, ringColor);
+
+            Draw.color(Pal.command, ringColor, fin);
+
+            //handles
+            for(int i = 0; i < 4; i++){
+                float angle = i * 90f + 45f + rotate;
+                Lines.beginLine();
+                Lines.linePoint(Tmp.v1.trns(angle - ringHandleLen, rad * ringHandleTilt).add(x, y));
+                Lines.linePoint(Tmp.v2.trns(angle, rad).add(x, y));
+                Lines.linePoint(Tmp.v3.trns(angle + ringHandleLen, rad * ringHandleTilt).add(x, y));
+                Lines.endLine(false);
+
+            }
+
+            Draw.scl(fin);
+
+            //selection triangles
+            for(int i = 0; i < 4; i++){
+                float angle = i * 90f + rotate;
+
+
+                Draw.rect(selectArrowRegion, x + Angles.trnsx(angle, rad), y + Angles.trnsy(angle, rad), angle + 180f + 45f);
+
+                //shape variant:
+                //Lines.poly(x + Angles.trnsx(angle, rad), y + Angles.trnsy(angle, rad), 3, ringArrowRad * fin, angle + 180f);
+            }
+
+            Draw.scl();
+
+        }
+
+        protected void drawLanding(float fin, float x, float y){
+            float rawTime = launchDuration() - renderer.getLandTime();
+            float fout = 1f - fin;
+
+            float scl = rawTime < chargeDuration ? 1f : Scl.scl(4f) / renderer.getDisplayScale();
+            float shake = 0f;
+            float s = launchBlock.region.width * launchBlock.region.scl() * scl * 3.6f * Interp.pow2Out.apply(fout);
+            float rotation = Interp.pow2In.apply(fout) * 135f;
+            x += Mathf.range(shake);
+            y += Mathf.range(shake);
+            float thrustOpen = 0.25f;
+            float thrusterFrame = fin >= thrustOpen ? 1f : fin / thrustOpen;
+            float thrusterSize = Mathf.sample(CoreBlock.thrusterSizes, fin);
+
+            //when launching, thrusters stay out the entire time.
+            if(renderer.isLaunching()){
+                Interp i = Interp.pow2Out;
+                thrusterFrame = i.apply(Mathf.clamp(fout*13f));
+                thrusterSize = i.apply(Mathf.clamp(fout*9f));
+            }
+
+            Draw.color(Pal.lightTrail);
+            //TODO spikier heat
+            Draw.rect("circle-shadow", x, y, s, s);
+
+            Draw.scl(scl);
+
+            //draw thruster flame
+            float strength = (1f + (launchBlock.size - 3)/2.5f) * scl * thrusterSize * (0.95f + Mathf.absin(2f, 0.1f));
+            float offset = (launchBlock.size - 3) * 3f * scl;
+
+            for(int i = 0; i < 4; i++){
+                Tmp.v1.trns(i * 90 + rotation, 1f);
+
+                Tmp.v1.setLength((launchBlock.size * tilesize/2f + 1f)*scl + strength*2f + offset);
+                Draw.color(team.color);
+                Fill.circle(Tmp.v1.x + x, Tmp.v1.y + y, 6f * strength);
+
+                Tmp.v1.setLength((launchBlock.size * tilesize/2f + 1f)*scl + strength*0.5f + offset);
+                Draw.color(Color.white);
+                Fill.circle(Tmp.v1.x + x, Tmp.v1.y + y, 3.5f * strength);
+            }
+
+            drawLandingThrusters(x, y, rotation, thrusterFrame);
+
+            Drawf.spinSprite(launchBlock.region, x, y, rotation);
+
+            Draw.alpha(Interp.pow4In.apply(thrusterFrame));
+            drawLandingThrusters(x, y, rotation, thrusterFrame);
+            Draw.alpha(1f);
+
+            if(launchBlock.teamRegions[team.id] == launchBlock.teamRegion) Draw.color(team.color);
+
+            Drawf.spinSprite(launchBlock.teamRegions[team.id], x, y, rotation);
+
+            Draw.color();
+            Draw.scl();
+            Draw.reset();
+        }
+
+        protected void drawLandingThrusters(float x, float y, float rotation, float frame){
+            CoreBlock core = (CoreBlock)launchBlock;
+            float length = core.thrusterLength * (frame - 1f) - 1f/4f;
+            float alpha = Draw.getColorAlpha();
+
+            //two passes for consistent lighting
+            for(int j = 0; j < 2; j++){
+                for(int i = 0; i < 4; i++){
+                    var reg = i >= 2 ? core.thruster2 : core.thruster1;
+                    float rot = (i * 90) + rotation % 90f;
+                    Tmp.v1.trns(rot, length * Draw.xscl);
+
+                    //second pass applies extra layer of shading
+                    if(j == 1){
+                        Tmp.v1.rotate(-90f);
+                        Draw.alpha((rotation % 90f) / 90f * alpha);
+                        rot -= 90f;
+                        Draw.rect(reg, x + Tmp.v1.x, y + Tmp.v1.y, rot);
+                    }else{
+                        Draw.alpha(alpha);
+                        Draw.rect(reg, x + Tmp.v1.x, y + Tmp.v1.y, rot);
+                    }
+                }
+            }
+            Draw.alpha(1f);
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/campaign/LandingPad.java b/core/src/mindustry/world/blocks/campaign/LandingPad.java
new file mode 100644
index 0000000000..2fc630fc4a
--- /dev/null
+++ b/core/src/mindustry/world/blocks/campaign/LandingPad.java
@@ -0,0 +1,477 @@
+package mindustry.world.blocks.campaign;
+
+import arc.*;
+import arc.Graphics.*;
+import arc.Graphics.Cursor.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.liquid.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class LandingPad extends Block{
+    static ObjectMap<Item, Seq<LandingPadBuild>> waiting = new ObjectMap<>();
+    static long lastUpdateId = -1;
+
+    static{
+        Events.on(ResetEvent.class, e -> {
+            waiting.clear();
+            lastUpdateId = -1;
+        });
+    }
+
+    public @Load(value = "@-pod", fallback = "advanced-launch-pad-pod") TextureRegion podRegion;
+    public float arrivalDuration = 150f;
+    public float cooldownTime = 150f;
+    public float consumeLiquidAmount = 100f;
+    public Liquid consumeLiquid = Liquids.water;
+
+    public Effect landEffect = Fx.podLandShockwave;
+    public Effect coolingEffect = Fx.none;
+    public float coolingEffectChance = 0.2f;
+
+    public float liquidPad = 2f;
+    public Color bottomColor = Pal.darkerMetal;
+
+    public LandingPad(String name){
+        super(name);
+
+        hasItems = true;
+        hasLiquids = true;
+        solid = true;
+        update = true;
+        configurable = true;
+        acceptsItems = false;
+        canOverdrive = false; //overdriving can't do anything meaningful besides decrease cooldown, which is very small anyway, so don't bother
+        emitLight = true;
+        lightRadius = 90f;
+
+        config(Item.class, (LandingPadBuild build, Item item) -> {
+            if(!build.accessible()) return;
+
+            build.config = item;
+        });
+        configClear((LandingPadBuild build) -> {
+            if(!build.accessible()) return;
+
+            build.config = null;
+        });
+    }
+
+    @Override
+    public void init(){
+        consume(new ConsumeLiquid(consumeLiquid, consumeLiquidAmount){
+
+            @Override
+            public void build(Building build, Table table){
+                table.add(new ReqImage(liquid.uiIcon, () -> build.liquids.get(liquid) >= amount)).size(iconMed).top().left();
+            }
+
+            @Override
+            public float efficiency(Building build){
+                return build.liquids.get(consumeLiquid) >= amount ? 1f : 0f;
+            }
+
+            @Override
+            public void display(Stats stats){
+                stats.add(Stat.input, liquid, amount, false);
+            }
+        }).update(false);
+
+        super.init();
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addLiquidBar(consumeLiquid);
+        //TODO: does cooldown even need to exist?
+        addBar("cooldown", (LandingPadBuild entity) -> new Bar("bar.cooldown", Pal.lightOrange, () -> entity.cooldown));
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return true;
+    }
+
+    @Remote(called = Loc.server)
+    public static void landingPadLanded(Tile tile){
+        if(tile == null || !(tile.build instanceof LandingPadBuild build)) return;
+        build.handleLanding();
+    }
+
+    public class LandingPadBuild extends Building{
+        public @Nullable Item config;
+        //priority collisions are possible, but should be extremely rare
+        public int priority = Mathf.rand.nextInt();
+        public float cooldown = 0f, landParticleTimer;
+
+        public float arrivingTimer = 0f;
+        public @Nullable Item arriving;
+        public float liquidRemoved;
+
+        public void handleLanding(){
+            if(config == null) return;
+
+            cooldown = 1f;
+            arriving = config;
+            arrivingTimer = 0f;
+            liquidRemoved = 0f;
+
+            if(state.isCampaign() && !isFake()){
+                state.rules.sector.info.importCooldownTimers.put(config, 0f);
+            }
+        }
+
+        public boolean accessible(){
+            //In custom games, this block can be configured by anyone except the player team; this allows for enemy builder AI to use it
+            return state.rules.editor || state.rules.allowEditWorldProcessors || state.isCampaign() || state.rules.infiniteResources || (team != state.rules.defaultTeam && !state.rules.pvp && team != Team.derelict);
+        }
+
+        public void updateTimers(){
+            if(state.isCampaign() && lastUpdateId != state.updateId){
+                lastUpdateId = state.updateId;
+
+                float[] imports = state.rules.sector.info.getImportRates(state.getPlanet());
+
+                for(Item item : content.items()){
+                    float importedPerFrame = imports[item.id]/60f;
+                    if(importedPerFrame > 0f){
+                        float framesBetweenArrival = itemCapacity / importedPerFrame;
+
+                        state.rules.sector.info.importCooldownTimers.increment(item, 0f, 1f / framesBetweenArrival * Time.delta);
+                    }else{
+                        //nothing is being imported, so reset the timer
+                        state.rules.sector.info.importCooldownTimers.put(item, 0f);
+                    }
+                }
+
+                waiting.each((item, pads) -> {
+                    if(pads.size > 0){
+                        pads.sort(p -> p.priority);
+
+                        var first = pads.first();
+                        var head = pads.peek();
+
+                        Call.landingPadLanded(first.tile);
+
+                        //swap priorities, moving this block to the end of the list (if there is only one block waiting, this does nothing)
+                        var tmp = first.priority;
+                        first.priority = head.priority;
+                        head.priority = tmp;
+
+                        pads.clear();
+                    }
+                });
+            }
+        }
+
+        @Override
+        public void draw(){
+            if(consumeLiquid != null){
+                Draw.color(bottomColor);
+                Fill.square(x, y, size * tilesize/2f - liquidPad);
+                Draw.color();
+                LiquidBlock.drawTiledFrames(block.size, x, y, liquidPad, liquidPad, liquidPad, liquidPad, consumeLiquid, liquids.get(consumeLiquid) / liquidCapacity);
+            }
+
+            super.draw();
+
+            if(arriving != null){
+                float fin = Mathf.clamp(arrivingTimer), fout = 1f - fin;
+                float alpha = Interp.pow5Out.apply(fin);
+                float scale = (1f - alpha) * 1.3f + 1f;
+                float
+                cx = x,
+                cy = y + Interp.pow4In.apply(fout) * (100f + Mathf.randomSeedRange(id() + 2, 30f));
+
+                float rotation = fout * (90f + Mathf.randomSeedRange(id(), 50f));
+
+                Draw.z(Layer.effect + 0.001f);
+
+                Draw.color(Pal.engine);
+
+                float rad = 0.15f + Interp.pow5Out.apply(Mathf.slope(fin));
+
+                Fill.light(cx, cy, 10, 25f * (rad + scale-1f), Tmp.c2.set(Pal.engine).a(alpha), Tmp.c1.set(Pal.engine).a(0f));
+
+                Draw.alpha(alpha);
+                for(int i = 0; i < 4; i++){
+                    Drawf.tri(cx, cy, 6f, 40f * (rad + scale-1f), i * 90f + rotation);
+                }
+
+                Draw.color();
+
+                Draw.z(Layer.weather - 1);
+
+                scale *= podRegion.scl();
+                float rw = podRegion.width * scale, rh = podRegion.height * scale;
+
+                Draw.alpha(alpha);
+                Drawf.shadow(cx, cy, size * tilesize, fin);
+                Draw.rect(podRegion, cx, cy, rw, rh, rotation);
+
+                Tmp.v1.trns(225f, Interp.pow3In.apply(fout) * 250f);
+
+                Draw.z(Layer.flyingUnit + 1);
+                Draw.color(0, 0, 0, 0.22f * alpha);
+
+                Draw.rect(podRegion, cx + Tmp.v1.x, cy + Tmp.v1.y, rw, rh, rotation);
+
+            }else if(cooldown > 0f){
+
+                Drawf.shadow(x, y, size * tilesize, cooldown);
+                Draw.alpha(cooldown);
+                Draw.mixcol(Pal.accent, 1f - cooldown);
+                Draw.rect(podRegion, x, y);
+            }
+
+            Draw.reset();
+        }
+
+        @Override
+        public void drawLight(){
+            Drawf.light(x, y, lightRadius, Pal.accent, Mathf.clamp(Math.max(cooldown, arrivingTimer * 1.5f)));
+        }
+
+        @Override
+        public void updateTile(){
+            updateTimers();
+
+            if(arriving != null){
+                if(!headless){ //pod particles
+                    float fin = arrivingTimer;
+                    float tsize = Interp.pow5Out.apply(fin);
+
+                    landParticleTimer += tsize * Time.delta / 2f;
+                    if(landParticleTimer >= 1f){
+                        tile.getLinkedTiles(t -> {
+                            if(Mathf.chance(0.1f)){
+                                Fx.podLandDust.at(t.worldx(), t.worldy(), angleTo(t.worldx(), t.worldy()) + Mathf.range(30f), Tmp.c1.set(t.floor().mapColor).mul(1.5f + Mathf.range(0.15f)));
+                            }
+                        });
+
+                        landParticleTimer = 0f;
+                    }
+                }
+
+                arrivingTimer += Time.delta / arrivalDuration;
+
+                float toRemove = Math.min(consumeLiquidAmount / arrivalDuration * Time.delta, consumeLiquidAmount - liquidRemoved);
+                liquidRemoved += toRemove;
+
+                liquids.remove(consumeLiquid, toRemove);
+
+                if(Mathf.chanceDelta(coolingEffectChance * Interp.pow5Out.apply(arrivingTimer))){
+                    coolingEffect.at(this);
+                }
+
+                if(arrivingTimer >= 1f){
+                    //remove any leftovers to make sure it's precise
+                    liquids.remove(consumeLiquid, consumeLiquidAmount - liquidRemoved);
+
+                    landEffect.at(this);
+                    Effect.shake(3f, 3f, this);
+
+                    items.set(arriving, itemCapacity);
+                    if(!isFake()){
+                        state.getSector().info.handleItemImport(arriving, itemCapacity);
+                    }
+
+                    arriving = null;
+                    arrivingTimer = 0f;
+                }
+            }
+
+            if(items.total() > 0){
+                dumpAccumulate(config == null || items.get(config) != items.total() ? null : config);
+            }
+
+            if(arriving == null){
+                cooldown -= delta() / cooldownTime;
+                cooldown = Mathf.clamp(cooldown);
+            }
+
+            if(config != null && (isFake() || (state.isCampaign() && !state.getPlanet().campaignRules.legacyLaunchPads))){
+
+                if(cooldown <= 0f && efficiency > 0f && items.total() == 0 && (isFake() || (state.rules.sector.info.getImportRate(state.getPlanet(), config) > 0f && state.rules.sector.info.importCooldownTimers.get(config, 0f) >= 1f))){
+
+                    if(isFake()){
+                        //there is no queue for enemy team blocks, it's all fake
+                        Call.landingPadLanded(tile);
+                    }else{
+                        //queue landing for next frame
+                        waiting.get(config, Seq::new).add(this);
+                    }
+                }
+            }
+        }
+
+        /** @return whether this pad should receive items forever, essentially acting as an item source for maps. */
+        public boolean isFake(){
+            return team != state.rules.defaultTeam || !state.isCampaign();
+        }
+
+        @Override
+        public boolean canDump(Building to, Item item){
+            //hack: canDump is only ever called right before item offload, so count the item as "produced" before that.
+            produced(item);
+            return true;
+        }
+
+        @Override
+        public void drawSelect(){
+            if(config != null){
+                float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
+                Draw.mixcol(Color.darkGray, 1f);
+                Draw.rect(config.fullIcon, dx, dy - 1, s, s);
+                Draw.reset();
+                Draw.rect(config.fullIcon, dx, dy, s, s);
+            }
+        }
+
+        @Override
+        public Cursor getCursor(){
+            return !accessible() ? SystemCursor.arrow : super.getCursor();
+        }
+
+        @Override
+        public boolean shouldShowConfigure(Player player){
+            return accessible();
+        }
+
+        @Override
+        public boolean onConfigureBuildTapped(Building other){
+            if(this == other || !accessible()){
+                deselect();
+                return false;
+            }
+
+            return super.onConfigureBuildTapped(other);
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+
+            ItemSelection.buildTable(LandingPad.this, table, content.items(), () -> config, this::configure, selectionRows, selectionColumns);
+
+            if(!net.client() && !isFake()){
+                table.row();
+
+                table.table(t -> {
+                    t.background(Styles.black6);
+
+                    t.button(Icon.downOpen, Styles.clearNonei, 40f, () -> {
+                        if(config != null && state.isCampaign()){
+                            for(Sector sector : state.getPlanet().sectors){
+                                if(sector.hasBase() && sector != state.getSector() && sector.info.destination != state.getSector() && sector.info.hasExport(config)){
+                                    sector.info.destination = state.getSector();
+                                    sector.saveInfo();
+                                }
+                            }
+                            state.getSector().info.refreshImportRates(state.getPlanet());
+                        }
+                    }).disabled(b -> config == null || !state.isCampaign() || (!state.getPlanet().sectors.contains(s -> s.hasBase() && s.info.hasExport(config) && s.info.destination != state.getSector())))
+                    .tooltip("@sectors.redirect").get();
+                }).fillX().left();
+            }
+        }
+
+        @Override
+        public void display(Table table){
+            super.display(table);
+
+            if(!state.isCampaign() || net.client() || team != player.team() || isFake()) return;
+
+            table.row();
+            table.label(() -> {
+                if(!state.isCampaign() || isFake()) return "";
+
+                if(state.getPlanet().campaignRules.legacyLaunchPads){
+                    return Core.bundle.get("landingpad.legacy.disabled");
+                }
+
+                if(config == null) return "";
+
+                int sources = 0;
+                float perSecond = 0f;
+                for(var s : state.getPlanet().sectors){
+                    if(s != state.getSector() && s.hasBase() && s.info.destination == state.getSector()){
+                        float amount = s.info.getExport(config);
+                        if(amount > 0){
+                            sources ++;
+                            perSecond += s.info.getExport(config);
+                        }
+                    }
+                }
+
+                String str = Core.bundle.format("landing.sources", sources == 0 ? Core.bundle.get("none") : sources);
+                if(perSecond > 0){
+                    str += "\n" + Core.bundle.format("landing.import", config.emoji(), (int)(perSecond * 60f));
+                }
+                return str;
+            }).pad(4).wrap().width(200f).left();
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return false;
+        }
+
+        @Override
+        public @Nullable Object config(){
+            return config;
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            config = TypeIO.readItem(read);
+            priority = read.i();
+            cooldown = read.f();
+
+            if(revision >= 1){
+                arriving = TypeIO.readItem(read);
+                arrivingTimer = read.f();
+                liquidRemoved = read.f();
+            }
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            TypeIO.writeItem(write, config);
+            write.i(priority);
+            write.f(cooldown);
+
+            TypeIO.writeItem(write, arriving);
+            write.f(arrivingTimer);
+            write.f(liquidRemoved);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java
index d0804bd4cf..1063b45460 100644
--- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java
+++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java
@@ -1,9 +1,9 @@
 package mindustry.world.blocks.campaign;
 
 import arc.*;
-import arc.audio.*;
 import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
+import arc.audio.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -11,29 +11,38 @@ import arc.math.geom.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 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.*;
-import mindustry.world.consumers.*;
+import mindustry.world.blocks.liquid.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class LaunchPad extends Block{
-    public final int timerLaunch = timers++;
-    /** Time inbetween launches. */
-    public float launchTime;
+    /** Time between launches. */
+    public float launchTime = 1f;
     public Sound launchSound = Sounds.none;
 
     public @Load("@-light") TextureRegion lightRegion;
-    public @Load("launchpod") TextureRegion podRegion;
+    public @Load(value = "@-pod", fallback = "launchpod") TextureRegion podRegion;
     public Color lightColor = Color.valueOf("eab678");
+    public boolean acceptMultipleItems = false;
+
+    public float lightStep = 1f;
+    public int lightSteps = 3;
+
+    public float liquidPad = 2f;
+    public @Nullable Liquid drawLiquid;
+    public Color bottomColor = Pal.darkerMetal;
 
     public LaunchPad(String name){
         super(name);
@@ -41,7 +50,7 @@ public class LaunchPad extends Block{
         solid = true;
         update = true;
         configurable = true;
-        drawDisabled = false;
+        flags = EnumSet.of(BlockFlag.launchPad);
     }
 
     @Override
@@ -55,7 +64,8 @@ public class LaunchPad extends Block{
     public void setBars(){
         super.setBars();
 
-        bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
+        addBar("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
+        addBar("progress", (LaunchPadBuild build) -> new Bar(() -> Core.bundle.get("bar.launchcooldown"), () -> Pal.ammo, () -> Mathf.clamp(build.launchCounter / launchTime)));
     }
 
     @Override
@@ -64,34 +74,44 @@ public class LaunchPad extends Block{
     }
 
     public class LaunchPadBuild extends Building{
+        public float launchCounter;
 
         @Override
         public Cursor getCursor(){
             return !state.isCampaign() || net.client() ? SystemCursor.arrow : super.getCursor();
         }
 
-        //cannot be disabled
         @Override
-        public float efficiency(){
-            return power != null && (block.consumes.has(ConsumeType.power) && !block.consumes.getPower().buffered) ? power.status : 1f;
+        public boolean shouldConsume(){
+            //TODO add launch costs, maybe legacy version
+            return launchCounter < launchTime;
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return Mathf.clamp(launchCounter / launchTime);
+            return super.sense(sensor);
         }
 
         @Override
         public void draw(){
-            super.draw();
+            if(hasLiquids && drawLiquid != null){
+                Draw.color(bottomColor);
+                Fill.square(x, y, size * tilesize/2f - liquidPad);
+                Draw.color();
+                LiquidBlock.drawTiledFrames(block.size, x, y, liquidPad, liquidPad, liquidPad, liquidPad, drawLiquid, liquids.get(drawLiquid) / liquidCapacity);
+            }
 
-            if(!state.isCampaign()) return;
+            super.draw();
 
             if(lightRegion.found()){
                 Draw.color(lightColor);
-                float progress = Math.min((float)items.total() / itemCapacity, timer.getTime(timerLaunch) / (launchTime / timeScale));
-                int steps = 3;
-                float step = 1f;
+                float progress = Math.min((float)items.total() / itemCapacity, launchCounter / launchTime);
 
                 for(int i = 0; i < 4; i++){
-                    for(int j = 0; j < steps; j++){
-                        float alpha = Mathf.curve(progress, (float)j / steps, (j+1f) / steps);
-                        float offset = -(j - 1f) * step;
+                    for(int j = 0; j < lightSteps; j++){
+                        float alpha = Mathf.curve(progress, (float)j / lightSteps, (j+1f) / lightSteps);
+                        float offset = -(j - 1f) * lightStep;
 
                         Draw.color(Pal.metalGrayDark, lightColor, alpha);
                         Draw.rect(lightRegion, x + Geometry.d8edge(i).x * offset, y + Geometry.d8edge(i).y * offset, i * 90);
@@ -101,10 +121,7 @@ public class LaunchPad extends Block{
                 Draw.reset();
             }
 
-            float cooldown = Mathf.clamp(timer.getTime(timerLaunch) / (90f / timeScale));
-
-            Draw.mixcol(lightColor, 1f - cooldown);
-
+            Drawf.shadow(x, y, size * tilesize);
             Draw.rect(podRegion, x, y);
 
             Draw.reset();
@@ -112,15 +129,16 @@ public class LaunchPad extends Block{
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            return items.total() < itemCapacity;
+            return items.total() < itemCapacity && (acceptMultipleItems || items.total() == 0 || items.first() == item);
         }
 
         @Override
         public void updateTile(){
-            if(!state.isCampaign()) return;
 
-            //launch when full and base conditions are met
-            if(items.total() >= itemCapacity && efficiency() >= 1f && timer(timerLaunch, launchTime / timeScale)){
+            //increment launchCounter then launch when full and base conditions are met
+            if((launchCounter += edelta()) >= launchTime && items.total() >= itemCapacity){
+                //if there are item requirements, use those.
+                consume();
                 launchSound.at(x, y);
                 LaunchPayload entity = LaunchPayload.create();
                 items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount)));
@@ -131,6 +149,7 @@ public class LaunchPad extends Block{
                 Fx.launchPod.at(this);
                 items.clear();
                 Effect.shake(3f, 3f, this);
+                launchCounter = 0f;
             }
         }
 
@@ -138,18 +157,23 @@ public class LaunchPad extends Block{
         public void display(Table table){
             super.display(table);
 
-            if(!state.isCampaign()) return;
+            if(!state.isCampaign() || net.client() || team != player.team()) return;
 
             table.row();
             table.label(() -> {
-                Sector dest = state.rules.sector == null ? null : state.rules.sector.info.getRealDestination();
+                Sector dest = state.rules.sector == null ? null : state.rules.sector.info.destination;
 
                 return Core.bundle.format("launch.destination",
-                    dest == null ? Core.bundle.get("sectors.nonelaunch") :
+                    dest == null || !dest.hasBase() ? Core.bundle.get("sectors.nonelaunch") :
                     "[accent]" + dest.name());
             }).pad(4).wrap().width(200f).left();
         }
 
+        @Override
+        public boolean shouldShowConfigure(Player player){
+            return state.isCampaign();
+        }
+
         @Override
         public void buildConfiguration(Table table){
             if(!state.isCampaign() || net.client()){
@@ -157,15 +181,38 @@ public class LaunchPad extends Block{
                 return;
             }
 
-            table.button(Icon.upOpen, Styles.clearTransi, () -> {
+            table.button(Icon.upOpen, Styles.cleari, () -> {
                 ui.planet.showSelect(state.rules.sector, other -> {
-                    if(state.isCampaign()){
+                    if(state.isCampaign() && other.planet == state.rules.sector.planet){
+                        var prev = state.rules.sector.info.destination;
                         state.rules.sector.info.destination = other;
+                        if(prev != null){
+                            prev.info.refreshImportRates(state.getPlanet());
+                        }
                     }
                 });
                 deselect();
             }).size(40f);
         }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(launchCounter);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                launchCounter = read.f();
+            }
+        }
     }
 
     @EntityDef(LaunchPayloadc.class)
@@ -200,8 +247,9 @@ public class LaunchPad extends Block{
 
             Draw.z(Layer.weather - 1);
 
-            TextureRegion region = Core.atlas.find("launchpod");
-            float rw = region.width * Draw.scl * scale, rh = region.height * Draw.scl * scale;
+            TextureRegion region = blockOn() instanceof mindustry.world.blocks.campaign.LaunchPad p ? p.podRegion : Core.atlas.find("launchpod");
+            scale *= region.scl();
+            float rw = region.width * scale, rh = region.height * scale;
 
             Draw.alpha(alpha);
             Draw.rect(region, cx, cy, rw, rh, rotation);
@@ -233,26 +281,24 @@ public class LaunchPad extends Block{
 
         @Override
         public void remove(){
-            if(!state.isCampaign()) return;
+            if(!state.isCampaign() || net.client()) return;
 
-            Sector destsec = state.rules.sector.info.getRealDestination();
+            Sector destsec = state.rules.sector.info.destination;
 
             //actually launch the items upon removal
-            if(team() == state.rules.defaultTeam){
-                if(destsec != null && (destsec != state.rules.sector || net.client())){
-                    ItemSeq dest = new ItemSeq();
+            if(team() == state.rules.defaultTeam && destsec != null && destsec != state.rules.sector){
+                ItemSeq dest = new ItemSeq();
 
-                    for(ItemStack stack : stacks){
-                        dest.add(stack);
+                for(ItemStack stack : stacks){
+                    dest.add(stack);
 
-                        //update export
-                        state.rules.sector.info.handleItemExport(stack);
-                        Events.fire(new LaunchItemEvent(stack));
-                    }
+                    //update export statistics
+                    state.rules.sector.info.handleItemExport(stack);
+                    Events.fire(new LaunchItemEvent(stack));
+                }
 
-                    if(!net.client()){
-                        destsec.addItems(dest);
-                    }
+                if(state.getPlanet().campaignRules.legacyLaunchPads){
+                    destsec.addItems(dest);
                 }
             }
         }
diff --git a/core/src/mindustry/world/blocks/defense/AutoDoor.java b/core/src/mindustry/world/blocks/defense/AutoDoor.java
new file mode 100644
index 0000000000..a1cfb08619
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/AutoDoor.java
@@ -0,0 +1,109 @@
+package mindustry.world.blocks.defense;
+
+import arc.audio.*;
+import arc.func.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.logic.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class AutoDoor extends Wall{
+    protected final static Rect rect = new Rect();
+    protected final static Seq<Unit> units = new Seq<>();
+    protected final static Boolf<Unit> groundCheck = u -> u.isGrounded() && !u.type.allowLegStep;
+
+    public final int timerToggle = timers++;
+
+    public float checkInterval = 20f;
+    public Effect openfx = Fx.dooropen;
+    public Effect closefx = Fx.doorclose;
+    public Sound doorSound = Sounds.door;
+    public @Load("@-open") TextureRegion openRegion;
+    public float triggerMargin = 12f;
+
+    public AutoDoor(String name){
+        super(name);
+        solid = false;
+        solidifes = true;
+        update = true;
+        teamPassable = true;
+
+        noUpdateDisabled = true;
+        drawDisabled = true;
+    }
+
+    @Remote(called = Loc.server)
+    public static void autoDoorToggle(Tile tile, boolean open){
+        if(tile == null || !(tile.build instanceof AutoDoorBuild build)) return;
+        build.setOpen(open);
+    }
+
+    public class AutoDoorBuild extends Building{
+        public boolean open = false;
+
+        public AutoDoorBuild(){
+            //make sure it is staggered
+            timer.reset(timerToggle, Mathf.random(checkInterval));
+        }
+
+        @Override
+        public void updateTile(){
+            if(timer(timerToggle, checkInterval) && !net.client()){
+                units.clear();
+                team.data().tree().intersect(rect.setSize(size * tilesize + triggerMargin * 2f).setCenter(x, y), units);
+                boolean shouldOpen = units.contains(groundCheck);
+
+                if(open != shouldOpen){
+                    Call.autoDoorToggle(tile, shouldOpen);
+                }
+            }
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.enabled) return open ? 1 : 0;
+            return super.sense(sensor);
+        }
+
+        public void setOpen(boolean open){
+            this.open = open;
+            pathfinder.updateTile(tile);
+            if(wasVisible){
+                (!open ? closefx : openfx).at(this, size);
+                doorSound.at(this);
+            }
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(open ? openRegion : region, x, y);
+        }
+
+        @Override
+        public boolean checkSolid(){
+            return !open;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.bool(open);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            open = read.bool();
+        }
+    }
+
+}
diff --git a/core/src/mindustry/world/blocks/defense/BaseShield.java b/core/src/mindustry/world/blocks/defense/BaseShield.java
new file mode 100644
index 0000000000..bb1f0dd6fe
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/BaseShield.java
@@ -0,0 +1,170 @@
+package mindustry.world.blocks.defense;
+
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class BaseShield extends Block{
+    //TODO game rule? or field? should vary by base.
+    public float radius = 200f;
+    public int sides = 24;
+    
+    public @Nullable Color shieldColor;
+
+    protected static BaseShieldBuild paramBuild;
+    //protected static Effect paramEffect;
+    protected static final Cons<Bullet> bulletConsumer = bullet -> {
+        if(bullet.team != paramBuild.team && bullet.type.absorbable && bullet.within(paramBuild, paramBuild.radius())){
+            bullet.absorb();
+            //paramEffect.at(bullet);
+
+            //TODO effect, shield health go down?
+            //paramBuild.hit = 1f;
+            //paramBuild.buildup += bullet.damage;
+        }
+    };
+
+    protected static final Cons<Unit> unitConsumer = unit -> {
+        //if this is positive, repel the unit; if it exceeds the unit radius * 2, it's inside the forcefield and must be killed
+        float overlapDst = (unit.hitSize/2f + paramBuild.radius()) - unit.dst(paramBuild);
+
+        if(overlapDst > 0){
+            if(overlapDst > unit.hitSize * 1.5f){
+                //instakill units that are stuck inside the shield (TODO or maybe damage them instead?)
+                unit.kill();
+            }else{
+                //stop
+                unit.vel.setZero();
+                //get out
+                unit.move(Tmp.v1.set(unit).sub(paramBuild).setLength(overlapDst + 0.01f));
+
+                if(Mathf.chanceDelta(0.12f * Time.delta)){
+                    Fx.circleColorSpark.at(unit.x, unit.y, paramBuild.team.color);
+                }
+            }
+        }
+    };
+
+    public BaseShield(String name){
+        super(name);
+
+        hasPower = true;
+        update = solid = true;
+        rebuildable = false;
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        updateClipRadius(radius);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, radius, player.team().color);
+    }
+
+    public class BaseShieldBuild extends Building{
+        public boolean broken = false; //TODO
+        public float hit = 0f;
+        public float smoothRadius;
+
+        @Override
+        public void updateTile(){
+            smoothRadius = Mathf.lerpDelta(smoothRadius, radius * efficiency, 0.05f);
+
+            float rad = radius();
+
+            if(rad > 1){
+                paramBuild = this;
+                //paramEffect = absorbEffect;
+                Groups.bullet.intersect(x - rad, y - rad, rad * 2f, rad * 2f, bulletConsumer);
+                Units.nearbyEnemies(team, x, y, rad + 10f, unitConsumer);
+            }
+        }
+
+        public float radius(){
+            return smoothRadius;
+        }
+
+        @Override
+        public void drawSelect(){
+            super.drawSelect();
+
+            Drawf.dashCircle(x, y, radius, team.color);
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            drawShield();
+        }
+
+        //always visible due to their shield nature
+        @Override
+        public boolean inFogTo(Team viewer){
+            return false;
+        }
+
+        public void drawShield(){
+            if(!broken){
+                float radius = radius();
+
+                Draw.z(Layer.shields);
+
+                Draw.color(shieldColor == null ? team.color : shieldColor, Color.white, Mathf.clamp(hit));
+
+                if(renderer.animateShields){
+                    Fill.poly(x, y, sides, radius);
+                }else{
+                    Lines.stroke(1.5f);
+                    Draw.alpha(0.09f + Mathf.clamp(0.08f * hit));
+                    Fill.poly(x, y, sides, radius);
+                    Draw.alpha(1f);
+                    Lines.poly(x, y, sides, radius);
+                    Draw.reset();
+                }
+            }
+
+            Draw.reset();
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(smoothRadius);
+            write.bool(broken);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read);
+
+            if(revision >= 1){
+                smoothRadius = read.f();
+                broken = read.bool();
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/BuildTurret.java b/core/src/mindustry/world/blocks/defense/BuildTurret.java
new file mode 100644
index 0000000000..a6468c5433
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/BuildTurret.java
@@ -0,0 +1,269 @@
+package mindustry.world.blocks.defense;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.game.Teams.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.defense.turrets.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class BuildTurret extends BaseTurret{
+    public final int timerTarget = timers++, timerTarget2 = timers++;
+    public int targetInterval = 15;
+
+    public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
+    public @Load("@-glow") TextureRegion glowRegion;
+    public float buildSpeed = 1f;
+    public float buildBeamOffset = 5f;
+    //created in init()
+    public @Nullable UnitType unitType;
+    public float elevation = -1f;
+    public Color heatColor = Pal.accent.cpy().a(0.9f);
+
+    public BuildTurret(String name){
+        super(name);
+        group = BlockGroup.turrets;
+        sync = false;
+        rotateSpeed = 10f;
+        suppressable = true;
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        if(elevation < 0) elevation = size / 2f;
+
+        //this is super hacky, but since blocks are initialized before units it does not run into init/concurrent modification issues
+        unitType = new UnitType("turret-unit-" + name){{
+            hidden = true;
+            internal = true;
+            speed = 0f;
+            hitSize = 0f;
+            health = 1;
+            itemCapacity = 0;
+            rotateSpeed = BuildTurret.this.rotateSpeed;
+            buildBeamOffset = BuildTurret.this.buildBeamOffset;
+            buildRange = BuildTurret.this.range;
+            buildSpeed = BuildTurret.this.buildSpeed;
+            constructor = BlockUnitUnit::create;
+        }};
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.addPercent(Stat.buildSpeed, buildSpeed);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{baseRegion, region};
+    }
+
+    public class BuildTurretBuild extends BaseTurretBuild implements ControlBlock, RotBlock{
+        public BlockUnitc unit = (BlockUnitc)unitType.create(team);
+        public @Nullable Unit following;
+        public @Nullable BlockPlan lastPlan;
+        public float warmup;
+
+        {
+            unit.rotation(90f);
+        }
+
+        @Override
+        public boolean canControl(){
+            return true;
+        }
+
+        @Override
+        public float buildRotation(){
+            return unit.rotation();
+        }
+
+        @Override
+        public Unit unit(){
+            //make sure stats are correct
+            unit.tile(this);
+            unit.team(team);
+            return (Unit)unit;
+        }
+
+        @Override
+        public void updateTile(){
+            unit.tile(this);
+            unit.team(team);
+
+            //only cares about where the unit itself is looking
+            rotation = unit.rotation();
+
+            if(unit.activelyBuilding()){
+                unit.lookAt(angleTo(unit.buildPlan()));
+            }
+
+            if(checkSuppression()){
+                efficiency = potentialEfficiency = 0f;
+            }
+
+            unit.buildSpeedMultiplier(potentialEfficiency * timeScale);
+            unit.speedMultiplier(potentialEfficiency * timeScale);
+
+            warmup = Mathf.lerpDelta(warmup, unit.activelyBuilding() ? efficiency : 0f, 0.1f);
+
+            if(!isControlled()){
+                unit.updateBuilding(true);
+
+                if(following != null){
+                    //validate follower
+                    if(!following.isValid() || !following.activelyBuilding()){
+                        following = null;
+                        unit.plans().clear();
+                    }else{
+                        //set to follower's first build plan, whatever that is
+                        unit.plans().clear();
+                        unit.plans().addFirst(following.buildPlan());
+                        lastPlan = null;
+                    }
+
+                }else if(unit.buildPlan() == null && timer(timerTarget, targetInterval)){ //search for new stuff
+                    Queue<BlockPlan> blocks = team.data().plans;
+                    for(int i = 0; i < blocks.size; i++){
+                        var block = blocks.get(i);
+                        if(within(block.x * tilesize, block.y * tilesize, range)){
+                            var btype = block.block;
+
+                            if(Build.validPlace(btype, unit.team(), block.x, block.y, block.rotation) && (state.rules.infiniteResources || team.rules().infiniteResources || team.items().has(btype.requirements, state.rules.buildCostMultiplier))){
+                                unit.addBuild(new BuildPlan(block.x, block.y, block.rotation, block.block, block.config));
+                                //shift build plan to tail so next unit builds something else
+                                blocks.addLast(blocks.removeIndex(i));
+                                lastPlan = block;
+                                break;
+                            }
+                        }
+                    }
+
+                    //still not building, find someone to mimic
+                    if(unit.buildPlan() == null){
+                        following = null;
+                        Units.nearby(team, x, y, range, u -> {
+                            if(following  != null) return;
+
+                            if(u.canBuild() && u.activelyBuilding()){
+                                BuildPlan plan = u.buildPlan();
+
+                                Building build = world.build(plan.x, plan.y);
+                                if(build instanceof ConstructBuild && within(build, range)){
+                                    following = u;
+                                }
+                            }
+                        });
+                    }
+                }else if(unit.buildPlan() != null){ //validate building
+                    BuildPlan req = unit.buildPlan();
+
+                    //clear break plan if another player is breaking something
+                    if(!req.breaking && timer.get(timerTarget2, 30f)){
+                        for(Player player : team.data().players){
+                            if(player.isBuilder() && player.unit().activelyBuilding() && player.unit().buildPlan().samePos(req) && player.unit().buildPlan().breaking){
+                                unit.plans().removeFirst();
+                                //remove from list of plans
+                                team.data().plans.remove(p -> p.x == req.x && p.y == req.y);
+                                return;
+                            }
+                        }
+                    }
+
+                    boolean valid =
+                        !(lastPlan != null && lastPlan.removed) &&
+                        ((req.tile() != null && req.tile().build instanceof ConstructBuild cons && cons.current == req.block) ||
+                        (req.breaking ?
+                        Build.validBreak(unit.team(), req.x, req.y) :
+                        Build.validPlace(req.block, unit.team(), req.x, req.y, req.rotation)));
+
+                    if(!valid){
+                        //discard invalid request
+                        unit.plans().removeFirst();
+                        lastPlan = null;
+                    }
+                }
+            }else{ //is being controlled, forget everything
+                following = null;
+                lastPlan = null;
+            }
+
+            //please do not commit suicide
+            unit.plans().remove(b -> b.build() == this);
+
+            unit.updateBuildLogic();
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return unit.plans().size > 0 && !isHealSuppressed();
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            Draw.rect(baseRegion, x, y);
+            Draw.color();
+
+            Draw.z(Layer.turret);
+
+            Drawf.shadow(region, x - elevation, y - elevation, rotation - 90);
+            Draw.rect(region, x, y, rotation - 90);
+
+            if(glowRegion.found()){
+                Drawf.additive(glowRegion, heatColor, warmup, x, y, rotation - 90f, Layer.turretHeat);
+            }
+
+            if(efficiency > 0){
+                unit.drawBuilding();
+            }
+        }
+
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(rotation);
+            //TODO queue can be very large due to logic?
+            TypeIO.writePlans(write, unit.plans().toArray(BuildPlan.class));
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            rotation = read.f();
+            unit.rotation(rotation);
+            unit.plans().clear();
+            var reqs = TypeIO.readPlans(read);
+            if(reqs != null){
+                for(var req : reqs){
+                    unit.plans().add(req);
+                }
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/DirectionalForceProjector.java b/core/src/mindustry/world/blocks/defense/DirectionalForceProjector.java
new file mode 100644
index 0000000000..43548a63bc
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/DirectionalForceProjector.java
@@ -0,0 +1,275 @@
+package mindustry.world.blocks.defense;
+
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+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.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+//TODO use completely different layer
+//TODO consume heat
+//TODO broken class!!!!!
+public class DirectionalForceProjector extends Block{
+    protected static final Vec2 intersectOut = new Vec2(), p1 = new Vec2(), p2 = new Vec2();
+    protected static DirectionalForceProjectorBuild paramEntity;
+    protected static Effect paramEffect;
+    protected static final Cons<Bullet> dirShieldConsumer = b -> {
+        if(b.team != paramEntity.team && b.type.absorbable){
+            //just in case
+            float deltaAdd = 1.1f;
+
+            if(Intersector.intersectSegments(b.x, b.y,
+                    b.x + b.vel.x * (Time.delta + deltaAdd),
+                    b.y + b.vel.y * (Time.delta + deltaAdd), p1.x, p1.y, p2.x, p2.y, intersectOut)){
+                b.set(intersectOut);
+                b.absorb();
+                paramEffect.at(b);
+                paramEntity.hit = 1f;
+                paramEntity.buildup += b.damage();
+            }
+        }
+    };
+
+    public float width = 30f;
+    public float shieldHealth = 3000f;
+    public float cooldownNormal = 1.75f;
+    public float cooldownLiquid = 1.5f;
+    public float cooldownBrokenBase = 0.35f;
+
+    public Effect absorbEffect = Fx.absorb;
+    public Effect shieldBreakEffect = Fx.shieldBreak;
+    public @Load("@-top") TextureRegion topRegion;
+
+    public float length = 40f;
+    public float padSize = 40f;
+
+    public DirectionalForceProjector(String name){
+        super(name);
+
+        rotate = true;
+        rotateDraw = false;
+
+        update = true;
+        solid = true;
+        group = BlockGroup.projectors;
+        envEnabled |= Env.space;
+        ambientSound = Sounds.shield;
+        ambientSoundVolume = 0.08f;
+    }
+
+    @Override
+    public void init(){
+        updateClipRadius((width + 3f));
+
+        super.init();
+
+        if(length < 0){
+            length = size * tilesize/2f;
+        }
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+        addBar("shield", (DirectionalForceProjectorBuild entity) -> new Bar("stat.shieldhealth", Pal.accent, () -> entity.broken ? 0f : 1f - entity.buildup / (shieldHealth)).blink(Color.white));
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return false;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+        stats.add(Stat.shieldHealth, shieldHealth, StatUnit.none);
+        stats.add(Stat.cooldownTime, (int) (shieldHealth / cooldownBrokenBase / 60f), StatUnit.seconds);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        drawPotentialLinks(x, y);
+
+        x *= tilesize;
+        y *= tilesize;
+
+        Tmp.v1.set(length - size/2f, (width + size/2f)).rotate(rotation * 90).add(x, y);
+        Tmp.v2.set(length - size/2f, -(width + size/2f)).rotate(rotation * 90).add(x, y);
+
+        Drawf.dashLine(Color.lightGray, x, y, Tmp.v1.x, Tmp.v1.y);
+        Drawf.dashLine(Color.lightGray, x, y, Tmp.v2.x, Tmp.v2.y);
+        Drawf.dashLine(Pal.accent, Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
+    }
+
+    public class DirectionalForceProjectorBuild extends Building{
+        public boolean broken = true;
+        public float buildup, hit, warmup, shieldRadius;
+
+        @Override
+        public boolean shouldAmbientSound(){
+            return !broken && shieldRadius > 1f;
+        }
+
+        @Override
+        public void pickedUp(){
+            super.pickedUp();
+            shieldRadius = warmup = 0f;
+        }
+
+        @Override
+        public void updateTile(){
+            shieldRadius = Mathf.lerpDelta(shieldRadius, broken ? 0f : warmup * width, 0.05f);
+
+            //TODO ?????????????????
+            if(Mathf.chanceDelta(buildup / shieldHealth * 0.1f)){
+                Fx.reactorsmoke.at(x + Mathf.range(tilesize / 2f), y + Mathf.range(tilesize / 2f));
+            }
+
+            warmup = Mathf.lerpDelta(warmup, efficiency, 0.1f);
+
+            //TODO aaaaaaaaaaaaAAAAAAAAAAAAAAaa
+            if(buildup > 0 && false){
+                float scale = !broken ? cooldownNormal : cooldownBrokenBase;
+                Consume cons = null;
+                //if(cons.valid(this)){
+                //    cons.update(this);
+                //    scale *= (cooldownLiquid * (1f + (liquids.current().heatCapacity - 0.4f) * 0.9f));
+                //}
+
+                buildup -= delta() * scale;
+            }
+
+            if(broken && buildup <= 0){
+                broken = false;
+            }
+
+            if(buildup >= shieldHealth && !broken){
+                broken = true;
+                buildup = shieldHealth;
+                shieldBreakEffect.at(x, y, shieldRadius, team.color);
+            }
+
+            if(hit > 0f){
+                hit -= 1f / 5f * Time.delta;
+            }
+
+            deflectBullets();
+        }
+
+        public void deflectBullets(){
+
+            if(shieldRadius > 0 && !broken){
+                paramEntity = this;
+                paramEffect = absorbEffect;
+
+                //top
+                p1.set(length, shieldRadius).rotate(rotdeg());
+                //bot
+                p2.set(length, -shieldRadius).rotate(rotdeg());
+
+                //"check" radius is grown to catch bullets moving at high velocity
+                Tmp.r1.set(p2.x, p2.y, p1.x - p2.x, p1.y - p2.y).normalize().grow(padSize);
+
+                p1.add(x, y);
+                p2.add(x, y);
+
+                Groups.bullet.intersect(x + Tmp.r1.x, y + Tmp.r1.y, Tmp.r1.width, Tmp.r1.height, dirShieldConsumer);
+            }
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            //TODO wrong
+            if(buildup > 0f){
+                Draw.alpha(buildup / shieldHealth * 0.75f);
+                Draw.z(Layer.blockAdditive);
+                Draw.blend(Blending.additive);
+                Draw.rect(topRegion, x, y);
+                Draw.blend();
+                Draw.z(Layer.block);
+                Draw.reset();
+            }
+
+            drawShield();
+        }
+
+        public void drawShield(){
+            if(!broken && shieldRadius > 0){
+                float rot = rotdeg();
+
+                p1.set(length, shieldRadius).rotate(rot).add(this);
+                p2.set(length, -shieldRadius).rotate(rot).add(this);
+                float size = 4f;
+                Tmp.r1.set(p2.x, p2.y, p1.x - p2.x, p1.y - p2.y).normalize().grow(size);
+
+                Draw.z(Layer.shields);
+
+                Draw.color(team.color, Color.white, Mathf.clamp(hit));
+
+                if(renderer.animateShields){
+                    Fill.rect(Tmp.r1);
+
+                    Tmp.v1.set(length - size/2f, (shieldRadius + size/2f)).rotate(rot).add(this);
+                    Tmp.v2.set(length - size/2f, -(shieldRadius + size/2f)).rotate(rot).add(this);
+
+                    //Fill.tri(x, y, Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
+                    Lines.stroke(3f);
+                    Lines.line(x, y, Tmp.v1.x, Tmp.v1.y);
+                    Lines.line(x, y, Tmp.v2.x, Tmp.v2.y);
+
+                    Draw.z(Layer.shields);
+
+                    for(int i : Mathf.signs){
+                        Tmp.v1.set(length - size/2f, (shieldRadius + size/2f) * i).rotate(rot).add(this);
+                        Tmp.v3.set(length + size/2f, (shieldRadius + size/2f) * i).rotate(rot).add(this);
+                        Tmp.v2.set(length, (shieldRadius + size) * i).rotate(rot).add(this);
+                        Fill.tri(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y, Tmp.v3.x, Tmp.v3.y);
+                    }
+                }else{
+                    Lines.stroke(1.5f);
+                    Draw.alpha(0.09f + Mathf.clamp(0.08f * hit));
+                    Fill.rect(Tmp.r1);
+                    Draw.alpha(1f);
+                    Lines.rect(Tmp.r1);
+                    Draw.reset();
+                }
+
+                Draw.reset();
+            }
+        }
+
+        //TODO
+        /*
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.bool(broken);
+            write.f(buildup);
+            write.f(radscl);
+            write.f(warmup);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            broken = read.bool();
+            buildup = read.f();
+            radscl = read.f();
+            warmup = read.f();
+        }*/
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java
index 3546831ac8..7a48b6bb09 100644
--- a/core/src/mindustry/world/blocks/defense/Door.java
+++ b/core/src/mindustry/world/blocks/defense/Door.java
@@ -20,11 +20,13 @@ import static mindustry.Vars.*;
 
 public class Door extends Wall{
     protected final static Rect rect = new Rect();
+    protected final static Queue<DoorBuild> doorQueue = new Queue<>();
 
     public final int timerToggle = timers++;
     public Effect openfx = Fx.dooropen;
     public Effect closefx = Fx.doorclose;
     public Sound doorSound = Sounds.door;
+    public boolean chainEffect = false;
     public @Load("@-open") TextureRegion openRegion;
 
     public Door(String name){
@@ -34,29 +36,35 @@ public class Door extends Wall{
         consumesTap = true;
 
         config(Boolean.class, (DoorBuild base, Boolean open) -> {
-            doorSound.at(base);
+            if(!world.isGenerating()){
+                doorSound.at(base);
+                base.effect();
+            }
 
-            for(DoorBuild entity : base.chained){
+            doorQueue.clear();
+            doorQueue.add(base);
+
+            for(DoorBuild entity : base.chained.isEmpty() ? doorQueue : base.chained){
                 //skip doors with things in them
                 if((Units.anyEntities(entity.tile) && !open) || entity.open == open){
                     continue;
                 }
 
+                if(chainEffect) entity.effect();
                 entity.open = open;
-                pathfinder.updateTile(entity.tile());
-                entity.effect();
+                if(!world.isGenerating()) pathfinder.updateTile(entity.tile());
             }
         });
     }
 
     @Override
-    public TextureRegion getRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        return req.config == Boolean.TRUE ? openRegion : region;
+    public TextureRegion getPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        return plan.config == Boolean.TRUE ? openRegion : region;
     }
 
     public class DoorBuild extends Building{
         public boolean open = false;
-        public ObjectSet<DoorBuild> chained = new ObjectSet<>();
+        public Seq<DoorBuild> chained = new Seq<>();
 
         @Override
         public void onProximityAdded(){
@@ -69,8 +77,8 @@ public class Door extends Wall{
             super.onProximityRemoved();
 
             for(Building b : proximity){
-                if(b instanceof DoorBuild){
-                    ((DoorBuild)b).updateChained();
+                if(b instanceof DoorBuild d){
+                    d.updateChained();
                 }
             }
         }
@@ -99,22 +107,23 @@ public class Door extends Wall{
         }
 
         public void effect(){
-            (open ? closefx : openfx).at(this);
+            (open ? closefx : openfx).at(this, size);
         }
 
         public void updateChained(){
-            chained = new ObjectSet<>();
-            flow(chained);
-        }
+            chained = new Seq<>();
+            doorQueue.clear();
+            doorQueue.add(this);
 
-        public void flow(ObjectSet<DoorBuild> set){
-            if(!set.add(this)) return;
+            while(!doorQueue.isEmpty()){
+                var next = doorQueue.removeLast();
+                chained.add(next);
 
-            this.chained = set;
-
-            for(Building b : proximity){
-                if(b instanceof DoorBuild){
-                    ((DoorBuild)b).flow(set);
+                for(var b : next.proximity){
+                    if(b instanceof DoorBuild d && d.chained != chained){
+                        d.chained = chained;
+                        doorQueue.addFirst(d);
+                    }
                 }
             }
         }
@@ -126,7 +135,7 @@ public class Door extends Wall{
 
         @Override
         public Cursor getCursor(){
-            return SystemCursor.hand;
+            return interactable(player.team()) ? SystemCursor.hand : SystemCursor.arrow;
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java
index f17ac79b96..7aa49ecb98 100644
--- a/core/src/mindustry/world/blocks/defense/ForceProjector.java
+++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java
@@ -6,15 +6,20 @@ import arc.graphics.*;
 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.*;
 import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
 import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
@@ -27,20 +32,30 @@ public class ForceProjector extends Block{
     public float phaseRadiusBoost = 80f;
     public float phaseShieldBoost = 400f;
     public float radius = 101.7f;
+    public int sides = 6;
+    public float shieldRotation = 0f;
     public float shieldHealth = 700f;
     public float cooldownNormal = 1.75f;
     public float cooldownLiquid = 1.5f;
     public float cooldownBrokenBase = 0.35f;
-    public float basePowerDraw = 0.2f;
+    public float coolantConsumption = 0.1f;
+    public boolean consumeCoolant = true;
+    public float crashDamageMultiplier = 2f;
+    public Effect absorbEffect = Fx.absorb;
+    public Effect shieldBreakEffect = Fx.shieldBreak;
     public @Load("@-top") TextureRegion topRegion;
 
-    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);
+    //TODO json support
+    public @Nullable Consume itemConsumer, coolantConsumer;
+
+    protected static ForceBuild paramEntity;
+    protected static Effect paramEffect;
+    protected static final Cons<Bullet> shieldConsumer = bullet -> {
+        if(bullet.team != paramEntity.team && bullet.type.absorbable && !bullet.absorbed && Intersector.isInRegularPolygon(((ForceProjector)(paramEntity.block)).sides, paramEntity.x, paramEntity.y, paramEntity.realRadius(), ((ForceProjector)(paramEntity.block)).shieldRotation, bullet.x, bullet.y)){
+            bullet.absorb();
+            paramEffect.at(bullet);
             paramEntity.hit = 1f;
-            paramEntity.buildup += trait.damage() * paramEntity.warmup;
+            paramEntity.buildup += bullet.type.shieldDamage(bullet);
         }
     };
 
@@ -52,15 +67,26 @@ public class ForceProjector extends Block{
         hasPower = true;
         hasLiquids = true;
         hasItems = true;
+        envEnabled |= Env.space;
         ambientSound = Sounds.shield;
         ambientSoundVolume = 0.08f;
-        consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.1f)).boost().update(false);
+        flags = EnumSet.of(BlockFlag.shield);
+
+        if(consumeCoolant){
+            consume(coolantConsumer = new ConsumeCoolant(coolantConsumption)).boost().update(false);
+        }
+    }
+
+    @Override
+    public void init(){
+        updateClipRadius(radius + phaseRadiusBoost + 3f);
+        super.init();
     }
 
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("shield", (ForceBuild entity) -> new Bar("stat.shieldhealth", Pal.accent, () -> entity.broken ? 0f : 1f - entity.buildup / (shieldHealth + phaseShieldBoost * entity.phaseHeat)).blink(Color.white));
+        addBar("shield", (ForceBuild entity) -> new Bar("stat.shieldhealth", Pal.accent, () -> entity.broken ? 0f : 1f - entity.buildup / (shieldHealth + phaseShieldBoost * entity.phaseHeat)).blink(Color.white));
     }
 
     @Override
@@ -70,12 +96,18 @@ public class ForceProjector extends Block{
 
     @Override
     public void setStats(){
+        boolean consItems = itemConsumer != null;
+
+        if(consItems) stats.timePeriod = phaseUseTime;
         super.setStats();
         stats.add(Stat.shieldHealth, shieldHealth, StatUnit.none);
         stats.add(Stat.cooldownTime, (int) (shieldHealth / cooldownBrokenBase / 60f), StatUnit.seconds);
-        stats.add(Stat.powerUse, basePowerDraw * 60f, StatUnit.powerSecond);
-        stats.add(Stat.boostEffect, phaseRadiusBoost / tilesize, StatUnit.blocks);
-        stats.add(Stat.boostEffect, phaseShieldBoost, StatUnit.shieldHealth);
+
+        if(consItems && itemConsumer instanceof ConsumeItems coni){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster, StatValues.itemBoosters("+{0} " + StatUnit.shieldHealth.localized(), stats.timePeriod, phaseShieldBoost, phaseRadiusBoost, coni.items));
+            stats.add(Stat.booster, StatValues.speedBoosters("", coolantConsumption, Float.MAX_VALUE, true, this::consumesLiquid));
+        }
     }
 
     @Override
@@ -84,32 +116,22 @@ public class ForceProjector extends Block{
 
         Draw.color(Pal.gray);
         Lines.stroke(3f);
-        Lines.poly(x * tilesize + offset, y * tilesize + offset, 6, radius);
+        Lines.poly(x * tilesize + offset, y * tilesize + offset, sides, radius, shieldRotation);
         Draw.color(player.team().color);
         Lines.stroke(1f);
-        Lines.poly(x * tilesize + offset, y * tilesize + offset, 6, radius);
+        Lines.poly(x * tilesize + offset, y * tilesize + offset, sides, radius, shieldRotation);
         Draw.color();
     }
 
-    public class ForceBuild extends Building implements Ranged{
+    public class ForceBuild extends Building implements Ranged, ExplosionShield{
         public boolean broken = true;
         public float buildup, radscl, hit, warmup, phaseHeat;
-        public ForceDraw drawer;
 
         @Override
         public float range(){
             return realRadius();
         }
 
-        @Override
-        public void created(){
-            super.created();
-            drawer = ForceDraw.create();
-            drawer.build = this;
-            drawer.set(x, y);
-            drawer.add();
-        }
-
         @Override
         public boolean shouldAmbientSound(){
             return !broken && realRadius() > 1f;
@@ -117,17 +139,29 @@ public class ForceProjector extends Block{
 
         @Override
         public void onRemoved(){
+            float radius = realRadius();
+            if(!broken && radius > 1f) Fx.forceShrink.at(x, y, radius, team.color);
             super.onRemoved();
-            drawer.remove();
+        }
+
+        @Override
+        public void pickedUp(){
+            super.pickedUp();
+            radscl = warmup = 0f;
+        }
+
+        @Override
+        public boolean inFogTo(Team viewer){
+            return false;
         }
 
         @Override
         public void updateTile(){
-            boolean phaseValid = consumes.get(ConsumeType.item).valid(this);
+            boolean phaseValid = itemConsumer != null && itemConsumer.efficiency(this) > 0;
 
             phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(phaseValid), 0.1f);
 
-            if(phaseValid && !broken && timer(timerUse, phaseUseTime) && efficiency() > 0){
+            if(phaseValid && !broken && timer(timerUse, phaseUseTime) && efficiency > 0){
                 consume();
             }
 
@@ -137,14 +171,17 @@ public class ForceProjector extends Block{
                 Fx.reactorsmoke.at(x + Mathf.range(tilesize / 2f), y + Mathf.range(tilesize / 2f));
             }
 
-            warmup = Mathf.lerpDelta(warmup, efficiency(), 0.1f);
+            warmup = Mathf.lerpDelta(warmup, efficiency, 0.1f);
 
             if(buildup > 0){
                 float scale = !broken ? cooldownNormal : cooldownBrokenBase;
-                ConsumeLiquidFilter cons = consumes.get(ConsumeType.liquid);
-                if(cons.valid(this)){
-                    cons.update(this);
-                    scale *= (cooldownLiquid * (1f + (liquids.current().heatCapacity - 0.4f) * 0.9f));
+
+                //TODO I hate this system
+                if(coolantConsumer != null){
+                    if(coolantConsumer.efficiency(this) > 0){
+                        coolantConsumer.update(this);
+                        scale *= (cooldownLiquid * (1f + (liquids.current().heatCapacity - 0.4f) * 0.9f));
+                    }
                 }
 
                 buildup -= delta() * scale;
@@ -157,65 +194,101 @@ public class ForceProjector extends Block{
             if(buildup >= shieldHealth + phaseShieldBoost * phaseHeat && !broken){
                 broken = true;
                 buildup = shieldHealth;
-                Fx.shieldBreak.at(x, y, realRadius(), team.color);
+                shieldBreakEffect.at(x, y, realRadius(), team.color);
+                if(team != state.rules.defaultTeam){
+                    Events.fire(Trigger.forceProjectorBreak);
+                }
             }
 
             if(hit > 0f){
                 hit -= 1f / 5f * Time.delta;
             }
 
+            deflectBullets();
+        }
+
+        public void deflectBullets(){
             float realRadius = realRadius();
 
             if(realRadius > 0 && !broken){
                 paramEntity = this;
+                paramEffect = absorbEffect;
                 Groups.bullet.intersect(x - realRadius, y - realRadius, realRadius * 2f, realRadius * 2f, shieldConsumer);
             }
         }
 
+        @Override
+        public boolean absorbExplosion(float ex, float ey, float damage){
+            boolean absorb = !broken && Intersector.isInRegularPolygon(sides, x, y, realRadius(), shieldRotation, ex, ey);
+            if(absorb){
+                absorbEffect.at(ex, ey);
+                hit = 1f;
+                buildup += damage * crashDamageMultiplier;
+            }
+            return absorb;
+        }
+
         public float realRadius(){
             return (radius + phaseHeat * phaseRadiusBoost) * radscl;
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.heat) return buildup;
+            if(sensor == LAccess.shield) return broken ? 0f : Math.max(shieldHealth + phaseShieldBoost * phaseHeat - buildup, 0);
+            return super.sense(sensor);
+        }
+
         @Override
         public void draw(){
             super.draw();
 
-            if(drawer != null){
-                drawer.set(x, y);
-            }
-
             if(buildup > 0f){
                 Draw.alpha(buildup / shieldHealth * 0.75f);
+                Draw.z(Layer.blockAdditive);
                 Draw.blend(Blending.additive);
                 Draw.rect(topRegion, x, y);
                 Draw.blend();
+                Draw.z(Layer.block);
                 Draw.reset();
             }
+
+            drawShield();
         }
 
         public void drawShield(){
             if(!broken){
                 float radius = realRadius();
 
-                Draw.z(Layer.shields);
+                if(radius > 0.001f){
+                    Draw.color(team.color, Color.white, Mathf.clamp(hit));
 
-                Draw.color(team.color, Color.white, Mathf.clamp(hit));
-
-                if(Core.settings.getBool("animatedshields")){
-                    Fill.poly(x, y, 6, radius);
-                }else{
-                    Lines.stroke(1.5f);
-                    Draw.alpha(0.09f + Mathf.clamp(0.08f * hit));
-                    Fill.poly(x, y, 6, radius);
-                    Draw.alpha(1f);
-                    Lines.poly(x, y, 6, radius);
-                    Draw.reset();
+                    if(renderer.animateShields){
+                        Draw.z(Layer.shields + 0.001f * hit);
+                        Fill.poly(x, y, sides, radius, shieldRotation);
+                    }else{
+                        Draw.z(Layer.shields);
+                        Lines.stroke(1.5f);
+                        Draw.alpha(0.09f + Mathf.clamp(0.08f * hit));
+                        Fill.poly(x, y, sides, radius, shieldRotation);
+                        Draw.alpha(1f);
+                        Lines.poly(x, y, sides, radius, shieldRotation);
+                        Draw.reset();
+                    }
                 }
             }
 
             Draw.reset();
         }
 
+        @Override
+        public void overwrote(Seq<Building> previous){
+            if(previous.size > 0 && previous.first().block == block && previous.first() instanceof ForceBuild b){
+                broken = b.broken;
+                buildup = b.buildup;
+            }
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
@@ -236,21 +309,4 @@ 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 25a4c64544..ff4696bbf4 100644
--- a/core/src/mindustry/world/blocks/defense/MendProjector.java
+++ b/core/src/mindustry/world/blocks/defense/MendProjector.java
@@ -11,6 +11,7 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
 import mindustry.world.*;
+import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -18,7 +19,7 @@ import static mindustry.Vars.*;
 public class MendProjector extends Block{
     public final int timerUse = timers++;
     public Color baseColor = Color.valueOf("84f491");
-    public Color phaseColor = Color.valueOf("ffd59e");
+    public Color phaseColor = baseColor;
     public @Load("@-top") TextureRegion topRegion;
     public float reload = 250f;
     public float range = 60f;
@@ -34,6 +35,10 @@ public class MendProjector extends Block{
         group = BlockGroup.projectors;
         hasPower = true;
         hasItems = true;
+        emitLight = true;
+        lightRadius = 50f;
+        suppressable = true;
+        envEnabled |= Env.space;
     }
 
     @Override
@@ -43,25 +48,33 @@ public class MendProjector extends Block{
 
     @Override
     public void setStats(){
+        stats.timePeriod = useTime;
         super.setStats();
 
         stats.add(Stat.repairTime, (int)(100f / healPercent * reload / 60f), StatUnit.seconds);
         stats.add(Stat.range, range / tilesize, StatUnit.blocks);
 
-        stats.add(Stat.boostEffect, phaseRangeBoost / tilesize, StatUnit.blocks);
-        stats.add(Stat.boostEffect, (phaseBoost + healPercent) / healPercent, StatUnit.timesSpeed);
+        if(findConsumer(c -> c instanceof ConsumeItems) instanceof ConsumeItems cons){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster, StatValues.itemBoosters(
+                "{0}" + StatUnit.timesSpeed.localized(),
+                stats.timePeriod, (phaseBoost + healPercent) / healPercent, phaseRangeBoost,
+                cons.items)
+            );
+        }
     }
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, Pal.accent);
+        super.drawPlace(x, y, rotation, valid);
+        
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, baseColor);
+
+        indexer.eachBlock(player.team(), x * tilesize + offset, y * tilesize + offset, range, other -> true, other -> Drawf.selected(other, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f))));
     }
 
     public class MendBuild extends Building implements Ranged{
-        float heat;
-        float charge = Mathf.random(reload);
-        float phaseHeat;
-        float smoothEfficiency;
+        public float heat, charge = Mathf.random(reload), phaseHeat, smoothEfficiency;
 
         @Override
         public float range(){
@@ -70,27 +83,36 @@ public class MendProjector extends Block{
 
         @Override
         public void updateTile(){
-            smoothEfficiency = Mathf.lerpDelta(smoothEfficiency, efficiency(), 0.08f);
-            heat = Mathf.lerpDelta(heat, consValid() || cheating() ? 1f : 0f, 0.08f);
+            boolean canHeal = !checkSuppression();
+
+            smoothEfficiency = Mathf.lerpDelta(smoothEfficiency, efficiency, 0.08f);
+            heat = Mathf.lerpDelta(heat, efficiency > 0 && canHeal ? 1f : 0f, 0.08f);
             charge += heat * delta();
 
-            phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons.optionalValid()), 0.1f);
+            phaseHeat = Mathf.lerpDelta(phaseHeat, optionalEfficiency, 0.1f);
 
-            if(cons.optionalValid() && timer(timerUse, useTime) && efficiency() > 0){
+            if(optionalEfficiency > 0 && timer(timerUse, useTime) && canHeal){
                 consume();
             }
 
-            if(charge >= reload){
+            if(charge >= reload && canHeal){
                 float realRange = range + phaseHeat * phaseRangeBoost;
                 charge = 0f;
 
-                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));
+                indexer.eachBlock(this, realRange, b -> b.damaged() && !b.isHealSuppressed(), other -> {
+                    other.heal(other.maxHealth() * (healPercent + phaseHeat * phaseBoost) / 100f * efficiency);
+                    other.recentlyHealed();
+                    Fx.healBlockFull.at(other.x, other.y, other.block.size, baseColor, other.block);
                 });
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return Mathf.clamp(charge / reload);
+            return super.sense(sensor);
+        }
+
         @Override
         public void drawSelect(){
             float realRange = range + phaseHeat * phaseRangeBoost;
@@ -107,7 +129,7 @@ public class MendProjector extends Block{
             float f = 1f - (Time.time / 100f) % 1f;
 
             Draw.color(baseColor, phaseColor, phaseHeat);
-            Draw.alpha(heat * Mathf.absin(Time.time, 10f, 1f) * 0.5f);
+            Draw.alpha(heat * Mathf.absin(Time.time, 50f / Mathf.PI2, 1f) * 0.5f);
             Draw.rect(topRegion, x, y);
             Draw.alpha(1f);
             Lines.stroke((2f * f + 0.2f) * heat);
@@ -118,7 +140,7 @@ public class MendProjector extends Block{
 
         @Override
         public void drawLight(){
-            Drawf.light(team, x, y, 50f * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
+            Drawf.light(x, y, lightRadius * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java
index ad845991c7..d5261b0604 100644
--- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java
+++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java
@@ -1,20 +1,25 @@
 package mindustry.world.blocks.defense;
 
+import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
+import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class OverdriveProjector extends Block{
+    @Deprecated
     public final int timerUse = timers++;
 
     public @Load("@-top") TextureRegion topRegion;
@@ -36,6 +41,9 @@ public class OverdriveProjector extends Block{
         hasPower = true;
         hasItems = true;
         canOverdrive = false;
+        emitLight = true;
+        lightRadius = 50f;
+        envEnabled |= Env.space;
     }
 
     @Override
@@ -45,28 +53,36 @@ public class OverdriveProjector extends Block{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, Pal.accent);
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, baseColor);
+
+        indexer.eachBlock(player.team(), x * tilesize + offset, y * tilesize + offset, range, other -> other.block.canOverdrive, other -> Drawf.selected(other, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f))));
     }
 
     @Override
     public void setStats(){
+        stats.timePeriod = useTime;
         super.setStats();
 
-        stats.add(Stat.speedIncrease, (int)(100f * speedBoost), StatUnit.percent);
+        stats.add(Stat.speedIncrease, "+" + (int)(speedBoost * 100f - 100) + "%");
         stats.add(Stat.range, range / tilesize, StatUnit.blocks);
         stats.add(Stat.productionTime, useTime / 60f, StatUnit.seconds);
 
-        if(hasBoost){
-            stats.add(Stat.boostEffect, phaseRangeBoost / tilesize, StatUnit.blocks);
-            stats.add(Stat.boostEffect, (int)((speedBoost + speedBoostPhase) * 100f), StatUnit.percent);
+        if(hasBoost && findConsumer(f -> f instanceof ConsumeItems) instanceof ConsumeItems items){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster, StatValues.itemBoosters("+{0}%", stats.timePeriod, speedBoostPhase * 100f, phaseRangeBoost, items.items));
         }
     }
+    
+    @Override
+    public void setBars(){
+        super.setBars();
+        addBar("boost", (OverdriveBuild entity) -> new Bar(() -> Core.bundle.format("bar.boost", Mathf.round(Math.max((entity.realBoost() * 100 - 100), 0))), () -> Pal.accent, () -> entity.realBoost() / (hasBoost ? speedBoost + speedBoostPhase : speedBoost)));
+    }
 
     public class OverdriveBuild extends Building implements Ranged{
-        float heat;
-        float charge = Mathf.random(reload);
-        float phaseHeat;
-        float smoothEfficiency;
+        public float heat, charge = Mathf.random(reload), phaseHeat, smoothEfficiency, useProgress;
 
         @Override
         public float range(){
@@ -75,30 +91,38 @@ public class OverdriveProjector extends Block{
 
         @Override
         public void drawLight(){
-            Drawf.light(team, x, y, 50f * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
+            Drawf.light(x, y, lightRadius * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
         }
 
         @Override
         public void updateTile(){
-            smoothEfficiency = Mathf.lerpDelta(smoothEfficiency, efficiency(), 0.08f);
-            heat = Mathf.lerpDelta(heat, consValid() ? 1f : 0f, 0.08f);
+            smoothEfficiency = Mathf.lerpDelta(smoothEfficiency, efficiency, 0.08f);
+            heat = Mathf.lerpDelta(heat, efficiency > 0 ? 1f : 0f, 0.08f);
             charge += heat * Time.delta;
 
             if(hasBoost){
-                phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons.optionalValid()), 0.1f);
-            }
-
-            if(timer(timerUse, useTime) && efficiency() > 0 && consValid()){
-                consume();
+                phaseHeat = Mathf.lerpDelta(phaseHeat, optionalEfficiency, 0.1f);
             }
 
             if(charge >= reload){
                 float realRange = range + phaseHeat * phaseRangeBoost;
-                float realBoost = (speedBoost + phaseHeat * speedBoostPhase) * efficiency();
 
                 charge = 0f;
-                indexer.eachBlock(this, realRange, other -> true, other -> other.applyBoost(realBoost, reload + 1f));
+                indexer.eachBlock(this, realRange, other -> other.block.canOverdrive, other -> other.applyBoost(realBoost(), reload + 1f));
             }
+
+            if(efficiency > 0){
+                useProgress += delta();
+            }
+
+            if(useProgress >= useTime){
+                consume();
+                useProgress %= useTime;
+            }
+        }
+
+        public float realBoost(){
+            return (speedBoost + phaseHeat * speedBoostPhase) * efficiency;
         }
 
         @Override
@@ -117,11 +141,18 @@ public class OverdriveProjector extends Block{
             float f = 1f - (Time.time / 100f) % 1f;
 
             Draw.color(baseColor, phaseColor, phaseHeat);
-            Draw.alpha(heat * Mathf.absin(Time.time, 10f, 1f) * 0.5f);
+            Draw.alpha(heat * Mathf.absin(Time.time, 50f / Mathf.PI2, 1f) * 0.5f);
             Draw.rect(topRegion, x, y);
             Draw.alpha(1f);
             Lines.stroke((2f * f + 0.1f) * heat);
-            Lines.square(x, y, Math.min(1f + (1f - f) * size * tilesize / 2f, size * tilesize/2f));
+
+            float r = Math.max(0f, Mathf.clamp(2f - f * 2f) * size * tilesize / 2f - f - 0.2f), w = Mathf.clamp(0.5f - f) * size * tilesize;
+            Lines.beginLine();
+            for(int i = 0; i < 4; i++){
+                Lines.linePoint(x + Geometry.d4(i).x * r + Geometry.d4(i).y * w, y + Geometry.d4(i).y * r - Geometry.d4(i).x * w);
+                if(f < 0.5f) Lines.linePoint(x + Geometry.d4(i).x * r - Geometry.d4(i).y * w, y + Geometry.d4(i).y * r + Geometry.d4(i).x * w);
+            }
+            Lines.endLine(true);
 
             Draw.reset();
         }
diff --git a/core/src/mindustry/world/blocks/defense/Radar.java b/core/src/mindustry/world/blocks/defense/Radar.java
new file mode 100644
index 0000000000..e24a3368d1
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/Radar.java
@@ -0,0 +1,111 @@
+package mindustry.world.blocks.defense;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class Radar extends Block{
+    public float discoveryTime = 60f * 10f;
+    public float rotateSpeed = 2f;
+
+    public @Load("@-base") TextureRegion baseRegion;
+    public @Load("@-glow") TextureRegion glowRegion;
+
+    public Color glowColor = Pal.turretHeat;
+    public float glowScl = 5f, glowMag = 0.6f;
+
+    public Radar(String name){
+        super(name);
+
+        update = solid = true;
+        flags = EnumSet.of(BlockFlag.hasFogRadius);
+        outlineIcon = true;
+        fogRadius = 10;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{baseRegion, region};
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, fogRadius * tilesize, Pal.accent);
+    }
+
+    public class RadarBuild extends Building{
+        public float progress;
+        public float lastRadius = 0f;
+        public float smoothEfficiency = 1f;
+        public float totalProgress;
+
+        @Override
+        public float fogRadius(){
+            return fogRadius * progress * smoothEfficiency;
+        }
+
+        @Override
+        public void updateTile(){
+            smoothEfficiency = Mathf.lerpDelta(smoothEfficiency, efficiency, 0.05f);
+
+            if(Math.abs(fogRadius() - lastRadius) >= 0.5f){
+                Vars.fogControl.forceUpdate(team, this);
+                lastRadius = fogRadius();
+            }
+
+            progress += edelta() / discoveryTime;
+            progress = Mathf.clamp(progress);
+
+            totalProgress += efficiency * edelta();
+        }
+
+        @Override
+        public boolean canPickup(){
+            return false;
+        }
+
+        @Override
+        public void drawSelect(){
+            Drawf.dashCircle(x, y, fogRadius() * tilesize, Pal.accent);
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(baseRegion, x, y);
+            Draw.rect(region, x, y, rotateSpeed * totalProgress);
+
+            Drawf.additive(glowRegion, glowColor, glowColor.a * (1f - glowMag + Mathf.absin(glowScl, glowMag)), x, y, rotateSpeed * totalProgress, Layer.blockAdditive);
+        }
+
+        @Override
+        public float progress(){
+            return progress;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(progress);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            progress = read.f();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/RegenProjector.java b/core/src/mindustry/world/blocks/defense/RegenProjector.java
new file mode 100644
index 0000000000..5d05295de8
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/RegenProjector.java
@@ -0,0 +1,213 @@
+package mindustry.world.blocks.defense;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.consumers.*;
+import mindustry.world.draw.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class RegenProjector extends Block{
+    private static final IntSet taken = new IntSet();
+    //map building pos to mend amount (TODO just use buildings as keys? no lookup)
+    private static final IntFloatMap mendMap = new IntFloatMap();
+    private static long lastUpdateFrame = -1;
+
+    public int range = 14;
+    //per frame
+    public float healPercent = 12f / 60f;
+    public float optionalMultiplier = 2f;
+    public float optionalUseTime = 60f * 8f;
+
+    public DrawBlock drawer = new DrawDefault();
+
+    public float effectChance = 0.003f;
+    public Color baseColor = Pal.accent;
+    public Effect effect = Fx.regenParticle;
+
+    public RegenProjector(String name){
+        super(name);
+        solid = true;
+        update = true;
+        group = BlockGroup.projectors;
+        hasPower = true;
+        hasItems = true;
+        emitLight = true;
+        suppressable = true;
+        envEnabled |= Env.space;
+        rotateDraw = false;
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        x *= tilesize;
+        y *= tilesize;
+        x += offset;
+        y += offset;
+
+        Drawf.dashSquare(baseColor, x, y, range * tilesize);
+        indexer.eachBlock(player.team(), Tmp.r1.setCentered(x, y, range * tilesize), b -> true, t -> {
+            Drawf.selected(t, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f)));
+        });
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        drawer.drawPlan(this, plan, list);
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return false;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return drawer.finalIcons(this);
+    }
+
+    @Override
+    public void load(){
+        super.load();
+        drawer.load(this);
+    }
+
+    @Override
+    public void setStats(){
+        stats.timePeriod = optionalUseTime;
+        super.setStats();
+
+        stats.add(Stat.repairTime, (int)(1f / (healPercent / 100f) / 60f), StatUnit.seconds);
+        stats.add(Stat.range, range, StatUnit.blocks);
+
+        if(findConsumer(c -> c instanceof ConsumeItems) instanceof ConsumeItems cons){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster, StatValues.itemBoosters(
+                "{0}" + StatUnit.timesSpeed.localized(),
+                stats.timePeriod, optionalMultiplier, 0f,
+                cons.items)
+            );
+        }
+    }
+
+    public class RegenProjectorBuild extends Building{
+        public Seq<Building> targets = new Seq<>();
+        public int lastChange = -2;
+        public float warmup, totalTime, optionalTimer;
+        public boolean anyTargets = false;
+        public boolean didRegen = false;
+
+        public void updateTargets(){
+            targets.clear();
+            taken.clear();
+            indexer.eachBlock(team, Tmp.r1.setCentered(x, y, range * tilesize), b -> true, targets::add);
+        }
+
+        @Override
+        public void updateTile(){
+            if(lastChange != world.tileChanges){
+                lastChange = world.tileChanges;
+                updateTargets();
+            }
+
+            //TODO should warmup depend on didRegen?
+            warmup = Mathf.approachDelta(warmup, didRegen ? 1f : 0f, 1f / 70f);
+            totalTime += warmup * Time.delta;
+            didRegen = false;
+            anyTargets = false;
+
+            //no healing when suppressed
+            if(checkSuppression()){
+                return;
+            }
+
+            anyTargets = targets.contains(b -> b.damaged());
+
+            if(efficiency > 0){
+                if((optionalTimer += Time.delta * optionalEfficiency) >= optionalUseTime){
+                    consume();
+                    optionalTimer = 0f;
+                }
+
+                float healAmount = Mathf.lerp(1f, optionalMultiplier, optionalEfficiency) * healPercent;
+
+                //use Math.max to prevent stacking
+                for(var build : targets){
+                    if(!build.damaged() || build.isHealSuppressed()) continue;
+
+                    didRegen = true;
+
+                    int pos = build.pos();
+                    //TODO periodic effect
+                    float value = mendMap.get(pos);
+                    mendMap.put(pos, Math.min(Math.max(value, healAmount * edelta() * build.block.health / 100f), build.block.health - build.health));
+
+                    if(value <= 0 && Mathf.chanceDelta(effectChance * build.block.size * build.block.size)){
+                        effect.at(build.x + Mathf.range(build.block.size * tilesize/2f - 1f), build.y + Mathf.range(build.block.size * tilesize/2f - 1f));
+                    }
+                }
+            }
+
+            if(lastUpdateFrame != state.updateId){
+                lastUpdateFrame = state.updateId;
+
+                for(var entry : mendMap.entries()){
+                    var build = world.build(entry.key);
+                    if(build != null){
+                        build.heal(entry.value);
+                        build.recentlyHealed();
+                    }
+                }
+                mendMap.clear();
+            }
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return anyTargets;
+        }
+
+        @Override
+        public void drawSelect(){
+            super.drawSelect();
+
+            Drawf.dashSquare(baseColor, x, y, range * tilesize);
+            for(var target : targets){
+                Drawf.selected(target, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f)));
+            }
+        }
+
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalTime;
+        }
+
+        @Override
+        public void draw(){
+            drawer.draw(this);
+        }
+
+        @Override
+        public void drawLight(){
+            super.drawLight();
+            drawer.drawLight(this);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/ShieldWall.java b/core/src/mindustry/world/blocks/defense/ShieldWall.java
new file mode 100644
index 0000000000..8f7a1135a1
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/ShieldWall.java
@@ -0,0 +1,127 @@
+package mindustry.world.blocks.defense;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.graphics.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class ShieldWall extends Wall{
+    public float shieldHealth = 900f;
+    public float breakCooldown = 60f * 10f;
+    public float regenSpeed = 2f;
+
+    public Color glowColor = Color.valueOf("ff7531").a(0.5f);
+    public float glowMag = 0.6f, glowScl = 8f;
+
+    public @Load("@-glow") TextureRegion glowRegion;
+
+    public ShieldWall(String name){
+        super(name);
+
+        update = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.shieldHealth, shieldHealth);
+    }
+
+    public class ShieldWallBuild extends WallBuild{
+        public float shield = shieldHealth, shieldRadius = 0f;
+        public float breakTimer;
+
+        @Override
+        public void draw(){
+            Draw.rect(block.region, x, y);
+
+            if(shieldRadius > 0){
+                float radius = shieldRadius * tilesize * size / 2f;
+
+                Draw.z(Layer.shields);
+
+                Draw.color(team.color, Color.white, Mathf.clamp(hit));
+
+                if(renderer.animateShields){
+                    Fill.square(x, y, radius);
+                }else{
+                    Lines.stroke(1.5f);
+                    Draw.alpha(0.09f + Mathf.clamp(0.08f * hit));
+                    Fill.square(x, y, radius);
+                    Draw.alpha(1f);
+                    Lines.poly(x, y, 4, radius, 45f);
+                    Draw.reset();
+                }
+
+                Draw.reset();
+
+                Drawf.additive(glowRegion, glowColor, (1f - glowMag + Mathf.absin(glowScl, glowMag)) * shieldRadius, x, y, 0f, Layer.blockAdditive);
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            if(breakTimer > 0){
+                breakTimer -= Time.delta;
+            }else{
+                //regen when not broken
+                shield = Mathf.clamp(shield + regenSpeed * edelta(), 0f, shieldHealth);
+            }
+
+            if(hit > 0){
+                hit -= Time.delta / 10f;
+                hit = Math.max(hit, 0f);
+            }
+
+            shieldRadius = Mathf.lerpDelta(shieldRadius, broken() ? 0f : 1f, 0.12f);
+        }
+
+        public boolean broken(){
+            return breakTimer > 0 || !canConsume();
+        }
+
+        @Override
+        public void pickedUp(){
+            shieldRadius = 0f;
+        }
+
+        @Override
+        public void damage(float damage){
+            float shieldTaken = broken() ? 0f : Math.min(shield, damage);
+
+            shield -= shieldTaken;
+            if(shieldTaken > 0){
+                hit = 1f;
+            }
+
+            //shield was destroyed, needs to go down
+            if(shield <= 0.00001f && shieldTaken > 0){
+                breakTimer = breakCooldown;
+            }
+
+            if(damage - shieldTaken > 0){
+                super.damage(damage - shieldTaken);
+            }
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(shield);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            shield = read.f();
+            if(shield > 0) shieldRadius = 1f;
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/ShockMine.java b/core/src/mindustry/world/blocks/defense/ShockMine.java
index 00c805ac48..78a2abfd01 100644
--- a/core/src/mindustry/world/blocks/defense/ShockMine.java
+++ b/core/src/mindustry/world/blocks/defense/ShockMine.java
@@ -3,7 +3,10 @@ package mindustry.world.blocks.defense;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
+import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
@@ -17,6 +20,11 @@ public class ShockMine extends Block{
     public int length = 10;
     public int tendrils = 6;
     public Color lightningColor = Pal.lancerLaser;
+    public int shots = 6;
+    public float inaccuracy = 0f;
+    public @Nullable BulletType bullet;
+    public float teamAlpha = 0.3f;
+    public @Load("@-team-top") TextureRegion teamRegion;
 
     public ShockMine(String name){
         super(name);
@@ -24,7 +32,6 @@ public class ShockMine extends Block{
         destructible = true;
         solid = false;
         targetable = false;
-        rebuildable = false;
     }
 
     public class ShockMineBuild extends Building{
@@ -37,20 +44,33 @@ public class ShockMine extends Block{
         @Override
         public void draw(){
             super.draw();
-            Draw.color(team.color);
-            Draw.alpha(0.22f);
-            Fill.rect(x, y, 2f, 2f);
+            Draw.color(team.color, teamAlpha);
+            Draw.rect(teamRegion, x, y);
             Draw.color();
         }
 
+        @Override
+        public void drawCracks(){
+            //no
+        }
+
         @Override
         public void unitOn(Unit unit){
             if(enabled && unit.team != team && timer(timerDamage, cooldown)){
-                for(int i = 0; i < tendrils; i++){
-                    Lightning.create(team, lightningColor, damage, x, y, Mathf.random(360f), length);
-                }
+                triggered();
                 damage(tileDamage);
             }
         }
+
+        public void triggered(){
+            for(int i = 0; i < tendrils; i++){
+                Lightning.create(team, lightningColor, damage, x, y, Mathf.random(360f), length);
+            }
+            if(bullet != null){
+                for(int i = 0; i < shots; i++){
+                    bullet.create(this, x, y, (360f / shots) * i + Mathf.random(inaccuracy));
+                }
+            }
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/ShockwaveTower.java b/core/src/mindustry/world/blocks/defense/ShockwaveTower.java
new file mode 100644
index 0000000000..73bbd26feb
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/ShockwaveTower.java
@@ -0,0 +1,132 @@
+package mindustry.world.blocks.defense;
+
+import arc.*;
+import arc.audio.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class ShockwaveTower extends Block{
+    public int timerCheck = timers ++;
+
+    public float range = 110f;
+    public float reload = 60f * 1.5f;
+    public float bulletDamage = 160;
+    public float falloffCount = 20f;
+    public float shake = 2f;
+    //checking for bullets every frame is costly, so only do it at intervals even when ready.
+    public float checkInterval = 8f;
+    public Sound shootSound = Sounds.bang;
+    public Color waveColor = Pal.accent, heatColor = Pal.turretHeat, shapeColor = Color.valueOf("f29c83");
+    public float cooldownMultiplier = 1f;
+    public Effect hitEffect = Fx.hitSquaresColor;
+    public Effect waveEffect = Fx.pointShockwave;
+
+    //TODO switch to drawers eventually or something
+    public float shapeRotateSpeed = 1f, shapeRadius = 6f;
+    public int shapeSides = 4;
+
+    public @Load("@-heat") TextureRegion heatRegion;
+
+    public ShockwaveTower(String name){
+        super(name);
+        update = true;
+        solid = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.damage, bulletDamage, StatUnit.none);
+        stats.add(Stat.range, range / tilesize, StatUnit.blocks);
+        stats.add(Stat.reload, 60f / reload, StatUnit.perSecond);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, waveColor);
+    }
+    
+    public class ShockwaveTowerBuild extends Building{
+        public float reloadCounter = Mathf.random(reload);
+        public float heat = 0f;
+        public Seq<Bullet> targets = new Seq<>();
+
+        @Override
+        public void updateTile(){
+            if(potentialEfficiency > 0 && (reloadCounter += Time.delta) >= reload && timer(timerCheck, checkInterval)){
+                targets.clear();
+                Groups.bullet.intersect(x - range, y - range, range * 2, range * 2, b -> {
+                    if(b.team != team && b.type.hittable){
+                        targets.add(b);
+                    }
+                });
+
+                if(targets.size > 0){
+                    heat = 1f;
+                    reloadCounter = 0f;
+                    waveEffect.at(x, y, range, waveColor);
+                    shootSound.at(this);
+                    Effect.shake(shake, shake, this);
+                    float waveDamage = Math.min(bulletDamage, bulletDamage * falloffCount / targets.size);
+
+                    for(var target : targets){
+                        if(target.damage > waveDamage){
+                            target.damage -= waveDamage;
+                        }else{
+                            target.remove();
+                        }
+                        hitEffect.at(target.x, target.y, waveColor);
+                    }
+
+                    if(team == state.rules.defaultTeam){
+                        Events.fire(Trigger.shockwaveTowerUse);
+                    }
+                }
+            }
+
+            heat = Mathf.clamp(heat - Time.delta / reload * cooldownMultiplier);
+        }
+
+        @Override
+        public float warmup(){
+            return heat;
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return targets.size != 0;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+            Drawf.additive(heatRegion, heatColor, heat, x, y, 0f, Layer.blockAdditive);
+
+            Draw.z(Layer.effect);
+            Draw.color(shapeColor, waveColor, Mathf.pow(heat, 2f));
+            Fill.poly(x, y, shapeSides, shapeRadius * potentialEfficiency, Time.time * shapeRotateSpeed);
+            Draw.color();
+        }
+
+        @Override
+        public void drawSelect(){
+            Drawf.dashCircle(x, y, range, waveColor);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/Thruster.java b/core/src/mindustry/world/blocks/defense/Thruster.java
index 89c9a28c12..1d12a62a37 100644
--- a/core/src/mindustry/world/blocks/defense/Thruster.java
+++ b/core/src/mindustry/world/blocks/defense/Thruster.java
@@ -15,9 +15,9 @@ public class Thruster extends Wall{
     }
 
     @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        Draw.rect(region, req.drawx(), req.drawy());
-        Draw.rect(topRegion, req.drawx(), req.drawy(), req.rotation * 90);
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
     }
 
     @Override
@@ -29,8 +29,7 @@ public class Thruster extends Wall{
 
         @Override
         public void draw(){
-            super.draw();
-
+            Draw.rect(block.region, x, y);
             Draw.rect(topRegion, x, y, rotdeg());
         }
     }
diff --git a/core/src/mindustry/world/blocks/defense/Wall.java b/core/src/mindustry/world/blocks/defense/Wall.java
index 6f59fb8e34..03b919f795 100644
--- a/core/src/mindustry/world/blocks/defense/Wall.java
+++ b/core/src/mindustry/world/blocks/defense/Wall.java
@@ -15,8 +15,6 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class Wall extends Block{
-    public int variants = 0;
-
     /** Lighting chance. -1 to disable */
     public float lightningChance = -1f;
     public float lightningDamage = 20f;
@@ -37,6 +35,12 @@ public class Wall extends Block{
         group = BlockGroup.walls;
         buildCostMultiplier = 6f;
         canOverdrive = false;
+        drawDisabled = false;
+        crushDamageMultiplier = 5f;
+        priority = TargetPriority.wall;
+
+        //it's a wall of course it's supported everywhere
+        envEnabled = Env.any;
     }
 
     @Override
@@ -50,20 +54,6 @@ public class Wall extends Block{
         }
     }
 
-    @Override
-    public void load(){
-        super.load();
-
-        if(variants != 0){
-            variantRegions = new TextureRegion[variants];
-
-            for(int i = 0; i < variants; i++){
-                variantRegions[i] = Core.atlas.find(name + (i + 1));
-            }
-            region = variantRegions[0];
-        }
-    }
-
     @Override
     public TextureRegion[] icons(){
         return new TextureRegion[]{Core.atlas.find(Core.atlas.has(name) ? name : name + "1")};
@@ -74,11 +64,7 @@ public class Wall extends Block{
 
         @Override
         public void draw(){
-            if(variants == 0){
-                Draw.rect(region, x, y);
-            }else{
-                Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], x, y);
-            }
+            super.draw();
 
             //draw flashing white overlay if enabled
             if(flashHit){
@@ -91,7 +77,9 @@ public class Wall extends Block{
                 Draw.blend();
                 Draw.reset();
 
-                hit = Mathf.clamp(hit - Time.delta / 10f);
+                if(!state.isPaused()){
+                    hit = Mathf.clamp(hit - Time.delta / 10f);
+                }
             }
         }
 
@@ -112,7 +100,7 @@ public class Wall extends Block{
             //deflect bullets if necessary
             if(chanceDeflect > 0f){
                 //slow bullets are not deflected
-                if(bullet.vel().len() <= 0.1f || !bullet.type.reflectable) return true;
+                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;
@@ -131,9 +119,9 @@ public class Wall extends Block{
                     bullet.vel.y *= -1;
                 }
 
-                bullet.owner(this);
-                bullet.team(team);
-                bullet.time(bullet.time() + 1f);
+                bullet.owner = this;
+                bullet.team = team;
+                bullet.time += 1f;
 
                 //disable bullet collision by returning false
                 return false;
diff --git a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
index 44d4f63f93..dbe7794611 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
@@ -1,11 +1,15 @@
 package mindustry.world.blocks.defense.turrets;
 
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
@@ -13,13 +17,16 @@ import static mindustry.Vars.*;
 
 public class BaseTurret extends Block{
     public float range = 80f;
+    public float placeOverlapMargin = 8 * 7f;
     public float rotateSpeed = 5;
+    public float fogRadiusMultiplier = 1f;
 
-    public boolean acceptCoolant = true;
     /** Effect displayed when coolant is used. */
     public Effect coolEffect = Fx.fuelburn;
     /** How much reload is lowered by for each unit of liquid of heat capacity. */
     public float coolantMultiplier = 5f;
+    /** If not null, this consumer will be used for coolant. */
+    public @Nullable ConsumeLiquidBase coolant;
 
     public BaseTurret(String name){
         super(name);
@@ -27,21 +34,43 @@ public class BaseTurret extends Block{
         update = true;
         solid = true;
         outlineIcon = true;
+        attacks = true;
+        priority = TargetPriority.turret;
+        group = BlockGroup.turrets;
+        flags = EnumSet.of(BlockFlag.turret);
     }
 
     @Override
     public void init(){
-        if(acceptCoolant && !consumes.has(ConsumeType.liquid)){
-            hasLiquids = true;
-            consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.2f)).update(false).boost();
+        if(coolant == null){
+            coolant = findConsumer(c -> c instanceof ConsumeCoolant);
         }
 
+        //just makes things a little more convenient
+        if(coolant != null){
+            //TODO coolant fix
+            coolant.update = false;
+            coolant.booster = true;
+            coolant.optional = true;
+
+            //json parsing does not add to consumes
+            if(!hasConsumer(coolant)) consume(coolant);
+        }
+
+        placeOverlapRange = Math.max(placeOverlapRange, range + placeOverlapMargin);
+        fogRadius = Math.max(Mathf.round(range / tilesize * fogRadiusMultiplier), fogRadius);
         super.init();
     }
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
         Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, Pal.placing);
+
+        if(fogRadiusMultiplier < 0.99f && state.rules.fog){
+            Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range * fogRadiusMultiplier, Pal.lightishGray);
+        }
     }
 
     @Override
@@ -51,7 +80,7 @@ public class BaseTurret extends Block{
         stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks);
     }
 
-    public class BaseTurretBuild extends Building implements Ranged{
+    public class BaseTurretBuild extends Building implements Ranged, RotBlock{
         public float rotation = 90;
 
         @Override
@@ -59,9 +88,18 @@ public class BaseTurret extends Block{
             return range;
         }
 
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
         @Override
         public void drawSelect(){
-            Drawf.dashCircle(x, y, range, team.color);
+            Drawf.dashCircle(x, y, range(), team.color);
+        }
+
+        public float estimateDps(){
+            return 0f;
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
new file mode 100644
index 0000000000..b785e3ec4f
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
@@ -0,0 +1,119 @@
+package mindustry.world.blocks.defense.turrets;
+
+import arc.struct.*;
+import mindustry.content.*;
+import mindustry.entities.bullet.*;
+import mindustry.gen.*;
+import mindustry.logic.*;
+import mindustry.type.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+public class ContinuousLiquidTurret extends ContinuousTurret{
+    public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>();
+    public float liquidConsumed = 1f / 60f;
+
+    public ContinuousLiquidTurret(String name){
+        super(name);
+        hasLiquids = true;
+        //TODO
+        loopSound = Sounds.minebeam;
+        shootSound = Sounds.none;
+        smokeEffect = Fx.none;
+        shootEffect = Fx.none;
+    }
+
+    /** Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...] */
+    public void ammo(Object... objects){
+        ammoTypes = ObjectMap.of(objects);
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.remove(Stat.ammo);
+        //TODO looks bad
+        stats.add(Stat.ammo, table -> {
+            table.row();
+            StatValues.number(liquidConsumed * 60f, StatUnit.perSecond, true).display(table);
+        });
+        stats.add(Stat.ammo, StatValues.ammo(ammoTypes));
+    }
+
+    @Override
+    public void init(){
+        //TODO display ammoMultiplier.
+        consume(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), liquidConsumed){
+
+            @Override
+            public void display(Stats stats){
+
+            }
+        });
+
+        ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
+
+        super.init();
+    }
+
+    public class ContinuousLiquidTurretBuild extends ContinuousTurretBuild{
+
+        @Override
+        public boolean shouldActiveSound(){
+            return wasShooting && enabled;
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            unit.ammo(unit.type().ammoCapacity * liquids.currentAmount() / liquidCapacity);
+        }
+
+        @Override
+        public Object senseObject(LAccess sensor){
+            return switch(sensor){
+                case currentAmmoType -> liquids.current();
+                default -> super.senseObject(sensor);
+            };
+        }
+
+        @Override
+        public boolean canConsume(){
+            return hasCorrectAmmo() && super.canConsume();
+        }
+
+        @Override
+        public BulletType useAmmo(){
+            //does not consume ammo upon firing
+            return peekAmmo();
+        }
+
+        @Override
+        public BulletType peekAmmo(){
+            return ammoTypes.get(liquids.current());
+        }
+
+        @Override
+        public boolean hasAmmo(){
+            return hasCorrectAmmo() && ammoTypes.get(liquids.current()) != null && liquids.currentAmount() > 0f;
+        }
+
+        public boolean hasCorrectAmmo(){
+            return !bullets.any() || bullets.first().bullet.type == peekAmmo();
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return false;
+        }
+
+        @Override
+        public boolean acceptLiquid(Building source, Liquid liquid){
+            return ammoTypes.get(liquid) != null &&
+                (liquids.current() == liquid ||
+                ((!ammoTypes.containsKey(liquids.current()) || liquids.get(liquids.current()) <= 1f / ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f)));
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
new file mode 100644
index 0000000000..36e1b46266
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
@@ -0,0 +1,193 @@
+package mindustry.world.blocks.defense.turrets;
+
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.entities.bullet.*;
+import mindustry.gen.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+/** A turret that fires a continuous beam bullet with no reload or coolant necessary. The bullet only disappears when the turret stops shooting. */
+public class ContinuousTurret extends Turret{
+    public BulletType shootType = Bullets.placeholder;
+    /** Speed at which the turret can change its bullet "aim" distance. This is only used for point laser bullets. */
+    public float aimChangeSpeed = Float.POSITIVE_INFINITY;
+    public boolean scaleDamageEfficiency = false;
+
+    public ContinuousTurret(String name){
+        super(name);
+
+        coolantMultiplier = 1f;
+        envEnabled |= Env.space;
+        displayAmmoMultiplier = false;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.ammo, StatValues.ammo(ObjectMap.of(this, shootType)));
+        stats.remove(Stat.reload);
+        stats.remove(Stat.inaccuracy);
+    }
+
+    //TODO LaserTurret shared code
+    public class ContinuousTurretBuild extends TurretBuild{
+        public Seq<BulletEntry> bullets = new Seq<>();
+        public float lastLength = size * 4f;
+
+        @Override
+        public float estimateDps(){
+            if(!hasAmmo()) return 0f;
+            return shootType.damage * 60f / (shootType instanceof ContinuousBulletType c ? c.damageInterval : 5f);
+        }
+
+        @Override
+        protected void updateCooling(){
+            //TODO how does coolant work here, if at all?
+        }
+
+        @Override
+        public BulletType useAmmo(){
+            //nothing used directly
+            return shootType;
+        }
+
+        @Override
+        public boolean hasAmmo(){
+            return canConsume();
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return isShooting();
+        }
+
+        @Override
+        public BulletType peekAmmo(){
+            return shootType;
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            //TODO unclean way of calculating ammo fraction to display
+            float ammoFract = efficiency;
+            if(findConsumer(f -> f instanceof ConsumeLiquidBase) instanceof ConsumeLiquid cons){
+                ammoFract = Math.min(ammoFract, liquids.get(cons.liquid) / liquidCapacity);
+            }
+
+            unit.ammo(unit.type().ammoCapacity * ammoFract);
+
+            bullets.removeAll(b -> !b.bullet.isAdded() || b.bullet.type == null || b.bullet.owner != this);
+
+            if(bullets.any()){
+                for(var entry : bullets){
+                    updateBullet(entry);
+                }
+
+                wasShooting = true;
+                heat = 1f;
+                curRecoil = recoil;
+            }
+        }
+
+        protected void updateBullet(BulletEntry entry){
+            float
+                bulletX = x + Angles.trnsx(rotation - 90, shootX + entry.x, shootY + entry.y),
+                bulletY = y + Angles.trnsy(rotation - 90, shootX + entry.x, shootY + entry.y),
+                angle = rotation + entry.rotation;
+
+            entry.bullet.rotation(angle);
+            entry.bullet.set(bulletX, bulletY);
+
+            //target length of laser
+            float shootLength = Math.min(dst(targetPos), range);
+            //current length of laser
+            float curLength = dst(entry.bullet.aimX, entry.bullet.aimY);
+            //resulting length of the bullet (smoothed)
+            float resultLength = Mathf.approachDelta(curLength, shootLength, aimChangeSpeed);
+            //actual aim end point based on length
+            Tmp.v1.trns(rotation, lastLength = resultLength).add(x, y);
+
+            entry.bullet.aimX = Tmp.v1.x;
+            entry.bullet.aimY = Tmp.v1.y;
+            if(scaleDamageEfficiency){
+                entry.bullet.damage = entry.bullet.type.damage * Math.min(efficiency, 1f) * entry.bullet.damageMultiplier();
+            }
+
+            if(isShooting() && hasAmmo()){
+                entry.bullet.time = entry.bullet.lifetime * entry.bullet.type.optimalLifeFract * Math.min(shootWarmup, efficiency);
+                entry.bullet.keepAlive = true;
+            }
+        }
+
+        @Override
+        protected void updateReload(){
+            //continuous turrets don't have a concept of reload, they are always firing when possible
+        }
+
+        @Override
+        protected void updateShooting(){
+            if(bullets.any()){
+                return;
+            }
+
+            if(canConsume() && !charging() && shootWarmup >= minWarmup){
+                shoot(peekAmmo());
+            }
+        }
+
+        @Override
+        protected void turnToTarget(float targetRot){
+            rotation = Angles.moveToward(rotation, targetRot, efficiency * rotateSpeed * delta());
+        }
+
+        @Override
+        protected void handleBullet(@Nullable Bullet bullet, float offsetX, float offsetY, float angleOffset){
+            if(bullet != null){
+                bullets.add(new BulletEntry(bullet, offsetX, offsetY, angleOffset, 0f));
+
+                //make sure the length updates to the last set value
+                Tmp.v1.trns(rotation, shootY + lastLength).add(x, y);
+                bullet.aimX = Tmp.v1.x;
+                bullet.aimY = Tmp.v1.y;
+            }
+        }
+
+        @Override
+        public boolean shouldActiveSound(){
+            return bullets.any();
+        }
+
+        @Override
+        public float activeSoundVolume(){
+            return 1f;
+        }
+
+        @Override
+        public byte version(){
+            return 3;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(lastLength);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            if(revision >= 3){
+                lastLength = read.f();
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
index 30d3791231..51c07de96f 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -1,6 +1,7 @@
 package mindustry.world.blocks.defense.turrets;
 
 import arc.*;
+import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.io.*;
@@ -10,16 +11,16 @@ import mindustry.entities.bullet.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 import static mindustry.Vars.*;
 
 public class ItemTurret extends Turret{
-    public ObjectMap<Item, BulletType> ammoTypes = new ObjectMap<>();
+    public ObjectMap<Item, BulletType> ammoTypes = new OrderedMap<>();
 
     public ItemTurret(String name){
         super(name);
@@ -31,30 +32,57 @@ public class ItemTurret extends Turret{
         ammoTypes = OrderedMap.of(objects);
     }
 
+    /** Limits bullet range to this turret's range value. */
+    public void limitRange(){
+        limitRange(9f);
+    }
+
+    /** Limits bullet range to this turret's range value. */
+    public void limitRange(float margin){
+        for(var entry : ammoTypes.entries()){
+            limitRange(entry.value, margin);
+        }
+    }
+
     @Override
     public void setStats(){
         super.setStats();
 
         stats.remove(Stat.itemCapacity);
-        stats.add(Stat.ammo, new AmmoListValue<>(ammoTypes));
+        stats.add(Stat.ammo, StatValues.ammo(ammoTypes));
+        stats.add(Stat.ammoCapacity, maxAmmo / ammoPerShot, StatUnit.shots);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("ammo", (ItemTurretBuild entity) ->
+            new Bar(
+                "stat.ammo",
+                Pal.ammo,
+                () -> (float)entity.totalAmmo / maxAmmo
+            )
+        );
     }
 
     @Override
     public void init(){
-        consumes.add(new ConsumeItemFilter(i -> ammoTypes.containsKey(i)){
+        consume(new ConsumeItemFilter(i -> ammoTypes.containsKey(i)){
             @Override
-            public void build(Building tile, Table table){
+            public void build(Building build, 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 instanceof ItemTurretBuild it && !it.ammo.isEmpty() && ((ItemEntry)it.ammo.peek()).item == item)));
+                content.items().each(i -> filter.get(i) && i.unlockedNow(),
+                item -> image.add(new ReqImage(new Image(item.uiIcon),
+                () -> build instanceof ItemTurretBuild it && !it.ammo.isEmpty() && ((ItemEntry)it.ammo.peek()).item == item)));
 
                 table.add(image).size(8 * 4);
             }
 
             @Override
-            public boolean valid(Building entity){
-                //valid when there's any ammo in the turret
-                return entity instanceof ItemTurretBuild it && !it.ammo.isEmpty();
+            public float efficiency(Building build){
+                //valid when it can shoot
+                return build instanceof ItemTurretBuild it && it.ammo.size > 0 && (it.ammo.peek().amount >= ammoPerShot || it.cheating()) ? 1f : 0f;
             }
 
             @Override
@@ -63,6 +91,8 @@ public class ItemTurret extends Turret{
             }
         });
 
+        ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
+
         super.init();
     }
 
@@ -73,11 +103,19 @@ public class ItemTurret extends Turret{
             super.onProximityAdded();
 
             //add first ammo item to cheaty blocks so they can shoot properly
-            if(cheating() && ammo.size > 0){
-                handleItem(this, ammoTypes.entries().next().key);
+            if(!hasAmmo() && cheating() && ammoTypes.size > 0){
+                handleItem(this, ammoTypes.keys().next());
             }
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            return switch(sensor){
+                case currentAmmoType -> ammo.size > 0 ? ((ItemEntry)ammo.peek()).item : null;
+                default -> super.senseObject(sensor);
+            };
+        }
+
         @Override
         public void updateTile(){
             unit.ammo((float)unit.type().ammoCapacity * totalAmmo / maxAmmo);
@@ -85,14 +123,6 @@ public class ItemTurret extends Turret{
             super.updateTile();
         }
 
-        @Override
-        public void displayBars(Table bars){
-            super.displayBars(bars);
-
-            bars.add(new Bar("stat.ammo", Pal.ammo, () -> (float)totalAmmo / maxAmmo)).growX();
-            bars.row();
-        }
-
         @Override
         public int acceptStack(Item item, int amount, Teamc source){
             BulletType type = ammoTypes.get(item);
@@ -117,12 +147,18 @@ public class ItemTurret extends Turret{
 
         @Override
         public void handleItem(Building source, Item item){
+            //TODO instead of all this "entry" crap, turrets could just accept only one type of ammo at a time - simpler for both users and the code
 
             if(item == Items.pyratite){
                 Events.fire(Trigger.flameAmmo);
             }
 
+            if(totalAmmo == 0){
+                Events.fire(Trigger.resupplyTurret);
+            }
+
             BulletType type = ammoTypes.get(item);
+            if(type == null) return;
             totalAmmo += type.ammoMultiplier;
 
             //find ammo entry by type
@@ -165,22 +201,24 @@ public class ItemTurret extends Turret{
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
+            ammo.clear();
+            totalAmmo = 0;
             int amount = read.ub();
             for(int i = 0; i < amount; i++){
                 Item item = Vars.content.item(revision < 2 ? read.ub() : read.s());
                 short a = read.s();
-                totalAmmo += a;
 
                 //only add ammo if this is a valid ammo type
                 if(item != null && ammoTypes.containsKey(item)){
+                    totalAmmo += a;
                     ammo.add(new ItemEntry(item, a));
                 }
             }
         }
     }
 
-    class ItemEntry extends AmmoEntry{
-        protected Item item;
+    public class ItemEntry extends AmmoEntry{
+        public Item item;
 
         ItemEntry(Item item, int amount){
             this.item = item;
@@ -191,5 +229,13 @@ public class ItemTurret extends Turret{
         public BulletType type(){
             return ammoTypes.get(item);
         }
+
+        @Override
+        public String toString(){
+            return "ItemEntry{" +
+            "item=" + item +
+            ", amount=" + amount +
+            '}';
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
index fd971e55d7..d1d79ae868 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
@@ -1,114 +1,153 @@
 package mindustry.world.blocks.defense.turrets;
 
 import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 import static mindustry.Vars.*;
 
+/** A turret that fires a continuous beam with a delay between shots. Liquid coolant is required. Yes, this class name is awful. */
 public class LaserTurret extends PowerTurret{
     public float firingMoveFract = 0.25f;
     public float shootDuration = 100f;
 
     public LaserTurret(String name){
         super(name);
-        canOverdrive = false;
 
-        consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.01f)).update(false);
         coolantMultiplier = 1f;
     }
 
-    @Override
-    public void init(){
-        consumes.powerCond(powerUse, entity -> ((LaserTurretBuild)entity).bullet != null || ((LaserTurretBuild)entity).target != null);
-        super.init();
-    }
-
     @Override
     public void setStats(){
         super.setStats();
 
         stats.remove(Stat.booster);
-        stats.add(Stat.input, new BoosterListValue(reloadTime, consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount, coolantMultiplier, false, l -> consumes.liquidfilters.get(l.id)));
-        stats.remove(Stat.damage);
-        //damages every 5 ticks, at least in meltdown's case
-        stats.add(Stat.damage, shootType.damage * 60f / 5f, StatUnit.perSecond);
+        stats.add(Stat.input, StatValues.boosters(reload, coolant.amount, coolantMultiplier, false, this::consumesLiquid));
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        if(coolant == null){
+            coolant = findConsumer(c -> c instanceof ConsumeLiquidBase);
+        }
     }
 
     public class LaserTurretBuild extends PowerTurretBuild{
-        Bullet bullet;
-        float bulletLife;
+        public Seq<BulletEntry> bullets = new Seq<>();
 
         @Override
         protected void updateCooling(){
             //do nothing, cooling is irrelevant here
         }
 
+        @Override
+        public boolean shouldConsume(){
+            //still consumes power when bullet is around
+            return bullets.any() || isActive() || isShooting();
+        }
+
+        @Override
+        public void placed(){
+            super.placed();
+
+            reloadCounter = reload;
+        }
+
         @Override
         public void updateTile(){
             super.updateTile();
 
-            if(bulletLife > 0 && bullet != null){
-                wasShooting = true;
-                tr.trns(rotation, size * tilesize / 2f, 0f);
-                bullet.rotation(rotation);
-                bullet.set(x + tr.x, y + tr.y);
-                bullet.time(0f);
-                heat = 1f;
-                recoil = recoilAmount;
-                bulletLife -= Time.delta / Math.max(efficiency(), 0.00001f);
-                if(bulletLife <= 0f){
-                    bullet = null;
+            bullets.removeAll(b -> !b.bullet.isAdded() || b.bullet.type == null || b.life <= 0f || b.bullet.owner != this);
+
+            if(bullets.any()){
+
+                for(var entry : bullets){
+                    float
+                    bulletX = x + Angles.trnsx(rotation - 90, shootX + entry.x, shootY + entry.y),
+                    bulletY = y + Angles.trnsy(rotation - 90, shootX + entry.x, shootY + entry.y),
+                    angle = rotation + entry.rotation;
+
+                    entry.bullet.rotation(angle);
+                    entry.bullet.set(bulletX, bulletY);
+                    entry.bullet.time = entry.bullet.type.lifetime * entry.bullet.type.optimalLifeFract;
+                    entry.bullet.keepAlive = true;
+                    entry.life -= Time.delta * timeScale / Math.max(efficiency, 0.00001f);
                 }
-            }else if(reload > 0){
+
                 wasShooting = true;
-                Liquid liquid = liquids.current();
-                float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
+                heat = 1f;
+                curRecoil = 1f;
+            }else if(reloadCounter > 0){
 
-                float used = (cheating() ? maxUsed * Time.delta : Math.min(liquids.get(liquid), maxUsed * Time.delta)) * liquid.heatCapacity * coolantMultiplier;
-                reload -= used;
-                liquids.remove(liquid, used);
+                if(coolant != null){
+                    //TODO does not handle multi liquid req?
+                    Liquid liquid = liquids.current();
+                    float maxUsed = coolant.amount;
+                    float used = (cheating() ? maxUsed : Math.min(liquids.get(liquid), maxUsed)) * delta();
+                    reloadCounter -= used * liquid.heatCapacity * coolantMultiplier;
+                    liquids.remove(liquid, used);
 
-                if(Mathf.chance(0.06 * used)){
-                    coolEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
+                    if(Mathf.chance(0.06 * used)){
+                        coolEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
+                    }
+                }else{
+                    reloadCounter -= edelta();
                 }
             }
         }
 
+        @Override
+        public float progress(){
+            return 1f - Mathf.clamp(reloadCounter / reload);
+        }
+
+        @Override
+        protected void updateReload(){
+            //updated in updateTile() depending on coolant
+        }
+
         @Override
         protected void updateShooting(){
-            if(bulletLife > 0 && bullet != null){
+            if(bullets.any()){
                 return;
             }
 
-            if(reload <= 0 && (consValid() || cheating())){
+            if(reloadCounter <= 0 && efficiency > 0 && !charging() && shootWarmup >= minWarmup){
                 BulletType type = peekAmmo();
 
                 shoot(type);
 
-                reload = reloadTime;
+                reloadCounter = reload;
             }
         }
 
         @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() * (bullets.any() ? firingMoveFract : 1f));
         }
 
         @Override
-        protected void bullet(BulletType type, float angle){
-            bullet = type.create(tile.build, team, x + tr.x, y + tr.y, angle);
-            bulletLife = shootDuration;
+        protected void handleBullet(@Nullable Bullet bullet, float offsetX, float offsetY, float angleOffset){
+            if(bullet != null){
+                bullets.add(new BulletEntry(bullet, offsetX, offsetY, angleOffset, shootDuration));
+            }
+        }
+
+        @Override
+        public float activeSoundVolume(){
+            return 1f;
         }
 
         @Override
         public boolean shouldActiveSound(){
-            return bulletLife > 0 && bullet != null;
+            return bullets.any();
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index 21f480f0ab..82a9cf6d9e 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -1,56 +1,50 @@
 package mindustry.world.blocks.defense.turrets;
 
-import arc.graphics.g2d.*;
 import arc.struct.*;
-import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 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 boolean extinguish = true;
 
     public LiquidTurret(String name){
         super(name);
-        acceptCoolant = false;
         hasLiquids = true;
         loopSound = Sounds.spray;
         shootSound = Sounds.none;
+        smokeEffect = Fx.none;
+        shootEffect = Fx.none;
     }
 
     /** Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...] */
-    protected void ammo(Object... objects){
-        ammoTypes = OrderedMap.of(objects);
+    public void ammo(Object... objects){
+        ammoTypes = ObjectMap.of(objects);
     }
 
     @Override
     public void setStats(){
         super.setStats();
 
-        stats.add(Stat.ammo, new AmmoListValue<>(ammoTypes));
+        stats.add(Stat.ammo, StatValues.ammo(ammoTypes));
     }
 
     @Override
     public void init(){
-        consumes.add(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), 1f){
-            @Override
-            public boolean valid(Building entity){
-                return entity.liquids.total() > 0.001f;
-            }
+        consume(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), 1f){
 
             @Override
-            public void update(Building entity){
+            public void update(Building build){
 
             }
 
@@ -60,23 +54,16 @@ public class LiquidTurret extends Turret{
             }
         });
 
+        ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
+
         super.init();
     }
 
     public class LiquidTurretBuild extends TurretBuild{
-        @Override
-        public void draw(){
-            super.draw();
-            
-            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
         public boolean shouldActiveSound(){
-            return wasShooting;
+            return wasShooting && enabled;
         }
 
         @Override
@@ -86,40 +73,44 @@ public class LiquidTurret extends Turret{
             super.updateTile();
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            return switch(sensor){
+                case currentAmmoType -> liquids.current();
+                default -> super.senseObject(sensor);
+            };
+        }
+
         @Override
         protected void findTarget(){
             if(extinguish && liquids.current().canExtinguish()){
+                int tx = World.toTile(x), ty = World.toTile(y);
+                Fire result = null;
+                float mindst = 0f;
                 int tr = (int)(range / tilesize);
                 for(int x = -tr; x <= tr; x++){
                     for(int y = -tr; y <= tr; y++){
-                        Tile other = world.tileWorld(x + tile.x, y + tile.y);
+                        Tile other = world.tile(x + tx, y + ty);
+                        var fire = Fires.get(x + tx, y + ty);
+                        float dst = fire == null ? 0 : dst2(fire);
                         //do not extinguish fires on other team blocks
-                        if(other != null && Fires.has(x + tile.x, y + tile.y) && (other.build == null || other.team() == team)){
-                            target = Fires.get(x + tile.x, y + tile.y);
-                            return;
+                        if(other != null && fire != null && Fires.has(other.x, other.y) && dst <= range * range && (result == null || dst < mindst) && (other.build == null || other.team() == team)){
+                            result = fire;
+                            mindst = dst;
                         }
                     }
                 }
+
+                if(result != null){
+                    target = result;
+                    //don't run standard targeting
+                    return;
+                }
             }
 
             super.findTarget();
         }
 
-        @Override
-        protected void effects(){
-            BulletType type = peekAmmo();
-
-            type.shootEffect.at(x + tr.x, y + tr.y, rotation, liquids.current().color);
-            type.smokeEffect.at(x + tr.x, y + tr.y, rotation, liquids.current().color);
-            shootSound.at(tile);
-
-            if(shootShake > 0){
-                Effect.shake(shootShake, shootShake, tile.build);
-            }
-
-            recoil = recoilAmount;
-        }
-
         @Override
         public BulletType useAmmo(){
             if(cheating()) return ammoTypes.get(liquids.current());
@@ -135,7 +126,7 @@ public class LiquidTurret extends Turret{
 
         @Override
         public boolean hasAmmo(){
-            return ammoTypes.get(liquids.current()) != null && liquids.total() >= 1f / ammoTypes.get(liquids.current()).ammoMultiplier;
+            return ammoTypes.get(liquids.current()) != null && liquids.currentAmount() >= 1f / ammoTypes.get(liquids.current()).ammoMultiplier;
         }
 
         @Override
@@ -145,9 +136,9 @@ public class LiquidTurret extends Turret{
 
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
-            return ammoTypes.get(liquid) != null
-                && (liquids.current() == liquid || (ammoTypes.containsKey(liquid)
-                && (!ammoTypes.containsKey(liquids.current()) || liquids.get(liquids.current()) <= 1f / ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f)));
+            return ammoTypes.get(liquid) != null &&
+                (liquids.current() == liquid ||
+                ((!ammoTypes.containsKey(liquids.current()) || liquids.get(liquids.current()) <= 1f / ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f)));
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/PayloadAmmoTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PayloadAmmoTurret.java
new file mode 100644
index 0000000000..1600ef7d0d
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/turrets/PayloadAmmoTurret.java
@@ -0,0 +1,176 @@
+package mindustry.world.blocks.defense.turrets;
+
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.io.*;
+import mindustry.ctype.*;
+import mindustry.entities.bullet.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.blocks.payloads.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+//TODO visuals!
+/** Do not use this class! */
+public class PayloadAmmoTurret extends Turret{
+    public ObjectMap<UnlockableContent, BulletType> ammoTypes = new ObjectMap<>();
+
+    protected UnlockableContent[] ammoKeys;
+
+    public PayloadAmmoTurret(String name){
+        super(name);
+
+        maxAmmo = 3;
+        acceptsPayload = true;
+    }
+
+    /** Initializes accepted ammo map. Format: [block1, bullet1, block2, bullet2...] */
+    public void ammo(Object... objects){
+        ammoTypes = ObjectMap.of(objects);
+    }
+
+    /** Makes copies of all bullets and limits their range. */
+    public void limitRange(){
+        limitRange(1f);
+    }
+
+    /** Makes copies of all bullets and limits their range. */
+    public void limitRange(float margin){
+        for(var entry : ammoTypes.copy().entries()){
+            entry.value.lifetime = (range + margin) / entry.value.speed;
+        }
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.remove(Stat.itemCapacity);
+        stats.add(Stat.ammo, StatValues.ammo(ammoTypes, true));
+    }
+
+    @Override
+    public void init(){
+        consume(new ConsumePayloadFilter(i -> ammoTypes.containsKey(i)){
+            @Override
+            public void build(Building build, Table table){
+                MultiReqImage image = new MultiReqImage();
+
+                for(var block : content.blocks()) displayContent(build, image, block);
+                for(var unit : content.units()) displayContent(build, image, unit);
+
+                table.add(image).size(8 * 4);
+            }
+
+            void displayContent(Building build, MultiReqImage image, UnlockableContent content){
+                if(filter.get(content) && content.unlockedNow()){
+                    image.add(new ReqImage(new Image(content.uiIcon), () -> build instanceof PayloadTurretBuild it && !it.payloads.isEmpty() && it.currentAmmo() == content));
+                }
+            }
+
+            @Override
+            public float efficiency(Building build){
+                //valid when there's any ammo in the turret
+                return build instanceof PayloadTurretBuild it && it.payloads.any() ? 1f : 0f;
+            }
+
+            @Override
+            public void display(Stats stats){
+                //don't display
+            }
+        });
+
+        ammoKeys = ammoTypes.keys().toSeq().toArray(UnlockableContent.class);
+
+        super.init();
+    }
+
+    public class PayloadTurretBuild extends TurretBuild{
+        public PayloadSeq payloads = new PayloadSeq();
+
+        public UnlockableContent currentAmmo(){
+            for(var content : ammoKeys){
+                if(payloads.contains(content)){
+                    return content;
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return payloads.total() < maxAmmo && ammoTypes.containsKey(payload.content());
+        }
+
+        @Override
+        public void handlePayload(Building source, Payload payload){
+            payloads.add(payload.content());
+        }
+
+        @Override
+        public boolean hasAmmo(){
+            return payloads.total() > 0;
+        }
+
+        @Override
+        public BulletType useAmmo(){
+            for(var content : ammoKeys){
+                if(payloads.contains(content)){
+                    payloads.remove(content);
+                    return ammoTypes.get(content);
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public BulletType peekAmmo(){
+            for(var content : ammoKeys){
+                if(payloads.contains(content)){
+                    return ammoTypes.get(content);
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public PayloadSeq getPayloads(){
+            return payloads;
+        }
+
+        @Override
+        public void updateTile(){
+            totalAmmo = payloads.total();
+            unit.ammo((float)unit.type().ammoCapacity * totalAmmo / maxAmmo);
+
+            super.updateTile();
+        }
+
+        @Override
+        public void displayBars(Table bars){
+            super.displayBars(bars);
+
+            bars.add(new Bar("stat.ammo", Pal.ammo, () -> (float)totalAmmo / maxAmmo)).growX();
+            bars.row();
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            payloads.write(write);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            payloads.read(read);
+            payloads.removeAll(u -> !ammoTypes.containsKey(u));
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java
index 9c0259c8b2..97aedf43b5 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java
@@ -14,11 +14,13 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class PointDefenseTurret extends ReloadTurret{
     public final int timerTarget = timers++;
     public float retargetTime = 5f;
 
-    public @Load("block-@size") TextureRegion baseRegion;
+    public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
 
     public Color color = Color.white;
     public Effect beamEffect = Fx.pointBeam;
@@ -35,11 +37,9 @@ public class PointDefenseTurret extends ReloadTurret{
         super(name);
 
         rotateSpeed = 20f;
-        reloadTime = 30f;
+        reload = 30f;
 
         coolantMultiplier = 2f;
-        //disabled due to version mismatch problems
-        acceptCoolant = false;
     }
 
     @Override
@@ -51,7 +51,7 @@ public class PointDefenseTurret extends ReloadTurret{
     public void setStats(){
         super.setStats();
 
-        stats.add(Stat.reload, 60f / reloadTime, StatUnit.none);
+        stats.add(Stat.reload, 60f / reload, StatUnit.perSecond);
     }
 
     public class PointDefenseBuild extends ReloadTurretBuild{
@@ -70,7 +70,7 @@ public class PointDefenseTurret extends ReloadTurret{
                 target = null;
             }
 
-            if(acceptCoolant){
+            if(coolant != null){
                 updateCooling();
             }
 
@@ -78,12 +78,13 @@ public class PointDefenseTurret extends ReloadTurret{
             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();
+                reloadCounter += edelta();
 
                 //shoot when possible
-                if(Angles.within(rotation, dest, shootCone) && reload >= reloadTime){
-                    if(target.damage() > bulletDamage){
-                        target.damage(target.damage() - bulletDamage);
+                if(Angles.within(rotation, dest, shootCone) && reloadCounter >= reload){
+                    float realDamage = bulletDamage * state.rules.blockDamage(team);
+                    if(target.damage() > realDamage){
+                        target.damage(target.damage() - realDamage);
                     }else{
                         target.remove();
                     }
@@ -94,11 +95,16 @@ public class PointDefenseTurret extends ReloadTurret{
                     shootEffect.at(x + Tmp.v1.x, y + Tmp.v1.y, rotation, color);
                     hitEffect.at(target.x, target.y, color);
                     shootSound.at(x + Tmp.v1.x, y + Tmp.v1.y, Mathf.random(0.9f, 1.1f));
-                    reload = 0;
+                    reloadCounter = 0;
                 }
             }
         }
 
+        @Override
+        public boolean shouldConsume(){
+            return super.shouldConsume() && target != null;
+        }
+
         @Override
         public void draw(){
             Draw.rect(baseRegion, x, y);
diff --git a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
index bf365f4439..d18db6208c 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
@@ -1,12 +1,12 @@
 package mindustry.world.blocks.defense.turrets;
 
+import arc.struct.*;
 import mindustry.entities.bullet.*;
 import mindustry.logic.*;
 import mindustry.world.meta.*;
 
 public class PowerTurret extends Turret{
     public BulletType shootType;
-    public float powerUse = 1f;
 
     public PowerTurret(String name){
         super(name);
@@ -16,13 +16,11 @@ public class PowerTurret extends Turret{
     @Override
     public void setStats(){
         super.setStats();
-        stats.add(Stat.damage, shootType.damage, StatUnit.none);
+        stats.add(Stat.ammo, StatValues.ammo(ObjectMap.of(this, shootType)));
     }
 
-    @Override
-    public void init(){
-        consumes.powerCond(powerUse, TurretBuild::isActive);
-        super.init();
+    public void limitRange(float margin){
+        limitRange(shootType, margin);
     }
 
     public class PowerTurretBuild extends TurretBuild{
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
index bc172e9c46..8748b91ed8 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
@@ -1,16 +1,13 @@
 package mindustry.world.blocks.defense.turrets;
 
 import arc.math.*;
-import arc.util.*;
-import mindustry.type.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 import static mindustry.Vars.*;
 
 public class ReloadTurret extends BaseTurret{
-    public float reloadTime = 10f;
+    public float reload = 10f;
 
     public ReloadTurret(String name){
         super(name);
@@ -20,30 +17,33 @@ public class ReloadTurret extends BaseTurret{
     public void setStats(){
         super.setStats();
 
-        if(acceptCoolant){
-            stats.add(Stat.booster, new BoosterListValue(reloadTime, consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount, coolantMultiplier, true, l -> consumes.liquidfilters.get(l.id)));
+        if(coolant != null){
+            stats.replace(Stat.booster, StatValues.boosters(reload, coolant.amount, coolantMultiplier, true, coolant::consumes));
         }
     }
 
     public class ReloadTurretBuild extends BaseTurretBuild{
-        public float reload;
+        public float reloadCounter;
 
         protected void updateCooling(){
-            float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
+            if(reloadCounter < reload && coolant != null && coolant.efficiency(this) > 0 && efficiency > 0){
+                float capacity = coolant instanceof ConsumeLiquidFilter filter ? filter.getConsumed(this).heatCapacity : (coolant.consumes(liquids.current()) ? liquids.current().heatCapacity : 0.4f);
+                float amount = coolant.amount * coolant.efficiency(this);
+                coolant.update(this);
+                reloadCounter += amount * edelta() * capacity * coolantMultiplier * ammoReloadMultiplier();
 
-            Liquid liquid = liquids.current();
-
-            float used = Math.min(Math.min(liquids.get(liquid), maxUsed * Time.delta), Math.max(0, ((reloadTime - reload) / coolantMultiplier) / liquid.heatCapacity)) * baseReloadSpeed();
-            reload += used * liquid.heatCapacity * coolantMultiplier;
-            liquids.remove(liquid, used);
-
-            if(Mathf.chance(0.06 * used)){
-                coolEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
+                if(Mathf.chance(0.06 * amount)){
+                    coolEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
+                }
             }
         }
 
+        protected float ammoReloadMultiplier(){
+            return 1f;
+        }
+
         protected float baseReloadSpeed(){
-            return efficiency();
+            return efficiency;
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
index 34e960ea2d..dffd95f03f 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
@@ -12,7 +12,6 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
-import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -21,11 +20,8 @@ public class TractorBeamTurret extends BaseTurret{
     public final int timerTarget = timers++;
     public float retargetTime = 5f;
 
-    public @Load("block-@size") TextureRegion baseRegion;
-    public @Load("@-laser") TextureRegion laser;
-    public @Load("@-laser-end") TextureRegion laserEnd;
-
     public float shootCone = 6f;
+    public float shootLength = 5f;
     public float laserWidth = 0.6f;
     public float force = 0.3f;
     public float scaledForce = 0f;
@@ -38,14 +34,17 @@ public class TractorBeamTurret extends BaseTurret{
     public Sound shootSound = Sounds.tractorbeam;
     public float shootSoundVolume = 0.9f;
 
+    public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
+    public @Load("@-laser") TextureRegion laser;
+    public @Load(value = "@-laser-start", fallback = "@-laser-end") TextureRegion laserStart;
+    public @Load("@-laser-end") TextureRegion laserEnd;
+
     public TractorBeamTurret(String name){
         super(name);
 
         rotateSpeed = 10f;
         coolantMultiplier = 1f;
-
-        //disabled due to version mismatch problems
-        acceptCoolant = false;
+        envEnabled |= Env.space;
     }
 
     @Override
@@ -59,17 +58,25 @@ public class TractorBeamTurret extends BaseTurret{
 
         stats.add(Stat.targetsAir, targetAir);
         stats.add(Stat.targetsGround, targetGround);
-        stats.add(Stat.damage, damage * 60f, StatUnit.perSecond);
+        if(damage > 0) stats.add(Stat.damage, damage * 60f, StatUnit.perSecond);
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        updateClipRadius(range + tilesize);
     }
 
     public class TractorBeamBuild extends BaseTurretBuild{
         public @Nullable Unit target;
         public float lastX, lastY, strength;
         public boolean any;
-        public float coolant = 1f;
+        public float coolantMultiplier = 1f;
 
         @Override
         public void updateTile(){
+            float eff = efficiency * coolantMultiplier, edelta = eff * delta();
 
             //retarget
             if(timer(timerTarget, retargetTime)){
@@ -77,8 +84,8 @@ public class TractorBeamTurret extends BaseTurret{
             }
 
             //consume coolant
-            if(target != null && acceptCoolant){
-                float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
+            if(target != null && coolant != null){
+                float maxUsed = coolant.amount;
 
                 Liquid liquid = liquids.current();
 
@@ -90,19 +97,19 @@ public class TractorBeamTurret extends BaseTurret{
                     coolEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
                 }
 
-                coolant = 1f + (used * liquid.heatCapacity * coolantMultiplier);
+                coolantMultiplier = 1f + (used * liquid.heatCapacity * coolantMultiplier);
             }
 
             any = false;
 
             //look at target
-            if(target != null && target.within(this, range) && target.team() != team && target.type.flying && efficiency() > 0.02f){
+            if(target != null && target.within(this, range + target.hitSize/2f) && target.team() != team && target.checkTarget(targetAir, targetGround) && efficiency > 0.02f){
                 if(!headless){
                     control.sound.loop(shootSound, this, shootSoundVolume);
                 }
 
                 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);
@@ -110,7 +117,7 @@ public class TractorBeamTurret extends BaseTurret{
                 //shoot when possible
                 if(Angles.within(rotation, dest, shootCone)){
                     if(damage > 0){
-                        target.damageContinuous(damage * efficiency());
+                        target.damageContinuous(damage * eff * state.rules.blockDamage(team));
                     }
 
                     if(status != StatusEffects.none){
@@ -118,7 +125,7 @@ public class TractorBeamTurret extends BaseTurret{
                     }
 
                     any = true;
-                    target.impulseNet(Tmp.v1.set(this).sub(target).limit((force + (1f - target.dst(this) / range) * scaledForce) * edelta() * timeScale));
+                    target.impulseNet(Tmp.v1.set(this).sub(target).limit((force + (1f - target.dst(this) / range) * scaledForce) * edelta));
                 }
             }else{
                 strength = Mathf.lerpDelta(strength, 0, 0.1f);
@@ -126,8 +133,14 @@ public class TractorBeamTurret extends BaseTurret{
         }
 
         @Override
-        public float efficiency(){
-            return super.efficiency() * coolant;
+        public boolean shouldConsume(){
+            return super.shouldConsume() && target != null;
+        }
+
+        @Override
+        public float estimateDps(){
+            if(!any || damage <= 0) return 0f;
+            return damage * 60f * efficiency * coolantMultiplier;
         }
 
         @Override
@@ -140,13 +153,12 @@ public class TractorBeamTurret extends BaseTurret{
             if(any){
                 Draw.z(Layer.bullet);
                 float ang = angleTo(lastX, lastY);
-                float len = 5f;
 
                 Draw.mixcol(laserColor, Mathf.absin(4f, 0.6f));
 
-                Drawf.laser(team, laser, laserEnd,
-                x + Angles.trnsx(ang, len), y + Angles.trnsy(ang, len),
-                lastX, lastY, strength * efficiency() * laserWidth);
+                Drawf.laser(laser, laserStart, laserEnd,
+                x + Angles.trnsx(ang, shootLength), y + Angles.trnsy(ang, shootLength),
+                lastX, lastY, strength * efficiency * laserWidth);
 
                 Draw.mixcol();
             }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 044f583722..d0637be9f4 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -10,19 +10,21 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
-import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.entities.Units.*;
 import mindustry.entities.bullet.*;
+import mindustry.entities.pattern.*;
 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.blocks.*;
-import mindustry.world.consumers.*;
+import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -32,72 +34,121 @@ public class Turret extends ReloadTurret{
     public final static float logicControlCooldown = 60 * 2;
 
     public final int timerTarget = timers++;
-    public int targetInterval = 20;
+    /** Ticks between attempt at finding a target. */
+    public float targetInterval = 20;
+    /** Target interval for when this turret already has a valid target. -1 = targetInterval */
+    public float newTargetInterval = -1f;
 
-    public Color heatColor = Pal.turretHeat;
-    public Effect shootEffect = Fx.none;
-    public Effect smokeEffect = Fx.none;
-    public Effect ammoUseEffect = Fx.none;
-    public Sound shootSound = Sounds.shoot;
-
-    //general info
+    /** Maximum ammo units stored. */
     public int maxAmmo = 30;
+    /** Ammo units used per shot. */
     public int ammoPerShot = 1;
-    public float ammoEjectBack = 1f;
+    /** If true, ammo is only consumed once per shot regardless of bullet count. */
+    public boolean consumeAmmoOnce = true;
+    /** Minimum input heat required to fire. */
+    public float heatRequirement = -1f;
+    /** Maximum efficiency possible, if this turret uses heat. */
+    public float maxHeatEfficiency = 3f;
+
+    /** Bullet angle randomness in degrees. */
     public float inaccuracy = 0f;
-    public float velocityInaccuracy = 0f;
-    public int shots = 1;
-    public float spread = 4f;
-    public float recoilAmount = 1f;
-    public float restitution = 0.02f;
-    public float cooldown = 0.02f;
-    public float coolantUsage = 0.2f;
+    /** Fraction of bullet velocity that is random. */
+    public float velocityRnd = 0f;
+    /** Fraction of lifetime that is added to bullets with lifeScale. */
+    public float scaleLifetimeOffset = 0f;
+    /** Maximum angle difference in degrees at which turret will still try to shoot. */
     public float shootCone = 8f;
-    public float shootShake = 0f;
+    /** Turret shoot point. */
+    public float shootX = 0f, shootY = Float.NEGATIVE_INFINITY;
+    /** Random spread on the X axis. */
     public float xRand = 0f;
-    /** Currently used for artillery only. */
+    /** Range at which it finds and locks on to the target, but does not shoot. */
+    public float trackingRange = 0f;
+    /** Minimum bullet range. Used for artillery only. */
     public float minRange = 0f;
-    public float burstSpacing = 0;
-    public boolean alternate = false;
+    /** Minimum warmup needed to fire. */
+    public float minWarmup = 0f;
+    /** If true, this turret will accurately target moving targets with respect to shoot.firstShotDelay. */
+    public boolean accurateDelay = true;
+    /** If false, this turret can't move while charging. */
+    public boolean moveWhileCharging = true;
+    /** If false, this turret can't reload while charging */
+    public boolean reloadWhileCharging = true;
+    /** How long warmup is maintained even if this turret isn't shooting. */
+    public float warmupMaintainTime = 0f;
+    /** pattern used for bullets */
+    public ShootPattern shoot = new ShootPattern();
+
+    /** If true, this block targets air units. */
     public boolean targetAir = true;
+    /** If true, this block targets ground units and structures. */
     public boolean targetGround = true;
+    /** If true, this block targets blocks. */
+    public boolean targetBlocks = true;
+    /** If true, this block targets friend blocks, to heal them. */
+    public boolean targetHealing = false;
+    /** If true, this turret can be controlled by players. */
+    public boolean playerControllable = true;
+    /** If true, this block will display ammo multipliers in its stats (irrelevant for certain types of turrets). */
+    public boolean displayAmmoMultiplier = true;
+    /** If false, 'under' blocks like conveyors are not targeted. */
+    public boolean targetUnderBlocks = true;
+    /** If true, the turret will always shoot when it has ammo, regardless of targets in range or any control. */
+    public boolean alwaysShooting = false;
+    /** Whether this turret predicts unit movement. */
+    public boolean predictTarget = true;
+    /** Function for choosing which unit to target. */
+    public Sortf unitSort = UnitSorts.closest;
+    /** Filter for types of units to attack. */
+    public Boolf<Unit> unitFilter = u -> true;
+    /** Filter for types of buildings to attack. */
+    public Boolf<Building> buildingFilter = b -> targetUnderBlocks || !b.block.underBullets;
 
-    //charging
-    public float chargeTime = -1f;
-    public int chargeEffects = 5;
-    public float chargeMaxDelay = 10f;
-    public Effect chargeEffect = Fx.none;
-    public Effect chargeBeginEffect = Fx.none;
+    /** Color of heat region drawn on top (if found) */
+    public Color heatColor = Pal.turretHeat;
+    /** Optional override for all shoot effects. */
+    public @Nullable Effect shootEffect;
+    /** Optional override for all smoke effects. */
+    public @Nullable Effect smokeEffect;
+    /** Effect created when ammo is used. Not optional. */
+    public Effect ammoUseEffect = Fx.none;
+    /** Sound emitted when a single bullet is shot. */
+    public Sound shootSound = Sounds.shoot;
+    /** Sound emitted when shoot.firstShotDelay is >0 and shooting begins. */
     public Sound chargeSound = Sounds.none;
+    /** Range for pitch of shoot sound. */
+    public float soundPitchMin = 0.9f, soundPitchMax = 1.1f;
+    /** Backwards Y offset of ammo eject effect. */
+    public float ammoEjectBack = 1f;
+    /** Lerp speed of turret warmup. */
+    public float shootWarmupSpeed = 0.1f;
+    /** If true, turret warmup is linear instead of a curve. */
+    public boolean linearWarmup = false;
+    /** Visual amount by which the turret recoils back per shot. */
+    public float recoil = 1f;
+    /** Number of additional counters for recoil. */
+    public int recoils = -1;
+    /** ticks taken for turret to return to starting position in ticks. uses reload time by default  */
+    public float recoilTime = -1f;
+    /** power curve applied to visual recoil */
+    public float recoilPow = 1.8f;
+    /** ticks to cool down the heat region */
+    public float cooldownTime = 20f;
+    /** Visual elevation of turret shadow, -1 to use defaults. */
+    public float elevation = -1f;
+    /** How much the screen shakes per shot. */
+    public float shake = 0f;
 
-    public Sortf unitSort = Unit::dst2;
-
-    protected Vec2 tr = new Vec2();
-    protected Vec2 tr2 = new Vec2();
-
-    public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
-    public @Load("@-heat") TextureRegion heatRegion;
-
-    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);
-        Draw.blend();
-        Draw.color();
-    };
+    /** Defines drawing behavior for this turret. */
+    public DrawBlock drawer = new DrawTurret();
 
     public Turret(String name){
         super(name);
-        priority = TargetPriority.turret;
-        update = true;
-        solid = true;
-        group = BlockGroup.turrets;
-        flags = EnumSet.of(BlockFlag.turret);
-        outlineIcon = true;
         liquidCapacity = 20f;
+        quickRotate = false;
+        outlinedIcon = 1;
+        drawLiquidLight = false;
+        sync = true;
     }
 
     @Override
@@ -110,25 +161,59 @@ public class Turret extends ReloadTurret{
         super.setStats();
 
         stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees);
-        stats.add(Stat.reload, 60f / reloadTime * (alternate ? 1 : shots), StatUnit.none);
+        stats.add(Stat.reload, 60f / (reload + (!reloadWhileCharging ? shoot.firstShotDelay : 0f)) * shoot.shots, StatUnit.perSecond);
         stats.add(Stat.targetsAir, targetAir);
         stats.add(Stat.targetsGround, targetGround);
         if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);
+        if(heatRequirement > 0) stats.add(Stat.input, heatRequirement, StatUnit.heatUnits);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        if(heatRequirement > 0){
+            addBar("heat", (TurretBuild entity) ->
+            new Bar(() ->
+            Core.bundle.format("bar.heatpercent", (int)entity.heatReq, (int)(Math.min(entity.heatReq / heatRequirement, maxHeatEfficiency) * 100)),
+            () -> Pal.lightOrange,
+            () -> entity.heatReq / heatRequirement));
+        }
     }
 
     @Override
     public void init(){
-        if(acceptCoolant && !consumes.has(ConsumeType.liquid)){
-            hasLiquids = true;
-            consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, coolantUsage)).update(false).boost();
-        }
+        if(shootY == Float.NEGATIVE_INFINITY) shootY = size * tilesize / 2f;
+        if(elevation < 0) elevation = size / 2f;
+        if(recoilTime < 0f) recoilTime = reload;
+        if(cooldownTime < 0f) cooldownTime = reload;
+        if(newTargetInterval <= 0f) newTargetInterval = targetInterval;
 
         super.init();
+        trackingRange = Math.max(range, trackingRange);
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        drawer.load(this);
     }
 
     @Override
     public TextureRegion[] icons(){
-        return new TextureRegion[]{baseRegion, region};
+        return drawer.finalIcons(this);
+    }
+
+    @Override
+    public void getRegionsToOutline(Seq<TextureRegion> out){
+        drawer.getRegionsToOutline(this, out);
+    }
+
+    public void limitRange(BulletType bullet, float margin){
+        float realRange = bullet.rangeChange + range;
+        //doesn't handle drag
+        bullet.lifetime = (realRange + margin + bullet.extraRangeMargin) / bullet.speed;
     }
 
     public static abstract class AmmoEntry{
@@ -138,20 +223,64 @@ public class Turret extends ReloadTurret{
     }
 
     public class TurretBuild extends ReloadTurretBuild implements ControlBlock{
+        //TODO storing these as instance variables is horrible design
+        /** Turret sprite offset, based on recoil. Updated every frame. */
+        public Vec2 recoilOffset = new Vec2();
+
         public Seq<AmmoEntry> ammo = new Seq<>();
         public int totalAmmo;
-        public float recoil, heat, logicControlTime = -1;
-        public int shotCounter;
+        public float curRecoil, heat, logicControlTime = -1;
+        public @Nullable float[] curRecoils;
+        public float shootWarmup, charge, warmupHold = 0f;
+        public int totalShots, barrelCounter;
         public boolean logicShooting = false;
         public @Nullable Posc target;
         public Vec2 targetPos = new Vec2();
-        public BlockUnitc unit = Nulls.blockUnit;
-        public boolean wasShooting, charging;
+        public BlockUnitc unit = (BlockUnitc)UnitTypes.block.create(team);
+        public boolean wasShooting;
+        public int queuedBullets = 0;
+
+        public float heatReq;
+        public float[] sideHeat = new float[4];
+
+        float lastRangeChange;
 
         @Override
-        public void created(){
-            unit = (BlockUnitc)UnitTypes.block.create(team);
-            unit.tile(this);
+        public float estimateDps(){
+            if(!hasAmmo()) return 0f;
+            return shoot.shots / reload * 60f * (peekAmmo() == null ? 0f : peekAmmo().estimateDPS()) * potentialEfficiency * timeScale;
+        }
+
+        @Override
+        public float range(){
+            if(peekAmmo() != null){
+                return range + peekAmmo().rangeChange;
+            }
+            return range;
+        }
+
+        public float trackingRange(){
+            return range() + trackingRange - range;
+        }
+
+        @Override
+        public float warmup(){
+            return shootWarmup;
+        }
+
+        @Override
+        public float drawrot(){
+            return rotation - 90;
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return isShooting() || reloadCounter < reload;
+        }
+
+        @Override
+        public boolean canControl(){
+            return playerControllable;
         }
 
         @Override
@@ -167,12 +296,12 @@ public class Turret extends ReloadTurret{
 
         @Override
         public void control(LAccess type, Object p1, double p2, double p3, double p4){
-            if(type == LAccess.shootp && !unit.isPlayer()){
+            if(type == LAccess.shootp && (unit == null || !unit.isPlayer())){
                 logicControlTime = logicControlCooldown;
                 logicShooting = !Mathf.zero(p2);
 
-                if(p1 instanceof Posc){
-                    targetPosition((Posc)p1);
+                if(p1 instanceof Posc pos){
+                    targetPosition(pos);
                 }
             }
 
@@ -188,16 +317,30 @@ public class Turret extends ReloadTurret{
                 case shootX -> World.conv(targetPos.x);
                 case shootY -> World.conv(targetPos.y);
                 case shooting -> isShooting() ? 1 : 0;
+                case progress -> progress();
                 default -> super.sense(sensor);
             };
         }
 
+        @Override
+        public float fogRadius(){
+            return (range + (hasAmmo() ? peekAmmo().rangeChange : 0f)) / tilesize * fogRadiusMultiplier;
+        }
+
+        @Override
+        public float progress(){
+            return Mathf.clamp(reloadCounter / reload);
+        }
+
         public boolean isShooting(){
-            return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : target != null);
+            return alwaysShooting || (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : target != null);
         }
 
         @Override
         public Unit unit(){
+            //make sure stats are correct
+            unit.tile(this);
+            unit.team(team);
             return (Unit)unit;
         }
 
@@ -206,60 +349,98 @@ public class Turret extends ReloadTurret{
         }
 
         public boolean isActive(){
-            return target != null || wasShooting;
+            return (target != null || wasShooting) && enabled;
         }
 
         public void targetPosition(Posc pos){
-            if(!hasAmmo() || target == null) return;
+            if(!hasAmmo() || pos == null) return;
             BulletType bullet = peekAmmo();
-            float speed = bullet.speed;
-            //slow bullets never intersect
-            if(speed < 0.1f) speed = 9999999f;
 
-            targetPos.set(Predict.intercept(this, pos, speed));
+            var offset = Tmp.v1.setZero();
+
+            //when delay is accurate, assume unit has moved by chargeTime already
+            if(accurateDelay && !moveWhileCharging && pos instanceof Hitboxc h){
+                offset.set(h.deltaX(), h.deltaY()).scl(shoot.firstShotDelay / Time.delta);
+            }
+
+            if(predictTarget && bullet.speed >= 0.01f){
+                targetPos.set(Predict.intercept(this, pos, offset.x, offset.y, bullet.speed));
+            }else{
+                targetPos.set(pos);
+            }
+
             if(targetPos.isZero()){
-                targetPos.set(target);
+                targetPos.set(pos);
             }
         }
 
         @Override
         public void draw(){
-            Draw.rect(baseRegion, x, y);
-            Draw.color();
-
-            Draw.z(Layer.turret);
-
-            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")){
-                heatDrawer.get(this);
-            }
+            drawer.draw(this);
         }
 
         @Override
         public void updateTile(){
             if(!validateTarget()) target = null;
 
+            float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f;
+            if(warmupTarget > 0 && !isControlled()){
+                warmupHold = 1f;
+            }
+            if(warmupHold > 0f){
+                warmupHold -= Time.delta / warmupMaintainTime;
+                warmupTarget = 1f;
+            }
+
+            if(linearWarmup){
+                shootWarmup = Mathf.approachDelta(shootWarmup, warmupTarget, shootWarmupSpeed * (warmupTarget > 0 ? efficiency : 1f));
+            }else{
+                shootWarmup = Mathf.lerpDelta(shootWarmup, warmupTarget, shootWarmupSpeed * (warmupTarget > 0 ? efficiency : 1f));
+            }
+
             wasShooting = false;
 
-            recoil = Mathf.lerpDelta(recoil, 0f, restitution);
-            heat = Mathf.lerpDelta(heat, 0f, cooldown);
+            curRecoil = Mathf.approachDelta(curRecoil, 0, 1 / recoilTime);
+            if(recoils > 0){
+                if(curRecoils == null) curRecoils = new float[recoils];
+                for(int i = 0; i < recoils; i++){
+                    curRecoils[i] = Mathf.approachDelta(curRecoils[i], 0, 1 / recoilTime);
+                }
+            }
+            heat = Mathf.approachDelta(heat, 0, 1 / cooldownTime);
+            charge = charging() ? Mathf.approachDelta(charge, 1, 1 / shoot.firstShotDelay) : 0;
 
-            unit.health(health);
+            unit.tile(this);
             unit.rotation(rotation);
             unit.team(team);
-            unit.set(x, y);
+            recoilOffset.trns(rotation, -Mathf.pow(curRecoil, recoilPow) * recoil);
 
             if(logicControlTime > 0){
                 logicControlTime -= Time.delta;
             }
 
-            if(hasAmmo()){
+            if(heatRequirement > 0){
+                heatReq = calculateHeat(sideHeat);
+            }
 
-                if(timer(timerTarget, targetInterval)){
+            //turret always reloads regardless of whether it's targeting something
+            if(reloadWhileCharging || !charging()){
+                updateReload();
+                updateCooling();
+            }
+
+            if(state.rules.fog){
+                float newRange = hasAmmo() ? peekAmmo().rangeChange : 0f;
+                if(newRange != lastRangeChange){
+                    lastRangeChange = newRange;
+                    fogControl.forceUpdate(team, this);
+                }
+            }
+
+            if(hasAmmo()){
+                if(Float.isNaN(reloadCounter)) reloadCounter = 0;
+
+                if(timer(timerTarget, target != null ? newTargetInterval : targetInterval)){
                     findTarget();
                 }
 
@@ -274,9 +455,13 @@ public class Turret extends ReloadTurret{
                     }else{ //default AI behavior
                         targetPosition(target);
 
-                        if(Float.isNaN(rotation)){
-                            rotation = 0;
-                        }
+                        if(Float.isNaN(rotation)) rotation = 0;
+                        canShoot = within(target, range() + (target instanceof Sized hb ? hb.hitSize()/1.9f : 0f));
+                    }
+
+                    if(!isControlled()){
+                        unit.aimX(targetPos.x);
+                        unit.aimY(targetPos.y);
                     }
 
                     float targetRot = angleTo(targetPos);
@@ -285,21 +470,24 @@ public class Turret extends ReloadTurret{
                         turnToTarget(targetRot);
                     }
 
-                    if(Angles.angleDist(rotation, targetRot) < shootCone && canShoot){
+                    if(!alwaysShooting && Angles.angleDist(rotation, targetRot) < shootCone && canShoot){
                         wasShooting = true;
                         updateShooting();
                     }
+                }else{
+                    target = null;
                 }
-            }
 
-            if(acceptCoolant){
-                updateCooling();
+                if(alwaysShooting){
+                    wasShooting = true;
+                    updateShooting();
+                }
             }
         }
 
         @Override
         public void handleLiquid(Building source, Liquid liquid, float amount){
-            if(acceptCoolant && liquids.currentAmount() <= 0.001f){
+            if(coolant != null && liquids.currentAmount() <= 0.001f){
                 Events.fire(Trigger.turretCool);
             }
 
@@ -307,23 +495,52 @@ public class Turret extends ReloadTurret{
         }
 
         protected boolean validateTarget(){
-            return !Units.invalidateTarget(target, team, x, y) || isControlled() || logicControlled();
+            return !Units.invalidateTarget(target, canHeal() ? Team.derelict : team, x, y) || isControlled() || logicControlled();
+        }
+
+        protected boolean canHeal(){
+            return targetHealing && hasAmmo() && peekAmmo().collidesTeam && peekAmmo().heals();
+        }
+
+        protected Posc findEnemy(float range){
+            if(targetAir && !targetGround){
+                return Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded() && unitFilter.get(e), unitSort);
+            }else{
+                var ammo = peekAmmo();
+                boolean buildings = targetGround && targetBlocks && (ammo == null || ammo.targetBlocks), missiles = ammo == null || ammo.targetMissiles;
+                return Units.bestTarget(team, x, y, range,
+                    e -> !e.dead() && unitFilter.get(e) && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround) && (missiles || !(e instanceof TimedKillc)),
+                    b -> buildings && buildingFilter.get(b), unitSort);
+            }
         }
 
         protected void findTarget(){
-            if(targetAir && !targetGround){
-                target = Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded(), unitSort);
-            }else{
-                target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> true, unitSort);
+            float trackRange = trackingRange(), range = range();
+
+            target = findEnemy(range);
+            //find another target within the tracking range, but only if there's nothing else (always prioritize standard target)
+            if(!Mathf.equal(trackRange, range) && target == null){
+                target = findEnemy(trackRange);
+            }
+
+            if(target == null && canHeal()){
+                target = Units.findAllyTile(team, x, y, range, b -> b.damaged() && b != this);
             }
         }
 
         protected void turnToTarget(float targetRot){
-            rotation = Angles.moveToward(rotation, targetRot, rotateSpeed * delta() * baseReloadSpeed());
+            rotation = Angles.moveToward(rotation, targetRot, rotateSpeed * delta() * potentialEfficiency);
         }
 
         public boolean shouldTurn(){
-            return !charging;
+            return moveWhileCharging || !charging();
+        }
+
+        @Override
+        public void updateEfficiencyMultiplier(){
+            if(heatRequirement > 0){
+                efficiency *= Math.min(Math.max(heatReq / heatRequirement, cheating() ? 1f : 0f), maxHeatEfficiency);
+            }
         }
 
         /** Consume ammo and return a type. */
@@ -335,142 +552,146 @@ public class Turret extends ReloadTurret{
             if(entry.amount <= 0) ammo.pop();
             totalAmmo -= ammoPerShot;
             totalAmmo = Math.max(totalAmmo, 0);
-            ejectEffects();
             return entry.type();
         }
 
         /** @return the ammo type that will be returned if useAmmo is called. */
-        public BulletType peekAmmo(){
-            return ammo.peek().type();
+        public @Nullable BulletType peekAmmo(){
+            return ammo.size == 0 ? null : ammo.peek().type();
         }
 
-        /** @return  whether the turret has ammo. */
+        /** @return whether the turret has ammo. */
         public boolean hasAmmo(){
             //skip first entry if it has less than the required amount of ammo
-            if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot){
-                ammo.pop();
+            if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot && ammo.get(ammo.size - 2).amount >= ammoPerShot){
+                ammo.swap(ammo.size - 1, ammo.size - 2);
             }
-            return ammo.size > 0 && ammo.peek().amount >= ammoPerShot;
+
+            //used for "side-ammo" like gas in some turrets
+            if(!canConsume()) return false;
+
+            return ammo.size > 0 && (ammo.peek().amount >= ammoPerShot || cheating());
+        }
+
+        public boolean charging(){
+            return queuedBullets > 0 && shoot.firstShotDelay > 0;
+        }
+
+        protected void updateReload(){
+            reloadCounter += delta() * ammoReloadMultiplier() * baseReloadSpeed();
+
+            //cap reload for visual reasons
+            reloadCounter = Math.min(reloadCounter, reload);
+        }
+
+        @Override
+        protected float ammoReloadMultiplier(){
+            return hasAmmo() ? peekAmmo().reloadMultiplier : 1f;
         }
 
         protected void updateShooting(){
-            if(reload >= reloadTime){
+
+            if(reloadCounter >= reload && !charging() && shootWarmup >= minWarmup){
                 BulletType type = peekAmmo();
 
                 shoot(type);
 
-                reload = 0f;
-            }else{
-                reload += delta() * peekAmmo().reloadMultiplier * baseReloadSpeed();
+                reloadCounter %= reload;
             }
         }
 
         protected void shoot(BulletType type){
+            float
+            bulletX = x + Angles.trnsx(rotation - 90, shootX, shootY),
+            bulletY = y + Angles.trnsy(rotation - 90, shootX, shootY);
 
-            //when charging is enabled, use the charge shoot pattern
-            if(chargeTime > 0){
-                useAmmo();
+            if(shoot.firstShotDelay > 0){
+                chargeSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax));
+                type.chargeEffect.at(bulletX, bulletY, rotation);
+            }
 
-                tr.trns(rotation, size * tilesize / 2f);
-                chargeBeginEffect.at(x + tr.x, y + tr.y, rotation);
-                chargeSound.at(x + tr.x, y + tr.y, 1);
+            shoot.shoot(barrelCounter, (xOffset, yOffset, angle, delay, mover) -> {
+                queuedBullets++;
+                int barrel = barrelCounter;
 
-                for(int i = 0; i < chargeEffects; i++){
-                    Time.run(Mathf.random(chargeMaxDelay), () -> {
-                        if(!isValid()) return;
-                        tr.trns(rotation, size * tilesize / 2f);
-                        chargeEffect.at(x + tr.x, y + tr.y, rotation);
+                if(delay > 0f){
+                    Time.run(delay, () -> {
+                        //hack: make sure the barrel is the same as what it was when the bullet was queued to fire
+                        int prev = barrelCounter;
+                        barrelCounter = barrel;
+                        bullet(type, xOffset, yOffset, angle, mover);
+                        barrelCounter = prev;
                     });
-                }
-
-                charging = true;
-
-                Time.run(chargeTime, () -> {
-                    if(!isValid()) return;
-                    tr.trns(rotation, size * tilesize / 2f);
-                    recoil = recoilAmount;
-                    heat = 1f;
-                    bullet(type, rotation + Mathf.range(inaccuracy));
-                    effects();
-                    charging = false;
-                });
-
-                //when burst spacing is enabled, use the burst pattern
-            }else if(burstSpacing > 0.0001f){
-                for(int i = 0; i < shots; i++){
-                    Time.run(burstSpacing * i, () -> {
-                        if(!isValid() || !hasAmmo()) return;
-
-                        recoil = recoilAmount;
-
-                        tr.trns(rotation, size * tilesize / 2f, Mathf.range(xRand));
-                        bullet(type, rotation + Mathf.range(inaccuracy));
-                        effects();
-                        useAmmo();
-                        recoil = recoilAmount;
-                        heat = 1f;
-                    });
-                }
-
-            }else{
-                //otherwise, use the normal shot pattern(s)
-
-                if(alternate){
-                    float i = (shotCounter % shots) - (shots-1)/2f;
-
-                    tr.trns(rotation - 90, spread * i + Mathf.range(xRand), size * tilesize / 2f);
-                    bullet(type, rotation + Mathf.range(inaccuracy));
                 }else{
-                    tr.trns(rotation, size * tilesize / 2f, Mathf.range(xRand));
-
-                    for(int i = 0; i < shots; i++){
-                        bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (i - (int)(shots / 2f)) * spread);
-                    }
+                    bullet(type, xOffset, yOffset, angle, mover);
                 }
+            }, () -> barrelCounter++);
 
-                shotCounter++;
-
-                recoil = recoilAmount;
-                heat = 1f;
-                effects();
+            if(consumeAmmoOnce){
                 useAmmo();
             }
         }
 
-        protected void bullet(BulletType type, float angle){
-            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;
+        protected void bullet(BulletType type, float xOffset, float yOffset, float angleOffset, Mover mover){
+            queuedBullets --;
 
-            type.create(this, team, x + tr.x, y + tr.y, angle, 1f + Mathf.range(velocityInaccuracy), lifeScl);
-        }
+            if(dead || (!consumeAmmoOnce && !hasAmmo())) return;
 
-        protected void effects(){
-            Effect fshootEffect = shootEffect == Fx.none ? peekAmmo().shootEffect : shootEffect;
-            Effect fsmokeEffect = smokeEffect == Fx.none ? peekAmmo().smokeEffect : smokeEffect;
+            float
+            xSpread = Mathf.range(xRand),
+            bulletX = x + Angles.trnsx(rotation - 90, shootX + xOffset + xSpread, shootY + yOffset),
+            bulletY = y + Angles.trnsy(rotation - 90, shootX + xOffset + xSpread, shootY + yOffset),
+            shootAngle = rotation + angleOffset + Mathf.range(inaccuracy + type.inaccuracy);
 
-            fshootEffect.at(x + tr.x, y + tr.y, rotation);
-            fsmokeEffect.at(x + tr.x, y + tr.y, rotation);
-            shootSound.at(x + tr.x, y + tr.y, Mathf.random(0.9f, 1.1f));
+            float lifeScl = type.scaleLife ? Mathf.clamp((1 + scaleLifetimeOffset) * Mathf.dst(bulletX, bulletY, targetPos.x, targetPos.y) / type.range, minRange / type.range, range() / type.range) : 1f;
 
-            if(shootShake > 0){
-                Effect.shake(shootShake, shootShake, this);
+            //TODO aimX / aimY for multi shot turrets?
+            handleBullet(type.create(this, team, bulletX, bulletY, shootAngle, -1f, (1f - velocityRnd) + Mathf.random(velocityRnd), lifeScl, null, mover, targetPos.x, targetPos.y), xOffset, yOffset, shootAngle - rotation);
+
+            (shootEffect == null ? type.shootEffect : shootEffect).at(bulletX, bulletY, rotation + angleOffset, type.hitColor);
+            (smokeEffect == null ? type.smokeEffect : smokeEffect).at(bulletX, bulletY, rotation + angleOffset, type.hitColor);
+            shootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax));
+
+            ammoUseEffect.at(
+                x - Angles.trnsx(rotation, ammoEjectBack),
+                y - Angles.trnsy(rotation, ammoEjectBack),
+                rotation * Mathf.sign(xOffset)
+            );
+
+            if(shake > 0){
+                Effect.shake(shake, shake, this);
             }
 
-            recoil = recoilAmount;
+            curRecoil = 1f;
+            if(recoils > 0){
+                curRecoils[barrelCounter % recoils] = 1f;
+            }
+            heat = 1f;
+            totalShots++;
+
+            if(!consumeAmmoOnce){
+                useAmmo();
+            }
         }
 
-        protected void ejectEffects(){
-            if(!isValid()) return;
+        protected void handleBullet(@Nullable Bullet bullet, float offsetX, float offsetY, float angleOffset){
 
-            //alternate sides when using a double turret
-            float scl = (shots == 2 && alternate && shotCounter % 2 == 1 ? -1f : 1f);
+        }
 
-            ammoUseEffect.at(x - Angles.trnsx(rotation, ammoEjectBack), y - Angles.trnsy(rotation, ammoEjectBack), rotation * scl);
+        @Override
+        public float activeSoundVolume(){
+            return shootWarmup;
+        }
+
+        @Override
+        public boolean shouldActiveSound(){
+            return shootWarmup > 0.01f && loopSound != Sounds.none;
         }
 
         @Override
         public void write(Writes write){
             super.write(write);
-            write.f(reload);
+            write.f(reloadCounter);
             write.f(rotation);
         }
 
@@ -479,7 +700,7 @@ public class Turret extends ReloadTurret{
             super.read(read, revision);
 
             if(revision >= 1){
-                reload = read.f();
+                reloadCounter = read.f();
                 rotation = read.f();
             }
         }
@@ -488,5 +709,29 @@ public class Turret extends ReloadTurret{
         public byte version(){
             return 1;
         }
+
+        @Override
+        public void readSync(Reads read, byte revision){
+            //maintain rotation and reload when syncing so clients don't see turrets snapping around
+            float oldRot = rotation, oldReload = reloadCounter;
+
+            readAll(read, revision);
+
+            rotation = oldRot;
+            reloadCounter = oldReload;
+        }
+    }
+
+    public static class BulletEntry{
+        public Bullet bullet;
+        public float x, y, rotation, life;
+
+        public BulletEntry(Bullet bullet, float x, float y, float rotation, float life){
+            this.bullet = bullet;
+            this.x = x;
+            this.y = y;
+            this.rotation = rotation;
+            this.life = life;
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
index af7e2c985b..8c5d2f6e23 100644
--- a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.distribution;
 
+import arc.math.geom.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
@@ -8,6 +9,7 @@ public class ArmoredConveyor extends Conveyor{
 
     public ArmoredConveyor(String name){
         super(name);
+        noSideBlend = true;
     }
 
     @Override
@@ -16,6 +18,14 @@ public class ArmoredConveyor extends Conveyor{
             (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems);
     }
 
+    @Override
+    public boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
+        return Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
+            || ((!otherblock.rotatedOutput(otherx, othery, tile) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
+            Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) ||
+            (otherblock instanceof Conveyor && otherblock.rotatedOutput(otherx, othery, tile) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
+    }
+
     public class ArmoredConveyorBuild extends ConveyorBuild{
         @Override
         public boolean acceptItem(Building source, Item item){
diff --git a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
index a0eddc20c1..6fe8e90722 100644
--- a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
@@ -1,12 +1,11 @@
 package mindustry.world.blocks.distribution;
 
-import arc.math.*;
 import arc.util.io.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
-public class BufferedItemBridge extends ExtendingItemBridge{
+public class BufferedItemBridge extends ItemBridge{
     public final int timerAccept = timers++;
 
     public float speed = 40f;
@@ -19,7 +18,7 @@ public class BufferedItemBridge extends ExtendingItemBridge{
         canOverdrive = true;
     }
 
-    public class BufferedItemBridgeBuild extends ExtendingItemBridgeBuild{
+    public class BufferedItemBridgeBuild extends ItemBridgeBuild{
         ItemBuffer buffer = new ItemBuffer(bufferCapacity);
 
         @Override
@@ -30,14 +29,17 @@ public class BufferedItemBridge extends ExtendingItemBridge{
 
             Item item = buffer.poll(speed / timeScale);
             if(timer(timerAccept, 4 / timeScale) && item != null && other.acceptItem(this, item)){
-                cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
+                moved = true;
                 other.handleItem(this, item);
                 buffer.remove();
-            }else{
-                cycleSpeed = Mathf.lerpDelta(cycleSpeed, 0f, 0.008f);
             }
         }
 
+        @Override
+        public void doDump(){
+            dump();
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index f21f4fbad2..cf1ab20889 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -9,11 +9,13 @@ 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.*;
+import mindustry.input.*;
+import mindustry.logic.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.meta.*;
@@ -22,15 +24,15 @@ import static mindustry.Vars.*;
 
 public class Conveyor extends Block implements Autotiler{
     private static final float itemSpace = 0.4f;
-    private static final int capacity = 4;
-
-    final Vec2 tr1 = new Vec2();
-    final Vec2 tr2 = new Vec2();
+    private static final int capacity = 3;
 
     public @Load(value = "@-#1-#2", lengths = {7, 4}) TextureRegion[][] regions;
 
     public float speed = 0f;
     public float displayedSpeed = 0f;
+    public boolean pushUnits = true;
+
+    public @Nullable Block junctionReplacement, bridgeReplacement;
 
     public Conveyor(String name){
         super(name);
@@ -38,8 +40,10 @@ public class Conveyor extends Block implements Autotiler{
         update = true;
         group = BlockGroup.transportation;
         hasItems = true;
-        itemCapacity = 4;
+        itemCapacity = capacity;
+        priority = TargetPriority.transport;
         conveyorPlacement = true;
+        underBullets = true;
 
         ambientSound = Sounds.conveyor;
         ambientSoundVolume = 0.0022f;
@@ -56,13 +60,21 @@ public class Conveyor extends Block implements Autotiler{
     }
 
     @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        int[] bits = getTiling(req, list);
+    public void init(){
+        super.init();
+
+        if(junctionReplacement == null) junctionReplacement = Blocks.junction;
+        if(bridgeReplacement == null || !(bridgeReplacement instanceof ItemBridge)) bridgeReplacement = Blocks.itemBridge;
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        int[] bits = getTiling(plan, list);
 
         if(bits == null) return;
 
         TextureRegion region = regions[bits[0]][0];
-        Draw.rect(region, req.drawx(), req.drawy(), region.width * bits[1] * Draw.scl, region.height * bits[2] * Draw.scl, req.rotation * 90);
+        Draw.rect(region, plan.drawx(), plan.drawy(), region.width * bits[1] * region.scl(), region.height * bits[2] * region.scl(), plan.rotation * 90);
     }
 
     @Override
@@ -71,6 +83,19 @@ public class Conveyor extends Block implements Autotiler{
             && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
     }
 
+    //stack conveyors should be bridged over, not replaced
+    @Override
+    public boolean canReplace(Block other){
+        return super.canReplace(other) && !(other instanceof StackConveyor);
+    }
+
+    @Override
+    public void handlePlacementLine(Seq<BuildPlan> plans){
+        if(bridgeReplacement == null) return;
+
+        Placement.calculateBridges(plans, (ItemBridge)bridgeReplacement, b -> b instanceof Conveyor);
+    }
+
     @Override
     public TextureRegion[] icons(){
         return new TextureRegion[]{regions[0][0]};
@@ -82,20 +107,21 @@ public class Conveyor extends Block implements Autotiler{
     }
 
     @Override
-    public Block getReplacement(BuildPlan req, Seq<BuildPlan> requests){
-        Boolf<Point2> cont = p -> requests.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && o.rotation == req.rotation && (req.block instanceof Conveyor || req.block instanceof Junction));
+    public Block getReplacement(BuildPlan req, Seq<BuildPlan> plans){
+        if(junctionReplacement == null) return this;
+
+        Boolf<Point2> cont = p -> plans.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && (req.block instanceof Conveyor || req.block instanceof Junction));
         return cont.get(Geometry.d4(req.rotation)) &&
             cont.get(Geometry.d4(req.rotation - 2)) &&
             req.tile() != null &&
             req.tile().block() instanceof Conveyor &&
-            Mathf.mod(req.tile().build.rotation - req.rotation, 2) == 1 ? Blocks.junction : this;
+            Mathf.mod(req.tile().build.rotation - req.rotation, 2) == 1 ? junctionReplacement : this;
     }
 
     public class ConveyorBuild extends Building implements ChainedBuilding{
         //parallel array data
         public Item[] ids = new Item[capacity];
-        public float[] xs = new float[capacity];
-        public float[] ys = new float[capacity];
+        public float[] xs = new float[capacity], ys = new float[capacity];
         //amount of items, always < capacity
         public int len = 0;
         //next entity
@@ -108,13 +134,13 @@ public class Conveyor extends Block implements Autotiler{
         public float minitem = 1;
 
         public int blendbits, blending;
-        public int blendsclx, blendscly;
+        public int blendsclx = 1, blendscly = 1;
 
         public float clogHeat = 0f;
 
         @Override
         public void draw(){
-            int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time * speed * 8f * timeScale())) % 4) : 0;
+            int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time * speed * 8f * timeScale * efficiency)) % 4) : 0;
 
             //draw extra conveyors facing this one for non-square tiling purposes
             Draw.z(Layer.blockUnder);
@@ -127,24 +153,39 @@ public class Conveyor extends Block implements Autotiler{
                 }
             }
 
-            Draw.z(Layer.block);
+            Draw.z(Layer.block - 0.2f);
 
             Draw.rect(regions[blendbits][frame], x, y, tilesize * blendsclx, tilesize * blendscly, rotation * 90);
 
-            Draw.z(Layer.blockOver);
+            Draw.z(Layer.block - 0.1f);
+            float layer = Layer.block - 0.1f, wwidth = world.unitWidth(), wheight = world.unitHeight(), scaling = 0.01f;
 
             for(int i = 0; i < len; i++){
                 Item item = ids[i];
-                tr1.trns(rotation * 90, tilesize, 0);
-                tr2.trns(rotation * 90, -tilesize / 2f, xs[i] * tilesize / 2f);
+                Tmp.v1.trns(rotation * 90, tilesize, 0);
+                Tmp.v2.trns(rotation * 90, -tilesize / 2f, xs[i] * tilesize / 2f);
 
-                Draw.rect(item.icon(Cicon.medium),
-                    (tile.x * tilesize + tr1.x * ys[i] + tr2.x),
-                    (tile.y * tilesize + tr1.y * ys[i] + tr2.y),
-                    itemSize, itemSize);
+                float
+                ix = (x + Tmp.v1.x * ys[i] + Tmp.v2.x),
+                iy = (y + Tmp.v1.y * ys[i] + Tmp.v2.y);
+
+                //keep draw position deterministic.
+                Draw.z(layer + (ix / wwidth + iy / wheight) * scaling);
+                Draw.rect(item.fullIcon, ix, iy, itemSize, itemSize);
             }
         }
 
+        @Override
+        public void payloadDraw(){
+            Draw.rect(block.fullIcon, x, y);
+        }
+
+        @Override
+        public void drawCracks(){
+            Draw.z(Layer.block - 0.15f);
+            super.drawCracks();
+        }
+
         @Override
         public void overwrote(Seq<Building> builds){
             if(builds.first() instanceof ConveyorBuild build){
@@ -183,7 +224,7 @@ public class Conveyor extends Block implements Autotiler{
         @Override
         public void unitOn(Unit unit){
 
-            if(clogHeat > 0.5f || !enabled) return;
+            if(!pushUnits || clogHeat > 0.5f || !enabled) return;
 
             noSleep();
 
@@ -213,7 +254,7 @@ public class Conveyor extends Block implements Autotiler{
             mid = 0;
 
             //skip updates if possible
-            if(len == 0){
+            if(len == 0 && Mathf.equal(timeScale, 1f)){
                 clogHeat = 0f;
                 sleep();
                 return;
@@ -230,7 +271,7 @@ public class Conveyor extends Block implements Autotiler{
 
                 if(ys[i] > nextMax) ys[i] = nextMax;
                 if(ys[i] > 0.5 && i > 0) mid = i - 1;
-                xs[i] = Mathf.approachDelta(xs[i], 0, speed*2);
+                xs[i] = Mathf.approach(xs[i], 0, moved*2);
 
                 if(ys[i] >= 1f && pass(ids[i])){
                     //align X position if passing forwards
@@ -246,7 +287,7 @@ public class Conveyor extends Block implements Autotiler{
             }
 
             if(minitem < itemSpace + (blendbits == 1 ? 0.3f : 0f)){
-                clogHeat = Mathf.lerpDelta(clogHeat, 1f, 0.02f);
+                clogHeat = Mathf.approachDelta(clogHeat, 1f, 1f / 60f);
             }else{
                 clogHeat = 0f;
             }
@@ -293,7 +334,7 @@ public class Conveyor extends Block implements Autotiler{
 
         @Override
         public void handleStack(Item item, int amount, Teamc source){
-            amount = Math.min(amount, itemCapacity - len);
+            amount = Math.min(amount, capacity - len);
 
             for(int i = amount - 1; i >= 0; i--){
                 add(0);
@@ -310,6 +351,7 @@ public class Conveyor extends Block implements Autotiler{
         public boolean acceptItem(Building source, Item item){
             if(len >= capacity) return false;
             Tile facing = Edges.getFacingEdge(source.tile, tile);
+            if(facing == null) return false;
             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 && next == source);
         }
@@ -339,13 +381,20 @@ public class Conveyor extends Block implements Autotiler{
             }
         }
 
+        @Override
+        public byte version(){
+            return 1;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
             write.i(len);
 
             for(int i = 0; i < len; i++){
-                write.i(Pack.intBytes((byte)ids[i].id, (byte)(xs[i] * 127), (byte)(ys[i] * 255 - 128), (byte)0));
+                write.s(ids[i].id);
+                write.b((byte)(xs[i] * 127));
+                write.b((byte)(ys[i] * 255 - 128));
             }
         }
 
@@ -356,10 +405,20 @@ public class Conveyor extends Block implements Autotiler{
             len = Math.min(amount, capacity);
 
             for(int i = 0; i < amount; i++){
-                int val = read.i();
-                short id = (short)(((byte)(val >> 24)) & 0xff);
-                float x = (float)((byte)(val >> 16)) / 127f;
-                float y = ((float)((byte)(val >> 8)) + 128f) / 255f;
+                short id;
+                float x, y;
+
+                if(revision == 0){
+                    int val = read.i();
+                    id = (short)(((byte)(val >> 24)) & 0xff);
+                    x = (float)((byte)(val >> 16)) / 127f;
+                    y = ((float)((byte)(val >> 8)) + 128f) / 255f;
+                }else{
+                    id = read.s();
+                    x = (float)read.b() / 127f;
+                    y = ((float)read.b() + 128f) / 255f;
+                }
+
                 if(i < capacity){
                     ids[i] = content.item(id);
                     xs[i] = x;
@@ -371,6 +430,11 @@ public class Conveyor extends Block implements Autotiler{
             updateTile();
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            if(sensor == LAccess.firstItem && len > 0) return ids[len - 1];
+            return super.senseObject(sensor);
+        }
 
         public final void add(int o){
             for(int i = Math.max(o + 1, len); i > o; i--){
diff --git a/core/src/mindustry/world/blocks/distribution/DirectionBridge.java b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
new file mode 100644
index 0000000000..2c0077cc99
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
@@ -0,0 +1,219 @@
+package mindustry.world.blocks.distribution;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.core.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.input.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class DirectionBridge extends Block{
+    private static BuildPlan otherReq;
+    private int otherDst = 0;
+
+    public @Load("@-bridge") TextureRegion bridgeRegion;
+    public @Load("@-bridge-bottom") TextureRegion bridgeBotRegion;
+    public @Load("@-bridge-liquid") TextureRegion bridgeLiquidRegion;
+    public @Load("@-arrow") TextureRegion arrowRegion;
+    public @Load("@-dir") TextureRegion dirRegion;
+
+    public int range = 4;
+
+    public DirectionBridge(String name){
+        super(name);
+        update = true;
+        solid = true;
+        rotate = true;
+        group = BlockGroup.transportation;
+        noUpdateDisabled = true;
+        priority = TargetPriority.transport;
+        envEnabled = Env.space | Env.terrestrial | Env.underwater;
+        drawArrow = false;
+        allowDiagonal = false;
+        regionRotated1 = 1;
+    }
+
+    @Override
+    public void init(){
+        updateClipRadius((range + 0.5f) * tilesize);
+        super.init();
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(dirRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+    }
+
+    @Override
+    public void drawPlanConfigTop(BuildPlan plan, Eachable<BuildPlan> list){
+        otherReq = null;
+        otherDst = range;
+        Point2 d = Geometry.d4(plan.rotation);
+        list.each(other -> {
+            if(other.block == this && plan != other && Mathf.clamp(other.x - plan.x, -1, 1) == d.x && Mathf.clamp(other.y - plan.y, -1, 1) == d.y){
+                int dst = Math.max(Math.abs(other.x - plan.x), Math.abs(other.y - plan.y));
+                if(dst <= otherDst){
+                    otherReq = other;
+                    otherDst = dst;
+                }
+            }
+        });
+
+        if(otherReq != null){
+            drawBridge(plan.rotation, plan.drawx(), plan.drawy(), otherReq.drawx(), otherReq.drawy(), null);
+        }
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, dirRegion};
+    }
+
+    @Override
+    public void changePlacementPath(Seq<Point2> points, int rotation){
+        Placement.calculateNodes(points, this, rotation, (point, other) -> Math.max(Math.abs(point.x - other.x), Math.abs(point.y - other.y)) <= range);
+    }
+
+    public void drawPlace(int x, int y, int rotation, boolean valid, boolean line){
+        int length = range;
+        Building found = null;
+        int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation);
+
+        //find the link
+        for(int i = 1; i <= range; i++){
+            Tile other = world.tile(x + dx * i, y + dy * i);
+
+            if(other != null && other.build instanceof DirectionBridgeBuild build && build.block == this && build.team == player.team()){
+                length = i;
+                found = other.build;
+                break;
+            }
+        }
+
+        if(line || found != null){
+            Drawf.dashLine(Pal.placing,
+            x * tilesize + dx * (tilesize / 2f + 2),
+            y * tilesize + dy * (tilesize / 2f + 2),
+            x * tilesize + dx * (length) * tilesize,
+            y * tilesize + dy * (length) * tilesize
+            );
+        }
+
+        if(found != null){
+            if(line){
+                Drawf.square(found.x, found.y, found.block.size * tilesize/2f + 2.5f, 0f);
+            }else{
+                Drawf.square(found.x, found.y, 2f);
+            }
+        }
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        drawPlace(x, y, rotation, valid, true);
+    }
+
+    public void drawBridge(int rotation, float x1, float y1, float x2, float y2, @Nullable Color liquidColor){
+        Draw.alpha(Renderer.bridgeOpacity);
+        float
+        angle = Angles.angle(x1, y1, x2, y2),
+        cx = (x1 + x2)/2f,
+        cy = (y1 + y2)/2f,
+        len = Math.max(Math.abs(x1 - x2), Math.abs(y1 - y2)) - size * tilesize;
+
+        Draw.rect(bridgeRegion, cx, cy, len, bridgeRegion.height * bridgeRegion.scl(), angle);
+        if(liquidColor != null){
+            Draw.color(liquidColor, liquidColor.a * Renderer.bridgeOpacity);
+            Draw.rect(bridgeLiquidRegion, cx, cy, len, bridgeLiquidRegion.height * bridgeLiquidRegion.scl(), angle);
+            Draw.color();
+            Draw.alpha(Renderer.bridgeOpacity);
+        }
+        if(bridgeBotRegion.found()){
+            Draw.color(0.4f, 0.4f, 0.4f, 0.4f * Renderer.bridgeOpacity);
+            Draw.rect(bridgeBotRegion, cx, cy, len, bridgeBotRegion.height * bridgeBotRegion.scl(), angle);
+            Draw.reset();
+        }
+        Draw.alpha(Renderer.bridgeOpacity);
+
+        for(float i = 6f; i <= len + size * tilesize - 5f; i += 5f){
+            Draw.rect(arrowRegion, x1 + Geometry.d4x(rotation) * i, y1 + Geometry.d4y(rotation) * i, angle);
+        }
+
+        Draw.reset();
+    }
+
+    public boolean positionsValid(int x1, int y1, int x2, int y2){
+        if(x1 == x2){
+            return Math.abs(y1 - y2) <= range;
+        }else if(y1 == y2){
+            return Math.abs(x1 - x2) <= range;
+        }else{
+            return false;
+        }
+    }
+
+    public class DirectionBridgeBuild extends Building{
+        public DirectionBridgeBuild[] occupied = new DirectionBridgeBuild[4];
+        public @Nullable DirectionBridgeBuild lastLink;
+
+        @Override
+        public void draw(){
+            Draw.rect(block.region, x, y);
+            Draw.rect(dirRegion, x, y, rotdeg());
+            var link = findLink();
+            if(link != null){
+                Draw.z(Layer.power - 1);
+                drawBridge(rotation, x, y, link.x, link.y, null);
+            }
+        }
+
+        @Override
+        public void drawSelect(){
+            drawPlace(tile.x, tile.y, rotation, true, false);
+            //draw incoming bridges
+            for(int dir = 0; dir < 4; dir++){
+                if(dir != rotation){
+                    int dx = Geometry.d4x(dir), dy = Geometry.d4y(dir);
+                    Building found = occupied[(dir + 2) % 4];
+
+                    if(found != null){
+                        int length = Math.max(Math.abs(found.tileX() - tileX()), Math.abs(found.tileY() - tileY()));
+                        Drawf.dashLine(Pal.place,
+                        found.x - dx * (tilesize / 2f + 2),
+                        found.y - dy * (tilesize / 2f + 2),
+                        found.x - dx * (length) * tilesize,
+                        found.y - dy * (length) * tilesize
+                        );
+
+                        Drawf.square(found.x, found.y, 2f, 45f, Pal.place);
+                    }
+                }
+            }
+        }
+
+        @Nullable
+        public DirectionBridgeBuild findLink(){
+            for(int i = 1; i <= range; i++){
+                Tile other = tile.nearby(Geometry.d4x(rotation) * i, Geometry.d4y(rotation) * i);
+                if(other != null && other.build instanceof DirectionBridgeBuild build && build.block == DirectionBridge.this && build.team == team){
+                    return build;
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/DirectionLiquidBridge.java b/core/src/mindustry/world/blocks/distribution/DirectionLiquidBridge.java
new file mode 100644
index 0000000000..05d4f038e1
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/DirectionLiquidBridge.java
@@ -0,0 +1,91 @@
+package mindustry.world.blocks.distribution;
+
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.blocks.liquid.*;
+import mindustry.world.meta.*;
+
+public class DirectionLiquidBridge extends DirectionBridge{
+    public final int timerFlow = timers++;
+
+    public float speed = 5f;
+    public float liquidPadding = 1f;
+
+    public @Load("@-bottom") TextureRegion bottomRegion;
+
+    public DirectionLiquidBridge(String name){
+        super(name);
+
+        outputsLiquid = true;
+        group = BlockGroup.liquids;
+        canOverdrive = false;
+        liquidCapacity = 20f;
+        hasLiquids = true;
+    }
+
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{bottomRegion, region, dirRegion};
+    }
+
+    public class DuctBridgeBuild extends DirectionBridgeBuild{
+
+        @Override
+        public void draw(){
+            Draw.rect(bottomRegion, x, y);
+
+            if(liquids.currentAmount() > 0.001f){
+                LiquidBlock.drawTiledFrames(size, x, y, liquidPadding, liquids.current(), liquids.currentAmount() / liquidCapacity);
+            }
+
+            Draw.rect(block.region, x, y);
+
+            Draw.rect(dirRegion, x, y, rotdeg());
+            var link = findLink();
+            if(link != null){
+                Draw.z(Layer.power - 1);
+                drawBridge(rotation, x, y, link.x, link.y, Tmp.c1.set(liquids.current().color).a(liquids.currentAmount() / liquidCapacity * liquids.current().color.a));
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            var link = lastLink = findLink();
+            if(link != null){
+                moveLiquid(link, liquids.current());
+                link.occupied[rotation % 4] = this;
+            }
+
+            if(link == null){
+                if(liquids.currentAmount() > 0.0001f && timer(timerFlow, 1)){
+                    moveLiquidForward(false, liquids.current());
+                }
+            }
+
+            for(int i = 0; i < 4; i++){
+                if(occupied[i] == null || occupied[i].rotation != i || !occupied[i].isValid() || occupied[i].lastLink != this){
+                    occupied[i] = null;
+                }
+            }
+        }
+
+        @Override
+        public boolean acceptLiquid(Building source, Liquid liquid){
+            var link = findLink();
+            //only accept if there's an output point, or it comes from a link
+            if(link == null && !(source instanceof DirectionBridgeBuild b && b.findLink() == this)) return false;
+
+            int rel = this.relativeToEdge(source.tile);
+
+            return
+                hasLiquids && team == source.team &&
+                (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f) && rel != rotation &&
+                (occupied[(rel + 2) % 4] == null || occupied[(rel + 2) % 4] == source);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/DirectionalUnloader.java b/core/src/mindustry/world/blocks/distribution/DirectionalUnloader.java
new file mode 100644
index 0000000000..92ccae0e11
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/DirectionalUnloader.java
@@ -0,0 +1,156 @@
+package mindustry.world.blocks.distribution;
+
+import arc.graphics.g2d.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
+import mindustry.world.blocks.storage.StorageBlock.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class DirectionalUnloader extends Block{
+    public @Load(value = "@-center", fallback = "unloader-center") TextureRegion centerRegion;
+    public @Load("@-top") TextureRegion topRegion;
+    public @Load("@-arrow") TextureRegion arrowRegion;
+
+    public float speed = 1f;
+    public boolean allowCoreUnload = false;
+
+    public DirectionalUnloader(String name){
+        super(name);
+
+        group = BlockGroup.transportation;
+        update = true;
+        solid = true;
+        hasItems = true;
+        configurable = true;
+        saveConfig = true;
+        rotate = true;
+        itemCapacity = 0;
+        noUpdateDisabled = true;
+        unloadable = false;
+        isDuct = true;
+        envDisabled = Env.none;
+        clearOnDoubleTap = true;
+        priority = TargetPriority.transport;
+
+        config(Item.class, (DirectionalUnloaderBuild tile, Item item) -> tile.unloadItem = item);
+        configClear((DirectionalUnloaderBuild tile) -> tile.unloadItem = null);
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+        stats.add(Stat.speed, 60f / speed, StatUnit.itemsSecond);
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        drawPlanConfig(plan, list);
+    }
+
+    @Override
+    public void drawPlanConfig(BuildPlan plan, Eachable<BuildPlan> list){
+        drawPlanConfigCenter(plan, plan.config, "duct-unloader-center");
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+        removeBar("items");
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion, arrowRegion};
+    }
+
+    public class DirectionalUnloaderBuild extends Building{
+        public float unloadTimer = 0f;
+        public Item unloadItem = null;
+        public int offset = 0;
+
+        @Override
+        public void updateTile(){
+            if((unloadTimer += edelta()) >= speed){
+                Building front = front(), back = back();
+
+                if(front != null && back != null && back.items != null && front.team == team && back.team == team && back.canUnload() && (allowCoreUnload || !(back instanceof CoreBuild || (back instanceof StorageBuild sb && sb.linkedCore != null)))){
+                    if(unloadItem == null){
+                        var itemseq = content.items();
+                        int itemc = itemseq.size;
+                        for(int i = 0; i < itemc; i++){
+                            Item item = itemseq.get((i + offset) % itemc);
+                            if(back.items.has(item) && front.acceptItem(this, item)){
+                                front.handleItem(this, item);
+                                back.items.remove(item, 1);
+                                back.itemTaken(item);
+                                offset ++;
+                                offset %= itemc;
+                                break;
+                            }
+                        }
+                    }else if(back.items.has(unloadItem) && front.acceptItem(this, unloadItem)){
+                        front.handleItem(this, unloadItem);
+                        back.items.remove(unloadItem, 1);
+                        back.itemTaken(unloadItem);
+                    }
+                }
+
+                unloadTimer %= speed;
+            }
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            Draw.rect(topRegion, x, y, rotdeg());
+
+            if(unloadItem != null){
+                Draw.color(unloadItem.color);
+                Draw.rect(centerRegion, x, y);
+                Draw.color();
+            }else{
+                Draw.rect(arrowRegion, x, y, rotdeg());
+            }
+
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            ItemSelection.buildTable(DirectionalUnloader.this, table, content.items(), () -> unloadItem, this::configure);
+        }
+
+        @Override
+        public Item config(){
+            return unloadItem;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.s(unloadItem == null ? -1 : unloadItem.id);
+            write.s(offset);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            int id = read.s();
+            unloadItem = id == -1 ? null : content.items().get(id);
+            offset = read.s();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/Duct.java b/core/src/mindustry/world/blocks/distribution/Duct.java
new file mode 100644
index 0000000000..dacd3a8b8e
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/Duct.java
@@ -0,0 +1,252 @@
+package mindustry.world.blocks.distribution;
+
+import arc.*;
+import arc.graphics.*;
+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.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.input.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class Duct extends Block implements Autotiler{
+    public float speed = 5f;
+    public boolean armored = false;
+    public Color transparentColor = new Color(0.4f, 0.4f, 0.4f, 0.1f);
+
+    public @Load(value = "@-top-#", length = 5) TextureRegion[] topRegions;
+    public @Load(value = "@-bottom-#", length = 5, fallback = "duct-bottom-#") TextureRegion[] botRegions;
+
+    public @Nullable Block bridgeReplacement;
+
+    public Duct(String name){
+        super(name);
+
+        group = BlockGroup.transportation;
+        update = true;
+        solid = false;
+        hasItems = true;
+        conveyorPlacement = true;
+        unloadable = false;
+        itemCapacity = 1;
+        noUpdateDisabled = true;
+        underBullets = true;
+        rotate = true;
+        noSideBlend = true;
+        isDuct = true;
+        priority = TargetPriority.transport;
+        envEnabled = Env.space | Env.terrestrial | Env.underwater;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.itemsMoved, 60f / speed, StatUnit.itemsSecond);
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        if(bridgeReplacement == null || !(bridgeReplacement instanceof DuctBridge)) bridgeReplacement = Blocks.ductBridge;
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        int[] bits = getTiling(plan, list);
+
+        if(bits == null) return;
+
+        Draw.scl(bits[1], bits[2]);
+        Draw.alpha(0.5f);
+        Draw.rect(botRegions[bits[0]], plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.color();
+        Draw.rect(topRegions[bits[0]], plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.scl();
+    }
+
+    @Override
+    public boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
+        return Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
+            || ((!otherblock.rotatedOutput(otherx, othery, tile) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
+            Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) ||
+
+            ((otherblock.rotatedOutput(otherx, othery, tile)) && (otherblock.isDuct) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
+    }
+
+    @Override
+    public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
+        if(!armored){
+            return (otherblock.outputsItems() || (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems))
+            && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
+        }else{
+            return (otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) || (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems);
+        }
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{Core.atlas.find("duct-bottom"), topRegions[0]};
+    }
+
+    @Override
+    public void handlePlacementLine(Seq<BuildPlan> plans){
+        if(bridgeReplacement == null) return;
+
+        Placement.calculateBridges(plans, (DuctBridge)bridgeReplacement, false, b -> b instanceof Duct || b instanceof StackConveyor || b instanceof Conveyor);
+    }
+
+    public class DuctBuild extends Building{
+        public float progress;
+        public @Nullable Item current;
+        public int recDir = 0;
+        public int blendbits, xscl, yscl, blending;
+        public @Nullable Building next;
+        public @Nullable DuctBuild nextc;
+
+        @Override
+        public void draw(){
+            float rotation = rotdeg();
+            int r = this.rotation;
+
+            //draw extra ducts facing this one for tiling purposes
+            for(int i = 0; i < 4; i++){
+                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 ? SliceMode.bottom : SliceMode.top);
+                }
+            }
+
+            //draw item
+            if(current != null){
+                Draw.z(Layer.blockUnder + 0.1f);
+                Tmp.v1.set(Geometry.d4x(recDir) * tilesize / 2f, Geometry.d4y(recDir) * tilesize / 2f)
+                .lerp(Geometry.d4x(r) * tilesize / 2f, Geometry.d4y(r) * tilesize / 2f,
+                Mathf.clamp((progress + 1f) / 2f));
+
+                Draw.rect(current.fullIcon, x + Tmp.v1.x, y + Tmp.v1.y, itemSize, itemSize);
+            }
+
+            Draw.scl(xscl, yscl);
+            drawAt(x, y, blendbits, rotation, SliceMode.none);
+            Draw.reset();
+        }
+
+        @Override
+        public void payloadDraw(){
+            Draw.rect(fullIcon, x, y);
+        }
+
+        protected void drawAt(float x, float y, int bits, float rotation, SliceMode slice){
+            Draw.z(Layer.blockUnder);
+            Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
+
+            Draw.z(Layer.blockUnder + 0.2f);
+            Draw.color(transparentColor);
+            Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
+            Draw.color();
+            Draw.rect(sliced(topRegions[bits], slice), x, y, rotation);
+        }
+
+        @Override
+        public void updateTile(){
+            progress += edelta() / speed * 2f;
+
+            if(current != null && next != null){
+                if(progress >= (1f - 1f/speed) && moveForward(current)){
+                    items.remove(current, 1);
+                    current = null;
+                    progress %= (1f - 1f/speed);
+                }
+            }else{
+                progress = 0;
+            }
+
+            if(current == null && items.total() > 0){
+                current = items.first();
+            }
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return current == null && items.total() == 0 &&
+                (armored ?
+                    //armored acceptance
+                    ((source.block.rotate && source.front() == this && source.block.hasItems && source.block.isDuct) ||
+                    Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation) :
+                    //standard acceptance - do not accept from front
+                    !(source.block.rotate && next == source) && Edges.getFacingEdge(source.tile, tile) != null && Math.abs(Edges.getFacingEdge(source.tile, tile).relativeTo(tile.x, tile.y) - rotation) != 2
+                );
+        }
+
+        @Override
+        public int removeStack(Item item, int amount){
+            int removed = super.removeStack(item, amount);
+            if(item == current) current = null;
+            return removed;
+        }
+
+        @Override
+        public void handleStack(Item item, int amount, Teamc source){
+            super.handleStack(item, amount, source);
+            current = item;
+        }
+
+        @Override
+        public void handleItem(Building source, Item item){
+            current = item;
+            progress = -1f;
+            recDir = relativeToEdge(source.tile);
+            items.add(item, 1);
+            noSleep();
+        }
+
+        @Override
+        public void onProximityUpdate(){
+            super.onProximityUpdate();
+
+            int[] bits = buildBlending(tile, rotation, null, true);
+            blendbits = bits[0];
+            xscl = bits[1];
+            yscl = bits[2];
+            blending = bits[4];
+            next = front();
+            nextc = next instanceof DuctBuild d ? d : null;
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.b(recDir);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                recDir = read.b();
+            }
+            current = items.first();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/DuctBridge.java b/core/src/mindustry/world/blocks/distribution/DuctBridge.java
new file mode 100644
index 0000000000..68bc9de946
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/DuctBridge.java
@@ -0,0 +1,61 @@
+package mindustry.world.blocks.distribution;
+
+import mindustry.gen.*;
+import mindustry.type.*;
+
+public class DuctBridge extends DirectionBridge{
+    public float speed = 5f;
+
+    public DuctBridge(String name){
+        super(name);
+
+        itemCapacity = 4;
+        hasItems = true;
+        underBullets = true;
+        isDuct = true;
+    }
+
+    public class DuctBridgeBuild extends DirectionBridgeBuild{
+        public float progress = 0f;
+
+        @Override
+        public void updateTile(){
+            var link = lastLink = findLink();
+            if(link != null){
+                link.occupied[rotation % 4] = this;
+                if(items.any() && link.items.total() < link.block.itemCapacity){
+                    progress += edelta();
+                    while(progress > speed){
+                        Item next = items.take();
+                        if(next != null && link.items.total() < link.block.itemCapacity){
+                            link.handleItem(this, next);
+                        }
+                        progress -= speed;
+                    }
+                }
+            }
+
+            if(link == null && items.any()){
+                Item next = items.first();
+                if(moveForward(next)){
+                    items.remove(next, 1);
+                }
+            }
+
+            for(int i = 0; i < 4; i++){
+                if(occupied[i] == null || occupied[i].rotation != i || !occupied[i].isValid() || occupied[i].lastLink != this){
+                    occupied[i] = null;
+                }
+            }
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            //only accept if there's an output point.
+            if(findLink() == null) return false;
+
+            int rel = this.relativeToEdge(source.tile);
+            return items.total() < itemCapacity && rel != rotation && occupied[(rel + 2) % 4] == null;
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/DuctRouter.java b/core/src/mindustry/world/blocks/distribution/DuctRouter.java
new file mode 100644
index 0000000000..502915d288
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/DuctRouter.java
@@ -0,0 +1,192 @@
+package mindustry.world.blocks.distribution;
+
+import arc.graphics.g2d.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class DuctRouter extends Block{
+    public float speed = 5f;
+
+    public @Load(value = "@-top") TextureRegion topRegion;
+
+    public DuctRouter(String name){
+        super(name);
+
+        group = BlockGroup.transportation;
+        update = true;
+        solid = false;
+        hasItems = true;
+        unloadable = false;
+        itemCapacity = 1;
+        noUpdateDisabled = true;
+        configurable = true;
+        saveConfig = true;
+        rotate = true;
+        clearOnDoubleTap = true;
+        underBullets = true;
+        priority = TargetPriority.transport;
+        envEnabled = Env.space | Env.terrestrial | Env.underwater;
+
+        config(Item.class, (DuctRouterBuild tile, Item item) -> tile.sortItem = item);
+        configClear((DuctRouterBuild tile) -> tile.sortItem = null);
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.itemsMoved, 60f / speed * itemCapacity, StatUnit.itemsSecond);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+    }
+
+    @Override
+    public int minimapColor(Tile tile){
+        var build = (DuctRouterBuild)tile.build;
+        return build == null || build.sortItem == null ? 0 : build.sortItem.color.rgba();
+    }
+
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        return false;
+    }
+
+    public class DuctRouterBuild extends Building{
+        public @Nullable Item sortItem;
+
+        public float progress;
+        public @Nullable Item current;
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+            if(sortItem != null){
+                Draw.color(sortItem.color);
+                Draw.rect("center", x, y);
+                Draw.color();
+            }else{
+                Draw.rect(topRegion, x, y, rotdeg());
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            progress += edelta() / speed * 2f;
+
+            if(current != null){
+                if(progress >= (1f - 1f/speed)){
+                    var target = target();
+                    if(target != null){
+                        target.handleItem(this, current);
+                        items.remove(current, 1);
+                        current = null;
+                        progress %= (1f - 1f/speed);
+                    }
+                }
+            }else{
+                progress = 0;
+            }
+
+            if(current == null && items.total() > 0){
+                current = items.first();
+            }
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            ItemSelection.buildTable(DuctRouter.this, table, content.items(), () -> sortItem, this::configure);
+        }
+
+        @Nullable
+        public Building target(){
+            if(current == null) return null;
+
+            int dump = cdump;
+
+            for(int i = 0; i < proximity.size; i++){
+                Building other = proximity.get((i + dump) % proximity.size);
+                int rel = relativeTo(other);
+
+                if(!(sortItem != null && (current == sortItem) != (rel == rotation)) && !(rel == (rotation + 2) % 4) && other.team == team && other.acceptItem(this, current)){
+                    incrementDump(proximity.size);
+                    return other;
+                }
+
+                incrementDump(proximity.size);
+            }
+
+            return null;
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return current == null && items.total() == 0 &&
+                (Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation);
+        }
+
+        @Override
+        public int removeStack(Item item, int amount){
+            int removed = super.removeStack(item, amount);
+            if(item == current) current = null;
+            return removed;
+        }
+
+        @Override
+        public void handleStack(Item item, int amount, Teamc source){
+            super.handleStack(item, amount, source);
+            current = item;
+        }
+
+        @Override
+        public void handleItem(Building source, Item item){
+            current = item;
+            progress = -1f;
+            items.add(item, 1);
+            noSleep();
+        }
+
+        @Override
+        public Item config(){
+            return sortItem;
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.s(sortItem == null ? -1 : sortItem.id);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                sortItem = content.item(read.s());
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java
deleted file mode 100644
index 98b48e043a..0000000000
--- a/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package mindustry.world.blocks.distribution;
-
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.math.geom.*;
-import mindustry.core.*;
-import mindustry.graphics.*;
-import mindustry.world.*;
-
-import static mindustry.Vars.*;
-
-public class ExtendingItemBridge extends ItemBridge{
-
-    public ExtendingItemBridge(String name){
-        super(name);
-        hasItems = true;
-    }
-
-    public class ExtendingItemBridgeBuild extends ItemBridgeBuild{
-        @Override
-        public void draw(){
-            Draw.rect(region, x, y);
-
-            Draw.z(Layer.power);
-
-            Tile other = world.tile(link);
-            if(!linkValid(tile, other)) return;
-
-            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 uptime = state.isEditor() ? 1f : this.uptime;
-
-            ex *= uptime;
-            ey *= uptime;
-
-            if(Mathf.zero(Renderer.bridgeOpacity)) return;
-            Draw.alpha(Renderer.bridgeOpacity);
-
-            Lines.stroke(8f);
-            Lines.line(bridgeRegion,
-            x + Geometry.d4(i).x * tilesize / 2f,
-            y + Geometry.d4(i).y * tilesize / 2f,
-            x + ex,
-            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);
-
-            int dist = Math.max(Math.abs(other.x - tile.x), Math.abs(other.y - tile.y));
-
-            int arrows = (dist) * tilesize / 6 - 1;
-
-            Draw.color();
-
-            for(int a = 0; a < arrows; a++){
-                Draw.alpha(Mathf.absin(a / (float)arrows - time / 100f, 0.1f, 1f) * uptime * Renderer.bridgeOpacity);
-                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,
-                    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 2ab0c9b047..0ec2e16bcd 100644
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
@@ -1,16 +1,15 @@
 package mindustry.world.blocks.distribution;
 
-import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.struct.IntSet.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.core.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -24,31 +23,41 @@ import static mindustry.Vars.*;
 public class ItemBridge extends Block{
     private static BuildPlan otherReq;
 
-    public final int timerTransport = timers++;
+    public final int timerCheckMoved = timers ++;
+
     public int range;
     public float transportTime = 2f;
     public @Load("@-end") TextureRegion endRegion;
     public @Load("@-bridge") TextureRegion bridgeRegion;
     public @Load("@-arrow") TextureRegion arrowRegion;
 
+    public boolean fadeIn = true;
+    public boolean moveArrows = true;
+    public boolean pulse = false;
+    public float arrowSpacing = 4f, arrowOffset = 2f, arrowPeriod = 0.4f;
+    public float arrowTimeScl = 6.2f;
+    public float bridgeWidth = 6.5f;
+
     //for autolink
-    @Nullable
-    public ItemBridgeBuild lastBuild;
-    @Nullable
-    public BuildPlan lastPlan;
+    public @Nullable ItemBridgeBuild lastBuild;
 
     public ItemBridge(String name){
         super(name);
         update = true;
         solid = true;
+        underBullets = true;
         hasPower = true;
-        expanded = true;
         itemCapacity = 10;
         configurable = true;
         hasItems = true;
         unloadable = false;
         group = BlockGroup.transportation;
         noUpdateDisabled = true;
+        allowDiagonal = false;
+        copyConfig = false;
+        //disabled as to not be annoying
+        allowConfigInventory = false;
+        priority = TargetPriority.transport;
 
         //point2 config is relative
         config(Point2.class, (ItemBridgeBuild tile, Point2 i) -> tile.link = Point2.pack(i.x + tile.tileX(), i.y + tile.tileY()));
@@ -57,16 +66,16 @@ public class ItemBridge extends Block{
     }
 
     @Override
-    public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){
+    public void drawPlanConfigTop(BuildPlan plan, Eachable<BuildPlan> list){
         otherReq = null;
         list.each(other -> {
-            if(other.block == this && req != other && req.config instanceof Point2 p && p.equals(other.x - req.x, other.y - req.y)){
+            if(other.block == this && plan != other && plan.config instanceof Point2 p && p.equals(other.x - plan.x, other.y - plan.y)){
                 otherReq = other;
             }
         });
 
         if(otherReq != null){
-            drawBridge(req, otherReq.drawx(), otherReq.drawy(), 0);
+            drawBridge(plan, otherReq.drawx(), otherReq.drawy(), 0);
         }
     }
 
@@ -74,7 +83,7 @@ public class ItemBridge extends Block{
         if(Mathf.zero(Renderer.bridgeOpacity)) return;
         Draw.alpha(Renderer.bridgeOpacity);
 
-        Lines.stroke(8f);
+        Lines.stroke(bridgeWidth);
 
         Tmp.v1.set(ox, oy).sub(req.drawx(), req.drawy()).setLength(tilesize/2f);
 
@@ -94,16 +103,16 @@ public class ItemBridge extends Block{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
         Tile link = findLink(x, y);
 
-        Lines.stroke(2f, Pal.placing);
         for(int i = 0; i < 4; i++){
-            Lines.dashLine(
+            Drawf.dashLine(Pal.placing,
             x * tilesize + Geometry.d4[i].x * (tilesize / 2f + 2),
             y * tilesize + Geometry.d4[i].y * (tilesize / 2f + 2),
-            x * tilesize + Geometry.d4[i].x * (range + 0.5f) * tilesize,
-            y * tilesize + Geometry.d4[i].y * (range + 0.5f) * tilesize,
-            range);
+            x * tilesize + Geometry.d4[i].x * (range) * tilesize,
+            y * tilesize + Geometry.d4[i].y * (range) * tilesize);
         }
 
         Draw.reset();
@@ -144,19 +153,27 @@ public class ItemBridge extends Block{
 
     public Tile findLink(int x, int y){
         Tile tile = world.tile(x, y);
-        if(tile != null && lastBuild != null && linkValid(tile, lastBuild.tile) && lastBuild.tile != tile){
+        if(tile != null && lastBuild != null && linkValid(tile, lastBuild.tile) && lastBuild.tile != tile && lastBuild.link == -1){
             return lastBuild.tile;
         }
         return null;
     }
 
     @Override
-    public void onNewPlan(BuildPlan plan){
-        if(lastPlan != null && lastPlan.config == null && positionsValid(lastPlan.x, lastPlan.y, plan.x, plan.y)){
-            lastPlan.config = new Point2(plan.x - lastPlan.x, plan.y - lastPlan.y);
-        }
+    public void init(){
+        super.init();
+        updateClipRadius((range + 0.5f) * tilesize);
+    }
 
-        lastPlan = plan;
+    @Override
+    public void handlePlacementLine(Seq<BuildPlan> plans){
+        for(int i = 0; i < plans.size - 1; i++){
+            var cur = plans.get(i);
+            var next = plans.get(i + 1);
+            if(positionsValid(cur.x, cur.y, next.x, next.y)){
+                cur.config = new Point2(next.x - cur.x, next.y - cur.y);
+            }
+        }
     }
 
     @Override
@@ -166,20 +183,23 @@ public class ItemBridge extends Block{
 
     public class ItemBridgeBuild extends Building{
         public int link = -1;
-        public IntSet incoming = new IntSet();
-        public float uptime;
-        public float time;
-        public float time2;
-        public float cycleSpeed = 1f;
+        public IntSeq incoming = new IntSeq(false, 4);
+        public float warmup;
+        public float time = -8f, timeSpeed;
+        public boolean wasMoved, moved;
+        public float transportCounter;
+
+        @Override
+        public void pickedUp(){
+            link = -1;
+        }
 
         @Override
         public void playerPlaced(Object config){
             super.playerPlaced(config);
 
-            if(config != null) return;
-
             Tile link = findLink(tile.x, tile.y);
-            if(linkValid(tile, link) && !proximity.contains(link.build)){
+            if(linkValid(tile, link) && this.link != link.pos() && !proximity.contains(link.build)){
                 link.build.configure(tile.pos());
             }
 
@@ -218,13 +238,15 @@ public class ItemBridge extends Block{
             Lines.stroke(2.5f);
             Lines.line(tx + Tmp.v2.x, ty + Tmp.v2.y, ox - Tmp.v2.x, oy - Tmp.v2.y);
 
+            float color = (linked ? Pal.place : Pal.accent).toFloatBits();
+
             //draw foreground colors
-            Draw.color(linked ? Pal.place : Pal.accent);
+            Draw.color(color);
             Lines.stroke(1f);
             Lines.line(tx + Tmp.v2.x, ty + Tmp.v2.y, ox - Tmp.v2.x, oy - Tmp.v2.y);
 
             Lines.square(ox, oy, 2f, 45f);
-            Draw.mixcol(Draw.getColor(), 1f);
+            Draw.mixcol(color);
             Draw.color();
             Draw.rect(arrowRegion, x, y, rel * 90);
             Draw.mixcol();
@@ -248,9 +270,9 @@ public class ItemBridge extends Block{
         }
 
         @Override
-        public boolean onConfigureTileTapped(Building other){
+        public boolean onConfigureBuildTapped(Building other){
             //reverse connection
-            if(other instanceof ItemBridgeBuild && ((ItemBridgeBuild)other).link == pos()){
+            if(other instanceof ItemBridgeBuild b && b.link == pos()){
                 configure(other.pos());
                 other.configure(-1);
                 return true;
@@ -268,53 +290,65 @@ public class ItemBridge extends Block{
         }
 
         public void checkIncoming(){
-            IntSetIterator it = incoming.iterator();
-            while(it.hasNext){
-                int i = it.next();
+            int idx = 0;
+            while(idx < incoming.size){
+                int i = incoming.items[idx];
                 Tile other = world.tile(i);
                 if(!linkValid(tile, other, false) || ((ItemBridgeBuild)other.build).link != tile.pos()){
-                    it.remove();
+                    incoming.removeIndex(idx);
+                    idx --;
                 }
+                idx ++;
             }
         }
 
         @Override
         public void updateTile(){
-            time += cycleSpeed * delta();
-            time2 += (cycleSpeed - 1f) * delta();
+            if(timer(timerCheckMoved, 30f)){
+                wasMoved = moved;
+                moved = false;
+            }
+
+            //smooth out animation, so it doesn't stop/start immediately
+            timeSpeed = Mathf.approachDelta(timeSpeed, wasMoved ? 1f : 0f, 1f / 60f);
+
+            time += timeSpeed * delta();
 
             checkIncoming();
 
             Tile other = world.tile(link);
             if(!linkValid(tile, other)){
-                dump();
-                uptime = 0f;
+                doDump();
+                warmup = 0f;
             }else{
-                ((ItemBridgeBuild)other.build).incoming.add(tile.pos());
-
-                if(consValid() && Mathf.zero(1f - efficiency())){
-                    uptime = Mathf.lerpDelta(uptime, 1f, 0.04f);
-                }else{
-                    uptime = Mathf.lerpDelta(uptime, 0f, 0.02f);
+                var inc = ((ItemBridgeBuild)other.build).incoming;
+                int pos = tile.pos();
+                if(!inc.contains(pos)){
+                    inc.add(pos);
                 }
 
+                warmup = Mathf.approachDelta(warmup, efficiency, 1f / 30f);
                 updateTransport(other.build);
             }
         }
 
+        public void doDump(){
+            //allow dumping multiple times per frame
+            dumpAccumulate();
+        }
+
         public void updateTransport(Building other){
-            if(uptime >= 0.5f && timer(timerTransport, transportTime)){
+            transportCounter += edelta();
+            while(transportCounter >= transportTime){
                 Item item = items.take();
                 if(item != null && other.acceptItem(this, item)){
                     other.handleItem(this, item);
-                    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);
-                        items.undoFlow(item);
-                    }
+                    moved = true;
+                }else if(item != null){
+                    items.add(item, 1);
+                    items.undoFlow(item);
                 }
+                transportCounter -= transportTime;
             }
         }
 
@@ -331,13 +365,18 @@ public class ItemBridge extends Block{
 
             int i = relativeTo(other.x, other.y);
 
-            Draw.color(Color.white, Color.black, Mathf.absin(Time.time, 6f, 0.07f));
-            Draw.alpha(Math.max(uptime, 0.25f) * Renderer.bridgeOpacity);
+            if(pulse){
+                Draw.color(Color.white, Color.black, Mathf.absin(Time.time, 6f, 0.07f));
+            }
+
+            float warmup = hasPower ? this.warmup : 1f;
+
+            Draw.alpha((fadeIn ? Math.max(warmup, 0.25f) : 1f) * Renderer.bridgeOpacity);
 
             Draw.rect(endRegion, x, y, i * 90 + 90);
             Draw.rect(endRegion, other.drawx(), other.drawy(), i * 90 + 270);
 
-            Lines.stroke(8f);
+            Lines.stroke(bridgeWidth);
 
             Tmp.v1.set(x, y).sub(other.worldx(), other.worldy()).setLength(tilesize/2f).scl(-1f);
 
@@ -347,40 +386,26 @@ public class ItemBridge extends Block{
             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));
-
-            float time = time2 / 1.7f;
-            int arrows = (dist) * tilesize / 4 - 2;
+            int dist = Math.max(Math.abs(other.x - tile.x), Math.abs(other.y - tile.y)) - 1;
 
             Draw.color();
 
+            int arrows = (int)(dist * tilesize / arrowSpacing), dx = Geometry.d4x(i), dy = Geometry.d4y(i);
+
             for(int a = 0; a < arrows; a++){
-                Draw.alpha(Mathf.absin(a / (float)arrows - time / 100f, 0.1f, 1f) * uptime * Renderer.bridgeOpacity);
+                Draw.alpha(Mathf.absin(a - time / arrowTimeScl, arrowPeriod, 1f) * warmup * Renderer.bridgeOpacity);
                 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 + dx * (tilesize / 2f + a * arrowSpacing + arrowOffset),
+                y + dy * (tilesize / 2f + a * arrowSpacing + arrowOffset),
+                i * 90f);
             }
+
             Draw.reset();
         }
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            if(team != source.team) return false;
-
-            Tile other = world.tile(link);
-
-            if(items.total() >= itemCapacity) return false;
-
-            if(linked(source)) return true;
-
-            if(linkValid(tile, other)){
-                int rel = relativeTo(other);
-                int rel2 = relativeTo(Edges.getFacingEdge(source, this));
-
-                return rel != rel2;
-            }
-
-            return false;
+            return hasItems && team == source.team && items.total() < itemCapacity && checkAccept(source, world.tile(link));
         }
 
         @Override
@@ -390,17 +415,28 @@ public class ItemBridge extends Block{
 
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
-            if(team != source.team || !hasLiquids) return false;
+            return
+                hasLiquids && team == source.team &&
+                (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f) &&
+                checkAccept(source, world.tile(link));
+        }
 
-            Tile other = world.tile(link);
+        protected boolean checkAccept(Building source, Tile link){
+            if(tile == null || linked(source)) return true;
 
-            if(!(liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f)) return false;
+            if(linkValid(tile, link)){
+                int rel = relativeTo(link);
+                var facing = Edges.getFacingEdge(source, this);
+                int rel2 = facing == null ? -1 : relativeTo(facing);
 
-            if(linked(source)) return true;
-
-            if(linkValid(tile, other)){
-                int rel = relativeTo(other.x, other.y);
-                int rel2 = relativeTo(Edges.getFacingEdge(source, this));
+                //this is a bug, but it is kept for compatibility, see: https://github.com/Anuken/Mindustry/issues/9257#issuecomment-1801998747
+                /*
+                for(int j = 0; j < incoming.size; j++){
+                    int v = incoming.items[j];
+                    if(relativeTo(Point2.x(v), Point2.y(v)) == rel2){
+                        return false;
+                    }
+                }*/
 
                 return rel != rel2;
             }
@@ -423,10 +459,8 @@ public class ItemBridge extends Block{
                 Tile edge = Edges.getFacingEdge(to.tile, tile);
                 int i = relativeTo(edge.x, edge.y);
 
-                IntSetIterator it = incoming.iterator();
-
-                while(it.hasNext){
-                    int v = it.next();
+                for(int j = 0; j < incoming.size; j++){
+                    int v = incoming.items[j];
                     if(relativeTo(Point2.x(v), Point2.y(v)) == i){
                         return false;
                     }
@@ -450,29 +484,38 @@ public class ItemBridge extends Block{
             return Point2.unpack(link).sub(tile.x, tile.y);
         }
 
+        @Override
+        public byte version(){
+            return 1;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
             write.i(link);
-            write.f(uptime);
+            write.f(warmup);
             write.b(incoming.size);
 
-            IntSetIterator it = incoming.iterator();
-
-            while(it.hasNext){
-                write.i(it.next());
+            for(int i = 0; i < incoming.size; i++){
+                write.i(incoming.items[i]);
             }
+
+            write.bool(wasMoved || moved);
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
             link = read.i();
-            uptime = read.f();
+            warmup = read.f();
             byte links = read.b();
             for(int i = 0; i < links; i++){
                 incoming.add(read.i());
             }
+
+            if(revision >= 1){
+                wasMoved = moved = read.bool();
+            }
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java
index a60e13fb2b..ec21de0b16 100644
--- a/core/src/mindustry/world/blocks/distribution/Junction.java
+++ b/core/src/mindustry/world/blocks/distribution/Junction.java
@@ -16,9 +16,11 @@ public class Junction extends Block{
     public Junction(String name){
         super(name);
         update = true;
-        solid = true;
+        solid = false;
+        underBullets = true;
         group = BlockGroup.transportation;
         unloadable = false;
+        floating = true;
         noUpdateDisabled = true;
     }
 
@@ -77,6 +79,11 @@ public class Junction extends Block{
             return to != null && to.team == team;
         }
 
+        @Override
+        public byte version(){
+            return 1;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
@@ -86,7 +93,7 @@ public class Junction extends Block{
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
-            buffer.read(read);
+            buffer.read(read, revision == 0);
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java
index eb3409b1cd..7fc0d5f0ec 100644
--- a/core/src/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java
@@ -12,20 +12,25 @@ import arc.util.pooling.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class MassDriver extends Block{
     public float range;
-    public float rotateSpeed = 0.04f;
+    public float rotateSpeed = 5f;
     public float translation = 7f;
     public int minDistribute = 10;
     public float knockback = 4f;
-    public float reloadTime = 100f;
+    public float reload = 100f;
+    public MassDriverBolt bullet = new MassDriverBolt();
     public float bulletSpeed = 5.5f;
     public float bulletLifetime = 200f;
     public Effect shootEffect = Fx.shootBig2;
@@ -44,12 +49,21 @@ public class MassDriver extends Block{
         hasPower = true;
         outlineIcon = true;
         sync = true;
+        envEnabled |= Env.space;
 
         //point2 is relative
         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
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks);
+        stats.add(Stat.reload, 60f / reload, StatUnit.perSecond);
+    }
+
     @Override
     public TextureRegion[] icons(){
         return new TextureRegion[]{baseRegion, region};
@@ -57,12 +71,14 @@ public class MassDriver extends Block{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
         Drawf.dashCircle(x * tilesize, y * tilesize, range, Pal.accent);
 
         //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(!control.input.config.isShown()) return;
+        Building selected = control.input.config.getSelected();
+        if(selected == null || selected.block != this || !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);
@@ -78,7 +94,7 @@ public class MassDriver extends Block{
         Draw.reset();
     }
 
-    public class DriverBulletData implements Poolable{
+    public static class DriverBulletData implements Poolable{
         public MassDriverBuild from, to;
         public int[] items = new int[content.items().size];
 
@@ -89,14 +105,20 @@ public class MassDriver extends Block{
         }
     }
 
-    public class MassDriverBuild extends Building{
+    public class MassDriverBuild extends Building implements RotBlock{
         public int link = -1;
         public float rotation = 90;
-        public float reload = 0f;
+        public float reloadCounter = 0f;
         public DriverState state = DriverState.idle;
-        public OrderedSet<Tile> waitingShooters = new OrderedSet<>();
+        //TODO use queue? this array usually holds about 3 shooters max anyway
+        public OrderedSet<Building> waitingShooters = new OrderedSet<>();
 
-        public Tile currentShooter(){
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
+        public Building currentShooter(){
             return waitingShooters.isEmpty() ? null : waitingShooters.first();
         }
 
@@ -110,13 +132,15 @@ public class MassDriver extends Block{
             }
 
             //reload regardless of state
-            if(reload > 0f){
-                reload = Mathf.clamp(reload - edelta() / reloadTime);
+            if(reloadCounter > 0f){
+                reloadCounter = Mathf.clamp(reloadCounter - edelta() / reload);
             }
 
+            var current = currentShooter();
+
             //cleanup waiting shooters that are not valid
-            if(!shooterValid(currentShooter())){
-                waitingShooters.remove(currentShooter());
+            if(current != null && !shooterValid(current)){
+                waitingShooters.remove(current);
             }
 
             //switch states
@@ -131,11 +155,11 @@ public class MassDriver extends Block{
 
             //dump when idle or accepting
             if(state == DriverState.idle || state == DriverState.accepting){
-                dump();
+                dumpAccumulate();
             }
 
             //skip when there's no power
-            if(!consValid()){
+            if(efficiency <= 0f){
                 return;
             }
 
@@ -147,7 +171,7 @@ public class MassDriver extends Block{
                 }
 
                 //align to shooter rotation
-                rotation = Mathf.slerpDelta(rotation, tile.angleTo(currentShooter()), rotateSpeed * efficiency());
+                rotation = Angles.moveToward(rotation, angleTo(currentShooter()), rotateSpeed * efficiency);
             }else if(state == DriverState.shooting){
                 //if there's nothing to shoot at OR someone wants to shoot at this thing, bail
                 if(!hasLink || (!waitingShooters.isEmpty() && (itemCapacity - items.total() >= minDistribute))){
@@ -155,37 +179,46 @@ public class MassDriver extends Block{
                     return;
                 }
 
-                float targetRotation = tile.angleTo(link);
+                float targetRotation = angleTo(link);
 
                 if(
                 items.total() >= minDistribute && //must shoot minimum amount of items
                 link.block.itemCapacity - link.items.total() >= minDistribute //must have minimum amount of space
                 ){
                     MassDriverBuild other = (MassDriverBuild)link;
-                    other.waitingShooters.add(tile);
+                    other.waitingShooters.add(this);
 
-                    if(reload <= 0.0001f){
+                    if(reloadCounter <= 0.0001f){
 
                         //align to target location
-                        rotation = Mathf.slerpDelta(rotation, targetRotation, rotateSpeed * efficiency());
+                        rotation = Angles.moveToward(rotation, targetRotation, rotateSpeed * efficiency);
 
                         //fire when it's the first in the queue and angles are ready.
-                        if(other.currentShooter() == tile &&
+                        if(other.currentShooter() == this &&
                         other.state == DriverState.accepting &&
                         Angles.near(rotation, targetRotation, 2f) && Angles.near(other.rotation, targetRotation + 180f, 2f)){
                             //actually fire
                             fire(other);
-                            //remove waiting shooters, it's done firing
-                            other.waitingShooters.remove(tile);
-                            //set both states to idle
+                            float timeToArrive = Math.min(bulletLifetime, dst(other) / bulletSpeed);
+                            Time.run(timeToArrive, () -> {
+                                //remove waiting shooters, it's done firing
+                                other.waitingShooters.remove(this);
+                                other.state = DriverState.idle;
+                            });
+                            //driver is immediately idle
                             state = DriverState.idle;
-                            other.state = DriverState.idle;
                         }
                     }
                 }
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return Mathf.clamp(1f - reloadCounter / reload);
+            return super.sense(sensor);
+        }
+
         @Override
         public void draw(){
             Draw.rect(baseRegion, x, y);
@@ -193,11 +226,11 @@ 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);
+            x + Angles.trnsx(rotation + 180f, reloadCounter * knockback) - (size / 2),
+            y + Angles.trnsy(rotation + 180f, reloadCounter * knockback) - (size / 2), rotation - 90);
             Draw.rect(region,
-            x + Angles.trnsx(rotation + 180f, reload * knockback),
-            y + Angles.trnsy(rotation + 180f, reload * knockback), rotation - 90);
+            x + Angles.trnsx(rotation + 180f, reloadCounter * knockback),
+            y + Angles.trnsy(rotation + 180f, reloadCounter * knockback), rotation - 90);
         }
 
         @Override
@@ -208,9 +241,9 @@ public class MassDriver extends Block{
             Lines.stroke(1f);
             Drawf.circles(x, y, (tile.block().size / 2f + 1) * tilesize + sin - 2f, Pal.accent);
 
-            for(Tile shooter : waitingShooters){
-                Drawf.circles(shooter.drawx(), shooter.drawy(), (tile.block().size / 2f + 1) * tilesize + sin - 2f, Pal.place);
-                Drawf.arrow(shooter.drawx(), shooter.drawy(), x, y, size * tilesize + sin, 4f + sin, Pal.place);
+            for(var shooter : waitingShooters){
+                Drawf.circles(shooter.x, shooter.y, (tile.block().size / 2f + 1) * tilesize + sin - 2f, Pal.place);
+                Drawf.arrow(shooter.x, shooter.y, x, y, size * tilesize + sin, 4f + sin, Pal.place);
             }
 
             if(linkValid()){
@@ -223,8 +256,9 @@ public class MassDriver extends Block{
         }
 
         @Override
-        public boolean onConfigureTileTapped(Building other){
+        public boolean onConfigureBuildTapped(Building other){
             if(this == other){
+                if(link == -1) deselect();
                 configure(-1);
                 return false;
             }
@@ -232,7 +266,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 == block && other.dst(tile) <= range && other.team == team){
                 configure(other.pos());
                 return false;
             }
@@ -248,7 +282,7 @@ public class MassDriver extends Block{
 
         protected void fire(MassDriverBuild target){
             //reset reload, use power.
-            reload = 1f;
+            reloadCounter = 1f;
 
             DriverBulletData data = Pools.obtain(DriverBulletData.class, DriverBulletData::new);
             data.from = this;
@@ -263,15 +297,12 @@ public class MassDriver extends Block{
 
             float angle = tile.angleTo(target);
 
-            Bullets.driverBolt.create(this, team,
+            bullet.create(this, team,
                 x + Angles.trnsx(angle, translation), y + Angles.trnsy(angle, translation),
                 angle, -1f, bulletSpeed, bulletLifetime, data);
 
-            shootEffect.at(x + Angles.trnsx(angle, translation),
-            y + Angles.trnsy(angle, translation), angle);
-
-            smokeEffect.at(x + Angles.trnsx(angle, translation),
-            y + Angles.trnsy(angle, translation), angle);
+            shootEffect.at(x + Angles.trnsx(angle, translation), y + Angles.trnsy(angle, translation), angle);
+            smokeEffect.at(x + Angles.trnsx(angle, translation), y + Angles.trnsy(angle, translation), angle);
 
             Effect.shake(shake, shake, this);
             
@@ -296,24 +327,22 @@ public class MassDriver extends Block{
             Effect.shake(shake, shake, this);
             receiveEffect.at(bullet);
 
-            reload = 1f;
+            reloadCounter = 1f;
             bullet.remove();
         }
 
-        protected boolean shooterValid(Tile other){
-            if(other == null) return true;
-            if(!(other.build instanceof MassDriverBuild entity)) return false;
-            return entity.link == tile.pos() && tile.dst(other) <= range;
+        protected boolean shooterValid(Building other){
+            return other instanceof MassDriverBuild entity && other.isValid() && other.efficiency > 0 && entity.block == block && entity.link == pos() && within(other, range);
         }
 
         protected boolean linkValid(){
             if(link == -1) return false;
-            Building link = world.build(this.link);
-            return link instanceof MassDriverBuild && link.team == team && within(link, range);
+            return world.build(this.link) instanceof MassDriverBuild other && other.block == block && other.team == team && within(other, range);
         }
 
         @Override
         public Point2 config(){
+            if(tile == null) return null;
             return Point2.unpack(link).sub(tile.x, tile.y);
         }
 
@@ -337,8 +366,7 @@ public class MassDriver extends Block{
     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;
+        shooting;
 
         public static final DriverState[] all = values();
     }
diff --git a/core/src/mindustry/world/blocks/distribution/OverflowDuct.java b/core/src/mindustry/world/blocks/distribution/OverflowDuct.java
new file mode 100644
index 0000000000..d7099268b2
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/OverflowDuct.java
@@ -0,0 +1,159 @@
+package mindustry.world.blocks.distribution;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+public class OverflowDuct extends Block{
+    public float speed = 5f;
+    public boolean invert = false;
+
+    public @Load(value = "@-top") TextureRegion topRegion;
+
+    public OverflowDuct(String name){
+        super(name);
+
+        group = BlockGroup.transportation;
+        update = true;
+        solid = false;
+        hasItems = true;
+        conveyorPlacement = true;
+        unloadable = false;
+        itemCapacity = 1;
+        noUpdateDisabled = true;
+        rotate = true;
+        underBullets = true;
+        priority = TargetPriority.transport;
+        envEnabled = Env.space | Env.terrestrial | Env.underwater;
+        regionRotated1 = 1;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.itemsMoved, 60f / speed, StatUnit.itemsSecond);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+    }
+
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        return false;
+    }
+
+    public class OverflowDuctBuild extends Building{
+        public float progress;
+        public @Nullable Item current;
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+            Draw.rect(topRegion, x, y, rotdeg());
+        }
+
+        @Override
+        public void updateTile(){
+            progress += edelta() / speed * 2f;
+
+            if(current != null){
+                if(progress >= (1f - 1f/speed)){
+                    var target = target();
+                    if(target != null){
+                        target.handleItem(this, current);
+                        cdump = (byte)(cdump == 0 ? 2 : 0);
+                        items.remove(current, 1);
+                        current = null;
+                        progress %= (1f - 1f/speed);
+                    }
+                }
+            }else{
+                progress = 0;
+            }
+
+            if(current == null && items.total() > 0){
+                current = items.first();
+            }
+        }
+
+        @Nullable
+        public Building target(){
+            if(current == null) return null;
+
+            if(invert){ //Lots of extra code. Make separate UnderflowDuct class?
+                Building l = left(), r = right();
+                boolean lc = l != null && l.team == team && l.acceptItem(this, current),
+                    rc = r != null && r.team == team && r.acceptItem(this, current);
+
+                if(lc && !rc){
+                    return l;
+                }else if(rc && !lc){
+                    return r;
+                }else if(lc && rc){
+                    return cdump == 0 ? l : r;
+                }
+            }
+
+            Building front = front();
+            if(front != null && front.team == team && front.acceptItem(this, current)){
+                return front;
+            }
+
+            if(invert) return null;
+
+            for(int i = -1; i <= 1; i++){
+                int dir = Mathf.mod(rotation + (((i + cdump + 1) % 3) - 1), 4);
+                if(dir == rotation) continue;
+                Building other = nearby(dir);
+                if(other != null && other.team == team && other.acceptItem(this, current)){
+                    return other;
+                }
+            }
+
+            return null;
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return current == null && items.total() == 0 &&
+                (Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation);
+        }
+
+        @Override
+        public int removeStack(Item item, int amount){
+            int removed = super.removeStack(item, amount);
+            if(item == current) current = null;
+            return removed;
+        }
+
+        @Override
+        public void handleStack(Item item, int amount, Teamc source){
+            super.handleStack(item, amount, source);
+            current = item;
+        }
+
+        @Override
+        public void handleItem(Building source, Item item){
+            current = item;
+            progress = -1f;
+            items.add(item, 1);
+            noSleep();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java
index 1b38cff775..70b942afe1 100644
--- a/core/src/mindustry/world/blocks/distribution/OverflowGate.java
+++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java
@@ -8,8 +8,6 @@ import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.*;
-
 public class OverflowGate extends Block{
     public float speed = 1f;
     public boolean invert = false;
@@ -17,13 +15,14 @@ public class OverflowGate extends Block{
     public OverflowGate(String name){
         super(name);
         hasItems = true;
-        solid = true;
-        update = true;
+        underBullets = true;
+        update = false;
+        destructible = true;
         group = BlockGroup.transportation;
         instantTransfer = true;
         unloadable = false;
         canOverdrive = false;
-        itemCapacity = 1;
+        itemCapacity = 0;
     }
 
     @Override
@@ -32,73 +31,35 @@ public class OverflowGate extends Block{
     }
 
     public class OverflowGateBuild extends Building{
-        public Item lastItem;
-        public Tile lastInput;
-        public float time;
-
-        @Override
-        public int acceptStack(Item item, int amount, Teamc source){
-            return 0;
-        }
-
-        @Override
-        public int removeStack(Item item, int amount){
-            int result = super.removeStack(item, amount);
-            if(result != 0 && item == lastItem){
-                lastItem = null;
-            }
-            return result;
-        }
-
-        @Override
-        public void updateTile(){
-            if(lastItem == null && items.total() > 0){
-                items.clear();
-            }
-
-            if(lastItem != null){
-                if(lastInput == null){
-                    lastItem = null;
-                    return;
-                }
-
-                time += 1f / speed * Time.delta;
-                Building target = getTileTarget(lastItem, lastInput, false);
-
-                if(target != null && (time >= 1f)){
-                    getTileTarget(lastItem, lastInput, true);
-                    target.handleItem(this, lastItem);
-                    items.remove(lastItem, 1);
-                    lastItem = null;
-                }
-            }
-        }
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            return team == source.team && lastItem == null && items.total() == 0;
+            Building to = getTileTarget(item, source, false);
+
+            return to != null && to.acceptItem(this, item) && to.team == team;
         }
 
         @Override
         public void handleItem(Building source, Item item){
-            items.add(item, 1);
-            lastItem = item;
-            time = 0f;
-            lastInput = source.tile();
+            Building target = getTileTarget(item, source, true);
+
+            if(target != null) target.handleItem(this, item);
         }
 
-        public @Nullable Building getTileTarget(Item item, Tile src, boolean flip){
-            int from = relativeToEdge(src);
+        public @Nullable Building getTileTarget(Item item, Building src, boolean flip){
+            int from = relativeToEdge(src.tile);
             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 inv = invert == enabled;
+            boolean
+                fromInst = src.block.instantTransfer,
+                canForward = to != null && to.team == team && !(fromInst && to.block.instantTransfer) && to.acceptItem(this, item),
+                inv = invert == enabled;
 
             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 && !(fromInst && a.block.instantTransfer) && a.team == team && a.acceptItem(this, item);
+                boolean bc = b != null && !(fromInst && b.block.instantTransfer) && b.team == team && b.acceptItem(this, item);
 
                 if(!ac && !bc){
                     return inv && canForward ? to : null;
@@ -109,13 +70,8 @@ public class OverflowGate extends Block{
                 }else if(bc && !ac){
                     to = b;
                 }else{
-                    if(rotation == 0){
-                        to = a;
-                        if(flip) rotation =1;
-                    }else{
-                        to = b;
-                        if(flip) rotation = 0;
-                    }
+                    to = (rotation & (1 << from)) == 0 ? a : b;
+                    if(flip) rotation ^= (1 << from);
                 }
             }
 
@@ -124,14 +80,7 @@ public class OverflowGate extends Block{
 
         @Override
         public byte version(){
-            return 3;
-        }
-
-        @Override
-        public void write(Writes write){
-            super.write(write);
-
-            write.i(lastInput == null ? -1 : lastInput.pos());
+            return 4;
         }
 
         @Override
@@ -141,9 +90,10 @@ public class OverflowGate extends Block{
             if(revision == 1){
                 new DirectionalItemBuffer(25).read(read);
             }else if(revision == 3){
-                lastInput = world.tile(read.i());
-                lastItem = items.first();
+                read.i();
             }
+
+            items.clear();
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java
deleted file mode 100644
index 3e1d2949dc..0000000000
--- a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package mindustry.world.blocks.distribution;
-
-import arc.graphics.g2d.*;
-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;
-
-    public PayloadRouter(String name){
-        super(name);
-
-        outputsPayload = true;
-        outputFacing = false;
-    }
-
-    @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        super.drawRequestRegion(req, list);
-
-        Draw.rect(overRegion, req.drawx(), req.drawy());
-    }
-
-    public class PayloadRouterBuild extends PayloadConveyorBuild{
-        public float smoothRot;
-
-        @Override
-        public void add(){
-            super.add();
-            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 handlePayload(Building source, Payload payload){
-            super.handlePayload(source, payload);
-            pickNext();
-        }
-
-        @Override
-        public void moveFailed(){
-            pickNext();
-        }
-
-        @Override
-        public void updateTile(){
-            super.updateTile();
-
-            smoothRot = Mathf.slerpDelta(smoothRot, rotdeg(), 0.2f);
-        }
-
-        @Override
-        public void draw(){
-            Draw.rect(region, x, y);
-
-            float dst = 0.8f;
-
-            Draw.mixcol(team.color, Math.max((dst - (Math.abs(fract() - 0.5f) * 2)) / dst, 0));
-            Draw.rect(topRegion, x, y, smoothRot);
-            Draw.reset();
-
-            Draw.rect(overRegion, x, y);
-
-            Draw.z(Layer.blockOver);
-
-            if(item != null){
-                item.draw();
-            }
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/distribution/Router.java b/core/src/mindustry/world/blocks/distribution/Router.java
index 141f188446..1e4a9399aa 100644
--- a/core/src/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/mindustry/world/blocks/distribution/Router.java
@@ -14,7 +14,8 @@ public class Router extends Block{
 
     public Router(String name){
         super(name);
-        solid = true;
+        solid = false;
+        underBullets = true;
         update = true;
         hasItems = true;
         itemCapacity = 1;
@@ -104,7 +105,7 @@ public class Router extends Block{
                 int angle = Mathf.mod((int)((angleTo(unit.aimX(), unit.aimY()) + 45) / 90), 4);
 
                 if(unit.isShooting()){
-                    Building other = nearby(angle);
+                    Building other = nearby(rotation = angle);
                     if(other != null && 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 f15c561c04..805fad17aa 100644
--- a/core/src/mindustry/world/blocks/distribution/Sorter.java
+++ b/core/src/mindustry/world/blocks/distribution/Sorter.java
@@ -1,10 +1,12 @@
 package mindustry.world.blocks.distribution;
 
+import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -15,25 +17,28 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class Sorter extends Block{
+    public @Load(value = "@-cross", fallback = "cross-full") TextureRegion cross;
     public boolean invert;
 
     public Sorter(String name){
         super(name);
-        update = true;
-        solid = true;
+        update = false;
+        destructible = true;
+        underBullets = true;
         instantTransfer = true;
         group = BlockGroup.transportation;
         configurable = true;
         unloadable = false;
         saveConfig = true;
+        clearOnDoubleTap = true;
 
         config(Item.class, (SorterBuild tile, Item item) -> tile.sortItem = item);
         configClear((SorterBuild tile) -> tile.sortItem = null);
     }
 
     @Override
-    public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
-        drawRequestConfigCenter(req, req.config, "center");
+    public void drawPlanConfig(BuildPlan plan, Eachable<BuildPlan> list){
+        drawPlanConfigCenter(plan, plan.config, "center", true);
     }
 
     @Override
@@ -47,6 +52,11 @@ public class Sorter extends Block{
         return build == null || build.sortItem == null ? 0 : build.sortItem.color.rgba();
     }
 
+    @Override
+    protected TextureRegion[] icons(){
+        return new TextureRegion[]{Core.atlas.find("source-bottom"), region};
+    }
+
     public class SorterBuild extends Building{
         public @Nullable Item sortItem;
 
@@ -61,15 +71,16 @@ public class Sorter extends Block{
 
         @Override
         public void draw(){
-            super.draw();
 
             if(sortItem == null){
-                Draw.rect("cross", x, y);
+                Draw.rect(cross, x, y);
             }else{
                 Draw.color(sortItem.color);
-                Draw.rect("center", x, y);
+                Fill.square(x, y, tilesize/2f - 0.00001f);
                 Draw.color();
             }
+
+            super.draw();
         }
 
         @Override
@@ -81,13 +92,10 @@ public class Sorter extends Block{
 
         @Override
         public void handleItem(Building source, Item item){
-            Building to = getTileTarget(item, source, true);
-
-            to.handleItem(this, item);
+            getTileTarget(item, source, true).handleItem(this, item);
         }
 
         public boolean isSame(Building other){
-            // comment code below to allow sorter/gate chaining
             return other != null && other.block.instantTransfer;
         }
 
@@ -117,13 +125,8 @@ public class Sorter extends Block{
                 }else if(!bc){
                     return null;
                 }else{
-                    if(rotation == 0){
-                        to = a;
-                        if(flip) this.rotation = (byte)1;
-                    }else{
-                        to = b;
-                        if(flip) this.rotation = (byte)0;
-                    }
+                    to = (rotation & (1 << dir)) == 0 ? a : b;
+                    if(flip) rotation ^= (1 << dir);
                 }
             }
 
@@ -132,18 +135,7 @@ public class Sorter extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> sortItem, this::configure);
-        }
-
-        @Override
-        public boolean onConfigureTileTapped(Building other){
-            if(this == other){
-                deselect();
-                configure(null);
-                return false;
-            }
-
-            return true;
+            ItemSelection.buildTable(Sorter.this, table, content.items(), () -> sortItem, this::configure, selectionRows, selectionColumns);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index 41b0736181..9bf0bcf4cf 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -1,7 +1,9 @@
 package mindustry.world.blocks.distribution;
 
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
@@ -12,7 +14,6 @@ import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.distribution.Conveyor.*;
@@ -26,13 +27,20 @@ public class StackConveyor extends Block implements Autotiler{
     public @Load(value = "@-#", length = 3) TextureRegion[] regions;
     public @Load("@-edge") TextureRegion edgeRegion;
     public @Load("@-stack") TextureRegion stackRegion;
+    /** requires power to work properly */
+    public @Load(value = "@-glow") TextureRegion glowRegion;
+    public @Load(value = "@-edge-glow", fallback = "@-glow") TextureRegion edgeGlowRegion;
 
+    public float glowAlpha = 1f;
+    public Color glowColor = Pal.redLight;
+
+    public float baseEfficiency = 0f;
     public float speed = 0f;
-    public boolean splitOut = true;
+    public boolean outputRouter = 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 Effect loadEffect = Fx.conveyorPoof;
+    public Effect unloadEffect = Fx.conveyorPoof;
 
     public StackConveyor(String name){
         super(name);
@@ -43,6 +51,8 @@ public class StackConveyor extends Block implements Autotiler{
         hasItems = true;
         itemCapacity = 10;
         conveyorPlacement = true;
+        underBullets = true;
+        priority = TargetPriority.transport;
 
         ambientSound = Sounds.conveyor;
         ambientSoundVolume = 0.004f;
@@ -61,8 +71,9 @@ public class StackConveyor extends Block implements Autotiler{
             int state = b.state;
             if(state == stateLoad){ //standard conveyor mode
                 return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
-            }else if(state == stateUnload){ //router mode
+            }else if(state == stateUnload && !outputRouter){ //router mode
                 return otherblock.acceptsItems &&
+                    (!otherblock.noSideBlend || lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock)) &&
                     (notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) ||
                     (otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) &&
                     !(world.build(otherx, othery) instanceof StackConveyorBuild s && s.state == stateUnload) &&
@@ -74,17 +85,17 @@ public class StackConveyor extends Block implements Autotiler{
     }
 
     @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        int[] bits = getTiling(req, list);
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        int[] bits = getTiling(plan, list);
 
         if(bits == null) return;
 
         TextureRegion region = regions[0];
-        Draw.rect(region, req.drawx(), req.drawy(), req.rotation * 90);
+        Draw.rect(region, plan.drawx(), plan.drawy(), plan.rotation * 90);
 
         for(int i = 0; i < 4; i++){
             if((bits[3] & (1 << i)) == 0){
-                Draw.rect(edgeRegion, req.drawx(), req.drawy(), (req.rotation - i) * 90);
+                Draw.rect(edgeRegion, plan.drawx(), plan.drawy(), (plan.rotation - i) * 90);
             }
         }
     }
@@ -92,8 +103,8 @@ public class StackConveyor extends Block implements Autotiler{
     @Override
     public boolean rotatedOutput(int x, int y){
         Building tile = world.build(x, y);
-        if(tile instanceof StackConveyorBuild){
-            return ((StackConveyorBuild)tile).state != stateUnload;
+        if(tile instanceof StackConveyorBuild s){
+            return s.state != stateUnload;
         }
         return super.rotatedOutput(x, y);
     }
@@ -109,6 +120,8 @@ public class StackConveyor extends Block implements Autotiler{
 
         @Override
         public void draw(){
+            Draw.z(Layer.block - 0.2f);
+
             Draw.rect(regions[state], x, y, rotdeg());
 
             for(int i = 0; i < 4; i++){
@@ -117,10 +130,37 @@ public class StackConveyor extends Block implements Autotiler{
                 }
             }
 
-            Draw.z(Layer.blockOver);
+            //draw inputs
+            if(state == stateLoad){
+                for(int i = 0; i < 4; i++){
+                    int dir = rotation - i;
+                    var near = nearby(dir);
+                    if((blendprox & (1 << i)) != 0 && i != 0 && near != null && !near.block.squareSprite){
+                        Draw.rect(sliced(regions[0], SliceMode.bottom), x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, (float)(dir*90));
+                    }
+                }
+            }else if(state == stateUnload){ //front unload
+                //TOOD hacky front check
+                if((blendprox & (1)) != 0 && !front().block.squareSprite){
+                    Draw.rect(sliced(regions[0], SliceMode.top), x + Geometry.d4x(rotation) * tilesize*0.75f, y + Geometry.d4y(rotation) * tilesize*0.75f, rotation * 90f);
+                }
+            }
+
+            Draw.z(Layer.block - 0.1f);
 
             Tile from = world.tile(link);
 
+            //TODO do not draw for certain configurations?
+            if(glowRegion.found() && power != null && power.status > 0f){
+                Draw.z(Layer.blockAdditive);
+                Draw.color(glowColor, glowAlpha * power.status);
+                Draw.blend(Blending.additive);
+                Draw.rect(state == stateLoad ? edgeGlowRegion : glowRegion, x, y, rotation * 90);
+                Draw.blend();
+                Draw.color();
+                Draw.z(Layer.block - 0.1f);
+            }
+
             if(link == -1 || from == null || lastItem == null) return;
 
             int fromRot = from.build == null ? rotation : from.build.rotation;
@@ -136,13 +176,35 @@ public class StackConveyor extends Block implements Autotiler{
             if((fromRot%4) == 3 && (rotation%4) == 0) a = -1 * 90;
             if((fromRot%4) == 0 && (rotation%4) == 3) a =  4 * 90;
 
+            if(glowRegion.found()){
+                Draw.z(Layer.blockAdditive + 0.01f);
+            }
+
             //stack
             Draw.rect(stackRegion, Tmp.v1.x, Tmp.v1.y, Mathf.lerp(a, b, Interp.smooth.apply(1f - Mathf.clamp(cooldown * 2, 0f, 1f))));
 
             //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(lastItem.icon(Cicon.medium), Tmp.v1.x, Tmp.v1.y, size, size, 0);
+            Draw.rect(lastItem.fullIcon, Tmp.v1.x, Tmp.v1.y, size, size, 0);
+        }
+
+        @Override
+        public void dropped(){
+            super.dropped();
+            var prev = Geometry.d4[(rotation + 2) % 4];
+            link = Point2.pack(tile.x + prev.x, tile.y + prev.y);
+        }
+
+        @Override
+        public void drawCracks(){
+            Draw.z(Layer.block - 0.15f);
+            super.drawCracks();
+        }
+        
+        @Override
+        public void payloadDraw(){
+            Draw.rect(block.fullIcon, x, y);
         }
 
         @Override
@@ -154,14 +216,15 @@ public class StackConveyor extends Block implements Autotiler{
             state = stateMove;
 
             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
+            if(bits[0] == 0 && blends(tile, rotation, 0) && (!blends(tile, rotation, 2) || back() instanceof StackConveyorBuild b && b.state == stateUnload)) state = stateLoad;  // a 0 that faces into a conveyor with none behind it
+            if(outputRouter && bits[0] == 0 && !blends(tile, rotation, 0) && blends(tile, rotation, 2)) state = stateUnload; // a 0 that faces into none with a conveyor behind it
+            if(!outputRouter && !(front() instanceof StackConveyorBuild)) state = stateUnload; // a 0 that faces into none with a conveyor behind it
 
             if(!headless){
                 blendprox = 0;
 
                 for(int i = 0; i < 4; i++){
-                    if(blends(tile, rotation, i)){
+                    if(blends(tile, rotation, i) && (state != stateUnload || outputRouter || i == 0 || nearby(Mathf.mod(rotation - i, 4)) instanceof StackConveyorBuild)){
                         blendprox |= (1 << i);
                     }
                 }
@@ -194,43 +257,49 @@ public class StackConveyor extends Block implements Autotiler{
             return state != stateLoad;
         }
 
-        @Override
-        public float efficiency(){
-            return 1f;
-        }
-
         @Override
         public void updateTile(){
-            // reel in crater
-            if(cooldown > 0f) cooldown = Mathf.clamp(cooldown - speed * edelta(), 0f, recharge);
+            //the item still needs to be "reeled" in when disabled
+            float eff = enabled ? (efficiency + baseEfficiency) : 1f;
 
-            // indicates empty state
+            //reel in crater
+            if(cooldown > 0f) cooldown = Mathf.clamp(cooldown - speed * eff * delta(), 0f, recharge);
+
+            //indicates empty state
             if(link == -1) return;
 
-            // crater needs to be centered
+            //crater needs to be centered
             if(cooldown > 0f) return;
 
-            // get current item
+            //get current item
             if(lastItem == null || !items.has(lastItem)){
                 lastItem = items.first();
             }
 
-            // do not continue if disabled, will still allow one to be reeled in to prevent visual stacking
+            //do not continue if disabled, will still allow one to be reeled in to prevent visual stacking
             if(!enabled) return;
 
             if(state == stateUnload){ //unload
-                while(lastItem != null && (!splitOut ? moveForward(lastItem) : dump(lastItem))){
-                    if(items.empty()) poofOut();
+                while(lastItem != null && !outputRouter ? moveForward(lastItem) : dump(lastItem)){
+                    if(!outputRouter){
+                        items.remove(lastItem, 1);
+                    }
+
+                    if(!items.has(lastItem)){
+                        poofOut();
+                        lastItem = null;
+                        break;
+                    }
                 }
             }else{ //transfer
                 if(state != stateLoad || (items.total() >= getMaximumAccepted(lastItem))){
                     if(front() instanceof StackConveyorBuild e && e.team == team){
-                        // sleep if its occupied
+                        //sleep if its occupied
                         if(e.link == -1){
                             e.items.add(items);
                             e.lastItem = lastItem;
                             e.link = tile.pos();
-                            // â–² to | from â–¼
+                            //â–² to | from â–¼
                             link = -1;
                             items.clear();
 
@@ -254,7 +323,7 @@ public class StackConveyor extends Block implements Autotiler{
 
         @Override
         public boolean shouldAmbientSound(){
-            return false; // has no moving parts;
+            return false; //has no moving parts;
         }
 
         protected void poofIn(){
@@ -267,9 +336,15 @@ public class StackConveyor extends Block implements Autotiler{
             link = -1;
         }
 
+        @Override
+        public int acceptStack(Item item, int amount, Teamc source){
+            if(items.any() && !items.has(item)) return 0;
+            return super.acceptStack(item, amount, source);
+        }
+
         @Override
         public void handleItem(Building source, Item item){
-            if(items.empty()) poofIn();
+            if(items.empty() && tile != null) poofIn();
             super.handleItem(source, item);
             lastItem = item;
         }
@@ -277,7 +352,7 @@ public class StackConveyor extends Block implements Autotiler{
         @Override
         public void handleStack(Item item, int amount, Teamc source){
             if(amount <= 0) return;
-            if(items.empty()) poofIn();
+            if(items.empty() && tile != null) poofIn();
             super.handleStack(item, amount, source);
             lastItem = item;
         }
@@ -298,11 +373,11 @@ public class StackConveyor extends Block implements Autotiler{
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            if(this == source) return true;                 // player threw items
-            if(cooldown > recharge - 1f) return false;      // still cooling down
-            return !((state != stateLoad)                   // not a loading dock
-            ||  (items.total() > 0 && !items.has(item))     // incompatible items
-            ||  (items.total() >= getMaximumAccepted(item)) // filled to capacity
+            if(this == source) return items.total() < itemCapacity && (!items.any() || items.has(item)); //player threw items
+            if(cooldown > recharge - 1f) return false; //still cooling down
+            return !((state != stateLoad) //not a loading dock
+            ||  (items.any() && !items.has(item)) //incompatible items
+            ||  (items.total() >= getMaximumAccepted(item)) //filled to capacity
             ||  (front()  == source));
         }
 
@@ -320,6 +395,7 @@ public class StackConveyor extends Block implements Autotiler{
 
             link = read.i();
             cooldown = read.f();
+            lastItem = items.first();
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/StackRouter.java b/core/src/mindustry/world/blocks/distribution/StackRouter.java
new file mode 100644
index 0000000000..1186401c9c
--- /dev/null
+++ b/core/src/mindustry/world/blocks/distribution/StackRouter.java
@@ -0,0 +1,91 @@
+package mindustry.world.blocks.distribution;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+public class StackRouter extends DuctRouter{
+    public float baseEfficiency = 0f;
+
+    public @Load(value = "@-glow", fallback = "arrow-glow") TextureRegion glowRegion;
+    public float glowAlpha = 1f;
+    public Color glowColor = Pal.redLight;
+
+    public StackRouter(String name){
+        super(name);
+        itemCapacity = 10;
+    }
+
+    public class StackRouterBuild extends DuctRouterBuild{
+        public boolean unloading = false;
+
+        @Override
+        public void updateTile(){
+            float eff = enabled ? (efficiency + baseEfficiency) : 0f;
+            float cap = speed;
+
+            if(!unloading && current != null && items.total() >= itemCapacity){
+                if(progress < cap){
+                    //when items are full, begin offload timer
+                    progress += eff;
+                }
+
+                if(progress >= cap){
+                    unloading = true;
+                    progress %= cap;
+                }
+            }
+
+            //unload as many as possible when in unloading state
+            if(unloading && current != null){
+                //unload when possible
+                var target = target();
+                while(target != null && items.get(current) > 0){
+                    target.handleItem(this, current);
+                    items.remove(current, 1);
+
+                    target = target();
+                }
+
+                //if out of items, unloading is over
+                if(items.get(current) == 0){
+                    current = null;
+                    unloading = false;
+                }
+            }
+
+            if((current == null || items.get(current) == 0) && items.total() > 0){
+                current = items.first();
+            }
+
+            if(items.empty()){
+                unloading = false;
+                current = null;
+            }
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(glowRegion.found() && power != null && power.status > 0){
+                Draw.z(Layer.blockAdditive);
+                Draw.color(glowColor, glowAlpha * power.status);
+                Draw.blend(Blending.additive);
+                Draw.rect(glowRegion, x, y, rotation * 90);
+                Draw.blend();
+                Draw.color();
+            }
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return !unloading && (current == null || item == current) && items.total() < itemCapacity &&
+                (Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/AirBlock.java b/core/src/mindustry/world/blocks/environment/AirBlock.java
new file mode 100644
index 0000000000..6afcbf261f
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/AirBlock.java
@@ -0,0 +1,46 @@
+package mindustry.world.blocks.environment;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.world.*;
+
+public class AirBlock extends Floor{
+
+    public AirBlock(String name){
+        super(name);
+        alwaysReplace = true;
+        hasShadow = false;
+        useColor = false;
+        wall = this;
+        generateIcons = false;
+        needsSurface = false;
+        canShadow = false;
+    }
+
+    @Override
+    public void drawBase(Tile tile){}
+
+    @OverrideCallSuper
+    @Override
+    public void load(){}
+
+    @OverrideCallSuper
+    @Override
+    public void init(){
+        decoration = this;
+    }
+
+    @Override
+    public boolean isHidden(){
+        return true;
+    }
+
+    @Override
+    public TextureRegion[] variantRegions(){
+        if(variantRegions == null){
+            variantRegions = new TextureRegion[]{Core.atlas.find("clear")};
+        }
+        return variantRegions;
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/Boulder.java b/core/src/mindustry/world/blocks/environment/Boulder.java
deleted file mode 100644
index 3d2cd2efa1..0000000000
--- a/core/src/mindustry/world/blocks/environment/Boulder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package mindustry.world.blocks.environment;
-
-import arc.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import mindustry.world.*;
-
-public class Boulder extends Block{
-    protected int variants;
-
-    public Boulder(String name){
-        super(name);
-        breakable = true;
-        alwaysReplace = true;
-        
-        deconstructThreshold = 0.35f;
-    }
-
-    @Override
-    public void drawBase(Tile tile){
-        if(variants > 0){
-            Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
-        }else{
-            Draw.rect(region, tile.worldx(), tile.worldy());
-        }
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return variants == 0 ? super.icons() : new TextureRegion[]{Core.atlas.find(name + "1")};
-    }
-
-    @Override
-    public void load(){
-        super.load();
-
-        if(variants > 0){
-            variantRegions = new TextureRegion[variants];
-
-            for(int i = 0; i < variants; i++){
-                variantRegions[i] = Core.atlas.find(name + (i + 1));
-            }
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/environment/Cliff.java b/core/src/mindustry/world/blocks/environment/Cliff.java
index 49dba95d7c..d3a0c99771 100644
--- a/core/src/mindustry/world/blocks/environment/Cliff.java
+++ b/core/src/mindustry/world/blocks/environment/Cliff.java
@@ -9,6 +9,7 @@ import mindustry.world.*;
 public class Cliff extends Block{
     public float size = 11f;
     public @Load(value = "cliffmask#", length = 256) TextureRegion[] cliffs;
+    public @Load(value = "editor-cliffmask#", length = 256) TextureRegion[] editorCliffs;
 
     public Cliff(String name){
         super(name);
diff --git a/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java b/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java
deleted file mode 100644
index c26107caa1..0000000000
--- a/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package mindustry.world.blocks.environment;
-
-import arc.graphics.g2d.*;
-import arc.math.*;
-import mindustry.world.*;
-
-public class DoubleOverlayFloor extends OverlayFloor{
-
-    public DoubleOverlayFloor(String name){
-        super(name);
-    }
-
-    @Override
-    public void drawBase(Tile tile){
-        Draw.colorl(0.4f);
-        Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy() - 0.75f);
-        Draw.color();
-        Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
-    }
-}
diff --git a/core/src/mindustry/world/blocks/environment/EmptyFloor.java b/core/src/mindustry/world/blocks/environment/EmptyFloor.java
new file mode 100644
index 0000000000..436150792d
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/EmptyFloor.java
@@ -0,0 +1,27 @@
+package mindustry.world.blocks.environment;
+
+import mindustry.content.*;
+import mindustry.world.*;
+
+/** Empty floor is *not* equivalent to air. Unlike air, it is solid, and still draws neighboring tile edges. */
+public class EmptyFloor extends Floor{
+
+    public EmptyFloor(String name){
+        super(name);
+        variants = 0;
+        canShadow = false;
+        placeableOn = false;
+        solid = true;
+    }
+
+    @Override
+    public void drawBase(Tile tile){
+        //draws only edges, never itself
+        drawEdges(tile);
+
+        Floor floor = tile.overlay();
+        if(floor != Blocks.air && floor != this){
+            floor.drawBase(tile);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index 02aed4b003..2ea499d015 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -4,7 +4,6 @@ import arc.*;
 import arc.audio.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
-import arc.graphics.g2d.TextureAtlas.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
@@ -15,15 +14,13 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.MultiPacker.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.world.*;
-import mindustry.world.blocks.*;
+
+import java.util.*;
 
 import static mindustry.Vars.*;
 
 public class Floor extends Block{
-    /** number of different variant regions to use */
-    public int variants = 3;
     /** edge fallback, used mainly for ores */
     public String edge = "stone";
     /** Multiplies unit velocity by this when walked on. */
@@ -32,7 +29,7 @@ public class Floor extends Block{
     public float dragMultiplier = 1f;
     /** Damage taken per tick on this tile. */
     public float damageTaken = 0f;
-    /** How many ticks it takes to drown on this. */
+    /** How many ticks it takes to drown on this. 0 to disable. */
     public float drownTime = 0f;
     /** Effect when walking on this floor. */
     public Effect walkEffect = Fx.none;
@@ -46,22 +43,20 @@ public class Floor extends Block{
     public StatusEffect status = StatusEffects.none;
     /** Intensity of applied status effect. */
     public float statusDuration = 60f;
-    /** liquids that drop from this block, used for pumps */
+    /** 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 */
+    /** whether this block is liquid. */
     public boolean isLiquid;
-    /** if true, this block cannot be mined by players. useful for annoying things like sand. */
-    public boolean playerUnmineable = false;
+    /** for liquid floors, this is the opacity of the overlay drawn on top. */
+    public float overlayAlpha = 0.65f;
+    /** whether this floor supports an overlay floor */
+    public boolean supportsOverlay = false;
+    /** shallow water flag used for generation */
+    public boolean shallow = false;
     /** Group of blocks that this block does not draw edges on. */
     public Block blendGroup = this;
-    /** Effect displayed when randomly updated. */
-    public Effect updateEffect = Fx.none;
-    /** Array of affinities to certain things. */
-    public Attributes attributes = new Attributes();
     /** Whether this ore generates in maps by default. */
     public boolean oreDefault = false;
     /** Ore generation params. */
@@ -70,16 +65,35 @@ public class Floor extends Block{
     public Block wall = Blocks.air;
     /** Decoration block. Usually a rock. May be air. */
     public Block decoration = Blocks.air;
+    /** Whether units can draw shadows over this. */
+    public boolean canShadow = true;
     /** Whether this overlay needs a surface to be on. False for floating blocks, like spawns. */
     public boolean needsSurface = true;
+    /** If true, cores can be placed on this floor. */
+    public boolean allowCorePlacement = false;
+    /** If true, this ore is allowed on walls. */
+    public boolean wallOre = false;
+    /** Actual ID used for blend groups. Internal. */
+    public int blendId = -1;
 
     protected TextureRegion[][] edges;
-    protected Seq<Block> blenders = new Seq<>();
+    protected Seq<Floor> blenders = new Seq<>();
     protected Bits blended = new Bits(256);
+    protected int[] dirs = new int[8];
     protected TextureRegion edgeRegion;
 
     public Floor(String name){
+        this(name, 3);
+    }
+
+    public Floor(String name, int variants){
         super(name);
+        this.variants = variants;
+        placeableLiquid = true;
+        allowRectanglePlacement = true;
+        instantBuild = true;
+        ignoreBuildDarkness = true;
+        placeEffect = Fx.rotateBlock;
     }
 
     @Override
@@ -89,7 +103,6 @@ public class Floor extends Block{
         //load variant regions for drawing
         if(variants > 0){
             variantRegions = new TextureRegion[variants];
-
             for(int i = 0; i < variants; i++){
                 variantRegions[i] = Core.atlas.find(name + (i + 1));
             }
@@ -97,7 +110,6 @@ public class Floor extends Block{
             variantRegions = new TextureRegion[1];
             variantRegions[0] = Core.atlas.find(name);
         }
-
         int size = (int)(tilesize / Draw.scl);
         if(Core.atlas.has(name + "-edge")){
             edges = Core.atlas.find(name + "-edge").split(size, size);
@@ -110,6 +122,8 @@ public class Floor extends Block{
     public void init(){
         super.init();
 
+        blendId = blendGroup.id;
+
         if(wall == Blocks.air){
             wall = content.block(name + "-wall");
             if(wall == null) wall = content.block(name.replace("darksand", "dune") + "-wall");
@@ -118,8 +132,9 @@ public class Floor extends Block{
         //keep default value if not found...
         if(wall == null) wall = Blocks.air;
 
-        if(decoration == Blocks.air){
-            decoration = content.blocks().min(b -> b instanceof Boulder && b.minfo.mod == null && b.breakable ? mapColor.diff(b.mapColor) : Float.POSITIVE_INFINITY);
+        //try to load the default boulder
+        if(decoration == null){
+            decoration = content.block(name + "-boulder");
         }
 
         if(isLiquid && walkEffect == Fx.none){
@@ -131,49 +146,65 @@ public class Floor extends Block{
         }
     }
 
+    @Override
+    public TextureRegion getDisplayIcon(Tile tile){
+        return liquidDrop == null ? super.getDisplayIcon(tile) : liquidDrop.uiIcon;
+    }
+
+    @Override
+    public String getDisplayName(Tile tile){
+        return liquidDrop == null ? super.getDisplayName(tile) : liquidDrop.localizedName;
+    }
+
     @Override
     public void createIcons(MultiPacker packer){
         super.createIcons(packer);
-        packer.add(PageType.editor, "editor-" + name, Core.atlas.getPixmap((AtlasRegion)icon(Cicon.full)).crop());
+        packer.add(PageType.editor, "editor-" + name, Core.atlas.getPixmap(fullIcon));
 
         if(blendGroup != this){
             return;
         }
 
-        if(variants > 0){
-            for(int i = 0; i < variants; i++){
-                String rname = name + (i + 1);
-                packer.add(PageType.editor, "editor-" + rname, Core.atlas.getPixmap(rname).crop());
-            }
-        }
+        if(Core.atlas.has(name + "-edge")) return;
 
-        Color color = new Color();
-        Color color2 = new Color();
-        PixmapRegion image = Core.atlas.getPixmap((AtlasRegion)icons()[0]);
-        PixmapRegion edge = Core.atlas.getPixmap("edge-stencil");
+        var image = Core.atlas.getPixmap(icons()[0]);
+        var edge = Core.atlas.getPixmap(Core.atlas.find(name + "-edge-stencil", "edge-stencil"));
         Pixmap result = new Pixmap(edge.width, edge.height);
 
         for(int x = 0; x < edge.width; x++){
             for(int y = 0; y < edge.height; y++){
-                edge.getPixel(x, y, color);
-                result.draw(x, y, color.mul(color2.set(image.getPixel(x % image.width, y % image.height))));
+                result.set(x, y, Color.muli(edge.get(x, y), image.get(x % image.width, y % image.height)));
             }
         }
 
         packer.add(PageType.environment, name + "-edge", result);
+        result.dispose();
     }
 
     @Override
     public void drawBase(Tile tile){
         Mathf.rand.setSeed(tile.pos());
+        Draw.rect(variantRegions[variant(tile.x, tile.y)], tile.worldx(), tile.worldy());
 
-        Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
-
+        Draw.alpha(1f);
         drawEdges(tile);
+        drawOverlay(tile);
+    }
 
+    public int variant(int x, int y){
+        return Mathf.randomSeed(Point2.pack(x, y), 0, Math.max(0, variantRegions.length - 1));
+    }
+
+    public void drawOverlay(Tile tile){
         Floor floor = tile.overlay();
-        if(floor != Blocks.air && floor != this){ //ore should never have itself on top, but it's possible, so prevent a crash in that case
+        if(floor != Blocks.air && floor != this){
+            if(isLiquid){
+                Draw.alpha(overlayAlpha);
+            }
             floor.drawBase(tile);
+            if(isLiquid){
+                Draw.alpha(1f);
+            }
         }
     }
 
@@ -182,6 +213,16 @@ public class Floor extends Block{
         return new TextureRegion[]{Core.atlas.find(Core.atlas.has(name) ? name : name + "1")};
     }
 
+    //TODO currently broken for dynamically edited floor tiles
+    /** @return true if this floor should be updated in the render loop, e.g. for effects. Do NOT overuse this! */
+    public boolean updateRender(Tile tile){
+        return false;
+    }
+
+    public void renderUpdate(UpdateRenderState tile){
+
+    }
+
     /** @return whether this floor has a valid surface on which to place things, e.g. scorch marks. */
     public boolean hasSurface(){
         return !isLiquid && !solid;
@@ -194,48 +235,55 @@ public class Floor extends Block{
     public void drawNonLayer(Tile tile, CacheLayer layer){
         Mathf.rand.setSeed(tile.pos());
 
+        Arrays.fill(dirs, 0);
         blenders.clear();
         blended.clear();
 
         for(int i = 0; i < 8; i++){
             Point2 point = Geometry.d8[i];
             Tile other = tile.nearby(point);
-            if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null){
+            //special case: empty is, well, empty, so never draw emptiness on top, as that would just be an incorrect black texture
+            if(other != null && other.floor().cacheLayer == layer && other.floor().edges(tile.x, tile.y) != null && other.floor() != Blocks.empty){
                 if(!blended.getAndSet(other.floor().id)){
                     blenders.add(other.floor());
+                    dirs[i] = other.floorID();
                 }
             }
         }
 
-        drawBlended(tile);
+        drawBlended(tile, false);
     }
 
     protected void drawEdges(Tile tile){
         blenders.clear();
         blended.clear();
+        Arrays.fill(dirs, 0);
+        CacheLayer realCache = tile.floor().cacheLayer;
 
         for(int i = 0; i < 8; i++){
             Point2 point = Geometry.d8[i];
             Tile other = tile.nearby(point);
-            if(other != null && doEdge(other.floor()) && other.floor().cacheLayer == cacheLayer && other.floor().edges() != null){
+
+            if(other != null && doEdge(tile, other, other.floor()) && other.floor().cacheLayer == realCache && other.floor().edges(tile.x, tile.y) != null && other.floor() != Blocks.empty){
                 if(!blended.getAndSet(other.floor().id)){
                     blenders.add(other.floor());
                 }
+                dirs[i] = other.floorID();
             }
         }
 
-        drawBlended(tile);
+        drawBlended(tile, true);
     }
 
-    protected void drawBlended(Tile tile){
+    protected void drawBlended(Tile tile, boolean checkId){
         blenders.sort(a -> a.id);
 
-        for(Block block : blenders){
+        for(Floor block : blenders){
             for(int i = 0; i < 8; i++){
                 Point2 point = Geometry.d8[i];
                 Tile other = tile.nearby(point);
-                if(other != null && other.floor() == block){
-                    TextureRegion region = edge((Floor)block, 1 - point.x, 1 - point.y);
+                if(other != null && other.floor() == block && (!checkId || dirs[i] == block.id)){
+                    TextureRegion region = block.edge(tile.x, tile.y, 1 - point.x, 1 - point.y);
                     Draw.rect(region, tile.worldx(), tile.worldy());
                 }
             }
@@ -246,7 +294,7 @@ public class Floor extends Block{
     protected void drawEdgesFlat(Tile tile, boolean sameLayer){
         for(int i = 0; i < 4; i++){
             Tile other = tile.nearby(i);
-            if(other != null && doEdge(other.floor())){
+            if(other != null && doEdge(tile, other, 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);
@@ -255,17 +303,40 @@ public class Floor extends Block{
         Draw.color();
     }
 
+    public int realBlendId(Tile tile){
+        if(tile.floor().isLiquid && !tile.overlay().isAir() && !(tile.overlay() instanceof OreBlock)){
+            return -((tile.overlay().blendId) | (tile.floor().blendId << 15));
+        }
+        return blendId;
+    }
 
+    /** Returns the edge array that should be used to draw at the specified tile position. */
+    protected TextureRegion[][] edges(int x, int y){
+        return blendGroup.asFloor().edges;
+    }
+
+    protected TextureRegion edge(int x, int y, int rx, int ry){
+        return edges(x, y)[rx][2 - ry];
+    }
+
+    @Deprecated
     protected TextureRegion[][] edges(){
-        return ((Floor)blendGroup).edges;
+        return edges(0, 0);
     }
 
-    protected boolean doEdge(Floor other){
-        return other.blendGroup.id > blendGroup.id || edges() == null;
+    /** @return whether the edges from {@param other} should be drawn onto this tile **/
+    protected boolean doEdge(Tile tile, Tile otherTile, Floor other){
+        return (other.realBlendId(otherTile) > realBlendId(tile) || edges(tile.x, tile.y) == null);
     }
 
-    TextureRegion edge(Floor block, int x, int y){
-        return block.edges()[x][2 - y];
-    }
+    public static class UpdateRenderState{
+        public Tile tile;
+        public Floor floor;
+        public float data;
 
+        public UpdateRenderState(Tile tile, Floor floor){
+            this.tile = tile;
+            this.floor = floor;
+        }
+    }
 }
diff --git a/core/src/mindustry/world/blocks/environment/OreBlock.java b/core/src/mindustry/world/blocks/environment/OreBlock.java
index c08a3eccce..f6da9d5f89 100644
--- a/core/src/mindustry/world/blocks/environment/OreBlock.java
+++ b/core/src/mindustry/world/blocks/environment/OreBlock.java
@@ -14,8 +14,8 @@ import static mindustry.Vars.*;
 /**An overlay ore for a specific item type.*/
 public class OreBlock extends OverlayFloor{
 
-    public OreBlock(Item ore){
-        super("ore-" + ore.name);
+    public OreBlock(String name, Item ore){
+        super(name);
         this.localizedName = ore.localizedName;
         this.itemDrop = ore;
         this.variants = 3;
@@ -23,14 +23,19 @@ public class OreBlock extends OverlayFloor{
         this.useColor = true;
     }
 
+    public OreBlock(Item ore){
+        this("ore-" + ore.name, ore);
+    }
+
     /** For mod use only!*/
     public OreBlock(String name){
         super(name);
+        this.useColor = true;
         variants = 3;
     }
 
     public void setup(Item ore){
-        this.localizedName = ore.localizedName;
+        this.localizedName = ore.localizedName + (wallOre ? " " + Core.bundle.get("wallore") : "");
         this.itemDrop = ore;
         this.mapColor.set(ore.color);
     }
@@ -39,25 +44,24 @@ public class OreBlock extends OverlayFloor{
     @OverrideCallSuper
     public void createIcons(MultiPacker packer){
         for(int i = 0; i < variants; i++){
-            Pixmap image = new Pixmap(32, 32);
-            PixmapRegion shadow = Core.atlas.getPixmap(itemDrop.name + (i + 1));
+            //use name (e.g. "ore-copper1"), fallback to "copper1" as per the old naming system
+            PixmapRegion shadow = Core.atlas.has(name + (i + 1)) ?
+                Core.atlas.getPixmap(name + (i + 1)) :
+                Core.atlas.getPixmap(itemDrop.name + (i + 1));
 
-            int offset = image.getWidth() / tilesize - 1;
-            Color color = new Color();
+            Pixmap image = shadow.crop();
 
-            for(int x = 0; x < image.getWidth(); x++){
-                for(int y = offset; y < image.getHeight(); y++){
-                    shadow.getPixel(x, y - offset, color);
+            int offset = image.width / tilesize - 1;
+            int shadowColor = Color.rgba8888(0, 0, 0, 0.3f);
 
-                    if(color.a > 0.001f){
-                        color.set(0, 0, 0, 0.3f);
-                        image.draw(x, y, color);
+            for(int x = 0; x < image.width; x++){
+                for(int y = offset; y < image.height; y++){
+                    if(shadow.getA(x, y) == 0 && shadow.getA(x, y - offset) != 0){
+                        image.setRaw(x, y, shadowColor);
                     }
                 }
             }
 
-            image.draw(shadow);
-
             packer.add(PageType.environment, name + (i + 1), image);
             packer.add(PageType.editor, "editor-" + name + (i + 1), image);
 
@@ -65,6 +69,8 @@ public class OreBlock extends OverlayFloor{
                 packer.add(PageType.editor, "editor-block-" + name + "-full", image);
                 packer.add(PageType.main, "block-" + name + "-full", image);
             }
+
+            image.dispose();
         }
     }
 
diff --git a/core/src/mindustry/world/blocks/environment/OverlayFloor.java b/core/src/mindustry/world/blocks/environment/OverlayFloor.java
index c20eccceaf..c7d5a10f28 100644
--- a/core/src/mindustry/world/blocks/environment/OverlayFloor.java
+++ b/core/src/mindustry/world/blocks/environment/OverlayFloor.java
@@ -2,6 +2,7 @@ package mindustry.world.blocks.environment;
 
 import arc.graphics.g2d.*;
 import arc.math.*;
+import mindustry.game.*;
 import mindustry.world.*;
 
 /**A type of floor that is overlaid on top of other floors.*/
@@ -12,6 +13,11 @@ public class OverlayFloor extends Floor{
         useColor = false;
     }
 
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        return !wallOre || tile.block().solid;
+    }
+
     @Override
     public void drawBase(Tile tile){
         Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
diff --git a/core/src/mindustry/world/blocks/environment/Prop.java b/core/src/mindustry/world/blocks/environment/Prop.java
new file mode 100644
index 0000000000..44611e5ba3
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/Prop.java
@@ -0,0 +1,34 @@
+package mindustry.world.blocks.environment;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.content.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class Prop extends Block{
+    public float layer = Layer.blockProp;
+
+    public Prop(String name){
+        super(name);
+        breakable = true;
+        alwaysReplace = true;
+        instantDeconstruct = true;
+        unitMoveBreakable = true;
+        breakEffect = Fx.breakProp;
+        breakSound = Sounds.rockBreak;
+    }
+
+    @Override
+    public void drawBase(Tile tile){
+        Draw.z(layer);
+        Draw.rect(variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : region, tile.worldx(), tile.worldy());
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return variants == 0 ? super.icons() : new TextureRegion[]{Core.atlas.find(name + "1")};
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/RemoveOre.java b/core/src/mindustry/world/blocks/environment/RemoveOre.java
new file mode 100644
index 0000000000..b50d019c4f
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/RemoveOre.java
@@ -0,0 +1,51 @@
+package mindustry.world.blocks.environment;
+
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class RemoveOre extends OverlayFloor{
+
+    public RemoveOre(String name){
+        super(name);
+
+        allowRectanglePlacement = true;
+        placeEffect = Fx.rotateBlock;
+        instantBuild = true;
+        ignoreBuildDarkness = true;
+        placeableLiquid = true;
+        inEditor = false;
+        variants = 0;
+    }
+
+    @Override
+    public void drawPlan(BuildPlan plan, Eachable<BuildPlan> list, boolean valid, float alpha){
+        Draw.reset();
+        Draw.alpha(alpha * (valid ? 1f : 0.2f));
+        float prevScale = Draw.scl;
+        Draw.scl *= plan.animScale;
+        drawPlanRegion(plan, list);
+        Draw.scl = prevScale;
+        Draw.reset();
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        return tile.overlay() != Blocks.air;
+    }
+
+    @Override
+    public boolean canReplace(Block other){
+        return true;
+    }
+
+    @Override
+    public void placeEnded(Tile tile, @Nullable Unit builder){
+        tile.setOverlay(Blocks.air);
+    }
+
+}
diff --git a/core/src/mindustry/world/blocks/environment/RemoveWall.java b/core/src/mindustry/world/blocks/environment/RemoveWall.java
new file mode 100644
index 0000000000..0359ee7052
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/RemoveWall.java
@@ -0,0 +1,53 @@
+package mindustry.world.blocks.environment;
+
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class RemoveWall extends Block{
+
+    public RemoveWall(String name){
+        super(name);
+
+        allowRectanglePlacement = true;
+        placeEffect = Fx.rotateBlock;
+        instantBuild = true;
+        ignoreBuildDarkness = true;
+        placeableLiquid = true;
+        inEditor = false;
+    }
+
+    @Override
+    public void drawPlan(BuildPlan plan, Eachable<BuildPlan> list, boolean valid, float alpha){
+        Draw.reset();
+        Draw.alpha(alpha * (valid ? 1f : 0.2f));
+        float prevScale = Draw.scl;
+        Draw.scl *= plan.animScale;
+        drawPlanRegion(plan, list);
+        Draw.scl = prevScale;
+        Draw.reset();
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        return tile.block() != Blocks.air;
+    }
+
+    @Override
+    public boolean canReplace(Block other){
+        return other != Blocks.air && !other.synthetic();
+    }
+
+    @Override
+    public void placeEnded(Tile tile, @Nullable Unit builder){
+        tile.setBlock(Blocks.air);
+        if(tile.overlay().wallOre){
+            tile.setOverlay(Blocks.air);
+        }
+    }
+
+}
diff --git a/core/src/mindustry/world/blocks/environment/SeaBush.java b/core/src/mindustry/world/blocks/environment/SeaBush.java
new file mode 100644
index 0000000000..81c0c5fe58
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/SeaBush.java
@@ -0,0 +1,47 @@
+package mindustry.world.blocks.environment;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.world.*;
+
+public class SeaBush extends Prop{
+    public @Load(value = "@-bot", fallback = "@") TextureRegion botRegion;
+    public @Load(value = "@-center") TextureRegion centerRegion;
+
+    public int lobesMin = 7, lobesMax = 7;
+    public float botAngle = 60f, origin = 0.1f;
+    public float sclMin = 30f, sclMax = 50f, magMin = 5f, magMax = 15f, timeRange = 40f, spread = 0f;
+
+    static Rand rand = new Rand();
+
+    public SeaBush(String name){
+        super(name);
+        variants = 0;
+    }
+
+    @Override
+    public void drawBase(Tile tile){
+        Draw.z(layer);
+        rand.setSeed(tile.pos());
+        float offset = rand.random(180f);
+        int lobes = rand.random(lobesMin, lobesMax);
+        for(int i = 0; i < lobes; i++){
+            float ba =  i / (float)lobes * 360f + offset + rand.range(spread), angle = ba + Mathf.sin(Time.time + rand.random(0, timeRange), rand.random(sclMin, sclMax), rand.random(magMin, magMax));
+            float w = region.width * region.scl(), h = region.height * region.scl();
+            var region = Angles.angleDist(ba, 225f) <= botAngle ? botRegion : this.region;
+
+            Draw.rect(region,
+                tile.worldx() - Angles.trnsx(angle, origin) + w*0.5f, tile.worldy() - Angles.trnsy(angle, origin),
+                w, h,
+                origin*4f, h/2f,
+                angle
+            );
+        }
+
+        if(centerRegion.found()){
+            Draw.rect(centerRegion, tile.worldx(), tile.worldy());
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/Seaweed.java b/core/src/mindustry/world/blocks/environment/Seaweed.java
new file mode 100644
index 0000000000..bc1c852f90
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/Seaweed.java
@@ -0,0 +1,30 @@
+package mindustry.world.blocks.environment;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.world.*;
+
+public class Seaweed extends Prop{
+
+    public Seaweed(String name){
+        super(name);
+    }
+
+    @Override
+    public void drawBase(Tile tile){
+        var region = variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : this.region;
+
+        float
+        x = tile.worldx(), y = tile.worldy(),
+        rotmag = 3f, rotscl = 0.5f,
+        rot = Mathf.randomSeedRange(tile.pos(), 20f) - 45 + Mathf.sin(Time.time + x, 50f * rotscl, 0.5f * rotmag) + Mathf.sin(Time.time - y, 65f * rotscl, 0.9f* rotmag) + Mathf.sin(Time.time + y - x, 85f * rotscl, 0.9f* rotmag),
+        w = region.width * region.scl(), h = region.height * region.scl(),
+        scl = 30f, mag = 0.3f;
+
+        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)
+        ));
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/ShallowLiquid.java b/core/src/mindustry/world/blocks/environment/ShallowLiquid.java
index 28d94c05fe..95c4a368ee 100644
--- a/core/src/mindustry/world/blocks/environment/ShallowLiquid.java
+++ b/core/src/mindustry/world/blocks/environment/ShallowLiquid.java
@@ -1,10 +1,18 @@
 package mindustry.world.blocks.environment;
 
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.graphics.*;
+import mindustry.graphics.MultiPacker.*;
 import mindustry.world.*;
 
-//do not use in mods!
+/**
+ * Blends water together with a standard floor. No new mechanics.
+ * */
 public class ShallowLiquid extends Floor{
-    public Floor liquidBase, floorBase;
+    public @Nullable Floor liquidBase, floorBase;
     public float liquidOpacity = 0.35f;
 
     public ShallowLiquid(String name){
@@ -20,5 +28,31 @@ public class ShallowLiquid extends Floor{
         status = liquidBase.status;
         liquidDrop = liquidBase.liquidDrop;
         cacheLayer = liquidBase.cacheLayer;
+        shallow = true;
+    }
+
+    @Override
+    public void createIcons(MultiPacker packer){
+        //TODO might not be necessary at all, but I am not sure yet
+        //super.createIcons(packer);
+
+        if(liquidBase != null && floorBase != null){
+            var overlay = Core.atlas.getPixmap(liquidBase.region);
+            int index = 0;
+            for(TextureRegion region : floorBase.variantRegions()){
+                var res = Core.atlas.getPixmap(region).crop();
+                for(int x = 0; x < res.width; x++){
+                    for(int y = 0; y < res.height; y++){
+                        res.setRaw(x, y, Pixmap.blend((overlay.getRaw(x, y) & 0xffffff00) | (int)(liquidOpacity * 255), res.getRaw(x, y)));
+                    }
+                }
+
+                String baseName = this.name + "" + (++index);
+                packer.add(PageType.environment, baseName, res);
+                packer.add(PageType.editor, "editor-" + baseName, res);
+
+                res.dispose();
+            }
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/environment/SpawnBlock.java b/core/src/mindustry/world/blocks/environment/SpawnBlock.java
new file mode 100644
index 0000000000..fd3360a837
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/SpawnBlock.java
@@ -0,0 +1,15 @@
+package mindustry.world.blocks.environment;
+
+import mindustry.world.*;
+
+public class SpawnBlock extends OverlayFloor{
+
+    public SpawnBlock(String name){
+        super(name);
+        variants = 0;
+        needsSurface = false;
+    }
+
+    @Override
+    public void drawBase(Tile tile){}
+}
diff --git a/core/src/mindustry/world/blocks/environment/StaticTree.java b/core/src/mindustry/world/blocks/environment/StaticTree.java
index 9b1a7063f4..7ec5984513 100644
--- a/core/src/mindustry/world/blocks/environment/StaticTree.java
+++ b/core/src/mindustry/world/blocks/environment/StaticTree.java
@@ -1,6 +1,7 @@
 package mindustry.world.blocks.environment;
 
 import arc.graphics.g2d.*;
+import arc.math.*;
 import arc.util.*;
 import mindustry.world.*;
 
@@ -10,13 +11,16 @@ public class StaticTree extends StaticWall{
 
     public StaticTree(String name){
         super(name);
+        variants = 0;
     }
 
     @Override
     public void drawBase(Tile tile){
+        TextureRegion reg = variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : region;
+
         TextureRegion r = Tmp.tr1;
-        r.set(region);
-        int crop = (region.width - tilesize*4) / 2;
+        r.set(reg);
+        int crop = (r.width - tilesize*4) / 2;
         float ox = 0;
         float oy = 0;
 
diff --git a/core/src/mindustry/world/blocks/environment/StaticWall.java b/core/src/mindustry/world/blocks/environment/StaticWall.java
index a364db4ab2..b59b25f30b 100644
--- a/core/src/mindustry/world/blocks/environment/StaticWall.java
+++ b/core/src/mindustry/world/blocks/environment/StaticWall.java
@@ -5,12 +5,13 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
-public class StaticWall extends Boulder{
+public class StaticWall extends Prop{
     public @Load("@-large") TextureRegion large;
     public TextureRegion[][] split;
 
@@ -20,6 +21,11 @@ public class StaticWall extends Boulder{
         solid = true;
         variants = 2;
         cacheLayer = CacheLayer.walls;
+        allowRectanglePlacement = true;
+        placeEffect = Fx.rotateBlock;
+        instantBuild = true;
+        ignoreBuildDarkness = true;
+        placeableLiquid = true;
     }
 
     @Override
@@ -27,19 +33,37 @@ public class StaticWall extends Boulder{
         int rx = tile.x / 2 * 2;
         int ry = tile.y / 2 * 2;
 
-        if(Core.atlas.isFound(large) && eq(rx, ry) && Mathf.randomSeed(Point2.pack(rx, ry)) < 0.5){
+        if(Core.atlas.isFound(large) && eq(rx, ry) && Mathf.randomSeed(Point2.pack(rx, ry)) < 0.5 && split.length >= 2 && split[0].length >= 2){
             Draw.rect(split[tile.x % 2][1 - tile.y % 2], tile.worldx(), tile.worldy());
         }else if(variants > 0){
             Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
         }else{
             Draw.rect(region, tile.worldx(), tile.worldy());
         }
+
+        //draw ore on top
+        if(tile.overlay().wallOre){
+            tile.overlay().drawBase(tile);
+        }
     }
 
     @Override
     public void load(){
         super.load();
-        split = large.split(32, 32);
+        int size = large.width / 2;
+        split = large.split(size, size);
+        if(split != null){
+            for(var arr : split){
+                for(var reg : arr){
+                    reg.scale = region.scale;
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean canReplace(Block other){
+        return other instanceof StaticWall || super.canReplace(other);
     }
 
     boolean eq(int rx, int ry){
diff --git a/core/src/mindustry/world/blocks/environment/SteamVent.java b/core/src/mindustry/world/blocks/environment/SteamVent.java
new file mode 100644
index 0000000000..ef2414e1cf
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/SteamVent.java
@@ -0,0 +1,78 @@
+package mindustry.world.blocks.environment;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+//can't use an overlay for this because it spans multiple tiles
+public class SteamVent extends Floor{
+    public static final Point2[] offsets = {
+        new Point2(0, 0),
+        new Point2(1, 0),
+        new Point2(1, 1),
+        new Point2(0, 1),
+        new Point2(-1, 1),
+        new Point2(-1, 0),
+        new Point2(-1, -1),
+        new Point2(0, -1),
+        new Point2(1, -1),
+    };
+
+    public Block parent = Blocks.air;
+    public Effect effect = Fx.ventSteam;
+    public Color effectColor = Pal.vent;
+    public float effectSpacing = 15f;
+
+    static{
+        for(var p : offsets){
+            p.sub(1, 1);
+        }
+    }
+
+    public SteamVent(String name){
+        super(name);
+        variants = 2;
+    }
+
+    @Override
+    public void drawBase(Tile tile){
+        parent.drawBase(tile);
+
+        if(checkAdjacent(tile)){
+            Mathf.rand.setSeed(tile.pos());
+            Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx() - tilesize, tile.worldy() - tilesize);
+        }
+    }
+
+    @Override
+    public boolean updateRender(Tile tile){
+        return checkAdjacent(tile);
+    }
+
+    @Override
+    public void renderUpdate(UpdateRenderState state){
+        if(state.tile.nearby(-1, -1) != null && state.tile.nearby(-1, -1).block() == Blocks.air && (state.data += Time.delta) >= effectSpacing){
+            effect.at(state.tile.x * tilesize - tilesize, state.tile.y * tilesize - tilesize, effectColor);
+            state.data = 0f;
+        }
+    }
+
+    public boolean checkAdjacent(Tile tile){
+        for(var point : offsets){
+            Tile other = Vars.world.tile(tile.x + point.x, tile.y + point.y);
+            if(other == null || other.floor() != this){
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/TallBlock.java b/core/src/mindustry/world/blocks/environment/TallBlock.java
new file mode 100644
index 0000000000..f9384ff98f
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/TallBlock.java
@@ -0,0 +1,55 @@
+package mindustry.world.blocks.environment;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+//I don't know what else to call this. It's not a prop, it's not a tree.
+public class TallBlock extends Block{
+    public float shadowOffset = -3f;
+    public float layer = Layer.power + 1;
+    public float shadowLayer = Layer.power - 1;
+    public float rotationRand = 20f;
+    public float shadowAlpha = 0.6f;
+
+    public TallBlock(String name){
+        super(name);
+        solid = true;
+        clipSize = 90;
+        customShadow = true;
+    }
+
+    @Override
+    public void init(){
+        super.init();
+        hasShadow = true;
+    }
+
+    @Override
+    public void drawBase(Tile tile){
+        float rot = Mathf.randomSeedRange(tile.pos() + 1, rotationRand);
+
+        Draw.z(shadowLayer);
+        Draw.color(0f, 0f, 0f, shadowAlpha);
+        Draw.rect(variants > 0 ? variantShadowRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantShadowRegions.length - 1))] : customShadowRegion,
+            tile.worldx() + shadowOffset, tile.worldy() + shadowOffset, rot);
+
+        Draw.color();
+
+        Draw.z(layer);
+        Draw.rect(variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : region,
+            tile.worldx(), tile.worldy(), rot);
+    }
+
+    @Override
+    public void drawShadow(Tile tile){
+
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return variants == 0 ? super.icons() : new TextureRegion[]{Core.atlas.find(name + "1")};
+    }
+}
diff --git a/core/src/mindustry/world/blocks/environment/TreeBlock.java b/core/src/mindustry/world/blocks/environment/TreeBlock.java
index d0354c2811..f05348884b 100644
--- a/core/src/mindustry/world/blocks/environment/TreeBlock.java
+++ b/core/src/mindustry/world/blocks/environment/TreeBlock.java
@@ -2,45 +2,47 @@ package mindustry.world.blocks.environment;
 
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.math.geom.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 
 public class TreeBlock extends Block{
-    public @Load("@-shadow") TextureRegion shadow;
     public float shadowOffset = -4f;
+    public @Load("@-shadow") TextureRegion shadow;
 
     public TreeBlock(String name){
         super(name);
         solid = true;
-        expanded = true;
+        clipSize = 90;
+        customShadow = true;
     }
 
     @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;
+        float
+        x = tile.worldx(), y = tile.worldy(),
+        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),
+        w = region.width * region.scl(), h = region.height * region.scl(),
+        scl = 30f, mag = 0.2f;
 
-        if(shadow.found()){
+        TextureRegion shad = variants == 0 ? customShadowRegion : variantShadowRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantShadowRegions.length - 1))];
+
+        if(shad.found()){
             Draw.z(Layer.power - 1);
-            Draw.rect(shadow, tile.worldx() + shadowOffset, tile.worldy() + shadowOffset, rot);
+            Draw.rect(shad, tile.worldx() + shadowOffset, tile.worldy() + shadowOffset, rot);
         }
 
+        TextureRegion reg = variants == 0 ? region : variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))];
+        
         Draw.z(Layer.power + 1);
-        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)
-            );
-        });
+        Draw.rectv(reg, 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){
-
-    }
+    @Override
+    public void drawShadow(Tile tile){}
 }
diff --git a/core/src/mindustry/world/blocks/environment/WobbleProp.java b/core/src/mindustry/world/blocks/environment/WobbleProp.java
new file mode 100644
index 0000000000..6c2670db78
--- /dev/null
+++ b/core/src/mindustry/world/blocks/environment/WobbleProp.java
@@ -0,0 +1,26 @@
+package mindustry.world.blocks.environment;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class WobbleProp extends Prop{
+    public float wscl = 25f, wmag = 0.4f, wtscl = 1f, wmag2 = 1f;
+
+    public WobbleProp(String name){
+        super(name);
+        breakSound = Sounds.plantBreak;
+    }
+
+    @Override
+    public void drawBase(Tile tile){
+        var region = variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : this.region;
+
+        Draw.rectv(region, tile.worldx(), tile.worldy(), region.width * region.scl(), region.height * region.scl(), 0, vec -> vec.add(
+        Mathf.sin(vec.y*3 + Time.time, wscl, wmag) + Mathf.sin(vec.x*3 - Time.time, 70 * wtscl, 0.8f * wmag2),
+        Mathf.cos(vec.x*3 + Time.time + 8, wscl + 6f, wmag * 1.1f) + Mathf.sin(vec.y*3 - Time.time, 50 * wtscl, 0.2f * wmag2)
+        ));
+    }
+}
diff --git a/core/src/mindustry/world/blocks/experimental/BlockForge.java b/core/src/mindustry/world/blocks/experimental/BlockForge.java
deleted file mode 100644
index 83f9bc032a..0000000000
--- a/core/src/mindustry/world/blocks/experimental/BlockForge.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package mindustry.world.blocks.experimental;
-
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import arc.util.*;
-import arc.util.io.*;
-import mindustry.*;
-import mindustry.entities.units.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.*;
-import mindustry.world.blocks.*;
-import mindustry.world.blocks.payloads.*;
-import mindustry.world.blocks.production.*;
-import mindustry.world.consumers.*;
-
-import static mindustry.Vars.*;
-
-public class BlockForge extends PayloadAcceptor{
-    public float buildSpeed = 0.4f;
-    public int minBlockSize = 1, maxBlockSize = 2;
-
-    public BlockForge(String name){
-        super(name);
-
-        size = 3;
-        update = true;
-        outputsPayload = true;
-        hasItems = true;
-        configurable = true;
-        hasPower = true;
-        rotate = true;
-
-        config(Block.class, (BlockForgeBuild tile, Block block) -> {
-            if(tile.recipe != block) tile.progress = 0f;
-            tile.recipe = block;
-        });
-
-        consumes.add(new ConsumeItemDynamic((BlockForgeBuild e) -> e.recipe != null ? e.recipe.requirements : ItemStack.empty));
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{region, outRegion};
-    }
-
-    @Override
-    public void setBars(){
-        super.setBars();
-
-        bars.add("progress", (BlockForgeBuild entity) -> new Bar("bar.progress", Pal.ammo, () -> entity.recipe == null ? 0f : (entity.progress / entity.recipe.buildCost)));
-    }
-
-    @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        Draw.rect(region, req.drawx(), req.drawy());
-        Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
-    }
-    
-    public class BlockForgeBuild extends PayloadAcceptorBuild<BuildPayload>{
-        public @Nullable Block recipe;
-        public float progress, time, heat;
-
-        @Override
-        public boolean acceptItem(Building source, Item item){
-            return items.get(item) < getMaximumAccepted(item);
-        }
-
-        @Override
-        public int getMaximumAccepted(Item item){
-            if(recipe == null) return 0;
-            for(ItemStack stack : recipe.requirements){
-                if(stack.item == item) return stack.amount * 2;
-            }
-            return 0;
-        }
-
-        @Override
-        public boolean acceptPayload(Building source, Payload payload){
-            return false;
-        }
-
-        @Override
-        public void updateTile(){
-            boolean produce = recipe != null && consValid() && payload == null;
-
-            if(produce){
-                progress += buildSpeed * edelta();
-
-                if(progress >= recipe.buildCost){
-                    consume();
-                    payload = new BuildPayload(recipe, team);
-                    payVector.setZero();
-                    progress = 0f;
-                }
-            }
-
-            heat = Mathf.lerpDelta(heat, Mathf.num(produce), 0.3f);
-            time += heat * delta();
-
-            moveOutPayload();
-        }
-
-        @Override
-        public void buildConfiguration(Table table){
-            Seq<Block> blocks = Vars.content.blocks().select(b -> b.isVisible() && b.size >= minBlockSize && b.size <= maxBlockSize);
-
-            ItemSelection.buildTable(table, blocks, () -> recipe, this::configure);
-        }
-
-        @Override
-        public Object config(){
-            return recipe;
-        }
-
-        @Override
-        public void draw(){
-            Draw.rect(region, x, y);
-            Draw.rect(outRegion, x, y, rotdeg());
-
-            if(recipe != null){
-                Draw.draw(Layer.blockOver, () -> Drawf.construct(this, recipe, 0, progress / recipe.buildCost, heat, time));
-            }
-
-            drawPayload();
-        }
-        
-        @Override
-        public void drawSelect(){
-            if(recipe != null){
-                float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f;
-                TextureRegion icon = recipe.icon(Cicon.medium);
-                Draw.mixcol(Color.darkGray, 1f);
-                //Fixes size because modded content icons are not scaled
-                Draw.rect(icon, dx - 0.7f, dy - 1f, Draw.scl * Draw.xscl * 24f, Draw.scl * Draw.yscl * 24f);
-                Draw.reset();
-                Draw.rect(icon, dx, dy, Draw.scl * Draw.xscl * 24f, Draw.scl * Draw.yscl * 24f);
-            }
-        }
-
-        @Override
-        public void write(Writes write){
-            super.write(write);
-            write.s(recipe == null ? -1 : recipe.id);
-            write.f(progress);
-        }
-
-        @Override
-        public void read(Reads read, byte revision){
-            super.read(read, revision);
-            recipe = Vars.content.block(read.s());
-            progress = read.f();
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
deleted file mode 100644
index 172ea8e5b7..0000000000
--- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package mindustry.world.blocks.experimental;
-
-import arc.*;
-import arc.graphics.g2d.*;
-import arc.util.*;
-import mindustry.entities.units.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.blocks.payloads.*;
-import mindustry.world.blocks.production.*;
-
-import static mindustry.Vars.*;
-
-public class BlockLoader extends PayloadAcceptor{
-    public final int timerLoad = timers++;
-
-    public float loadTime = 2f;
-    public int itemsLoaded = 5;
-    public float liquidsLoaded = 5f;
-    public int maxBlockSize = 2;
-
-    public BlockLoader(String name){
-        super(name);
- 
-        hasItems = true;
-        itemCapacity = 25;
-        //liquidCapacity = 25;
-        update = true;
-        outputsPayload = true;
-        size = 3;
-        rotate = true;
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{region, inRegion, outRegion, topRegion};
-    }
-
-    @Override
-    public boolean outputsItems(){
-        return false;
-    }
-
-    @Override
-    public void setBars(){
-        super.setBars();
-
-        bars.add("progress", (BlockLoaderBuild entity) -> new Bar(() -> Core.bundle.format("bar.items", entity.payload == null ? 0 : entity.payload.build.items.total()), () -> Pal.items, entity::fraction));
-    }
-
-    @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        Draw.rect(region, req.drawx(), req.drawy());
-        Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90);
-        Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
-        Draw.rect(topRegion, req.drawx(), req.drawy());
-    }
-
-    public class BlockLoaderBuild extends PayloadAcceptorBuild<BuildPayload>{
-
-        @Override
-        public boolean acceptPayload(Building source, Payload payload){
-            return super.acceptPayload(source, payload) &&
-                (payload instanceof BuildPayload build) &&
-                ((build.build.block.hasItems && build.block().unloadable && build.block().itemCapacity >= 10 && build.block().size <= maxBlockSize)/* ||
-                ((BlockPayload)payload).entity.block().hasLiquids && ((BlockPayload)payload).block().liquidCapacity >= 10f)*/);
-        }
-
-        @Override
-        public boolean acceptItem(Building source, Item item){
-            return items.total() < itemCapacity;
-        }
-
-        @Override
-        public void draw(){
-            Draw.rect(region, x, y);
-
-            //draw input
-            boolean fallback = true;
-            for(int i = 0; i < 4; i++){
-                if(blends(i) && i != rotation){
-                    Draw.rect(inRegion, x, y, (i * 90) - 180);
-                    fallback = false;
-                }
-            }
-            if(fallback) Draw.rect(inRegion, x, y, rotation * 90);
-
-            Draw.rect(outRegion, x, y, rotdeg());
-
-            Draw.z(Layer.blockOver);
-            payRotation = rotdeg();
-            drawPayload();
-
-            Draw.z(Layer.blockOver + 0.1f);
-            Draw.rect(topRegion, x, y);
-        }
-
-        @Override
-        public void updateTile(){
-            if(shouldExport()){
-                moveOutPayload();
-            }else if(moveInPayload()){
-
-                //load up items
-                if(payload.block().hasItems && items.any()){
-                    if(efficiency() > 0.01f && timer(timerLoad, loadTime / efficiency())){
-                        //load up items a set amount of times
-                        for(int j = 0; j < itemsLoaded && items.any(); j++){
-
-                            for(int i = 0; i < items.length(); i++){
-                                if(items.get(i) > 0){
-                                    Item item = content.item(i);
-                                    if(payload.build.acceptItem(payload.build, item)){
-                                        payload.build.handleItem(payload.build, item);
-                                        items.remove(item, 1);
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                //load up liquids (disabled)
-                /*
-                if(payload.block().hasLiquids && liquids.total() >= 0.001f){
-                    Liquid liq = liquids.current();
-                    float total = liquids.currentAmount();
-                    float flow = Math.min(Math.min(liquidsLoaded * delta(), payload.block().liquidCapacity - payload.entity.liquids.get(liq) - 0.0001f), total);
-                    if(payload.entity.acceptLiquid(payload.entity, liq, flow)){
-                        payload.entity.liquids.add(liq, flow);
-                        liquids.remove(liq, flow);
-                    }
-                }*/
-            }
-        }
-
-        public float fraction(){
-            return payload == null ? 0f : payload.build.items.total() / (float)payload.build.block.itemCapacity;
-        }
-
-        public boolean shouldExport(){
-            return payload != null &&
-                ((payload.block().hasLiquids && payload.build.liquids.total() >= payload.block().liquidCapacity - 0.001f) ||
-                (payload.block().hasItems && payload.build.items.total() >= payload.block().itemCapacity));
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
deleted file mode 100644
index cdb3681ae9..0000000000
--- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package mindustry.world.blocks.experimental;
-
-import mindustry.gen.*;
-import mindustry.type.*;
-
-import static mindustry.Vars.*;
-
-public class BlockUnloader extends BlockLoader{
-
-    public BlockUnloader(String name){
-        super(name);
-    }
-
-    @Override
-    public boolean outputsItems(){
-        return true;
-    }
-
-    public class BlockUnloaderBuild extends BlockLoaderBuild{
-
-        @Override
-        public boolean acceptItem(Building source, Item item){
-            return false;
-        }
-
-        @Override
-        public void updateTile(){
-            if(shouldExport()){
-                moveOutPayload();
-            }else if(moveInPayload()){
-
-                //load up items
-                if(payload.block().hasItems && !full()){
-                    if(efficiency() > 0.01f && timer(timerLoad, loadTime / efficiency())){
-                        //load up items a set amount of times
-                        for(int j = 0; j < itemsLoaded && !full(); j++){
-                            for(int i = 0; i < items.length(); i++){
-                                if(payload.build.items.get(i) > 0){
-                                    Item item = content.item(i);
-                                    payload.build.items.remove(item, 1);
-                                    items.add(item, 1);
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            dump();
-        }
-
-        public boolean full(){
-            return items.total() >= itemCapacity;
-        }
-
-        @Override
-        public boolean shouldExport(){
-            return payload != null && (payload.block().hasItems && payload.build.items.empty());
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/heat/HeatBlock.java b/core/src/mindustry/world/blocks/heat/HeatBlock.java
new file mode 100644
index 0000000000..665df310de
--- /dev/null
+++ b/core/src/mindustry/world/blocks/heat/HeatBlock.java
@@ -0,0 +1,8 @@
+package mindustry.world.blocks.heat;
+
+/** Basic interface for any block that produces heat.*/
+public interface HeatBlock{
+    float heat();
+    /** @return heat as a fraction of max heat */
+    float heatFrac();
+}
diff --git a/core/src/mindustry/world/blocks/heat/HeatConductor.java b/core/src/mindustry/world/blocks/heat/HeatConductor.java
new file mode 100644
index 0000000000..8ca9446de3
--- /dev/null
+++ b/core/src/mindustry/world/blocks/heat/HeatConductor.java
@@ -0,0 +1,106 @@
+package mindustry.world.blocks.heat;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.draw.*;
+
+public class HeatConductor extends Block{
+    public float visualMaxHeat = 15f;
+    public DrawBlock drawer = new DrawDefault();
+    public boolean splitHeat = false;
+
+    public HeatConductor(String name){
+        super(name);
+        update = solid = rotate = true;
+        rotateDraw = false;
+        size = 3;
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        //TODO show number
+        addBar("heat", (HeatConductorBuild entity) -> new Bar(() -> Core.bundle.format("bar.heatamount", (int)(entity.heat + 0.001f)), () -> Pal.lightOrange, () -> entity.heat / visualMaxHeat));
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        drawer.load(this);
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        drawer.drawPlan(this, plan, list);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return drawer.finalIcons(this);
+    }
+
+    public class HeatConductorBuild extends Building implements HeatBlock, HeatConsumer{
+        public float heat = 0f;
+        public float[] sideHeat = new float[4];
+        public IntSet cameFrom = new IntSet();
+        public long lastHeatUpdate = -1;
+
+        @Override
+        public void draw(){
+            drawer.draw(this);
+        }
+
+        @Override
+        public void drawLight(){
+            super.drawLight();
+            drawer.drawLight(this);
+        }
+
+        @Override
+        public float[] sideHeat(){
+            return sideHeat;
+        }
+
+        @Override
+        public float heatRequirement(){
+            return visualMaxHeat;
+        }
+
+        @Override
+        public void updateTile(){
+            updateHeat();
+        }
+
+        public void updateHeat(){
+            if(lastHeatUpdate == Vars.state.updateId) return;
+
+            lastHeatUpdate = Vars.state.updateId;
+            heat = calculateHeat(sideHeat, cameFrom);
+        }
+
+        @Override
+        public float warmup(){
+            return heat;
+        }
+
+        @Override
+        public float heat(){
+            return heat;
+        }
+
+        @Override
+        public float heatFrac(){
+            return (heat / visualMaxHeat) / (splitHeat ? 3f : 1);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/heat/HeatConsumer.java b/core/src/mindustry/world/blocks/heat/HeatConsumer.java
new file mode 100644
index 0000000000..f59569a98e
--- /dev/null
+++ b/core/src/mindustry/world/blocks/heat/HeatConsumer.java
@@ -0,0 +1,6 @@
+package mindustry.world.blocks.heat;
+
+public interface HeatConsumer{
+    float[] sideHeat();
+    float heatRequirement();
+}
diff --git a/core/src/mindustry/world/blocks/heat/HeatProducer.java b/core/src/mindustry/world/blocks/heat/HeatProducer.java
new file mode 100644
index 0000000000..b2bcd8ab2d
--- /dev/null
+++ b/core/src/mindustry/world/blocks/heat/HeatProducer.java
@@ -0,0 +1,72 @@
+package mindustry.world.blocks.heat;
+
+import arc.math.*;
+import arc.util.io.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.blocks.production.*;
+import mindustry.world.draw.*;
+import mindustry.world.meta.*;
+
+public class HeatProducer extends GenericCrafter{
+    public float heatOutput = 10f;
+    public float warmupRate = 0.15f;
+
+    public HeatProducer(String name){
+        super(name);
+
+        drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput());
+        rotateDraw = false;
+        rotate = true;
+        canOverdrive = false;
+        drawArrow = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.output, heatOutput, StatUnit.heatUnits);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("heat", (HeatProducerBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat / heatOutput));
+    }
+
+    public class HeatProducerBuild extends GenericCrafterBuild implements HeatBlock{
+        public float heat;
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            //heat approaches target at the same speed regardless of efficiency
+            heat = Mathf.approachDelta(heat, heatOutput * efficiency, warmupRate * delta());
+        }
+
+        @Override
+        public float heatFrac(){
+            return heat / heatOutput;
+        }
+
+        @Override
+        public float heat(){
+            return heat;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(heat);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            heat = read.f();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/legacy/LegacyBlock.java b/core/src/mindustry/world/blocks/legacy/LegacyBlock.java
index 61b3d690f6..01db7d7ace 100644
--- a/core/src/mindustry/world/blocks/legacy/LegacyBlock.java
+++ b/core/src/mindustry/world/blocks/legacy/LegacyBlock.java
@@ -7,6 +7,8 @@ public class LegacyBlock extends Block{
 
     public LegacyBlock(String name){
         super(name);
+        inEditor = false;
+        generateIcons = false;
     }
 
     /** Removes this block from the world, or replaces it with something else. */
diff --git a/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java b/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java
new file mode 100644
index 0000000000..5ea8aee12a
--- /dev/null
+++ b/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java
@@ -0,0 +1,28 @@
+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 CommandBuild extends Building{
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.b(0);
+        }
+
+        @Override
+        public void read(Reads read, byte version){
+            super.read(read, version);
+            read.b();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
index e404b36b44..f4adacd4f6 100644
--- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
+++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
@@ -1,13 +1,11 @@
 package mindustry.world.blocks.liquid;
 
-import arc.graphics.g2d.*;
-import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.distribution.*;
 
 public class ArmoredConduit extends Conduit{
-    public @Load("@-cap") TextureRegion capRegion;
 
     public ArmoredConduit(String name){
         super(name);
@@ -17,25 +15,15 @@ public class ArmoredConduit extends Conduit{
     @Override
     public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
         return (otherblock.outputsLiquid && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) ||
-            (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasLiquids);
+            (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasLiquids) || otherblock instanceof LiquidJunction;
     }
 
     public class ArmoredConduitBuild extends ConduitBuild{
-        @Override
-        public void draw(){
-            super.draw();
-
-            //draw the cap when a conduit would normally leak
-            Building next = front();
-            if(next != null && next.team == team && next.block.hasLiquids) return;
-
-            Draw.rect(capRegion, x, y, rotdeg());
-        }
-
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
-            return super.acceptLiquid(source, liquid) && (source.block instanceof Conduit ||
-                source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation);
+            //TODO the proximity check is a super hacky solution for block-to-conduit through a junction...
+            return super.acceptLiquid(source, liquid) && (tile == null || source.block instanceof Conduit || source.block instanceof DirectionLiquidBridge || source.block instanceof LiquidJunction ||
+                source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation || !source.proximity.contains(this));
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java
index fe7f0086b0..64f1b02ac4 100644
--- a/core/src/mindustry/world/blocks/liquid/Conduit.java
+++ b/core/src/mindustry/world/blocks/liquid/Conduit.java
@@ -10,58 +10,122 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.input.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.distribution.*;
 
 import static mindustry.Vars.*;
+import static mindustry.type.Liquid.*;
 
 public class Conduit extends LiquidBlock implements Autotiler{
+    static final float rotatePad = 6, hpad = rotatePad / 2f / 4f;
+    static final float[][] rotateOffsets = {{hpad, hpad}, {-hpad, hpad}, {-hpad, -hpad}, {hpad, -hpad}};
+
     public final int timerFlow = timers++;
-    
+
     public Color botColor = Color.valueOf("565656");
 
     public @Load(value = "@-top-#", length = 5) TextureRegion[] topRegions;
     public @Load(value = "@-bottom-#", length = 5, fallback = "conduit-bottom-#") TextureRegion[] botRegions;
+    public @Load("@-cap") TextureRegion capRegion;
 
+    /** indices: [rotation] [fluid type] [frame] */
+    public TextureRegion[][][] rotateRegions;
+
+    /** If true, the liquid region is padded at corners, so it doesn't stick out. */
+    public boolean padCorners = true;
     public boolean leaks = true;
+    public @Nullable Block junctionReplacement, bridgeReplacement, rotBridgeReplacement;
 
     public Conduit(String name){
         super(name);
         rotate = true;
         solid = false;
         floating = true;
+        underBullets = true;
         conveyorPlacement = true;
         noUpdateDisabled = true;
+        canOverdrive = false;
+        priority = TargetPriority.transport;
     }
 
     @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        int[] bits = getTiling(req, list);
+    public void init(){
+        super.init();
+
+        if(junctionReplacement == null) junctionReplacement = Blocks.liquidJunction;
+        if(bridgeReplacement == null || !(bridgeReplacement instanceof ItemBridge)) bridgeReplacement = Blocks.bridgeConduit;
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        rotateRegions = new TextureRegion[4][2][animationFrames];
+
+        if(renderer != null){
+            float pad = rotatePad;
+            var frames = renderer.getFluidFrames();
+
+            for(int rot = 0; rot < 4; rot++){
+                for(int fluid = 0; fluid < 2; fluid++){
+                    for(int frame = 0; frame < animationFrames; frame++){
+                        TextureRegion base = frames[fluid][frame];
+                        TextureRegion result = new TextureRegion();
+                        result.set(base);
+
+                        if(rot == 0){
+                            result.setX(result.getX() + pad);
+                            result.setHeight(result.height - pad);
+                        }else if(rot == 1){
+                            result.setWidth(result.width - pad);
+                            result.setHeight(result.height - pad);
+                        }else if(rot == 2){
+                            result.setWidth(result.width - pad);
+                            result.setY(result.getY() + pad);
+                        }else{
+                            result.setX(result.getX() + pad);
+                            result.setY(result.getY() + pad);
+                        }
+
+                        rotateRegions[rot][fluid][frame] = result;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        int[] bits = getTiling(plan, list);
 
         if(bits == null) return;
 
         Draw.scl(bits[1], bits[2]);
         Draw.color(botColor);
         Draw.alpha(0.5f);
-        Draw.rect(botRegions[bits[0]], req.drawx(), req.drawy(), req.rotation * 90);
+        Draw.rect(botRegions[bits[0]], plan.drawx(), plan.drawy(), plan.rotation * 90);
         Draw.color();
-        Draw.rect(topRegions[bits[0]], req.drawx(), req.drawy(), req.rotation * 90);
+        Draw.rect(topRegions[bits[0]], plan.drawx(), plan.drawy(), plan.rotation * 90);
         Draw.scl();
     }
 
     @Override
-    public Block getReplacement(BuildPlan req, Seq<BuildPlan> requests){
-        Boolf<Point2> cont = p -> requests.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && o.rotation == req.rotation && (req.block instanceof Conduit || req.block instanceof LiquidJunction));
+    public Block getReplacement(BuildPlan req, Seq<BuildPlan> plans){
+        if(junctionReplacement == null) return this;
+
+        Boolf<Point2> cont = p -> plans.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && (req.block instanceof Conduit || req.block instanceof LiquidJunction));
         return cont.get(Geometry.d4(req.rotation)) &&
             cont.get(Geometry.d4(req.rotation - 2)) &&
             req.tile() != null &&
             req.tile().block() instanceof Conduit &&
-            Mathf.mod(req.build().rotation - req.rotation, 2) == 1 ? Blocks.liquidJunction : this;
+            Mathf.mod(req.build().rotation - req.rotation, 2) == 1 ? junctionReplacement : this;
     }
 
     @Override
@@ -69,6 +133,17 @@ public class Conduit extends LiquidBlock implements Autotiler{
         return otherblock.hasLiquids && (otherblock.outputsLiquid || (lookingAt(tile, rotation, otherx, othery, otherblock))) && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
     }
 
+    @Override
+    public void handlePlacementLine(Seq<BuildPlan> plans){
+        if(bridgeReplacement == null) return;
+
+        if(rotBridgeReplacement instanceof DirectionBridge duct){
+            Placement.calculateBridges(plans, duct, true, b -> b instanceof Conduit);
+        }else{
+            Placement.calculateBridges(plans, (ItemBridge)bridgeReplacement, b -> b instanceof Conduit);
+        }
+    }
+
     @Override
     public TextureRegion[] icons(){
         return new TextureRegion[]{Core.atlas.find("conduit-bottom"), topRegions[0]};
@@ -76,11 +151,11 @@ public class Conduit extends LiquidBlock implements Autotiler{
 
     public class ConduitBuild extends LiquidBuild implements ChainedBuilding{
         public float smoothLiquid;
-        public int blendbits, xscl, yscl, blending;
+        public int blendbits, xscl = 1, yscl = 1, blending;
+        public boolean capped, backCapped = false;
 
         @Override
         public void draw(){
-            float rotation = rotdeg();
             int r = this.rotation;
 
             //draw extra conduits facing this one for tiling purposes
@@ -88,25 +163,45 @@ public class Conduit extends LiquidBlock implements Autotiler{
             for(int i = 0; i < 4; i++){
                 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 ? SliceMode.bottom : SliceMode.top);
+                    drawAt(x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, 0, i == 0 ? r : dir, i != 0 ? SliceMode.bottom : SliceMode.top);
                 }
             }
 
             Draw.z(Layer.block);
 
             Draw.scl(xscl, yscl);
-            drawAt(x, y, blendbits, rotation, SliceMode.none);
+            drawAt(x, y, blendbits, r, SliceMode.none);
             Draw.reset();
+
+            if(capped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg());
+            if(backCapped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg() + 180);
         }
 
-        protected void drawAt(float x, float y, int bits, float rotation, SliceMode slice){
+        protected void drawAt(float x, float y, int bits, int rotation, SliceMode slice){
+            float angle = rotation * 90f;
             Draw.color(botColor);
-            Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
+            Draw.rect(sliced(botRegions[bits], slice), x, y, angle);
 
-            Drawf.liquid(sliced(botRegions[bits], slice), x, y, smoothLiquid, liquids.current().color, rotation);
+            int offset = yscl == -1 ? 3 : 0;
 
-            Draw.rect(sliced(topRegions[bits], slice), x, y, rotation);
+            int frame = liquids.current().getAnimationFrame();
+            int gas = liquids.current().gas ? 1 : 0;
+            float ox = 0f, oy = 0f;
+            int wrapRot = (rotation + offset) % 4;
+            TextureRegion liquidr = bits == 1 && padCorners ? rotateRegions[wrapRot][gas][frame] : renderer.fluidFrames[gas][frame];
+
+            if(bits == 1 && padCorners){
+                ox = rotateOffsets[wrapRot][0];
+                oy = rotateOffsets[wrapRot][1];
+            }
+
+            //the drawing state machine sure was a great design choice with no downsides or hidden behavior!!!
+            float xscl = Draw.xscl, yscl = Draw.yscl;
+            Draw.scl(1f, 1f);
+            Drawf.liquid(sliced(liquidr, slice), x + ox, y + oy, smoothLiquid, liquids.current().color.write(Tmp.c1).a(1f));
+            Draw.scl(xscl, yscl);
+
+            Draw.rect(sliced(topRegions[bits], slice), x, y, angle);
         }
 
         @Override
@@ -118,20 +213,24 @@ public class Conduit extends LiquidBlock implements Autotiler{
             xscl = bits[1];
             yscl = bits[2];
             blending = bits[4];
+
+            Building next = front(), prev = back();
+            capped = next == null || next.team != team || !next.block.hasLiquids;
+            backCapped = blendbits == 0 && (prev == null || prev.team != team || !prev.block.hasLiquids);
         }
 
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
             noSleep();
             return (liquids.current() == liquid || liquids.currentAmount() < 0.2f)
-                && ((source.relativeTo(tile.x, tile.y) + 2) % 4 != rotation);
+                && (tile == null || source == this || (source.relativeTo(tile.x, tile.y) + 2) % 4 != rotation);
         }
 
         @Override
         public void updateTile(){
             smoothLiquid = Mathf.lerpDelta(smoothLiquid, liquids.currentAmount() / liquidCapacity, 0.05f);
 
-            if(liquids.total() > 0.001f && timer(timerFlow, 1)){
+            if(liquids.currentAmount() > 0.0001f && timer(timerFlow, 1)){
                 moveLiquidForward(leaks, liquids.current());
                 noSleep();
             }else{
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java
index eb9a3f16d3..e5976530af 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java
@@ -1,12 +1,17 @@
 package mindustry.world.blocks.liquid;
 
+import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class LiquidBlock extends Block{
     public @Load("@-liquid") TextureRegion liquidRegion;
     public @Load("@-top") TextureRegion topRegion;
@@ -19,6 +24,7 @@ public class LiquidBlock extends Block{
         hasLiquids = true;
         group = BlockGroup.liquids;
         outputsLiquid = true;
+        envEnabled |= Env.space | Env.underwater;
     }
 
     @Override
@@ -26,14 +32,55 @@ public class LiquidBlock extends Block{
         return new TextureRegion[]{bottomRegion, topRegion};
     }
 
+    public static void drawTiledFrames(int size, float x, float y, float padding, Liquid liquid, float alpha){
+        drawTiledFrames(size, x, y, padding, padding, padding, padding, liquid, alpha);
+    }
+
+    public static void drawTiledFrames(int size, float x, float y, float padLeft, float padRight, float padTop, float padBottom, Liquid liquid, float alpha){
+        TextureRegion region = renderer.fluidFrames[liquid.gas ? 1 : 0][liquid.getAnimationFrame()];
+        TextureRegion toDraw = Tmp.tr1;
+
+        float leftBounds = size/2f * tilesize - padRight;
+        float bottomBounds = size/2f * tilesize - padTop;
+        Color color = Tmp.c1.set(liquid.color).a(1f);
+
+        for(int sx = 0; sx < size; sx++){
+            for(int sy = 0; sy < size; sy++){
+                float relx = sx - (size-1)/2f, rely = sy - (size-1)/2f;
+
+                toDraw.set(region);
+
+                //truncate region if at border
+                float rightBorder = relx*tilesize + padLeft, topBorder = rely*tilesize + padBottom;
+                float squishX = rightBorder + tilesize/2f - leftBounds, squishY = topBorder + tilesize/2f - bottomBounds;
+                float ox = 0f, oy = 0f;
+
+                if(squishX >= 8 || squishY >= 8) continue;
+
+                //cut out the parts that don't fit inside the padding
+                if(squishX > 0){
+                    toDraw.setWidth(toDraw.width - squishX * 4f);
+                    ox = -squishX/2f;
+                }
+
+                if(squishY > 0){
+                    toDraw.setY(toDraw.getY() + squishY * 4f);
+                    oy = -squishY/2f;
+                }
+
+                Drawf.liquid(toDraw, x + rightBorder + ox, y + topBorder + oy, alpha, color);
+            }
+        }
+    }
+
     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){
-                Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
+            if(liquids.currentAmount() > 0.001f){
+                Drawf.liquid(liquidRegion, x, y, liquids.currentAmount() / 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 59205c3c92..984688a468 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java
@@ -1,13 +1,9 @@
 package mindustry.world.blocks.liquid;
 
-import arc.math.*;
 import mindustry.gen.*;
-import mindustry.type.*;
 import mindustry.world.blocks.distribution.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.*;
-
 public class LiquidBridge extends ItemBridge{
 
     public LiquidBridge(String name){
@@ -17,46 +13,21 @@ public class LiquidBridge extends ItemBridge{
         outputsLiquid = true;
         canOverdrive = false;
         group = BlockGroup.liquids;
+        envEnabled = Env.any;
     }
 
     public class LiquidBridgeBuild extends ItemBridgeBuild{
+
         @Override
-        public void updateTile(){
-            time += cycleSpeed * delta();
-            time2 += (cycleSpeed - 1f) * delta();
-
-            checkIncoming();
-
-            Building other = world.build(link);
-            if(other == null || !linkValid(tile, other.tile())){
-                dumpLiquid(liquids.current());
-            }else{
-                ((ItemBridgeBuild)other).incoming.add(tile.pos());
-
-                if(consValid()){
-                    float alpha = 0.04f;
-                    if(hasPower){
-                        alpha *= efficiency(); // Exceed boot time unless power is at max.
-                    }
-                    uptime = Mathf.lerpDelta(uptime, 1f, alpha);
-                }else{
-                    uptime = Mathf.lerpDelta(uptime, 0f, 0.02f);
-                }
-
-                if(uptime >= 0.5f){
-
-                    if(moveLiquid(other, liquids.current()) > 0.1f){
-                        cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
-                    }else{
-                        cycleSpeed = Mathf.lerpDelta(cycleSpeed, 1f, 0.01f);
-                    }
-                }
+        public void updateTransport(Building other){
+            if(warmup >= 0.25f){
+                moved |= moveLiquid(other, liquids.current()) > 0.05f;
             }
         }
 
         @Override
-        public boolean acceptItem(Building source, Item item){
-            return false;
+        public void doDump(){
+            dumpLiquid(liquids.current(), 1f);
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
deleted file mode 100644
index 76e4929b45..0000000000
--- a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package mindustry.world.blocks.liquid;
-
-import arc.math.*;
-import mindustry.gen.*;
-import mindustry.type.*;
-import mindustry.world.blocks.distribution.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class LiquidExtendingBridge extends ExtendingItemBridge{
-
-    public LiquidExtendingBridge(String name){
-        super(name);
-        hasItems = false;
-        hasLiquids = true;
-        outputsLiquid = true;
-        group = BlockGroup.liquids;
-    }
-
-    public class LiquidExtendingBridgeBuild extends ExtendingItemBridgeBuild{
-        @Override
-        public void updateTile(){
-            time += cycleSpeed * delta();
-            time2 += (cycleSpeed - 1f) * delta();
-
-            checkIncoming();
-
-            Building other = world.build(link);
-            if(other == null || !linkValid(tile, other.tile())){
-                dumpLiquid(liquids.current());
-            }else{
-                ((ItemBridgeBuild)other).incoming.add(tile.pos());
-
-                if(consValid()){
-                    uptime = Mathf.lerpDelta(uptime, 1f, 0.04f);
-                }else{
-                    uptime = Mathf.lerpDelta(uptime, 0f, 0.02f);
-                }
-
-                if(uptime >= 0.5f){
-                    if(moveLiquid(other, liquids.current()) > 0.1f){
-                        cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
-                    }else{
-                        cycleSpeed = Mathf.lerpDelta(cycleSpeed, 0f, 0.01f);
-                    }
-                }
-            }
-        }
-
-        @Override
-        public boolean acceptItem(Building source, Item item){
-            return false;
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidJunction.java b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java
index 80881e2c17..399c8a76b1 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidJunction.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java
@@ -5,6 +5,7 @@ import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.meta.*;
 
+//TODO should leak!
 public class LiquidJunction extends LiquidBlock{
 
     public LiquidJunction(String name){
@@ -20,7 +21,7 @@ public class LiquidJunction extends LiquidBlock{
     @Override
     public void setBars(){
         super.setBars();
-        bars.remove("liquid");
+        removeBar("liquid");
     }
 
     @Override
@@ -38,8 +39,7 @@ public class LiquidJunction extends LiquidBlock{
         public Building getLiquidDestination(Building source, Liquid liquid){
             if(!enabled) return this;
 
-            int dir = source.relativeTo(tile.x, tile.y);
-            dir = (dir + 4) % 4;
+            int dir = (source.relativeTo(tile.x, tile.y) + 4) % 4;
             Building next = nearby(dir);
             if(next == null || (!next.acceptLiquid(this, liquid) && !(next.block instanceof LiquidJunction))){
                 return this;
@@ -47,6 +47,4 @@ public class LiquidJunction extends LiquidBlock{
             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 d3befe8233..020b651060 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
@@ -1,22 +1,40 @@
 package mindustry.world.blocks.liquid;
 
+import arc.graphics.g2d.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 
 public class LiquidRouter extends LiquidBlock{
+    public float liquidPadding = 0f;
 
     public LiquidRouter(String name){
         super(name);
-
+        solid = true;
         noUpdateDisabled = true;
+        canOverdrive = false;
+        floating = true;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{bottomRegion, region};
     }
 
     public class LiquidRouterBuild extends LiquidBuild{
         @Override
         public void updateTile(){
-            if(liquids.total() > 0.01f){
-                dumpLiquid(liquids.current());
+            dumpLiquid(liquids.current());
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(bottomRegion, x, y);
+
+            if(liquids.currentAmount() > 0.001f){
+                drawTiledFrames(size, x, y, liquidPadding, liquids.current(), liquids.currentAmount() / liquidCapacity);
             }
+
+            Draw.rect(region, x, y);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/logic/CanvasBlock.java b/core/src/mindustry/world/blocks/logic/CanvasBlock.java
new file mode 100644
index 0000000000..809c765ba5
--- /dev/null
+++ b/core/src/mindustry/world/blocks/logic/CanvasBlock.java
@@ -0,0 +1,441 @@
+package mindustry.world.blocks.logic;
+
+import arc.*;
+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.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class CanvasBlock extends Block{
+    public float padding = 0f;
+    public int canvasSize = 8;
+    public int[] palette = {0x362944_ff, 0xc45d9f_ff, 0xe39aac_ff, 0xf0dab1_ff, 0x6461c2_ff, 0x2ba9b4_ff, 0x93d4b5_ff, 0xf0f6e8_ff};
+    public int bitsPerPixel;
+    public IntIntMap colorToIndex = new IntIntMap();
+
+    public @Load("@-side1") TextureRegion side1;
+    public @Load("@-side2") TextureRegion side2;
+
+    public @Load("@-corner1") TextureRegion corner1;
+    public @Load("@-corner2") TextureRegion corner2;
+
+    protected @Nullable Pixmap previewPixmap;
+    protected @Nullable Texture previewTexture;
+    protected int tempBlend = 0;
+
+    public CanvasBlock(String name){
+        super(name);
+
+        configurable = true;
+        destructible = true;
+        canOverdrive = false;
+        solid = true;
+
+        config(byte[].class, (CanvasBuild build, byte[] bytes) -> {
+            if(build.data.length == bytes.length){
+                build.data = bytes;
+                build.updateTexture();
+            }
+        });
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        for(int i = 0; i < palette.length; i++){
+            colorToIndex.put(palette[i], i);
+        }
+        bitsPerPixel = Mathf.log2(Mathf.nextPowerOfTwo(palette.length));
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        //only draw the preview in schematics, as it lags otherwise
+        if(!plan.worldContext && plan.config instanceof byte[] data){
+            Pixmap pix = makePixmap(data);
+
+            if(previewTexture == null){
+                previewTexture = new Texture(pix);
+            }else{
+                previewTexture.draw(pix);
+            }
+
+            tempBlend = 0;
+
+            //O(N^2), awful
+            list.each(other -> {
+                if(other.block == this){
+                    for(int i = 0; i < 4; i++){
+                        if(other.x == plan.x + Geometry.d4x(i) * size && other.y == plan.y + Geometry.d4y(i) * size){
+                            tempBlend |= (1 << i);
+                        }
+                    }
+                }
+            });
+
+            int blending = tempBlend;
+
+            float x = plan.drawx(), y = plan.drawy();
+            Tmp.tr1.set(previewTexture);
+            float pad = blending == 0 ? padding : 0f;
+
+            Draw.rect(Tmp.tr1, x, y, size * tilesize - pad, size * tilesize - pad);
+            Draw.flush(); //texture is reused, so flush it now
+
+            //code duplication, awful
+            for(int i = 0; i < 4; i ++){
+                if((blending & (1 << i)) == 0){
+                    Draw.rect(i >= 2 ? side2 : side1, x, y, i * 90);
+
+                    if((blending & (1 << ((i + 1) % 4))) != 0){
+                        Draw.rect(i >= 2 ? corner2 : corner1, x, y, i * 90);
+                    }
+
+                    if((blending & (1 << (Mathf.mod(i - 1, 4)))) != 0){
+                        Draw.yscl = -1f;
+                        Draw.rect(i >= 2 ? corner2 : corner1, x, y, i * 90);
+                        Draw.yscl = 1f;
+                    }
+                }
+            }
+
+        }else{
+            super.drawPlanRegion(plan, list);
+        }
+    }
+
+    /** returns the same pixmap instance each time, use with care */
+    public Pixmap makePixmap(byte[] data){
+        if(previewPixmap == null){
+            previewPixmap = new Pixmap(canvasSize, canvasSize);
+        }
+
+        int bpp = bitsPerPixel;
+        int pixels = canvasSize * canvasSize;
+        for(int i = 0; i < pixels; i++){
+            int bitOffset = i * bpp;
+            int pal = getByte(data, bitOffset);
+            previewPixmap.set(i % canvasSize, i / canvasSize, palette[pal]);
+        }
+        return previewPixmap;
+    }
+
+    protected int getByte(byte[] data, int bitOffset){
+        int result = 0, bpp = bitsPerPixel;
+        for(int i = 0; i < bpp; i++){
+            int word = i + bitOffset >>> 3;
+            result |= (((data[word] & (1 << (i + bitOffset & 7))) == 0 ? 0 : 1) << i);
+        }
+        return result;
+    }
+
+    public class CanvasBuild extends Building{
+        public @Nullable Texture texture;
+        public byte[] data = new byte[Mathf.ceil(canvasSize * canvasSize * bitsPerPixel / 8f)];
+        public int blending;
+
+        public void updateTexture(){
+            if(headless) return;
+
+            Pixmap pix = makePixmap(data);
+            if(texture != null){
+                texture.draw(pix);
+            }else{
+                texture = new Texture(pix);
+            }
+        }
+
+        public byte[] packPixmap(Pixmap pixmap){
+            byte[] bytes = new byte[data.length];
+            int pixels = canvasSize * canvasSize;
+            for(int i = 0; i < pixels; i++){
+                int color = pixmap.get(i % canvasSize, i / canvasSize);
+                int palIndex = colorToIndex.get(color);
+                setByte(bytes, i * bitsPerPixel, palIndex);
+            }
+            return bytes;
+        }
+
+        protected void setByte(byte[] bytes, int bitOffset, int value){
+            int bpp = bitsPerPixel;
+            for(int i = 0; i < bpp; i++){
+                int word = i + bitOffset >>> 3;
+
+                if(((value >>> i) & 1) == 0){
+                    bytes[word] &= ~(1 << (i + bitOffset & 7));
+                }else{
+                    bytes[word] |= (1 << (i + bitOffset & 7));
+                }
+            }
+        }
+
+        @Override
+        public void onProximityUpdate(){
+            super.onProximityUpdate();
+
+            blending = 0;
+            for(int i = 0; i < 4; i++){
+                if(blends(world.tile(tile.x + Geometry.d4[i].x * size, tile.y + Geometry.d4[i].y * size))) blending |= (1 << i);
+            }
+        }
+
+        boolean blends(Tile other){
+            return other != null && other.build != null && other.build.block == block && other.build.tileX() == other.x && other.build.tileY() == other.y;
+        }
+
+        @Override
+        public void draw(){
+            if(!renderer.drawDisplays){
+                super.draw();
+
+                return;
+            }
+
+            if(blending == 0){
+                super.draw();
+            }
+
+            if(texture == null){
+                updateTexture();
+            }
+            Tmp.tr1.set(texture);
+            float pad = blending == 0 ? padding : 0f;
+
+            Draw.rect(Tmp.tr1, x, y, size * tilesize - pad, size * tilesize - pad);
+            for(int i = 0; i < 4; i ++){
+                if((blending & (1 << i)) == 0){
+                    Draw.rect(i >= 2 ? side2 : side1, x, y, i * 90);
+
+                    if((blending & (1 << ((i + 1) % 4))) != 0){
+                        Draw.rect(i >= 2 ? corner2 : corner1, x, y, i * 90);
+                    }
+
+                    if((blending & (1 << (Mathf.mod(i - 1, 4)))) != 0){
+                        Draw.yscl = -1f;
+                        Draw.rect(i >= 2 ? corner2 : corner1, x, y, i * 90);
+                        Draw.yscl = 1f;
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void remove(){
+            super.remove();
+            if(texture != null){
+                texture.dispose();
+                texture = null;
+            }
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            table.button(Icon.pencil, Styles.cleari, () -> {
+                Dialog dialog = new Dialog();
+
+                Pixmap pix = makePixmap(data);
+                Texture texture = new Texture(pix);
+                int[] curColor = {palette[0]};
+                boolean[] modified = {false};
+                boolean[] fill = {false};
+
+                dialog.resized(dialog::hide);
+
+                dialog.cont.table(Tex.pane, body -> {
+                    body.add(new Element(){
+                        int lastX, lastY;
+                        IntSeq stack = new IntSeq();
+
+                        int convertX(float ex){
+                            return (int)((ex) / (width / canvasSize));
+                        }
+
+                        int convertY(float ey){
+                            return pix.height - 1 - (int)((ey) / (height / canvasSize));
+                        }
+
+                        {
+                            addListener(new InputListener(){
+
+                                @Override
+                                public boolean touchDown(InputEvent event, float ex, float ey, int pointer, KeyCode button){
+                                    int cx = convertX(ex), cy = convertY(ey);
+                                    if(fill[0]){
+                                        stack.clear();
+                                        int src = curColor[0];
+                                        int dst = pix.get(cx, cy);
+                                        if(src != dst){
+                                            stack.add(Point2.pack(cx, cy));
+                                            while(!stack.isEmpty()){
+                                                int current = stack.pop();
+                                                int x = Point2.x(current), y = Point2.y(current);
+                                                draw(x, y);
+                                                for(int i = 0; i < 4; i++){
+                                                    int nx = x + Geometry.d4x(i), ny = y + Geometry.d4y(i);
+                                                    if(nx >= 0 && ny >= 0 && nx < pix.width && ny < pix.height && pix.getRaw(nx, ny) == dst){
+                                                        stack.add(Point2.pack(nx, ny));
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                    }else{
+                                        draw(cx, cy);
+                                        lastX = cx;
+                                        lastY = cy;
+                                    }
+                                    return true;
+                                }
+
+                                @Override
+                                public void touchDragged(InputEvent event, float ex, float ey, int pointer){
+                                    if(fill[0]) return;
+                                    int cx = convertX(ex), cy = convertY(ey);
+                                    Bresenham2.line(lastX, lastY, cx, cy, (x, y) -> draw(x, y));
+                                    lastX = cx;
+                                    lastY = cy;
+                                }
+                            });
+                        }
+
+                        void draw(int x, int y){
+                            if(pix.get(x, y) != curColor[0]){
+                                pix.set(x, y, curColor[0]);
+                                Pixmaps.drawPixel(texture, x, y, curColor[0]);
+                                modified[0] = true;
+                            }
+                        }
+
+                        @Override
+                        public void draw(){
+                            Tmp.tr1.set(texture);
+                            Draw.alpha(parentAlpha);
+                            Draw.rect(Tmp.tr1, x + width/2f, y + height/2f, width, height);
+
+                            //draw grid
+                            {
+                                float xspace = (getWidth() / canvasSize);
+                                float yspace = (getHeight() / canvasSize);
+                                float s = 1f;
+
+                                int minspace = 10;
+
+                                int jumpx = (int)(Math.max(minspace, xspace) / xspace);
+                                int jumpy = (int)(Math.max(minspace, yspace) / yspace);
+
+                                for(int x = 0; x <= canvasSize; x += jumpx){
+                                    Fill.crect((int)(this.x + xspace * x - s), y - s, 2, getHeight() + (x == canvasSize ? 1 : 0));
+                                }
+
+                                for(int y = 0; y <= canvasSize; y += jumpy){
+                                    Fill.crect(x - s, (int)(this.y + y * yspace - s), getWidth(), 2);
+                                }
+                            }
+
+                            if(!mobile){
+                                Vec2 s = screenToLocalCoordinates(Core.input.mouse());
+                                if(s.x >= 0 && s.y >= 0 && s.x < width && s.y < height){
+                                    float sx = Mathf.round(s.x, width / canvasSize), sy = Mathf.round(s.y, height / canvasSize);
+
+                                    Lines.stroke(Scl.scl(6f));
+                                    Draw.color(Pal.accent);
+                                    Lines.rect(sx + x, sy + y, width / canvasSize, height / canvasSize, Lines.getStroke() - 1f);
+
+                                    Draw.reset();
+                                }
+                            }
+                        }
+                    }).size(mobile && !Core.graphics.isPortrait() ? Math.min(290f, Core.graphics.getHeight() / Scl.scl(1f) - 75f / Scl.scl(1f)) : 480f);
+                }).colspan(3);
+
+                dialog.cont.row();
+
+                dialog.cont.add().size(60f);
+
+                dialog.cont.table(Tex.button, p -> {
+                    for(int i = 0; i < palette.length; i++){
+                        int fi = i;
+
+                        var button = p.button(Tex.whiteui, Styles.squareTogglei, 30, () -> {
+                            curColor[0] = palette[fi];
+                        }).size(44).checked(b -> curColor[0] == palette[fi]).get();
+                        button.getStyle().imageUpColor = new Color(palette[i]);
+                    }
+                });
+
+                dialog.cont.table(Tex.button, t -> {
+                    t.button(Icon.fill, Styles.clearNoneTogglei, () -> {
+                        fill[0] = !fill[0];
+                    }).size(44f);
+                });
+
+                dialog.closeOnBack();
+
+                dialog.buttons.defaults().size(150f, 64f);
+                dialog.buttons.button("@cancel", Icon.cancel, dialog::hide);
+                dialog.buttons.button("@ok", Icon.ok, () -> {
+                    if(modified[0]){
+                        configure(packPixmap(pix));
+                        texture.dispose();
+                    }
+                    dialog.hide();
+                });
+
+                dialog.show();
+            }).size(40f);
+        }
+
+        @Override
+        public boolean onConfigureBuildTapped(Building other){
+            if(this == other){
+                deselect();
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public byte[] config(){
+            return data;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            //for future canvas resizing events
+            write.i(data.length);
+            write.b(data);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            int len = read.i();
+            if(data.length == len){
+                read.b(data);
+            }else{
+                read.skip(len);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
index 21d3534273..b978be9993 100644
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -1,21 +1,25 @@
 package mindustry.world.blocks.logic;
 
+import arc.Graphics.*;
+import arc.Graphics.Cursor.*;
 import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
 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 arc.util.pooling.*;
 import mindustry.ai.types.*;
 import mindustry.core.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.*;
+import mindustry.io.TypeIO.*;
 import mindustry.logic.*;
-import mindustry.logic.LAssembler.*;
-import mindustry.logic.LExecutor.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.ConstructBlock.*;
@@ -27,10 +31,13 @@ import java.util.zip.*;
 import static mindustry.Vars.*;
 
 public class LogicBlock extends Block{
-    private static final int maxByteLen = 1024 * 500;
+    private static final int maxByteLen = 1024 * 100;
+    public static final int maxNameLength = 32;
 
     public int maxInstructionScale = 5;
     public int instructionsPerTick = 1;
+    //privileged only
+    public int maxInstructionsPerTick = 40;
     public float range = 8 * 10;
 
     public LogicBlock(String name){
@@ -39,13 +46,38 @@ public class LogicBlock extends Block{
         solid = true;
         configurable = true;
         group = BlockGroup.logic;
+        schematicPriority = 5;
+        ignoreResizeConfig = true;
 
-        config(byte[].class, (LogicBuild build, byte[] data) -> build.readCompressed(data, true));
+        //universal, no real requirements
+        envEnabled = Env.any;
+
+        config(byte[].class, (LogicBuild build, byte[] data) -> {
+            if(!accessible()) return;
+
+            build.readCompressed(data, true);
+        });
+
+        config(String.class, (LogicBuild build, String data) -> {
+            if(!accessible() || !privileged) return;
+
+            if(data != null && data.length() < maxNameLength){
+                build.tag = data;
+            }
+        });
+
+        config(Character.class, (LogicBuild build, Character data) -> {
+            if(!accessible() || !privileged) return;
+
+            build.iconTag = data;
+        });
 
         config(Integer.class, (LogicBuild entity, Integer pos) -> {
+            if(!accessible()) return;
+
             //if there is no valid link in the first place, nobody cares
             if(!entity.validLink(world.build(pos))) return;
-            Building lbuild = world.build(pos);
+            var lbuild = world.build(pos);
             int x = lbuild.tileX(), y = lbuild.tileY();
 
             LogicLink link = entity.links.find(l -> l.x == x && l.y == y);
@@ -58,16 +90,33 @@ public class LogicBlock extends Block{
                     link.name = "";
                     link.name = entity.findLinkName(lbuild.block);
                 }
+                //disable when unlinking
+                if(!link.active && lbuild.block.autoResetEnabled && lbuild.lastDisabler == entity){
+                    lbuild.enabled = true;
+                }
             }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.links.add(new LogicLink(x, y, entity.findLinkName(lbuild.block), true));
             }
 
-            entity.updateCode();
+            entity.updateCode(entity.code, true, null);
         });
     }
 
+    @Override
+    public boolean checkForceDark(Tile tile){
+        return !accessible();
+    }
+
+    public boolean accessible(){
+        return !privileged || state.rules.editor || state.playtestingMap != null || state.rules.allowEditWorldProcessors;
+    }
+
+    @Override
+    public boolean canBreak(Tile tile){
+        return accessible();
+    }
+
     public static String getLinkName(Block block){
         String name = block.name;
         if(name.contains("-")){
@@ -88,8 +137,8 @@ public class LogicBlock extends Block{
 
     public static byte[] compress(byte[] bytes, Seq<LogicLink> links){
         try{
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DataOutputStream stream = new DataOutputStream(new DeflaterOutputStream(baos));
+            var baos = new ByteArrayOutputStream();
+            var stream = new DataOutputStream(new DeflaterOutputStream(baos));
 
             //current version of config format
             stream.write(1);
@@ -121,12 +170,16 @@ public class LogicBlock extends Block{
     public void setStats(){
         super.setStats();
 
-        stats.add(Stat.linkRange, range / 8, StatUnit.blocks);
-        stats.add(Stat.instructions, instructionsPerTick * 60, StatUnit.perSecond);
+        if(!privileged){
+            stats.add(Stat.linkRange, range / 8, StatUnit.blocks);
+            stats.add(Stat.instructions, instructionsPerTick * 60, StatUnit.perSecond);
+        }
     }
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        if(privileged) return;
+
         Drawf.circles(x*tilesize + offset, y*tilesize + offset, range);
     }
 
@@ -140,7 +193,7 @@ public class LogicBlock extends Block{
 
                 int bytelen = stream.readInt();
 
-                if(bytelen > maxByteLen) throw new RuntimeException("Malformed logic data! Length: " + bytelen);
+                if(bytelen > maxByteLen) throw new RuntimeException("Logic data too long or malformed! Length: " + bytelen);
 
                 byte[] bytes = new byte[bytelen];
                 stream.readFully(bytes);
@@ -173,6 +226,7 @@ public class LogicBlock extends Block{
         public boolean active = true, valid;
         public int x, y;
         public String name;
+        public Building lastBuild;
 
         public LogicLink(int x, int y, String name, boolean valid){
             this.x = x;
@@ -195,15 +249,26 @@ public class LogicBlock extends Block{
         public float accumulator = 0;
         public Seq<LogicLink> links = new Seq<>();
         public boolean checkedDuplicates = false;
+        //dynamic only for privileged processors
+        public int ipt = instructionsPerTick;
+        /** Display name, for convenience. This is currently only available for world processors. */
+        public @Nullable String tag;
+        public char iconTag;
+
+        /** Block of code to run after load. */
+        public @Nullable Runnable loadBlock;
+
+        {
+            executor.privileged = privileged;
+            executor.build = this;
+        }
 
         public void readCompressed(byte[] data, boolean relative){
-            DataInputStream stream = new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(data)));
-
-            try{
+            try(DataInputStream stream = new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(data)))){
                 int version = stream.read();
 
                 int bytelen = stream.readInt();
-                if(bytelen > maxByteLen) throw new RuntimeException("Malformed logic data! Length: " + bytelen);
+                if(bytelen > maxByteLen) throw new IOException("Malformed logic data! Length: " + bytelen);
                 byte[] bytes = new byte[bytelen];
                 stream.readFully(bytes);
 
@@ -236,13 +301,13 @@ public class LogicBlock extends Block{
                             }
                         }
 
-                        links.add(new LogicLink(x, y, name, validLink(world.build(x, y))));
+                        links.add(new LogicLink(x, y, name, false));
                     }
                 }
 
                 updateCode(new String(bytes, charset));
-            }catch(IOException e){
-                Log.err(e);
+            }catch(Exception ignored){
+                //invalid logic doesn't matter here
             }
         }
 
@@ -277,21 +342,17 @@ public class LogicBlock extends Block{
             return bname + outnum;
         }
 
-        public void updateCode(){
-            updateCode(code);
-        }
-
         public void updateCode(String str){
-            updateCodeVars(str, null);
+            updateCode(str, false, null);
         }
 
-        public void updateCodeVars(String str, Cons<LAssembler> assemble){
+        public void updateCode(String str, boolean keep, Cons<LAssembler> assemble){
             if(str != null){
                 code = str;
 
                 try{
                     //create assembler to store extra variables
-                    LAssembler asm = LAssembler.assemble(str, LExecutor.maxInstructions);
+                    LAssembler asm = LAssembler.assemble(str, privileged);
 
                     //store connections
                     for(LogicLink link : links){
@@ -303,6 +364,7 @@ public class LogicBlock extends Block{
                     //store link objects
                     executor.links = new Building[links.count(l -> l.valid && l.active)];
                     executor.linkIds.clear();
+
                     int index = 0;
                     for(LogicLink link : links){
                         if(link.active && link.valid){
@@ -312,18 +374,22 @@ public class LogicBlock extends Block{
                         }
                     }
 
-                    asm.putConst("@mapw", world.width());
-                    asm.putConst("@maph", world.height());
                     asm.putConst("@links", executor.links.length);
                     asm.putConst("@ipt", instructionsPerTick);
 
-                    //store any older variables
-                    for(Var var : executor.vars){
-                        boolean unit = var.name.equals("@unit");
-                        if(!var.constant || unit){
-                            BVar dest = asm.getVar(var.name);
-                            if(dest != null && (!dest.constant || unit)){
-                                dest.value = var.isobj ? var.objval : var.numval;
+                    Object oldUnit = null;
+
+                    if(keep){
+                        oldUnit = executor.unit.objval;
+                        //store any older variables
+                        for(LVar var : executor.vars){
+                            if(!var.constant){
+                                LVar dest = asm.getVar(var.name);
+                                if(dest != null && !dest.constant){
+                                    dest.isobj = var.isobj;
+                                    dest.objval = var.objval;
+                                    dest.numval = var.numval;
+                                }
                             }
                         }
                     }
@@ -331,23 +397,60 @@ public class LogicBlock extends Block{
                     //inject any extra variables
                     if(assemble != null){
                         assemble.get(asm);
+
+                        if(oldUnit == null && asm.getVar("@unit") != null && asm.getVar("@unit").objval instanceof Unit u){
+                            oldUnit = u;
+                        }
                     }
 
-                    asm.getVar("@this").value = this;
+                    asm.getVar("@this").setconst(this);
                     asm.putConst("@thisx", World.conv(x));
                     asm.putConst("@thisy", World.conv(y));
 
                     executor.load(asm);
+                    executor.unit.objval = oldUnit;
+                    executor.unit.isobj = true;
                 }catch(Exception e){
-                    Log.err("Failed to compile logic program @", code);
-                    Log.err(e);
-
                     //handle malformed code and replace it with nothing
-                    executor.load("", LExecutor.maxInstructions);
+                    executor.load(LAssembler.assemble(code = "", privileged));
                 }
             }
         }
 
+        //editor-only processors cannot be damaged or destroyed
+        @Override
+        public boolean collide(Bullet other){
+            return !privileged;
+        }
+
+        @Override
+        public boolean displayable(){
+            return accessible();
+        }
+
+        @Override
+        public void damage(float damage){
+            if(!privileged){
+                super.damage(damage);
+            }
+        }
+
+        @Override
+        public void removeFromProximity(){
+            super.removeFromProximity();
+
+            for(var link : executor.links){
+                if(!link.enabled && link.lastDisabler == this){
+                    link.enabled = true;
+                }
+            }
+        }
+
+        @Override
+        public Cursor getCursor(){
+            return !accessible() ? SystemCursor.arrow : super.getCursor();
+        }
+
         //logic blocks cause write problems when picked up
         @Override
         public boolean canPickup(){
@@ -361,6 +464,12 @@ public class LogicBlock extends Block{
 
         @Override
         public void updateTile(){
+            //load up code from read()
+            if(loadBlock != null){
+                loadBlock.run();
+                loadBlock = null;
+            }
+
             executor.team = team;
 
             if(!checkedDuplicates){
@@ -379,48 +488,64 @@ public class LogicBlock extends Block{
             }
 
             //check for previously invalid links to add after configuration
-            boolean changed = false;
+            boolean changed = false, updates = true;
 
-            for(int i = 0; i < links.size; i++){
-                LogicLink l = links.get(i);
+            while(updates){
+                updates = false;
 
-                if(!l.active) continue;
+                for(int i = 0; i < links.size; i++){
+                    LogicLink l = links.get(i);
 
-                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);
+                    if(!l.active) continue;
 
-                        //this prevents conflicts
-                        l.name = "";
-                        //finds a new matching name after toggling
-                        l.name = findLinkName(lbuild.block);
+                    var cur = world.build(l.x, l.y);
 
-                        //remove redundant links
-                        links.removeAll(o -> world.build(o.x, o.y) == lbuild && o != l);
+                    boolean valid = validLink(cur);
+                    if(l.lastBuild == null) l.lastBuild = cur;
+                    if(valid != l.valid || l.lastBuild != cur){
+                        l.lastBuild = cur;
+                        changed = true;
+                        l.valid = valid;
+                        if(valid){
 
-                        //break to prevent concurrent modification
-                        break;
+                            //this prevents conflicts
+                            l.name = "";
+                            //finds a new matching name after toggling
+                            l.name = findLinkName(cur.block);
+
+                            //remove redundant links
+                            links.removeAll(o -> world.build(o.x, o.y) == cur && o != l);
+
+                            //break to prevent concurrent modification
+                            updates = true;
+                            break;
+                        }
                     }
                 }
             }
 
             if(changed){
-                updateCode();
+                updateCode(code, true, null);
             }
 
-            if(enabled){
-                accumulator += edelta() * instructionsPerTick * (consValid() ? 1 : 0);
+            if(!privileged){
+                ipt = instructionsPerTick;
+            }
 
-                if(accumulator > maxInstructionScale * instructionsPerTick) accumulator = maxInstructionScale * instructionsPerTick;
+            if(state.rules.disableWorldProcessors && privileged) return;
+
+            if(enabled && executor.initialized()){
+                accumulator += edelta() * ipt;
+
+                if(accumulator > maxInstructionScale * ipt) accumulator = maxInstructionScale * ipt;
 
                 for(int i = 0; i < (int)accumulator; i++){
-                    if(executor.initialized()){
-                        executor.runOnce();
-                    }
+                    executor.runOnce();
                     accumulator --;
+                    if(executor.yield){
+                        executor.yield = false;
+                        break;
+                    }
                 }
             }
         }
@@ -431,9 +556,9 @@ public class LogicBlock extends Block{
         }
 
         public Seq<LogicLink> relativeConnections(){
-            Seq<LogicLink> copy = new Seq<>(links.size);
-            for(LogicLink l : links){
-                LogicLink c = l.copy();
+            var copy = new Seq<LogicLink>(links.size);
+            for(var l : links){
+                var c = l.copy();
                 c.x -= tileX();
                 c.y -= tileY();
                 copy.add(c);
@@ -445,7 +570,9 @@ public class LogicBlock extends Block{
         public void drawConfigure(){
             super.drawConfigure();
 
-            Drawf.circles(x, y, range);
+            if(!privileged){
+                Drawf.circles(x, y, range);
+            }
 
             for(LogicLink l : links){
                 Building build = world.build(l.x, l.y);
@@ -465,25 +592,78 @@ public class LogicBlock extends Block{
 
         @Override
         public void drawSelect(){
+            if(!accessible()) return;
+
             Groups.unit.each(u -> u.controller() instanceof LogicAI ai && ai.controller == this, unit -> {
                 Drawf.square(unit.x, unit.y, unit.hitSize, unit.rotation + 45);
             });
+
+            //draw tag over processor (world processor only)
+            if(!(renderer.pixelate || !privileged || tag == null || tag.isEmpty())){
+                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);
+
+                l.setText(font, tag, Color.white, 90f, Align.left, true);
+                float offset = 1f;
+
+                //Draw.color(0f, 0f, 0f, 0.1f);
+                //Fill.rect(x, y + tilesize/2f - l.height/2f - offset, l.width + offset*2f, l.height + offset*2f);
+                Draw.color();
+                font.setColor(1f, 1f, 1f, 0.5f);
+                font.draw(tag, x - l.width/2f, y + tilesize + 2f - offset, 90f, Align.left, true);
+                font.setUseIntegerPositions(ints);
+
+                font.getData().setScale(1f);
+
+                Pools.free(l);
+            }
+
+            if(iconTag != 0){
+                TextureRegion icon = Fonts.getLargeIcon(Fonts.unicodeToName(iconTag));
+                if(icon.found()){
+                    Draw.alpha(0.5f);
+
+                    Draw.rect(icon, x, y, tilesize, tilesize / icon.ratio());
+
+                    Draw.color();
+                }
+            }
         }
 
         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);
+            return other != null && other.isValid() && (privileged || (!other.block.privileged && other.team == team && other.within(this, range + other.block.size*tilesize/2f))) && !(other instanceof ConstructBuild);
+        }
+
+        @Override
+        public boolean shouldShowConfigure(Player player){
+            return accessible();
         }
 
         @Override
         public void buildConfiguration(Table table){
-            table.button(Icon.pencil, Styles.clearTransi, () -> {
-                Vars.ui.logic.show(code, code -> configure(compress(code, relativeConnections())));
-            }).size(40);
+            table.button(Icon.pencil, Styles.cleari, this::showEditDialog).size(40);
+        }
+
+        public void showEditDialog(){
+            showEditDialog(false);
+        }
+
+        public void showEditDialog(boolean forceEditor){
+            ui.logic.show(code, executor, privileged, code -> {
+                boolean prev = state.rules.editor;
+                //this is a hack to allow configuration to work correctly in the editor for privileged processors
+                if(forceEditor) state.rules.editor = true;
+                configure(compress(code, relativeConnections()));
+                state.rules.editor = prev;
+            });
         }
 
         @Override
-        public boolean onConfigureTileTapped(Building other){
-            if(this == other){
+        public boolean onConfigureBuildTapped(Building other){
+            if(this == other || !accessible()){
                 deselect();
                 return false;
             }
@@ -493,12 +673,12 @@ public class LogicBlock extends Block{
                 return false;
             }
 
-            return super.onConfigureTileTapped(other);
+            return super.onConfigureBuildTapped(other);
         }
 
         @Override
         public byte version(){
-            return 1;
+            return 3;
         }
 
         @Override
@@ -510,37 +690,46 @@ public class LogicBlock extends Block{
             write.b(compressed);
 
             //write only the non-constant variables
-            int count = Structs.count(executor.vars, v -> !v.constant);
+            int count = Structs.count(executor.vars, v -> (!v.constant || v == executor.unit) && !(v.isobj && v.objval == null));
 
             write.i(count);
             for(int i = 0; i < executor.vars.length; i++){
-                Var v = executor.vars[i];
+                LVar v = executor.vars[i];
 
-                if(v.constant) continue;
+                //null is the default variable value, so waste no time serializing that
+                if(v.isobj && v.objval == null) continue;
+
+                //skip constants
+                if(v.constant && v != executor.unit) 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);
+
+            if(privileged){
+                write.s(Mathf.clamp(ipt, 1, maxInstructionsPerTick));
+            }
+
+            TypeIO.writeString(write, tag);
+            write.s(iconTag);
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
 
-            if(revision == 1){
+            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();
@@ -557,7 +746,7 @@ public class LogicBlock extends Block{
 
             for(int i = 0; i < varcount; i++){
                 String name = read.str();
-                Object value = TypeIO.readObject(read);
+                Object value = TypeIO.readObjectBoxed(read, true);
 
                 names[i] = name;
                 values[i] = value;
@@ -567,29 +756,34 @@ public class LogicBlock extends Block{
             //skip memory, it isn't used anymore
             read.skip(memory * 8);
 
-            updateCodeVars(code, asm -> {
-
+            loadBlock = () -> updateCode(code, false, 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];
+                    LVar var = asm.getVar(names[i]);
+                    if(var != null && (!var.constant || var.name.equals("@unit"))){
+                        var value = values[i];
+                        if(value instanceof Boxed<?> boxed) value = boxed.unbox();
+
+                        if(value instanceof Number num){
+                            var.numval = num.doubleValue();
+                            var.isobj = false;
+                        }else{
+                            var.objval = value;
+                            var.isobj = true;
+                        }
                     }
                 }
             });
-        }
-    }
 
-    public static class LogicConfig{
-        public String code;
-        public IntSeq connections;
+            if(privileged && revision >= 2){
+                ipt = Mathf.clamp(read.s(), 1, maxInstructionsPerTick);
+            }
 
-        public LogicConfig(String code, IntSeq connections){
-            this.code = code;
-            this.connections = connections;
-        }
+            if(revision >= 3){
+                tag = TypeIO.readString(read);
+                iconTag = (char)read.us();
+            }
 
-        public LogicConfig(){
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
index 22e2b0fb6e..1816245ad2 100644
--- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java
+++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
@@ -4,9 +4,13 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
+import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
@@ -17,24 +21,40 @@ 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,
-        commandImage = 9;
+        //virtual command, unpacked in instruction
+        commandColorPack = 2,
+        commandStroke = 3,
+        commandLine = 4,
+        commandRect = 5,
+        commandLineRect = 6,
+        commandPoly = 7,
+        commandLinePoly = 8,
+        commandTriangle = 9,
+        commandImage = 10,
+        //note that this command actually only draws 1 character, unpacked in instruction
+        commandPrint = 11,
+
+        commandTranslate = 12,
+        commandScale = 13,
+        commandRotate = 14,
+        commandResetTransform = 15
+    ;
+
+    public static final float scaleStep = 0.05f;
 
     public int maxSides = 25;
 
     public int displaySize = 64;
+    public float scaleFactor = 1f;
 
     public LogicDisplay(String name){
         super(name);
         update = true;
         solid = true;
+        canOverdrive = false;
         group = BlockGroup.logic;
+        drawDisabled = false;
+        envEnabled = Env.any;
     }
 
     @Override
@@ -49,11 +69,15 @@ public class LogicDisplay extends Block{
         public float color = Color.whiteFloatBits;
         public float stroke = 1f;
         public LongQueue commands = new LongQueue(256);
+        public @Nullable Mat transform;
 
         @Override
         public void draw(){
             super.draw();
 
+            //don't even bother processing anything when displays are off.
+            if(!Vars.renderer.drawDisplays) return;
+
             Draw.draw(Draw.z(), () -> {
                 if(buffer == null){
                     buffer = new FrameBuffer(displaySize, displaySize);
@@ -63,22 +87,31 @@ public class LogicDisplay extends Block{
                 }
             });
 
+            //don't bother processing commands if displays are off
             if(!commands.isEmpty()){
                 Draw.draw(Draw.z(), () -> {
                     Tmp.m1.set(Draw.proj());
+                    Tmp.m2.set(Draw.trans());
                     Draw.proj(0, 0, displaySize, displaySize);
+                    if(transform != null){
+                        Draw.trans(transform);
+                    }
                     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);
+                        int type = DisplayCmd.type(c);
+                        int x = unpackSign(DisplayCmd.x(c)), y = unpackSign(DisplayCmd.y(c)),
+                        p1 = unpackSign(DisplayCmd.p1(c)), p2 = unpackSign(DisplayCmd.p2(c)), p3 = unpackSign(DisplayCmd.p3(c)), p4 = unpackSign(DisplayCmd.p4(c));
 
                         switch(type){
-                            case commandClear -> Core.graphics.clear(x / 255f, y / 255f, p1 / 255f, 1f);
+                            case commandClear -> {
+                                //discard any pending batched sprites, so they don't get drawn over the cleared screen later
+                                Draw.discard();
+                                Core.graphics.clear(x / 255f, y / 255f, p1 / 255f, 1f);
+                            }
                             case commandLine -> Lines.line(x, y, p1, p2);
                             case commandRect -> Fill.crect(x, y, p1, p2);
                             case commandLineRect -> Lines.rect(x, y, p1, p2);
@@ -87,27 +120,98 @@ public class LogicDisplay extends Block{
                             case commandTriangle -> Fill.tri(x, y, p1, p2, p3, p4);
                             case commandColor -> Draw.color(this.color = Color.toFloatBits(x, y, p1, p2));
                             case commandStroke -> Lines.stroke(this.stroke = x);
-                            case commandImage -> Draw.rect(Fonts.logicIcon(p1), x, y, p2, p2, p3);
+                            case commandImage -> {
+                                if(p4 >= 0 && p4 < ContentType.all.length && Vars.content.getByID(ContentType.all[p4], p1) instanceof UnlockableContent u){
+                                    var icon = u.fullIcon;
+                                    Draw.rect(icon, x, y, p2, p2 / icon.ratio(), p3);
+                                }
+                            }
+                            case commandPrint -> {
+                                var glyph = Fonts.logic.getData().getGlyph((char)p1);
+                                if(glyph != null){
+                                    Tmp.tr1.set(Fonts.logic.getRegion().texture);
+                                    Tmp.tr1.set(glyph.u, glyph.v2, glyph.u2, glyph.v);
+
+                                    Draw.rect(Tmp.tr1, x + Tmp.tr1.width/2f + glyph.xoffset, y + Tmp.tr1.height/2f + glyph.yoffset + Fonts.logic.getData().capHeight + Fonts.logic.getData().ascent, Tmp.tr1.width, Tmp.tr1.height);
+                                }
+                            }
+                            case commandTranslate -> Draw.trans((transform == null ? (transform = new Mat()) : transform).translate(x, y));
+                            case commandScale -> Draw.trans((transform == null ? (transform = new Mat()) : transform).scale(x * scaleStep, y * scaleStep));
+                            case commandRotate-> Draw.trans((transform == null ? (transform = new Mat()) : transform).rotate(p1));
+                            case commandResetTransform -> Draw.trans((transform == null ? (transform = new Mat()) : transform).idt());
                         }
                     }
 
                     buffer.end();
                     Draw.proj(Tmp.m1);
+                    Draw.trans(Tmp.m2);
                     Draw.reset();
                 });
             }
 
+            Draw.blend(Blending.disabled);
             Draw.draw(Draw.z(), () -> {
                 if(buffer != null){
-                    Draw.rect(Draw.wrap(buffer.getTexture()), x, y, buffer.getWidth() * Draw.scl, -buffer.getHeight() * Draw.scl);
+                    Draw.rect(Draw.wrap(buffer.getTexture()), x, y, buffer.getWidth() * scaleFactor * Draw.scl, -buffer.getHeight() * scaleFactor * Draw.scl);
                 }
             });
+            Draw.blend();
         }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            if(transform != null){
+                write.bool(true);
+                for(int i = 0; i < transform.val.length; i++){
+                    write.f(transform.val[i]);
+                }
+            }else{
+                write.bool(false);
+            }
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            if(revision >= 1){
+                boolean hasTransform = read.bool();
+                if(hasTransform){
+                    transform = new Mat();
+
+                    for(int i = 0; i < transform.val.length; i++){
+                        transform.val[i] = read.f();
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void remove(){
+            super.remove();
+            if(buffer != null){
+                buffer.dispose();
+                buffer = null;
+            }
+        }
+    }
+
+    static int unpackSign(int value){
+        return (value & 0b0111111111) * ((value & (0b1000000000)) != 0 ? -1 : 1);
     }
 
     public enum GraphicsType{
         clear,
         color,
+        //virtual
+        col,
         stroke,
         line,
         rect,
@@ -115,17 +219,25 @@ public class LogicDisplay extends Block{
         poly,
         linePoly,
         triangle,
-        image;
+        image,
+        //note that this command actually only draws 1 character, unpacked in instruction
+        print,
+        translate,
+        scale,
+        rotate,
+        reset
+        ;
 
         public static final GraphicsType[] all = values();
     }
 
     @Struct
     static class DisplayCmdStruct{
-        public byte type;
+        @StructField(4)
+        public int type;
 
-        //9 bits are required for full 360 degrees
-        @StructField(9)
+        //at least 9 bits are required for full 360 degrees
+        @StructField(10)
         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
index 5b91425a27..44af66623a 100644
--- a/core/src/mindustry/world/blocks/logic/MemoryBlock.java
+++ b/core/src/mindustry/world/blocks/logic/MemoryBlock.java
@@ -5,6 +5,8 @@ import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class MemoryBlock extends Block{
     public int memoryCapacity = 32;
 
@@ -13,6 +15,9 @@ public class MemoryBlock extends Block{
         destructible = true;
         solid = true;
         group = BlockGroup.logic;
+        drawDisabled = false;
+        envEnabled = Env.any;
+        canOverdrive = false;
     }
 
     @Override
@@ -22,6 +27,15 @@ public class MemoryBlock extends Block{
         stats.add(Stat.memoryCapacity, memoryCapacity, StatUnit.none);
     }
 
+    public boolean accessible(){
+        return !privileged || state.rules.editor || state.rules.allowEditWorldProcessors;
+    }
+
+    @Override
+    public boolean canBreak(Tile tile){
+        return accessible();
+    }
+
     public class MemoryBuild extends Building{
         public double[] memory = new double[memoryCapacity];
 
@@ -31,6 +45,22 @@ public class MemoryBlock extends Block{
             return false;
         }
 
+        @Override
+        public boolean collide(Bullet other){
+            return !privileged;
+        }
+
+        @Override
+        public boolean displayable(){
+            return accessible();
+        }
+
+        @Override
+        public void damage(float damage){
+            if(privileged) return;
+            super.damage(damage);
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
diff --git a/core/src/mindustry/world/blocks/logic/MessageBlock.java b/core/src/mindustry/world/blocks/logic/MessageBlock.java
index f47b613d72..eb644b57de 100644
--- a/core/src/mindustry/world/blocks/logic/MessageBlock.java
+++ b/core/src/mindustry/world/blocks/logic/MessageBlock.java
@@ -1,6 +1,8 @@
 package mindustry.world.blocks.logic;
 
 import arc.*;
+import arc.Graphics.*;
+import arc.Graphics.Cursor.*;
 import arc.Input.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
@@ -29,9 +31,11 @@ public class MessageBlock extends Block{
         solid = true;
         destructible = true;
         group = BlockGroup.logic;
+        drawDisabled = false;
+        envEnabled = Env.any;
 
         config(String.class, (MessageBuild tile, String text) -> {
-            if(text.length() > maxTextLength){
+            if(text.length() > maxTextLength || !accessible()){
                 return; //no.
             }
 
@@ -43,8 +47,7 @@ public class MessageBlock extends Block{
             for(int i = 0; i < text.length(); i++){
                 char c = text.charAt(i);
                 if(c == '\n'){
-                    count ++;
-                    if(count <= maxNewlines){
+                    if(count++ <= maxNewlines){
                         tile.message.append('\n');
                     }
                 }else{
@@ -54,12 +57,21 @@ public class MessageBlock extends Block{
         });
     }
 
+    public boolean accessible(){
+        return !privileged || state.rules.editor || state.rules.allowEditWorldProcessors;
+    }
+
+    @Override
+    public boolean canBreak(Tile tile){
+        return accessible();
+    }
+
     public class MessageBuild extends Building{
         public StringBuilder message = new StringBuilder();
 
         @Override
         public void drawSelect(){
-            if(renderer.pixelator.enabled()) return;
+            if(renderer.pixelate) return;
 
             Font font = Fonts.outline;
             GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
@@ -84,15 +96,23 @@ public class MessageBlock extends Block{
             Pools.free(l);
         }
 
+        @Override
+        public boolean shouldShowConfigure(Player player){
+            return accessible();
+        }
+
         @Override
         public void buildConfiguration(Table table){
-            table.button(Icon.pencil, () -> {
+            table.button(Icon.pencil, Styles.cleari, () -> {
                 if(mobile){
+                    var contents = this.message.toString();
                     Core.input.getTextInput(new TextInput(){{
-                        text = message.toString();
+                        text = contents;
                         multiline = true;
                         maxLength = maxTextLength;
-                        accepted = str -> configure(str);
+                        accepted = str -> {
+                            if(!str.equals(text)) configure(str);
+                        };
                     }});
                 }else{
                     BaseDialog dialog = new BaseDialog("@editmessage");
@@ -111,21 +131,55 @@ public class MessageBlock extends Block{
                         return true;
                     });
                     a.setMaxLength(maxTextLength);
+                    dialog.cont.row();
+                    dialog.cont.label(() -> a.getText().length() + " / " + maxTextLength).color(Color.lightGray);
                     dialog.buttons.button("@ok", () -> {
-                        configure(a.getText());
+                        if(!a.getText().equals(message.toString())) configure(a.getText());
                         dialog.hide();
                     }).size(130f, 60f);
                     dialog.update(() -> {
-                        if(tile.block() != MessageBlock.this){
+                        if(tile.build != this){
                             dialog.hide();
                         }
                     });
+                    dialog.closeOnBack();
                     dialog.show();
                 }
                 deselect();
             }).size(40f);
         }
 
+        @Override
+        public boolean onConfigureBuildTapped(Building other){
+            if(this == other || !accessible()){
+                deselect();
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public Cursor getCursor(){
+            return !accessible() ? SystemCursor.arrow : super.getCursor();
+        }
+
+        @Override
+        public void damage(float damage){
+            if(privileged) return;
+            super.damage(damage);
+        }
+
+        @Override
+        public boolean canPickup(){
+            return false;
+        }
+
+        @Override
+        public boolean collide(Bullet other){
+            return !privileged;
+        }
+
         @Override
         public void handleString(Object value){
             message.setLength(0);
diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
index 60e5db6dc7..db49b70f6c 100644
--- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java
+++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.logic;
 
+import arc.audio.*;
 import arc.graphics.g2d.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
@@ -7,7 +8,11 @@ import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.state;
+
 public class SwitchBlock extends Block{
+    public Sound clickSound = Sounds.click;
+
     public @Load("@-on") TextureRegion onRegion;
 
     public SwitchBlock(String name){
@@ -17,16 +22,41 @@ public class SwitchBlock extends Block{
         drawDisabled = false;
         autoResetEnabled = false;
         group = BlockGroup.logic;
+        envEnabled = Env.any;
 
         config(Boolean.class, (SwitchBuild entity, Boolean b) -> entity.enabled = b);
     }
 
+    public boolean accessible(){
+        return !privileged || state.rules.editor || state.rules.allowEditWorldProcessors;
+    }
+
+    @Override
+    public boolean canBreak(Tile tile){
+        return accessible();
+    }
+
     public class SwitchBuild extends Building{
+        @Override
+        public void damage(float damage){
+            if(privileged) return;
+            super.damage(damage);
+        }
+        
+        @Override
+        public boolean canPickup(){
+            return !privileged;
+        }
+
+        @Override
+        public boolean collide(Bullet other){
+            return !privileged;
+        }
 
         @Override
         public boolean configTapped(){
             configure(!enabled);
-            Sounds.click.at(this);
+            clickSound.at(this);
             return false;
         }
 
diff --git a/core/src/mindustry/world/blocks/payloads/BlockProducer.java b/core/src/mindustry/world/blocks/payloads/BlockProducer.java
new file mode 100644
index 0000000000..2bc66e0e1f
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/BlockProducer.java
@@ -0,0 +1,180 @@
+package mindustry.world.blocks.payloads;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.consumers.*;
+
+import static mindustry.Vars.*;
+
+/** Generic building that produces other buildings. */
+public abstract class BlockProducer extends PayloadBlock{
+    public float buildSpeed = 0.4f;
+
+    public BlockProducer(String name){
+        super(name);
+
+        size = 3;
+        update = true;
+        outputsPayload = true;
+        hasItems = true;
+        solid = true;
+        hasPower = true;
+        acceptsUnitPayloads = false;
+        rotate = true;
+        regionRotated1 = 1;
+
+        ObjectMap<Block, ItemStack[]> stacks = new ObjectMap<>();
+
+        consume(new ConsumeItemDynamic((BlockProducerBuild e) -> {
+            Block block = e.recipe();
+
+            if(block != null){
+                ItemStack[] clone = stacks.get(block, () -> ItemStack.copy(block.requirements));
+                for(int i = 0; i < clone.length; i++){
+                    clone[i].amount = Mathf.ceil(block.requirements[i].amount * state.rules.buildCostMultiplier);
+                }
+                return clone;
+            }else{
+                return ItemStack.empty;
+            }
+        }));
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, outRegion, topRegion};
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("progress", (BlockProducerBuild entity) -> new Bar("bar.progress", Pal.ammo, () -> entity.recipe() == null ? 0f : (entity.progress / entity.recipe().buildCost)));
+    }
+
+    public abstract class BlockProducerBuild extends PayloadBlockBuild<BuildPayload>{
+        public float progress, time, heat;
+
+        public abstract @Nullable Block recipe();
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return items.get(item) < getMaximumAccepted(item);
+        }
+
+        @Override
+        public int getMaximumAccepted(Item item){
+            if(recipe() == null) return 0;
+            for(ItemStack stack : recipe().requirements){
+                if(stack.item == item) return stack.amount * 2;
+            }
+            return 0;
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return false;
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return super.shouldConsume() && recipe() != null;
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+            var recipe = recipe();
+            boolean produce = recipe != null && efficiency > 0 && payload == null;
+
+            if(produce){
+                progress += buildSpeed * edelta();
+
+                if(progress >= recipe.buildCost){
+                    consume();
+                    payload = new BuildPayload(recipe, team);
+                    payload.block().placeEffect.at(x, y, payload.size() / tilesize);
+                    payVector.setZero();
+                    progress %= 1f;
+                }
+            }
+
+            heat = Mathf.lerpDelta(heat, Mathf.num(produce), 0.15f);
+            time += heat * delta();
+
+            moveOutPayload();
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+            Draw.rect(outRegion, x, y, rotdeg());
+
+            var recipe = recipe();
+            if(recipe != null){
+                Drawf.shadow(x, y, recipe.size * tilesize * 2f, progress / recipe.buildCost);
+                Draw.draw(Layer.blockBuilding, () -> {
+                    Draw.color(Pal.accent);
+
+                    for(TextureRegion region : recipe.getGeneratedIcons()){
+                        Shaders.blockbuild.region = region;
+                        Shaders.blockbuild.time = time;
+                        Shaders.blockbuild.progress = progress / recipe.buildCost;
+
+                        Draw.rect(region, x, y, recipe.rotate ? rotdeg() : 0);
+                        Draw.flush();
+                    }
+
+                    Draw.color();
+                });
+                Draw.z(Layer.blockBuilding + 1);
+                Draw.color(Pal.accent, heat);
+
+                Lines.lineAngleCenter(x + Mathf.sin(time, 10f, Vars.tilesize / 2f * recipe.size + 1f), y, 90, recipe.size * Vars.tilesize + 1f);
+
+                Draw.reset();
+            }
+
+            drawPayload();
+
+            Draw.z(Layer.blockBuilding + 1.1f);
+            Draw.rect(topRegion, x, y);
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return progress;
+            return super.sense(sensor);
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(progress);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            progress = read.f();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/BuildPayload.java b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
index 446954883b..524cdf75aa 100644
--- a/core/src/mindustry/world/blocks/payloads/BuildPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
@@ -1,11 +1,14 @@
 package mindustry.world.blocks.payloads;
 
 import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
 import arc.util.io.*;
+import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.ui.*;
+import mindustry.type.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
@@ -15,6 +18,7 @@ public class BuildPayload implements Payload{
 
     public BuildPayload(Block block, Team team){
         this.build = block.newBuilding().create(block, team);
+        this.build.tile = emptyTile;
     }
 
     public BuildPayload(Building build){
@@ -34,11 +38,55 @@ public class BuildPayload implements Payload{
         build.dropped();
     }
 
+    @Override
+    public UnlockableContent content(){
+        return build.block;
+    }
+
+    @Override
+    public void update(@Nullable Unit unitHolder, @Nullable Building buildingHolder){
+        if(unitHolder != null && (!build.block.updateInUnits || (!state.rules.unitPayloadUpdate && !build.block.alwaysUpdateInUnits))) return;
+
+        build.tile = emptyTile;
+        build.updatePayload(unitHolder, buildingHolder);
+    }
+
+    @Override
+    public void destroyed(){
+        build.dead = true;
+        build.onDestroyed();
+    }
+
+    @Override
+    public ItemStack[] requirements(){
+        return build.block.requirements;
+    }
+
+    @Override
+    public float buildTime(){
+        return build.block.buildCost;
+    }
+
+    @Override
+    public float x(){
+        return build.x;
+    }
+
+    @Override
+    public float y(){
+        return build.y;
+    }
+
     @Override
     public float size(){
         return build.block.size * tilesize;
     }
 
+    @Override
+    public void remove(){
+        build.stopSound();
+    }
+
     @Override
     public void write(Writes write){
         write.b(payloadBlock);
@@ -50,16 +98,32 @@ public class BuildPayload implements Payload{
     @Override
     public void set(float x, float y, float rotation){
         build.set(x, y);
+        build.payloadRotation = rotation;
+    }
+
+    @Override
+    public void drawShadow(float alpha){
+        Drawf.squareShadow(build.x, build.y, build.block.size * tilesize * 1.85f, alpha);
     }
 
     @Override
     public void draw(){
-        Drawf.shadow(build.x, build.y, build.block.size * tilesize * 2f);
-        Draw.rect(build.block.icon(Cicon.full), build.x, build.y);
+        float prevZ = Draw.z();
+        Draw.z(prevZ - 0.001f);
+        drawShadow(1f);
+        Draw.z(prevZ);
+        Draw.zTransform(z ->
+            z >= Layer.flyingUnitLow + 1f ? z :
+            0.0011f + Math.min(Mathf.clamp((z - prevZ)/100f, -0.0009f, 0.9f) + prevZ, Layer.flyingUnitLow - 1f)
+        );
+        build.tile = emptyTile;
+        build.payloadDraw();
+        Draw.zTransform();
+        Draw.z(prevZ);
     }
 
     @Override
-    public TextureRegion icon(Cicon icon){
-        return block().icon(icon);
+    public TextureRegion icon(){
+        return block().fullIcon;
     }
 }
diff --git a/core/src/mindustry/world/blocks/payloads/Constructor.java b/core/src/mindustry/world/blocks/payloads/Constructor.java
new file mode 100644
index 0000000000..2983023068
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/Constructor.java
@@ -0,0 +1,100 @@
+package mindustry.world.blocks.payloads;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.storage.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+/** Configurable BlockProducer variant. */
+public class Constructor extends BlockProducer{
+    /** Empty seq for no filter. */
+    public Seq<Block> filter = new Seq<>();
+    public int minBlockSize = 1, maxBlockSize = 2;
+
+    public Constructor(String name){
+        super(name);
+
+        size = 3;
+        configurable = true;
+        clearOnDoubleTap = true;
+
+        configClear((ConstructorBuild tile) -> tile.recipe = null);
+        config(Block.class, (ConstructorBuild tile, Block block) -> {
+            if(tile.recipe != block) tile.progress = 0f;
+            if(canProduce(block)){
+                tile.recipe = block;
+            }
+        });
+        configClear((ConstructorBuild tile) -> tile.recipe = null);
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.output, "@x@ ~ @x@", minBlockSize, minBlockSize, maxBlockSize, maxBlockSize);
+    }
+
+    @Override
+    public void getPlanConfigs(Seq<UnlockableContent> options){
+        options.add(content.blocks().select(this::canProduce));
+    }
+
+    public boolean canProduce(Block b){
+        return b.isVisible() && b.size >= minBlockSize && b.size <= maxBlockSize && !(b instanceof CoreBlock) && !state.rules.isBanned(b) && b.environmentBuildable() && (filter.isEmpty() || filter.contains(b));
+    }
+
+    public class ConstructorBuild extends BlockProducerBuild{
+        public @Nullable Block recipe;
+
+        @Override
+        public @Nullable Block recipe(){
+            return recipe;
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            ItemSelection.buildTable(Constructor.this, table, filter.isEmpty() ? content.blocks().select(Constructor.this::canProduce) : filter, () -> recipe, this::configure, selectionRows, selectionColumns);
+        }
+
+        @Override
+        public Object config(){
+            return recipe;
+        }
+
+        @Override
+        public void drawSelect(){
+            if(recipe != null){
+                float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f;
+                TextureRegion icon = recipe.uiIcon;
+                Draw.mixcol(Color.darkGray, 1f);
+                //Fixes size because modded content icons are not scaled
+                Draw.rect(icon, dx - 0.7f, dy - 1f, Draw.scl * Draw.xscl * 24f, Draw.scl * Draw.yscl * 24f);
+                Draw.reset();
+                Draw.rect(icon, dx, dy, Draw.scl * Draw.xscl * 24f, Draw.scl * Draw.yscl * 24f);
+            }
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.s(recipe == null ? -1 : recipe.id);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            recipe = Vars.content.block(read.s());
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java
index 851678094e..6b96c78e89 100644
--- a/core/src/mindustry/world/blocks/payloads/Payload.java
+++ b/core/src/mindustry/world/blocks/payloads/Payload.java
@@ -1,16 +1,18 @@
 package mindustry.world.blocks.payloads;
 
 import arc.graphics.g2d.*;
+import arc.math.geom.*;
 import arc.util.*;
 import arc.util.io.*;
+import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
-import mindustry.ui.*;
+import mindustry.type.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
-public interface Payload{
+public interface Payload extends Position{
     int payloadUnit = 0, payloadBlock = 1;
 
     /** sets this payload's position on the map. */
@@ -19,24 +21,61 @@ public interface Payload{
     /** draws this payload at a position. */
     void draw();
 
+    void drawShadow(float alpha);
+
     /** @return hitbox size of the payload. */
     float size();
 
+    float x();
+
+    float y();
+
+    /** @return the items needed to make this payload; may be empty. */
+    ItemStack[] requirements();
+
+    /** @return the time taken to build this payload. */
+    float buildTime();
+
+    /** update this payload inside a container unit or building. either can be null. */
+    default void update(@Nullable Unit unitHolder, @Nullable Building buildingHolder){}
+
     /** @return whether this payload was dumped. */
     default boolean dump(){
         return false;
     }
 
-    /** @return whether this payload fits in a given size. 2.5 is the max for a standard 3x3 conveyor. */
+    /** @return whether this payload fits in a given size. 3 is the max for a standard 3x3 conveyor. */
     default boolean fits(float s){
         return size() / tilesize <= s;
     }
 
+    /** @return rotation of this payload. */
+    default float rotation(){
+        return 0f;
+    }
+
+    default void destroyed(){};
+
     /** writes the payload for saving. */
     void write(Writes write);
 
     /** @return icon describing the contents. */
-    TextureRegion icon(Cicon icon);
+    TextureRegion icon();
+
+    /** @return content describing this payload (block or unit) */
+    UnlockableContent content();
+
+    @Override
+    default float getX(){
+        return x();
+    }
+
+    @Override
+    default float getY(){
+        return y();
+    }
+
+    default void remove(){}
 
     static void write(@Nullable Payload payload, Writes write){
         if(payload == null){
@@ -59,6 +98,7 @@ public interface Payload{
             BuildPayload payload = new BuildPayload(block, Team.derelict);
             byte version = read.b();
             payload.build.readAll(read, version);
+            payload.build.tile = emptyTile;
             return (T)payload;
         }else if(type == payloadUnit){
             byte id = read.b();
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
new file mode 100644
index 0000000000..cde357e2db
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
@@ -0,0 +1,281 @@
+package mindustry.world.blocks.payloads;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class PayloadBlock extends Block{
+    public float payloadSpeed = 0.7f, payloadRotateSpeed = 5f;
+
+    public String regionSuffix = "";
+    public TextureRegion topRegion, outRegion, inRegion;
+
+    public PayloadBlock(String name){
+        super(name);
+
+        update = true;
+        sync = true;
+        group = BlockGroup.payloads;
+        acceptsUnitPayloads = true;
+        envEnabled |= Env.space | Env.underwater;
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        topRegion = findFactoryRegion("-top");
+        outRegion =  findFactoryRegion("-out");
+        inRegion =  findFactoryRegion("-in");
+    }
+
+    protected TextureRegion findFactoryRegion(String suf){
+        TextureRegion region = Core.atlas.find(name + suf);
+
+        if(!region.found() && minfo.mod != null) region = Core.atlas.find(minfo.mod.name + "-factory" + suf + "-" + size + regionSuffix);
+        if(!region.found()) region = Core.atlas.find("factory" + suf + "-" + size + regionSuffix);
+
+        return region;
+    }
+
+    public static boolean blends(Building build, int direction){
+        int size = build.block.size;
+        int trns = build.block.size/2 + 1;
+        Building accept = build.nearby(Geometry.d4(direction).x * trns, Geometry.d4(direction).y * trns);
+        return accept != null &&
+            accept.block.outputsPayload &&
+
+            //if size is the same, block must either be facing this one, or not be rotating
+            ((accept.block.size == size
+            && Math.abs(accept.tileX() - build.tileX()) % size == 0 //check alignment
+            && Math.abs(accept.tileY() - build.tileY()) % size == 0
+            && ((accept.block.rotate && accept.tileX() + Geometry.d4(accept.rotation).x * size == build.tileX() && accept.tileY() + Geometry.d4(accept.rotation).y * size == build.tileY())
+            || !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 - build.y) <= Math.abs(size * tilesize - accept.block.size * tilesize)/2f : //check Y alignment
+                Math.abs(accept.x - build.x) <= Math.abs(size * tilesize - accept.block.size * tilesize)/2f   //check X alignment
+                )) && (!accept.block.rotate || accept.front() == build || !accept.block.outputFacing) //make sure it's facing this block
+            );
+    }
+
+    public static void pushOutput(Payload payload, float progress){
+        float thresh = 0.55f;
+        if(progress >= thresh){
+            boolean legStep = payload instanceof UnitPayload u && u.unit.type.allowLegStep;
+            float size = payload.size(), radius = size/2f, x = payload.x(), y = payload.y(), scl = Mathf.clamp(((progress - thresh) / (1f - thresh)) * 1.1f);
+
+            Groups.unit.intersect(x - size/2f, y - size/2f, size, size, u -> {
+                float dst = u.dst(payload);
+                float rs = radius + u.hitSize/2f;
+                if(u.isGrounded() && u.type.allowLegStep == legStep && dst < rs){
+                    u.vel.add(Tmp.v1.set(u.x - x, u.y - y).setLength(Math.min(rs - dst, 1f)).scl(scl));
+                }
+            });
+        }
+    }
+
+    public class PayloadBlockBuild<T extends Payload> extends Building{
+        public @Nullable T payload;
+        //TODO redundant; already stored in payload?
+        public Vec2 payVector = new Vec2();
+        public float payRotation;
+        public boolean carried;
+
+        public boolean acceptUnitPayload(Unit unit){
+            return false;
+        }
+
+        @Override
+        public boolean canControlSelect(Unit unit){
+            return !unit.spawnedByCore && unit.type.allowedInPayloads && this.payload == null && acceptUnitPayload(unit) && unit.tileOn() != null && unit.tileOn().build == this;
+        }
+
+        @Override
+        public void onControlSelect(Unit player){
+            float x = player.x, y = player.y;
+            handleUnitPayload(player, p -> payload = (T)p);
+            this.payVector.set(x, y).sub(this).clamp(-size * tilesize / 2f, -size * tilesize / 2f, size * tilesize / 2f, size * tilesize / 2f);
+            this.payRotation = player.rotation;
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return this.payload == null;
+        }
+
+        @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.payRotation = payload.rotation();
+
+            updatePayload();
+        }
+
+        @Override
+        public Payload getPayload(){
+            return payload;
+        }
+
+        @Override
+        public void pickedUp(){
+            carried = true;
+        }
+
+        @Override
+        public void drawTeamTop(){
+            carried = false;
+        }
+
+        @Override
+        public Payload takePayload(){
+            T t = payload;
+            payload = null;
+            return t;
+        }
+
+        @Override
+        public void onRemoved(){
+            super.onRemoved();
+            if(payload != null && !carried) payload.dump();
+        }
+
+        @Override
+        public void updateTile(){
+            if(payload != null){
+                payload.update(null, this);
+            }
+        }
+
+        @Override
+        public void onDestroyed(){
+            if(payload != null) payload.destroyed();
+            super.onDestroyed();
+        }
+
+        public boolean blends(int direction){
+            return PayloadBlock.blends(this, direction);
+        }
+
+        public void updatePayload(){
+            if(payload != null){
+                payload.set(x + payVector.x, y + payVector.y, payRotation);
+            }
+        }
+
+        /** @return true if the payload is in position. */
+        public boolean moveInPayload(){
+            return moveInPayload(true);
+        }
+
+        /** @return true if the payload is in position. */
+        public boolean moveInPayload(boolean rotate){
+            if(payload == null) return false;
+
+            updatePayload();
+
+            if(rotate){
+                payRotation = Angles.moveToward(payRotation, block.rotate ? rotdeg() : 90f, payloadRotateSpeed * delta());
+            }
+            payVector.approach(Vec2.ZERO, payloadSpeed * delta());
+
+            return hasArrived();
+        }
+
+        public void moveOutPayload(){
+            if(payload == null) return;
+
+            updatePayload();
+
+            Vec2 dest = Tmp.v1.trns(rotdeg(), size * tilesize/2f);
+
+            payRotation = Angles.moveToward(payRotation, rotdeg(), payloadRotateSpeed * delta());
+            payVector.approach(dest, payloadSpeed * delta());
+
+            Building front = front();
+            boolean canDump = front == null || !front.tile().solid();
+            boolean canMove = front != null && (front.block.outputsPayload || front.block.acceptsPayload);
+
+            if(canDump && !canMove){
+                pushOutput(payload, 1f - (payVector.dst(dest) / (size * tilesize / 2f)));
+            }
+
+            if(payVector.within(dest, 0.001f)){
+                payVector.clamp(-size * tilesize / 2f, -size * tilesize / 2f, size * tilesize / 2f, size * tilesize / 2f);
+
+                if(canMove){
+                    if(movePayload(payload)){
+                        payload = null;
+                    }
+                }else if(canDump){
+                    dumpPayload();
+                }
+            }
+        }
+
+        public void dumpPayload(){
+            //translate payload forward slightly
+            float tx = Angles.trnsx(payload.rotation(), 0.1f), ty = Angles.trnsy(payload.rotation(), 0.1f);
+            payload.set(payload.x() + tx, payload.y() + ty, payload.rotation());
+
+            if(payload.dump()){
+                payload = null;
+            }else{
+                payload.set(payload.x() - tx, payload.y() - ty, payload.rotation());
+            }
+        }
+
+        public boolean hasArrived(){
+            return payVector.isZero(0.01f);
+        }
+
+        public void drawPayload(){
+            if(payload != null){
+                updatePayload();
+
+                Draw.z(Layer.blockOver);
+                payload.draw();
+            }
+        }
+
+        @Override
+        public double sense(Content content){
+            if(payload instanceof UnitPayload up) return up.unit.type == content ? 1 : 0;
+            if(payload instanceof BuildPayload bp) return bp.build.block == content ? 1 : 0;
+            return super.sense(content);
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(payVector.x);
+            write.f(payVector.y);
+            write.f(payRotation);
+            Payload.write(payload, write);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            payVector.set(read.f(), read.f());
+            payRotation = read.f();
+            payload = Payload.read(read);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
similarity index 76%
rename from core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
rename to core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
index 122278238a..650846987b 100644
--- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
@@ -1,4 +1,4 @@
-package mindustry.world.blocks.distribution;
+package mindustry.world.blocks.payloads;
 
 import arc.*;
 import arc.graphics.g2d.*;
@@ -7,31 +7,35 @@ import arc.math.geom.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
-import mindustry.world.blocks.payloads.*;
-import mindustry.world.blocks.production.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class PayloadConveyor extends Block{
-    public float moveTime = 40f, moveForce = 201f;
+    public float moveTime = 45f, moveForce = 201f;
     public @Load("@-top") TextureRegion topRegion;
     public @Load("@-edge") TextureRegion edgeRegion;
     public Interp interp = Interp.pow5;
-    public float payloadLimit = 2.5f;
+    public float payloadLimit = 3f;
+    public boolean pushUnits = true;
 
     public PayloadConveyor(String name){
         super(name);
-        group = BlockGroup.transportation;
+        group = BlockGroup.payloads;
         size = 3;
         rotate = true;
         update = true;
         outputsPayload = true;
         noUpdateDisabled = true;
+        acceptsUnitPayloads = true;
+        priority = TargetPriority.transport;
+        envEnabled |= Env.space | Env.underwater;
         sync = true;
+        underBullets = true;
     }
 
     @Override
@@ -51,6 +55,21 @@ public class PayloadConveyor extends Block{
         }
     }
 
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.payloadCapacity, StatValues.squared(payloadLimit, StatUnit.blocksSquared));
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        //increase clip size for oversize loads
+        clipSize = Math.max(clipSize, size * tilesize * 2.1f);
+    }
+
     public class PayloadConveyorBuild extends Building{
         public @Nullable Payload item;
         public float progress, itemRotation, animation;
@@ -59,6 +78,16 @@ public class PayloadConveyor extends Block{
         public boolean blocked;
         public int step = -1, stepAccepted = -1;
 
+        @Override
+        public boolean canControlSelect(Unit unit){
+            return this.item == null && unit.type.allowedInPayloads && !unit.spawnedByCore && unit.hitSize / tilesize <= payloadLimit && unit.tileOn() != null && unit.tileOn().build == this;
+        }
+
+        @Override
+        public void onControlSelect(Unit player){
+            handleUnitPayload(player, p -> item = p);
+        }
+
         @Override
         public Payload takePayload(){
             Payload t = item;
@@ -70,7 +99,7 @@ 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/2+1), Geometry.d4(rotation).y * (size/2+1));
             //next block must be aligned and of the same size
             if(accept != null && (
                 //same size
@@ -89,7 +118,7 @@ public class PayloadConveyor extends Block{
 
             int ntrns = 1 + size/2;
             Tile next = tile.nearby(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);
+            blocked = (next != null && next.solid() && !(next.block().outputsPayload || next.block().acceptsPayload)) || (this.next != null && this.next.payloadCheck(rotation));
         }
 
         @Override
@@ -101,6 +130,10 @@ public class PayloadConveyor extends Block{
         public void updateTile(){
             if(!enabled) return;
 
+            if(item != null){
+                item.update(null, this);
+            }
+
             lastInterp = curInterp;
             curInterp = fract();
             //rollover skip
@@ -108,6 +141,9 @@ public class PayloadConveyor extends Block{
             progress = time() % moveTime;
 
             updatePayload();
+            if(item != null && next == null){
+                PayloadBlock.pushOutput(item, progress / moveTime);
+            }
 
             //TODO nondeterministic input priority
             int curStep = curStep();
@@ -122,7 +158,7 @@ public class PayloadConveyor extends Block{
                         next.updateTile();
 
                         //TODO add self to queue of next conveyor, then check if this conveyor was selected next frame - selection happens deterministically
-                        if(next.acceptPayload(this, item)){
+                        if(next != null && next.acceptPayload(this, item)){
                             //move forward.
                             next.handlePayload(this, item);
                             item = null;
@@ -155,6 +191,12 @@ public class PayloadConveyor extends Block{
             super.draw();
         }
 
+        @Override
+        public void onDestroyed(){
+            if(item != null) item.destroyed();
+            super.onDestroyed();
+        }
+
         @Override
         public void draw(){
             super.draw();
@@ -164,26 +206,28 @@ public class PayloadConveyor extends Block{
             float glow = Math.max((dst - (Math.abs(fract() - 0.5f) * 2)) / dst, 0);
             Draw.mixcol(team.color, glow);
 
-            float trnext = fract() * size * tilesize, trprev = size * tilesize * (fract() - 1), rot = rotdeg();
-
-            TextureRegion clipped = clipRegion(tile.getHitbox(Tmp.r1), tile.getHitbox(Tmp.r2).move(trnext, 0), topRegion);
             float s = tilesize * size;
+            float trnext = s * fract(), trprev = s * (fract() - 1), rot = rotdeg();
 
             //next
-            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);
+            TextureRegion clipped = clipRegion(tile.getHitbox(Tmp.r1), tile.getHitbox(Tmp.r2).move(trnext, 0), topRegion);
+            float widthNext = (s - clipped.width * clipped.scl()) * 0.5f;
+            float heightNext = (s - clipped.height * clipped.scl()) * 0.5f;
+            Tmp.v1.set(widthNext, heightNext).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.width /2f*Draw.scl,  - s/2f + clipped.height /2f*Draw.scl).rotate(rot);
+            clipped = clipRegion(tile.getHitbox(Tmp.r1), tile.getHitbox(Tmp.r2).move(trprev, 0), topRegion);
+            float widthPrev = (clipped.width * clipped.scl() - s) * 0.5f;
+            float heightPrev = (clipped.height * clipped.scl() - s) * 0.5f;
+            Tmp.v1.set(widthPrev, heightPrev).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){
                     Draw.alpha(1f - Interp.pow5In.apply(fract()));
                     //prev from back
-                    Tmp.v1.set(- s/2f + clipped.width /2f*Draw.scl,  - s/2f + clipped.height /2f*Draw.scl).rotate(i * 90 + 180);
+                    Tmp.v1.set(widthPrev, heightPrev).rotate(i * 90 + 180);
                     Draw.rect(clipped, x + Tmp.v1.x, y + Tmp.v1.y, i * 90 + 180);
                 }
             }
@@ -203,12 +247,19 @@ public class PayloadConveyor extends Block{
             }
         }
 
+        @Override
+        public void payloadDraw(){
+            Draw.rect(block.fullIcon,x, y);
+        }
+
         public float time(){
             return Time.time;
         }
 
         @Override
         public void unitOn(Unit unit){
+            if(!pushUnits || !enabled) return;
+
             //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));
@@ -217,11 +268,9 @@ public class PayloadConveyor extends Block{
 
         @Override
         public boolean acceptPayload(Building source, Payload payload){
-            if(source == this){
-                return this.item == null && payload.fits(payloadLimit);
-            }
-            //accepting payloads from units isn't supported
-            return this.item == null && progress <= 5f && payload.fits(payloadLimit);
+            return this.item == null
+                && payload.fits(payloadLimit)
+                && (source == this || this.enabled && progress <= 5f);
         }
 
         @Override
@@ -285,7 +334,7 @@ public class PayloadConveyor extends Block{
             if(direction == rotation){
                 return !blocked || next != null;
             }
-            return PayloadAcceptor.blends(this, direction);
+            return PayloadBlock.blends(this, direction);
         }
 
         protected TextureRegion clipRegion(Rect bounds, Rect sprite, TextureRegion region){
@@ -295,6 +344,7 @@ public class PayloadConveyor extends Block{
 
             TextureRegion out = Tmp.tr1;
             out.set(region.texture);
+            out.scale = region.scale;
 
             if(overlaps){
                 float w = region.u2 - region.u;
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java b/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
new file mode 100644
index 0000000000..8b151af5dc
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
@@ -0,0 +1,254 @@
+package mindustry.world.blocks.payloads;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.ui.*;
+
+import static mindustry.Vars.*;
+
+public class PayloadDeconstructor extends PayloadBlock{
+    public float maxPayloadSize = 4;
+    public float deconstructSpeed = 2.5f;
+    public int dumpRate = 4;
+
+    public PayloadDeconstructor(String name){
+        super(name);
+
+        outputsPayload = false;
+        acceptsPayload = true;
+        update = true;
+        rotate = false;
+        solid = true;
+        size = 5;
+        payloadSpeed = 1f;
+        //make sure to display large units.
+        clipSize = 120;
+        hasItems = true;
+        hasPower = true;
+        itemCapacity = 100;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("progress", (PayloadDeconstructorBuild e) -> new Bar("bar.progress", Pal.ammo, () -> e.progress));
+    }
+
+    public class PayloadDeconstructorBuild extends PayloadBlockBuild<Payload>{
+        public @Nullable Payload deconstructing;
+        public @Nullable float[] accum;
+        public float progress;
+        public float time, speedScl;
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            //draw input
+            for(int i = 0; i < 4; i++){
+                if(blends(i)){
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
+                }
+            }
+
+            Draw.z(Layer.blockOver);
+            drawPayload();
+            if(deconstructing != null){
+                deconstructing.set(x + payVector.x, y + payVector.y, payRotation);
+
+                Draw.z(Layer.blockOver);
+                deconstructing.drawShadow(1f - progress);
+
+                //TODO looks really bad
+                Draw.draw(Layer.blockOver, () -> {
+                    Drawf.construct(x, y, deconstructing.icon(), Pal.remove, deconstructing instanceof BuildPayload ? 0f : payRotation - 90f, 1f - progress, 1f - progress, time);
+                    Draw.color(Pal.remove);
+                    Draw.alpha(1f);
+
+                    Lines.lineAngleCenter(x + Mathf.sin(time, 20f, tilesize / 2f * block.size - 3f), y, 90f, block.size * tilesize - 6f);
+
+                    Draw.reset();
+                });
+            }
+
+            Draw.rect(topRegion, x, y);
+        }
+
+        @Override
+        public boolean acceptUnitPayload(Unit unit){
+            return payload == null && deconstructing == null && unit.type.allowedInPayloads && !unit.spawnedByCore
+                && unit.type.getTotalRequirements().length > 0 && unit.hitSize / tilesize <= maxPayloadSize;
+        }
+
+        @Override
+        public void handlePayload(Building source, Payload payload){
+            super.handlePayload(source, payload);
+            accum = null;
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return deconstructing == null && this.payload == null && super.acceptPayload(source, payload) && payload.requirements().length > 0 && payload.fits(maxPayloadSize);
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+            if(items.total() > 0){
+                for(int i = 0; i < dumpRate; i++){
+                    dumpAccumulate();
+                }
+            }
+
+            if(deconstructing == null){
+                progress = 0f;
+            }
+
+            payRotation = Angles.moveToward(payRotation, 90f, payloadRotateSpeed * edelta());
+
+            if(deconstructing != null){
+                var reqs = deconstructing.requirements();
+                if(accum == null || reqs.length != accum.length){
+                    accum = new float[reqs.length];
+                }
+
+                //check if there is enough space to get the items for deconstruction
+                boolean canProgress = items.total() <= itemCapacity;
+                if(canProgress){
+                    for(var ac : accum){
+                        if(ac >= 1f){
+                            canProgress = false;
+                            break;
+                        }
+                    }
+                }
+
+                //move progress forward if possible
+                if(canProgress){
+                    float shift = edelta() * deconstructSpeed / deconstructing.buildTime();
+                    float realShift = Math.min(shift, 1f - progress);
+
+                    //if began deconstruction...
+                    if(progress == 0f && shift > 0f && deconstructing instanceof BuildPayload pay){
+                        var build = pay.build;
+                        //dump liquid on floor (does not respect block configuration with respect to dumping liquids on floor)
+                        if(build.liquids != null && build.liquids.currentAmount() > 0){
+                            float perCell = build.liquids.currentAmount() / (block.size * block.size) * 2f;
+                            tile.getLinkedTiles(other -> Puddles.deposit(other, build.liquids.current(), perCell));
+                        }
+                    }
+
+                    progress += shift;
+                    time += edelta();
+
+                    for(int i = 0; i < reqs.length; i++){
+                        accum[i] += reqs[i].amount * (deconstructing instanceof BuildPayload ? state.rules.buildCostMultiplier : state.rules.unitCost(team)) * realShift;
+                    }
+                }
+
+                speedScl = Mathf.lerpDelta(speedScl, canProgress ? 1f : 0f, 0.1f);
+
+                //transfer items from accumulation buffer into block inventory when they reach integers
+                for(int i = 0; i < reqs.length; i++){
+                    int taken = Math.min((int)accum[i], itemCapacity - items.total());
+                    if(taken > 0){
+                        items.add(reqs[i].item, taken);
+                        accum[i] -= taken;
+                    }
+                }
+
+                //finish deconstruction, prepare for next payload.
+                if(progress >= 1f){
+                    canProgress = true;
+                    //check for rounding errors
+                    for(int i = 0; i < reqs.length; i++){
+                        if(Mathf.equal(accum[i], 1f, 0.0001f)){
+                            if(items.total() < itemCapacity){
+                                items.add(reqs[i].item, 1);
+                                accum[i] = 0f;
+                            }else{
+                                canProgress = false;
+                                break;
+                            }
+                        }
+                    }
+
+                    if(canProgress){
+                        Fx.breakBlock.at(x, y, deconstructing.size() / tilesize);
+
+                        deconstructing = null;
+                        accum = null;
+                    }
+                }
+            }else if(moveInPayload(false) && payload != null){
+                accum = new float[payload.requirements().length];
+                deconstructing = payload;
+                payload = null;
+                progress = 0f;
+            }
+        }
+
+        @Override
+        public double sense(Content content){
+            if(deconstructing instanceof UnitPayload up) return up.unit.type == content ? 1 : 0;
+            if(deconstructing instanceof BuildPayload bp) return bp.build.block == content ? 1 : 0;
+            return super.sense(content);
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return progress;
+            return super.sense(sensor);
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return deconstructing != null && enabled;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(progress);
+            if(accum != null){
+                write.s(accum.length);
+                for(float v : accum){
+                    write.f(v);
+                }
+            }else{
+                write.s(0);
+            }
+            Payload.write(deconstructing, write);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            progress = read.f();
+            short accums = read.s();
+            if(accums > 0){
+                accum = new float[accums];
+                for(int i = 0; i < accums; i++){
+                    accum[i] = read.f();
+                }
+            }
+            deconstructing = Payload.read(read);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
new file mode 100644
index 0000000000..9d9328597e
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
@@ -0,0 +1,263 @@
+package mindustry.world.blocks.payloads;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.blocks.payloads.PayloadUnloader.*;
+import mindustry.world.blocks.sandbox.*;
+
+import static mindustry.Vars.*;
+
+public class PayloadLoader extends PayloadBlock{
+    public final int timerLoad = timers++;
+
+    public float loadTime = 2f;
+    public int itemsLoaded = 8;
+    public float liquidsLoaded = 40f;
+    public int maxBlockSize = 3;
+    public float maxPowerConsumption = 40f;
+    public boolean loadPowerDynamic = true;
+
+    public @Load("@-over") TextureRegion overRegion;
+
+    //initialized in init(), do not touch
+    protected float basePowerUse = 0f;
+
+    public PayloadLoader(String name){
+        super(name);
+ 
+        hasItems = true;
+        hasLiquids = true;
+        hasPower = true;
+        itemCapacity = 100;
+        liquidCapacity = 100f;
+        update = true;
+        outputsPayload = true;
+        size = 3;
+        rotate = true;
+        canOverdrive = false;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, inRegion, outRegion, topRegion};
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return false;
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("progress", (PayloadLoaderBuild build) -> new Bar(() ->
+            Core.bundle.format(build.payload != null && build.payload.block().hasItems ? "bar.items" : "bar.loadprogress",
+                build.payload == null || !build.payload.block().hasItems ? 0 : build.payload.build.items.total()), () -> Pal.items, build::fraction));
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(inRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public void init(){
+        if(loadPowerDynamic){
+            basePowerUse = consPower != null ? consPower.usage : 0f;
+            consumePowerDynamic(basePowerUse, (PayloadLoaderBuild loader) -> loader.shouldConsume() ? (loader.hasBattery() && !loader.exporting ? maxPowerConsumption + basePowerUse : basePowerUse) : 0f);
+        }
+
+        super.init();
+    }
+
+    public class PayloadLoaderBuild extends PayloadBlockBuild<BuildPayload>{
+        public boolean exporting = false;
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return super.acceptPayload(source, payload) &&
+                payload.fits(maxBlockSize) &&
+                payload instanceof BuildPayload build && (
+                //item container
+                (build.build.block.hasItems && build.block().unloadable && build.block().itemCapacity >= 10 && build.block().size <= maxBlockSize) ||
+                //liquid container
+                (build.build.block().hasLiquids && build.block().liquidCapacity >= 10f) ||
+                //battery
+                (build.build.block.consPower != null && build.build.block.consPower.buffered)
+            );
+        }
+
+        @Override
+        public void handlePayload(Building source, Payload payload){
+            super.handlePayload(source, payload);
+            exporting = false;
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return items.total() < itemCapacity && !(source instanceof PayloadUnloaderBuild);
+        }
+
+        @Override
+        public boolean acceptLiquid(Building source, Liquid liquid){
+            return (liquids.current() == liquid || liquids.currentAmount() < 0.2f) && !(source instanceof PayloadUnloaderBuild);
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            //draw input
+            boolean fallback = true;
+            for(int i = 0; i < 4; i++){
+                if(blends(i) && i != rotation){
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
+                    fallback = false;
+                }
+            }
+            if(fallback) Draw.rect(inRegion, x, y, rotation * 90);
+
+            Draw.rect(outRegion, x, y, rotdeg());
+
+            //drawn below payload so 3x3 blocks don't look even even weirder
+            Draw.rect(topRegion, x, y);
+
+            Draw.z(Layer.blockOver);
+            drawPayload();
+
+            if(overRegion.found()){
+                Draw.z(Layer.blockOver + 0.1f);
+                Draw.rect(overRegion, x, y);
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+            if(shouldExport()){
+                moveOutPayload();
+            }else if(moveInPayload()){
+
+                //load up items
+                if(payload.block().hasItems && items.any()){
+                    boolean acceptedAny = true;
+                    if(efficiency > 0.01f && timer(timerLoad, loadTime / efficiency)){
+                        acceptedAny = false;
+                        //load up items a set amount of times
+                        for(int j = 0; j < itemsLoaded && items.any(); j++){
+
+                            for(int i = 0; i < items.length(); i++){
+                                if(items.get(i) > 0){
+                                    Item item = content.item(i);
+                                    if(payload.build.acceptItem(payload.build, item)){
+                                        payload.build.handleItem(payload.build, item);
+                                        items.remove(item, 1);
+                                        acceptedAny = true;
+                                        break;
+                                    }else if(payload.block().separateItemCapacity || payload.block().consumesItem(item)){
+                                        exporting = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if(!acceptedAny){
+                        exporting = true;
+                    }
+                }
+
+                //load up liquids
+                if(payload.block().hasLiquids && liquids.currentAmount() >= 0.001f){
+                    Liquid liq = liquids.current();
+                    float total = liquids.currentAmount();
+                    float flow = Math.min(Math.min(liquidsLoaded * edelta(), payload.block().liquidCapacity - payload.build.liquids.get(liq)), total);
+                    //TODO potential crash here
+                    if(payload.build.acceptLiquid(payload.build, liq)){
+                        if(!(payload.block() instanceof LiquidVoid)){
+                            payload.build.liquids.add(liq, flow);
+                        }
+                        liquids.remove(liq, flow);
+                    }else{
+                        exporting = true;
+                    }
+                }
+
+                //load up power
+                if(hasBattery()){
+                    //base power input that in raw units
+                    float powerInput = power.status * (basePowerUse + maxPowerConsumption);
+                    //how much is actually usable
+                    float availableInput = Math.max(powerInput - basePowerUse, 0f);
+
+                    //charge the battery
+                    float cap = payload.block().consPower.capacity;
+                    payload.build.power.status += availableInput / cap * edelta();
+
+                    //export if full
+                    if(payload.build.power.status >= 1f){
+                        exporting = true;
+                        payload.build.power.status = Mathf.clamp(payload.build.power.status);
+                    }
+                }
+            }
+        }
+
+        public float fraction(){
+            return payload == null ? 0f :
+                payload.build.items != null ? payload.build.items.total() / (float)payload.build.block.itemCapacity :
+                payload.build.liquids != null ? payload.build.liquids.currentAmount() / payload.block().liquidCapacity :
+                hasBattery() ? payload.build.power.status :
+                0f;
+        }
+
+        public boolean shouldExport(){
+            return payload != null && (
+                exporting ||
+                (payload.block().hasLiquids && liquids.currentAmount() >= 0.1f && payload.build.liquids.currentAmount() >= payload.block().liquidCapacity - 0.001f) ||
+                (payload.block().hasItems && items.any() && payload.block().separateItemCapacity && content.items().contains(i -> payload.build.items.get(i) >= payload.block().itemCapacity)) ||
+                (hasBattery() && payload.build.power.status >= 0.999999999f));
+        }
+
+        public boolean hasBattery(){
+            return payload != null && payload.block().consPower != null && payload.block().consPower.buffered;
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return payload != null;
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.bool(exporting);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                exporting = read.bool();
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
new file mode 100644
index 0000000000..0e129a7b39
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
@@ -0,0 +1,526 @@
+package mindustry.world.blocks.payloads;
+
+import arc.audio.*;
+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.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+import static mindustry.world.blocks.payloads.PayloadMassDriver.PayloadDriverState.*;
+
+public class PayloadMassDriver extends PayloadBlock{
+    public float range = 100f;
+    public float rotateSpeed = 2f;
+    public float length = 89 / 8f;
+    public float knockback = 5f;
+    public float reload = 30f;
+    public float chargeTime = 100f;
+    public float maxPayloadSize = 3;
+    public float grabWidth = 8f, grabHeight = 11/4f;
+    public Effect shootEffect = Fx.shootBig2;
+    public Effect smokeEffect = Fx.shootPayloadDriver;
+    public Effect receiveEffect = Fx.payloadReceive;
+    public Sound shootSound = Sounds.shootBig;
+    public float shake = 3f;
+
+    public Effect transferEffect = new Effect(11f, 600f, e -> {
+        if(!(e.data instanceof PayloadMassDriverData data)) return;
+        Tmp.v1.set(data.x, data.y).lerp(data.ox, data.oy, Interp.sineIn.apply(e.fin()));
+        data.payload.set(Tmp.v1.x, Tmp.v1.y, e.rotation);
+        data.payload.draw();
+    }).layer(Layer.flyingUnitLow - 1);
+
+    public @Load("@-base") TextureRegion baseRegion;
+    public @Load("@-cap") TextureRegion capRegion;
+    public @Load("@-left") TextureRegion leftRegion;
+    public @Load("@-right") TextureRegion rightRegion;
+    public @Load("@-cap-outline") TextureRegion capOutlineRegion;
+    public @Load("@-left-outline") TextureRegion leftOutlineRegion;
+    public @Load("@-right-outline") TextureRegion rightOutlineRegion;
+    public @Load("bridge-arrow") TextureRegion arrow;
+
+    public PayloadMassDriver(String name){
+        super(name);
+        update = true;
+        solid = true;
+        configurable = true;
+        hasPower = true;
+        outlineIcon = true;
+        sync = true;
+        rotate = true;
+        outputsPayload = true;
+        group = BlockGroup.units;
+        regionRotated1 = 1;
+
+        //point2 is relative
+        config(Point2.class, (PayloadDriverBuild tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY()));
+        config(Integer.class, (PayloadDriverBuild tile, Integer point) -> tile.link = point);
+    }
+
+    @Override
+    public void init(){
+        super.init();
+        updateClipRadius(range);
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.payloadCapacity, StatValues.squared(maxPayloadSize, StatUnit.blocksSquared));
+        stats.add(Stat.reload, 60f / (chargeTime + reload), StatUnit.perSecond);
+        stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{baseRegion, outRegion, region};
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(baseRegion, plan.drawx(), plan.drawy());
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
+        Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(region, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize, y * tilesize, range, Pal.accent);
+
+        //check if a mass driver is selected while placing this driver
+        if(!control.input.config.isShown()) return;
+        Building selected = control.input.config.getSelected();
+        if(selected == null || selected.block != this || !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);
+        Tmp.v1.set(x * tilesize + offset, y * tilesize + offset).sub(selected.x, selected.y).limit((size / 2f + 1) * tilesize + sin + 0.5f);
+        float x2 = x * tilesize - Tmp.v1.x, y2 = y * tilesize - Tmp.v1.y,
+            x1 = selected.x + Tmp.v1.x, y1 = selected.y + Tmp.v1.y;
+        int segs = (int)(selected.dst(x * tilesize, y * tilesize) / tilesize);
+
+        Lines.stroke(4f, Pal.gray);
+        Lines.dashLine(x1, y1, x2, y2, segs);
+        Lines.stroke(2f, Pal.placing);
+        Lines.dashLine(x1, y1, x2, y2, segs);
+        Draw.reset();
+    }
+
+    @Override
+    public void getRegionsToOutline(Seq<TextureRegion> out){
+        out.add(leftRegion, rightRegion, capRegion);
+    }
+
+    public class PayloadDriverBuild extends PayloadBlockBuild<Payload> implements RotBlock{
+        public int link = -1;
+        public float turretRotation = 90;
+        public float reloadCounter = 0f, charge = 0f;
+        public float targetSize = grabWidth*2f, curSize = targetSize;
+        public float payLength = 0f, effectDelayTimer = -1f;
+        public PayloadDriverBuild lastOther;
+        public boolean loaded;
+        public boolean charging;
+        public PayloadDriverState state = idle;
+        public Queue<Building> waitingShooters = new Queue<>();
+        public Payload recPayload;
+
+        public Building currentShooter(){
+            return waitingShooters.isEmpty() ? null : waitingShooters.first();
+        }
+
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+            Building link = world.build(this.link);
+            boolean hasLink = linkValid();
+
+            //discharge when charging isn't happening
+            if(!charging){
+                charge -= Time.delta * 10f;
+                if(charge < 0) charge = 0f;
+            }
+
+            curSize = Mathf.lerpDelta(curSize, targetSize, 0.05f);
+            targetSize = grabWidth*2f;
+
+            if(payload != null){
+                targetSize = payload.size();
+            }
+
+            boolean pos = effectDelayTimer > 0;
+            effectDelayTimer -= Time.delta;
+            if(effectDelayTimer <= 0 && pos && lastOther != null){
+                var other = lastOther;
+                float cx = Angles.trnsx(other.turretRotation, length), cy = Angles.trnsy(other.turretRotation, length);
+                receiveEffect.at(x - cx/2f, y - cy/2f, turretRotation);
+                reloadCounter = 1f;
+                Effect.shake(shake, shake, this);
+            }
+
+            charging = false;
+
+            if(hasLink){
+                this.link = link.pos();
+            }
+
+            //reload regardless of state
+            reloadCounter -= edelta() / reload;
+            if(reloadCounter < 0) reloadCounter = 0f;
+
+            var current = currentShooter();
+
+            //cleanup waiting shooters that are not valid
+            if(current != null &&
+                !(
+                    current instanceof PayloadDriverBuild entity &&
+                    current.isValid() &&
+                    entity.efficiency > 0 && entity.block == block &&
+                    entity.link == pos() && within(current, range)
+                )){
+                waitingShooters.removeFirst();
+            }
+
+            //switch states
+            if(state == idle){
+                //start accepting when idle and there's space
+                if(!waitingShooters.isEmpty() && payload == null){
+                    state = accepting;
+                }else if(hasLink){ //switch to shooting if there's a valid link.
+                    state = shooting;
+                }
+            }
+
+            //dump when idle or accepting
+            if((state == idle || state == accepting) && payload != null){
+                if(loaded){
+                    payLength -= payloadSpeed * delta();
+                    if(payLength <= 0f){
+                        loaded = false;
+                        payVector.setZero();
+                        payRotation = Angles.moveToward(payRotation, turretRotation + 180f, payloadRotateSpeed * delta());
+                    }
+                }else if(effectDelayTimer <= 0){
+                    moveOutPayload();
+                }
+            }
+
+            //skip when there's no power
+            if(efficiency <= 0f){
+                return;
+            }
+
+            if(state == accepting){
+                //if there's nothing shooting at this or items are full, bail out
+                if(currentShooter() == null || payload != null){
+                    state = idle;
+                    return;
+                }
+
+                if(currentShooter().getPayload() != null){
+                    targetSize = recPayload == null ? currentShooter().getPayload().size() : recPayload.size();
+                }
+
+                //align to shooter rotation
+                turretRotation = Angles.moveToward(turretRotation, angleTo(currentShooter()), rotateSpeed * efficiency);
+            }else if(state == shooting){
+                //if there's nothing to shoot at OR someone wants to shoot at this thing, bail
+                if(!hasLink || (!waitingShooters.isEmpty() && payload == null)){
+                    state = idle;
+                    return;
+                }
+
+                float targetRotation = angleTo(link);
+                boolean movedOut = false;
+
+                payRotation = Angles.moveToward(payRotation, turretRotation, payloadRotateSpeed * delta());
+                if(loaded){
+                    float loadLength = length - reloadCounter *knockback;
+                    payLength += payloadSpeed * delta();
+                    if(payLength >= loadLength){
+                        payLength = loadLength;
+                        movedOut = true;
+                    }
+                }else if(moveInPayload()){
+                    payLength = 0f;
+                    loaded = true;
+                }
+
+                //make sure payload firing can happen
+                if(movedOut && payload != null && link.getPayload() == null){
+                    var other = (PayloadDriverBuild)link;
+
+                    if(!other.waitingShooters.contains(this)){
+                        other.waitingShooters.addLast(this);
+                    }
+
+                    if(reloadCounter <= 0){
+                        //align to target location
+                        turretRotation = Angles.moveToward(turretRotation, targetRotation, rotateSpeed * efficiency);
+
+                        //fire when it's the first in the queue and angles are ready.
+                        if(other.currentShooter() == this &&
+                        other.state == accepting &&
+                        other.reloadCounter <= 0f &&
+                        Angles.within(turretRotation, targetRotation, 1f) && Angles.within(other.turretRotation, targetRotation + 180f, 1f)){
+                            charge += edelta();
+                            charging = true;
+
+                            if(charge >= chargeTime){
+                                float cx = Angles.trnsx(turretRotation, length), cy = Angles.trnsy(turretRotation, length);
+
+                                //effects
+                                shootEffect.at(x + cx, y + cy, turretRotation);
+                                smokeEffect.at(x, y, turretRotation);
+
+                                Effect.shake(shake, shake, this);
+                                shootSound.at(this, Mathf.random(0.9f, 1.1f));
+                                transferEffect.at(x + cx, y + cy, turretRotation, new PayloadMassDriverData(x + cx, y + cy, other.x - cx, other.y - cy, payload));
+                                Payload pay = payload;
+                                other.recPayload = payload;
+                                other.effectDelayTimer = transferEffect.lifetime;
+
+                                //transfer payload
+                                other.handlePayload(this, pay);
+                                other.lastOther = this;
+                                other.payVector.set(-cx, -cy);
+                                other.payRotation = turretRotation;
+                                other.payLength = length;
+                                other.loaded = true;
+                                other.updatePayload();
+                                other.recPayload = null;
+
+                                if(other.waitingShooters.size != 0 && other.waitingShooters.first() == this){
+                                    other.waitingShooters.removeFirst();
+                                }
+                                other.state = idle;
+
+                                //reset state after shooting immediately
+                                payload = null;
+                                payLength = 0f;
+                                loaded = false;
+                                state = idle;
+                                reloadCounter = 1f;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return Mathf.clamp(1f - reloadCounter / reload);
+            return super.sense(sensor);
+        }
+
+        @Override
+        public void updatePayload(){
+            if(payload != null){
+                if(loaded){
+                    payload.set(x + Angles.trnsx(turretRotation, payLength), y + Angles.trnsy(turretRotation, payLength), payRotation);
+                }else{
+                    payload.set(x + payVector.x, y + payVector.y, payRotation);
+                }
+            }
+        }
+
+        @Override
+        public void draw(){
+            float
+            tx = x + Angles.trnsx(turretRotation + 180f, reloadCounter * knockback),
+            ty = y + Angles.trnsy(turretRotation + 180f, reloadCounter * knockback), r = turretRotation - 90;
+
+            Draw.rect(baseRegion, x, y);
+
+            //draw input
+            for(int i = 0; i < 4; i++){
+                if(blends(i) && i != rotation){
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
+                }
+            }
+
+            Draw.rect(outRegion, x, y, rotdeg());
+
+            if(payload != null){
+                updatePayload();
+
+                if(effectDelayTimer <= 0){
+                    Draw.z(loaded ? Layer.blockOver + 0.2f : Layer.blockOver);
+                    payload.draw();
+                }
+            }
+
+            Draw.z(Layer.blockOver + 0.1f);
+            Draw.rect(topRegion, x, y);
+
+            Draw.z(Layer.turret);
+            //TODO
+            Drawf.shadow(region, tx - (size / 2f), ty - (size / 2f), r);
+
+            Tmp.v1.trns(turretRotation, 0, -(curSize/2f - grabWidth));
+            Tmp.v2.trns(rotation, -Math.max(curSize/2f - grabHeight - length, 0f), 0f);
+            float rx = tx + Tmp.v1.x + Tmp.v2.x, ry = ty + Tmp.v1.y + Tmp.v2.y;
+            float lx = tx - Tmp.v1.x + Tmp.v2.x, ly = ty - Tmp.v1.y + Tmp.v2.y;
+
+            Draw.rect(capOutlineRegion, tx, ty, r);
+            Draw.rect(leftOutlineRegion, lx, ly, r);
+            Draw.rect(rightOutlineRegion, rx, ry, r);
+
+            Draw.rect(leftRegion, lx, ly, r);
+            Draw.rect(rightRegion, rx, ry, r);
+            Draw.rect(capRegion, tx, ty, r);
+
+            Draw.z(Layer.effect);
+
+            if(charge > 0 && linkValid()){
+                Building link = world.build(this.link);
+
+                float fin = Interp.pow2Out.apply(charge / chargeTime), fout = 1f-fin, len = length*1.8f, w = curSize/2f + 7f*fout;
+                Vec2 right = Tmp.v1.trns(turretRotation, len, w);
+                Vec2 left = Tmp.v2.trns(turretRotation, len, -w);
+
+                Lines.stroke(fin * 1.2f, Pal.accent);
+                Lines.line(x + left.x, y + left.y, link.x - right.x, link.y - right.y);
+                Lines.line(x + right.x, y + right.y, link.x - left.x, link.y - left.y);
+
+                for(int i = 0; i < 4; i++){
+                    Tmp.v3.set(x, y).lerp(link.x, link.y, 0.5f + (i - 2) * 0.1f);
+                    Draw.scl(fin * 1.1f);
+                    Draw.rect(arrow, Tmp.v3.x, Tmp.v3.y, turretRotation);
+                    Draw.scl();
+                }
+
+                Draw.reset();
+            }
+        }
+
+        @Override
+        public void drawConfigure(){
+            float sin = Mathf.absin(Time.time, 6f, 1f);
+
+            Draw.color(Pal.accent);
+            Lines.stroke(1f);
+            Drawf.circles(x, y, (tile.block().size / 2f + 1) * tilesize + sin - 2f, Pal.accent);
+
+            for(var shooter : waitingShooters){
+                Drawf.circles(shooter.x, shooter.y, (tile.block().size / 2f + 1) * tilesize + sin - 2f, Pal.place);
+                Drawf.arrow(shooter.x, shooter.y, x, y, size * tilesize + sin, 4f + sin, Pal.place);
+            }
+
+            if(linkValid()){
+                Building target = world.build(link);
+                Drawf.circles(target.x, target.y, (target.block().size / 2f + 1) * tilesize + sin - 2f, Pal.place);
+                Drawf.arrow(x, y, target.x, target.y, size * tilesize + sin, 4f + sin);
+            }
+
+            Drawf.dashCircle(x, y, range, Pal.accent);
+        }
+
+        @Override
+        public boolean onConfigureBuildTapped(Building other){
+            if(this == other){
+                if(link == -1) deselect();
+                configure(-1);
+                return false;
+            }
+
+            if(link == other.pos()){
+                configure(-1);
+                return false;
+            }else if(other.block instanceof PayloadMassDriver && other.dst(tile) <= range && other.team == team){
+                configure(other.pos());
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return super.acceptPayload(source, payload) && payload.size() <= maxPayloadSize * tilesize;
+        }
+
+        protected boolean linkValid(){
+            return link != -1 && world.build(this.link) instanceof PayloadDriverBuild other && other.block == block && other.team == team && within(other, range);
+        }
+
+        @Override
+        public Point2 config(){
+            if(tile == null) return null;
+            return Point2.unpack(link).sub(tile.x, tile.y);
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.i(link);
+            write.f(turretRotation);
+            write.b((byte)state.ordinal());
+
+            write.f(reloadCounter);
+            write.f(charge);
+            write.bool(loaded);
+            write.bool(charging);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            link = read.i();
+            turretRotation = read.f();
+            state = PayloadDriverState.all[read.b()];
+
+            if(revision >= 1){
+                reloadCounter = read.f();
+                charge = read.f();
+                loaded = read.bool();
+                charging = read.bool();
+            }
+        }
+    }
+
+    public static class PayloadMassDriverData{
+        public float x, y, ox, oy;
+        public Payload payload;
+
+        public PayloadMassDriverData(float x, float y, float ox, float oy, Payload payload){
+            this.x = x;
+            this.y = y;
+            this.ox = ox;
+            this.oy = oy;
+            this.payload = payload;
+        }
+    }
+
+    public enum PayloadDriverState{
+        idle, accepting, shooting;
+
+        public static final PayloadDriverState[] all = values();
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadRouter.java b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java
new file mode 100644
index 0000000000..e2219de3cf
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java
@@ -0,0 +1,227 @@
+package mindustry.world.blocks.payloads;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.ctype.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.storage.*;
+
+import static mindustry.Vars.*;
+
+public class PayloadRouter extends PayloadConveyor{
+    public boolean invert = false;
+
+    public @Load("@-over") TextureRegion overRegion;
+
+    public PayloadRouter(String name){
+        super(name);
+
+        outputsPayload = true;
+        outputFacing = false;
+        configurable = true;
+        clearOnDoubleTap = true;
+
+        config(Block.class, (PayloadRouterBuild tile, Block item) -> tile.sorted = item);
+        config(UnitType.class, (PayloadRouterBuild tile, UnitType item) -> tile.sorted = item);
+        configClear((PayloadRouterBuild tile) -> tile.sorted = null);
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        super.drawPlanRegion(plan, list);
+
+        Draw.rect(overRegion, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public void getPlanConfigs(Seq<UnlockableContent> options){
+        options.add(content.blocks().select(this::canSort));
+        options.add(content.units().select(this::canSort));
+    }
+
+    public boolean canSort(Block b){
+        return b.isVisible() && b.size <= size && !(b instanceof CoreBlock) && !state.rules.isBanned(b) && b.environmentBuildable();
+    }
+
+    public boolean canSort(UnitType t){
+        return !t.isHidden() && !t.isBanned() && t.supportsEnv(state.rules.env);
+    }
+
+    public class PayloadRouterBuild extends PayloadConveyorBuild{
+        public @Nullable UnlockableContent sorted;
+        public int recDir;
+        public boolean matches;
+
+        public float smoothRot;
+        public float controlTime = -1f;
+
+        @Override
+        public void add(){
+            super.add();
+            smoothRot = rotdeg();
+        }
+
+        public void pickNext(){
+            if(item != null && controlTime <= 0f){
+                if(matches){
+                    //when the item matches, always move forward.
+                    rotation = recDir;
+                    onProximityUpdate();
+                }else{
+                    int rotations = 0;
+                    do{
+                        rotation = (rotation + 1) % 4;
+                        //if it doesn't match the sort item and this router is facing forward, skip this rotation
+                        if(!matches && sorted != null && rotation == recDir){
+                            rotation ++;
+                        }
+                        onProximityUpdate();
+
+                        //force update to transfer if necessary
+                        if(next instanceof PayloadConveyorBuild && !(next instanceof PayloadRouterBuild)){
+                            next.updateTile();
+                        }
+                        //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);
+                }
+            }else{
+                onProximityUpdate();
+            }
+        }
+
+        @Override
+        public void control(LAccess type, double p1, double p2, double p3, double p4){
+            super.control(type, p1, p2, p3, p4);
+            if(type == LAccess.config){
+                int prev = rotation;
+                rotation = Mathf.mod((int)p1, 4);
+                //when manually controlled, routers do not turn automatically for a while, same as turrets
+                controlTime = 60f * 6f;
+                if(prev != rotation){
+                    onProximityUpdate();
+                }
+            }
+        }
+
+        @Override
+        public void onControlSelect(Unit player){
+            super.onControlSelect(player);
+            //this will immediately snap back if logic controlled
+            recDir = rotation;
+            checkMatch();
+        }
+
+        @Override
+        public void handlePayload(Building source, Payload payload){
+            super.handlePayload(source, payload);
+            if(controlTime < 0f){ //don't overwrite logic recDir
+                recDir = source == null ? rotation : source.relativeTo(this);
+            }
+            checkMatch();
+            pickNext();
+        }
+
+        public void checkMatch(){
+            matches = sorted != null &&
+                (item instanceof BuildPayload build && build.block() == sorted) ||
+                (item instanceof UnitPayload unit && unit.unit.type == sorted);
+
+            if(invert) matches = !matches;
+        }
+
+        @Override
+        public void moveFailed(){
+            pickNext();
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            controlTime -= Time.delta;
+            smoothRot = Mathf.slerpDelta(smoothRot, rotdeg(), 0.2f);
+        }
+
+        @Override
+        public void drawSelect(){
+            if(sorted != null){
+                float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
+                Draw.mixcol(Color.darkGray, 1f);
+                Draw.rect(sorted.fullIcon, dx, dy - 1, s, s);
+                Draw.reset();
+                Draw.rect(sorted.fullIcon, dx, dy, s, s);
+            }
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            float dst = 0.8f;
+
+            Draw.mixcol(team.color, Math.max((dst - (Math.abs(fract() - 0.5f) * 2)) / dst, 0));
+            Draw.rect(topRegion, x, y, smoothRot);
+            Draw.reset();
+
+            Draw.rect(overRegion, x, y);
+
+            Draw.z(Layer.blockOver);
+
+            if(item != null){
+                item.draw();
+            }
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            ItemSelection.buildTable(PayloadRouter.this, table,
+                content.blocks().select(PayloadRouter.this::canSort).<UnlockableContent>as()
+                .add(content.units().select(PayloadRouter.this::canSort).as()),
+                () -> (UnlockableContent)config(), this::configure);
+        }
+
+        @Override
+        public Object config(){
+            return sorted;
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.b(sorted == null ? -1 : sorted.getContentType().ordinal());
+            write.s(sorted == null ? -1 : sorted.id);
+            write.b(recDir);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                byte ctype = read.b();
+                short sort = read.s();
+                sorted = ctype == -1 ? null : Vars.content.getByID(ContentType.all[ctype], sort);
+                recDir = read.b();
+                checkMatch();
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadSource.java b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
new file mode 100644
index 0000000000..618f258feb
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
@@ -0,0 +1,180 @@
+package mindustry.world.blocks.payloads;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.entities.units.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.storage.*;
+
+import static mindustry.Vars.*;
+
+/** Generic building that produces other buildings. */
+public class PayloadSource extends PayloadBlock{
+
+    public PayloadSource(String name){
+        super(name);
+
+        size = 3;
+        update = true;
+        outputsPayload = true;
+        hasPower = false;
+        rotate = true;
+        configurable = true;
+        selectionRows = selectionColumns = 8;
+        //make sure to display large units.
+        clipSize = 120;
+        noUpdateDisabled = true;
+        clearOnDoubleTap = true;
+        regionRotated1 = 1;
+        acceptsUnitPayloads = false;
+        commandable = true;
+
+        config(Block.class, (PayloadSourceBuild build, Block block) -> {
+            if(canProduce(block) && build.configBlock != block){
+                build.configBlock = block;
+                build.unit = null;
+                build.payload = null;
+                build.scl = 0f;
+            }
+        });
+
+        config(UnitType.class, (PayloadSourceBuild build, UnitType unit) -> {
+            if(canProduce(unit) && build.unit != unit){
+                build.unit = unit;
+                build.configBlock = null;
+                build.payload = null;
+                build.scl = 0f;
+            }
+        });
+
+        configClear((PayloadSourceBuild build) -> {
+            build.configBlock = null;
+            build.unit = null;
+            build.payload = null;
+            build.scl = 0f;
+        });
+    }
+
+    @Override
+    public void getPlanConfigs(Seq<UnlockableContent> options){
+        options.add(content.blocks().select(this::canProduce));
+        options.add(content.units().select(this::canProduce));
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, outRegion, topRegion};
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
+    }
+
+    public boolean canProduce(Block b){
+        return b.isVisible() && b.size < size && !(b instanceof CoreBlock) && !state.rules.isBanned(b) && b.environmentBuildable();
+    }
+
+    public boolean canProduce(UnitType t){
+        return !t.isHidden() && !t.isBanned() && t.supportsEnv(state.rules.env);
+    }
+
+    public class PayloadSourceBuild extends PayloadBlockBuild<Payload>{
+        public UnitType unit;
+        public Block configBlock;
+        public @Nullable Vec2 commandPos;
+        public float scl;
+
+        @Override
+        public Vec2 getCommandPosition(){
+            return commandPos;
+        }
+
+        @Override
+        public void onCommand(Vec2 target){
+            commandPos = target;
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            ItemSelection.buildTable(PayloadSource.this, table,
+                content.blocks().select(PayloadSource.this::canProduce).<UnlockableContent>as()
+                .add(content.units().select(PayloadSource.this::canProduce).as()),
+            () -> (UnlockableContent)config(), this::configure, selectionRows, selectionColumns);
+        }
+
+        @Override
+        public Object config(){
+            return unit == null ? configBlock : unit;
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return false;
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+            if(payload == null){
+                scl = 0f;
+                if(unit != null){
+                    payload = new UnitPayload(unit.create(team));
+
+                    Unit p = ((UnitPayload)payload).unit;
+                    if(commandPos != null && p.isCommandable()){
+                        p.command().commandPosition(commandPos);
+                    }
+
+                    Events.fire(new UnitCreateEvent(p, this));
+                }else if(configBlock != null){
+                    payload = new BuildPayload(configBlock, team);
+                }
+                payVector.setZero();
+                payRotation = rotdeg();
+            }
+            scl = Mathf.lerpDelta(scl, 1f, 0.1f);
+
+            moveOutPayload();
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+            Draw.rect(outRegion, x, y, rotdeg());
+            Draw.rect(topRegion, x, y);
+
+            Draw.scl(scl);
+            drawPayload();
+            Draw.reset();
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.s(unit == null ? -1 : unit.id);
+            write.s(configBlock == null ? -1 : configBlock.id);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            unit = Vars.content.unit(read.s());
+            configBlock = Vars.content.block(read.s());
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java b/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
new file mode 100644
index 0000000000..205402fdd6
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
@@ -0,0 +1,124 @@
+package mindustry.world.blocks.payloads;
+
+import mindustry.gen.*;
+import mindustry.type.*;
+
+import static mindustry.Vars.*;
+
+public class PayloadUnloader extends PayloadLoader{
+    public int offloadSpeed = 4;
+    //per frame
+    public float maxPowerUnload = 80f;
+
+    public PayloadUnloader(String name){
+        super(name);
+        outputsPower = true;
+        consumesPower = true;
+        outputsLiquid = true;
+        loadPowerDynamic = false;
+        canOverdrive = false;
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return true;
+    }
+
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        return false;
+    }
+
+    public class PayloadUnloaderBuild extends PayloadLoaderBuild{
+        public float lastOutputPower = 0f;
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return false;
+        }
+
+        @Override
+        public boolean acceptLiquid(Building source, Liquid liquid){
+            return false;
+        }
+
+        @Override
+        public float getPowerProduction(){
+            return lastOutputPower;
+        }
+
+        @Override
+        public void updateTile(){
+            if(payload != null){
+                payload.update(null, this);
+            }
+            lastOutputPower = 0f;
+
+            if(shouldExport()){
+                //one-use, disposable block
+                if(payload.block().instantDeconstruct){
+                    payload.block().breakEffect.at(this, payload.block().size);
+                    payload = null;
+                }else{
+                    moveOutPayload();
+                }
+            }else if(moveInPayload()){
+
+                //unload items
+                if(payload.block().hasItems && !full()){
+                    if(efficiency > 0.01f && timer(timerLoad, loadTime / efficiency)){
+                        //load up items a set amount of times
+                        for(int j = 0; j < itemsLoaded && !full(); j++){
+                            for(int i = 0; i < items.length(); i++){
+                                if(payload.build.items.get(i) > 0){
+                                    Item item = content.item(i);
+                                    payload.build.items.remove(item, 1);
+                                    items.add(item, 1);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                //unload liquids
+                //TODO tile is null may crash
+                if(payload.block().hasLiquids && payload.build.liquids.currentAmount() >= 0.01f &&
+                    (liquids.current() == payload.build.liquids.current() || liquids.currentAmount() <= 0.2f)){
+                    var liq = payload.build.liquids.current();
+                    float remaining = liquidCapacity - liquids.currentAmount();
+                    float flow = Math.min(Math.min(liquidsLoaded * edelta(), remaining), payload.build.liquids.currentAmount());
+
+                    liquids.add(liq, flow);
+                    payload.build.liquids.remove(liq, flow);
+                }
+
+                if(hasBattery()){
+                    float cap = payload.block().consPower.capacity;
+                    float total = payload.build.power.status * cap;
+                    float unloaded = Math.min(maxPowerUnload * edelta(), total);
+                    lastOutputPower = unloaded;
+                    payload.build.power.status -= unloaded / cap;
+                }
+            }
+
+            dumpLiquid(liquids.current());
+            for(int i = 0; i < offloadSpeed; i++){
+                dumpAccumulate();
+            }
+        }
+
+        public boolean full(){
+            return items.total() >= itemCapacity;
+        }
+
+        @Override
+        public boolean shouldExport(){
+            return payload != null && (
+                (!payload.block().hasItems || payload.build.items.empty()) &&
+                (!payload.block().hasLiquids || payload.build.liquids.currentAmount() <= 0.011f) &&
+                (!hasBattery() || payload.build.power.status <= 0.0000001f)
+            );
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadVoid.java b/core/src/mindustry/world/blocks/payloads/PayloadVoid.java
new file mode 100644
index 0000000000..78e77fcb7d
--- /dev/null
+++ b/core/src/mindustry/world/blocks/payloads/PayloadVoid.java
@@ -0,0 +1,66 @@
+package mindustry.world.blocks.payloads;
+
+import arc.audio.*;
+import arc.graphics.g2d.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+public class PayloadVoid extends PayloadBlock{
+    public Effect incinerateEffect = Fx.blastExplosion;
+    public Sound incinerateSound = Sounds.bang;
+
+    public PayloadVoid(String name){
+        super(name);
+
+        outputsPayload = false;
+        acceptsPayload = true;
+        update = true;
+        rotate = false;
+        size = 3;
+        payloadSpeed = 1.2f;
+        //make sure to display large units.
+        clipSize = 120;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    public class PayloadVoidBuild extends PayloadBlockBuild<Payload>{
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            //draw input
+            for(int i = 0; i < 4; i++){
+                if(blends(i)){
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
+                }
+            }
+
+            Draw.rect(topRegion, x, y);
+
+            Draw.z(Layer.blockOver);
+            drawPayload();
+        }
+
+        @Override
+        public boolean acceptUnitPayload(Unit unit){
+            return true;
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+            if(moveInPayload(false) && efficiency > 0){
+                payload = null;
+                incinerateEffect.at(this);
+                incinerateSound.at(this);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/UnitPayload.java b/core/src/mindustry/world/blocks/payloads/UnitPayload.java
index c02ca68f5d..a9c57941ce 100644
--- a/core/src/mindustry/world/blocks/payloads/UnitPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/UnitPayload.java
@@ -1,28 +1,67 @@
 package mindustry.world.blocks.payloads;
 
+import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.math.geom.*;
+import arc.scene.style.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
+import mindustry.core.*;
+import mindustry.ctype.*;
 import mindustry.entities.EntityCollisions.*;
 import mindustry.entities.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.ui.*;
+import mindustry.type.*;
+
+import static mindustry.Vars.*;
 
 public class UnitPayload implements Payload{
-    public static final float deactiveDuration = 40f;
+    public static final float overlayDuration = 40f;
 
     public Unit unit;
-    public float deactiveTime = 0f;
+    public float overlayTime = 0f;
+    public @Nullable TextureRegion overlayRegion;
 
     public UnitPayload(Unit unit){
         this.unit = unit;
     }
 
+    /** Flashes a red overlay region. */
+    public void showOverlay(TextureRegion icon){
+        overlayRegion = icon;
+        overlayTime = 1f;
+    }
+
+    /** Flashes a red overlay region. */
+    public void showOverlay(TextureRegionDrawable icon){
+        if(icon == null || headless) return;
+        showOverlay(icon.getRegion());
+    }
+
+    @Override
+    public void update(@Nullable Unit unitHolder, @Nullable Building buildingHolder){
+        unit.type.updatePayload(unit, unitHolder, buildingHolder);
+    }
+
+    @Override
+    public UnlockableContent content(){
+        return unit.type;
+    }
+
+    @Override
+    public ItemStack[] requirements(){
+        return unit.type.getTotalRequirements();
+    }
+
+    @Override
+    public float buildTime(){
+        return unit.type.getBuildTime();
+    }
+
     @Override
     public void write(Writes write){
         write.b(payloadUnit);
@@ -33,7 +72,22 @@ public class UnitPayload implements Payload{
     @Override
     public void set(float x, float y, float rotation){
         unit.set(x, y);
-        unit.rotation(rotation);
+        unit.rotation = rotation;
+    }
+
+    @Override
+    public float x(){
+        return unit.x;
+    }
+
+    @Override
+    public float y(){
+        return unit.y;
+    }
+
+    @Override
+    public float rotation(){
+        return unit.rotation;
     }
 
     @Override
@@ -43,22 +97,29 @@ public class UnitPayload implements Payload{
 
     @Override
     public boolean dump(){
+        //TODO should not happen
+        if(unit.type == null) return true;
+
         if(!Units.canCreate(unit.team, unit.type)){
-            deactiveTime = 1f;
+            overlayTime = 1f;
+            overlayRegion = null;
             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);
-            }
+            Tmp.v1.trns(unit.rotation, 1f);
+
+            int tx = World.toTile(unit.x + Tmp.v1.x), ty = World.toTile(unit.y + Tmp.v1.y);
 
             //cannot dump on solid blocks
-            if(!nearEmpty) return false;
+            if(solid.solid(tx, ty)) return false;
+        }
+
+        //cannot dump when there's a lot of overlap going on
+        if(!unit.type.flying && Units.count(unit.x, unit.y, unit.physicSize() * 1.05f, o -> o.isGrounded() && (o.type.allowLegStep == unit.type.allowLegStep)) > 0){
+            return false;
         }
 
         //no client dumping
@@ -67,31 +128,50 @@ public class UnitPayload implements Payload{
         //prevents stacking
         unit.vel.add(Mathf.range(0.5f), Mathf.range(0.5f));
         unit.add();
+        unit.unloaded();
+        Events.fire(new UnitUnloadEvent(unit));
 
         return true;
     }
 
+    @Override
+    public void drawShadow(float alpha){
+        //TODO should not happen
+        if(unit.type == null) return;
+
+        unit.type.drawSoftShadow(unit, alpha);
+    }
+
     @Override
     public void draw(){
-        Drawf.shadow(unit.x, unit.y, 20);
-        Draw.rect(unit.type.icon(Cicon.full), unit.x, unit.y, unit.rotation - 90);
+        //TODO should not happen
+        if(unit.type == null) return;
+
+        float e = unit.elevation;
+        unit.elevation = 0f;
+        unit.type.draw(unit);
+        unit.elevation = e;
 
         //draw warning
-        if(deactiveTime > 0){
+        if(overlayTime > 0){
+            float z = Draw.z();
+            Draw.z(Layer.groundUnit + 1f);
+            var region = overlayRegion == null ? Icon.warning.getRegion() : overlayRegion;
             Draw.color(Color.scarlet);
-            Draw.alpha(0.8f * Interp.exp5Out.apply(deactiveTime));
+            Draw.alpha(0.8f * Interp.exp5Out.apply(overlayTime));
 
             float size = 8f;
-            Draw.rect(Icon.warning.getRegion(), unit.x, unit.y, size, size);
+            Draw.rect(region, unit.x, unit.y, size, size);
 
             Draw.reset();
 
-            deactiveTime = Math.max(deactiveTime - Time.delta/deactiveDuration, 0f);
+            overlayTime = Math.max(overlayTime - Time.delta/overlayDuration, 0f);
+            Draw.z(z);
         }
     }
 
     @Override
-    public TextureRegion icon(Cicon icon){
-        return unit.type.icon(icon);
+    public TextureRegion icon(){
+        return unit.type.fullIcon;
     }
 }
diff --git a/core/src/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java
index f0cff96156..ce3867666b 100644
--- a/core/src/mindustry/world/blocks/power/Battery.java
+++ b/core/src/mindustry/world/blocks/power/Battery.java
@@ -4,41 +4,97 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.*;
-
 public class Battery extends PowerDistributor{
-    public @Load("@-top") TextureRegion topRegion;
+    public @Nullable DrawBlock drawer;
 
     public Color emptyLightColor = Color.valueOf("f8c266");
     public Color fullLightColor = Color.valueOf("fb9567");
 
+    @Deprecated
+    public @Load("@-top") TextureRegion topRegion;
+
     public Battery(String name){
         super(name);
         outputsPower = true;
         consumesPower = true;
+        canOverdrive = false;
         flags = EnumSet.of(BlockFlag.battery);
+        //TODO could be supported everywhere...
+        envEnabled |= Env.space;
+        destructible = true;
+        //batteries don't need to update
+        update = false;
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        checkDrawDefault();
+    }
+
+    void checkDrawDefault(){
+        if(drawer == null){
+            drawer = new DrawMulti(new DrawDefault(), new DrawPower(){{
+                emptyLightColor = Battery.this.emptyLightColor;
+                fullLightColor = Battery.this.fullLightColor;
+            }}, new DrawRegion("-top"));
+        }
+    }
+
+    @Override
+    public void load(){
+        checkDrawDefault();
+
+        super.load();
+        drawer.load(this);
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        drawer.drawPlan(this, plan, list);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return drawer.finalIcons(this);
+    }
+
+    @Override
+    public void getRegionsToOutline(Seq<TextureRegion> out){
+        drawer.getRegionsToOutline(this, out);
     }
 
     public class BatteryBuild extends Building{
         @Override
         public void draw(){
-            Draw.color(emptyLightColor, fullLightColor, power.status);
-            Fill.square(x, y, tilesize * size / 2f - 1);
-            Draw.color();
+            drawer.draw(this);
+        }
 
-            Draw.rect(topRegion, x, y);
+        @Override
+        public void drawLight(){
+            super.drawLight();
+            drawer.drawLight(this);
+        }
+
+        @Override
+        public float warmup(){
+            return power.status;
         }
 
         @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);
+                if(other.power != null && other.block.consPower != null && other.block.consPower.buffered){
+                    float amount = other.block.consPower.capacity * other.power.status;
+                    power.status = Mathf.clamp(power.status + amount / consPower.capacity);
                 }
             }
         }
diff --git a/core/src/mindustry/world/blocks/power/BeamNode.java b/core/src/mindustry/world/blocks/power/BeamNode.java
new file mode 100644
index 0000000000..a32f2e2178
--- /dev/null
+++ b/core/src/mindustry/world/blocks/power/BeamNode.java
@@ -0,0 +1,295 @@
+package mindustry.world.blocks.power;
+
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.core.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.input.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import java.util.*;
+
+import static mindustry.Vars.*;
+
+public class BeamNode extends PowerBlock{
+    //maximum expected range of any beam node; used for previews
+    private static final int maxRange = 30;
+
+    public int range = 5;
+
+    public @Load(value = "@-beam", fallback = "power-beam") TextureRegion laser;
+    public @Load(value = "@-beam-end", fallback = "power-beam-end") TextureRegion laserEnd;
+
+    public Color laserColor1 = Color.white;
+    public Color laserColor2 = Color.valueOf("ffd9c2");
+    public float pulseScl = 7, pulseMag = 0.05f;
+    public float laserWidth = 0.4f;
+
+    public BeamNode(String name){
+        super(name);
+        consumesPower = outputsPower = false;
+        drawDisabled = false;
+        envEnabled |= Env.space;
+        allowDiagonal = false;
+        underBullets = true;
+        priority = TargetPriority.transport;
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("power", PowerNode.makePowerBalance());
+        addBar("batteries", PowerNode.makeBatteryBalance());
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.powerRange, range, StatUnit.blocks);
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        updateClipRadius((range + 1) * tilesize);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        for(int i = 0; i < 4; i++){
+            int maxLen = range + size/2;
+            Building dest = null;
+            var dir = Geometry.d4[i];
+            int dx = dir.x, dy = dir.y;
+            int offset = size/2;
+            for(int j = 1 + offset; j <= range + offset; j++){
+                var other = world.build(x + j * dir.x, y + j * dir.y);
+
+                //hit insulated wall
+                if(other != null && other.isInsulated()){
+                    break;
+                }
+
+                if(other != null && other.block.hasPower && other.team == Vars.player.team() && !(other.block instanceof PowerNode)){
+                    maxLen = j;
+                    dest = other;
+                    break;
+                }
+            }
+
+            Drawf.dashLine(Pal.placing,
+                x * tilesize + dx * (tilesize * size / 2f + 2),
+                y * tilesize + dy * (tilesize * size / 2f + 2),
+                x * tilesize + dx * (maxLen) * tilesize,
+                y * tilesize + dy * (maxLen) * tilesize
+            );
+
+            if(dest != null){
+                Drawf.square(dest.x, dest.y, dest.block.size * tilesize/2f + 2.5f, 0f);
+            }
+        }
+    }
+
+    @Override
+    public void changePlacementPath(Seq<Point2> points, int rotation, boolean diagonal){
+        if(!diagonal){
+            Placement.calculateNodes(points, this, rotation, (point, other) -> Math.max(Math.abs(point.x - other.x), Math.abs(point.y - other.y)) <= range + size - 1);
+        }
+    }
+
+    /** Iterates through linked nodes of a block at a tile. All returned buildings are beam nodes. */
+    public static void getNodeLinks(Tile tile, Block block, Team team, Cons<Building> others){
+        var tree = team.data().buildingTree;
+
+        if(tree == null) return;
+
+        float cx = tile.worldx() + block.offset, cy = tile.worldy() + block.offset, s = block.size * tilesize/2f, r = maxRange * tilesize;
+
+        for(int i = 0; i < 4; i++){
+            switch(i){
+                case 0 -> Tmp.r1.set(cx - s, cy - s, r, s * 2f);
+                case 1 -> Tmp.r1.set(cx - s, cy - s, s * 2f, r);
+                case 2 -> Tmp.r1.set(cx + s, cy - s, -r, s * 2f).normalize();
+                case 3 -> Tmp.r1.set(cx - s, cy + s, s * 2f, -r).normalize();
+            }
+
+            tempBuilds.clear();
+            tree.intersect(Tmp.r1, tempBuilds);
+            int fi = i;
+            Building closest = tempBuilds.min(b -> b instanceof BeamNodeBuild node && node.couldConnect((fi + 2) % 4, block, tile.x, tile.y), b -> b.dst2(cx, cy));
+            tempBuilds.clear();
+            if(closest != null){
+                others.get(closest);
+            }
+        }
+    }
+
+    /** Note that x1 and y1 are expected to be coordinates of the node to draw the beam from. */
+    public void drawLaser(float x1, float y1, float x2, float y2, int size1, int size2){
+        float w = laserWidth;
+        float dst = Math.max(Math.abs(x1 - x2),  Math.abs(y2 - y1)) / tilesize;
+        float sizeOff = dst * tilesize - (size1 + size2) * tilesize/2f;
+
+        //don't draw lasers for adjacent blocks
+        if(dst > 1 + size/2){
+            var point = Geometry.d4(Tile.relativeTo(x1, y1, x2, y2));
+            float poff = tilesize/2f;
+            Drawf.laser(laser, laserEnd, x1 + poff*size*point.x, y1 + poff*size*point.y, x1 + (poff*size + sizeOff) * point.x, y1 + (poff*size + sizeOff) * point.y, w);
+        }
+    }
+
+    public class BeamNodeBuild extends Building{
+        //current links in cardinal directions
+        public Building[] links = new Building[4];
+        public Tile[] dests = new Tile[4];
+        public int lastChange = -2;
+
+        /** @return whether a beam could theoretically connect with the specified block at a position */
+        public boolean couldConnect(int direction, Block target, int targetX, int targetY){
+            int offset = -(target.size - 1) / 2;
+            int minX = targetX + offset, minY = targetY + offset, maxX = targetX + offset + target.size - 1, maxY = targetY + offset + target.size - 1;
+            var dir = Geometry.d4[direction];
+
+            int rangeOffset = size/2;
+
+            //find first block with power in range
+            for(int j = 1 + rangeOffset; j <= range + rangeOffset; j++){
+                var other = world.tile(tile.x + j * dir.x, tile.y + j * dir.y);
+
+                if(other == null) return false;
+
+                //hit insulated wall
+                if((other.build != null && other.build.isInsulated()) || (other.block().hasPower && other.block().connectedPower && other.team() == team)){
+                    return false;
+                }
+
+                //within target rectangle
+                if(other.x >= minX && other.y >= minY && other.x <= maxX && other.y <= maxY){
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        @Override
+        public void updateTile(){
+            //TODO this block technically does not need to update every frame, perhaps put it in a special list.
+            if(lastChange != world.tileChanges){
+                lastChange = world.tileChanges;
+                updateDirections();
+            }
+        }
+
+        @Override
+        public BlockStatus status(){
+            float balance = power.graph.getPowerBalance();
+            if(balance > 0f) return BlockStatus.active;
+            if(balance < 0f && power.graph.getLastPowerStored() > 0) return BlockStatus.noOutput;
+            return BlockStatus.noInput;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(Mathf.zero(Renderer.laserOpacity) || team == Team.derelict) return;
+
+            Draw.z(Layer.power);
+            Draw.color(laserColor1, laserColor2, (1f - power.graph.getSatisfaction()) * 0.86f + Mathf.absin(3f, 0.1f));
+            Draw.alpha(Renderer.laserOpacity);
+            float w = laserWidth + Mathf.absin(pulseScl, pulseMag);
+
+            for(int i = 0; i < 4; i ++){
+                if(dests[i] != null && links[i].wasVisible && (!(links[i].block instanceof BeamNode node) ||
+                    (links[i].tileX() != tileX() && links[i].tileY() != tileY()) ||
+                    (links[i].id > id && range >= node.range) || range > node.range)){
+
+                    int dst = Math.max(Math.abs(dests[i].x - tile.x),  Math.abs(dests[i].y - tile.y));
+                    //don't draw lasers for adjacent blocks
+                    if(dst > 1 + size/2){
+                        var point = Geometry.d4[i];
+                        float poff = tilesize/2f;
+                        Drawf.laser(laser, laserEnd, x + poff*size*point.x, y + poff*size*point.y, dests[i].worldx() - poff*point.x, dests[i].worldy() - poff*point.y, w);
+                    }
+                }
+            }
+
+            Draw.reset();
+        }
+
+        @Override
+        public void pickedUp(){
+            Arrays.fill(links, null);
+            Arrays.fill(dests, null);
+        }
+
+        public void updateDirections(){
+            for(int i = 0; i < 4; i ++){
+                var prev = links[i];
+                var dir = Geometry.d4[i];
+                links[i] = null;
+                dests[i] = null;
+                int offset = size/2;
+                //find first block with power in range
+                for(int j = 1 + offset; j <= range + offset; j++){
+                    var other = world.build(tile.x + j * dir.x, tile.y + j * dir.y);
+
+                    //hit insulated wall
+                    if(other != null && other.isInsulated()){
+                        break;
+                    }
+
+                    //power nodes do NOT play nice with beam nodes, do not touch them as that forcefully modifies their links
+                    if(other != null && other.block.hasPower && other.block.connectedPower && other.team == team && !(other.block instanceof PowerNode)){
+                        links[i] = other;
+                        dests[i] = world.tile(tile.x + j * dir.x, tile.y + j * dir.y);
+                        break;
+                    }
+                }
+
+                var next = links[i];
+
+                if(next != prev){
+                    //unlinked, disconnect and reflow
+                    if(prev != null && prev.isAdded()){
+                        prev.power.links.removeValue(pos());
+                        power.links.removeValue(prev.pos());
+
+                        PowerGraph newgraph = new PowerGraph();
+                        //reflow from this point, covering all tiles on this side
+                        newgraph.reflow(this);
+
+                        if(prev.power.graph != newgraph){
+                            //reflow power for other end
+                            PowerGraph og = new PowerGraph();
+                            og.reflow(prev);
+                        }
+                    }
+
+                    //linked to a new one, connect graphs
+                    if(next != null){
+                        power.links.addUnique(next.pos());
+                        next.power.links.addUnique(pos());
+
+                        power.graph.addGraph(next.power.graph);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/power/BurnerGenerator.java b/core/src/mindustry/world/blocks/power/BurnerGenerator.java
deleted file mode 100644
index 9e70f9b86f..0000000000
--- a/core/src/mindustry/world/blocks/power/BurnerGenerator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package mindustry.world.blocks.power;
-
-import arc.graphics.g2d.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.graphics.*;
-import mindustry.type.*;
-
-public class BurnerGenerator extends ItemLiquidGenerator{
-    public @Load(value = "@-turbine#", length = 2) TextureRegion[] turbineRegions;
-    public @Load("@-cap") TextureRegion capRegion;
-    public float turbineSpeed = 2f;
-
-    public BurnerGenerator(String name){
-        super(true, false, name);
-    }
-
-    @Override
-    protected float getLiquidEfficiency(Liquid liquid){
-        return liquid.flammability;
-    }
-
-    @Override
-    protected float getItemEfficiency(Item item){
-        return item.flammability;
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return turbineRegions[0].found() ? new TextureRegion[]{region, turbineRegions[0], turbineRegions[1], capRegion} : super.icons();
-    }
-
-    public class BurnerGeneratorBuild extends ItemLiquidGeneratorBuild{
-
-        @Override
-        public void draw(){
-            super.draw();
-
-            if(turbineRegions[0].found()){
-                Draw.rect(turbineRegions[0], x, y, totalTime * turbineSpeed);
-                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/ConsumeGenerator.java b/core/src/mindustry/world/blocks/power/ConsumeGenerator.java
new file mode 100644
index 0000000000..6ebecbfabb
--- /dev/null
+++ b/core/src/mindustry/world/blocks/power/ConsumeGenerator.java
@@ -0,0 +1,167 @@
+package mindustry.world.blocks.power;
+
+import arc.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+/** A generator that just takes in certain items or liquids. */
+public class ConsumeGenerator extends PowerGenerator{
+    /** The time in number of ticks during which a single item will produce power. */
+    public float itemDuration = 120f;
+
+    public float warmupSpeed = 0.05f;
+    public float effectChance = 0.01f;
+    public Effect generateEffect = Fx.none, consumeEffect = Fx.none;
+    public float generateEffectRange = 3f;
+    public float baseLightRadius = 65f;
+
+    public @Nullable LiquidStack outputLiquid;
+    /** If true, this block explodes when outputLiquid exceeds capacity. */
+    public boolean explodeOnFull = false;
+
+    public @Nullable ConsumeItemFilter filterItem;
+    public @Nullable ConsumeLiquidFilter filterLiquid;
+    /** Multiplies the itemDuration for a given item. */
+    public ObjectFloatMap<Item> itemDurationMultipliers = new ObjectFloatMap<>();
+
+    public ConsumeGenerator(String name){
+        super(name);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        if(outputLiquid != null){
+            addLiquidBar(outputLiquid.liquid);
+        }
+    }
+
+    @Override
+    public void init(){
+        filterItem = findConsumer(c -> c instanceof ConsumeItemFilter);
+        filterLiquid = findConsumer(c -> c instanceof ConsumeLiquidFilter);
+
+        //pass along the duration multipliers to the consumer, so it can display them properly
+        if(filterItem instanceof ConsumeItemEfficiency eff){
+            eff.itemDurationMultipliers = itemDurationMultipliers;
+        }
+
+        if(outputLiquid != null){
+            outputsLiquid = true;
+            hasLiquids = true;
+        }
+
+        if(explodeOnFull && outputLiquid != null && explosionPuddleLiquid == null){
+            explosionPuddleLiquid = outputLiquid.liquid;
+        }
+
+        emitLight = true;
+        lightRadius = baseLightRadius * size;
+        super.init();
+    }
+
+    @Override
+    public void setStats(){
+        stats.timePeriod = itemDuration;
+        super.setStats();
+
+        if(hasItems){
+            stats.add(Stat.productionTime, itemDuration / 60f, StatUnit.seconds);
+        }
+
+        if(outputLiquid != null){
+            stats.add(Stat.output, StatValues.liquid(outputLiquid.liquid, outputLiquid.amount * 60f, true));
+        }
+    }
+
+    public class ConsumeGeneratorBuild extends GeneratorBuild{
+        public float warmup, totalTime, efficiencyMultiplier = 1f, itemDurationMultiplier = 1;
+
+        @Override
+        public void updateEfficiencyMultiplier(){
+            efficiencyMultiplier = 1f;
+            if(filterItem != null){
+                float m = filterItem.efficiencyMultiplier(this);
+                if(m > 0) efficiencyMultiplier *= m;
+            }
+            if(filterLiquid != null){
+                float m = filterLiquid.efficiencyMultiplier(this);
+                if(m > 0) efficiencyMultiplier *= m;
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            boolean valid = efficiency > 0;
+
+            warmup = Mathf.lerpDelta(warmup, valid ? 1f : 0f, warmupSpeed);
+
+            productionEfficiency = efficiency * efficiencyMultiplier;
+            totalTime += warmup * Time.delta;
+
+            //randomly produce the effect
+            if(valid && Mathf.chanceDelta(effectChance)){
+                generateEffect.at(x + Mathf.range(generateEffectRange), y + Mathf.range(generateEffectRange));
+            }
+
+            //make sure the multiplier doesn't change when there is nothing to consume while it's still running
+            if(filterItem != null && valid && itemDurationMultipliers.size > 0 && filterItem.getConsumed(this) != null){
+                itemDurationMultiplier = itemDurationMultipliers.get(filterItem.getConsumed(this), 1);
+            }
+
+            //take in items periodically
+            if(hasItems && valid && generateTime <= 0f){
+                consume();
+                consumeEffect.at(x + Mathf.range(generateEffectRange), y + Mathf.range(generateEffectRange));
+                generateTime = 1f;
+            }
+
+            if(outputLiquid != null){
+                float added = Math.min(productionEfficiency * delta() * outputLiquid.amount, liquidCapacity - liquids.get(outputLiquid.liquid));
+                liquids.add(outputLiquid.liquid, added);
+                dumpLiquid(outputLiquid.liquid);
+
+                if(explodeOnFull && liquids.get(outputLiquid.liquid) >= liquidCapacity - 0.01f){
+                    kill();
+                    Events.fire(new GeneratorPressureExplodeEvent(this));
+                }
+            }
+
+            //generation time always goes down, but only at the end so consumeTriggerValid doesn't assume fake items
+            generateTime -= delta() / (itemDuration * itemDurationMultiplier);
+        }
+
+        @Override
+        public boolean consumeTriggerValid(){
+            return generateTime > 0;
+        }
+
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalTime;
+        }
+
+        @Override
+        public void drawLight(){
+            //???
+            drawer.drawLight(this);
+            //TODO hard coded
+            Drawf.light(x, y, (60f + Mathf.absin(10f, 5f)) * size, Color.orange, 0.5f * warmup);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/power/DecayGenerator.java b/core/src/mindustry/world/blocks/power/DecayGenerator.java
deleted file mode 100644
index becce39642..0000000000
--- a/core/src/mindustry/world/blocks/power/DecayGenerator.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package mindustry.world.blocks.power;
-
-import mindustry.type.*;
-
-public class DecayGenerator extends ItemLiquidGenerator{
-
-    public DecayGenerator(String name){
-        super(true, false, name);
-        hasItems = true;
-        hasLiquids = false;
-    }
-
-    @Override
-    protected float getItemEfficiency(Item item){
-        return item.radioactivity;
-    }
-}
diff --git a/core/src/mindustry/world/blocks/power/HeaterGenerator.java b/core/src/mindustry/world/blocks/power/HeaterGenerator.java
new file mode 100644
index 0000000000..53350f9fd5
--- /dev/null
+++ b/core/src/mindustry/world/blocks/power/HeaterGenerator.java
@@ -0,0 +1,77 @@
+package mindustry.world.blocks.power;
+
+import arc.math.*;
+import arc.util.io.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.blocks.heat.*;
+import mindustry.world.draw.*;
+import mindustry.world.meta.*;
+
+public class HeaterGenerator extends ConsumeGenerator{
+    public float heatOutput = 10f;
+    public float warmupRate = 0.15f;
+
+    public HeaterGenerator(String name){
+        super(name);
+
+        drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput());
+        rotateDraw = false;
+        rotate = true;
+        canOverdrive = false;
+        drawArrow = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.output, heatOutput, StatUnit.heatUnits);
+    }
+
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        return false;
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("heat", (HeaterGeneratorBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat / heatOutput));
+    }
+
+    public class HeaterGeneratorBuild extends ConsumeGeneratorBuild implements HeatBlock{
+        public float heat;
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            //heat approaches target at the same speed regardless of efficiency
+            heat = Mathf.approachDelta(heat, heatOutput * efficiency, warmupRate * delta());
+        }
+
+        @Override
+        public float heatFrac(){
+            return heat / heatOutput;
+        }
+
+        @Override
+        public float heat(){
+            return heat;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(heat);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            heat = read.f();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java
index 156e5c13ce..136cf66b46 100644
--- a/core/src/mindustry/world/blocks/power/ImpactReactor.java
+++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java
@@ -1,34 +1,23 @@
 package mindustry.world.blocks.power;
 
 import arc.*;
-import arc.graphics.*;
-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.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.ui.*;
+import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.*;
-
 public class ImpactReactor extends PowerGenerator{
     public final int timerUse = timers++;
-
     public float warmupSpeed = 0.001f;
     public float itemDuration = 60f;
-    public int explosionRadius = 50;
-    public int explosionDamage = 2000;
-
-    public Color plasma1 = Color.valueOf("ffd06b"), plasma2 = Color.valueOf("ff361b");
-
-    public @Load("@-bottom") TextureRegion bottomRegion;
-    public @Load(value = "@-plasma-#", length = 4) TextureRegion[] plasmaRegions;
 
     public ImpactReactor(String name){
         super(name);
@@ -37,15 +26,28 @@ public class ImpactReactor extends PowerGenerator{
         liquidCapacity = 30f;
         hasItems = true;
         outputsPower = consumesPower = true;
+        flags = EnumSet.of(BlockFlag.reactor, BlockFlag.generator);
+        lightRadius = 115f;
+        emitLight = true;
+        envEnabled = Env.any;
+
+        drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPlasma(), new DrawDefault());
+
+        explosionShake = 6f;
+        explosionShakeDuration = 16f;
+        explosionDamage = 1900 * 4;
+        explosionMinWarmup = 0.3f;
+        explodeEffect = Fx.impactReactorExplosion;
+        explodeSound = Sounds.explosionbig;
     }
 
     @Override
     public void setBars(){
         super.setBars();
 
-        bars.add("poweroutput", (GeneratorBuild entity) -> new Bar(() ->
+        addBar("power", (GeneratorBuild entity) -> new Bar(() ->
         Core.bundle.format("bar.poweroutput",
-        Strings.fixed(Math.max(entity.getPowerProduction() - consumes.getPower().usage, 0) * 60 * entity.timeScale(), 1)),
+        Strings.fixed(Math.max(entity.getPowerProduction() - consPower.usage, 0) * 60 * entity.timeScale(), 1)),
         () -> Pal.powerBar,
         () -> entity.productionEfficiency));
     }
@@ -59,99 +61,54 @@ public class ImpactReactor extends PowerGenerator{
         }
     }
 
-    @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{bottomRegion, region};
-    }
-
     public class ImpactReactorBuild extends GeneratorBuild{
-        public float warmup;
+        public float warmup, totalProgress;
 
         @Override
         public void updateTile(){
-            if(consValid() && power.status >= 0.99f){
-                boolean prevOut = getPowerProduction() <= consumes.getPower().requestedPower(this);
+            if(efficiency >= 0.9999f && power.status >= 0.99f){
+                boolean prevOut = getPowerProduction() <= consPower.requestedPower(this);
 
-                warmup = Mathf.lerpDelta(warmup, 1f, warmupSpeed);
+                warmup = Mathf.lerpDelta(warmup, 1f, warmupSpeed * timeScale);
                 if(Mathf.equal(warmup, 1f, 0.001f)){
                     warmup = 1f;
                 }
 
-                if(!prevOut && (getPowerProduction() > consumes.getPower().requestedPower(this))){
+                if(!prevOut && (getPowerProduction() > consPower.requestedPower(this))){
                     Events.fire(Trigger.impactPower);
                 }
 
-                if(timer(timerUse, itemDuration / timeScale())){
+                if(timer(timerUse, itemDuration / timeScale)){
                     consume();
                 }
             }else{
                 warmup = Mathf.lerpDelta(warmup, 0f, 0.01f);
             }
 
+            totalProgress += warmup * Time.delta;
+
             productionEfficiency = Mathf.pow(warmup, 5f);
         }
 
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalProgress;
+        }
+
         @Override
         public float ambientVolume(){
             return warmup;
         }
 
         @Override
-        public void draw(){
-            Draw.rect(bottomRegion, x, y);
-
-            for(int i = 0; i < plasmaRegions.length; i++){
-                float r = size * tilesize - 3f + Mathf.absin(Time.time, 2f + i * 1f, 5f - i * 0.5f);
-
-                Draw.color(plasma1, plasma2, (float)i / plasmaRegions.length);
-                Draw.alpha((0.3f + Mathf.absin(Time.time, 2f + i * 2f, 0.3f + i * 0.05f)) * warmup);
-                Draw.blend(Blending.additive);
-                Draw.rect(plasmaRegions[i], x, y, r, r, Time.time * (12 + i * 6f) * warmup);
-                Draw.blend();
-            }
-
-            Draw.color();
-
-            Draw.rect(region, x, y);
-
-            Draw.color();
-        }
-
-        @Override
-        public void drawLight(){
-            Drawf.light(team, x, y, (110f + Mathf.absin(5, 5f)) * warmup, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * warmup);
-        }
-
-        @Override
-        public void onDestroyed(){
-            super.onDestroyed();
-
-            if(warmup < 0.4f || !state.rules.reactorExplosions) return;
-
-            Sounds.explosionbig.at(tile);
-
-            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));
-            }
-
-            Damage.damage(x, y, explosionRadius * tilesize, explosionDamage * 4);
-
-
-            for(int i = 0; i < 20; i++){
-                Time.run(Mathf.random(80), () -> {
-                    Tmp.v1.rnd(Mathf.random(40f));
-                    Fx.explosion.at(Tmp.v1.x + x, Tmp.v1.y + y);
-                });
-            }
-
-            for(int i = 0; i < 70; i++){
-                Time.run(Mathf.random(90), () -> {
-                    Tmp.v1.rnd(Mathf.random(120f));
-                    Fx.impactsmoke.at(Tmp.v1.x + x, Tmp.v1.y + y);
-                });
-            }
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.heat) return warmup;
+            return super.sense(sensor);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
deleted file mode 100644
index 8671ab3b5d..0000000000
--- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package mindustry.world.blocks.power;
-
-import arc.*;
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.util.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
-import mindustry.entities.*;
-import mindustry.graphics.*;
-import mindustry.type.*;
-import mindustry.world.consumers.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-/**
- * Power generation block which can use items, liquids or both as input sources for power production.
- * Liquids will take priority over items.
- */
-public class ItemLiquidGenerator extends PowerGenerator{
-    public float minItemEfficiency = 0.2f;
-    /** The time in number of ticks during which a single item will produce power. */
-    public float itemDuration = 70f;
-
-    public float minLiquidEfficiency = 0.2f;
-    /** Maximum liquid used per frame. */
-    public float maxLiquidGenerate = 0.4f;
-
-    public Effect generateEffect = Fx.generatespark;
-    public Effect explodeEffect = Fx.generatespark;
-    public Color heatColor = Color.valueOf("ff9b59");
-    public @Load("@-top") TextureRegion topRegion;
-    public @Load("@-liquid") TextureRegion liquidRegion;
-    public boolean randomlyExplode = true;
-    public boolean defaults = false;
-
-    public ItemLiquidGenerator(boolean hasItems, boolean hasLiquids, String name){
-        this(name);
-        this.hasItems = hasItems;
-        this.hasLiquids = hasLiquids;
-        setDefaults();
-    }
-
-    public ItemLiquidGenerator(String name){
-        super(name);
-    }
-
-    protected void setDefaults(){
-        if(hasItems){
-            consumes.add(new ConsumeItemFilter(item -> getItemEfficiency(item) >= minItemEfficiency)).update(false).optional(true, false);
-        }
-
-        if(hasLiquids){
-            consumes.add(new ConsumeLiquidFilter(liquid -> getLiquidEfficiency(liquid) >= minLiquidEfficiency, maxLiquidGenerate)).update(false).optional(true, false);
-        }
-
-        defaults = true;
-    }
-
-    @Override
-    public void init(){
-        if(!defaults){
-            setDefaults();
-        }
-        super.init();
-    }
-
-    @Override
-    public void setStats(){
-        super.setStats();
-
-        if(hasItems){
-            stats.add(Stat.productionTime, itemDuration / 60f, StatUnit.seconds);
-        }
-    }
-
-    protected float getItemEfficiency(Item item){
-        return 0.0f;
-    }
-
-    protected float getLiquidEfficiency(Liquid liquid){
-        return 0.0f;
-    }
-
-    public class ItemLiquidGeneratorBuild extends GeneratorBuild{
-        public float explosiveness, heat, totalTime;
-
-        @Override
-        public boolean productionValid(){
-            return generateTime > 0;
-        }
-
-        @Override
-        public void updateTile(){
-            //Note: Do not use this delta when calculating the amount of power or the power efficiency, but use it for resource consumption if necessary.
-            //Power amount is delta'd by PowerGraph class already.
-            float calculationDelta = delta();
-
-            heat = Mathf.lerpDelta(heat, generateTime >= 0.001f && enabled ? 1f : 0f, 0.05f);
-
-            if(!consValid()){
-                productionEfficiency = 0.0f;
-                return;
-            }
-
-            Liquid liquid = null;
-            for(Liquid other : content.liquids()){
-                if(hasLiquids && liquids.get(other) >= 0.001f && getLiquidEfficiency(other) >= minLiquidEfficiency){
-                    liquid = other;
-                    break;
-                }
-            }
-
-            totalTime += heat * Time.delta;
-
-            //liquid takes priority over solids
-            if(hasLiquids && liquid != null && liquids.get(liquid) >= 0.001f){
-                float baseLiquidEfficiency = getLiquidEfficiency(liquid);
-                float maximumPossible = maxLiquidGenerate * calculationDelta;
-                float used = Math.min(liquids.get(liquid) * calculationDelta, maximumPossible);
-
-                liquids.remove(liquid, used * power.graph.getUsageFraction());
-                productionEfficiency = baseLiquidEfficiency * used / maximumPossible;
-
-                if(used > 0.001f && Mathf.chance(0.05 * delta())){
-                    generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
-                }
-            }else if(hasItems){
-                // No liquids accepted or none supplied, try using items if accepted
-                if(generateTime <= 0f && items.total() > 0){
-                    generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
-                    Item item = items.take();
-                    productionEfficiency = getItemEfficiency(item);
-                    explosiveness = item.explosiveness;
-                    generateTime = 1f;
-                }
-
-                if(generateTime > 0f){
-                    generateTime -= Math.min(1f / itemDuration * delta() * power.graph.getUsageFraction(), generateTime);
-
-                    if(randomlyExplode && state.rules.reactorExplosions && Mathf.chance(delta() * 0.06 * Mathf.clamp(explosiveness - 0.5f))){
-                        //this block is run last so that in the event of a block destruction, no code relies on the block type
-                        Core.app.post(() -> {
-                            damage(Mathf.random(11f));
-                            explodeEffect.at(x + Mathf.range(size * tilesize / 2f), y + Mathf.range(size * tilesize / 2f));
-                        });
-                    }
-                }else{
-                    productionEfficiency = 0.0f;
-                }
-            }
-        }
-
-        @Override
-        public void draw(){
-            super.draw();
-
-            if(hasItems){
-                Draw.color(heatColor);
-                Draw.alpha(heat * 0.4f + Mathf.absin(Time.time, 8f, 0.6f) * heat);
-                Draw.rect(topRegion, x, y);
-                Draw.reset();
-            }
-
-            if(hasLiquids){
-                Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
-            }
-        }
-
-        @Override
-        public void drawLight(){
-            Drawf.light(team, x, y, (60f + Mathf.absin(10f, 5f)) * size, Color.orange, 0.5f * heat);
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/power/LightBlock.java b/core/src/mindustry/world/blocks/power/LightBlock.java
index 6d55d0ac09..8beccc9f76 100644
--- a/core/src/mindustry/world/blocks/power/LightBlock.java
+++ b/core/src/mindustry/world/blocks/power/LightBlock.java
@@ -3,13 +3,19 @@ package mindustry.world.blocks.power;
 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 arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.input.*;
+import mindustry.logic.*;
+import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -24,19 +30,58 @@ public class LightBlock extends Block{
         update = true;
         configurable = true;
         saveConfig = true;
+        envEnabled |= Env.space;
+        swapDiagonalPlacement = true;
 
         config(Integer.class, (LightBuild tile, Integer value) -> tile.color = value);
     }
 
+    @Override
+    public void init(){
+        lightRadius = radius*2.5f;
+        clipSize = Math.max(clipSize, lightRadius * 3f);
+        emitLight = true;
+
+        super.init();
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, radius * 0.75f, Pal.placing);
+    }
+
+    @Override
+    public void changePlacementPath(Seq<Point2> points, int rotation){
+        var placeRadius2 = Mathf.pow(radius * 0.7f / tilesize, 2f) * 3;
+        Placement.calculateNodes(points, this, rotation, (point, other) -> point.dst2(other) <= placeRadius2);
+    }
+
     public class LightBuild extends Building{
         public int color = Pal.accent.rgba();
         public float smoothTime = 1f;
 
+        @Override
+        public void control(LAccess type, double p1, double p2, double p3, double p4){
+            if(type == LAccess.color){
+                color = Tmp.c1.fromDouble(p1).rgba8888();
+            }
+
+            super.control(type, p1, p2, p3, p4);
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.color) return Tmp.c1.set(color).toDoubleBits();
+            return super.sense(sensor);
+        }
+
         @Override
         public void draw(){
             super.draw();
             Draw.blend(Blending.additive);
-            Draw.color(Tmp.c1.set(color), efficiency() * 0.3f);
+            Draw.color(Tmp.c1.set(color), efficiency * 0.3f);
             Draw.rect(topRegion, x, y);
             Draw.color();
             Draw.blend();
@@ -49,15 +94,25 @@ public class LightBlock extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            table.button(Icon.pencil, () -> {
+            table.button(Icon.pencil, Styles.cleari, () -> {
                 ui.picker.show(Tmp.c1.set(color).a(0.5f), false, res -> configure(res.rgba()));
                 deselect();
             }).size(40f);
         }
 
+        @Override
+        public boolean onConfigureBuildTapped(Building other){
+            if(this == other){
+                deselect();
+                return false;
+            }
+
+            return true;
+        }
+
         @Override
         public void drawLight(){
-            Drawf.light(team, x, y, radius * Math.min(smoothTime, 2f), Tmp.c1.set(color), brightness * efficiency());
+            Drawf.light(x, y, lightRadius * Math.min(smoothTime, 2f), Tmp.c1.set(color), brightness * efficiency);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/power/LongPowerNode.java b/core/src/mindustry/world/blocks/power/LongPowerNode.java
new file mode 100644
index 0000000000..fde8cd2a78
--- /dev/null
+++ b/core/src/mindustry/world/blocks/power/LongPowerNode.java
@@ -0,0 +1,48 @@
+package mindustry.world.blocks.power;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.graphics.*;
+
+public class LongPowerNode extends PowerNode{
+    public @Load("@-glow") TextureRegion glow;
+    public Color glowColor = Color.valueOf("cbfd81").a(0.45f);
+    public float glowScl = 16f, glowMag = 0.6f;
+
+    public LongPowerNode(String name){
+        super(name);
+        drawRange = false;
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        laser = Core.atlas.find(name + "-beam", Core.atlas.find("power-beam"));
+        laserEnd = Core.atlas.find(name + "-beam-end", Core.atlas.find("power-beam-end"));
+    }
+
+    public class LongPowerNodeBuild extends PowerNodeBuild{
+        public float warmup = 0f;
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            warmup = Mathf.lerpDelta(warmup, power.links.size > 0 ? 1f : 0f, 0.05f);
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(warmup > 0.001f){
+                Drawf.additive(glow, Tmp.c1.set(glowColor).mula(warmup).mula(1f - glowMag + Mathf.absin(glowScl, glowMag)), x, y);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java
index bbde62b3e7..8e28d5b331 100644
--- a/core/src/mindustry/world/blocks/power/NuclearReactor.java
+++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java
@@ -4,20 +4,17 @@ import arc.*;
 import arc.graphics.*;
 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.*;
 import mindustry.content.*;
-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.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -25,19 +22,23 @@ import static mindustry.Vars.*;
 public class NuclearReactor extends PowerGenerator{
     public final int timerFuel = timers++;
 
-    public final Vec2 tr = new Vec2();
-
     public Color lightColor = Color.valueOf("7f19ea");
     public Color coolColor = new Color(1, 1, 1, 0f);
     public Color hotColor = Color.valueOf("ff9575a3");
-    public float itemDuration = 120; //time to consume 1 fuel
-    public float heating = 0.01f; //heating per frame * fullness
-    public float smokeThreshold = 0.3f; //threshold at which block starts smoking
-    public int explosionRadius = 40;
-    public int explosionDamage = 1350;
-    public float flashThreshold = 0.46f; //heat threshold at which the lights start flashing
+    /** ticks to consume 1 fuel */
+    public float itemDuration = 120;
+    /** heating per frame * fullness */
+    public float heating = 0.01f;
+    /** threshold at which block starts smoking */
+    public float smokeThreshold = 0.3f;
+    /** heat threshold at which lights start flashing */
+    public float flashThreshold = 0.46f;
+
+    /** heat removed per unit of coolant */
     public float coolantPower = 0.5f;
 
+    public Item fuelItem = Items.thorium;
+
     public @Load("@-top") TextureRegion topRegion;
     public @Load("@-lights") TextureRegion lightsRegion;
 
@@ -48,7 +49,18 @@ public class NuclearReactor extends PowerGenerator{
         hasItems = true;
         hasLiquids = true;
         rebuildable = false;
-        flags = EnumSet.of(BlockFlag.reactor);
+        flags = EnumSet.of(BlockFlag.reactor, BlockFlag.generator);
+        schematicPriority = -5;
+        envEnabled = Env.any;
+
+        explosionShake = 6f;
+        explosionShakeDuration = 16f;
+
+        explosionRadius = 19;
+        explosionDamage = 1250 * 4;
+
+        explodeEffect = Fx.reactorExplosion;
+        explodeSound = Sounds.explosionbig;
     }
 
     @Override
@@ -63,37 +75,34 @@ public class NuclearReactor extends PowerGenerator{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("heat", (NuclearReactorBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat));
+        addBar("heat", (NuclearReactorBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat));
     }
 
     public class NuclearReactorBuild extends GeneratorBuild{
         public float heat;
+        public float flash;
+        public float smoothLight;
 
         @Override
         public void updateTile(){
-            ConsumeLiquid cliquid = consumes.get(ConsumeType.liquid);
-            Item item = consumes.getItem().items[0].item;
-
-            int fuel = items.get(item);
+            int fuel = items.get(fuelItem);
             float fullness = (float)fuel / itemCapacity;
             productionEfficiency = fullness;
 
             if(fuel > 0 && enabled){
                 heat += fullness * heating * Math.min(delta(), 4f);
 
-                if(timer(timerFuel, itemDuration / timeScale())){
+                if(timer(timerFuel, itemDuration / timeScale)){
                     consume();
                 }
             }else{
                 productionEfficiency = 0f;
             }
 
-            Liquid liquid = cliquid.liquid;
-
             if(heat > 0){
-                float maxUsed = Math.min(liquids.get(liquid), heat / coolantPower);
+                float maxUsed = Math.min(liquids.currentAmount(), heat / coolantPower);
                 heat -= maxUsed * coolantPower;
-                liquids.remove(liquid, maxUsed);
+                liquids.remove(liquids.current(), maxUsed);
             }
 
             if(heat > smokeThreshold){
@@ -119,42 +128,15 @@ public class NuclearReactor extends PowerGenerator{
         }
 
         @Override
-        public void onDestroyed(){
-            super.onDestroyed();
-
-            Sounds.explosionbig.at(tile);
-
-            int fuel = items.get(consumes.<ConsumeItems>get(ConsumeType.item).items[0].item);
-
-            if((fuel < 5 && heat < 0.5f) || !state.rules.reactorExplosions) return;
-
-            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));
-            }
-
-            Damage.damage(x, y, explosionRadius * tilesize, explosionDamage * 4);
-
-            for(int i = 0; i < 20; i++){
-                Time.run(Mathf.random(50), () -> {
-                    tr.rnd(Mathf.random(40f));
-                    Fx.explosion.at(tr.x + x, tr.y + y);
-                });
-            }
-
-            for(int i = 0; i < 70; i++){
-                Time.run(Mathf.random(80), () -> {
-                    tr.rnd(Mathf.random(120f));
-                    Fx.nuclearsmoke.at(tr.x + x, tr.y + y);
-                });
-            }
+        public boolean shouldExplode(){
+            return super.shouldExplode() && (items.get(fuelItem) >= 5 || heat >= 0.5f);
         }
 
         @Override
         public void drawLight(){
             float fract = productionEfficiency;
-            Drawf.light(team, x, y, (90f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * fract);
+            smoothLight = Mathf.lerpDelta(smoothLight, fract, 0.08f);
+            Drawf.light(x, y, (90f + Mathf.absin(5, 5f)) * smoothLight, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * smoothLight);
         }
 
         @Override
@@ -169,10 +151,9 @@ public class NuclearReactor extends PowerGenerator{
             Draw.rect(topRegion, x, y);
 
             if(heat > flashThreshold){
-                float flash = 1f + ((heat - flashThreshold) / (1f - flashThreshold)) * 5.4f;
-                flash += flash * Time.delta;
+                flash += (1f + ((heat - flashThreshold) / (1f - flashThreshold)) * 5.4f) * Time.delta;
                 Draw.color(Color.red, Color.yellow, Mathf.absin(flash, 9f, 1f));
-                Draw.alpha(0.6f);
+                Draw.alpha(0.3f);
                 Draw.rect(lightsRegion, x, y);
             }
 
diff --git a/core/src/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java
index 75f589eabd..1dc0f016c3 100644
--- a/core/src/mindustry/world/blocks/power/PowerDiode.java
+++ b/core/src/mindustry/world/blocks/power/PowerDiode.java
@@ -22,20 +22,22 @@ public class PowerDiode extends Block{
         insulated = true;
         group = BlockGroup.power;
         noUpdateDisabled = true;
+        schematicPriority = 10;
+        envEnabled |= Env.space;
     }
 
     @Override
     public void setBars(){
         super.setBars();
 
-        bars.add("back", entity -> new Bar("bar.input", Pal.powerBar, () -> bar(entity.back())));
-        bars.add("front", entity -> new Bar("bar.output", Pal.powerBar, () -> bar(entity.front())));
+        addBar("back", entity -> new Bar("bar.input", Pal.powerBar, () -> bar(entity.back())));
+        addBar("front", entity -> new Bar("bar.output", Pal.powerBar, () -> bar(entity.front())));
     }
 
     @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        Draw.rect(icon(Cicon.full), req.drawx(), req.drawy());
-        Draw.rect(arrow, req.drawx(), req.drawy(), !rotate ? 0 : req.rotation * 90);
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(fullIcon, plan.drawx(), plan.drawy());
+        Draw.rect(arrow, plan.drawx(), plan.drawy(), !rotate ? 0 : plan.rotation * 90);
     }
 
     // battery % of the graph on either side, defaults to zero
@@ -54,26 +56,29 @@ public class PowerDiode extends Block{
         public void updateTile(){
             super.updateTile();
 
-            if(front() == null || back() == null || !back().block.hasPower || !front().block.hasPower || back().team != front().team) return;
+            if(tile == null || front() == null || back() == null || !back().block.hasPower || !front().block.hasPower || back().team != team || front().team != team) return;
 
             PowerGraph backGraph = back().power.graph;
             PowerGraph frontGraph = front().power.graph;
             if(backGraph == frontGraph) return;
 
-            // 0f - 1f of battery capacity in use
-            float backStored = backGraph.getBatteryStored() / backGraph.getTotalBatteryCapacity();
-            float frontStored = frontGraph.getBatteryStored() / frontGraph.getTotalBatteryCapacity();
+            float backStored = backGraph.getBatteryStored();
+            float backCapacity = backGraph.getTotalBatteryCapacity();
+            float frontStored = frontGraph.getBatteryStored();
+            float frontCapacity = frontGraph.getTotalBatteryCapacity();
 
-            // try to send if the back side has more % capacity stored than the front side
-            if(backStored > frontStored){
-                // send half of the difference
-                float amount = backGraph.getBatteryStored() * (backStored - frontStored) / 2;
-                // prevent sending more than the front can handle
-                amount = Mathf.clamp(amount, 0, frontGraph.getTotalBatteryCapacity() * (1 - frontStored));
+            if(backStored/backCapacity <= frontStored/frontCapacity) return;
 
-                backGraph.useBatteries(amount);
-                frontGraph.chargeBatteries(amount);
-            }
+            float targetPercentage = (frontStored + backStored) / (frontCapacity + backCapacity);
+
+            // send half of the difference
+            float amount = (targetPercentage * frontCapacity - frontStored) / 2;
+
+            // prevent sending more than the front can handle
+            amount = Mathf.clamp(amount, 0, frontCapacity - frontStored);
+
+            backGraph.transferPower(-amount);
+            frontGraph.transferPower(amount);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/world/blocks/power/PowerGenerator.java b/core/src/mindustry/world/blocks/power/PowerGenerator.java
index 5a2bd12f0d..9b0ef63732 100644
--- a/core/src/mindustry/world/blocks/power/PowerGenerator.java
+++ b/core/src/mindustry/world/blocks/power/PowerGenerator.java
@@ -1,19 +1,43 @@
 package mindustry.world.blocks.power;
 
 import arc.*;
+import arc.audio.*;
+import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class PowerGenerator extends PowerDistributor{
     /** The amount of power produced per tick in case of an efficiency of 1.0, which represents 100%. */
     public float powerProduction;
     public Stat generationType = Stat.basePowerGeneration;
+    public DrawBlock drawer = new DrawDefault();
+
+    public int explosionRadius = 12;
+    public int explosionDamage = 0;
+    public Effect explodeEffect = Fx.none;
+    public Sound explodeSound = Sounds.none;
+
+    public int explosionPuddles = 10;
+    public float explosionPuddleRange = tilesize * 2f;
+    public float explosionPuddleAmount = 100f;
+    public @Nullable Liquid explosionPuddleLiquid;
+    public float explosionMinWarmup = 0f;
+
+    public float explosionShake = 0f, explosionShakeDuration = 6f;
 
     public PowerGenerator(String name){
         super(name);
@@ -22,6 +46,21 @@ public class PowerGenerator extends PowerDistributor{
         flags = EnumSet.of(BlockFlag.generator);
     }
 
+    public float getDisplayedPowerProduction(){
+        return powerProduction;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return drawer.finalIcons(this);
+    }
+
+    @Override
+    public void load(){
+        super.load();
+        drawer.load(this);
+    }
+
     @Override
     public void setStats(){
         super.setStats();
@@ -32,8 +71,8 @@ public class PowerGenerator extends PowerDistributor{
     public void setBars(){
         super.setBars();
 
-        if(hasPower && outputsPower && !consumes.hasPower()){
-            bars.add("power", (GeneratorBuild entity) -> new Bar(() ->
+        if(hasPower && outputsPower){
+            addBar("power", (GeneratorBuild entity) -> new Bar(() ->
             Core.bundle.format("bar.poweroutput",
             Strings.fixed(entity.getPowerProduction() * 60 * entity.timeScale(), 1)),
             () -> Pal.powerBar,
@@ -41,6 +80,11 @@ public class PowerGenerator extends PowerDistributor{
         }
     }
 
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        drawer.drawPlan(this, plan, list);
+    }
+
     @Override
     public boolean outputsItems(){
         return false;
@@ -51,6 +95,58 @@ public class PowerGenerator extends PowerDistributor{
         /** The efficiency of the producer. An efficiency of 1.0 means 100% */
         public float productionEfficiency = 0.0f;
 
+        @Override
+        public void draw(){
+            drawer.draw(this);
+        }
+
+        @Override
+        public float warmup(){
+            return enabled ? productionEfficiency : 0f;
+        }
+
+        @Override
+        public void onDestroyed(){
+            super.onDestroyed();
+
+            if(state.rules.reactorExplosions){
+                createExplosion();
+            }
+        }
+
+        public boolean shouldExplode(){
+            return warmup() >= explosionMinWarmup;
+        }
+
+        public void createExplosion(){
+            if(shouldExplode()){
+                if(explosionDamage > 0){
+                    Damage.damage(x, y, explosionRadius * tilesize, explosionDamage);
+                }
+
+                explodeEffect.at(this);
+                explodeSound.at(this);
+
+                if(explosionPuddleLiquid != null){
+                    for(int i = 0; i < explosionPuddles; i++){
+                        Tmp.v1.trns(Mathf.random(360f), Mathf.random(explosionPuddleRange));
+                        Tile tile = world.tileWorld(x + Tmp.v1.x, y + Tmp.v1.y);
+                        Puddles.deposit(tile, explosionPuddleLiquid, explosionPuddleAmount);
+                    }
+                }
+
+                if(explosionShake > 0){
+                    Effect.shake(explosionShake, explosionShakeDuration, this);
+                }
+            }
+        }
+
+        @Override
+        public void drawLight(){
+            super.drawLight();
+            drawer.drawLight(this);
+        }
+
         @Override
         public float ambientVolume(){
             return Mathf.clamp(productionEfficiency);
@@ -58,19 +154,28 @@ public class PowerGenerator extends PowerDistributor{
 
         @Override
         public float getPowerProduction(){
-            return powerProduction * productionEfficiency;
+            return enabled ? powerProduction * productionEfficiency : 0f;
+        }
+
+        @Override
+        public byte version(){
+            return 1;
         }
 
         @Override
         public void write(Writes write){
             super.write(write);
             write.f(productionEfficiency);
+            write.f(generateTime);
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
             productionEfficiency = read.f();
+            if(revision >= 1){
+                generateTime = read.f();
+            }
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java
index 26c34268d9..dd86bec9c9 100644
--- a/core/src/mindustry/world/blocks/power/PowerGraph.java
+++ b/core/src/mindustry/world/blocks/power/PowerGraph.java
@@ -1,11 +1,9 @@
 package mindustry.world.blocks.power;
 
-import arc.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.gen.*;
-import mindustry.world.consumers.*;
 
 public class PowerGraph{
     private static final Queue<Building> queue = new Queue<>();
@@ -13,20 +11,30 @@ public class PowerGraph{
     private static final Seq<Building> outArray2 = new Seq<>();
     private static final IntSet closedSet = new IntSet();
 
-    private final Seq<Building> producers = new Seq<>(false);
-    private final Seq<Building> consumers = new Seq<>(false);
-    private final Seq<Building> batteries = new Seq<>(false);
-    private final Seq<Building> all = new Seq<>(false);
+    //do not modify any of these unless you know what you're doing!
+    public final Seq<Building> producers = new Seq<>(false, 16, Building.class);
+    public final Seq<Building> consumers = new Seq<>(false, 16, Building.class);
+    public final Seq<Building> batteries = new Seq<>(false, 16, Building.class);
+    public final Seq<Building> all = new Seq<>(false, 16, Building.class);
 
+    private final @Nullable PowerGraphUpdater entity;
     private final WindowedMean powerBalance = new WindowedMean(60);
     private float lastPowerProduced, lastPowerNeeded, lastPowerStored;
     private float lastScaledPowerIn, lastScaledPowerOut, lastCapacity;
+    //diodes workaround for correct energy production info
+    private float energyDelta = 0f;
 
-    private long lastFrameUpdated = -1;
     private final int graphID;
     private static int lastGraphID;
 
-    {
+    public PowerGraph(){
+        entity = PowerGraphUpdater.create();
+        entity.graph = this;
+        graphID = lastGraphID++;
+    }
+
+    public PowerGraph(boolean noEntity){
+        entity = null;
         graphID = lastGraphID++;
     }
 
@@ -47,7 +55,11 @@ public class PowerGraph{
     }
 
     public float getPowerBalance(){
-        return powerBalance.mean();
+        return powerBalance.rawMean();
+    }
+
+    public boolean hasPowerBalanceSamples(){
+        return powerBalance.hasEnoughData();
     }
 
     public float getLastPowerNeeded(){
@@ -62,6 +74,15 @@ public class PowerGraph{
         return lastPowerStored;
     }
 
+    public void transferPower(float amount){
+        if(amount > 0){
+            chargeBatteries(amount);
+        }else{
+            useBatteries(-amount);
+        }
+        energyDelta += amount;
+    }
+
     public float getSatisfaction(){
         if(Mathf.zero(lastPowerProduced)){
             return 0f;
@@ -71,14 +92,11 @@ public class PowerGraph{
         return Mathf.clamp(lastPowerProduced / lastPowerNeeded);
     }
 
-    /** @return multiplier of speed at which resources should be consumed for power generation. */
-    public float getUsageFraction(){
-        return 1f;
-    }
-
     public float getPowerProduced(){
         float powerProduced = 0f;
-        for(Building producer : producers){
+        var items = producers.items;
+        for(int i = 0; i < producers.size; i++){
+            var producer = items[i];
             powerProduced += producer.getPowerProduction() * producer.delta();
         }
         return powerProduced;
@@ -86,13 +104,12 @@ public class PowerGraph{
 
     public float getPowerNeeded(){
         float powerNeeded = 0f;
-        for(Building consumer : consumers){
-            Consumers consumes = consumer.block.consumes;
-            if(consumes.hasPower()){
-                ConsumePower consumePower = consumes.getPower();
-                if(otherConsumersAreValid(consumer, consumePower)){
-                    powerNeeded += consumePower.requestedPower(consumer) * consumer.delta();
-                }
+        var items = consumers.items;
+        for(int i = 0; i < consumers.size; i++){
+            var consumer = items[i];
+            var consumePower = consumer.block.consPower;
+            if(consumer.shouldConsumePower){
+                powerNeeded += consumePower.requestedPower(consumer) * consumer.delta();
             }
         }
         return powerNeeded;
@@ -100,10 +117,11 @@ public class PowerGraph{
 
     public float getBatteryStored(){
         float totalAccumulator = 0f;
-        for(Building battery : batteries){
-            Consumers consumes = battery.block.consumes;
-            if(consumes.hasPower()){
-                totalAccumulator += battery.power.status * consumes.getPower().capacity;
+        var items = batteries.items;
+        for(int i = 0; i < batteries.size; i++){
+            var battery = items[i];
+            if(battery.enabled){
+                totalAccumulator += battery.power.status * battery.block.consPower.capacity;
             }
         }
         return totalAccumulator;
@@ -111,10 +129,11 @@ 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;
+        var items = batteries.items;
+        for(int i = 0; i < batteries.size; i++){
+            var battery = items[i];
+            if(battery.enabled){
+                totalCapacity += (1f - battery.power.status) * battery.block.consPower.capacity;
             }
         }
         return totalCapacity;
@@ -122,9 +141,11 @@ public class PowerGraph{
 
     public float getTotalBatteryCapacity(){
         float totalCapacity = 0f;
-        for(Building battery : batteries){
-            if(battery.block.consumes.hasPower()){
-                totalCapacity += battery.block.consumes.getPower().capacity;
+        var items = batteries.items;
+        for(int i = 0; i < batteries.size; i++){
+            var battery = items[i];
+            if(battery.enabled){
+                totalCapacity += battery.block.consPower.capacity;
             }
         }
         return totalCapacity;
@@ -136,9 +157,10 @@ 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;
-            if(consumes.hasPower()){
+        var items = batteries.items;
+        for(int i = 0; i < batteries.size; i++){
+            var battery = items[i];
+            if(battery.enabled){
                 battery.power.status *= (1f-consumedPowerPercentage);
             }
         }
@@ -151,41 +173,40 @@ public class PowerGraph{
         float chargedPercent = Math.min(excess/capacity, 1f);
         if(Mathf.equal(capacity, 0f)) return 0f;
 
-        for(Building battery : batteries){
-            Consumers consumes = battery.block.consumes;
-            if(consumes.hasPower()){
-                ConsumePower consumePower = consumes.getPower();
-                if(consumePower.capacity > 0f){
-                    battery.power.status += (1f- battery.power.status) * chargedPercent;
-                }
+        var items = batteries.items;
+        for(int i = 0; i < batteries.size; i++){
+            var battery = items[i];
+            //TODO why would it be 0
+            if(battery.enabled && battery.block.consPower.capacity > 0f){
+                battery.power.status += (1f - battery.power.status) * chargedPercent;
             }
         }
         return Math.min(excess, capacity);
     }
 
-    public void distributePower(float needed, float produced){
+    public void distributePower(float needed, float produced, boolean charged){
         //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;
-            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);
-                    }
-                }else{
-                    //valid consumers get power as usual
-                    if(otherConsumersAreValid(consumer, consumePower)){
-                        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()));
-                        //just in case
-                        if(Float.isNaN(consumer.power.status)){
-                            consumer.power.status = 0f;
-                        }
+        float coverage = Mathf.zero(needed) && Mathf.zero(produced) && !charged && Mathf.zero(lastPowerStored) ? 0f : Mathf.zero(needed) ? 1f : Math.min(1, produced / needed);
+        var items = consumers.items;
+        for(int i = 0; i < consumers.size; i++){
+            var consumer = items[i];
+            //TODO how would it even be null
+            var cons = consumer.block.consPower;
+            if(cons.buffered){
+                if(!Mathf.zero(cons.capacity)){
+                    // Add an equal percentage of power to all buffers, based on the global power coverage in this graph
+                    float maximumRate = cons.requestedPower(consumer) * coverage * consumer.delta();
+                    consumer.power.status = Mathf.clamp(consumer.power.status + maximumRate / cons.capacity);
+                }
+            }else{
+                //valid consumers get power as usual
+                if(consumer.shouldConsumePower){
+                    consumer.power.status = coverage;
+                }else{ //invalid consumers get an estimate, if they were to activate
+                    consumer.power.status = Math.min(1, produced / (needed + cons.usage * consumer.delta()));
+                    //just in case
+                    if(Float.isNaN(consumer.power.status)){
+                        consumer.power.status = 0f;
                     }
                 }
             }
@@ -193,9 +214,7 @@ public class PowerGraph{
     }
 
     public void update(){
-        if(Core.graphics.getFrameId() == lastFrameUpdated){
-            return;
-        }else if(!consumers.isEmpty() && consumers.first().cheating()){
+        if(!consumers.isEmpty() && consumers.first().cheating()){
             //when cheating, just set status to 1
             for(Building tile : consumers){
                 tile.power.status = 1f;
@@ -205,23 +224,22 @@ public class PowerGraph{
             return;
         }
 
-        lastFrameUpdated = Core.graphics.getFrameId();
-
         float powerNeeded = getPowerNeeded();
         float powerProduced = getPowerProduced();
 
         lastPowerNeeded = powerNeeded;
         lastPowerProduced = powerProduced;
 
-        lastScaledPowerIn = powerProduced / Time.delta;
+        lastScaledPowerIn = (powerProduced + energyDelta) / Time.delta;
         lastScaledPowerOut = powerNeeded / Time.delta;
         lastCapacity = getTotalBatteryCapacity();
-
         lastPowerStored = getBatteryStored();
 
-        powerBalance.add((lastPowerProduced - lastPowerNeeded) / Time.delta);
+        powerBalance.add((lastPowerProduced - lastPowerNeeded + energyDelta) / Time.delta);
+        energyDelta = 0f;
 
         if(!(consumers.size == 0 && producers.size == 0 && batteries.size == 0)){
+            boolean charged = false;
 
             if(!Mathf.equal(powerNeeded, powerProduced)){
                 if(powerNeeded > powerProduced){
@@ -229,41 +247,72 @@ public class PowerGraph{
                     powerProduced += powerBatteryUsed;
                     lastPowerProduced += powerBatteryUsed;
                 }else if(powerProduced > powerNeeded){
+                    charged = true;
                     powerProduced -= chargeBatteries(powerProduced - powerNeeded);
                 }
             }
 
-            distributePower(powerNeeded, powerProduced);
+            distributePower(powerNeeded, powerProduced, charged);
         }
     }
 
     public void addGraph(PowerGraph graph){
+        if(graph == this) return;
+
+        //merge into other graph instead.
+        if(graph.all.size > all.size){
+            graph.addGraph(this);
+            return;
+        }
+
+        //other entity should be removed as the graph was merged
+        if(graph.entity != null) graph.entity.remove();
+
         for(Building tile : graph.all){
             add(tile);
         }
+        checkAdd();
     }
 
     public void add(Building build){
         if(build == null || build.power == null) return;
 
         if(build.power.graph != this || !build.power.init){
+            //any old graph that is added here MUST be invalid, remove it
+            if(build.power.graph != null && build.power.graph != this){
+                if(build.power.graph.entity != null) build.power.graph.entity.remove();
+            }
+
             build.power.graph = this;
             build.power.init = true;
             all.add(build);
 
-            if(build.block.outputsPower && build.block.consumesPower && !build.block.consumes.getPower().buffered){
+            if(build.block.outputsPower && build.block.consumesPower && !build.block.consPower.buffered){
                 producers.add(build);
                 consumers.add(build);
             }else if(build.block.outputsPower && build.block.consumesPower){
                 batteries.add(build);
             }else if(build.block.outputsPower){
                 producers.add(build);
-            }else if(build.block.consumesPower){
+            }else if(build.block.consumesPower && build.block.consPower != null){
                 consumers.add(build);
             }
         }
     }
 
+    public void checkAdd(){
+        if(entity != null) entity.add();
+    }
+
+    public void clear(){
+        all.clear();
+        producers.clear();
+        consumers.clear();
+        batteries.clear();
+        //nothing left
+        if(entity != null) entity.remove();
+    }
+
     public void reflow(Building tile){
         queue.clear();
         queue.addLast(tile);
@@ -271,26 +320,26 @@ public class PowerGraph{
         while(queue.size > 0){
             Building child = queue.removeFirst();
             add(child);
+            checkAdd();
             for(Building next : child.getPowerConnections(outArray2)){
-                if(!closedSet.contains(next.pos())){
+                if(closedSet.add(next.pos())){
                     queue.addLast(next);
-                    closedSet.add(next.pos());
                 }
             }
         }
     }
 
-    private void removeSingle(Building tile){
-        all.remove(tile, true);
-        producers.remove(tile, true);
-        consumers.remove(tile, true);
-        batteries.remove(tile, true);
+    /** Used for unit tests only. */
+    public void removeList(Building build){
+        all.remove(build);
+        producers.remove(build);
+        consumers.remove(build);
+        batteries.remove(build);
     }
 
+    /** Note that this does not actually remove the building from the graph;
+     * it creates *new* graphs that contain the correct buildings. Doing this invalidates the graph. */
     public void remove(Building tile){
-        removeSingle(tile);
-        //begin by clearing the closed set
-        closedSet.clear();
 
         //go through all the connections of this tile
         for(Building other : tile.getPowerConnections(outArray1)){
@@ -299,6 +348,7 @@ public class PowerGraph{
 
             //create graph for this branch
             PowerGraph graph = new PowerGraph();
+            graph.checkAdd();
             graph.add(other);
             //add to queue for BFS
             queue.clear();
@@ -306,32 +356,28 @@ public class PowerGraph{
             while(queue.size > 0){
                 //get child from queue
                 Building child = queue.removeFirst();
-                //remove it from this graph
-                removeSingle(child);
                 //add it to the new branch graph
                 graph.add(child);
                 //go through connections
                 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){
+                        graph.add(next);
                         queue.addLast(next);
-                        closedSet.add(next.pos());
                     }
                 }
             }
             //update the graph once so direct consumers without any connected producer lose their power
             graph.update();
         }
+
+        //implied empty graph here
+        if(entity != null) entity.remove();
     }
 
-    private boolean otherConsumersAreValid(Building tile, Consume consumePower){
-        for(Consume cons : tile.block.consumes.all()){
-            if(cons != consumePower && !cons.isOptional() && !cons.valid(tile)){
-                return false;
-            }
-        }
-        return true;
+    public int getId(){
+        return graphID;
     }
 
     @Override
@@ -341,7 +387,6 @@ public class PowerGraph{
         ", consumers=" + consumers +
         ", batteries=" + batteries +
         ", all=" + all +
-        ", lastFrameUpdated=" + lastFrameUpdated +
         ", graphID=" + graphID +
         '}';
     }
diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java
index f5801d98a7..89ddae8cbc 100644
--- a/core/src/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/mindustry/world/blocks/power/PowerNode.java
@@ -23,16 +23,18 @@ import mindustry.world.modules.*;
 import static mindustry.Vars.*;
 
 public class PowerNode extends PowerBlock{
-    protected static boolean returnValue = false;
     protected static BuildPlan otherReq;
-
+    protected static int returnInt = 0;
     protected final static ObjectSet<PowerGraph> graphs = new ObjectSet<>();
-    protected final static Seq<Point2> tmpPoints = new Seq<>(), tmpPoints2 = new Seq<>();
+    /** The maximum range of all power nodes on the map */
+    protected static float maxRange;
 
-    public @Load("laser") TextureRegion laser;
-    public @Load("laser-end") TextureRegion laserEnd;
+    public @Load(value = "@-laser", fallback = "laser") TextureRegion laser;
+    public @Load(value = "@-laser-end", fallback = "laser-end") TextureRegion laserEnd;
     public float laserRange = 6;
     public int maxNodes = 3;
+    public boolean autolink = true, drawRange = true;
+    public float laserScale = 0.25f;
     public Color laserColor1 = Color.white;
     public Color laserColor2 = Pal.powerLight;
 
@@ -43,6 +45,13 @@ public class PowerNode extends PowerBlock{
         outputsPower = false;
         canOverdrive = false;
         swapDiagonalPlacement = true;
+        schematicPriority = -10;
+        drawDisabled = false;
+        envEnabled |= Env.space;
+        destructible = true;
+
+        //nodes do not even need to update
+        update = false;
 
         config(Integer.class, (entity, value) -> {
             PowerModule power = entity.power;
@@ -67,15 +76,10 @@ public class PowerNode extends PowerBlock{
                 }
             }else if(linkValid(entity, other) && valid && power.links.size < maxNodes){
 
-                if(!power.links.contains(other.pos())){
-                    power.links.add(other.pos());
-                }
+                power.links.addUnique(other.pos());
 
                 if(other.team == entity.team){
-
-                    if(!other.power.links.contains(entity.pos())){
-                        other.power.links.add(entity.pos());
-                    }
+                    other.power.links.addUnique(entity.pos());
                 }
 
                 power.graph.addGraph(other.power.graph);
@@ -83,20 +87,16 @@ 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);
+                configurations.get(Integer.class).get(tile, old.get(i));
             }
 
             //set new
             for(Point2 p : value){
-                int newPos = Point2.pack(p.x + tile.tileX(), p.y + tile.tileY());
-                configurations.get(Integer.class).get(tile, newPos);
+                configurations.get(Integer.class).get(tile, Point2.pack(p.x + tile.tileX(), p.y + tile.tileY()));
             }
         });
     }
@@ -104,25 +104,34 @@ public class PowerNode extends PowerBlock{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("power", entity -> new Bar(() ->
-        Core.bundle.format("bar.powerbalance",
-            ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + Strings.fixed(entity.power.graph.getPowerBalance() * 60, 1))),
-            () -> Pal.powerBar,
-            () -> Mathf.clamp(entity.power.graph.getLastPowerProduced() / entity.power.graph.getLastPowerNeeded())));
+        addBar("power", makePowerBalance());
+        addBar("batteries", makeBatteryBalance());
 
-        bars.add("batteries", entity -> new Bar(() ->
-        Core.bundle.format("bar.powerstored",
-            (UI.formatAmount((int)entity.power.graph.getLastPowerStored())), UI.formatAmount((int)entity.power.graph.getLastCapacity())),
-            () -> Pal.powerBar,
-            () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getLastCapacity())));
-
-        bars.add("connections", entity -> new Bar(() ->
+        addBar("connections", entity -> new Bar(() ->
         Core.bundle.format("bar.powerlines", entity.power.links.size, maxNodes),
             () -> Pal.items,
             () -> (float)entity.power.links.size / (float)maxNodes
         ));
     }
 
+    public static Func<Building, Bar> makePowerBalance(){
+        return entity -> new Bar(() ->
+        Core.bundle.format("bar.powerbalance",
+            ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + UI.formatAmount((long)(entity.power.graph.getPowerBalance() * 60)))),
+            () -> Pal.powerBar,
+            () -> Mathf.clamp(entity.power.graph.getLastPowerProduced() / entity.power.graph.getLastPowerNeeded())
+        );
+    }
+
+    public static Func<Building, Bar> makeBatteryBalance(){
+        return entity -> new Bar(() ->
+        Core.bundle.format("bar.powerstored",
+            (UI.formatAmount((long)entity.power.graph.getLastPowerStored())), UI.formatAmount((long)entity.power.graph.getLastCapacity())),
+            () -> Pal.powerBar,
+            () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getLastCapacity())
+        );
+    }
+
     @Override
     public void setStats(){
         super.setStats();
@@ -131,22 +140,28 @@ public class PowerNode extends PowerBlock{
         stats.add(Stat.powerConnections, maxNodes, StatUnit.none);
     }
 
+    @Override
+    public void init(){
+        super.init();
+
+        clipSize = Math.max(clipSize, laserRange * tilesize);
+    }
+
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
         Tile tile = world.tile(x, y);
 
-        if(tile == null) return;
+        if(tile == null || !autolink) return;
 
         Lines.stroke(1f);
         Draw.color(Pal.placing);
         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);
+        getPotentialLinks(tile, player.team(), other -> {
+            Draw.color(laserColor1, Renderer.laserOpacity * 0.5f);
+            drawLaser(x * tilesize + offset, y * tilesize + offset, other.x, other.y, size, other.block.size);
 
-            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(other.x, other.y, other.block.size * tilesize / 2f + 2f, Pal.place);
         });
 
         Draw.reset();
@@ -158,16 +173,20 @@ public class PowerNode extends PowerBlock{
     }
 
     protected void setupColor(float satisfaction){
-        Draw.color(laserColor1, laserColor2, (1f - satisfaction) * 0.86f + Mathf.absin(3f, 0.1f));
-        Draw.alpha(Renderer.laserOpacity);
+        Draw.color(Tmp.c1.set(laserColor1).lerp(laserColor2, (1f - satisfaction) * 0.86f + Mathf.absin(3f, 0.1f)).a(Renderer.laserOpacity));
     }
 
-    protected void drawLaser(Team team, float x1, float y1, float x2, float y2, int size1, int size2){
+    public void drawLaser(float x1, float y1, float x2, float y2, int size1, int size2){
         float angle1 = Angles.angle(x1, y1, x2, y2),
             vx = Mathf.cosDeg(angle1), vy = Mathf.sinDeg(angle1),
             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);
+        Drawf.laser(laser, laserEnd, x1 + vx*len1, y1 + vy*len1, x2 - vx*len2, y2 - vy*len2, laserScale);
+    }
+
+    protected boolean overlaps(float srcx, float srcy, Tile other, Block otherBlock, float range){
+        return Intersector.overlaps(Tmp.cr1.set(srcx, srcy, range), Tmp.r1.setCentered(other.worldx() + otherBlock.offset, other.worldy() + otherBlock.offset,
+            otherBlock.size * tilesize, otherBlock.size * tilesize));
     }
 
     protected boolean overlaps(float srcx, float srcy, Tile other, float range){
@@ -187,52 +206,131 @@ public class PowerNode extends PowerBlock{
         return Intersector.overlaps(Tmp.cr1.set(src.worldx() + offset, src.worldy() + offset, laserRange * tilesize), Tmp.r1.setSize(size * tilesize).setCenter(other.worldx() + offset, other.worldy() + offset));
     }
 
-    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 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);
+    protected void getPotentialLinks(Tile tile, Team team, Cons<Building> others){
+        if(!autolink) return;
 
-        tempTileEnts.clear();
+        Boolf<Building> valid = other -> other != null && other.tile() != tile && other.block.connectedPower && other.power != null &&
+            (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 == team &&
+            !graphs.contains(other.power.graph) &&
+            !PowerNode.insulated(tile, other.tile) &&
+            !(other instanceof PowerNodeBuild obuild && obuild.power.links.size >= ((PowerNode)obuild.block).maxNodes) &&
+            !Structs.contains(Edges.getEdges(size), p -> { //do not link to adjacent buildings
+                var t = world.tile(tile.x + p.x, tile.y + p.y);
+                return t != null && t.build == other;
+            });
+
+        tempBuilds.clear();
         graphs.clear();
+
+        //add conducting graphs to prevent double link
+        for(var p : Edges.getEdges(size)){
+            Tile other = tile.nearby(p);
+            if(other != null && other.team() == team && other.build != null && other.build.power != null){
+                graphs.add(other.build.power.graph);
+            }
+        }
+
         if(tile.build != null && tile.build.power != null){
             graphs.add(tile.build.power.graph);
         }
 
-        Geometry.circle(tile.x, tile.y, (int)(laserRange + 2), (x, y) -> {
-            Building other = world.build(x, y);
-            if(valid.get(other) && !tempTileEnts.contains(other)){
-                tempTileEnts.add(other);
-            }
-        });
+        var worldRange = laserRange * tilesize;
+        var tree = team.data().buildingTree;
+        if(tree != null){
+            tree.intersect(tile.worldx() - worldRange, tile.worldy() - worldRange, worldRange * 2, worldRange * 2, build -> {
+                if(valid.get(build) && !tempBuilds.contains(build)){
+                    tempBuilds.add(build);
+                }
+            });
+        }
 
-        tempTileEnts.sort((a, b) -> {
+        tempBuilds.sort((a, b) -> {
             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 -> {
+        returnInt = 0;
+
+        tempBuilds.each(valid, t -> {
+            if(returnInt ++ < maxNodes){
+                graphs.add(t.power.graph);
+                others.get(t);
+            }
+        });
+    }
+
+    //TODO code duplication w/ method above?
+    /** Iterates through linked nodes of a block at a tile. All returned buildings are power nodes. */
+    public static void getNodeLinks(Tile tile, Block block, Team team, Cons<Building> others){
+        Boolf<Building> valid = other -> other != null && other.tile() != tile && other.block instanceof PowerNode node &&
+        node.autolink &&
+        other.power.links.size < node.maxNodes &&
+        node.overlaps(other.x, other.y, tile, block, node.laserRange * tilesize) && other.team == team
+        && !graphs.contains(other.power.graph) &&
+        !PowerNode.insulated(tile, other.tile) &&
+        !Structs.contains(Edges.getEdges(block.size), p -> { //do not link to adjacent buildings
+            var t = world.tile(tile.x + p.x, tile.y + p.y);
+            return t != null && t.build == other;
+        });
+
+        tempBuilds.clear();
+        graphs.clear();
+
+        //add conducting graphs to prevent double link
+        for(var p : Edges.getEdges(block.size)){
+            Tile other = tile.nearby(p);
+            if(other != null && other.team() == team && other.build != null && other.build.power != null
+                && !(block.consumesPower && other.block().consumesPower && !block.outputsPower && !other.block().outputsPower)){
+                graphs.add(other.build.power.graph);
+            }
+        }
+
+        if(tile.build != null && tile.build.power != null){
+            graphs.add(tile.build.power.graph);
+        }
+
+        var rangeWorld = maxRange * tilesize;
+        var tree = team.data().buildingTree;
+        if(tree != null){
+            tree.intersect(tile.worldx() - rangeWorld, tile.worldy() - rangeWorld, rangeWorld * 2, rangeWorld * 2, build -> {
+                if(valid.get(build) && !tempBuilds.contains(build)){
+                    tempBuilds.add(build);
+                }
+            });
+        }
+
+        tempBuilds.sort((a, b) -> {
+            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));
+        });
+
+        tempBuilds.each(valid, t -> {
             graphs.add(t.power.graph);
             others.get(t);
         });
     }
 
     @Override
-    public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){
-        if(req.config instanceof Point2[]){
+    public void drawPlanConfigTop(BuildPlan plan, Eachable<BuildPlan> list){
+        if(plan.config instanceof Point2[] ps){
             setupColor(1f);
-            for(Point2 point : (Point2[])req.config){
+            for(Point2 point : ps){
+                int px = plan.x + point.x, py = plan.y + point.y;
                 otherReq = null;
                 list.each(other -> {
-                    if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req){
+                    if(other.block != null
+                        && (px >= other.x - ((other.block.size-1)/2) && py >= other.y - ((other.block.size-1)/2) && px <= other.x + other.block.size/2 && py <= other.y + other.block.size/2)
+                        && other != plan && other.block.hasPower){
                         otherReq = other;
                     }
                 });
 
-                if(otherReq == null || otherReq.block == null) return;
+                if(otherReq == null || otherReq.block == null) continue;
 
-                drawLaser(player == null ? Team.sharded : player.team(), req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy(), size, otherReq.block.size);
+                drawLaser(plan.drawx(), plan.drawy(), otherReq.drawx(), otherReq.drawy(), size, otherReq.block.size);
             }
             Draw.color();
         }
@@ -243,11 +341,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 || !link.block.connectedPower || 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 node && overlaps(link, tile, node.laserRange * tilesize))){
+            if(checkMaxNodes && link.block instanceof PowerNode node){
+                return link.power.links.size < node.maxNodes || link.power.links.contains(tile.pos());
             }
             return true;
         }
@@ -263,49 +361,27 @@ public class PowerNode extends PowerBlock{
     }
 
     public static boolean insulated(int x, int y, int x2, int y2){
-        returnValue = false;
-        insulators(x, y, x2, y2, cause -> returnValue = true);
-        return returnValue;
-    }
-
-    public static void insulators(int x, int y, int x2, int y2, Cons<Building> iterator){
-        world.raycastEach(x, y, x2, y2, (wx, wy) -> {
-
+        return World.raycast(x, y, x2, y2, (wx, wy) -> {
             Building tile = world.build(wx, wy);
-            if(tile != null && tile.block.insulated){
-                iterator.get(tile);
-            }
-
-            return false;
+            return tile != null && tile.isInsulated();
         });
     }
 
     public class PowerNodeBuild extends Building{
 
+        @Override
+        public void created(){ // Called when one is placed/loaded in the world
+            if(autolink && laserRange > maxRange) maxRange = laserRange;
+
+            super.created();
+        }
+
+
         @Override
         public void placed(){
-            if(net.client()) return;
+            if(net.client() || power.links.size > 0) return;
 
-            Boolf<Building> valid = other -> other != null && other != this &&
-                (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) -> {
-                Building other = world.build(x, y);
-                if(valid.get(other)){
-                    if(!insulated(this, other)){
-                        tempTileEnts.add(other);
-                    }
-                }
-            });
-
-            tempTileEnts.sort((a, b) -> {
-                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, other -> {
+            getPotentialLinks(tile, team, other -> {
                 if(!power.links.contains(other.pos())){
                     configureAny(other.pos());
                 }
@@ -317,34 +393,27 @@ public class PowerNode extends PowerBlock{
         @Override
         public void dropped(){
             power.links.clear();
-            //create new power graph to manually unlink (this may be redundant)
-            new PowerGraph().add(this);
+            updatePowerGraph();
         }
 
         @Override
-        public void updateTile(){
-            power.graph.update();
-        }
-
-        @Override
-        public boolean onConfigureTileTapped(Building other){
+        public boolean onConfigureBuildTapped(Building other){
             if(linkValid(this, other)){
                 configure(other.pos());
                 return false;
             }
 
-            if(this == other){
-                if(other.power.links.size == 0){
-                    int[] total = {0};
-                    getPotentialLinks(tile, link -> {
-                        if(!insulated(this, link) && total[0]++ < maxNodes){
-                            configure(link.pos());
+            if(this == other){ //double tapped
+                if(other.power.links.size == 0){ //find links
+                    Seq<Point2> points = new Seq<>();
+                    getPotentialLinks(tile, team, link -> {
+                        if(!insulated(this, link) && points.size < maxNodes){
+                            points.add(new Point2(link.tileX() - tile.x, link.tileY() - tile.y));
                         }
                     });
-                }else{
-                    while(power.links.size > 0){
-                        configure(power.links.get(0));
-                    }
+                    configure(points.toArray(Point2.class));
+                }else{ //clear links
+                    configure(new Point2[0]);
                 }
                 deselect();
                 return false;
@@ -357,6 +426,8 @@ public class PowerNode extends PowerBlock{
         public void drawSelect(){
             super.drawSelect();
 
+            if(!drawRange) return;
+
             Lines.stroke(1f);
 
             Draw.color(Pal.accent);
@@ -368,30 +439,40 @@ public class PowerNode extends PowerBlock{
         public void drawConfigure(){
 
             Drawf.circles(x, y, tile.block().size * tilesize / 2f + 1f + Mathf.absin(Time.time, 4f, 1f));
-            Drawf.circles(x, y, laserRange * tilesize);
 
-            for(int x = (int)(tile.x - laserRange - 2); x <= tile.x + laserRange + 2; x++){
-                for(int y = (int)(tile.y - laserRange - 2); y <= tile.y + laserRange + 2; y++){
-                    Building link = world.build(x, y);
+            if(drawRange){
+                Drawf.circles(x, y, laserRange * tilesize);
 
-                    if(link != this && linkValid(this, link, false)){
-                        boolean linked = linked(link);
+                for(int x = (int)(tile.x - laserRange - 2); x <= tile.x + laserRange + 2; x++){
+                    for(int y = (int)(tile.y - laserRange - 2); y <= tile.y + laserRange + 2; y++){
+                        Building link = world.build(x, y);
 
-                        if(linked){
-                            Drawf.square(link.x, link.y, link.block.size * tilesize / 2f + 1f, Pal.place);
+                        if(link != this && linkValid(this, link, false)){
+                            boolean linked = linked(link);
+
+                            if(linked){
+                                Drawf.square(link.x, link.y, link.block.size * tilesize / 2f + 1f, Pal.place);
+                            }
                         }
                     }
                 }
-            }
 
-            Draw.reset();
+                Draw.reset();
+            }else{
+                power.links.each(i -> {
+                    var link = world.build(i);
+                    if(link != null && linkValid(this, link, false)){
+                        Drawf.square(link.x, link.y, link.block.size * tilesize / 2f + 1f, Pal.place);
+                    }
+                });
+            }
         }
 
         @Override
         public void draw(){
             super.draw();
 
-            if(Mathf.zero(Renderer.laserOpacity)) return;
+            if(Mathf.zero(Renderer.laserOpacity) || isPayload() || team == Team.derelict) return;
 
             Draw.z(Layer.power);
             setupColor(power.graph.getSatisfaction());
@@ -403,7 +484,7 @@ public class PowerNode extends PowerBlock{
 
                 if(link.block instanceof PowerNode && link.id >= id) continue;
 
-                drawLaser(team, x, y, link.x, link.y, size, link.block.size);
+                drawLaser(x, y, link.x, link.y, size, link.block.size);
             }
 
             Draw.reset();
diff --git a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java
deleted file mode 100644
index ff5da52aaa..0000000000
--- a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package mindustry.world.blocks.power;
-
-import mindustry.type.*;
-
-public class SingleTypeGenerator extends ItemLiquidGenerator{
-
-    public SingleTypeGenerator(String name){
-        super(name);
-        defaults = true;
-    }
-
-    @Override
-    protected float getItemEfficiency(Item item){
-        return 1f;
-    }
-
-    @Override
-    protected float getLiquidEfficiency(Liquid liquid){
-        return 0f;
-    }
-}
diff --git a/core/src/mindustry/world/blocks/power/SolarGenerator.java b/core/src/mindustry/world/blocks/power/SolarGenerator.java
index d5f37329ae..785151ad38 100644
--- a/core/src/mindustry/world/blocks/power/SolarGenerator.java
+++ b/core/src/mindustry/world/blocks/power/SolarGenerator.java
@@ -10,8 +10,9 @@ public class SolarGenerator extends PowerGenerator{
 
     public SolarGenerator(String name){
         super(name);
-        //remove the BlockFlag.producer flag to make this a lower priority target than other generators.
+        //remove the BlockFlag.generator flag to make this a lower priority target than other generators.
         flags = EnumSet.of();
+        envEnabled = Env.any;
     }
 
     @Override
@@ -25,7 +26,7 @@ public class SolarGenerator extends PowerGenerator{
         @Override
         public void updateTile(){
             productionEfficiency = enabled ?
-                Mathf.maxZero(Attribute.light.env() +
+                state.rules.solarMultiplier * Mathf.maxZero(Attribute.light.env() +
                     (state.rules.lighting ?
                         1f - state.rules.ambientLight.a :
                         1f
diff --git a/core/src/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
index 154bd02a0c..1af92ce5da 100644
--- a/core/src/mindustry/world/blocks/power/ThermalGenerator.java
+++ b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
@@ -3,37 +3,71 @@ package mindustry.world.blocks.power;
 import arc.*;
 import arc.graphics.*;
 import arc.math.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.game.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
 public class ThermalGenerator extends PowerGenerator{
     public Effect generateEffect = Fx.none;
+    public float effectChance = 0.05f;
+    public float minEfficiency = 0f;
+    public float displayEfficiencyScale = 1f;
+    public boolean displayEfficiency = true;
+    public @Nullable LiquidStack outputLiquid;
     public Attribute attribute = Attribute.heat;
 
     public ThermalGenerator(String name){
         super(name);
+        noUpdateDisabled = true;
+    }
+
+    @Override
+    public float getDisplayedPowerProduction(){
+        return powerProduction / displayEfficiencyScale;
+    }
+
+    @Override
+    public void init(){
+        if(outputLiquid != null){
+            outputsLiquid = true;
+            hasLiquids = true;
+        }
+        super.init();
+        //proper light clipping
+        clipSize = Math.max(clipSize, 45f * size * 2f * 2f);
     }
 
     @Override
     public void setStats(){
         super.setStats();
 
-        stats.add(Stat.tiles, attribute, floating);
+        stats.add(Stat.tiles, attribute, floating, size * size * displayEfficiencyScale, !displayEfficiency);
+        stats.remove(generationType);
+        stats.add(generationType, powerProduction * 60.0f / displayEfficiencyScale, StatUnit.powerSecond);
+
+        if(outputLiquid != null){
+            stats.add(Stat.output, StatValues.liquid(outputLiquid.liquid, outputLiquid.amount * size * size * 60f, true));
+        }
     }
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        drawPlaceText(Core.bundle.formatFloat("bar.efficiency", sumAttribute(attribute, x, y) * 100, 1), x, y, valid);
+        super.drawPlace(x, y, rotation, valid);
+
+        if(displayEfficiency){
+            drawPlaceText(Core.bundle.formatFloat("bar.efficiency", sumAttribute(attribute, x, y) * 100, 1), x, y, valid);
+        }
     }
 
     @Override
-    public boolean canPlaceOn(Tile tile, Team team){
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
         //make sure there's heat at this location
-        return tile.getLinkedTilesAs(this, tempTiles).sumf(other -> other.floor().attributes.get(attribute)) > 0.01f;
+        return tile.getLinkedTilesAs(this, tempTiles).sumf(other -> other.floor().attributes.get(attribute)) > minEfficiency;
     }
 
     public class ThermalGeneratorBuild extends GeneratorBuild{
@@ -43,14 +77,31 @@ public class ThermalGenerator extends PowerGenerator{
         public void updateTile(){
             productionEfficiency = sum + attribute.env();
 
-            if(productionEfficiency > 0.1f && Mathf.chance(0.05 * delta())){
+            if(productionEfficiency > 0.1f && Mathf.chanceDelta(effectChance)){
                 generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
             }
+
+            if(outputLiquid != null){
+                float added = Math.min(productionEfficiency * delta() * outputLiquid.amount, liquidCapacity - liquids.get(outputLiquid.liquid));
+                liquids.add(outputLiquid.liquid, added);
+                dumpLiquid(outputLiquid.liquid);
+            }
+        }
+
+        @Override
+        public void afterPickedUp(){
+            super.afterPickedUp();
+            sum = 0f;
+        }
+
+        @Override
+        public float totalProgress(){
+            return enabled && sum > 0 ? super.totalProgress() : 0f;
         }
 
         @Override
         public void drawLight(){
-            Drawf.light(team, x, y, (40f + Mathf.absin(10f, 5f)) * productionEfficiency * size, Color.scarlet, 0.4f);
+            Drawf.light(x, y, (40f + Mathf.absin(10f, 5f)) * Math.min(productionEfficiency, 2f) * size, Color.scarlet, 0.4f);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/power/VariableReactor.java b/core/src/mindustry/world/blocks/power/VariableReactor.java
new file mode 100644
index 0000000000..2f8d81dd0f
--- /dev/null
+++ b/core/src/mindustry/world/blocks/power/VariableReactor.java
@@ -0,0 +1,172 @@
+package mindustry.world.blocks.power;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.effect.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.blocks.heat.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class VariableReactor extends PowerGenerator{
+    public float maxHeat = 100f;
+    /** How quickly instability moves towards 1, per frame. */
+    public float unstableSpeed = 1f / 60f / 3f;
+    public float warmupSpeed = 0.1f;
+    public Effect effect = Fx.fluxVapor;
+    public float effectChance = 0.05f;
+    public Color effectColor = Color.valueOf("ffdf9d");
+
+    public float flashThreshold = 0.01f, flashAlpha = 0.4f, flashSpeed = 7f;
+    public Color flashColor1 = Color.red, flashColor2 = Color.valueOf("89e8b6");
+
+    public @Load("@-lights") TextureRegion lightsRegion;
+
+    public VariableReactor(String name){
+        super(name);
+        powerProduction = 20f;
+        rebuildable = false;
+
+
+        explosionRadius = 16;
+        explosionDamage = 1500;
+        explodeEffect = new MultiEffect(Fx.bigShockwave, new WrapEffect(Fx.titanSmoke, Color.valueOf("e3ae6f")));
+        explodeSound = Sounds.explosionbig;
+
+        explosionPuddles = 70;
+        explosionPuddleRange = tilesize * 6f;
+        explosionPuddleLiquid = Liquids.slag;
+        explosionPuddleAmount = 100f;
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("instability", (VariableReactorBuild entity) -> new Bar("bar.instability", Pal.sap, () -> entity.instability));
+
+        addBar("heat", (VariableReactorBuild entity) ->
+            new Bar(() ->
+            Core.bundle.format("bar.heatpercent", (int)entity.heat, (int)(Mathf.clamp(entity.heat / maxHeat) * 100)),
+            () -> Pal.lightOrange,
+            () -> entity.heat / maxHeat));
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.input, maxHeat, StatUnit.heatUnits);
+    }
+
+    //TODO: draw warmup fraction on block?
+    public class VariableReactorBuild extends GeneratorBuild implements HeatConsumer{
+        public float[] sideHeat = new float[4];
+        public float heat = 0f, instability, totalProgress, warmup, flash;
+
+        @Override
+        public void updateTile(){
+            heat = calculateHeat(sideHeat);
+
+            productionEfficiency = efficiency;
+            warmup = Mathf.lerpDelta(warmup, productionEfficiency > 0 ? 1f : 0f, warmupSpeed);
+
+            if(instability >= 1f){
+                kill();
+            }
+
+            totalProgress += productionEfficiency * Time.delta;
+
+            if(Mathf.chanceDelta(effectChance * warmup)){
+                effect.at(x, y, effectColor);
+            }
+        }
+
+        @Override
+        public boolean shouldExplode(){
+            return heat > 0f;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(instability > flashThreshold){
+                if(!state.isPaused()) flash += (1f + ((instability - flashThreshold) / (1f - flashThreshold)) * flashSpeed) * Time.delta;
+                Draw.z(Layer.blockAdditive);
+                Draw.blend(Blending.additive);
+                Draw.color(flashColor1, flashColor2, Mathf.absin(flash, 8f, 1f));
+                Draw.alpha(flashAlpha * Mathf.clamp((instability - flashThreshold) / (1f - flashThreshold) * 4f));
+                Draw.rect(lightsRegion, x, y);
+                Draw.blend();
+            }
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalProgress;
+        }
+
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public void updateEfficiencyMultiplier(){
+            //at this stage efficiency = how much coolant is provided
+
+            //target efficiency value
+            float target = Mathf.clamp(heat / maxHeat);
+
+            //fraction of coolant provided (from what is needed)
+            float efficiencyMet = Mathf.clamp(Mathf.zero(target) ? 1f : efficiency / target);
+            boolean met = efficiencyMet >= 0.99999f;
+
+            //if all requirements are met, instability moves toward 0 at 50% of speed
+            //if requirements are not meant, instability approaches 1 at a speed scaled by how much efficiency is *not* met
+            instability = Mathf.approachDelta(instability, met ? 0f : 1f, met ? 0.5f : unstableSpeed * (1f - efficiencyMet));
+
+            //now scale efficiency by target, so it consumes less depending on heat
+            efficiency *= target;
+        }
+
+        @Override
+        public float[] sideHeat(){
+            return sideHeat;
+        }
+
+        @Override
+        public float heatRequirement(){
+            return maxHeat;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(heat);
+            write.f(instability);
+            write.f(warmup);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            heat = read.f();
+            instability = read.f();
+            warmup = read.f();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/production/AttributeCrafter.java b/core/src/mindustry/world/blocks/production/AttributeCrafter.java
new file mode 100644
index 0000000000..0cff4eb1b7
--- /dev/null
+++ b/core/src/mindustry/world/blocks/production/AttributeCrafter.java
@@ -0,0 +1,91 @@
+package mindustry.world.blocks.production;
+
+import arc.*;
+import mindustry.game.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+/** A crafter that gains efficiency from attribute tiles. */
+public class AttributeCrafter extends GenericCrafter{
+    public Attribute attribute = Attribute.heat;
+    public float baseEfficiency = 1f;
+    public float boostScale = 1f;
+    public float maxBoost = 1f;
+    public float minEfficiency = -1f;
+    public float displayEfficiencyScale = 1f;
+    public boolean displayEfficiency = true;
+    public boolean scaleLiquidConsumption = false;
+
+    public AttributeCrafter(String name){
+        super(name);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        if(!displayEfficiency) return;
+
+        drawPlaceText(Core.bundle.format("bar.efficiency",
+        (int)((baseEfficiency + Math.min(maxBoost, boostScale * sumAttribute(attribute, x, y))) * 100f)), x, y, valid);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        if(!displayEfficiency) return;
+
+        addBar("efficiency", (AttributeCrafterBuild entity) ->
+            new Bar(
+            () -> Core.bundle.format("bar.efficiency", (int)(entity.efficiencyMultiplier() * 100 * displayEfficiencyScale)),
+            () -> Pal.lightOrange,
+            entity::efficiencyMultiplier));
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        //make sure there's enough efficiency at this location
+        return baseEfficiency + tile.getLinkedTilesAs(this, tempTiles).sumf(other -> other.floor().attributes.get(attribute)) >= minEfficiency;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(baseEfficiency <= 0.0001f ? Stat.tiles : Stat.affinities, attribute, floating, boostScale * size * size, !displayEfficiency);
+    }
+
+    public class AttributeCrafterBuild extends GenericCrafterBuild{
+        public float attrsum;
+
+        @Override
+        public float getProgressIncrease(float base){
+            return super.getProgressIncrease(base) * efficiencyMultiplier();
+        }
+
+        public float efficiencyMultiplier(){
+            return baseEfficiency + Math.min(maxBoost, boostScale * attrsum) + attribute.env();
+        }
+
+        @Override
+        public float efficiencyScale(){
+            return scaleLiquidConsumption ? efficiencyMultiplier() : super.efficiencyScale();
+        }
+
+        @Override
+        public void pickedUp(){
+            attrsum = 0f;
+            warmup = 0f;
+        }
+
+        @Override
+        public void onProximityUpdate(){
+            super.onProximityUpdate();
+
+            attrsum = 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
deleted file mode 100644
index c2650ab030..0000000000
--- a/core/src/mindustry/world/blocks/production/AttributeSmelter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package mindustry.world.blocks.production;
-
-import arc.*;
-import mindustry.graphics.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-/** A smelter that gains efficiency from attribute tiles. */
-public class AttributeSmelter extends GenericSmelter{
-    public Attribute attribute = Attribute.heat;
-    public float baseEfficiency = 1f;
-    public float boostScale = 1f;
-    public float maxHeatBoost = 1f;
-
-    public AttributeSmelter(String name){
-        super(name);
-    }
-
-    @Override
-    public void drawPlace(int x, int y, int rotation, boolean valid){
-        drawPlaceText(Core.bundle.format("bar.efficiency",
-        (int)((baseEfficiency + Math.min(maxHeatBoost, boostScale * sumAttribute(attribute, x, y))) * 100f)), x, y, valid);
-    }
-
-    @Override
-    public void setBars(){
-        super.setBars();
-
-        bars.add("efficiency", entity ->
-            new Bar(() ->
-            Core.bundle.format("bar.efficiency", (int)(entity.efficiency() * 100)),
-            () -> Pal.lightOrange,
-            entity::efficiency));
-    }
-
-    @Override
-    public void setStats(){
-        super.setStats();
-
-        stats.add(Stat.affinities, attribute, boostScale);
-    }
-
-    public class AttributeSmelterBuild extends SmelterBuild{
-        public float attrsum;
-
-        @Override
-        public float efficiency(){
-            return (baseEfficiency + Math.min(maxHeatBoost, boostScale * attrsum)) * super.efficiency();
-        }
-
-        @Override
-        public void onProximityUpdate(){
-            super.onProximityUpdate();
-
-            attrsum = sumAttribute(attribute, tile.x, tile.y);
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java
new file mode 100644
index 0000000000..008953ff51
--- /dev/null
+++ b/core/src/mindustry/world/blocks/production/BeamDrill.java
@@ -0,0 +1,435 @@
+package mindustry.world.blocks.production;
+
+import arc.*;
+import arc.graphics.*;
+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.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class BeamDrill extends Block{
+    protected Rand rand = new Rand();
+
+    public @Load(value = "@-beam", fallback = "drill-laser") TextureRegion laser;
+    public @Load(value = "@-beam-end", fallback = "drill-laser-end") TextureRegion laserEnd;
+    public @Load(value = "@-beam-center", fallback = "drill-laser-center") TextureRegion laserCenter;
+
+    public @Load(value = "@-beam-boost", fallback = "drill-laser-boost") TextureRegion laserBoost;
+    public @Load(value = "@-beam-boost-end", fallback = "drill-laser-boost-end") TextureRegion laserEndBoost;
+    public @Load(value = "@-beam-boost-center", fallback = "drill-laser-boost-center") TextureRegion laserCenterBoost;
+
+    public @Load("@-top") TextureRegion topRegion;
+    public @Load("@-glow") TextureRegion glowRegion;
+
+    public float drillTime = 200f;
+    public int range = 5;
+    public int tier = 1;
+    public float laserWidth = 0.65f;
+    /** How many times faster the drill will progress when boosted by an optional consumer. */
+    public float optionalBoostIntensity = 2.5f;
+
+    /** Multipliers of drill speed for each item. Defaults to 1. */
+    public ObjectFloatMap<Item> drillMultipliers = new ObjectFloatMap<>();
+    /** Special exemption item that this drill can't mine. */
+    public @Nullable Item blockedItem;
+    /** Special exemption items that this drill can't mine. */
+    public @Nullable Seq<Item> blockedItems;
+
+    public Color sparkColor = Color.valueOf("fd9e81"), glowColor = Color.white;
+    public float glowIntensity = 0.2f, pulseIntensity = 0.07f;
+    public float glowScl = 3f;
+    public int sparks = 7;
+    public float sparkRange = 10f, sparkLife = 27f, sparkRecurrence = 4f, sparkSpread = 45f, sparkSize = 3.5f;
+
+    public Color boostHeatColor = Color.sky.cpy().mul(0.87f);
+    public Color heatColor = new Color(1f, 0.35f, 0.35f, 0.9f);
+    public float heatPulse = 0.3f, heatPulseScl = 7f;
+
+    public BeamDrill(String name){
+        super(name);
+
+        hasItems = true;
+        rotate = true;
+        update = true;
+        solid = true;
+        drawArrow = false;
+        regionRotated1 = 1;
+        ambientSoundVolume = 0.05f;
+        ambientSound = Sounds.minebeam;
+
+        envEnabled |= Env.space;
+        flags = EnumSet.of(BlockFlag.drill);
+    }
+
+    @Override
+    public void init(){
+        updateClipRadius((range + 2) * tilesize);
+        super.init();
+        if(blockedItems == null && blockedItem != null){
+            blockedItems = Seq.with(blockedItem);
+        }
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("drillspeed", (BeamDrillBuild e) ->
+            new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60, 2)), () -> Pal.ammo, () -> e.warmup));
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return true;
+    }
+
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        return false;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.drillTier, StatValues.drillables(drillTime, 0f, size, drillMultipliers, b ->
+            (b instanceof Floor f && f.wallOre && f.itemDrop != null && f.itemDrop.hardness <= tier && (blockedItems == null || !blockedItems.contains(f.itemDrop))) ||
+            (b instanceof StaticWall w && w.itemDrop != null && w.itemDrop.hardness <= tier && (blockedItems == null || !blockedItems.contains(w.itemDrop)))
+        ));
+
+        stats.add(Stat.drillSpeed, 60f / drillTime * size, StatUnit.itemsSecond);
+
+        if(optionalBoostIntensity != 1 && findConsumer(f -> f instanceof ConsumeLiquidBase && f.booster) instanceof ConsumeLiquidBase consBase){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster,
+                StatValues.speedBoosters("{0}" + StatUnit.timesSpeed.localized(),
+                consBase.amount, optionalBoostIntensity, false,
+                l -> (consumesLiquid(l) && (findConsumer(f -> f instanceof ConsumeLiquid).booster || ((ConsumeLiquid)findConsumer(f -> f instanceof ConsumeLiquid)).liquid != l)))
+            );
+        }
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        Item item = null, invalidItem = null;
+        boolean multiple = false;
+        int count = 0;
+
+        for(int i = 0; i < size; i++){
+            nearbySide(x, y, rotation, i, Tmp.p1);
+
+            int j = 0;
+            Item found = null;
+            for(; j < range; j++){
+                int rx = Tmp.p1.x + Geometry.d4x(rotation)*j, ry = Tmp.p1.y + Geometry.d4y(rotation)*j;
+                Tile other = world.tile(rx, ry);
+                if(other != null && other.solid()){
+                    Item drop = other.wallDrop();
+                    if(drop != null){
+                        if(drop.hardness <= tier && (blockedItems == null || !blockedItems.contains(drop))){
+                            found = drop;
+                            count++;
+                        }else{
+                            invalidItem = drop;
+                        }
+                    }
+                    break;
+                }
+            }
+
+            if(found != null){
+                //check if multiple items will be drilled
+                if(item != found && item != null){
+                    multiple = true;
+                }
+                item = found;
+            }
+
+            int len = Math.min(j, range - 1);
+            Drawf.dashLine(found == null ? Pal.remove : Pal.placing,
+            Tmp.p1.x * tilesize,
+            Tmp.p1.y *tilesize,
+            (Tmp.p1.x + Geometry.d4x(rotation)*len) * tilesize,
+            (Tmp.p1.y + Geometry.d4y(rotation)*len) * tilesize
+            );
+        }
+
+        if(item != null){
+            float width = drawPlaceText(Core.bundle.formatFloat("bar.drillspeed", 60f / getDrillTime(item) * count, 2), x, y, valid);
+            if(!multiple){
+                float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5, s = iconSmall / 4f;
+                Draw.mixcol(Color.darkGray, 1f);
+                Draw.rect(item.fullIcon, dx, dy - 1, s, s);
+                Draw.reset();
+                Draw.rect(item.fullIcon, dx, dy, s, s);
+            }
+        }else if(invalidItem != null){
+            drawPlaceText(Core.bundle.get("bar.drilltierreq"), x, y, false);
+        }
+
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        for(int i = 0; i < size; i++){
+            nearbySide(tile.x, tile.y, rotation, i, Tmp.p1);
+            for(int j = 0; j < range; j++){
+                Tile other = world.tile(Tmp.p1.x + Geometry.d4x(rotation)*j, Tmp.p1.y + Geometry.d4y(rotation)*j);
+                if(other != null && other.solid()){
+                    Item drop = other.wallDrop();
+                    if(drop != null && drop.hardness <= tier && (blockedItems == null || !blockedItems.contains(drop))){
+                        return true;
+                    }
+                    break;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public float getDrillTime(Item item){
+        return drillTime / drillMultipliers.get(item, 1f);
+    }
+
+    public class BeamDrillBuild extends Building{
+        public Tile[] facing = new Tile[size];
+        public Point2[] lasers = new Point2[size];
+        public @Nullable Item lastItem;
+
+        public float time;
+        public float warmup, boostWarmup;
+        public float lastDrillSpeed;
+        public int facingAmount;
+
+        @Override
+        public void drawSelect(){
+
+            if(lastItem != null){
+                float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
+                Draw.mixcol(Color.darkGray, 1f);
+                Draw.rect(lastItem.fullIcon, dx, dy - 1, s, s);
+                Draw.reset();
+                Draw.rect(lastItem.fullIcon, dx, dy, s, s);
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            if(lasers[0] == null) updateLasers();
+
+            warmup = Mathf.approachDelta(warmup, Mathf.num(efficiency > 0), 1f / 60f);
+            
+            updateFacing();
+
+            float multiplier = Mathf.lerp(1f, optionalBoostIntensity, optionalEfficiency);
+            float drillTime = getDrillTime(lastItem);
+            boostWarmup = Mathf.lerpDelta(boostWarmup, optionalEfficiency, 0.1f);
+            lastDrillSpeed = (facingAmount * multiplier * timeScale) / drillTime;
+
+            time += edelta() * multiplier;
+
+            if(time >= drillTime){
+                for(Tile tile : facing){
+                    Item drop = tile == null ? null : tile.wallDrop();
+                    if(items.total() < itemCapacity && drop != null){
+                        items.add(drop, 1);
+                        produced(drop);
+                    }
+                }
+                time %= drillTime;
+            }
+
+            if(timer(timerDump, dumpTime)){
+                dump();
+            }
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return items.total() < itemCapacity && facingAmount > 0 && enabled;
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(block.region, x, y);
+            Draw.rect(topRegion, x, y, rotdeg());
+
+            if(isPayload()) return;
+
+            var dir = Geometry.d4(rotation);
+            int ddx = Geometry.d4x(rotation + 1), ddy = Geometry.d4y(rotation + 1);
+
+            for(int i = 0; i < size; i++){
+                Tile face = facing[i];
+                if(face != null){
+                    Point2 p = lasers[i];
+                    float lx = face.worldx() - (dir.x/2f)*tilesize, ly = face.worldy() - (dir.y/2f)*tilesize;
+
+                    float width = (laserWidth + Mathf.absin(Time.time + i*5 + (id % 9)*9, glowScl, pulseIntensity)) * warmup;
+
+                    Draw.z(Layer.power - 1);
+                    Draw.mixcol(glowColor, Mathf.absin(Time.time + i*5 + id*9, glowScl, glowIntensity));
+                    if(Math.abs(p.x - face.x) + Math.abs(p.y - face.y) == 0){
+                        Draw.scl(width);
+
+                        if(boostWarmup < 0.99f){
+                            Draw.alpha(1f - boostWarmup);
+                            Draw.rect(laserCenter, lx, ly);
+                        }
+
+                        if(boostWarmup > 0.01f){
+                            Draw.alpha(boostWarmup);
+                            Draw.rect(laserCenterBoost, lx, ly);
+                        }
+
+                        Draw.scl();
+                    }else{
+                        float lsx = (p.x - dir.x/2f) * tilesize, lsy = (p.y - dir.y/2f) * tilesize;
+
+                        if(boostWarmup < 0.99f){
+                            Draw.alpha(1f - boostWarmup);
+                            Drawf.laser(laser, laserEnd, lsx, lsy, lx, ly, width);
+                        }
+
+                        if(boostWarmup > 0.001f){
+                            Draw.alpha(boostWarmup);
+                            Drawf.laser(laserBoost, laserEndBoost, lsx, lsy, lx, ly, width);
+                        }
+                    }
+                    Draw.color();
+                    Draw.mixcol();
+
+                    Draw.z(Layer.effect);
+                    Lines.stroke(warmup);
+                    rand.setState(i, id);
+                    Color col = face.wallDrop().color;
+                    Color spark = Tmp.c3.set(sparkColor).lerp(boostHeatColor, boostWarmup);
+                    for(int j = 0; j < sparks; j++){
+                        float fin = (Time.time / sparkLife + rand.random(sparkRecurrence + 1f)) % sparkRecurrence;
+                        float or = rand.range(2f);
+                        Tmp.v1.set(sparkRange * fin, 0).rotate(rotdeg() + rand.range(sparkSpread));
+
+                        Draw.color(spark, col, fin);
+                        float px = Tmp.v1.x, py = Tmp.v1.y;
+                        if(fin <= 1f) Lines.lineAngle(lx + px + or * ddx, ly + py + or * ddy, Angles.angle(px, py), Mathf.slope(fin) * sparkSize);
+                    }
+                    Draw.reset();
+                }
+            }
+
+            if(glowRegion.found()){
+                Draw.z(Layer.blockAdditive);
+                Draw.blend(Blending.additive);
+                Draw.color(Tmp.c1.set(heatColor).lerp(boostHeatColor, boostWarmup), warmup * (heatColor.a * (1f - heatPulse + Mathf.absin(heatPulseScl, heatPulse))));
+                Draw.rect(glowRegion, x, y, rotdeg());
+                Draw.blend();
+                Draw.color();
+            }
+
+            Draw.blend();
+            Draw.reset();
+        }
+
+        @Override
+        public void onProximityUpdate(){
+            //when rotated.
+            updateLasers();
+            updateFacing();
+        }
+
+        protected void updateLasers(){
+            for(int i = 0; i < size; i++){
+                if(lasers[i] == null) lasers[i] = new Point2();
+                nearbySide(tileX(), tileY(), rotation, i, lasers[i]);
+            }
+        }
+
+        protected void updateFacing(){
+            lastItem = null;
+            boolean multiple = false;
+            int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation);
+            facingAmount = 0;
+
+            //update facing tiles
+            for(int p = 0; p < size; p++){
+                Point2 l = lasers[p];
+                Tile dest = null;
+                for(int i = 0; i < range; i++){
+                    int rx = l.x + dx*i, ry = l.y + dy*i;
+                    Tile other = world.tile(rx, ry);
+                    if(other != null){
+                        if(other.solid()){
+                            Item drop = other.wallDrop();
+                            if(drop != null && drop.hardness <= tier && (blockedItems == null || !blockedItems.contains(drop))){
+                                facingAmount ++;
+                                if(lastItem != drop && lastItem != null){
+                                    multiple = true;
+                                }
+                                lastItem = drop;
+                                dest = other;
+                            }
+                            break;
+                        }
+                    }
+                }
+
+                facing[p] = dest;
+            }
+
+            //when multiple items are present, count that as no item
+            if(multiple){
+                lastItem = null;
+            }
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(time);
+            write.f(warmup);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                time = read.f();
+                warmup = read.f();
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/production/BurstDrill.java b/core/src/mindustry/world/blocks/production/BurstDrill.java
new file mode 100644
index 0000000000..cf4340866e
--- /dev/null
+++ b/core/src/mindustry/world/blocks/production/BurstDrill.java
@@ -0,0 +1,167 @@
+package mindustry.world.blocks.production;
+
+import arc.audio.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+
+public class BurstDrill extends Drill{
+    public float shake = 2f;
+    public Interp speedCurve = Interp.pow2In;
+
+    public @Load("@-top-invert") TextureRegion topInvertRegion;
+    public @Load("@-glow") TextureRegion glowRegion;
+    public @Load("@-arrow") TextureRegion arrowRegion;
+    public @Load("@-arrow-blur") TextureRegion arrowBlurRegion;
+
+    public float invertedTime = 200f;
+    public float arrowSpacing = 4f, arrowOffset = 0f;
+    public int arrows = 3;
+    public Color arrowColor = Color.valueOf("feb380"), baseArrowColor = Color.valueOf("6e7080");
+    public Color glowColor = arrowColor.cpy();
+
+    public Sound drillSound = Sounds.drillImpact;
+    public float drillSoundVolume = 0.6f, drillSoundPitchRand = 0.1f;
+
+    public BurstDrill(String name){
+        super(name);
+
+        //does not drill in the traditional sense, so this is not even used
+        hardnessDrillMultiplier = 0f;
+        liquidBoostIntensity = 1f;
+        //generally at center
+        drillEffectRnd = 0f;
+        drillEffect = Fx.shockwave;
+        ambientSoundVolume = 0.18f;
+        ambientSound = Sounds.drillCharge;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    @Override
+    public float getDrillTime(Item item){
+        return drillTime / drillMultipliers.get(item, 1f);
+    }
+
+    public class BurstDrillBuild extends DrillBuild{
+        //used so the lights don't fade out immediately
+        public float smoothProgress = 0f;
+        public float invertTime = 0f;
+
+        @Override
+        public void updateTile(){
+            if(dominantItem == null){
+                return;
+            }
+
+            if(invertTime > 0f) invertTime -= delta() / invertedTime;
+
+            if(timer(timerDump, dumpTime)){
+                dump(items.has(dominantItem) ? dominantItem : null);
+            }
+
+            float drillTime = getDrillTime(dominantItem);
+
+            smoothProgress = Mathf.lerpDelta(smoothProgress, progress / (drillTime - 20f), 0.1f);
+
+            if(items.total() <= itemCapacity - dominantItems && dominantItems > 0 && efficiency > 0){
+                warmup = Mathf.approachDelta(warmup, progress / drillTime, 0.01f);
+
+                float speed = efficiency;
+
+                timeDrilled += speedCurve.apply(progress / drillTime) * speed;
+
+                lastDrillSpeed = 1f / drillTime * speed * dominantItems;
+                progress += delta() * speed;
+            }else{
+                warmup = Mathf.approachDelta(warmup, 0f, 0.01f);
+                lastDrillSpeed = 0f;
+                return;
+            }
+
+            if(dominantItems > 0 && progress >= drillTime && items.total() < itemCapacity){
+                for(int i = 0; i < dominantItems; i++){
+                    offload(dominantItem);
+                }
+
+                invertTime = 1f;
+                progress %= drillTime;
+
+                if(wasVisible){
+                    Effect.shake(shake, shake, this);
+                    drillSound.at(x, y, 1f + Mathf.range(drillSoundPitchRand), drillSoundVolume);
+                    drillEffect.at(x + Mathf.range(drillEffectRnd), y + Mathf.range(drillEffectRnd), dominantItem.color);
+                }
+            }
+        }
+
+        @Override
+        public float ambientVolume(){
+            return super.ambientVolume() * Mathf.pow(progress(), 4f);
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return items.total() <= itemCapacity - dominantItems && enabled;
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+            drawDefaultCracks();
+
+            Draw.rect(topRegion, x, y);
+            if(invertTime > 0 && topInvertRegion.found()){
+                Draw.alpha(Interp.pow3Out.apply(invertTime));
+                Draw.rect(topInvertRegion, x, y);
+                Draw.color();
+            }
+
+            if(dominantItem != null && drawMineItem){
+                Draw.color(dominantItem.color);
+                Draw.rect(itemRegion, x, y);
+                Draw.color();
+            }
+
+            float fract = smoothProgress;
+            Draw.color(arrowColor);
+            for(int i = 0; i < 4; i++){
+                for(int j = 0; j < arrows; j++){
+                    float arrowFract = (arrows - 1 - j);
+                    float a = Mathf.clamp(fract * arrows - arrowFract);
+                    Tmp.v1.trns(i * 90 + 45, j * arrowSpacing + arrowOffset);
+
+                    //TODO maybe just use arrow alpha and draw gray on the base?
+                    Draw.z(Layer.block);
+                    Draw.color(baseArrowColor, arrowColor, a);
+                    Draw.rect(arrowRegion, x + Tmp.v1.x, y + Tmp.v1.y, i * 90);
+
+                    Draw.color(arrowColor);
+
+                    if(arrowBlurRegion.found()){
+                        Draw.z(Layer.blockAdditive);
+                        Draw.blend(Blending.additive);
+                        Draw.alpha(Mathf.pow(a, 10f));
+                        Draw.rect(arrowBlurRegion, x + Tmp.v1.x, y + Tmp.v1.y, i * 90);
+                        Draw.blend();
+                    }
+                }
+            }
+            Draw.color();
+
+            if(glowRegion.found()){
+                Drawf.additive(glowRegion, Tmp.c2.set(glowColor).a(Mathf.pow(fract, 3f) * glowColor.a), x, y);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/production/Cultivator.java b/core/src/mindustry/world/blocks/production/Cultivator.java
deleted file mode 100644
index 57b2372f6c..0000000000
--- a/core/src/mindustry/world/blocks/production/Cultivator.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package mindustry.world.blocks.production;
-
-import arc.*;
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.util.*;
-import arc.util.io.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
-import mindustry.graphics.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-public class Cultivator extends GenericCrafter{
-    public Color plantColor = Color.valueOf("5541b1");
-    public Color plantColorLight = Color.valueOf("7457ce");
-    public Color bottomColor = Color.valueOf("474747");
-
-    public @Load("@-middle") TextureRegion middleRegion;
-    public @Load("@-top") TextureRegion topRegion;
-    public Rand random = new Rand(0);
-    public float recurrence = 6f;
-    public Attribute attribute = Attribute.spores;
-
-    public Cultivator(String name){
-        super(name);
-        craftEffect = Fx.none;
-    }
-
-    @Override
-    public void setBars(){
-        super.setBars();
-        bars.add("multiplier", (CultivatorBuild entity) -> new Bar(() ->
-        Core.bundle.formatFloat("bar.efficiency",
-        ((entity.boost + 1f + attribute.env()) * entity.warmup) * 100f, 1),
-        () -> Pal.ammo,
-        () -> entity.warmup));
-    }
-
-    @Override
-    public void setStats(){
-        super.setStats();
-
-        stats.add(Stat.affinities, attribute);
-    }
-
-    @Override
-    public void drawPlace(int x, int y, int rotation, boolean valid){
-        drawPlaceText(Core.bundle.formatFloat("bar.efficiency", (1 + sumAttribute(attribute, x, y)) * 100, 1), x, y, valid);
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{region, topRegion};
-    }
-
-    public class CultivatorBuild extends GenericCrafterBuild{
-        public float warmup;
-        public float boost;
-
-        @Override
-        public void updateTile(){
-            super.updateTile();
-
-            warmup = Mathf.lerpDelta(warmup, consValid() ? 1f : 0f, 0.015f);
-        }
-
-        @Override
-        public void draw(){
-            Draw.rect(region, x, y);
-
-            Drawf.liquid(middleRegion, x, y, warmup, plantColor);
-
-            Draw.color(bottomColor, plantColorLight, warmup);
-
-            random.setSeed(tile.pos());
-            for(int i = 0; i < 12; i++){
-                float offset = random.nextFloat() * 999999f;
-                float x = random.range(4f), y = random.range(4f);
-                float life = 1f - (((Time.time + offset) / 50f) % recurrence);
-
-                if(life > 0){
-                    Lines.stroke(warmup * (life + 0.2f));
-                    Lines.poly(x + x, y + y, 8, (1f - life) * 3f);
-                }
-            }
-
-            Draw.color();
-            Draw.rect(topRegion, x, y);
-        }
-
-        @Override
-        public void onProximityUpdate(){
-            super.onProximityAdded();
-
-            boost = sumAttribute(attribute, tile.x, tile.y);
-        }
-
-        @Override
-        public float getProgressIncrease(float baseTime){
-            return super.getProgressIncrease(baseTime) * (1f + boost + attribute.env());
-        }
-
-        @Override
-        public void write(Writes write){
-            super.write(write);
-            write.f(warmup);
-        }
-
-        @Override
-        public void read(Reads read, byte revision){
-            super.read(read, revision);
-            warmup = read.f();
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java
index 6d4e0c8708..9e165e18f1 100644
--- a/core/src/mindustry/world/blocks/production/Drill.java
+++ b/core/src/mindustry/world/blocks/production/Drill.java
@@ -6,6 +6,7 @@ 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.*;
@@ -13,12 +14,13 @@ import mindustry.entities.units.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
+import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 import static mindustry.Vars.*;
 
@@ -35,16 +37,24 @@ public class Drill extends Block{
     /** How many times faster the drill will progress when boosted by liquid. */
     public float liquidBoostIntensity = 1.6f;
     /** Speed at which the drill speeds up. */
-    public float warmupSpeed = 0.02f;
+    public float warmupSpeed = 0.015f;
+    /** Special exemption item that this drill can't mine. */
+    public @Nullable Item blockedItem;
+    /** Special exemption items that this drill can't mine. */
+    public @Nullable Seq<Item> blockedItems;
 
     //return variables for countOre
-    protected Item returnItem;
+    protected @Nullable Item returnItem;
     protected int returnCount;
 
     /** Whether to draw the item this drill is mining. */
     public boolean drawMineItem = true;
     /** Effect played when an item is produced. This is colored. */
     public Effect drillEffect = Fx.mine;
+    /** Drill effect randomness. Block size by default. */
+    public float drillEffectRnd = -1f;
+    /** Chance of displaying the effect. Useful for extremely fast drills. */
+    public float drillEffectChance = 0.02f;
     /** Speed the drill bit rotates at. */
     public float rotateSpeed = 2f;
     /** Effect randomly played while drilling. */
@@ -52,7 +62,11 @@ public class Drill extends Block{
     /** Chance the update effect will appear. */
     public float updateEffectChance = 0.02f;
 
+    /** Multipliers of drill speed for each item. Defaults to 1. */
+    public ObjectFloatMap<Item> drillMultipliers = new ObjectFloatMap<>();
+
     public boolean drawRim = false;
+    public boolean drawSpinSprite = true;
     public Color heatColor = Color.valueOf("ff5512");
     public @Load("@-rim") TextureRegion rimRegion;
     public @Load("@-rotator") TextureRegion rotatorRegion;
@@ -69,19 +83,31 @@ public class Drill extends Block{
         hasItems = true;
         ambientSound = Sounds.drill;
         ambientSoundVolume = 0.018f;
+        //drills work in space I guess
+        envEnabled |= Env.space;
+        flags = EnumSet.of(BlockFlag.drill);
     }
 
     @Override
-    public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){
-        if(!req.worldContext) return;
-        Tile tile = req.tile();
+    public void init(){
+        super.init();
+        if(blockedItems == null && blockedItem != null){
+            blockedItems = Seq.with(blockedItem);
+        }
+        if(drillEffectRnd < 0) drillEffectRnd = size;
+    }
+
+    @Override
+    public void drawPlanConfigTop(BuildPlan plan, Eachable<BuildPlan> list){
+        if(!plan.worldContext) return;
+        Tile tile = plan.tile();
         if(tile == null) return;
 
         countOre(tile);
         if(returnItem == null || !drawMineItem) return;
 
         Draw.color(returnItem.color);
-        Draw.rect(itemRegion, req.drawx(), req.drawy());
+        Draw.rect(itemRegion, plan.drawx(), plan.drawy());
         Draw.color();
     }
 
@@ -89,7 +115,7 @@ public class Drill extends Block{
     public void setBars(){
         super.setBars();
 
-        bars.add("drillspeed", (DrillBuild e) ->
+        addBar("drillspeed", (DrillBuild e) ->
              new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60 * e.timeScale(), 2)), () -> Pal.ammo, () -> e.warmup));
     }
 
@@ -98,7 +124,7 @@ public class Drill extends Block{
     }
 
     @Override
-    public boolean canPlaceOn(Tile tile, Team team){
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
         if(isMultiblock()){
             for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){
                 if(canMine(other)){
@@ -113,18 +139,20 @@ public class Drill extends Block{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
         Tile tile = world.tile(x, y);
         if(tile == null) return;
 
         countOre(tile);
 
         if(returnItem != null){
-            float width = drawPlaceText(Core.bundle.formatFloat("bar.drillspeed", 60f / (drillTime + hardnessDrillMultiplier * returnItem.hardness) * returnCount, 2), x, y, valid);
-            float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5;
+            float width = drawPlaceText(Core.bundle.formatFloat("bar.drillspeed", 60f / getDrillTime(returnItem) * returnCount, 2), x, y, valid);
+            float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5, s = iconSmall / 4f;
             Draw.mixcol(Color.darkGray, 1f);
-            Draw.rect(returnItem.icon(Cicon.small), dx, dy - 1);
+            Draw.rect(returnItem.fullIcon, dx, dy - 1, s, s);
             Draw.reset();
-            Draw.rect(returnItem.icon(Cicon.small), dx, dy);
+            Draw.rect(returnItem.fullIcon, dx, dy, s, s);
 
             if(drawMineItem){
                 Draw.color(returnItem.color);
@@ -132,7 +160,7 @@ public class Drill extends Block{
                 Draw.color();
             }
         }else{
-            Tile to = tile.getLinkedTilesAs(this, tempTiles).find(t -> t.drop() != null && t.drop().hardness > tier);
+            Tile to = tile.getLinkedTilesAs(this, tempTiles).find(t -> t.drop() != null && (t.drop().hardness > tier || (blockedItems != null && blockedItems.contains(t.drop()))));
             Item item = to == null ? null : to.drop();
             if(item != null){
                 drawPlaceText(Core.bundle.get("bar.drilltierreq"), x, y, valid);
@@ -140,15 +168,26 @@ public class Drill extends Block{
         }
     }
 
+    public float getDrillTime(Item item){
+        return (drillTime + hardnessDrillMultiplier * item.hardness) / drillMultipliers.get(item, 1f);
+    }
+
     @Override
     public void setStats(){
         super.setStats();
 
-        stats.add(Stat.drillTier, new BlockFilterValue(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= tier));
+        stats.add(Stat.drillTier, StatValues.drillables(drillTime, hardnessDrillMultiplier, size * size, drillMultipliers, b -> b instanceof Floor f && !f.wallOre && f.itemDrop != null &&
+            f.itemDrop.hardness <= tier && (blockedItems == null || !blockedItems.contains(f.itemDrop)) && (indexer.isBlockPresent(f) || state.isMenu())));
 
         stats.add(Stat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond);
-        if(liquidBoostIntensity != 1){
-            stats.add(Stat.boostEffect, liquidBoostIntensity * liquidBoostIntensity, StatUnit.timesSpeed);
+
+        if(liquidBoostIntensity != 1 && findConsumer(f -> f instanceof ConsumeLiquidBase) instanceof ConsumeLiquidBase consBase){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster,
+                StatValues.speedBoosters("{0}" + StatUnit.timesSpeed.localized(),
+                consBase.amount,
+                liquidBoostIntensity * liquidBoostIntensity, false, this::consumesLiquid)
+            );
         }
     }
 
@@ -157,7 +196,7 @@ public class Drill extends Block{
         return new TextureRegion[]{region, rotatorRegion, topRegion};
     }
 
-    void countOre(Tile tile){
+    protected void countOre(Tile tile){
         returnItem = null;
         returnCount = 0;
 
@@ -191,14 +230,13 @@ public class Drill extends Block{
     }
 
     public boolean canMine(Tile tile){
-        if(tile == null) return false;
+        if(tile == null || tile.block().isStatic()) return false;
         Item drops = tile.drop();
-        return drops != null && drops.hardness <= tier;
+        return drops != null && drops.hardness <= tier && (blockedItems == null || !blockedItems.contains(drops));
     }
 
     public class DrillBuild extends Building{
         public float progress;
-        public int index;
         public float warmup;
         public float timeDrilled;
         public float lastDrillSpeed;
@@ -213,89 +251,114 @@ public class Drill extends Block{
 
         @Override
         public boolean shouldAmbientSound(){
-            return efficiency() > 0.01f && items.total() < itemCapacity;
+            return efficiency > 0.01f && items.total() < itemCapacity;
         }
 
         @Override
         public float ambientVolume(){
-            return efficiency() * (size * size) / 4f;
+            return efficiency * (size * size) / 4f;
         }
 
         @Override
         public void drawSelect(){
             if(dominantItem != null){
-                float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f;
+                float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
                 Draw.mixcol(Color.darkGray, 1f);
-                Draw.rect(dominantItem.icon(Cicon.small), dx, dy - 1);
+                Draw.rect(dominantItem.fullIcon, dx, dy - 1, s, s);
                 Draw.reset();
-                Draw.rect(dominantItem.icon(Cicon.small), dx, dy);
+                Draw.rect(dominantItem.fullIcon, dx, dy, s, s);
             }
         }
 
+        @Override
+        public void pickedUp(){
+            dominantItem = null;
+        }
+
         @Override
         public void onProximityUpdate(){
+            super.onProximityUpdate();
+
             countOre(tile);
             dominantItem = returnItem;
             dominantItems = returnCount;
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            if(sensor == LAccess.firstItem) return dominantItem;
+            return super.senseObject(sensor);
+        }
+
         @Override
         public void updateTile(){
+            if(timer(timerDump, dumpTime)){
+                dump(dominantItem != null && items.has(dominantItem) ? dominantItem : null);
+            }
+
             if(dominantItem == null){
                 return;
             }
 
-            if(timer(timerDump, dumpTime)){
-                dump(dominantItem);
-            }
-
             timeDrilled += warmup * delta();
 
-            if(items.total() < itemCapacity && dominantItems > 0 && consValid()){
+            float delay = getDrillTime(dominantItem);
 
-                float speed = 1f;
+            if(items.total() < itemCapacity && dominantItems > 0 && efficiency > 0){
+                float speed = Mathf.lerp(1f, liquidBoostIntensity, optionalEfficiency) * efficiency;
 
-                if(cons.optionalValid()){
-                    speed = liquidBoostIntensity;
-                }
-
-                speed *= efficiency(); // Drill slower when not at full power
-
-                lastDrillSpeed = (speed * dominantItems * warmup) / (drillTime + hardnessDrillMultiplier * dominantItem.hardness);
-                warmup = Mathf.lerpDelta(warmup, speed, warmupSpeed);
+                lastDrillSpeed = (speed * dominantItems * warmup) / delay;
+                warmup = Mathf.approachDelta(warmup, speed, warmupSpeed);
                 progress += delta() * dominantItems * speed * warmup;
 
                 if(Mathf.chanceDelta(updateEffectChance * warmup))
                     updateEffect.at(x + Mathf.range(size * 2f), y + Mathf.range(size * 2f));
             }else{
                 lastDrillSpeed = 0f;
-                warmup = Mathf.lerpDelta(warmup, 0f, warmupSpeed);
+                warmup = Mathf.approachDelta(warmup, 0f, warmupSpeed);
                 return;
             }
 
-            float delay = drillTime + hardnessDrillMultiplier * dominantItem.hardness;
-
             if(dominantItems > 0 && progress >= delay && items.total() < itemCapacity){
-                offload(dominantItem);
+                int amount = (int)(progress / delay);
+                for(int i = 0; i < amount; i++){
+                    offload(dominantItem);
+                }
 
-                index ++;
                 progress %= delay;
 
-                drillEffect.at(x + Mathf.range(size), y + Mathf.range(size), dominantItem.color);
+                if(wasVisible && Mathf.chanceDelta(drillEffectChance * warmup)) drillEffect.at(x + Mathf.range(drillEffectRnd), y + Mathf.range(drillEffectRnd), dominantItem.color);
             }
         }
 
+        @Override
+        public float progress(){
+            return dominantItem == null ? 0f : Mathf.clamp(progress / getDrillTime(dominantItem));
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress && dominantItem != null) return progress;
+            return super.sense(sensor);
+        }
+
         @Override
         public void drawCracks(){}
 
+        public void drawDefaultCracks(){
+            super.drawCracks();
+        }
+
         @Override
         public void draw(){
             float s = 0.3f;
             float ts = 0.6f;
 
             Draw.rect(region, x, y);
-            super.drawCracks();
+            Draw.z(Layer.blockCracks);
+            drawDefaultCracks();
 
+            Draw.z(Layer.blockAfterCracks);
             if(drawRim){
                 Draw.color(heatColor);
                 Draw.alpha(warmup * ts * (1f - s + Mathf.absin(Time.time, 3f, s)));
@@ -305,7 +368,11 @@ public class Drill extends Block{
                 Draw.color();
             }
 
-            Draw.rect(rotatorRegion, x, y, timeDrilled * rotateSpeed);
+            if(drawSpinSprite){
+                Drawf.spinSprite(rotatorRegion, x, y, timeDrilled * rotateSpeed);
+            }else{
+                Draw.rect(rotatorRegion, x, y, timeDrilled * rotateSpeed);
+            }
 
             Draw.rect(topRegion, x, y);
 
@@ -315,6 +382,27 @@ public class Drill extends Block{
                 Draw.color();
             }
         }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(progress);
+            write.f(warmup);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                progress = read.f();
+                warmup = read.f();
+            }
+        }
     }
 
 }
diff --git a/core/src/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java
index 0ce66cd54c..967455fcbe 100644
--- a/core/src/mindustry/world/blocks/production/Fracker.java
+++ b/core/src/mindustry/world/blocks/production/Fracker.java
@@ -1,77 +1,46 @@
 package mindustry.world.blocks.production;
 
-import arc.graphics.g2d.*;
-import mindustry.annotations.Annotations.*;
+import arc.math.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
 import mindustry.world.meta.*;
 
 public class Fracker extends SolidPump{
     public float itemUseTime = 100f;
 
-    public @Load("@-liquid") TextureRegion liquidRegion;
-    public @Load("@-rotator") TextureRegion rotatorRegion;
-    public @Load("@-top") TextureRegion topRegion;
-
     public Fracker(String name){
         super(name);
         hasItems = true;
         ambientSound = Sounds.drill;
         ambientSoundVolume = 0.03f;
+        envRequired |= Env.groundOil;
     }
 
     @Override
     public void setStats(){
+        stats.timePeriod = itemUseTime;
         super.setStats();
 
         stats.add(Stat.productionTime, itemUseTime / 60f, StatUnit.seconds);
     }
 
-    @Override
-    public boolean outputsItems(){
-        return false;
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{region, rotatorRegion, topRegion};
-    }
-
     public class FrackerBuild extends SolidPumpBuild{
         public float accumulator;
 
-        @Override
-        public void drawCracks(){}
-
-        @Override
-        public void draw(){
-            Draw.rect(region, x, y);
-            super.drawCracks();
-
-            Drawf.liquid(liquidRegion, x, y, liquids.get(result) / liquidCapacity, result.color);
-
-            Draw.rect(rotatorRegion, x, y, pumpTime);
-            Draw.rect(topRegion, x, y);
-        }
-
         @Override
         public void updateTile(){
-            if(consValid()){
+            if(efficiency > 0){
                 if(accumulator >= itemUseTime){
                     consume();
                     accumulator -= itemUseTime;
                 }
 
                 super.updateTile();
-                accumulator += delta() * efficiency();
+                accumulator += delta() * efficiency;
             }else{
+                warmup = Mathf.lerpDelta(warmup, 0f, 0.02f);
+                lastPump = 0f;
                 dumpLiquid(result);
             }
         }
-
-        @Override
-        public float typeLiquid(){
-            return liquids.get(result);
-        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java
index 39a2e2ac4f..9fe01d436e 100644
--- a/core/src/mindustry/world/blocks/production/GenericCrafter.java
+++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java
@@ -2,26 +2,50 @@ package mindustry.world.blocks.production;
 
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.struct.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.liquid.Conduit.*;
 import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class GenericCrafter extends Block{
-    public ItemStack outputItem;
-    public LiquidStack outputLiquid;
+    /** Written to outputItems as a single-element array if outputItems is null. */
+    public @Nullable ItemStack outputItem;
+    /** Overwrites outputItem if not null. */
+    public @Nullable ItemStack[] outputItems;
+
+    /** Written to outputLiquids as a single-element array if outputLiquids is null. */
+    public @Nullable LiquidStack outputLiquid;
+    /** Overwrites outputLiquid if not null. */
+    public @Nullable LiquidStack[] outputLiquids;
+    /** Liquid output directions, specified in the same order as outputLiquids. Use -1 to dump in every direction. Rotations are relative to block. */
+    public int[] liquidOutputDirections = {-1};
+
+    /** if true, crafters with multiple liquid outputs will dump excess when there's still space for at least one liquid type */
+    public boolean dumpExtraLiquid = true;
+    public boolean ignoreLiquidFullness = false;
 
     public float craftTime = 80;
     public Effect craftEffect = Fx.none;
     public Effect updateEffect = Fx.none;
     public float updateEffectChance = 0.04f;
+    public float updateEffectSpread = 4f;
+    public float warmupSpeed = 0.019f;
+    /** Only used for legacy cultivator blocks. */
+    public boolean legacyReadWarmup = false;
 
-    public DrawBlock drawer = new DrawBlock();
+    public DrawBlock drawer = new DrawDefault();
 
     public GenericCrafter(String name){
         super(name);
@@ -32,20 +56,54 @@ public class GenericCrafter extends Block{
         sync = true;
         ambientSoundVolume = 0.03f;
         flags = EnumSet.of(BlockFlag.factory);
+        drawArrow = false;
     }
 
     @Override
     public void setStats(){
+        stats.timePeriod = craftTime;
         super.setStats();
-        stats.add(Stat.productionTime, craftTime / 60f, StatUnit.seconds);
-
-        if(outputItem != null){
-            stats.add(Stat.output, outputItem);
+        if((hasItems && itemCapacity > 0) || outputItems != null){
+            stats.add(Stat.productionTime, craftTime / 60f, StatUnit.seconds);
         }
 
-        if(outputLiquid != null){
-            stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * (60f / craftTime), true);
+        if(outputItems != null){
+            stats.add(Stat.output, StatValues.items(craftTime, outputItems));
         }
+
+        if(outputLiquids != null){
+            stats.add(Stat.output, StatValues.liquids(1f, outputLiquids));
+        }
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        //set up liquid bars for liquid outputs
+        if(outputLiquids != null && outputLiquids.length > 0){
+            //no need for dynamic liquid bar
+            removeBar("liquid");
+
+            //then display output buffer
+            for(var stack : outputLiquids){
+                addLiquidBar(stack.liquid);
+            }
+        }
+    }
+
+    @Override
+    public boolean rotatedOutput(int fromX, int fromY, Tile destination){
+        if(!(destination.build instanceof ConduitBuild)) return false;
+
+        Building crafter = world.build(fromX, fromY);
+        if(crafter == null) return false;
+        int relative = Mathf.mod(crafter.relativeTo(destination) - crafter.rotation, 4);
+        for(int dir : liquidOutputDirections){
+            if(dir == -1 || dir == relative) return false;
+        }
+
+        return true;
     }
 
     @Override
@@ -57,18 +115,60 @@ public class GenericCrafter extends Block{
 
     @Override
     public void init(){
-        outputsLiquid = outputLiquid != null;
+        if(outputItems == null && outputItem != null){
+            outputItems = new ItemStack[]{outputItem};
+        }
+        if(outputLiquids == null && outputLiquid != null){
+            outputLiquids = new LiquidStack[]{outputLiquid};
+        }
+        //write back to outputLiquid, as it helps with sensing
+        if(outputLiquid == null && outputLiquids != null && outputLiquids.length > 0){
+            outputLiquid = outputLiquids[0];
+        }
+        outputsLiquid = outputLiquids != null;
+
+        if(outputItems != null) hasItems = true;
+        if(outputLiquids != null) hasLiquids = true;
+
         super.init();
     }
 
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        drawer.drawPlan(this, plan, list);
+    }
+
     @Override
     public TextureRegion[] icons(){
-        return drawer.icons(this);
+        return drawer.finalIcons(this);
     }
 
     @Override
     public boolean outputsItems(){
-        return outputItem != null;
+        return outputItems != null;
+    }
+
+    @Override
+    public void getRegionsToOutline(Seq<TextureRegion> out){
+        drawer.getRegionsToOutline(this, out);
+    }
+
+    @Override
+    public void drawOverlay(float x, float y, int rotation){
+        if(outputLiquids != null){
+            for(int i = 0; i < outputLiquids.length; i++){
+                int dir = liquidOutputDirections.length > i ? liquidOutputDirections[i] : -1;
+
+                if(dir != -1){
+                    Draw.rect(
+                        outputLiquids[i].liquid.fullIcon,
+                        x + Geometry.d4x(dir + rotation) * (size * tilesize / 2f + 4),
+                        y + Geometry.d4y(dir + rotation) * (size * tilesize / 2f + 4),
+                        8f, 8f
+                    );
+                }
+            }
+        }
     }
 
     public class GenericCrafterBuild extends Building{
@@ -81,55 +181,156 @@ public class GenericCrafter extends Block{
             drawer.draw(this);
         }
 
+        @Override
+        public void drawLight(){
+            super.drawLight();
+            drawer.drawLight(this);
+        }
+
         @Override
         public boolean shouldConsume(){
-            if(outputItem != null && items.get(outputItem.item) >= itemCapacity){
-                return false;
+            if(outputItems != null){
+                for(var output : outputItems){
+                    if(items.get(output.item) + output.amount > itemCapacity){
+                        return false;
+                    }
+                }
             }
-            return (outputLiquid == null || !(liquids.get(outputLiquid.liquid) >= liquidCapacity - 0.001f)) && enabled;
+            if(outputLiquids != null && !ignoreLiquidFullness){
+                boolean allFull = true;
+                for(var output : outputLiquids){
+                    if(liquids.get(output.liquid) >= liquidCapacity - 0.001f){
+                        if(!dumpExtraLiquid){
+                            return false;
+                        }
+                    }else{
+                        //if there's still space left, it's not full for all liquids
+                        allFull = false;
+                    }
+                }
+
+                //if there is no space left for any liquid, it can't reproduce
+                if(allFull){
+                    return false;
+                }
+            }
+
+            return enabled;
         }
 
         @Override
         public void updateTile(){
-            if(consValid()){
+            if(efficiency > 0){
 
                 progress += getProgressIncrease(craftTime);
-                totalProgress += delta();
-                warmup = Mathf.lerpDelta(warmup, 1f, 0.02f);
+                warmup = Mathf.approachDelta(warmup, warmupTarget(), warmupSpeed);
 
-                if(Mathf.chanceDelta(updateEffectChance)){
-                    updateEffect.at(getX() + Mathf.range(size * 4f), getY() + Mathf.range(size * 4));
-                }
-            }else{
-                warmup = Mathf.lerp(warmup, 0f, 0.02f);
-            }
-
-            if(progress >= 1f){
-                consume();
-
-                if(outputItem != null){
-                    for(int i = 0; i < outputItem.amount; i++){
-                        offload(outputItem.item);
+                //continuously output based on efficiency
+                if(outputLiquids != null){
+                    float inc = getProgressIncrease(1f);
+                    for(var output : outputLiquids){
+                        handleLiquid(this, output.liquid, Math.min(output.amount * inc, liquidCapacity - liquids.get(output.liquid)));
                     }
                 }
 
-                if(outputLiquid != null){
-                    handleLiquid(this, outputLiquid.liquid, outputLiquid.amount);
+                if(wasVisible && Mathf.chanceDelta(updateEffectChance)){
+                    updateEffect.at(x + Mathf.range(size * updateEffectSpread), y + Mathf.range(size * updateEffectSpread));
                 }
+            }else{
+                warmup = Mathf.approachDelta(warmup, 0f, warmupSpeed);
+            }
 
+            //TODO may look bad, revert to edelta() if so
+            totalProgress += warmup * Time.delta;
+
+            if(progress >= 1f){
+                craft();
+            }
+
+            dumpOutputs();
+        }
+
+        @Override
+        public float getProgressIncrease(float baseTime){
+            if(ignoreLiquidFullness){
+                return super.getProgressIncrease(baseTime);
+            }
+
+            //limit progress increase by maximum amount of liquid it can produce
+            float scaling = 1f, max = 1f;
+            if(outputLiquids != null){
+                max = 0f;
+                for(var s : outputLiquids){
+                    float value = (liquidCapacity - liquids.get(s.liquid)) / (s.amount * edelta());
+                    scaling = Math.min(scaling, value);
+                    max = Math.max(max, value);
+                }
+            }
+
+            //when dumping excess take the maximum value instead of the minimum.
+            return super.getProgressIncrease(baseTime) * (dumpExtraLiquid ? Math.min(max, 1f) : scaling);
+        }
+
+        public float warmupTarget(){
+            return 1f;
+        }
+
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalProgress;
+        }
+
+        public void craft(){
+            consume();
+
+            if(outputItems != null){
+                for(var output : outputItems){
+                    for(int i = 0; i < output.amount; i++){
+                        offload(output.item);
+                    }
+                }
+            }
+
+            if(wasVisible){
                 craftEffect.at(x, y);
-                progress = 0f;
+            }
+            progress %= 1f;
+        }
+
+        public void dumpOutputs(){
+            if(outputItems != null && timer(timerDump, dumpTime / timeScale)){
+                for(ItemStack output : outputItems){
+                    dump(output.item);
+                }
             }
 
-            if(outputItem != null && timer(timerDump, dumpTime)){
-                dump(outputItem.item);
-            }
+            if(outputLiquids != null){
+                for(int i = 0; i < outputLiquids.length; i++){
+                    int dir = liquidOutputDirections.length > i ? liquidOutputDirections[i] : -1;
 
-            if(outputLiquid != null){
-                dumpLiquid(outputLiquid.liquid);
+                    dumpLiquid(outputLiquids[i].liquid, 2f, dir);
+                }
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return progress();
+            //attempt to prevent wild total liquid fluctuation, at least for crafters
+            if(sensor == LAccess.totalLiquids && outputLiquid != null) return liquids.get(outputLiquid.liquid);
+            return super.sense(sensor);
+        }
+
+        @Override
+        public float progress(){
+            return Mathf.clamp(progress);
+        }
+
         @Override
         public int getMaximumAccepted(Item item){
             return itemCapacity;
@@ -137,7 +338,7 @@ public class GenericCrafter extends Block{
 
         @Override
         public boolean shouldAmbientSound(){
-            return cons.valid();
+            return efficiency > 0;
         }
 
         @Override
@@ -145,6 +346,7 @@ public class GenericCrafter extends Block{
             super.write(write);
             write.f(progress);
             write.f(warmup);
+            if(legacyReadWarmup) write.f(0f);
         }
 
         @Override
@@ -152,6 +354,7 @@ public class GenericCrafter extends Block{
             super.read(read, revision);
             progress = read.f();
             warmup = read.f();
+            if(legacyReadWarmup) read.f();
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/production/GenericSmelter.java b/core/src/mindustry/world/blocks/production/GenericSmelter.java
deleted file mode 100644
index 57108317ed..0000000000
--- a/core/src/mindustry/world/blocks/production/GenericSmelter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package mindustry.world.blocks.production;
-
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.util.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-
-/** A GenericCrafter with a new glowing region drawn on top. */
-public class GenericSmelter extends GenericCrafter{
-    public Color flameColor = Color.valueOf("ffc999");
-    public @Load("@-top") TextureRegion topRegion;
-
-    public GenericSmelter(String name){
-        super(name);
-        ambientSound = Sounds.smelter;
-        ambientSoundVolume = 0.07f;
-    }
-
-    public class SmelterBuild extends GenericCrafterBuild{
-        @Override
-        public void draw(){
-            super.draw();
-
-            //draw glowing center
-            if(warmup > 0f && flameColor.a > 0.001f){
-                float g = 0.3f;
-                float r = 0.06f;
-                float cr = Mathf.random(0.1f);
-
-                Draw.alpha(((1f - g) + Mathf.absin(Time.time, 8f, g) + Mathf.random(r) - r) * warmup);
-
-                Draw.tint(flameColor);
-                Fill.circle(x, y, 3f + Mathf.absin(Time.time, 5f, 2f) + cr);
-                Draw.color(1f, 1f, 1f, warmup);
-                Draw.rect(topRegion, x, y);
-                Fill.circle(x, y, 1.9f + Mathf.absin(Time.time, 5f, 1f) + cr);
-
-                Draw.color();
-            }
-        }
-
-        @Override
-        public void drawLight(){
-            Drawf.light(team, x, y, (60f + Mathf.absin(10f, 5f)) * warmup * size, flameColor, 0.65f);
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/production/HeatCrafter.java b/core/src/mindustry/world/blocks/production/HeatCrafter.java
new file mode 100644
index 0000000000..5af67c37c7
--- /dev/null
+++ b/core/src/mindustry/world/blocks/production/HeatCrafter.java
@@ -0,0 +1,75 @@
+package mindustry.world.blocks.production;
+
+import arc.*;
+import arc.math.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.blocks.heat.*;
+import mindustry.world.meta.*;
+
+/** A crafter that requires contact from heater blocks to craft. */
+public class HeatCrafter extends GenericCrafter{
+    /** Base heat requirement for 100% efficiency. */
+    public float heatRequirement = 10f;
+    /** After heat meets this requirement, excess heat will be scaled by this number. */
+    public float overheatScale = 1f;
+    /** Maximum possible efficiency after overheat. */
+    public float maxEfficiency = 4f;
+
+    public HeatCrafter(String name){
+        super(name);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("heat", (HeatCrafterBuild entity) ->
+            new Bar(() ->
+            Core.bundle.format("bar.heatpercent", (int)(entity.heat + 0.01f), (int)(entity.efficiencyScale() * 100 + 0.01f)),
+            () -> Pal.lightOrange,
+            () -> entity.heat / heatRequirement));
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.input, heatRequirement, StatUnit.heatUnits);
+        stats.add(Stat.maxEfficiency, (int)(maxEfficiency * 100f), StatUnit.percent);
+    }
+
+    public class HeatCrafterBuild extends GenericCrafterBuild implements HeatConsumer{
+        //TODO sideHeat could be smooth
+        public float[] sideHeat = new float[4];
+        public float heat = 0f;
+
+        @Override
+        public void updateTile(){
+            heat = calculateHeat(sideHeat);
+
+            super.updateTile();
+        }
+
+        @Override
+        public float heatRequirement(){
+            return heatRequirement;
+        }
+
+        @Override
+        public float[] sideHeat(){
+            return sideHeat;
+        }
+
+        @Override
+        public float warmupTarget(){
+            return Mathf.clamp(heat / heatRequirement);
+        }
+
+        @Override
+        public float efficiencyScale(){
+            float over = Math.max(heat - heatRequirement, 0f);
+            return Math.min(Mathf.clamp(heat / heatRequirement) + over / heatRequirement * overheatScale, maxEfficiency);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/production/Incinerator.java b/core/src/mindustry/world/blocks/production/Incinerator.java
index 35765f6961..62f8fc573e 100644
--- a/core/src/mindustry/world/blocks/production/Incinerator.java
+++ b/core/src/mindustry/world/blocks/production/Incinerator.java
@@ -9,6 +9,7 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 public class Incinerator extends Block{
     public Effect effect = Fx.fuelburn;
@@ -27,11 +28,12 @@ public class Incinerator extends Block{
 
         @Override
         public void updateTile(){
-            if(consValid() && efficiency() > 0.9f){
-                heat = Mathf.lerpDelta(heat, 1f, 0.04f);
-            }else{
-                heat = Mathf.lerpDelta(heat, 0f, 0.02f);
-            }
+            heat = Mathf.approachDelta(heat, efficiency, 0.04f);
+        }
+
+        @Override
+        public BlockStatus status(){
+            return heat > 0.5f ? BlockStatus.active : BlockStatus.noInput;
         }
 
         @Override
@@ -74,7 +76,7 @@ public class Incinerator extends Block{
 
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
-            return heat > 0.5f;
+            return heat > 0.5f && liquid.incinerable;
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/production/ItemIncinerator.java b/core/src/mindustry/world/blocks/production/ItemIncinerator.java
new file mode 100644
index 0000000000..ba90ec9469
--- /dev/null
+++ b/core/src/mindustry/world/blocks/production/ItemIncinerator.java
@@ -0,0 +1,68 @@
+package mindustry.world.blocks.production;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+/** Incinerator that accepts only items and optionally requires a liquid, e.g. slag. */
+public class ItemIncinerator extends Block{
+    public Effect effect = Fx.incinerateSlag;
+    public float effectChance = 0.2f;
+
+    public @Load("@-liquid") TextureRegion liquidRegion;
+    public @Load("@-top") TextureRegion topRegion;
+
+    public ItemIncinerator(String name){
+        super(name);
+        update = true;
+        solid = true;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    public class ItemIncineratorBuild extends Building{
+
+        @Override
+        public void updateTile(){
+        }
+
+        @Override
+        public BlockStatus status(){
+            return efficiency > 0 ? BlockStatus.active : BlockStatus.noInput;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(liquidRegion.found()){
+                Drawf.liquid(liquidRegion, x, y, liquids.currentAmount() / liquidCapacity, liquids.current().color);
+            }
+            if(topRegion.found()){
+                Draw.rect(topRegion, x, y);
+            }
+        }
+
+        @Override
+        public void handleItem(Building source, Item item){
+            if(Mathf.chance(effectChance)){
+                effect.at(x, y);
+            }
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return efficiency > 0;
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/production/LiquidConverter.java b/core/src/mindustry/world/blocks/production/LiquidConverter.java
deleted file mode 100644
index 3ea25117e0..0000000000
--- a/core/src/mindustry/world/blocks/production/LiquidConverter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package mindustry.world.blocks.production;
-
-import mindustry.world.consumers.*;
-import mindustry.world.meta.*;
-
-public class LiquidConverter extends GenericCrafter{
-
-    public LiquidConverter(String name){
-        super(name);
-        hasLiquids = true;
-    }
-
-    @Override
-    public boolean outputsItems(){
-        return false;
-    }
-
-    @Override
-    public void init(){
-        if(!consumes.has(ConsumeType.liquid) || !(consumes.get(ConsumeType.liquid) instanceof ConsumeLiquid)){
-            throw new RuntimeException("LiquidsConverters must have a ConsumeLiquid. Note that filters are not supported.");
-        }
-
-        ConsumeLiquid cl = consumes.get(ConsumeType.liquid);
-        cl.update(false);
-        outputLiquid.amount = cl.amount;
-        super.init();
-    }
-
-    @Override
-    public void setStats(){
-        super.setStats();
-        stats.remove(Stat.output);
-        stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * 60f, true);
-    }
-
-    public class LiquidConverterBuild extends GenericCrafterBuild{
-        @Override
-        public void drawLight(){
-            if(hasLiquids && drawLiquidLight && outputLiquid.liquid.lightColor.a > 0.001f){
-                drawLiquidLight(outputLiquid.liquid, liquids.get(outputLiquid.liquid));
-            }
-        }
-
-        @Override
-        public void updateTile(){
-            ConsumeLiquid cl = consumes.get(ConsumeType.liquid);
-
-            if(cons.valid()){
-                float use = Math.min(cl.amount * edelta(), liquidCapacity - liquids.get(outputLiquid.liquid));
-
-                liquids.remove(cl.liquid, Math.min(use, liquids.get(cl.liquid)));
-
-                progress += use / cl.amount;
-                liquids.add(outputLiquid.liquid, use);
-                if(progress >= craftTime){
-                    consume();
-                    progress %= craftTime;
-                }
-            }
-
-            dumpLiquid(outputLiquid.liquid);
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
deleted file mode 100644
index 2851d4c27f..0000000000
--- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package mindustry.world.blocks.production;
-
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.math.geom.*;
-import arc.util.*;
-import arc.util.io.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.world.*;
-import mindustry.world.blocks.payloads.*;
-
-import static mindustry.Vars.*;
-
-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 PayloadAcceptor(String name){
-        super(name);
-
-        update = true;
-        sync = true;
-    }
-
-    public static boolean blends(Building build, int direction){
-        int size = build.block.size;
-        int trns = build.block.size/2 + 1;
-        Building accept = build.nearby(Geometry.d4(direction).x * trns, Geometry.d4(direction).y * trns);
-        return accept != null &&
-            accept.block.outputsPayload &&
-
-            //if size is the same, block must either be facing this one, or not be rotating
-            ((accept.block.size == size
-            && Math.abs(accept.tileX() - build.tileX()) % size == 0 //check alignment
-            && Math.abs(accept.tileY() - build.tileY()) % size == 0
-            && ((accept.block.rotate && accept.tileX() + Geometry.d4(accept.rotation).x * size == build.tileX() && accept.tileY() + Geometry.d4(accept.rotation).y * size == build.tileY())
-            || !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 - build.y) <= (size * tilesize - accept.block.size * tilesize)/2f : //check Y alignment
-                Math.abs(accept.x - build.x) <= (size * tilesize - accept.block.size * tilesize)/2f   //check X alignment
-                )) && (!accept.block.rotate || accept.front() == build || !accept.block.outputFacing) //make sure it's facing this block
-            );
-    }
-
-    public class PayloadAcceptorBuild<T extends Payload> extends Building{
-        public @Nullable T payload;
-        public Vec2 payVector = new Vec2();
-        public float payRotation;
-        public boolean carried;
-
-        @Override
-        public boolean acceptPayload(Building source, Payload payload){
-            return this.payload == null;
-        }
-
-        @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.payRotation = source.angleTo(this);
-
-            updatePayload();
-        }
-
-        @Override
-        public Payload getPayload(){
-            return payload;
-        }
-
-        @Override
-        public void pickedUp(){
-            carried = true;
-        }
-
-        @Override
-        public void drawTeamTop(){
-            carried = false;
-        }
-
-        @Override
-        public Payload takePayload(){
-            T t = payload;
-            payload = null;
-            return t;
-        }
-
-        @Override
-        public void onRemoved(){
-            super.onRemoved();
-            if(payload != null && !carried) payload.dump();
-        }
-
-        public boolean blends(int direction){
-            return PayloadAcceptor.blends(this, direction);
-        }
-
-        public void updatePayload(){
-            if(payload != null){
-                payload.set(x + payVector.x, y + payVector.y, payRotation);
-            }
-        }
-
-        /** @return true if the payload is in position. */
-        public boolean moveInPayload(){
-            if(payload == null) return false;
-
-            updatePayload();
-
-            payRotation = Mathf.slerpDelta(payRotation, rotate ? rotdeg() : 90f, 0.3f);
-            payVector.approach(Vec2.ZERO, payloadSpeed * delta());
-
-            return hasArrived();
-        }
-
-        public void moveOutPayload(){
-            if(payload == null) return;
-
-            updatePayload();
-
-            payVector.trns(rotdeg(), payVector.len() + delta() * payloadSpeed);
-            payRotation = rotdeg();
-
-            if(payVector.len() >= 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(movePayload(payload)){
-                        payload = null;
-                    }
-                }else if(front == null || !front.tile().solid()){
-                    dumpPayload();
-                }
-            }
-        }
-
-        public void dumpPayload(){
-            if(payload.dump()){
-                payload = null;
-            }
-        }
-
-        public boolean hasArrived(){
-            return payVector.isZero(0.01f);
-        }
-
-        public void drawPayload(){
-            if(payload != null){
-                payload.set(x + payVector.x, y + payVector.y, payRotation);
-
-                Draw.z(Layer.blockOver);
-                payload.draw();
-            }
-        }
-
-        @Override
-        public void write(Writes write){
-            super.write(write);
-
-            write.f(payVector.x);
-            write.f(payVector.y);
-            write.f(payRotation);
-            Payload.write(payload, write);
-        }
-
-        @Override
-        public void read(Reads read, byte revision){
-            super.read(read, revision);
-
-            payVector.set(read.f(), read.f());
-            payRotation = read.f();
-            payload = Payload.read(read);
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/production/Pump.java b/core/src/mindustry/world/blocks/production/Pump.java
index c31d346c80..09c3fb2a5c 100644
--- a/core/src/mindustry/world/blocks/production/Pump.java
+++ b/core/src/mindustry/world/blocks/production/Pump.java
@@ -3,12 +3,14 @@ package mindustry.world.blocks.production;
 import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
 import mindustry.game.*;
-import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.liquid.*;
+import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -16,11 +18,16 @@ import static mindustry.Vars.*;
 public class Pump extends LiquidBlock{
     /** Pump amount per tile. */
     public float pumpAmount = 0.2f;
+    /** Interval in-between item consumptions, if applicable. */
+    public float consumeTime = 60f * 5f;
+    public float warmupSpeed = 0.019f;
+    public DrawBlock drawer = new DrawMulti(new DrawDefault(), new DrawPumpLiquid());
 
     public Pump(String name){
         super(name);
         group = BlockGroup.liquids;
         floating = true;
+        envEnabled = Env.terrestrial;
     }
 
     @Override
@@ -31,6 +38,8 @@ public class Pump extends LiquidBlock{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
         Tile tile = world.tile(x, y);
         if(tile == null) return;
 
@@ -39,6 +48,10 @@ public class Pump extends LiquidBlock{
 
         for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){
             if(canPump(other)){
+                if(liquidDrop != null && other.floor().liquidDrop != liquidDrop){
+                    liquidDrop = null;
+                    break;
+                }
                 liquidDrop = other.floor().liquidDrop;
                 amount += other.floor().liquidMultiplier;
             }
@@ -46,21 +59,28 @@ public class Pump extends LiquidBlock{
 
         if(liquidDrop != null){
             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;
+            float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5, s = iconSmall / 4f;
+            float ratio = (float)liquidDrop.fullIcon.width / liquidDrop.fullIcon.height;
             Draw.mixcol(Color.darkGray, 1f);
-            Draw.rect(liquidDrop.icon(Cicon.small), dx, dy - 1);
+            Draw.rect(liquidDrop.fullIcon, dx, dy - 1, s * ratio, s);
             Draw.reset();
-            Draw.rect(liquidDrop.icon(Cicon.small), dx, dy);
+            Draw.rect(liquidDrop.fullIcon, dx, dy, s * ratio, s);
         }
     }
 
     @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{region};
+    public void load(){
+        super.load();
+        drawer.load(this);
     }
 
     @Override
-    public boolean canPlaceOn(Tile tile, Team team){
+    public TextureRegion[] icons(){
+        return drawer.finalIcons(this);
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
         if(isMultiblock()){
             Liquid last = null;
             for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){
@@ -74,19 +94,45 @@ public class Pump extends LiquidBlock{
         }
     }
 
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        //replace dynamic output bar with own custom bar
+        addLiquidBar((PumpBuild build) -> build.liquidDrop);
+    }
+
     protected boolean canPump(Tile tile){
         return tile != null && tile.floor().liquidDrop != null;
     }
 
     public class PumpBuild extends LiquidBuild{
+        public float warmup, totalProgress;
+        public float consTimer;
         public float amount = 0f;
-        public Liquid liquidDrop = null;
+        public @Nullable Liquid liquidDrop = null;
 
         @Override
         public void draw(){
-            Draw.rect(name, x, y);
+            drawer.draw(this);
+        }
 
-            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
+        @Override
+        public void drawLight(){
+            super.drawLight();
+            drawer.drawLight(this);
+        }
+
+        @Override
+        public void pickedUp(){
+            amount = 0f;
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.efficiency) return shouldConsume() ? efficiency : 0f;
+            if(sensor == LAccess.totalLiquids) return liquidDrop == null ? 0f : liquids.get(liquidDrop);
+            return super.sense(sensor);
         }
 
         @Override
@@ -111,13 +157,41 @@ public class Pump extends LiquidBlock{
 
         @Override
         public void updateTile(){
-            if(consValid() && liquidDrop != null){
-                float maxPump = Math.min(liquidCapacity - liquids.total(), amount * pumpAmount * edelta());
+            if(efficiency > 0 && liquidDrop != null){
+                float maxPump = Math.min(liquidCapacity - liquids.get(liquidDrop), amount * pumpAmount * edelta());
                 liquids.add(liquidDrop, maxPump);
-            }
 
-            dumpLiquid(liquids.current());
+                //does nothing for most pumps, as those do not require items.
+                if((consTimer += delta()) >= consumeTime){
+                    consume();
+                    consTimer %= 1f;
+                }
+                
+                warmup = Mathf.approachDelta(warmup, maxPump > 0.001f ? 1f : 0f, warmupSpeed);
+            }else{
+                warmup = Mathf.approachDelta(warmup, 0f, warmupSpeed);
+            }
+            
+            totalProgress += warmup * Time.delta;
+
+            if(liquidDrop != null){
+                dumpLiquid(liquidDrop);
+            }
+        }
+
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+        
+        @Override
+        public float progress(){
+            return Mathf.clamp(consTimer / consumeTime);
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalProgress;
         }
     }
-
 }
diff --git a/core/src/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java
index 494a2977d8..1bd5351b5e 100644
--- a/core/src/mindustry/world/blocks/production/Separator.java
+++ b/core/src/mindustry/world/blocks/production/Separator.java
@@ -1,28 +1,28 @@
 package mindustry.world.blocks.production;
 
-import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.util.*;
 import arc.util.io.*;
-import mindustry.annotations.Annotations.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.consumers.*;
+import mindustry.world.draw.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 /**
  * Extracts a random list of items from an input item and an input liquid.
  */
 public class Separator extends Block{
+    protected @Nullable ConsumeItems consItems;
+
     public ItemStack[] results;
     public float craftTime;
 
-    public @Load("@-liquid") TextureRegion liquidRegion;
-    public @Load("@-spinner") TextureRegion spinnerRegion;
-    public float spinnerSpeed = 3f;
+    public DrawBlock drawer = new DrawDefault();
 
     public Separator(String name){
         super(name);
@@ -30,39 +30,70 @@ public class Separator extends Block{
         solid = true;
         hasItems = true;
         hasLiquids = true;
+        sync = true;
     }
 
     @Override
     public void setStats(){
+        stats.timePeriod = craftTime;
         super.setStats();
 
-        stats.add(Stat.output, new ItemFilterValue(item -> {
-            for(ItemStack i : results){
-                if(item == i.item) return true;
-            }
-            return false;
-        }));
+        int[] sum = {0};
+        for(var r : results) sum[0] += r.amount;
 
+        stats.add(Stat.output, table -> {
+            for(ItemStack stack : results){
+                table.add(StatValues.displayItemPercent(stack.item, (int)((float)stack.amount / sum[0] * 100), true)).padRight(5);
+            }
+        });
         stats.add(Stat.productionTime, craftTime / 60f, StatUnit.seconds);
     }
 
+    @Override
+    public void init(){
+        super.init();
+        consItems = findConsumer(c -> c instanceof ConsumeItems);
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        drawer.load(this);
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        drawer.drawPlan(this, plan, list);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return drawer.finalIcons(this);
+    }
+
     public class SeparatorBuild extends Building{
         public float progress;
         public float totalProgress;
         public float warmup;
+        public int seed;
+
+        @Override
+        public void created(){
+            seed = Mathf.randomSeed(tile.pos(), 0, Integer.MAX_VALUE - 1);
+        }
 
         @Override
         public boolean shouldAmbientSound(){
-            return cons.valid();
+            return efficiency > 0;
         }
 
         @Override
         public boolean shouldConsume(){
             int total = items.total();
             //very inefficient way of allowing separators to ignore input buffer storage
-            if(consumes.has(ConsumeType.item) && consumes.get(ConsumeType.item) instanceof ConsumeItems){
-                ConsumeItems c = consumes.get(ConsumeType.item);
-                for(ItemStack stack : c.items){
+            if(consItems != null){
+                for(ItemStack stack : consItems.items){
                     total -= items.get(stack.item);
                 }
             }
@@ -71,20 +102,35 @@ public class Separator extends Block{
 
         @Override
         public void draw(){
-            super.draw();
+            drawer.draw(this);
+        }
 
-            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
+        @Override
+        public void drawLight(){
+            super.drawLight();
+            drawer.drawLight(this);
+        }
 
-            if(Core.atlas.isFound(spinnerRegion)){
-                Draw.rect(spinnerRegion, x, y, totalProgress * spinnerSpeed);
-            }
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public float progress(){
+            return progress;
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalProgress;
         }
 
         @Override
         public void updateTile(){
             totalProgress += warmup * delta();
 
-            if(consValid()){
+            if(efficiency > 0){
                 progress += getProgressIncrease(craftTime);
                 warmup = Mathf.lerpDelta(warmup, 1f, 0.02f);
             }else{
@@ -96,7 +142,7 @@ public class Separator extends Block{
                 int sum = 0;
                 for(ItemStack stack : results) sum += stack.amount;
 
-                int i = Mathf.random(sum);
+                int i = Mathf.randomSeed(seed++, 0, sum - 1);
                 int count = 0;
                 Item item = null;
 
@@ -121,9 +167,20 @@ public class Separator extends Block{
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return progress;
+            return super.sense(sensor);
+        }
+
         @Override
         public boolean canDump(Building to, Item item){
-            return !consumes.itemFilters.get(item.id);
+            return !consumesItem(item);
+        }
+
+        @Override
+        public byte version(){
+            return 1;
         }
 
         @Override
@@ -131,6 +188,7 @@ public class Separator extends Block{
             super.write(write);
             write.f(progress);
             write.f(warmup);
+            write.i(seed);
         }
 
         @Override
@@ -138,6 +196,7 @@ public class Separator extends Block{
             super.read(read, revision);
             progress = read.f();
             warmup = read.f();
+            if(revision == 1) seed = read.i();
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/production/SingleBlockProducer.java b/core/src/mindustry/world/blocks/production/SingleBlockProducer.java
new file mode 100644
index 0000000000..5dab7d775d
--- /dev/null
+++ b/core/src/mindustry/world/blocks/production/SingleBlockProducer.java
@@ -0,0 +1,23 @@
+package mindustry.world.blocks.production;
+
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.world.*;
+import mindustry.world.blocks.payloads.*;
+
+public class SingleBlockProducer extends BlockProducer{
+    public Block result = Blocks.router;
+
+    public SingleBlockProducer(String name){
+        super(name);
+    }
+
+    public class SingleBlockProducerBuild extends BlockProducerBuild{
+
+        @Nullable
+        @Override
+        public Block recipe(){
+            return result;
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java
index 78a423dcec..a08f781758 100644
--- a/core/src/mindustry/world/blocks/production/SolidPump.java
+++ b/core/src/mindustry/world/blocks/production/SolidPump.java
@@ -31,22 +31,26 @@ public class SolidPump extends Pump{
     public SolidPump(String name){
         super(name);
         hasPower = true;
+        //only supports ground by default
+        envEnabled = Env.terrestrial;
     }
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
+        drawPotentialLinks(x, y);
+
         if(attribute != null){
-            drawPlaceText(Core.bundle.formatFloat("bar.efficiency", Math.max(sumAttribute(attribute, x, y) / size / size + baseEfficiency, 0f) * 100 * percentSolid(x, y), 1), x, y, valid);
+            drawPlaceText(Core.bundle.format("bar.efficiency", Math.round(Math.max((sumAttribute(attribute, x, y)) / size / size + percentSolid(x, y) * baseEfficiency, 0f) * 100)), x, y, valid);
         }
     }
 
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("efficiency", (SolidPumpBuild entity) -> new Bar(() -> Core.bundle.formatFloat("bar.pumpspeed",
-        entity.lastPump / Time.delta * 60, 1),
+        addBar("efficiency", (SolidPumpBuild entity) -> new Bar(() -> Core.bundle.formatFloat("bar.pumpspeed",
+        entity.lastPump * 60, 1),
         () -> Pal.ammo,
-        () -> entity.warmup));
+        () -> entity.warmup * entity.efficiency));
     }
 
     @Override
@@ -61,11 +65,16 @@ public class SolidPump extends Pump{
     }
 
     @Override
-    public boolean canPlaceOn(Tile tile, Team team){
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
         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
+    public boolean outputsItems(){
+        return false;
+    }
+
     @Override
     protected boolean canPump(Tile tile){
         return tile != null && !tile.floor().isLiquid;
@@ -83,36 +92,49 @@ public class SolidPump extends Pump{
         public float validTiles;
         public float lastPump;
 
+        @Override
+        public void drawCracks(){}
+
+        @Override
+        public void pickedUp(){
+            boost = validTiles = 0f;
+        }
+
         @Override
         public void draw(){
             Draw.rect(region, x, y);
-            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
-            Draw.rect(rotatorRegion, x, y, pumpTime * rotateSpeed);
+            Draw.z(Layer.blockCracks);
+            super.drawCracks();
+            Draw.z(Layer.blockAfterCracks);
+
+            Drawf.liquid(liquidRegion, x, y, liquids.get(result) / liquidCapacity, result.color);
+            Drawf.spinSprite(rotatorRegion, x, y, pumpTime * rotateSpeed);
             Draw.rect(topRegion, x, y);
         }
 
         @Override
         public boolean shouldConsume(){
-            return liquids.get(result) < liquidCapacity - 0.01f && enabled;
+            return liquids.get(result) < liquidCapacity - 0.01f;
         }
 
         @Override
         public void updateTile(){
+            liquidDrop = result;
             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());
+            if(efficiency > 0 && typeLiquid() < liquidCapacity - 0.001f){
+                float maxPump = Math.min(liquidCapacity - typeLiquid(), pumpAmount * delta() * fraction * efficiency);
                 liquids.add(result, maxPump);
-                lastPump = maxPump;
+                lastPump = maxPump / Time.delta;
                 warmup = Mathf.lerpDelta(warmup, 1f, 0.02f);
                 if(Mathf.chance(delta() * updateEffectChance))
-                    updateEffect.at(getX() + Mathf.range(size * 2f), getY() + Mathf.range(size * 2f));
+                    updateEffect.at(x + Mathf.range(size * 2f), y + Mathf.range(size * 2f));
             }else{
                 warmup = Mathf.lerpDelta(warmup, 0f, 0.02f);
                 lastPump = 0f;
             }
 
-            pumpTime += warmup * delta();
+            pumpTime += warmup * edelta();
 
             dumpLiquid(result);
         }
@@ -131,7 +153,7 @@ public class SolidPump extends Pump{
         }
 
         public float typeLiquid(){
-            return liquids.total();
+            return liquids.get(result);
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/production/WallCrafter.java b/core/src/mindustry/world/blocks/production/WallCrafter.java
new file mode 100644
index 0000000000..c9e3b3abf2
--- /dev/null
+++ b/core/src/mindustry/world/blocks/production/WallCrafter.java
@@ -0,0 +1,247 @@
+package mindustry.world.blocks.production;
+
+import arc.*;
+import arc.func.*;
+import arc.graphics.g2d.*;
+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.entities.units.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class WallCrafter extends Block{
+    static int idx = 0;
+
+    public @Load("@-top") TextureRegion topRegion;
+    public @Load("@-rotator-bottom") TextureRegion rotatorBottomRegion;
+    public @Load("@-rotator") TextureRegion rotatorRegion;
+
+    /** Time to produce one item at 100% efficiency. */
+    public float drillTime = 150f;
+    /** How many times faster the drill will progress when boosted by liquid. */
+    public float liquidBoostIntensity = 1.6f;
+    /** Effect randomly played while drilling. */
+    public Effect updateEffect = Fx.mineWallSmall;
+    public float updateEffectChance = 0.02f;
+    public float rotateSpeed = 2f;
+    /** Attribute to check for wall output. */
+    public Attribute attribute = Attribute.sand;
+
+    public Item output = Items.sand;
+
+    public float boostItemUseTime = 120f;
+    /** How many times faster the drill will progress when boosted by items. Note: Using item and liquid boosters at once is not supported. */
+    public float itemBoostIntensity = 1.6f;
+    public @Nullable Consume itemConsumer;
+    public boolean hasLiquidBooster;
+
+    public final int timerUse = timers ++;
+
+    public WallCrafter(String name){
+        super(name);
+
+        hasItems = true;
+        rotate = true;
+        update = true;
+        solid = true;
+        regionRotated1 = 1;
+
+        envEnabled |= Env.space;
+        flags = EnumSet.of(BlockFlag.drill);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("drillspeed", (WallCrafterBuild e) ->
+            new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastEfficiency * 60 / drillTime, 2)), () -> Pal.ammo, () -> e.warmup));
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.output, output);
+        stats.add(Stat.tiles, StatValues.blocks(attribute, floating, 1f, true, false));
+        stats.add(Stat.drillSpeed, 60f / drillTime * size, StatUnit.itemsSecond);
+
+        boolean consItems = itemConsumer != null;
+
+        if(consItems) stats.timePeriod = boostItemUseTime;
+
+        if(consItems && itemConsumer instanceof ConsumeItems coni){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster, StatValues.itemBoosters("{0}" + StatUnit.timesSpeed.localized(), stats.timePeriod, itemBoostIntensity, 0f, coni.items));
+        }
+
+        if(liquidBoostIntensity != 1 && findConsumer(f -> f instanceof ConsumeLiquidBase && f.booster) instanceof ConsumeLiquidBase consBase){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster,
+                StatValues.speedBoosters("{0}" + StatUnit.timesSpeed.localized(),
+                consBase.amount,
+                liquidBoostIntensity, false, consBase::consumes)
+            );
+        }
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        hasLiquidBooster = findConsumer(f -> f instanceof ConsumeLiquidBase && f.booster) != null;
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return true;
+    }
+
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        return false;
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, topRegion};
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        float eff = getEfficiency(x, y, rotation, null, null);
+
+        drawPlaceText(Core.bundle.formatFloat("bar.drillspeed", 60f / drillTime * eff, 2), x, y, valid);
+    }
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        return getEfficiency(tile.x, tile.y, rotation, null, null) > 0;
+    }
+
+    float getEfficiency(int tx, int ty, int rotation, @Nullable Cons<Tile> ctile, @Nullable Intc2 cpos){
+        float eff = 0f;
+        int cornerX = tx - (size-1)/2, cornerY = ty - (size-1)/2, s = size;
+
+        for(int i = 0; i < size; i++){
+            int rx = 0, ry = 0;
+
+            switch(rotation){
+                case 0 -> {
+                    rx = cornerX + s;
+                    ry = cornerY + i;
+                }
+                case 1 -> {
+                    rx = cornerX + i;
+                    ry = cornerY + s;
+                }
+                case 2 -> {
+                    rx = cornerX - 1;
+                    ry = cornerY + i;
+                }
+                case 3 -> {
+                    rx = cornerX + i;
+                    ry = cornerY - 1;
+                }
+            }
+
+            if(cpos != null){
+                cpos.get(rx, ry);
+            }
+
+            Tile other = world.tile(rx, ry);
+            if(other != null && other.solid()){
+                float at = other.block().attributes.get(attribute);
+                eff += at;
+                if(at > 0 && ctile != null){
+                    ctile.get(other);
+                }
+            }
+        }
+        return eff;
+    }
+
+    public class WallCrafterBuild extends Building{
+        public float time, warmup, totalTime, lastEfficiency;
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            boolean cons = shouldConsume();
+            boolean itemValid = itemConsumer != null && itemConsumer.efficiency(this) > 0;
+
+            warmup = Mathf.approachDelta(warmup, Mathf.num(efficiency > 0), 1f / 40f);
+            float dx = Geometry.d4x(rotation) * 0.5f, dy = Geometry.d4y(rotation) * 0.5f;
+
+            float eff = getEfficiency(tile.x, tile.y, rotation, dest -> {
+                //TODO make not chance based?
+                if(wasVisible && cons && Mathf.chanceDelta(updateEffectChance * warmup)){
+                    updateEffect.at(
+                        dest.worldx() + Mathf.range(3f) - dx * tilesize,
+                        dest.worldy() + Mathf.range(3f) - dy * tilesize,
+                        dest.block().mapColor
+                    );
+                }
+            }, null) * Mathf.lerp(1f, liquidBoostIntensity, hasLiquidBooster ? optionalEfficiency : 0f) * (itemValid ? itemBoostIntensity : 1f);
+
+            if(itemValid && eff * efficiency > 0 && timer(timerUse, boostItemUseTime)){
+                consume();
+            }
+
+            lastEfficiency = eff * timeScale * efficiency;
+
+            if(cons && (time += edelta() * eff) >= drillTime){
+                items.add(output, 1);
+                time %= drillTime;
+            }
+
+            totalTime += edelta() * warmup * (eff <= 0f ? 0f : 1f);
+
+            if(timer(timerDump, dumpTime)){
+                dump(output);
+            }
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return items.get(output) < itemCapacity;
+        }
+
+        @Override
+        public void draw(){
+            //TODO draw spinner drill thingies
+            Draw.rect(block.region, x, y);
+            Draw.rect(topRegion, x, y, rotdeg());
+            float ds = 0.6f, dx = Geometry.d4x(rotation) * ds, dy = Geometry.d4y(rotation) * ds;
+
+            int bs = (rotation == 0 || rotation == 3) ? 1 : -1;
+            idx = 0;
+            getEfficiency(tile.x, tile.y, rotation, null, (cx, cy) -> {
+                int sign = idx++ >= size/2 && size % 2 == 0 ? -1 : 1;
+                float vx = (cx - dx) * tilesize, vy = (cy - dy) * tilesize;
+                Draw.z(Layer.blockOver);
+                Draw.rect(rotatorBottomRegion, vx, vy, totalTime * rotateSpeed * sign * bs);
+                Draw.rect(rotatorRegion, vx, vy);
+            });
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java
index fb28247758..28d42f86ec 100644
--- a/core/src/mindustry/world/blocks/sandbox/ItemSource.java
+++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.sandbox;
 
+import arc.*;
 import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
@@ -14,6 +15,7 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class ItemSource extends Block{
+    public int itemsPerSecond = 100;
 
     public ItemSource(String name){
         super(name);
@@ -24,6 +26,8 @@ public class ItemSource extends Block{
         configurable = true;
         saveConfig = true;
         noUpdateDisabled = true;
+        envEnabled = Env.any;
+        clearOnDoubleTap = true;
 
         config(Item.class, (ItemSourceBuild tile, Item item) -> tile.outputItem = item);
         configClear((ItemSourceBuild tile) -> tile.outputItem = null);
@@ -32,12 +36,24 @@ public class ItemSource extends Block{
     @Override
     public void setBars(){
         super.setBars();
-        bars.remove("items");
+        removeBar("items");
     }
 
     @Override
-    public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
-        drawRequestConfigCenter(req, req.config, "center");
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.output, itemsPerSecond, StatUnit.itemsSecond);
+    }
+
+    @Override
+    protected TextureRegion[] icons(){
+        return new TextureRegion[]{Core.atlas.find("source-bottom"), region};
+    }
+
+    @Override
+    public void drawPlanConfig(BuildPlan plan, Eachable<BuildPlan> list){
+        drawPlanConfigCenter(plan, plan.config, "center", true);
     }
 
     @Override
@@ -46,44 +62,41 @@ public class ItemSource extends Block{
     }
 
     public class ItemSourceBuild extends Building{
-        Item outputItem;
+        public float counter;
+        public Item outputItem;
 
         @Override
         public void draw(){
-            super.draw();
-
             if(outputItem == null){
-                Draw.rect("cross", x, y);
+                Draw.rect("cross-full", x, y);
             }else{
                 Draw.color(outputItem.color);
-                Draw.rect("center", x, y);
+                Fill.square(x, y, tilesize/2f - 0.00001f);
                 Draw.color();
             }
+
+            super.draw();
         }
 
         @Override
         public void updateTile(){
             if(outputItem == null) return;
 
-            items.set(outputItem, 1);
-            dump(outputItem);
-            items.set(outputItem, 0);
+            counter += edelta();
+            float limit = 60f / itemsPerSecond;
+
+            while(counter >= limit){
+                items.set(outputItem, 1);
+                dump(outputItem);
+                produced(outputItem);
+                items.set(outputItem, 0);
+                counter -= limit;
+            }
         }
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> outputItem, this::configure);
-        }
-
-        @Override
-        public boolean onConfigureTileTapped(Building other){
-            if(this == other){
-                deselect();
-                configure(null);
-                return false;
-            }
-
-            return true;
+            ItemSelection.buildTable(ItemSource.this, table, content.items(), () -> outputItem, this::configure, selectionRows, selectionColumns);
         }
 
         @Override
@@ -108,4 +121,4 @@ public class ItemSource extends Block{
             outputItem = content.item(read.s());
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/world/blocks/sandbox/ItemVoid.java b/core/src/mindustry/world/blocks/sandbox/ItemVoid.java
index 030433d43d..dfc94238bb 100644
--- a/core/src/mindustry/world/blocks/sandbox/ItemVoid.java
+++ b/core/src/mindustry/world/blocks/sandbox/ItemVoid.java
@@ -4,6 +4,7 @@ import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
+import mindustry.world.modules.*;
 
 public class ItemVoid extends Block{
 
@@ -11,11 +12,22 @@ public class ItemVoid extends Block{
         super(name);
         group = BlockGroup.transportation;
         update = solid = acceptsItems = true;
+        envEnabled = Env.any;
     }
 
     public class ItemVoidBuild extends Building{
+        //I need a fake item module, because items can't be added to older blocks (breaks saves)
+        public ItemModule flowItems = new ItemModule();
+
         @Override
-        public void handleItem(Building source, Item item){}
+        public ItemModule flowItems(){
+            return flowItems;
+        }
+
+        @Override
+        public void handleItem(Building source, Item item){
+            flowItems.handleFlow(item, 1);
+        }
 
         @Override
         public boolean acceptItem(Building source, Item item){
diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java
index 25d84598bf..f51b9cda1f 100644
--- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java
+++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java
@@ -4,29 +4,35 @@ import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
+import mindustry.world.blocks.liquid.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
 public class LiquidSource extends Block{
+    public @Load("cross") TextureRegion crossRegion;
+    public @Load("source-bottom") TextureRegion bottomRegion;
 
     public LiquidSource(String name){
         super(name);
         update = true;
         solid = true;
         hasLiquids = true;
-        liquidCapacity = 100f;
+        liquidCapacity = 10000f;
         configurable = true;
         outputsLiquid = true;
         saveConfig = true;
         noUpdateDisabled = true;
         displayFlow = false;
         group = BlockGroup.liquids;
+        envEnabled = Env.any;
+        clearOnDoubleTap = true;
 
         config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l);
         configClear((LiquidSourceBuild tile) -> tile.source = null);
@@ -36,12 +42,17 @@ public class LiquidSource extends Block{
     public void setBars(){
         super.setBars();
 
-        bars.remove("liquid");
+        removeBar("liquid");
     }
 
     @Override
-    public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
-        drawRequestConfigCenter(req, req.config, "center");
+    public void drawPlanConfig(BuildPlan plan, Eachable<BuildPlan> list){
+        drawPlanConfigCenter(plan, plan.config, "center", true);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{bottomRegion, region};
     }
 
     public class LiquidSourceBuild extends Building{
@@ -52,7 +63,7 @@ public class LiquidSource extends Block{
             if(source == null){
                 liquids.clear();
             }else{
-                liquids.add(source, liquidCapacity);
+                liquids.set(source, liquidCapacity);
                 dumpLiquid(source);
             }
         }
@@ -61,29 +72,20 @@ public class LiquidSource extends Block{
         public void draw(){
             super.draw();
 
+            Draw.rect(bottomRegion, x, y);
+
             if(source == null){
-                Draw.rect("cross", x, y);
+                Draw.rect(crossRegion, x, y);
             }else{
-                Draw.color(source.color);
-                Draw.rect("center", x, y);
-                Draw.color();
+                LiquidBlock.drawTiledFrames(size, x, y, 0f, source, 1f);
             }
+
+            Draw.rect(block.region, x, y);
         }
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.liquids(), () -> source, this::configure);
-        }
-
-        @Override
-        public boolean onConfigureTileTapped(Building other){
-            if(this == other){
-                deselect();
-                configure(null);
-                return false;
-            }
-
-            return true;
+            ItemSelection.buildTable(LiquidSource.this, table, content.liquids(), () -> source, this::configure, selectionRows, selectionColumns);
         }
 
         @Override
@@ -109,4 +111,4 @@ public class LiquidSource extends Block{
             source = id == -1 ? null : content.liquid(id);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
index bde9742467..bc6a56cfe8 100644
--- a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
+++ b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
@@ -13,15 +13,23 @@ public class LiquidVoid extends Block{
         solid = true;
         update = true;
         group = BlockGroup.liquids;
+        envEnabled = Env.any;
+        liquidCapacity = 10000f;
     }
 
     @Override
     public void setBars(){
         super.setBars();
-        bars.remove("liquid");
+        removeBar("liquid");
     }
 
     public class LiquidVoidBuild extends Building{
+        @Override
+        public void placed(){
+            super.placed();
+            liquids.clear();
+        }
+
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
             return enabled;
@@ -29,6 +37,7 @@ public class LiquidVoid extends Block{
 
         @Override
         public void handleLiquid(Building source, Liquid liquid, float amount){
+            liquids.handleFlow(liquid, amount);
         }
     }
 
diff --git a/core/src/mindustry/world/blocks/sandbox/PowerSource.java b/core/src/mindustry/world/blocks/sandbox/PowerSource.java
index b392ce8813..0e011c9bac 100644
--- a/core/src/mindustry/world/blocks/sandbox/PowerSource.java
+++ b/core/src/mindustry/world/blocks/sandbox/PowerSource.java
@@ -1,9 +1,9 @@
 package mindustry.world.blocks.sandbox;
 
 import mindustry.world.blocks.power.*;
+import mindustry.world.meta.*;
 
 public class PowerSource extends PowerNode{
-
     public float powerProduction = 10000f;
 
     public PowerSource(String name){
@@ -11,9 +11,20 @@ public class PowerSource extends PowerNode{
         maxNodes = 100;
         outputsPower = true;
         consumesPower = false;
+        drawDisabled = true;
+        //TODO maybe don't?
+        envEnabled = Env.any;
     }
 
     public class PowerSourceBuild extends PowerNodeBuild{
+        @Override
+        public void onProximityUpdate(){
+            super.onProximityUpdate();
+            if(!allowUpdate()){
+                enabled = false;
+            }
+        }
+
         @Override
         public float getPowerProduction(){
             return enabled ? powerProduction : 0f;
diff --git a/core/src/mindustry/world/blocks/sandbox/PowerVoid.java b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java
index e97622c609..d0a8acf4d7 100644
--- a/core/src/mindustry/world/blocks/sandbox/PowerVoid.java
+++ b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java
@@ -7,7 +7,9 @@ public class PowerVoid extends PowerBlock{
 
     public PowerVoid(String name){
         super(name);
-        consumes.power(Float.MAX_VALUE);
+        consumePower(Float.MAX_VALUE);
+        envEnabled = Env.any;
+        enableDrawStatus = false;
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index 18299cd02a..5aff273ddc 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -1,15 +1,23 @@
 package mindustry.world.blocks.storage;
 
 import arc.*;
+import arc.audio.*;
 import arc.func.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.scene.actions.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.*;
+import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -20,26 +28,37 @@ import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
-import mindustry.world.blocks.units.*;
 import mindustry.world.meta.*;
 import mindustry.world.modules.*;
 
 import static mindustry.Vars.*;
 
 public class CoreBlock extends StorageBlock{
+    public static final float cloudScaling = 1700f, cfinScl = -2f, cfinOffset = 0.3f, calphaFinOffset = 0.25f, cloudAlpha = 0.81f;
+    public static final float[] cloudAlphas = {0, 0.5f, 1f, 0.1f, 0, 0f};
+
     //hacky way to pass item modules between methods
     private static ItemModule nextItems;
+    public static final float[] thrusterSizes = {0f, 0f, 0f, 0f, 0.3f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 0f};
+
+    public @Load(value = "@-thruster1", fallback = "clear-effect") TextureRegion thruster1; //top right
+    public @Load(value = "@-thruster2", fallback = "clear-effect") TextureRegion thruster2; //bot left
+    public float thrusterLength = 14f/4f;
+    public boolean isFirstTier;
+    /** If true, this core type requires a core zone to upgrade. */
+    public boolean requiresCoreZone;
+    public boolean incinerateNonBuildable = false;
 
     public UnitType unitType = UnitTypes.alpha;
+    public float landDuration = 160f;
+    public Music landMusic = Musics.land;
+    public Music launchMusic = Musics.coreLaunch;
+    public Effect launchEffect = Fx.launch;
 
-    public final int timerResupply = timers++;
+    public Interp landZoomInterp = Interp.pow3;
+    public float landZoomFrom = 0.02f, landZoomTo = 4f;
 
-    public int launchRange = 1;
-
-    public int ammoAmount = 5;
-    public float resupplyRate = 10f;
-    public float resupplyRange = 60f;
-    public Item resupplyItem = Items.copper;
+    public float captureInvicibility = 60f * 15f;
 
     public CoreBlock(String name){
         super(name);
@@ -48,34 +67,41 @@ public class CoreBlock extends StorageBlock{
         update = true;
         hasItems = true;
         priority = TargetPriority.core;
-        flags = EnumSet.of(BlockFlag.core, BlockFlag.unitModifier);
+        flags = EnumSet.of(BlockFlag.core);
         unitCapModifier = 10;
         loopSound = Sounds.respawning;
         loopSoundVolume = 1f;
-        group = BlockGroup.none;
+        drawDisabled = false;
+        canOverdrive = false;
+        envEnabled |= Env.space;
+
+        //support everything
+        replaceable = false;
     }
 
     @Remote(called = Loc.server)
     public static void playerSpawn(Tile tile, Player player){
-        if(player == null || tile == null || !(tile.build instanceof CoreBuild entity)) return;
+        if(player == null || tile == null || !(tile.build instanceof CoreBuild core)) return;
 
-        CoreBlock block = (CoreBlock)tile.block();
-        Fx.spawn.at(entity);
+        UnitType spawnType = ((CoreBlock)core.block).unitType;
+        if(core.wasVisible){
+            Fx.spawn.at(core);
+        }
 
-        player.set(entity);
+        player.set(core);
 
         if(!net.client()){
-            Unit unit = block.unitType.create(tile.team());
-            unit.set(entity);
+            Unit unit = spawnType.create(tile.team());
+            unit.set(core);
             unit.rotation(90f);
             unit.impulse(0f, 3f);
-            unit.controller(player);
             unit.spawnedByCore(true);
+            unit.controller(player);
             unit.add();
         }
 
         if(state.isCampaign() && player == Vars.player){
-            block.unitType.unlock();
+            spawnType.unlock();
         }
     }
 
@@ -84,46 +110,82 @@ public class CoreBlock extends StorageBlock{
         super.setStats();
 
         stats.remove(Stat.buildTime);
+        stats.add(Stat.unitType, table -> {
+            table.row();
+            table.table(Styles.grayPanel, b -> {
+                b.image(unitType.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit);
+                b.table(info -> {
+                    info.add(unitType.localizedName).left();
+                    if(Core.settings.getBool("console")){
+                        info.row();
+                        info.add(unitType.name).left().color(Color.lightGray);
+                    }
+                });
+                b.button("?", Styles.flatBordert, () -> ui.content.show(unitType)).size(40f).pad(10).right().grow().visible(() -> unitType.unlockedNow());
+            }).growX().pad(5).row();
+        });
     }
 
     @Override
     public void setBars(){
         super.setBars();
 
-        bars.add("capacity", (CoreBuild e) -> new Bar(
+        addBar("capacity", (CoreBuild e) -> new Bar(
             () -> Core.bundle.format("bar.capacity", UI.formatAmount(e.storageCapacity)),
             () -> Pal.items,
-            () -> e.items.total() / ((float)e.storageCapacity * content.items().count(i -> i.unlockedNow()))
+            () -> e.items.total() / ((float)e.storageCapacity * content.items().count(UnlockableContent::unlockedNow))
         ));
     }
 
+    @Override
+    public void init(){
+        //assign to update clipSize internally
+        lightRadius = 30f + 20f * size;
+        fogRadius = Math.max(fogRadius, (int)(lightRadius / 8f * 3f) + 13);
+        emitLight = true;
+
+        super.init();
+    }
+
     @Override
     public boolean canBreak(Tile tile){
-        return false;
+        return state.isEditor();
     }
 
     @Override
     public boolean canReplace(Block other){
         //coreblocks can upgrade smaller cores
-        return super.canReplace(other) || (other instanceof CoreBlock && size > other.size);
+        return super.canReplace(other) || (other instanceof CoreBlock && size >= other.size && other != this);
     }
 
     @Override
-    public boolean canPlaceOn(Tile tile, Team team){
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
         if(tile == null) return false;
+        //in the editor, you can place them anywhere for convenience
+        if(state.isEditor()) return true;
+
         CoreBuild core = team.core();
+
+        //special floor upon which cores can be placed
+        tile.getLinkedTilesAs(this, tempTiles);
+        if(!tempTiles.contains(o -> !o.floor().allowCorePlacement || o.block() instanceof CoreBlock)){
+            return true;
+        }
+
         //must have all requirements
-        if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements))) return false;
-        return tile.block() instanceof CoreBlock && size > tile.block().size;
+        if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements, state.rules.buildCostMultiplier))) return false;
+
+        return tile.block() instanceof CoreBlock && size > tile.block().size && (!requiresCoreZone || tempTiles.allMatch(o -> o.floor().allowCorePlacement));
     }
 
     @Override
-    public void placeBegan(Tile tile, Block previous){
+    public void placeBegan(Tile tile, Block previous, Unit builder){
         //finish placement immediately when a block is replaced.
         if(previous instanceof CoreBlock){
             tile.setBlock(this, tile.team());
-            Fx.placeBlock.at(tile, tile.block().size);
-            Fx.upgradeCore.at(tile, tile.block().size);
+            tile.block().placeEffect.at(tile, tile.block().size);
+            Fx.upgradeCore.at(tile.drawx(), tile.drawy(), 0f, tile.block());
+            Fx.upgradeCoreBloom.at(tile, tile.block().size);
 
             //set up the correct items
             if(nextItems != null){
@@ -134,6 +196,8 @@ public class CoreBlock extends StorageBlock{
 
                 nextItems = null;
             }
+
+            Events.fire(new BlockBuildEndEvent(tile, builder, tile.team(), false, null));
         }
     }
 
@@ -154,21 +218,297 @@ public class CoreBlock extends StorageBlock{
     public void drawPlace(int x, int y, int rotation, boolean valid){
         if(world.tile(x, y) == null) return;
 
-        if(!canPlaceOn(world.tile(x, y), player.team())){
+        if(!canPlaceOn(world.tile(x, y), player.team(), rotation)){
 
-            drawPlaceText(Core.bundle.get((player.team().core() != null && player.team().core().items.has(requirements, state.rules.buildCostMultiplier)) || state.rules.infiniteResources ?
-                "bar.corereq" :
-                "bar.noresources"
+            drawPlaceText(Core.bundle.get(
+                isFirstTier ?
+                    //TODO better message
+                    "bar.corefloor" :
+                    (player.team().core() != null && player.team().core().items.has(requirements, state.rules.buildCostMultiplier)) || state.rules.infiniteResources ?
+                    "bar.corereq" :
+                    "bar.noresources"
             ), x, y, valid);
-
         }
     }
 
-    public class CoreBuild extends Building implements ControlBlock{
+    public class CoreBuild extends Building implements LaunchAnimator{
         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 BlockUnitc unit = Nulls.blockUnit;
         public boolean noEffect = false;
+        public Team lastDamage = Team.derelict;
+        public float iframes = -1f;
+        public float thrusterTime = 0f;
+
+        protected float cloudSeed, landParticleTimer;
+
+        @Override
+        public void draw(){
+            //draw thrusters when just landed
+            if(thrusterTime > 0){
+                float frame = thrusterTime;
+
+                Draw.alpha(1f);
+                drawThrusters(frame);
+                Draw.rect(block.region, x, y);
+                Draw.alpha(Interp.pow4In.apply(frame));
+                drawThrusters(frame);
+                Draw.reset();
+
+                drawTeamTop();
+            }else{
+                super.draw();
+            }
+        }
+
+        @Override
+        public float launchDuration(){
+            return landDuration;
+        }
+
+        @Override
+        public Music landMusic(){
+            return landMusic;
+        }
+
+        @Override
+        public Music launchMusic(){
+            return launchMusic;
+        }
+
+        @Override
+        public void beginLaunch(boolean launching){
+            cloudSeed = Mathf.random(1f);
+            if(launching){
+                Fx.coreLaunchConstruct.at(x, y, size);
+            }
+
+            if(!headless){
+                // Add fade-in and fade-out foreground when landing or launching.
+                if(renderer.isLaunching()){
+                    float margin = 30f;
+
+                    Image image = new Image();
+                    image.color.a = 0f;
+                    image.touchable = Touchable.disabled;
+                    image.setFillParent(true);
+                    image.actions(Actions.delay((launchDuration() - margin) / 60f), Actions.fadeIn(margin / 60f, Interp.pow2In), Actions.delay(6f / 60f), Actions.remove());
+                    image.update(() -> {
+                        image.toFront();
+                        ui.loadfrag.toFront();
+                        if(state.isMenu()){
+                            image.remove();
+                        }
+                    });
+                    Core.scene.add(image);
+                }else{
+                    Image image = new Image();
+                    image.color.a = 1f;
+                    image.touchable = Touchable.disabled;
+                    image.setFillParent(true);
+                    image.actions(Actions.fadeOut(35f / 60f), Actions.remove());
+                    image.update(() -> {
+                        image.toFront();
+                        ui.loadfrag.toFront();
+                        if(state.isMenu()){
+                            image.remove();
+                        }
+                    });
+                    Core.scene.add(image);
+
+                    Time.run(launchDuration(), () -> {
+                        launchEffect.at(this);
+                        Effect.shake(5f, 5f, this);
+                        thrusterTime = 1f;
+
+                        if(state.isCampaign() && Vars.showSectorLandInfo && (state.rules.sector.preset == null || state.rules.sector.preset.showSectorLandInfo)){
+                            ui.announce("[accent]" + state.rules.sector.name() + "\n" +
+                                (state.rules.sector.info.resources.any() ? "[lightgray]" + Core.bundle.get("sectors.resources") + "[white] " +
+                                    state.rules.sector.info.resources.toString(" ", UnlockableContent::emoji) : ""), 5);
+                        }
+                    });
+                }
+            }
+        }
+
+        @Override
+        public void endLaunch(){}
+
+        @Override
+        public void drawLaunch(){
+            var clouds = Core.assets.get("sprites/clouds.png", Texture.class);
+
+            float fin = renderer.getLandTimeIn();
+            float cameraScl = renderer.getDisplayScale();
+
+            float fout = 1f - fin;
+            float scl = Scl.scl(4f) / cameraScl;
+            float pfin = Interp.pow3Out.apply(fin), pf = Interp.pow2In.apply(fout);
+
+            //draw particles
+            Draw.color(Pal.lightTrail);
+            Angles.randLenVectors(1, pfin, 100, 800f * scl * pfin, (ax, ay, ffin, ffout) -> {
+                Lines.stroke(scl * ffin * pf * 3f);
+                Lines.lineAngle(x + ax, y + ay, Mathf.angle(ax, ay), (ffin * 20 + 1f) * scl);
+            });
+            Draw.color();
+
+            drawLanding(x, y);
+
+            Draw.color();
+            Draw.mixcol(Color.white, Interp.pow5In.apply(fout));
+
+            //accent tint indicating that the core was just constructed
+            if(renderer.isLaunching()){
+                float f = Mathf.clamp(1f - fout * 12f);
+                if(f > 0.001f){
+                    Draw.mixcol(Pal.accent, f);
+                }
+            }
+
+            //draw clouds
+            if(state.rules.cloudColor.a > 0.0001f){
+                float scaling = cloudScaling;
+                float sscl = Math.max(1f + Mathf.clamp(fin + cfinOffset) * cfinScl, 0f) * cameraScl;
+
+                Tmp.tr1.set(clouds);
+                Tmp.tr1.set(
+                    (Core.camera.position.x - Core.camera.width/2f * sscl) / scaling,
+                    (Core.camera.position.y - Core.camera.height/2f * sscl) / scaling,
+                    (Core.camera.position.x + Core.camera.width/2f * sscl) / scaling,
+                    (Core.camera.position.y + Core.camera.height/2f * sscl) / scaling);
+
+                Tmp.tr1.scroll(10f * cloudSeed, 10f * cloudSeed);
+
+                Draw.alpha(Mathf.sample(cloudAlphas, fin + calphaFinOffset) * cloudAlpha);
+                Draw.mixcol(state.rules.cloudColor, state.rules.cloudColor.a);
+                Draw.rect(Tmp.tr1, Core.camera.position.x, Core.camera.position.y, Core.camera.width, Core.camera.height);
+                Draw.reset();
+            }
+        }
+
+        public void drawLanding(float x, float y){
+            float fin = renderer.getLandTimeIn();
+            float fout = 1f - fin;
+
+            float scl = Scl.scl(4f) / renderer.getDisplayScale();
+            float shake = 0f;
+            float s = region.width * region.scl() * scl * 3.6f * Interp.pow2Out.apply(fout);
+            float rotation = Interp.pow2In.apply(fout) * 135f;
+            x += Mathf.range(shake);
+            y += Mathf.range(shake);
+            float thrustOpen = 0.25f;
+            float thrusterFrame = fin >= thrustOpen ? 1f : fin / thrustOpen;
+            float thrusterSize = Mathf.sample(thrusterSizes, fin);
+
+            //when launching, thrusters stay out the entire time.
+            if(renderer.isLaunching()){
+                Interp i = Interp.pow2Out;
+                thrusterFrame = i.apply(Mathf.clamp(fout*13f));
+                thrusterSize = i.apply(Mathf.clamp(fout*9f));
+            }
+
+            Draw.color(Pal.lightTrail);
+            //TODO spikier heat
+            Draw.rect("circle-shadow", x, y, s, s);
+
+            Draw.scl(scl);
+
+            //draw thruster flame
+            float strength = (1f + (size - 3)/2.5f) * scl * thrusterSize * (0.95f + Mathf.absin(2f, 0.1f));
+            float offset = (size - 3) * 3f * scl;
+
+            for(int i = 0; i < 4; i++){
+                Tmp.v1.trns(i * 90 + rotation, 1f);
+
+                Tmp.v1.setLength((size * tilesize/2f + 1f)*scl + strength*2f + offset);
+                Draw.color(team.color);
+                Fill.circle(Tmp.v1.x + x, Tmp.v1.y + y, 6f * strength);
+
+                Tmp.v1.setLength((size * tilesize/2f + 1f)*scl + strength*0.5f + offset);
+                Draw.color(Color.white);
+                Fill.circle(Tmp.v1.x + x, Tmp.v1.y + y, 3.5f * strength);
+            }
+
+            drawLandingThrusters(x, y, rotation, thrusterFrame);
+
+            Drawf.spinSprite(region, x, y, rotation);
+
+            Draw.alpha(Interp.pow4In.apply(thrusterFrame));
+            drawLandingThrusters(x, y, rotation, thrusterFrame);
+            Draw.alpha(1f);
+
+            if(teamRegions[team.id] == teamRegion) Draw.color(team.color);
+
+            Drawf.spinSprite(teamRegions[team.id], x, y, rotation);
+
+            Draw.color();
+            Draw.scl();
+            Draw.reset();
+        }
+
+        protected void drawLandingThrusters(float x, float y, float rotation, float frame){
+            float length = thrusterLength * (frame - 1f) - 1f/4f;
+            float alpha = Draw.getColorAlpha();
+
+            //two passes for consistent lighting
+            for(int j = 0; j < 2; j++){
+                for(int i = 0; i < 4; i++){
+                    var reg = i >= 2 ? thruster2 : thruster1;
+                    float rot = (i * 90) + rotation % 90f;
+                    Tmp.v1.trns(rot, length * Draw.xscl);
+
+                    //second pass applies extra layer of shading
+                    if(j == 1){
+                        Tmp.v1.rotate(-90f);
+                        Draw.alpha((rotation % 90f) / 90f * alpha);
+                        rot -= 90f;
+                        Draw.rect(reg, x + Tmp.v1.x, y + Tmp.v1.y, rot);
+                    }else{
+                        Draw.alpha(alpha);
+                        Draw.rect(reg, x + Tmp.v1.x, y + Tmp.v1.y, rot);
+                    }
+                }
+            }
+            Draw.alpha(1f);
+        }
+
+        public void drawThrusters(float frame){
+            float length = thrusterLength * (frame - 1f) - 1f/4f;
+            for(int i = 0; i < 4; i++){
+                var reg = i >= 2 ? thruster2 : thruster1;
+                float dx = Geometry.d4x[i] * length, dy = Geometry.d4y[i] * length;
+                Draw.rect(reg, x + dx, y + dy, i * 90);
+            }
+        }
+
+        @Override
+        public void damage(@Nullable Team source, float damage){
+            if(iframes > 0) return;
+
+            if(source != null && source != team){
+                lastDamage = source;
+            }
+            super.damage(source, damage);
+        }
+
+        @Override
+        public void created(){
+            super.created();
+
+            Events.fire(new CoreChangeEvent(this));
+        }
+
+        @Override
+        public void changeTeam(Team next){
+            if(this.team == next) return;
+
+            onRemoved();
+
+            super.changeTeam(next);
+
+            onProximityUpdate();
+
+            Events.fire(new CoreChangeEvent(this));
+        }
 
         @Override
         public double sense(LAccess sensor){
@@ -177,26 +517,59 @@ public class CoreBlock extends StorageBlock{
         }
 
         @Override
-        public void created(){
-            unit = (BlockUnitc)UnitTypes.block.create(team);
-            unit.tile(this);
+        public boolean canControlSelect(Unit player){
+            return player.isPlayer();
         }
 
         @Override
-        public Unit unit(){
-            return (Unit)unit;
+        public void onControlSelect(Unit unit){
+            if(!unit.isPlayer()) return;
+            Player player = unit.getPlayer();
+
+            Fx.spawn.at(player);
+            if(net.client() && player == Vars.player){
+                control.input.controlledType = null;
+            }
+
+            player.clearUnit();
+            player.deathTimer = Player.deathDelay + 1f;
+            requestSpawn(player);
         }
 
         public void requestSpawn(Player player){
+            //do not try to respawn in unsupported environments at all
+            if(!unitType.supportsEnv(state.rules.env)) return;
+
             Call.playerSpawn(tile, player);
         }
 
         @Override
         public void updateTile(){
+            iframes -= Time.delta;
+            thrusterTime -= Time.delta/90f;
+        }
 
-            //resupply nearby units
-            if(items.has(resupplyItem) && timer(timerResupply, resupplyRate) && ResupplyPoint.resupply(this, resupplyRange, ammoAmount, resupplyItem.color)){
-                items.remove(resupplyItem, 1);
+        /** @return Camera zoom while landing or launching. May optionally do other things such as setting camera position to itself. */
+        @Override
+        public float zoomLaunch(){
+            Core.camera.position.set(this);
+            return landZoomInterp.apply(Scl.scl(landZoomFrom), Scl.scl(landZoomTo), renderer.getLandTimeIn());
+        }
+
+        @Override
+        public void updateLaunch(){
+            float in = renderer.getLandTimeIn() * launchDuration();
+            float tsize = Mathf.sample(thrusterSizes, (in + 35f) / launchDuration());
+
+            landParticleTimer += tsize * Time.delta;
+            if(landParticleTimer >= 1f){
+                tile.getLinkedTiles(t -> {
+                    if(Mathf.chance(0.4f)){
+                        Fx.coreLandDust.at(t.worldx(), t.worldy(), angleTo(t.worldx(), t.worldy()) + Mathf.range(30f), Tmp.c1.set(t.floor().mapColor).mul(1.5f + Mathf.range(0.15f)));
+                    }
+                });
+
+                landParticleTimer = 0f;
             }
         }
 
@@ -208,10 +581,16 @@ public class CoreBlock extends StorageBlock{
 
         @Override
         public void onDestroyed(){
-            super.onDestroyed();
+            if(state.rules.coreCapture){
+                //just create an explosion, no fire. this prevents immediate recapture
+                Damage.dynamicExplosion(x, y, 0, 0, 0, tilesize * block.size / 2f, state.rules.damageExplosions);
+                Fx.commandSend.at(x, y, 140f);
+            }else{
+                super.onDestroyed();
+            }
 
             //add a spawn to the map for future reference - waves should be disabled, so it shouldn't matter
-            if(state.isCampaign() && team == state.rules.waveTeam && team.cores().size <= 1){
+            if(state.isCampaign() && team == state.rules.waveTeam && team.cores().size <= 1 && state.rules.sector.planet.enemyCoreSpawnReplace){
                 //do not recache
                 tile.setOverlayQuiet(Blocks.spawn);
 
@@ -219,11 +598,32 @@ public class CoreBlock extends StorageBlock{
                     spawner.getSpawns().add(tile);
                 }
             }
+
+            Events.fire(new CoreChangeEvent(this));
+        }
+
+        @Override
+        public void afterDestroyed(){
+            super.afterDestroyed();
+            if(state.rules.coreCapture){
+                if(!net.client()){
+                    tile.setBlock(block, lastDamage);
+                }
+
+                //delay so clients don't destroy it afterwards
+                Core.app.post(() -> tile.setNet(block, lastDamage, 0));
+
+                //building does not exist on client yet
+                if(!net.client()){
+                    //core is invincible for several seconds to prevent recapture
+                    ((CoreBuild)tile.build).iframes = captureInvicibility;
+                }
+            }
         }
 
         @Override
         public void drawLight(){
-            Drawf.light(team, x, y, 30f + 20f * size, Pal.accent, 0.65f + Mathf.absin(20f, 0.1f));
+            Drawf.light(x, y, lightRadius, Pal.accent, 0.65f + Mathf.absin(20f, 0.1f));
         }
 
         @Override
@@ -233,11 +633,13 @@ public class CoreBlock extends StorageBlock{
 
         @Override
         public int getMaximumAccepted(Item item){
-            return incinerate() ? storageCapacity * 2 : storageCapacity;
+            return state.rules.coreIncinerates ? storageCapacity * 20 : storageCapacity;
         }
 
         @Override
         public void onProximityUpdate(){
+            super.onProximityUpdate();
+
             for(Building other : state.teams.cores(team)){
                 if(other.tile() != tile){
                     this.items = other.items;
@@ -246,7 +648,7 @@ public class CoreBlock extends StorageBlock{
             state.teams.registerCore(this);
 
             storageCapacity = itemCapacity + proximity().sum(e -> owns(e) ? e.block.itemCapacity : 0);
-            proximity.each(e -> owns(e), t -> {
+            proximity.each(this::owns, t -> {
                 t.items = items;
                 ((StorageBuild)t).linkedCore = this;
             });
@@ -270,13 +672,16 @@ public class CoreBlock extends StorageBlock{
 
         @Override
         public void handleStack(Item item, int amount, Teamc source){
-            int realAmount = Math.min(amount, storageCapacity - items.get(item));
+            boolean incinerate = incinerateNonBuildable && !item.buildable;
+            int realAmount = incinerate ? 0 : Math.min(amount, storageCapacity - items.get(item));
             super.handleStack(item, realAmount, source);
 
             if(team == state.rules.defaultTeam && state.isCampaign()){
-                state.rules.sector.info.handleCoreItem(item, amount);
+                if(!incinerate){
+                    state.rules.sector.info.handleCoreItem(item, amount);
+                }
 
-                if(realAmount == 0){
+                if(realAmount == 0 && wasVisible){
                     Fx.coreBurn.at(x, y);
                 }
             }
@@ -295,18 +700,21 @@ public class CoreBlock extends StorageBlock{
 
         @Override
         public void drawSelect(){
+            //do not draw a pointless single outline when there's no storage
+            if(team.cores().size <= 1 && !proximity.contains(storage -> storage.items == items)) return;
+
             Lines.stroke(1f, Pal.accent);
-            Cons<Building> outline = t -> {
+            Cons<Building> outline = b -> {
                 for(int i = 0; i < 4; i++){
                     Point2 p = Geometry.d8edge[i];
-                    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);
+                    float offset = -Math.max(b.block.size - 1, 0) / 2f * tilesize;
+                    Draw.rect("block-select", b.x + offset * p.x, b.y + offset * p.y, i * 90);
                 }
             };
-            if(proximity.contains(e -> owns(e) && e.items == items)){
-                outline.get(this);
-            }
-            proximity.each(e -> owns(e) && e.items == items, outline);
+            team.cores().each(core -> {
+                outline.get(core);
+                core.proximity.each(storage -> storage.items == items, outline);
+            });
             Draw.reset();
         }
 
@@ -315,42 +723,32 @@ public class CoreBlock extends StorageBlock{
         }
 
         public boolean owns(Building core, Building tile){
-            return tile instanceof StorageBuild b && (b.linkedCore == core || b.linkedCore == null);
-        }
-
-        public boolean incinerate(){
-            return state.isCampaign();
+            return tile instanceof StorageBuild b && ((StorageBlock)b.block).coreMerge && (b.linkedCore == core || b.linkedCore == null);
         }
 
         @Override
-        public float handleDamage(float amount){
+        public void damage(float amount){
             if(player != null && team == player.team()){
                 Events.fire(Trigger.teamCoreDamage);
             }
-            return amount;
+            super.damage(amount);
         }
 
         @Override
         public void onRemoved(){
-            int total = proximity.count(e -> e.items != null && e.items == items);
-            float fract = 1f / total / state.teams.cores(team).size;
+            int totalCapacity = proximity.sum(e -> e.items != null && e.items == items ? e.block.itemCapacity : 0);
 
             proximity.each(e -> owns(e) && e.items == items && owns(e), t -> {
                 StorageBuild ent = (StorageBuild)t;
                 ent.linkedCore = null;
                 ent.items = new ItemModule();
                 for(Item item : content.items()){
-                    ent.items.set(item, (int)(fract * items.get(item)));
+                    ent.items.set(item, (int)Math.min(ent.block.itemCapacity, items.get(item) * (float)ent.block.itemCapacity / totalCapacity));
                 }
             });
 
             state.teams.unregisterCore(this);
 
-            int max = itemCapacity * state.teams.cores(team).size;
-            for(Item item : content.items()){
-                items.set(item, Math.min(items.get(item), max));
-            }
-
             for(CoreBuild other : state.teams.cores(team)){
                 other.onProximityUpdate();
             }
@@ -372,12 +770,18 @@ public class CoreBlock extends StorageBlock{
 
         @Override
         public void handleItem(Building source, Item item){
+            boolean incinerate = incinerateNonBuildable && !item.buildable;
+
+            if(team == state.rules.defaultTeam){
+                state.stats.coreItemCount.increment(item);
+            }
+
             if(net.server() || !net.active()){
-                if(team == state.rules.defaultTeam && state.isCampaign()){
+                if(team == state.rules.defaultTeam && state.isCampaign() && !incinerate){
                     state.rules.sector.info.handleCoreItem(item, 1);
                 }
 
-                if(items.get(item) >= storageCapacity){
+                if(items.get(item) >= storageCapacity || incinerate){
                     //create item incineration effect at random intervals
                     if(!noEffect){
                         incinerateEffect(this, source);
@@ -386,13 +790,10 @@ public class CoreBlock extends StorageBlock{
                 }else{
                     super.handleItem(source, item);
                 }
-            }else if(incinerate()){
-                if(items.get(item) >= storageCapacity){
-                    //create item incineration effect at random intervals
-                    if(!noEffect){
-                        incinerateEffect(this, source);
-                    }
-                }
+            }else if(((state.rules.coreIncinerates && items.get(item) >= storageCapacity) || incinerate) && !noEffect){
+                //create item incineration effect at random intervals
+                incinerateEffect(this, source);
+                noEffect = false;
             }
         }
     }
diff --git a/core/src/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java
index 1ead7b97ab..31d0666b14 100644
--- a/core/src/mindustry/world/blocks/storage/StorageBlock.java
+++ b/core/src/mindustry/world/blocks/storage/StorageBlock.java
@@ -5,6 +5,7 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
@@ -13,6 +14,7 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class StorageBlock extends Block{
+    public boolean coreMerge = true;
 
     public StorageBlock(String name){
         super(name);
@@ -20,7 +22,11 @@ public class StorageBlock extends Block{
         solid = true;
         update = false;
         destructible = true;
-        group = BlockGroup.storage;
+        separateItemCapacity = true;
+        group = BlockGroup.transportation;
+        flags = EnumSet.of(BlockFlag.storage);
+        allowResupply = true;
+        envEnabled = Env.any;
     }
 
     @Override
@@ -32,14 +38,14 @@ public class StorageBlock extends Block{
         if(Mathf.chance(0.3)){
             Tile edge = Edges.getFacingEdge(source, self);
             Tile edge2 = Edges.getFacingEdge(self, source);
-            if(edge != null && edge2 != null){
+            if(edge != null && edge2 != null && self.wasVisible){
                 Fx.coreBurn.at((edge.worldx() + edge2.worldx())/2f, (edge.worldy() + edge2.worldy())/2f);
             }
         }
     }
 
     public class StorageBuild extends Building{
-        protected @Nullable Building linkedCore;
+        public @Nullable Building linkedCore;
 
         @Override
         public boolean acceptItem(Building source, Item item){
@@ -79,7 +85,13 @@ public class StorageBlock extends Block{
 
         @Override
         public int getMaximumAccepted(Item item){
-            return itemCapacity;
+            return linkedCore != null ? linkedCore.getMaximumAccepted(item) : itemCapacity;
+        }
+
+        @Override
+        public int explosionItemCap(){
+            //when linked to a core, containers/vaults are made significantly less explosive.
+            return linkedCore != null ? Math.min(itemCapacity/60, 6) : itemCapacity;
         }
 
         @Override
@@ -89,6 +101,12 @@ public class StorageBlock extends Block{
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.itemCapacity && linkedCore != null) return linkedCore.sense(sensor);
+            return super.sense(sensor);
+        }
+
         @Override
         public void overwrote(Seq<Building> previous){
             //only add prev items when core is not linked
diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java
index e040153828..08a9880162 100644
--- a/core/src/mindustry/world/blocks/storage/Unloader.java
+++ b/core/src/mindustry/world/blocks/storage/Unloader.java
@@ -3,19 +3,30 @@ package mindustry.world.blocks.storage;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
+import arc.util.pooling.*;
+import arc.util.pooling.Pool.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
+
+import java.util.*;
 
 import static mindustry.Vars.*;
 
 public class Unloader extends Block{
+    public @Load(value = "@-center", fallback = "unloader-center") TextureRegion centerRegion;
+
     public float speed = 1f;
-    public final int timerUnload = timers++;
+
+    /** Cached result of content.items() */
+    static Item[] allItems;
 
     public Unloader(String name){
         super(name);
@@ -27,6 +38,7 @@ public class Unloader extends Block{
         saveConfig = true;
         itemCapacity = 0;
         noUpdateDisabled = true;
+        clearOnDoubleTap = true;
         unloadable = false;
 
         config(Item.class, (UnloaderBuild tile, Item item) -> tile.sortItem = item);
@@ -34,60 +46,181 @@ public class Unloader extends Block{
     }
 
     @Override
-    public void drawRequestConfig(BuildPlan req, Eachable<BuildPlan> list){
-        drawRequestConfigCenter(req, req.config, "unloader-center");
+    public void init(){
+        super.init();
+
+        allItems = content.items().toArray(Item.class);
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+        stats.add(Stat.speed, 60f / speed, StatUnit.itemsSecond);
+    }
+
+    @Override
+    public void drawPlanConfig(BuildPlan plan, Eachable<BuildPlan> list){
+        drawPlanConfigCenter(plan, plan.config, "unloader-center");
     }
 
     @Override
     public void setBars(){
         super.setBars();
-        bars.remove("items");
+        removeBar("items");
+    }
+
+    public static class ContainerStat implements Poolable{
+        Building building;
+        float loadFactor;
+        boolean canLoad;
+        boolean canUnload;
+        /** Cached !(building instanceof StorageBuild) */
+        boolean notStorage;
+        int lastUsed;
+
+        @Override
+        public void reset(){
+            building = null;
+        }
     }
 
     public class UnloaderBuild extends Building{
+        public float unloadTimer = 0f;
+        public int rotations = 0;
         public Item sortItem = null;
-        public Building dumpingTo;
-        public int offset = 0;
-        public int[] rotations;
+        public ContainerStat dumpingFrom, dumpingTo;
+        public final Seq<ContainerStat> possibleBlocks = new Seq<>(ContainerStat.class);
+
+        protected final Comparator<ContainerStat> comparator = (x, y) -> {
+            //sort so it gives priority for blocks that can only either receive or give (not both), and then by load, and then by last use
+            //highest = unload from, lowest = unload to
+            int unloadPriority = Boolean.compare(x.canUnload && !x.canLoad, y.canUnload && !y.canLoad); //priority to receive if it cannot give
+            if(unloadPriority != 0) return unloadPriority;
+            int loadPriority = Boolean.compare(x.canUnload || !x.canLoad, y.canUnload || !y.canLoad); //priority to give if it cannot receive
+            if(loadPriority != 0) return loadPriority;
+            int loadFactor = Float.compare(x.loadFactor, y.loadFactor);
+            if(loadFactor != 0) return loadFactor;
+            return Integer.compare(y.lastUsed, x.lastUsed); //inverted
+        };
+
+        private boolean isPossibleItem(Item item){
+            boolean hasProvider = false,
+            hasReceiver = false,
+            isDistinct = false;
+
+            var pbi = possibleBlocks.items;
+            for(int i = 0, l = possibleBlocks.size; i < l; i++){
+                var pb = pbi[i];
+                var other = pb.building;
+
+                //set the stats of buildings in possibleBlocks while we are at it
+                pb.canLoad = pb.notStorage && other.acceptItem(this, item);
+                pb.canUnload = other.canUnload() && other.items != null && other.items.has(item);
+
+                //thats also handling framerate issues and slow conveyor belts, to avoid skipping items if nulloader
+                isDistinct |= (hasProvider && pb.canLoad) || (hasReceiver && pb.canUnload);
+                hasProvider |= pb.canUnload;
+                hasReceiver |= pb.canLoad;
+            }
+            return isDistinct;
+        }
+
+        @Override
+        public void onProximityUpdate(){
+            //filter all blocks in the proximity that will never be able to trade items
+
+            super.onProximityUpdate();
+            Pools.freeAll(possibleBlocks, true);
+            possibleBlocks.clear();
+
+            for(int i = 0; i < proximity.size; i++){
+                var other = proximity.get(i);
+                if(!other.interactable(team)) continue; //avoid blocks of the wrong team
+
+                //partial check
+                boolean canLoad = !(other.block instanceof StorageBlock);
+                boolean canUnload = other.canUnload() && other.items != null;
+
+                if(canLoad || canUnload){ //avoid blocks that can neither give nor receive items
+                    var pb = Pools.obtain(ContainerStat.class, ContainerStat::new);
+                    pb.building = other;
+                    pb.notStorage = canLoad;
+                    //TODO store the partial canLoad/canUnload?
+                    possibleBlocks.add(pb);
+                }
+            }
+        }
 
         @Override
         public void updateTile(){
-            if(timer(timerUnload, speed / timeScale())){
-                if(rotations == null || rotations.length != proximity.size){
-                    rotations = new int[proximity.size];
+            if(((unloadTimer += delta()) < speed) || (possibleBlocks.size < 2)) return;
+            Item item = null;
+            boolean any = false;
+
+            if(sortItem != null){
+                if(isPossibleItem(sortItem)) item = sortItem;
+            }else{
+                //selects the next item for nulloaders
+                //inspired of nextIndex() but for all "proximity" (possibleBlocks) at once, and also way more powerful
+                for(int i = 0, l = allItems.length; i < l; i++){
+                    int id = (rotations + i + 1) % l;
+                    var possibleItem = allItems[id];
+
+                    if(isPossibleItem(possibleItem)){
+                        item = possibleItem;
+                        break;
+                    }
+                }
+            }
+
+            if(item != null){
+                rotations = item.id; //next rotation for nulloaders //TODO maybe if(sortItem == null)
+                var pbi = possibleBlocks.items;
+                int pbs = possibleBlocks.size;
+
+                for(int i = 0; i < pbs; i++){
+                    var pb = pbi[i];
+                    var other = pb.building;
+                    int maxAccepted = other.getMaximumAccepted(item);
+                    pb.loadFactor = maxAccepted == 0 || other.items == null ? 0 : other.items.get(item) / (float)maxAccepted;
+                    pb.lastUsed = (pb.lastUsed + 1) % Integer.MAX_VALUE; //increment the priority if not used
                 }
 
-                for(int i = 0; i < proximity.size; i++){
-                    int pos = (offset + i) % proximity.size;
-                    var other = proximity.get(pos);
+                possibleBlocks.sort(comparator);
 
-                    if(other.interactable(team) && other.block.unloadable && other.canUnload() && 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;
+                dumpingTo = null;
+                dumpingFrom = null;
 
-                        //get item to be taken
-                        Item item = sortItem == null ? other.items.takeIndex(rotations[pos]) : sortItem;
-
-                        //remove item if it's dumped correctly
-                        if(put(item)){
-                            other.items.remove(item, 1);
-
-                            if(sortItem == null){
-                                rotations[pos] = item.id + 1;
-                            }
-
-                            other.itemTaken(item);
-                        }else if(sortItem == null){
-                            rotations[pos] = other.items.nextIndex(rotations[pos]);
-                        }
+                //choose the building to accept the item
+                for(int i = 0; i < pbs; i++){
+                    if(pbi[i].canLoad){
+                        dumpingTo = pbi[i];
+                        break;
                     }
                 }
 
-                if(proximity.size > 0){
-                    offset ++;
-                    offset %= proximity.size;
+                //choose the building to take the item from
+                for(int i = pbs - 1; i >= 0; i--){
+                    if(pbi[i].canUnload){
+                        dumpingFrom = pbi[i];
+                        break;
+                    }
                 }
+
+                //trade the items
+                if(dumpingFrom != null && dumpingTo != null && (dumpingFrom.loadFactor != dumpingTo.loadFactor || !dumpingFrom.canLoad)){
+                    dumpingTo.building.handleItem(this, item);
+                    dumpingFrom.building.removeStack(item, 1);
+                    dumpingTo.lastUsed = 0;
+                    dumpingFrom.lastUsed = 0;
+                    any = true;
+                }
+            }
+
+            if(any){
+                unloadTimer %= speed;
+            }else{
+                unloadTimer = Math.min(unloadTimer, speed);
             }
         }
 
@@ -96,29 +229,13 @@ public class Unloader extends Block{
             super.draw();
 
             Draw.color(sortItem == null ? Color.clear : sortItem.color);
-            Draw.rect("unloader-center", x, y);
+            Draw.rect(centerRegion, x, y);
             Draw.color();
         }
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> sortItem, this::configure);
-        }
-
-        @Override
-        public boolean onConfigureTileTapped(Building other){
-            if(this == other){
-                deselect();
-                configure(null);
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public boolean canDump(Building to, Item item){
-            return !(to.block instanceof StorageBlock) && to != dumpingTo;
+            ItemSelection.buildTable(Unloader.this, table, content.items(), () -> sortItem, this::configure, selectionRows, selectionColumns);
         }
 
         @Override
@@ -141,7 +258,7 @@ public class Unloader extends Block{
         public void read(Reads read, byte revision){
             super.read(read, revision);
             int id = revision == 1 ? read.s() : read.b();
-            sortItem = id == -1 ? null : content.items().get(id);
+            sortItem = id == -1 ? null : content.item(id);
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java
deleted file mode 100644
index a564f4dc07..0000000000
--- a/core/src/mindustry/world/blocks/units/CommandCenter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package mindustry.world.blocks.units;
-
-import arc.*;
-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.game.EventType.*;
-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);
-            Events.fire(new CommandIssueEvent(build, command));
-        });
-    }
-
-    @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()];
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/units/DroneCenter.java b/core/src/mindustry/world/blocks/units/DroneCenter.java
new file mode 100644
index 0000000000..c6a5c35efd
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/DroneCenter.java
@@ -0,0 +1,166 @@
+package mindustry.world.blocks.units;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+//TODO remove
+public class DroneCenter extends Block{
+    public int unitsSpawned = 4;
+    public UnitType droneType;
+    public StatusEffect status = StatusEffects.overdrive;
+    public float droneConstructTime = 60f * 3f;
+    public float statusDuration = 60f * 2f;
+    public float droneRange = 50f;
+
+    public DroneCenter(String name){
+        super(name);
+
+        update = solid = true;
+        configurable = true;
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        droneType.aiController = EffectDroneAI::new;
+    }
+
+    public class DroneCenterBuild extends Building{
+        protected IntSeq readUnits = new IntSeq();
+        protected int readTarget = -1;
+
+        public Seq<Unit> units = new Seq<>();
+        public @Nullable Unit target;
+        public float droneProgress, droneWarmup, totalDroneProgress;
+
+        @Override
+        public void updateTile(){
+            if(!readUnits.isEmpty()){
+                units.clear();
+                readUnits.each(i -> {
+                    var unit = Groups.unit.getByID(i);
+                    if(unit != null){
+                        units.add(unit);
+                    }
+                });
+                readUnits.clear();
+            }
+
+            units.removeAll(u -> !u.isAdded() || u.dead);
+
+            droneWarmup = Mathf.lerpDelta(droneWarmup, units.size < unitsSpawned ? efficiency : 0f, 0.1f);
+            totalDroneProgress += droneWarmup * Time.delta;
+
+            if(readTarget != 0){
+                target = Groups.unit.getByID(readTarget);
+                readTarget = 0;
+            }
+
+            //TODO better effects?
+            if(units.size < unitsSpawned && (droneProgress += edelta() / droneConstructTime) >= 1f){
+                var unit = droneType.create(team);
+                if(unit instanceof BuildingTetherc bt){
+                    bt.building(this);
+                }
+                unit.set(x, y);
+                unit.rotation = 90f;
+                unit.add();
+
+                Fx.spawn.at(unit);
+                units.add(unit);
+                droneProgress = 0f;
+            }
+
+            if(target != null && !target.isValid()){
+                target = null;
+            }
+
+            //TODO no autotarget, bad
+            if(target == null){
+                target = Units.closest(team, x, y, u -> !u.spawnedByCore && u.type != droneType);
+            }
+        }
+
+        @Override
+        public void drawConfigure(){
+            Drawf.square(x, y, tile.block().size * tilesize / 2f + 1f + Mathf.absin(Time.time, 4f, 1f));
+
+            if(target != null){
+                Drawf.square(target.x, target.y, target.hitSize * 0.8f);
+            }
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            //TODO draw more stuff
+
+            if(droneWarmup > 0){
+                Draw.draw(Layer.blockOver + 0.2f, () -> {
+                    Drawf.construct(this, droneType.fullIcon, Pal.accent, 0f, droneProgress, droneWarmup, totalDroneProgress, 14f);
+                });
+            }
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.i(target == null ? -1 : target.id);
+
+            write.s(units.size);
+            for(var unit : units){
+                write.i(unit.id);
+            }
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            readTarget = read.i();
+
+            int count = read.s();
+            readUnits.clear();
+            for(int i = 0; i < count; i++){
+                readUnits.add(read.i());
+            }
+        }
+    }
+
+    public class EffectDroneAI extends AIController{
+
+        @Override
+        public void updateUnit(){
+            if(!(unit instanceof BuildingTetherc tether)) return;
+            if(!(tether.building() instanceof DroneCenterBuild build)) return;
+            if(build.target == null) return;
+
+            target = build.target;
+
+            //TODO what angle?
+            moveTo(target, build.target.hitSize / 1.8f + droneRange - 10f);
+
+            unit.lookAt(target);
+
+            //TODO low power? status effects may not be the best way to do this...
+            if(unit.within(target, droneRange + build.target.hitSize)){
+                build.target.apply(status, statusDuration);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java
index 3f65908068..8c243d878c 100644
--- a/core/src/mindustry/world/blocks/units/Reconstructor.java
+++ b/core/src/mindustry/world/blocks/units/Reconstructor.java
@@ -1,18 +1,26 @@
 package mindustry.world.blocks.units;
 
 import arc.*;
+import arc.Graphics.*;
+import arc.Graphics.Cursor.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
+import mindustry.ai.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.payloads.*;
@@ -24,18 +32,25 @@ import static mindustry.Vars.*;
 public class Reconstructor extends UnitBlock{
     public float constructTime = 60 * 2;
     public Seq<UnitType[]> upgrades = new Seq<>();
-    public int[] capacities;
+    public int[] capacities = {};
 
     public Reconstructor(String name){
         super(name);
+        regionRotated1 = 1;
+        regionRotated2 = 2;
+        commandable = true;
+        ambientSound = Sounds.respawning;
+        configurable = true;
+        config(UnitCommand.class, (ReconstructorBuild build, UnitCommand command) -> build.command = command);
+        configClear((ReconstructorBuild build) -> build.command = null);
     }
 
     @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        Draw.rect(region, req.drawx(), req.drawy());
-        Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90);
-        Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
-        Draw.rect(topRegion, req.drawx(), req.drawy());
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(inRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
     }
 
     @Override
@@ -47,37 +62,55 @@ public class Reconstructor extends UnitBlock{
     public void setBars(){
         super.setBars();
 
-        bars.add("progress", (ReconstructorBuild entity) -> new Bar("bar.progress", Pal.ammo, entity::fraction));
-        bars.add("units", (ReconstructorBuild e) ->
+        addBar("progress", (ReconstructorBuild entity) -> new Bar("bar.progress", Pal.ammo, entity::fraction));
+        addBar("units", (ReconstructorBuild e) ->
         new Bar(
             () -> e.unit() == null ? "[lightgray]" + Iconc.cancel :
                 Core.bundle.format("bar.unitcap",
-                Fonts.getUnicodeStr(e.unit().name),
-                e.team.data().countType(e.unit()),
-                Units.getCap(e.team)
-            ),
+                    Fonts.getUnicodeStr(e.unit().name),
+                    e.team.data().countType(e.unit()),
+                    e.unit() == null || e.unit().useUnitCap ? Units.getStringCap(e.team) : "∞"
+                ),
             () -> Pal.power,
-            () -> e.unit() == null ? 0f : (float)e.team.data().countType(e.unit()) / Units.getCap(e.team)
+            () -> e.unit() == null ? 0f : (e.unit().useUnitCap ? (float)e.team.data().countType(e.unit()) / Units.getCap(e.team) : 1f)
         ));
     }
 
     @Override
     public void setStats(){
+        stats.timePeriod = constructTime;
         super.setStats();
 
         stats.add(Stat.productionTime, constructTime / 60f, StatUnit.seconds);
         stats.add(Stat.output, table -> {
             table.row();
             for(var upgrade : upgrades){
-                float size = 8 * 3;
                 if(upgrade[0].unlockedNow() && upgrade[1].unlockedNow()){
-                    table.image(upgrade[0].icon(Cicon.small)).size(size).padRight(4).padLeft(10).scaling(Scaling.fit).right();
-                    table.add(upgrade[0].localizedName).left();
+                    table.table(Styles.grayPanel, t -> {
+                        t.left();
 
-                    table.add("[lightgray] -> ");
+                        t.image(upgrade[0].uiIcon).size(40).pad(10f).left().scaling(Scaling.fit).with(i -> StatValues.withTooltip(i, upgrade[0]));
+                        t.table(info -> {
+                            info.add(upgrade[0].localizedName).left();
+                            info.row();
+                        }).pad(10).left();
+                    }).fill().padTop(5).padBottom(5);
+
+                    table.table(Styles.grayPanel, t -> {
+
+                        t.image(Icon.right).color(Pal.darkishGray).size(40).pad(10f);
+                    }).fill().padTop(5).padBottom(5);
+
+                    table.table(Styles.grayPanel, t -> {
+                        t.left();
+
+                        t.image(upgrade[1].uiIcon).size(40).pad(10f).right().scaling(Scaling.fit).with(i -> StatValues.withTooltip(i, upgrade[1]));
+                        t.table(info -> {
+                            info.add(upgrade[1].localizedName).right();
+                            info.row();
+                        }).pad(10).right();
+                    }).fill().padTop(5).padBottom(5);
 
-                    table.image(upgrade[1].icon(Cicon.small)).size(size).padRight(4).scaling(Scaling.fit);
-                    table.add(upgrade[1].localizedName).left();
                     table.row();
                 }
             }
@@ -87,33 +120,126 @@ public class Reconstructor extends UnitBlock{
     @Override
     public void init(){
         capacities = new int[Vars.content.items().size];
-        if(consumes.has(ConsumeType.item) && consumes.get(ConsumeType.item) instanceof ConsumeItems){
-            for(ItemStack stack : consumes.<ConsumeItems>get(ConsumeType.item).items){
+
+        ConsumeItems cons = findConsumer(c -> c instanceof ConsumeItems);
+        if(cons != null){
+            for(ItemStack stack : cons.items){
                 capacities[stack.item.id] = Math.max(capacities[stack.item.id], stack.amount * 2);
                 itemCapacity = Math.max(itemCapacity, stack.amount * 2);
             }
         }
 
+        consumeBuilder.each(c -> c.multiplier = b -> state.rules.unitCost(b.team));
+
         super.init();
     }
 
+    public void addUpgrade(UnitType from, UnitType to){
+        upgrades.add(new UnitType[]{from, to});
+    }
+
     public class ReconstructorBuild extends UnitBuild{
+        public @Nullable Vec2 commandPos;
+        public @Nullable UnitCommand command;
 
         public float fraction(){
             return progress / constructTime;
         }
 
+        @Override
+        public boolean shouldActiveSound(){
+            return shouldConsume();
+        }
+
+        @Override
+        public Vec2 getCommandPosition(){
+            return commandPos;
+        }
+
+        @Override
+        public void onCommand(Vec2 target){
+            commandPos = target;
+        }
+
+        @Override
+        public boolean acceptUnitPayload(Unit unit){
+            return hasUpgrade(unit.type) && !upgrade(unit.type).isBanned();
+        }
+
+        public boolean canSetCommand(){
+            var output = unit();
+            return output != null && output.commands.size > 1 && output.allowChangeCommands;
+        }
+
+        @Override
+        public Cursor getCursor(){
+            return canSetCommand() ? super.getCursor() : SystemCursor.arrow;
+        }
+
+        @Override
+        public boolean shouldShowConfigure(Player player){
+            return canSetCommand();
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            var unit = unit();
+
+            if(unit == null){
+                deselect();
+                return;
+            }
+
+            var group = new ButtonGroup<ImageButton>();
+            group.setMinCheckCount(0);
+            int i = 0, columns = 4;
+
+            table.background(Styles.black6);
+
+            var list = unit().commands;
+            for(var item : list){
+                ImageButton button = table.button(item.getIcon(), Styles.clearNoneTogglei, 40f, () -> {
+                    configure(item);
+                    deselect();
+                }).tooltip(item.localized()).group(group).get();
+
+                button.update(() -> button.setChecked(command == item || (command == null && unit.defaultCommand == item)));
+
+                if(++i % columns == 0){
+                    table.row();
+                }
+            }
+        }
+
         @Override
         public boolean acceptPayload(Building source, Payload payload){
-            return this.payload == null
-                && relativeTo(source) != rotation
-                && payload instanceof UnitPayload
-                && hasUpgrade(((UnitPayload)payload).unit.type);
+            if(!(this.payload == null
+            && (this.enabled || source == this)
+            && relativeTo(source) != rotation
+            && payload instanceof UnitPayload pay)){
+                return false;
+            }
+
+            var upgrade = upgrade(pay.unit.type);
+
+            if(upgrade != null){
+                if(!upgrade.unlockedNowHost() && !team.isAI()){
+                    //flash "not researched"
+                    pay.showOverlay(Icon.tree);
+                }
+
+                if(upgrade.isBanned()){
+                    //flash an X, meaning 'banned'
+                    pay.showOverlay(Icon.cancel);
+                }
+            }
+
+            return upgrade != null && (team.isAI() || upgrade.unlockedNowHost()) && !upgrade.isBanned();
         }
 
         @Override
         public int getMaximumAccepted(Item item){
-            return capacities[item.id];
+            return Mathf.round(capacities[item.id] * state.rules.unitCost(team));
         }
 
         @Override
@@ -142,13 +268,12 @@ public class Reconstructor extends UnitBlock{
             if(constructing() && hasArrived()){
                 Draw.draw(Layer.blockOver, () -> {
                     Draw.alpha(1f - progress/ constructTime);
-                    Draw.rect(payload.unit.type.icon(Cicon.full), x, y, rotdeg() - 90);
+                    Draw.rect(payload.unit.type.fullIcon, x, y, payload.rotation() - 90);
                     Draw.reset();
-                    Drawf.construct(this, upgrade(payload.unit.type), rotdeg() - 90f, progress / constructTime, speedScl, time);
+                    Drawf.construct(this, upgrade(payload.unit.type), payload.rotation() - 90f, progress / constructTime, speedScl, time);
                 });
             }else{
                 Draw.z(Layer.blockOver);
-                payRotation = rotdeg();
 
                 drawPayload();
             }
@@ -157,6 +282,12 @@ public class Reconstructor extends UnitBlock{
             Draw.rect(topRegion, x, y);
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            if(sensor == LAccess.config) return unit();
+            return super.senseObject(sensor);
+        }
+
         @Override
         public void updateTile(){
             boolean valid = false;
@@ -167,38 +298,59 @@ public class Reconstructor extends UnitBlock{
                     moveOutPayload();
                 }else{ //update progress
                     if(moveInPayload()){
-                        if(consValid()){
+                        if(efficiency > 0){
                             valid = true;
-                            progress += edelta() * state.rules.unitBuildSpeedMultiplier;
+                            progress += edelta() * state.rules.unitBuildSpeed(team);
                         }
 
                         //upgrade the unit
                         if(progress >= constructTime){
                             payload.unit = upgrade(payload.unit.type).create(payload.unit.team());
-                            progress = 0;
+
+                            if(payload.unit.isCommandable()){
+                                if(commandPos != null){
+                                    payload.unit.command().commandPosition(commandPos);
+                                }
+                                //this already checks if it is a valid command for the unit type
+                                payload.unit.command().command(command == null && payload.unit.type.defaultCommand != null ? payload.unit.type.defaultCommand : command);
+                            }
+
+                            progress %= 1f;
                             Effect.shake(2f, 3f, this);
                             Fx.producesmoke.at(this);
                             consume();
-                            Events.fire(new UnitCreateEvent(payload.unit));
+                            Events.fire(new UnitCreateEvent(payload.unit, this));
                         }
                     }
                 }
             }
 
             speedScl = Mathf.lerpDelta(speedScl, Mathf.num(valid), 0.05f);
-            time += edelta() * speedScl * state.rules.unitBuildSpeedMultiplier;
+            time += edelta() * speedScl * state.rules.unitBuildSpeed(team);
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return Mathf.clamp(fraction());
+            if(sensor == LAccess.itemCapacity) return Mathf.round(itemCapacity * state.rules.unitCost(team));
+            return super.sense(sensor);
         }
 
         @Override
         public boolean shouldConsume(){
-            return constructing();
+            return constructing() && enabled;
+        }
+
+        @Override
+        public Object config(){
+            return command;
         }
 
         public UnitType unit(){
             if(payload == null) return null;
 
             UnitType t = upgrade(payload.unit.type);
-            return t != null && t.unlockedNow() ? t : null;
+            return t != null && (t.unlockedNowHost() || team.isAI()) ? t : null;
         }
 
         public boolean constructing(){
@@ -207,7 +359,7 @@ public class Reconstructor extends UnitBlock{
 
         public boolean hasUpgrade(UnitType type){
             UnitType t = upgrade(type);
-            return t != null && t.unlockedNow();
+            return t != null && (t.unlockedNowHost() || team.isAI()) && !type.isBanned();
         }
 
         public UnitType upgrade(UnitType type){
@@ -217,7 +369,7 @@ public class Reconstructor extends UnitBlock{
 
         @Override
         public byte version(){
-            return 1;
+            return 3;
         }
 
         @Override
@@ -225,16 +377,25 @@ public class Reconstructor extends UnitBlock{
             super.write(write);
 
             write.f(progress);
+            TypeIO.writeVecNullable(write, commandPos);
+            TypeIO.writeCommand(write, command);
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
 
-            if(revision == 1){
+            if(revision >= 1){
                 progress = read.f();
             }
 
+            if(revision >= 2){
+                commandPos = TypeIO.readVecNullable(read);
+            }
+
+            if(revision >= 3){
+                command = TypeIO.readCommand(read);
+            }
         }
 
     }
diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java
deleted file mode 100644
index 64595c0902..0000000000
--- a/core/src/mindustry/world/blocks/units/RepairPoint.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package mindustry.world.blocks.units;
-
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.math.geom.*;
-import arc.struct.*;
-import arc.util.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.entities.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.world.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class RepairPoint extends Block{
-    static final Rect rect = new Rect();
-
-    public int timerTarget = timers++;
-
-    public float repairRadius = 50f;
-    public float repairSpeed = 0.3f;
-    public float powerUse;
-
-    public @Load("@-base") TextureRegion baseRegion;
-    public @Load("laser") TextureRegion laser;
-    public @Load("laser-end") TextureRegion laserEnd;
-
-    public Color laserColor = Color.valueOf("e8ffd7");
-
-    public RepairPoint(String name){
-        super(name);
-        update = true;
-        solid = true;
-        flags = EnumSet.of(BlockFlag.repair);
-        hasPower = true;
-        outlineIcon = true;
-    }
-
-    @Override
-    public void setStats(){
-        super.setStats();
-        stats.add(Stat.range, repairRadius / tilesize, StatUnit.blocks);
-    }
-
-    @Override
-    public void init(){
-        consumes.powerCond(powerUse, entity -> ((RepairPointBuild)entity).target != null);
-        super.init();
-    }
-
-    @Override
-    public void drawPlace(int x, int y, int rotation, boolean valid){
-        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, repairRadius, Pal.accent);
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{baseRegion, region};
-    }
-
-    public class RepairPointBuild extends Building{
-        public Unit target;
-        public float strength, rotation = 90;
-
-        @Override
-        public void draw(){
-            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.flyingUnit + 1); //above all units
-                float ang = angleTo(target);
-                float len = 5f;
-
-                Draw.color(laserColor);
-                Drawf.laser(team, laser, laserEnd,
-                x + Angles.trnsx(ang, len), y + Angles.trnsy(ang, len),
-                target.x(), target.y(), strength);
-                Draw.color();
-            }
-        }
-
-        @Override
-        public void drawSelect(){
-            Drawf.dashCircle(x, y, repairRadius, Pal.accent);
-        }
-
-        @Override
-        public void updateTile(){
-            boolean targetIsBeingRepaired = false;
-            if(target != null && (target.dead() || target.dst(tile) > repairRadius || target.health() >= target.maxHealth())){
-                target = null;
-            }else if(target != null && consValid()){
-                target.heal(repairSpeed * Time.delta * strength * efficiency());
-                rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.5f);
-                targetIsBeingRepaired = true;
-            }
-
-            if(target != null && targetIsBeingRepaired){
-                strength = Mathf.lerpDelta(strength, 1f, 0.08f * Time.delta);
-            }else{
-                strength = Mathf.lerpDelta(strength, 0f, 0.07f * Time.delta);
-            }
-
-            if(timer(timerTarget, 20)){
-                rect.setSize(repairRadius * 2).setCenter(x, y);
-                target = Units.closest(team, x, y, repairRadius, Unit::damaged);
-            }
-        }
-
-        @Override
-        public boolean shouldConsume(){
-            return target != null && enabled;
-        }
-
-        @Override
-        public BlockStatus status(){
-            return Mathf.equal(efficiency(), 0f, 0.01f) ? BlockStatus.noInput : cons.status();
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/units/RepairTower.java b/core/src/mindustry/world/blocks/units/RepairTower.java
new file mode 100644
index 0000000000..ad610bf8c4
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/RepairTower.java
@@ -0,0 +1,119 @@
+package mindustry.world.blocks.units;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class RepairTower extends Block{
+    static final float refreshInterval = 6f;
+
+    public float range = 80f;
+    public Color circleColor = Pal.heal, glowColor = Pal.heal.cpy().a(0.5f);
+    public float circleSpeed = 120f, circleStroke = 3f, squareRad = 3f, squareSpinScl = 0.8f, glowMag = 0.5f, glowScl = 8f;
+    public float healAmount = 1f;
+    public @Load("@-glow") TextureRegion glow;
+
+    public RepairTower(String name){
+        super(name);
+        update = true;
+        solid = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.range, range / tilesize, StatUnit.blocks);
+        stats.add(Stat.repairSpeed, healAmount * 60f, StatUnit.perSecond);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, Pal.placing);
+    }
+
+    public class RepairTowerBuild extends Building implements Ranged{
+        public float refresh = Mathf.random(refreshInterval);
+        public float warmup = 0f;
+        public float totalProgress = 0f;
+        public Seq<Unit> targets = new Seq<>();
+
+        @Override
+        public void updateTile(){
+
+            if(potentialEfficiency > 0 && (refresh += Time.delta) >= refreshInterval){
+                targets.clear();
+                refresh = 0f;
+                Units.nearby(team, x, y, range, u -> {
+                    if(u.damaged()){
+                        targets.add(u);
+                    }
+                });
+            }
+
+            boolean any = false;
+            if(efficiency > 0){
+                for(var target : targets){
+                    if(target.damaged()){
+                        target.heal(healAmount * efficiency);
+                        any = true;
+                    }
+                }
+            }
+
+            warmup = Mathf.lerpDelta(warmup, any ? efficiency : 0f, 0.08f);
+            totalProgress += Time.delta / circleSpeed;
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return targets.size > 0;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(warmup <= 0.001f) return;
+
+            Draw.z(Layer.effect);
+            float mod = totalProgress % 1f;
+            Draw.color(circleColor);
+            Lines.stroke(circleStroke * (1f - mod) * warmup);
+            Lines.circle(x, y, range * mod);
+            Draw.color(Pal.heal);
+            Fill.square(x, y, squareRad * warmup, Time.time / squareSpinScl);
+            Draw.reset();
+
+            Drawf.additive(glow, glowColor, warmup * (1f - glowMag + Mathf.absin(Time.time, glowScl, glowMag)), x, y, 0f, Layer.blockAdditive);
+        }
+
+        @Override
+        public float range(){
+            return range;
+        }
+
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
+        @Override
+        public void drawSelect(){
+            Drawf.dashCircle(x, y, range, Pal.placing);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/RepairTurret.java b/core/src/mindustry/world/blocks/units/RepairTurret.java
new file mode 100644
index 0000000000..86b29c79a4
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/RepairTurret.java
@@ -0,0 +1,249 @@
+package mindustry.world.blocks.units;
+
+import arc.*;
+import arc.graphics.*;
+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.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.logic.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class RepairTurret extends Block{
+    static final Rect rect = new Rect();
+    static final Rand rand = new Rand();
+
+    public int timerTarget = timers++;
+    public int timerEffect = timers++;
+
+    public float repairRadius = 50f;
+    public float repairSpeed = 0.3f;
+    public float powerUse;
+    public float length = 5f;
+    public float beamWidth = 1f;
+    public float pulseRadius = 6f;
+    public float pulseStroke = 2f;
+    public boolean acceptCoolant = false;
+
+    public float coolantUse = 0.5f;
+    /** Effect displayed when coolant is used. */
+    public Effect coolEffect = Fx.fuelburn;
+    /** How much healing is increased by with heat capacity. */
+    public float coolantMultiplier = 1f;
+
+    public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
+    public @Load("laser-white") TextureRegion laser;
+    public @Load("laser-white-end") TextureRegion laserEnd;
+    public @Load("laser-top") TextureRegion laserTop;
+    public @Load("laser-top-end") TextureRegion laserTopEnd;
+
+    public Color laserColor = Color.valueOf("98ffa9"), laserTopColor = Color.white.cpy();
+
+    public RepairTurret(String name){
+        super(name);
+        update = true;
+        solid = true;
+        flags = EnumSet.of(BlockFlag.repair);
+        hasPower = true;
+        outlineIcon = true;
+        //yeah, this isn't the same thing, but it's close enough
+        group = BlockGroup.projectors;
+
+        envEnabled |= Env.space;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+        stats.add(Stat.range, repairRadius / tilesize, StatUnit.blocks);
+        stats.add(Stat.repairSpeed, repairSpeed * 60f, StatUnit.perSecond);
+
+        if(acceptCoolant){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster, StatValues.speedBoosters(Core.bundle.get("bar.strength"), coolantUse, coolantMultiplier, true, this::consumesLiquid));
+        }
+    }
+
+    @Override
+    public void init(){
+        if(acceptCoolant){
+            hasLiquids = true;
+            consume(new ConsumeCoolant(coolantUse)).optional(true, true);
+        }
+
+        consumePowerCond(powerUse, (RepairPointBuild entity) -> entity.target != null);
+        updateClipRadius(repairRadius);
+        super.init();
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, repairRadius, Pal.accent);
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{baseRegion, region};
+    }
+
+    public static void drawBeam(float x, float y, float rotation, float length, int id, @Nullable Sized target, Team team,
+                                float strength, float pulseStroke, float pulseRadius, float beamWidth,
+                                Vec2 lastEnd, Vec2 offset,
+                                Color laserColor, Color laserTopColor,
+                                TextureRegion laser, TextureRegion laserEnd, TextureRegion laserTop, TextureRegion laserTopEnd){
+        rand.setSeed(id + (target instanceof Entityc e ? e.id() : 0));
+
+        if(target != null){
+            float
+            originX = x + Angles.trnsx(rotation, length),
+            originY = y + Angles.trnsy(rotation, length);
+
+            lastEnd.set(target).sub(originX, originY);
+            lastEnd.setLength(Math.max(2f, lastEnd.len()));
+
+            lastEnd.add(offset.trns(
+            rand.random(360f) + Time.time/2f,
+            Mathf.sin(Time.time + rand.random(200f), 55f, rand.random(target.hitSize() * 0.2f, target.hitSize() * 0.45f))
+            ).rotate(target instanceof Rotc rot ? rot.rotation() : 0f));
+
+            lastEnd.add(originX, originY);
+        }
+
+        if(strength > 0.01f){
+            float
+            originX = x + Angles.trnsx(rotation, length),
+            originY = y + Angles.trnsy(rotation, length);
+
+            Draw.z(Layer.flyingUnit + 1); //above all units
+
+            Draw.color(laserColor);
+
+            float f = (Time.time / 85f + rand.random(1f)) % 1f;
+
+            Draw.alpha(1f - Interp.pow5In.apply(f));
+            Lines.stroke(strength * pulseStroke);
+            Lines.circle(lastEnd.x, lastEnd.y, 1f + f * pulseRadius);
+
+            Draw.color(laserColor);
+            Drawf.laser(laser, laserEnd, originX, originY, lastEnd.x, lastEnd.y, strength * beamWidth);
+            Draw.z(Layer.flyingUnit + 1.1f);
+            Draw.color(laserTopColor);
+            Drawf.laser(laserTop, laserTopEnd, originX, originY, lastEnd.x, lastEnd.y, strength * beamWidth);
+            Draw.color();
+        }
+    }
+
+    public class RepairPointBuild extends Building implements Ranged, RotBlock{
+        public Unit target;
+        public Vec2 offset = new Vec2(), lastEnd = new Vec2();
+        public float strength, rotation = 90;
+
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
+        @Override
+        public void draw(){
+            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);
+
+            drawBeam(x, y, rotation, length, id, target, team, strength,
+                pulseStroke, pulseRadius, beamWidth, lastEnd, offset, laserColor, laserTopColor,
+                laser, laserEnd, laserTop, laserTopEnd);
+        }
+
+        @Override
+        public void drawSelect(){
+            Drawf.dashCircle(x, y, repairRadius, Pal.accent);
+        }
+
+        @Override
+        public void updateTile(){
+            float multiplier = 1f;
+            if(acceptCoolant){
+                multiplier = 1f + liquids.current().heatCapacity * coolantMultiplier * optionalEfficiency;
+            }
+
+            if(target != null && (target.dead() || target.dst(this) - target.hitSize/2f > repairRadius || target.health() >= target.maxHealth())){
+                target = null;
+            }
+
+            if(target == null){
+                offset.setZero();
+            }
+
+            boolean healed = false;
+
+            if(target != null && efficiency > 0){
+                float angle = Angles.angle(x, y, target.x + offset.x, target.y + offset.y);
+                if(Angles.angleDist(angle, rotation) < 30f){
+                    healed = true;
+                    target.heal(repairSpeed * strength * edelta() * multiplier);
+                }
+                rotation = Mathf.slerpDelta(rotation, angle, 0.5f * efficiency * timeScale);
+            }
+
+            strength = Mathf.lerpDelta(strength, healed ? 1f : 0f, 0.08f * Time.delta);
+
+            if(timer(timerTarget, 20)){
+                rect.setSize(repairRadius * 2).setCenter(x, y);
+                target = Units.closest(team, x, y, repairRadius, Unit::damaged);
+            }
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return target != null && enabled;
+        }
+
+        @Override
+        public BlockStatus status(){
+            return Mathf.equal(potentialEfficiency, 0f, 0.01f) ? BlockStatus.noInput : super.status();
+        }
+
+        @Override
+        public float range(){
+            return repairRadius;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(rotation);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            if(revision >= 1){
+                rotation = read.f();
+            }
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/ResupplyPoint.java b/core/src/mindustry/world/blocks/units/ResupplyPoint.java
deleted file mode 100644
index 6402b20147..0000000000
--- a/core/src/mindustry/world/blocks/units/ResupplyPoint.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package mindustry.world.blocks.units;
-
-import arc.func.*;
-import arc.graphics.*;
-import arc.struct.*;
-import mindustry.content.*;
-import mindustry.entities.*;
-import mindustry.game.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.type.AmmoTypes.*;
-import mindustry.world.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class ResupplyPoint extends Block{
-    public final int timerResupply = timers++;
-
-    public int ammoAmount = 10;
-    public float resupplyRate = 5f;
-    public float range = 60f;
-    public Color ammoColor = Items.copper.color;
-
-    public ResupplyPoint(String name){
-        super(name);
-        solid = update = true;
-        hasItems = true;
-        flags = EnumSet.of(BlockFlag.resupply);
-    }
-
-    @Override
-    public boolean outputsItems(){
-        return false;
-    }
-
-    @Override
-    public void drawPlace(int x, int y, int rotation, boolean valid){
-        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, Pal.placing);
-    }
-
-    public class ResupplyPointBuild extends Building{
-
-        @Override
-        public void drawSelect(){
-            Drawf.dashCircle(x, y, range, team.color);
-        }
-
-        @Override
-         public void updateTile(){
-             if(consValid() && timer(timerResupply, resupplyRate / timeScale) && resupply(this, range, ammoAmount, ammoColor)){
-                 consume();
-             }
-         }
-    }
-
-    /** 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, 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(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(x, y, ammoAmount / 2f, ammoColor, unit);
-            unit.ammo = Math.min(unit.ammo + ammoAmount, unit.type.ammoCapacity);
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java
new file mode 100644
index 0000000000..2311d4100a
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java
@@ -0,0 +1,650 @@
+package mindustry.world.blocks.units;
+
+import arc.*;
+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 arc.util.io.*;
+import mindustry.ai.types.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.logic.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.blocks.payloads.*;
+import mindustry.world.blocks.units.UnitAssemblerModule.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class UnitAssembler extends PayloadBlock{
+    public @Load("@-side1") TextureRegion sideRegion1;
+    public @Load("@-side2") TextureRegion sideRegion2;
+
+    public int areaSize = 11;
+    public UnitType droneType = UnitTypes.assemblyDrone;
+    public int dronesCreated = 4;
+    public float droneConstructTime = 60f * 4f;
+
+    public Seq<AssemblerUnitPlan> plans = new Seq<>(4);
+
+    protected @Nullable ConsumePayloadDynamic consPayload;
+
+    public UnitAssembler(String name){
+        super(name);
+        update = solid = true;
+        rotate = true;
+        rotateDraw = false;
+        acceptsPayload = true;
+        flags = EnumSet.of(BlockFlag.unitAssembler);
+        regionRotated1 = 1;
+        sync = true;
+        group = BlockGroup.units;
+        commandable = true;
+        quickRotate = false;
+    }
+
+    public Rect getRect(Rect rect, float x, float y, int rotation){
+        rect.setCentered(x, y, areaSize * tilesize);
+        float len = tilesize * (areaSize + size)/2f;
+
+        rect.x += Geometry.d4x(rotation) * len;
+        rect.y += Geometry.d4y(rotation) * len;
+
+        return rect;
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        x *= tilesize;
+        y *= tilesize;
+        x += offset;
+        y += offset;
+
+        Rect rect = getRect(Tmp.r1, x, y, rotation);
+
+        Drawf.dashRect(valid ? Pal.accent : Pal.remove, rect);
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        //overlapping construction areas not allowed; grow by a tiny amount so edges can't overlap either.
+        Rect rect = getRect(Tmp.r1, tile.worldx() + offset, tile.worldy() + offset, rotation).grow(0.1f);
+        return
+            !indexer.getFlagged(team, BlockFlag.unitAssembler).contains(b -> getRect(Tmp.r2, b.x, b.y, b.rotation).overlaps(rect)) &&
+            !team.data().getBuildings(ConstructBlock.get(size)).contains(b -> ((ConstructBuild)b).current instanceof UnitAssembler && getRect(Tmp.r2, b.x, b.y, b.rotation).overlaps(rect));
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("progress", (UnitAssemblerBuild e) -> new Bar("bar.progress", Pal.ammo, () -> e.progress));
+
+        addBar("units", (UnitAssemblerBuild e) ->
+            new Bar(() ->
+            Core.bundle.format("bar.unitcap",
+                Fonts.getUnicodeStr(e.unit().name),
+                e.team.data().countType(e.unit()),
+                e.unit().useUnitCap ? Units.getStringCap(e.team) : "∞"
+            ),
+            () -> Pal.power,
+            () -> e.unit().useUnitCap ? ((float)e.team.data().countType(e.unit()) / Units.getCap(e.team)) : 1f
+        ));
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(plan.rotation >= 2 ? sideRegion2 : sideRegion1, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, sideRegion1, topRegion};
+    }
+
+    @Override
+    public void init(){
+        updateClipRadius(areaSize * tilesize);
+        consume(consPayload = new ConsumePayloadDynamic((UnitAssemblerBuild build) -> build.plan().requirements));
+
+        consumeBuilder.each(c -> c.multiplier = b -> state.rules.unitCost(b.team));
+
+        super.init();
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.output, table -> {
+            table.row();
+
+            int tier = 0;
+            for(var plan : plans){
+                int ttier = tier;
+                table.table(Styles.grayPanel, t -> {
+
+                    if(plan.unit.isBanned()){
+                        t.image(Icon.cancel).color(Pal.remove).size(40).pad(10);
+                        return;
+                    }
+
+                    if(plan.unit.unlockedNow()){
+                        t.image(plan.unit.uiIcon).scaling(Scaling.fit).size(40).pad(10f).left().with(i -> StatValues.withTooltip(i, plan.unit));
+                        t.table(info -> {
+                            info.defaults().left();
+                            info.add(plan.unit.localizedName);
+                            info.row();
+                            info.add(Strings.autoFixed(plan.time / 60f, 1) + " " + Core.bundle.get("unit.seconds")).color(Color.lightGray);
+                            if(ttier > 0){
+                                info.row();
+                                info.add(Stat.moduleTier.localized() + ": " + ttier).color(Color.lightGray);
+                            }
+                        }).left();
+
+                        t.table(req -> {
+                            req.right();
+                            for(int i = 0; i < plan.requirements.size; i++){
+                                if(i % 6 == 0){
+                                    req.row();
+                                }
+
+                                PayloadStack stack = plan.requirements.get(i);
+                                req.add(StatValues.stack(stack)).pad(5);
+                            }
+                        }).right().grow().pad(10f);
+                    }else{
+                        t.image(Icon.lock).color(Pal.darkerGray).size(40).pad(10);
+                    }
+                }).growX().pad(5);
+                table.row();
+                tier++;
+            }
+        });
+    }
+
+    public static class AssemblerUnitPlan{
+        public UnitType unit;
+        public Seq<PayloadStack> requirements;
+        public float time;
+
+        public AssemblerUnitPlan(UnitType unit, float time, Seq<PayloadStack> requirements){
+            this.unit = unit;
+            this.time = time;
+            this.requirements = requirements;
+        }
+
+        AssemblerUnitPlan(){}
+    }
+
+    /** hbgwerjhbagjegwg */
+    public static class YeetData{
+        public Vec2 target;
+        public UnlockableContent item;
+
+        public YeetData(Vec2 target, UnlockableContent item){
+            this.target = target;
+            this.item = item;
+        }
+    }
+
+    @Remote(called = Loc.server)
+    public static void assemblerUnitSpawned(Tile tile){
+        if(tile == null || !(tile.build instanceof UnitAssemblerBuild build)) return;
+        build.spawned();
+    }
+
+    @Remote(called = Loc.server)
+    public static void assemblerDroneSpawned(Tile tile, int id){
+        if(tile == null || !(tile.build instanceof UnitAssemblerBuild build)) return;
+        build.droneSpawned(id);
+    }
+
+    public class UnitAssemblerBuild extends PayloadBlockBuild<Payload>{
+        protected IntSeq readUnits = new IntSeq();
+        //holds drone IDs that have been sent, but not synced yet - add to list as soon as possible
+        protected IntSeq whenSyncedUnits = new IntSeq();
+
+        public @Nullable Vec2 commandPos;
+        public Seq<Unit> units = new Seq<>();
+        public Seq<UnitAssemblerModuleBuild> modules = new Seq<>();
+        public PayloadSeq blocks = new PayloadSeq();
+        public float progress, warmup, droneWarmup, powerWarmup, sameTypeWarmup;
+        public float invalidWarmup = 0f;
+        public int currentTier = 0;
+        public int lastTier = -2;
+        public boolean wasOccupied = false;
+
+        public float droneProgress, totalDroneProgress;
+
+        public Vec2 getUnitSpawn(){
+            float len = tilesize * (areaSize + size)/2f;
+            float unitX = x + Geometry.d4x(rotation) * len, unitY = y + Geometry.d4y(rotation) * len;
+            return Tmp.v4.set(unitX, unitY);
+        }
+
+        public boolean moduleFits(Block other, float ox, float oy, int rotation){
+            float
+            dx = ox + Geometry.d4x(rotation) * (other.size/2f + 0.5f) * tilesize,
+            dy = oy + Geometry.d4y(rotation) * (other.size/2f + 0.5f) * tilesize;
+
+            Vec2 spawn = getUnitSpawn();
+
+            if(Tile.relativeTo(ox, oy, spawn.x, spawn.y) != rotation){
+                return false;
+            }
+
+            float dst = Math.max(Math.abs(dx - spawn.x), Math.abs(dy - spawn.y));
+            return Mathf.equal(dst, tilesize * areaSize / 2f - tilesize/2f);
+        }
+
+        public void updateModules(UnitAssemblerModuleBuild build){
+            modules.addUnique(build);
+            checkTier();
+        }
+
+        public void removeModule(UnitAssemblerModuleBuild build){
+            modules.remove(build);
+            checkTier();
+        }
+
+        public void checkTier(){
+            modules.sort(b -> b.tier());
+            int max = 0;
+            for(int i = 0; i < modules.size; i++){
+                var mod = modules.get(i);
+                if(mod.tier() == max || mod.tier() == max + 1){
+                    max = mod.tier();
+                }else{
+                    //tier gap, TODO warning?
+                    break;
+                }
+            }
+
+            currentTier = max;
+        }
+
+        public UnitType unit(){
+            return plan().unit;
+        }
+
+        public AssemblerUnitPlan plan(){
+            //clamp plan pos
+            return plans.get(Math.min(currentTier, plans.size - 1));
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            //liquid is only consumed when building is being done
+            return enabled && !wasOccupied && Units.canCreate(team, plan().unit) && consPayload.efficiency(this) > 0;
+        }
+
+        @Override
+        public void drawSelect(){
+            for(var module : modules){
+                Drawf.selected(module, Pal.accent);
+            }
+
+            Drawf.dashRect(Tmp.c1.set(Pal.accent).lerp(Pal.remove, invalidWarmup), getRect(Tmp.r1, x, y, rotation));
+        }
+
+        @Override
+        public void display(Table table){
+            super.display(table);
+
+            if(team != player.team()) return;
+
+            table.row();
+            table.table(t -> {
+                t.left().defaults().left();
+
+                Block prev = null;
+                for(int i = 0; i < modules.size; i++){
+                    var mod = modules.get(i);
+                    if(prev == mod.block) continue;
+                    //TODO crosses for missing reqs?
+                    t.image(mod.block.uiIcon).size(iconMed).padRight(4);
+
+                    prev = mod.block;
+                }
+
+                t.label(() -> "[accent] -> []" + unit().emoji() + " " + unit().localizedName);
+            }).pad(4).padLeft(0f).fillX().left();
+        }
+
+        @Override
+        public void updateTile(){
+            if(!readUnits.isEmpty()){
+                units.clear();
+                readUnits.each(i -> {
+                    var unit = Groups.unit.getByID(i);
+                    if(unit != null){
+                        units.add(unit);
+                    }
+                });
+                readUnits.clear();
+            }
+
+            if(lastTier != currentTier){
+                if(lastTier >= 0f){
+                    progress = 0f;
+                }
+
+                lastTier =
+                    lastTier == -2 ? -1 : currentTier;
+            }
+
+            //read newly synced drones on client end
+            if(units.size < dronesCreated && whenSyncedUnits.size > 0){
+                whenSyncedUnits.each(id -> {
+                    var unit = Groups.unit.getByID(id);
+                    if(unit != null){
+                        units.addUnique(unit);
+                    }
+                });
+            }
+
+            units.removeAll(u -> !u.isAdded() || u.dead || !(u.controller() instanceof AssemblerAI));
+
+            //unsupported
+            if(!allowUpdate()){
+                progress = 0f;
+                units.each(Unit::kill);
+                units.clear();
+            }
+
+            float powerStatus = !enabled ? 0f : power == null ? 1f : power.status;
+            powerWarmup = Mathf.lerpDelta(powerStatus, powerStatus > 0.0001f ? 1f : 0f, 0.1f);
+            droneWarmup = Mathf.lerpDelta(droneWarmup, units.size < dronesCreated ? powerStatus : 0f, 0.1f);
+            totalDroneProgress += droneWarmup * delta();
+
+            if(units.size < dronesCreated && enabled && (droneProgress += delta() * state.rules.unitBuildSpeed(team) * powerStatus / droneConstructTime) >= 1f){
+                if(!net.client()){
+                    var unit = droneType.create(team);
+                    if(unit instanceof BuildingTetherc bt){
+                        bt.building(this);
+                    }
+                    unit.set(x, y);
+                    unit.rotation = 90f;
+                    unit.add();
+                    units.add(unit);
+                    Call.assemblerDroneSpawned(tile, unit.id);
+                }
+            }
+
+            if(units.size >= dronesCreated){
+                droneProgress = 0f;
+            }
+
+            Vec2 spawn = getUnitSpawn();
+
+            if(moveInPayload() && !wasOccupied){
+                yeetPayload(payload);
+                payload = null;
+            }
+
+            //arrange units around perimeter
+            for(int i = 0; i < units.size; i++){
+                var unit = units.get(i);
+                var ai = (AssemblerAI)unit.controller();
+
+                ai.targetPos.trns(i * 90f + 45f, areaSize / 2f * Mathf.sqrt2 * tilesize).add(spawn);
+                ai.targetAngle = i * 90f + 45f + 180f;
+            }
+
+            wasOccupied = checkSolid(spawn, false);
+            boolean visualOccupied = checkSolid(spawn, true);
+            float eff = (units.count(u -> ((AssemblerAI)u.controller()).inPosition()) / (float)dronesCreated);
+
+            sameTypeWarmup = Mathf.lerpDelta(sameTypeWarmup, wasOccupied && !visualOccupied ? 0f : 1f, 0.1f);
+            invalidWarmup = Mathf.lerpDelta(invalidWarmup, visualOccupied ? 1f : 0f, 0.1f);
+
+            var plan = plan();
+
+            //check if all requirements are met
+            if(!wasOccupied && efficiency > 0 && Units.canCreate(team, plan.unit)){
+                warmup = Mathf.lerpDelta(warmup, efficiency, 0.1f);
+
+                if((progress += edelta() * state.rules.unitBuildSpeed(team) * eff / plan.time) >= 1f){
+                    Call.assemblerUnitSpawned(tile);
+                }
+            }else{
+                warmup = Mathf.lerpDelta(warmup, 0f, 0.1f);
+            }
+        }
+
+        public void droneSpawned(int id){
+            Fx.spawn.at(x, y);
+            droneProgress = 0f;
+            if(net.client()){
+                whenSyncedUnits.add(id);
+            }
+        }
+
+        public void spawned(){
+            var plan = plan();
+            Vec2 spawn = getUnitSpawn();
+            consume();
+
+            if(!net.client()){
+                var unit = plan.unit.create(team);
+                if(unit != null && unit.isCommandable() && commandPos != null){
+                    unit.command().commandPosition(commandPos);
+                }
+                unit.set(spawn.x + Mathf.range(0.001f), spawn.y + Mathf.range(0.001f));
+                unit.rotation = rotdeg();
+                unit.add();
+            }
+
+            progress = 0f;
+            Fx.unitAssemble.at(spawn.x, spawn.y, 0f, plan.unit);
+            blocks.clear();
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            //draw input conveyors
+            for(int i = 0; i < 4; i++){
+                if(blends(i) && i != rotation){
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
+                }
+            }
+
+            Draw.rect(rotation >= 2 ? sideRegion2 : sideRegion1, x, y, rotdeg());
+
+            Draw.z(Layer.blockOver);
+
+            payRotation = rotdeg();
+            drawPayload();
+
+            Draw.z(Layer.blockOver + 0.1f);
+
+            Draw.rect(topRegion, x, y);
+
+            if(isPayload()) return;
+
+            //draw drone construction
+            if(droneWarmup > 0.001f){
+                Draw.draw(Layer.blockOver + 0.2f, () -> {
+                    Drawf.construct(this, droneType.fullIcon, Pal.accent, 0f, droneProgress, droneWarmup, totalDroneProgress, 14f);
+                });
+            }
+
+            Vec2 spawn = getUnitSpawn();
+            float sx = spawn.x, sy = spawn.y;
+
+            var plan = plan();
+
+            //draw the unit construction as outline
+            //TODO flashes when no gallium
+            Draw.draw(Layer.blockBuilding, () -> {
+                Draw.color(Pal.accent, warmup);
+
+                Shaders.blockbuild.region = plan.unit.fullIcon;
+                Shaders.blockbuild.time = Time.time;
+                //margin due to units not taking up whole region
+                Shaders.blockbuild.progress = Mathf.clamp(progress + 0.05f);
+
+                Draw.rect(plan.unit.fullIcon, sx, sy, rotdeg() - 90f);
+                Draw.flush();
+                Draw.color();
+            });
+
+            Draw.reset();
+
+            Draw.z(Layer.buildBeam);
+
+            //draw unit silhouette
+            Draw.mixcol(Tmp.c1.set(Pal.accent).lerp(Pal.remove, invalidWarmup), 1f);
+            Draw.alpha(Math.min(powerWarmup, sameTypeWarmup));
+            Draw.rect(plan.unit.fullIcon, spawn.x, spawn.y, rotdeg() - 90f);
+
+            //build beams do not draw when invalid
+            Draw.alpha(Math.min(1f - invalidWarmup, warmup));
+
+            //draw build beams
+            for(var unit : units){
+                if(!((AssemblerAI)unit.controller()).inPosition()) continue;
+
+                float
+                    px = unit.x + Angles.trnsx(unit.rotation, unit.type.buildBeamOffset),
+                    py = unit.y + Angles.trnsy(unit.rotation, unit.type.buildBeamOffset);
+
+                Drawf.buildBeam(px, py, spawn.x, spawn.y, plan.unit.hitSize/2f);
+            }
+
+            //fill square in middle
+            Fill.square(spawn.x, spawn.y, plan.unit.hitSize/2f);
+
+            Draw.reset();
+
+            Draw.z(Layer.buildBeam);
+
+            float fulls = areaSize * tilesize/2f;
+
+            //draw full area
+            Lines.stroke(2f, Pal.accent);
+            Draw.alpha(powerWarmup);
+            Drawf.dashRectBasic(spawn.x - fulls, spawn.y - fulls, fulls*2f, fulls*2f);
+
+            Draw.reset();
+
+            float outSize = plan.unit.hitSize + 9f;
+
+            if(invalidWarmup > 0){
+                //draw small square for area
+                Lines.stroke(2f, Tmp.c3.set(Pal.accent).lerp(Pal.remove, invalidWarmup).a(invalidWarmup));
+                Drawf.dashSquareBasic(spawn.x, spawn.y, outSize);
+            }
+
+            Draw.reset();
+        }
+
+        public boolean checkSolid(Vec2 v, boolean same){
+            var output = unit();
+            float hsize = output.hitSize * 1.4f;
+            return ((!output.flying && collisions.overlapsTile(Tmp.r1.setCentered(v.x, v.y, output.hitSize), EntityCollisions::solid)) ||
+                Units.anyEntities(v.x - hsize/2f, v.y - hsize/2f, hsize, hsize, u -> (!same || u.type != output) && !u.spawnedByCore &&
+                    ((u.type.allowLegStep && output.allowLegStep) || (output.flying && u.isFlying()) || (!output.flying && u.isGrounded()))));
+        }
+
+        /** @return true if this block is ready to produce units, e.g. requirements met */
+        public boolean ready(){
+            return efficiency > 0 && !wasOccupied;
+        }
+
+        public void yeetPayload(Payload payload){
+            var spawn = getUnitSpawn();
+            blocks.add(payload.content(), 1);
+            float rot = payload.angleTo(spawn);
+            Fx.shootPayloadDriver.at(payload.x(), payload.y(), rot);
+            Fx.payloadDeposit.at(payload.x(), payload.y(), rot, new YeetData(spawn.cpy(), payload.content()));
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return progress;
+            return super.sense(sensor);
+        }
+
+        @Override
+        public PayloadSeq getPayloads(){
+            return blocks;
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            var plan = plan();
+            return (this.payload == null || source instanceof UnitAssemblerModuleBuild) &&
+                    plan.requirements.contains(b -> b.item == payload.content() && blocks.get(payload.content()) < Mathf.round(b.amount * state.rules.unitCost(team)));
+        }
+
+        @Override
+        public Vec2 getCommandPosition(){
+            return commandPos;
+        }
+
+        @Override
+        public void onCommand(Vec2 target){
+            commandPos = target;
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(progress);
+            write.b(units.size);
+            for(var unit : units){
+                write.i(unit.id);
+            }
+
+            blocks.write(write);
+            TypeIO.writeVecNullable(write, commandPos);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            progress = read.f();
+            int count = read.b();
+            readUnits.clear();
+            for(int i = 0; i < count; i++){
+                readUnits.add(read.i());
+            }
+            whenSyncedUnits.clear();
+
+            blocks.read(read);
+            if(revision >= 1){
+                commandPos = TypeIO.readVecNullable(read);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java b/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java
new file mode 100644
index 0000000000..79cd4ddc9e
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java
@@ -0,0 +1,145 @@
+package mindustry.world.blocks.units;
+
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.payloads.*;
+import mindustry.world.blocks.units.UnitAssembler.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class UnitAssemblerModule extends PayloadBlock{
+    public @Load("@-side1") TextureRegion sideRegion1;
+    public @Load("@-side2") TextureRegion sideRegion2;
+
+    public int tier = 1;
+
+    public UnitAssemblerModule(String name){
+        super(name);
+        rotate = true;
+        rotateDraw = false;
+        acceptsPayload = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.moduleTier, tier);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        var link = getLink(player.team(), x, y, rotation);
+        if(link != null){
+            link.block.drawPlace(link.tile.x, link.tile.y, link.rotation, true);
+        }
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        return getLink(team, tile.x, tile.y, rotation) != null;
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(plan.rotation >= 2 ? sideRegion2 : sideRegion1, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region, sideRegion1, topRegion};
+    }
+
+    public @Nullable UnitAssemblerBuild getLink(Team team, int x, int y, int rotation){
+        var results = Vars.indexer.getFlagged(team, BlockFlag.unitAssembler).<UnitAssemblerBuild>as();
+
+        return results.find(b -> b.moduleFits(this, x * tilesize + offset, y * tilesize + offset, rotation));
+    }
+
+    public class UnitAssemblerModuleBuild extends PayloadBlockBuild<Payload>{
+        public UnitAssemblerBuild link;
+        public int lastChange = -2;
+
+        public void findLink(){
+            if(link != null){
+                link.removeModule(this);
+            }
+            link = getLink(team, tile.x, tile.y, rotation);
+            if(link != null){
+                link.updateModules(this);
+            }
+        }
+
+        public int tier(){
+            return tier;
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            //draw input conveyors
+            for(int i = 0; i < 4; i++){
+                if(blends(i) && i != rotation){
+                    Draw.rect(inRegion, x, y, (i * 90) - 180);
+                }
+            }
+
+            Draw.rect(rotation >= 2 ? sideRegion2 : sideRegion1, x, y, rotdeg());
+
+            Draw.z(Layer.blockOver);
+            payRotation = rotdeg();
+            drawPayload();
+            Draw.z(Layer.blockOver + 0.1f);
+            Draw.rect(topRegion, x, y);
+        }
+
+        @Override
+        public boolean acceptPayload(Building source, Payload payload){
+            return link != null && this.payload == null && link.acceptPayload(this, payload);
+        }
+
+        @Override
+        public void drawSelect(){
+            //TODO draw area?
+            if(link != null){
+                Drawf.selected(link, Pal.accent);
+            }
+        }
+
+        @Override
+        public void onRemoved(){
+            super.onRemoved();
+
+            if(link != null){
+                link.removeModule(this);
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            if(lastChange != world.tileChanges){
+                lastChange = world.tileChanges;
+                findLink();
+            }
+
+            if(moveInPayload() && link != null && link.moduleFits(block, x, y, rotation) && !link.wasOccupied && link.acceptPayload(this, payload) && efficiency > 0){
+                link.yeetPayload(payload);
+                payload = null;
+            }
+        }
+
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/UnitBlock.java b/core/src/mindustry/world/blocks/units/UnitBlock.java
index 5de6fd135b..4c78b650ad 100644
--- a/core/src/mindustry/world/blocks/units/UnitBlock.java
+++ b/core/src/mindustry/world/blocks/units/UnitBlock.java
@@ -1,20 +1,12 @@
 package mindustry.world.blocks.units;
 
-import arc.*;
-import arc.math.*;
-import arc.util.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
-import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
-import mindustry.world.blocks.production.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.*;
-
-public class UnitBlock extends PayloadAcceptor{
+public class UnitBlock extends PayloadBlock{
 
     public UnitBlock(String name){
         super(name);
@@ -27,30 +19,15 @@ public class UnitBlock extends PayloadAcceptor{
 
     @Remote(called = Loc.server)
     public static void unitBlockSpawn(Tile tile){
-        if(!(tile.build instanceof UnitBuild build)) return;
+        if(tile == null || !(tile.build instanceof UnitBuild build)) return;
         build.spawned();
     }
 
-    public class UnitBuild extends PayloadAcceptorBuild<UnitPayload>{
+    public class UnitBuild extends PayloadBlockBuild<UnitPayload>{
         public float progress, time, speedScl;
 
         public void spawned(){
             progress = 0f;
-
-            Tmp.v1.trns(rotdeg(), size * tilesize/2f);
-            Fx.smeltsmoke.at(x + Tmp.v1.x, y + Tmp.v1.y);
-
-            if(!net.client() && payload != null){
-                Unit unit = payload.unit;
-                unit.set(x, y);
-                unit.rotation(rotdeg());
-                unit.vel().trns(rotdeg(), payloadSpeed * 2f).add(Mathf.range(0.3f), Mathf.range(0.3f));
-                unit.trns(Tmp.v1.trns(rotdeg(), size * tilesize/2f));
-                unit.trns(unit.vel());
-                unit.add();
-                Events.fire(new UnitCreateEvent(unit));
-            }
-
             payload = null;
         }
 
diff --git a/core/src/mindustry/world/blocks/units/UnitCargoLoader.java b/core/src/mindustry/world/blocks/units/UnitCargoLoader.java
new file mode 100644
index 0000000000..ee42fc828e
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/UnitCargoLoader.java
@@ -0,0 +1,192 @@
+package mindustry.world.blocks.units;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+
+import static mindustry.Vars.*;
+
+public class UnitCargoLoader extends Block{
+    public UnitType unitType = UnitTypes.manifold;
+    public float buildTime = 60f * 8f;
+
+    public float polyStroke = 1.8f, polyRadius = 8f;
+    public int polySides = 6;
+    public float polyRotateSpeed = 1f;
+    public Color polyColor = Pal.accent;
+
+    public UnitCargoLoader(String name){
+        super(name);
+
+        solid = true;
+        update = true;
+        hasItems = true;
+        itemCapacity = 200;
+        ambientSound = Sounds.respawning;
+    }
+
+    @Override
+    public boolean outputsItems(){
+        return false;
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        addBar("units", (UnitTransportSourceBuild e) ->
+            new Bar(
+            () ->
+            Core.bundle.format("bar.unitcap",
+                Fonts.getUnicodeStr(unitType.name),
+                e.team.data().countType(unitType),
+                unitType.useUnitCap ? Units.getStringCap(e.team) : "∞"
+            ),
+            () -> Pal.power,
+            () -> unitType.useUnitCap ? (float)e.team.data().countType(unitType) / Units.getCap(e.team) : 1f
+        ));
+    }
+
+    @Override
+    public boolean canPlaceOn(Tile tile, Team team, int rotation){
+        return super.canPlaceOn(tile, team, rotation) && Units.canCreate(team, unitType);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        if(!Units.canCreate(Vars.player.team(), unitType)){
+            drawPlaceText(Core.bundle.get("bar.cargounitcap"), x, y, valid);
+        }
+    }
+
+    @Remote(called = Loc.server)
+    public static void unitTetherBlockSpawned(Tile tile, int id){
+        if(tile == null || !(tile.build instanceof UnitTetherBlock build)) return;
+        build.spawned(id);
+    }
+
+    public class UnitTransportSourceBuild extends Building implements UnitTetherBlock{
+        //needs to be "unboxed" after reading, since units are read after buildings.
+        public int readUnitId = -1;
+        public float buildProgress, totalProgress;
+        public float warmup, readyness;
+        public @Nullable Unit unit;
+
+        @Override
+        public void updateTile(){
+            //unit was lost/destroyed
+            if(unit != null && (unit.dead || !unit.isAdded())){
+                unit = null;
+            }
+
+            if(readUnitId != -1){
+                unit = Groups.unit.getByID(readUnitId);
+                if(unit != null || !net.client()){
+                    readUnitId = -1;
+                }
+            }
+
+            warmup = Mathf.approachDelta(warmup, efficiency, 1f / 60f);
+            readyness = Mathf.approachDelta(readyness, unit != null ? 1f : 0f, 1f / 60f);
+
+            if(unit == null && Units.canCreate(team, unitType)){
+                buildProgress += edelta() / buildTime;
+                totalProgress += edelta();
+
+                if(buildProgress >= 1f){
+                    if(!net.client()){
+                        unit = unitType.create(team);
+                        if(unit instanceof BuildingTetherc bt){
+                            bt.building(this);
+                        }
+                        unit.set(x, y);
+                        unit.rotation = 90f;
+                        unit.add();
+                        Call.unitTetherBlockSpawned(tile, unit.id);
+                    }
+                }
+            }
+        }
+
+        public void spawned(int id){
+            Fx.spawn.at(x, y);
+            buildProgress = 0f;
+            if(net.client()){
+                readUnitId = id;
+            }
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return items.total() < itemCapacity;
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return unit == null;
+        }
+
+        @Override
+        public boolean shouldActiveSound(){
+            return shouldConsume() && warmup > 0.01f;
+        }
+
+        @Override
+        public void draw(){
+            Draw.rect(block.region, x, y);
+            if(unit == null){
+                Draw.draw(Layer.blockOver, () -> {
+                    //TODO make sure it looks proper
+                    Drawf.construct(this, unitType.fullIcon, 0f, buildProgress, warmup, totalProgress);
+                });
+            }else{
+                Draw.z(Layer.bullet - 0.01f);
+                Draw.color(polyColor);
+                Lines.stroke(polyStroke * readyness);
+                Lines.poly(x, y, polySides, polyRadius, Time.time * polyRotateSpeed);
+                Draw.reset();
+                Draw.z(Layer.block);
+            }
+        }
+
+        @Override
+        public float totalProgress(){
+            return totalProgress;
+        }
+
+        @Override
+        public float progress(){
+            return buildProgress;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.i(unit == null ? -1 : unit.id);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            readUnitId = read.i();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java b/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java
new file mode 100644
index 0000000000..d7a2e02c0d
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java
@@ -0,0 +1,99 @@
+package mindustry.world.blocks.units;
+
+import arc.graphics.g2d.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class UnitCargoUnloadPoint extends Block{
+    /** If a block is full for this amount of time, it will not be flown to anymore. */
+    public float staleTimeDuration = 60f * 6f;
+
+    public @Load("@-top") TextureRegion topRegion;
+
+    public UnitCargoUnloadPoint(String name){
+        super(name);
+        update = solid = true;
+        hasItems = true;
+        configurable = true;
+        saveConfig = true;
+        clearOnDoubleTap = true;
+        flags = EnumSet.of(BlockFlag.unitCargoUnloadPoint);
+
+        config(Item.class, (UnitCargoUnloadPointBuild build, Item item) -> build.item = item);
+        configClear((UnitCargoUnloadPointBuild build) -> build.item = null);
+    }
+
+    public class UnitCargoUnloadPointBuild extends Building{
+        public Item item;
+        public float staleTimer;
+        public boolean stale;
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(item != null){
+                Draw.color(item.color);
+                Draw.rect(topRegion, x, y);
+                Draw.color();
+            }
+        }
+
+        @Override
+        public void updateTile(){
+            super.updateTile();
+
+            if(items.total() < itemCapacity){
+                staleTimer = 0f;
+                stale = false;
+            }
+
+            if(dumpAccumulate()){
+                staleTimer = 0f;
+                stale = false;
+            }else if(items.total() >= itemCapacity && (staleTimer += Time.delta) >= staleTimeDuration){
+                stale = true;
+            }
+        }
+
+        @Override
+        public int acceptStack(Item item, int amount, Teamc source){
+            return Math.min(itemCapacity - items.total(), amount);
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            ItemSelection.buildTable(UnitCargoUnloadPoint.this, table, content.items(), () -> item, this::configure);
+        }
+
+        @Override
+        public Object config(){
+            return item;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.s(item == null ? -1 : item.id);
+            write.bool(stale);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            item = Vars.content.item(read.s());
+            stale = read.bool();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index 1a257d9565..10ee5a3a13 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -4,16 +4,22 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
 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.ai.*;
+import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.io.*;
 import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
@@ -22,8 +28,10 @@ import mindustry.world.blocks.payloads.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class UnitFactory extends UnitBlock{
-    public int[] capacities;
+    public int[] capacities = {};
 
     public Seq<UnitPlan> plans = new Seq<>(4);
 
@@ -34,20 +42,40 @@ public class UnitFactory extends UnitBlock{
         hasItems = true;
         solid = true;
         configurable = true;
+        clearOnDoubleTap = true;
         outputsPayload = true;
         rotate = true;
+        regionRotated1 = 1;
+        commandable = true;
+        ambientSound = Sounds.respawning;
 
-        config(Integer.class, (UnitFactoryBuild tile, Integer i) -> {
-            tile.currentPlan = i < 0 || i >= plans.size ? -1 : i;
-            tile.progress = 0;
+        config(Integer.class, (UnitFactoryBuild build, Integer i) -> {
+            if(!configurable) return;
+
+            if(build.currentPlan == i) return;
+            build.currentPlan = i < 0 || i >= plans.size ? -1 : i;
+            build.progress = 0;
+            if(build.command != null && !build.unit().commands.contains(build.command)){
+                build.command = null;
+            }
         });
 
-        config(UnitType.class, (UnitFactoryBuild tile, UnitType val) -> {
-            tile.currentPlan = plans.indexOf(p -> p.unit == val);
-            tile.progress = 0;
+        config(UnitType.class, (UnitFactoryBuild build, UnitType val) -> {
+            if(!configurable) return;
+
+            int next = plans.indexOf(p -> p.unit == val);
+            if(build.currentPlan == next) return;
+            build.currentPlan = next;
+            build.progress = 0;
+            if(build.command != null && !val.commands.contains(build.command)){
+                build.command = null;
+            }
         });
 
-        consumes.add(new ConsumeItemDynamic((UnitFactoryBuild e) -> e.currentPlan != -1 ? plans.get(e.currentPlan).requirements : ItemStack.empty));
+        config(UnitCommand.class, (UnitFactoryBuild build, UnitCommand command) -> build.command = command);
+        configClear((UnitFactoryBuild build) -> build.command = null);
+
+        consume(new ConsumeItemDynamic((UnitFactoryBuild e) -> e.currentPlan != -1 ? plans.get(Math.min(e.currentPlan, plans.size - 1)).requirements : ItemStack.empty));
     }
 
     @Override
@@ -60,24 +88,26 @@ public class UnitFactory extends UnitBlock{
             }
         }
 
+        consumeBuilder.each(c -> c.multiplier = b -> state.rules.unitCost(b.team));
+
         super.init();
     }
 
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("progress", (UnitFactoryBuild e) -> new Bar("bar.progress", Pal.ammo, e::fraction));
+        addBar("progress", (UnitFactoryBuild e) -> new Bar("bar.progress", Pal.ammo, e::fraction));
 
-        bars.add("units", (UnitFactoryBuild e) ->
+        addBar("units", (UnitFactoryBuild e) ->
         new Bar(
             () -> e.unit() == null ? "[lightgray]" + Iconc.cancel :
                 Core.bundle.format("bar.unitcap",
                     Fonts.getUnicodeStr(e.unit().name),
                     e.team.data().countType(e.unit()),
-                    Units.getCap(e.team)
+                    e.unit() == null ? Units.getStringCap(e.team) : (e.unit().useUnitCap ? Units.getStringCap(e.team) : "∞")
                 ),
             () -> Pal.power,
-            () -> e.unit() == null ? 0f : (float)e.team.data().countType(e.unit()) / Units.getCap(e.team)
+            () -> e.unit() == null ? 0f : (e.unit().useUnitCap ? (float)e.team.data().countType(e.unit()) / Units.getCap(e.team) : 1f)
         ));
     }
 
@@ -93,14 +123,40 @@ public class UnitFactory extends UnitBlock{
         stats.remove(Stat.itemCapacity);
 
         stats.add(Stat.output, table -> {
-            Seq<UnitPlan> p = plans.select(u -> u.unit.unlockedNow());
             table.row();
-            for(var plan : p){
-                if(plan.unit.unlockedNow()){
-                    table.image(plan.unit.icon(Cicon.small)).size(8 * 3).padRight(2).right();
-                    table.add(plan.unit.localizedName).left();
-                    table.row();
-                }
+
+            for(var plan : plans){
+                table.table(Styles.grayPanel, t -> {
+
+                    if(plan.unit.isBanned()){
+                        t.image(Icon.cancel).color(Pal.remove).size(40);
+                        return;
+                    }
+
+                    if(plan.unit.unlockedNow()){
+                        t.image(plan.unit.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit).with(i -> StatValues.withTooltip(i, plan.unit));
+                        t.table(info -> {
+                            info.add(plan.unit.localizedName).left();
+                            info.row();
+                            info.add(Strings.autoFixed(plan.time / 60f, 1) + " " + Core.bundle.get("unit.seconds")).color(Color.lightGray);
+                        }).left();
+
+                        t.table(req -> {
+                            req.right();
+                            for(int i = 0; i < plan.requirements.length; i++){
+                                if(i % 6 == 0){
+                                    req.row();
+                                }
+
+                                ItemStack stack = plan.requirements[i];
+                                req.add(StatValues.displayItem(stack.item, stack.amount, plan.time, true)).pad(5);
+                            }
+                        }).right().grow().pad(10f);
+                    }else{
+                        t.image(Icon.lock).color(Pal.darkerGray).size(40);
+                    }
+                }).growX().pad(5);
+                table.row();
             }
         });
     }
@@ -111,10 +167,19 @@ public class UnitFactory extends UnitBlock{
     }
 
     @Override
-    public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
-        Draw.rect(region, req.drawx(), req.drawy());
-        Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
-        Draw.rect(topRegion, req.drawx(), req.drawy());
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(region, plan.drawx(), plan.drawy());
+        Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90);
+        Draw.rect(topRegion, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public void getPlanConfigs(Seq<UnlockableContent> options){
+        for(var plan : plans){
+            if(!plan.unit.isBanned()){
+                options.add(plan.unit);
+            }
+        }
     }
 
     public static class UnitPlan{
@@ -132,24 +197,119 @@ public class UnitFactory extends UnitBlock{
     }
 
     public class UnitFactoryBuild extends UnitBuild{
+        public @Nullable Vec2 commandPos;
+        public @Nullable UnitCommand command;
         public int currentPlan = -1;
 
         public float fraction(){
             return currentPlan == -1 ? 0 : progress / plans.get(currentPlan).time;
         }
 
+        public boolean canSetCommand(){
+            var output = unit();
+            return output != null && output.commands.size > 1 && output.allowChangeCommands &&
+                //to avoid cluttering UI, don't show command selection for "standard" units that only have two commands.
+                !(output.commands.size == 2 && output.commands.get(1) == UnitCommand.enterPayloadCommand);
+        }
+
+        @Override
+        public void created(){
+            //auto-set to the first plan, it's better than nothing.
+            if(currentPlan == -1){
+                currentPlan = plans.indexOf(u -> u.unit.unlockedNow());
+            }
+        }
+
+        @Override
+        public Vec2 getCommandPosition(){
+            return commandPos;
+        }
+
+        @Override
+        public void onCommand(Vec2 target){
+            commandPos = target;
+        }
+
         @Override
         public Object senseObject(LAccess sensor){
             if(sensor == LAccess.config) return currentPlan == -1 ? null : plans.get(currentPlan).unit;
             return super.senseObject(sensor);
         }
 
+        @Override
+        public boolean shouldActiveSound(){
+            return shouldConsume();
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.progress) return Mathf.clamp(fraction());
+            if(sensor == LAccess.itemCapacity) return Mathf.round(itemCapacity * state.rules.unitCost(team));
+            return super.sense(sensor);
+        }
+
         @Override
         public void buildConfiguration(Table table){
-            Seq<UnitType> units = Seq.with(plans).map(u -> u.unit).filter(u -> u.unlockedNow());
+            Seq<UnitType> units = Seq.with(plans).map(u -> u.unit).retainAll(u -> u.unlockedNow() && !u.isBanned());
 
             if(units.any()){
-                ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans.get(currentPlan).unit, unit -> configure(plans.indexOf(u -> u.unit == unit)));
+                ItemSelection.buildTable(UnitFactory.this, table, units, () -> currentPlan == -1 ? null : plans.get(currentPlan).unit, unit -> configure(plans.indexOf(u -> u.unit == unit)), selectionRows, selectionColumns);
+
+                table.row();
+
+                Table commands = new Table();
+                commands.top().left();
+
+                Runnable rebuildCommands = () -> {
+                    commands.clear();
+                    commands.background(null);
+                    var unit = unit();
+                    if(unit != null && canSetCommand()){
+                        commands.background(Styles.black6);
+                        var group = new ButtonGroup<ImageButton>();
+                        group.setMinCheckCount(0);
+                        int i = 0, columns = Mathf.clamp(units.size, 2, selectionColumns);
+                        var list = unit.commands;
+
+                        commands.image(Tex.whiteui, Pal.gray).height(4f).growX().colspan(columns).row();
+
+                        for(var item : list){
+                            ImageButton button = commands.button(item.getIcon(), Styles.clearNoneTogglei, 40f, () -> {
+                                configure(item);
+                            }).tooltip(item.localized()).group(group).get();
+
+                            button.update(() -> button.setChecked(command == item || (command == null && unit.defaultCommand == item)));
+
+                            if(++i % columns == 0){
+                                commands.row();
+                            }
+                        }
+
+                        if(list.size < columns){
+                            for(int j = 0; j < (columns - list.size); j++){
+                                commands.add().size(40f);
+                            }
+                        }
+                    }
+                };
+
+                rebuildCommands.run();
+
+                //Since the menu gets hidden when a new unit is selected, this is unnecessary.
+                /*
+                UnitType[] lastUnit = {unit()};
+
+                commands.update(() -> {
+                    if(lastUnit[0] != unit()){
+                        lastUnit[0] = unit();
+                        rebuildCommands.run();
+                    }
+                });*/
+
+                table.row();
+
+                table.add(commands).fillX().left();
+
             }else{
                 table.table(Styles.black3, t -> t.add("@none").color(Color.lightGray));
             }
@@ -170,7 +330,7 @@ public class UnitFactory extends UnitBlock{
             table.table(t -> {
                 t.left();
                 t.image().update(i -> {
-                    i.setDrawable(currentPlan == -1 ? Icon.cancel : reg.set(plans.get(currentPlan).unit.icon(Cicon.medium)));
+                    i.setDrawable(currentPlan == -1 ? Icon.cancel : reg.set(plans.get(currentPlan).unit.uiIcon));
                     i.setScaling(Scaling.fit);
                     i.setColor(currentPlan == -1 ? Color.lightGray : Color.white);
                 }).size(32).padBottom(-4).padRight(2);
@@ -205,13 +365,17 @@ public class UnitFactory extends UnitBlock{
 
         @Override
         public void updateTile(){
+            if(!configurable){
+                currentPlan = 0;
+            }
+
             if(currentPlan < 0 || currentPlan >= plans.size){
                 currentPlan = -1;
             }
 
-            if(consValid() && currentPlan != -1){
-                time += edelta() * speedScl * Vars.state.rules.unitBuildSpeedMultiplier;
-                progress += edelta() * Vars.state.rules.unitBuildSpeedMultiplier;
+            if(efficiency > 0 && currentPlan != -1){
+                time += edelta() * speedScl * Vars.state.rules.unitBuildSpeed(team);
+                progress += edelta() * Vars.state.rules.unitBuildSpeed(team);
                 speedScl = Mathf.lerpDelta(speedScl, 1f, 0.05f);
             }else{
                 speedScl = Mathf.lerpDelta(speedScl, 0f, 0.05f);
@@ -222,12 +386,28 @@ public class UnitFactory extends UnitBlock{
             if(currentPlan != -1 && payload == null){
                 UnitPlan plan = plans.get(currentPlan);
 
-                if(progress >= plan.time && consValid()){
-                    progress = 0f;
+                //make sure to reset plan when the unit got banned after placement
+                if(plan.unit.isBanned()){
+                    currentPlan = -1;
+                    return;
+                }
 
-                    payload = new UnitPayload(plan.unit.create(team));
+                if(progress >= plan.time){
+                    progress %= 1f;
+
+                    Unit unit = plan.unit.create(team);
+                    if(unit.isCommandable()){
+                        if(commandPos != null){
+                            unit.command().commandPosition(commandPos);
+                        }
+
+                        unit.command().command(command == null && unit.type.defaultCommand != null ? unit.type.defaultCommand : command);
+                    }
+
+                    payload = new UnitPayload(unit);
                     payVector.setZero();
                     consume();
+                    Events.fire(new UnitCreateEvent(payload.unit, this));
                 }
 
                 progress = Mathf.clamp(progress, 0, plan.time);
@@ -244,7 +424,7 @@ public class UnitFactory extends UnitBlock{
 
         @Override
         public int getMaximumAccepted(Item item){
-            return capacities[item.id];
+            return Mathf.round(capacities[item.id] * state.rules.unitCost(team));
         }
 
         @Override
@@ -259,7 +439,7 @@ public class UnitFactory extends UnitBlock{
 
         @Override
         public byte version(){
-            return 1;
+            return 3;
         }
 
         @Override
@@ -267,6 +447,8 @@ public class UnitFactory extends UnitBlock{
             super.write(write);
             write.f(progress);
             write.s(currentPlan);
+            TypeIO.writeVecNullable(write, commandPos);
+            TypeIO.writeCommand(write, command);
         }
 
         @Override
@@ -274,6 +456,13 @@ public class UnitFactory extends UnitBlock{
             super.read(read, revision);
             progress = read.f();
             currentPlan = read.s();
+            if(revision >= 2){
+                commandPos = TypeIO.readVecNullable(read);
+            }
+
+            if(revision >= 3){
+                command = TypeIO.readCommand(read);
+            }
         }
     }
 }
diff --git a/core/src/mindustry/world/consumers/Consume.java b/core/src/mindustry/world/consumers/Consume.java
index 3066dbb9bb..7f73226f8e 100644
--- a/core/src/mindustry/world/consumers/Consume.java
+++ b/core/src/mindustry/world/consumers/Consume.java
@@ -1,31 +1,26 @@
 package mindustry.world.consumers;
 
+import arc.func.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import mindustry.gen.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
 
 /** An abstract class that defines a type of resource that a block can consume. */
 public abstract class Consume{
     /** If true, this consumer will not influence consumer validity. */
-    protected boolean optional;
+    public boolean optional;
     /** If true, this consumer will be displayed as a boost input. */
-    protected boolean booster;
-    protected boolean update = true;
+    public boolean booster;
+    /** If false, this consumer will still be checked, but it will need to updated manually. */
+    public boolean update = true;
+    /** Multiplier for costs. Does not work for power consumers. */
+    public Floatf<Building> multiplier = b -> 1f;
 
     /**
-     * Apply a filter to items accepted.
-     * This should set all item IDs that are present in the filter to true.
+     * Apply extra filters to a block.
      */
-    public void applyItemFilter(Bits filter){
-
-    }
-
-    /**
-     * Apply a filter to liquids accepted.
-     * This should set all liquid IDs that are present in the filter to true.
-     */
-    public void applyLiquidFilter(Bits filter){
+    public void apply(Block block){
 
     }
 
@@ -44,30 +39,27 @@ public abstract class Consume{
         return this;
     }
 
-    public boolean isOptional(){
-        return optional;
+    /** @return if true, this consumer will be ignored in the consumer list (no updates or valid() checks) */
+    public boolean ignore(){
+        return false;
     }
 
-    public boolean isBoost(){
-        return booster;
-    }
-
-    public boolean isUpdate(){
-        return update;
-    }
-
-    public abstract ConsumeType type();
-
-    public abstract void build(Building tile, Table table);
+    public void build(Building build, Table table){}
 
     /** Called when a consumption is triggered manually. */
-    public void trigger(Building entity){}
+    public void trigger(Building build){}
 
-    public abstract String getIcon();
+    public void update(Building build){}
 
-    public abstract void update(Building entity);
+    /** @return [0, 1] efficiency multiplier based on input. Returns 0 if not valid in subclasses. Should return fraction if needs are partially met. */
+    public float efficiency(Building build){
+        return 1f;
+    }
 
-    public abstract boolean valid(Building entity);
+    /** @return multiplier for efficiency - this can be above 1. Will not influence a building's base efficiency value. */
+    public float efficiencyMultiplier(Building build){
+        return 1f;
+    }
 
-    public abstract void display(Stats stats);
+    public void display(Stats stats){}
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeCoolant.java b/core/src/mindustry/world/consumers/ConsumeCoolant.java
new file mode 100644
index 0000000000..9ff7a9b57d
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeCoolant.java
@@ -0,0 +1,23 @@
+package mindustry.world.consumers;
+
+/** A ConsumeLiquidFilter that consumes specific coolant, selected based on stats. */
+public class ConsumeCoolant extends ConsumeLiquidFilter{
+    public float maxTemp = 0.5f, maxFlammability = 0.1f;
+    public boolean allowLiquid = true, allowGas = false;
+
+    public ConsumeCoolant(float amount, boolean allowLiquid, boolean allowGas){
+        this.allowLiquid = allowLiquid;
+        this.allowGas = allowGas;
+
+        this.filter = liquid -> liquid.coolant && (this.allowLiquid && !liquid.gas || this.allowGas && liquid.gas) && liquid.temperature <= maxTemp && liquid.flammability < maxFlammability;
+        this.amount = amount;
+    }
+    
+    public ConsumeCoolant(float amount){
+        this(amount, true, false);
+    }
+
+    public ConsumeCoolant(){
+        this(1f);
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItemCharged.java b/core/src/mindustry/world/consumers/ConsumeItemCharged.java
new file mode 100644
index 0000000000..66e89d117f
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeItemCharged.java
@@ -0,0 +1,22 @@
+package mindustry.world.consumers;
+
+import mindustry.type.*;
+
+/** For mods. I don't use this (yet). */
+public class ConsumeItemCharged extends ConsumeItemEfficiency{
+    public float minCharge;
+
+    public ConsumeItemCharged(float minCharge){
+        this.minCharge = minCharge;
+        filter = item -> item.charge >= this.minCharge;
+    }
+
+    public ConsumeItemCharged(){
+        this(0.2f);
+    }
+
+    @Override
+    public float itemEfficiencyMultiplier(Item item){
+        return item.charge;
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItemDynamic.java b/core/src/mindustry/world/consumers/ConsumeItemDynamic.java
index 580ba7ed1d..b026ce3df9 100644
--- a/core/src/mindustry/world/consumers/ConsumeItemDynamic.java
+++ b/core/src/mindustry/world/consumers/ConsumeItemDynamic.java
@@ -2,80 +2,62 @@ package mindustry.world.consumers;
 
 import arc.func.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
 
 public class ConsumeItemDynamic extends Consume{
     public final Func<Building, ItemStack[]> items;
 
+    @SuppressWarnings("unchecked")
     public <T extends Building> ConsumeItemDynamic(Func<T, ItemStack[]> items){
         this.items = (Func<Building, ItemStack[]>)items;
     }
 
     @Override
-    public void applyItemFilter(Bits filter){
-        //this must be done dynamically
+    public void apply(Block block){
+        block.hasItems = true;
+        block.acceptsItems = true;
     }
 
     @Override
-    public ConsumeType type(){
-        return ConsumeType.item;
-    }
-
-    @Override
-    public void build(Building tile, Table table){
-        ItemStack[][] current = {items.get(tile)};
+    public void build(Building build, Table table){
+        ItemStack[][] current = {items.get(build)};
 
         table.table(cont -> {
             table.update(() -> {
-                if(current[0] != items.get(tile)){
-                    rebuild(tile, cont);
-                    current[0] = items.get(tile);
+                if(current[0] != items.get(build)){
+                    rebuild(build, cont);
+                    current[0] = items.get(build);
                 }
             });
 
-            rebuild(tile, cont);
+            rebuild(build, cont);
         });
     }
 
-    private void rebuild(Building tile, Table table){
+    private void rebuild(Building build, Table table){
         table.clear();
         int i = 0;
 
-        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))).padRight(8).left();
+        for(ItemStack stack : items.get(build)){
+            table.add(new ReqImage(StatValues.stack(stack.item, Math.round(stack.amount * multiplier.get(build))),
+            () -> build.items != null && build.items.has(stack.item, Math.round(stack.amount * multiplier.get(build))))).padRight(8).left();
             if(++i % 4 == 0) table.row();
         }
     }
 
     @Override
-    public String getIcon(){
-        return "icon-item";
-    }
-
-    @Override
-    public void update(Building entity){
-
-    }
-
-    @Override
-    public void trigger(Building entity){
-        for(ItemStack stack : items.get(entity)){
-            entity.items.remove(stack);
+    public void trigger(Building build){
+        for(ItemStack stack : items.get(build)){
+            build.items.remove(stack.item, Math.round(stack.amount * multiplier.get(build)));
         }
     }
 
     @Override
-    public boolean valid(Building entity){
-        return entity.items != null && entity.items.has(items.get(entity));
-    }
-
-    @Override
-    public void display(Stats stats){
-        //should be handled by the block
+    public float efficiency(Building build){
+        return build.consumeTriggerValid() || build.items.has(items.get(build), multiplier.get(build)) ? 1f : 0f;
     }
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeItemEfficiency.java b/core/src/mindustry/world/consumers/ConsumeItemEfficiency.java
new file mode 100644
index 0000000000..f424c37f66
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeItemEfficiency.java
@@ -0,0 +1,24 @@
+package mindustry.world.consumers;
+
+import arc.func.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.type.*;
+import mindustry.world.meta.*;
+
+public class ConsumeItemEfficiency extends ConsumeItemFilter{
+    /** This has no effect on the consumer itself, but is used for stat display. */
+    public @Nullable ObjectFloatMap<Item> itemDurationMultipliers;
+
+    public ConsumeItemEfficiency(Boolf<Item> item){
+        super(item);
+    }
+
+    public ConsumeItemEfficiency(){
+    }
+
+    @Override
+    public void display(Stats stats){
+        stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(this::itemEfficiencyMultiplier, stats.timePeriod, filter, itemDurationMultipliers));
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItemExplode.java b/core/src/mindustry/world/consumers/ConsumeItemExplode.java
new file mode 100644
index 0000000000..f2d3fb78f9
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeItemExplode.java
@@ -0,0 +1,62 @@
+package mindustry.world.consumers;
+
+import arc.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+/** Causes a block to explode when explosive items are moved into it. */
+public class ConsumeItemExplode extends ConsumeItemFilter{
+    public float damage = 4f;
+    public float threshold, baseChance = 0.06f;
+    public Effect explodeEffect = Fx.generatespark;
+
+    public ConsumeItemExplode(float threshold){
+        this.filter = item -> item.explosiveness >= this.threshold;
+        this.threshold = threshold;
+    }
+
+    public ConsumeItemExplode(){
+        this(0.5f);
+    }
+
+    @Override
+    public void update(Building build){
+        var item = getConsumed(build);
+
+        if(item != null){
+            if(Vars.state.rules.reactorExplosions && Mathf.chance(build.delta() * baseChance * Mathf.clamp(item.explosiveness - threshold))){
+                build.damage(damage);
+                explodeEffect.at(build.x + Mathf.range(build.block.size * tilesize / 2f), build.y + Mathf.range(build.block.size * tilesize / 2f));
+                Events.fire(Trigger.blastGenerator);
+            }
+        }
+    }
+
+    //as this consumer doesn't actually consume anything, all methods below are empty
+
+    @Override
+    public void build(Building build, Table table){}
+
+    @Override
+    public void trigger(Building build){}
+
+    @Override
+    public void display(Stats stats){}
+
+    @Override
+    public void apply(Block block){}
+
+    @Override
+    public float efficiency(Building build){
+        return 1f;
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItemExplosive.java b/core/src/mindustry/world/consumers/ConsumeItemExplosive.java
new file mode 100644
index 0000000000..c2bc2f1370
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeItemExplosive.java
@@ -0,0 +1,21 @@
+package mindustry.world.consumers;
+
+import mindustry.type.*;
+
+public class ConsumeItemExplosive extends ConsumeItemEfficiency{
+    public float minExplosiveness;
+
+    public ConsumeItemExplosive(float minCharge){
+        this.minExplosiveness = minCharge;
+        filter = item -> item.explosiveness >= this.minExplosiveness;
+    }
+
+    public ConsumeItemExplosive(){
+        this(0.2f);
+    }
+
+    @Override
+    public float itemEfficiencyMultiplier(Item item){
+        return item.explosiveness;
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/mindustry/world/consumers/ConsumeItemFilter.java
index 93d70a46f3..b0ca96cc71 100644
--- a/core/src/mindustry/world/consumers/ConsumeItemFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumeItemFilter.java
@@ -2,75 +2,80 @@ package mindustry.world.consumers;
 
 import arc.func.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
+import arc.util.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 import static mindustry.Vars.*;
 
 public class ConsumeItemFilter extends Consume{
-    public final Boolf<Item> filter;
+    public Boolf<Item> filter = i -> false;
 
     public ConsumeItemFilter(Boolf<Item> item){
         this.filter = item;
     }
 
-    @Override
-    public void applyItemFilter(Bits arr){
-        content.items().each(filter, item -> arr.set(item.id));
+    public ConsumeItemFilter(){
     }
 
     @Override
-    public ConsumeType type(){
-        return ConsumeType.item;
+    public void apply(Block block){
+        block.hasItems = true;
+        block.acceptsItems = true;
+        content.items().each(filter, item -> block.itemFilter[item.id] = true);
     }
 
     @Override
-    public void build(Building tile, Table table){
+    public void build(Building build, 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), 1),
-            () -> tile.items != null && tile.items.has(item))));
+        content.items().each(i -> filter.get(i) && i.unlockedNow(), item -> image.add(new ReqImage(StatValues.stack(item, 1),
+            () -> build.items.has(item))));
 
         table.add(image).size(8 * 4);
     }
 
     @Override
-    public String getIcon(){
-        return "icon-item";
+    public void update(Building build){
     }
 
     @Override
-    public void update(Building entity){
-
-    }
-
-    @Override
-    public void trigger(Building entity){
-        for(int i = 0; i < content.items().size; i++){
-            Item item = content.item(i);
-            if(entity.items != null && entity.items.has(item) && this.filter.get(item)){
-                entity.items.remove(item, 1);
-                break;
-            }
+    public void trigger(Building build){
+        Item item = getConsumed(build);
+        if(item != null){
+            build.items.remove(item, 1);
         }
     }
 
     @Override
-    public boolean valid(Building entity){
+    public float efficiency(Building build){
+        return build.consumeTriggerValid() || getConsumed(build) != null ? 1f : 0f;
+    }
+
+    public @Nullable Item getConsumed(Building build){
         for(int i = 0; i < content.items().size; i++){
             Item item = content.item(i);
-            if(entity.items != null && entity.items.has(item) && this.filter.get(item)){
-                return true;
+            if(build.items.has(item) && this.filter.get(item)){
+                return item;
             }
         }
-        return false;
+        return null;
     }
 
     @Override
     public void display(Stats stats){
-        stats.add(booster ? Stat.booster : Stat.input, new ItemFilterValue(filter));
+        stats.add(booster ? Stat.booster : Stat.input, StatValues.items(stats.timePeriod, filter));
+    }
+
+    @Override
+    public float efficiencyMultiplier(Building build){
+        var item = getConsumed(build);
+        return item == null ? 0f : itemEfficiencyMultiplier(item);
+    }
+
+    public float itemEfficiencyMultiplier(Item item){
+        return 1f;
     }
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeItemFlammable.java b/core/src/mindustry/world/consumers/ConsumeItemFlammable.java
new file mode 100644
index 0000000000..df3dd87069
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeItemFlammable.java
@@ -0,0 +1,21 @@
+package mindustry.world.consumers;
+
+import mindustry.type.*;
+
+public class ConsumeItemFlammable extends ConsumeItemEfficiency{
+    public float minFlammability;
+
+    public ConsumeItemFlammable(float minFlammability){
+        this.minFlammability = minFlammability;
+        filter = item -> item.flammability >= this.minFlammability;
+    }
+
+    public ConsumeItemFlammable(){
+        this(0.2f);
+    }
+
+    @Override
+    public float itemEfficiencyMultiplier(Item item){
+        return item.flammability;
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItemList.java b/core/src/mindustry/world/consumers/ConsumeItemList.java
new file mode 100644
index 0000000000..7dea4e7a3e
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeItemList.java
@@ -0,0 +1,33 @@
+package mindustry.world.consumers;
+
+import arc.struct.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+
+public class ConsumeItemList extends ConsumeItemFilter{
+    public ObjectFloatMap<Item> itemMultipliers = new ObjectFloatMap<>();
+
+    public ConsumeItemList(Item... items){
+        this();
+        for(Item i : items){
+            itemMultipliers.put(i, 1f);
+        }
+    }
+
+    public ConsumeItemList(){
+        filter = item -> itemMultipliers.containsKey(item);
+    }
+
+    /** Initializes item efficiency multiplier map. Format: [item1, mult1, item2, mult2...] */
+    public void setMultipliers(Object... objects){
+        for(int i = 0; i < objects.length; i += 2){
+            itemMultipliers.put((Item)objects[i], (Float)objects[i + 1]);
+        }
+    }
+
+    @Override
+    public float efficiencyMultiplier(Building build){
+        var item = getConsumed(build);
+        return itemMultipliers.get(item, 1f);
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItemRadioactive.java b/core/src/mindustry/world/consumers/ConsumeItemRadioactive.java
new file mode 100644
index 0000000000..ab044c6cbf
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeItemRadioactive.java
@@ -0,0 +1,21 @@
+package mindustry.world.consumers;
+
+import mindustry.type.*;
+
+public class ConsumeItemRadioactive extends ConsumeItemEfficiency{
+    public float minRadioactivity;
+
+    public ConsumeItemRadioactive(float minRadioactivity){
+        this.minRadioactivity = minRadioactivity;
+        filter = item -> item.radioactivity >= this.minRadioactivity;
+    }
+
+    public ConsumeItemRadioactive(){
+        this(0.2f);
+    }
+
+    @Override
+    public float itemEfficiencyMultiplier(Item item){
+        return item.radioactivity;
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeItems.java b/core/src/mindustry/world/consumers/ConsumeItems.java
index c4f5b03cfd..c43fa42a32 100644
--- a/core/src/mindustry/world/consumers/ConsumeItems.java
+++ b/core/src/mindustry/world/consumers/ConsumeItems.java
@@ -1,12 +1,11 @@
 package mindustry.world.consumers;
 
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 public class ConsumeItems extends Consume{
     public final ItemStack[] items;
@@ -21,53 +20,40 @@ public class ConsumeItems extends Consume{
     }
 
     @Override
-    public void applyItemFilter(Bits filter){
-        for(ItemStack stack : items){
-            filter.set(stack.item.id);
+    public void apply(Block block){
+        block.hasItems = true;
+        block.acceptsItems = true;
+        for(var stack : items){
+            block.itemFilter[stack.item.id] = true;
         }
     }
 
     @Override
-    public ConsumeType type(){
-        return ConsumeType.item;
-    }
-
-    @Override
-    public void build(Building tile, Table table){
+    public void build(Building build, Table table){
         table.table(c -> {
             int i = 0;
-            for(ItemStack stack : items){
-                c.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount),
-                () -> tile.items != null && tile.items.has(stack.item, stack.amount))).padRight(8);
-                if(++i % 4 == 0) table.row();
+            for(var stack : items){
+                c.add(new ReqImage(StatValues.stack(stack.item, Math.round(stack.amount * multiplier.get(build))),
+                () -> build.items.has(stack.item, Math.round(stack.amount * multiplier.get(build))))).padRight(8);
+                if(++i % 4 == 0) c.row();
             }
         }).left();
     }
 
     @Override
-    public String getIcon(){
-        return "icon-item";
-    }
-
-    @Override
-    public void update(Building entity){
-
-    }
-
-    @Override
-    public void trigger(Building entity){
-        for(ItemStack stack : items){
-            entity.items.remove(stack);
+    public void trigger(Building build){
+        for(var stack : items){
+            build.items.remove(stack.item, Math.round(stack.amount * multiplier.get(build)));
         }
     }
 
     @Override
-    public boolean valid(Building entity){
-        return entity.items != null && entity.items.has(items);
+    public float efficiency(Building build){
+        return build.consumeTriggerValid() || build.items.has(items, multiplier.get(build)) ? 1f : 0f;
     }
 
     @Override
     public void display(Stats stats){
-        stats.add(booster ? Stat.booster : Stat.input, new ItemListValue(items));
+        stats.add(booster ? Stat.booster : Stat.input, stats.timePeriod < 0 ? StatValues.items(items) : StatValues.items(stats.timePeriod, items));
     }
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquid.java b/core/src/mindustry/world/consumers/ConsumeLiquid.java
index 0834935198..8d756cdbdc 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquid.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquid.java
@@ -1,12 +1,15 @@
 package mindustry.world.consumers;
 
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
+//TODO replace with ConsumeLiquids?
 public class ConsumeLiquid extends ConsumeLiquidBase{
     public final Liquid liquid;
 
@@ -19,33 +22,38 @@ public class ConsumeLiquid extends ConsumeLiquidBase{
         this(null, 0f);
     }
 
+
     @Override
-    public void applyLiquidFilter(Bits filter){
-        filter.set(liquid.id);
+    public void apply(Block block){
+        super.apply(block);
+        block.liquidFilter[liquid.id] = true;
     }
 
     @Override
-    public void build(Building tile, Table table){
-        table.add(new ReqImage(liquid.icon(Cicon.medium), () -> valid(tile))).size(8 * 4);
+    public void build(Building build, Table table){
+        table.add(new ReqImage(liquid.uiIcon, () -> build.liquids.get(liquid) > 0)).size(iconMed).top().left();
     }
 
     @Override
-    public String getIcon(){
-        return "icon-liquid-consume";
+    public void update(Building build){
+        build.liquids.remove(liquid, amount * build.edelta() * multiplier.get(build));
     }
 
     @Override
-    public void update(Building entity){
-        entity.liquids.remove(liquid, Math.min(use(entity), entity.liquids.get(liquid)));
-    }
-
-    @Override
-    public boolean valid(Building entity){
-        return entity != null && entity.liquids != null && entity.liquids.get(liquid) >= use(entity);
+    public float efficiency(Building build){
+        float ed = build.edelta() * build.efficiencyScale();
+        if(ed <= 0.00000001f) return 0f;
+        //there can be more liquid than necessary, so cap at 1
+        return Math.min(build.liquids.get(liquid) / (amount * ed * multiplier.get(build)), 1f);
     }
 
     @Override
     public void display(Stats stats){
         stats.add(booster ? Stat.booster : Stat.input, liquid, amount * 60f, true);
     }
+
+    @Override
+    public boolean consumes(Liquid liquid){
+        return liquid == this.liquid;
+    }
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
index 5e581fc610..9a74338434 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
@@ -1,21 +1,22 @@
 package mindustry.world.consumers;
 
-import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
 
 public abstract class ConsumeLiquidBase extends Consume{
     /** amount used per frame */
-    public final float amount;
+    public float amount;
 
     public ConsumeLiquidBase(float amount){
         this.amount = amount;
     }
 
+    public ConsumeLiquidBase(){}
+
     @Override
-    public ConsumeType type(){
-        return ConsumeType.liquid;
+    public void apply(Block block){
+        block.hasLiquids = true;
     }
 
-    protected float use(Building entity){
-        return Math.min(amount * entity.edelta(), entity.block.liquidCapacity);
-    }
+    public abstract boolean consumes(Liquid liquid);
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
index 268cdfaf54..ceacb52554 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
@@ -3,53 +3,90 @@ package mindustry.world.consumers;
 import arc.func.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
-import mindustry.world.meta.values.*;
 
 import static mindustry.Vars.*;
 
 public class ConsumeLiquidFilter extends ConsumeLiquidBase{
-    public final Boolf<Liquid> filter;
+    public Boolf<Liquid> filter = l -> false;
 
     public ConsumeLiquidFilter(Boolf<Liquid> liquid, float amount){
         super(amount);
         this.filter = liquid;
     }
 
-    @Override
-    public void applyLiquidFilter(Bits arr){
-        content.liquids().each(filter, item -> arr.set(item.id));
+    public ConsumeLiquidFilter(){
     }
 
     @Override
-    public void build(Building tile, Table table){
+    public void apply(Block block){
+        block.hasLiquids = true;
+        content.liquids().each(filter, item -> block.liquidFilter[item.id] = true);
+    }
+
+    @Override
+    public void build(Building build, Table table){
         Seq<Liquid> list = content.liquids().select(l -> !l.isHidden() && filter.get(l));
         MultiReqImage image = new MultiReqImage();
-        list.each(liquid -> image.add(new ReqImage(liquid.icon(Cicon.medium), () -> tile.liquids != null && tile.liquids.get(liquid) >= use(tile))));
+        list.each(liquid -> image.add(new ReqImage(liquid.uiIcon, () -> getConsumed(build) == liquid)));
 
         table.add(image).size(8 * 4);
     }
 
     @Override
-    public String getIcon(){
-        return "icon-liquid-consume";
+    public void update(Building build){
+        Liquid liq = getConsumed(build);
+        if(liq != null){
+            build.liquids.remove(liq, amount * build.edelta() * multiplier.get(build));
+        }
     }
 
     @Override
-    public void update(Building entity){
-        entity.liquids.remove(entity.liquids.current(), use(entity));
+    public float efficiency(Building build){
+        var liq = getConsumed(build);
+        float ed = build.edelta();
+        if(ed <= 0.00000001f) return 0f;
+        return liq != null ? Math.min(build.liquids.get(liq) / (amount * ed * multiplier.get(build)), 1f) : 0f;
     }
 
     @Override
-    public boolean valid(Building entity){
-        return entity != null && entity.liquids != null && filter.get(entity.liquids.current()) && entity.liquids.currentAmount() >= use(entity);
+    public float efficiencyMultiplier(Building build){
+        var liq = getConsumed(build);
+        return liq == null ? 0 : liquidEfficiencyMultiplier(liq);
+    }
+
+    public @Nullable Liquid getConsumed(Building build){
+        if(filter.get(build.liquids.current()) && build.liquids.currentAmount() > 0){
+            return build.liquids.current();
+        }
+
+        var liqs = content.liquids();
+
+        for(int i = 0; i < liqs.size; i++){
+            var liq = liqs.get(i);
+            if(filter.get(liq) && build.liquids.get(liq) > 0){
+                return liq;
+            }
+        }
+        return null;
     }
 
     @Override
     public void display(Stats stats){
-        stats.add(booster ? Stat.booster : Stat.input, new LiquidFilterValue(filter, amount * 60f, true));
+        stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(filter, amount * 60f, true));
+    }
+
+    @Override
+    public boolean consumes(Liquid liquid){
+        return filter.get(liquid);
+    }
+
+    public float liquidEfficiencyMultiplier(Liquid liquid){
+        return 1f;
     }
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidFlammable.java b/core/src/mindustry/world/consumers/ConsumeLiquidFlammable.java
new file mode 100644
index 0000000000..df2826b0e7
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidFlammable.java
@@ -0,0 +1,32 @@
+package mindustry.world.consumers;
+
+import mindustry.type.*;
+import mindustry.world.meta.*;
+
+public class ConsumeLiquidFlammable extends ConsumeLiquidFilter{
+    public float minFlammability;
+
+    public ConsumeLiquidFlammable(float minFlammability, float amount){
+        this.amount = amount;
+        this.minFlammability = minFlammability;
+        this.filter = liquid -> liquid.flammability >= this.minFlammability;
+    }
+
+    public ConsumeLiquidFlammable(float amount){
+        this(0.2f, amount);
+    }
+
+    public ConsumeLiquidFlammable(){
+        this(0.2f);
+    }
+
+    @Override
+    public void display(Stats stats){
+        stats.add(booster ? Stat.booster : Stat.input, StatValues.liquidEffMultiplier(l -> l.flammability, amount * 60f, filter));
+    }
+
+    @Override
+    public float liquidEfficiencyMultiplier(Liquid liquid){
+        return liquid.flammability;
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquids.java b/core/src/mindustry/world/consumers/ConsumeLiquids.java
new file mode 100644
index 0000000000..2b53287374
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeLiquids.java
@@ -0,0 +1,68 @@
+package mindustry.world.consumers;
+
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+public class ConsumeLiquids extends Consume{
+    public final LiquidStack[] liquids;
+
+    public ConsumeLiquids(LiquidStack[] liquids){
+        this.liquids = liquids;
+    }
+
+    /** Mods.*/
+    protected ConsumeLiquids(){
+        this(LiquidStack.empty);
+    }
+
+    @Override
+    public void apply(Block block){
+        block.hasLiquids = true;
+        for(var stack : liquids){
+            block.liquidFilter[stack.liquid.id] = true;
+        }
+    }
+
+    @Override
+    public void build(Building build, Table table){
+        table.table(c -> {
+            int i = 0;
+            for(var stack : liquids){
+                c.add(new ReqImage(stack.liquid.uiIcon,
+                () -> build.liquids.get(stack.liquid) > 0)).size(Vars.iconMed).padRight(8);
+                if(++i % 4 == 0) c.row();
+            }
+        }).left();
+    }
+
+    @Override
+    public void update(Building build){
+        float mult = multiplier.get(build);
+        for(var stack : liquids){
+            build.liquids.remove(stack.liquid, stack.amount * build.edelta() * mult);
+        }
+    }
+
+    @Override
+    public float efficiency(Building build){
+        float mult = multiplier.get(build);
+        float ed = build.edelta() * build.efficiencyScale();
+        if(ed <= 0.00000001f) return 0f;
+        float min = 1f;
+        for(var stack : liquids){
+            min = Math.min(build.liquids.get(stack.liquid) / (stack.amount * ed * mult), min);
+        }
+        return min;
+    }
+
+    @Override
+    public void display(Stats stats){
+        stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(1f, true, liquids));
+    }
+
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidsDynamic.java b/core/src/mindustry/world/consumers/ConsumeLiquidsDynamic.java
new file mode 100644
index 0000000000..ae82560ef4
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidsDynamic.java
@@ -0,0 +1,69 @@
+package mindustry.world.consumers;
+
+import arc.func.*;
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+
+public class ConsumeLiquidsDynamic extends Consume{
+    public final Func<Building, LiquidStack[]> liquids;
+
+    @SuppressWarnings("unchecked")
+    public <T extends Building> ConsumeLiquidsDynamic(Func<T, LiquidStack[]> liquids){
+        this.liquids = (Func<Building, LiquidStack[]>)liquids;
+    }
+
+    @Override
+    public void apply(Block block){
+        block.hasLiquids = true;
+    }
+
+    @Override
+    public void build(Building build, Table table){
+        LiquidStack[][] current = {liquids.get(build)};
+
+        table.table(cont -> {
+            table.update(() -> {
+                if(current[0] != liquids.get(build)){
+                    rebuild(build, cont);
+                    current[0] = liquids.get(build);
+                }
+            });
+
+            rebuild(build, cont);
+        });
+    }
+
+    private void rebuild(Building build, Table table){
+        table.clear();
+        int i = 0;
+
+        for(LiquidStack stack : liquids.get(build)){
+            table.add(new ReqImage(stack.liquid.uiIcon,
+                    () -> build.liquids != null && build.liquids.get(stack.liquid) > 0)).size(Vars.iconMed).padRight(8);
+            if(++i % 4 == 0) table.row();
+        }
+    }
+
+    @Override
+    public void update(Building build){
+        float mult = multiplier.get(build);
+        for(LiquidStack stack : liquids.get(build)){
+            build.liquids.remove(stack.liquid, stack.amount * build.edelta() * mult);
+        }
+    }
+
+    @Override
+    public float efficiency(Building build){
+        float ed = build.edelta();
+        if(ed <= 0.00000001f) return 0f;
+        float min = 1f;
+        for(LiquidStack stack : liquids.get(build)){
+            min = Math.min(build.liquids.get(stack.liquid) / (stack.amount * ed * multiplier.get(build)), min);
+        }
+        return min;
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumePayloadDynamic.java b/core/src/mindustry/world/consumers/ConsumePayloadDynamic.java
new file mode 100644
index 0000000000..ebb6f32430
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumePayloadDynamic.java
@@ -0,0 +1,72 @@
+package mindustry.world.consumers;
+
+import arc.func.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
+
+public class ConsumePayloadDynamic extends Consume{
+    public final Func<Building, Seq<PayloadStack>> payloads;
+
+    @SuppressWarnings("unchecked")
+    public <T extends Building>  ConsumePayloadDynamic(Func<T, Seq<PayloadStack>> payloads){
+        this.payloads = (Func<Building, Seq<PayloadStack>>)payloads;
+    }
+
+    @Override
+    public float efficiency(Building build){
+        float mult = multiplier.get(build);
+        for(PayloadStack stack : payloads.get(build)){
+            if(!build.getPayloads().contains(stack.item, Math.round(stack.amount * mult))){
+                return 0f;
+            }
+        }
+        return 1f;
+    }
+
+    @Override
+    public void trigger(Building build){
+        float mult = multiplier.get(build);
+        for(PayloadStack stack : payloads.get(build)){
+            build.getPayloads().remove(stack.item, Math.round(stack.amount * mult));
+        }
+    }
+
+    @Override
+    public void display(Stats stats){
+        //needs to be implemented by the block itself, not enough info to display here
+    }
+
+    @Override
+    public void build(Building build, Table table){
+        Seq[] current = {payloads.get(build)};
+
+        table.table(cont -> {
+            table.update(() -> {
+                if(current[0] != payloads.get(build)){
+                    rebuild(build, cont);
+                    current[0] = payloads.get(build);
+                }
+            });
+
+            rebuild(build, cont);
+        });
+    }
+
+    private void rebuild(Building build, Table table){
+        var inv = build.getPayloads();
+        var pay = payloads.get(build);
+
+        table.table(c -> {
+            int i = 0;
+            for(var stack : pay){
+                c.add(new ReqImage(StatValues.stack(stack.item, Math.round(stack.amount * multiplier.get(build))),
+                () -> inv.contains(stack.item, Math.round(stack.amount * multiplier.get(build))))).padRight(8);
+                if(++i % 4 == 0) c.row();
+            }
+        }).left();
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumePayloadFilter.java b/core/src/mindustry/world/consumers/ConsumePayloadFilter.java
new file mode 100644
index 0000000000..ffcf0dc2a6
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumePayloadFilter.java
@@ -0,0 +1,66 @@
+package mindustry.world.consumers;
+
+import arc.func.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
+
+import static mindustry.Vars.*;
+
+public class ConsumePayloadFilter extends Consume{
+    //cache fitting blocks to prevent search over all blocks later
+    protected final UnlockableContent[] fitting;
+
+    public Boolf<UnlockableContent> filter;
+
+    public ConsumePayloadFilter(Boolf<UnlockableContent> filter){
+        this.filter = filter;
+        this.fitting = Vars.content.blocks().copy().<UnlockableContent>as().add(content.units().as())
+            .select(filter).toArray(UnlockableContent.class);
+    }
+
+    @Override
+    public float efficiency(Building build){
+        var payloads = build.getPayloads();
+        for(var block : fitting){
+            if(payloads.contains(block, 1)){
+                return 1f;
+            }
+        }
+        return 0f;
+    }
+
+    @Override
+    public void trigger(Building build){
+        var payloads = build.getPayloads();
+        for(var block : fitting){
+            if(payloads.contains(block, 1)){
+                payloads.remove(block);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void display(Stats stats){
+        stats.add(booster ? Stat.booster : Stat.input, StatValues.content(new Seq<>(fitting)));
+    }
+
+    @Override
+    public void build(Building build, Table table){
+        var inv = build.getPayloads();
+
+        MultiReqImage image = new MultiReqImage();
+
+        content.blocks().each(i -> filter.get(i) && i.unlockedNow(),
+            block -> image.add(new ReqImage(StatValues.stack(block, 1),
+            () -> inv.contains(block, 1)))
+        );
+
+        table.add(image).size(8 * 4);
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumePayloads.java b/core/src/mindustry/world/consumers/ConsumePayloads.java
new file mode 100644
index 0000000000..cbbc4145e6
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumePayloads.java
@@ -0,0 +1,60 @@
+package mindustry.world.consumers;
+
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
+
+public class ConsumePayloads extends Consume{
+    public Seq<PayloadStack> payloads;
+
+    public ConsumePayloads(Seq<PayloadStack> payloads){
+        this.payloads = payloads;
+    }
+
+    @Override
+    public float efficiency(Building build){
+        float mult = multiplier.get(build);
+        for(PayloadStack stack : payloads){
+            if(!build.getPayloads().contains(stack.item, Math.round(stack.amount * mult))){
+                return 0f;
+            }
+        }
+        return 1f;
+    }
+
+    @Override
+    public void trigger(Building build){
+        float mult = multiplier.get(build);
+        for(PayloadStack stack : payloads){
+            build.getPayloads().remove(stack.item, Math.round(stack.amount * mult));
+        }
+    }
+
+    @Override
+    public void display(Stats stats){
+
+        for(var stack : payloads){
+            stats.add(Stat.input, t -> {
+                t.add(StatValues.stack(stack));
+                t.add(stack.item.localizedName).padLeft(4).padRight(4);
+            });
+        }
+    }
+
+    @Override
+    public void build(Building build, Table table){
+        var inv = build.getPayloads();
+
+        table.table(c -> {
+            int i = 0;
+            for(var stack : payloads){
+                c.add(new ReqImage(StatValues.stack(stack.item, Math.round(stack.amount * multiplier.get(build))),
+                () -> inv.contains(stack.item, Math.round(stack.amount * multiplier.get(build))))).padRight(8);
+                if(++i % 4 == 0) c.row();
+            }
+        }).left();
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumePower.java b/core/src/mindustry/world/consumers/ConsumePower.java
index 67b23d6c4c..74a96b1c5f 100644
--- a/core/src/mindustry/world/consumers/ConsumePower.java
+++ b/core/src/mindustry/world/consumers/ConsumePower.java
@@ -1,18 +1,17 @@
 package mindustry.world.consumers;
 
-import arc.math.*;
-import arc.scene.ui.layout.*;
 import mindustry.gen.*;
+import mindustry.world.*;
 import mindustry.world.meta.*;
 
 /** Consumer class for blocks which consume power while being connected to a power graph. */
 public class ConsumePower extends Consume{
     /** The maximum amount of power which can be processed per tick. This might influence efficiency or load a buffer. */
-    public final float usage;
+    public float usage;
     /** The maximum power capacity in power units. */
-    public final float capacity;
+    public float capacity;
     /** True if the module can store power. */
-    public final boolean buffered;
+    public boolean buffered;
 
     public ConsumePower(float usage, float capacity, boolean buffered){
         this.usage = usage;
@@ -25,39 +24,26 @@ public class ConsumePower extends Consume{
     }
 
     @Override
-    public ConsumeType type(){
-        return ConsumeType.power;
+    public void apply(Block block){
+        block.hasPower = true;
+        block.consPower = this;
     }
 
     @Override
-    public void build(Building tile, Table table){
-        //No tooltip for power, for now
+    public boolean ignore(){
+        return buffered;
     }
 
     @Override
-    public String getIcon(){
-        return "icon-power";
-    }
-
-    @Override
-    public void update(Building entity){
-        // Nothing to do since PowerGraph directly updates entity.power.status
-    }
-
-    @Override
-    public boolean valid(Building entity){
-        if(buffered){
-            return true;
-        }else{
-            return entity.power.status > 0f;
-        }
+    public float efficiency(Building build){
+        return build.power.status;
     }
 
     @Override
     public void display(Stats stats){
         if(buffered){
             stats.add(Stat.powerCapacity, capacity, StatUnit.none);
-        }else{
+        }else if(usage > 0f){
             stats.add(Stat.powerUse, usage * 60f, StatUnit.powerSecond);
         }
     }
@@ -68,17 +54,9 @@ public class ConsumePower extends Consume{
      * @return The amount of power which is requested per tick.
      */
     public float requestedPower(Building entity){
-        if(entity.tile().build == null) return 0f;
-        if(buffered){
-            return (1f-entity.power.status)*capacity;
-        }else{
-            try{
-                return usage * Mathf.num(entity.shouldConsume());
-            }catch(Exception e){
-                //HACK an error will only happen with a bar that is checking its requested power, and the entity is null/a different class
-                return 0;
-            }
-        }
+        return buffered ?
+            (1f - entity.power.status) * capacity :
+            usage * (entity.shouldConsume() ? 1f : 0f);
     }
 
 
diff --git a/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java b/core/src/mindustry/world/consumers/ConsumePowerCondition.java
similarity index 61%
rename from core/src/mindustry/world/blocks/power/ConditionalConsumePower.java
rename to core/src/mindustry/world/consumers/ConsumePowerCondition.java
index 61e1b4b059..5eee32bedf 100644
--- a/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java
+++ b/core/src/mindustry/world/consumers/ConsumePowerCondition.java
@@ -1,14 +1,13 @@
-package mindustry.world.blocks.power;
+package mindustry.world.consumers;
 
 import arc.func.*;
 import mindustry.gen.*;
-import mindustry.world.consumers.*;
 
 /** A power consumer that only activates sometimes. */
-public class ConditionalConsumePower extends ConsumePower{
+public class ConsumePowerCondition extends ConsumePower{
     private final Boolf<Building> consume;
 
-    public ConditionalConsumePower(float usage, Boolf<Building> consume){
+    public ConsumePowerCondition(float usage, Boolf<Building> consume){
         super(usage, 0, false);
         this.consume = consume;
     }
diff --git a/core/src/mindustry/world/consumers/ConsumePowerDynamic.java b/core/src/mindustry/world/consumers/ConsumePowerDynamic.java
new file mode 100644
index 0000000000..fb40c0aaa9
--- /dev/null
+++ b/core/src/mindustry/world/consumers/ConsumePowerDynamic.java
@@ -0,0 +1,34 @@
+package mindustry.world.consumers;
+
+import arc.func.*;
+import mindustry.gen.*;
+import mindustry.world.meta.*;
+
+/** A power consumer that uses a dynamic amount of power. */
+public class ConsumePowerDynamic extends ConsumePower{
+    private final Floatf<Building> usage;
+    private float displayedPowerUsage;
+
+    public ConsumePowerDynamic(Floatf<Building> usage){
+        super(0, 0, false);
+        this.usage = usage;
+    }
+
+    public ConsumePowerDynamic(float displayed, Floatf<Building> usage){
+        super(0, 0, false);
+        this.displayedPowerUsage = displayed;
+        this.usage = usage;
+    }
+
+    @Override
+    public float requestedPower(Building entity){
+        return usage.get(entity);
+    }
+
+    @Override
+    public void display(Stats stats){
+        if(displayedPowerUsage != 0f){
+            stats.add(Stat.powerUse, displayedPowerUsage * 60f, StatUnit.powerSecond);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/consumers/ConsumeType.java b/core/src/mindustry/world/consumers/ConsumeType.java
deleted file mode 100644
index 9a68a050cc..0000000000
--- a/core/src/mindustry/world/consumers/ConsumeType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package mindustry.world.consumers;
-
-public enum ConsumeType{
-    item,
-    power,
-    liquid
-}
diff --git a/core/src/mindustry/world/consumers/Consumers.java b/core/src/mindustry/world/consumers/Consumers.java
deleted file mode 100644
index 73ad0b0b96..0000000000
--- a/core/src/mindustry/world/consumers/Consumers.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package mindustry.world.consumers;
-
-import arc.func.*;
-import arc.struct.*;
-import arc.util.*;
-import mindustry.*;
-import mindustry.gen.*;
-import mindustry.type.*;
-import mindustry.world.blocks.power.*;
-import mindustry.world.meta.*;
-
-public class Consumers{
-    private Consume[] map = new Consume[ConsumeType.values().length];
-    private Consume[] results, optionalResults;
-
-    public final Bits itemFilters = new Bits(Vars.content.items().size);
-    public final Bits liquidfilters = new Bits(Vars.content.liquids().size);
-
-    public boolean any(){
-        return results != null && results.length > 0;
-    }
-
-    public void each(Cons<Consume> c){
-        for(var cons : map){
-            if(cons != null){
-                c.get(cons);
-            }
-        }
-    }
-
-    public void init(){
-        results = Structs.filter(Consume.class, map, m -> m != null);
-        optionalResults = Structs.filter(Consume.class, map, m -> m != null && m.isOptional());
-
-        for(Consume cons : results){
-            cons.applyItemFilter(itemFilters);
-            cons.applyLiquidFilter(liquidfilters);
-        }
-    }
-
-    public ConsumePower getPower(){
-        return get(ConsumeType.power);
-    }
-
-    public ConsumeItems getItem(){
-        return get(ConsumeType.item);
-    }
-
-    public boolean hasPower(){
-        return has(ConsumeType.power);
-    }
-
-    public ConsumeLiquid liquid(Liquid liquid, float amount){
-        return add(new ConsumeLiquid(liquid, amount));
-    }
-
-    /**
-     * Creates a consumer which directly uses power without buffering it.
-     * @param powerPerTick The amount of power which is required each tick for 100% efficiency.
-     * @return the created consumer object.
-     */
-    public ConsumePower power(float powerPerTick){
-        return add(new ConsumePower(powerPerTick, 0.0f, false));
-    }
-
-    /** Creates a consumer which only consumes power when the condition is met. */
-    public <T extends Building> ConsumePower powerCond(float usage, Boolf<T> cons){
-        return add(new ConditionalConsumePower(usage, (Boolf<Building>)cons));
-    }
-
-    /**
-     * Creates a consumer which stores power.
-     * @param powerCapacity The maximum capacity in power units.
-     */
-    public ConsumePower powerBuffered(float powerCapacity){
-        return add(new ConsumePower(0f, powerCapacity, true));
-    }
-
-    public ConsumeItems item(Item item){
-        return item(item, 1);
-    }
-
-    public ConsumeItems item(Item item, int amount){
-        return add(new ConsumeItems(new ItemStack[]{new ItemStack(item, amount)}));
-    }
-
-    public ConsumeItems items(ItemStack... items){
-        return add(new ConsumeItems(items));
-    }
-
-    public <T extends Consume> T add(T consume){
-        map[consume.type().ordinal()] = consume;
-        return consume;
-    }
-
-    public void remove(ConsumeType type){
-        map[type.ordinal()] = null;
-    }
-
-    public boolean has(ConsumeType type){
-        return map[type.ordinal()] != null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends Consume> T get(ConsumeType type){
-        if(map[type.ordinal()] == null){
-            throw new IllegalArgumentException("Block does not contain consumer of type '" + type + "'!");
-        }
-        return (T)map[type.ordinal()];
-    }
-
-    @Nullable
-    public Consume[] all(){
-        return results;
-    }
-
-    public Consume[] optionals(){
-        return optionalResults;
-    }
-
-    public void display(Stats stats){
-        for(Consume c : map){
-            if(c != null){
-                c.display(stats);
-            }
-        }
-    }
-}
diff --git a/core/src/mindustry/world/draw/DrawAnimation.java b/core/src/mindustry/world/draw/DrawAnimation.java
deleted file mode 100644
index 6c4de1ef36..0000000000
--- a/core/src/mindustry/world/draw/DrawAnimation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package mindustry.world.draw;
-
-import arc.*;
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import mindustry.world.*;
-import mindustry.world.blocks.production.GenericCrafter.*;
-
-public class DrawAnimation extends DrawBlock{
-    public int frameCount = 3;
-    public float frameSpeed = 5f;
-    public boolean sine = true;
-    public TextureRegion[] frames;
-    public TextureRegion liquid, top;
-
-    @Override
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(entity.block.region, entity.x, entity.y);
-        Draw.rect(
-            sine ?
-                frames[(int)Mathf.absin(entity.totalProgress, frameSpeed, frameCount - 0.001f)] :
-                frames[(int)((entity.totalProgress / frameSpeed) % frameCount)],
-            entity.x, entity.y);
-        Draw.color(Color.clear, entity.liquids.current().color, entity.liquids.total() / entity.block.liquidCapacity);
-        Draw.rect(liquid, entity.x, entity.y);
-        Draw.color();
-        Draw.rect(top, entity.x, entity.y);
-    }
-
-    @Override
-    public void load(Block block){
-        frames = new TextureRegion[frameCount];
-        for(int i = 0; i < frameCount; i++){
-            frames[i] = Core.atlas.find(block.name + "-frame" + i);
-        }
-
-        liquid = Core.atlas.find(block.name + "-liquid");
-        top = Core.atlas.find(block.name + "-top");
-    }
-
-    @Override
-    public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{block.region, top};
-    }
-}
diff --git a/core/src/mindustry/world/draw/DrawArcSmelt.java b/core/src/mindustry/world/draw/DrawArcSmelt.java
new file mode 100644
index 0000000000..1ee86390a0
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawArcSmelt.java
@@ -0,0 +1,49 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.gen.*;
+
+public class DrawArcSmelt extends DrawBlock{
+    public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585");
+    public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 3f, flameRadiusMag = 0.3f, circleStroke = 1.5f;
+    public float x = 0, y = 0;
+    public float alpha = 0.68f;
+    public int particles = 25;
+    public float particleLife = 40f, particleRad = 7f, particleStroke = 1.1f, particleLen = 3f;
+    public boolean drawCenter = true;
+    public Blending blending = Blending.additive;
+
+    @Override
+    public void draw(Building build){
+        if(build.warmup() > 0f && flameColor.a > 0.001f){
+            Lines.stroke(circleStroke * build.warmup());
+
+            float si = Mathf.absin(flameRadiusScl, flameRadiusMag);
+            float a = alpha * build.warmup();
+            Draw.blend(blending);
+
+            Draw.color(midColor, a);
+            if(drawCenter) Fill.circle(build.x + x, build.y + y, flameRad + si);
+
+            Draw.color(flameColor, a);
+            if(drawCenter) Lines.circle(build.x + x, build.y + y, (flameRad + circleSpace + si) * build.warmup());
+
+            Lines.stroke(particleStroke * build.warmup());
+
+            float base = (Time.time / particleLife);
+            rand.setSeed(build.id);
+            for(int i = 0; i < particles; i++){
+                float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin;
+                float angle = rand.random(360f);
+                float len = particleRad * Interp.pow2Out.apply(fin);
+                Lines.lineAngle(build.x + Angles.trnsx(angle, len) + x, build.y + Angles.trnsy(angle, len) + y, angle, particleLen * fout * build.warmup());
+            }
+
+            Draw.blend();
+            Draw.reset();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawBlock.java b/core/src/mindustry/world/draw/DrawBlock.java
index d40d8fe583..6c25c97748 100644
--- a/core/src/mindustry/world/draw/DrawBlock.java
+++ b/core/src/mindustry/world/draw/DrawBlock.java
@@ -1,16 +1,40 @@
 package mindustry.world.draw;
 
+import arc.*;
 import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
 import mindustry.world.*;
-import mindustry.world.blocks.production.GenericCrafter.*;
+import mindustry.world.blocks.production.*;
 
-/** An implementation of custom rendering behavior for a block.
+/** An implementation of custom rendering behavior for a crafter block.
  * This is used mostly for mods. */
-public class DrawBlock{
+public abstract class DrawBlock{
+    protected static final Rand rand = new Rand();
+
+    /** If set, the icon is overridden to be these strings, in order. Each string is a suffix. */
+    public @Nullable String[] iconOverride = null;
+
+    public void getRegionsToOutline(Block block, Seq<TextureRegion> out){
+
+    }
+
+    /** Draws the block itself. */
+    public void draw(Building build){
+
+    }
+
+    /** Draws any extra light for the block. */
+    public void drawLight(Building build){
+
+    }
+
+    /** Draws the planned version of this block. */
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
 
-    /** Draws the block. */
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(entity.block.region, entity.x, entity.y, entity.block.rotate ? entity.rotdeg() : 0);
     }
 
     /** Load any relevant texture regions. */
@@ -20,6 +44,23 @@ public class DrawBlock{
 
     /** @return the generated icons to be used for this block. */
     public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{block.region};
+        return new TextureRegion[]{};
+    }
+
+    public final TextureRegion[] finalIcons(Block block){
+        if(iconOverride != null){
+            var out = new TextureRegion[iconOverride.length];
+            for(int i = 0; i < out.length; i++){
+                out[i] = Core.atlas.find(block.name + iconOverride[i]);
+            }
+            return out;
+        }
+        TextureRegion[] icons = icons(block);
+        return icons.length == 0 ? new TextureRegion[]{Core.atlas.find("error")} : icons;
+    }
+
+    public GenericCrafter expectCrafter(Block block){
+        if(!(block instanceof GenericCrafter crafter)) throw new ClassCastException("This drawer requires the block to be a GenericCrafter. Use a different drawer.");
+        return crafter;
     }
 }
diff --git a/core/src/mindustry/world/draw/DrawBlurSpin.java b/core/src/mindustry/world/draw/DrawBlurSpin.java
new file mode 100644
index 0000000000..75d151c6c8
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawBlurSpin.java
@@ -0,0 +1,37 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class DrawBlurSpin extends DrawBlock{
+    public TextureRegion region, blurRegion;
+    public String suffix = "";
+    public float rotateSpeed = 1f, x, y, blurThresh = 0.7f;
+
+    public DrawBlurSpin(String suffix, float speed){
+        this.suffix = suffix;
+        rotateSpeed = speed;
+    }
+
+    public DrawBlurSpin(){
+    }
+
+    @Override
+    public void draw(Building build){
+        Drawf.spinSprite(build.warmup() > blurThresh ? blurRegion : region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed);
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{region};
+    }
+
+    @Override
+    public void load(Block block){
+        region = Core.atlas.find(block.name + suffix);
+        blurRegion = Core.atlas.find(block.name + suffix + "-blur");
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawBubbles.java b/core/src/mindustry/world/draw/DrawBubbles.java
new file mode 100644
index 0000000000..19ea4179ae
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawBubbles.java
@@ -0,0 +1,48 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.gen.*;
+
+public class DrawBubbles extends DrawBlock{
+    public Color color = Color.valueOf("7457ce");
+
+    public int amount = 12, sides = 8;
+    public float strokeMin = 0.2f, spread = 3f, timeScl = 30f;
+    public float recurrence = 6f, radius = 3f;
+    public boolean fill = false;
+
+    public DrawBubbles(Color color){
+        this.color = color;
+    }
+
+    public DrawBubbles(){
+    }
+
+    @Override
+    public void draw(Building build){
+        if(build.warmup() <= 0.001f) return;
+
+        Draw.color(color);
+        Draw.alpha(build.warmup());
+
+        rand.setSeed(build.id);
+        for(int i = 0; i < amount; i++){
+            float x = rand.range(spread), y = rand.range(spread);
+            float life = 1f - ((Time.time / timeScl + rand.random(recurrence)) % recurrence);
+
+            if(life > 0){
+                float rad = (1f - life) * radius;
+                if(fill){
+                    Fill.circle(build.x + x, build.y + y, rad);
+                }else{
+                    Lines.stroke(build.warmup() * (life + strokeMin));
+                    Lines.poly(build.x + x, build.y + y, sides, rad);
+                }
+            }
+        }
+
+        Draw.color();
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawCells.java b/core/src/mindustry/world/draw/DrawCells.java
new file mode 100644
index 0000000000..28e6b4078c
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawCells.java
@@ -0,0 +1,48 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class DrawCells extends DrawBlock{
+    public TextureRegion middle;
+
+    public Color color = Color.white.cpy(), particleColorFrom = Color.black.cpy(), particleColorTo = Color.black.cpy();
+    public int particles = 12;
+    public float range = 4f, recurrence = 2f, radius = 1.8f, lifetime = 60f * 3f;
+
+    @Override
+    public void draw(Building build){
+        Drawf.liquid(middle, build.x, build.y, build.warmup(), color);
+
+        if(build.warmup() > 0.001f){
+            rand.setSeed(build.id);
+            for(int i = 0; i < particles; i++){
+                float offset = rand.nextFloat() * 999999f;
+                float x = rand.range(range), y = rand.range(range);
+                float fin = 1f - (((Time.time + offset) / lifetime) % recurrence);
+                float ca = rand.random(0.1f, 1f);
+                float fslope = Mathf.slope(fin);
+
+                if(fin > 0){
+                    Draw.color(particleColorFrom, particleColorTo, ca);
+                    Draw.alpha(build.warmup());
+
+                    Fill.circle(build.x + x, build.y + y, fslope * radius);
+                }
+            }
+        }
+
+        Draw.color();
+    }
+
+    @Override
+    public void load(Block block){
+        middle = Core.atlas.find(block.name + "-middle");
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawCircles.java b/core/src/mindustry/world/draw/DrawCircles.java
new file mode 100644
index 0000000000..106517ddfc
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawCircles.java
@@ -0,0 +1,39 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.gen.*;
+
+public class DrawCircles extends DrawBlock{
+    public Color color = Color.valueOf("7457ce");
+
+    public int amount = 5, sides = 15;
+    public float strokeMin = 0.2f, strokeMax = 2f, timeScl = 160f;
+    public float radius = 12f, radiusOffset = 0f, x = 0f, y = 0f;
+    public Interp strokeInterp = Interp.pow3In;
+
+    public DrawCircles(Color color){
+        this.color = color;
+    }
+
+    public DrawCircles(){
+    }
+
+    @Override
+    public void draw(Building build){
+        if(build.warmup() <= 0.001f) return;
+
+        Draw.color(color, build.warmup() * color.a);
+
+        for(int i = 0; i < amount; i++){
+            float life = ((Time.time / timeScl + i/(float)amount) % 1f);
+
+            Lines.stroke(build.warmup() * strokeInterp.apply(strokeMax, strokeMin, life));
+            Lines.poly(build.x + x, build.y + y, sides, radiusOffset + life * radius);
+        }
+
+        Draw.reset();
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawCrucibleFlame.java b/core/src/mindustry/world/draw/DrawCrucibleFlame.java
new file mode 100644
index 0000000000..2e7cb9fdc6
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawCrucibleFlame.java
@@ -0,0 +1,53 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.Interp.*;
+import arc.util.*;
+import mindustry.gen.*;
+
+public class DrawCrucibleFlame extends DrawBlock{
+    public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585");
+    public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 10f, flameRadiusMag = 0.6f, circleStroke = 1.5f, x = 0, y = 0;
+    public float alpha = 0.5f;
+    public int particles = 30;
+    public float particleLife = 70f, particleRad = 7f, particleSize = 3f, fadeMargin = 0.4f, rotateScl = 1.5f;
+    public Interp particleInterp = new PowIn(1.5f);
+
+    @Override
+    public void draw(Building build){
+
+        if(build.warmup() > 0f && flameColor.a > 0.001f){
+            Lines.stroke(circleStroke * build.warmup());
+
+            float si = Mathf.absin(flameRadiusScl, flameRadiusMag);
+            float a = alpha * build.warmup();
+            Draw.blend(Blending.additive);
+
+            Draw.color(midColor, a);
+            Fill.circle(build.x + x, build.y + y, flameRad + si);
+
+            Draw.color(flameColor, a);
+            Lines.circle(build.x + x, build.y + y, (flameRad + circleSpace + si) * build.warmup());
+
+            float base = (Time.time / particleLife);
+            rand.setSeed(build.id);
+            for(int i = 0; i < particles; i++){
+                float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin;
+                float angle = rand.random(360f) + (Time.time / rotateScl) % 360f;
+                float len = particleRad * particleInterp.apply(fout);
+                Draw.alpha(a * (1f - Mathf.curve(fin, 1f - fadeMargin)));
+                Fill.circle(
+                    build.x + Angles.trnsx(angle, len) + x,
+                    build.y + Angles.trnsy(angle, len) + y,
+                    particleSize * fin * build.warmup()
+                );
+            }
+
+            Draw.blend();
+            Draw.reset();
+        }
+    }
+
+}
diff --git a/core/src/mindustry/world/draw/DrawCultivator.java b/core/src/mindustry/world/draw/DrawCultivator.java
new file mode 100644
index 0000000000..c4717baa40
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawCultivator.java
@@ -0,0 +1,46 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class DrawCultivator extends DrawBlock{
+    public Color plantColor = Color.valueOf("5541b1");
+    public Color plantColorLight = Color.valueOf("7457ce");
+    public Color bottomColor = Color.valueOf("474747");
+
+    public int bubbles = 12, sides = 8;
+    public float strokeMin = 0.2f, spread = 3f, timeScl = 70f;
+    public float recurrence = 6f, radius = 3f;
+
+    public TextureRegion middle;
+
+    @Override
+    public void draw(Building build){
+        Drawf.liquid(middle, build.x, build.y, build.warmup(), plantColor);
+
+        Draw.color(bottomColor, plantColorLight, build.warmup());
+
+        rand.setSeed(build.pos());
+        for(int i = 0; i < bubbles; i++){
+            float x = rand.range(spread), y = rand.range(spread);
+            float life = 1f - ((Time.time / timeScl + rand.random(recurrence)) % recurrence);
+
+            if(life > 0){
+                Lines.stroke(build.warmup() * (life + strokeMin));
+                Lines.poly(build.x + x, build.y + y, sides, (1f - life) * radius);
+            }
+        }
+
+        Draw.color();
+    }
+
+    @Override
+    public void load(Block block){
+        middle = Core.atlas.find(block.name + "-middle");
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawDefault.java b/core/src/mindustry/world/draw/DrawDefault.java
new file mode 100644
index 0000000000..9cfcf72007
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawDefault.java
@@ -0,0 +1,25 @@
+package mindustry.world.draw;
+
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawDefault extends DrawBlock{
+
+    @Override
+    public void draw(Building build){
+        Draw.rect(build.block.region, build.x, build.y, build.drawrot());
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        block.drawDefaultPlanRegion(plan, list);
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{block.region};
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawFade.java b/core/src/mindustry/world/draw/DrawFade.java
new file mode 100644
index 0000000000..1b9798babf
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawFade.java
@@ -0,0 +1,25 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawFade extends DrawBlock{
+    public String suffix = "-top";
+    public float alpha = 0.6f, scale = 3f;
+    public TextureRegion region;
+
+    @Override
+    public void draw(Building build){
+        Draw.alpha(Mathf.absin(build.totalProgress(), scale, alpha) * build.warmup());
+        Draw.rect(region, build.x, build.y);
+        Draw.reset();
+    }
+
+    @Override
+    public void load(Block block){
+        region = Core.atlas.find(block.name + suffix);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawFlame.java b/core/src/mindustry/world/draw/DrawFlame.java
new file mode 100644
index 0000000000..60af38b497
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawFlame.java
@@ -0,0 +1,59 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class DrawFlame extends DrawBlock{
+    public Color flameColor = Color.valueOf("ffc999");
+    public TextureRegion top;
+    public float lightRadius = 60f, lightAlpha = 0.65f, lightSinScl = 10f, lightSinMag = 5;
+    public float flameRadius = 3f, flameRadiusIn = 1.9f, flameRadiusScl = 5f, flameRadiusMag = 2f, flameRadiusInMag = 1f;
+    public float flameX = 0, flameY = 0;
+
+    public DrawFlame(){
+    }
+
+    public DrawFlame(Color flameColor){
+        this.flameColor = flameColor;
+    }
+
+    @Override
+    public void load(Block block){
+        top = Core.atlas.find(block.name + "-top");
+        block.clipSize = Math.max(block.clipSize, (lightRadius + lightSinMag) * 2f * block.size);
+    }
+
+    @Override
+    public void draw(Building build){
+        if(build.warmup() > 0f && flameColor.a > 0.001f){
+            float g = 0.3f;
+            float r = 0.06f;
+            float cr = Mathf.random(0.1f);
+
+            Draw.z(Layer.block + 0.01f);
+
+            Draw.alpha(build.warmup());
+            Draw.rect(top, build.x, build.y);
+
+            Draw.alpha(((1f - g) + Mathf.absin(Time.time, 8f, g) + Mathf.random(r) - r) * build.warmup());
+
+            Draw.tint(flameColor);
+            Fill.circle(build.x + flameX, build.y + flameY, flameRadius + Mathf.absin(Time.time, flameRadiusScl, flameRadiusMag) + cr);
+            Draw.color(1f, 1f, 1f, build.warmup());
+            Fill.circle(build.x + flameX, build.y + flameY, flameRadiusIn + Mathf.absin(Time.time, flameRadiusScl, flameRadiusInMag) + cr);
+
+            Draw.color();
+        }
+    }
+
+    @Override
+    public void drawLight(Building build){
+        Drawf.light(build.x + flameX, build.y + flameY, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawFrames.java b/core/src/mindustry/world/draw/DrawFrames.java
new file mode 100644
index 0000000000..52e14240ff
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawFrames.java
@@ -0,0 +1,39 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawFrames extends DrawBlock{
+    /** Number of frames to draw. */
+    public int frames = 3;
+    /** Ticks between frames. */
+    public float interval = 5f;
+    /** If true, frames wil alternate back and forth in a sine wave. */
+    public boolean sine = true;
+    public TextureRegion[] regions;
+
+    @Override
+    public void draw(Building build){
+        Draw.rect(
+            sine ?
+                regions[(int)Mathf.absin(build.totalProgress(), interval, frames - 0.001f)] :
+                regions[(int)((build.totalProgress() / interval) % frames)],
+            build.x, build.y);
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{regions[0]};
+    }
+
+    @Override
+    public void load(Block block){
+        regions = new TextureRegion[frames];
+        for(int i = 0; i < frames; i++){
+            regions[i] = Core.atlas.find(block.name + "-frame" + i);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawGlow.java b/core/src/mindustry/world/draw/DrawGlow.java
deleted file mode 100644
index d15d477b61..0000000000
--- a/core/src/mindustry/world/draw/DrawGlow.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package mindustry.world.draw;
-
-import arc.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import mindustry.world.*;
-import mindustry.world.blocks.production.GenericCrafter.*;
-
-public class DrawGlow extends DrawBlock{
-    public float glowAmount = 0.9f, glowScale = 3f;
-    public TextureRegion top;
-
-    @Override
-    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);
-        Draw.reset();
-    }
-
-    @Override
-    public void load(Block block){
-        top = Core.atlas.find(block.name + "-top");
-    }
-}
diff --git a/core/src/mindustry/world/draw/DrawGlowRegion.java b/core/src/mindustry/world/draw/DrawGlowRegion.java
new file mode 100644
index 0000000000..15a34fc2b7
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawGlowRegion.java
@@ -0,0 +1,56 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class DrawGlowRegion extends DrawBlock{
+    public Blending blending = Blending.additive;
+    public String suffix = "-glow";
+    public float alpha = 0.9f, glowScale = 10f, glowIntensity = 0.5f;
+    public float rotateSpeed = 0f;
+    public float layer = Layer.blockAdditive;
+    public boolean rotate = false;
+    public Color color = Color.red.cpy();
+    public TextureRegion region;
+
+    public DrawGlowRegion(){
+    }
+
+    public DrawGlowRegion(float layer){
+        this.layer = layer;
+    }
+
+    public DrawGlowRegion(boolean rotate){
+        this.rotate = rotate;
+    }
+
+
+    public DrawGlowRegion(String suffix){
+        this.suffix = suffix;
+    }
+
+    @Override
+    public void draw(Building build){
+        if(build.warmup() <= 0.001f) return;
+
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+        Draw.blend(blending);
+        Draw.color(color);
+        Draw.alpha((Mathf.absin(build.totalProgress(), glowScale, alpha) * glowIntensity + 1f - glowIntensity) * build.warmup() * alpha);
+        Draw.rect(region, build.x, build.y, build.totalProgress() * rotateSpeed + (rotate ? build.rotdeg() : 0f));
+        Draw.reset();
+        Draw.blend();
+        Draw.z(z);
+    }
+
+    @Override
+    public void load(Block block){
+        region = Core.atlas.find(block.name + suffix);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawHeatInput.java b/core/src/mindustry/world/draw/DrawHeatInput.java
new file mode 100644
index 0000000000..51f49cc0d5
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawHeatInput.java
@@ -0,0 +1,55 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.heat.*;
+
+public class DrawHeatInput extends DrawBlock{
+    public String suffix = "-heat";
+    public Color heatColor = new Color(1f, 0.22f, 0.22f, 0.8f);
+    public float heatPulse = 0.3f, heatPulseScl = 10f;
+
+    public TextureRegion heat;
+
+    public DrawHeatInput(String suffix){
+        this.suffix = suffix;
+    }
+
+    public DrawHeatInput(){
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+    }
+
+    @Override
+    public void draw(Building build){
+
+        Draw.z(Layer.blockAdditive);
+        if(build instanceof HeatConsumer hc){
+            float[] side = hc.sideHeat();
+            for(int i = 0; i < 4; i++){
+                if(side[i] > 0){
+                    Draw.blend(Blending.additive);
+                    Draw.color(heatColor, side[i] / hc.heatRequirement() * (heatColor.a * (1f - heatPulse + Mathf.absin(heatPulseScl, heatPulse))));
+                    Draw.rect(heat, build.x, build.y, i * 90f);
+                    Draw.blend();
+                    Draw.color();
+                }
+            }
+        }
+        Draw.z(Layer.block);
+    }
+
+    @Override
+    public void load(Block block){
+        heat = Core.atlas.find(block.name + suffix);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawHeatOutput.java b/core/src/mindustry/world/draw/DrawHeatOutput.java
new file mode 100644
index 0000000000..031e9d9941
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawHeatOutput.java
@@ -0,0 +1,62 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.heat.*;
+
+public class DrawHeatOutput extends DrawBlock{
+    public TextureRegion heat, glow, top1, top2;
+
+    public Color heatColor = new Color(1f, 0.22f, 0.22f, 0.8f);
+    public float heatPulse = 0.3f, heatPulseScl = 10f, glowMult = 1.2f;
+
+    public int rotOffset = 0;
+    public boolean drawGlow = true;
+
+    public DrawHeatOutput(){}
+
+    public DrawHeatOutput(int rotOffset, boolean drawGlow){
+        this.rotOffset = rotOffset;
+        this.drawGlow = drawGlow;
+    }
+
+    @Override
+    public void draw(Building build){
+        float rotdeg = (build.rotation + rotOffset) * 90;
+        Draw.rect(Mathf.mod((build.rotation + rotOffset), 4) > 1 ? top2 : top1, build.x, build.y, rotdeg);
+
+        if(build instanceof HeatBlock heater && heater.heat() > 0){
+            Draw.z(Layer.blockAdditive);
+            Draw.blend(Blending.additive);
+            Draw.color(heatColor, heater.heatFrac() * (heatColor.a * (1f - heatPulse + Mathf.absin(heatPulseScl, heatPulse))));
+            if(heat.found()) Draw.rect(heat, build.x, build.y, rotdeg);
+            Draw.color(Draw.getColor().mul(glowMult));
+            if(drawGlow && glow.found()) Draw.rect(glow, build.x, build.y);
+            Draw.blend();
+            Draw.color();
+        }
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(Mathf.mod((plan.rotation + rotOffset), 4) > 1 ? top2 : top1, plan.drawx(), plan.drawy(), (plan.rotation + rotOffset) * 90);
+    }
+
+    @Override
+    public void load(Block block){
+        heat = Core.atlas.find(block.name + "-heat");
+        glow = Core.atlas.find(block.name + "-glow");
+        top1 = Core.atlas.find(block.name + "-top1");
+        top2 = Core.atlas.find(block.name + "-top2");
+    }
+
+    //TODO currently no icons due to concerns with rotation
+
+}
\ No newline at end of file
diff --git a/core/src/mindustry/world/draw/DrawHeatRegion.java b/core/src/mindustry/world/draw/DrawHeatRegion.java
new file mode 100644
index 0000000000..7c42f9c228
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawHeatRegion.java
@@ -0,0 +1,51 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.production.HeatCrafter.*;
+
+public class DrawHeatRegion extends DrawBlock{
+    public Color color = new Color(1f, 0.22f, 0.22f, 0.8f);
+    public float pulse = 0.3f, pulseScl = 10f;
+    public float layer = Layer.blockAdditive;
+
+    public TextureRegion heat;
+    public String suffix = "-glow";
+
+    public DrawHeatRegion(float layer){
+        this.layer = layer;
+    }
+
+    public DrawHeatRegion(String suffix){
+        this.suffix = suffix;
+    }
+
+    public DrawHeatRegion(){
+    }
+
+    @Override
+    public void draw(Building build){
+        Draw.z(Layer.blockAdditive);
+        if(build instanceof HeatCrafterBuild hc && hc.heat > 0){
+
+            float z = Draw.z();
+            if(layer > 0) Draw.z(layer);
+            Draw.blend(Blending.additive);
+            Draw.color(color, Mathf.clamp(hc.heat / hc.heatRequirement()) * (color.a * (1f - pulse + Mathf.absin(pulseScl, pulse))));
+            Draw.rect(heat, build.x, build.y);
+            Draw.blend();
+            Draw.color();
+            Draw.z(z);
+        }
+    }
+
+    @Override
+    public void load(Block block){
+        heat = Core.atlas.find(block.name + suffix);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawLiquidOutputs.java b/core/src/mindustry/world/draw/DrawLiquidOutputs.java
new file mode 100644
index 0000000000..7793857570
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawLiquidOutputs.java
@@ -0,0 +1,56 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+import mindustry.world.blocks.production.*;
+
+/** This must be used in conjunction with another DrawBlock; it only draws outputs. */
+public class DrawLiquidOutputs extends DrawBlock{
+    public TextureRegion[][] liquidOutputRegions;
+
+    @Override
+    public void draw(Building build){
+        GenericCrafter crafter = (GenericCrafter)build.block;
+        if(crafter.outputLiquids == null) return;
+
+        for(int i = 0; i < crafter.outputLiquids.length; i++){
+            int side = i < crafter.liquidOutputDirections.length ? crafter.liquidOutputDirections[i] : -1;
+            if(side != -1){
+                int realRot = (side + build.rotation) % 4;
+                Draw.rect(liquidOutputRegions[realRot > 1 ? 1 : 0][i], build.x, build.y, realRot * 90);
+            }
+        }
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        GenericCrafter crafter = (GenericCrafter)block;
+        if(crafter.outputLiquids == null) return;
+
+        for(int i = 0; i < crafter.outputLiquids.length; i++){
+            int side = i < crafter.liquidOutputDirections.length ? crafter.liquidOutputDirections[i] : -1;
+            if(side != -1){
+                int realRot = (side + plan.rotation) % 4;
+                Draw.rect(liquidOutputRegions[realRot > 1 ? 1 : 0][i], plan.drawx(), plan.drawy(), realRot * 90);
+            }
+        }
+    }
+
+    @Override
+    public void load(Block block){
+        var crafter = expectCrafter(block);
+
+        if(crafter.outputLiquids == null) return;
+
+        liquidOutputRegions = new TextureRegion[2][crafter.outputLiquids.length];
+        for(int i = 0; i < crafter.outputLiquids.length; i++){
+            for(int j = 1; j <= 2; j++){
+                liquidOutputRegions[j - 1][i] = Core.atlas.find(block.name + "-" + crafter.outputLiquids[i].liquid.name + "-output" + j);
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawLiquidRegion.java b/core/src/mindustry/world/draw/DrawLiquidRegion.java
new file mode 100644
index 0000000000..e22daa7c9e
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawLiquidRegion.java
@@ -0,0 +1,40 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+public class DrawLiquidRegion extends DrawBlock{
+    public Liquid drawLiquid;
+    public TextureRegion liquid;
+    public String suffix = "-liquid";
+    public float alpha = 1f;
+
+    public DrawLiquidRegion(Liquid drawLiquid){
+        this.drawLiquid = drawLiquid;
+    }
+
+    public DrawLiquidRegion(){
+    }
+
+    @Override
+    public void draw(Building build){
+        Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current();
+        Drawf.liquid(liquid, build.x, build.y,
+            build.liquids.get(drawn) / build.block.liquidCapacity * alpha,
+            drawn.color
+        );
+    }
+
+    @Override
+    public void load(Block block){
+        if(!block.hasLiquids){
+            throw new RuntimeException("Block '" + block + "' has a DrawLiquidRegion, but hasLiquids is false! Make sure it is true.");
+        }
+
+        liquid = Core.atlas.find(block.name + suffix);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawLiquidTile.java b/core/src/mindustry/world/draw/DrawLiquidTile.java
new file mode 100644
index 0000000000..0066314841
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawLiquidTile.java
@@ -0,0 +1,39 @@
+package mindustry.world.draw;
+
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.liquid.*;
+
+public class DrawLiquidTile extends DrawBlock{
+    public Liquid drawLiquid;
+    public float padding;
+    public float padLeft = -1, padRight = -1, padTop = -1, padBottom = -1;
+    public float alpha = 1f;
+
+    public DrawLiquidTile(Liquid drawLiquid, float padding){
+        this.drawLiquid = drawLiquid;
+        this.padding = padding;
+    }
+
+    public DrawLiquidTile(Liquid drawLiquid){
+        this.drawLiquid = drawLiquid;
+    }
+
+    public DrawLiquidTile(){
+    }
+
+    @Override
+    public void draw(Building build){
+        Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current();
+        LiquidBlock.drawTiledFrames(build.block.size, build.x, build.y, padLeft, padRight, padTop, padBottom, drawn, build.liquids.get(drawn) / build.block.liquidCapacity * alpha);
+    }
+
+    @Override
+    public void load(Block block){
+        if(padLeft < 0) padLeft = padding;
+        if(padRight < 0) padRight = padding;
+        if(padTop < 0) padTop = padding;
+        if(padBottom < 0) padBottom = padding;
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawMixer.java b/core/src/mindustry/world/draw/DrawMixer.java
deleted file mode 100644
index bb785e01f0..0000000000
--- a/core/src/mindustry/world/draw/DrawMixer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package mindustry.world.draw;
-
-import arc.*;
-import arc.graphics.g2d.*;
-import mindustry.world.*;
-import mindustry.world.blocks.production.*;
-import mindustry.world.blocks.production.GenericCrafter.*;
-
-public class DrawMixer extends DrawBlock{
-    public TextureRegion liquid, top, bottom;
-
-    @Override
-    public void draw(GenericCrafterBuild entity){
-        float rotation = entity.block.rotate ? entity.rotdeg() : 0;
-
-        Draw.rect(bottom, entity.x, entity.y, rotation);
-
-        if(entity.liquids.total() > 0.001f){
-            Draw.color(((GenericCrafter)entity.block).outputLiquid.liquid.color);
-            Draw.alpha(entity.liquids.get(((GenericCrafter)entity.block).outputLiquid.liquid) / entity.block.liquidCapacity);
-            Draw.rect(liquid, entity.x, entity.y, rotation);
-            Draw.color();
-        }
-
-        Draw.rect(top, entity.x, entity.y, rotation);
-    }
-
-    @Override
-    public void load(Block block){
-        liquid = Core.atlas.find(block.name + "-liquid");
-        top = Core.atlas.find(block.name + "-top");
-        bottom = Core.atlas.find(block.name + "-bottom");
-    }
-
-    @Override
-    public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{bottom, top};
-    }
-}
diff --git a/core/src/mindustry/world/draw/DrawMulti.java b/core/src/mindustry/world/draw/DrawMulti.java
new file mode 100644
index 0000000000..907e979c84
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawMulti.java
@@ -0,0 +1,68 @@
+package mindustry.world.draw;
+
+import arc.graphics.g2d.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+/** combined several DrawBlocks into one */
+public class DrawMulti extends DrawBlock{
+    public DrawBlock[] drawers = {};
+
+    public DrawMulti(){
+    }
+
+    public DrawMulti(DrawBlock... drawers){
+        this.drawers = drawers;
+    }
+
+    public DrawMulti(Seq<DrawBlock> drawers){
+        this.drawers = drawers.toArray(DrawBlock.class);
+    }
+
+    @Override
+    public void getRegionsToOutline(Block block, Seq<TextureRegion> out){
+        for(var draw : drawers){
+            draw.getRegionsToOutline(block, out);
+        }
+    }
+
+    @Override
+    public void draw(Building build){
+        for(var draw : drawers){
+            draw.draw(build);
+        }
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        for(var draw : drawers){
+            draw.drawPlan(block, plan, list);
+        }
+    }
+
+    @Override
+    public void drawLight(Building build){
+        for(var draw : drawers){
+            draw.drawLight(build);
+        }
+    }
+
+    @Override
+    public void load(Block block){
+        for(var draw : drawers){
+            draw.load(block);
+        }
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        var result = new Seq<TextureRegion>();
+        for(var draw : drawers){
+            result.addAll(draw.icons(block));
+        }
+        return result.toArray(TextureRegion.class);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawMultiWeave.java b/core/src/mindustry/world/draw/DrawMultiWeave.java
new file mode 100644
index 0000000000..1bfda310bd
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawMultiWeave.java
@@ -0,0 +1,49 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawMultiWeave extends DrawBlock{
+    public TextureRegion weave, glow;
+    public float rotateSpeed = 1f, rotateSpeed2 = -0.9f;
+    public boolean fadeWeave = false;
+    public Color glowColor = new Color(1f, 0.4f, 0.4f, 0.8f), weaveColor = Color.white.cpy();
+    public float pulse = 0.3f, pulseScl = 10f;
+
+    @Override
+    public void draw(Building build){
+        Draw.color(weaveColor);
+        if(fadeWeave){
+            Draw.alpha(build.warmup());
+        }
+
+        Draw.rect(weave, build.x, build.y, build.totalProgress() * rotateSpeed);
+        Draw.rect(weave, build.x, build.y, build.totalProgress() * rotateSpeed * rotateSpeed2);
+
+        Draw.blend(Blending.additive);
+
+        Draw.color(glowColor, build.warmup() * (glowColor.a * (1f - pulse + Mathf.absin(pulseScl, pulse))));
+
+        Draw.rect(glow, build.x, build.y, build.totalProgress() * rotateSpeed);
+        Draw.rect(glow, build.x, build.y, build.totalProgress() * rotateSpeed * rotateSpeed2);
+
+        Draw.blend();
+        Draw.reset();
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return fadeWeave ? new TextureRegion[0] : new TextureRegion[]{weave};
+    }
+
+    @Override
+    public void load(Block block){
+        weave = Core.atlas.find(block.name + "-weave");
+        glow = Core.atlas.find(block.name + "-weave-glow");
+    }
+
+}
diff --git a/core/src/mindustry/world/draw/DrawParticles.java b/core/src/mindustry/world/draw/DrawParticles.java
new file mode 100644
index 0000000000..ca6261344e
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawParticles.java
@@ -0,0 +1,62 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.Interp.*;
+import arc.util.*;
+import mindustry.gen.*;
+
+public class DrawParticles extends DrawBlock{
+    public Color color = Color.valueOf("f2d585");
+
+    public int sides = 12;
+    public float x = 0, y = 0;
+    public float alpha = 0.5f;
+    public int particles = 30;
+    public float particleRotation = 0, particleLife = 70f, particleRad = 7f, particleSize = 3f, fadeMargin = 0.4f, rotateScl = 3f;
+    public boolean reverse = false, poly = false;
+    public Interp particleInterp = new PowIn(1.5f);
+    public Interp particleSizeInterp = Interp.slope;
+    public Blending blending = Blending.normal;
+
+    @Override
+    public void draw(Building build){
+        if(build.warmup() > 0f){
+            float a = alpha * build.warmup();
+
+            Draw.blend(blending);
+            Draw.color(color);
+
+            float base = Time.time / particleLife;
+            rand.setSeed(build.id);
+            for(int i = 0; i < particles; i++){
+                float fin = (rand.random(2f) + base) % 1f;
+                if(reverse) fin = 1f - fin;
+                float fout = 1f - fin;
+                float angle = rand.random(360f) + (Time.time / rotateScl) % 360f;
+                float len = particleRad * particleInterp.apply(fout);
+
+                Draw.alpha(a * (1f - Mathf.curve(fin, 1f - fadeMargin)));
+                if(poly){
+                    Fill.poly(
+                            build.x + x + Angles.trnsx(angle, len),
+                            build.y + y + Angles.trnsy(angle, len),
+                            sides,
+                            particleSize * particleSizeInterp.apply(fin) * build.warmup(),
+                            particleRotation
+                    );
+                }else{
+                    Fill.circle(
+                            build.x + x + Angles.trnsx(angle, len),
+                            build.y + y + Angles.trnsy(angle, len),
+                            particleSize * particleSizeInterp.apply(fin) * build.warmup()
+                    );
+                }
+            }
+
+            Draw.blend();
+            Draw.reset();
+        }
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawPistons.java b/core/src/mindustry/world/draw/DrawPistons.java
new file mode 100644
index 0000000000..117a361cad
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawPistons.java
@@ -0,0 +1,58 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawPistons extends DrawBlock{
+    public float sinMag = 4f, sinScl = 6f, sinOffset = 50f, sideOffset = 0f, lenOffset = -1f, horiOffset = 0f, angleOffset = 0f;
+    public int sides = 4;
+    public String suffix = "-piston";
+    public TextureRegion region1, region2, regiont, iconRegion;
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        if(iconRegion.found()){
+            Draw.rect(iconRegion, plan.drawx(), plan.drawy());
+        }
+    }
+
+    @Override
+    public void draw(Building build){
+        for(int i = 0; i < sides; i++){
+            float len = Mathf.absin(build.totalProgress() + sinOffset + sideOffset * sinScl * i, sinScl, sinMag) + lenOffset;
+            float angle = angleOffset + i * 360f / sides;
+            TextureRegion reg =
+                regiont.found() && (Mathf.equal(angle, 315) || Mathf.equal(angle, 135)) ? regiont :
+                angle >= 135 && angle < 315 ? region2 : region1;
+
+            if(Mathf.equal(angle, 315)){
+                Draw.yscl = -1f;
+            }
+
+            Tmp.v1.trns(angle, len, -horiOffset);
+            Draw.rect(reg, build.x + Tmp.v1.x, build.y + Tmp.v1.y, angle);
+
+            Draw.yscl = 1f;
+        }
+    }
+
+    @Override
+    public void load(Block block){
+        super.load(block);
+
+        region1 = Core.atlas.find(block.name + suffix + "0", block.name + suffix);
+        region2 = Core.atlas.find(block.name + suffix + "1", block.name + suffix);
+        regiont = Core.atlas.find(block.name + suffix + "-t");
+        iconRegion = Core.atlas.find(block.name + suffix + "-icon");
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{iconRegion};
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawPlasma.java b/core/src/mindustry/world/draw/DrawPlasma.java
new file mode 100644
index 0000000000..7cb5c81a73
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawPlasma.java
@@ -0,0 +1,45 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class DrawPlasma extends DrawFlame{
+    public TextureRegion[] regions;
+    public String suffix = "-plasma-";
+    public int plasmas = 4;
+
+    public Color plasma1 = Color.valueOf("ffd06b"), plasma2 = Color.valueOf("ff361b");
+
+    @Override
+    public void load(Block block){
+        regions = new TextureRegion[plasmas];
+        for(int i = 0; i < regions.length; i++){
+            regions[i] = Core.atlas.find(block.name + suffix + i);
+        }
+    }
+
+    @Override
+    public void drawLight(Building build){
+        Drawf.light(build.x, build.y, (110f + Mathf.absin(5, 5f)) * build.warmup(), Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * build.warmup());
+    }
+
+    @Override
+    public void draw(Building build){
+        Draw.blend(Blending.additive);
+        for(int i = 0; i < regions.length; i++){
+            float r = ((float)regions[i].width * regions[i].scl() - 3f + Mathf.absin(Time.time, 2f + i * 1f, 5f - i * 0.5f));
+
+            Draw.color(plasma1, plasma2, (float)i / regions.length);
+            Draw.alpha((0.3f + Mathf.absin(Time.time, 2f + i * 2f, 0.3f + i * 0.05f)) * build.warmup());
+            Draw.rect(regions[i], build.x, build.y, r, r, build.totalProgress() * (12 + i * 6f));
+        }
+        Draw.color();
+        Draw.blend();
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawPower.java b/core/src/mindustry/world/draw/DrawPower.java
new file mode 100644
index 0000000000..279669fb4a
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawPower.java
@@ -0,0 +1,73 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class DrawPower extends DrawBlock{
+    public TextureRegion emptyRegion, fullRegion;
+    public String suffix = "-power";
+
+    public boolean drawPlan = true;
+    /** If false, fades between emptyRegion and fullRegion instead of mixcol between empty and full colors. */
+    public boolean mixcol = true;
+    public Color emptyLightColor = Color.valueOf("f8c266");
+    public Color fullLightColor = Color.valueOf("fb9567");
+
+    /** Any number <=0 disables layer changes. */
+    public float layer = -1;
+
+    public DrawPower(){
+    }
+
+    public DrawPower(String suffix){
+        this.suffix = suffix;
+    }
+
+    @Override
+    public void draw(Building build){
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+        if(mixcol){
+            Draw.color(emptyLightColor, fullLightColor, build.power.status);
+            if(emptyRegion.found()){
+                Draw.rect(emptyRegion, build.x, build.y);
+            }else{
+                Fill.square(build.x, build.y, (tilesize * build.block.size / 2f - 1) * Draw.xscl);
+            }
+        }else{
+            Draw.rect(emptyRegion, build.x, build.y);
+            Draw.alpha(build.power.status);
+            Draw.rect(fullRegion, build.x, build.y);
+        }
+        Draw.color();
+        Draw.z(z);
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        if(!drawPlan || mixcol || !emptyRegion.found()) return;
+        Draw.rect(emptyRegion, plan.drawx(), plan.drawy());
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return !mixcol && emptyRegion.found() ? new TextureRegion[]{emptyRegion} : new TextureRegion[]{};
+    }
+
+    @Override
+    public void load(Block block){
+        if(mixcol){
+            emptyRegion = Core.atlas.find(block.name + suffix);
+        }else{
+            emptyRegion = Core.atlas.find(block.name + suffix + "-empty");
+            fullRegion = Core.atlas.find(block.name + suffix + "-full");
+        }
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawPulseShape.java b/core/src/mindustry/world/draw/DrawPulseShape.java
new file mode 100644
index 0000000000..36f1e8475a
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawPulseShape.java
@@ -0,0 +1,55 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+import static mindustry.Vars.*;
+
+public class DrawPulseShape extends DrawBlock{
+    public Color color = Pal.accent.cpy();
+    public float stroke = 2f, timeScl = 100f, minStroke = 0.2f;
+    public float radiusScl = 1f;
+    public float layer = -1f;
+    public boolean square = true;
+
+    public DrawPulseShape(boolean square){
+        this.square = square;
+    }
+
+    public DrawPulseShape(){
+    }
+
+    @Override
+    public void draw(Building build){
+        float pz = Draw.z();
+        if(layer > 0) Draw.z(layer);
+
+        float f = 1f - (Time.time / timeScl) % 1f;
+        float rad = build.block.size * tilesize / 2f * radiusScl;
+
+        Draw.color(color);
+        Lines.stroke((stroke * f + minStroke) * build.warmup());
+
+        if(square){
+            Lines.square(build.x, build.y, Math.min(1f + (1f - f) * rad, rad));
+        }else{
+            float r = Math.max(0f, Mathf.clamp(2f - f * 2f) * rad - f - 0.2f), w = Mathf.clamp(0.5f - f) * rad * 2f;
+            Lines.beginLine();
+            for(int i = 0; i < 4; i++){
+                Lines.linePoint(build.x + Geometry.d4(i).x * r + Geometry.d4(i).y * w, build.y + Geometry.d4(i).y * r - Geometry.d4(i).x * w);
+                if(f < 0.5f) Lines.linePoint(build.x + Geometry.d4(i).x * r - Geometry.d4(i).y * w, build.y + Geometry.d4(i).y * r + Geometry.d4(i).x * w);
+            }
+            Lines.endLine(true);
+        }
+
+
+
+        Draw.reset();
+        Draw.z(pz);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawPumpLiquid.java b/core/src/mindustry/world/draw/DrawPumpLiquid.java
new file mode 100644
index 0000000000..e31945d3bd
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawPumpLiquid.java
@@ -0,0 +1,24 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.production.Pump.*;
+
+public class DrawPumpLiquid extends DrawBlock{
+    public TextureRegion liquid;
+
+    @Override
+    public void draw(Building build){
+        if(!(build instanceof PumpBuild pump) || pump.liquidDrop == null) return;
+
+        Drawf.liquid(liquid, build.x, build.y, build.liquids.get(pump.liquidDrop) / build.block.liquidCapacity, pump.liquidDrop.color);
+    }
+
+    @Override
+    public void load(Block block){
+        liquid = Core.atlas.find(block.name + "-liquid");
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawRegion.java b/core/src/mindustry/world/draw/DrawRegion.java
new file mode 100644
index 0000000000..5d2547890d
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawRegion.java
@@ -0,0 +1,70 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+
+public class DrawRegion extends DrawBlock{
+    public TextureRegion region;
+    public String suffix = "";
+    public boolean spinSprite = false;
+    public boolean drawPlan = true;
+    public boolean buildingRotate = false;
+    public float rotateSpeed, x, y, rotation;
+    /** Any number <=0 disables layer changes. */
+    public float layer = -1;
+
+    public DrawRegion(String suffix){
+        this.suffix = suffix;
+    }
+
+    public DrawRegion(String suffix, float rotateSpeed){
+        this.suffix = suffix;
+        this.rotateSpeed = rotateSpeed;
+    }
+
+    public DrawRegion(String suffix, float rotateSpeed, boolean spinSprite){
+        this.suffix = suffix;
+        this.spinSprite = spinSprite;
+        this.rotateSpeed = rotateSpeed;
+    }
+
+    public DrawRegion(){
+    }
+
+    @Override
+    public void draw(Building build){
+        float z = Draw.z();
+        if(layer > 0) Draw.z(layer);
+        if(spinSprite){
+            Drawf.spinSprite(region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed + rotation + (buildingRotate ? build.rotdeg() : 0));
+        }else{
+            Draw.rect(region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed + rotation + (buildingRotate ? build.rotdeg() : 0));
+        }
+        Draw.z(z);
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        if(!drawPlan) return;
+        if(spinSprite){
+            Drawf.spinSprite(region, plan.drawx() + x, plan.drawy() + y, (buildingRotate ? plan.rotation * 90f : 0 + rotation));
+        }else{
+            Draw.rect(region, plan.drawx()+ x, plan.drawy() + y, (buildingRotate ? plan.rotation * 90f : 0 + rotation));
+        }
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{region};
+    }
+
+    @Override
+    public void load(Block block){
+        region = Core.atlas.find(block.name + suffix);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawRotator.java b/core/src/mindustry/world/draw/DrawRotator.java
deleted file mode 100644
index ca92aaf351..0000000000
--- a/core/src/mindustry/world/draw/DrawRotator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package mindustry.world.draw;
-
-import arc.*;
-import arc.graphics.g2d.*;
-import mindustry.world.*;
-import mindustry.world.blocks.production.GenericCrafter.*;
-
-public class DrawRotator extends DrawBlock{
-    public TextureRegion rotator;
-
-    @Override
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(entity.block.region, entity.x, entity.y);
-        Draw.rect(rotator, entity.x, entity.y, entity.totalProgress * 2f);
-    }
-
-    @Override
-    public void load(Block block){
-        rotator = Core.atlas.find(block.name + "-rotator");
-    }
-
-    @Override
-    public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{block.region, rotator};
-    }
-}
diff --git a/core/src/mindustry/world/draw/DrawShape.java b/core/src/mindustry/world/draw/DrawShape.java
new file mode 100644
index 0000000000..ed6d80c560
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawShape.java
@@ -0,0 +1,25 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+public class DrawShape extends DrawBlock{
+    public Color color = Pal.accent.cpy();
+    public int sides = 4;
+    public float radius = 2f, timeScl = 1f, layer = -1f, x, y;
+    public boolean useWarmupRadius = false;
+
+    @Override
+    public void draw(Building build){
+        float pz = Draw.z();
+        if(layer > 0) Draw.z(layer);
+
+        Draw.color(color);
+        Fill.poly(build.x + x, build.y + y, sides, useWarmupRadius ? radius * build.warmup() : radius, build.totalProgress() * timeScl);
+
+        Draw.reset();
+        Draw.z(pz);
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawSideRegion.java b/core/src/mindustry/world/draw/DrawSideRegion.java
new file mode 100644
index 0000000000..e1b3dfca6a
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawSideRegion.java
@@ -0,0 +1,35 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawSideRegion extends DrawBlock{
+    public TextureRegion top1, top2;
+
+
+    @Override
+    public void draw(Building build){
+        Draw.rect(build.rotation > 1 ? top2 : top1, build.x, build.y, build.rotdeg());
+    }
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+        Draw.rect(plan.rotation > 1 ? top2 : top1, plan.drawx(), plan.drawy(), plan.rotation * 90);
+    }
+
+    @Override
+    public void load(Block block){
+        top1 = Core.atlas.find(block.name + "-top1");
+        top2 = Core.atlas.find(block.name + "-top2");
+    }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{top1};
+    }
+
+}
diff --git a/core/src/mindustry/world/draw/DrawSoftParticles.java b/core/src/mindustry/world/draw/DrawSoftParticles.java
new file mode 100644
index 0000000000..35c7d903b2
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawSoftParticles.java
@@ -0,0 +1,63 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.Interp.*;
+import arc.util.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawSoftParticles extends DrawBlock{
+    public TextureRegion region;
+
+    public Color color = Color.valueOf("e3ae6f"), color2 = Color.valueOf("d04d46");
+    public float x = 0, y = 0;
+    public float alpha = 0.5f;
+    public int particles = 30;
+    public float particleLife = 70f, particleRad = 7f, particleSize = 3f, fadeMargin = 0.4f, rotateScl = 1.5f;
+    public Interp particleInterp = new PowIn(1.5f);
+
+    @Override
+    public void draw(Building build){
+
+        if(build.warmup() > 0f && color.a > 0.001f){
+            float a = alpha * build.warmup();
+
+            Draw.color(color, a);
+            Draw.blend(Blending.additive);
+
+            float base = (Time.time / particleLife);
+            rand.setSeed(build.id);
+            for(int i = 0; i < particles; i++){
+                float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin;
+                fin = 1f - fin;
+                fout = 1f - fout;
+
+                float angle = rand.random(360f) + (Time.time / rotateScl) % 360f;
+                float col = rand.random(1f);
+                Draw.tint(color, color2, col);
+                float len = particleRad * particleInterp.apply(fout);
+                Draw.alpha(a * (1f - Mathf.curve(fin, 1f - fadeMargin)));
+                float r = particleSize * fin * build.warmup()*2f;
+                Draw.rect(
+                    region,
+                    build.x + x + Angles.trnsx(angle, len),
+                    build.y + y + Angles.trnsy(angle, len),
+                    r, r
+                );
+            }
+
+            Draw.blend();
+            Draw.reset();
+        }
+    }
+
+    @Override
+    public void load(Block block){
+        super.load(block);
+
+        region = Core.atlas.find("circle-shadow");
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawSpikes.java b/core/src/mindustry/world/draw/DrawSpikes.java
new file mode 100644
index 0000000000..3a19d31628
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawSpikes.java
@@ -0,0 +1,36 @@
+package mindustry.world.draw;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import mindustry.gen.*;
+
+public class DrawSpikes extends DrawBlock{
+    public Color color = Color.valueOf("7457ce");
+
+    public int amount = 10, layers = 1;
+    public float stroke = 2f, rotateSpeed = 0.8f;
+    public float radius = 6f, length = 4f, x = 0f, y = 0f, layerSpeed = -1f;
+
+    public DrawSpikes(Color color){
+        this.color = color;
+    }
+
+    public DrawSpikes(){
+    }
+
+    @Override
+    public void draw(Building build){
+        if(build.warmup() <= 0.001f) return;
+
+        Draw.color(color, build.warmup() * color.a);
+
+        Lines.stroke(stroke);
+        float curSpeed = 1f;
+        for(int i = 0; i < layers; i++){
+            Lines.spikes(build.x + x, build.y + y, radius, length, amount, build.totalProgress() * rotateSpeed * curSpeed);
+            curSpeed *= layerSpeed;
+        }
+
+        Draw.reset();
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java
new file mode 100644
index 0000000000..d76708b9d6
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawTurret.java
@@ -0,0 +1,133 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.entities.part.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.defense.turrets.*;
+import mindustry.world.blocks.defense.turrets.Turret.*;
+
+/** Extend to implement custom drawing behavior for a turret. */
+public class DrawTurret extends DrawBlock{
+    protected static final Rand rand = new Rand();
+
+    public Seq<DrawPart> parts = new Seq<>();
+    /** Prefix to use when loading base region. */
+    public String basePrefix = "";
+    /** Overrides the liquid to draw in the liquid region. */
+    public @Nullable Liquid liquidDraw;
+    public float turretLayer = Layer.turret, shadowLayer = Layer.turret - 0.5f, heatLayer = Layer.turretHeat;
+    public TextureRegion base, liquid, top, heat, preview, outline;
+
+    public DrawTurret(String basePrefix){
+        this.basePrefix = basePrefix;
+    }
+
+    public DrawTurret(){
+    }
+
+    @Override
+    public void getRegionsToOutline(Block block, Seq<TextureRegion> out){
+        for(var part : parts){
+            part.getOutlines(out);
+        }
+
+        if(block.region.found() && !(block.outlinedIcon > 0 && block.outlinedIcon < block.getGeneratedIcons().length && block.getGeneratedIcons()[block.outlinedIcon].equals(block.region))){
+            out.add(block.region);
+        }
+
+        block.resetGeneratedIcons();
+    }
+
+    @Override
+    public void draw(Building build){
+        Turret turret = (Turret)build.block;
+        TurretBuild tb = (TurretBuild)build;
+
+        Draw.rect(base, build.x, build.y);
+        Draw.color();
+
+        Draw.z(shadowLayer);
+
+        Drawf.shadow(preview, build.x + tb.recoilOffset.x - turret.elevation, build.y + tb.recoilOffset.y - turret.elevation, tb.drawrot());
+
+        Draw.z(turretLayer);
+
+        drawTurret(turret, tb);
+        drawHeat(turret, tb);
+
+        if(parts.size > 0){
+            if(outline.found()){
+                //draw outline under everything when parts are involved
+                Draw.z(turretLayer - 0.01f);
+                Draw.rect(outline, build.x + tb.recoilOffset.x, build.y + tb.recoilOffset.y, tb.drawrot());
+                Draw.z(turretLayer);
+            }
+
+            float progress = tb.progress();
+
+            //TODO no smooth reload
+            var params = DrawPart.params.set(build.warmup(), 1f - progress, 1f - progress, tb.heat, tb.curRecoil, tb.charge, tb.x + tb.recoilOffset.x, tb.y + tb.recoilOffset.y, tb.rotation);
+
+            for(var part : parts){
+                params.setRecoil(part.recoilIndex >= 0 && tb.curRecoils != null ? tb.curRecoils[part.recoilIndex] : tb.curRecoil);
+                part.draw(params);
+            }
+        }
+    }
+
+    public void drawTurret(Turret block, TurretBuild build){
+        if(block.region.found()){
+            Draw.rect(block.region, build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.drawrot());
+        }
+
+        if(liquid.found()){
+            Liquid toDraw = liquidDraw == null ? build.liquids.current() : liquidDraw;
+            Drawf.liquid(liquid, build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.liquids.get(toDraw) / block.liquidCapacity, toDraw.color.write(Tmp.c1).a(1f), build.drawrot());
+        }
+
+        if(top.found()){
+            Draw.rect(top, build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.drawrot());
+        }
+    }
+
+    public void drawHeat(Turret block, TurretBuild build){
+        if(build.heat <= 0.00001f || !heat.found()) return;
+
+        Drawf.additive(heat, block.heatColor.write(Tmp.c1).a(build.heat), build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.drawrot(), heatLayer);
+    }
+
+    /** Load any relevant texture regions. */
+    @Override
+    public void load(Block block){
+        if(!(block instanceof Turret)) throw new ClassCastException("This drawer can only be used on turrets.");
+
+        preview = Core.atlas.find(block.name + "-preview", block.region);
+        outline = Core.atlas.find(block.name + "-outline");
+        liquid = Core.atlas.find(block.name + "-liquid");
+        top = Core.atlas.find(block.name + "-top");
+        heat = Core.atlas.find(block.name + "-heat");
+        base = Core.atlas.find(block.name + "-base");
+
+        for(var part : parts){
+            part.turretShading = true;
+            part.load(block.name);
+        }
+
+        //TODO test this for mods, e.g. exotic
+        if(!base.found() && block.minfo.mod != null) base = Core.atlas.find(block.minfo.mod.name + "-" + basePrefix + "block-" + block.size);
+        if(!base.found()) base = Core.atlas.find(basePrefix + "block-" + block.size);
+    }
+
+    /** @return the generated icons to be used for this block. */
+    @Override
+    public TextureRegion[] icons(Block block){
+        return top.found() ? new TextureRegion[]{base, preview, top} : new TextureRegion[]{base, preview};
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawWarmupRegion.java b/core/src/mindustry/world/draw/DrawWarmupRegion.java
new file mode 100644
index 0000000000..1145d49f04
--- /dev/null
+++ b/core/src/mindustry/world/draw/DrawWarmupRegion.java
@@ -0,0 +1,36 @@
+package mindustry.world.draw;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class DrawWarmupRegion extends DrawBlock{
+    public float sinMag = 0.6f, sinScl = 8f;
+    public Color color = Color.valueOf("ff9b59");
+    public TextureRegion region;
+
+    @Override
+    public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
+
+    }
+
+    @Override
+    public void draw(Building build){
+        Draw.color(color);
+        Draw.alpha(build.warmup() * (1f - sinMag) + Mathf.absin(Time.time, sinScl, sinMag) * build.warmup());
+        Draw.rect(region, build.x, build.y);
+        Draw.reset();
+    }
+
+    @Override
+    public void load(Block block){
+        super.load(block);
+
+        region = Core.atlas.find(block.name + "-top");
+    }
+}
diff --git a/core/src/mindustry/world/draw/DrawWeave.java b/core/src/mindustry/world/draw/DrawWeave.java
index 5ccd476b5f..d95652455e 100644
--- a/core/src/mindustry/world/draw/DrawWeave.java
+++ b/core/src/mindustry/world/draw/DrawWeave.java
@@ -4,40 +4,36 @@ import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import mindustry.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
-import mindustry.world.blocks.production.GenericCrafter.*;
 
 public class DrawWeave extends DrawBlock{
-    public TextureRegion weave, bottom;
+    public TextureRegion weave;
 
     @Override
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(bottom, entity.x, entity.y);
-        Draw.rect(weave, entity.x, entity.y, entity.totalProgress);
+    public void draw(Building build){
+        Draw.rect(weave, build.x, build.y, build.totalProgress());
 
         Draw.color(Pal.accent);
-        Draw.alpha(entity.warmup);
+        Draw.alpha(build.warmup());
 
         Lines.lineAngleCenter(
-        entity.x + Mathf.sin(entity.totalProgress, 6f, Vars.tilesize / 3f * entity.block.size),
-        entity.y,
+        build.x + Mathf.sin(build.totalProgress(), 6f, Vars.tilesize / 3f * build.block.size),
+        build.y,
         90,
-        entity.block.size * Vars.tilesize / 2f);
+        build.block.size * Vars.tilesize / 2f);
 
         Draw.reset();
+    }
 
-        Draw.rect(entity.block.region, entity.x, entity.y);
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{weave};
     }
 
     @Override
     public void load(Block block){
         weave = Core.atlas.find(block.name + "-weave");
-        bottom = Core.atlas.find(block.name + "-bottom");
-    }
-
-    @Override
-    public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{bottom, block.region, weave};
     }
 }
diff --git a/core/src/mindustry/world/meta/Attribute.java b/core/src/mindustry/world/meta/Attribute.java
index 07699ba6b3..8b960f2b36 100644
--- a/core/src/mindustry/world/meta/Attribute.java
+++ b/core/src/mindustry/world/meta/Attribute.java
@@ -1,24 +1,65 @@
 package mindustry.world.meta;
 
+import arc.struct.*;
 import mindustry.*;
 
-public enum Attribute{
-    /** Heat of this block. Used for calculating output of thermal generators. */
-    heat,
-    /** Spore content of this block. Used for increasing cultivator yield. */
-    spores,
-    /** Water content of this block. Used for increasing water extractor yield. */
-    water,
-    /** Oil content of this block. Used for increasing oil extractor yield. */
-    oil,
+public class Attribute{
+    public static Attribute[] all = {};
+    public static ObjectMap<String, Attribute> map = new ObjectMap<>();
+
+    /** Heat content. Used for thermal generator yield. */
+    public static final Attribute
+    heat = add("heat"),
+    /** Spore content. Used for cultivator yield. */
+    spores = add("spores"),
+    /** Water content. Used for water extractor yield. */
+    water = add("water"),
+    /** Oil content. Used for oil extractor yield. */
+    oil = add("oil"),
     /** Light coverage. Negative values decrease solar panel efficiency. */
-    light;
+    light = add("light"),
+    /** Used for sand extraction. */
+    sand = add("sand"),
+    /** Used for erekir vents only. */
+    steam = add("steam");
 
-    public static final Attribute[] all = values();
+    public final int id;
+    public final String name;
 
-    /** @return the envrionmental value for this attribute. */
+    /** @return the environmental value for this attribute. */
     public float env(){
         if(Vars.state == null) return 0;
         return Vars.state.envAttrs.get(this);
     }
+
+    Attribute(int id, String name){
+        this.id = id;
+        this.name = name;
+    }
+
+    @Override
+    public String toString(){
+        return name;
+    }
+
+    /** Never returns null, may throw an exception if not found. */
+    public static Attribute get(String name){
+        return map.getThrow(name, () -> new IllegalArgumentException("Unknown Attribute type: " + name));
+    }
+
+    /** @return Whether an attribute exists. */
+    public static boolean exists(String name){
+        return map.containsKey(name);
+    }
+
+    /** Automatically registers this attribute for use. Do not call after mod init. */
+    public static Attribute add(String name){
+        Attribute a = new Attribute(all.length, name);
+        Attribute[] prev = all;
+        all = new Attribute[all.length + 1];
+        System.arraycopy(prev, 0, all, 0, a.id);
+        all[a.id] = a;
+        map.put(name, a);
+        return a;
+    }
 }
diff --git a/core/src/mindustry/world/meta/BlockBars.java b/core/src/mindustry/world/meta/BlockBars.java
deleted file mode 100644
index acc6cbd100..0000000000
--- a/core/src/mindustry/world/meta/BlockBars.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package mindustry.world.meta;
-
-import arc.func.*;
-import arc.struct.*;
-import mindustry.gen.*;
-import mindustry.ui.*;
-
-public class BlockBars{
-    private OrderedMap<String, Func<Building, Bar>> bars = new OrderedMap<>();
-
-    public <T extends Building> void add(String name, Func<T, Bar> sup){
-        bars.put(name, (Func<Building, Bar>)sup);
-    }
-
-    public void remove(String name){
-        if(!bars.containsKey(name))
-            throw new RuntimeException("No bar with name '" + name + "' found; current bars: " + bars.keys().toSeq());
-        bars.remove(name);
-    }
-
-    public Iterable<Func<Building, Bar>> list(){
-        return bars.values();
-    }
-}
diff --git a/core/src/mindustry/world/meta/BlockFlag.java b/core/src/mindustry/world/meta/BlockFlag.java
index f1778accff..82d073a780 100644
--- a/core/src/mindustry/world/meta/BlockFlag.java
+++ b/core/src/mindustry/world/meta/BlockFlag.java
@@ -14,18 +14,25 @@ public enum BlockFlag{
     factory,
     /** Repair point. */
     repair,
-    /** Rally point. */
-    rally,
     /** Block that stored power for resupply. */
     battery,
-    /** Block used for resupply. */
-    resupply,
     /** Any reactor block. */
     reactor,
-    /** Any block that boosts unit capacity. */
-    unitModifier,
     /** Blocks that extinguishes fires. */
-    extinguisher;
+    extinguisher,
+    /** Is a drill. */
+    drill,
+    /** Force projector block. */
+    shield,
+
+    //special, internal identifiers
+    launchPad,
+    unitCargoUnloadPoint,
+    unitAssembler,
+    hasFogRadius;
 
     public final static BlockFlag[] all = values();
+
+    /** Values for logic only. Filters out some internal flags. */
+    public final static BlockFlag[] allLogic = {core, storage, generator, turret, factory, repair, battery, reactor, drill, shield};
 }
diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java
index 690e181b64..e3b6d8ed11 100644
--- a/core/src/mindustry/world/meta/BlockGroup.java
+++ b/core/src/mindustry/world/meta/BlockGroup.java
@@ -1,7 +1,7 @@
 package mindustry.world.meta;
 
 public enum BlockGroup{
-    none, walls(true), projectors(true), turrets, transportation(true), power, liquids(true), drills, storage, units, logic(true);
+    none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true), payloads(true), heat(true);
 
     /** if true, any block in this category replaces any other block in this category. */
     public final boolean anyReplace;
diff --git a/core/src/mindustry/world/meta/BlockStatus.java b/core/src/mindustry/world/meta/BlockStatus.java
index fa939ec8c7..d21887244e 100644
--- a/core/src/mindustry/world/meta/BlockStatus.java
+++ b/core/src/mindustry/world/meta/BlockStatus.java
@@ -6,7 +6,8 @@ import mindustry.graphics.*;
 public enum BlockStatus{
     active(Color.valueOf("5ce677")),
     noOutput(Color.orange),
-    noInput(Pal.remove);
+    noInput(Pal.remove),
+    logicDisable(Color.valueOf("8a73c6"));
 
     public final Color color;
 
diff --git a/core/src/mindustry/world/meta/BuildVisibility.java b/core/src/mindustry/world/meta/BuildVisibility.java
index 2402b0238b..06d08323f2 100644
--- a/core/src/mindustry/world/meta/BuildVisibility.java
+++ b/core/src/mindustry/world/meta/BuildVisibility.java
@@ -2,16 +2,24 @@ package mindustry.world.meta;
 
 import arc.func.*;
 import mindustry.*;
+import mindustry.content.*;
 
-public enum BuildVisibility{
-    hidden(() -> false),
-    shown(() -> true),
-    debugOnly(() -> false),
-    editorOnly(() -> false),
-    sandboxOnly(() -> Vars.state == null || Vars.state.rules.infiniteResources),
-    campaignOnly(() -> Vars.state == null || Vars.state.isCampaign()),
-    lightingOnly(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()),
-    ammoOnly(() -> Vars.state == null || Vars.state.rules.unitAmmo);
+public class BuildVisibility{
+    public static final BuildVisibility
+
+    hidden = new BuildVisibility(() -> false),
+    shown = new BuildVisibility(() -> true),
+    debugOnly = new BuildVisibility(() -> false),
+    editorOnly = new BuildVisibility(() -> Vars.state.rules.editor),
+    coreZoneOnly = new BuildVisibility(() -> Vars.indexer.isBlockPresent(Blocks.coreZone)),
+    worldProcessorOnly = new BuildVisibility(() -> Vars.state.rules.editor || Vars.state.rules.allowEditWorldProcessors),
+    sandboxOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.infiniteResources),
+    campaignOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.isCampaign()),
+    legacyLaunchPadOnly = new BuildVisibility(() -> (Vars.state == null || Vars.state.isCampaign() && Vars.state.getPlanet().campaignRules.legacyLaunchPads) && Blocks.advancedLaunchPad != null && Blocks.advancedLaunchPad.unlocked()),
+    notLegacyLaunchPadOnly = new BuildVisibility(() -> (Vars.state == null || Vars.state.isCampaign() && !Vars.state.getPlanet().campaignRules.legacyLaunchPads)),
+    lightingOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()),
+    ammoOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.unitAmmo),
+    fogOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor);
 
     private final Boolp visible;
 
@@ -19,7 +27,7 @@ public enum BuildVisibility{
         return visible.get();
     }
 
-    BuildVisibility(Boolp visible){
+    public BuildVisibility(Boolp visible){
         this.visible = visible;
     }
 }
diff --git a/core/src/mindustry/world/meta/Env.java b/core/src/mindustry/world/meta/Env.java
new file mode 100644
index 0000000000..4cb7bf7676
--- /dev/null
+++ b/core/src/mindustry/world/meta/Env.java
@@ -0,0 +1,26 @@
+package mindustry.world.meta;
+
+/** Environmental flags for different types of locations. */
+public class Env{
+    public static final int
+    //is on a planet
+    terrestrial = 1,
+    //is in space, no atmosphere
+    space = 1 << 1,
+    //is underwater, on a planet
+    underwater = 1 << 2,
+    //has a spores
+    spores = 1 << 3,
+    //has a scorching env effect
+    scorching = 1 << 4,
+    //has oil reservoirs
+    groundOil = 1 << 5,
+    //has water reservoirs
+    groundWater = 1 << 6,
+    //has oxygen in the atmosphere
+    oxygen = 1 << 7,
+    //all attributes combined, only used for bitmasking purposes
+    any = 0xffffffff,
+    //no attributes (0)
+    none = 0;
+}
\ No newline at end of file
diff --git a/core/src/mindustry/world/meta/PowerType.java b/core/src/mindustry/world/meta/PowerType.java
deleted file mode 100644
index 3f870ce85a..0000000000
--- a/core/src/mindustry/world/meta/PowerType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package mindustry.world.meta;
-
-public enum PowerType{
-    consumer,
-    producer,
-    bridge
-}
diff --git a/core/src/mindustry/world/meta/Producers.java b/core/src/mindustry/world/meta/Producers.java
deleted file mode 100644
index 56abff88d6..0000000000
--- a/core/src/mindustry/world/meta/Producers.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package mindustry.world.meta;
-
-import arc.struct.*;
-import mindustry.gen.*;
-
-public class Producers{
-    private Seq<Produce> producers = new Seq<>();
-
-    public void add(Produce prod){
-        producers.add(prod);
-    }
-
-    interface Produce{
-        void add(Building entity);
-    }
-}
diff --git a/core/src/mindustry/world/meta/Stat.java b/core/src/mindustry/world/meta/Stat.java
index 2f933bb46a..b1257d6232 100644
--- a/core/src/mindustry/world/meta/Stat.java
+++ b/core/src/mindustry/world/meta/Stat.java
@@ -1,94 +1,129 @@
 package mindustry.world.meta;
 
 import arc.*;
+import arc.struct.*;
 
 import java.util.*;
 
 /** Describes one type of stat for content. */
-public enum Stat{
-    health,
-    size,
-    displaySize,
-    buildTime,
-    buildCost,
-    memoryCapacity,
-    explosiveness,
-    flammability,
-    radioactivity,
-    heatCapacity,
-    viscosity,
-    temperature,
-    flying,
-    speed,
-    buildSpeed,
-    mineSpeed,
-    mineTier,
-    payloadCapacity,
-    commandLimit,
-    baseDeflectChance,
-    lightningChance, 
-    lightningDamage,
-    abilities,
-    canBoost,
+public class Stat implements Comparable<Stat>{
+    public static final Seq<Stat> all = new Seq<>();
 
-    itemCapacity(StatCat.items),
-    itemsMoved(StatCat.items),
-    launchTime(StatCat.items),
-    maxConsecutive(StatCat.items),
+    public static final Stat
 
-    liquidCapacity(StatCat.liquids),
+    health = new Stat("health"),
+    armor = new Stat("armor"),
+    size = new Stat("size"),
+    displaySize = new Stat("displaySize"),
+    buildTime = new Stat("buildTime"),
+    buildCost = new Stat("buildCost"),
+    memoryCapacity = new Stat("memoryCapacity"),
+    explosiveness = new Stat("explosiveness"),
+    flammability = new Stat("flammability"),
+    radioactivity = new Stat("radioactivity"),
+    charge = new Stat("charge"),
+    heatCapacity = new Stat("heatCapacity"),
+    viscosity = new Stat("viscosity"),
+    temperature = new Stat("temperature"),
+    flying = new Stat("flying"),
+    speed = new Stat("speed"),
+    buildSpeed = new Stat("buildSpeed"),
+    mineSpeed = new Stat("mineSpeed"),
+    mineTier = new Stat("mineTier"),
+    payloadCapacity = new Stat("payloadCapacity"),
+    baseDeflectChance = new Stat("baseDeflectChance"),
+    lightningChance = new Stat("lightningChance"),
+    lightningDamage = new Stat("lightningDamage"),
+    abilities = new Stat("abilities"),
+    canBoost = new Stat("canBoost"),
+    maxUnits = new Stat("maxUnits"),
 
-    powerCapacity(StatCat.power),
-    powerUse(StatCat.power),
-    powerDamage(StatCat.power),
-    powerRange(StatCat.power),
-    powerConnections(StatCat.power),
-    basePowerGeneration(StatCat.power),
+    damageMultiplier = new Stat("damageMultiplier"),
+    healthMultiplier = new Stat("healthMultiplier"),
+    speedMultiplier = new Stat("speedMultiplier"),
+    reloadMultiplier = new Stat("reloadMultiplier"),
+    buildSpeedMultiplier = new Stat("buildSpeedMultiplier"),
+    reactive = new Stat("reactive"),
+    healing = new Stat("healing"),
+    immunities = new Stat("immunities"),
 
-    tiles(StatCat.crafting),
-    input(StatCat.crafting),
-    output(StatCat.crafting),
-    productionTime(StatCat.crafting),
-    drillTier(StatCat.crafting),
-    drillSpeed(StatCat.crafting),
-    maxUnits(StatCat.crafting),
-    linkRange(StatCat.crafting),
-    instructions(StatCat.crafting),
+    itemCapacity = new Stat("itemCapacity", StatCat.items),
+    itemsMoved = new Stat("itemsMoved", StatCat.items),
+    launchTime = new Stat("launchTime", StatCat.items),
+    maxConsecutive = new Stat("maxConsecutive", StatCat.items),
 
-    weapons(StatCat.function),
-    bullet(StatCat.function),
+    liquidCapacity = new Stat("liquidCapacity", StatCat.liquids),
 
-    speedIncrease(StatCat.function),
-    repairTime(StatCat.function),
-    range(StatCat.function),
-    shootRange(StatCat.function),
-    inaccuracy(StatCat.function),
-    shots(StatCat.function),
-    reload(StatCat.function),
-    powerShot(StatCat.function),
-    targetsAir(StatCat.function),
-    targetsGround(StatCat.function),
-    damage(StatCat.function),
-    ammo(StatCat.function),
-    ammoUse(StatCat.function),
-    shieldHealth(StatCat.function),
-    cooldownTime(StatCat.function),
+    powerCapacity = new Stat("powerCapacity", StatCat.power),
+    powerUse = new Stat("powerUse", StatCat.power),
+    powerDamage = new Stat("powerDamage", StatCat.power),
+    powerRange = new Stat("powerRange", StatCat.power),
+    powerConnections = new Stat("powerConnections", StatCat.power),
+    basePowerGeneration = new Stat("basePowerGeneration", StatCat.power),
 
-    booster(StatCat.optional),
-    boostEffect(StatCat.optional),
-    affinities(StatCat.optional);
+    tiles = new Stat("tiles", StatCat.crafting),
+    input = new Stat("input", StatCat.crafting),
+    output = new Stat("output", StatCat.crafting),
+    productionTime = new Stat("productionTime", StatCat.crafting),
+    maxEfficiency = new Stat("maxEfficiency", StatCat.crafting),
+    drillTier = new Stat("drillTier", StatCat.crafting),
+    drillSpeed = new Stat("drillSpeed", StatCat.crafting),
+    linkRange = new Stat("linkRange", StatCat.crafting),
+    instructions = new Stat("instructions", StatCat.crafting),
+
+    weapons = new Stat("weapons", StatCat.function),
+    bullet = new Stat("bullet", StatCat.function),
+
+    speedIncrease = new Stat("speedIncrease", StatCat.function),
+    repairTime = new Stat("repairTime", StatCat.function),
+    repairSpeed = new Stat("repairSpeed", StatCat.function),
+    range = new Stat("range", StatCat.function),
+    shootRange = new Stat("shootRange", StatCat.function),
+    inaccuracy = new Stat("inaccuracy", StatCat.function),
+    shots = new Stat("shots", StatCat.function),
+    reload = new Stat("reload", StatCat.function),
+    targetsAir = new Stat("targetsAir", StatCat.function),
+    targetsGround = new Stat("targetsGround", StatCat.function),
+    damage = new Stat("damage", StatCat.function),
+    ammo = new Stat("ammo", StatCat.function),
+    ammoCapacity = new Stat("ammoCapacity", StatCat.function),
+    ammoUse = new Stat("ammoUse", StatCat.function),
+    shieldHealth = new Stat("shieldHealth", StatCat.function),
+    cooldownTime = new Stat("cooldownTime", StatCat.function),
+    moduleTier = new Stat("moduletier", StatCat.function),
+    unitType = new Stat("unittype", StatCat.function),
+
+    booster = new Stat("booster", StatCat.optional),
+    boostEffect = new Stat("boostEffect", StatCat.optional),
+    affinities = new Stat("affinities", StatCat.optional),
+    opposites = new Stat("opposites", StatCat.optional);
 
     public final StatCat category;
+    public final String name;
+    public final int id;
 
-    Stat(StatCat category){
+    public Stat(String name, StatCat category){
         this.category = category;
+        this.name = name;
+        id = all.size;
+        all.add(this);
     }
 
-    Stat(){
-        this.category = StatCat.general;
+    public Stat(String name){
+        this(name, StatCat.general);
     }
 
     public String localized(){
-        return Core.bundle.get("stat." + name().toLowerCase(Locale.ROOT));
+        return Core.bundle.get("stat." + name.toLowerCase(Locale.ROOT));
+    }
+
+    @Override
+    public String toString(){
+        return name;
+    }
+
+    @Override
+    public int compareTo(Stat o){
+        return id - o.id;
     }
 }
diff --git a/core/src/mindustry/world/meta/StatCat.java b/core/src/mindustry/world/meta/StatCat.java
index 0398ff7b5d..416df5a20a 100644
--- a/core/src/mindustry/world/meta/StatCat.java
+++ b/core/src/mindustry/world/meta/StatCat.java
@@ -1,18 +1,42 @@
 package mindustry.world.meta;
 
 import arc.*;
+import arc.struct.*;
 
 /** A specific category for a stat. */
-public enum StatCat{
-    general,
-    power,
-    liquids,
-    items,
-    crafting,
-    function,
-    optional;
+public class StatCat implements Comparable<StatCat>{
+    public static final Seq<StatCat> all = new Seq<>();
+
+    public static final StatCat
+
+    general = new StatCat("general"),
+    power = new StatCat("power"),
+    liquids = new StatCat("liquids"),
+    items = new StatCat("items"),
+    crafting = new StatCat("crafting"),
+    function = new StatCat("function"),
+    optional = new StatCat("optional");
+
+    public final String name;
+    public final int id;
+
+    public StatCat(String name){
+        this.name = name;
+        id = all.size;
+        all.add(this);
+    }
 
     public String localized(){
-        return Core.bundle.get("category." + name());
+        return Core.bundle.get("category." + name);
+    }
+
+    @Override
+    public String toString(){
+        return name;
+    }
+
+    @Override
+    public int compareTo(StatCat o){
+        return id - o.id;
     }
 }
diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java
index f2d1ba07c3..917b88937d 100644
--- a/core/src/mindustry/world/meta/StatUnit.java
+++ b/core/src/mindustry/world/meta/StatUnit.java
@@ -1,44 +1,60 @@
 package mindustry.world.meta;
 
 import arc.*;
+import arc.util.*;
+import mindustry.gen.*;
 
 import java.util.*;
 
 /**
  * Defines a unit of measurement for block stats.
  */
-public enum StatUnit{
-    blocks,
-    blocksSquared,
-    powerSecond,
-    liquidSecond,
-    itemsSecond,
-    liquidUnits,
-    powerUnits,
-    degrees,
-    seconds,
-    minutes,
-    perSecond,
-    perMinute,
-    perShot,
-    timesSpeed(false),
-    percent(false),
-    shieldHealth,
-    none,
-    items;
+public class StatUnit{
+    public static final StatUnit
+
+    blocks = new StatUnit("blocks"),
+    blocksSquared = new StatUnit("blocksSquared"),
+    tilesSecond = new StatUnit("tilesSecond"),
+    powerSecond = new StatUnit("powerSecond", "[accent]" + Iconc.power + "[]"),
+    liquidSecond = new StatUnit("liquidSecond", "[sky]" + Iconc.liquid + "[]"),
+    itemsSecond = new StatUnit("itemsSecond"),
+    liquidUnits = new StatUnit("liquidUnits", "[sky]" + Iconc.liquid + "[]"),
+    powerUnits = new StatUnit("powerUnits", "[accent]" + Iconc.power + "[]"),
+    heatUnits = new StatUnit("heatUnits", "[red]" + Iconc.waves + "[]"),
+    degrees = new StatUnit("degrees"),
+    seconds = new StatUnit("seconds"),
+    minutes = new StatUnit("minutes"),
+    shots = new StatUnit("shots"),
+    perSecond = new StatUnit("perSecond", false),
+    perMinute = new StatUnit("perMinute", false),
+    perShot = new StatUnit("perShot", false),
+    timesSpeed = new StatUnit("timesSpeed", false),
+    multiplier = new StatUnit("multiplier", false),
+    percent = new StatUnit("percent", false),
+    shieldHealth = new StatUnit("shieldHealth"),
+    none = new StatUnit("none"),
+    items = new StatUnit("items");
 
     public final boolean space;
+    public final String name;
+    public @Nullable String icon;
 
-    StatUnit(boolean space){
+    public StatUnit(String name, boolean space){
+        this.name = name;
         this.space = space;
     }
 
-    StatUnit(){
-        this(true);
+    public StatUnit(String name){
+        this(name, true);
+    }
+
+    public StatUnit(String name, String icon){
+        this(name, true);
+        this.icon = icon;
     }
 
     public String localized(){
         if(this == none) return "";
-        return Core.bundle.get("unit." + name().toLowerCase(Locale.ROOT));
+        return Core.bundle.get("unit." + name.toLowerCase(Locale.ROOT));
     }
 }
diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
new file mode 100644
index 0000000000..5720179103
--- /dev/null
+++ b/core/src/mindustry/world/meta/StatValues.java
@@ -0,0 +1,782 @@
+package mindustry.world.meta;
+
+import arc.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.Tooltip.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.ctype.*;
+import mindustry.entities.abilities.*;
+import mindustry.entities.bullet.*;
+import mindustry.gen.*;
+import mindustry.maps.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.defense.turrets.*;
+import mindustry.world.blocks.environment.*;
+
+import static mindustry.Vars.*;
+
+/** Utilities for displaying certain stats in a table. */
+public class StatValues{
+
+    public static StatValue string(String value, Object... args){
+        String result = Strings.format(value, args);
+        return table -> table.add(result);
+    }
+
+    public static StatValue bool(boolean value){
+        return table ->  table.add(!value ? "@no" : "@yes");
+    }
+
+    public static String fixValue(float value){
+        return Strings.autoFixed(value, 2);
+    }
+
+    public static StatValue squared(float value, StatUnit unit){
+        return table -> {
+            String fixed = fixValue(value);
+            table.add(fixed + "x" + fixed);
+            table.add((unit.space ? " " : "") + unit.localized());
+        };
+    }
+
+    public static StatValue number(float value, StatUnit unit, boolean merge){
+        return table -> {
+            String l1 = (unit.icon == null ? "" : unit.icon + " ") + fixValue(value), l2 = (unit.space ? " " : "") + unit.localized();
+
+            if(merge){
+                table.add(l1 + l2).left();
+            }else{
+                table.add(l1).left();
+                table.add(l2).left();
+            }
+        };
+    }
+
+    public static StatValue number(float value, StatUnit unit){
+        return number(value, unit, false);
+    }
+
+    public static StatValue multiplierModifier(float value, StatUnit unit, boolean merge){
+        return table -> {
+            String l1 = (unit.icon == null ? "" : unit.icon + " ") + multStat(value), l2 = (unit.space ? " " : "") + unit.localized();
+
+            if(merge){
+                table.add(l1 + l2).left();
+            }else{
+                table.add(l1).left();
+                table.add(l2).left();
+            }
+        };
+    }
+
+    public static StatValue multiplierModifier(float value, StatUnit unit){
+        return multiplierModifier(value, unit, true);
+    }
+
+    public static StatValue multiplierModifier(float value){
+        return multiplierModifier(value, StatUnit.multiplier);
+    }
+
+    public static StatValue percentModifier(float value, StatUnit unit, boolean merge){
+        return table -> {
+            String l1 = (unit.icon == null ? "" : unit.icon + " ") + ammoStat((value - 1) * 100), l2 = (unit.space ? " " : "") + unit.localized();
+
+            if(merge){
+                table.add(l1 + l2).left();
+            }else{
+                table.add(l1).left();
+                table.add(l2).left();
+            }
+        };
+    }
+
+    public static StatValue percentModifier(float value, StatUnit unit){
+        return percentModifier(value, unit, true);
+    }
+
+    public static StatValue percentModifier(float value){
+        return percentModifier(value, StatUnit.percent);
+    }
+
+    public static StatValue liquid(Liquid liquid, float amount, boolean perSecond){
+        return table -> table.add(displayLiquid(liquid, amount, perSecond)).left();
+    }
+
+    public static StatValue liquids(Boolf<Liquid> filter, float amount, boolean perSecond){
+        return table -> {
+            Seq<Liquid> list = content.liquids().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden());
+
+            for(int i = 0; i < list.size; i++){
+                table.add(displayLiquid(list.get(i), amount, perSecond)).padRight(5);
+
+                if(i != list.size - 1){
+                    table.add("/");
+                }
+            }
+        };
+    }
+
+    public static StatValue liquids(float timePeriod, LiquidStack... stacks){
+        return liquids(timePeriod, true, stacks);
+    }
+
+    public static StatValue liquids(float timePeriod, boolean perSecond, LiquidStack... stacks){
+        return table -> {
+            for(var stack : stacks){
+                table.add(displayLiquid(stack.liquid, stack.amount * (60f / timePeriod), perSecond)).padRight(5);
+            }
+        };
+    }
+
+    public static StatValue items(ItemStack... stacks){
+        return items(true, stacks);
+    }
+
+    public static StatValue items(boolean displayName, ItemStack... stacks){
+        return table -> {
+            for(ItemStack stack : stacks){
+                table.add(displayItem(stack.item, stack.amount, displayName)).padRight(5);
+            }
+        };
+    }
+
+    public static StatValue items(float timePeriod, ItemStack... stacks){
+        return table -> {
+            for(ItemStack stack : stacks){
+                table.add(displayItem(stack.item, stack.amount, timePeriod, true)).padRight(5);
+            }
+        };
+    }
+
+    public static StatValue items(Boolf<Item> filter){
+        return items(-1, filter);
+    }
+
+    public static StatValue items(float timePeriod, Boolf<Item> filter){
+        return table -> {
+            Seq<Item> list = content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden());
+
+            for(int i = 0; i < list.size; i++){
+                Item item = list.get(i);
+
+                table.add(timePeriod <= 0 ? displayItem(item) : displayItem(item, 1, timePeriod, true)).padRight(5);
+
+                if(i != list.size - 1){
+                    table.add("/");
+                }
+            }
+        };
+    }
+
+    public static Table displayLiquid(Liquid liquid, float amount, boolean perSecond){
+        Table t = new Table();
+
+        t.add(new Stack(){{
+            add(new Image(liquid.uiIcon).setScaling(Scaling.fit));
+
+            if(amount != 0){
+                Table t = new Table().left().bottom();
+                t.add(Strings.autoFixed(amount, 2)).style(Styles.outlineLabel);
+                add(t);
+            }
+        }}).size(iconMed).padRight(3  + (amount != 0 ? (Strings.autoFixed(amount, 2).length() - 1) * 10 : 0)).with(s -> withTooltip(s, liquid, false));
+
+        if(perSecond && amount != 0){
+            t.add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray).style(Styles.outlineLabel);
+        }
+
+        t.add(liquid.localizedName);
+
+        return t;
+    }
+
+    public static <T extends Element> T withTooltip(T element, UnlockableContent content, boolean tooltip){
+        if(content != null){
+            if(!mobile){
+                if(tooltip){
+                    element.addListener(Tooltips.getInstance().create(content.localizedName, mobile));
+                }
+                element.addListener(new HandCursorListener(() -> !content.isHidden(), true));
+            }
+            element.clicked(() -> {
+                if(!content.isHidden()){
+                    Vars.ui.content.show(content);
+                }
+            });
+        }
+        return element;
+    }
+
+    public static <T extends Element> T withTooltip(T element, UnlockableContent content){
+        return withTooltip(element, content, false);
+    }
+
+    /** Displays an item with a specified amount. */
+    private static Stack stack(TextureRegion region, int amount, @Nullable UnlockableContent content, boolean tooltip){
+        Stack stack = new Stack();
+
+        stack.add(new Table(o -> {
+            o.left();
+            o.add(new Image(region)).size(32f).scaling(Scaling.fit);
+        }));
+
+        if(amount != 0){
+            stack.add(new Table(t -> {
+                t.left().bottom();
+                t.add(amount >= 1000 ? UI.formatAmount(amount) : amount + "").style(Styles.outlineLabel);
+                t.pack();
+            }));
+        }
+
+        withTooltip(stack, content, tooltip);
+
+        return stack;
+    }
+
+    /** Displays an item with a specified amount. */
+    private static Stack stack(TextureRegion region, int amount, @Nullable UnlockableContent content){
+        return stack(region, amount, content, true);
+    }
+
+    public static Stack stack(ItemStack stack){
+        return stack(stack.item.uiIcon, stack.amount, stack.item);
+    }
+
+    public static Stack stack(UnlockableContent item, int amount){
+        return stack(item.uiIcon, amount, item);
+    }
+
+    public static Stack stack(UnlockableContent item, int amount, boolean tooltip){
+        return stack(item.uiIcon, amount, item, tooltip);
+    }
+
+    public static Stack stack(Item item){
+        return stack(item.uiIcon, 0, item);
+    }
+
+    public static Stack stack(PayloadStack stack){
+        return stack(stack.item.uiIcon, stack.amount, stack.item);
+    }
+
+    public static Table displayItem(Item item){
+        return displayItem(item, 0);
+    }
+
+    public static Table displayItem(Item item, int amount, boolean showName){
+        Table t = new Table();
+        t.add(stack(item, amount, !showName));
+        if(showName) t.add(item.localizedName).padLeft(4 + amount > 99 ? 4 : 0);
+        return t;
+    }
+
+    public static Table displayItem(Item item, int amount){
+        return displayItem(item, amount, true);
+    }
+
+    /** Displays the item with a "/sec" qualifier based on the time period, in ticks. */
+    public static Table displayItem(Item item, int amount, float timePeriod, boolean showName){
+        Table t = new Table();
+        t.add(stack(item, amount, !showName));
+        t.add((showName ? item.localizedName + "\n" : "") + "[lightgray]" + Strings.autoFixed(amount / (timePeriod / 60f), 2) + StatUnit.perSecond.localized()).padLeft(2).padRight(5).style(Styles.outlineLabel);
+        return t;
+    }
+
+    /** Displays the item with a "/sec" qualifier based on the time period, in ticks. */
+    public static Table displayItemPercent(Item item, int percent, boolean showName){
+        Table t = new Table();
+        t.add(stack(item, 0, !showName));
+        t.add((showName ? item.localizedName + "\n" : "") + "[lightgray]" +  percent + "%").padLeft(2).padRight(5).style(Styles.outlineLabel);
+        return t;
+    }
+
+    public static StatValue content(UnlockableContent content){
+        return table -> {
+            table.add(new Image(content.uiIcon)).size(iconSmall).padRight(3);
+            table.add(content.localizedName).padRight(3);
+        };
+    }
+
+    public static StatValue blockEfficiency(Block floor, float multiplier, boolean startZero){
+        return table -> table.stack(
+            new Image(floor.uiIcon).setScaling(Scaling.fit),
+            new Table(t -> t.top().right().add((multiplier < 0 ? "[scarlet]" : startZero ? "[accent]" : "[accent]+") + (int)((multiplier) * 100) + "%").style(Styles.outlineLabel))
+        ).maxSize(64f);
+    }
+
+    public static StatValue blocks(Attribute attr, boolean floating, float scale, boolean startZero){
+        return blocks(attr, floating, scale, startZero, true);
+    }
+
+    public static StatValue blocks(Attribute attr, boolean floating, float scale, boolean startZero, boolean checkFloors){
+        return table -> table.table(c -> {
+            Runnable[] rebuild = {null};
+            Map[] lastMap = {null};
+
+            rebuild[0] = () -> {
+                c.clearChildren();
+                c.left();
+
+                if(state.isGame()){
+                    var blocks = Vars.content.blocks()
+                    .select(block -> (!checkFloors || block instanceof Floor) && indexer.isBlockPresent(block) && block.attributes.get(attr) != 0 && !((block instanceof Floor f && f.isDeep()) && !floating))
+                    .with(s -> s.sort(f -> f.attributes.get(attr)));
+
+                    if(blocks.any()){
+                        int i = 0;
+                        for(var block : blocks){
+
+                            blockEfficiency(block, block.attributes.get(attr) * scale, startZero).display(c);
+                            if(++i % 5 == 0){
+                                c.row();
+                            }
+                        }
+                    }else{
+                        c.add("@none.inmap");
+                    }
+                }else{
+                    c.add("@stat.showinmap");
+                }
+            };
+
+            rebuild[0].run();
+
+            //rebuild when map changes.
+            c.update(() -> {
+                Map current = state.isGame() ? state.map : null;
+
+                if(current != lastMap[0]){
+                    rebuild[0].run();
+                    lastMap[0] = current;
+                }
+            });
+        });
+    }
+    public static StatValue content(Seq<UnlockableContent> list){
+        return content(list, i -> true);
+    }
+
+    public static <T extends UnlockableContent> StatValue content(Seq<T> list, Boolf<T> check){
+        return table -> table.table(l -> {
+            l.left();
+
+            boolean any = false;
+            for(int i = 0; i < list.size; i++){
+                var item = list.get(i);
+
+                if(!check.get(item)) continue;
+                any = true;
+
+                if(item.uiIcon.found()) l.image(item.uiIcon).size(iconSmall).scaling(Scaling.fit).padRight(2).padLeft(2).padTop(3).padBottom(3).with(img -> withTooltip(img, item, false));
+                l.add(item.localizedName).left().padLeft(1).padRight(4).colspan(item.uiIcon.found() ? 1 : 2);
+                if(i % 5 == 4){
+                    l.row();
+                }
+            }
+
+            if(!any){
+                l.add("@none.inmap");
+            }
+        });
+    }
+
+    public static StatValue blocks(Boolf<Block> pred){
+        return content(content.blocks(), pred);
+    }
+
+    public static StatValue blocks(Seq<Block> list){
+        return content(list.as());
+    }
+
+    public static StatValue statusEffects(Seq<StatusEffect> list){
+        return content(list.as());
+    }
+
+    public static StatValue drillables(float drillTime, float drillMultiplier, float size, ObjectFloatMap<Item> multipliers, Boolf<Block> filter){
+        return table -> {
+            table.row();
+            table.table(c -> {
+                int i = 0;
+                for(Block block : content.blocks()){
+                    if(!filter.get(block)) continue;
+
+                    c.table(Styles.grayPanel, b -> {
+                        b.image(block.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit);
+                        b.table(info -> {
+                            info.left();
+                            info.add(block.localizedName).left().row();
+                            info.add(block.itemDrop.emoji()).with(l -> withTooltip(l, block.itemDrop)).left();
+                        }).grow();
+                        if(multipliers != null){
+                            b.add(Strings.autoFixed(60f / (Math.max(drillTime + drillMultiplier * block.itemDrop.hardness, drillTime) / multipliers.get(block.itemDrop, 1f)) * size, 2) + StatUnit.perSecond.localized())
+                            .right().pad(10f).padRight(15f).color(Color.lightGray);
+                        }
+                    }).growX().pad(5);
+                    if(++i % 2 == 0) c.row();
+                }
+            }).growX().colspan(table.getColumns());
+        };
+    }
+
+    public static StatValue boosters(float reload, float maxUsed, float multiplier, boolean baseReload, Boolf<Liquid> filter){
+        return table -> {
+            table.row();
+            table.table(c -> {
+                for(Liquid liquid : content.liquids()){
+                    if(!filter.get(liquid)) continue;
+
+                    c.table(Styles.grayPanel, b -> {
+                        b.image(liquid.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit).with(i -> withTooltip(i, liquid, false));;
+                        b.table(info -> {
+                            info.add(liquid.localizedName).left().row();
+                            info.add(Strings.autoFixed(maxUsed * 60f, 2) + StatUnit.perSecond.localized()).left().color(Color.lightGray);
+                        });
+
+                        b.table(bt -> {
+                            bt.right().defaults().padRight(3).left();
+
+                            float reloadRate = (baseReload ? 1f : 0f) + maxUsed * multiplier * liquid.heatCapacity;
+                            float standardReload = baseReload ? reload : reload / (maxUsed * multiplier * 0.4f);
+                            float result = standardReload / (reload / reloadRate);
+                            bt.add(Core.bundle.format("bullet.reload", Strings.autoFixed(result * 100, 2))).pad(5);
+                        }).right().grow().pad(10f).padRight(15f);
+                    }).growX().pad(5).row();
+                }
+            }).growX().colspan(table.getColumns());
+            table.row();
+        };
+    }
+
+    public static StatValue itemEffMultiplier(Floatf<Item> efficiency, float timePeriod, Boolf<Item> filter){
+        return itemEffMultiplier(efficiency, timePeriod, filter, null);
+    }
+
+    public static StatValue itemEffMultiplier(Floatf<Item> efficiency, float timePeriod, Boolf<Item> filter, @Nullable ObjectFloatMap<Item> itemDurationMultipliers){
+        return table -> {
+            table.getCells().peek().growX(); //Expand the spacer on the row above to push everything to the left
+            table.row();
+            table.table(c -> {
+                for(Item item : content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden())){
+                    float timeMultiplier = itemDurationMultipliers == null ? 1f : itemDurationMultipliers.get(item, 1f);
+                    float time = 1f / (timePeriod * timeMultiplier / 60f);
+
+                    c.table(Styles.grayPanel, b -> {
+                        b.image(item.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit);
+                        b.add(item.localizedName + (timePeriod > 0 ? "\n[lightgray]" + (time < 0.01f ? Strings.fixed(time, 3) : Strings.autoFixed(time, 2)) + StatUnit.perSecond.localized() : "")).left().grow();
+                        b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().pad(10f).padRight(15f);
+                    }).growX().pad(5).row();
+                }
+            }).growX().colspan(table.getColumns()).row();
+        };
+    }
+
+    public static StatValue liquidEffMultiplier(Floatf<Liquid> efficiency, float amount, Boolf<Liquid> filter){
+        return table -> {
+            table.getCells().peek().growX(); //Expand the spacer on the row above to push everything to the left
+            table.row();
+            table.table(c -> {
+                for(Liquid liquid : content.liquids().select(l -> filter.get(l) && l.unlockedNow() && !l.isHidden())){
+                    c.table(Styles.grayPanel, b -> {
+                        b.add(displayLiquid(liquid, amount, true)).pad(10f).left().grow();
+                        b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(liquid) * 100f))).right().pad(10f).padRight(15f);
+                    }).growX().pad(5).row();
+                }
+            }).growX().colspan(table.getColumns()).row();
+        };
+    }
+
+    public static StatValue speedBoosters(String unit, float amount, float speed, boolean strength, Boolf<Liquid> filter){
+        return table -> {
+            table.row();
+            table.table(c -> {
+                for(Liquid liquid : content.liquids()){
+                    if(!filter.get(liquid)) continue;
+
+                    c.table(Styles.grayPanel, b -> {
+                        b.image(liquid.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit).with(i -> withTooltip(i, liquid, false));;
+                        b.table(info -> {
+                            info.add(liquid.localizedName).left().row();
+                            info.add(Strings.autoFixed(amount * 60f, 2) + StatUnit.perSecond.localized()).left().color(Color.lightGray);
+                        });
+
+                        b.table(bt -> {
+                            bt.right().defaults().padRight(3).left();
+                            if(speed != Float.MAX_VALUE) bt.add(unit.replace("{0}", "[stat]" + Strings.autoFixed(speed * (strength ? liquid.heatCapacity : 1f) + (strength ? 1f : 0f), 2) + "[lightgray]")).pad(5);
+                        }).right().grow().pad(10f).padRight(15f);
+                    }).growX().pad(5).row();
+                }
+            }).growX().colspan(table.getColumns());
+            table.row();
+        };
+    }
+
+    public static StatValue itemBoosters(String unit, float timePeriod, float speedBoost, float rangeBoost, ItemStack[] items){
+        return table -> {
+            table.row();
+            table.table(c -> {
+                c.table(Styles.grayPanel, b -> {
+                    b.table(it -> {
+                        for(ItemStack stack : items){
+                            if(timePeriod < 0){
+                                it.add(displayItem(stack.item, stack.amount, true)).pad(10f).padLeft(15f).left();
+                            }else{
+                                it.add(displayItem(stack.item, stack.amount, timePeriod, true)).pad(10f).padLeft(15f).left();
+                            }
+                            it.row();
+                        }
+                    }).left();
+
+                    b.table(bt -> {
+                        bt.right().defaults().padRight(3).left();
+                        if(rangeBoost != 0) bt.add("[lightgray]+[stat]" + Strings.autoFixed(rangeBoost / tilesize, 2) + "[lightgray] " + StatUnit.blocks.localized()).row();
+                        if(speedBoost != 0) bt.add("[lightgray]" + unit.replace("{0}", "[stat]" + Strings.autoFixed(speedBoost, 2) + "[lightgray]"));
+                    }).right().top().grow().pad(10f).padRight(15f);
+                }).growX().pad(5).padBottom(-5).row();
+            }).growX().colspan(table.getColumns());
+            table.row();
+        };
+    }
+
+    public static StatValue weapons(UnitType unit, Seq<Weapon> weapons){
+        return table -> {
+            table.row();
+            for(int i = 0; i < weapons.size; i++){
+                Weapon weapon = weapons.get(i);
+
+                if(weapon.flipSprite || !weapon.hasStats(unit)){
+                    //flipped weapons are not given stats
+                    continue;
+                }
+
+                TextureRegion region = !weapon.name.isEmpty() ? Core.atlas.find(weapon.name + "-preview", weapon.region) : null;
+
+                table.table(Styles.grayPanel, w -> {
+                    w.left().top().defaults().padRight(3).left();
+                    if(region != null && region.found() && weapon.showStatSprite) w.image(region).size(60).scaling(Scaling.bounded).left().top();
+                    w.row();
+
+                    weapon.addStats(unit, w);
+                }).growX().pad(5).margin(10);
+                table.row();
+            }
+        };
+    }
+
+    public static StatValue abilities(Seq<Ability> abilities){
+        return table -> {
+            table.row();
+            table.table(t -> {
+                int count = 0;
+                for(Ability ability : abilities){
+                    if(ability.display){
+                        t.table(Styles.grayPanel, a -> {
+                            a.add("[accent]" + ability.localized()).padBottom(4).center().top().expandX();
+                            a.row();
+                            a.left().top().defaults().left();
+                            ability.addStats(a);
+                        }).pad(5).margin(10).growX().top().uniformX();
+                        if((++count) == 2){
+                            count = 0;
+                            t.row();
+                        }
+                    }
+                };
+            });
+        };
+    }
+
+    public static <T extends UnlockableContent> StatValue ammo(ObjectMap<T, BulletType> map){
+        return ammo(map, false, false);
+    }
+
+    public static <T extends UnlockableContent> StatValue ammo(ObjectMap<T, BulletType> map, boolean showUnit){
+        return ammo(map, false, showUnit);
+    }
+
+    public static <T extends UnlockableContent> StatValue ammo(ObjectMap<T, BulletType> map, boolean nested, boolean showUnit){
+        return table -> {
+
+            table.row();
+
+            var orderedKeys = map.keys().toSeq();
+            orderedKeys.sort();
+
+            for(T t : orderedKeys){
+                boolean compact = t instanceof UnitType && !showUnit || nested;
+
+                BulletType type = map.get(t);
+
+                if(type.spawnUnit != null && type.spawnUnit.weapons.size > 0){
+                    ammo(ObjectMap.of(t, type.spawnUnit.weapons.first().bullet), nested, false).display(table);
+                    continue;
+                }
+
+                table.table(Styles.grayPanel, bt -> {
+                    bt.left().top().defaults().padRight(3).left();
+                    //no point in displaying unit icon twice
+                    if(!compact && !(t instanceof Turret)){
+                        bt.table(title -> {
+                            title.image(icon(t)).size(3 * 8).padRight(4).right().scaling(Scaling.fit).top().with(i -> withTooltip(i, t, false));
+                            title.add(t.localizedName).padRight(10).left().top();
+                        });
+                        bt.row();
+                    }
+
+                    if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
+                        if(type.continuousDamage() > 0){
+                            bt.add(Core.bundle.format("bullet.damage", type.continuousDamage()) + StatUnit.perSecond.localized());
+                        }else{
+                            bt.add(Core.bundle.format("bullet.damage", type.damage));
+                        }
+                    }
+
+                    if(type.buildingDamageMultiplier != 1){
+                        sep(bt, Core.bundle.format("bullet.buildingdamage", ammoStat((int)(type.buildingDamageMultiplier * 100 - 100))));
+                    }
+
+                    if(type.rangeChange != 0 && !compact){
+                        sep(bt, Core.bundle.format("bullet.range", ammoStat(type.rangeChange / tilesize)));
+                    }
+
+                    if(type.shieldDamageMultiplier != 1){
+                        sep(bt, Core.bundle.format("bullet.shielddamage", ammoStat((int)(type.shieldDamageMultiplier * 100 - 100))));
+                    }
+
+                    if(type.splashDamage > 0){
+                        sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1)));
+                    }
+
+                    if(!compact && !Mathf.equal(type.ammoMultiplier, 1f) && type.displayAmmoMultiplier && (!(t instanceof Turret turret) || turret.displayAmmoMultiplier)){
+                        sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier));
+                    }
+
+                    if(!compact && !Mathf.equal(type.reloadMultiplier, 1f)){
+                        int val = (int)(type.reloadMultiplier * 100 - 100);
+                        sep(bt, Core.bundle.format("bullet.reload", ammoStat(val)));
+                    }
+
+                    if(type.knockback > 0){
+                        sep(bt, Core.bundle.format("bullet.knockback", Strings.autoFixed(type.knockback, 2)));
+                    }
+
+                    if(type.healPercent > 0f){
+                        sep(bt, Core.bundle.format("bullet.healpercent", Strings.autoFixed(type.healPercent, 2)));
+                    }
+
+                    if(type.healAmount > 0f){
+                        sep(bt, Core.bundle.format("bullet.healamount", Strings.autoFixed(type.healAmount, 2)));
+                    }
+
+                    if(type.pierce || type.pierceCap != -1){
+                        sep(bt, type.pierceCap == -1 ? "@bullet.infinitepierce" : Core.bundle.format("bullet.pierce", type.pierceCap));
+                    }
+
+                    if(type.incendAmount > 0){
+                        sep(bt, "@bullet.incendiary");
+                    }
+
+                    if(type.homingPower > 0.01f){
+                        sep(bt, "@bullet.homing");
+                    }
+
+                    if(type.lightning > 0){
+                        sep(bt, Core.bundle.format("bullet.lightning", type.lightning, type.lightningDamage < 0 ? type.damage : type.lightningDamage));
+                    }
+
+                    if(type.pierceArmor){
+                        sep(bt, "@bullet.armorpierce");
+                    }
+
+                    if(type.maxDamageFraction > 0){
+                        sep(bt, Core.bundle.format("bullet.maxdamagefraction", (int)(type.maxDamageFraction * 100)));
+                    }
+
+                    if(type.suppressionRange > 0){
+                        sep(bt, Core.bundle.format("bullet.suppression", Strings.autoFixed(type.suppressionDuration / 60f, 2), Strings.fixed(type.suppressionRange / tilesize, 1)));
+                    }
+
+                    if(type.status != StatusEffects.none){
+                        sep(bt, (type.status.hasEmoji() ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + (type.status.reactive ? "" : "[lightgray] ~ [stat]" +
+                            ((int)(type.statusDuration / 60f)) + "[lightgray] " + Core.bundle.get("unit.seconds"))).with(c -> withTooltip(c, type.status));
+                    }
+
+                    if(!type.targetMissiles){
+                        sep(bt, "@bullet.notargetsmissiles");
+                    }
+
+                    if(!type.targetBlocks){
+                        sep(bt, "@bullet.notargetsbuildings");
+                    }
+
+                    if(type.intervalBullet != null){
+                        bt.row();
+
+                        Table ic = new Table();
+                        ammo(ObjectMap.of(t, type.intervalBullet), true, false).display(ic);
+                        Collapser coll = new Collapser(ic, true);
+                        coll.setDuration(0.1f);
+
+                        bt.table(it -> {
+                            it.left().defaults().left();
+
+                            it.add(Core.bundle.format("bullet.interval", Strings.autoFixed(type.intervalBullets / type.bulletInterval * 60, 2)));
+                            it.button(Icon.downOpen, Styles.emptyi, () -> coll.toggle(false)).update(i -> i.getStyle().imageUp = (!coll.isCollapsed() ? Icon.upOpen : Icon.downOpen)).size(8).padLeft(16f).expandX();
+                        });
+                        bt.row();
+                        bt.add(coll);
+                    }
+
+                    if(type.fragBullet != null){
+                        bt.row();
+
+                        Table fc = new Table();
+                        ammo(ObjectMap.of(t, type.fragBullet), true, false).display(fc);
+                        Collapser coll = new Collapser(fc, true);
+                        coll.setDuration(0.1f);
+
+                        bt.table(ft -> {
+                            ft.left().defaults().left();
+
+                            ft.add(Core.bundle.format("bullet.frags", type.fragBullets));
+                            ft.button(Icon.downOpen, Styles.emptyi, () -> coll.toggle(false)).update(i -> i.getStyle().imageUp = (!coll.isCollapsed() ? Icon.upOpen : Icon.downOpen)).size(8).padLeft(16f).expandX();
+                        });
+                        bt.row();
+                        bt.add(coll);
+                    }
+                }).padLeft(5).padTop(5).padBottom(compact ? 0 : 5).growX().margin(compact ? 0 : 10);
+                table.row();
+            }
+        };
+    }
+
+    //for AmmoListValue
+    private static Cell<?> sep(Table table, String text){
+        table.row();
+        return table.add(text);
+    }
+
+    //for AmmoListValue
+    private static String ammoStat(float val){
+        return (val > 0 ? "[stat]+" : "[negstat]") + Strings.autoFixed(val, 1);
+    }
+
+    private static String multStat(float val){
+        return (val >= 1 ? "[stat]" : "[negstat]") + Strings.autoFixed(val, 2);
+    }
+
+    private static TextureRegion icon(UnlockableContent t){
+        return t.uiIcon;
+    }
+}
diff --git a/core/src/mindustry/world/meta/Stats.java b/core/src/mindustry/world/meta/Stats.java
index 39d887f188..e59bae797c 100644
--- a/core/src/mindustry/world/meta/Stats.java
+++ b/core/src/mindustry/world/meta/Stats.java
@@ -3,10 +3,7 @@ package mindustry.world.meta;
 import arc.struct.ObjectMap.*;
 import arc.struct.*;
 import arc.util.*;
-import mindustry.*;
 import mindustry.type.*;
-import mindustry.world.blocks.environment.*;
-import mindustry.world.meta.values.*;
 
 /** Hold and organizes a list of block stats. */
 public class Stats{
@@ -14,14 +11,15 @@ public class Stats{
     public boolean useCategories = false;
     /** Whether these stats are initialized yet. */
     public boolean intialized = false;
+    /** Production time period in ticks. Used for crafters. **/
+    public float timePeriod = -1;
 
-    @Nullable
-    private OrderedMap<StatCat, OrderedMap<Stat, Seq<StatValue>>> map;
+    private @Nullable OrderedMap<StatCat, OrderedMap<Stat, Seq<StatValue>>> map;
     private boolean dirty;
 
     /** Adds a single float value with this stat, formatted to 2 decimal places. */
     public void add(Stat stat, float value, StatUnit unit){
-        add(stat, new NumberValue(value, unit));
+        add(stat, StatValues.number(value, unit));
     }
 
     /** Adds a single float value with this stat and no unit. */
@@ -31,27 +29,37 @@ public class Stats{
 
     /** Adds an integer percent stat value. Value is assumed to be in the 0-1 range. */
     public void addPercent(Stat stat, float value){
-        add(stat, new NumberValue((int)(value * 100), StatUnit.percent));
+        add(stat, StatValues.number((int)(value * 100), StatUnit.percent));
+    }
+
+    /** Adds a multiplicative modifier stat value. Value is assumed to be in the 0-1 range. */
+    public void addMultModifier(Stat stat, float value){
+        add(stat, StatValues.multiplierModifier(value));
+    }
+
+    /** Adds an percent modifier stat value. Value is assumed to be in the 0-1 range. */
+    public void addPercentModifier(Stat stat, float value){
+        add(stat, StatValues.percentModifier(value));
     }
 
     /** Adds a single y/n boolean value. */
     public void add(Stat stat, boolean value){
-        add(stat, new BooleanValue(value));
+        add(stat, StatValues.bool(value));
     }
 
     /** Adds an item value. */
     public void add(Stat stat, Item item){
-        add(stat, new ItemListValue(new ItemStack(item, 1)));
+        add(stat, StatValues.items(new ItemStack(item, 1)));
     }
 
     /** Adds an item value. */
     public void add(Stat stat, ItemStack item){
-        add(stat, new ItemListValue(item));
+        add(stat, StatValues.items(item));
     }
 
     /** Adds an item value. */
     public void add(Stat stat, Liquid liquid, float amount, boolean perSecond){
-        add(stat, new LiquidValue(liquid, amount, perSecond));
+        add(stat, StatValues.liquid(liquid, amount, perSecond));
     }
 
     public void add(Stat stat, Attribute attr){
@@ -67,16 +75,18 @@ public class Stats{
     }
 
     public void add(Stat stat, Attribute attr, boolean floating, float scale, boolean startZero){
-        for(var block : Vars.content.blocks()
-            .select(block -> block instanceof Floor f && f.attributes.get(attr) != 0 && !(f.isLiquid && !floating))
-            .<Floor>as().with(s -> s.sort(f -> f.attributes.get(attr)))){
-            add(stat, new FloorEfficiencyValue(block, block.attributes.get(attr) * scale, startZero));
-        }
+        add(stat, StatValues.blocks(attr, floating, scale, startZero));
     }
 
     /** Adds a single string value with this stat. */
     public void add(Stat stat, String format, Object... args){
-        add(stat, new StringValue(format, args));
+        add(stat, StatValues.string(format, args));
+    }
+
+    /** Replaces a stat, removing the old value if it exists. */
+    public void replace(Stat stat, StatValue value){
+        remove(stat);
+        add(stat, value);
     }
 
     /** Adds a stat value. */
@@ -96,8 +106,8 @@ public class Stats{
     public void remove(Stat stat){
         if(map == null) map = new OrderedMap<>();
 
-        if(!map.containsKey(stat.category) || !map.get(stat.category).containsKey(stat)){
-            throw new RuntimeException("No stat entry found: \"" + stat + "\" in block.");
+        if(!map.containsKey(stat.category)){
+            return;
         }
 
         map.get(stat.category).remove(stat);
diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java
deleted file mode 100644
index 16c759f110..0000000000
--- a/core/src/mindustry/world/meta/values/AmmoListValue.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import arc.util.*;
-import mindustry.content.*;
-import mindustry.ctype.*;
-import mindustry.entities.bullet.*;
-import mindustry.gen.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class AmmoListValue<T extends UnlockableContent> implements StatValue{
-    private final ObjectMap<T, BulletType> map;
-
-    public AmmoListValue(ObjectMap<T, BulletType> map){
-        this.map = map;
-    }
-
-    @Override
-    public void display(Table table){
-
-        table.row();
-
-        for(T t : map.keys()){
-            boolean unit = t instanceof UnitType;
-
-            BulletType type = map.get(t);
-
-            //no point in displaying unit icon twice
-            if(!unit){
-                table.image(icon(t)).size(3 * 8).padRight(4).right().top();
-                table.add(t.localizedName).padRight(10).left().top();
-            }
-
-            table.table(bt -> {
-                bt.left().defaults().padRight(3).left();
-
-                if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
-                    bt.add(Core.bundle.format("bullet.damage", type.damage));
-                }
-
-                if(type.buildingDamageMultiplier != 1){
-                    sep(bt, Core.bundle.format("bullet.buildingdamage", (int)(type.buildingDamageMultiplier * 100)));
-                }
-
-                if(type.splashDamage > 0){
-                    sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1)));
-                }
-
-                if(!unit && !Mathf.equal(type.ammoMultiplier, 1f) && !(type instanceof LiquidBulletType)){
-                    sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier));
-                }
-
-                if(!Mathf.equal(type.reloadMultiplier, 1f)){
-                    sep(bt, Core.bundle.format("bullet.reload", Strings.fixed(type.reloadMultiplier, 1)));
-                }
-
-                if(type.knockback > 0){
-                    sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1)));
-                }
-
-                if(type.healPercent > 0f){
-                    sep(bt, Core.bundle.format("bullet.healpercent", (int)type.healPercent));
-                }
-
-                if(type.pierce || type.pierceCap != -1){
-                    sep(bt, type.pierceCap == -1 ? "@bullet.infinitepierce" : Core.bundle.format("bullet.pierce", type.pierceCap));
-                }
-
-                if(type.status == StatusEffects.burning || type.status == StatusEffects.melting || type.incendAmount > 0){
-                    sep(bt, "@bullet.incendiary");
-                }
-
-                if(type.status == StatusEffects.freezing){
-                    sep(bt, "@bullet.freezing");
-                }
-
-                if(type.status == StatusEffects.tarred){
-                    sep(bt, "@bullet.tarred");
-                }
-
-                if(type.status == StatusEffects.sapped){
-                    sep(bt, "@bullet.sapping");
-                }
-
-                if(type.homingPower > 0.01f){
-                    sep(bt, "@bullet.homing");
-                }
-
-                if(type.lightning > 0){
-                    sep(bt, "@bullet.shock");
-                }
-
-                if(type.fragBullet != null){
-                    sep(bt, "@bullet.frag");
-                }
-            }).padTop(unit ? 0 : -9).left().get().background(unit ? null : Tex.underline);
-
-            table.row();
-        }
-    }
-
-    void sep(Table table, String text){
-        table.row();
-        table.add(text);
-    }
-
-    TextureRegion icon(T t){
-        return t.icon(Cicon.medium);
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/BlockFilterValue.java b/core/src/mindustry/world/meta/values/BlockFilterValue.java
deleted file mode 100644
index 3c4d0fe56e..0000000000
--- a/core/src/mindustry/world/meta/values/BlockFilterValue.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.func.*;
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import mindustry.ui.*;
-import mindustry.world.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class BlockFilterValue implements StatValue{
-    public final Boolf<Block> pred;
-
-    public BlockFilterValue(Boolf<Block> pred){
-        this.pred = pred;
-    }
-
-    @Override
-    public void display(Table table){
-        Seq<Block> list = content.blocks().select(pred);
-
-        table.table(l -> {
-            l.left();
-
-            for(int i = 0; i < list.size; i++){
-                Block item = list.get(i);
-
-                l.image(item.icon(Cicon.small)).size(8 * 3).padRight(2).padLeft(2).padTop(3).padBottom(3);
-                l.add(item.localizedName).left().padLeft(1).padRight(4);
-                if(i % 5 == 4){
-                    l.row();
-                }
-            }
-        });
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/BlockListValue.java b/core/src/mindustry/world/meta/values/BlockListValue.java
deleted file mode 100644
index a1cd5adffe..0000000000
--- a/core/src/mindustry/world/meta/values/BlockListValue.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import mindustry.ui.*;
-import mindustry.world.*;
-import mindustry.world.meta.*;
-
-public class BlockListValue implements StatValue{
-    public final Seq<Block> list;
-
-    public BlockListValue(Seq<Block> list){
-        this.list = list;
-    }
-
-    @Override
-    public void display(Table table){
-
-        table.table(l -> {
-            l.left();
-
-            for(int i = 0; i < list.size; i++){
-                Block item = list.get(i);
-
-                l.image(item.icon(Cicon.small)).size(8 * 3).padRight(2).padLeft(2).padTop(3).padBottom(3);
-                l.add(item.localizedName).left().padLeft(1).padRight(4);
-                if(i % 5 == 4){
-                    l.row();
-                }
-            }
-        });
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/BooleanValue.java b/core/src/mindustry/world/meta/values/BooleanValue.java
deleted file mode 100644
index c1da598008..0000000000
--- a/core/src/mindustry/world/meta/values/BooleanValue.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.layout.*;
-import mindustry.world.meta.*;
-
-public class BooleanValue implements StatValue{
-    private final boolean value;
-
-    public BooleanValue(boolean value){
-        this.value = value;
-    }
-
-    @Override
-    public void display(Table table){
-        table.add(!value ? "@no" : "@yes");
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/BoosterListValue.java b/core/src/mindustry/world/meta/values/BoosterListValue.java
deleted file mode 100644
index 8d3315adaa..0000000000
--- a/core/src/mindustry/world/meta/values/BoosterListValue.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.*;
-import arc.func.*;
-import arc.scene.ui.layout.*;
-import arc.util.*;
-import mindustry.gen.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class BoosterListValue implements StatValue{
-    protected float reload, maxUsed, multiplier;
-    protected boolean baseReload;
-    protected Boolf<Liquid> filter;
-
-    public BoosterListValue(float reload, float maxUsed, float multiplier, boolean baseReload, Boolf<Liquid> filter){
-        this.reload = reload;
-        this.maxUsed = maxUsed;
-        this.baseReload = baseReload;
-        this.multiplier = multiplier;
-        this.filter = filter;
-    }
-
-    @Override
-    public void display(Table table){
-
-        table.row();
-        table.table(c -> {
-            for(Liquid liquid : content.liquids()){
-                if(!filter.get(liquid)) continue;
-
-                c.image(liquid.icon(Cicon.medium)).size(3 * 8).padRight(4).right().top();
-                c.add(liquid.localizedName).padRight(10).left().top();
-                c.table(Tex.underline, bt -> {
-                    bt.left().defaults().padRight(3).left();
-
-                    float reloadRate = (baseReload ? 1f : 0f) + maxUsed * multiplier * liquid.heatCapacity;
-                    float standardReload = baseReload ? reload : reload / (maxUsed * multiplier * 0.4f);
-                    float result = standardReload / (reload / reloadRate);
-                    bt.add(Core.bundle.format("bullet.reload", Strings.fixed(result, 1)));
-                }).left().padTop(-9);
-                c.row();
-            }
-        }).colspan(table.getColumns());
-        table.row();
-
-    }
-
-    void sep(Table table, String text){
-        table.row();
-        table.add(text);
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/FloorEfficiencyValue.java b/core/src/mindustry/world/meta/values/FloorEfficiencyValue.java
deleted file mode 100644
index ad32ecf453..0000000000
--- a/core/src/mindustry/world/meta/values/FloorEfficiencyValue.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.*;
-import arc.scene.ui.layout.*;
-import arc.util.*;
-import mindustry.ui.*;
-import mindustry.world.blocks.environment.*;
-import mindustry.world.meta.*;
-
-public class FloorEfficiencyValue implements StatValue{
-    private final Floor floor;
-    private final float multiplier;
-    private final boolean startZero;
-
-    public FloorEfficiencyValue(Floor floor, float multiplier, boolean startZero){
-        this.floor = floor;
-        this.multiplier = multiplier;
-        this.startZero = startZero;
-    }
-
-    @Override
-    public void display(Table table){
-        table.stack(new Image(floor.icon(Cicon.medium)).setScaling(Scaling.fit), new Table(t -> {
-            t.top().right().add((multiplier < 0 ? "[scarlet]" : startZero ? "[accent]" : "[accent]+") + (int)((multiplier) * 100) + "%").style(Styles.outlineLabel);
-        }));
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/FloorValue.java b/core/src/mindustry/world/meta/values/FloorValue.java
deleted file mode 100644
index 45ff92bc7d..0000000000
--- a/core/src/mindustry/world/meta/values/FloorValue.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.*;
-import arc.scene.ui.layout.*;
-import mindustry.ui.*;
-import mindustry.world.blocks.environment.*;
-import mindustry.world.meta.*;
-
-public class FloorValue implements StatValue{
-    private final Floor floor;
-
-    public FloorValue(Floor floor){
-        this.floor = floor;
-    }
-
-    @Override
-    public void display(Table table){
-        table.add(new Image(floor.icon(Cicon.small))).padRight(3);
-        table.add(floor.localizedName).padRight(3);
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/ItemFilterValue.java b/core/src/mindustry/world/meta/values/ItemFilterValue.java
deleted file mode 100644
index 78db854658..0000000000
--- a/core/src/mindustry/world/meta/values/ItemFilterValue.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.func.*;
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class ItemFilterValue implements StatValue{
-    private final Boolf<Item> filter;
-
-    public ItemFilterValue(Boolf<Item> filter){
-        this.filter = filter;
-    }
-
-    @Override
-    public void display(Table table){
-        Seq<Item> list = content.items().select(filter);
-
-        for(int i = 0; i < list.size; i++){
-            Item item = list.get(i);
-
-            table.add(new ItemDisplay(item)).padRight(5);
-
-            if(i != list.size - 1){
-                table.add("/");
-            }
-        }
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/ItemListValue.java b/core/src/mindustry/world/meta/values/ItemListValue.java
deleted file mode 100644
index 164b6a2a3c..0000000000
--- a/core/src/mindustry/world/meta/values/ItemListValue.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.layout.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-public class ItemListValue implements StatValue{
-    private final ItemStack[] stacks;
-    private final boolean displayName;
-
-    public ItemListValue(ItemStack... stacks){
-        this(true, stacks);
-    }
-
-    public ItemListValue(boolean displayName, ItemStack... stacks){
-        this.stacks = stacks;
-        this.displayName = displayName;
-    }
-
-    @Override
-    public void display(Table table){
-        for(ItemStack stack : stacks){
-            table.add(new ItemDisplay(stack.item, stack.amount, displayName)).padRight(5);
-        }
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/mindustry/world/meta/values/LiquidFilterValue.java
deleted file mode 100644
index d5aef23376..0000000000
--- a/core/src/mindustry/world/meta/values/LiquidFilterValue.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.func.*;
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-public class LiquidFilterValue implements StatValue{
-    private final Boolf<Liquid> filter;
-    private final float amount;
-    private final boolean perSecond;
-
-    public LiquidFilterValue(Boolf<Liquid> filter, float amount, boolean perSecond){
-        this.filter = filter;
-        this.amount = amount;
-        this.perSecond = perSecond;
-    }
-
-    @Override
-    public void display(Table table){
-        Seq<Liquid> list = new Seq<>();
-
-        for(Liquid item : content.liquids()){
-            if(!item.isHidden() && filter.get(item)) list.add(item);
-        }
-
-        for(int i = 0; i < list.size; i++){
-            table.add(new LiquidDisplay(list.get(i), amount, perSecond)).padRight(5);
-
-            if(i != list.size - 1){
-                table.add("/");
-            }
-        }
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/LiquidValue.java b/core/src/mindustry/world/meta/values/LiquidValue.java
deleted file mode 100644
index 6139aed5ce..0000000000
--- a/core/src/mindustry/world/meta/values/LiquidValue.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.layout.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-public class LiquidValue implements StatValue{
-    private final Liquid liquid;
-    private final float amount;
-    private final boolean perSecond;
-
-    public LiquidValue(Liquid liquid, float amount, boolean perSecond){
-        this.liquid = liquid;
-        this.amount = amount;
-        this.perSecond = perSecond;
-    }
-
-    @Override
-    public void display(Table table){
-        table.add(new LiquidDisplay(liquid, amount, perSecond));
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/NumberValue.java b/core/src/mindustry/world/meta/values/NumberValue.java
deleted file mode 100644
index fa815f4d49..0000000000
--- a/core/src/mindustry/world/meta/values/NumberValue.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.layout.*;
-import arc.util.*;
-import mindustry.world.meta.*;
-
-/**
- * A stat that is a number with a unit attacked.
- * The number is rounded to 2 decimal places by default.
- */
-public class NumberValue implements StatValue{
-    private final StatUnit unit;
-    private final float value;
-
-    public NumberValue(float value, StatUnit unit){
-        this.unit = unit;
-        this.value = value;
-    }
-
-    @Override
-    public void display(Table table){
-        int precision = Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2;
-
-        table.add(Strings.fixed(value, precision));
-        table.add((unit.space ? " " : "") + unit.localized());
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/StringValue.java b/core/src/mindustry/world/meta/values/StringValue.java
deleted file mode 100644
index b36a9d47e4..0000000000
--- a/core/src/mindustry/world/meta/values/StringValue.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.scene.ui.layout.*;
-import arc.util.*;
-import mindustry.world.meta.*;
-
-public class StringValue implements StatValue{
-    private final String value;
-
-    public StringValue(String value, Object... args){
-        this.value = Strings.format(value, args);
-    }
-
-    @Override
-    public void display(Table table){
-        table.add(value);
-    }
-}
diff --git a/core/src/mindustry/world/meta/values/WeaponListValue.java b/core/src/mindustry/world/meta/values/WeaponListValue.java
deleted file mode 100644
index 706077b967..0000000000
--- a/core/src/mindustry/world/meta/values/WeaponListValue.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package mindustry.world.meta.values;
-
-import arc.graphics.g2d.*;
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import arc.util.*;
-import mindustry.gen.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.meta.*;
-
-public class WeaponListValue implements StatValue{
-    private final Seq<Weapon> weapons;
-    private final UnitType unit;
-
-    public WeaponListValue(UnitType unit, Seq<Weapon> weapons){
-        this.weapons = weapons;
-        this.unit = unit;
-    }
-
-    @Override
-    public void display(Table table){
-        table.row();
-        for(int i = 0; i < weapons.size;i ++){
-            Weapon weapon = weapons.get(i);
-
-            if(weapon.flipSprite){
-                //flipped weapons are not given stats
-                continue;
-            }
-
-            TextureRegion region = !weapon.name.equals("") && weapon.outlineRegion.found() ? weapon.outlineRegion : unit.icon(Cicon.full);
-
-            table.image(region).size(60).scaling(Scaling.bounded).right().top();
-
-            table.table(Tex.underline,  w -> {
-                w.left().defaults().padRight(3).left();
-
-                if(weapon.inaccuracy > 0){
-                    sep(w, "[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)weapon.inaccuracy + " " + StatUnit.degrees.localized());
-                }
-                sep(w, "[lightgray]" + Stat.reload.localized() + ": " + (weapon.mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / weapon.reload * weapon.shots, 1));
-
-                var bullet = new AmmoListValue<UnitType>(OrderedMap.of(unit, weapon.bullet));
-                bullet.display(w);
-            }).padTop(-9).left();
-            table.row();
-        }
-    }
-
-    void sep(Table table, String text){
-        table.row();
-        table.add(text);
-    }
-}
diff --git a/core/src/mindustry/world/modules/ConsumeModule.java b/core/src/mindustry/world/modules/ConsumeModule.java
deleted file mode 100644
index 431fa3fd1f..0000000000
--- a/core/src/mindustry/world/modules/ConsumeModule.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package mindustry.world.modules;
-
-import arc.util.io.*;
-import mindustry.gen.*;
-import mindustry.world.consumers.*;
-import mindustry.world.meta.*;
-
-public class ConsumeModule extends BlockModule{
-    private boolean valid, optionalValid;
-    private final Building entity;
-
-    public ConsumeModule(Building entity){
-        this.entity = entity;
-    }
-
-    public BlockStatus status(){
-        if(!entity.shouldConsume()){
-            return BlockStatus.noOutput;
-        }
-
-        if(!valid || !entity.productionValid()){
-            return BlockStatus.noInput;
-        }
-
-        return BlockStatus.active;
-    }
-
-    public void update(){
-        //everything is valid when cheating
-        if(entity.cheating()){
-            valid = optionalValid = true;
-            return;
-        }
-
-        boolean prevValid = valid();
-        valid = true;
-        optionalValid = true;
-        boolean docons = entity.shouldConsume() && entity.productionValid();
-
-        for(Consume cons : entity.block.consumes.all()){
-            if(cons.isOptional()) continue;
-
-            if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
-                cons.update(entity);
-            }
-
-            valid &= cons.valid(entity);
-        }
-
-        for(Consume cons : entity.block.consumes.optionals()){
-            if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
-                cons.update(entity);
-            }
-
-            optionalValid &= cons.valid(entity);
-        }
-    }
-
-    public void trigger(){
-        for(Consume cons : entity.block.consumes.all()){
-            cons.trigger(entity);
-        }
-    }
-
-    public boolean valid(){
-        return valid && entity.shouldConsume() && entity.enabled;
-    }
-
-    public boolean optionalValid(){
-        return valid() && optionalValid && entity.enabled;
-    }
-
-    @Override
-    public void write(Writes write){
-        write.bool(valid);
-    }
-
-    @Override
-    public void read(Reads read){
-        valid = read.bool();
-    }
-}
diff --git a/core/src/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java
index 835ae45fb4..5f01d335e3 100644
--- a/core/src/mindustry/world/modules/ItemModule.java
+++ b/core/src/mindustry/world/modules/ItemModule.java
@@ -39,66 +39,62 @@ public class ItemModule extends BlockModule{
         System.arraycopy(other.items, 0, items, 0, items.length);
     }
 
-    public void update(boolean showFlow){
-        if(showFlow){
-            //update the flow at 30fps at most
-            if(flowTimer.get(1, pollScl)){
+    public void updateFlow(){
+        //update the flow at N fps 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();
+            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);
                     }
-
-                    Arrays.fill(displayFlow, -1);
-
-                    flow = cacheFlow;
+                    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();
                 }
 
-                boolean updateFlow = flowTimer.get(30);
+                Arrays.fill(displayFlow, -1);
 
-                for(int i = 0; i < items.length; i++){
-                    flow[i].add(cacheSums[i]);
-                    if(cacheSums[i] > 0){
-                        cacheBits.set(i);
-                    }
-                    cacheSums[i] = 0;
+                flow = cacheFlow;
+            }
 
-                    if(updateFlow){
-                        displayFlow[i] = flow[i].hasEnoughData() ? flow[i].mean() / pollScl : -1;
-                    }
+            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() / pollScl : -1;
                 }
             }
-        }else{
-            flow = null;
         }
     }
 
+    public void stopFlow(){
+        flow = null;
+    }
+
     public int length(){
         return items.length;
     }
 
     /** @return a specific item's flow rate in items/s; any value < 0 means not ready.*/
     public float getFlowRate(Item item){
-        if(flow == null) return -1f;
-
-        return displayFlow[item.id] * 60;
+        return flow == null ? -1f : displayFlow[item.id] * 60;
     }
 
     public boolean hasFlowItem(Item item){
-        if(flow == null) return false;
-
-        return cacheBits.get(item.id);
+        return flow != null && cacheBits.get(item.id);
     }
 
     public void each(ItemConsumer cons){
@@ -119,6 +115,10 @@ public class ItemModule extends BlockModule{
         return sum;
     }
 
+    public boolean has(int id){
+        return items[id] > 0;
+    }
+
     public boolean has(Item item){
         return get(item) > 0;
     }
@@ -179,8 +179,7 @@ public class ItemModule extends BlockModule{
         return total > 0;
     }
 
-    @Nullable
-    public Item first(){
+    public @Nullable Item first(){
         for(int i = 0; i < items.length; i++){
             if(items[i] > 0){
                 return content.item(i);
@@ -189,8 +188,7 @@ public class ItemModule extends BlockModule{
         return null;
     }
 
-    @Nullable
-    public Item take(){
+    public @Nullable Item take(){
         for(int i = 0; i < items.length; i++){
             int index = (i + takeRotation);
             if(index >= items.length) index -= items.length;
@@ -204,30 +202,6 @@ public class ItemModule extends BlockModule{
         return null;
     }
 
-    /** Begins a speculative take operation. This returns the item that would be returned by #take(), but does not change state. */
-    @Nullable
-    public Item takeIndex(int takeRotation){
-        for(int i = 0; i < items.length; i++){
-            int index = (i + takeRotation);
-            if(index >= items.length) index -= items.length;
-            if(items[index] > 0){
-                return content.item(index);
-            }
-        }
-        return null;
-    }
-
-    public int nextIndex(int takeRotation){
-        for(int i = 1; i < items.length; i++){
-            int index = (i + takeRotation);
-            if(index >= items.length) index -= items.length;
-            if(items[index] > 0){
-                return (takeRotation + i) % items.length;
-            }
-        }
-        return takeRotation;
-    }
-
     public int get(int id){
         return items[id];
     }
@@ -269,6 +243,12 @@ public class ItemModule extends BlockModule{
         }
     }
 
+    public void handleFlow(Item item, int amount){
+        if(flow != null){
+            cacheSums[item.id] += amount;
+        }
+    }
+
     public void undoFlow(Item item){
         if(flow != null){
             cacheSums[item.id] -= 1;
@@ -310,7 +290,7 @@ public class ItemModule extends BlockModule{
             if(item > 0) amount++;
         }
 
-        write.s(amount); //amount of items
+        write.s(amount);
 
         for(int i = 0; i < items.length; i++){
             if(items[i] > 0){
@@ -330,8 +310,11 @@ public class ItemModule extends BlockModule{
         for(int j = 0; j < count; j++){
             int itemid = legacy ? read.ub() : read.s();
             int itemamount = read.i();
-            items[content.item(itemid).id] = itemamount;
-            total += itemamount;
+            Item item = content.item(itemid);
+            if(item != null){
+                items[item.id] = itemamount;
+                total += itemamount;
+            }
         }
     }
 
@@ -342,4 +325,22 @@ public class ItemModule extends BlockModule{
     public interface ItemCalculator{
         float get(Item item, int amount);
     }
+
+    @Override
+    public String toString(){
+        var res = new StringBuilder();
+        res.append("ItemModule{");
+        boolean any = false;
+        for(int i = 0; i < items.length; i++){
+            if(items[i] != 0){
+                res.append(content.items().get(i).name).append(":").append(items[i]).append(",");
+                any = true;
+            }
+        }
+        if(any){
+            res.setLength(res.length() - 1);
+        }
+        res.append("}");
+        return res.toString();
+    }
 }
diff --git a/core/src/mindustry/world/modules/LiquidModule.java b/core/src/mindustry/world/modules/LiquidModule.java
index 5713129506..589c712840 100644
--- a/core/src/mindustry/world/modules/LiquidModule.java
+++ b/core/src/mindustry/world/modules/LiquidModule.java
@@ -1,6 +1,7 @@
 package mindustry.world.modules;
 
 import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.type.*;
@@ -10,56 +11,70 @@ import java.util.*;
 import static mindustry.Vars.*;
 
 public class LiquidModule extends BlockModule{
-    private static final int windowSize = 3, updateInterval = 60;
+    private static final int windowSize = 3;
     private static final Interval flowTimer = new Interval(2);
     private static final float pollScl = 20f;
 
+    private static WindowedMean[] cacheFlow;
+    private static float[] cacheSums;
+    private static float[] displayFlow;
+    private static final Bits cacheBits = new Bits();
+
     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;
+    private @Nullable WindowedMean[] flow;
 
-    public void update(boolean showFlow){
-        smoothLiquid = Mathf.lerpDelta(smoothLiquid, currentAmount(), 0.1f);
-        if(showFlow){
-            if(flowTimer.get(1, pollScl)){
+    public void updateFlow(){
+        if(flowTimer.get(1, pollScl)){
+            if(flow == null){
+                if(cacheFlow == null || cacheFlow.length != liquids.length){
+                    cacheFlow = new WindowedMean[liquids.length];
+                    for(int i = 0; i < liquids.length; i++){
+                        cacheFlow[i] = new WindowedMean(windowSize);
+                    }
+                    cacheSums = new float[liquids.length];
+                    displayFlow = new float[liquids.length];
+                }else{
+                    for(int i = 0; i < liquids.length; i++){
+                        cacheFlow[i].reset();
+                    }
+                    Arrays.fill(cacheSums, 0);
+                    cacheBits.clear();
+                }
 
-                if(flow == null) flow = new WindowedMean(windowSize);
-                if(lastAdded > 0.0001f) hadFlow = true;
+                Arrays.fill(displayFlow, -1);
 
-                flow.add(lastAdded);
-                lastAdded = 0;
-                if(currentFlowRate < 0 || flowTimer.get(updateInterval)){
-                    currentFlowRate = flow.hasEnoughData() ? flow.mean() / pollScl : -1f;
+                flow = cacheFlow;
+            }
+
+            boolean updateFlow = flowTimer.get(30);
+
+            for(int i = 0; i < liquids.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() / pollScl : -1;
                 }
             }
-        }else{
-            currentFlowRate = -1f;
-            flow = null;
-            hadFlow = false;
         }
     }
 
+    public void stopFlow(){
+        flow = null;
+    }
+
     /** @return current liquid's flow rate in u/s; any value < 0 means 'not ready'. */
-    public float getFlowRate(){
-        return currentFlowRate * 60;
+    public float getFlowRate(Liquid liquid){
+        return flow == null ? -1f : displayFlow[liquid.id] * 60;
     }
 
-    public boolean hadFlow(){
-        return hadFlow;
-    }
-
-    public float smoothAmount(){
-        return smoothLiquid;
-    }
-
-    /** @return total amount of liquids. */
-    public float total(){
-        return total;
+    public boolean hasFlowLiquid(Liquid liquid){
+        return flow != null && cacheBits.get(liquid.id);
     }
 
     /** Last received or loaded liquid. Only valid for liquid modules with 1 type of liquid. */
@@ -70,10 +85,16 @@ public class LiquidModule extends BlockModule{
     public void reset(Liquid liquid, float amount){
         Arrays.fill(liquids, 0f);
         liquids[liquid.id] = amount;
-        total = amount;
         current = liquid;
     }
 
+    public void set(Liquid liquid, float amount){
+        if(amount >= liquids[current.id]){
+            current = liquid;
+        }
+        liquids[liquid.id] = amount;
+    }
+
     public float currentAmount(){
         return liquids[current.id];
     }
@@ -83,22 +104,27 @@ public class LiquidModule extends BlockModule{
     }
 
     public void clear(){
-        total = 0;
         Arrays.fill(liquids, 0);
     }
 
     public void add(Liquid liquid, float amount){
         liquids[liquid.id] += amount;
-        total += amount;
         current = liquid;
 
         if(flow != null){
-            lastAdded += Math.max(amount, 0);
+            cacheSums[liquid.id] += Math.max(amount, 0);
+        }
+    }
+
+    public void handleFlow(Liquid liquid, float amount){
+        if(flow != null){
+            cacheSums[liquid.id] += Math.max(amount, 0);
         }
     }
 
     public void remove(Liquid liquid, float amount){
-        add(liquid, -amount);
+        //cap to prevent negative removal
+        add(liquid, Math.max(-amount, -liquids[liquid.id]));
     }
 
     public void each(LiquidConsumer cons){
@@ -139,17 +165,18 @@ public class LiquidModule extends BlockModule{
     @Override
     public void read(Reads read, boolean legacy){
         Arrays.fill(liquids, 0);
-        total = 0f;
         int count = legacy ? read.ub() : read.s();
 
         for(int j = 0; j < count; j++){
-            int liquidid = legacy ? read.ub() : read.s();
+            Liquid liq = content.liquid(legacy ? read.ub() : read.s());
             float amount = read.f();
-            liquids[liquidid] = amount;
-            if(amount > 0){
-                current = content.liquid(liquidid);
+            if(liq != null){
+                int liquidid = liq.id;
+                liquids[liquidid] = amount;
+                if(amount > liquids[current.id]){
+                    current = liq;
+                }
             }
-            this.total += amount;
         }
     }
 
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 81459ed156..b4d9955e70 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -1,7 +1,4 @@
-import com.badlogicgames.packr.Packr
-import com.badlogicgames.packr.PackrConfig
-
-sourceSets.main.java.srcDirs = [ "src/" ]
+sourceSets.main.java.srcDirs = ["src/"]
 
 project.ext.mainClassName = "mindustry.desktop.DesktopLauncher"
 project.ext.assetsDir = new File("../core/assets")
@@ -9,16 +6,17 @@ project.ext.assetsDir = new File("../core/assets")
 def enableTemplates = true
 def JDK_DIR = "$System.env.JDK_DIR"
 def ICON_DIR = new File("$rootDir/core/assets/icons/icon.icns")
+def platforms = ["Linux64", "Windows64", "Windows32", "MacOS"]
 
 task run(dependsOn: classes, type: JavaExec){
-    main = project.mainClassName
+    mainClass = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = project.assetsDir
     ignoreExitValue = true
 
     if(System.getProperty("os.name").toLowerCase().contains("mac")){
-        jvmArgs("-XstartOnFirstThread", "-Djava.awt.headless=true")
+        jvmArgs("-XstartOnFirstThread")
     }
 
     jvmArgs += "-XX:+ShowCodeDetailsInExceptionMessages"
@@ -31,17 +29,28 @@ task run(dependsOn: classes, type: JavaExec){
         jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
     }
 
+    if(project.hasProperty("dataDir")){
+        environment("MINDUSTRY_DATA_DIR", project.getProperties()["dataDir"])
+    }
+
     if(args.contains("debug")){
-        main = "mindustry.debug.DebugLauncher"
+        mainClass = "mindustry.debug.DebugLauncher"
     }
 }
 
-
 task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
+    dependsOn ":desktop:processResources"
+
     from files(sourceSets.main.output.classesDirs)
     from files(sourceSets.main.output.resourcesDir)
     from {configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }}
     from files(project.assetsDir)
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+    //don't include steam shared libraries unless necessary
+    if(!versionModifier.contains("steam")){
+        exclude("**steam**.so", "**steam**.dll", "**steam**.dylib")
+    }
 
     archiveFileName = "${appName}.jar"
 
@@ -50,17 +59,21 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
     }
 }
 
-if(!project.ext.hasSprites()){
+if(!project.ext.hasSprites() && System.getenv("JITPACK") != "true"){
     println "Scheduling sprite packing."
     run.dependsOn ":tools:pack"
     dist.dependsOn ":tools:pack"
 }
 
+//this is only for local testing
+//add -Prelease -PversionModifier=steam as build properties
 task steamtest(dependsOn: dist){
     doLast{
         copy{
             from "build/libs/Mindustry.jar"
-            if(System.properties["os.name"].contains("Mac")){
+            if(project.hasProperty("destination")){
+                into project.property("destination")
+            }else if(System.properties["os.name"].contains("Mac")){
                 into "/Users/anuke/Library/Application Support/Steam/steamapps/common/Mindustry/Mindustry.app/Contents/Resources"
             }else{
                 into "/home/anuke/.steam/steam/steamapps/common/Mindustry/jre"
@@ -70,7 +83,13 @@ task steamtest(dependsOn: dist){
     }
 }
 
-PackrConfig.Platform.values().each{ platform ->
+//required templates:
+//- Windows32: Not provided by Packr! This uses Java 8
+//required JDKs:
+//- Windows64
+//- Linux64
+//- Mac
+platforms.each{ platform ->
     task "packr${platform.toString()}"{
         dependsOn dist
 
@@ -85,7 +104,8 @@ PackrConfig.Platform.values().each{ platform ->
                 delete "build/packr/output/"
             }
 
-            if(enableTemplates && (platform == PackrConfig.Platform.Windows64)){
+            //the Windows32 version uses an old java-8 based template, because packr and jpackage don't support win32
+            if(enableTemplates && (platform == "Windows32")){
                 copy{
                     into "build/packr/output"
                     from "${JDK_DIR}/templates/${platform.toString().toLowerCase()}"
@@ -97,30 +117,37 @@ PackrConfig.Platform.values().each{ platform ->
                     from "build/libs/${appName}.jar"
                 }
             }else{
-                def config = new PackrConfig()
-                config.with{
-                    config.executable = appName
-                    config.platform = platform
-                    verbose = true
-                    bundleIdentifier = getPackage() + ".mac"
-                    iconResource = ICON_DIR
-                    outDir = file("$rootDir/desktop/build/packr/output")
-                    mainClass = project.ext.mainClassName
-                    classpath = ["$rootDir/desktop/build/packr/desktop.jar".toString()]
-                    removePlatformLibs = ["$rootDir/desktop/build/packr/desktop.jar".toString()]
+                def jarPath = JDK_DIR + "packr.jar"
+                def args = new String[]{"java", "-jar", jarPath}
 
-                    vmArgs = []
-                    minimizeJre = "$rootDir/desktop/packr_minimize.json".toString()
-                    jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip"
-
-                    if(platform == PackrConfig.Platform.MacOS){
-                        vmArgs += "XstartOnFirstThread"
-                    }
+                args += new String[]{
+                        "--platform", platform == "MacOS" ? "Mac" : platform.toString(),
+                        "--jdk", JDK_DIR + "jre-${platform.toString().toLowerCase()}",
+                        "--executable", appName,
+                        "--classpath", "$rootDir/desktop/build/packr/desktop.jar".toString(),
+                        "--mainclass", project.ext.mainClassName,
+                        "--verbose",
+                        "--bundle", getPackage() + ".mac",
+                        "--icon", ICON_DIR,
+                        "--output", "$rootDir/desktop/build/packr/output".toString(),
+                        "--removelibs", "$rootDir/desktop/build/packr/desktop.jar".toString()
                 }
 
-                new Packr().pack(config)
+                args += "--vmargs"
 
-                if(platform != PackrConfig.Platform.MacOS){
+                if(platform == "MacOS"){
+                    args += "XstartOnFirstThread"
+                }
+
+                args += "Dhttps.protocols=TLSv1.2,TLSv1.1,TLSv1"
+                args += "XX:+ShowCodeDetailsInExceptionMessages"
+
+                exec{
+                    commandLine args.toList()
+                    standardOutput = System.out
+                }
+
+                if(platform != "MacOS"){
                     copy{
                         into "build/packr/output/jre/"
                         from "build/packr/output/desktop.jar"
@@ -130,10 +157,8 @@ PackrConfig.Platform.values().each{ platform ->
                         delete "build/packr/output/desktop.jar"
                     }
 
-                    file("build/packr/output/config.json").text = file("build/packr/output/config.json").text.replace("desktop.jar", "jre/desktop.jar")
-                }
-
-                if(platform == PackrConfig.Platform.MacOS){
+                    file("build/packr/output/Mindustry.json").text = file("build/packr/output/Mindustry.json").text.replace("desktop.jar", "jre/desktop.jar")
+                }else{
                     copy{
                         into "build/packr/output/${appName}.app/Contents/"
                         from "build/packr/output/Contents/"
@@ -145,7 +170,7 @@ PackrConfig.Platform.values().each{ platform ->
                 }
             }
 
-            if((platform == PackrConfig.Platform.Windows64 || platform == PackrConfig.Platform.Windows32)){
+            if((platform == "Windows64" || platform == "Windows32")){
                 copy{
                     from "build/packr/output/jre/bin/msvcr100.dll"
                     into "build/packr/output/"
@@ -155,12 +180,12 @@ PackrConfig.Platform.values().each{ platform ->
 
             if(versionModifier.contains("steam")){
                 copy{
-                    def lib = platform == PackrConfig.Platform.MacOS || platform == PackrConfig.Platform.Linux64 ? "lib" : ""
-                    from zipTree(platform == PackrConfig.Platform.MacOS ? "build/packr/output/${appName}.app/Contents/Resources/desktop.jar" : "build/packr/output/jre/desktop.jar").matching{
-                        include "${lib}steamworks4j${platform == PackrConfig.Platform.Windows64 ? '64.dll' : platform == PackrConfig.Platform.Windows32 ? '.dll' : platform == PackrConfig.Platform.Linux64 ? '.so' : '.dylib'}"
-                        include "${lib}steam_api${platform == PackrConfig.Platform.Windows64 ? '64.dll' : platform == PackrConfig.Platform.Windows32 ? '.dll' : platform == PackrConfig.Platform.Linux64 ? '.so' : '.dylib'}"
+                    def lib = platform == "MacOS" || platform == "Linux64" ? "lib" : ""
+                    from zipTree(platform == "MacOS" ? "build/packr/output/${appName}.app/Contents/Resources/desktop.jar" : "build/packr/output/jre/desktop.jar").matching{
+                        include "${lib}steamworks4j${platform == "Windows64" ? '64.dll' : platform == "Windows32" ? '.dll' : platform == "Linux64" ? '.so' : '.dylib'}"
+                        include "${lib}steam_api${platform == "Windows64" ? '64.dll' : platform == "Windows32" ? '.dll' : platform == "Linux64" ? '.so' : '.dylib'}"
                     }
-                    into platform != PackrConfig.Platform.MacOS ? "build/packr/output/" : "build/packr/output/${appName}.app/Contents/Resources"
+                    into platform != "MacOS" ? "build/packr/output/" : "build/packr/output/${appName}.app/Contents/Resources"
                 }
             }
 
diff --git a/desktop/packr_minimize.json b/desktop/packr_minimize.json
deleted file mode 100644
index d18eb478a8..0000000000
--- a/desktop/packr_minimize.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "reduce": [
-    {
-      "archive": "jre/lib/rt.jar",
-      "paths": [
-        "javax/transaction",
-        "javax/tools",
-        "javax/swing",
-        "javax/sql",
-        "javax/smartcardio",
-        "javax/rmi",
-        "javax/print",
-        "javax/naming",
-        "javax/management",
-        "javax/lang",
-        "javax/jws",
-        "javax/swing",
-        "javax/imageio",
-        "javax/annotation",
-        "javax/activity",
-        "javax/activation",
-        "javax/accessibility",
-        "com/sun/corba",
-        "com/sun/jmx",
-        "com/sun/org",
-        "com/sun/imageio",
-        "com/sun/jndi",
-        "com/sun/xml",
-        "com/sun/script",
-        "sun/awt",
-        "sun/java2d",
-        "sun/font",
-        "sun/rmi",
-        "sun/swing",
-        "com/sun/media",
-        "sun/print",
-        "sun/awt",
-        "sun/instrument",
-        "sun/security/tools",
-        "sun/security/smartcardio",
-        "sun/audio",
-        "javax/xml",
-        "javax/sound",
-        "javax/script",
-        "java/beans",
-        "java/applet",
-        "java/rmi",
-        "com/sun/naming",
-        "java/awt",
-        "com/sun/org/apache/xpath",
-        "com/sun/rowset",
-        "com/sun/script",
-        "sun/applet",
-        "sun/corba",
-        "sun/management"
-      ]
-    },
-    {
-      "archive": "jre/lib/charsets.jar",
-      "paths": [
-      ]
-    },
-    {
-      "archive": "jre/lib/jsse.jar",
-      "paths": [
-      ]
-    },
-    {
-      "archive": "jre/lib/resources.jar",
-      "paths": [
-      ]
-    }
-  ],
-  "remove": [
-    {
-      "platform": "*",
-      "paths": [
-        "jre/lib/rhino.jar"
-      ]
-    },
-    {
-      "platform": "linux",
-      "paths": [
-        "jre/lib/amd64/libawt.so",
-        "jre/lib/amd64/libawt_xawt.so",
-        "jre/lib/amd64/libjawt.so",
-        "jre/lib/amd64/libhprof.so",
-        "jre/lib/amd64/libdt_socket.so",
-        "jre/lib/amd64/libsplashscreen.so",
-        "jre/lib/amd64/libunpack.so",
-        "jre/lib/amd64/libnpt.so",
-        "jre/lib/amd64/libmlib_image.so",
-        "jre/lib/amd64/libinstrument.so",
-        "jre/lib/amd64/libjava_crw_demo.so",
-        "jre/lib/amd64/libfreetype.so",
-        "jre/lib/amd64/libmanagement.so",
-        "jre/lib/amd64/libsctp.so",
-        "jre/lib/amd64/libjpeg.so",
-        "jre/lib/amd64/libfreetype.so.6",
-        "jre/lib/amd64/libjsoundalsa.so",
-        "jre/lib/amd64/libjsound.so",
-        "jre/lib/amd64/libattach.so",
-        "jre/lib/amd64/libawt_headless.so",
-        "jre/lib/amd64/libfontmanager.so"
-      ]
-    },
-    {
-      "platform": "windows",
-      "paths": [
-        "jre/bin/*.exe",
-        "jre/bin/client",
-        "jre/bin/awt.dll"
-      ]
-    }
-  ]
-}
diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java
index 99120a74df..2500d18e59 100644
--- a/desktop/src/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/mindustry/desktop/DesktopLauncher.java
@@ -4,21 +4,24 @@ import arc.*;
 import arc.Files.*;
 import arc.backend.sdl.*;
 import arc.backend.sdl.jni.*;
+import arc.discord.*;
+import arc.discord.DiscordRPC.*;
 import arc.files.*;
-import arc.func.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
+import arc.util.Log.*;
 import arc.util.serialization.*;
-import club.minnced.discord.rpc.*;
 import com.codedisaster.steamworks.*;
 import mindustry.*;
 import mindustry.core.*;
 import mindustry.desktop.steam.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
+import mindustry.mod.Mods.*;
 import mindustry.net.*;
 import mindustry.net.Net.*;
+import mindustry.service.*;
 import mindustry.type.*;
 
 import java.io.*;
@@ -26,8 +29,8 @@ import java.io.*;
 import static mindustry.Vars.*;
 
 public class DesktopLauncher extends ClientLauncher{
-    public final static String discordID = "610508934456934412";
-    boolean useDiscord = OS.is64Bit && !OS.isARM && !OS.hasProp("nodiscord"), loadError = false;
+    public final static long discordID = 610508934456934412L;
+    boolean useDiscord = !OS.hasProp("nodiscord"), loadError = false;
     Throwable steamError;
 
     public static void main(String[] arg){
@@ -36,9 +39,29 @@ public class DesktopLauncher extends ClientLauncher{
             new SdlApplication(new DesktopLauncher(arg), new SdlConfig(){{
                 title = "Mindustry";
                 maximized = true;
-                stencil = 1;
                 width = 900;
                 height = 700;
+                //request 3.1, which has instancing
+                gl30Minor = 1;
+                gl30 = true;
+                for(int i = 0; i < arg.length; i++){
+                    if(arg[i].charAt(0) == '-'){
+                        String name = arg[i].substring(1);
+                        try{
+                            switch(name){
+                                case "width": width = Integer.parseInt(arg[i + 1]); break;
+                                case "height": height = Integer.parseInt(arg[i + 1]); break;
+                                case "gl3": gl30 = true; break;
+                                case "gl2": gl30 = false; break;
+                                case "antialias": samples = 16; break;
+                                case "debug": Log.level = LogLevel.debug; break;
+                                case "maximized": maximized = Boolean.parseBoolean(arg[i + 1]); break;
+                            }
+                        }catch(NumberFormatException number){
+                            Log.warn("Invalid parameter number value.");
+                        }
+                    }
+                }
                 setWindowIcon(FileType.internal, "icons/icon_64.png");
             }});
         }catch(Throwable e){
@@ -53,24 +76,19 @@ public class DesktopLauncher extends ClientLauncher{
 
         if(useDiscord){
             try{
-                DiscordRPC.INSTANCE.Discord_Initialize(discordID, null, true, "1127400");
+                DiscordRPC.connect(discordID);
                 Log.info("Initialized Discord rich presence.");
-                Runtime.getRuntime().addShutdownHook(new Thread(DiscordRPC.INSTANCE::Discord_Shutdown));
+                Runtime.getRuntime().addShutdownHook(new Thread(DiscordRPC::close));
+            }catch(NoDiscordClientException none){
+                //don't log if no client is found
+                useDiscord = false;
             }catch(Throwable t){
                 useDiscord = false;
-                Log.err("Failed to initialize discord. Enable debug logging for details.");
-                Log.debug("Discord init error: \n@\n", Strings.getStackTrace(t));
+                Log.warn("Failed to initialize Discord RPC - you are likely using a JVM <16.");
             }
         }
 
         if(useSteam){
-            //delete leftover dlls
-            Fi file = new Fi(".");
-            for(Fi other : file.parent().list()){
-                if(other.name().contains("steam") && (other.extension().equals("dll") || other.extension().equals("so") || other.extension().equals("dylib"))){
-                    other.delete();
-                }
-            }
 
             Events.on(ClientLoadEvent.class, event -> {
                 if(steamError != null){
@@ -94,9 +112,6 @@ public class DesktopLauncher extends ClientLauncher{
                 if(SteamAPI.restartAppIfNecessary(SVars.steamID)){
                     System.exit(0);
                 }
-            }catch(NullPointerException ignored){
-                steam = false;
-                Log.info("Running in offline mode.");
             }catch(Throwable e){
                 steam = false;
                 Log.err("Failed to load Steam native libraries.");
@@ -109,7 +124,7 @@ public class DesktopLauncher extends ClientLauncher{
         steamError = e;
         loadError = true;
         Log.err(e);
-        try(OutputStream s = new FileOutputStream(new File("steam-error-log-" + System.nanoTime() + ".txt"))){
+        try(OutputStream s = new FileOutputStream("steam-error-log-" + System.nanoTime() + ".txt")){
             String log = Strings.neatError(e);
             s.write(log.getBytes());
         }catch(Exception e2){
@@ -124,12 +139,53 @@ public class DesktopLauncher extends ClientLauncher{
         SVars.user = new SUser();
         boolean[] isShutdown = {false};
 
+        service = new GameService(){
+
+            @Override
+            public boolean enabled(){
+                return true;
+            }
+
+            @Override
+            public void completeAchievement(String name){
+                SVars.stats.stats.setAchievement(name);
+                SVars.stats.stats.storeStats();
+            }
+
+            @Override
+            public void clearAchievement(String name){
+                SVars.stats.stats.clearAchievement(name);
+                SVars.stats.stats.storeStats();
+            }
+
+            @Override
+            public boolean isAchieved(String name){
+                return SVars.stats.stats.isAchieved(name, false);
+            }
+
+            @Override
+            public int getStat(String name, int def){
+                return SVars.stats.stats.getStatI(name, def);
+            }
+
+            @Override
+            public void setStat(String name, int amount){
+                SVars.stats.stats.setStatI(name, amount);
+            }
+
+            @Override
+            public void storeStats(){
+                SVars.stats.onUpdate();
+            }
+        };
+
         Events.on(ClientLoadEvent.class, event -> {
             Core.settings.defaults("name", SVars.net.friends.getPersonaName());
             if(player.name.isEmpty()){
                 player.name = SVars.net.friends.getPersonaName();
                 Core.settings.put("name", player.name);
             }
+            steamPlayerName = SVars.net.friends.getPersonaName();
             //update callbacks
             Core.app.addListener(new ApplicationListener(){
                 @Override
@@ -167,27 +223,30 @@ public class DesktopLauncher extends ClientLauncher{
     }
 
     static void handleCrash(Throwable e){
-        Cons<Runnable> dialog = Runnable::run;
         boolean badGPU = false;
         String finalMessage = Strings.getFinalMessage(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")|| total.contains("unsupported combination of formats")){
 
-            dialog.get(() -> message(
+            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 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));
+                                    "Full message: " + finalMessage);
             badGPU = true;
         }
 
         boolean fbgp = badGPU;
 
-        CrashSender.send(e, file -> {
+        LoadedMod cause = CrashHandler.getModCause(e);
+        String causeString = cause == null ? (Structs.contains(e.getStackTrace(), st -> st.getClassName().contains("rhino.gen.")) ? "A mod or script has caused Mindustry to crash.\nConsider disabling your mods if the issue persists.\n" : "Mindustry has crashed.") :
+            "'" + cause.meta.displayName + "' (" + cause.name + ") has caused Mindustry to crash.\nConsider disabling this mod if issues persist.\n";
+
+        CrashHandler.handle(e, file -> {
             Throwable fc = Strings.getFinalCause(e);
             if(!fbgp){
-                dialog.get(() -> message("A crash has occured. It has been saved in:\n" + file.getAbsolutePath() + "\n" + fc.getClass().getSimpleName().replace("Exception", "") + (fc.getMessage() == null ? "" : ":\n" + fc.getMessage())));
+                message(causeString + "\nThe logs have been saved in:\n" + file.getAbsolutePath() + "\n" + fc.getClass().getSimpleName().replace("Exception", "") + (fc.getMessage() == null ? "" : ":\n" + fc.getMessage()));
             }
         });
     }
@@ -247,13 +306,12 @@ public class DesktopLauncher extends ClientLauncher{
         String uiState = "";
 
         if(inGame){
-            //TODO implement nice name for sector
             gameMapWithWave = Strings.capitalize(Strings.stripColors(state.map.name()));
 
             if(state.rules.waves){
                 gameMapWithWave += " | Wave " + state.wave;
             }
-            gameMode = state.rules.pvp ? "PvP" : state.rules.attackMode ? "Attack" : "Survival";
+            gameMode = state.rules.pvp ? "PvP" : state.rules.attackMode ? "Attack" : state.rules.infiniteResources ? "Sandbox" : "Survival";
             if(net.active() && Groups.player.size() > 1){
                 gamePlayersSuffix = " | " + Groups.player.size() + " Players";
             }
@@ -268,7 +326,7 @@ public class DesktopLauncher extends ClientLauncher{
         }
 
         if(useDiscord){
-            DiscordRichPresence presence = new DiscordRichPresence();
+            RichPresence presence = new RichPresence();
 
             if(inGame){
                 presence.state = gameMode + gamePlayersSuffix;
@@ -282,7 +340,9 @@ public class DesktopLauncher extends ClientLauncher{
 
             presence.largeImageKey = "logo";
 
-            DiscordRPC.INSTANCE.Discord_UpdatePresence(presence);
+            try{
+                DiscordRPC.send(presence);
+            }catch(Exception ignored){}
         }
 
         if(steam){
@@ -315,11 +375,4 @@ public class DesktopLauncher extends ClientLauncher{
     private static void message(String message){
         SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MESSAGEBOX_ERROR, "oh no", message);
     }
-
-    private boolean validAddress(byte[] bytes){
-        if(bytes == null) return false;
-        byte[] result = new byte[8];
-        System.arraycopy(bytes, 0, result, 0, bytes.length);
-        return !new String(Base64Coder.encode(result)).equals("AAAAAAAAAOA=") && !new String(Base64Coder.encode(result)).equals("AAAAAAAAAAA=");
-    }
 }
diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java
index 1417ffc0b9..a08ecf3120 100644
--- a/desktop/src/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/mindustry/desktop/steam/SNet.java
@@ -4,9 +4,7 @@ import arc.*;
 import arc.func.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.pooling.*;
 import com.codedisaster.steamworks.*;
-import com.codedisaster.steamworks.SteamFriends.*;
 import com.codedisaster.steamworks.SteamMatchmaking.*;
 import com.codedisaster.steamworks.SteamNetworking.*;
 import mindustry.core.*;
@@ -33,6 +31,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
     final PacketSerializer serializer = new PacketSerializer();
     final ByteBuffer writeBuffer = ByteBuffer.allocateDirect(16384);
     final ByteBuffer readBuffer = ByteBuffer.allocateDirect(16384);
+    final ByteBuffer readCopyBuffer = ByteBuffer.allocate(writeBuffer.capacity());
 
     final CopyOnWriteArrayList<SteamConnection> connections = new CopyOnWriteArrayList<>();
     final IntMap<SteamConnection> steamConnections = new IntMap<>(); //maps steam ID -> valid net connection
@@ -53,10 +52,20 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
             public void update(){
                 while((length = snet.isP2PPacketAvailable(0)) != 0){
                     try{
-                        readBuffer.position(0);
-                        snet.readP2PPacket(from, readBuffer, 0);
+                        readBuffer.position(0).limit(readBuffer.capacity());
+                        //lz4 chokes on direct buffers, so copy the bytes over
+                        int len = snet.readP2PPacket(from, readBuffer, 0);
+                        readBuffer.limit(len);
+                        readCopyBuffer.position(0);
+                        readCopyBuffer.put(readBuffer);
+                        readCopyBuffer.position(0);
                         int fromID = from.getAccountID();
-                        Object output = serializer.read(readBuffer);
+                        Object output = serializer.read(readCopyBuffer);
+
+                        //it may be theoretically possible for this to be a framework message, if the packet is malicious or corrupted
+                        if(!(output instanceof Packet)) return;
+
+                        Packet pack = (Packet)output;
 
                         if(net.server()){
                             SteamConnection con = steamConnections.get(fromID);
@@ -74,29 +83,33 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                                     net.handleServerReceived(con, c);
                                 }
 
-                                net.handleServerReceived(con, output);
+                                net.handleServerReceived(con, pack);
                             }catch(Throwable e){
                                 Log.err(e);
                             }
                         }else if(currentServer != null && fromID == currentServer.getAccountID()){
                             try{
-                                net.handleClientReceived(output);
+                                net.handleClientReceived(pack);
                             }catch(Throwable t){
                                 net.handleException(t);
                             }
                         }
-                    }catch(SteamException e){
-                        Log.err(e);
+                    }catch(Exception e){
+                        if(net.server()){
+                            Log.err(e);
+                        }else{
+                            net.showError(e);
+                        }
                     }
                 }
             }
         }));
 
-        Events.on(WaveEvent.class, e -> {
-            if(currentLobby != null && net.server()){
-                smat.setLobbyData(currentLobby, "wave", state.wave + "");
-            }
-        });
+        Events.on(WaveEvent.class, e -> updateWave());
+        Events.run(Trigger.newGame, this::updateWave);
+
+        Events.on(PlayerIpBanEvent.class, e -> updateBans(e.ip));
+        Events.on(PlayerIpUnbanEvent.class, e -> updateBans(e.ip));
     }
 
     public boolean isSteamClient(){
@@ -120,7 +133,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
     }
 
     @Override
-    public void sendClient(Object object, SendMode mode){
+    public void sendClient(Object object, boolean reliable){
         if(isSteamClient()){
             if(currentServer == null){
                 Log.info("Not connected, quitting.");
@@ -134,17 +147,15 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                 int length = writeBuffer.position();
                 writeBuffer.flip();
 
-                snet.sendP2PPacket(currentServer, writeBuffer, mode == SendMode.tcp || length >= 1200 ? P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0);
+                snet.sendP2PPacket(currentServer, writeBuffer, reliable || length >= 1000 ? P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0);
             }catch(Exception e){
                 net.showError(e);
             }
-            Pools.free(object);
         }else{
-            provider.sendClient(object, mode);
+            provider.sendClient(object, reliable);
         }
     }
 
-
     @Override
     public void disconnectClient(){
         if(isSteamClient()){
@@ -163,6 +174,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
     @Override
     public void discoverServers(Cons<Host> callback, Runnable done){
         smat.addRequestLobbyListResultCountFilter(32);
+        smat.addRequestLobbyListDistanceFilter(LobbyDistanceFilter.Worldwide);
         smat.requestLobbyList();
         lobbyCallback = callback;
 
@@ -178,17 +190,31 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
     @Override
     public void hostServer(int port) throws IOException{
         provider.hostServer(port);
-        smat.createLobby(Core.settings.getBool("publichost") ? LobbyType.Public : LobbyType.FriendsOnly, Core.settings.getInt("playerlimit"));
+        smat.createLobby(Core.settings.getBool("steampublichost") ? LobbyType.Public : LobbyType.FriendsOnly, Core.settings.getInt("playerlimit"));
 
         Core.app.post(() -> Core.app.post(() -> Core.app.post(() -> Log.info("Server: @\nClient: @\nActive: @", net.server(), net.client(), net.active()))));
     }
 
     public void updateLobby(){
         if(currentLobby != null && net.server()){
-            smat.setLobbyType(currentLobby, Core.settings.getBool("publichost") ? LobbyType.Public : LobbyType.FriendsOnly);
+            smat.setLobbyType(currentLobby, Core.settings.getBool("steampublichost") ? LobbyType.Public : LobbyType.FriendsOnly);
             smat.setLobbyMemberLimit(currentLobby, Core.settings.getInt("playerlimit"));
         }
     }
+    
+    void updateWave(){
+        if(currentLobby != null && net.server()){
+            smat.setLobbyData(currentLobby, "mapname", state.map.name());
+            smat.setLobbyData(currentLobby, "wave", state.wave + "");
+            smat.setLobbyData(currentLobby, "gamemode", state.rules.mode().name() + "");
+        }
+    }
+
+    /** Updates the ban list so that lobbies don't appear for banned players. The list will only be updated when a steam player is banned/unbanned. */
+    void updateBans(String changed){
+        if(changed != null && !changed.startsWith("steam:")) return; //hacky way to ignore non-steam ids
+        smat.setLobbyData(currentLobby, "banned", netServer.admins.bannedIPs.select(ip -> ip.contains("steam:")).reduce(new StringBuilder(), (ip, str) -> str.append(ip.substring(6)).append(',')).toString()); //list of handles split by commas
+    }
 
     @Override
     public void closeServer(){
@@ -226,11 +252,6 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         }
     }
 
-    @Override
-    public void onFavoritesListChanged(int i, int i1, int i2, int i3, int i4, boolean b, int i5){
-
-    }
-
     @Override
     public void onLobbyInvite(SteamID steamIDUser, SteamID steamIDLobby, long gameID){
         Log.info("onLobbyInvite @ @ @", steamIDLobby.getAccountID(), steamIDUser.getAccountID(), gameID);
@@ -251,7 +272,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         //check version
         if(version != Version.build){
             ui.loadfrag.hide();
-            ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" +
+            ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated) + "\n[]" +
                 Core.bundle.format("server.versions", Version.build, version));
             smat.leaveLobby(steamIDLobby);
             return;
@@ -279,11 +300,6 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         Core.app.post(() -> Core.app.post(() -> Core.app.post(() -> Log.info("Server: @\nClient: @\nActive: @", net.server(), net.client(), net.active()))));
     }
 
-    @Override
-    public void onLobbyDataUpdate(SteamID steamID, SteamID steamID1, boolean b){
-
-    }
-
     @Override
     public void onLobbyChatUpdate(SteamID lobby, SteamID who, SteamID changer, ChatMemberStateChange change){
         Log.info("lobby @: @ caused @'s change: @", lobby.getAccountID(), who.getAccountID(), changer.getAccountID(), change);
@@ -301,25 +317,24 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         }
     }
 
-    @Override
-    public void onLobbyChatMessage(SteamID steamID, SteamID steamID1, ChatEntryType chatEntryType, int i){
-
-    }
-
-    @Override
-    public void onLobbyGameCreated(SteamID steamID, SteamID steamID1, int i, short i1){
-
-    }
-
     @Override
     public void onLobbyMatchList(int matches){
-        Log.info("found @ matches @", matches, lobbyDoneCallback);
+        Log.info("found @ matches", matches);
 
         if(lobbyDoneCallback != null){
             Seq<Host> hosts = new Seq<>();
             for(int i = 0; i < matches; i++){
                 try{
                     SteamID lobby = smat.getLobbyByIndex(i);
+                    if(smat.getLobbyData(lobby, "hidden").equals("true")) continue;
+                    String mode = smat.getLobbyData(lobby, "gamemode");
+                    //make sure versions are equal, don't list incompatible lobbies
+                    if(mode == null || mode.isEmpty() || (Version.build != -1 && Strings.parseInt(smat.getLobbyData(lobby, "version"), -1) != Version.build)) continue;
+
+                    String banList = smat.getLobbyData(lobby, "banned");
+
+                    boolean banned = banList.length() > 0 && Structs.contains(banList.split(","), SVars.user.user.getSteamID().getAccountID() + "");
+
                     Host out = new Host(
                         -1, //invalid ping
                         smat.getLobbyData(lobby, "name"),
@@ -329,9 +344,9 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                         smat.getNumLobbyMembers(lobby),
                         Strings.parseInt(smat.getLobbyData(lobby, "version"), -1),
                         smat.getLobbyData(lobby, "versionType"),
-                        Gamemode.valueOf(smat.getLobbyData(lobby, "gamemode")),
+                        Gamemode.valueOf(mode),
                         smat.getLobbyMemberLimit(lobby),
-                        "",
+                        banned ? "[banned]" : "",
                         null
                     );
                     hosts.add(out);
@@ -347,11 +362,6 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         }
     }
 
-    @Override
-    public void onLobbyKicked(SteamID steamID, SteamID steamID1, boolean b){
-        Log.info("Kicked: @ @ @", steamID, steamID1, b);
-    }
-
     @Override
     public void onLobbyCreated(SteamResult result, SteamID steamID){
         if(!net.server()){
@@ -369,6 +379,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
             smat.setLobbyData(steamID, "versionType", Version.type);
             smat.setLobbyData(steamID, "wave", state.wave + "");
             smat.setLobbyData(steamID, "gamemode", state.rules.mode().name() + "");
+            updateBans(null);
         }
     }
 
@@ -379,11 +390,6 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         }
     }
 
-    @Override
-    public void onFavoritesListAccountsUpdated(SteamResult steamResult){
-
-    }
-
     @Override
     public void onP2PSessionConnectFail(SteamID steamIDRemote, P2PSessionError sessionError){
         if(net.server()){
@@ -404,59 +410,23 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         }
     }
 
-    @Override
-    public void onSetPersonaNameResponse(boolean b, boolean b1, SteamResult steamResult){
-
-    }
-
-    @Override
-    public void onPersonaStateChange(SteamID steamID, PersonaChange personaChange){
-
-    }
-
-    @Override
-    public void onGameOverlayActivated(boolean b){
-
-    }
-
     @Override
     public void onGameLobbyJoinRequested(SteamID lobby, SteamID steamIDFriend){
         Log.info("onGameLobbyJoinRequested @ @", lobby, steamIDFriend);
         smat.joinLobby(lobby);
     }
 
-    @Override
-    public void onAvatarImageLoaded(SteamID steamID, int i, int i1, int i2){
-
-    }
-
-    @Override
-    public void onFriendRichPresenceUpdate(SteamID steamID, int i){
-
-    }
-
-    @Override
-    public void onGameRichPresenceJoinRequested(SteamID steamID, String connect){
-        Log.info("onGameRichPresenceJoinRequested @ @", steamID, connect);
-    }
-
-    @Override
-    public void onGameServerChangeRequested(String server, String password){
-
-    }
-
     public class SteamConnection extends NetConnection{
         final SteamID sid;
-        final P2PSessionState state = new P2PSessionState();
 
         public SteamConnection(SteamID sid){
-            super(sid.getAccountID() + "");
+            super("steam:" + sid.getAccountID());
             this.sid = sid;
-            Log.info("Create STEAM client @", sid.getAccountID());
+            Log.info("Created STEAM connection: @", sid.getAccountID());
         }
 
         @Override
-        public void send(Object object, SendMode mode){
+        public void send(Object object, boolean reliable){
             try{
                 writeBuffer.limit(writeBuffer.capacity());
                 writeBuffer.position(0);
@@ -464,7 +434,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                 int length = writeBuffer.position();
                 writeBuffer.flip();
 
-                snet.sendP2PPacket(sid, writeBuffer, mode == SendMode.tcp || length >= 1200 ? object instanceof StreamChunk ? P2PSend.ReliableWithBuffering : P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0);
+                snet.sendP2PPacket(sid, writeBuffer, reliable || length >= 1000 ? object instanceof StreamChunk ? P2PSend.ReliableWithBuffering : P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0);
             }catch(Exception e){
                 Log.err(e);
                 Log.info("Error sending packet. Disconnecting invalid client!");
@@ -477,10 +447,17 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
 
         @Override
         public boolean isConnected(){
-            snet.getP2PSessionState(sid, state);
+            //TODO ???
+            //snet.getP2PSessionState(sid, state);
             return true;//state.isConnectionActive();
         }
 
+        @Override
+        protected void kickDisconnect(){
+            //delay the close so the kick packet can be sent on steam
+            Time.runTask(10f, this::close);
+        }
+
         @Override
         public void close(){
             disconnectSteamUser(sid);
diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java
index 9146ff12cd..1a5ed54b77 100644
--- a/desktop/src/mindustry/desktop/steam/SStats.java
+++ b/desktop/src/mindustry/desktop/steam/SStats.java
@@ -1,51 +1,22 @@
 package mindustry.desktop.steam;
 
 import arc.*;
-import arc.struct.*;
 import arc.util.*;
 import com.codedisaster.steamworks.*;
-import mindustry.*;
-import mindustry.content.*;
-import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
-import mindustry.gen.*;
-import mindustry.type.*;
-import mindustry.world.*;
-import mindustry.world.blocks.distribution.*;
 
 import static mindustry.Vars.*;
-import static mindustry.desktop.steam.SAchievement.*;
 
-@SuppressWarnings("unchecked")
 public class SStats implements SteamUserStatsCallback{
     public final SteamUserStats stats = new SteamUserStats(this);
 
     private boolean updated = false;
     private int statSavePeriod = 4; //in minutes
 
-    private ObjectSet<String> blocksBuilt = new ObjectSet<>(), unitsBuilt = new ObjectSet<>();
-    private ObjectSet<UnitType> t5s = new ObjectSet<>();
-    private IntSet checked = new IntSet();
-
     public SStats(){
         stats.requestCurrentStats();
 
         Events.on(ClientLoadEvent.class, e -> {
-            unitsBuilt = Core.settings.getJson("units-built" , ObjectSet.class, String.class, ObjectSet::new);
-            blocksBuilt = Core.settings.getJson("blocks-built" , ObjectSet.class, String.class, ObjectSet::new);
-            t5s = ObjectSet.with(UnitTypes.omura, UnitTypes.reign, UnitTypes.toxopid, UnitTypes.eclipse, UnitTypes.oct, UnitTypes.corvus);
-
-            Core.app.addListener(new ApplicationListener(){
-                Interval i = new Interval();
-
-                @Override
-                public void update(){
-                    if(i.get(60f)){
-                        checkUpdate();
-                    }
-                }
-            });
-
             Timer.schedule(() -> {
                 if(updated){
                     stats.storeStats();
@@ -58,283 +29,9 @@ public class SStats implements SteamUserStatsCallback{
         this.updated = true;
     }
 
-    void checkUpdate(){
-        if(campaign()){
-            SStat.maxUnitActive.max(Groups.unit.count(t -> t.team == player.team()));
-
-            if(Groups.unit.count(u -> u.type == UnitTypes.poly && u.team == player.team()) >= 10){
-                 active10Polys.complete();
-            }
-
-            for(Building entity : player.team().cores()){
-                if(!content.items().contains(i -> entity.items.get(i) < entity.block.itemCapacity)){
-                    fillCoreAllCampaign.complete();
-                    break;
-                }
-            }
-        }
-    }
-
-    private void registerEvents(){
-
-        Events.on(UnitDestroyEvent.class, e -> {
-            if(campaign()){
-                if(e.unit.team != Vars.player.team()){
-                    SStat.unitsDestroyed.add();
-
-                    if(e.unit.isBoss()){
-                        SStat.bossesDefeated.add();
-                    }
-                }
-            }
-        });
-
-        Events.on(TurnEvent.class, e -> {
-            float total = 0;
-            for(Planet planet : content.planets()){
-                for(Sector sec : planet.sectors){
-                    if(sec.hasBase()){
-                        for(var v : sec.info.production.values()){
-                            if(v.mean > 0) total += v.mean * 60;
-                        }
-                    }
-                }
-            }
-
-            SStat.maxProduction.max(Math.round(total));
-        });
-
-        Events.run(Trigger.newGame, () -> Core.app.post(() -> {
-            if(campaign() && player.core() != null && player.core().items.total() >= 10 * 1000){
-                drop10kitems.complete();
-            }
-        }));
-
-        Events.on(CommandIssueEvent.class, e -> {
-            if(campaign() && e.command == UnitCommand.attack){
-                issueAttackCommand.complete();
-            }
-        });
-
-        Events.on(BlockBuildEndEvent.class, e -> {
-            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)){
-                    chainRouters.complete();
-                }
-
-                if(e.tile.block() == Blocks.groundFactory){
-                    buildGroundFactory.complete();
-                }
-
-                if(blocksBuilt.add(e.tile.block().name)){
-                    if(blocksBuilt.contains("meltdown") && blocksBuilt.contains("spectre") && blocksBuilt.contains("foreshadow")){
-                        buildMeltdownSpectre.complete();
-                    }
-
-                    save();
-                }
-
-                if(e.tile.block() instanceof Conveyor){
-                    checked.clear();
-                    check: {
-                        Tile current = e.tile;
-                        for(int i = 0; i < 4; i++){
-                            checked.add(current.pos());
-                            if(current.build == null) break check;
-                            Tile next = current.nearby(current.build.rotation);
-                            if(next != null && next.block() instanceof Conveyor){
-                                current = next;
-                            }else{
-                                break check;
-                            }
-                        }
-
-                        if(current == e.tile && checked.size == 4){
-                            circleConveyor.complete();
-                        }
-                    }
-                }
-            }
-        });
-
-        Events.on(UnitCreateEvent.class, e -> {
-            if(campaign()){
-                if(unitsBuilt.add(e.unit.type.name)){
-                    SStat.unitTypesBuilt.set(content.units().count(u -> unitsBuilt.contains(u.name) && !u.isHidden()));
-                }
-
-                if(t5s.contains(e.unit.type)){
-                    buildT5.complete();
-                }
-            }
-        });
-
-        Events.on(UnitControlEvent.class, e -> {
-            if(e.unit instanceof BlockUnitc block && block.tile().block == Blocks.router){
-                becomeRouter.complete();
-            }
-        });
-
-        Events.on(SchematicCreateEvent.class, e -> {
-            SStat.schematicsCreated.add();
-        });
-
-        Events.on(BlockDestroyEvent.class, e -> {
-            if(campaign() && e.tile.team() != player.team()){
-                SStat.blocksDestroyed.add();
-            }
-        });
-
-        Events.on(MapMakeEvent.class, e -> SStat.mapsMade.add());
-
-        Events.on(MapPublishEvent.class, e -> SStat.mapsPublished.add());
-
-        Events.on(UnlockEvent.class, e -> {
-            if(e.content == Items.thorium) obtainThorium.complete();
-            if(e.content == Items.titanium) obtainTitanium.complete();
-        });
-
-        Events.run(Trigger.openWiki, openWiki::complete);
-
-        Events.run(Trigger.exclusionDeath, dieExclusion::complete);
-
-        Events.on(UnitDrownEvent.class, e -> {
-            if(campaign() && e.unit.isPlayer()){
-                drown.complete();
-            }
-        });
-
-        trigger(Trigger.acceleratorUse, useAccelerator);
-
-        trigger(Trigger.impactPower, powerupImpactReactor);
-
-        trigger(Trigger.flameAmmo, useFlameAmmo);
-
-        trigger(Trigger.turretCool, coolTurret);
-
-        trigger(Trigger.suicideBomb, suicideBomb);
-
-        Events.run(Trigger.enablePixelation, enablePixelation::complete);
-
-        Events.run(Trigger.thoriumReactorOverheat, () -> {
-            if(campaign()){
-                SStat.reactorsOverheated.add();
-            }
-        });
-
-        trigger(Trigger.shock, shockWetEnemy);
-
-        trigger(Trigger.phaseDeflectHit, killEnemyPhaseWall);
-
-        Events.on(LaunchItemEvent.class, e -> {
-            if(campaign()){
-                launchItemPad.complete();
-            }
-        });
-
-        Events.on(PickupEvent.class, e -> {
-            if(e.carrier.isPlayer() && campaign() && e.unit != null && t5s.contains(e.unit.type)){
-                pickupT5.complete();
-            }
-        });
-
-        Events.on(UnitCreateEvent.class, e -> {
-            if(campaign() && e.unit.team() == player.team()){
-                SStat.unitsBuilt.add();
-            }
-        });
-
-        Events.on(SectorLaunchEvent.class, e -> {
-            SStat.timesLaunched.add();
-        });
-
-        Events.on(LaunchItemEvent.class, e -> {
-            SStat.itemsLaunched.add(e.stack.amount);
-        });
-
-        Events.on(WaveEvent.class, e -> {
-            if(campaign()){
-                SStat.maxWavesSurvived.max(Vars.state.wave);
-
-                if(state.stats.buildingsBuilt == 0 && state.wave >= 10){
-                    survive10WavesNoBlocks.complete();
-                }
-            }
-        });
-
-        Events.on(PlayerJoin.class, e -> {
-            if(Vars.net.server()){
-                SStat.maxPlayersServer.max(Groups.player.size());
-            }
-        });
-
-        Runnable checkUnlocks = () -> {
-            if(Blocks.router.unlocked()) researchRouter.complete();
-
-            if(!TechTree.all.contains(t -> t.content.locked())){
-                researchAll.complete();
-            }
-        };
-
-        //check unlocked stuff on load as well
-        Events.on(ResearchEvent.class, e -> checkUnlocks.run());
-        Events.on(ClientLoadEvent.class, e -> checkUnlocks.run());
-
-        Events.on(WinEvent.class, e -> {
-            if(state.rules.pvp){
-                SStat.pvpsWon.add();
-            }
-        });
-
-        Events.on(SectorCaptureEvent.class, e -> {
-            if(e.sector.isBeingPlayed() || net.client()){
-                if(Vars.state.wave <= 5 && state.rules.attackMode){
-                    defeatAttack5Waves.complete();
-                }
-
-                if(state.stats.buildingsDestroyed == 0){
-                    captureNoBlocksBroken.complete();
-                }
-            }
-
-            if(Vars.state.rules.attackMode){
-                SStat.attacksWon.add();
-            }
-
-            if(!e.sector.isBeingPlayed() && !net.client()){
-                captureBackground.complete();
-            }
-
-            if(!e.sector.planet.sectors.contains(s -> !s.hasBase())){
-                captureAllSectors.complete();
-            }
-
-            SStat.sectorsControlled.set(e.sector.planet.sectors.count(Sector::hasBase));
-        });
-    }
-
-    private void save(){
-        Core.settings.putJson("units-built" , String.class, unitsBuilt);
-        Core.settings.putJson("blocks-built" , String.class, blocksBuilt);
-    }
-
-    private void trigger(Trigger trigger, SAchievement ach){
-        Events.run(trigger, () -> {
-            if(campaign()){
-                ach.complete();
-            }
-        });
-    }
-
-    private boolean campaign(){
-        return Vars.state.isCampaign();
-    }
-
     @Override
     public void onUserStatsReceived(long gameID, SteamID steamID, SteamResult result){
-        registerEvents();
+        service.init();
 
         if(result != SteamResult.OK){
             Log.err("Failed to receive steam stats: @", result);
@@ -351,34 +48,4 @@ public class SStats implements SteamUserStatsCallback{
             updated = true;
         }
     }
-
-    @Override
-    public void onUserStatsUnloaded(SteamID steamID){
-
-    }
-
-    @Override
-    public void onUserAchievementStored(long l, boolean b, String s, int i, int i1){
-
-    }
-
-    @Override
-    public void onLeaderboardFindResult(SteamLeaderboardHandle steamLeaderboardHandle, boolean b){
-
-    }
-
-    @Override
-    public void onLeaderboardScoresDownloaded(SteamLeaderboardHandle steamLeaderboardHandle, SteamLeaderboardEntriesHandle steamLeaderboardEntriesHandle, int i){
-
-    }
-
-    @Override
-    public void onLeaderboardScoreUploaded(boolean b, SteamLeaderboardHandle steamLeaderboardHandle, int i, boolean b1, int i1, int i2){
-
-    }
-
-    @Override
-    public void onGlobalStatsReceived(long l, SteamResult steamResult){
-
-    }
 }
diff --git a/desktop/src/mindustry/desktop/steam/SUser.java b/desktop/src/mindustry/desktop/steam/SUser.java
index 730b12763e..1b368e7982 100644
--- a/desktop/src/mindustry/desktop/steam/SUser.java
+++ b/desktop/src/mindustry/desktop/steam/SUser.java
@@ -1,23 +1,7 @@
 package mindustry.desktop.steam;
 
 import com.codedisaster.steamworks.*;
-import com.codedisaster.steamworks.SteamAuth.*;
 
 public class SUser implements SteamUserCallback{
     public final SteamUser user = new SteamUser(this);
-
-    @Override
-    public void onValidateAuthTicket(SteamID steamID, AuthSessionResponse authSessionResponse, SteamID ownerSteamID){
-
-    }
-
-    @Override
-    public void onMicroTxnAuthorization(int appID, long orderID, boolean authorized){
-
-    }
-
-    @Override
-    public void onEncryptedAppTicket(SteamResult result){
-
-    }
 }
diff --git a/desktop/src/mindustry/desktop/steam/SWorkshop.java b/desktop/src/mindustry/desktop/steam/SWorkshop.java
index ac6e5f5060..7566597380 100644
--- a/desktop/src/mindustry/desktop/steam/SWorkshop.java
+++ b/desktop/src/mindustry/desktop/steam/SWorkshop.java
@@ -1,18 +1,19 @@
 package mindustry.desktop.steam;
 
 import arc.*;
-import com.codedisaster.steamworks.*;
-import com.codedisaster.steamworks.SteamRemoteStorage.*;
-import com.codedisaster.steamworks.SteamUGC.*;
-import arc.struct.*;
 import arc.files.*;
 import arc.func.*;
 import arc.scene.ui.*;
+import arc.struct.*;
 import arc.util.*;
+import com.codedisaster.steamworks.*;
+import com.codedisaster.steamworks.SteamRemoteStorage.*;
+import com.codedisaster.steamworks.SteamUGC.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.maps.*;
 import mindustry.mod.Mods.*;
+import mindustry.service.*;
 import mindustry.type.*;
 import mindustry.ui.dialogs.*;
 
@@ -32,17 +33,16 @@ public class SWorkshop implements SteamUGCCallback{
         ItemInstallInfo info = new ItemInstallInfo();
         ugc.getSubscribedItems(ids);
 
-        Seq<Fi> folders = Seq.with(ids).map(f -> {
-            ugc.getItemInstallInfo(f, info);
-            return new Fi(info.getFolder());
-        }).select(f -> f != null && f.list().length > 0);
+        Seq<Fi> folders = Seq.with(ids)
+            .map(f -> !ugc.getItemInstallInfo(f, info) || info.getFolder() == null ? null : new Fi(info.getFolder()))
+            .select(f -> f != null && f.list().length > 0);
 
         workshopFiles.put(Map.class, folders.select(f -> f.list().length == 1 && f.list()[0].extension().equals(mapExtension)).map(f -> f.list()[0]));
         workshopFiles.put(Schematic.class, folders.select(f -> f.list().length == 1 && f.list()[0].extension().equals(schematicExtension)).map(f -> f.list()[0]));
         workshopFiles.put(LoadedMod.class, folders.select(f -> f.child("mod.json").exists() || f.child("mod.hjson").exists()));
 
         if(!workshopFiles.get(Map.class).isEmpty()){
-            SAchievement.downloadMapWorkshop.complete();
+            Achievement.downloadMapWorkshop.complete();
         }
 
         workshopFiles.each((type, list) -> {
@@ -69,14 +69,7 @@ public class SWorkshop implements SteamUGCCallback{
             return;
         }
 
-        showPublish(id -> update(p, id, null));
-    }
-
-    /** Update an existing item with a changelog. */
-    public void updateItem(Publishable p, String changelog){
-        String id = p.getSteamID();
-        long handle = Strings.parseLong(id, -1);
-        update(p, new SteamPublishedFileID(handle), changelog);
+        showPublish(id -> update(p, id, null, true));
     }
 
     /** Fetches info for an item, checking to make sure that it exists.*/
@@ -113,6 +106,12 @@ public class SWorkshop implements SteamUGCCallback{
                                 cont.row();
                                 TextArea field = cont.area("", t -> {}).size(500f, 160f).get();
                                 field.setMaxLength(400);
+                                cont.row();
+
+                                boolean[] updatedesc = {false};
+
+                                cont.check("@updatedesc", b -> updatedesc[0] = b).pad(4);
+
                                 buttons.defaults().size(120, 54).pad(4);
                                 buttons.button("@ok", () -> {
                                     if(!p.prePublish()){
@@ -121,7 +120,7 @@ public class SWorkshop implements SteamUGCCallback{
                                     }
 
                                     ui.loadfrag.show("@publishing");
-                                    updateItem(p, field.getText().replace("\r", "\n"));
+                                    SWorkshop.this.update(p, new SteamPublishedFileID(Strings.parseLong(p.getSteamID(), -1)), field.getText().replace("\r", "\n"), updatedesc[0]);
                                     dialog.hide();
                                     hide();
                                 });
@@ -149,21 +148,26 @@ public class SWorkshop implements SteamUGCCallback{
         SVars.net.friends.activateGameOverlayToWebPage("steam://url/CommunityFilePage/" + id.handle());
     }
 
-    void update(Publishable p, SteamPublishedFileID id, String changelog){
+    void update(Publishable p, SteamPublishedFileID id, String changelog, boolean updateDescription){
         Log.info("Calling update(@) @", p.steamTitle(), id.handle());
         String sid = id.handle() + "";
 
         updateItem(id, h -> {
-            if(p.steamDescription() != null){
-                ugc.setItemDescription(h, p.steamDescription());
+            if(updateDescription){
+                ugc.setItemTitle(h, p.steamTitle());
+                if(p.steamDescription() != null){
+                    ugc.setItemDescription(h, p.steamDescription());
+                }
             }
 
             Seq<String> tags = p.extraTags();
             tags.add(p.steamTag());
 
-            ugc.setItemTitle(h, p.steamTitle());
             ugc.setItemTags(h, tags.toArray(String.class));
-            ugc.setItemPreview(h, p.createSteamPreview(sid).absolutePath());
+            String path = p.createSteamPreview(sid).absolutePath();
+
+            Log.info("PREVIEW @ @ @",  ugc.setItemPreview(h, path), path, Fi.get(path).exists());
+
             ugc.setItemContent(h, p.createSteamFolder(sid).absolutePath());
             if(changelog == null){
                 ugc.setItemVisibility(h, PublishedFileVisibility.Private);
@@ -171,7 +175,7 @@ public class SWorkshop implements SteamUGCCallback{
             ugc.submitItemUpdate(h, changelog == null ? "<Created>" : changelog);
 
             if(p instanceof Map){
-                SAchievement.publishMap.complete();
+                Achievement.publishMap.complete();
             }
         }, () -> p.addSteamID(sid));
     }
@@ -228,11 +232,6 @@ public class SWorkshop implements SteamUGCCallback{
         }
     }
 
-    @Override
-    public void onRequestUGCDetails(SteamUGCDetails details, SteamResult result){
-
-    }
-
     @Override
     public void onUGCQueryCompleted(SteamUGCQuery query, int numResultsReturned, int totalMatchingResults, boolean isCachedData, SteamResult result){
         Log.info("GET QUERY " + query);
@@ -263,7 +262,7 @@ public class SWorkshop implements SteamUGCCallback{
         ItemInstallInfo info = new ItemInstallInfo();
         ugc.getItemInstallInfo(publishedFileID, info);
         Log.info("Item subscribed from @", info.getFolder());
-        SAchievement.downloadMapWorkshop.complete();
+        Achievement.downloadMapWorkshop.complete();
     }
 
     @Override
@@ -311,42 +310,12 @@ public class SWorkshop implements SteamUGCCallback{
 
     @Override
     public void onDownloadItemResult(int appID, SteamPublishedFileID publishedFileID, SteamResult result){
-        SAchievement.downloadMapWorkshop.complete();
+        Achievement.downloadMapWorkshop.complete();
         ItemInstallInfo info = new ItemInstallInfo();
         ugc.getItemInstallInfo(publishedFileID, info);
         Log.info("Item downloaded to @", info.getFolder());
     }
 
-    @Override
-    public void onUserFavoriteItemsListChanged(SteamPublishedFileID publishedFileID, boolean wasAddRequest, SteamResult result){
-
-    }
-
-    @Override
-    public void onSetUserItemVote(SteamPublishedFileID publishedFileID, boolean voteUp, SteamResult result){
-
-    }
-
-    @Override
-    public void onGetUserItemVote(SteamPublishedFileID publishedFileID, boolean votedUp, boolean votedDown, boolean voteSkipped, SteamResult result){
-
-    }
-
-    @Override
-    public void onStartPlaytimeTracking(SteamResult result){
-
-    }
-
-    @Override
-    public void onStopPlaytimeTracking(SteamResult result){
-
-    }
-
-    @Override
-    public void onStopPlaytimeTrackingForAllItems(SteamResult result){
-
-    }
-
     @Override
     public void onDeleteItem(SteamPublishedFileID publishedFileID, SteamResult result){
         ItemInstallInfo info = new ItemInstallInfo();
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/102.1.txt b/fastlane/metadata/android/cs-CZ/changelogs/102.1.txt
deleted file mode 100644
index 01760ded80..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/102.1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Přidán nový pohled na mapu s rolováním a posouváním
-- Přidáno pravidlo pro zdraví bloku
-- Přidáno více interních týmů pro různé herní režimy
-- Přidána vylepšená podpora pro modifikace
-- Hlavní vnitřní změna: programový balík se te� jmenuje "mindustry" namísto dosavadního "io.anuke.mindustry" (toto rozbije staré pluginy)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/102.2.txt b/fastlane/metadata/android/cs-CZ/changelogs/102.2.txt
deleted file mode 100644
index 01760ded80..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/102.2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Přidán nový pohled na mapu s rolováním a posouváním
-- Přidáno pravidlo pro zdraví bloku
-- Přidáno více interních týmů pro různé herní režimy
-- Přidána vylepšená podpora pro modifikace
-- Hlavní vnitřní změna: programový balík se te� jmenuje "mindustry" namísto dosavadního "io.anuke.mindustry" (toto rozbije staré pluginy)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/102.txt b/fastlane/metadata/android/cs-CZ/changelogs/102.txt
deleted file mode 100644
index 01760ded80..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/102.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Přidán nový pohled na mapu s rolováním a posouváním
-- Přidáno pravidlo pro zdraví bloku
-- Přidáno více interních týmů pro různé herní režimy
-- Přidána vylepšená podpora pro modifikace
-- Hlavní vnitřní změna: programový balík se te� jmenuje "mindustry" namísto dosavadního "io.anuke.mindustry" (toto rozbije staré pluginy)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.1.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.1.txt
deleted file mode 100644
index ea267c1c96..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/103.1.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Přidány nové ikony s hladkým škálováním
-- Přidána �erná díra na kapaliny (přispěno uživatelem @GioIacca9)
-- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler)
-- Přidána brána s podtokem (protikus k bráně s přete�ením)
-- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů
-- Přidán nový strom technologií, s lepší podporou pro modifikace
-- Přidán soubor s logem hry, uložený v adresáři s daty
-- Přidán nový oddělova� pro sprity a animace (ocení modéři)
-- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.2.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.2.txt
deleted file mode 100644
index ea267c1c96..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/103.2.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Přidány nové ikony s hladkým škálováním
-- Přidána �erná díra na kapaliny (přispěno uživatelem @GioIacca9)
-- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler)
-- Přidána brána s podtokem (protikus k bráně s přete�ením)
-- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů
-- Přidán nový strom technologií, s lepší podporou pro modifikace
-- Přidán soubor s logem hry, uložený v adresáři s daty
-- Přidán nový oddělova� pro sprity a animace (ocení modéři)
-- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.3.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.3.txt
deleted file mode 100644
index ea267c1c96..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/103.3.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Přidány nové ikony s hladkým škálováním
-- Přidána �erná díra na kapaliny (přispěno uživatelem @GioIacca9)
-- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler)
-- Přidána brána s podtokem (protikus k bráně s přete�ením)
-- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů
-- Přidán nový strom technologií, s lepší podporou pro modifikace
-- Přidán soubor s logem hry, uložený v adresáři s daty
-- Přidán nový oddělova� pro sprity a animace (ocení modéři)
-- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.txt
deleted file mode 100644
index ea267c1c96..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/103.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Přidány nové ikony s hladkým škálováním
-- Přidána �erná díra na kapaliny (přispěno uživatelem @GioIacca9)
-- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler)
-- Přidána brána s podtokem (protikus k bráně s přete�ením)
-- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů
-- Přidán nový strom technologií, s lepší podporou pro modifikace
-- Přidán soubor s logem hry, uložený v adresáři s daty
-- Přidán nový oddělova� pro sprity a animace (ocení modéři)
-- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/104.1.txt b/fastlane/metadata/android/cs-CZ/changelogs/104.1.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/104.1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/104.2.txt b/fastlane/metadata/android/cs-CZ/changelogs/104.2.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/104.2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/104.3.txt b/fastlane/metadata/android/cs-CZ/changelogs/104.3.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/104.3.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/104.4.txt b/fastlane/metadata/android/cs-CZ/changelogs/104.4.txt
deleted file mode 100644
index 0289dad81f..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/104.4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Aktualizován link pro navržení nové funkce
-- Aktualizovány překlady
-- Opraveno uložen upraveného jména hrá�e poté, co byl ukon�en server
-- Přidán násobek slune�ní energie
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/104.5.txt b/fastlane/metadata/android/cs-CZ/changelogs/104.5.txt
deleted file mode 100644
index 0289dad81f..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/104.5.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Aktualizován link pro navržení nové funkce
-- Aktualizovány překlady
-- Opraveno uložen upraveného jména hrá�e poté, co byl ukon�en server
-- Přidán násobek slune�ní energie
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/104.txt b/fastlane/metadata/android/cs-CZ/changelogs/104.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/104.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29591.txt b/fastlane/metadata/android/cs-CZ/changelogs/29591.txt
deleted file mode 100644
index ea267c1c96..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29591.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Přidány nové ikony s hladkým škálováním
-- Přidána �erná díra na kapaliny (přispěno uživatelem @GioIacca9)
-- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler)
-- Přidána brána s podtokem (protikus k bráně s přete�ením)
-- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů
-- Přidán nový strom technologií, s lepší podporou pro modifikace
-- Přidán soubor s logem hry, uložený v adresáři s daty
-- Přidán nový oddělova� pro sprity a animace (ocení modéři)
-- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29594.txt b/fastlane/metadata/android/cs-CZ/changelogs/29594.txt
deleted file mode 100644
index ea267c1c96..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29594.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Přidány nové ikony s hladkým škálováním
-- Přidána �erná díra na kapaliny (přispěno uživatelem @GioIacca9)
-- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler)
-- Přidána brána s podtokem (protikus k bráně s přete�ením)
-- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů
-- Přidán nový strom technologií, s lepší podporou pro modifikace
-- Přidán soubor s logem hry, uložený v adresáři s daty
-- Přidán nový oddělova� pro sprity a animace (ocení modéři)
-- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29597.txt b/fastlane/metadata/android/cs-CZ/changelogs/29597.txt
deleted file mode 100644
index ea267c1c96..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29597.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Přidány nové ikony s hladkým škálováním
-- Přidána �erná díra na kapaliny (přispěno uživatelem @GioIacca9)
-- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler)
-- Přidána brána s podtokem (protikus k bráně s přete�ením)
-- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů
-- Přidán nový strom technologií, s lepší podporou pro modifikace
-- Přidán soubor s logem hry, uložený v adresáři s daty
-- Přidán nový oddělova� pro sprity a animace (ocení modéři)
-- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29603.txt b/fastlane/metadata/android/cs-CZ/changelogs/29603.txt
deleted file mode 100644
index 56174b520a..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29603.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Opraveno nesprávné �íslování řádek v chybovách hláškách skriptů
-- Opravena �erná obrazovka způsobená filtrem Bloom na některých zařízeních
-- Opraveny některé potíže s hudbou když je zvuk nastaven na 0% [Android]
-- Opravena ID�ka klientů po nastavení na původní hodnoty
-- Opraveno nastavování dat na původní hodnoty na některých verzích [Android]
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Optimalizovány a vy�ištěny dopravníky
-- Vyladěna paleta energetických bloků
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29607.txt b/fastlane/metadata/android/cs-CZ/changelogs/29607.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29607.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29609.txt b/fastlane/metadata/android/cs-CZ/changelogs/29609.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29609.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29612.txt b/fastlane/metadata/android/cs-CZ/changelogs/29612.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29612.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29616.txt b/fastlane/metadata/android/cs-CZ/changelogs/29616.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29616.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29618.txt b/fastlane/metadata/android/cs-CZ/changelogs/29618.txt
deleted file mode 100644
index 43eb391b26..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29618.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimalizovány a vy�ištěny dopravníky
-- Odbavova�e vykládají položky z bloků rovnoměrně
-- Přidány kategorie serverů (s přispěním uživatele @Quezler)
-- Přidána funkce require() pro skripty (s přispěním uživatele @DeltaNedas)
-- Přidán barevný přechod pro stav baterie (s přispěním uživatele @Arkanic
-- Změněno na�ítání skriptu: Pro modifikace s více než jedním souborem skriptu musí být hlavní soubor pojmenován "main.js" a musí odkazovat na další skripty pomocí funkce require()
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29620.txt b/fastlane/metadata/android/cs-CZ/changelogs/29620.txt
deleted file mode 100644
index 0289dad81f..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29620.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Aktualizován link pro navržení nové funkce
-- Aktualizovány překlady
-- Opraveno uložen upraveného jména hrá�e poté, co byl ukon�en server
-- Přidán násobek slune�ní energie
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29623.txt b/fastlane/metadata/android/cs-CZ/changelogs/29623.txt
deleted file mode 100644
index 0289dad81f..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29623.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Aktualizován link pro navržení nové funkce
-- Aktualizovány překlady
-- Opraveno uložen upraveného jména hrá�e poté, co byl ukon�en server
-- Přidán násobek slune�ní energie
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29659.txt b/fastlane/metadata/android/cs-CZ/changelogs/29659.txt
deleted file mode 100644
index db918ffffb..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29659.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-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/cs-CZ/changelogs/29661.txt b/fastlane/metadata/android/cs-CZ/changelogs/29661.txt
deleted file mode 100644
index 7d218735fd..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29661.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Opraveny některé chyby
-- A některé opraveny nebyly
-- Přidáno 6 nových jednotek, které zaplnily chybějící povýšení na T4/5
-- Přidán obrys jednotek pro vizuálbí �istotu, možná bude později odebráno
-- Přidán povrch typu bláto (příspěvek od ThePlayerA)
-- Přidána cena výzkumu k jednotkám v technologickém stromě
-- Přidána schopnost hry nahradit malé kusy zdí přímo většími 
-- Přidána možnost vybrat si cíl vyslání (jen zběžně testováno)
-- Přidány barvy týmů pro uskladněné bloky (příspěek od Voz-Duh)
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29664.txt b/fastlane/metadata/android/cs-CZ/changelogs/29664.txt
deleted file mode 100644
index 8a5413885e..0000000000
--- a/fastlane/metadata/android/cs-CZ/changelogs/29664.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Toto je malá aktualizace. Neobsahuje  mnoho nového obsahu, hlavně opravy chyb.
-Další plánovaná aktualizace se zaměří na kampaň a pravděpodobně zabere více �asu.
-
-- Opravy chyb
-- Přidána barva týmu pro řídicí středisko (příspěvek od Voz-Duh)
-- Vy�ištěny některé sprajty jednotek tak, aby ladily s V6 stylem (�ástě�ný příspěvek od Voz-Duh)
-- Přidána podpora na Androidu pro modifikace založené na Javě (aktuálně prakticky bez dokumentace)
-- Přidána vysoce kapacitní pamě%tový banka (2x2) pro logické procesory
-- Vyvážení hry
diff --git a/fastlane/metadata/android/cs-CZ/full_description.txt b/fastlane/metadata/android/cs-CZ/full_description.txt
deleted file mode 100644
index 112ccaf515..0000000000
--- a/fastlane/metadata/android/cs-CZ/full_description.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Vytvoř propracovaný výrobní řetězec dopravníků, abys naládoval munici do věží, vyrobil materiály pro stavění a ubránil své stavby před vlnami nepřátel. Hraj s Tvými přáteli koopera�ně napří� platformami, nebo je vyzvi v týmové hře hrá�ů proti sobě.
-
-Hra:
-- Vytvoř vrty a dopravníky pro přesun zdrojů do Tvého jádra. 
-- Použij výrobní bloky pro vytvoření pokro�ilých materiálů.
-- Postav drony pro automatické těžení zdrojů, pomoc se stavěním a vybudování a ochraně své základny.
-- Rozváděj kapaliny a bojuj s požárem.
-- Posilni výrobu dodate�ným chlazením a promaž obranné i výrobní bloky.
-
-Kampaň:
-- Projdi skrz 12 znovuhratelných předpřipravených zón s náhodným místem startu.
-- Sesbírej a vyšli zpět ze zón materiál.
-- Vynalezni nové bloky, abys rozjel výrobu.
-- Konfiguruj předměty, se kterými se vyšleš do zóny, abys byl lépe připraven.
-- V jednotlivých zónách plň rozdílné cíle mise.
-- Pozvi kamarády pro spole�né dokon�ení mise.
-- 120+ technologických bloků, dokážeš je všechny využít?
-- 19 různých typů dronů, mechů and lodí!
-
-Herní módy:
-- Přežití: Postav věže k obraně Tvého jádra před nepřátelskými jednotkami. Přežij tak dlouho, jak jen dokážeš, a ideálně ještě odešli své jádro zpět se sesbíranými surovinami pro zaplacení výzkumu. Připrav svou základnu pro střídavý útok vzdušného Záporáka.
-- Útok: Postav továrny na jednotky pro zni�ení nepřátelského jádra, zatímco zároveň ochraňuj svoji základnu před vlnami nepřátelských jednotek. Vytvoř různé typy podpůrných a obranných jednotek pro dosažení tohoto cíle.
-- Hrá�i proti sobě: Soupeř s jinými hrá�i v až 4 různých týmech, s cílem zni�it ostatní jádra. Vytvoř jednotky nebo úto� na cizí jádro rovnou ve svém mechu.
-- Pískoviště: Vyzkoušej si hru s nekone�nými zdroji surovin a bez nepřátelských hrozeb. Použij bloky dostupné pouze v pískovišti aby sis otestoval svůj nový nápad a pokud budeš chtít, můžeš si na vyžádání nechat seslat nepřátelské jednotky.
-
-Vlastní hra a podpora napří� herními platformami:
-- 12 vestavěných map pro vlastní hry, navíc ke kampani
-- Hraj kooperativně, proti sobě nebo na pískovišti
-- Připoj se k  veřejnému serveru nebo pozvi přátele do svého vlastního soukromého sezení
-- Nastavitelná herní pravidla: Změn cenu bloků, nepřátelské statistiky, po�áte�ní předměty, �asování vln atd.
-- Mix herních režimů: Smíchej dohromady hru hrá�ů proti sobě (PvP) a hrá�ů proti prostředí (PvE)
-
-Editor map:
-- Nakresli si novou mapu s vestavěným editorem 
-- Upravuj a dej si náhled staveb přímo ve hře
-- Konfigurovatelné nástroje: Změň, jak se každý nástroj chová
-- Silný systém pro generování map, s mnoha různými typy filtrů pro procedurální manipulaci s terénem - vytvoř úžasnou mapu za 5 minut!
-- Přidej zašumění, zkreslení, vyhlazení, prolnutí, zrcadlení, rozptýlení, generování rud a náhodného terénu do svých map
-- Konfiguruj náhodné generování rudy, řek a surovin
-- Konfiguruj rozestavění nepřátelských vln
-- Sdílej vyexportované mapy v dílně Steamu
-- Nastav pravidla pro základní mapy
-- Použij 75+ různých bloků
diff --git a/fastlane/metadata/android/cs-CZ/short_description.txt b/fastlane/metadata/android/cs-CZ/short_description.txt
deleted file mode 100644
index 706cd5e9c8..0000000000
--- a/fastlane/metadata/android/cs-CZ/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hra typu tower-defense s otevřeným koncem, zaměřená na řízení zdrojů.
diff --git a/fastlane/metadata/android/cs-CZ/summary.txt b/fastlane/metadata/android/cs-CZ/summary.txt
deleted file mode 100644
index 706cd5e9c8..0000000000
--- a/fastlane/metadata/android/cs-CZ/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hra typu tower-defense s otevřeným koncem, zaměřená na řízení zdrojů.
diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
deleted file mode 100644
index 84717be4ba..0000000000
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Baue komplexe Produktionsketten aus Förderbändern, um deine Geschütztürme mit Munition zu versorgen. Stelle Materialien her, um deine Fabrik zu vergrößern und sie vor Gegnerwellen zu schützen. Spiele mit deinen Freunden in plattformübergreifenden Partien oder fordere sie zum Kampf heraus.
-
-Dieses Tower-Defense-Spiel bietet:
-- 24 Karten
-- Eine Kampagne, die ins Spiel einführt und einen Forschungsbaum enthält
-- 4 mächtige Bosse
-- Transportsysteme für Materialien, Flüssigkeiten und Strom
-- 19 verschiedene Einheiten, die du kommandieren kannst
-- Mehrspielerpartien im lokalen Netzwerk oder über einen Server
-
-Mithilfe eines eingebauten Editors können eigene Karten und Gegnerwellen erstellt werden. Die Spielregeln kannst du flexibel nach deinen Wünschen anpassen.
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
deleted file mode 100644
index b3e1651c66..0000000000
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verteidige deine Basis mit einer Fabrik in diesem Sandbox-Spiel.
diff --git a/fastlane/metadata/android/de-DE/summary.txt b/fastlane/metadata/android/de-DE/summary.txt
deleted file mode 100644
index b3e1651c66..0000000000
--- a/fastlane/metadata/android/de-DE/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verteidige deine Basis mit einer Fabrik in diesem Sandbox-Spiel.
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/de-DE/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/en-US/changelogs/100.1.txt b/fastlane/metadata/android/en-US/changelogs/100.1.txt
deleted file mode 100644
index 53c981258b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/100.1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added fallback mod loading for poorly formatted old mods
-- Fixed infinite building range
-- Fixed impact reactors being able to blow up core on servers
-- Fixed liquid bridges passing backwards
-- Updated various translations
diff --git a/fastlane/metadata/android/en-US/changelogs/100.txt b/fastlane/metadata/android/en-US/changelogs/100.txt
deleted file mode 100644
index 362a138fae..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/100.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added experimental lighting system - can be enabled in custom game rules
-- Added power diode block (Contributed by Quezler)
-- Added plated conduit block (Contributed by Quezler)
-- Added light block for dark maps only
-- Improved pulse conduit speed (Contributed by Quezler)
-- Improved building priority
-- New permissive mod parsing format (HJSON)
-- Fixed a few incorrect consumption displays in blocks
-- Fixed 'underwater' ores in editor
diff --git a/fastlane/metadata/android/en-US/changelogs/101.1.txt b/fastlane/metadata/android/en-US/changelogs/101.1.txt
deleted file mode 100644
index 0f00ca0c5c..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/101.1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-- Added safer mod loading system - errors should no longer crash, but display a log
-- Added new Cyrllic font
-- Added range display and stats for repair point
-- Whitelisted some more classes for scripting
-- Fixed scripting not working on some devices [Android]
-- Fixed power node desync
-- Fixed some blocks not showing up in drill mining list
diff --git a/fastlane/metadata/android/en-US/changelogs/101.txt b/fastlane/metadata/android/en-US/changelogs/101.txt
deleted file mode 100644
index d53a88571c..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/101.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-- Added various new features for modding - see documentation
-- Added server block state autosync
-- Added support for Thai font
-- Added JS scripting - unstable, not well tested
-- Fixed liquid junction to item bridge crash
-- Fixed launch items not saving
-- General maintenance bugfixes and translation updates
diff --git a/fastlane/metadata/android/en-US/changelogs/102.1.txt b/fastlane/metadata/android/en-US/changelogs/102.1.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/102.1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/102.2.txt b/fastlane/metadata/android/en-US/changelogs/102.2.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/102.2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/102.txt b/fastlane/metadata/android/en-US/changelogs/102.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/102.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/103.1.txt b/fastlane/metadata/android/en-US/changelogs/103.1.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/103.1.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/103.2.txt b/fastlane/metadata/android/en-US/changelogs/103.2.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/103.2.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/103.3.txt b/fastlane/metadata/android/en-US/changelogs/103.3.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/103.3.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/103.txt b/fastlane/metadata/android/en-US/changelogs/103.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/103.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/104.1.txt b/fastlane/metadata/android/en-US/changelogs/104.1.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/104.1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/104.2.txt b/fastlane/metadata/android/en-US/changelogs/104.2.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/104.2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/104.3.txt b/fastlane/metadata/android/en-US/changelogs/104.3.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/104.3.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/104.4.txt b/fastlane/metadata/android/en-US/changelogs/104.4.txt
deleted file mode 100644
index 4790ed135d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/104.4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Updated feature suggestion link
-- Updated translations
-- Fixed modified player name persisting after server is exited
-- Added solar power multiplier rule
diff --git a/fastlane/metadata/android/en-US/changelogs/104.5.txt b/fastlane/metadata/android/en-US/changelogs/104.5.txt
deleted file mode 100644
index 4790ed135d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/104.5.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Updated feature suggestion link
-- Updated translations
-- Fixed modified player name persisting after server is exited
-- Added solar power multiplier rule
diff --git a/fastlane/metadata/android/en-US/changelogs/104.txt b/fastlane/metadata/android/en-US/changelogs/104.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/104.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/12203.txt b/fastlane/metadata/android/en-US/changelogs/12203.txt
deleted file mode 100644
index 8cefa14d20..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/12203.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Fixed incorrect attribution in credits; music was made by "A Drop A Day"
-- Removed unneeded 3.5 upgrade dialog that sometimes showed up in main menu
-- Added information dialog regarding v4 beta
diff --git a/fastlane/metadata/android/en-US/changelogs/12205.txt b/fastlane/metadata/android/en-US/changelogs/12205.txt
deleted file mode 100644
index d2fbea0415..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/12205.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Fixed incorrect attribution in credits; music was made by "A Drop A Day"
-- Removed unneeded 3.5 upgrade dialog that sometimes showed up in main menu
-- Added information dialog regarding v4 beta
-- Fixed Discord link
diff --git a/fastlane/metadata/android/en-US/changelogs/26593.txt b/fastlane/metadata/android/en-US/changelogs/26593.txt
deleted file mode 100644
index 7e281e161b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/26593.txt
+++ /dev/null
@@ -1 +0,0 @@
-sound.
diff --git a/fastlane/metadata/android/en-US/changelogs/27434.txt b/fastlane/metadata/android/en-US/changelogs/27434.txt
deleted file mode 100644
index 0228878dee..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/27434.txt
+++ /dev/null
@@ -1 +0,0 @@
-everything
diff --git a/fastlane/metadata/android/en-US/changelogs/27476.txt b/fastlane/metadata/android/en-US/changelogs/27476.txt
deleted file mode 100644
index f7a9042cc4..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/27476.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fixed some minor sound/multiplayer issues
diff --git a/fastlane/metadata/android/en-US/changelogs/27689.txt b/fastlane/metadata/android/en-US/changelogs/27689.txt
deleted file mode 100644
index f849f7a245..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/27689.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bugfixes
diff --git a/fastlane/metadata/android/en-US/changelogs/27770.txt b/fastlane/metadata/android/en-US/changelogs/27770.txt
deleted file mode 100644
index 06f22342a3..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/27770.txt
+++ /dev/null
@@ -1 +0,0 @@
-Added ambient sounds for machines.
diff --git a/fastlane/metadata/android/en-US/changelogs/27997.txt b/fastlane/metadata/android/en-US/changelogs/27997.txt
deleted file mode 100644
index 9b26aa3618..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/27997.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The first release of version 4.0; an update that has been in the works for over a year.
-Extensive changes, including new gamemodes, customizable rules, a new editor, new graphics, new enemies, unit production, new progression, a campaign, and more. See the in-game changelog link for specific details of what has been added and removed over the past year.
diff --git a/fastlane/metadata/android/en-US/changelogs/28409.txt b/fastlane/metadata/android/en-US/changelogs/28409.txt
deleted file mode 100644
index 72fac509ef..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/28409.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed multiplayer not syncing positions and shots correctly on certain networks or situations.
-Various other bugfixes.
diff --git a/fastlane/metadata/android/en-US/changelogs/29547.txt b/fastlane/metadata/android/en-US/changelogs/29547.txt
deleted file mode 100644
index 362a138fae..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29547.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added experimental lighting system - can be enabled in custom game rules
-- Added power diode block (Contributed by Quezler)
-- Added plated conduit block (Contributed by Quezler)
-- Added light block for dark maps only
-- Improved pulse conduit speed (Contributed by Quezler)
-- Improved building priority
-- New permissive mod parsing format (HJSON)
-- Fixed a few incorrect consumption displays in blocks
-- Fixed 'underwater' ores in editor
diff --git a/fastlane/metadata/android/en-US/changelogs/29550.txt b/fastlane/metadata/android/en-US/changelogs/29550.txt
deleted file mode 100644
index 53c981258b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29550.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added fallback mod loading for poorly formatted old mods
-- Fixed infinite building range
-- Fixed impact reactors being able to blow up core on servers
-- Fixed liquid bridges passing backwards
-- Updated various translations
diff --git a/fastlane/metadata/android/en-US/changelogs/29553.txt b/fastlane/metadata/android/en-US/changelogs/29553.txt
deleted file mode 100644
index d53a88571c..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29553.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-- Added various new features for modding - see documentation
-- Added server block state autosync
-- Added support for Thai font
-- Added JS scripting - unstable, not well tested
-- Fixed liquid junction to item bridge crash
-- Fixed launch items not saving
-- General maintenance bugfixes and translation updates
diff --git a/fastlane/metadata/android/en-US/changelogs/29556.txt b/fastlane/metadata/android/en-US/changelogs/29556.txt
deleted file mode 100644
index d53a88571c..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29556.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-- Added various new features for modding - see documentation
-- Added server block state autosync
-- Added support for Thai font
-- Added JS scripting - unstable, not well tested
-- Fixed liquid junction to item bridge crash
-- Fixed launch items not saving
-- General maintenance bugfixes and translation updates
diff --git a/fastlane/metadata/android/en-US/changelogs/29558.txt b/fastlane/metadata/android/en-US/changelogs/29558.txt
deleted file mode 100644
index 0f00ca0c5c..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29558.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-- Added safer mod loading system - errors should no longer crash, but display a log
-- Added new Cyrllic font
-- Added range display and stats for repair point
-- Whitelisted some more classes for scripting
-- Fixed scripting not working on some devices [Android]
-- Fixed power node desync
-- Fixed some blocks not showing up in drill mining list
diff --git a/fastlane/metadata/android/en-US/changelogs/29561.txt b/fastlane/metadata/android/en-US/changelogs/29561.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29561.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/29564.txt b/fastlane/metadata/android/en-US/changelogs/29564.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29564.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/29567.txt b/fastlane/metadata/android/en-US/changelogs/29567.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29567.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/29570.txt b/fastlane/metadata/android/en-US/changelogs/29570.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29570.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/29573.txt b/fastlane/metadata/android/en-US/changelogs/29573.txt
deleted file mode 100644
index f8244a4b0b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29573.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added new map view w/ panning and scrolling
-- Added block health rule
-- Added more internal teams for alternative gamemodes
-- Added features for improved server modding
-- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)
diff --git a/fastlane/metadata/android/en-US/changelogs/29584.txt b/fastlane/metadata/android/en-US/changelogs/29584.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29584.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/29586.txt b/fastlane/metadata/android/en-US/changelogs/29586.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29586.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/29589.txt b/fastlane/metadata/android/en-US/changelogs/29589.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29589.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/29591.txt b/fastlane/metadata/android/en-US/changelogs/29591.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29591.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/29594.txt b/fastlane/metadata/android/en-US/changelogs/29594.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29594.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/29597.txt b/fastlane/metadata/android/en-US/changelogs/29597.txt
deleted file mode 100644
index fa41c882ac..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29597.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added new icons w/ smooth scaling
-- Added liquid void (Contributed by @GioIacca9)
-- Added bridge opacity slider (Contributed by @Quezler)
-- Added "underflow" gate (opposite of overflow gate)
-- Added "emojis" for most blocks and items into the font
-- Added new tech tree layout w/ better mod support
-- Added game log file, stored in data folder
-- Added new separator sprite/animation
-- Added list of affinity tiles to stats of certain blocks
diff --git a/fastlane/metadata/android/en-US/changelogs/29603.txt b/fastlane/metadata/android/en-US/changelogs/29603.txt
deleted file mode 100644
index a268ddebde..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29603.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Fixed incorrect line numbers in script errors
-- Fixed black screen caused by bloom on some devices
-- Fixed some music issues with sound playing at 0% [Android]
-- Fixed client IDs resetting
-- Fixed data resetting between specific versions [Android]
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Optimized and cleaned up conveyors
-- Tweaked power block palette
diff --git a/fastlane/metadata/android/en-US/changelogs/29607.txt b/fastlane/metadata/android/en-US/changelogs/29607.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29607.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/29609.txt b/fastlane/metadata/android/en-US/changelogs/29609.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29609.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/29612.txt b/fastlane/metadata/android/en-US/changelogs/29612.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29612.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/29616.txt b/fastlane/metadata/android/en-US/changelogs/29616.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29616.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/29618.txt b/fastlane/metadata/android/en-US/changelogs/29618.txt
deleted file mode 100644
index 6f3e27fb4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29618.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optimized and cleaned up conveyors
-- Made unloaders take items from blocks in equal amounts
-- Added server categories (Partially contributed by @Quezler)
-- Added require() function for scripts (Contributed by @DeltaNedas)
-- Added color gradient for battery status (Contributed by @Arkanic (eventually))
-- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them
diff --git a/fastlane/metadata/android/en-US/changelogs/29620.txt b/fastlane/metadata/android/en-US/changelogs/29620.txt
deleted file mode 100644
index 4790ed135d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29620.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Updated feature suggestion link
-- Updated translations
-- Fixed modified player name persisting after server is exited
-- Added solar power multiplier rule
diff --git a/fastlane/metadata/android/en-US/changelogs/29623.txt b/fastlane/metadata/android/en-US/changelogs/29623.txt
deleted file mode 100644
index 4790ed135d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29623.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Updated feature suggestion link
-- Updated translations
-- Fixed modified player name persisting after server is exited
-- Added solar power multiplier rule
diff --git a/fastlane/metadata/android/en-US/changelogs/29659.txt b/fastlane/metadata/android/en-US/changelogs/29659.txt
deleted file mode 100644
index 77646b10bd..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29659.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 076169ca4d..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29661.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- 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
deleted file mode 100644
index cd151c8499..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29664.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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/en-US/changelogs/29670.txt b/fastlane/metadata/android/en-US/changelogs/29670.txt
deleted file mode 100644
index 3a1e1f7b28..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29670.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Mindustry 6.0 is now in beta. This means most mechanics outside of the campaign have been more or less finalized. Any significant new content is unlikely to be added.
-
-- Added Foreshadow turret
-- Added Tsunami turret (initial implementation by Slava0135, sprite by EyeOfDarkness)
-- Added logic unit control system
-- Added space floor block
-- Added button to center map to editor
-- Added rule setting for enemy lights
-- Changed armored conduits to not leak
diff --git a/fastlane/metadata/android/en-US/changelogs/29672.txt b/fastlane/metadata/android/en-US/changelogs/29672.txt
deleted file mode 100644
index 04c1a277ad..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29672.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Fixed "host game" crash, as well as some other prominent bugs
-- Logic: Breaking change: All coordinates are now in tiles, not in "world units"
-- Logic: Added sensors for ammo (units/turrets)
-- Campaign: Added research button in mobile multiplayer (check pause menu)
-- Campaign: Added tech tree sharing in multiplayer - only the host can research
-- Campaign: Re-added sector invasions, any sector near an enemy base can be invaded
diff --git a/fastlane/metadata/android/en-US/changelogs/29675.txt b/fastlane/metadata/android/en-US/changelogs/29675.txt
deleted file mode 100644
index 36a7033ea8..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29675.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-- Added 4 new custom game maps (untested)
-- Added new stats to unit info
-- Added buttons to clear campaign research+saves
-- Added fog weather
-- Added weather to some custom game maps
-- Added support for weather in JSON mods
-- Added better control sync for commanded units
-- Added recipe display for reconstructors
-- Added titanium fuse ammo
-- Made campaign load research from older versions (5.0)
-- Campaign: Added more schematics for bases to use
-- router.
diff --git a/fastlane/metadata/android/en-US/changelogs/29678.txt b/fastlane/metadata/android/en-US/changelogs/29678.txt
deleted file mode 100644
index b484064b86..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29678.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Fixed several issues related to the locate logic instruction
-- Fixed enemy water spawns not appearing
-- Fixed many various issues related to the campaign
-- Fixed player camera not resetting its position on new game
-- Fixed illuminator being unplaceable in campaign in daylight
-- Improved item sprites slightly
-- Balancing of campaign waves
-- Logic: Added configure instruction for controlling certain blocks
-- Added extra starting items to ground zero
diff --git a/fastlane/metadata/android/en-US/changelogs/29685.txt b/fastlane/metadata/android/en-US/changelogs/29685.txt
deleted file mode 100644
index 092195960a..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29685.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added basic descriptions & details to new blocks/units
-- Balancing
-- Improved casing ejection effects in turrets/units
-- Logic: Added draw sub-instruction to render an icon of an item/unit/block
-- Campaign: Reduced research costs
-- Campaign: Added info indicating maximum simulated waves survived
-- Campaign: Fixed many issues related to base attack simulations
-- Campaign: Less extreme waves
-- Campaign: Slightly easier bosses
diff --git a/fastlane/metadata/android/en-US/changelogs/29688.txt b/fastlane/metadata/android/en-US/changelogs/29688.txt
deleted file mode 100644
index a752b711fe..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29688.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Fixed meltdowns settings themselves on fire
-- Added memory counter to FPS display
-- Added button to export crash logs
diff --git a/fastlane/metadata/android/en-US/changelogs/29691.txt b/fastlane/metadata/android/en-US/changelogs/29691.txt
deleted file mode 100644
index 181d3edb28..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29691.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Improved icons
-- Improved unit rotation visuals when moving and building/mining
-- Decreased command limit of early game flying units to reduce PvP rushing
-- Made core units unlock on spawn
-- Switched to a new, unified audio framework for all platforms
-- Added new sound effects and loops
-- Added new music
-- Added community server groups with optional titles and a hide button
-- Added editor search bar (Contributed by @summetdev)
diff --git a/fastlane/metadata/android/en-US/changelogs/29694.txt b/fastlane/metadata/android/en-US/changelogs/29694.txt
deleted file mode 100644
index 857e5f9a7f..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29694.txt
+++ /dev/null
@@ -1 +0,0 @@
-- Fixed many various sound-related bugs, such as music playing after application exit
diff --git a/fastlane/metadata/android/en-US/changelogs/29697.txt b/fastlane/metadata/android/en-US/changelogs/29697.txt
deleted file mode 100644
index d187e2042e..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29697.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Fixed server weather-related crash
-- Fixed music not loading on certain systems
-- Added sounds for quad unit
diff --git a/fastlane/metadata/android/en-US/changelogs/29699.txt b/fastlane/metadata/android/en-US/changelogs/29699.txt
deleted file mode 100644
index d187e2042e..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29699.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Fixed server weather-related crash
-- Fixed music not loading on certain systems
-- Added sounds for quad unit
diff --git a/fastlane/metadata/android/en-US/changelogs/29702.txt b/fastlane/metadata/android/en-US/changelogs/29702.txt
deleted file mode 100644
index 5e5fe92e21..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29702.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-- Sound fixes for various platforms
-- Added a few new sound effects
-- Added stats for unit weapons (Contributed by @genNAowl)
-- Logic: Added logical AND operation
-- Disabled automatic targeting of derelict structures
-- Campaign: Many various bugfixes
-- Campaign: Added random water pool generation
-- Campaign: Added more preset sectors
-- Campaign: Removed item/liquid research costs, items are now discovered upon production
-- Campaign: More scrap generation
diff --git a/fastlane/metadata/android/en-US/changelogs/29706.txt b/fastlane/metadata/android/en-US/changelogs/29706.txt
deleted file mode 100644
index ab381c91e6..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29706.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Fixed file chooser crash [Android]
-- Fixed time stopping after sector capture
-- Moved Ruinous Shores map to more approppriate location
diff --git a/fastlane/metadata/android/en-US/changelogs/29713.txt b/fastlane/metadata/android/en-US/changelogs/29713.txt
deleted file mode 100644
index 618ce38525..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29713.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Fixed research not using resources
-- Fixed capturing other sectors in campaign counting as a capture in current sector
-- Fixed incorrect shots/sec for turrets
-- Fixed resources being unlocked in custom games
-- Made campaign co-op games automatically send maps upon switching sectors instead of disconnecting
diff --git a/fastlane/metadata/android/en-US/changelogs/29716.txt b/fastlane/metadata/android/en-US/changelogs/29716.txt
deleted file mode 100644
index bcf3708d75..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29716.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Yes, it's another one. Get ready for more rapid-fire releases.
-
-- Fixed sound not working [Android]
-- Fixed sound being muffled at start of game
-- Fixed continuous lasers setting shooters on fire
-- Fixed deconstruction area not being queued [Mobile]
-- Limited logic symbols to 40 characters
-- Added "Launching From" info to sector launch dialog
-- Added final campaign sector (untested!)
diff --git a/fastlane/metadata/android/en-US/changelogs/29719.txt b/fastlane/metadata/android/en-US/changelogs/29719.txt
deleted file mode 100644
index f1f09303d5..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29719.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Added tutorial hints (Can be disabled in settings)
-- Fixed game crashing on systems without audio devices
-- Removed game startup dialog
-- Campaign: Balancing of certain preset sectors
-- Campaign: Made attacks less frequent
-- Campaign: Shifted AI bases toward poles
-- Campaign: Increased resource quantities near poles
-- Campaign: Fixed sectors being accessible after defeat
-- Campaign: Fixed AI builders sometimes blocking ground unit paths
diff --git a/fastlane/metadata/android/en-US/changelogs/29723.txt b/fastlane/metadata/android/en-US/changelogs/29723.txt
deleted file mode 100644
index c07b6541ec..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29723.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Only a few days left until stable 6.0 release now. The campaign should now be playable; I've done a playthrough and fixed all the bugs and irregularities I encountered.
-
-Aside from internal modding API changes and potential bugfixes, 6.0 should not have any more additions.
-
-- Added basalt boulder decoration block
-- Added hint about generator use & power transfer
-- Made power node placement smarter
-- Buffed Lancer turret
-
-Campaign: 
diff --git a/fastlane/metadata/android/en-US/changelogs/29726.txt b/fastlane/metadata/android/en-US/changelogs/29726.txt
deleted file mode 100644
index 52dda104eb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29726.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fixed broken blocks increasing exponentially, leading to runaway memory usage/lag
-- Fixed incorrect planet dialog layout on certain devices
diff --git a/fastlane/metadata/android/en-US/changelogs/29730.txt b/fastlane/metadata/android/en-US/changelogs/29730.txt
deleted file mode 100644
index c98275f647..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29730.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This should be one of the last beta builds. In a couple of days, I will make a final release with the most recent translation bundles & bugfixes.
-
-- Fixed infinitely looping Vela laser sound
-- Fixed fire not burning on tar
-- Disabled fire for items with flammability <= 1 (this means coal bombing no longer causes fire)
-- Disabled unit explosion team damage
-- Disabled core unit crash damage
-- Disabled automatic linking of adjacent bridges
-
-Campaign:
diff --git a/fastlane/metadata/android/en-US/changelogs/29733.txt b/fastlane/metadata/android/en-US/changelogs/29733.txt
deleted file mode 100644
index da6bfa3221..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29733.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-The final beta build.
-
-- Updated link to wiki modding guide, now points to new wiki
-- Fixed weaving missiles consistently moving off to one direction
-- Fixed units shooting fast bullets on servers in certain conditions
-- Fixed some crashes
-- Made construction of rotated blocks free/instant (i.e. equivalent to manually rotating it)
-
-Campaign:
-- Better production calculation system
-- Fixed deconstruction counting as production
diff --git a/fastlane/metadata/android/en-US/changelogs/29736.txt b/fastlane/metadata/android/en-US/changelogs/29736.txt
deleted file mode 100644
index d8fa4d35cc..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29736.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-After more than 9 months of development, 6.0 is finally here. There have been far too many changes to reasonably list here, so I'll go over the highlights.
-
-Units:
-
-- The unit system has been completely reworked
-- All unit sprites have been re-drawn and cleaned up
-- Many new unit types have been added
-- Player-specific pads and unit-specific factories have been removed
-
-
-Campaign:
-
-
-
-
-
-
-
-
-
-Maps:
-
diff --git a/fastlane/metadata/android/en-US/changelogs/29738.txt b/fastlane/metadata/android/en-US/changelogs/29738.txt
deleted file mode 100644
index d8fa4d35cc..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29738.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-After more than 9 months of development, 6.0 is finally here. There have been far too many changes to reasonably list here, so I'll go over the highlights.
-
-Units:
-
-- The unit system has been completely reworked
-- All unit sprites have been re-drawn and cleaned up
-- Many new unit types have been added
-- Player-specific pads and unit-specific factories have been removed
-
-
-Campaign:
-
-
-
-
-
-
-
-
-
-Maps:
-
diff --git a/fastlane/metadata/android/en-US/changelogs/29741.txt b/fastlane/metadata/android/en-US/changelogs/29741.txt
deleted file mode 100644
index 45be741658..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29741.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Fixed two rare crashes
-- Made units depend on their production materials in tech tree
-- Made conveyors replaceable by distributors
-- Translation updates
diff --git a/fastlane/metadata/android/en-US/changelogs/29744.txt b/fastlane/metadata/android/en-US/changelogs/29744.txt
deleted file mode 100644
index 670ec7a7c0..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29744.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-Yeah, it's another hotfix. I missed these during earlier testing.
-
-- Fixed research deadlock caused by blocks requiring optional inputs as research
-- Possible fix for "Unsupported combination of formats" startup error
diff --git a/fastlane/metadata/android/en-US/changelogs/29747.txt b/fastlane/metadata/android/en-US/changelogs/29747.txt
deleted file mode 100644
index f5612f502b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29747.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Added disclaimer for community servers
-- Added hints concerning core upgrades and numbered sectors
-- Decreased spore storm opacity
-- Made items stay inside reconstructors when rebuilding (Contributed by @Quezler)
-- Made early game procedural sectors slightly easier
-- Fixed some blocks having duplicate research dependencies
-- Fixed legacy research not being cleared after first import
diff --git a/fastlane/metadata/android/en-US/changelogs/29750.txt b/fastlane/metadata/android/en-US/changelogs/29750.txt
deleted file mode 100644
index 19b92fc1cb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29750.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Leaving sectors while guardians are present is now heavily penalized
-- Made community servers sort by ping
-- Changed "global items" to "total items"
-- Added hint about core item incineration
-- Made sector landing zones display on map when visible but not unlocked
diff --git a/fastlane/metadata/android/en-US/changelogs/29753.txt b/fastlane/metadata/android/en-US/changelogs/29753.txt
deleted file mode 100644
index 19b92fc1cb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29753.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Leaving sectors while guardians are present is now heavily penalized
-- Made community servers sort by ping
-- Changed "global items" to "total items"
-- Added hint about core item incineration
-- Made sector landing zones display on map when visible but not unlocked
diff --git a/fastlane/metadata/android/en-US/changelogs/29755.txt b/fastlane/metadata/android/en-US/changelogs/29755.txt
deleted file mode 100644
index 19b92fc1cb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29755.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Leaving sectors while guardians are present is now heavily penalized
-- Made community servers sort by ping
-- Changed "global items" to "total items"
-- Added hint about core item incineration
-- Made sector landing zones display on map when visible but not unlocked
diff --git a/fastlane/metadata/android/en-US/changelogs/29757.txt b/fastlane/metadata/android/en-US/changelogs/29757.txt
deleted file mode 100644
index 19b92fc1cb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29757.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Leaving sectors while guardians are present is now heavily penalized
-- Made community servers sort by ping
-- Changed "global items" to "total items"
-- Added hint about core item incineration
-- Made sector landing zones display on map when visible but not unlocked
diff --git a/fastlane/metadata/android/en-US/changelogs/29759.txt b/fastlane/metadata/android/en-US/changelogs/29759.txt
deleted file mode 100644
index 19b92fc1cb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29759.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Leaving sectors while guardians are present is now heavily penalized
-- Made community servers sort by ping
-- Changed "global items" to "total items"
-- Added hint about core item incineration
-- Made sector landing zones display on map when visible but not unlocked
diff --git a/fastlane/metadata/android/en-US/changelogs/29761.txt b/fastlane/metadata/android/en-US/changelogs/29761.txt
deleted file mode 100644
index 19b92fc1cb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29761.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Leaving sectors while guardians are present is now heavily penalized
-- Made community servers sort by ping
-- Changed "global items" to "total items"
-- Added hint about core item incineration
-- Made sector landing zones display on map when visible but not unlocked
diff --git a/fastlane/metadata/android/en-US/changelogs/29763.txt b/fastlane/metadata/android/en-US/changelogs/29763.txt
deleted file mode 100644
index 19b92fc1cb..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29763.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Leaving sectors while guardians are present is now heavily penalized
-- Made community servers sort by ping
-- Changed "global items" to "total items"
-- Added hint about core item incineration
-- Made sector landing zones display on map when visible but not unlocked
diff --git a/fastlane/metadata/android/en-US/changelogs/29766.txt b/fastlane/metadata/android/en-US/changelogs/29766.txt
deleted file mode 100644
index bccc1e789c..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29766.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Fixed certain sectors having infinite waves in very specific situations
-- Fixed various crashes
-- Fixed community servers not displaying on Linux
-- Fixed some logic UI bugs
-- Fixed Distort filter not working in map post-generation
-- Fixed clients in multiplayer not getting item unlocks
-- Fixed enemy AI blocking ground unit paths in some circumstances
-- Made night in campaign slightly less dark
diff --git a/fastlane/metadata/android/en-US/changelogs/29769.txt b/fastlane/metadata/android/en-US/changelogs/29769.txt
deleted file mode 100644
index 7aec4dd10b..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29769.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Fixed rebuilding a core near vault causing resources to drop to 1K
-- Fixed captured sectors getting locked
-
-Campaign multiplayer changes:
-
-- New host research is now carried over to clients
-- Clients can now use their research even if the host doesn't have it
-- Clients can now research new tech in multiplayer
-- Added a hint that explains this information
diff --git a/fastlane/metadata/android/en-US/changelogs/29772.txt b/fastlane/metadata/android/en-US/changelogs/29772.txt
deleted file mode 100644
index 46192a9571..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29772.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Slightly increased Lancer build cost
-- Double-tapping now enters a campaign map (Contributed by @joshuaptfan)
-- Minor logic memory optimizations - block/sensor constants are no longer stored in every processor
-- Doubled surge smelter item capacity
-- Made Fungal Pass slightly easier
-- Fixed some rare crashes
-- Fixed unit spawn shockwave appearing too late
diff --git a/fastlane/metadata/android/en-US/changelogs/29775.txt b/fastlane/metadata/android/en-US/changelogs/29775.txt
deleted file mode 100644
index b4550ee5ce..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29775.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Fixed a common crash related to planet selection
diff --git a/fastlane/metadata/android/en-US/changelogs/29788.txt b/fastlane/metadata/android/en-US/changelogs/29788.txt
deleted file mode 100644
index 7dfe3fe10f..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29788.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Decreased junction item capacity - this may cause slight desync on servers running previous 121 versions, servers are advised to update
-- Many various small bugfixes
diff --git a/fastlane/metadata/android/en-US/changelogs/29795.txt b/fastlane/metadata/android/en-US/changelogs/29795.txt
deleted file mode 100644
index b72b5f0a4a..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29795.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Fixed Quad AI
-- Fixed crash in conveyor upgrade pathing
-- Fixed other various crashes
-- Made payload pickups prioritize units in blocks instead of the blocks themselves
-- Increased foreshadow coolant effectiveness, but slightly decreased rotation speed
-- Improved space skybox scaling
-- Added building damage stats to bullets
-- Added WIP mod browser for GitHub mods
-- Added bridge link preview
diff --git a/fastlane/metadata/android/en-US/changelogs/29798.txt b/fastlane/metadata/android/en-US/changelogs/29798.txt
deleted file mode 100644
index 3e6f6ebac5..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/29798.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[This is a truncated changelog, see Github for full notes]
-- Various minor bugfixes
-- Increased power source output again
-- Improved building beam visuals
-- Improved peformance of maps with many adjacent power nodes/batteries
-- Disabled weather in editor
diff --git a/fastlane/metadata/android/en-US/changelogs/721.txt b/fastlane/metadata/android/en-US/changelogs/721.txt
deleted file mode 100644
index 4e72aaf3d6..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/721.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Fixed most formatted numbers being missing from Spanish translation
-- Fixed wave timer being extremely slow at high TPS with multithreading enabled
-- Fixed scrolling on player menu causing the whole screen to pan
-- Updated Polish translation
-- Updated Russian translation with new text (Thanks to @Prosta4okua)
diff --git a/fastlane/metadata/android/en-US/changelogs/89.txt b/fastlane/metadata/android/en-US/changelogs/89.txt
deleted file mode 100644
index 89827aa74c..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/89.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-- Fixed iOS/Android having frozen multiplayer
-- Fixed Veins map not having a silicon source
-- Fixed inaccurate enemy shoot prediction
-- Fixed server crash exploit
-- Fixed panes not scrolling with mousewheel [Desktop]
-- Fixed incorrect PvP team assignment
-- Fixed not being able to tap 'ok' in UI scale changed dialog
-- Fixed not being able to play on PvP maps without orange team
-- Fixed error message on exiting server after saved map
-- Fixed attack map completion displaying low rank
-- Possibly fixed Mac version not starting
-- Switched to TCP from UDP - experimental
-- Added descriptive display when failing to connect due to version mismatch
-- Improved smoothness of multiplayer building, rotation and collision
-- Improved power node linking
diff --git a/fastlane/metadata/android/en-US/changelogs/93.txt b/fastlane/metadata/android/en-US/changelogs/93.txt
deleted file mode 100644
index c0e7d256af..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/93.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-- Added new spawn animations w/ progress bar and names
-- Added configurable server whitelist based on player UUID
-- Added many new events for plugins
-- Added core land animation
-- Added player limit for servers
-- Added gamemode display for server/save lists
-- Added new filechooser for Android, fixes file access on Android 10
-- Added core storage space increase via adjacent vaults or containers
-- Made unloader be able to take items from any block
-- Improved votekick sensitivity
-- Fixed many various bugs
diff --git a/fastlane/metadata/android/en-US/changelogs/94.txt b/fastlane/metadata/android/en-US/changelogs/94.txt
deleted file mode 100644
index f967815789..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/94.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-- Fixed tutorial displaying Desktop text on Android
-- Fixed common crash related to status effects
-- Fixed launch pads launching entire core contents
-- Fixed new maps overwriting old ones without warning
-- Fixed phase conveyors operating on near-0 power
-- Fixed incorrect message dialog layout
-- Fixed some crashes
-- Reverted removal of router passback
diff --git a/fastlane/metadata/android/en-US/changelogs/95.txt b/fastlane/metadata/android/en-US/changelogs/95.txt
deleted file mode 100755
index ba151cae49..0000000000
--- a/fastlane/metadata/android/en-US/changelogs/95.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-- Fixed zone exploit caused by import of zone saves
-- Reverted to old file chooser when possible [Android]
-- New multithreaded pathfinding implementation
-- Made attack command have units move toward enemy spawnpoints in survival
-- Made votekick still tempban people after disconnection
-- Added 'rally' command to  command center, replaces old patrol command
-- Added full Android keyboard support, completely removes any touch input, adds desktop keys
-- Added ability to rotate lines while placing [Desktop] [Contributed by Synray]
-- Added votekick button
-- Added display of power capacity in power graphs
-- Added armored conveyors - more armor than titanium, don't accept items from sides
-- Added message blocks - editable text
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 51d9d7b4b3..76c308848a 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,14 +1,34 @@
-Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies. Play with your friends in cross-platform multiplayer co-op games, or challenge them in team-based PvP matches.
+Mindustry is a factory-building game with tower defense and RTS elements. Create elaborate supply chains to feed ammo into your turrets, produce materials to use for building, and construct units. Command units to capture enemy bases, and expand your production. Defend your core from waves of enemies.
 
-Features include:
-- 24 built-in maps
-- A campaign, complete with a tech tree and unlockable areas
-- 4 powerful wave bosses to defeat
-- Energy, liquid and item transportation systems
-- 19 different types of drones, mechs and ships
-- 120+ technology blocks to master
-- 75+ different environmental blocks
-- Cross-platform multiplayer via local networks or dedicated servers
-- Custom game rules: Change block costs, enemy stats, starting items, wave timing and more
-- A powerful editor, with tools to randomly generate ores, terrain, decoration and apply symmetry to maps
-- Customizable map wave layouts
+<h2>Gameplay Features</h2>
+ 
+- Use production blocks to create a wide variety of advanced materials
+- Defend your structures from waves of enemies
+- Play with your friends in cross-platform multiplayer co-op games, or challenge them in team-based PvP matches
+- Distribute liquids and fight constant challenges, like outbreaks of fire or enemy flier raids
+- Get the most out of your production by supplying optional coolant and lubricant
+- Produce a wide variety of units for automatic management of your base or assault on enemy bases
+- Set up assembly lines to construct armies of mechanized units
+- Use your units to square up against fully functional enemy bases
+
+
+<h2>Campaign</h2>
+
+- Conquer the planets Serpulo and Erekir as you advance through 35 hand-made maps and 250+ procedurally generated sectors
+- Capture territory and set up factories to produce resources while you play other sectors
+- Defend your sectors from periodic invasions
+- Coordinate resource distribution between sectors via launch pads
+- Research new blocks to fuel progress
+- Invite your friends to complete missions together
+- 250+ technology blocks to master
+- 50+ different types of drones, mechs and ships
+
+
+<h2>Custom Games & Cross-Platform Multiplayer</h2>
+
+- 16+ built in maps for custom games, in addition to two entire campaigns
+- Play co-op, PvP or sandbox
+- Join a public dedicated server, or invite friends to your own private session
+- Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more
+- Full functional map editor with scripting support
+- Built-in mod browser & mod support
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
deleted file mode 100644
index 90e27dddca..0000000000
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
deleted file mode 100644
index 705e880a20..0000000000
Binary files a/fastlane/metadata/android/en-US/images/icon.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
deleted file mode 100644
index 44949de11d..0000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
deleted file mode 100644
index 7d37a27105..0000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
deleted file mode 100644
index 53525bbd13..0000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
deleted file mode 100644
index 091f53243c..0000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
deleted file mode 100644
index 952aa2aa54..0000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
deleted file mode 100644
index 3830432e4f..0000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
deleted file mode 100644
index 8fa92e537d..0000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png
deleted file mode 100644
index 286795f87f..0000000000
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png
deleted file mode 100644
index 7d37a27105..0000000000
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png
deleted file mode 100644
index 091f53243c..0000000000
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index ac569c2687..eb919fe0ce 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-A factory-based sandbox tower defense game.
+An open-ended factory management game with RTS and tower defense elements
diff --git a/fastlane/metadata/android/en-US/summary.txt b/fastlane/metadata/android/en-US/summary.txt
index ac569c2687..eb919fe0ce 100644
--- a/fastlane/metadata/android/en-US/summary.txt
+++ b/fastlane/metadata/android/en-US/summary.txt
@@ -1 +1 @@
-A factory-based sandbox tower defense game.
+An open-ended factory management game with RTS and tower defense elements
diff --git a/fastlane/metadata/android/es-ES/changelogs/100.1.txt b/fastlane/metadata/android/es-ES/changelogs/100.1.txt
deleted file mode 100644
index 182fef996f..0000000000
--- a/fastlane/metadata/android/es-ES/changelogs/100.1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
--Solución de bugs
--Actualizadas algunas traducciones
--Agregada la opción de volver atrás al cargar ciertos mods antiguos.
diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt
deleted file mode 100644
index f1ff659fef..0000000000
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Crea elaboradas cadenas de suministros para cargar tus torretas, produce materiales para crear estructuras y defiendelas de oleadas de enemigos. Juega con tus amigos en un multijugador cooperativo multiplataforma, o pelea contra ellos en batallas PvP por equipos.
-
-Características:
-- 24 mapas oficiales integrados
-- Una campaña, con un completo árbol de tecnologias y áreas desbloqueables
-- 4 poderosos jefes de oleada que derrotar
-- Sistemas de transporte de energía, minerales y líquidos
-- 19 tipos de drones, mecanoides y naves
-- Mas de 120 bloques desbloqueables por tecnologias
-- Más de 75 bloques de ambiente, con distintos biomas por descubrir.
-- Multijugador multiplataforma tanto por redes locales (LAN) como en servidores dedicados.
-- Reglas personalizadas: Configura costos, fuerza de los enemigos, recursos iniciales, tiempo entre oleadas, y más
-- Un poderoso editor, con herramientas para generar terreno y ores automaticamente, decorar y aplicar simetría.
-- Oleadas personalizables.
diff --git a/fastlane/metadata/android/es-ES/short_description.txt b/fastlane/metadata/android/es-ES/short_description.txt
deleted file mode 100644
index 515d4b8068..0000000000
--- a/fastlane/metadata/android/es-ES/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Un Tower Defense Sandbox basado en Fábricas.
diff --git a/fastlane/metadata/android/es-ES/summary.txt b/fastlane/metadata/android/es-ES/summary.txt
deleted file mode 100644
index a59e404e54..0000000000
--- a/fastlane/metadata/android/es-ES/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Un Tower Defense Sandbox basado en Fábricas
diff --git a/fastlane/metadata/android/es-ES/title.txt b/fastlane/metadata/android/es-ES/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/es-ES/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
deleted file mode 100644
index 691e49eedb..0000000000
--- a/fastlane/metadata/android/fr-FR/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Crée des chaînes de ravitaillement pour tes défenses, produis les matériaux de construction pour aggrandir et protéger tes bâtiments contre des vagues d'ennemis. Joue avec tes amis grâce à des jeux multijoueurs co-op cross-plateformes, ou défie-les dans des parties en JcJ par équipe.
-
-Caractéristiques:
-- 24 cartes integrées
-- Une campagne, complète avec un arbre de recherche et des zones à débloquer
-- 4 puissants boss de fin de vague à vaincre
-- Systèmes de transport d'énergie, liquides et objets
-- 19 différents types de drones, méchas et vaisseaux
-- 120+ blocs technologiques à maîtriser
-- 75+ différents blocs environnementaux
-- Multijoueur cross-plateforme via réseau local or serveurs dédiés
-- Règles de jeu personnalisables: Change le coût des structures, les stats des ennemis, les ressources de départ, fréquence des vagues et plus
-- Un éditeur puissant dotés d'outils pour générer aléatoirement des minéraux, le terrain, des décorations et appliquer une symétrie au terrain.
-- Vagues d'ennemis personnalisables
diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
deleted file mode 100644
index f511b816dd..0000000000
--- a/fastlane/metadata/android/fr-FR/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-L'industrie au service de ce tower defense.
diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/fr-FR/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/hi-IN/full_description.txt b/fastlane/metadata/android/hi-IN/full_description.txt
deleted file mode 100644
index acdb71229f..0000000000
--- a/fastlane/metadata/android/hi-IN/full_description.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-बारूद को अपने ब�र�ज में खिलाने के लि� कन�वेयर बेल�ट की विस�तृत आपूर�ति श�रृंखला बना�ं, निर�माण के लि� उपयोग करने के लि� सामग�री का उत�पादन करें, और द�श�मनों की लहरों से अपनी संरचनाओं का बचाव करें। क�रॉस-प�लेटफ़ॉर�म मल�टीप�लेयर सह-ऑप गेम�स में अपने दोस�तों के साथ खेलें, या टीम-आधारित PvP मैचों में उन�हें च�नौती दें।
-
-इसमें शामिल है:
-
-- 24 निर�मित नक�शे
-- �क अभियान, �क टेक ट�री और अनलॉक करने योग�य क�षेत�रों के साथ पूरा
-- 4 शक�तिशाली लहर मालिकों को हराने के लि�
-- ऊर�जा, तरल और आइटम परिवहन प�रणाली
-- 19 विभिन�न प�रकार के ड�रोन, मेच और जहाज
-- मास�टर करने के लि� 120+ प�रौद�योगिकी ब�लॉक
-- 75+ विभिन�न पर�यावरण ब�लॉक
-- स�थानीय नेटवर�क या समर�पित सर�वरस के माध�यम से क�रॉस-प�लेटफॉर�म मल�टीप�लेयर
-- कस�टम खेल के नियम: ब�लॉक की लागत, द�श�मन के आ�कड़े, श�रू आइटम, लहर समय और अधिक बदलें
-- �क शक�तिशाली संपादक, यादृच�छिक रूप से अयस�कों, इलाकों, सजावट को बनाने और मानचित�रों के लि� समरूपता को लागू करने के लि� उपकरण के साथ
-- अन�कूलन योग�य मानचित�र तरंग लेआउट
diff --git a/fastlane/metadata/android/hi-IN/short_description.txt b/fastlane/metadata/android/hi-IN/short_description.txt
deleted file mode 100644
index 8d38239525..0000000000
--- a/fastlane/metadata/android/hi-IN/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-�क कारखाने आधारित सैंडबॉक�स टॉवर रक�षा खेल।
diff --git a/fastlane/metadata/android/hi-IN/summary.txt b/fastlane/metadata/android/hi-IN/summary.txt
deleted file mode 100644
index 8d38239525..0000000000
--- a/fastlane/metadata/android/hi-IN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-�क कारखाने आधारित सैंडबॉक�स टॉवर रक�षा खेल।
diff --git a/fastlane/metadata/android/hi-IN/title.txt b/fastlane/metadata/android/hi-IN/title.txt
deleted file mode 100644
index 37ffbf60b2..0000000000
--- a/fastlane/metadata/android/hi-IN/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-मिन�द�स�त�र�यि (Mindustry)
diff --git a/fastlane/metadata/android/hu-HU/full_description.txt b/fastlane/metadata/android/hu-HU/full_description.txt
new file mode 100644
index 0000000000..103c1fa665
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/full_description.txt
@@ -0,0 +1,34 @@
+A Mindustry egy gyárépítő játék Toronyvédő és RTS elemekkel. Készíts bonyolult ellátási láncokat, hogy lőszert juttass a lövegtornyokba, termelj az építkezéshez használható nyersanyagokat, és állíts elő egységeket. Irányítsd az egységeket, hogy elfoglald az ellenséges bázisokat, és bővítsd a termelésedet. Védd meg a magodat a hullámokban támadó ellenségtől.
+
+<h2>A játékmenet szolgáltatásai</h2>
+ 
+- Használd a gyártó-blokkokat a legkülönfélébb fejlett nyersanyagok létrehozásához
+- Védd meg az építményeidet a hullámokban támadó ellenségektől
+- Játssz vállvetve a barátaiddal a platformokon átívelő többjátékos módban, vagy hívd ki őket csapat alapú PvP meccsekre
+- Oszd szét a folyadékokat, és küzdj meg az állandó kihívásokkal, mint például a tűzkitörések, vagy az ellenséges repülőgépek rajtaütéseivel
+- Hozd ki a legtöbbet a termelésből az opcionális hűtő- és kenőanyag-ellátással
+- Egységek széles skáláját állíthatod elő a bázisod automatikus irányításához és az ellenséges bázisok megtámadásához
+- �llíts fel összeszerelősorokat a gépesített egységek hadainak előállításához
+- Használd az egységeidet a hatékonyan felszerelt ellenséges bázisok ellen
+
+
+<h2>Hadjárat</h2>
+
+- Hódítsd meg a Serpulo és az Erekir bolygót, miközben 35 kézzel készített pályán és 250+ procedurálisan generált szektoron keresztül haladsz
+- Foglalj el területeket és építs gyárakat, hogy nyersanyagokat termelhess, miközben más szektorokban játszol
+- Védd meg a szektorokat az időszakos invázióktól
+- Koordináld az erőforrások elosztását a szektorok között az indítóállások felhasználásával
+- Fedezz fel új épületeket, gyárakat a fejlődés elősegítése érdekében
+- Hívd meg barátaidat, hogy együtt teljesítsék a küldetéseket
+- 250+ technológiai épület használatának elsajátítása
+- 50+ különböző típusú drón, mech és hajó
+
+
+<h2>Egyéni és platformokon átívelő többjátékos módok</h2>
+
+- 16+ beépített pálya az egyéni játékokhoz, a két teljes értékű hadjárat mellett
+- Játssz kooperatív módban, PvP-ben, vagy a homokozóban
+- Hozz létre nyilvános dedikált szervert, vagy hívd meg a barátaidat a saját privát munkamenetedre
+- Testre szabható játékszabályok: Változtasd meg az épületek építési költségeit, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését és így tovább
+- Teljes funkcionalitású térképszerkesztő, parancsfájl támogatással
+- Beépített mod böngésző és mod támogatás
diff --git a/fastlane/metadata/android/hu-HU/short_description.txt b/fastlane/metadata/android/hu-HU/short_description.txt
new file mode 100644
index 0000000000..d0788ec62e
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/short_description.txt
@@ -0,0 +1 @@
+Egy nyílt végű gyártás-menedzselős játék Toronyvédő és RTS elemekkel.
diff --git a/fastlane/metadata/android/hu-HU/summary.txt b/fastlane/metadata/android/hu-HU/summary.txt
new file mode 100644
index 0000000000..d0788ec62e
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/summary.txt
@@ -0,0 +1 @@
+Egy nyílt végű gyártás-menedzselős játék Toronyvédő és RTS elemekkel.
diff --git a/fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/hu-HU/title.txt
similarity index 100%
rename from fastlane/metadata/android/cs-CZ/title.txt
rename to fastlane/metadata/android/hu-HU/title.txt
diff --git a/fastlane/metadata/android/in/full_description.txt b/fastlane/metadata/android/in/full_description.txt
deleted file mode 100644
index cd5adae89b..0000000000
--- a/fastlane/metadata/android/in/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Buat rantai pasokan pengantar berjalan yang rumit untuk memasukkan amunisi ke menara Anda, menghasilkan bahan yang akan digunakan untuk membangun, dan mempertahankan bangunan Anda dari gelombang musuh. Bermain dengan teman-teman Anda dalam game co-op multipemain lintas platform, atau tantang mereka dalam pertandingan PvP berbasis tim.
-
-Fitur:
-- 24 peta bawaan
-- Kampanye, lengkap dengan pohon teknologi dan area yang dapat dibuka
-- 4 bos gelombang yang kuat untuk dikalahkan
-- Sistem transportasi energi, cairan dan barang
-- 19 jenis drone, mech, dan kapal
-- 120+ blok teknologi untuk dikuasai
-- 75+ blok lingkungan yang berbeda
-- Multipemain lintas platform melalui jaringan lokal atau server khusus
-- Aturan permainan khusus: Ubah biaya blok, statistik musuh, item awal, waktu gelombang, dan lainnya
-- Editor yang andal, dengan alat untuk menghasilkan sumber daya, medan, dekorasi, dan menerapkan simetri ke peta secara acak
-- Tata letak gelombang peta yang dapat disesuaikan
diff --git a/fastlane/metadata/android/in/short_description.txt b/fastlane/metadata/android/in/short_description.txt
deleted file mode 100644
index 19ec900c68..0000000000
--- a/fastlane/metadata/android/in/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sebuah game pertahanan menara sandbox berbasis pabrik.
diff --git a/fastlane/metadata/android/in/summary.txt b/fastlane/metadata/android/in/summary.txt
deleted file mode 100644
index 19ec900c68..0000000000
--- a/fastlane/metadata/android/in/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sebuah game pertahanan menara sandbox berbasis pabrik.
diff --git a/fastlane/metadata/android/in/title.txt b/fastlane/metadata/android/in/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/in/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/it-IT/changelogs/102.2.txt b/fastlane/metadata/android/it-IT/changelogs/102.2.txt
deleted file mode 100644
index 718fa43d87..0000000000
--- a/fastlane/metadata/android/it-IT/changelogs/102.2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Aggiunta una nuova modalità di visualizzazione della mappa con panoramica e scorrimento
-- Aggiunta regola della salute dei blocchi
-- Aggiunte ulteriori squadre interne per modalità di gioco alternative
-- Aggiunte funzionalità per migliorare il server modding
-- Cambiamenti interni: il package ora è "mindustry" invece di "io.anuke.mindustry" (i plugin non funzioneranno)
diff --git a/fastlane/metadata/android/it-IT/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
deleted file mode 100644
index 071cef4ed0..0000000000
--- a/fastlane/metadata/android/it-IT/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Crea elaborate catene di nastri trasportatori per rifornire di ammonizioni le tue torrette, produci materiali per la costruzione e difendi le tue strutture contro le ondate nemiche. Gioca con i tuoi amici con la modalità multigiocatore cross-platform o sfidali in partite PvP a squadre.
-
-Funzionalità:
-- 24 mappe incluse
-- Modalità campagna, completa con albero delle scoperte e aree sbloccabili
-- 4 potenti ondate con boss da sconfiggere
-- Sistemi di trasporto di energia, liquidi e oggetti
-- 19 tipi di droni, mechs e navi
-- 120+ blocchi tecnologici da padroneggiare
-- 75+ blocchi ambientali
-- Modalità multigiocatore cross-platform attraverso la rete locale o i server dedicati
-- Regole di gioco personalizzate: modifica i costi dei blocchi, le statistiche nemiche, gli oggetti di partenza, i tempi tra le ondate e molto altro
-- Un editor potente, con strumenti che permettono di generare i minerali in modo casuale, il terreno, le decorazioni e applicare simmetria alle mappe 
-- Ondate delle mappe completamente personalizzabili
diff --git a/fastlane/metadata/android/it-IT/short_description.txt b/fastlane/metadata/android/it-IT/short_description.txt
deleted file mode 100644
index 335469c50a..0000000000
--- a/fastlane/metadata/android/it-IT/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Un gioco sandbox basato sulla produzione e sulla difesa.
diff --git a/fastlane/metadata/android/it-IT/summary.txt b/fastlane/metadata/android/it-IT/summary.txt
deleted file mode 100644
index 335469c50a..0000000000
--- a/fastlane/metadata/android/it-IT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Un gioco sandbox basato sulla produzione e sulla difesa.
diff --git a/fastlane/metadata/android/it-IT/title.txt b/fastlane/metadata/android/it-IT/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/it-IT/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/ja-JP/full_description.txt b/fastlane/metadata/android/ja-JP/full_description.txt
deleted file mode 100644
index 8b0405139b..0000000000
--- a/fastlane/metadata/android/ja-JP/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ベルトコンベアーを巧���置���弾薬をタレット��り込��建設�必���料を集���敵�らコアを守り切��。����フレンド�クロスプラットフォーム�マル�プレイ����互���力��り��ーム�戦��り�よ�。
-
-Mindustry�特徴:
-- 24個�マップ
-- テックツリーや新��エリア�解放を目指�
-- 4��パワフル�ボス
-- 電気�液体�アイテム�輸�システム
-- 19個�個性的�ドローンや機体
-- 120以上�テクノロジーブロックを使����
-- 75以上�異�る環境ブロック
-- ローカル�ットワークや専用サー�ー��クロスプラットフォーム�マル�プレイ��能
-- カスタマイズ�能�ゲーム: ブロック�コスト変更�敵�ステータス��期アイテム�ウェーブ�タイミング ��…
-- 強力�エディター�鉱石をランダム�生���り�地形�デコレーション�左�対称�マップも制作�能
-- マップ���ウェーブ�構�もカスタマイズ�能
diff --git a/fastlane/metadata/android/ja-JP/short_description.txt b/fastlane/metadata/android/ja-JP/short_description.txt
deleted file mode 100644
index 093c9d2745..0000000000
--- a/fastlane/metadata/android/ja-JP/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-工場ベース�サンドボックスタワーディフェンスゲーム。
diff --git a/fastlane/metadata/android/ja-JP/title.txt b/fastlane/metadata/android/ja-JP/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/ja-JP/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/ko-KR/changelogs/29769.txt b/fastlane/metadata/android/ko-KR/changelogs/29769.txt
deleted file mode 100644
index faa6e80415..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/29769.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[� 변경�� 몹시 �략�었습니다. 모든 변경�� 볼려면 Github를 보십시오.]
-- 코어 옆 창고를 재건설해서 1천� ��� 사�지는 문제� 수정
-- �령한 지역들� 잠금�는 현� 수정
-
-캠페� 멀티플레�어 변경�:
-
-- �제 호스트가 새로 해금한 것들� ���언트�게� �어�
-- �제 ���언트는 호스트가 가지지 않았��� 그들� 해금한 콘�츠를 사용할 수 있�
-- �제 ���언트는 멀티플레�어�서 새로운 콘�츠를 해금할 수 있�
-- � 정보를 설명하는 힌트 추가
diff --git a/fastlane/metadata/android/ko-KR/changelogs/29772.txt b/fastlane/metadata/android/ko-KR/changelogs/29772.txt
deleted file mode 100644
index f16b516f51..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/29772.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[� 변경�� 몹시 �략�었습니다. 모든 변경�� 볼려면 Github를 보십시오.]
-- 랜서 건설 비용� 약간 �승�
-- �제 � 번 터치하면 캠페� 지역으로 들어� (기여�: @joshuaptfan)
-- 부 로� 메모리 최�화 - � �� 모든 프로세서� 블�/센서 �수가 저장�지 않�
-- 설금 제련소� 아�템 저장량� 2배 �승함
-- Fungal Pass 를 약간 쉽게 만듬
-- 드문 �래쉬들� 수정
-- 유닛 스� 충격파가 너무 늦게 나오는 문제� 수정
diff --git a/fastlane/metadata/android/ko-KR/changelogs/29775.txt b/fastlane/metadata/android/ko-KR/changelogs/29775.txt
deleted file mode 100644
index 30dad43e6e..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/29775.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[� 변경�� 몹시 �략�었습니다. 모든 변경�� 볼려면 Github를 보십시오.]
-- 행성 지역과 관련� �한 �래쉬 수정
diff --git a/fastlane/metadata/android/ko-KR/changelogs/29795.txt b/fastlane/metadata/android/ko-KR/changelogs/29795.txt
deleted file mode 100644
index 878089e1e8..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/29795.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[� 변경�� 엄청 �략�었습니다. 모든 변경�� 볼려면 Github를 보십시오.]
-- 쿼드 AI 고침
-- 컨베�어 업그레�드 경로�서 �기는 �래쉬 고침
-- 다른 다양한 �래쉬들 고침
-- 화물� 픽업할 때, 유닛� 든 블�� 유닛� 블� �체보다 먼저 집히게 만듬
-- �어��우� 냉� 효율� �가, �신 ����를 약간 �소
-- 우주 스카�박스 스케�� 향�
-- 건물 �미지 정보를 탄환� 추가
-- 깃허브 모드를 위한 WIP 모드 브�우저 추가
-- 다리 연결 미리보기 추가
\ No newline at end of file
diff --git a/fastlane/metadata/android/ko-KR/changelogs/89.txt b/fastlane/metadata/android/ko-KR/changelogs/89.txt
deleted file mode 100644
index 6e34373cd9..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/89.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-- IOS/안드로�드�서 멀티플레�어 기능� 고장나는 오류를 해결했습니다.
-- Veins 맵� 실리콘� 재료를 반드시 �함하�� 수정�었습니다.
-- � 유닛� 잘못� 곳� 공격 예측지�으로 조준하는 오류를 해결했습니다.
-- 서버 오류 송출� 수정했습니다.
-- [PC] 마우스 휠 스�롤로 팬� �아가지 않� 오류를 해결했습니다.
-- PVP 팀 배정 오류를 해결했습니다.
-- '확�' 버튼� 누르지 않아� ui scale� 바뀌는 오류를 해결했습니다.
-- PVP 맵�서 주황색 팀� 없�경우 게임 시작� 안�는 오류를 해결했습니다.
-- 맵 저장 후 서버 퇴장시 나오는 오류 메세지를 수정했습니다.
-- 공격맵� �리어했� 때 낮� �수를 표시하는 오류를 해결했습니다.
-- 맥� 시작 오류를 해결했습니다.
-- UDP�서 TCP로 바꾸었습니다. - 실험�� 기능입니다.
-- 버전� 달� 서버 접�� 하지 못할시� 메세지를 추가했습니다.
-- 다수가 건설할시� 회전과 충�� 좀 � 매�러워졌습니다.
-- 전력 노드� 최대 연결 수를 �가시켰습니다.
diff --git a/fastlane/metadata/android/ko-KR/changelogs/93.txt b/fastlane/metadata/android/ko-KR/changelogs/93.txt
deleted file mode 100644
index 52dc74527a..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/93.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-- 플레�어 소환/부활 애니메�션� 진행� 바와 닉네임� 추가�었습니다.
-- 플레�어 UUID� 기반한 서버 화�트리스트 기능� 추가�었습니다.
-- 플러그� api� 많� �벤트들� 추가�었습니다.
-- 코어 착륙 애니메�션� 추가�었습니다.
-- 서버� 접� 플레�어 수 제한� 추가�었습니다.
-- 서버/게임 저장 파� �태� 게임모드가 추가�었습니다. 
-- 안드로�드� 새로운 파�선�기가 추가�고, 안드로�드 10�서 파� 접근 오류를 해결했습니다.
-- �제 코어� 최대 �� 보관량� 코어� 컨테�너 혹� 창고를 붙여 건설하는 것으로 �가가 가능합니다.
-- 언로�가 �제 �탑� 뺀 모든 블럭�서 ��� 추출가능합니다.
-- 투표 추방 기능� 좀 � 예민하게 바뀌었습니다.
-- 많� 오류를 해결했습니다.
diff --git a/fastlane/metadata/android/ko-KR/changelogs/94.txt b/fastlane/metadata/android/ko-KR/changelogs/94.txt
deleted file mode 100644
index 9f9884e549..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/94.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-- PC� 튜토리얼� 안드로�드� 나타나는 오류를 해결했습니다.
-- �반�� �태 효과와 관련�어 팅기는 오류를 해결했습니다. 
-- 발사대가 코어� 모든 ��� 출격시키는 오류를 해결했습니다.
-- 새로운 맵� 오래� 맵� �어쓸 때 경고가 표시�지 않는 오류를 해결했습니다.
-- 메타 컨베�어가 전력� 부족할 때� 작�하는 오류를 해결했습니다.
-- 다�얼로그가 잘못� 내용� 표시하는 오류를 해결했습니다.
-- �부 팅기는 오류를 해결했습니다.
-- 분배기� 역류제거가 롤백�었습니다.
diff --git a/fastlane/metadata/android/ko-KR/changelogs/95.txt b/fastlane/metadata/android/ko-KR/changelogs/95.txt
deleted file mode 100644
index 6d56411169..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/95.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-- 지역 �수를 불러오는 과정�서 �기는 오류 해결
-- [안드로�드] 파�선�기가 예전 버전으로 롤백�었습니다.
-* 바뀌지 않� 기기가 있� 수� 있습니다.
-- 유닛 경로 선�� �제 멀티스레드로 작업합니다.
-- �제 �존 모드� 때 지휘소�서 공격명령� 내릴 경우 유닛들� � 소환지�으로 ��합니다.
-- �제 투표로 추방당한 유저는 �정시간 해당 서버� 접�하지 못합니다.
-- 지휘소�서 '순찰' 명령� '집합' 명령으로 �체�었습니다.
-- 안드로�드 키보드 기능� 추가�었습니다. 해당 기능� 활성화� 경우 대부분� 터치 기능들� 비활성화�고, 대신 키보드를 사용하여 조작할 수 있습니다.
-- [Pc] 설계중� 때 방향� 회전시키는 기능� 추가�었습니다. [유저 Synray가 개발� 기여했습니다.]
-- 투표추방 버튼� 추가�었습니다.
-- 전력 �태 그래프� 전력 저장량� 추가�었습니다.
-- 장갑 컨베�어들� 추가�었습니다. 기능 : 티타늄 컨베�어보다 � 많� 체력� 있지만, 컨베�어가 아닌 블럭� 옆�서 ��� 보낼 경우 그 ��� 받지 않습니다.
-- 메모 블럭� 추가�었습니다. 기능 : 글� �� 수 있습니다!
diff --git a/fastlane/metadata/android/ko-KR/changelogs/99.6.txt b/fastlane/metadata/android/ko-KR/changelogs/99.6.txt
deleted file mode 100644
index ca8395b39a..0000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/99.6.txt
+++ /dev/null
@@ -1 +0,0 @@
-- �제 안드로�드�서� 설계� 기능� 지�합니다. 건물들� 복사하여 설계�를 만들고 붙여넣어 보세요!
diff --git a/fastlane/metadata/android/ko-KR/full_description.txt b/fastlane/metadata/android/ko-KR/full_description.txt
deleted file mode 100644
index dee45ee1dd..0000000000
--- a/fastlane/metadata/android/ko-KR/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-정�한 컨베�어 벨트 공급�� 만들어 �탑� 탄약� 공급하고 건물� 사용할 재료를 �산하여 �� 공격으로부터 기지를 방어하십시오. �로스 플렛� 멀티플레�어�서 친구와 함께 협� 대형 혹� 어려운 맵�서 협�전� 하거나, 팀 pvp를 통해 실력� �랑해 보세요.
-
-�함� 특징들 :
-- 16개� 기본 맵들
-- 해금 가능 지역과 테� 트리로 구성� 캠페�
-- 당신� 파괴하기 위한 강력한 보스
-- 전력, 액체, �� 수송 시스템
-- 33가지� �기 다른 드론, 유닛, 배들
-- 120종류가 넘는 블럭들
-- 80가지가 넘는 환경 타� � 블럭들
-- 로컬 네트워� �는 전용 서버를 통한 �로스 플랫� 멀티플레�어
-- 사용� 정� 게임 규칙 : 블� 가격, � 스텟 변경, 시작 ��, 단계 대기시간 그 ��� 변경해보세요.
-- 맵� 광물, 지형, 장�� 랜�으로 �성하고, 대칭� 추가해보세요.
-- 맵 규칙� 마�대로 바꿔보세요.
diff --git a/fastlane/metadata/android/ko-KR/short_description.txt b/fastlane/metadata/android/ko-KR/short_description.txt
deleted file mode 100644
index 2990a8dd79..0000000000
--- a/fastlane/metadata/android/ko-KR/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-공장� 기반한 샌드박스형 타워디펜스 게임입니다!
diff --git a/fastlane/metadata/android/ko-KR/summary.txt b/fastlane/metadata/android/ko-KR/summary.txt
deleted file mode 100644
index 2990a8dd79..0000000000
--- a/fastlane/metadata/android/ko-KR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-공장� 기반한 샌드박스형 타워디펜스 게임입니다!
diff --git a/fastlane/metadata/android/ko-KR/title.txt b/fastlane/metadata/android/ko-KR/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/ko-KR/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/pl-PL/changelogs/100.1.txt b/fastlane/metadata/android/pl-PL/changelogs/100.1.txt
deleted file mode 100644
index e7056994ab..0000000000
--- a/fastlane/metadata/android/pl-PL/changelogs/100.1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Dodano awaryjne wczytywani modów dla źle przygotowanych modów na starsze wersje gry
-- Naprawiono nieskończony zasięg budowy
-- Naprawiono reaktor uderzeniowy mogący zniszczyć rdzeń na serwerze
-- Naprawiono most płynów działający wstecz
-- Zaktualizowano tłumaczenia
diff --git a/fastlane/metadata/android/pl-PL/changelogs/100.txt b/fastlane/metadata/android/pl-PL/changelogs/100.txt
deleted file mode 100644
index da309b7162..0000000000
--- a/fastlane/metadata/android/pl-PL/changelogs/100.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Dodano eksperymentalny system oświetlenia - może być aktywowany w menu własnych zasad gry
-- Dodano blok diody (dodane dzięki @Quezler)
-- Dodano opancerzoną rurę (dodane dzięki @Quezler)
-- Dodano bloki światła tylko dla ciemnych map
-- Polepszono prędkość przepływu rury pulsacyjnej (dodane dzięki @Quezler)
-- Polepszono priorytet budowy
-- Nowy format parsowania modów (HJSON)
-- Naprawiono wyświetlanie niepoprawnych wartości zużycia bloku
-- Naprawiono 'underwater' w edytorze
diff --git a/fastlane/metadata/android/pl-PL/changelogs/104.3.txt b/fastlane/metadata/android/pl-PL/changelogs/104.3.txt
deleted file mode 100644
index a0c7542103..0000000000
--- a/fastlane/metadata/android/pl-PL/changelogs/104.3.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Optymalizacja przenośników
-- Ekstraktor bierze po równo przedmioty z przylegających bloków
-- Utworzono kategorie serwerów (dodane dzięki @Quezler)
-- Dodano funckję require()  dla skryptów (dodane dzięki @DeltaNedas)
-- Dodano gradient kolorystyczny dla statusu baterii (dodane dzięki @Arkanic)
-- Zmieniono ładowanie skryptów: dla modów z więcej niż jednym plikiem skryptowym, główny plik musi nazywać się "main.js" oraz musi zawierać require() do pozostałych plików
diff --git a/fastlane/metadata/android/pl-PL/changelogs/104.4.txt b/fastlane/metadata/android/pl-PL/changelogs/104.4.txt
deleted file mode 100644
index 04976a469a..0000000000
--- a/fastlane/metadata/android/pl-PL/changelogs/104.4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Aktualizacja sugerowanych linków
-- Aktualizacja tłumaczeń
-- Poprawiono zmienianie nazwy gracza po tym jak serwer został zamknięty
-- Dodano mnożnik paneli słonecznych
diff --git a/fastlane/metadata/android/pl-PL/changelogs/104.5.txt b/fastlane/metadata/android/pl-PL/changelogs/104.5.txt
deleted file mode 100644
index 04976a469a..0000000000
--- a/fastlane/metadata/android/pl-PL/changelogs/104.5.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Aktualizacja sugerowanych linków
-- Aktualizacja tłumaczeń
-- Poprawiono zmienianie nazwy gracza po tym jak serwer został zamknięty
-- Dodano mnożnik paneli słonecznych
diff --git a/fastlane/metadata/android/pl-PL/full_description.txt b/fastlane/metadata/android/pl-PL/full_description.txt
deleted file mode 100644
index 03fe669cc8..0000000000
--- a/fastlane/metadata/android/pl-PL/full_description.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Twórz skomplikowane linie transportowe przy użyciu przenośników by zaopatrzyć wieżyczki w amunicję, produkować materiały używane do budowy, oraz broń swoje struktury przed falami wrogów. Graj ze swoimi przyjaciółmi w międzyplatformowych rozgrywkach wieloosobwych typu co-op, lub rzuć im wyzwanie w drużynowych rozgrywkach PvP.
-
-W grze znajdziesz:
-- 24 podstawowe mapy
-- KampaniÄ™ z drzewkiem rozwoju technologii i terenami do odblokowania
-- 4 potężne fale bossów
-- System zarządzania elektrycznością, transportem cieczy i przedmiotów
-- 19 unikatowych typów dronów, mechów i statków
-- 120+ bloków do użycia podczas gry
-- 75+ różnorodnych bloków terenu
-- Graj ze znajomymi przez sieć lokalną lub na serwerze dedykowanym
-- Zmieniaj zasady gry: Modyfikuj koszt budowy bloków, statystyki przeciwników, przedmioty na start, czas trwania tury i wiele więcej
-- Stwórz własną mapę przy użyciu wbudowanego edytora i popisz się kreatywnością z innymi
-- Sam zdecyduj skąd nadejdzie następny atak
-
diff --git a/fastlane/metadata/android/pl-PL/short_description.txt b/fastlane/metadata/android/pl-PL/short_description.txt
deleted file mode 100644
index 520c848bcf..0000000000
--- a/fastlane/metadata/android/pl-PL/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bazująca na przetrwaniu i zarządzaniu fabryką sandboxowa gra typu obrony wieży.
diff --git a/fastlane/metadata/android/pl-PL/summary.txt b/fastlane/metadata/android/pl-PL/summary.txt
deleted file mode 100644
index 33cdf2f65c..0000000000
--- a/fastlane/metadata/android/pl-PL/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-BazujÄ…ca na przetrwaniu i zarzÄ…dzaniu fabrykÄ… sandboxowa gra typu tower-defense.
diff --git a/fastlane/metadata/android/pl-PL/title.txt b/fastlane/metadata/android/pl-PL/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/pl-PL/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/pt-PT/changelogs/102.txt b/fastlane/metadata/android/pt-PT/changelogs/102.txt
deleted file mode 100644
index f1fb5da19e..0000000000
--- a/fastlane/metadata/android/pt-PT/changelogs/102.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Adicionado nova forma de ver mapas. Com panorâmica e rolagem
-- Foi adicionada regra de integridade do bloco
-- Adicionado mais equipes internas para modos de jogo alternativos
-- Adicionado recursos para melhorar a modificação do servidor
--Grande mudança interna: o pacote agora é "mindustry" em vez de "io.anuke.mindustry" (irá quebrar os plugins)
diff --git a/fastlane/metadata/android/pt-PT/full_description.txt b/fastlane/metadata/android/pt-PT/full_description.txt
deleted file mode 100644
index 78d122abe5..0000000000
--- a/fastlane/metadata/android/pt-PT/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Cria e elabora e fornece correntes de correias transportadoras para aumentar a munição das tuas torretas, produz materiais para usar em construções, e defende as tuas estruturas de ondas de inimigos. Joga com os teus amigos em multiplataforma multijogador jogos cooperativos, ou desafia eles em batalhas em equipa modo PvP.
-
-Recursos incluidos:
-- 24 mapas integrados
-- Uma campanha completa com uma estrutura tecnológica em árvore e áreas para desbloquear
-- 4 ondas de chefes poderosas para derrotar
-- Sistema de transporte de Energias, Líquidos e Itens
-- 19 tipos diferentes de drones, mechas e navios
-- Mais de 120 blocos de tecnologia para dominar
-- Mais de 75 diferentes blocos de ambiente
-- Multijogador multiplataforma através de redes locais ou servidores dedicados
-- Regras personalizadas do jogo: altere os custos de bloqueio, estatísticas do inimigo, itens iniciais, tempo das ondas e muito mais
-- Um editor poderoso, com ferramentas para gerar aleatoriamente minérios, terrenos, decoração e aplicar simetria a mapas
-- Layouts de rondas de mapa personalizáveis
diff --git a/fastlane/metadata/android/pt-PT/short_description.txt b/fastlane/metadata/android/pt-PT/short_description.txt
deleted file mode 100644
index 6ecbaf697a..0000000000
--- a/fastlane/metadata/android/pt-PT/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Um jogo de defesa de torre de sandbox baseado em construção.
diff --git a/fastlane/metadata/android/pt-PT/summary.txt b/fastlane/metadata/android/pt-PT/summary.txt
deleted file mode 100644
index 6ecbaf697a..0000000000
--- a/fastlane/metadata/android/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Um jogo de defesa de torre de sandbox baseado em construção.
diff --git a/fastlane/metadata/android/pt-PT/title.txt b/fastlane/metadata/android/pt-PT/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/pt-PT/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/ru-RU/changelogs/104.4.txt b/fastlane/metadata/android/ru-RU/changelogs/104.4.txt
deleted file mode 100644
index 49c499f087..0000000000
--- a/fastlane/metadata/android/ru-RU/changelogs/104.4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Обновлена ��ылка дл� предложений новых возможно�тей
-- Обновлены переводы
-- И�правлена ошибка, из-за которой им� игрока, изменённое �ервером, о�тавало�ь по�ле выхода
-- Добавлено правило множител� �олнечной �нергии
diff --git a/fastlane/metadata/android/ru-RU/changelogs/29713.txt b/fastlane/metadata/android/ru-RU/changelogs/29713.txt
deleted file mode 100644
index 848cf9b32f..0000000000
--- a/fastlane/metadata/android/ru-RU/changelogs/29713.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- И�правлено и��ледование не и�пользующее ре�ур�ы
-- И�правлен под�чёт захвата других �екторов в кампании как номер текущего �ектора
-- И�правлено неправильное значение вы�трелы/�екунду у турелей
-- И�правлены уже разблокированные ре�ур�ы в пользователь�ких играх
-- Сделана автоматиче�ка� отправка карт вме�то отключени� при переключении �екторов в режиме �овме�тного прохождени� кампании
diff --git a/fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt
deleted file mode 100644
index c69aa89b6f..0000000000
--- a/fastlane/metadata/android/ru-RU/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Создавайте �ложные логи�тиче�кие �ети дл� перено�а боеприпа�ов дл� турелей, добывайте ре�ур�ы дл� �троитель�тва и защищайте их от различных волн врагов. Играйте � друзь�ми в кро��платформенные многопользователь�кие кооперативные игры или бро�ьте им вызов в командных PvP-матчах.
-
-О�обенно�ти игры:
-- 24 в�троенные карты
-- Кампани� � полноценным технологиче�ким древом и прогре��ией карт
-- 4 вида мощных бо��ов
-- Си�темы дл� тран�порта �лектро�нергии, жидко�тей и ре�ур�ов
-- 19 видов дронов, мехов и кораблей
-- Более 120 блоков в техногиче�ком древе
-- Более 75 видов натуральных блоков
-- Кро��платформенна� многопользователь�ка� игра � поддержкой как и локальных �етей, так и �ерверов
-- Пользователь�кие на�тройки игры — измен�йте цену блоков, �илу врагов, количе�тво �тартовых ре�ур�ов, интервал между волнами и т.д.
-- Мощный редактор карт � ин�трументами дл� �лучайной генерации руд, рельефа, декораций, а также дл� �имметрии карт
-- �а�траиваемые ра�кладки волн дл� карт
diff --git a/fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt
deleted file mode 100644
index 69f3e28476..0000000000
--- a/fastlane/metadata/android/ru-RU/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Заводо�троительна� игра-пе�очница в жанре башенна� защита. 
diff --git a/fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/ru-RU/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/uk/changelogs/100.txt b/fastlane/metadata/android/uk/changelogs/100.txt
deleted file mode 100644
index 3e7cafd4f6..0000000000
--- a/fastlane/metadata/android/uk/changelogs/100.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Додана ек�периментальна �и�тема о�вітленн�. Можна увімкнути у кори�тувацьких правилах гри.
-- Додано блок діоду (Спри�в Quezler).
-- Додано зміцнений трубопровід (Спри�в Quezler).
-- Додано блок о�вітлювача. Є тільки на темних мапах.
-- Підвищена швидкі�ть трубопровода (Спри�в Quezler).
-- Поліпшено пріоритет �порудженн�.
-- �овий дозвільний формат дл� модифікацій (HJSON).
-- Виправлено кілька неправильних відображень �поживанн� в блоках.
-- Виправлені «підводні» руди в редакторі мап.
diff --git a/fastlane/metadata/android/uk/changelogs/104.4 b/fastlane/metadata/android/uk/changelogs/104.4
deleted file mode 100644
index 9a5813fab6..0000000000
--- a/fastlane/metadata/android/uk/changelogs/104.4
+++ /dev/null
@@ -1,4 +0,0 @@
-- Оновлено по�иланн�, �ке веде на �торінку, де можна запропонувати нову можливі�ть
-- Оновлено переклади
-- Виправлено помилка, через �ку ім'� гравц�, змінене �ерером, залишаєть��
-- Додано кори�тувацьке правило — множник �он�чної енергії
diff --git a/fastlane/metadata/android/uk/changelogs/29547.txt b/fastlane/metadata/android/uk/changelogs/29547.txt
deleted file mode 100644
index 3e7cafd4f6..0000000000
--- a/fastlane/metadata/android/uk/changelogs/29547.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-- Додана ек�периментальна �и�тема о�вітленн�. Можна увімкнути у кори�тувацьких правилах гри.
-- Додано блок діоду (Спри�в Quezler).
-- Додано зміцнений трубопровід (Спри�в Quezler).
-- Додано блок о�вітлювача. Є тільки на темних мапах.
-- Підвищена швидкі�ть трубопровода (Спри�в Quezler).
-- Поліпшено пріоритет �порудженн�.
-- �овий дозвільний формат дл� модифікацій (HJSON).
-- Виправлено кілька неправильних відображень �поживанн� в блоках.
-- Виправлені «підводні» руди в редакторі мап.
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
deleted file mode 100644
index 6d0515099a..0000000000
--- a/fastlane/metadata/android/uk/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Створюйте �кладні �и�теми логі�тики дл� перене�енн� боєприпа�ів у башточки, видобувайте ре�ур�и дл� будівництва, і захищайте �воє �дро від різних хвиль ворогів. Грайте з друз�ми на різних платформах у кооперативні ігри, або киньте їм виклик в командних PvP-матчах.
-
-О�обливо�ті гри:
-- 24 вбудовані мапи
-- Кампані�, з повноцінним деревом технологій і прогре�ією мап
-- 4 види потужних бо�ів
-- Си�теми дл� тран�порту електроенергії, рідин і ре�ур�ів
-- 19 видів дронів, кораблів та наземних бойових одиниць
-- Понад 120 блоків у дереві технологій
-- Понад 75 видів блоків навколишнього �ередовища
-- Багатоплатформова багатокори�тувацька гра з підтримкою �к і локальних мереж, так і �ерверів
-- Кори�тувацькі налаштуванн� гри — ціну блоків, �ила ворогів, кількі�ть початкових ре�ур�ів, інтервал між хвил�ми, тощо
-- Редактор мап з не�кінченними можливо�т�ми, ін�трументами дл� випадкової генерації руд, рельєфу, декорацій, а також дл� �иметрії мап
-- Розкладки хвиль дл� мап можна налаштувати
diff --git a/fastlane/metadata/android/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
deleted file mode 100644
index fea6ef13fa..0000000000
--- a/fastlane/metadata/android/uk/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Виробнича пі�очниц� у жанрі «захи�т башт» (англ. — Tower Defence, TD).
diff --git a/fastlane/metadata/android/uk/summary.txt b/fastlane/metadata/android/uk/summary.txt
deleted file mode 100644
index d9a469925c..0000000000
--- a/fastlane/metadata/android/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Виробнича пі�очниц� у жанрі «баштовий захи�т» (англ. — Tower Defence, TD).
diff --git a/fastlane/metadata/android/uk/title.txt b/fastlane/metadata/android/uk/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/uk/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/android/zh-TW/full_description.txt b/fastlane/metadata/android/zh-TW/full_description.txt
deleted file mode 100644
index 6a0092cdbf..0000000000
--- a/fastlane/metadata/android/zh-TW/full_description.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-建立精密的輸�帶供應�，�供砲塔彈藥，生產建築原料，�護您的建築物並抵禦入侵的敵人。在跨平臺的多人�作�戲中和朋�一起玩，或在團隊 PvP 比賽中�他們挑戰。
-
-包�了以下特色：
-- 24 張內建地圖
-- 有科技樹與�解鎖�域的戰役
-- �擊敗 4 波強大的魔王
-- 能��液體與物��輸系統
-- 19 種��類型的無人機�機甲與飛船
-- 研究 120 種以上的科技
-- 75 種以上��的環境方塊
-- ���域網路或專用伺�器�玩跨平臺多人�戲
-- 自訂�戲�則：變更方塊花費�敵方屬性�起始物��敵人來襲的間隔時間等
-- 強大的編輯器，有工具�將噪音�變形�平滑�����稱�礦物生�與隨機地形套用到您的地圖上
-- 設定敵人攻擊佈局
diff --git a/fastlane/metadata/android/zh-TW/short_description.txt b/fastlane/metadata/android/zh-TW/short_description.txt
deleted file mode 100644
index fc87660b42..0000000000
--- a/fastlane/metadata/android/zh-TW/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-一款��資�管�的開放�塔防�戲。
diff --git a/fastlane/metadata/android/zh-TW/summary.txt b/fastlane/metadata/android/zh-TW/summary.txt
deleted file mode 100644
index fc87660b42..0000000000
--- a/fastlane/metadata/android/zh-TW/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-一款��資�管�的開放�塔防�戲。
diff --git a/fastlane/metadata/android/zh-TW/title.txt b/fastlane/metadata/android/zh-TW/title.txt
deleted file mode 100644
index e2842b447a..0000000000
--- a/fastlane/metadata/android/zh-TW/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mindustry
diff --git a/fastlane/metadata/steam/Simplified Chinese/achievements.vdf b/fastlane/metadata/steam/Simplified Chinese/achievements.vdf
index fbdadf9a19..c677a7eec9 100644
--- a/fastlane/metadata/steam/Simplified Chinese/achievements.vdf	
+++ b/fastlane/metadata/steam/Simplified Chinese/achievements.vdf	
@@ -1,109 +1,184 @@
-"lang"
-{
-	"Language"	"Simplified Chinese"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"�新"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"完�教程。"
-		"NEW_ACHIEVEMENT_20_1_NAME"	"�人斩�"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"累计击败1,000�敌人。"
-		"NEW_ACHIEVEMENT_20_2_NAME"	"�万人斩�"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"累计击败100,000�敌人。"
-		"NEW_ACHIEVEMENT_20_3_NAME"	"大气输�"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"累计�射10,000件物�。"
-		"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_7_NAME"	"冠军"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"赢得10场PvP比赛。"
-		"NEW_ACHIEVEMENT_20_8_NAME"	"速战速决"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"在攻击模�地区中在5波以内摧�敌方核心。"
-		"NEW_ACHIEVEMENT_20_9_NAME"	"核心雨"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"把你的核心�射到一个区域30次。"
-		"NEW_ACHIEVEMENT_20_10_NAME"	"顽强抵抗"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"存活100波。"
-		"NEW_ACHIEVEMENT_20_11_NAME"	"����"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"存活500波。"
-		"NEW_ACHIEVEMENT_20_12_NAME"	"研究者"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"研究所有科技。"
-		"NEW_ACHIEVEMENT_20_13_NAME"	"�形金刚"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"解�并�形�所有机甲。"
-		"NEW_ACHIEVEMENT_20_14_NAME"	"过载"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"用电力击打被水覆盖的敌人。"
-		"NEW_ACHIEVEMENT_20_15_NAME"	"借刀�人"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"用敌人的�弹摧�它自己。"
-		"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_19_NAME"	"夷为平地"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"摧�1,000个敌方方�。"
-		"NEW_ACHIEVEMENT_20_20_NAME"	"壮观的�难"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"引起��应堆过热爆炸。"
-		"NEW_ACHIEVEMENT_20_21_NAME"	"地图制造者"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"制造10次新地图。"
-		"NEW_ACHIEVEMENT_20_22_NAME"	"�览器"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"从创�工�上下载一次地图。"
-		"NEW_ACHIEVEMENT_20_23_NAME"	"创造者"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"上传一次地图到创�工�。"
-		"NEW_ACHIEVEMENT_20_24_NAME"	"�戮者"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"击败一次Boss"
-		"NEW_ACHIEVEMENT_20_25_NAME"	"探索者"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"解�战役模�所有地区。"
-		"NEW_ACHIEVEMENT_20_26_NAME"	"强迫症"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"完�所有地区的任务。"
-		"NEW_ACHIEVEMENT_20_29_NAME"	"第二�料"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"解��。"
-		"NEW_ACHIEVEMENT_20_31_NAME"	"第一�料"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"解�钛。"
-		"NEW_ACHIEVEMENT_21_0_NAME"	"�怖分�"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"将你的机甲装满爆炸性物�并自爆。"
-		"NEW_ACHIEVEMENT_21_1_NAME"	"开始了�"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"建造尖刀机甲工厂。"
-		"NEW_ACHIEVEMENT_21_2_NAME"	"�击�"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"用指挥中心�出攻击指令。"
-		"NEW_ACHIEVEMENT_21_3_NAME"	"蜂群"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"�时拥有100个��。"
-		"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_6_NAME"	"军队"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"总计建造1,000个机甲"
-		"NEW_ACHIEVEMENT_21_7_NAME"	"SR"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"在任一地区达到级别S。"
-		"NEW_ACHIEVEMENT_21_8_NAME"	"SSR"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"在所有地区达到级别S。"
-		"NEW_ACHIEVEMENT_21_9_NAME"	"���的下场"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"在敌人出生点死亡。"
-		"NEW_ACHIEVEMENT_21_10_NAME"	"被水淹没，�知所措"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"被淹死。"
-		"NEW_ACHIEVEMENT_21_11_NAME"	"收集者"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"将核心装满所有资�。"
-		"NEW_ACHIEVEMENT_21_12_NAME"	"忙碌"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"创建一个有10个玩家的�务器。"
-		"NEW_ACHIEVEMENT_21_13_NAME"	"无懈�击"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"建造熔�和幽�。"
-		"NEW_ACHIEVEMENT_21_14_NAME"	"上天"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"使用�射�。"
-		"NEW_ACHIEVEMENT_21_15_NAME"	"�人�能太自以为是"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"跳过两次�射机会�核心被敌人摧�。"
-		"NEW_ACHIEVEMENT_21_16_NAME"	"路由器邪教"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"建造两个相邻的路由器。"
-		"NEW_ACHIEVEMENT_21_17_NAME"	"�枪匹马"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"�放置一�方�存活10波。"
-		"NEW_ACHIEVEMENT_21_18_NAME"	"FFF团之力"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"使用硫�炮塔弹�。"
-		"NEW_ACHIEVEMENT_21_19_NAME"	"效率"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"用水或冷�液冷�炮塔。"
-		"NEW_ACHIEVEMENT_21_20_NAME"	"�典模�"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"�用�素化。"
-		"NEW_ACHIEVEMENT_21_21_NAME"	"学者"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"从游�中打开Wiki。"
-		"NEW_ACHIEVEMENT_21_22_NAME"	"硬核开头"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"�带10,000资�进入一个地区"
-		"NEW_ACHIEVEMENT_21_23_NAME"	"点�"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"�动冲击�应堆。"
-	}
-}
+"lang"
+{
+	"Language"	"schinese"
+	"Tokens"
+	{
+		"NEW_ACHIEVEMENT_20_1_NAME"	"好战"
+		"NEW_ACHIEVEMENT_20_1_DESC"	"摧�1000个敌方��。"
+		"NEW_ACHIEVEMENT_20_2_NAME"	"清洗"
+		"NEW_ACHIEVEMENT_20_2_DESC"	"摧�100,000个敌方��。"
+		"NEW_ACHIEVEMENT_20_5_NAME"	"无尽装�"
+		"NEW_ACHIEVEMENT_20_5_DESC"	"总共�射100,000个物�。"
+		"NEW_ACHIEVEMENT_20_6_NAME"	"��者"
+		"NEW_ACHIEVEMENT_20_6_DESC"	"赢得10场进攻模�游�。"
+		"NEW_ACHIEVEMENT_20_7_NAME"	"冠军"
+		"NEW_ACHIEVEMENT_20_7_DESC"	"赢得10场多人对战游�。"
+		"NEW_ACHIEVEMENT_20_8_NAME"	"闪电战"
+		"NEW_ACHIEVEMENT_20_8_DESC"	"在进攻区�中于5波内摧�敌方核心。"
+		"NEW_ACHIEVEMENT_20_9_NAME"	"核心雨"
+		"NEW_ACHIEVEMENT_20_9_DESC"	"�射核心30次。"
+		"NEW_ACHIEVEMENT_20_10_NAME"	"顽强抵抗"
+		"NEW_ACHIEVEMENT_20_10_DESC"	"存活100波。"
+		"NEW_ACHIEVEMENT_20_12_NAME"	"研究者"
+		"NEW_ACHIEVEMENT_20_12_DESC"	"研究所有科技。"
+		"NEW_ACHIEVEMENT_20_14_NAME"	"过载"
+		"NEW_ACHIEVEMENT_20_14_DESC"	"用闪电击中潮湿的敌人。"
+		"NEW_ACHIEVEMENT_20_15_NAME"	"�折"
+		"NEW_ACHIEVEMENT_20_15_DESC"	"用��的�弹�弹摧�自身。"
+		"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_19_NAME"	"摧枯拉朽"
+		"NEW_ACHIEVEMENT_20_19_DESC"	"摧�1,000个敌方建筑。"
+		"NEW_ACHIEVEMENT_20_20_NAME"	"壮观的�难"
+		"NEW_ACHIEVEMENT_20_20_DESC"	"使��应堆过热并爆炸。"
+		"NEW_ACHIEVEMENT_20_21_NAME"	"制图师"
+		"NEW_ACHIEVEMENT_20_21_DESC"	"制作新地图10次。"
+		"NEW_ACHIEVEMENT_20_22_NAME"	"�览者"
+		"NEW_ACHIEVEMENT_20_22_DESC"	"从创�工�下载地图。"
+		"NEW_ACHIEVEMENT_20_23_NAME"	"创作者"
+		"NEW_ACHIEVEMENT_20_23_DESC"	"在创�工�上�布地图。"
+		"NEW_ACHIEVEMENT_20_24_NAME"	"�手"
+		"NEW_ACHIEVEMENT_20_24_DESC"	"打败boss。"
+		"NEW_ACHIEVEMENT_20_29_NAME"	"�料学II"
+		"NEW_ACHIEVEMENT_20_29_DESC"	"解��。"
+		"NEW_ACHIEVEMENT_20_31_NAME"	"�料学I"
+		"NEW_ACHIEVEMENT_20_31_DESC"	"解�钛。"
+		"NEW_ACHIEVEMENT_21_0_NAME"	"神风特攻队"
+		"NEW_ACHIEVEMENT_21_0_DESC"	"用爆炸性�料填满任何�核心��并死亡。"
+		"NEW_ACHIEVEMENT_21_1_NAME"	"开端"
+		"NEW_ACHIEVEMENT_21_1_DESC"	"建造地���工厂。"
+		"NEW_ACHIEVEMENT_21_2_NAME"	"直接攻击"
+		"NEW_ACHIEVEMENT_21_2_DESC"	"命令任何��攻击目标。"
+		"NEW_ACHIEVEMENT_21_3_NAME"	"蜂拥"
+		"NEW_ACHIEVEMENT_21_3_DESC"	"�时拥有100个��。"
+		"NEW_ACHIEVEMENT_21_4_NAME"	"飞群"
+		"NEW_ACHIEVEMENT_21_4_DESC"	"�时拥有10个幻型。"
+		"NEW_ACHIEVEMENT_21_5_NAME"	"机械师"
+		"NEW_ACHIEVEMENT_21_5_DESC"	"制造所有类型的��。"
+		"NEW_ACHIEVEMENT_21_6_NAME"	"军团"
+		"NEW_ACHIEVEMENT_21_6_DESC"	"总共制造1000个��。"
+		"NEW_ACHIEVEMENT_21_9_NAME"	"���"
+		"NEW_ACHIEVEMENT_21_9_DESC"	"在敌人出生点�区死亡。"
+		"NEW_ACHIEVEMENT_21_10_NAME"	"这个游�有海军的"
+		"NEW_ACHIEVEMENT_21_10_DESC"	"淹死。"
+		"NEW_ACHIEVEMENT_21_11_NAME"	"收集者"
+		"NEW_ACHIEVEMENT_21_11_DESC"	"将核心装满��物�。"
+		"NEW_ACHIEVEMENT_21_12_NAME"	"人从众𠈌"
+		"NEW_ACHIEVEMENT_21_12_DESC"	"在�务器上拥有10�玩家。"
+		"NEW_ACHIEVEMENT_21_13_NAME"	"���摧"
+		"NEW_ACHIEVEMENT_21_13_DESC"	"建造熔��幽�和厄兆。"
+		"NEW_ACHIEVEMENT_21_14_NAME"	"�射"
+		"NEW_ACHIEVEMENT_21_14_DESC"	"使用�射�。"
+		"NEW_ACHIEVEMENT_21_16_NAME"	"路由器邪教"
+		"NEW_ACHIEVEMENT_21_16_DESC"	"建造两个相邻的路由器。"
+		"NEW_ACHIEVEMENT_21_17_NAME"	"孤守阵地"
+		"NEW_ACHIEVEMENT_21_17_DESC"	"�建造建筑生存10波。"
+		"NEW_ACHIEVEMENT_21_18_NAME"	"焚烧"
+		"NEW_ACHIEVEMENT_21_18_DESC"	"使用硫化物作为炮塔弹�。"
+		"NEW_ACHIEVEMENT_21_19_NAME"	"效率"
+		"NEW_ACHIEVEMENT_21_19_DESC"	"用水或冷冻液冷�炮塔。"
+		"NEW_ACHIEVEMENT_21_20_NAME"	"�典模�"
+		"NEW_ACHIEVEMENT_21_20_DESC"	"�用�素画�设置。"
+		"NEW_ACHIEVEMENT_21_21_NAME"	"学者"
+		"NEW_ACHIEVEMENT_21_21_DESC"	"从游�打开维基页�。"
+		"NEW_ACHIEVEMENT_21_22_NAME"	"先�制人"
+		"NEW_ACHIEVEMENT_21_22_DESC"	"�射装载超过10,000个物�的核心进入区�。"
+		"NEW_ACHIEVEMENT_21_23_NAME"	"点�"
+		"NEW_ACHIEVEMENT_21_23_DESC"	"�动冲击�应堆。"
+		"NEW_ACHIEVEMENT_21_25_NAME"	"螺旋"
+		"NEW_ACHIEVEMENT_21_25_DESC"	"转啊转……"
+		"NEW_ACHIEVEMENT_21_26_NAME"	"�级"
+		"NEW_ACHIEVEMENT_21_26_DESC"	"制造T5��。"
+		"NEW_ACHIEVEMENT_21_27_NAME"	"建筑师"
+		"NEW_ACHIEVEMENT_21_27_DESC"	"创建20个�图。"
+		"NEW_ACHIEVEMENT_21_28_NAME"	"全�霸�"
+		"NEW_ACHIEVEMENT_21_28_DESC"	"�领赛普罗上的所有区�。"
+		"NEW_ACHIEVEMENT_21_29_NAME"	"空�"
+		"NEW_ACHIEVEMENT_21_29_DESC"	"用�塞�带T5��。"
+		"NEW_ACHIEVEMENT_21_30_NAME"	"终�形�"
+		"NEW_ACHIEVEMENT_21_30_DESC"	"加入它们。"
+		"NEW_ACHIEVEMENT_21_31_NAME"	"生产I"
+		"NEW_ACHIEVEMENT_21_31_DESC"	"战役总产�达到�分钟5,000个物�。"
+		"NEW_ACHIEVEMENT_26_0_NAME"	"生产II"
+		"NEW_ACHIEVEMENT_26_0_DESC"	"战役总产�达到�分钟50,000个物�。"
+		"NEW_ACHIEVEMENT_26_1_NAME"	"稳�胜劵"
+		"NEW_ACHIEVEMENT_26_1_DESC"	"在一个区�游玩时�领�一个区�。"
+		"NEW_ACHIEVEMENT_26_2_NAME"	"��国"
+		"NEW_ACHIEVEMENT_26_2_DESC"	"�时�领10个区�。"
+		"NEW_ACHIEVEMENT_26_3_NAME"	"设计师"
+		"NEW_ACHIEVEMENT_26_3_DESC"	"创建500个�图。"
+		"NEW_ACHIEVEMENT_26_4_NAME"	"��大师"
+		"NEW_ACHIEVEMENT_26_4_DESC"	"在地图中使用（一个星�的）所有�输器件。"
+		"NEW_ACHIEVEMENT_26_5_NAME"	"超频"
+		"NEW_ACHIEVEMENT_26_5_DESC"	"建造超速投影。"
+		"NEW_ACHIEVEMENT_26_6_NAME"	"ç»´ä¿®"
+		"NEW_ACHIEVEMENT_26_6_DESC"	"建造修�投影。"
+		"NEW_ACHIEVEMENT_26_7_NAME"	"低效"
+		"NEW_ACHIEVEMENT_26_7_DESC"	"在水上建造抽水机，而�是使用泵。"
+		"NEW_ACHIEVEMENT_26_8_NAME"	"库存爆满"
+		"NEW_ACHIEVEMENT_26_8_DESC"	"在战役中收集1�万个物�。"
+		"NEW_ACHIEVEMENT_26_9_NAME"	"逆境之战"
+		"NEW_ACHIEVEMENT_26_9_DESC"	"用�管�死日蚀。"
+		"NEW_ACHIEVEMENT_26_10_NAME"	"埃里克尔 完�"
+		"NEW_ACHIEVEMENT_26_10_DESC"	"�领埃里克尔的最终区�。"
+		"NEW_ACHIEVEMENT_26_11_NAME"	"塞普罗 完�"
+		"NEW_ACHIEVEMENT_26_11_DESC"	"�领塞普罗的最终区�。"
+		"NEW_ACHIEVEMENT_26_12_NAME"	"装船"
+		"NEW_ACHIEVEMENT_26_12_DESC"	"在塞普罗上�射时选择自定义核心�图。"
+		"NEW_ACHIEVEMENT_26_13_NAME"	"准备过度"
+		"NEW_ACHIEVEMENT_26_13_DESC"	"将零�地区的核心�级为终代核心。"
+		"NEW_ACHIEVEMENT_26_14_NAME"	"爆�"
+		"NEW_ACHIEVEMENT_26_14_DESC"	"使瘤液蔓延到任何�水建筑。"
+		"NEW_ACHIEVEMENT_26_15_NAME"	"脆弱"
+		"NEW_ACHIEVEMENT_26_15_DESC"	"对带有冻结状�效果的��造��外爆炸伤害。"
+		"NEW_ACHIEVEMENT_26_16_NAME"	"塞普罗 建筑精通"
+		"NEW_ACHIEVEMENT_26_16_DESC"	"在塞普罗上建造所有�用建筑。"
+		"NEW_ACHIEVEMENT_26_17_NAME"	"埃里克尔 建筑精通"
+		"NEW_ACHIEVEMENT_26_17_DESC"	"在埃里克尔上建造所有�用建筑。"
+		"NEW_ACHIEVEMENT_26_18_NAME"	"护盾崩溃"
+		"NEW_ACHIEVEMENT_26_18_DESC"	"打破敌方的力墙投影。"
+		"NEW_ACHIEVEMENT_26_19_NAME"	"说明书在哪里？"
+		"NEW_ACHIEVEMENT_26_19_DESC"	"研究微型处�器。"
+		"NEW_ACHIEVEMENT_26_20_NAME"	"�电"
+		"NEW_ACHIEVEMENT_26_20_DESC"	"电网中达到�秒-10,000的负电力。"
+		"NEW_ACHIEVEMENT_26_21_NAME"	"电涌"
+		"NEW_ACHIEVEMENT_26_21_DESC"	"达到�秒+100,000的正电力。"
+		"NEW_ACHIEVEMENT_26_22_NAME"	"高电容"
+		"NEW_ACHIEVEMENT_26_22_DESC"	"在电网中的电池里存储1百万电力。"
+		"NEW_ACHIEVEMENT_26_23_NAME"	"�主�"
+		"NEW_ACHIEVEMENT_26_23_DESC"	"往�力�电机中输入爆炸混�物。"
+		"NEW_ACHIEVEMENT_26_24_NAME"	"污染"
+		"NEW_ACHIEVEMENT_26_24_DESC"	"使瘤��应堆因瘤液堆积而爆炸。"
+		"NEW_ACHIEVEMENT_26_25_NAME"	"模组"
+		"NEW_ACHIEVEMENT_26_25_DESC"	"安装模组。"
+		"NEW_ACHIEVEMENT_26_26_NAME"	"Router?"
+		"NEW_ACHIEVEMENT_26_26_DESC"	"Router."
+		"NEW_ACHIEVEMENT_26_27_NAME"	"完整体验"
+		"NEW_ACHIEVEMENT_26_27_DESC"	"加入社区�务器。"
+		"NEW_ACHIEVEMENT_26_28_NAME"	"黑客"
+		"NEW_ACHIEVEMENT_26_28_DESC"	"打开脚本控制�。"
+		"NEW_ACHIEVEMENT_26_29_NAME"	"直接控制"
+		"NEW_ACHIEVEMENT_26_29_DESC"	"手动控制炮塔。"
+		"NEW_ACHIEVEMENT_26_30_NAME"	"深入敌�"
+		"NEW_ACHIEVEMENT_26_30_DESC"	"在敌方核心��建造区域内投放��。"
+		"NEW_ACHIEVEMENT_26_31_NAME"	"�仇"
+		"NEW_ACHIEVEMENT_26_31_DESC"    "使用星辉摧�分裂。"
+		"NEW_ACHIEVEMENT_29_0_NAME"	"�空"
+		"NEW_ACHIEVEMENT_29_0_DESC"	"使用地���的助推器。"
+		"NEW_ACHIEVEMENT_29_1_NAME"	"气垫船"
+		"NEW_ACHIEVEMENT_29_1_DESC"	"使用挣脱穿越液体地形。"
+		"NEW_ACHIEVEMENT_29_2_NAME"	"因地制宜"
+		"NEW_ACHIEVEMENT_29_2_DESC"	"将建筑放置在特殊地�上�高工作效率。"
+		"NEW_ACHIEVEMENT_29_3_NAME"	"清�"
+		"NEW_ACHIEVEMENT_29_3_DESC"	"破�100个石�。"
+		"NEW_ACHIEVEMENT_29_4_NAME"	"全�扫�"
+		"NEW_ACHIEVEMENT_29_4_DESC"	"破�10,000个石�。"
+		"NEW_ACHIEVEMENT_29_5_NAME"	"木大木大"
+		"NEW_ACHIEVEMENT_29_5_DESC"	"使用震爆塔�收�袭�弹。"
+		"NEW_ACHIEVEMENT_29_6_NAME"	"�幸"
+		"NEW_ACHIEVEMENT_29_6_DESC"	"在多人�天中使用:alphachan:表情符�。用�用�决于你。"
+	
+	}
+}
diff --git a/fastlane/metadata/steam/Simplified Chinese/description.txt b/fastlane/metadata/steam/Simplified Chinese/description.txt
index 09c9954e2d..089fffb412 100644
--- a/fastlane/metadata/steam/Simplified Chinese/description.txt	
+++ b/fastlane/metadata/steam/Simplified Chinese/description.txt	
@@ -1,60 +1,62 @@
-建造精密的传�带供应链，�供炮塔弹�，生产建筑�料，�护你的建筑并抵御敌人。在跨平�多人�作游�中与朋�一起玩，或在基于团队的PVP比赛中�他们挑战。
+Mindustry是一款结�了工厂建设�塔防和�时战略元素的游�。�建精密的供应链，为你的炮塔供弹，生产用于建设的�料，并组装��。指挥���领敌方基地，扩展生产。在一波波�袭敌人中��你的核心。
 
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
+独自完�战役，或者和朋�一起在跨平�多人�作模�中挑战，并在团队PvP比赛中与他们竞争。
 
-[h2]游��作[/h2]
+[img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
+
+[h2]工厂建设[/h2]
 
 [list]
-[*] 建造钻头和传�带�将资�转移到核心
-[*] 使用工厂制造进阶�料
-[*] 建造无人机以自动采矿，�助建造和��核心
-[*] 分�液体并扑�����
-[*] 用特定物�冷�炮塔和�高生产
+[*] �建精密的传�带供应链为你的炮塔供弹，并生产建造�料
+[*] 使用生产建筑创造��先进�料
+[*] 传输液体以�断应对��或敌军空袭等挑战
+[*] �建筑供应�选的冷�液或润滑油以充分利用你的生产线
+[*] 生产����，自动管�你的基地或攻击敌军基地
+[/list]
+
+[h2]塔防[/h2]
+
+[list]
+[*] 抵御一波波�袭的敌人
+[*] 策略性地放置你的炮塔，在敌人到达核心之�摧�它们
+[*] 为你的炮塔供给弹��冷�液和电力
+[*] 使用力墙投影�修�投影和其他辅助建筑加强你的防线
+[/list]
+
+[img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
+
+[h2]�时战略[/h2]
+
+[list]
+[*] 建立生产线以建造机械化��部队
+[*] 使用你的��攻�防�森严的敌军基地
+[*] �领更多领土，扩展更多核心，并获�扩张所需的�外资�
 [/list]
 
 [h2]战役模�[/h2]
 
 [list]
-[*]在12张���游玩的内建区域中�进
-[*]收集并�射资�
-[*]研究科技以进步
-[*]�带资�进入�个区域
-[*]多样的任务与目标
-[*]邀请朋�一起完�任务
-[*]研究120+科技
-[*]19���类型的无人机�机甲�飞船
-[*]达�50+�就
+[*] 完�两个独立的行星战役
+[*] ��塞普罗和埃里克尔行星，游玩35张手工制作的战役地图和250+个�机生�的区�
+[*] 游玩区�，�领领土，建立工厂，生产资�
+[*] ��你的区���周期性入侵
+[*] 通过�射�在区�间分�资�
+[*] 研究新的建筑以推动进展
+[*] 邀请朋�一起完�任务
+[*] 解�250+�建筑
+[*] 控制50+���类型的无人机�机甲和船�
+[*] 完�80+项�就
 [/list]
 
-[h2][h2]游�模�[/h2][/h2]
-
-[*] [b]生存[/b]: 建造炮塔�防御敌人。尽�能长的生存下�，�射你的核心�使用你收集的资�进行研究。为Boss的到��好准备。
-[*] [b]攻击[/b]: 为建造工厂生产机甲�摧�敌人的核心，�时�护你的基地，抵御敌人的攻击。创建����类型的支�和进攻��，以�助你实现目标。
-[*] [b]PvP[/b]: 与最多4个��团队的其他玩家互相伤害。创建��，或者直接用你的飞船攻击他人基地。
-[*] [b]沙盒[/b]: 无�的资�，没有敌人的��。使用��于沙盒的物��和液体��测试设计，和根�需�生�敌人。
-[/list]
-
-[h2]自定义游�和跨平�多人游�[/h2]
+[h2]社区与模组[/h2]
 
 [list]
-[*]用于自定义的12个内置地图
-[*]游玩�作，PvP或沙盒模�
-[*]加入公共专用�务器，或邀请朋��加您自己的�人�务器
-[*]�定制的游�规则
-[*]混�和匹�游�模�：结�PvP和PvE游�模� 
-[/list]
-
-[h2]自定义地图编辑器[/h2]
-
-[list]
-[*]使用编辑器绘制地图
-[*]在游�中编辑和预览
-[*]�更改的工具模�
-[*]具有多���类型的地形处�过滤器的强大的地图生�系统
-[*]将�机地形应用于地图
-[*]�机�置和生�矿石，以�放置河�和资�
-[*]�置敌方波次布局
-[*]在Steam创�工�上共享导出的地图
-[*]自定义地图的基础规则
-[*]使用75+个��的环境�
+[*] 使用Steam创�工��览社区制作的地图和�图
+[*] 加入公共社区�务器，与其他平�上的玩家一起游玩
+[*] 进行�作�PvP或沙盒游�
+[*] 社区�务器支�自定义地图与游�模�的�件
+[*] 创建你的公共专用�务器，或邀请朋��加你自己的�人游�
+[*] 定制游�规则：更改建造花费�敌人属性��始资��波次时间等
+[*] 使用内置地图编辑器制作自己的地图，并与社区分享
+[*] �览社区制作的模组并添加�混�更多内容
 [/list]
diff --git a/fastlane/metadata/steam/Simplified Chinese/short-description.txt b/fastlane/metadata/steam/Simplified Chinese/short-description.txt
index da05408477..967c54384c 100644
--- a/fastlane/metadata/steam/Simplified Chinese/short-description.txt	
+++ b/fastlane/metadata/steam/Simplified Chinese/short-description.txt	
@@ -1 +1 @@
-一款以资�管�为核心的无尽塔防游�。
+一款结��时战略与塔防�素的开放�工厂管�游�。
diff --git a/fastlane/metadata/steam/Traditional Chinese/achievements.vdf b/fastlane/metadata/steam/Traditional Chinese/achievements.vdf
deleted file mode 100644
index e4fe0c6cee..0000000000
--- a/fastlane/metadata/steam/Traditional Chinese/achievements.vdf	
+++ /dev/null
@@ -1,115 +0,0 @@
-"lang"
-{
-	"Language"	"tchinese"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_1_NAME"	"�人斬"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"累計擊敗 1000 �敵人。"
-		"NEW_ACHIEVEMENT_20_2_NAME"	"���年���"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"累計擊敗 100,000 �敵人。"
-		"NEW_ACHIEVEMENT_20_5_NAME"	"出貨出�完"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"累計發射 100,000 個物�。"
-		"NEW_ACHIEVEMENT_20_6_NAME"	"��者"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"在 10 場攻擊模�中��。"
-		"NEW_ACHIEVEMENT_20_7_NAME"	"冠�"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"在 10 場多人 PvP �戲中��。"
-		"NEW_ACHIEVEMENT_20_8_NAME"	"閃電戰"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"在攻擊�域中於 5 波或更少波數摧毀敵人核心。"
-		"NEW_ACHIEVEMENT_20_9_NAME"	"核心雨"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"將您的核心發射到一個�域 30 次。"
-		"NEW_ACHIEVEMENT_20_10_NAME"	"頑強抵抗"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"活� 100 波。"
-		"NEW_ACHIEVEMENT_20_12_NAME"	"研究者"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"研究所有科技。"
-		"NEW_ACHIEVEMENT_20_14_NAME"	"超載"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"以電力攻擊被水覆蓋的敵人。"
-		"NEW_ACHIEVEMENT_20_15_NAME"	"以�之矛，攻�之盾"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"用敵人的�彈摧毀它自己。"
-		"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_19_NAME"	"夷為平地"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"摧毀 1,000 個敵方的方塊。"
-		"NEW_ACHIEVEMENT_20_20_NAME"	"壯觀的�難"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"造�釷�應��熱爆炸。"
-		"NEW_ACHIEVEMENT_20_21_NAME"	"製圖者"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"製作 10 張新地圖。"
-		"NEW_ACHIEVEMENT_20_22_NAME"	"�覽者"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"從工作�下載地圖。"
-		"NEW_ACHIEVEMENT_20_23_NAME"	"創作者"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"在工作�上發佈地圖。"
-		"NEW_ACHIEVEMENT_20_24_NAME"	"殺手"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"擊敗一次頭目。"
-		"NEW_ACHIEVEMENT_20_25_NAME"	"探索者"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"解鎖戰役模�中的所有�域。"
-		"NEW_ACHIEVEMENT_20_29_NAME"	"�料II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"解鎖釷。"
-		"NEW_ACHIEVEMENT_20_31_NAME"	"�料I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"解鎖鈦。"
-		"NEW_ACHIEVEMENT_21_0_NAME"	"神風特攻隊"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"將您的機甲�滿爆炸性物質並自爆。"
-		"NEW_ACHIEVEMENT_21_1_NAME"	"開始了"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"建造匕首機甲工廠。"
-		"NEW_ACHIEVEMENT_21_2_NAME"	"正��擊"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"用指�中心發出攻擊指令。"
-		"NEW_ACHIEVEMENT_21_3_NAME"	"蜂群"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"�時�有 100 個單�。"
-		"NEW_ACHIEVEMENT_21_4_NAME"	"建造大隊"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"�時�有 10 個鬼怪無人機。"
-		"NEW_ACHIEVEMENT_21_5_NAME"	"機器人專家"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"建造�一種單�。"
-		"NEW_ACHIEVEMENT_21_6_NAME"	"�團"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"總共建造 1000 個單�。"
-		"NEW_ACHIEVEMENT_21_9_NAME"	"誰�你��？"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"在敵方空��死亡。"
-		"NEW_ACHIEVEMENT_21_10_NAME"	"當海��素的？"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"被淹死。"
-		"NEW_ACHIEVEMENT_21_11_NAME"	"�集者"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"將核心�滿所有類型的資�。"
-		"NEW_ACHIEVEMENT_21_12_NAME"	"人群"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"建立一個有 10 個玩家的伺�器。"
-		"NEW_ACHIEVEMENT_21_13_NAME"	"無懈�擊"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"建造熔毀砲�鬼影砲和狙擊砲。"
-		"NEW_ACHIEVEMENT_21_14_NAME"	"起飛"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"使用發射臺。"
-		"NEW_ACHIEVEMENT_21_16_NAME"	"異端邪說"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"建造兩個彼此相鄰的路由器。"
-		"NEW_ACHIEVEMENT_21_17_NAME"	"孤�的守護者"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"在任��域�放置任何方塊的情�下存活 10 波。"
-		"NEW_ACHIEVEMENT_21_18_NAME"	"焚化"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"在任�砲塔中使用�焰彈�為彈藥。"
-		"NEW_ACHIEVEMENT_21_19_NAME"	"效率"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"用水或冷�液冷�砲塔。"
-		"NEW_ACHIEVEMENT_21_20_NAME"	"經典模�"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"啟用�素化。"
-		"NEW_ACHIEVEMENT_21_21_NAME"	"學者"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"從�戲中開啟 Wiki。"
-		"NEW_ACHIEVEMENT_21_22_NAME"	"領先"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"攜帶 10,000 或更多的資�進入一個地�。"
-		"NEW_ACHIEVEMENT_21_23_NAME"	"點�"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"啟動�擊�應器。"
-		"NEW_ACHIEVEMENT_21_24_NAME"	"加速"
-		"NEW_ACHIEVEMENT_21_24_DESC"	"啟動行星際加速器。"
-		"NEW_ACHIEVEMENT_21_25_NAME"	"螺旋"
-		"NEW_ACHIEVEMENT_21_25_DESC"	"來跟著我旋轉..."
-		"NEW_ACHIEVEMENT_21_26_NAME"	"情勢�溫"
-		"NEW_ACHIEVEMENT_21_26_DESC"	"建造一個5階單�。"
-		"NEW_ACHIEVEMENT_21_27_NAME"	"建築師"
-		"NEW_ACHIEVEMENT_21_27_DESC"	"�20個�圖。"
-		"NEW_ACHIEVEMENT_21_28_NAME"	"全���"
-		"NEW_ACHIEVEMENT_21_28_DESC"	"佔領蕈孢星上的�一個地�。"
-		"NEW_ACHIEVEMENT_21_29_NAME"	"空�"
-		"NEW_ACHIEVEMENT_21_29_DESC"	"Pick up a T5 unit in an Oct unit carrier."
-		"NEW_ACHIEVEMENT_21_30_NAME"	"最終型態"
-		"NEW_ACHIEVEMENT_21_30_DESC"	"加入它們。"
-		"NEW_ACHIEVEMENT_21_31_NAME"	"工業化 I"
-		"NEW_ACHIEVEMENT_21_31_DESC"	"戰役中總生產��到 5,000 物�/分�。"
-		"NEW_ACHIEVEMENT_26_0_NAME"	"工業化 II"
-		"NEW_ACHIEVEMENT_26_0_DESC"	"戰役中總生產��到 50,000 物�/分�。"
-		"NEW_ACHIEVEMENT_26_1_NAME"	"必定�利"
-		"NEW_ACHIEVEMENT_26_1_DESC"	"在一個地��玩時佔領�外一個地�。"
-		"NEW_ACHIEVEMENT_26_2_NAME"	"�型�國"
-		"NEW_ACHIEVEMENT_26_2_DESC"	"�時控制 10 個地�。"		
-	}
-}
diff --git a/fastlane/metadata/steam/Traditional Chinese/description.txt b/fastlane/metadata/steam/Traditional Chinese/description.txt
deleted file mode 100644
index 5a73494eec..0000000000
--- a/fastlane/metadata/steam/Traditional Chinese/description.txt	
+++ /dev/null
@@ -1,65 +0,0 @@
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]基本�戲�作[/h2]
-
-[list]
-[*] 建造精密的供應系統�填砲塔和生產建造所需的�料。 
-[*] 使用製造方塊製作一系列的進階原料。
-[*] 抵禦敵人一波一波的攻擊。
-[*] 和朋�一�跨平�玩多人模�，或是邀請進行多人PvP。
-[*] 輸�液體應���的挑戰，�是�發的��或敵�空襲。
-[*] 利用冷�液或催化劑��砲塔與生產方塊的最高效率。
-[*] 生產���樣的機械�到基地的自動化或侵襲敵方基地。
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-1-8679abe089cd.gif[/img]
-
-[h2]戰役模�[/h2]
-
-[list]
-[*] 探索並��蕈孢星上250+個地�和16個手作地圖。
-[*] 佔領領地�建造工廠，在其他星��玩��續生產物資。
-[*] 抵禦敵方定時侵略，�衛領地。
-[*] �用發射臺分�地�間的資�。
-[*] 研究新方塊推進進度。
-[*] 邀請好�一�完�任務。
-[*] 超� 120 種方塊供玩家使用�探索。
-[*] 33 種��類型的無人機�機甲和船艦
-[*] 50+ 個�就�供解鎖
-[/list]
-
-[h2][h2]�戲模�[/h2][/h2]
-
-[list]
-[*] [b]生存[/b]：建造砲塔來抵禦敵人入侵。生存愈久愈好，�擇發射您的核心並將您採集的資�用來研究新科技。為敵人頭目的到來�好準備。
-[*] [b]攻擊[/b]：建造工廠並生產部隊來摧毀敵人的核心，�時�護自己的基地��敵方單�的攻擊。建立�種��類型的支�與攻擊單�來�助實�您的目標。��擇啟用自動建築防禦的AI增加難度。
-[*] [b]PvP[/b]：與最多四個��團隊的玩家競爭摧毀其他人的核心。建立單�或直接用您的飛船攻擊其他人的基地。
-[*] [b]沙盒[/b]：在資�無�而且無敵人�脅下盡情�玩。使用僅在沙盒模�中�有的無�物�與液體來�以測試設計，並根據需�生�敵人。
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/2020-11-30_10-46-02.gif[/img]
-
-[h2]自訂�戲與跨平臺多人�戲[/h2]
-
-[list]
-[*] 除了戰役以外，還有 16 個內建地圖�用於自訂�戲
-[*] 玩�作�PvP 或沙盒模�
-[*] 加入公開的專用伺�器，或邀請朋�加入您的�人伺�器
-[*] 自訂�戲�則：變更方塊花費�敵方屬性�起始物��敵人來襲的間隔時間等
-[*] 混��戲模�：�� PvP 與 PvE �戲模�
-[/list]
-
-[h2]自訂地圖編輯器[/h2]
-
-[list]
-[*] 使用編輯器來繪製地圖
-[*] 在�戲中編輯並�覽建築
-[*] �設定的工具模�：變更�個工具的功能
-[*] 強大的地圖生�系統，有許多��類型的�濾器，�用於地形的�程�化處�
-[*] 將噪音�變形�平滑�����稱�礦物生�與隨機地形套用到您的地圖上
-[*] 隨機設定礦物生�，並放置河�與資�
-[*] 設定敵人攻擊佈局
-[*] 在 Steam 工作�上分享匯出的地圖
-[*] 自訂地圖的基礎�則
-[*] 使用 80 種以上��的環境方塊
-[/list]
diff --git a/fastlane/metadata/steam/Traditional Chinese/short-description.txt b/fastlane/metadata/steam/Traditional Chinese/short-description.txt
deleted file mode 100644
index 76738a4a74..0000000000
--- a/fastlane/metadata/steam/Traditional Chinese/short-description.txt	
+++ /dev/null
@@ -1 +0,0 @@
-一款��資�管�的開放�塔防�戲。
diff --git a/fastlane/metadata/steam/czech/achievements.vdf b/fastlane/metadata/steam/czech/achievements.vdf
deleted file mode 100644
index e7e80c47f2..0000000000
--- a/fastlane/metadata/steam/czech/achievements.vdf
+++ /dev/null
@@ -1,109 +0,0 @@
-"lang"
-{
-	"Language"	"czech"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Ověřen"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Dokon�ena výuka."
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Šroťák"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Zni� 1000 nepřátelských jednotek."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Čisti�"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Zni� 100,000 nepřátelských jednotek."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Přesun do atmosféry"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Vyšli zpět celkem 10.000 předmětů."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"Nekone�né dodávky"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Vyšli zpět celkem 1.000.000 předmětů."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Dobyvatel"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Vyhraj 10 zápasů v herním režimu Útok."
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Šampión"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Vyhraj 10 zápasů v herním režimu Hrá�i proti sobě."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Blesk"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Zni� nepřátelské jádro v úto�né zóně v průběhu prvních 5 vln."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Prší jádra"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Vyšli Tvoje jádro do mapy 30x."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Houževnatý"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Přežij 100 vln."
-		"NEW_ACHIEVEMENT_20_11_NAME"	"Neposkvrněný"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Přežij 500 vln."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"Výzkumník"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"Vyzkoumej všechno."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Měňavec"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Odemkni každého mecha ve hře a transformuj se do něj."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Přetížení"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Zasáhni nepřítele pokrytého vodou energetickou zbraní."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Odražení"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Zni� jednotku její vlastní odraženou kulkou."
-		"NEW_ACHIEVEMENT_20_17_NAME"	"Distributor v zácviku"
-		"NEW_ACHIEVEMENT_20_17_DESC"	"Vynalezni Směrova�."
-		"NEW_ACHIEVEMENT_20_18_NAME"	"Stvořitel"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"Umísti 10.000 bloků."
-		"NEW_ACHIEVEMENT_20_19_NAME"	"Viktor �isti�"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Zni� 1.000 nepřátelských bloků."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Velkolepá chyba"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Způsob přetížení Thoriového reaktoru, následované explozí."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Kartograf"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Vytvoř 10 nových map."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Sosa�"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Stáhni mapu z dílny."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Tvůrce"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Publikuj mapu do dílny."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Řezník"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Poraž Záporáka."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Průzkumník"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Odemkni všechny zóny v kampani."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Perfekcionalista"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"Dosáhni požadavku pro vlastní výbavu ve všech zónách v kampani."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Materiály II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Odemkni Thorium."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Materiály I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Odemkni Titan."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Naplň svého mecha výbušným materiálem a zemři v explozi ."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"A tak to za�íná"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Vytvoř továrnu na mecha Dýka."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Přímý útok"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Vyšli příkaz k útoku z řídícího střediska."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Roj"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Měj v jeden ukamžil 100 aktivních jednotek."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Stádo"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Měj v jeden okamžik 10 aktivních dronů Fantóm ."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Proměnlivá armáda"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Měj v jeden okamžik 50 aktivních jednotek Slídi�."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Legie"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Postav celkem 1.000 jednotek."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Dosáhni hodnocení S v jakékoliv zóně."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Dosáhni hodnocení SS v jakékoliv zóně."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Měl jsi líp poslouchat"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Zemři v zóně pro vylíhnutí nepřátelských jednotek."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Prostě zmá�kni Shift"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Nějak se utop."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Sběratel"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Naplň jádro do maximální kapacity každým typem materiálu."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"Dav"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Hostuj server s aspoň 10 hrá�i."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"Nezranitelný"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Postav drony Meltdown a Spectre."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Odlet"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Použij Vysílací plošinu."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Samolibost"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Přesko� vyslání zpět dvakrát a pak si nech zni�it jádro nepřítelem."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Kacířství"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Postav dva směrova�e vedle sebe."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Osamělý strážce"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Přežij 10 vln v jakékoliv zóně bez položení bloku."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Zpopelnění"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Použij ve střílně pyratit."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Ú�innost"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Chla� střílnu vodou nebo chladící kapalinou."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Klasický režim"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Zapni rozpixlování."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Školák"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Otevři Wiki Mindustry ze hry."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Náskok"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Vyšli se do zóny s nejméně 10.000 předměty."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Zážeh"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Zažehni rázový reaktor."
-	}
-}
diff --git a/fastlane/metadata/steam/czech/description.txt b/fastlane/metadata/steam/czech/description.txt
deleted file mode 100644
index 7a7ac632ff..0000000000
--- a/fastlane/metadata/steam/czech/description.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Vytvoř propracovaný výrobní řetězec dopravníků, abys naládoval munici do věží, vyrobil materiály pro stavění a ubránil své stavby před vlnami nepřátel. Hraj s Tvými přáteli koopera�ně napří� platformami, nebo je vyzvi v týmové hře hrá�ů proti sobě.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Hra[/h2]
-
-[list]
-[*] Vytvoř vrty a dopravníky pro přesun zdrojů do Tvého jádra. 
-[*] Použij výrobní bloky pro vytvoření pokro�ilých materiálů.
-[*] Postav drony pro automatické těžení zdrojů, pomoc se stavěním a vybudování a ochraně své základny.
-[*] Rozváděj kapaliny a bojuj s požárem.
-[*] Posilni výrobu dodate�ným chlazením a promaž obranné i výrobní bloky.
-[/list]
-
-[h2]Kampaň[/h2]
-
-[list]
-[*] Projdi skrz 12 znovuhratelných předpřipravených zón s náhodným místem startu.
-[*] Sesbírej a vyšli zpět ze zón materiál.
-[*] Vynalezni nové bloky, abys rozjel výrobu.
-[*] Konfiguruj předměty, se kterými se vyšleš do zóny, abys byl lépe připraven.
-[*] V jednotlivých zónách plň rozdílné cíle mise.
-[*] Pozvi kamarády pro spole�né dokon�ení mise.
-[*] 120+ technologických bloků, dokážeš je všechny využít?
-[*] 19 různých typů dronů, mechů and lodí!
-[*] 50+ achievementů!
-[/list]
-
-[h2][h2]Herní módy[/h2][/h2]
-
-[list]
-[*] [b]Přežití[/b]: Postav věže k obraně Tvého jádra před nepřátelskými jednotkami. Přežij tak dlouho, jak jen dokážeš, a ideálně ještě odešli své jádro zpět se sesbíranými surovinami pro zaplacení výzkumu. Připrav svou základnu pro střídavý útok vzdušného Záporáka.
-[*] [b]Útok[/b]: Postav továrny na jednotky pro zni�ení nepřátelského jádra, zatímco zároveň ochraňuj svoji základnu před vlnami nepřátelských jednotek.  Vytvoř různé typy podpůrných a obranných jednotek pro dosažení tohoto cíle.
-[*] [b]Hrá�i proti sobě[/b]: Soupeř s jinými hrá�i v až 4 různých týmech, s cílem zni�it ostatní jádra. Vytvoř jednotky nebo úto� na cizí jádro rovnou ve svém mechu.
-[*] [b]Pískoviště[/b]: Vyzkoušej si hru s nekone�nými zdroji surovin a bez nepřátelských hrozeb. Použij bloky dostupné pouze v pískovišti aby sis otestoval svůj nový nápad a pokud budeš chtít, můžeš si na vyžádání nechat seslat nepřátelské jednotky.
-[/list]
-
-[h2]Vlastní hra a podpora napří� herními platformami[/h2]
-
-[list]
-[*] 12 vestavěných map pro vlastní hry, navíc ke kampani
-[*] Hraj kooperativně, proti sobě nebo na pískovišti
-[*] Připoj se k  veřejnému serveru nebo pozvi přátele do svého vlastního soukromého sezení
-[*] Nastavitelná herní pravidla: Změn cenu bloků, nepřátelské statistiky, po�áte�ní předměty, �asování vln atd.
-[*] Mix herních režimů: Smíchej dohromady hru hrá�ů proti sobě (PvP) a hrá�ů proti prostředí (PvE)
-[/list]
-
-[h2]Editor map[/h2]
-
-[list]
-[*] Nakresli si novou mapu s vestavěným editorem 
-[*] Upravuj a dej si náhled staveb přímo ve hře
-[*] Konfigurovatelné nástroje: Změň, jak se každý nástroj chová
-[*] Silný systém pro generování map, s mnoha různými typy filtrů pro procedurální manipulaci s terénem - vytvoř úžasnou mapu za 5 minut!
-[*] Přidej zašumění, zkreslení, vyhlazení, prolnutí, zrcadlení, rozptýlení, generování rud a náhodného terénu do svých map
-[*] Konfiguruj náhodné generování rudy, řek a surovin
-[*] Konfiguruj rozestavění nepřátelských vln
-[*] Sdílej vyexportované mapy v dílně Steamu
-[*] Nastav pravidla pro základní mapy
-[*] Použij 75+ různých bloků
-[/list]
diff --git a/fastlane/metadata/steam/czech/short-description.txt b/fastlane/metadata/steam/czech/short-description.txt
deleted file mode 100644
index 252ae989db..0000000000
--- a/fastlane/metadata/steam/czech/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hra typu tower-defense s otevřeným koncem, zaměřená na řízení zdrojů.
diff --git a/fastlane/metadata/steam/english/achievements.vdf b/fastlane/metadata/steam/english/achievements.vdf
index df04afc94d..74c090b7e6 100644
--- a/fastlane/metadata/steam/english/achievements.vdf
+++ b/fastlane/metadata/steam/english/achievements.vdf
@@ -41,18 +41,16 @@
 		"NEW_ACHIEVEMENT_20_23_DESC"	"Publish a map on the Workshop."
 		"NEW_ACHIEVEMENT_20_24_NAME"	"Slayer"
 		"NEW_ACHIEVEMENT_20_24_DESC"	"Defeat a boss."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Explorer"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Unlock all zones in the campaign."
 		"NEW_ACHIEVEMENT_20_29_NAME"	"Material II"
 		"NEW_ACHIEVEMENT_20_29_DESC"	"Unlock Thorium."
 		"NEW_ACHIEVEMENT_20_31_NAME"	"Material I"
 		"NEW_ACHIEVEMENT_20_31_DESC"	"Unlock Titanium."
 		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Fill your mech up with explosive materials and die."
+		"NEW_ACHIEVEMENT_21_0_DESC"	"Fill up any non-core unit with explosive materials and die."
 		"NEW_ACHIEVEMENT_21_1_NAME"	"It Begins"
 		"NEW_ACHIEVEMENT_21_1_DESC"	"Build a ground unit factory."
 		"NEW_ACHIEVEMENT_21_2_NAME"	"Direct Assault"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Issue the Attack command using the Command Center."
+		"NEW_ACHIEVEMENT_21_2_DESC"	"Command any units to attack a target."
 		"NEW_ACHIEVEMENT_21_3_NAME"	"Swarm"
 		"NEW_ACHIEVEMENT_21_3_DESC"	"Have 100 units active at once."
 		"NEW_ACHIEVEMENT_21_4_NAME"	"Flock"
@@ -63,7 +61,7 @@
 		"NEW_ACHIEVEMENT_21_6_DESC"	"Build 1000 units total."
 		"NEW_ACHIEVEMENT_21_9_NAME"	"You Should've Listened"
 		"NEW_ACHIEVEMENT_21_9_DESC"	"Die in the drop point exclusion zone."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"There Are Naval Units For That"
+		"NEW_ACHIEVEMENT_21_10_NAME"	"There Are Naval Units for That"
 		"NEW_ACHIEVEMENT_21_10_DESC"	"Drown."
 		"NEW_ACHIEVEMENT_21_11_NAME"	"Collector"
 		"NEW_ACHIEVEMENT_21_11_DESC"	"Fill the core to maximum capacity with every type of material."
@@ -89,8 +87,6 @@
 		"NEW_ACHIEVEMENT_21_22_DESC"	"Launch into a zone with 10,000 or more items configured."
 		"NEW_ACHIEVEMENT_21_23_NAME"	"Ignition"
 		"NEW_ACHIEVEMENT_21_23_DESC"	"Power up an Impact Reactor."
-		"NEW_ACHIEVEMENT_21_24_NAME"	"Acceleration"
-		"NEW_ACHIEVEMENT_21_24_DESC"	"Activate the Interplanetary Accelerator."
 		"NEW_ACHIEVEMENT_21_25_NAME"	"The Spiral"
 		"NEW_ACHIEVEMENT_21_25_DESC"	"Round and round it goes..."
 		"NEW_ACHIEVEMENT_21_26_NAME"	"Escalation"
@@ -111,5 +107,77 @@
 		"NEW_ACHIEVEMENT_26_1_DESC"	"Capture a sector while playing on a different sector."
 		"NEW_ACHIEVEMENT_26_2_NAME"	"Small Empire"
 		"NEW_ACHIEVEMENT_26_2_DESC"	"Control 10 sectors at once."
+		"NEW_ACHIEVEMENT_26_3_NAME"	"Designer"
+		"NEW_ACHIEVEMENT_26_3_DESC"	"Create 500 schematics."
+		"NEW_ACHIEVEMENT_26_4_NAME"	"Master of Distribution"
+		"NEW_ACHIEVEMENT_26_4_DESC"	"Use every transportation block (from one planet) in a single map."
+		"NEW_ACHIEVEMENT_26_5_NAME"	"Overdrive"
+		"NEW_ACHIEVEMENT_26_5_DESC"	"Build an Overdrive Projector."
+		"NEW_ACHIEVEMENT_26_6_NAME"	"Mending"
+		"NEW_ACHIEVEMENT_26_6_DESC"	"Build a Mend Projector."
+		"NEW_ACHIEVEMENT_26_7_NAME"	"Inefficiency"
+		"NEW_ACHIEVEMENT_26_7_DESC"	"Build a Water Extractor on water, instead of using a pump."
+		"NEW_ACHIEVEMENT_26_8_NAME"	"Stockpile"
+		"NEW_ACHIEVEMENT_26_8_DESC"	"Collect 10 million total items in the campaign."
+		"NEW_ACHIEVEMENT_26_9_NAME"	"Against All Odds"
+		"NEW_ACHIEVEMENT_26_9_DESC"	"Land the killing blow on an Eclipse unit with a Duo turret."
+		"NEW_ACHIEVEMENT_26_10_NAME"	"Erekir Completion"
+		"NEW_ACHIEVEMENT_26_10_DESC"	"Capture the final sector on Erekir."
+		"NEW_ACHIEVEMENT_26_11_NAME"	"Serpulo Completion"
+		"NEW_ACHIEVEMENT_26_11_DESC"	"Capture the final sector on Serpulo."
+		"NEW_ACHIEVEMENT_26_12_NAME"	"Loadout"
+		"NEW_ACHIEVEMENT_26_12_DESC"	"Launch with a custom core schematic selected on Serpulo."
+		"NEW_ACHIEVEMENT_26_13_NAME"	"Overprepared"
+		"NEW_ACHIEVEMENT_26_13_DESC"	"Upgrade the core in Ground Zero to a Nucleus."
+		"NEW_ACHIEVEMENT_26_14_NAME"	"Outbreak"
+		"NEW_ACHIEVEMENT_26_14_DESC"	"Have neoplasm spread to any water-containing block."
+		"NEW_ACHIEVEMENT_26_15_NAME"	"Brittle"
+		"NEW_ACHIEVEMENT_26_15_DESC"	"Deal extra explosive damage to a unit with the Freezing status effect."
+		"NEW_ACHIEVEMENT_26_16_NAME"	"Serpulo Structure Mastery"
+		"NEW_ACHIEVEMENT_26_16_DESC"	"Build every block available on Serpulo."
+		"NEW_ACHIEVEMENT_26_17_NAME"	"Erekir Structure Mastery"
+		"NEW_ACHIEVEMENT_26_17_DESC"	"Build every block available on Erekir."
+		"NEW_ACHIEVEMENT_26_18_NAME"	"Shields Down"
+		"NEW_ACHIEVEMENT_26_18_DESC"	"Break an enemy Force Projector's shield."
+		"NEW_ACHIEVEMENT_26_19_NAME"	"Where's The Manual?"
+		"NEW_ACHIEVEMENT_26_19_DESC"	"Research the micro-processor."
+		"NEW_ACHIEVEMENT_26_20_NAME"	"Blackout"
+		"NEW_ACHIEVEMENT_26_20_DESC"	"Reach negative 10k/sec power in a network."
+		"NEW_ACHIEVEMENT_26_21_NAME"	"Power Surge"
+		"NEW_ACHIEVEMENT_26_21_DESC"	"Reach positive 100k/sec power."
+		"NEW_ACHIEVEMENT_26_22_NAME"	"High Capacity"
+		"NEW_ACHIEVEMENT_26_22_DESC"	"Have 1 million power stored in batteries in a network."
+		"NEW_ACHIEVEMENT_26_23_NAME"	"Bad Idea"
+		"NEW_ACHIEVEMENT_26_23_DESC"	"Insert blast compound into a combustion generator."
+		"NEW_ACHIEVEMENT_26_24_NAME"	"Contamination"
+		"NEW_ACHIEVEMENT_26_24_DESC"	"Have a Neoplasia Reactor explode due to neoplasm buildup."
+		"NEW_ACHIEVEMENT_26_25_NAME"	"Modified"
+		"NEW_ACHIEVEMENT_26_25_DESC"	"Install a mod."
+		"NEW_ACHIEVEMENT_26_26_NAME"	"router"
+		"NEW_ACHIEVEMENT_26_26_DESC"	"router"
+		"NEW_ACHIEVEMENT_26_27_NAME"	"The Full Experience"
+		"NEW_ACHIEVEMENT_26_27_DESC"	"Join a community server."
+		"NEW_ACHIEVEMENT_26_28_NAME"	"Hackerman"
+		"NEW_ACHIEVEMENT_26_28_DESC"	"Open the scripting console."
+		"NEW_ACHIEVEMENT_26_29_NAME"	"Direct Control"
+		"NEW_ACHIEVEMENT_26_29_DESC"	"Manually command a turret."
+		"NEW_ACHIEVEMENT_26_30_NAME"	"Behind Enemy Lines"
+		"NEW_ACHIEVEMENT_26_30_DESC"	"Drop units within an enemy core's no-build zone."
+		"NEW_ACHIEVEMENT_26_31_NAME"	"Vengeance"
+		"NEW_ACHIEVEMENT_26_31_DESC"	"Destroy a scatter turret using a flare unit."
+		"NEW_ACHIEVEMENT_29_0_NAME"	"Airborne"
+		"NEW_ACHIEVEMENT_29_0_DESC"	"Use the boost function of a ground unit."
+		"NEW_ACHIEVEMENT_29_1_NAME"	"Hovercraft"
+		"NEW_ACHIEVEMENT_29_1_DESC"	"Use an Elude unit to cross a liquid."
+		"NEW_ACHIEVEMENT_29_2_NAME"	"Terrain Boost"
+		"NEW_ACHIEVEMENT_29_2_DESC"	"Increase the efficiency of a structure by placing it on specific tiles."
+		"NEW_ACHIEVEMENT_29_3_NAME"	"Cleanup"
+		"NEW_ACHIEVEMENT_29_3_DESC"	"Break 100 boulders."
+		"NEW_ACHIEVEMENT_29_4_NAME"	"The Global Sweep"
+		"NEW_ACHIEVEMENT_29_4_DESC"	"Break 10,000 boulders."
+		"NEW_ACHIEVEMENT_29_5_NAME"	"Neutralized"
+		"NEW_ACHIEVEMENT_29_5_DESC"	"Use a Shockwave Tower to absorb incoming bullets."
+		"NEW_ACHIEVEMENT_29_6_NAME"	"Unfortunately,"
+		"NEW_ACHIEVEMENT_29_6_DESC"	"Use the :alphachan: emoji in multiplayer chat. Or don't, it's your choice."
 	}
 }
diff --git a/fastlane/metadata/steam/english/description.txt b/fastlane/metadata/steam/english/description.txt
index 9f5ea15047..0026a22ddd 100644
--- a/fastlane/metadata/steam/english/description.txt
+++ b/fastlane/metadata/steam/english/description.txt
@@ -1,65 +1,62 @@
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
+Mindustry is a factory-building game with tower defense and RTS elements. Create elaborate supply chains to feed ammo into your turrets, produce materials to use for building, and construct units. Command units to capture enemy bases, and expand your production. Defend your core from waves of enemies.
 
-[h2]Gameplay[/h2]
+Play through the campaign alone or with with your friends in cross-platform multiplayer co-op and challenge them in team-based PvP matches.
+
+[img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
+
+[h2]Factory Building[/h2]
 
 [list]
 [*] Create elaborate supply chains of conveyor belts to feed ammo into your turrets and produce materials to use for building
 [*] Use production blocks to create a wide variety of advanced materials
-[*] Defend your structures from waves of enemies
-[*] Play with your friends in cross-platform multiplayer co-op games, or challenge them in team-based PvP matches
 [*] Distribute liquids and fight constant challenges, like outbreaks of fire or enemy flier raids
 [*] Get the most out of your production by supplying optional coolant and lubricant
 [*] Produce a wide variety of units for automatic management of your base or assault on enemy bases
 [/list]
 
-[img]{STEAM_APP_IMAGE}/extras/ezgif-1-8679abe089cd.gif[/img]
+[h2]Tower Defense[/h2]
+
+[list]
+[*] Defend your structures from waves of enemies
+[*] Strategically place your turrets to destroy them before they reach your core
+[*] Supply your turrets with ammo, coolant, and power
+[*] Bolster your defenses with powered shields, regeneration projectors and other support buildings
+[/list]
+
+[img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
+
+[h2]Real Time Strategy[/h2]
+
+[list]
+[*] Set up assembly lines to construct armies of mechanized units
+[*] Use your units to square up against fully functional enemy bases
+[*] Capture more territory to place down more cores and get access to additional resources for expansion
+[/list]
 
 [h2]Campaign[/h2]
 
 [list]
-[*] Conquer the planet Serpulo as you advance through 250+ procedurally generated sectors and 16 hand-made maps
+[*] Play through two separate planetary campaigns
+[*] Conquer the planet Serpulo and Erekir as you advance through 35 hand-made maps and 250+ procedurally generated sectors
 [*] Capture territory and set up factories to produce resources while you play other sectors
 [*] Defend your sectors from periodic invasions
 [*] Coordinate resource distribution between sectors via launch pads
 [*] Research new blocks to fuel progress
 [*] Invite your friends to complete missions together
-[*] 120+ technology blocks to master
-[*] 33 different types of drones, mechs and ships
-[*] 50+ achievements to complete
+[*] 250+ technology blocks to master
+[*] 50+ different types of drones, mechs and ships
+[*] 80+ achievements to complete
 [/list]
 
-[h2][h2]Gamemodes[/h2][/h2]
+[h2]Community and Modding[/h2]
 
 [list]
-[*] [b]Survival[/b]: Build turrets to defend from enemies in tower-defense based gameplay. Survive as long as possible, optionally launching your core to use your collected resources for research. Prepare your base for intermittent attacks from airborne bosses.
-[*] [b]Attack[/b]: Build factories for units to destroy the enemy cores, while simultaneously defending your base from waves of enemy units. Create a variety of different types of support and offensive unit to assist you in your goals. Optionally enable an AI that builds defensive structures to an extra challenge.
-[*] [b]PvP[/b]: Compete with other players on up to 4 different teams to destroy each other's cores. Create units, or attack other bases directly with your mechs.
-[*] [b]Sandbox[/b]: Play around with infinite resources and no enemy threat. Use sandbox-specific item and liquid source blocks to test out designs, and spawn in enemies on request.
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/2020-11-30_10-46-02.gif[/img]
-
-[h2]Custom Games & Cross-Platform Multiplayer[/h2]
-
-[list]
-[*] 16 built in maps for custom games, in addition to campaign
+[*] Use the steam workshop to browse community-made maps and schematics
+[*] Join public community servers to play with others across platforms
 [*] Play co-op, PvP or sandbox
-[*] Join a public dedicated server, or invite friends to your own private session
+[*] Community servers support plugins for custom maps and gamemodes
+[*] Create your public dedicated server, or invite friends to your own private session
 [*] Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more
-[*] Mix & match gamemodes: Combine PvP and PvE gamemodes together
-[/list]
-
-[h2]Custom Map Editor[/h2]
-
-[list]
-[*] Paint terrain with an editor UI
-[*] Edit and preview structures in-game
-[*] Configurable tool modes: Change how each tool functions
-[*] Powerful map generation system, with many different types of filters for procedural manipulation of terrain
-[*] Apply noise, distortion, smoothing, erosion, symmetry, ore generation and random terrain to your maps
-[*] Randomize and configure ore generation, as well as placement of river and resource tiles
-[*] Configure enemy wave layouts
-[*] Share exported maps on the Steam Workshop
-[*] Customize base map rules
-[*] Use 80+ different environmental blocks
+[*] Built-in map editor lets you make your own maps to play and share with the community
+[*] Browse community-made mods to add or remix even more content
 [/list]
diff --git a/fastlane/metadata/steam/english/short-description.txt b/fastlane/metadata/steam/english/short-description.txt
index 1d5eae544e..de6e2b0e60 100644
--- a/fastlane/metadata/steam/english/short-description.txt
+++ b/fastlane/metadata/steam/english/short-description.txt
@@ -1 +1 @@
-An open-ended tower-defense game with a focus on resource management.
+An open-ended factory management game with RTS and tower defense elements.
diff --git a/fastlane/metadata/steam/french/achievements.vdf b/fastlane/metadata/steam/french/achievements.vdf
deleted file mode 100644
index 316945c53c..0000000000
--- a/fastlane/metadata/steam/french/achievements.vdf
+++ /dev/null
@@ -1,109 +0,0 @@
-"lang"
-{
-	"Language"	"french"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Certifié"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Terminer le tutoriel."
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Bagarreur"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Détruire 1 000 unités ennemies."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Purge"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Détruire 100 000 unités ennemies."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Transport Atmosphérique"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Transférer 10 000 ressources."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"Livraison Sans Fin"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Transférer 1 000 000 ressources."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Conquérant"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Remporter 10 matchs en mode Attaque."
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Champion"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Remporter 10 matchs en mode PvP."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Blitz"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Détruire le noyau ennemi en 5 vagues ou moins."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Pluie de Noyau"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Lancer votre Noyau dans une zone 30 fois."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Tenace"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Survivre 100 vagues."
-		"NEW_ACHIEVEMENT_20_11_NAME"	"Invaincu"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Survivre 500 vagues."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"Chercheur"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"Rechercher toutes les technologies."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Transformiste"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Débloquer et utiliser tous les Méchas du jeu."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Surcharge"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Toucher un ennemi couvert d'eau avec un tir électrique."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Déflexion"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Détruire une unité avec la reflexion de son propre tir."
-		"NEW_ACHIEVEMENT_20_17_NAME"	"Une Grave Erreur"
-		"NEW_ACHIEVEMENT_20_17_DESC"	"Rechercher le Routeur."
-		"NEW_ACHIEVEMENT_20_18_NAME"	"Créer"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"Placer 10 000 blocs."
-		"NEW_ACHIEVEMENT_20_19_NAME"	"Dévaster"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Détruire 1 000 blocs ennemis."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Un Désastre Spectaculaire"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Provoquer l'explosion d'un Réacteur à Thorium en le faisant surchauffer."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Cartographe"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Éditer une nouvelle carte 10 fois."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Navigateur"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Télécharger une carte sur le Workshop."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Créateur"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Publier une carte sur le Workshop."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Tueur"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Vaincre un boss."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Explorateur"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Débloquer toutes les zones de la campagne."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Complétionniste"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"Atteindre la vague requise pour débloquer la configuration des ressources sur chaque zones."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Matériau II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Débloquer le Thorium."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Matériau I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Débloquer le Titane."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Remplir votre Mécha de matériaux explosifs et mourir en créant une explosion."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"Le Commencement"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Construire une Usine de Méchas Poignards."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Attaque Directe "
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Utiliser la commande Attaque du Centre de Commandement."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Horde"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Avoir 100 unités actives en même temps."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Fidèles"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Avoir 10 Drones Fantômes actifs en même temps."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Armée Instable"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Avoir 50 Rampeurs actifs en même temps."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Légions"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Construire 1000 unités total."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Atteindre le rang S dans n'importe quelle zone."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Atteindre le rang SS dans n'importe quelle zone"
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Tu Aurais Dû Écouter"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Mourir dans la zone d'exclusion du point d'apparition ennemi."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Il Suffit De Sprinter..."
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Réussir à couler."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Collectionneur"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Remplir le Noyau au maximum de sa capacité avec tous les types de matériaux."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"Foule"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Héberger un serveur avec 10 joueurs connectés."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"Invulnerable"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Construire les tourelles Fusion et Spectre."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Décollage"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Utiliser la Plateforme de Lancement."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Complaisance"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Passer le lancement deux fois, puis se faire anéantir par l'ennemi."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Hérésie"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Construire deux routeurs côte à côte."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Gardien Solitaire"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Survivre 10 vagues sur n'importe quelle zone sans placer un seul bloc."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Incinérer"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Utiliser de la Pyratite dans n'importe quelle tourelle."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Efficacité"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Refroidir une tourelle avec de l'eau ou du liquide cryogénique."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Mode Classique"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Activer la pixelisation."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Érudit"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Ouvrir le Wiki depuis le jeu."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Avantage"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Démarrer une zone en emportant 10 000 ressources ou plus."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Allumage"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Lancer un Réacteur à Impact."
-	}
-}
diff --git a/fastlane/metadata/steam/french/description.txt b/fastlane/metadata/steam/french/description.txt
deleted file mode 100644
index 7978f37f15..0000000000
--- a/fastlane/metadata/steam/french/description.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-Créez des chaînes d'approvisionnement complexes pour alimenter vos tourelles en munitions, produisez des matériaux à utiliser pour vos constructions et protégez vos structures des vagues d'ennemis. Jouez avec vos amis dans des parties multijoueurs cross-plateformes en co-op ou défiez-les lors de matchs PvP en équipe.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Gameplay[/h2]
-
-[list]
-[*] Créez des foreuses et des convoyeurs pour récolter et transporter les resources jusqu'à votre Noyau.
-[*] Utilisez les blocs de production avancés pour créer des ressources plus complexes.
-[*] Construisez des drones pour miner automatiquement les ressources, pour vous assistez dans la construction ou encore pour défendre votre base.
-[*] Gérez l'acheminent des liquides et combattez les incendies.
-[*] Boostez la production en approvisionnant vos blocs de défense et de production avec des liquides de refroidissement et des lubrifiants optionnels.
-[/list]
-
-[h2]Campagne[/h2]
-
-[list]
-[*] Avancez à travers les 12 zones rejouables de la campagne.
-[*] Récoltez and accumulez les resources.
-[*] Recherchez de nouveaux blocs et faites progresser les technologies à votre disposition.
-[*] Missions et objectifs variés.
-[*] Invitez vos amis pour terminer les missions ensemble.
-[*] 120+ blocs technologiques à maîtriser.
-[*] 19 types de drones, mechs et vaisseaux.
-[*] 50+ succès à débloquer.
-[/list]
-
-[h2]Modes de jeu[/h2]
-
-[list]
-[*] [b]Survie[/b]: Construisez des tourelles pour défendre votre base des ennemis dans un style de jeu inspiré des tower-defense. Survivez aussi longtemps que possible, avant de faire décoller votre noyau. Utilisez les ressources récoltées pour débloquer de nouvelles technologies. Préparez votre base pour les attaques de puissants boss aériens.
-[*] [b]Attaque[/b]: Construisez des usines et produisez des unités pour détruire les noyaux ennemis, tout en défendant votre base contre les vagues d'attaque. Créez une grande variété d'unités offensives et de support pour vous aider dans vos objectifs.
-[*] [b]PvP[/b]: Affrontez d'autres joueurs. Constituez jusqu'à 4 équipes différentes et tentez de détruire les noyaux adverses. Créez des unités d'assaut ou attaquez directement les autres bases avec vos mechs.
-[*] [b]Bac à sable[/b]: Jouez avec des ressources infinies et aucune menace ennemie. Utilisez des objets et des blocs spécifiques à ce mode de jeu tels que les sources de liquides. Testez vos designs et faites apparaître les ennemis à la demande.
-[/list]
-
-[h2]Parties Multijoueurs Cross-Platformes Personnalisées[/h2]
-
-[list]
-[*] 12 cartes supplémentaires pour vos parties personnalisées en plus des cartes de la campagne.
-[*] Jouez en Co-op, en PvP ou en mode Bac à sable.
-[*] Rejoignez un serveur dédié public, ou invitez vos amis dans vos propres sessions privées.
-[*] Personnalisez les règles de jeu: changez les coûts des blocs, les stats des ennemis, les ressources de départs, le timing des vagues...
-[*] Mixez les modes de jeux: combinez PvP et PvE dans la même partie.
-[/list]
-
-[h2]Éditeur de carte[/h2]
-
-[list]
-[*] Peignez le terrain grâce à une interface d'édition.
-[*] Éditez and prévisualisez les structures en jeu.
-[*] Outils d'édition configurables: choisissez comment chaque outil fonctionne.
-[*] Générateur de carte puissant, disposant d'un grand nombre de filtres permettant la manipulation procédurale du terrain.
-[*] Appliquez les effets bruit, distortion, lissage, erosion, symétrie, génération de minerais et terrain aléatoire.
-[*] Randomisez et configurez la génération des minerais ainsi que le placement des rivières et des tuiles de ressources.
-[*] Configurez la disposition des vagues d'ennemis.
-[*] Partagez vos cartes sur le Workshop Steam.
-[*] Personnalisez les règles de base de vos cartes.
-[*] 75+ blocs environnementaux différents.
-[/list]
diff --git a/fastlane/metadata/steam/french/short-description.txt b/fastlane/metadata/steam/french/short-description.txt
deleted file mode 100644
index 1198f34de7..0000000000
--- a/fastlane/metadata/steam/french/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Un tower-defense ouvert axé sur la gestion des ressources.
diff --git a/fastlane/metadata/steam/german/achievements.vdf b/fastlane/metadata/steam/german/achievements.vdf
deleted file mode 100644
index e501c9b3e8..0000000000
--- a/fastlane/metadata/steam/german/achievements.vdf
+++ /dev/null
@@ -1,115 +0,0 @@
-"lang"
-{
-	"Language"	"german"
-	"Tokens"
-	{
-	"NEW_ACHIEVEMENT_20_1_NAME"	"Vernichter"
-	"NEW_ACHIEVEMENT_20_1_DESC"	"Zerstöre 1.000 gegnerische Einheiten."
-	"NEW_ACHIEVEMENT_20_2_NAME"	"Auslöschung"
-	"NEW_ACHIEVEMENT_20_2_DESC"	"Zerstöre 100.000 gegnerische Einheiten."
-	"NEW_ACHIEVEMENT_20_5_NAME"	"Endlose Lieferungen"
-	"NEW_ACHIEVEMENT_20_5_DESC"	"Starte insgesamt 100.000 Materialien."
-	"NEW_ACHIEVEMENT_20_6_NAME"	"Eroberer"
-	"NEW_ACHIEVEMENT_20_6_DESC"	"Gewinne 10 Angriffs-Spiele."
-	"NEW_ACHIEVEMENT_20_7_NAME"	"Sieger"
-	"NEW_ACHIEVEMENT_20_7_DESC"	"Gewinne 10 PvP-Spiele gegen andere Spieler."
-	"NEW_ACHIEVEMENT_20_8_NAME"	"Blitzschnell"
-	"NEW_ACHIEVEMENT_20_8_DESC"	"Zerstöre den gegnerischen Kern in 5 Wellen oder weniger."
-	"NEW_ACHIEVEMENT_20_9_NAME"	"Es regnet Kerne"
-	"NEW_ACHIEVEMENT_20_9_DESC"	"Starte insgesamt 30 Mal."
-	"NEW_ACHIEVEMENT_20_10_NAME"	"Hartnäckig"
-	"NEW_ACHIEVEMENT_20_10_DESC"	"Ãœberlebe 100 Wellen."
-	"NEW_ACHIEVEMENT_20_12_NAME"	"Forscher"
-	"NEW_ACHIEVEMENT_20_12_DESC"	"Erforsche alles."
-	"NEW_ACHIEVEMENT_20_14_NAME"	"Stromschlag"
-	"NEW_ACHIEVEMENT_20_14_DESC"	"Treffe einen mit Wasser angegriffenen Gegner mit Elektrizität."
-	"NEW_ACHIEVEMENT_20_15_NAME"	"Reflektion"
-	"NEW_ACHIEVEMENT_20_15_DESC"	"Zerstöre eine Einheit mit dessen eigenem reflektierten Projektil."
-	"NEW_ACHIEVEMENT_20_17_NAME"	"Ein schwerer Fehler"
-	"NEW_ACHIEVEMENT_20_17_DESC"	"Erforsche den Verteiler."
-	"NEW_ACHIEVEMENT_20_18_NAME"	"Baumeister"
-	"NEW_ACHIEVEMENT_20_18_DESC"	"Baue 10.000 Blöcke."
-	"NEW_ACHIEVEMENT_20_19_NAME"	"Vernichter"
-	"NEW_ACHIEVEMENT_20_19_DESC"	"Zerstöre 1.000 gegnerische Blöcke."
-	"NEW_ACHIEVEMENT_20_20_NAME"	"Eine spektakuläre Katastrophe"
-	"NEW_ACHIEVEMENT_20_20_DESC"	"Lass einen Thorium-Reaktor explodieren."
-	"NEW_ACHIEVEMENT_20_21_NAME"	"Kartograph"
-	"NEW_ACHIEVEMENT_20_21_DESC"	"Erstelle 10 neue Karten."
-	"NEW_ACHIEVEMENT_20_22_NAME"	"Sucher"
-	"NEW_ACHIEVEMENT_20_22_DESC"	"Lade dir eine Karte aus der Workshop herunter."
-	"NEW_ACHIEVEMENT_20_23_NAME"	"Schöpfer"
-	"NEW_ACHIEVEMENT_20_23_DESC"	"Veröffentliche eine Karte im Workshop."
-	"NEW_ACHIEVEMENT_20_24_NAME"	"Bezwinger"
-	"NEW_ACHIEVEMENT_20_24_DESC"	"Besiege einen Boss."
-	"NEW_ACHIEVEMENT_20_25_NAME"	"Entdecker"
-	"NEW_ACHIEVEMENT_20_25_DESC"	"Schalte alle Sektoren frei."
-	"NEW_ACHIEVEMENT_20_29_NAME"	"Material II"
-	"NEW_ACHIEVEMENT_20_29_DESC"	"Schalte Thorium frei."
-	"NEW_ACHIEVEMENT_20_31_NAME"	"Material I"
-	"NEW_ACHIEVEMENT_20_31_DESC"	"Schalte Titan frei."
-	"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-	"NEW_ACHIEVEMENT_21_0_DESC"	"Lade explosives Material und sterbe."
-	"NEW_ACHIEVEMENT_21_1_NAME"	"Es beginnt"
-	"NEW_ACHIEVEMENT_21_1_DESC"	"Baue eine Bodeneinheiten-Fabrik."
-	"NEW_ACHIEVEMENT_21_2_NAME"	"Direkter Angriff"
-	"NEW_ACHIEVEMENT_21_2_DESC"	"Befehle einen Angriff mit der Kommandozentrale."
-	"NEW_ACHIEVEMENT_21_3_NAME"	"Schwarm"
-	"NEW_ACHIEVEMENT_21_3_DESC"	"Habe 100 Einheiten gleichzeitig aktiv."
-	"NEW_ACHIEVEMENT_21_4_NAME"	"Schar"
-	"NEW_ACHIEVEMENT_21_4_DESC"	"Habe 10 Poly-Einheiten gleichzeitig aktiv."
-	"NEW_ACHIEVEMENT_21_5_NAME"	"Robotiker"
-	"NEW_ACHIEVEMENT_21_5_DESC"	"Baue jede Einheit."
-	"NEW_ACHIEVEMENT_21_6_NAME"	"Legion"
-	"NEW_ACHIEVEMENT_21_6_DESC"	"Baue insgesamt 1.000 Einheiten."
-	"NEW_ACHIEVEMENT_21_9_NAME"	"Du hättest zuhören sollen"
-	"NEW_ACHIEVEMENT_21_9_DESC"	"Sterbe im Spawnpunkt der Gegner."
-	"NEW_ACHIEVEMENT_21_10_NAME"	"Dafür gibt es Wassereinheiten"
-	"NEW_ACHIEVEMENT_21_10_DESC"	"Ertrinke."
-	"NEW_ACHIEVEMENT_21_11_NAME"	"Sammler"
-	"NEW_ACHIEVEMENT_21_11_DESC"	"Fülle den mit jedem Material ganz auf."
-	"NEW_ACHIEVEMENT_21_12_NAME"	"Menge"
-	"NEW_ACHIEVEMENT_21_12_DESC"	"Habe 10 Spieler in deinem Spiel."
-	"NEW_ACHIEVEMENT_21_13_NAME"	"Unverletzlich"
-	"NEW_ACHIEVEMENT_21_13_DESC"	"Baue den Meltdown, Phantom und Foreshadow."
-	"NEW_ACHIEVEMENT_21_14_NAME"	"Abflug"
-	"NEW_ACHIEVEMENT_21_14_DESC"	"Benutze ein Launchpad."
-	"NEW_ACHIEVEMENT_21_16_NAME"	"Ketzerei"
-	"NEW_ACHIEVEMENT_21_16_DESC"	"Baue zwei Verteiler nebeneinander."
-	"NEW_ACHIEVEMENT_21_17_NAME"	"Einsamer Wächter"
-	"NEW_ACHIEVEMENT_21_17_DESC"	"Überlebe 10 Wellen, ohne Blöcke zu platzieren."
-	"NEW_ACHIEVEMENT_21_18_NAME"	"Verbrenner"
-	"NEW_ACHIEVEMENT_21_18_DESC"	"Verwende Pyratit in einem Geschütz."
-	"NEW_ACHIEVEMENT_21_19_NAME"	"Effizienz"
-	"NEW_ACHIEVEMENT_21_19_DESC"	"Kühle ein Geschütz mithilfe von Wasser oder Kryoflüssigkeit."
-	"NEW_ACHIEVEMENT_21_20_NAME"	"Klassischer Modus"
-	"NEW_ACHIEVEMENT_21_20_DESC"	"Schalte die Verpixelung an."
-	"NEW_ACHIEVEMENT_21_21_NAME"	"Schüler"
-	"NEW_ACHIEVEMENT_21_21_DESC"	"Besuche aus dem Spiel die Wiki."
-	"NEW_ACHIEVEMENT_21_22_NAME"	"Vorsprung"
-	"NEW_ACHIEVEMENT_21_22_DESC"	"Starte einen Sektor mit 10.000 oder mehr Materialen."
-	"NEW_ACHIEVEMENT_21_23_NAME"	"Zündung"
-	"NEW_ACHIEVEMENT_21_23_DESC"	"Starte einen Schlaggenerator."
-	"NEW_ACHIEVEMENT_21_24_NAME"	"Beschleunigung"
-	"NEW_ACHIEVEMENT_21_24_DESC"	"Aktiviere den interplanetarischen Beschleuniger."
-	"NEW_ACHIEVEMENT_21_25_NAME"	"Die Spirale"
-	"NEW_ACHIEVEMENT_21_25_DESC"	"Kein Anfang und kein Ende..."
-	"NEW_ACHIEVEMENT_21_26_NAME"	"Eskalierung"
-	"NEW_ACHIEVEMENT_21_26_DESC"	"Erstelle eine Einheit der fünften Stufe."
-	"NEW_ACHIEVEMENT_21_27_NAME"	"Architekt"
-	"NEW_ACHIEVEMENT_21_27_DESC"	"Erstelle 20 Entwürfe."
-	"NEW_ACHIEVEMENT_21_28_NAME"	"Weltherrschaft"
-	"NEW_ACHIEVEMENT_21_28_DESC"	"Erobere jeden Sektor auf Serpulo."
-	"NEW_ACHIEVEMENT_21_29_NAME"	"Lufttransport"
-	"NEW_ACHIEVEMENT_21_29_DESC"	"Trage eine Einheit der fünften Stufe mit einem Okt."
-	"NEW_ACHIEVEMENT_21_30_NAME"	"Die ultimative Form"
-	"NEW_ACHIEVEMENT_21_30_DESC"	"Schließe dich ihnen an."
-	"NEW_ACHIEVEMENT_21_31_NAME"	"Produktion I"
-	"NEW_ACHIEVEMENT_21_31_DESC"	"Stelle insgesamt 5.000 Ressourcen/min in der Kampagne her."
-	"NEW_ACHIEVEMENT_26_0_NAME"	"Produktion II"
-	"NEW_ACHIEVEMENT_26_0_DESC"	"Stelle insgesamt 50.000 Ressourcen/min in der Kampagne her."
-	"NEW_ACHIEVEMENT_26_1_NAME"	"Sicherer Sieg"
-	"NEW_ACHIEVEMENT_26_1_DESC"	"Erobere einen Sektor während du in einem Anderen spielst."
-	"NEW_ACHIEVEMENT_26_2_NAME"	"Kleines Imperium"
-	"NEW_ACHIEVEMENT_26_2_DESC"	"Besitze 10 eroberte Sektoren gleichzeitig."
-	}
-}
diff --git a/fastlane/metadata/steam/german/description.txt b/fastlane/metadata/steam/german/description.txt
deleted file mode 100644
index 941444cdbd..0000000000
--- a/fastlane/metadata/steam/german/description.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Spielmechanik[/h2]
-
-[list]
-[*] Baue komplexe Produktionsketten aus Förderbändern, um deine Geschütztürme mit Munition zu versorgen
-[*] Stelle Materialien her, um deine Fabrik zu vergrößern und sie vor Gegnerwellen zu schützen
-[*] Spiele mit deinen Freunden in plattformübergreifenden Partien oder fordere sie zum Kampf heraus
-[*] Es gibt immer etwas zu tun: Wenn du deine Kühlsysteme nicht im Blick behältst, könnte dein Reaktor explodieren!
-[*] Produziere Einheiten, die bei deiner Basis helfen oder den Gegner angreifen
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-1-8679abe089cd.gif[/img]
-
-[h2]Kampagne[/h2]
-
-[list]
-[*] Erobere den Planeten Serpulo, indem du über 250 prozedural generierte Sektoren und 16 handgemachte Karten eroberst
-[*] Stelle Materialien in eroberten Sektoren her, während du den nächsten Sektor eroberst
-[*] Verteidige deine Sektoren vor regelmäßigen Invasionen
-[*] Transportiere Materialien zwischen deinen Sektoren
-[*] Schalte neue Blöcke in der Forschung frei
-[*] Schließe Missionen zusammen mit deinen Freunden ab
-[*] 33 verschiedene Einheiten
-[*] über 50 Erfolge
-[/list]
-
-[h2]Spielmodi[/h2]
-
-[list]
-[*] [b]Überleben[/b]: Baue Geschütztürme und verteidige Wellen von Gegnern. Bereite dich auf zwischenzeitliche Zerstörungsangriffe von flugfähigen Einheiten vor.
-[*] [b]Angriff[/b]: Stelle Einheiten her, um den gegnerischen Kern zu zerstören. Vergesse dabei nicht, deinen eigenen Kern zu schützen!
-[*] [b]PvP[/b]: Kämpfe gegen andere Spieler in Teams und zerstöre die gegnerischen Kerne.
-[*] [b]Sandkasten[/b]: Probiere deine Designs mit unendlichen Ressourcen und Gegnerwellen auf Anfrage aus.
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/2020-11-30_10-46-02.gif[/img]
-
-[h2]Mehrspielermodus[/h2]
-
-[list]
-[*] Trete einem öffentlichen Server bei oder eröffne ein Spiel für deine Freunde
-[*] Ändere die Spielregeln: Kosten, Schadenswerte und mehr!
-[*] Kombiniere PvP und PvE (player versus enemies)
-[/list]
-
-[h2]Karteneditor[/h2]
-
-[list]
-[*] Passe die Werkzeuge nach deinen Vorstellungen an
-[*] Viele Filter für das prozedurale Generieren der Umgebung
-[*] Verschönere die Landschaft mit Rauschen, Verzerrungen, Erosion, Symmetrie und Zufallsgenerierung
-[*] Modifiziere die Gegnerwellen
-[*] Teile deine Karten im Steam-Workshop
-[*] Nutze über 80 verschiedene Umgebungsblöcke
-[/list]
diff --git a/fastlane/metadata/steam/german/short-description.txt b/fastlane/metadata/steam/german/short-description.txt
deleted file mode 100644
index 9317cbdecf..0000000000
--- a/fastlane/metadata/steam/german/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ein offenes Tower-Defense-Spiel mit Fokus auf Ressourcenverwaltung
diff --git a/fastlane/metadata/steam/hungarian/achievements.vdf b/fastlane/metadata/steam/hungarian/achievements.vdf
new file mode 100644
index 0000000000..6dd1226554
--- /dev/null
+++ b/fastlane/metadata/steam/hungarian/achievements.vdf
@@ -0,0 +1,183 @@
+"lang"
+{
+	"Language"	"hungarian"
+	"Tokens"
+	{
+		"NEW_ACHIEVEMENT_20_1_NAME"	"Selejtező"
+		"NEW_ACHIEVEMENT_20_1_DESC"	"Pusztíts el 1 000 ellenséges egységet."
+		"NEW_ACHIEVEMENT_20_2_NAME"	"Megtisztulás"
+		"NEW_ACHIEVEMENT_20_2_DESC"	"Pusztíts el 100 000 ellenséges egységet."
+		"NEW_ACHIEVEMENT_20_5_NAME"	"Végtelen szállítmányok"
+		"NEW_ACHIEVEMENT_20_5_DESC"	"Összesen 100 000 nyersanyag elindítása a szektorok között."
+		"NEW_ACHIEVEMENT_20_6_NAME"	"Hódító"
+		"NEW_ACHIEVEMENT_20_6_DESC"	"Nyerj meg 10 támadó módú mérkőzést."
+		"NEW_ACHIEVEMENT_20_7_NAME"	"Bajnok"
+		"NEW_ACHIEVEMENT_20_7_DESC"	"Nyerj meg 10 többjátékos PvP mérkőzést."
+		"NEW_ACHIEVEMENT_20_8_NAME"	"Villám"
+		"NEW_ACHIEVEMENT_20_8_DESC"	"Semmisíts meg egy ellenséges támaszpontot egy támadási zónában 5 vagy annál kevesebb hullámban."
+		"NEW_ACHIEVEMENT_20_9_NAME"	"Támaszponteső"
+		"NEW_ACHIEVEMENT_20_9_DESC"	"Indítsd el a támaszpontot 30-szor."
+		"NEW_ACHIEVEMENT_20_10_NAME"	"Kitartó"
+		"NEW_ACHIEVEMENT_20_10_DESC"	"Élj túl 100 hullámot."
+		"NEW_ACHIEVEMENT_20_12_NAME"	"Fejlesztő"
+		"NEW_ACHIEVEMENT_20_12_DESC"	"Fejlessz ki mindent."
+		"NEW_ACHIEVEMENT_20_14_NAME"	"Túlterhelés"
+		"NEW_ACHIEVEMENT_20_14_DESC"	"Csapj meg árammal egy vízzel borított ellenséget."
+		"NEW_ACHIEVEMENT_20_15_NAME"	"Eltérítés"
+		"NEW_ACHIEVEMENT_20_15_DESC"	"Pusztíts el egy egységet a saját visszavert lövedékével."
+		"NEW_ACHIEVEMENT_20_17_NAME"	"Egy végzetes hiba"
+		"NEW_ACHIEVEMENT_20_17_DESC"	"Az elosztó kifejlesztése."
+		"NEW_ACHIEVEMENT_20_18_NAME"	"Készítő"
+		"NEW_ACHIEVEMENT_20_18_DESC"	"Helyezz el 10 000 blokkot."
+		"NEW_ACHIEVEMENT_20_19_NAME"	"Zúzás"
+		"NEW_ACHIEVEMENT_20_19_DESC"	"Pusztíts el 1 000 ellenséges blokkot."
+		"NEW_ACHIEVEMENT_20_20_NAME"	"Egy látványos katasztrófa"
+		"NEW_ACHIEVEMENT_20_20_DESC"	"Egy tóriumreaktor túlmelegedése és felrobbanása."
+		"NEW_ACHIEVEMENT_20_21_NAME"	"Térképész"
+		"NEW_ACHIEVEMENT_20_21_DESC"	"Készíts 10 új pályát."
+		"NEW_ACHIEVEMENT_20_22_NAME"	"Böngésző"
+		"NEW_ACHIEVEMENT_20_22_DESC"	"Töltse le egy pályát a Steam Műhelyből."
+		"NEW_ACHIEVEMENT_20_23_NAME"	"Alkotó"
+		"NEW_ACHIEVEMENT_20_23_DESC"	"Tegyél közzé egy pályát a Steam Műhelyben."
+		"NEW_ACHIEVEMENT_20_24_NAME"	"Gyilkoló"
+		"NEW_ACHIEVEMENT_20_24_DESC"	"Győzz le egy őrzőt."
+		"NEW_ACHIEVEMENT_20_29_NAME"	"Nyersanyag II"
+		"NEW_ACHIEVEMENT_20_29_DESC"	"Oldd fel a tóriumot."
+		"NEW_ACHIEVEMENT_20_31_NAME"	"Nyersanyag I"
+		"NEW_ACHIEVEMENT_20_31_DESC"	"Oldd fel a titániumot."
+		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
+		"NEW_ACHIEVEMENT_21_0_DESC"	"Tölts fel egy bármely nem-támaszpont egységet robbanóanyaggal és halj meg."
+		"NEW_ACHIEVEMENT_21_1_NAME"	"Elkezdődik"
+		"NEW_ACHIEVEMENT_21_1_DESC"	"Építs egy földiegységgyárat."
+		"NEW_ACHIEVEMENT_21_2_NAME"	"Közvetlen támadás"
+		"NEW_ACHIEVEMENT_21_2_DESC"	"Parancsold meg bármelyik egységnek, hogy támadjon meg egy célpontot."
+		"NEW_ACHIEVEMENT_21_3_NAME"	"Raj"
+		"NEW_ACHIEVEMENT_21_3_DESC"	"Legyen egyszerre 100 aktív egységed."
+		"NEW_ACHIEVEMENT_21_4_NAME"	"Nyáj"
+		"NEW_ACHIEVEMENT_21_4_DESC"	"Legyen egyszerre 10 aktív Poly drón egységed."
+		"NEW_ACHIEVEMENT_21_5_NAME"	"Robottechnikus"
+		"NEW_ACHIEVEMENT_21_5_DESC"	"�llítsd elő az egységek minden típusát."
+		"NEW_ACHIEVEMENT_21_6_NAME"	"Légiók"
+		"NEW_ACHIEVEMENT_21_6_DESC"	"�llíts elő 1 000 egységet."
+		"NEW_ACHIEVEMENT_21_9_NAME"	"Figyelned kellett volna"
+		"NEW_ACHIEVEMENT_21_9_DESC"	"Halj meg a ledobási pont kizárási zónájában."
+		"NEW_ACHIEVEMENT_21_10_NAME"	"Ezért vannak a haditengerészeti egységek"
+		"NEW_ACHIEVEMENT_21_10_DESC"	"Megfulladt."
+		"NEW_ACHIEVEMENT_21_11_NAME"	"Gyűjtő"
+		"NEW_ACHIEVEMENT_21_11_DESC"	"Töltsd meg a támaszpontot a maximális kapacitásig mindenféle nyersanyaggal."
+		"NEW_ACHIEVEMENT_21_12_NAME"	"Tömeg"
+		"NEW_ACHIEVEMENT_21_12_DESC"	"Indíts egy kiszolgálót 10 játékossal."
+		"NEW_ACHIEVEMENT_21_13_NAME"	"Sebezhetetlen"
+		"NEW_ACHIEVEMENT_21_13_DESC"	"Építs Meltdown-, Spectre- és Foreshadow-lövegtornyokat."
+		"NEW_ACHIEVEMENT_21_14_NAME"	"Felszállás"
+		"NEW_ACHIEVEMENT_21_14_DESC"	"Használd a kilövőállást."
+		"NEW_ACHIEVEMENT_21_16_NAME"	"Eretnekség"
+		"NEW_ACHIEVEMENT_21_16_DESC"	"Építs két elosztót egymás mellé."
+		"NEW_ACHIEVEMENT_21_17_NAME"	"Magányos védelmező"
+		"NEW_ACHIEVEMENT_21_17_DESC"	"Élj túl 10 hullámot bármelyik zónában, blokkok elhelyezése nélkül."
+		"NEW_ACHIEVEMENT_21_18_NAME"	"Hamvasztás"
+		"NEW_ACHIEVEMENT_21_18_DESC"	"Használd a piratitot bármelyik lövegtoronyban."
+		"NEW_ACHIEVEMENT_21_19_NAME"	"Hatásfok"
+		"NEW_ACHIEVEMENT_21_19_DESC"	"Hűts le egy lövegtornyot vízzel vagy hűtőfolyadékkal."
+		"NEW_ACHIEVEMENT_21_20_NAME"	"Klasszikus mód"
+		"NEW_ACHIEVEMENT_21_20_DESC"	"Kapcsold be a pixeles módot."
+		"NEW_ACHIEVEMENT_21_21_NAME"	"Tudós"
+		"NEW_ACHIEVEMENT_21_21_DESC"	"Nyisd meg a Wikit a játékból."
+		"NEW_ACHIEVEMENT_21_22_NAME"	"Erős kezdés"
+		"NEW_ACHIEVEMENT_21_22_DESC"	"Indítsd el a támaszpontot bármely zónába 10 000 vagy több nyersanyaggal konfigurálva."
+		"NEW_ACHIEVEMENT_21_23_NAME"	"Begyújtás"
+		"NEW_ACHIEVEMENT_21_23_DESC"	"Indíts be egy ütközéses erőművet."
+		"NEW_ACHIEVEMENT_21_25_NAME"	"A spirál"
+		"NEW_ACHIEVEMENT_21_25_DESC"	"Csak körbe-körbe szállít…
+		"NEW_ACHIEVEMENT_21_26_NAME"	"Fokozás"
+		"NEW_ACHIEVEMENT_21_26_DESC"	"Építs egy 5-ös szintű egységet."
+		"NEW_ACHIEVEMENT_21_27_NAME"	"Építész"
+		"NEW_ACHIEVEMENT_21_27_DESC"	"Készíts 20 vázlatot."
+		"NEW_ACHIEVEMENT_21_28_NAME"	"Globális dominancia"
+		"NEW_ACHIEVEMENT_21_28_DESC"	"Foglald el a Serpulo minden szektorát."
+		"NEW_ACHIEVEMENT_21_29_NAME"	"Légi szállítás"
+		"NEW_ACHIEVEMENT_21_29_DESC"	"Vegyél fel egy 5-ös szintű egységet egy Oct egységszállítóba."
+		"NEW_ACHIEVEMENT_21_30_NAME"	"A tökéletes forma"
+		"NEW_ACHIEVEMENT_21_30_DESC"	"Csatlakozz hozzájuk."
+		"NEW_ACHIEVEMENT_21_31_NAME"	"Termelés I"
+		"NEW_ACHIEVEMENT_21_31_DESC"	"Érj el 5 000 nyersanyag/perc össztermelést a hadjáratban."
+		"NEW_ACHIEVEMENT_26_0_NAME"	"Termelés II"
+		"NEW_ACHIEVEMENT_26_0_DESC"	"Érj el 50 000 nyersanyag/perc össztermelést a hadjáratban."
+		"NEW_ACHIEVEMENT_26_1_NAME"	"Biztos győzelem"
+		"NEW_ACHIEVEMENT_26_1_DESC"	"Foglalj el egy szektort, miközben egy másik szektorban játszol."
+		"NEW_ACHIEVEMENT_26_2_NAME"	"Kis birodalom"
+		"NEW_ACHIEVEMENT_26_2_DESC"	"Legyen az ellenőrzésed alatt egyszerre 10 szektor."
+		"NEW_ACHIEVEMENT_26_3_NAME"	"Tervező"
+		"NEW_ACHIEVEMENT_26_3_DESC"	"Készíts 500 vázlatot."
+		"NEW_ACHIEVEMENT_26_4_NAME"	"Terjesztőmester"
+		"NEW_ACHIEVEMENT_26_4_DESC"	"Használj minden nyersanyagszállító blokkot (egy bolygón) egyetlen pályán."
+		"NEW_ACHIEVEMENT_26_5_NAME"	"Túlhajtás"
+		"NEW_ACHIEVEMENT_26_5_DESC"	"Építs egy túlhajtó kivetítőt."
+		"NEW_ACHIEVEMENT_26_6_NAME"	"Foltozás"
+		"NEW_ACHIEVEMENT_26_6_DESC"	"Építs egy foltozó kivetítőt."
+		"NEW_ACHIEVEMENT_26_7_NAME"	"Hatástalanság"
+		"NEW_ACHIEVEMENT_26_7_DESC"	"Építs kútfúró tornyot a vízre, ahelyett, hogy szivattyút használnál."
+		"NEW_ACHIEVEMENT_26_8_NAME"	"Raktárkészlet"
+		"NEW_ACHIEVEMENT_26_8_DESC"	"Gyűjts össze összesen 10 millió nyersanyagot a hadjáratban."
+		"NEW_ACHIEVEMENT_26_9_NAME"	"Minden esély ellenére"
+		"NEW_ACHIEVEMENT_26_9_DESC"	"Mérj gyilkos csapást egy Eclipse egységre egy Duo toronnyal."
+		"NEW_ACHIEVEMENT_26_10_NAME"	"Erekir befejezése"
+		"NEW_ACHIEVEMENT_26_10_DESC"	"Foglald el az Erekir utolsó szektorát."
+		"NEW_ACHIEVEMENT_26_11_NAME"	"Serpulo befejezése"
+		"NEW_ACHIEVEMENT_26_11_DESC"	"Foglald el a Serpulo utolsó szektorát."
+		"NEW_ACHIEVEMENT_26_12_NAME"	"Rakomány"
+		"NEW_ACHIEVEMENT_26_12_DESC"	"Indítsd el a támaszpontot a Serpulo egyik szektorába egy saját egyéni támaszpontvázlatot használva."
+		"NEW_ACHIEVEMENT_26_13_NAME"	"Túlságosan felkészült"
+		"NEW_ACHIEVEMENT_26_13_DESC"	"Fejleszd a Becsapódási pont szektorban lévő támaszpontot Magnumra."
+		"NEW_ACHIEVEMENT_26_14_NAME"	"Kitörés"
+		"NEW_ACHIEVEMENT_26_14_DESC"	"A neoplazma terjedjen át bármely víztartalmú blokkra."
+		"NEW_ACHIEVEMENT_26_15_NAME"	"Törékeny"
+		"NEW_ACHIEVEMENT_26_15_DESC"	"Adj extra robbanássebzést egy fagyasztó állapothatással rendelkező egységnek."
+		"NEW_ACHIEVEMENT_26_16_NAME"	"Serpulo struktúramester"
+		"NEW_ACHIEVEMENT_26_16_DESC"	"Építsd meg a Serpulo összes elérhető blokkját."
+		"NEW_ACHIEVEMENT_26_17_NAME"	"Erekir struktúramester"
+		"NEW_ACHIEVEMENT_26_17_DESC"	"Építsd meg az Erekir összes elérhető blokkját."
+		"NEW_ACHIEVEMENT_26_18_NAME"	"Pajzsok le"
+		"NEW_ACHIEVEMENT_26_18_DESC"	"Törd össze egy ellenséges erőpajzs-kivetítő pajzsát."
+		"NEW_ACHIEVEMENT_26_19_NAME"	"Hol van a kézikönyv?"
+		"NEW_ACHIEVEMENT_26_19_DESC"	"Fejleszd ki a mikroprocesszort."
+		"NEW_ACHIEVEMENT_26_20_NAME"	"�rnyékolás"
+		"NEW_ACHIEVEMENT_26_20_DESC"	"Negatív 10k/mp teljesítmény elérése egy hálózatban."
+		"NEW_ACHIEVEMENT_26_21_NAME"	"Teljesítmény-túltengés"
+		"NEW_ACHIEVEMENT_26_21_DESC"	"Pozitív 100k/mp teljesítmény elérése egy hálózatban."
+		"NEW_ACHIEVEMENT_26_22_NAME"	"Magas kapacitás"
+		"NEW_ACHIEVEMENT_26_22_DESC"	"Legyen 1 millió tárolt energia az akkumulátorokban egy hálózatban."
+		"NEW_ACHIEVEMENT_26_23_NAME"	"Rossz ötlet"
+		"NEW_ACHIEVEMENT_26_23_DESC"	"Helyezz robbanóanyagot egy égetőerőműbe."
+		"NEW_ACHIEVEMENT_26_24_NAME"	"Szennyezés"
+		"NEW_ACHIEVEMENT_26_24_DESC"	"Robbanjon fel egy neopláziareaktor a neoplazma felhalmozódása miatt."
+		"NEW_ACHIEVEMENT_26_25_NAME"	"Módosított"
+		"NEW_ACHIEVEMENT_26_25_DESC"	"Telepíts egy modot."
+		"NEW_ACHIEVEMENT_26_26_NAME"	"Elosztó"
+		"NEW_ACHIEVEMENT_26_26_DESC"	"Elosztó."
+		"NEW_ACHIEVEMENT_26_27_NAME"	"A teljes élmény"
+		"NEW_ACHIEVEMENT_26_27_DESC"	"Csatlakozz egy közösségi kiszolgálóhoz."
+		"NEW_ACHIEVEMENT_26_28_NAME"	"Hackerman"
+		"NEW_ACHIEVEMENT_26_28_DESC"	"Nyisd meg a szkript-konzolt."
+		"NEW_ACHIEVEMENT_26_29_NAME"	"Közvetlen irányítás"
+		"NEW_ACHIEVEMENT_26_29_DESC"	"Irányíts te magad kézzel egy lövegtornyot."
+		"NEW_ACHIEVEMENT_26_30_NAME"	"Ellenséges vonalak mögött"
+		"NEW_ACHIEVEMENT_26_30_DESC"	"Dobj le egységeket egy ellenséges támaszpont építési tilalmi zónájába."
+		"NEW_ACHIEVEMENT_26_31_NAME"	"Bosszú"
+		"NEW_ACHIEVEMENT_26_31_DESC"	"Pusztíts el egy Scatter-lövegtornyot egy Flare egységgel."
+		"NEW_ACHIEVEMENT_29_0_NAME"	"Légierő"
+		"NEW_ACHIEVEMENT_29_0_DESC"	"Használd egy földi egység erősítés funkcióját."
+		"NEW_ACHIEVEMENT_29_1_NAME"	"Légpárnás"
+		"NEW_ACHIEVEMENT_29_1_DESC"	"Használj egy Elude egységet a folyadékon való átkeléshez."
+		"NEW_ACHIEVEMENT_29_2_NAME"	"Terep erősítés"
+		"NEW_ACHIEVEMENT_29_2_DESC"	"Növeld egy blokk hatékonyságát azáltal, hogy egy meghatározott terepre helyezed."
+		"NEW_ACHIEVEMENT_29_3_NAME"	"Takarítás"
+		"NEW_ACHIEVEMENT_29_3_DESC"	"Törj össze 100 sziklát."
+		"NEW_ACHIEVEMENT_29_4_NAME"	"Globális takarítás"
+		"NEW_ACHIEVEMENT_29_4_DESC"	"Törj össze 10 000 sziklát."
+		"NEW_ACHIEVEMENT_29_5_NAME"	"Semlegesítve"
+		"NEW_ACHIEVEMENT_29_5_DESC"	"Használj egy Shockwave-lövegtornyot, hogy semlegesítsd a beérkező lövedékeket."
+		"NEW_ACHIEVEMENT_29_6_NAME"	"Sajnos"
+		"NEW_ACHIEVEMENT_29_6_DESC"	"Használd az :alphachan: hangulatjelet a többjátékos csevegésben vagy ne, te döntesz."
+	}
+}
diff --git a/fastlane/metadata/steam/hungarian/description.txt b/fastlane/metadata/steam/hungarian/description.txt
new file mode 100644
index 0000000000..6d77a69dc1
--- /dev/null
+++ b/fastlane/metadata/steam/hungarian/description.txt
@@ -0,0 +1,62 @@
+A Mindustry egy gyárépítő játék Toronyvédő és RTS elemekkel. Készíts bonyolult ellátási láncokat, hogy lőszert juttass a lövegtornyokba, termelj az építkezéshez használható nyersanyagokat, és állíts elő egységeket. Irányítsd az egységeket, hogy elfoglald az ellenséges bázisokat, és bővítsd a termelésedet. Védd meg a támaszpontodat a hullámokban támadó ellenségektől.
+
+Játszd végig a hadjáratokat egyedül, vagy vállvetve a barátaiddal a platformokon átívelő többjátékos módban, vagy hívd ki őket csapat alapú PvP mérkőzésekre
+
+[img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
+
+[h2]Gyár építés[/h2]
+
+[list]
+[*] Hozz létre bonyolult szállítószalagokból álló ellátási láncokat, hogy lőszert juttass a lövegtornyokba és termelj nyersanyagokat az építkezésekhez
+[*] Használd a gyártó-blokkokat a legkülönfélébb fejlett nyersanyagok létrehozásához
+[*] Oszd szét a folyadékokat, és küzdj meg az állandó kihívásokkal, mint például a tűzkitörések, vagy az ellenséges repülőgépek rajtaütéseivel
+[*] Hozd ki a legtöbbet a termelésből az opcionális hűtőfolyadék-ellátással
+[*] Egységek széles skáláját állíthatod elő a bázisod automatikus irányításához, és az ellenséges bázisok megtámadásához
+[/list]
+
+[h2]Toronyvédés[/h2]
+
+[list]
+[*] Védd meg építményeidet a hullámokban támadó ellenségektől
+[*] Stratégiailag helyezd el a lövegtornyokat, hogy elpusztítsd a támadóidat, mielőtt elérnék a támaszpontodat
+[*] Lásd el a lövegtornyokat lőszerrel, hűtőfolyadékkal és energiával
+[*] Erősítsd meg a védelmedet erőpajzs- és foltozó-kivetítőkkel és egyéb támogató épületekkel
+[/list]
+
+[img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
+
+[h2]Valós idejű stratégia[/h2]
+
+[list]
+[*] �llíts fel összeszerelősorokat a gépesített egységek hadainak előállításához
+[*] Használd az egységeidet a hatékonyan felszerelt ellenséges bázisok ellen
+[*] Foglalj el minél több területet, hogy még több támaszpontot helyezhess el, és további erőforrásokhoz férhess hozzá a terjeszkedéshez
+[/list]
+
+[h2]Hadjárat[/h2]
+
+[list]
+[*] Játssz végig a két különböző bolygó hadjáratait
+[*] Hódítsd meg a Serpulo és az Erekir bolygót, miközben 35 kézzel készített pályán és 250+ procedurálisan előállított szektoron keresztül haladsz
+[*] Foglalj el területeket és építs gyárakat, hogy nyersanyagokat termelhess, miközben más szektorokban játszol
+[*] Védd meg a szektorokat az időszakos invázióktól
+[*] Koordináld az erőforrások elosztását a szektorok között az indítóállások felhasználásával
+[*] Fedezz fel új épületeket, gyárakat a fejlődés elősegítése érdekében
+[*] Hívd meg barátaidat, hogy együtt teljesítsék a küldetéseket
+[*] 250+ technológiai épület használatának elsajátítása
+[*] 50+ különböző típusú drón, mech és hajó
+[*] 80+ teljesítendő feladat
+[/list]
+
+[h2]Közösség és moddolás[/h2]
+
+[list]
+[*] Használd a Steam Műhelyt a közösség által készített pályák és vázlatok böngészéséhez.
+[*] Csatlakozz nyilvános és közösségi kiszolgálókhoz, hogy másokkal játszhass platformokon keresztül
+[*] Játssz vállvetve, PvP-ben, vagy homokozóban a barátaiddal
+[*] A közösségi kiszolgálók támogatják az egyéni pályák és játékmódok bővítményeit
+[*] Hozz létre nyilvános dedikált kiszolgálót, vagy hívd meg a barátaidat a saját privát munkamenetedre
+[*] Testre szabható játékszabályok: Változtasd meg az épületek építési költségeit, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését, vagy bármi mást
+[*] A beépített pályaszerkesztővel saját pályákat készíthetsz, hogy játszhass másokkal és megoszthasd a közösséggel
+[*] Böngéssz a közösség által készített modok között, hogy még több tartalmat adhass hozzá a játékodhoz, vagy keverj belőlük egy újat
+[/list]
diff --git a/fastlane/metadata/steam/hungarian/short-description.txt b/fastlane/metadata/steam/hungarian/short-description.txt
new file mode 100644
index 0000000000..d0788ec62e
--- /dev/null
+++ b/fastlane/metadata/steam/hungarian/short-description.txt
@@ -0,0 +1 @@
+Egy nyílt végű gyártás-menedzselős játék Toronyvédő és RTS elemekkel.
diff --git a/fastlane/metadata/steam/indonesian/achievements.vdf b/fastlane/metadata/steam/indonesian/achievements.vdf
new file mode 100644
index 0000000000..417527f198
--- /dev/null
+++ b/fastlane/metadata/steam/indonesian/achievements.vdf
@@ -0,0 +1,183 @@
+"lang"
+{
+	"Language"	"indonesian"
+	"Tokens"
+	{
+		"NEW_ACHIEVEMENT_20_1_NAME"	"Scrapper"
+		"NEW_ACHIEVEMENT_20_1_DESC"	"Hancurkan 1000 unit musuh."
+		"NEW_ACHIEVEMENT_20_2_NAME"	"Purge"
+		"NEW_ACHIEVEMENT_20_2_DESC"	"Hancurkan 100.000 unit musuh."
+		"NEW_ACHIEVEMENT_20_5_NAME"	"Endless Shipments"
+		"NEW_ACHIEVEMENT_20_5_DESC"	"Luncurkan 100.000 item secara keseluruhan."
+		"NEW_ACHIEVEMENT_20_6_NAME"	"Penakluk"
+		"NEW_ACHIEVEMENT_20_6_DESC"	"Menangkan 10 pertandingan dalam mode penyerangan."
+		"NEW_ACHIEVEMENT_20_7_NAME"	"Jawara"
+		"NEW_ACHIEVEMENT_20_7_DESC"	"Menangkan 10 pertandingan PvP multipemain."
+		"NEW_ACHIEVEMENT_20_8_NAME"	"Secepat Kilat"
+		"NEW_ACHIEVEMENT_20_8_DESC"	"Hancurkan inti musuh pada zona penyerangan dalam 5 gelombang atau kurang."
+		"NEW_ACHIEVEMENT_20_9_NAME"	"Hujan Inti"
+		"NEW_ACHIEVEMENT_20_9_DESC"	"Luncurkan inti sebanyak 30 kali."
+		"NEW_ACHIEVEMENT_20_10_NAME"	"Kegigihan"
+		"NEW_ACHIEVEMENT_20_10_DESC"	"Bertahan hingga 100 gelombang."
+		"NEW_ACHIEVEMENT_20_12_NAME"	"Periset"
+		"NEW_ACHIEVEMENT_20_12_DESC"	"Buka semua riset yang ada."
+		"NEW_ACHIEVEMENT_20_14_NAME"	"Overload"
+		"NEW_ACHIEVEMENT_20_14_DESC"	"Tembak musuh yang basah dengan listrik."
+		"NEW_ACHIEVEMENT_20_15_NAME"	"Deflection"
+		"NEW_ACHIEVEMENT_20_15_DESC"	"Hancurkan unit dengan tembakan pantulannya sendiri."
+		"NEW_ACHIEVEMENT_20_17_NAME"	"Kesalahan Besar"
+		"NEW_ACHIEVEMENT_20_17_DESC"	"Buka riset Pengarah."
+		"NEW_ACHIEVEMENT_20_18_NAME"	"Pencipta"
+		"NEW_ACHIEVEMENT_20_18_DESC"	"Letakkan 10,000 blok."
+		"NEW_ACHIEVEMENT_20_19_NAME"	"Raze"
+		"NEW_ACHIEVEMENT_20_19_DESC"	"Hancurkan 1,000 blok musuh."
+		"NEW_ACHIEVEMENT_20_20_NAME"	"A Spectacular Disaster"
+		"NEW_ACHIEVEMENT_20_20_DESC"	"Biarkan Reaktor Thorium memanas lalu meledak."
+		"NEW_ACHIEVEMENT_20_21_NAME"	"Mapper"
+		"NEW_ACHIEVEMENT_20_21_DESC"	"Buat peta baru sebanyak 10 kali."
+		"NEW_ACHIEVEMENT_20_22_NAME"	"Peramban"
+		"NEW_ACHIEVEMENT_20_22_DESC"	"Unduh peta dari Workshop."
+		"NEW_ACHIEVEMENT_20_23_NAME"	"Kreator"
+		"NEW_ACHIEVEMENT_20_23_DESC"	"Publikasikan peta ke Workshop."
+		"NEW_ACHIEVEMENT_20_24_NAME"	"Slayer"
+		"NEW_ACHIEVEMENT_20_24_DESC"	"Kalahkan boss."
+		"NEW_ACHIEVEMENT_20_29_NAME"	"Material II"
+		"NEW_ACHIEVEMENT_20_29_DESC"	"Temukan Thorium."
+		"NEW_ACHIEVEMENT_20_31_NAME"	"Material I"
+		"NEW_ACHIEVEMENT_20_31_DESC"	"Temukan Titanium."
+		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
+		"NEW_ACHIEVEMENT_21_0_DESC"	"Isi penuh unit biasa dengan bahan yang mudah meledak lalu hancurkan unitnya."
+		"NEW_ACHIEVEMENT_21_1_NAME"	"Sudah Waktunya"
+		"NEW_ACHIEVEMENT_21_1_DESC"	"Bangun pabrik unit darat."
+		"NEW_ACHIEVEMENT_21_2_NAME"	"Serangan Langsung"
+		"NEW_ACHIEVEMENT_21_2_DESC"	"Issue the Attack command using the Command Center."
+		"NEW_ACHIEVEMENT_21_3_NAME"	"Swarm"
+		"NEW_ACHIEVEMENT_21_3_DESC"	"Miliki 100 unit aktif secara bersamaan."
+		"NEW_ACHIEVEMENT_21_4_NAME"	"Flock"
+		"NEW_ACHIEVEMENT_21_4_DESC"	"Miliki 10 Poly aktif secara bersamaan."
+		"NEW_ACHIEVEMENT_21_5_NAME"	"Roboticist"
+		"NEW_ACHIEVEMENT_21_5_DESC"	"Buat setiap tipe unit."
+		"NEW_ACHIEVEMENT_21_6_NAME"	"Legions"
+		"NEW_ACHIEVEMENT_21_6_DESC"	"Buat 1000 unit."
+		"NEW_ACHIEVEMENT_21_9_NAME"	"Dengarkan Nasihat Dulu"
+		"NEW_ACHIEVEMENT_21_9_DESC"	"Hancur di dalam zona pendaratan musuh."
+		"NEW_ACHIEVEMENT_21_10_NAME"	"Percuma Ada Unit Laut Kalau Begitu"
+		"NEW_ACHIEVEMENT_21_10_DESC"	"Tenggelam."
+		"NEW_ACHIEVEMENT_21_11_NAME"	"Kolektor"
+		"NEW_ACHIEVEMENT_21_11_DESC"	"Isi inti hingga kapasitas penuh dengan semua jenis material."
+		"NEW_ACHIEVEMENT_21_12_NAME"	"Crowd"
+		"NEW_ACHIEVEMENT_21_12_DESC"	"Host server dengan 10 pemain bergabung."
+		"NEW_ACHIEVEMENT_21_13_NAME"	"Invulnerable"
+		"NEW_ACHIEVEMENT_21_13_DESC"	"Bangun menara Meltdown, Spectre dan Foreshadow."
+		"NEW_ACHIEVEMENT_21_14_NAME"	"Lepas Landas"
+		"NEW_ACHIEVEMENT_21_14_DESC"	"Gunakan Launch Pad."
+		"NEW_ACHIEVEMENT_21_16_NAME"	"Heresy"
+		"NEW_ACHIEVEMENT_21_16_DESC"	"Bangun dua pengarah berdekatan satu sama lain."
+		"NEW_ACHIEVEMENT_21_17_NAME"	"Lone Guardian"
+		"NEW_ACHIEVEMENT_21_17_DESC"	"Bertahan sebanyak 10 gelombang pada zona apapun tanpa menaruh blok apapun."
+		"NEW_ACHIEVEMENT_21_18_NAME"	"Incinerate"
+		"NEW_ACHIEVEMENT_21_18_DESC"	"Gunakan Pyratit dalam menara apapun."
+		"NEW_ACHIEVEMENT_21_19_NAME"	"Efisien"
+		"NEW_ACHIEVEMENT_21_19_DESC"	"Dinginkan menara dengan air atau cairan dingin."
+		"NEW_ACHIEVEMENT_21_20_NAME"	"Mode Klasik"
+		"NEW_ACHIEVEMENT_21_20_DESC"	"Hidupkan pikselasi."
+		"NEW_ACHIEVEMENT_21_21_NAME"	"Scholar"
+		"NEW_ACHIEVEMENT_21_21_DESC"	"Buka Wiki dari dalam game."
+		"NEW_ACHIEVEMENT_21_22_NAME"	"Head Start"
+		"NEW_ACHIEVEMENT_21_22_DESC"	"Meluncur ke zona dengan membawa 10.000 atau lebih item."
+		"NEW_ACHIEVEMENT_21_23_NAME"	"Penyalaan"
+		"NEW_ACHIEVEMENT_21_23_DESC"	"Nyalakan sebuah Reaktor Benturan."
+		"NEW_ACHIEVEMENT_21_25_NAME"	"The Spiral"
+		"NEW_ACHIEVEMENT_21_25_DESC"	"Aku pusing tujuh keliling..."
+		"NEW_ACHIEVEMENT_21_26_NAME"	"Escalation"
+		"NEW_ACHIEVEMENT_21_26_DESC"	"Buat unit Tingkat 5."
+		"NEW_ACHIEVEMENT_21_27_NAME"	"Arsitek"
+		"NEW_ACHIEVEMENT_21_27_DESC"	"Buat 20 skematik."
+		"NEW_ACHIEVEMENT_21_28_NAME"	"Dominasi Dunia"
+		"NEW_ACHIEVEMENT_21_28_DESC"	"Taklukkan semua sektor di Serpulo."
+		"NEW_ACHIEVEMENT_21_29_NAME"	"Lepas Landas"
+		"NEW_ACHIEVEMENT_21_29_DESC"	"Angkut sebuah unit T5 dengan unit Oct."
+		"NEW_ACHIEVEMENT_21_30_NAME"	"Wujud Tertinggi"
+		"NEW_ACHIEVEMENT_21_30_DESC"	"Bergabunglah."
+		"NEW_ACHIEVEMENT_21_31_NAME"	"Produksi I"
+		"NEW_ACHIEVEMENT_21_31_DESC"	"Raih total produksi 5,000 item/menit dalam kampanye."
+		"NEW_ACHIEVEMENT_26_0_NAME"	"Produksi II"
+		"NEW_ACHIEVEMENT_26_0_DESC"	"Raih total produksi 50,000 item/menit dalam kampanye."
+		"NEW_ACHIEVEMENT_26_1_NAME"	"Kemenangan Mutlak"
+		"NEW_ACHIEVEMENT_26_1_DESC"	"Taklukkan suatu sektor saat bermain di sektor yang berbeda."
+		"NEW_ACHIEVEMENT_26_2_NAME"	"Kerajaan Kecil"
+		"NEW_ACHIEVEMENT_26_2_DESC"	"Kendalikan 10 sektor secara bersamaan."
+		"NEW_ACHIEVEMENT_26_3_NAME"	"Desainer"
+		"NEW_ACHIEVEMENT_26_3_DESC"	"Buat 500 skematik."
+		"NEW_ACHIEVEMENT_26_4_NAME"	"Master of Distribution"
+		"NEW_ACHIEVEMENT_26_4_DESC"	"Gunakan semua blok transportasi (dari satu planet) dalam peta yang sama."
+		"NEW_ACHIEVEMENT_26_5_NAME"	"Percepatan"
+		"NEW_ACHIEVEMENT_26_5_DESC"	"Bangun sebuah Proyektor Pemercepat."
+		"NEW_ACHIEVEMENT_26_6_NAME"	"Penyembuhan"
+		"NEW_ACHIEVEMENT_26_6_DESC"	"Bangun sebuah Proyektor Penyembuh."
+		"NEW_ACHIEVEMENT_26_7_NAME"	"Tidak Efisien"
+		"NEW_ACHIEVEMENT_26_7_DESC"	"Bangun sebuah Pengekstrak Air di air, yang seharusnya menggunakan pompa."
+		"NEW_ACHIEVEMENT_26_8_NAME"	"Stockpile"
+		"NEW_ACHIEVEMENT_26_8_DESC"	"Kumpulkan 10 juta item dalam kampanye."
+		"NEW_ACHIEVEMENT_26_9_NAME"	"Against All Odds"
+		"NEW_ACHIEVEMENT_26_9_DESC"	"Hancurkan unit Eclipse yang diakhiri tembakan oleh menara Duo."
+		"NEW_ACHIEVEMENT_26_10_NAME"	"Erekir Completion"
+		"NEW_ACHIEVEMENT_26_10_DESC"	"Taklukkan sektor terakhir di Erekir."
+		"NEW_ACHIEVEMENT_26_11_NAME"	"Serpulo Completion"
+		"NEW_ACHIEVEMENT_26_11_DESC"	"Taklukkan sektor terakhir di Serpulo."
+		"NEW_ACHIEVEMENT_26_12_NAME"	"Loadout"
+		"NEW_ACHIEVEMENT_26_12_DESC"	"Luncurkan dengan skema inti kustom di planet Serpulo."
+		"NEW_ACHIEVEMENT_26_13_NAME"	"Overprepared"
+		"NEW_ACHIEVEMENT_26_13_DESC"	"Tingkatkan inti pada Ground Zero menjadi Nukleus."
+		"NEW_ACHIEVEMENT_26_14_NAME"	"Outbreak"
+		"NEW_ACHIEVEMENT_26_14_DESC"	"Biarkan neoplasma menyebar ke blok yang mengisi cairan."
+		"NEW_ACHIEVEMENT_26_15_NAME"	"Brittle"
+		"NEW_ACHIEVEMENT_26_15_DESC"	"Berikan kerusakan ledakan tambahan pada unit yang terkena status efek Membeku."
+		"NEW_ACHIEVEMENT_26_16_NAME"	"Serpulo Structure Mastery"
+		"NEW_ACHIEVEMENT_26_16_DESC"	"Bangun semua blok yang tersedia di Serpulo."
+		"NEW_ACHIEVEMENT_26_17_NAME"	"Erekir Structure Mastery"
+		"NEW_ACHIEVEMENT_26_17_DESC"	"Bangun semua blok yang tersedia di Erekir."
+		"NEW_ACHIEVEMENT_26_18_NAME"	"Shields Down"
+		"NEW_ACHIEVEMENT_26_18_DESC"	"Hancurkan an enemy Force Projector's shield."
+		"NEW_ACHIEVEMENT_26_19_NAME"	"Di Mana Buku Petunjuknya?"
+		"NEW_ACHIEVEMENT_26_19_DESC"	"Buka riset mikro-prosesor."
+		"NEW_ACHIEVEMENT_26_20_NAME"	"Pemadaman"
+		"NEW_ACHIEVEMENT_26_20_DESC"	"Capai -10rb/dtk pasokan tenaga dalam jaringan."
+		"NEW_ACHIEVEMENT_26_21_NAME"	"Power Surge"
+		"NEW_ACHIEVEMENT_26_21_DESC"	"Capai hingga 100rb/dtk tenaga."
+		"NEW_ACHIEVEMENT_26_22_NAME"	"Tegangan Tinggi"
+		"NEW_ACHIEVEMENT_26_22_DESC"	"Miliki 1 juta tenaga stored in batteries in a network."
+		"NEW_ACHIEVEMENT_26_23_NAME"	"Ide Buruk"
+		"NEW_ACHIEVEMENT_26_23_DESC"	"Masukan senyawa peledak dalam generator pembakar."
+		"NEW_ACHIEVEMENT_26_24_NAME"	"Kontaminasi"
+		"NEW_ACHIEVEMENT_26_24_DESC"	"Jadilah saksi meledaknya Reaktor Neoplasia yang disebabkan oleh penumpukan neoplasma."
+		"NEW_ACHIEVEMENT_26_25_NAME"	"Termodifikasi"
+		"NEW_ACHIEVEMENT_26_25_DESC"	"Pasang sebuah mod."
+		"NEW_ACHIEVEMENT_26_26_NAME"	"pengarah"
+		"NEW_ACHIEVEMENT_26_26_DESC"	"pengarah"
+		"NEW_ACHIEVEMENT_26_27_NAME"	"Pengalaman Penuh"
+		"NEW_ACHIEVEMENT_26_27_DESC"	"Masuk dalam peladen komunitas."
+		"NEW_ACHIEVEMENT_26_28_NAME"	"Peretas"
+		"NEW_ACHIEVEMENT_26_28_DESC"	"Buka terminal untuk skripting."
+		"NEW_ACHIEVEMENT_26_29_NAME"	"Kendali Langsung"
+		"NEW_ACHIEVEMENT_26_29_DESC"	"Perintahkan menara secara manual."
+		"NEW_ACHIEVEMENT_26_30_NAME"	"Behind Enemy Lines"
+		"NEW_ACHIEVEMENT_26_30_DESC"	"Jatuhkan unit dalam zona inti anti-membangun musuh."
+		"NEW_ACHIEVEMENT_26_31_NAME"	"Vengeance"
+		"NEW_ACHIEVEMENT_26_31_DESC"	"Hancurkan menara scatter dengan unit flare."
+		"NEW_ACHIEVEMENT_29_0_NAME"	"Mengudara"
+		"NEW_ACHIEVEMENT_29_0_DESC"	"Gunakan fungsi boost pada unit darat."
+		"NEW_ACHIEVEMENT_29_1_NAME"	"Amphibi"
+		"NEW_ACHIEVEMENT_29_1_DESC"	"Gunakan unit Elude untuk menyebrangi cairan."
+		"NEW_ACHIEVEMENT_29_2_NAME"	"Ubin Pemercepat"
+		"NEW_ACHIEVEMENT_29_2_DESC"	"Naikkan efisiensi bangunan dengan menempatkannya di ubin tertentu."
+		"NEW_ACHIEVEMENT_29_3_NAME"	"Bersih-bersih"
+		"NEW_ACHIEVEMENT_29_3_DESC"	"Hancurkan 100 bebatuan kecil."
+		"NEW_ACHIEVEMENT_29_4_NAME"	"The Global Sweep"
+		"NEW_ACHIEVEMENT_29_4_DESC"	"Hancurkan 10,000 bebatuan kecil."
+		"NEW_ACHIEVEMENT_29_5_NAME"	"Ternetralisasi"
+		"NEW_ACHIEVEMENT_29_5_DESC"	"Gunakan menara Shockwave Tower to absorb incoming bullets."
+		"NEW_ACHIEVEMENT_29_6_NAME"	"Sayangnya,"
+		"NEW_ACHIEVEMENT_29_6_DESC"	"Gunakan emoji :alphachan: dalam obrolan multipemain. Mau apa nggak, terserahlah."
+	}
+}
\ No newline at end of file
diff --git a/fastlane/metadata/steam/indonesian/description.txt b/fastlane/metadata/steam/indonesian/description.txt
new file mode 100644
index 0000000000..c0e9b8c134
--- /dev/null
+++ b/fastlane/metadata/steam/indonesian/description.txt
@@ -0,0 +1,62 @@
+Mindustry is a factory-building game with tower defense and RTS elements. Create elaborate supply chains to feed ammo into your turrets, produce materials to use for building, and construct units. Command units to capture enemy bases, and expand your production. Defend your core from waves of enemies.
+
+Play through the campaign alone or with with your friends in cross-platform multiplayer co-op and challenge them in team-based PvP matches.
+
+[img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
+
+[h2]Factory Building[/h2]
+
+[list]
+[*] Create elaborate supply chains of conveyor belts to feed ammo into your turrets and produce materials to use for building
+[*] Use production blocks to create a wide variety of advanced materials
+[*] Distribute liquids and fight constant challenges, like outbreaks of fire or enemy flier raids
+[*] Get the most out of your production by supplying optional coolant and lubricant
+[*] Produce a wide variety of units for automatic management of your base or assault on enemy bases
+[/list]
+
+[h2]Tower Defense[/h2]
+
+[list]
+[*] Defend your structures from waves of enemies
+[*] Strategically place your turrets to destroy them before they reach your core
+[*] Supply your turrets with ammo, coolant, and power
+[*] Bolster your defenses with powered shields, regeneration projectors and other support buildings
+[/list]
+
+[img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
+
+[h2]Real Time Strategy[/h2]
+
+[list]
+[*] Set up assembly lines to construct armies of mechanized units
+[*] Use your units to square up against fully functional enemy bases
+[*] Capture more territory to place down more cores and get access to additional resources for expansion
+[/list]
+
+[h2]Campaign[/h2]
+
+[list]
+[*] Play through two separate planetary campaigns
+[*] Conquer the planet Serpulo and Erekir as you advance through 35 hand-made maps and 250+ procedurally generated sectors
+[*] Capture territory and set up factories to produce resources while you play other sectors
+[*] Defend your sectors from periodic invasions
+[*] Coordinate resource distribution between sectors via launch pads
+[*] Research new blocks to fuel progress
+[*] Invite your friends to complete missions together
+[*] 250+ technology blocks to master
+[*] 50+ different types of drones, mechs and ships
+[*] 80+ achievements to complete
+[/list]
+
+[h2]Community and Modding[/h2]
+
+[list]
+[*] Use the steam workshop to browse community-made maps and schematics
+[*] Join public community servers to play with others across platforms
+[*] Play co-op, PvP or sandbox
+[*] Community servers support plugins for custom maps and gamemodes
+[*] Create your public dedicated server, or invite friends to your own private session
+[*] Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more
+[*] Built-in map editor lets you make your own maps to play and share with the community
+[*] Browse community-made mods to add or remix even more content
+[/list]
diff --git a/fastlane/metadata/steam/indonesian/short-description.txt b/fastlane/metadata/steam/indonesian/short-description.txt
new file mode 100644
index 0000000000..85f1f7ca20
--- /dev/null
+++ b/fastlane/metadata/steam/indonesian/short-description.txt
@@ -0,0 +1 @@
+Sebuah game manajemen industri terbuka dengan elemen RTS dan pertahanan menara.
\ No newline at end of file
diff --git a/fastlane/metadata/steam/italian/achievements.vdf b/fastlane/metadata/steam/italian/achievements.vdf
deleted file mode 100644
index dc2a1f78d3..0000000000
--- a/fastlane/metadata/steam/italian/achievements.vdf
+++ /dev/null
@@ -1,109 +0,0 @@
-"lang"
-{
-	"Language"	"italian"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Utente abilitato"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Completa il tutorial."
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Attaccabrighe"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Distruggi 1000 unità nemiche."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Epurazione"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Distruggi 100,000 unità nemiche."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Trasporto Atmosferico"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Lancia 10,000 oggetti."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"Spedizioni senza fine"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Lancia 1,000,000 di oggetti."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Conquistatore"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Vinci 10 partite in modalità attacco."
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Campione"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Vinci 10 partite multigiocatore PvP."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Blitz"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Distruggi il nucleo nemico in una zona d'attacco in 5 ondate o meno."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Pioggia di Nuclei"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Lancia il tuo nucleo in una zona 30 volte"
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Tenace"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Sopravvivi a 100 ondate."
-		"NEW_ACHIEVEMENT_20_11_NAME"	"Imbattuto"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Sopravvivi a 500 ondate."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"Ricercatore"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"Ricerca tutto."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Mutaforma"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Sblocca tutti i mech e trasformati in ogniuno di essi."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Sovraccarico"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Colpisci un nemico ricoperto d'acqua con l'elettricità."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Deviazione"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Distruggi un nemico con un suo colpo riflesso."
-		"NEW_ACHIEVEMENT_20_17_NAME"	"Un grave errore"
-		"NEW_ACHIEVEMENT_20_17_DESC"	"Ricerca il distributore."
-		"NEW_ACHIEVEMENT_20_18_NAME"	"Costruttore"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"Piazza 10,000 blocchi."
-		"NEW_ACHIEVEMENT_20_19_NAME"	"Razziatore"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Distruggi 1,000 blocchi nemici."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Un disastro memorabile"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Causa il surriscaldamento e l'esplosione di un Reattore al Torio."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Cartografo"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Crea 10 nuove mappe."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Navigatore"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Scarica una mappa dal Workshop."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Creatore"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Pubblica una mappa nel Workshop."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Mietitore"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Sconfiggi un boss."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Esploratore"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Sblocca tutte le zone della campagna."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Completista"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"Sblocca l'equipaggiamento personalizzato in tutte le zone."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Materiale II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Sblocca il Torio."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Materiale I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Sblocca il Titanio."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Riempi il tuo mech di esplosivi e muori, creando un esplosione."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"Ha inizio"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Costruisci una fabbrica di droni pugnalatori."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Assalto Diretto"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Emetti un ordine di attacco usando il centro di comando."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Orda"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Possiedi 100 unità attive contemporaneamente."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Stormo"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Possiedi 10 Droni Fantasma attivi contemporaneamente."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Esercito Esplosivo"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Possiedi 50 Strisciatori attivi contemporaneamente."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Legione"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Costruisci 1000 unità."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Ottieni la valutazione S in una zona qualsiasi."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Ottieni la valutazione SS in una zona qualsiasi."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Avresti dovusto ascoltare"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Muori nella zona di esclusione dell'atterraggio nemico."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Premi Shift"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Annega, in qualche modo."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Collezionista"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Riempi il nucleo alla capacità massima con ogni tipo di materiale."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"Folla"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Ospita un server con 10 giocatori."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"Invincibile"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Costruisci le torrette Fusione e Spettro."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Ascesa"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Usa l'ascensore spaziale."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Autocompiacimento"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Salta il decollo due volte e perdi il nucleo per mano nemica."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Eresia"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Costruisci due distributori uno affianco all'altro."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Guardiano Solitario"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Sopravvivi a 10 ondate in qualsiasi zona senza piazzare blocchi."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Incenerimento"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Usa la Pirite in una torretta qualsiasi."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Efficenza"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Raffredda una torretta con dell'acqua o del criofluido."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Modalità Classica"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Abilita la pixelazione."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Alunno"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Apri la wiki dal gioco."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Vantaggio"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Lanciati in una zona con 10,000 o più oggetti nell'equipaggiamento."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Avviamento"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Avvia un Reattore ad Impatto."
-	}
-}
diff --git a/fastlane/metadata/steam/italian/description.txt b/fastlane/metadata/steam/italian/description.txt
deleted file mode 100644
index 057956f6d4..0000000000
--- a/fastlane/metadata/steam/italian/description.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-Crea un'elaborata filera di nastri trasportatori per rifornire di proiettili le tue torrette, produrre materiali per la costruzione e difendere le tue strutture da ondate di nemici. Gioca con i tuoi amici in multigiocatore cross-platform in partite co-op, oppure afrontali in duelli PVP a squadre.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Gameplay[/h2]
-
-[list]
-[*] Crea trivelle e nastri per trasportare le risorse nel tuo nucleo. 
-[*] Usa i blocchi per la produzione per creare materiali avanzati.
-[*] Costruisci droni per raccogliere risorse automaticamente, assisterti nella costruzione e proteggere la tua base.
-[*] Distribuisci i liquidi e combatti l'insorgere d'incendi.
-[*] Incrementa la produzione rifornendo di refrigerante e lubrificante le tue torrette e i tuoi blocchi per la produzione.
-[/list]
-
-[h2]Campagna[/h2]
-
-[list]
-[*] Avanza attraverso 12 zone rigiocabili già incluse, con punti di generazione casuali
-[*] Raccogli e lancia risorse
-[*] Ricerca nuovi blocchi per progredire nella campagna
-[*] Configura l'equipaggiamento al lancio per portare risorse personalizzate in ogni zona
-[*] Varietà di traguardi ed obiettivi
-[*] Invita i tuoi amici per completare le missioni insieme
-[*] 120+ blocchi tecnologici da padroneggiare
-[*] 19 diversi tipi di droni, mech e navi
-[*] 50+ achievement da completare
-[/list]
-
-[h2][h2]Modalità di gioco[/h2][/h2]
-
-[*] [b]Sopravvivenza[/b]: Costruisci torrette per difenderti dai nemici in questa modalità tower-defense. Sopravvivi più a lungo che puoi e possibilmente lancia il tuo nucleo per utilizzare le risorse raccolte per la ricerca. Prepara la tua base per gli attacchi intermittenti di Boss volanti.
-[*] [b]Schermaglia[/b]: Costruisci fabbriche di unità per distruggere i nuclei nemici, proteggendo simultanemante la tua base da ondate di unità nemiche. Crea un esercito di unità offensive e di supporto per assisterti in battaglia.
-[*] [b]PvP[/b]: Competi con altri giocatori fino a 4 squadre per distruggere i nuclei avversari. Crea unità o colpisci i nuclei nemici direttamente col tuo mech.
-[*] [b]Creativa[/b]: Divertiti con risorse infinite e senza una minaccia nemica. Usa oggetti creativi come le sorgenti di liquidi ed oggetti per testare la tua filiera e genera nemici su richiesta.
-[/list]
-
-[h2]Partite personalizzate & Multigiocatore Cross-Platform[/h2]
-
-[list]
-[*] 12 mappe incluse per partite personalizzate, oltre alla campagna
-[*] Gioca in Co-op, PvP o in creativa
-[*] Unisciti a server pubblici dedicati o invita i tuoi amici nella tua partita
-[*] Regole personalizzate: Cambia il costo dei blocchi, le statistiche dei nemici, le risorse iniziali, il tempo tre le ondate ed altro
-[*] Combina le modalità: Unisci PvP e PvE in scontri epici
-[/list]
-
-[h2]Editor di mappe[/h2]
-
-[list]
-[*] Crea il tuo scenario con l'editor
-[*] Avvia un'anteprima direttamente dall'editor
-[*] Configura gli attrezzi: modifica il funzionamento dei singoli strumenti
-[*] Potente sistema di generazione delle mappe, con tantissimi tipi di filtri per la generazione procedurale o manipolazione del terreno
-[*] Applica disturbo, distorci, fluidifica, erodi, rendi simmetrica la generazione dei minerali ed il terreno casuale nelle tue mappe
-[*] Casualizza e configura la generazione dei minerali, così come il posizionamento di fiumi e caselle delle risorse
-[*] Configura le ondate nemiche
-[*] Condividi le mappe esportate sul Workshop di Steam
-[*] Personalizza le regole delle mappe create
-[*] Usa 75+ blocchi ambientali differenti
-[/list]
diff --git a/fastlane/metadata/steam/italian/short-description.txt b/fastlane/metadata/steam/italian/short-description.txt
deleted file mode 100644
index a0a6a3f214..0000000000
--- a/fastlane/metadata/steam/italian/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Un tower defense incentrato sulla gestione delle risorse.
diff --git a/fastlane/metadata/steam/japanese/short-description.txt b/fastlane/metadata/steam/japanese/short-description.txt
deleted file mode 100644
index a4f33ac79f..0000000000
--- a/fastlane/metadata/steam/japanese/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-リソース管��焦点を当��オープンソース�タワーディフェンスゲーム。
diff --git a/fastlane/metadata/steam/korean/achievements.vdf b/fastlane/metadata/steam/korean/achievements.vdf
index 4bec7cab2e..ef184e7f83 100644
--- a/fastlane/metadata/steam/korean/achievements.vdf
+++ b/fastlane/metadata/steam/korean/achievements.vdf
@@ -4,23 +4,23 @@
 	"Tokens"
 	{
 		"NEW_ACHIEVEMENT_20_1_NAME"	"분쇄�"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"� 유닛� 1000기 사살하세요"
-		"NEW_ACHIEVEMENT_20_2_NAME"	"파괴�"
+		"NEW_ACHIEVEMENT_20_1_DESC"	"� 유닛� 1000기 사살하세요."
+		"NEW_ACHIEVEMENT_20_2_NAME"	"숙청"
 		"NEW_ACHIEVEMENT_20_2_DESC"	"� 유닛� 100,000기 사살하세요."
 		"NEW_ACHIEVEMENT_20_5_NAME"	"무한� 배달부"
 		"NEW_ACHIEVEMENT_20_5_DESC"	"��� � 100,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"	"�질긴"
 		"NEW_ACHIEVEMENT_20_10_DESC"	"100 단계를 �존하세요."
 		"NEW_ACHIEVEMENT_20_12_NAME"	"연구�"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"모든 것� 연구하세요"
+		"NEW_ACHIEVEMENT_20_12_DESC"	"모든 것� 연구하세요."
 		"NEW_ACHIEVEMENT_20_14_NAME"	"과충전"
 		"NEW_ACHIEVEMENT_20_14_DESC"	"물� 젖� �� 전기로 지져버리세요."
 		"NEW_ACHIEVEMENT_20_15_NAME"	"무지개 반사"
@@ -28,55 +28,53 @@
 		"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_20_NAME"	"�발� 예술�다!"
 		"NEW_ACHIEVEMENT_20_20_DESC"	"토륨 ��로를 �발시키세요."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"맵�"
+		"NEW_ACHIEVEMENT_20_21_NAME"	"맵 제작�"
 		"NEW_ACHIEVEMENT_20_21_DESC"	"새로운 맵� 10개 만드세요."
 		"NEW_ACHIEVEMENT_20_22_NAME"	"브�우저"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"워�샵�서 맵� 1개 내려받으세요."
+		"NEW_ACHIEVEMENT_20_22_DESC"	"창작마당�서 맵� 1개 내려받으세요."
 		"NEW_ACHIEVEMENT_20_23_NAME"	"�리��터"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"워�샵� 맵� 1개 올리세요."
+		"NEW_ACHIEVEMENT_20_23_DESC"	"창작마당� 맵� 1개 올리세요."
 		"NEW_ACHIEVEMENT_20_24_NAME"	"슬레�어"
 		"NEW_ACHIEVEMENT_20_24_DESC"	"보스를 처치하세요."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"�스플로러"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"캠페�� 모든 지역� 해금하세요."
 		"NEW_ACHIEVEMENT_20_29_NAME"	"�� 연구 II"
 		"NEW_ACHIEVEMENT_20_29_DESC"	"토륨� 해금하세요."
 		"NEW_ACHIEVEMENT_20_31_NAME"	"�� 연구 I"
 		"NEW_ACHIEVEMENT_20_31_DESC"	"티타늄� 해금하세요."
 		"NEW_ACHIEVEMENT_21_0_NAME"	"공�� �� 분대"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"당신� 기체를 �발성� 있는 ��으로 채우고 사�하여 �발� �으키세요."
+		"NEW_ACHIEVEMENT_21_0_DESC"	"당신� 유닛� �발성� 있는 ��으로 채우고 사�하여 �발� �으키세요."
 		"NEW_ACHIEVEMENT_21_1_NAME"	"�제 시작�야"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"지� 공장� 건설하세요."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"전군 진격"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"지휘소�서 공격 명령� 내리세요."
+		"NEW_ACHIEVEMENT_21_1_DESC"	"지� 유닛 공장� 건설하세요."
+		"NEW_ACHIEVEMENT_21_2_NAME"	"�접 �격"
+		"NEW_ACHIEVEMENT_21_2_DESC"	"유닛�게 목표물� 공격하�� 명령하세요."
 		"NEW_ACHIEVEMENT_21_3_NAME"	"물량"
 		"NEW_ACHIEVEMENT_21_3_DESC"	"한 게임�서 활성화� 100기� 유닛� 가지세요."
 		"NEW_ACHIEVEMENT_21_4_NAME"	"추종�들"
 		"NEW_ACHIEVEMENT_21_4_DESC"	"한 게임�서 활성화� 10기� �리를 가지세요."
 		"NEW_ACHIEVEMENT_21_5_NAME"	"로봇 공학�"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"모든 타입� 유닛들� 만드세요."
+		"NEW_ACHIEVEMENT_21_5_DESC"	"모든 종류� 유닛� 만드세요."
 		"NEW_ACHIEVEMENT_21_6_NAME"	"군단"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"유닛� � 1000기 �산하세요."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"당신� 사시입니다."
-		"NEW_ACHIEVEMENT_21_9_DESC"	"� 소환 구역�서 사�하세요."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"제발 Shift 버튼좀 눌러"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"�사하세요, 어떻게든"
+		"NEW_ACHIEVEMENT_21_6_DESC"	"유닛� � 1,000기 �산하세요."
+		"NEW_ACHIEVEMENT_21_9_NAME"	"당신� 사시입니다"
+		"NEW_ACHIEVEMENT_21_9_DESC"	"� 착륙 지��서 사�하세요."
+		"NEW_ACHIEVEMENT_21_10_NAME"	"� 게임�는 해� 유닛� 있어요"
+		"NEW_ACHIEVEMENT_21_10_DESC"	"�사하세요, 어떻게든."
 		"NEW_ACHIEVEMENT_21_11_NAME"	"수집가"
 		"NEW_ACHIEVEMENT_21_11_DESC"	"캠페� 지역�서 코어� 넣� 수 있는 모든 ��� 최대치로 넣으세요."
 		"NEW_ACHIEVEMENT_21_12_NAME"	"왕관"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"서버를 열고 10명 ��� 플레�어를 유지하세요."
+		"NEW_ACHIEVEMENT_21_12_DESC"	"서버를 열고 10명 ��� 플��어를 유지하세요."
 		"NEW_ACHIEVEMENT_21_13_NAME"	"진입 불가"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"멜트다운과 스펙터 그리고 �어��우를 건설하세요."
+		"NEW_ACHIEVEMENT_21_13_DESC"	"멜트다운과 스펙터, 그리고 �어��우를 건설하세요."
 		"NEW_ACHIEVEMENT_21_14_NAME"	"출격!"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"발사대를 사용하세요."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"2단"
+		"NEW_ACHIEVEMENT_21_14_DESC"	"지역 �� 수송기를 사용하세요."
+		"NEW_ACHIEVEMENT_21_16_NAME"	"�단"
 		"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"	"효율성"
@@ -84,32 +82,102 @@
 		"NEW_ACHIEVEMENT_21_20_NAME"	"�래� 모드"
 		"NEW_ACHIEVEMENT_21_20_DESC"	"픽셀화를 활성화시키세요."
 		"NEW_ACHIEVEMENT_21_21_NAME"	"학�"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"게임내�서 위키를 여세요."
+		"NEW_ACHIEVEMENT_21_21_DESC"	"게임 내�서 위키를 여세요."
 		"NEW_ACHIEVEMENT_21_22_NAME"	"힘찬 시작"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"캠페� 지역� 10000개 혹� 그 ��� 시작��� 설정하고 시작하세요."
+		"NEW_ACHIEVEMENT_21_22_DESC"	"캠페� 지역� 10,000개 혹� 그 ��� 시작 ��� 설정하고 시작하세요."
 		"NEW_ACHIEVEMENT_21_23_NAME"	"�화"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"핵융합로를 활성화시키세요."
-		"NEW_ACHIEVEMENT_21_24_NAME"	"행성 탈주!"
-		"NEW_ACHIEVEMENT_21_24_DESC"	"성간 코어 가�기를 활성화시키세요."
+		"NEW_ACHIEVEMENT_21_23_DESC"	"핵융합 ��로를 활성화시키세요."
 		"NEW_ACHIEVEMENT_21_25_NAME"	"나선형"
-		"NEW_ACHIEVEMENT_21_25_DESC"	"�고�아 강강술래"
+		"NEW_ACHIEVEMENT_21_25_DESC"	"�고 �아 강강술래~!"
 		"NEW_ACHIEVEMENT_21_26_NAME"	"�승!"
-		"NEW_ACHIEVEMENT_21_26_DESC"	"5티어 유닛� 만드세요."
+		"NEW_ACHIEVEMENT_21_26_DESC"	"5 티어 유닛� 만드세요."
 		"NEW_ACHIEVEMENT_21_27_NAME"	"건축가"
 		"NEW_ACHIEVEMENT_21_27_DESC"	"20개� 설계�를 �성하세요."
 		"NEW_ACHIEVEMENT_21_28_NAME"	"글로벌 �미네�션"
-		"NEW_ACHIEVEMENT_21_28_DESC"	"세르플로� 있는 모든 지역들� �령하세요."
+		"NEW_ACHIEVEMENT_21_28_DESC"	"세르플로� 있는 모든 지역� �령하세요."
 		"NEW_ACHIEVEMENT_21_29_NAME"	"공수부대"
-		"NEW_ACHIEVEMENT_21_29_DESC"	"옥트 유닛으로 5티어 유닛� 수송하세요."
+		"NEW_ACHIEVEMENT_21_29_DESC"	"옥트 유닛으로 5 티어 유닛� 수송하세요."
 		"NEW_ACHIEVEMENT_21_30_NAME"	"�극� 형태"
-		"NEW_ACHIEVEMENT_21_30_DESC"	"그들과 함께 하십시오."
+		"NEW_ACHIEVEMENT_21_30_DESC"	"그들과 함계 하십시오."
 		"NEW_ACHIEVEMENT_21_31_NAME"	"�산 I"
-		"NEW_ACHIEVEMENT_21_31_DESC"	"캠페��서 �합 분당 5000 �� �산량� �달하세요."
+		"NEW_ACHIEVEMENT_21_31_DESC"	"캠페��서 �합 분당 5,000 �� �산량� �달하세요."
 		"NEW_ACHIEVEMENT_26_0_NAME"	"�산 II"
-		"NEW_ACHIEVEMENT_26_0_DESC"	"캠페��서 �합 분당 50000 �� �산량� �달하세요."
+		"NEW_ACHIEVEMENT_26_0_DESC"	"캠페��서 �합 분당 50,000 �� �산량� �달하세요."
 		"NEW_ACHIEVEMENT_26_1_NAME"	"확실한 승리"
 		"NEW_ACHIEVEMENT_26_1_DESC"	"다른 지역�서 플레�하는 �안 한 지역� �령하세요."
 		"NEW_ACHIEVEMENT_26_2_NAME"	"작� 제국"
 		"NEW_ACHIEVEMENT_26_2_DESC"	"한 번� 10개� 지역� 제어하세요."
+		"NEW_ACHIEVEMENT_26_3_NAME"	"디��너"
+		"NEW_ACHIEVEMENT_26_3_DESC"	"500개� 설계�를 �성하세요."
+		"NEW_ACHIEVEMENT_26_4_NAME"	"운반� 달�"
+		"NEW_ACHIEVEMENT_26_4_DESC"	"단� 맵�서 모든 운송 블�(한 행성�서)� 사용하세요."
+		"NEW_ACHIEVEMENT_26_5_NAME"	"과부하"
+		"NEW_ACHIEVEMENT_26_5_DESC"	"과부하 프로�터를 건설하세요."
+		"NEW_ACHIEVEMENT_26_6_NAME"	"수선"
+		"NEW_ACHIEVEMENT_26_6_DESC"	"멘� �는 수리 프로�터를 건설하세요."
+		"NEW_ACHIEVEMENT_26_7_NAME"	"비효율성"
+		"NEW_ACHIEVEMENT_26_7_DESC"	"물 위� 펌프 대신 물 추출기를 설치하세요."
+		"NEW_ACHIEVEMENT_26_8_NAME"	"비축"
+		"NEW_ACHIEVEMENT_26_8_DESC"	"캠페��서 � 1,000만개� ��� 수집하세요."
+		"NEW_ACHIEVEMENT_26_9_NAME"	"모든 역경� 맞서"
+		"NEW_ACHIEVEMENT_26_9_DESC"	"듀오 �탑으로 ��립스 유닛� 마지막 �격� 가하세요."
+		"NEW_ACHIEVEMENT_26_10_NAME"	"�르키아 완료"
+		"NEW_ACHIEVEMENT_26_10_DESC"	"�르키아� 마지막 지역� �령하세요."
+		"NEW_ACHIEVEMENT_26_11_NAME"	"세르플로 완료"
+		"NEW_ACHIEVEMENT_26_11_DESC"	"세르플로� 마지막 지역� �령하세요."
+		"NEW_ACHIEVEMENT_26_12_NAME"	"미리 세팅"
+		"NEW_ACHIEVEMENT_26_12_DESC"	"세르플로�서 제작한 코어 설계�로 지역� 시작하세요."
+		"NEW_ACHIEVEMENT_26_13_NAME"	"과�하게 준비"
+		"NEW_ACHIEVEMENT_26_13_DESC"	"전초기지� 코어를 핵으로 업그레�드하세요.."
+		"NEW_ACHIEVEMENT_26_14_NAME"	"ì „ì—¼"
+		"NEW_ACHIEVEMENT_26_14_DESC"	"물� 함유� 블�� 신�물� �뜨리세요."
+		"NEW_ACHIEVEMENT_26_15_NAME"	"불안정"
+		"NEW_ACHIEVEMENT_26_15_DESC"	"빙결 �태 효과가 있는 유닛� 추가 �발 피해를 입히세요."
+		"NEW_ACHIEVEMENT_26_16_NAME"	"세르플로 구조물 마스터"
+		"NEW_ACHIEVEMENT_26_16_DESC"	"세르플로�서 사용 가능한 모든 블�� 건설하세요."
+		"NEW_ACHIEVEMENT_26_17_NAME"	"�르키아 구조물 마스터"
+		"NEW_ACHIEVEMENT_26_17_DESC"	"�르키아�서 사용 가능한 모든 블�� 건설하세요."
+		"NEW_ACHIEVEMENT_26_18_NAME"	"보호막 파괴!"
+		"NEW_ACHIEVEMENT_26_18_DESC"	"� 보호막 프로�터� 보호막� 파괴하세요."
+		"NEW_ACHIEVEMENT_26_19_NAME"	"설명서는 어디� 있나요?"
+		"NEW_ACHIEVEMENT_26_19_DESC"	"마��로 프로세서를 연구하세요."
+		"NEW_ACHIEVEMENT_26_20_NAME"	"ì •ì „"
+		"NEW_ACHIEVEMENT_26_20_DESC"	"전력 소모 10k/초� �달하세요."
+		"NEW_ACHIEVEMENT_26_21_NAME"	"전력 급�승"
+		"NEW_ACHIEVEMENT_26_21_DESC"	"전력 �산 100k/초� �달하세요."
+		"NEW_ACHIEVEMENT_26_22_NAME"	"고용량"
+		"NEW_ACHIEVEMENT_26_22_DESC"	"배터리� � 100만개� 전력� 저장하세요."
+		"NEW_ACHIEVEMENT_26_23_NAME"	"나� 아�디어�요!"
+		"NEW_ACHIEVEMENT_26_23_DESC"	"화력 발전기� �발물� 넣으세요."
+		"NEW_ACHIEVEMENT_26_24_NAME"	"오염"
+		"NEW_ACHIEVEMENT_26_24_DESC"	"신�물 축�으로 �해 신�물 반�로를 �발하게 만드세요."
+		"NEW_ACHIEVEMENT_26_25_NAME"	"수정�"
+		"NEW_ACHIEVEMENT_26_25_DESC"	"모드를 설치하세요."
+		"NEW_ACHIEVEMENT_26_26_NAME"	"router"
+		"NEW_ACHIEVEMENT_26_26_DESC"	"router"
+		"NEW_ACHIEVEMENT_26_27_NAME"	"전체� 경험"
+		"NEW_ACHIEVEMENT_26_27_DESC"	"커뮤니티 서버� 들어가세요."
+		"NEW_ACHIEVEMENT_26_28_NAME"	"해커맨"
+		"NEW_ACHIEVEMENT_26_28_DESC"	"스�립트 콘솔� 여세요."
+		"NEW_ACHIEVEMENT_26_29_NAME"	"�접 제어"
+		"NEW_ACHIEVEMENT_26_29_DESC"	"�탑� �접 조종하세요."
+		"NEW_ACHIEVEMENT_26_30_NAME"	"방어선 뒤�서 침입"
+		"NEW_ACHIEVEMENT_26_30_DESC"	"� 코어� 건설 불가 구역 내� 유닛� 투하하세요."
+		"NEW_ACHIEVEMENT_26_31_NAME"	"복수"
+		"NEW_ACHIEVEMENT_26_31_DESC"	"플레어 유닛� 사용하여 스�터 �탑� 파괴하세요."
+		"NEW_ACHIEVEMENT_29_0_NAME"	"공수"
+		"NEW_ACHIEVEMENT_29_0_DESC"	"지� 유닛� �륙 기능� 사용하세요."
+		"NEW_ACHIEVEMENT_29_1_NAME"	"호버�래프트"
+		"NEW_ACHIEVEMENT_29_1_DESC"	"�루드 유닛� 사용해서 액체 위를 건너세요."
+		"NEW_ACHIEVEMENT_29_2_NAME"	"지형 부스트"
+		"NEW_ACHIEVEMENT_29_2_DESC"	"특정 타�� 구조물� 배치하여 효율성� 높�세요."
+		"NEW_ACHIEVEMENT_29_3_NAME"	"대청소"
+		"NEW_ACHIEVEMENT_29_3_DESC"	"바위 100개를 부수세요."
+		"NEW_ACHIEVEMENT_29_4_NAME"	"광범위한 청소"
+		"NEW_ACHIEVEMENT_29_4_DESC"	"바위 10,00개를 부수세요."
+		"NEW_ACHIEVEMENT_29_5_NAME"	"중화�"
+		"NEW_ACHIEVEMENT_29_5_DESC"	"충격파 타워를 사용하여 들어오는 탄막� �수하세요."
+		"NEW_ACHIEVEMENT_29_6_NAME"	"안타�게�요,"
+		"NEW_ACHIEVEMENT_29_6_DESC"	"멀티플레�어 채팅�서 :alphachan: �모지를 사용하세요. 선�� 여러분� 몫입니다. 개발�� 취미� 찾으셨네요..."
 	}
 }
diff --git a/fastlane/metadata/steam/korean/description.txt b/fastlane/metadata/steam/korean/description.txt
index 349b368d2f..4b234545f7 100644
--- a/fastlane/metadata/steam/korean/description.txt
+++ b/fastlane/metadata/steam/korean/description.txt
@@ -1,65 +1,62 @@
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
+Mindustry는 타워 디펜스와 RTS 요소가 있는 공장 건설 게임입니다. �탑� 탄약� 공급하고, 건설� 사용할 재료를 �산하고, 유닛� 건설하기 위해 정�한 공급�� 만드세요. 유닛� 지휘하여 �� 기지를 �령하고, �산� 확장하세요. �으로부터 코어를 방어하세요.
 
-[h2]게임플레�[/h2]
+캠페�� 혼� �는 여러 플랫�� 멀티플레�어 협� 모드로 플레�하고, 팀 기반 PvP 매치�서 친구와 경�하세요.
+
+[img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
+
+[h2]공장 건물[/h2]
 
 [list]
-[*] 정�한 컨베�어 벨트 공급�� 만들어 탄약� 터렛� 공급하고 건축� 사용할 재료를 �산하세요.
-[*] �산 건물� 사용하여 고급 ��� 조합하세요.
-[*] 단계�서 몰려오는 �들�게서 당신� 기지를 지키세요.
-[*] �로스 플랫� 멀티플레�어 협� 게임�서 친구와 함께 플레�하거나 팀 기반 PvP 게임�서 �전해보세요.
-[*] 액체를 분배하고 화재 발��나 �� 급습과 같� �임없는 �전과 싸워보세요.
-[*] 옵션� 냉�수 � 윤활유를 공급하여 �산 효과를 극대화하세요.
-[*] 당신� 기지를 ��으로 관리하거나 � 기지를 공격할 수 있는 다양한 유닛� �산해보세요.
+[*] �탑� 탄약� 공급하고 건축� 사용할 재료를 �산하기 위해 컨베�어 벨트� 정�한 공급�� 만드세요.
+[*] 공장 블�� 사용하여 다양한 첨단 ��를 �산하세요.
+[*] 액체를 분배하고 화재 발��나 �� 비행기 습격과 같� �임없는 �전� 맞서 싸우세요.
+[*] 선��으로 제공�는 냉�수 � 윤활유를 공급하여 �산 효율� 극대화하세요.
+[*] 기지 �� 관리 �는 � 기지 공격� 위한 다양한 유닛� �산하세요.
 [/list]
 
-[img]{STEAM_APP_IMAGE}/extras/ezgif-1-8679abe089cd.gif[/img]
+[h2]타워 디펜스[/h2]
+
+[list]
+[*] �으로부터 구조물� 보호하세요.
+[*] �� 코어� �달하기 전� 그들� 파괴할 수 있�� 전략�으로 �탑� 배치하세요.
+[*] �탑� 탄약, 냉�수, 전력� 공급하세요.
+[*] 보호막, 재� 프로�터 � 기타 지� 건물로 방어력� 강화하세요.
+[/list]
+
+[img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
+
+[h2]실시간 전략[/h2]
+
+[list]
+[*] 기계로 � 부대를 세우기 위한 조립 ��� 설정하세요.
+[*] 유닛� 사용해 완벽하게 기능하는 � 기지� 맞서세요.
+[*] � 많� �토를 확보하여 � 많� 코어를 배치하고 확장� 위한 추가 ��� 입수하세요.
+[/list]
 
 [h2]캠페�[/h2]
 
 [list]
-[*] 250개 ��� ��으로 �성� 지역들과 16개� 수제 맵들� 지나 전진하면서 세르플로 행성� 정복하세요. 
-[*] 지역� �령하고 당신� 다른 지역�서 플레�하는 �안 ��� 만들�� 공장� 지으세요.
-[*] 주기�� 공격�게서 당신� 지역들� 지키세요.
-[*] 지역 �� 수송기를 통해 지역간 ��� 조�화하세요.
-[*] 발전� 촉진하기 위해 새로운 블�들� 연구하세요.
-[*] 친구를 초대해서 다같� 미션� 완료하세요.
-[*] 120개가 넘는 블�들� 연구해보세요.
-[*] 33가지 종류� �기 다른 드론, 유닛, 그리고 배들� 있습니다.
-[*] 50개가 넘는 �전과제들� 달성해보세요.
+[*] 별�로 � � 개� 행성� 캠페�� 플레�하세요.
+[*] 수작업으로 만들어진 35개� 맵과 절차�으로 �성� 250개 ��� 지역� 통과하면서 세르플로와 �르키아 행성� 정복하세요.
+[*] 다른 지역�서 플레�하는 �안 �토를 �령하고 공장� 설치하여 ��� �산하세요.
+[*] 주기�� 침략으로부터 당신� 지역� 방어하세요.
+[*] 지역 �� 수송기를 통해 지역 간 �� 분배를 조정하세요.
+[*] 진행� 촉진하기 위해 새로운 블�� 연구하세요.
+[*] 친구를 초대하여 함께 미션� 완료하세요.
+[*] 마스터해야 할 250개 ��� 블�.
+[*] 50개 ��� 다양한 유형� 드론, 기계 � 함선.
+[*] 완료해야 할 80개 ��� 업�
 [/list]
 
-[h2][h2]게임모드[/h2][/h2]
+[h2]커뮤니티와 모딩[/h2]
 
 [list]
-[*] [b]�존[/b]: �탑� 건설하고, �� 공격� 방어하는 기본�� 타워디펜스 모드입니다. �욱 길게 �존하여 연구하기 위한 ��� 모으고 출격하는 것� 가능합니다. 공중 보스� 기습 공격� 대비하세요.
-[*] [b]공격[/b]: 공장� 건설하여 �� 코어를 파괴하기 위한 유닛들� �산하고, �시� �� 유닛� 방어하기 위한 방어건물� 건설하세요. 다양한 지� � 공격 유닛� 만들어서 목표를 달성하세요. 플레�어� 추가 공격� 막기 위한 방어선� 건설하는 � AI를 선��으로 활성화할 수 있습니다.
-[*] [b]PvP[/b]: 서로� 코어를 파괴하는 4개 ��� 다른 팀과� 경� 모드입니다. 유닛� �성하거나, 당신� 기체로 �� 기지를 바로 공격하세요.
-[*] [b]샌드박스[/b]: �� 위협 없� 무한한 ��으로 플레�하세요. 디��� 시험해보기 위해 무한 ��, 전기, 액체와 같� 샌드박스 전용 블�들� 사용해보거나, �한다면 �� �성해보세요.
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/2020-11-30_10-46-02.gif[/img]
-
-[h2]사용� 정� 게임 & �로스플랫� 멀티플레�어[/h2]
-
-[list]
-[*] 캠페�� �하여 커스텀 게임� 위한 16개� 추가�� 맵들� 준비�어 있습니다.
-[*] 협�, PvP �는 샌드박스를 플레�해보세요!
-[*] 유저들� 운�하는 공개�어있는 공용서버� 접�하거나, 당신만� 비공개서버를 만들고 친구들� 초대해보세요.
-[*] �유로운 게임 규칙: 블�� 재료 요구량 변경, �� 능력 수치변경, 시작�� 변경, 단계 대기시간 변경 등 많� 것� �접 설정할 수 있습니다.
-[*] 게임모드 혼합!: PvP와 PvE를 합� 새로운 컨�츠를 만들어보세요.
-[/list]
-
-[h2]사용� 정� 맵 �디터[/h2]
-
-[list]
-[*] �디터 ui를 사용하여 지형� 그려보세요.
-[*] �-게임 �디터를 사용하여 맵 미리보기와 수정� 해보세요.
-[*] �구 모드 설정: 편집 �구� 모드를 바꿔보세요.
-[*] 다양한 타입� 필터와 지형 �성 조건� 설정하고, 강력한 맵 �성 시스템� 사용하여 맵� 만들어보세요.
-[*] 뿌리기, 왜곡, 매�러움, 침�, 균형, �� �성 그리고 지형 무작위 �성 등� 당신� 맵� �용해보세요.
-[*] 강�나 �� 타�� 배치하는 것 �만� 아니� 광물 �성� 랜�화 하거나, 설정해보세요.
-[*] � 단계 구성� 설정해보세요.
-[*] 스팀 창작마당� 맵� 공유해보세요.
-[*] 맵 규칙� 마�대로 바꿔보세요.
-[*] 80개 ��� �기 다른 지형 블�들� 사용해보세요.
+[*] 커뮤니티�서 만든 맵과 설계�를 �색하려면 Steam 창작마당� 사용하세요.
+[*] 여러 플랫��서 다른 사람들과 함께 플레�하려면 공개 커뮤니티 서버� 가입하세요.
+[*] 멀티플레�, PvP �는 샌드박스 플레�.
+[*] 커뮤니티 서버는 사용� 지정 맵 � 게임 모드� 대한 플러그�� 지�합니다.
+[*] 공개 전용 서버를 만들거나 친구를 개� 서버� 초대하세요.
+[*] 사용� 지정 가능한 게임 규칙: 블� 비용, � 통계, 시작 ��, 단계 시간 등� 변경하세요.
+[*] 내장� 맵 편집기를 사용하면 �접 플레�하고 커뮤니티와 공유할 수 있는 나만� 맵� 만들 수 있습니다.
+[*] 커뮤니티�서 만든 모드를 �색하여 � 많� 콘�츠를 추가하세요.
 [/list]
diff --git a/fastlane/metadata/steam/korean/short-description.txt b/fastlane/metadata/steam/korean/short-description.txt
index 45fb3d476a..23868935ca 100644
--- a/fastlane/metadata/steam/korean/short-description.txt
+++ b/fastlane/metadata/steam/korean/short-description.txt
@@ -1 +1 @@
-�� 관리� 초�� 맞춘 엔드리스 타워디펜스 게임입니다.
+RTS와 타워 디펜스 요소를 갖춘 개방형 공장 관리 게임입니다.
diff --git a/fastlane/metadata/steam/polish/achievements.vdf b/fastlane/metadata/steam/polish/achievements.vdf
deleted file mode 100644
index 8c8e7404b5..0000000000
--- a/fastlane/metadata/steam/polish/achievements.vdf
+++ /dev/null
@@ -1,131 +0,0 @@
-"lang"
-{
-	"Language"	"polish"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Zweryfikowany"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Ukończ samouczek."
-		"NEW_ACHIEVEMENT_20_1_NAME"	"ZÅ‚omiarz"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Zniszcz 1000 wrogich jednostek."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Pogrom"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Zniszcz 100.000 wrogich jednostek."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Transport atmosferyczny"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Wystrzel łącznie 10.000 przedmiotów."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"Niekończące się dostawy"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Wystrzel łącznie 1.000.000 przedmiotów."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Zdobywca"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Zwycięż w 10 rozgrywkach trybu ataku."
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Czempion"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Zwycięż w 10 rozgrywkach PvP."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Wojna błyskawiczna"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Zniszcz rdzeń wroga w trybie ataku w ciągu 5 fal."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Deszcz rdzeni"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Zacznij rozgrywkÄ™ 30 razy."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Wytrwały"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Przetrwaj 100 fal."
-		"NEW_ACHIEVEMENT_20_11_NAME"	"Niezwyciężony"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Przetrwaj 500 fal."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"Badacz"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"Zbadaj wszystko w drzewku badań."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Zmiennokształtny"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Odblokuj i użyj każdego mecha w grze."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Przeciążenie"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Traf pokrytego wodÄ… wroga broniÄ… elektrycznÄ…."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Rykoszet"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Zniszcz jednostkę przy użyciu jej własnego pocisku."
-		"NEW_ACHIEVEMENT_20_17_NAME"	"Śmiertelny błąd"
-		"NEW_ACHIEVEMENT_20_17_DESC"	"Zbadaj Rozdzielacz."
-		"NEW_ACHIEVEMENT_20_18_NAME"	"Konstruktor"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"Zbuduj 10.000 bloków."
-		"NEW_ACHIEVEMENT_20_19_NAME"	"Rozbiórka"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Zniszcz 1000 wrogich bloków."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Spektakularna katastrofa"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Spowoduj przegrzanie i wybuch reaktora torowego."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Kartograf"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Stwórz nową mape 10 razy."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Nawigator"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Pobierz mapÄ™ z Warsztatu."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Twórca"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Opublikuj mapÄ™ na Warsztacie steam."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Niszczyciel"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Pokonaj bossa."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Odkrywca"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Odblokuj każdą strefę w kampanii."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Pełen komplet"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"Osiągnij fale odblokowania konfiguracji w każdej strefie."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Surowiec II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Odblokuj Tor."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Surowiec I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Odblokuj Tytan."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Wypełnij swojego mecha materiałami wybuchowymi i zgiń, tworząc eksplozje."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"Zaczęło się..."
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Zbuduj fabrykę dronów Nóż."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Atak bezpośredni"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Wykonaj rozkaz ataku używając Centrum Dowodzenia."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Armia"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Posiadaj 100 aktywnych jednostek jednocześnie."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Rój"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Posiadaj 10 dronów Widmo aktywnych jednocześnie."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Wybuchowa Armia"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Posiadaj 50 jednostek Pełzacz aktywnych jednocześnie."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Legiony"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Zbuduj Å‚Ä…cznie 1000 jednostek."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Zdobądź rangę S w jednej ze stref."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Zdobądź rangę SS w jednej ze stref."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Powinieneś posłuchać"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Zgiń w strefie zrzutu."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Po prostu naciśnij shift"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Utoń, jakoś."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Zbieracz"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Uzupełnij rdzeń do pełna każdym rodzajem materiału."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"TÅ‚um"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Hostuj serwer z 10 graczami."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"Nietykalny"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Zbuduj Rozpad i Huragan."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Wystrzelenie"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Użyj wyrzutni."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Samozadowolenie"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Pomiń wystrzelenie dwa razy, następnie zostań pokonany przez wroga."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Herezja"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Zbuduj dwa rozdzielacze obok siebie."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Samotny obrońca"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Przetrwaj 10 fal na jednej ze stref nie budujÄ…c ani jednego bloku."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Pożoga"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Użyj piratianu w wieżyczce."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Skuteczność bojowa"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Schłodź wieżyczkę wodą lub lodocieczą."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Tryb Klasyczny"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"WÅ‚Ä…cz pikselacje."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Uczony"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Otwórz Wiki w grze."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Przewaga"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Zacznij w strefie z 10.000 lub większą ilością surowców."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Zapłon"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Aktywuj Reaktor Uderzeniowy."
-		"NEW_ACHIEVEMENT_21_24_NAME"	"Przyspieszenie"
-		"NEW_ACHIEVEMENT_21_24_DESC"	"Aktwuj Przyspiszacz Międzyplanetarny."
-		"NEW_ACHIEVEMENT_21_25_NAME"	"Spirala"
-		"NEW_ACHIEVEMENT_21_25_DESC"	"I się kręci i kręci..."
-		"NEW_ACHIEVEMENT_21_26_NAME"	"Eskalacja"
-		"NEW_ACHIEVEMENT_21_26_DESC"	"Zbuduj jednostkÄ™ poziomu 5."
-		"NEW_ACHIEVEMENT_21_27_NAME"	"Architekt"
-		"NEW_ACHIEVEMENT_21_27_DESC"	"Stwóż 20 schematów."
-		"NEW_ACHIEVEMENT_21_28_NAME"	"Globalna Dominacja"
-		"NEW_ACHIEVEMENT_21_28_DESC"	"Podbij każdy sektor na Serpulo."
-		"NEW_ACHIEVEMENT_21_29_NAME"	"Most Lotniczy"
-		"NEW_ACHIEVEMENT_21_29_DESC"	"Podnieś jednostkę poziomu 5 używając jednostki Oct."
-		"NEW_ACHIEVEMENT_21_30_NAME"	"Ostateczna Forma"
-		"NEW_ACHIEVEMENT_21_30_DESC"	"Dołącz do nich."
-		"NEW_ACHIEVEMENT_21_31_NAME"	"Produkcja I"
-		"NEW_ACHIEVEMENT_21_31_DESC"	"Osiągnij 5000 przedmiotów/minute w kampani."
-		"NEW_ACHIEVEMENT_26_0_NAME"	"Production II"
-		"NEW_ACHIEVEMENT_26_0_DESC"	"Osiągnij 50000 przedmiotów/minute w kampani."
-		"NEW_ACHIEVEMENT_26_1_NAME"	"Pewne Zwycięstwo"
-		"NEW_ACHIEVEMENT_26_1_DESC"	"Podbij sektor grajÄ…c na innym sektorze."
-		"NEW_ACHIEVEMENT_26_2_NAME"	"Małe Królestwo"
-		"NEW_ACHIEVEMENT_26_2_DESC"	"Kontroluj 10 sektorów na raz."
-	}
-}
diff --git a/fastlane/metadata/steam/polish/description.txt b/fastlane/metadata/steam/polish/description.txt
deleted file mode 100644
index 34b3399886..0000000000
--- a/fastlane/metadata/steam/polish/description.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-Twórz skomplikowane linie transportowe przy użyciu przenośników by zaopatrzyć wieżyczki w amunicję, produkować materiały używane do budowy, oraz broń swoje struktury przed falami wrogów. Graj ze swoimi przyjaciółmi w międzyplatformowych rozgrywkach wieloosobwych typu co-op, lub rzuć im wyzwanie w drużynowych rozgrywkach PvP.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Rozgrywka[/h2]
-
-[list]
-[*] Stawiaj wiertła oraz przenośniki by przetransportować surowce do twojego Rdzenia.
-[*] Używaj bloków produkcyjnych do tworzenia zaawansowanych materiałów.
-[*] Buduj drony do automatycznego wydobycia surowców, pomocy przy budowie i obrony twojej bazy.
-[*] Rozprowadzaj płyny i walcz z nagłymi pożarami.
-[*] Przyśpiesz produkcje poprzez opcjonalne zaopatrzenie swoich linii obronnych i bloków produkcyjnych w chłodziwo.
-[/list]
-
-[h2]Kampania[/h2]
-
-[list]
-[*] Przejdź przez 12 powtarzalnych wbudowanych stref z losowymi punktami startu
-[*] Zbieraj i wystrzeliwuj surowce
-[*] Badaj nowe bloki by zwiększyć postęp
-[*] Konfiguruj ładunek by przenieść surowce do każdej strefy
-[*] Różnorodność celów misji
-[*] Zapraszaj znajomych by razem wykonywać misje
-[*] 120+ technologii do zbadania
-[*] 19 różnych typów dronów, mechów oraz statków
-[*] 50+ osiągnięć do ukończenia
-[/list]
-
-[h2][h2]Tryby Gry[/h2][/h2]
-
-[*] [b]Przetrwanie[/b]: Buduj wieżyczki by obronić się przed wrogami w opartej na gatunku tower-defense rozgrywce. Przetrwaj tak długo jak to możliwe, opcjonalnie wystrzel swój rdzeń by użyć zebrane surowce do badań. Przygotuj swoją bazę na sporadyczne ataki powietrznych bossów.
-[*] [b]Atak[/b]: Buduj fabryki jednostek by zniszczyć rdzenie wroga, jednocześnie broniąc swoją bazę przed falami jednostek wroga. Twórz rozmaite jednostki typu wsparcia i ofensywy które pomogą ci osiągnąć twoje cele.
-[*] [b]PvP[/b]: Rywalizuj z innymi graczami z maksymalnie 4 drużyn gdzie celem jest zniszczenie wrogich rdzeni. Twórz jednostki, lub atakuj cudze bazy bezpośrednio przy użyciu swoich mechów.
-[*] [b]Sandbox[/b]: Graj z nieskończoną ilością surowców i bez żadnego zagrożenia ze strony wroga. Używaj przeznaczonych dla tego trybu specjalnych bloków które są źródłami przedmiotów i płynów by przetestować różne projekty, oraz tworzyć wrogów na żądanie.
-[/list]
-
-[h2]Gra Niestandardowa & Międzyplatformowa Gra Wieloosobowa[/h2]
-
-[list]
-[*] 12 wbudowanych map do gier niestandardowych (nie liczÄ…c kampanii)
-[*] Graj w trybie Co-op, PvP lub sandbox
-[*] Dołącz do publicznych serwerów dedykowanych, lub zaproś przyjaciół do twoich własnych prywatnych rozgrywek
-[*] Konfigurowalne zasady gry: Zmień koszt budowy, statystyki wrogów, przedmioty początkowe, odstęp fal wrogów i wiele więcej
-[*] Możliwość mieszania trybów gry: Połącz ze sobą tryby PvP oraz PvE
-[/list]
-
-[h2]Edytor Map[/h2]
-
-[list]
-[*] Twórz teren przy użyciu UI edytora
-[*] Edytuj i testuj w grze
-[*] Konfigurowalne tryby narzędzi: Zmieniaj to jak działa każde narzędzie
-[*] Potężny system generacji mapy, z wieloma różnymi typami filtrów do proceduralnej manipulacji terenem
-[*] Zastosuj szumy, zniekształcenia, wygładzenie, erozje, symetrie, generacje rud oraz losowy teren do twoich map
-[*] Randomizuj i konfiguruj generacje rud, jak również położenie rzek i kratek rud
-[*] Konfiguruj układ fal wroga
-[*] Publikuj eksportowane mapy na Warsztacie Steam
-[*] Dostosuj standardowy zasady mapy
-[*] Użyj 75+ różnych bloków terenu
-[/list]
diff --git a/fastlane/metadata/steam/polish/short-description.txt b/fastlane/metadata/steam/polish/short-description.txt
deleted file mode 100644
index bfc8cf99b0..0000000000
--- a/fastlane/metadata/steam/polish/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Otwarta gra typu tower-defense skupiona na zarzÄ…dzaniu surowcami.
diff --git a/fastlane/metadata/steam/portuguese-brazil/achievements.vdf b/fastlane/metadata/steam/portuguese-brazil/achievements.vdf
deleted file mode 100644
index caa3a26319..0000000000
--- a/fastlane/metadata/steam/portuguese-brazil/achievements.vdf
+++ /dev/null
@@ -1,109 +0,0 @@
-"lang"
-{
-	"Language"	"portuguese-brazil"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Verificado"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Complete o tutorial"
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Sucateiro"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Destrua 1000 unidades inimigas."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Expurgo"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Destrua 100.000 unidades inimigas."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Transporte atmosférico"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Lance 10.000 itens no total."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"Transportes Sem Fim"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Lance 1.000.000 itens no total."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Conquistador"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Vença 10 partidas no modo de ataque."
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Campeão"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Vença 10 partidas PvP multi-jogador."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Blitz"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Destrua o núcleo inimigo na zona de ataque em 5 hordas ou menos."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Chuva de núcleos"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Lance seu núcleo em uma zona 10 vezes."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Persistente"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Sobreviva 100 hordas"
-		"NEW_ACHIEVEMENT_20_11_NAME"	"Invicto"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Sobreviva 500 hordas."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"Pesquisador"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"Pesquise tudo."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Metamorfose Ambulante"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Desbloqueie e transforme-se em todos os mechas no jogo."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Sobrecarga"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Atinja um inimigo coberto de água com eletricidade."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Deflexão"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Destrua uma unidade com suas proprias balas refletidas."
-		"NEW_ACHIEVEMENT_20_17_NAME"	"Um Erro Grave"
-		"NEW_ACHIEVEMENT_20_17_DESC"	"Pesquise o roteador."
-		"NEW_ACHIEVEMENT_20_18_NAME"	"Crie"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"Coloque 10.000 blocos."
-		"NEW_ACHIEVEMENT_20_19_NAME"	"Arraso"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Destrua 1.000 blocos inimigos."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Um desastre espetacular."
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Faça com que um reator de tório superaqueça e exploda."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Cartógrafo"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Faça um mapa novo 10 vezes."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Navegador"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Baixe um mapa da Oficina."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Criador"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Publique um mapa na Oficina."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Matador"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Derrote um chefe."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Explorador"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Desbloqueie todas as zonas na campanha."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Completador"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"Alcance a horda requerida para configuração em todas as zonas."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Material II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Desbloqueie Tório."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Material I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Desbloqueie Titânio."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Encha o seu mecha com materiais explosivos e morra, criando uma explosão."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"Assim Começa"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Construa uma fábrica de Dagger."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Ataque direto"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Emita o comando de Ataque usando o Centro de Comando."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Enchame"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Tenha 100 unidades ativas ao mesmo tempo."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Rebanho"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Tenha 10 drones Phantom ativos ao mesmo tempo."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Exército Volátil"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Tenha 50 unidades Crawler ativas ao mesmo tempo."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Legiões"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Construa 1000 unidades no total."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Conquiste o rank S em qualquer zona."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Conquiste o rank SS em qualquer zona."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Você Devia Ter Escutado"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Morra na zona de exclusão do ponto de spawn."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Só Aperte Shift"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Afogue, de algum modo."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Colecionador"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Encha o núcleo até a capacidade máxima com todos os tipos de materiais."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"Galera"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Hospede um servidor com 10 pessoas nele."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"Invulnerável"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Construa o Meltdown e o Spectre."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Decolagem"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Use a Plataforma de Lançamento."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Complacência"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Pule o lançamento duas vezes, então tenha o seu núcleo destruído pelo inimigo."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Heresia"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Construa dois roteadores, um do lado do outro."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Guardião Solitário"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Sobreviva 10 hordas em qualquer zona, sem colocar qualquer bloco."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Incinere"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Use Piratita em qualquer torreta."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Eficiência"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Refirgere uma torreta com água ou crio fluido."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Modo Clássico"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Habilite pixelização."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Sábio"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Abra a Wiki do jogo."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Vantagem"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Entre em uma zona com 10.000 itens ou mais já configurados."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Ignição"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Ligue um Reator de Impacto."
-	}
-}
diff --git a/fastlane/metadata/steam/portuguese-brazil/description.txt b/fastlane/metadata/steam/portuguese-brazil/description.txt
deleted file mode 100644
index add86a6a2c..0000000000
--- a/fastlane/metadata/steam/portuguese-brazil/description.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Crie correntes de suprimentos elaboradas com correias transportadoras para alimentar suas torretas com munição, produza minerais para usar em construção, e defenda suas estruturas de hordas inimigas. Jogue com seus amigos em jogos cooperativos multi-jogadores multi-plataformas, ou desafie-os em partidas PvP de times.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Gameplay[/h2]
-
-[list]
-[*] Crie brocas e esteiras transportadoras para mover recursos para o seu Núcleo.
-[*] Use blocos de produção para criar materiais avançados.
-[*] Construa drones para minerar recursos automaticamente, ajudar na construção e proteger a sua base.
-[*] Distribua líquidos e enfrente surtos de fogo.
-[*] Melhore a produção suprimindo refrigerantes e lubrificantes opcionais para os seus blocos de defesa e produção.
-[/list]
-
-[h2]Campanha[/h2]
-
-[list]
-[*] Avance através de 12 zonas re-jogáveis com pontos de spawn aleatórios
-[*] Colete e lance recursos
-[*] Pesquise novos blocos para abastecer o progresso
-[*] Configure loadout antes do lançamento para levar recursos para cada zona
-[*] Variedade de missões com objetivos e metas
-[*] Convide seus amigos para completar missões juntos
-[*] Mais de 120 blocos de tecnologia para dominar
-[*] 19 tipos de drones, mechas e naves diferentes
-[*] Mais de 50 conquistas para completar
-[/list]
-
-[h2][h2]Modos de jogo[/h2][/h2]
-
-[list]
-[*] [b]Sobrevivência[/b]: Construa torretas para defender de inimigos no gameplay de tower-defense. Sobreviva o máximo possível, opcionalmente lançando o seu núcleo para usar os recursos coletados para pesquisa. Prepare a sua base para ataques intermitentes de chefes aéreos.
-[*] [b]Ataque[/b]: Construa fábricas para unidades destruírem núcleos inimidos, enquanto simultaneamente defendendo sua base de hordas de unidades inimigas. Crie uma variedade de tipos diferentes de unidades de suporte o defesa para auxiliar você em seus objetivos.
-[*] [b]PvP[/b]: Dispute com outros jogadores em até 4 times diferentes, para destruir o núcleo dos outros. Crie unidades, ou ataque outras bases diretamente com seus mechas.
-[*] [b]Sandbox[/b]: Brinque com recursos infinitos e sem ameaça inimiga. Use itens específicos do modo e fontes de líquidos para testar designs, e sumone inimigos à vontade.
-[/list]
-
-[h2]Jogos Personalizados & Multi-jogador Multi-plataforma[/h2]
-
-[list]
-[*] 12 mapas embutidos para jogos personalizados, além da campanha
-[*] Jogue Cooperativo, PvP, ou sandbox
-[*] Entre em um servidor público dedicado, ou convide amigos para a sua própria sessão privada
-[*] Regras do jogo personalizáveis: Mude custo dos blocos, estatísticas de inimigos, itens iniciais, tempo entre as hordas e mais
-[*] Misture modos de jogo: Combine modos de jogo PvP e PvE
-[/list]
-
-[h2]Editor de mapa[/h2]
-
-[list]
-[*] Pinte terreno com um editor
-[*] Edite e visualize estruturas em jogo
-[*] Modos de ferramentas configuráveis: Mude como cada ferramenta funciona
-[*] Sistema gerador de mapa poderoso, com muitos tipos diferentes de filtros para manipulação procedural de terreno
-[*] Aplique ruído, distorção, suavização, erosão, simetria, geração de minérios e terreno aleatório aos seus mapas
-[*] Aleatorize e configure geração de minérios, assim como localização de rios e recursos
-[*] Configure o layout de hordas inimigas
-[*] Compartilhe mapas exportados na Oficina da Steam
-[*] Modifique regras básicas do mapa
-[*] Use mais de 75 blocos de ambientação diferentes
-[/list]
diff --git a/fastlane/metadata/steam/portuguese-brazil/short-description.txt b/fastlane/metadata/steam/portuguese-brazil/short-description.txt
deleted file mode 100644
index c6ad92da31..0000000000
--- a/fastlane/metadata/steam/portuguese-brazil/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Um jogo de fim aberto de tower-defense com um foco em gerenciamento de recursos.
diff --git a/fastlane/metadata/steam/portuguese/achievements.vdf b/fastlane/metadata/steam/portuguese/achievements.vdf
deleted file mode 100644
index caa3a26319..0000000000
--- a/fastlane/metadata/steam/portuguese/achievements.vdf
+++ /dev/null
@@ -1,109 +0,0 @@
-"lang"
-{
-	"Language"	"portuguese-brazil"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Verificado"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Complete o tutorial"
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Sucateiro"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Destrua 1000 unidades inimigas."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Expurgo"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Destrua 100.000 unidades inimigas."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Transporte atmosférico"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Lance 10.000 itens no total."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"Transportes Sem Fim"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Lance 1.000.000 itens no total."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Conquistador"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Vença 10 partidas no modo de ataque."
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Campeão"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Vença 10 partidas PvP multi-jogador."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Blitz"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Destrua o núcleo inimigo na zona de ataque em 5 hordas ou menos."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Chuva de núcleos"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Lance seu núcleo em uma zona 10 vezes."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Persistente"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Sobreviva 100 hordas"
-		"NEW_ACHIEVEMENT_20_11_NAME"	"Invicto"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Sobreviva 500 hordas."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"Pesquisador"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"Pesquise tudo."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Metamorfose Ambulante"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Desbloqueie e transforme-se em todos os mechas no jogo."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Sobrecarga"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Atinja um inimigo coberto de água com eletricidade."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Deflexão"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Destrua uma unidade com suas proprias balas refletidas."
-		"NEW_ACHIEVEMENT_20_17_NAME"	"Um Erro Grave"
-		"NEW_ACHIEVEMENT_20_17_DESC"	"Pesquise o roteador."
-		"NEW_ACHIEVEMENT_20_18_NAME"	"Crie"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"Coloque 10.000 blocos."
-		"NEW_ACHIEVEMENT_20_19_NAME"	"Arraso"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Destrua 1.000 blocos inimigos."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Um desastre espetacular."
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Faça com que um reator de tório superaqueça e exploda."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Cartógrafo"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Faça um mapa novo 10 vezes."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Navegador"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Baixe um mapa da Oficina."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Criador"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Publique um mapa na Oficina."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Matador"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Derrote um chefe."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Explorador"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Desbloqueie todas as zonas na campanha."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Completador"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"Alcance a horda requerida para configuração em todas as zonas."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Material II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Desbloqueie Tório."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Material I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Desbloqueie Titânio."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Encha o seu mecha com materiais explosivos e morra, criando uma explosão."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"Assim Começa"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Construa uma fábrica de Dagger."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Ataque direto"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Emita o comando de Ataque usando o Centro de Comando."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Enchame"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Tenha 100 unidades ativas ao mesmo tempo."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Rebanho"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Tenha 10 drones Phantom ativos ao mesmo tempo."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Exército Volátil"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Tenha 50 unidades Crawler ativas ao mesmo tempo."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Legiões"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Construa 1000 unidades no total."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Conquiste o rank S em qualquer zona."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Conquiste o rank SS em qualquer zona."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Você Devia Ter Escutado"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Morra na zona de exclusão do ponto de spawn."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Só Aperte Shift"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Afogue, de algum modo."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Colecionador"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Encha o núcleo até a capacidade máxima com todos os tipos de materiais."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"Galera"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Hospede um servidor com 10 pessoas nele."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"Invulnerável"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Construa o Meltdown e o Spectre."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Decolagem"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Use a Plataforma de Lançamento."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Complacência"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Pule o lançamento duas vezes, então tenha o seu núcleo destruído pelo inimigo."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Heresia"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Construa dois roteadores, um do lado do outro."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Guardião Solitário"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Sobreviva 10 hordas em qualquer zona, sem colocar qualquer bloco."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Incinere"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Use Piratita em qualquer torreta."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Eficiência"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Refirgere uma torreta com água ou crio fluido."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Modo Clássico"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Habilite pixelização."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Sábio"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Abra a Wiki do jogo."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Vantagem"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Entre em uma zona com 10.000 itens ou mais já configurados."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Ignição"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Ligue um Reator de Impacto."
-	}
-}
diff --git a/fastlane/metadata/steam/portuguese/description.txt b/fastlane/metadata/steam/portuguese/description.txt
deleted file mode 100644
index 0efa240dc0..0000000000
--- a/fastlane/metadata/steam/portuguese/description.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Crie correntes de suprimentos elaboradas com correias transportadoras para alimentar suas torretas com munição, produza minerais para usar em construção, e defenda suas estruturas de hordas inimigas. Jogue com seus amigos em jogos cooperativos multi-jogadores multi-plataformas, ou desafie-os em partidas PvP de times.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Gameplay[/h2]
-
-[list]
-[*] Crie brocas e correntes transportadoras para mover recursos para o seu Núcleo.
-[*] Use blocos de produção para criar materiais avançados.
-[*] Construa drones para minerar recursos automaticamente, ajudar na construção e proteger a sua base.
-[*] Distribua líquidos e enfrente surtos de fogo.
-[*] Melhore a produção suprimindo refrigerantes e lubrificantes opcionais para os seus blocos de defesa e produção.
-[/list]
-
-[h2]Campanha[/h2]
-
-[list]
-[*] Avance através de 12 zonas re-jogáveis com pontos de spawn aleatórios
-[*] Colete e lance recursos
-[*] Pesquise novos blocos para abastecer o progresso
-[*] Configure loadout antes do lançamento para levar recursos para cada zona
-[*] Variedade de missões com objetivos e metas
-[*] Convide seus amigos para completar missões juntos
-[*] Mais de 120 blocos de tecnologia para dominar
-[*] 19 tipos de drones, mechas e naves diferentes
-[*] Mais de 50 conquistas para completar
-[/list]
-
-[h2][h2]Modos de jogo[/h2][/h2]
-
-[list]
-[*] [b]Sobrevivência[/b]: Construa torretas para defender de inimigos no gameplay de tower-defense. Sobreviva o máximo possível, opcionalmente lançando o seu núcleo para usar os recursos coletados para pesquisa. Prepare a sua base para ataques intermitentes de chefes aéreos.
-[*] [b]Ataque[/b]: Construa fábricas para unidades destruírem núcleos inimidos, enquanto simultaneamente defendendo sua base de hordas de unidades inimigas. Crie uma variedade de tipos diferentes de unidades de suporte o defesa para auxiliar você em seus objetivos.
-[*] [b]PvP[/b]: Dispute com outros jogadores em até 4 times diferentes, para destruir o núcleo dos outros. Crie unidades, ou ataque outras bases diretamente com seus mechas.
-[*] [b]Sandbox[/b]: Brinque com recursos infinitos e sem ameaça inimiga. Use itens específicos do modo e fontes de líquidos para testar designs, e sumone inimigos à vontade.
-[/list]
-
-[h2]Jogos Personalizados & Multi-jogador Multi-plataforma[/h2]
-
-[list]
-[*] 12 mapas embutidos para jogos personalizados, além da campanha
-[*] Jogue Cooperativo, PvP, ou sandbox
-[*] Entre em um servidor público dedicado, ou convide amigos para a sua própria sessão privada
-[*] Regras do jogo personalizáveis: Mude custo dos blocos, estatísticas de inimigos, itens iniciais, tempo entre as hordas e mais
-[*] Misture modos de jogo: Combine modos de jogo PvP e PvE
-[/list]
-
-[h2]Editor de mapa[/h2]
-
-[list]
-[*] Pinte terreno com um editor
-[*] Edite e visualize estruturas em jogo
-[*] Modos de ferramentas configuráveis: Mude como cada ferramenta funciona
-[*] Sistema gerador de mapa poderoso, com muitos tipos diferentes de filtros para manipulação procedural de terreno
-[*] Aplique ruído, distorção, suavização, erosão, simetria, geração de minérios e terreno aleatório aos seus mapas
-[*] Aleatorize e configure geração de minérios, assim como localização de rios e recursos
-[*] Configure o layout de hordas inimigas
-[*] Compartilhe mapas exportados na Oficina da Steam
-[*] Modifique regras básicas do mapa
-[*] Use mais de 75 blocos de ambientação diferentes
-[/list]
diff --git a/fastlane/metadata/steam/portuguese/short-description.txt b/fastlane/metadata/steam/portuguese/short-description.txt
deleted file mode 100644
index c6ad92da31..0000000000
--- a/fastlane/metadata/steam/portuguese/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Um jogo de fim aberto de tower-defense com um foco em gerenciamento de recursos.
diff --git a/fastlane/metadata/steam/russian/achievements.vdf b/fastlane/metadata/steam/russian/achievements.vdf
deleted file mode 100644
index 628e39b9a5..0000000000
--- a/fastlane/metadata/steam/russian/achievements.vdf
+++ /dev/null
@@ -1,109 +0,0 @@
-"lang"
-{
-	"Language"	"russian"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Проверен"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Пройдите обучение."
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Утилизатор"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Уничтожьте 1000 враже�ких единиц."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Зачи�тка"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Уничтожьте 100,000 враже�ких единиц."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Воздушна� до�тавка"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Запу�тите в целом 10,000 предметов."
-		"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_7_NAME"	"Чемпион"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Победите в 10 многопользователь�ких PvP матчах."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Блиц"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Уничтожьте враже�кое �дро в зоне атаки за 5 волн или меньше."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Ядрёный дождь"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Совершите 30 по�адок �дра на поверхно�ть."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Упорный"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Выживите 100 волн."
-		"NEW_ACHIEVEMENT_20_11_NAME"	"�епобежденный"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Выживите 500 волн."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"И��ледователь"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"И��ледуйте в�ё."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Оборотень"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Разблокируйте и тран�формируйте�ь во в�ех мехов в игре."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Перегрузка"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Поразите покрытого водой врага �лектриче�твом."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Отражение"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Уничтожьте единицу при помощи её же отражённого �нар�да."
-		"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_19_NAME"	"Сне�ите"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Уничтожьте 1,000 враже�ких блоков."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"�еожиданна� ката�трофа"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Допу�тите взрыв ториевого реактора из-за перегрева."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Картограф"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Создайте 10 новых карт."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Обозреватель"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Загрузите карту из Ма�тер�кой."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Создатель"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Опубликуйте карту в Ма�тер�кой."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Уничтожитель"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Уничтожьте бо��а."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Открыватель"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Разблокируйте в�е зоны в режиме кампании."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Завершитель"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"До�тигните необходимой волны дл� разблокировани� конфигурации во в�ех зонах."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Материал II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Разблокируйте торий."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Материал I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Разблокируйте титан."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Камикадзе"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Заполните Ваш мех взрывчатым веще�твом и умрите, �оздав взрыв."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"�ачинает��"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Создайте завод «Кинжалов»."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Пр�мое нападение"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Выберите команду «атака», и�пользу� командный центр."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Рой"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Имейте одновременно 100 активных единиц."
-		"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_6_NAME"	"Легионы"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"По�тройте в целом 1000 единиц."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Получите ранг «S» в любой зоне."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Получите ранг «SS» в любой зоне."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Тебе �ледовало по�лушать��"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Умрите в зоне вы�адки врагов."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Про�то нажми Shift"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Каким-то образом, утоните."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Собиратель"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Полно�тью заполните �дро в�еми видами ре�ур�ов."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"Толпа"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Создайте �ервер, на котором будет 10 игроков."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"�еу�звимый"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"По�тройте И�пепелитель и Спектр."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Взлет"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"И�пользуйте �тартовую площадку."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Самодоволь�тво"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Дважды пропу�тите запу�к и допу�тите уничтожение �дра врагом."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Ере�ь"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"По�тройте два маршрутизатора р�дом друг � другом."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Одинокий �траж"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Выживите 10 волн в любой зоне, не размеща� ни одного блока."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Сожжение"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"И�пользуйте пиротит в любой из турелей."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Эффективно�ть"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Охладите турель водой или криогенной жидко�тью."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Кла��иче�кий режим"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Включите пик�елизацию."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Прошаренный"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Откройте Wiki из игры."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Уверенное начало"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Запу�тите �дро в зону � 10,000 или более предметами."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Зажигание"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Запу�тите импуль�ный реактор."
-	}
-}
diff --git a/fastlane/metadata/steam/russian/description.txt b/fastlane/metadata/steam/russian/description.txt
deleted file mode 100644
index 6fae321743..0000000000
--- a/fastlane/metadata/steam/russian/description.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-Создавайте продуманные цепочки по�тавок конвейерными лентами дл� подачи боеприпа�ов в ваши башни, производите материалы дл� �троитель�тва и защищайте �вои �ооружени� от волн врагов. Играйте � друзь�ми в платформонезави�имые многопользователь�кие кооперативные матчи или бро�айте им вызов в командных PvP-матчах.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Игровой проце��[/h2]
-
-[list]
-[*] Создавайте буры и конвейеры дл� перемещени� ре�ур�ов в ваше �дро. 
-[*] И�пользуйте производ�щие блоки дл� �оздани� передовых материалов.
-[*] Создавайте дронов дл� автоматиче�кой добычи ре�ур�ов, помощи в �троитель�тве и защиты вашей базы.
-[*] До�тавл�йте жидко�ти и борите�ь � очагами огн�.
-[*] У�кор�йте производ�тво, дополнительно по�тавл�� охлаждающую жидко�ть и �мазку в ваши защитные и производ�твенные блоки.
-[/list]
-
-[h2]Кампани�[/h2]
-
-[list]
-[*] Продвигайте�ь через 12 переигрываемых в�троенных зон �о �лучайными точками возрождени�
-[*] Собирайте и запу�кайте ре�ур�ы
-[*] И��ледуйте новые блоки дл� поддержани� прогре��а
-[*] �а�траивайте выгружаемые ре�ур�ы дл� каждой зоны
-[*] Разнообразие целей и задач ми��ий
-[*] Приглашайте друзей дл� �овме�тного прохождени� ми��ий
-[*] Больше 120 функциональных блоков дл� о�воени�
-[*] 19 различных типов дронов, мехов и кораблей
-[*] Больше 50 до�тижений дл� прохождени�
-[/list]
-
-[h2][h2]Игровые режимы[/h2][/h2]
-
-[*] [b]Выживание[/b]: Стройте турели, чтобы защищать�� от врагов в �тиле башенной защиты. Продержите�ь как можно дольше, при желании запу�тив �воё �дро, чтобы и�пользовать �обранные ре�ур�ы дл� и��ледований. Подготовьте �вою базу дл� периодиче�ких атак воздушными бо��ами.
-[*] [b]�така[/b]: Стройте заводы боевых единиц, чтобы уничтожить враже�кие �дра, одновременно защища� �вою базу от волн враже�ких единиц. Создайте множе�тво различных в�помогательных и на�тупательных боевых единиц, которые помогут вам в ваших цел�х.
-[*] [b]PvP[/b]: До 4 различных команд дл� �оревновани� � другими игроками на уничтожение �дер друг друга. Создавайте отр�ды или атакуйте другие базы напр�мую �воими мехами.
-[*] [b]Пе�очница[/b]: Играйте � бе�конечными ре�ур�ами без враже�кой угрозы. И�пользуйте �пецифичные дл� пе�очницы блоки-и�точники предметов и жидко�тей дл� проверки �ффективно�ти по�троек, а также вызывайте волны врагов по запро�у.
-[/list]
-
-[h2]Пользователь�кие игры & платформонезави�имый мультиплеер[/h2]
-
-[list]
-[*] 12 в�троенных карт дл� игры, в дополнение к кампании.
-[*] Играйте в кооперативном режиме, PvP или пе�очницу.
-[*] При�оедините�ь к общедо�тупному �ерверу или пригла�ите друзей в �вою игровую �е��ию.
-[*] �а�триваемые игровые правила: Измен�йте �тоимо�ть блоков, характери�тики врагов, �тартовые ре�ур�ы, задержки между волнами и другое.
-[*] Смешанные игровые матчи: Совмещайте PvP и PvE режимы на одной карте.
-[/list]
-
-[h2]Пользователь�кий редактор карт[/h2]
-
-[list]
-[*] Создавайте ландшафт � помощью визуального редактора
-[*] Измен�йте и про�матривайте по�тройки так же как в игре
-[*] �а�траиваемые режимы ин�трументов — измените �по�об работы каждого ин�трумента
-[*] Мощна� �и�тема генерации карт, � большим количе�твом различных типов фильтров дл� процедурных манипул�ций над ме�тно�тью
-[*] Примен�йте шум, и�кажение, �глаживание, �розию, �имметрию, рудную генерацию и �лучайный ландшафт к вашим картам
-[*] �а�траивайте �лучайную генерацию руд, а также размещение рек и ре�ур�ов
-[*] �а�траиваемые шаблоны враже�ких волн
-[*] Делите�ь выложенными картами в Ма�тер�кой Steam
-[*] �а�траивайте изначальные правила карты
-[*] И�пользуйте больше 75 различных блоков окружени�
-[/list]
diff --git a/fastlane/metadata/steam/russian/short-description.txt b/fastlane/metadata/steam/russian/short-description.txt
deleted file mode 100644
index 995a8f2cf0..0000000000
--- a/fastlane/metadata/steam/russian/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Безгранична� игра в жанре «башенна� защита» � упором на управление ре�ур�ами.
diff --git a/fastlane/metadata/steam/spanish/achievements.vdf b/fastlane/metadata/steam/spanish/achievements.vdf
deleted file mode 100644
index fb67d82c9d..0000000000
--- a/fastlane/metadata/steam/spanish/achievements.vdf
+++ /dev/null
@@ -1,109 +0,0 @@
-"lang"
-{
-	"Language"	"spanish"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_0_NAME"	"Verificado"
-		"NEW_ACHIEVEMENT_20_0_DESC"	"Completa el tutorial."
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Scrapper"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Destruye 1,000 unidades enemigas."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Purga"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Destruye 100,000 unidades enemigas."
-		"NEW_ACHIEVEMENT_20_3_NAME"	"Transporte Atmosférico"
-		"NEW_ACHIEVEMENT_20_3_DESC"	"Lanza 10,000 items en total."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"Envíos Sin Fin"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Lanza un total de 1,000,000 ítems."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Conquistador"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Gana 10 partidas en modo Invasión"
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Campeón"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Gana 10 partidas PvP Multijugador."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Rápido"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Destruye el núcleo enemigo en 5 oleadas o menos."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Lluvia de núcleos"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Lanza tu núcleo a una zona 30 veces."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"Tenaz"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Sobrevive 100 oleadas."
-		"NEW_ACHIEVEMENT_20_11_NAME"	"Unvanquished"
-		"NEW_ACHIEVEMENT_20_11_DESC"	"Sobrevive 500 oleadas."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"Investigador"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"Investiga todo el árbol de tecnologías."
-		"NEW_ACHIEVEMENT_20_13_NAME"	"Cambiaformas"
-		"NEW_ACHIEVEMENT_20_13_DESC"	"Desbloquea y transformate en todos los mecanoides del juego."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Sobrecarga"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"Ataca a un enemigo con electricidad mientras este recibe agua."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Desviación"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Destruye una unidad haciendo rebotar su propia bala."
-		"NEW_ACHIEVEMENT_20_17_NAME"	"Un grave, grave error"
-		"NEW_ACHIEVEMENT_20_17_DESC"	"Investiga el enrutador."
-		"NEW_ACHIEVEMENT_20_18_NAME"	"Creador"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"Coloca 10,000 bloques."
-		"NEW_ACHIEVEMENT_20_19_NAME"	"Raze"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Destruye 1,000 bloques enemigos."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Un desastre espectacular"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Causa que un reactor de torio se sobre caliente y explote."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Mapper"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Crea un nuevo mapa 10 veces."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Buscador"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Descarga un mapa de la Workshop."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Creador"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Publca un mapa en la Workshop."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Slayer"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Derrota un boss."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"Explorador"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Desbloquea todas las zonas de la campaña."
-		"NEW_ACHIEVEMENT_20_26_NAME"	"Minucioso"
-		"NEW_ACHIEVEMENT_20_26_DESC"	"Alcanza el requisito de configuración en todas las zonas."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Material II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Desbloquea el Torio."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Material I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Desbloquea el Titanio."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"LLena tu mecanoide de explosivos y muere, creando una explosión."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"Así comienza"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Construye una fábrica de drones Daga."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Asalto Directo"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Utiliza el comando ataque desde el centro de comando."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Swarm"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"Consigue 100 unidades activas al mismo tiempo."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Flock"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Consigue 10 drones fantasmales activos al mismo tiempo."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Ejército volátil"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Consigue 50 Crawlers activos al mismo tiempo."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Legiones"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Construye 1,000 unidades en total."
-		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
-		"NEW_ACHIEVEMENT_21_7_DESC"	"Consigue el rango S en cualquier zona."
-		"NEW_ACHIEVEMENT_21_8_NAME"	"Super Super"
-		"NEW_ACHIEVEMENT_21_8_DESC"	"Consigue el rango SS en cualquier zona."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Deberías haber hecho caso"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Muere en la zona del punto de exclusión."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Solo aprieta Shift"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Muere ahogado, como sea."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Coleccionista"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Llena el núcleo con la máxima cantidad de todos los recursos."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"10 son multitud"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Hostea un servidor con 10 jugadores."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"Invencible"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Construye el Meltdown y el Espectro."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Liftoff"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Use the Launch Pad."
-		"NEW_ACHIEVEMENT_21_15_NAME"	"Complacencia"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"Saltea lanzar dos veces, luego deja que los enemigos destruyan tu núcleo."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Herejía"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Construye dos enrutadores, uno al lado del otro."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Guardián solitario"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Sobrevive 10 oleadas sin colocar ni un solo bloque."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Incinerador"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Usa pirotita para cargar una torreta."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Eficiente"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Refrigera una torreta con líquido criogénico."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Modo Clásico"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Activa el modo pixelado."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"Estudiante"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Abre la wiki desde el juego."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Comienzo a lo grande"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Lanzate a una zona con mas de 10.000 recursos configurados."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Ignición"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Alimenta con energía un generador de impacto."
-	}
-}
diff --git a/fastlane/metadata/steam/spanish/description.txt b/fastlane/metadata/steam/spanish/description.txt
deleted file mode 100644
index 979f2ad430..0000000000
--- a/fastlane/metadata/steam/spanish/description.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Crea elaboradas cadenas de suministros para cargar tus torretas, produce materiales para crear estructuras y defiendelas de oleadas de enemigos. Juega con tus amigos en un multijugador cooperativo multiplataforma, o pelea contra ellos en batallas PvP por equipos.
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Gameplay[/h2]
-
-[list]
-[*] Crea taladros y cintas transportadoras para enviar recursos a tu núcleo
-[*] Usa bloques de producción para crear materiales avanzados
-[*] Construye drones para minar recursos automaticamente, construir y defender tu base de forma eficiente
-[*] Distribuye liquidos y apaga posibles incendios
-[*] Potencia la producción refrigerando y lubricando tus defensas y bloques de construcción
-[/list]
-
-[h2]Campaña[/h2]
-
-[list]
-[*] Avanza a través de 12 zonas completamente rejugables con puntos de aparición randomizados
-[*] Obtén y lanza recursos para investigar nuevas tecnologías
-[*] Investiga nuevos bloques para facilitar tu progreso
-[*] Configura los recursos iniciales de cada área a tus necesidades
-[*] Gran variedad de misiones y objetivos
-[*] Juega con tus amigos y completa niveles con ellos
-[*] Mas de 120 bloques por investigar y descubrir
-[*] 19 tipos de drones, mecanoides y naves
-[*] Mas de 50 logros para completar
-[/list]
-
-[h2][h2]Modos de juego[/h2][/h2]
-
-[list]
-[*] [b]Supervivencia[/b]: Construye torretas para defenderte de tus enemigos con un estilo de Tower Defense. Sobrevive tanto como puedas, lanzando tu núcleo (opcionalmente) para utilizar los recursos con propósitos de investigación. Prepara tu base para el ataque de intermitentes bosses áereos.
-[*] [b]Invasión[/b]: Construye fábricas de unidades para destruir el núcleo enemigo, mientras resistes oleadas periódicamente. Utiliza distintos tipos de unidades de ataque y soporte para ayudarte en la conquista.
-[*] [b]PvP[/b]: Compite contra otros jugadores en hasta 4 equipos diferentes para destruir el núcleo de los demás. Crea unidades o ataca directamente con mecanoides la base de tus enemigos.
-[*] [b]Sandbox[/b]: Juega libremente con recursos infinitos y sin enemigos molestando. Usa bloques exclusivos de sandbox para facilitar la prueba de diseños. Crea oleadas a gusto.
-[/list]
-
-[h2]Partidas personalizadas y multijugador multiplataforma[/h2]
-
-[list]
-[*] 12 mapas integrados para partidas personalizadas, además de los de la campaña
-[*] Juega en cooperativo, Sandbox o PvP
-[*] Únete a un servidor dedicado, o invita amigos a tu partida privada
-[*] Reglas personalizadas: Cambia costos y tiempos de tus estructuras. Regula la fuerza de tus enemigos y cada cuanto aparecen, entre otras opciones
-[*] Modos de juego combinados: Juega PvP y PvE al mismo tiempo
-[/list]
-
-[h2]Editor de mapas[/h2]
-
-[list]
-[*] Dibuja terreno con una interfaz completa de editor
-[*] Edita y visualiza estructuras in-game
-[*] Configura los modos de las herramientas
-[*] Poderoso algoritmo de generacion, aplica filtros de terreno.
-[*] Aplica distorsión, simetria, suavidad, generación de terreno y más a tus mapas
-[*] Randomiza la generacion de ores y terreno, para que cada partida sea distinta
-[*] Configura las oleadas a tu gusto
-[*] Comparte mapas en la Steam Workshop
-[*] Personaliza las reglas de los mapas
-[*] Usa mas de 75 bloques ambientales, para darle un estilo único a tus mapas
-[/list]
diff --git a/fastlane/metadata/steam/spanish/short-description.txt b/fastlane/metadata/steam/spanish/short-description.txt
deleted file mode 100644
index 0966131f11..0000000000
--- a/fastlane/metadata/steam/spanish/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Un Tower Defense abierto centrado en la gestión de recursos.
diff --git a/fastlane/metadata/steam/ukrainian/achievements.vdf b/fastlane/metadata/steam/ukrainian/achievements.vdf
deleted file mode 100644
index 4d6c6e006a..0000000000
--- a/fastlane/metadata/steam/ukrainian/achievements.vdf
+++ /dev/null
@@ -1,115 +0,0 @@
-"lang"
-{
-	"Language"	"ukrainian"
-	"Tokens"
-	{
-		"NEW_ACHIEVEMENT_20_1_NAME"	"Забі�ка"
-		"NEW_ACHIEVEMENT_20_1_DESC"	"Знищте 1000 ворожих одиниць."
-		"NEW_ACHIEVEMENT_20_2_NAME"	"Чи�тка"
-		"NEW_ACHIEVEMENT_20_2_DESC"	"Знищте 100 000 ворожих одиниць."
-		"NEW_ACHIEVEMENT_20_5_NAME"	"�е�кінченне по�тачанн�"
-		"NEW_ACHIEVEMENT_20_5_DESC"	"Запу�тіть 100 000 предметів загалом."
-		"NEW_ACHIEVEMENT_20_6_NAME"	"Завойовник"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"Виграйте 10 матчів у режимі атаки."
-		"NEW_ACHIEVEMENT_20_7_NAME"	"Чемпіон"
-		"NEW_ACHIEVEMENT_20_7_DESC"	"Виграйте 10 матчів у режимі PvP."
-		"NEW_ACHIEVEMENT_20_8_NAME"	"Бліц"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"Знищте вороже �дро в зоні атаки за 5 хвиль або менше."
-		"NEW_ACHIEVEMENT_20_9_NAME"	"Ядерний дощ"
-		"NEW_ACHIEVEMENT_20_9_DESC"	"Запу�тіть �воє �дро в зону 30 разів."
-		"NEW_ACHIEVEMENT_20_10_NAME"	"�аполегливий"
-		"NEW_ACHIEVEMENT_20_10_DESC"	"Протримайте�ь 100 хвиль."
-		"NEW_ACHIEVEMENT_20_12_NAME"	"До�лідник"
-		"NEW_ACHIEVEMENT_20_12_DESC"	"До�лідіть в�е."
-		"NEW_ACHIEVEMENT_20_14_NAME"	"Перевантаженн�"
-		"NEW_ACHIEVEMENT_20_14_DESC"	"�ане�іть шкоду мокрому ворогу електрикою."
-		"NEW_ACHIEVEMENT_20_15_NAME"	"Рикошет"
-		"NEW_ACHIEVEMENT_20_15_DESC"	"Знищте ворога його же відбитою кулею."
-		"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_19_NAME"	"Зрівн�ти з землею"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"Знищте 1 000 ворожих блоків."
-		"NEW_ACHIEVEMENT_20_20_NAME"	"Ефектна ката�трофа"
-		"NEW_ACHIEVEMENT_20_20_DESC"	"Торієвий реактор повинен перегріти�� й вибухнути."
-		"NEW_ACHIEVEMENT_20_21_NAME"	"Картограф"
-		"NEW_ACHIEVEMENT_20_21_DESC"	"Зробіть 10 мап."
-		"NEW_ACHIEVEMENT_20_22_NAME"	"Веб-перегл�дач"
-		"NEW_ACHIEVEMENT_20_22_DESC"	"Завантажте мапу з Май�терні."
-		"NEW_ACHIEVEMENT_20_23_NAME"	"Творець"
-		"NEW_ACHIEVEMENT_20_23_DESC"	"Опублікуйте мапу в Май�терні."
-		"NEW_ACHIEVEMENT_20_24_NAME"	"Убивц�"
-		"NEW_ACHIEVEMENT_20_24_DESC"	"Здолайте бо�а."
-		"NEW_ACHIEVEMENT_20_25_NAME"	"До�лідник"
-		"NEW_ACHIEVEMENT_20_25_DESC"	"Розблокуйте в�і зони в кампанії."
-		"NEW_ACHIEVEMENT_20_29_NAME"	"Матеріал II"
-		"NEW_ACHIEVEMENT_20_29_DESC"	"Розблокуйте торій."
-		"NEW_ACHIEVEMENT_20_31_NAME"	"Матеріал I"
-		"NEW_ACHIEVEMENT_20_31_DESC"	"Розблокуйте титан."
-		"NEW_ACHIEVEMENT_21_0_NAME"	"Камікадзе"
-		"NEW_ACHIEVEMENT_21_0_DESC"	"Заповніть �вого меха вибуховими матеріалами й помріть, �творивши вибух."
-		"NEW_ACHIEVEMENT_21_1_NAME"	"Це починаєть��"
-		"NEW_ACHIEVEMENT_21_1_DESC"	"Побудуйте наземний завод."
-		"NEW_ACHIEVEMENT_21_2_NAME"	"Пр�мий на�туп"
-		"NEW_ACHIEVEMENT_21_2_DESC"	"Видайте команду «�такувати» за допомогою командного центру."
-		"NEW_ACHIEVEMENT_21_3_NAME"	"Рій"
-		"NEW_ACHIEVEMENT_21_3_DESC"	"100 бойових одиниць повинні бути активними одноча�но."
-		"NEW_ACHIEVEMENT_21_4_NAME"	"Згра�"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"10 Полі повинні літати одноча�но."
-		"NEW_ACHIEVEMENT_21_5_NAME"	"Робототехнік"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Створіть у�і типи одиниць."
-		"NEW_ACHIEVEMENT_21_6_NAME"	"Легіони"
-		"NEW_ACHIEVEMENT_21_6_DESC"	"Побудуйте 1000 одиниць загалом."
-		"NEW_ACHIEVEMENT_21_9_NAME"	"Ти не по�лухав��"
-		"NEW_ACHIEVEMENT_21_9_DESC"	"Помріть у зоні ви�адки ворогів."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"Дл� цього є флот"
-		"NEW_ACHIEVEMENT_21_10_DESC"	"Потоніть."
-		"NEW_ACHIEVEMENT_21_11_NAME"	"Збирач"
-		"NEW_ACHIEVEMENT_21_11_DESC"	"Заповніть �дро повні�тю кожним типом матеріалу."
-		"NEW_ACHIEVEMENT_21_12_NAME"	"�атовп"
-		"NEW_ACHIEVEMENT_21_12_DESC"	"Створіть �ервер, на �кому гратимуть де��ть гравців одноча�но."
-		"NEW_ACHIEVEMENT_21_13_NAME"	"�евразливий"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Побудуйте Ката�трофу, Випалювач і Передві�ник."
-		"NEW_ACHIEVEMENT_21_14_NAME"	"Зліт"
-		"NEW_ACHIEVEMENT_21_14_DESC"	"Викори�тайте Пу�ковий майданчик."
-		"NEW_ACHIEVEMENT_21_16_NAME"	"Поган�тво"
-		"NEW_ACHIEVEMENT_21_16_DESC"	"Побудуйте два маршрутизатори поруч."
-		"NEW_ACHIEVEMENT_21_17_NAME"	"Одинокий захи�ник"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"Протримайте�ь 10 хвиль в першій-ліпшій зоні без будуванн� будь-�ких блоків."
-		"NEW_ACHIEVEMENT_21_18_NAME"	"Спалити і викорінити"
-		"NEW_ACHIEVEMENT_21_18_DESC"	"Викори�тайте пиротит у будь-�кій башті."
-		"NEW_ACHIEVEMENT_21_19_NAME"	"Ефективні�ть"
-		"NEW_ACHIEVEMENT_21_19_DESC"	"Охолодіть башту водою чи кріогенною рідиною."
-		"NEW_ACHIEVEMENT_21_20_NAME"	"Кла�ичний режим"
-		"NEW_ACHIEVEMENT_21_20_DESC"	"Увімкніть пік�елізацію."
-		"NEW_ACHIEVEMENT_21_21_NAME"	"�ауковець"
-		"NEW_ACHIEVEMENT_21_21_DESC"	"Відкрийти Вікі з гри."
-		"NEW_ACHIEVEMENT_21_22_NAME"	"Упевнений початок"
-		"NEW_ACHIEVEMENT_21_22_DESC"	"Вивантажіть в зону 10 000 або більше предметів."
-		"NEW_ACHIEVEMENT_21_23_NAME"	"Запалюванн�"
-		"NEW_ACHIEVEMENT_21_23_DESC"	"Запу�тіть імпуль�ний реактор."
-		"NEW_ACHIEVEMENT_21_24_NAME"	"При�коренн�"
-		"NEW_ACHIEVEMENT_21_24_DESC"	"�ктивуйте Міжпланетний при�корювач."
-		"NEW_ACHIEVEMENT_21_25_NAME"	"Спираль"
-		"NEW_ACHIEVEMENT_21_25_DESC"	"Закручуєть�� і закручуєть��…"
-		"NEW_ACHIEVEMENT_21_26_NAME"	"По�иленн�"
-		"NEW_ACHIEVEMENT_21_26_DESC"	"Побудуйте одиницю пʼ�того рівн�."
-		"NEW_ACHIEVEMENT_21_27_NAME"	"�рхітектор"
-		"NEW_ACHIEVEMENT_21_27_DESC"	"Створіть 20 �хем."
-		"NEW_ACHIEVEMENT_21_28_NAME"	"Глобальне пануванн�"
-		"NEW_ACHIEVEMENT_21_28_DESC"	"Захопіть кожний �ектор на Серпуло."
-		"NEW_ACHIEVEMENT_21_29_NAME"	"Ерліфт"
-		"NEW_ACHIEVEMENT_21_29_DESC"	"Завантажте одиницю пʼ�того рівн� в Окта."
-		"NEW_ACHIEVEMENT_21_30_NAME"	"Кінцева форма"
-		"NEW_ACHIEVEMENT_21_30_DESC"	"Долучіть�� до них."
-		"NEW_ACHIEVEMENT_21_31_NAME"	"Виробництво I"
-		"NEW_ACHIEVEMENT_21_31_DESC"	"До��гніть загального виробництва у 5000 предметів за хв. в кампанії."
-		"NEW_ACHIEVEMENT_26_0_NAME"	"Виробництво II"
-		"NEW_ACHIEVEMENT_26_0_DESC"	"До��гніть загального виробництва у 50 000 предметів за хв. в кампанії."
-		"NEW_ACHIEVEMENT_26_1_NAME"	"Гарантована перемога"
-		"NEW_ACHIEVEMENT_26_1_DESC"	"Захопіть �ектор, поки граєте на іншому."
-		"NEW_ACHIEVEMENT_26_2_NAME"	"Мала імпері�"
-		"NEW_ACHIEVEMENT_26_2_DESC"	"Контролюйте 10 �екторів одноча�но."
-	}
-}
diff --git a/fastlane/metadata/steam/ukrainian/description.txt b/fastlane/metadata/steam/ukrainian/description.txt
deleted file mode 100644
index b9cde464a8..0000000000
--- a/fastlane/metadata/steam/ukrainian/description.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img]
-
-[h2]Ігровий проце�[/h2]
-
-[list]
-[*] Створюйте �кладні �и�теми логі�тики дл� перене�енн� боєприпа�ів у башти і видобувайте ре�ур�и дл� будівництва.
-[*] Викори�товуйте виробничі блоки дл� �творенн� чи�ленних передових матеріалів.
-[*] Захищайте �воє �дро від різних ворожих хвиль.
-[*] Грайте з друз�ми на різних платформах у кооперативні ігри, або киньте їм виклик у командних PvP-матчах.
-[*] До�тавл�йте рідини й боріть�� з по�тійними проблемами, такими �к �палахи вогню або рейди ворожих літаків.
-[*] Збільшуйте виробництво, по�тачаючи необов’�зкові теплоно�ії та ма�тила до ваших оборонно-виробничих блоків.
-[*] Отримайте мак�имум від �вого виробництва, по�тавл�ючи додаткові теплоно�ії та ма�тило.
-[*] Виробл�йте чи�ленних одиниць дл� автоматичного управлінн� �воєю базою або дл� на�тупу на ворожі бази.
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/ezgif-1-8679abe089cd.gif[/img]
-
-[h2]Кампані�[/h2]
-
-[list][*] Підкорюйте планету Серпуло, про�уваючи�ь через більш ніж 250 процедурно �творених �екторів та 16 рукотворних мап.
-[*] Захоплюйте територію та �творюйте заводи дл� видобутку ре�ур�ів, поки ви граєте на інших �екторах.
-[*] Захищайте �вої �ектори від періодичних вторгнень.
-[*] Координуйте розподіл ре�ур�ів між �екторами за допомогою пу�кових майданчиків.
-[*] До�лідженн� нових блоків дл� �при�нн� прогре�у.
-[*] �алаштовуйте початкові ре�ур�и дл� кожної зони.
-[*] Різноманітні�ть цілей та завдань мі�ій.
-[*] Запро�іть �воїх друзів дл� �пільного виконанн� мі�ій.
-[*] Понад 120 технологічних блоків дл� о�воєнн�.
-[*] 33 різних типів дронів, мехів і кораблів.
-[*] Понад 50 до��гнень дл� виконанн�.
-[/list]
-
-[h2][h2]Ігрові режими[/h2][/h2]
-
-[list]
-[*] [b]Виживанн�[/b]: �творіть башти дл� захи�ту від ворогів в ігровому проце�і, за�нованому на захи�ті башт. Виживайте �комога довше, за бажанн�м можна запу�тити �воє �дро, щоб викори�товувати зібрані ре�ур�и дл� до�ліджень. Підготуйте �вою базу дл� періодичних атак повітр�них бо�ів.
-[*] [b]�така[/b]: будуйте заводи бойових одиниць дл� знищенн� ворожих �дер, одноча�но захищаючи �вою базу від хвиль ворожих одиниць. За бажанн�м увімкніть ШІ, що будує оборонні �поруди, дл� випробуванн� �ебе на міцні�ть.
-[*] [b]PvP[/b]: змагайте�� з іншими гравц�ми, щоб знищити �дра один одного. Створюйте бойові одиниці або нападайте на інші бази безпо�ередньо зі �воїми мехами. Створіть різноманітні типи підрозділів підтримки та на�тупу, що допоможуть вам у до��гненні цілей.
-[*] [b]Пі�очниц�[/b]: грайте з не�кінченними ре�ур�ами без загрози з боку ворога. Викори�товуйте �пецифічні дл� пі�очниці елементи та блоки рідких джерел дл� те�туванн� кон�трукцій та по�ви ворогів за запитом.
-[/list]
-
-[img]{STEAM_APP_IMAGE}/extras/2020-11-30_10-46-02.gif[/img]
-
-[h2]Кори�тувацькі ігри і багатоплатформовий мультиплеєр[/h2]
-
-[list]
-[*] 16 вбудованих мап на додачу до кампанії.
-[*] Грайте в кооперативі, PvP чи пі�очниці.
-[*] Приєднуйте�ь до загальнодо�тупного �ервера, або запро�іть друзів на �вій приватний �еан�.
-[*] Кори�тувацькі налаштуванн� гри — ціна блоків, �ила ворогів, кількі�ть початкових ре�ур�ів, інтервал між хвил�ми, тощо.
-[*] Змішуйте і поєднуйте ігрові режими — комбінуйте PvP і PvE режими разом.
-[/list]
-
-[h2]Кори�тувацький редактор мап[/h2]
-
-[list]
-[*] Створюйте ландшафт за допомогою візуального редактора.
-[*] Змінюйте і перегл�дайте �поруди так �амо �к в грі.
-[*] Регульовані режими ін�трументів — змініть функціюванн� кожного ін�трументу.
-[*] Потужна �и�тема генерації мап, що має безліч різних типів фільтрів дл� процедурного маніпулюванн� мі�цеві�тю.
-[*] За�то�уйте на �воїх мапах шум, �потворенн�, згладжуванн�, ерозію, �иметрію, генерацію руди та випадкову генерацію мі�цево�ті.
-[*] Відкрита гра в жанрі «захи�т башт» з акцентом на керуванні ре�ур�ами.
-[*] Розкладки хвиль дл� мап можна налаштувати.
-[*] Поширюйте ек�портовані мапи в Май�терні Steam.
-[*] Правила дл� мап можна налаштувати.
-[*] Викори�товуйте понад 80 видів блоків навколишнього �ередовища.
-[/list]
diff --git a/fastlane/metadata/steam/ukrainian/short-description.txt b/fastlane/metadata/steam/ukrainian/short-description.txt
deleted file mode 100644
index 95bce25229..0000000000
--- a/fastlane/metadata/steam/ukrainian/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-�е�кінченна гра у жанрі «захи�т вежі» з акцентом на керуванні ре�ур�ами.
diff --git a/gradle.properties b/gradle.properties
index f42373473e..04720cf292 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,29 @@
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=5e9176c3feefa5ee2f14b08f82da1f01f790e64a
+org.gradle.jvmargs=-Xms256m -Xmx1024m --illegal-access=permit \
+--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
+--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+--add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED
+
+# Multithreaded
+kapt.use.worker.api=true
+# Compilation avoidance (see https://kotlinlang.org/docs/kapt.html#compile-avoidance-for-kapt-since-1-3-20)
+kapt.include.compile.classpath=false
+# I don't need to use the kotlin stdlib, so remove it to prevent extra bloat & method count issues
+kotlin.stdlib.default.dependency=false
+#needed for android compilation
+android.useAndroidX=true
+org.gradle.caching=true
+#used for slow jitpack builds; TODO see if this actually works
+org.gradle.internal.http.socketTimeout=100000
+org.gradle.internal.http.connectionTimeout=100000
+android.enableR8.fullMode=false
+archash=c8004178c4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016..e708b1c023 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6c9a224775..e1adfb4938 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acfdc3..4f906e0c81 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d960..107acd32c4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/ios/build.gradle b/ios/build.gradle
index aad88383dc..d0ec38f0a9 100644
--- a/ios/build.gradle
+++ b/ios/build.gradle
@@ -1,3 +1,47 @@
+buildscript{
+    repositories{
+        mavenCentral()
+    }
+
+    dependencies{
+        classpath "com.mobidevelop.robovm:robovm-gradle-plugin:2.3.19"
+    }
+}
+
+apply plugin: "java"
+apply plugin: "robovm"
+
+task incrementConfig{
+    def vfile = file('robovm.properties')
+    def bversion = getBuildVersion()
+    def props = new Properties()
+    if(vfile.exists()){
+        props.load(new FileInputStream(vfile))
+    }else{
+        props['app.id'] = 'io.anuke.mindustry'
+        props['app.version'] = '7.0'
+        props['app.mainclass'] = 'mindustry.IOSLauncher'
+        props['app.executable'] = 'IOSLauncher'
+        props['app.name'] = 'Mindustry'
+    }
+
+    props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
+    if(bversion != "custom build"){
+        props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
+    }
+    props.store(vfile.newWriter(), null)
+}
+
+dependencies{
+    implementation project(":core")
+
+    implementation arcModule("natives:natives-ios")
+    implementation arcModule("natives:natives-freetype-ios")
+    implementation arcModule("backends:backend-robovm")
+
+    compileOnly project(":annotations")
+}
+
 sourceSets.main.java.srcDirs = ["src/"]
 
 ext{
@@ -17,13 +61,24 @@ task copyAssets(){
     }
 }
 
+task copyNatives(){
+    doLast{
+        copy{
+            from "../../Arc/natives/natives-freetype-ios/libs", "../../Arc/natives/natives-ios/libs"
+            into "libs"
+        }
+
+    }
+}
+
 task deploy{
     if(System.getProperty("os.name").contains("Mac")) dependsOn copyAssets
     dependsOn createIPA
 }
 
-//must pack before deployment, as iOS does never has the latest sprites.
+//must pack before deployment, as iOS never has the latest sprites.
 copyAssets.dependsOn ":tools:pack"
+copyAssets.dependsOn copyNatives
 launchIPhoneSimulator.dependsOn build
 launchIPadSimulator.dependsOn build
 launchIOSDevice.dependsOn build
diff --git a/ios/data/Default-568h@2x~iphone.png b/ios/data/Default-568h@2x~iphone.png
deleted file mode 100644
index 9a0e377f65..0000000000
Binary files a/ios/data/Default-568h@2x~iphone.png and /dev/null differ
diff --git a/ios/data/Default-667h.png b/ios/data/Default-667h.png
deleted file mode 100644
index b5a4b57681..0000000000
Binary files a/ios/data/Default-667h.png and /dev/null differ
diff --git a/ios/data/Default-736h.png b/ios/data/Default-736h.png
deleted file mode 100644
index 8d05a25f44..0000000000
Binary files a/ios/data/Default-736h.png and /dev/null differ
diff --git a/ios/data/Default-Landscape-736h.png b/ios/data/Default-Landscape-736h.png
deleted file mode 100644
index 70badabb86..0000000000
Binary files a/ios/data/Default-Landscape-736h.png and /dev/null differ
diff --git a/ios/data/Default-Landscape@2x~ipad.png b/ios/data/Default-Landscape@2x~ipad.png
deleted file mode 100644
index da2884cfd1..0000000000
Binary files a/ios/data/Default-Landscape@2x~ipad.png and /dev/null differ
diff --git a/ios/data/Default-Landscape~ipad.png b/ios/data/Default-Landscape~ipad.png
deleted file mode 100644
index 3b101edc7e..0000000000
Binary files a/ios/data/Default-Landscape~ipad.png and /dev/null differ
diff --git a/ios/data/Default-Portrait@2x~ipad.png b/ios/data/Default-Portrait@2x~ipad.png
deleted file mode 100644
index 0989e62081..0000000000
Binary files a/ios/data/Default-Portrait@2x~ipad.png and /dev/null differ
diff --git a/ios/data/Default-Portrait~ipad.png b/ios/data/Default-Portrait~ipad.png
deleted file mode 100644
index 9f980c961a..0000000000
Binary files a/ios/data/Default-Portrait~ipad.png and /dev/null differ
diff --git a/ios/data/Default@2x~iphone.png b/ios/data/Default@2x~iphone.png
deleted file mode 100644
index 710599b407..0000000000
Binary files a/ios/data/Default@2x~iphone.png and /dev/null differ
diff --git a/ios/data/Default~iphone.png b/ios/data/Default~iphone.png
deleted file mode 100644
index 527d691cc0..0000000000
Binary files a/ios/data/Default~iphone.png and /dev/null differ
diff --git a/ios/robovm.xml b/ios/robovm.xml
index e792b258a8..c94ef0fe26 100644
--- a/ios/robovm.xml
+++ b/ios/robovm.xml
@@ -2,7 +2,6 @@
     <executableName>${app.executable}</executableName>
     <mainClass>${app.mainclass}</mainClass>
     <os>ios</os>
-    <arch>thumbv7</arch>
     <target>ios</target>
     <iosInfoPList>Info.plist.xml</iosInfoPList>
     <resources>
@@ -20,10 +19,7 @@
     <forceLinkClasses>
         <pattern>net.jpountz.lz4.**</pattern>
         <pattern>arc.scene.**</pattern>
-        <pattern>mindustry.gen.Call</pattern>
-        <pattern>mindustry.net.**</pattern>
-        <pattern>mindustry.world.blocks.**</pattern>
-        <pattern>mindustry.logic.**</pattern>
+        <pattern>mindustry.**</pattern>
         <pattern>com.android.okhttp.HttpHandler</pattern>
         <pattern>com.android.okhttp.HttpsHandler</pattern>
         <pattern>com.android.org.conscrypt.**</pattern>
diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java
index edf279d912..776a2ec3e0 100644
--- a/ios/src/mindustry/ios/IOSLauncher.java
+++ b/ios/src/mindustry/ios/IOSLauncher.java
@@ -16,7 +16,6 @@ import mindustry.net.*;
 import mindustry.ui.*;
 import org.robovm.apple.coregraphics.*;
 import org.robovm.apple.foundation.*;
-import org.robovm.apple.glkit.*;
 import org.robovm.apple.uikit.*;
 import org.robovm.objc.block.*;
 
@@ -25,8 +24,10 @@ import java.util.*;
 import java.util.zip.*;
 
 import static mindustry.Vars.*;
-import static org.robovm.apple.foundation.NSPathUtilities.getDocumentsDirectory;
+import static org.robovm.apple.foundation.NSPathUtilities.*;
 
+//warnings for deprecated functions related to multi-window applications are not applicable here
+@SuppressWarnings("deprecation")
 public class IOSLauncher extends IOSApplication.Delegate{
     private boolean forced;
 
@@ -74,7 +75,6 @@ public class IOSLauncher extends IOSApplication.Delegate{
                 class ChooserDelegate extends NSObject implements UIDocumentBrowserViewControllerDelegate{
                     @Override
                     public void didPickDocumentURLs(UIDocumentBrowserViewController controller, NSArray<NSURL> documentURLs){
-
                     }
 
                     @Override
@@ -141,11 +141,12 @@ public class IOSLauncher extends IOSApplication.Delegate{
             public void shareFile(Fi file){
                 try{
                     Log.info("Attempting to share file " + file);
-                    Fi to = Core.files.absolute(getDocumentsDirectory()).child(file.name());
-                    file.copyTo(to);
+                    List<Object> list = new ArrayList<>();
 
-                    NSURL url = new NSURL(to.file());
-                    UIActivityViewController p = new UIActivityViewController(Collections.singletonList(url), null);
+                    //better choice?
+                    list.add(new NSURL(file.file()));
+
+                    UIActivityViewController p = new UIActivityViewController(list, null);
                     UIViewController rootVc = UIApplication.getSharedApplication().getKeyWindow().getRootViewController();
                     if(UIDevice.getCurrentDevice().getUserInterfaceIdiom() == UIUserInterfaceIdiom.Pad){
                         // Set up the pop-over for iPad
@@ -156,7 +157,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
                         pop.setSourceRect(targetRect);
                         pop.setPermittedArrowDirections(UIPopoverArrowDirection.None);
                     }
-                    rootVc.presentViewController(p, true, () -> Log.info("Success! Presented @", to));
+                    rootVc.presentViewController(p, true, () -> Log.info("Success! Presented @", file));
                 }catch(Throwable t){
                     ui.showException(t);
                 }
@@ -174,7 +175,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
                 UINavigationController.attemptRotationToDeviceOrientation();
             }
         }, new IOSApplicationConfiguration(){{
-            stencilFormat = GLKViewDrawableStencilFormat._8;
+            useGL30 = true;
         }});
     }
 
@@ -198,19 +199,15 @@ public class IOSLauncher extends IOSApplication.Delegate{
             openURL(((NSURL)options.get(UIApplicationLaunchOptions.Keys.URL())));
         }
 
-        Events.on(ClientLoadEvent.class, e -> {
-            Core.app.post(() -> Core.app.post(() -> {
-                Core.scene.table(Styles.black9, t -> {
-                    t.visible(() -> {
-                        if(!forced) return false;
-                        t.toFront();
-                        UIInterfaceOrientation o = UIApplication.getSharedApplication().getStatusBarOrientation();
-                        return forced && (o == UIInterfaceOrientation.Portrait || o == UIInterfaceOrientation.PortraitUpsideDown);
-                    });
-                    t.add("Rotate the device to landscape orientation to use the editor.").wrap().grow();
-                });
-            }));
-        });
+        Events.on(ClientLoadEvent.class, e -> Core.app.post(() -> Core.app.post(() -> Core.scene.table(Styles.black9, t -> {
+            t.visible(() -> {
+                if(!forced) return false;
+                t.toFront();
+                UIInterfaceOrientation o = UIApplication.getSharedApplication().getStatusBarOrientation();
+                return forced && (o == UIInterfaceOrientation.Portrait || o == UIInterfaceOrientation.PortraitUpsideDown);
+            });
+            t.add("Rotate the device to landscape orientation to use the editor.").wrap().grow();
+        }))));
 
         return b;
     }
@@ -223,9 +220,9 @@ public class IOSLauncher extends IOSApplication.Delegate{
 
             if(file.extension().equalsIgnoreCase(saveExtension)){ //open save
 
-                if(SaveIO.isSaveValid(file)){
-                    try{
-                        SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.DEFAULT_BUFFER_SIZE))));
+                try{
+                    if(SaveIO.isSaveValid(file)){
+                        SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.defaultBufferSize))));
                         if(meta.tags.containsKey("name")){
                             //is map
                             if(!ui.editor.isShown()){
@@ -237,13 +234,12 @@ public class IOSLauncher extends IOSApplication.Delegate{
                             SaveSlot slot = control.saves.importSave(file);
                             ui.load.runLoadSave(slot);
                         }
-                    }catch(IOException e){
-                        ui.showException("@save.import.fail", e);
+                    }else{
+                        ui.showErrorMessage("@save.import.invalid");
                     }
-                }else{
-                    ui.showErrorMessage("@save.import.invalid");
+                }catch(Throwable e){
+                    ui.showException("@save.import.fail", e);
                 }
-
             }
         }));
     }
@@ -254,7 +250,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
             UIApplication.main(argv, null, IOSLauncher.class);
         }catch(Throwable t){
             //attempt to log the exception
-            CrashSender.log(t);
+            CrashHandler.log(t);
             Log.err(t);
             //rethrow the exception so it actually crashes
             throw t;
diff --git a/jitpack.yml b/jitpack.yml
index c06db14182..ba04fbf8f9 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,4 +1,9 @@
+jdk:
+  - openjdk16
 before_install:
-  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
-  - source install-jdk.sh --feature 14
+  - wget https://github.com/sormuras/bach/raw/releases/11/install-jdk.sh
+  - source install-jdk.sh --feature 17
   - jshell --version
+install:
+  - ./gradlew publishToMavenLocal
+  - echo -n > gradle.properties #zero out gradle.properties
\ No newline at end of file
diff --git a/server/build.gradle b/server/build.gradle
index a62fb66121..f348e41dbf 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -8,7 +8,7 @@ ext.getServerFolder = {
 }
 
 task run(dependsOn: classes, type: JavaExec){
-    main = project.mainClassName
+    mainClass = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = project.assetsDir
@@ -22,7 +22,7 @@ task run(dependsOn: classes, type: JavaExec){
 }
 
 task debug(dependsOn: classes, type: JavaExec){
-    main = project.mainClassName
+    mainClass = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = project.assetsDir
@@ -39,9 +39,15 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
     exclude("music/**")
     exclude("sounds/**")
     exclude("fonts/**")
-    exclude("zones/**")
-    exclude("icons/**")
     exclude("bundles/**")
+    exclude("cubemaps/**")
+    exclude("cursors/**")
+    exclude("shaders/**")
+    exclude("icons/icon.icns")
+    exclude("icons/icon.ico")
+    exclude("icons/icon_64.png")
+
+    duplicatesStrategy = 'exclude'
 
     manifest{
         attributes 'Main-Class': project.mainClassName
diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java
index 553fd6af74..6716c1165b 100644
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -2,6 +2,7 @@ package mindustry.server;
 
 import arc.*;
 import arc.files.*;
+import arc.func.Cons;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.Timer;
@@ -35,30 +36,74 @@ import static arc.util.Log.*;
 import static mindustry.Vars.*;
 
 public class ServerControl implements ApplicationListener{
-    private static final int roundExtraTime = 12;
-    private static final int maxLogLength = 1024 * 512;
-
     protected static String[] tags = {"&lc&fb[D]&fr", "&lb&fb[I]&fr", "&ly&fb[W]&fr", "&lr&fb[E]", ""};
     protected static DateTimeFormatter dateTime = DateTimeFormatter.ofPattern("MM-dd-yyyy HH:mm:ss"),
         autosaveDate = DateTimeFormatter.ofPattern("MM-dd-yyyy_HH-mm-ss");
 
+    /** Global instance of ServerControl, initialized when the server is created. Should never be null on a dedicated server. */
+    public static ServerControl instance;
+
     public final CommandHandler handler = new CommandHandler("");
     public final Fi logFolder = Core.settings.getDataDirectory().child("logs/");
 
-    private Fi currentLogFile;
-    private boolean inExtraRound;
-    private Task lastTask;
-    private Gamemode lastMode;
-    private @Nullable Map nextMapOverride;
-    private Interval autosaveCount = new Interval();
+    private final Interval autosaveCount = new Interval();
 
+    public Runnable serverInput = () -> {
+        Scanner scan = new Scanner(System.in);
+        while(scan.hasNext()){
+            String line = scan.nextLine();
+            Core.app.post(() -> handleCommandString(line));
+        }
+    };
+
+    /** The file to which the logs are currently being written. */
+    public Fi currentLogFile;
+
+    /** Whether the server is currently waiting for the next map to be loaded. */
+    public boolean inGameOverWait;
+
+    /** The last gamemode loaded on this server. */
+    public Gamemode lastMode;
+
+    private Task lastTask;
     private Thread socketThread;
     private ServerSocket serverSocket;
     private PrintWriter socketOutput;
     private String suggested;
+    private boolean autoPaused = false;
+
+    public Cons<GameOverEvent> gameOverListener = event -> {
+        if(state.rules.waves){
+            info("Game over! Reached wave @ with @ players online on map @.", state.wave, Groups.player.size(), Strings.capitalize(state.map.plainName()));
+        }else{
+            info("Game over! Team @ is victorious with @ players online on map @.", event.winner.name, Groups.player.size(), Strings.capitalize(state.map.plainName()));
+        }
+
+        //set the next map to be played
+        Map map = maps.getNextMap(lastMode, state.map);
+        if(map != null){
+            Call.infoMessage((state.rules.pvp
+                    ? "[accent]The " + event.winner.coloredName() + " team is victorious![]\n" : "[scarlet]Game over![]\n")
+                    + "\nNext selected map: [accent]" + map.name() + "[white]"
+                    + (map.hasTag("author") ? " by[accent] " + map.author() + "[white]" : "") + "." +
+                    "\nNew game begins in " + Config.roundExtraTime.num() + " seconds.");
+
+            state.gameOver = true;
+            Call.updateGameOver(event.winner);
+
+            info("Selected next map to be @.", map.plainName());
+
+            play(() -> world.loadMap(map, map.applyRules(lastMode)));
+        }else{
+            netServer.kickAll(KickReason.gameover);
+            state.set(State.menu);
+            net.closeServer();
+        }
+    };
 
     public ServerControl(String[] args){
         setup(args);
+        instance = this;
     }
 
     protected void setup(String[] args){
@@ -66,7 +111,7 @@ public class ServerControl implements ApplicationListener{
             "bans", "",
             "admins", "",
             "shufflemode", "custom",
-            "globalrules", "{reactorExplosions: false}"
+            "globalrules", "{reactorExplosions: false, logicUnitBuild: false}"
         );
 
         //update log level
@@ -79,6 +124,9 @@ public class ServerControl implements ApplicationListener{
         }
 
         logger = (level1, text) -> {
+            //err has red text instead of reset.
+            if(level1 == LogLevel.err) text = text.replace(reset, lightRed + bold);
+
             String result = bold + lightBlack + "[" + dateTime.format(LocalDateTime.now()) + "] " + reset + format(tags[level1.ordinal()] + " " + text + "&fr");
             System.out.println(result);
 
@@ -100,7 +148,7 @@ public class ServerControl implements ApplicationListener{
             return useColors ? addColors(text) : removeColors(text);
         };
 
-        Time.setDeltaProvider(() -> Core.graphics.getDeltaTime() * 60f);
+        Time.setDeltaProvider(() -> Math.min(Core.graphics.getDeltaTime() * 60f, maxDeltaServer));
 
         registerCommands();
 
@@ -144,10 +192,6 @@ public class ServerControl implements ApplicationListener{
 
         customMapDirectory.mkdirs();
 
-        Thread thread = new Thread(this::readCommands, "Server Controls");
-        thread.setDaemon(true);
-        thread.start();
-
         if(Version.build == -1){
             warn("&lyYour server is running a custom build, which means that client checking is disabled.");
             warn("&lyIt is highly advised to specify which version you're using by building with gradle args &lb&fb-Pbuildversion=&lr<build>");
@@ -161,33 +205,8 @@ public class ServerControl implements ApplicationListener{
         }
 
         Events.on(GameOverEvent.class, event -> {
-            if(inExtraRound) return;
-            if(state.rules.waves){
-                info("Game over! Reached wave @ with @ players online on map @.", state.wave, Groups.player.size(), Strings.capitalize(state.map.name()));
-            }else{
-                info("Game over! Team @ is victorious with @ players online on map @.", event.winner.name, Groups.player.size(), Strings.capitalize(state.map.name()));
-            }
-
-            //set next map to be played
-            Map map = nextMapOverride != null ? nextMapOverride : maps.getNextMap(lastMode, state.map);
-            nextMapOverride = null;
-            if(map != null){
-                Call.infoMessage((state.rules.pvp
-                ? "[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)));
-            }else{
-                netServer.kickAll(KickReason.gameover);
-                state.set(State.menu);
-                net.closeServer();
+            if(!inGameOverWait && gameOverListener != null){
+                gameOverListener.get(event);
             }
         });
 
@@ -236,10 +255,9 @@ public class ServerControl implements ApplicationListener{
         });
 
         Events.on(PlayEvent.class, e -> {
-
             try{
-                JsonValue value = JsonIO.json().fromJson(null, Core.settings.getString("globalrules"));
-                JsonIO.json().readFields(state.rules, value);
+                JsonValue value = JsonIO.json.fromJson(null, Core.settings.getString("globalrules"));
+                JsonIO.json.readFields(state.rules, value);
             }catch(Throwable t){
                 err("Error applying custom rules, proceeding without them.", t);
             }
@@ -247,28 +265,83 @@ public class ServerControl implements ApplicationListener{
 
         //autosave settings once a minute
         float saveInterval = 60;
-        Timer.schedule(() -> Core.settings.forceSave(), saveInterval, saveInterval);
+        Timer.schedule(() -> {
+            netServer.admins.forceSave();
+            Core.settings.forceSave();
+        }, saveInterval, saveInterval);
 
-        if(!mods.list().isEmpty()){
-            info("@ mods loaded.", mods.list().size);
+        if(!mods.orderedMods().isEmpty()){
+            info("@ mods loaded.", mods.orderedMods().size);
+        }
+
+        int unsupported = mods.list().count(l -> !l.enabled());
+
+        if(unsupported > 0){
+            Log.err("There were errors loading @ mod(s):", unsupported);
+            for(LoadedMod mod : mods.list().select(l -> !l.enabled())){
+                Log.err("- @ &ly(" + mod.state + ")", mod.meta.name);
+            }
         }
 
         toggleSocket(Config.socketInput.bool());
 
-        info("Server loaded. Type @ for help.", "'help'");
+        Events.on(ServerLoadEvent.class, e -> {
+            if(serverInput != null){
+                Thread thread = new Thread(serverInput, "Server Controls");
+                thread.setDaemon(true);
+                thread.start();
+            }
+
+            info("Server loaded. Type @ for help.", "'help'");
+        });
+
+        Events.on(SaveLoadEvent.class, e -> {
+            Core.app.post(() -> {
+                if(Config.autoPause.bool() && Groups.player.size() == 0){
+                    state.set(State.paused);
+                    autoPaused = true;
+                }
+            });
+        });
+
+        Events.on(PlayerJoin.class, e -> {
+            if(state.isPaused() && autoPaused && Config.autoPause.bool()){
+                state.set(State.playing);
+                autoPaused = false;
+            }
+        });
+
+        Events.on(PlayerLeave.class, e -> {
+            // The player list length is compared with 1 and not 0 here,
+            // because when PlayerLeave gets fired, the player hasn't been removed from the player list yet
+            if(!state.isPaused() && Config.autoPause.bool() && Groups.player.size() == 1){
+                state.set(State.paused);
+                autoPaused = true;
+            }
+        });
     }
 
     protected void registerCommands(){
-        handler.register("help", "Displays this command list.", arg -> {
-            info("Commands:");
-            for(Command command : handler.getCommandList()){
-                info("  &b&lb " + command.text + (command.paramText.isEmpty() ? "" : " &lc&fi") + command.paramText + "&fr - &lw" + command.description);
+        handler.register("help", "[command]", "Display the command list, or get help for a specific command.", arg -> {
+            if(arg.length > 0){
+                Command command = handler.getCommandList().find(c -> c.text.equalsIgnoreCase(arg[0]));
+                if(command == null){
+                    err("Command " + arg[0] + " not found!");
+                }else{
+                    info(command.text + ":");
+                    info("  &b&lb " + command.text + (command.paramText.isEmpty() ? "" : " &lc&fi") + command.paramText + "&fr - &lw" + command.description);
+                }
+            }else{
+                info("Commands:");
+                for(Command command : handler.getCommandList()){
+                    info("  &b&lb " + command.text + (command.paramText.isEmpty() ? "" : " &lc&fi") + command.paramText + "&fr - &lw" + command.description);
+                }
             }
         });
 
         handler.register("version", "Displays server version info.", arg -> {
             info("Version: Mindustry @-@ @ / build @", Version.number, Version.modifier, Version.type, Version.build + (Version.revision == 0 ? "" : "." + Version.revision));
-            info("Java Version: @", System.getProperty("java.version"));
+            info("Java Version: @", OS.javaVersion);
         });
 
         handler.register("exit", "Exit the server application.", arg -> {
@@ -277,21 +350,20 @@ public class ServerControl implements ApplicationListener{
             Core.app.exit();
         });
 
-
         handler.register("stop", "Stop hosting the server.", arg -> {
             net.closeServer();
-            if(lastTask != null) lastTask.cancel();
+            cancelPlayTask();
             state.set(State.menu);
             info("Stopped server.");
         });
 
         handler.register("host", "[mapname] [mode]", "Open the server. Will default to survival and a random map if not specified.", arg -> {
-            if(state.is(State.playing)){
+            if(state.isGame()){
                 err("Already hosting. Type 'stop' to stop hosting first.");
                 return;
             }
 
-            if(lastTask != null) lastTask.cancel();
+            cancelPlayTask();
 
             Gamemode preset = Gamemode.survival;
 
@@ -306,7 +378,7 @@ public class ServerControl implements ApplicationListener{
 
             Map result;
             if(arg.length > 0){
-                result = maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0]));
+                result = maps.all().find(map -> map.plainName().replace('_', ' ').equalsIgnoreCase(Strings.stripColors(arg[0]).replace('_', ' ')));
 
                 if(result == null){
                     err("No map with name '@' found.", arg[0]);
@@ -314,7 +386,7 @@ public class ServerControl implements ApplicationListener{
                 }
             }else{
                 result = maps.getShuffleMode().next(preset, state.map);
-                info("Randomized next map to be @.", result.name());
+                info("Randomized next map to be @.", result.plainName());
             }
 
             info("Loading map...");
@@ -330,16 +402,39 @@ public class ServerControl implements ApplicationListener{
                 info("Map loaded.");
 
                 netServer.openServer();
+
+                if(Config.autoPause.bool()){
+                    state.set(State.paused);
+                    autoPaused = true;
+                }
             }catch(MapException e){
-                err(e.map.name() + ": " + e.getMessage());
+                err("@: @", e.map.plainName(), e.getMessage());
             }
         });
 
-        handler.register("maps", "Display all available maps.", arg -> {
+        handler.register("maps", "[all/custom/default]", "Display available maps. Displays only custom maps by default.", arg -> {
+            boolean custom = arg.length == 0 || arg[0].equals("custom") || arg[0].equals("all");
+            boolean def = arg.length > 0 && (arg[0].equals("default") || arg[0].equals("all"));
+
             if(!maps.all().isEmpty()){
-                info("Maps:");
-                for(Map map : maps.all()){
-                    info("  @: &fi@ / @x@", map.name(), map.custom ? "Custom" : "Default", map.width, map.height);
+                Seq<Map> all = new Seq<>();
+
+                if(custom) all.addAll(maps.customMaps());
+                if(def) all.addAll(maps.defaultMaps());
+
+                if(all.isEmpty()){
+                    info("No custom maps loaded. &fiTo display built-in maps, use the \"@\" argument.", "all");
+                }else{
+                    info("Maps:");
+
+                    for(Map map : all){
+                        String mapName = map.plainName().replace(' ', '_');
+                        if(map.custom){
+                            info("  @ (@): &fiCustom / @x@", mapName, map.file.name(), map.width, map.height);
+                        }else{
+                            info("  @: &fiDefault / @x@", mapName, map.width, map.height);
+                        }
+                    }
                 }
             }else{
                 info("No maps found.");
@@ -352,6 +447,8 @@ public class ServerControl implements ApplicationListener{
             maps.reload();
             if(maps.all().size > beforeMaps){
                 info("@ new map(s) found and reloaded.", maps.all().size - beforeMaps);
+            }else if(maps.all().size < beforeMaps){
+                info("@ old map(s) deleted.", beforeMaps - maps.all().size);
             }else{
                 info("Maps reloaded.");
             }
@@ -362,20 +459,19 @@ public class ServerControl implements ApplicationListener{
                 info("Status: &rserver closed");
             }else{
                 info("Status:");
-                info("  Playing on map &fi@ / Wave @", Strings.capitalize(state.map.name()), state.wave);
+                info("  Playing on map &fi@ / Wave @", Strings.capitalize(state.map.plainName()), state.wave);
 
                 if(state.rules.waves){
-                    info("  @ enemies.", state.enemies);
-                }else{
                     info("  @ seconds until next wave.", (int)(state.wavetime / 60));
                 }
+                info("  @ units / @ enemies", Groups.unit.size(), state.enemies);
 
                 info("  @ FPS, @ MB used.", Core.graphics.getFramesPerSecond(), Core.app.getJavaHeap() / 1024 / 1024);
 
                 if(Groups.player.size() > 0){
                     info("  Players: @", Groups.player.size());
                     for(Player p : Groups.player){
-                        info("    @ / @", p.name, p.uuid());
+                        info("    @ @ / @", p.admin() ? "&r[A]&c" : "&b[P]&c", p.plainName(), p.uuid());
                     }
                 }else{
                     info("  No players connected.");
@@ -387,7 +483,7 @@ public class ServerControl implements ApplicationListener{
             if(!mods.list().isEmpty()){
                 info("Mods:");
                 for(LoadedMod mod : mods.list()){
-                    info("  @ &fi@", mod.meta.displayName(), mod.meta.version);
+                    info("  @ &fi@ " + (mod.enabled() ? "" : " &lr(" + mod.state + ")"), mod.meta.displayName, mod.meta.version);
                 }
             }else{
                 info("No mods found.");
@@ -398,7 +494,7 @@ public class ServerControl implements ApplicationListener{
         handler.register("mod", "<name...>", "Display information about a loaded plugin.", arg -> {
             LoadedMod mod = mods.list().find(p -> p.meta.name.equalsIgnoreCase(arg[0]));
             if(mod != null){
-                info("Name: @", mod.meta.displayName());
+                info("Name: @", mod.meta.displayName);
                 info("Internal Name: @", mod.name);
                 info("Version: @", mod.meta.version);
                 info("Author: @", mod.meta.author);
@@ -414,7 +510,7 @@ public class ServerControl implements ApplicationListener{
         });
 
         handler.register("say", "<message...>", "Send a message to all players.", arg -> {
-            if(!state.is(State.playing)){
+            if(!state.isGame()){
                 err("Not hosting. Host a game first.");
                 return;
             }
@@ -424,16 +520,20 @@ public class ServerControl implements ApplicationListener{
             info("&fi&lcServer: &fr@", "&lw" + arg[0]);
         });
 
-
         handler.register("pause", "<on/off>", "Pause or unpause the game.", arg -> {
+            if(state.isMenu()){
+                err("Cannot pause without a game running.");
+                return;
+            }
             boolean pause = arg[0].equals("on");
-            state.serverPaused = pause;
+            autoPaused = false;
+            state.set(pause ? State.paused : State.playing);
             info(pause ? "Game paused." : "Game unpaused.");
         });
 
         handler.register("rules", "[remove/add] [name] [value...]", "List, remove or add global rules. These will apply regardless of map.", arg -> {
             String rules = Core.settings.getString("globalrules");
-            JsonValue base = JsonIO.json().fromJson(null, rules);
+            JsonValue base = JsonIO.json.fromJson(null, rules);
 
             if(arg.length == 0){
                 info("Rules:\n@", JsonIO.print(rules));
@@ -467,7 +567,7 @@ public class ServerControl implements ApplicationListener{
                         JsonValue parent = new JsonValue(ValueType.object);
                         parent.addChild(value);
 
-                        JsonIO.json().readField(state.rules, value.name, parent);
+                        JsonIO.json.readField(state.rules, value.name, parent);
                         if(base.has(value.name)){
                             base.remove(value.name);
                         }
@@ -484,7 +584,7 @@ public class ServerControl implements ApplicationListener{
         });
 
         handler.register("fillitems", "[team]", "Fill the core with items.", arg -> {
-            if(!state.is(State.playing)){
+            if(!state.isGame()){
                 err("Not playing. Host first.");
                 return;
             }
@@ -502,7 +602,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().storageCapacity);
             }
 
             info("Core filled.");
@@ -532,19 +632,22 @@ public class ServerControl implements ApplicationListener{
             if(arg.length == 0){
                 info("All config values:");
                 for(Config c : Config.all){
-                    info("&lk| @: @", c.name(), "&lc&fi" + c.get());
+                    info("&lk| @: @", c.name, "&lc&fi" + c.get());
                     info("&lk| | &lw" + c.description);
                     info("&lk|");
                 }
                 return;
             }
 
-            try{
-                Config c = Config.valueOf(arg[0]);
+            Config c = Config.all.find(conf -> conf.name.equalsIgnoreCase(arg[0]));
+
+            if(c != null){
                 if(arg.length == 1){
-                    info("'@' is currently @.", c.name(), c.get());
+                    info("'@' is currently @.", c.name, c.get());
                 }else{
-                    if(c.isBool()){
+                    if(arg[1].equals("default")){
+                        c.set(c.defaultValue);
+                    }else if(c.isBool()){
                         c.set(arg[1].equals("on") || arg[1].equals("true"));
                     }else if(c.isNum()){
                         try{
@@ -554,13 +657,13 @@ public class ServerControl implements ApplicationListener{
                             return;
                         }
                     }else if(c.isString()){
-                        c.set(arg[1]);
+                        c.set(arg[1].replace("\\n", "\n"));
                     }
 
-                    info("@ set to @.", c.name(), c.get());
+                    info("@ set to @.", c.name, c.get());
                     Core.settings.forceSave();
                 }
-            }catch(IllegalArgumentException e){
+            }else{
                 err("Unknown config: '@'. Run the command with no arguments to get a list of valid configs.", arg[0]);
             }
         });
@@ -591,43 +694,45 @@ public class ServerControl implements ApplicationListener{
                     netServer.admins.removeSubnetBan(arg[1]);
                     info("Unbanned @**", arg[1]);
                 }else{
-                    err("Incorrect usage. You must provide add/remove as the second argument.");
+                    err("Incorrect usage. Provide add/remove as the second argument.");
                 }
             }
         });
 
-        handler.register("whitelisted", "List the entire whitelist.", arg -> {
-            if(netServer.admins.getWhitelisted().isEmpty()){
-                info("No whitelisted players found.");
-                return;
-            }
+        handler.register("whitelist", "[add/remove] [ID]", "Add/remove players from the whitelist using their ID.", arg -> {
+            if(arg.length == 0){
+                Seq<PlayerInfo> whitelist = netServer.admins.getWhitelisted();
 
-            info("Whitelist:");
-            netServer.admins.getWhitelisted().each(p -> info("- @", p.lastName));
-        });
+                if(whitelist.isEmpty()){
+                    info("No whitelisted players found.");
+                }else{
+                    info("Whitelist:");
+                    whitelist.each(p -> info("- Name: @ / UUID: @", p.plainLastName(), p.id));
+                }
+            }else{
+                if(arg.length == 2){
+                    PlayerInfo info = netServer.admins.getInfoOptional(arg[1]);
 
-        handler.register("whitelist-add", "<ID>", "Add a player to the whitelist by ID.", arg -> {
-            PlayerInfo info = netServer.admins.getInfoOptional(arg[0]);
-            if(info == null){
-                err("Player ID not found. You must use the ID displayed when a player joins a server.");
-                return;
+                    if(info == null){
+                        err("Player ID not found. You must use the ID displayed when a player joins a server.");
+                    }else{
+                        if(arg[0].equals("add")){
+                            netServer.admins.whitelist(arg[1]);
+                            info("Player '@' has been whitelisted.", info.plainLastName());
+                        }else if(arg[0].equals("remove")){
+                            netServer.admins.unwhitelist(arg[1]);
+                            info("Player '@' has been un-whitelisted.", info.plainLastName());
+                        }else{
+                            err("Incorrect usage. Provide add/remove as the second argument.");
+                        }
+                    }
+                }else{
+                    err("Incorrect usage. Provide an ID to add or remove.");
+                }
             }
-
-            netServer.admins.whitelist(arg[0]);
-            info("Player '@' has been whitelisted.", info.lastName);
-        });
-
-        handler.register("whitelist-remove", "<ID>", "Remove a player to the whitelist by ID.", arg -> {
-            PlayerInfo info = netServer.admins.getInfoOptional(arg[0]);
-            if(info == null){
-                err("Player ID not found. You must use the ID displayed when a player joins a server.");
-                return;
-            }
-
-            netServer.admins.unwhitelist(arg[0]);
-            info("Player '@' has been un-whitelisted.", info.lastName);
         });
 
+        //TODO should be a config, not a separate command.
         handler.register("shuffle", "[none/all/custom/builtin]", "Set map shuffling mode.", arg -> {
             if(arg.length == 0){
                 info("Shuffle mode current set to '@'.", maps.getShuffleMode());
@@ -644,17 +749,17 @@ public class ServerControl implements ApplicationListener{
         });
 
         handler.register("nextmap", "<mapname...>", "Set the next map to be played after a game-over. Overrides shuffling.", arg -> {
-            Map res = maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0]));
+            Map res = maps.all().find(map -> map.plainName().replace('_', ' ').equalsIgnoreCase(Strings.stripColors(arg[0]).replace('_', ' ')));
             if(res != null){
-                nextMapOverride = res;
-                info("Next map set to '@'.", res.name());
+                maps.setNextMapOverride(res);
+                info("Next map set to '@'.", res.plainName());
             }else{
                 err("No map '@' found.", arg[0]);
             }
         });
 
         handler.register("kick", "<username...>", "Kick a person by name.", arg -> {
-            if(!state.is(State.playing)){
+            if(!state.isGame()){
                 err("Not hosting a game yet. Calm down.");
                 return;
             }
@@ -705,7 +810,7 @@ public class ServerControl implements ApplicationListener{
             }else{
                 info("Banned players [ID]:");
                 for(PlayerInfo info : bans){
-                    info(" @ / Last known name: '@'", info.id, info.lastName);
+                    info(" @ / Last known name: '@'", info.id, info.plainLastName());
                 }
             }
 
@@ -718,7 +823,7 @@ public class ServerControl implements ApplicationListener{
                 for(String string : ipbans){
                     PlayerInfo info = netServer.admins.findByIP(string);
                     if(info != null){
-                        info("  '@' / Last known name: '@' / ID: '@'", string, info.lastName, info.id);
+                        info("  '@' / Last known name: '@' / ID: '@'", string, info.plainLastName(), info.id);
                     }else{
                         info("  '@' (No known name or info)", string);
                     }
@@ -739,14 +844,15 @@ public class ServerControl implements ApplicationListener{
 
             if(info != null){
                 info.lastKicked = 0;
-                info("Pardoned player: @", info.lastName);
+                netServer.admins.kickedIPs.remove(info.lastIP);
+                info("Pardoned player: @", info.plainLastName());
             }else{
                 err("That ID can't be found.");
             }
         });
 
         handler.register("admin", "<add/remove> <username/ID...>", "Make an online user admin", arg -> {
-            if(!state.is(State.playing)){
+            if(!state.isGame()){
                 err("Open the server first.");
                 return;
             }
@@ -759,7 +865,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.plainName().equalsIgnoreCase(Strings.stripColors(arg[1])));
             if(playert != null){
                 target = playert.getInfo();
             }else{
@@ -769,12 +875,12 @@ public class ServerControl implements ApplicationListener{
 
             if(target != null){
                 if(add){
-                    netServer.admins.adminPlayer(target.id, target.adminUsid);
+                    netServer.admins.adminPlayer(target.id, playert == null ? target.adminUsid : playert.usid());
                 }else{
                     netServer.admins.unAdminPlayer(target.id);
                 }
                 if(playert != null) playert.admin = add;
-                info("Changed admin status of player: @", target.lastName);
+                info("Changed admin status of player: @", target.plainLastName());
             }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.");
             }
@@ -788,7 +894,7 @@ public class ServerControl implements ApplicationListener{
             }else{
                 info("Admins:");
                 for(PlayerInfo info : admins){
-                    info(" &lm @ /  ID: '@' / IP: '@'", info.lastName, info.id, info.lastIP);
+                    info(" &lm @ /  ID: '@' / IP: '@'", info.plainLastName(), info.id, info.lastIP);
                 }
             }
         });
@@ -799,14 +905,13 @@ public class ServerControl implements ApplicationListener{
             }else{
                 info("Players: @", Groups.player.size());
                 for(Player user : Groups.player){
-                    PlayerInfo userInfo = user.getInfo();
-                    info(" &lm @ /  ID: @ / IP: @ / Admin: @", userInfo.lastName, userInfo.id, userInfo.lastIP, userInfo.admin);
+                    info(" @&lm @ / ID: @ / IP: @", user.admin ? "&r[A]&c" : "&b[P]&c", user.plainName(), user.uuid(), user.ip());
                 }
             }
         });
 
         handler.register("runwave", "Trigger the next wave.", arg -> {
-            if(!state.is(State.playing)){
+            if(!state.isGame()){
                 err("Not hosting. Host a game first.");
             }else{
                 logic.runWave();
@@ -814,8 +919,39 @@ public class ServerControl implements ApplicationListener{
             }
         });
 
+        handler.register("loadautosave", "Loads the last auto-save.", arg -> {
+            if(state.isGame()){
+                err("Already hosting. Type 'stop' to stop hosting first.");
+                return;
+            }
+
+            Fi newestSave = saveDirectory.findAll(f -> f.name().startsWith("auto_")).min(Fi::lastModified);
+
+            if(newestSave == null){
+                err("No auto-saves found! Type `config autosave true` to enable auto-saves.");
+                return;
+            }
+
+            if(!SaveIO.isSaveValid(newestSave)){
+                err("No (valid) save data found for slot.");
+                return;
+            }
+
+            Core.app.post(() -> {
+                try{
+                    SaveIO.load(newestSave);
+                    state.rules.sector = null;
+                    info("Save loaded.");
+                    state.set(State.playing);
+                    netServer.openServer();
+                }catch(Throwable t){
+                    err("Failed to load save. Outdated or corrupt file.");
+                }
+            });
+        });
+
         handler.register("load", "<slot>", "Load a save from a slot.", arg -> {
-            if(state.is(State.playing)){
+            if(state.isGame()){
                 err("Already hosting. Type 'stop' to stop hosting first.");
                 return;
             }
@@ -841,7 +977,7 @@ public class ServerControl implements ApplicationListener{
         });
 
         handler.register("save", "<slot>", "Save game state to a slot.", arg -> {
-            if(!state.is(State.playing)){
+            if(!state.isGame()){
                 err("Not hosting. Host a game first.");
                 return;
             }
@@ -870,8 +1006,8 @@ public class ServerControl implements ApplicationListener{
             }
 
             info("Core destroyed.");
-            inExtraRound = false;
-            Events.fire(new GameOverEvent(Team.crux));
+            inGameOverWait = false;
+            Events.fire(new GameOverEvent(state.rules.waveTeam));
         });
 
         handler.register("info", "<IP/UUID/name...>", "Find player info(s). Can optionally check for all names or IPs a player has had.", arg -> {
@@ -882,7 +1018,7 @@ public class ServerControl implements ApplicationListener{
 
                 int i = 0;
                 for(PlayerInfo info : infos){
-                    info("[@] Trace info for player '@' / UUID @", i++, info.lastName, info.id);
+                    info("[@] Trace info for player '@' / UUID @ / RAW @", i++, info.plainLastName(), info.id, info.lastName);
                     info("  all names used: @", info.names);
                     info("  IP: @", info.lastIP);
                     info("  all IPs used: @", info.ips);
@@ -902,7 +1038,7 @@ public class ServerControl implements ApplicationListener{
 
                 int i = 0;
                 for(PlayerInfo info : infos){
-                    info("- [@] '@' / @", i++, info.lastName, info.id);
+                    info("- [@] '@' / @", i++, info.plainLastName(), info.id);
                 }
             }else{
                 info("Nobody with that name could be found.");
@@ -927,15 +1063,7 @@ public class ServerControl implements ApplicationListener{
         mods.eachClass(p -> p.registerServerCommands(handler));
     }
 
-    private void readCommands(){
-        Scanner scan = new Scanner(System.in);
-        while(scan.hasNext()){
-            String line = scan.nextLine();
-            Core.app.post(() -> handleCommandString(line));
-        }
-    }
-
-    private void handleCommandString(String line){
+    public void handleCommandString(String line){
         CommandResponse response = handler.handleMessage(line);
 
         if(response.type == ResponseType.unknownCommand){
@@ -966,43 +1094,66 @@ public class ServerControl implements ApplicationListener{
         }
     }
 
-    private void play(boolean wait, Runnable run){
-        inExtraRound = true;
-        Runnable r = () -> {
-            WorldReloader reloader = new WorldReloader();
+    /**
+     * @deprecated
+     * Use {@link Maps#setNextMapOverride(Map)} instead.
+     */
+    @Deprecated
+    public void setNextMap(Map map){
+        maps.setNextMapOverride(map);
+    }
 
-            reloader.begin();
+    /**
+     * Cancels the world load timer task, if it is scheduled. Can be useful for stopping a server or hosting a new game.
+     */
+    public void cancelPlayTask(){
+        if(lastTask != null) lastTask.cancel();
+    }
 
-            run.run();
+    /**
+     * Resets the world state, starts a new game.
+     * @param run What task to run to load a new world.
+     */
+    public void play(Runnable run){
+        play(true, run);
+    }
 
-            state.rules = state.map.applyRules(lastMode);
-            logic.play();
+    /**
+     * Resets the world state, starts a new game.
+     * @param wait Whether to wait for {@link Config#roundExtraTime} seconds before starting a new game.
+     * @param run What task to run to load a new world.
+     */
+    public void play(boolean wait, Runnable run){
+        inGameOverWait = true;
+        cancelPlayTask();
+        
+        Runnable reload = () -> {
+            try{
+                WorldReloader reloader = new WorldReloader();
+                reloader.begin();
 
-            reloader.end();
-            inExtraRound = false;
+                run.run();
+
+                state.rules = state.map.applyRules(lastMode);
+                logic.play();
+
+                reloader.end();
+                inGameOverWait = false;
+            }catch(MapException e){
+                err("@: @", e.map.plainName(), e.getMessage());
+                net.closeServer();
+            }
         };
 
         if(wait){
-            lastTask = new Task(){
-                @Override
-                public void run(){
-                    try{
-                        r.run();
-                    }catch(MapException e){
-                        err(e.map.name() + ": " + e.getMessage());
-                        net.closeServer();
-                    }
-                }
-            };
-
-            Timer.schedule(lastTask, roundExtraTime);
+            lastTask = Timer.schedule(reload, Config.roundExtraTime.num());
         }else{
-            r.run();
+            reload.run();
         }
     }
 
-    private void logToFile(String text){
-        if(currentLogFile != null && currentLogFile.length() > maxLogLength){
+    public void logToFile(String text){
+        if(currentLogFile != null && currentLogFile.length() > Config.maxLogLength.num()){
             currentLogFile.writeString("[End of log file. Date: " + dateTime.format(LocalDateTime.now()) + "]\n", true);
             currentLogFile = null;
         }
@@ -1013,7 +1164,7 @@ public class ServerControl implements ApplicationListener{
 
         if(currentLogFile == null){
             int i = 0;
-            while(logFolder.child("log-" + i + ".txt").length() >= maxLogLength){
+            while(logFolder.child("log-" + i + ".txt").length() >= Config.maxLogLength.num()){
                 i++;
             }
 
@@ -1023,7 +1174,7 @@ public class ServerControl implements ApplicationListener{
         currentLogFile.writeString(text + "\n", true);
     }
 
-    private void toggleSocket(boolean on){
+    public void toggleSocket(boolean on){
         if(on && socketThread == null){
             socketThread = new Thread(() -> {
                 try{
@@ -1045,7 +1196,7 @@ public class ServerControl implements ApplicationListener{
                 }catch(BindException b){
                     err("Command input socket already in use. Is another instance of the server running?");
                 }catch(IOException e){
-                    if(!e.getMessage().equals("Socket closed")){
+                    if(!e.getMessage().equals("Socket closed") && !e.getMessage().equals("Connection reset")){
                         err("Terminating socket server.");
                         err(e);
                     }
diff --git a/server/src/mindustry/server/ServerLauncher.java b/server/src/mindustry/server/ServerLauncher.java
index 8c20047022..d8737fc5e1 100644
--- a/server/src/mindustry/server/ServerLauncher.java
+++ b/server/src/mindustry/server/ServerLauncher.java
@@ -2,7 +2,6 @@ package mindustry.server;
 
 import arc.*;
 import arc.backend.headless.*;
-import arc.files.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.core.*;
@@ -12,6 +11,7 @@ import mindustry.mod.*;
 import mindustry.mod.Mods.*;
 import mindustry.net.Net;
 import mindustry.net.*;
+import mindustry.ui.*;
 
 import java.time.*;
 
@@ -32,9 +32,9 @@ public class ServerLauncher implements ApplicationListener{
                 String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level1.ordinal()] + " " + text + "&fr");
                 System.out.println(result);
             };
-            new HeadlessApplication(new ServerLauncher(), throwable -> CrashSender.send(throwable, f -> {}));
+            new HeadlessApplication(new ServerLauncher(), throwable -> CrashHandler.handle(throwable, f -> {}));
         }catch(Throwable t){
-            CrashSender.send(t, f -> {});
+            CrashHandler.handle(t, f -> {});
         }
     }
 
@@ -44,21 +44,17 @@ public class ServerLauncher implements ApplicationListener{
         loadLocales = false;
         headless = true;
 
-        Fi plugins = Core.settings.getDataDirectory().child("plugins");
-        if(plugins.isDirectory() && plugins.list().length > 0 && !plugins.sibling("mods").exists()){
-            warn("[IMPORTANT NOTICE] &lrPlugins have been detected.&ly Automatically moving all contents of the plugin folder into the 'mods' folder. The original folder will not be removed; please do so manually.");
-            plugins.sibling("mods").mkdirs();
-            for(Fi file : plugins.list()){
-                file.copyTo(plugins.sibling("mods"));
-            }
-        }
-
         Vars.loadSettings();
         Vars.init();
+
+        UI.loadColors();
+        Fonts.loadContentIconsHeadless();
+
         content.createBaseContent();
         mods.loadScripts();
         content.createModContent();
         content.init();
+
         if(mods.hasContentErrors()){
             err("Error occurred loading mod content:");
             for(LoadedMod mod : mods.list()){
diff --git a/servers.json b/servers.json
deleted file mode 100644
index 2aaea0169a..0000000000
--- a/servers.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "address": "mindustry.indielm.com:1101"
-  },
-  {
-    "address": "mindustry.indielm.com"
-  },
-  {
-    "address": "mindustry.nydus.app:1337"
-  },
-  {
-    "address": "mindustry.ru"
-  },
-  {
-    "address": "mindustry.ru:7000"
-  },
-  {
-    "address": "Mindustry.pl"
-  },
-  {
-    "address": "aamindustry.play.ai"
-  },
-  {
-    "address": "aamindustry.play.ai:6568"
-  },
-  {
-    "address": "aamindustry.play.ai:6569"
-  },
-  {
-    "address": "aamindustry.play.ai:6570"
-  },
-  {
-    "address": "mindustry.atannergaming.com"
-  },
-  {
-    "address": "mindustry.atannergaming.com:7000"
-  },
-  {
-    "address": "mindustry.atannergaming.com:8000"
-  },
-  {
-    "address": "mindustry.atannergaming.com:6800"
-  },
-  {
-    "address": "mindustry.kbni.net.au:6567"
-  },
-  {
-    "address": "mindustry.kbni.net.au:6568"
-  },
-  {
-    "address": "twsmindustry.24x7.hk"
-  },
-  {
-    "address": "twsmindustry.24x7.hk:6568"
-  },
-  {
-    "address": "mindustryranked.ddns.net"
-  },
-  {
-    "address": "attack.pearkin.net"
-  }
-]
diff --git a/servers_be.json b/servers_be.json
deleted file mode 100644
index a363d94b30..0000000000
--- a/servers_be.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "address": "mindustry.us.to"
-  },
-  {
-    "address": "nydustry.nydus.app:6060"
-  },
-  {
-    "address": "routerchain.ddns.net:6568"
-  },
-  {
-    "address": "mindustry.pl:6660"
-  }
-]
diff --git a/servers_v6.json b/servers_v6.json
index ff486ea497..fb5ce3c870 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -1,62 +1,22 @@
 [
-  {
-    "name": "mindustry.pl",
-    "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"]
-  },
   {
     "name": "{AA}",
-    "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"]
-  },
-   {
-    "name": "Atanner",
-    "address": ["atannergaming.com:13000"]
-  },
-  {
-    "name": "C.A.M.S.",
-    "address": ["routerchain.ddns.net", "pandorum.su:8000"]
-  },
-  {
-	"name": "io",
-	"address": ["mindustry.io", "mindustry.io:1000", "mindustry.io:2000", "mindustry.io:3000", "mindustry.io:4000"]
-  },
-  {
-    "name": "ECAN",
-    "address": ["mindustry.ecansol.com:6597", "mindustry.ecansol.com:6499", "mindustry.ecansol.com:6599"]
-  },
-  {
-    "name": "Chaotic Neutral",
-    "address": ["Chaotic-Neutral.ddns.net:1111", "Chaotic-Neutral.ddns.net:5555", "Chaotic-Neutral.ddns.net:6666", "Chaotic-Neutral.ddns.net:7777"]
+    "address": ["recessive.net"]
   },
   {
     "name": "Ranked",
-    "address": ["mindustryranked.ddns.net:16567"]
+    "address": ["mindustryranked.ddns.net:16567", "mindustryranked.ddns.net:16568", "mindustryranked.ddns.net:16569"]
   },
   {
     "name": "TWS",
-    "address": ["twsmindustry.24x7.hk:6701", "twsmindustry.24x7.hk:6702"]
-  },
-  {
-    "address": "cheginde.ddns.net"
-    
+    "address": ["twsmindustry.24x7.hk:6701", "twsmindustry.24x7.hk:6702", "twsmindustry.24x7.hk:6969"]
   },
   {
     "name": "mindustry.ddns.net",
-    "address": ["mindustry.ddns.net:1000", "mindustry.ddns.net:2000", "mindustry.ddns.net:3000", "mindustry.ddns.net:4000"]
+    "address": ["mindustry.ddns.net:2500"]
   },
   {
-    "name": "Gearblock",
-    "address": ["attack.gearblock.app"]
-  },
-  {
-    "name": "Surrealment",
-    "address": ["md.surrealment.com"]
-  },
-  {
-    "name": "ALEX",
-    "address": ["alexmindustryhub.ddns.net:6568", "alexmindustry.ddns.net:6568", "alexmindustry.ddns.net:6569", "alexmindustryattac.ddns.net:25800"]
-  },
-  {
-    "name": "Minty [subzero]",
-    "address": ["minty-server.ddns.net"]
+    "name": "Surrealment v6",
+    "address": ["md.surrealment.com:6566"]
   }
 ]
diff --git a/servers_v7.json b/servers_v7.json
new file mode 100644
index 0000000000..1030deab7d
--- /dev/null
+++ b/servers_v7.json
@@ -0,0 +1,342 @@
+[
+  {
+    "name": "EscoCorp",
+    "address": [
+      "121.127.37.17:6567",
+      "121.127.37.17:6568",
+      "121.127.37.17:6569",
+      "121.127.37.17:6570",
+      "121.127.37.17:6571",
+      "121.127.37.17:6572",
+      "194.164.245.218:6567",
+      "194.164.245.218:6568",
+      "194.164.245.218:6569",
+      "194.164.245.218:6570",
+      "194.164.245.218:6571",
+      "194.164.245.218:6572",
+      "194.164.245.218:6573",
+      "194.164.245.218:6574",
+      "194.164.245.218:6575",
+      "194.164.245.218:6576"
+    ]
+  },
+  {
+    "name": "EchoDustry",
+    "address": [
+      "node1.stellarch.org:7004"
+    ]
+  },
+  {
+    "name": "gods field",
+    "address": [
+      "n2.akiracloud.net:10225",
+      "n2.akiracloud.net:10335"
+    ]
+  },
+  {
+    "name": "DontVin",
+    "address": [
+      "be.phoenix-network.dev:4444"
+    ]
+  },
+  {
+    "name": "thedimas",
+    "address": [
+      "130.162.212.232",
+      "130.162.212.232:6503",
+      "130.162.212.232:6505",
+      "130.162.212.232:6507",
+      "130.162.212.232:6508",
+      "130.162.212.232:6509",
+      "130.162.212.232:6510",
+      "130.162.212.232:6511",
+      "130.162.212.232:6513"
+    ]
+  },
+  {
+    "name": "KMWStudios",
+    "address": [
+      "kislota.kmwstudios.org:28102",
+      "kislota.kmwstudios.org:28103",
+      "kislota.kmwstudios.org:28104",
+      "kislota.kmwstudios.org:28105",
+      "kislota.kmwstudios.org:28106",
+      "kislota.kmwstudios.org:28107"
+    ]
+  },
+  {
+    "name": "XCore",
+    "address": [
+      "128.140.88.66",
+      "128.140.88.66:6568",
+      "128.140.88.66:6569",
+      "128.140.88.66:6570",
+      "128.140.88.66:6571",
+      "128.140.88.66:6572",
+      "128.140.88.66:6573",
+      "128.140.88.66:6574",
+      "128.140.88.66:6575"
+    ]
+  },
+  {
+    "name": "MinDurka",
+    "address": [
+      "mindurka.fun",
+      "mindurka.fun:3001",
+      "mindurka.fun:3002",
+      "mindurka.fun:3003",
+      "mindurka.fun:3004",
+      "mindurka.fun:3005",
+      "mindurka.fun:3006",
+      "mindurka.fun:3007",
+      "mindurka.fun:3008",
+      "mindurka.fun:3009",
+      "mindurka.fun:3010",
+      "mindurka.fun:3011"
+    ]
+  },
+  {
+    "name": "Chaotic Neutral",
+    "address": [
+      "37.187.73.180:7011",
+      "37.187.73.180:7013",
+      "37.187.73.180:7014",
+      "37.187.73.180:7015",
+      "37.187.73.180:7016",
+      "37.187.73.180:7017"
+    ]
+  },
+  {
+    "name": "io",
+    "address": [
+      "148.251.184.58",
+      "148.251.184.58:1000",
+      "148.251.184.58:2000",
+      "148.251.184.58:3000",
+      "148.251.184.58:4000"
+    ]
+  },
+  {
+    "name": "Tinylake",
+    "address": [
+      "cn.mindustry.top"
+    ]
+  },
+  {
+    "name": "Fish",
+    "address": [
+      "162.248.101.95",
+      "162.248.100.98",
+      "162.248.100.133",
+      "162.248.101.53",
+      "162.248.102.101"
+    ]
+  },
+  {
+    "name": "OmniCorp Classic",
+    "address": ["omnidustry.ru:6567", "omnidustry.ru:6568", "omnidustry.ru:6569", "omnidustry.ru:6570", "omnidustry.ru:6571", "omnidustry.ru:6572", "omnidustry.ru:6573", "omnidustry.ru:6574", "omnidustry.ru:6575"]
+  },
+  {
+    "name": "The Devil",
+    "address": [
+      "new.xem8k5.top"
+    ]
+  },
+  {
+    "name": "Eradication Mindustry",
+    "address": [
+      "130.61.22.183:7000",
+      "130.61.22.183:7001",
+      "144.24.196.119:7000",
+      "144.24.196.119:7001",
+      "140.238.246.78:7000",
+      "140.238.246.78:7001",
+      "62.30.47.116:7000",
+      "62.30.47.116:7001",
+      "122.180.249.217:7000",
+      "122.180.249.217:7001",
+      "20.186.12.170:7000",
+      "20.2.202.238:7000"
+    ]
+  },
+  {
+    "name": "Conservatory",
+    "address": [
+      "165.232.137.170:6567",
+      "165.232.137.170:6568"
+    ]
+  },
+  {
+    "name": "mindustry.ddns.net",
+    "address": [
+      "mindustry.ddns.net",
+      "mindustry.ddns.net:1000",
+      "mindustry.ddns.net:2000",
+      "mindustry.ddns.net:3000",
+      "mindustry.ddns.net:4000",
+      "mindustry.ddns.net:5000"
+    ]
+  },
+  {
+    "name": "Sectorized",
+    "address": [
+      "sectorized.freeddns.org"
+    ]
+  },
+  {
+    "name": "Apricot Alliance",
+    "address": [
+      "apricotalliance.org"
+    ]
+  },
+  {
+    "name": "Sakura",
+    "address": [
+      "162.43.36.78:22527",
+      "162.43.36.78:24527",
+      "162.43.36.78:25527",
+      "162.43.36.78:27527",
+      "162.43.36.78:28527"
+    ]
+  },
+  {
+    "name": "Router Pi",
+    "address": [
+      "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6569",
+      "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6570"
+    ]
+  },
+  {
+    "name": "Anana",
+    "address": [
+      "mdt.mdtleague.top"
+    ]
+  },
+  {
+    "name": "Exploding Cowards",
+    "address": [
+      "45.43.163.225:25538"
+    ]
+  },
+  {
+    "name": "Realm of Serene Lime",
+    "address": [
+      "mindustry.icu",
+      "sx.mindustry.icu",
+      "9k38.igla.pics",
+      "frp-oak.com:26979"
+    ]
+  },
+  {
+    "name": "Cyandustry",
+    "address": [
+      "45.88.109.9:7000",
+      "45.88.109.9:7001",
+      "45.88.109.9:7003",
+      "45.88.109.9:7004",
+      "45.88.109.9:7006",
+      "45.88.109.9:7008"
+    ]
+  },
+  {
+    "name": "MeowIsland",
+    "address": [
+      "meowisland.ru:5000",
+      "meowisland.ru:5001",
+      "meowisland.ru:5003",
+      "meowisland.ru:5004"
+    ]
+  },
+  {
+    "name": "Exdustry",
+    "address": [
+      "play.exdustry.xyz:6001",
+      "play.exdustry.xyz:6002",
+      "play.exdustry.xyz:6003",
+      "play.exdustry.xyz:6004",
+      "play.exdustry.xyz:6005",
+      "play.exdustry.xyz:6006"
+    ]
+  },
+  {
+    "name": "CroCraft Network",
+    "address": [
+      "193.122.53.98:6567"
+    ]
+  },
+  {
+    "name": "Alex Multiverse",
+    "address": [
+      "alexmindustryv7.servegame.com:25588",
+      "172.234.80.96:6768",
+      "139.162.41.78:6767",
+      "172.245.187.143:6868",
+      "172.245.187.143:6869",
+      "92.119.127.171:6888",
+      "23.95.107.12"
+    ]
+  },
+  {
+    "name": "XuwenHost",
+    "address": [
+      "mdt.nekopark.cloud:6567"
+    ]
+  },
+  {
+    "name": "Erepulo",
+    "address": [
+      "95.84.198.97:5401",
+      "95.84.198.97:5402",
+      "95.84.198.97:5403",
+      "frost-heaven.ru",
+      "frost-heaven.ru:6568",
+      "91.200.150.116"
+    ]
+  },
+  {
+    "name": "FrostHeaven",
+    "address": [
+      "194.164.245.218:6567",
+      "194.164.245.218:6568",
+      "194.164.245.218:6569",
+      "194.164.245.218:6570",
+      "194.164.245.218:6571",
+      "194.164.245.218:6597",
+      "194.164.245.218:6598",
+      "194.164.245.218:6599",
+      "194.164.245.218:6600",
+      "194.164.245.218:6601"
+    ]
+  },
+  {
+    "name": "ArmyOFUkraine",
+    "address": [
+      "194.247.42.131:27715",
+      "194.247.42.131:27512",
+      "194.247.42.130:27505"
+    ]
+  },
+  {
+    "name": "VNM",
+    "address": [
+      "server.mindustry-tool.com",
+      "server.mindustry-tool.com:6568"
+    ]
+  },
+  {
+    "name": "Korea",
+    "address": [
+      "mindustry.kr"
+    ]
+  },
+  {
+    "name": "Extra Utilities",
+    "address": [
+      "yuyu.mindustry.ink",
+      "cn.mindustry.ink",
+      "203.135.99.51:15142",
+      "203.135.99.51:15143",
+      "183.131.51.178"
+    ]
+  }
+]
diff --git a/settings.gradle b/settings.gradle
index 52b0980311..b18346f652 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,16 +1,9 @@
-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"]}")
+if(JavaVersion.current().ordinal() < JavaVersion.VERSION_17.ordinal()){
+    throw new Exception("!!! YOU MUST USE JAVA 17 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 ->
-    for(String name : names){
-        include(name)
-        project(name).projectDir = new File(settingsDir, "../${name.substring(1).replace(":", "/")}")
-    }
-}
-
 def hasSdk = System.getenv("ANDROID_HOME") != null
 
 if(new File(settingsDir, 'local.properties').exists()){
@@ -22,42 +15,21 @@ if(new File(settingsDir, 'local.properties').exists()){
 if(System.getenv("JITPACK") == "true") hasSdk = false
 
 if(hasSdk){
-	include 'android'
+    include 'android'
 }else{
     println("No Android SDK found. Skipping Android module.")
 }
 
-if(!hasProperty("release")){
-    if(new File(settingsDir, '../Arc').exists()){
-        use(
-        ':Arc',
-        ':Arc:arc-core',
-        ':Arc:extensions',
-        ':Arc:extensions:freetype',
-        ':Arc:extensions:recorder',
-        ':Arc:extensions:arcnet',
-        ':Arc:extensions:packer',
-        ':Arc:extensions:g3d',
-        ':Arc:extensions:fx',
-        ':Arc:natives',
-        ':Arc:natives:natives-desktop',
-        ':Arc:natives:natives-android',
-        ':Arc:natives:natives-ios',
-        ':Arc:natives:natives-freetype-desktop',
-        ':Arc:natives:natives-freetype-android',
-        ':Arc:natives:natives-freetype-ios',
-        ':Arc:backends',
-        ':Arc:backends:backend-sdl',
-        ':Arc:backends:backend-android',
-        ':Arc:backends:backend-robovm',
-        ':Arc:backends:backend-headless'
-        )
+if(!hasProperty("release") && !hasProperty("noLocalArc")){
+    if(new File(rootDir.parent, 'Arc').exists()){
+        println("Compiling with localArc")
+        includeBuild("../Arc")
     }
 
-    if(new File(settingsDir, '../Mindustry-Debug').exists()){
+    if(new File(rootDir.parent, 'Mindustry-Debug').exists()){
         include(":debug")
-        project(":debug").projectDir = new File(settingsDir, "../Mindustry-Debug")
+        project(":debug").projectDir = new File(rootDir.parent, "Mindustry-Debug")
     }
 }else{
     println("Not including local repositories.")
-}
+}
\ No newline at end of file
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index a142826e26..4f6c608d19 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -1,10 +1,12 @@
 import arc.*;
 import arc.backend.headless.*;
-import arc.func.*;
-import arc.math.*;
+import arc.files.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
+import arc.util.io.*;
+import arc.util.serialization.*;
+import arc.util.serialization.JsonValue.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.core.*;
@@ -14,21 +16,40 @@ import mindustry.entities.units.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.io.*;
+import mindustry.io.SaveIO.*;
 import mindustry.maps.*;
-import mindustry.net.Net;
+import mindustry.mod.*;
+import mindustry.mod.Mods.*;
+import mindustry.net.*;
+import mindustry.net.Packets.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.payloads.*;
+import mindustry.world.blocks.storage.*;
+import org.json.*;
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.params.*;
+import org.junit.jupiter.params.provider.*;
+
+import java.io.*;
+import java.nio.*;
 
 import static mindustry.Vars.*;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.DynamicTest.*;
 
 public class ApplicationTests{
     static Map testMap;
     static boolean initialized;
+    //core/assets
+    static final Fi testDataFolder = new Fi("../../tests/build/test_data");
 
     @BeforeAll
-    static void launchApplication(){
+    public static void launchApplication(){
+        launchApplication(true);
+    }
+
+    public static void launchApplication(boolean clear){
         //only gets called once
         if(initialized) return;
         initialized = true;
@@ -41,6 +62,12 @@ public class ApplicationTests{
             ApplicationCore core = new ApplicationCore(){
                 @Override
                 public void setup(){
+                    //clear older data
+                    if(clear){
+                        ApplicationTests.testDataFolder.deleteDirectory();
+                    }
+
+                    Core.settings.setDataDirectory(testDataFolder);
                     headless = true;
                     net = new Net(null);
                     tree = new FileTree();
@@ -53,12 +80,26 @@ public class ApplicationTests{
                         }
                     };
                     content.createBaseContent();
+                    mods.loadScripts();
+                    content.createModContent();
 
                     add(logic = new Logic());
                     add(netServer = new NetServer());
 
                     content.init();
 
+                    mods.eachClass(Mod::init);
+
+                    if(mods.hasContentErrors()){
+                        for(LoadedMod mod : mods.list()){
+                            if(mod.hasContentErrors()){
+                                for(Content cont : mod.erroredContent){
+                                    throw new RuntimeException("error in file: " + cont.minfo.sourceFile.path(), cont.minfo.baseError);
+                                }
+                            }
+                        }
+                    }
+
                 }
 
                 @Override
@@ -79,7 +120,6 @@ public class ApplicationTests{
                 Thread.sleep(10);
             }
 
-
             Block block = content.getByName(ContentType.block, "build2");
             assertEquals("build2", block == null ? null : block.name, "2x2 construct block doesn't exist?");
         }catch(Throwable r){
@@ -94,6 +134,114 @@ public class ApplicationTests{
         state.set(State.menu);
     }
 
+    @ParameterizedTest
+    @NullSource
+    @ValueSource(strings = {
+    "a",
+    "asd asd asd asd asdagagasasjakbgeah;jwrej 23424234",
+    "这个�务器�以用自己的语言说�",
+    "\uD83D\uDEA3"
+    })
+    void writeStringTest(String string){
+        ByteBuffer buffer = ByteBuffer.allocate(500);
+        TypeIO.writeString(buffer, string);
+        buffer.position(0);
+        assertEquals(TypeIO.readString(buffer), string);
+
+        ByteArrayOutputStream ba = new ByteArrayOutputStream();
+
+        TypeIO.writeString(new Writes(new DataOutputStream(ba)), string);
+        assertEquals(TypeIO.readString(new Reads(new DataInputStream(new ByteArrayInputStream(ba.toByteArray())))), string);
+
+        SendChatMessageCallPacket pack = new SendChatMessageCallPacket();
+        pack.message = string;
+
+        buffer.position(0);
+        pack.write(new Writes(new ByteBufferOutput(buffer)));
+        int len = buffer.position();
+        buffer.position(0);
+        pack.message = "INVALID";
+        pack.read(new Reads(new ByteBufferInput(buffer)), len);
+        pack.handled();
+
+        assertEquals(string, pack.message);
+
+        buffer.position(0);
+        Writes writes = new Writes(new ByteBufferOutput(buffer));
+        TypeIO.writeString(writes, string);
+
+        buffer.position(0);
+
+        assertEquals(string, TypeIO.readString(new Reads(new ByteBufferInput(buffer))));
+
+        buffer.position(0);
+        ConnectPacket con = new ConnectPacket();
+        con.name = string;
+        con.uuid = "AAAAAAAA";
+        con.usid = "AAAAAAAA";
+        con.mods = new Seq<>();
+        con.write(new Writes(new ByteBufferOutput(buffer)));
+
+        con.name = "INVALID";
+        buffer.position(0);
+        con.read(new Reads(new ByteBufferInput(buffer)));
+
+        assertEquals(string, con.name);
+    }
+
+    @Test
+    void writeRules(){
+        ByteBuffer buffer = ByteBuffer.allocate(1000);
+
+        Rules rules = new Rules();
+        rules.attackMode = true;
+        rules.buildSpeedMultiplier = 99f;
+
+        TypeIO.writeRules(new Writes(new ByteBufferOutput(buffer)), rules);
+        buffer.position(0);
+        Rules res = TypeIO.readRules(new Reads(new ByteBufferInput(buffer)));
+
+        assertEquals(rules.buildSpeedMultiplier, res.buildSpeedMultiplier);
+        assertEquals(rules.attackMode, res.attackMode);
+    }
+
+    @Test
+    void writeRules2(){
+        Rules rules = new Rules();
+        rules.attackMode = true;
+        rules.tags.put("blah", "bleh");
+        rules.buildSpeedMultiplier = 99.1f;
+
+        String str = JsonIO.write(rules);
+        Rules res = JsonIO.read(Rules.class, str);
+
+        assertEquals(rules.buildSpeedMultiplier, res.buildSpeedMultiplier);
+        assertEquals(rules.attackMode, res.attackMode);
+        assertEquals(rules.tags.get("blah"), res.tags.get("blah"));
+
+        String str2 = JsonIO.write(new Rules(){{
+            attackMode = true;
+        }});
+    }
+
+    @Test
+    void serverListJson(){
+        String[] files = {"servers_v6.json", "servers_v7.json"};
+
+
+        for(String file : files){
+            try{
+                String str = Core.files.absolute("./../../" + file).readString();
+                assertEquals(ValueType.array, new JsonReader().parse(str).type());
+                assertTrue(Jval.read(str).isArray());
+                JSONArray array = new JSONArray(str);
+                assertTrue(array.length() > 0);
+            }catch(Exception e){
+                fail("Failed to parse " + file, e);
+            }
+        }
+    }
+
     @Test
     void initialization(){
         assertNotNull(logic);
@@ -205,14 +353,23 @@ public class ApplicationTests{
     }
 
     @Test
-    void load(){
+    void saveLoad(){
         world.loadMap(testMap);
         Map map = state.map;
 
+        float hp = 30f;
+
+        Unit unit = UnitTypes.dagger.spawn(Team.sharded, 20f, 30f);
+        unit.health = hp;
+
         SaveIO.save(saveDirectory.child("0.msav"));
         resetWorld();
         SaveIO.load(saveDirectory.child("0.msav"));
 
+        Unit spawned = Groups.unit.find(u -> u.type == UnitTypes.dagger);
+        assertNotNull(spawned, "Saved daggers must persist");
+        assertEquals(hp, spawned.health, "Spawned dagger health must save.");
+
         assertEquals(world.width(), map.width);
         assertEquals(world.height(), map.height);
         assertTrue(state.teams.playerCores().size > 0);
@@ -239,6 +396,7 @@ public class ApplicationTests{
     void liquidOutput(){
         world.loadMap(testMap);
         state.set(State.playing);
+        state.rules.limitMapArea = false;
 
         world.tile(0, 0).setBlock(Blocks.liquidSource, Team.sharded);
         world.tile(0, 0).build.configureAny(Liquids.water);
@@ -255,6 +413,7 @@ public class ApplicationTests{
     void liquidJunctionOutput(){
         world.loadMap(testMap);
         state.set(State.playing);
+        state.rules.limitMapArea = false;
 
         Tile source = world.rawTile(0, 0), tank = world.rawTile(1, 4), junction = world.rawTile(0, 1), conduit = world.rawTile(0, 2);
 
@@ -273,6 +432,119 @@ public class ApplicationTests{
         assertTrue(tank.build.liquids.current() == Liquids.water, "Tank has no water");
     }
 
+    @Test
+    void liquidRouterOutputAll() {
+        world.loadMap(testMap);
+        state.set(State.playing);
+        state.rules.limitMapArea = false;
+        Tile source = world.rawTile(4,0), router = world.rawTile(4, 2), conduitUp1 = world.rawTile(4,1),
+        conduitLeft = world.rawTile(3,2), conduitUp2 = world.rawTile(4, 3), conduitRight = world.rawTile(5, 2),
+        leftTank = world.rawTile(1, 2), topTank = world.rawTile(4,5), rightTank = world.rawTile(7, 2);
+
+        source.setBlock(Blocks.liquidSource, Team.sharded);
+        source.build.configureAny(Liquids.water);
+        conduitUp1.setBlock(Blocks.conduit, Team.sharded, 1);
+        router.setBlock(Blocks.liquidRouter, Team.sharded);
+        conduitLeft.setBlock(Blocks.conduit, Team.sharded,2);
+        conduitUp2.setBlock(Blocks.conduit, Team.sharded, 1);
+        conduitRight.setBlock(Blocks.conduit, Team.sharded, 0);
+        leftTank.setBlock(Blocks.liquidTank, Team.sharded);
+        topTank.setBlock(Blocks.liquidTank, Team.sharded);
+        rightTank.setBlock(Blocks.liquidTank, Team.sharded);
+
+        updateBlocks(200);
+        assertTrue(rightTank.build.liquids.currentAmount() > 0, "Liquid router did not distribute to rightTank");
+        assertTrue(topTank.build.liquids.currentAmount() > 0, "Liquid router did not distribute to topTank");
+        assertTrue(leftTank.build.liquids.currentAmount() > 0, "Liquid router did not distribute to rightTank");
+    }
+
+    @Test
+    void sorterOutputCorrect() {
+        world.loadMap(testMap);
+        state.set(State.playing);
+        state.rules.limitMapArea = false;
+        Tile source1 = world.rawTile(4, 0), source2 = world.rawTile(6, 0), s1conveyor = world.rawTile(4, 1),
+        s2conveyor = world.rawTile(6, 1), s1s2conveyor = world.rawTile(5, 1), sorter = world.rawTile(5, 2),
+        leftconveyor = world.rawTile(4, 2), rightconveyor = world.rawTile(6, 2), sortedconveyor = world.rawTile(5, 3),
+        leftVault = world.rawTile(2, 2), rightVault = world.rawTile(8, 2), topVault = world.rawTile(5, 5);
+
+        source1.setBlock(Blocks.itemSource, Team.sharded);
+        source1.build.configureAny(Items.coal);
+        source2.setBlock(Blocks.itemSource, Team.sharded);
+        source2.build.configureAny(Items.copper);
+        s1conveyor.setBlock(Blocks.conveyor, Team.sharded, 0);
+        s2conveyor.setBlock(Blocks.conveyor, Team.sharded, 2);
+        s1s2conveyor.setBlock(Blocks.conveyor, Team.sharded, 1);
+        sorter.setBlock(Blocks.sorter, Team.sharded);
+        sorter.build.configureAny(Items.copper);
+        leftconveyor.setBlock(Blocks.conveyor, Team.sharded, 2);
+        rightconveyor.setBlock(Blocks.conveyor, Team.sharded, 0);
+        sortedconveyor.setBlock(Blocks.conveyor, Team.sharded, 1);
+        leftVault.setBlock(Blocks.vault, Team.sharded);
+        rightVault.setBlock(Blocks.vault, Team.sharded);
+        topVault.setBlock(Blocks.vault, Team.sharded);
+
+        updateBlocks(200);
+        assertEquals(Items.coal, rightVault.build.items.first());
+        assertEquals(Items.copper, topVault.build.items.first());
+        assertEquals(Items.coal, leftVault.build.items.first());
+
+    }
+
+    @Test
+    void routerOutputAll() {
+        world.loadMap(testMap);
+        state.set(State.playing);
+        state.rules.limitMapArea = false;
+        Tile source1 = world.rawTile(5, 0),  conveyor = world.rawTile(5, 1),
+        router = world.rawTile(5, 2), leftconveyor = world.rawTile(4, 2), rightconveyor = world.rawTile(6, 2),
+        middleconveyor = world.rawTile(5, 3), leftVault = world.rawTile(2, 2),
+        rightVault = world.rawTile(8, 2), topVault = world.rawTile(5, 5);
+
+        source1.setBlock(Blocks.itemSource, Team.sharded);
+        source1.build.configureAny(Items.coal);
+        conveyor.setBlock(Blocks.conveyor, Team.sharded, 1);
+        router.setBlock(Blocks.router, Team.sharded);
+        router.build.configureAny(Items.coal);
+        leftconveyor.setBlock(Blocks.conveyor, Team.sharded, 2);
+        rightconveyor.setBlock(Blocks.conveyor, Team.sharded, 0);
+        middleconveyor.setBlock(Blocks.conveyor, Team.sharded, 1);
+        leftVault.setBlock(Blocks.vault, Team.sharded);
+        rightVault.setBlock(Blocks.vault, Team.sharded);
+        topVault.setBlock(Blocks.vault, Team.sharded);
+
+        updateBlocks(200);
+        assertEquals(Items.coal, rightVault.build.items.first());
+        assertEquals(Items.coal, topVault.build.items.first());
+        assertEquals(Items.coal, leftVault.build.items.first());
+    }
+
+    @Test
+    void junctionOutputCorrect() {
+        world.loadMap(testMap);
+        state.set(State.playing);
+        state.rules.limitMapArea = false;
+        Tile source1 = world.rawTile(5,0),source2 = world.rawTile(7, 2),  conveyor1 = world.rawTile(5, 1),
+        conveyor2 = world.rawTile(6,2), junction = world.rawTile(5, 2), conveyor3 = world.rawTile(5,3),
+        conveyor4 = world.rawTile(4,2), vault2 = world.rawTile(3, 1), vault1 = world.rawTile(5,5);
+        source1.setBlock(Blocks.itemSource, Team.sharded);
+        source1.build.configureAny(Items.coal);
+        source2.setBlock(Blocks.itemSource, Team.sharded);
+        source2.build.configureAny(Items.copper);
+        conveyor1.setBlock(Blocks.conveyor, Team.sharded, 1);
+        conveyor2.setBlock(Blocks.conveyor, Team.sharded, 2);
+        conveyor3.setBlock(Blocks.conveyor, Team.sharded, 1);
+        conveyor4.setBlock(Blocks.conveyor, Team.sharded, 2);
+        junction.setBlock(Blocks.junction, Team.sharded);
+
+        vault1.setBlock(Blocks.vault, Team.sharded);
+        vault2.setBlock(Blocks.vault, Team.sharded);
+
+        updateBlocks(200);
+        assertEquals(Items.coal, vault1.build.items.first());
+        assertEquals(Items.copper, vault2.build.items.first());
+    }
+
     @Test
     void blockOverlapRemoved(){
         world.loadMap(testMap);
@@ -296,78 +568,13 @@ public class ApplicationTests{
         world.tile(0, 0).build.acceptStack(Items.copper, 1000, null);
     }
 
-    @Test
-    void indexingBasic(){
-        resetWorld();
-        SaveIO.load(Core.files.internal("77.msav"));
-
-        //test basic method.
-        Rand r = new Rand(0);
-        Building[] res = {null};
-
-        Cons<Building> assigner = t -> res[0] = t;
-
-        int iterations = 100;
-
-        r.setSeed(0);
-
-        //warmup.
-        for(int i = 0; i < iterations; i++){
-            int x = r.random(0, world.width()), y = r.random(0, world.height());
-            float range = r.random(tilesize * 30);
-
-            indexer.eachBlock(Team.sharded, x * tilesize, y * tilesize, range, t -> true, assigner);
-        }
-
-        //TODO impl
-        /*
-        r.setSeed(0);
-
-        for(int i = 0; i < iterations; i++){
-            int x = r.random(0, world.width()), y = r.random(0, world.height());
-            float range = r.random(tilesize * 30);
-
-            indexer.eachBlock2(Team.sharded, x * tilesize, y * tilesize, range, t -> true, assigner);
-        }*/
-
-        //benchmark.
-
-        r.setSeed(0);
-
-        Time.mark();
-
-        for(int i = 0; i < iterations; i++){
-            int x = r.random(0, world.width()), y = r.random(0, world.height());
-            float range = r.random(tilesize * 30);
-
-            indexer.eachBlock(Team.sharded, x * tilesize, y * tilesize, range, t -> true, assigner);
-        }
-
-        Log.info("Time for basic indexing: @", Time.elapsed());
-
-        r.setSeed(0);
-
-        /*
-        Time.mark();
-
-        for(int i = 0; i < iterations; i++){
-            int x = r.random(0, world.width()), y = r.random(0, world.height());
-            float range = r.random(tilesize * 30);
-
-            indexer.eachBlock2(Team.sharded, x * tilesize, y * tilesize, range, t -> true, assigner);
-        }
-
-        Log.info("Time for quad: {0}", Time.elapsed());
-        */
-
-    }
-
     @Test
     void conveyorBench(){
         int[] itemsa = {0};
 
         world.loadMap(testMap);
         state.set(State.playing);
+        state.rules.limitMapArea = false;
         int length = 128;
         world.tile(0, 0).setBlock(Blocks.itemSource, Team.sharded);
         world.tile(0, 0).build.configureAny(Items.copper);
@@ -568,7 +775,7 @@ public class ApplicationTests{
 
     @Test
     void allBlockTest(){
-        Tiles tiles = world.resize(256 * 3 + 20, 10);
+        Tiles tiles = world.resize(80, 80);
 
         world.beginMapLoad();
         for(int x = 0; x < tiles.width; x++){
@@ -576,14 +783,24 @@ public class ApplicationTests{
                 tiles.set(x, y, new Tile(x, y, Blocks.stone, Blocks.air, Blocks.air));
             }
         }
-        int i = 0;
+        int maxHeight = 0;
+        state.rules.canGameOver = false;
+        state.rules.borderDarkness = false;
 
-        for(int x = 5; x < tiles.width && i < content.blocks().size; ){
-            Block block = content.block(i++);
+        for(int x = 0, y = 0, i = 0; i < content.blocks().size; i ++){
+            Block block = content.block(i);
             if(block.canBeBuilt()){
+                int offset = Math.max(block.size % 2 == 0 ? block.size/2 - 1 : block.size/2, 0);
+
+                if(x + block.size + 1 >= world.width()){
+                    y += maxHeight;
+                    maxHeight = 0;
+                    x = 0;
+                }
+
+                tiles.get(x + offset, y + offset).setBlock(block);
                 x += block.size;
-                tiles.get(x, 5).setBlock(block);
-                x += block.size;
+                maxHeight = Math.max(maxHeight, block.size);
             }
         }
         world.endMapLoad();
@@ -604,6 +821,138 @@ public class ApplicationTests{
         }
     }
 
+    void checkPayloads(){
+        for(int x = 0; x < world.tiles.width; x++){
+            for(int y = 0; y < world.tiles.height; y++){
+                Tile tile = world.rawTile(x, y);
+                if(tile.build != null && tile.isCenter() && !(tile.block() instanceof CoreBlock)){
+                    try{
+                        tile.build.update();
+                    }catch(Throwable t){
+                        fail("Failed to update block in payload: '" + ((BuildPayload)tile.build.getPayload()).block() + "'", t);
+                    }
+                    assertEquals(tile.block(), tile.build.block);
+                    assertEquals(tile.block().health, tile.build.health());
+                }
+            }
+        }
+    }
+
+    @Test
+    void allPayloadBlockTest(){
+        int ts = 20;
+        Tiles tiles = world.resize(ts * 3, ts * 3);
+
+        world.beginMapLoad();
+        for(int x = 0; x < tiles.width; x++){
+            for(int y = 0; y < tiles.height; y++){
+                tiles.set(x, y, new Tile(x, y, Blocks.stone, Blocks.air, Blocks.air));
+            }
+        }
+
+        tiles.getn(tiles.width - 2, tiles.height - 2).setBlock(Blocks.coreShard, Team.sharded);
+
+        Seq<Block> blocks = content.blocks().select(b -> b.canBeBuilt());
+        for(int i = 0; i < blocks.size; i++){
+            int x = (i % ts) * 3 + 1;
+            int y = (i / ts) * 3 + 1;
+            Tile tile = tiles.get(x, y);
+            tile.setBlock(Blocks.payloadConveyor, Team.sharded);
+            Building build = tile.build;
+            build.handlePayload(build, new BuildPayload(blocks.get(i), Team.sharded));
+        }
+        world.endMapLoad();
+
+        checkPayloads();
+
+        SaveIO.write(saveDirectory.child("payloads.msav"));
+        logic.reset();
+        SaveIO.load(saveDirectory.child("payloads.msav"));
+
+        checkPayloads();
+    }
+
+    @TestFactory
+    DynamicTest[] testSectorValidity(){
+        Seq<DynamicTest> out = new Seq<>();
+        if(world == null) world = new World();
+
+        for(SectorPreset zone : content.sectors()){
+
+            out.add(dynamicTest(zone.name, () -> {
+                Time.setDeltaProvider(() -> 1f);
+
+                logic.reset();
+                state.rules.sector = zone.sector;
+                try{
+                    world.loadGenerator(zone.generator.map.width, zone.generator.map.height, zone.generator::generate);
+                }catch(SaveException e){
+                    //fails randomly and I don't care about fixing it
+                    e.printStackTrace();
+                    return;
+                }
+                zone.rules.get(state.rules);
+                ObjectSet<Item> resources = new ObjectSet<>();
+                boolean hasSpawnPoint = false;
+
+                for(Tile tile : world.tiles){
+                    if(tile.drop() != null){
+                        resources.add(tile.drop());
+                    }
+                    if(tile.block() instanceof CoreBlock && tile.team() == state.rules.defaultTeam){
+                        hasSpawnPoint = true;
+                    }
+                }
+
+                if(state.rules.waves){
+                    Seq<SpawnGroup> spawns = state.rules.spawns;
+
+                    int bossWave = 0;
+                    if(state.rules.winWave > 0){
+                        bossWave = state.rules.winWave;
+                    }else{
+                        outer:
+                        for(int i = 1; i <= 1000; i++){
+                            for(SpawnGroup spawn : spawns){
+                                if(spawn.effect == StatusEffects.boss && spawn.getSpawned(i) > 0){
+                                    bossWave = i;
+                                    break outer;
+                                }
+                            }
+                        }
+                    }
+
+                    if(state.rules.attackMode){
+                        bossWave = 100;
+                    }else{
+                        assertNotEquals(0, bossWave, "Sector " + zone.name + " doesn't have a boss/end wave.");
+                    }
+
+                    if(state.rules.winWave > 0) bossWave = state.rules.winWave - 1;
+
+                    //TODO check for difficulty?
+                    for(int i = 1; i <= bossWave; i++){
+                        int total = 0;
+                        for(SpawnGroup spawn : spawns){
+                            total += spawn.getSpawned(i - 1);
+                        }
+
+                        assertNotEquals(0, total, "Sector " + zone + " has no spawned enemies at wave " + i);
+                        //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(hasSpawnPoint, "Sector \"" + zone.name + "\" has no spawn points.");
+                assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && state.rules.waveTeam.data().hasCore()), "Sector \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns());
+            }));
+        }
+
+        return out.toArray(DynamicTest.class);
+    }
+
     void initBuilding(){
         createMap();
 
@@ -613,7 +962,7 @@ public class ApplicationTests{
             core.build.items.set(item, 3000);
         }
 
-        assertEquals(core.build, state.teams.get(Team.sharded).core());
+        assertEquals(core.build, Team.sharded.data().core());
     }
 
     void depositTest(Block block, Item item){
diff --git a/tests/src/test/java/GenericModTest.java b/tests/src/test/java/GenericModTest.java
new file mode 100644
index 0000000000..f65aa881e8
--- /dev/null
+++ b/tests/src/test/java/GenericModTest.java
@@ -0,0 +1,32 @@
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import org.junit.jupiter.api.*;
+
+import java.io.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class GenericModTest{
+
+    /** grabs a mod and puts it in the mod folder */
+    static void grabMod(String url){
+        //clear older mods
+        ApplicationTests.testDataFolder.deleteDirectory();
+        Http.get(url).error(Assertions::fail).timeout(20000).block(httpResponse -> {
+            try{
+                ApplicationTests.testDataFolder.child("mods").child("test_mod." + (url.endsWith("jar") ? "jar" : "zip")).writeBytes(Streams.copyBytes(httpResponse.getResultAsStream()));
+            }catch(IOException e){
+                Assertions.fail(e);
+            }
+        });
+
+        ApplicationTests.launchApplication(false);
+    }
+
+    static void checkExistence(String modName){
+        assertNotEquals(Vars.mods, null);
+        assertNotEquals(Vars.mods.list().size, 0, "At least one mod must be loaded.");
+        assertEquals(modName, Vars.mods.list().first().name, modName + " must be loaded.");
+    }
+}
diff --git a/tests/src/test/java/IOTests.java b/tests/src/test/java/IOTests.java
deleted file mode 100644
index e44270e9c2..0000000000
--- a/tests/src/test/java/IOTests.java
+++ /dev/null
@@ -1,72 +0,0 @@
-import arc.util.*;
-import arc.util.io.*;
-import mindustry.game.*;
-import mindustry.io.*;
-import org.junit.jupiter.api.*;
-
-import java.nio.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class IOTests{
-
-    @Test
-    void writeEnglish(){
-        ByteBuffer buffer = ByteBuffer.allocate(500);
-        TypeIO.writeString(buffer, "asd asd asd asd asdagagasasjakbgeah;jwrej 23424234");
-        buffer.position(0);
-        assertEquals(TypeIO.readString(buffer), "asd asd asd asd asdagagasasjakbgeah;jwrej 23424234");
-    }
-
-    @Test
-    void writeChinese(){
-        ByteBuffer buffer = ByteBuffer.allocate(500);
-        TypeIO.writeString(buffer, "这个�务器�以用自己的语言说�");
-        buffer.position(0);
-        assertEquals(TypeIO.readString(buffer), "这个�务器�以用自己的语言说�");
-    }
-
-    @Test
-    void writeNull(){
-        ByteBuffer buffer = ByteBuffer.allocate(500);
-        TypeIO.writeString(buffer, null);
-        buffer.position(0);
-        assertNull(TypeIO.readString(buffer));
-    }
-
-    @Test
-    void writeRules(){
-        ByteBuffer buffer = ByteBuffer.allocate(500);
-
-        Rules rules = new Rules();
-        rules.attackMode = true;
-        rules.buildSpeedMultiplier = 99f;
-
-        TypeIO.writeRules(new Writes(new ByteBufferOutput(buffer)), rules);
-        buffer.position(0);
-        Rules res = TypeIO.readRules(new Reads(new ByteBufferInput(buffer)));
-
-        assertEquals(rules.buildSpeedMultiplier, res.buildSpeedMultiplier);
-        assertEquals(rules.attackMode, res.attackMode);
-    }
-
-    @Test
-    void writeRules2(){
-        Rules rules = new Rules();
-        rules.attackMode = true;
-        rules.tags.put("blah", "bleh");
-        rules.buildSpeedMultiplier = 99.1f;
-
-        String str = JsonIO.write(rules);
-        Rules res = JsonIO.read(Rules.class, str);
-
-        assertEquals(rules.buildSpeedMultiplier, res.buildSpeedMultiplier);
-        assertEquals(rules.attackMode, res.attackMode);
-        assertEquals(rules.tags.get("blah"), res.tags.get("blah"));
-
-        String str2 = JsonIO.write(new Rules(){{
-            attackMode = true;
-        }});
-        Log.info(str2);
-    }
-}
diff --git a/tests/src/test/java/ModTestAllure.java b/tests/src/test/java/ModTestAllure.java
new file mode 100644
index 0000000000..9d1db792dc
--- /dev/null
+++ b/tests/src/test/java/ModTestAllure.java
@@ -0,0 +1,41 @@
+import arc.util.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import org.junit.jupiter.api.*;
+
+import static mindustry.Vars.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+//grabs a version-locked exotic-mod commit and makes sure its content is parsed correctly
+//this mod was chosen because:
+//- it is written solely in (h)json
+//- it is probably the mod with the most json, and as such covers a lot of classes
+//- it is popular enough in the mod browser
+//- I am somewhat familiar with its files & the type of content it adds
+public class ModTestAllure extends GenericModTest{
+
+    @Test
+    public void begin(){
+        grabMod("https://github.com/LixieWulf/Allure/archive/4150f74db1ea6058dc090959cf0fe5dc9d239e37.zip");
+        checkExistence("allure");
+
+        UnitType type = Vars.content.unit("allure-0b11-exodus");
+        assertNotNull(type, "A mod unit must be loaded.");
+        assertTrue(type.weapons.size > 0, "A mod unit must have a weapon.");
+
+        Vars.world.loadMap(maps.loadInternalMap("groundZero"));
+
+        Unit unit = type.spawn(0, 0);
+
+        //check for crash
+        unit.update();
+
+        assertTrue(unit.health > 0, "Unit must be spawned and alive.");
+        assertTrue(Groups.unit.size() > 0, "Unit must be spawned and alive.");
+
+        //just an extra sanity check
+        Log.info("Modded units: @", Vars.content.units().select(u -> u.minfo.mod != null));
+    }
+
+}
diff --git a/tests/src/test/java/ModTestBM.java b/tests/src/test/java/ModTestBM.java
new file mode 100644
index 0000000000..24e817b441
--- /dev/null
+++ b/tests/src/test/java/ModTestBM.java
@@ -0,0 +1,39 @@
+import mindustry.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+import org.junit.jupiter.api.*;
+
+import static mindustry.Vars.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+//grabs a betamindy release and makes sure it initializes correctly
+//this mod was chosen because:
+//- it is one of the top java mods on the browser
+//- it uses a variety of mindustry classes
+//- it is popular enough to cause significant amounts of crashes when something breaks
+//- I have some familiarity with its codebase
+public class ModTestBM extends GenericModTest{
+
+    @Test
+    public void begin(){
+        grabMod("https://github.com/sk7725/BetaMindy/releases/download/v1.11/BetaMindy.jar");
+
+        checkExistence("betamindy");
+
+        Block type = Vars.content.blocks().find(u -> u.name.equals("betamindy-piston"));
+        assertNotNull(type, "A mod block must be loaded.");
+        assertSame(type.buildVisibility, BuildVisibility.shown, "A mod block must be buildable.");
+
+        world.loadMap(maps.loadInternalMap("groundZero"));
+        Tile t = world.tile(3, 3);
+
+        t.setBlock(type);
+
+        //check for crash
+        t.build.update();
+
+        assertTrue(t.build.health > 0, "Block must be spawned and alive.");
+        assertSame(t.build.block, type, "Block must be spawned and alive.");
+    }
+
+}
diff --git a/tests/src/test/java/SectorTests.java b/tests/src/test/java/SectorTests.java
deleted file mode 100644
index 6f07e77313..0000000000
--- a/tests/src/test/java/SectorTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-import arc.struct.*;
-import arc.util.*;
-import mindustry.content.*;
-import mindustry.core.*;
-import mindustry.core.GameState.*;
-import mindustry.game.*;
-import mindustry.io.SaveIO.*;
-import mindustry.type.*;
-import mindustry.world.*;
-import mindustry.world.blocks.storage.*;
-import org.junit.jupiter.api.*;
-
-import static mindustry.Vars.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
-public class SectorTests{
-
-    @BeforeAll
-    static void launchApplication(){
-        ApplicationTests.launchApplication();
-    }
-
-    @BeforeEach
-    void resetWorld(){
-        Time.setDeltaProvider(() -> 1f);
-        logic.reset();
-        state.set(State.menu);
-    }
-
-    @TestFactory
-    DynamicTest[] testZoneValidity(){
-        Seq<DynamicTest> out = new Seq<>();
-        if(world == null) world = new World();
-
-        for(SectorPreset zone : content.sectors()){
-
-            out.add(dynamicTest(zone.name, () -> {
-                logic.reset();
-                try{
-                    world.loadGenerator(zone.generator.map.width, zone.generator.map.height, zone.generator::generate);
-                }catch(SaveException e){
-                    //fails randomly and I don't care about fixing it
-                    e.printStackTrace();
-                    return;
-                }
-                zone.rules.get(state.rules);
-                ObjectSet<Item> resources = new ObjectSet<>();
-                boolean hasSpawnPoint = false;
-
-                for(Tile tile : world.tiles){
-                    if(tile.drop() != null){
-                        resources.add(tile.drop());
-                    }
-                    if(tile.block() instanceof CoreBlock && tile.team() == state.rules.defaultTeam){
-                        hasSpawnPoint = true;
-                    }
-                }
-
-                Seq<SpawnGroup> spawns = state.rules.spawns;
-
-                int bossWave = 0;
-                if(state.rules.winWave > 0){
-                    bossWave = state.rules.winWave;
-                }else{
-                    outer:
-                    for(int i = 1; i <= 1000; i++){
-                        for(SpawnGroup spawn : spawns){
-                            if(spawn.effect == StatusEffects.boss && spawn.getSpawned(i) > 0){
-                                bossWave = i;
-                                break outer;
-                            }
-                        }
-                    }
-                }
-
-                if(state.rules.attackMode){
-                    bossWave = 100;
-                }else{
-                    assertNotEquals(0, bossWave, "Sector doesn't have a boss wave.");
-                }
-
-                //TODO check for difficulty?
-                for(int i = 1; i <= bossWave; i++){
-                    int total = 0;
-                    for(SpawnGroup spawn : spawns){
-                        total += spawn.getSpawned(i);
-                    }
-
-                    assertNotEquals(0, total, "Sector " + zone + " has no spawned enemies at wave " + i);
-                    //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());
-            }));
-        }
-
-        return out.toArray(DynamicTest.class);
-    }
-}
diff --git a/tests/src/test/java/power/ConsumeGeneratorTests.java b/tests/src/test/java/power/ConsumeGeneratorTests.java
new file mode 100644
index 0000000000..e1d6f058c2
--- /dev/null
+++ b/tests/src/test/java/power/ConsumeGeneratorTests.java
@@ -0,0 +1,176 @@
+package power;
+
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.game.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.power.*;
+import mindustry.world.blocks.power.ConsumeGenerator.*;
+import mindustry.world.consumers.*;
+import org.junit.jupiter.api.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.DynamicTest.*;
+
+/**
+ * This class tests generators which can process items, liquids or both.
+ * All tests are run with a fixed delta of 0.5 so delta considerations can be tested as well.
+ * Any expected power amount (produced, consumed, buffered) should be affected by fakeDelta but status should not!
+ */
+public class ConsumeGeneratorTests extends PowerTestFixture{
+    private ConsumeGeneratorBuild build;
+    private final float fakeItemDuration = 60f; //ticks
+    private final float maximumLiquidUsage = 1f;
+
+    public void createGenerator(InputType inputType){
+        Vars.state = new GameState();
+        Vars.state.rules = new Rules();
+        ConsumeGenerator generator = new ConsumeGenerator("fakegen" + System.nanoTime()){{
+            powerProduction = 0.1f;
+            itemDuration = fakeItemDuration;
+            buildType = ConsumeGeneratorBuild::new;
+            liquidCapacity = 100f;
+
+            if(inputType != InputType.liquids){
+                consume(new ConsumeItemFlammable());
+            }
+
+            if(inputType != InputType.items){
+                consume(new ConsumeLiquidFlammable(maximumLiquidUsage));
+            }
+        }};
+
+        generator.init();
+        Tile tile = createFakeTile(0, 0, generator);
+        build = (ConsumeGeneratorBuild)tile.build;
+    }
+
+    /** Tests the consumption and efficiency when being supplied with liquids. */
+    @TestFactory
+    DynamicTest[] generatorWorksProperlyWithLiquidInput(){
+
+        // Execute all tests for the case where only liquids are accepted and for the case where liquids and items are accepted (but supply only liquids)
+        InputType[] inputTypesToBeTested = new InputType[]{
+        InputType.liquids,
+        //InputType.any
+        };
+
+        //TODO test with different delta values.
+        Seq<DynamicTest> tests = new Seq<>();
+        float[] deltas = {2f, 1f, 0.5f};
+
+        for(float d : deltas){
+            for(InputType inputType : inputTypesToBeTested){
+                tests.add(dynamicTest("01-delta" + d, () -> simulateLiquidConsumption(d, inputType, Liquids.oil, 0.0f, "No liquids provided")));
+                tests.add(dynamicTest("02-delta" + d, () -> simulateLiquidConsumption(d, inputType, Liquids.oil, maximumLiquidUsage / 4.0f, "Low oil provided")));
+                tests.add(dynamicTest("03-delta" + d, () -> simulateLiquidConsumption(d, inputType, Liquids.oil, maximumLiquidUsage * 1.0f, "Sufficient oil provided")));
+                tests.add(dynamicTest("04-delta" + d, () -> simulateLiquidConsumption(d, inputType, Liquids.oil, maximumLiquidUsage * 2.0f, "Excess oil provided")));
+                // Note: The generator will decline any other liquid since it's not flammable
+            }
+        }
+
+        return tests.toArray(DynamicTest.class);
+    }
+
+    void simulateLiquidConsumption(float delta, InputType inputType, Liquid liquid, float availableLiquidAmount, String parameterDescription){
+        Time.setDeltaProvider(() -> delta);
+
+        float expectedConsumptionPerTick = Math.min(maximumLiquidUsage * Time.delta, availableLiquidAmount);
+        float expectedEfficiency = expectedConsumptionPerTick / (maximumLiquidUsage * Time.delta);
+        float expectedOutputEfficiency = expectedEfficiency * liquid.flammability;
+        //it should either consume:
+        //- the maximum amount used (maximumLiquidUsage) multiplied by speed (delta), or
+        //- the maximum available amount (availableLiquidAmount), since that's a hard cap
+        float expectedRemainingLiquidAmount = Math.max(0.0f, availableLiquidAmount - expectedConsumptionPerTick);
+
+        createGenerator(inputType);
+        assertTrue(build.acceptLiquid(null, liquid), 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.");
+
+        build.liquids.add(liquid, availableLiquidAmount);
+
+        // Perform an update on the generator once - This should use up any resource up to the maximum liquid usage
+        build.update();
+
+        //reset
+        Time.setDeltaProvider(() -> 0.5f);
+
+        assertEquals(expectedEfficiency, build.efficiency(), inputType + " | " + parameterDescription + ": Base input efficiency mismatch.");
+        assertEquals(expectedRemainingLiquidAmount, build.liquids.get(liquid), inputType + " | " + parameterDescription + ": Remaining liquid amount mismatch.");
+        assertEquals(expectedOutputEfficiency, build.productionEfficiency, inputType + " | " + parameterDescription + ": Output production efficiency mismatch.");
+    }
+
+    /** Tests the consumption and efficiency when being supplied with items. */
+    @TestFactory
+    DynamicTest[] generatorWorksProperlyWithItemInput(){
+
+        // Execute all tests for the case where only items are accepted and for the case where liquids and items are accepted (but supply only items)
+        InputType[] inputTypesToBeTested = new InputType[]{
+        InputType.items,
+        //InputType.any
+        };
+
+        Seq<DynamicTest> tests = new Seq<>();
+        for(InputType inputType : inputTypesToBeTested){
+            tests.add(dynamicTest("01", () -> simulateItemConsumption(inputType, Items.coal, 0, "No items provided")));
+            tests.add(dynamicTest("02", () -> simulateItemConsumption(inputType, Items.coal, 1, "Sufficient coal provided")));
+            tests.add(dynamicTest("03", () -> simulateItemConsumption(inputType, Items.coal, 10, "Excess coal provided")));
+            tests.add(dynamicTest("04", () -> simulateItemConsumption(inputType, Items.blastCompound, 1, "Blast compound provided")));
+            tests.add(dynamicTest("05", () -> simulateItemConsumption(inputType, Items.sporePod, 1, "Biomatter provided")));
+            tests.add(dynamicTest("06", () -> simulateItemConsumption(inputType, Items.pyratite, 1, "Pyratite provided")));
+        }
+        return tests.toArray(DynamicTest.class);
+    }
+
+    void simulateItemConsumption(InputType inputType, Item item, int amount, String parameterDescription){
+        float expectedEfficiency = amount > 0 ? item.flammability : 0f;
+        int expectedRemainingItemAmount = Math.max(0, amount - 1);
+
+        createGenerator(inputType);
+        assertTrue(build.acceptItem(null, item), inputType + " | " + parameterDescription + ": Items which will be declined by the generator don't need to be tested - The code won't be called for those cases.");
+
+        if(amount > 0){
+            build.items.add(item, amount);
+        }
+
+        // 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.
+        build.update();
+
+        assertEquals(expectedRemainingItemAmount, build.items.get(item), inputType + " | " + parameterDescription + ": Remaining item amount mismatch.");
+        assertEquals(expectedEfficiency, build.productionEfficiency, inputType + " | " + parameterDescription + ": Efficiency mismatch.");
+
+    }
+
+    /** Makes sure the efficiency stays equal during the item duration. */
+    @Test
+    void efficiencyRemainsConstantWithinItemDuration_ItemsOnly(){
+        testItemDuration(InputType.items);
+    }
+
+    void testItemDuration(InputType inputType){
+        createGenerator(inputType);
+
+        // Burn a single coal and test for the duration
+        build.items.add(Items.coal, 1);
+        //first frame update for some setup (consume checking is delayed)
+        build.update();
+
+        float expectedEfficiency = build.productionEfficiency;
+
+        float currentDuration = 0.0f;
+        while((currentDuration += Time.delta) <= fakeItemDuration){
+            build.update();
+            assertEquals(expectedEfficiency, build.productionEfficiency, "Duration: " + currentDuration);
+        }
+        build.update();
+        assertEquals(0.0f, build.productionEfficiency, "Duration: " + currentDuration);
+    }
+
+    enum InputType{
+        items,
+        liquids
+    }
+}
diff --git a/tests/src/test/java/power/DirectConsumerTests.java b/tests/src/test/java/power/DirectConsumerTests.java
index 1b8aa04a8d..6919dd20b1 100644
--- a/tests/src/test/java/power/DirectConsumerTests.java
+++ b/tests/src/test/java/power/DirectConsumerTests.java
@@ -1,9 +1,18 @@
 package power;
 
+import mindustry.content.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.power.PowerGenerator.*;
+import mindustry.world.blocks.power.*;
+import mindustry.world.blocks.production.*;
+import org.junit.jupiter.api.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 /** Tests for direct power consumers. */
 public class DirectConsumerTests extends PowerTestFixture{
-    //TODO reimplement
-/*
+
     @Test
     void noPowerRequestedWithNoItems(){
         testUnitFactory(0, 0, 0.08f, 0.08f, 1f);
@@ -21,26 +30,26 @@ public class DirectConsumerTests extends PowerTestFixture{
     }
 
     void testUnitFactory(int siliconAmount, int leadAmount, float producedPower, float requestedPower, float expectedSatisfaction){
-        Tile consumerTile = createFakeTile(0, 0, new UnitFactory("fakefactory"){{
-            entityType = UnitFactoryEntity::new;
-            unitType = UnitTypes.spirit;
-            produceTime = 60;
-            consumes.power(requestedPower);
-            consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30));
+        Tile ct = createFakeTile(0, 0, new GenericCrafter("fakefactory"){{
+            hasPower = true;
+            hasItems = true;
+            consumePower(requestedPower);
+            consumeItems(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30));
         }});
-        consumerTile.entity.items.add(Items.silicon, siliconAmount);
-        consumerTile.entity.items.add(Items.lead, leadAmount);
+        ct.block().init();
+        ct.build.items.add(Items.silicon, siliconAmount);
+        ct.build.items.add(Items.lead, leadAmount);
 
         Tile producerTile = createFakeTile(2, 0, createFakeProducerBlock(producedPower));
-        producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1f;
+        ((GeneratorBuild)producerTile.build).productionEfficiency = 1f;
 
         PowerGraph graph = new PowerGraph();
-        graph.add(producerTile.entity);
-        graph.add(consumerTile.entity);
+        graph.add(producerTile.build);
+        graph.add(ct.build);
 
-        consumerTile.entity.update();
+        ct.build.update();
         graph.update();
 
-        assertEquals(expectedSatisfaction, consumerTile.entity.power.status);
-    }*/
+        assertEquals(expectedSatisfaction, ct.build.power.status);
+    }
 }
diff --git a/tests/src/test/java/power/FakeGraphics.java b/tests/src/test/java/power/FakeGraphics.java
deleted file mode 100644
index 5f64aa61f3..0000000000
--- a/tests/src/test/java/power/FakeGraphics.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package power;
-
-import arc.Graphics;
-import arc.Graphics.Cursor.SystemCursor;
-import arc.graphics.*;
-import arc.graphics.gl.GLVersion;
-
-public class FakeGraphics extends Graphics{
-    static int frame;
-
-    @Override
-    public boolean isGL30Available(){
-        return false;
-    }
-
-    @Override
-    public GL20 getGL20(){
-        return null;
-    }
-
-    @Override
-    public void setGL20(GL20 gl20){
-
-    }
-
-    @Override
-    public GL30 getGL30(){
-        return null;
-    }
-
-    @Override
-    public void setGL30(GL30 gl30){
-
-    }
-
-    @Override
-    public int getWidth(){
-        return 0;
-    }
-
-    @Override
-    public int getHeight(){
-        return 0;
-    }
-
-    @Override
-    public int getBackBufferWidth(){
-        return 0;
-    }
-
-    @Override
-    public int getBackBufferHeight(){
-        return 0;
-    }
-
-    @Override
-    public long getFrameId(){
-        return frame++;
-    }
-
-    @Override
-    public float getDeltaTime(){
-        return 0;
-    }
-
-    @Override
-    public int getFramesPerSecond(){
-        return 0;
-    }
-
-    @Override
-    public GLVersion getGLVersion(){
-        return null;
-    }
-
-    @Override
-    public float getPpiX(){
-        return 0;
-    }
-
-    @Override
-    public float getPpiY(){
-        return 0;
-    }
-
-    @Override
-    public float getPpcX(){
-        return 0;
-    }
-
-    @Override
-    public float getPpcY(){
-        return 0;
-    }
-
-    @Override
-    public float getDensity(){
-        return 0;
-    }
-
-    @Override
-    public boolean supportsDisplayModeChange(){
-        return false;
-    }
-
-    @Override
-    public Monitor getPrimaryMonitor(){
-        return null;
-    }
-
-    @Override
-    public Monitor getMonitor(){
-        return null;
-    }
-
-    @Override
-    public Monitor[] getMonitors(){
-        return new Monitor[0];
-    }
-
-    @Override
-    public DisplayMode[] getDisplayModes(){
-        return new DisplayMode[0];
-    }
-
-    @Override
-    public DisplayMode[] getDisplayModes(Monitor monitor){
-        return new DisplayMode[0];
-    }
-
-    @Override
-    public DisplayMode getDisplayMode(){
-        return null;
-    }
-
-    @Override
-    public DisplayMode getDisplayMode(Monitor monitor){
-        return null;
-    }
-
-    @Override
-    public boolean setFullscreenMode(DisplayMode displayMode){
-        return false;
-    }
-
-    @Override
-    public boolean setWindowedMode(int width, int height){
-        return false;
-    }
-
-    @Override
-    public void setTitle(String title){
-
-    }
-
-    @Override
-    public void setUndecorated(boolean undecorated){
-
-    }
-
-    @Override
-    public void setResizable(boolean resizable){
-
-    }
-
-    @Override
-    public void setVSync(boolean vsync){
-
-    }
-
-    @Override
-    public BufferFormat getBufferFormat(){
-        return null;
-    }
-
-    @Override
-    public boolean supportsExtension(String extension){
-        return false;
-    }
-
-    @Override
-    public boolean isContinuousRendering(){
-        return false;
-    }
-
-    @Override
-    public void setContinuousRendering(boolean isContinuous){
-
-    }
-
-    @Override
-    public void requestRendering(){
-
-    }
-
-    @Override
-    public boolean isFullscreen(){
-        return false;
-    }
-
-    @Override
-    public Cursor newCursor(Pixmap pixmap, int xHotspot, int yHotspot){
-        return null;
-    }
-
-    @Override
-    protected void setCursor(Cursor cursor){
-
-    }
-
-    @Override
-    protected void setSystemCursor(SystemCursor systemCursor){
-
-    }
-}
diff --git a/tests/src/test/java/power/ItemLiquidGeneratorTests.java b/tests/src/test/java/power/ItemLiquidGeneratorTests.java
deleted file mode 100644
index 71311cda10..0000000000
--- a/tests/src/test/java/power/ItemLiquidGeneratorTests.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package power;
-
-import arc.util.*;
-import mindustry.*;
-import mindustry.content.*;
-import mindustry.core.*;
-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.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
-/**
- * This class tests generators which can process items, liquids or both.
- * All tests are run with a fixed delta of 0.5 so delta considerations can be tested as well.
- * Additionally, each PowerGraph::update() call will have its own thread frame, i.e. the method will never be called twice within the same frame.
- * Both of these constraints are handled by FakeThreadHandler within PowerTestFixture.
- * Any expected power amount (produced, consumed, buffered) should be affected by FakeThreadHandler.fakeDelta but status should not!
- */
-public class ItemLiquidGeneratorTests extends PowerTestFixture{
-
-    private ItemLiquidGenerator generator;
-    private Tile tile;
-    private ItemLiquidGeneratorBuild entity;
-    private final float fakeItemDuration = 60f; //ticks
-    private final float maximumLiquidUsage = 0.5f;
-
-    public void createGenerator(InputType inputType){
-        Vars.state = new GameState();
-        Vars.state.rules = new Rules();
-        generator = new ItemLiquidGenerator(inputType != InputType.liquids, inputType != InputType.items, "fakegen" + System.nanoTime()){
-            {
-                powerProduction = 0.1f;
-                itemDuration = fakeItemDuration;
-                maxLiquidGenerate = maximumLiquidUsage;
-                buildType = ItemLiquidGeneratorBuild::new;
-            }
-
-            @Override
-            public float getItemEfficiency(Item item){
-                return item.flammability;
-            }
-
-            @Override
-            public float getLiquidEfficiency(Liquid liquid){
-                return liquid.flammability;
-            }
-        };
-
-        tile = createFakeTile(0, 0, generator);
-        entity = (ItemLiquidGeneratorBuild)tile.build;
-    }
-
-    /** Tests the consumption and efficiency when being supplied with liquids. */
-    @TestFactory
-    DynamicTest[] generatorWorksProperlyWithLiquidInput(){
-
-        // Execute all tests for the case where only liquids are accepted and for the case where liquids and items are accepted (but supply only liquids)
-        InputType[] inputTypesToBeTested = new InputType[]{
-        InputType.liquids,
-        InputType.any
-        };
-
-        ArrayList<DynamicTest> tests = new ArrayList<>();
-        for(InputType inputType : inputTypesToBeTested){
-            tests.add(dynamicTest("01", () -> simulateLiquidConsumption(inputType, Liquids.oil, 0.0f, "No liquids provided")));
-            tests.add(dynamicTest("02", () -> simulateLiquidConsumption(inputType, Liquids.oil, maximumLiquidUsage / 4.0f, "Low oil provided")));
-            tests.add(dynamicTest("03", () -> simulateLiquidConsumption(inputType, Liquids.oil, maximumLiquidUsage * 1.0f, "Sufficient oil provided")));
-            tests.add(dynamicTest("04", () -> simulateLiquidConsumption(inputType, Liquids.oil, maximumLiquidUsage * 2.0f, "Excess oil provided")));
-            // Note: The generator will decline any other liquid since it's not flammable
-        }
-        DynamicTest[] testArray = new DynamicTest[tests.size()];
-        testArray = tests.toArray(testArray);
-        return testArray;
-    }
-
-    void simulateLiquidConsumption(InputType inputType, Liquid liquid, float availableLiquidAmount, String parameterDescription){
-        final float baseEfficiency = liquid.flammability;
-        final float expectedEfficiency = Math.min(1.0f, availableLiquidAmount / maximumLiquidUsage) * baseEfficiency;
-        final float expectedConsumptionPerTick = Math.min(maximumLiquidUsage, availableLiquidAmount);
-        final float expectedRemainingLiquidAmount = Math.max(0.0f, availableLiquidAmount - expectedConsumptionPerTick * Time.delta);
-
-        createGenerator(inputType);
-        assertTrue(entity.acceptLiquid(null, liquid), 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();
-
-        // Perform an update on the generator once - This should use up any resource up to the maximum liquid usage
-        entity.updateTile();
-
-        assertEquals(expectedRemainingLiquidAmount, entity.liquids.get(liquid), inputType + " | " + parameterDescription + ": Remaining liquid amount mismatch.");
-        assertEquals(expectedEfficiency, entity.productionEfficiency, inputType + " | " + parameterDescription + ": Efficiency mismatch.");
-    }
-
-    /** Tests the consumption and efficiency when being supplied with items. */
-    @TestFactory
-    DynamicTest[] generatorWorksProperlyWithItemInput(){
-
-        // Execute all tests for the case where only items are accepted and for the case where liquids and items are accepted (but supply only items)
-        InputType[] inputTypesToBeTested = new InputType[]{
-        InputType.items,
-        InputType.any
-        };
-
-        ArrayList<DynamicTest> tests = new ArrayList<>();
-        for(InputType inputType : inputTypesToBeTested){
-            tests.add(dynamicTest("01", () -> simulateItemConsumption(inputType, Items.coal, 0, "No items provided")));
-            tests.add(dynamicTest("02", () -> simulateItemConsumption(inputType, Items.coal, 1, "Sufficient coal provided")));
-            tests.add(dynamicTest("03", () -> simulateItemConsumption(inputType, Items.coal, 10, "Excess coal provided")));
-            tests.add(dynamicTest("04", () -> simulateItemConsumption(inputType, Items.blastCompound, 1, "Blast compound provided")));
-            //dynamicTest("03", () -> simulateItemConsumption(inputType, Items.plastanium, 1, "Plastanium provided")), // Not accepted by generator due to low flammability
-            tests.add(dynamicTest("05", () -> simulateItemConsumption(inputType, Items.sporePod, 1, "Biomatter provided")));
-            tests.add(dynamicTest("06", () -> simulateItemConsumption(inputType, Items.pyratite, 1, "Pyratite provided")));
-        }
-        DynamicTest[] testArray = new DynamicTest[tests.size()];
-        testArray = tests.toArray(testArray);
-        return testArray;
-    }
-
-    void simulateItemConsumption(InputType inputType, Item item, int amount, String parameterDescription){
-        final float expectedEfficiency = amount > 0 ? item.flammability : 0f;
-        final float expectedRemainingItemAmount = Math.max(0, amount - 1);
-
-        createGenerator(inputType);
-        assertTrue(entity.acceptItem(null, item), inputType + " | " + parameterDescription + ": Items which will be declined by the generator don't need to be tested - The code won't be called for those cases.");
-
-        if(amount > 0){
-            entity.items.add(item, amount);
-        }
-        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{
-            entity.updateTile();
-
-            assertEquals(expectedRemainingItemAmount, entity.items.get(item), inputType + " | " + parameterDescription + ": Remaining item amount mismatch.");
-            assertEquals(expectedEfficiency, entity.productionEfficiency, inputType + " | " + parameterDescription + ": Efficiency mismatch.");
-        }catch(NullPointerException e){
-            e.printStackTrace();
-            //hacky, but sometimes tests fail here and I'm not going to bother testing it
-        }
-    }
-
-    /** Makes sure the efficiency stays equal during the item duration. */
-    @Test
-    void efficiencyRemainsConstantWithinItemDuration_ItemsOnly(){
-        testItemDuration(InputType.items);
-    }
-
-    /** Makes sure the efficiency stays equal during the item duration. */
-    @Test
-    void efficiencyRemainsConstantWithinItemDuration_ItemsAndLiquids(){
-        testItemDuration(InputType.any);
-    }
-
-    void testItemDuration(InputType inputType){
-        createGenerator(inputType);
-
-        // Burn a single coal and test for the duration
-        entity.items.add(Items.coal, 1);
-        entity.cons.update();
-        entity.updateTile();
-
-        float expectedEfficiency = entity.productionEfficiency;
-
-        float currentDuration = 0.0f;
-        while((currentDuration += Time.delta) <= fakeItemDuration){
-            entity.updateTile();
-            assertEquals(expectedEfficiency, entity.productionEfficiency, "Duration: " + currentDuration);
-        }
-        entity.updateTile();
-        assertEquals(0.0f, entity.productionEfficiency, "Duration: " + currentDuration);
-    }
-
-    enum InputType{
-        items,
-        liquids,
-        any
-    }
-}
diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java
index 457421a85c..ac0b9d72c5 100644
--- a/tests/src/test/java/power/PowerTestFixture.java
+++ b/tests/src/test/java/power/PowerTestFixture.java
@@ -26,8 +26,8 @@ public class PowerTestFixture{
     @BeforeAll
     static void initializeDependencies(){
         headless = true;
-        Core.graphics = new FakeGraphics();
         Core.files = new MockFiles();
+        Groups.init();
 
         boolean make = content == null;
 
@@ -58,14 +58,14 @@ public class PowerTestFixture{
     protected static Battery createFakeBattery(float capacity){
         return new Battery("fakebattery" + System.nanoTime()){{
             buildType = () -> new BatteryBuild();
-            consumes.powerBuffered(capacity);
+            consumePowerBuffered(capacity);
         }};
     }
 
     protected static Block createFakeDirectConsumer(float powerPerTick){
         return new PowerBlock("fakedirectconsumer" + System.nanoTime()){{
             buildType = Building::create;
-            consumes.power(powerPerTick);
+            consumePower(powerPerTick);
         }};
     }
 
@@ -81,8 +81,8 @@ public class PowerTestFixture{
             Tile tile = new Tile(x, y);
 
             //workaround since init() is not called for custom blocks
-            if(block.consumes.all() == null){
-                block.consumes.init();
+            if(block.consumers.length == 0){
+                block.init();
             }
 
             // Using the Tile(int, int, byte, byte) constructor would require us to register any fake block or tile we create
@@ -95,18 +95,12 @@ public class PowerTestFixture{
             // Simulate the "changed" method. Calling it through reflections would require half the game to be initialized.
             tile.build = block.newBuilding().init(tile, Team.sharded, false, 0);
             if(block.hasPower){
-                new PowerGraph(){
-                    //assume there's always something consuming power
-                    @Override
-                    public float getUsageFraction(){
-                        return 1f;
-                    }
-                }.add(tile.build);
+                new PowerGraph().add(tile.build);
             }
 
             // Assign incredibly high health so the block does not get destroyed on e.g. burning Blast Compound
             block.health = 100000;
-            tile.build.health(100000.0f);
+            tile.build.health = 100000.0f;
 
             return tile;
         }catch(Exception ex){
diff --git a/tests/src/test/java/power/PowerTests.java b/tests/src/test/java/power/PowerTests.java
index af90f1d762..a68930655c 100644
--- a/tests/src/test/java/power/PowerTests.java
+++ b/tests/src/test/java/power/PowerTests.java
@@ -1,18 +1,17 @@
 package power;
 
-import arc.*;
 import arc.math.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.core.*;
+import mindustry.gen.*;
 import mindustry.world.*;
-import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.power.PowerGenerator.*;
-import mindustry.world.consumers.*;
+import mindustry.world.blocks.power.*;
 import org.junit.jupiter.api.*;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.jupiter.api.DynamicTest.*;
 
 /**
  * Tests code related to the power system in general, but not specific blocks.
@@ -25,7 +24,6 @@ public class PowerTests extends PowerTestFixture{
 
     @BeforeAll
     static void init(){
-        Core.graphics = new FakeGraphics();
         Vars.state = new GameState();
     }
 
@@ -62,6 +60,8 @@ public class PowerTests extends PowerTestFixture{
             powerGraph.add(producerTile.build);
             powerGraph.add(directConsumerTile.build);
 
+            for(Building build : powerGraph.all) build.updateConsumption();
+
             assertEquals(producedPower * Time.delta, powerGraph.getPowerProduced(), Mathf.FLOAT_ROUNDING_ERROR);
             assertEquals(requiredPower * Time.delta, powerGraph.getPowerNeeded(), Mathf.FLOAT_ROUNDING_ERROR);
 
@@ -109,7 +109,10 @@ public class PowerTests extends PowerTestFixture{
 
             powerGraph.add(batteryTile.build);
 
+            for(Building build : powerGraph.all) build.updateConsumption();
+
             powerGraph.update();
+
             assertEquals(expectedBatteryCapacity / maxCapacity, batteryTile.build.power.status, Mathf.FLOAT_ROUNDING_ERROR, parameterDescription + ": Expected battery status did not match");
             if(directConsumerTile != null){
                 assertEquals(expectedSatisfaction, directConsumerTile.build.power.status, Mathf.FLOAT_ROUNDING_ERROR, parameterDescription + ": Satisfaction of direct consumer did not match");
@@ -130,14 +133,13 @@ public class PowerTests extends PowerTestFixture{
 
             assertEquals(1.0f, consumerTile.build.power.status, Mathf.FLOAT_ROUNDING_ERROR);
 
-            powerGraph.remove(producerTile.build);
+            powerGraph.removeList(producerTile.build);
             powerGraph.add(consumerTile.build);
             powerGraph.update();
 
             assertEquals(0.0f, consumerTile.build.power.status, Mathf.FLOAT_ROUNDING_ERROR);
-            if(consumerTile.block().consumes.hasPower()){
-                ConsumePower consumePower = consumerTile.block().consumes.getPower();
-                assertFalse(consumePower.valid(consumerTile.build));
+            if(consumerTile.block().consPower != null){
+                assertEquals(0f, consumerTile.block().consPower.efficiency(consumerTile.build));
             }
         }
     }
diff --git a/tools/build.gradle b/tools/build.gradle
index 4e8de5b536..b029266302 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -1,74 +1,55 @@
 sourceSets.main.java.srcDirs = ["src/"]
 
-import arc.struct.*
-import arc.graphics.*
-import arc.packer.*
-import arc.util.*
+import arc.files.Fi
+import arc.files.ZipFi
+import arc.func.Func2
+import arc.graphics.Color
+import arc.graphics.Pixmap
+import arc.packer.TexturePacker
+import arc.struct.ObjectMap
+import arc.struct.OrderedMap
+import arc.struct.Seq
+import arc.util.Http
+import arc.util.Log
+import arc.util.OS
+import arc.util.Threads
+import arc.util.io.PropertiesUtils
+import arc.util.io.Streams
 
-import javax.imageio.*
-import java.awt.Graphics2D
-import java.awt.image.*
-import java.util.concurrent.*
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
 
 def genFolder = "../core/assets-raw/sprites_out/generated/"
-def doAntialias = !project.hasProperty("disableAntialias")
-def colorMap = new IntMap<List<Color>>(), colorIndexMap = new IntIntMap()
-//on my machine, I have a native Nim AA implementation that is ~10x faster
-//it's not compiled for other platforms so they don't get it
-def useFastAA = System.getProperty("user.name") == "anuke"
+def enableAA = true
 
-def transformColors = { List<List<String>> list ->
-    list.each{ colors ->
-        def newColors = []
-        colors.each{ hexc ->
-            newColors += Color.valueOf(hexc)
-        }
-
-        newColors.each{ color ->
-            colorMap.put(color.argb8888(), newColors)
-            colorIndexMap.put(color.argb8888(), newColors.indexOf(color))
-        }
-    }
+@groovy.transform.CompileStatic
+static int getRGB(Pixmap image, int ix, int iy) {
+    return image.getRaw(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0))
 }
 
+@groovy.transform.CompileStatic
+static void antialias(File file){
+    Pixmap image = new Pixmap(new Fi(file))
+    Pixmap out = image.copy()
 
-//d4816b
-transformColors([["a387ea", "8a73c6", "5c5e9f"], ["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"],
-                 ["de9458", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"], ["d4816b", "eab678", "ffd37f"], ["ffffff", "dcc6c6", "9d7f7f"]])
-
-def antialias = { File file ->
-    if(!doAntialias) return
-
-    if(useFastAA){
-        "antialias ${file.absolutePath}".execute().waitFor()
-        return
-    }
-
-    def image = ImageIO.read(file)
-    def out = ImageIO.read(file)
-    def getRGB = { int ix, int iy ->
-        //if(ix <= 0 || iy <= 0 || ix >= image.width || iy >= image.height) return 0
-        return image.getRGB(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0))
-    }
-
-    def color = new Color()
-    def sum = new Color()
-    def suma = new Color()
+    Color color = new Color()
+    Color sum = new Color()
+    Color suma = new Color()
     int[] p = new int[9]
 
-    for(int x = 0; x < image.getWidth(); x++){
-        for(int y = 0; y < image.getHeight(); y++){
-            int A = getRGB(x - 1, y + 1),
-                B = getRGB(x, y + 1),
-                C = getRGB(x + 1, y + 1),
-                D = getRGB(x - 1, y),
-                E = getRGB(x, y),
-                F = getRGB(x + 1, y),
-                G = getRGB(x - 1, y - 1),
-                H = getRGB(x, y - 1),
-                I = getRGB(x + 1, y - 1)
+    for(int x = 0; x < image.width; x++){
+        for(int y = 0; y < image.height; y++){
+            int A = getRGB(image, x - 1, y + 1),
+                B = getRGB(image, x, y + 1),
+                C = getRGB(image, x + 1, y + 1),
+                D = getRGB(image, x - 1, y),
+                E = getRGB(image, x, y),
+                F = getRGB(image, x + 1, y),
+                G = getRGB(image, x - 1, y - 1),
+                H = getRGB(image, x, y - 1),
+                I = getRGB(image, x + 1, y - 1)
 
-            Arrays.fill(p, E);
+            Arrays.fill(p, E)
 
             if(D == B && D != H && B != F) p[0] = D
             if((D == B && D != H && B != F && E != C) || (B == F && B != D && F != H && E != A)) p[1] = B
@@ -82,223 +63,42 @@ def antialias = { File file ->
             suma.set(0)
 
             for(int val : p){
-                color.argb8888(val)
-                suma.r += color.r * color.a
-                suma.g += color.g * color.a
-                suma.b += color.b * color.a
-                suma.a += color.a
+                color.rgba8888(val)
+                color.premultiplyAlpha()
+                suma.r(suma.r + color.r)
+                suma.g(suma.g + color.g)
+                suma.b(suma.b + color.b)
+                suma.a(suma.a + color.a)
             }
 
-            float fm = suma.a <= 0.001f ? 0f : (float) (1f / suma.a)
+            float fm = suma.a <= 0.001f ? 0f : (float)(1f / suma.a)
             suma.mul(fm, fm, fm, fm)
 
             float total = 0
             sum.set(0)
 
             for(int val : p){
-                color.argb8888(val)
+                color.rgba8888(val)
                 float a = color.a
                 color.lerp(suma, (float) (1f - a))
-                sum.r += color.r
-                sum.g += color.g
-                sum.b += color.b
-                sum.a += a
+                sum.r(sum.r + color.r)
+                sum.g(sum.g + color.g)
+                sum.b(sum.b + color.b)
+                sum.a(sum.a + a)
                 total += 1f
             }
 
             fm = (float)(1f / total)
             sum.mul(fm, fm, fm, fm)
-            out.setRGB(x, y, sum.argb8888())
+            out.setRaw(x, y, sum.rgba8888())
             sum.set(0)
         }
     }
 
-    ImageIO.write(out, "png", file)
-}
+    image.dispose()
+    out.dispose()
 
-def medianBlur = { File file ->
-    def image = ImageIO.read(file)
-    def result = new BufferedImage(image.width, image.height, BufferedImage.TYPE_INT_ARGB)
-    def radius = 4
-    IntSeq array = new IntSeq()
-
-    def getRGB = { int ix, int iy ->
-        return image.getRGB(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0))
-    }
-
-    for(int x = 0; x < image.width; x++){
-        for(int y = 0; y < image.height; y++){
-            array.clear()
-
-            for(int dx = -radius; dx <= radius; dx ++){
-                for(int dy = -radius; dy <= radius; dy ++){
-                    if(dx*dx + dy*dy <= radius*radius){
-                        array.add(getRGB(x + dx, y + dy))
-                    }
-                }
-            }
-
-            array.sort()
-
-            result.setRGB(x, y, array.get((int)(array.size / 2)))
-        }
-    }
-
-    ImageIO.write(result, "png", file)
-}
-
-def scaleImage = { File file ->
-    def image = ImageIO.read(file)
-    for(int iteration in 0..1){
-        def scaled = new BufferedImage(image.width * 2, image.height * 2, BufferedImage.TYPE_INT_ARGB)
-
-        def getRGB = { int ix, int iy ->
-            return image.getRGB(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0))
-        }
-
-        for(int x = 0; x < image.width; x++){
-            for(int y = 0; y < image.height; y++){
-                int p = image.getRGB(x, y)
-                int p1 = p, p2 = p, p3 = p, p4 = p
-
-                int A = getRGB(x - 1, y + 1),
-                    B = getRGB(x, y + 1),
-                    C = getRGB(x + 1, y + 1),
-                    D = getRGB(x - 1, y),
-                    E = getRGB(x, y),
-                    F = getRGB(x + 1, y),
-                    G = getRGB(x - 1, y - 1),
-                    H = getRGB(x, y - 1),
-                    I = getRGB(x + 1, y - 1),
-                    J = getRGB(x, y + 2),
-                    K = getRGB(x - 2, y),
-                    L = getRGB(x + 2, y),
-                    M = getRGB(x, y - 2)
-
-                if(B == D && B != F && D != H && (E != A || E == C || E == G || A == J || A == K)) p1 = B
-                if(B == F && B != D && F != H && (E != C || E == A || E == I || C == J || C == L)) p2 = F
-                if(D == H && B != D && F != H && (E != G || E == A || E == I || G == K || G == M)) p3 = D
-                if(F == H && B != F && D != H && (E != I || E == C || E == G || I == L || I == M)) p4 = H
-
-                scaled.setRGB(x * 2, y * 2 + 1, p1)
-                scaled.setRGB(x * 2 + 1, y * 2 + 1, p2)
-                scaled.setRGB(x * 2, y * 2, p3)
-                scaled.setRGB(x * 2 + 1, y * 2, p4)
-            }
-        }
-        image = scaled
-    }
-
-    ImageIO.write(image, "png", file)
-}
-
-def tileImage = { File file ->
-    def image = ImageIO.read(file)
-
-    for(x in 0..image.width-1){
-        for(y in 0..image.height-1){
-            if(x > (image.height - 1 - y)){
-                def rx = image.height - 1 - y
-                def ry = x
-
-                image.setRGB(x, y, image.getRGB(rx, image.height - 1 - ry))
-            }
-        }
-    }
-
-    def result = new BufferedImage(image.width * 2, image.height * 2, image.getType())
-    Graphics2D graphics = result.createGraphics()
-    graphics.drawImage(image, image.width, 0, -image.width, image.height, null)
-
-    graphics.drawImage(image, image.width, 0, image.width, image.height, null)
-
-    graphics.drawImage(image, image.width, image.height*2, -image.width, -image.height, null)
-
-    graphics.drawImage(image, image.width, image.height*2, image.width, -image.height, null)
-
-    for(int x = 0; x < result.width; x++){
-        for(int y = 0; y < result.height; y++){
-            int p = result.getRGB(x, y)
-            if(x <= y){
-                List<Color> list = colorMap.get(p)
-                int index = colorIndexMap.get(p, -1)
-
-                if(index != -1){
-                    int resultIndex = (x == y ? 1 : index == 2 ? 0 : index == 0 ? 2 : 1);
-                    result.setRGB(x, y, list[resultIndex].argb8888())
-                }
-            }
-        }
-    }
-
-    ImageIO.write(result, "png", file)
-}
-
-task swapColors(){
-    doLast{
-        if(project.hasProperty("colors")){
-            def carr = new File(getProperty("colors")).text.split("\n")
-            def map = [:]
-            def swaps = 0
-            carr.each{ str -> map[Color.valueOf(str.split("=")[0]).argb8888()] = Color.valueOf(str.split("=")[1]).argb8888() }
-            def tmpc = new Color()
-
-            fileTree(dir: '../core/assets-raw/sprites', include: "**/*.png").visit{ file ->
-                if(file.isDirectory()) return
-
-                boolean found = false
-
-                def img = ImageIO.read(file.file)
-                for(x in (0..img.getWidth() - 1)){
-                    for(y in (0..img.getHeight() - 1)){
-                        def c = img.getRGB(x, y)
-                        tmpc.argb8888(c)
-                        if(tmpc.a < 0.1f) continue
-                        if(map.containsKey(c)){
-                            img.setRGB(x, y, (int)map.get(c))
-                            found = true
-                        }
-                    }
-                }
-                if(found){
-                    swaps++
-                    ImageIO.write(img, "png", file.file)
-                }
-            }
-            println "Swapped $swaps images."
-        }else{
-            throw new InvalidUserDataException("No replacement colors specified. Use -Pcolors=\"<path to color file>\"")
-        }
-    }
-}
-
-task genPalette(){
-    doLast{
-        def total = 0
-        def size = 32
-        def outImage = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB)
-        def colorsUsed = new IntSet()
-
-        fileTree(dir: '../core/assets-raw/sprites/blocks', include: "**/*.png").visit{ file ->
-            if(file.isDirectory()) return
-
-            def img = ImageIO.read(file.file)
-            for(x in (0..img.getWidth() - 1)){
-                for(y in (0..img.getHeight() - 1)){
-                    def c = img.getRGB(x, y)
-
-                    if(Tmp.c1.argb8888(c).a > 0.999f && colorsUsed.add(c)){
-                        outImage.setRGB((int)(total / size), total % size, c)
-                        total ++
-                    }
-                }
-            }
-        }
-
-        ImageIO.write(outImage, "png", new File("palette.png"))
-        println "Found $total colors."
-
-    }
+    new Fi(file).writePng(out)
 }
 
 task antialiasImages(){
@@ -310,15 +110,6 @@ task antialiasImages(){
     }
 }
 
-task scaleImages(){
-    doLast{
-        for(def img : project.getProperty("images").split(",")){
-            println(project.getProperty("startdir") + "/" + img)
-            scaleImage(new File(project.getProperty("startdir") + "/" + img))
-        }
-    }
-}
-
 task tileImages(){
     doLast{
         for(def img : project.getProperty("images").split(",")){
@@ -359,31 +150,28 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){
             delete "../core/assets-raw/sprites_out/ui/icons"
         }
 
-        ExecutorService executor = Executors.newFixedThreadPool(16)
-        long ms = System.currentTimeMillis()
+        if(enableAA){
+            ExecutorService executor = Executors.newFixedThreadPool(OS.cores)
+            long ms = System.currentTimeMillis()
 
-        //antialias everything except UI elements
-        fileTree(dir: new File(rootDir, 'core/assets-raw/sprites_out/').absolutePath, include: "**/*.png").visit{ file ->
-            if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-")) || file.toString().contains(".9.png")) return
+            //antialias everything except UI elements
+            fileTree(dir: new File(rootDir, 'core/assets-raw/sprites_out/').absolutePath, include: "**/*.png").visit{ file ->
+                if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-")) || file.toString().contains(".9.png") || file.toString().contains("aaaa")) return
 
-            executor.submit{
-                antialias(file.file)
+                executor.submit{
+                    antialias(file.file)
+                }
             }
-        }
 
-        executor.shutdown()
-        try{
-            executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS)
-        }catch(InterruptedException e){
-            e.printStackTrace()
-        }
+            Threads.await(executor)
 
-        println "Time taken for AA: ${(System.currentTimeMillis() - ms) / 1000f}"
+            println "Time taken for AA: ${(System.currentTimeMillis() - ms) / 1000f} seconds"
+        }
 
         println("\n\nPacking normal 4096 sprites...\n\n")
 
         //pack normal sprites
-        TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/").absolutePath, "sprites.atlas")
+        TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/").absolutePath, "sprites.aatls")
 
         println("\n\nPacking fallback 2048 sprites...\n\n")
 
@@ -392,47 +180,181 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){
             if(!file.isDirectory()) file.file.text = file.file.text.replace("4096", "2048")
         }
 
-        //pack fallback 2048x2048 sprites
-        TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/fallback/").absolutePath, "sprites.atlas")
+        //pack fallback 2048x2048 sprites - disabled when debugging
+        if(!project.hasProperty("args")){
+            TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/fallback/").absolutePath, "sprites.aatls")
+        }
     }
 }
 
 task genSprites(dependsOn: classes, type: JavaExec){
     finalizedBy 'antialiasGen'
 
-    main = "mindustry.tools.ImagePacker"
+    mainClass = "mindustry.tools.ImagePacker"
     classpath = sourceSets.main.runtimeClasspath
-    jvmArgs("-Djava.awt.headless=true")
     standardInput = System.in
     workingDir = genFolder
 }
 
-task updateBundles(dependsOn: classes, type: JavaExec){
-    file(genFolder).mkdirs()
-
-    main = "mindustry.tools.BundleLauncher"
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = "../core/assets/bundles/"
-}
-
 task fontgen(dependsOn: classes, type: JavaExec){
-    main = "mindustry.tools.FontGenerator"
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = "../"
+    /* icon font pipeline:
+     1. take set of pre-defined icons and SVGs
+     2. use Fontello API to get a font with these
+     3. combine fontello font and standard font, get output font
+     4. use json to generate a file with constants for every icon size+type (during annotation processing)
+     */
+    doLast{
+        Fi folder = Fi.get("core/assets-raw/fontgen/out/")
+        folder.mkdirs()
+
+        Log.info("Session...")
+
+        OS.exec("curl", "--fail", "--output", "core/assets-raw/fontgen/out/session", "--form", "config=@core/assets-raw/fontgen/config.json", "https://fontello.com")
+
+        Log.info("Zip...")
+
+        String session = folder.child("session").readString()
+
+        Http.get("https://fontello.com/" + session + "/get").block(result -> {
+            Streams.copy(result.getResultAsStream(), folder.child("font.zip").write())
+        })
+
+        Log.info("Icon font...")
+
+        ZipFi zip = new ZipFi(folder.child("font.zip"))
+        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"))
+
+        Log.info("Merge...")
+
+        //TODO this is broken
+
+        Log.info(OS.exec("fontforge", "-script",
+            Fi.get("core/assets-raw/fontgen/merge.pe").absolutePath(),
+            Fi.get("core/assets/fonts/font.woff").absolutePath(),
+            Fi.get("core/assets-raw/fontgen/out/font.woff").absolutePath())
+        )
+
+        Log.info("Done.")
+    }
 }
 
 task icongen(dependsOn: classes, type: JavaExec){
-    main = "mindustry.tools.IconConverter"
+    mainClass = "mindustry.tools.IconConverter"
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = "../core/assets-raw"
 }
 
 task updateScripts(dependsOn: classes, type: JavaExec){
-    main = "mindustry.tools.ScriptMainGenerator"
+    mainClass = "mindustry.tools.ScriptMainGenerator"
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = "../"
+}
+
+task updateBundles{
+    doLast{
+        def uniEscape = { String string ->
+            StringBuilder outBuffer = new StringBuilder()
+            int len = string.length()
+            for(int i = 0; i < len; i++){
+                char ch = string.charAt(i)
+                if((ch > 61) && (ch < 127)){
+                    outBuffer.append(ch == (char)'\\' ? "\\\\" : ch)
+                    continue
+                }
+
+                if(ch >= 0xE000 && ch <= 0xF8FF){
+                    String hex = Integer.toHexString((int)ch)
+                    outBuffer.append("\\u")
+                    for(int j = 0; j < 4 - hex.length(); j++){
+                        outBuffer.append('0')
+                    }
+                    outBuffer.append(hex)
+                }else{
+                    outBuffer.append(ch)
+                }
+            }
+
+            return outBuffer.toString()
+        }
+
+        OrderedMap<String, String> base = new OrderedMap<>()
+        PropertiesUtils.load(base, Fi.get("core/assets/bundles/bundle.properties").reader())
+        Seq<String> removals = new Seq<>()
+
+        Log.info("Updating bundles...")
+
+        Fi.get("core/assets/bundles").walk(child -> {
+            if(child.name().equals("bundle.properties") || child.toString().contains("output")) return
+
+            Log.info("| @", child.nameWithoutExtension())
+
+            OrderedMap<String, String> other = new OrderedMap<>()
+
+            //find the last known comment of each line
+            ObjectMap<String, String> comments = new ObjectMap<>()
+            StringBuilder curComment = new StringBuilder()
+
+            for(String line : Seq.with(child.readString().split("\n", -1))){
+                if(line.startsWith("#") || line.isEmpty()){
+                    curComment.append(line).append("\n")
+                }else if(line.contains("=")){
+                    String lastKey = line.substring(0, line.indexOf("=")).trim()
+                    if(curComment.length() != 0){
+                        comments.put(lastKey, curComment.toString())
+                        curComment.setLength(0)
+                    }
+                }
+            }
+
+            ObjectMap<String, String> extras = new OrderedMap<>()
+            PropertiesUtils.load(other, child.reader())
+            removals.clear()
+
+            for(String key : other.orderedKeys()){
+                if(!base.containsKey(key) && key.contains(".details") && false){
+                    extras.put(key, other.get(key))
+                }else if(!base.containsKey(key)){
+                    removals.add(key)
+                    Log.info("&lr- Removing unused key '@'...", key)
+                }
+            }
+            if(removals.size > 0) Log.info("&lr@ keys removed.", removals.size)
+            for(String s : removals){
+                other.remove(s)
+            }
+
+            int added = 0
+
+            for(String key : base.orderedKeys()){
+                if(other.get(key) == null || other.get(key).trim().isEmpty()){
+                    other.put(key, base.get(key))
+                    added++
+                    Log.info("&lc- Adding missing key '@'...", key)
+                }
+            }
+
+            Func2<String, String, String> processor = (key, value) ->
+                    (comments.containsKey(key) ? comments.get(key) : "") + //append last known comment if present
+                            (key + " =" + (value.trim().isEmpty() ? "" : " ") + uniEscape(value)).replace("\n", "\\n") + "\n"
+            Fi output = child.sibling("output/" + child.name())
+
+            if(added > 0) Log.info("&lc@ keys added.", added)
+            if(removals.size + added > 0) Log.info("Writing bundle to @", output)
+            StringBuilder result = new StringBuilder()
+
+            //add everything ordered
+            for(String key : base.orderedKeys().copy().add(extras.keys().toSeq())){
+                if(other.get(key) == null) continue
+
+                result.append(processor.get(key, other.get(key)))
+                other.remove(key)
+            }
+
+            child.writeString(result.toString())
+        })
+    }
 }
\ No newline at end of file
diff --git a/tools/src/mindustry/tools/BundleLauncher.java b/tools/src/mindustry/tools/BundleLauncher.java
deleted file mode 100644
index fe1484175a..0000000000
--- a/tools/src/mindustry/tools/BundleLauncher.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package mindustry.tools;
-
-import arc.files.*;
-import arc.func.*;
-import arc.struct.*;
-import arc.util.*;
-import arc.util.io.*;
-
-public class BundleLauncher{
-
-    public static void main(String[] args){
-        OrderedMap<String, String> base = new OrderedMap<>();
-        PropertiesUtils.load(base, Fi.get("bundle.properties").reader());
-        Seq<String> removals = new Seq<>();
-        String str = Fi.get("bundle.properties").readString();
-        ObjectSet<String> newlines = Seq.with(str.split("\n")).select(l -> l.contains(" = ") && str.indexOf(l) + l.length() < str.length() - 2 && str.charAt(str.indexOf(l) + l.length() + 1) == '\n').map(l -> l.split(" = ")[0]).asSet();
-        Fi.get(".").walk(child -> {
-            if(child.name().equals("bundle.properties") || child.toString().contains("output")) return;
-
-            Log.info("Parsing bundle: @", child);
-
-            OrderedMap<String, String> other = new OrderedMap<>();
-            PropertiesUtils.load(other, child.reader(2048, "UTF-8"));
-            removals.clear();
-
-            for(String key : other.orderedKeys()){
-                if(!base.containsKey(key)){
-                    removals.add(key);
-                    Log.info("&lr- Removing unused key '@'...", key);
-                }
-            }
-            Log.info("&lr@ keys removed.", removals.size);
-            for(String s : removals){
-                other.remove(s);
-            }
-
-            int added = 0;
-
-            for(String key : base.orderedKeys()){
-                if(!other.containsKey(key) || other.get(key).trim().isEmpty()){
-                    other.put(key, base.get(key));
-                    added++;
-                    Log.info("&lc- Adding missing key '@'...", key);
-                }
-            }
-
-            Func2<String, String, String> processor = (key, value) -> (key + " = " + value).replace("\\", "\\\\").replace("\n", "\\n") + "\n" + (newlines.contains(key) ? "\n" : "");
-            Fi output = child.sibling("output/" + child.name());
-
-            Log.info("&lc@ keys added.", added);
-            Log.info("Writing bundle to @", output);
-            StringBuilder result = new StringBuilder();
-
-            //add everything ordered
-            for(String key : base.orderedKeys()){
-                result.append(processor.get(key, other.get(key)));
-                other.remove(key);
-            }
-
-            child.writeString(result.toString());
-        });
-    }
-
-}
diff --git a/tools/src/mindustry/tools/Edgifier.java b/tools/src/mindustry/tools/Edgifier.java
deleted file mode 100644
index f83694d13a..0000000000
--- a/tools/src/mindustry/tools/Edgifier.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package mindustry.tools;
-
-import arc.files.*;
-import arc.graphics.*;
-import arc.struct.*;
-import arc.util.*;
-
-public class Edgifier{
-
-    public static void main(String[] args){
-        ArcNativesLoader.load();
-
-        Pixmap pixmap = new Pixmap(Fi.get("/home/anuke/Projects/Mindustry/core/assets-raw/sprites/units/reaper.png"));
-
-        Fi.get("/home/anuke/out.png").writePNG(edgify(pixmap, 5));
-    }
-
-    private static Pixmap edgify(Pixmap in, int chunk){
-        Pixmap out = new Pixmap(in.getWidth(), in.getHeight());
-        IntSeq side1 = new IntSeq(), side2 = new IntSeq();
-
-        for(int x = 0; x < in.getWidth(); x += chunk){
-            for(int y = 0; y < in.getHeight(); y += chunk){
-                int bestErrors = Integer.MAX_VALUE;
-                int bestRotation = 0;
-                int bestSide1 = 0, bestSide2 = 0;
-
-                for(int rotation = 0; rotation < 8; rotation++){
-                    side1.clear();
-                    side2.clear();
-
-                    //assign pixels present on each side
-                    for(int cx = 0; cx < chunk; cx++){
-                        for(int cy = 0; cy < chunk; cy++){
-                            boolean side = classify(rotation, cx, cy, chunk);
-
-                            int pixel = in.getPixel(x + cx, y + cy);
-                            if(Pixmaps.empty(pixel)) pixel = 0; //all alpha=0 pixels are treated as 0
-
-                            (side ? side1 : side2).add(pixel);
-                        }
-                    }
-
-                    //find most popular element here
-                    int mode1 = side1.mode(), mode2 = side2.mode();
-                    //total errors; 'incorrect' pixels
-                    int errors = (side1.size - side1.count(mode1)) + (side2.size - side2.count(mode2));
-
-                    //Log.info("errors for rotation={0}: {1}", rotation, errors);
-
-                    //update if better
-                    if(errors < bestErrors){
-                        bestRotation = rotation;
-                        bestSide1 = mode1;
-                        bestSide2 = mode2;
-                        bestErrors = errors;
-                    }
-                }
-
-                //Log.info("Best result for {0},{1}: rotation={2} 1={3} 2={4} errors={5}", x, y, bestRotation, bestSide1, bestSide2, bestErrors);
-
-                //draw with the best result
-                for(int cx = 0; cx < chunk; cx++){
-                    for(int cy = 0; cy < chunk; cy++){
-                        boolean side = classify(bestRotation, cx, cy, chunk);
-                        out.draw(x + cx, y + cy, side ? bestSide1 : bestSide2);
-                    }
-                }
-            }
-        }
-
-        return out;
-    }
-
-    private static boolean classify(int rotation, int x, int y, int chunk){
-        switch(rotation){
-            case 0: //return y >= chunk / 2;
-            case 1: return y < x;
-            case 2: //return x <= chunk / 2;
-            case 3: return (chunk - 1 - y) < x;
-            case 4: //return (y > chunk / 2);
-            case 5: return (y <= x);
-            case 6: //return (x < chunk / 2);
-            case 7: return ((chunk - 1 - y) <= x);
-            default: throw new IllegalArgumentException("Invalid rotation: " + rotation);
-        }
-    }
-}
diff --git a/tools/src/mindustry/tools/FontGenerator.java b/tools/src/mindustry/tools/FontGenerator.java
deleted file mode 100644
index 1c1ef50013..0000000000
--- a/tools/src/mindustry/tools/FontGenerator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package mindustry.tools;
-
-import arc.*;
-import arc.files.*;
-import arc.util.*;
-import arc.util.io.*;
-
-import java.io.*;
-
-/* icon font pipeline:
- 1. take set of pre-defined icons and SVGs
- 2. use Fontello API to get a font with these
- 3. combine fontello font and standard font, get output font
- 4. use json to generate a file with constants for every icon size+type (during annotation processing)
- */
-public class FontGenerator{
-
-    //E000 to F8FF
-    public static void main(String[] args){
-        Net net = Core.net = new Net();
-        net.setBlock(true);
-        Fi folder = Fi.get("core/assets-raw/fontgen/out/");
-        folder.mkdirs();
-
-        Log.info("Session...");
-
-        OS.exec("curl", "--fail", "--output", "core/assets-raw/fontgen/out/session", "--form", "config=@core/assets-raw/fontgen/config.json", "https://fontello.com");
-
-        Log.info("Zip...");
-
-        String session = folder.child("session").readString();
-        net.httpGet("https://fontello.com/" + session + "/get", result -> {
-            try{
-                Streams.copy(result.getResultAsStream(), folder.child("font.zip").write());
-            }catch(IOException e){
-                throw new RuntimeException(e);
-            }
-        }, Log::err);
-
-        Log.info("Icon font...");
-
-        ZipFi zip = new ZipFi(folder.child("font.zip"));
-        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"));
-
-        Log.info("Merge...");
-
-        //TODO this is broken
-
-        Log.info(OS.exec("fontforge", "-script",
-            Fi.get("core/assets-raw/fontgen/merge.pe").absolutePath(),
-            Fi.get("core/assets/fonts/font.woff").absolutePath(),
-            Fi.get("core/assets-raw/fontgen/out/font.woff").absolutePath())
-        );
-
-        Log.info("Done.");
-    }
-}
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index 1350a0ff24..108784fe47 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -14,48 +14,61 @@ import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.tools.ImagePacker.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.legacy.*;
-import mindustry.world.meta.*;
+
+import java.util.concurrent.*;
 
 import static mindustry.Vars.*;
+import static mindustry.tools.ImagePacker.*;
 
 public class Generators{
-    //used for changing colors in the UI - testing only
-    static final IntIntMap paletteMap = IntIntMap.with(
-    //empty for now
-    0x454545ff, 0x00000000,//0x32394bff,
-    0x00000099, 0x00000000//0x000000ff
-    );
-    static final Cicon logicIcon = Cicon.medium;
+    static final int maxUiIcon = 128;
 
-    public static void generate(){
-        ObjectMap<Block, Image> gens = new ObjectMap<>();
+    private static float fluid(boolean gas, double x, double y, float frame){
+        int keyframes = gas ? 4 : 3;
 
-        if(!paletteMap.isEmpty()){
-            ImagePacker.generate("uipalette", () -> {
-                Fi.get("../ui").walk(fi -> {
-                    if(!fi.extEquals("png")) return;
+        //interpolate between the current two keyframes
+        int curFrame = (int)(frame * keyframes);
+        int nextFrame = (curFrame + 1) % keyframes;
+        float progress = (frame * keyframes) % 1f;
 
-                    Pixmap pix = new Pixmap(fi);
-                    pix.setBlending(Pixmap.Blending.sourceOver);
-                    pix.each((x, y) -> {
-                        int value = pix.getPixel(x, y);
-                        pix.draw(x, y, paletteMap.get(value, value));
-                    });
-
-                    fi.writePNG(pix);
-                });
-            });
+        if(gas){
+            float min = 0.56f;
+            float interpolated = Mathf.lerp((float)gasFrame(x, y, curFrame), (float)gasFrame(x, y, nextFrame), progress);
+            return min + (1f - min) * interpolated;
+        }else{ //liquids
+            float min = 0.84f;
+            double rx = (x + frame*32) % 32, ry = (y + frame*32) % 32;
+            float interpolated = (float)liquidFrame(rx, ry, 2);
+            //only two colors here
+            return min + (interpolated >= 0.3f ? 1f - min : 0f);
         }
+    }
 
-        ImagePacker.generate("splashes", () -> {
-            ArcNativesLoader.load();
+    private static double gasFrame(double x, double y, int frame){
+        int s = 31;
+        //calculate random space offsets for the frame cutout
+        double ox = Mathf.randomSeed(frame, 200_000), oy = Mathf.randomSeed(frame, 200_000);
+        double scale = 21, second = 0.3;
+        return (Simplex.rawTiled(x, y, ox, oy, s, s, scale) + Simplex.rawTiled(x, y, ox, oy, s, s, scale / 1.5) * second) / (1.0 + second);
+    }
+
+    private static double liquidFrame(double x, double y, int frame){
+        int s = 31;
+        //calculate random space offsets for the frame cutout
+        double ox = Mathf.randomSeed(frame, 1), oy = Mathf.randomSeed(frame, 1);
+        double scale = 26, second = 0.5;
+        return (Simplex.rawTiled(x, y, ox, oy, s, s, scale) + Simplex.rawTiled(x, y, ox, oy, s, s, scale / 1.5) * second) / (1.0 + second);
+    }
+
+    public static void run(){
+        ObjectMap<Block, Pixmap> gens = new ObjectMap<>();
+
+        generate("splashes", () -> {
 
             int frames = 12;
             int size = 32;
@@ -67,111 +80,176 @@ public class Generators{
 
                 Pixmap pixmap = new Pixmap(size, size);
 
-                pixmap.each((x, y) -> {
-                    float dst = Mathf.dst(x, y, size/2f, size/2f);
-                    if(Math.abs(dst - radius) <= stroke){
-                        pixmap.draw(x, y, Color.white);
+                for(int x = 0; x < pixmap.width; x++){
+                    for(int y = 0; y < pixmap.height; y++){
+                        float dst = Mathf.dst(x, y, size/2f, size/2f);
+                        if(Math.abs(dst - radius) <= stroke){
+                            pixmap.set(x, y, Color.white);
+                        }
                     }
-                });
+                }
 
-                Fi.get("splash-" + i + ".png").writePNG(pixmap);
+                Fi.get("splash-" + i + ".png").writePng(pixmap);
 
                 pixmap.dispose();
             }
         });
 
-        ImagePacker.generate("cliffs", () -> {
-            int size = 64;
-            Color dark = new Color(0.5f, 0.5f, 0.6f, 1f).mul(0.98f);
-            Color mid = Color.lightGray;
+        generate("bubbles", () -> {
 
-            Image[] images = new Image[8];
+            int frames = 16;
+            int size = 40;
+            for(int i = 0; i < frames; i++){
+                float fin = (float)i / (frames);
+                float fout = 1f - fin;
+                float stroke = 3.5f * fout;
+                float radius = (size/2f) * fin;
+                float shinelen = radius / 2.5f, shinerad = stroke*1.5f + 0.3f;
+                float shinex = size/2f + shinelen / Mathf.sqrt2, shiney = size/2f - shinelen / Mathf.sqrt2;
+
+                Pixmap pixmap = new Pixmap(size, size);
+
+                pixmap.each((x, y) -> {
+                    float dst = Mathf.dst(x, y, size/2f, size/2f);
+                    if(Math.abs(dst - radius) <= stroke || Mathf.within(x, y, shinex, shiney, shinerad)){
+                        pixmap.set(x, y, Color.white);
+                    }
+                });
+
+                Fi.get("bubble-" + i + ".png").writePng(pixmap);
+
+                pixmap.dispose();
+            }
+        });
+
+        generate("gas-frames", () -> {
+            int frames = Liquid.animationFrames;
+            String[] stencils = {"fluid"};
+            String[] types = {"liquid", "gas"};
+            int typeIndex = 0;
+
+            for(String type : types){
+                boolean gas = typeIndex++ == 1;
+                for(String region : stencils){
+                    Pixmap base = get(region);
+
+                    for(int i = 0; i < frames; i++){
+                        float frame = i / (float)frames;
+
+                        Pixmap copy = base.copy();
+                        for(int x = 0; x < copy.width; x++){
+                            for(int y = 0; y < copy.height; y++){
+                                if(copy.getA(x, y) > 128){
+                                    copy.setRaw(x, y, Color.rgba8888(1f, 1f, 1f, fluid(gas, x, y, frame)));
+                                }
+                            }
+                        }
+                        save(copy, region + "-" + type + "-" + i);
+                    }
+                }
+            }
+        });
+
+        generate("cliffs", () -> {
+            ExecutorService exec = Executors.newFixedThreadPool(OS.cores);
+            int size = 64;
+            int dark = new Color(0.5f, 0.5f, 0.6f, 1f).mul(0.98f).rgba();
+            int mid = Color.lightGray.rgba();
+
+            Pixmap[] images = new Pixmap[8];
             for(int i = 0; i < 8; i++){
-                images[i] = ImagePacker.get("cliff" + i);
+                images[i] = new Pixmap(((GenRegion)Core.atlas.find("cliff" + i)).path);
             }
 
             for(int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++){
-                Image result = new Image(size, size);
-                byte[][] mask = new byte[size][size];
+                int bi = i;
+                exec.execute(() -> {
+                    Color color = new Color();
+                    Pixmap result = new Pixmap(size, size);
+                    byte[][] mask = new byte[size][size];
 
-                byte val = (byte)i;
-                //check each bit/direction
-                for(int j = 0; j < 8; j++){
-                    if((val & (1 << j)) != 0){
-                        if(j % 2 == 1 && (((val & (1 << (j + 1))) != 0) != ((val & (1 << (j - 1))) != 0))){
-                            continue;
-                        }
-
-                        Image image = images[j];
-                        image.each((x, y) -> {
-                            Color color = image.getColor(x, y);
-                            if(color.a > 0.1){
-                                //white -> bit 1 -> top
-                                //black -> bit 2 -> bottom
-                                mask[x][y] |= (color.r > 0.5f ? 1 : 2);
+                    byte val = (byte)bi;
+                    //check each bit/direction
+                    for(int j = 0; j < 8; j++){
+                        if((val & (1 << j)) != 0){
+                            if(j % 2 == 1 && (((val & (1 << (j + 1))) != 0) != ((val & (1 << (j - 1))) != 0))){
+                                continue;
                             }
-                        });
-                    }
-                }
 
-                result.each((x, y) -> {
-                    byte m = mask[x][y];
-                    if(m != 0){
-                        //mid
-                        if(m == 3){
-                            //find nearest non-mid color
-                            byte best = 0;
-                            float bestDst = 0;
-                            boolean found = false;
-                            //expand search range until found
-                            for(int rad = 9; rad < 64; rad += 7){
-                                for(int cx = Math.max(x - rad, 0); cx <= Math.min(x + rad, size - 1); cx++){
-                                    for(int cy = Math.max(y - rad, 0); cy <= Math.min(y + rad, size - 1); cy++){
-                                        byte nval = mask[cx][cy];
-                                        if(nval == 1 || nval == 2){
-                                            float dst2 = Mathf.dst2(cx, cy, x, y);
-                                            if(dst2 <= rad * rad && (!found || dst2 < bestDst)){
-                                                best = nval;
-                                                bestDst = dst2;
-                                                found = true;
+                            Pixmap image = images[j];
+                            image.each((x, y) -> {
+                                color.set(image.getRaw(x, y));
+                                if(color.a > 0.1){
+                                    //white -> bit 1 -> top
+                                    //black -> bit 2 -> bottom
+                                    mask[x][y] |= (color.r > 0.5f ? 1 : 2);
+                                }
+                            });
+                        }
+                    }
+
+                    result.each((x, y) -> {
+                        byte m = mask[x][y];
+                        if(m != 0){
+                            //mid
+                            if(m == 3){
+                                //find nearest non-mid color
+                                byte best = 0;
+                                float bestDst = 0;
+                                boolean found = false;
+                                //expand search range until found
+                                for(int rad = 9; rad < 64; rad += 7){
+                                    for(int cx = Math.max(x - rad, 0); cx <= Math.min(x + rad, size - 1); cx++){
+                                        for(int cy = Math.max(y - rad, 0); cy <= Math.min(y + rad, size - 1); cy++){
+                                            byte nval = mask[cx][cy];
+                                            if(nval == 1 || nval == 2){
+                                                float dst2 = Mathf.dst2(cx, cy, x, y);
+                                                if(dst2 <= rad * rad && (!found || dst2 < bestDst)){
+                                                    best = nval;
+                                                    bestDst = dst2;
+                                                    found = true;
+                                                }
                                             }
                                         }
                                     }
                                 }
+
+                                if(found){
+                                    m = best;
+                                }
                             }
 
-                            if(found){
-                                m = best;
-                            }
+                            result.setRaw(x, y, m == 1 ? Color.whiteRgba : m == 2 ? dark : mid);
                         }
+                    });
 
-                        result.draw(x, y, m == 1 ? Color.white : m == 2 ? dark : mid);
-                    }
+                    Fi fi = Fi.get("../blocks/environment/cliffmask" + (val & 0xff) + ".png");
+                    fi.writePng(result);
+                    fi.copyTo(Fi.get("../editor").child("editor-" + fi.name()));
                 });
-
-                result.save("../blocks/environment/cliffmask" + (val & 0xff));
             }
+
+            Threads.await(exec);
         });
 
-        ImagePacker.generate("cracks", () -> {
-            RidgedPerlin r = new RidgedPerlin(1, 3);
+        generate("cracks", () -> {
             for(int size = 1; size <= BlockRenderer.maxCrackSize; size++){
                 int dim = size * 32;
                 int steps = BlockRenderer.crackRegions;
                 for(int i = 0; i < steps; i++){
                     float fract = i / (float)steps;
 
-                    Image image = new Image(dim, dim);
+                    Pixmap image = new Pixmap(dim, dim);
                     for(int x = 0; x < dim; x++){
                         for(int y = 0; y < dim; y++){
                             float dst = Mathf.dst((float)x/dim, (float)y/dim, 0.5f, 0.5f) * 2f;
-                            if(dst < 1.2f && r.getValue(x, y, 1f / 40f) - dst*(1f-fract) > 0.16f){
-                                image.draw(x, y, Color.white);
+                            if(dst < 1.2f && Ridged.noise2d(1, x, y, 3, 1f / 40f) - dst*(1f-fract) > 0.16f){
+                                image.setRaw(x, y, Color.whiteRgba);
                             }
                         }
                     }
 
-                    Image output = new Image(image.width, image.height);
+                    Pixmap output = new Pixmap(image.width, image.height);
                     int rad = 3;
 
                     //median filter
@@ -181,34 +259,35 @@ public class Generators{
                             for(int cx = -rad; cx < rad; cx++){
                                 for(int cy = -rad; cy < rad; cy++){
                                     int wx = Mathf.clamp(cx + x, 0, output.width - 1), wy = Mathf.clamp(cy + y, 0, output.height - 1);
-                                    Color color = image.getColor(wx, wy);
-                                    if(color.a > 0.5f){
+                                    int color = image.getRaw(wx, wy);
+                                    if((color & 0xff) > 127){
                                         whites ++;
                                     }else{
                                         clears ++;
                                     }
                                 }
                             }
-                            output.draw(x, y, whites >= clears ? Color.white : Color.clear);
+                            output.setRaw(x, y, whites >= clears ? Color.whiteRgba : Color.clearRgba);
                         }
                     }
 
-                    output.save("cracks-" + size + "-" + i);
+                    Fi.get("../rubble/cracks-" + size + "-" + i + ".png").writePng(output);
                 }
             }
         });
 
-        ImagePacker.generate("block-icons", () -> {
-            Image colors = new Image(content.blocks().size, 1);
+        generate("block-icons", () -> {
+            Pixmap colors = new Pixmap(content.blocks().size, 1);
 
             for(Block block : content.blocks()){
                 if(block.isAir() || block instanceof ConstructBlock || block instanceof OreBlock || block instanceof LegacyBlock) continue;
 
-                block.load();
+                Seq<TextureRegion> toOutline = new Seq<>();
+                block.getRegionsToOutline(toOutline);
 
                 TextureRegion[] regions = block.getGeneratedIcons();
 
-                if(block instanceof Floor){
+                if(block.variants > 0 || block instanceof Floor){
                     for(TextureRegion region : block.variantRegions()){
                         GenRegion gen = (GenRegion)region;
                         if(gen.path == null) continue;
@@ -216,20 +295,25 @@ public class Generators{
                     }
                 }
 
-                Image shardTeamTop = null;
+                for(TextureRegion region : block.makeIconRegions()){
+                    GenRegion gen = (GenRegion)region;
+                    save(get(region).outline(block.outlineColor, block.outlineRadius), gen.name + "-outline");
+                }
+
+                Pixmap shardTeamTop = null;
 
                 if(block.teamRegion.found()){
-                    Image teamr = ImagePacker.get(block.teamRegion);
+                    Pixmap teamr = get(block.teamRegion);
 
                     for(Team team : Team.all){
                         if(team.hasPalette){
-                            Image out = new Image(teamr.width, teamr.height);
+                            Pixmap out = new Pixmap(teamr.width, teamr.height);
                             teamr.each((x, y) -> {
-                                int color = teamr.getColor(x, y).rgba8888();
+                                int color = teamr.getRaw(x, y);
                                 int index = color == 0xffffffff ? 0 : color == 0xdcc6c6ff ? 1 : color == 0x9d7f7fff ? 2 : -1;
-                                out.draw(x, y, index == -1 ? teamr.getColor(x, y) : team.palette[index]);
+                                out.setRaw(x, y, index == -1 ? teamr.getRaw(x, y) : team.palettei[index]);
                             });
-                            out.save(block.name + "-team-" + team.name);
+                            save(out, block.name + "-team-" + team.name);
 
                             if(team == Team.sharded){
                                 shardTeamTop = out;
@@ -238,84 +322,75 @@ public class Generators{
                     }
                 }
 
+                for(TextureRegion region : toOutline){
+                    Pixmap pix = get(region).outline(block.outlineColor, block.outlineRadius);
+                    save(pix, ((GenRegion)region).name + "-outline");
+                }
+
                 if(regions.length == 0){
                     continue;
                 }
 
                 try{
-                    Image last = null;
+                    Pixmap last = null;
                     if(block.outlineIcon){
-                        int radius = 4;
-                        GenRegion region = (GenRegion)regions[regions.length - 1];
-                        Image base = ImagePacker.get(region);
-                        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++){
+                        GenRegion region = (GenRegion)regions[block.outlinedIcon >= 0 ? block.outlinedIcon : regions.length -1];
+                        Pixmap base = get(region);
+                        Pixmap out = last = base.outline(block.outlineColor, block.outlineRadius);
 
-                                Color color = base.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 && base.getColor(rx + x, ry + y).a > 0.01f){
-                                                found = true;
-                                                break outer;
-                                            }
-                                        }
-                                    }
-                                    if(found){
-                                        out.draw(x, y, block.outlineColor);
-                                    }
-                                }
+                        //do not run for legacy ones
+                        if(block.outlinedIcon >= 0){
+                            //prevents the regions above from being ignored/invisible/etc
+                            for(int i = block.outlinedIcon + 1; i < regions.length; i++){
+                                out.draw(get(regions[i]), true);
                             }
                         }
 
                         region.path.delete();
 
-                        out.save(block.name);
+                        //1 pixel of padding to prevent edges with linear filtering
+                        int padding = 1;
+                        Pixmap padded = new Pixmap(base.width + padding*2, base.height + padding*2);
+                        padded.draw(base, padding, padding);
+                        padded = padded.outline(block.outlineColor, block.outlineRadius);
+
+                        save(padded, region.name);
                     }
 
-                    Image image = ImagePacker.get(regions[0]);
+                    if(!regions[0].found()){
+                        continue;
+                    }
+
+                    Pixmap image = get(regions[0]);
 
                     int i = 0;
                     for(TextureRegion region : regions){
                         i++;
                         if(i != regions.length || last == null){
-                            image.draw(region);
+                            image.draw(get(region), true);
                         }else{
-                            image.draw(last);
+                            image.draw(last, true);
                         }
 
                         //draw shard (default team top) on top of first sprite
                         if(region == block.teamRegions[Team.sharded.id] && shardTeamTop != null){
-                            image.draw(shardTeamTop);
+                            image.draw(shardTeamTop, true);
                         }
                     }
 
                     if(!(regions.length == 1 && regions[0] == Core.atlas.find(block.name) && shardTeamTop == null)){
-                        image.save("block-" + block.name + "-full");
+                        save(image, "block-" + block.name + "-full");
                     }
 
-                    image.save("../editor/" + block.name + "-icon-editor");
-
-                    for(Cicon icon : Cicon.scaled){
-                        Image scaled = new Image(icon.size, icon.size);
-                        scaled.drawScaled(image);
-                        scaled.save("../ui/block-" + block.name + "-" + icon.name());
-
-                        if(icon == logicIcon && block.synthetic() && block.buildVisibility != BuildVisibility.hidden){
-                            image.save(block.name + "-icon-logic");
-                        }
-                    }
+                    save(image, "../editor/" + block.name + "-icon-editor");
+                    saveScaled(image, "../ui/block-" + block.name + "-ui", Math.min(image.width, maxUiIcon));
 
                     boolean hasEmpty = false;
-                    Color average = new Color();
+                    Color average = new Color(), c = 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);
+                            Color color = c.set(image.get(x, y));
                             average.r += color.r*color.a;
                             average.g += color.g*color.a;
                             average.b += color.b*color.a;
@@ -328,85 +403,173 @@ public class Generators{
 
                     average.mul(1f / asum);
 
-                    if(block instanceof Floor){
-                        average.mul(0.8f);
+                    if(block instanceof Floor && !((Floor)block).wallOre){
+                        average.mul(0.77f);
                     }else{
                         average.mul(1.1f);
                     }
                     //encode square sprite in alpha channel
                     average.a = hasEmpty ? 0.1f : 1f;
-                    colors.draw(block.id, 0, average);
+                    colors.setRaw(block.id, 0, average.rgba());
                 }catch(NullPointerException e){
                     Log.err("Block &ly'@'&lr has an null region!", block);
                 }
             }
 
-            colors.save("../../../assets/sprites/block_colors");
+            save(colors, "../../../assets/sprites/block_colors");
         });
 
-        ImagePacker.generate("shallows", () -> {
+        generate("shallows", () -> {
             content.blocks().<ShallowLiquid>each(b -> b instanceof ShallowLiquid, floor -> {
-                Image overlay = ImagePacker.get(floor.liquidBase.region);
+                Pixmap overlay = get(floor.liquidBase.region);
                 int index = 0;
                 for(TextureRegion region : floor.floorBase.variantRegions()){
-                    Image res = new Image(32, 32);
-                    res.draw(ImagePacker.get(region));
+                    Pixmap res = get(region).copy();
                     for(int x = 0; x < res.width; x++){
                         for(int y = 0; y < res.height; y++){
-                            Color color = overlay.getColor(x, y).a(floor.liquidOpacity);
-                            res.draw(x, y, color);
+                            res.set(x, y, Pixmap.blend((overlay.getRaw(x, y) & 0xffffff00) | (int)(floor.liquidOpacity * 255), res.getRaw(x, y)));
                         }
                     }
 
                     String name = floor.name + "" + (++index);
-                    res.save("../blocks/environment/" + name);
-                    res.save("../editor/editor-" + name);
+                    save(res, "../blocks/environment/" + name);
+                    save(res, "../editor/editor-" + name);
 
                     gens.put(floor, res);
                 }
             });
         });
 
-        ImagePacker.generate("item-icons", () -> {
-            for(UnlockableContent item : Seq.<UnlockableContent>withArrays(content.items(), content.liquids())){
-                Image base = ImagePacker.get(item.getContentType().name() + "-" + item.name);
-                for(Cicon icon : Cicon.scaled){
-                    //if(icon.size == base.width) continue;
-                    Image image = new Image(icon.size, icon.size);
-                    image.drawScaled(base);
-                    image.save(item.getContentType().name() + "-" + item.name + "-" + icon.name(), false);
+        generate("item-icons", () -> {
+            for(UnlockableContent item : Seq.<UnlockableContent>withArrays(content.items(), content.liquids(), content.statusEffects())){
+                if(item instanceof StatusEffect && !has(item.getContentType().name() + "-" + item.name)){
+                    continue;
+                }
 
-                    if(icon == Cicon.medium){
-                        image.save("../ui/" + item.getContentType() + "-" + item.name + "-icon");
-                    }
+                Pixmap base = get(item.getContentType().name() + "-" + item.name);
+                //tint status effect icon color
+                if(item instanceof StatusEffect){
+                    StatusEffect stat = (StatusEffect)item;
+                    Pixmap tint = base;
+                    base.each((x, y) -> tint.setRaw(x, y, Color.muli(tint.getRaw(x, y), stat.color.rgba())));
 
-                    if(icon == logicIcon){
-                        image.save(item.name + "-icon-logic");
+                    //outline the image
+                    Pixmap container = new Pixmap(tint.width + 6, tint.height + 6);
+                    container.draw(base, 3, 3, true);
+                    base = container.outline(Pal.gray, 3);
+                }
+
+                save(base, "../ui/" + item.getContentType().name() + "-" + item.name + "-ui");
+            }
+        });
+
+        generate("team-icons", () -> {
+            for(Team team : Team.all){
+                if(has("team-" + team.name)){
+                    int rgba = team == Team.derelict ? Color.valueOf("b7b8c9").rgba() : team.color.rgba();
+                    Pixmap base = get("team-" + team.name);
+                    base.each((x, y) -> base.setRaw(x, y, Color.muli(base.getRaw(x, y), rgba)));
+
+                    delete("team-" + team.name);
+                    save(base.outline(Pal.gray, 3), "../ui/team-" + team.name);
+                }
+            }
+        });
+
+        MultiPacker packer = new MultiPacker(){
+            @Override
+            public void add(PageType type, String name, PixmapRegion region, int[] splits, int[] pads){
+                String prefix = type == PageType.main ? "" : "../" + type.name() + "/";
+                Log.info("@ | @x@", prefix + name, region.width, region.height);
+                //save(region.pixmap, prefix + name);
+            }
+        };
+
+        //TODO !!!!! currently just an experiment
+
+        if(false)
+        generate("all-icons", () -> {
+            for(Seq<Content> arr : content.getContentMap()){
+                for(Content cont : arr){
+                    if(cont instanceof UnlockableContent && !(cont instanceof Planet)){
+                        UnlockableContent unlock = (UnlockableContent)cont;
+
+                        if(unlock.generateIcons){
+                            try{
+                                unlock.createIcons(packer);
+                            }catch(IllegalArgumentException e){
+                                Log.err(e);
+                                Log.err("Skip: @", unlock.name);
+                            }
+                        }
                     }
                 }
             }
         });
 
-        ImagePacker.generate("unit-icons", () -> content.units().each(type -> {
-            if(type.isHidden()) return; //hidden units don't generate
+        generate("unit-icons", () -> content.units().each(type -> {
+            if(type.internal) return; //internal hidden units don't generate
 
             ObjectSet<String> outlined = new ObjectSet<>();
 
             try{
-                type.load();
-                type.init();
+                Unit sample = type.constructor.get();
 
-                Color outc = Pal.darkerMetal;
-                Func<Image, Image> outline = i -> i.outline(3, outc);
+                Func<Pixmap, Pixmap> outline = i -> i.outline(type.outlineColor, 3);
                 Cons<TextureRegion> outliner = t -> {
                     if(t != null && t.found()){
-                        ImagePacker.replace(t, outline.get(ImagePacker.get(t)));
+                        replace(t, outline.get(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");
+                Seq<TextureRegion> toOutline = new Seq<>();
+                type.getRegionsToOutline(toOutline);
+
+                for(TextureRegion region : toOutline){
+                    Pixmap pix = get(region).outline(type.outlineColor, type.outlineRadius);
+                    save(pix, ((GenRegion)region).name + "-outline");
+                }
+
+                Seq<Weapon> weapons = type.weapons;
+                weapons.each(Weapon::load);
+                weapons.removeAll(w -> !w.region.found());
+
+                for(Weapon weapon : weapons){
+                    if(outlined.add(weapon.name) && has(weapon.name)){
+                        //only non-top weapons need separate outline sprites (this is mostly just mechs)
+                        if(!weapon.top || weapon.parts.contains(p -> p.under)){
+                            save(outline.get(get(weapon.name)), weapon.name + "-outline");
+                        }else{
+                            //replace weapon with outlined version, no use keeping standard around
+                            outliner.get(weapon.region);
+                        }
+                    }
+                }
+
+                //generate tank animation
+                if(sample instanceof Tankc){
+                    Pixmap pix = get(type.treadRegion);
+
+                    for(int r = 0; r < type.treadRects.length; r++){
+                        Rect treadRect = type.treadRects[r];
+                        //slice is always 1 pixel wide
+                        Pixmap slice = pix.crop((int)(treadRect.x + pix.width/2f), (int)(treadRect.y + pix.height/2f), 1, (int)treadRect.height);
+                        int frames = type.treadFrames;
+                        for(int i = 0; i < frames; i++){
+                            int pullOffset = type.treadPullOffset;
+                            Pixmap frame = new Pixmap(slice.width, slice.height);
+                            for(int y = 0; y < slice.height; y++){
+                                int idx = y + i;
+                                if(idx >= slice.height){
+                                    idx -= slice.height;
+                                    idx += pullOffset;
+                                    idx = Mathf.mod(idx, slice.height);
+                                }
+
+                                frame.setRaw(0, y, slice.getRaw(0, idx));
+                            }
+                            save(frame, type.name + "-treads" + r + "-" + i);
+                        }
                     }
                 }
 
@@ -414,49 +577,106 @@ public class Generators{
                 outliner.get(type.footRegion);
                 outliner.get(type.legBaseRegion);
                 outliner.get(type.baseJointRegion);
-                if(type.constructor.get() instanceof Legsc) outliner.get(type.legRegion);
+                if(sample instanceof Legsc) outliner.get(type.legRegion);
+                if(sample instanceof Tankc) outliner.get(type.treadRegion);
 
-                Image image = outline.get(ImagePacker.get(type.region));
+                Pixmap image = type.segments > 0 ? get(type.segmentRegions[0]) : outline.get(get(type.previewRegion));
 
-                image.save(type.name + "-outline");
+                Func<Weapon, Pixmap> weaponRegion = weapon -> Core.atlas.has(weapon.name + "-preview") ? get(weapon.name + "-preview") : get(weapon.region);
+                Cons2<Weapon, Pixmap> drawWeapon = (weapon, pixmap) ->
+                image.draw(weapon.flipSprite ? pixmap.flipX() : pixmap,
+                (int)(weapon.x / Draw.scl + image.width / 2f - weapon.region.width / 2f),
+                (int)(-weapon.y / Draw.scl + image.height / 2f - weapon.region.height / 2f),
+                true
+                );
 
-                //draw mech parts
-                if(type.constructor.get() instanceof Mechc){
-                    image.drawCenter(type.baseRegion);
-                    image.drawCenter(type.legRegion);
-                    image.drawCenter(type.legRegion, true, false);
-                    image.draw(type.region);
+                boolean anyUnder = false;
+
+                //draw each extra segment on top before it is saved as outline
+                if(sample instanceof Crawlc){
+                    for(int i = 0; i < type.segments; i++){
+                        //replace(type.segmentRegions[i], outline.get(get(type.segmentRegions[i])));
+                        save(outline.get(get(type.segmentRegions[i])), type.name + "-segment-outline" + i);
+
+                        if(i > 0){
+                            drawCenter(image, get(type.segmentRegions[i]));
+                        }
+                    }
+                    save(image, type.name);
                 }
 
-                //draw outlines
-                for(Weapon weapon : type.weapons){
-                    weapon.load();
+                //outline is currently never needed, although it could theoretically be necessary
+                if(type.needsBodyOutline()){
+                    save(image, type.name + "-outline");
+                }else if(type.segments == 0){
+                    replace(type.name, type.segments > 0 ? get(type.segmentRegions[0]) : outline.get(get(type.region)));
+                }
 
-                    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);
+                //draw weapons that are under the base
+                for(Weapon weapon : weapons.select(w -> w.layerOffset < 0)){
+                    drawWeapon.get(weapon, outline.get(weaponRegion.get(weapon)));
+                    anyUnder = true;
+                }
+
+                //draw over the weapons under the image
+                if(anyUnder){
+                    image.draw(outline.get(get(type.previewRegion)), true);
+                }
+
+                //draw treads
+                if(sample instanceof Tankc){
+                    Pixmap treads = outline.get(get(type.treadRegion));
+                    image.draw(treads, image.width / 2 - treads.width / 2, image.height / 2 - treads.height / 2, true);
+                    image.draw(get(type.previewRegion), true);
+                }
+
+                //draw mech parts
+                if(sample instanceof Mechc){
+                    drawCenter(image, get(type.baseRegion));
+                    drawCenter(image, get(type.legRegion));
+                    drawCenter(image, get(type.legRegion).flipX());
+                    image.draw(get(type.previewRegion), true);
+                }
+
+                //draw weapon outlines on base
+                for(Weapon weapon : weapons){
+                    //skip weapons under unit
+                    if(weapon.layerOffset < 0) continue;
+
+                    drawWeapon.get(weapon, outline.get(weaponRegion.get(weapon)));
                 }
 
                 //draw base region on top to mask weapons
-                image.draw(type.region);
+                if(type.drawCell) image.draw(get(type.previewRegion), true);
 
-                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"))));
+                if(type.drawCell){
+                    Pixmap baseCell = get(type.cellRegion);
+                    Pixmap cell = baseCell.copy();
 
-                image.draw(cell, image.width / 2 - cell.width / 2, image.height / 2 - cell.height / 2);
+                    //replace with 0xffd37fff : 0xdca463ff for sharded colors?
+                    cell.replace(in -> in == 0xffffffff ? 0xffa664ff : in == 0xdcc6c6ff || in == 0xdcc5c5ff ? 0xd06b53ff : 0);
 
-                for(Weapon weapon : type.weapons){
-                    weapon.load();
-
-                    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);
+                    image.draw(cell, image.width / 2 - cell.width / 2, image.height / 2 - cell.height / 2, true);
                 }
 
-                image.save("unit-" + type.name + "-full");
+                for(Weapon weapon : weapons){
+                    //skip weapons under unit
+                    if(weapon.layerOffset < 0) continue;
+
+                    Pixmap reg = weaponRegion.get(weapon);
+                    Pixmap wepReg = weapon.top ? outline.get(reg) : reg;
+
+                    drawWeapon.get(weapon, wepReg);
+
+                    if(weapon.cellRegion.found()){
+                        Pixmap weaponCell = get(weapon.cellRegion);
+                        weaponCell.replace(in -> in == 0xffffffff ? 0xffa664ff : in == 0xdcc6c6ff || in == 0xdcc5c5ff ? 0xd06b53ff : 0);
+                        drawWeapon.get(weapon, weaponCell);
+                    }
+                }
+
+                //TODO I can save a LOT of space by not creating a full icon.
+                save(image, "unit-" + type.name + "-full");
 
                 Rand rand = new Rand();
                 rand.setSeed(type.name.hashCode());
@@ -468,17 +688,16 @@ public class Generators{
                 float offsetRange = Math.max(image.width, image.height) * 0.15f;
                 Vec2 offset = new Vec2(1, 1).rotate(rand.random(360f)).setLength(rand.random(0, offsetRange)).add(image.width/2f, image.height/2f);
 
-                Image[] wrecks = new Image[splits];
+                Pixmap[] wrecks = new Pixmap[splits];
                 for(int i = 0; i < wrecks.length; i++){
-                    wrecks[i] = new Image(image.width, image.height);
+                    wrecks[i] = new Pixmap(image.width, image.height);
                 }
 
-                RidgedPerlin r = new RidgedPerlin(1, 3);
                 VoronoiNoise vn = new VoronoiNoise(type.id, true);
 
                 image.each((x, y) -> {
                     //add darker cracks on top
-                    boolean rValue = Math.max(r.getValue(x, y, 1f / (20f + image.width/8f)), 0) > 0.16f;
+                    boolean rValue = Math.max(Ridged.noise2d(1, x, y, 3, 1f / (20f + image.width/8f)), 0) > 0.16f;
                     //cut out random chunks with voronoi
                     boolean vval = vn.noise(x, y, 1f / (14f + image.width/40f)) > 0.47;
 
@@ -486,92 +705,82 @@ public class Generators{
                     //distort edges with random noise
                     float noise = (float)Noise.rawNoise(dst / (9f + image.width/70f)) * (60 + image.width/30f);
                     int section = (int)Mathf.clamp(Mathf.mod(offset.angleTo(x, y) + noise + degrees, 360f) / 360f * splits, 0, splits - 1);
-                    if(!vval) wrecks[section].draw(x, y, image.getColor(x, y).mul(rValue ? 0.7f : 1f));
+                    if(!vval) wrecks[section].setRaw(x, y, Color.muli(image.getRaw(x, y), rValue ? 0.7f : 1f));
                 });
 
                 for(int i = 0; i < wrecks.length; i++){
-                    wrecks[i].save(type.name + "-wreck" + i);
+                    save(wrecks[i], "../rubble/" + type.name + "-wreck" + i);
                 }
 
-                for(Cicon icon : Cicon.scaled){
-                    Vec2 size = Scaling.fit.apply(image.width, image.height, icon.size, icon.size);
-                    Image scaled = new Image((int)size.x, (int)size.y);
+                int maxd = Math.min(Math.max(image.width, image.height), maxUiIcon);
+                Pixmap fit = new Pixmap(maxd, maxd);
+                drawScaledFit(fit, image);
 
-                    scaled.drawScaled(image);
-                    scaled.save("../ui/unit-" + type.name + "-" + icon.name());
-
-                    if(icon == logicIcon){
-                        scaled.save(type.name + "-icon-logic");
-                    }
-                }
+                save(fit, "../ui/unit-" + type.name + "-ui");
             }catch(IllegalArgumentException e){
                 Log.err("WARNING: Skipping unit @: @", type.name, e.getMessage());
             }
 
         }));
 
-        ImagePacker.generate("ore-icons", () -> {
+        generate("ore-icons", () -> {
             content.blocks().<OreBlock>each(b -> b instanceof OreBlock, ore -> {
-                Item item = ore.itemDrop;
+                int shadowColor = Color.rgba8888(0, 0, 0, 0.3f);
 
-                for(int i = 0; i < 3; i++){
+                for(int i = 0; i < ore.variants; i++){
                     //get base image to draw on
-                    Image image = new Image(32, 32);
-                    Image shadow = ImagePacker.get(item.name + (i + 1));
+                    Pixmap base = get(ore.variantRegions[i]);
+                    Pixmap image = base.copy();
 
                     int offset = image.width / tilesize - 1;
 
                     for(int x = 0; x < image.width; x++){
                         for(int y = offset; y < image.height; y++){
-                            Color color = shadow.getColor(x, y - offset);
-
                             //draw semi transparent background
-                            if(color.a > 0.001f){
-                                color.set(0, 0, 0, 0.3f);
-                                image.draw(x, y, color);
+                            if(base.getA(x, y - offset) != 0){
+                                image.setRaw(x, y, Pixmap.blend(shadowColor, base.getRaw(x, y)));
                             }
                         }
                     }
 
-                    image.draw(ImagePacker.get(item.name + (i + 1)));
-                    image.save("../blocks/environment/ore-" + item.name + (i + 1));
-                    image.save("../editor/editor-ore-" + item.name + (i + 1));
+                    image.draw(base, true);
 
-                    image.save("block-" + ore.name + "-full");
-                    for(Cicon icon : Cicon.scaled){
-                        Image scaled = new Image(icon.size, icon.size);
-                        scaled.drawScaled(image);
-                        scaled.save("../ui/block-" + ore.name + "-" + icon.name());
-                    }
+                    replace(ore.variantRegions[i], image);
+
+                    save(image, "../blocks/environment/" + ore.name + (i + 1));
+                    save(image, "../editor/editor-" + ore.name + (i + 1));
+
+                    save(image, "block-" + ore.name + "-full");
+                    save(image, "../ui/block-" + ore.name + "-ui");
                 }
             });
         });
 
-        ImagePacker.generate("edges", () -> {
+        generate("edges", () -> {
             content.blocks().<Floor>each(b -> b instanceof Floor && !(b instanceof OverlayFloor), floor -> {
 
-                if(ImagePacker.has(floor.name + "-edge") || floor.blendGroup != floor){
+                if(has(floor.name + "-edge") || floor.blendGroup != floor){
                     return;
                 }
 
                 try{
-                    Image image = gens.get(floor, ImagePacker.get(floor.getGeneratedIcons()[0]));
-                    Image edge = ImagePacker.get("edge-stencil");
-                    Image result = new Image(edge.width, edge.height);
+                    Pixmap image = gens.get(floor, get(floor.getGeneratedIcons()[0]));
+                    Pixmap edge = get("edge-stencil");
+                    Pixmap result = new Pixmap(edge.width, edge.height);
 
                     for(int x = 0; x < edge.width; x++){
                         for(int y = 0; y < edge.height; y++){
-                            result.draw(x, y, edge.getColor(x, y).mul(image.getColor(x % image.width, y % image.height)));
+                            result.set(x, y, Color.muli(edge.getRaw(x, y), image.get(x % image.width, y % image.height)));
                         }
                     }
 
-                    result.save("../blocks/environment/" + floor.name + "-edge");
+                    save(result, "../blocks/environment/" + floor.name + "-edge");
 
                 }catch(Exception ignored){}
             });
         });
 
-        ImagePacker.generate("scorches", () -> {
+        generate("scorches", () -> {
             for(int size = 0; size < 10; size++){
                 for(int i = 0; i < 3; i++){
                     ScorchGenerator gen = new ScorchGenerator();
@@ -591,7 +800,7 @@ public class Generators{
 
                     Pixmap out = gen.generate();
                     Pixmap median = Pixmaps.median(out, 2, 0.75);
-                    Fi.get("../rubble/scorch-" + size + "-" + i + ".png").writePNG(median);
+                    Fi.get("../rubble/scorch-" + size + "-" + i + ".png").writePng(median);
                     out.dispose();
                     median.dispose();
                 }
@@ -599,4 +808,27 @@ public class Generators{
         });
     }
 
+    /** Generates a scorch pixmap based on parameters. Thread safe. */
+    public static class ScorchGenerator{
+        public int size = 80, seed = 0, color = Color.whiteRgba;
+        public double scale = 18, pow = 2, octaves = 4, pers = 0.4, add = 2, nscl = 4.5f;
+
+        public Pixmap generate(){
+            Pixmap pix = new Pixmap(size, size);
+
+            pix.each((x, y) -> {
+                double dst = Mathf.dst(x, y, size/2, size/2) / (size / 2f);
+                double scaled = Math.abs(dst - 0.5f) * 5f + add;
+                scaled -= noise(Angles.angle(x, y, size/2, size/2))*nscl;
+                if(scaled < 1.5f) pix.setRaw(x, y, color);
+            });
+
+            return pix;
+        }
+
+        private double noise(float angle){
+            return Math.pow(Simplex.noise2d(seed, octaves, pers, 1 / scale, Angles.trnsx(angle, size/2f) + size/2f, Angles.trnsy(angle, size/2f) + size/2f), pow);
+        }
+    }
+
 }
diff --git a/tools/src/mindustry/tools/IconConverter.java b/tools/src/mindustry/tools/IconConverter.java
index c672e2a119..3b0c0d7c13 100644
--- a/tools/src/mindustry/tools/IconConverter.java
+++ b/tools/src/mindustry/tools/IconConverter.java
@@ -10,6 +10,14 @@ public class IconConverter{
     float width, height;
 
     public static void main(String[] __){
+        /*
+        Process for adding an icon to the font:
+        1. Have an SVG ready, possibly created with this tool.
+        2. Go to Fontello and load the config.json from core/assets-raw/fontgen/config.json
+        3. Drag the SVG in.
+        4. Export the config and font file, replace the old config.
+        5. Take the font (ttf) from the zip, open it in FontForge, and merge it into font.woff and icon.ttf. Usually, you would do view -> go to (the 0x unicode index).
+        **/
 
         Log.info("Converting icons...");
         Time.mark();
@@ -17,7 +25,6 @@ public class IconConverter{
         Fi.get("fontgen/icon_parts").deleteDirectory();
         Fi[] list = new Fi("icons").list();
 
-        ArcNativesLoader.load();
         Seq<Fi> files = new Seq<>();
 
         for(Fi img : list){
@@ -29,7 +36,7 @@ public class IconConverter{
             }
         }
 
-        Seq<String> args = Seq.with("inkscape", "--batch-process", "--verb", "EditSelectAll;SelectionUnion;FitCanvasToSelectionOrDrawing;FileSave");
+        Seq<String> args = Seq.with("inkscape", "--batch-process", "--actions", "select-all; path-union; fit-canvas-to-selection; export-overwrite; export-do");
         args.addAll(files.map(Fi::absolutePath));
 
         Fi.get("fontgen/extra").findAll().each(f -> f.copyTo(Fi.get("fontgen/icons").child(f.name())));
@@ -42,25 +49,25 @@ public class IconConverter{
     }
 
     void convert(Pixmap pixmap, Fi output){
-        boolean[][] grid = new boolean[pixmap.getWidth()][pixmap.getHeight()];
+        boolean[][] grid = new boolean[pixmap.width][pixmap.height];
 
-        for(int x = 0; x < pixmap.getWidth(); x++){
-            for(int y = 0; y < pixmap.getHeight(); y++){
-                grid[x][pixmap.getHeight() - 1 - y] = !Pixmaps.empty(pixmap.getPixel(x, y));
+        for(int x = 0; x < pixmap.width; x++){
+            for(int y = 0; y < pixmap.height; y++){
+                grid[x][pixmap.height - 1 - y] = !pixmap.empty(x, y);
             }
         }
 
         float xscl = 1f, yscl = 1f;//resolution / (float)pixmap.getWidth(), yscl = resolution / (float)pixmap.getHeight();
         float scl = xscl;
 
-        width = pixmap.getWidth();
-        height = pixmap.getHeight();
+        width = pixmap.width;
+        height = pixmap.height;
 
-        out.append("<svg width=\"").append(pixmap.getWidth()).append("\" height=\"").append(pixmap.getHeight()).append("\">\n");
+        out.append("<svg width=\"").append(pixmap.width).append("\" height=\"").append(pixmap.height).append("\">\n");
 
-        for(int x = -1; x < pixmap.getWidth(); x++){
-            for(int y = -1; y < pixmap.getHeight(); y++){
-                int index = index(x, y, pixmap.getWidth(), pixmap.getHeight(), grid);
+        for(int x = -1; x < pixmap.width; x++){
+            for(int y = -1; y < pixmap.height; y++){
+                int index = index(x, y, pixmap.width, pixmap.height, grid);
 
                 float leftx = x * xscl, boty = y * yscl, rightx = x * xscl + xscl, topy = y * xscl + yscl,
                 midx = x * xscl + xscl / 2f, midy = y * yscl + yscl / 2f;
diff --git a/tools/src/mindustry/tools/Image.java b/tools/src/mindustry/tools/Image.java
deleted file mode 100644
index 83594f22be..0000000000
--- a/tools/src/mindustry/tools/Image.java
+++ /dev/null
@@ -1,229 +0,0 @@
-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.*;
-
-import javax.imageio.*;
-import java.awt.*;
-import java.awt.image.*;
-import java.io.*;
-
-class Image{
-    private static Seq<Image> toDispose = new Seq<>();
-
-    private BufferedImage image;
-    private Graphics2D graphics;
-    private Color color = new Color();
-
-    public final int width, height;
-
-    Image(TextureRegion region){
-        this(ImagePacker.buf(region));
-    }
-
-    Image(BufferedImage src){
-        this.image = new BufferedImage(src.getWidth(), src.getHeight(), BufferedImage.TYPE_INT_ARGB);
-        this.graphics = image.createGraphics();
-        this.graphics.drawImage(src, 0, 0, null);
-        this.width = image.getWidth();
-        this.height = image.getHeight();
-
-        toDispose.add(this);
-    }
-
-    Image(int width, int height){
-        this(new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB));
-    }
-
-    Image copy(){
-        Image out =new Image(width, height);
-        out.draw(this);
-        return out;
-    }
-
-    boolean isEmpty(int x, int y){
-        if(!Structs.inBounds(x, y, width, height)){
-            return true;
-        }
-        Color color = getColor(x, y);
-        return color.a <= 0.001f;
-    }
-
-    Color getColor(int x, int y){
-        if(!Structs.inBounds(x, y, width, height)) return color.set(0, 0, 0, 0);
-        int i = image.getRGB(x, y);
-        color.argb8888(i);
-        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++){
-                cons.get(x, y);
-            }
-        }
-    }
-
-    void draw(int x, int y, Color color){
-        graphics.setColor(new java.awt.Color(color.r, color.g, color.b, color.a));
-        graphics.fillRect(x, y, 1, 1);
-    }
-
-
-    /** Draws a region at the top left corner. */
-    void draw(TextureRegion region){
-        draw(region, 0, 0, false, false);
-    }
-
-    /** Draws a region at the center. */
-    void drawCenter(TextureRegion region){
-        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.width) / 2, (height - region.height) / 2, flipx, flipy);
-    }
-
-    void drawScaled(Image image){
-        graphics.drawImage(image.image.getScaledInstance(width, height, java.awt.Image.SCALE_AREA_AVERAGING), 0, 0, width, height, null);
-    }
-
-    /** Draws an image at the top left corner. */
-    void draw(Image image){
-        draw(image, 0, 0);
-    }
-
-    /** Draws an image at the coordinates specified. */
-    void draw(Image image, int x, int y){
-        graphics.drawImage(image.image, x, y, null);
-    }
-
-    void draw(TextureRegion region, boolean flipx, boolean flipy){
-        draw(region, 0, 0, flipx, flipy);
-    }
-
-    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(region.image,
-        x, y,
-        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);
-    }
-
-    /** @param name Name of texture file name to create, without any extensions. */
-    void save(String name){
-        try{
-            ImageIO.write(image, "png", new File(name + ".png"));
-        }catch(IOException e){
-            throw new RuntimeException(e);
-        }
-    }
-
-    void save(String name, boolean antialias){
-        save(name);
-        if(!antialias){
-            new File(name + ".png").setLastModified(0);
-        }
-    }
-
-    static int total(){
-        return toDispose.size;
-    }
-
-    static void dispose(){
-        for(Image image : toDispose){
-            image.graphics.dispose();
-        }
-        toDispose.clear();
-    }
-}
diff --git a/tools/src/mindustry/tools/ImagePacker.java b/tools/src/mindustry/tools/ImagePacker.java
index 1142de8a26..a319555abe 100644
--- a/tools/src/mindustry/tools/ImagePacker.java
+++ b/tools/src/mindustry/tools/ImagePacker.java
@@ -2,8 +2,11 @@ package mindustry.tools;
 
 import arc.*;
 import arc.files.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.g2d.TextureAtlas.*;
+import arc.math.geom.*;
+import arc.mock.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.Log.*;
@@ -12,90 +15,89 @@ import mindustry.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
-import mindustry.type.*;
-import mindustry.world.*;
+import mindustry.logic.*;
 import mindustry.world.blocks.*;
 
-import javax.imageio.*;
-import java.awt.image.*;
 import java.io.*;
 
 public class ImagePacker{
-    static ObjectMap<String, TextureRegion> regionCache = new ObjectMap<>();
-    static ObjectMap<String, BufferedImage> imageCache = new ObjectMap<>();
+    static ObjectMap<String, PackIndex> cache = new ObjectMap<>();
 
     public static void main(String[] args) throws Exception{
         Vars.headless = true;
+        //makes PNG loading slightly faster
         ArcNativesLoader.load();
 
+        Core.settings = new MockSettings();
         Log.logger = new NoopLogHandler();
         Vars.content = new ContentLoader();
         Vars.content.createBaseContent();
+        Vars.content.init();
         Log.logger = new DefaultLogHandler();
 
         Fi.get("../../../assets-raw/sprites_out").walk(path -> {
             if(!path.extEquals("png")) return;
 
-            String fname = path.nameWithoutExtension();
-
-            try{
-                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){{
-                    width = image.getWidth();
-                    height = image.getHeight();
-                    u2 = v2 = 1f;
-                    u = v = 0f;
-                }};
-
-                regionCache.put(fname, region);
-                imageCache.put(fname, image);
-            }catch(IOException e){
-                throw new RuntimeException(e);
-            }
+            cache.put(path.nameWithoutExtension(), new PackIndex(path));
         });
 
         Core.atlas = new TextureAtlas(){
             @Override
             public AtlasRegion find(String name){
-                if(!regionCache.containsKey(name)){
+                if(!cache.containsKey(name)){
                     GenRegion region = new GenRegion(name, null);
                     region.invalid = true;
                     return region;
                 }
-                return (AtlasRegion)regionCache.get(name);
+
+                PackIndex index = cache.get(name);
+                if(index.pixmap == null){
+                    index.pixmap = new Pixmap(index.file);
+                    index.region = new GenRegion(name, index.file){{
+                        width = index.pixmap.width;
+                        height = index.pixmap.height;
+                        u2 = v2 = 1f;
+                        u = v = 0f;
+                    }};
+                }
+                return index.region;
             }
 
             @Override
             public AtlasRegion find(String name, TextureRegion def){
-                if(!regionCache.containsKey(name)){
+                if(!cache.containsKey(name)){
                     return (AtlasRegion)def;
                 }
-                return (AtlasRegion)regionCache.get(name);
+                return find(name);
             }
 
             @Override
             public AtlasRegion find(String name, String def){
-                if(!regionCache.containsKey(name)){
-                    return (AtlasRegion)regionCache.get(def);
+                if(!cache.containsKey(name)){
+                    return find(def);
                 }
-                return (AtlasRegion)regionCache.get(name);
+                return find(name);
+            }
+
+            @Override
+            public PixmapRegion getPixmap(AtlasRegion region){
+                return new PixmapRegion(get(region.name));
             }
 
             @Override
             public boolean has(String s){
-                return regionCache.containsKey(s);
+                return cache.containsKey(s);
             }
         };
 
         Draw.scl = 1f / Core.atlas.find("scale_marker").width;
 
         Time.mark();
-        Generators.generate();
+        Vars.content.load();
+        Generators.run();
         Log.info("&ly[Generator]&lc Total time to generate: &lg@&lcms", Time.elapsed());
-        Log.info("&ly[Generator]&lc Total images created: &lg@", Image.total());
-        Image.dispose();
+
+        //write icons to icons.properties
 
         //format:
         //character-ID=contentname:texture-name
@@ -106,7 +108,7 @@ public class ImagePacker{
         ObjectMap<String, String> content2id = new ObjectMap<>();
         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());
+        Seq<UnlockableContent> cont = Seq.withArrays(Vars.content.blocks(), Vars.content.items(), Vars.content.liquids(), Vars.content.units(), Vars.content.statusEffects());
         cont.removeAll(u -> u instanceof ConstructBlock || u == Blocks.air);
 
         int minid = 0xF8FF;
@@ -127,12 +129,78 @@ public class ImagePacker{
         }
 
         writer.close();
+
+        //now, write the IDs to logicids.dat
+
+        //don't write to the file unless I'm packing, because logic IDs rarely change and I don't want merge conflicts from PRs
+        if(!OS.username.equals("anuke")) return;
+
+        //format: ([content type (byte)] [content count (short)] (repeat [name (string)])) until EOF
+        Fi logicidfile = Fi.get("../../../assets/logicids.dat");
+
+        Seq<UnlockableContent> lookupCont = new Seq<>();
+
+        for(ContentType t : GlobalVars.writableLookableContent){
+            lookupCont.addAll(Vars.content.<UnlockableContent>getBy(t).select(UnlockableContent::logicVisible));
+        }
+
+        ObjectIntMap<UnlockableContent>[] registered = new ObjectIntMap[ContentType.all.length];
+        IntMap<UnlockableContent>[] idToContent = new IntMap[ContentType.all.length];
+
+        for(int i = 0; i < ContentType.all.length; i++){
+            registered[i] = new ObjectIntMap<>();
+            idToContent[i] = new IntMap<>();
+        }
+
+        if(logicidfile.exists()){
+            try(DataInputStream in = new DataInputStream(logicidfile.readByteStream())){
+                for(ContentType ctype : GlobalVars.writableLookableContent){
+                    short amount = in.readShort();
+                    for(int i = 0; i < amount; i++){
+                        String name = in.readUTF();
+                        UnlockableContent fetched = Vars.content.getByName(ctype, name);
+                        if(fetched != null){
+                            registered[ctype.ordinal()].put(fetched, i);
+                            idToContent[ctype.ordinal()].put(i, fetched);
+                        }
+                    }
+                }
+            }
+        }
+
+        //map stuff that hasn't been mapped yet
+        for(UnlockableContent c : lookupCont){
+            int ctype = c.getContentType().ordinal();
+            if(!registered[ctype].containsKey(c)){
+                int nextId = 0;
+                //find next ID - this is O(N) but content counts are so low that I don't really care
+                //checking the last ID doesn't work because there might be "holes"
+                for(UnlockableContent other : lookupCont){
+                    if(!idToContent[ctype].containsKey(other.id + 1)){
+                        nextId = other.id + 1;
+                        break;
+                    }
+                }
+
+                idToContent[ctype].put(nextId, c);
+                registered[ctype].put(c, nextId);
+            }
+        }
+
+        //write the resulting IDs
+        try(DataOutputStream out = new DataOutputStream(logicidfile.write(false, 2048))){
+            for(ContentType t : GlobalVars.writableLookableContent){
+                Seq<UnlockableContent> all = idToContent[t.ordinal()].values().toArray().sort(u -> registered[t.ordinal()].get(u));
+                out.writeShort(all.size);
+                for(UnlockableContent u : all){
+                    out.writeUTF(u.name);
+                }
+            }
+        }
     }
 
     static String texname(UnlockableContent c){
-        if(c instanceof Block) return "block-" + c.name + "-medium";
-        if(c instanceof UnitType) return "unit-" + c.name + "-medium";
-        return c.getContentType() + "-" + c.name + "-icon";
+        return c.getContentType() + "-" + c.name + "-ui";
     }
 
     static void generate(String name, Runnable run){
@@ -141,15 +209,7 @@ public class ImagePacker{
         Log.info("&ly[Generator]&lc Time to generate &lm@&lc: &lg@&lcms", name, Time.elapsed());
     }
 
-    static BufferedImage buf(TextureRegion region){
-        return imageCache.get(((AtlasRegion)region).name);
-    }
-
-    static Image create(int width, int height){
-        return new Image(width, height);
-    }
-
-    static Image get(String name){
+    static Pixmap get(String name){
         return get(Core.atlas.find(name));
     }
 
@@ -157,18 +217,44 @@ public class ImagePacker{
         return Core.atlas.has(name);
     }
 
-    static Image get(TextureRegion region){
-        GenRegion.validate(region);
+    static Pixmap get(TextureRegion region){
+        validate(region);
 
-        return new Image(imageCache.get(((AtlasRegion)region).name));
+        return cache.get(((AtlasRegion)region).name).pixmap.copy();
     }
 
-    static void replace(String name, Image image){
-        image.save(name);
+    static void save(Pixmap pix, String path){
+        Fi.get(path + ".png").writePng(pix);
+    }
+
+    static void drawCenter(Pixmap pix, Pixmap other){
+        pix.draw(other, pix.width/2 - other.width/2, pix.height/2 - other.height/2, true);
+    }
+
+    static void saveScaled(Pixmap pix, String name, int size){
+        Pixmap scaled = new Pixmap(size, size);
+        //TODO bad linear scaling
+        scaled.draw(pix, 0, 0, pix.width, pix.height, 0, 0, size, size, true, true);
+        save(scaled, name);
+    }
+
+    static void drawScaledFit(Pixmap base, Pixmap image){
+        Vec2 size = Scaling.fit.apply(image.width, image.height, base.width, base.height);
+        int wx = (int)size.x, wy = (int)size.y;
+        //TODO bad linear scaling
+        base.draw(image, 0, 0, image.width, image.height, base.width/2 - wx/2, base.height/2 - wy/2, wx, wy, true, true);
+    }
+
+    static void delete(String name){
         ((GenRegion)Core.atlas.find(name)).path.delete();
     }
 
-    static void replace(TextureRegion region, Image image){
+    static void replace(String name, Pixmap image){
+        Fi.get(name + ".png").writePng(image);
+        ((GenRegion)Core.atlas.find(name)).path.delete();
+    }
+
+    static void replace(TextureRegion region, Pixmap image){
         replace(((GenRegion)region).name, image);
     }
 
@@ -176,6 +262,12 @@ public class ImagePacker{
         throw new IllegalArgumentException(Strings.format(message, args));
     }
 
+    static void validate(TextureRegion region){
+        if(((GenRegion)region).invalid){
+            ImagePacker.err("Region does not exist: @", ((GenRegion)region).name);
+        }
+    }
+
     static class GenRegion extends AtlasRegion{
         boolean invalid;
         Fi path;
@@ -190,11 +282,15 @@ public class ImagePacker{
         public boolean found(){
             return !invalid;
         }
+    }
 
-        static void validate(TextureRegion region){
-            if(((GenRegion)region).invalid){
-                ImagePacker.err("Region does not exist: @", ((GenRegion)region).name);
-            }
+    static class PackIndex{
+        @Nullable AtlasRegion region;
+        @Nullable Pixmap pixmap;
+        Fi file;
+
+        public PackIndex(Fi file){
+            this.file = file;
         }
     }
 }
diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java
index cfc248dca4..4b0fdac9e5 100644
--- a/tools/src/mindustry/tools/ScriptMainGenerator.java
+++ b/tools/src/mindustry/tools/ScriptMainGenerator.java
@@ -10,22 +10,22 @@ import arc.graphics.gl.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
+import com.google.common.reflect.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.io.*;
 import mindustry.net.*;
+import mindustry.world.*;
 
 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<String> blacklist = Seq.with("tools", "arc.flabel.effects");
+        Seq<String> nameBlacklist = Seq.with();
         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,
@@ -41,13 +41,15 @@ public class ScriptMainGenerator{
             getClasses("arc.audio"),
             getClasses("arc.input"),
             getClasses("arc.util"),
+            getClasses("arc.files"),
+            getClasses("arc.flabel"),
             getClasses("arc.struct")
         );
         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()));
+        || blacklist.contains(s -> type.getName().startsWith(base + "." + s + ".")) || nameBlacklist.contains(type.getSimpleName()) || blacklist.contains(type.getPackage().getName()));
         classes.add(NetConnection.class, SaveIO.class, SystemCursor.class);
 
         classes.distinct();
@@ -69,36 +71,60 @@ public class ScriptMainGenerator{
         }
 
         new Fi("core/assets/scripts/global.js").writeString(result.toString());
-    }
 
+        //map simple name to type
+        Seq<String> packages = Seq.with(
+        "mindustry.entities.effect",
+        "mindustry.entities.bullet",
+        "mindustry.entities.abilities",
+        "mindustry.ai.types",
+        "mindustry.type.weather",
+        "mindustry.type.weapons",
+        "mindustry.type.ammo",
+        "mindustry.game.Objectives",
+        "mindustry.world.blocks",
+        "mindustry.world.consumers",
+        "mindustry.world.draw",
+        "mindustry.type",
+        "mindustry.entities.pattern",
+        "mindustry.entities.part"
+        );
 
-    private static Seq<Class> getClasses(String packageName) throws Exception{
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        Seq<File> dirs = new Seq<>();
+        String classTemplate = "package mindustry.mod;\n" +
+        "\n" +
+        "import arc.struct.*;\n" +
+        "/** Generated class. Maps simple class names to concrete classes. For use in JSON mods. */\n" +
+        "@SuppressWarnings(\"deprecation\")\n" +
+        "public class ClassMap{\n" +
+        "    public static final ObjectMap<String, Class<?>> classes = new ObjectMap<>();\n" +
+        "    \n" +
+        "    static{\n$CLASSES$" +
+        "    }\n" +
+        "}\n";
 
-        for(URL resource : Collections.list(classLoader.getResources(packageName.replace('.', '/')))){
-            dirs.add(new File(resource.getFile()));
+        StringBuilder cdef = new StringBuilder();
+
+        Seq<Class<?>> mapped = classes.select(c -> Modifier.isPublic(c.getModifiers()) && packages.contains(c.getCanonicalName()::startsWith))
+        .add(Block.class); //special case
+
+        for(Class<?> c : mapped){
+            cdef.append("        classes.put(\"").append(c.getSimpleName()).append("\", ").append(c.getCanonicalName()).append(".class);\n");
         }
 
-        Seq<Class> classes = new Seq<>();
-        for(File directory : dirs){
-            classes.addAll(findClasses(directory, packageName));
-        }
-        return classes;
+        new Fi("core/src/mindustry/mod/ClassMap.java").writeString(classTemplate.replace("$CLASSES$", cdef.toString()));
+        Log.info("Generated @ class mappings.", mapped.size);
     }
 
-    private static Seq<Class> findClasses(File directory, String packageName) throws Exception{
-        Seq<Class> classes = new Seq<>();
-        if(!directory.exists()) return classes;
+    public static Seq<Class> getClasses(String packageName) throws Exception{
+        final ClassLoader loader = Thread.currentThread().getContextClassLoader();
 
-        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()));
+        var result = new Seq<Class>();
+
+        for(ClassPath.ClassInfo info : ClassPath.from(loader).getAllClasses()){
+            if(info.getName().startsWith(packageName + ".")){
+                result.add(info.load());
             }
         }
-        return classes;
+        return result;
     }
 }